test(server): distinguish Hub execution sessions

test(server): exclude internal sessions from Hub counts
fix(nix): refresh npm dependency hash
2026-10-16 22:32:42 +00:00 · 2026-08-09 02:39:21 +02:00 · 2026-08-09 02:26:55 +02:00 · 2026-08-09 02:06:43 +02:00 · 2026-08-09 01:53:55 +02:00 · 2026-08-09 01:53:55 +02:00
164 changed files with 5750 additions and 5010 deletions
@@ -1,33 +1,5 @@
 # Changelog

-## 0.3.1 - 2026-08-09
-
-### Added
-
- Unassign keyboard shortcuts and see the effective bindings in shortcut help ([#2510](https://github.com/getpaseo/paseo/pull/2510) by [@cleiter](https://github.com/cleiter), [#2985](https://github.com/getpaseo/paseo/pull/2985) by [@cleiter](https://github.com/cleiter))
- Choose a Pure black theme ([#3012](https://github.com/getpaseo/paseo/pull/3012) by [@shrimpwtf](https://github.com/shrimpwtf))
-
-### Improved
-
- Running agents use a clearer animated status ring ([c0daf8e](https://github.com/getpaseo/paseo/commit/c0daf8e066e0d7379723a2a6ddea20afc71ead20) by [@cleiter](https://github.com/cleiter))
- Workspace Git updates stay responsive under file-watcher failures, heavy Git activity, and large shared-worktree repositories ([#3056](https://github.com/getpaseo/paseo/pull/3056), [#3033](https://github.com/getpaseo/paseo/pull/3033) by [@dwyanewang](https://github.com/dwyanewang), [#3078](https://github.com/getpaseo/paseo/pull/3078))
- Kimi usage refreshes correctly and shows five-hour limits and reasoning levels ([#2743](https://github.com/getpaseo/paseo/pull/2743) by [@UnbrokenHunter](https://github.com/UnbrokenHunter))
- Resize the desktop sidebar with touch ([#2953](https://github.com/getpaseo/paseo/pull/2953) by [@colonelpanic8](https://github.com/colonelpanic8))
-
-### Fixed
-
- Direct LAN connections work again on macOS ([#3071](https://github.com/getpaseo/paseo/pull/3071))
- Desktop update checks no longer report an error while platform downloads are still publishing ([#3076](https://github.com/getpaseo/paseo/pull/3076))
- Copied lists keep their markers across selection boundaries ([#3055](https://github.com/getpaseo/paseo/pull/3055))
- Switching hosts keeps the active project selected ([#3051](https://github.com/getpaseo/paseo/pull/3051))
- New Workspace keeps project and isolation controls inside the composer ([#3050](https://github.com/getpaseo/paseo/pull/3050))
- Session rename is reachable from the mobile sessions menu ([#2924](https://github.com/getpaseo/paseo/pull/2924) by [@kaspesi](https://github.com/kaspesi))
- Desktop notification sounds play again ([#2582](https://github.com/getpaseo/paseo/pull/2582) by [@gstamp](https://github.com/gstamp))
- Codex slash commands omit disabled skills ([#2759](https://github.com/getpaseo/paseo/pull/2759) by [@jasonhnd](https://github.com/jasonhnd))
- Exact ignored file paths resolve correctly ([#3042](https://github.com/getpaseo/paseo/pull/3042) by [@cleiter](https://github.com/cleiter))
- Claude question notifications summarize the requested input ([#2925](https://github.com/getpaseo/paseo/pull/2925) by [@SihyeonJeon](https://github.com/SihyeonJeon))
- The crash screen stays readable and keeps its retry action reachable ([#3043](https://github.com/getpaseo/paseo/pull/3043))
-
 ## 0.3.0 - 2026-08-08

 ### Added
@@ -40,6 +40,7 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [docs/providers.md](docs/providers.md)                             | Adding a new agent provider end-to-end                                                                                         |
 | [docs/forge-providers.md](docs/forge-providers.md)                 | Adding a git forge: registry/manifest, drop-in checklist, self-host/GHES, the two facts tiers                                  |
 | [docs/custom-providers.md](docs/custom-providers.md)               | Custom provider config: Z.AI, Alibaba/Qwen, ACP agents, profiles, custom binaries                                              |
+| [docs/plugins.md](docs/plugins.md)                                 | Local plugin manifest, directory source config, RPCs, native surfaces, and attachment sources                                  |
 | [docs/service-proxy.md](docs/service-proxy.md)                     | Service proxy: exposing workspace scripts at public URLs, DNS setup, reverse proxy config                                      |
 | [docs/development.md](docs/development.md)                         | Dev server, build sync gotchas, CLI reference, agent state, Playwright MCP                                                     |
 | [docs/rpc-namespacing.md](docs/rpc-namespacing.md)                 | WebSocket RPC naming convention — dotted namespaces and `.request`/`.response` pairs                                           |
@@ -223,7 +223,7 @@ Selected state on rows in a desktop list+detail uses `surfaceSidebarHover` as th

 There is exactly one token per status signal — `statusSuccess`, `statusDanger`, `statusWarning`, `statusMerged` — and every status surface uses it: PR state icons, CI check icons and pies, diff stats, file-change icons, status pills, usage bars. A surface does not get a quieter or louder variant because of where it sits. If a dense list feels loud, that is a density or weight problem; fix the density, not the color. The tokens are generated, not hand-picked — see the rule in `packages/app/src/styles/theme.ts` and regenerate rather than nudging one value. The level is set by the densest consumer, the sidebar workspace list.

-Status **dots** are the one exception, and they are a family of their own — `statusDotSuccess`, `statusDotDanger`, `statusDotWarning`, `statusDotRunning`, read only by `getStatusDotColor` (`packages/app/src/utils/status-dot-color.ts`). Same hues and the same generation rule, but their own band: 90% of gamut chroma against the status family's 55–60%. A dot is a few points of solid color with no shape to read and no label attached, and the running one pulses, so at the status band's chroma the dots read dimmer than the metadata beside them — backwards, since the dot is the row's state. Lightness is set by hue separation rather than by distance from the surface: at 6pt four dark hues on a light surface all read as one dark blob no matter how much contrast they have. So the light band runs as bright as the contrast floor allows at L=0.62, the last step where all four clear 3:1 against the sidebar's `surface2`; the dark band sits at L=0.72, where danger turns pink above. All four move together; regenerate the set, never one hue.
+Status **dots** are the one exception, and they are a family of their own — `statusDotSuccess`, `statusDotDanger`, `statusDotWarning`, `statusDotRunning`, read only by `getStatusDotColor` (`packages/app/src/utils/status-dot-color.ts`). Same hues and the same generation rule, but their own band: pushed away from the surface rather than toward it (darker in light, lighter in dark) and at 90% of gamut chroma against the status family's 55–60%. A dot is a few points of solid color with no shape to read and no label attached, and the running one pulses, so at the status band's lightness the dots read dimmer than the metadata beside them — backwards, since the dot is the row's state. All four move together; regenerate the set, never one hue.

 Status pills are the status token as foreground on a 10%-alpha tint of the same token (`${token}1a`), with a 20% border (`${token}33`). The `<StatusBadge>` primitive (`packages/app/src/components/ui/status-badge.tsx`) is canonical; a pill never reaches into `palette`.

@@ -0,0 +1,135 @@
+# Local plugins
+
+Local plugins contribute daemon RPCs, native app surfaces, and composer attachment sources from one
+`index.tsx`. Paseo executes the server contribution in a subprocess and evaluates the client
+contribution in the app runtime. Plugin code is trusted code; this first slice does not sandbox it.
+
+## Configure a directory source
+
+Add the plugin to the root `plugins` object in `$PASEO_HOME/config.json`:
+
+```json
+{
+  "plugins": {
+    "my-plugin": {
+      "source": "directory",
+      "path": "/absolute/path/to/my-plugin"
+    }
+  }
+}
+```
+
+The directory contains an identity-only manifest and one entry point:
+
+```text
+my-plugin/
+  paseo-plugin.json
+  index.tsx
+```
+
+```json
+{
+  "id": "my-plugin"
+}
+```
+
+The manifest ID must match the config key. Restart the development daemon after changing plugin
+source or configuration; directory watching is outside the first slice.
+
+## Contribute behavior and UI
+
+Default export one contribution function. Paseo calls it with a plugin-scoped context. The compiler
+removes UI registrations from the server bundle and RPC registrations from the client bundle before
+resolving dependencies.
+
+```tsx
+import { Text } from "react-native";
+import { useQuery } from "@tanstack/react-query";
+import { z } from "zod";
+import { defineRpc, type PluginContext, useRpc } from "@paseo/plugin";
+
+const greetRpc = defineRpc({
+  name: "greet",
+  input: z.object({ name: z.string() }),
+  output: z.object({ message: z.string() }),
+});
+
+function Greeting() {
+  const greet = useRpc(greetRpc);
+  const query = useQuery({
+    queryKey: ["greeting", "Paseo"],
+    queryFn: () => greet({ name: "Paseo" }),
+  });
+  return <Text>{query.data?.message}</Text>;
+}
+
+export default function contribute(plugin: PluginContext) {
+  plugin.handle(greetRpc, async ({ name }) => ({ message: `Hello, ${name}` }));
+  plugin.addSurface("main", Greeting);
+  plugin.addSidebarItem({
+    id: "main",
+    title: "Greeting",
+    icon: "MessageCircle",
+    surface: "main",
+  });
+}
+```
+
+Paseo owns the route, screen header, Lucide icon validation, close action, theme DTO, layout facts,
+and render error boundary. The contributed component owns the complete body below the header.
+
+RPC contracts validate inputs and outputs in both the app and plugin subprocess. `useRpc` returns a
+typed async function. Use the host-provided `@tanstack/react-query` for request state and caching;
+Paseo gives each plugin installation its own query client.
+
+When the same plugin contribution exists on multiple hosts, Paseo shows it once in the sidebar and
+adds a host picker to the screen header. The selected host supplies the bundle, RPC transport, and
+query cache. Plugin code cannot address another host.
+
+## Contribute composer attachments
+
+Register a declarative attachment source backed by a plugin RPC. Paseo owns the attachment menu,
+search picker, drafts, selected pill, and submission. The plugin returns complete text snapshots;
+credentials and vendor API calls stay in the daemon handler.
+
+```tsx
+const searchIssues = defineRpc({
+  name: "issues.search",
+  input: z.object({ query: z.string() }),
+  output: z.object({
+    items: z.array(
+      z.object({
+        id: z.string(),
+        identifier: z.string(),
+        title: z.string(),
+        subtitle: z.string().optional(),
+        url: z.string().url(),
+        text: z.string(),
+        resourceType: z.string(),
+      }),
+    ),
+  }),
+});
+
+const issues = defineAttachmentSource({
+  id: "issues",
+  title: "Acme issue",
+  icon: "CircleDot",
+  pickerTitle: "Attach Acme issue",
+  searchPlaceholder: "Search by identifier or title",
+  search: searchIssues,
+});
+
+export default function contribute(plugin: PluginContext) {
+  plugin.handle(searchIssues, ({ query }) => searchAcmeIssues(query));
+  plugin.addAttachmentSource(issues);
+}
+```
+
+Attachment sources stay scoped to the composer's host. Unlike sidebar contributions, equal sources
+on several hosts are not coalesced. The selected snapshot submits as a text attachment with neutral
+external-resource presentation, so it remains readable if the plugin is removed or an older peer
+drops the optional presentation fields.
+
+See `examples/local-plugin` for a native surface and `extensions/linear` for a complete official
+attachment-source extension.
@@ -0,0 +1,74 @@
+import React, { useCallback, useMemo } from "react";
+import { Pressable, Text, View } from "react-native";
+import { useMutation } from "@tanstack/react-query";
+import { z } from "zod";
+import { defineRpc, type PluginContext, useRpc } from "@paseo/plugin";
+
+const incrementRpc = defineRpc({
+  name: "increment",
+  input: z.object({ value: z.number() }),
+  output: z.object({ value: z.number(), handledBy: z.string() }),
+});
+
+interface ExampleTheme {
+  colors: {
+    surface0: string;
+    foreground: string;
+    foregroundMuted: string;
+    accent: string;
+    accentForeground: string;
+    statusDanger: string;
+  };
+}
+
+function ExampleSurface({ theme }: { theme: ExampleTheme }) {
+  const callIncrement = useRpc(incrementRpc);
+  const { data, error, isPending, mutate } = useMutation({ mutationFn: callIncrement });
+  const value = data?.value ?? 0;
+  const styles = useMemo(
+    () => ({
+      screen: { flex: 1, padding: 24, gap: 16, backgroundColor: theme.colors.surface0 },
+      title: { color: theme.colors.foreground, fontSize: 24 },
+      detail: { color: theme.colors.foregroundMuted },
+      button: { padding: 14, borderRadius: 10, backgroundColor: theme.colors.accent },
+      buttonText: { color: theme.colors.accentForeground, textAlign: "center" },
+      error: { color: theme.colors.statusDanger },
+    }),
+    [theme.colors],
+  );
+  const handleIncrement = useCallback(() => {
+    mutate({ value });
+  }, [mutate, value]);
+
+  return (
+    <View style={styles.screen}>
+      <Text style={styles.title}>Native plugin surface</Text>
+      <Text style={styles.detail}>{data?.handledBy ?? "The RPC has not run yet."}</Text>
+      <Pressable
+        accessibilityRole="button"
+        accessibilityLabel={`Increment plugin counter, currently ${value}`}
+        onPress={handleIncrement}
+        style={styles.button}
+      >
+        <Text style={styles.buttonText}>
+          {isPending ? "Calling daemon…" : `RPC counter: ${value}`}
+        </Text>
+      </Pressable>
+      {error ? <Text style={styles.error}>{error.message}</Text> : null}
+    </View>
+  );
+}
+
+export default function contribute(plugin: PluginContext) {
+  plugin.handle(incrementRpc, async (input) => ({
+    value: input.value + 1,
+    handledBy: "plugin subprocess",
+  }));
+  plugin.addSurface("main", ExampleSurface);
+  plugin.addSidebarItem({
+    id: "main",
+    title: "Local plugin",
+    icon: "Blocks",
+    surface: "main",
+  });
+}
@@ -0,0 +1,3 @@
+{
+  "id": "local-example"
+}
@@ -0,0 +1,32 @@
+# Linear
+
+The official Linear extension adds `Attach Linear issue` to the composer. Search by issue identifier
+or title, then send a stable issue snapshot to the agent.
+
+Set a personal API key in the daemon environment:
+
+```bash
+export LINEAR_API_KEY="lin_api_..."
+```
+
+Register the extension in `$PASEO_HOME/config.json`:
+
+```json
+{
+  "plugins": {
+    "linear": {
+      "source": "directory",
+      "path": "/absolute/path/to/paseo/extensions/linear"
+    }
+  }
+}
+```
+
+Restart the development daemon after changing its environment or plugin configuration.
+
+The entry point demonstrates the complete attachment-source pattern:
+
+- define one validated search RPC;
+- handle it in the daemon subprocess;
+- register a declarative attachment source for the client;
+- keep credentials and vendor API calls out of the client bundle.
@@ -0,0 +1,45 @@
+import { z } from "zod";
+import {
+  defineAttachmentSource,
+  defineRpc,
+  type PluginAttachmentSearchPayload,
+  type PluginContext,
+} from "@paseo/plugin";
+import { createLinearIssueSearch } from "./linear";
+
+const SearchPayloadSchema = z.object({
+  items: z.array(
+    z.object({
+      id: z.string(),
+      identifier: z.string(),
+      title: z.string(),
+      subtitle: z.string().optional(),
+      url: z.string().url(),
+      text: z.string(),
+      resourceType: z.string(),
+    }),
+  ),
+});
+
+const searchIssues = defineRpc({
+  name: "issues.search",
+  input: z.object({ query: z.string() }),
+  output: SearchPayloadSchema,
+});
+
+const issueAttachments = defineAttachmentSource({
+  id: "issues",
+  title: "Linear issue",
+  icon: "CircleDot",
+  pickerTitle: "Attach Linear issue",
+  searchPlaceholder: "Search by identifier or title",
+  search: searchIssues,
+});
+
+export default function contribute(plugin: PluginContext) {
+  plugin.handle(searchIssues, async ({ query }): Promise<PluginAttachmentSearchPayload> => {
+    const linear = createLinearIssueSearch({ apiKey: process.env.LINEAR_API_KEY ?? "" });
+    return linear.search(query);
+  });
+  plugin.addAttachmentSource(issueAttachments);
+}
@@ -0,0 +1,135 @@
+import { createServer, type IncomingMessage, type ServerResponse } from "node:http";
+import type { AddressInfo } from "node:net";
+import { describe, expect, it } from "vitest";
+import { createLinearIssueSearch } from "./linear";
+
+const issue = {
+  id: "issue-uuid",
+  identifier: "ENG-123",
+  title: "Plugin attachments",
+  description: "Let extensions attach external context.",
+  url: "https://linear.app/acme/issue/ENG-123/plugin-attachments",
+  priorityLabel: "High",
+  state: { name: "In Progress" },
+  assignee: { name: "Mohamed" },
+  project: { name: "Paseo" },
+  labels: { nodes: [{ name: "Feature" }] },
+};
+
+interface CapturedRequest {
+  authorization: string | undefined;
+  body: { query: string; variables: Record<string, unknown> };
+}
+
+async function readRequest(request: IncomingMessage): Promise<CapturedRequest> {
+  const chunks: Buffer[] = [];
+  for await (const chunk of request) chunks.push(Buffer.from(chunk));
+  return {
+    authorization: request.headers.authorization,
+    body: JSON.parse(Buffer.concat(chunks).toString("utf8")) as CapturedRequest["body"],
+  };
+}
+
+async function withLinearServer<T>(
+  respond: (request: CapturedRequest, response: ServerResponse) => void,
+  run: (endpoint: string) => Promise<T>,
+): Promise<T> {
+  const server = createServer((request, response) => {
+    void readRequest(request).then((captured) => respond(captured, response));
+  });
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  const address = server.address() as AddressInfo;
+  try {
+    return await run(`http://127.0.0.1:${address.port}/graphql`);
+  } finally {
+    await new Promise<void>((resolve, reject) => {
+      server.close((error) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+        resolve();
+      });
+    });
+  }
+}
+
+function sendJson(response: ServerResponse, body: unknown): void {
+  response.writeHead(200, { "Content-Type": "application/json" });
+  response.end(JSON.stringify(body));
+}
+
+describe("Linear issue search", () => {
+  it("resolves an exact issue identifier and formats its agent snapshot", async () => {
+    const result = await withLinearServer(
+      (request, response) => {
+        expect(request.authorization).toBe("lin_api_test");
+        expect(request.body.variables).toEqual({ id: "ENG-123" });
+        sendJson(response, { data: { issue } });
+      },
+      async (endpoint) => {
+        const linear = createLinearIssueSearch({ apiKey: "lin_api_test", endpoint });
+        return linear.search("eng-123");
+      },
+    );
+
+    expect(result).toEqual({
+      items: [
+        {
+          id: "issue-uuid",
+          identifier: "ENG-123",
+          title: "Plugin attachments",
+          subtitle: "In Progress · Mohamed",
+          url: issue.url,
+          resourceType: "issue",
+          text: [
+            "Linear issue ENG-123: Plugin attachments",
+            `URL: ${issue.url}`,
+            "Status: In Progress",
+            "Priority: High",
+            "Assignee: Mohamed",
+            "Project: Paseo",
+            "Labels: Feature",
+            "",
+            "Let extensions attach external context.",
+          ].join("\n"),
+        },
+      ],
+    });
+  });
+
+  it("searches issue titles through a case-insensitive filter", async () => {
+    const result = await withLinearServer(
+      (request, response) => {
+        expect(request.body.variables).toEqual({
+          filter: { title: { containsIgnoreCase: "plugin" } },
+        });
+        sendJson(response, { data: { issues: { nodes: [issue] } } });
+      },
+      async (endpoint) => {
+        const linear = createLinearIssueSearch({ apiKey: "lin_api_test", endpoint });
+        return linear.search(" plugin ");
+      },
+    );
+
+    expect(result.items.map((item) => item.identifier)).toEqual(["ENG-123"]);
+  });
+
+  it("surfaces GraphQL errors even when HTTP succeeds", async () => {
+    await expect(
+      withLinearServer(
+        (_request, response) => sendJson(response, { errors: [{ message: "Token expired" }] }),
+        async (endpoint) => {
+          const linear = createLinearIssueSearch({ apiKey: "lin_api_test", endpoint });
+          return linear.search("ENG-123");
+        },
+      ),
+    ).rejects.toThrow("Token expired");
+  });
+
+  it("requires a daemon-side API key", () => {
+    expect(() => createLinearIssueSearch({ apiKey: "" })).toThrow(
+      "Set LINEAR_API_KEY in the daemon environment",
+    );
+  });
+});
@@ -0,0 +1,183 @@
+import { z } from "zod";
+
+const LinearIssueSchema = z.object({
+  id: z.string(),
+  identifier: z.string(),
+  title: z.string(),
+  description: z.string().nullable(),
+  url: z.string(),
+  priorityLabel: z.string(),
+  state: z.object({ name: z.string() }),
+  assignee: z.object({ name: z.string() }).nullable(),
+  project: z.object({ name: z.string() }).nullable(),
+  labels: z.object({ nodes: z.array(z.object({ name: z.string() })) }),
+});
+
+const LinearGraphqlErrorSchema = z.object({ message: z.string() }).passthrough();
+const ExactIssueResponseSchema = z.object({
+  data: z.object({ issue: LinearIssueSchema.nullable() }).nullable().optional(),
+  errors: z.array(LinearGraphqlErrorSchema).optional(),
+});
+const IssueSearchResponseSchema = z.object({
+  data: z
+    .object({ issues: z.object({ nodes: z.array(LinearIssueSchema) }) })
+    .nullable()
+    .optional(),
+  errors: z.array(LinearGraphqlErrorSchema).optional(),
+});
+
+const ISSUE_FIELDS = `
+  id
+  identifier
+  title
+  description
+  url
+  priorityLabel
+  state { name }
+  assignee { name }
+  project { name }
+  labels { nodes { name } }
+`;
+
+const EXACT_ISSUE_QUERY = `
+  query PaseoLinearIssue($id: String!) {
+    issue(id: $id) { ${ISSUE_FIELDS} }
+  }
+`;
+
+const SEARCH_ISSUES_QUERY = `
+  query PaseoLinearIssues($filter: IssueFilter) {
+    issues(first: 20, filter: $filter, orderBy: updatedAt) {
+      nodes { ${ISSUE_FIELDS} }
+    }
+  }
+`;
+
+const LINEAR_IDENTIFIER = /^[A-Z][A-Z0-9]+-\d+$/i;
+
+export interface LinearAttachmentItem {
+  id: string;
+  identifier: string;
+  title: string;
+  subtitle?: string;
+  url: string;
+  text: string;
+  resourceType: string;
+}
+
+export interface LinearIssueSearch {
+  search(query: string): Promise<{ items: LinearAttachmentItem[] }>;
+}
+
+interface LinearIssueSearchOptions {
+  apiKey: string;
+  endpoint?: string;
+  request?: typeof fetch;
+}
+
+interface GraphqlRequest {
+  query: string;
+  variables: Record<string, unknown>;
+}
+
+class LinearApiError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "LinearApiError";
+  }
+}
+
+function issueSubtitle(issue: z.infer<typeof LinearIssueSchema>): string | undefined {
+  const parts = [issue.state.name, issue.assignee?.name].filter(
+    (part): part is string => typeof part === "string" && part.length > 0,
+  );
+  return parts.length > 0 ? parts.join(" · ") : undefined;
+}
+
+function issueText(issue: z.infer<typeof LinearIssueSchema>): string {
+  const labels = issue.labels.nodes.map((label) => label.name).join(", ");
+  const lines = [
+    `Linear issue ${issue.identifier}: ${issue.title}`,
+    `URL: ${issue.url}`,
+    `Status: ${issue.state.name}`,
+    `Priority: ${issue.priorityLabel}`,
+  ];
+  if (issue.assignee) lines.push(`Assignee: ${issue.assignee.name}`);
+  if (issue.project) lines.push(`Project: ${issue.project.name}`);
+  if (labels) lines.push(`Labels: ${labels}`);
+  lines.push("", issue.description ?? "No description.");
+  return lines.join("\n");
+}
+
+function toAttachmentItem(issue: z.infer<typeof LinearIssueSchema>): LinearAttachmentItem {
+  const subtitle = issueSubtitle(issue);
+  return {
+    id: issue.id,
+    identifier: issue.identifier,
+    title: issue.title,
+    ...(subtitle ? { subtitle } : {}),
+    url: issue.url,
+    text: issueText(issue),
+    resourceType: "issue",
+  };
+}
+
+function describeHttpFailure(status: number): string {
+  if (status === 401 || status === 403) return "Linear rejected LINEAR_API_KEY";
+  if (status === 429) return "Linear rate limit reached. Try again shortly";
+  return `Linear API request failed with HTTP ${status}`;
+}
+
+function throwGraphqlErrors(errors: Array<{ message: string }> | undefined): void {
+  if (!errors || errors.length === 0) return;
+  throw new LinearApiError(errors.map((error) => error.message).join("; "));
+}
+
+export function createLinearIssueSearch(options: LinearIssueSearchOptions): LinearIssueSearch {
+  const apiKey = options.apiKey.trim();
+  if (!apiKey) throw new LinearApiError("Set LINEAR_API_KEY in the daemon environment");
+  const endpoint = options.endpoint ?? "https://api.linear.app/graphql";
+  const request = options.request ?? fetch;
+
+  async function graphql(body: GraphqlRequest): Promise<unknown> {
+    const response = await request(endpoint, {
+      method: "POST",
+      headers: {
+        Authorization: apiKey,
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(body),
+    });
+    if (!response.ok) throw new LinearApiError(describeHttpFailure(response.status));
+    return response.json();
+  }
+
+  async function findExact(identifier: string): Promise<LinearAttachmentItem[]> {
+    const response = ExactIssueResponseSchema.parse(
+      await graphql({ query: EXACT_ISSUE_QUERY, variables: { id: identifier } }),
+    );
+    throwGraphqlErrors(response.errors);
+    return response.data?.issue ? [toAttachmentItem(response.data.issue)] : [];
+  }
+
+  async function searchTitles(query: string): Promise<LinearAttachmentItem[]> {
+    const filter = query ? { title: { containsIgnoreCase: query } } : null;
+    const response = IssueSearchResponseSchema.parse(
+      await graphql({ query: SEARCH_ISSUES_QUERY, variables: { filter } }),
+    );
+    throwGraphqlErrors(response.errors);
+    if (!response.data) throw new LinearApiError("Linear returned no issue data");
+    return response.data.issues.nodes.map(toAttachmentItem);
+  }
+
+  return {
+    async search(query: string) {
+      const normalized = query.trim();
+      if (LINEAR_IDENTIFIER.test(normalized)) {
+        return { items: await findExact(normalized.toUpperCase()) };
+      }
+      const items = await searchTitles(normalized);
+      return { items };
+    },
+  };
+}
@@ -0,0 +1,3 @@
+{
+  "id": "linear"
+}
@@ -1 +1 @@
-sha256-RCp5Ogd8AETLmJCZaUebcgSPRk+is26nkUY7+blDb/g=
+sha256-BfRbfVUFaHQEMtDOsWAo49txz+cueRpe/7Qxltg+HSg=
@@ -1,12 +1,12 @@
 {
  "name": "paseo",
-  "version": "0.3.1",
+  "version": "0.3.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "paseo",
-      "version": "0.3.1",
+      "version": "0.3.0",
      "hasInstallScript": true,
      "license": "AGPL-3.0-or-later",
      "workspaces": [
@@ -2291,6 +2291,15 @@
        "node": ">=6.9.0"
      }
    },
+    "node_modules/@babel/standalone": {
+      "version": "7.29.1",
+      "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.29.1.tgz",
+      "integrity": "sha512-z42abD0C6fiHfgLyCWw8PYv6FCJ0IGVtSCxXk/NPykWO5LNIEGfdLDJ3HdYqlPcAhwtQ3oKH1PvNj2JGpTxQKg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
    "node_modules/@babel/template": {
      "version": "7.28.6",
      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
@@ -12503,6 +12512,21 @@
        "@babel/types": "^7.0.0"
      }
    },
+    "node_modules/@types/babel__standalone": {
+      "version": "7.1.9",
+      "resolved": "https://registry.npmjs.org/@types/babel__standalone/-/babel__standalone-7.1.9.tgz",
+      "integrity": "sha512-IcCNPLqpevUD7UpV8QB0uwQPOyoOKACFf0YtYWRHcmxcakaje4Q7dbG2+jMqxw/I8Zk0NHvEps66WwS7z/UaaA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.25.6",
+        "@babel/types": "^7.25.6",
+        "@types/babel__core": "^7.20.5",
+        "@types/babel__generator": "^7.6.8",
+        "@types/babel__template": "^7.4.4",
+        "@types/babel__traverse": "^7.20.6"
+      }
+    },
    "node_modules/@types/babel__template": {
      "version": "7.4.4",
      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
@@ -35299,8 +35323,9 @@
    },
    "packages/app": {
      "name": "@getpaseo/app",
-      "version": "0.3.1",
+      "version": "0.3.0",
      "dependencies": {
+        "@babel/standalone": "^7.29.1",
        "@codemirror/commands": "6.10.4",
        "@codemirror/language": "6.12.4",
        "@codemirror/search": "6.7.1",
@@ -35393,6 +35418,7 @@
        "@playwright/test": "^1.56.1",
        "@testing-library/dom": "^10.4.1",
        "@testing-library/react": "^16.3.2",
+        "@types/babel__standalone": "^7.1.9",
        "@types/markdown-it": "^14.1.2",
        "@types/qrcode": "^1.5.6",
        "@types/react": "~19.2.0",
@@ -36353,12 +36379,12 @@
    },
    "packages/cli": {
      "name": "@getpaseo/cli",
-      "version": "0.3.1",
+      "version": "0.3.0",
      "dependencies": {
        "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.3.1",
-        "@getpaseo/protocol": "0.3.1",
-        "@getpaseo/server": "0.3.1",
+        "@getpaseo/client": "0.3.0",
+        "@getpaseo/protocol": "0.3.0",
+        "@getpaseo/server": "0.3.0",
        "chalk": "^5.3.0",
        "commander": "^12.0.0",
        "mime-types": "^2.1.35",
@@ -36605,10 +36631,10 @@
    },
    "packages/client": {
      "name": "@getpaseo/client",
-      "version": "0.3.1",
+      "version": "0.3.0",
      "dependencies": {
-        "@getpaseo/protocol": "0.3.1",
-        "@getpaseo/relay": "0.3.1",
+        "@getpaseo/protocol": "0.3.0",
+        "@getpaseo/relay": "0.3.0",
        "zod": "^4.4.3"
      },
      "devDependencies": {
@@ -36619,7 +36645,7 @@
    },
    "packages/desktop": {
      "name": "@getpaseo/desktop",
-      "version": "0.3.1",
+      "version": "0.3.0",
      "license": "AGPL-3.0-or-later",
      "dependencies": {
        "@getpaseo/cli": "*",
@@ -36862,7 +36888,7 @@
    },
    "packages/expo-two-way-audio": {
      "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.3.1",
+      "version": "0.3.0",
      "license": "MIT",
      "devDependencies": {
        "@types/jest": "^29.5.14",
@@ -37758,7 +37784,7 @@
    },
    "packages/highlight": {
      "name": "@getpaseo/highlight",
-      "version": "0.3.1",
+      "version": "0.3.0",
      "dependencies": {
        "@codemirror/language": "6.12.4",
        "@codemirror/legacy-modes": "^6.5.3",
@@ -37990,7 +38016,7 @@
    },
    "packages/protocol": {
      "name": "@getpaseo/protocol",
-      "version": "0.3.1",
+      "version": "0.3.0",
      "dependencies": {
        "zod": "^4.4.3"
      },
@@ -38003,7 +38029,7 @@
    },
    "packages/relay": {
      "name": "@getpaseo/relay",
-      "version": "0.3.1",
+      "version": "0.3.0",
      "dependencies": {
        "base64-js": "^1.5.1",
        "tweetnacl": "^1.0.3",
@@ -38221,15 +38247,16 @@
    },
    "packages/server": {
      "name": "@getpaseo/server",
-      "version": "0.3.1",
+      "version": "0.3.0",
      "dependencies": {
        "@agentclientprotocol/sdk": "^0.17.1",
        "@anthropic-ai/claude-agent-sdk": "^0.3.220",
        "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.3.1",
-        "@getpaseo/highlight": "0.3.1",
-        "@getpaseo/protocol": "0.3.1",
-        "@getpaseo/relay": "0.3.1",
+        "@babel/parser": "^7.29.8",
+        "@getpaseo/client": "0.3.0",
+        "@getpaseo/highlight": "0.3.0",
+        "@getpaseo/protocol": "0.3.0",
+        "@getpaseo/relay": "0.3.0",
        "@isaacs/ttlcache": "^2.1.4",
        "@modelcontextprotocol/sdk": "^1.20.1",
        "@opencode-ai/sdk": "1.14.46",
@@ -38239,6 +38266,7 @@
        "ajv": "^8.20.0",
        "bcryptjs": "^3.0.3",
        "dotenv": "^17.2.3",
+        "esbuild": "^0.25.12",
        "express": "^4.18.2",
        "fast-deep-equal": "^3.1.3",
        "lru-cache": "^11.5.1",
@@ -38402,6 +38430,468 @@
        "win32"
      ]
    },
+    "packages/server/node_modules/@babel/helper-string-parser": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "packages/server/node_modules/@babel/helper-validator-identifier": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "packages/server/node_modules/@babel/parser": {
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.8.tgz",
+      "integrity": "sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.29.8"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "packages/server/node_modules/@babel/types": {
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz",
+      "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "packages/server/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
+      "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/android-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz",
+      "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/android-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz",
+      "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/android-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz",
+      "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz",
+      "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/darwin-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz",
+      "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz",
+      "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz",
+      "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz",
+      "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz",
+      "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-loong64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz",
+      "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz",
+      "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz",
+      "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz",
+      "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-s390x": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz",
+      "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/linux-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz",
+      "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",
+      "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/sunos-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",
+      "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/win32-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz",
+      "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/win32-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz",
+      "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "packages/server/node_modules/@esbuild/win32-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz",
+      "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
    "packages/server/node_modules/@isaacs/ttlcache": {
      "version": "2.1.4",
      "resolved": "https://registry.npmjs.org/@isaacs/ttlcache/-/ttlcache-2.1.4.tgz",
@@ -38556,6 +39046,47 @@
        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
      }
    },
+    "packages/server/node_modules/esbuild": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz",
+      "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.25.12",
+        "@esbuild/android-arm": "0.25.12",
+        "@esbuild/android-arm64": "0.25.12",
+        "@esbuild/android-x64": "0.25.12",
+        "@esbuild/darwin-arm64": "0.25.12",
+        "@esbuild/darwin-x64": "0.25.12",
+        "@esbuild/freebsd-arm64": "0.25.12",
+        "@esbuild/freebsd-x64": "0.25.12",
+        "@esbuild/linux-arm": "0.25.12",
+        "@esbuild/linux-arm64": "0.25.12",
+        "@esbuild/linux-ia32": "0.25.12",
+        "@esbuild/linux-loong64": "0.25.12",
+        "@esbuild/linux-mips64el": "0.25.12",
+        "@esbuild/linux-ppc64": "0.25.12",
+        "@esbuild/linux-riscv64": "0.25.12",
+        "@esbuild/linux-s390x": "0.25.12",
+        "@esbuild/linux-x64": "0.25.12",
+        "@esbuild/netbsd-arm64": "0.25.12",
+        "@esbuild/netbsd-x64": "0.25.12",
+        "@esbuild/openbsd-arm64": "0.25.12",
+        "@esbuild/openbsd-x64": "0.25.12",
+        "@esbuild/openharmony-arm64": "0.25.12",
+        "@esbuild/sunos-x64": "0.25.12",
+        "@esbuild/win32-arm64": "0.25.12",
+        "@esbuild/win32-ia32": "0.25.12",
+        "@esbuild/win32-x64": "0.25.12"
+      }
+    },
    "packages/server/node_modules/isexe": {
      "version": "3.1.5",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz",
@@ -38778,7 +39309,7 @@
    },
    "packages/website": {
      "name": "@getpaseo/website",
-      "version": "0.3.1",
+      "version": "0.3.0",
      "dependencies": {
        "@cloudflare/vite-plugin": "^1.29.1",
        "@cloudflare/workers-types": "^4.20260317.1",
@@ -1,6 +1,6 @@
 {
  "name": "paseo",
-  "version": "0.3.1",
+  "version": "0.3.0",
  "private": true,
  "description": "Paseo: voice-controlled development environment for local AI coding agents",
  "keywords": [
@@ -118,53 +118,6 @@ async function selectAssistantText(page: Page, text: string): Promise<void> {
  await selectAssistantTextRange(page, text, text);
 }

-async function selectAssistantListItemFromMarker(
-  page: Page,
-  listTag: "ol" | "ul",
-  itemText: string,
-  endText: string,
-): Promise<void> {
-  const assistantMessage = page.getByTestId("assistant-message").filter({
-    hasText: "Direct matches:",
-  });
-  const item = assistantMessage
-    .locator(`[data-paseo-markdown-tag="${listTag}"]`)
-    .filter({ hasText: itemText })
-    .locator(':scope > [data-paseo-markdown-tag="li"]')
-    .filter({ hasText: itemText });
-
-  await item.evaluate((element, selectedEndText) => {
-    const marker = element.querySelector(':scope > [data-paseo-markdown-list-marker="true"]');
-    const markerText = marker?.firstChild;
-    if (!(markerText instanceof Text)) {
-      throw new Error("Expected rendered list marker text");
-    }
-
-    const walker = document.createTreeWalker(element, NodeFilter.SHOW_TEXT);
-    let endNode: Text | null = null;
-    let endOffset = -1;
-    while (walker.nextNode()) {
-      const node = walker.currentNode;
-      const offset = node.textContent?.indexOf(selectedEndText) ?? -1;
-      if (node instanceof Text && offset >= 0) {
-        endNode = node;
-        endOffset = offset + selectedEndText.length;
-        break;
-      }
-    }
-    if (!endNode) {
-      throw new Error(`Could not find list item selection end: ${selectedEndText}`);
-    }
-
-    const range = document.createRange();
-    range.setStart(markerText, 0);
-    range.setEnd(endNode, endOffset);
-    const selection = window.getSelection();
-    selection?.removeAllRanges();
-    selection?.addRange(range);
-  }, endText);
-}
-
 async function doubleClickAssistantMarkdownText(
  page: Page,
  tag: "code" | "strong",
@@ -452,24 +405,6 @@ test("copying an assistant selection preserves Markdown structure and links", as
      '<div>- <strong><a href="https://example.com/issues/1">First issue</a></strong>',
    );

-    await selectAssistantListItemFromMarker(page, "ul", "First issue", "failure.");
-    await copySelection(page);
-
-    const draggedBulletClipboard = await readRichClipboard(page);
-    expect(draggedBulletClipboard.plainText).toBe(
-      "- **[First issue](https://example.com/issues/1)**: exact `apply_patch` failure.",
-    );
-    expect(draggedBulletClipboard.html).toContain(
-      '<div>- <strong><a href="https://example.com/issues/1">First issue</a></strong>',
-    );
-
-    await selectAssistantListItemFromMarker(page, "ol", "Sixth item", "Sixth item");
-    await copySelection(page);
-
-    const draggedNumberClipboard = await readRichClipboard(page);
-    expect(draggedNumberClipboard.plainText).toBe("6. Sixth item");
-    expect(draggedNumberClipboard.html).toContain("<div>6. Sixth item</div>");
-
    await selectAssistantText(page, "docs");
    await copySelection(page);

@@ -114,6 +114,16 @@ test.describe("Settings sidebar navigation", () => {
    await expectDirectHostUriHidden(page);
  });

+  test("browser web hides direct connection custom headers", async ({ page }) => {
+    await gotoAppShell(page);
+    await openSettings(page);
+    await openAddHostFlow(page);
+    await selectHostConnectionType(page, "direct");
+    await toggleHostAdvanced(page);
+
+    await expect(page.getByTestId("direct-header-add")).toHaveCount(0);
+  });
+
  test("sidebar shows a Back to workspace row that leaves /settings", async ({ page }) => {
    await gotoAppShell(page);
    await openSettings(page);
@@ -17,49 +17,6 @@ interface PairingHostInput {
  endpoint: string;
 }

-export async function prepareLocalPairingHost(
-  page: Page,
-  daemon: IsolatedHostDaemon | OutdatedDaemon,
-  additionalHosts: PairingHostInput[] = [],
-): Promise<void> {
-  await page.addInitScript((localServerId) => {
-    (window as unknown as { paseoDesktop: unknown }).paseoDesktop = {
-      platform: "darwin",
-      invoke: async (command: string) => {
-        if (command === "desktop_daemon_status") {
-          return {
-            serverId: localServerId,
-            status: "running",
-            listen: null,
-            hostname: null,
-            pid: null,
-            home: "",
-            version: null,
-            desktopManaged: true,
-            error: null,
-          };
-        }
-        if (command === "get_desktop_settings") {
-          return {
-            releaseChannel: "stable",
-            daemon: { manageBuiltInDaemon: false, keepRunningAfterQuit: true },
-          };
-        }
-        return null;
-      },
-      getPendingOpenProject: async () => null,
-      events: { on: async () => () => undefined },
-      opener: {
-        openUrl: async (url: string) => {
-          localStorage.setItem("@paseo:e2e-opened-url", url);
-        },
-      },
-    };
-  }, daemon.serverId);
-
-  await preparePairingHost(page, daemon, additionalHosts);
-}
-
 export async function preparePairingHost(
  page: Page,
  daemon: IsolatedHostDaemon | OutdatedDaemon,
@@ -1,6 +1,6 @@
 {
  "name": "@getpaseo/app",
-  "version": "0.3.1",
+  "version": "0.3.0",
  "private": true,
  "main": "index.ts",
  "scripts": {
@@ -32,6 +32,7 @@
    "build:terminal-webview": "node ./scripts/build-terminal-webview-html.mjs"
  },
  "dependencies": {
+    "@babel/standalone": "^7.29.1",
    "@codemirror/commands": "6.10.4",
    "@codemirror/language": "6.12.4",
    "@codemirror/search": "6.7.1",
@@ -124,6 +125,7 @@
    "@playwright/test": "^1.56.1",
    "@testing-library/dom": "^10.4.1",
    "@testing-library/react": "^16.3.2",
+    "@types/babel__standalone": "^7.1.9",
    "@types/markdown-it": "^14.1.2",
    "@types/qrcode": "^1.5.6",
    "@types/react": "~19.2.0",
@@ -124,6 +124,7 @@ import {
 } from "@/utils/host-routes";
 import { buildNotificationRoute, resolveNotificationTarget } from "@/utils/notification-routing";
 import { navigateToAgent } from "@/utils/navigate-to-agent";
+import { PluginCatalogSync } from "@/plugins/catalog-sync";
 import {
  ensureOsNotificationPermission,
  WEB_NOTIFICATION_CLICK_EVENT,
@@ -266,7 +267,7 @@ function ManagedDaemonSession({ daemon }: { daemon: HostProfile }) {

  return (
    <SessionProvider key={daemon.serverId} serverId={daemon.serverId} client={client}>
-      {null}
+      <PluginCatalogSync serverId={daemon.serverId} client={client} />
    </SessionProvider>
  );
 }
@@ -892,6 +893,7 @@ function RootStack() {
  return (
    <ThemedStack screenOptions={ROOT_STACK_SCREEN_OPTIONS}>
      <Stack.Screen name="index" />
+      <Stack.Screen name="runtime-component" />
      <Stack.Protected guard={storeReady}>
        <Stack.Screen name="welcome" />
        <Stack.Screen name="settings/index" />
@@ -41,6 +41,7 @@ function KnownHostRoute() {
      <Stack.Screen name="sessions" />
      <Stack.Screen name="open-project" />
      <Stack.Screen name="settings" />
+      <Stack.Screen name="plugin/[pluginId]/[surfaceId]" />
    </ThemedStack>
  );

@@ -0,0 +1,5 @@
+import { PluginSurfaceScreen } from "@/plugins/surface-screen";
+
+export default function PluginSurfaceRoute() {
+  return <PluginSurfaceScreen />;
+}
@@ -0,0 +1,5 @@
+import { RuntimeComponentPrototypeScreen } from "@/runtime-component/prototype-screen";
+
+export default function RuntimeComponentRoute() {
+  return <RuntimeComponentPrototypeScreen />;
+}
@@ -5,8 +5,8 @@ const fixture = `
  <div data-testid="assistant-message">
    <div data-paseo-markdown-tag="p">Prefix <span data-paseo-markdown-tag="strong">bold text</span> and <span data-paseo-markdown-tag="code">inline code</span> suffix.</div>
    <div data-paseo-markdown-tag="ul">
-      <div data-paseo-markdown-tag="li"><span data-paseo-markdown-ignore="true" data-paseo-markdown-list-marker="true">•</span><div><span>First bullet text</span></div></div>
-      <div data-paseo-markdown-tag="li"><span data-paseo-markdown-ignore="true" data-paseo-markdown-list-marker="true">•</span><div><span>Second bullet text</span></div></div>
+      <div data-paseo-markdown-tag="li"><span data-paseo-markdown-ignore="true">•</span><div><span>First bullet text</span></div></div>
+      <div data-paseo-markdown-tag="li"><span data-paseo-markdown-ignore="true">•</span><div><span>Second bullet text</span></div></div>
    </div>
    <div data-paseo-markdown-tag="pre" data-paseo-markdown-language="ts"><span data-paseo-markdown-tag="code">const answer = true;</span></div>
  </div>
@@ -203,97 +203,6 @@ describe("assistant selection copy ranges", () => {
    expect(copiedMarkdown(selectNodeContents(item))).toBe("- First bullet text");
  });

-  it("retains a bullet when a drag selects from the rendered marker through the item text", () => {
-    const message = mountFixture();
-    const marker = fixtureElement(message, '[data-paseo-markdown-list-marker="true"]');
-    const itemText = fixtureElement(message, '[data-paseo-markdown-tag="li"] div span');
-
-    const content = createAssistantSelectionClipboardContent(
-      selectRange(marker, 0, itemText, textNode(itemText).length),
-    );
-    expect(content?.plainText).toBe("- First bullet text");
-    expect(content?.html).toContain("<div>- First bullet text</div>");
-    expect(content?.html).not.toContain("<ul>");
-    expect(content?.html).not.toContain("<li>");
-  });
-
-  it("retains a bullet when a drag includes the marker and part of the item text", () => {
-    const message = mountFixture();
-    const marker = fixtureElement(message, '[data-paseo-markdown-list-marker="true"]');
-    const itemText = fixtureElement(message, '[data-paseo-markdown-tag="li"] div span');
-
-    expect(copiedMarkdown(selectRange(marker, 0, itemText, 5))).toBe("- First");
-  });
-
-  it("does not invent a bullet when a drag starts after the rendered marker", () => {
-    const message = mountFixture();
-    const marker = fixtureElement(message, '[data-paseo-markdown-list-marker="true"]');
-    const itemText = fixtureElement(message, '[data-paseo-markdown-tag="li"] div span');
-
-    expect(
-      copiedMarkdown(
-        selectRange(marker, textNode(marker).length, itemText, textNode(itemText).length),
-      ),
-    ).toBe("First bullet text");
-  });
-
-  it("retains every selected marker across a partial multi-item drag", () => {
-    const message = mountFixture();
-    const markerSelector = '[data-paseo-markdown-list-marker="true"]';
-    const textSelector = '[data-paseo-markdown-tag="li"] div span';
-    const firstMarker = fixtureElement(message, markerSelector);
-    const secondText = fixtureElement(message, textSelector, 1);
-
-    expect(copiedMarkdown(selectRange(firstMarker, 0, secondText, 6))).toBe(
-      "- First bullet text\n- Second",
-    );
-  });
-
-  it("retains the original number when a marker drag starts mid-list", () => {
-    const message = mountFixture();
-    const list = fixtureElement(message, '[data-paseo-markdown-tag="ul"]');
-    list.setAttribute("data-paseo-markdown-tag", "ol");
-    list.setAttribute("data-paseo-markdown-list-start", "5");
-    const markers = list.querySelectorAll<HTMLElement>('[data-paseo-markdown-list-marker="true"]');
-    markers.item(0).textContent = "5.";
-    markers.item(1).textContent = "6.";
-    const secondMarker = fixtureElement(list, '[data-paseo-markdown-list-marker="true"]', 1);
-    const secondText = fixtureElement(list, '[data-paseo-markdown-tag="li"] div span', 1);
-
-    expect(
-      copiedMarkdown(selectRange(secondMarker, 0, secondText, textNode(secondText).length)),
-    ).toBe("6. Second bullet text");
-  });
-
-  it("retains nested markers when a drag includes the complete outer item", () => {
-    const message = mountFixture();
-    const firstItem = fixtureElement(message, '[data-paseo-markdown-tag="li"]');
-    firstItem.innerHTML = [
-      '<span data-paseo-markdown-ignore="true" data-paseo-markdown-list-marker="true">•</span>',
-      "<div>",
-      "<span>Outer text</span>",
-      '<div data-paseo-markdown-tag="ul">',
-      '<div data-paseo-markdown-tag="li">',
-      '<span data-paseo-markdown-ignore="true" data-paseo-markdown-list-marker="true">•</span>',
-      "<div><span>Inner text</span></div>",
-      "</div>",
-      "</div>",
-      "</div>",
-    ].join("");
-    const outerMarker = fixtureElement(
-      firstItem,
-      ':scope > [data-paseo-markdown-list-marker="true"]',
-    );
-    const innerText = fixtureElement(
-      firstItem,
-      ':scope [data-paseo-markdown-tag="ul"] > [data-paseo-markdown-tag="li"] > div > span',
-    );
-
-    expect(copiedMarkdown(selectRange(outerMarker, 0, innerText, textNode(innerText).length))).toBe(
-      "- Outer text\n    - Inner text",
-    );
-  });
-
  it("preserves paragraph breaks when rich HTML flattens a loose list item", () => {
    const message = mountFixture();
    const item = fixtureElement(message, '[data-paseo-markdown-tag="li"]');
@@ -9,7 +9,6 @@ import {
  MARKDOWN_COPY_ALIGN_ATTRIBUTE,
  MARKDOWN_COPY_IGNORE_ATTRIBUTE,
  MARKDOWN_COPY_LANGUAGE_ATTRIBUTE,
-  MARKDOWN_COPY_LIST_MARKER_ATTRIBUTE,
  MARKDOWN_COPY_LIST_START_ATTRIBUTE,
  MARKDOWN_COPY_TAG_ATTRIBUTE,
  MARKDOWN_COPY_UNWRAP_ATTRIBUTE,
@@ -279,7 +278,7 @@ function shouldPreserveSemanticElement(range: Range, element: Element): boolean
  if (tag === "p" || isTableStructure(tag)) {
    return true;
  }
-  const isSelectableSemantic = tag !== null && tag !== "li" && tag !== "ol" && tag !== "ul";
+  const isSelectableSemantic = tag !== null && tag !== "ol" && tag !== "ul";
  if (
    (isSelectableSemantic || element.tagName === "A") &&
    selectionStaysInsideElement(range, element)
@@ -288,12 +287,7 @@ function shouldPreserveSemanticElement(range: Range, element: Element): boolean
  }
  if (tag === "ol" || tag === "ul") {
    const selectedItems = selectedListItems(element, range);
-    return selectedItems.some(
-      (item) => hasSelectedListMarker(range, item) || hasSelectedAllContents(range, item, true),
-    );
-  }
-  if (tag === "li" && hasSelectedListMarker(range, element)) {
-    return true;
+    return selectedItems.some((item) => hasSelectedAllContents(range, item, true));
  }
  return hasSelectedAllContents(range, element, tag === "li");
 }
@@ -317,31 +311,6 @@ function selectedListItems(list: Element, range: Range): Element[] {
  );
 }

-function hasSelectedListMarker(range: Range, item: Element): boolean {
-  const marker = item.querySelector(`:scope > [${MARKDOWN_COPY_LIST_MARKER_ATTRIBUTE}]`);
-  if (!marker) {
-    return false;
-  }
-
-  const markerContents = document.createRange();
-  markerContents.selectNodeContents(marker);
-  const selectionEndsBeforeMarker =
-    range.compareBoundaryPoints(Range.END_TO_START, markerContents) >= 0;
-  const selectionStartsAfterMarker =
-    range.compareBoundaryPoints(Range.START_TO_END, markerContents) <= 0;
-  if (selectionEndsBeforeMarker || selectionStartsAfterMarker) {
-    return false;
-  }
-
-  if (range.compareBoundaryPoints(Range.START_TO_START, markerContents) > 0) {
-    markerContents.setStart(range.startContainer, range.startOffset);
-  }
-  if (range.compareBoundaryPoints(Range.END_TO_END, markerContents) < 0) {
-    markerContents.setEnd(range.endContainer, range.endOffset);
-  }
-  return hasMarkdownContent(markerContents.cloneContents(), true);
-}
-
 function normalizeOrderedListStart(copy: Element, original: Element, range: Range): void {
  if (original.getAttribute(MARKDOWN_COPY_TAG_ATTRIBUTE) !== "ol") {
    return;
@@ -1,6 +1,5 @@
 export const MARKDOWN_COPY_TAG_ATTRIBUTE = "data-paseo-markdown-tag";
 export const MARKDOWN_COPY_IGNORE_ATTRIBUTE = "data-paseo-markdown-ignore";
-export const MARKDOWN_COPY_LIST_MARKER_ATTRIBUTE = "data-paseo-markdown-list-marker";
 export const MARKDOWN_COPY_UNWRAP_ATTRIBUTE = "data-paseo-markdown-unwrap";
 export const MARKDOWN_COPY_LIST_START_ATTRIBUTE = "data-paseo-markdown-list-start";
 export const MARKDOWN_COPY_LANGUAGE_ATTRIBUTE = "data-paseo-markdown-language";
@@ -29,7 +28,6 @@ export const markdownCopyDataSet = {
  hr: { paseoMarkdownTag: "hr" },
  ignore: { paseoMarkdownIgnore: "true" },
  li: { paseoMarkdownTag: "li" },
-  listMarker: { paseoMarkdownIgnore: "true", paseoMarkdownListMarker: "true" },
  ol: { paseoMarkdownTag: "ol" },
  p: { paseoMarkdownTag: "p" },
  pre: { paseoMarkdownTag: "pre" },
@@ -0,0 +1,29 @@
+import { describe, expect, it } from "vitest";
+import { i18n } from "@/i18n/i18next";
+import { getAgentAttachmentPillContent } from "./attachment-pill-content";
+
+describe("agent attachment pill content", () => {
+  it("presents external resources with their provider identity", () => {
+    const content = getAgentAttachmentPillContent(
+      {
+        type: "text",
+        mimeType: "text/plain",
+        title: "ENG-123 Plugin attachments",
+        text: "Linear issue ENG-123: Plugin attachments",
+        externalResource: {
+          provider: "linear",
+          providerLabel: "Linear issue",
+          resourceType: "issue",
+          id: "issue-uuid",
+          identifier: "ENG-123",
+          title: "Plugin attachments",
+          url: "https://linear.app/acme/issue/ENG-123/plugin-attachments",
+        },
+      },
+      i18n.t,
+    );
+
+    expect(content.title).toBe("Plugin attachments");
+    expect(content.subtitle).toBe("Linear issue ENG-123");
+  });
+});
@@ -1,5 +1,6 @@
 import type { ReactNode } from "react";
 import type { TFunction } from "i18next";
+import React from "react";
 import {
  CircleDot,
  FileText,
@@ -86,6 +87,13 @@ export function getAgentAttachmentPillContent(
        subtitle: `Issue #${attachment.number}`,
      };
    case "text":
+      if (attachment.externalResource) {
+        return {
+          icon: attachmentGithubIssueIcon,
+          title: attachment.externalResource.title,
+          subtitle: `${attachment.externalResource.providerLabel} ${attachment.externalResource.identifier}`,
+        };
+      }
      return {
        icon: attachmentFileIcon,
        title: attachment.title ?? t("message.attachments.textAttachment"),
@@ -3,6 +3,7 @@ import type {
  ForgeSearchItem,
  UploadedFileAttachment,
 } from "@getpaseo/protocol/messages";
+import type { PluginResourceComposerAttachment } from "@/plugins/attachments/model";

 export type AttachmentStorageType = "web-indexeddb" | "desktop-file" | "native-file";

@@ -106,6 +107,7 @@ export type UserComposerAttachment =
  | { kind: "image"; metadata: AttachmentMetadata }
  | { kind: "file"; attachment: UploadedFileAttachment }
  | WorkspaceFileComposerAttachment
+  | PluginResourceComposerAttachment
  | { kind: "forge_issue"; item: ForgeSearchItem }
  | { kind: "forge_change_request"; item: ForgeSearchItem }
  // COMPAT(githubAttachmentKinds): added in v0.1.106, remove after 2026-12-28 once daemon floor >= v0.1.106
@@ -1,9 +1,10 @@
-import { useCallback, useMemo, useReducer, useState } from "react";
+import { useCallback, useMemo, useReducer, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, Pressable, Text, View } from "react-native";
 import { StyleSheet, useUnistyles } from "react-native-unistyles";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { Check, ChevronDown, ChevronRight, Eye, EyeOff, Link2 } from "lucide-react-native";
+import { getIsElectron, isNative } from "@/constants/platform";
+import { Check, ChevronDown, ChevronRight, Eye, EyeOff, Link2, Plus, X } from "lucide-react-native";
 import type { HostProfile } from "@/types/host-connection";
 import { useHosts, useHostMutations } from "@/runtime/host-runtime";
 import {
@@ -12,6 +13,11 @@ import {
  serializeConnectionUriForStorage,
 } from "@/utils/daemon-endpoints";
 import { DaemonConnectionTestError } from "@/utils/test-daemon-connection";
+import {
+  prepareConnectionHeaders,
+  type ConnectionHeaderDraft,
+  type ConnectionHeaderValidationIssue,
+} from "@/utils/connection-headers";
 import { AdaptiveModalSheet, AdaptiveTextInput, type SheetHeader } from "./adaptive-modal-sheet";
 import { Button } from "@/components/ui/button";

@@ -123,6 +129,30 @@ const styles = StyleSheet.create((theme) => ({
    fontSize: theme.fontSize.sm,
    fontWeight: theme.fontWeight.medium,
  },
+  advancedContent: {
+    gap: theme.spacing[4],
+  },
+  headerSection: {
+    gap: theme.spacing[2],
+  },
+  headerTitleRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "space-between",
+    gap: theme.spacing[3],
+  },
+  headerList: {
+    gap: theme.spacing[2],
+  },
+  headerRow: {
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[2],
+  },
+  headerInput: {
+    flex: 1,
+    minWidth: 0,
+  },
  actions: {
    flexDirection: "row",
    gap: theme.spacing[3],
@@ -181,6 +211,94 @@ function prepareDirectConnection(
  };
 }

+function headerIssueMessage(
+  issue: ConnectionHeaderValidationIssue,
+  t: ReturnType<typeof useTranslation>["t"],
+): string {
+  if (issue.type === "missingName") return t("pairing.direct.headers.errors.missingName");
+  if (issue.type === "invalidName") {
+    return t("pairing.direct.headers.errors.invalidName", { name: issue.name });
+  }
+  if (issue.type === "invalidValue") {
+    return t("pairing.direct.headers.errors.invalidValue", { name: issue.name });
+  }
+  return t("pairing.direct.headers.errors.duplicateName", { name: issue.name });
+}
+
+interface ConnectionHeaderRowProps {
+  draft: ConnectionHeaderDraft;
+  index: number;
+  disabled: boolean;
+  placeholderTextColor: string;
+  iconColor: string;
+  onUpdate: (id: number, field: "name" | "value", value: string) => void;
+  onRemove: (id: number) => void;
+}
+
+function ConnectionHeaderRow({
+  draft,
+  index,
+  disabled,
+  placeholderTextColor,
+  iconColor,
+  onUpdate,
+  onRemove,
+}: ConnectionHeaderRowProps) {
+  const { t } = useTranslation();
+  const handleNameChange = useCallback(
+    (value: string) => onUpdate(draft.id, "name", value),
+    [draft.id, onUpdate],
+  );
+  const handleValueChange = useCallback(
+    (value: string) => onUpdate(draft.id, "value", value),
+    [draft.id, onUpdate],
+  );
+  const handleRemove = useCallback(() => onRemove(draft.id), [draft.id, onRemove]);
+
+  return (
+    <View style={styles.headerRow}>
+      <AdaptiveTextInput
+        testID={`direct-header-name-${index}`}
+        nativeID={`direct-header-name-${draft.id}`}
+        accessibilityLabel={t("pairing.direct.headers.name")}
+        initialValue={draft.name}
+        value={draft.name}
+        onChangeText={handleNameChange}
+        placeholder={t("pairing.direct.headers.name")}
+        placeholderTextColor={placeholderTextColor}
+        style={[styles.input, styles.headerInput]}
+        autoCapitalize="none"
+        autoCorrect={false}
+        editable={!disabled}
+      />
+      <AdaptiveTextInput
+        testID={`direct-header-value-${index}`}
+        nativeID={`direct-header-value-${draft.id}`}
+        accessibilityLabel={t("pairing.direct.headers.value")}
+        initialValue={draft.value}
+        value={draft.value}
+        onChangeText={handleValueChange}
+        placeholder={t("pairing.direct.headers.value")}
+        placeholderTextColor={placeholderTextColor}
+        style={[styles.input, styles.headerInput]}
+        autoCapitalize="none"
+        autoCorrect={false}
+        editable={!disabled}
+      />
+      <Pressable
+        style={styles.iconButton}
+        onPress={handleRemove}
+        disabled={disabled}
+        accessibilityRole="button"
+        accessibilityLabel={t("pairing.direct.headers.remove")}
+        testID={`direct-header-remove-${index}`}
+      >
+        <X size={18} color={iconColor} />
+      </Pressable>
+    </View>
+  );
+}
+
 function draftFromConnectionUri(uri: string): DirectConnectionDraft {
  const parsed = parseConnectionUri(uri);
  return {
@@ -305,6 +423,8 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
  const [isPasswordVisible, setIsPasswordVisible] = useState(false);
  const [isAdvancedOpen, setIsAdvancedOpen] = useState(false);
  const [advancedUri, setAdvancedUri] = useState("");
+  const [headerDrafts, setHeaderDrafts] = useState<ConnectionHeaderDraft[]>([]);
+  const nextHeaderId = useRef(1);
  const [inputResetKey, bumpInputResetKey] = useReducer((key: number) => key + 1, 0);

  const clearInput = useCallback(() => {
@@ -315,6 +435,8 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
    setIsPasswordVisible(false);
    setIsAdvancedOpen(false);
    setAdvancedUri("");
+    setHeaderDrafts([]);
+    nextHeaderId.current = 1;
    bumpInputResetKey();
  }, []);

@@ -369,11 +491,18 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
    if (isSaving) return;

    let connection: PreparedDirectConnection;
+    let headers: Record<string, string> | undefined;
    try {
      connection = prepareDirectConnection(
        { host, port, useTls, password },
        directConnectionLabels,
      );
+      const preparedHeaders = prepareConnectionHeaders(headerDrafts);
+      if (preparedHeaders.issue) {
+        setErrorMessage(headerIssueMessage(preparedHeaders.issue, t));
+        return;
+      }
+      headers = preparedHeaders.headers;
    } catch (error) {
      const message =
        error instanceof Error ? error.message : directConnectionLabels.invalidConnection;
@@ -389,6 +518,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
        endpoint: connection.endpoint,
        useTls: connection.useTls,
        ...(connection.password ? { password: connection.password } : {}),
+        ...(headers ? { headers } : {}),
      });
      const isNewHost = !daemons.some((daemon) => daemon.serverId === serverId);

@@ -425,6 +555,7 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
    daemons,
    directConnectionLabels,
    handleClose,
+    headerDrafts,
    host,
    isMobile,
    isSaving,
@@ -453,6 +584,22 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
    setIsPasswordVisible((current) => !current);
  }, []);

+  const handleAddHeader = useCallback(() => {
+    const id = nextHeaderId.current;
+    nextHeaderId.current += 1;
+    setHeaderDrafts((current) => [...current, { id, name: "", value: "" }]);
+  }, []);
+
+  const handleUpdateHeader = useCallback((id: number, field: "name" | "value", value: string) => {
+    setHeaderDrafts((current) =>
+      current.map((draft) => (draft.id === id ? { ...draft, [field]: value } : draft)),
+    );
+  }, []);
+
+  const handleRemoveHeader = useCallback((id: number) => {
+    setHeaderDrafts((current) => current.filter((draft) => draft.id !== id));
+  }, []);
+
  const handleToggleAdvanced = useCallback(() => {
    if (!isAdvancedOpen) {
      try {
@@ -609,24 +756,58 @@ export function AddHostModal({ visible, onClose, onCancel, onSaved }: AddHostMod
          <Text style={styles.advancedText}>{t("pairing.direct.advanced.label")}</Text>
        </Pressable>
        {isAdvancedOpen ? (
-          <AdaptiveTextInput
-            testID="direct-host-uri-input"
-            nativeID="direct-host-uri-input"
-            accessibilityLabel={t("pairing.direct.fields.connectionUri")}
-            initialValue={advancedUri}
-            resetKey={`direct-host-uri-${inputResetKey}`}
-            value={advancedUri}
-            onChangeText={setAdvancedUri}
-            placeholder="tcp://localhost:6767?ssl=true"
-            placeholderTextColor={theme.colors.foregroundMuted}
-            style={styles.input}
-            autoCapitalize="none"
-            autoCorrect={false}
-            keyboardType="url"
-            editable={!isSaving}
-            returnKeyType="done"
-            onSubmitEditing={handleToggleAdvanced}
-          />
+          <View style={styles.advancedContent}>
+            <AdaptiveTextInput
+              testID="direct-host-uri-input"
+              nativeID="direct-host-uri-input"
+              accessibilityLabel={t("pairing.direct.fields.connectionUri")}
+              initialValue={advancedUri}
+              resetKey={`direct-host-uri-${inputResetKey}`}
+              value={advancedUri}
+              onChangeText={setAdvancedUri}
+              placeholder="tcp://localhost:6767?ssl=true"
+              placeholderTextColor={theme.colors.foregroundMuted}
+              style={styles.input}
+              autoCapitalize="none"
+              autoCorrect={false}
+              keyboardType="url"
+              editable={!isSaving}
+              returnKeyType="done"
+              onSubmitEditing={handleToggleAdvanced}
+            />
+
+            {isNative || getIsElectron() ? (
+              <View style={styles.headerSection}>
+                <View style={styles.headerTitleRow}>
+                  <Text style={styles.label}>{t("pairing.direct.headers.title")}</Text>
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    leftIcon={Plus}
+                    onPress={handleAddHeader}
+                    disabled={isSaving}
+                    testID="direct-header-add"
+                  >
+                    {t("pairing.direct.headers.add")}
+                  </Button>
+                </View>
+                <View style={styles.headerList}>
+                  {headerDrafts.map((draft, index) => (
+                    <ConnectionHeaderRow
+                      key={draft.id}
+                      draft={draft}
+                      index={index}
+                      disabled={isSaving}
+                      placeholderTextColor={theme.colors.foregroundMuted}
+                      iconColor={theme.colors.foregroundMuted}
+                      onUpdate={handleUpdateHeader}
+                      onRemove={handleRemoveHeader}
+                    />
+                  ))}
+                </View>
+              </View>
+            ) : null}
+          </View>
        ) : null}
        {errorMessage ? <Text style={styles.error}>{errorMessage}</Text> : null}
      </View>
@@ -7,7 +7,6 @@ import {
 } from "@getpaseo/protocol/agent-lifecycle";
 import { deriveSidebarStateBucket } from "@/utils/sidebar-agent-state";
 import { getStatusDotColor } from "@/utils/status-dot-color";
-import { STATUS_INDICATOR_FILLED_DOT_SIZE } from "@/utils/status-indicator-geometry";

 export function AgentStatusDot({
  status,
@@ -57,8 +56,8 @@ function isAgentLifecycleStatus(value: string): value is AgentLifecycleStatus {

 const styles = StyleSheet.create((theme) => ({
  dot: {
-    width: STATUS_INDICATOR_FILLED_DOT_SIZE,
-    height: STATUS_INDICATOR_FILLED_DOT_SIZE,
+    width: 8,
+    height: 8,
    borderRadius: theme.borderRadius.full,
  },
 }));
@@ -6,16 +6,37 @@ import { getIsElectronRuntime } from "@/constants/layout";
 import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet";
 import { Shortcut } from "@/components/ui/shortcut";
 import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
+import { formatShortcut } from "@/utils/format-shortcut";
 import { getShortcutOs } from "@/utils/shortcut-platform";
 import {
  buildEffectiveBindings,
  buildKeyboardShortcutHelpSections,
 } from "@/keyboard/keyboard-shortcuts";
-import { filterShortcutHelpSections } from "@/keyboard/shortcut-help-search";
 import { useKeyboardShortcutOverrides } from "@/hooks/use-keyboard-shortcut-overrides";

 const SNAP_POINTS: string[] = ["70%", "92%"];

+function shortcutSearchAliases(keys: string[], shortcutOs: "mac" | "non-mac"): string {
+  const aliases = keys.map((key) => {
+    if (shortcutOs === "mac") {
+      if (key === "mod" || key === "meta") return ["cmd", "command"];
+      if (key === "alt") return ["alt", "option"];
+    } else {
+      if (key === "mod" || key === "ctrl") return ["ctrl", "control"];
+      if (key === "meta") return ["win", "windows"];
+    }
+    return [key];
+  });
+  const combinations = aliases.reduce<string[][]>(
+    (prefixes, choices) =>
+      prefixes.flatMap((prefix) => choices.map((choice) => [...prefix, choice])),
+    [[]],
+  );
+  return combinations
+    .flatMap((combination) => [combination.join(" "), combination.join("+")])
+    .join(" ");
+}
+
 export function KeyboardShortcutsDialog() {
  const { t } = useTranslation();
  const open = useKeyboardShortcutsStore((s) => s.shortcutsDialogOpen);
@@ -33,10 +54,33 @@ export function KeyboardShortcutsDialog() {
    () => buildKeyboardShortcutHelpSections({ isMac, isDesktop: isDesktopApp }, bindings),
    [bindings, isDesktopApp, isMac],
  );
-  const visibleSections = useMemo(
-    () => filterShortcutHelpSections({ sections, query, translate: t, shortcutOs }),
-    [query, sections, shortcutOs, t],
-  );
+  const visibleSections = useMemo(() => {
+    const normalizedQuery = query.trim().toLocaleLowerCase();
+    if (!normalizedQuery) return sections;
+
+    return sections.flatMap((section) => {
+      const sectionTitle = t(section.titleKey);
+      if (sectionTitle.toLocaleLowerCase().includes(normalizedQuery)) {
+        return [section];
+      }
+
+      const rows = section.rows.filter((row) => {
+        const searchText = [
+          t(row.labelKey),
+          row.noteKey ? t(row.noteKey) : row.note,
+          row.keys.join(" "),
+          formatShortcut(row.keys, shortcutOs),
+          shortcutSearchAliases(row.keys, shortcutOs),
+        ]
+          .filter(Boolean)
+          .join(" ")
+          .toLocaleLowerCase();
+        return searchText.includes(normalizedQuery);
+      });
+
+      return rows.length > 0 ? [{ ...section, rows }] : [];
+    });
+  }, [query, sections, shortcutOs, t]);

  useEffect(() => {
    if (!open) setQuery("");
@@ -70,18 +114,14 @@ export function KeyboardShortcutsDialog() {
            <Text style={styles.sectionTitle}>{t(section.titleKey)}</Text>
            <View style={styles.rows}>
              {section.rows.map((row) => (
-                <View key={row.id} style={styles.row} testID={`shortcut-help-row-${row.id}`}>
+                <View key={row.id} style={styles.row}>
                  <View style={styles.rowText}>
                    <Text style={styles.rowLabel}>{t(row.labelKey)}</Text>
                    {row.note ? (
                      <Text style={styles.rowNote}>{row.noteKey ? t(row.noteKey) : row.note}</Text>
                    ) : null}
                  </View>
-                  {row.chord === null ? (
-                    <Text style={styles.rowUnassigned}>{t("settings.shortcuts.unassigned")}</Text>
-                  ) : (
-                    <Shortcut chord={row.chord} style={styles.rowShortcut} />
-                  )}
+                  <Shortcut keys={row.keys} style={styles.rowShortcut} />
                </View>
              ))}
            </View>
@@ -139,13 +179,6 @@ const styles = StyleSheet.create((theme) => ({
  rowShortcut: {
    alignSelf: "flex-start",
  },
-  // Matches the settings row's unassigned label, so the two screens describe the
-  // same state the same way.
-  rowUnassigned: {
-    alignSelf: "flex-start",
-    fontSize: theme.fontSize.sm,
-    color: theme.colors.foregroundMuted,
-  },
  empty: {
    paddingVertical: theme.spacing[6],
    textAlign: "center",
@@ -74,6 +74,7 @@ import type { ShortcutKey } from "@/utils/format-shortcut";
 import { SidebarAgentListSkeleton } from "./sidebar-agent-list-skeleton";
 import { SidebarCalloutSlot } from "./sidebar-callout-slot";
 import { SidebarWorkspaceList } from "./sidebar-workspace-list";
+import { PluginSidebarItems } from "@/plugins/sidebar-items";

 type SidebarTheme = ReturnType<typeof useUnistyles>["theme"];

@@ -678,6 +679,7 @@ function MobileSidebar({
            testID="sidebar-schedules"
            variant="compact"
          />
+          <PluginSidebarItems onBeforeNavigate={closeSidebar} />
        </View>
        <WindowChromeSafeArea placement="inline" style={styles.mobileCloseButtonRow}>
          <Pressable
@@ -883,6 +885,7 @@ function DesktopSidebar({
              testID="sidebar-schedules"
              variant="compact"
            />
+            <PluginSidebarItems />
          </View>
        </View>

@@ -1806,7 +1806,7 @@ export const AssistantMessage = memo(function AssistantMessage({

        return (
          <View key={node.key} style={styles.list_item} dataSet={markdownCopyDataSet.li}>
-            <Text style={iconStyle} dataSet={markdownCopyDataSet.listMarker}>
+            <Text style={iconStyle} dataSet={markdownCopyDataSet.ignore}>
              {marker}
            </Text>
            <MarkdownListItemContent contentStyle={contentStyle}>
@@ -376,21 +376,18 @@ function projectKebabStyle({

 function getProjectWorkspaceRowStyle({
  isDragging,
-  isPressed,
  selected,
  isHovered,
 }: {
  isDragging: boolean;
-  isPressed: boolean;
  selected: boolean;
  isHovered: boolean;
 }) {
  return [
    styles.workspaceRow,
+    isDragging && styles.workspaceRowDragging,
    selected && styles.sidebarRowSelected,
    isHovered && styles.workspaceRowHovered,
-    isDragging && styles.workspaceRowDragging,
-    isPressed && styles.workspaceRowPressed,
  ];
 }

@@ -874,7 +871,6 @@ function ProjectHeaderRow({
  dragHandleProps,
 }: ProjectHeaderRowProps) {
  const [isHovered, setIsHovered] = useState(false);
-  const [isPressed, setIsPressed] = useState(false);
  const [contextMenuOpen, setContextMenuOpen] = useState(false);
  const isMobileBreakpoint = useIsCompactFormFactor();
  const localDaemonServerId = useLocalDaemonServerId();
@@ -921,17 +917,6 @@ function ProjectHeaderRow({
    setContextMenuOpen(open);
    if (open) setIsHovered(false);
  }, []);
-  const handleProjectPressIn = useCallback(
-    (event: GestureResponderEvent) => {
-      setIsPressed(true);
-      interaction.handlePressIn(event);
-    },
-    [interaction],
-  );
-  const handleProjectPressOut = useCallback(() => {
-    setIsPressed(false);
-    interaction.handlePressOut();
-  }, [interaction]);

  const projectRowStyle = useCallback(
    ({ pressed }: PressableStateCallbackType) => [
@@ -952,7 +937,7 @@ function ProjectHeaderRow({
          iconDataUri={iconDataUri}
          statusBucket={statusBucket}
          projectViewKey={project.viewKey}
-          backdrop={getSidebarRowBackdrop({ isDragging, isPressed, selected, isHovered })}
+          backdrop={getSidebarRowBackdrop({ isDragging, selected, isHovered })}
          chevron={chevron}
          showChevron={isHovered && chevron !== null}
          isArchiving={isArchiving}
@@ -997,10 +982,10 @@ function ProjectHeaderRow({
        <PressHighlight
          accessibilityRole="button"
          style={projectRowStyle}
-          highlightStyle={styles.projectRowPressed}
-          onPressIn={handleProjectPressIn}
+          highlightStyle={styles.projectRowHovered}
+          onPressIn={interaction.handlePressIn}
          onTouchMove={interaction.handleTouchMove}
-          onPressOut={handleProjectPressOut}
+          onPressOut={interaction.handlePressOut}
          onPress={handlePress}
          testID={`sidebar-project-row-${project.viewKey}`}
        >
@@ -1023,10 +1008,10 @@ function ProjectHeaderRow({
          enabledOnMobile={false}
          accessibilityRole="button"
          style={projectRowStyle}
-          highlightStyle={styles.projectRowPressed}
-          onPressIn={handleProjectPressIn}
+          highlightStyle={styles.projectRowHovered}
+          onPressIn={interaction.handlePressIn}
          onTouchMove={interaction.handleTouchMove}
-          onPressOut={handleProjectPressOut}
+          onPressOut={interaction.handlePressOut}
          onPress={handlePress}
          testID={`sidebar-project-row-${project.viewKey}`}
        >
@@ -1079,7 +1064,6 @@ function WorkspaceRowInner({
  reserveIdleStatusIndicatorSpace = true,
 }: WorkspaceRowInnerProps) {
  const _isCompact = useIsCompactFormFactor();
-  const [isPressed, setIsPressed] = useState(false);
  const isTouchPlatform = platformIsNative;
  const interaction = useLongPressDragInteraction({
    drag,
@@ -1099,17 +1083,6 @@ function WorkspaceRowInner({
    }
    onPress();
  }, [interaction.didLongPressRef, onPress]);
-  const handleWorkspacePressIn = useCallback(
-    (event: GestureResponderEvent) => {
-      setIsPressed(true);
-      interaction.handlePressIn(event);
-    },
-    [interaction],
-  );
-  const handleWorkspacePressOut = useCallback(() => {
-    setIsPressed(false);
-    interaction.handlePressOut();
-  }, [interaction]);

  const accessibilityState = useMemo(() => ({ selected }), [selected]);

@@ -1120,7 +1093,6 @@ function WorkspaceRowInner({
        const serviceSummary = isDesktop ? selectWorkspaceServiceSummary(workspace.scripts) : null;
        const workspaceRowStyle = getProjectWorkspaceRowStyle({
          isDragging,
-          isPressed,
          selected,
          isHovered,
        });
@@ -1155,10 +1127,10 @@ function WorkspaceRowInner({
              accessibilityRole="button"
              accessibilityState={accessibilityState}
              style={workspaceRowStyle}
-              highlightStyle={styles.workspaceRowPressed}
-              onPressIn={handleWorkspacePressIn}
+              highlightStyle={styles.workspaceRowHovered}
+              onPressIn={interaction.handlePressIn}
              onTouchMove={interaction.handleTouchMove}
-              onPressOut={handleWorkspacePressOut}
+              onPressOut={interaction.handlePressOut}
              onPress={handlePress}
              testID={`sidebar-workspace-row-${workspace.workspaceKey}`}
            >
@@ -1168,7 +1140,7 @@ function WorkspaceRowInner({
                leadingProjectName={leadingProjectName}
                leadingProjectIconDataUri={leadingProjectIconDataUri}
                serviceSummary={serviceSummary}
-                backdrop={getSidebarRowBackdrop({ isDragging, isPressed, selected, isHovered })}
+                backdrop={getSidebarRowBackdrop({ isDragging, selected, isHovered })}
                isHovered={isHovered}
                isLoading={isArchiving || isCreating}
                isCreating={isCreating}
@@ -12,13 +12,8 @@ import {
 } from "@/utils/project-status-badge-content";
 import { projectIconPlaceholderLabelFromDisplayName } from "@/utils/project-display-name";
 import { getStatusDotColor } from "@/utils/status-dot-color";
-import {
-  STATUS_INDICATOR_ALERT_SIZE,
-  STATUS_INDICATOR_FILLED_DOT_SIZE,
-} from "@/utils/status-indicator-geometry";
-import { StatusRing } from "@/components/status-ring";
-import { getStatusRingOffset } from "@/components/status-ring/geometry";
-import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
+import { STATUS_INDICATOR_ALERT_SIZE } from "@/utils/status-indicator-geometry";
+import type { SurfaceBackdrop } from "@/styles/surface-backdrop";

 // Every surfaced status shares one badge shell, so the badge never changes size or position
 // between states. Only the thing inside it changes.
@@ -34,6 +29,7 @@ const STATUS_BADGE_OFFSET = -4;
 //
 // The filled alert occupies the full badge shell so needs-input remains more prominent than
 // the passive status dots.
+const STATUS_BADGE_DOT_SIZE = 6;
 // Matches the workspace title's lineHeight (sidebar-workspace-row-content's
 // workspaceBranchText) so the icon centers on the title rather than floating above it.
 const LEADING_SLOT_HEIGHT = 20;
@@ -69,7 +65,7 @@ export function ProjectLeadingVisual({
  statusBucket: SidebarStateBucket | null;
  projectViewKey: string;
  /** The row's current background, so the status badge can knock out of it. */
-  backdrop: SidebarSurfaceBackdrop;
+  backdrop: SurfaceBackdrop;
  chevron?: "expand" | "collapse" | null;
  showChevron?: boolean;
  isArchiving?: boolean;
@@ -120,7 +116,7 @@ export function ProjectStatusIndicator({
  projectViewKey: string;
  statusBucket: SidebarStateBucket | null;
  /** The row's current background, so the status badge can knock out of it. */
-  backdrop: SidebarSurfaceBackdrop;
+  backdrop: SurfaceBackdrop;
  loading?: boolean;
  testID?: string;
 }) {
@@ -168,23 +164,8 @@ function ProjectStatusBadge({
 }: {
  content: ProjectStatusBadgeContent;
  statusBucket: SidebarStateBucket;
-  backdrop: SidebarSurfaceBackdrop;
+  backdrop: SurfaceBackdrop;
 }) {
-  // Running skips the shell. The ring is wider than the 12pt shell and carries its own knockout,
-  // so nesting it inside would clip it against the very thing that was meant to separate it from
-  // the icon. It anchors to the same corner instead, growing around the centre the dot had.
-  if (content.kind === "dot" && content.bucket === "running") {
-    return (
-      <View
-        role="status"
-        accessibilityLabel={STATUS_BUCKET_LABELS[statusBucket]}
-        style={styles.statusRingAnchor}
-        testID="project-status-badge"
-      >
-        <StatusRing backdrop={backdrop} />
-      </View>
-    );
-  }
  return (
    <View
      role="status"
@@ -201,14 +182,14 @@ function ProjectStatusBadge({
  );
 }

-function getStatusBadgeBackdropStyle(backdrop: SidebarSurfaceBackdrop): ViewStyle {
+function getStatusBadgeBackdropStyle(backdrop: SurfaceBackdrop): ViewStyle {
  switch (backdrop) {
-    case "surfaceSidebar":
-      return styles.statusBadgeOnSidebar;
    case "surfaceSidebarHover":
      return styles.statusBadgeOnSidebarHover;
    case "surface2":
      return styles.statusBadgeOnSurface2;
+    default:
+      return styles.statusBadgeOnSidebar;
  }
 }

@@ -259,8 +240,8 @@ const styles = StyleSheet.create((theme) => {
  // so this badge can't drift from the status dots everywhere else.
  const statusDot = (bucket: ProjectStatusBadgeDotBucket) =>
    ({
-      width: STATUS_INDICATOR_FILLED_DOT_SIZE,
-      height: STATUS_INDICATOR_FILLED_DOT_SIZE,
+      width: STATUS_BADGE_DOT_SIZE,
+      height: STATUS_BADGE_DOT_SIZE,
      borderRadius: theme.borderRadius.full,
      backgroundColor: getStatusDotColor({ theme, bucket }) ?? undefined,
    }) as const;
@@ -301,12 +282,6 @@ const styles = StyleSheet.create((theme) => {
      justifyContent: "center",
      overflow: "hidden",
    },
-    // Same corner as the shell, re-centred for the wider ring.
-    statusRingAnchor: {
-      position: "absolute",
-      right: getStatusRingOffset(STATUS_BADGE_OFFSET, STATUS_BADGE_SIZE),
-      bottom: getStatusRingOffset(STATUS_BADGE_OFFSET, STATUS_BADGE_SIZE),
-    },
    statusBadgeOnSidebar: { backgroundColor: theme.colors.surfaceSidebar },
    statusBadgeOnSidebarHover: { backgroundColor: theme.colors.surfaceSidebarHover },
    statusBadgeOnSurface2: { backgroundColor: theme.colors.surface2 },
@@ -1,4 +1,4 @@
-import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
+import type { SurfaceBackdrop } from "@/styles/surface-backdrop";

 /**
 * Which surface a sidebar row is currently painting, so anything knocking out of it — the status
@@ -9,19 +9,19 @@ import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
 * here rather than three ternaries beside three stylesheets: drifting from them is how the badge
 * ends up with a halo, and a halo in one grouping mode but not the other is worse than either.
 *
+ * The pressed background is deliberately absent. It lives in a Pressable style callback and lasts
+ * as long as a finger is down, which is not long enough to see a mismatched ring.
 */
 export function getSidebarRowBackdrop({
  isDragging = false,
-  isPressed = false,
  selected = false,
  isHovered = false,
 }: {
  isDragging?: boolean;
-  isPressed?: boolean;
  selected?: boolean;
  isHovered?: boolean;
-}): SidebarSurfaceBackdrop {
-  if (isDragging || isPressed) return "surface2";
+}): SurfaceBackdrop {
+  if (isDragging) return "surface2";
  if (selected || isHovered) return "surfaceSidebarHover";
  return "surfaceSidebar";
 }
@@ -687,15 +687,12 @@ function StatusWorkspaceRowInner({
  inStatusGroup?: boolean;
 }) {
  const isTouchPlatform = platformIsNative;
-  const [isPressed, setIsPressed] = useState(false);
  const trailing = useSidebarWorkspaceTrailing();

  const isDesktop = !isTouchPlatform;
  const serviceSummary = isDesktop ? selectWorkspaceServiceSummary(workspace.scripts) : null;

  const accessibilityState = useMemo(() => ({ selected }), [selected]);
-  const handlePressIn = useCallback(() => setIsPressed(true), []);
-  const handlePressOut = useCallback(() => setIsPressed(false), []);

  return (
    <SidebarWorkspaceRowFrame workspace={workspace}>
@@ -716,7 +713,6 @@ function StatusWorkspaceRowInner({
          showShortcut,
        });
        const workspaceRowStyle = getStatusWorkspaceRowStyle({
-          isPressed,
          selected,
          isHovered,
          inStatusGroup,
@@ -747,9 +743,7 @@ function StatusWorkspaceRowInner({
              accessibilityRole="button"
              accessibilityState={accessibilityState}
              style={workspaceRowStyle}
-              highlightStyle={styles.workspaceRowPressed}
-              onPressIn={handlePressIn}
-              onPressOut={handlePressOut}
+              highlightStyle={styles.workspaceRowHovered}
              onPress={onPress}
              testID={`sidebar-workspace-row-${workspace.workspaceKey}`}
            >
@@ -759,7 +753,7 @@ function StatusWorkspaceRowInner({
                leadingProjectName={projectName}
                leadingProjectIconDataUri={projectIconDataUri}
                serviceSummary={serviceSummary}
-                backdrop={getSidebarRowBackdrop({ isPressed, selected, isHovered })}
+                backdrop={getSidebarRowBackdrop({ selected, isHovered })}
                isHovered={isHovered}
                isLoading={isArchiving}
                shortcutNumber={shortcutNumber}
@@ -863,12 +857,10 @@ function StatusWorkspaceActionSlot({
 }

 function getStatusWorkspaceRowStyle({
-  isPressed,
  selected,
  isHovered,
  inStatusGroup,
 }: {
-  isPressed: boolean;
  selected: boolean;
  isHovered: boolean;
  inStatusGroup: boolean;
@@ -878,7 +870,6 @@ function getStatusWorkspaceRowStyle({
    inStatusGroup && sidebarWorkspaceRowStyles.rowIndented,
    selected && styles.sidebarRowSelected,
    isHovered && styles.workspaceRowHovered,
-    isPressed && styles.workspaceRowPressed,
  ];
 }

@@ -4,7 +4,7 @@ import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import Svg, { Defs, LinearGradient as SvgLinearGradient, Rect, Stop } from "react-native-svg";
 import { CircleAlert, Folder, FolderGit2, Monitor } from "lucide-react-native";
 import { ProjectStatusIndicator } from "@/components/sidebar/project-leading-visual";
-import type { SidebarSurfaceBackdrop } from "@/styles/surface-backdrop";
+import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
 import {
  WorkspaceMetaRow,
  type WorkspaceServiceSummary,
@@ -19,14 +19,12 @@ import {
 import { useAppSettings } from "@/hooks/use-settings";
 import type { Theme } from "@/styles/theme";
 import type { SidebarStateBucket } from "@/utils/sidebar-agent-state";
-import { getStatusDotColor } from "@/utils/status-dot-color";
+import { getStatusDotColor, isEmphasizedStatusDotBucket } from "@/utils/status-dot-color";
 import {
  STATUS_INDICATOR_ALERT_SIZE,
  STATUS_INDICATOR_DOT_SIZE,
-  STATUS_INDICATOR_FILLED_DOT_SIZE,
 } from "@/utils/status-indicator-geometry";
 import { shouldRenderSyncedStatusLoader } from "@/utils/status-loader";
-import { StatusRing } from "@/components/status-ring";
 import { resolveSidebarWorkspacePrimaryLabel } from "@/components/sidebar/sidebar-workspace-title";

 // The scrim spans more than the kebab so the fade starts left of the diff stat. Solid from
@@ -34,6 +32,11 @@ import { resolveSidebarWorkspacePrimaryLabel } from "@/components/sidebar/sideba
 const SCRIM_WIDTH = 48;
 const SCRIM_SOLID_OFFSET = "55%";

+const DEFAULT_STATUS_DOT_SIZE = 7;
+const EMPHASIZED_STATUS_DOT_SIZE = 9;
+const DEFAULT_STATUS_DOT_OFFSET = 0;
+const EMPHASIZED_STATUS_DOT_OFFSET = -1;
+
 const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
 const needsInputColorMapping = (theme: Theme) => ({
  color: theme.colors.surface0,
@@ -140,7 +143,7 @@ export const SidebarWorkspaceRowContent = memo(function SidebarWorkspaceRowConte
  leadingProjectIconDataUri?: string | null;
  serviceSummary?: WorkspaceServiceSummary | null;
  /** The row's current background, so the project status badge can knock out of it. */
-  backdrop: SidebarSurfaceBackdrop;
+  backdrop: SurfaceBackdrop;
  isHovered: boolean;
  isLoading: boolean;
  isCreating?: boolean;
@@ -218,14 +221,14 @@ function WorkspaceStatusIndicator({
  loading?: boolean;
  reserveIdleSpace?: boolean;
 }) {
-  // Busy is the only status that moves, and it is the ring rather than a dot for the same
-  // reason it is a dot elsewhere: every status in the sidebar sits in this one slot, so busy
-  // has to fill it without displacing anything. A row starting up and a row working are both
-  // busy, so they share the ring and differ only in testID.
+  // Busy is a dot here for the same reason it is on a project icon: every status in the
+  // sidebar is a dot, and a row with a project icon simply moves that dot onto the icon.
+  // A row starting up and a row working are both busy, so they share the dot and differ only
+  // in testID.
  if (loading) {
    return (
      <View style={styles.workspaceStatusDot} testID="workspace-status-indicator-loading">
-        <StatusRing />
+        <View style={styles.standaloneRunningDot} />
      </View>
    );
  }
@@ -233,7 +236,7 @@ function WorkspaceStatusIndicator({
  if (shouldRenderSyncedStatusLoader({ bucket })) {
    return (
      <View style={styles.workspaceStatusDot} testID="workspace-status-indicator-running">
-        <StatusRing />
+        <View style={styles.standaloneRunningDot} />
      </View>
    );
  }
@@ -272,16 +275,50 @@ function WorkspaceStatusIndicator({
  else KindIcon = ThemedFolder;

  const dotColorStyle = getStatusDotColorStyle(bucket);
+  const statusDotSize = isEmphasizedStatusDotBucket(bucket)
+    ? EMPHASIZED_STATUS_DOT_SIZE
+    : DEFAULT_STATUS_DOT_SIZE;
+  const statusDotOffset =
+    statusDotSize === EMPHASIZED_STATUS_DOT_SIZE
+      ? EMPHASIZED_STATUS_DOT_OFFSET
+      : DEFAULT_STATUS_DOT_OFFSET;
  return (
    <View style={styles.workspaceStatusDot} testID={`workspace-status-indicator-${bucket}`}>
      <KindIcon size={14} uniProps={foregroundMutedColorMapping} />
-      {dotColorStyle ? <StatusDotOverlay dotColorStyle={dotColorStyle} /> : null}
+      {dotColorStyle ? (
+        <StatusDotOverlay
+          dotColorStyle={dotColorStyle}
+          size={statusDotSize}
+          offset={statusDotOffset}
+        />
+      ) : null}
    </View>
  );
 }

-function StatusDotOverlay({ dotColorStyle }: { dotColorStyle: ViewStyle }) {
-  return <View style={[styles.statusDotOverlay, dotColorStyle]} />;
+function StatusDotOverlay({
+  dotColorStyle,
+  size,
+  offset,
+}: {
+  dotColorStyle: ViewStyle;
+  size: number;
+  offset: number;
+}) {
+  const overlayStyle = useMemo(
+    () => [
+      styles.statusDotOverlay,
+      dotColorStyle,
+      {
+        width: size,
+        height: size,
+        right: offset,
+        bottom: offset,
+      },
+    ],
+    [dotColorStyle, offset, size],
+  );
+  return <View style={overlayStyle} />;
 }

 function getStatusDotColorStyle(bucket: SidebarStateBucket) {
@@ -532,22 +569,24 @@ const styles = StyleSheet.create((theme) => ({
  },
  statusDotOverlay: {
    position: "absolute",
-    right: 0,
-    bottom: 0,
-    width: STATUS_INDICATOR_DOT_SIZE,
-    height: STATUS_INDICATOR_DOT_SIZE,
    borderRadius: theme.borderRadius.full,
    borderWidth: 1,
  },
  standaloneStatusDot: {
-    width: STATUS_INDICATOR_FILLED_DOT_SIZE,
-    height: STATUS_INDICATOR_FILLED_DOT_SIZE,
+    width: STATUS_INDICATOR_DOT_SIZE,
+    height: STATUS_INDICATOR_DOT_SIZE,
    borderRadius: theme.borderRadius.full,
    backgroundColor: getStatusDotColor({ theme, bucket: "attention" }) ?? undefined,
  },
+  standaloneRunningDot: {
+    width: STATUS_INDICATOR_DOT_SIZE,
+    height: STATUS_INDICATOR_DOT_SIZE,
+    borderRadius: theme.borderRadius.full,
+    backgroundColor: getStatusDotColor({ theme, bucket: "running" }) ?? undefined,
+  },
  idleStatusDot: {
-    width: STATUS_INDICATOR_FILLED_DOT_SIZE,
-    height: STATUS_INDICATOR_FILLED_DOT_SIZE,
+    width: 8,
+    height: 8,
    borderRadius: theme.borderRadius.full,
    backgroundColor: theme.colors.foregroundExtraMuted,
    opacity: 0.3,
@@ -1,6 +1,6 @@
 import { memo, useCallback, useMemo, useState, type Ref } from "react";
 import { useTranslation } from "react-i18next";
-import { View, Text, type GestureResponderEvent } from "react-native";
+import { View, Text } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { useMutation } from "@tanstack/react-query";
 import * as Clipboard from "expo-clipboard";
@@ -264,7 +264,6 @@ function WorkspaceRowBody({
  archiveShortcutKeys,
 }: WorkspaceRowBodyProps) {
  const isTouchPlatform = platformIsNative;
-  const [isPressed, setIsPressed] = useState(false);
  const trailing = useSidebarWorkspaceTrailing();
  const draggable = Boolean(drag);
  const interaction = useLongPressDragInteraction({
@@ -285,17 +284,6 @@ function WorkspaceRowBody({
    }
    onPress();
  }, [interaction.didLongPressRef, onPress]);
-  const handleWorkspacePressIn = useCallback(
-    (event: GestureResponderEvent) => {
-      setIsPressed(true);
-      if (draggable) interaction.handlePressIn(event);
-    },
-    [draggable, interaction],
-  );
-  const handleWorkspacePressOut = useCallback(() => {
-    setIsPressed(false);
-    if (draggable) interaction.handlePressOut();
-  }, [draggable, interaction]);

  const accessibilityState = useMemo(() => ({ selected }), [selected]);

@@ -304,12 +292,7 @@ function WorkspaceRowBody({
      {({ isHovered, contextMenuOpen, onContextMenuOpenChange, hoverHandlers }) => {
        const isDesktop = !isTouchPlatform;
        const serviceSummary = isDesktop ? selectWorkspaceServiceSummary(workspace.scripts) : null;
-        const workspaceRowStyle = getWorkspaceRowStyle({
-          isDragging,
-          isPressed,
-          selected,
-          isHovered,
-        });
+        const workspaceRowStyle = getWorkspaceRowStyle({ isDragging, selected, isHovered });
        return (
          <View
            {...(draggable ? dragAttributes : {})}
@@ -342,10 +325,10 @@ function WorkspaceRowBody({
              accessibilityRole="button"
              accessibilityState={accessibilityState}
              style={workspaceRowStyle}
-              highlightStyle={styles.workspaceRowPressed}
-              onPressIn={handleWorkspacePressIn}
+              highlightStyle={styles.workspaceRowHovered}
+              onPressIn={draggable ? interaction.handlePressIn : undefined}
              onTouchMove={draggable ? interaction.handleTouchMove : undefined}
-              onPressOut={handleWorkspacePressOut}
+              onPressOut={draggable ? interaction.handlePressOut : undefined}
              onPress={handlePress}
              testID={`sidebar-workspace-row-${workspace.workspaceKey}`}
            >
@@ -353,7 +336,7 @@ function WorkspaceRowBody({
                workspace={workspace}
                hostBadge={hostBadge}
                serviceSummary={serviceSummary}
-                backdrop={getSidebarRowBackdrop({ isDragging, isPressed, selected, isHovered })}
+                backdrop={getSidebarRowBackdrop({ isDragging, selected, isHovered })}
                isHovered={isHovered}
                isLoading={isArchiving || isCreating}
                isCreating={isCreating}
@@ -475,21 +458,18 @@ function WorkspaceRowTrailingActions({

 function getWorkspaceRowStyle({
  isDragging,
-  isPressed,
  selected,
  isHovered,
 }: {
  isDragging: boolean;
-  isPressed: boolean;
  selected: boolean;
  isHovered: boolean;
 }) {
  return [
    styles.workspaceRow,
+    isDragging && styles.workspaceRowDragging,
    selected && styles.sidebarRowSelected,
    isHovered && styles.workspaceRowHovered,
-    isDragging && styles.workspaceRowDragging,
-    isPressed && styles.workspaceRowPressed,
  ];
 }

@@ -515,9 +495,6 @@ const styles = StyleSheet.create((theme) => ({
  workspaceRowHovered: {
    backgroundColor: theme.colors.surfaceSidebarHover,
  },
-  workspaceRowPressed: {
-    backgroundColor: theme.colors.surface2,
-  },
  workspaceRowDragging: {
    backgroundColor: theme.colors.surface2,
    borderWidth: 1,
@@ -710,7 +710,7 @@ function DragOverlayTabChipInner({

        return (
          <View style={chipStyle}>
-            <WorkspaceTabIcon presentation={presentation} active size={14} backdrop="surface1" />
+            <WorkspaceTabIcon presentation={presentation} active size={14} />
            <Text numberOfLines={1} style={chipLabelStyle}>
              {label}
            </Text>
@@ -1,58 +0,0 @@
-import { useLayoutEffect } from "react";
-import { makeMutable, type SharedValue, useSharedValue } from "react-native-reanimated";
-import { scheduleOnUI } from "react-native-worklets";
-import { getStatusRingRotation } from "@/components/status-ring/geometry";
-
-const sharedRotation = makeMutable(getStatusRingRotation(Date.now()));
-const activeRingCount = makeMutable(0);
-const clockRunning = makeMutable(false);
-
-function advanceSharedRotation(): void {
-  "worklet";
-  if (activeRingCount.value === 0) {
-    clockRunning.value = false;
-    return;
-  }
-
-  sharedRotation.value = getStatusRingRotation(Date.now());
-  requestAnimationFrame(advanceSharedRotation);
-}
-
-function registerStatusRing(registered: SharedValue<boolean>): void {
-  "worklet";
-  if (registered.value) {
-    return;
-  }
-
-  registered.value = true;
-  activeRingCount.value += 1;
-
-  if (!clockRunning.value) {
-    clockRunning.value = true;
-    sharedRotation.value = getStatusRingRotation(Date.now());
-    requestAnimationFrame(advanceSharedRotation);
-  }
-}
-
-function unregisterStatusRing(registered: SharedValue<boolean>): void {
-  "worklet";
-  if (!registered.value) {
-    return;
-  }
-
-  registered.value = false;
-  activeRingCount.value -= 1;
-}
-
-export function useStatusRingRotation(): SharedValue<number> {
-  const registered = useSharedValue(false);
-
-  useLayoutEffect(() => {
-    scheduleOnUI(registerStatusRing, registered);
-    return () => {
-      scheduleOnUI(unregisterStatusRing, registered);
-    };
-  }, [registered]);
-
-  return sharedRotation;
-}
@@ -1,35 +0,0 @@
-import { useCallback, useLayoutEffect, useRef, type RefCallback } from "react";
-import type { View as NativeView } from "react-native";
-import { STATUS_RING_PERIOD_MS } from "@/components/status-ring/geometry";
-
-const STATUS_RING_KEYFRAMES: PropertyIndexedKeyframes = {
-  transform: ["rotate(0deg)", "rotate(360deg)"],
-};
-const STATUS_RING_TIMING: KeyframeAnimationOptions = {
-  duration: STATUS_RING_PERIOD_MS,
-  easing: "linear",
-  iterations: Number.POSITIVE_INFINITY,
-};
-const STATUS_RING_TIMELINE_START_MS = 0;
-
-export function useStatusRingAnimationRef(): RefCallback<NativeView> {
-  const arcElement = useRef<HTMLElement | null>(null);
-  const setArcElement = useCallback((instance: NativeView | null) => {
-    arcElement.current = instance instanceof HTMLElement ? instance : null;
-  }, []);
-
-  useLayoutEffect(() => {
-    const element = arcElement.current;
-    if (!element) {
-      return;
-    }
-
-    const animation = element.animate(STATUS_RING_KEYFRAMES, STATUS_RING_TIMING);
-    animation.startTime = STATUS_RING_TIMELINE_START_MS;
-    return () => {
-      animation.cancel();
-    };
-  }, []);
-
-  return setArcElement;
-}
@@ -1,121 +0,0 @@
-import type { ReactNode } from "react";
-import { StyleSheet as RNStyleSheet, View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
-import { getStatusDotColor } from "@/utils/status-dot-color";
-import {
-  STATUS_RING_FRAME_SIZE,
-  STATUS_RING_HEAD_OPACITY,
-  STATUS_RING_SIZE,
-  STATUS_RING_STROKE,
-  STATUS_RING_TRACK_OPACITY,
-} from "@/components/status-ring/geometry";
-import { STATUS_INDICATOR_FILLED_DOT_SIZE } from "@/utils/status-indicator-geometry";
-
-export interface StatusRingProps {
-  // The surface the ring is drawn on top of, named rather than resolved, because theme colours
-  // are only legible inside `StyleSheet.create` — see docs/unistyles.md. The frame fills itself
-  // with this so the ring reads as a hole punched in whatever it overlaps: the agent icon under a
-  // tab dot, the project tile under a sidebar badge. Leave it out where the ring sits on flat
-  // background and has nothing to knock out.
-  backdrop?: SurfaceBackdrop | null;
-}
-
-/**
- * The static half of the running indicator: the knockout, the track, and the centre dot. The
- * platform entry points supply the rotating quarter and own only how it is driven.
- *
- * The ring has no colour prop. It only ever means one thing — an agent is running — so it reads
- * that one colour out of the theme itself. Passing the colour in would materialise it at the call
- * site, outside anything Unistyles tracks, and leave the mark in the old theme until something
- * incidental re-rendered the row.
- */
-export function StatusRingFrame({ backdrop, children }: StatusRingProps & { children: ReactNode }) {
-  return (
-    <View style={[styles.frame, getBackdropStyle(backdrop)]}>
-      <View style={styles.track} />
-      {children}
-      <View style={styles.centerDot} />
-    </View>
-  );
-}
-
-function getBackdropStyle(backdrop: SurfaceBackdrop | null | undefined) {
-  switch (backdrop) {
-    case "surface0":
-      return styles.backdropSurface0;
-    case "surface1":
-      return styles.backdropSurface1;
-    case "surfaceSidebar":
-      return styles.backdropSurfaceSidebar;
-    case "surfaceSidebarHover":
-      return styles.backdropSurfaceSidebarHover;
-    case "surface2":
-      return styles.backdropSurface2;
-    default:
-      return null;
-  }
-}
-
-// The rotating quarter's geometry, deliberately plain React Native rather than Unistyles: on
-// native this style lands on a Reanimated `Animated.View`, and applying a theme-tracked style to
-// one crashes when the theme changes — Unistyles and Reanimated both mutate the same native node.
-// See docs/unistyles.md. The colour it needs lives on `styles.arc`, one level in, on a view
-// Reanimated never touches.
-export const rotatorStyles = RNStyleSheet.create({
-  rotator: {
-    position: "absolute",
-    width: STATUS_RING_SIZE,
-    height: STATUS_RING_SIZE,
-  },
-});
-
-export const styles = StyleSheet.create((theme) => {
-  const circle = {
-    width: STATUS_RING_SIZE,
-    height: STATUS_RING_SIZE,
-    borderRadius: theme.borderRadius.full,
-    borderWidth: STATUS_RING_STROKE,
-  } as const;
-  const runningColor = getStatusDotColor({ theme, bucket: "running" }) ?? undefined;
-
-  return {
-    frame: {
-      width: STATUS_RING_FRAME_SIZE,
-      height: STATUS_RING_FRAME_SIZE,
-      borderRadius: theme.borderRadius.full,
-      alignItems: "center",
-      justifyContent: "center",
-    },
-    backdropSurface0: { backgroundColor: theme.colors.surface0 },
-    backdropSurface1: { backgroundColor: theme.colors.surface1 },
-    backdropSurfaceSidebar: { backgroundColor: theme.colors.surfaceSidebar },
-    backdropSurfaceSidebarHover: { backgroundColor: theme.colors.surfaceSidebarHover },
-    backdropSurface2: { backgroundColor: theme.colors.surface2 },
-
-    // The closed ring the quarter runs on. Same colour rather than a grey so the indicator is one
-    // object at one hue; the opacity is what puts it behind the quarter instead of competing.
-    track: {
-      ...circle,
-      position: "absolute",
-      borderColor: runningColor,
-      opacity: STATUS_RING_TRACK_OPACITY,
-    },
-
-    // The moving quarter. Three sides transparent leaves the top border alone, which on a fully
-    // rounded box is a 90° arc — the edge that makes the rotation legible against the track.
-    arc: {
-      ...circle,
-      borderColor: "transparent",
-      borderTopColor: runningColor,
-      opacity: STATUS_RING_HEAD_OPACITY,
-    },
-
-    centerDot: {
-      width: STATUS_INDICATOR_FILLED_DOT_SIZE,
-      height: STATUS_INDICATOR_FILLED_DOT_SIZE,
-      borderRadius: theme.borderRadius.full,
-      backgroundColor: runningColor,
-    },
-  };
-});
@@ -1,49 +0,0 @@
-import { STATUS_INDICATOR_FILLED_DOT_SIZE } from "@/utils/status-indicator-geometry";
-
-// The running indicator is a status dot with a rotating ring around it, and the whole set of
-// numbers below is a budget rather than four independent choices. The centre matches every other
-// filled status circle; the gap and stroke grow outward from it without changing that shared size.
-export const STATUS_RING_GAP = 1.5;
-export const STATUS_RING_STROKE = 1.5;
-// Derived outward from the dot, which means the dot is not a free variable: shrink it without
-// opening the gap by the same amount and the ring closes in behind it, the whole mark scales
-// down, and nothing about how the centre reads against the ring actually changes.
-export const STATUS_RING_SIZE =
-  STATUS_INDICATOR_FILLED_DOT_SIZE + (STATUS_RING_GAP + STATUS_RING_STROKE) * 2;
-
-// The knockout margin, and the reason the frame is wider than the ring. These indicators sit on
-// the bottom-right corner of an agent or project icon, and a dot only stays readable there
-// because it carries a ring of surface colour separating it from the art underneath. A ring drawn
-// out to the frame's edge has no such separation and collides with the icon, so the frame is the
-// knockout and the ring lives inside it.
-export const STATUS_RING_HALO_INSET = 1;
-export const STATUS_RING_FRAME_SIZE = STATUS_RING_SIZE + STATUS_RING_HALO_INSET * 2;
-
-// The track and the quarter riding it are the same color and differ only here. The track is low
-// enough that the quarter is unmistakably the thing moving, high enough that the ring still reads
-// as a ring when the quarter is on the far side of it. The quarter is held off full so the centre
-// dot stays the solid part of the mark — the ring is what the dot is doing, not a second dot.
-export const STATUS_RING_TRACK_OPACITY = 0.3;
-export const STATUS_RING_HEAD_OPACITY = 0.9;
-
-// One period for every ring in the app. Each platform owns one mount-independent timeline: web
-// animations share an absolute document-timeline start, while native publishes this wall-clock
-// phase from one UI-thread clock. A row that appears mid-flight therefore lands in step with the
-// rings already turning.
-export const STATUS_RING_PERIOD_MS = 900;
-
-export function getStatusRingRotation(nowMs: number): number {
-  "worklet";
-  return ((nowMs % STATUS_RING_PERIOD_MS) / STATUS_RING_PERIOD_MS) * 360;
-}
-
-/**
- * Re-anchors a corner status dot's offset for the ring that replaces it.
- *
- * The dots this replaces are pinned to an icon's bottom-right corner rather than centred in a
- * slot, so growing them in place would walk the indicator off the corner. Callers keep their
- * existing dot offset and pass it through here to grow around the same centre point.
- */
-export function getStatusRingOffset(dotOffset: number, dotSize: number): number {
-  return dotOffset - (STATUS_RING_FRAME_SIZE - dotSize) / 2;
-}
@@ -1,32 +0,0 @@
-import { memo } from "react";
-import { View } from "react-native";
-import Animated, { useAnimatedStyle } from "react-native-reanimated";
-import {
-  StatusRingFrame,
-  type StatusRingProps,
-  rotatorStyles,
-  styles,
-} from "@/components/status-ring/frame";
-import { useStatusRingRotation } from "@/components/status-ring/clock";
-
-/**
- * Native running indicator. The rotation is published by one shared UI-thread clock rather than
- * per-instance timing, so a ring that mounts mid-flight is already in phase — see `clock.ts`.
- *
- * The rotated view carries no theme-tracked style; the coloured arc is nested inside it. Putting
- * a Unistyles style on a Reanimated view crashes on theme change (docs/unistyles.md).
- */
-export const StatusRing = memo(function StatusRing({ backdrop }: StatusRingProps) {
-  const rotation = useStatusRingRotation();
-  const rotatorStyle = useAnimatedStyle(() => ({
-    transform: [{ rotate: `${rotation.value}deg` }],
-  }));
-
-  return (
-    <StatusRingFrame backdrop={backdrop}>
-      <Animated.View style={[rotatorStyles.rotator, rotatorStyle]}>
-        <View style={styles.arc} />
-      </Animated.View>
-    </StatusRingFrame>
-  );
-});
@@ -1,26 +0,0 @@
-import { memo } from "react";
-import { View } from "react-native";
-import {
-  StatusRingFrame,
-  type StatusRingProps,
-  rotatorStyles,
-  styles,
-} from "@/components/status-ring/frame";
-import { useStatusRingAnimationRef } from "@/components/status-ring/clock.web";
-
-/**
- * Web running indicator. A sidebar full of agents can hold dozens of these at once, so the browser
- * drives the rotation from one absolute document-timeline epoch rather than from mount time — see
- * `clock.web.ts`.
- */
-export const StatusRing = memo(function StatusRing({ backdrop }: StatusRingProps) {
-  const rotatorRef = useStatusRingAnimationRef();
-
-  return (
-    <StatusRingFrame backdrop={backdrop}>
-      <View ref={rotatorRef} style={rotatorStyles.rotator}>
-        <View style={styles.arc} />
-      </View>
-    </StatusRingFrame>
-  );
-});
@@ -863,6 +863,35 @@ describe("openComposerAttachment", () => {
    });
    expect(externalUrlCalls).toEqual([issueItem.url]);
  });
+
+  it("opens plugin resource URLs through the external url opener", () => {
+    const externalUrlCalls: string[] = [];
+    openComposerAttachment({
+      attachment: {
+        kind: "plugin_resource",
+        pluginId: "linear",
+        sourceId: "issues",
+        sourceTitle: "Linear issue",
+        sourceIcon: "CircleDot",
+        item: {
+          id: "issue-uuid",
+          identifier: "ENG-123",
+          title: "Plugin attachments",
+          url: "https://linear.app/acme/issue/ENG-123/plugin-attachments",
+          text: "Linear issue ENG-123: Plugin attachments",
+          resourceType: "issue",
+        },
+      },
+      setLightboxMetadata: () => {
+        throw new Error("unexpected lightbox call");
+      },
+      openWorkspaceAttachment: () => false,
+      openExternalUrl: (url) => {
+        externalUrlCalls.push(url);
+      },
+    });
+    expect(externalUrlCalls).toEqual(["https://linear.app/acme/issue/ENG-123/plugin-attachments"]);
+  });
 });

 describe("toggleGithubAttachment", () => {
@@ -10,6 +10,7 @@ import {
  buildLegacyGitHubAttachmentFromSearchItem,
 } from "@/utils/review-attachments";
 import { workspaceFileAttachmentToAgentAttachment } from "@/attachments/workspace-file";
+import { pluginResourceAttachmentToAgentAttachment } from "@/plugins/attachments/model";

 export type ComposerAttachmentSubmitFormat = "forge" | "legacy-github";

@@ -55,6 +56,11 @@ export function splitComposerAttachmentsForSubmit(
      continue;
    }

+    if (attachment.kind === "plugin_resource") {
+      agentAttachments.push(pluginResourceAttachmentToAgentAttachment(attachment));
+      continue;
+    }
+
    if (isWorkspaceAttachment(attachment)) {
      if (attachment.kind === "browser_element" && attachment.attachment.screenshot) {
        images.push(attachment.attachment.screenshot);
@@ -125,6 +125,8 @@ import { getForgePresentation } from "@/git/forge";
 import { ForgeBrandIcon } from "@/git/forge-icon";
 import { useComposerGithubAutoAttach } from "./github/auto-attach";
 import { readClipboardImage } from "./clipboard-image";
+import { usePluginAttachmentPicker } from "@/plugins/attachments/picker";
+import { PluginResourceAttachmentPill } from "@/plugins/attachments/pill";
 import { resolveClientSlashCommand, type ClientSlashCommand } from "@/client-slash-commands";
 import {
  appendWorkspaceFileAttachment,
@@ -440,6 +442,20 @@ function renderComposerAttachmentPill(args: RenderComposerAttachmentPillArgs): R
      onRemove,
    });
  }
+  if (attachment.kind === "plugin_resource") {
+    return (
+      <PluginResourceAttachmentPill
+        key={`${attachment.pluginId}:${attachment.sourceId}:${attachment.item.id}`}
+        attachment={attachment}
+        index={index}
+        disabled={disabled}
+        onOpen={onOpen}
+        onRemove={onRemove}
+        openLabel={labels.openGithub}
+        removeLabel={labels.removeGithub}
+      />
+    );
+  }
  return (
    <GithubAttachmentPill
      key={`${attachment.item.kind}:${attachment.item.number}`}
@@ -1158,6 +1174,14 @@ export function Composer({
  const [lightboxMetadata, setLightboxMetadata] = useState<AttachmentMetadata | null>(null);
  const attachButtonRef = useRef<View | null>(null);
  const messageInputRef = useRef<MessageInputRef>(null);
+  const pluginAttachments = usePluginAttachmentPicker({
+    serverId,
+    client,
+    connected: isConnected,
+    attachments,
+    onChangeAttachments: setSelectedAttachments,
+    anchorRef: attachButtonRef,
+  });
  const isComposerLocked = resolveIsComposerLocked(submitBehavior, isSubmitLoading);
  const keyboardHandlerIdRef = useRef(
    `message-input:${serverId}:${agentId}:${Math.random().toString(36).slice(2)}`,
@@ -1922,6 +1946,7 @@ export function Composer({
          setIsGithubPickerOpen(true);
        },
      },
+      ...pluginAttachments.menuItems,
      {
        id: "file",
        label: t("composer.attachments.addFile"),
@@ -1932,7 +1957,14 @@ export function Composer({
      },
    );
    return items;
-  }, [forgePresentation, handlePasteImage, handlePickFile, handlePickImage, t]);
+  }, [
+    forgePresentation,
+    handlePasteImage,
+    handlePickFile,
+    handlePickImage,
+    pluginAttachments.menuItems,
+    t,
+  ]);

  const handleToggleGithubItem = useCallback(
    (item: ForgeSearchItem) => {
@@ -2189,6 +2221,7 @@ export function Composer({
                emptyText={githubEmptyText}
                renderOption={renderGithubPickerOption}
              />
+              {pluginAttachments.picker}
            </View>
          </View>
        </View>
@@ -1,5 +1,8 @@
 import { describe, expect, it, vi } from "vitest";
-import { createDesktopLocalDaemonTransportFactory } from "./desktop-daemon-transport";
+import {
+  createDesktopLocalDaemonTransportFactory,
+  createDesktopWebSocketTransportFactory,
+} from "./desktop-daemon-transport";
 import { createFakeLocalDaemonTransportRpc } from "./test-local-daemon-transport-rpc";

 const LOCAL_URL = "paseo+local://socket?path=%2Ftmp%2Fpaseo.sock";
@@ -43,4 +46,25 @@ describe("desktop-daemon-transport", () => {
    expect(rpc.closedSessions).toEqual(["local-session-2"]);
    expect(cleanup).toHaveBeenCalledTimes(1);
  });
+
+  it("forwards remote WebSocket headers and protocols through the desktop bridge", () => {
+    const rpc = createFakeLocalDaemonTransportRpc();
+    const transportFactory = createDesktopWebSocketTransportFactory(rpc);
+    expect(transportFactory).not.toBeNull();
+
+    transportFactory!({
+      url: "wss://daemon.example/ws",
+      headers: { "X-Tenant": "acme", Authorization: "Bearer secret" },
+      protocols: ["paseo.bearer.secret"],
+    });
+
+    expect(rpc.openCalls).toEqual([
+      {
+        transportType: "websocket",
+        url: "wss://daemon.example/ws",
+        headers: { "X-Tenant": "acme", Authorization: "Bearer secret" },
+        protocols: ["paseo.bearer.secret"],
+      },
+    ]);
+  });
 });
@@ -2,11 +2,13 @@ import type {
  DaemonTransport,
  DaemonTransportFactory,
 } from "@getpaseo/client/internal/daemon-client";
-import type { LocalTransportTarget } from "./desktop-daemon";
+import type { DesktopDaemonTransportTarget, LocalTransportTarget } from "./desktop-daemon";
 import {
  defaultLocalDaemonTransportRpc,
+  defaultWebSocketDaemonTransportRpc,
  type LocalDaemonTransportRpc,
 } from "./local-daemon-transport-rpc";
+import { isElectronRuntime } from "@/desktop/host";

 const LOCAL_TRANSPORT_SCHEME = "paseo+local:";

@@ -50,11 +52,12 @@ function parseLocalDaemonTransportUrl(url: string): LocalTransportTarget {
  };
 }

-export function createDesktopLocalDaemonTransportFactory(
-  rpc: LocalDaemonTransportRpc = defaultLocalDaemonTransportRpc,
-): DaemonTransportFactory | null {
-  return ({ url }) => {
-    const target = parseLocalDaemonTransportUrl(url);
+function createDesktopDaemonTransportFactory(
+  resolveTarget: (options: Parameters<DaemonTransportFactory>[0]) => DesktopDaemonTransportTarget,
+  rpc: LocalDaemonTransportRpc,
+): DaemonTransportFactory {
+  return (options) => {
+    const target = resolveTarget(options);
    let sessionId: string | null = null;
    let unlisten: (() => void) | null = null;
    let disposed = false;
@@ -187,3 +190,26 @@ export function createDesktopLocalDaemonTransportFactory(
    return transport;
  };
 }
+
+export function createDesktopLocalDaemonTransportFactory(
+  rpc: LocalDaemonTransportRpc = defaultLocalDaemonTransportRpc,
+): DaemonTransportFactory | null {
+  return createDesktopDaemonTransportFactory(({ url }) => parseLocalDaemonTransportUrl(url), rpc);
+}
+
+export function createDesktopWebSocketTransportFactory(
+  rpc?: LocalDaemonTransportRpc,
+): DaemonTransportFactory | null {
+  if (!rpc && !isElectronRuntime()) {
+    return null;
+  }
+  return createDesktopDaemonTransportFactory(
+    ({ url, headers, protocols }) => ({
+      transportType: "websocket" as const,
+      url,
+      ...(headers && Object.keys(headers).length > 0 ? { headers } : {}),
+      ...(protocols && protocols.length > 0 ? { protocols } : {}),
+    }),
+    rpc ?? defaultWebSocketDaemonTransportRpc,
+  );
+}
@@ -46,6 +46,16 @@ export interface LocalTransportTarget {
  transportPath: string;
 }

+export interface WebSocketTransportTarget {
+  [key: string]: unknown;
+  transportType: "websocket";
+  url: string;
+  headers?: Record<string, string>;
+  protocols?: string[];
+}
+
+export type DesktopDaemonTransportTarget = LocalTransportTarget | WebSocketTransportTarget;
+
 interface LocalTransportEventPayload {
  sessionId: string;
  kind: "open" | "message" | "close" | "error";
@@ -193,6 +203,16 @@ export async function openLocalTransportSession(target: LocalTransportTarget): P
  return raw;
 }

+export async function openWebSocketTransportSession(
+  target: WebSocketTransportTarget,
+): Promise<string> {
+  const raw = await invokeDesktopCommand<unknown>("open_websocket_daemon_transport", target);
+  if (typeof raw !== "string" || raw.trim().length === 0) {
+    throw new Error("Unexpected WebSocket transport session response.");
+  }
+  return raw;
+}
+
 export async function sendLocalTransportMessage(input: {
  sessionId: string;
  text?: string;
@@ -2,8 +2,10 @@ import {
  closeLocalTransportSession,
  listenToLocalTransportEvents,
  openLocalTransportSession,
+  openWebSocketTransportSession,
  sendLocalTransportMessage,
-  type LocalTransportTarget,
+  type DesktopDaemonTransportTarget,
+  type WebSocketTransportTarget,
 } from "./desktop-daemon";

 export interface LocalDaemonTransportEvent {
@@ -17,7 +19,7 @@ export interface LocalDaemonTransportEvent {
 }

 export interface LocalDaemonTransportRpc {
-  openSession(target: LocalTransportTarget): Promise<string>;
+  openSession(target: DesktopDaemonTransportTarget): Promise<string>;
  listenToEvents(handler: (event: LocalDaemonTransportEvent) => void): Promise<() => void>;
  sendMessage(input: { sessionId: string; text?: string; binaryBase64?: string }): Promise<void>;
  closeSession(sessionId: string): Promise<void>;
@@ -29,3 +31,10 @@ export const defaultLocalDaemonTransportRpc: LocalDaemonTransportRpc = {
  sendMessage: sendLocalTransportMessage,
  closeSession: closeLocalTransportSession,
 };
+
+export const defaultWebSocketDaemonTransportRpc: LocalDaemonTransportRpc = {
+  openSession: (target) => openWebSocketTransportSession(target as WebSocketTransportTarget),
+  listenToEvents: listenToLocalTransportEvents,
+  sendMessage: sendLocalTransportMessage,
+  closeSession: closeLocalTransportSession,
+};
@@ -1,4 +1,4 @@
-import type { LocalTransportTarget } from "./desktop-daemon";
+import type { DesktopDaemonTransportTarget } from "./desktop-daemon";
 import type {
  LocalDaemonTransportEvent,
  LocalDaemonTransportRpc,
@@ -11,7 +11,7 @@ export interface RecordedSend {
 }

 export interface FakeLocalDaemonTransportRpc extends LocalDaemonTransportRpc {
-  readonly openCalls: LocalTransportTarget[];
+  readonly openCalls: DesktopDaemonTransportTarget[];
  readonly recordedSends: RecordedSend[];
  readonly closedSessions: string[];
  resolveOpen(sessionId: string): void;
@@ -22,7 +22,7 @@ export interface FakeLocalDaemonTransportRpc extends LocalDaemonTransportRpc {
 }

 export function createFakeLocalDaemonTransportRpc(): FakeLocalDaemonTransportRpc {
-  const openCalls: LocalTransportTarget[] = [];
+  const openCalls: DesktopDaemonTransportTarget[] = [];
  const recordedSends: RecordedSend[] = [];
  const closedSessions: string[] = [];
  let eventHandler: ((event: LocalDaemonTransportEvent) => void) | null = null;
@@ -1426,6 +1426,19 @@ export const ar: TranslationResources = {
        show: "عرض متقدم",
        hide: "إخفاء المتقدمة",
      },
+      headers: {
+        title: "رؤوس مخصصة",
+        add: "إضافة رأس",
+        name: "الاسم",
+        value: "القيمة",
+        remove: "إزالة الرأس",
+        errors: {
+          missingName: "أدخل اسمًا لكل رأس",
+          invalidName: "{{name}} ليس اسم رأس صالحًا",
+          invalidValue: "يحتوي {{name}} على فاصل أسطر غير صالح",
+          duplicateName: "تم إدخال {{name}} أكثر من مرة",
+        },
+      },
      passwordVisibility: {
        show: "إظهار كلمة المرور",
        hide: "إخفاء كلمة المرور",
@@ -1437,6 +1437,19 @@ export const en = {
        show: "Show advanced",
        hide: "Hide advanced",
      },
+      headers: {
+        title: "Custom headers",
+        add: "Add header",
+        name: "Name",
+        value: "Value",
+        remove: "Remove header",
+        errors: {
+          missingName: "Enter a name for each header",
+          invalidName: "{{name}} is not a valid header name",
+          invalidValue: "{{name}} contains an invalid line break",
+          duplicateName: "{{name}} is entered more than once",
+        },
+      },
      passwordVisibility: {
        show: "Show password",
        hide: "Hide password",
@@ -1467,6 +1467,19 @@ export const es: TranslationResources = {
        show: "Mostrar avanzado",
        hide: "Ocultar avanzado",
      },
+      headers: {
+        title: "Encabezados personalizados",
+        add: "Añadir encabezado",
+        name: "Nombre",
+        value: "Valor",
+        remove: "Eliminar encabezado",
+        errors: {
+          missingName: "Introduce un nombre para cada encabezado",
+          invalidName: "{{name}} no es un nombre de encabezado válido",
+          invalidValue: "{{name}} contiene un salto de línea no válido",
+          duplicateName: "{{name}} se ha introducido más de una vez",
+        },
+      },
      passwordVisibility: {
        show: "Mostrar contraseña",
        hide: "Ocultar contraseña",
@@ -1471,6 +1471,19 @@ export const fr: TranslationResources = {
        show: "Afficher avancé",
        hide: "Masquer avancé",
      },
+      headers: {
+        title: "En-têtes personnalisés",
+        add: "Ajouter un en-tête",
+        name: "Nom",
+        value: "Valeur",
+        remove: "Supprimer l'en-tête",
+        errors: {
+          missingName: "Saisissez un nom pour chaque en-tête",
+          invalidName: "{{name}} n'est pas un nom d'en-tête valide",
+          invalidValue: "{{name}} contient un saut de ligne non valide",
+          duplicateName: "{{name}} est saisi plusieurs fois",
+        },
+      },
      passwordVisibility: {
        show: "Afficher le mot de passe",
        hide: "Masquer le mot de passe",
@@ -1440,6 +1440,19 @@ export const ja: TranslationResources = {
        show: "詳細設定を表示",
        hide: "詳細設定を非表示",
      },
+      headers: {
+        title: "カスタムヘッダー",
+        add: "ヘッダーを追加",
+        name: "名前",
+        value: "値",
+        remove: "ヘッダーを削除",
+        errors: {
+          missingName: "各ヘッダーの名前を入力してください",
+          invalidName: "{{name}} は有効なヘッダー名ではありません",
+          invalidValue: "{{name}} に無効な改行が含まれています",
+          duplicateName: "{{name}} が複数回入力されています",
+        },
+      },
      passwordVisibility: {
        show: "パスワードを表示",
        hide: "パスワードを非表示",
@@ -1436,6 +1436,19 @@ export const ko: TranslationResources = {
        show: "고급 표시",
        hide: "고급 숨기기",
      },
+      headers: {
+        title: "사용자 지정 헤더",
+        add: "헤더 추가",
+        name: "이름",
+        value: "값",
+        remove: "헤더 삭제",
+        errors: {
+          missingName: "각 헤더의 이름을 입력하세요",
+          invalidName: "{{name}}은(는) 올바른 헤더 이름이 아닙니다",
+          invalidValue: "{{name}}에 잘못된 줄바꿈이 있습니다",
+          duplicateName: "{{name}}이(가) 두 번 이상 입력되었습니다",
+        },
+      },
      passwordVisibility: {
        show: "비밀번호 표시",
        hide: "비밀번호 숨기기",
@@ -1453,6 +1453,19 @@ export const ptBR: TranslationResources = {
        show: "Mostrar avançado",
        hide: "Ocultar avançado",
      },
+      headers: {
+        title: "Cabeçalhos personalizados",
+        add: "Adicionar cabeçalho",
+        name: "Nome",
+        value: "Valor",
+        remove: "Remover cabeçalho",
+        errors: {
+          missingName: "Digite um nome para cada cabeçalho",
+          invalidName: "{{name}} não é um nome de cabeçalho válido",
+          invalidValue: "{{name}} contém uma quebra de linha inválida",
+          duplicateName: "{{name}} foi inserido mais de uma vez",
+        },
+      },
      passwordVisibility: {
        show: "Mostrar senha",
        hide: "Ocultar senha",
@@ -1458,6 +1458,19 @@ export const ru: TranslationResources = {
        show: "Показать расширенные",
        hide: "Скрыть расширенные",
      },
+      headers: {
+        title: "Пользовательские заголовки",
+        add: "Добавить заголовок",
+        name: "Имя",
+        value: "Значение",
+        remove: "Удалить заголовок",
+        errors: {
+          missingName: "Введите имя для каждого заголовка",
+          invalidName: "{{name}} — недопустимое имя заголовка",
+          invalidValue: "{{name}} содержит недопустимый перенос строки",
+          duplicateName: "{{name}} введён несколько раз",
+        },
+      },
      passwordVisibility: {
        show: "Показать пароль",
        hide: "Скрыть пароль",
@@ -1409,6 +1409,19 @@ export const zhCN: TranslationResources = {
        show: "显示高级选项",
        hide: "隐藏高级选项",
      },
+      headers: {
+        title: "自定义请求头",
+        add: "添加请求头",
+        name: "名称",
+        value: "值",
+        remove: "删除请求头",
+        errors: {
+          missingName: "请为每个请求头输入名称",
+          invalidName: "{{name}} 不是有效的请求头名称",
+          invalidValue: "{{name}} 包含无效换行符",
+          duplicateName: "{{name}} 输入了多次",
+        },
+      },
      passwordVisibility: {
        show: "显示密码",
        hide: "隐藏密码",
@@ -1,5 +1,4 @@
 import { describe, expect, it, vi } from "vitest";
-import { formatShortcut } from "@/utils/format-shortcut";
 import {
  buildKeyboardShortcutHelpSections,
  buildEffectiveBindings,
@@ -646,11 +645,7 @@ describe("keyboard-shortcut help sections", () => {
        "workspace-tab-new": ["mod", "T"],
        "workspace-jump-index": ["mod", "1-9"],
        "workspace-tab-jump-index": ["mod", "alt", "1-9"],
-        // Derived from `combo: "Cmd+W"`, so the token is `mod` where the row
-        // used to be hand-authored as `meta`. This binding is mac-only and
-        // `formatShortcut` renders both as ⌘, so the badge is unchanged — see
-        // the render assertion below.
-        "workspace-tab-close-current": ["mod", "W"],
+        "workspace-tab-close-current": ["meta", "W"],
        "workspace-pane-split-right": ["mod", "\\"],
        "workspace-pane-close": ["mod", "shift", "W"],
      },
@@ -664,15 +659,11 @@ describe("keyboard-shortcut help sections", () => {
      },
    },
    {
-      name: "uses ctrl+b for the left sidebar and ctrl+period for both sidebars on non-mac",
+      name: "uses mod+b for the left sidebar and mod+period for both sidebars on non-mac",
      context: { isMac: false, isDesktop: false },
-      // Derived from `combo: "Ctrl+B"` / `"Ctrl+."`, so the token is `ctrl` where
-      // these rows used to be hand-authored as `mod`. Both bindings are non-mac
-      // only and `formatShortcut` labels either token "Ctrl" there, so the badge
-      // is unchanged — see the render assertion below.
      expectedKeys: {
-        "toggle-left-sidebar": ["ctrl", "B"],
-        "toggle-both-sidebars": ["ctrl", "."],
+        "toggle-left-sidebar": ["mod", "B"],
+        "toggle-both-sidebars": ["mod", "."],
      },
    },
  ];
@@ -681,104 +672,10 @@ describe("keyboard-shortcut help sections", () => {
    const sections = buildKeyboardShortcutHelpSections(context);

    for (const [id, keys] of Object.entries(expectedKeys)) {
-      expect(findRow(sections, id)?.chord).toEqual([keys]);
+      expect(findRow(sections, id)?.keys).toEqual(keys);
    }
  });

-  describe("rows derive their keys from the binding that fires", () => {
-    const macDesktop = { isMac: true, isDesktop: true };
-    const NEW_WORKSPACE_BINDING = "workspace-new-cmd-n-mac";
-    const MAC_INDEX_BINDING = "workspace-navigate-index-cmd-digit-mac";
-    const PANE_FOCUS_LEFT_BINDING = "workspace-pane-focus-left-cmd-shift-left";
-    const SHOW_SHORTCUTS_BINDING = "shortcuts-dialog-toggle-question-mark";
-
-    function rowChord(overrides: ShortcutOverrides, id: string) {
-      const sections = buildKeyboardShortcutHelpSections(
-        macDesktop,
-        buildEffectiveBindings(overrides),
-      );
-      return findRow(sections, id)?.chord ?? null;
-    }
-
-    // The reported bug: the cheat sheet advertised the shipped default no matter
-    // what the user had rebound the shortcut to.
-    it("shows the override, not the shipped default", () => {
-      expect(rowChord({}, "new-workspace")).toEqual([["mod", "N"]]);
-      expect(rowChord({ [NEW_WORKSPACE_BINDING]: "Cmd+Shift+K" }, "new-workspace")).toEqual([
-        ["mod", "shift", "K"],
-      ]);
-    });
-
-    it("shows every step of a multi-step chord override", () => {
-      expect(rowChord({ [NEW_WORKSPACE_BINDING]: "Cmd+K Cmd+N" }, "new-workspace")).toEqual([
-        ["mod", "K"],
-        ["mod", "N"],
-      ]);
-    });
-
-    it("reports an unassigned row as having no keys at all", () => {
-      expect(rowChord({ [NEW_WORKSPACE_BINDING]: UNASSIGNED_COMBO }, "new-workspace")).toBeNull();
-    });
-
-    it("returns to the shipped default once the override is cleared", () => {
-      expect(rowChord({ [NEW_WORKSPACE_BINDING]: "Cmd+Shift+K" }, "new-workspace")).toEqual([
-        ["mod", "shift", "K"],
-      ]);
-      expect(rowChord({}, "new-workspace")).toEqual([["mod", "N"]]);
-    });
-
-    // An arrow override used to render as the raw `ARROWLEFT` code, because the
-    // display path uppercased key names past the table that maps them to arrows.
-    it("renders an arrow override as an arrow", () => {
-      const chord = rowChord(
-        { [PANE_FOCUS_LEFT_BINDING]: "Cmd+Alt+ArrowLeft" },
-        "workspace-pane-focus-left",
-      );
-      expect(chord).toEqual([["mod", "alt", "Left"]]);
-      expect(formatShortcut(chord?.[0] ?? [], "mac")).toBe("⌥⌘←");
-    });
-
-    // `1-9` and `?` are display-only tokens no combo string can spell, so these
-    // two rows opt out of default derivation via `help.defaultDisplayKeys`.
-    it("keeps the wildcard token on the index-jump row", () => {
-      expect(rowChord({}, "workspace-jump-index")).toEqual([["mod", "1-9"]]);
-    });
-
-    it("keeps the bare ? on the show-shortcuts row rather than deriving Shift+?", () => {
-      expect(rowChord({}, "show-shortcuts")).toEqual([["?"]]);
-    });
-
-    it("replaces the default-only wildcard when the index jump is rebound", () => {
-      expect(rowChord({ [MAC_INDEX_BINDING]: "Ctrl+Digit" }, "workspace-jump-index")).toEqual([
-        ["ctrl", "Digit"],
-      ]);
-    });
-
-    it("replaces the default-only ? when show shortcuts is rebound", () => {
-      expect(rowChord({ [SHOW_SHORTCUTS_BINDING]: "Cmd+K" }, "show-shortcuts")).toEqual([
-        ["mod", "K"],
-      ]);
-    });
-
-    // The authored row said `meta`, the derived row says `mod`. Both render ⌘ on
-    // mac and this binding is mac-only, so nothing the user sees moved.
-    it("still renders close-tab as ⌘W after switching to the derived token", () => {
-      const sections = buildKeyboardShortcutHelpSections(macDesktop);
-      const chord = findRow(sections, "workspace-tab-close-current")?.chord;
-      expect(formatShortcut(chord?.[0] ?? [], "mac")).toBe("⌘W");
-    });
-
-    // Same story on the other side: these rows said `mod`, the non-mac combos
-    // say `Ctrl`, and non-mac labels both as "Ctrl".
-    it("still renders the sidebar toggles as Ctrl+B and Ctrl+. on non-mac", () => {
-      const sections = buildKeyboardShortcutHelpSections({ isMac: false, isDesktop: false });
-      const left = findRow(sections, "toggle-left-sidebar")?.chord;
-      const both = findRow(sections, "toggle-both-sidebars")?.chord;
-      expect(formatShortcut(left?.[0] ?? [], "non-mac")).toBe("Ctrl+B");
-      expect(formatShortcut(both?.[0] ?? [], "non-mac")).toBe("Ctrl+.");
-    });
-  });
-
  it("returns stable i18n keys for section titles and help rows", () => {
    const sections = buildKeyboardShortcutHelpSections({ isMac: true, isDesktop: true });
    const projects = sections.find((section) => section.id === "projects");
@@ -992,12 +889,9 @@ describe("unassigned shortcuts", () => {
  });

  describe("resolveShortcutKeysForAction", () => {
-    // `ctrl`, not `mod`: these keys are derived from the non-mac binding's
-    // `combo: "Ctrl+T"` rather than hand-authored. `formatShortcut` labels both
-    // tokens "Ctrl" off mac, and this binding is non-mac only.
    it("returns the default keys when there is no override", () => {
      expect(resolveShortcutKeysForAction("workspace-tab-new", {}, desktopNonMac)).toEqual([
-        ["ctrl", "T"],
+        ["mod", "T"],
      ]);
    });

@@ -1030,13 +924,13 @@ describe("unassigned shortcuts", () => {
          { [TAB_NEW_BINDING]: "Ctrl+Nonsense" },
          desktopNonMac,
        ),
-      ).toEqual([["ctrl", "T"]]);
+      ).toEqual([["mod", "T"]]);
    });

    it("falls back to the default keys for a non-string stored value", () => {
      const overrides = { [TAB_NEW_BINDING]: 42 } as unknown as ShortcutOverrides;
      expect(resolveShortcutKeysForAction("workspace-tab-new", overrides, desktopNonMac)).toEqual([
-        ["ctrl", "T"],
+        ["mod", "T"],
      ]);
    });

@@ -1050,7 +944,7 @@ describe("unassigned shortcuts", () => {
      const bindings = buildEffectiveBindings({ [TAB_NEW_BINDING]: UNASSIGNED_COMBO });
      const sections = buildKeyboardShortcutHelpSections(desktopNonMac, bindings);

-      expect(findRow(sections, "workspace-tab-new")?.chord).toBeNull();
+      expect(findRow(sections, "workspace-tab-new")?.keys).toEqual([]);
    });

    it("keeps the row so the shortcut stays rebindable", () => {
@@ -1064,14 +958,15 @@ describe("unassigned shortcuts", () => {
    it("still lists the default keys when nothing is overridden", () => {
      const sections = buildKeyboardShortcutHelpSections(desktopNonMac);

-      expect(findRow(sections, "workspace-tab-new")?.chord).toEqual([["ctrl", "T"]]);
-      expect(getDefaultKeysForAction("workspace-tab-new", desktopNonMac)).toEqual([["ctrl", "T"]]);
+      expect(findRow(sections, "workspace-tab-new")?.keys).toEqual(["mod", "T"]);
+      expect(getDefaultKeysForAction("workspace-tab-new", desktopNonMac)).toEqual(["mod", "T"]);
    });

    // A binding authored with `combo: ""` has no default. The settings row uses
    // this to hide Reset, which would otherwise be a dead button landing on the
-    // same "Not set" state Clear already produced. The empty parsed chord is what
-    // marks the binding default-less.
+    // same "Not set" state Clear already produced. `help.keys` stays populated
+    // on purpose: it is hand-authored, so the empty parsed chord alone has to be
+    // what marks the binding default-less.
    it("reports no default keys for a binding that ships without a combo", () => {
      const bindings = withoutDefaultCombo("workspace-tab-new");

@@ -1082,7 +977,7 @@ describe("unassigned shortcuts", () => {
      const bindings = withoutDefaultCombo("workspace-tab-new");
      const sections = buildKeyboardShortcutHelpSections(desktopNonMac, bindings);

-      expect(findRow(sections, "workspace-tab-new")?.chord).toBeNull();
+      expect(findRow(sections, "workspace-tab-new")?.keys).toEqual([]);
    });
  });
 });
@@ -43,8 +43,7 @@ export interface KeyboardShortcutHelpRow {
  id: string;
  label: string;
  labelKey: string;
-  /** The keys that actually fire this action, or `null` when it has none. */
-  chord: ShortcutKey[][] | null;
+  keys: ShortcutKey[];
  note?: string;
  noteKey?: string;
 }
@@ -89,14 +88,7 @@ interface ShortcutHelp {
  id: string;
  section: ShortcutSectionId;
  label: string;
-  /**
-   * Display keys to show instead of the combo. Set this only when the combo
-   * cannot express what the row means — the `Digit` wildcard, which stands for
-   * any of 1-9, and `Shift+?`, whose Shift is implied by the character itself.
-   * Every other row derives its keys from `combo`, so a rebound shortcut shows
-   * what it now does rather than what it shipped as.
-   */
-  defaultDisplayKeys?: ShortcutKey[];
+  keys: ShortcutKey[];
  note?: string;
 }

@@ -202,6 +194,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "new-agent",
      section: "projects",
      label: "Open project",
+      keys: ["mod", "O"],
    },
  },
  {
@@ -213,6 +206,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "new-agent",
      section: "projects",
      label: "Open project",
+      keys: ["mod", "O"],
    },
  },

@@ -226,6 +220,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "new-workspace",
      section: "projects",
      label: "New workspace",
+      keys: ["mod", "N"],
    },
  },
  {
@@ -237,6 +232,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "new-workspace",
      section: "projects",
      label: "New workspace",
+      keys: ["mod", "N"],
    },
  },

@@ -250,6 +246,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "switch-project",
      section: "projects",
      label: "Switch project",
+      keys: ["mod", "P"],
    },
  },
  {
@@ -261,6 +258,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "switch-project",
      section: "projects",
      label: "Switch project",
+      keys: ["mod", "P"],
    },
  },

@@ -276,6 +274,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "archive-workspace",
      section: "projects",
      label: "Archive workspace",
+      keys: ["mod", "shift", "Backspace"],
    },
  },
  {
@@ -289,6 +288,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "archive-workspace",
      section: "projects",
      label: "Archive workspace",
+      keys: ["mod", "shift", "Backspace"],
    },
  },

@@ -302,6 +302,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "pin-workspace",
      section: "projects",
      label: "Pin chat",
+      keys: ["mod", "shift", "P"],
    },
  },
  {
@@ -313,6 +314,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "pin-workspace",
      section: "projects",
      label: "Pin chat",
+      keys: ["mod", "shift", "P"],
    },
  },

@@ -326,6 +328,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-tab-new",
      section: "tabs-panes",
      label: "New tab",
+      keys: ["mod", "T"],
    },
  },
  {
@@ -337,6 +340,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-tab-new",
      section: "tabs-panes",
      label: "New tab",
+      keys: ["mod", "T"],
    },
  },
  {
@@ -348,6 +352,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-tab-close-current",
      section: "tabs-panes",
      label: "Close current tab",
+      keys: ["meta", "W"],
    },
  },
  {
@@ -359,6 +364,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-tab-close-current",
      section: "tabs-panes",
      label: "Close current tab",
+      keys: ["ctrl", "W"],
    },
  },
  {
@@ -370,6 +376,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-tab-close-current",
      section: "tabs-panes",
      label: "Close current tab",
+      keys: ["alt", "shift", "W"],
    },
  },

@@ -384,7 +391,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-jump-index",
      section: "navigation",
      label: "Jump to workspace",
-      defaultDisplayKeys: ["mod", "1-9"],
+      keys: ["mod", "1-9"],
    },
  },
  {
@@ -397,7 +404,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-jump-index",
      section: "navigation",
      label: "Jump to workspace",
-      defaultDisplayKeys: ["mod", "1-9"],
+      keys: ["mod", "1-9"],
    },
  },
  {
@@ -410,7 +417,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-jump-index",
      section: "navigation",
      label: "Jump to workspace",
-      defaultDisplayKeys: ["alt", "1-9"],
+      keys: ["alt", "1-9"],
    },
  },

@@ -425,7 +432,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-tab-jump-index",
      section: "navigation",
      label: "Jump to tab",
-      defaultDisplayKeys: ["mod", "alt", "1-9"],
+      keys: ["mod", "alt", "1-9"],
    },
  },
  {
@@ -438,7 +445,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-tab-jump-index",
      section: "navigation",
      label: "Jump to tab",
-      defaultDisplayKeys: ["alt", "1-9"],
+      keys: ["alt", "1-9"],
    },
  },
  {
@@ -451,7 +458,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-tab-jump-index",
      section: "navigation",
      label: "Jump to tab",
-      defaultDisplayKeys: ["alt", "shift", "1-9"],
+      keys: ["alt", "shift", "1-9"],
    },
  },

@@ -466,6 +473,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-prev",
      section: "navigation",
      label: "Previous workspace",
+      keys: ["mod", "["],
    },
  },
  {
@@ -478,6 +486,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-prev",
      section: "navigation",
      label: "Previous workspace",
+      keys: ["mod", "["],
    },
  },
  {
@@ -490,6 +499,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-next",
      section: "navigation",
      label: "Next workspace",
+      keys: ["mod", "]"],
    },
  },
  {
@@ -502,6 +512,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-next",
      section: "navigation",
      label: "Next workspace",
+      keys: ["mod", "]"],
    },
  },
  {
@@ -514,6 +525,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-prev",
      section: "navigation",
      label: "Previous workspace",
+      keys: ["alt", "["],
    },
  },
  {
@@ -526,6 +538,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-next",
      section: "navigation",
      label: "Next workspace",
+      keys: ["alt", "]"],
    },
  },

@@ -540,6 +553,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-tab-prev",
      section: "navigation",
      label: "Previous tab",
+      keys: ["alt", "shift", "["],
    },
  },
  {
@@ -552,6 +566,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-tab-next",
      section: "navigation",
      label: "Next tab",
+      keys: ["alt", "shift", "]"],
    },
  },

@@ -565,6 +580,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-pane-split-right",
      section: "tabs-panes",
      label: "Split pane right",
+      keys: ["mod", "\\"],
    },
  },
  {
@@ -576,6 +592,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-pane-split-down",
      section: "tabs-panes",
      label: "Split pane down",
+      keys: ["mod", "shift", "\\"],
    },
  },
  {
@@ -587,6 +604,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-pane-focus-left",
      section: "tabs-panes",
      label: "Focus pane left",
+      keys: ["mod", "shift", "Left"],
    },
  },
  {
@@ -598,6 +616,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-pane-focus-right",
      section: "tabs-panes",
      label: "Focus pane right",
+      keys: ["mod", "shift", "Right"],
    },
  },
  {
@@ -609,6 +628,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-pane-focus-up",
      section: "tabs-panes",
      label: "Focus pane up",
+      keys: ["mod", "shift", "Up"],
    },
  },
  {
@@ -620,6 +640,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-pane-focus-down",
      section: "tabs-panes",
      label: "Focus pane down",
+      keys: ["mod", "shift", "Down"],
    },
  },
  {
@@ -631,6 +652,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-pane-move-tab-left",
      section: "tabs-panes",
      label: "Move tab left",
+      keys: ["mod", "shift", "alt", "Left"],
    },
  },
  {
@@ -642,6 +664,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-pane-move-tab-right",
      section: "tabs-panes",
      label: "Move tab right",
+      keys: ["mod", "shift", "alt", "Right"],
    },
  },
  {
@@ -653,6 +676,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-pane-move-tab-up",
      section: "tabs-panes",
      label: "Move tab up",
+      keys: ["mod", "shift", "alt", "Up"],
    },
  },
  {
@@ -664,6 +688,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-pane-move-tab-down",
      section: "tabs-panes",
      label: "Move tab down",
+      keys: ["mod", "shift", "alt", "Down"],
    },
  },
  {
@@ -675,6 +700,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-pane-close",
      section: "tabs-panes",
      label: "Close pane",
+      keys: ["mod", "shift", "W"],
    },
  },

@@ -688,6 +714,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-terminal-new",
      section: "panels",
      label: "New terminal",
+      keys: ["mod", "shift", "T"],
    },
  },
  {
@@ -699,6 +726,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "workspace-terminal-new",
      section: "panels",
      label: "New terminal",
+      keys: ["mod", "shift", "T"],
    },
  },

@@ -712,6 +740,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-command-center",
      section: "panels",
      label: "Toggle command center",
+      keys: ["mod", "K"],
    },
  },
  {
@@ -723,6 +752,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-command-center",
      section: "panels",
      label: "Toggle command center",
+      keys: ["mod", "K"],
    },
  },

@@ -737,7 +767,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "show-shortcuts",
      section: "panels",
      label: "Show keyboard shortcuts",
-      defaultDisplayKeys: ["?"],
+      keys: ["?"],
      note: "Available when focus is not in a text field or terminal.",
    },
  },
@@ -752,6 +782,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-left-sidebar",
      section: "panels",
      label: "Toggle left sidebar",
+      keys: ["mod", "B"],
    },
  },
  {
@@ -763,6 +794,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-left-sidebar",
      section: "panels",
      label: "Toggle left sidebar",
+      keys: ["mod", "B"],
    },
  },
  {
@@ -774,6 +806,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-right-sidebar",
      section: "panels",
      label: "Toggle right sidebar",
+      keys: ["mod", "E"],
    },
  },
  {
@@ -785,6 +818,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-right-sidebar",
      section: "panels",
      label: "Toggle right sidebar",
+      keys: ["mod", "E"],
    },
  },
  {
@@ -804,6 +838,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-both-sidebars",
      section: "panels",
      label: "Toggle both sidebars",
+      keys: ["mod", "."],
    },
  },
  {
@@ -815,6 +850,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-both-sidebars",
      section: "panels",
      label: "Toggle both sidebars",
+      keys: ["mod", "."],
    },
  },

@@ -828,6 +864,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-settings",
      section: "panels",
      label: "Toggle settings",
+      keys: ["mod", ","],
    },
  },
  {
@@ -839,6 +876,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-settings",
      section: "panels",
      label: "Toggle settings",
+      keys: ["mod", ","],
    },
  },

@@ -852,6 +890,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-focus",
      section: "panels",
      label: "Toggle focus mode",
+      keys: ["mod", "shift", "F"],
    },
  },
  {
@@ -863,6 +902,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "toggle-focus",
      section: "panels",
      label: "Toggle focus mode",
+      keys: ["mod", "shift", "F"],
    },
  },

@@ -876,6 +916,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "cycle-theme",
      section: "panels",
      label: "Cycle theme",
+      keys: ["mod", "alt", "T"],
    },
  },
  {
@@ -887,6 +928,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "cycle-theme",
      section: "panels",
      label: "Cycle theme",
+      keys: ["mod", "alt", "T"],
    },
  },

@@ -901,6 +943,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "focus-message-input",
      section: "agent-input",
      label: "Focus message input",
+      keys: ["mod", "L"],
    },
  },
  {
@@ -913,6 +956,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "focus-message-input",
      section: "agent-input",
      label: "Focus message input",
+      keys: ["mod", "L"],
    },
  },
  {
@@ -926,6 +970,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "cycle-agent-mode",
      section: "agent-input",
      label: "Cycle agent mode",
+      keys: ["shift", "Tab"],
    },
  },
  {
@@ -939,6 +984,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "voice-toggle",
      section: "agent-input",
      label: "Toggle voice mode",
+      keys: ["mod", "shift", "D"],
    },
  },
  {
@@ -952,6 +998,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "voice-toggle",
      section: "agent-input",
      label: "Toggle voice mode",
+      keys: ["mod", "shift", "D"],
    },
  },
  {
@@ -964,6 +1011,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "dictation-toggle",
      section: "agent-input",
      label: "Start/stop dictation",
+      keys: ["mod", "D"],
    },
  },
  {
@@ -976,6 +1024,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "dictation-toggle",
      section: "agent-input",
      label: "Start/stop dictation",
+      keys: ["mod", "D"],
    },
  },
  {
@@ -989,6 +1038,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "agent-interrupt",
      section: "agent-input",
      label: "Interrupt agent",
+      keys: ["Esc"],
    },
  },
  {
@@ -1010,6 +1060,7 @@ const SHORTCUT_BINDINGS: readonly ShortcutBinding[] = [
      id: "voice-mute-toggle",
      section: "agent-input",
      label: "Mute/unmute voice mode",
+      keys: ["Space"],
    },
  },
 ];
@@ -1072,11 +1123,7 @@ export function buildEffectiveBindings(overrides: ShortcutOverrides): ParsedShor
    if (binding.repeat === false && lastCombo) {
      lastCombo.repeat = false;
    }
-    if (!binding.help?.defaultDisplayKeys) {
-      return { ...binding, combo: override, parsedChord };
-    }
-    const { defaultDisplayKeys: _defaultDisplayKeys, ...help } = binding.help;
-    return { ...binding, combo: override, parsedChord, help };
+    return { ...binding, combo: override, parsedChord };
  });
 }

@@ -1375,33 +1422,11 @@ export function getBindingIdForAction(
  return null;
 }

-/**
- * The keys to display for one binding, derived from the combo that actually
- * fires so a rebound shortcut never advertises the keys it shipped with.
- *
- * `help.defaultDisplayKeys` wins where it is set, but only on the shipped
- * binding. Effective bindings discard it when an override replaces the combo,
- * so rebound rows still derive the keys that now fire.
- * `parsedChord` is the single source of truth for "has no keys": it is derived
- * from `combo`, so it covers both a user-unassigned shortcut and a binding
- * authored without a default.
- */
-function displayChordForBinding(binding: ParsedShortcutBinding): ShortcutKey[][] | null {
-  if (binding.parsedChord.length === 0) {
-    return null;
-  }
-  const displayKeys = binding.help?.defaultDisplayKeys;
-  if (displayKeys) {
-    return [displayKeys];
-  }
-  return chordStringToShortcutKeys(binding.combo);
-}
-
 export function getDefaultKeysForAction(
  actionId: string,
  platform: { isMac: boolean; isDesktop: boolean },
  bindings: readonly ParsedShortcutBinding[] = DEFAULT_BINDINGS,
-): ShortcutKey[][] | null {
+): ShortcutKey[] | null {
  for (const binding of bindings) {
    if (binding.help?.id !== actionId) {
      continue;
@@ -1409,7 +1434,13 @@ export function getDefaultKeysForAction(
    if (!helpMatchesPlatform(binding.when, platform)) {
      continue;
    }
-    return displayChordForBinding(binding);
+    // `help.keys` is hand-authored, so it cannot be trusted to be empty for a
+    // binding that ships without a default combo. The parsed chord is derived
+    // from `combo`, so it is the single source of truth for "has no keys".
+    if (binding.parsedChord.length === 0) {
+      return null;
+    }
+    return binding.help.keys;
  }
  return null;
 }
@@ -1433,7 +1464,8 @@ export function resolveShortcutKeysForAction(
    return null;
  }

-  const defaultChord = getDefaultKeysForAction(actionId, platform);
+  const defaultKeys = getDefaultKeysForAction(actionId, platform);
+  const defaultChord = defaultKeys ? [defaultKeys] : null;

  const override = overrides[bindingId];
  if (override === UNASSIGNED_COMBO || override === "") {
@@ -1534,7 +1566,8 @@ export function buildKeyboardShortcutHelpSections(
      id: help.id,
      label: help.label,
      labelKey: SHORTCUT_HELP_LABEL_KEYS[help.id] ?? help.label,
-      chord: displayChordForBinding(binding),
+      // An empty chord has no keys to show, whatever `help.keys` was authored as.
+      keys: binding.parsedChord.length === 0 ? [] : help.keys,
      ...(help.note ? { note: help.note } : {}),
      ...(SHORTCUT_HELP_NOTE_KEYS[help.id] ? { noteKey: SHORTCUT_HELP_NOTE_KEYS[help.id] } : {}),
    });
@@ -1,113 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  buildEffectiveBindings,
-  buildKeyboardShortcutHelpSections,
-  UNASSIGNED_COMBO,
-  type ShortcutOverrides,
-} from "./keyboard-shortcuts";
-import { filterShortcutHelpSections, shortcutSearchText } from "./shortcut-help-search";
-
-const MAC_DESKTOP = { isMac: true, isDesktop: true };
-const NEW_WORKSPACE_BINDING = "workspace-new-cmd-n-mac";
-
-/**
- * The i18n port, filled with the real English strings the rows use. Translation
- * is the only dependency the filter cannot compute, so it is injected rather
- * than mocked.
- */
-const EN: Record<string, string> = {
-  "settings.shortcuts.sections.projects": "Projects",
-  "settings.shortcuts.help.newWorkspace": "New workspace",
-  "settings.shortcuts.help.openProject": "Open project",
-};
-
-function translate(key: string): string {
-  return EN[key] ?? key;
-}
-
-function filter(query: string, overrides: ShortcutOverrides = {}) {
-  return filterShortcutHelpSections({
-    sections: buildKeyboardShortcutHelpSections(MAC_DESKTOP, buildEffectiveBindings(overrides)),
-    query,
-    translate,
-    shortcutOs: "mac",
-  });
-}
-
-function matchedRowIds(query: string, overrides: ShortcutOverrides = {}): string[] {
-  return filter(query, overrides).flatMap((section) => section.rows.map((row) => row.id));
-}
-
-describe("shortcutSearchText", () => {
-  it("covers the tokens, the rendered badge, and the modifier aliases", () => {
-    const text = shortcutSearchText([["mod", "N"]], "mac");
-
-    expect(text).toContain("mod N");
-    expect(text).toContain("⌘N");
-    expect(text).toContain("cmd+N");
-    expect(text).toContain("command+N");
-  });
-
-  // The alias expansion is combinatorial, so a flattened chord would multiply
-  // the two combos together and invent spellings for keys never pressed at once.
-  it("keeps a multi-step chord's combos apart", () => {
-    const text = shortcutSearchText(
-      [
-        ["mod", "K"],
-        ["mod", "N"],
-      ],
-      "mac",
-    );
-
-    expect(text).toContain("cmd+K");
-    expect(text).toContain("cmd+N");
-    expect(text).not.toContain("cmd+K+cmd+N");
-  });
-});
-
-describe("filterShortcutHelpSections", () => {
-  it("returns every section for a blank query", () => {
-    expect(filter("  ")).toHaveLength(buildKeyboardShortcutHelpSections(MAC_DESKTOP).length);
-  });
-
-  it("matches a row by its label", () => {
-    expect(matchedRowIds("new workspace")).toContain("new-workspace");
-  });
-
-  it("matches a row by the rendered badge", () => {
-    expect(matchedRowIds("⌘n")).toContain("new-workspace");
-  });
-
-  it("matches a row by a spelled-out modifier", () => {
-    expect(matchedRowIds("command+n")).toContain("new-workspace");
-  });
-
-  // The reported bug, from the search side: the cheat sheet has to stop finding
-  // a row by keys the user has rebound away from.
-  it("finds a rebound row by its new keys and not by the superseded default", () => {
-    const overrides = { [NEW_WORKSPACE_BINDING]: "Cmd+Shift+K" };
-
-    expect(matchedRowIds("cmd+shift+k", overrides)).toContain("new-workspace");
-    expect(matchedRowIds("cmd+n", overrides)).not.toContain("new-workspace");
-  });
-
-  it("still finds an unassigned row by its label", () => {
-    const overrides = { [NEW_WORKSPACE_BINDING]: UNASSIGNED_COMBO };
-
-    expect(matchedRowIds("new workspace", overrides)).toContain("new-workspace");
-    expect(matchedRowIds("cmd+n", overrides)).not.toContain("new-workspace");
-  });
-
-  it("keeps every row of a section whose own title matches", () => {
-    const projects = filter("projects").find((section) => section.id === "projects");
-    const allProjects = buildKeyboardShortcutHelpSections(MAC_DESKTOP).find(
-      (section) => section.id === "projects",
-    );
-
-    expect(projects?.rows).toHaveLength(allProjects?.rows.length ?? 0);
-  });
-
-  it("drops a section whose rows all miss", () => {
-    expect(filter("no shortcut spells this")).toEqual([]);
-  });
-});
@@ -1,90 +0,0 @@
-import type { KeyboardShortcutHelpSection } from "@/keyboard/keyboard-shortcuts";
-import { formatShortcut, type ShortcutKey, type ShortcutOs } from "@/utils/format-shortcut";
-
-/** Resolves an i18n key to display text. The caller's `t`, injected. */
-export type TranslateHelpKey = (key: string) => string;
-
-/**
- * Alternative spellings for one combo, so searching "cmd k" and "command+k" both
- * find ⌘K. The modifier a user types rarely matches the token the binding
- * stores, and never matches the symbol the badge renders.
- */
-export function shortcutSearchAliases(
-  keys: readonly ShortcutKey[],
-  shortcutOs: ShortcutOs,
-): string {
-  const aliases = keys.map((key) => {
-    if (shortcutOs === "mac") {
-      if (key === "mod" || key === "meta") return ["cmd", "command"];
-      if (key === "alt") return ["alt", "option"];
-    } else {
-      if (key === "mod" || key === "ctrl") return ["ctrl", "control"];
-      if (key === "meta") return ["win", "windows"];
-    }
-    return [key];
-  });
-  const combinations = aliases.reduce<string[][]>(
-    (prefixes, choices) =>
-      prefixes.flatMap((prefix) => choices.map((choice) => [...prefix, choice])),
-    [[]],
-  );
-  return combinations
-    .flatMap((combination) => [combination.join(" "), combination.join("+")])
-    .join(" ");
-}
-
-/**
- * Search text for one row's keys. Built per combo and joined, never over a
- * flattened chord: the alias expansion is combinatorial, so flattening a
- * multi-step chord into one key list both explodes the combination count and
- * invents aliases for combos the user never has to press together.
- */
-export function shortcutSearchText(chord: ShortcutKey[][], shortcutOs: ShortcutOs): string {
-  return chord
-    .flatMap((combo) => [
-      combo.join(" "),
-      formatShortcut(combo, shortcutOs),
-      shortcutSearchAliases(combo, shortcutOs),
-    ])
-    .join(" ");
-}
-
-/**
- * The cheat sheet's sections narrowed to a query, matching on the row's label,
- * its note, and every spelling of the keys that actually fire it. A section
- * whose own title matches keeps all of its rows.
- */
-export function filterShortcutHelpSections({
-  sections,
-  query,
-  translate,
-  shortcutOs,
-}: {
-  sections: readonly KeyboardShortcutHelpSection[];
-  query: string;
-  translate: TranslateHelpKey;
-  shortcutOs: ShortcutOs;
-}): KeyboardShortcutHelpSection[] {
-  const normalizedQuery = query.trim().toLocaleLowerCase();
-  if (!normalizedQuery) return [...sections];
-
-  return sections.flatMap((section) => {
-    if (translate(section.titleKey).toLocaleLowerCase().includes(normalizedQuery)) {
-      return [section];
-    }
-
-    const rows = section.rows.filter((row) => {
-      const searchText = [
-        translate(row.labelKey),
-        row.noteKey ? translate(row.noteKey) : row.note,
-        row.chord ? shortcutSearchText(row.chord, shortcutOs) : null,
-      ]
-        .filter(Boolean)
-        .join(" ")
-        .toLocaleLowerCase();
-      return searchText.includes(normalizedQuery);
-    });
-
-    return rows.length > 0 ? [{ ...section, rows }] : [];
-  });
-}
@@ -1,11 +1,8 @@
 import { describe, expect, it } from "vitest";
-import { formatShortcut } from "@/utils/format-shortcut";
 import {
-  comboStringToShortcutKeys,
  keyComboToString,
  keyboardEventToComboString,
  parseShortcutString,
-  SHORTCUT_KEY_NAMES,
 } from "./shortcut-string";

 function keyboardEvent(overrides: Partial<KeyboardEvent>): KeyboardEvent {
@@ -71,40 +68,3 @@ describe("parseShortcutString round-trips punctuation keys", () => {
    expect(keyComboToString(combo)).toBe("Cmd+-");
  });
 });
-
-describe("comboStringToShortcutKeys", () => {
-  it("maps every modifier spelling onto its display token", () => {
-    expect(comboStringToShortcutKeys("Cmd+Ctrl+Alt+Shift+K")).toEqual([
-      "mod",
-      "ctrl",
-      "alt",
-      "shift",
-      "K",
-    ]);
-    // `parseShortcutString` accepts `Mod` as well, so the display path has to.
-    expect(comboStringToShortcutKeys("Mod+K")).toEqual(["mod", "K"]);
-  });
-
-  it("hands named keys to the display table under the names it uses", () => {
-    expect(comboStringToShortcutKeys("Cmd+Shift+ArrowLeft")).toEqual(["mod", "shift", "Left"]);
-    expect(formatShortcut(comboStringToShortcutKeys("Cmd+Shift+ArrowLeft"), "mac")).toBe(
-      "Shift+⌘+←",
-    );
-    expect(formatShortcut(comboStringToShortcutKeys("Escape"), "mac")).toBe("Esc");
-    expect(formatShortcut(comboStringToShortcutKeys("Backspace"), "mac")).toBe("⌫");
-  });
-
-  // The whole class, not just the arrows: uppercasing key names used to push
-  // every multi-character name past `KEY_DISPLAY`, so an override on one of them
-  // rendered as a shouty raw code — `ARROWLEFT`, `ESCAPE`, `PAGEDOWN`.
-  it("never emits a shouty raw code for any key the capture path can produce", () => {
-    for (const name of SHORTCUT_KEY_NAMES) {
-      // `F1` and the digits are already all-caps, so only names that contain a
-      // lowercase letter can exhibit the bug.
-      if (name === name.toUpperCase()) continue;
-      const [key] = comboStringToShortcutKeys(name);
-      const rendered = formatShortcut([key], "non-mac");
-      expect(rendered, `${name} renders as ${rendered}`).not.toBe(name.toUpperCase());
-    }
-  });
-});
@@ -74,13 +74,6 @@ for (let i = 1; i <= 12; i++) {
  KEY_MAP[`F${i}`] = { code: `F${i}` };
 }

-/**
- * Every key name a combo string can carry. Exported so the display path can be
- * driven over the whole vocabulary instead of a hand-copied sample that goes
- * stale the moment `KEY_MAP` gains an entry.
- */
-export const SHORTCUT_KEY_NAMES: readonly string[] = Object.keys(KEY_MAP);
-
 const CODE_TO_KEY: Record<string, string> = {};
 for (const [humanKey, mapping] of Object.entries(KEY_MAP)) {
  if (!CODE_TO_KEY[mapping.code]) {
@@ -184,21 +177,6 @@ const MODIFIER_CODES = new Set([
  "ShiftRight",
 ]);

-/**
- * Key names as combo strings spell them, mapped to the names `KEY_DISPLAY` in
- * `format-shortcut` is keyed on. The two vocabularies were never reconciled:
- * `keyboardEventToComboString` emits `ArrowLeft` and `Escape` (from `KEY_MAP`),
- * while the display table only knows `Left` and `Esc`. Without this bridge an
- * override on a named key renders as a raw code — `ARROWLEFT`, not `←`.
- */
-const DISPLAY_KEY_ALIASES: Record<string, string> = {
-  ArrowLeft: "Left",
-  ArrowRight: "Right",
-  ArrowUp: "Up",
-  ArrowDown: "Down",
-  Escape: "Esc",
-};
-
 export function comboStringToShortcutKeys(comboString: string): ShortcutKey[] {
  const parts = comboString.split("+");
  const keys: ShortcutKey[] = [];
@@ -207,11 +185,6 @@ export function comboStringToShortcutKeys(comboString: string): ShortcutKey[] {
      case "Cmd":
        keys.push("mod");
        break;
-      // `parseShortcutString` accepts `Mod`, so the display path has to as well
-      // or a combo it can match would render the literal word.
-      case "Mod":
-        keys.push("mod");
-        break;
      case "Ctrl":
        keys.push("ctrl");
        break;
@@ -222,10 +195,7 @@ export function comboStringToShortcutKeys(comboString: string): ShortcutKey[] {
        keys.push("shift");
        break;
      default:
-        // Pass the key through unchanged. `normalizeKey` already uppercases
-        // single characters, and uppercasing here is what used to push
-        // multi-character names past `KEY_DISPLAY` into raw output.
-        keys.push(DISPLAY_KEY_ALIASES[part] ?? part);
+        keys.push(part.toUpperCase());
        break;
    }
  }
@@ -0,0 +1,69 @@
+import { describe, expect, it } from "vitest";
+import {
+  createPluginResourceAttachment,
+  PluginResourceComposerAttachmentSchema,
+  pluginResourceAttachmentToAgentAttachment,
+  togglePluginResourceAttachment,
+} from "./model";
+import { splitComposerAttachmentsForSubmit } from "@/composer/attachments/submit";
+
+const source = {
+  pluginId: "linear",
+  sourceId: "issues",
+  sourceTitle: "Linear issue",
+  sourceIcon: "CircleDot",
+};
+
+const item = {
+  id: "issue-uuid",
+  identifier: "ENG-123",
+  title: "Plugin attachments",
+  subtitle: "In progress · Mohamed",
+  url: "https://linear.app/acme/issue/ENG-123/plugin-attachments",
+  text: "Linear issue ENG-123: Plugin attachments\nStatus: In progress",
+  resourceType: "issue",
+};
+
+describe("plugin resource attachments", () => {
+  it("creates a draft-safe composer attachment", () => {
+    const attachment = createPluginResourceAttachment(source, item);
+
+    expect(PluginResourceComposerAttachmentSchema.parse(attachment)).toEqual({
+      kind: "plugin_resource",
+      ...source,
+      item,
+    });
+  });
+
+  it("toggles one resource by plugin, source, and stable item id", () => {
+    const attachment = createPluginResourceAttachment(source, item);
+
+    expect(togglePluginResourceAttachment([], attachment)).toEqual([attachment]);
+    expect(togglePluginResourceAttachment([attachment], attachment)).toEqual([]);
+  });
+
+  it("submits through the backward-compatible text attachment", () => {
+    const attachment = createPluginResourceAttachment(source, item);
+
+    const agentAttachment = pluginResourceAttachmentToAgentAttachment(attachment);
+    expect(agentAttachment).toEqual({
+      type: "text",
+      mimeType: "text/plain",
+      title: "ENG-123 Plugin attachments",
+      text: item.text,
+      externalResource: {
+        provider: "linear",
+        providerLabel: "Linear issue",
+        resourceType: "issue",
+        id: "issue-uuid",
+        identifier: "ENG-123",
+        title: "Plugin attachments",
+        url: item.url,
+      },
+    });
+    expect(splitComposerAttachmentsForSubmit([attachment])).toEqual({
+      images: [],
+      attachments: [agentAttachment],
+    });
+  });
+});
@@ -0,0 +1,70 @@
+import { z } from "zod";
+import type { AgentAttachment } from "@getpaseo/protocol/messages";
+import type { UserComposerAttachment } from "@/attachments/types";
+import { PluginAttachmentItemSchema, type PluginAttachmentItem } from "./schema";
+
+export const PluginResourceComposerAttachmentSchema = z.object({
+  kind: z.literal("plugin_resource"),
+  pluginId: z.string().min(1),
+  sourceId: z.string().min(1),
+  sourceTitle: z.string().min(1),
+  sourceIcon: z.string().min(1),
+  item: PluginAttachmentItemSchema,
+});
+
+export type PluginResourceComposerAttachment = z.infer<
+  typeof PluginResourceComposerAttachmentSchema
+>;
+
+export interface PluginResourceSourceIdentity {
+  pluginId: string;
+  sourceId: string;
+  sourceTitle: string;
+  sourceIcon: string;
+}
+
+export function createPluginResourceAttachment(
+  source: PluginResourceSourceIdentity,
+  item: PluginAttachmentItem,
+): PluginResourceComposerAttachment {
+  return {
+    kind: "plugin_resource",
+    ...source,
+    item,
+  };
+}
+
+export function togglePluginResourceAttachment(
+  current: UserComposerAttachment[],
+  attachment: PluginResourceComposerAttachment,
+): UserComposerAttachment[] {
+  const matches = (candidate: UserComposerAttachment) =>
+    candidate.kind === "plugin_resource" &&
+    candidate.pluginId === attachment.pluginId &&
+    candidate.sourceId === attachment.sourceId &&
+    candidate.item.id === attachment.item.id;
+  if (current.some(matches)) {
+    return current.filter((candidate) => !matches(candidate));
+  }
+  return [...current, attachment];
+}
+
+export function pluginResourceAttachmentToAgentAttachment(
+  attachment: PluginResourceComposerAttachment,
+): AgentAttachment {
+  return {
+    type: "text",
+    mimeType: "text/plain",
+    title: `${attachment.item.identifier} ${attachment.item.title}`,
+    text: attachment.item.text,
+    externalResource: {
+      provider: attachment.pluginId,
+      providerLabel: attachment.sourceTitle,
+      resourceType: attachment.item.resourceType,
+      id: attachment.item.id,
+      identifier: attachment.item.identifier,
+      title: attachment.item.title,
+      url: attachment.item.url,
+    },
+  };
+}
@@ -0,0 +1,176 @@
+import { useCallback, useMemo, useState, type ReactElement, type RefObject } from "react";
+import { View } from "react-native";
+import { withUnistyles } from "react-native-unistyles";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import type { LucideIcon } from "lucide-react-native";
+import type { UserComposerAttachment } from "@/attachments/types";
+import type { AttachmentMenuItem } from "@/composer/input/input";
+import { Combobox, type ComboboxOption } from "@/components/ui/combobox";
+import { useFetchQuery } from "@/data/query";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
+import { resolvePluginIcon } from "../icons";
+import { useInstalledPlugins } from "../registry";
+import { searchPluginAttachments } from "../sdk";
+import type { InstalledPlugin, PluginAttachmentSourceContribution } from "../types";
+import { createPluginResourceAttachment, togglePluginResourceAttachment } from "./model";
+import type { PluginAttachmentItem } from "./schema";
+
+const SEARCH_STALE_TIME_MS = 30_000;
+const EMPTY_ATTACHMENT_ITEMS: PluginAttachmentItem[] = [];
+const iconColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+
+function SourceIcon({ Icon, color = "" }: { Icon: LucideIcon; color?: string }) {
+  return <Icon size={ICON_SIZE.md} color={color} />;
+}
+
+const ThemedSourceIcon = withUnistyles(SourceIcon);
+
+interface InstalledAttachmentSource {
+  plugin: InstalledPlugin;
+  source: PluginAttachmentSourceContribution;
+  key: string;
+}
+
+interface PluginAttachmentPickerInput {
+  serverId: string;
+  client: DaemonClient | null;
+  connected: boolean;
+  attachments: UserComposerAttachment[];
+  onChangeAttachments: (attachments: UserComposerAttachment[]) => void;
+  anchorRef: RefObject<View | null>;
+}
+
+interface PluginAttachmentPickerBinding {
+  menuItems: AttachmentMenuItem[];
+  picker: ReactElement | null;
+}
+
+function searchEmptyText(error: unknown, isFetching: boolean): string {
+  if (error instanceof Error) return error.message;
+  if (error) return String(error);
+  return isFetching ? "Searching..." : "No results";
+}
+
+function installedAttachmentSources(
+  plugins: InstalledPlugin[],
+  serverId: string,
+): InstalledAttachmentSource[] {
+  return plugins
+    .filter((plugin) => plugin.serverId === serverId)
+    .flatMap((plugin) =>
+      plugin.attachmentSources.map((source) => ({
+        plugin,
+        source,
+        key: `${plugin.id}/${source.id}`,
+      })),
+    );
+}
+
+function attachmentOptions(items: PluginAttachmentItem[]): ComboboxOption[] {
+  return items.map((item) => ({
+    id: item.id,
+    label: `${item.identifier} ${item.title}`,
+    description: item.subtitle,
+  }));
+}
+
+export function usePluginAttachmentPicker(
+  input: PluginAttachmentPickerInput,
+): PluginAttachmentPickerBinding {
+  const plugins = useInstalledPlugins();
+  const sources = useMemo(
+    () => installedAttachmentSources(plugins, input.serverId),
+    [input.serverId, plugins],
+  );
+  const [activeKey, setActiveKey] = useState<string | null>(null);
+  const [query, setQuery] = useState("");
+  const active = sources.find((candidate) => candidate.key === activeKey) ?? null;
+  const trimmedQuery = query.trim();
+  const search = useFetchQuery({
+    queryKey: [
+      "plugin-attachment-search",
+      input.serverId,
+      active?.plugin.id ?? "",
+      active?.source.id ?? "",
+      trimmedQuery,
+    ],
+    queryFn: async () => {
+      if (!input.client || !active) throw new Error("Plugin host is offline");
+      const client = input.client;
+      return searchPluginAttachments(
+        active.source,
+        (method, rpcInput) => client.invokePluginRpc(active.plugin.id, method, rpcInput),
+        trimmedQuery,
+      );
+    },
+    enabled: input.connected && active !== null,
+    dataShape: "list",
+    staleTimeMs: SEARCH_STALE_TIME_MS,
+  });
+  const items = search.error
+    ? EMPTY_ATTACHMENT_ITEMS
+    : (search.data?.items ?? EMPTY_ATTACHMENT_ITEMS);
+  const options = useMemo(() => attachmentOptions(items), [items]);
+  const close = useCallback(() => {
+    setActiveKey(null);
+    setQuery("");
+  }, []);
+  const handleOpenChange = useCallback(
+    (open: boolean) => {
+      if (!open) close();
+    },
+    [close],
+  );
+  const handleSelect = useCallback(
+    (itemId: string) => {
+      if (!active) return;
+      const item = items.find((candidate) => candidate.id === itemId);
+      if (!item) return;
+      const attachment = createPluginResourceAttachment(
+        {
+          pluginId: active.plugin.id,
+          sourceId: active.source.id,
+          sourceTitle: active.source.title,
+          sourceIcon: active.source.icon,
+        },
+        item,
+      );
+      input.onChangeAttachments(togglePluginResourceAttachment(input.attachments, attachment));
+      close();
+    },
+    [active, close, input, items],
+  );
+  const menuItems = useMemo(
+    () =>
+      sources.map(({ key, source }) => {
+        const Icon = resolvePluginIcon(source.icon);
+        return {
+          id: `plugin:${key}`,
+          label: `Attach ${source.title}`,
+          icon: <ThemedSourceIcon Icon={Icon} uniProps={iconColorMapping} />,
+          onSelect: () => setActiveKey(key),
+        };
+      }),
+    [sources],
+  );
+  if (!active) return { menuItems, picker: null };
+  return {
+    menuItems,
+    picker: (
+      <Combobox
+        options={options}
+        value=""
+        onSelect={handleSelect}
+        searchable
+        searchPlaceholder={active.source.searchPlaceholder}
+        title={active.source.pickerTitle}
+        open
+        onOpenChange={handleOpenChange}
+        onSearchQueryChange={setQuery}
+        desktopPlacement="top-start"
+        anchorRef={input.anchorRef}
+        emptyText={searchEmptyText(search.error, search.isFetching)}
+      />
+    ),
+  };
+}
@@ -0,0 +1,65 @@
+import { useCallback, useMemo } from "react";
+import { withUnistyles } from "react-native-unistyles";
+import { AttachmentLabel, AttachmentPill } from "@/components/attachment-pill";
+import type { ComposerAttachment } from "@/attachments/types";
+import { ICON_SIZE, type Theme } from "@/styles/theme";
+import { resolvePluginIcon } from "../icons";
+import type { PluginResourceComposerAttachment } from "./model";
+
+const iconColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+
+function ResourceIcon({
+  Icon,
+  color = "",
+}: {
+  Icon: ReturnType<typeof resolvePluginIcon>;
+  color?: string;
+}) {
+  return <Icon size={ICON_SIZE.sm} color={color} />;
+}
+
+const ThemedResourceIcon = withUnistyles(ResourceIcon);
+
+interface PluginResourceAttachmentPillProps {
+  attachment: PluginResourceComposerAttachment;
+  index: number;
+  disabled: boolean;
+  onOpen: (attachment: ComposerAttachment) => void;
+  onRemove: (index: number) => void;
+  openLabel: (kind: string, identifier: string) => string;
+  removeLabel: (kind: string, identifier: string) => string;
+}
+
+export function PluginResourceAttachmentPill({
+  attachment,
+  index,
+  disabled,
+  onOpen,
+  onRemove,
+  openLabel,
+  removeLabel,
+}: PluginResourceAttachmentPillProps) {
+  const Icon = resolvePluginIcon(attachment.sourceIcon);
+  const handleOpen = useCallback(() => onOpen(attachment), [attachment, onOpen]);
+  const handleRemove = useCallback(() => onRemove(index), [index, onRemove]);
+  const icon = useMemo(
+    () => <ThemedResourceIcon Icon={Icon} uniProps={iconColorMapping} />,
+    [Icon],
+  );
+  return (
+    <AttachmentPill
+      testID="composer-plugin-resource-attachment-pill"
+      onOpen={handleOpen}
+      onRemove={handleRemove}
+      openAccessibilityLabel={openLabel(attachment.sourceTitle, attachment.item.identifier)}
+      removeAccessibilityLabel={removeLabel(attachment.sourceTitle, attachment.item.identifier)}
+      disabled={disabled}
+    >
+      <AttachmentLabel
+        icon={icon}
+        title={attachment.item.title}
+        subtitle={`${attachment.sourceTitle} ${attachment.item.identifier}`}
+      />
+    </AttachmentPill>
+  );
+}
@@ -0,0 +1,18 @@
+import { z } from "zod";
+
+export const PluginAttachmentItemSchema = z.object({
+  id: z.string().min(1),
+  identifier: z.string().min(1),
+  title: z.string().min(1),
+  subtitle: z.string().min(1).optional(),
+  url: z.string().url(),
+  text: z.string().min(1),
+  resourceType: z.string().min(1),
+});
+
+export const PluginAttachmentSearchPayloadSchema = z.object({
+  items: z.array(PluginAttachmentItemSchema),
+});
+
+export type PluginAttachmentItem = z.infer<typeof PluginAttachmentItemSchema>;
+export type PluginAttachmentSearchPayload = z.infer<typeof PluginAttachmentSearchPayloadSchema>;
@@ -0,0 +1,43 @@
+import { useEffect } from "react";
+import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
+import { useHostFeature } from "@/runtime/host-features";
+import { useHostRuntimeIsConnected } from "@/runtime/host-runtime";
+import { pluginRegistry } from "./registry";
+
+export function PluginCatalogSync({
+  serverId,
+  client,
+}: {
+  serverId: string;
+  client: DaemonClient;
+}) {
+  const connected = useHostRuntimeIsConnected(serverId);
+  const supported = useHostFeature(serverId, "plugins");
+
+  useEffect(() => {
+    let cancelled = false;
+    if (!supported) {
+      pluginRegistry.removeHost(serverId);
+      return;
+    }
+    if (!connected) return;
+    void client
+      .getPluginCatalog()
+      .then((catalog) => {
+        if (!cancelled) pluginRegistry.installCatalog(serverId, catalog);
+        return undefined;
+      })
+      .catch((error) => {
+        if (!cancelled) {
+          console.warn(`[Plugins] Failed to load catalog for ${serverId}`, error);
+        }
+        return undefined;
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [client, connected, serverId, supported]);
+
+  useEffect(() => () => pluginRegistry.removeHost(serverId), [serverId]);
+  return null;
+}
@@ -0,0 +1,93 @@
+import { describe, expect, it } from "vitest";
+import { evaluatePluginClientBundle } from "./evaluate";
+
+function bundle(body: string): string {
+  return `(function() {
+    const module = { exports: {} };
+    module.exports.default = function(plugin) { ${body} };
+    return module.exports;
+  })`;
+}
+
+describe("evaluatePluginClientBundle", () => {
+  it("collects a surface and its sidebar placement", () => {
+    const plugin = evaluatePluginClientBundle(
+      "example",
+      bundle(`
+        function Surface() { return null; }
+        plugin.addSurface("main", Surface);
+        plugin.addSidebarItem({ id: "main", title: "Example", icon: "Blocks", surface: "main" });
+      `),
+    );
+
+    expect(plugin.id).toBe("example");
+    expect(plugin.surfaces.map((surface) => surface.id)).toEqual(["main"]);
+    expect(plugin.sidebarItems).toEqual([
+      { id: "main", title: "Example", icon: "Blocks", surface: "main" },
+    ]);
+  });
+
+  it("collects a declarative attachment source", () => {
+    const plugin = evaluatePluginClientBundle(
+      "linear",
+      bundle(`
+        plugin.addAttachmentSource({
+          id: "issues",
+          title: "Linear issue",
+          icon: "CircleDot",
+          pickerTitle: "Attach Linear issue",
+          searchPlaceholder: "Search by identifier or title",
+          search: { name: "issues.search", input: {}, output: {} },
+        });
+      `),
+    );
+
+    expect(plugin.attachmentSources).toEqual([
+      {
+        id: "issues",
+        title: "Linear issue",
+        icon: "CircleDot",
+        pickerTitle: "Attach Linear issue",
+        searchPlaceholder: "Search by identifier or title",
+        search: { name: "issues.search", input: {}, output: {} },
+      },
+    ]);
+  });
+
+  it("rejects duplicate attachment source ids", () => {
+    expect(() =>
+      evaluatePluginClientBundle(
+        "linear",
+        bundle(`
+          const source = {
+            id: "issues",
+            title: "Linear issue",
+            icon: "CircleDot",
+            pickerTitle: "Attach Linear issue",
+            searchPlaceholder: "Search",
+            search: { name: "issues.search", input: {}, output: {} },
+          };
+          plugin.addAttachmentSource(source);
+          plugin.addAttachmentSource(source);
+        `),
+      ),
+    ).toThrow("Duplicate attachment source: issues");
+  });
+
+  it("rejects a sidebar placement whose surface does not exist", () => {
+    expect(() =>
+      evaluatePluginClientBundle(
+        "example",
+        bundle(`
+          plugin.addSidebarItem({ id: "main", title: "Example", icon: "Blocks", surface: "missing" });
+        `),
+      ),
+    ).toThrow("references missing surface missing");
+  });
+
+  it("rejects a bundle without a default contribution function", () => {
+    expect(() => evaluatePluginClientBundle("example", `(function() { return {}; })`)).toThrow(
+      "must default export a function",
+    );
+  });
+});
@@ -0,0 +1,125 @@
+import * as React from "react";
+import * as ReactJsxRuntime from "react/jsx-runtime";
+import * as ReactNative from "react-native";
+// eslint-disable-next-line no-restricted-imports -- plugin bundles receive TanStack's real runtime, not Paseo's query wrappers.
+import * as ReactQuery from "@tanstack/react-query";
+import * as Zod from "zod";
+import {
+  createPluginContext,
+  defineAttachmentSource,
+  defineRpc,
+  type PluginRegistrationCollector,
+  useRpc,
+} from "./sdk";
+import type {
+  EvaluatedPlugin,
+  PluginAttachmentSourceContribution,
+  PluginSidebarContribution,
+  PluginSurfaceProps,
+} from "./types";
+import type { ComponentType } from "react";
+import { resolvePluginIcon } from "./icons";
+
+const CONTRIBUTION_ID = /^[a-z][a-z0-9-]*$/;
+
+function requireId(value: string, label: string): string {
+  const id = value.trim();
+  if (!CONTRIBUTION_ID.test(id)) throw new Error(`Invalid ${label}: ${value}`);
+  return id;
+}
+
+export function evaluatePluginClientBundle(id: string, bundle: string): EvaluatedPlugin {
+  const collector: PluginRegistrationCollector = {
+    surfaces: [],
+    sidebarItems: [],
+    attachmentSources: [],
+  };
+  const surfaceIds = new Set<string>();
+  const sidebarItemIds = new Set<string>();
+  const attachmentSourceIds = new Set<string>();
+  const pluginContext = createPluginContext({
+    addSurface(surfaceId: string, Component: ComponentType<PluginSurfaceProps>) {
+      const normalizedId = requireId(surfaceId, "surface id");
+      if (surfaceIds.has(normalizedId)) throw new Error(`Duplicate surface: ${normalizedId}`);
+      if (typeof Component !== "function")
+        throw new Error(`Surface ${normalizedId} is not a component`);
+      surfaceIds.add(normalizedId);
+      collector.surfaces.push({ id: normalizedId, Component });
+    },
+    addSidebarItem(contribution: PluginSidebarContribution) {
+      const normalizedId = requireId(contribution.id, "sidebar item id");
+      if (sidebarItemIds.has(normalizedId))
+        throw new Error(`Duplicate sidebar item: ${normalizedId}`);
+      if (!contribution.title.trim()) throw new Error(`Sidebar item ${normalizedId} has no title`);
+      if (!contribution.icon.trim()) throw new Error(`Sidebar item ${normalizedId} has no icon`);
+      resolvePluginIcon(contribution.icon.trim());
+      sidebarItemIds.add(normalizedId);
+      collector.sidebarItems.push({
+        id: normalizedId,
+        title: contribution.title.trim(),
+        icon: contribution.icon.trim(),
+        surface: requireId(contribution.surface, "sidebar surface id"),
+      });
+    },
+    addAttachmentSource(contribution: PluginAttachmentSourceContribution) {
+      const normalizedId = requireId(contribution.id, "attachment source id");
+      if (attachmentSourceIds.has(normalizedId)) {
+        throw new Error(`Duplicate attachment source: ${normalizedId}`);
+      }
+      const title = contribution.title.trim();
+      const icon = contribution.icon.trim();
+      const pickerTitle = contribution.pickerTitle.trim();
+      const searchPlaceholder = contribution.searchPlaceholder.trim();
+      const method = contribution.search.name.trim();
+      if (!title) throw new Error(`Attachment source ${normalizedId} has no title`);
+      if (!icon) throw new Error(`Attachment source ${normalizedId} has no icon`);
+      if (!pickerTitle) throw new Error(`Attachment source ${normalizedId} has no picker title`);
+      if (!searchPlaceholder) {
+        throw new Error(`Attachment source ${normalizedId} has no search placeholder`);
+      }
+      if (!method) throw new Error(`Attachment source ${normalizedId} has no search RPC`);
+      resolvePluginIcon(icon);
+      attachmentSourceIds.add(normalizedId);
+      collector.attachmentSources.push({
+        id: normalizedId,
+        title,
+        icon,
+        pickerTitle,
+        searchPlaceholder,
+        search: { ...contribution.search, name: method },
+      });
+    },
+  });
+  const runtimeRequire = (name: string): unknown => {
+    if (name === "react") return React;
+    if (name === "react/jsx-runtime") return ReactJsxRuntime;
+    if (name === "react-native") return ReactNative;
+    if (name === "@paseo/plugin") return { defineAttachmentSource, defineRpc, useRpc };
+    if (name === "@tanstack/react-query") return ReactQuery;
+    if (name === "zod") return Zod;
+    throw new Error(`Module "${name}" is not available in plugin client code`);
+  };
+  const evaluate: (source: string) => unknown = globalThis.eval;
+  const factory = evaluate(bundle);
+  if (typeof factory !== "function")
+    throw new Error(`Plugin ${id} client bundle is not executable`);
+  const exports = factory(runtimeRequire);
+  const setup =
+    exports !== null && typeof exports === "object" ? Reflect.get(exports, "default") : undefined;
+  if (typeof setup !== "function") {
+    throw new Error(`Plugin ${id} must default export a function`);
+  }
+  setup(pluginContext);
+
+  for (const item of collector.sidebarItems) {
+    if (!surfaceIds.has(item.surface)) {
+      throw new Error(`Sidebar item ${item.id} references missing surface ${item.surface}`);
+    }
+  }
+  return {
+    id,
+    surfaces: collector.surfaces,
+    sidebarItems: collector.sidebarItems,
+    attachmentSources: collector.attachmentSources,
+  };
+}
@@ -0,0 +1,11 @@
+import * as LucideIcons from "lucide-react-native";
+import type { LucideIcon } from "lucide-react-native";
+
+export function resolvePluginIcon(name: string): LucideIcon {
+  const candidate = Reflect.get(LucideIcons, name);
+  const isComponent =
+    typeof candidate === "function" ||
+    (typeof candidate === "object" && candidate !== null && "$$typeof" in candidate);
+  if (!isComponent) throw new Error(`Unknown Lucide icon: ${name}`);
+  return candidate as LucideIcon;
+}
@@ -0,0 +1,57 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { pluginRegistry } from "./registry";
+
+function bundle(marker: string): string {
+  return `(function() {
+    const module = { exports: {} };
+    module.exports.default = function(plugin) {
+      function Surface() { return ${JSON.stringify(marker)}; }
+      plugin.addSurface("main", Surface);
+      plugin.addSidebarItem({ id: "main", title: "Example", icon: "Blocks", surface: "main" });
+    };
+    return module.exports;
+  })`;
+}
+
+afterEach(() => {
+  pluginRegistry.removeHost("host-a");
+  pluginRegistry.removeHost("host-b");
+});
+
+describe("PluginRegistry", () => {
+  it("preserves a plugin query cache when the same bundle reconnects", () => {
+    const clientBundle = bundle("one");
+    pluginRegistry.installCatalog("host-a", [{ id: "example", clientBundle }]);
+    const first = pluginRegistry.getSnapshot()[0];
+    first?.queryClient.setQueryData(["counter"], 3);
+
+    pluginRegistry.installCatalog("host-a", [{ id: "example", clientBundle }]);
+
+    const second = pluginRegistry.getSnapshot()[0];
+    expect(second?.queryClient).toBe(first?.queryClient);
+    expect(second?.queryClient.getQueryData(["counter"])).toBe(3);
+  });
+
+  it("replaces the query cache when the plugin bundle changes", () => {
+    pluginRegistry.installCatalog("host-a", [{ id: "example", clientBundle: bundle("one") }]);
+    const first = pluginRegistry.getSnapshot()[0];
+    first?.queryClient.setQueryData(["counter"], 3);
+
+    pluginRegistry.installCatalog("host-a", [{ id: "example", clientBundle: bundle("two") }]);
+
+    const second = pluginRegistry.getSnapshot()[0];
+    expect(second?.queryClient).not.toBe(first?.queryClient);
+    expect(second?.queryClient.getQueryData(["counter"])).toBeUndefined();
+    expect(first?.queryClient.getQueryData(["counter"])).toBeUndefined();
+  });
+
+  it("isolates query caches between hosts", () => {
+    const clientBundle = bundle("same");
+    pluginRegistry.installCatalog("host-a", [{ id: "example", clientBundle }]);
+    pluginRegistry.installCatalog("host-b", [{ id: "example", clientBundle }]);
+    const [hostA, hostB] = pluginRegistry.getSnapshot();
+    hostA?.queryClient.setQueryData(["counter"], 3);
+
+    expect(hostB?.queryClient.getQueryData(["counter"])).toBeUndefined();
+  });
+});
@@ -0,0 +1,91 @@
+import { useSyncExternalStore } from "react";
+import { QueryClient } from "@tanstack/react-query";
+import { evaluatePluginClientBundle } from "./evaluate";
+import type { InstalledPlugin } from "./types";
+
+interface CatalogPlugin {
+  id: string;
+  clientBundle: string;
+}
+
+class PluginRegistry {
+  private readonly byHost = new Map<string, InstalledPlugin[]>();
+  private readonly listeners = new Set<() => void>();
+  private snapshot: InstalledPlugin[] = [];
+
+  subscribe = (listener: () => void): (() => void) => {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  };
+
+  getSnapshot = (): InstalledPlugin[] => this.snapshot;
+
+  installCatalog(serverId: string, catalog: CatalogPlugin[]): void {
+    const previous = this.byHost.get(serverId) ?? [];
+    const installed = catalog.flatMap((entry) => {
+      try {
+        const existing = previous.find(
+          (plugin) => plugin.id === entry.id && plugin.clientBundle === entry.clientBundle,
+        );
+        const queryClient = existing?.queryClient ?? new QueryClient();
+        return [
+          {
+            ...evaluatePluginClientBundle(entry.id, entry.clientBundle),
+            serverId,
+            clientBundle: entry.clientBundle,
+            queryClient,
+          },
+        ];
+      } catch (error) {
+        console.warn(`[Plugins] Failed to evaluate ${serverId}/${entry.id}`, error);
+        return [];
+      }
+    });
+    for (const plugin of previous) {
+      if (!installed.some((candidate) => candidate.queryClient === plugin.queryClient)) {
+        plugin.queryClient.clear();
+      }
+    }
+    this.byHost.set(serverId, installed);
+    this.publish();
+  }
+
+  removeHost(serverId: string): void {
+    const installed = this.byHost.get(serverId);
+    if (!installed) return;
+    for (const plugin of installed) plugin.queryClient.clear();
+    this.byHost.delete(serverId);
+    this.publish();
+  }
+
+  private publish(): void {
+    this.snapshot = [...this.byHost.values()]
+      .flat()
+      .sort((left, right) =>
+        `${left.serverId}/${left.id}`.localeCompare(`${right.serverId}/${right.id}`),
+      );
+    for (const listener of this.listeners) listener();
+  }
+}
+
+export const pluginRegistry = new PluginRegistry();
+
+export function useInstalledPlugins(): InstalledPlugin[] {
+  return useSyncExternalStore(
+    pluginRegistry.subscribe,
+    pluginRegistry.getSnapshot,
+    pluginRegistry.getSnapshot,
+  );
+}
+
+export function useInstalledPlugin(serverId: string, pluginId: string): InstalledPlugin | null {
+  return (
+    useInstalledPlugins().find(
+      (plugin) => plugin.serverId === serverId && plugin.id === pluginId,
+    ) ?? null
+  );
+}
+
+export function usePluginInstallations(pluginId: string): InstalledPlugin[] {
+  return useInstalledPlugins().filter((plugin) => plugin.id === pluginId);
+}
@@ -0,0 +1,17 @@
+export function buildPluginSurfaceRoute(
+  serverId: string,
+  pluginId: string,
+  contributionId: string,
+): `/h/${string}/plugin/${string}/${string}` {
+  return `/h/${encodeURIComponent(serverId)}/plugin/${encodeURIComponent(pluginId)}/${encodeURIComponent(contributionId)}`;
+}
+
+export function hostIdFromPathname(pathname: string): string | null {
+  const encoded = /^\/h\/([^/]+)/.exec(pathname)?.[1];
+  if (!encoded) return null;
+  try {
+    return decodeURIComponent(encoded);
+  } catch {
+    return null;
+  }
+}
@@ -0,0 +1,110 @@
+import { describe, expect, it } from "vitest";
+import { z } from "zod";
+import { callPluginRpc, defineAttachmentSource, defineRpc, searchPluginAttachments } from "./sdk";
+
+const contract = defineRpc({
+  name: "increment",
+  input: z.unknown().pipe(z.object({ value: z.number() })),
+  output: z.object({ value: z.number() }),
+});
+
+describe("plugin RPC contracts", () => {
+  it("validates input before invoking the daemon", async () => {
+    let invocations = 0;
+    const invoke = async () => {
+      invocations += 1;
+      return { value: 2 };
+    };
+
+    await expect(callPluginRpc(contract, invoke, { value: "wrong" })).rejects.toBeInstanceOf(
+      z.ZodError,
+    );
+    expect(invocations).toBe(0);
+  });
+
+  it("validates output before resolving", async () => {
+    const invoke = async () => ({ value: "wrong" });
+
+    await expect(callPluginRpc(contract, invoke, { value: 1 })).rejects.toBeInstanceOf(z.ZodError);
+  });
+
+  it("returns parsed output for a valid invocation", async () => {
+    const invoke = async (method: string, input: unknown) => ({
+      value: method === "increment" && typeof input === "object" ? 2 : 0,
+    });
+
+    await expect(callPluginRpc(contract, invoke, { value: 1 })).resolves.toEqual({ value: 2 });
+  });
+});
+
+describe("plugin attachment sources", () => {
+  const search = defineRpc({
+    name: "issues.search",
+    input: z.object({ query: z.string() }),
+    output: z.object({
+      items: z.array(
+        z.object({
+          id: z.string(),
+          identifier: z.string(),
+          title: z.string(),
+          subtitle: z.string().optional(),
+          url: z.string(),
+          text: z.string(),
+          resourceType: z.string(),
+        }),
+      ),
+    }),
+  });
+
+  it("searches through the declared RPC and validates the standard result", async () => {
+    const source = defineAttachmentSource({
+      id: "issues",
+      title: "Linear issue",
+      icon: "CircleDot",
+      pickerTitle: "Attach Linear issue",
+      searchPlaceholder: "Search",
+      search,
+    });
+
+    const payload = await searchPluginAttachments(
+      source,
+      async (method, input) => ({
+        items: [
+          {
+            id: "issue-1",
+            identifier: `${method}:${String(Reflect.get(input as object, "query"))}`,
+            title: "Plugin attachments",
+            url: "https://linear.app/acme/issue/ENG-123/plugin-attachments",
+            text: "Linear issue ENG-123: Plugin attachments",
+            resourceType: "issue",
+          },
+        ],
+      }),
+      "ENG-123",
+    );
+
+    expect(payload.items[0]).toEqual({
+      id: "issue-1",
+      identifier: "issues.search:ENG-123",
+      title: "Plugin attachments",
+      url: "https://linear.app/acme/issue/ENG-123/plugin-attachments",
+      text: "Linear issue ENG-123: Plugin attachments",
+      resourceType: "issue",
+    });
+  });
+
+  it("rejects a malformed standard search result", async () => {
+    const source = defineAttachmentSource({
+      id: "issues",
+      title: "Linear issue",
+      icon: "CircleDot",
+      pickerTitle: "Attach Linear issue",
+      searchPlaceholder: "Search",
+      search,
+    });
+
+    await expect(
+      searchPluginAttachments(source, async () => ({ items: [{ id: "issue-1" }] }), "issue"),
+    ).rejects.toBeInstanceOf(z.ZodError);
+  });
+});
@@ -0,0 +1,138 @@
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useMemo,
+  type ComponentType,
+  type ReactNode,
+} from "react";
+import type { ZodType, output as ZodOutput, input as ZodInput } from "zod";
+import {
+  PluginAttachmentSearchPayloadSchema,
+  type PluginAttachmentSearchPayload,
+} from "./attachments/schema";
+import type {
+  PluginAttachmentSourceContribution,
+  PluginSidebarContribution,
+  PluginSurfaceContribution,
+  PluginSurfaceProps,
+} from "./types";
+
+interface PluginCollector {
+  addSurface(id: string, Component: ComponentType<PluginSurfaceProps>): void;
+  addSidebarItem(contribution: PluginSidebarContribution): void;
+  addAttachmentSource(contribution: PluginAttachmentSourceContribution): void;
+}
+
+interface PluginRpcContextValue {
+  invoke(method: string, input: unknown): Promise<unknown>;
+}
+
+export interface PluginRpcContract<
+  InputSchema extends ZodType = ZodType,
+  OutputSchema extends ZodType = ZodType,
+> {
+  name: string;
+  input: InputSchema;
+  output: OutputSchema;
+}
+
+export interface PluginContext {
+  handle<InputSchema extends ZodType, OutputSchema extends ZodType>(
+    contract: PluginRpcContract<InputSchema, OutputSchema>,
+    handler: (
+      input: ZodOutput<InputSchema>,
+    ) => ZodInput<OutputSchema> | Promise<ZodInput<OutputSchema>>,
+  ): void;
+  addSurface(id: string, Component: ComponentType<PluginSurfaceProps>): void;
+  addSidebarItem(contribution: PluginSidebarContribution): void;
+  addAttachmentSource(contribution: PluginAttachmentSourceContribution): void;
+}
+
+interface RpcDefinition<InputSchema extends ZodType, OutputSchema extends ZodType> {
+  name: string;
+  input: InputSchema;
+  output: OutputSchema;
+}
+
+const RPC_NAME = /^[a-z][a-z0-9._-]*$/;
+
+export function defineRpc<InputSchema extends ZodType, OutputSchema extends ZodType>(
+  definition: RpcDefinition<InputSchema, OutputSchema>,
+): PluginRpcContract<InputSchema, OutputSchema> {
+  const name = definition.name.trim();
+  if (!RPC_NAME.test(name)) throw new Error(`Invalid plugin RPC method: ${definition.name}`);
+  return { ...definition, name };
+}
+
+export type { PluginAttachmentItem, PluginAttachmentSearchPayload } from "./attachments/schema";
+
+export function defineAttachmentSource(
+  definition: PluginAttachmentSourceContribution,
+): PluginAttachmentSourceContribution {
+  return definition;
+}
+
+const PluginRpcContext = createContext<PluginRpcContextValue | null>(null);
+
+export function PluginRpcProvider({
+  children,
+  invoke,
+}: {
+  children: ReactNode;
+  invoke(method: string, input: unknown): Promise<unknown>;
+}) {
+  const value = useMemo(() => ({ invoke }), [invoke]);
+  return <PluginRpcContext.Provider value={value}>{children}</PluginRpcContext.Provider>;
+}
+
+export function createPluginContext(collector: PluginCollector) {
+  return {
+    addSurface(id: string, Component: ComponentType<PluginSurfaceProps>) {
+      collector.addSurface(id, Component);
+    },
+    addSidebarItem(contribution: PluginSidebarContribution) {
+      collector.addSidebarItem(contribution);
+    },
+    addAttachmentSource(contribution: PluginAttachmentSourceContribution) {
+      collector.addAttachmentSource(contribution);
+    },
+  };
+}
+
+export async function searchPluginAttachments(
+  source: PluginAttachmentSourceContribution,
+  invoke: (method: string, input: unknown) => Promise<unknown>,
+  query: string,
+): Promise<PluginAttachmentSearchPayload> {
+  const output = await callPluginRpc(source.search, invoke, { query });
+  return PluginAttachmentSearchPayloadSchema.parseAsync(output);
+}
+
+export function useRpc<InputSchema extends ZodType, OutputSchema extends ZodType>(
+  contract: PluginRpcContract<InputSchema, OutputSchema>,
+): (input: ZodInput<InputSchema>) => Promise<ZodOutput<OutputSchema>> {
+  const context = useContext(PluginRpcContext);
+  if (!context) throw new Error("useRpc must run inside a contributed plugin surface");
+
+  return useCallback(
+    (input: ZodInput<InputSchema>) => callPluginRpc(contract, context.invoke, input),
+    [context, contract],
+  );
+}
+
+export async function callPluginRpc<InputSchema extends ZodType, OutputSchema extends ZodType>(
+  contract: PluginRpcContract<InputSchema, OutputSchema>,
+  invoke: (method: string, input: unknown) => Promise<unknown>,
+  input: ZodInput<InputSchema>,
+): Promise<ZodOutput<OutputSchema>> {
+  const parsedInput = await contract.input.parseAsync(input);
+  const output = await invoke(contract.name, parsedInput);
+  return contract.output.parseAsync(output);
+}
+
+export interface PluginRegistrationCollector {
+  surfaces: PluginSurfaceContribution[];
+  sidebarItems: PluginSidebarContribution[];
+  attachmentSources: PluginAttachmentSourceContribution[];
+}
@@ -0,0 +1,44 @@
+import { QueryClient } from "@tanstack/react-query";
+import { describe, expect, it } from "vitest";
+import type { InstalledPlugin } from "./types";
+import { groupPluginSidebarContributions } from "./sidebar-groups";
+
+function installed(serverId: string, contributionId = "main"): InstalledPlugin {
+  return {
+    id: "example",
+    serverId,
+    clientBundle: serverId,
+    queryClient: new QueryClient(),
+    surfaces: [{ id: "surface", Component: () => null }],
+    sidebarItems: [
+      {
+        id: contributionId,
+        title: "Example",
+        icon: "Blocks",
+        surface: "surface",
+      },
+    ],
+    attachmentSources: [],
+  };
+}
+
+describe("groupPluginSidebarContributions", () => {
+  it("coalesces the same plugin contribution across hosts", () => {
+    const groups = groupPluginSidebarContributions([installed("host-a"), installed("host-b")]);
+
+    expect(groups).toHaveLength(1);
+    expect(groups[0]?.targets.map((target) => target.plugin.serverId)).toEqual([
+      "host-a",
+      "host-b",
+    ]);
+  });
+
+  it("keeps different contribution ids separate", () => {
+    const groups = groupPluginSidebarContributions([
+      installed("host-a", "main"),
+      installed("host-b", "settings"),
+    ]);
+
+    expect(groups.map((group) => group.key)).toEqual(["example/main", "example/settings"]);
+  });
+});
@@ -0,0 +1,48 @@
+import type { InstalledPlugin, PluginSidebarContribution } from "./types";
+
+const preferredHosts = new Map<string, string>();
+
+export interface PluginSidebarTarget {
+  plugin: InstalledPlugin;
+  item: PluginSidebarContribution;
+}
+
+export interface PluginSidebarGroup {
+  key: string;
+  pluginId: string;
+  contributionId: string;
+  title: string;
+  icon: string;
+  targets: PluginSidebarTarget[];
+}
+
+export function groupPluginSidebarContributions(plugins: InstalledPlugin[]): PluginSidebarGroup[] {
+  const groups = new Map<string, PluginSidebarGroup>();
+  for (const plugin of plugins) {
+    for (const item of plugin.sidebarItems) {
+      const key = `${plugin.id}/${item.id}`;
+      const existing = groups.get(key);
+      if (existing) {
+        existing.targets.push({ plugin, item });
+      } else {
+        groups.set(key, {
+          key,
+          pluginId: plugin.id,
+          contributionId: item.id,
+          title: item.title,
+          icon: item.icon,
+          targets: [{ plugin, item }],
+        });
+      }
+    }
+  }
+  return [...groups.values()];
+}
+
+export function getPreferredPluginContributionHost(groupKey: string): string | null {
+  return preferredHosts.get(groupKey) ?? null;
+}
+
+export function rememberPluginContributionHost(groupKey: string, serverId: string): void {
+  preferredHosts.set(groupKey, serverId);
+}
@@ -0,0 +1,80 @@
+import { router, usePathname } from "expo-router";
+import { useCallback, useMemo } from "react";
+import { SidebarHeaderRow } from "@/components/sidebar/sidebar-header-row";
+import { resolvePluginIcon } from "./icons";
+import { useInstalledPlugins } from "./registry";
+import { buildPluginSurfaceRoute, hostIdFromPathname } from "./routes";
+import {
+  groupPluginSidebarContributions,
+  getPreferredPluginContributionHost,
+  rememberPluginContributionHost,
+  type PluginSidebarGroup,
+  type PluginSidebarTarget,
+} from "./sidebar-groups";
+
+function selectTarget(
+  group: PluginSidebarGroup,
+  currentHostId: string | null,
+): PluginSidebarTarget {
+  const current = group.targets.find((target) => target.plugin.serverId === currentHostId);
+  if (current) return current;
+  const rememberedHostId = getPreferredPluginContributionHost(group.key);
+  const remembered = group.targets.find((target) => target.plugin.serverId === rememberedHostId);
+  return remembered ?? group.targets[0];
+}
+
+export function PluginSidebarItems({ onBeforeNavigate }: { onBeforeNavigate?: () => void }) {
+  const plugins = useInstalledPlugins();
+  const pathname = usePathname();
+  const groups = useMemo(() => groupPluginSidebarContributions(plugins), [plugins]);
+  const currentHostId = hostIdFromPathname(pathname);
+
+  return groups.map((group) => (
+    <PluginSidebarItemRow
+      key={group.key}
+      group={group}
+      currentHostId={currentHostId}
+      pathname={pathname}
+      onBeforeNavigate={onBeforeNavigate}
+    />
+  ));
+}
+
+function PluginSidebarItemRow({
+  group,
+  currentHostId,
+  pathname,
+  onBeforeNavigate,
+}: {
+  group: PluginSidebarGroup;
+  currentHostId: string | null;
+  pathname: string;
+  onBeforeNavigate?: () => void;
+}) {
+  const target = selectTarget(group, currentHostId);
+  const route = buildPluginSurfaceRoute(
+    target.plugin.serverId,
+    group.pluginId,
+    group.contributionId,
+  );
+  const isActive = group.targets.some(
+    (candidate) =>
+      pathname ===
+      buildPluginSurfaceRoute(candidate.plugin.serverId, group.pluginId, group.contributionId),
+  );
+  const navigate = useCallback(() => {
+    rememberPluginContributionHost(group.key, target.plugin.serverId);
+    onBeforeNavigate?.();
+    router.push(route);
+  }, [group.key, onBeforeNavigate, route, target.plugin.serverId]);
+  return (
+    <SidebarHeaderRow
+      icon={resolvePluginIcon(group.icon)}
+      label={group.title}
+      onPress={navigate}
+      isActive={isActive}
+      testID={`plugin-sidebar-${group.pluginId}-${group.contributionId}`}
+      variant="compact"
+    />
+  );
+}
@@ -0,0 +1,297 @@
+import { router, useLocalSearchParams } from "expo-router";
+import { QueryClientProvider } from "@tanstack/react-query";
+import { ChevronDown, X } from "lucide-react-native";
+import {
+  Component,
+  useCallback,
+  useMemo,
+  useRef,
+  useState,
+  type ComponentType,
+  type ErrorInfo,
+  type ReactNode,
+} from "react";
+import { Platform, Pressable, Text, View } from "react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import { HeaderIconBadge } from "@/components/headers/header-icon-badge";
+import { HeaderToggleButton } from "@/components/headers/header-toggle-button";
+import { ScreenHeader } from "@/components/headers/screen-header";
+import { ScreenTitle } from "@/components/headers/screen-title";
+import { HostPicker } from "@/components/hosts/host-picker";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { useHostRuntimeClient, useHosts } from "@/runtime/host-runtime";
+import type { Theme } from "@/styles/theme";
+import type { ShortcutKey } from "@/utils/format-shortcut";
+import { resolvePluginIcon } from "./icons";
+import { useInstalledPlugin, usePluginInstallations } from "./registry";
+import { buildPluginSurfaceRoute } from "./routes";
+import { rememberPluginContributionHost } from "./sidebar-groups";
+import { PluginRpcProvider } from "./sdk";
+import type { PluginSurfaceProps } from "./types";
+
+const EMPTY_SHORTCUT_KEYS: ShortcutKey[] = [];
+const EMPTY_THEME_DTO: Record<string, unknown> = {};
+const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+const pluginThemeMapping = (theme: Theme) => ({
+  themeDto: JSON.parse(JSON.stringify(theme)) as Record<string, unknown>,
+});
+const ThemedX = withUnistyles(X);
+const ThemedChevronDown = withUnistyles(ChevronDown);
+
+function routeParam(value: string | string[] | undefined): string {
+  return typeof value === "string" ? value : "";
+}
+
+function PluginHeaderIcon({
+  Icon,
+  color = "",
+}: {
+  Icon: ReturnType<typeof resolvePluginIcon>;
+  color?: string;
+}) {
+  return <Icon size={16} color={color} />;
+}
+
+const ThemedPluginHeaderIcon = withUnistyles(PluginHeaderIcon);
+
+function SurfaceRenderer({
+  Surface,
+  invoke,
+  plugin,
+  layout,
+  host,
+  themeDto = EMPTY_THEME_DTO,
+}: {
+  Surface: ComponentType<PluginSurfaceProps>;
+  invoke(method: string, input: unknown): Promise<unknown>;
+  plugin: NonNullable<ReturnType<typeof useInstalledPlugin>>;
+  layout: PluginSurfaceProps["layout"];
+  host: PluginSurfaceProps["host"];
+  themeDto?: Record<string, unknown>;
+}) {
+  return (
+    <QueryClientProvider client={plugin.queryClient}>
+      <PluginRpcProvider invoke={invoke}>
+        <Surface theme={themeDto} host={host} layout={layout} />
+      </PluginRpcProvider>
+    </QueryClientProvider>
+  );
+}
+
+const ThemedSurfaceRenderer = withUnistyles(SurfaceRenderer);
+
+interface SurfaceErrorBoundaryState {
+  error: string | null;
+}
+
+class SurfaceErrorBoundary extends Component<{ children: ReactNode }, SurfaceErrorBoundaryState> {
+  state: SurfaceErrorBoundaryState = { error: null };
+
+  static getDerivedStateFromError(error: unknown): SurfaceErrorBoundaryState {
+    return { error: error instanceof Error ? error.message : String(error) };
+  }
+
+  componentDidCatch(error: Error, info: ErrorInfo): void {
+    console.warn("[Plugins] Surface render failed", error, info.componentStack);
+  }
+
+  render() {
+    if (this.state.error) {
+      return <Text style={styles.errorText}>Plugin failed: {this.state.error}</Text>;
+    }
+    return this.props.children;
+  }
+}
+
+function resolvePlatform(): PluginSurfaceProps["layout"]["platform"] {
+  if (Platform.OS === "ios") return "ios";
+  if (Platform.OS === "android") return "android";
+  return "web";
+}
+
+function PluginHostSwitcher({
+  serverId,
+  pluginId,
+  contributionId,
+  serverIds,
+}: {
+  serverId: string;
+  pluginId: string;
+  contributionId: string;
+  serverIds: string[];
+}) {
+  const allHosts = useHosts();
+  const hosts = useMemo(
+    () => allHosts.filter((host) => serverIds.includes(host.serverId)),
+    [allHosts, serverIds],
+  );
+  const [open, setOpen] = useState(false);
+  const anchorRef = useRef<View | null>(null);
+  const selectedLabel = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
+  const selectHost = useCallback(
+    (nextServerId: string) => {
+      rememberPluginContributionHost(`${pluginId}/${contributionId}`, nextServerId);
+      router.replace(buildPluginSurfaceRoute(nextServerId, pluginId, contributionId));
+    },
+    [contributionId, pluginId],
+  );
+  const openPicker = useCallback(() => setOpen(true), []);
+  const show = serverIds.length > 1 && hosts.length > 1;
+  if (!show) return null;
+
+  return (
+    <HostPicker
+      hosts={hosts}
+      value={serverId}
+      onSelect={selectHost}
+      open={open}
+      onOpenChange={setOpen}
+      anchorRef={anchorRef}
+      title="Choose plugin host"
+      desktopPlacement="bottom-start"
+    >
+      <View ref={anchorRef} collapsable={false}>
+        <Pressable
+          accessibilityRole="button"
+          accessibilityLabel={`Plugin host: ${selectedLabel}`}
+          testID="plugin-host-switcher"
+          onPress={openPicker}
+          style={styles.hostSwitcher}
+        >
+          <Text numberOfLines={1} style={styles.hostSwitcherText}>
+            {selectedLabel}
+          </Text>
+          <ThemedChevronDown size={14} uniProps={mutedColorMapping} />
+        </Pressable>
+      </View>
+    </HostPicker>
+  );
+}
+
+export function PluginSurfaceScreen() {
+  const params = useLocalSearchParams<{
+    serverId?: string | string[];
+    pluginId?: string | string[];
+    surfaceId?: string | string[];
+  }>();
+  const serverId = routeParam(params.serverId);
+  const pluginId = routeParam(params.pluginId);
+  const contributionId = routeParam(params.surfaceId);
+  const plugin = useInstalledPlugin(serverId, pluginId);
+  const installations = usePluginInstallations(pluginId);
+  const hosts = useHosts();
+  const client = useHostRuntimeClient(serverId);
+  const compact = useIsCompactFormFactor();
+  const sidebarItem = plugin?.sidebarItems.find((entry) => entry.id === contributionId) ?? null;
+  const surface = plugin?.surfaces.find((entry) => entry.id === sidebarItem?.surface) ?? null;
+  const hostLabel = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
+  const contributionServerIds = useMemo(
+    () =>
+      installations
+        .filter((entry) => entry.sidebarItems.some((item) => item.id === contributionId))
+        .map((entry) => entry.serverId),
+    [contributionId, installations],
+  );
+  const title = sidebarItem?.title ?? (pluginId || "Plugin");
+  const Icon = sidebarItem ? resolvePluginIcon(sidebarItem.icon) : null;
+  const invoke = useCallback(
+    async (method: string, input: unknown) => {
+      if (!client) throw new Error("Plugin host is offline");
+      return client.invokePluginRpc(pluginId, method, input);
+    },
+    [client, pluginId],
+  );
+  const close = useCallback(() => {
+    if (router.canGoBack()) router.back();
+    else router.replace(`/h/${encodeURIComponent(serverId)}`);
+  }, [serverId]);
+  const layout = useMemo(() => ({ compact, platform: resolvePlatform() }), [compact]);
+  const host = useMemo(() => ({ id: serverId, label: hostLabel }), [hostLabel, serverId]);
+  const headerLeft = useMemo(
+    () => (
+      <>
+        {Icon ? (
+          <HeaderIconBadge>
+            <ThemedPluginHeaderIcon Icon={Icon} uniProps={mutedColorMapping} />
+          </HeaderIconBadge>
+        ) : null}
+        <ScreenTitle>{title}</ScreenTitle>
+      </>
+    ),
+    [Icon, title],
+  );
+  const headerRight = useMemo(
+    () => (
+      <>
+        <PluginHostSwitcher
+          serverId={serverId}
+          pluginId={pluginId}
+          contributionId={contributionId}
+          serverIds={contributionServerIds}
+        />
+        <HeaderToggleButton
+          accessibilityLabel="Close plugin"
+          onPress={close}
+          testID="plugin-surface-close"
+          tooltipKeys={EMPTY_SHORTCUT_KEYS}
+          tooltipLabel="Close"
+          tooltipSide="bottom"
+        >
+          <ThemedX size={18} uniProps={mutedColorMapping} />
+        </HeaderToggleButton>
+      </>
+    ),
+    [close, contributionId, contributionServerIds, pluginId, serverId],
+  );
+
+  return (
+    <View style={styles.screen}>
+      <ScreenHeader left={headerLeft} right={headerRight} />
+      <View style={styles.body}>
+        {plugin && surface ? (
+          <SurfaceErrorBoundary key={`${serverId}/${pluginId}/${contributionId}`}>
+            <ThemedSurfaceRenderer
+              Surface={surface.Component}
+              invoke={invoke}
+              plugin={plugin}
+              host={host}
+              layout={layout}
+              uniProps={pluginThemeMapping}
+            />
+          </SurfaceErrorBoundary>
+        ) : (
+          <Text style={styles.errorText}>This plugin surface is unavailable.</Text>
+        )}
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  screen: {
+    flex: 1,
+    backgroundColor: theme.colors.surface0,
+  },
+  body: {
+    flex: 1,
+  },
+  errorText: {
+    color: theme.colors.statusDanger,
+    padding: theme.spacing[4],
+  },
+  hostSwitcher: {
+    maxWidth: 180,
+    minHeight: 32,
+    paddingHorizontal: theme.spacing[2],
+    flexDirection: "row",
+    alignItems: "center",
+    gap: theme.spacing[1],
+    borderRadius: theme.borderRadius.md,
+    backgroundColor: theme.colors.surface1,
+  },
+  hostSwitcherText: {
+    flexShrink: 1,
+    color: theme.colors.foregroundMuted,
+    fontSize: theme.fontSize.sm,
+  },
+}));
@@ -0,0 +1,49 @@
+import type { ComponentType } from "react";
+import type { QueryClient } from "@tanstack/react-query";
+import type { PluginRpcContract } from "./sdk";
+
+export interface PluginSurfaceProps {
+  theme: Record<string, unknown>;
+  host: {
+    id: string;
+    label: string;
+  };
+  layout: {
+    compact: boolean;
+    platform: "ios" | "android" | "web";
+  };
+}
+
+export interface PluginSurfaceContribution {
+  id: string;
+  Component: ComponentType<PluginSurfaceProps>;
+}
+
+export interface PluginSidebarContribution {
+  id: string;
+  title: string;
+  icon: string;
+  surface: string;
+}
+
+export interface PluginAttachmentSourceContribution {
+  id: string;
+  title: string;
+  icon: string;
+  pickerTitle: string;
+  searchPlaceholder: string;
+  search: PluginRpcContract;
+}
+
+export interface EvaluatedPlugin {
+  id: string;
+  surfaces: PluginSurfaceContribution[];
+  sidebarItems: PluginSidebarContribution[];
+  attachmentSources: PluginAttachmentSourceContribution[];
+}
+
+export interface InstalledPlugin extends EvaluatedPlugin {
+  serverId: string;
+  clientBundle: string;
+  queryClient: QueryClient;
+}
@@ -0,0 +1,73 @@
+import { transform } from "@babel/standalone";
+import * as React from "react";
+import type { ComponentType, ReactElement } from "react";
+import * as ReactNative from "react-native";
+
+interface RuntimeModule {
+  exports: unknown;
+}
+
+const RUNTIME_MODULES = new Map<string, unknown>([
+  ["react", React],
+  ["react-native", ReactNative],
+]);
+
+function requireRuntimeModule(name: string): unknown {
+  if (!RUNTIME_MODULES.has(name)) {
+    throw new Error(`Module "${name}" is not available in the runtime component.`);
+  }
+  return RUNTIME_MODULES.get(name);
+}
+
+function readDefaultExport(moduleExports: unknown): unknown {
+  if (typeof moduleExports !== "object" || moduleExports === null) {
+    return moduleExports;
+  }
+  if ("default" in moduleExports) {
+    return moduleExports.default;
+  }
+  return moduleExports;
+}
+
+export function evaluateRuntimeComponent(source: string): ComponentType {
+  const compiled = transform(source, {
+    filename: "user-component.tsx",
+    plugins: ["transform-modules-commonjs"],
+    presets: [
+      ["typescript", { allExtensions: true, isTSX: true }],
+      ["react", { runtime: "classic" }],
+    ],
+    sourceType: "module",
+  }).code;
+
+  if (compiled === undefined) {
+    throw new Error("Babel produced no JavaScript for the component.");
+  }
+
+  const evaluateScript: (script: string) => unknown = globalThis.eval;
+  const moduleFactory = evaluateScript(
+    `(function(require, module, exports) { "use strict";\n${compiled}\n})`,
+  );
+  if (typeof moduleFactory !== "function") {
+    throw new Error("The compiled component did not produce a module factory.");
+  }
+
+  const runtimeModule: RuntimeModule = { exports: {} };
+  moduleFactory(requireRuntimeModule, runtimeModule, runtimeModule.exports);
+  const authoredComponent = readDefaultExport(runtimeModule.exports);
+  if (typeof authoredComponent !== "function") {
+    throw new Error("The source must default-export a function component.");
+  }
+  const renderAuthoredComponent = authoredComponent;
+
+  function RuntimeComponent(): ReactElement {
+    const rendered: unknown = renderAuthoredComponent();
+    if (!React.isValidElement(rendered)) {
+      throw new Error("The authored component must return one React element.");
+    }
+    return rendered;
+  }
+
+  RuntimeComponent.displayName = "RuntimeComponent";
+  return RuntimeComponent;
+}
@@ -0,0 +1,284 @@
+import { Component, type ComponentType, type ReactNode, useCallback, useReducer } from "react";
+import {
+  KeyboardAvoidingView,
+  Platform,
+  Pressable,
+  ScrollView,
+  StyleSheet,
+  Text,
+  TextInput,
+  View,
+} from "react-native";
+import { SafeAreaView } from "react-native-safe-area-context";
+import { evaluateRuntimeComponent } from "@/runtime-component/evaluate";
+
+const INITIAL_SOURCE = `import React, { useState } from "react";
+import { Pressable, Text, TextInput, View } from "react-native";
+
+interface Todo {
+  id: number;
+  label: string;
+}
+
+export default function UserAuthoredCard() {
+  const [count, setCount] = useState(0);
+  const [name, setName] = useState("Ada");
+  const todos: Todo[] = [
+    { id: 1, label: "Compiled TSX on-device" },
+    { id: 2, label: "Rendered native views" },
+    { id: 3, label: "Hooks and events survived" },
+  ];
+
+  return (
+    <View style={{ gap: 14, padding: 18, borderRadius: 18, backgroundColor: "#172554" }}>
+      <Text style={{ color: "#93c5fd", fontSize: 12, fontWeight: "700" }}>
+        USER-AUTHORED TSX STRING
+      </Text>
+      <Text style={{ color: "white", fontSize: 24, fontWeight: "800" }}>
+        Hello {name || "stranger"}
+      </Text>
+      <TextInput
+        accessibilityLabel="Authored name"
+        value={name}
+        onChangeText={setName}
+        style={{ backgroundColor: "white", borderRadius: 10, padding: 12, color: "#111827" }}
+      />
+      <Pressable
+        accessibilityRole="button"
+        accessibilityLabel={\`Native presses: \${count}\`}
+        onPress={() => setCount((value) => value + 1)}
+        style={{ backgroundColor: "#22c55e", borderRadius: 10, padding: 14 }}
+      >
+        <Text style={{ color: "#052e16", fontWeight: "800", textAlign: "center" }}>
+          Native presses: {count}
+        </Text>
+      </Pressable>
+      <View style={{ gap: 6 }}>
+        {todos.map((todo) => (
+          <Text key={todo.id} style={{ color: "#dbeafe" }}>✓ {todo.label}</Text>
+        ))}
+      </View>
+    </View>
+  );
+}`;
+
+const SECOND_SOURCE = `import React, { useState } from "react";
+import { Pressable, Text, View } from "react-native";
+
+export default function SecondProgram() {
+  const [isOn, setIsOn] = useState(false);
+  return (
+    <View style={{ gap: 16, padding: 24, borderRadius: 20, backgroundColor: "#4c1d95" }}>
+      <Text style={{ color: "white", fontSize: 26, fontWeight: "900" }}>SECOND PROGRAM</Text>
+      <Text style={{ color: "#ddd6fe" }}>This TSX replaced the original string at runtime.</Text>
+      <Pressable
+        accessibilityRole="button"
+        accessibilityLabel={isOn ? "Dynamic state on" : "Dynamic state off"}
+        onPress={() => setIsOn((value) => !value)}
+        style={{ padding: 16, borderRadius: 12, backgroundColor: isOn ? "#4ade80" : "#f472b6" }}
+      >
+        <Text style={{ textAlign: "center", fontWeight: "900" }}>{isOn ? "ON" : "OFF"}</Text>
+      </Pressable>
+    </View>
+  );
+}`;
+
+interface SuccessfulOutput {
+  kind: "success";
+  Component: ComponentType;
+}
+
+interface FailedOutput {
+  kind: "failure";
+  message: string;
+}
+
+type PrototypeOutput = SuccessfulOutput | FailedOutput;
+
+interface PrototypeState {
+  source: string;
+  revision: number;
+  output: PrototypeOutput;
+}
+
+type PrototypeAction = { type: "edit"; source: string } | { type: "run"; output: PrototypeOutput };
+
+function describeError(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
+
+function compile(source: string): PrototypeOutput {
+  try {
+    return { kind: "success", Component: evaluateRuntimeComponent(source) };
+  } catch (error) {
+    return { kind: "failure", message: describeError(error) };
+  }
+}
+
+function createInitialState(): PrototypeState {
+  return {
+    source: INITIAL_SOURCE,
+    revision: 0,
+    output: compile(INITIAL_SOURCE),
+  };
+}
+
+function prototypeReducer(state: PrototypeState, action: PrototypeAction): PrototypeState {
+  if (action.type === "edit") {
+    return { ...state, source: action.source };
+  }
+  return {
+    ...state,
+    revision: state.revision + 1,
+    output: action.output,
+  };
+}
+
+interface RenderBoundaryProps {
+  children: ReactNode;
+}
+
+interface RenderBoundaryState {
+  message: string | null;
+}
+
+class RenderBoundary extends Component<RenderBoundaryProps, RenderBoundaryState> {
+  state: RenderBoundaryState = { message: null };
+
+  static getDerivedStateFromError(error: unknown): RenderBoundaryState {
+    return { message: describeError(error) };
+  }
+
+  render() {
+    if (this.state.message !== null) {
+      return <Text style={styles.errorText}>Render failed: {this.state.message}</Text>;
+    }
+    return this.props.children;
+  }
+}
+
+export function RuntimeComponentPrototypeScreen() {
+  const [state, dispatch] = useReducer(prototypeReducer, undefined, createInitialState);
+
+  const runSource = useCallback(() => {
+    dispatch({ type: "run", output: compile(state.source) });
+  }, [state.source]);
+
+  const editSource = useCallback((source: string) => {
+    dispatch({ type: "edit", source });
+  }, []);
+
+  const loadSecondSource = useCallback(() => {
+    dispatch({ type: "edit", source: SECOND_SOURCE });
+  }, []);
+
+  const output = state.output;
+  return (
+    <SafeAreaView style={styles.safeArea}>
+      <KeyboardAvoidingView
+        behavior={Platform.OS === "ios" ? "padding" : undefined}
+        style={styles.keyboardAvoidingView}
+      >
+        <ScrollView contentContainerStyle={styles.content} keyboardShouldPersistTaps="handled">
+          <Text style={styles.title}>Native runtime component</Text>
+          <Text style={styles.subtitle}>
+            Babel compiles this string locally. Hermes executes it in Paseo&apos;s JavaScript realm.
+          </Text>
+
+          <View style={styles.preview}>
+            {output.kind === "success" ? (
+              <RenderBoundary key={state.revision}>
+                <output.Component />
+              </RenderBoundary>
+            ) : (
+              <Text style={styles.errorText}>Compile failed: {output.message}</Text>
+            )}
+          </View>
+
+          <View style={styles.editorHeader}>
+            <Text style={styles.editorLabel}>user-component.tsx</Text>
+            <View style={styles.editorActions}>
+              <Pressable
+                accessibilityRole="button"
+                accessibilityLabel="Load second authored component"
+                onPress={loadSecondSource}
+                style={styles.loadButton}
+              >
+                <Text style={styles.loadButtonText}>Load second</Text>
+              </Pressable>
+              <Pressable
+                accessibilityRole="button"
+                accessibilityLabel="Run authored component"
+                onPress={runSource}
+                style={styles.runButton}
+              >
+                <Text style={styles.runButtonText}>Run string</Text>
+              </Pressable>
+            </View>
+          </View>
+          <TextInput
+            accessibilityLabel="Authored component source"
+            autoCapitalize="none"
+            autoCorrect={false}
+            multiline
+            onChangeText={editSource}
+            style={styles.editor}
+            textAlignVertical="top"
+            value={state.source}
+          />
+
+          <Text style={styles.warning}>
+            This is code execution, not a sandbox. The string has the same authority as the app.
+          </Text>
+        </ScrollView>
+      </KeyboardAvoidingView>
+    </SafeAreaView>
+  );
+}
+
+const styles = StyleSheet.create({
+  safeArea: { flex: 1, backgroundColor: "#020617" },
+  keyboardAvoidingView: { flex: 1 },
+  content: { gap: 14, padding: 18, paddingBottom: 50 },
+  title: { color: "white", fontSize: 28, fontWeight: "800" },
+  subtitle: { color: "#94a3b8", fontSize: 14, lineHeight: 20 },
+  preview: {
+    minHeight: 260,
+    borderColor: "#334155",
+    borderRadius: 20,
+    borderWidth: 1,
+    justifyContent: "center",
+    padding: 12,
+  },
+  editorHeader: { alignItems: "center", flexDirection: "row", justifyContent: "space-between" },
+  editorActions: { flexDirection: "row", gap: 8 },
+  editorLabel: { color: "#cbd5e1", fontFamily: "Menlo", fontSize: 13 },
+  loadButton: {
+    backgroundColor: "#334155",
+    borderRadius: 8,
+    paddingHorizontal: 12,
+    paddingVertical: 10,
+  },
+  loadButtonText: { color: "#f8fafc", fontWeight: "800" },
+  runButton: {
+    backgroundColor: "#f8fafc",
+    borderRadius: 8,
+    paddingHorizontal: 16,
+    paddingVertical: 10,
+  },
+  runButtonText: { color: "#0f172a", fontWeight: "800" },
+  editor: {
+    minHeight: 520,
+    backgroundColor: "#0f172a",
+    borderColor: "#334155",
+    borderRadius: 12,
+    borderWidth: 1,
+    color: "#e2e8f0",
+    fontFamily: "Menlo",
+    fontSize: 11,
+    lineHeight: 16,
+    padding: 12,
+  },
+  errorText: { color: "#fca5a5", fontSize: 14, lineHeight: 20 },
+  warning: { color: "#fbbf24", fontSize: 12, lineHeight: 18 },
+});
@@ -3042,7 +3042,7 @@ describe("HostRuntimeStore", () => {
    }
  });

-  it("upsertDirectConnection stores SSL and password settings", async () => {
+  it("upsertDirectConnection stores SSL, password, and custom header settings", async () => {
    const store = new HostRuntimeStore({
      deps: {
        createClient: () => new FakeDaemonClient() as unknown as DaemonClient,
@@ -3060,6 +3060,7 @@ describe("HostRuntimeStore", () => {
      endpoint: "example.paseo.test:7443",
      useTls: true,
      password: "shared-secret",
+      headers: { "X-Tenant": "acme" },
      label: "tls host",
    });

@@ -3071,6 +3072,7 @@ describe("HostRuntimeStore", () => {
        endpoint: "example.paseo.test:7443",
        useTls: true,
        password: "shared-secret",
+        headers: { "X-Tenant": "acme" },
      },
    ]);

@@ -36,6 +36,7 @@ import {
 import {
  buildLocalDaemonTransportUrl,
  createDesktopLocalDaemonTransportFactory,
+  createDesktopWebSocketTransportFactory,
 } from "@/desktop/daemon/desktop-daemon-transport";
 import { getDesktopHost } from "@/desktop/host";
 import { CLIENT_CAPS } from "@getpaseo/protocol/client-capabilities";
@@ -478,7 +479,10 @@ function createDefaultDeps(): HostRuntimeControllerDeps {
  return {
    createClient: ({ host, connection, clientId, runtimeGeneration }) => {
      const localTransportFactory = createDesktopLocalDaemonTransportFactory();
-      const webSocketConfig = { webSocketFactory: createAppWebSocketFactory() };
+      const webSocketTransportFactory = createDesktopWebSocketTransportFactory();
+      const webSocketConfig = webSocketTransportFactory
+        ? { transportFactory: webSocketTransportFactory }
+        : { webSocketFactory: createAppWebSocketFactory() };
      const base = {
        suppressSendErrors: true,
        clientId,
@@ -506,6 +510,7 @@ function createDefaultDeps(): HostRuntimeControllerDeps {
            useTls: connection.useTls ?? false,
          }),
          ...(connection.password ? { password: connection.password } : {}),
+          ...(connection.headers ? { headers: connection.headers } : {}),
        });
      }
      return new DaemonClient({
@@ -1646,6 +1651,7 @@ export class HostRuntimeStore {
    endpoint: string;
    useTls?: boolean;
    password?: string;
+    headers?: Record<string, string>;
    label?: string;
    existingClient?: DaemonClient;
  }): Promise<HostProfile> {
@@ -1660,6 +1666,7 @@ export class HostRuntimeStore {
        endpoint,
        useTls: input.useTls ?? false,
        ...(password ? { password } : {}),
+        ...(input.headers ? { headers: input.headers } : {}),
      },
      existingClient: input.existingClient,
    });
@@ -1701,6 +1708,7 @@ export class HostRuntimeStore {
    endpoint: string;
    useTls?: boolean;
    password?: string;
+    headers?: Record<string, string>;
    label?: string;
  }): Promise<{ profile: HostProfile; serverId: string; hostname: string | null }> {
    const endpoint = normalizeHostPort(input.endpoint);
@@ -1713,6 +1721,7 @@ export class HostRuntimeStore {
        endpoint,
        useTls: input.useTls ?? false,
        ...(password ? { password } : {}),
+        ...(input.headers ? { headers: input.headers } : {}),
      },
    });
  }
@@ -2454,12 +2463,14 @@ export interface HostMutations {
    endpoint: string;
    useTls?: boolean;
    password?: string;
+    headers?: Record<string, string>;
    label?: string;
  }) => Promise<HostProfile>;
  probeAndUpsertDirectConnection: (input: {
    endpoint: string;
    useTls?: boolean;
    password?: string;
+    headers?: Record<string, string>;
    label?: string;
  }) => Promise<{ profile: HostProfile; serverId: string; hostname: string | null }>;
  upsertRelayConnection: (input: {
@@ -508,7 +508,7 @@ function TabHandleContent({
  return (
    <View style={styles.tabHandle} dataSet={tabHandleDataSet}>
      <View style={styles.tabIcon}>
-        <WorkspaceTabIcon presentation={presentation} active={isHighlighted} backdrop="surface0" />
+        <WorkspaceTabIcon presentation={presentation} active={isHighlighted} />
      </View>
      {showLabel && presentation.titleState === "loading" ? (
        <View style={tabLabelSkeletonStyle} />
@@ -175,7 +175,6 @@ import {
 import { findAdjacentPane } from "@/utils/split-navigation";
 import { useIsCompactFormFactor, supportsDesktopPaneSplits } from "@/constants/layout";
 import { getIsElectron, isNative, isWeb } from "@/constants/platform";
-import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
 import { useContainerWidthBelow } from "@/hooks/use-container-width";
 import {
  buildHostRootRoute,
@@ -430,12 +429,10 @@ function MobileActiveTabTrigger({
  activeTab,
  normalizedServerId,
  normalizedWorkspaceId,
-  backdrop,
 }: {
  activeTab: WorkspaceTabDescriptor | null;
  normalizedServerId: string;
  normalizedWorkspaceId: string;
-  backdrop: SurfaceBackdrop;
 }) {
  if (!activeTab) {
    return null;
@@ -446,7 +443,6 @@ function MobileActiveTabTrigger({
      activeTab={activeTab}
      normalizedServerId={normalizedServerId}
      normalizedWorkspaceId={normalizedWorkspaceId}
-      backdrop={backdrop}
    />
  );
 }
@@ -455,12 +451,10 @@ function ResolvedMobileActiveTabTrigger({
  activeTab,
  normalizedServerId,
  normalizedWorkspaceId,
-  backdrop,
 }: {
  activeTab: WorkspaceTabDescriptor;
  normalizedServerId: string;
  normalizedWorkspaceId: string;
-  backdrop: SurfaceBackdrop;
 }) {
  const { t } = useTranslation();
  return (
@@ -472,7 +466,7 @@ function ResolvedMobileActiveTabTrigger({
      {(presentation) => (
        <>
          <View style={styles.switcherTriggerIcon} testID="workspace-active-tab-icon">
-            <WorkspaceTabIcon presentation={presentation} active backdrop={backdrop} />
+            <WorkspaceTabIcon presentation={presentation} active />
          </View>

          <Text style={styles.switcherTriggerText} numberOfLines={1}>
@@ -747,19 +741,14 @@ const MobileWorkspaceTabSwitcher = memo(function MobileWorkspaceTabSwitcher({
        style={switcherTriggerStyle}
        onPress={handleOpenSwitcher}
      >
-        {({ pressed }) => (
-          <>
-            <View style={styles.switcherTriggerLeft}>
-              <MobileActiveTabTrigger
-                activeTab={activeTab}
-                normalizedServerId={normalizedServerId}
-                normalizedWorkspaceId={normalizedWorkspaceId}
-                backdrop={pressed ? "surface1" : "surface0"}
-              />
-            </View>
-            <ThemedChevronDown size={14} uniProps={mutedColorMapping} />
-          </>
-        )}
+        <View style={styles.switcherTriggerLeft}>
+          <MobileActiveTabTrigger
+            activeTab={activeTab}
+            normalizedServerId={normalizedServerId}
+            normalizedWorkspaceId={normalizedWorkspaceId}
+          />
+        </View>
+        <ThemedChevronDown size={14} uniProps={mutedColorMapping} />
      </Pressable>

      <Combobox
@@ -8,10 +8,7 @@ import { ensurePanelsRegistered } from "@/panels/register-panels";
 import { getPanelRegistration } from "@/panels/panel-registry";
 import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
 import type { SidebarStateBucket } from "@/utils/sidebar-agent-state";
-import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
 import { getStatusDotColor } from "@/utils/status-dot-color";
-import { StatusRing } from "@/components/status-ring";
-import { getStatusRingOffset } from "@/components/status-ring/geometry";
 import {
  STATUS_INDICATOR_ALERT_SIZE,
  STATUS_INDICATOR_DOT_SIZE,
@@ -115,13 +112,6 @@ interface WorkspaceTabIconProps {
  active?: boolean;
  size?: number;
  statusDotBorderColor?: string;
-  /**
-   * The surface this icon is sitting on, so the running ring can knock out of it. This icon is
-   * shared by the desktop tab strip, the tab switcher trigger, the split drag chip and the
-   * subagents track, which are on different surfaces and some of which change surface on hover —
-   * it cannot work the colour out for itself.
-   */
-  backdrop: SurfaceBackdrop;
 }

 const ThemedCheckIcon = withUnistyles(Check);
@@ -137,13 +127,12 @@ export function WorkspaceTabIcon({
  active = false,
  size = 14,
  statusDotBorderColor,
-  backdrop,
 }: WorkspaceTabIconProps): ReactElement {
  const iconColor = active ? styles.iconActive.color : styles.iconInactive.color;
  const bucket = presentation.statusBucket;
-  const isRunning = bucket === "running";
  let statusDotColor: string | undefined;
  if (bucket === "failed") statusDotColor = styles.statusDotFailed.color;
+  else if (bucket === "running") statusDotColor = styles.statusDotRunning.color;
  else if (bucket === "attention") statusDotColor = styles.statusDotAttention.color;
  const showNeedsInputAlert = bucket === "needs_input";
  const Icon = presentation.icon;
@@ -165,16 +154,13 @@ export function WorkspaceTabIcon({
  return (
    <View style={agentIconWrapperStyle}>
      <Icon size={size} color={iconColor} />
-      {isRunning ? (
+      {statusDotColor ? (
        <View
-          style={styles.statusRing}
-          accessibilityRole="progressbar"
-          accessibilityLabel="Agent running"
-        >
-          <StatusRing backdrop={backdrop} />
-        </View>
+          style={statusDotStyle}
+          accessibilityRole={bucket === "running" ? "progressbar" : undefined}
+          accessibilityLabel={bucket === "running" ? "Agent running" : undefined}
+        />
      ) : null}
-      {statusDotColor ? <View style={statusDotStyle} /> : null}
      {showNeedsInputAlert ? (
        <View style={styles.statusAlertOverlay}>
          <ThemedCircleAlert size={STATUS_INDICATOR_ALERT_SIZE} uniProps={needsInputAlertMapping} />
@@ -200,17 +186,12 @@ export function WorkspaceTabOptionRow({
  trailingAccessory,
 }: WorkspaceTabOptionRowProps): ReactElement {
  const { t } = useTranslation();
-  const isOptionActive = useCallback(
-    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) =>
-      Boolean(hovered) || pressed || active,
-    [active],
-  );
  const pressableStyle = useCallback(
-    (state: PressableStateCallbackType & { hovered?: boolean }) => [
+    ({ hovered, pressed }: PressableStateCallbackType & { hovered?: boolean }) => [
      styles.optionMainPressable,
-      isOptionActive(state) && styles.optionRowActive,
+      (Boolean(hovered) || pressed || active) && styles.optionRowActive,
    ],
-    [isOptionActive],
+    [active],
  );
  const optionRowStyle = useMemo(
    () => [styles.optionRow, active && styles.optionRowActive],
@@ -219,27 +200,16 @@ export function WorkspaceTabOptionRow({
  return (
    <View style={optionRowStyle}>
      <Pressable onPress={onPress} style={pressableStyle}>
-        {(state) => {
-          const optionActive = isOptionActive(state);
-          return (
-            <>
-              <View style={styles.optionLeadingSlot}>
-                <WorkspaceTabIcon
-                  presentation={presentation}
-                  active={selected || active}
-                  backdrop={optionActive ? "surface1" : "surface0"}
-                />
-              </View>
-              <View style={styles.optionContent}>
-                <Text numberOfLines={1} style={styles.optionLabel}>
-                  {presentation.titleState === "loading"
-                    ? t("workspace.tabs.loading")
-                    : presentation.label}
-                </Text>
-              </View>
-            </>
-          );
-        }}
+        <View style={styles.optionLeadingSlot}>
+          <WorkspaceTabIcon presentation={presentation} active={selected || active} />
+        </View>
+        <View style={styles.optionContent}>
+          <Text numberOfLines={1} style={styles.optionLabel}>
+            {presentation.titleState === "loading"
+              ? t("workspace.tabs.loading")
+              : presentation.label}
+          </Text>
+        </View>
      </Pressable>
      {presentation.modified ? (
        <View style={styles.optionModifiedDot} accessibilityLabel={t("workspace.tabs.modified")} />
@@ -271,11 +241,6 @@ const styles = StyleSheet.create((theme) => ({
    borderRadius: theme.borderRadius.full,
    borderWidth: 1,
  },
-  statusRing: {
-    position: "absolute",
-    right: getStatusRingOffset(DEFAULT_STATUS_DOT_OFFSET, STATUS_INDICATOR_DOT_SIZE),
-    bottom: getStatusRingOffset(DEFAULT_STATUS_DOT_OFFSET, STATUS_INDICATOR_DOT_SIZE),
-  },
  statusDotBorderDefault: {
    borderColor: theme.colors.surface0,
  },
@@ -71,6 +71,34 @@ describe("draft-store lifecycle", () => {
 });

 describe("draft-store normalization", () => {
+  it("preserves plugin resources when hydrating a draft", () => {
+    const attachment = {
+      kind: "plugin_resource" as const,
+      pluginId: "linear",
+      sourceId: "issues",
+      sourceTitle: "Linear issue",
+      sourceIcon: "CircleDot",
+      item: {
+        id: "issue-uuid",
+        identifier: "ENG-123",
+        title: "Plugin attachments",
+        subtitle: "In progress",
+        url: "https://linear.app/acme/issue/ENG-123/plugin-attachments",
+        text: "Linear issue ENG-123: Plugin attachments",
+        resourceType: "issue",
+      },
+    };
+
+    expect(
+      toDraftInputIfReady({
+        input: { text: "Implement this", attachments: [attachment] },
+        lifecycle: "active",
+        updatedAt: 1,
+        version: 1,
+      }),
+    ).toEqual({ text: "Implement this", attachments: [attachment] });
+  });
+
  it("preserves uploaded file attachments when hydrating a draft", () => {
    const attachment = {
      kind: "file" as const,
@@ -9,6 +9,7 @@ import {
  GitHubSearchItemSchema,
  UploadedFileAttachmentSchema,
 } from "@getpaseo/protocol/messages";
+import { PluginResourceComposerAttachmentSchema } from "@/plugins/attachments/model";

 export const DRAFT_STORE_VERSION = 5;
 export const FINALIZED_DRAFT_TTL_MS = 5 * 60 * 1000;
@@ -94,6 +95,9 @@ export function isUserComposerAttachment(value: unknown): value is UserComposerA
  if (record.kind === "file") {
    return UploadedFileAttachmentSchema.safeParse(record.attachment).success;
  }
+  if (record.kind === "plugin_resource") {
+    return PluginResourceComposerAttachmentSchema.safeParse(record).success;
+  }
  if (
    record.kind !== "forge_issue" &&
    record.kind !== "forge_change_request" &&
@@ -77,8 +77,8 @@ describe("createMarkdownStyles", () => {
    expect(styles.code_inline).toMatchObject({
      fontFamily: darkTheme.fontFamily.mono,
      fontSize: darkTheme.fontSize.code,
+      lineHeight: Math.round(darkTheme.fontSize.code * 1.45),
    });
-    expect(styles.code_inline).not.toHaveProperty("lineHeight");
    expect(styles.code_block).toMatchObject({
      fontFamily: darkTheme.fontFamily.mono,
      fontSize: darkTheme.fontSize.code,
@@ -90,7 +90,7 @@ describe("createMarkdownStyles", () => {
    expect(compactStyles.code_inline).toMatchObject({
      fontFamily: darkTheme.fontFamily.mono,
      fontSize: darkTheme.fontSize.code,
+      lineHeight: Math.round(darkTheme.fontSize.code * 1.45),
    });
-    expect(compactStyles.code_inline).not.toHaveProperty("lineHeight");
  });
 });
@@ -172,6 +172,7 @@ export function createMarkdownStyles(theme: Theme) {
      borderWidth: 0,
      fontFamily: theme.fontFamily.mono,
      fontSize: theme.fontSize.code,
+      lineHeight: Math.round(theme.fontSize.code * 1.45),
    },

    code_block: {
@@ -11,14 +11,4 @@
 * `StyleSheet.create` — see docs/unistyles.md. Each knockout maps the name to a style of its own.
 * Add a token here when a knockout lands on a surface that isn't listed.
 */
-export type SurfaceBackdrop =
-  | "surface0"
-  | "surface1"
-  | "surface2"
-  | "surfaceSidebar"
-  | "surfaceSidebarHover";
-
-export type SidebarSurfaceBackdrop = Extract<
-  SurfaceBackdrop,
-  "surfaceSidebar" | "surfaceSidebarHover" | "surface2"
->;
+export type SurfaceBackdrop = "surfaceSidebar" | "surfaceSidebarHover" | "surface2";
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mohamed Boudra	3a3751f1bf	test(server): distinguish Hub execution sessions	2026-08-09 02:39:21 +02:00
Mohamed Boudra	cb4976289b	test(server): exclude internal sessions from Hub counts	2026-08-09 02:26:55 +02:00
Mohamed Boudra	2668f31e07	fix(nix): refresh npm dependency hash	2026-08-09 02:06:43 +02:00
Mohamed Boudra	be523e09e9	feat(plugins): add Linear attachment source	2026-08-09 01:53:55 +02:00
Mohamed Boudra	1c41ba0bee	feat(plugins): add local plugin surfaces and RPCs Keep plugin execution scoped to its daemon while allowing one local TypeScript entry point to contribute validated RPCs and native client surfaces. Paseo owns host selection, navigation chrome, and per-installation query caches.	2026-08-09 01:53:55 +02:00