feat: service proxy, health monitor, hover card, and homepage section

Built-in service proxy with branch-based URLs, service health monitoring, workspace hover card with service status, and "Forget about ports" homepage section.
Emit running state when workspace setup begins
2026-11-05 16:04:43 +00:00 · 2026-04-01 10:31:15 +07:00 · 2026-03-31 16:22:51 +07:00 · 2026-03-31 09:09:38 +07:00 · 2026-03-30 21:41:03 +07:00 · 2026-03-30 17:05:14 +07:00
144 changed files with 10804 additions and 2669 deletions
@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [boudra]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
@@ -9,6 +9,8 @@ on:
      - 'package-lock.json'
      - 'patches/**'
      - '.github/workflows/deploy-website.yml'
+  release:
+    types: [published, edited]
  workflow_dispatch:

 jobs:
@@ -1,5 +1,21 @@
 # Changelog

+## 0.1.38 - 2026-03-30
+
+### Fixed
+- Fixed daemon startup race where the app could time out connecting on first launch because the PID file advertised a listen address before the server was ready.
+- Fixed daemon log rotation losing startup traces — trace-level WebSocket logs no longer include full message payloads.
+
+## 0.1.37 - 2026-03-29
+
+### Added
+- Custom window controls on Windows and Linux — the native titlebar is replaced with overlay controls that match the app's design.
+- Desktop file logging with electron-log for easier debugging of daemon and app issues.
+
+### Fixed
+- Fixed broken PATH propagation and Claude binary resolution on Windows.
+- Dictation errors now show a visible toast instead of failing silently.
+
 ## 0.1.36 - 2026-03-27

 ### Fixed
@@ -26,20 +26,32 @@ Run agents in parallel on your own machines. Ship from your phone or your desk.

 ## Getting Started

-### Desktop app
+Paseo runs a local server called the daemon that manages your coding agents. Clients like the desktop app, mobile app, web app, and CLI connect to it.

-Download from [paseo.sh/download](https://paseo.sh/download) or the [GitHub releases page](https://github.com/getpaseo/paseo/releases). The app bundles its own daemon, so there's nothing else to install. It can also connect to daemons running on other machines.
+### Prerequisites

-### Headless / server mode
+You need at least one agent CLI installed and configured with your credentials:

-Run the daemon on any machine:
+- [Claude Code](https://docs.anthropic.com/en/docs/claude-code)
+- [Codex](https://github.com/openai/codex)
+- [OpenCode](https://github.com/anomalyco/opencode)
+
+### Desktop app (recommended)
+
+Download it from [paseo.sh/download](https://paseo.sh/download) or the [GitHub releases page](https://github.com/getpaseo/paseo/releases). Open the app and the daemon starts automatically. Nothing else to install.
+
+To connect from your phone, scan the QR code shown in Settings.
+
+### CLI / headless
+
+Install the CLI and start Paseo:

 ```bash
 npm install -g @getpaseo/cli
 paseo
 ```

-Then connect from any client — desktop, web, mobile, or CLI. See [paseo.sh/download](https://paseo.sh/download) for all options.
+This shows a QR code in the terminal. Connect from any client. This path is useful for servers and remote machines.

 For full setup and configuration, see:
 - [Docs](https://paseo.sh/docs)
@@ -31,6 +31,14 @@ Your code never leaves your machine. Paseo is local-first.
 └───────────┘ └────────┘ └──────────┘
 ```

+## Components at a glance
+
+- **Daemon:** Local server that spawns and manages agent processes and exposes the WebSocket API.
+- **App:** Cross-platform Expo client for iOS, Android, web, and the shared UI used by desktop.
+- **CLI:** Terminal interface for agent workflows that can also start and manage the daemon.
+- **Desktop app:** Electron wrapper around the web app that bundles and auto-manages its own daemon.
+- **Relay:** Optional encrypted bridge for remote access without opening ports directly.
+
 ## Packages

 ### `packages/server` — The daemon
@@ -0,0 +1,109 @@
+# File Icons
+
+The file explorer uses colored SVG icons from [`material-icon-theme`](https://github.com/material-extensions/vscode-material-icon-theme) (installed as a dev dependency in `packages/app`).
+
+Icons are inlined as SVG strings in:
+
+```
+packages/app/src/components/material-file-icons.ts
+```
+
+This file is auto-generated. Do not edit it by hand.
+
+## How it works
+
+- `SVG_ICONS` maps icon names (e.g. `"typescript"`) to raw SVG strings
+- `EXTENSION_TO_ICON` maps file extensions (e.g. `"ts"`) to icon names
+- `getFileIconSvg(fileName)` returns the SVG string for a given filename, falling back to a generic file icon
+
+## Adding a new icon
+
+1. Find the icon name in the material-icon-theme manifest:
+
+```bash
+node -e "
+const m = require('./node_modules/material-icon-theme/dist/material-icons.json');
+console.log('fileExtensions:', m.fileExtensions['YOUR_EXT']);
+console.log('languageIds:', m.languageIds['YOUR_LANG']);
+"
+```
+
+2. Verify the SVG exists:
+
+```bash
+cat node_modules/material-icon-theme/icons/ICON_NAME.svg
+```
+
+3. Add two things to `material-file-icons.ts`:
+
+   - The SVG string in `SVG_ICONS`:
+     ```ts
+     "icon_name": `<svg ...>...</svg>`,
+     ```
+
+   - The extension mapping in `EXTENSION_TO_ICON`:
+     ```ts
+     "ext": "icon_name",
+     ```
+
+4. Run `npm run typecheck` to verify.
+
+## Currently included icons
+
+53 unique icons covering these extensions:
+
+| Extension(s) | Icon |
+|---|---|
+| `ts` | typescript |
+| `tsx` | react_ts |
+| `js` | javascript |
+| `jsx` | react |
+| `py` | python |
+| `go` | go |
+| `rs` | rust |
+| `rb` | ruby |
+| `java` | java |
+| `kt` | kotlin |
+| `c` | c |
+| `cpp` | cpp |
+| `h` | h |
+| `hpp` | hpp |
+| `cs` | csharp |
+| `swift` | swift |
+| `dart` | dart |
+| `ex`, `exs` | elixir |
+| `erl` | erlang |
+| `hs` | haskell |
+| `clj` | clojure |
+| `scala` | scala |
+| `ml` | ocaml |
+| `r` | r |
+| `lua` | lua |
+| `zig` | zig |
+| `nix` | nix |
+| `php` | php |
+| `html` | html |
+| `css` | css |
+| `scss` | sass |
+| `less` | less |
+| `json` | json |
+| `yml`, `yaml` | yaml |
+| `xml` | xml |
+| `toml` | toml |
+| `md`, `markdown` | markdown |
+| `sql` | database |
+| `graphql`, `gql` | graphql |
+| `sh`, `bash` | console |
+| `tf` | terraform |
+| `hcl` | hcl |
+| `vue` | vue |
+| `svelte` | svelte |
+| `astro` | astro |
+| `wasm` | webassembly |
+| `svg` | svg |
+| `png`, `jpg`, `jpeg`, `gif`, `webp`, `ico` | image |
+| `txt` | document |
+| `conf`, `cfg`, `ini` | settings |
+| `lock` | lock |
+| `groovy` | groovy |
+| `gradle` | gradle |
@@ -42,7 +42,7 @@ buildNpmPackage rec {

  # To update: run `nix build` with lib.fakeHash, copy the `got:` hash.
  # CI auto-updates this when package-lock.json changes (see .github/workflows/).
-  npmDepsHash = "sha256-6/O7JL4VDI7bKvFwXSRMvJ7VV2yiBUtQ9zrY3cbKYb0=";
+  npmDepsHash = "sha256-Cz3xidzBIWER4ktn3wWzT9PDm9PnipVA7XnsTQC440U=";

  # Prevent onnxruntime-node's install script from running during automatic
  # npm rebuild (it tries to download from api.nuget.org, which fails in the sandbox).
@@ -114,7 +114,7 @@ buildNpmPackage rec {
      fi
    done

-    # Copy server scripts (daemon-runner, supervisor) needed by CLI
+    # Copy server scripts (including supervisor-entrypoint) needed by CLI
    if [ -d packages/server/dist/scripts ]; then
      mkdir -p $out/lib/paseo/packages/server/dist/scripts
      cp -a packages/server/dist/scripts/* $out/lib/paseo/packages/server/dist/scripts/
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.1.37",
+  "version": "0.1.38",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.1.37",
+      "version": "0.1.38",
      "hasInstallScript": true,
      "license": "AGPL-3.0-or-later",
      "workspaces": [
@@ -14831,6 +14831,13 @@
        "node": ">=10"
      }
    },
+    "node_modules/chroma-js": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-3.2.0.tgz",
+      "integrity": "sha512-os/OippSlX1RlWWr+QDPcGUZs0uoqr32urfxESG9U93lhUfbnlyckte84Q8P1UQY/qth983AS1JONKmLS4T0nw==",
+      "dev": true,
+      "license": "(BSD-3-Clause AND Apache-2.0)"
+    },
    "node_modules/chrome-launcher": {
      "version": "0.15.2",
      "resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.15.2.tgz",
@@ -15855,6 +15862,33 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/deep-rename-keys": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/deep-rename-keys/-/deep-rename-keys-0.2.1.tgz",
+      "integrity": "sha512-RHd9ABw4Fvk+gYDWqwOftG849x0bYOySl/RgX0tLI9i27ZIeSO91mLZJEp7oPHOMFqHvpgu21YptmDt0FYD/0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2",
+        "rename-keys": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/deep-rename-keys/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/deepmerge": {
      "version": "4.3.1",
      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
@@ -18423,6 +18457,13 @@
        "node": ">=6"
      }
    },
+    "node_modules/eventemitter3": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
+      "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/events": {
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
@@ -25292,6 +25333,25 @@
        "node": ">=10"
      }
    },
+    "node_modules/material-icon-theme": {
+      "version": "5.32.0",
+      "resolved": "https://registry.npmjs.org/material-icon-theme/-/material-icon-theme-5.32.0.tgz",
+      "integrity": "sha512-SxJxCcnk6cJIbd+AxmoeghXJ24joXGmUzjiGci16sX4mXZdXprGEzM6ZZ0VHGAofxNlMqznEbExINwFLsxf8eQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chroma-js": "^3.1.2",
+        "events": "^3.3.0",
+        "fast-deep-equal": "^3.1.3",
+        "svgson": "^5.3.1"
+      },
+      "engines": {
+        "vscode": "^1.55.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/material-extensions"
+      }
+    },
    "node_modules/math-intrinsics": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -30156,6 +30216,16 @@
      "dev": true,
      "license": "MIT"
    },
+    "node_modules/rename-keys": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/rename-keys/-/rename-keys-1.2.0.tgz",
+      "integrity": "sha512-U7XpAktpbSgHTRSNRrjKSrjYkZKuhUukfoBlXWXUExCAqhzh1TU3BDRAfJmarcl5voKS+pbKU9MvyLWKZ4UEEg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
    "node_modules/require-directory": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -32144,6 +32214,17 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/svgson": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/svgson/-/svgson-5.3.1.tgz",
+      "integrity": "sha512-qdPgvUNWb40gWktBJnbJRelWcPzkLed/ShhnRsjbayXz8OtdPOzbil9jtiZdrYvSDumAz/VNQr6JaNfPx/gvPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "deep-rename-keys": "^0.2.1",
+        "xml-reader": "2.4.3"
+      }
+    },
    "node_modules/symbol-tree": {
      "version": "3.2.4",
      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -34550,6 +34631,16 @@
        "uuid": "dist/bin/uuid"
      }
    },
+    "node_modules/xml-lexer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/xml-lexer/-/xml-lexer-0.2.2.tgz",
+      "integrity": "sha512-G0i98epIwiUEiKmMcavmVdhtymW+pCAohMRgybyIME9ygfVu8QheIi+YoQh3ngiThsT0SQzJT4R0sKDEv8Ou0w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^2.0.0"
+      }
+    },
    "node_modules/xml-name-validator": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
@@ -34560,6 +34651,17 @@
        "node": ">=12"
      }
    },
+    "node_modules/xml-reader": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/xml-reader/-/xml-reader-2.4.3.tgz",
+      "integrity": "sha512-xWldrIxjeAMAu6+HSf9t50ot1uL5M+BtOidRCWHXIeewvSeIpscWCsp4Zxjk8kHHhdqFBrfK8U0EJeCcnyQ/gA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^2.0.0",
+        "xml-lexer": "^0.2.2"
+      }
+    },
    "node_modules/xml2js": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.0.tgz",
@@ -34860,16 +34962,16 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.1.37",
+      "version": "0.1.38",
      "dependencies": {
        "@dnd-kit/core": "^6.3.1",
        "@dnd-kit/sortable": "^10.0.0",
        "@dnd-kit/utilities": "^3.2.2",
        "@expo/vector-icons": "^15.0.2",
        "@floating-ui/react-native": "^0.10.7",
-        "@getpaseo/expo-two-way-audio": "0.1.37",
-        "@getpaseo/highlight": "0.1.37",
-        "@getpaseo/server": "0.1.37",
+        "@getpaseo/expo-two-way-audio": "0.1.38",
+        "@getpaseo/highlight": "0.1.38",
+        "@getpaseo/server": "0.1.38",
        "@gorhom/bottom-sheet": "^5.2.6",
        "@gorhom/portal": "^1.0.14",
        "@react-native-async-storage/async-storage": "2.2.0",
@@ -34947,6 +35049,7 @@
        "eas-cli": "^16.24.1",
        "eslint": "^9.25.0",
        "eslint-config-expo": "~10.0.0",
+        "material-icon-theme": "^5.32.0",
        "playwright": "^1.56.1",
        "typescript": "~5.9.2",
        "vitest": "^3.2.4",
@@ -34985,11 +35088,11 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.1.37",
+      "version": "0.1.38",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/relay": "0.1.37",
-        "@getpaseo/server": "0.1.37",
+        "@getpaseo/relay": "0.1.38",
+        "@getpaseo/server": "0.1.38",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -35030,11 +35133,11 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.1.37",
+      "version": "0.1.38",
      "license": "AGPL-3.0-or-later",
      "dependencies": {
-        "@getpaseo/cli": "0.1.37",
-        "@getpaseo/server": "0.1.37",
+        "@getpaseo/cli": "0.1.38",
+        "@getpaseo/server": "0.1.38",
        "electron-log": "^5.4.3",
        "electron-updater": "^6.6.2",
        "ws": "^8.14.2"
@@ -35068,7 +35171,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.1.37",
+      "version": "0.1.38",
      "license": "MIT",
      "devDependencies": {
        "@biomejs/biome": "1.9.4",
@@ -35269,7 +35372,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.1.37",
+      "version": "0.1.38",
      "dependencies": {
        "@lezer/common": "^1.5.0",
        "@lezer/cpp": "^1.1.5",
@@ -35295,7 +35398,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.1.37",
+      "version": "0.1.38",
      "dependencies": {
        "base64-js": "^1.5.1",
        "tweetnacl": "^1.0.3",
@@ -35311,13 +35414,14 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.1.37",
+      "version": "0.1.38",
      "dependencies": {
        "@ai-sdk/openai": "2.0.52",
        "@anthropic-ai/claude-agent-sdk": "^0.2.11",
        "@deepgram/sdk": "^3.4.0",
-        "@getpaseo/highlight": "0.1.37",
-        "@getpaseo/relay": "0.1.37",
+        "@getpaseo/highlight": "0.1.38",
+        "@getpaseo/relay": "0.1.38",
+        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "^1.20.1",
        "@opencode-ai/sdk": "1.2.6",
        "@sctg/sentencepiece-js": "^1.1.0",
@@ -35360,6 +35464,15 @@
        "vitest": "^3.2.4"
      }
    },
+    "packages/server/node_modules/@isaacs/ttlcache": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@isaacs/ttlcache/-/ttlcache-2.1.4.tgz",
+      "integrity": "sha512-7kMz0BJpMvgAMkyglums7B2vtrn5g0a0am77JY0GjkZZNetOBCFn7AG7gKCwT0QPiXyxW7YIQSgtARknUEOcxQ==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "packages/server/node_modules/@modelcontextprotocol/sdk": {
      "version": "1.20.1",
      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.20.1.tgz",
@@ -35705,7 +35818,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.1.37",
+      "version": "0.1.38",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.20.3",
        "@cloudflare/workers-types": "^4.20260114.0",
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.1.37",
+  "version": "0.1.38",
  "private": true,
  "workspaces": [
    "packages/expo-two-way-audio",
@@ -0,0 +1,159 @@
+import path from "node:path";
+import { randomUUID } from "node:crypto";
+import { pathToFileURL } from "node:url";
+import { expect, type Page } from "@playwright/test";
+import { gotoAppShell } from "./app";
+import type { SessionOutboundMessage } from "@server/shared/messages";
+
+type WorkspaceSetupDaemonClient = {
+  connect(): Promise<void>;
+  close(): Promise<void>;
+  openProject(
+    cwd: string,
+  ): Promise<{ workspace: { id: string; name: string } | null; error: string | null }>;
+  createPaseoWorktree(
+    input: { cwd: string; worktreeSlug?: string },
+  ): Promise<{ workspace: { id: string; name: string } | null; error: string | null }>;
+  listTerminals(
+    cwd?: string,
+  ): Promise<{ cwd?: string; terminals: Array<{ id: string; name: string }>; requestId: string }>;
+  subscribeRawMessages(handler: (message: SessionOutboundMessage) => void): () => void;
+};
+
+export type WorkspaceSetupProgressPayload = Extract<
+  SessionOutboundMessage,
+  { type: "workspace_setup_progress" }
+>["payload"];
+
+function getDaemonWsUrl(): string {
+  const daemonPort = process.env.E2E_DAEMON_PORT;
+  if (!daemonPort) {
+    throw new Error("E2E_DAEMON_PORT is not set.");
+  }
+  return `ws://127.0.0.1:${daemonPort}/ws`;
+}
+
+async function loadDaemonClientConstructor(): Promise<
+  new (config: { url: string; clientId: string; clientType: "cli" }) => WorkspaceSetupDaemonClient
+> {
+  const repoRoot = path.resolve(process.cwd(), "../..");
+  const moduleUrl = pathToFileURL(
+    path.join(repoRoot, "packages/server/dist/server/server/exports.js"),
+  ).href;
+  const mod = (await import(moduleUrl)) as {
+    DaemonClient: new (config: {
+      url: string;
+      clientId: string;
+      clientType: "cli";
+    }) => WorkspaceSetupDaemonClient;
+  };
+  return mod.DaemonClient;
+}
+
+export async function connectWorkspaceSetupClient(): Promise<WorkspaceSetupDaemonClient> {
+  const DaemonClient = await loadDaemonClientConstructor();
+  const client = new DaemonClient({
+    url: getDaemonWsUrl(),
+    clientId: `workspace-setup-${randomUUID()}`,
+    clientType: "cli",
+  });
+  await client.connect();
+  return client;
+}
+
+export async function seedProjectForWorkspaceSetup(
+  client: WorkspaceSetupDaemonClient,
+  repoPath: string,
+): Promise<void> {
+  const result = await client.openProject(repoPath);
+  if (!result.workspace || result.error) {
+    throw new Error(result.error ?? `Failed to open project ${repoPath}`);
+  }
+}
+
+export function projectNameFromPath(repoPath: string): string {
+  return repoPath.replace(/\/+$/, "").split("/").filter(Boolean).pop() ?? repoPath;
+}
+
+export async function openHomeWithProject(page: Page, repoPath: string): Promise<void> {
+  await gotoAppShell(page);
+  await expect(createWorkspaceButton(page, repoPath)).toBeVisible({ timeout: 30_000 });
+}
+
+function createWorkspaceButton(page: Page, repoPath: string) {
+  return page.getByRole("button", {
+    name: `Create a new workspace for ${projectNameFromPath(repoPath)}`,
+  });
+}
+
+async function revealWorkspaceButton(page: Page, repoPath: string): Promise<void> {
+  await page.getByTestId(`sidebar-project-row-${repoPath}`).hover();
+}
+
+export async function createWorkspaceFromSidebar(page: Page, repoPath: string): Promise<void> {
+  await revealWorkspaceButton(page, repoPath);
+  await expect(createWorkspaceButton(page, repoPath)).toBeEnabled({ timeout: 30_000 });
+  await createWorkspaceButton(page, repoPath).click();
+  await expect(page).toHaveURL(/\/workspace\//, { timeout: 30_000 });
+}
+
+export async function expectSetupPanel(page: Page): Promise<void> {
+  await expect(page.getByTestId("workspace-setup-panel")).toBeVisible({ timeout: 30_000 });
+}
+
+export async function expectSetupStatus(
+  page: Page,
+  status: "Running" | "Completed" | "Failed",
+): Promise<void> {
+  await expect(page.getByTestId("workspace-setup-status")).toContainText(status, {
+    timeout: 30_000,
+  });
+}
+
+export async function expectSetupLogContains(page: Page, text: string): Promise<void> {
+  await expect(page.getByTestId("workspace-setup-log")).toContainText(text, {
+    timeout: 30_000,
+  });
+}
+
+export async function expectNoSetupMessage(page: Page): Promise<void> {
+  await expect(page.getByText("No setup commands ran for this workspace.", { exact: true })).toBeVisible({
+    timeout: 30_000,
+  });
+}
+
+export async function createWorkspaceThroughDaemon(
+  client: WorkspaceSetupDaemonClient,
+  input: { cwd: string; worktreeSlug: string },
+): Promise<{ id: string; name: string }> {
+  const result = await client.createPaseoWorktree(input);
+  if (!result.workspace || result.error) {
+    throw new Error(result.error ?? `Failed to create workspace for ${input.cwd}`);
+  }
+  return result.workspace;
+}
+
+export async function waitForWorkspaceSetupProgress(
+  client: WorkspaceSetupDaemonClient,
+  predicate: (payload: WorkspaceSetupProgressPayload) => boolean,
+  timeoutMs = 30_000,
+): Promise<WorkspaceSetupProgressPayload> {
+  return new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      unsubscribe();
+      reject(new Error(`Timed out waiting for workspace_setup_progress after ${timeoutMs}ms`));
+    }, timeoutMs);
+
+    const unsubscribe = client.subscribeRawMessages((message) => {
+      if (message.type !== "workspace_setup_progress") {
+        return;
+      }
+      if (!predicate(message.payload)) {
+        return;
+      }
+      clearTimeout(timeout);
+      unsubscribe();
+      resolve(message.payload);
+    });
+  });
+}
@@ -10,7 +10,11 @@ type TempRepo = {

 export const createTempGitRepo = async (
  prefix = "paseo-e2e-",
-  options?: { withRemote?: boolean },
+  options?: {
+    withRemote?: boolean;
+    paseoConfig?: Record<string, unknown>;
+    files?: Array<{ path: string; content: string }>;
+  },
 ): Promise<TempRepo> => {
  // Keep E2E repo paths short so terminal prompt + typed commands stay visible without zsh clipping.
  const tempRoot = process.platform === "win32" ? tmpdir() : "/tmp";
@@ -22,7 +26,24 @@ export const createTempGitRepo = async (
  execSync('git config user.name "Paseo E2E"', { cwd: repoPath, stdio: "ignore" });
  execSync("git config commit.gpgsign false", { cwd: repoPath, stdio: "ignore" });
  await writeFile(path.join(repoPath, "README.md"), "# Temp Repo\n");
+  if (options?.paseoConfig) {
+    await writeFile(
+      path.join(repoPath, "paseo.json"),
+      JSON.stringify(options.paseoConfig, null, 2),
+    );
+  }
+  for (const file of options?.files ?? []) {
+    const filePath = path.join(repoPath, file.path);
+    await mkdir(path.dirname(filePath), { recursive: true });
+    await writeFile(filePath, file.content);
+  }
  execSync("git add README.md", { cwd: repoPath, stdio: "ignore" });
+  if (options?.paseoConfig) {
+    execSync("git add paseo.json", { cwd: repoPath, stdio: "ignore" });
+  }
+  for (const file of options?.files ?? []) {
+    execSync(`git add ${JSON.stringify(file.path)}`, { cwd: repoPath, stdio: "ignore" });
+  }
  execSync('git commit -m "Initial commit"', { cwd: repoPath, stdio: "ignore" });

  if (withRemote) {
@@ -0,0 +1,134 @@
+import { test, expect } from "./fixtures";
+import { createTempGitRepo } from "./helpers/workspace";
+import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
+import {
+  connectWorkspaceSetupClient,
+  createWorkspaceFromSidebar,
+  expectSetupPanel,
+  expectSetupStatus,
+  openHomeWithProject,
+  seedProjectForWorkspaceSetup,
+} from "./helpers/workspace-setup";
+import type { Page } from "@playwright/test";
+
+// ---------------------------------------------------------------------------
+// Composable helpers
+// ---------------------------------------------------------------------------
+
+/** Waits for the globe icon to appear on a workspace row (proves services are running). */
+async function expectGlobeIcon(page: Page): Promise<void> {
+  await expect(page.getByTestId("workspace-globe-icon")).toBeVisible({ timeout: 30_000 });
+}
+
+/** Hovers the workspace row (by visible name) and waits for the hover card to appear. */
+async function expectHoverCard(page: Page, workspaceName: string): Promise<void> {
+  const row = page.getByRole("button", { name: workspaceName }).first();
+  await row.hover();
+  await expect(page.getByTestId("workspace-hover-card")).toBeVisible({ timeout: 10_000 });
+}
+
+/** Asserts that a service row with the given name exists in the hover card. */
+async function expectServiceInCard(page: Page, serviceName: string): Promise<void> {
+  const card = page.getByTestId("workspace-hover-card");
+  await expect(card.getByTestId(`hover-card-service-${serviceName}`)).toBeVisible({
+    timeout: 10_000,
+  });
+}
+
+/** Asserts the service status dot indicates "running". */
+async function expectServiceRunning(page: Page, serviceName: string): Promise<void> {
+  const card = page.getByTestId("workspace-hover-card");
+  await expect(
+    card.getByTestId(`hover-card-service-status-${serviceName}`),
+  ).toHaveAttribute("aria-label", "Running", { timeout: 10_000 });
+}
+
+/** Asserts the hover card contains the workspace name. */
+async function expectWorkspaceNameInCard(page: Page, name: string): Promise<void> {
+  const card = page.getByTestId("workspace-hover-card");
+  await expect(card.getByTestId("hover-card-workspace-name")).toContainText(name, {
+    timeout: 10_000,
+  });
+}
+
+/** Moves the mouse away from the sidebar and asserts the hover card disappears. */
+async function expectHoverCardDismissed(page: Page): Promise<void> {
+  // Move mouse to the center of the viewport (away from sidebar)
+  const viewport = page.viewportSize();
+  await page.mouse.move((viewport?.width ?? 1280) / 2, (viewport?.height ?? 720) / 2);
+  await expect(page.getByTestId("workspace-hover-card")).not.toBeVisible({ timeout: 10_000 });
+}
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+test.describe("Workspace hover card", () => {
+  test("shows hover card with services when hovering a workspace with running services", async ({
+    page,
+  }) => {
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("hovercard-svc-", {
+      paseoConfig: {
+        worktree: {
+          setup: ["sh -c 'echo bootstrapping; sleep 1; echo setup complete'"],
+        },
+        services: {
+          web: {
+            command:
+              "node -e \"const http = require('http'); const s = http.createServer((q,r) => r.end('ok')); s.listen(process.env.PORT || 3000, () => console.log('listening on ' + s.address().port))\"",
+          },
+        },
+      },
+    });
+
+    try {
+      await seedProjectForWorkspaceSetup(client, repo.path);
+      await openHomeWithProject(page, repo.path);
+      await createWorkspaceFromSidebar(page, repo.path);
+
+      // Wait for setup to complete and workspace to be usable
+      await expectSetupPanel(page);
+      await expectSetupStatus(page, "Completed");
+      await waitForWorkspaceTabsVisible(page);
+
+      // Wait for the globe icon — proves services are running and client has the data
+      await expectGlobeIcon(page);
+
+      // Read the workspace name from the page header (the mnemonic name, e.g. "upbeat-crab")
+      const workspaceHeader = page.getByTestId("workspace-tabs-row");
+      await expect(workspaceHeader).toBeVisible({ timeout: 10_000 });
+      // The workspace name is the second workspace row button in the sidebar under the worktree project
+      // We can find it by looking for the workspace row that has the globe icon next to it
+      const globeIcon = page.getByTestId("workspace-globe-icon");
+      const workspaceRow = page.locator('[data-testid^="sidebar-workspace-row-"]', {
+        has: globeIcon,
+      });
+      const workspaceName =
+        (await workspaceRow.locator("button").first().innerText()).trim() || "workspace";
+
+      // Hover the workspace row — hover card should appear
+      await expectHoverCard(page, workspaceName);
+
+      // Assert the card shows the workspace name
+      await expectWorkspaceNameInCard(page, workspaceName);
+
+      // Assert the "web" service entry exists in the card
+      await expectServiceInCard(page, "web");
+
+      // Assert the status dot shows "running"
+      await expectServiceRunning(page, "web");
+
+      // Assert the service row is a link (has role="link")
+      const card = page.getByTestId("workspace-hover-card");
+      const serviceLink = card.getByRole("link", { name: "web service" });
+      await expect(serviceLink).toBeVisible({ timeout: 10_000 });
+
+      // Move mouse away — card should dismiss
+      await expectHoverCardDismissed(page);
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+});
@@ -0,0 +1,292 @@
+import { rm, writeFile } from "node:fs/promises";
+import { test, expect } from "./fixtures";
+import { createTempGitRepo } from "./helpers/workspace";
+import { waitForWorkspaceTabsVisible } from "./helpers/workspace-tabs";
+import {
+  connectWorkspaceSetupClient,
+  createWorkspaceFromSidebar,
+  createWorkspaceThroughDaemon,
+  expectSetupLogContains,
+  expectSetupPanel,
+  expectSetupStatus,
+  openHomeWithProject,
+  seedProjectForWorkspaceSetup,
+  waitForWorkspaceSetupProgress,
+} from "./helpers/workspace-setup";
+
+test.describe("Workspace setup streaming", () => {
+  test("opens the setup tab when a workspace is created from the sidebar", async ({ page }) => {
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("setup-open-", {
+      paseoConfig: {
+        worktree: {
+          setup: ["sh -c 'echo starting setup; sleep 2; echo setup complete'"],
+        },
+      },
+    });
+
+    try {
+      await seedProjectForWorkspaceSetup(client, repo.path);
+      await openHomeWithProject(page, repo.path);
+      await createWorkspaceFromSidebar(page, repo.path);
+
+      await expectSetupPanel(page);
+      await expect(page).toHaveURL(/\/workspace\//, { timeout: 30_000 });
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+
+  test("runs setup through the sidebar and leaves the workspace usable", async ({ page }) => {
+    const setupTriggerPath = `/tmp/setup-trigger-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("setup-ui-flow-", {
+      paseoConfig: {
+        worktree: {
+          setup: [
+            `sh -c 'while [ ! -f "${setupTriggerPath}" ]; do sleep 0.2; done; echo starting setup; sleep 1; echo loading dependencies; sleep 1; echo setup complete'`,
+          ],
+        },
+      },
+      files: [{ path: "src/index.ts", content: "export const ready = true;\n" }],
+    });
+
+    try {
+      await seedProjectForWorkspaceSetup(client, repo.path);
+      await openHomeWithProject(page, repo.path);
+      await createWorkspaceFromSidebar(page, repo.path);
+
+      await expectSetupPanel(page);
+      await expectSetupStatus(page, "Running");
+      await writeFile(setupTriggerPath, "start\n");
+      await expectSetupLogContains(page, "starting setup");
+      await expectSetupLogContains(page, "loading dependencies");
+      await expectSetupStatus(page, "Completed");
+      await expectSetupLogContains(page, "setup complete");
+
+      await waitForWorkspaceTabsVisible(page);
+      await page.getByTestId("workspace-new-agent-tab").first().click();
+      await expect(page.getByRole("textbox", { name: "Message agent..." }).first()).toBeVisible({
+        timeout: 30_000,
+      });
+
+      const explorerToggle = page.getByTestId("workspace-explorer-toggle").first();
+      if ((await explorerToggle.getAttribute("aria-label")) === "Open explorer") {
+        await explorerToggle.click();
+      }
+      await expect(explorerToggle).toHaveAttribute("aria-label", "Close explorer", {
+        timeout: 30_000,
+      });
+      await page.getByTestId("explorer-tab-files").click();
+      await expect(page.getByTestId("file-explorer-tree-scroll")).toBeVisible({ timeout: 30_000 });
+      await expect(page.getByText("README.md", { exact: true }).first()).toBeVisible({
+        timeout: 30_000,
+      });
+      await expect(page.getByText("src", { exact: true }).first()).toBeVisible({
+        timeout: 30_000,
+      });
+    } finally {
+      await rm(setupTriggerPath, { force: true });
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+
+  test("streams running and completed setup snapshots for a successful setup", async () => {
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("setup-success-", {
+      paseoConfig: {
+        worktree: {
+          setup: ["sh -c 'echo starting setup; sleep 2; echo setup complete'"],
+        },
+      },
+    });
+
+    try {
+      await seedProjectForWorkspaceSetup(client, repo.path);
+      const initialRunning = waitForWorkspaceSetupProgress(
+        client,
+        (payload) => payload.status === "running" && payload.detail.log === "",
+      );
+      const runningWithOutput = waitForWorkspaceSetupProgress(
+        client,
+        (payload) => payload.status === "running" && payload.detail.log.includes("starting setup"),
+      );
+      const completed = waitForWorkspaceSetupProgress(
+        client,
+        (payload) => payload.status === "completed" && payload.detail.log.includes("setup complete"),
+      );
+
+      await createWorkspaceThroughDaemon(client, {
+        cwd: repo.path,
+        worktreeSlug: "workspace-setup-success",
+      });
+
+      const initialPayload = await initialRunning;
+      const runningPayload = await runningWithOutput;
+      const completedPayload = await completed;
+
+      expect(initialPayload.detail.log).toBe("");
+      expect(runningPayload.detail.log).toContain("starting setup");
+      expect(completedPayload.detail.log).toContain("setup complete");
+      expect(completedPayload.error).toBeNull();
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+
+  test("streams a failed setup snapshot when setup fails", async () => {
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("setup-failure-", {
+      paseoConfig: {
+        worktree: {
+          setup: ["sh -c 'echo starting setup; sleep 2; echo setup failed 1>&2; exit 1'"],
+        },
+      },
+    });
+
+    try {
+      await seedProjectForWorkspaceSetup(client, repo.path);
+      const failed = waitForWorkspaceSetupProgress(
+        client,
+        (payload) => payload.status === "failed" && payload.detail.log.includes("setup failed"),
+      );
+
+      await createWorkspaceThroughDaemon(client, {
+        cwd: repo.path,
+        worktreeSlug: "workspace-setup-failure",
+      });
+
+      const failedPayload = await failed;
+      expect(failedPayload.detail.log).toContain("starting setup");
+      expect(failedPayload.detail.log).toContain("setup failed");
+      expect(failedPayload.error).toMatch(/failed/i);
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+
+  test("emits a completed empty snapshot when no setup commands exist", async () => {
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("setup-none-");
+
+    try {
+      await seedProjectForWorkspaceSetup(client, repo.path);
+      const completed = waitForWorkspaceSetupProgress(
+        client,
+        (payload) =>
+          payload.status === "completed" &&
+          payload.detail.commands.length === 0 &&
+          payload.detail.log === "",
+      );
+
+      await createWorkspaceThroughDaemon(client, {
+        cwd: repo.path,
+        worktreeSlug: "workspace-setup-none",
+      });
+
+      const completedPayload = await completed;
+      expect(completedPayload.error).toBeNull();
+      expect(completedPayload.detail.commands).toEqual([]);
+      expect(completedPayload.detail.log).toBe("");
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+
+  test("launches service terminals after setup completes", async ({ page }) => {
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("setup-svc-ui-", {
+      paseoConfig: {
+        worktree: {
+          setup: ["sh -c 'echo bootstrapping; sleep 1; echo setup complete'"],
+        },
+        services: {
+          web: {
+            command:
+              "node -e \"const http = require('http'); const s = http.createServer((q,r) => r.end('ok')); s.listen(process.env.PORT || 3000, () => console.log('listening on ' + s.address().port))\"",
+          },
+        },
+      },
+    });
+
+    try {
+      await seedProjectForWorkspaceSetup(client, repo.path);
+      await openHomeWithProject(page, repo.path);
+      await createWorkspaceFromSidebar(page, repo.path);
+
+      await expectSetupPanel(page);
+      await expectSetupStatus(page, "Completed");
+
+      await waitForWorkspaceTabsVisible(page);
+
+      // Wait for the service terminal tab to appear in the tabs bar
+      const terminalTab = page.locator('[data-testid^="workspace-tab-terminal_"]', {
+        hasText: "web",
+      });
+      await expect(terminalTab).toBeVisible({ timeout: 30_000 });
+
+      // Click the service terminal tab
+      await terminalTab.click();
+
+      // Verify the terminal surface rendered
+      await expect(page.getByTestId("terminal-surface").first()).toBeVisible({ timeout: 10_000 });
+
+      // Verify the terminal output contains "listening on" (xterm renders text in .xterm-rows)
+      await expect(page.locator(".xterm-rows").first()).toContainText("listening on", {
+        timeout: 30_000,
+      });
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+
+  test("launches workspace services after setup completes", async () => {
+    const client = await connectWorkspaceSetupClient();
+    const repo = await createTempGitRepo("setup-services-", {
+      paseoConfig: {
+        worktree: {
+          setup: ["sh -c 'echo bootstrapping; sleep 1; echo setup complete'"],
+        },
+        services: {
+          editor: {
+            command: "npm run dev",
+          },
+        },
+      },
+    });
+
+    try {
+      await seedProjectForWorkspaceSetup(client, repo.path);
+      const completed = waitForWorkspaceSetupProgress(
+        client,
+        (payload) => payload.status === "completed" && payload.detail.log.includes("setup complete"),
+      );
+
+      const workspace = await createWorkspaceThroughDaemon(client, {
+        cwd: repo.path,
+        worktreeSlug: "workspace-setup-services",
+      });
+
+      await completed;
+
+      await expect
+        .poll(async () => {
+          const terminals = await client.listTerminals(workspace.id);
+          return terminals.terminals.find((terminal) => terminal.name === "editor") ?? null;
+        })
+        .toMatchObject({
+          id: expect.any(String),
+          name: "editor",
+        });
+    } finally {
+      await client.close();
+      await repo.cleanup();
+    }
+  });
+});
@@ -1,7 +1,7 @@
 {
  "name": "@getpaseo/app",
  "main": "index.ts",
-  "version": "0.1.37",
+  "version": "0.1.38",
  "private": true,
  "scripts": {
    "start": "expo start",
@@ -31,9 +31,9 @@
    "@dnd-kit/utilities": "^3.2.2",
    "@expo/vector-icons": "^15.0.2",
    "@floating-ui/react-native": "^0.10.7",
-    "@getpaseo/expo-two-way-audio": "0.1.37",
-    "@getpaseo/highlight": "0.1.37",
-    "@getpaseo/server": "0.1.37",
+    "@getpaseo/expo-two-way-audio": "0.1.38",
+    "@getpaseo/highlight": "0.1.38",
+    "@getpaseo/server": "0.1.38",
    "@gorhom/bottom-sheet": "^5.2.6",
    "@gorhom/portal": "^1.0.14",
    "@react-native-async-storage/async-storage": "2.2.0",
@@ -111,6 +111,7 @@
    "eas-cli": "^16.24.1",
    "eslint": "^9.25.0",
    "eslint-config-expo": "~10.0.0",
+    "material-icon-theme": "^5.32.0",
    "playwright": "^1.56.1",
    "typescript": "~5.9.2",
    "vitest": "^3.2.4",
@@ -15,7 +15,7 @@ import { PortalProvider } from "@gorhom/portal";
 import { VoiceProvider } from "@/contexts/voice-context";
 import { useAppSettings } from "@/hooks/use-settings";
 import { useFaviconStatus } from "@/hooks/use-favicon-status";
-import { View, ActivityIndicator, Text } from "react-native";
+import { View, Text } from "react-native";
 import { UnistylesRuntime, useUnistyles } from "react-native-unistyles";
 import { darkTheme } from "@/styles/theme";
 import { QueryClientProvider } from "@tanstack/react-query";
@@ -26,13 +26,13 @@ import {
  useHostRuntimeClient,
 } from "@/runtime/host-runtime";
 import { shouldUseDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
-import { StartupSplashScreen } from "@/screens/startup-splash-screen";
 import { loadSettingsFromStorage } from "@/hooks/use-settings";
 import { useColorScheme } from "@/hooks/use-color-scheme";
 import { SessionProvider } from "@/contexts/session-context";
 import type { HostProfile } from "@/types/host-connection";
 import {
  createContext,
+  useCallback,
  useContext,
  useState,
  useEffect,
@@ -81,7 +81,18 @@ import {
 import { syncNavigationActiveWorkspace } from "@/stores/navigation-active-workspace-store";

 polyfillCrypto();
-const HostRuntimeBootstrapContext = createContext(false);
+
+export type HostRuntimeBootstrapState = {
+  phase: "starting-daemon" | "connecting" | "online" | "error";
+  error: string | null;
+  retry: () => void;
+};
+
+const HostRuntimeBootstrapContext = createContext<HostRuntimeBootstrapState>({
+  phase: "starting-daemon",
+  error: null,
+  retry: () => {},
+});

 function PushNotificationRouter() {
  const router = useRouter();
@@ -209,49 +220,99 @@ function HostSessionManager() {
 }

 function HostRuntimeBootstrapProvider({ children }: { children: ReactNode }) {
-  const [ready, setReady] = useState(false);
+  const [phase, setPhase] = useState<HostRuntimeBootstrapState["phase"]>("starting-daemon");
+  const [error, setError] = useState<string | null>(null);
+  const [retryToken, setRetryToken] = useState(0);
+  const retry = useCallback(() => {
+    setPhase("starting-daemon");
+    setError(null);
+    setRetryToken((current) => current + 1);
+  }, []);

  useEffect(() => {
    let cancelled = false;
+    const shouldManageDesktop = shouldUseDesktopDaemon();
    const store = getHostRuntimeStore();

    const init = async () => {
      const settings = await loadSettingsFromStorage();
-      const isDesktopManaged = shouldUseDesktopDaemon() && settings.manageBuiltInDaemon;
+      const isDesktopManaged = shouldManageDesktop && settings.manageBuiltInDaemon;
      await store.loadFromStorage();
      if (isDesktopManaged) {
-        await store.bootstrap({ manageBuiltInDaemon: true });
+        setPhase("starting-daemon");
+        setError(null);
+        const bootstrapResult = await store.bootstrapDesktop();
+        if (!bootstrapResult.ok) {
+          if (!cancelled) {
+            setPhase("error");
+            setError(bootstrapResult.error);
+          }
+          return;
+        }
+
+        if (cancelled) {
+          return;
+        }
+
+        setPhase("connecting");
+        await store.addConnectionFromListenAndWaitForOnline({
+          listenAddress: bootstrapResult.listenAddress,
+          serverId: bootstrapResult.serverId,
+          hostname: bootstrapResult.hostname,
+        });
+        if (!cancelled) {
+          setPhase("online");
+          setError(null);
+        }
      } else {
        void store.bootstrap({ manageBuiltInDaemon: settings.manageBuiltInDaemon });
+        if (!cancelled) {
+          setPhase("online");
+          setError(null);
+        }
      }
    };

-    void init()
-      .then(() => {
-        if (!cancelled) {
-          setReady(true);
-        }
-      })
-      .catch((error) => {
-        console.error("[HostRuntime] Failed to initialize store", error);
-        if (!cancelled) {
-          setReady(true);
-        }
-      });
+    void init().catch((bootstrapError) => {
+      console.error("[HostRuntime] Failed to initialize store", bootstrapError);
+      if (cancelled) {
+        return;
+      }
+      if (shouldManageDesktop) {
+        setPhase("error");
+        setError(bootstrapError instanceof Error ? bootstrapError.message : String(bootstrapError));
+        return;
+      }
+      setPhase("online");
+      setError(null);
+    });

    return () => {
      cancelled = true;
    };
-  }, []);
+  }, [retryToken]);
+
+  const state = useMemo<HostRuntimeBootstrapState>(
+    () => ({
+      phase,
+      error,
+      retry,
+    }),
+    [error, phase, retry],
+  );

  return (
-    <HostRuntimeBootstrapContext.Provider value={ready}>
+    <HostRuntimeBootstrapContext.Provider value={state}>
      {children}
    </HostRuntimeBootstrapContext.Provider>
  );
 }

-function useStoreReady(): boolean {
+export function useStoreReady(): boolean {
+  return useContext(HostRuntimeBootstrapContext).phase === "online";
+}
+
+export function useHostRuntimeBootstrapState(): HostRuntimeBootstrapState {
  return useContext(HostRuntimeBootstrapContext);
 }

@@ -412,38 +473,30 @@ function MobileGestureWrapper({

 function ProvidersWrapper({ children }: { children: ReactNode }) {
  const { settings, isLoading: settingsLoading } = useAppSettings();
-  const storeReady = useStoreReady();
  const { upsertConnectionFromOfferUrl } = useHostMutations();
  const systemColorScheme = useColorScheme();
-  const isLoading = settingsLoading || !storeReady;
  const resolvedTheme = settings.theme === "auto" ? (systemColorScheme ?? "light") : settings.theme;

  // Apply theme setting on mount and when it changes
  useEffect(() => {
-    if (isLoading) return;
+    if (settingsLoading) return;
    if (settings.theme === "auto") {
      UnistylesRuntime.setAdaptiveThemes(true);
    } else {
      UnistylesRuntime.setAdaptiveThemes(false);
      UnistylesRuntime.setTheme(settings.theme);
    }
-  }, [isLoading, settings.theme]);
+  }, [settingsLoading, settings.theme]);

  useEffect(() => {
-    if (isLoading || Platform.OS !== "web") {
+    if (settingsLoading || Platform.OS !== "web") {
      return;
    }

    void setDesktopTitleBarTheme(resolvedTheme).catch((error) => {
      console.warn("[DesktopWindow] Failed to update title bar theme", error);
    });
-  }, [isLoading, resolvedTheme]);
-
-  if (isLoading) {
-    const isDesktopManaged =
-      !settingsLoading && shouldUseDesktopDaemon() && settings.manageBuiltInDaemon;
-    return isDesktopManaged ? <StartupSplashScreen /> : <LoadingView />;
-  }
+  }, [settingsLoading, resolvedTheme]);

  return (
    <VoiceProvider>
@@ -546,6 +599,38 @@ function FaviconStatusSync() {
  return null;
 }

+function RootStack() {
+  const storeReady = useStoreReady();
+
+  return (
+    <Stack
+      screenOptions={{
+        headerShown: false,
+        animation: "none",
+        contentStyle: {
+          backgroundColor: darkTheme.colors.surface0,
+        },
+      }}
+    >
+      <Stack.Protected guard={storeReady}>
+        <Stack.Screen name="welcome" />
+        <Stack.Screen name="settings" />
+        <Stack.Screen name="h/[serverId]/workspace/[workspaceId]" />
+        <Stack.Screen
+          name="h/[serverId]/agent/[agentId]"
+          options={{ gestureEnabled: false }}
+        />
+        <Stack.Screen name="h/[serverId]/index" />
+        <Stack.Screen name="h/[serverId]/sessions" />
+        <Stack.Screen name="h/[serverId]/open-project" />
+        <Stack.Screen name="h/[serverId]/settings" />
+        <Stack.Screen name="pair-scan" />
+      </Stack.Protected>
+      <Stack.Screen name="index" />
+    </Stack>
+  );
+}
+
 function NavigationActiveWorkspaceObserver() {
  const navigationRef = useNavigationContainerRef();

@@ -566,57 +651,6 @@ function NavigationActiveWorkspaceObserver() {
  return null;
 }

-function LoadingView({ message }: { message?: string } = {}) {
-  return (
-    <View
-      style={{
-        flex: 1,
-        justifyContent: "center",
-        alignItems: "center",
-        backgroundColor: darkTheme.colors.surface0,
-      }}
-    >
-      <ActivityIndicator size="large" color={darkTheme.colors.foreground} />
-      {message ? (
-        <Text
-          style={{
-            color: darkTheme.colors.foregroundMuted,
-            marginTop: 16,
-            fontSize: 14,
-          }}
-        >
-          {message}
-        </Text>
-      ) : null}
-    </View>
-  );
-}
-
-function MissingDaemonView() {
-  return (
-    <View
-      style={{
-        flex: 1,
-        justifyContent: "center",
-        alignItems: "center",
-        padding: 24,
-        backgroundColor: darkTheme.colors.surface0,
-      }}
-    >
-      <ActivityIndicator size="small" color={darkTheme.colors.foreground} />
-      <Text
-        style={{
-          color: darkTheme.colors.foreground,
-          marginTop: 16,
-          textAlign: "center",
-        }}
-      >
-        No host configured. Open Settings to add a server URL.
-      </Text>
-    </View>
-  );
-}
-
 export default function RootLayout() {
  return (
    <GestureHandlerRootView style={{ flex: 1, backgroundColor: darkTheme.colors.surface0 }}>
@@ -633,28 +667,7 @@ export default function RootLayout() {
                      <HorizontalScrollProvider>
                        <ToastProvider>
                          <AppWithSidebar>
-                            <Stack
-                              screenOptions={{
-                                headerShown: false,
-                                animation: "none",
-                                contentStyle: {
-                                  backgroundColor: darkTheme.colors.surface0,
-                                },
-                              }}
-                            >
-                              <Stack.Screen name="index" />
-                              <Stack.Screen name="settings" />
-                              <Stack.Screen name="h/[serverId]/workspace/[workspaceId]" />
-                              <Stack.Screen
-                                name="h/[serverId]/agent/[agentId]"
-                                options={{ gestureEnabled: false }}
-                              />
-                              <Stack.Screen name="h/[serverId]/index" />
-                              <Stack.Screen name="h/[serverId]/sessions" />
-                              <Stack.Screen name="h/[serverId]/open-project" />
-                              <Stack.Screen name="h/[serverId]/settings" />
-                              <Stack.Screen name="pair-scan" />
-                            </Stack>
+                            <RootStack />
                          </AppWithSidebar>
                        </ToastProvider>
                      </HorizontalScrollProvider>
@@ -31,6 +31,9 @@ function getOpenIntentTarget(openIntent: WorkspaceOpenIntent): WorkspaceTabTarge
  if (openIntent.kind === "file") {
    return { kind: "file", path: openIntent.path };
  }
+  if (openIntent.kind === "setup") {
+    return { kind: "setup", workspaceId: openIntent.workspaceId };
+  }
  return { kind: "draft", draftId: openIntent.draftId };
 }

@@ -1,18 +1,65 @@
-import { useEffect } from "react";
+import { useEffect, useSyncExternalStore } from "react";
 import { usePathname, useRouter } from "expo-router";
+import { StartupSplashScreen } from "@/screens/startup-splash-screen";
+import {
+  useHostRuntimeBootstrapState,
+  useStoreReady,
+} from "@/app/_layout";
+import {
+  getHostRuntimeStore,
+  isHostRuntimeConnected,
+  useHosts,
+} from "@/runtime/host-runtime";
+import { buildHostRootRoute } from "@/utils/host-routes";

 const WELCOME_ROUTE = "/welcome";

+function useAnyOnlineHostServerId(serverIds: string[]): string | null {
+  const runtime = getHostRuntimeStore();
+
+  return useSyncExternalStore(
+    (onStoreChange) => runtime.subscribeAll(onStoreChange),
+    () => {
+      let firstOnlineServerId: string | null = null;
+      let firstOnlineAt: string | null = null;
+      for (const serverId of serverIds) {
+        const snapshot = runtime.getSnapshot(serverId);
+        const lastOnlineAt = snapshot?.lastOnlineAt ?? null;
+        if (!isHostRuntimeConnected(snapshot) || !lastOnlineAt) {
+          continue;
+        }
+        if (!firstOnlineAt || lastOnlineAt < firstOnlineAt) {
+          firstOnlineAt = lastOnlineAt;
+          firstOnlineServerId = serverId;
+        }
+      }
+      return firstOnlineServerId;
+    },
+    () => null,
+  );
+}
+
 export default function Index() {
  const router = useRouter();
  const pathname = usePathname();
+  const bootstrapState = useHostRuntimeBootstrapState();
+  const storeReady = useStoreReady();
+  const hosts = useHosts();
+  const anyOnlineServerId = useAnyOnlineHostServerId(hosts.map((host) => host.serverId));

  useEffect(() => {
+    if (!storeReady) {
+      return;
+    }
    if (pathname !== "/" && pathname !== "") {
      return;
    }
-    router.replace(WELCOME_ROUTE as any);
-  }, [pathname, router]);

-  return null;
+    const targetRoute = anyOnlineServerId
+      ? buildHostRootRoute(anyOnlineServerId)
+      : WELCOME_ROUTE;
+    router.replace(targetRoute as any);
+  }, [anyOnlineServerId, pathname, router, storeReady]);
+
+  return <StartupSplashScreen bootstrapState={bootstrapState} />;
 }
@@ -8,6 +8,7 @@ import { getProviderIcon } from "@/components/provider-icons";
 import { CombinedModelSelector } from "@/components/combined-model-selector";
 import { useQuery } from "@tanstack/react-query";
 import { useSessionStore } from "@/stores/session-store";
+import { mergeProviderPreferences, useFormPreferences } from "@/hooks/use-form-preferences";
 import {
  DropdownMenu,
  DropdownMenuContent,
@@ -609,6 +610,7 @@ function ControlledStatusBar({
 const EMPTY_MODES: AgentMode[] = [];

 export function AgentStatusBar({ agentId, serverId }: AgentStatusBarProps) {
+  const { preferences, updatePreferences } = useFormPreferences();
  const agent = useSessionStore(
    useShallow((state) => {
      const currentAgent = state.sessions[serverId]?.agents?.get(agentId) ?? null;
@@ -709,6 +711,17 @@ export function AgentStatusBar({ agentId, serverId }: AgentStatusBarProps) {
        if (!client) {
          return;
        }
+        void updatePreferences(
+          mergeProviderPreferences({
+            preferences,
+            provider: agent.provider,
+            updates: {
+              model: modelId,
+            },
+          }),
+        ).catch((error) => {
+          console.warn("[AgentStatusBar] persist model preference failed", error);
+        });
        void client.setAgentModel(agentId, modelId).catch((error) => {
          console.warn("[AgentStatusBar] setAgentModel failed", error);
        });
@@ -719,6 +732,23 @@ export function AgentStatusBar({ agentId, serverId }: AgentStatusBarProps) {
        if (!client) {
          return;
        }
+        const activeModelId = modelSelection.activeModelId;
+        if (activeModelId) {
+          void updatePreferences(
+            mergeProviderPreferences({
+              preferences,
+              provider: agent.provider,
+              updates: {
+                model: activeModelId,
+                thinkingByModel: {
+                  [activeModelId]: thinkingOptionId,
+                },
+              },
+            }),
+          ).catch((error) => {
+            console.warn("[AgentStatusBar] persist thinking preference failed", error);
+          });
+        }
        void client.setAgentThinkingOption(agentId, thinkingOptionId).catch((error) => {
          console.warn("[AgentStatusBar] setAgentThinkingOption failed", error);
        });
@@ -17,6 +17,7 @@ import { HEADER_INNER_HEIGHT } from "@/constants/layout";
 import { GitDiffPane } from "./git-diff-pane";
 import { FileExplorerPane } from "./file-explorer-pane";
 import { useKeyboardShiftStyle } from "@/hooks/use-keyboard-shift-style";
+import { useWindowControlsPadding } from "@/utils/desktop-window";

 const MIN_CHAT_WIDTH = 400;
 function logExplorerSidebar(_event: string, _details: Record<string, unknown>): void {}
@@ -336,12 +337,13 @@ function SidebarContent({
  onOpenFile,
 }: SidebarContentProps) {
  const { theme } = useUnistyles();
+  const padding = useWindowControlsPadding("explorerSidebar");
  const resolvedTab: ExplorerTab = !isGit && activeTab === "changes" ? "files" : activeTab;

  return (
    <View style={styles.sidebarContent} pointerEvents="auto">
      {/* Header with tabs and close button */}
-      <View style={styles.header} testID="explorer-header">
+      <View style={[styles.header, { paddingRight: padding.right }]} testID="explorer-header">
        <View style={styles.tabsContainer}>
          {isGit && (
            <Pressable
@@ -26,18 +26,17 @@ import Animated, {
 import { WORKSPACE_SECONDARY_HEADER_HEIGHT } from "@/constants/layout";
 import { Fonts } from "@/constants/theme";
 import * as Clipboard from "expo-clipboard";
+import { SvgXml } from "react-native-svg";
 import {
+  ChevronDown,
+  ChevronRight,
  Copy,
  Download,
-  File,
-  FileText,
-  Folder,
-  FolderOpen,
-  Image as ImageIcon,
  MoreVertical,
  RotateCw,
  X,
 } from "lucide-react-native";
+import { getFileIconSvg } from "@/components/material-file-icons";
 import type { AgentFileExplorerState, ExplorerEntry } from "@/stores/session-store";
 import { useHosts } from "@/runtime/host-runtime";
 import { useSessionStore } from "@/stores/session-store";
@@ -65,7 +64,7 @@ const SORT_OPTIONS: { value: SortOption; label: string }[] = [
  { value: "size", label: "Size" },
 ];

-const INDENT_PER_LEVEL = 12;
+const INDENT_PER_LEVEL = 16;

 function formatFileSize({ size }: { size: number }): string {
  if (size < 1024) {
@@ -384,7 +383,6 @@ export function FileExplorerPane({
    ({ item }: ListRenderItemInfo<TreeRow>) => {
      const entry = item.entry;
      const depth = item.depth;
-      const displayKind = getEntryDisplayKind(entry);
      const isDirectory = entry.kind === "directory";
      const isExpanded = isDirectory && expandedPaths.has(entry.path);
      const isSelected = selectedEntryPath === entry.path;
@@ -399,16 +397,30 @@ export function FileExplorerPane({
            (hovered || pressed || isSelected) && styles.entryRowActive,
          ]}
        >
+          {depth > 0 &&
+            Array.from({ length: depth }, (_, i) => (
+              <View
+                key={i}
+                style={[
+                  styles.indentGuide,
+                  {
+                    left: theme.spacing[3] + i * INDENT_PER_LEVEL + 4,
+                  },
+                ]}
+              />
+            ))}
          <View style={styles.entryInfo}>
            <View style={styles.entryIcon}>
-              {loading ? (
-                <ActivityIndicator size="small" />
+              {isDirectory ? (
+                loading ? (
+                  <ActivityIndicator size="small" />
+                ) : (
+                  <View style={[styles.chevron, isExpanded && styles.chevronExpanded]}>
+                    <ChevronRight size={16} color={theme.colors.foregroundMuted} />
+                  </View>
+                )
              ) : (
-                renderEntryIcon(isDirectory ? "directory" : displayKind, {
-                  foreground: theme.colors.foregroundMuted,
-                  primary: theme.colors.primary,
-                  directoryOpen: isExpanded,
-                })
+                <SvgXml xml={getFileIconSvg(entry.name)} width={16} height={16} />
              )}
            </View>
            <Text style={styles.entryName} numberOfLines={1}>
@@ -552,27 +564,31 @@ export function FileExplorerPane({
      ) : (
        <View style={[styles.treePane, styles.treePaneFill]}>
          <View style={styles.paneHeader} testID="files-pane-header">
-            <View style={styles.paneHeaderLeft} />
-            <View style={styles.paneHeaderRight}>
-              <Pressable
-                onPress={handleRefresh}
-                disabled={isRefreshFetching}
-                hitSlop={8}
-                style={({ hovered, pressed }) => [
-                  styles.iconButton,
-                  (hovered || pressed) && styles.iconButtonHovered,
-                ]}
-                accessibilityRole="button"
-                accessibilityLabel="Refresh files"
-              >
-                <Animated.View style={[styles.refreshIcon, refreshIconAnimatedStyle]}>
-                  <RotateCw size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
-                </Animated.View>
-              </Pressable>
-              <Pressable style={styles.sortButton} onPress={handleSortCycle}>
-                <Text style={styles.sortButtonText}>{currentSortLabel}</Text>
-              </Pressable>
-            </View>
+            <Pressable
+              onPress={handleSortCycle}
+              style={({ hovered, pressed }) => [
+                styles.sortTrigger,
+                (hovered || pressed) && styles.sortTriggerHovered,
+              ]}
+            >
+              <Text style={styles.sortTriggerText}>{currentSortLabel}</Text>
+              <ChevronDown size={12} color={theme.colors.foregroundMuted} />
+            </Pressable>
+            <Pressable
+              onPress={handleRefresh}
+              disabled={isRefreshFetching}
+              hitSlop={8}
+              style={({ hovered, pressed }) => [
+                styles.iconButton,
+                (hovered || pressed) && styles.iconButtonHovered,
+              ]}
+              accessibilityRole="button"
+              accessibilityLabel="Refresh files"
+            >
+              <Animated.View style={[styles.refreshIcon, refreshIconAnimatedStyle]}>
+                <RotateCw size={theme.iconSize.sm} color={theme.colors.foregroundMuted} />
+              </Animated.View>
+            </Pressable>
          </View>
          <FlatList
            ref={treeListRef}
@@ -609,99 +625,6 @@ export function FileExplorerPane({
  );
 }

-type EntryDisplayKind = "directory" | "image" | "text" | "other";
-
-const IMAGE_EXTENSIONS = new Set(["png", "jpg", "jpeg", "gif", "bmp", "svg", "webp", "ico"]);
-
-const TEXT_EXTENSIONS = new Set([
-  "txt",
-  "md",
-  "markdown",
-  "ts",
-  "tsx",
-  "js",
-  "jsx",
-  "json",
-  "yml",
-  "yaml",
-  "toml",
-  "py",
-  "rb",
-  "go",
-  "rs",
-  "java",
-  "kt",
-  "c",
-  "cpp",
-  "cc",
-  "h",
-  "hpp",
-  "cs",
-  "swift",
-  "php",
-  "html",
-  "css",
-  "scss",
-  "less",
-  "xml",
-  "sh",
-  "bash",
-  "zsh",
-  "ini",
-  "cfg",
-  "conf",
-]);
-
-function renderEntryIcon(
-  kind: EntryDisplayKind,
-  colors: { foreground: string; primary: string; directoryOpen?: boolean },
-) {
-  const color = colors.foreground;
-  switch (kind) {
-    case "directory":
-      return colors.directoryOpen ? (
-        <FolderOpen size={18} color={colors.primary} />
-      ) : (
-        <Folder size={18} color={colors.primary} />
-      );
-    case "image":
-      return <ImageIcon size={18} color={color} />;
-    case "text":
-      return <FileText size={18} color={color} />;
-    default:
-      return <File size={18} color={color} />;
-  }
-}
-
-function getEntryDisplayKind(entry: ExplorerEntry): EntryDisplayKind {
-  if (entry.kind === "directory") {
-    return "directory";
-  }
-
-  const extension = getExtension(entry.name);
-  if (extension === null) {
-    return "other";
-  }
-
-  if (IMAGE_EXTENSIONS.has(extension)) {
-    return "image";
-  }
-
-  if (TEXT_EXTENSIONS.has(extension)) {
-    return "text";
-  }
-
-  return "other";
-}
-
-function getExtension(name: string): string | null {
-  const index = name.lastIndexOf(".");
-  if (index === -1 || index === name.length - 1) {
-    return null;
-  }
-  return name.slice(index + 1).toLowerCase();
-}
-
 function sortEntries(entries: ExplorerEntry[], sortOption: SortOption): ExplorerEntry[] {
  const sorted = [...entries];
  sorted.sort((a, b) => {
@@ -842,50 +765,38 @@ const styles = StyleSheet.create((theme) => ({
    minWidth: 0,
  },
  paneHeader: {
+    height: WORKSPACE_SECONDARY_HEADER_HEIGHT,
    flexDirection: "row",
    alignItems: "center",
    justifyContent: "space-between",
-    height: WORKSPACE_SECONDARY_HEADER_HEIGHT,
-    paddingHorizontal: theme.spacing[3],
+    paddingRight: theme.spacing[3],
    borderBottomWidth: 1,
    borderBottomColor: theme.colors.border,
-    backgroundColor: theme.colors.surfaceSidebar,
  },
-  paneHeaderLeft: {
-    flex: 1,
-    minWidth: 0,
-  },
-  paneHeaderRight: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    flexShrink: 0,
-  },
-  previewHeaderRight: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    flexShrink: 0,
-  },
-  sortButton: {
-    height: 28,
+  sortTrigger: {
    flexDirection: "row",
    alignItems: "center",
    justifyContent: "center",
-    paddingHorizontal: theme.spacing[2],
-    borderRadius: theme.borderRadius.md,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
+    gap: theme.spacing[1],
+    marginLeft: theme.spacing[3] - theme.spacing[1],
+    paddingHorizontal: theme.spacing[1],
+    height: 24,
+    borderRadius: theme.borderRadius.base,
  },
-  sortButtonText: {
-    color: theme.colors.foregroundMuted,
+  sortTriggerHovered: {
+    backgroundColor: theme.colors.surface2,
+  },
+  sortTriggerText: {
    fontSize: theme.fontSize.xs,
+    color: theme.colors.foregroundMuted,
  },
  treeList: {
    flex: 1,
    minHeight: 0,
  },
  entriesContent: {
+    paddingHorizontal: theme.spacing[2],
+    paddingTop: theme.spacing[2],
    paddingBottom: theme.spacing[4],
  },
  centerState: {
@@ -936,8 +847,16 @@ const styles = StyleSheet.create((theme) => ({
    justifyContent: "space-between",
    paddingVertical: 2,
    paddingRight: theme.spacing[2],
+    borderRadius: theme.borderRadius.md,
  },
  entryRowActive: {
+    backgroundColor: theme.colors.surface1,
+  },
+  indentGuide: {
+    position: "absolute",
+    top: 0,
+    bottom: 0,
+    width: 1,
    backgroundColor: theme.colors.surface2,
  },
  entryInfo: {
@@ -947,6 +866,16 @@ const styles = StyleSheet.create((theme) => ({
    gap: theme.spacing[2],
    minWidth: 0,
  },
+  chevron: {
+    width: 16,
+    height: 16,
+    alignItems: "center",
+    justifyContent: "center",
+    flexShrink: 0,
+  },
+  chevronExpanded: {
+    transform: [{ rotate: "90deg" }],
+  },
  entryIcon: {
    flexShrink: 0,
  },
@@ -10,6 +10,7 @@ import { getShortcutOs } from "@/utils/shortcut-platform";
 interface MenuHeaderProps {
  title?: string;
  rightContent?: ReactNode;
+  borderless?: boolean;
 }

 interface SidebarMenuToggleProps {
@@ -75,7 +76,7 @@ export function SidebarMenuToggle({
  );
 }

-export function MenuHeader({ title, rightContent }: MenuHeaderProps) {
+export function MenuHeader({ title, rightContent, borderless }: MenuHeaderProps) {
  return (
    <ScreenHeader
      left={
@@ -90,6 +91,7 @@ export function MenuHeader({ title, rightContent }: MenuHeaderProps) {
      }
      right={rightContent}
      leftStyle={styles.left}
+      borderless={borderless}
    />
  );
 }
@@ -7,33 +7,28 @@ import {
  HEADER_INNER_HEIGHT_MOBILE,
  HEADER_TOP_PADDING_MOBILE,
 } from "@/constants/layout";
-import { useDesktopDragHandlers, useTrafficLightPadding } from "@/utils/desktop-window";
-import { usePanelStore } from "@/stores/panel-store";
+import { useDesktopDragHandlers, useWindowControlsPadding } from "@/utils/desktop-window";

 interface ScreenHeaderProps {
  left?: ReactNode;
  right?: ReactNode;
  leftStyle?: StyleProp<ViewStyle>;
  rightStyle?: StyleProp<ViewStyle>;
+  borderless?: boolean;
 }

 /**
 * Shared frame for the home/back headers so we only maintain padding, border,
 * and safe-area logic in one place.
 */
-export function ScreenHeader({ left, right, leftStyle, rightStyle }: ScreenHeaderProps) {
+export function ScreenHeader({ left, right, leftStyle, rightStyle, borderless }: ScreenHeaderProps) {
  const { theme } = useUnistyles();
  const insets = useSafeAreaInsets();
  const isMobile = UnistylesRuntime.breakpoint === "xs" || UnistylesRuntime.breakpoint === "sm";
-  const desktopAgentListOpen = usePanelStore((state) => state.desktop.agentListOpen);
-  const trafficLightPadding = useTrafficLightPadding();
+  const padding = useWindowControlsPadding("header");
  // Only add extra padding on mobile for better touch targets; on desktop, only use safe area insets
  const topPadding = isMobile ? HEADER_TOP_PADDING_MOBILE : 0;
  const baseHorizontalPadding = theme.spacing[2];
-  const collapsedSidebarInset =
-    !isMobile && !desktopAgentListOpen && trafficLightPadding.side
-      ? trafficLightPadding
-      : { left: 0, right: 0 };

  const dragHandlers = useDesktopDragHandlers();

@@ -44,9 +39,10 @@ export function ScreenHeader({ left, right, leftStyle, rightStyle }: ScreenHeade
          style={[
            styles.row,
            {
-              paddingLeft: baseHorizontalPadding + collapsedSidebarInset.left,
-              paddingRight: baseHorizontalPadding + collapsedSidebarInset.right,
+              paddingLeft: baseHorizontalPadding + padding.left,
+              paddingRight: baseHorizontalPadding + padding.right,
            },
+            borderless && styles.borderless,
          ]}
          {...dragHandlers}
        >
@@ -87,4 +83,7 @@ const styles = StyleSheet.create((theme) => ({
    alignItems: "center",
    gap: theme.spacing[2],
  },
+  borderless: {
+    borderBottomColor: "transparent",
+  },
 }));
@@ -35,7 +35,7 @@ import {
  type SidebarProjectEntry,
 } from "@/hooks/use-sidebar-workspaces-list";
 import { useSidebarAnimation } from "@/contexts/sidebar-animation-context";
-import { useDesktopDragHandlers, useTrafficLightPadding } from "@/utils/desktop-window";
+import { useDesktopDragHandlers, useWindowControlsPadding } from "@/utils/desktop-window";
 import { Combobox } from "@/components/ui/combobox";
 import { getHostRuntimeStore, useHosts } from "@/runtime/host-runtime";
 import { formatConnectionStatus } from "@/utils/daemons";
@@ -520,6 +520,7 @@ function MobileSidebar({
                isRefreshing={isManualRefresh && isRevalidating}
                onRefresh={handleRefresh}
                onWorkspacePress={closeToAgent}
+                onAddProject={handleOpenProject}
                parentGestureRef={closeGestureRef}
              />
            )}
@@ -631,7 +632,7 @@ function DesktopSidebar({
 }: DesktopSidebarProps) {
  const newAgentKeys = useShortcutKeys("new-agent");
  const dragHandlers = useDesktopDragHandlers();
-  const trafficLightPadding = useTrafficLightPadding();
+  const padding = useWindowControlsPadding("sidebar");
  const sidebarWidth = usePanelStore((state) => state.sidebarWidth);
  const setSidebarWidth = usePanelStore((state) => state.setSidebarWidth);
  const { width: viewportWidth } = useWindowDimensions();
@@ -681,9 +682,7 @@ function DesktopSidebar({

  return (
    <Animated.View style={[styles.desktopSidebar, resizeAnimatedStyle]}>
-      {trafficLightPadding.side === 'left' ? (
-        <View style={{ height: trafficLightPadding.top }} {...dragHandlers} />
-      ) : null}
+      {padding.top > 0 ? <View style={{ height: padding.top }} {...dragHandlers} /> : null}
      <View style={styles.sidebarHeader} {...dragHandlers}>
        <View style={styles.sidebarHeaderRow}>
          <SessionsButton onPress={handleViewMore} />
@@ -701,6 +700,7 @@ function DesktopSidebar({
          projects={projects}
          isRefreshing={isManualRefresh && isRevalidating}
          onRefresh={handleRefresh}
+          onAddProject={handleOpenProject}
        />
      )}

@@ -809,7 +809,6 @@ const styles = StyleSheet.create((theme) => ({
  sidebarContent: {
    flex: 1,
    minHeight: 0,
-    overflow: "hidden",
  },
  desktopSidebar: {
    position: "relative",
@@ -0,0 +1,141 @@
+// Auto-generated from material-icon-theme. Do not edit manually.
+
+const SVG_ICONS: Record<string, string> = {
+  "_default": `<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="m8.668 6h3.6641l-3.6641-3.668v3.668m-4.668-4.668h5.332l4 4v8c0 0.73828-0.59375 1.3359-1.332 1.3359h-8c-0.73828 0-1.332-0.59766-1.332-1.3359v-10.664c0-0.74219 0.59375-1.3359 1.332-1.3359m3.332 1.3359h-3.332v10.664h8v-6h-4.668z" fill="#90a4ae" /></svg>`,
+  "astro": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#7c4dff" d="M12.106 25.849c-1.262-1.156-1.63-3.586-1.105-5.346a5.18 5.18 0 0 0 3.484 1.66 9.68 9.68 0 0 0 5.882-.734c.215-.106.413-.247.648-.39a3.5 3.5 0 0 1 .16 1.555 4.26 4.26 0 0 1-1.798 3.021c-.404.3-.832.569-1.25.852a2.613 2.613 0 0 0-1.15 3.372l.048.161a3.4 3.4 0 0 1-1.5-1.285 3.6 3.6 0 0 1-.578-1.962 9 9 0 0 0-.05-1.037c-.114-.831-.504-1.204-1.238-1.225a1.45 1.45 0 0 0-1.507 1.18c-.012.056-.028.112-.046.178M4.901 20a17.75 17.75 0 0 1 7.4-2l2.913-8.38a.765.765 0 0 1 1.527 0L19.7 18a14.24 14.24 0 0 1 7.399 2S20.704 2.877 20.692 2.842C20.51 2.33 20.202 2 19.787 2h-7.619c-.415 0-.71.33-.904.842z"/></svg>`,
+  "c": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#0288d1" d="M19.563 22A5.57 5.57 0 0 1 14 16.437v-2.873A5.57 5.57 0 0 1 19.563 8H24V2h-4.437A11.563 11.563 0 0 0 8 13.563v2.873A11.564 11.564 0 0 0 19.563 28H24v-6Z"/></svg>`,
+  "clojure": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path fill="#64dd17" d="M123.456 129.975a507 507 0 0 0-3.54 7.846c-4.406 9.981-9.284 22.127-11.066 29.908-.64 2.77-1.037 6.205-1.03 10.013 0 1.506.081 3.09.21 4.702a58.1 58.1 0 0 0 19.98 3.559 58.2 58.2 0 0 0 18.29-2.98c-1.352-1.237-2.642-2.554-3.816-4.038-7.796-9.942-12.146-24.512-19.028-49.01m-28.784-49.39C79.782 91.08 70.039 108.387 70.002 128c.037 19.32 9.487 36.403 24.002 46.94 3.56-14.83 12.485-28.41 25.868-55.63a219 219 0 0 0-2.714-7.083c-3.708-9.3-9.059-20.102-13.834-24.993-2.435-2.555-5.389-4.763-8.652-6.648"/><path fill="#7cb342" d="M178.532 194.535c-7.683-.963-14.023-2.124-19.57-4.081a69.4 69.4 0 0 1-30.958 7.249c-38.491 0-69.693-31.198-69.698-69.7 0-20.891 9.203-39.62 23.764-52.392-3.895-.94-7.956-1.49-12.104-1.482-20.45.193-42.037 11.51-51.025 42.075-.84 4.45-.64 7.813-.64 11.8 0 60.591 49.12 109.715 109.705 109.715 37.104 0 69.882-18.437 89.732-46.633-10.736 2.675-21.06 3.955-29.902 3.982-3.314 0-6.425-.177-9.305-.53"/><path fill="#29b6f6" d="M157.922 173.271c.678.336 2.213.884 4.35 1.49 14.375-10.553 23.717-27.552 23.754-46.764h-.005c-.055-32.03-25.974-57.945-58.011-58.009a58.2 58.2 0 0 0-18.213 2.961c11.779 13.426 17.443 32.613 22.922 53.6l.01.025c.01.017 1.752 5.828 4.743 13.538 2.97 7.7 7.203 17.231 11.818 24.178 3.03 4.655 6.363 8 8.632 8.981"/><path fill="#1e88e5" d="M128.009 18.29c-36.746 0-69.25 18.089-89.16 45.826 10.361-6.49 20.941-8.83 30.174-8.747 12.753.037 22.779 3.991 27.589 6.696a51 51 0 0 1 3.345 2.131 69.4 69.4 0 0 1 28.049-5.894c38.496.004 69.703 31.202 69.709 69.698h-.006c0 19.409-7.938 36.957-20.736 49.594 3.142.352 6.492.571 9.912.554 12.15.006 25.284-2.675 35.13-10.956 6.42-5.408 11.798-13.327 14.78-25.199.584-4.586.92-9.247.92-13.991 0-60.588-49.116-109.715-109.705-109.715"/></svg>`,
+  "console": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#ff7043" d="M2 2a1 1 0 0 0-1 1v10c0 .554.446 1 1 1h12c.554 0 1-.446 1-1V3a1 1 0 0 0-1-1zm0 3h12v8H2zm1 2 2 2-2 2 1 1 3-3-3-3zm5 3.5V12h5v-1.5z"/></svg>`,
+  "cpp": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#0288d1" d="M28 14v-4h-2v4h-6v-4h-2v4h-4v2h4v4h2v-4h6v4h2v-4h4v-2z"/><path fill="#0288d1" d="M13.563 22A5.57 5.57 0 0 1 8 16.437v-2.873A5.57 5.57 0 0 1 13.563 8H18V2h-4.437A11.563 11.563 0 0 0 2 13.563v2.873A11.564 11.564 0 0 0 13.563 28H18v-6Z"/></svg>`,
+  "csharp": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#0288d1" d="M30 14v-2h-2V8h-2v4h-2V8h-2v4h-2v2h2v2h-2v2h2v4h2v-4h2v4h2v-4h2v-2h-2v-2Zm-4 2h-2v-2h2Zm-12.437 6A5.57 5.57 0 0 1 8 16.437v-2.873A5.57 5.57 0 0 1 13.563 8H18V2h-4.437A11.563 11.563 0 0 0 2 13.563v2.873A11.564 11.564 0 0 0 13.563 28H18v-6Z"/></svg>`,
+  "css": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#7e57c2" d="M20 18h-2v-2h-2v2c0 .193 0 .703 1.254 1.033A3.345 3.345 0 0 1 20 22h2v2h2v-2c0-.388-.562-.851-1.254-1.034C20.356 20.34 20 18.84 20 18m-3.254 2.966C14.356 20.34 14 18.84 14 18h-2v-2h-2v8h2v-2h4v2h2v-2c0-.388-.562-.851-1.254-1.034"/><path fill="#7e57c2" d="M24 4H4v20a4 4 0 0 0 4 4h16.16A3.84 3.84 0 0 0 28 24.16V8a4 4 0 0 0-4-4m2 14h-2v-2h-2v2c0 .193 0 .703 1.254 1.033A3.345 3.345 0 0 1 26 22v2a2 2 0 0 1-2 2h-2a2 2 0 0 1-2-2 2 2 0 0 1-2 2h-2a2 2 0 0 1-2-2 2 2 0 0 1-2 2h-2a2 2 0 0 1-2-2v-8a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2 2 2 0 0 1 2-2h2a2 2 0 0 1 2 2 2 2 0 0 1 2-2h2a2 2 0 0 1 2 2Z"/></svg>`,
+  "dart": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#4fc3f7" d="M16.83 2a1.3 1.3 0 0 0-.916.377l-.013.01L7.323 7.34l8.556 8.55v.005l10.283 10.277 1.96-3.529-7.068-16.96-3.299-3.297A1.3 1.3 0 0 0 16.828 2Z"/><path fill="#01579b" d="m7.343 7.32-4.955 8.565-.01.013a1.297 1.297 0 0 0 .004 1.835l.005.005 4.106 4.107 16.064 6.314 3.632-2.015-.098-.098-.025.002L15.995 15.97h-.012z"/><path fill="#01579b" d="m7.321 7.324 8.753 8.755h.013L26.16 26.156l3.835-.73L30 14.089l-4.049-3.965a6.5 6.5 0 0 0-3.618-1.612l.002-.043L7.323 7.325Z"/><path fill="#64b5f6" d="m7.332 7.335 8.758 8.75v.013l10.079 10.071L25.436 30H14.09l-3.967-4.048a6.5 6.5 0 0 1-1.611-3.618l-.045.004Z"/></svg>`,
+  "database": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#ffca28" d="M16 24c-5.525 0-10-.9-10-2v4c0 1.1 4.475 2 10 2s10-.9 10-2v-4c0 1.1-4.475 2-10 2m0-8c-5.525 0-10-.9-10-2v4c0 1.1 4.475 2 10 2s10-.9 10-2v-4c0 1.1-4.475 2-10 2m0-12C10.477 4 6 4.895 6 6v4c0 1.1 4.475 2 10 2s10-.9 10-2V6c0-1.105-4.477-2-10-2"/></svg>`,
+  "document": `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path d="M0 0h24v24H0z"/><path fill="#42a5f5" d="M8 16h8v2H8zm0-4h8v2H8zm6-10H6c-1.1 0-2 .9-2 2v16c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8zm4 18H6V4h7v5h5z"/></svg>`,
+  "elixir": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#9575cd" d="M12.173 22.681c-3.86 0-6.99-3.64-6.99-8.13 0-3.678 2.773-8.172 4.916-10.91 1.014-1.296 2.93-2.322 2.93-2.322s-.982 5.239 1.683 7.319c2.366 1.847 4.106 4.25 4.106 6.363 0 4.232-2.784 7.68-6.645 7.68"/></svg>`,
+  "erlang": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30"><path fill="#f44336" d="M5.207 4.33q-.072.075-.143.153Q1.5 8.476 1.5 15.33c0 4.418 1.155 7.862 3.459 10.34h19.415c2.553-1.152 4.127-3.43 4.127-3.43l-3.147-2.52L23.9 21.1c-.867.773-.845.931-2.315 1.78-1.495.674-3.04.966-4.634.966-2.515 0-4.423-.909-5.723-2.059-1.286-1.15-1.985-4.511-2.096-6.68l17.458.067-.183-1.472s-.847-7.129-2.541-9.372zm8.76.846c1.565 0 3.22.535 3.961 1.471.74.937.931 1.667.973 3.524H9.11c.112-1.955.436-2.81 1.373-3.698.936-.887 2.03-1.297 3.484-1.297"/></svg>`,
+  "go": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#00acc1" d="M2 12h4v2H2zm-2 4h6v2H0zm4 4h2v2H4zm16.954-5H14v3h3.239a4.42 4.42 0 0 1-3.531 2 2.65 2.65 0 0 1-2.053-.858 2.86 2.86 0 0 1-.628-2.28A4.515 4.515 0 0 1 15.292 13a2.73 2.73 0 0 1 1.749.584l2.962-1.185A5.6 5.6 0 0 0 15.292 10a7.526 7.526 0 0 0-7.243 6.5 5.614 5.614 0 0 0 5.659 6.5 7.526 7.526 0 0 0 7.243-6.5 6.4 6.4 0 0 0 .003-1.5"/><path fill="#00acc1" d="M26.292 10a7.526 7.526 0 0 0-7.243 6.5 5.614 5.614 0 0 0 5.659 6.5 7.526 7.526 0 0 0 7.243-6.5 5.614 5.614 0 0 0-5.659-6.5m2.681 6.137A4.515 4.515 0 0 1 24.708 20a2.65 2.65 0 0 1-2.053-.858 2.86 2.86 0 0 1-.628-2.28A4.515 4.515 0 0 1 26.292 13a2.65 2.65 0 0 1 2.053.858 2.86 2.86 0 0 1 .628 2.28Z"/></svg>`,
+  "gradle": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#0097a7" d="M16 10v2h6c-2 0-3-2-6-2"/><path fill="#0097a7" d="M26 4h-2a4 4 0 0 0-4 4h4a1 1 0 0 1 2 0v4H16v-2h-5.317A2.683 2.683 0 0 0 8 12.683v2.634A2.683 2.683 0 0 0 10.683 18H16v2h-5.98A4.02 4.02 0 0 1 6 16v-2c-2 0-4 4-4 8 0 5 1 6 2 6h4v-4h4v4h4v-4h4v4h4v-6a2 2 0 0 0 2-2v-2a4 4 0 0 0 4-4V8a4 4 0 0 0-4-4m-4 12h-2a2 2 0 0 1-2-2h6a2 2 0 0 1-2 2"/></svg>`,
+  "graphql": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#ec407a" d="M6 20h20v2H6z"/><circle cx="7" cy="21" r="3" fill="#ec407a"/><circle cx="16" cy="27" r="3" fill="#ec407a"/><circle cx="25" cy="21" r="3" fill="#ec407a"/><path fill="#ec407a" d="M6 10h20v2H6z"/><circle cx="7" cy="11" r="3" fill="#ec407a"/><circle cx="16" cy="5" r="3" fill="#ec407a"/><circle cx="25" cy="11" r="3" fill="#ec407a"/><path fill="#ec407a" d="M6 12h2v10H6zm18-2h2v12h-2z"/><path fill="#ec407a" d="m5.014 19.41 11.674 6.866L15.674 28 4 21.134z"/><path fill="#ec407a" d="M26.688 21.724 15.014 28.59 14 26.866 25.674 20zM5.124 10.382l11.415-7.29 1.077 1.686L6.2 12.068z"/><path fill="#ec407a" d="m25.798 12.067-11.415-7.29 1.077-1.685 11.415 7.29zM6.2 19.932l11.416 7.29-1.077 1.686-11.415-7.29z"/><path fill="#ec407a" d="m26.875 21.619-11.415 7.29-1.077-1.687 11.415-7.289zM5.877 22.6 16.04 3.686l1.762.946L7.638 23.546z"/><path fill="#ec407a" d="M24.361 23.545 14.197 4.633l1.761-.947 10.165 18.913z"/></svg>`,
+  "groovy": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#26c6da" d="M19.322 2a6.5 6.5 0 0 1 4.352 1.419 4.55 4.55 0 0 1 1.685 3.662 5.82 5.82 0 0 1-1.886 4.275 6.04 6.04 0 0 1-4.34 1.846 4.15 4.15 0 0 1-2.385-.649 1.91 1.91 0 0 1-.936-1.603 1.6 1.6 0 0 1 .356-1.024 1.1 1.1 0 0 1 .861-.447q.469 0 .468.504a.79.79 0 0 0 .358.693 1.43 1.43 0 0 0 .826.245 3.1 3.1 0 0 0 2.39-1.573 5.66 5.66 0 0 0 1.154-3.39 2.64 2.64 0 0 0-.891-2.064 3.28 3.28 0 0 0-2.293-.812 6.18 6.18 0 0 0-4.086 1.736 12.9 12.9 0 0 0-3.215 4.557 13.4 13.4 0 0 0-1.233 5.36 5.86 5.86 0 0 0 1.091 3.723 3.53 3.53 0 0 0 2.905 1.372q3.058 0 5.848-4.002l2.935-.388q.546-.07.545.246a8 8 0 0 1-.423 1.24q-.421 1.097-1.152 3.668A12.7 12.7 0 0 0 26 17.72v1.66a14.2 14.2 0 0 1-4.055 2.57 10.38 10.38 0 0 1-2.764 5.931 6.7 6.7 0 0 1-4.806 2.11 3.3 3.3 0 0 1-2.012-.55 1.8 1.8 0 0 1-.718-1.514q0-2.685 5.634-5.212.532-1.766 1.152-3.507a8.6 8.6 0 0 1-2.853 2.323 7.4 7.4 0 0 1-3.48 1.01 5.46 5.46 0 0 1-4.366-2.093A8.1 8.1 0 0 1 6 15.122a11.6 11.6 0 0 1 1.966-6.426 14.7 14.7 0 0 1 5.162-4.862A12.44 12.44 0 0 1 19.322 2m-2.407 22.17q-4.055 1.875-4.054 3.695a.87.87 0 0 0 .999.97q1.964 0 3.055-4.665"/></svg>`,
+  "h": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#0288d1" d="M18.5 11a5.49 5.49 0 0 0-4.5 2.344V4H8v24h6V17a2 2 0 0 1 4 0v11h6V16.5a5.5 5.5 0 0 0-5.5-5.5"/></svg>`,
+  "haskell": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><g stroke-width="2.422"><path fill="#ef5350" d="m23.928 240.5 59.94-89.852-59.94-89.855h44.955l59.94 89.855-59.94 89.852z"/><path fill="#ffa726" d="m83.869 240.5 59.94-89.852-59.94-89.855h44.955l119.88 179.71h-44.95l-37.46-56.156-37.468 56.156z"/><path fill="#ffee58" d="m228.72 188.08-19.98-29.953h69.93v29.956h-49.95zm-29.97-44.924-19.98-29.953h99.901v29.953z"/></g></svg>`,
+  "hcl": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#eceff1" d="M18 1.2V14h-4v-4l-4 2v16.37l4 2.43V18h4v4l4-2V3.63z"/><path fill="#eceff1" d="M14 1.2 2 8.49v15.02l4 2.43v-15.2l8-4.86zm12 4.86v15.2l-8 4.86v4.68l12-7.29V8.49z"/></svg>`,
+  "hpp": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#0288d1" d="M28 6V2h-2v4h-6V2h-2v4h-4v2h4v4h2V8h6v4h2V8h4V6zm-15.5 5A5.49 5.49 0 0 0 8 13.344V4H2v24h6V17a2 2 0 0 1 4 0v11h6V16.5a5.5 5.5 0 0 0-5.5-5.5"/></svg>`,
+  "html": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#e65100" d="m4 4 2 22 10 2 10-2 2-22Zm19.72 7H11.28l.29 3h11.86l-.802 9.335L15.99 25l-6.635-1.646L8.93 19h3.02l.19 2 3.86.77 3.84-.77.29-4H8.84L8 8h16Z"/></svg>`,
+  "image": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#26a69a" d="M8.5 6h4l-4-4zM3.875 1H9.5l4 4v8.6c0 .773-.616 1.4-1.375 1.4h-8.25c-.76 0-1.375-.627-1.375-1.4V2.4c0-.777.612-1.4 1.375-1.4M4 13.6h8V8l-2.625 2.8L8 9.4zm1.25-7.7c-.76 0-1.375.627-1.375 1.4s.616 1.4 1.375 1.4c.76 0 1.375-.627 1.375-1.4S6.009 5.9 5.25 5.9"/></svg>`,
+  "java": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#f44336" d="M4 26h24v2H4zM28 4H7a1 1 0 0 0-1 1v13a4 4 0 0 0 4 4h10a4 4 0 0 0 4-4v-4h4a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2m0 8h-4V6h4Z"/></svg>`,
+  "javascript": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#ffca28" d="M2 2v12h12V2zm6 6h1v4a1.003 1.003 0 0 1-1 1H7a1.003 1.003 0 0 1-1-1v-1h1v1h1zm3 0h2v1h-2v1h1a1.003 1.003 0 0 1 1 1v1a1.003 1.003 0 0 1-1 1h-2v-1h2v-1h-1a1.003 1.003 0 0 1-1-1V9a1.003 1.003 0 0 1 1-1"/></svg>`,
+  "json": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path fill="#f9a825" d="M560-160v-80h120q17 0 28.5-11.5T720-280v-80q0-38 22-69t58-44v-14q-36-13-58-44t-22-69v-80q0-17-11.5-28.5T680-720H560v-80h120q50 0 85 35t35 85v80q0 17 11.5 28.5T840-560h40v160h-40q-17 0-28.5 11.5T800-360v80q0 50-35 85t-85 35zm-280 0q-50 0-85-35t-35-85v-80q0-17-11.5-28.5T120-400H80v-160h40q17 0 28.5-11.5T160-600v-80q0-50 35-85t85-35h120v80H280q-17 0-28.5 11.5T240-680v80q0 38-22 69t-58 44v14q36 13 58 44t22 69v80q0 17 11.5 28.5T280-240h120v80z"/></svg>`,
+  "kotlin": `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24"><defs><linearGradient id="a" x1="1.725" x2="22.185" y1="22.67" y2="1.982" gradientTransform="translate(1.306 1.129)scale(.89324)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#7c4dff"/><stop offset=".5" stop-color="#d500f9"/><stop offset="1" stop-color="#ef5350"/></linearGradient></defs><path fill="url(#a)" d="M2.975 2.976v18.048h18.05v-.03l-4.478-4.511-4.48-4.515 4.48-4.515 4.443-4.477z"/></svg>`,
+  "less": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#0277bd" d="M8 3a2 2 0 0 0-2 2v4a2 2 0 0 1-2 2H3v2h1a2 2 0 0 1 2 2v4a2 2 0 0 0 2 2h2v-2H8v-5a2 2 0 0 0-2-2 2 2 0 0 0 2-2V5h2V3m6 0a2 2 0 0 1 2 2v4a2 2 0 0 0 2 2h1v2h-1a2 2 0 0 0-2 2v4a2 2 0 0 1-2 2h-2v-2h2v-5a2 2 0 0 1 2-2 2 2 0 0 1-2-2V5h-2V3z"/></svg>`,
+  "lock": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#ffd54f" d="M25 12h-3V8a6 6 0 0 0-12 0v4H7a1 1 0 0 0-1 1v16a1 1 0 0 0 1 1h18a1 1 0 0 0 1-1V13a1 1 0 0 0-1-1M14 8a2 2 0 0 1 4 0v4h-4Zm2 17a4 4 0 1 1 4-4 4 4 0 0 1-4 4"/></svg>`,
+  "lua": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#42a5f5" d="M30 6a3.86 3.86 0 0 1-1.167 2.833 4.024 4.024 0 0 1-5.666 0A3.86 3.86 0 0 1 22 6a3.86 3.86 0 0 1 1.167-2.833 4.024 4.024 0 0 1 5.666 0A3.86 3.86 0 0 1 30 6m-9.208 5.208A10.6 10.6 0 0 0 13 8a10.6 10.6 0 0 0-7.792 3.208A10.6 10.6 0 0 0 2 19a10.6 10.6 0 0 0 3.208 7.792A10.6 10.6 0 0 0 13 30a10.6 10.6 0 0 0 7.792-3.208A10.6 10.6 0 0 0 24 19a10.6 10.6 0 0 0-3.208-7.792m-1.959 7.625a4.024 4.024 0 0 1-5.666 0 4.024 4.024 0 0 1 0-5.666 4.024 4.024 0 0 1 5.666 0 4.024 4.024 0 0 1 0 5.666"/></svg>`,
+  "markdown": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#42a5f5" d="m14 10-4 3.5L6 10H4v12h4v-6l2 2 2-2v6h4V10zm12 6v-6h-4v6h-4l6 8 6-8z"/></svg>`,
+  "nix": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500"><g stroke-width=".395"><path fill="#1976d2" d="M133.347 451.499c0-.295-2.752-5.283-6.116-11.084s-6.116-10.776-6.116-11.055 9.514-16.889 21.143-36.912c11.629-20.022 21.323-36.798 21.542-37.279.346-.76-1.608-4.363-14.896-27.466-8.412-14.625-15.294-26.785-15.294-27.023 0-.5 24.46-43.501 25.206-44.31.414-.45.592-.384 1.078.395.32.513 16.876 29.256 36.791 63.87 62.62 108.85 74.852 130.01 75.41 130.46.3.242.544.554.544.694s-11.836.21-26.302.154c-23.023-.09-26.313-.175-26.393-.694-.11-.714-27.662-48.825-28.86-50.392-.746-.978-.906-1.035-1.426-.51-.688.696-28.954 49.323-29.49 50.733l-.364.96h-13.23c-10.895 0-13.228-.095-13.228-.538zm167.58-125.61c-.134-.216 1.189-2.863 2.939-5.882 6.924-11.944 84.29-145.75 96.49-166.88 7.143-12.371 13.143-22.465 13.334-22.433.362.062 25.86 43.105 25.86 43.655 0 .174-6.761 11.952-15.025 26.173-8.46 14.557-14.932 26.104-14.81 26.421.185.483 4.563.564 30.213.564h29.996l.957 1.48c.527.814 3.296 5.547 6.155 10.518s5.45 9.29 5.757 9.597c.705.705.703.724-.16 1.572-.396.388-3.36 5.323-6.588 10.965-3.228 5.643-6.056 10.387-6.285 10.543s-19.695.171-43.256.034l-42.84-.249-.803 1.15c-.442.632-7.505 12.736-15.696 26.897l-14.892 25.747h-15.486c-8.518 0-20.015.116-25.551.259-6.55.168-10.15.121-10.308-.135zm-133.75-157.86c-56.373-.055-102.5-.182-102.5-.282s5.617-10.132 12.481-22.294L89.64 123.34h30.332c27.113 0 30.332-.065 30.332-.611 0-.336-6.659-12.228-14.797-26.427s-14.797-25.917-14.797-26.04 2.682-4.853 5.96-10.51 6.003-10.578 6.056-10.934c.086-.586 1.375-.648 13.572-.648 7.412 0 13.463.143 13.446.317-.018.174.22.707.53 1.184.31.476 9.763 16.937 21.007 36.578 11.244 19.64 20.71 36.022 21.036 36.4.554.647 2.549.691 31.428.691h30.837l12.896 22.145c7.093 12.18 12.8 22.301 12.682 22.492-.117.19-4.776.303-10.352.249-5.575-.054-56.26-.143-112.63-.198z"/><path fill="#64b5f6" d="M23.046 238.939c-6.098 10.563-6.69 11.711-6.224 12.078.282.224 3.18 5.044 6.44 10.712s6.016 10.355 6.123 10.417c.106.061 13.585.153 29.95.204 16.367.052 29.994.23 30.285.399.473.273-1.08 3.094-14.637 26.574l-15.166 26.269 12.907 21.865c7.1 12.026 12.982 21.906 13.068 21.956s23.257-39.831 51.492-88.624c11.352-19.617 21.214-36.64 30.37-52.442 23.308-40.452 30.68-53.468 30.73-54.132-1.096-.11-6.141-.187-13.006-.216-3.945-.01-7.82-.02-12.75-.002l-25.341.092-15.42 26.706c-14.256 24.693-15.445 26.663-16.278 26.86l-.023.037c-.012.003-1.622-.001-1.826 0-4.29.062-20.453.063-40.226-.01-22.632-.082-41.615-.125-42.183-.096-.567.03-1.147-.03-1.29-.132-.141-.102-3.29 5.066-6.996 11.485zm205.16-190.3c-.123.149 5.62 10.392 12.761 22.763 12.2 21.131 89.393 155.03 96.276 167 1.503 2.613 2.92 4.803 3.443 5.348.9-1.249 3.532-5.63 7.954-13.219a1343 1343 0 0 1 10.05-17.76l6.606-11.443c.691-1.403.753-1.818.652-2.117-.161-.48-6.903-12.332-14.982-26.337-8.078-14.005-14.824-25.849-14.99-26.32a.73.73 0 0 1-.01-.366l-.426-.913 21.636-36.976c3.69-6.307 6.425-11.042 9.471-16.29 9.158-15.948 12.036-21.189 11.895-21.55-.126-.324-2.7-4.83-5.72-10.017-3.021-5.185-5.845-10.148-6.275-11.026-.483-.987-.734-1.364-1.1-1.456-.054.014-.083.018-.144.035-.42.112-5.455.195-11.19.185s-11.22.024-12.187.073l-1.76.089-14.998 25.978c-12.824 22.212-15.084 25.964-15.595 25.883-.024-.004-.15-.189-.235-.301-.109.066-.2.09-.271.05-.256-.148-7.144-11.902-15.306-26.119L279.4 48.817c-.116-.186-.444-.744-.458-.752-.476-.275-50.502.287-50.737.57zm-18.646 283.09c-.047.109-.026.262.043.48.328 1.05 25.338 43.735 25.772 43.985.206.119 14.178.239 31.05.266 26.65.044 30.749.152 31.234.832.307.43 9.987 17.214 21.513 37.296s21.152 36.627 21.394 36.767 5.926.243 12.633.23c6.705-.013 12.4.099 12.657.246.131.076.381-.141.851-.795l6.008-10.406c5.234-9.065 6.62-11.684 6.294-11.888-.575-.36-15.597-26.643-23.859-41.482-3.09-5.45-5.37-9.516-5.44-9.774-.196-.712-.066-.822 1.155-.98 1.956-.252 57.397-.057 58.071.205.237.092.79-.569 2.593-3.497 1.866-3.067 5.03-8.524 11.001-18.866 7.22-12.505 13.043-22.784 12.941-22.843s-.77-.051-1.489.016l-.046.001c-4.451.204-33.918.203-149.74.025-38.96-.06-69.786-.09-71.912-.072-1.12.01-2.095.076-2.66.172a.3.3 0 0 0-.062.083z"/></g></svg>`,
+  "ocaml": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m12.019 15.021.003-.008c-.005-.021-.006-.026-.003.008"/><path fill="#ff9800" d="M4.51 3.273a2.523 2.523 0 0 0-2.524 2.523V11.3c.361-.13.88-.898 1.043-1.085.285-.327.337-.743.478-1.006C3.83 8.612 3.886 8.2 4.62 8.2c.342 0 .478.08.71.39.16.216.438.615.568.882.15.307.396.724.503.808q.122.095.233.137c.119.044.218-.037.297-.1.102-.082.145-.247.24-.467.135-.317.283-.697.367-.83.146-.23.195-.501.352-.633.232-.195.535-.208.618-.225.466-.092.677.225.907.43.15.133.355.403.5.765.114.283.26.544.32.707.059.158.203.41.289.713.077.275.286.486.365.616 0 0 .121.34.858.65.16.067.482.176.674.246.32.116.63.101 1.025.054.281 0 .434-.408.562-.734.075-.193.148-.745.197-.902.048-.153-.064-.27.031-.405.112-.156.178-.164.242-.368.138-.436.936-.458 1.384-.458.374 0 .327.363.96.239.364-.072.714.046 1.1.149.324.086.63.184.812.398.119.139.412.834.113.863.029.035.05.099.104.134-.067.262-.357.075-.518.041-.217-.045-.37.007-.583.101-.363.162-.894.143-1.21.407-.27.223-.269.721-.394 1 0 0-.348.895-1.106 1.443-.194.14-.574.477-1.4.605a5.3 5.3 0 0 1-1.1.043c-.186-.009-.362-.018-.549-.02-.11-.002-.48-.013-.461.022l-.041.103.024.138c.015.083.019.149.022.225.006.157-.013.32-.005.478.017.328.138.627.154.958.017.368.199.758.375 1.059.067.114.169.128.213.269.052.161.003.333.028.505.1.668.292 1.366.592 1.97l.008.014c.371-.062.743-.196 1.226-.267.885-.132 2.115-.064 2.906-.138 2-.188 3.085.82 4.882.407V5.796a2.523 2.523 0 0 0-2.523-2.523zm-.907 11.144q-.022 0-.046.003c-.159.025-.313.08-.412.24-.08.13-.108.355-.164.505-.064.175-.176.338-.274.505-.18.305-.504.581-.644.879-.028.06-.053.13-.076.2v3.402c.163.028.333.062.524.113 1.407.375 1.75.407 3.13.25l.13-.018c.105-.22.187-.968.255-1.2.054-.178.127-.32.155-.5.026-.173-.003-.337-.017-.493-.04-.393.285-.533.44-.87.14-.304.22-.651.336-.963.11-.298.284-.721.579-.872-.036-.041-.617-.06-.772-.076a5 5 0 0 1-.5-.07c-.314-.064-.656-.126-.965-.2a10 10 0 0 1-.947-.328c-.298-.138-.503-.497-.732-.507m5.737.83c-.74.149-.97.876-1.32 1.451-.192.319-.396.59-.548.928-.14.312-.128.657-.368.924a2.55 2.55 0 0 0-.528.922c-.023.067-.088.776-.158.943l1.101-.078c1.026.07.73.464 2.332.378l2.529-.078a7 7 0 0 0-.228-.588c-.07-.147-.16-.434-.218-.56a3.5 3.5 0 0 0-.309-.526c-.184-.215-.227-.23-.28-.503-.095-.473-.344-1.33-.637-1.923-.151-.306-.403-.562-.634-.784-.2-.195-.655-.522-.734-.505z"/></svg>`,
+  "php": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#1e88e5" d="M12 18.08c-6.63 0-12-2.72-12-6.08s5.37-6.08 12-6.08S24 8.64 24 12s-5.37 6.08-12 6.08m-5.19-7.95c.54 0 .91.1 1.09.31.18.2.22.56.13 1.03-.1.53-.29.87-.58 1.09q-.42.33-1.29.33h-.87l.53-2.76zm-3.5 5.55h1.44l.34-1.75h1.23c.54 0 .98-.06 1.33-.17.35-.12.67-.31.96-.58.24-.22.43-.46.58-.73.15-.26.26-.56.31-.88.16-.78.05-1.39-.33-1.82-.39-.44-.99-.65-1.82-.65H4.59zm7.25-8.33-1.28 6.58h1.42l.74-3.77h1.14c.36 0 .6.06.71.18s.13.34.07.66l-.57 2.93h1.45l.59-3.07c.13-.62.03-1.07-.27-1.36-.3-.27-.85-.4-1.65-.4h-1.27L12 7.35zM18 10.13c.55 0 .91.1 1.09.31.18.2.22.56.13 1.03-.1.53-.29.87-.57 1.09-.29.22-.72.33-1.3.33h-.85l.5-2.76zm-3.5 5.55h1.44l.34-1.75h1.22c.55 0 1-.06 1.35-.17.35-.12.65-.31.95-.58.24-.22.44-.46.58-.73.15-.26.26-.56.32-.88.15-.78.04-1.39-.34-1.82-.36-.44-.99-.65-1.82-.65h-2.75z"/></svg>`,
+  "python": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#0288d1" d="M9.86 2A2.86 2.86 0 0 0 7 4.86v1.68h4.29c.39 0 .71.57.71.96H4.86A2.86 2.86 0 0 0 2 10.36v3.781a2.86 2.86 0 0 0 2.86 2.86h1.18v-2.68a2.85 2.85 0 0 1 2.85-2.86h5.25c1.58 0 2.86-1.271 2.86-2.851V4.86A2.86 2.86 0 0 0 14.14 2zm-.72 1.61c.4 0 .72.12.72.71s-.32.891-.72.891c-.39 0-.71-.3-.71-.89s.32-.711.71-.711"/><path fill="#fdd835" d="M17.959 7v2.68a2.85 2.85 0 0 1-2.85 2.859H9.86A2.85 2.85 0 0 0 7 15.389v3.75a2.86 2.86 0 0 0 2.86 2.86h4.28A2.86 2.86 0 0 0 17 19.14v-1.68h-4.291c-.39 0-.709-.57-.709-.96h7.14A2.86 2.86 0 0 0 22 13.64V9.86A2.86 2.86 0 0 0 19.14 7zM8.32 11.513l-.004.004.038-.004zm6.54 7.276c.39 0 .71.3.71.89a.71.71 0 0 1-.71.71c-.4 0-.72-.12-.72-.71s.32-.89.72-.89"/></svg>`,
+  "r": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#1976d2" d="M11.956 4.05c-5.694 0-10.354 3.106-10.354 6.947 0 3.396 3.686 6.212 8.531 6.813v2.205h3.53V17.82c.88-.093 1.699-.259 2.475-.497l1.43 2.692h3.996l-2.402-4.048c1.936-1.263 3.147-3.034 3.147-4.97 0-3.841-4.659-6.947-10.354-6.947m1.584 2.712c4.349 0 7.558 1.45 7.558 4.753 0 1.77-.952 3.013-2.505 3.779a1 1 0 0 1-.228-.156c-.373-.165-.994-.352-.994-.352s3.085-.227 3.085-3.302-3.23-3.127-3.23-3.127h-7.092v7.413c-2.64-.766-4.462-2.392-4.462-4.255 0-2.63 3.52-4.753 7.868-4.753m.156 4.12h2.143s.983-.05.983.974c0 1.004-.983 1.004-.983 1.004h-2.143v-1.977m-.031 4.566h.952c.186 0 .28.052.445.207.135.103.28.3.404.476-.57.073-1.17.104-1.801.104z"/></svg>`,
+  "react": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#00bcd4" d="M16 12c7.444 0 12 2.59 12 4s-4.556 4-12 4-12-2.59-12-4 4.556-4 12-4m0-2c-7.732 0-14 2.686-14 6s6.268 6 14 6 14-2.686 14-6-6.268-6-14-6"/><path fill="#00bcd4" d="M16 14a2 2 0 1 0 2 2 2 2 0 0 0-2-2"/><path fill="#00bcd4" d="M10.458 5.507c2.017 0 5.937 3.177 9.006 8.493 3.722 6.447 3.757 11.687 2.536 12.392a.9.9 0 0 1-.457.1c-2.017 0-5.938-3.176-9.007-8.492C8.814 11.553 8.779 6.313 10 5.608a.9.9 0 0 1 .458-.1m-.001-2A2.87 2.87 0 0 0 9 3.875C6.13 5.532 6.938 12.304 10.804 19c3.284 5.69 7.72 9.493 10.74 9.493A2.87 2.87 0 0 0 23 28.124c2.87-1.656 2.062-8.428-1.804-15.124-3.284-5.69-7.72-9.493-10.74-9.493Z"/><path fill="#00bcd4" d="M21.543 5.507a.9.9 0 0 1 .457.1c1.221.706 1.186 5.946-2.536 12.393-3.07 5.316-6.99 8.493-9.007 8.493a.9.9 0 0 1-.457-.1C8.779 25.686 8.814 20.446 12.536 14c3.07-5.316 6.99-8.493 9.007-8.493m0-2c-3.02 0-7.455 3.804-10.74 9.493C6.939 19.696 6.13 26.468 9 28.124a2.87 2.87 0 0 0 1.457.369c3.02 0 7.455-3.804 10.74-9.493C25.061 12.304 25.87 5.532 23 3.876a2.87 2.87 0 0 0-1.457-.369"/></svg>`,
+  "react_ts": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#0288d1" d="M16 12c7.444 0 12 2.59 12 4s-4.556 4-12 4-12-2.59-12-4 4.556-4 12-4m0-2c-7.732 0-14 2.686-14 6s6.268 6 14 6 14-2.686 14-6-6.268-6-14-6"/><path fill="#0288d1" d="M16 14a2 2 0 1 0 2 2 2 2 0 0 0-2-2"/><path fill="#0288d1" d="M10.458 5.507c2.017 0 5.937 3.177 9.006 8.493 3.722 6.447 3.757 11.687 2.536 12.392a.9.9 0 0 1-.457.1c-2.017 0-5.938-3.176-9.007-8.492C8.814 11.553 8.779 6.313 10 5.608a.9.9 0 0 1 .458-.1m-.001-2A2.87 2.87 0 0 0 9 3.875C6.13 5.532 6.938 12.304 10.804 19c3.284 5.69 7.72 9.493 10.74 9.493A2.87 2.87 0 0 0 23 28.124c2.87-1.656 2.062-8.428-1.804-15.124-3.284-5.69-7.72-9.493-10.74-9.493Z"/><path fill="#0288d1" d="M21.543 5.507a.9.9 0 0 1 .457.1c1.221.706 1.186 5.946-2.536 12.393-3.07 5.316-6.99 8.493-9.007 8.493a.9.9 0 0 1-.457-.1C8.779 25.686 8.814 20.446 12.536 14c3.07-5.316 6.99-8.493 9.007-8.493m0-2c-3.02 0-7.455 3.804-10.74 9.493C6.939 19.696 6.13 26.468 9 28.124a2.87 2.87 0 0 0 1.457.369c3.02 0 7.455-3.804 10.74-9.493C25.061 12.304 25.87 5.532 23 3.876a2.87 2.87 0 0 0-1.457-.369"/></svg>`,
+  "ruby": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#f44336" d="M18.041 3.177c2.24.382 2.879 1.919 2.843 3.527V6.67l-1.013 13.266-13.132.897h.008c-1.093-.044-3.518-.151-3.634-3.545l1.217-2.222 2.462 5.74 2.097-6.77-.045.009.018-.018 6.85 2.186L13.945 9.3l6.53-.409-5.144-4.212 2.71-1.51v.009M3.113 17.252v.017zM6.916 6.874c2.63-2.622 6.033-4.168 7.34-2.844 1.297 1.306-.072 4.523-2.702 7.135-2.666 2.613-6.015 4.248-7.322 2.933-1.306-1.324.036-4.612 2.675-7.224z"/></svg>`,
+  "rust": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#ff7043" d="m30 12-4-2V6h-4l-2-4-4 2-4-2-2 4H6v4l-4 2 2 4-2 4 4 2v4h4l2 4 4-2 4 2 2-4h4v-4l4-2-2-4ZM6 16a9.9 9.9 0 0 1 .842-4H10v8H6.842A9.9 9.9 0 0 1 6 16m10 10a9.98 9.98 0 0 1-7.978-4H16v-2h-2v-2h4c.819.819.297 2.308 1.179 3.37a1.89 1.89 0 0 0 1.46.63h3.34A9.98 9.98 0 0 1 16 26m-2-12v-2h4a1 1 0 0 1 0 2Zm11.158 6H24a2.006 2.006 0 0 1-2-2 2 2 0 0 0-2-2 3 3 0 0 0 3-3q0-.08-.004-.161A3.115 3.115 0 0 0 19.83 10H8.022a9.986 9.986 0 0 1 17.136 10"/></svg>`,
+  "sass": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#ec407a" d="M27.837 5.673a4.33 4.33 0 0 0-2.293-2.701c-2.362-1.261-6.11-1.298-9.548-.092a26.3 26.3 0 0 0-8.76 4.966c-2.752 2.542-3.438 4.925-3.189 6.194.523 2.668 3.274 4.539 5.485 6.042.418.284.822.559 1.175.816-1.429.76-4.261 2.444-5.088 4.248a3.88 3.88 0 0 0-.118 3.332A2.37 2.37 0 0 0 6.869 29.8a5.6 5.6 0 0 0 1.49.2 6.35 6.35 0 0 0 5.19-2.856 6.74 6.74 0 0 0 .864-5.382 7.3 7.3 0 0 1 2.044-.03 3.92 3.92 0 0 1 2.816 1.311 1.82 1.82 0 0 1 .423 1.262 1.55 1.55 0 0 1-.772 1.05c-.234.14-.586.355-.504.803.036.194.198.633.894.512a2.93 2.93 0 0 0 2.145-2.651 4 4 0 0 0-1.197-2.904 5.94 5.94 0 0 0-4.396-1.626 10.6 10.6 0 0 0-2.672.304 20 20 0 0 0-2.203-1.846c-1.712-1.3-3.33-2.529-3.235-4.26.125-2.263 2.468-4.532 6.964-6.744 4.016-1.976 7.254-2.037 8.944-1.438a2 2 0 0 1 1.204.883 2.77 2.77 0 0 1-.36 2.47 9.71 9.71 0 0 1-7.425 4.304 3.86 3.86 0 0 1-3.238-.757c-.278-.302-.593-.645-1.074-.383q-.565.31-.225 1.189a3.9 3.9 0 0 0 2.407 1.92 11.7 11.7 0 0 0 7.128-.671c3.527-1.35 6.681-5.202 5.756-8.787M11.895 24.475a4 4 0 0 1-.192.468 4.5 4.5 0 0 1-.753 1.081 2.83 2.83 0 0 1-2.533 1.107c-.056-.032-.078-.146-.085-.193a3.28 3.28 0 0 1 1.076-2.284 11.3 11.3 0 0 1 2.644-1.933 3.85 3.85 0 0 1-.157 1.754"/></svg>`,
+  "scala": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#f44336" d="m6.457 9.894 12.523 5.163-.456 1.211L6 11.105Zm7.02-3.091L26 11.966l-.457 1.21L13.02 8.015ZM6.465 18.885l12.524 5.163-.457 1.21L6.01 20.097Zm7.007-3.086 12.524 5.163-.456 1.21-12.524-5.162Z"/><path fill="#f44336" d="M6 24.07V30l19.997-3.106V20.96zM6 5.11v5.99l20-3.11V2zm0 9.96v5.03l20-3.11v-5.03z"/></svg>`,
+  "settings": `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path d="M0 0h24v24H0z"/><path fill="#42a5f5" d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46a.5.5 0 0 0-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65A.49.49 0 0 0 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1a.6.6 0 0 0-.18-.03c-.17 0-.34.09-.43.25l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46a.5.5 0 0 0 .61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1q.09.03.18.03c.17 0 .34-.09.43-.25l2-3.46c.12-.22.07-.49-.12-.64zm-1.98-1.71c.04.31.05.52.05.73s-.02.43-.05.73l-.14 1.13.89.7 1.08.84-.7 1.21-1.27-.51-1.04-.42-.9.68c-.43.32-.84.56-1.25.73l-1.06.43-.16 1.13-.2 1.35h-1.4l-.19-1.35-.16-1.13-1.06-.43c-.43-.18-.83-.41-1.23-.71l-.91-.7-1.06.43-1.27.51-.7-1.21 1.08-.84.89-.7-.14-1.13c-.03-.31-.05-.54-.05-.74s.02-.43.05-.73l.14-1.13-.89-.7-1.08-.84.7-1.21 1.27.51 1.04.42.9-.68c.43-.32.84-.56 1.25-.73l1.06-.43.16-1.13.2-1.35h1.39l.19 1.35.16 1.13 1.06.43c.43.18.83.41 1.23.71l.91.7 1.06-.43 1.27-.51.7 1.21-1.07.85-.89.7zM12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4m0 6c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2"/></svg>`,
+  "svelte": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><path fill="#ff5722" d="M175.94 24.328c-13.037.252-26.009 3.872-37.471 11.174L79.912 72.818a67.13 67.13 0 0 0-30.355 44.906 70.8 70.8 0 0 0 6.959 45.445 67.2 67.2 0 0 0-10.035 25.102 71.54 71.54 0 0 0 12.236 54.156c23.351 33.41 69.468 43.311 102.81 22.07l58.559-37.158a67.36 67.36 0 0 0 30.355-44.906 70.77 70.77 0 0 0-6.982-45.422 67.65 67.65 0 0 0 10.059-25.102 71.63 71.63 0 0 0-12.236-54.156v-.18c-15.324-21.925-40.453-33.727-65.342-33.246zm5.137 28.68a46.5 46.5 0 0 1 36.09 19.969 42.98 42.98 0 0 1 7.365 32.557 45 45 0 0 1-1.393 5.455l-1.123 3.37-2.986-2.247a75.9 75.9 0 0 0-22.902-11.45l-2.244-.651.201-2.246a13.16 13.16 0 0 0-2.379-8.711 13.99 13.99 0 0 0-14.953-5.412 12.8 12.8 0 0 0-3.594 1.572l-58.578 37.25a12.24 12.24 0 0 0-5.502 8.15 13.1 13.1 0 0 0 2.246 9.834 14.03 14.03 0 0 0 14.93 5.569 13.5 13.5 0 0 0 3.594-1.573l22.453-14.234a41.8 41.8 0 0 1 11.898-5.232 46.48 46.48 0 0 1 49.914 18.502 43.02 43.02 0 0 1 7.363 32.557 40.42 40.42 0 0 1-18.254 27.078l-58.58 37.316a43 43 0 0 1-11.898 5.23A46.545 46.545 0 0 1 82.81 227.14a42.98 42.98 0 0 1-7.341-32.557 38 38 0 0 1 1.39-5.41l1.102-3.37 3.008 2.246a75.9 75.9 0 0 0 22.836 11.361l2.244.65-.201 2.247a13.25 13.25 0 0 0 2.447 8.644 14.03 14.03 0 0 0 15.043 5.569 13.1 13.1 0 0 0 3.592-1.573l58.467-37.316a12.17 12.17 0 0 0 5.502-8.173 12.96 12.96 0 0 0-2.246-9.811 14.03 14.03 0 0 0-15.043-5.568 12.8 12.8 0 0 0-3.592 1.57l-22.453 14.258a42.9 42.9 0 0 1-11.877 5.209 46.52 46.52 0 0 1-49.846-18.5 43.02 43.02 0 0 1-7.297-32.557A40.42 40.42 0 0 1 96.798 96.98l58.646-37.316a42.8 42.8 0 0 1 11.811-5.21 46.5 46.5 0 0 1 13.822-1.444z"/></svg>`,
+  "svg": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#ffb300" d="M29.168 14.03a2.7 2.7 0 0 0-1.968-.83 2.51 2.51 0 0 0-1.929.8h-4.443l3.078-3.078a2.835 2.835 0 0 0 2.857-2.842 2.6 2.6 0 0 0-.831-1.969 2.82 2.82 0 0 0-2.014-.788 2.67 2.67 0 0 0-1.968.788 2.36 2.36 0 0 0-.812 1.922L18 11.17V6.726a2.51 2.51 0 0 0 .8-1.929 2.7 2.7 0 0 0-.832-1.968 2.745 2.745 0 0 0-3.936 0 2.7 2.7 0 0 0-.832 1.968 2.51 2.51 0 0 0 .8 1.93v4.443l-3.138-3.138a2.36 2.36 0 0 0-.812-1.922 2.66 2.66 0 0 0-1.968-.788 2.83 2.83 0 0 0-2.014.788 2.6 2.6 0 0 0-.831 1.969 2.74 2.74 0 0 0 .831 2.013 2.8 2.8 0 0 0 2.026.829l3.078 3.078H6.729a2.51 2.51 0 0 0-1.929-.8 2.7 2.7 0 0 0-1.968.831 2.745 2.745 0 0 0 0 3.937 2.7 2.7 0 0 0 1.968.832 2.51 2.51 0 0 0 1.929-.8h4.443l-3.078 3.077a2.835 2.835 0 0 0-2.857 2.842 2.6 2.6 0 0 0 .831 1.969 2.82 2.82 0 0 0 2.014.788 2.67 2.67 0 0 0 1.968-.788 2.36 2.36 0 0 0 .812-1.922L14 20.827v4.444a2.51 2.51 0 0 0-.8 1.929 2.784 2.784 0 0 0 4.768 1.968A2.7 2.7 0 0 0 18.8 27.2a2.51 2.51 0 0 0-.8-1.929v-4.444l3.138 3.138a2.36 2.36 0 0 0 .812 1.922 2.66 2.66 0 0 0 1.968.788 2.83 2.83 0 0 0 2.014-.788 2.6 2.6 0 0 0 .831-1.969 2.74 2.74 0 0 0-.831-2.013 2.8 2.8 0 0 0-2.026-.829L20.828 18h4.443a2.51 2.51 0 0 0 1.93.8 2.784 2.784 0 0 0 1.967-4.769Z"/></svg>`,
+  "swift": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#ff6e40" d="M17.087 19.721c-2.36 1.36-5.59 1.5-8.86.1a13.8 13.8 0 0 1-6.23-5.32c.67.55 1.46 1 2.3 1.4 3.37 1.57 6.73 1.46 9.1 0-3.37-2.59-6.24-5.96-8.37-8.71-.45-.45-.78-1.01-1.12-1.51 8.28 6.05 7.92 7.59 2.41-1.01 4.89 4.94 9.43 7.74 9.43 7.74.16.09.25.16.36.22.1-.25.19-.51.26-.78.79-2.85-.11-6.12-2.08-8.81 4.55 2.75 7.25 7.91 6.12 12.24-.03.11-.06.22-.05.39 2.24 2.83 1.64 5.78 1.35 5.22-1.21-2.39-3.48-1.65-4.62-1.17"/></svg>`,
+  "terraform": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#5c6bc0" d="m2 10 8 4V6L2 2zm10 5 8 4v-8l-8-4zm0 11 8 4v-8l-8-4zm10-14v8l8-4V8z"/></svg>`,
+  "toml": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#cfd8dc" d="M4 6V4h8v2H9v7H7V6z"/><path fill="#ef5350" d="M4 1v1H2v12h2v1H1V1zm8 0v1h2v12h-2v1h3V1z"/></svg>`,
+  "typescript": `<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 16 16"><path fill="#0288d1" d="M2 2v12h12V2zm4 6h3v1H8v4H7V9H6zm5 0h2v1h-2v1h1a1.003 1.003 0 0 1 1 1v1a1.003 1.003 0 0 1-1 1h-2v-1h2v-1h-1a1.003 1.003 0 0 1-1-1V9a1.003 1.003 0 0 1 1-1"/></svg>`,
+  "vue": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#41b883" d="M1.791 3.851 12 21.471 22.209 3.936V3.85H18.24l-6.18 10.616L5.906 3.851z"/><path fill="#35495e" d="m5.907 3.851 6.152 10.617L18.24 3.851h-3.723L12.084 8.03 9.66 3.85z"/></svg>`,
+  "webassembly": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#7c4dff" d="M22 18h4v4h-4z"/><path fill="#7c4dff" d="M20 2a4 4 0 0 1-8 0H2v28h28V2Zm-2 24h-2v2h-4v-2h-2v2H6v-2H4V16h2v10h4V16h2v10h4V16h2Zm10 2h-2v-4h-4v4h-2V18h2v-2h4v2h2Z"/></svg>`,
+  "xml": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#8bc34a" d="M13 9h5.5L13 3.5zM6 2h8l6 6v12a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V4c0-1.11.89-2 2-2m.12 13.5 3.74 3.74 1.42-1.41-2.33-2.33 2.33-2.33-1.42-1.41zm11.16 0-3.74-3.74-1.42 1.41 2.33 2.33-2.33 2.33 1.42 1.41z"/></svg>`,
+  "yaml": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="#ff5252" d="M13 9h5.5L13 3.5zM6 2h8l6 6v12c0 1.1-.9 2-2 2H6c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2m12 16v-2H9v2zm-4-4v-2H6v2z"/></svg>`,
+  "zig": `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path fill="#f9a825" d="M2 8h6v4H2zm8 0h12v4H10zm0 12h12v4H10zm14 0h2v4h-2zM8 20l-3 4H2V12h4v8zm14-8h-6l-6 8h6z"/><path fill="#f9a825" d="M16 20h-6l-6 8m12-16h6l6-8m2 4v16h-4V12h-2l3-4z"/></svg>`,
+};
+
+const EXTENSION_TO_ICON: Record<string, string> = {
+  "astro": "astro",
+  "bash": "console",
+  "c": "c",
+  "cfg": "settings",
+  "clj": "clojure",
+  "conf": "settings",
+  "cpp": "cpp",
+  "cs": "csharp",
+  "css": "css",
+  "dart": "dart",
+  "erl": "erlang",
+  "ex": "elixir",
+  "exs": "elixir",
+  "gif": "image",
+  "go": "go",
+  "gql": "graphql",
+  "gradle": "gradle",
+  "graphql": "graphql",
+  "groovy": "groovy",
+  "h": "h",
+  "hcl": "hcl",
+  "hpp": "hpp",
+  "hs": "haskell",
+  "html": "html",
+  "ico": "image",
+  "ini": "settings",
+  "java": "java",
+  "jpeg": "image",
+  "jpg": "image",
+  "js": "javascript",
+  "json": "json",
+  "jsx": "react",
+  "kt": "kotlin",
+  "less": "less",
+  "lock": "lock",
+  "lua": "lua",
+  "markdown": "markdown",
+  "md": "markdown",
+  "ml": "ocaml",
+  "nix": "nix",
+  "php": "php",
+  "png": "image",
+  "py": "python",
+  "r": "r",
+  "rb": "ruby",
+  "rs": "rust",
+  "scala": "scala",
+  "scss": "sass",
+  "sh": "console",
+  "sql": "database",
+  "svelte": "svelte",
+  "svg": "svg",
+  "swift": "swift",
+  "tf": "terraform",
+  "toml": "toml",
+  "ts": "typescript",
+  "tsx": "react_ts",
+  "txt": "document",
+  "vue": "vue",
+  "wasm": "webassembly",
+  "webp": "image",
+  "xml": "xml",
+  "yaml": "yaml",
+  "yml": "yaml",
+  "zig": "zig",
+};
+
+export function getFileIconSvg(fileName: string): string {
+  const ext = getExtension(fileName);
+  if (ext) {
+    const iconName = EXTENSION_TO_ICON[ext];
+    if (iconName && SVG_ICONS[iconName]) return SVG_ICONS[iconName];
+  }
+  return SVG_ICONS["_default"];
+}
+
+function getExtension(name: string): string | null {
+  const idx = name.lastIndexOf(".");
+  if (idx === -1 || idx === name.length - 1) return null;
+  return name.slice(idx + 1).toLowerCase();
+}
@@ -34,8 +34,10 @@ import {
  FolderPlus,
  FolderGit2,
  GitPullRequest,
+  Globe,
  Monitor,
  MoreVertical,
+  Plus,
 } from "lucide-react-native";
 import { NestableScrollContainer } from "react-native-draggable-flatlist";
 import { DraggableList, type DraggableRenderItemInfo } from "./draggable-list";
@@ -73,6 +75,7 @@ import { confirmDialog } from "@/utils/confirm-dialog";
 import { projectIconPlaceholderLabelFromDisplayName } from "@/utils/project-display-name";
 import { shouldRenderSyncedStatusLoader } from "@/utils/status-loader";
 import { getStatusDotColor } from "@/utils/status-dot-color";
+import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
 import { Shortcut } from "@/components/ui/shortcut";
 import type { ShortcutKey } from "@/utils/format-shortcut";
@@ -85,6 +88,7 @@ import { normalizeWorkspaceDescriptor, useSessionStore } from "@/stores/session-
 import { createNameId } from "mnemonic-id";
 import { buildWorkspaceArchiveRedirectRoute } from "@/utils/workspace-archive-navigation";
 import { openExternalUrl } from "@/utils/open-external-url";
+import { WorkspaceHoverCard } from "@/components/workspace-hover-card";

 function toProjectIconDataUri(icon: { mimeType: string; data: string } | null): string | null {
  if (!icon) {
@@ -113,6 +117,7 @@ interface SidebarWorkspaceListProps {
  isRefreshing?: boolean;
  onRefresh?: () => void;
  onWorkspacePress?: () => void;
+  onAddProject?: () => void;
  listFooterComponent?: ReactElement | null;
  /** Gesture ref for coordinating with parent gestures (e.g., sidebar close) */
  parentGestureRef?: MutableRefObject<GestureType | undefined>;
@@ -692,7 +697,7 @@ function ProjectHeaderRow({
        prepareWorkspaceTab({
          serverId: serverId!,
          workspaceId: workspace.id,
-          target: { kind: "draft", draftId: "new" },
+          target: { kind: "setup", workspaceId: workspace.id },
        }) as any,
      );
    },
@@ -852,122 +857,132 @@ function WorkspaceRowInner({
    onPress();
  }, [interaction.didLongPressRef, onPress]);

+  const isDesktop = !isMobile;
+  const showGlobe = isDesktop && workspace.hasRunningServices;
+
  return (
-    <View
-      style={styles.workspaceRowContainer}
-      onPointerEnter={() => setIsHovered(true)}
-      onPointerLeave={() => setIsHovered(false)}
-    >
-      <Pressable
-        disabled={isArchiving}
-        style={({ pressed }) => [
-          styles.workspaceRow,
-          isDragging && styles.workspaceRowDragging,
-          selected && styles.sidebarRowSelected,
-          isHovered && styles.workspaceRowHovered,
-          pressed && styles.workspaceRowPressed,
-        ]}
-        onPressIn={interaction.handlePressIn}
-        onTouchMove={interaction.handleTouchMove}
-        onPressOut={interaction.handlePressOut}
-        onPress={handlePress}
-        testID={`sidebar-workspace-row-${workspace.workspaceKey}`}
+    <WorkspaceHoverCard workspace={workspace} isDragging={isDragging}>
+      <View
+        style={styles.workspaceRowContainer}
+        onPointerEnter={() => setIsHovered(true)}
+        onPointerLeave={() => setIsHovered(false)}
      >
-        <View style={styles.workspaceRowMain}>
-          <View
-            {...(dragHandleProps?.attributes as any)}
-            {...(dragHandleProps?.listeners as any)}
-            ref={dragHandleProps?.setActivatorNodeRef as any}
-            style={styles.workspaceRowLeft}
-          >
-            <WorkspaceStatusIndicator
-              bucket={workspace.statusBucket}
-              workspaceKind={workspace.workspaceKind}
-              loading={isArchiving || isCreating}
-            />
-            <Text
-              style={[
-                styles.workspaceBranchText,
-                isHovered && styles.workspaceBranchTextHovered,
-                isCreating && styles.workspaceBranchTextCreating,
-              ]}
-              numberOfLines={1}
+        <Pressable
+          disabled={isArchiving}
+          style={({ pressed }) => [
+            styles.workspaceRow,
+            isDragging && styles.workspaceRowDragging,
+            selected && styles.sidebarRowSelected,
+            isHovered && styles.workspaceRowHovered,
+            pressed && styles.workspaceRowPressed,
+          ]}
+          onPressIn={interaction.handlePressIn}
+          onTouchMove={interaction.handleTouchMove}
+          onPressOut={interaction.handlePressOut}
+          onPress={handlePress}
+          testID={`sidebar-workspace-row-${workspace.workspaceKey}`}
+        >
+          <View style={styles.workspaceRowMain}>
+            <View
+              {...(dragHandleProps?.attributes as any)}
+              {...(dragHandleProps?.listeners as any)}
+              ref={dragHandleProps?.setActivatorNodeRef as any}
+              style={styles.workspaceRowLeft}
            >
-              {workspace.name}
-            </Text>
-          </View>
-          <View style={styles.workspaceRowRight}>
-            {isCreating ? <Text style={styles.workspaceCreatingText}>Creating...</Text> : null}
-            {onArchive && (isHovered || isMobile) ? (
-              <DropdownMenu>
-                <DropdownMenuTrigger
-                  hitSlop={8}
-                  style={({ hovered = false }) => [
-                    styles.kebabButton,
-                    hovered && styles.kebabButtonHovered,
-                  ]}
-                  accessibilityRole="button"
-                  accessibilityLabel="Workspace actions"
-                  testID={`sidebar-workspace-kebab-${workspace.workspaceKey}`}
-                >
-                  {({ hovered }) => (
-                    <MoreVertical
-                      size={14}
-                      color={hovered ? theme.colors.foreground : theme.colors.foregroundMuted}
-                    />
-                  )}
-                </DropdownMenuTrigger>
-                <DropdownMenuContent align="end" width={260}>
-                  {onCopyPath ? (
-                    <DropdownMenuItem
-                      testID={`sidebar-workspace-menu-copy-path-${workspace.workspaceKey}`}
-                      leading={<Copy size={14} color={theme.colors.foregroundMuted} />}
-                      onSelect={onCopyPath}
-                    >
-                      Copy path
-                    </DropdownMenuItem>
-                  ) : null}
-                  {onCopyBranchName ? (
-                    <DropdownMenuItem
-                      testID={`sidebar-workspace-menu-copy-branch-name-${workspace.workspaceKey}`}
-                      leading={<Copy size={14} color={theme.colors.foregroundMuted} />}
-                      onSelect={onCopyBranchName}
-                    >
-                      Copy branch name
-                    </DropdownMenuItem>
-                  ) : null}
-                  <DropdownMenuItem
-                    testID={`sidebar-workspace-menu-archive-${workspace.workspaceKey}`}
-                    leading={<Archive size={14} color={theme.colors.foregroundMuted} />}
-                    trailing={archiveShortcutKeys ? <Shortcut chord={archiveShortcutKeys} /> : null}
-                    status={archiveStatus}
-                    pendingLabel={archivePendingLabel}
-                    onSelect={onArchive}
+              <WorkspaceStatusIndicator
+                bucket={workspace.statusBucket}
+                workspaceKind={workspace.workspaceKind}
+                loading={isArchiving || isCreating}
+              />
+              <Text
+                style={[
+                  styles.workspaceBranchText,
+                  isHovered && styles.workspaceBranchTextHovered,
+                  isCreating && styles.workspaceBranchTextCreating,
+                ]}
+                numberOfLines={1}
+              >
+                {workspace.name}
+              </Text>
+            </View>
+            <View style={styles.workspaceRowRight}>
+              {showGlobe ? (
+                <View testID="workspace-globe-icon" accessibilityLabel="Services available">
+                  <Globe size={12} color={theme.colors.foregroundMuted} />
+                </View>
+              ) : null}
+              {isCreating ? <Text style={styles.workspaceCreatingText}>Creating...</Text> : null}
+              {onArchive && (isHovered || isMobile) ? (
+                <DropdownMenu>
+                  <DropdownMenuTrigger
+                    hitSlop={8}
+                    style={({ hovered = false }) => [
+                      styles.kebabButton,
+                      hovered && styles.kebabButtonHovered,
+                    ]}
+                    accessibilityRole="button"
+                    accessibilityLabel="Workspace actions"
+                    testID={`sidebar-workspace-kebab-${workspace.workspaceKey}`}
                  >
-                    {archiveLabel ?? "Archive"}
-                  </DropdownMenuItem>
-                </DropdownMenuContent>
-              </DropdownMenu>
-            ) : workspace.diffStat ? (
-              <View style={styles.diffStatRow}>
-                <Text style={styles.diffStatAdditions}>+{workspace.diffStat.additions}</Text>
-                <Text style={styles.diffStatDeletions}>-{workspace.diffStat.deletions}</Text>
-              </View>
-            ) : null}
-            {showShortcutBadge && shortcutNumber !== null ? (
-              <View style={styles.shortcutBadge}>
-                <Text style={styles.shortcutBadgeText}>{shortcutNumber}</Text>
-              </View>
-            ) : null}
+                    {({ hovered }) => (
+                      <MoreVertical
+                        size={14}
+                        color={hovered ? theme.colors.foreground : theme.colors.foregroundMuted}
+                      />
+                    )}
+                  </DropdownMenuTrigger>
+                  <DropdownMenuContent align="end" width={260}>
+                    {onCopyPath ? (
+                      <DropdownMenuItem
+                        testID={`sidebar-workspace-menu-copy-path-${workspace.workspaceKey}`}
+                        leading={<Copy size={14} color={theme.colors.foregroundMuted} />}
+                        onSelect={onCopyPath}
+                      >
+                        Copy path
+                      </DropdownMenuItem>
+                    ) : null}
+                    {onCopyBranchName ? (
+                      <DropdownMenuItem
+                        testID={`sidebar-workspace-menu-copy-branch-name-${workspace.workspaceKey}`}
+                        leading={<Copy size={14} color={theme.colors.foregroundMuted} />}
+                        onSelect={onCopyBranchName}
+                      >
+                        Copy branch name
+                      </DropdownMenuItem>
+                    ) : null}
+                    <DropdownMenuItem
+                      testID={`sidebar-workspace-menu-archive-${workspace.workspaceKey}`}
+                      leading={<Archive size={14} color={theme.colors.foregroundMuted} />}
+                      trailing={archiveShortcutKeys ? <Shortcut chord={archiveShortcutKeys} /> : null}
+                      status={archiveStatus}
+                      pendingLabel={archivePendingLabel}
+                      onSelect={onArchive}
+                    >
+                      {archiveLabel ?? "Archive"}
+                    </DropdownMenuItem>
+                  </DropdownMenuContent>
+                </DropdownMenu>
+              ) : workspace.diffStat ? (
+                <View style={styles.diffStatRow}>
+                  <Text style={styles.diffStatAdditions}>+{workspace.diffStat.additions}</Text>
+                  <Text style={styles.diffStatDeletions}>-{workspace.diffStat.deletions}</Text>
+                </View>
+              ) : null}
+              {showShortcutBadge && shortcutNumber !== null ? (
+                <View style={styles.shortcutBadge}>
+                  <Text style={styles.shortcutBadgeText}>{shortcutNumber}</Text>
+                </View>
+              ) : null}
+            </View>
          </View>
-        </View>
-        {prHint ? (
-          <View style={styles.workspacePrBadgeRow}>
-            <WorkspacePrBadge hint={prHint} />
-          </View>
-        ) : null}
-      </Pressable>
-    </View>
+          {prHint ? (
+            <View style={styles.workspacePrBadgeRow}>
+              <WorkspacePrBadge hint={prHint} />
+            </View>
+          ) : null}
+        </Pressable>
+      </View>
+    </WorkspaceHoverCard>
  );
 }

@@ -1631,6 +1646,7 @@ export function SidebarWorkspaceList({
  isRefreshing = false,
  onRefresh,
  onWorkspacePress,
+  onAddProject,
  listFooterComponent,
  parentGestureRef,
 }: SidebarWorkspaceListProps) {
@@ -1900,7 +1916,18 @@ export function SidebarWorkspaceList({
  const content = (
    <>
      {projects.length === 0 ? (
-        <Text style={styles.emptyText}>No projects yet</Text>
+        <View style={styles.emptyContainer}>
+          <Text style={styles.emptyTitle}>No projects yet</Text>
+          <Text style={styles.emptyText}>Add a project to get started</Text>
+          <Button
+            variant="ghost"
+            size="sm"
+            leftIcon={Plus}
+            onPress={onAddProject}
+          >
+            Add project
+          </Button>
+        </View>
      ) : (
        <DraggableList
          testID="sidebar-project-list"
@@ -1963,11 +1990,27 @@ const styles = StyleSheet.create((theme) => ({
    marginBottom: theme.spacing[1],
  },
  workspaceListContainer: {},
+  emptyContainer: {
+    marginHorizontal: theme.spacing[2],
+    marginTop: theme.spacing[4],
+    paddingTop: theme.spacing[6],
+    paddingBottom: theme.spacing[4],
+    paddingHorizontal: theme.spacing[4],
+    borderRadius: theme.borderRadius.lg,
+    backgroundColor: theme.colors.surface0,
+    alignItems: "center",
+    gap: theme.spacing[3],
+  },
+  emptyTitle: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.medium,
+    textAlign: "center",
+  },
  emptyText: {
    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
    textAlign: "center",
-    marginTop: theme.spacing[8],
-    marginHorizontal: theme.spacing[2],
  },
  projectRow: {
    minHeight: 36,
@@ -32,7 +32,7 @@ import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { ResizeHandle } from "@/components/resize-handle";
 import { shouldFocusPaneFromEventTarget } from "@/components/split-container-pane-focus";
 import { usePanelStore } from "@/stores/panel-store";
-import { useTrafficLightPadding } from "@/utils/desktop-window";
+import { useWindowControlsPadding } from "@/utils/desktop-window";
 import {
  computeTabDropPreview,
  type TabDropPreview,
@@ -809,8 +809,7 @@ function SplitPaneView({
  const { theme } = useUnistyles();
  const paneRef = useRef<View | null>(null);
  const stableOnFocusPane = useStableEvent(onFocusPane);
-  const isFocusModeEnabled = usePanelStore((s) => s.desktop.focusModeEnabled);
-  const trafficLightPadding = useTrafficLightPadding();
+  const padding = useWindowControlsPadding("tabRow");
  const paneState = useMemo(
    () =>
      deriveWorkspacePaneState({
@@ -885,11 +884,7 @@ function SplitPaneView({
      <View
        style={[
          styles.paneTabs,
-          isFocusModeEnabled &&
-            trafficLightPadding.side && {
-              paddingLeft: trafficLightPadding.left,
-              paddingRight: trafficLightPadding.right,
-            },
+          { paddingLeft: padding.left, paddingRight: padding.right },
        ]}
      >
        <WorkspaceDesktopTabsRow
@@ -1,11 +1,19 @@
-import type { PropsWithChildren, ReactElement } from "react";
+import { useState, type ComponentType, type PropsWithChildren, type ReactElement } from "react";
 import { Pressable, Text, View } from "react-native";
 import type { PressableProps, StyleProp, TextStyle, ViewStyle } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";

 type ButtonVariant = "default" | "secondary" | "outline" | "ghost" | "destructive";
 type ButtonSize = "sm" | "md" | "lg";

+type LeftIcon =
+  | ReactElement
+  | ComponentType<{ color: string; size: number }>
+  | ((color: string) => ReactElement)
+  | null;
+
+const ICON_SIZE: Record<ButtonSize, number> = { sm: 14, md: 16, lg: 20 };
+
 const styles = StyleSheet.create((theme) => ({
  base: {
    flexDirection: "row",
@@ -67,6 +75,12 @@ const styles = StyleSheet.create((theme) => ({
  textDestructive: {
    color: theme.colors.palette.white,
  },
+  textGhost: {
+    color: theme.colors.foregroundMuted,
+  },
+  textGhostHovered: {
+    color: theme.colors.foreground,
+  },
 }));

 export function Button({
@@ -83,11 +97,14 @@ export function Button({
  Omit<PressableProps, "style"> & {
    variant?: ButtonVariant;
    size?: ButtonSize;
-    leftIcon?: ReactElement | null;
+    leftIcon?: LeftIcon;
    style?: StyleProp<ViewStyle>;
    textStyle?: StyleProp<TextStyle>;
  }
 >) {
+  const [hovered, setHovered] = useState(false);
+  const { theme } = useUnistyles();
+
  const variantStyle =
    variant === "default"
      ? styles.default
@@ -100,19 +117,47 @@ export function Button({
            : styles.destructive;

  const sizeStyle = size === "sm" ? styles.sm : size === "lg" ? styles.lg : styles.md;
+  const isGhostHovered = hovered && variant === "ghost";

  const resolvedTextStyle = [
    styles.text,
    variant === "default" ? styles.textDefault : null,
    variant === "destructive" ? styles.textDestructive : null,
+    variant === "ghost" ? styles.textGhost : null,
    textStyle,
+    isGhostHovered ? styles.textGhostHovered : null,
  ];

+  function renderIcon() {
+    if (!leftIcon) return null;
+
+    // Pre-rendered element — pass through
+    if (typeof leftIcon === "object" && "type" in leftIcon) {
+      return <View>{leftIcon}</View>;
+    }
+
+    const color = variant === "ghost"
+      ? (isGhostHovered ? theme.colors.foreground : theme.colors.foregroundMuted)
+      : theme.colors.foreground;
+    const iconSize = ICON_SIZE[size];
+
+    // Render function
+    if (typeof leftIcon === "function" && !leftIcon.prototype?.isReactComponent && leftIcon.length > 0) {
+      return <View>{(leftIcon as (color: string) => ReactElement)(color)}</View>;
+    }
+
+    // Component type
+    const Icon = leftIcon as ComponentType<{ color: string; size: number }>;
+    return <View><Icon color={color} size={iconSize} /></View>;
+  }
+
  return (
    <Pressable
      {...props}
      accessibilityRole={accessibilityRole ?? "button"}
      disabled={disabled}
+      onHoverIn={() => setHovered(true)}
+      onHoverOut={() => setHovered(false)}
      style={({ pressed }) => [
        styles.base,
        sizeStyle,
@@ -122,7 +167,7 @@ export function Button({
        style,
      ]}
    >
-      {leftIcon ? <View>{leftIcon}</View> : null}
+      {renderIcon()}
      <Text style={resolvedTextStyle}>{children}</Text>
    </Pressable>
  );
@@ -278,7 +278,10 @@ export function DropdownMenuContent({
      setModalVisible(true);
      setClosing(false);
    } else if (modalVisible) {
-      setClosing(true);
+      // Avoid leaving an invisible full-screen Modal mounted on native when
+      // the exit animation callback does not fire.
+      setClosing(false);
+      setModalVisible(false);
    }
  }, [open, modalVisible]);

@@ -0,0 +1,490 @@
+import {
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+  type PropsWithChildren,
+  type ReactElement,
+} from "react";
+import { Dimensions, Platform, Text, View } from "react-native";
+import Animated, { FadeIn, FadeOut } from "react-native-reanimated";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { ExternalLink, FolderGit2, GitPullRequest, Monitor } from "lucide-react-native";
+import { Pressable } from "react-native";
+import { Portal } from "@gorhom/portal";
+import { useBottomSheetModalInternal } from "@gorhom/bottom-sheet";
+import type { SidebarWorkspaceEntry } from "@/hooks/use-sidebar-workspaces-list";
+import { type PrHint, useWorkspacePrHint } from "@/hooks/use-checkout-pr-status-query";
+import { openExternalUrl } from "@/utils/open-external-url";
+import { getStatusDotColor } from "@/utils/status-dot-color";
+import { shouldRenderSyncedStatusLoader } from "@/utils/status-loader";
+import { SyncedLoader } from "@/components/synced-loader";
+
+interface Rect {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+function measureElement(element: View): Promise<Rect> {
+  return new Promise((resolve) => {
+    element.measureInWindow((x, y, width, height) => {
+      resolve({ x, y, width, height });
+    });
+  });
+}
+
+function computeHoverCardPosition({
+  triggerRect,
+  contentSize,
+  displayArea,
+  offset,
+}: {
+  triggerRect: Rect;
+  contentSize: { width: number; height: number };
+  displayArea: Rect;
+  offset: number;
+}): { x: number; y: number } {
+  let x = triggerRect.x + triggerRect.width + offset;
+  let y = triggerRect.y;
+
+  // If it overflows right, try left
+  if (x + contentSize.width > displayArea.width - 8) {
+    x = triggerRect.x - contentSize.width - offset;
+  }
+
+  // Constrain to screen
+  const padding = 8;
+  x = Math.max(padding, Math.min(displayArea.width - contentSize.width - padding, x));
+  y = Math.max(
+    displayArea.y + padding,
+    Math.min(displayArea.y + displayArea.height - contentSize.height - padding, y),
+  );
+
+  return { x, y };
+}
+
+const HOVER_GRACE_MS = 100;
+const HOVER_CARD_WIDTH = 260;
+
+interface WorkspaceHoverCardProps {
+  workspace: SidebarWorkspaceEntry;
+  isDragging: boolean;
+}
+
+export function WorkspaceHoverCard({
+  workspace,
+  isDragging,
+  children,
+}: PropsWithChildren<WorkspaceHoverCardProps>): ReactElement {
+  // Desktop-only: skip on non-web platforms
+  if (Platform.OS !== "web") {
+    return <>{children}</>;
+  }
+
+  return (
+    <WorkspaceHoverCardDesktop workspace={workspace} isDragging={isDragging}>
+      {children}
+    </WorkspaceHoverCardDesktop>
+  );
+}
+
+function WorkspaceHoverCardDesktop({
+  workspace,
+  isDragging,
+  children,
+}: PropsWithChildren<WorkspaceHoverCardProps>): ReactElement {
+  const triggerRef = useRef<View>(null);
+  const [open, setOpen] = useState(false);
+  const graceTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const triggerHoveredRef = useRef(false);
+  const contentHoveredRef = useRef(false);
+
+  const hasServices = workspace.services.length > 0;
+
+  const clearGraceTimer = useCallback(() => {
+    if (graceTimerRef.current) {
+      clearTimeout(graceTimerRef.current);
+      graceTimerRef.current = null;
+    }
+  }, []);
+
+  const scheduleClose = useCallback(() => {
+    clearGraceTimer();
+    graceTimerRef.current = setTimeout(() => {
+      if (!triggerHoveredRef.current && !contentHoveredRef.current) {
+        setOpen(false);
+      }
+      graceTimerRef.current = null;
+    }, HOVER_GRACE_MS);
+  }, [clearGraceTimer]);
+
+  const handleTriggerEnter = useCallback(() => {
+    triggerHoveredRef.current = true;
+    clearGraceTimer();
+    if (!isDragging && hasServices) {
+      setOpen(true);
+    }
+  }, [clearGraceTimer, isDragging, hasServices]);
+
+  const handleTriggerLeave = useCallback(() => {
+    triggerHoveredRef.current = false;
+    scheduleClose();
+  }, [scheduleClose]);
+
+  const handleContentEnter = useCallback(() => {
+    contentHoveredRef.current = true;
+    clearGraceTimer();
+  }, [clearGraceTimer]);
+
+  const handleContentLeave = useCallback(() => {
+    contentHoveredRef.current = false;
+    scheduleClose();
+  }, [scheduleClose]);
+
+  // Close when drag starts
+  useEffect(() => {
+    if (isDragging) {
+      clearGraceTimer();
+      setOpen(false);
+    }
+  }, [isDragging, clearGraceTimer]);
+
+  // When hasServices becomes true while trigger is already hovered, open the card.
+  useEffect(() => {
+    if (!hasServices || isDragging) return;
+    if (triggerHoveredRef.current) {
+      setOpen(true);
+    }
+  }, [hasServices, isDragging]);
+
+  // Cleanup on unmount
+  useEffect(() => {
+    return () => {
+      clearGraceTimer();
+    };
+  }, [clearGraceTimer]);
+
+  return (
+    <View
+      ref={triggerRef}
+      collapsable={false}
+      onPointerEnter={handleTriggerEnter}
+      onPointerLeave={handleTriggerLeave}
+    >
+      {children}
+      {open && hasServices ? (
+        <WorkspaceHoverCardContent
+          workspace={workspace}
+          triggerRef={triggerRef}
+          onContentEnter={handleContentEnter}
+          onContentLeave={handleContentLeave}
+        />
+      ) : null}
+    </View>
+  );
+}
+
+const GITHUB_PR_STATE_LABELS: Record<PrHint["state"], string> = {
+  open: "Open",
+  merged: "Merged",
+  closed: "Closed",
+};
+
+function HoverCardStatusIndicator({
+  workspace,
+}: {
+  workspace: SidebarWorkspaceEntry;
+}): ReactElement | null {
+  const { theme } = useUnistyles();
+  const showSyncedLoader = shouldRenderSyncedStatusLoader({ bucket: workspace.statusBucket });
+
+  if (showSyncedLoader) {
+    return <SyncedLoader size={11} color={theme.colors.palette.amber[500]} />;
+  }
+
+  const KindIcon =
+    workspace.workspaceKind === "local_checkout"
+      ? Monitor
+      : workspace.workspaceKind === "worktree"
+        ? FolderGit2
+        : null;
+  if (!KindIcon) return null;
+
+  const dotColor = getStatusDotColor({ theme, bucket: workspace.statusBucket, showDoneAsInactive: false });
+
+  return (
+    <View style={styles.hoverStatusIcon}>
+      <KindIcon size={14} color={theme.colors.foregroundMuted} />
+      {dotColor ? (
+        <View
+          style={[
+            styles.hoverStatusDotOverlay,
+            {
+              backgroundColor: dotColor,
+              borderColor: theme.colors.surface1,
+            },
+          ]}
+        />
+      ) : null}
+    </View>
+  );
+}
+
+function WorkspaceHoverCardContent({
+  workspace,
+  triggerRef,
+  onContentEnter,
+  onContentLeave,
+}: {
+  workspace: SidebarWorkspaceEntry;
+  triggerRef: React.RefObject<View | null>;
+  onContentEnter: () => void;
+  onContentLeave: () => void;
+}): ReactElement | null {
+  const { theme } = useUnistyles();
+  const bottomSheetInternal = useBottomSheetModalInternal(true);
+  const [triggerRect, setTriggerRect] = useState<Rect | null>(null);
+  const [contentSize, setContentSize] = useState<{ width: number; height: number } | null>(null);
+  const [position, setPosition] = useState<{ x: number; y: number } | null>(null);
+  const prHint = useWorkspacePrHint({
+    serverId: workspace.serverId,
+    cwd: workspace.workspaceId,
+    enabled: workspace.workspaceKind !== "directory",
+  });
+
+  // Measure trigger — same pattern as tooltip.tsx
+  useEffect(() => {
+    if (!triggerRef.current) return;
+
+    let cancelled = false;
+    measureElement(triggerRef.current).then((rect) => {
+      if (cancelled) return;
+      setTriggerRect(rect);
+    });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [triggerRef]);
+
+  // Compute position when both measurements are available
+  useEffect(() => {
+    if (!triggerRect || !contentSize) return;
+    const { width: screenWidth, height: screenHeight } = Dimensions.get("window");
+    const displayArea = { x: 0, y: 0, width: screenWidth, height: screenHeight };
+    const result = computeHoverCardPosition({
+      triggerRect,
+      contentSize,
+      displayArea,
+      offset: 4,
+    });
+    setPosition(result);
+  }, [triggerRect, contentSize]);
+
+  const handleLayout = useCallback(
+    (event: { nativeEvent: { layout: { width: number; height: number } } }) => {
+      const { width, height } = event.nativeEvent.layout;
+      setContentSize({ width, height });
+    },
+    [],
+  );
+
+  return (
+    <Portal hostName={bottomSheetInternal?.hostName}>
+      <View pointerEvents="box-none" style={styles.portalOverlay}>
+        <Animated.View
+          entering={FadeIn.duration(80)}
+          exiting={FadeOut.duration(80)}
+          collapsable={false}
+          onLayout={handleLayout}
+          onPointerEnter={onContentEnter}
+          onPointerLeave={onContentLeave}
+          accessibilityRole="menu"
+          accessibilityLabel="Workspace services"
+          testID="workspace-hover-card"
+          style={[
+            styles.card,
+            {
+              width: HOVER_CARD_WIDTH,
+              position: "absolute",
+              top: position?.y ?? -9999,
+              left: position?.x ?? -9999,
+            },
+          ]}
+        >
+          <View style={styles.cardHeader}>
+            <HoverCardStatusIndicator workspace={workspace} />
+            <Text style={styles.cardTitle} numberOfLines={1} testID="hover-card-workspace-name">
+              {workspace.name}
+            </Text>
+          </View>
+          {workspace.diffStat ? (
+            <View style={styles.cardMetaRow}>
+              <Text style={styles.diffStatAdditions}>+{workspace.diffStat.additions}</Text>
+              <Text style={styles.diffStatDeletions}>-{workspace.diffStat.deletions}</Text>
+            </View>
+          ) : null}
+          {prHint ? (
+            <Pressable
+              style={styles.cardMetaRow}
+              onPress={() => void openExternalUrl(prHint.url)}
+            >
+              <GitPullRequest size={12} color={theme.colors.foregroundMuted} />
+              <Text style={styles.prBadgeText} numberOfLines={1}>
+                #{prHint.number} · {GITHUB_PR_STATE_LABELS[prHint.state]}
+              </Text>
+            </Pressable>
+          ) : null}
+          <View style={styles.separator} />
+          <View style={styles.serviceList} testID="hover-card-service-list">
+            {workspace.services.map((service) => (
+              <Pressable
+                key={service.hostname}
+                accessibilityRole="link"
+                accessibilityLabel={`${service.serviceName} service`}
+                testID={`hover-card-service-${service.serviceName}`}
+                style={({ hovered }) => [
+                  styles.serviceRow,
+                  hovered && styles.serviceRowHovered,
+                ]}
+                onPress={() => {
+                  if (service.url) {
+                    void openExternalUrl(service.url);
+                  }
+                }}
+                disabled={!service.url}
+              >
+                <View
+                  testID={`hover-card-service-status-${service.serviceName}`}
+                  accessibilityLabel={service.status === "running" ? "Running" : "Stopped"}
+                  style={[
+                    styles.statusDot,
+                    {
+                      backgroundColor:
+                        service.status === "running"
+                          ? theme.colors.palette.green[500]
+                          : theme.colors.palette.red[500],
+                    },
+                  ]}
+                />
+                <Text style={styles.serviceName} numberOfLines={1}>
+                  {service.serviceName}
+                </Text>
+                {service.url ? (
+                  <ExternalLink size={12} color={theme.colors.foregroundMuted} />
+                ) : null}
+              </Pressable>
+            ))}
+          </View>
+        </Animated.View>
+      </View>
+    </Portal>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  portalOverlay: {
+    position: "absolute",
+    top: 0,
+    right: 0,
+    bottom: 0,
+    left: 0,
+    zIndex: 1000,
+  },
+  card: {
+    backgroundColor: theme.colors.surface1,
+    borderWidth: 1,
+    borderColor: theme.colors.borderAccent,
+    borderRadius: theme.borderRadius.lg,
+    paddingVertical: theme.spacing[2],
+    shadowColor: "#000",
+    shadowOffset: { width: 0, height: 4 },
+    shadowOpacity: 0.2,
+    shadowRadius: 8,
+    elevation: 8,
+    zIndex: 1000,
+  },
+  cardHeader: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    paddingHorizontal: theme.spacing[3],
+    paddingBottom: theme.spacing[2],
+  },
+  cardTitle: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    fontWeight: theme.fontWeight.medium,
+    flex: 1,
+    minWidth: 0,
+  },
+  cardMetaRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: 6,
+    paddingHorizontal: theme.spacing[3],
+    paddingBottom: theme.spacing[2],
+  },
+  diffStatAdditions: {
+    fontSize: theme.fontSize.xs,
+    fontWeight: theme.fontWeight.normal,
+    color: theme.colors.palette.green[400],
+  },
+  diffStatDeletions: {
+    fontSize: theme.fontSize.xs,
+    fontWeight: theme.fontWeight.normal,
+    color: theme.colors.palette.red[500],
+  },
+  prBadgeText: {
+    fontSize: theme.fontSize.xs,
+    color: theme.colors.foregroundMuted,
+  },
+  hoverStatusIcon: {
+    width: 14,
+    height: 14,
+    alignItems: "center",
+    justifyContent: "center",
+    position: "relative",
+  },
+  hoverStatusDotOverlay: {
+    position: "absolute",
+    bottom: -1,
+    right: -1,
+    width: 6,
+    height: 6,
+    borderRadius: 3,
+    borderWidth: 1,
+  },
+  separator: {
+    height: 1,
+    backgroundColor: theme.colors.border,
+  },
+  serviceList: {
+    paddingTop: theme.spacing[1],
+  },
+  serviceRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    paddingHorizontal: theme.spacing[3],
+    paddingVertical: theme.spacing[2],
+    minHeight: 32,
+  },
+  serviceRowHovered: {
+    backgroundColor: theme.colors.surface2,
+  },
+  statusDot: {
+    width: 8,
+    height: 8,
+    borderRadius: 4,
+    flexShrink: 0,
+  },
+  serviceName: {
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize.sm,
+    flex: 1,
+    minWidth: 0,
+  },
+}));
@@ -60,14 +60,3 @@ export function getIsDesktop(): boolean {
  }
  return result;
 }
-
-// Get traffic light padding values (only non-zero on desktop macOS)
-export function getTrafficLightPadding(): { left: number; top: number } {
-  if (!getIsDesktopMac()) {
-    return { left: 0, top: 0 };
-  }
-  return {
-    left: DESKTOP_TRAFFIC_LIGHT_WIDTH,
-    top: DESKTOP_TRAFFIC_LIGHT_HEIGHT,
-  };
-}
@@ -0,0 +1,64 @@
+import { describe, expect, it } from "vitest";
+import type { WorkspaceServicePayload } from "@server/shared/messages";
+import type { WorkspaceDescriptor } from "@/stores/session-store";
+import { patchWorkspaceServices } from "./session-workspace-services";
+
+function workspace(input: {
+  id: string;
+  services?: WorkspaceDescriptor["services"];
+}): WorkspaceDescriptor {
+  return {
+    id: input.id,
+    projectId: "project-1",
+    projectDisplayName: "Project 1",
+    projectRootPath: "/repo",
+    projectKind: "git",
+    workspaceKind: "local_checkout",
+    name: "main",
+    status: "running",
+    activityAt: null,
+    diffStat: null,
+    services: input.services ?? [],
+  };
+}
+
+const runningService: WorkspaceServicePayload = {
+  serviceName: "web",
+  hostname: "main.web.localhost",
+  port: 3000,
+  url: "http://main.web.localhost:6767",
+  status: "running",
+};
+
+describe("patchWorkspaceServices", () => {
+  it("patches only the matching workspace services", () => {
+    const other = workspace({ id: "/repo/other", services: [] });
+    const current = new Map<string, WorkspaceDescriptor>([
+      ["/repo/main", workspace({ id: "/repo/main", services: [] })],
+      [other.id, other],
+    ]);
+
+    const next = patchWorkspaceServices(current, {
+      workspaceId: "/repo/main",
+      services: [runningService],
+    });
+
+    expect(next).not.toBe(current);
+    expect(next.get("/repo/main")?.services).toEqual([runningService]);
+    expect(next.get("/repo/other")).toBe(other);
+  });
+
+  it("ignores updates for unknown workspaces", () => {
+    const current = new Map<string, WorkspaceDescriptor>([
+      ["/repo/main", workspace({ id: "/repo/main", services: [] })],
+    ]);
+
+    const next = patchWorkspaceServices(current, {
+      workspaceId: "/repo/missing",
+      services: [runningService],
+    });
+
+    expect(next).toBe(current);
+    expect(next.get("/repo/main")?.services).toEqual([]);
+  });
+});
@@ -35,6 +35,7 @@ import {
  normalizeWorkspaceDescriptor,
 } from "@/stores/session-store";
 import { useDraftStore } from "@/stores/draft-store";
+import { useWorkspaceSetupStore } from "@/stores/workspace-setup-store";
 import type { AgentDirectoryEntry } from "@/types/agent-directory";
 import { sendOsNotification } from "@/utils/os-notifications";
 import { getIsAppActivelyVisible } from "@/utils/app-visibility";
@@ -50,6 +51,7 @@ import { resolveProjectPlacement } from "@/utils/project-placement";
 import { buildDraftStoreKey } from "@/stores/draft-keys";
 import type { AttachmentMetadata } from "@/attachments/types";
 import { reconcilePreviousAgentStatuses } from "@/contexts/session-status-tracking";
+import { patchWorkspaceServices } from "@/contexts/session-workspace-services";

 // Re-export types from session-store and draft-store for backward compatibility
 export type { DraftInput } from "@/stores/draft-store";
@@ -159,6 +161,10 @@ type WorkspaceUpdatePayload = Extract<
  SessionOutboundMessage,
  { type: "workspace_update" }
 >["payload"];
+type WorkspaceSetupProgressPayload = Extract<
+  SessionOutboundMessage,
+  { type: "workspace_setup_progress" }
+>["payload"];

 const getAgentIdFromUpdate = (update: AgentUpdatePayload): string =>
  update.kind === "remove" ? update.agentId : update.agent.id;
@@ -264,6 +270,9 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
  const setQueuedMessages = useSessionStore((state) => state.setQueuedMessages);
  const updateSessionClient = useSessionStore((state) => state.updateSessionClient);
  const updateSessionServerInfo = useSessionStore((state) => state.updateSessionServerInfo);
+  const upsertWorkspaceSetupProgress = useWorkspaceSetupStore((state) => state.upsertProgress);
+  const removeWorkspaceSetup = useWorkspaceSetupStore((state) => state.removeWorkspace);
+  const clearWorkspaceSetupServer = useWorkspaceSetupStore((state) => state.clearServer);

  // Track focused agent for heartbeat
  const focusedAgentId = useSessionStore(
@@ -748,6 +757,13 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
    ],
  );

+  const applyWorkspaceSetupProgress = useCallback(
+    (payload: WorkspaceSetupProgressPayload) => {
+      upsertWorkspaceSetupProgress({ serverId, payload });
+    },
+    [serverId, upsertWorkspaceSetupProgress],
+  );
+
  const requestCanonicalCatchUp = useCallback(
    (agentId: string, cursor: { epoch: string; endSeq: number }) => {
      void client
@@ -1090,12 +1106,34 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
    const unsubWorkspaceUpdate = client.on("workspace_update", (message) => {
      if (message.type !== "workspace_update") return;
      if (message.payload.kind === "remove") {
+        removeWorkspaceSetup({ serverId, workspaceId: message.payload.id });
        removeWorkspace(serverId, message.payload.id);
        return;
      }
      mergeWorkspaces(serverId, [normalizeWorkspaceDescriptor(message.payload.workspace)]);
    });

+    const unsubServiceStatusUpdate = client.on("service_status_update", (message) => {
+      if (message.type !== "service_status_update") return;
+      setWorkspaces(serverId, (prev) => patchWorkspaceServices(prev, message.payload));
+    });
+
+    const unsubWorkspaceSetupProgress = client.on("workspace_setup_progress", (message) => {
+      if (message.type !== "workspace_setup_progress") return;
+      applyWorkspaceSetupProgress(message.payload);
+    });
+
+    const unsubWorkspaceSetupStatusResponse = client.on(
+      "workspace_setup_status_response",
+      (message) => {
+        if (message.type !== "workspace_setup_status_response") return;
+        const { workspaceId, snapshot } = message.payload;
+        if (snapshot) {
+          applyWorkspaceSetupProgress({ workspaceId, ...snapshot });
+        }
+      },
+    );
+
    const unsubStatus = client.on("status", (message) => {
      if (message.type !== "status") return;
      const serverInfo = parseServerInfoStatusPayload(message.payload);
@@ -1444,6 +1482,9 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
      unsubAgentStream();
      unsubAgentTimeline();
      unsubWorkspaceUpdate();
+      unsubServiceStatusUpdate();
+      unsubWorkspaceSetupProgress();
+      unsubWorkspaceSetupStatusResponse();
      unsubStatus();
      unsubPermissionRequest();
      unsubPermissionResolved();
@@ -1469,8 +1510,10 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
    setAgentTimelineCursor,
    setInitializingAgents,
    setAgents,
+    setWorkspaces,
    mergeWorkspaces,
    removeWorkspace,
+    removeWorkspaceSetup,
    setAgentLastActivity,
    setPendingPermissions,
    setHasHydratedAgents,
@@ -1478,6 +1521,7 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
    notifyAgentAttention,
    requestCanonicalCatchUp,
    applyAgentUpdatePayload,
+    applyWorkspaceSetupProgress,
    applyTimelineResponse,
    voiceRuntime,
    voiceAudioEngine,
@@ -1681,9 +1725,10 @@ function SessionProviderInternal({ children, serverId, client }: SessionProvider
  // Cleanup on unmount
  useEffect(() => {
    return () => {
+      clearWorkspaceSetupServer(serverId);
      clearSession(serverId);
    };
-  }, [clearSession, serverId]);
+  }, [clearSession, clearWorkspaceSetupServer, serverId]);

  return children;
 }
@@ -0,0 +1,19 @@
+import type { ServiceStatusUpdateMessage } from "@server/shared/messages";
+import type { WorkspaceDescriptor } from "@/stores/session-store";
+
+export function patchWorkspaceServices(
+  workspaces: Map<string, WorkspaceDescriptor>,
+  update: ServiceStatusUpdateMessage["payload"],
+): Map<string, WorkspaceDescriptor> {
+  const existing = workspaces.get(update.workspaceId);
+  if (!existing) {
+    return workspaces;
+  }
+
+  const next = new Map(workspaces);
+  next.set(update.workspaceId, {
+    ...existing,
+    services: update.services.map((s) => ({ ...s })),
+  });
+  return next;
+}
@@ -6,7 +6,7 @@ export type DesktopDaemonState = "starting" | "running" | "stopped" | "errored";
 export type DesktopDaemonStatus = {
  serverId: string;
  status: DesktopDaemonState;
-  listen: string;
+  listen: string | null;
  hostname: string | null;
  pid: number | null;
  home: string;
@@ -82,7 +82,7 @@ function parseDesktopDaemonStatus(raw: unknown): DesktopDaemonStatus {
  return {
    serverId: toStringOrNull(raw.serverId) ?? "",
    status: parseDesktopDaemonState(raw.status),
-    listen: toStringOrNull(raw.listen) ?? "",
+    listen: toStringOrNull(raw.listen),
    hostname: toStringOrNull(raw.hostname),
    pid: toNumberOrNull(raw.pid),
    home: toStringOrNull(raw.home) ?? "",
@@ -13,6 +13,7 @@ import { useHosts } from "@/runtime/host-runtime";
 import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
 import {
  useFormPreferences,
+  mergeProviderPreferences,
  type FormPreferences,
  type ProviderPreferences,
 } from "./use-form-preferences";
@@ -693,26 +694,23 @@ export function useAgentFormState(options: UseAgentFormStateOptions = {}): UseAg
  const persistFormPreferences = useCallback(async () => {
    const resolvedModel = resolveEffectiveModel(availableModels, formState.model);
    const modelId = resolvedModel?.id ?? formState.model;
-    const existingProviderPrefs = preferences?.providerPreferences?.[formState.provider];
-
-    const nextProviderPrefs: ProviderPreferences = {
-      model: modelId || undefined,
-      mode: formState.modeId || undefined,
-      thinkingByModel: {
-        ...existingProviderPrefs?.thinkingByModel,
-        ...(modelId && formState.thinkingOptionId
-          ? { [modelId]: formState.thinkingOptionId }
-          : {}),
-      },
-    };
-
-    await updatePreferences({
+    const nextPreferences = mergeProviderPreferences({
+      preferences: preferences ?? {},
      provider: formState.provider,
-      providerPreferences: {
-        ...preferences?.providerPreferences,
-        [formState.provider]: nextProviderPrefs,
-      },
+      updates: {
+        model: modelId || undefined,
+        mode: formState.modeId || undefined,
+        ...(modelId && formState.thinkingOptionId
+          ? {
+              thinkingByModel: {
+                [modelId]: formState.thinkingOptionId,
+              },
+            }
+          : {}),
+      } satisfies Partial<ProviderPreferences>,
    });
+
+    await updatePreferences(nextPreferences);
  }, [
    availableModels,
    formState.model,
@@ -0,0 +1,57 @@
+import { describe, expect, it } from "vitest";
+
+import { mergeProviderPreferences } from "./use-form-preferences";
+
+describe("mergeProviderPreferences", () => {
+  it("stores the selected model for a provider", () => {
+    expect(
+      mergeProviderPreferences({
+        preferences: {},
+        provider: "claude",
+        updates: { model: "claude-opus-4-6" },
+      }),
+    ).toEqual({
+      provider: "claude",
+      providerPreferences: {
+        claude: {
+          model: "claude-opus-4-6",
+        },
+      },
+    });
+  });
+
+  it("merges thinking preferences by model without dropping existing entries", () => {
+    expect(
+      mergeProviderPreferences({
+        preferences: {
+          provider: "claude",
+          providerPreferences: {
+            claude: {
+              model: "claude-sonnet-4-6",
+              thinkingByModel: {
+                "claude-sonnet-4-6": "medium",
+              },
+            },
+          },
+        },
+        provider: "claude",
+        updates: {
+          thinkingByModel: {
+            "claude-opus-4-6": "high",
+          },
+        },
+      }),
+    ).toEqual({
+      provider: "claude",
+      providerPreferences: {
+        claude: {
+          model: "claude-sonnet-4-6",
+          thinkingByModel: {
+            "claude-sonnet-4-6": "medium",
+            "claude-opus-4-6": "high",
+          },
+        },
+      },
+    });
+  });
+});
@@ -2,6 +2,7 @@ import { useCallback } from "react";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { z } from "zod";
+import type { AgentProvider } from "@server/server/agent/agent-sdk-types";

 const FORM_PREFERENCES_STORAGE_KEY = "@paseo:create-agent-preferences";
 const FORM_PREFERENCES_QUERY_KEY = ["form-preferences"];
@@ -35,6 +36,36 @@ export interface UseFormPreferencesReturn {
  updatePreferences: (updates: Partial<FormPreferences>) => Promise<void>;
 }

+export function mergeProviderPreferences(args: {
+  preferences: FormPreferences;
+  provider: AgentProvider;
+  updates: Partial<ProviderPreferences>;
+}): FormPreferences {
+  const { preferences, provider, updates } = args;
+  const existingProviderPreferences = preferences.providerPreferences ?? {};
+  const existing = existingProviderPreferences[provider] ?? {};
+  const nextThinkingByModel =
+    updates.thinkingByModel === undefined
+      ? existing.thinkingByModel
+      : {
+          ...existing.thinkingByModel,
+          ...updates.thinkingByModel,
+        };
+
+  return {
+    ...preferences,
+    provider,
+    providerPreferences: {
+      ...existingProviderPreferences,
+      [provider]: {
+        ...existing,
+        ...updates,
+        ...(nextThinkingByModel ? { thinkingByModel: nextThinkingByModel } : {}),
+      },
+    },
+  };
+}
+
 export function useFormPreferences(): UseFormPreferencesReturn {
  const queryClient = useQueryClient();
  const { data, isPending } = useQuery({
@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+import type { WorkspaceServicePayload } from "@server/shared/messages";
 import {
  appendMissingOrderKeys,
  applyStoredOrdering,
@@ -19,7 +20,7 @@ function workspace(
    Partial<
      Pick<
        WorkspaceDescriptor,
-        "projectDisplayName" | "projectRootPath" | "projectKind" | "workspaceKind"
+        "projectDisplayName" | "projectRootPath" | "projectKind" | "workspaceKind" | "services"
      >
    >,
 ): WorkspaceDescriptor {
@@ -34,9 +35,26 @@ function workspace(
    status: input.status,
    activityAt: input.activityAt,
    diffStat: null,
+    services: input.services ?? [],
  };
 }

+const runningService: WorkspaceServicePayload = {
+  serviceName: "web",
+  hostname: "main.web.localhost",
+  port: 3000,
+  url: "http://main.web.localhost:6767",
+  status: "running",
+};
+
+const stoppedService: WorkspaceServicePayload = {
+  serviceName: "api",
+  hostname: "main.api.localhost",
+  port: 3001,
+  url: "http://main.api.localhost:6767",
+  status: "stopped",
+};
+
 describe("applyStoredOrdering", () => {
  it("keeps unknown items on the baseline while applying stored order", () => {
    const result = applyStoredOrdering({
@@ -117,6 +135,27 @@ describe("buildSidebarProjectsFromWorkspaces", () => {
    expect(projects[0]?.workspaces[0]?.statusBucket).toBe("failed");
  });

+  it("threads services into workspace rows and derives hasRunningServices", () => {
+    const projects = buildSidebarProjectsFromWorkspaces({
+      serverId: "srv",
+      workspaces: [
+        workspace({
+          id: "/repo/main",
+          projectId: "project-1",
+          name: "main",
+          status: "running",
+          activityAt: new Date("2026-01-01T00:00:00.000Z"),
+          services: [runningService, stoppedService],
+        }),
+      ],
+      projectOrder: [],
+      workspaceOrderByScope: {},
+    });
+
+    expect(projects[0]?.workspaces[0]?.services).toEqual([runningService, stoppedService]);
+    expect(projects[0]?.workspaces[0]?.hasRunningServices).toBe(true);
+  });
+
  it("preserves stored project order even when activity changes", () => {
    const initialWorkspaces: WorkspaceDescriptor[] = [
      workspace({
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useMemo, useSyncExternalStore } from "react";
+import type { WorkspaceDescriptorPayload } from "@server/shared/messages";
 import { normalizeWorkspaceDescriptor, useSessionStore } from "@/stores/session-store";
 import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { useSidebarOrderStore } from "@/stores/sidebar-order-store";
@@ -20,6 +21,8 @@ export interface SidebarWorkspaceEntry {
  activityAt: Date | null;
  statusBucket: SidebarStateBucket;
  diffStat: { additions: number; deletions: number } | null;
+  services: WorkspaceDescriptor["services"];
+  hasRunningServices: boolean;
 }

 export interface SidebarProjectEntry {
@@ -135,6 +138,8 @@ export function buildSidebarProjectsFromWorkspaces(input: {
      activityAt: workspace.activityAt,
      statusBucket: workspace.status,
      diffStat: workspace.diffStat,
+      services: workspace.services,
+      hasRunningServices: workspace.services.some((service) => service.status === "running"),
    };

    project.workspaces.push(row);
@@ -257,8 +262,12 @@ function toWorkspaceDescriptor(payload: {
  name: string;
  status: WorkspaceDescriptor["status"];
  activityAt: string | null;
+  services?: WorkspaceDescriptorPayload["services"];
 }): WorkspaceDescriptor {
-  return normalizeWorkspaceDescriptor(payload);
+  return normalizeWorkspaceDescriptor({
+    ...payload,
+    services: payload.services ?? [],
+  });
 }

 export function useSidebarWorkspacesList(options?: {
@@ -2,6 +2,7 @@ import { agentPanelRegistration } from "@/panels/agent-panel";
 import { draftPanelRegistration } from "@/panels/draft-panel";
 import { filePanelRegistration } from "@/panels/file-panel";
 import { registerPanel } from "@/panels/panel-registry";
+import { setupPanelRegistration } from "@/panels/setup-panel";
 import { terminalPanelRegistration } from "@/panels/terminal-panel";

 let panelsRegistered = false;
@@ -12,6 +13,7 @@ export function ensurePanelsRegistered(): void {
  }
  registerPanel(draftPanelRegistration);
  registerPanel(agentPanelRegistration);
+  registerPanel(setupPanelRegistration);
  registerPanel(terminalPanelRegistration);
  registerPanel(filePanelRegistration);
  panelsRegistered = true;
@@ -0,0 +1,444 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+import { CheckCircle2, ChevronRight, CircleAlert, SquareTerminal } from "lucide-react-native";
+import { ActivityIndicator, Pressable, ScrollView, Text, View } from "react-native";
+import invariant from "tiny-invariant";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { Fonts } from "@/constants/theme";
+import { usePaneContext } from "@/panels/pane-context";
+import type { PanelDescriptor, PanelRegistration } from "@/panels/panel-registry";
+import { buildWorkspaceTabPersistenceKey } from "@/stores/workspace-tabs-store";
+import { useWorkspaceSetupStore } from "@/stores/workspace-setup-store";
+import { useHostRuntimeClient } from "@/runtime/host-runtime";
+
+function useSetupPanelDescriptor(
+  target: { kind: "setup"; workspaceId: string },
+  context: { serverId: string; workspaceId: string },
+): PanelDescriptor {
+  const key = buildWorkspaceTabPersistenceKey({
+    serverId: context.serverId,
+    workspaceId: target.workspaceId,
+  });
+  const snapshot = useWorkspaceSetupStore((state) => (key ? state.snapshots[key] ?? null : null));
+
+  if (snapshot?.status === "completed") {
+    return {
+      label: "Setup",
+      subtitle: "Setup completed",
+      titleState: "ready",
+      icon: CheckCircle2,
+      statusBucket: null,
+    };
+  }
+
+  if (snapshot?.status === "failed") {
+    return {
+      label: "Setup",
+      subtitle: "Setup failed",
+      titleState: "ready",
+      icon: CircleAlert,
+      statusBucket: null,
+    };
+  }
+
+  return {
+    label: "Setup",
+    subtitle: "Workspace setup",
+    titleState: "ready",
+    icon: SquareTerminal,
+    statusBucket: snapshot?.status === "running" ? "running" : null,
+  };
+}
+
+type CommandStatus = "running" | "completed" | "failed";
+
+function CommandStatusIcon({ status }: { status: CommandStatus }) {
+  const { theme } = useUnistyles();
+
+  if (status === "running") {
+    return <ActivityIndicator size={14} color={theme.colors.foreground} />;
+  }
+  if (status === "completed") {
+    return <CheckCircle2 size={14} color={theme.colors.palette.green[500]} />;
+  }
+  return <CircleAlert size={14} color={theme.colors.palette.red[500]} />;
+}
+
+function formatDuration(ms: number): string {
+  if (ms < 1000) return `${ms}ms`;
+  const seconds = Math.floor(ms / 1000);
+  if (seconds < 60) return `${seconds}s`;
+  const minutes = Math.floor(seconds / 60);
+  const remainingSeconds = seconds % 60;
+  return `${minutes}m ${remainingSeconds}s`;
+}
+
+/**
+ * Process carriage returns in log text so progress-bar output renders cleanly.
+ * Splits on \r, keeps only the last segment per CR-delimited group (unless followed by \n).
+ */
+function processCarriageReturns(text: string): string {
+  if (!text.includes("\r")) return text;
+  return text
+    .split("\n")
+    .map((line) => {
+      if (!line.includes("\r")) return line;
+      const segments = line.split("\r");
+      return segments[segments.length - 1];
+    })
+    .join("\n");
+}
+
+function SetupPanel() {
+  const { theme } = useUnistyles();
+  const { serverId, target } = usePaneContext();
+  invariant(target.kind === "setup", "SetupPanel requires setup target");
+
+  const client = useHostRuntimeClient(serverId);
+  const key = buildWorkspaceTabPersistenceKey({
+    serverId,
+    workspaceId: target.workspaceId,
+  });
+  const snapshot = useWorkspaceSetupStore((state) => (key ? state.snapshots[key] ?? null : null));
+  const upsertProgress = useWorkspaceSetupStore((state) => state.upsertProgress);
+
+  // On mount, if no snapshot in the store, request cached status from server
+  const requestedRef = useRef(false);
+  useEffect(() => {
+    if (snapshot || requestedRef.current || !client) return;
+    requestedRef.current = true;
+    client
+      .fetchWorkspaceSetupStatus(target.workspaceId)
+      .then((response) => {
+        if (response.snapshot) {
+          upsertProgress({
+            serverId,
+            payload: { workspaceId: response.workspaceId, ...response.snapshot },
+          });
+        }
+      })
+      .catch(() => {
+        // Server may not support this yet — ignore
+      });
+  }, [client, snapshot, serverId, target.workspaceId, upsertProgress]);
+
+  const commands = snapshot?.detail.commands ?? [];
+  const log = snapshot?.detail.log ?? "";
+  const hasNoSetupCommands =
+    snapshot?.status === "completed" && commands.length === 0 && log.trim().length === 0;
+  const isWaiting = !snapshot || (snapshot.status === "running" && commands.length === 0);
+
+  const [expandedIndices, setExpandedIndices] = useState<Set<number>>(new Set());
+  const [manuallyCollapsed, setManuallyCollapsed] = useState<Set<number>>(new Set());
+
+  const toggleExpanded = useCallback((index: number, isAutoExpanded: boolean) => {
+    setExpandedIndices((prev) => {
+      const next = new Set(prev);
+      if (next.has(index) || isAutoExpanded) {
+        next.delete(index);
+        // If this was auto-expanded, record that the user manually collapsed it
+        if (isAutoExpanded) {
+          setManuallyCollapsed((mc) => new Set(mc).add(index));
+        }
+      } else {
+        next.add(index);
+        // If the user re-expands, remove from manually collapsed
+        setManuallyCollapsed((mc) => {
+          const next = new Set(mc);
+          next.delete(index);
+          return next;
+        });
+      }
+      return next;
+    });
+  }, []);
+
+  // Determine which command should auto-expand (running or last completed).
+  const autoExpandIndex = (() => {
+    const running = commands.find((c) => c.status === "running");
+    if (running) return running.index;
+    if (commands.length > 0) return commands[commands.length - 1].index;
+    return null;
+  })();
+
+  const statusLabel = snapshot?.status === "running"
+    ? "Running"
+    : snapshot?.status === "completed"
+      ? "Completed"
+      : snapshot?.status === "failed"
+        ? "Failed"
+        : "Waiting for setup output";
+
+  return (
+    <ScrollView
+      style={styles.container}
+      contentContainerStyle={styles.contentContainer}
+      testID="workspace-setup-panel"
+    >
+      {/* Hidden element for status — preserves testID for E2E */}
+      <Text
+        style={styles.hiddenStatus}
+        testID="workspace-setup-status"
+      >{statusLabel}</Text>
+
+      {isWaiting ? (
+        <View style={styles.waitingContainer}>
+          <ActivityIndicator size="large" color={theme.colors.foregroundMuted} />
+          <Text style={styles.waitingText}>Setting up workspace...</Text>
+        </View>
+      ) : hasNoSetupCommands ? (
+        <View style={styles.emptyContainer}>
+          <Text
+            style={styles.emptyText}
+            accessible
+            accessibilityLabel="No setup commands ran for this workspace"
+          >
+            No setup commands ran for this workspace.
+          </Text>
+        </View>
+      ) : (
+        <View style={styles.commandList}>
+          {commands.map((command) => {
+            const isExpanded = expandedIndices.has(command.index);
+            const hasError = command.status === "failed" && snapshot?.error;
+
+            // Per-command log: use command.log if available, fall back to detail.log for the auto-expand target
+            const commandLog = (() => {
+              if ("log" in command && typeof command.log === "string") {
+                return command.log;
+              }
+              // Fallback: show detail.log on the auto-expand target command
+              if (command.index === autoExpandIndex) return log;
+              return "";
+            })();
+            const hasLog = commandLog.trim().length > 0;
+
+            // All non-running commands are expandable (completed/failed)
+            const isExpandable = command.status !== "running" || hasLog || !!hasError;
+
+            // Auto-expand the active command unless the user manually collapsed it
+            const isAutoExpanded =
+              command.index === autoExpandIndex && !manuallyCollapsed.has(command.index);
+            const showDetail = isExpanded || isAutoExpanded;
+
+            const processedLog = hasLog ? processCarriageReturns(commandLog) : "";
+
+            return (
+              <View key={`${command.index}:${command.command}`} style={styles.commandItem}>
+                <Pressable
+                  onPress={() => toggleExpanded(command.index, isAutoExpanded)}
+                  style={({ pressed }) => [
+                    styles.commandRow,
+                    showDetail && styles.commandRowExpanded,
+                    pressed && styles.commandRowPressed,
+                  ]}
+                  accessibilityRole="button"
+                  accessibilityState={{ expanded: showDetail }}
+                >
+                  <View style={styles.commandStatusIcon}>
+                    <CommandStatusIcon status={command.status} />
+                  </View>
+                  <Text style={styles.commandText} numberOfLines={1}>
+                    {command.command}
+                  </Text>
+                  {command.durationMs != null ? (
+                    <Text style={styles.commandDuration}>
+                      {formatDuration(command.durationMs)}
+                    </Text>
+                  ) : null}
+                  <ChevronRight
+                    size={14}
+                    color={theme.colors.foregroundMuted}
+                    style={[
+                      styles.chevron,
+                      showDetail && styles.chevronExpanded,
+                    ]}
+                  />
+                </Pressable>
+                {showDetail ? (
+                  <View style={styles.commandDetail}>
+                    {hasLog ? (
+                      <ScrollView
+                        style={styles.logScroll}
+                        contentContainerStyle={styles.logScrollContent}
+                        horizontal={false}
+                        showsVerticalScrollIndicator
+                        testID="workspace-setup-log"
+                        accessible
+                        accessibilityLabel="Workspace setup log"
+                      >
+                        <Text selectable style={styles.logText}>
+                          {processedLog}
+                        </Text>
+                      </ScrollView>
+                    ) : (
+                      <View
+                        style={styles.logScrollContent}
+                        testID="workspace-setup-log"
+                        accessible
+                        accessibilityLabel="Workspace setup log"
+                      >
+                        <Text style={styles.emptyLogText}>No output</Text>
+                      </View>
+                    )}
+                    {hasError ? (
+                      <View style={styles.errorCard}>
+                        <Text selectable style={styles.errorText}>
+                          {snapshot.error}
+                        </Text>
+                      </View>
+                    ) : null}
+                  </View>
+                ) : null}
+              </View>
+            );
+          })}
+
+          {/* If there's log but no commands yet, or log without a target command, show standalone */}
+          {commands.length === 0 && log.trim().length > 0 ? (
+            <ScrollView
+              style={styles.logScroll}
+              contentContainerStyle={styles.logScrollContent}
+              showsVerticalScrollIndicator
+              testID="workspace-setup-log"
+              accessible
+              accessibilityLabel="Workspace setup log"
+            >
+              <Text selectable style={styles.logText}>
+                {log}
+              </Text>
+            </ScrollView>
+          ) : null}
+
+          {/* Show error at top level if no commands failed but there's a setup error */}
+          {snapshot?.error && !commands.some((c) => c.status === "failed") ? (
+            <View style={styles.errorCard}>
+              <Text selectable style={styles.errorText}>
+                {snapshot.error}
+              </Text>
+            </View>
+          ) : null}
+        </View>
+      )}
+    </ScrollView>
+  );
+}
+
+export const setupPanelRegistration: PanelRegistration<"setup"> = {
+  kind: "setup",
+  component: SetupPanel,
+  useDescriptor: useSetupPanelDescriptor,
+};
+
+const styles = StyleSheet.create((theme) => ({
+  container: {
+    flex: 1,
+    minHeight: 0,
+    backgroundColor: theme.colors.surface0,
+  },
+  contentContainer: {
+    padding: theme.spacing[4],
+    flexGrow: 1,
+  },
+  hiddenStatus: {
+    position: "absolute",
+    width: 1,
+    height: 1,
+    overflow: "hidden",
+    opacity: 0,
+  },
+  waitingContainer: {
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "center",
+    gap: theme.spacing[3],
+  },
+  waitingText: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foregroundMuted,
+  },
+  emptyContainer: {
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  emptyText: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foregroundMuted,
+  },
+  commandList: {
+    gap: theme.spacing[2],
+  },
+  commandItem: {
+    borderRadius: theme.borderRadius.lg,
+    borderWidth: theme.borderWidth[1],
+    borderColor: theme.colors.border,
+    overflow: "hidden",
+  },
+  commandRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+    paddingHorizontal: theme.spacing[3],
+    paddingVertical: theme.spacing[2],
+    backgroundColor: theme.colors.surface1,
+  },
+  commandRowExpanded: {
+    borderBottomWidth: theme.borderWidth[1],
+    borderBottomColor: theme.colors.border,
+  },
+  commandRowPressed: {
+    opacity: 0.8,
+  },
+  commandStatusIcon: {
+    width: 18,
+    height: 18,
+    alignItems: "center",
+    justifyContent: "center",
+    flexShrink: 0,
+  },
+  commandText: {
+    flex: 1,
+    fontFamily: Fonts.mono,
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foreground,
+  },
+  commandDuration: {
+    fontSize: theme.fontSize.xs,
+    color: theme.colors.foregroundMuted,
+    flexShrink: 0,
+  },
+  chevron: {
+    flexShrink: 0,
+  },
+  chevronExpanded: {
+    transform: [{ rotate: "90deg" }],
+  },
+  commandDetail: {
+    backgroundColor: theme.colors.surface0,
+  },
+  logScroll: {
+    maxHeight: 400,
+  },
+  logScrollContent: {
+    padding: theme.spacing[3],
+  },
+  logText: {
+    fontFamily: Fonts.mono,
+    fontSize: theme.fontSize.sm,
+    lineHeight: 20,
+    color: theme.colors.foreground,
+  },
+  emptyLogText: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.foregroundMuted,
+    fontStyle: "italic",
+  },
+  errorCard: {
+    padding: theme.spacing[3],
+    backgroundColor: theme.colors.palette.red[100],
+  },
+  errorText: {
+    fontSize: theme.fontSize.sm,
+    color: theme.colors.palette.red[800],
+  },
+}));
@@ -15,7 +15,10 @@ import {
 } from "@/types/host-connection";
 import { decodeOfferFragmentPayload, normalizeHostPort } from "@/utils/daemon-endpoints";
 import { ConnectionOfferSchema, type ConnectionOffer } from "@server/shared/connection-offer";
-import { shouldUseDesktopDaemon, startDesktopDaemon } from "@/desktop/daemon/desktop-daemon";
+import {
+  shouldUseDesktopDaemon,
+  startDesktopDaemon,
+} from "@/desktop/daemon/desktop-daemon";
 import { connectToDaemon } from "@/utils/test-daemon-connection";
 import { buildDaemonWebSocketUrl, buildRelayWebSocketUrl } from "@/utils/daemon-endpoints";
 import { getOrCreateClientId } from "@/utils/client-id";
@@ -33,6 +36,10 @@ import { useSessionStore, type Agent } from "@/stores/session-store";

 export type HostRuntimeConnectionStatus = "idle" | "connecting" | "online" | "offline" | "error";

+export type HostRuntimeBootstrapResult =
+  | { ok: true; listenAddress: string; serverId: string; hostname: string | null }
+  | { ok: false; error: string };
+
 export type ActiveConnection =
  | { type: "directTcp"; endpoint: string; display: string }
  | { type: "directSocket"; endpoint: string; display: "socket" }
@@ -1073,6 +1080,7 @@ const DEFAULT_LOCALHOST_ENDPOINT =
  process.env.EXPO_PUBLIC_LOCAL_DAEMON?.trim() || "localhost:6767";
 const DEFAULT_LOCALHOST_BOOTSTRAP_KEY = "@paseo:default-localhost-bootstrap-v1";
 const DEFAULT_LOCALHOST_BOOTSTRAP_TIMEOUT_MS = 2500;
+const CONNECTION_ONLINE_TIMEOUT_MS = 15_000;
 const E2E_STORAGE_KEY = "@paseo:e2e";

 export class HostRuntimeStore {
@@ -1161,35 +1169,40 @@ export class HostRuntimeStore {
    }
  }

-  private async bootstrapDesktop(): Promise<void> {
-    let lastError: unknown = null;
-
-    for (let attempt = 1; attempt <= 3; attempt += 1) {
-      try {
-        const daemon = await startDesktopDaemon();
-        const connection = connectionFromListen(daemon.listen);
-        if (!connection || !daemon.serverId) {
-          return;
-        }
-        await this.upsertHostConnection({
-          serverId: daemon.serverId,
-          label: daemon.hostname ?? undefined,
-          connection,
-        });
-        return;
-      } catch (error) {
-        lastError = error;
-        console.warn(`[HostRuntime] Failed to bootstrap desktop daemon (attempt ${attempt}/3)`, error);
-        if (attempt < 3) {
-          await new Promise((resolve) => {
-            setTimeout(resolve, attempt * 500);
-          });
-        }
+  async bootstrapDesktop(): Promise<HostRuntimeBootstrapResult> {
+    try {
+      const daemon = await startDesktopDaemon();
+      const listenAddress = daemon.listen?.trim() ?? "";
+      const serverId = daemon.serverId.trim();
+      if (!listenAddress) {
+        return {
+          ok: false,
+          error: "Desktop daemon did not return a listen address.",
+        };
      }
-    }
-
-    if (lastError) {
-      console.warn("[HostRuntime] Desktop daemon bootstrap exhausted retries", lastError);
+      if (!serverId) {
+        return {
+          ok: false,
+          error: "Desktop daemon did not return a server id.",
+        };
+      }
+      if (!connectionFromListen(listenAddress)) {
+        return {
+          ok: false,
+          error: `Desktop daemon returned an unsupported listen address: ${listenAddress}`,
+        };
+      }
+      return {
+        ok: true,
+        listenAddress,
+        serverId,
+        hostname: daemon.hostname,
+      };
+    } catch (error) {
+      return {
+        ok: false,
+        error: toErrorMessage(error),
+      };
    }
  }

@@ -1295,6 +1308,36 @@ export class HostRuntimeStore {
    return this.upsertConnectionFromOffer(offer);
  }

+  async addConnectionFromListenAndWaitForOnline(input: {
+    listenAddress: string;
+    serverId: string;
+    hostname: string | null;
+    timeoutMs?: number;
+  }): Promise<HostProfile> {
+    const normalizedListenAddress = input.listenAddress.trim();
+    const serverId = input.serverId.trim();
+    const connection = connectionFromListen(normalizedListenAddress);
+    if (!connection) {
+      throw new Error(`Unsupported listen address: ${input.listenAddress}`);
+    }
+    if (!serverId) {
+      throw new Error("Desktop daemon did not return a server id.");
+    }
+    const profile = await this.upsertHostConnection({
+      serverId,
+      label: input.hostname ?? undefined,
+      connection,
+    });
+
+    await this.waitForConnectionOnline({
+      serverId,
+      connectionId: connection.id,
+      timeoutMs: input.timeoutMs,
+    });
+
+    return profile;
+  }
+
  async renameHost(serverId: string, label: string): Promise<void> {
    const next = this.hosts.map((h) =>
      h.serverId === serverId ? { ...h, label, updatedAt: new Date().toISOString() } : h,
@@ -1456,6 +1499,100 @@ export class HostRuntimeStore {
    }
  }

+  private waitForConnectionOnline(input: {
+    serverId: string;
+    connectionId: string;
+    timeoutMs?: number;
+  }): Promise<void> {
+    const { serverId, connectionId } = input;
+    const timeoutMs = input.timeoutMs ?? CONNECTION_ONLINE_TIMEOUT_MS;
+
+    return new Promise((resolve, reject) => {
+      let settled = false;
+      let timeoutHandle: ReturnType<typeof setTimeout> | null = null;
+
+      const cleanup = (unsubscribe: (() => void) | null): void => {
+        if (timeoutHandle) {
+          clearTimeout(timeoutHandle);
+          timeoutHandle = null;
+        }
+        unsubscribe?.();
+      };
+
+      const settle = (
+        unsubscribe: (() => void) | null,
+        outcome: { ok: true } | { ok: false; error: Error },
+      ): void => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        cleanup(unsubscribe);
+        if (outcome.ok) {
+          resolve();
+        } else {
+          reject(outcome.error);
+        }
+      };
+
+      const readSnapshot = (): { ok: true } | { ok: false; error: Error } | null => {
+        const snapshot = this.getSnapshot(serverId);
+        if (!snapshot) {
+          return {
+            ok: false,
+            error: new Error(`Unknown host runtime for serverId ${serverId}`),
+          };
+        }
+
+        if (
+          snapshot.activeConnectionId === connectionId &&
+          snapshot.connectionStatus === "online"
+        ) {
+          return { ok: true };
+        }
+
+        if (
+          snapshot.activeConnectionId === connectionId &&
+          snapshot.connectionStatus === "error"
+        ) {
+          return {
+            ok: false,
+            error: new Error(snapshot.lastError ?? "Connection failed before coming online."),
+          };
+        }
+
+        return null;
+      };
+
+      const unsubscribe = this.subscribe(serverId, () => {
+        const outcome = readSnapshot();
+        if (outcome) {
+          settle(unsubscribe, outcome);
+        }
+      });
+
+      timeoutHandle = setTimeout(() => {
+        settle(unsubscribe, {
+          ok: false,
+          error: new Error(`Timed out waiting for connection ${connectionId} to come online.`),
+        });
+      }, timeoutMs);
+
+      const initialOutcome = readSnapshot();
+      if (initialOutcome) {
+        settle(unsubscribe, initialOutcome);
+        return;
+      }
+
+      void this.runProbeCycleNow(serverId).catch((error) => {
+        settle(unsubscribe, {
+          ok: false,
+          error: error instanceof Error ? error : new Error(String(error)),
+        });
+      });
+    });
+  }
+
  private maybeAutoBootstrapAgentDirectory(serverId: string): void {
    const controller = this.controllers.get(serverId);
    if (!controller) {
@@ -1,27 +1,22 @@
 import { useEffect } from "react";
-import { View, Text, Pressable } from "react-native";
-import { StyleSheet, UnistylesRuntime, useUnistyles } from "react-native-unistyles";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { View, Text } from "react-native";
+import { StyleSheet, UnistylesRuntime } from "react-native-unistyles";
 import { FolderOpen } from "lucide-react-native";
 import { PaseoLogo } from "@/components/icons/paseo-logo";
-import { SidebarMenuToggle } from "@/components/headers/menu-header";
+import { Button } from "@/components/ui/button";
+import { MenuHeader } from "@/components/headers/menu-header";
 import { useOpenProjectPicker } from "@/hooks/use-open-project-picker";
 import { usePanelStore } from "@/stores/panel-store";
-import { useDesktopDragHandlers, useTrafficLightPadding } from "@/utils/desktop-window";
+import { useSessionStore } from "@/stores/session-store";
+import { useDesktopDragHandlers } from "@/utils/desktop-window";

 export function OpenProjectScreen({ serverId }: { serverId: string }) {
-  const { theme } = useUnistyles();
-  const insets = useSafeAreaInsets();
-  const trafficLightPadding = useTrafficLightPadding();
-  const desktopAgentListOpen = usePanelStore((s) => s.desktop.agentListOpen);
  const openAgentList = usePanelStore((s) => s.openAgentList);
  const openProjectPicker = useOpenProjectPicker(serverId);
+  const hasHydrated = useSessionStore((s) => s.sessions[serverId]?.hasHydratedWorkspaces ?? false);
+  const hasProjects = useSessionStore((s) => (s.sessions[serverId]?.workspaces?.size ?? 0) > 0);

  const isMobile = UnistylesRuntime.breakpoint === "xs" || UnistylesRuntime.breakpoint === "sm";
-  const collapsedSidebarInset =
-    !isMobile && !desktopAgentListOpen && trafficLightPadding.side
-      ? trafficLightPadding
-      : { left: 0, right: 0 };
  const dragHandlers = useDesktopDragHandlers();

  useEffect(() => {
@@ -31,23 +26,25 @@ export function OpenProjectScreen({ serverId }: { serverId: string }) {
  }, [isMobile, openAgentList]);

  return (
-    <View style={styles.container} {...dragHandlers}>
-      <View style={[styles.menuToggle, { paddingTop: insets.top, paddingLeft: collapsedSidebarInset.left, paddingRight: collapsedSidebarInset.right }]}>
-        <SidebarMenuToggle />
-      </View>
-      <View style={styles.content}>
-        <PaseoLogo size={56} />
-        <Text style={styles.heading}>What shall we build today?</Text>
-        <Pressable
-          style={({ hovered }) => [styles.openButton, hovered && styles.openButtonHovered]}
-          onPress={() => {
-            void openProjectPicker();
-          }}
-          testID="open-project-submit"
-        >
-          <FolderOpen size={16} color={theme.colors.foregroundMuted} />
-          <Text style={styles.openButtonText}>Add a project</Text>
-        </Pressable>
+    <View style={styles.container}>
+      <MenuHeader borderless />
+      <View style={styles.content} {...dragHandlers}>
+        <View style={styles.logo}>
+          <PaseoLogo size={56} />
+        </View>
+        <View style={styles.headingGroup}>
+          <Text style={styles.heading}>What shall we build today?</Text>
+          {hasHydrated && !hasProjects ? (
+            <Text style={styles.subtitle}>
+              Add a project folder to start running agents on your codebase
+            </Text>
+          ) : null}
+        </View>
+        <View style={styles.cta}>
+          <Button variant="default" leftIcon={FolderOpen} onPress={() => void openProjectPicker()} testID="open-project-submit">
+            Add a project
+          </Button>
+        </View>
      </View>
    </View>
  );
@@ -59,43 +56,32 @@ const styles = StyleSheet.create((theme) => ({
    backgroundColor: theme.colors.surface0,
    userSelect: "none",
  },
-  menuToggle: {
-    position: "absolute",
-    top: theme.spacing[3],
-    left: theme.spacing[3],
-    zIndex: 1,
-  },
  content: {
    flexGrow: 1,
    justifyContent: "center",
    alignItems: "center",
-    gap: theme.spacing[6],
+    gap: 0,
    padding: theme.spacing[6],
  },
+  logo: {
+    marginBottom: theme.spacing[8],
+  },
+  headingGroup: {
+    alignItems: "center",
+    gap: theme.spacing[3],
+  },
+  cta: {
+    marginTop: theme.spacing[12],
+  },
  heading: {
    color: theme.colors.foreground,
    fontSize: theme.fontSize["2xl"],
    fontWeight: theme.fontWeight.normal,
    textAlign: "center",
  },
-  openButton: {
-    flexDirection: "row",
-    alignItems: "center",
-    gap: theme.spacing[2],
-    paddingVertical: theme.spacing[3],
-    paddingHorizontal: theme.spacing[4],
-    borderRadius: theme.borderRadius.lg,
-    borderWidth: 1,
-    borderColor: theme.colors.border,
-    backgroundColor: "transparent",
-  },
-  openButtonHovered: {
-    borderColor: theme.colors.borderAccent,
-    backgroundColor: theme.colors.surface1,
-  },
-  openButtonText: {
+  subtitle: {
    color: theme.colors.foregroundMuted,
-    fontSize: theme.fontSize.sm,
-    fontWeight: theme.fontWeight.normal,
+    fontSize: theme.fontSize.base,
+    textAlign: "center",
  },
 }));
@@ -1,10 +1,14 @@
 import { useMemo, useState, useCallback, useEffect } from "react";
-import { View } from "react-native";
+import { View, Text } from "react-native";
 import { useIsFocused } from "@react-navigation/native";
+import { router } from "expo-router";
 import { StyleSheet } from "react-native-unistyles";
+import { ChevronLeft } from "lucide-react-native";
 import { MenuHeader } from "@/components/headers/menu-header";
+import { Button } from "@/components/ui/button";
 import { AgentList } from "@/components/agent-list";
 import { useAllAgentsList } from "@/hooks/use-all-agents-list";
+import { buildHostOpenProjectRoute } from "@/utils/host-routes";

 export function SessionsScreen({ serverId }: { serverId: string }) {
  const isFocused = useIsFocused();
@@ -44,13 +48,26 @@ function SessionsScreenContent({ serverId }: { serverId: string }) {
  return (
    <View style={styles.container}>
      <MenuHeader title="Sessions" />
-      <AgentList
-        agents={sortedAgents}
-        showCheckoutInfo={false}
-        isRefreshing={isManualRefresh && isRevalidating}
-        onRefresh={handleRefresh}
-        showAttentionIndicator={false}
-      />
+      {sortedAgents.length === 0 ? (
+        <View style={styles.emptyContainer}>
+          <Text style={styles.emptyText}>No sessions yet</Text>
+          <Button
+            variant="ghost"
+            leftIcon={ChevronLeft}
+            onPress={() => router.navigate(buildHostOpenProjectRoute(serverId) as any)}
+          >
+            Back
+          </Button>
+        </View>
+      ) : (
+        <AgentList
+          agents={sortedAgents}
+          showCheckoutInfo={false}
+          isRefreshing={isManualRefresh && isRevalidating}
+          onRefresh={handleRefresh}
+          showAttentionIndicator={false}
+        />
+      )}
    </View>
  );
 }
@@ -60,4 +77,15 @@ const styles = StyleSheet.create((theme) => ({
    flex: 1,
    backgroundColor: theme.colors.surface0,
  },
+  emptyContainer: {
+    flex: 1,
+    justifyContent: "center",
+    alignItems: "center",
+    gap: theme.spacing[6],
+    padding: theme.spacing[6],
+  },
+  emptyText: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.lg,
+  },
 }));
@@ -1,29 +1,318 @@
-import { Text, View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
+import { useEffect, useMemo, useState } from "react";
+import { ActivityIndicator, Platform, ScrollView, Text, View } from "react-native";
+import * as Clipboard from "expo-clipboard";
+import { openExternalUrl } from "@/utils/open-external-url";
+import { BookOpen, Check, Copy, RotateCw, TriangleAlert } from "lucide-react-native";
+import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { PaseoLogo } from "@/components/icons/paseo-logo";
+import { Button } from "@/components/ui/button";
+import { Fonts } from "@/constants/theme";
+import {
+  getDesktopDaemonLogs,
+  type DesktopDaemonLogs,
+} from "@/desktop/daemon/desktop-daemon";
 import { useDesktopDragHandlers } from "@/utils/desktop-window";

+type StartupSplashScreenProps = {
+  bootstrapState?: {
+    phase: "starting-daemon" | "connecting" | "online" | "error";
+    error: string | null;
+    retry: () => void;
+  };
+};
+
+const GITHUB_ISSUE_URL = "https://github.com/getpaseo/paseo/issues/new";
+const DOCS_URL = "https://paseo.sh/docs";
+
 const styles = StyleSheet.create((theme) => ({
  container: {
    flex: 1,
-    justifyContent: "center",
    alignItems: "center",
+    justifyContent: "center",
    backgroundColor: theme.colors.surface0,
+    paddingHorizontal: theme.spacing[8],
+    paddingVertical: theme.spacing[8],
  },
-  status: {
+  containerError: {
+    justifyContent: "flex-start",
+    paddingTop: theme.spacing[16],
+  },
+  centeredContent: {
+    alignItems: "center",
+    justifyContent: "center",
+    maxWidth: 520,
+    width: "100%",
+  },
+  errorContent: {
+    alignItems: "stretch",
+    maxWidth: 720,
+    width: "100%",
+    gap: theme.spacing[6],
+  },
+  errorHeader: {
+    alignItems: "flex-start",
+  },
+  title: {
+    marginTop: theme.spacing[8],
+    color: theme.colors.foreground,
+    fontSize: theme.fontSize["3xl"],
+    fontWeight: theme.fontWeight.semibold,
+    textAlign: "center",
+  },
+  titleError: {
+    textAlign: "left",
+  },
+  subtitleRow: {
+    marginTop: theme.spacing[4],
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[3],
+  },
+  progressSteps: {
+    marginTop: theme.spacing[4],
+    gap: theme.spacing[3],
+    width: "100%",
+  },
+  progressStepRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "center",
+    gap: theme.spacing[3],
+  },
+  subtitle: {
    marginTop: theme.spacing[8],
    color: theme.colors.foregroundMuted,
    fontSize: theme.fontSize.lg,
+    textAlign: "center",
+  },
+  subtitleInline: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.lg,
+    textAlign: "center",
+  },
+  errorDescription: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.base,
+    lineHeight: 22,
+  },
+  errorMessage: {
+    color: theme.colors.destructive,
+    fontSize: theme.fontSize.sm,
+    lineHeight: 20,
+    fontFamily: Fonts.mono,
+  },
+  logsMeta: {
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+  },
+  logsContainer: {
+    height: 200,
+    borderRadius: theme.borderRadius.xl,
+    backgroundColor: theme.colors.surface1,
+    borderWidth: theme.borderWidth[1],
+    borderColor: theme.colors.border,
+    overflow: "hidden",
+  },
+  logsScroll: {
+    flexGrow: 0,
+  },
+  logsContent: {
+    padding: theme.spacing[4],
+  },
+  logsText: {
+    fontFamily: Fonts.mono,
+    fontSize: theme.fontSize.xs,
+    color: theme.colors.foreground,
+    lineHeight: 18,
+    ...(Platform.OS === "web"
+      ? {
+          whiteSpace: "pre",
+          overflowWrap: "normal",
+        }
+      : null),
+  },
+  actionRow: {
+    flexDirection: "row",
+    gap: theme.spacing[3],
+    flexWrap: "wrap",
  },
 }));

-export function StartupSplashScreen() {
+export function StartupSplashScreen({ bootstrapState }: StartupSplashScreenProps) {
+  const { theme } = useUnistyles();
  const dragHandlers = useDesktopDragHandlers();
+  const [daemonLogs, setDaemonLogs] = useState<DesktopDaemonLogs | null>(null);
+  const [logsError, setLogsError] = useState<string | null>(null);
+  const [isLoadingLogs, setIsLoadingLogs] = useState(false);
+
+  const phase = bootstrapState?.phase;
+  const isError = phase === "error";
+  const isSimpleSplash = bootstrapState === undefined;
+
+  useEffect(() => {
+    if (!isError) {
+      setDaemonLogs(null);
+      setLogsError(null);
+      setIsLoadingLogs(false);
+      return;
+    }
+
+    let isCancelled = false;
+    setIsLoadingLogs(true);
+    setLogsError(null);
+
+    void getDesktopDaemonLogs()
+      .then((logs) => {
+        if (isCancelled) {
+          return;
+        }
+        setDaemonLogs(logs);
+      })
+      .catch((error) => {
+        if (isCancelled) {
+          return;
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        setDaemonLogs(null);
+        setLogsError(`Unable to load daemon logs: ${message}`);
+      })
+      .finally(() => {
+        if (!isCancelled) {
+          setIsLoadingLogs(false);
+        }
+      });
+
+    return () => {
+      isCancelled = true;
+    };
+  }, [isError]);
+
+  const progressSteps =
+    phase === "starting-daemon"
+      ? [{ key: "starting-daemon", label: "Starting local server...", status: "active" as const }]
+      : phase === "connecting"
+        ? [
+            { key: "starting-daemon", label: "Started local server", status: "complete" as const },
+            { key: "connecting", label: "Connecting to local server...", status: "active" as const },
+          ]
+        : [
+            { key: "starting-daemon", label: "Started local server", status: "complete" as const },
+            { key: "connecting", label: "Connected to local server", status: "complete" as const },
+          ];
+
+  const logsText = useMemo(() => {
+    if (isLoadingLogs) {
+      return "Loading daemon logs...";
+    }
+    if (daemonLogs?.contents) {
+      return daemonLogs.contents;
+    }
+    if (logsError) {
+      return logsError;
+    }
+    return "No daemon logs available.";
+  }, [daemonLogs?.contents, isLoadingLogs, logsError]);
+
+  const handleCopyLogs = () => {
+    const payload = daemonLogs?.logPath
+      ? `${daemonLogs.logPath}\n\n${daemonLogs.contents}`
+      : logsText;
+    void Clipboard.setStringAsync(payload);
+  };
+
+  if (isSimpleSplash) {
+    return (
+      <View style={styles.container} {...dragHandlers}>
+        <PaseoLogo size={96} />
+        <Text style={styles.subtitle}>Starting up…</Text>
+      </View>
+    );
+  }
+
+  if (!isError) {
+    return (
+      <View style={styles.container} {...dragHandlers}>
+        <View style={styles.centeredContent}>
+          <PaseoLogo size={96} />
+          <Text style={styles.title}>Welcome to Paseo</Text>
+          <View style={styles.progressSteps}>
+            {progressSteps.map((step) => (
+              <View key={step.key} style={styles.progressStepRow}>
+                {step.status === "complete" ? (
+                  <Check size={18} color={theme.colors.success} />
+                ) : (
+                  <ActivityIndicator color={theme.colors.accent} />
+                )}
+                <Text style={styles.subtitleInline}>{step.label}</Text>
+              </View>
+            ))}
+          </View>
+        </View>
+      </View>
+    );
+  }

  return (
-    <View style={styles.container} {...dragHandlers}>
-      <PaseoLogo size={96} />
-      <Text style={styles.status}>Starting up…</Text>
+    <View style={[styles.container, styles.containerError]} {...dragHandlers}>
+      <View style={styles.errorContent}>
+        <View style={styles.errorHeader}>
+          <PaseoLogo size={64} />
+          <Text style={[styles.title, styles.titleError]}>Something went wrong</Text>
+        </View>
+
+        <Text style={styles.errorDescription}>
+          The local server failed to start. If this keeps happening, please report the issue on GitHub and include the logs below.
+        </Text>
+
+        <Text style={styles.errorMessage}>
+          {bootstrapState.error}
+        </Text>
+
+        {daemonLogs?.logPath ? <Text style={styles.logsMeta}>{daemonLogs.logPath}</Text> : null}
+
+        <View style={styles.logsContainer}>
+          <ScrollView
+            style={styles.logsScroll}
+            contentContainerStyle={styles.logsContent}
+            showsVerticalScrollIndicator
+          >
+            <Text selectable style={styles.logsText}>
+              {logsText}
+            </Text>
+          </ScrollView>
+        </View>
+
+        <View style={styles.actionRow}>
+          <Button
+            variant="secondary"
+            leftIcon={<Copy size={16} color={theme.colors.foreground} />}
+            onPress={handleCopyLogs}
+          >
+            Copy logs
+          </Button>
+          <Button
+            variant="outline"
+            leftIcon={<TriangleAlert size={16} color={theme.colors.foreground} />}
+            onPress={() => void openExternalUrl(GITHUB_ISSUE_URL)}
+          >
+            Open GitHub issue
+          </Button>
+          <Button
+            variant="outline"
+            leftIcon={<BookOpen size={16} color={theme.colors.foreground} />}
+            onPress={() => void openExternalUrl(DOCS_URL)}
+          >
+            Docs
+          </Button>
+          <Button
+            variant="default"
+            leftIcon={<RotateCw size={16} color={theme.colors.palette.white} />}
+            onPress={bootstrapState.retry}
+          >
+            Retry
+          </Button>
+        </View>
+      </View>
    </View>
  );
 }
@@ -79,6 +79,9 @@ function getFallbackTabLabel(tab: WorkspaceTabDescriptor): string {
  if (tab.target.kind === "draft") {
    return "New Agent";
  }
+  if (tab.target.kind === "setup") {
+    return "Setup";
+  }
  if (tab.target.kind === "terminal") {
    return "Terminal";
  }
@@ -139,6 +139,9 @@ function getFallbackTabOptionLabel(tab: WorkspaceTabDescriptor): string {
  if (tab.target.kind === "draft") {
    return "New Agent";
  }
+  if (tab.target.kind === "setup") {
+    return "Setup";
+  }
  if (tab.target.kind === "terminal") {
    return "Terminal";
  }
@@ -152,6 +155,9 @@ function getFallbackTabOptionDescription(tab: WorkspaceTabDescriptor): string {
  if (tab.target.kind === "draft") {
    return "New Agent";
  }
+  if (tab.target.kind === "setup") {
+    return "Workspace setup";
+  }
  if (tab.target.kind === "agent") {
    return "Agent";
  }
@@ -19,6 +19,7 @@ describe("workspace source of truth consumption", () => {
      status: "running",
      activityAt: new Date("2026-03-01T00:00:00.000Z"),
      diffStat: null,
+      services: [],
    };

    const header = resolveWorkspaceHeader({ workspace });
@@ -76,6 +76,9 @@ function getCloseButtonTestId(tab: WorkspaceTabDescriptor): string {
  if (tab.target.kind === "draft") {
    return `workspace-draft-close-${tab.target.draftId}`;
  }
+  if (tab.target.kind === "setup") {
+    return `workspace-setup-close-${encodeFilePathForPathSegment(tab.target.workspaceId)}`;
+  }
  return `workspace-file-close-${encodeFilePathForPathSegment(tab.target.path)}`;
 }

@@ -0,0 +1,124 @@
+import { afterEach, describe, expect, it } from "vitest";
+import type { DaemonClient } from "@server/client/daemon-client";
+import type { WorkspaceDescriptorPayload } from "@server/shared/messages";
+import {
+  normalizeWorkspaceDescriptor,
+  useSessionStore,
+  type WorkspaceDescriptor,
+} from "./session-store";
+
+function workspace(
+  input: Partial<WorkspaceDescriptor> & Pick<WorkspaceDescriptor, "id">,
+): WorkspaceDescriptor {
+  return {
+    id: input.id,
+    projectId: input.projectId ?? "project-1",
+    projectDisplayName: input.projectDisplayName ?? "Project 1",
+    projectRootPath: input.projectRootPath ?? "/repo",
+    projectKind: input.projectKind ?? "git",
+    workspaceKind: input.workspaceKind ?? "local_checkout",
+    name: input.name ?? "main",
+    status: input.status ?? "done",
+    activityAt: input.activityAt ?? null,
+    diffStat: input.diffStat ?? null,
+    services: input.services ?? [],
+  };
+}
+
+afterEach(() => {
+  useSessionStore.getState().clearSession("test-server");
+});
+
+describe("normalizeWorkspaceDescriptor", () => {
+  it("normalizes workspace services and invalid activity timestamps", () => {
+    const services = [
+      {
+        serviceName: "web",
+        hostname: "main.web.localhost",
+        port: 3000,
+        url: "http://main.web.localhost:6767",
+        status: "running" as const,
+      },
+    ];
+    const workspace = normalizeWorkspaceDescriptor({
+      id: "/repo/main",
+      projectId: "project-1",
+      projectDisplayName: "Project 1",
+      projectRootPath: "/repo",
+      projectKind: "git",
+      workspaceKind: "local_checkout",
+      name: "main",
+      status: "running",
+      activityAt: "not-a-date",
+      diffStat: null,
+      services,
+    });
+
+    expect(workspace.activityAt).toBeNull();
+    expect(workspace.services).toEqual([
+      {
+        serviceName: "web",
+        hostname: "main.web.localhost",
+        port: 3000,
+        url: "http://main.web.localhost:6767",
+        status: "running",
+      },
+    ]);
+    expect(workspace.services).not.toBe(services);
+  });
+
+  it("defaults missing services to an empty array", () => {
+    const payload = {
+      id: "/repo/main",
+      projectId: "project-1",
+      projectDisplayName: "Project 1",
+      projectRootPath: "/repo",
+      projectKind: "git",
+      workspaceKind: "local_checkout",
+      name: "main",
+      status: "done",
+      activityAt: null,
+      diffStat: null,
+    } as WorkspaceDescriptorPayload;
+
+    const workspace = normalizeWorkspaceDescriptor(payload);
+
+    expect(workspace.services).toEqual([]);
+  });
+});
+
+describe("mergeWorkspaces", () => {
+  it("preserves services on merged workspace entries", () => {
+    const store = useSessionStore.getState();
+    store.initializeSession("test-server", null as unknown as DaemonClient);
+    store.setWorkspaces(
+      "test-server",
+      new Map([["/repo/main", workspace({ id: "/repo/main", services: [] })]]),
+    );
+
+    store.mergeWorkspaces("test-server", [
+      workspace({
+        id: "/repo/main",
+        services: [
+          {
+            serviceName: "web",
+            hostname: "main.web.localhost",
+            port: 3000,
+            url: "http://main.web.localhost:6767",
+            status: "running",
+          },
+        ],
+      }),
+    ]);
+
+    expect(store.getSession("test-server")?.workspaces.get("/repo/main")?.services).toEqual([
+      {
+        serviceName: "web",
+        hostname: "main.web.localhost",
+        port: 3000,
+        url: "http://main.web.localhost:6767",
+        status: "running",
+      },
+    ]);
+  });
+});
@@ -119,6 +119,7 @@ export interface WorkspaceDescriptor {
  status: WorkspaceDescriptorPayload["status"];
  activityAt: Date | null;
  diffStat: { additions: number; deletions: number } | null;
+  services: WorkspaceDescriptorPayload["services"];
 }

 export function normalizeWorkspaceDescriptor(
@@ -136,6 +137,7 @@ export function normalizeWorkspaceDescriptor(
    status: payload.status,
    activityAt: activityAt && !Number.isNaN(activityAt.getTime()) ? activityAt : null,
    diffStat: payload.diffStat ?? null,
+    services: (payload.services ?? []).map((s) => ({ ...s })),
  };
 }

@@ -0,0 +1,72 @@
+import type { SessionOutboundMessage } from "@server/shared/messages";
+import { create } from "zustand";
+import { buildWorkspaceTabPersistenceKey } from "@/stores/workspace-tabs-store";
+
+export type WorkspaceSetupProgressPayload = Extract<
+  SessionOutboundMessage,
+  { type: "workspace_setup_progress" }
+>["payload"];
+
+export interface WorkspaceSetupSnapshot extends WorkspaceSetupProgressPayload {
+  updatedAt: number;
+}
+
+interface WorkspaceSetupStoreState {
+  snapshots: Record<string, WorkspaceSetupSnapshot>;
+  upsertProgress: (input: { serverId: string; payload: WorkspaceSetupProgressPayload }) => void;
+  removeWorkspace: (input: { serverId: string; workspaceId: string }) => void;
+  clearServer: (serverId: string) => void;
+}
+
+function buildWorkspaceSetupKey(input: {
+  serverId: string;
+  workspaceId: string;
+}): string | null {
+  return buildWorkspaceTabPersistenceKey(input);
+}
+
+export const useWorkspaceSetupStore = create<WorkspaceSetupStoreState>()((set) => ({
+  snapshots: {},
+  upsertProgress: ({ serverId, payload }) => {
+    const key = buildWorkspaceSetupKey({ serverId, workspaceId: payload.workspaceId });
+    if (!key) {
+      return;
+    }
+
+    set((state) => ({
+      snapshots: {
+        ...state.snapshots,
+        [key]: {
+          ...payload,
+          updatedAt: Date.now(),
+        },
+      },
+    }));
+  },
+  removeWorkspace: ({ serverId, workspaceId }) => {
+    const key = buildWorkspaceSetupKey({ serverId, workspaceId });
+    if (!key) {
+      return;
+    }
+
+    set((state) => {
+      if (!(key in state.snapshots)) {
+        return state;
+      }
+      const next = { ...state.snapshots };
+      delete next[key];
+      return { snapshots: next };
+    });
+  },
+  clearServer: (serverId) => {
+    set((state) => {
+      const nextEntries = Object.entries(state.snapshots).filter(
+        ([key]) => !key.startsWith(`${serverId}:`),
+      );
+      if (nextEntries.length === Object.keys(state.snapshots).length) {
+        return state;
+      }
+      return { snapshots: Object.fromEntries(nextEntries) };
+    });
+  },
+}));
@@ -200,4 +200,19 @@ describe("workspace-tabs-store retargetTab", () => {
    expect(reopenedFileTabId).toBe(fileTabId);
    expect(useWorkspaceTabsStore.getState().focusedTabIdByWorkspace[workspaceKey]).toBe(fileTabId);
  });
+
+  it("builds a deterministic setup tab keyed by workspace id", () => {
+    const key = buildWorkspaceTabPersistenceKey({ serverId: SERVER_ID, workspaceId: WORKSPACE_ID });
+    expect(key).toBeTruthy();
+    const workspaceKey = key as string;
+
+    const tabId = useWorkspaceTabsStore.getState().openOrFocusTab({
+      serverId: SERVER_ID,
+      workspaceId: WORKSPACE_ID,
+      target: { kind: "setup", workspaceId: WORKSPACE_ID },
+    });
+
+    expect(tabId).toBe(`setup_${WORKSPACE_ID}`);
+    expect(useWorkspaceTabsStore.getState().focusedTabIdByWorkspace[workspaceKey]).toBe(tabId);
+  });
 });
@@ -6,7 +6,8 @@ export type WorkspaceTabTarget =
  | { kind: "draft"; draftId: string }
  | { kind: "agent"; agentId: string }
  | { kind: "terminal"; terminalId: string }
-  | { kind: "file"; path: string };
+  | { kind: "file"; path: string }
+  | { kind: "setup"; workspaceId: string };

 export type WorkspaceTab = {
  tabId: string;
@@ -60,6 +61,10 @@ function normalizeTabTarget(
    const path = trimNonEmpty(value.path);
    return path ? { kind: "file", path: path.replace(/\\/g, "/") } : null;
  }
+  if (value.kind === "setup") {
+    const workspaceId = trimNonEmpty(value.workspaceId);
+    return workspaceId ? { kind: "setup", workspaceId: workspaceId.replace(/\\/g, "/") } : null;
+  }
  return null;
 }

@@ -79,6 +84,9 @@ function tabTargetsEqual(left: WorkspaceTabTarget, right: WorkspaceTabTarget): b
  if (left.kind === "file" && right.kind === "file") {
    return left.path === right.path;
  }
+  if (left.kind === "setup" && right.kind === "setup") {
+    return left.workspaceId === right.workspaceId;
+  }
  return false;
 }

@@ -92,6 +100,9 @@ function buildDeterministicTabId(target: WorkspaceTabTarget): string {
  if (target.kind === "terminal") {
    return `terminal_${target.terminalId}`;
  }
+  if (target.kind === "setup") {
+    return `setup_${target.workspaceId}`;
+  }
  return `file_${target.path}`;
 }

@@ -10,6 +10,7 @@ import {
 } from "@/constants/layout";
 import { getDesktopWindow } from "@/desktop/electron/window";
 import { isDesktop } from "@/desktop/host";
+import { usePanelStore } from "@/stores/panel-store";
 import { readFiniteScreenPoint } from "./desktop-window-drag-coordinates";

 export async function toggleMaximize() {
@@ -123,7 +124,15 @@ export function useDesktopDragHandlers(): DesktopDragViewProps {
  }, [isActive]);
 }

-export function useTrafficLightPadding(): { left: number; right: number; top: number; side: 'left' | 'right' | null } {
+type RawWindowControlsPadding = {
+  left: number;
+  right: number;
+  top: number;
+};
+
+type WindowControlsPaddingRole = "sidebar" | "header" | "tabRow" | "explorerSidebar";
+
+function useRawWindowControlsPadding(): RawWindowControlsPadding {
  const [isFullscreen, setIsFullscreen] = useState(false);

  useEffect(() => {
@@ -178,23 +187,52 @@ export function useTrafficLightPadding(): { left: number; right: number; top: nu
    };
  }, []);

-  if (!getIsDesktop() || isFullscreen) {
-    return { left: 0, right: 0, top: 0, side: null };
-  }
+  return useMemo((): RawWindowControlsPadding => {
+    if (!getIsDesktop() || isFullscreen) {
+      return { left: 0, right: 0, top: 0 };
+    }
+
+    if (getIsDesktopMac()) {
+      return {
+        left: DESKTOP_TRAFFIC_LIGHT_WIDTH,
+        right: 0,
+        top: DESKTOP_TRAFFIC_LIGHT_HEIGHT,
+      };
+    }

-  if (getIsDesktopMac()) {
    return {
-      left: DESKTOP_TRAFFIC_LIGHT_WIDTH,
-      right: 0,
-      top: DESKTOP_TRAFFIC_LIGHT_HEIGHT,
-      side: 'left',
+      left: 0,
+      right: DESKTOP_WINDOW_CONTROLS_WIDTH,
+      top: DESKTOP_WINDOW_CONTROLS_HEIGHT,
    };
+  }, [isFullscreen]);
+}
+
+export function useWindowControlsPadding(
+  role: WindowControlsPaddingRole,
+): { left: number; right: number; top: number } {
+  const sidebarOpen = usePanelStore((state) => state.desktop.agentListOpen);
+  const explorerOpen = usePanelStore((state) => state.desktop.fileExplorerOpen);
+  const focusModeEnabled = usePanelStore((state) => state.desktop.focusModeEnabled);
+  const rawPadding = useRawWindowControlsPadding();
+  const sidebarClosed = !sidebarOpen;
+
+  let left = 0;
+  let right = 0;
+  let top = 0;
+
+  if (role === "sidebar") {
+    left = rawPadding.left;
+    top = rawPadding.top;
+  } else if (role === "header") {
+    left = sidebarClosed ? rawPadding.left : 0;
+    right = explorerOpen ? 0 : rawPadding.right;
+  } else if (role === "tabRow") {
+    left = sidebarClosed && focusModeEnabled ? rawPadding.left : 0;
+    right = focusModeEnabled && !explorerOpen ? rawPadding.right : 0;
+  } else if (role === "explorerSidebar") {
+    right = rawPadding.right;
  }

-  return {
-    left: 0,
-    right: DESKTOP_WINDOW_CONTROLS_WIDTH,
-    top: DESKTOP_WINDOW_CONTROLS_HEIGHT,
-    side: 'right',
-  };
+  return useMemo(() => ({ left, right, top }), [left, right, top]);
 }
@@ -82,6 +82,10 @@ describe("workspace route parsing", () => {
      kind: "file",
      path: "src/index.ts",
    });
+    expect(parseWorkspaceOpenIntent("setup:L3RtcC9yZXBv")).toEqual({
+      kind: "setup",
+      workspaceId: "/tmp/repo",
+    });
  });

  it("uses the plain workspace route when workspace context is provided", () => {
@@ -99,7 +99,8 @@ export type WorkspaceOpenIntent =
  | { kind: "agent"; agentId: string }
  | { kind: "terminal"; terminalId: string }
  | { kind: "file"; path: string }
-  | { kind: "draft"; draftId: string };
+  | { kind: "draft"; draftId: string }
+  | { kind: "setup"; workspaceId: string };

 export function parseWorkspaceOpenIntent(
  value: string | null | undefined,
@@ -136,6 +137,13 @@ export function parseWorkspaceOpenIntent(
    }
    return { kind: "file", path: decodedPath };
  }
+  if (kind === "setup") {
+    const workspaceId = decodeWorkspaceIdFromPathSegment(payload);
+    if (!workspaceId) {
+      return null;
+    }
+    return { kind: "setup", workspaceId };
+  }

  return null;
 }
@@ -18,6 +18,8 @@ function workspace(overrides: Partial<SidebarWorkspaceEntry> = {}): SidebarWorks
    activityAt: null,
    statusBucket: "done",
    diffStat: null,
+    services: [],
+    hasRunningServices: false,
    ...overrides,
  };
 }
@@ -87,8 +89,8 @@ describe("buildSidebarProjectRowModel", () => {
    });
  });

-  it("flattens git projects with a single workspace and keeps the new worktree action", () => {
-    const flattenedWorkspace = workspace({
+  it("keeps single-workspace git projects as sections with a new worktree action", () => {
+    const workspaceEntry = workspace({
      workspaceId: "/repo/main",
      workspaceKind: "local_checkout",
    });
@@ -96,16 +98,14 @@ describe("buildSidebarProjectRowModel", () => {
    const result = buildSidebarProjectRowModel({
      project: project({
        projectKind: "git",
-        workspaces: [flattenedWorkspace],
+        workspaces: [workspaceEntry],
      }),
      collapsed: true,
    });

    expect(result).toEqual({
-      kind: "workspace_link",
-      workspace: flattenedWorkspace,
-      selected: false,
-      chevron: null,
+      kind: "project_section",
+      chevron: "expand",
      trailingAction: "new_worktree",
    });
  });
@@ -131,10 +131,10 @@ describe("buildSidebarProjectRowModel", () => {
 });

 describe("isSidebarProjectFlattened", () => {
-  it("returns true for single-workspace projects regardless of kind", () => {
+  it("returns true only for single-workspace non-git projects", () => {
    expect(
      isSidebarProjectFlattened(project({ projectKind: "git", workspaces: [workspace()] })),
-    ).toBe(true);
+    ).toBe(false);
    expect(
      isSidebarProjectFlattened(project({ projectKind: "non_git", workspaces: [workspace()] })),
    ).toBe(true);
@@ -16,6 +16,8 @@ function workspace(serverId: string, cwd: string): SidebarWorkspaceEntry {
    activityAt: null,
    statusBucket: "done",
    diffStat: null,
+    services: [],
+    hasRunningServices: false,
  };
 }

@@ -76,7 +78,7 @@ describe("buildSidebarShortcutModel", () => {
    expect(model.shortcutTargets[8]).toEqual({ serverId: "s", workspaceId: "/repo/w9" });
  });

-  it("ignores collapsed state for flattened single-workspace projects", () => {
+  it("still hides collapsed single-workspace git projects because they are not flattened", () => {
    const projects = [project("p1", [workspace("s1", "/repo/main")])];

    const model = buildSidebarShortcutModel({
@@ -84,7 +86,7 @@ describe("buildSidebarShortcutModel", () => {
      collapsedProjectKeys: new Set<string>(["p1"]),
    });

-    expect(model.visibleTargets).toEqual([{ serverId: "s1", workspaceId: "/repo/main" }]);
-    expect(model.shortcutTargets).toEqual([{ serverId: "s1", workspaceId: "/repo/main" }]);
+    expect(model.visibleTargets).toEqual([]);
+    expect(model.shortcutTargets).toEqual([]);
  });
 });
@@ -96,6 +96,7 @@ describe("tool-call-display", () => {
            index: 1,
            command: "npm install",
            cwd: "/tmp/repo/.paseo/worktrees/repo/branch",
+            log: "",
            status: "running",
            exitCode: null,
          },
@@ -19,6 +19,7 @@ function workspace(
    status: input.status ?? "done",
    activityAt: input.activityAt ?? null,
    diffStat: input.diffStat ?? null,
+    services: input.services ?? [],
  };
 }

@@ -22,6 +22,10 @@ export function normalizeWorkspaceTabTarget(
    const path = trimNonEmpty(value.path);
    return path ? { kind: "file", path: path.replace(/\\/g, "/") } : null;
  }
+  if (value.kind === "setup") {
+    const workspaceId = trimNonEmpty(value.workspaceId);
+    return workspaceId ? { kind: "setup", workspaceId: workspaceId.replace(/\\/g, "/") } : null;
+  }
  return null;
 }

@@ -44,6 +48,9 @@ export function workspaceTabTargetsEqual(
  if (left.kind === "file" && right.kind === "file") {
    return left.path === right.path;
  }
+  if (left.kind === "setup" && right.kind === "setup") {
+    return left.workspaceId === right.workspaceId;
+  }
  return false;
 }

@@ -57,6 +64,9 @@ export function buildDeterministicWorkspaceTabId(target: WorkspaceTabTarget): st
  if (target.kind === "terminal") {
    return `terminal_${target.terminalId}`;
  }
+  if (target.kind === "setup") {
+    return `setup_${target.workspaceId}`;
+  }
  return `file_${target.path}`;
 }

@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/cli",
-  "version": "0.1.37",
+  "version": "0.1.38",
  "description": "Paseo CLI - control your AI coding agents from the command line",
  "type": "module",
  "files": [
@@ -24,8 +24,8 @@
  },
  "dependencies": {
    "@clack/prompts": "^1.0.0",
-    "@getpaseo/relay": "0.1.37",
-    "@getpaseo/server": "0.1.37",
+    "@getpaseo/relay": "0.1.38",
+    "@getpaseo/server": "0.1.38",
    "chalk": "^5.3.0",
    "commander": "^12.0.0",
    "mime-types": "^2.1.35",
@@ -8,6 +8,7 @@ import { createPermitCommand } from "./commands/permit/index.js";
 import { createProviderCommand } from "./commands/provider/index.js";
 import { createScheduleCommand } from "./commands/schedule/index.js";
 import { createSpeechCommand } from "./commands/speech/index.js";
+import { createTerminalCommand } from "./commands/terminal/index.js";
 import { createWorktreeCommand } from "./commands/worktree/index.js";
 import { startCommand as daemonStartCommand } from "./commands/daemon/start.js";
 import { runStatusCommand as runDaemonStatusCommand } from "./commands/daemon/status.js";
@@ -143,6 +144,9 @@ export function createCli(): Command {
  // Chat commands
  program.addCommand(createChatCommand());

+  // Terminal commands
+  program.addCommand(createTerminalCommand());
+
  // Loop commands
  program.addCommand(createLoopCommand());

@@ -1,5 +1,5 @@
 import { spawn, spawnSync } from "node:child_process";
-import { appendFileSync, existsSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import { loadConfig, resolvePaseoHome } from "@getpaseo/server";
@@ -64,7 +64,6 @@ const DETACHED_STARTUP_GRACE_MS = 1200;
 const PID_POLL_INTERVAL_MS = 100;
 const KILL_TIMEOUT_MS = 3000;
 const DAEMON_LOG_FILENAME = "daemon.log";
-const DAEMON_LAUNCH_LOG_FILENAME = "daemon-launch.log";
 const DAEMON_PID_FILENAME = "paseo.pid";

 export const DEFAULT_STOP_TIMEOUT_MS = 15_000;
@@ -115,24 +114,6 @@ function buildChildEnv(options: DaemonStartOptions): NodeJS.ProcessEnv {
  return childEnv;
 }

-function appendLaunchLog(home: string, message: string, details?: Record<string, unknown>): void {
-  const line = [
-    new Date().toISOString(),
-    "[CLI daemon]",
-    `pid=${process.pid}`,
-    message,
-    details ? JSON.stringify(details) : "",
-  ]
-    .filter((part) => part.length > 0)
-    .join(" ");
-
-  try {
-    appendFileSync(path.join(home, DAEMON_LAUNCH_LOG_FILENAME), `${line}\n`, "utf-8");
-  } catch {
-    // Keep launch debugging best-effort so daemon startup behavior is unchanged.
-  }
-}
-
 function resolveDaemonRunnerEntry(): string {
  const serverExportPath = require.resolve("@getpaseo/server");
  let currentDir = path.dirname(serverExportPath);
@@ -143,11 +124,16 @@ function resolveDaemonRunnerEntry(): string {
      try {
        const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8")) as { name?: string };
        if (packageJson.name === "@getpaseo/server") {
-          const distRunner = path.join(currentDir, "dist", "scripts", "daemon-runner.js");
+          const distRunner = path.join(
+            currentDir,
+            "dist",
+            "scripts",
+            "supervisor-entrypoint.js",
+          );
          if (existsSync(distRunner)) {
            return distRunner;
          }
-          return path.join(currentDir, "scripts", "daemon-runner.ts");
+          return path.join(currentDir, "scripts", "supervisor-entrypoint.ts");
        }
      } catch {
        // Continue searching up if package.json exists but is invalid.
@@ -373,14 +359,6 @@ export async function startLocalDaemonDetached(
  const paseoHome = resolvePaseoHome(childEnv);
  const logPath = path.join(paseoHome, DAEMON_LOG_FILENAME);
  const daemonRunnerEntry = resolveDaemonRunnerEntry();
-  appendLaunchLog(paseoHome, "starting detached daemon", {
-    execPath: process.execPath,
-    execArgv: process.execArgv,
-    daemonRunnerEntry,
-    runnerArgs: buildRunnerArgs(options),
-    listen: childEnv.PASEO_LISTEN ?? null,
-    allowedHosts: childEnv.PASEO_ALLOWED_HOSTS ?? null,
-  });
  const child = spawn(
    process.execPath,
    [...process.execArgv, daemonRunnerEntry, ...buildRunnerArgs(options)],
@@ -391,12 +369,6 @@ export async function startLocalDaemonDetached(
    },
  );

-  appendLaunchLog(paseoHome, "detached spawn returned", {
-    childPid: child.pid ?? null,
-    spawnfile: child.spawnfile,
-    spawnargs: child.spawnargs,
-  });
-
  child.unref();

  const startup = await new Promise<DetachedStartupResult>((resolve) => {
@@ -411,33 +383,16 @@ export async function startLocalDaemonDetached(
    const timer = setTimeout(() => finish(startupReady()), DETACHED_STARTUP_GRACE_MS);

    child.once("error", (error) => {
-      appendLaunchLog(paseoHome, "detached child emitted error during grace period", {
-        childPid: child.pid ?? null,
-        message: error.message,
-      });
      clearTimeout(timer);
      finish(startupExited({ code: null, signal: null, error }));
    });

    child.once("exit", (code, signal) => {
-      appendLaunchLog(paseoHome, "detached child emitted exit during grace period", {
-        childPid: child.pid ?? null,
-        code,
-        signal,
-      });
      clearTimeout(timer);
      finish(startupExited({ code, signal }));
    });
  });

-  appendLaunchLog(paseoHome, "detached startup grace period completed", {
-    childPid: child.pid ?? null,
-    exitedEarly: startup.exitedEarly,
-    code: startup.exitedEarly ? startup.code : null,
-    signal: startup.exitedEarly ? startup.signal : null,
-    error: startup.exitedEarly ? startup.error?.message ?? null : null,
-  });
-
  if (startup.exitedEarly) {
    const reason = startup.error
      ? startup.error.message
@@ -1,63 +0,0 @@
-import type { Command } from "commander";
-import type { CommandError, CommandOptions, ListResult, OutputSchema } from "../../output/index.js";
-import { connectToDaemon } from "../../utils/client.js";
-
-interface SpeechDownloadRow {
-  modelId: string;
-  status: "downloaded";
-}
-
-const speechDownloadSchema: OutputSchema<SpeechDownloadRow> = {
-  idField: "modelId",
-  columns: [
-    { header: "MODEL", field: "modelId", width: 36 },
-    { header: "STATUS", field: "status", width: 12, color: () => "green" },
-  ],
-};
-
-export type SpeechDownloadResult = ListResult<SpeechDownloadRow>;
-
-export interface SpeechDownloadOptions extends CommandOptions {
-  host?: string;
-  model?: string[];
-}
-
-export async function runSpeechDownloadCommand(
-  options: SpeechDownloadOptions,
-  _command: Command,
-): Promise<SpeechDownloadResult> {
-  const client = await connectToDaemon({ host: options.host });
-  try {
-    const response = await client.downloadSpeechModels({
-      modelIds: options.model && options.model.length > 0 ? options.model : undefined,
-    });
-    if (response.error) {
-      const commandError: CommandError = {
-        code: "SPEECH_MODELS_DOWNLOAD_FAILED",
-        message: response.error,
-      };
-      throw commandError;
-    }
-
-    return {
-      type: "list",
-      data: response.downloadedModelIds.map((modelId) => ({
-        modelId,
-        status: "downloaded" as const,
-      })),
-      schema: speechDownloadSchema,
-    };
-  } catch (error) {
-    if (typeof error === "object" && error && "code" in error && "message" in error) {
-      throw error;
-    }
-    const message = error instanceof Error ? error.message : String(error);
-    const commandError: CommandError = {
-      code: "SPEECH_MODELS_DOWNLOAD_FAILED",
-      message: `Failed to download speech models: ${message}`,
-    };
-    throw commandError;
-  } finally {
-    await client.close().catch(() => {});
-  }
-}
@@ -1,22 +1,5 @@
 import { Command } from "commander";
-import { withOutput } from "../../output/index.js";
-import { runSpeechModelsCommand } from "./models.js";
-import { runSpeechDownloadCommand } from "./download.js";
-import { addJsonAndDaemonHostOptions, collectMultiple } from "../../utils/command-options.js";

 export function createSpeechCommand(): Command {
-  const speech = new Command("speech").description("Manage local speech models");
-
-  addJsonAndDaemonHostOptions(
-    speech.command("models").description("List local speech model download status"),
-  ).action(withOutput(runSpeechModelsCommand));
-
-  addJsonAndDaemonHostOptions(
-    speech
-      .command("download")
-      .description("Download local speech models")
-      .option("--model <id>", "Model ID to download (repeatable)", collectMultiple, []),
-  ).action(withOutput(runSpeechDownloadCommand));
-
-  return speech;
+  return new Command("speech").description("Speech commands");
 }
@@ -1,67 +0,0 @@
-import type { Command } from "commander";
-import type { CommandError, CommandOptions, ListResult, OutputSchema } from "../../output/index.js";
-import { connectToDaemon } from "../../utils/client.js";
-
-interface SpeechModelListItem {
-  id: string;
-  kind: string;
-  status: "downloaded" | "missing";
-  modelDir: string;
-  missingFiles: string;
-}
-
-const speechModelsSchema: OutputSchema<SpeechModelListItem> = {
-  idField: "id",
-  columns: [
-    { header: "MODEL", field: "id", width: 36 },
-    { header: "KIND", field: "kind", width: 12 },
-    {
-      header: "STATUS",
-      field: "status",
-      width: 12,
-      color: (value) => (value === "downloaded" ? "green" : "yellow"),
-    },
-    { header: "MODEL DIR", field: "modelDir", width: 44 },
-    { header: "MISSING FILES", field: "missingFiles", width: 40 },
-  ],
-};
-
-export type SpeechModelsResult = ListResult<SpeechModelListItem>;
-
-export interface SpeechModelsOptions extends CommandOptions {
-  host?: string;
-}
-
-export async function runSpeechModelsCommand(
-  options: SpeechModelsOptions,
-  _command: Command,
-): Promise<SpeechModelsResult> {
-  const client = await connectToDaemon({ host: options.host });
-  try {
-    const response = await client.listSpeechModels();
-    const rows: SpeechModelListItem[] = response.models
-      .slice()
-      .sort((a, b) => a.kind.localeCompare(b.kind) || a.id.localeCompare(b.id))
-      .map((model) => ({
-        id: model.id,
-        kind: model.kind,
-        status: model.isDownloaded ? "downloaded" : "missing",
-        modelDir: model.modelDir,
-        missingFiles: model.missingFiles?.join(", ") ?? "",
-      }));
-    return {
-      type: "list",
-      data: rows,
-      schema: speechModelsSchema,
-    };
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    const commandError: CommandError = {
-      code: "SPEECH_MODELS_LIST_FAILED",
-      message: `Failed to list speech models: ${message}`,
-    };
-    throw commandError;
-  } finally {
-    await client.close().catch(() => {});
-  }
-}
@@ -0,0 +1,99 @@
+import type { Command } from "commander";
+import { renderError, toCommandError } from "../../output/render.js";
+import {
+  connectTerminalClient,
+  resolveTerminalId,
+  toTerminalCommandError,
+  type TerminalCommandOptions,
+} from "./shared.js";
+
+export interface TerminalCaptureOptions extends TerminalCommandOptions {
+  start?: string;
+  end?: string;
+  scrollback?: boolean;
+  ansi?: boolean;
+}
+
+export async function runCaptureCommand(
+  terminalId: string,
+  _options: TerminalCaptureOptions,
+  command: Command,
+): Promise<void> {
+  const options = command.optsWithGlobals() as TerminalCaptureOptions;
+
+  try {
+    const payload = await executeCaptureCommand(terminalId, options);
+    if (options.json) {
+      process.stdout.write(
+        JSON.stringify(
+          {
+            terminalId: payload.terminalId,
+            lines: payload.lines,
+            totalLines: payload.totalLines,
+          },
+          null,
+          2,
+        ) + "\n",
+      );
+      return;
+    }
+
+    if (payload.lines.length > 0) {
+      process.stdout.write(payload.lines.join("\n") + "\n");
+    }
+  } catch (err) {
+    const output = renderError(toCommandError(err), {
+      format: options.json ? "json" : "table",
+      noColor: options.color === false,
+    });
+    process.stderr.write(output + "\n");
+    process.exit(1);
+  }
+}
+
+async function executeCaptureCommand(
+  terminalId: string,
+  options: TerminalCaptureOptions,
+): Promise<{ terminalId: string; lines: string[]; totalLines: number }> {
+  const { client } = await connectTerminalClient(options.host);
+
+  try {
+    const resolvedId = await resolveTerminalId(client, terminalId);
+    if (!resolvedId) {
+      throw {
+        code: "TERMINAL_NOT_FOUND",
+        message: `No terminal found matching: ${terminalId}`,
+        details: "Use `paseo terminal ls --all` to list available terminals.",
+      };
+    }
+
+    const start = options.scrollback ? 0 : parseLineNumber("--start", options.start);
+    const end = parseLineNumber("--end", options.end);
+
+    return await client.captureTerminal(resolvedId, {
+      ...(start === undefined ? {} : { start }),
+      ...(end === undefined ? {} : { end }),
+      stripAnsi: !options.ansi,
+    });
+  } catch (err) {
+    throw toTerminalCommandError("TERMINAL_CAPTURE_FAILED", "capture terminal output", err);
+  } finally {
+    await client.close().catch(() => {});
+  }
+}
+
+function parseLineNumber(flag: string, value?: string): number | undefined {
+  if (value === undefined) {
+    return undefined;
+  }
+
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isInteger(parsed)) {
+    throw {
+      code: "INVALID_LINE_NUMBER",
+      message: `Invalid ${flag} value: ${value}`,
+      details: "Use an integer line number.",
+    };
+  }
+  return parsed;
+}
@@ -0,0 +1,41 @@
+import type { Command } from "commander";
+import type { SingleResult, CommandError } from "../../output/index.js";
+import {
+  connectTerminalClient,
+  toTerminalCommandError,
+  type TerminalCommandOptions,
+} from "./shared.js";
+import { terminalSchema, type TerminalRow, toTerminalRow } from "./schema.js";
+
+export interface TerminalCreateOptions extends TerminalCommandOptions {
+  cwd?: string;
+  name?: string;
+}
+
+export async function runCreateCommand(
+  options: TerminalCreateOptions,
+  _command: Command,
+): Promise<SingleResult<TerminalRow>> {
+  const { client } = await connectTerminalClient(options.host);
+  const cwd = options.cwd ?? process.cwd();
+
+  try {
+    const payload = await client.createTerminal(cwd, options.name);
+    if (!payload.terminal) {
+      const error: CommandError = {
+        code: "TERMINAL_CREATE_FAILED",
+        message: payload.error ?? "Failed to create terminal",
+      };
+      throw error;
+    }
+    return {
+      type: "single",
+      data: toTerminalRow(payload.terminal),
+      schema: terminalSchema,
+    };
+  } catch (err) {
+    throw toTerminalCommandError("TERMINAL_CREATE_FAILED", "create terminal", err);
+  } finally {
+    await client.close().catch(() => {});
+  }
+}
@@ -0,0 +1,59 @@
+import { Command } from "commander";
+import { withOutput } from "../../output/index.js";
+import { addDaemonHostOption, addJsonAndDaemonHostOptions } from "../../utils/command-options.js";
+import { runCaptureCommand } from "./capture.js";
+import { runCreateCommand } from "./create.js";
+import { runKillCommand } from "./kill.js";
+import { runLsCommand } from "./ls.js";
+import { runSendKeysCommand } from "./send-keys.js";
+
+export function createTerminalCommand(): Command {
+  const terminal = new Command("terminal").description("Manage workspace terminals");
+
+  addJsonAndDaemonHostOptions(
+    terminal
+      .command("ls")
+      .description("List terminals")
+      .option("--all", "List terminals across all workspaces")
+      .option("--cwd <path>", "Workspace directory"),
+  ).action(withOutput(runLsCommand));
+
+  addJsonAndDaemonHostOptions(
+    terminal
+      .command("create")
+      .description("Create a terminal")
+      .option("--cwd <path>", "Workspace directory")
+      .option("--name <name>", "Terminal name"),
+  ).action(withOutput(runCreateCommand));
+
+  addJsonAndDaemonHostOptions(
+    terminal
+      .command("kill")
+      .description("Kill a terminal")
+      .argument("<terminal-id>", "Terminal ID, ID prefix, or name"),
+  ).action(withOutput(runKillCommand));
+
+  addDaemonHostOption(
+    terminal
+      .command("capture")
+      .description("Capture terminal output")
+      .argument("<terminal-id>", "Terminal ID, ID prefix, or name")
+      .option("--start <n>", "Capture start line")
+      .option("--end <n>", "Capture end line")
+      .option("-S, --scrollback", "Capture from the beginning of scrollback")
+      .option("--ansi", "Preserve ANSI escape codes")
+      .option("--json", "Output in JSON format"),
+  ).action(runCaptureCommand);
+
+  addDaemonHostOption(
+    terminal
+      .command("send-keys")
+      .description("Send keys to a terminal")
+      .argument("<terminal-id>", "Terminal ID, ID prefix, or name")
+      .argument("<keys...>", "Keys to send")
+      .option("-l, --literal", "Send raw keys without interpreting special tokens")
+      .option("--json", "Output in JSON format"),
+  ).action(runSendKeysCommand);
+
+  return terminal;
+}
@@ -0,0 +1,51 @@
+import type { Command } from "commander";
+import type { CommandError, SingleResult } from "../../output/index.js";
+import {
+  connectTerminalClient,
+  resolveTerminalId,
+  toTerminalCommandError,
+  type TerminalCommandOptions,
+} from "./shared.js";
+import { terminalKillSchema, type TerminalKillRow } from "./schema.js";
+
+export async function runKillCommand(
+  terminalId: string,
+  options: TerminalCommandOptions,
+  _command: Command,
+): Promise<SingleResult<TerminalKillRow>> {
+  const { client } = await connectTerminalClient(options.host);
+
+  try {
+    const resolvedId = await requireTerminalId(client, terminalId);
+    const payload = await client.killTerminal(resolvedId);
+    return {
+      type: "single",
+      data: {
+        terminalId: payload.terminalId,
+        success: payload.success,
+      },
+      schema: terminalKillSchema,
+    };
+  } catch (err) {
+    throw toTerminalCommandError("TERMINAL_KILL_FAILED", "kill terminal", err);
+  } finally {
+    await client.close().catch(() => {});
+  }
+}
+
+async function requireTerminalId(
+  client: Awaited<ReturnType<typeof connectTerminalClient>>["client"],
+  terminalId: string,
+): Promise<string> {
+  const resolvedId = await resolveTerminalId(client, terminalId);
+  if (resolvedId) {
+    return resolvedId;
+  }
+
+  const error: CommandError = {
+    code: "TERMINAL_NOT_FOUND",
+    message: `No terminal found matching: ${terminalId}`,
+    details: "Use `paseo terminal ls --all` to list available terminals.",
+  };
+  throw error;
+}
@@ -0,0 +1,34 @@
+import type { Command } from "commander";
+import type { ListResult } from "../../output/index.js";
+import {
+  connectTerminalClient,
+  toTerminalCommandError,
+  type TerminalCommandOptions,
+} from "./shared.js";
+import { terminalSchema, type TerminalRow, toTerminalRow } from "./schema.js";
+
+export interface TerminalLsOptions extends TerminalCommandOptions {
+  all?: boolean;
+  cwd?: string;
+}
+
+export async function runLsCommand(
+  options: TerminalLsOptions,
+  _command: Command,
+): Promise<ListResult<TerminalRow>> {
+  const { client } = await connectTerminalClient(options.host);
+  const cwd = options.all ? undefined : (options.cwd ?? process.cwd());
+
+  try {
+    const payload = cwd === undefined ? await client.listTerminals() : await client.listTerminals(cwd);
+    return {
+      type: "list",
+      data: payload.terminals.map((terminal) => toTerminalRow(terminal, payload.cwd ?? cwd)),
+      schema: terminalSchema,
+    };
+  } catch (err) {
+    throw toTerminalCommandError("TERMINAL_LIST_FAILED", "list terminals", err);
+  } finally {
+    await client.close().catch(() => {});
+  }
+}
@@ -0,0 +1,44 @@
+import type { OutputSchema } from "../../output/index.js";
+
+export interface TerminalRow {
+  id: string;
+  name: string;
+  cwd: string;
+}
+
+export interface TerminalKillRow {
+  terminalId: string;
+  success: boolean;
+}
+
+export const terminalSchema: OutputSchema<TerminalRow> = {
+  idField: "id",
+  columns: [
+    { header: "ID", field: (row) => row.id.slice(0, 8), width: 8 },
+    { header: "NAME", field: "name", width: 24 },
+    { header: "CWD", field: "cwd", width: 48 },
+  ],
+};
+
+export const terminalKillSchema: OutputSchema<TerminalKillRow> = {
+  idField: "terminalId",
+  columns: [
+    { header: "ID", field: (row) => row.terminalId.slice(0, 8), width: 8 },
+    { header: "SUCCESS", field: "success", width: 8 },
+  ],
+};
+
+export function toTerminalRow(
+  terminal: {
+    id: string;
+    name: string;
+    cwd?: string;
+  },
+  cwd?: string,
+): TerminalRow {
+  return {
+    id: terminal.id,
+    name: terminal.name,
+    cwd: terminal.cwd ?? cwd ?? "-",
+  };
+}
@@ -0,0 +1,99 @@
+import type { Command } from "commander";
+import { renderError, toCommandError } from "../../output/render.js";
+import {
+  connectTerminalClient,
+  resolveTerminalId,
+  toTerminalCommandError,
+  type TerminalCommandOptions,
+} from "./shared.js";
+
+export interface TerminalSendKeysOptions extends TerminalCommandOptions {
+  literal?: boolean;
+}
+
+export async function runSendKeysCommand(
+  terminalId: string,
+  keys: string[],
+  _options: TerminalSendKeysOptions,
+  command: Command,
+): Promise<void> {
+  const options = command.optsWithGlobals() as TerminalSendKeysOptions;
+
+  try {
+    const payload = await executeSendKeysCommand(terminalId, keys, options);
+    if (options.json) {
+      process.stdout.write(JSON.stringify(payload, null, 2) + "\n");
+    }
+  } catch (err) {
+    const output = renderError(toCommandError(err), {
+      format: options.json ? "json" : "table",
+      noColor: options.color === false,
+    });
+    process.stderr.write(output + "\n");
+    process.exit(1);
+  }
+}
+
+async function executeSendKeysCommand(
+  terminalId: string,
+  keys: string[],
+  options: TerminalSendKeysOptions,
+): Promise<{ terminalId: string; keysSent: number }> {
+  const { client } = await connectTerminalClient(options.host);
+
+  try {
+    const resolvedId = await resolveTerminalId(client, terminalId);
+    if (!resolvedId) {
+      throw {
+        code: "TERMINAL_NOT_FOUND",
+        message: `No terminal found matching: ${terminalId}`,
+        details: "Use `paseo terminal ls --all` to list available terminals.",
+      };
+    }
+
+    const data = keys.map((key) => resolveKeyToken(key, options.literal === true)).join("");
+    client.sendTerminalInput(resolvedId, { type: "input", data });
+
+    return {
+      terminalId: resolvedId,
+      keysSent: data.length,
+    };
+  } catch (err) {
+    throw toTerminalCommandError("TERMINAL_SEND_KEYS_FAILED", "send terminal keys", err);
+  } finally {
+    await client.close().catch(() => {});
+  }
+}
+
+function resolveKeyToken(key: string, literal: boolean): string {
+  if (literal) {
+    return key;
+  }
+
+  switch (key) {
+    case "Enter":
+      return "\r";
+    case "Tab":
+      return "\t";
+    case "Escape":
+      return "\u001b";
+    case "Space":
+      return " ";
+    case "BSpace":
+      return "\u007f";
+    case "C-c":
+      return "\u0003";
+    case "C-d":
+      return "\u0004";
+    case "C-z":
+      return "\u001a";
+    case "C-l":
+      return "\u000c";
+    case "C-a":
+      return "\u0001";
+    case "C-e":
+      return "\u0005";
+    default:
+      return key;
+  }
+}
@@ -0,0 +1,87 @@
+import { connectToDaemon, getDaemonHost } from "../../utils/client.js";
+import type { CommandError, CommandOptions } from "../../output/index.js";
+
+export interface TerminalCommandOptions extends CommandOptions {
+  host?: string;
+}
+
+interface TerminalLike {
+  id: string;
+  name?: string | null;
+}
+
+export async function connectTerminalClient(host?: string) {
+  const daemonHost = getDaemonHost({ host });
+  try {
+    const client = await connectToDaemon({ host });
+    return { client, daemonHost };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    const error: CommandError = {
+      code: "DAEMON_NOT_RUNNING",
+      message: `Cannot connect to daemon at ${daemonHost}: ${message}`,
+      details: "Start the daemon with: paseo daemon start",
+    };
+    throw error;
+  }
+}
+
+export function toTerminalCommandError(code: string, action: string, err: unknown): CommandError {
+  if (err && typeof err === "object" && "code" in err && "message" in err) {
+    return err as CommandError;
+  }
+
+  const message = err instanceof Error ? err.message : String(err);
+  const rpcCode =
+    typeof err === "object" && err !== null && "code" in err && typeof err.code === "string"
+      ? err.code
+      : undefined;
+
+  return {
+    code: rpcCode ?? code,
+    message: `Failed to ${action}: ${message}`,
+  };
+}
+
+export async function resolveTerminalId(
+  client: Awaited<ReturnType<typeof connectToDaemon>>,
+  idOrName: string,
+): Promise<string | null> {
+  const payload = await client.listTerminals();
+  return resolveTerminalIdentifier(idOrName, payload.terminals);
+}
+
+function resolveTerminalIdentifier(idOrName: string, terminals: TerminalLike[]): string | null {
+  if (!idOrName || terminals.length === 0) {
+    return null;
+  }
+
+  const query = idOrName.toLowerCase();
+
+  const exactMatch = terminals.find((terminal) => terminal.id === idOrName);
+  if (exactMatch) {
+    return exactMatch.id;
+  }
+
+  const prefixMatches = terminals.filter((terminal) => terminal.id.toLowerCase().startsWith(query));
+  if (prefixMatches.length === 1 && prefixMatches[0]) {
+    return prefixMatches[0].id;
+  }
+  if (prefixMatches.length > 1) {
+    return null;
+  }
+
+  const nameMatches = terminals.filter((terminal) => terminal.name?.toLowerCase() === query);
+  if (nameMatches.length === 1 && nameMatches[0]) {
+    return nameMatches[0].id;
+  }
+
+  const partialNameMatches = terminals.filter((terminal) =>
+    terminal.name?.toLowerCase().includes(query),
+  );
+  if (partialNameMatches.length === 1 && partialNameMatches[0]) {
+    return partialNameMatches[0].id;
+  }
+
+  return null;
+}
@@ -2,7 +2,7 @@

 /**
 * Regression: `paseo daemon stop` must stop supervised dev daemons
- * without allowing daemon-runner to respawn a new worker process.
+ * without allowing the supervisor entrypoint to respawn a new worker process.
 */

 import assert from "node:assert";
@@ -120,20 +120,24 @@ let supervisorProcess: ChildProcess | null = null;
 let recentSupervisorLogs = "";

 try {
-  console.log("Test 1: start daemon-runner in dev mode with isolated PASEO_HOME");
+  console.log("Test 1: start supervisor-entrypoint in dev mode with isolated PASEO_HOME");

-  supervisorProcess = spawn("npx", ["tsx", "../server/scripts/daemon-runner.ts", "--dev"], {
-    cwd: cliRoot,
-    env: {
-      ...process.env,
-      ...testEnv,
-      PASEO_HOME: paseoHome,
-      PASEO_LISTEN: `127.0.0.1:${port}`,
-      PASEO_RELAY_ENABLED: "false",
-      CI: "true",
+  supervisorProcess = spawn(
+    "npx",
+    ["tsx", "../server/scripts/supervisor-entrypoint.ts", "--dev"],
+    {
+      cwd: cliRoot,
+      env: {
+        ...process.env,
+        ...testEnv,
+        PASEO_HOME: paseoHome,
+        PASEO_LISTEN: `127.0.0.1:${port}`,
+        PASEO_RELAY_ENABLED: "false",
+        CI: "true",
+      },
+      stdio: ["ignore", "pipe", "pipe"],
    },
-    stdio: ["ignore", "pipe", "pipe"],
-  });
+  );

  supervisorProcess.stdout?.on("data", (chunk) => {
    recentSupervisorLogs = (recentSupervisorLogs + chunk.toString()).slice(-8000);
@@ -161,8 +165,9 @@ try {
  const command = readProcessCommand(daemonPid);
  assert(command !== null, "pid lock pid should resolve to a running process command");
  assert(
-    command.includes("daemon-runner.ts") || command.includes("daemon-runner.js"),
-    `pid lock pid should be daemon-runner process, got: ${command}`,
+    command.includes("supervisor-entrypoint.ts") ||
+      command.includes("supervisor-entrypoint.js"),
+    `pid lock pid should be supervisor-entrypoint process, got: ${command}`,
  );
  console.log(`✓ dev daemon started with daemon pid ${daemonPid}\n`);

@@ -186,7 +191,7 @@ try {
    await waitFor(
      () => !isProcessRunning(supervisorProcess!.pid ?? -1),
      15000,
-      "daemon-runner supervisor remained running after stop",
+      "supervisor-entrypoint process remained running after stop",
    );
  }

@@ -1,7 +1,7 @@
 #!/usr/bin/env npx tsx

 /**
- * Regression: a single SIGINT sent to a supervised daemon-runner must allow
+ * Regression: a single SIGINT sent to the supervised supervisor entrypoint must allow
 * graceful daemon lifecycle shutdown to complete (no early forced exit path).
 */

@@ -131,21 +131,25 @@ let supervisorProcess: ChildProcess | null = null;
 let recentSupervisorLogs = "";

 try {
-  console.log("Test 1: start daemon-runner in dev mode with isolated PASEO_HOME");
+  console.log("Test 1: start supervisor-entrypoint in dev mode with isolated PASEO_HOME");

-  supervisorProcess = spawn("npx", ["tsx", "../server/scripts/daemon-runner.ts", "--dev"], {
-    cwd: cliRoot,
-    env: {
-      ...process.env,
-      ...testEnv,
-      PASEO_HOME: paseoHome,
-      PASEO_LISTEN: `127.0.0.1:${port}`,
-      PASEO_RELAY_ENABLED: "false",
-      CI: "true",
+  supervisorProcess = spawn(
+    "npx",
+    ["tsx", "../server/scripts/supervisor-entrypoint.ts", "--dev"],
+    {
+      cwd: cliRoot,
+      env: {
+        ...process.env,
+        ...testEnv,
+        PASEO_HOME: paseoHome,
+        PASEO_LISTEN: `127.0.0.1:${port}`,
+        PASEO_RELAY_ENABLED: "false",
+        CI: "true",
+      },
+      stdio: ["ignore", "pipe", "pipe"],
+      detached: process.platform !== "win32",
    },
-    stdio: ["ignore", "pipe", "pipe"],
-    detached: process.platform !== "win32",
-  });
+  );

  supervisorProcess.stdout?.on("data", (chunk) => {
    recentSupervisorLogs = (recentSupervisorLogs + chunk.toString()).slice(-8000);
@@ -62,7 +62,7 @@ try {
      "-e",
      // Keep the process alive long enough for stop command assertions.
      "setInterval(() => {}, 1000)",
-      "daemon-runner.ts",
+      "supervisor-entrypoint.ts",
    ],
    {
      env: {
@@ -122,20 +122,24 @@ let supervisorProcess: ChildProcess | null = null;
 let recentSupervisorLogs = "";

 try {
-  console.log("Test 1: start daemon-runner in dev mode with isolated PASEO_HOME");
+  console.log("Test 1: start supervisor-entrypoint in dev mode with isolated PASEO_HOME");

-  supervisorProcess = spawn("npx", ["tsx", "../server/scripts/daemon-runner.ts", "--dev"], {
-    cwd: cliRoot,
-    env: {
-      ...process.env,
-      ...testEnv,
-      PASEO_HOME: paseoHome,
-      PASEO_LISTEN: host,
-      PASEO_RELAY_ENABLED: "false",
-      CI: "true",
+  supervisorProcess = spawn(
+    "npx",
+    ["tsx", "../server/scripts/supervisor-entrypoint.ts", "--dev"],
+    {
+      cwd: cliRoot,
+      env: {
+        ...process.env,
+        ...testEnv,
+        PASEO_HOME: paseoHome,
+        PASEO_LISTEN: host,
+        PASEO_RELAY_ENABLED: "false",
+        CI: "true",
+      },
+      stdio: ["ignore", "pipe", "pipe"],
    },
-    stdio: ["ignore", "pipe", "pipe"],
-  });
+  );

  supervisorProcess.stdout?.on("data", (chunk) => {
    recentSupervisorLogs = (recentSupervisorLogs + chunk.toString()).slice(-8000);
@@ -134,11 +134,6 @@ try {
      env: {
        ...process.env,
        ...testEnv,
-        // This test validates direct unsupervised worker ownership semantics.
-        // Agent-orchestrated shells may export PASEO_PID_LOCK_MODE=external,
-        // which would delegate lock ownership away from this process and make
-        // daemon status checks fail to observe a running owner PID.
-        PASEO_PID_LOCK_MODE: "self",
        PASEO_HOME: paseoHome,
        PASEO_LISTEN: host,
        PASEO_RELAY_ENABLED: "false",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/desktop",
-  "version": "0.1.37",
+  "version": "0.1.38",
  "private": true,
  "description": "Paseo desktop app (Electron wrapper)",
  "main": "dist/main.js",
@@ -12,8 +12,8 @@
    "typecheck": "tsc --noEmit -p tsconfig.json"
  },
  "dependencies": {
-    "@getpaseo/cli": "0.1.37",
-    "@getpaseo/server": "0.1.37",
+    "@getpaseo/cli": "0.1.38",
+    "@getpaseo/server": "0.1.38",
    "electron-log": "^5.4.3",
    "electron-updater": "^6.6.2",
    "ws": "^8.14.2"
@@ -1,8 +1,9 @@
 import { spawn, type ChildProcess } from "node:child_process";
-import { appendFileSync, existsSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import { app, ipcMain } from "electron";
-import { loadConfig, resolvePaseoHome, getOrCreateServerId } from "@getpaseo/server";
+import log from "electron-log/main";
+import { resolvePaseoHome, getOrCreateServerId } from "@getpaseo/server";
 import {
  copyAttachmentFileToManagedStorage,
  deleteManagedAttachmentFile,
@@ -26,15 +27,13 @@ const STARTUP_POLL_MAX_ATTEMPTS = 150;
 const STOP_TIMEOUT_MS = 15_000;
 const KILL_TIMEOUT_MS = 3_000;
 const DETACHED_STARTUP_GRACE_MS = 1200;
-const DEFAULT_ELECTRON_DEV_SERVER_URL = "http://localhost:8081";
-const DAEMON_LAUNCH_LOG_FILENAME = "daemon-launch.log";

 type DesktopDaemonState = "starting" | "running" | "stopped" | "errored";

 type DesktopDaemonStatus = {
  serverId: string;
  status: DesktopDaemonState;
-  listen: string;
+  listen: string | null;
  hostname: string | null;
  pid: number | null;
  home: string;
@@ -76,10 +75,6 @@ function logFilePath(): string {
  return path.join(getPaseoHome(), DAEMON_LOG_FILENAME);
 }

-function launchLogFilePath(): string {
-  return path.join(getPaseoHome(), DAEMON_LAUNCH_LOG_FILENAME);
-}
-
 function isProcessRunning(pid: number): boolean {
  try {
    process.kill(pid, 0);
@@ -145,48 +140,13 @@ function tailFile(filePath: string, lines = 50): string {
  }
 }

-function appendLaunchLog(message: string, details?: Record<string, unknown>): void {
-  const line = [
-    new Date().toISOString(),
-    "[desktop daemon]",
-    `pid=${process.pid}`,
-    message,
-    details ? JSON.stringify(details) : "",
-  ]
-    .filter((part) => part.length > 0)
-    .join(" ");
-
-  try {
-    appendFileSync(launchLogFilePath(), `${line}\n`, "utf-8");
-  } catch {
-    // Keep launch debugging best-effort so desktop startup behavior is unchanged.
-  }
+function logDesktopDaemonLifecycle(message: string, details?: Record<string, unknown>): void {
+  log.info("[desktop daemon]", message, {
+    pid: process.pid,
+    ...(details ?? {}),
+  });
 }

-function buildDesktopDaemonCorsOriginsEnv(): string | undefined {
-  const origins = new Set(
-    (process.env.PASEO_CORS_ORIGINS ?? "")
-      .split(",")
-      .map((value) => value.trim())
-      .filter((value) => value.length > 0),
-  );
-
-  const devServerUrl = process.env.EXPO_DEV_URL ?? DEFAULT_ELECTRON_DEV_SERVER_URL;
-  try {
-    const parsed = new URL(devServerUrl);
-    origins.add(parsed.origin);
-
-    if (parsed.hostname === "localhost") {
-      origins.add(`${parsed.protocol}//127.0.0.1${parsed.port ? `:${parsed.port}` : ""}`);
-    } else if (parsed.hostname === "127.0.0.1") {
-      origins.add(`${parsed.protocol}//localhost${parsed.port ? `:${parsed.port}` : ""}`);
-    }
-  } catch {
-    // Ignore malformed dev server URLs and preserve any explicit env configuration.
-  }
-
-  return origins.size > 0 ? Array.from(origins).join(",") : undefined;
-}

 function toTrimmedString(value: unknown): string | null {
  if (typeof value !== "string") {
@@ -261,12 +221,11 @@ function resolveDesktopAppVersion(): string {

 function resolveStatus(): DesktopDaemonStatus {
  const home = getPaseoHome();
-  const config = loadConfig(home, { env: process.env });
  const pidPath = pidFilePath();

  let pid: number | null = null;
  let hostname: string | null = null;
-  let listen: string = config.listen;
+  let listen: string | null = null;

  try {
    if (existsSync(pidPath)) {
@@ -281,7 +240,7 @@ function resolveStatus(): DesktopDaemonStatus {
            : typeof parsed.sockPath === "string"
              ? (parsed.sockPath as string)
              : null;
-        if (pidListen) listen = pidListen;
+        listen = pidListen;
      }
    }
  } catch {
@@ -312,28 +271,20 @@ async function startDaemon(): Promise<DesktopDaemonStatus> {
  const current = resolveStatus();
  if (current.status === "running") return current;

-  const home = getPaseoHome();
  const daemonRunner = resolveDaemonRunnerEntrypoint();
-  const corsOrigins = buildDesktopDaemonCorsOriginsEnv();
  const invocation = createNodeEntrypointInvocation({
    entrypoint: daemonRunner,
    argvMode: "node-script",
    args: [],
-    baseEnv: {
-      ...process.env,
-      PASEO_HOME: home,
-      ...(corsOrigins ? { PASEO_CORS_ORIGINS: corsOrigins } : {}),
-    },
+    baseEnv: process.env,
  });

-  appendLaunchLog("starting detached daemon", {
+  logDesktopDaemonLifecycle("starting detached daemon", {
    appIsPackaged: app.isPackaged,
    daemonRunnerEntry: daemonRunner.entryPath,
    daemonRunnerExecArgv: daemonRunner.execArgv,
    command: invocation.command,
    args: invocation.args,
-    listen: process.env.PASEO_LISTEN ?? null,
-    corsOrigins: corsOrigins ?? null,
  });

  const child: ChildProcess = spawn(
@@ -346,7 +297,7 @@ async function startDaemon(): Promise<DesktopDaemonStatus> {
    },
  );

-  appendLaunchLog("detached spawn returned", {
+  logDesktopDaemonLifecycle("detached spawn returned", {
    childPid: child.pid ?? null,
    spawnfile: child.spawnfile,
    spawnargs: child.spawnargs,
@@ -366,14 +317,14 @@ async function startDaemon(): Promise<DesktopDaemonStatus> {
    const timer = setTimeout(() => finish(false), DETACHED_STARTUP_GRACE_MS);

    child.once("error", () => {
-      appendLaunchLog("detached child emitted error during grace period", {
+      logDesktopDaemonLifecycle("detached child emitted error during grace period", {
        childPid: child.pid ?? null,
      });
      clearTimeout(timer);
      finish(true);
    });
    child.once("exit", () => {
-      appendLaunchLog("detached child emitted exit during grace period", {
+      logDesktopDaemonLifecycle("detached child emitted exit during grace period", {
        childPid: child.pid ?? null,
      });
      clearTimeout(timer);
@@ -381,7 +332,7 @@ async function startDaemon(): Promise<DesktopDaemonStatus> {
    });
  });

-  appendLaunchLog("detached startup grace period completed", {
+  logDesktopDaemonLifecycle("detached startup grace period completed", {
    childPid: child.pid ?? null,
    exitedEarly,
  });
@@ -395,7 +346,7 @@ async function startDaemon(): Promise<DesktopDaemonStatus> {
  for (let attempt = 0; attempt < STARTUP_POLL_MAX_ATTEMPTS; attempt++) {
    const status = resolveStatus();
    if (attempt === 0 || attempt === STARTUP_POLL_MAX_ATTEMPTS - 1 || attempt % 10 === 9) {
-      appendLaunchLog("polling daemon status after detached start", {
+      logDesktopDaemonLifecycle("polling daemon status after detached start", {
        attempt: attempt + 1,
        status: status.status,
        pid: status.pid,
@@ -403,7 +354,7 @@ async function startDaemon(): Promise<DesktopDaemonStatus> {
        serverId: status.serverId || null,
      });
    }
-    if (status.status === "running" && status.serverId) return status;
+    if (status.status === "running" && status.serverId && status.listen) return status;
    await sleep(STARTUP_POLL_INTERVAL_MS);
  }

@@ -454,6 +405,9 @@ async function getDaemonPairing(): Promise<DesktopPairingOffer> {
  }

  try {
+    if (!status.listen) {
+      throw new Error("Daemon listen target is unavailable.");
+    }
    const baseUrl = buildDaemonHttpBaseUrl(status.listen);
    if (!baseUrl) {
      throw new Error(`Daemon listen target is not a TCP endpoint: ${status.listen}`);
@@ -495,6 +449,10 @@ async function getLocalDaemonVersion(): Promise<{
    };
  }

+  if (!status.listen) {
+    return { version: null, error: "Daemon listen target is unavailable." };
+  }
+
  const baseUrl = buildDaemonHttpBaseUrl(status.listen);
  if (!baseUrl) {
    return { version: null, error: `Daemon listen target is not a TCP endpoint: ${status.listen}` };
@@ -107,7 +107,7 @@ export function resolveDaemonRunnerEntrypoint(): NodeEntrypointSpec {
          "server",
          "dist",
          "scripts",
-          "daemon-runner.js",
+          "supervisor-entrypoint.js",
        ),
      }),
      execArgv: [],
@@ -115,7 +115,12 @@ export function resolveDaemonRunnerEntrypoint(): NodeEntrypointSpec {
  }

  const serverPackage = resolveServerPackageInfo();
-  const distRunner = path.join(serverPackage.root, "dist", "scripts", "daemon-runner.js");
+  const distRunner = path.join(
+    serverPackage.root,
+    "dist",
+    "scripts",
+    "supervisor-entrypoint.js",
+  );
  if (existsSync(distRunner)) {
    return {
      entryPath: distRunner,
@@ -126,7 +131,7 @@ export function resolveDaemonRunnerEntrypoint(): NodeEntrypointSpec {
  return {
    entryPath: assertPathExists({
      label: "Daemon runner source",
-      filePath: path.join(serverPackage.root, "scripts", "daemon-runner.ts"),
+      filePath: path.join(serverPackage.root, "scripts", "supervisor-entrypoint.ts"),
    }),
    execArgv: ["--import", "tsx"],
  };
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.1.37",
+  "version": "0.1.38",
  "description": "Native module for two way audio streaming",
  "main": "build/index.js",
  "types": "build/index.d.ts",
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/highlight",
-  "version": "0.1.37",
+  "version": "0.1.38",
  "type": "module",
  "publishConfig": {
    "access": "public"
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/relay",
-  "version": "0.1.37",
+  "version": "0.1.38",
  "description": "Paseo relay for bridging daemon and client connections",
  "type": "module",
  "publishConfig": {
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/server",
-  "version": "0.1.37",
+  "version": "0.1.38",
  "description": "Paseo backend server",
  "type": "module",
  "publishConfig": {
@@ -63,8 +63,9 @@
    "@ai-sdk/openai": "2.0.52",
    "@anthropic-ai/claude-agent-sdk": "^0.2.11",
    "@deepgram/sdk": "^3.4.0",
-    "@getpaseo/highlight": "0.1.37",
-    "@getpaseo/relay": "0.1.37",
+    "@getpaseo/highlight": "0.1.38",
+    "@getpaseo/relay": "0.1.38",
+    "@isaacs/ttlcache": "^2.1.4",
    "@modelcontextprotocol/sdk": "^1.20.1",
    "@opencode-ai/sdk": "1.2.6",
    "@sctg/sentencepiece-js": "^1.1.0",
@@ -7,7 +7,7 @@ dotenv.config({
  quiet: true,
 });

-const daemonRunnerEntry = fileURLToPath(new URL("./daemon-runner.ts", import.meta.url));
+const daemonRunnerEntry = fileURLToPath(new URL("./supervisor-entrypoint.ts", import.meta.url));
 const result = spawnSync(
  process.execPath,
  ["--inspect", "--heapsnapshot-near-heap-limit=3", "--max-old-space-size=3072", "--report-on-fatalerror", "--report-directory=/tmp/paseo-reports", ...process.execArgv, daemonRunnerEntry, "--dev", ...process.argv.slice(2)],
@@ -3,7 +3,10 @@ import { describe, expect, test } from "vitest";

 describe("supervision parity", () => {
  test("has exactly one runtime callsite for runSupervisor", () => {
-    const daemonRunner = readFileSync(new URL("./daemon-runner.ts", import.meta.url), "utf8");
+    const daemonRunner = readFileSync(
+      new URL("./supervisor-entrypoint.ts", import.meta.url),
+      "utf8",
+    );
    const devRunner = readFileSync(new URL("./dev-runner.ts", import.meta.url), "utf8");

    const daemonRunnerCalls = (daemonRunner.match(/\brunSupervisor\s*\(/g) ?? []).length;
@@ -1,8 +1,12 @@
 import { fileURLToPath } from "url";
-import { appendFileSync, existsSync } from "node:fs";
+import { existsSync } from "node:fs";
 import path from "node:path";
-import { loadConfig } from "../src/server/config.js";
-import { acquirePidLock, PidLockError, releasePidLock } from "../src/server/pid-lock.js";
+import {
+  acquirePidLock,
+  PidLockError,
+  releasePidLock,
+  updatePidLock,
+} from "../src/server/pid-lock.js";
 import { resolvePaseoHome } from "../src/server/paseo-home.js";
 import { runSupervisor } from "./supervisor.js";
 import { applySherpaLoaderEnv } from "../src/server/speech/providers/local/sherpa/sherpa-runtime-env.js";
@@ -68,36 +72,11 @@ function resolvePackagedNodeEntrypointRunnerPath(currentScriptPath: string): str
  return existsSync(runnerPath) ? runnerPath : null;
 }

-function appendLaunchLog(
-  launchLogPath: string,
-  message: string,
-  details?: Record<string, unknown>,
-): void {
-  const line = [
-    new Date().toISOString(),
-    "[DaemonRunner]",
-    `pid=${process.pid}`,
-    message,
-    details ? JSON.stringify(details) : "",
-  ]
-    .filter((part) => part.length > 0)
-    .join(" ");
-
-  try {
-    appendFileSync(launchLogPath, `${line}\n`, "utf-8");
-  } catch {
-    // Keep launch debugging best-effort so daemon startup behavior is unchanged.
-  }
-}
-
 async function main(): Promise<void> {
  const config = parseConfig(process.argv.slice(2));
  const workerEntry = config.devMode ? resolveDevWorkerEntry() : resolveWorkerEntry();
  const workerExecArgv = resolveWorkerExecArgv(workerEntry);
-  const workerEnv: NodeJS.ProcessEnv = {
-    ...process.env,
-    PASEO_PID_LOCK_MODE: "external",
-  };
+  const workerEnv: NodeJS.ProcessEnv = { ...process.env, PASEO_SUPERVISED: "1" };
  const packagedNodeEntrypointRunner =
    process.env.ELECTRON_RUN_AS_NODE === "1"
      ? resolvePackagedNodeEntrypointRunnerPath(fileURLToPath(import.meta.url))
@@ -106,34 +85,13 @@ async function main(): Promise<void> {
  applySherpaLoaderEnv(workerEnv);

  const paseoHome = resolvePaseoHome(workerEnv);
-  const launchLogPath = path.join(paseoHome, "daemon-launch.log");
-  const daemonConfig = loadConfig(paseoHome, { env: workerEnv });
-
-  appendLaunchLog(launchLogPath, "daemon runner starting", {
-    argv: process.argv.slice(2),
-    execPath: process.execPath,
-    execArgv: process.execArgv,
-    workerEntry,
-    workerExecArgv,
-    devMode: config.devMode,
-    listen: daemonConfig.listen,
-    packagedNodeEntrypointRunner,
-  });

  try {
-    await acquirePidLock(paseoHome, daemonConfig.listen, {
+    await acquirePidLock(paseoHome, null, {
      ownerPid: process.pid,
    });
-    appendLaunchLog(launchLogPath, "pid lock acquired", {
-      ownerPid: process.pid,
-      listen: daemonConfig.listen,
-    });
  } catch (error) {
    if (error instanceof PidLockError) {
-      appendLaunchLog(launchLogPath, "pid lock acquisition failed", {
-        message: error.message,
-        existingLock: error.existingLock,
-      });
      process.stderr.write(`${error.message}\n`);
      process.exit(1);
      return;
@@ -147,9 +105,6 @@ async function main(): Promise<void> {
      return;
    }
    lockReleased = true;
-    appendLaunchLog(launchLogPath, "releasing pid lock", {
-      ownerPid: process.pid,
-    });
    await releasePidLock(paseoHome, {
      ownerPid: process.pid,
    });
@@ -157,7 +112,6 @@ async function main(): Promise<void> {

  runSupervisor({
    name: "DaemonRunner",
-    launchLogPath,
    startupMessage: config.devMode
      ? "Starting daemon worker (dev mode, crash restarts enabled)"
      : "Starting daemon worker (IPC restart enabled)",
@@ -181,6 +135,9 @@ async function main(): Promise<void> {
        })
      : undefined,
    restartOnCrash: config.devMode,
+    onWorkerReady: async ({ listen }) => {
+      await updatePidLock(paseoHome, { listen }, { ownerPid: process.pid });
+    },
    onSupervisorExit: releaseLock,
  });
 }
@@ -1,10 +1,13 @@
 import { fork, spawn, type ChildProcess } from "child_process";
-import { appendFileSync } from "node:fs";

 type WorkerLifecycleMessage =
  | {
      type: "paseo:shutdown";
    }
+  | {
+      type: "paseo:ready";
+      listen: string;
+    }
  | {
      type: "paseo:restart";
      reason?: string;
@@ -13,7 +16,6 @@ type WorkerLifecycleMessage =
 type SupervisorOptions = {
  name: string;
  startupMessage: string;
-  launchLogPath?: string;
  resolveWorkerEntry: () => string;
  workerArgs?: string[];
  workerEnv?: NodeJS.ProcessEnv;
@@ -23,6 +25,7 @@ type SupervisorOptions = {
    args: string[];
    env?: NodeJS.ProcessEnv;
  } | null;
+  onWorkerReady?: (message: { listen: string }) => Promise<void> | void;
  restartOnCrash?: boolean;
  onSupervisorExit?: () => Promise<void> | void;
 };
@@ -39,6 +42,13 @@ function parseLifecycleMessage(msg: unknown): WorkerLifecycleMessage | null {
  if (type === "paseo:shutdown") {
    return { type: "paseo:shutdown" };
  }
+  if (type === "paseo:ready") {
+    const listen = (msg as { listen?: unknown }).listen;
+    if (typeof listen !== "string" || listen.trim().length === 0) {
+      return null;
+    }
+    return { type: "paseo:ready", listen };
+  }
  if (type === "paseo:restart") {
    const reason = (msg as { reason?: unknown }).reason;
    return {
@@ -65,28 +75,6 @@ export function runSupervisor(options: SupervisorOptions): void {
    process.stderr.write(`[${options.name}] ${message}\n`);
  };

-  const logLaunch = (message: string, details?: Record<string, unknown>): void => {
-    if (!options.launchLogPath) {
-      return;
-    }
-
-    const line = [
-      new Date().toISOString(),
-      `[${options.name}]`,
-      `pid=${process.pid}`,
-      message,
-      details ? JSON.stringify(details) : "",
-    ]
-      .filter((part) => part.length > 0)
-      .join(" ");
-
-    try {
-      appendFileSync(options.launchLogPath, `${line}\n`, "utf-8");
-    } catch {
-      // Keep launch debugging best-effort so daemon startup behavior is unchanged.
-    }
-  };
-
  const exitSupervisor = (code: number): void => {
    if (exiting) {
      return;
@@ -116,22 +104,11 @@ export function runSupervisor(options: SupervisorOptions): void {

    const spawnSpec = resolveWorkerSpawnSpec?.(workerEntry) ?? null;
    if (spawnSpec) {
-      logLaunch("spawning worker via explicit spawn spec", {
-        workerEntry,
-        command: spawnSpec.command,
-        args: spawnSpec.args,
-        workerArgs,
-      });
      child = spawn(spawnSpec.command, spawnSpec.args, {
        stdio: ["inherit", "inherit", "inherit", "ipc"],
        env: spawnSpec.env ?? workerEnv,
      });
    } else {
-      logLaunch("spawning worker via fork", {
-        workerEntry,
-        workerArgs,
-        workerExecArgv,
-      });
      child = fork(workerEntry, workerArgs, {
        stdio: "inherit",
        env: workerEnv,
@@ -139,39 +116,22 @@ export function runSupervisor(options: SupervisorOptions): void {
      });
    }

-    logLaunch("worker spawn returned", {
-      childPid: child.pid ?? null,
-      connected: child.connected,
-      spawnfile: child.spawnfile,
-      spawnargs: child.spawnargs,
-    });
-
-    child.on("spawn", () => {
-      logLaunch("worker emitted spawn", {
-        childPid: child?.pid ?? null,
-      });
-    });
-
-    child.on("error", (error) => {
-      logLaunch("worker emitted error", {
-        childPid: child?.pid ?? null,
-        message: error.message,
-      });
-    });
-
    child.on("message", (msg: unknown) => {
      const lifecycleMessage = parseLifecycleMessage(msg);
-      logLaunch("worker emitted ipc message", {
-        childPid: child?.pid ?? null,
-        rawType:
-          typeof msg === "object" && msg !== null && "type" in msg
-            ? (msg as { type?: unknown }).type
-            : typeof msg,
-      });
      if (!lifecycleMessage) {
        return;
      }

+      if (lifecycleMessage.type === "paseo:ready") {
+        Promise.resolve(options.onWorkerReady?.({ listen: lifecycleMessage.listen })).catch(
+          (error) => {
+            const message = error instanceof Error ? error.message : String(error);
+            log(`Worker ready callback failed: ${message}`);
+          },
+        );
+        return;
+      }
+
      if (lifecycleMessage.type === "paseo:shutdown") {
        requestShutdown("Shutdown requested by worker");
        return;
@@ -181,13 +141,6 @@ export function runSupervisor(options: SupervisorOptions): void {
    });

    child.on("exit", (code, signal) => {
-      logLaunch("worker emitted exit", {
-        childPid: child?.pid ?? null,
-        code,
-        signal,
-        restarting,
-        shuttingDown,
-      });
      const exitDescriptor = describeExit(code, signal);

      if (shuttingDown) {
@@ -196,7 +149,11 @@ export function runSupervisor(options: SupervisorOptions): void {
        return;
      }

-      if (restarting || (restartOnCrash && code !== 0 && code !== null)) {
+      const crashed =
+        restartOnCrash &&
+        ((code !== 0 && code !== null) || (signal !== null && signal === "SIGKILL"));
+
+      if (restarting || crashed) {
        restarting = false;
        log(`Worker exited (${exitDescriptor}). Restarting worker...`);
        spawnWorker();
@@ -206,20 +163,6 @@ export function runSupervisor(options: SupervisorOptions): void {
      log(`Worker exited (${exitDescriptor}). Supervisor exiting.`);
      exitSupervisor(typeof code === "number" ? code : 0);
    });
-
-    child.on("close", (code, signal) => {
-      logLaunch("worker emitted close", {
-        childPid: child?.pid ?? null,
-        code,
-        signal,
-      });
-    });
-
-    child.on("disconnect", () => {
-      logLaunch("worker emitted disconnect", {
-        childPid: child?.pid ?? null,
-      });
-    });
  };

  const requestRestart = (reason: string) => {
@@ -252,12 +195,6 @@ export function runSupervisor(options: SupervisorOptions): void {
  process.on("SIGINT", () => forwardSignal("SIGINT"));
  process.on("SIGTERM", () => forwardSignal("SIGTERM"));

-  logLaunch("supervisor starting", {
-    startupMessage: options.startupMessage,
-    restartOnCrash,
-    workerArgs,
-    workerExecArgv,
-  });
  process.stdout.write(`[${options.name}] ${options.startupMessage}\n`);
  spawnWorker();
 }
@@ -213,6 +213,82 @@ describe("DaemonClient", () => {
    expect(client.getConnectionState().status).toBe("disposed");
  });

+  test("normalizes workspace_setup_progress into a workspace-scoped daemon event", async () => {
+    const logger = createMockLogger();
+    const mock = createMockTransport();
+
+    const client = new DaemonClient({
+      url: "ws://test",
+      clientId: "clsk_unit_test",
+      logger,
+      reconnect: { enabled: false },
+      transportFactory: () => mock.transport,
+    });
+    clients.push(client);
+
+    const events: Array<Parameters<Parameters<typeof client.subscribe>[0]>[0]> = [];
+    client.subscribe((event) => {
+      events.push(event);
+    });
+
+    const connectPromise = client.connect();
+    mock.triggerOpen();
+    await connectPromise;
+
+    mock.triggerMessage(
+      wrapSessionMessage({
+        type: "workspace_setup_progress",
+        payload: {
+          workspaceId: "/tmp/project/.paseo/worktrees/feature-a",
+          status: "running",
+          detail: {
+            type: "worktree_setup",
+            worktreePath: "/tmp/project/.paseo/worktrees/feature-a",
+            branchName: "feature-a",
+            log: "phase-one\n",
+            commands: [
+              {
+                index: 1,
+                command: "npm install",
+                cwd: "/tmp/project/.paseo/worktrees/feature-a",
+                log: "phase-one\n",
+                status: "running",
+                exitCode: null,
+              },
+            ],
+          },
+          error: null,
+        },
+      }),
+    );
+
+    expect(events).toContainEqual({
+      type: "workspace_setup_progress",
+      workspaceId: "/tmp/project/.paseo/worktrees/feature-a",
+      payload: {
+        workspaceId: "/tmp/project/.paseo/worktrees/feature-a",
+        status: "running",
+        detail: {
+          type: "worktree_setup",
+          worktreePath: "/tmp/project/.paseo/worktrees/feature-a",
+          branchName: "feature-a",
+          log: "phase-one\n",
+          commands: [
+            {
+              index: 1,
+              command: "npm install",
+              cwd: "/tmp/project/.paseo/worktrees/feature-a",
+              log: "phase-one\n",
+              status: "running",
+              exitCode: null,
+            },
+          ],
+        },
+        error: null,
+      },
+    });
+  });
+
  test("sends explicit shutdown_server_request via shutdownServer", async () => {
    const logger = createMockLogger();
    const mock = createMockTransport();
@@ -36,16 +36,16 @@ import type {
  ProjectIconResponse,
  OpenProjectResponseMessage,
  ArchiveWorkspaceResponseMessage,
+  WorkspaceSetupStatusResponseMessage,
  ListCommandsResponse,
  ListProviderModelsResponseMessage,
  ListAvailableProvidersResponse,
-  SpeechModelsListResponse,
-  SpeechModelsDownloadResponse,
  ListTerminalsResponse,
  CreateTerminalResponse,
  SubscribeTerminalResponse,
  TerminalState,
  KillTerminalResponse,
+  CaptureTerminalResponse,
  TerminalInput,
  SessionInboundMessage,
  SessionOutboundMessage,
@@ -124,6 +124,11 @@ export type DaemonEvent =
      workspaceId: string;
      payload: Extract<SessionOutboundMessage, { type: "workspace_update" }>["payload"];
    }
+  | {
+      type: "workspace_setup_progress";
+      workspaceId: string;
+      payload: Extract<SessionOutboundMessage, { type: "workspace_setup_progress" }>["payload"];
+    }
  | {
      type: "agent_stream";
      agentId: string;
@@ -217,8 +222,6 @@ type FileExplorerPayload = FileExplorerResponse["payload"];
 type FileDownloadTokenPayload = FileDownloadTokenResponse["payload"];
 type ListProviderModelsPayload = ListProviderModelsResponseMessage["payload"];
 type ListAvailableProvidersPayload = ListAvailableProvidersResponse["payload"];
-type SpeechModelsListPayload = SpeechModelsListResponse["payload"];
-type SpeechModelsDownloadPayload = SpeechModelsDownloadResponse["payload"];
 type ListCommandsPayload = ListCommandsResponse["payload"];
 type ListCommandsDraftConfig = Pick<
  AgentSessionConfig,
@@ -241,6 +244,7 @@ type ListTerminalsPayload = ListTerminalsResponse["payload"];
 type CreateTerminalPayload = CreateTerminalResponse["payload"];
 type SubscribeTerminalPayload = SubscribeTerminalResponse["payload"];
 type KillTerminalPayload = KillTerminalResponse["payload"];
+type CaptureTerminalPayload = CaptureTerminalResponse["payload"];
 type ChatCreatePayload = Extract<
  SessionOutboundMessage,
  { type: "chat/create/response" }
@@ -459,6 +463,7 @@ export type InspectScheduleOptions = {
 };
 type OpenProjectPayload = OpenProjectResponseMessage["payload"];
 type ArchiveWorkspacePayload = ArchiveWorkspaceResponseMessage["payload"];
+type WorkspaceSetupStatusPayload = WorkspaceSetupStatusResponseMessage["payload"];

 export type FetchAgentResult = {
  agent: AgentSnapshotPayload;
@@ -1315,6 +1320,21 @@ export class DaemonClient {
    });
  }

+  async fetchWorkspaceSetupStatus(
+    workspaceId: string,
+    requestId?: string,
+  ): Promise<WorkspaceSetupStatusPayload> {
+    return this.sendCorrelatedSessionRequest({
+      requestId,
+      message: {
+        type: "workspace_setup_status_request",
+        workspaceId,
+      },
+      responseType: "workspace_setup_status_response",
+      timeout: 10000,
+    });
+  }
+
  async fetchAgent(agentId: string, requestId?: string): Promise<FetchAgentResult | null> {
    const resolvedRequestId = this.createRequestId(requestId);
    const message = SessionInboundMessageSchema.parse({
@@ -2487,32 +2507,6 @@ export class DaemonClient {
    });
  }

-  async listSpeechModels(requestId?: string): Promise<SpeechModelsListPayload> {
-    return this.sendCorrelatedSessionRequest({
-      requestId,
-      message: {
-        type: "speech_models_list_request",
-      },
-      responseType: "speech_models_list_response",
-      timeout: 30000,
-    });
-  }
-
-  async downloadSpeechModels(options?: {
-    modelIds?: string[];
-    requestId?: string;
-  }): Promise<SpeechModelsDownloadPayload> {
-    return this.sendCorrelatedSessionRequest({
-      requestId: options?.requestId,
-      message: {
-        type: "speech_models_download_request",
-        modelIds: options?.modelIds,
-      },
-      responseType: "speech_models_download_response",
-      timeout: 30 * 60 * 1000,
-    });
-  }
-
  async listCommands(agentId: string, requestId?: string): Promise<ListCommandsPayload>;
  async listCommands(agentId: string, options?: ListCommandsOptions): Promise<ListCommandsPayload>;
  async listCommands(
@@ -2739,11 +2733,11 @@ export class DaemonClient {
    });
  }

-  async listTerminals(cwd: string, requestId?: string): Promise<ListTerminalsPayload> {
+  async listTerminals(cwd?: string, requestId?: string): Promise<ListTerminalsPayload> {
    const resolvedRequestId = this.createRequestId(requestId);
    const message = SessionInboundMessageSchema.parse({
      type: "list_terminals_request",
-      cwd,
+      ...(cwd === undefined ? {} : { cwd }),
      requestId: resolvedRequestId,
    });
    return this.sendCorrelatedRequest({
@@ -2857,6 +2851,29 @@ export class DaemonClient {
    });
  }

+  async captureTerminal(
+    terminalId: string,
+    options?: { start?: number; end?: number; stripAnsi?: boolean },
+    requestId?: string,
+  ): Promise<CaptureTerminalPayload> {
+    const resolvedRequestId = this.createRequestId(requestId);
+    const message = SessionInboundMessageSchema.parse({
+      type: "capture_terminal_request",
+      terminalId,
+      ...(options?.start === undefined ? {} : { start: options.start }),
+      ...(options?.end === undefined ? {} : { end: options.end }),
+      ...(options?.stripAnsi === undefined ? {} : { stripAnsi: options.stripAnsi }),
+      requestId: resolvedRequestId,
+    });
+    return this.sendCorrelatedRequest({
+      requestId: resolvedRequestId,
+      message,
+      responseType: "capture_terminal_response",
+      timeout: 10000,
+      options: { skipQueue: true },
+    });
+  }
+
  async createChatRoom(options: CreateChatRoomOptions): Promise<ChatCreatePayload> {
    return this.sendCorrelatedSessionRequest({
      requestId: options.requestId,
@@ -3528,6 +3545,12 @@ export class DaemonClient {
          workspaceId: msg.payload.kind === "upsert" ? msg.payload.workspace.id : msg.payload.id,
          payload: msg.payload,
        };
+      case "workspace_setup_progress":
+        return {
+          type: "workspace_setup_progress",
+          workspaceId: msg.payload.workspaceId,
+          payload: msg.payload,
+        };
      case "agent_stream":
        return {
          type: "agent_stream",
@@ -48,11 +48,14 @@ import { scheduleAgentMetadataGeneration } from "./agent-metadata-generator.js";
 import { expandUserPath } from "../path-utils.js";
 import type { TerminalManager } from "../../terminal/terminal-manager.js";
 import { createAgentWorktree, runAsyncWorktreeBootstrap } from "../worktree-bootstrap.js";
+import type { ServiceRouteStore } from "../service-proxy.js";

 export interface AgentManagementMcpOptions {
  agentManager: AgentManager;
  agentStorage: AgentStorage;
  terminalManager?: TerminalManager | null;
+  serviceRouteStore?: ServiceRouteStore;
+  getDaemonTcpPort?: () => number | null;
  paseoHome?: string;
  logger: Logger;
 }
@@ -296,21 +299,25 @@ export async function createAgentManagementMcpServer(
      };

      let resolvedCwd = expandUserPath(cwd);
-      let worktreeConfig: WorktreeConfig | undefined;
+      let worktreeBootstrap:
+        | {
+            worktree: WorktreeConfig;
+            shouldBootstrap: boolean;
+          }
+        | undefined;

      if (worktreeName) {
        if (!baseBranch) {
          throw new Error("baseBranch is required when creating a worktree");
        }
-        const worktree = await createAgentWorktree({
+        worktreeBootstrap = await createAgentWorktree({
          branchName: worktreeName,
          cwd: resolvedCwd,
          baseBranch,
          worktreeSlug: worktreeName,
          paseoHome: options.paseoHome,
        });
-        resolvedCwd = worktree.worktreePath;
-        worktreeConfig = worktree;
+        resolvedCwd = worktreeBootstrap.worktree.worktreePath;
      }

      const provider: AgentProvider = agentType ?? "claude";
@@ -322,10 +329,11 @@ export async function createAgentManagementMcpServer(
        title: normalizedTitle ?? undefined,
      });

-      if (worktreeConfig) {
+      if (worktreeBootstrap) {
        void runAsyncWorktreeBootstrap({
          agentId: snapshot.id,
-          worktree: worktreeConfig,
+          worktree: worktreeBootstrap.worktree,
+          shouldBootstrap: worktreeBootstrap.shouldBootstrap,
          terminalManager: options.terminalManager ?? null,
          appendTimelineItem: (item) =>
            appendTimelineItemIfAgentKnown({
@@ -339,6 +347,8 @@ export async function createAgentManagementMcpServer(
              agentId: snapshot.id,
              item,
            }),
+          serviceRouteStore: options.serviceRouteStore,
+          daemonPort: options.getDaemonTcpPort?.() ?? null,
          logger: childLogger,
        });
      }
@@ -178,6 +178,7 @@ export type ToolCallDetail =
        index: number;
        command: string;
        cwd: string;
+        log: string;
        status: "running" | "completed" | "failed";
        exitCode: number | null;
        durationMs?: number;
@@ -28,11 +28,14 @@ import type { VoiceCallerContext, VoiceSpeakHandler } from "../voice-types.js";
 import { expandUserPath, resolvePathFromBase } from "../path-utils.js";
 import type { TerminalManager } from "../../terminal/terminal-manager.js";
 import { createAgentWorktree, runAsyncWorktreeBootstrap } from "../worktree-bootstrap.js";
+import type { ServiceRouteStore } from "../service-proxy.js";

 export interface AgentMcpServerOptions {
  agentManager: AgentManager;
  agentStorage: AgentStorage;
  terminalManager?: TerminalManager | null;
+  serviceRouteStore?: ServiceRouteStore;
+  getDaemonTcpPort?: () => number | null;
  paseoHome?: string;
  /**
   * ID of the agent that is connecting to this MCP server.
@@ -428,6 +431,7 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
      let resolvedCwd: string;
      let resolvedMode: string | undefined;
      let worktreeConfig: WorktreeConfig | undefined;
+      let shouldBootstrapWorktree: boolean | undefined;

      if (callerAgentId) {
        const callerArgs = agentToAgentCreateAgentArgsSchema.parse(args);
@@ -464,15 +468,16 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
          if (!baseBranch) {
            throw new Error("baseBranch is required when creating a worktree");
          }
-          const worktree = await createAgentWorktree({
+          const worktreeBootstrap = await createAgentWorktree({
            branchName: worktreeName,
            cwd: resolvedCwd,
            baseBranch,
            worktreeSlug: worktreeName,
            paseoHome: options.paseoHome,
          });
-          resolvedCwd = worktree.worktreePath;
-          worktreeConfig = worktree;
+          resolvedCwd = worktreeBootstrap.worktree.worktreePath;
+          worktreeConfig = worktreeBootstrap.worktree;
+          shouldBootstrapWorktree = worktreeBootstrap.shouldBootstrap;
        }

        resolvedMode = initialMode;
@@ -497,6 +502,7 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
        void runAsyncWorktreeBootstrap({
          agentId: snapshot.id,
          worktree: worktreeConfig,
+          shouldBootstrap: shouldBootstrapWorktree,
          terminalManager: terminalManager ?? null,
          appendTimelineItem: (item) =>
            appendTimelineItemIfAgentKnown({
@@ -510,6 +516,8 @@ export async function createAgentMcpServer(options: AgentMcpServerOptions): Prom
              agentId: snapshot.id,
              item,
            }),
+          serviceRouteStore: options.serviceRouteStore,
+          daemonPort: options.getDaemonTcpPort?.() ?? null,
          logger: childLogger,
        });
      }
@@ -91,7 +91,7 @@ import { DownloadTokenStore } from "./file-download/token-store.js";
 import type { OpenAiSpeechProviderConfig } from "./speech/providers/openai/config.js";
 import type { LocalSpeechProviderConfig } from "./speech/providers/local/config.js";
 import type { RequestedSpeechProviders } from "./speech/speech-types.js";
-import { initializeSpeechRuntime } from "./speech/speech-runtime.js";
+import { createSpeechService } from "./speech/speech-runtime.js";
 import { AgentManager } from "./agent/agent-manager.js";
 import { AgentStorage } from "./agent/agent-storage.js";
 import { attachAgentStoragePersistence } from "./persistence-hooks.js";
@@ -100,6 +100,7 @@ import { createAllClients, shutdownProviders } from "./agent/provider-registry.j
 import { bootstrapWorkspaceRegistries } from "./workspace-registry-bootstrap.js";
 import { FileBackedProjectRegistry, FileBackedWorkspaceRegistry } from "./workspace-registry.js";
 import { FileBackedChatService } from "./chat/chat-service.js";
+import { CheckoutDiffManager } from "./checkout-diff-manager.js";
 import { LoopService } from "./loop-service.js";
 import { ScheduleService } from "./schedule/service.js";
 import { createTerminalManager, type TerminalManager } from "../terminal/terminal-manager.js";
@@ -111,8 +112,14 @@ import { getOrCreateServerId } from "./server-id.js";
 import { resolveDaemonVersion } from "./daemon-version.js";
 import type { AgentClient, AgentProvider } from "./agent/agent-sdk-types.js";
 import type { AgentProviderRuntimeSettingsMap } from "./agent/provider-launch-config.js";
-import { acquirePidLock, releasePidLock } from "./pid-lock.js";
 import { isHostAllowed, type AllowedHostsConfig } from "./allowed-hosts.js";
+import {
+  ServiceRouteStore,
+  createServiceProxyMiddleware,
+  createServiceProxyUpgradeHandler,
+} from "./service-proxy.js";
+import { ServiceHealthMonitor } from "./service-health-monitor.js";
+import { createServiceStatusEmitter } from "./service-status-projection.js";
 import {
  createVoiceMcpSocketBridgeManager,
  type VoiceMcpSocketBridgeManager,
@@ -182,10 +189,6 @@ export type PaseoDaemonConfig = {
  downloadTokenTtlMs?: number;
  agentProviderSettings?: AgentProviderRuntimeSettingsMap;
  onLifecycleIntent?: (intent: DaemonLifecycleIntent) => void;
-  pidLock?: {
-    mode?: "self" | "external";
-    ownerPid?: number;
-  };
 };

 export interface PaseoDaemon {
@@ -193,6 +196,7 @@ export interface PaseoDaemon {
  agentManager: AgentManager;
  agentStorage: AgentStorage;
  terminalManager: TerminalManager;
+  serviceRouteStore: ServiceRouteStore;
  start(): Promise<void>;
  stop(): Promise<void>;
  getListenTarget(): ListenTarget | null;
@@ -206,17 +210,6 @@ export async function createPaseoDaemon(
  const bootstrapStart = performance.now();
  const elapsed = () => `${(performance.now() - bootstrapStart).toFixed(0)}ms`;
  const daemonVersion = resolveDaemonVersion(import.meta.url);
-  const pidLockMode = config.pidLock?.mode ?? "self";
-  const pidLockOwnerPid = config.pidLock?.ownerPid;
-  const ownsPidLock = pidLockMode === "self";
-
-  // Acquire PID lock before expensive bootstrap work so duplicate starts fail immediately.
-  if (ownsPidLock) {
-    await acquirePidLock(config.paseoHome, config.listen, {
-      ownerPid: pidLockOwnerPid,
-    });
-    logger.info({ elapsed: elapsed() }, "PID lock acquired");
-  }

  try {
    const serverId = getOrCreateServerId(config.paseoHome, { logger });
@@ -233,6 +226,20 @@ export async function createPaseoDaemon(
    const app = express();
    let boundListenTarget: ListenTarget | null = null;

+    const serviceRouteStore = new ServiceRouteStore();
+    let wsServer: VoiceAssistantWebSocketServer | null = null;
+    const serviceHealthMonitor = new ServiceHealthMonitor({
+      routeStore: serviceRouteStore,
+      onChange: createServiceStatusEmitter({
+        sessions: () =>
+          wsServer?.listActiveSessions().map((session) => ({
+            emit: (message) => session.emitServerMessage(message),
+          })) ?? [],
+        routeStore: serviceRouteStore,
+        daemonPort: () => (boundListenTarget?.type === "tcp" ? boundListenTarget.port : null),
+      }),
+    });
+
    // Host allowlist / DNS rebinding protection (vite-like semantics).
    // For non-TCP (unix sockets), skip host validation.
    if (listenTarget.type === "tcp") {
@@ -246,6 +253,14 @@ export async function createPaseoDaemon(
      });
    }

+    // Service proxy — intercepts requests for registered *.localhost hostnames
+    // and forwards them to the corresponding local service port. Placed after
+    // the host allowlist (*.localhost is already allowed) but before CORS and
+    // the rest of the routes so proxied requests skip unnecessary middleware.
+    app.use(
+      createServiceProxyMiddleware({ routeStore: serviceRouteStore, logger }),
+    );
+
    // CORS - allow same-origin + configured origins
    const allowedOrigins = new Set([
      ...config.corsAllowedOrigins,
@@ -367,6 +382,16 @@ export async function createPaseoDaemon(

    const httpServer = createHTTPServer(app);

+    // Service proxy WebSocket upgrade handler — must be registered before the
+    // VoiceAssistantWebSocketServer attaches its own "upgrade" listener so that
+    // service-bound upgrades are forwarded first. The handler is a no-op for
+    // requests that don't match a registered service route.
+    const serviceProxyUpgradeHandler = createServiceProxyUpgradeHandler({
+      routeStore: serviceRouteStore,
+      logger,
+    });
+    httpServer.on("upgrade", serviceProxyUpgradeHandler);
+
    const agentStorage = new AgentStorage(config.agentStoragePath, logger);
    const projectRegistry = new FileBackedProjectRegistry(
      path.join(config.paseoHome, "projects", "projects.json"),
@@ -410,6 +435,10 @@ export async function createPaseoDaemon(
    logger.info({ elapsed: elapsed() }, "Workspace registries bootstrapped");
    await chatService.initialize();
    logger.info({ elapsed: elapsed() }, "Chat service initialized");
+    const checkoutDiffManager = new CheckoutDiffManager({
+      logger,
+      paseoHome: config.paseoHome,
+    });
    const loopService = new LoopService({
      paseoHome: config.paseoHome,
      logger,
@@ -435,9 +464,7 @@ export async function createPaseoDaemon(
      "Voice mode configured for agent-scoped resume flow (no dedicated voice assistant provider)",
    );
    logger.info({ elapsed: elapsed() }, "Preparing voice and MCP runtime");
-    let wsServer: VoiceAssistantWebSocketServer | null = null;
    let voiceMcpBridgeManager: VoiceMcpSocketBridgeManager | null = null;
-    let unsubscribeSpeechReadiness: (() => void) | null = null;

    // Create in-memory transport for Session's Agent MCP client (voice assistant tools)
    const createInMemoryAgentMcpTransport = async (): Promise<InMemoryTransport> => {
@@ -445,6 +472,9 @@ export async function createPaseoDaemon(
        agentManager,
        agentStorage,
        terminalManager,
+        serviceRouteStore,
+        getDaemonTcpPort: () =>
+          boundListenTarget?.type === "tcp" ? boundListenTarget.port : null,
        paseoHome: config.paseoHome,
        enableVoiceTools: false,
        resolveSpeakHandler: (callerAgentId) =>
@@ -471,6 +501,9 @@ export async function createPaseoDaemon(
          agentManager,
          agentStorage,
          terminalManager,
+          serviceRouteStore,
+          getDaemonTcpPort: () =>
+            boundListenTarget?.type === "tcp" ? boundListenTarget.port : null,
          paseoHome: config.paseoHome,
          callerAgentId,
          enableVoiceTools: false,
@@ -591,6 +624,9 @@ export async function createPaseoDaemon(
          agentManager,
          agentStorage,
          terminalManager,
+          serviceRouteStore,
+          getDaemonTcpPort: () =>
+            boundListenTarget?.type === "tcp" ? boundListenTarget.port : null,
          paseoHome: config.paseoHome,
          callerAgentId,
          voiceOnly: true,
@@ -600,21 +636,12 @@ export async function createPaseoDaemon(
        });
      },
    });
-    const {
-      resolveVoiceTurnDetection,
-      resolveVoiceStt,
-      resolveVoiceTts,
-      resolveDictationStt,
-      getSpeechReadiness,
-      subscribeSpeechReadiness,
-      cleanup: cleanupSpeechRuntime,
-      localModelConfig,
-    } = await initializeSpeechRuntime({
+    const speechService = createSpeechService({
      logger,
      openaiConfig: config.openai,
      speechConfig: config.speech,
    });
-    logger.info({ elapsed: elapsed() }, "Speech runtime initialized");
+    logger.info({ elapsed: elapsed() }, "Speech service created");

    wsServer = new VoiceAssistantWebSocketServer(
      httpServer,
@@ -626,7 +653,7 @@ export async function createPaseoDaemon(
      config.paseoHome,
      createInMemoryAgentMcpTransport,
      { allowedOrigins, allowedHosts: config.allowedHosts },
-      { turnDetection: resolveVoiceTurnDetection, stt: resolveVoiceStt, tts: resolveVoiceTts },
+      speechService,
      terminalManager,
      {
        voiceAgentMcpStdio: {
@@ -644,9 +671,6 @@ export async function createPaseoDaemon(
      },
      {
        finalTimeoutMs: config.dictationFinalTimeoutMs,
-        stt: resolveDictationStt,
-        localModels: localModelConfig ?? undefined,
-        getSpeechReadiness,
      },
      config.agentProviderSettings,
      daemonVersion,
@@ -662,10 +686,11 @@ export async function createPaseoDaemon(
      chatService,
      loopService,
      scheduleService,
+      checkoutDiffManager,
+      serviceRouteStore,
+      () => (boundListenTarget?.type === "tcp" ? boundListenTarget.port : null),
+      (hostname) => serviceHealthMonitor.getStatusForHostname(hostname),
    );
-    unsubscribeSpeechReadiness = subscribeSpeechReadiness((snapshot) => {
-      wsServer?.publishSpeechReadiness(snapshot);
-    });

    logger.info({ elapsed: elapsed() }, "Bootstrap complete, ready to start listening");

@@ -701,6 +726,16 @@ export async function createPaseoDaemon(
              );
            }

+            if (typeof process.send === "function" && process.env.PASEO_SUPERVISED === "1") {
+              process.send({
+                type: "paseo:ready",
+                listen:
+                  boundListenTarget.type === "tcp"
+                    ? `${boundListenTarget.host}:${boundListenTarget.port}`
+                    : boundListenTarget.path,
+              });
+            }
+
            if (relayEnabled) {
              const offer = await createConnectionOfferV2({
                serverId,
@@ -741,9 +776,15 @@ export async function createPaseoDaemon(
          httpServer.listen(listenTarget.path);
        }
      });
+
+      // Start speech service after listening so synchronous Sherpa native
+      // model loading doesn't block the server from accepting connections.
+      speechService.start();
+      serviceHealthMonitor.start();
    };

    const stop = async () => {
+      serviceHealthMonitor.stop();
      await closeAllAgents(logger, agentManager);
      await agentManager.flush().catch(() => undefined);
      detachAgentStoragePersistence();
@@ -752,9 +793,7 @@ export async function createPaseoDaemon(
        runtimeSettings: config.agentProviderSettings,
      });
      terminalManager.killAll();
-      unsubscribeSpeechReadiness?.();
-      unsubscribeSpeechReadiness = null;
-      cleanupSpeechRuntime();
+      speechService.stop();
      await scheduleService.stop().catch(() => undefined);
      await relayTransport?.stop().catch(() => undefined);
      if (wsServer) {
@@ -770,12 +809,6 @@ export async function createPaseoDaemon(
      if (listenTarget.type === "socket" && existsSync(listenTarget.path)) {
        unlinkSync(listenTarget.path);
      }
-      // Release PID lock
-      if (ownsPidLock) {
-        await releasePidLock(config.paseoHome, {
-          ownerPid: pidLockOwnerPid,
-        });
-      }
    };

    return {
@@ -783,16 +816,12 @@ export async function createPaseoDaemon(
      agentManager,
      agentStorage,
      terminalManager,
+      serviceRouteStore,
      start,
      stop,
      getListenTarget: () => boundListenTarget,
    };
  } catch (err) {
-    if (ownsPidLock) {
-      await releasePidLock(config.paseoHome, {
-        ownerPid: pidLockOwnerPid,
-      }).catch(() => undefined);
-    }
    throw err;
  }
 }
@@ -0,0 +1,361 @@
+import { watch, type FSWatcher } from "node:fs";
+import { exec } from "child_process";
+import { promisify } from "util";
+import type pino from "pino";
+import type { SubscribeCheckoutDiffRequest, SessionOutboundMessage } from "./messages.js";
+import { getCheckoutDiff } from "../utils/checkout-git.js";
+import { expandTilde } from "../utils/path.js";
+import { READ_ONLY_GIT_ENV, resolveCheckoutGitDir, toCheckoutError } from "./checkout-git-utils.js";
+
+const execAsync = promisify(exec);
+
+const CHECKOUT_DIFF_WATCH_DEBOUNCE_MS = 150;
+const CHECKOUT_DIFF_FALLBACK_REFRESH_MS = 5_000;
+
+export type CheckoutDiffCompareInput = SubscribeCheckoutDiffRequest["compare"];
+
+export type CheckoutDiffSnapshotPayload = Omit<
+  Extract<SessionOutboundMessage, { type: "checkout_diff_update" }>["payload"],
+  "subscriptionId"
+>;
+
+export type CheckoutDiffMetrics = {
+  checkoutDiffTargetCount: number;
+  checkoutDiffSubscriptionCount: number;
+  checkoutDiffWatcherCount: number;
+  checkoutDiffFallbackRefreshTargetCount: number;
+};
+
+type CheckoutDiffWatchTarget = {
+  key: string;
+  cwd: string;
+  diffCwd: string;
+  compare: CheckoutDiffCompareInput;
+  listeners: Set<(snapshot: CheckoutDiffSnapshotPayload) => void>;
+  watchers: FSWatcher[];
+  fallbackRefreshInterval: NodeJS.Timeout | null;
+  debounceTimer: NodeJS.Timeout | null;
+  refreshPromise: Promise<void> | null;
+  refreshQueued: boolean;
+  latestPayload: CheckoutDiffSnapshotPayload | null;
+  latestFingerprint: string | null;
+};
+
+export class CheckoutDiffManager {
+  private readonly logger: pino.Logger;
+  private readonly paseoHome: string;
+  private readonly targets = new Map<string, CheckoutDiffWatchTarget>();
+
+  constructor(options: { logger: pino.Logger; paseoHome: string }) {
+    this.logger = options.logger.child({ module: "checkout-diff-manager" });
+    this.paseoHome = options.paseoHome;
+  }
+
+  async subscribe(
+    params: {
+      cwd: string;
+      compare: CheckoutDiffCompareInput;
+    },
+    listener: (snapshot: CheckoutDiffSnapshotPayload) => void,
+  ): Promise<{ initial: CheckoutDiffSnapshotPayload; unsubscribe: () => void }> {
+    const cwd = params.cwd;
+    const compare = this.normalizeCompare(params.compare);
+    const target = await this.ensureTarget(cwd, compare);
+    target.listeners.add(listener);
+
+    const initial =
+      target.latestPayload ??
+      (await this.computeCheckoutDiffSnapshot(target.cwd, target.compare, {
+        diffCwd: target.diffCwd,
+      }));
+    target.latestPayload = initial;
+    target.latestFingerprint = JSON.stringify(initial);
+    return {
+      initial,
+      unsubscribe: () => {
+        this.removeListener(target.key, listener);
+      },
+    };
+  }
+
+  scheduleRefreshForCwd(cwd: string): void {
+    const resolvedCwd = expandTilde(cwd);
+    for (const target of this.targets.values()) {
+      if (target.cwd !== resolvedCwd && target.diffCwd !== resolvedCwd) {
+        continue;
+      }
+      this.scheduleTargetRefresh(target);
+    }
+  }
+
+  getMetrics(): CheckoutDiffMetrics {
+    let checkoutDiffSubscriptionCount = 0;
+    let checkoutDiffWatcherCount = 0;
+    let checkoutDiffFallbackRefreshTargetCount = 0;
+
+    for (const target of this.targets.values()) {
+      checkoutDiffSubscriptionCount += target.listeners.size;
+      checkoutDiffWatcherCount += target.watchers.length;
+      if (target.fallbackRefreshInterval) {
+        checkoutDiffFallbackRefreshTargetCount += 1;
+      }
+    }
+
+    return {
+      checkoutDiffTargetCount: this.targets.size,
+      checkoutDiffSubscriptionCount,
+      checkoutDiffWatcherCount,
+      checkoutDiffFallbackRefreshTargetCount,
+    };
+  }
+
+  dispose(): void {
+    for (const target of this.targets.values()) {
+      this.closeTarget(target);
+    }
+    this.targets.clear();
+  }
+
+  private normalizeCompare(compare: CheckoutDiffCompareInput): CheckoutDiffCompareInput {
+    if (compare.mode === "uncommitted") {
+      return { mode: "uncommitted" };
+    }
+    const trimmedBaseRef = compare.baseRef?.trim();
+    return trimmedBaseRef ? { mode: "base", baseRef: trimmedBaseRef } : { mode: "base" };
+  }
+
+  private buildTargetKey(cwd: string, compare: CheckoutDiffCompareInput): string {
+    return JSON.stringify([
+      cwd,
+      compare.mode,
+      compare.mode === "base" ? (compare.baseRef ?? "") : "",
+    ]);
+  }
+
+  private closeTarget(target: CheckoutDiffWatchTarget): void {
+    if (target.debounceTimer) {
+      clearTimeout(target.debounceTimer);
+      target.debounceTimer = null;
+    }
+    if (target.fallbackRefreshInterval) {
+      clearInterval(target.fallbackRefreshInterval);
+      target.fallbackRefreshInterval = null;
+    }
+    for (const watcher of target.watchers) {
+      watcher.close();
+    }
+    target.watchers = [];
+    target.listeners.clear();
+  }
+
+  private removeListener(
+    targetKey: string,
+    listener: (snapshot: CheckoutDiffSnapshotPayload) => void,
+  ): void {
+    const target = this.targets.get(targetKey);
+    if (!target) {
+      return;
+    }
+    target.listeners.delete(listener);
+    if (target.listeners.size > 0) {
+      return;
+    }
+    this.closeTarget(target);
+    this.targets.delete(targetKey);
+  }
+
+  private async resolveCheckoutWatchRoot(cwd: string): Promise<string | null> {
+    try {
+      const { stdout } = await execAsync("git rev-parse --path-format=absolute --show-toplevel", {
+        cwd,
+        env: READ_ONLY_GIT_ENV,
+      });
+      const root = stdout.trim();
+      return root.length > 0 ? root : null;
+    } catch {
+      return null;
+    }
+  }
+
+  private scheduleTargetRefresh(target: CheckoutDiffWatchTarget): void {
+    if (target.debounceTimer) {
+      clearTimeout(target.debounceTimer);
+    }
+    target.debounceTimer = setTimeout(() => {
+      target.debounceTimer = null;
+      void this.refreshTarget(target);
+    }, CHECKOUT_DIFF_WATCH_DEBOUNCE_MS);
+  }
+
+  private async computeCheckoutDiffSnapshot(
+    cwd: string,
+    compare: CheckoutDiffCompareInput,
+    options?: { diffCwd?: string },
+  ): Promise<CheckoutDiffSnapshotPayload> {
+    const diffCwd = options?.diffCwd ?? cwd;
+    try {
+      const diffResult = await getCheckoutDiff(
+        diffCwd,
+        {
+          mode: compare.mode,
+          baseRef: compare.baseRef,
+          includeStructured: true,
+        },
+        { paseoHome: this.paseoHome },
+      );
+      const files = [...(diffResult.structured ?? [])];
+      files.sort((a, b) => {
+        if (a.path === b.path) return 0;
+        return a.path < b.path ? -1 : 1;
+      });
+      return {
+        cwd,
+        files,
+        error: null,
+      };
+    } catch (error) {
+      return {
+        cwd,
+        files: [],
+        error: toCheckoutError(error),
+      };
+    }
+  }
+
+  private async refreshTarget(target: CheckoutDiffWatchTarget): Promise<void> {
+    if (target.refreshPromise) {
+      target.refreshQueued = true;
+      return;
+    }
+
+    target.refreshPromise = (async () => {
+      do {
+        target.refreshQueued = false;
+        const snapshot = await this.computeCheckoutDiffSnapshot(target.cwd, target.compare, {
+          diffCwd: target.diffCwd,
+        });
+        target.latestPayload = snapshot;
+        const fingerprint = JSON.stringify(snapshot);
+        if (fingerprint !== target.latestFingerprint) {
+          target.latestFingerprint = fingerprint;
+          for (const listener of target.listeners) {
+            listener(snapshot);
+          }
+        }
+      } while (target.refreshQueued);
+    })();
+
+    try {
+      await target.refreshPromise;
+    } finally {
+      target.refreshPromise = null;
+    }
+  }
+
+  private async ensureTarget(
+    cwd: string,
+    compare: CheckoutDiffCompareInput,
+  ): Promise<CheckoutDiffWatchTarget> {
+    const targetKey = this.buildTargetKey(cwd, compare);
+    const existing = this.targets.get(targetKey);
+    if (existing) {
+      return existing;
+    }
+
+    const watchRoot = await this.resolveCheckoutWatchRoot(cwd);
+    const target: CheckoutDiffWatchTarget = {
+      key: targetKey,
+      cwd,
+      diffCwd: watchRoot ?? cwd,
+      compare,
+      listeners: new Set(),
+      watchers: [],
+      fallbackRefreshInterval: null,
+      debounceTimer: null,
+      refreshPromise: null,
+      refreshQueued: false,
+      latestPayload: null,
+      latestFingerprint: null,
+    };
+
+    const repoWatchPath = watchRoot ?? cwd;
+    const watchPaths = new Set<string>([repoWatchPath]);
+    const gitDir = await resolveCheckoutGitDir(cwd);
+    if (gitDir) {
+      watchPaths.add(gitDir);
+    }
+
+    let hasRecursiveRepoCoverage = false;
+    const allowRecursiveRepoWatch = process.platform !== "linux";
+    for (const watchPath of watchPaths) {
+      const shouldTryRecursive = watchPath === repoWatchPath && allowRecursiveRepoWatch;
+      const createWatcher = (recursive: boolean): FSWatcher =>
+        watch(watchPath, { recursive }, () => {
+          this.scheduleTargetRefresh(target);
+        });
+
+      let watcher: FSWatcher | null = null;
+      let watcherIsRecursive = false;
+      try {
+        if (shouldTryRecursive) {
+          watcher = createWatcher(true);
+          watcherIsRecursive = true;
+        } else {
+          watcher = createWatcher(false);
+        }
+      } catch (error) {
+        if (shouldTryRecursive) {
+          try {
+            watcher = createWatcher(false);
+            this.logger.warn(
+              { err: error, watchPath, cwd, compare },
+              "Checkout diff recursive watch unavailable; using non-recursive fallback",
+            );
+          } catch (fallbackError) {
+            this.logger.warn(
+              { err: fallbackError, watchPath, cwd, compare },
+              "Failed to start checkout diff watcher",
+            );
+          }
+        } else {
+          this.logger.warn(
+            { err: error, watchPath, cwd, compare },
+            "Failed to start checkout diff watcher",
+          );
+        }
+      }
+
+      if (!watcher) {
+        continue;
+      }
+
+      watcher.on("error", (error) => {
+        this.logger.warn({ err: error, watchPath, cwd, compare }, "Checkout diff watcher error");
+      });
+      target.watchers.push(watcher);
+      if (watchPath === repoWatchPath && watcherIsRecursive) {
+        hasRecursiveRepoCoverage = true;
+      }
+    }
+
+    const missingRepoCoverage = !hasRecursiveRepoCoverage;
+    if (target.watchers.length === 0 || missingRepoCoverage) {
+      target.fallbackRefreshInterval = setInterval(() => {
+        this.scheduleTargetRefresh(target);
+      }, CHECKOUT_DIFF_FALLBACK_REFRESH_MS);
+      this.logger.warn(
+        {
+          cwd,
+          compare,
+          intervalMs: CHECKOUT_DIFF_FALLBACK_REFRESH_MS,
+          reason:
+            target.watchers.length === 0 ? "no_watchers" : "missing_recursive_repo_root_coverage",
+        },
+        "Checkout diff watchers unavailable; using timed refresh fallback",
+      );
+    }
+
+    this.targets.set(targetKey, target);
+    return target;
+  }
+}
@@ -0,0 +1,50 @@
+import { exec } from "child_process";
+import { promisify } from "util";
+import {
+  MergeConflictError,
+  MergeFromBaseConflictError,
+  NotGitRepoError,
+} from "../utils/checkout-git.js";
+
+const execAsync = promisify(exec);
+
+export const READ_ONLY_GIT_ENV: NodeJS.ProcessEnv = {
+  ...process.env,
+  GIT_OPTIONAL_LOCKS: "0",
+};
+
+export type CheckoutErrorCode = "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+
+export type CheckoutErrorPayload = {
+  code: CheckoutErrorCode;
+  message: string;
+};
+
+export async function resolveCheckoutGitDir(cwd: string): Promise<string | null> {
+  try {
+    const { stdout } = await execAsync("git rev-parse --absolute-git-dir", {
+      cwd,
+      env: READ_ONLY_GIT_ENV,
+    });
+    const gitDir = stdout.trim();
+    return gitDir.length > 0 ? gitDir : null;
+  } catch {
+    return null;
+  }
+}
+
+export function toCheckoutError(error: unknown): CheckoutErrorPayload {
+  if (error instanceof NotGitRepoError) {
+    return { code: "NOT_GIT_REPO", message: error.message };
+  }
+  if (error instanceof MergeConflictError) {
+    return { code: "MERGE_CONFLICT", message: error.message };
+  }
+  if (error instanceof MergeFromBaseConflictError) {
+    return { code: "MERGE_CONFLICT", message: error.message };
+  }
+  if (error instanceof Error) {
+    return { code: "UNKNOWN", message: error.message };
+  }
+  return { code: "UNKNOWN", message: String(error) };
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mohamed Boudra	5b3ec572cb	feat: service proxy, health monitor, hover card, and homepage section Built-in service proxy with branch-based URLs, service health monitoring, workspace hover card with service status, and "Forget about ports" homepage section.	2026-04-01 10:31:15 +07:00
Mohamed Boudra	806079c7ad	Emit running state when workspace setup begins	2026-03-31 16:22:51 +07:00
Mohamed Boudra	1f6ffa9e0e	Add workspace setup streaming and setup tab	2026-03-31 09:09:38 +07:00
Mohamed Boudra	266d042528	feat(server): built-in service proxy — absorb portless into daemon Services defined in paseo.json get reverse-proxied through the daemon via hostname-based routing on *.localhost. Each service receives $PORT, $HOST, and $PASEO_SERVICE_URL env vars, and is accessible at {service}.localhost:6767 (main) or {branch}.{service}.localhost:6767 (worktrees).	2026-03-30 21:41:03 +07:00
Mohamed Boudra	0ba2f6b194	feat(cli): add `paseo terminal` command group for managing workspace terminals New CLI commands: ls, create, kill, capture (tmux capture-pane style with line range slicing and ANSI stripping), and send-keys (with special token interpretation). Server-side adds capture_terminal_request RPC and list-all-terminals support (optional CWD). Includes e2e tests and skill docs.	2026-03-30 17:05:14 +07:00
Mohamed Boudra	5b22aedaff	feat(app): polish file explorer tree with material icons and visual refinements Replace lucide file icons with colored SVGs from material-icon-theme covering 53 language/filetype-specific icons. Add chevron expand indicators for directories, indent guide lines, rounded rows, and restyle the header toolbar to match the git diff pane pattern.	2026-03-30 17:05:14 +07:00
Mohamed Boudra	e3b6e2dcfa	Create FUNDING.yml	2026-03-30 17:29:31 +08:00
Mohamed Boudra	0d9bda12e6	fix(app): centralize window controls padding into useWindowControlsPadding hook Replaces useTrafficLightPadding with a role-based useWindowControlsPadding hook that absorbs all layout-conditional logic (sidebar state, focus mode, explorer state). Consumers no longer make platform or layout decisions — they just apply the resolved padding values. Fixes Windows title bar overlay buttons overlapping source control icons when the left sidebar is open, and right padding not shifting to the explorer sidebar header when it's open. Also fixes borderless header using borderBottomWidth:0 (layout shift) instead of transparent, and double-click-to-maximize bounce on the open project screen caused by nested drag handlers.	2026-03-30 15:17:27 +07:00
Mohamed Boudra	a94bc0720c	refactor(server): rename worktree destroy → teardown, add port to env, extract session code - Rename `worktree.destroy` config field to `worktree.teardown` (breaking) - Rename getWorktreeDestroyCommands/runWorktreeDestroyCommands → teardown - Add PASEO_WORKTREE_PORT to teardown env from persisted metadata (omit if missing) - Extract worktree orchestration from session.ts into worktree-session.ts - Document teardown lifecycle hooks in worktree docs	2026-03-30 14:53:27 +07:00
Mohamed Boudra	7504d20b67	refactor(server): extract SpeechService and defer init until after listen Speech runtime was leaking 8+ individual resolvers into bootstrap and blocking server startup for ~3s with synchronous Sherpa native model loading. Refactor into a self-contained SpeechService that owns its full lifecycle (init, download, monitor, cleanup) and defer start() until after httpServer.listen() so native loading doesn't block accepting connections. Server startup drops from ~3.2s to ~0.5s. Also removes unused client-triggered speech model download/list path (CLI commands, session handlers, message types) — the service manages its own models.	2026-03-30 14:07:55 +07:00
Mohamed Boudra	db39417be9	fix(app): remove redundant overflow hidden causing iOS sidebar scroll flicker The inner sidebarContent had overflow: "hidden" while the parent mobileSidebar already clips. On iOS, nested overflow clipping on Animated.View with transforms and scroll containers causes rendering artifacts during scroll.	2026-03-30 13:45:26 +07:00
Mohamed Boudra	e0e4f228eb	fix(server): guard paseo:ready IPC behind PASEO_SUPERVISED env var The process.send check alone was insufficient because vitest also runs workers with IPC channels. Now the supervisor sets PASEO_SUPERVISED=1 on the worker env, and bootstrap checks for it before sending.	2026-03-30 12:44:05 +07:00
github-actions[bot]	f6630e16ff	fix: update lockfile signatures and Nix hash	2026-03-30 05:40:49 +00:00
Mohamed Boudra	82a235dada	chore(release): cut 0.1.38	2026-03-30 12:39:23 +07:00
Mohamed Boudra	3784357b7e	docs: add 0.1.38 changelog entry	2026-03-30 12:39:12 +07:00
Mohamed Boudra	8d0a9f9224	fix(server): fix daemon startup race and reduce log bloat The desktop app could time out connecting to the daemon on first launch because the PID file advertised a listen address before the HTTP server was actually listening. The supervisor now writes the PID lock with listen: null and updates it only after the worker sends a paseo:ready IPC message confirming the server is listening. - Rename daemon-runner.ts to supervisor-entrypoint.ts - PID lock acquired with listen: null, updated via paseo:ready IPC - Worker sends paseo:ready after httpServer.listen() resolves - Desktop polls until listen is non-null before returning to the app - Remove PASEO_PID_LOCK_MODE and external lock mode - Remove unnecessary env overrides (PASEO_HOME, PASEO_CORS_ORIGINS) from desktop daemon spawn - Reduce trace log bloat: inbound/outbound WebSocket messages now log only message type and payload size instead of full payloads - Supervisor restarts worker on SIGKILL (covers OOM)	2026-03-30 12:37:07 +07:00
Mohamed Boudra	e758734807	feat(website): update marketing copy and section styling Rework multi-provider and self-hosted sections with clearer copy. Scale up self-hosted diagram cards to match multi-provider sizing.	2026-03-30 12:31:42 +07:00
Mohamed Boudra	352a4e793a	feat(website): redeploy on new GitHub releases The website fetches the latest release version at build time, so it needs to redeploy when a new release is published to pick up updated download links.	2026-03-30 08:48:06 +07:00
Mohamed Boudra	8047394154	docs: add 0.1.37 changelog entry	2026-03-29 23:28:00 +07:00
Mohamed Boudra	e5fd61f131	feat(app): add empty states for sidebar, sessions, and open-project Sidebar shows a card with "No projects yet" and an Add project ghost button. Sessions screen shows "No sessions yet" with a ghost Back button. Open-project screen uses MenuHeader borderless, shared Button, and shows introductory text when no projects exist.	2026-03-29 23:10:45 +07:00
Mohamed Boudra	487af3c822	feat(app): add borderless prop to ScreenHeader and MenuHeader	2026-03-29 23:10:40 +07:00
Mohamed Boudra	a7439c8e56	feat(app): enhance Button ghost variant with hover and flexible leftIcon Ghost variant text+icon are foregroundMuted by default, foreground on hover. leftIcon now accepts a ReactElement, ComponentType, or render function so the Button can control icon color internally.	2026-03-29 23:10:35 +07:00
Mohamed Boudra	930660074d	fix(server): treat bare slash queries as search terms in project picker Queries like "faro/main" were treated as literal paths relative to ~, so the picker tried to list ~/faro/ (which doesn't exist) instead of searching the home tree for paths containing "faro/main". Only treat queries as paths when explicitly rooted with ~, ~/, ./, or /.	2026-03-29 23:10:15 +07:00
Mohamed Boudra	fd030e8673	docs: clarify installation paths and components (#153 ) Rewrite Getting Started in README and website docs to explain the daemon, put agent CLI prerequisites first, and split setup into Desktop App (recommended, bundles daemon) and CLI/headless paths. Add "Components at a glance" section to ARCHITECTURE.md.	2026-03-29 22:37:53 +07:00
Mohamed Boudra	bb73147efd	feat(app): desktop startup sequence with error recovery (#153 ) Replace the silent daemon bootstrap failure path with a multi-phase startup screen that shows progress and surfaces errors. Uses Expo Router Stack.Protected to gate app screens behind bootstrap completion, keeping the Stack mounted at all times to avoid layout remounts. - bootstrapDesktop() returns structured result instead of swallowing errors - addConnectionFromListenAndWaitForOnline() waits for real connection, not just probe - Startup screen shows stacked progress steps with checkmark transitions - Error state shows daemon logs, copy button, GitHub issue link, docs link, retry - External URLs open in system browser via openExternalUrl	2026-03-29 22:29:16 +07:00
Mohamed Boudra	04b21f089c	Fix mobile dropdown close and draft thinking persistence Closes #150 Closes #151	2026-03-29 21:17:31 +07:00
Mohamed Boudra	fb42c8eea2	fix(website): fetch desktop version from latest GitHub release The download page was showing pre-release versions because it read the version directly from package.json. Now fetches the latest non-prerelease from the GitHub Releases API at build time, with fallback to package.json for local dev.	2026-03-29 21:12:30 +07:00
github-actions[bot]	971f74e2ab	fix: update lockfile signatures and Nix hash	2026-03-29 13:41:46 +00:00
github-actions[bot]	4318aa2bb1	fix: update lockfile signatures and Nix hash	2026-03-29 20:39:03 +07:00
Mohamed Boudra	a1761363fa	fix(website): respect draft frontmatter field when filtering posts Posts with `draft: true` in frontmatter were shown because isDraft only checked the file path for `/drafts/`. Now checks both path and frontmatter.	2026-03-29 20:39:03 +07:00
github-actions[bot]	096417d5ac	fix: update lockfile signatures and Nix hash	2026-03-29 10:54:20 +00:00
Mohamed Boudra	35446e01a2	docs(skills): add paseo archive command to CLI reference	2026-03-29 17:39:50 +07:00
Mohamed Boudra	6c3559e90f	refactor(server): extract CheckoutDiffManager from Session into daemon-global service Checkout-diff watch targets were per-Session, so multiple clients (phone, desktop, browser) watching the same workspace duplicated fs.watch sets and snapshot computation. Move all checkout-diff subscription machinery into a singleton CheckoutDiffManager that deduplicates watchers and snapshots across sessions — same pattern as AgentManager. Session now keeps only a Map<subscriptionId, unsubscribe> and thin message handler wrappers. Shared utilities (resolveCheckoutGitDir, toCheckoutError, READ_ONLY_GIT_ENV) extracted to checkout-git-utils.ts.	2026-03-29 17:39:47 +07:00
Mohamed Boudra	409ab466ca	docs(website): add draft blog posts	2026-03-29 16:44:51 +07:00
Mohamed Boudra	efb8c8f229	feat(server): cache getPullRequestStatus with TTL and in-flight dedup Adds @isaacs/ttlcache to avoid repeated gh CLI calls for the same working directory. Concurrent lookups for the same cwd share a single in-flight promise. Cache expires after 30s by default.	2026-03-29 16:42:39 +07:00
Mohamed Boudra	b1d663557b	refactor(daemon): replace daemon-launch.log with electron-log in desktop, remove from CLI/server The file-based daemon-launch.log was added as temporary instrumentation for debugging Windows startup. Desktop now logs lifecycle events through electron-log; CLI and server supervisor drop the launch logging entirely.	2026-03-29 16:42:31 +07:00
Mohamed Boudra	a460c5e9b9	fix(website): only show blog drafts when explicitly requested The validateSearch round-trip caused drafts to always show because `false !== undefined` is true. Check for explicit truthy values instead.	2026-03-29 14:43:23 +07:00