feat(app): edit source files on mobile

Use one source-editor contract and shared editing runtime across browser and native hosts so file-pane persistence, conflicts, and line endings keep the same semantics on every platform.

CHANGELOG.md

@@ -1,29 +1,5 @@
 # Changelog
 
-## 0.7.0-beta.2 - 2026-08-28
-
-### Added
-
-- Added SSH connections to existing remote daemons from Desktop and CLI ([#3989](https://github.com/getpaseo/paseo/pull/3989) by [@reidlevesque](https://github.com/reidlevesque))
-- Added workspace management and layout actions to the Command Center ([#3013](https://github.com/getpaseo/paseo/pull/3013) by [@cleiter](https://github.com/cleiter))
-- Added contextual composer-pill contributions for plugins ([#3956](https://github.com/getpaseo/paseo/pull/3956))
-- Added host UI primitives for client plugins ([#3967](https://github.com/getpaseo/paseo/pull/3967))
-- Added PR and MR number search to the Command Center ([#3008](https://github.com/getpaseo/paseo/pull/3008) by [@cleiter](https://github.com/cleiter))
-- Added session commands to agent SDK handles ([#3719](https://github.com/getpaseo/paseo/pull/3719) by [@gpambrozio](https://github.com/gpambrozio), [@marvin-ambrozio](https://github.com/marvin-ambrozio))
-
-### Improved
-
-- Batched GitHub pull request polling within the reserved API budget ([#3825](https://github.com/getpaseo/paseo/pull/3825) by [@dezchai](https://github.com/dezchai))
-
-### Fixed
-
-- Fixed daemon reconnects stalling while Git processes were queued ([#3945](https://github.com/getpaseo/paseo/pull/3945))
-- Fixed restored workspace tabs entering reconciliation loops ([#3987](https://github.com/getpaseo/paseo/pull/3987))
-- Fixed immediate dictation submissions omitting the newest speech segment ([#3968](https://github.com/getpaseo/paseo/pull/3968))
-- Fixed archived workspaces returning from durable cache ([#3975](https://github.com/getpaseo/paseo/pull/3975))
-- Fixed commits and squash merges bypassing configured Git signing ([#3976](https://github.com/getpaseo/paseo/pull/3976))
-- Fixed Markdown literal characters being replaced by typographic symbols ([#3253](https://github.com/getpaseo/paseo/pull/3253) by [@cleiter](https://github.com/cleiter))
-
 ## 0.7.0-beta.1 - 2026-08-27
 
 ### Changed

CLAUDE.md

@@ -46,7 +46,9 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
 | [docs/rpc-namespacing.md](docs/rpc-namespacing.md)                   | WebSocket RPC naming convention — dotted namespaces and `.request`/`.response` pairs                                           |
 | [docs/protocol-compatibility.md](docs/protocol-compatibility.md)     | Why app/daemon versions drift, protocol vs feature contract, capability gating, COMPAT tagging                                 |
 | [docs/protocol-validation.md](docs/protocol-validation.md)           | zod-aot generated inbound WebSocket validation, patched compiler regressions, schema-purity rules                              |
+| [docs/permissions.md](docs/permissions.md)                           | Semantic daemon permissions, principals, credentials, pairing invitations, and Hub authority                                   |
 | [docs/terminal-performance.md](docs/terminal-performance.md)         | Terminal latency pipeline, coalescing/backpressure invariants, benchmark + perf spec usage                                     |
+| [docs/source-editor.md](docs/source-editor.md)                       | Shared CodeMirror runtime, native bridge boundary, line-ending preservation, and embedded bundle workflow                      |
 | [docs/agent-stream-performance.md](docs/agent-stream-performance.md) | Assistant text pipeline — coalescing window, paced reveal, why arrival lumps are smoothed at render                            |
 | [docs/file-observation.md](docs/file-observation.md)                 | Recursive watcher ownership, Linux constraints, teardown invariants, and Parcel comparison                                     |
 | [docs/testing.md](docs/testing.md)                                   | TDD workflow, determinism, real dependencies over mocks, test organization                                                     |

docs/architecture.md

@@ -109,6 +109,7 @@ Cross-platform React Native app that connects to one or more daemons.
 - `workspace-labels` owns one sequenced catalog replica per connected host, the deterministic cross-host projection that surfaces spanning hosts use (the filter page, the manager), and the per-host resolution a workspace row's chips use. Two hosts may give one name different colors, so a row resolves against its own host's catalog and a merged answer would be wrong there. Catalogs never synchronize between hosts; assignment creates a missing definition only on the target host. On the daemon, catalog and assignment rewrites share a journaled commit boundary. Startup recovery completes that commit before workspace or catalog publication.
 - `SessionContext` wraps the daemon client for the active session
 - Composer UI and submit/draft behavior live in `packages/app/src/composer/`; screens and panels should integrate it from there instead of dropping composer internals into `components/`, `hooks/`, or `screens/workspace/`
+- Source editing uses one CodeMirror runtime on web and in an offline native WebView. Its ownership and bridge constraints are documented in [docs/source-editor.md](source-editor.md).
 - Timeline reducers in `timeline/session-stream-reducers.ts` handle compaction, gap detection, sequence-based deduplication
 - Timeline sync correctness is documented in [docs/timeline-sync.md](timeline-sync.md): live streams are for immediacy, `fetch_agent_timeline_request` is authoritative, and catch-up is paged but complete.
 - Voice features: dictation (STT) and voice agent (realtime)

docs/custom-providers.md

@@ -393,6 +393,7 @@ Custom OMP profiles should extend `omp`. They inherit the OMP adapter's `rpc-ui`
         },
         "params": {
           "sessionDir": "~/.local/state/omp-work/omp/agent/sessions",
+          "rpcTimeoutMs": 60000,
           "smolModel": "openai/gpt-5-mini",
           "slowModel": "anthropic/claude-opus-4-1",
           "planModel": "openai/o3"
@@ -403,7 +404,7 @@ Custom OMP profiles should extend `omp`. They inherit the OMP adapter's `rpc-ui`
 }
 ```
 
-`params.sessionDir` is used only for importing sessions that were started outside Paseo. If `command` or XDG env vars move OMP's state directory, set `params.sessionDir` to the resulting OMP JSONL session directory; launching and resuming still go through the configured command.
+`params.sessionDir` is used only for importing sessions that were started outside Paseo. If `command` or XDG env vars move OMP's state directory, set `params.sessionDir` to the resulting OMP JSONL session directory; launching and resuming still go through the configured command. `params.rpcTimeoutMs` overrides the 60-second OMP control-plane RPC deadline.
 
 For other providers that keep Pi's `--mode rpc` API but write sessions somewhere else, extend `pi`, replace the command, and provide the JSONL session directory:
 
@@ -416,7 +417,8 @@ For other providers that keep Pi's `--mode rpc` API but write sessions somewhere
         "label": "My Pi Fork",
         "command": ["my-pi-fork"],
         "params": {
-          "sessionDir": "~/.my-pi-fork/sessions"
+          "sessionDir": "~/.my-pi-fork/sessions",
+          "rpcTimeoutMs": 60000
         }
       }
     }
@@ -424,7 +426,7 @@ For other providers that keep Pi's `--mode rpc` API but write sessions somewhere
 }
 ```
 
-This session directory is also import-only. Launching and resuming still go through the configured command, so this example resumes with `my-pi-fork --mode rpc --session <session-file>`.
+This session directory is also import-only. Launching and resuming still go through the configured command, so this example resumes with `my-pi-fork --mode rpc --session <session-file>`. `params.rpcTimeoutMs` overrides the 60-second Pi control-plane RPC deadline.
 
 ---
 

docs/floating-panels.md

@@ -132,30 +132,21 @@ quietly relying on:
 
 The fix for transforms is Gotcha 3. The fix for context is Gotcha 7.
 
-## Gotcha 3 — Reanimated transforms vs `measureInWindow`
+## Gotcha 3 — Keyboard layout and portal anchors
 
-`measureInWindow` returns the view's _current_ screen position. In theory that
-includes Reanimated-applied transforms (Reanimated updates native view
-properties, and Android's `getLocationInWindow` reads transformed coords). In
-practice it's racy — the measurement may snapshot mid-animation, and on Android
-with Reanimated worklets the result is not always stable.
+Move the chat surface with worklet-driven bottom padding from
+`KeyboardShiftProvider`. Padding keeps the stream, composer, visual position,
+and native hit testing in the same layout. Do not translate the stream and
+composer independently.
 
-If the panel cannot stay inside the transformed ancestor, do not try to track
-the keyboard by re-measuring on every frame. Instead,
-**slave the popover's transform to the same `KeyboardShiftProvider` SharedValue
-the composer uses**:
+Do not use the controller's raw keyboard progress for the padding. It can retain
+a nonzero value after the keyboard closes. The shared provider normalizes that
+state and reconciles native animation-end events.
 
-1. Snapshot `openShift = shift.value` at the moment you measure the anchor.
-2. Apply `useAnimatedStyle(() => ({ transform: [{ translateY: openShift.value - shift.value }] }))`
-   to the popover wrapper.
-
-When `shift` equals `openShift`, the translate is 0 and the popover sits at
-the measured position. When the keyboard moves afterward, the delta translates
-the popover by exactly the amount the composer translates. They move in
-lockstep, no re-measurement needed. Do not call
-`useReanimatedKeyboardAnimation()` directly for app UI offset policy; Android
-can briefly report a stale nonzero height with closed progress, and the shared
-provider is where that is normalized.
+`measureInWindow` already includes the dock's current padding layout. When a
+portal opens, snapshot the current shift and apply only the subsequent shift
+delta to its animated `bottom`. Adding the full shift moves the portal twice and
+can place it over the composer controls.
 
 The provider also reconciles iOS from the controller's native `onEnd` event.
 The controller's stock iOS shared values update at move start and during an

docs/hub.md

@@ -4,7 +4,7 @@ Paseo Hub is an explicit opt-in connection from one Paseo daemon to one Hub. Run
 not register it with a Hub. The relationship begins only when a user runs
 `paseo hub connect [url]` from the daemon machine with an explicit API key or matching stored CLI login.
 
-The human CLI login and daemon relationship are separate identities. `paseo hub login [url]` stores a durable organization-scoped CLI credential keyed by normalized Hub origin under `PASEO_HOME`. Origin resolution uses explicit command input, `PASEO_HUB_URL`, active login, then `https://hub.paseo.sh`. Connect uses exact-origin authority to request a one-time enrollment token, then passes only that token to the daemon. The daemon generates and persists its own relationship credential.
+The human CLI login and daemon relationship are separate identities. `paseo hub login [url]` stores a durable organization-scoped CLI credential keyed by normalized Hub origin under `PASEO_HOME`. Interactive login optionally connects the local daemon, then points to the Hub UI for trigger configuration; it does not scaffold or deploy configuration. `paseo hub init` remains the explicit triggers-as-code scaffold. `paseo hub export [directory]` writes the active organization's current triggers as one self-contained YAML file per trigger, using the active login unless another Hub or API key is selected. Origin resolution uses explicit command input, `PASEO_HUB_URL`, active login, then `https://hub.paseo.sh`. Connect uses exact-origin authority to request a one-time enrollment token, then passes only that token to the daemon. The daemon generates and persists its own relationship credential.
 
 ## Connection and authority
 
@@ -24,10 +24,10 @@ receive only `hub.execution.*` authority, so execution credentials cannot manage
 ## Session grants and execution ownership
 
 Trusted clients and the Hub use the same `Session` implementation. The connection boundary supplies
-grants: trusted clients receive `*`, while an enrolled Hub connection receives its persisted
-`hub.execution.*` grant. One matcher handles exact RPC names and trailing namespace wildcards for
-both inbound requests and outbound messages. A denied request returns the ordinary `rpc_error`
-shape.
+semantic permissions: trusted clients receive the owner permission set, while an enrolled Hub
+connection receives `hub.execute`. The current enrollment and persistence format still carries
+`hub.execution.*`; one compatibility boundary translates it before the session is created. A denied
+request returns the ordinary `rpc_error` shape. See [permissions.md](permissions.md).
 
 The Hub connection still has a narrow lifecycle boundary: it has no trusted-client hello/resume,
 browser, binary, retained-session, or broadcast state. Its outbound execution events include only

docs/mobile-testing.md

@@ -259,7 +259,9 @@ background music stays paused. On iOS this is not just a "while recording" probl
 `.playAndRecord`/`.voiceChat` category is non-mixing and survives backgrounding, and iOS re-asserts
 it every time the app returns to the foreground — so one dictation turn kills music for the life of
 the process, on every open, until the app is force-quit. Android holds
-`AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE` with the same effect.
+`AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE` with the same effect. It must also reset
+`MODE_IN_COMMUNICATION` and clear the selected communication device; abandoning focus alone can
+leave Bluetooth earbuds on their narrow-band call route without an active microphone indicator.
 
 `createAudioEngine` (`packages/app/src/voice/audio-engine.native.ts`) calls
 `releaseAudioSession()` whenever capture stops and the playback queue drains, and the iOS module
@@ -267,9 +269,9 @@ also releases on `OnAppEntersBackground`. The native side re-guards on `isRecord
 `speechPlayer.isPlaying`, because the native engine is a singleton shared by multiple JS engine
 wrappers (voice provider + dictation) and only it knows the true state.
 
-This cannot be validated by a JS test — verify on a device: play music, open Paseo, use dictation
-once, stop, and confirm the music resumes; then background/foreground the app and confirm it keeps
-playing.
+This cannot be validated by a JS test — verify on a device: play music through Bluetooth earbuds,
+open Paseo, use dictation once, stop, and confirm the music resumes at full quality; then
+background/foreground the app and confirm it keeps playing at full quality.
 
 ## Unistyles + Reanimated
 

docs/permissions.md

@@ -0,0 +1,59 @@
+# Daemon permissions
+
+The daemon authorizes principals with semantic permissions. RPC names and protocol namespaces are not authority.
+
+## Model
+
+```text
+principal -> grants
+    |
+    +-- authenticated by a device or service credential
+    `-- opens a session with equal or narrower authority
+```
+
+A principal is the durable identity the daemon authorizes. A credential proves that a device or service represents it. Keep them separate so you can rotate credentials, attach more than one device, and revoke a Hub user without inventing daemon user accounts.
+
+A pairing invitation is neither. It is an expiring, single-use exchange that creates a principal and credential with the permissions selected by its issuer.
+
+## Permissions
+
+| Permission          | Authority                                                                  |
+| ------------------- | -------------------------------------------------------------------------- |
+| `daemon.read`       | Daemon status, diagnostics, configuration, and provider information        |
+| `daemon.manage`     | Restart, update, configuration changes, providers, skills, and plugins     |
+| `tunnel.manage`     | Relay, Hub, service tunnel, and public endpoint relationships              |
+| `access.manage`     | Pairing invitations, principals, credentials, grants, and revocation       |
+| `workspace.read`    | Projects, workspaces, agents, timelines, files, diffs, and terminal output |
+| `workspace.write`   | Prompts, agent control, files, terminals, git operations, and scripts      |
+| `workspace.manage`  | Create, rename, archive, and remove projects and workspaces                |
+| `automation.manage` | Schedules, heartbeats, and loops                                           |
+| `hub.execute`       | The Hub-owned execution lifecycle                                          |
+
+Agents and terminals use workspace authority. Both can execute code and mutate the workspace, so separate write permissions would claim an isolation boundary the daemon cannot enforce.
+
+Owner, operator, and viewer are UI presets expanded into explicit permissions. Do not persist them as roles. Adding a permission must not silently widen an existing principal.
+
+Permissions are additive allows. Missing authority denies the operation. Do not add deny precedence.
+
+## Resources
+
+Permissions are daemon-wide today. Future grants may select workspaces or agents, but operation classification remains inside the authorization module:
+
+```ts
+type Grant = {
+  permission: Permission;
+  resource: { kind: "daemon" } | { kind: "workspace"; ids: string[] };
+};
+```
+
+A delegating principal can grant only authority it already possesses. A session may attenuate its principal's grants but cannot widen them.
+
+Workspace-scoped grants require every resource-bearing operation and outbound observation to enforce the same workspace boundary. File preview currently accepts any daemon-readable regular file, so it must gain resource enforcement before workspace-specific access ships.
+
+## Hub
+
+The Hub authenticates as a service principal. Its locally selected grants decide whether it may execute agents, manage the daemon, manage tunnels, or manage access.
+
+Hub user and role identifiers remain opaque external subjects. The Hub may create and revoke linked daemon principals when granted `access.manage`; the daemon does not interpret accounts, organizations, or roles.
+
+The current Hub enrollment protocol still exchanges `hub.execution.*`. The daemon translates that legacy value to `hub.execute` once at the connection boundary. Remove the translation when Hub enrollment exchanges semantic permissions.

docs/plugins.md

@@ -201,9 +201,10 @@ when moved between hosts. Explorer configuration can create workspace-context pa
 existing agent-context instances, but it cannot create an agent panel without an agent-aware command.
 
 Command Center callbacks use the selected host's existing `PaseoApi` for normal Paseo operations.
-They use typed plugin RPC only for plugin-specific backend work. Navigation is limited to the
-plugin's registered global surfaces and workspace panels; plugins do not receive Expo Router or
-workspace-layout store access.
+They use typed plugin RPC only for plugin-specific backend work. Surface and panel props expose
+optional client-owned agent and workspace navigation; its absence is the compatibility gate for
+older clients. Other navigation remains limited to registered global surfaces and workspace panels.
+Plugins do not receive Expo Router or workspace-layout store access.
 
 ## Contribute composer pills
 

docs/providers.md

@@ -67,6 +67,8 @@ Pi model records expose input capabilities through `model.input`. Only send raw
 
 Pi MCP support depends on the open-source `pi-mcp-adapter` extension being loaded for the agent cwd. Probe with Pi RPC `get_commands`; the adapter registers an extension command named `mcp` (often with `sourceInfo.source` containing `pi-mcp-adapter`). When Paseo injects MCP servers into Pi, write a per-agent MCP config and pass it with `--mcp-config` instead of modifying user or project MCP files. Because that flag replaces the Pi global config layer, preserve the existing `<Pi agent dir>/mcp.json` in the generated file before overlaying injected servers. For local HTTP servers such as Paseo's own `/mcp/agents` endpoint, explicitly disable adapter OAuth (`auth: false`, `oauth: false`) in the generated config.
 
+Pi and OMP control-plane RPCs wait 60 seconds by default. Override the provider's `params.rpcTimeoutMs` when extension or MCP startup on a slow host needs a different deadline. Timeout errors name the pending RPC phase and report both elapsed time and the configured deadline. This setting does not govern long-running Pi compaction or Pi extension UI results.
+
 Pi import discovery reads Pi's persisted JSONL session files because Pi RPC does not expose a recent-session listing command. Resume and full history hydration still go through `pi --mode rpc` using the session file as `nativeHandle`.
 
 OMP is a first-class built-in provider, disabled by default. Its launch contract, typed runtime, agent/session behavior, history, permissions, imports, and test fake live under `providers/omp/`; only the provider-neutral JSONL child-process transport is shared with Pi. It launches `omp --mode rpc-ui`, uses OMP's `get_available_commands` RPC for slash-command discovery, bridges OMP `rpc-ui` approval dialogs into Paseo permissions, and imports terminal-started sessions from `~/.omp/agent/sessions` when enabled.
@@ -75,7 +77,9 @@ OMP supports native Paseo host tools. The adapter registers the full caller-scop
 
 Pi RPC extension UI dialog requests (`select`, `input`, `editor`, `confirm`) are bridged into Paseo question permissions and answered with `extension_ui_response`. Pi extensions such as `ask_user` may chain dialogs: for example, a `select` can be followed by an optional-comment `input`. When an `ask_user` tool call declares `allowComment: true`, Paseo presents the selection and optional comment as one question permission, answers Pi's initial `select` immediately, then auto-answers the follow-up optional `input` with the comment the user already supplied (or an empty string). Preserve placeholders and optional/skip semantics for standalone optional inputs so the app can still distinguish "skip this optional input" from "cancel the whole dialog." Fire-and-forget extension UI requests such as notifications are intentionally ignored by the provider adapter unless Paseo grows first-class UI for them.
 
-OpenCode MCP injection is dynamic and session-scoped. Call OpenCode's `mcp.add` endpoint with the MCP server config and do not follow it with `mcp.connect`; `connect` only toggles MCP servers already present in OpenCode's own config. New OpenCode versions return `McpServerNotFoundError`/404 for `connect` after a dynamic add because the server is not config-backed, while older versions silently swallowed the same missing-config path.
+OpenCode 1 keeps MCP and process environment outside the session boundary. Paseo shares one OpenCode server for ordinary agents and installs a daemon-owned plugin through `OPENCODE_CONFIG_CONTENT`. The plugin reads the exact agent environment and caller-scoped Paseo tool catalog from the daemon's private loopback bridge for each OpenCode session. Bridge context lives only in daemon memory and is removed when the Paseo session closes. The content-addressed plugin artifact contains no session data or secrets.
+
+An agent with custom environment variables or user-configured MCP servers gets a dedicated OpenCode server. Keep that isolation until OpenCode exposes those values as session-owned configuration. Configure custom MCP with `mcp.add`; do not follow it with `mcp.connect`, which only toggles config-backed servers.
 
 OpenCode owns user message IDs. Do not pass Paseo-generated IDs to OpenCode prompt APIs; let OpenCode create `msg*` IDs and record the user timeline item from the `message.updated` event.
 

docs/source-editor.md

@@ -0,0 +1,35 @@
+# Source editor
+
+The source editor has one CodeMirror runtime and two hosts:
+
+- Web mounts the runtime directly into the page.
+- iOS and Android mount the same runtime from a generated, offline HTML document in a WebView.
+
+Keep editor mechanics in `packages/app/src/source-editor/`. File loading, conflict handling, and
+persistence belong to the file pane's `FileEditorModel`. The source editor receives a document and
+emits edits; it does not know about workspaces or daemon RPCs.
+
+## Native bridge
+
+The native bridge sends compact change ranges in normalized LF coordinates. The host-side document
+mirror validates and applies them, then restores the file's original line separator before calling
+the file model. Full document replacements cross the bridge only for mount and external changes.
+
+Every message carries an editor key. Ignore messages from an old key after remounting or switching
+files. Keep the bridge protocol private to this module; React components outside it use
+`SourceEditorProps`.
+
+Do not expose raw CodeMirror extensions as the cross-platform API. Add named capabilities to the
+source editor contract, then implement them once in the shared runtime or explicitly in each host.
+
+## Embedded bundle
+
+After changing the CodeMirror runtime, bridge protocol, or WebView entry point, run:
+
+```bash
+npm --prefix packages/app run build:source-editor-webview
+```
+
+The generated `webview-html.ts` is committed so native builds do not need a runtime bundler or
+network access. `build:source-editor-webview:check` fails when the committed artifact is stale, and
+EAS post-install rebuilds all embedded WebViews.

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.7.0-beta.2",
+  "version": "0.7.0-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -36298,7 +36298,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -37363,12 +37363,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.7.0-beta.2",
-        "@getpaseo/protocol": "0.7.0-beta.2",
-        "@getpaseo/server": "0.7.0-beta.2",
+        "@getpaseo/client": "0.7.0-beta.1",
+        "@getpaseo/protocol": "0.7.0-beta.1",
+        "@getpaseo/server": "0.7.0-beta.1",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -37615,10 +37615,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "dependencies": {
-        "@getpaseo/protocol": "0.7.0-beta.2",
-        "@getpaseo/relay": "0.7.0-beta.2",
+        "@getpaseo/protocol": "0.7.0-beta.1",
+        "@getpaseo/relay": "0.7.0-beta.1",
         "zod": "^4.4.3"
       },
       "devDependencies": {
@@ -37629,7 +37629,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -37872,7 +37872,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -38768,7 +38768,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "dependencies": {
         "@codemirror/language": "6.12.4",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -38797,13 +38797,13 @@
     },
     "packages/plugin": {
       "name": "@getpaseo/plugin",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "dependencies": {
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.7.0-beta.2",
-        "@getpaseo/protocol": "0.7.0-beta.2",
+        "@getpaseo/client": "0.7.0-beta.1",
+        "@getpaseo/protocol": "0.7.0-beta.1",
         "@types/node": "^20.9.0",
         "@types/react": "~19.2.0",
         "react": "19.1.0",
@@ -38812,15 +38812,15 @@
         "zod": "^4.4.3"
       },
       "peerDependencies": {
-        "@getpaseo/client": "0.7.0-beta.2",
-        "@getpaseo/protocol": "0.7.0-beta.2",
+        "@getpaseo/client": "0.7.0-beta.1",
+        "@getpaseo/protocol": "0.7.0-beta.1",
         "react": "19.1.0",
         "zod": "^4.4.3"
       }
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "dependencies": {
         "zod": "^4.4.3"
       },
@@ -38833,7 +38833,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "dependencies": {
         "base64-js": "^1.5.1",
         "tweetnacl": "^1.0.3",
@@ -39051,17 +39051,17 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "0.3.246",
         "@anthropic-ai/sdk": "^0.104.2",
         "@babel/parser": "^7.29.8",
-        "@getpaseo/client": "0.7.0-beta.2",
-        "@getpaseo/highlight": "0.7.0-beta.2",
-        "@getpaseo/plugin": "0.7.0-beta.2",
-        "@getpaseo/protocol": "0.7.0-beta.2",
-        "@getpaseo/relay": "0.7.0-beta.2",
+        "@getpaseo/client": "0.7.0-beta.1",
+        "@getpaseo/highlight": "0.7.0-beta.1",
+        "@getpaseo/plugin": "0.7.0-beta.1",
+        "@getpaseo/protocol": "0.7.0-beta.1",
+        "@getpaseo/relay": "0.7.0-beta.1",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "1.29.0",
         "@opencode-ai/sdk": "1.14.46",
@@ -39985,7 +39985,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.7.0-beta.2",
+      "version": "0.7.0-beta.1",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.7.0-beta.2",
+  "version": "0.7.0-beta.1",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [
@@ -41,6 +41,7 @@
     "dev:server:raw": "npm run dev --workspace=@getpaseo/server",
     "dev:app": "cross-env PASEO_LISTEN=127.0.0.1:6768 EXPO_PORT=8081 ./scripts/dev-app.sh",
     "test:e2e:mobile": "./scripts/test-mobile-agent-device.sh",
+    "test:e2e:composer-keyboard:android": "./packages/app/e2e/mobile/composer-keyboard/android.sh",
     "dev:website": "npm run dev --workspace=@getpaseo/website",
     "postinstall": "node scripts/postinstall-patches.mjs",
     "prepare": "lefthook install --force",

packages/app/e2e/browser/agent-message-rewind.spec.ts

@@ -23,7 +23,7 @@ async function completeSubmittedTurn(
 
   const finish = await agent.client.waitForFinish(agent.agentId, 30_000);
   expect(finish.status).toBe("idle");
-  await expect(page.getByText("(end of synthetic stream)", { exact: true })).toBeVisible();
+  await expect(page.getByText("(end of synthetic stream)", { exact: true }).last()).toBeVisible();
   await expect(userMessage).toHaveAttribute("aria-busy", "false");
   return userMessage;
 }
@@ -40,7 +40,7 @@ async function expectTurnCompletesNormally(
 ): Promise<void> {
   const finish = await agent.client.waitForFinish(agent.agentId, 30_000);
   expect(finish.status).toBe("idle");
-  await expect(page.getByText("(end of synthetic stream)", { exact: true })).toBeVisible();
+  await expect(page.getByText("(end of synthetic stream)", { exact: true }).last()).toBeVisible();
   await expectAgentIdle(page);
 }
 

packages/app/e2e/browser/agent-tab-image-stability.spec.ts

@@ -45,6 +45,49 @@ test("switching between settled agent tabs keeps a real assistant PNG rendered",
   await switchAwayAndBackWithoutImageInstability(page, { image, imageAgent, otherAgent });
 });
 
+test("opens a timeline image in a zoomable lightbox", async ({
+  imageWorkspace: workspace,
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const image = await createSmallAssistantPng(workspace, {
+    alt: "Zoomable timeline image",
+    fileName: "zoomable-timeline-image.png",
+  });
+  const imageAgent = await createSettledMockAgent(workspace, "Zoomable image timeline");
+  await emitSettledAssistantImage(workspace.client, imageAgent, image);
+  await openAssistantImageTimeline(page, imageAgent);
+  await expectAssistantImageRendered(page, image);
+
+  await page.getByRole("button", { name: "Open image attachment" }).click();
+  const lightboxImage = page.getByTestId("attachment-lightbox-image");
+  const canvas = page.getByTestId("attachment-lightbox-canvas");
+  await expect(lightboxImage).toBeVisible();
+  await canvas.hover();
+  const transformedContent = canvas.locator(":scope > div").first();
+  const initialBox = await transformedContent.boundingBox();
+  const canvasBox = await canvas.boundingBox();
+  expect(initialBox).not.toBeNull();
+  expect(canvasBox).not.toBeNull();
+  expect(initialBox!.width).toBeLessThan(canvasBox!.width);
+  const zoomIn = page.getByRole("button", { name: "Zoom in", exact: true });
+  await zoomIn.click();
+  await zoomIn.click();
+  await zoomIn.click();
+  await zoomIn.click();
+  await expect
+    .poll(async () => (await transformedContent.boundingBox())?.width ?? 0)
+    .toBeGreaterThan(canvasBox!.width);
+
+  await canvas.dblclick({ position: { x: canvasBox!.width / 2, y: canvasBox!.height / 2 } });
+  await expect
+    .poll(async () => Math.round((await transformedContent.boundingBox())?.width ?? 0))
+    .toBe(Math.round(initialBox!.width));
+
+  await canvas.click({ position: { x: 4, y: 4 } });
+  await expect(lightboxImage).toHaveCount(0);
+});
+
 test("reloading a timeline anchors near-tail assistant image growth", async ({
   imageWorkspace: workspace,
   page,

packages/app/e2e/browser/archive-tab.spec.ts

@@ -10,6 +10,7 @@ import {
   archiveAgentFromSessions,
   clickSessionRow,
   createIdleAgent,
+  expectArchivedAgentFocused,
   expectSessionRowArchived,
   expectSessionRowVisible,
   expectWorkspaceArchiveOutcome,
@@ -21,6 +22,7 @@ import {
   resetSeededPageState,
   reloadWorkspace,
 } from "../support/helpers/archive-tab";
+import { expectAgentTabActive } from "../support/helpers/launcher";
 
 test.describe("Archive tab reconciliation", () => {
   let client: Awaited<ReturnType<typeof connectSeedClient>>;
@@ -144,6 +146,8 @@ test.describe("Archive tab reconciliation", () => {
 
     await clickSessionRow(page, archived.title);
 
+    await expectArchivedAgentFocused(page, archived.id);
+    await expectAgentTabActive(page, archived.id);
     expect(await fetchAgentArchivedAt(client, archived.id)).toBe(archivedAt);
 
     await expect(page).toHaveURL(buildHostWorkspaceRoute(getServerId(), archived.workspaceId), {

packages/app/e2e/browser/composer-focus.spec.ts

@@ -0,0 +1,29 @@
+import { test } from "../support/fixtures";
+import {
+  expectComposerDraft,
+  expectComposerFocused,
+  expectComposerVisible,
+  submitMessage,
+  typeIntoFocusedComposer,
+} from "../support/helpers/composer";
+import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
+
+test("submitting a message leaves the composer ready for the next message", async ({ page }) => {
+  const agent = await seedMockAgentWorkspace({
+    repoPrefix: "composer-focus-",
+    title: "Composer focus",
+  });
+
+  try {
+    await openAgentRoute(page, agent);
+    await expectComposerVisible(page);
+
+    await submitMessage(page, "First message");
+    await expectComposerFocused(page);
+
+    await typeIntoFocusedComposer(page, "Second message");
+    await expectComposerDraft(page, "Second message");
+  } finally {
+    await agent.cleanup();
+  }
+});

packages/app/e2e/browser/file-editing.spec.ts

@@ -538,6 +538,16 @@ test.describe("CodeMirror workspace file editing", () => {
     await openWorkspaceFile(page, "pixel.png");
     const image = visibleFilePane.locator("img");
     await expect(image).toBeVisible();
+    const imageCanvas = page.getByTestId("image-file-preview-canvas");
+    await expect(imageCanvas).toBeVisible();
+    await imageCanvas.hover();
+    const transformedContent = imageCanvas.locator(":scope > div").first();
+    const fittedImageBox = await transformedContent.boundingBox();
+    expect(fittedImageBox).not.toBeNull();
+    await page.getByRole("button", { name: "Zoom in", exact: true }).click();
+    await expect
+      .poll(async () => (await transformedContent.boundingBox())?.width ?? 0)
+      .toBeGreaterThan(fittedImageBox!.width * 1.2);
     const initialSource = await image.getAttribute("src");
     await writeFile(imagePath, BLUE_PIXEL);
     await expect.poll(() => image.getAttribute("src")).not.toBe(initialSource);

packages/app/e2e/browser/paseo-tool-call-details.codex.real.spec.ts

@@ -0,0 +1,124 @@
+import { mkdirSync, mkdtempSync, realpathSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import type { Locator, Page, TestInfo } from "@playwright/test";
+import { expect, test } from "../support/fixtures";
+import {
+  cleanupRewindFlow,
+  launchAgent,
+  sendMessage,
+  type AgentHandle,
+} from "../support/helpers/rewind-flow";
+
+const GREETING = "Say hello back.";
+
+test.use({ e2eInjectPaseoTools: true });
+
+function verificationPrompt(workspacePath: string): string {
+  return [
+    "Use Paseo tools to perform this exact UI verification.",
+    "Do not edit files or run shell commands. Every prompt below is intentionally non-actionable.",
+    `1. Create a local workspace at ${workspacePath} titled "Presentation QA workspace".`,
+    `2. In that workspace, create a codex/gpt-5.4-mini agent titled "Greeting child" with the initial prompt "${GREETING}".`,
+    `3. Create a schedule named "Greeting schedule" with prompt "${GREETING}", cron "0 0 1 1 *", timezone "Europe/Berlin", provider "codex/gpt-5.4-mini", cwd ${workspacePath}, maxRuns 1, and expiresIn "1h". Delete that schedule using its returned id.`,
+    `4. Create a heartbeat named "Greeting heartbeat" with prompt "${GREETING}", cron "0 0 1 1 *", timezone "Europe/Berlin", maxRuns 1, and expiresIn "1h". Delete that heartbeat using its returned id.`,
+    `5. After the child agent finishes, send it the follow-up prompt "${GREETING}" synchronously.`,
+    "6. Archive the workspace from step 1.",
+    "7. Reply with exactly TOOL_CALL_QA_DONE.",
+    "Use each named Paseo tool exactly once except for the matching schedule and heartbeat deletion tools.",
+  ].join(" ");
+}
+
+async function expandedToolCall(page: Page, label: string): Promise<Locator> {
+  const badge = page.getByTestId("tool-call-badge").filter({ hasText: label }).last();
+  await expect(badge).toBeVisible({ timeout: 30_000 });
+  await badge.scrollIntoViewIfNeeded();
+  await badge.click();
+  return badge;
+}
+
+async function captureToolCall(
+  page: Page,
+  testInfo: TestInfo,
+  input: { label: string; artifact: string; expectedText: Array<string | RegExp> },
+): Promise<void> {
+  const badge = await expandedToolCall(page, input.label);
+  for (const text of input.expectedText) {
+    await expect(badge).toContainText(text);
+  }
+  const screenshot = testInfo.outputPath(`${input.artifact}.png`);
+  await badge.screenshot({ path: screenshot });
+  await testInfo.attach(input.artifact, { path: screenshot, contentType: "image/png" });
+  await badge.click();
+}
+
+async function runPresentationJourney(handle: AgentHandle, workspacePath: string): Promise<void> {
+  await sendMessage(handle, verificationPrompt(workspacePath));
+  await expect(
+    handle.page.getByTestId("assistant-message").filter({ hasText: "TOOL_CALL_QA_DONE" }).last(),
+  ).toBeVisible({ timeout: 30_000 });
+}
+
+test.describe("real Codex Paseo tool-call presentation", () => {
+  test.setTimeout(600_000);
+
+  test("renders owned tool inputs and results as readable text", async ({ page }, testInfo) => {
+    const cwd = realpathSync(mkdtempSync(path.join(tmpdir(), "paseo-tool-call-presentation-")));
+    const childWorkspacePath = path.join(cwd, "presentation-workspace");
+    mkdirSync(childWorkspacePath);
+    let handle: AgentHandle | undefined;
+
+    try {
+      handle = await launchAgent({ page, provider: "codex", cwd, mode: "full-access" });
+      await runPresentationJourney(handle, childWorkspacePath);
+      await page.setViewportSize({ width: 1280, height: 1600 });
+
+      await captureToolCall(page, testInfo, {
+        label: "Create workspace",
+        artifact: "create-workspace-presentation",
+        expectedText: ["Details", "Presentation QA workspace", childWorkspacePath, "local"],
+      });
+      await captureToolCall(page, testInfo, {
+        label: "Create agent",
+        artifact: "create-agent-prompt-presentation",
+        expectedText: ["Prompt", GREETING, "Greeting child", "codex/gpt-5.4-mini", "Result"],
+      });
+      await captureToolCall(page, testInfo, {
+        label: "Send agent prompt",
+        artifact: "send-prompt-presentation",
+        expectedText: ["Prompt", GREETING, "Agent", "Result"],
+      });
+      await captureToolCall(page, testInfo, {
+        label: "Create schedule",
+        artifact: "schedule-presentation",
+        expectedText: [
+          "Prompt",
+          GREETING,
+          "0 0 1 1 *",
+          "Europe/Berlin",
+          "Greeting schedule",
+          "Result",
+        ],
+      });
+      await captureToolCall(page, testInfo, {
+        label: "Create heartbeat",
+        artifact: "heartbeat-presentation",
+        expectedText: [
+          "Prompt",
+          GREETING,
+          "0 0 1 1 *",
+          "Europe/Berlin",
+          "Greeting heartbeat",
+          "Result",
+        ],
+      });
+      await captureToolCall(page, testInfo, {
+        label: "Archive workspace",
+        artifact: "archive-workspace-presentation",
+        expectedText: ["Details", "Workspace", "Result", "Removed directory"],
+      });
+    } finally {
+      await cleanupRewindFlow({ handle, cwd });
+    }
+  });
+});

packages/app/e2e/browser/plugin-workspace-panels.spec.ts

@@ -29,9 +29,9 @@ function isSettledWorkspaceUrl(url: URL): boolean {
   return url.pathname.includes("/workspace/") && !url.searchParams.has("open");
 }
 
-function pluginSource(): string {
+function pluginSource(input: { workspaceId: string; agentId: string }): string {
   return `import React, { useRef } from "react";
-import { Text, View } from "react-native";
+import { Pressable, Text, View } from "react-native";
 import { Icon, useAgent, useWorkspace } from "@getpaseo/plugin";
 import { defineRpc } from "@getpaseo/plugin/server";
 import { z } from "zod";
@@ -55,8 +55,14 @@ function AgentPanel({ workspaceId, agentId, host, layout }) {
   return <View><Text>Agent bridge {agent?.id}</Text><Text>Workspace {workspace?.id}</Text><Text>Host {host.id}</Text><Text>Layout {layout.compact ? "compact" : "wide"}</Text></View>;
 }
 
-function DirectCollisionSurface() {
-  return <View><Text>Direct collision surface</Text></View>;
+function DirectCollisionSurface({ navigation }) {
+  return <View>
+    <Text>Direct collision surface</Text>
+    {navigation ? <>
+      <Pressable accessibilityRole="button" onPress={() => navigation.openWorkspace({ workspaceId: ${JSON.stringify(input.workspaceId)} })}><Text>Open workspace from plugin</Text></Pressable>
+      <Pressable accessibilityRole="button" onPress={() => navigation.openAgent({ agentId: ${JSON.stringify(input.agentId)} })}><Text>Open agent from plugin</Text></Pressable>
+    </> : null}
+  </View>;
 }
 
 function SidebarCollisionSurface() {
@@ -178,7 +184,10 @@ test.describe("plugin workspace panels and Command Center", () => {
       port: secondaryDaemon.port,
     });
     await writeFile(path.join(directory, "paseo-plugin.json"), JSON.stringify({ id: PLUGIN_ID }));
-    await writeFile(path.join(directory, "index.tsx"), pluginSource());
+    await writeFile(
+      path.join(directory, "index.tsx"),
+      pluginSource({ workspaceId: primary.workspaceId, agentId: "missing-agent" }),
+    );
 
     try {
       await primaryClient.patchDaemonConfig({ pluginsEnabled: true });
@@ -239,6 +248,38 @@ test.describe("plugin workspace panels and Command Center", () => {
         await page.getByTestId("plugin-surface-close").click();
       });
 
+      await test.step("surface navigation opens host-owned workspace and agent routes", async () => {
+        await runCommand(page, "Open direct collision surface");
+        await page.getByRole("button", { name: "Open workspace from plugin", exact: true }).click();
+        await page.waitForURL(isSettledWorkspaceUrl);
+        await expect(page.getByTestId("workspace-header-title")).toBeVisible();
+
+        const agent = await primary.client.createAgent({
+          provider: "mock",
+          cwd: primary.repoPath,
+          workspaceId: primary.workspaceId,
+          title: "Plugin navigation agent",
+          model: "ten-second-stream",
+          modeId: "load-test",
+        });
+        const navigationAgentId = agent.id;
+        await writeFile(
+          path.join(directory, "index.tsx"),
+          pluginSource({ workspaceId: primary.workspaceId, agentId: navigationAgentId }),
+        );
+        await primaryClient.reloadPlugin(PLUGIN_ID);
+
+        await runCommand(page, "Open direct collision surface");
+        await page.getByRole("button", { name: "Open agent from plugin", exact: true }).click();
+        await page.waitForURL(isSettledWorkspaceUrl);
+        await expect(
+          page
+            .getByTestId(`workspace-tab-agent_${navigationAgentId}`)
+            .filter({ visible: true })
+            .first(),
+        ).toBeVisible();
+      });
+
       await test.step("switching hosts removes commands from an uninstalled host", async () => {
         await switchWorkspaceViaSidebar({
           page,

packages/app/e2e/mobile/composer-keyboard/android.sh

@@ -0,0 +1,340 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../../../.." && pwd)"
+STATE_DIR="${PASEO_COMPOSER_KEYBOARD_STATE_DIR:-${REPO_ROOT}/.dev/agent-device-composer-keyboard}"
+ARTIFACTS_DIR="${REPO_ROOT}/.dev/agent-device-artifacts/composer-keyboard-android"
+SESSION="${PASEO_COMPOSER_KEYBOARD_SESSION:-composer-keyboard-android}"
+APP_ID="${PASEO_COMPOSER_KEYBOARD_APP_ID:-sh.paseo.debug}"
+DEVICE="${PASEO_COMPOSER_KEYBOARD_DEVICE:-paseo-api35}"
+HELPER_IME="com.callstack.agentdevice.imehelper/.TestInputMethodService"
+GBOARD_IME="com.google.android.inputmethod.latin/com.android.inputmethod.latin.LatinIME"
+ASSERT="${REPO_ROOT}/packages/app/e2e/mobile/composer-keyboard/assert-composer-keyboard.mjs"
+STALL_HERMES="${REPO_ROOT}/packages/app/e2e/mobile/composer-keyboard/stall-hermes.mjs"
+METRO_PORT="${PASEO_MOBILE_E2E_METRO_PORT:-8082}"
+DAEMON_HOST="${PASEO_COMPOSER_KEYBOARD_DAEMON_HOST:-127.0.0.1:6770}"
+DAEMON_HOME="${PASEO_COMPOSER_KEYBOARD_DAEMON_HOME:-${REPO_ROOT}/.dev/composer-e2e-home}"
+SERVER_ID="${PASEO_COMPOSER_KEYBOARD_SERVER_ID:-}"
+MESSAGE=$'keyboard invariant line one\nline two\nline three\nline four'
+LONG_MESSAGE="$(node -e 'process.stdout.write(Array.from({ length: 180 }, (_, index) => `line${index + 1}`).join(" "))')"
+AGENT_TITLE="Keyboard dismiss QA $(date +%s)"
+
+if [[ -z "${SERVER_ID}" ]]; then
+  if [[ ! -f "${DAEMON_HOME}/server-id" ]]; then
+    echo "Missing ${DAEMON_HOME}/server-id; set PASEO_COMPOSER_KEYBOARD_SERVER_ID" >&2
+    exit 1
+  fi
+  SERVER_ID="$(<"${DAEMON_HOME}/server-id")"
+fi
+
+ad() {
+  AGENT_DEVICE_STATE_DIR="${STATE_DIR}" agent-device "$@" --session "${SESSION}"
+}
+
+capture_screen() {
+  local output_path="$1"
+  ad screenshot "${output_path}" >/dev/null
+}
+
+snapshot_json() {
+  local output_path="$1"
+  ad snapshot -i --json >"${output_path}"
+}
+
+capture_ui_xml() {
+  local output_path="$1"
+  local device_path="/sdcard/paseo-composer-keyboard-window.xml"
+  # Android exposes one UI Automation connection at a time. Release the
+  # persistent agent-device snapshot helper before asking uiautomator for the
+  # app and IME windows; agent-device reconnects it on the next interaction.
+  adb shell am force-stop com.callstack.agentdevice.snapshothelper
+  sleep 0.2
+  adb shell uiautomator dump "${device_path}" >/dev/null
+  adb pull "${device_path}" "${output_path}" >/dev/null
+}
+
+clear_input() {
+  ad fill 'editable=true' "x" --settle
+  adb shell input keycombination 113 29
+  adb shell input keyevent 67
+}
+
+clear_focused_input_with_adb() {
+  adb shell input keycombination 113 29
+  adb shell input keyevent 67
+}
+
+wait_for_ime() {
+  local expected="$1"
+  local previous_top=""
+  local stable_count=0
+  for _ in $(seq 1 30); do
+    local window_state
+    window_state="$(adb shell dumpsys window)"
+    if [[ "${expected}" == "true" ]]; then
+      local ime_top
+      ime_top="$(printf '%s' "${window_state}" | sed -n 's/.*type=ime frame=\[0,\([0-9][0-9]*\)\].*visible=true.*/\1/p' | head -1)"
+      if [[ -n "${ime_top}" && "${ime_top}" -gt 0 ]]; then
+        if [[ "${ime_top}" == "${previous_top}" ]]; then
+          stable_count="$((stable_count + 1))"
+        else
+          stable_count=0
+          previous_top="${ime_top}"
+        fi
+        if [[ "${stable_count}" -ge 2 ]]; then
+          return
+        fi
+      fi
+    elif ! printf '%s' "${window_state}" | rg -q "type=ime .*visible=true"; then
+      return
+    fi
+    sleep 0.1
+  done
+  echo "IME did not become visible=${expected}" >&2
+  exit 1
+}
+
+ime_is_visible() {
+  adb shell dumpsys window | rg -q "type=ime .*visible=true"
+}
+
+open_gboard() {
+  local x="$1"
+  local y="$2"
+  adb shell ime set "${GBOARD_IME}" >/dev/null
+  if ime_is_visible; then
+    adb shell input keyevent BACK
+    wait_for_ime false
+  fi
+  adb shell input tap "${x}" "${y}"
+  wait_for_ime true
+  local keyboard_shift
+  keyboard_shift="$(read_keyboard_shift)"
+  adb shell input tap "${x}" "$((y - keyboard_shift))"
+}
+
+read_keyboard_shift() {
+  local ime_top
+  local navigation_top
+  ime_top="$(adb shell dumpsys window | sed -n 's/.*type=ime frame=\[0,\([0-9][0-9]*\)\].*visible=true.*/\1/p' | head -1)"
+  navigation_top="$(adb shell dumpsys window | sed -n 's/.*type=navigationBars frame=\[0,\([0-9][0-9]*\)\].*/\1/p' | head -1)"
+  printf '%s\n' "$((navigation_top - ime_top))"
+}
+
+read_ime_top() {
+  adb shell dumpsys window | sed -n \
+    's/.*type=ime frame=\[0,\([0-9][0-9]*\)\].*visible=true.*/\1/p' | head -1
+}
+
+cleanup() {
+  adb shell ime set "${HELPER_IME}" >/dev/null 2>&1 || true
+  AGENT_DEVICE_STATE_DIR="${STATE_DIR}" agent-device daemon stop --clean >/dev/null 2>&1 || true
+}
+
+trap cleanup EXIT INT TERM
+cleanup
+mkdir -p "${STATE_DIR}" "${ARTIFACTS_DIR}"
+
+workspaces_json="$(env -u PASEO_CALLER_AGENT_ID -u PASEO_AGENT_ID -u PASEO_WORKSPACE_ID \
+  npm run --silent cli -- workspace ls --json --host "${DAEMON_HOST}")"
+workspace_id="$(node -e '
+  const workspaces = JSON.parse(require("node:fs").readFileSync(0, "utf8"));
+  const cwd = process.argv[1];
+  const workspace = workspaces.find((candidate) => candidate.cwd === cwd);
+  if (!workspace) process.exit(1);
+  process.stdout.write(workspace.workspaceId);
+' "${REPO_ROOT}" <<<"${workspaces_json}")"
+
+AGENT_DEVICE_STATE_DIR="${STATE_DIR}" agent-device open "${APP_ID}" \
+  --platform android \
+  --device "${DEVICE}" \
+  --session "${SESSION}"
+adb shell am force-stop "${APP_ID}"
+adb shell am start \
+  -a android.intent.action.VIEW \
+  -d "exp+voice-mobile://expo-development-client/?url=http%3A%2F%2F10.0.2.2%3A${METRO_PORT}" \
+  "${APP_ID}" >/dev/null
+sleep 3
+
+# Create the fixture while the client is connected so its directory replica observes the insert.
+run_json="$(env -u PASEO_CALLER_AGENT_ID -u PASEO_AGENT_ID -u PASEO_WORKSPACE_ID \
+  npm run --silent cli -- run "Exercise the composer keyboard invariant flow" \
+  --background \
+  --title "${AGENT_TITLE}" \
+  --provider mock \
+  --model e2e-fast-stream \
+  --workspace "${workspace_id}" \
+  --cwd "${REPO_ROOT}" \
+  --host "${DAEMON_HOST}" \
+  --json)"
+agent_id="$(node -e '
+  const result = JSON.parse(require("node:fs").readFileSync(0, "utf8"));
+  process.stdout.write(result.agentId);
+' <<<"${run_json}")"
+sleep 3
+
+adb shell am start \
+  -a android.intent.action.VIEW \
+  -d "paseo://h/${SERVER_ID}/agent/${agent_id}" \
+  "${APP_ID}" >/dev/null
+sleep 5
+# The development-client bootstrap can consume the first link while Expo Router is mounting.
+# Deliver the target again after the root navigator is live.
+adb shell am start \
+  -a android.intent.action.VIEW \
+  -d "paseo://h/${SERVER_ID}/agent/${agent_id}" \
+  "${APP_ID}" >/dev/null
+ad wait "text=\"${AGENT_TITLE}\"" 45000
+ad wait 'editable=true' 10000
+clear_input
+ad keyboard dismiss || true
+ad wait 'label="Message, @files, /commands"' 10000
+
+snapshot_json "${ARTIFACTS_DIR}/baseline.json"
+capture_screen "${ARTIFACTS_DIR}/baseline.png"
+read -r input_x input_y baseline_input_height < <(
+  node "${ASSERT}" rect "${ARTIFACTS_DIR}/baseline.json" "Message, @files, /commands"
+)
+read -r model_x model_y _ < <(
+  node "${ASSERT}" rect "${ARTIFACTS_DIR}/baseline.json" "combined-model-selector"
+)
+read -r attach_x attach_y _ < <(
+  node "${ASSERT}" rect "${ARTIFACTS_DIR}/baseline.json" "message-input-attach-button"
+)
+read -r _ header_y _ < <(
+  node "${ASSERT}" rect "${ARTIFACTS_DIR}/baseline.json" "workspace-tab-switcher-trigger"
+)
+
+adb shell input keyevent HOME
+adb shell am start -n "${APP_ID}/.MainActivity" >/dev/null
+sleep 1
+open_gboard "${input_x}" "${input_y}"
+clear_focused_input_with_adb
+keyboard_shift="$(read_keyboard_shift)"
+adb shell input keyevent 76
+sleep 1
+capture_screen "${ARTIFACTS_DIR}/command-popover.png"
+ad wait 'id="composer-autocomplete-popover"' 10000
+ad wait 'text="/exit"' 10000
+model_open_y="$((model_y - keyboard_shift))"
+adb shell input tap "${model_x}" "${model_open_y}"
+sleep 1
+capture_screen "${ARTIFACTS_DIR}/model-selector-open.png"
+adb shell ime set "${HELPER_IME}" >/dev/null
+ad wait 'id="compact-provider-list"' 10000
+ad press 'label="Close"' --settle
+adb shell input tap "${input_x}" "${input_y}"
+clear_focused_input_with_adb
+ad wait 'editable=true' 10000
+
+adb shell input keyevent HOME
+adb shell am start -n "${APP_ID}/.MainActivity" >/dev/null
+sleep 1
+open_gboard "${input_x}" "${input_y}"
+clear_focused_input_with_adb
+adb shell input keyevent 76
+sleep 1
+adb shell ime set "${HELPER_IME}" >/dev/null
+ad wait 'id="composer-autocomplete-popover"' 10000
+ad wait 'text="/exit"' 10000
+snapshot_json "${ARTIFACTS_DIR}/command-popover.json"
+node "${ASSERT}" above-y \
+  "${ARTIFACTS_DIR}/command-popover.json" \
+  "/exit, Archive the current agent" \
+  "$((input_y - baseline_input_height / 2))"
+adb shell input keyevent 67
+ad wait 'label="Message, @files, /commands"' 10000
+
+ad fill 'label="Message, @files, /commands"' "${MESSAGE}" --settle
+snapshot_json "${ARTIFACTS_DIR}/multiline-first.json"
+ad fill 'editable=true focused=true' "${MESSAGE}" --settle
+snapshot_json "${ARTIFACTS_DIR}/multiline-second.json"
+node "${ASSERT}" same-input-height \
+  "${ARTIFACTS_DIR}/multiline-first.json" \
+  "${ARTIFACTS_DIR}/multiline-second.json"
+
+adb shell input keyevent HOME
+adb shell am start -n "${APP_ID}/.MainActivity" >/dev/null
+sleep 1
+open_gboard "${input_x}" "${input_y}"
+
+keyboard_shift="$(read_keyboard_shift)"
+capture_screen "${ARTIFACTS_DIR}/keyboard-open.png"
+
+node "${ASSERT}" same-header \
+  "${ARTIFACTS_DIR}/baseline.png" \
+  "${ARTIFACTS_DIR}/keyboard-open.png" \
+  "$((header_y + 48))"
+
+adb shell ime set "${HELPER_IME}" >/dev/null
+ad fill 'editable=true focused=true' "${LONG_MESSAGE}" --settle
+open_gboard "${input_x}" "${input_y}"
+capture_ui_xml "${ARTIFACTS_DIR}/long-draft-keyboard-open.xml"
+capture_screen "${ARTIFACTS_DIR}/long-draft-keyboard-open.png"
+node "${ASSERT}" xml-above-y \
+  "${ARTIFACTS_DIR}/long-draft-keyboard-open.xml" \
+  "Add attachment" \
+  "$(read_ime_top)"
+adb shell ime set "${HELPER_IME}" >/dev/null
+ad fill 'editable=true' "${MESSAGE}" --settle
+open_gboard "${input_x}" "${input_y}"
+keyboard_shift="$(read_keyboard_shift)"
+
+read -r changes_x changes_y _ < <(
+  node "${ASSERT}" rect "${ARTIFACTS_DIR}/multiline-second.json" "Open Changes tab"
+)
+adb shell input tap "${changes_x}" "$((changes_y - keyboard_shift))"
+ad wait 'id="changes-header"' 10000
+capture_screen "${ARTIFACTS_DIR}/changes-control-open.png"
+ad press 'label="Close Explorer sidebar"' --settle
+ad wait "text=\"${AGENT_TITLE}\"" 10000
+ad wait 'editable=true' 10000
+
+open_gboard "${input_x}" "${input_y}"
+keyboard_shift="$(read_keyboard_shift)"
+adb shell input tap "${attach_x}" "$((attach_y - keyboard_shift))"
+sleep 1
+adb shell ime set "${HELPER_IME}" >/dev/null
+ad wait 'id="message-input-attachment-menu-content"' 10000
+ad press 540 600 --settle
+
+open_gboard "${input_x}" "${input_y}"
+keyboard_shift="$(read_keyboard_shift)"
+adb shell input tap 983 "$((attach_y - keyboard_shift))"
+wait_for_ime false
+adb shell ime set "${HELPER_IME}" >/dev/null
+ad wait text "keyboard invariant line one" 10000
+snapshot_json "${ARTIFACTS_DIR}/after-submit.json"
+node "${ASSERT}" has-exact-text "${ARTIFACTS_DIR}/after-submit.json" "${MESSAGE}"
+node "${ASSERT}" same-input-height \
+  "${ARTIFACTS_DIR}/baseline.json" \
+  "${ARTIFACTS_DIR}/after-submit.json"
+
+open_gboard "${input_x}" "${input_y}"
+adb shell input keyevent BACK
+wait_for_ime false
+sleep 0.5
+capture_screen "${ARTIFACTS_DIR}/hidden-focused-baseline.png"
+
+open_gboard "${input_x}" "${input_y}"
+node "${STALL_HERMES}" "${METRO_PORT}" 3000 "${APP_ID}" &
+stall_pid="$!"
+sleep 0.25
+adb shell input keyevent BACK
+wait_for_ime false
+sleep 0.5
+capture_screen "${ARTIFACTS_DIR}/hidden-during-js-stall.png"
+wait "${stall_pid}"
+capture_screen "${ARTIFACTS_DIR}/hidden-after-js-stall.png"
+node "${ASSERT}" same-region \
+  "${ARTIFACTS_DIR}/hidden-focused-baseline.png" \
+  "${ARTIFACTS_DIR}/hidden-during-js-stall.png" \
+  1400 \
+  430
+node "${ASSERT}" same-region \
+  "${ARTIFACTS_DIR}/hidden-focused-baseline.png" \
+  "${ARTIFACTS_DIR}/hidden-after-js-stall.png" \
+  1400 \
+  430
+
+echo "Composer keyboard invariants passed"

packages/app/e2e/mobile/composer-keyboard/assert-composer-keyboard.mjs

@@ -0,0 +1,106 @@
+import fs from "node:fs/promises";
+import process from "node:process";
+import sharp from "sharp";
+
+const [, , command, ...args] = process.argv;
+
+if (command === "rect") {
+  const [snapshotPath, identifier] = args;
+  const snapshot = JSON.parse(await fs.readFile(snapshotPath, "utf8"));
+  const node = snapshot.data.nodes.find(
+    (candidate) => candidate.identifier === identifier || candidate.label === identifier,
+  );
+  if (!node) throw new Error(`Missing node: ${identifier}`);
+  const { x, y, width, height } = node.rect;
+  process.stdout.write(`${Math.round(x + width / 2)} ${Math.round(y + height / 2)} ${height}\n`);
+} else if (command === "above-y") {
+  const [snapshotPath, upperIdentifier, lowerYArgument] = args;
+  const snapshot = JSON.parse(await fs.readFile(snapshotPath, "utf8"));
+  const upper = snapshot.data.nodes.find(
+    (candidate) => candidate.identifier === upperIdentifier || candidate.label === upperIdentifier,
+  );
+  if (!upper) throw new Error(`Missing node: ${upperIdentifier}`);
+  const upperBottom = upper.rect.y + upper.rect.height;
+  const lowerY = Number(lowerYArgument);
+  if (upperBottom > lowerY) {
+    throw new Error(
+      `${upperIdentifier} extends below the composer top: ${upperBottom} > ${lowerY}`,
+    );
+  }
+} else if (command === "xml-above-y") {
+  const [snapshotPath, contentDescription, lowerYArgument] = args;
+  const snapshot = await fs.readFile(snapshotPath, "utf8");
+  const escapedDescription = contentDescription.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const match = snapshot.match(
+    new RegExp(
+      `<node[^>]*content-desc="${escapedDescription}"[^>]*bounds="\\[(\\d+),(\\d+)\\]\\[(\\d+),(\\d+)\\]"`,
+    ),
+  );
+  if (!match) throw new Error(`Missing node: ${contentDescription}`);
+  const upperBottom = Number(match[4]);
+  const lowerY = Number(lowerYArgument);
+  if (upperBottom > lowerY) {
+    throw new Error(`${contentDescription} extends below the keyboard: ${upperBottom} > ${lowerY}`);
+  }
+} else if (command === "same-header") {
+  const [baselinePath, keyboardPath, headerBottomArgument] = args;
+  const headerBottom = Number(headerBottomArgument);
+  const crop = { left: 0, top: 64, width: 1080, height: headerBottom - 64 };
+  const [baseline, keyboard] = await Promise.all([
+    sharp(baselinePath).extract(crop).removeAlpha().raw().toBuffer(),
+    sharp(keyboardPath).extract(crop).removeAlpha().raw().toBuffer(),
+  ]);
+  let changed = 0;
+  for (let index = 0; index < baseline.length; index += 1) {
+    if (Math.abs(baseline[index] - keyboard[index]) > 8) changed += 1;
+  }
+  const changedRatio = changed / baseline.length;
+  if (changedRatio > 0.01) {
+    throw new Error(`Header changed while the keyboard opened (${changedRatio.toFixed(3)})`);
+  }
+} else if (command === "same-input-height") {
+  const [firstPath, secondPath] = args;
+  const readInputHeight = async (snapshotPath) => {
+    const snapshot = JSON.parse(await fs.readFile(snapshotPath, "utf8"));
+    const input = snapshot.data.nodes.find((candidate) => candidate.type.endsWith("EditText"));
+    if (!input) throw new Error(`Missing composer input in ${snapshotPath}`);
+    return input.rect.height;
+  };
+  const [firstHeight, secondHeight] = await Promise.all([
+    readInputHeight(firstPath),
+    readInputHeight(secondPath),
+  ]);
+  if (firstHeight !== secondHeight) {
+    throw new Error(`Composer height drifted from ${firstHeight} to ${secondHeight}`);
+  }
+} else if (command === "has-exact-text") {
+  const [snapshotPath, expected] = args;
+  const snapshot = JSON.parse(await fs.readFile(snapshotPath, "utf8"));
+  if (!snapshot.data.nodes.some((candidate) => candidate.label === expected)) {
+    throw new Error(`Missing exact text in ${snapshotPath}: ${expected}`);
+  }
+} else if (command === "same-region") {
+  const [firstPath, secondPath, topArgument, heightArgument, failureMessage] = args;
+  const crop = {
+    left: 0,
+    top: Number(topArgument),
+    width: 1080,
+    height: Number(heightArgument),
+  };
+  const [first, second] = await Promise.all([
+    sharp(firstPath).extract(crop).removeAlpha().raw().toBuffer(),
+    sharp(secondPath).extract(crop).removeAlpha().raw().toBuffer(),
+  ]);
+  let changed = 0;
+  for (let index = 0; index < first.length; index += 1) {
+    if (Math.abs(first[index] - second[index]) > 8) changed += 1;
+  }
+  const changedRatio = changed / first.length;
+  if (changedRatio > 0.02) {
+    throw new Error(
+      `${failureMessage ?? "Composer region changed during the JS stall"} (${changedRatio.toFixed(3)})`,
+    );
+  }
+} else {
+  throw new Error(`Unknown command: ${command}`);
+}

packages/app/e2e/mobile/composer-keyboard/stall-hermes.mjs

@@ -0,0 +1,35 @@
+import process from "node:process";
+import { WebSocket } from "ws";
+
+const [, , metroPortArgument, durationArgument, appId] = process.argv;
+const metroPort = Number(metroPortArgument);
+const duration = Number(durationArgument);
+const targets = await fetch(`http://127.0.0.1:${metroPort}/json/list`).then((response) =>
+  response.json(),
+);
+const target = targets.find((candidate) => candidate.appId === appId);
+if (!target) throw new Error(`Missing Hermes target for ${appId}`);
+
+await new Promise((resolve, reject) => {
+  const socket = new WebSocket(target.webSocketDebuggerUrl);
+  const timeout = setTimeout(() => reject(new Error("Hermes stall timed out")), duration + 5000);
+  socket.on("open", () => {
+    socket.send(
+      JSON.stringify({
+        id: 1,
+        method: "Runtime.evaluate",
+        params: {
+          expression: `(() => { const deadline = Date.now() + ${duration}; while (Date.now() < deadline) {} })()`,
+        },
+      }),
+    );
+  });
+  socket.on("message", (message) => {
+    const response = JSON.parse(message.toString());
+    if (response.id !== 1) return;
+    clearTimeout(timeout);
+    socket.close();
+    resolve();
+  });
+  socket.on("error", reject);
+});

packages/app/e2e/support/fixtures.ts

@@ -34,13 +34,20 @@ const metroTest = base.extend({
 
 const daemonTest = metroTest.extend<
   { projectOwnership: void },
-  { e2eForkProviders: string[]; e2eWorker: void; e2eWorkerClient: SeedDaemonClient }
+  {
+    e2eForkProviders: string[];
+    e2eInjectPaseoTools: boolean;
+    e2eWorker: void;
+    e2eWorkerClient: SeedDaemonClient;
+  }
 >({
   e2eForkProviders: [[], { scope: "worker", option: true }],
+  e2eInjectPaseoTools: [false, { scope: "worker", option: true }],
   e2eWorker: [
-    async ({ e2eForkProviders }, provide, workerInfo) => {
+    async ({ e2eForkProviders, e2eInjectPaseoTools }, provide, workerInfo) => {
       const worker = await startE2EWorker(workerInfo.workerIndex, {
         forkProviders: e2eForkProviders,
+        injectPaseoTools: e2eInjectPaseoTools,
       });
       try {
         await provide();

packages/app/e2e/support/helpers/composer.ts

@@ -38,6 +38,10 @@ export async function expectComposerEditable(page: Page): Promise<void> {
   await expect(composerInput(page)).toBeEditable({ timeout: 15_000 });
 }
 
+export async function expectComposerFocused(page: Page): Promise<void> {
+  await expect(composerInput(page)).toBeFocused();
+}
+
 export async function submitMessage(page: Page, text: string): Promise<void> {
   const input = composerInput(page);
   await expect(input).toBeEditable({ timeout: 30_000 });
@@ -49,6 +53,10 @@ export async function fillComposerDraft(page: Page, text: string): Promise<void>
   await composerInput(page).fill(text);
 }
 
+export async function typeIntoFocusedComposer(page: Page, text: string): Promise<void> {
+  await page.keyboard.type(text);
+}
+
 export async function sendDraftToQueue(page: Page): Promise<void> {
   await composerInput(page).press("Control+Enter");
 }

packages/app/e2e/support/helpers/e2e-worker.ts

@@ -1,4 +1,5 @@
 import { execFileSync } from "node:child_process";
+import { existsSync } from "node:fs";
 import { chmod, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
@@ -155,7 +156,7 @@ async function applyMetadataFork(targetHome: string, providerIds: string[]): Pro
 
 export async function startE2EWorker(
   workerIndex: number,
-  options: { forkProviders?: string[] } = {},
+  options: { forkProviders?: string[]; injectPaseoTools?: boolean } = {},
 ): Promise<E2EWorker> {
   const requestedRoot = resolveOptionalHome(process.env.E2E_PASEO_HOME);
   const paseoHome = requestedRoot
@@ -168,6 +169,9 @@ export async function startE2EWorker(
 
   try {
     await applyMetadataFork(paseoHome, options.forkProviders ?? []);
+    if (options.injectPaseoTools) {
+      await enablePaseoTools(paseoHome);
+    }
     const daemon = await startIsolatedHostDaemon(serverId, {
       paseoHome,
       preserveHome,
@@ -201,3 +205,28 @@ export async function startE2EWorker(
     throw error;
   }
 }
+
+async function enablePaseoTools(paseoHome: string): Promise<void> {
+  const configPath = path.join(paseoHome, "config.json");
+  const existing = existsSync(configPath)
+    ? JSON.parse(await readFile(configPath, "utf8"))
+    : { version: 1 };
+  await writeFile(
+    configPath,
+    `${JSON.stringify(
+      {
+        ...existing,
+        daemon: {
+          ...existing.daemon,
+          mcp: {
+            ...existing.daemon?.mcp,
+            enabled: true,
+            injectIntoAgents: true,
+          },
+        },
+      },
+      null,
+      2,
+    )}\n`,
+  );
+}

packages/app/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.7.0-beta.2",
+  "version": "0.7.0-beta.1",
   "private": true,
   "main": "index.ts",
   "scripts": {
     "start": "npm run start:expo",
     "start:expo": "cross-env APP_VARIANT=development expo start",
     "reset-project": "node ./scripts/reset-project.js",
-    "eas-build-post-install": "npm --prefix ../.. run build:app-deps && npm run build:terminal-webview",
+    "eas-build-post-install": "npm --prefix ../.. run build:app-deps && npm run build:embedded-webviews",
     "android": "npm run android:development",
     "android:development": "npm --prefix ../.. run build:client && cross-env APP_VARIANT=development expo prebuild --platform android --clean --non-interactive && cross-env APP_VARIANT=development expo run:android --variant=debug",
     "android:production": "npm --prefix ../.. run build:client && cross-env APP_VARIANT=production expo prebuild --platform android --clean --non-interactive && cross-env APP_VARIANT=production expo run:android --variant=release",
@@ -35,7 +35,10 @@
     "profile:workspace-switching": "node ./scripts/profile-workspace-switching.mjs",
     "profile:workspace-tabs": "node ./scripts/profile-workspace-tabs.mjs",
     "deploy:web": "npm run build:web && wrangler pages deploy dist --project-name paseo-app --branch main",
+    "build:embedded-webviews": "npm run build:terminal-webview && npm run build:source-editor-webview",
     "build:terminal-webview": "node ./scripts/build-terminal-webview-html.mjs",
+    "build:source-editor-webview": "node ./scripts/build-source-editor-webview-html.mjs",
+    "build:source-editor-webview:check": "node ./scripts/build-source-editor-webview-html.mjs --check",
     "build:mermaid-runtime": "node ./src/components/markdown/fence/mermaid/build-runtime.mjs"
   },
   "dependencies": {

packages/app/scripts/build-source-editor-webview-html.mjs

@@ -0,0 +1,95 @@
+import esbuild from "esbuild";
+import fs from "node:fs/promises";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const scriptDirectory = path.dirname(fileURLToPath(import.meta.url));
+const appRoot = path.resolve(scriptDirectory, "..");
+const repoRoot = path.resolve(appRoot, "../..");
+const entry = path.join(appRoot, "src/source-editor/codemirror/webview-entry.ts");
+const output = path.join(appRoot, "src/source-editor/codemirror/webview-html.ts");
+const checkOnly = process.argv.includes("--check");
+
+async function resolveTsPath(basePath) {
+  const candidates = [
+    basePath,
+    `${basePath}.ts`,
+    `${basePath}.tsx`,
+    `${basePath}.js`,
+    `${basePath}.jsx`,
+    path.join(basePath, "index.ts"),
+    path.join(basePath, "index.tsx"),
+  ];
+  for (const candidate of candidates) {
+    try {
+      if ((await fs.stat(candidate)).isFile()) return candidate;
+    } catch {
+      // Try the next TypeScript resolution candidate.
+    }
+  }
+  return basePath;
+}
+
+const aliasPlugin = {
+  name: "paseo-alias",
+  setup(build) {
+    build.onResolve({ filter: /^@\// }, async (args) => ({
+      path: await resolveTsPath(path.join(appRoot, "src", args.path.slice(2))),
+    }));
+  },
+};
+
+const result = await esbuild.build({
+  entryPoints: [entry],
+  bundle: true,
+  write: false,
+  format: "iife",
+  platform: "browser",
+  target: ["ios15", "chrome100"],
+  plugins: [aliasPlugin],
+  logLevel: "info",
+});
+
+const javascript = result.outputFiles[0]?.text;
+if (!javascript) throw new Error("source editor WebView bundle produced no JavaScript");
+
+const html = `<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'unsafe-inline'; style-src 'unsafe-inline'; img-src data:" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover, interactive-widget=resizes-content" />
+    <style>
+      html, body, #source-editor-root, #source-editor-host {
+        width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden;
+      }
+      html, body { overscroll-behavior: none; }
+      #source-editor-root, #source-editor-host { display: flex; min-width: 0; min-height: 0; }
+      #source-editor-host { flex: 1; }
+      * { -webkit-tap-highlight-color: transparent; }
+    </style>
+  </head>
+  <body>
+    <script>${javascript}</script>
+  </body>
+</html>`;
+
+const contents = `// Generated by packages/app/scripts/build-source-editor-webview-html.mjs.
+// Do not edit by hand.
+
+export const sourceEditorWebViewHtml =
+  ${JSON.stringify(html)};
+`;
+
+if (checkOnly) {
+  const existing = await fs.readFile(output, "utf8").catch(() => null);
+  if (existing !== contents) {
+    throw new Error(
+      `${path.relative(repoRoot, output)} is stale. Run npm --prefix packages/app run build:source-editor-webview.`,
+    );
+  }
+  console.log(`${path.relative(repoRoot, output)} is current (${html.length} bytes)`);
+} else {
+  await fs.writeFile(output, contents);
+  console.log(`Wrote ${path.relative(repoRoot, output)} (${html.length} bytes)`);
+}

packages/app/src/components/attachment-lightbox.test.tsx

@@ -4,7 +4,7 @@ import { createRoot, type Root } from "react-dom/client";
 import { JSDOM } from "jsdom";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { AttachmentMetadata } from "@/attachments/types";
-import { AttachmentLightbox } from "./attachment-lightbox";
+import { AttachmentLightbox, type ImageLightboxSource } from "./attachment-lightbox";
 
 const { theme, imageMetadata, useAttachmentPreviewUrlMock } = vi.hoisted(() => {
   const hoistedTheme = {
@@ -42,6 +42,11 @@ const { theme, imageMetadata, useAttachmentPreviewUrlMock } = vi.hoisted(() => {
     ),
   };
 });
+const attachmentSource: ImageLightboxSource = { type: "attachment", metadata: imageMetadata };
+const assistantImageSource: ImageLightboxSource = {
+  type: "uri",
+  uri: "blob:assistant-image",
+};
 
 vi.mock("react-native-unistyles", () => ({
   StyleSheet: {
@@ -70,6 +75,11 @@ vi.mock("react-native-safe-area-context", () => ({
   useSafeAreaInsets: () => ({ top: 0, right: 0, bottom: 0, left: 0 }),
 }));
 
+vi.mock("react-native-gesture-handler", () => ({
+  GestureHandlerRootView: ({ children }: { children?: React.ReactNode }) =>
+    React.createElement("div", { "data-testid": "gesture-handler-root" }, children),
+}));
+
 vi.mock("lucide-react-native", () => {
   const createIcon = (name: string) => (props: Record<string, unknown>) =>
     React.createElement("span", { ...props, "data-icon": name });
@@ -78,16 +88,34 @@ vi.mock("lucide-react-native", () => {
   };
 });
 
-vi.mock("expo-image", () => ({
-  Image: (props: Record<string, unknown>) => {
-    const source = props.source as { uri?: string } | string | undefined;
-    const uri = typeof source === "string" ? source : source?.uri;
-    return React.createElement("div", {
-      "data-testid": props.testID,
-      "data-source": uri,
-      "data-style": JSON.stringify(props.style ?? null),
-      role: "img",
-    });
+vi.mock("@/components/zoomable-viewport/image", () => ({
+  ZoomableImage: (props: Record<string, unknown>) => {
+    const actions = props.actions as Array<{
+      label: string;
+      onPress: () => void;
+      testID?: string;
+    }>;
+    return React.createElement(
+      "div",
+      {
+        "data-testid": `${String(props.testID)}-image`,
+        "data-source": props.uri,
+        role: "img",
+      },
+      actions.map((action) =>
+        React.createElement(
+          "button",
+          {
+            "aria-label": action.label,
+            "data-testid": action.testID,
+            key: action.label,
+            onClick: action.onPress,
+            type: "button",
+          },
+          action.label,
+        ),
+      ),
+    );
   },
 }));
 
@@ -150,42 +178,32 @@ function queryByTestId(testID: string): HTMLElement | null {
 }
 
 describe("AttachmentLightbox", () => {
-  it("renders nothing when metadata is null", () => {
-    render(<AttachmentLightbox metadata={null} onClose={vi.fn()} />);
+  it("renders nothing when the source is null", () => {
+    render(<AttachmentLightbox source={null} onClose={vi.fn()} />);
 
     expect(queryByTestId("attachment-lightbox-backdrop")).toBeNull();
     expect(queryByTestId("attachment-lightbox-image")).toBeNull();
   });
 
   it("renders the image when metadata is provided", () => {
-    render(<AttachmentLightbox metadata={imageMetadata} onClose={vi.fn()} />);
+    render(<AttachmentLightbox source={attachmentSource} onClose={vi.fn()} />);
 
     const image = queryByTestId("attachment-lightbox-image");
     expect(image).not.toBeNull();
     expect(image?.getAttribute("data-source")).toBe("blob:preview");
   });
 
-  it("fills its parent via absolute positioning so expo-image does not collapse to 0px", () => {
-    render(<AttachmentLightbox metadata={imageMetadata} onClose={vi.fn()} />);
+  it("renders a direct timeline image without resolving attachment storage", () => {
+    render(<AttachmentLightbox source={assistantImageSource} onClose={vi.fn()} />);
 
     const image = queryByTestId("attachment-lightbox-image");
-    const style = JSON.parse(image?.getAttribute("data-style") ?? "null") as {
-      position?: string;
-      top?: number;
-      left?: number;
-      right?: number;
-      bottom?: number;
-    } | null;
-    expect(style?.position).toBe("absolute");
-    expect(style?.top).toBe(0);
-    expect(style?.left).toBe(0);
-    expect(style?.right).toBe(0);
-    expect(style?.bottom).toBe(0);
+    expect(image?.getAttribute("data-source")).toBe("blob:assistant-image");
+    expect(useAttachmentPreviewUrlMock).toHaveBeenLastCalledWith(null);
   });
 
   it("calls onClose when the backdrop is pressed", () => {
     const onClose = vi.fn();
-    render(<AttachmentLightbox metadata={imageMetadata} onClose={onClose} />);
+    render(<AttachmentLightbox source={attachmentSource} onClose={onClose} />);
 
     const backdrop = queryByTestId("attachment-lightbox-backdrop");
     expect(backdrop).not.toBeNull();
@@ -196,7 +214,7 @@ describe("AttachmentLightbox", () => {
 
   it("calls onClose when the close button is pressed", () => {
     const onClose = vi.fn();
-    render(<AttachmentLightbox metadata={imageMetadata} onClose={onClose} />);
+    render(<AttachmentLightbox source={attachmentSource} onClose={onClose} />);
 
     const closeButton = document.querySelector(
       '[aria-label="Close image"][data-testid="attachment-lightbox-close"]',
@@ -209,7 +227,7 @@ describe("AttachmentLightbox", () => {
 
   it("shows error text when the preview URL resolves to null", () => {
     useAttachmentPreviewUrlMock.mockReturnValue(null);
-    render(<AttachmentLightbox metadata={imageMetadata} onClose={vi.fn()} />);
+    render(<AttachmentLightbox source={attachmentSource} onClose={vi.fn()} />);
 
     expect(queryByTestId("attachment-lightbox-image")).toBeNull();
     expect(document.body.textContent ?? "").toContain("Couldn't load image");
@@ -217,7 +235,7 @@ describe("AttachmentLightbox", () => {
 
   it("closes on Escape key on web", () => {
     const onClose = vi.fn();
-    render(<AttachmentLightbox metadata={imageMetadata} onClose={onClose} />);
+    render(<AttachmentLightbox source={attachmentSource} onClose={onClose} />);
 
     act(() => {
       window.dispatchEvent(new window.KeyboardEvent("keydown", { key: "Escape" }));

packages/app/src/components/attachment-lightbox.tsx

@@ -1,33 +1,45 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { Modal, Pressable, Text, View } from "react-native";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { GestureHandlerRootView } from "react-native-gesture-handler";
+import { StyleSheet } from "react-native-unistyles";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { Image as ExpoImage } from "expo-image";
 import { X } from "lucide-react-native";
 import { useTranslation } from "react-i18next";
 import type { AttachmentMetadata } from "@/attachments/types";
 import { useAttachmentPreviewUrl } from "@/attachments/use-attachment-preview-url";
-import { isWeb } from "@/constants/platform";
-import { WindowChromeRootRegion, WindowChromeSafeArea } from "@/utils/desktop-window";
+import { isNative, isWeb } from "@/constants/platform";
+import { SPACING } from "@/styles/theme";
+import { WindowChromeRootRegion } from "@/utils/desktop-window";
+import { ZoomableImage } from "@/components/zoomable-viewport/image";
+import type { ViewportSize } from "@/components/zoomable-viewport/geometry";
+
+export type ImageLightboxSource =
+  | { type: "attachment"; metadata: AttachmentMetadata }
+  | { type: "uri"; uri: string; contentSize?: ViewportSize };
 
 interface AttachmentLightboxProps {
-  metadata: AttachmentMetadata | null;
+  source: ImageLightboxSource | null;
   onClose: () => void;
 }
 
-export function AttachmentLightbox({ metadata, onClose }: AttachmentLightboxProps) {
-  const { theme } = useUnistyles();
+const ModalRoot = isNative ? GestureHandlerRootView : View;
+const LIGHTBOX_FIT = { padding: SPACING[4], maxWidth: 960, maxHeight: 640 };
+
+export function AttachmentLightbox({ source, onClose }: AttachmentLightboxProps) {
   const { t } = useTranslation();
   const insets = useSafeAreaInsets();
-  const url = useAttachmentPreviewUrl(metadata);
+  const metadata = source?.type === "attachment" ? source.metadata : null;
+  const attachmentUrl = useAttachmentPreviewUrl(metadata);
+  const url = source?.type === "uri" ? source.uri : attachmentUrl;
+  const contentSize = source?.type === "uri" ? source.contentSize : undefined;
   const [errored, setErrored] = useState(false);
 
   useEffect(() => {
     setErrored(false);
-  }, [metadata?.id]);
+  }, [metadata?.id, url]);
 
   useEffect(() => {
-    if (!isWeb || !metadata) return;
+    if (!isWeb || !source) return;
     function handleKeydown(event: KeyboardEvent) {
       if (event.key === "Escape") {
         onClose();
@@ -37,27 +49,35 @@ export function AttachmentLightbox({ metadata, onClose }: AttachmentLightboxProp
     return () => {
       window.removeEventListener("keydown", handleKeydown);
     };
-  }, [metadata, onClose]);
+  }, [onClose, source]);
 
-  const closeButtonRowStyle = useMemo(
+  const contentLayerStyle = useMemo(
     () => [
-      styles.closeButtonRow,
+      styles.contentLayer,
       {
-        top: insets.top + theme.spacing[3],
+        paddingTop: insets.top,
+        paddingRight: insets.right,
+        paddingBottom: insets.bottom,
+        paddingLeft: insets.left,
       },
     ],
-    [insets.top, theme.spacing],
+    [insets.bottom, insets.left, insets.right, insets.top],
   );
-  const closeButtonStyle = useMemo(
-    () => [styles.closeButton, { marginRight: insets.right + theme.spacing[3] }],
-    [insets.right, theme.spacing],
+  const actions = useMemo(
+    () => [
+      {
+        icon: X,
+        label: t("message.attachments.closeImage"),
+        onPress: onClose,
+        testID: "attachment-lightbox-close",
+      },
+    ],
+    [onClose, t],
   );
 
   const handleImageError = useCallback(() => setErrored(true), []);
-  const noopPress = useCallback(() => {}, []);
-  const imageSource = useMemo(() => ({ uri: url ?? "" }), [url]);
 
-  if (!metadata) {
+  if (!source) {
     return null;
   }
 
@@ -65,61 +85,47 @@ export function AttachmentLightbox({ metadata, onClose }: AttachmentLightboxProp
 
   return (
     <Modal transparent animationType="fade" statusBarTranslucent visible onRequestClose={onClose}>
-      <WindowChromeRootRegion corners="both">
-        <View style={styles.root}>
-          <Pressable
-            testID="attachment-lightbox-backdrop"
-            accessibilityRole="button"
-            accessibilityLabel={t("message.attachments.dismissImage")}
-            onPress={onClose}
-            style={styles.backdrop}
-          />
-          <View style={styles.contentLayer}>
-            <View style={styles.imageArea}>
-              {hasError ? (
-                <Text style={styles.errorText}>{t("message.attachments.imageLoadFailed")}</Text>
-              ) : (
-                <Pressable onPress={noopPress} style={styles.imagePressable}>
-                  <ExpoImage
-                    testID="attachment-lightbox-image"
-                    source={imageSource}
-                    contentFit="contain"
+      <ModalRoot style={styles.root}>
+        <WindowChromeRootRegion corners="both">
+          <View style={styles.root}>
+            <Pressable
+              testID="attachment-lightbox-backdrop"
+              accessibilityRole="button"
+              accessibilityLabel={t("message.attachments.dismissImage")}
+              onPress={onClose}
+              style={styles.backdrop}
+            />
+            <View pointerEvents="box-none" style={contentLayerStyle}>
+              <View pointerEvents="box-none" style={styles.imageArea}>
+                {hasError ? (
+                  <Text style={styles.errorText}>{t("message.attachments.imageLoadFailed")}</Text>
+                ) : (
+                  <ZoomableImage
+                    accessibilityLabel={t("composer.attachments.openImage")}
+                    actions={actions}
+                    contentSize={contentSize}
+                    fit={LIGHTBOX_FIT}
                     onError={handleImageError}
-                    style={imageFillStyle}
+                    onPressOutsideContent={onClose}
+                    style={styles.imageViewport}
+                    testID="attachment-lightbox"
+                    uri={url}
                   />
-                </Pressable>
-              )}
+                )}
+              </View>
             </View>
-            <WindowChromeSafeArea placement="inline" style={closeButtonRowStyle}>
-              <Pressable
-                testID="attachment-lightbox-close"
-                accessibilityRole="button"
-                accessibilityLabel={t("message.attachments.closeImage")}
-                hitSlop={8}
-                onPress={onClose}
-                style={closeButtonStyle}
-              >
-                <X size={16} color={theme.colors.foregroundMuted} />
-              </Pressable>
-            </WindowChromeSafeArea>
           </View>
-        </View>
-      </WindowChromeRootRegion>
+        </WindowChromeRootRegion>
+      </ModalRoot>
     </Modal>
   );
 }
 
-const imageFillStyle = {
-  position: "absolute",
-  top: 0,
-  left: 0,
-  right: 0,
-  bottom: 0,
-} as const;
-
 const styles = StyleSheet.create((theme) => ({
   root: {
     flex: 1,
+    minHeight: 0,
+    minWidth: 0,
   },
   backdrop: {
     position: "absolute",
@@ -135,42 +141,19 @@ const styles = StyleSheet.create((theme) => ({
     left: 0,
     right: 0,
     bottom: 0,
-    pointerEvents: "box-none",
-  },
-  closeButtonRow: {
-    position: "absolute",
-    left: 0,
-    right: 0,
-    alignItems: "flex-end",
-    pointerEvents: "box-none",
   },
   imageArea: {
     flex: 1,
     alignItems: "center",
     justifyContent: "center",
-    padding: theme.spacing[4],
-    pointerEvents: "box-none",
   },
-  imagePressable: {
+  imageViewport: {
     flex: 1,
     width: "100%",
     alignSelf: "center",
-    maxWidth: 960,
-    maxHeight: 640,
   },
   errorText: {
     color: theme.colors.foregroundMuted,
     fontSize: theme.fontSize.base,
   },
-  closeButton: {
-    width: 32,
-    height: 32,
-    borderRadius: 16,
-    backgroundColor: theme.colors.surface2,
-    borderWidth: theme.borderWidth[1],
-    borderColor: theme.colors.border,
-    alignItems: "center",
-    justifyContent: "center",
-    zIndex: 1,
-  },
 }));

packages/app/src/components/combined-model-selector.tsx

@@ -8,6 +8,8 @@ import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
 import { LoadingSpinner } from "@/components/ui/loading-spinner";
 import { Combobox, type ComboboxOption, type ComboboxProps } from "@/components/ui/combobox";
 import { ModelBrowser, ModelProviderGlyph, useModelBrowser } from "@/components/model-browser";
+import { resolveModelBrowserScrolling } from "@/components/model-browser-view";
+import { useIsCompactFormFactor } from "@/constants/layout";
 import { isNative, isWeb } from "@/constants/platform";
 import type { ProviderSelectorProvider } from "@/provider-selection/provider-selection";
 import { ICON_SIZE, type Theme } from "@/styles/theme";
@@ -87,6 +89,8 @@ export function CombinedModelSelector({
   toolbar,
 }: CombinedModelSelectorProps) {
   const { t } = useTranslation();
+  const isCompact = useIsCompactFormFactor();
+  const modelBrowserScrolling = resolveModelBrowserScrolling({ isNative, isCompact });
   const anchorRef = useRef<View>(null);
   const [isOpen, setIsOpen] = useState(false);
   const [isContentReady, setIsContentReady] = useState(isWeb);
@@ -198,7 +202,7 @@ export function CombinedModelSelector({
       onEditProfile={onEditProfile ? handleEditProfile : undefined}
       onRetryProvider={onRetryProvider}
       isRetryingProvider={isRetryingProvider}
-      scrolling={isWeb ? "independent" : "sheet"}
+      scrolling={modelBrowserScrolling}
     />
   ) : (
     <View style={styles.sheetLoadingState}>

packages/app/src/components/keyboard-dock.d.ts

@@ -0,0 +1 @@
+export * from "./keyboard-dock.native";

packages/app/src/components/keyboard-dock.native.tsx

@@ -0,0 +1,21 @@
+import type { ReactNode } from "react";
+import type { ViewProps } from "react-native";
+import Animated, { useAnimatedStyle } from "react-native-reanimated";
+import { useKeyboardShift } from "@/hooks/keyboard-shift-context";
+
+interface KeyboardDockProps extends ViewProps {
+  children: ReactNode;
+}
+
+export function KeyboardDock({ children, style, ...props }: KeyboardDockProps) {
+  const { shift } = useKeyboardShift();
+  const keyboardPaddingStyle = useAnimatedStyle(() => ({
+    paddingBottom: shift.value,
+  }));
+
+  return (
+    <Animated.View style={[style, keyboardPaddingStyle]} {...props}>
+      {children}
+    </Animated.View>
+  );
+}

packages/app/src/components/keyboard-dock.web.tsx

@@ -0,0 +1,10 @@
+import type { ReactNode } from "react";
+import { View, type ViewProps } from "react-native";
+
+interface KeyboardDockProps extends ViewProps {
+  children: ReactNode;
+}
+
+export function KeyboardDock(props: KeyboardDockProps) {
+  return <View {...props} />;
+}

packages/app/src/components/markdown/fence/mermaid/host.web.tsx

@@ -1,17 +1,10 @@
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-  type ComponentType,
-} from "react";
-import { Pressable, View, type StyleProp, type TextStyle, type ViewStyle } from "react-native";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Pressable, View, type TextStyle, type ViewStyle } from "react-native";
+import { Code, Workflow } from "lucide-react-native";
 import { useTranslation } from "react-i18next";
-import { Code, Scan, Workflow, ZoomIn, ZoomOut } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { HighlightedCodeBlock } from "@/components/highlighted-code-block";
-import { useIsCompactFormFactor } from "@/constants/layout";
+import { ZoomableViewport } from "@/components/zoomable-viewport";
 import type { Theme } from "@/styles/theme";
 import type { MarkdownFenceRendererProps } from "../types";
 import type { MermaidRenderRequest } from "./render-model";
@@ -21,13 +14,9 @@ import { MermaidRuntimeRequestDriver } from "./runtime/request-driver";
 import { useMermaidRenderModel } from "./use-render-model";
 import { getDiagramBoxStyle } from "./presentation";
 
-interface MermaidFenceHostImplProps extends MarkdownFenceRendererProps {
-  colorScheme?: "light" | "dark";
-}
-
 interface MermaidIframeRuntimeProps {
   request: MermaidRenderRequest | null;
-  height: number;
+  height: React.CSSProperties["height"];
   onRendered: (message: {
     revision: number;
     source: string;
@@ -61,9 +50,7 @@ function MermaidIframeRuntime({
 
   const sendRequest = useCallback((current: MermaidRenderRequest | null) => {
     const target = iframeRef.current?.contentWindow;
-    if (!current || !target) {
-      return;
-    }
+    if (!current || !target) return;
     const message: MermaidRuntimeRenderMessage = {
       type: "render",
       revision: current.revision,
@@ -80,13 +67,9 @@ function MermaidIframeRuntime({
 
   useEffect(() => {
     function receiveMessage(event: MessageEvent): void {
-      if (event.source !== iframeRef.current?.contentWindow) {
-        return;
-      }
+      if (event.source !== iframeRef.current?.contentWindow) return;
       const message = parseMermaidRuntimeMessage(event.data);
-      if (!message) {
-        return;
-      }
+      if (!message) return;
       if (message.type === "bridgeReady") {
         sendRequest(driverRef.current?.ready() ?? null);
         return;
@@ -116,8 +99,9 @@ function MermaidIframeRuntime({
   );
 }
 
-const MIN_SCALE = 0.25;
-const MAX_SCALE = 8;
+interface MermaidFenceHostImplProps extends MarkdownFenceRendererProps {
+  colorScheme?: "light" | "dark";
+}
 
 function MermaidFenceHostImpl({
   code,
@@ -133,6 +117,9 @@ function MermaidFenceHostImpl({
     colorScheme,
   });
   const [hasRuntimeContent, setHasRuntimeContent] = useState(false);
+  const [showSource, setShowSource] = useState(false);
+  const showSourcePress = useCallback(() => setShowSource(true), []);
+  const showDiagramPress = useCallback(() => setShowSource(false), []);
   const handleRendered = useCallback(
     (message: {
       revision: number;
@@ -153,152 +140,18 @@ function MermaidFenceHostImpl({
   );
   const visible = state.visible;
   const canShowDiagram = visible !== null && hasRuntimeContent;
+  const diagramVisible = canShowDiagram && !showSource;
   const runtimeHeight = Math.max(visible?.height ?? 240, 1);
-
-  const viewportRef = useRef<HTMLDivElement | null>(null);
-  const contentRef = useRef<HTMLDivElement | null>(null);
-  const controlsRegionRef = useRef<HTMLDivElement | null>(null);
-  const transformRef = useRef({ x: 0, y: 0, scale: 1 });
-  const dragRef = useRef<{
-    pointerId: number;
-    startX: number;
-    startY: number;
-    originX: number;
-    originY: number;
-  } | null>(null);
-
-  const applyTransformToElement = useCallback(
-    (element: HTMLDivElement, transform: { x: number; y: number; scale: number }) => {
-      const { x, y, scale } = transform;
-      element.style.transform = `translate(${x}px, ${y}px) scale(${scale})`;
-    },
-    [],
+  const actions = useMemo(
+    () => [
+      {
+        icon: Code,
+        label: t("message.diagram.viewSource"),
+        onPress: showSourcePress,
+      },
+    ],
+    [showSourcePress, t],
   );
-  const applyTransform = useCallback(() => {
-    if (contentRef.current) {
-      applyTransformToElement(contentRef.current, transformRef.current);
-    }
-  }, [applyTransformToElement]);
-  const setContentRef = useCallback(
-    (node: HTMLDivElement | null) => {
-      contentRef.current = node;
-      if (node) {
-        applyTransformToElement(node, transformRef.current);
-      }
-    },
-    [applyTransformToElement],
-  );
-  const setControlsRegionRef = useCallback((node: unknown) => {
-    controlsRegionRef.current = node instanceof HTMLDivElement ? node : null;
-  }, []);
-  const hasFocusedControls = useCallback(() => {
-    const region = controlsRegionRef.current;
-    const active = document.activeElement;
-    return Boolean(region && active instanceof Node && region.contains(active));
-  }, []);
-  const [isFocusWithin, setIsFocusWithin] = useState(false);
-  const handleFocusWithin = useCallback(() => setIsFocusWithin(true), []);
-  const handleBlurWithin = useCallback(() => {
-    window.requestAnimationFrame(() => setIsFocusWithin(hasFocusedControls()));
-  }, [hasFocusedControls]);
-
-  useEffect(() => {
-    const viewport = viewportRef.current;
-    if (!viewport || !visible) {
-      return;
-    }
-    const activeViewport = viewport;
-    function zoomWithWheel(event: WheelEvent): void {
-      if (!event.ctrlKey && !event.metaKey) {
-        return;
-      }
-      event.preventDefault();
-      const transform = transformRef.current;
-      const factor = Math.min(1.25, Math.max(0.8, Math.exp(-event.deltaY * 0.01)));
-      const scale = Math.min(MAX_SCALE, Math.max(MIN_SCALE, transform.scale * factor));
-      const rect = activeViewport.getBoundingClientRect();
-      const x = event.clientX - rect.left;
-      const y = event.clientY - rect.top;
-      transform.x = x - ((x - transform.x) / transform.scale) * scale;
-      transform.y = y - ((y - transform.y) / transform.scale) * scale;
-      transform.scale = scale;
-      applyTransform();
-    }
-    viewport.addEventListener("wheel", zoomWithWheel, { passive: false });
-    return () => viewport.removeEventListener("wheel", zoomWithWheel);
-  }, [applyTransform, visible]);
-
-  const onPointerDown = useCallback((event: React.PointerEvent<HTMLDivElement>) => {
-    if (event.button !== 0 || event.pointerType !== "mouse") {
-      return;
-    }
-    const transform = transformRef.current;
-    dragRef.current = {
-      pointerId: event.pointerId,
-      startX: event.clientX,
-      startY: event.clientY,
-      originX: transform.x,
-      originY: transform.y,
-    };
-    event.currentTarget.setPointerCapture(event.pointerId);
-  }, []);
-  const onPointerMove = useCallback(
-    (event: React.PointerEvent<HTMLDivElement>) => {
-      const drag = dragRef.current;
-      if (!drag || event.pointerId !== drag.pointerId) {
-        return;
-      }
-      transformRef.current.x = drag.originX + event.clientX - drag.startX;
-      transformRef.current.y = drag.originY + event.clientY - drag.startY;
-      applyTransform();
-    },
-    [applyTransform],
-  );
-  const onPointerUp = useCallback((event: React.PointerEvent<HTMLDivElement>) => {
-    if (dragRef.current?.pointerId === event.pointerId) {
-      dragRef.current = null;
-    }
-  }, []);
-  const resetTransform = useCallback(() => {
-    transformRef.current = { x: 0, y: 0, scale: 1 };
-    applyTransform();
-  }, [applyTransform]);
-  const zoomBy = useCallback(
-    (factor: number) => {
-      const viewport = viewportRef.current;
-      if (!viewport) {
-        return;
-      }
-      const rect = viewport.getBoundingClientRect();
-      const x = rect.width / 2;
-      const y = rect.height / 2;
-      const transform = transformRef.current;
-      const scale = Math.min(MAX_SCALE, Math.max(MIN_SCALE, transform.scale * factor));
-      transform.x = x - ((x - transform.x) / transform.scale) * scale;
-      transform.y = y - ((y - transform.y) / transform.scale) * scale;
-      transform.scale = scale;
-      applyTransform();
-    },
-    [applyTransform],
-  );
-  const zoomInPress = useCallback(() => zoomBy(1.25), [zoomBy]);
-  const zoomOutPress = useCallback(() => zoomBy(0.8), [zoomBy]);
-
-  const [showSource, setShowSource] = useState(false);
-  const showSourcePress = useCallback(() => setShowSource(true), []);
-  const showDiagramPress = useCallback(() => setShowSource(false), []);
-  const [isHovered, setIsHovered] = useState(false);
-  const handlePointerEnter = useCallback(() => setIsHovered(true), []);
-  const handlePointerLeave = useCallback(() => setIsHovered(false), []);
-  const isCompact = useIsCompactFormFactor();
-  const controlsVisible = isHovered || isCompact || isFocusWithin;
-
-  useEffect(() => {
-    if (!showSource && contentRef.current) {
-      applyTransformToElement(contentRef.current, transformRef.current);
-    }
-  }, [applyTransformToElement, showSource]);
-
   const sourceView = useMemo(() => {
     const { marginTop, marginBottom, marginVertical, ...sourceTextStyle } = textStyle;
     const margins: ViewStyle = {
@@ -306,182 +159,90 @@ function MermaidFenceHostImpl({
       marginBottom: marginBottom ?? marginVertical,
     };
     const text: TextStyle = sourceTextStyle;
-    return {
-      container: [margins, sourceContainerStyle],
-      text,
-    };
+    return { container: [margins, sourceContainerStyle], text };
   }, [textStyle]);
-  const diagramBoxStyle = getDiagramBoxStyle(textStyle);
-
-  const diagramVisible = canShowDiagram && !showSource;
-  const sourceVisible = !canShowDiagram || showSource;
-  let rootStyle: StyleProp<ViewStyle> = sourceContainerStyle;
-  if (diagramVisible) {
-    rootStyle = [diagramBoxStyle, containerStyle];
-  } else if (showSource) {
-    rootStyle = sourceView.container;
-  }
+  const diagramStyle = useMemo(
+    () => [getDiagramBoxStyle(textStyle), containerStyle, { height: runtimeHeight }],
+    [runtimeHeight, textStyle],
+  );
+  const diagramSize = useMemo(
+    () => (visible ? { width: visible.width, height: visible.height } : MEASURING_SIZE),
+    [visible],
+  );
+  const sourceVisible = !diagramVisible;
+  const sourceContainer = showSource ? sourceView.container : sourceContainerStyle;
   const sourceTextStyle = showSource ? sourceView.text : textStyle;
+  const viewportStyle = diagramVisible ? diagramStyle : measuringStyle;
 
-  const runtime = (
-    <MermaidIframeRuntime
-      request={request}
-      height={runtimeHeight}
-      onRendered={handleRendered}
-      onRenderFailed={renderFailed}
-    />
-  );
   return (
-    <View
-      ref={setControlsRegionRef}
-      style={rootStyle}
-      onPointerEnter={handlePointerEnter}
-      onPointerLeave={handlePointerLeave}
-      onFocus={handleFocusWithin}
-      onBlur={handleBlurWithin}
-    >
+    <>
       {sourceVisible ? (
-        <HighlightedCodeBlock
-          code={code}
-          language="mermaid"
-          inheritedStyles={inheritedStyles}
-          textStyle={sourceTextStyle}
-        />
+        <View style={sourceContainer}>
+          <HighlightedCodeBlock
+            code={code}
+            language="mermaid"
+            inheritedStyles={inheritedStyles}
+            textStyle={sourceTextStyle}
+          />
+          {showSource && canShowDiagram ? (
+            <Pressable
+              accessibilityLabel={t("message.diagram.viewDiagram")}
+              accessibilityRole="button"
+              hitSlop={4}
+              onPress={showDiagramPress}
+              style={controlStyles.sourceButton}
+            >
+              {({ hovered }) => (
+                <Workflow
+                  size={14}
+                  color={hovered ? controlStyles.iconHovered.color : controlStyles.icon.color}
+                />
+              )}
+            </Pressable>
+          ) : null}
+        </View>
       ) : null}
-      <div
-        ref={viewportRef}
-        role={diagramVisible ? "img" : undefined}
-        aria-label={diagramVisible ? t("message.diagram.diagram") : undefined}
-        aria-hidden={!diagramVisible}
-        style={diagramVisible ? viewportDomStyle : measuringRuntimeStyle}
-        onPointerDown={onPointerDown}
-        onPointerMove={onPointerMove}
-        onPointerUp={onPointerUp}
-        onPointerCancel={onPointerUp}
-        onDoubleClick={resetTransform}
+      <ZoomableViewport
+        accessibilityLabel={t("message.diagram.diagram")}
+        actions={actions}
+        contentSize={diagramSize}
+        style={viewportStyle}
+        testID="mermaid-viewport"
+        wheelActivation="modifier"
       >
-        <div ref={setContentRef} style={contentDomStyle}>
-          {runtime}
-        </div>
-      </div>
-      {diagramVisible ? (
-        <View style={controlStyles.cluster}>
-          <DiagramControlButton
-            icon={ZoomIn}
-            label={t("message.diagram.zoomIn")}
-            onPress={zoomInPress}
-            visible={controlsVisible}
-          />
-          <DiagramControlButton
-            icon={ZoomOut}
-            label={t("message.diagram.zoomOut")}
-            onPress={zoomOutPress}
-            visible={controlsVisible}
-          />
-          <DiagramControlButton
-            icon={Scan}
-            label={t("message.diagram.resetZoom")}
-            onPress={resetTransform}
-            visible={controlsVisible}
-          />
-          <DiagramControlButton
-            icon={Code}
-            label={t("message.diagram.viewSource")}
-            onPress={showSourcePress}
-            visible={controlsVisible}
-          />
-        </View>
-      ) : null}
-      {showSource && canShowDiagram ? (
-        <View style={[controlStyles.cluster, controlStyles.clusterSourceOffset]}>
-          <DiagramControlButton
-            icon={Workflow}
-            label={t("message.diagram.viewDiagram")}
-            onPress={showDiagramPress}
-            visible={controlsVisible}
-            plain
-          />
-        </View>
-      ) : null}
-    </View>
-  );
-}
-
-interface DiagramControlButtonProps {
-  icon: ComponentType<{ size?: number; color?: string }>;
-  label: string;
-  onPress: () => void;
-  visible: boolean;
-  plain?: boolean;
-}
-
-const DiagramControlButton = React.memo(function DiagramControlButton({
-  icon: Icon,
-  label,
-  onPress,
-  visible,
-  plain = false,
-}: DiagramControlButtonProps) {
-  const pillStyle = visible ? controlStyles.button : controlStyles.buttonHidden;
-  const plainStyle = visible ? controlStyles.plainButton : controlStyles.plainButtonHidden;
-  return (
-    <Pressable
-      onPress={onPress}
-      style={plain ? plainStyle : pillStyle}
-      accessibilityRole="button"
-      accessibilityLabel={label}
-      hitSlop={4}
-    >
-      {({ hovered }) => (
-        <Icon
-          size={14}
-          color={hovered ? controlStyles.iconHovered.color : controlStyles.icon.color}
+        <MermaidIframeRuntime
+          request={request}
+          height="100%"
+          onRendered={handleRendered}
+          onRenderFailed={renderFailed}
         />
-      )}
-    </Pressable>
+      </ZoomableViewport>
+    </>
   );
-});
+}
 
+const MEASURING_SIZE = { width: 240, height: 240 };
+const sourceContainerStyle: ViewStyle = { position: "relative" };
+const containerStyle: ViewStyle = { overflow: "hidden", position: "relative" };
+const measuringStyle: ViewStyle = {
+  position: "absolute",
+  left: 0,
+  right: 0,
+  top: 0,
+  height: 240,
+  opacity: 0,
+  pointerEvents: "none",
+};
 const controlStyles = StyleSheet.create((theme) => ({
-  cluster: {
+  sourceButton: {
     position: "absolute",
     top: theme.spacing[2],
     right: theme.spacing[2],
-    flexDirection: "row",
-    gap: theme.spacing[1],
-  },
-  clusterSourceOffset: { right: 40 },
-  button: {
     padding: theme.spacing[1],
-    borderRadius: theme.borderRadius.md,
-    backgroundColor: theme.colors.surface2,
-    opacity: 1,
-    pointerEvents: "auto",
   },
-  buttonHidden: {
-    padding: theme.spacing[1],
-    borderRadius: theme.borderRadius.md,
-    backgroundColor: theme.colors.surface2,
-    opacity: 0,
-    pointerEvents: "none",
-  },
-  plainButton: { padding: theme.spacing[1], opacity: 1, pointerEvents: "auto" },
-  plainButtonHidden: { padding: theme.spacing[1], opacity: 0, pointerEvents: "none" },
   icon: { color: theme.colors.foregroundMuted },
   iconHovered: { color: theme.colors.foreground },
 }));
-
-const sourceContainerStyle: ViewStyle = { position: "relative" };
-const containerStyle: ViewStyle = { overflow: "hidden", position: "relative" };
-const viewportDomStyle: React.CSSProperties = { cursor: "grab", userSelect: "none" };
-const contentDomStyle: React.CSSProperties = { transformOrigin: "0 0" };
-const measuringRuntimeStyle: React.CSSProperties = {
-  position: "absolute",
-  inset: 0,
-  opacity: 0,
-  pointerEvents: "none",
-  overflow: "hidden",
-};
 const mapColorScheme = (theme: Theme) => ({ colorScheme: theme.colorScheme });
 const ThemedMermaidFenceHost = withUnistyles(MermaidFenceHostImpl);
 

packages/app/src/components/message.tsx

@@ -42,7 +42,6 @@ import {
   CircleDot,
   Copy,
   Plus,
-  RotateCcw,
   TriangleAlertIcon,
   Scissors,
   MicVocal,
@@ -103,7 +102,7 @@ import {
   AttachmentLabel,
   AttachmentThumbnail,
 } from "@/components/attachment-pill";
-import { AttachmentLightbox } from "@/components/attachment-lightbox";
+import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { isWeb, isNative } from "@/constants/platform";
 import type { AgentCapabilityFlags } from "@getpaseo/protocol/agent-types";
@@ -441,6 +440,10 @@ export const UserMessage = memo(function UserMessage({
   const [isHovered, setIsHovered] = useState(false);
   const [lightboxMetadata, setLightboxMetadata] = useState<UserMessageImageAttachment | null>(null);
   const handleLightboxClose = useCallback(() => setLightboxMetadata(null), []);
+  const lightboxSource = useMemo<ImageLightboxSource | null>(
+    () => (lightboxMetadata ? { type: "attachment", metadata: lightboxMetadata } : null),
+    [lightboxMetadata],
+  );
   const resolvedDisableOuterSpacing = useDisableOuterSpacing(disableOuterSpacing);
   const hasText = message.trim().length > 0;
   const hasImages = images.length > 0;
@@ -566,7 +569,7 @@ export const UserMessage = memo(function UserMessage({
           </View>
         ) : null}
       </View>
-      <AttachmentLightbox metadata={lightboxMetadata} onClose={handleLightboxClose} />
+      <AttachmentLightbox source={lightboxSource} onClose={handleLightboxClose} />
     </View>
   );
 });
@@ -816,6 +819,10 @@ function AssistantMarkdownImage({
   workspaceRoot?: string;
   serverId?: string;
 }) {
+  const { t } = useTranslation();
+  const [viewerOpen, setViewerOpen] = useState(false);
+  const openViewer = useCallback(() => setViewerOpen(true), []);
+  const closeViewer = useCallback(() => setViewerOpen(false), []);
   const containerStyle = useMemo<StyleProp<ViewStyle>>(
     () => ({
       marginTop: hasLeadingContent ? 16 : 0,
@@ -848,6 +855,14 @@ function AssistantMarkdownImage({
     () => [assistantMessageStylesheet.imageSurface, imageSizeStyle],
     [imageSizeStyle],
   );
+  const lightboxSource = useMemo<ImageLightboxSource | null>(() => {
+    if (!viewerOpen || !imageUri) return null;
+    return {
+      type: "uri",
+      uri: imageUri,
+      contentSize: aspectRatio ? { width: aspectRatio, height: 1 } : undefined,
+    };
+  }, [aspectRatio, imageUri, viewerOpen]);
 
   const stateFrameStyle = useMemo<StyleProp<ViewStyle>>(
     () => [
@@ -877,21 +892,34 @@ function AssistantMarkdownImage({
 
   return (
     <View style={frameStyle}>
-      <View style={surfaceStyle} accessibilityRole="image" accessibilityLabel={alt}>
-        <Image
-          ref={binding.onRef}
-          source={imageSource}
+      <Pressable
+        accessibilityLabel={t("composer.attachments.openImage")}
+        accessibilityRole="button"
+        disabled={image.status !== "loaded"}
+        onPress={openViewer}
+        style={surfaceStyle}
+      >
+        <View
           style={assistantMessageStylesheet.image}
-          resizeMode="contain"
-          onLoad={binding.onLoad}
-          onError={binding.onError}
-        />
-        {image.status === "loading" ? (
-          <View pointerEvents="none" style={assistantMessageStylesheet.imageLoadingOverlay}>
-            <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
-          </View>
-        ) : null}
-      </View>
+          accessibilityRole="image"
+          accessibilityLabel={alt}
+        >
+          <Image
+            ref={binding.onRef}
+            source={imageSource}
+            style={assistantMessageStylesheet.image}
+            resizeMode="contain"
+            onLoad={binding.onLoad}
+            onError={binding.onError}
+          />
+          {image.status === "loading" ? (
+            <View pointerEvents="none" style={assistantMessageStylesheet.imageLoadingOverlay}>
+              <ThemedLoadingSpinner size="small" uniProps={foregroundMutedColorMapping} />
+            </View>
+          ) : null}
+        </View>
+      </Pressable>
+      <AttachmentLightbox source={lightboxSource} onClose={closeViewer} />
     </View>
   );
 }
@@ -2261,8 +2289,6 @@ function taskActivityIcon(activity: TaskActivity) {
       return CircleDot;
     case "completed":
       return Check;
-    case "reopened":
-      return RotateCcw;
     default:
       return CheckSquare;
   }
@@ -3120,6 +3146,7 @@ export const ToolCall = memo(function ToolCall({
   const handleToggle = useCallback(() => {
     if (!shouldRenderInline) {
       openToolCall({
+        toolName,
         displayName: presentation.displayName,
         summary: presentation.summary,
         detail: effectiveDetail,
@@ -3133,6 +3160,7 @@ export const ToolCall = memo(function ToolCall({
   }, [
     shouldRenderInline,
     openToolCall,
+    toolName,
     presentation.displayName,
     presentation.summary,
     presentation.errorText,
@@ -3173,6 +3201,7 @@ export const ToolCall = memo(function ToolCall({
     if (!shouldRenderInline) return null;
     return (
       <ToolCallDetailsContent
+        toolName={toolName}
         detail={effectiveDetail}
         errorText={presentation.errorText}
         maxHeight={maxDetailHeight}
@@ -3181,6 +3210,7 @@ export const ToolCall = memo(function ToolCall({
     );
   }, [
     shouldRenderInline,
+    toolName,
     effectiveDetail,
     presentation.errorText,
     presentation.isLoadingDetails,

packages/app/src/components/model-browser-view.test.ts

@@ -7,6 +7,7 @@ import {
   resolveInitialModelBrowserView,
   resolveModelBrowserAllView,
   groupProfilesByProviderModel,
+  resolveModelBrowserScrolling,
 } from "./model-browser-view";
 
 function provider(
@@ -37,6 +38,20 @@ function modelRow(
   };
 }
 
+describe("model browser scrolling", () => {
+  it("participates in native compact bottom-sheet scrolling", () => {
+    expect(resolveModelBrowserScrolling({ isNative: true, isCompact: true })).toBe("sheet");
+  });
+
+  it.each([
+    { platform: "native wide", isNative: true, isCompact: false },
+    { platform: "compact web", isNative: false, isCompact: true },
+    { platform: "wide web", isNative: false, isCompact: false },
+  ])("owns scrolling on $platform surfaces", ({ isNative, isCompact }) => {
+    expect(resolveModelBrowserScrolling({ isNative, isCompact })).toBe("independent");
+  });
+});
+
 describe("model browser initial view", () => {
   const codex = provider("codex", "Codex");
   const pi = provider("pi", "Pi");

packages/app/src/components/model-browser-view.ts

@@ -9,6 +9,16 @@ export type ModelBrowserView =
   | { kind: "all" }
   | { kind: "provider"; providerId: string; providerLabel: string };
 
+export function resolveModelBrowserScrolling({
+  isNative,
+  isCompact,
+}: {
+  isNative: boolean;
+  isCompact: boolean;
+}): "sheet" | "independent" {
+  return isNative && isCompact ? "sheet" : "independent";
+}
+
 /** A profile's model reference; used to match profiles back to model rows. */
 export interface ModelProfileRef {
   provider: string;

packages/app/src/components/tool-call-details.tsx

@@ -11,6 +11,10 @@ import { StyleSheet } from "react-native-unistyles";
 import type { TFunction } from "i18next";
 import { useTranslation } from "react-i18next";
 import type { ToolCallDetail } from "@getpaseo/protocol/agent-types";
+import {
+  buildPaseoToolDetailSections,
+  type PaseoToolDetailSection,
+} from "@getpaseo/protocol/paseo-tool-call-detail";
 import { buildLineDiff, parseUnifiedDiff, type DiffLine } from "@/utils/tool-call-parsers";
 import { highlightDiffLines } from "@/utils/diff-highlight";
 import { hasMeaningfulToolCallDetail } from "@/utils/tool-call-detail-state";
@@ -27,6 +31,7 @@ const ScrollView = isWeb ? RNScrollView : GHScrollView;
 // ---- Content Component ----
 
 interface ToolCallDetailsContentProps {
+  toolName?: string;
   detail?: ToolCallDetail;
   errorText?: string;
   maxHeight?: number;
@@ -626,7 +631,42 @@ function buildUnknownSections(detail: UnknownDetail, ds: DetailStyles, t: TFunct
   return out;
 }
 
+function PaseoDetailSection({ section }: { section: PaseoToolDetailSection }) {
+  return (
+    <View style={styles.paseoSection}>
+      <Text style={styles.paseoSectionTitle}>{section.title}</Text>
+      {section.kind === "prose" ? (
+        <Text selectable style={styles.paseoProse}>
+          {section.text}
+        </Text>
+      ) : (
+        <View style={styles.paseoFields}>
+          {section.fields.map((field) => (
+            <View key={field.label} style={styles.paseoFieldRow}>
+              <Text style={styles.paseoFieldLabel}>{field.label}</Text>
+              <Text selectable style={styles.paseoFieldValue}>
+                {field.value}
+              </Text>
+            </View>
+          ))}
+        </View>
+      )}
+    </View>
+  );
+}
+
+function buildPaseoUnknownSections(
+  toolName: string | undefined,
+  detail: UnknownDetail,
+): ReactNode[] | null {
+  if (!toolName) return null;
+  const sections = buildPaseoToolDetailSections(toolName, detail.input, detail.output);
+  if (!sections) return null;
+  return sections.map((section) => <PaseoDetailSection key={section.title} section={section} />);
+}
+
 function buildDetailSections(
+  toolName: string | undefined,
   detail: ToolCallDetail | undefined,
   diffLines: DiffLine[] | undefined,
   ds: DetailStyles,
@@ -701,7 +741,7 @@ function buildDetailSections(
     return [<ScrollablePlainTextSection key="plain-text" text={detail.text} ds={ds} />];
   }
   if (detail.type === "unknown") {
-    return buildUnknownSections(detail, ds, t);
+    return buildPaseoUnknownSections(toolName, detail) ?? buildUnknownSections(detail, ds, t);
   }
   return [];
 }
@@ -741,6 +781,7 @@ function LoadingSkeleton({ containerStyle }: { containerStyle: StyleProp<ViewSty
 }
 
 export function ToolCallDetailsContent({
+  toolName,
   detail,
   errorText,
   maxHeight,
@@ -752,7 +793,7 @@ export function ToolCallDetailsContent({
   const ds = useDetailStyles(detail, resolvedMaxHeight, fillAvailableHeight);
   const diffLines = useDiffLines(detail);
 
-  const sections: ReactNode[] = buildDetailSections(detail, diffLines, ds, t);
+  const sections: ReactNode[] = buildDetailSections(toolName, detail, diffLines, ds, t);
 
   if (errorText) {
     sections.push(<ErrorSection key="error" errorText={errorText} ds={ds} />);
@@ -796,6 +837,46 @@ const styles = StyleSheet.create((theme) => {
       fontSize: theme.fontSize.base,
       fontWeight: theme.fontWeight.normal,
     },
+    paseoSection: {
+      gap: theme.spacing[3],
+      paddingHorizontal: theme.spacing[4],
+      paddingVertical: theme.spacing[4],
+      borderBottomWidth: theme.borderWidth[1],
+      borderBottomColor: theme.colors.border,
+    },
+    paseoSectionTitle: {
+      color: theme.colors.foreground,
+      fontSize: theme.fontSize.base,
+      fontWeight: theme.fontWeight.medium,
+    },
+    paseoProse: {
+      color: theme.colors.foreground,
+      fontSize: theme.fontSize.content,
+      lineHeight: Math.round(theme.fontSize.content * 1.5),
+      overflowWrap: "anywhere",
+    },
+    paseoFields: {
+      gap: theme.spacing[3],
+    },
+    paseoFieldRow: {
+      flexDirection: "row",
+      alignItems: "flex-start",
+      gap: theme.spacing[4],
+    },
+    paseoFieldLabel: {
+      width: 120,
+      color: theme.colors.foregroundMuted,
+      fontSize: theme.fontSize.sm,
+      lineHeight: Math.round(theme.fontSize.base * 1.5),
+    },
+    paseoFieldValue: {
+      flex: 1,
+      minWidth: 0,
+      color: theme.colors.foreground,
+      fontSize: theme.fontSize.base,
+      lineHeight: Math.round(theme.fontSize.base * 1.5),
+      overflowWrap: "anywhere",
+    },
     section: {
       gap: theme.spacing[2],
     },

packages/app/src/components/tool-call-sheet.tsx

@@ -17,6 +17,7 @@ import { ToolCallDetailsContent } from "./tool-call-details";
 // ----- Types -----
 
 export interface ToolCallSheetData {
+  toolName: string;
   displayName: string;
   summary?: string;
   detail?: ToolCallDetail;
@@ -155,7 +156,14 @@ interface ToolCallSheetContentProps {
 
 function ToolCallSheetContent({ data, onClose }: ToolCallSheetContentProps) {
   const { t } = useTranslation();
-  const { displayName, detail, errorText, icon: IconComponent, showLoadingSkeleton } = data;
+  const {
+    toolName,
+    displayName,
+    detail,
+    errorText,
+    icon: IconComponent,
+    showLoadingSkeleton,
+  } = data;
 
   return (
     <View style={styles.container}>
@@ -181,6 +189,7 @@ function ToolCallSheetContent({ data, onClose }: ToolCallSheetContentProps) {
       {/* Content */}
       <BottomSheetScrollView style={styles.content} contentContainerStyle={styles.contentContainer}>
         <ToolCallDetailsContent
+          toolName={toolName}
           detail={detail}
           errorText={errorText}
           fillAvailableHeight

packages/app/src/components/ui/autocomplete-popover.tsx

@@ -2,6 +2,7 @@ import { useEffect, useMemo, useState, type ReactElement, type RefObject } from
 import { Keyboard, View, useWindowDimensions } from "react-native";
 import { Portal } from "@gorhom/portal";
 import Animated, { useAnimatedStyle, useSharedValue } from "react-native-reanimated";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { StyleSheet } from "react-native-unistyles";
 import { Autocomplete, type AutocompleteOption } from "@/components/ui/autocomplete";
 import {
@@ -63,9 +64,10 @@ export function AutocompletePopover({
   // React Compiler memoizes effect captures by reading SharedValue.value during render.
   const [relativeAnchorRect, setRelativeAnchorRect] = useState<RelativeAnchorRect | null>(null);
   const windowDimensions = useWindowDimensions();
+  const safeAreaInsets = useSafeAreaInsets();
   const portalHostName = useFloatingPanelPortalHostName();
   const { shift } = useKeyboardShift();
-  const openShift = useSharedValue(0);
+  const measuredShift = useSharedValue(0);
 
   useEffect(() => {
     if (!visible || (options.length > 0 && selectedIndex < 0)) {
@@ -88,7 +90,7 @@ export function AutocompletePopover({
           width: anchorRect.width,
           hostHeight: hostRect.height,
         });
-        openShift.value = shift.value;
+        measuredShift.value = shift.value;
         return undefined;
       });
     };
@@ -110,7 +112,7 @@ export function AutocompletePopover({
     selectedIndex,
     anchorRef,
     portalHostName,
-    openShift,
+    measuredShift,
     shift,
     windowDimensions.width,
     windowDimensions.height,
@@ -120,20 +122,22 @@ export function AutocompletePopover({
     if (!relativeAnchorRect) return null;
     return inlineUnistylesStyle({
       position: "absolute" as const,
-      bottom: relativeAnchorRect.hostHeight - relativeAnchorRect.y + OFFSET_FROM_ANCHOR,
       left: relativeAnchorRect.x,
       width: relativeAnchorRect.width,
     });
   }, [relativeAnchorRect]);
 
-  const animatedTransformStyle = useAnimatedStyle(() => ({
-    transform: [{ translateY: openShift.value - shift.value }],
-  }));
-
-  const composedStyle = useMemo(
-    () => [baseStyle, animatedTransformStyle],
-    [baseStyle, animatedTransformStyle],
-  );
+  const anchorY = relativeAnchorRect?.y ?? 0;
+  const baseBottom = relativeAnchorRect
+    ? relativeAnchorRect.hostHeight - relativeAnchorRect.y + OFFSET_FROM_ANCHOR
+    : 0;
+  const keyboardLayoutStyle = useAnimatedStyle(() => {
+    const shiftDelta = shift.value - measuredShift.value;
+    return {
+      bottom: baseBottom + shiftDelta,
+      maxHeight: Math.max(0, anchorY - shiftDelta - safeAreaInsets.top - OFFSET_FROM_ANCHOR * 2),
+    };
+  }, [anchorY, baseBottom, safeAreaInsets.top]);
 
   if (!visible || !relativeAnchorRect || !baseStyle) return null;
   if (options.length > 0 && selectedIndex < 0) return null;
@@ -141,7 +145,10 @@ export function AutocompletePopover({
   return (
     <Portal hostName={portalHostName}>
       <View style={styles.overlay} pointerEvents="box-none">
-        <Animated.View testID="composer-autocomplete-popover" style={composedStyle}>
+        <Animated.View
+          testID="composer-autocomplete-popover"
+          style={[baseStyle, keyboardLayoutStyle]}
+        >
           <Autocomplete
             options={options}
             selectedIndex={selectedIndex}

packages/app/src/components/ui/autocomplete.tsx

@@ -288,6 +288,8 @@ export function Autocomplete({
 
 const styles = StyleSheet.create((theme: Theme) => ({
   outerWrapper: {
+    flexShrink: 1,
+    minHeight: 0,
     gap: theme.spacing[1],
   },
   detailCard: {
@@ -315,6 +317,8 @@ const styles = StyleSheet.create((theme: Theme) => ({
     marginTop: theme.spacing[1],
   },
   container: {
+    flexShrink: 1,
+    minHeight: 0,
     backgroundColor: theme.colors.surface1,
     borderWidth: theme.borderWidth[1],
     borderColor: theme.colors.borderAccent,

packages/app/src/components/ui/text-input/text-input.native.test.tsx

@@ -92,6 +92,45 @@ describe("EditingTextInputNative", () => {
     expect(handleRef.current?.getText()).toBe("");
   });
 
+  it("replaces the native input when clearing text", () => {
+    const handleRef = createRef<EditingTextInputHandle>();
+
+    act(() => {
+      root?.render(
+        <EditingTextInput
+          ref={handleRef}
+          initialValue="line one\nline two\nline three"
+          onChangeText={noop}
+        />,
+      );
+    });
+    const grownInput = container?.querySelector("input");
+
+    act(() => {
+      handleRef.current?.replaceText("");
+    });
+
+    expect(container?.querySelector("input")).not.toBe(grownInput);
+  });
+
+  it("restores focus after replacing a cleared native input", () => {
+    const handleRef = createRef<EditingTextInputHandle>();
+
+    act(() => {
+      root?.render(<EditingTextInput ref={handleRef} initialValue="message" />);
+    });
+    const originalInput = container?.querySelector("input");
+    if (!originalInput) throw new Error("Expected native input");
+    Object.assign(originalInput, { isFocused: () => true });
+    originalInput.focus();
+
+    act(() => {
+      handleRef.current?.replaceText("");
+    });
+
+    expect(document.activeElement).toBe(container?.querySelector("input"));
+  });
+
   it("updates textRef and text when replaceText receives non-empty text", () => {
     const handleRef = createRef<EditingTextInputHandle>();
 

packages/app/src/components/ui/text-input/text-input.native.tsx

@@ -1,4 +1,4 @@
-import React, { forwardRef, useCallback, useImperativeHandle, useRef } from "react";
+import React, { forwardRef, useCallback, useImperativeHandle, useRef, useState } from "react";
 import { TextInput } from "react-native";
 import { BottomSheetTextInput } from "@gorhom/bottom-sheet";
 import PasteInput, {
@@ -11,7 +11,7 @@ import type { EditingTextInputHandle, EditingTextInputProps } from "./types";
 type NativeInput = (TextInput | PasteTextInputInstance) & {
   blur(): void;
   focus(): void;
-  isFocused(): boolean;
+  isFocused?(): boolean;
   clear?(): void;
   replaceText?(text: string, selection?: { start: number; end: number }): void;
   setNativeProps?(props: { text?: string; selection?: { start: number; end: number } }): void;
@@ -35,26 +35,41 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
     const inputRef = useRef<NativeInput | null>(null);
     const initialTextRef = useRef(initialValue);
     const textRef = useRef(initialTextRef.current);
+    const restoreFocusAfterResetRef = useRef(false);
+    const [nativeInputRevision, setNativeInputRevision] = useState(0);
+
+    const assignInputRef = useCallback((input: NativeInput | null) => {
+      inputRef.current = input;
+      if (!input || !restoreFocusAfterResetRef.current) return;
+      restoreFocusAfterResetRef.current = false;
+      input.focus();
+    }, []);
 
     useImperativeHandle(ref, () => ({
       focus: () => inputRef.current?.focus(),
       blur: () => inputRef.current?.blur(),
-      isFocused: () => inputRef.current?.isFocused() ?? false,
+      isFocused: () => inputRef.current?.isFocused?.() ?? false,
       getText: () => textRef.current,
       replaceText: (nextText, selection) => {
         textRef.current = nextText;
+        if (nextText === "") {
+          restoreFocusAfterResetRef.current = inputRef.current?.isFocused?.() ?? false;
+          if (inputRef.current?.replaceText) {
+            inputRef.current.replaceText(nextText, selection);
+          } else {
+            inputRef.current?.clear?.();
+          }
+          setNativeInputRevision((revision) => revision + 1);
+          return;
+        }
         if (inputRef.current?.replaceText) {
           inputRef.current.replaceText(nextText, selection);
           return;
         }
-        if (nextText === "") {
-          inputRef.current?.clear?.();
-        } else {
-          inputRef.current?.setNativeProps?.({
-            text: nextText,
-            ...(selection ? { selection } : {}),
-          });
-        }
+        inputRef.current?.setNativeProps?.({
+          text: nextText,
+          ...(selection ? { selection } : {}),
+        });
         if (selection) inputRef.current?.setSelection?.(selection.start, selection.end);
       },
       getNativeRef: () => inputRef.current?.getNativeRef?.() ?? inputRef.current,
@@ -82,8 +97,9 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
       return (
         <PasteInput
           {...props}
-          ref={inputRef as React.Ref<PasteTextInputInstance>}
-          defaultValue={initialTextRef.current}
+          key={nativeInputRevision}
+          ref={assignInputRef as React.Ref<PasteTextInputInstance>}
+          defaultValue={textRef.current}
           onChangeText={handleChangeText}
           onPaste={handlePaste}
         />
@@ -93,8 +109,9 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
       return (
         <BottomSheetTextInput
           {...props}
-          ref={inputRef as unknown as React.Ref<never>}
-          defaultValue={initialTextRef.current}
+          key={nativeInputRevision}
+          ref={assignInputRef as unknown as React.Ref<never>}
+          defaultValue={textRef.current}
           onChangeText={handleChangeText}
         />
       );
@@ -102,8 +119,9 @@ export const EditingTextInput = forwardRef<EditingTextInputHandle, EditingTextIn
     return (
       <TextInput
         {...props}
-        ref={inputRef as React.Ref<TextInput>}
-        defaultValue={initialTextRef.current}
+        key={nativeInputRevision}
+        ref={assignInputRef as React.Ref<TextInput>}
+        defaultValue={textRef.current}
         onChangeText={handleChangeText}
       />
     );

packages/app/src/components/zoomable-viewport/geometry.test.ts

@@ -0,0 +1,108 @@
+import { describe, expect, it } from "vitest";
+import {
+  FIT_TRANSFORM,
+  clampTransform,
+  fitContentSize,
+  isActivePinchUpdate,
+  isPointInsideTransformedContent,
+  panContent,
+  zoomContentAtPoint,
+} from "./geometry";
+
+const viewport = { width: 800, height: 600 };
+const fittedContent = { width: 800, height: 400 };
+
+describe("zoomable viewport geometry", () => {
+  it("rejects Android's terminal pinch update after a touch has lifted", () => {
+    expect(isActivePinchUpdate(1, 2)).toBe(false);
+    expect(isActivePinchUpdate(2, 2)).toBe(true);
+  });
+
+  it("fits content inside the viewport without changing its aspect ratio", () => {
+    expect(fitContentSize({ width: 1600, height: 800 }, viewport)).toEqual(fittedContent);
+    expect(fitContentSize({ width: 400, height: 800 }, viewport)).toEqual({
+      width: 300,
+      height: 600,
+    });
+  });
+
+  it("fits within presentation padding and caps without shrinking the zoom viewport", () => {
+    expect(
+      fitContentSize({ width: 1600, height: 800 }, viewport, {
+        padding: 20,
+        maxWidth: 600,
+        maxHeight: 500,
+      }),
+    ).toEqual({ width: 600, height: 300 });
+  });
+
+  it("distinguishes backdrop taps from taps on transformed content", () => {
+    expect(
+      isPointInsideTransformedContent({
+        point: { x: 400, y: 300 },
+        transform: FIT_TRANSFORM,
+        fittedContent,
+        viewport,
+      }),
+    ).toBe(true);
+    expect(
+      isPointInsideTransformedContent({
+        point: { x: 400, y: 50 },
+        transform: FIT_TRANSFORM,
+        fittedContent,
+        viewport,
+      }),
+    ).toBe(false);
+    expect(
+      isPointInsideTransformedContent({
+        point: { x: 10, y: 10 },
+        transform: { scale: 2, x: 0, y: 0 },
+        fittedContent,
+        viewport,
+      }),
+    ).toBe(true);
+  });
+
+  it("returns to the centered fit transform at the minimum scale", () => {
+    expect(
+      clampTransform({ scale: 0.5, x: 200, y: -200 }, fittedContent, viewport, {
+        minScale: 1,
+        maxScale: 8,
+      }),
+    ).toEqual(FIT_TRANSFORM);
+  });
+
+  it("keeps the focal content point under the cursor while zooming", () => {
+    expect(
+      zoomContentAtPoint({
+        transform: FIT_TRANSFORM,
+        scale: 2,
+        focalPoint: { x: 600, y: 300 },
+        fittedContent,
+        viewport,
+        limits: { minScale: 1, maxScale: 8 },
+      }),
+    ).toEqual({ scale: 2, x: -200, y: 0 });
+  });
+
+  it("clamps panning to the scaled content edges", () => {
+    expect(
+      panContent({
+        transform: { scale: 2, x: 0, y: 0 },
+        delta: { x: 900, y: -900 },
+        fittedContent,
+        viewport,
+        limits: { minScale: 1, maxScale: 8 },
+      }),
+    ).toEqual({ scale: 2, x: 400, y: -100 });
+  });
+
+  it("allows Mermaid consumers to zoom below fit without inventing translation", () => {
+    expect(
+      clampTransform({ scale: 0.25, x: 100, y: 100 }, fittedContent, viewport, {
+        minScale: 0.25,
+        maxScale: 8,
+      }),
+    ).toEqual({ scale: 0.25, x: 0, y: 0 });
+  });
+});

packages/app/src/components/zoomable-viewport/geometry.ts

@@ -0,0 +1,148 @@
+export interface ViewportSize {
+  width: number;
+  height: number;
+}
+
+export interface ViewportPoint {
+  x: number;
+  y: number;
+}
+
+export interface ViewportTransform {
+  scale: number;
+  x: number;
+  y: number;
+}
+
+export interface ViewportScaleLimits {
+  minScale: number;
+  maxScale: number;
+}
+
+export interface ViewportFitOptions {
+  padding?: number;
+  maxWidth?: number;
+  maxHeight?: number;
+}
+
+export const FIT_TRANSFORM: ViewportTransform = { scale: 1, x: 0, y: 0 };
+
+export function isActivePinchUpdate(activeTouches: number, reportedPointers: number): boolean {
+  "worklet";
+  return activeTouches >= 2 && reportedPointers >= 2;
+}
+
+export function isPointInsideTransformedContent(input: {
+  point: ViewportPoint;
+  transform: ViewportTransform;
+  fittedContent: ViewportSize;
+  viewport: ViewportSize;
+}): boolean {
+  "worklet";
+  const centerX = input.viewport.width / 2 + input.transform.x;
+  const centerY = input.viewport.height / 2 + input.transform.y;
+  const halfWidth = (input.fittedContent.width * input.transform.scale) / 2;
+  const halfHeight = (input.fittedContent.height * input.transform.scale) / 2;
+  return (
+    input.point.x >= centerX - halfWidth &&
+    input.point.x <= centerX + halfWidth &&
+    input.point.y >= centerY - halfHeight &&
+    input.point.y <= centerY + halfHeight
+  );
+}
+
+export function fitContentSize(
+  content: ViewportSize,
+  viewport: ViewportSize,
+  options: ViewportFitOptions = {},
+): ViewportSize {
+  const padding = options.padding ?? 0;
+  const availableWidth = Math.max(
+    0,
+    Math.min(viewport.width - padding * 2, options.maxWidth ?? Number.POSITIVE_INFINITY),
+  );
+  const availableHeight = Math.max(
+    0,
+    Math.min(viewport.height - padding * 2, options.maxHeight ?? Number.POSITIVE_INFINITY),
+  );
+  const fitScale = Math.min(availableWidth / content.width, availableHeight / content.height);
+  return {
+    width: content.width * fitScale,
+    height: content.height * fitScale,
+  };
+}
+
+function clampScale(scale: number, limits: ViewportScaleLimits): number {
+  return Math.min(limits.maxScale, Math.max(limits.minScale, scale));
+}
+
+function clampOffset(offset: number, maximum: number): number {
+  if (maximum === 0) {
+    return 0;
+  }
+  return Math.min(maximum, Math.max(-maximum, offset));
+}
+
+export function clampTransform(
+  transform: ViewportTransform,
+  fittedContent: ViewportSize,
+  viewport: ViewportSize,
+  limits: ViewportScaleLimits,
+): ViewportTransform {
+  const scale = clampScale(transform.scale, limits);
+  const maxX = Math.max(0, (fittedContent.width * scale - viewport.width) / 2);
+  const maxY = Math.max(0, (fittedContent.height * scale - viewport.height) / 2);
+  return {
+    scale,
+    x: clampOffset(transform.x, maxX),
+    y: clampOffset(transform.y, maxY),
+  };
+}
+
+export function zoomContentAtPoint(input: {
+  transform: ViewportTransform;
+  scale: number;
+  focalPoint: ViewportPoint;
+  fittedContent: ViewportSize;
+  viewport: ViewportSize;
+  limits: ViewportScaleLimits;
+}): ViewportTransform {
+  const scale = clampScale(input.scale, input.limits);
+  const viewportCenter = {
+    x: input.viewport.width / 2,
+    y: input.viewport.height / 2,
+  };
+  const contentPoint = {
+    x: (input.focalPoint.x - viewportCenter.x - input.transform.x) / input.transform.scale,
+    y: (input.focalPoint.y - viewportCenter.y - input.transform.y) / input.transform.scale,
+  };
+  return clampTransform(
+    {
+      scale,
+      x: input.focalPoint.x - viewportCenter.x - contentPoint.x * scale,
+      y: input.focalPoint.y - viewportCenter.y - contentPoint.y * scale,
+    },
+    input.fittedContent,
+    input.viewport,
+    input.limits,
+  );
+}
+
+export function panContent(input: {
+  transform: ViewportTransform;
+  delta: ViewportPoint;
+  fittedContent: ViewportSize;
+  viewport: ViewportSize;
+  limits: ViewportScaleLimits;
+}): ViewportTransform {
+  return clampTransform(
+    {
+      ...input.transform,
+      x: input.transform.x + input.delta.x,
+      y: input.transform.y + input.delta.y,
+    },
+    input.fittedContent,
+    input.viewport,
+    input.limits,
+  );
+}

packages/app/src/components/zoomable-viewport/image.tsx

@@ -0,0 +1,102 @@
+import { useEffect, useMemo, useState } from "react";
+import { Image, View, type StyleProp, type ViewStyle } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import type { ViewportFitOptions, ViewportSize } from "./geometry";
+import { ZoomableViewport } from "./index";
+import type { ZoomableViewportAction } from "./types";
+
+interface ZoomableImageProps {
+  uri: string;
+  accessibilityLabel?: string;
+  actions?: ZoomableViewportAction[];
+  contentSize?: ViewportSize;
+  fit?: ViewportFitOptions;
+  maxScale?: number;
+  minScale?: number;
+  onError?: () => void;
+  onPressOutsideContent?: () => void;
+  style?: StyleProp<ViewStyle>;
+  testID?: string;
+  wheelActivation?: "always" | "modifier";
+}
+
+export function ZoomableImage({
+  uri,
+  accessibilityLabel,
+  actions,
+  contentSize,
+  fit,
+  maxScale,
+  minScale = 1,
+  onError,
+  onPressOutsideContent,
+  style,
+  testID = "zoomable-image",
+  wheelActivation = "always",
+}: ZoomableImageProps) {
+  const [loadedSize, setLoadedSize] = useState<ViewportSize | null>(null);
+  const resolvedSize = contentSize ?? loadedSize;
+  const source = useMemo(() => ({ uri }), [uri]);
+
+  useEffect(() => {
+    if (contentSize) return;
+    let active = true;
+    setLoadedSize(null);
+    Image.getSize(
+      uri,
+      (width, height) => {
+        if (active && width > 0 && height > 0) setLoadedSize({ width, height });
+      },
+      () => {
+        if (active) onError?.();
+      },
+    );
+    return () => {
+      active = false;
+    };
+  }, [contentSize, onError, uri]);
+
+  if (!resolvedSize) {
+    return (
+      <View style={[styles.root, style]} testID={testID}>
+        <Image
+          accessibilityLabel={accessibilityLabel}
+          accessibilityRole="image"
+          onError={onError}
+          resizeMode="contain"
+          source={source}
+          style={styles.image}
+          testID={`${testID}-image`}
+        />
+      </View>
+    );
+  }
+
+  return (
+    <ZoomableViewport
+      accessibilityLabel={accessibilityLabel}
+      actions={actions}
+      contentSize={resolvedSize}
+      fit={fit}
+      maxScale={maxScale}
+      minScale={minScale}
+      onPressOutsideContent={onPressOutsideContent}
+      style={style}
+      testID={testID}
+      wheelActivation={wheelActivation}
+    >
+      <Image
+        onError={onError}
+        resizeMode="contain"
+        source={source}
+        style={styles.image}
+        testID={`${testID}-image`}
+      />
+    </ZoomableViewport>
+  );
+}
+
+const styles = StyleSheet.create(() => ({
+  root: { flex: 1, minHeight: 0 },
+  image: { width: "100%", height: "100%" },
+}));

packages/app/src/components/zoomable-viewport/index.tsx

@@ -0,0 +1,252 @@
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { View, type LayoutChangeEvent } from "react-native";
+import { Gesture, GestureDetector } from "react-native-gesture-handler";
+import Animated, { runOnJS, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
+import { StyleSheet } from "react-native-unistyles";
+import {
+  FIT_TRANSFORM,
+  fitContentSize,
+  isActivePinchUpdate,
+  isPointInsideTransformedContent,
+  zoomContentAtPoint,
+  type ViewportSize,
+} from "./geometry";
+import { ViewportToolbar } from "./toolbar";
+import type { ZoomableViewportProps } from "./types";
+
+const DEFAULT_MAX_SCALE = 8;
+const DEFAULT_MIN_SCALE = 0.25;
+
+export function ZoomableViewport({
+  contentSize,
+  children,
+  actions = [],
+  accessibilityLabel,
+  fit,
+  maxScale = DEFAULT_MAX_SCALE,
+  minScale = DEFAULT_MIN_SCALE,
+  onPressOutsideContent,
+  style,
+  testID,
+}: ZoomableViewportProps) {
+  const [viewport, setViewport] = useState<ViewportSize | null>(null);
+  const [toolbarScale, setToolbarScale] = useState(1);
+  const scale = useSharedValue(1);
+  const translateX = useSharedValue(0);
+  const translateY = useSharedValue(0);
+  const startScale = useSharedValue(1);
+  const startX = useSharedValue(0);
+  const startY = useSharedValue(0);
+  const pinchFocalX = useSharedValue(0);
+  const pinchFocalY = useSharedValue(0);
+  const pinchReady = useSharedValue(false);
+  const pinchTouchCount = useSharedValue(0);
+  const fittedContent = useMemo(
+    () => (viewport ? fitContentSize(contentSize, viewport, fit) : null),
+    [contentSize, fit, viewport],
+  );
+
+  const reset = useCallback(() => {
+    scale.value = FIT_TRANSFORM.scale;
+    translateX.value = FIT_TRANSFORM.x;
+    translateY.value = FIT_TRANSFORM.y;
+    setToolbarScale(FIT_TRANSFORM.scale);
+  }, [scale, translateX, translateY]);
+
+  useEffect(() => reset(), [contentSize.height, contentSize.width, reset, viewport]);
+
+  const panGesture = useMemo(
+    () =>
+      Gesture.Pan()
+        .maxPointers(1)
+        .onBegin(() => {
+          startX.value = translateX.value;
+          startY.value = translateY.value;
+        })
+        .onUpdate((event) => {
+          if (!fittedContent || !viewport || scale.value <= minScale) return;
+          const maxX = Math.max(0, (fittedContent.width * scale.value - viewport.width) / 2);
+          const maxY = Math.max(0, (fittedContent.height * scale.value - viewport.height) / 2);
+          translateX.value = Math.min(maxX, Math.max(-maxX, startX.value + event.translationX));
+          translateY.value = Math.min(maxY, Math.max(-maxY, startY.value + event.translationY));
+        }),
+    [fittedContent, minScale, scale, startX, startY, translateX, translateY, viewport],
+  );
+
+  const pinchGesture = useMemo(
+    () =>
+      Gesture.Pinch()
+        .onTouchesDown((event) => {
+          pinchTouchCount.value = event.numberOfTouches;
+        })
+        .onTouchesUp((event) => {
+          pinchTouchCount.value = event.numberOfTouches;
+        })
+        .onBegin((event) => {
+          pinchTouchCount.value = event.numberOfPointers;
+          startScale.value = scale.value;
+          startX.value = translateX.value;
+          startY.value = translateY.value;
+          pinchReady.value = false;
+        })
+        .onUpdate((event) => {
+          if (!fittedContent || !viewport) return;
+          // Android emits one final pinch update after a finger lifts. Its focal point belongs to
+          // the remaining pointer, so applying it makes the content jump as the gesture ends.
+          if (!isActivePinchUpdate(pinchTouchCount.value, event.numberOfPointers)) return;
+          if (!pinchReady.value) {
+            pinchFocalX.value = event.focalX;
+            pinchFocalY.value = event.focalY;
+            pinchReady.value = true;
+          }
+          const nextScale = Math.min(maxScale, Math.max(minScale, startScale.value * event.scale));
+          const centerX = viewport.width / 2;
+          const centerY = viewport.height / 2;
+          const contentPointX = (pinchFocalX.value - centerX - startX.value) / startScale.value;
+          const contentPointY = (pinchFocalY.value - centerY - startY.value) / startScale.value;
+          const nextX = event.focalX - centerX - contentPointX * nextScale;
+          const nextY = event.focalY - centerY - contentPointY * nextScale;
+          const maxX = Math.max(0, (fittedContent.width * nextScale - viewport.width) / 2);
+          const maxY = Math.max(0, (fittedContent.height * nextScale - viewport.height) / 2);
+          scale.value = nextScale;
+          translateX.value = Math.min(maxX, Math.max(-maxX, nextX));
+          translateY.value = Math.min(maxY, Math.max(-maxY, nextY));
+        })
+        .onFinalize(() => {
+          pinchTouchCount.value = 0;
+          runOnJS(setToolbarScale)(scale.value);
+        }),
+    [
+      fittedContent,
+      maxScale,
+      minScale,
+      pinchFocalX,
+      pinchFocalY,
+      pinchReady,
+      pinchTouchCount,
+      scale,
+      startScale,
+      startX,
+      startY,
+      translateX,
+      translateY,
+      viewport,
+    ],
+  );
+  const doubleTapGesture = useMemo(
+    () =>
+      Gesture.Tap()
+        .numberOfTaps(2)
+        .onEnd((_event, success) => {
+          if (success) runOnJS(reset)();
+        }),
+    [reset],
+  );
+  const backdropTapGesture = useMemo(
+    () =>
+      Gesture.Tap()
+        .numberOfTaps(1)
+        .onEnd((event, success) => {
+          if (!success || !fittedContent || !viewport || !onPressOutsideContent) return;
+          const isInside = isPointInsideTransformedContent({
+            point: { x: event.x, y: event.y },
+            transform: { scale: scale.value, x: translateX.value, y: translateY.value },
+            fittedContent,
+            viewport,
+          });
+          if (!isInside) runOnJS(onPressOutsideContent)();
+        }),
+    [fittedContent, onPressOutsideContent, scale, translateX, translateY, viewport],
+  );
+  const tapGesture = useMemo(
+    () => Gesture.Exclusive(doubleTapGesture, backdropTapGesture),
+    [backdropTapGesture, doubleTapGesture],
+  );
+  const transformGesture = useMemo(
+    () => Gesture.Simultaneous(panGesture, pinchGesture),
+    [panGesture, pinchGesture],
+  );
+  const gesture = useMemo(
+    () => Gesture.Exclusive(transformGesture, tapGesture),
+    [tapGesture, transformGesture],
+  );
+
+  const zoomFromCenter = useCallback(
+    (factor: number) => {
+      if (!fittedContent || !viewport) return;
+      const next = zoomContentAtPoint({
+        transform: { scale: scale.value, x: translateX.value, y: translateY.value },
+        scale: scale.value * factor,
+        focalPoint: { x: viewport.width / 2, y: viewport.height / 2 },
+        fittedContent,
+        viewport,
+        limits: { minScale, maxScale },
+      });
+      scale.value = next.scale;
+      translateX.value = next.x;
+      translateY.value = next.y;
+      setToolbarScale(next.scale);
+    },
+    [fittedContent, maxScale, minScale, scale, translateX, translateY, viewport],
+  );
+  const zoomIn = useCallback(() => zoomFromCenter(1.25), [zoomFromCenter]);
+  const zoomOut = useCallback(() => zoomFromCenter(0.8), [zoomFromCenter]);
+  const handleLayout = useCallback((event: LayoutChangeEvent) => {
+    const { width, height } = event.nativeEvent.layout;
+    if (width > 0 && height > 0) setViewport({ width, height });
+  }, []);
+
+  const translationStyle = useAnimatedStyle(() => ({
+    transform: [{ translateX: translateX.value }, { translateY: translateY.value }],
+  }));
+  const scaleStyle = useAnimatedStyle(() => ({ transform: [{ scale: scale.value }] }));
+  const frameStyle = useMemo(
+    () => [
+      styles.contentFrame,
+      { width: fittedContent?.width ?? 0, height: fittedContent?.height ?? 0 },
+      translationStyle,
+    ],
+    [fittedContent, translationStyle],
+  );
+
+  return (
+    <View onLayout={handleLayout} style={[styles.root, style]} testID={testID}>
+      <GestureDetector gesture={gesture}>
+        <View
+          accessibilityLabel={accessibilityLabel}
+          accessibilityRole={accessibilityLabel ? "image" : undefined}
+          style={styles.canvas}
+          testID={testID ? `${testID}-canvas` : undefined}
+        >
+          {fittedContent ? (
+            <Animated.View style={frameStyle}>
+              <Animated.View style={[styles.content, scaleStyle]}>{children}</Animated.View>
+            </Animated.View>
+          ) : null}
+        </View>
+      </GestureDetector>
+      <ViewportToolbar
+        actions={actions}
+        maxScale={maxScale}
+        minScale={minScale}
+        onReset={reset}
+        onZoomIn={zoomIn}
+        onZoomOut={zoomOut}
+        scale={toolbarScale}
+        visible
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create(() => ({
+  root: { flex: 1, minHeight: 0, overflow: "hidden", position: "relative" },
+  canvas: {
+    flex: 1,
+    alignItems: "center",
+    justifyContent: "center",
+    overflow: "hidden",
+  },
+  contentFrame: { flexShrink: 0 },
+  content: { width: "100%", height: "100%" },
+}));

packages/app/src/components/zoomable-viewport/index.web.tsx

@@ -0,0 +1,350 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { View } from "react-native";
+import { StyleSheet } from "react-native-unistyles";
+import {
+  FIT_TRANSFORM,
+  fitContentSize,
+  isPointInsideTransformedContent,
+  panContent,
+  zoomContentAtPoint,
+  type ViewportPoint,
+  type ViewportSize,
+  type ViewportTransform,
+} from "./geometry";
+import { ViewportToolbar } from "./toolbar";
+import type { ZoomableViewportProps } from "./types";
+
+const DEFAULT_MAX_SCALE = 8;
+const DEFAULT_MIN_SCALE = 0.25;
+
+interface DragGesture {
+  type: "drag";
+  pointerId: number;
+  startPoint: ViewportPoint;
+  startTransform: ViewportTransform;
+}
+
+interface PinchGesture {
+  type: "pinch";
+  distance: number;
+  midpoint: ViewportPoint;
+}
+
+type ActiveGesture = DragGesture | PinchGesture;
+
+function midpoint(points: ViewportPoint[]): ViewportPoint {
+  return {
+    x: (points[0].x + points[1].x) / 2,
+    y: (points[0].y + points[1].y) / 2,
+  };
+}
+
+function distance(points: ViewportPoint[]): number {
+  return Math.hypot(points[0].x - points[1].x, points[0].y - points[1].y);
+}
+
+export function ZoomableViewport({
+  contentSize,
+  children,
+  actions = [],
+  accessibilityLabel,
+  fit,
+  maxScale = DEFAULT_MAX_SCALE,
+  minScale = DEFAULT_MIN_SCALE,
+  onPressOutsideContent,
+  style,
+  testID,
+  wheelActivation = "modifier",
+}: ZoomableViewportProps) {
+  const canvasRef = useRef<HTMLDivElement | null>(null);
+  const pointersRef = useRef(new Map<number, ViewportPoint>());
+  const gestureRef = useRef<ActiveGesture | null>(null);
+  const suppressClickRef = useRef(false);
+  const transformRef = useRef<ViewportTransform>(FIT_TRANSFORM);
+  const [viewport, setViewport] = useState<ViewportSize | null>(null);
+  const [transform, setTransform] = useState<ViewportTransform>(FIT_TRANSFORM);
+  const [isDragging, setIsDragging] = useState(false);
+  const [isHovered, setIsHovered] = useState(false);
+  const [isFocusWithin, setIsFocusWithin] = useState(false);
+  const [hasTouchInput, setHasTouchInput] = useState(false);
+  const fittedContent = useMemo(
+    () => (viewport ? fitContentSize(contentSize, viewport, fit) : null),
+    [contentSize, fit, viewport],
+  );
+  const limits = useMemo(() => ({ minScale, maxScale }), [maxScale, minScale]);
+
+  const commitTransform = useCallback((next: ViewportTransform) => {
+    transformRef.current = next;
+    setTransform(next);
+  }, []);
+  const reset = useCallback(() => commitTransform(FIT_TRANSFORM), [commitTransform]);
+
+  useEffect(() => {
+    const canvas = canvasRef.current;
+    if (!canvas) return;
+    const observer = new ResizeObserver(([entry]) => {
+      if (!entry || entry.contentRect.width <= 0 || entry.contentRect.height <= 0) return;
+      setViewport({ width: entry.contentRect.width, height: entry.contentRect.height });
+    });
+    observer.observe(canvas);
+    return () => observer.disconnect();
+  }, []);
+
+  useEffect(() => reset(), [contentSize.height, contentSize.width, reset, viewport]);
+
+  const zoomAt = useCallback(
+    (scale: number, focalPoint: ViewportPoint) => {
+      if (!fittedContent || !viewport) return;
+      commitTransform(
+        zoomContentAtPoint({
+          transform: transformRef.current,
+          scale,
+          focalPoint,
+          fittedContent,
+          viewport,
+          limits,
+        }),
+      );
+    },
+    [commitTransform, fittedContent, limits, viewport],
+  );
+  const zoomFromCenter = useCallback(
+    (factor: number) => {
+      if (!viewport) return;
+      zoomAt(transformRef.current.scale * factor, {
+        x: viewport.width / 2,
+        y: viewport.height / 2,
+      });
+    },
+    [viewport, zoomAt],
+  );
+  const zoomIn = useCallback(() => zoomFromCenter(1.25), [zoomFromCenter]);
+  const zoomOut = useCallback(() => zoomFromCenter(0.8), [zoomFromCenter]);
+
+  useEffect(() => {
+    const canvas = canvasRef.current;
+    if (!canvas) return;
+    const activeCanvas = canvas;
+    function zoomWithWheel(event: WheelEvent) {
+      const hasModifier = event.ctrlKey || event.metaKey;
+      if (wheelActivation === "modifier" && !hasModifier) return;
+      event.preventDefault();
+      const bounds = activeCanvas.getBoundingClientRect();
+      const factor = Math.min(1.25, Math.max(0.8, Math.exp(-event.deltaY * 0.01)));
+      zoomAt(transformRef.current.scale * factor, {
+        x: event.clientX - bounds.left,
+        y: event.clientY - bounds.top,
+      });
+    }
+    activeCanvas.addEventListener("wheel", zoomWithWheel, { passive: false });
+    return () => activeCanvas.removeEventListener("wheel", zoomWithWheel);
+  }, [wheelActivation, zoomAt]);
+
+  const beginPointer = useCallback((event: React.PointerEvent<HTMLDivElement>) => {
+    if (event.pointerType === "mouse" && event.button !== 0) return;
+    if (event.pointerType !== "mouse") setHasTouchInput(true);
+    if (pointersRef.current.size === 0) suppressClickRef.current = false;
+    event.currentTarget.setPointerCapture(event.pointerId);
+    pointersRef.current.set(event.pointerId, { x: event.clientX, y: event.clientY });
+    const points = Array.from(pointersRef.current.values());
+    if (points.length >= 2) {
+      gestureRef.current = {
+        type: "pinch",
+        distance: distance(points),
+        midpoint: midpoint(points),
+      };
+      setIsDragging(true);
+      return;
+    }
+    gestureRef.current = {
+      type: "drag",
+      pointerId: event.pointerId,
+      startPoint: points[0],
+      startTransform: transformRef.current,
+    };
+    setIsDragging(transformRef.current.scale > 1);
+  }, []);
+
+  const movePointer = useCallback(
+    (event: React.PointerEvent<HTMLDivElement>) => {
+      if (!pointersRef.current.has(event.pointerId) || !fittedContent || !viewport) return;
+      pointersRef.current.set(event.pointerId, { x: event.clientX, y: event.clientY });
+      const gesture = gestureRef.current;
+      const points = Array.from(pointersRef.current.values());
+      if (gesture?.type === "pinch" && points.length >= 2) {
+        suppressClickRef.current = true;
+        const nextMidpoint = midpoint(points);
+        const nextDistance = distance(points);
+        const panned = panContent({
+          transform: transformRef.current,
+          delta: {
+            x: nextMidpoint.x - gesture.midpoint.x,
+            y: nextMidpoint.y - gesture.midpoint.y,
+          },
+          fittedContent,
+          viewport,
+          limits,
+        });
+        const next = zoomContentAtPoint({
+          transform: panned,
+          scale: panned.scale * (nextDistance / gesture.distance),
+          focalPoint: nextMidpoint,
+          fittedContent,
+          viewport,
+          limits,
+        });
+        gestureRef.current = { type: "pinch", distance: nextDistance, midpoint: nextMidpoint };
+        commitTransform(next);
+        return;
+      }
+      if (gesture?.type !== "drag" || gesture.pointerId !== event.pointerId) return;
+      if (
+        Math.hypot(event.clientX - gesture.startPoint.x, event.clientY - gesture.startPoint.y) > 3
+      ) {
+        suppressClickRef.current = true;
+      }
+      commitTransform(
+        panContent({
+          transform: gesture.startTransform,
+          delta: {
+            x: event.clientX - gesture.startPoint.x,
+            y: event.clientY - gesture.startPoint.y,
+          },
+          fittedContent,
+          viewport,
+          limits,
+        }),
+      );
+    },
+    [commitTransform, fittedContent, limits, viewport],
+  );
+
+  const endPointer = useCallback((event: React.PointerEvent<HTMLDivElement>) => {
+    pointersRef.current.delete(event.pointerId);
+    if (event.currentTarget.hasPointerCapture(event.pointerId)) {
+      event.currentTarget.releasePointerCapture(event.pointerId);
+    }
+    const remaining = Array.from(pointersRef.current.entries());
+    if (remaining.length === 1) {
+      const [pointerId, point] = remaining[0];
+      gestureRef.current = {
+        type: "drag",
+        pointerId,
+        startPoint: point,
+        startTransform: transformRef.current,
+      };
+      setIsDragging(transformRef.current.scale > 1);
+      return;
+    }
+    gestureRef.current = null;
+    setIsDragging(false);
+  }, []);
+
+  const handleCanvasClick = useCallback(
+    (event: React.MouseEvent<HTMLDivElement>) => {
+      if (suppressClickRef.current) {
+        suppressClickRef.current = false;
+        return;
+      }
+      if (!fittedContent || !viewport || !onPressOutsideContent) return;
+      const bounds = event.currentTarget.getBoundingClientRect();
+      const isInside = isPointInsideTransformedContent({
+        point: { x: event.clientX - bounds.left, y: event.clientY - bounds.top },
+        transform: transformRef.current,
+        fittedContent,
+        viewport,
+      });
+      if (!isInside) onPressOutsideContent();
+    },
+    [fittedContent, onPressOutsideContent, viewport],
+  );
+
+  const renderedCanvasStyle = useMemo<React.CSSProperties>(() => {
+    let cursor: React.CSSProperties["cursor"] = "default";
+    if (transform.scale > 1) cursor = isDragging ? "grabbing" : "grab";
+    return { ...canvasDomStyle, cursor };
+  }, [isDragging, transform.scale]);
+  const renderedContentStyle = useMemo<React.CSSProperties>(
+    () => ({
+      ...contentDomStyle,
+      width: fittedContent?.width ?? 0,
+      height: fittedContent?.height ?? 0,
+      transform: `translate3d(${transform.x}px, ${transform.y}px, 0) scale(${transform.scale})`,
+    }),
+    [fittedContent, transform],
+  );
+  const controlsVisible = isHovered || isFocusWithin || hasTouchInput;
+  const handleFocus = useCallback(() => setIsFocusWithin(true), []);
+  const handleBlur = useCallback(() => setIsFocusWithin(false), []);
+  const handleMouseEnter = useCallback(() => setIsHovered(true), []);
+  const handleMouseLeave = useCallback(() => setIsHovered(false), []);
+
+  return (
+    <View style={[styles.root, style]} testID={testID}>
+      <div
+        aria-label={accessibilityLabel}
+        data-testid={testID ? `${testID}-canvas` : undefined}
+        onClick={handleCanvasClick}
+        onDoubleClick={reset}
+        onFocusCapture={handleFocus}
+        onBlurCapture={handleBlur}
+        onMouseEnter={handleMouseEnter}
+        onMouseLeave={handleMouseLeave}
+        onPointerCancel={endPointer}
+        onPointerDown={beginPointer}
+        onPointerMove={movePointer}
+        onPointerUp={endPointer}
+        ref={canvasRef}
+        role={accessibilityLabel ? "img" : undefined}
+        style={renderedCanvasStyle}
+      >
+        <div style={renderedContentStyle}>{children}</div>
+      </div>
+      <div
+        onBlurCapture={handleBlur}
+        onFocusCapture={handleFocus}
+        onMouseEnter={handleMouseEnter}
+        onMouseLeave={handleMouseLeave}
+        style={toolbarDomStyle}
+      >
+        <ViewportToolbar
+          actions={actions}
+          maxScale={maxScale}
+          minScale={minScale}
+          onReset={reset}
+          onZoomIn={zoomIn}
+          onZoomOut={zoomOut}
+          scale={transform.scale}
+          visible={controlsVisible}
+        />
+      </div>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create(() => ({
+  root: { flex: 1, minHeight: 0, overflow: "hidden", position: "relative" },
+}));
+
+const canvasDomStyle: React.CSSProperties = {
+  position: "absolute",
+  inset: 0,
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "center",
+  overflow: "hidden",
+  touchAction: "none",
+  userSelect: "none",
+};
+const contentDomStyle: React.CSSProperties = {
+  flexShrink: 0,
+  transformOrigin: "center center",
+};
+const toolbarDomStyle: React.CSSProperties = {
+  position: "absolute",
+  top: 0,
+  right: 0,
+  width: 200,
+  height: 48,
+  zIndex: 1,
+};

packages/app/src/components/zoomable-viewport/toolbar.tsx

@@ -0,0 +1,137 @@
+import React from "react";
+import { Pressable, View } from "react-native";
+import { Scan, ZoomIn, ZoomOut } from "lucide-react-native";
+import { useTranslation } from "react-i18next";
+import { StyleSheet } from "react-native-unistyles";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import {
+  iconButtonChromeGlyphSize,
+  iconButtonChromeStyle,
+} from "@/components/ui/icon-button-chrome";
+import type { ZoomableViewportAction } from "./types";
+
+interface ViewportToolbarProps {
+  actions: ZoomableViewportAction[];
+  maxScale: number;
+  minScale: number;
+  onReset: () => void;
+  onZoomIn: () => void;
+  onZoomOut: () => void;
+  scale: number;
+  visible: boolean;
+}
+
+interface ResolvedViewportAction extends ZoomableViewportAction {
+  disabled: boolean;
+}
+
+export const ViewportToolbar = React.memo(function ViewportToolbar({
+  actions,
+  maxScale,
+  minScale,
+  onReset,
+  onZoomIn,
+  onZoomOut,
+  scale,
+  visible,
+}: ViewportToolbarProps) {
+  const { t } = useTranslation();
+  const viewportActions: ResolvedViewportAction[] = [
+    {
+      icon: ZoomIn,
+      label: t("message.diagram.zoomIn"),
+      onPress: onZoomIn,
+      disabled: scale >= maxScale,
+    },
+    {
+      icon: ZoomOut,
+      label: t("message.diagram.zoomOut"),
+      onPress: onZoomOut,
+      disabled: scale <= minScale,
+    },
+    {
+      icon: Scan,
+      label: t("message.diagram.resetZoom"),
+      onPress: onReset,
+      disabled: scale === 1,
+    },
+    ...actions.map((action) => ({ ...action, disabled: false })),
+  ];
+
+  return (
+    <View style={styles.cluster} testID="zoomable-viewport-toolbar">
+      {viewportActions.map((action) => (
+        <ViewportToolbarButton
+          key={action.label}
+          action={action}
+          disabled={action.disabled}
+          visible={visible}
+        />
+      ))}
+    </View>
+  );
+});
+
+function ViewportToolbarButton({
+  action,
+  disabled,
+  visible,
+}: {
+  action: ZoomableViewportAction;
+  disabled: boolean;
+  visible: boolean;
+}) {
+  const Icon = action.icon;
+  const isCompact = useIsCompactFormFactor();
+  const iconSize = iconButtonChromeGlyphSize("small", isCompact);
+  const buttonStyle = React.useCallback(
+    ({ hovered, pressed }: { hovered?: boolean; pressed: boolean }) =>
+      iconButtonChromeStyle({
+        size: "small",
+        compact: isCompact,
+        state: { hovered, pressed },
+        disabled,
+        style: visible ? styles.button : styles.buttonHidden,
+      }),
+    [disabled, isCompact, visible],
+  );
+  return (
+    <Pressable
+      accessibilityLabel={action.label}
+      accessibilityRole="button"
+      disabled={disabled}
+      hitSlop={isCompact ? 6 : 4}
+      onPress={action.onPress}
+      style={buttonStyle}
+      testID={action.testID}
+    >
+      {({ hovered }) => (
+        <Icon size={iconSize} color={hovered ? styles.iconHovered.color : styles.icon.color} />
+      )}
+    </Pressable>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  cluster: {
+    position: "absolute",
+    top: theme.spacing[2],
+    right: theme.spacing[2],
+    zIndex: 1,
+    flexDirection: "row",
+    gap: theme.spacing[1],
+    pointerEvents: "box-none",
+  },
+  button: {
+    backgroundColor: theme.colors.surface2,
+    opacity: 1,
+    pointerEvents: "auto",
+  },
+  buttonHidden: {
+    backgroundColor: theme.colors.surface2,
+    opacity: 0,
+    pointerEvents: "none",
+  },
+  icon: { color: theme.colors.foregroundMuted },
+  iconHovered: { color: theme.colors.foreground },
+}));

packages/app/src/components/zoomable-viewport/types.ts

@@ -0,0 +1,24 @@
+import type { ComponentType, ReactNode } from "react";
+import type { StyleProp, ViewStyle } from "react-native";
+import type { ViewportFitOptions, ViewportSize } from "./geometry";
+
+export interface ZoomableViewportAction {
+  icon: ComponentType<{ size?: number; color?: string }>;
+  label: string;
+  onPress: () => void;
+  testID?: string;
+}
+
+export interface ZoomableViewportProps {
+  contentSize: ViewportSize;
+  children: ReactNode;
+  actions?: ZoomableViewportAction[];
+  accessibilityLabel?: string;
+  fit?: ViewportFitOptions;
+  maxScale?: number;
+  minScale?: number;
+  onPressOutsideContent?: () => void;
+  style?: StyleProp<ViewStyle>;
+  testID?: string;
+  wheelActivation?: "always" | "modifier";
+}

packages/app/src/composer/agent-controls/model-sheet-flow.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import type { ProviderSelectorProvider } from "@/provider-selection/provider-selection";
-import { resolveModelBrowserScrolling, resolveModelSheetOpening } from "./model-sheet-flow";
+import { resolveModelSheetOpening } from "./model-sheet-flow";
 
 function provider(id: string, label: string): ProviderSelectorProvider {
   return { id, label, modelSelection: { kind: "models", rows: [] } };
@@ -40,13 +40,3 @@ describe("model sheet opening", () => {
     ).toEqual({ kind: "provider", providerId: "codex", providerLabel: "Codex" });
   });
 });
-
-describe("model sheet gesture ownership", () => {
-  it("uses the sheet-aware model browser inside compact bottom sheets", () => {
-    expect(resolveModelBrowserScrolling(true)).toBe("sheet");
-  });
-
-  it("keeps independent scrolling in the desktop split viewport", () => {
-    expect(resolveModelBrowserScrolling(false)).toBe("independent");
-  });
-});

packages/app/src/composer/agent-controls/model-sheet-flow.ts

@@ -1,10 +1,6 @@
 import type { ModelBrowserView } from "@/components/model-browser-view";
 import type { ProviderSelectorProvider } from "@/provider-selection/provider-selection";
 
-export function resolveModelBrowserScrolling(usesBottomSheet: boolean): "sheet" | "independent" {
-  return usesBottomSheet ? "sheet" : "independent";
-}
-
 export function resolveModelSheetOpening({
   canSwitchProvider,
   providers,

packages/app/src/composer/agent-controls/model-sheet.tsx

@@ -9,15 +9,13 @@ import { AdaptiveModalSheet } from "@/components/adaptive-modal-sheet";
 import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
 import { getProviderIcon } from "@/components/provider-icons";
 import { ModelBrowser, useModelBrowser } from "@/components/model-browser";
+import { resolveModelBrowserScrolling } from "@/components/model-browser-view";
 import { AgentControlTrigger } from "@/composer/agent-controls/control";
 import { ComposerToolbarGlyph } from "@/composer/agent-controls/glyph";
-import {
-  resolveModelBrowserScrolling,
-  resolveModelSheetOpening,
-} from "@/composer/agent-controls/model-sheet-flow";
+import { resolveModelSheetOpening } from "@/composer/agent-controls/model-sheet-flow";
 import type { ProviderSelectorProvider } from "@/provider-selection/provider-selection";
 import { useIsCompactFormFactor } from "@/constants/layout";
-import { isWeb } from "@/constants/platform";
+import { isNative, isWeb } from "@/constants/platform";
 
 const SNAP_POINTS = ["80%", "90%"];
 const MODEL_LIST_TOP_INSET = 4;
@@ -102,7 +100,10 @@ export function CompactModelSheet({
 }: CompactModelSheetProps) {
   const { t } = useTranslation();
   const usesBottomSheet = useIsCompactFormFactor();
-  const modelBrowserScrolling = resolveModelBrowserScrolling(usesBottomSheet);
+  const modelBrowserScrolling = resolveModelBrowserScrolling({
+    isNative,
+    isCompact: usesBottomSheet,
+  });
   const [isOpen, setIsOpen] = useState(false);
   const [isModelBrowserOpen, setIsModelBrowserOpen] = useState(false);
   const availableProviders = useMemo(() => {

packages/app/src/composer/index.tsx

@@ -124,7 +124,7 @@ import { droppedItemsToPickedFiles } from "@/composer/attachments/drop";
 import { getFileTypeLabel } from "@/attachments/file-types";
 import { Combobox, ComboboxItem, type ComboboxOption } from "@/components/ui/combobox";
 import { AttachmentLabel, AttachmentPill, AttachmentThumbnail } from "@/components/attachment-pill";
-import { AttachmentLightbox } from "@/components/attachment-lightbox";
+import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
 import { openExternalUrl } from "@/utils/open-external-url";
 import { useIsDictationReady } from "@/hooks/use-is-dictation-ready";
 import { useForgeSearchQuery } from "@/git/use-forge-search-query";
@@ -2141,6 +2141,10 @@ function ComposerContentImpl({
   const handleLightboxClose = useCallback(() => {
     setLightboxMetadata(null);
   }, []);
+  const lightboxSource = useMemo<ImageLightboxSource | null>(
+    () => (lightboxMetadata ? { type: "attachment", metadata: lightboxMetadata } : null),
+    [lightboxMetadata],
+  );
 
   const handleGithubPickerOpenChange = useCallback(
     (open: boolean) => {
@@ -2263,7 +2267,7 @@ function ComposerContentImpl({
         isMessageInputFocused={isMessageInputFocused}
       />
       <Animated.View style={composerContainerStyle}>
-        <AttachmentLightbox metadata={lightboxMetadata} onClose={handleLightboxClose} />
+        <AttachmentLightbox source={lightboxSource} onClose={handleLightboxClose} />
         {/* Input area */}
         <View style={inputAreaContainerStyle}>
           <View style={styles.inputAreaContent}>
@@ -2364,6 +2368,9 @@ function ComposerContentImpl({
 const animatedStaticStyles = RNStyleSheet.create({
   container: {
     flexDirection: "column",
+    // KeyboardDock reduces the available column height with bottom padding.
+    // Keep the composer's constraint chain shrinkable down to its scrolling input.
+    flexShrink: 1,
     position: "relative",
   },
 });
@@ -2374,6 +2381,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
     backgroundColor: theme.colors.border,
   },
   inputAreaContainer: {
+    flexShrink: 1,
     position: "relative",
     minHeight: FOOTER_HEIGHT,
     marginHorizontal: "auto",
@@ -2387,11 +2395,13 @@ const styles = StyleSheet.create((theme: Theme) => ({
     opacity: 0.6,
   },
   inputAreaContent: {
+    flexShrink: 1,
     width: "100%",
     maxWidth: MAX_CONTENT_WIDTH,
     gap: theme.spacing[3],
   },
   messageInputContainer: {
+    flexShrink: 1,
     position: "relative",
     width: "100%",
     gap: theme.spacing[3],

packages/app/src/composer/input/input.tsx

@@ -1901,9 +1901,11 @@ export const MessageInput = forwardRef<MessageInputRef, MessageInputProps>(
 
 const styles = StyleSheet.create((theme: Theme) => ({
   container: {
+    flexShrink: 1,
     position: "relative",
   },
   inputWrapper: {
+    flexShrink: 1,
     flexDirection: "column",
     gap: theme.spacing[3],
     backgroundColor: theme.colors.surface1,
@@ -1932,6 +1934,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
     borderStyle: "dotted",
   },
   textInputScrollWrapper: {
+    flexShrink: 1,
     position: "relative",
   },
   focusHintText: {
@@ -1943,6 +1946,8 @@ const styles = StyleSheet.create((theme: Theme) => ({
     opacity: 0.5,
   },
   textInput: {
+    // Preserve the controls when an ancestor constrains an overlong draft.
+    flexShrink: 1,
     width: "100%",
     color: theme.colors.foreground,
     fontSize: theme.fontSize.content,
@@ -1964,6 +1969,7 @@ const styles = StyleSheet.create((theme: Theme) => ({
     color: theme.colors.foregroundMuted,
   },
   buttonRow: {
+    flexShrink: 0,
     flexDirection: "row",
     alignItems: "flex-end",
     justifyContent: "space-between",

packages/app/src/file-pane/editor/view.tsx

@@ -1,36 +1,49 @@
-import { Text, View } from "react-native";
-import { StyleSheet } from "react-native-unistyles";
-import type { HighlightStyle } from "@getpaseo/highlight";
+import { useCallback, useMemo, useSyncExternalStore } from "react";
+import { SourceEditor } from "@/source-editor/source-editor";
+import type { SourceEditorTheme } from "@/source-editor/contract";
 import type { WorkspaceFileLocation } from "@/workspace/file-open";
 import type { FileEditorModel } from "./model";
 
-export function FileEditorView(_props: {
+export function FileEditorView(props: {
   model: FileEditorModel;
   filename: string;
   location: WorkspaceFileLocation;
   navigationRevision: number;
   vimEnabled: boolean;
-  theme: {
-    background: string;
-    foreground: string;
-    foregroundMuted: string;
-    border: string;
-    selection: string;
-    monoFont: string;
-    codeFontSize: number;
-    syntax: Record<HighlightStyle, string>;
-  };
+  theme: SourceEditorTheme;
   onCursorChange(position: { line: number; column: number }): void;
   onVimModeChange(mode: string | null): void;
 }) {
+  const snapshot = useSyncExternalStore(
+    props.model.subscribe,
+    props.model.getSnapshot,
+    props.model.getSnapshot,
+  );
+  const selectionTarget = useMemo(
+    () =>
+      props.location.lineStart
+        ? {
+            lineStart: props.location.lineStart,
+            lineEnd: props.location.lineEnd,
+            revision: props.navigationRevision,
+          }
+        : undefined,
+    [props.location.lineEnd, props.location.lineStart, props.navigationRevision],
+  );
+  const handleChange = useCallback((document: string) => props.model.edit(document), [props.model]);
+  const handleSave = useCallback(() => void props.model.save(), [props.model]);
+
   return (
-    <View style={styles.container}>
-      <Text style={styles.text}>Source editing is available on web and desktop.</Text>
-    </View>
+    <SourceEditor
+      document={snapshot.content}
+      filename={props.filename}
+      selectionTarget={selectionTarget}
+      vimEnabled={props.vimEnabled}
+      theme={props.theme}
+      onChange={handleChange}
+      onSave={handleSave}
+      onCursorChange={props.onCursorChange}
+      onVimModeChange={props.onVimModeChange}
+    />
   );
 }
-
-const styles = StyleSheet.create((theme) => ({
-  container: { flex: 1, alignItems: "center", justifyContent: "center" },
-  text: { color: theme.colors.foregroundMuted, fontSize: theme.fontSize.base },
-}));

packages/app/src/file-pane/editor/view.web.tsx

@@ -1,155 +0,0 @@
-import { useEffect, useRef, useSyncExternalStore } from "react";
-import { Annotation, Compartment, EditorState, Transaction } from "@codemirror/state";
-import { EditorView } from "@codemirror/view";
-import { getLanguageForFile } from "@getpaseo/highlight";
-import { getCM, vim } from "@replit/codemirror-vim";
-import { isRenderedMarkdownFile } from "@/components/file-pane-render-mode";
-import type { WorkspaceFileLocation } from "@/workspace/file-open";
-import type { FileEditorModel } from "./model";
-import { editorBaseExtensions, editorTheme, type EditorVisualTheme } from "./extensions.web";
-
-interface FileEditorViewProps {
-  model: FileEditorModel;
-  filename: string;
-  location: WorkspaceFileLocation;
-  navigationRevision: number;
-  vimEnabled: boolean;
-  theme: EditorVisualTheme;
-  onCursorChange(position: { line: number; column: number }): void;
-  onVimModeChange(mode: string | null): void;
-}
-
-const languageCompartment = new Compartment();
-const wrappingCompartment = new Compartment();
-const themeCompartment = new Compartment();
-const vimCompartment = new Compartment();
-
-function wrappingForFile(filename: string) {
-  return isRenderedMarkdownFile(filename) ? EditorView.lineWrapping : [];
-}
-
-export function FileEditorView({
-  model,
-  filename,
-  location,
-  navigationRevision,
-  vimEnabled,
-  theme,
-  onCursorChange,
-  onVimModeChange,
-}: FileEditorViewProps) {
-  const hostRef = useRef<HTMLDivElement>(null);
-  const viewRef = useRef<EditorView | null>(null);
-  const snapshot = useSyncExternalStore(model.subscribe, model.getSnapshot, model.getSnapshot);
-  const initial = useRef({ filename, model, theme, vimEnabled, content: snapshot.content });
-  const onCursorChangeRef = useRef(onCursorChange);
-  onCursorChangeRef.current = onCursorChange;
-
-  useEffect(() => {
-    if (!hostRef.current) return;
-    const values = initial.current;
-    const view = new EditorView({
-      parent: hostRef.current,
-      state: EditorState.create({
-        doc: values.content,
-        extensions: [
-          vimCompartment.of(values.vimEnabled ? vim() : []),
-          ...editorBaseExtensions(() => void values.model.save()),
-          languageCompartment.of(getLanguageForFile(values.filename)?.extension ?? []),
-          wrappingCompartment.of(wrappingForFile(values.filename)),
-          themeCompartment.of(editorTheme(values.theme)),
-          EditorView.updateListener.of((update) => {
-            if (
-              update.docChanged &&
-              !update.transactions.some((tr) => tr.annotation(remoteUpdate))
-            ) {
-              const { lineSeparator } = values.model.getSnapshot();
-              values.model.edit(update.state.doc.sliceString(0, undefined, lineSeparator));
-            }
-            if (update.selectionSet || update.docChanged) {
-              const head = update.state.selection.main.head;
-              const line = update.state.doc.lineAt(head);
-              onCursorChangeRef.current({ line: line.number, column: head - line.from + 1 });
-            }
-          }),
-        ],
-      }),
-    });
-    viewRef.current = view;
-    onCursorChangeRef.current({ line: 1, column: 1 });
-    return () => {
-      view.destroy();
-      viewRef.current = null;
-    };
-  }, []);
-
-  useEffect(() => {
-    const view = viewRef.current;
-    if (!view) return;
-    const document = view.state.toText(snapshot.content);
-    if (view.state.doc.eq(document)) return;
-    const head = Math.min(view.state.selection.main.head, document.length);
-    view.dispatch({
-      changes: { from: 0, to: view.state.doc.length, insert: document },
-      selection: { anchor: head },
-      annotations: [remoteUpdate.of(true), Transaction.addToHistory.of(false)],
-    });
-  }, [snapshot.content]);
-
-  useEffect(() => {
-    const view = viewRef.current;
-    if (!view || !location.lineStart) return;
-    const lineStart = Math.min(location.lineStart, view.state.doc.lines);
-    const lineEnd = Math.min(location.lineEnd ?? lineStart, view.state.doc.lines);
-    const from = view.state.doc.line(lineStart).from;
-    const to = view.state.doc.line(Math.max(lineStart, lineEnd)).to;
-    view.dispatch({
-      selection: { anchor: from, head: lineEnd > lineStart ? to : from },
-      effects: EditorView.scrollIntoView(from, { y: "center" }),
-    });
-  }, [location.lineEnd, location.lineStart, navigationRevision]);
-
-  useEffect(() => {
-    viewRef.current?.dispatch({
-      effects: [
-        languageCompartment.reconfigure(getLanguageForFile(filename)?.extension ?? []),
-        wrappingCompartment.reconfigure(wrappingForFile(filename)),
-      ],
-    });
-  }, [filename]);
-
-  useEffect(() => {
-    viewRef.current?.dispatch({ effects: themeCompartment.reconfigure(editorTheme(theme)) });
-  }, [theme]);
-
-  useEffect(() => {
-    const view = viewRef.current;
-    if (!view) return;
-    view.dispatch({ effects: vimCompartment.reconfigure(vimEnabled ? vim() : []) });
-    if (!vimEnabled) {
-      onVimModeChange(null);
-      return;
-    }
-    const cm = getCM(view);
-    if (!cm) return;
-    function handleModeChange(event: { mode?: string }) {
-      onVimModeChange((event.mode ?? "normal").toUpperCase());
-    }
-    cm.on("vim-mode-change", handleModeChange);
-    onVimModeChange("NORMAL");
-    return () => cm.off("vim-mode-change", handleModeChange);
-  }, [onVimModeChange, vimEnabled]);
-
-  return (
-    <div
-      ref={hostRef}
-      data-pmono=""
-      data-testid="file-source-editor"
-      aria-label={`Source editor for ${filename}`}
-      style={HOST_STYLE}
-    />
-  );
-}
-
-const remoteUpdate = Annotation.define<boolean>();
-const HOST_STYLE = { flex: 1, minHeight: 0, overflow: "hidden" } as const;

packages/app/src/file-pane/pane.tsx

@@ -9,7 +9,7 @@ import React, {
   useSyncExternalStore,
 } from "react";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
-import { Image as RNImage, ScrollView as RNScrollView, Text, View } from "react-native";
+import { ScrollView as RNScrollView, Text, View } from "react-native";
 import { StyleSheet, UnistylesRuntime, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 import { useIsCompactFormFactor } from "@/constants/layout";
@@ -22,7 +22,6 @@ import type { WorkspaceFileLocation } from "@/workspace/file-open";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { useAppActivelyVisible } from "@/hooks/use-app-visible";
 import { isFileQueryEnabled } from "@/components/file-pane-enabled";
-import { isWeb } from "@/constants/platform";
 import { useAppSettings } from "@/hooks/use-settings";
 import { useLiveFile } from "./live-file/hook";
 import { useFilePreview } from "./preview-lifecycle/hook";
@@ -39,6 +38,7 @@ import type { LiveFileModel } from "./live-file/model";
 import { confirmDialog } from "@/utils/confirm-dialog";
 import { usePublishPanelInstanceAttributes } from "@/panels/panel-instance-attributes";
 import type { Theme } from "@/styles/theme";
+import { ZoomableImage } from "@/components/zoomable-viewport/image";
 
 const ThemedLoadingSpinner = withUnistyles(LoadingSpinner);
 const foregroundMutedColorMapping = (theme: Theme) => ({
@@ -146,11 +146,6 @@ function FilePreviewBody({
 
   const previewScrollRef = useRef<RNScrollView>(null);
 
-  const imageSource = useMemo(
-    () => (imagePreviewUri ? { uri: imagePreviewUri } : null),
-    [imagePreviewUri],
-  );
-
   if (isLoading && !preview) {
     return (
       <View style={styles.centerState} testID="file-preview-loading">
@@ -212,22 +207,7 @@ function FilePreviewBody({
       );
     }
 
-    return (
-      <View style={styles.previewScrollContainer}>
-        <RNScrollView
-          ref={previewScrollRef}
-          style={styles.previewContent}
-          contentContainerStyle={styles.previewImageScrollContent}
-          showsVerticalScrollIndicator
-        >
-          <RNImage
-            source={imageSource ?? undefined}
-            style={styles.previewImage}
-            resizeMode="contain"
-          />
-        </RNScrollView>
-      </View>
-    );
+    return <ZoomableImage uri={imagePreviewUri} testID="image-file-preview" />;
   }
 
   return (
@@ -348,10 +328,7 @@ function isEditableTextFile(input: {
   supportsEditing: boolean;
 }): boolean {
   return Boolean(
-    isWeb &&
-    input.supportsEditing &&
-    input.preview?.kind === "text" &&
-    input.preview.size <= 1024 * 1024,
+    input.supportsEditing && input.preview?.kind === "text" && input.preview.size <= 1024 * 1024,
   );
 }
 
@@ -711,14 +688,4 @@ const styles = StyleSheet.create((theme) => ({
   previewCodeScrollContent: {
     padding: theme.spacing[4],
   },
-  previewImageScrollContent: {
-    flexGrow: 1,
-    padding: theme.spacing[4],
-    alignItems: "center",
-    justifyContent: "center",
-  },
-  previewImage: {
-    width: "100%",
-    height: 420,
-  },
 }));

packages/app/src/file-pane/source/view.native.tsx

@@ -2,9 +2,9 @@ import { useEffect, useMemo, useRef } from "react";
 import { FlatList, Text, View, type ListRenderItem } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { highlightCode, type HighlightToken } from "@getpaseo/highlight";
+import type { SourceEditorTheme } from "@/source-editor/contract";
 import { syntaxTokenStyleFor } from "@/styles/syntax-token-styles";
 import type { WorkspaceFileLocation } from "@/workspace/file-open";
-import type { EditorVisualTheme } from "../editor/extensions.web";
 import { selectSourcePresentation } from "./presentation";
 
 interface FileSourceViewProps {
@@ -13,7 +13,7 @@ interface FileSourceViewProps {
   location: WorkspaceFileLocation;
   navigationRevision: number;
   size: number;
-  theme: EditorVisualTheme;
+  theme: SourceEditorTheme;
   tooLargeMessage: string;
 }
 

packages/app/src/file-pane/source/view.web.tsx

@@ -2,9 +2,9 @@ import { useEffect, useRef } from "react";
 import { Compartment, EditorState } from "@codemirror/state";
 import { EditorView } from "@codemirror/view";
 import { getLanguageForFile } from "@getpaseo/highlight";
+import type { SourceEditorTheme } from "@/source-editor/contract";
+import { sourceEditorTheme } from "@/source-editor/codemirror/configuration";
 import type { WorkspaceFileLocation } from "@/workspace/file-open";
-import type { EditorVisualTheme } from "../editor/extensions.web";
-import { editorTheme } from "../editor/extensions.web";
 import { selectSourcePresentation, type SourcePresentation } from "./presentation";
 
 interface FileSourceViewProps {
@@ -13,7 +13,7 @@ interface FileSourceViewProps {
   location: WorkspaceFileLocation;
   navigationRevision: number;
   size: number;
-  theme: EditorVisualTheme;
+  theme: SourceEditorTheme;
   tooLargeMessage: string;
 }
 
@@ -76,7 +76,7 @@ function ReadonlyCodeMirror({
           languageCompartment.of(
             languageFor({ filename: values.filename, presentation: values.presentation }),
           ),
-          themeCompartment.of(editorTheme(values.theme)),
+          themeCompartment.of(sourceEditorTheme(values.theme)),
         ],
       }),
     });
@@ -97,7 +97,7 @@ function ReadonlyCodeMirror({
     viewRef.current?.dispatch({
       effects: [
         languageCompartment.reconfigure(languageFor({ filename, presentation })),
-        themeCompartment.reconfigure(editorTheme(theme)),
+        themeCompartment.reconfigure(sourceEditorTheme(theme)),
       ],
     });
   }, [filename, presentation, theme]);

packages/app/src/git/commits-section/commits-section.test.tsx

@@ -0,0 +1,83 @@
+import React, { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { JSDOM } from "jsdom";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { CommitsSection } from "./commits-section";
+
+vi.mock("react-native-unistyles", () => ({
+  StyleSheet: {
+    create: (factory: unknown) =>
+      typeof factory === "function"
+        ? factory({
+            borderRadius: { full: 9999, sm: 4 },
+            borderWidth: { 1: 1 },
+            colors: {
+              border: "#333",
+              foreground: "#fff",
+              foregroundMuted: "#aaa",
+              statusDanger: "#c33",
+              surface2: "#222",
+            },
+            fontSize: { base: 15, sm: 13 },
+            spacing: [0, 4, 8, 12],
+          })
+        : factory,
+  },
+}));
+
+vi.mock("react-native-safe-area-context", () => ({
+  useSafeAreaInsets: () => ({ top: 0, right: 0, bottom: 34, left: 0 }),
+}));
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+vi.mock("@/git/use-commits-query", () => ({
+  useCheckoutCommitsQuery: () => ({ status: "idle" }),
+}));
+
+vi.mock("@/git/themed-chevron", () => ({
+  ThemedChevron: () => null,
+  chevronColorMapping: () => ({}),
+}));
+
+vi.mock("./commit-row", () => ({
+  CommitRow: () => null,
+}));
+
+let root: Root | null = null;
+
+beforeEach(() => {
+  const dom = new JSDOM("<!doctype html><html><body></body></html>");
+  vi.stubGlobal("React", React);
+  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+  vi.stubGlobal("window", dom.window);
+  vi.stubGlobal("document", dom.window.document);
+  vi.stubGlobal("HTMLElement", dom.window.HTMLElement);
+  vi.stubGlobal("Node", dom.window.Node);
+  vi.stubGlobal("navigator", dom.window.navigator);
+
+  const container = document.createElement("div");
+  document.body.appendChild(container);
+  root = createRoot(container);
+});
+
+afterEach(() => {
+  act(() => root?.unmount());
+  root = null;
+  vi.unstubAllGlobals();
+});
+
+describe("CommitsSection", () => {
+  it("keeps its bottom edge above the device safe area", () => {
+    act(() => {
+      root?.render(
+        <CommitsSection serverId="server" cwd="/repo" onCommitPress={vi.fn()} collapsed />,
+      );
+    });
+
+    const header = document.querySelector('[data-testid="commits-section-header"]');
+    expect(header?.parentElement?.getAttribute("style")).toContain("padding-bottom: 34px");
+  });
+});

packages/app/src/git/commits-section/commits-section.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { Pressable, Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useTranslation } from "react-i18next";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { useCheckoutCommitsQuery, type CheckoutCommitsQueryResult } from "@/git/use-commits-query";
@@ -91,6 +92,7 @@ export function CommitsSection({
   onCollapsedChange,
 }: CommitsSectionProps) {
   const { t } = useTranslation();
+  const insets = useSafeAreaInsets();
   const isPanelActive = useRetainedPanelActive();
   const [now, setNow] = useState(() => new Date());
   const displayNow = useMemo(() => (isPanelActive ? new Date() : now), [isPanelActive, now]);
@@ -119,6 +121,10 @@ export function CommitsSection({
     () => [styles.headerChevron, !collapsed && styles.headerChevronExpanded],
     [collapsed],
   );
+  const containerStyle = useMemo(
+    () => [styles.container, { paddingBottom: insets.bottom }],
+    [insets.bottom],
+  );
 
   if (query.status === "unsupported") {
     return null;
@@ -129,7 +135,7 @@ export function CommitsSection({
       : null;
 
   return (
-    <View style={styles.container}>
+    <View style={containerStyle}>
       <Pressable
         accessibilityRole="button"
         testID="commits-section-header"

packages/app/src/i18n/resources.test.ts

@@ -422,7 +422,6 @@ describe("translation resources", () => {
       added: "Added",
       started: "Started",
       completed: "Completed",
-      reopened: "Reopened",
     });
   });
 

packages/app/src/i18n/resources/ar.ts

@@ -345,7 +345,6 @@ export const ar: TranslationResources = {
         added: "أُضيفت",
         started: "بدأت",
         completed: "اكتملت",
-        reopened: "أُعيد فتحها",
       },
     },
     compaction: {

packages/app/src/i18n/resources/en.ts

@@ -343,7 +343,6 @@ export const en = {
         added: "Added",
         started: "Started",
         completed: "Completed",
-        reopened: "Reopened",
       },
     },
     compaction: {

packages/app/src/i18n/resources/es.ts

@@ -348,7 +348,6 @@ export const es: TranslationResources = {
         added: "Añadida",
         started: "Iniciada",
         completed: "Completada",
-        reopened: "Reabierta",
       },
     },
     compaction: {

packages/app/src/i18n/resources/fr.ts

@@ -349,7 +349,6 @@ export const fr: TranslationResources = {
         added: "Ajoutée",
         started: "Commencée",
         completed: "Terminée",
-        reopened: "Rouverte",
       },
     },
     compaction: {

packages/app/src/i18n/resources/ja.ts

@@ -348,7 +348,6 @@ export const ja: TranslationResources = {
         added: "追加",
         started: "開始",
         completed: "完了",
-        reopened: "再開",
       },
     },
     compaction: {

packages/app/src/i18n/resources/ko.ts

@@ -346,7 +346,6 @@ export const ko: TranslationResources = {
         added: "추가됨",
         started: "시작됨",
         completed: "완료됨",
-        reopened: "다시 열림",
       },
     },
     compaction: {

packages/app/src/i18n/resources/pt-BR.ts

@@ -348,7 +348,6 @@ export const ptBR: TranslationResources = {
         added: "Adicionada",
         started: "Iniciada",
         completed: "Concluída",
-        reopened: "Reaberta",
       },
     },
     compaction: {

packages/app/src/i18n/resources/ru.ts

@@ -347,7 +347,6 @@ export const ru: TranslationResources = {
         added: "Добавлена",
         started: "Начата",
         completed: "Завершена",
-        reopened: "Возобновлена",
       },
     },
     compaction: {

packages/app/src/i18n/resources/zh-CN.ts

@@ -345,7 +345,6 @@ export const zhCN: TranslationResources = {
         added: "已添加",
         started: "已开始",
         completed: "已完成",
-        reopened: "已重新打开",
       },
     },
     compaction: {

packages/app/src/panels/agent-panel.tsx

@@ -5,6 +5,7 @@ import type { TFunction } from "i18next";
 import { SquarePen } from "lucide-react-native";
 import React, {
   memo,
+  type ReactNode,
   useCallback,
   useEffect,
   useMemo,
@@ -14,7 +15,6 @@ import React, {
 } from "react";
 import { useTranslation } from "react-i18next";
 import { StyleSheet as RNStyleSheet, Text, View } from "react-native";
-import ReanimatedAnimated from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import invariant from "tiny-invariant";
@@ -22,6 +22,7 @@ import { shallow, useShallow } from "zustand/shallow";
 import { useStoreWithEqualityFn } from "zustand/traditional";
 import { AgentStreamView, type AgentStreamViewHandle } from "@/agent-stream/view";
 import { ArchivedAgentCallout } from "@/components/archived-agent-callout";
+import { KeyboardDock } from "@/components/keyboard-dock";
 import { FileDropZone } from "@/components/file-drop/file-drop-zone";
 import { useRetainedPanelActive } from "@/components/retained-panel";
 import { Composer } from "@/composer";
@@ -46,7 +47,7 @@ import {
   MAX_CONTENT_WIDTH,
   useIsCompactFormFactor,
 } from "@/constants/layout";
-import { isWeb } from "@/constants/platform";
+import { isNative, isWeb } from "@/constants/platform";
 import { useAgentAttentionClear } from "@/hooks/use-agent-attention-clear";
 import { useAgentInputDraft, type AgentInputDraft } from "@/composer/draft/input-draft";
 import {
@@ -57,7 +58,6 @@ import {
   useAgentScreenStateMachine,
 } from "@/hooks/use-agent-screen-state-machine";
 import { useArchiveAgent } from "@/hooks/use-archive-agent";
-import { useKeyboardShiftStyle } from "@/hooks/use-keyboard-shift-style";
 import { useContainerWidthBelow } from "@/hooks/use-container-width";
 import { reconcileMissingAgentStateWithPresentAgent } from "@/panels/agent-panel-load-state";
 import {
@@ -885,9 +885,6 @@ function ChatAgentContent({
     clearOnAgentBlurRef.current = attentionController.clearOnAgentBlur;
   }, [attentionController.clearOnAgentBlur]);
 
-  const { style: animatedKeyboardStyle } = useKeyboardShiftStyle({
-    mode: "translate",
-  });
   const shouldPresentReconnectToast =
     isPaneVisible && connectionStatus !== "online" && connectionStatus !== "idle";
 
@@ -1169,11 +1166,6 @@ function ChatAgentContent({
     visibilityCatchUpStatus,
   ]);
 
-  const animatedContentStyle = useMemo(
-    () => [animatedStaticStyles.content, animatedKeyboardStyle],
-    [animatedKeyboardStyle],
-  );
-
   const nonReadyView = renderChatAgentNonReadyView({
     viewState,
     effectiveAgent,
@@ -1210,7 +1202,6 @@ function ChatAgentContent({
       toast={toastState}
       dismiss={dismissToast}
       streamViewRef={streamViewRef}
-      animatedContentStyle={animatedContentStyle}
       handleComposerHeightChange={handleComposerHeightChange}
       handleMessageSent={handleMessageSent}
       handleRewindComplete={handleRewindComplete}
@@ -1240,7 +1231,6 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   toast,
   dismiss,
   streamViewRef,
-  animatedContentStyle,
   handleComposerHeightChange,
   handleMessageSent,
   handleRewindComplete,
@@ -1266,7 +1256,6 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   toast: ToastState | null;
   dismiss: () => void;
   streamViewRef: React.RefObject<AgentStreamViewHandle | null>;
-  animatedContentStyle: object[];
   handleComposerHeightChange: (height: number) => void;
   handleMessageSent: () => void;
   handleRewindComplete: () => void;
@@ -1362,7 +1351,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
     </RenderProfile>
   );
   const streamContent = (
-    <ReanimatedAnimated.View style={animatedContentStyle}>
+    <View style={animatedStaticStyles.content}>
       <RenderProfile id={`AgentStreamSection:${agentId}`}>
         <AgentStreamSection
           streamViewRef={streamViewRef}
@@ -1391,7 +1380,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
           hasPluginComposerPills={hasPluginComposerPills}
         />
       ) : null}
-    </ReanimatedAnimated.View>
+    </View>
   );
   const contentContainer = <View style={styles.contentContainer}>{streamContent}</View>;
 
@@ -1402,7 +1391,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
       onRewindComplete={handleRewindComplete}
     >
       <View style={styles.root}>
-        <FileDropZone style={styles.container} disabled={isArchivingCurrentAgent}>
+        <DockedChatSurface disabled={isArchivingCurrentAgent}>
           {contentContainer}
 
           {showHistorySyncError ? (
@@ -1437,7 +1426,7 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
           ) : null}
 
           <ToastViewport toast={toast} onDismiss={dismiss} placement="panel" />
-        </FileDropZone>
+        </DockedChatSurface>
 
         {isArchivingCurrentAgent ? (
           <View style={styles.archivingOverlay} testID="agent-archiving-overlay">
@@ -1451,6 +1440,16 @@ const ChatAgentReadyContent = memo(function ChatAgentReadyContent({
   );
 });
 
+function DockedChatSurface({ children, disabled }: { children: ReactNode; disabled: boolean }) {
+  return (
+    <KeyboardDock style={styles.container}>
+      <FileDropZone style={styles.container} disabled={disabled}>
+        {children}
+      </FileDropZone>
+    </KeyboardDock>
+  );
+}
+
 const AgentStreamSection = memo(function AgentStreamSection({
   streamViewRef,
   serverId,
@@ -1702,26 +1701,19 @@ function ActiveAgentComposer({
     ],
   );
 
-  const { style: composerKeyboardStyle } = useKeyboardShiftStyle({
-    mode: "translate",
-  });
-
   const inputAreaStyle = useMemo(
-    () => [
-      animatedStaticStyles.inputAreaWrapper,
-      { paddingBottom: insets.bottom },
-      composerKeyboardStyle,
-    ],
-    [insets.bottom, composerKeyboardStyle],
+    () => [animatedStaticStyles.inputAreaWrapper, { paddingBottom: insets.bottom }],
+    [insets.bottom],
   );
 
   return (
-    <ReanimatedAnimated.View style={inputAreaStyle} onLayout={onInputAreaLayout}>
+    <View style={inputAreaStyle} onLayout={onInputAreaLayout}>
       <Composer
         agentId={agentId}
         serverId={serverId}
         workspaceId={workspaceId}
         externalKeyboardShift
+        blurOnSubmit={isNative}
         isPaneFocused={isPaneFocused}
         value={agentInputDraft.text}
         onChangeText={agentInputDraft.editText}
@@ -1742,7 +1734,7 @@ function ActiveAgentComposer({
         onClientSlashCommand={handleClientSlashCommand}
         isCompactLayout={isCompactComposerLayout}
       />
-    </ReanimatedAnimated.View>
+    </View>
   );
 }
 
@@ -1823,6 +1815,7 @@ const animatedStaticStyles = RNStyleSheet.create({
   },
   inputAreaWrapper: {
     width: "100%",
+    flexShrink: 1,
   },
 });
 

packages/app/src/plugins/host-navigation.test.tsx

@@ -0,0 +1,59 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { act, renderHook } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { navigateToWorkspace } from "@/stores/navigation-active-workspace-store";
+import { navigateToAgent } from "@/utils/navigate-to-agent";
+import { usePluginHostNavigation } from "./host-navigation";
+
+vi.mock("@/utils/navigate-to-agent", () => ({
+  navigateToAgent: vi.fn(),
+}));
+vi.mock("@/stores/navigation-active-workspace-store", () => ({
+  navigateToWorkspace: vi.fn(),
+}));
+
+const navigateToAgentMock = vi.mocked(navigateToAgent);
+const navigateToWorkspaceMock = vi.mocked(navigateToWorkspace);
+
+describe("usePluginHostNavigation", () => {
+  beforeEach(() => {
+    navigateToAgentMock.mockReset();
+    navigateToWorkspaceMock.mockReset();
+  });
+
+  it("opens agents and workspaces on the rendering host", () => {
+    const { result } = renderHook(() => usePluginHostNavigation("host-1"));
+
+    act(() => result.current.openAgent({ agentId: "agent-1" }));
+    act(() => result.current.openWorkspace({ workspaceId: "workspace-1" }));
+
+    expect(navigateToAgentMock).toHaveBeenCalledWith({ serverId: "host-1", agentId: "agent-1" });
+    expect(navigateToWorkspaceMock).toHaveBeenCalledWith({
+      serverId: "host-1",
+      workspaceId: "workspace-1",
+    });
+  });
+
+  it("keeps the capability stable until the rendering host changes", () => {
+    const { result, rerender } = renderHook(({ serverId }) => usePluginHostNavigation(serverId), {
+      initialProps: { serverId: "host-1" },
+    });
+    const initialNavigation = result.current;
+
+    rerender({ serverId: "host-1" });
+    expect(result.current).toBe(initialNavigation);
+
+    rerender({ serverId: "host-2" });
+    expect(result.current).not.toBe(initialNavigation);
+
+    act(() => result.current.openAgent({ agentId: "agent-2" }));
+    act(() => result.current.openWorkspace({ workspaceId: "workspace-2" }));
+    expect(navigateToAgentMock).toHaveBeenCalledWith({ serverId: "host-2", agentId: "agent-2" });
+    expect(navigateToWorkspaceMock).toHaveBeenCalledWith({
+      serverId: "host-2",
+      workspaceId: "workspace-2",
+    });
+  });
+});

packages/app/src/plugins/host-navigation.ts

@@ -0,0 +1,16 @@
+import type { PluginSurfaceProps } from "@getpaseo/plugin";
+import { useMemo } from "react";
+import { navigateToWorkspace } from "@/stores/navigation-active-workspace-store";
+import { navigateToAgent } from "@/utils/navigate-to-agent";
+
+export function usePluginHostNavigation(
+  serverId: string,
+): NonNullable<PluginSurfaceProps["navigation"]> {
+  return useMemo(
+    () => ({
+      openAgent: ({ agentId }) => navigateToAgent({ serverId, agentId }),
+      openWorkspace: ({ workspaceId }) => navigateToWorkspace({ serverId, workspaceId }),
+    }),
+    [serverId],
+  );
+}

packages/app/src/plugins/registry-hooks.test.tsx

@@ -0,0 +1,23 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { renderHook } from "@testing-library/react";
+import { expect, it, vi } from "vitest";
+
+vi.mock("./evaluate", () => ({
+  evaluatePluginClientBundle: vi.fn(),
+}));
+vi.mock("./composer-pills/lifecycle", () => ({
+  startPluginClientSide: vi.fn(),
+}));
+
+import { usePluginInstallations } from "./registry";
+
+it("keeps plugin installation selections stable while the registry is unchanged", () => {
+  const { result, rerender } = renderHook(() => usePluginInstallations("missing-plugin"));
+  const initialInstallations = result.current;
+
+  rerender();
+
+  expect(result.current).toBe(initialInstallations);
+});

packages/app/src/plugins/registry.ts

@@ -1,4 +1,4 @@
-import { useSyncExternalStore } from "react";
+import { useMemo, useSyncExternalStore } from "react";
 import { QueryClient } from "@tanstack/react-query";
 import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
 import { startPluginClientSide } from "./composer-pills/lifecycle";
@@ -166,5 +166,6 @@ export function useInstalledPlugin(serverId: string, pluginId: string): Installe
 }
 
 export function usePluginInstallations(pluginId: string): InstalledPlugin[] {
-  return useInstalledPlugins().filter((plugin) => plugin.id === pluginId);
+  const installed = useInstalledPlugins();
+  return useMemo(() => installed.filter((plugin) => plugin.id === pluginId), [installed, pluginId]);
 }

packages/app/src/plugins/surface-screen.tsx

@@ -13,6 +13,7 @@ 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 { usePluginHostNavigation } from "./host-navigation";
 import { resolvePluginIcon } from "./icons";
 import { toPluginTheme } from "./theme";
 import { useInstalledPlugin, usePluginInstallations } from "./registry";
@@ -66,9 +67,10 @@ function SurfaceRenderer({
   host: PluginSurfaceProps["host"];
   theme: PluginTheme;
 }) {
+  const navigation = usePluginHostNavigation(host.id);
   return (
     <PluginRuntimeBoundary plugin={plugin} runtime={runtime}>
-      <Surface theme={theme} host={host} layout={layout} />
+      <Surface theme={theme} host={host} layout={layout} navigation={navigation} />
     </PluginRuntimeBoundary>
   );
 }

packages/app/src/plugins/workspace-panels/panel.tsx

@@ -18,6 +18,7 @@ import { useSessionStore } from "@/stores/session-store";
 import { useWorkspaceExists } from "@/stores/session-store-hooks";
 import type { Theme } from "@/styles/theme";
 import { normalizeWorkspaceOpaqueId } from "@/utils/workspace-identity";
+import { usePluginHostNavigation } from "../host-navigation";
 import { createPluginClientStateSource } from "../client-state/source";
 import { toPluginTheme } from "../theme";
 import { resolvePluginIcon } from "../icons";
@@ -63,6 +64,7 @@ function PluginPanelBody({ theme }: { theme: PluginTheme }) {
   const host = useMemo(() => ({ id: serverId, label: hostLabel }), [hostLabel, serverId]);
   const layout = useMemo(() => ({ compact, platform: resolvePlatform() }), [compact]);
   const stateSource = useMemo(() => createPluginClientStateSource(serverId), [serverId]);
+  const navigation = usePluginHostNavigation(serverId);
 
   if (!plugin || !contribution || !workspaceExists) {
     return <PluginPanelUnavailable />;
@@ -79,6 +81,7 @@ function PluginPanelBody({ theme }: { theme: PluginTheme }) {
       theme,
       host,
       layout,
+      navigation,
       workspaceId,
     };
     const Component = contribution.Component;
@@ -90,6 +93,7 @@ function PluginPanelBody({ theme }: { theme: PluginTheme }) {
       theme,
       host,
       layout,
+      navigation,
       workspaceId,
       agentId: target.agentId,
     };

packages/app/src/runtime/replica-cache/index.test.ts

@@ -508,6 +508,21 @@ describe("ReplicaCache", () => {
     ]);
   });
 
+  it("retries a timeline read invalidated by a concurrent directory commit", async () => {
+    const storage = new MemoryStorage();
+    const cache = createCache(storage);
+    cache.commitTimeline(SERVER_ID, "agent-1", timeline("Persisted timeline"));
+    await cache.flush();
+    storage.onRead = () => {
+      storage.onRead = null;
+      cache.commitDirectory(SERVER_ID, directory());
+    };
+
+    expect((await cache.readTimeline(SERVER_ID, "agent-1"))?.items).toEqual([
+      timelineItem("Persisted timeline"),
+    ]);
+  });
+
   it("rebuilds every directory row before restoring its checkpoint after eviction", async () => {
     const storage = new MemoryStorage();
     const cache = new ReplicaCache(storage, { ...noLegacyCleanup, maxBytes: 2_500 });

packages/app/src/runtime/replica-cache/index.ts

@@ -69,7 +69,7 @@ const TodoEntrySchema = z.strictObject({
 const TaskActivitySchema = z.discriminatedUnion("type", [
   z.strictObject({ type: z.literal("created"), count: z.number().int().nonnegative() }),
   z.strictObject({
-    type: z.enum(["added", "started", "completed", "reopened"]),
+    type: z.enum(["added", "started", "completed"]),
     task: z.string(),
   }),
 ]);
@@ -898,13 +898,15 @@ export class ReplicaCache {
     ids?: readonly string[],
   ): Promise<ReplicaRow[]> {
     if (!this.activeServerIds.has(serverId)) return [];
-    const revision = this.hostRevisions.get(serverId) ?? 0;
     try {
       await this.prepareStore();
-      await this.flush();
-      if (!this.canReadHostRevision(serverId, revision)) return [];
-      const rows = await this.rowStore.read(serverId, kinds, ids);
-      return this.canReadHostRevision(serverId, revision) ? rows : [];
+      while (this.activeServerIds.has(serverId)) {
+        await this.flush();
+        const revision = this.hostRevisions.get(serverId) ?? 0;
+        const rows = await this.rowStore.read(serverId, kinds, ids);
+        if (this.canReadHostRevision(serverId, revision)) return rows;
+      }
+      return [];
     } catch {
       return [];
     }

packages/app/src/source-editor/codemirror/bridge-protocol.test.ts

@@ -0,0 +1,29 @@
+import { describe, expect, test } from "vitest";
+import { parseSourceEditorBridgeMessage } from "./bridge-protocol";
+
+describe("parseSourceEditorBridgeMessage", () => {
+  test("accepts compact document changes", () => {
+    expect(
+      parseSourceEditorBridgeMessage(
+        JSON.stringify({
+          type: "change",
+          editorKey: "editor-1",
+          changes: [{ from: 2, to: 4, insert: "replacement" }],
+        }),
+      ),
+    ).toEqual({
+      type: "change",
+      editorKey: "editor-1",
+      changes: [{ from: 2, to: 4, insert: "replacement" }],
+    });
+  });
+
+  test("rejects malformed bridge input", () => {
+    expect(parseSourceEditorBridgeMessage("not json")).toBeNull();
+    expect(
+      parseSourceEditorBridgeMessage(
+        JSON.stringify({ type: "change", editorKey: "editor-1", changes: [{ from: "2" }] }),
+      ),
+    ).toBeNull();
+  });
+});

packages/app/src/source-editor/codemirror/bridge-protocol.ts

@@ -0,0 +1,162 @@
+import type {
+  SourceChange,
+  SourceEditorConfiguration,
+  SourceEditorPosition,
+  SourceEditorSelectionTarget,
+} from "../contract";
+
+export type SourceEditorHostMessage =
+  | {
+      type: "mount";
+      editorKey: string;
+      document: string;
+      configuration: SourceEditorConfiguration;
+    }
+  | { type: "replaceDocument"; editorKey: string; document: string }
+  | { type: "configure"; editorKey: string; configuration: SourceEditorConfiguration }
+  | ({ type: "reveal"; editorKey: string } & SourceEditorSelectionTarget)
+  | { type: "destroy"; editorKey: string };
+
+export type SourceEditorBridgeMessage =
+  | { type: "bridgeReady" }
+  | { type: "ready"; editorKey: string }
+  | { type: "change"; editorKey: string; changes: readonly SourceChange[] }
+  | ({ type: "cursor"; editorKey: string } & SourceEditorPosition)
+  | { type: "save"; editorKey: string }
+  | { type: "vimMode"; editorKey: string; mode: string | null };
+
+export function parseSourceEditorBridgeMessage(value: string): SourceEditorBridgeMessage | null {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(value);
+  } catch {
+    return null;
+  }
+  if (!isRecord(parsed) || typeof parsed.type !== "string") return null;
+  if (parsed.type === "bridgeReady") return { type: "bridgeReady" };
+  if (typeof parsed.editorKey !== "string") return null;
+  switch (parsed.type) {
+    case "ready":
+    case "save":
+      return { type: parsed.type, editorKey: parsed.editorKey };
+    case "vimMode":
+      return parsed.mode === null || typeof parsed.mode === "string"
+        ? { type: "vimMode", editorKey: parsed.editorKey, mode: parsed.mode }
+        : null;
+    case "cursor":
+      return isPositiveInteger(parsed.line) && isPositiveInteger(parsed.column)
+        ? {
+            type: "cursor",
+            editorKey: parsed.editorKey,
+            line: parsed.line,
+            column: parsed.column,
+          }
+        : null;
+    case "change": {
+      const changes = parseChanges(parsed.changes);
+      return changes ? { type: "change", editorKey: parsed.editorKey, changes } : null;
+    }
+    default:
+      return null;
+  }
+}
+
+export function parseSourceEditorHostMessage(value: string): SourceEditorHostMessage | null {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(value);
+  } catch {
+    return null;
+  }
+  if (
+    !isRecord(parsed) ||
+    typeof parsed.type !== "string" ||
+    typeof parsed.editorKey !== "string"
+  ) {
+    return null;
+  }
+  switch (parsed.type) {
+    case "mount":
+      return typeof parsed.document === "string" && isConfiguration(parsed.configuration)
+        ? {
+            type: "mount",
+            editorKey: parsed.editorKey,
+            document: parsed.document,
+            configuration: parsed.configuration,
+          }
+        : null;
+    case "replaceDocument":
+      return typeof parsed.document === "string"
+        ? { type: "replaceDocument", editorKey: parsed.editorKey, document: parsed.document }
+        : null;
+    case "configure":
+      return isConfiguration(parsed.configuration)
+        ? { type: "configure", editorKey: parsed.editorKey, configuration: parsed.configuration }
+        : null;
+    case "reveal":
+      return isPositiveInteger(parsed.lineStart) &&
+        (parsed.lineEnd === undefined || isPositiveInteger(parsed.lineEnd)) &&
+        Number.isInteger(parsed.revision)
+        ? {
+            type: "reveal",
+            editorKey: parsed.editorKey,
+            lineStart: parsed.lineStart,
+            lineEnd: parsed.lineEnd,
+            revision: parsed.revision as number,
+          }
+        : null;
+    case "destroy":
+      return { type: "destroy", editorKey: parsed.editorKey };
+    default:
+      return null;
+  }
+}
+
+function parseChanges(value: unknown): SourceChange[] | null {
+  if (!Array.isArray(value)) return null;
+  const changes: SourceChange[] = [];
+  for (const change of value) {
+    if (
+      !isRecord(change) ||
+      !Number.isInteger(change.from) ||
+      !Number.isInteger(change.to) ||
+      typeof change.insert !== "string"
+    ) {
+      return null;
+    }
+    changes.push({ from: change.from as number, to: change.to as number, insert: change.insert });
+  }
+  return changes;
+}
+
+function isConfiguration(value: unknown): value is SourceEditorConfiguration {
+  if (
+    !isRecord(value) ||
+    typeof value.filename !== "string" ||
+    typeof value.vimEnabled !== "boolean"
+  ) {
+    return false;
+  }
+  const theme = value.theme;
+  return (
+    isRecord(theme) &&
+    (theme.colorScheme === "light" || theme.colorScheme === "dark") &&
+    typeof theme.background === "string" &&
+    typeof theme.foreground === "string" &&
+    typeof theme.cursor === "string" &&
+    typeof theme.foregroundMuted === "string" &&
+    typeof theme.border === "string" &&
+    typeof theme.selection === "string" &&
+    typeof theme.monoFont === "string" &&
+    typeof theme.codeFontSize === "number" &&
+    isRecord(theme.syntax)
+  );
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+function isPositiveInteger(value: unknown): value is number {
+  return Number.isInteger(value) && (value as number) > 0;
+}

packages/app/src/source-editor/codemirror/configuration.ts

@@ -13,22 +13,10 @@ import {
   keymap,
   lineNumbers,
 } from "@codemirror/view";
-import { createCodeMirrorHighlightStyle, type HighlightStyle } from "@getpaseo/highlight";
+import { createCodeMirrorHighlightStyle } from "@getpaseo/highlight";
+import type { SourceEditorTheme } from "../contract";
 
-export interface EditorVisualTheme {
-  colorScheme: "light" | "dark";
-  background: string;
-  foreground: string;
-  cursor: string;
-  foregroundMuted: string;
-  border: string;
-  selection: string;
-  monoFont: string;
-  codeFontSize: number;
-  syntax: Record<HighlightStyle, string>;
-}
-
-export function editorBaseExtensions(onSave: () => void) {
+export function sourceEditorBaseExtensions(onSave: () => void) {
   return [
     lineNumbers(),
     history(),
@@ -47,7 +35,7 @@ export function editorBaseExtensions(onSave: () => void) {
   ];
 }
 
-export function editorTheme(theme: EditorVisualTheme) {
+export function sourceEditorTheme(theme: SourceEditorTheme) {
   return [
     EditorView.theme(
       {
@@ -62,8 +50,13 @@ export function editorTheme(theme: EditorVisualTheme) {
           overflow: "auto",
           fontFamily: theme.monoFont,
           lineHeight: "1.45",
+          WebkitOverflowScrolling: "touch",
+        },
+        ".cm-content": {
+          caretColor: theme.foreground,
+          padding: "16px 0",
+          minHeight: "100%",
         },
-        ".cm-content": { caretColor: theme.foreground, padding: "16px 0" },
         ".cm-cursor, .cm-dropCursor": { borderLeftColor: theme.cursor },
         ".cm-gutters": {
           backgroundColor: theme.background,
@@ -75,9 +68,7 @@ export function editorTheme(theme: EditorVisualTheme) {
         "&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground": {
           backgroundColor: theme.selection,
         },
-        ".cm-selectionBackground, ::selection": {
-          backgroundColor: theme.selection,
-        },
+        ".cm-selectionBackground, ::selection": { backgroundColor: theme.selection },
         "&.cm-focused": { outline: "none" },
       },
       { dark: theme.colorScheme === "dark" },

packages/app/src/source-editor/codemirror/runtime.ts

@@ -0,0 +1,152 @@
+import { Annotation, Compartment, EditorState, Transaction } from "@codemirror/state";
+import { EditorView, type ViewUpdate } from "@codemirror/view";
+import { getLanguageForFile } from "@getpaseo/highlight";
+import { getCM, vim } from "@replit/codemirror-vim";
+import { isRenderedMarkdownFile } from "@/components/file-pane-render-mode";
+import type {
+  SourceChange,
+  SourceEditorConfiguration,
+  SourceEditorPosition,
+  SourceEditorSelectionTarget,
+} from "../contract";
+import { sourceEditorBaseExtensions, sourceEditorTheme } from "./configuration";
+
+interface CodeMirrorRuntimeCallbacks {
+  onChange(changes: readonly SourceChange[]): void;
+  onSave(): void;
+  onCursorChange(position: SourceEditorPosition): void;
+  onVimModeChange(mode: string | null): void;
+}
+
+const remoteUpdate = Annotation.define<boolean>();
+
+export class CodeMirrorRuntime {
+  private readonly languageCompartment = new Compartment();
+  private readonly wrappingCompartment = new Compartment();
+  private readonly themeCompartment = new Compartment();
+  private readonly vimCompartment = new Compartment();
+  private view: EditorView | null = null;
+  private callbacks: CodeMirrorRuntimeCallbacks | null = null;
+  private vimModeListener: ((event: { mode?: string }) => void) | null = null;
+
+  mount(input: {
+    host: HTMLElement;
+    document: string;
+    configuration: SourceEditorConfiguration;
+    callbacks: CodeMirrorRuntimeCallbacks;
+  }): void {
+    this.destroy();
+    this.callbacks = input.callbacks;
+    this.view = new EditorView({
+      parent: input.host,
+      state: EditorState.create({
+        doc: input.document,
+        extensions: [
+          this.vimCompartment.of(input.configuration.vimEnabled ? vim() : []),
+          ...sourceEditorBaseExtensions(() => this.callbacks?.onSave()),
+          this.languageCompartment.of(languageForFile(input.configuration.filename)),
+          this.wrappingCompartment.of(wrappingForFile(input.configuration.filename)),
+          this.themeCompartment.of(sourceEditorTheme(input.configuration.theme)),
+          EditorView.updateListener.of((update) => this.receiveUpdate(update)),
+        ],
+      }),
+    });
+    this.configureVim(input.configuration.vimEnabled);
+    this.reportCursor();
+  }
+
+  replaceDocument(document: string): void {
+    const view = this.view;
+    if (!view || view.state.doc.toString() === document) return;
+    const head = Math.min(view.state.selection.main.head, document.length);
+    view.dispatch({
+      changes: { from: 0, to: view.state.doc.length, insert: document },
+      selection: { anchor: head },
+      annotations: [remoteUpdate.of(true), Transaction.addToHistory.of(false)],
+    });
+  }
+
+  configure(configuration: SourceEditorConfiguration): void {
+    const view = this.view;
+    if (!view) return;
+    this.removeVimModeListener();
+    view.dispatch({
+      effects: [
+        this.languageCompartment.reconfigure(languageForFile(configuration.filename)),
+        this.wrappingCompartment.reconfigure(wrappingForFile(configuration.filename)),
+        this.themeCompartment.reconfigure(sourceEditorTheme(configuration.theme)),
+        this.vimCompartment.reconfigure(configuration.vimEnabled ? vim() : []),
+      ],
+    });
+    this.configureVim(configuration.vimEnabled);
+  }
+
+  reveal(target: SourceEditorSelectionTarget): void {
+    const view = this.view;
+    if (!view) return;
+    const lineStart = Math.min(target.lineStart, view.state.doc.lines);
+    const lineEnd = Math.min(target.lineEnd ?? lineStart, view.state.doc.lines);
+    const from = view.state.doc.line(lineStart).from;
+    const to = view.state.doc.line(Math.max(lineStart, lineEnd)).to;
+    view.dispatch({
+      selection: { anchor: from, head: lineEnd > lineStart ? to : from },
+      effects: EditorView.scrollIntoView(from, { y: "center" }),
+    });
+  }
+
+  destroy(): void {
+    this.removeVimModeListener();
+    this.view?.destroy();
+    this.view = null;
+    this.callbacks = null;
+  }
+
+  private receiveUpdate(update: ViewUpdate): void {
+    if (
+      update.docChanged &&
+      !update.transactions.some((transaction) => transaction.annotation(remoteUpdate))
+    ) {
+      const changes: SourceChange[] = [];
+      update.changes.iterChanges((from, to, _fromNew, _toNew, inserted) => {
+        changes.push({ from, to, insert: inserted.toString() });
+      });
+      this.callbacks?.onChange(changes);
+    }
+    if (update.selectionSet || update.docChanged) this.reportCursor();
+  }
+
+  private reportCursor(): void {
+    const view = this.view;
+    if (!view) return;
+    const head = view.state.selection.main.head;
+    const line = view.state.doc.lineAt(head);
+    this.callbacks?.onCursorChange({ line: line.number, column: head - line.from + 1 });
+  }
+
+  private configureVim(enabled: boolean): void {
+    if (!enabled || !this.view) {
+      this.callbacks?.onVimModeChange(null);
+      return;
+    }
+    const cm = getCM(this.view);
+    if (!cm) return;
+    this.vimModeListener = (event) =>
+      this.callbacks?.onVimModeChange((event.mode ?? "normal").toUpperCase());
+    cm.on("vim-mode-change", this.vimModeListener);
+    this.callbacks?.onVimModeChange("NORMAL");
+  }
+
+  private removeVimModeListener(): void {
+    if (!this.view || !this.vimModeListener) return;
+    getCM(this.view)?.off("vim-mode-change", this.vimModeListener);
+    this.vimModeListener = null;
+  }
+}
+
+function languageForFile(filename: string) {
+  return getLanguageForFile(filename)?.extension ?? [];
+}
+
+function wrappingForFile(filename: string) {
+  return isRenderedMarkdownFile(filename) ? EditorView.lineWrapping : [];
+}

packages/app/src/source-editor/codemirror/webview-entry.ts

@@ -0,0 +1,83 @@
+import { CodeMirrorRuntime } from "./runtime";
+import {
+  parseSourceEditorHostMessage,
+  type SourceEditorBridgeMessage,
+  type SourceEditorHostMessage,
+} from "./bridge-protocol";
+
+declare global {
+  interface Window {
+    ReactNativeWebView?: { postMessage?: (data: string) => void };
+    __PASEO_SOURCE_EDITOR_RECEIVE__?: (message: string) => void;
+  }
+}
+
+function send(message: SourceEditorBridgeMessage): void {
+  window.ReactNativeWebView?.postMessage?.(JSON.stringify(message));
+}
+
+class SourceEditorWebViewBridge {
+  private runtime: CodeMirrorRuntime | null = null;
+  private editorKey: string | null = null;
+
+  receive = (rawMessage: string): void => {
+    const message = parseSourceEditorHostMessage(rawMessage);
+    if (!message) return;
+    if (message.type === "mount") {
+      this.mount(message);
+      return;
+    }
+    if (message.editorKey !== this.editorKey) return;
+    switch (message.type) {
+      case "replaceDocument":
+        this.runtime?.replaceDocument(message.document);
+        break;
+      case "configure":
+        this.runtime?.configure(message.configuration);
+        break;
+      case "reveal":
+        this.runtime?.reveal(message);
+        break;
+      case "destroy":
+        this.destroy();
+        break;
+    }
+  };
+
+  private mount(message: Extract<SourceEditorHostMessage, { type: "mount" }>): void {
+    this.destroy();
+    this.editorKey = message.editorKey;
+    const runtime = new CodeMirrorRuntime();
+    this.runtime = runtime;
+    runtime.mount({
+      host,
+      document: message.document,
+      configuration: message.configuration,
+      callbacks: {
+        onChange: (changes) => send({ type: "change", editorKey: message.editorKey, changes }),
+        onSave: () => send({ type: "save", editorKey: message.editorKey }),
+        onCursorChange: (position) =>
+          send({ type: "cursor", editorKey: message.editorKey, ...position }),
+        onVimModeChange: (mode) => send({ type: "vimMode", editorKey: message.editorKey, mode }),
+      },
+    });
+    send({ type: "ready", editorKey: message.editorKey });
+  }
+
+  private destroy(): void {
+    this.runtime?.destroy();
+    this.runtime = null;
+    this.editorKey = null;
+  }
+}
+
+const root = document.createElement("div");
+root.id = "source-editor-root";
+const host = document.createElement("div");
+host.id = "source-editor-host";
+root.appendChild(host);
+document.body.appendChild(root);
+
+const bridge = new SourceEditorWebViewBridge();
+window.__PASEO_SOURCE_EDITOR_RECEIVE__ = bridge.receive;
+send({ type: "bridgeReady" });

packages/app/src/source-editor/contract.ts

@@ -0,0 +1,46 @@
+import type { HighlightStyle } from "@getpaseo/highlight";
+
+export interface SourceChange {
+  from: number;
+  to: number;
+  insert: string;
+}
+
+export interface SourceEditorPosition {
+  line: number;
+  column: number;
+}
+
+export interface SourceEditorSelectionTarget {
+  lineStart: number;
+  lineEnd?: number;
+  revision: number;
+}
+
+export interface SourceEditorTheme {
+  colorScheme: "light" | "dark";
+  background: string;
+  foreground: string;
+  cursor: string;
+  foregroundMuted: string;
+  border: string;
+  selection: string;
+  monoFont: string;
+  codeFontSize: number;
+  syntax: Record<HighlightStyle, string>;
+}
+
+export interface SourceEditorConfiguration {
+  filename: string;
+  vimEnabled: boolean;
+  theme: SourceEditorTheme;
+}
+
+export interface SourceEditorProps extends SourceEditorConfiguration {
+  document: string;
+  selectionTarget?: SourceEditorSelectionTarget;
+  onChange(document: string): void;
+  onSave(): void;
+  onCursorChange(position: SourceEditorPosition): void;
+  onVimModeChange(mode: string | null): void;
+}

packages/app/src/source-editor/controller.test.ts

@@ -0,0 +1,59 @@
+import { describe, expect, test } from "vitest";
+import { SourceEditorController } from "./controller";
+
+function makeController() {
+  const events: unknown[] = [];
+  const controller = new SourceEditorController({
+    editorKey: "current",
+    document: "one\r\ntwo",
+    callbacks: {
+      onChange: (document) => events.push(["change", document]),
+      onSave: () => events.push(["save"]),
+      onCursorChange: (position) => events.push(["cursor", position]),
+      onVimModeChange: (mode) => events.push(["vim", mode]),
+    },
+  });
+  return { controller, events };
+}
+
+describe("SourceEditorController", () => {
+  test("turns compact runtime changes into a document callback", () => {
+    const { controller, events } = makeController();
+
+    expect(
+      controller.receive({
+        type: "change",
+        editorKey: "current",
+        changes: [{ from: 4, to: 7, insert: "second" }],
+      }),
+    ).toBe(true);
+    expect(events).toEqual([["change", "one\r\nsecond"]]);
+  });
+
+  test("rejects messages from a stale editor generation", () => {
+    const { controller, events } = makeController();
+
+    expect(controller.receive({ type: "save", editorKey: "stale" })).toBe(false);
+    expect(events).toEqual([]);
+  });
+
+  test("rejects invalid changes at the document boundary", () => {
+    const { controller, events } = makeController();
+
+    expect(
+      controller.receive({
+        type: "change",
+        editorKey: "current",
+        changes: [{ from: 0, to: 99, insert: "bad" }],
+      }),
+    ).toBe(false);
+    expect(events).toEqual([]);
+  });
+
+  test("returns a normalized replacement only when the controlled document changed", () => {
+    const { controller } = makeController();
+
+    expect(controller.replaceDocument("one\r\ntwo")).toBeNull();
+    expect(controller.replaceDocument("replacement\r\ndocument")).toBe("replacement\ndocument");
+  });
+});

packages/app/src/source-editor/controller.ts

@@ -0,0 +1,61 @@
+import type { SourceEditorBridgeMessage } from "./codemirror/bridge-protocol";
+import type { SourceEditorPosition } from "./contract";
+import { SourceDocumentMirror } from "./document-mirror";
+
+interface SourceEditorControllerCallbacks {
+  onChange(document: string): void;
+  onSave(): void;
+  onCursorChange(position: SourceEditorPosition): void;
+  onVimModeChange(mode: string | null): void;
+}
+
+export class SourceEditorController {
+  private readonly editorKey: string;
+  private readonly mirror: SourceDocumentMirror;
+  private readonly callbacks: SourceEditorControllerCallbacks;
+
+  constructor(input: {
+    editorKey: string;
+    document: string;
+    callbacks: SourceEditorControllerCallbacks;
+  }) {
+    this.editorKey = input.editorKey;
+    this.mirror = new SourceDocumentMirror(input.document);
+    this.callbacks = input.callbacks;
+  }
+
+  getRuntimeDocument(): string {
+    return this.mirror.getRuntimeDocument();
+  }
+
+  replaceDocument(document: string): string | null {
+    return this.mirror.replace(document) ? this.mirror.getRuntimeDocument() : null;
+  }
+
+  receive(message: SourceEditorBridgeMessage): boolean {
+    if (message.type === "bridgeReady" || message.editorKey !== this.editorKey) return false;
+    switch (message.type) {
+      case "ready":
+        return true;
+      case "change": {
+        let document: string;
+        try {
+          document = this.mirror.apply(message.changes);
+        } catch {
+          return false;
+        }
+        this.callbacks.onChange(document);
+        return true;
+      }
+      case "cursor":
+        this.callbacks.onCursorChange({ line: message.line, column: message.column });
+        return true;
+      case "save":
+        this.callbacks.onSave();
+        return true;
+      case "vimMode":
+        this.callbacks.onVimModeChange(message.mode);
+        return true;
+    }
+  }
+}

packages/app/src/source-editor/document-mirror.test.ts

@@ -0,0 +1,38 @@
+import { describe, expect, test } from "vitest";
+import { SourceDocumentMirror } from "./document-mirror";
+
+describe("SourceDocumentMirror", () => {
+  test("applies CodeMirror changes without replacing unchanged text", () => {
+    const mirror = new SourceDocumentMirror("one two three");
+
+    const document = mirror.apply([
+      { from: 0, to: 3, insert: "ONE" },
+      { from: 8, to: 13, insert: "THREE" },
+    ]);
+
+    expect(document).toBe("ONE two THREE");
+  });
+
+  test("preserves the file line separator while runtime offsets stay normalized", () => {
+    const mirror = new SourceDocumentMirror("one\r\ntwo\r\n");
+
+    expect(mirror.getRuntimeDocument()).toBe("one\ntwo\n");
+    expect(mirror.apply([{ from: 4, to: 7, insert: "second\nline" }])).toBe(
+      "one\r\nsecond\r\nline\r\n",
+    );
+  });
+
+  test("rejects overlapping or out-of-range changes", () => {
+    const mirror = new SourceDocumentMirror("one two");
+
+    expect(() =>
+      mirror.apply([
+        { from: 0, to: 4, insert: "" },
+        { from: 3, to: 7, insert: "" },
+      ]),
+    ).toThrow("Invalid source editor change range");
+    expect(() => mirror.apply([{ from: 0, to: 8, insert: "" }])).toThrow(
+      "Invalid source editor change range",
+    );
+  });
+});

packages/app/src/source-editor/document-mirror.ts

@@ -0,0 +1,66 @@
+import type { SourceChange } from "./contract";
+
+type LineSeparator = "\n" | "\r\n" | "\r";
+
+export class SourceDocumentMirror {
+  private text: string;
+  private lineSeparator: LineSeparator;
+
+  constructor(document: string) {
+    this.lineSeparator = detectLineSeparator(document);
+    this.text = normalizeLineSeparators(document);
+  }
+
+  getRuntimeDocument(): string {
+    return this.text;
+  }
+
+  getDocument(): string {
+    return serializeDocument(this.text, this.lineSeparator);
+  }
+
+  replace(document: string): boolean {
+    if (document === this.getDocument()) return false;
+    this.lineSeparator = detectLineSeparator(document);
+    this.text = normalizeLineSeparators(document);
+    return true;
+  }
+
+  apply(changes: readonly SourceChange[]): string {
+    validateChanges(changes, this.text.length);
+    for (let index = changes.length - 1; index >= 0; index -= 1) {
+      const change = changes[index];
+      this.text = `${this.text.slice(0, change.from)}${normalizeLineSeparators(change.insert)}${this.text.slice(change.to)}`;
+    }
+    return this.getDocument();
+  }
+}
+
+function validateChanges(changes: readonly SourceChange[], documentLength: number): void {
+  let previousEnd = 0;
+  for (const change of changes) {
+    if (
+      !Number.isInteger(change.from) ||
+      !Number.isInteger(change.to) ||
+      change.from < previousEnd ||
+      change.from > change.to ||
+      change.to > documentLength
+    ) {
+      throw new Error("Invalid source editor change range");
+    }
+    previousEnd = change.to;
+  }
+}
+
+function normalizeLineSeparators(document: string): string {
+  return document.replace(/\r\n?|\n/g, "\n");
+}
+
+function serializeDocument(document: string, lineSeparator: LineSeparator): string {
+  return lineSeparator === "\n" ? document : document.replace(/\n/g, lineSeparator);
+}
+
+function detectLineSeparator(document: string): LineSeparator {
+  const match = /\r\n|\r|\n/.exec(document);
+  return (match?.[0] as LineSeparator | undefined) ?? "\n";
+}

packages/app/src/source-editor/source-editor.tsx

@@ -0,0 +1,152 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { WebViewMessageEvent } from "react-native-webview";
+import { WebView } from "react-native-webview";
+import { StyleSheet } from "react-native-unistyles";
+import { SourceEditorController } from "./controller";
+import type { SourceEditorConfiguration, SourceEditorProps } from "./contract";
+import {
+  parseSourceEditorBridgeMessage,
+  type SourceEditorHostMessage,
+} from "./codemirror/bridge-protocol";
+import { sourceEditorWebViewHtml } from "./codemirror/webview-html";
+
+const BASE_URL = "about:blank";
+const ORIGIN_WHITELIST = ["*"];
+let nextEditorKey = 1;
+
+export function SourceEditor(props: SourceEditorProps) {
+  const webViewRef = useRef<WebView>(null);
+  const bridgeReadyRef = useRef(false);
+  const propsRef = useRef(props);
+  propsRef.current = props;
+  const [editorKey] = useState(() => `native-source-editor-${nextEditorKey++}`);
+  const controllerRef = useRef<SourceEditorController | null>(null);
+  if (!controllerRef.current) {
+    controllerRef.current = new SourceEditorController({
+      editorKey,
+      document: props.document,
+      callbacks: {
+        onChange: (document) => propsRef.current.onChange(document),
+        onSave: () => propsRef.current.onSave(),
+        onCursorChange: (position) => propsRef.current.onCursorChange(position),
+        onVimModeChange: (mode) => propsRef.current.onVimModeChange(mode),
+      },
+    });
+  }
+  const controller = controllerRef.current;
+  const source = useMemo(() => ({ html: sourceEditorWebViewHtml, baseUrl: BASE_URL }), []);
+  const configuration = useMemo<SourceEditorConfiguration>(
+    () => ({ filename: props.filename, vimEnabled: props.vimEnabled, theme: props.theme }),
+    [props.filename, props.theme, props.vimEnabled],
+  );
+
+  const send = useCallback((message: SourceEditorHostMessage) => {
+    if (!bridgeReadyRef.current) return;
+    const serialized = JSON.stringify(JSON.stringify(message));
+    webViewRef.current?.injectJavaScript(
+      `window.__PASEO_SOURCE_EDITOR_RECEIVE__?.(${serialized}); true;`,
+    );
+  }, []);
+
+  const mount = useCallback(() => {
+    send({
+      type: "mount",
+      editorKey,
+      document: controller.getRuntimeDocument(),
+      configuration: configurationFromProps(propsRef.current),
+    });
+  }, [controller, editorKey, send]);
+
+  const handleMessage = useCallback(
+    (event: WebViewMessageEvent) => {
+      const message = parseSourceEditorBridgeMessage(event.nativeEvent.data);
+      if (!message) return;
+      if (message.type === "bridgeReady") {
+        bridgeReadyRef.current = true;
+        mount();
+        const selectionTarget = propsRef.current.selectionTarget;
+        if (selectionTarget) send({ type: "reveal", editorKey, ...selectionTarget });
+        return;
+      }
+      controller.receive(message);
+    },
+    [controller, editorKey, mount, send],
+  );
+
+  useEffect(() => {
+    const replacement = controller.replaceDocument(props.document);
+    if (replacement !== null) {
+      send({ type: "replaceDocument", editorKey, document: replacement });
+    }
+  }, [controller, editorKey, props.document, send]);
+
+  useEffect(() => {
+    send({
+      type: "configure",
+      editorKey,
+      configuration,
+    });
+  }, [configuration, editorKey, send]);
+
+  useEffect(() => {
+    if (props.selectionTarget) {
+      send({ type: "reveal", editorKey, ...props.selectionTarget });
+    }
+  }, [editorKey, props.selectionTarget, send]);
+
+  useEffect(
+    () => () => {
+      send({ type: "destroy", editorKey });
+      bridgeReadyRef.current = false;
+    },
+    [editorKey, send],
+  );
+
+  const allowOnlyInitialDocument = useCallback(({ url }: { url: string }) => {
+    return url === BASE_URL;
+  }, []);
+
+  const reloadAfterProcessFailure = useCallback(() => {
+    bridgeReadyRef.current = false;
+    webViewRef.current?.reload();
+  }, []);
+  const handleLoadStart = useCallback(() => {
+    bridgeReadyRef.current = false;
+  }, []);
+  const handleRenderProcessGone = useCallback(() => {
+    reloadAfterProcessFailure();
+    return true;
+  }, [reloadAfterProcessFailure]);
+
+  return (
+    <WebView
+      ref={webViewRef}
+      testID="file-source-editor"
+      style={[styles.webview, { backgroundColor: props.theme.background }]}
+      source={source}
+      originWhitelist={ORIGIN_WHITELIST}
+      onShouldStartLoadWithRequest={allowOnlyInitialDocument}
+      onMessage={handleMessage}
+      onLoadStart={handleLoadStart}
+      onContentProcessDidTerminate={reloadAfterProcessFailure}
+      onRenderProcessGone={handleRenderProcessGone}
+      setSupportMultipleWindows={false}
+      javaScriptCanOpenWindowsAutomatically={false}
+      domStorageEnabled={false}
+      thirdPartyCookiesEnabled={false}
+      cacheEnabled={false}
+      incognito
+      scrollEnabled={false}
+      overScrollMode="never"
+      keyboardDisplayRequiresUserAction={false}
+    />
+  );
+}
+
+function configurationFromProps(props: SourceEditorProps): SourceEditorConfiguration {
+  return { filename: props.filename, vimEnabled: props.vimEnabled, theme: props.theme };
+}
+
+const styles = StyleSheet.create(() => ({
+  webview: { flex: 1 },
+}));

packages/app/src/source-editor/source-editor.web.tsx

@@ -0,0 +1,85 @@
+import { useEffect, useMemo, useRef, useState } from "react";
+import { SourceEditorController } from "./controller";
+import type { SourceEditorConfiguration, SourceEditorProps } from "./contract";
+import { CodeMirrorRuntime } from "./codemirror/runtime";
+
+let nextEditorKey = 1;
+
+export function SourceEditor(props: SourceEditorProps) {
+  const hostRef = useRef<HTMLDivElement>(null);
+  const runtimeRef = useRef<CodeMirrorRuntime | null>(null);
+  const propsRef = useRef(props);
+  propsRef.current = props;
+  const initial = useRef(props);
+  const [editorKey] = useState(() => `web-source-editor-${nextEditorKey++}`);
+  const controllerRef = useRef<SourceEditorController | null>(null);
+  if (!controllerRef.current) {
+    controllerRef.current = new SourceEditorController({
+      editorKey,
+      document: initial.current.document,
+      callbacks: {
+        onChange: (document) => propsRef.current.onChange(document),
+        onSave: () => propsRef.current.onSave(),
+        onCursorChange: (position) => propsRef.current.onCursorChange(position),
+        onVimModeChange: (mode) => propsRef.current.onVimModeChange(mode),
+      },
+    });
+  }
+  const controller = controllerRef.current;
+  const configuration = useMemo<SourceEditorConfiguration>(
+    () => ({ filename: props.filename, vimEnabled: props.vimEnabled, theme: props.theme }),
+    [props.filename, props.theme, props.vimEnabled],
+  );
+
+  useEffect(() => {
+    const host = hostRef.current;
+    if (!host) return;
+    const runtime = new CodeMirrorRuntime();
+    runtimeRef.current = runtime;
+    runtime.mount({
+      host,
+      document: controller.getRuntimeDocument(),
+      configuration: configurationFromProps(initial.current),
+      callbacks: {
+        onChange: (changes) => controller.receive({ type: "change", editorKey, changes }),
+        onSave: () => controller.receive({ type: "save", editorKey }),
+        onCursorChange: (position) =>
+          controller.receive({ type: "cursor", editorKey, ...position }),
+        onVimModeChange: (mode) => controller.receive({ type: "vimMode", editorKey, mode }),
+      },
+    });
+    return () => {
+      runtime.destroy();
+      runtimeRef.current = null;
+    };
+  }, [controller, editorKey]);
+
+  useEffect(() => {
+    const replacement = controller.replaceDocument(props.document);
+    if (replacement !== null) runtimeRef.current?.replaceDocument(replacement);
+  }, [controller, props.document]);
+
+  useEffect(() => {
+    runtimeRef.current?.configure(configuration);
+  }, [configuration]);
+
+  useEffect(() => {
+    if (props.selectionTarget) runtimeRef.current?.reveal(props.selectionTarget);
+  }, [props.selectionTarget]);
+
+  return (
+    <div
+      ref={hostRef}
+      data-pmono=""
+      data-testid="file-source-editor"
+      aria-label={`Source editor for ${props.filename}`}
+      style={HOST_STYLE}
+    />
+  );
+}
+
+function configurationFromProps(props: SourceEditorProps): SourceEditorConfiguration {
+  return { filename: props.filename, vimEnabled: props.vimEnabled, theme: props.theme };
+}
+
+const HOST_STYLE = { flex: 1, minHeight: 0, overflow: "hidden" } as const;

packages/app/src/stores/navigation-active-workspace-store/index.ts

@@ -37,9 +37,8 @@ function navigateDeps(): NavigateToWorkspaceDeps {
     getSessionWorkspaces: (serverId) => useSessionStore.getState().sessions[serverId]?.workspaces,
     getSessionAgents: (serverId) =>
       useSessionStore.getState().sessions[serverId]?.agents.values() ?? [],
+    isWorkspaceLayoutHydrated: () => useWorkspaceLayoutStore.persist.hasHydrated(),
     openTab: (input) => useWorkspaceLayoutStore.getState().openTab(input),
-    pinAgent: (workspaceKey, agentId) =>
-      useWorkspaceLayoutStore.getState().pinAgent(workspaceKey, agentId),
     rememberLastWorkspace: (selection) => lastWorkspaceSelectionStore.remember(selection),
     navigateToRoute: (route) => {
       navigateToHostWorkspaceRoute(route);

packages/app/src/stores/navigation-active-workspace-store/navigation.test.ts

@@ -14,6 +14,7 @@ import type { Agent, WorkspaceDescriptor } from "@/stores/session-store";
 interface RecordedTab {
   workspaceKey: string;
   target: WorkspaceTabTarget;
+  pin: boolean;
 }
 
 function createFakeDeps(overrides: Partial<NavigateToWorkspaceDeps> = {}) {
@@ -23,11 +24,11 @@ function createFakeDeps(overrides: Partial<NavigateToWorkspaceDeps> = {}) {
   const deps: NavigateToWorkspaceDeps = {
     getSessionWorkspaces: () => null,
     getSessionAgents: () => [] as Agent[],
-    openTab: ({ workspaceKey, target }) => {
-      openedTabs.push({ workspaceKey, target });
+    isWorkspaceLayoutHydrated: () => true,
+    openTab: ({ workspaceKey, target, pin = false }) => {
+      openedTabs.push({ workspaceKey, target, pin });
       return target.kind === "agent" ? target.agentId : null;
     },
-    pinAgent: () => undefined,
     rememberLastWorkspace: (selection) => remembered.push(selection),
     navigateToRoute: (route) => navigations.push(route),
     ...overrides,
@@ -97,6 +98,7 @@ describe("workspace navigation", () => {
       {
         workspaceKey: "server-1:workspace-a",
         target: { kind: "agent", agentId: "agent-1" },
+        pin: false,
       },
     ]);
   });
@@ -131,6 +133,7 @@ describe("workspace navigation", () => {
       {
         workspaceKey: "server-1:workspace-a",
         target: { kind: "draft", draftId: "draft-1" },
+        pin: false,
       },
     ]);
   });
@@ -153,6 +156,30 @@ describe("workspace navigation", () => {
     expect(navigations).toEqual(["/h/server-1/workspace/workspace-a?open=agent%3Aagent-1"]);
   });
 
+  it("defers an agent tab until persisted workspace layout has hydrated", () => {
+    const workspace = {
+      id: "workspace-a",
+      workspaceDirectory: "/repo/workspace-a",
+    } as WorkspaceDescriptor;
+    const { deps, navigations, openedTabs } = createFakeDeps({
+      getSessionWorkspaces: () => new Map([[workspace.id, workspace]]),
+      isWorkspaceLayoutHydrated: () => false,
+    });
+
+    navigateToWorkspace(
+      {
+        serverId: "server-1",
+        workspaceId: "workspace-a",
+        target: { kind: "agent", agentId: "agent-1" },
+        pin: true,
+      },
+      deps,
+    );
+
+    expect(openedTabs).toEqual([]);
+    expect(navigations).toEqual(["/h/server-1/workspace/workspace-a?open=agent%3Aagent-1"]);
+  });
+
   it("reads the active workspace from the current route", () => {
     const selection = parseActiveWorkspaceSelection({
       pathname: "/h/server-1/workspace/workspace-a",

packages/app/src/stores/navigation-active-workspace-store/navigation.ts

@@ -34,6 +34,7 @@ export interface NavigateToWorkspaceInput {
 export interface NavigateToWorkspaceDeps extends PrepareWorkspaceTabDeps {
   getSessionWorkspaces: (serverId: string) => Map<string, WorkspaceDescriptor> | null | undefined;
   getSessionAgents: (serverId: string) => Iterable<Agent>;
+  isWorkspaceLayoutHydrated: () => boolean;
   rememberLastWorkspace: (selection: ActiveWorkspaceSelection) => void;
   navigateToRoute: (route: string) => void;
 }
@@ -90,8 +91,11 @@ export function navigateToWorkspace(
     workspaces,
     workspaceId: input.workspaceId,
   });
+  const shouldDeferAgentOpen = Boolean(
+    input.target?.kind === "agent" && (!resolvedWorkspaceId || !deps.isWorkspaceLayoutHydrated()),
+  );
   if (input.target) {
-    if (resolvedWorkspaceId || input.target.kind !== "agent") {
+    if (!shouldDeferAgentOpen) {
       prepareWorkspaceTab({ ...input, target: input.target }, deps);
     }
   } else {
@@ -111,7 +115,7 @@ export function navigateToWorkspace(
   }
 
   const route =
-    input.target?.kind === "agent" && !resolvedWorkspaceId
+    input.target?.kind === "agent" && shouldDeferAgentOpen
       ? buildHostWorkspaceOpenRoute(
           input.serverId,
           input.workspaceId,

packages/app/src/stores/workspace-layout-store.test.ts

@@ -3092,7 +3092,7 @@ describe("workspace-layout-store actions", () => {
     expect(findPaneById(layout.root, "explorer")?.hidden).toBe(true);
   });
 
-  it("keeps pinned archived agents in memory per workspace without persisting them", () => {
+  it("keeps explicitly opened pinned agents in memory per workspace without persisting them", () => {
     const workspaceKey = createWorkspaceKey();
     const otherWorkspaceKey = buildWorkspaceTabPersistenceKey({
       serverId: SERVER_ID,
@@ -3102,9 +3102,18 @@ describe("workspace-layout-store actions", () => {
     expect(otherWorkspaceKey).toBeTruthy();
 
     const store = workspaceLayoutStore.getState();
-    store.pinAgent(workspaceKey, "agent-1");
-    store.pinAgent(workspaceKey, "agent-1");
-    store.pinAgent(otherWorkspaceKey as string, "agent-2");
+    store.openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "agent-1" },
+      intent: "reveal",
+      pin: true,
+    });
+    store.openTab({
+      workspaceKey: otherWorkspaceKey as string,
+      target: { kind: "agent", agentId: "agent-2" },
+      intent: "reveal",
+      pin: true,
+    });
 
     let state = workspaceLayoutStore.getState();
     expect(Array.from(state.pinnedAgentIdsByWorkspace[workspaceKey] ?? [])).toEqual(["agent-1"]);
@@ -3122,13 +3131,7 @@ describe("workspace-layout-store actions", () => {
 
     const partialize = workspaceLayoutStore.persist.getOptions().partialize;
     expect(partialize).toBeTypeOf("function");
-    expect(partialize?.(state)).toEqual({
-      layoutByWorkspace: {},
-      splitSizesByWorkspace: {},
-      explorerSidebarWidthByWorkspace: {},
-      explorerPaneIdByWorkspace: {},
-      sidePaneIdByWorkspace: {},
-    });
+    expect(partialize?.(state)).not.toHaveProperty("pinnedAgentIdsByWorkspace");
   });
 
   it("keeps hidden agent intents in memory per workspace without persisting them", () => {
@@ -3653,14 +3656,19 @@ describe("workspace-layout-store actions", () => {
     ]);
   });
 
-  it("pinning an agent clears hidden intent", () => {
+  it("opening a pinned agent clears hidden intent", () => {
     const workspaceKey = createWorkspaceKey();
     const store = workspaceLayoutStore.getState();
 
     store.hideAgent(workspaceKey, "agent-1");
     expect(workspaceLayoutStore.getState().hiddenAgentIdsByWorkspace[workspaceKey]).toBeDefined();
 
-    store.pinAgent(workspaceKey, "agent-1");
+    store.openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "agent-1" },
+      intent: "reveal",
+      pin: true,
+    });
 
     const state = workspaceLayoutStore.getState();
     expect(state.hiddenAgentIdsByWorkspace[workspaceKey]).toBeUndefined();
@@ -3675,8 +3683,8 @@ describe("workspace-layout-store actions", () => {
       workspaceKey: workspaceKey,
       target: { kind: "agent", agentId: "archived-agent" },
       intent: "reveal",
+      pin: true,
     });
-    store.pinAgent(workspaceKey, "archived-agent");
     store.reconcileTabs(workspaceKey, {
       agentsHydrated: true,
       terminalsHydrated: true,
@@ -3730,8 +3738,8 @@ describe("workspace-layout-store actions", () => {
       workspaceKey: workspaceKey,
       target: { kind: "agent", agentId: "archived-agent" },
       intent: "reveal",
+      pin: true,
     });
-    store.pinAgent(workspaceKey, "archived-agent");
     store.reconcileTabs(workspaceKey, {
       agentsHydrated: true,
       terminalsHydrated: true,
@@ -3749,6 +3757,48 @@ describe("workspace-layout-store actions", () => {
     ).toEqual(["agent_archived-agent"]);
   });
 
+  it("atomically reveals, focuses, and pins an archived agent against reconciliation", () => {
+    const workspaceKey = createWorkspaceKey();
+    const store = workspaceLayoutStore.getState();
+    store.openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "first-agent" },
+      intent: "reveal",
+    });
+    store.openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "second-agent" },
+      intent: "reveal",
+    });
+    store.hideAgent(workspaceKey, "archived-agent");
+
+    const archivedTabId = store.openTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "archived-agent" },
+      intent: "reveal",
+      pin: true,
+    });
+    store.reconcileTabs(workspaceKey, {
+      agentsHydrated: true,
+      terminalsHydrated: true,
+      activeAgentIds: ["first-agent", "second-agent"],
+      autoOpenAgentIds: ["first-agent", "second-agent"],
+      knownAgentIds: ["first-agent", "second-agent"],
+      standaloneTerminalIds: [],
+    });
+
+    const state = workspaceLayoutStore.getState();
+    const layout = state.layoutByWorkspace[workspaceKey];
+    expect(contentTabs(state.getWorkspaceTabs(workspaceKey)).map((tab) => tab.tabId)).toContain(
+      archivedTabId,
+    );
+    expect(findPaneById(layout.root, layout.focusedPaneId)?.focusedTabId).toBe(archivedTabId);
+    expect(Array.from(state.pinnedAgentIdsByWorkspace[workspaceKey] ?? [])).toContain(
+      "archived-agent",
+    );
+    expect(state.hiddenAgentIdsByWorkspace[workspaceKey]).toBeUndefined();
+  });
+
   it("retargeting a tab to an agent clears hidden intent", () => {
     const workspaceKey = createWorkspaceKey();
     const store = workspaceLayoutStore.getState();

packages/app/src/stores/workspace-layout-store.ts

@@ -95,6 +95,8 @@ export interface OpenWorkspaceTabInput {
   workspaceKey: string;
   target: WorkspaceTabTarget;
   intent: WorkspaceTabOpenIntent;
+  /** Keeps an explicitly opened agent visible even when it is archived. */
+  pin?: boolean;
   placement?: WorkspaceTabPlacement;
   parentTabId?: string;
   state?: JsonValue;
@@ -159,7 +161,6 @@ interface WorkspaceLayoutStore {
   resizeSplit: (workspaceKey: string, groupId: string, sizes: number[]) => void;
   resizeExplorerSidebar: (workspaceKey: string, width: number) => void;
   reorderTabsInPane: (workspaceKey: string, paneId: string, tabIds: string[]) => void;
-  pinAgent: (workspaceKey: string, agentId: string) => void;
   unpinAgent: (workspaceKey: string, agentId: string) => void;
   hideAgent: (workspaceKey: string, agentId: string) => void;
   unhideAgent: (workspaceKey: string, agentId: string) => void;
@@ -811,6 +812,7 @@ export function createWorkspaceLayoutStore(
             placement.explorerSidebarPaneId,
             placement.layout.focusedPaneId,
           );
+          const shouldPinAgent = input.pin === true && normalizedTarget.kind === "agent";
           set((state) => ({
             ...withoutFocusRestoration(state, normalizedWorkspaceKey),
             hiddenAgentIdsByWorkspace:
@@ -821,6 +823,20 @@ export function createWorkspaceLayoutStore(
                     normalizedWorkspaceKey,
                     normalizedTarget.agentId,
                   ),
+            pinnedAgentIdsByWorkspace: shouldPinAgent
+              ? addAgentIdToWorkspaceSet(
+                  state.pinnedAgentIdsByWorkspace,
+                  normalizedWorkspaceKey,
+                  normalizedTarget.agentId,
+                )
+              : state.pinnedAgentIdsByWorkspace,
+            pendingAgentIdsByWorkspace: shouldPinAgent
+              ? addAgentIdToWorkspaceSet(
+                  state.pendingAgentIdsByWorkspace,
+                  normalizedWorkspaceKey,
+                  normalizedTarget.agentId,
+                )
+              : state.pendingAgentIdsByWorkspace,
             layoutByWorkspace: {
               ...state.layoutByWorkspace,
               [normalizedWorkspaceKey]: input.parentTabId
@@ -1639,46 +1655,6 @@ export function createWorkspaceLayoutStore(
             };
           });
         },
-        pinAgent: (workspaceKey, agentId) => {
-          const normalizedWorkspaceKey = trimNonEmpty(workspaceKey);
-          const normalizedAgentId = trimNonEmpty(agentId);
-          if (!normalizedWorkspaceKey || !normalizedAgentId) {
-            return;
-          }
-
-          set((state) => {
-            const currentPinnedAgentIds =
-              state.pinnedAgentIdsByWorkspace[normalizedWorkspaceKey] ?? null;
-            const currentPendingAgentIds =
-              state.pendingAgentIdsByWorkspace[normalizedWorkspaceKey] ?? null;
-            if (
-              currentPinnedAgentIds?.has(normalizedAgentId) &&
-              currentPendingAgentIds?.has(normalizedAgentId)
-            ) {
-              return state;
-            }
-
-            const nextPinnedAgentIds = new Set(currentPinnedAgentIds ?? []);
-            nextPinnedAgentIds.add(normalizedAgentId);
-
-            return {
-              hiddenAgentIdsByWorkspace: removeAgentIdFromWorkspaceSet(
-                state.hiddenAgentIdsByWorkspace,
-                normalizedWorkspaceKey,
-                normalizedAgentId,
-              ),
-              pinnedAgentIdsByWorkspace: {
-                ...state.pinnedAgentIdsByWorkspace,
-                [normalizedWorkspaceKey]: nextPinnedAgentIds,
-              },
-              pendingAgentIdsByWorkspace: addAgentIdToWorkspaceSet(
-                state.pendingAgentIdsByWorkspace,
-                normalizedWorkspaceKey,
-                normalizedAgentId,
-              ),
-            };
-          });
-        },
         unpinAgent: (workspaceKey, agentId) => {
           const normalizedWorkspaceKey = trimNonEmpty(workspaceKey);
           const normalizedAgentId = trimNonEmpty(agentId);