chore(release): cut 0.13.0-beta.2

EAS auto selects Xcode 26.6 for Expo 57, leaving releases in phone compatibility mode despite scene support. Pin Xcode 27.1 for the native resizing opt-in.

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.13.0-beta.1 - 2026-10-22
+## 0.13.0-beta.2 - 2026-10-23
 
 Foldable phone layouts, agents that delegate work to other machines, plugin file panels, and plugin translations.
 
@@ -14,18 +14,25 @@ paseo host add 'relay://...' --label laptop
 
 ### Added
 
-- Added support for foldable phones such as iPhone Duo, which switch to the wide layout when unfolded ([#7424](https://github.com/getpaseo/paseo/pull/7424))
+- Added support for foldable phones such as iPhone Duo, which switch to the wide layout when unfolded ([#7424](https://github.com/getpaseo/paseo/pull/7424), [#7705](https://github.com/getpaseo/paseo/pull/7705))
 - Added connected hosts, so agents can create, prompt and monitor agents on other machines and see them in the Subagents track ([#7370](https://github.com/getpaseo/paseo/pull/7370), [#7593](https://github.com/getpaseo/paseo/pull/7593))
 - Added paseo.sh in Simplified Chinese at [paseo.sh/zh-CN](https://paseo.sh/zh-CN) ([#7373](https://github.com/getpaseo/paseo/pull/7373))
 - Added All changes to the Changes pane as the default, showing committed and uncommitted work since the branch base in one diff ([#7576](https://github.com/getpaseo/paseo/pull/7576))
 - Added Implement with Auto mode to Claude plan approvals when Auto was on before Plan ([#7453](https://github.com/getpaseo/paseo/pull/7453))
+- Added pasting images and dropping files into terminals, so agent TUIs such as Claude Code and Codex can read them, including on remote hosts ([#3795](https://github.com/getpaseo/paseo/pull/3795) by [@gerardbalaoro](https://github.com/gerardbalaoro))
 
 ### Improved
 
+- Changed sidebar workspaces to sort by Created, with Last prompt under Display → Sort; workspaces no longer drag to reorder ([#7635](https://github.com/getpaseo/paseo/pull/7635))
+- Changed long project groups in the sidebar to show seven workspaces plus any that need attention or are working, with Show more for the rest ([#7635](https://github.com/getpaseo/paseo/pull/7635))
+- Changed Command Center agent and workspace results to show the same icons and status as tabs and the sidebar ([#7690](https://github.com/getpaseo/paseo/pull/7690))
+- Changed Manual metadata generation to use only the models you chose, without falling back to the defaults ([#7611](https://github.com/getpaseo/paseo/pull/7611))
 - Changed the Host field on New workspace to always show, with Add host at the end of its menu ([#7580](https://github.com/getpaseo/paseo/pull/7580))
-- Replaced the file tab's Preview/Source toggle with a switcher between the file's panels ([#7411](https://github.com/getpaseo/paseo/pull/7411))
 - Changed Explorer to use the same tabs and launcher on phones, tablets and desktop ([#7424](https://github.com/getpaseo/paseo/pull/7424))
 - Changed Explorer tabs on phones to keep full labels and scroll, with Close moved to the long-press menu ([#7589](https://github.com/getpaseo/paseo/pull/7589))
+- Changed relay connections to require the daemon password when the daemon has one; re-add relay hosts saved without it ([#7668](https://github.com/getpaseo/paseo/pull/7668) by [@nickmaglowsch](https://github.com/nickmaglowsch))
+- Kept the sidebar open on phones when you cancel Search, Import session or Add project ([#7693](https://github.com/getpaseo/paseo/pull/7693))
+- Removed the legacy terminal renderer; iOS and Android always use the native terminal renderer ([#7639](https://github.com/getpaseo/paseo/pull/7639))
 - Changed usage rows to say whether a percentage is used or remaining, in the app's language ([#7376](https://github.com/getpaseo/paseo/pull/7376) by [@michaelmwu](https://github.com/michaelmwu))
 - Changed an agent's report and its finish notification to reach the parent agent as one message ([#7561](https://github.com/getpaseo/paseo/pull/7561))
 - Stopped sending workspace setup output to apps that are not showing that workspace's Setup panel ([#7407](https://github.com/getpaseo/paseo/pull/7407), [#7473](https://github.com/getpaseo/paseo/pull/7473))
@@ -35,18 +42,31 @@ paseo host add 'relay://...' --label laptop
 
 ### Plugins
 
-- Added [file panels](https://paseo.sh/docs/plugins/reference#file-panels), so a plugin can open matching files in the file tab, such as a PDF viewer or a rich Markdown editor ([#7411](https://github.com/getpaseo/paseo/pull/7411), [#7366](https://github.com/getpaseo/paseo/pull/7366))
+- Added [file panels](https://paseo.sh/docs/plugins/reference#file-panels), so a plugin can open matching files in the file tab, such as a PDF viewer or a rich Markdown editor ([#7411](https://github.com/getpaseo/paseo/pull/7411), [#7366](https://github.com/getpaseo/paseo/pull/7366), [#7614](https://github.com/getpaseo/paseo/pull/7614))
+- Added `useTabState` for per-tab panel state that survives reloads, and `addAgentPanel`; workspace, agent and file panels share the `workspaceId`, `params`, `revision` and `tab` props ([#7685](https://github.com/getpaseo/paseo/pull/7685))
 - Added [plugin translations](https://paseo.sh/docs/plugins/reference#runtime-translations), so plugin content and labels follow the app's language ([#7478](https://github.com/getpaseo/paseo/pull/7478))
 - Added translated plugin listings through `translations` in `paseo-plugin.json` and `OVERVIEW.zh-CN.md` ([#7373](https://github.com/getpaseo/paseo/pull/7373))
 - Added `Markdown` to `@getpaseo/plugin/client/ui` to render Markdown with Paseo's renderer ([#7579](https://github.com/getpaseo/paseo/pull/7579))
 - Added inline SVG and component icons to every plugin `icon` ([#7368](https://github.com/getpaseo/paseo/pull/7368))
 - Changed every plugin UI import to `@getpaseo/plugin/client/ui`; the previous entry point still works and is deprecated ([#7474](https://github.com/getpaseo/paseo/pull/7474))
+- Deprecated the panel `context` and `agentId` props and `addWorkspacePanel`'s `context` field; use `params.agentId` and `addAgentPanel` ([#7685](https://github.com/getpaseo/paseo/pull/7685))
 - Changed turn-ended hooks to send an empty `timeline`; fetch recent history with `timeline.refetch` instead ([#7477](https://github.com/getpaseo/paseo/pull/7477))
+- Fixed plugin header buttons missing on phones and narrow windows; they now appear in the workspace ··· menu ([#7630](https://github.com/getpaseo/paseo/pull/7630))
 - Fixed notification timeline transformers failing to load with "invalid item type: notification" ([#7582](https://github.com/getpaseo/paseo/pull/7582) by [@Gavinchen92](https://github.com/Gavinchen92))
 
 ### Fixed
 
 - Fixed agents showing as running after a daemon restart ([#7573](https://github.com/getpaseo/paseo/pull/7573))
+- Fixed parent agents never hearing from `notifyOnFinish` children after a daemon restart ([#7683](https://github.com/getpaseo/paseo/pull/7683))
+- Fixed opening a large Claude session showing an empty chat or crashing the daemon ([#7431](https://github.com/getpaseo/paseo/pull/7431) by [@ZouYusheng](https://github.com/ZouYusheng))
+- Fixed Import session crashing the daemon with large Claude histories ([#7626](https://github.com/getpaseo/paseo/pull/7626) by [@lanej](https://github.com/lanej))
+- Fixed hosts staying in Error when the direct connection drops instead of switching to a saved relay connection ([#7616](https://github.com/getpaseo/paseo/pull/7616) by [@3ae3ae](https://github.com/3ae3ae))
+- Fixed tapping a notification opening a stale workspace on iOS, and Android reopening the notification's agent on every app reopen ([#7612](https://github.com/getpaseo/paseo/pull/7612) by [@kassamkhoja](https://github.com/kassamkhoja))
+- Fixed sidebar PR status and checks disappearing after the app reconnects ([#7638](https://github.com/getpaseo/paseo/pull/7638))
+- Fixed workspace diff stats and merged-PR auto-archive missing updates while no app was showing the workspace ([#7681](https://github.com/getpaseo/paseo/pull/7681))
+- Fixed the `/` and `@` picker on iPhone covering the composer and hiding its best match behind the keyboard ([#7679](https://github.com/getpaseo/paseo/pull/7679) by [@masz77](https://github.com/masz77))
+- Fixed reopening a workspace marked unread on a phone leaving its agent stuck loading ([#7608](https://github.com/getpaseo/paseo/pull/7608))
+- Fixed Command Center jumping back to the selected result while you scroll ([#7688](https://github.com/getpaseo/paseo/pull/7688))
 - Fixed Claude system context appearing as an assistant message in imported or restored chats ([#7590](https://github.com/getpaseo/paseo/pull/7590) by [@khevamann](https://github.com/khevamann), [@rogerluan](https://github.com/rogerluan))
 - Fixed saved workspace tabs being lost when leaving or reloading the app right after it loads ([#7547](https://github.com/getpaseo/paseo/pull/7547))
 - Fixed relative links in Markdown preview resolving from the workspace root instead of the document's folder ([#7538](https://github.com/getpaseo/paseo/pull/7538))

CHANGELOG.zh-CN.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-## 0.13.0-beta.1 - 2026-10-22
+## 0.13.0-beta.2 - 2026-10-23
 
 折叠屏手机布局、可将工作委派给其他机器的 Agent、插件文件面板，以及插件翻译。
 
@@ -14,18 +14,25 @@ paseo host add 'relay://...' --label laptop
 
 ### 新增
 
-- 新增对 iPhone Duo 等折叠屏手机的支持，展开后切换到宽屏布局 ([#7424](https://github.com/getpaseo/paseo/pull/7424))
+- 新增对 iPhone Duo 等折叠屏手机的支持，展开后切换到宽屏布局 ([#7424](https://github.com/getpaseo/paseo/pull/7424), [#7705](https://github.com/getpaseo/paseo/pull/7705))
 - 新增已连接主机，Agent 可以在其他机器上创建、提示和监控 Agent，并在 Subagents 中查看它们 ([#7370](https://github.com/getpaseo/paseo/pull/7370), [#7593](https://github.com/getpaseo/paseo/pull/7593))
 - 新增简体中文版 paseo.sh，地址为 [paseo.sh/zh-CN](https://paseo.sh/zh-CN) ([#7373](https://github.com/getpaseo/paseo/pull/7373))
 - Changes 窗格新增 All changes 并设为默认，在一个 diff 中显示自分支基点以来已提交和未提交的工作 ([#7576](https://github.com/getpaseo/paseo/pull/7576))
 - 如果进入 Plan 前开启了 Auto，Claude 计划审批新增 Implement with Auto mode ([#7453](https://github.com/getpaseo/paseo/pull/7453))
+- 新增在终端中粘贴图片和拖放文件，Claude Code、Codex 等 Agent TUI 可以读取它们，远程主机同样适用 ([#3795](https://github.com/getpaseo/paseo/pull/3795) by [@gerardbalaoro](https://github.com/gerardbalaoro))
 
 ### 改进
 
+- 侧边栏工作区改为按“创建时间”排序，可在“显示”→“排序”中选择“最近提示词”；工作区不再支持拖动排序 ([#7635](https://github.com/getpaseo/paseo/pull/7635))
+- 侧边栏中较长的项目分组现在显示七个工作区，以及所有需要处理或正在运行的工作区，其余的可通过“显示更多”查看 ([#7635](https://github.com/getpaseo/paseo/pull/7635))
+- Command Center 中的 Agent 和工作区结果现在显示与标签页和侧边栏相同的图标和状态 ([#7690](https://github.com/getpaseo/paseo/pull/7690))
+- 手动元数据生成现在只使用你选择的模型，不再回退到默认模型 ([#7611](https://github.com/getpaseo/paseo/pull/7611))
 - 新建工作区中的 Host 字段现在始终显示，其菜单末尾为 Add host ([#7580](https://github.com/getpaseo/paseo/pull/7580))
-- 文件标签页的 Preview/Source 切换改为在该文件的各个面板之间切换 ([#7411](https://github.com/getpaseo/paseo/pull/7411))
 - Explorer 在手机、平板和桌面上使用相同的标签页和启动器 ([#7424](https://github.com/getpaseo/paseo/pull/7424))
 - 手机上的 Explorer 标签页保留完整标签并可滚动，关闭操作移到了长按菜单中 ([#7589](https://github.com/getpaseo/paseo/pull/7589))
+- 如果 daemon 设置了密码，relay 连接现在需要该密码；请重新添加保存时未带密码的 relay 主机 ([#7668](https://github.com/getpaseo/paseo/pull/7668) by [@nickmaglowsch](https://github.com/nickmaglowsch))
+- 在手机上取消搜索、导入会话或添加项目时，侧边栏保持打开 ([#7693](https://github.com/getpaseo/paseo/pull/7693))
+- 移除了旧版终端渲染器；iOS 和 Android 始终使用原生终端渲染器 ([#7639](https://github.com/getpaseo/paseo/pull/7639))
 - 用量行现在用应用的语言说明百分比是已用还是剩余 ([#7376](https://github.com/getpaseo/paseo/pull/7376) by [@michaelmwu](https://github.com/michaelmwu))
 - Agent 的报告和完成通知现在合并为一条消息发送给父 Agent ([#7561](https://github.com/getpaseo/paseo/pull/7561))
 - 不再向未显示该工作区 Setup 面板的应用发送工作区的 Setup 输出 ([#7407](https://github.com/getpaseo/paseo/pull/7407), [#7473](https://github.com/getpaseo/paseo/pull/7473))
@@ -35,18 +42,31 @@ paseo host add 'relay://...' --label laptop
 
 ### 插件
 
-- 新增[文件面板](https://paseo.sh/zh-CN/docs/plugins/reference#file-panels)，插件可以在文件标签页中打开匹配的文件，例如 PDF 查看器或富文本 Markdown 编辑器 ([#7411](https://github.com/getpaseo/paseo/pull/7411), [#7366](https://github.com/getpaseo/paseo/pull/7366))
+- 新增[文件面板](https://paseo.sh/zh-CN/docs/plugins/reference#file-panels)，插件可以在文件标签页中打开匹配的文件，例如 PDF 查看器或富文本 Markdown 编辑器 ([#7411](https://github.com/getpaseo/paseo/pull/7411), [#7366](https://github.com/getpaseo/paseo/pull/7366), [#7614](https://github.com/getpaseo/paseo/pull/7614))
+- 新增 `useTabState`，用于保存每个标签页的面板状态并在重新加载后恢复，并新增 `addAgentPanel`；工作区、Agent 和文件面板共用 `workspaceId`、`params`、`revision` 和 `tab` 属性 ([#7685](https://github.com/getpaseo/paseo/pull/7685))
 - 新增[插件翻译](https://paseo.sh/zh-CN/docs/plugins/reference#runtime-translations)，插件内容和标签会跟随应用的语言 ([#7478](https://github.com/getpaseo/paseo/pull/7478))
 - 新增插件列表翻译，可通过 `paseo-plugin.json` 中的 `translations` 和 `OVERVIEW.zh-CN.md` 提供 ([#7373](https://github.com/getpaseo/paseo/pull/7373))
 - `@getpaseo/plugin/client/ui` 新增 `Markdown`，可使用 Paseo 的渲染器渲染 Markdown ([#7579](https://github.com/getpaseo/paseo/pull/7579))
 - 所有插件 `icon` 新增对内联 SVG 和组件图标的支持 ([#7368](https://github.com/getpaseo/paseo/pull/7368))
 - 所有插件 UI 导入改为 `@getpaseo/plugin/client/ui`；原入口仍可使用，但已弃用 ([#7474](https://github.com/getpaseo/paseo/pull/7474))
+- 弃用面板的 `context` 和 `agentId` 属性，以及 `addWorkspacePanel` 的 `context` 字段；请改用 `params.agentId` 和 `addAgentPanel` ([#7685](https://github.com/getpaseo/paseo/pull/7685))
 - turn-ended hook 现在发送空的 `timeline`；请改用 `timeline.refetch` 获取最近的历史记录 ([#7477](https://github.com/getpaseo/paseo/pull/7477))
+- 修复了插件标题栏按钮在手机和窄窗口中不显示的问题；它们现在显示在工作区的 ··· 菜单中 ([#7630](https://github.com/getpaseo/paseo/pull/7630))
 - 修复了 notification 时间线转换器加载失败并报错 "invalid item type: notification" 的问题 ([#7582](https://github.com/getpaseo/paseo/pull/7582) by [@Gavinchen92](https://github.com/Gavinchen92))
 
 ### 修复
 
 - 修复了 daemon 重启后 Agent 仍显示为运行中的问题 ([#7573](https://github.com/getpaseo/paseo/pull/7573))
+- 修复了 daemon 重启后父 Agent 收不到 `notifyOnFinish` 子 Agent 通知的问题 ([#7683](https://github.com/getpaseo/paseo/pull/7683))
+- 修复了打开大型 Claude 会话时聊天为空或 daemon 崩溃的问题 ([#7431](https://github.com/getpaseo/paseo/pull/7431) by [@ZouYusheng](https://github.com/ZouYusheng))
+- 修复了 Claude 历史记录较大时导入会话导致 daemon 崩溃的问题 ([#7626](https://github.com/getpaseo/paseo/pull/7626) by [@lanej](https://github.com/lanej))
+- 修复了直连断开后主机停留在错误状态、不切换到已保存的 relay 连接的问题 ([#7616](https://github.com/getpaseo/paseo/pull/7616) by [@3ae3ae](https://github.com/3ae3ae))
+- 修复了 iOS 上点击通知打开过期工作区，以及 Android 每次重新打开应用都会再次打开通知对应 Agent 的问题 ([#7612](https://github.com/getpaseo/paseo/pull/7612) by [@kassamkhoja](https://github.com/kassamkhoja))
+- 修复了应用重新连接后侧边栏中的 PR 状态和检查消失的问题 ([#7638](https://github.com/getpaseo/paseo/pull/7638))
+- 修复了没有应用显示工作区时，工作区 diff 统计和已合并 PR 的自动归档不更新的问题 ([#7681](https://github.com/getpaseo/paseo/pull/7681))
+- 修复了 iPhone 上 `/` 和 `@` 选择器遮挡输入框、并把最佳匹配项藏在键盘后面的问题 ([#7679](https://github.com/getpaseo/paseo/pull/7679) by [@masz77](https://github.com/masz77))
+- 修复了在手机上重新打开标记为未读的工作区后 Agent 一直加载的问题 ([#7608](https://github.com/getpaseo/paseo/pull/7608))
+- 修复了滚动时 Command Center 跳回所选结果的问题 ([#7688](https://github.com/getpaseo/paseo/pull/7688))
 - 修复了导入或恢复的聊天中 Claude 系统上下文显示为助手消息的问题 ([#7590](https://github.com/getpaseo/paseo/pull/7590) by [@khevamann](https://github.com/khevamann), [@rogerluan](https://github.com/rogerluan))
 - 修复了应用加载后立即离开或重新加载时已保存的工作区标签页丢失的问题 ([#7547](https://github.com/getpaseo/paseo/pull/7547))
 - 修复了 Markdown 预览中的相对链接从工作区根目录而不是文档所在文件夹解析的问题 ([#7538](https://github.com/getpaseo/paseo/pull/7538))

SECURITY.md

@@ -42,7 +42,7 @@ The daemon requires a valid cryptographic handshake before processing any comman
 
 The QR code or pairing link is the trust anchor. It contains the daemon's public key, which is required to establish the encrypted connection. Treat it like a password — don't share it publicly.
 
-When a daemon password is configured, new relay clients send it in the encrypted `hello` message. This release still admits relay clients that send no credential so existing mobile builds continue to connect. A wrong password is rejected. The next release will require the password for relay connections after updated mobile builds are available.
+When a daemon password is configured, relay clients send it in the encrypted `hello` message, so the relay never sees it. The daemon rejects a relay client that sends a wrong password or none, so a leaked pairing link alone does not grant access to a password-protected daemon.
 
 ## Local daemon trust boundary
 

docs/agent-lifecycle.md

@@ -79,7 +79,30 @@ Users can also detach an existing subagent from the subagents track. Detach is d
 
 Agent-originated messages and automatic notifications share a recipient-daemon delivery module. A queued receipt acknowledges admission before provider dispatch, allowing a child to report and finish in the same two-second quiet window. Human prompts dispatch directly. Conflicting explicit interruption or session-mode choices retain separate ordered dispatches.
 
-The pending window is in memory. Clean shutdown flushes it before closing agents; an abrupt crash can lose it. A durable send receipt remains pending until actual dispatch acknowledgment, so a lost window never becomes a completed receipt. Completion waits cover queued admission within their original timeout and cancellation scope.
+The pending message window is in memory. Clean shutdown flushes it before closing agents; an abrupt
+crash can lose queued prompts. A durable send receipt remains pending until actual dispatch
+acknowledgment, so a lost window never becomes a completed receipt. Completion waits cover queued
+admission within their original timeout and cancellation scope.
+
+Finish notification intent has a separate daemon-owned lifetime. The finish-subscriptions module
+persists caller, child, host, and ownership policy through an injectable store; its JSON adapter uses
+`$PASEO_HOME/finish-subscriptions.json`. Registration must commit before creation or queued-prompt
+acknowledgment promises a notification. A pending replacement retains its predecessor until dispatch
+accepts; rejected dispatch removes only the candidate. Recovery coalesces registrations for the same
+caller, child, and host into one watch.
+
+Bootstrap restores these watches after repairing stale running records to `closed` and before opening
+ingress. Reading a closed child's result does not load its provider. A finish notification reports that
+the child's run has settled; the parent decides whether its task is complete. Recovery never resumes
+child work. Archived or deleted parents suppress delivery; parent-owned creation watches also stop
+reporting after detachment.
+
+Intent remains stored until the parent's notification dispatch is acknowledged. Dispatch failure
+retries the captured notification; it does not change the child's reported outcome. Remote host loss
+follows the [connected-host observation policy](connected-hosts.md#delegating-agents). Shutdown stops observation before flushing message delivery, retaining
+outstanding intent. A crash after successful dispatch but before removal commits can repeat the
+notification. Clean shutdown can also flush an already queued callback while retaining its intent,
+so that callback can repeat after restart. This is an at-least-once wakeup, without turn attribution or exactly-once delivery.
 
 Permission requests are notification checkpoints, not the end of that subscription. The caller is notified again after a permission response when the child finishes, errors, or requests another permission.
 The permission notification includes the normalized request plus the child and request IDs, so the caller can inspect it and respond without fetching agent status.

docs/connected-hosts.md

@@ -44,10 +44,25 @@ connection candidates, including direct connections and routes discovered throug
 Adding a direct connection to a discovered host adds another candidate. If no candidate connects,
 the destination workspace keeps its existing disconnected or reconnecting behavior.
 
-Finish notifications use the existing idle wait, including a pending initial run or an already idle
-child. They name the server and agent. A daemon restart or route loss ends an outstanding notification
-wait; inspect or wait for the child again rather than resending its prompt. Concurrent prompts gain
-no additional turn attribution or delivery guarantee.
+Finish notifications name the destination server and child agent. The caller's daemon owns durable
+subscription intent and restores observation through the same routed wait and permission observation
+used during ordinary operation. Restarting the caller's daemon does not imply that a remote child
+stopped. Three failed remote observation attempts end the subscription with a notification that the
+child could not be observed and its status is unknown. This does not prove the host is offline: remote
+RPC failures also prevent observation. Attempts use capped backoff; a connection still
+in progress does not spend that budget. A confirmed removed registration reports host unavailability
+immediately through the same path. Neither notice claims the child finished. Intent remains stored
+until the parent accepts dispatch, then is consumed; reconnecting does not restore that watch. The
+parent decides whether to inspect the child or delegate again.
+
+A definitely unsent prompt returns a tool error and creates no notification. An ambiguous prompt
+response retains intent because the destination may have admitted it; observation then follows the
+same retry policy. A confirmed missing child reports unavailability.
+
+Remote creation and local subscription persistence are separate commits. A failed local write reports
+failure even if the destination already created the child; inspect it before retrying creation.
+See [finish notification lifetime](agent-lifecycle.md#relationships) for registration, acknowledgment,
+and duplicate-delivery semantics. Concurrent prompts gain no turn attribution.
 
 ## Connections and recovery
 

docs/explorer-sidebar.md

@@ -43,13 +43,16 @@ remounts its panel. Revealing a target that already has a sheet uncovers that sh
 ones above it, except ones holding unsaved work, which stay where they are. Opening a sheet as a tab
 dismisses the sheets above it, since the tab would sit under them. The stack is not persisted.
 
-Sheets are modal and cover the whole compact workspace, including the header and Explorer. A sheet's header is its drag
+Sheets are modal and cover both compact sidebars as well as the workspace. A sheet's header is its drag
 handle, because the panel scrolls on its own and content panning would fight it. Its trailing rail
 holds icon buttons only (`SheetHeaderIconButton`): Open as tab is the full-screen glyph beside
-Close, so the title keeps its width. The sheets present
-from the shared workspace's `SheetHostScope`, so their panels read the navigator and every
-workspace provider an ordinary pane has without a context bridge
-([floating-panels.md Gotcha 6](floating-panels.md#gotcha-6--bottom-sheet-refs-are-not-lifecycle-truth)).
+Close, so the title keeps its width. Compact sheets use the app overlay host: a workspace-local
+host sits behind the app-level left sidebar. The workspace environment bridge preserves existing
+editing sessions, caches, file-link resolution and supported navigation context without moving
+their providers. Keep this capability at the workspace boundary; new sheet callers must not
+assemble provider internals. Wide layouts retain local hosting and pane geometry. Both hosts
+forward the same Gorhom modal queue; neither creates another stack. See
+[floating-panels.md Gotcha 7](floating-panels.md#gotcha-7--a-sheet-cannot-read-context-from-its-call-site).
 
 A sheet holding unsaved work is never implicitly displaced; only its guarded close removes it.
 Moving its tab to another host remounts the panel, and the file editor keeps unsaved text in the

docs/floating-panels.md

@@ -115,11 +115,10 @@ quietly relying on:
   Gate `visible` on a screen-focus signal. For panes inside `agent-panel`, the
   `isPaneFocused` prop already exists and flips on pane switches; pass
   `visible={isYourOwnVisible && isPaneFocused}`.
-- **Transforms.** `KeyboardShiftProvider` owns the canonical keyboard shift
-  SharedValue, and `useKeyboardShiftStyle()` only adapts that value into
-  translate/padding styles. The composer and chat content must both read that
-  provider-owned value. A portal'd popover is outside the composer tree — it
-  does not get that transform unless you apply it yourself.
+- **Transforms.** The composer moves with the keyboard through a
+  `KeyboardTranslateView` transform. A portal'd popover is outside that view, so
+  it does not move with the composer unless it renders its own
+  `KeyboardTranslateView` with the same translation.
 - **Layering.** The default root host renders after app content, so it sits
   above compact sidebars. Content overlays that must sit below sidebars should
   use the current `FloatingPanelPortalHost`.
@@ -158,7 +157,7 @@ and the stream keeps its existing flick-to-dismiss gesture.
 The dock's private viewport and capacity model are extracted from chat. The
 app-wide `@/keyboard/shift` module owns shared motion for the dock, portals, streams,
 terminal, explorer, and dialogs. Import only its public entry point: the provider,
-shift hooks, shift style, translate view, settled stream inset, and explorer padding
+shift hooks, shift style, translate view, keyboard anchor, settled stream inset, and explorer padding
 policy. Its contexts and reconciliation stay private. Keep `KeyboardShiftProvider`
 at its root mount point outside the portal host when changing dock hosts.
 
@@ -256,11 +255,27 @@ portal geometry, plus the `isMoving` worklet value. It reconciles native
 animation-end events because the controller can retain a nonzero value after
 the keyboard closes.
 
-Measure portal anchors while the dock is at rest. If a popover opens during
-motion, re-measure when `isMoving` settles. `measureInWindow` includes the
-dock's current layout and transform. Snapshot the shift at measurement time and
-apply only the subsequent shift delta to the animated `bottom`. Adding the full
-shift moves the portal twice and can place it over the composer controls.
+Anchor a portal to content inside a `KeyboardTranslateView` with
+`useKeyboardAnchor()`. Read it on the anchor's side of the Portal: the
+translation scope is React context and does not cross it (Gotcha 7). It returns:
+
+- `measureAtRest(element)`: the element's window rect with the keyboard
+  translation left out, or null once the anchor unmounts. Lay the popover out
+  from this rect. It assumes the translate view's parent does not move with the
+  keyboard, which holds for the composer dock.
+- `translation`: spread it onto a `KeyboardTranslateView` inside the Portal, so
+  the popover moves with the anchor on the same driver, including centered
+  clearance and disabled translation.
+- `reservedLift`: the anchor's lift at keyboard boundaries. Bound the popover's
+  height with it; never animate height per frame.
+
+Do not measure an anchor with `measureInWindow` and correct it by the keyboard
+shift. On iOS the translate view uses the native driver, and `measureInWindow`
+includes its transform only when the view happened to re-render since the
+keyboard moved. Both results were observed, so any correction double-lifts the
+popover or leaves it behind the keyboard. `measureAtRest` measures through
+Fabric's transform-free `measureLayout` instead. Re-measure when `isMoving`
+settles; the composer's resting position changes as the draft grows.
 
 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
@@ -273,7 +288,8 @@ not be required to repair the offset.
 
 The generic anchored-overlay rule is:
 
-1. Measure the anchor with `measureInWindow`.
+1. Measure the anchor with `measureInWindow`, or with `measureAtRest` when it
+   moves with the keyboard (Gotcha 3).
 2. Measure the Portal host with `measureFloatingPanelPortalHost(hostName)`.
 3. Position with anchor coordinates relative to the host:
 
@@ -347,10 +363,10 @@ track phase.
 All sheets use the app-wide Gorhom modal provider through `IsolatedBottomSheetModal`, with no
 exceptions: one stack means a sheet opened from any sheet lands on top of it and uncovers it on
 close. This includes native centered dialogs: separate React Native Modals cannot present a
-root-owned sibling dialog over an existing iOS presenter. A sheet that must draw inside a subtree
-(the [sheet tabs](explorer-sidebar.md#sheets) draw inside the compact workspace column so their
-panels read the workspace providers) presents from inside a `SheetHostScope`, which moves the
-portal host and container measurement while the sheet still joins the same stack. That export is
+root-owned sibling dialog over an existing iOS presenter. `SheetHostScope` moves the portal host
+and container measurement while forwarding the same modal queue. Compact
+[workspace sheets](explorer-sidebar.md#sheets) use the app overlay host above both sidebars;
+wide layouts keep local geometry. That export is
 what `patches/@gorhom+bottom-sheet+*.patch` adds.
 
 A sheet whose owner may veto the close (unsaved work) passes `enableDismissOnClose={false}`. Every
@@ -405,8 +421,8 @@ Before you write a new one, ask:
 3. **Is the panel rendered in a Portal host?** Measure the host too. Never use
    raw window coordinates as local Portal coordinates.
 4. **Does the panel sit above something that moves with the keyboard?** If
-   yes, slave a Reanimated transform to the same SharedValue (Gotcha 3).
-   If no, you can probably skip the transform entirely.
+   yes, anchor it with `useKeyboardAnchor()` and wrap it in a
+   `KeyboardTranslateView` with the anchor's translation (Gotcha 3).
 5. **Will the panel's content height vary?** If yes, you need both
    `anchorRect` and `contentSize` for positioning → apply Gotcha 5 (return
    null until anchor, then opacity-0 until contentSize). If no — content has

docs/mobile-testing.md

@@ -53,7 +53,18 @@ hold-to-delete and background-tap dismissal scenario on chat, a workspace draft
 tab, and New workspace. It checks empty-content taps and header taps at the cap
 without changing the input height. Each
 host also opens command/file autocomplete, the model selector, the attachment
-menu, and the forge picker from both keyboard states. It then submits a long
+menu, and the forge picker from both keyboard states. Autocomplete opens with
+the keyboard closed, before the keyboard opens, and after it settles. Each time
+the expected best match must be drawn whole between the header and the composer,
+above the IME frame, and tapping it there must produce the exact composer text.
+Accessibility reports rows behind the keyboard too, so
+`packages/app/e2e/mobile/composer-keyboard/autocomplete-placement.mjs` compares
+bounds. Android leaves the chat and composer out of the accessibility tree while
+suggestions are open, so the composer bounds come from a snapshot with an empty
+input in the same keyboard state. The queries are partial names with known best
+matches: in chat `/mo` finds the mock provider's `/mock` command, in drafts
+`/release` finds this repository's `release-beta` skill for the first Claude model,
+and `@app` finds `packages/app`. It then submits a long
 fixture from each host and checks native stream displacement twice: after the
 response settles, and after returning to the bottom and letting the scrollbar
 fade. The image comparison excludes the scrollbar; keyboard dismissal alone
@@ -64,6 +75,25 @@ Metro, and device through the `PASEO_COMPOSER_KEYBOARD_*` variables in
 `packages/app/e2e/mobile/composer-keyboard/android.sh`. Use a software keyboard;
 the headless input helper cannot verify the
 [visible composer constraints](floating-panels.md#gotcha-3--keyboard-layout-and-portal-anchors).
+To rerun only the autocomplete, model selector, attachment menu, and forge picker
+checks on each host, skipping the chat baseline and the growth, dismissal, and
+stream scenarios:
+
+```bash
+PASEO_COMPOSER_KEYBOARD_SCENARIO=overlays npm run test:e2e:composer-keyboard:android
+```
+
+`node packages/app/e2e/mobile/composer-keyboard/ios.mjs` runs the same
+autocomplete checks on iOS for chat, a workspace draft tab, and New workspace,
+with commands, files, and files under a grown draft. Suggestions open while the
+keyboard opens (`fill` taps and types at once), after it settles, with it closed,
+and before it reopens. `test:e2e:mobile` cannot host this: its `.ad` flows assert
+accessibility state and cannot compare bounds. Run it where `agent-device`
+reaches the simulator, with the development app connected to the fixture host
+and its Claude provider available. Set `PASEO_COMPOSER_KEYBOARD_SERVER_ID`,
+`_AGENT_ID` (an idle mock chat), and `_WORKSPACE_ID` (its workspace); `_DEVICE`,
+`_SESSION`, and `_DRAFT_ID` are optional. Artifacts go to
+`.dev/agent-device-artifacts/composer-keyboard-ios`.
 
 The Android sidebar scroll-retention flow requires a connected host with enough
 workspaces to overflow the compact sidebar. Pass `TOP_WORKSPACE` and

docs/plugins.md

@@ -570,7 +570,7 @@ and resolves conflicts. The host has no bar and no notion of a panel's views: th
 panels own their Preview and Source views, toolbar and editor buffer, and the tab only shows the
 dot a panel sets through `tab.setModified`. Source is the floor for text files no other built-in
 claims, never a candidate beside one. Built-in panels (Markdown, HTML, Image, and Source, Paseo's
-editor) take the same handle as plugin panels, so a fix to reading, watching, or writing lands in one place:
+editor) take exactly `PluginFilePanelProps`, including params and persisted tab state, so a fix to reading, watching, or writing lands in one place:
 `packages/app/src/file-panels/file/`. Do not add a host-side read or loading gate for one panel;
 make that panel faster instead. Source highlights a large file on native in idle-time slices,
 the lines around the opening line first.

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "paseo",
-  "version": "0.13.0-beta.1",
+  "version": "0.13.0-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "paseo",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "workspaces": [
@@ -35695,7 +35695,7 @@
     },
     "packages/app": {
       "name": "@getpaseo/app",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "dependencies": {
         "@codemirror/commands": "6.10.4",
         "@codemirror/language": "6.12.4",
@@ -37961,12 +37961,12 @@
     },
     "packages/cli": {
       "name": "@getpaseo/cli",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "dependencies": {
         "@clack/prompts": "^1.0.0",
-        "@getpaseo/client": "0.13.0-beta.1",
-        "@getpaseo/protocol": "0.13.0-beta.1",
-        "@getpaseo/server": "0.13.0-beta.1",
+        "@getpaseo/client": "0.13.0-beta.2",
+        "@getpaseo/protocol": "0.13.0-beta.2",
+        "@getpaseo/server": "0.13.0-beta.2",
         "chalk": "^5.3.0",
         "commander": "^12.0.0",
         "mime-types": "^2.1.35",
@@ -38213,10 +38213,10 @@
     },
     "packages/client": {
       "name": "@getpaseo/client",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "dependencies": {
-        "@getpaseo/protocol": "0.13.0-beta.1",
-        "@getpaseo/relay": "0.13.0-beta.1",
+        "@getpaseo/protocol": "0.13.0-beta.2",
+        "@getpaseo/relay": "0.13.0-beta.2",
         "ws": "^8.20.0",
         "zod": "^4.4.3"
       },
@@ -38228,7 +38228,7 @@
     },
     "packages/desktop": {
       "name": "@getpaseo/desktop",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@getpaseo/cli": "*",
@@ -38472,7 +38472,7 @@
     },
     "packages/expo-two-way-audio": {
       "name": "@getpaseo/expo-two-way-audio",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "license": "MIT",
       "devDependencies": {
         "@types/jest": "^29.5.14",
@@ -42124,7 +42124,7 @@
     },
     "packages/highlight": {
       "name": "@getpaseo/highlight",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "dependencies": {
         "@codemirror/language": "6.12.4",
         "@codemirror/legacy-modes": "^6.5.3",
@@ -42153,15 +42153,15 @@
     },
     "packages/plugin": {
       "name": "@getpaseo/plugin",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "dependencies": {
         "@agentclientprotocol/sdk": "^1.4.0",
         "i18next": "^26.3.0",
         "use-sync-external-store": "^1.6.0"
       },
       "devDependencies": {
-        "@getpaseo/client": "0.13.0-beta.1",
-        "@getpaseo/protocol": "0.13.0-beta.1",
+        "@getpaseo/client": "0.13.0-beta.2",
+        "@getpaseo/protocol": "0.13.0-beta.2",
         "@types/node": "^20.9.0",
         "@types/react": "~19.2.0",
         "react": "19.2.3",
@@ -42171,8 +42171,8 @@
         "zod": "^4.4.3"
       },
       "peerDependencies": {
-        "@getpaseo/client": "0.13.0-beta.1",
-        "@getpaseo/protocol": "0.13.0-beta.1",
+        "@getpaseo/client": "0.13.0-beta.2",
+        "@getpaseo/protocol": "0.13.0-beta.2",
         "react": ">=19.1.0 <20",
         "react-native": ">=0.81.5",
         "zod": "^4.4.3"
@@ -42194,7 +42194,7 @@
     },
     "packages/protocol": {
       "name": "@getpaseo/protocol",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "dependencies": {
         "semver": "^7.8.5",
         "zod": "^4.4.3"
@@ -42221,7 +42221,7 @@
     },
     "packages/relay": {
       "name": "@getpaseo/relay",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "dependencies": {
         "@noble/ciphers": "^2.4.0",
         "@noble/curves": "^2.4.0",
@@ -42442,16 +42442,16 @@
     },
     "packages/server": {
       "name": "@getpaseo/server",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.17.1",
         "@anthropic-ai/claude-agent-sdk": "0.3.246",
         "@anthropic-ai/sdk": "^0.104.2",
-        "@getpaseo/client": "0.13.0-beta.1",
-        "@getpaseo/highlight": "0.13.0-beta.1",
-        "@getpaseo/plugin": "0.13.0-beta.1",
-        "@getpaseo/protocol": "0.13.0-beta.1",
-        "@getpaseo/relay": "0.13.0-beta.1",
+        "@getpaseo/client": "0.13.0-beta.2",
+        "@getpaseo/highlight": "0.13.0-beta.2",
+        "@getpaseo/plugin": "0.13.0-beta.2",
+        "@getpaseo/protocol": "0.13.0-beta.2",
+        "@getpaseo/relay": "0.13.0-beta.2",
         "@isaacs/ttlcache": "^2.1.4",
         "@modelcontextprotocol/sdk": "1.29.0",
         "@opencode-ai/sdk": "1.14.46",
@@ -43372,7 +43372,7 @@
     },
     "packages/website": {
       "name": "@getpaseo/website",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "dependencies": {
         "@cloudflare/vite-plugin": "^1.29.1",
         "@cloudflare/workers-types": "^4.20260317.1",
@@ -44982,7 +44982,7 @@
     },
     "plugins": {
       "name": "@getpaseo/builtin-plugins",
-      "version": "0.13.0-beta.1",
+      "version": "0.13.0-beta.2",
       "dependencies": {
         "@getpaseo/plugin": "*",
         "zod": "^4.4.3"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo",
-  "version": "0.13.0-beta.1",
+  "version": "0.13.0-beta.2",
   "private": true,
   "description": "Paseo: voice-controlled development environment for local AI coding agents",
   "keywords": [

packages/app/e2e/browser/add-project-flow.spec.ts

@@ -420,3 +420,40 @@ test.describe("Add Project command-center flow", () => {
     }
   });
 });
+
+test.describe("Compact Add project context", () => {
+  test.use({ viewport: { width: 390, height: 844 } });
+  test("canceling Add project preserves the sidebar", async ({ page }) => {
+    await gotoAppShell(page);
+    await page.getByRole("button", { name: "Open menu", exact: true }).click();
+    await openAddProjectFlow(page);
+    await page.keyboard.press("Escape");
+    await expect(addProjectFlow(page)).not.toBeVisible();
+    await expect(page.getByRole("button", { name: "Close menu", exact: true })).toHaveAttribute(
+      "aria-expanded",
+      "true",
+    );
+    await expect(page.getByTestId("sidebar-search")).toBeVisible();
+  });
+  test("successful Add project reveals the new workspace page", async ({
+    page,
+    projectPickerFixture,
+  }) => {
+    await gotoAppShell(page);
+    await page.getByRole("button", { name: "Open menu", exact: true }).click();
+    await openAddProjectFlow(page);
+    await chooseAddProjectMethod(page, "directory-search");
+    await addProjectFlowInput(page).fill(projectPickerFixture.fuzzyQuery);
+    await expect(addProjectFlow(page)).toContainText(projectPickerFixture.projectName);
+    await page.keyboard.press("Enter");
+    const projectId = await expectOpenedProject(page, projectPickerFixture.projectName);
+    projectPickerFixture.rememberProjectId(projectId);
+    await expectNewWorkspaceForAddedProject(page, {
+      serverId: getServerId(),
+      projectId,
+      projectName: projectPickerFixture.projectName,
+      projectPath: projectPickerFixture.projectPath,
+    });
+    await expect(page.getByRole("button", { name: "Open menu", exact: true })).toBeVisible();
+  });
+});

packages/app/e2e/browser/command-center-file-search.spec.ts

@@ -2,11 +2,17 @@ import { expect, test } from "../support/fixtures";
 import { openCommandCenter } from "../support/helpers/command-center";
 import {
   delayDirectorySuggestionResponses,
+  holdDirectorySuggestionResponses,
   expectOneLineTruncatedFileResult,
   expectStableCommandCenterLayout,
   failDirectorySuggestionRequests,
   startCommandCenterLayoutObservation,
 } from "../support/helpers/command-center-file-search";
+import {
+  scrollCommandCenterAwayFromSelection,
+  expectCommandCenterScrollToStayAt,
+  expectKeyboardNavigationToResume,
+} from "../support/helpers/command-center-scroll";
 import { expectFileTabOpen } from "../support/helpers/file-explorer";
 import { gotoWorkspace } from "../support/helpers/launcher";
 import { seedWorkspace, type SeededWorkspace } from "../support/helpers/seed-client";
@@ -137,3 +143,94 @@ test("unscoped command search keeps commands visible and reports file-search fai
     await Promise.allSettled(seeded.map((workspace) => workspace.cleanup()));
   }
 });
+
+test("manual scrolling cancels a pending file-search reveal and query editing restores it", async ({
+  page,
+}) => {
+  const seeded = await seedWorkspace({
+    repoPrefix: "command-center-delayed-scroll-",
+    title: "Delayed file search scroll",
+    repo: { files: paseoSizedFiles() },
+  });
+  try {
+    const responses = await holdDirectorySuggestionResponses(page);
+    await gotoWorkspace(page, seeded.workspaceId);
+    await page.keyboard.press("Meta+P");
+    const panel = page.getByTestId("command-center-panel");
+    await expect(panel).toBeVisible();
+    await panel.getByTestId("command-center-input").fill("index");
+    await expect(panel.getByTestId("command-center-file-search-loading")).toBeHidden();
+    await expect(
+      panel.getByRole("button", {
+        name: "index.ts packages/app/src/features/feature-000",
+        exact: true,
+      }),
+    ).toBeVisible();
+
+    responses.hold();
+    await panel.getByTestId("command-center-input").fill("index.");
+    await expect(panel.getByTestId("command-center-file-search-loading")).toBeVisible();
+    const offset = await scrollCommandCenterAwayFromSelection(page, panel);
+    await responses.release();
+    await expect(panel.getByTestId("command-center-file-search-loading")).toBeHidden();
+    await expectCommandCenterScrollToStayAt(panel, offset);
+    await expectKeyboardNavigationToResume(page, panel, offset);
+
+    const nextOffset = await scrollCommandCenterAwayFromSelection(page, panel);
+    await panel.getByTestId("command-center-input").fill("index.ts");
+    await expect(panel.getByTestId("command-center-file-search-loading")).toBeHidden();
+    await expect
+      .poll(() => panel.getByTestId("command-center-results").evaluate((el) => el.scrollTop))
+      .toBeLessThan(nextOffset);
+    await expect(
+      panel.getByRole("button", {
+        name: "index.ts packages/app/src/features/feature-000",
+        exact: true,
+      }),
+    ).toBeInViewport({ ratio: 1 });
+    await page.keyboard.press("Escape");
+    await page.keyboard.press("Meta+P");
+    await expect(panel.getByTestId("command-center-input")).toHaveValue("");
+    await panel.getByTestId("command-center-input").fill("index");
+    await expect(
+      panel.getByRole("button", {
+        name: "index.ts packages/app/src/features/feature-000",
+        exact: true,
+      }),
+    ).toBeInViewport({ ratio: 1 });
+  } finally {
+    await seeded.cleanup();
+  }
+});
+
+test.describe("Compact file search context", () => {
+  test.use({ viewport: { width: 390, height: 844 } });
+  test("a file result opens a sheet above the left sidebar", async ({ page }) => {
+    const seeded = await seedWorkspace({
+      repoPrefix: "compact-search-file-",
+      title: "Compact file lookup",
+      repo: { files: [{ path: "lookup.ts", content: "export const lookup = true;\n" }] },
+    });
+    try {
+      await page.goto(`/h/${process.env.E2E_SERVER_ID}/workspace/${seeded.workspaceId}`);
+      await page.getByRole("button", { name: "Open menu", exact: true }).click();
+      const search = await openCommandCenter(page);
+      await search.getByTestId("command-center-input").fill("lookup.ts");
+      await search.getByRole("button", { name: "lookup.ts", exact: true }).click();
+      await expect(page.getByTestId("sheet-tab-body")).toBeVisible();
+      await expect(page.getByTestId("sheet-tab-header")).toContainText("lookup.ts");
+      await page
+        .getByTestId("sheet-tab-header")
+        .getByRole("button", { name: "Close", exact: true })
+        .click();
+      await expect(page.getByTestId("sheet-tab-body")).not.toBeVisible();
+      await expect(page.getByRole("button", { name: "Close menu", exact: true })).toHaveAttribute(
+        "aria-expanded",
+        "true",
+      );
+      await expect(page.getByTestId("sidebar-search")).toBeVisible();
+    } finally {
+      await seeded.cleanup();
+    }
+  });
+});

packages/app/e2e/browser/command-center-scroll.spec.ts

@@ -1,7 +1,21 @@
+import { expect } from "@playwright/test";
 import { test } from "../support/fixtures";
+import { getServerId } from "../support/helpers/server-id";
+import {
+  seedSearchableCommandCenter,
+  observeCommandCenterRowRenders,
+  searchCommandCenter,
+  warmCommandCenterRows,
+  expectOnlyCommandCenterRowRendered,
+  expectCommandCenterAgentWindow,
+  scrollToOldestCommandCenterAgent,
+} from "../support/helpers/command-center-performance";
 import { gotoAppShell } from "../support/helpers/app";
 import {
   expectCommandCenterToRemainAtTheTop,
+  scrollCommandCenterAwayFromSelection,
+  expectCommandCenterScrollToStayAt,
+  expectKeyboardNavigationToResume,
   expectPrimaryCommandCenterActions,
   expectTightTwoLineResultSpacing,
   expectVisibleKeyboardNavigationNotToScroll,
@@ -16,12 +30,15 @@ test.use({
     "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 Chrome/145.0 Safari/537.36",
 });
 
-test("opening the command center keeps its first result fully visible", async ({ page }) => {
+test("Command Center preserves manual scrolling through live updates and resumes keyboard navigation", async ({
+  page,
+}) => {
   const seeded = await seedWorkspace({
     repoPrefix: "command-center-scroll-",
     title: "Command Center Scroll 00",
   });
 
+  let newestWorkspaceId = seeded.workspaceId;
   try {
     for (let index = 1; index <= 8; index += 1) {
       const created = await seeded.client.createWorkspace({
@@ -36,6 +53,7 @@ test("opening the command center keeps its first result fully visible", async ({
       if (!created.workspace) {
         throw new Error(created.error ?? `Failed to seed workspace ${index}`);
       }
+      newestWorkspaceId = created.workspace.id;
     }
 
     await gotoAppShell(page);
@@ -48,6 +66,52 @@ test("opening the command center keeps its first result fully visible", async ({
     // The empty query lists the most recent workspaces, so the last one seeded leads it.
     await expectTightTwoLineResultSpacing(panel, "Command Center Scroll 08");
     await expectWorkspaceResultsToBeLimitedUntilSearch(panel);
+    const offset = await scrollCommandCenterAwayFromSelection(page, panel);
+    await seeded.client.setWorkspaceTitle(newestWorkspaceId, "Command Center Scroll renamed");
+    await expect(panel.getByText("Command Center Scroll renamed", { exact: true })).toHaveCount(1);
+    await expectCommandCenterScrollToStayAt(panel, offset);
+    await expectKeyboardNavigationToResume(page, panel, offset);
+  } finally {
+    await seeded.cleanup();
+  }
+});
+
+test("live search updates render only the changed row and keep agents virtualized", async ({
+  page,
+}) => {
+  test.setTimeout(120_000);
+  const seeded = await seedSearchableCommandCenter();
+  try {
+    await observeCommandCenterRowRenders(page);
+    await gotoAppShell(page);
+    const panel = await openCommandCenterWithKeyboard(page);
+    await searchCommandCenter(panel, "Search agent");
+    await expect(panel.getByText("Search agent 059", { exact: true })).toBeVisible();
+    await warmCommandCenterRows(page);
+    await expectCommandCenterAgentWindow(panel, seeded.agents.length);
+
+    await seeded.client.updateAgent(seeded.agents[59].id, { name: "Search agent 059 revised" });
+    await expect(panel.getByText("Search agent 059 revised", { exact: true })).toBeVisible();
+    await expectOnlyCommandCenterRowRendered(
+      page,
+      `agent:${getServerId()}:${seeded.agents[59].id}`,
+    );
+
+    await searchCommandCenter(panel, "Search workspace");
+    await expect(panel.getByText("Search workspace 039", { exact: true })).toBeVisible();
+    await warmCommandCenterRows(page);
+    await seeded.client.setWorkspaceTitle(seeded.workspaces[39].id, "Search workspace 039 revised");
+    await expect(panel.getByText("Search workspace 039 revised", { exact: true })).toBeVisible();
+    await expectOnlyCommandCenterRowRendered(
+      page,
+      `workspace:${getServerId()}:${seeded.workspaces[39].id}`,
+    );
+
+    await searchCommandCenter(panel, "Search agent");
+    await warmCommandCenterRows(page);
+    await scrollToOldestCommandCenterAgent(panel);
+    await expect(panel.getByText("Search agent 000", { exact: true })).toBeVisible();
+    await expectCommandCenterAgentWindow(panel, seeded.agents.length);
   } finally {
     await seeded.cleanup();
   }

packages/app/e2e/browser/command-center-workspaces.spec.ts

@@ -9,6 +9,7 @@ import { addOfflineHostAndReload } from "../support/helpers/hosts";
 import { expectAppRoute } from "../support/helpers/route-assertions";
 import { seedWorkspace } from "../support/helpers/seed-client";
 import { getServerId } from "../support/helpers/server-id";
+import { seedRunningMockAgentWorkspace, openAgentRoute } from "../support/helpers/mock-agent";
 import { buildHostWorkspaceRoute } from "@/utils/host-routes";
 
 const PRIMARY_HOST_LABEL = "Primary Host";
@@ -20,6 +21,34 @@ const AGENT_TITLE = "Fix checkout retries";
 test.describe("Command center workspaces", () => {
   test.describe.configure({ timeout: 180_000 });
 
+  test("agent and workspace results retain their icons and overlay live status", async ({
+    page,
+  }) => {
+    const workspace = await seedRunningMockAgentWorkspace({
+      repoPrefix: "command-center-status-",
+      title: "Review checkout retries",
+      model: "five-minute-stream",
+      initialPrompt: "Keep working on checkout retries",
+    });
+    try {
+      await openAgentRoute(page, workspace);
+      await expectAgentTabActive(page, workspace.agentId);
+      const panel = await openCommandCenter(page);
+      const agent = panel.getByTestId(`command-center-agent-${getServerId()}:${workspace.agentId}`);
+      const row = panel.getByTestId(
+        `command-center-workspace-${getServerId()}:${workspace.workspaceId}`,
+      );
+      await expect(agent.getByRole("progressbar", { name: "Agent running" })).toBeVisible();
+      await expect(row.getByRole("progressbar", { name: "Agent running" })).toBeVisible();
+      await expect(agent.getByRole("img", { name: "Mock agent" })).toBeVisible();
+      await workspace.client.cancelAgent(workspace.agentId);
+      await expect(agent.getByRole("progressbar")).toHaveCount(0);
+      await expect(row.getByRole("progressbar")).toHaveCount(0);
+    } finally {
+      await workspace.cleanup();
+    }
+  });
+
   test("workspace results show their title, host, and branch and open the workspace", async ({
     page,
   }) => {
@@ -156,3 +185,74 @@ test.describe("Command center workspaces", () => {
     }
   });
 });
+
+test.describe("Compact sidebar inspection", () => {
+  test.use({ viewport: { width: 390, height: 844 } });
+
+  async function openSidebar(page: import("@playwright/test").Page) {
+    await page.getByRole("button", { name: "Open menu", exact: true }).click();
+    await expect(page.getByTestId("sidebar-search")).toBeVisible();
+  }
+
+  async function expectSidebarPreserved(page: import("@playwright/test").Page) {
+    await expect(page.getByRole("button", { name: "Close menu", exact: true })).toHaveAttribute(
+      "aria-expanded",
+      "true",
+    );
+    await expect(page.getByTestId("sidebar-search")).toBeVisible();
+  }
+
+  test("canceling Search retains the compact sidebar", async ({ page }) => {
+    await gotoAppShell(page);
+    await openSidebar(page);
+    await openCommandCenter(page);
+    await page.keyboard.press("Escape");
+    await expect(page.getByTestId("command-center-panel")).not.toBeVisible();
+    await expectSidebarPreserved(page);
+  });
+  test("canceling Import session retains the compact sidebar", async ({ page }) => {
+    await gotoAppShell(page);
+    await openSidebar(page);
+    await page
+      .getByTestId("sidebar-project-empty-state")
+      .getByRole("button", { name: "Import session", exact: true })
+      .click();
+    await expect(page.getByTestId("import-session-sheet")).toBeVisible();
+    await page.getByRole("button", { name: "Close", exact: true }).click();
+    await expect(page.getByTestId("import-session-sheet")).not.toBeVisible();
+    await expectSidebarPreserved(page);
+  });
+
+  test("Search reveals the same workspace and a selected root agent", async ({ page }) => {
+    const seeded = await seedWorkspace({
+      repoPrefix: "compact-search-destination-",
+      title: "Compact destination",
+    });
+    try {
+      const agent = await createIdleAgent(seeded.client, {
+        cwd: seeded.repoPath,
+        workspaceId: seeded.workspaceId,
+        title: "Compact root agent",
+      });
+      await page.goto(buildHostWorkspaceRoute(getServerId(), seeded.workspaceId));
+      await openSidebar(page);
+      const search = await openCommandCenter(page);
+      await search.getByTestId("command-center-input").fill("Compact destination");
+      await search
+        .getByTestId(`command-center-workspace-${getServerId()}:${seeded.workspaceId}`)
+        .click();
+      await expect(page.getByRole("button", { name: "Open menu", exact: true })).toBeVisible();
+      await expectAppRoute(page, buildHostWorkspaceRoute(getServerId(), seeded.workspaceId));
+      await openSidebar(page);
+      const agentSearch = await openCommandCenter(page);
+      await agentSearch.getByTestId("command-center-input").fill("Compact root agent");
+      await agentSearch.getByTestId(`command-center-agent-${getServerId()}:${agent.id}`).click();
+      await expect(page.getByRole("button", { name: "Open menu", exact: true })).toBeVisible();
+      await expect(
+        page.getByRole("textbox", { name: "Message agent...", exact: true }),
+      ).toBeVisible();
+    } finally {
+      await seeded.cleanup();
+    }
+  });
+});

packages/app/e2e/browser/import-session-flow.spec.ts

@@ -182,6 +182,7 @@ test("captures the compact import-session journey", async ({ page }, testInfo) =
   await test.step("the selected row imports and opens the hydrated transcript", async () => {
     await flow.importSession(scenario.importSessionId);
     await flow.expectTranscript("Review the invoice migration", "The fixture transcript is ready.");
+    await expect(page.getByRole("button", { name: "Open menu", exact: true })).toBeVisible();
     await capture(page, testInfo, "08-mobile-agent-after-import.png");
   });
 

packages/app/e2e/browser/plugin-file-panel-examples.spec.ts

@@ -105,6 +105,17 @@ async function selectFileView(page: Page, view: "Preview" | "Source") {
   await expect(option).toHaveAttribute("aria-selected", "true");
 }
 
+async function rememberMarkdownViewAcrossReload(page: Page, view: "Preview" | "Source") {
+  const button = page.getByRole("button", { name: `Rich Markdown ${view}`, exact: true });
+  await button.click();
+  await page.reload();
+  if (view === "Source") {
+    await expectMarkdownEditor(page, "Edited by Rich Markdown");
+  } else {
+    await expect(page.getByRole("heading", { name: "Edited by Rich Markdown" })).toBeVisible();
+  }
+}
+
 /** The browser's PDF viewer in the mounted frame; a remounted pane leaves old frames detached. */
 async function pdfViewer(page: Page): Promise<Frame> {
   const viewerUrl = /^chrome-extension:\/\/[^/]+\/index\.html$/;
@@ -220,6 +231,9 @@ test("directory examples mount the PDF frame and write Markdown through the file
       await expectMarkdownEditor(page, "Edited by Rich Markdown");
     });
 
+    await rememberMarkdownViewAcrossReload(page, "Preview");
+    await rememberMarkdownViewAcrossReload(page, "Source");
+
     // "Open with…" switches to Paseo's Markdown panel; its Source view is the editor, with the
     // cursor and vim mode in the panel's toolbar.
     await openWithFromTabMenu(page, "notes.md", "Markdown — Paseo");

packages/app/e2e/browser/sidebar-nav-settings.spec.ts

@@ -6,6 +6,7 @@ import {
   claudeAndCodexReports,
   expectPinnedUsage,
   openCompactSidebar,
+  expectCompactSidebarOpen,
 } from "../support/helpers/usage-sidebar-item";
 import { gotoAppShell } from "../support/helpers/app";
 import { SHOWCASE_PLUGIN_ID, installSidebarPlugins } from "../support/helpers/plugin-sidebar-items";
@@ -90,12 +91,13 @@ test("fixed footer line keeps its five icons, Help and Settings at the end", asy
   await openAddProjectFlow(page);
   await page.keyboard.press("Escape");
   await expect(addProjectFlow(page)).toBeHidden();
+  await expectCompactSidebarOpen(page);
   await page.setViewportSize({ width: 1440, height: 900 });
   await openSidebarNavSettings(page);
   await setFooterItemVisible(page, "usage", true);
   await leaveSettings(page);
   await page.setViewportSize({ width: 390, height: 844 });
-  await openCompactSidebar(page);
+  await expectCompactSidebarOpen(page);
   await expectFooterSeparator(page, true);
   await expectFooterIconRow(page);
   await footerScreenshot(page, "footer-compact-with-rows");

packages/app/e2e/browser/sidebar-workspace-mark-unread.spec.ts

@@ -180,6 +180,7 @@ async function addFinishedAgent(workspace: MockAgentWorkspace) {
 async function openCompactWorkspace(page: Page, workspace: MockAgentWorkspace) {
   await page.setViewportSize({ width: 390, height: 844 });
   await openAgentRoute(page, workspace);
+  await expect(page.getByText("Finish this turn.", { exact: true })).toBeVisible();
   await openMobileAgentSidebar(page);
 }
 

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

@@ -19,6 +19,13 @@ 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(" "))')"
 BLANK_LINE_DRAFT="$(node -e 'process.stdout.write("\n".repeat(22) + "ddjdj")')"
 AGENT_TITLE="Keyboard dismiss QA $(date +%s)"
+# `overlays` runs only each host's autocomplete, model selector, attachment menu, and
+# forge picker checks; `all` also runs the chat baseline and the full host scenario.
+SCENARIO="${PASEO_COMPOSER_KEYBOARD_SCENARIO:-all}"
+if [[ "${SCENARIO}" != all && "${SCENARIO}" != overlays ]]; then
+  echo "PASEO_COMPOSER_KEYBOARD_SCENARIO must be all or overlays" >&2
+  exit 1
+fi
 
 if [[ -z "${SERVER_ID}" ]]; then
   if [[ ! -f "${DAEMON_HOME}/server-id" ]]; then
@@ -173,8 +180,10 @@ sleep 3
 
 # Create the fixture while the client is connected so its directory replica observes the insert.
 ad wait 'id="message-input-root"' 90000
+# The compact header names the workspace, not the agent, so the chat waits below find
+# the fixture by its prompt bubble.
 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" \
+  npm run --silent cli -- run "${AGENT_TITLE}" \
   --background \
   --title "${AGENT_TITLE}" \
   --provider mock \
@@ -206,238 +215,241 @@ 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"
-)
+# Chat-only invariants, then the long-draft checks on New workspace.
+run_chat_baseline() {
+  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
+  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
+  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"
+  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}"
+  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"
+  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))"
+  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)"
-display_density="$(adb shell wm density | awk '/density:/ { density = $NF } END { print density }')"
-node "${ASSERT}" xml-composer-contained \
-  "${ARTIFACTS_DIR}/long-draft-keyboard-open.xml" \
-  "$(read_ime_top)" \
-  "${display_density}"
-# Emptying a capped blank-line draft with Gboard's hold-to-delete must return the input to
-# its baseline height. Fabric only re-measures the Android input when its text prop changes,
-# so the editing input renders again after every edit
-# (packages/app/src/components/ui/text-input/text-input.native.tsx). The sequence mirrors the
-# report: grow to the cap, close and reopen the keyboard, hold delete from the middle of the
-# draft, jump to the end, hold delete again. The first hold-delete must start mid-draft: from
-# the end, the pre-fix input also returns to baseline. Backspace sits on Gboard's third key
-# row on the paseo-api35 layout.
-adb shell ime set "${HELPER_IME}" >/dev/null
-ad fill 'editable=true' "${BLANK_LINE_DRAFT}" --settle
-open_gboard "${input_x}" "${input_y}"
-adb shell input keyevent BACK
-wait_for_ime false
-open_gboard "${input_x}" "${input_y}"
-adb shell input keycombination 113 122
-adb shell input keyevent 20 20 20 20 20 20 20 20
-screen_width="$(adb shell wm size | sed -n 's/.*: \([0-9]*\)x.*/\1/p' | tail -1)"
-backspace_x="$((screen_width - 85))"
-backspace_y="$(($(read_ime_top) + 507))"
-adb shell input swipe "${backspace_x}" "${backspace_y}" "${backspace_x}" "${backspace_y}" 8000
-adb shell input keycombination 113 123
-adb shell input swipe "${backspace_x}" "${backspace_y}" "${backspace_x}" "${backspace_y}" 12000
-adb shell ime set "${HELPER_IME}" >/dev/null
-ad wait 'label="Message, @files, /commands"' 10000
-snapshot_json "${ARTIFACTS_DIR}/after-hold-delete.json"
-node "${ASSERT}" same-input-height \
-  "${ARTIFACTS_DIR}/baseline.json" \
-  "${ARTIFACTS_DIR}/after-hold-delete.json"
+  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)"
+  display_density="$(adb shell wm density | awk '/density:/ { density = $NF } END { print density }')"
+  node "${ASSERT}" xml-composer-contained \
+    "${ARTIFACTS_DIR}/long-draft-keyboard-open.xml" \
+    "$(read_ime_top)" \
+    "${display_density}"
+  # Emptying a capped blank-line draft with Gboard's hold-to-delete must return the input to
+  # its baseline height. Fabric only re-measures the Android input when its text prop changes,
+  # so the editing input renders again after every edit
+  # (packages/app/src/components/ui/text-input/text-input.native.tsx). The sequence mirrors the
+  # report: grow to the cap, close and reopen the keyboard, hold delete from the middle of the
+  # draft, jump to the end, hold delete again. The first hold-delete must start mid-draft: from
+  # the end, the pre-fix input also returns to baseline. Backspace sits on Gboard's third key
+  # row on the paseo-api35 layout.
+  adb shell ime set "${HELPER_IME}" >/dev/null
+  ad fill 'editable=true' "${BLANK_LINE_DRAFT}" --settle
+  open_gboard "${input_x}" "${input_y}"
+  adb shell input keyevent BACK
+  wait_for_ime false
+  open_gboard "${input_x}" "${input_y}"
+  adb shell input keycombination 113 122
+  adb shell input keyevent 20 20 20 20 20 20 20 20
+  screen_width="$(adb shell wm size | sed -n 's/.*: \([0-9]*\)x.*/\1/p' | tail -1)"
+  backspace_x="$((screen_width - 85))"
+  backspace_y="$(($(read_ime_top) + 507))"
+  adb shell input swipe "${backspace_x}" "${backspace_y}" "${backspace_x}" "${backspace_y}" 8000
+  adb shell input keycombination 113 123
+  adb shell input swipe "${backspace_x}" "${backspace_y}" "${backspace_x}" "${backspace_y}" 12000
+  adb shell ime set "${HELPER_IME}" >/dev/null
+  ad wait 'label="Message, @files, /commands"' 10000
+  snapshot_json "${ARTIFACTS_DIR}/after-hold-delete.json"
+  node "${ASSERT}" same-input-height \
+    "${ARTIFACTS_DIR}/baseline.json" \
+    "${ARTIFACTS_DIR}/after-hold-delete.json"
 
-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)"
+  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
+  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 "${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}"
+  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}"
+  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
+  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
 
-ad press 'id="menu-button"' --settle
-ad press 'id="sidebar-global-new-workspace"' --settle
-ad wait 'id="workspace-create-submit"' 10000
-adb shell ime set "${HELPER_IME}" >/dev/null
-ad fill 'editable=true' "x" --settle
-snapshot_json "${ARTIFACTS_DIR}/new-workspace-short-draft.json"
-read -r new_input_x new_input_y _ < <(
-  node "${ASSERT}" rect "${ARTIFACTS_DIR}/new-workspace-short-draft.json" "editable"
-)
-open_gboard "${new_input_x}" "${new_input_y}"
-capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-short-draft-keyboard-open.xml"
-# Typing more lines moves the setup fields up with the composer instead of
-# hiding their bottom rows behind it.
-adb shell input keycombination 113 123
-adb shell input keyevent 66 66 66
-adb shell input text grown
-sleep 1
-capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-grown-draft-keyboard-open.xml"
-capture_screen "${ARTIFACTS_DIR}/new-workspace-grown-draft-keyboard-open.png"
-node "${ASSERT}" xml-fields-follow-growth \
-  "${ARTIFACTS_DIR}/new-workspace-short-draft-keyboard-open.xml" \
-  "${ARTIFACTS_DIR}/new-workspace-grown-draft-keyboard-open.xml"
+  ad press 'id="menu-button"' --settle
+  ad press 'id="sidebar-global-new-workspace"' --settle
+  ad wait 'id="workspace-create-submit"' 10000
+  adb shell ime set "${HELPER_IME}" >/dev/null
+  ad fill 'editable=true' "x" --settle
+  snapshot_json "${ARTIFACTS_DIR}/new-workspace-short-draft.json"
+  read -r new_input_x new_input_y _ < <(
+    node "${ASSERT}" rect "${ARTIFACTS_DIR}/new-workspace-short-draft.json" "editable"
+  )
+  open_gboard "${new_input_x}" "${new_input_y}"
+  capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-short-draft-keyboard-open.xml"
+  # Typing more lines moves the setup fields up with the composer instead of
+  # hiding their bottom rows behind it.
+  adb shell input keycombination 113 123
+  adb shell input keyevent 66 66 66
+  adb shell input text grown
+  sleep 1
+  capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-grown-draft-keyboard-open.xml"
+  capture_screen "${ARTIFACTS_DIR}/new-workspace-grown-draft-keyboard-open.png"
+  node "${ASSERT}" xml-fields-follow-growth \
+    "${ARTIFACTS_DIR}/new-workspace-short-draft-keyboard-open.xml" \
+    "${ARTIFACTS_DIR}/new-workspace-grown-draft-keyboard-open.xml"
 
-adb shell ime set "${HELPER_IME}" >/dev/null
-ad fill 'editable=true' "${LONG_MESSAGE}" --settle
-snapshot_json "${ARTIFACTS_DIR}/new-workspace-long-draft.json"
-read -r new_input_x new_input_y new_input_height < <(
-  node "${ASSERT}" rect "${ARTIFACTS_DIR}/new-workspace-long-draft.json" "editable"
-)
-# The editor shrinks when the keyboard opens. Its bottom stays anchored, while
-# its old center can move into the setup fields after the height constraint.
-new_input_y="$((new_input_y + new_input_height / 2 - 8))"
-open_gboard "${new_input_x}" "${new_input_y}"
-capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.xml"
-capture_screen "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.png"
-node "${ASSERT}" xml-composer-contained \
-  "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.xml" \
-  "$(read_ime_top)" \
-  "${display_density}"
+  adb shell ime set "${HELPER_IME}" >/dev/null
+  ad fill 'editable=true' "${LONG_MESSAGE}" --settle
+  snapshot_json "${ARTIFACTS_DIR}/new-workspace-long-draft.json"
+  read -r new_input_x new_input_y new_input_height < <(
+    node "${ASSERT}" rect "${ARTIFACTS_DIR}/new-workspace-long-draft.json" "editable"
+  )
+  # The editor shrinks when the keyboard opens. Its bottom stays anchored, while
+  # its old center can move into the setup fields after the height constraint.
+  new_input_y="$((new_input_y + new_input_height / 2 - 8))"
+  open_gboard "${new_input_x}" "${new_input_y}"
+  capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.xml"
+  capture_screen "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.png"
+  node "${ASSERT}" xml-composer-contained \
+    "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.xml" \
+    "$(read_ime_top)" \
+    "${display_density}"
 
-# Dismissing the keyboard moves the composer down at its editing height and
-# brings the setup fields back fully visible above it.
-adb shell input keyevent BACK
-wait_for_ime false
-capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.xml"
-capture_screen "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.png"
-node "${ASSERT}" same-input-height \
-  "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.xml" \
-  "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.xml"
-node "${ASSERT}" xml-fields-above-composer \
-  "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.xml"
+  # Dismissing the keyboard moves the composer down at its editing height and
+  # brings the setup fields back fully visible above it.
+  adb shell input keyevent BACK
+  wait_for_ime false
+  capture_ui_xml "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.xml"
+  capture_screen "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.png"
+  node "${ASSERT}" same-input-height \
+    "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-open.xml" \
+    "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.xml"
+  node "${ASSERT}" xml-fields-above-composer \
+    "${ARTIFACTS_DIR}/new-workspace-long-draft-keyboard-closed.xml"
+}
 
 # All hosts run the same scenario; only navigation differs.
 # For the shared scenario, tap the editor's blank right edge once. Tapping
@@ -470,20 +482,80 @@ press_composer_control() {
   adb shell input tap "${x}" "${y}"
 }
 
+# Opens suggestions with the keyboard closed, before it opens, or after it settled;
+# checks their bounds and taps the best match where it is drawn. Accessibility keeps
+# reporting rows behind the keyboard, so existence is not evidence. It also drops the
+# composer while suggestions are open, so the composer bounds come from a reference
+# snapshot with an empty input in the keyboard state the suggestions are checked in.
+check_autocomplete() {
+  local host="$1" order="$2" kind="$3" query="$4" expected="$5" inserted="$6"
+  local prefix="${ARTIFACTS_DIR}/${host}-${kind}-${order}"
+  if [[ "${order}" == keyboard-closed ]]; then
+    prepare_composer closed
+    snapshot_json "${prefix}-reference.json"
+    adb shell input text "${query}"
+  else
+    prepare_composer open
+    # The composer follows the keyboard animation, which ends after the IME frame settles.
+    sleep 1
+    snapshot_json "${prefix}-reference.json"
+    if [[ "${order}" == before-keyboard ]]; then
+      adb shell ime set "${HELPER_IME}" >/dev/null
+      wait_for_ime false
+      adb shell input text "${query}"
+      open_editor_keyboard "${overlay_x}" "${overlay_y}"
+    else
+      adb shell input text "${query}"
+    fi
+  fi
+  ad wait 'id="composer-autocomplete-popover"' 10000
+  # The popover remeasures once keyboard motion settles.
+  sleep 1
+  capture_screen "${prefix}.png"
+  snapshot_json "${prefix}.json"
+  local ime_top=""
+  if [[ "${order}" != keyboard-closed ]]; then ime_top="$(read_ime_top)"; fi
+  local best_x best_y
+  read -r best_x best_y < <(
+    node "${ASSERT}" autocomplete-best "${prefix}.json" "${prefix}-reference.json" "${expected}" "${ime_top}"
+  )
+  adb shell input tap "${best_x}" "${best_y}"
+  sleep 1
+  snapshot_json "${prefix}-selected.json"
+  node "${ASSERT}" composer-text "${prefix}-selected.json" "${inserted}"
+  clear_focused_input_with_adb
+  echo "PASS host=${host}: ${kind} ${order}, ${expected} drawn above composer and keyboard and inserted"
+}
+
+# Drafts list commands for their selected provider, and a fresh install selects none.
+select_claude_model() {
+  local x y h
+  press_composer_control combined-model-selector
+  ad wait 'id="agent-controls-model"' 10000
+  ad press 'id="agent-controls-model"' --settle
+  ad press 'id="model-provider-claude"' --settle
+  snapshot_json "${ARTIFACTS_DIR}/model-list.json"
+  read -r x y h < <(node "${ASSERT}" rect "${ARTIFACTS_DIR}/model-list.json" 'model-row-claude-*')
+  adb shell input tap "${x}" "${y}"
+  ad wait 'id="agent-controls-thinking"' 10000
+  ad press 'label="Close"' --settle
+}
+
 run_host_overlays() {
   local host="$1"
+  if [[ "${host}" != chat ]]; then
+    prepare_composer closed
+    select_claude_model
+  fi
+  # Chat lists the mock provider's command; drafts list the release skills in
+  # this repository's .claude/skills for the selected Claude model.
+  local command_query=/release command_match=/release-beta command_inserted="/release-beta "
+  if [[ "${host}" == chat ]]; then command_query=/mo command_match=/mock command_inserted="/mock "; fi
+  for order in keyboard-closed before-keyboard after-keyboard; do
+    check_autocomplete "${host}" "${order}" commands "${command_query}" "${command_match}" "${command_inserted}"
+    check_autocomplete "${host}" "${order}" files @app packages/app '"packages/app"'
+  done
   for mode in closed open; do
-    for query in / @README; do
-      prepare_composer closed
-      adb shell input text "${query}"
-      if [[ "${mode}" == open ]]; then open_editor_keyboard "${overlay_x}" "${overlay_y}"; fi
-      ad wait 'id="composer-autocomplete-popover"' 10000
-      local kind=commands
-      if [[ "${query}" == @* ]]; then kind=files; fi
-      capture_screen "${ARTIFACTS_DIR}/${host}-${kind}-${mode}.png"
-      clear_focused_input_with_adb
-      echo "PASS host=${host}: ${kind} popover keyboard=${mode}"
-    done
     prepare_composer "${mode}"
     press_composer_control combined-model-selector
     ad wait 'id="compact-provider-list"' 10000
@@ -656,19 +728,29 @@ run_host_scenario() {
   run_host_scroll "${host}"
 }
 
+run_host() {
+  if [[ "${SCENARIO}" == overlays ]]; then
+    run_host_overlays "$1"
+  else
+    run_host_scenario "$1"
+  fi
+}
+
+if [[ "${SCENARIO}" == all ]]; then run_chat_baseline; fi
 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}\"" 10000
-run_host_scenario chat
+run_host chat
 ad keyboard dismiss || true
 ad press 'id="workspace-tab-switcher-trigger"' --settle
 ad wait 'id="workspace-tab-switcher-new-agent"' 10000
 ad press 'id="workspace-tab-switcher-new-agent"' --settle
-ad wait 'text="New Agent"' 10000
-run_host_scenario workspace-draft
+# Only a draft offers to import a session.
+ad wait 'id="composer-import-agent-pill"' 10000
+run_host workspace-draft
 ad keyboard dismiss || true
 ad press 'id="menu-button"' --settle
 ad press 'id="sidebar-global-new-workspace"' --settle
 ad wait 'id="workspace-create-submit"' 10000
-run_host_scenario new-workspace
+run_host new-workspace
 
 echo "Composer keyboard invariants passed"

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

@@ -1,6 +1,7 @@
 import fs from "node:fs/promises";
 import process from "node:process";
 import sharp from "sharp";
+import { resolveAutocompletePlacement } from "./autocomplete-placement.mjs";
 
 const [, , command, ...args] = process.argv;
 
@@ -115,11 +116,14 @@ if (command === "stream-moved") {
     `Composer contained: top=${composer.top}, header=${viewport.top}, bottom=${composer.bottom}, keyboard=${imeTopArgument}\n`,
   );
 } else if (command === "rect") {
+  // A trailing `*` matches the first identifier with that prefix.
   const [snapshotPath, identifier, edge] = args;
   const snapshot = JSON.parse(await fs.readFile(snapshotPath, "utf8"));
+  const prefix = identifier.endsWith("*") ? identifier.slice(0, -1) : null;
   const node = snapshot.data.nodes.find(
     (candidate) =>
       candidate.identifier === identifier ||
+      (prefix !== null && candidate.identifier?.startsWith(prefix)) ||
       candidate.label === identifier ||
       (identifier === "editable" && candidate.type.endsWith("EditText")),
   );
@@ -232,6 +236,27 @@ if (command === "stream-moved") {
   if (!snapshot.data.nodes.some((candidate) => candidate.label === expected)) {
     throw new Error(`Missing exact text in ${snapshotPath}: ${expected}`);
   }
+} else if (command === "autocomplete-best") {
+  // Prints the center of the expected best match after checking its placement
+  // against the composer in the reference snapshot.
+  const [snapshotPath, referencePath, expected, imeTopArgument] = args;
+  const snapshot = JSON.parse(await fs.readFile(snapshotPath, "utf8"));
+  const reference = JSON.parse(await fs.readFile(referencePath, "utf8"));
+  const best = resolveAutocompletePlacement(snapshot, {
+    expected,
+    keyboardTop: imeTopArgument ? Number(imeTopArgument) : undefined,
+    reference,
+  });
+  process.stdout.write(`${best.x} ${best.y}\n`);
+} else if (command === "composer-text") {
+  // Accessibility drops a trailing space, so compare without it.
+  const [snapshotPath, expected] = args;
+  const snapshot = JSON.parse(await fs.readFile(snapshotPath, "utf8"));
+  const input = snapshot.data.nodes.find((candidate) => candidate.type.endsWith("EditText"));
+  const text = input?.value ?? input?.label ?? "";
+  if (text.trimEnd() !== expected.trimEnd()) {
+    throw new Error(`Composer text ${JSON.stringify(text)}, expected ${JSON.stringify(expected)}`);
+  }
 } else if (command === "same-region") {
   const [firstPath, secondPath, topArgument, heightArgument, failureMessage] = args;
   const crop = {

packages/app/e2e/mobile/composer-keyboard/autocomplete-placement.mjs

@@ -0,0 +1,94 @@
+// Shared by the iOS and Android composer keyboard harnesses. Reads an agent-device
+// `snapshot --raw --json` result. Accessibility keeps reporting suggestion rows that
+// sit behind the keyboard, so existence is not evidence: compare their screen bounds.
+
+const bottomOf = (rect) => rect.y + rect.height;
+
+function findById(nodes, identifier) {
+  const node = nodes.find((candidate) => candidate.identifier === identifier && candidate.rect);
+  if (!node) throw new Error(`Missing node: ${identifier}`);
+  return node;
+}
+
+function contains(outer, inner) {
+  return (
+    inner.x >= outer.x - 1 &&
+    inner.y >= outer.y - 1 &&
+    inner.x + inner.width <= outer.x + outer.width + 1 &&
+    bottomOf(inner) <= bottomOf(outer) + 1
+  );
+}
+
+/**
+ * The best match is the list row nearest the composer. Check that the popover sits
+ * between the app's header controls and the composer, that the keyboard (when shown)
+ * is below both, and that the row nearest the composer is fully drawn and is
+ * `expected`. A clipped best match fails: the nearest whole row is then another one.
+ * Return where to tap it. Android leaves the composer out of the accessibility tree
+ * while suggestions are open, so its callers read the composer from `reference`: a
+ * snapshot in the same keyboard state with an empty input.
+ */
+export function resolveAutocompletePlacement(snapshot, { expected, keyboardTop, reference }) {
+  if (!snapshot.success || !snapshot.data?.nodes?.length) throw new Error("Empty device snapshot");
+  const nodes = snapshot.data.nodes;
+  const popover = findById(nodes, "composer-autocomplete-popover").rect;
+  const composer = findById((reference ?? snapshot).data.nodes, "message-input-root").rect;
+  // The popover may cover the compact header, never the status bar above it.
+  const minimumTop =
+    nodes.find((node) => node.identifier === "menu-button" && node.rect)?.rect.y ?? 0;
+  // iOS reports the keyboard in the app's tree; Android callers pass the IME frame.
+  const keyboardY =
+    keyboardTop ?? nodes.find((node) => node.type === "Keyboard" && node.rect)?.rect.y;
+  const popoverBottom = bottomOf(popover);
+  if (popoverBottom > composer.y + 1) {
+    throw new Error(
+      `Autocomplete overlaps the composer: popover bottom=${popoverBottom}, composer top=${composer.y}`,
+    );
+  }
+  if (popover.y < minimumTop - 1) {
+    throw new Error(
+      `Autocomplete extends above the header: top=${popover.y}, minimum=${minimumTop}`,
+    );
+  }
+  if (keyboardY !== undefined && popoverBottom > keyboardY + 1) {
+    throw new Error(
+      `Autocomplete sits behind the keyboard: popover bottom=${popoverBottom}, keyboard top=${keyboardY}`,
+    );
+  }
+  // Rows are the innermost labelled boxes spanning the popover. The list scrolls to
+  // its end, so the lowest row is the best match nearest the composer.
+  const candidates = nodes.filter(
+    (node) =>
+      node.rect &&
+      node.label &&
+      node.identifier !== "composer-autocomplete-popover" &&
+      !/scroll bar/i.test(node.label) &&
+      node.rect.height > 0 &&
+      // The popover border insets rows by a few pixels; their labels are narrower.
+      node.rect.width >= popover.width * 0.97 &&
+      contains(popover, node.rect),
+  );
+  const area = (rect) => rect.width * rect.height;
+  const rows = candidates.filter(
+    (outer) =>
+      !candidates.some(
+        (inner) => area(inner.rect) < area(outer.rect) - 1 && contains(outer.rect, inner.rect),
+      ),
+  );
+  if (rows.length === 0) throw new Error("Autocomplete has no visible rows");
+  const best = rows.reduce((lowest, row) =>
+    bottomOf(row.rect) > bottomOf(lowest.rect) ? row : lowest,
+  );
+  const label = best.label.split(", ")[0];
+  if (label !== expected) {
+    throw new Error(`Best visible match is ${label}, expected ${expected}`);
+  }
+  return {
+    label,
+    x: Math.round(best.rect.x + best.rect.width / 2),
+    y: Math.round(best.rect.y + best.rect.height / 2),
+    popover,
+    composer,
+    keyboardTop: keyboardY ?? null,
+  };
+}

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

@@ -0,0 +1,229 @@
+// Composer autocomplete placement on iOS with the software keyboard: chat, workspace
+// draft tab, and New workspace. Run where agent-device reaches the simulator, with the
+// development app connected to the fixture host. See docs/mobile-testing.md.
+import { execFileSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import process from "node:process";
+import { setTimeout as sleep } from "node:timers/promises";
+import { fileURLToPath } from "node:url";
+import { resolveAutocompletePlacement } from "./autocomplete-placement.mjs";
+
+const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../../../..");
+const env = (name, fallback) => process.env[`PASEO_COMPOSER_KEYBOARD_${name}`] ?? fallback;
+const serverId = env("SERVER_ID");
+const agentId = env("AGENT_ID");
+const workspaceId = env("WORKSPACE_ID");
+if (!serverId || !agentId || !workspaceId) {
+  throw new Error(
+    "Set PASEO_COMPOSER_KEYBOARD_SERVER_ID, _AGENT_ID (an idle chat) and _WORKSPACE_ID (its workspace)",
+  );
+}
+const draftId = env("DRAFT_ID", "composer-keyboard");
+const session = env("SESSION", "composer-keyboard-ios");
+const device = env("DEVICE", "iPhone 16 Pro");
+const artifactsDir = path.join(repoRoot, ".dev/agent-device-artifacts/composer-keyboard-ios");
+const grownPrefix = "grown line one\ngrown line two\ngrown line three\n";
+// Partial queries with known best matches. `inserted` is the composer text after
+// tapping the best match.
+const fileCase = { text: "@app", expected: "packages/app", inserted: '"packages/app"' };
+// The release skills ship in this repository's .claude/skills.
+const skillCase = { text: "/release", expected: "/release-beta", inserted: "/release-beta " };
+// The chat fixture's mock provider lists one command.
+const chatCommandCase = { text: "/mo", expected: "/mock", inserted: "/mock " };
+
+fs.mkdirSync(artifactsDir, { recursive: true });
+
+function ad(...args) {
+  return execFileSync("agent-device", [...args, "--session", session], {
+    encoding: "utf8",
+    maxBuffer: 64 * 1024 * 1024,
+  });
+}
+
+function snapshot(name) {
+  const output = ad("snapshot", "--raw", "--json");
+  fs.writeFileSync(path.join(artifactsDir, `${name}.json`), output);
+  ad("screenshot", path.join(artifactsDir, `${name}.png`));
+  return JSON.parse(output);
+}
+
+const nodeById = (snap, id) => snap.data.nodes.find((node) => node.identifier === id && node.rect);
+const keyboardShown = (snap) => snap.data.nodes.some((node) => node.type === "Keyboard");
+const composerText = (snap) =>
+  snap.data.nodes.find((node) => node.type === "TextView" && node.rect)?.value ?? "";
+
+async function waitFor(name, predicate, timeoutMs = 10_000) {
+  const deadline = Date.now() + timeoutMs;
+  for (;;) {
+    const snap = snapshot(name);
+    if (predicate(snap)) return snap;
+    if (Date.now() > deadline) throw new Error(`Timed out waiting for ${name}`);
+    await sleep(500);
+  }
+}
+
+// Keyboard motion has settled once two snapshots agree on the composer position.
+async function settledPlacement(name, keyboard) {
+  let previousTop;
+  return waitFor(name, (snap) => {
+    const composer = nodeById(snap, "message-input-root");
+    if (!nodeById(snap, "composer-autocomplete-popover") || !composer) return false;
+    if (keyboardShown(snap) !== keyboard) return false;
+    const stable = composer.rect.y === previousTop;
+    previousTop = composer.rect.y;
+    return stable;
+  });
+}
+
+function assertPlacement(name, snap, expected) {
+  const placement = resolveAutocompletePlacement(snap, { expected });
+  process.stdout.write(
+    `PASS ${name}: popover ${Math.round(placement.popover.y)}-${Math.round(
+      placement.popover.y + placement.popover.height,
+    )} above composer ${Math.round(placement.composer.y)}, ${expected} drawn\n`,
+  );
+  return placement;
+}
+
+// iOS has no generic keyboard dismissal. Tapping the chat stream dismisses it; a
+// draft has no stream, so open and close the model sheet, which takes input focus.
+async function dismissKeyboard(snap) {
+  const composer = nodeById(snap, "message-input-root").rect;
+  ad("press", "4", String(Math.round(composer.y - 8)));
+  await sleep(1_000);
+  if (!keyboardShown(snapshot("dismiss-keyboard"))) return;
+  const sheetOpen = (sheet) =>
+    sheet.data.nodes.some((node) => node.type === "Button" && node.label === "Close");
+  ad("press", 'id="combined-model-selector"');
+  await waitFor("dismiss-keyboard-sheet", sheetOpen);
+  ad("press", 'label="Close"');
+  // The input is not hittable until the sheet has gone.
+  await waitFor("dismiss-keyboard-done", (done) => !sheetOpen(done) && !keyboardShown(done));
+}
+
+// Tap past the end of the (short) last line so the caret lands after the mention.
+// The input's right padding holds the fullscreen toggle; stay clear of it.
+function focusAtEnd(snap) {
+  const input = snap.data.nodes.find((node) => node.type === "TextView" && node.rect)?.rect;
+  if (!input) throw new Error("Missing composer input");
+  ad(
+    "press",
+    String(Math.round(input.x + input.width * 0.7)),
+    String(Math.round(input.y + input.height - 6)),
+  );
+}
+
+// `fill` cannot replace a multi-line draft or write an empty one, so delete from the end.
+async function clearInput(name) {
+  focusAtEnd(snapshot(`${name}-before-clear`));
+  const keyboard = await waitFor(`${name}-clear`, keyboardShown);
+  const deleteKey = keyboard.data.nodes.find(
+    (node) => node.type === "Key" && node.label === "delete" && node.rect,
+  )?.rect;
+  if (!deleteKey) throw new Error("Missing keyboard delete key");
+  const length = composerText(keyboard).length;
+  ad(
+    "press",
+    String(Math.round(deleteKey.x + deleteKey.width / 2)),
+    String(Math.round(deleteKey.y + deleteKey.height / 2)),
+    "--count",
+    String(length + 2),
+    "--interval-ms",
+    "40",
+  );
+}
+
+// The accessibility value drops a trailing space.
+const sameText = (actual, expected) => actual.trimEnd() === expected.trimEnd();
+
+async function runCase(host, kind, { text, expected, inserted }) {
+  const name = `${host}-${kind}`;
+  await clearInput(name);
+  await dismissKeyboard(snapshot(`${name}-empty`));
+  // fill taps the input and types at once, so suggestions open while the keyboard opens.
+  ad("fill", "editable=true", text);
+  assertPlacement(
+    `${name} opened while keyboard opens`,
+    await settledPlacement(`${name}-opening`, true),
+    expected,
+  );
+  await clearInput(`${name}-settled`);
+  await waitFor(`${name}-settled-empty`, (snap) => composerText(snap) === "");
+  ad("type", text);
+  assertPlacement(
+    `${name} opened after keyboard settled`,
+    await settledPlacement(`${name}-open`, true),
+    expected,
+  );
+  await dismissKeyboard(snapshot(`${name}-before-close`));
+  assertPlacement(
+    `${name} keyboard closed`,
+    await settledPlacement(`${name}-closed`, false),
+    expected,
+  );
+  focusAtEnd(snapshot(`${name}-before-reopen`));
+  const reopened = assertPlacement(
+    `${name} keyboard opened under open suggestions`,
+    await settledPlacement(`${name}-reopened`, true),
+    expected,
+  );
+  ad("press", String(reopened.x), String(reopened.y));
+  const selected = await waitFor(`${name}-selected`, (snap) =>
+    sameText(composerText(snap), inserted),
+  );
+  if (!keyboardShown(selected)) throw new Error(`Selecting ${expected} closed the keyboard`);
+  process.stdout.write(
+    `PASS ${name}: tapped ${expected}, composer now ${JSON.stringify(inserted)}\n`,
+  );
+}
+
+// Drafts list commands for their selected provider, and a fresh install selects none.
+async function selectClaudeModel(host) {
+  ad("press", 'id="combined-model-selector"');
+  await waitFor(`${host}-model-sheet`, (snap) => Boolean(nodeById(snap, "agent-controls-model")));
+  ad("press", 'id="agent-controls-model"');
+  await waitFor(`${host}-providers`, (snap) => Boolean(nodeById(snap, "model-provider-claude")));
+  ad("press", 'id="model-provider-claude"');
+  const models = await waitFor(`${host}-models`, (snap) =>
+    snap.data.nodes.some((node) => node.identifier?.startsWith("model-row-claude-") && node.rect),
+  );
+  const row = models.data.nodes.find(
+    (node) => node.identifier?.startsWith("model-row-claude-") && node.rect,
+  ).rect;
+  ad(
+    "press",
+    String(Math.round(row.x + row.width / 2)),
+    String(Math.round(row.y + row.height / 2)),
+  );
+  await waitFor(`${host}-model-selected`, (snap) =>
+    Boolean(nodeById(snap, "agent-controls-thinking")),
+  );
+  ad("press", 'label="Close"');
+  await waitFor(`${host}-model-closed`, (snap) => !nodeById(snap, "agent-controls-model"));
+}
+
+async function runHost(host) {
+  if (host !== "chat") await selectClaudeModel(host);
+  await runCase(host, "commands", host === "chat" ? chatCommandCase : skillCase);
+  await runCase(host, "files", fileCase);
+  await runCase(host, "files-grown", {
+    text: `${grownPrefix}${fileCase.text}`,
+    expected: fileCase.expected,
+    inserted: `${grownPrefix}${fileCase.inserted}`,
+  });
+  await clearInput(`${host}-done`);
+  await dismissKeyboard(snapshot(`${host}-done`));
+}
+
+const hosts = [
+  ["chat", `paseo://h/${serverId}/agent/${agentId}`],
+  ["workspace-draft", `paseo://h/${serverId}/workspace/${workspaceId}?open=draft%3A${draftId}`],
+  ["new-workspace", `paseo://new?serverId=${serverId}`],
+];
+for (const [host, url] of hosts) {
+  ad("open", url, "--platform", "ios", "--device", device);
+  await waitFor(host, (snap) => Boolean(nodeById(snap, "message-input-root")), 60_000);
+  await runHost(host);
+}
+process.stdout.write(`Composer autocomplete placement passed. Artifacts: ${artifactsDir}\n`);

packages/app/e2e/support/helpers/command-center-file-search.ts

@@ -210,3 +210,30 @@ export async function expectOneLineTruncatedFileResult(
   expect(overflow.overflow).toBe("hidden");
   expect(overflow.whiteSpace).toBe("nowrap");
 }
+
+/** Hold real daemon responses until the user has finished the interaction under test. */
+export async function holdDirectorySuggestionResponses(page: Page) {
+  let holding = false;
+  const pending: Array<() => void> = [];
+  await page.routeWebSocket(daemonWsRoutePattern(), (ws) => {
+    const server = ws.connectToServer();
+    ws.onMessage((message) => server.send(message));
+    server.onMessage((message) => {
+      if (holding && parseSessionMessage(message)?.type === "directory_suggestions_response") {
+        pending.push(() => ws.send(message));
+      } else {
+        ws.send(message);
+      }
+    });
+  });
+  return {
+    hold() {
+      holding = true;
+    },
+    async release() {
+      await expect.poll(() => pending.length).toBeGreaterThan(0);
+      holding = false;
+      for (const send of pending.splice(0)) send();
+    },
+  };
+}

packages/app/e2e/support/helpers/command-center-performance.ts

@@ -0,0 +1,90 @@
+import { mkdirSync } from "node:fs";
+import { expect, type Locator, type Page } from "@playwright/test";
+import { createMockIdleAgent } from "./archive-tab";
+import { seedWorkspace } from "./seed-client";
+
+export async function seedSearchableCommandCenter() {
+  const seed = await seedWorkspace({
+    repoPrefix: "command-center-performance-",
+    title: "Search workspace",
+    git: false,
+  });
+  try {
+    const agents = [];
+    for (let index = 0; index < 60; index += 1) {
+      agents.push(
+        await createMockIdleAgent(seed.client, {
+          cwd: seed.repoPath,
+          workspaceId: seed.workspaceId,
+          title: `Search agent ${String(index).padStart(3, "0")}`,
+        }),
+      );
+    }
+    const workspaces = [];
+    for (let index = 0; index < 40; index += 1) {
+      const path = `${seed.repoPath}/workspace-${index}`;
+      mkdirSync(path);
+      const result = await seed.client.createWorkspace({
+        source: { kind: "directory", path, projectId: seed.projectId },
+        title: `Search workspace ${String(index).padStart(3, "0")}`,
+      });
+      if (!result.workspace) throw new Error(result.error ?? "Workspace creation failed");
+      workspaces.push(result.workspace);
+    }
+    return { ...seed, agents, workspaces };
+  } catch (error) {
+    await seed.cleanup();
+    throw error;
+  }
+}
+
+export async function observeCommandCenterRowRenders(page: Page) {
+  await page.addInitScript(() => {
+    globalThis.__PASEO_RENDER_PROFILE_ENABLED__ = true;
+  });
+}
+
+export async function searchCommandCenter(panel: Locator, query: string) {
+  await panel.getByTestId("command-center-input").fill(query);
+}
+
+export async function warmCommandCenterRows(page: Page) {
+  // FlatList fills its overscan window in timed batches after the first visible frame.
+  await page.waitForTimeout(600);
+  await page.evaluate(() => {
+    globalThis.__PASEO_RENDER_PROFILE_REASONS__ = {};
+  });
+}
+
+export async function expectOnlyCommandCenterRowRendered(page: Page, resultId: string) {
+  await page.evaluate(
+    () =>
+      new Promise<void>((resolve) =>
+        requestAnimationFrame(() => requestAnimationFrame(() => resolve())),
+      ),
+  );
+  const renders = await page.evaluate(() =>
+    Object.fromEntries(
+      Object.entries(globalThis.__PASEO_RENDER_PROFILE_REASONS__ ?? {}).filter(([id]) =>
+        id.startsWith("CommandCenterResultRow:"),
+      ),
+    ),
+  );
+  expect(renders).toEqual({ [`CommandCenterResultRow:${resultId}`]: { render: 1 } });
+}
+
+export async function expectCommandCenterAgentWindow(panel: Locator, total: number) {
+  const rows = panel.locator(
+    '[data-testid^="command-center-agent-"]:not([data-testid="command-center-agent-subtitle"])',
+  );
+  const count = await rows.count();
+  expect(count).toBeGreaterThan(0);
+  expect(count).toBeLessThan(total);
+}
+
+export async function scrollToOldestCommandCenterAgent(panel: Locator) {
+  await panel.getByTestId("command-center-results").evaluate((element) => {
+    element.scrollTop = element.scrollHeight;
+    element.dispatchEvent(new Event("scroll"));
+  });
+}

packages/app/e2e/support/helpers/command-center-scroll.ts

@@ -169,3 +169,42 @@ export async function expectTightTwoLineResultSpacing(
     .evaluate((element) => element.getBoundingClientRect().top);
   expect(subtitleTop - titleTop).toBeLessThanOrEqual(18);
 }
+
+/** Wait for the browser to deliver wheel events before publishing a daemon update. */
+export async function scrollCommandCenterAwayFromSelection(page: Page, panel: Locator) {
+  await page.setViewportSize({ width: 1280, height: 500 });
+  const viewport = panel.getByTestId("command-center-results");
+  await viewport.hover();
+  await page.mouse.wheel(0, 300);
+  await expect.poll(() => viewport.evaluate((element) => element.scrollTop)).toBeGreaterThan(100);
+  const samples = await sampleCommandCenterScroll(panel);
+  const offset = samples.at(-1)!;
+  expect(offset).toBeGreaterThan(100);
+  return offset;
+}
+
+async function sampleCommandCenterScroll(panel: Locator): Promise<number[]> {
+  return panel.getByTestId("command-center-results").evaluate(async (viewport) => {
+    const samples: number[] = [];
+    for (let frame = 0; frame < 30; frame += 1) {
+      await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
+      samples.push(viewport.scrollTop);
+    }
+    return samples;
+  });
+}
+
+export async function expectCommandCenterScrollToStayAt(panel: Locator, offset: number) {
+  const samples = await sampleCommandCenterScroll(panel);
+  expect(Math.min(...samples)).toBe(offset);
+  expect(Math.max(...samples)).toBe(offset);
+}
+
+export async function expectKeyboardNavigationToResume(page: Page, panel: Locator, offset: number) {
+  await page.keyboard.press("ArrowDown");
+  await expect
+    .poll(() => panel.getByTestId("command-center-results").evaluate((el) => el.scrollTop))
+    .toBeLessThan(offset);
+  const second = panel.getByTestId("command-center-results").getByRole("button").nth(1);
+  await expect(second).toBeInViewport({ ratio: 1 });
+}

packages/app/e2e/support/helpers/seed-client.ts

@@ -44,6 +44,7 @@ export interface SeedDaemonClient {
   fetchWorkspaces(options?: { filter?: { projectId?: string } }): Promise<{
     entries: SeedWorkspaceDescriptor[];
   }>;
+  setWorkspaceTitle(workspaceId: string, title: string | null): Promise<{ title: string | null }>;
   setWorkspacePinned(workspaceId: string, pinned: boolean): Promise<{ pinnedAt: string | null }>;
   clearWorkspaceAttention(workspaceId: string): Promise<void>;
   setWorkspaceLabel(input: {
@@ -147,6 +148,7 @@ export interface SeedDaemonClient {
     predicate: (snapshot: { status: string }) => boolean,
     timeout?: number,
   ): Promise<{ status: string }>;
+  cancelAgent(agentId: string): Promise<void>;
   sendAgentMessage(agentId: string, text: string): Promise<void>;
   waitForFinish(
     agentId: string,

packages/app/e2e/support/helpers/usage-sidebar-item.ts

@@ -301,3 +301,10 @@ export async function refreshAllUsage(page: Page): Promise<void> {
 export async function openCompactSidebar(page: Page): Promise<void> {
   await page.getByRole("button", { name: "Open menu", exact: true }).first().click();
 }
+
+export async function expectCompactSidebarOpen(page: Page): Promise<void> {
+  await expect(page.getByRole("button", { name: "Close menu", exact: true })).toHaveAttribute(
+    "aria-expanded",
+    "true",
+  );
+}

packages/app/eas.json

@@ -15,6 +15,9 @@
       }
     },
     "production": {
+      "ios": {
+        "image": "macos-tahoe-26.6-xcode-27.1"
+      },
       "env": {
         "APP_VARIANT": "production"
       },

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/app",
-  "version": "0.13.0-beta.1",
+  "version": "0.13.0-beta.2",
   "private": true,
   "main": "index.ts",
   "scripts": {

packages/app/src/agent-presentation/index.ts

@@ -0,0 +1,84 @@
+import { useShallow } from "zustand/shallow";
+import { useProviderIcon } from "@/components/provider-icons";
+import type { PanelDescriptor } from "@/panels/panel-registry";
+import { useSessionStore, selectAgentTurnPresentation, type Agent } from "@/stores/session-store";
+import { deriveSidebarStateBucket } from "@/utils/sidebar-agent-state";
+
+function formatProviderLabel(provider: Agent["provider"]): string {
+  if (!provider) {
+    return "Agent";
+  }
+  return provider
+    .split(/[-_\s]+/)
+    .filter((part) => part.length > 0)
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join(" ");
+}
+
+export function resolveAgentLabel(title: string | null | undefined): string | null {
+  if (typeof title !== "string") {
+    return null;
+  }
+  const normalized = title.trim();
+  if (!normalized) {
+    return null;
+  }
+  if (normalized.toLowerCase() === "new agent") {
+    return null;
+  }
+  return normalized;
+}
+
+export function useAgentDescriptor(
+  target: { kind: "agent"; agentId: string },
+  context: { serverId: string },
+): PanelDescriptor {
+  const descriptorState = useSessionStore(
+    useShallow((state) => {
+      const session = state.sessions[context.serverId];
+      const agent =
+        session?.agents?.get(target.agentId) ?? session?.agentDetails?.get(target.agentId) ?? null;
+      return {
+        provider: agent?.provider ?? "codex",
+        title: agent?.title ?? null,
+        status: agent?.status ?? null,
+        pendingPermissionCount: agent?.pendingPermissions.length ?? 0,
+        requiresAttention: agent?.requiresAttention ?? false,
+        attentionReason: agent?.attentionReason ?? null,
+        isTurnActive: selectAgentTurnPresentation(session, target.agentId).isActive,
+      };
+    }),
+  );
+  const icon = useProviderIcon(descriptorState.provider, context.serverId);
+  return buildAgentDescriptor({ ...descriptorState, icon });
+}
+
+export function buildAgentDescriptor(input: {
+  provider: Agent["provider"];
+  title: string | null;
+  status: Agent["status"] | null;
+  pendingPermissionCount: number;
+  requiresAttention: boolean;
+  attentionReason: Agent["attentionReason"];
+  isTurnActive: boolean;
+  icon: PanelDescriptor["icon"];
+}): PanelDescriptor {
+  const provider = input.provider;
+  const label = resolveAgentLabel(input.title);
+
+  return {
+    label: label ?? "",
+    subtitle: `${formatProviderLabel(provider)} agent`,
+    tooltip: label ?? `${formatProviderLabel(provider)} agent`,
+    titleState: label ? "ready" : "loading",
+    icon: input.icon,
+    statusBucket: input.status
+      ? deriveSidebarStateBucket({
+          status: input.isTurnActive ? "running" : input.status,
+          pendingPermissionCount: input.pendingPermissionCount,
+          requiresAttention: input.requiresAttention,
+          attentionReason: input.attentionReason,
+        })
+      : null,
+  };
+}

packages/app/src/app/_layout.tsx

@@ -2,6 +2,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
 import { useIsExplorerSidebarOpen } from "@/workspace-tabs/explorer-sidebar";
 import { ComposerEditingSessionsProvider } from "@/composer/editing-session";
+import { SheetHostScope } from "@/components/ui/isolated-bottom-sheet-modal";
 import "@/styles/unistyles";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
 import { PortalProvider } from "@gorhom/portal";
@@ -507,7 +508,7 @@ function AppContainer({ children, chromeEnabled: chromeEnabledOverride }: AppCon
 
   return (
     <AppContainerLifetime compactGesturesEnabled={chromeEnabled && isCompactLayout}>
-      {surface}
+      <SheetHostScope enabled={isCompactLayout}>{surface}</SheetHostScope>
     </AppContainerLifetime>
   );
 }

packages/app/src/assistant-file-links/index.ts

@@ -6,6 +6,7 @@ export {
 export {
   AssistantFileLinkResolverProvider,
   useAssistantFileLinkEnvironment,
+  useAssistantFileLinkEnvironmentBridge,
   type AssistantFileLinkResolverProviderProps,
 } from "./provider";
 export type { AssistantFileLinkSource } from "./resolver";

packages/app/src/assistant-file-links/provider.tsx

@@ -39,6 +39,18 @@ export interface AssistantFileLinkResolverContextValue {
 const AssistantFileLinkResolverContext =
   createContext<AssistantFileLinkResolverContextValue | null>(null);
 
+export function useAssistantFileLinkEnvironmentBridge() {
+  const value = useContext(AssistantFileLinkResolverContext);
+  return useCallback(
+    (children: ReactNode) => (
+      <AssistantFileLinkResolverContext.Provider value={value}>
+        {children}
+      </AssistantFileLinkResolverContext.Provider>
+    ),
+    [value],
+  );
+}
+
 export function AssistantFileLinkResolverProvider({
   client,
   serverId,

packages/app/src/assistant-file-links/use-file-link.test.tsx

@@ -2,9 +2,9 @@
  * @vitest-environment jsdom
  */
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { act, renderHook, waitFor } from "@testing-library/react";
+import { act, cleanup, renderHook, waitFor } from "@testing-library/react";
 import React, { useCallback, useMemo, useState, type ReactNode } from "react";
-import { describe, expect, it, vi } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import type { ToastApi } from "@/components/toast-host";
 import type { InlinePathTarget } from "./parse";
 import { AssistantFileLinkResolverProvider } from "./provider";
@@ -99,6 +99,12 @@ function createWrapper(input: { client: TestClient; openedFiles: OpenedFile[]; t
 }
 
 describe("useFileLink", () => {
+  // Lookups resolve after a test's last assertion; an unmounted hook cannot re-render
+  // once jsdom is torn down.
+  afterEach(() => {
+    cleanup();
+  });
+
   it("returns the same object across no-op parent rerenders", () => {
     const getDirectorySuggestions = vi.fn(async () => resolvedSuggestions([]));
     const queryClient = createQueryClient();

packages/app/src/command-center/command-center.tsx

@@ -1,3 +1,5 @@
+import equal from "fast-deep-equal";
+import { recordRenderProfileReasons } from "@/utils/render-profiler";
 import {
   FlatList,
   Modal,
@@ -10,12 +12,25 @@ import {
   type NativeSyntheticEvent,
   type PressableStateCallbackType,
 } from "react-native";
-import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import {
+  memo,
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+  useSyncExternalStore,
+} from "react";
 import { useTranslation } from "react-i18next";
 import { Check, ChevronRight, Folder, X } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { BottomSheetFlatList, type BottomSheetFlatListMethods } from "@gorhom/bottom-sheet";
-import { AgentStatusDot } from "@/components/agent-status-dot";
+import { useAgentDescriptor, resolveAgentLabel } from "@/agent-presentation";
+import { StatusIcon } from "@/components/status-icon";
+import { useWorkspaceStatus } from "@/workspace-status";
+import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
+import type { Theme } from "@/styles/theme";
 import { HighlightedText, type HighlightedTextProps } from "@/components/ui/highlighted-text";
 import { findHighlightRanges } from "@/components/ui/highlighted-text-segments";
 import { MaterialFileIcon } from "@/components/material-file-icon";
@@ -69,9 +84,7 @@ import {
   buildContributionSections,
   filterAndRankBuiltInResults,
   joinSubtitleParts,
-  moveActiveResultId,
   PINNED_SECTION_BAND,
-  preserveActiveResultId,
   projectCommandCenterRows,
   type CommandCenterAgentResult,
   type CommandCenterFileResult,
@@ -81,6 +94,7 @@ import {
   type CommandCenterSearchFields,
   type CommandCenterWorkspaceResult,
 } from "./results";
+import { createCommandCenterInteraction, type CommandCenterInteraction } from "./interaction";
 import { useWorkspaceFileSearch } from "./workspace-file-search";
 
 const ThemedBottomSheetTextInput = withUnistyles(TextInput, (theme) => ({
@@ -106,6 +120,20 @@ function agentSearchFields(result: CommandCenterAgentResult): CommandCenterSearc
   return { visible: [result.title, result.subtitle], hidden: [result.agent.cwd] };
 }
 
+function createWorkspaceResultAction(serverId: string, workspaceId: string) {
+  return () => {
+    clearCommandCenterFocusRestoreElement();
+    navigateToWorkspace({ serverId, workspaceId });
+  };
+}
+
+function createAgentResultAction(serverId: string, agentId: string) {
+  return () => {
+    clearCommandCenterFocusRestoreElement();
+    navigateToAgent({ serverId, agentId });
+  };
+}
+
 /**
  * Build every pinned row. Deliberately not keyed on `query`: none of this work depends on what
  * was typed. Ordering belongs to `filterAndRankBuiltInResults`, which ranks on every keystroke.
@@ -115,6 +143,9 @@ function useBuiltInRows(open: boolean): {
   agents: CommandCenterAgentResult[];
 } {
   const { t } = useTranslation();
+  const previousRows = useRef(
+    new Map<string, CommandCenterAgentResult | CommandCenterWorkspaceResult>(),
+  );
   const { agents } = useAggregatedAgents({ demand: open });
   const { projects } = useProjects({ enabled: open });
   const showHost = useHosts().length > 1;
@@ -136,7 +167,22 @@ function useBuiltInRows(open: boolean): {
   const iconDataByProjectViewKey = useProjectIcons({ projects: iconTargets });
 
   return useMemo(() => {
-    if (!open) return { workspaces: [], agents: [] };
+    if (!open) {
+      previousRows.current.clear();
+      return { workspaces: [], agents: [] };
+    }
+    // Built-in IDs identify immutable navigation targets. Reuse their callbacks and unchanged
+    // row data so a directory update does not invalidate every mounted ResultRow.
+    const nextRows = new Map<string, CommandCenterAgentResult | CommandCenterWorkspaceResult>();
+    const preserve = <T extends CommandCenterAgentResult | CommandCenterWorkspaceResult>(
+      row: T,
+    ): T => {
+      const previous = previousRows.current.get(row.id);
+      if (previous) row.run = previous.run;
+      const stable = previous && equal(previous, row) ? (previous as T) : row;
+      nextRows.set(row.id, stable);
+      return stable;
+    };
     const allWorkspaces: CommandCenterWorkspaceResult[] = [];
     for (const project of projects) {
       const workspaceProject = {
@@ -147,23 +193,24 @@ function useBuiltInRows(open: boolean): {
       for (const host of project.hosts) {
         for (const workspace of host.workspaces) {
           if (workspace.archivingAt) continue;
-          allWorkspaces.push({
-            kind: "workspace",
-            id: `workspace:${host.serverId}:${workspace.id}`,
-            title: workspace.title ?? workspace.name,
-            subtitle: joinSubtitleParts([
-              showHost ? host.serverName : null,
-              project.projectName,
-              workspace.currentBranch,
-            ]),
-            project: workspaceProject,
-            changeRequestNumber: workspace.changeRequestNumber,
-            activityAt: workspace.statusEnteredAt,
-            run: () => {
-              clearCommandCenterFocusRestoreElement();
-              navigateToWorkspace({ serverId: host.serverId, workspaceId: workspace.id });
-            },
-          });
+          allWorkspaces.push(
+            preserve({
+              kind: "workspace",
+              id: `workspace:${host.serverId}:${workspace.id}`,
+              title: workspace.title ?? workspace.name,
+              subtitle: joinSubtitleParts([
+                showHost ? host.serverName : null,
+                project.projectName,
+                workspace.currentBranch,
+              ]),
+              serverId: host.serverId,
+              workspaceId: workspace.id,
+              project: workspaceProject,
+              changeRequestNumber: workspace.changeRequestNumber,
+              activityAt: workspace.statusEnteredAt,
+              run: createWorkspaceResultAction(host.serverId, workspace.id),
+            }),
+          );
         }
       }
     }
@@ -174,22 +221,20 @@ function useBuiltInRows(open: boolean): {
       const workspaceTitle = agent.workspaceId
         ? workspaceTitleByKey.get(`${agent.serverId}:${agent.workspaceId}`)
         : undefined;
-      return {
+      return preserve({
         kind: "agent",
         id: `agent:${agent.serverId}:${agent.id}`,
         agent,
-        title: agent.title || t("shell.commandCenter.newAgent"),
+        title: resolveAgentLabel(agent.title) ?? t("workspace.tabs.loading"),
         subtitle: joinSubtitleParts([
           showHost ? agent.serverLabel : null,
           workspaceTitle ?? shortenPath(agent.cwd),
         ]),
         activityAt: agent.lastActivityAt,
-        run: () => {
-          clearCommandCenterFocusRestoreElement();
-          navigateToAgent({ serverId: agent.serverId, agentId: agent.id });
-        },
-      };
+        run: createAgentResultAction(agent.serverId, agent.id),
+      });
     });
+    previousRows.current = nextRows;
     return { workspaces: allWorkspaces, agents: agentRows };
   }, [agents, iconDataByProjectViewKey, open, projects, showHost, t]);
 }
@@ -227,8 +272,6 @@ interface CommandCenterState {
   setQuery(query: string): void;
   activeId: string | null;
   rows: readonly CommandCenterListRow[];
-  results: readonly CommandCenterResult[];
-  rowIndexByResultId: ReadonlyMap<string, number>;
   offsets: readonly number[];
   inputRef: React.RefObject<EditingTextInputHandle | null>;
   fileSearchLoading: boolean;
@@ -238,7 +281,10 @@ interface CommandCenterState {
   key(key: string): boolean;
 }
 
-function useCommandCenterState(listMetrics: CommandCenterListMetrics): CommandCenterState {
+function useCommandCenterState(
+  listMetrics: CommandCenterListMetrics,
+  interaction: CommandCenterInteraction,
+): CommandCenterState {
   const keyboardActionDispatcher = useKeyboardActionDispatcher();
   const { t } = useTranslation();
   const open = useKeyboardShortcutsStore((state) => state.commandCenterOpen);
@@ -248,8 +294,7 @@ function useCommandCenterState(listMetrics: CommandCenterListMetrics): CommandCe
   const snapshot = useCommandCenterContributions();
   const inputRef = useRef<EditingTextInputHandle>(null);
   const previousOpenRef = useRef(open);
-  const [query, setQueryState] = useState("");
-  const [activeId, setActiveId] = useState<string | null>(null);
+  const { query, activeId } = useSyncExternalStore(interaction.subscribe, interaction.getSnapshot);
   const builtInSections = useBuiltInSections(open, query);
   const {
     entries: fileSearchEntries,
@@ -296,15 +341,9 @@ function useCommandCenterState(listMetrics: CommandCenterListMetrics): CommandCe
       ),
     [builtInSections, contributionSections, fileSections, listMetrics, scope],
   );
-  const resolvedActiveId = preserveActiveResultId(activeId, projection.selectableResults);
-
-  // Editing the query re-ranks everything, so an arrow-key selection made under the previous
-  // query is no longer meaningful. Reset it in the same update as the query rather than in an
-  // effect, so there is no intermediate render holding the stale selection.
-  const setQuery = useCallback((next: string) => {
-    setQueryState(next);
-    setActiveId(null);
-  }, []);
+  useLayoutEffect(() => {
+    interaction.update({ open, scope, query, projection, loading: fileSearchLoading });
+  }, [interaction, open, scope, query, projection, fileSearchLoading]);
 
   const close = useCallback(() => setOpen(false), [setOpen]);
   const select = useCallback(
@@ -327,18 +366,25 @@ function useCommandCenterState(listMetrics: CommandCenterListMetrics): CommandCe
         return true;
       }
       if (pressed === "Enter") {
-        const selected = results.find((result) => result.id === resolvedActiveId);
+        const selected = results.find((result) => result.id === activeId);
         if (!selected) return false;
         select(selected);
         return true;
       }
       if (pressed !== "ArrowDown" && pressed !== "ArrowUp") return false;
-      if (results.length === 0) return false;
-      const direction = pressed === "ArrowDown" ? "next" : "previous";
-      setActiveId(moveActiveResultId(resolvedActiveId, results, direction));
-      return true;
+      return interaction.move(pressed === "ArrowDown" ? "next" : "previous");
     },
-    [close, open, projection.selectableResults, query, resolvedActiveId, scope, select, setScope],
+    [
+      close,
+      open,
+      projection.selectableResults,
+      query,
+      activeId,
+      scope,
+      select,
+      setScope,
+      interaction,
+    ],
   );
 
   useEffect(() => {
@@ -348,8 +394,6 @@ function useCommandCenterState(listMetrics: CommandCenterListMetrics): CommandCe
       const timer = setTimeout(() => inputRef.current?.focus(), 0);
       return () => clearTimeout(timer);
     }
-    setQueryState("");
-    setActiveId(null);
     if (!wasOpen) return;
     const element = takeCommandCenterFocusRestoreElement();
     if (!element) return;
@@ -367,11 +411,9 @@ function useCommandCenterState(listMetrics: CommandCenterListMetrics): CommandCe
     scope,
     clearScope: () => setScope(null),
     query,
-    setQuery,
-    activeId: resolvedActiveId,
+    setQuery: interaction.setQuery,
+    activeId,
     rows: projection.rows,
-    results: projection.selectableResults,
-    rowIndexByResultId: projection.rowIndexByResultId,
     offsets: projection.offsets,
     inputRef,
     fileSearchLoading,
@@ -397,6 +439,7 @@ const ResultRow = memo(function ResultRow({
   active,
   onSelect,
 }: ResultRowProps) {
+  recordRenderProfileReasons(`CommandCenterResultRow:${result.id}`, ["render"]);
   const press = useCallback(() => onSelect(result), [onSelect, result]);
   const choice =
     result.kind === "contribution" && result.contribution.presentation.kind === "choice"
@@ -430,7 +473,19 @@ const ResultRow = memo(function ResultRow({
         result.kind === "file" ? `command-center-file-row-${result.filePath}` : choice?.testId
       }
     >
-      <ResultContent result={result} query={query} />
+      {(state) => (
+        <ResultContent
+          result={result}
+          query={query}
+          backdrop={
+            active ||
+            state.pressed ||
+            Boolean((state as PressableStateCallbackType & { hovered?: boolean }).hovered)
+              ? "surface1"
+              : "surface0"
+          }
+        />
+      )}
     </Pressable>
   );
 });
@@ -484,6 +539,72 @@ function SubtitleWithTimestamp({
   );
 }
 
+const providerIconMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
+
+function AgentResultContent({
+  result,
+  query,
+  backdrop,
+}: {
+  result: CommandCenterAgentResult;
+  query: string;
+  backdrop: SurfaceBackdrop;
+}) {
+  const agent = result.agent;
+  const descriptor = useAgentDescriptor(
+    { kind: "agent", agentId: agent.id },
+    { serverId: agent.serverId },
+  );
+  const Icon = useMemo(
+    () => withUnistyles(descriptor.icon, providerIconMapping),
+    [descriptor.icon],
+  );
+  return (
+    <View style={styles.rowContent} testID={`command-center-agent-${agent.serverId}:${agent.id}`}>
+      <View style={styles.rowMain}>
+        <View style={styles.iconSlot}>
+          <StatusIcon statusBucket={descriptor.statusBucket} size={16} backdrop={backdrop}>
+            <View accessibilityRole="image" accessibilityLabel={descriptor.subtitle}>
+              <Icon size={16} />
+            </View>
+          </StatusIcon>
+        </View>
+        <View style={styles.textContent}>
+          <QueryHighlightedText
+            query={query}
+            text={result.title}
+            style={styles.title}
+            numberOfLines={1}
+          />
+          <SubtitleWithTimestamp
+            query={query}
+            subtitle={result.subtitle}
+            activityAt={result.activityAt}
+            testID="command-center-agent-subtitle"
+          />
+        </View>
+      </View>
+    </View>
+  );
+}
+
+function WorkspaceResultIcon({
+  result,
+  backdrop,
+}: {
+  result: CommandCenterWorkspaceResult;
+  backdrop: SurfaceBackdrop;
+}) {
+  const statusBucket = useWorkspaceStatus(result.serverId, result.workspaceId);
+  return (
+    <StatusIcon statusBucket={statusBucket} size={16} backdrop={backdrop}>
+      <View accessibilityElementsHidden importantForAccessibility="no-hide-descendants" aria-hidden>
+        <WorkspaceProjectIcon project={result.project} />
+      </View>
+    </StatusIcon>
+  );
+}
+
 /** The same project icon the sidebar's workspace rows lead with: its image, or a lettered square. */
 function WorkspaceProjectIcon({ project }: { project: CommandCenterWorkspaceResult["project"] }) {
   const initial = projectIconPlaceholderLabelFromDisplayName(project.name).charAt(0).toUpperCase();
@@ -498,7 +619,15 @@ function WorkspaceProjectIcon({ project }: { project: CommandCenterWorkspaceResu
   );
 }
 
-function ResultContent({ result, query }: { result: CommandCenterResult; query: string }) {
+function ResultContent({
+  result,
+  query,
+  backdrop,
+}: {
+  result: CommandCenterResult;
+  query: string;
+  backdrop: SurfaceBackdrop;
+}) {
   if (result.kind === "file") {
     return (
       <View style={styles.rowContent}>
@@ -525,34 +654,7 @@ function ResultContent({ result, query }: { result: CommandCenterResult; query:
     );
   }
   if (result.kind === "agent") {
-    const agent = result.agent;
-    return (
-      <View style={styles.rowContent} testID={`command-center-agent-${agent.serverId}:${agent.id}`}>
-        <View style={styles.rowMain}>
-          <View style={styles.iconSlot}>
-            <AgentStatusDot
-              status={agent.status}
-              requiresAttention={agent.requiresAttention}
-              showInactive
-            />
-          </View>
-          <View style={styles.textContent}>
-            <QueryHighlightedText
-              query={query}
-              text={result.title}
-              style={styles.title}
-              numberOfLines={1}
-            />
-            <SubtitleWithTimestamp
-              query={query}
-              subtitle={result.subtitle}
-              activityAt={result.activityAt}
-              testID="command-center-agent-subtitle"
-            />
-          </View>
-        </View>
-      </View>
-    );
+    return <AgentResultContent result={result} query={query} backdrop={backdrop} />;
   }
   if (result.kind === "workspace") {
     const key = result.id.slice("workspace:".length);
@@ -560,13 +662,8 @@ function ResultContent({ result, query }: { result: CommandCenterResult; query:
       <View style={styles.rowContent} testID={`command-center-workspace-${key}`}>
         <View style={styles.rowMain}>
           {/* Decorative: the fallback icon's initial must not prefix the row's accessible name. */}
-          <View
-            style={styles.iconSlot}
-            accessibilityElementsHidden
-            importantForAccessibility="no-hide-descendants"
-            aria-hidden
-          >
-            <WorkspaceProjectIcon project={result.project} />
+          <View style={styles.iconSlot}>
+            <WorkspaceResultIcon result={result} backdrop={backdrop} />
           </View>
           <View style={styles.textContent}>
             <QueryHighlightedText
@@ -669,62 +766,39 @@ function SectionRow({ row }: { row: Extract<CommandCenterListRow, { kind: "secti
 export function CommandCenter() {
   const { t } = useTranslation();
   const isCompact = useIsCompactFormFactor();
-  const state = useCommandCenterState(
-    isCompact ? COMMAND_CENTER_LIST_METRICS.compact : COMMAND_CENTER_LIST_METRICS.desktop,
-  );
-  const showBottomSheet = isCompact && isNative;
-  const modalLayer = useGlobalWebOverlayLayer("modal", isWeb && state.open && !showBottomSheet);
   const listRef = useRef<FlatList<CommandCenterListRow>>(null);
   const bottomSheetListRef = useRef<BottomSheetFlatListMethods>(null);
   const bottomSheetInputRef = useRef<EditingTextInputHandle>(null);
-  const scrollMetricsRef = useRef({ offset: 0, visibleLength: 0 });
+  const [interaction] = useState(() =>
+    createCommandCenterInteraction((offset) => {
+      const list = listRef.current ?? bottomSheetListRef.current;
+      list?.scrollToOffset({ offset, animated: false });
+    }),
+  );
+  const state = useCommandCenterState(
+    isCompact ? COMMAND_CENTER_LIST_METRICS.compact : COMMAND_CENTER_LIST_METRICS.desktop,
+    interaction,
+  );
+  const showBottomSheet = isCompact && isNative;
+  const modalLayer = useGlobalWebOverlayLayer("modal", isWeb && state.open && !showBottomSheet);
   const { sheetRef, handleSheetChange, handleSheetDismiss } = useIsolatedBottomSheetVisibility({
     visible: state.open,
     isEnabled: showBottomSheet,
     onClose: state.close,
   });
 
-  const revealActiveResult = useCallback(() => {
-    if (!state.open || !state.activeId) return;
-    const index = state.rowIndexByResultId.get(state.activeId);
-    if (index === undefined) return;
-    const { offset, visibleLength } = scrollMetricsRef.current;
-    if (visibleLength <= 0) return;
-    const rowTop = state.offsets[index];
-    const rowBottom = rowTop + state.rows[index].height;
-    let nextOffset: number | null = null;
-    if (rowTop < offset) nextOffset = rowTop;
-    if (rowBottom > offset + visibleLength) nextOffset = rowBottom - visibleLength;
-    if (nextOffset === null) return;
-    const ref = showBottomSheet ? bottomSheetListRef.current : listRef.current;
-    const boundedOffset = Math.max(0, nextOffset);
-    scrollMetricsRef.current.offset = boundedOffset;
-    ref?.scrollToOffset({ offset: boundedOffset, animated: false });
-  }, [
-    showBottomSheet,
-    state.activeId,
-    state.offsets,
-    state.open,
-    state.rowIndexByResultId,
-    state.rows,
-  ]);
-  useEffect(() => {
-    if (!state.open) {
-      scrollMetricsRef.current = { offset: 0, visibleLength: 0 };
-      return;
-    }
-    revealActiveResult();
-  }, [revealActiveResult, state.open]);
   const handleListLayout = useCallback(
     (event: LayoutChangeEvent) => {
-      scrollMetricsRef.current.visibleLength = event.nativeEvent.layout.height;
-      revealActiveResult();
+      interaction.layout(event.nativeEvent.layout.height);
     },
-    [revealActiveResult],
+    [interaction],
+  );
+  const handleListScroll = useCallback(
+    (event: NativeSyntheticEvent<NativeScrollEvent>) => {
+      interaction.scrolled(event.nativeEvent.contentOffset.y);
+    },
+    [interaction],
   );
-  const handleListScroll = useCallback((event: NativeSyntheticEvent<NativeScrollEvent>) => {
-    scrollMetricsRef.current.offset = event.nativeEvent.contentOffset.y;
-  }, []);
   useEffect(() => {
     if (!showBottomSheet || !state.open) return;
     const timer = setTimeout(() => bottomSheetInputRef.current?.focus(), 300);
@@ -790,6 +864,14 @@ export function CommandCenter() {
     windowSize: 5,
     onLayout: handleListLayout,
     onScroll: handleListScroll,
+    onScrollBeginDrag: interaction.beginManualScroll,
+    onTouchStart: interaction.beginManualScroll,
+    ...(isWeb
+      ? {
+          onWheel: interaction.beginManualScroll,
+          onMouseDown: interaction.beginManualScroll,
+        }
+      : {}),
     scrollEventThrottle: 16,
   };
   const keyPress = useCallback(

packages/app/src/command-center/interaction.test.ts

@@ -0,0 +1,178 @@
+import { describe, expect, it } from "vitest";
+import { createCommandCenterInteraction } from "./interaction";
+import { projectCommandCenterRows, type CommandCenterFileResult } from "./results";
+import type { CommandCenterScope } from "@/stores/keyboard-shortcuts-store";
+
+function results(ids = ["a", "b", "c", "d"]) {
+  return projectCommandCenterRows(
+    [
+      {
+        id: "files",
+        band: 0,
+        rank: 0,
+        title: "Files",
+        results: ids.map<CommandCenterFileResult>((id) => ({
+          id,
+          kind: "file",
+          filePath: id,
+          title: id,
+          subtitle: "",
+          run() {},
+        })),
+      },
+    ],
+    { singleLineRow: 40, twoLineRow: 60, sectionTitle: 20, sectionDivider: 10 },
+  );
+}
+
+function setup(options: { scope?: CommandCenterScope; measured?: boolean } = {}) {
+  const offsets: number[] = [];
+  const model = createCommandCenterInteraction((offset) => offsets.push(offset));
+  const publish = (ids = ["a", "b", "c", "d"], loading = false) =>
+    model.update({
+      open: true,
+      scope: options.scope ?? null,
+      query: model.getSnapshot().query,
+      projection: results(ids),
+      loading,
+    });
+  publish();
+  if (options.measured !== false) model.layout(80);
+  return { model, offsets, publish };
+}
+
+describe("Command Center interaction", () => {
+  it("keeps manual scrolling through result refresh, removal, and resizing", () => {
+    const { model, offsets, publish } = setup();
+    model.beginManualScroll();
+    model.scrolled(100);
+    publish();
+    publish(["b", "c", "d"]);
+    model.layout(60);
+    expect(model.getSnapshot().activeId).toBe("b");
+    expect(offsets).toEqual([]);
+  });
+
+  it("reveals only clipped keyboard selections and wraps around", () => {
+    const { model, offsets } = setup();
+    expect(model.move("next")).toBe(true);
+    expect(offsets).toEqual([20]);
+    model.scrolled(20); // The programmatic scroll callback is only a measurement.
+    model.move("next");
+    expect(offsets).toEqual([20, 60]);
+    model.move("previous");
+    expect(offsets).toEqual([20, 60]);
+    model.move("previous");
+    expect(offsets).toEqual([20, 60, 20]);
+    model.move("previous");
+    expect(model.getSnapshot().activeId).toBe("d");
+    expect(offsets).toEqual([20, 60, 20, 100]);
+  });
+
+  it("keyboard navigation takes control again after manual scrolling", () => {
+    const { model, offsets } = setup();
+    model.beginManualScroll();
+    model.scrolled(100);
+    model.move("next");
+    expect(model.getSnapshot().activeId).toBe("b");
+    expect(offsets).toEqual([60]);
+  });
+
+  it("a new query reveals even when the active ID stays the same", () => {
+    const { model, offsets, publish } = setup();
+    model.scrolled(100);
+    model.setQuery("a");
+    expect(offsets).toEqual([]);
+    publish(["a", "b"]);
+    expect(model.getSnapshot()).toEqual({ query: "a", activeId: "a" });
+    expect(offsets).toEqual([20]);
+    model.scrolled(100);
+    publish(["a", "b"]);
+    expect(offsets).toEqual([20]);
+  });
+
+  it("an arrow command reveals a single result even when its ID cannot change", () => {
+    const { model, offsets, publish } = setup();
+    publish(["a"]);
+    model.scrolled(30);
+    model.move("next");
+    expect(offsets).toEqual([20]);
+  });
+
+  it("defers reveals until layout exists and consumes them only once", () => {
+    const { model, offsets, publish } = setup({ measured: false });
+    model.move("previous");
+    expect(offsets).toEqual([]);
+    model.layout(80);
+    expect(offsets).toEqual([100]);
+    model.scrolled(0);
+    publish();
+    model.layout(60);
+    expect(offsets).toEqual([100]);
+  });
+
+  it("manual interaction cancels an unmeasured request", () => {
+    const { model, offsets } = setup({ measured: false });
+    model.move("previous");
+    model.beginManualScroll();
+    model.layout(80);
+    expect(offsets).toEqual([]);
+  });
+
+  it("waits for scoped search results instead of revealing the previous query's rows", () => {
+    const { model, offsets, publish } = setup({ scope: "files" });
+    model.scrolled(100);
+    model.setQuery("new");
+    publish(["a", "b"], true);
+    expect(offsets).toEqual([]);
+    expect(model.getSnapshot().activeId).toBeNull();
+    publish(["b", "a"]);
+    expect(model.getSnapshot().activeId).toBe("b");
+    expect(offsets).toEqual([20]);
+  });
+
+  it("manual interaction cancels a reveal awaiting search results", () => {
+    const { model, offsets, publish } = setup({ scope: "files" });
+    model.setQuery("new");
+    publish([], true);
+    model.beginManualScroll();
+    model.scrolled(100);
+    publish(["new"]);
+    expect(model.getSnapshot().activeId).toBe("new");
+    expect(offsets).toEqual([]);
+  });
+
+  it("empty searches complete without granting future passive results permission to scroll", () => {
+    const { model, offsets, publish } = setup();
+    model.setQuery("missing");
+    publish([]);
+    expect(model.move("next")).toBe(false);
+    expect(model.getSnapshot().activeId).toBeNull();
+    model.scrolled(100);
+    publish(["late"]);
+    expect(offsets).toEqual([]);
+  });
+
+  it("scope changes reset selection and request a reveal", () => {
+    const { model, offsets } = setup();
+    model.move("next");
+    model.scrolled(100);
+    model.update({ open: true, scope: "files", query: "", projection: results(), loading: false });
+    expect(model.getSnapshot().activeId).toBe("a");
+    expect(offsets).toEqual([20, 20]);
+  });
+
+  it("close discards the old query, metrics, and deferred reveal", () => {
+    const { model, offsets, publish } = setup({ measured: false });
+    model.setQuery("old");
+    publish();
+    model.move("previous");
+    model.update({ open: false, scope: null, query: "old", projection: results(), loading: false });
+    model.layout(80);
+    expect(model.getSnapshot()).toEqual({ query: "", activeId: null });
+    expect(offsets).toEqual([]);
+    publish();
+    expect(model.getSnapshot().activeId).toBe("a");
+    expect(offsets).toEqual([]);
+  });
+});

packages/app/src/command-center/interaction.ts

@@ -0,0 +1,131 @@
+import type { CommandCenterScope } from "@/stores/keyboard-shortcuts-store";
+import {
+  moveActiveResultId,
+  preserveActiveResultId,
+  type CommandCenterListProjection,
+} from "./results";
+
+interface Snapshot {
+  query: string;
+  activeId: string | null;
+}
+
+interface ResultsInput {
+  open: boolean;
+  scope: CommandCenterScope;
+  query: string;
+  projection: CommandCenterListProjection;
+  loading: boolean;
+}
+
+/** Selection persists; permission to move the viewport lasts for one user command. */
+export function createCommandCenterInteraction(scrollToOffset: (offset: number) => void) {
+  let snapshot: Snapshot = { query: "", activeId: null };
+  const listeners = new Set<() => void>();
+  let open = false;
+  let scope: CommandCenterScope = null;
+  let projection: CommandCenterListProjection | null = null;
+  let loading = false;
+  let revealPending = false;
+  let offset = 0;
+  let visibleLength = 0;
+
+  function publish(next: Snapshot) {
+    if (next.query === snapshot.query && next.activeId === snapshot.activeId) return;
+    snapshot = next;
+    for (const listener of listeners) listener();
+  }
+
+  function reveal() {
+    if (!open || !revealPending || !projection || visibleLength <= 0) return;
+    // Scoped file search keeps its previous entries while the next query is loading.
+    if (scope === "files" && loading) return;
+    if (!snapshot.activeId) {
+      if (!loading) revealPending = false;
+      return;
+    }
+    const index = projection.rowIndexByResultId.get(snapshot.activeId);
+    if (index === undefined) return;
+    const top = projection.offsets[index];
+    const bottom = top + projection.rows[index].height;
+    revealPending = false;
+    let nextOffset = offset;
+    if (top < offset) nextOffset = top;
+    if (bottom > offset + visibleLength) nextOffset = bottom - visibleLength;
+    nextOffset = Math.max(0, nextOffset);
+    if (nextOffset === offset) return;
+    offset = nextOffset;
+    scrollToOffset(nextOffset);
+  }
+
+  return {
+    getSnapshot: () => snapshot,
+    subscribe(listener: () => void) {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    },
+    update(input: ResultsInput) {
+      const resetSelection = input.open && (!open || scope !== input.scope);
+      open = input.open;
+      scope = input.scope;
+      if (!open) {
+        projection = null;
+        revealPending = false;
+        offset = 0;
+        visibleLength = 0;
+        publish({ query: "", activeId: null });
+        return;
+      }
+      if (resetSelection) {
+        revealPending = true;
+        publish({ ...snapshot, activeId: null });
+      }
+      // A query command invalidates the old projection until React supplies its new results.
+      if (input.query !== snapshot.query) return;
+      projection = input.projection;
+      loading = input.loading;
+      if (scope !== "files" || !loading) {
+        publish({
+          ...snapshot,
+          activeId: preserveActiveResultId(snapshot.activeId, projection.selectableResults),
+        });
+      }
+      reveal();
+    },
+    setQuery(query: string) {
+      projection = null;
+      revealPending = true;
+      publish({ query, activeId: null });
+    },
+    move(direction: "next" | "previous"): boolean {
+      if (
+        !open ||
+        !projection ||
+        (scope === "files" && loading) ||
+        projection.selectableResults.length === 0
+      )
+        return false;
+      publish({
+        ...snapshot,
+        activeId: moveActiveResultId(snapshot.activeId, projection.selectableResults, direction),
+      });
+      revealPending = true;
+      reveal();
+      return true;
+    },
+    layout(height: number) {
+      visibleLength = height;
+      reveal();
+    },
+    scrolled(nextOffset: number) {
+      offset = nextOffset;
+    },
+    beginManualScroll() {
+      revealPending = false;
+    },
+  };
+}
+
+export type CommandCenterInteraction = ReturnType<typeof createCommandCenterInteraction>;

packages/app/src/command-center/results.test.ts

@@ -110,6 +110,8 @@ function workspace(
 ): CommandCenterWorkspaceResult {
   return {
     kind: "workspace",
+    serverId: "server",
+    workspaceId: "workspace",
     id,
     title,
     subtitle,

packages/app/src/command-center/results.ts

@@ -55,6 +55,8 @@ export interface CommandCenterWorkspaceResult {
   id: string;
   title: string;
   subtitle: string;
+  serverId: string;
+  workspaceId: string;
   project: CommandCenterWorkspaceProject;
   /** PR/MR number backing this workspace, so a number query can match it exactly. */
   changeRequestNumber: number | null;

packages/app/src/command-center/workspace-file-search.ts

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { openWorkspaceFileFromExplorer } from "@/screens/workspace/workspace-file-open-command";
 import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
-import { usePanelStore } from "@/stores/panel-store";
+import { revealWorkspaceTab } from "@/workspace-tabs/navigation";
 import { useSessionStore } from "@/stores/session-store";
 import { useWorkspaceDirectory } from "@/stores/session-store-hooks";
 import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
@@ -131,8 +131,6 @@ export function useWorkspaceFileSearch(input: { enabled: boolean; query: string
       openWorkspaceFileFromExplorer({
         filePath: path,
         persistenceKey: buildWorkspaceTabPersistenceKey({ serverId, workspaceId }),
-        closeExplorerAfterOpen: true,
-        showMobileAgent: usePanelStore.getState().showMobileAgent,
         openWorkspaceTabInFocusedPane: (workspaceKey, target, placement) =>
           useWorkspaceLayoutStore.getState().openTab({
             workspaceKey,
@@ -140,7 +138,7 @@ export function useWorkspaceFileSearch(input: { enabled: boolean; query: string
             intent: "reveal",
             placement,
           }),
-        focusWorkspaceTab: useWorkspaceLayoutStore.getState().focusTab,
+        revealWorkspaceTab,
       });
     },
     [serverId, workspaceId],

packages/app/src/command-center/workspace-search.test.ts

@@ -11,6 +11,8 @@ function workspace(input: {
 }): CommandCenterWorkspaceResult {
   return {
     kind: "workspace",
+    serverId: "server",
+    workspaceId: "workspace",
     id: input.id,
     title: input.title ?? input.id,
     subtitle: input.subtitle ?? "",

packages/app/src/components/add-project-flow.tsx

@@ -1,3 +1,4 @@
+import { usePanelStore } from "@/stores/panel-store";
 import { getHostRuntimeStore } from "@/runtime/host-runtime";
 import { router } from "expo-router";
 import type { WorkspaceProjectDescriptorPayload } from "@getpaseo/protocol/messages";
@@ -474,6 +475,7 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
   const openNewWorkspaceForProject = useCallback(
     (serverId: string, project: WorkspaceProjectDescriptorPayload) => {
       onClose();
+      usePanelStore.getState().showMobileAgent();
       router.push(
         buildNewWorkspaceRoute({
           serverId,
@@ -621,6 +623,7 @@ export function AddProjectFlow({ request, onClose }: AddProjectFlowProps) {
           testID: "add-project-flow-add-host",
           select: () => {
             onClose();
+            usePanelStore.getState().showMobileAgent();
             router.push(buildSettingsAddHostRoute(Date.now()));
           },
         });

packages/app/src/components/left-sidebar.tsx

@@ -166,9 +166,8 @@ export const LeftSidebar = memo(function LeftSidebar({ active }: { active: boole
   const { open: openImportSession, sheet: importSessionSheet } = useImportSession();
 
   const handleOpenProjectMobile = useCallback(() => {
-    showMobileAgent();
     void openProjectPicker();
-  }, [showMobileAgent, openProjectPicker]);
+  }, [openProjectPicker]);
 
   const handleOpenProjectDesktop = useCallback(() => {
     void openProjectPicker();
@@ -205,9 +204,8 @@ export const LeftSidebar = memo(function LeftSidebar({ active }: { active: boole
   }, []);
 
   const handleImportSessionMobile = useCallback(() => {
-    showMobileAgent();
     openImportSession();
-  }, [openImportSession, showMobileAgent]);
+  }, [openImportSession]);
 
   const labels = useMemo(
     (): SidebarLabels => ({

packages/app/src/components/sidebar-workspace-list.tsx

@@ -1401,7 +1401,6 @@ function WorkspaceRowItem({
   isCreating = false,
   selectionEnabled,
   activeWorkspaceSelection,
-  onWorkspacePress,
   drag,
   isDragging = false,
   dragHandleProps,
@@ -1410,9 +1409,8 @@ function WorkspaceRowItem({
     if (!workspace.serverId) {
       return;
     }
-    onWorkspacePress?.();
     navigateToWorkspace({ serverId: workspace.serverId, workspaceId: workspace.workspaceId });
-  }, [onWorkspacePress, workspace.serverId, workspace.workspaceId]);
+  }, [workspace.serverId, workspace.workspaceId]);
 
   return (
     <WorkspaceRow

packages/app/src/components/sidebar/sidebar-nav-rows.tsx

@@ -145,14 +145,13 @@ function SidebarHistoryRow({ onBeforeNavigate }: SidebarNavRowProps) {
   );
 }
 
-function SidebarSearchRow({ onBeforeNavigate }: SidebarNavRowProps) {
+function SidebarSearchRow() {
   const { t } = useTranslation();
   const shortcutKeys = useShortcutKeys(builtinSidebarNavShortcutAction("search"));
   const setCommandCenterOpen = useKeyboardShortcutsStore((state) => state.setCommandCenterOpen);
   const handlePress = useCallback(() => {
-    onBeforeNavigate?.();
     setCommandCenterOpen(true);
-  }, [onBeforeNavigate, setCommandCenterOpen]);
+  }, [setCommandCenterOpen]);
 
   return (
     <SidebarHeaderRow

packages/app/src/components/sidebar/sidebar-status-list.tsx

@@ -512,7 +512,6 @@ const StatusWorkspaceRow = memo(function StatusWorkspaceRow({
   onToggleWorkspacePin,
   reserveIdleStatusIndicatorSpace = true,
   inStatusGroup = true,
-  onWorkspacePress,
   drag,
   isDragging = false,
   dragHandleProps,
@@ -543,9 +542,8 @@ const StatusWorkspaceRow = memo(function StatusWorkspaceRow({
 
   const handlePress = useCallback(() => {
     if (!workspace.serverId) return;
-    onWorkspacePress?.();
     navigateToWorkspace({ serverId: workspace.serverId, workspaceId: workspace.workspaceId });
-  }, [onWorkspacePress, workspace.serverId, workspace.workspaceId]);
+  }, [workspace.serverId, workspace.workspaceId]);
 
   return (
     <StatusWorkspaceRowWithMenu

packages/app/src/components/status-icon.tsx

@@ -0,0 +1,119 @@
+import { useMemo, type ReactElement, type ReactNode } from "react";
+import { View } from "react-native";
+import { CircleAlert } from "lucide-react-native";
+import { StyleSheet, withUnistyles } from "react-native-unistyles";
+import type { SidebarStateBucket } from "@/utils/sidebar-agent-state";
+import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
+import { getStatusDotColor } from "@/utils/status-dot-color";
+import { StatusRing } from "@/components/status-ring";
+import { getStatusRingOffset } from "@/components/status-ring/geometry";
+import {
+  STATUS_INDICATOR_ALERT_SIZE,
+  STATUS_INDICATOR_DOT_SIZE,
+} from "@/utils/status-indicator-geometry";
+import type { Theme } from "@/styles/theme";
+
+interface StatusIconProps {
+  children: ReactNode;
+  statusBucket: SidebarStateBucket | null;
+  size?: number;
+  statusDotBorderColor?: string;
+  backdrop: SurfaceBackdrop;
+}
+const DEFAULT_STATUS_DOT_OFFSET = -2;
+const STATUS_ALERT_OFFSET = -3;
+const ThemedCircleAlert = withUnistyles(CircleAlert);
+const needsInputAlertMapping = (theme: Theme) => ({
+  color: theme.colors.surface0,
+  fill: getStatusDotColor({ theme, bucket: "needs_input" }) ?? undefined,
+});
+
+export function StatusIcon({
+  children,
+  statusBucket,
+  size = 14,
+  statusDotBorderColor,
+  backdrop,
+}: StatusIconProps): ReactElement {
+  const bucket = statusBucket;
+  const isRunning = bucket === "running";
+  let statusDotColor: string | undefined;
+  if (bucket === "failed") statusDotColor = styles.statusDotFailed.color;
+  else if (bucket === "attention") statusDotColor = styles.statusDotAttention.color;
+  const showNeedsInputAlert = bucket === "needs_input";
+  const agentIconWrapperStyle = useMemo(
+    () => [styles.agentIconWrapper, { width: size, height: size }],
+    [size],
+  );
+  const statusDotStyle = useMemo(
+    () => [
+      styles.statusDot,
+      {
+        backgroundColor: statusDotColor,
+        borderColor: statusDotBorderColor ?? styles[backdrop].borderColor,
+      },
+    ],
+    [statusDotColor, statusDotBorderColor, backdrop],
+  );
+
+  return (
+    <View style={agentIconWrapperStyle}>
+      {children}
+      {isRunning ? (
+        <View
+          style={styles.statusRing}
+          accessibilityRole="progressbar"
+          accessibilityLabel="Agent running"
+        >
+          <StatusRing backdrop={backdrop} />
+        </View>
+      ) : null}
+      {statusDotColor ? <View style={statusDotStyle} /> : null}
+      {showNeedsInputAlert ? (
+        <View style={styles.statusAlertOverlay}>
+          <ThemedCircleAlert size={STATUS_INDICATOR_ALERT_SIZE} uniProps={needsInputAlertMapping} />
+        </View>
+      ) : null}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create((theme) => ({
+  agentIconWrapper: {
+    position: "relative",
+    alignItems: "center",
+    justifyContent: "center",
+    flexShrink: 0,
+  },
+  statusDot: {
+    position: "absolute",
+    right: DEFAULT_STATUS_DOT_OFFSET,
+    bottom: DEFAULT_STATUS_DOT_OFFSET,
+    width: STATUS_INDICATOR_DOT_SIZE,
+    height: STATUS_INDICATOR_DOT_SIZE,
+    borderRadius: theme.borderRadius.full,
+    borderWidth: 1,
+  },
+  statusRing: {
+    position: "absolute",
+    right: getStatusRingOffset(DEFAULT_STATUS_DOT_OFFSET, STATUS_INDICATOR_DOT_SIZE),
+    bottom: getStatusRingOffset(DEFAULT_STATUS_DOT_OFFSET, STATUS_INDICATOR_DOT_SIZE),
+  },
+  surface0: { borderColor: theme.colors.surface0 },
+  surface1: { borderColor: theme.colors.surface1 },
+  surface2: { borderColor: theme.colors.surface2 },
+  surfaceSidebar: { borderColor: theme.colors.surfaceSidebar },
+  surfaceSidebarHover: { borderColor: theme.colors.surfaceSidebarHover },
+  surfaceSidebarSelected: { borderColor: theme.colors.surfaceSidebarSelected },
+  statusAlertOverlay: {
+    position: "absolute",
+    right: STATUS_ALERT_OFFSET,
+    bottom: STATUS_ALERT_OFFSET,
+  },
+  statusDotFailed: {
+    color: getStatusDotColor({ theme, bucket: "failed" }) ?? undefined,
+  },
+  statusDotAttention: {
+    color: getStatusDotColor({ theme, bucket: "attention" }) ?? undefined,
+  },
+}));

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

@@ -9,32 +9,20 @@ import {
 } from "react";
 import { View, useWindowDimensions } from "react-native";
 import { Portal } from "@gorhom/portal";
-import Animated, {
-  useAnimatedReaction,
-  useAnimatedStyle,
-  useSharedValue,
-} from "react-native-reanimated";
+import Animated, { useAnimatedReaction, useAnimatedStyle } from "react-native-reanimated";
 import { scheduleOnRN } from "react-native-worklets";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { StyleSheet } from "react-native-unistyles";
 import { Autocomplete, type AutocompleteOption } from "@/components/ui/autocomplete";
 import {
   measureFloatingPanelPortalHost,
   useFloatingPanelPortalHostName,
 } from "@/components/ui/floating-panel-portal";
-import { useKeyboardShift } from "@/keyboard/shift";
+import { KeyboardTranslateView, useKeyboardAnchor, useKeyboardShift } from "@/keyboard/shift";
 import { SPACING } from "@/styles/theme";
 import { inlineUnistylesStyle } from "@/styles/unistyles-inline-style";
 
 const OFFSET_FROM_ANCHOR = SPACING[3];
 
-interface Rect {
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-}
-
 interface RelativeAnchorRect {
   x: number;
   y: number;
@@ -42,14 +30,6 @@ interface RelativeAnchorRect {
   hostHeight: number;
 }
 
-function measureElement(element: View): Promise<Rect> {
-  return new Promise((resolve) => {
-    element.measureInWindow((x, y, width, height) => {
-      resolve({ x, y, width, height });
-    });
-  });
-}
-
 interface AutocompletePopoverProps {
   visible: boolean;
   anchorRef: RefObject<View | null>;
@@ -79,8 +59,9 @@ export function AutocompletePopover({
   const windowDimensions = useWindowDimensions();
   const safeAreaInsets = useSafeAreaInsets();
   const portalHostName = useFloatingPanelPortalHostName();
-  const { shift, isMoving } = useKeyboardShift();
-  const measuredShift = useSharedValue(0);
+  const { isMoving } = useKeyboardShift();
+  const anchor = useKeyboardAnchor();
+  const { measureAtRest } = anchor;
   const measurementGeneration = useRef(0);
   const canMeasure = visible && (options.length === 0 || selectedIndex >= 0);
 
@@ -90,20 +71,21 @@ export function AutocompletePopover({
     if (!anchorElement) return;
     const generation = measurementGeneration.current;
     void Promise.all([
-      measureElement(anchorElement),
+      measureAtRest(anchorElement),
       measureFloatingPanelPortalHost(portalHostName),
     ]).then(([anchorRect, hostRect]) => {
-      if (generation !== measurementGeneration.current || !hostRect) return undefined;
+      if (generation !== measurementGeneration.current || !anchorRect || !hostRect) {
+        return undefined;
+      }
       setRelativeAnchorRect({
         x: anchorRect.x - hostRect.x,
         y: anchorRect.y - hostRect.y,
         width: anchorRect.width,
         hostHeight: hostRect.height,
       });
-      measuredShift.value = shift.value;
       return undefined;
     });
-  }, [anchorRef, canMeasure, measuredShift, portalHostName, shift]);
+  }, [anchorRef, canMeasure, measureAtRest, portalHostName]);
 
   useEffect(() => {
     measurementGeneration.current += 1;
@@ -131,37 +113,38 @@ export function AutocompletePopover({
     [isMoving, remeasure],
   );
 
+  // Lay out at the anchor's resting position; the KeyboardTranslateView below lifts
+  // it with the anchor. Height changes only at keyboard boundaries.
   const baseStyle = useMemo(() => {
     if (!relativeAnchorRect) return null;
     return inlineUnistylesStyle({
       position: "absolute" as const,
       left: relativeAnchorRect.x,
       width: relativeAnchorRect.width,
+      bottom: relativeAnchorRect.hostHeight - relativeAnchorRect.y + OFFSET_FROM_ANCHOR,
     });
   }, [relativeAnchorRect]);
 
   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]);
+  const reservedLift = anchor.reservedLift;
+  const heightStyle = useAnimatedStyle(
+    () => ({
+      maxHeight: Math.max(
+        0,
+        anchorY - reservedLift.value - safeAreaInsets.top - OFFSET_FROM_ANCHOR * 2,
+      ),
+    }),
+    [anchorY, reservedLift, safeAreaInsets.top],
+  );
 
   if (!visible || !relativeAnchorRect || !baseStyle) return null;
   if (options.length > 0 && selectedIndex < 0) return null;
 
+  // The translate view is the popover's own frame, so it lifts only the popover.
   return (
     <Portal hostName={portalHostName}>
-      <View style={styles.overlay} pointerEvents="box-none">
-        <Animated.View
-          testID="composer-autocomplete-popover"
-          style={[baseStyle, keyboardLayoutStyle]}
-        >
+      <KeyboardTranslateView {...anchor.translation} style={baseStyle}>
+        <Animated.View testID="composer-autocomplete-popover" style={heightStyle}>
           <Autocomplete
             options={options}
             selectedIndex={selectedIndex}
@@ -172,17 +155,7 @@ export function AutocompletePopover({
             emptyText={emptyText}
           />
         </Animated.View>
-      </View>
+      </KeyboardTranslateView>
     </Portal>
   );
 }
-
-const styles = StyleSheet.create(() => ({
-  overlay: {
-    position: "absolute",
-    top: 0,
-    right: 0,
-    bottom: 0,
-    left: 0,
-  },
-}));

packages/app/src/components/ui/isolated-bottom-sheet-modal/host-scope.tsx

@@ -32,9 +32,12 @@ import { useSharedValue } from "react-native-reanimated";
 export function SheetHostScope({
   children,
   style,
+  enabled = true,
 }: {
   children: ReactNode;
   style?: StyleProp<ViewStyle>;
+  /** Disabled scopes keep their mounted children and use the enclosing host. */
+  enabled?: boolean;
 }) {
   const parent = useBottomSheetModalInternal();
   const hostName = `sheet-host-${useId()}`;
@@ -69,12 +72,14 @@ export function SheetHostScope({
   );
 
   return (
-    <BottomSheetModalInternalProvider value={value}>
+    <BottomSheetModalInternalProvider value={enabled ? value : parent}>
       <View style={[styles.scope, style]}>
         {children}
-        <View ref={hostRef} style={styles.host} pointerEvents="box-none" onLayout={handleLayout}>
-          <PortalHost name={hostName} />
-        </View>
+        {enabled ? (
+          <View ref={hostRef} style={styles.host} pointerEvents="box-none" onLayout={handleLayout}>
+            <PortalHost name={hostName} />
+          </View>
+        ) : null}
       </View>
     </BottomSheetModalInternalProvider>
   );
@@ -87,5 +92,6 @@ const styles = StyleSheet.create({
   },
   host: {
     ...StyleSheet.absoluteFill,
+    zIndex: 1,
   },
 });

packages/app/src/composer/editing-session/index.tsx

@@ -119,6 +119,20 @@ const SessionsContext = createContext<ComposerEditingSessions | null>(null);
 const WorkspaceContext = createContext<string | null>(null);
 const ScopeContext = createContext<{ tabId: string; targetKey: string } | null>(null);
 
+/** Keep the workspace's editing identity when a sheet renders in the app overlay host. */
+export function useComposerEditingEnvironmentBridge() {
+  const sessions = useContext(SessionsContext);
+  const workspaceKey = useContext(WorkspaceContext);
+  return useCallback(
+    (children: ReactNode) => (
+      <SessionsContext.Provider value={sessions}>
+        <WorkspaceContext.Provider value={workspaceKey}>{children}</WorkspaceContext.Provider>
+      </SessionsContext.Provider>
+    ),
+    [sessions, workspaceKey],
+  );
+}
+
 /** App-container ownership survives replacement of both the gesture shell and tab layout. */
 export function ComposerEditingSessionsProvider({ children }: { children: ReactNode }) {
   const [sessions] = useState(() => new ComposerEditingSessions());

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

@@ -1,5 +1,6 @@
+import { usePaneContext } from "@/panels/pane-context";
 import { useEffect, useMemo, useState } from "react";
-import type { PluginFile, PluginFileTab } from "@getpaseo/plugin/client";
+import type { PluginFile, PluginTab } from "@getpaseo/plugin/client";
 import { Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
@@ -69,13 +70,9 @@ export function FilePane({
     () => ({
       lineStart: location.lineStart,
       lineEnd: location.lineEnd,
-      revision: navigationRevision,
+      path,
     }),
-    [location.lineEnd, location.lineStart, navigationRevision],
-  );
-  const panelTarget = useMemo(
-    () => ({ serverId, workspaceRoot: root, path }),
-    [path, root, serverId],
+    [location.lineEnd, location.lineStart, path],
   );
 
   let body;
@@ -113,8 +110,8 @@ export function FilePane({
           key={`${panel.id}:${targetKey}`}
           panel={panel}
           file={handle.file}
-          location={panelLocation}
-          target={panelTarget}
+          params={panelLocation}
+          revision={navigationRevision}
           onModifiedChange={setModified}
         />
       </View>
@@ -131,21 +128,27 @@ export function FilePane({
 function MountedFilePanel({
   panel,
   file,
-  location,
-  target,
+  params,
+  revision,
   onModifiedChange,
 }: {
   panel: FilePanel;
   file: PluginFile;
-  location: { lineStart?: number; lineEnd?: number; revision: number };
-  target: { serverId: string; workspaceRoot: string; path: string };
+  params: { path: string; lineStart?: number; lineEnd?: number };
+  revision: number;
   onModifiedChange: (modified: boolean) => void;
 }) {
-  const [tab] = useState<PluginFileTab>(() => ({
-    setModified: (modified) => onModifiedChange(modified),
-  }));
+  const { state, setCurrentTabState } = usePaneContext();
+  const tab = useMemo<PluginTab>(
+    () => ({
+      setModified: onModifiedChange,
+      state,
+      setState: setCurrentTabState,
+    }),
+    [onModifiedChange, state, setCurrentTabState],
+  );
   useEffect(() => () => onModifiedChange(false), [onModifiedChange]);
-  return <FilePanelView panel={panel} file={file} tab={tab} location={location} target={target} />;
+  return <FilePanelView panel={panel} file={file} tab={tab} params={params} revision={revision} />;
 }
 
 const styles = StyleSheet.create((theme) => ({

packages/app/src/file-panels/builtin.tsx

@@ -1,4 +1,4 @@
-import { useFileUrl } from "@getpaseo/plugin/client";
+import { useWorkspace, useFileUrl, type PluginFilePanelProps } from "@getpaseo/plugin/client";
 import { useCallback, useState } from "react";
 import { ScrollView, Text, View } from "react-native";
 import { StyleSheet } from "react-native-unistyles";
@@ -7,28 +7,28 @@ import { useSessionStore } from "@/stores/session-store";
 import { FileHtmlPreview } from "./html-preview";
 import { FilePanelLoading } from "./loading";
 import { FileMarkdownPreview } from "./markdown-preview";
-import type { BuiltinFilePanelProps } from "./panels";
 import { TextFilePanel, type TextFilePreviewProps } from "./source/panel";
 import type { RenderingFilePanel, SourceFilePanel } from "./catalog";
 
 /** Source: the text file panel with no Preview, for text files no other built-in panel claims. */
-function SourcePanel(props: BuiltinFilePanelProps) {
+function SourcePanel(props: PluginFilePanelProps) {
   return <TextFilePanel {...props} />;
 }
 
 /** Markdown: the text file panel with the rendered document as its Preview. */
-function MarkdownPanel(props: BuiltinFilePanelProps) {
+function MarkdownPanel(props: PluginFilePanelProps) {
   return <TextFilePanel {...props} preview={MarkdownPreview} />;
 }
 
 /** HTML: the text file panel with the sandboxed page as its Preview. */
-function HtmlPanel(props: BuiltinFilePanelProps) {
+function HtmlPanel(props: PluginFilePanelProps) {
   return <TextFilePanel {...props} preview={HtmlPreview} />;
 }
 
 /** Shows Loading until the rendered Markdown has laid out once; later edits keep the content. */
-function MarkdownPreview({ text, target }: TextFilePreviewProps) {
-  const client = useSessionStore((state) => state.sessions[target.serverId]?.client ?? null);
+function MarkdownPreview({ text, params, workspaceId, host }: TextFilePreviewProps) {
+  const client = useSessionStore((state) => state.sessions[host.id]?.client ?? null);
+  const workspaceRoot = useWorkspace(workspaceId, (workspace) => workspace.directory);
   const [rendered, setRendered] = useState(false);
   const handleLayout = useCallback(() => setRendered(true), []);
   return (
@@ -37,10 +37,10 @@ function MarkdownPreview({ text, target }: TextFilePreviewProps) {
         <View onLayout={handleLayout}>
           <FileMarkdownPreview
             source={text}
-            filePath={target.path}
-            workspaceRoot={target.workspaceRoot}
+            filePath={params.path}
+            workspaceRoot={workspaceRoot ?? ""}
             client={client}
-            serverId={target.serverId}
+            serverId={host.id}
           />
         </View>
       </ScrollView>
@@ -58,7 +58,7 @@ function HtmlPreview({ text }: TextFilePreviewProps) {
   );
 }
 
-function ImagePanel({ file }: BuiltinFilePanelProps) {
+function ImagePanel({ file }: PluginFilePanelProps) {
   const url = useFileUrl(file);
   if (url.status === "loading") return <FilePanelLoading />;
   if (url.status === "error") return <FilePanelError message={url.error.message} />;
@@ -83,7 +83,7 @@ const components = {
 export function BuiltinFilePanelView({
   panel,
   ...props
-}: BuiltinFilePanelProps & { panel: RenderingFilePanel | SourceFilePanel }) {
+}: PluginFilePanelProps & { panel: RenderingFilePanel | SourceFilePanel }) {
   const Component = components[panel.id];
   return <Component {...props} />;
 }

packages/app/src/file-panels/panels.ts

@@ -1,5 +1,4 @@
 import { useMemo } from "react";
-import type { PluginFile, PluginFileLocation, PluginFileTab } from "@getpaseo/plugin/client";
 import { useInstalledPlugins } from "@/plugins/registry";
 import type { PluginFilePanelContribution, InstalledPlugin } from "@/plugins/types";
 import { filePanelCatalog, type RenderingFilePanel, type SourceFilePanel } from "./catalog";
@@ -13,14 +12,6 @@ export interface PluginFilePanel {
 }
 export type FilePanel = RenderingFilePanel | PluginFilePanel | SourceFilePanel;
 
-/** A built-in panel gets the plugin panel's file, tab and location, plus where the file lives. */
-export interface BuiltinFilePanelProps {
-  file: PluginFile;
-  tab: PluginFileTab;
-  location: PluginFileLocation;
-  target: { serverId: string; workspaceRoot: string; path: string };
-}
-
 export function useFilePanels(serverId: string): readonly FilePanel[] {
   const plugins = useInstalledPlugins();
   return useMemo(

packages/app/src/file-panels/plugin-host.tsx

@@ -1,54 +1,28 @@
-import { useMemo } from "react";
 import { PluginClientStateProvider } from "@getpaseo/plugin/client/host";
-import type { PluginTheme } from "@getpaseo/plugin";
-import { withUnistyles } from "react-native-unistyles";
-import { useIsCompactFormFactor } from "@/constants/layout";
-import { usePaneContext } from "@/panels/pane-context";
-import { useHosts } from "@/runtime/host-runtime";
+import type { PluginFilePanelProps } from "@getpaseo/plugin/client";
+import { useMemo } from "react";
 import { createPluginClientStateSource } from "@/plugins/client-state/source";
-import { usePluginHostNavigation } from "@/plugins/host-navigation";
 import { PluginInstallationProvider } from "@/plugins/installation-provider";
 import { SurfaceErrorBoundary } from "@/plugins/surface-error-boundary";
-import { resolvePluginPlatform } from "@/plugins/platform";
-import { toPluginTheme } from "@/plugins/theme";
-import type { Theme } from "@/styles/theme";
-import type { BuiltinFilePanelProps, PluginFilePanel } from "./panels";
+import type { PluginFilePanel } from "./panels";
 
-type Props = Pick<BuiltinFilePanelProps, "file" | "tab" | "location"> & { panel: PluginFilePanel };
-
-function PluginHost({ panel, file, tab, location, theme }: Props & { theme: PluginTheme }) {
-  const { workspaceId } = usePaneContext();
+export function PluginFilePanelHost({
+  panel,
+  ...props
+}: PluginFilePanelProps & { panel: PluginFilePanel }) {
   const { plugin, contribution } = panel;
-  const serverId = plugin.serverId;
-  const compact = useIsCompactFormFactor();
-  const hosts = useHosts();
-  const navigation = usePluginHostNavigation(serverId);
-  const stateSource = useMemo(() => createPluginClientStateSource(serverId), [serverId]);
-  const hostLabel = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
-  const host = useMemo(() => ({ id: serverId, label: hostLabel }), [serverId, hostLabel]);
-  const layout = useMemo(() => ({ compact, platform: resolvePluginPlatform() }), [compact]);
+  const stateSource = useMemo(
+    () => createPluginClientStateSource(plugin.serverId),
+    [plugin.serverId],
+  );
   const Component = contribution.Component;
   return (
     <SurfaceErrorBoundary installation={plugin} Surface={Component} key={panel.id}>
       <PluginInstallationProvider plugin={plugin}>
         <PluginClientStateProvider source={stateSource}>
-          <Component
-            theme={theme}
-            host={host}
-            layout={layout}
-            navigation={navigation}
-            workspaceId={workspaceId}
-            file={file}
-            tab={tab}
-            location={location}
-          />
+          <Component {...props} />
         </PluginClientStateProvider>
       </PluginInstallationProvider>
     </SurfaceErrorBoundary>
   );
 }
-const ThemedHost = withUnistyles(PluginHost);
-const themeMapping = (theme: Theme) => ({ theme: toPluginTheme(theme) });
-export function PluginFilePanelHost(props: Props) {
-  return <ThemedHost {...props} uniProps={themeMapping} />;
-}

packages/app/src/file-panels/source/panel.tsx

@@ -7,7 +7,11 @@ import {
   type ComponentProps,
   type ComponentType,
 } from "react";
-import { useFileText, type PluginFileLocation } from "@getpaseo/plugin/client";
+import {
+  useFileText,
+  type PluginFilePanelProps,
+  type PluginFilePanelParams,
+} from "@getpaseo/plugin/client";
 import { Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
@@ -18,7 +22,6 @@ import { confirmDialog } from "@/utils/confirm-dialog";
 import { formatFileSize } from "@/utils/format-file-size";
 import type { Theme } from "@/styles/theme";
 import { FilePanelLoading } from "../loading";
-import type { BuiltinFilePanelProps } from "../panels";
 import type { FileConflictAlertState } from "./conflict-alert";
 import { FileEditorModel, getFileConflictCallout } from "./editor/model";
 import { FileEditorView } from "./editor/view";
@@ -51,10 +54,12 @@ const MAX_EDITABLE_BYTES = 1024 * 1024;
 /** A rendered view of the file's text: the panel's Preview, shown instead of its source. */
 export interface TextFilePreviewProps {
   text: string;
-  target: BuiltinFilePanelProps["target"];
+  params: PluginFilePanelProps["params"];
+  workspaceId: string;
+  host: PluginFilePanelProps["host"];
 }
 
-type TextFilePanelProps = BuiltinFilePanelProps & {
+type TextFilePanelProps = PluginFilePanelProps & {
   /** The panel's Preview; with one, the toolbar switches between Preview and Source. */
   preview?: ComponentType<TextFilePreviewProps>;
 };
@@ -78,9 +83,10 @@ export function TextFilePanel(props: TextFilePanelProps) {
  * each later line target switches to Source again.
  */
 function useTextFileView(
-  location: PluginFileLocation,
+  params: PluginFilePanelParams,
+  revision: number,
 ): [TextFileView, (view: TextFileView) => void] {
-  const lineTarget = location.lineStart ? location.revision : null;
+  const lineTarget = params.lineStart ? revision : null;
   const [view, setView] = useState<TextFileView>(lineTarget === null ? "preview" : "source");
   const [shownLineTarget, setShownLineTarget] = useState(lineTarget);
   if (lineTarget !== null && lineTarget !== shownLineTarget) {
@@ -102,17 +108,19 @@ function TooLargeTextFile({ size }: { size: number }) {
 
 function ReadonlyTextFile({
   file,
-  location,
-  target,
+  params,
+  revision,
+  workspaceId,
+  host,
   preview: Preview,
   presentation,
 }: TextFilePanelProps & { presentation: "highlighted" | "plain" }) {
   const text = useFileText(file);
   const { t } = useTranslation();
-  const [view, setView] = useTextFileView(location);
+  const [view, setView] = useTextFileView(params, revision);
   const sourceLocation = useMemo(
-    () => ({ path: target.path, lineStart: location.lineStart, lineEnd: location.lineEnd }),
-    [location.lineEnd, location.lineStart, target.path],
+    () => ({ path: params.path, lineStart: params.lineStart, lineEnd: params.lineEnd }),
+    [params.lineEnd, params.lineStart, params.path],
   );
   if (text.status === "loading") return <FilePanelLoading />;
   if (text.status === "error") {
@@ -132,13 +140,13 @@ function ReadonlyTextFile({
         onViewChange={Preview ? setView : undefined}
       />
       {showPreview ? (
-        <Preview text={text.text} target={target} />
+        <Preview text={text.text} params={params} workspaceId={workspaceId} host={host} />
       ) : (
         <ThemedFileSourceView
           content={text.text}
-          filename={target.path}
+          filename={params.path}
           location={sourceLocation}
-          navigationRevision={location.revision}
+          navigationRevision={revision}
           presentation={presentation}
         />
       )}
@@ -146,11 +154,19 @@ function ReadonlyTextFile({
   );
 }
 
-function EditableTextFile({ file, tab, location, target, preview: Preview }: TextFilePanelProps) {
+function EditableTextFile({
+  file,
+  tab,
+  params,
+  revision,
+  workspaceId,
+  host,
+  preview: Preview,
+}: TextFilePanelProps) {
   const { settings } = useAppSettings();
   const { t } = useTranslation();
   const [model] = useState(() => new FileEditorModel({ file }));
-  const [view, setView] = useTextFileView(location);
+  const [view, setView] = useTextFileView(params, revision);
   const [cursor, setCursor] = useState({ line: 1, column: 1 });
   const [vimMode, setVimMode] = useState<string | null>(settings.vimKeybindings ? "NORMAL" : null);
   const snapshot = useSyncExternalStore(model.subscribe, model.getSnapshot, model.getSnapshot);
@@ -181,8 +197,8 @@ function EditableTextFile({ file, tab, location, target, preview: Preview }: Tex
   const handleOverwrite = useCallback(() => void model.overwrite(), [model]);
   const handleRetry = useCallback(() => void model.reload(), [model]);
   const editorLocation = useMemo(
-    () => ({ path: target.path, lineStart: location.lineStart, lineEnd: location.lineEnd }),
-    [location.lineEnd, location.lineStart, target.path],
+    () => ({ path: params.path, lineStart: params.lineStart, lineEnd: params.lineEnd }),
+    [params.lineEnd, params.lineStart, params.path],
   );
 
   if (snapshot.status === "loading") return <FilePanelLoading />;
@@ -222,13 +238,13 @@ function EditableTextFile({ file, tab, location, target, preview: Preview }: Tex
         conflict={conflict}
       />
       {showPreview ? (
-        <Preview text={snapshot.content} target={target} />
+        <Preview text={snapshot.content} params={params} workspaceId={workspaceId} host={host} />
       ) : (
         <SourceEditor
           model={model}
-          filename={target.path}
+          filename={params.path}
           location={editorLocation}
-          navigationRevision={location.revision}
+          navigationRevision={revision}
           vimEnabled={settings.vimKeybindings}
           onCursorChange={setCursor}
           onVimModeChange={setVimMode}

packages/app/src/file-panels/view.tsx

@@ -1,9 +1,43 @@
-import type { FilePanel, BuiltinFilePanelProps } from "./panels";
+import { PluginClientStateProvider } from "@getpaseo/plugin/client/host";
+import { createPluginClientStateSource } from "@/plugins/client-state/source";
+import { useMemo } from "react";
+import type { PluginFilePanelProps } from "@getpaseo/plugin/client";
+import type { PluginTheme } from "@getpaseo/plugin";
+import { withUnistyles } from "react-native-unistyles";
+import { useIsCompactFormFactor } from "@/constants/layout";
+import { usePaneContext } from "@/panels/pane-context";
+import { useHosts } from "@/runtime/host-runtime";
+import { usePluginHostNavigation } from "@/plugins/host-navigation";
+import { resolvePluginPlatform } from "@/plugins/platform";
+import { toPluginTheme } from "@/plugins/theme";
+import type { Theme } from "@/styles/theme";
+import type { FilePanel } from "./panels";
 import { BuiltinFilePanelView } from "./builtin";
 import { PluginFilePanelHost } from "./plugin-host";
 
-/** Renders a file panel as the file tab's body. The panel owns its loading, errors and saving. */
-export function FilePanelView({ panel, ...props }: BuiltinFilePanelProps & { panel: FilePanel }) {
-  if (panel.builtin) return <BuiltinFilePanelView {...props} panel={panel} />;
+type Props = Pick<PluginFilePanelProps, "file" | "tab" | "params" | "revision"> & {
+  panel: FilePanel;
+};
+function FilePanelHost({ panel, theme, ...input }: Props & { theme: PluginTheme }) {
+  const { workspaceId, serverId } = usePaneContext();
+  const compact = useIsCompactFormFactor();
+  const hosts = useHosts();
+  const label = hosts.find((host) => host.serverId === serverId)?.label ?? serverId;
+  const host = useMemo(() => ({ id: serverId, label }), [serverId, label]);
+  const layout = useMemo(() => ({ compact, platform: resolvePluginPlatform() }), [compact]);
+  const stateSource = useMemo(() => createPluginClientStateSource(serverId), [serverId]);
+  const navigation = usePluginHostNavigation(serverId);
+  const props: PluginFilePanelProps = { ...input, workspaceId, theme, host, layout, navigation };
+  if (panel.builtin)
+    return (
+      <PluginClientStateProvider source={stateSource}>
+        <BuiltinFilePanelView {...props} panel={panel} />
+      </PluginClientStateProvider>
+    );
   return <PluginFilePanelHost {...props} panel={panel} />;
 }
+const ThemedHost = withUnistyles(FilePanelHost);
+const themeMapping = (theme: Theme) => ({ theme: toPluginTheme(theme) });
+export function FilePanelView(props: Props) {
+  return <ThemedHost {...props} uniProps={themeMapping} />;
+}

packages/app/src/git/diff-document/workspace-cache.tsx

@@ -1,4 +1,4 @@
-import { createContext, useContext, useState, type ReactNode } from "react";
+import React, { createContext, useCallback, useContext, useState, type ReactNode } from "react";
 import invariant from "tiny-invariant";
 import { buildDiffDocumentModel, retainReusableModels, reviewGeometryKey } from "./model";
 import type {
@@ -162,6 +162,16 @@ function paletteKey(palette: DiffPalette): string {
 
 const WorkspaceCacheContext = createContext<DiffDocumentWorkspaceCache | null>(null);
 
+export function useDiffDocumentWorkspaceCacheBridge() {
+  const cache = useDiffDocumentWorkspaceCache();
+  return useCallback(
+    (children: ReactNode) => (
+      <WorkspaceCacheContext.Provider value={cache}>{children}</WorkspaceCacheContext.Provider>
+    ),
+    [cache],
+  );
+}
+
 export function DiffDocumentWorkspaceCacheProvider({ children }: { children: ReactNode }) {
   const [cache] = useState(createDiffDocumentWorkspaceCache);
   return <WorkspaceCacheContext.Provider value={cache}>{children}</WorkspaceCacheContext.Provider>;

packages/app/src/hooks/sidebar-workspaces-view-model.ts

@@ -1,3 +1,4 @@
+import { deriveEffectiveWorkspaceStatus } from "@/workspace-status";
 import equal from "fast-deep-equal";
 import type { PrHint } from "@/git/pr-hint";
 import { selectPrHintFromStatus } from "@/git/pr-hint";
@@ -124,11 +125,6 @@ export function areSidebarWorkspaceSessionsEqual(
   return true;
 }
 
-interface EffectiveWorkspaceStatus {
-  status: WorkspaceDescriptor["status"];
-  enteredAt: Date | null;
-}
-
 function projectNameForWorkspace(workspace: WorkspaceDescriptor): string {
   return (
     workspace.projectCustomName ??
@@ -189,51 +185,6 @@ export function createSidebarWorkspaceEntry(input: {
 
 const EMPTY_WORKSPACE_LABELS: string[] = [];
 
-function deriveEffectiveWorkspaceStatus(input: {
-  serverId: string;
-  workspace: WorkspaceDescriptor;
-  pendingCreateAttempts?: Record<string, PendingCreateAttempt>;
-  workspaceAgentActivity?: ReadonlyMap<string, WorkspaceAgentActivity>;
-}): EffectiveWorkspaceStatus {
-  if (input.workspace.status !== "done") {
-    return { status: input.workspace.status, enteredAt: input.workspace.statusEnteredAt };
-  }
-
-  const pendingStartedAt = getPendingInitialAgentCreateStartedAt({
-    serverId: input.serverId,
-    workspaceId: input.workspace.id,
-    pendingCreateAttempts: input.pendingCreateAttempts,
-  });
-  if (pendingStartedAt) {
-    return { status: "running", enteredAt: pendingStartedAt };
-  }
-
-  const rootAgentActivity = input.workspaceAgentActivity?.get(input.workspace.id);
-  if (rootAgentActivity && rootAgentActivity.status !== "done") {
-    return rootAgentActivity;
-  }
-
-  return { status: input.workspace.status, enteredAt: input.workspace.statusEnteredAt };
-}
-
-function getPendingInitialAgentCreateStartedAt(input: {
-  serverId: string;
-  workspaceId: string;
-  pendingCreateAttempts: Record<string, PendingCreateAttempt> | undefined;
-}): Date | null {
-  let latestStartedAt: Date | null = null;
-  for (const pending of Object.values(input.pendingCreateAttempts ?? {})) {
-    if (pending.serverId !== input.serverId) continue;
-    if (pending.workspaceId !== input.workspaceId) continue;
-    if (pending.lifecycle === "abandoned") continue;
-    const startedAt = new Date(pending.timestamp);
-    if (!latestStartedAt || startedAt > latestStartedAt) {
-      latestStartedAt = startedAt;
-    }
-  }
-  return latestStartedAt;
-}
-
 export interface ProjectStatusSession {
   workspaces: Map<string, WorkspaceDescriptor>;
   workspaceAgentActivity: Map<string, WorkspaceAgentActivity>;

packages/app/src/hooks/use-import-session.tsx

@@ -1,10 +1,9 @@
 import { useCallback, useState, type ReactNode } from "react";
-import { type Href, useRouter } from "expo-router";
 import { useTranslation } from "react-i18next";
 import { ImportSessionSheet } from "@/components/import-session-sheet";
 import { useHostChooser } from "@/hosts/host-chooser";
 import { useHostRuntimeClient } from "@/runtime/host-runtime";
-import { buildHostAgentDetailRoute } from "@/utils/host-routes";
+import { navigateToAgent } from "@/utils/navigate-to-agent";
 import { useOpenProject } from "@/hooks/use-open-project";
 
 interface UseImportSessionOptions {
@@ -31,7 +30,6 @@ interface ImportedAgentTarget {
 export function useNavigateToImportedAgent(
   serverId: string | null | undefined,
 ): (agent: ImportedAgentTarget) => Promise<void> {
-  const router = useRouter();
   const normalizedServerId = serverId?.trim() || null;
   const openProject = useOpenProject(normalizedServerId);
 
@@ -40,10 +38,10 @@ export function useNavigateToImportedAgent(
       if (!normalizedServerId) return;
       const project = await openProject(agent.cwd);
       if (project.ok) {
-        router.push(buildHostAgentDetailRoute(normalizedServerId, agent.id) as Href);
+        navigateToAgent({ serverId: normalizedServerId, agentId: agent.id });
       }
     },
-    [normalizedServerId, openProject, router],
+    [normalizedServerId, openProject],
   );
 }
 

packages/app/src/hosts/host-chooser.tsx

@@ -1,3 +1,4 @@
+import { usePanelStore } from "@/stores/panel-store";
 import { createElement, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
   Modal,
@@ -81,7 +82,13 @@ export function useHostChooser() {
       );
 
       if (availableHosts.length === 0) {
-        (input.onNoHosts ?? (() => router.push(buildSettingsAddHostRoute(Date.now()))))();
+        (
+          input.onNoHosts ??
+          (() => {
+            usePanelStore.getState().showMobileAgent();
+            router.push(buildSettingsAddHostRoute(Date.now()));
+          })
+        )();
         return false;
       }
 

packages/app/src/keyboard/shift/index.ts

@@ -1,4 +1,5 @@
 export { KeyboardShiftProvider, useKeyboardShiftStyle } from "./internal/provider";
 export { useKeyboardShift, useSettledKeyboardShift } from "./internal/context";
 export { KeyboardTranslateView } from "./internal/translate";
+export { useKeyboardAnchor } from "./internal/anchor";
 export { useKeyboardStreamInset } from "./internal/stream";

packages/app/src/keyboard/shift/internal/anchor.ts

@@ -0,0 +1,31 @@
+import { useContext, useMemo } from "react";
+import { useDerivedValue, type DerivedValue } from "react-native-reanimated";
+import {
+  KeyboardTranslationContext,
+  useKeyboardShift,
+  type KeyboardTranslationScope,
+} from "./context";
+import { resolveKeyboardLift } from "./policy";
+
+export interface KeyboardAnchor extends KeyboardTranslationScope {
+  /** The anchor's lift at keyboard boundaries. Bound overlay height with this, never per frame. */
+  reservedLift: DerivedValue<number>;
+}
+
+/**
+ * Position portal content against an element inside a `KeyboardTranslateView`.
+ * Lay the content out from `measureAtRest` and pass `translation` to a portal'd
+ * `KeyboardTranslateView`: the content then rides the anchor's own animation
+ * driver, frame for frame.
+ */
+export function useKeyboardAnchor(): KeyboardAnchor {
+  const { translation, measureAtRest } = useContext(KeyboardTranslationContext);
+  const { layoutShift } = useKeyboardShift();
+  const reservedLift = useDerivedValue(() =>
+    resolveKeyboardLift({ shift: layoutShift.value, ...translation }),
+  );
+  return useMemo(
+    () => ({ measureAtRest, translation, reservedLift }),
+    [measureAtRest, reservedLift, translation],
+  );
+}

packages/app/src/keyboard/shift/internal/context.ts

@@ -1,5 +1,7 @@
 import { createContext, useContext } from "react";
+import type { View } from "react-native";
 import type { SharedValue } from "react-native-reanimated";
+import { measureInWindow } from "./measure";
 
 export interface KeyboardShiftContextValue {
   shift: SharedValue<number>;
@@ -10,6 +12,35 @@ export interface KeyboardShiftContextValue {
 }
 
 export const KeyboardShiftContext = createContext<KeyboardShiftContextValue | null>(null);
+
+/** How the nearest KeyboardTranslateView moves its descendants with the keyboard. */
+export interface KeyboardTranslation {
+  enabled: boolean;
+  bottomClearance: number;
+}
+
+export interface WindowRect {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+/** What the nearest KeyboardTranslateView tells the content it moves. */
+export interface KeyboardTranslationScope {
+  translation: KeyboardTranslation;
+  /**
+   * The element's window rect with the keyboard closed, whatever the keyboard is doing
+   * now; null once the element or the translate view has unmounted.
+   */
+  measureAtRest: (element: View) => Promise<WindowRect | null>;
+}
+
+/** Views outside a KeyboardTranslateView stay put. */
+export const KeyboardTranslationContext = createContext<KeyboardTranslationScope>({
+  translation: { enabled: false, bottomClearance: 0 },
+  measureAtRest: measureInWindow,
+});
 export const SettledKeyboardShiftContext = createContext<number | null>(null);
 
 /** Read the app-wide keyboard inset without loading its native provider implementation. */

packages/app/src/keyboard/shift/internal/measure.ts

@@ -0,0 +1,60 @@
+import { useMemo, type RefObject } from "react";
+import type { View } from "react-native";
+import type { KeyboardTranslation, KeyboardTranslationScope, WindowRect } from "./context";
+
+export function measureInWindow(element: View): Promise<WindowRect> {
+  return new Promise((resolve) => {
+    element.measureInWindow((x, y, width, height) => resolve({ x, y, width, height }));
+  });
+}
+
+/**
+ * The element's window rect with `frame`'s own transform left out. Whether
+ * `measureInWindow` includes a transform depends on the driver: Reanimated commits
+ * it to the shadow tree, RN's native driver commits it only when the view happens
+ * to re-render. Fabric's `measureLayout` and a view's `measure` origin ignore
+ * transforms. The frame's parent must not move with the keyboard; the composer dock
+ * is the only anchor host, and its parent is the stationary dock viewport.
+ */
+function measureInUntranslatedWindow(frame: View, element: View): Promise<WindowRect | null> {
+  const parent = frame.parentElement;
+  if (!parent) return Promise.resolve(null);
+  const parentRect = parent.getBoundingClientRect();
+  const frameOrigin = new Promise<{ x: number; y: number }>((resolve) => {
+    frame.measure((x, y) => resolve({ x, y }));
+  });
+  const offset = new Promise<WindowRect | null>((resolve) => {
+    element.measureLayout(
+      frame,
+      (x, y, width, height) => resolve({ x, y, width, height }),
+      () => resolve(null),
+    );
+  });
+  return Promise.all([frameOrigin, offset]).then(([origin, rect]) =>
+    rect
+      ? {
+          x: parentRect.x + origin.x + rect.x,
+          y: parentRect.y + origin.y + rect.y,
+          width: rect.width,
+          height: rect.height,
+        }
+      : null,
+  );
+}
+
+/** What a KeyboardTranslateView publishes to the content it moves. */
+export function useKeyboardTranslationScope(
+  frameRef: RefObject<View | null>,
+  translation: KeyboardTranslation,
+): KeyboardTranslationScope {
+  return useMemo(
+    () => ({
+      translation,
+      measureAtRest: (element: View) =>
+        frameRef.current
+          ? measureInUntranslatedWindow(frameRef.current, element)
+          : Promise.resolve(null),
+    }),
+    [frameRef, translation],
+  );
+}

packages/app/src/keyboard/shift/internal/policy.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 import {
   resolveStreamKeyboardInset,
   shouldReconcileHiddenKeyboardEnd,
+  resolveKeyboardLift,
   resolveKeyboardShift,
   reserveKeyboardLayoutShift,
 } from "./policy";
@@ -89,6 +90,21 @@ describe("resolveKeyboardShift", () => {
   });
 });
 
+describe("resolveKeyboardLift", () => {
+  it("lifts a docked view by the whole shift", () => {
+    expect(resolveKeyboardLift({ shift: 302, enabled: true, bottomClearance: 0 })).toBe(302);
+  });
+
+  it("lets the keyboard fill a centered form's clearance before lifting it", () => {
+    expect(resolveKeyboardLift({ shift: 403, enabled: true, bottomClearance: 267 })).toBe(136);
+    expect(resolveKeyboardLift({ shift: 403, enabled: true, bottomClearance: 455 })).toBe(0);
+  });
+
+  it("keeps a disabled view in place", () => {
+    expect(resolveKeyboardLift({ shift: 302, enabled: false, bottomClearance: 0 })).toBe(0);
+  });
+});
+
 describe("shouldReconcileHiddenKeyboardEnd", () => {
   it("closes stale iOS keyboard state without letting a late visible end resurrect it", () => {
     expect(

packages/app/src/keyboard/shift/internal/policy.ts

@@ -52,6 +52,16 @@ export function resolveKeyboardShift(input: {
   return Math.max(0, input.rawKeyboardHeight - input.bottomInset);
 }
 
+/** Distance a KeyboardTranslateView lifts its content for a given keyboard shift. */
+export function resolveKeyboardLift(input: {
+  shift: number;
+  enabled: boolean;
+  bottomClearance: number;
+}): number {
+  "worklet";
+  return input.enabled ? Math.max(0, input.shift - input.bottomClearance) : 0;
+}
+
 export function shouldReconcileHiddenKeyboardEnd(input: {
   height: number;
   progress: number;

packages/app/src/keyboard/shift/internal/translate.android.tsx

@@ -1,7 +1,9 @@
-import type { ReactNode } from "react";
-import type { ViewProps } from "react-native";
+import { useMemo, useRef, type ReactNode } from "react";
+import type { View, ViewProps } from "react-native";
 import Animated, { useAnimatedStyle } from "react-native-reanimated";
-import { useKeyboardShift } from "./context";
+import { KeyboardTranslationContext, useKeyboardShift } from "./context";
+import { useKeyboardTranslationScope } from "./measure";
+import { resolveKeyboardLift } from "./policy";
 
 interface KeyboardTranslateViewProps extends ViewProps {
   children: ReactNode;
@@ -18,13 +20,18 @@ export function KeyboardTranslateView({
   ...props
 }: KeyboardTranslateViewProps) {
   const { shift } = useKeyboardShift();
+  const frameRef = useRef<View>(null);
+  const translation = useMemo(() => ({ enabled, bottomClearance }), [bottomClearance, enabled]);
+  const scope = useKeyboardTranslationScope(frameRef, translation);
   const keyboardStyle = useAnimatedStyle(() => ({
-    transform: [{ translateY: enabled ? -Math.max(0, shift.value - bottomClearance) : 0 }],
+    transform: [{ translateY: -resolveKeyboardLift({ shift: shift.value, ...translation }) }],
   }));
 
   return (
-    <Animated.View style={[style, keyboardStyle]} {...props}>
-      {children}
+    <Animated.View ref={frameRef} style={[style, keyboardStyle]} {...props}>
+      <KeyboardTranslationContext.Provider value={scope}>
+        {children}
+      </KeyboardTranslationContext.Provider>
     </Animated.View>
   );
 }

packages/app/src/keyboard/shift/internal/translate.ios.tsx

@@ -1,7 +1,9 @@
-import { useMemo, useEffect, type ReactNode } from "react";
-import { Animated, useAnimatedValue, type ViewProps } from "react-native";
+import { useMemo, useEffect, useRef, type ReactNode } from "react";
+import { Animated, useAnimatedValue, type View, type ViewProps } from "react-native";
 import { useKeyboardAnimation } from "react-native-keyboard-controller";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { KeyboardTranslationContext } from "./context";
+import { useKeyboardTranslationScope } from "./measure";
 
 interface KeyboardTranslateViewProps extends ViewProps {
   children: ReactNode;
@@ -35,7 +37,10 @@ export function KeyboardTranslateView({
   // Fullscreen resizes this view while disabling translation. iOS Fabric can
   // reapply its previous transform during that layout commit. Keep the graph
   // attached and apply the mode on the native animation frame; a static zero or
-  // setValue during the React commit gets overwritten by the resize.
+  // setValue during the React commit gets overwritten by the resize. A rebuilt
+  // graph (a new bottomClearance after rotation) starts from JS-side keyboard
+  // values, so run it on the native frame too or it stays stale until the
+  // keyboard next moves.
   const enabledValue = useAnimatedValue(enabled ? 1 : 0);
   useEffect(() => {
     const animation = Animated.timing(enabledValue, {
@@ -45,15 +50,21 @@ export function KeyboardTranslateView({
     });
     animation.start();
     return () => animation.stop();
-  }, [enabled, enabledValue]);
+  }, [enabled, enabledValue, translateY]);
   const keyboardStyle = useMemo(
     () => ({ transform: [{ translateY: Animated.multiply(translateY, enabledValue) }] }),
     [enabledValue, translateY],
   );
 
+  const frameRef = useRef<View>(null);
+  const translation = useMemo(() => ({ enabled, bottomClearance }), [bottomClearance, enabled]);
+  const scope = useKeyboardTranslationScope(frameRef, translation);
+
   return (
-    <Animated.View style={[style, keyboardStyle]} {...props}>
-      {children}
+    <Animated.View ref={frameRef} style={[style, keyboardStyle]} {...props}>
+      <KeyboardTranslationContext.Provider value={scope}>
+        {children}
+      </KeyboardTranslationContext.Provider>
     </Animated.View>
   );
 }

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

@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+import { buildAgentDescriptor, resolveAgentLabel } from "@/agent-presentation";
 import { i18n } from "@/i18n/i18next";
 import { buildDraftPanelDescriptor } from "@/panels/draft-panel-descriptor";
 
@@ -66,3 +67,57 @@ describe("buildDraftPanelDescriptor", () => {
     await i18n.changeLanguage("en");
   });
 });
+
+describe("shared agent descriptor", () => {
+  function describeAgent(overrides: Partial<Parameters<typeof buildAgentDescriptor>[0]> = {}) {
+    return buildAgentDescriptor({
+      provider: "codex",
+      title: "  Review checkout retries  ",
+      status: "idle",
+      pendingPermissionCount: 0,
+      requiresAttention: false,
+      attentionReason: null,
+      isTurnActive: false,
+      icon: TestIcon,
+      ...overrides,
+    });
+  }
+
+  it("keeps the normalized title and provider identity together", () => {
+    expect(describeAgent()).toMatchObject({
+      label: "Review checkout retries",
+      subtitle: "Codex agent",
+      icon: TestIcon,
+      titleState: "ready",
+      statusBucket: "done",
+    });
+  });
+
+  it.each([null, "", "   ", "New Agent", " new agent "])(
+    "leaves an untitled agent loading: %s",
+    (title) => {
+      expect(resolveAgentLabel(title)).toBeNull();
+      expect(describeAgent({ title })).toMatchObject({ label: "", titleState: "loading" });
+    },
+  );
+
+  it("shows an active turn as running before the lifecycle update arrives", () => {
+    expect(describeAgent({ isTurnActive: true }).statusBucket).toBe("running");
+  });
+
+  it("surfaces pending permissions even while the turn is running", () => {
+    expect(describeAgent({ isTurnActive: true, pendingPermissionCount: 1 }).statusBucket).toBe(
+      "needs_input",
+    );
+  });
+
+  it.each([
+    ["finished", "attention"],
+    ["error", "failed"],
+    ["permission", "needs_input"],
+  ] as const)("preserves %s attention", (attentionReason, statusBucket) => {
+    expect(describeAgent({ requiresAttention: true, attentionReason }).statusBucket).toBe(
+      statusBucket,
+    );
+  });
+});

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

@@ -39,7 +39,7 @@ import {
 } from "@/composer/pill-styles";
 import { getActiveMessageSubmissions } from "@/composer/submission/model";
 import { RewindComposerRestoreProvider } from "@/components/rewind/composer-restore";
-import { useProviderIcon } from "@/components/provider-icons";
+import { useAgentDescriptor } from "@/agent-presentation";
 import { useToastHost, type ToastApi, type ToastState } from "@/components/toast-host";
 import type { WorkspaceComposerAttachment } from "@/attachments/types";
 import { useWorkspaceAttachmentScopeKey } from "@/attachments/workspace-attachments-store";
@@ -62,7 +62,7 @@ import { TimelineSyncStatus } from "@/timeline/sync-status";
 import { usePaneContext, usePaneFocus } from "@/panels/pane-context";
 import { useAgentFactsLine } from "@/panels/agent-facts-line";
 import { PaneSubtitle } from "@/panels/pane-subtitle";
-import { definePanel, type PanelDescriptor } from "@/panels/panel-registry";
+import { definePanel } from "@/panels/panel-registry";
 import { RenderProfile } from "@/utils/render-profiler";
 import { useHasPluginComposerPills } from "@/plugins";
 import { buildDraftPanelDescriptor } from "@/panels/draft-panel-descriptor";
@@ -101,7 +101,6 @@ import { getInitDeferred, getInitKey } from "@/utils/agent-initialization";
 import { derivePendingPermissionKey, normalizeAgentSnapshot } from "@/utils/agent-snapshots";
 import { applyLegacyDaemonWorkspaceOwnership } from "@/workspace/legacy-daemon-workspaces";
 import type { WorkspaceFileOpenRequest } from "@/workspace/file-open";
-import { deriveSidebarStateBucket } from "@/utils/sidebar-agent-state";
 import { buildDraftAgentSetup, type ClientSlashCommand } from "@/client-slash-commands";
 
 interface ChatAgentStateShape {
@@ -256,31 +255,6 @@ function renderChatAgentNonReadyView(args: {
   return null;
 }
 
-function formatProviderLabel(provider: Agent["provider"]): string {
-  if (!provider) {
-    return "Agent";
-  }
-  return provider
-    .split(/[-_\s]+/)
-    .filter((part) => part.length > 0)
-    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
-    .join(" ");
-}
-
-function resolveWorkspaceAgentTabLabel(title: string | null | undefined): string | null {
-  if (typeof title !== "string") {
-    return null;
-  }
-  const normalized = title.trim();
-  if (!normalized) {
-    return null;
-  }
-  if (normalized.toLowerCase() === "new agent") {
-    return null;
-  }
-  return normalized;
-}
-
 function shouldStoreFetchedAgentInActiveDirectory(agent: Agent): boolean {
   return !agent.archivedAt && Boolean(agent.projectPlacement);
 }
@@ -328,47 +302,6 @@ function storeFetchedAgentDetail(input: {
   return hydrated;
 }
 
-function useAgentPanelDescriptor(
-  target: { kind: "agent"; agentId: string },
-  context: { serverId: string },
-): PanelDescriptor {
-  const descriptorState = useSessionStore(
-    useShallow((state) => {
-      const session = state.sessions[context.serverId];
-      const agent =
-        session?.agents?.get(target.agentId) ?? session?.agentDetails?.get(target.agentId) ?? null;
-      return {
-        provider: agent?.provider ?? "codex",
-        title: agent?.title ?? null,
-        status: agent?.status ?? null,
-        pendingPermissionCount: agent?.pendingPermissions.length ?? 0,
-        requiresAttention: agent?.requiresAttention ?? false,
-        attentionReason: agent?.attentionReason ?? null,
-        isTurnActive: selectAgentTurnPresentation(session, target.agentId).isActive,
-      };
-    }),
-  );
-  const provider = descriptorState.provider;
-  const label = resolveWorkspaceAgentTabLabel(descriptorState.title);
-  const icon = useProviderIcon(provider, context.serverId);
-
-  return {
-    label: label ?? "",
-    subtitle: `${formatProviderLabel(provider)} agent`,
-    tooltip: label ?? `${formatProviderLabel(provider)} agent`,
-    titleState: label ? "ready" : "loading",
-    icon,
-    statusBucket: descriptorState.status
-      ? deriveSidebarStateBucket({
-          status: descriptorState.isTurnActive ? "running" : descriptorState.status,
-          pendingPermissionCount: descriptorState.pendingPermissionCount,
-          requiresAttention: descriptorState.requiresAttention,
-          attentionReason: descriptorState.attentionReason,
-        })
-      : null,
-  };
-}
-
 function AgentPanel() {
   const { serverId, workspaceId, target, openFileInWorkspace } = usePaneContext();
   const { isInteractive } = usePaneFocus();
@@ -438,7 +371,7 @@ export function AgentConversationPanel() {
 
 export const agentPanelRegistration = definePanel("agent", {
   component: AgentConversationPanel,
-  useDescriptor: useAgentPanelDescriptor,
+  useDescriptor: useAgentDescriptor,
 });
 
 export function useDraftPanelDescriptor(

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

@@ -30,7 +30,7 @@ function useFilePanelDescriptor(target: { kind: "file"; path: string }) {
 
 function FilePanel() {
   const { t } = useTranslation();
-  const { serverId, workspaceId, target, fileNavigationRevision } = usePaneContext();
+  const { serverId, workspaceId, target, panelRevision } = usePaneContext();
   const workspaceDirectory = useWorkspaceDirectory(serverId, workspaceId);
   invariant(target.kind === "file", "FilePanel requires file target");
   if (!workspaceDirectory) {
@@ -45,7 +45,7 @@ function FilePanel() {
       serverId={serverId}
       workspaceRoot={workspaceDirectory}
       location={target}
-      navigationRevision={fileNavigationRevision ?? 0}
+      navigationRevision={panelRevision ?? 0}
     />
   );
 }

packages/app/src/panels/pane-context.tsx

@@ -13,7 +13,7 @@ export interface PaneContextValue {
   tabId: string;
   target: WorkspaceTabTarget;
   state?: JsonValue;
-  fileNavigationRevision?: number;
+  panelRevision?: number;
   openTab: (target: WorkspaceTabTarget) => void;
   openPreferredTarget: (target: WorkspaceTabTarget, source: OpenInSidePaneSource) => void;
   openTargetToSide?: (target: WorkspaceTabTarget) => void;

packages/app/src/panels/retained-chat-content.browser.test.tsx

@@ -1,11 +1,39 @@
-import { act, useLayoutEffect, useState, useSyncExternalStore } from "react";
+import React, {
+  act,
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useState,
+  useSyncExternalStore,
+} from "react";
 import { createRoot, type Root } from "react-dom/client";
-import { afterEach, beforeEach, expect, it } from "vitest";
-import { RetainedPanelActivity } from "@/components/retained-panel";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { RetainedPanelActivity, useRetainedPanelActive } from "@/components/retained-panel";
 import { RetainedChatContent as NativeChat } from "./retained-chat-content.native";
 import { RetainedChatContent as WebChat } from "./retained-chat-content.web";
 import { useMountedTabSet } from "@/screens/workspace/use-mounted-tab-set";
 
+import {
+  ComposerEditingScope,
+  ComposerEditingSessionsProvider,
+  WorkspaceComposerEditingSessionsProvider,
+  useComposerEditingSession,
+} from "@/composer/editing-session";
+import {
+  DiffDocumentWorkspaceCacheProvider,
+  useDiffDocumentWorkspaceCache,
+} from "@/git/diff-document/workspace-cache";
+import {
+  AssistantFileLinkResolverProvider,
+  useAssistantFileLinkEnvironment,
+} from "@/assistant-file-links";
+import type { ContextBridge } from "@/components/ui/isolated-bottom-sheet-modal";
+
+import { render as renderEnvironment } from "@testing-library/react";
+import { useWorkspaceSheetEnvironment } from "@/screens/workspace/workspace-sheet-environment";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { useAssistantFileLinkActions, type InlinePathTarget } from "@/assistant-file-links";
+
 Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
 let root: Root;
 let container: HTMLDivElement;
@@ -99,3 +127,96 @@ it("retains modified panels beyond the LRU cap and evicts them normally after sa
   render("e");
   expect(mounted).toEqual(["e", "a", "b"]);
 });
+
+describe("workspace sheet environment", () => {
+  it("shares editing sessions and diff cache across the host, keeping resolver updates live", async () => {
+    let bridge: ContextBridge = (children) => children;
+    const observations = new Map<string, ReturnType<typeof useEnvironment>>();
+    let mounts = 0;
+    const queryClient = new QueryClient();
+    const opened: Array<{ root: string; path: string }> = [];
+    function useEnvironment() {
+      return {
+        session: useComposerEditingSession("chat"),
+        cache: useDiffDocumentWorkspaceCache(),
+        files: useAssistantFileLinkEnvironment(),
+        active: useRetainedPanelActive(),
+        actions: useAssistantFileLinkActions(),
+      };
+    }
+    function Probe({ name }: { name: string }) {
+      observations.set(name, useEnvironment());
+      useEffect(() => {
+        if (name === "sheet") mounts++;
+      }, [name]);
+      return null;
+    }
+    function Capture() {
+      bridge = useWorkspaceSheetEnvironment();
+      return (
+        <ComposerEditingScope tabId="file" targetKey="file:a">
+          <Probe name="pane" />
+        </ComposerEditingScope>
+      );
+    }
+    function Source({ workspaceRoot, active }: { workspaceRoot: string; active: boolean }) {
+      const onOpenFile = useCallback(
+        (target: InlinePathTarget) => {
+          opened.push({ root: workspaceRoot, path: target.path });
+        },
+        [workspaceRoot],
+      );
+      return (
+        <QueryClientProvider client={queryClient}>
+          <ComposerEditingSessionsProvider>
+            <WorkspaceComposerEditingSessionsProvider
+              workspaceKey="host:workspace"
+              tabIds={["file"]}
+            >
+              <DiffDocumentWorkspaceCacheProvider>
+                <AssistantFileLinkResolverProvider
+                  workspaceRoot={workspaceRoot}
+                  onOpenWorkspaceFile={onOpenFile}
+                >
+                  <RetainedPanelActivity active={active}>
+                    <Capture />
+                  </RetainedPanelActivity>
+                </AssistantFileLinkResolverProvider>
+              </DiffDocumentWorkspaceCacheProvider>
+            </WorkspaceComposerEditingSessionsProvider>
+          </ComposerEditingSessionsProvider>
+        </QueryClientProvider>
+      );
+    }
+    const source = renderEnvironment(<Source workspaceRoot="/before" active />);
+    const sheetContent = (
+      <ComposerEditingScope tabId="file" targetKey="file:a">
+        <Probe name="sheet" />
+      </ComposerEditingScope>
+    );
+    const sheet = renderEnvironment(
+      <QueryClientProvider client={queryClient}>{bridge(sheetContent)}</QueryClientProvider>,
+    );
+    const pane = observations.get("pane")!;
+    expect(observations.get("sheet")?.session).toBe(pane.session);
+    expect(observations.get("sheet")?.cache).toBe(pane.cache);
+    expect(observations.get("sheet")?.files.workspaceRoot).toBe("/before");
+    const actions = observations.get("sheet")!.actions;
+    act(() => pane.session.setFullscreen(true));
+    source.rerender(<Source workspaceRoot="/after" active={false} />);
+    // An action captured before the provider update must already use the live resolver value.
+    await act(async () => actions.open({ href: "/after/linked.ts" }, "preferred"));
+    expect(opened).toEqual([{ root: "/after", path: "/after/linked.ts" }]);
+    sheet.rerender(
+      <QueryClientProvider client={queryClient}>{bridge(sheetContent)}</QueryClientProvider>,
+    );
+    expect(observations.get("sheet")?.session).toBe(pane.session);
+    expect(observations.get("sheet")?.session.getFullscreen()).toBe(true);
+    expect(observations.get("sheet")?.cache).toBe(pane.cache);
+    expect(observations.get("sheet")?.files.workspaceRoot).toBe("/after");
+    expect(observations.get("sheet")?.active).toBe(false);
+    expect(mounts).toBe(1);
+    sheet.unmount();
+    source.unmount();
+  });
+});

packages/app/src/plugins/evaluate.test.ts

@@ -381,6 +381,23 @@ describe("evaluatePluginClientBundle", () => {
     ).toEqual([{ id: "open-review", title: "Open review", icon: "Scan", context: "agent" }]);
   });
 
+  it("registers workspace and agent panels with stable aliases", () => {
+    const plugin = evaluatePluginClientBundle(
+      "panels",
+      bundle(`
+      const Component = () => null;
+      plugin.addWorkspacePanel({ id: "workspace", title: "Workspace", icon: "File", Component });
+      plugin.addAgentPanel({ id: "agent", title: "Agent", icon: "File", Component });
+      plugin.addWorkspacePanel({ id: "legacy", title: "Legacy", icon: "File", context: "agent", Component });
+    `),
+    );
+    expect(plugin.workspacePanels.map(({ id, context }) => ({ id, context }))).toEqual([
+      { id: "workspace", context: "workspace" },
+      { id: "agent", context: "agent" },
+      { id: "legacy", context: "agent" },
+    ]);
+  });
+
   it("registers inline SVG and component icons", () => {
     const svg = '<svg viewBox="0 0 24 24"><path fill="currentColor" d="M4 4h16v16H4z" /></svg>';
     const plugin = evaluatePluginClientBundle(

packages/app/src/plugins/evaluate.ts

@@ -15,6 +15,8 @@ import * as Zod from "zod";
 import { type PluginCleanup } from "@getpaseo/plugin";
 import {
   type PluginClientContext,
+  type PluginAgentPanelContribution,
+  type PluginWorkspacePanelContribution as WorkspacePanelInput,
   type PluginScreenProps,
   type PluginScreenTitle,
   type PluginText,
@@ -206,6 +208,31 @@ export function runPluginClientBundle(
       () => ids.delete(normalizedId),
     );
   }
+  function registerPanel(contribution: PluginWorkspacePanelContribution): PluginCleanup {
+    const normalizedId = requireId(contribution.id, "workspace panel id");
+    if (workspacePanelIds.has(normalizedId)) {
+      throw new Error(`Duplicate workspace panel: ${normalizedId}`);
+    }
+    const title = normalizePluginText(contribution.title);
+    if (!title) throw new Error(`Workspace panel ${normalizedId} has no title`);
+    const icon = parsePluginIcon(`Workspace panel ${normalizedId}`, contribution.icon);
+    if (typeof contribution.Component !== "function") {
+      throw new Error(`Workspace panel ${normalizedId} is not a component`);
+    }
+    const locations = normalizePanelLocations(normalizedId, contribution.locations);
+    workspacePanelIds.add(normalizedId);
+    return register(
+      collector.workspacePanels,
+      {
+        ...contribution,
+        id: normalizedId,
+        title,
+        icon,
+        locations,
+      },
+      () => workspacePanelIds.delete(normalizedId),
+    );
+  }
   const pluginContext: PluginClientContext = {
     ...runtime,
     addSettingsScreen(contribution) {
@@ -313,33 +340,17 @@ export function runPluginClientBundle(
         () => filePanelIds.delete(panelId),
       );
     },
-    addWorkspacePanel(contribution: PluginWorkspacePanelContribution) {
-      const normalizedId = requireId(contribution.id, "workspace panel id");
-      if (workspacePanelIds.has(normalizedId)) {
-        throw new Error(`Duplicate workspace panel: ${normalizedId}`);
+    addAgentPanel(contribution: PluginAgentPanelContribution<PluginText>) {
+      return registerPanel({ ...contribution, context: "agent" });
+    },
+    addWorkspacePanel(input: WorkspacePanelInput<PluginText>) {
+      // COMPAT(pluginAgentPanelAlias): added in v0.13.0, remove after 2027-04-23
+      if (input.context === "agent") return pluginContext.addAgentPanel(input);
+      // COMPAT(pluginPanelFlatProps): added in v0.13.0, remove after 2027-04-23
+      if (input.context !== undefined && input.context !== "workspace") {
+        throw new Error(`Workspace panel ${input.id} has invalid context`);
       }
-      const title = normalizePluginText(contribution.title);
-      if (!title) throw new Error(`Workspace panel ${normalizedId} has no title`);
-      const icon = parsePluginIcon(`Workspace panel ${normalizedId}`, contribution.icon);
-      if (contribution.context !== "workspace" && contribution.context !== "agent") {
-        throw new Error(`Workspace panel ${normalizedId} has invalid context`);
-      }
-      if (typeof contribution.Component !== "function") {
-        throw new Error(`Workspace panel ${normalizedId} is not a component`);
-      }
-      const locations = normalizePanelLocations(normalizedId, contribution.locations);
-      workspacePanelIds.add(normalizedId);
-      return register(
-        collector.workspacePanels,
-        {
-          ...contribution,
-          id: normalizedId,
-          title,
-          icon,
-          locations,
-        },
-        () => workspacePanelIds.delete(normalizedId),
-      );
+      return registerPanel({ ...input, context: "workspace" });
     },
     addCommandCenterItem(contribution: PluginCommandCenterItemContribution) {
       const normalizedId = requireId(contribution.id, "Command Center item id");

packages/app/src/plugins/types.ts

@@ -32,7 +32,10 @@ type PluginSidebarContribution = SDKPluginSidebarContribution<PluginText>;
 type PluginSidebarItemContribution = SDKPluginSidebarItemContribution<PluginText>;
 type PluginScreenContribution = SDKPluginScreenContribution<PluginText>;
 type PluginSettingsScreenContribution = SDKPluginSettingsScreenContribution<PluginText>;
-type PluginWorkspacePanelContribution = SDKPluginWorkspacePanelContribution<PluginText>;
+type WorkspacePanelInput = SDKPluginWorkspacePanelContribution<PluginText>;
+type PluginWorkspacePanelContribution =
+  | (Extract<WorkspacePanelInput, { context?: "workspace" }> & { context: "workspace" })
+  | Extract<WorkspacePanelInput, { context: "agent" }>;
 
 export type PluginSidebarSection = "header" | "footer";
 

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

@@ -1,8 +1,13 @@
-import type { PluginAgentPanelProps, PluginWorkspacePanelProps } from "@getpaseo/plugin/client";
+import { usePublishPanelInstanceAttributes } from "@/panels/panel-instance-attributes";
+import type {
+  PluginAgentPanelProps,
+  PluginWorkspacePanelProps,
+  PluginTab,
+} from "@getpaseo/plugin/client";
 import type { PluginTheme } from "@getpaseo/plugin";
 import { PluginClientStateProvider } from "@getpaseo/plugin/client/host";
 import { CircleAlert } from "lucide-react-native";
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import { Text, View } from "react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import invariant from "tiny-invariant";
@@ -29,7 +34,20 @@ const pluginThemeMapping = (theme: Theme) => ({
 });
 
 function PluginPanelBody({ theme }: { theme: PluginTheme }) {
-  const { serverId, workspaceId, target } = usePaneContext();
+  const {
+    serverId,
+    workspaceId,
+    target,
+    state: tabState,
+    setCurrentTabState,
+    panelRevision,
+  } = usePaneContext();
+  const [modified, setModified] = useState(false);
+  usePublishPanelInstanceAttributes({ modified });
+  const tab = useMemo<PluginTab>(
+    () => ({ state: tabState, setState: setCurrentTabState, setModified }),
+    [tabState, setCurrentTabState],
+  );
   invariant(target.kind === "plugin", "PluginPanel requires plugin target");
   const plugin = useInstalledPlugin(serverId, target.pluginId);
   const contribution = resolvePluginWorkspacePanel(plugin, target);
@@ -63,7 +81,11 @@ function PluginPanelBody({ theme }: { theme: PluginTheme }) {
   let Surface: unknown;
   if (contribution.context === "workspace") {
     const props: PluginWorkspacePanelProps = {
+      // COMPAT(pluginPanelFlatProps): added in v0.13.0, remove after 2027-04-23
       context: "workspace",
+      params: {},
+      revision: panelRevision ?? 0,
+      tab,
       theme,
       host,
       layout,
@@ -75,12 +97,17 @@ function PluginPanelBody({ theme }: { theme: PluginTheme }) {
     panel = <Component {...props} />;
   } else if (agentExists && target.context === "agent") {
     const props: PluginAgentPanelProps = {
+      // COMPAT(pluginPanelFlatProps): added in v0.13.0, remove after 2027-04-23
       context: "agent",
+      params: { agentId: target.agentId },
+      revision: panelRevision ?? 0,
+      tab,
       theme,
       host,
       layout,
       navigation,
       workspaceId,
+      // COMPAT(pluginPanelFlatProps): added in v0.13.0, remove after 2027-04-23
       agentId: target.agentId,
     };
     const Component = contribution.Component;

packages/app/src/plugins/workspace-panels/resolution.ts

@@ -1,11 +1,11 @@
-import type { PluginWorkspacePanelContribution } from "../types";
+import type { EvaluatedPluginWorkspacePanelContribution } from "../types";
 import type { InstalledPlugin } from "../types";
 import type { PluginWorkspaceTabTarget } from "@/workspace-tabs/model";
 
 export function resolvePluginWorkspacePanel(
   plugin: InstalledPlugin | null,
   target: PluginWorkspaceTabTarget,
-): PluginWorkspacePanelContribution | null {
+): EvaluatedPluginWorkspacePanelContribution | null {
   return (
     plugin?.workspacePanels.find(
       (panel) => panel.id === target.panelId && panel.context === target.context,

packages/app/src/screens/workspace/sheet-tabs.tsx

@@ -37,6 +37,7 @@ import {
   type WorkspacePaneContentModel,
 } from "@/screens/workspace/workspace-pane-content";
 import { useWorkspaceLayoutStore, type SheetTab } from "@/stores/workspace-layout-store";
+import { useWorkspaceSheetEnvironment } from "./workspace-sheet-environment";
 
 const SNAP_POINTS = ["92%"];
 const NO_SHEETS: readonly SheetTab[] = [];
@@ -101,8 +102,8 @@ interface SheetTabSheetProps extends Omit<SheetTabsProps, "workspaceKey" | "onCl
 }
 
 /**
- * The workspace's sheet tabs, one sheet each, on the app-wide sheet stack. They present from inside
- * the workspace's `SheetHostScope`, so each panel keeps every context an ordinary pane has, and a
+ * The workspace's sheet tabs, one sheet each, on the app-wide sheet stack. Their environment
+ * crosses into the app overlay host so compact sheets cover both sidebars, and a
  * sheet opened from any other sheet (a subagent chosen from the subagents list, say) lands on top of
  * it and uncovers it on close. The shared sheet parts (`SheetBackground`, `SheetHandle`,
  * `SheetHeaderView`) keep them looking and dragging like every other sheet.
@@ -160,6 +161,7 @@ function SheetTabSheet({
   const { tab } = sheet;
   const sheetRef = useRef<IsolatedBottomSheetModalRef>(null);
   const isScreenFocused = useIsFocused();
+  const contextBridge = useWorkspaceSheetEnvironment();
   ensurePanelsRegistered();
   const registration = getPanelRegistration(tab.target.kind);
   if (!registration) {
@@ -236,7 +238,7 @@ function SheetTabSheet({
   return (
     <IsolatedBottomSheetModal
       ref={sheetRef}
-      contextBridge={null}
+      contextBridge={contextBridge}
       snapPoints={SNAP_POINTS}
       enableDynamicSizing={false}
       enablePanDownToClose

packages/app/src/screens/workspace/workspace-file-open-command.test.ts

@@ -1,33 +1,63 @@
-import { describe, expect, it, vi } from "vitest";
-import { openWorkspaceFileFromExplorer } from "@/screens/workspace/workspace-file-open-command";
+import { beforeEach, describe, expect, it } from "vitest";
+import { openWorkspaceFileFromExplorer } from "./workspace-file-open-command";
+import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
+import { usePanelStore } from "@/stores/panel-store";
+import { revealWorkspaceTab } from "@/workspace-tabs/navigation";
 
-function createInput(closeExplorerAfterOpen: boolean) {
-  return {
-    filePath: "src/app.tsx",
-    persistenceKey: "server:workspace",
-    closeExplorerAfterOpen,
-    showMobileAgent: vi.fn(),
-    openWorkspaceTabInFocusedPane: vi.fn(() => "file-tab"),
-    focusWorkspaceTab: vi.fn(),
-  };
-}
-
-describe("openWorkspaceFileFromExplorer", () => {
-  it("closes the phone overlay after opening a file", () => {
-    const input = createInput(true);
-
-    openWorkspaceFileFromExplorer(input);
-
-    expect(input.showMobileAgent).toHaveBeenCalledOnce();
+const workspaceKey = "server:workspace";
+function openFile(filePath: string, persistenceKey: string | null = workspaceKey) {
+  openWorkspaceFileFromExplorer({
+    filePath,
+    persistenceKey,
+    openWorkspaceTabInFocusedPane: (key, target, placement) =>
+      useWorkspaceLayoutStore
+        .getState()
+        .openTab({ workspaceKey: key, target, placement, intent: "reveal" }),
+    revealWorkspaceTab,
   });
-
-  it("keeps the tablet dock open after opening a file", () => {
-    const input = createInput(false);
-
-    openWorkspaceFileFromExplorer(input);
-
-    expect(input.showMobileAgent).not.toHaveBeenCalled();
-    expect(input.openWorkspaceTabInFocusedPane).toHaveBeenCalledOnce();
-    expect(input.focusWorkspaceTab).toHaveBeenCalledWith("server:workspace", "file-tab");
+}
+beforeEach(() => {
+  useWorkspaceLayoutStore.setState({
+    layoutMode: "compact",
+    layoutByWorkspace: {},
+    sheetsByWorkspace: {},
+    explorerSidebarPaneIdByWorkspace: {},
+  });
+  usePanelStore.getState().showMobileFileExplorer();
+});
+describe("file search destination", () => {
+  it("preserves Explorer under a new file sheet", () => {
+    openFile("new.ts");
+    expect(usePanelStore.getState().mobilePanel.target).toBe("file-explorer");
+    expect(useWorkspaceLayoutStore.getState().sheetsByWorkspace[workspaceKey]).toHaveLength(1);
+  });
+  it.each([null, workspaceKey])("preserves context when no file opens (%s)", (key) => {
+    openFile("", key);
+    expect(usePanelStore.getState().mobilePanel.target).toBe("file-explorer");
+  });
+  it("reveals an existing main tab", () => {
+    const store = useWorkspaceLayoutStore.getState();
+    store.setLayoutMode("split-panes");
+    store.openTab({
+      workspaceKey,
+      target: { kind: "file", path: "existing.ts" },
+      intent: "reveal",
+    });
+    store.setLayoutMode("compact");
+    openFile("existing.ts");
+    expect(usePanelStore.getState().mobilePanel.target).toBe("agent");
+  });
+  it("reveals the existing Explorer tab from the left sidebar", () => {
+    const store = useWorkspaceLayoutStore.getState();
+    const paneId = store.showExplorerSidebar(workspaceKey)!;
+    store.openTab({
+      workspaceKey,
+      target: { kind: "file", path: "existing.ts" },
+      intent: "reveal",
+      placement: { mode: "pane", paneId },
+    });
+    usePanelStore.getState().showMobileAgentList();
+    openFile("existing.ts");
+    expect(usePanelStore.getState().mobilePanel.target).toBe("file-explorer");
   });
 });

packages/app/src/screens/workspace/workspace-file-open-command.ts

@@ -11,20 +11,15 @@ import type { WorkspaceTabTarget } from "@/workspace-tabs/model";
 interface OpenWorkspaceFileFromExplorerInput {
   filePath: string;
   persistenceKey: string | null;
-  closeExplorerAfterOpen: boolean;
-  showMobileAgent: () => void;
   openWorkspaceTabInFocusedPane: (
     workspaceKey: string,
     target: WorkspaceTabTarget,
     placement?: WorkspaceTabPlacement,
   ) => string | null;
-  focusWorkspaceTab: (workspaceKey: string, tabId: string) => void;
+  revealWorkspaceTab: (workspaceKey: string, tabId: string) => void;
 }
 
 export function openWorkspaceFileFromExplorer(input: OpenWorkspaceFileFromExplorerInput): void {
-  if (input.closeExplorerAfterOpen) {
-    input.showMobileAgent();
-  }
   if (!input.persistenceKey) {
     return;
   }
@@ -38,6 +33,6 @@ export function openWorkspaceFileFromExplorer(input: OpenWorkspaceFileFromExplor
     FOCUSED_PANE_PLACEMENT,
   );
   if (tabId) {
-    input.focusWorkspaceTab(input.persistenceKey, tabId);
+    input.revealWorkspaceTab(input.persistenceKey, tabId);
   }
 }

packages/app/src/screens/workspace/workspace-pane-content.tsx

@@ -27,7 +27,7 @@ export interface BuildWorkspacePaneContentModelInput {
   normalizedServerId: string;
   normalizedWorkspaceId: string;
   host: PaneHost;
-  fileNavigationRevision?: number;
+  panelRevision?: number;
   onOpenTab: (target: WorkspaceTabDescriptor["target"]) => void;
   onOpenPreferredTarget: (
     target: WorkspaceTabDescriptor["target"],
@@ -46,7 +46,7 @@ export function buildWorkspacePaneContentModel({
   normalizedServerId,
   normalizedWorkspaceId,
   host,
-  fileNavigationRevision,
+  panelRevision,
   onOpenTab,
   onOpenPreferredTarget,
   onOpenTargetToSide,
@@ -69,7 +69,7 @@ export function buildWorkspacePaneContentModel({
       tabId: tab.tabId,
       target: tab.target,
       state: tab.state,
-      fileNavigationRevision,
+      panelRevision,
       openTab: onOpenTab,
       openPreferredTarget: onOpenPreferredTarget,
       openTargetToSide: onOpenTargetToSide,
@@ -112,7 +112,7 @@ export function WorkspacePaneContent({
       tabId: paneContextValue.tabId,
       target: paneContextValue.target,
       state: paneContextValue.state,
-      fileNavigationRevision: paneContextValue.fileNavigationRevision,
+      panelRevision: paneContextValue.panelRevision,
       openTab,
       openPreferredTarget,
       openTargetToSide: paneContextValue.openTargetToSide ? openTargetToSide : undefined,
@@ -130,7 +130,7 @@ export function WorkspacePaneContent({
       openPreferredTarget,
       openTargetToSide,
       paneContextValue.serverId,
-      paneContextValue.fileNavigationRevision,
+      paneContextValue.panelRevision,
       paneContextValue.tabId,
       paneContextValue.target,
       paneContextValue.state,

packages/app/src/screens/workspace/workspace-screen.tsx

@@ -786,10 +786,11 @@ function WorkspacePanelSurface({
   children: ReactNode;
   tabIds: readonly string[];
 }) {
+  const isCompact = useIsCompactFormFactor();
   return (
     <WorkspaceComposerEditingSessionsProvider workspaceKey={workspaceKey} tabIds={tabIds}>
       <NewTabLauncherProvider value={launcher}>
-        <SheetHostScope>
+        <SheetHostScope enabled={!isCompact}>
           <View style={styles.threePaneRow} onLayout={onLayout}>
             {children}
           </View>
@@ -1130,22 +1131,15 @@ function WorkspaceScreenContent({
     ) => openTab({ workspaceKey, target, intent: "reveal", parentTabId, placement }),
     [openTab],
   );
-  // File targets stay identity-stable so the same path reuses its tab. Keep navigation
-  // requests separate so clicking an unchanged path:line can still recenter the pane.
-  const [fileNavigationRevisionByTabId, setFileNavigationRevisionByTabId] = useState<
-    Record<string, number>
-  >({});
-  const requestFileNavigation = useCallback((tabId: string) => {
-    setFileNavigationRevisionByTabId((current) => ({
-      ...current,
-      [tabId]: (current[tabId] ?? 0) + 1,
-    }));
-  }, []);
+  const panelRevisions = useWorkspaceLayoutStore((state) =>
+    persistenceKey ? state.panelRevisionByWorkspace[persistenceKey] : undefined,
+  );
   const focusWorkspacePane = useWorkspaceLayoutStore((state) => state.focusPane);
   const hasHydratedWorkspaces = useSessionStore(
     (state) => state.sessions[normalizedServerId]?.hasHydratedWorkspaces ?? false,
   );
   const pendingOpenTarget = usePendingWorkspaceOpen({
+    onOpened: revealWorkspaceTab,
     workspaceKey: persistenceKey,
     hasHydratedWorkspaces,
     workspaceExists: workspaceDescriptor !== null,
@@ -1669,9 +1663,6 @@ function WorkspaceScreenContent({
       if (!normalizedLocation) {
         return;
       }
-      if (isMobile) {
-        showMobileAgent();
-      }
       if (!persistenceKey) {
         return;
       }
@@ -1680,19 +1671,10 @@ function WorkspaceScreenContent({
         ? revealWorkspaceChildTab(persistenceKey, target, parentTabId, FOCUSED_PANE_PLACEMENT)
         : openWorkspaceTabFocused(persistenceKey, target, FOCUSED_PANE_PLACEMENT);
       if (tabId) {
-        requestFileNavigation(tabId);
         navigateToTabId(tabId);
       }
     },
-    [
-      isMobile,
-      navigateToTabId,
-      openWorkspaceTabFocused,
-      revealWorkspaceChildTab,
-      persistenceKey,
-      requestFileNavigation,
-      showMobileAgent,
-    ],
+    [navigateToTabId, openWorkspaceTabFocused, revealWorkspaceChildTab, persistenceKey],
   );
 
   const handleOpenPreferredAssistantFile = useCallback(
@@ -1705,18 +1687,15 @@ function WorkspaceScreenContent({
         return;
       }
 
-      const tabId = openPreferredWorkspaceTarget({
+      openPreferredWorkspaceTarget({
         workspaceKey: persistenceKey,
         target: createWorkspaceFileTabTarget(location),
         source: "chatFiles",
         preferences: openInSidePane,
         parentTabId: input.parentTabId,
       });
-      if (tabId) {
-        requestFileNavigation(tabId);
-      }
     },
-    [openInSidePane, persistenceKey, requestFileNavigation],
+    [openInSidePane, persistenceKey],
   );
 
   const handleOpenWorkspaceFileFromPane = useStableEvent(function handleOpenWorkspaceFileFromPane({
@@ -1736,14 +1715,11 @@ function WorkspaceScreenContent({
     if (request.disposition === "side") {
       const location = normalizeWorkspaceFileLocation(request.location);
       if (!location || !persistenceKey) return;
-      const tabId = openWorkspaceTargetBeside({
+      openWorkspaceTargetBeside({
         workspaceKey: persistenceKey,
         target: createWorkspaceFileTabTarget(location),
         parentTabId,
       });
-      if (tabId) {
-        requestFileNavigation(tabId);
-      }
       return;
     }
     if (request.disposition === "preferred") {
@@ -2947,7 +2923,7 @@ function WorkspaceScreenContent({
         host:
           input.host ??
           (input.paneId !== null && input.paneId === explorerSidebarPaneId ? "explorer" : "main"),
-        fileNavigationRevision: fileNavigationRevisionByTabId[input.tab.tabId] ?? 0,
+        panelRevision: panelRevisions?.[input.tab.tabId] ?? 0,
         onOpenTab: (target) => {
           if (!persistenceKey) {
             return;
@@ -2964,7 +2940,7 @@ function WorkspaceScreenContent({
         },
         onOpenPreferredTarget: (target, source) => {
           if (!persistenceKey) return;
-          const tabId = openPreferredWorkspacePreview({
+          openPreferredWorkspacePreview({
             workspaceKey: persistenceKey,
             serverId: normalizedServerId,
             workspaceId: normalizedWorkspaceId,
@@ -2974,7 +2950,6 @@ function WorkspaceScreenContent({
             source,
             preferences: openInSidePane,
           });
-          if (tabId && target.kind === "file") requestFileNavigation(tabId);
         },
         onOpenTargetToSide:
           canRenderDesktopPaneSplits &&
@@ -2982,12 +2957,11 @@ function WorkspaceScreenContent({
           input.paneId === explorerSidebarPaneId
             ? (target) => {
                 if (!persistenceKey) return;
-                const tabId = openWorkspaceTargetBeside({
+                openWorkspaceTargetBeside({
                   workspaceKey: persistenceKey,
                   target,
                   parentTabId: input.tab.tabId,
                 });
-                if (tabId && target.kind === "file") requestFileNavigation(tabId);
               }
             : undefined,
         onCloseCurrentTab: () => {
@@ -3016,7 +2990,7 @@ function WorkspaceScreenContent({
       }),
     [
       handleCloseTabById,
-      fileNavigationRevisionByTabId,
+      panelRevisions,
       handleOpenWorkspaceFileFromPane,
       navigateToTabId,
       normalizedServerId,
@@ -3024,7 +2998,6 @@ function WorkspaceScreenContent({
       canRenderDesktopPaneSplits,
       openImportSheet,
       openInSidePane,
-      requestFileNavigation,
       revealWorkspaceChildTab,
       persistenceKey,
       replaceWorkspaceTabTarget,
@@ -3552,7 +3525,7 @@ function WorkspaceScreenContent({
     composerFullscreen: useComposerTabFullscreen(workspacePanelKey, activeTabId),
   });
 
-  // Compact sheets use the shared workspace scope, above both center and Explorer.
+  // Compact sheets escape to the app overlay host, above both sidebars.
   const workspaceCenterColumn = isMobile ? (
     <View style={styles.centerColumn}>
       <FloatingHeaderLayout

packages/app/src/screens/workspace/workspace-sheet-environment.tsx

@@ -0,0 +1,38 @@
+import React, { useCallback, useContext } from "react";
+import { NavigationContext, NavigationRouteContext } from "expo-router/react-navigation";
+import { useAssistantFileLinkEnvironmentBridge } from "@/assistant-file-links";
+import { useComposerEditingEnvironmentBridge } from "@/composer/editing-session";
+import { RetainedPanelActivity, useRetainedPanelActive } from "@/components/retained-panel";
+import type { ContextBridge } from "@/components/ui/isolated-bottom-sheet-modal";
+import { useDiffDocumentWorkspaceCacheBridge } from "@/git/diff-document/workspace-cache";
+import { HostRouteProvider, useHostRouteServerId } from "@/navigation/host-route-context";
+
+/** The environment of the built-in compact panels; pane identity is supplied by their body. */
+export function useWorkspaceSheetEnvironment(): ContextBridge {
+  const editing = useComposerEditingEnvironmentBridge();
+  const cache = useDiffDocumentWorkspaceCacheBridge();
+  const files = useAssistantFileLinkEnvironmentBridge();
+  const active = useRetainedPanelActive();
+  const serverId = useHostRouteServerId();
+  const navigation = useContext(NavigationContext);
+  const route = useContext(NavigationRouteContext);
+  return useCallback(
+    (children) => {
+      const content = editing(cache(files(children)));
+      return (
+        <NavigationContext.Provider value={navigation}>
+          <NavigationRouteContext.Provider value={route}>
+            <RetainedPanelActivity active={active}>
+              {serverId ? (
+                <HostRouteProvider serverId={serverId}>{content}</HostRouteProvider>
+              ) : (
+                content
+              )}
+            </RetainedPanelActivity>
+          </NavigationRouteContext.Provider>
+        </NavigationContext.Provider>
+      );
+    },
+    [editing, cache, files, active, serverId, navigation, route],
+  );
+}

packages/app/src/screens/workspace/workspace-tab-presentation.tsx

@@ -1,6 +1,8 @@
+import type { Theme } from "@/styles/theme";
+import { StatusIcon } from "@/components/status-icon";
 import { useCallback, useMemo, type ReactElement, type ReactNode } from "react";
 import { Pressable, Text, View, type PressableStateCallbackType } from "react-native";
-import { Check, CircleAlert } from "lucide-react-native";
+import { Check } from "lucide-react-native";
 import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { useTranslation } from "react-i18next";
 import invariant from "tiny-invariant";
@@ -9,14 +11,6 @@ import { getPanelRegistration, type PanelIconProps } from "@/panels/panel-regist
 import type { WorkspaceTabDescriptor } from "@/screens/workspace/workspace-tabs-types";
 import type { SidebarStateBucket } from "@/utils/sidebar-agent-state";
 import type { SurfaceBackdrop } from "@/styles/surface-backdrop";
-import { getStatusDotColor } from "@/utils/status-dot-color";
-import { StatusRing } from "@/components/status-ring";
-import { getStatusRingOffset } from "@/components/status-ring/geometry";
-import {
-  STATUS_INDICATOR_ALERT_SIZE,
-  STATUS_INDICATOR_DOT_SIZE,
-} from "@/utils/status-indicator-geometry";
-import type { Theme } from "@/styles/theme";
 import { usePanelInstanceAttributes } from "@/panels/panel-instance-attributes";
 
 export interface WorkspaceTabPresentation {
@@ -32,9 +26,6 @@ export interface WorkspaceTabPresentation {
   statusBucket: SidebarStateBucket | null;
 }
 
-const DEFAULT_STATUS_DOT_OFFSET = -2;
-const STATUS_ALERT_OFFSET = -3;
-
 interface WorkspaceTabPresentationResolverProps {
   tab: WorkspaceTabDescriptor;
   serverId: string;
@@ -129,13 +120,7 @@ interface WorkspaceTabIconProps {
 }
 
 const ThemedCheckIcon = withUnistyles(Check);
-const ThemedCircleAlert = withUnistyles(CircleAlert);
 const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
-const needsInputAlertMapping = (theme: Theme) => ({
-  color: theme.colors.surface0,
-  fill: getStatusDotColor({ theme, bucket: "needs_input" }) ?? undefined,
-});
-
 export function WorkspaceTabIcon({
   presentation,
   active = false,
@@ -144,48 +129,17 @@ export function WorkspaceTabIcon({
   statusDotBorderColor,
   backdrop,
 }: WorkspaceTabIconProps): ReactElement {
-  const iconColor = active ? styles.iconActive.color : styles.iconInactive.color;
-  const bucket = presentation.statusBucket;
-  const isRunning = bucket === "running";
-  let statusDotColor: string | undefined;
-  if (bucket === "failed") statusDotColor = styles.statusDotFailed.color;
-  else if (bucket === "attention") statusDotColor = styles.statusDotAttention.color;
-  const showNeedsInputAlert = bucket === "needs_input";
   const Icon = presentation.icon;
-  const agentIconWrapperStyle = useMemo(
-    () => [styles.agentIconWrapper, { width: size, height: size }],
-    [size],
-  );
-  const statusDotStyle = useMemo(
-    () => [
-      styles.statusDot,
-      {
-        backgroundColor: statusDotColor,
-        borderColor: statusDotBorderColor ?? styles.statusDotBorderDefault.borderColor,
-      },
-    ],
-    [statusDotColor, statusDotBorderColor],
-  );
-
+  const iconColor = active ? styles.iconActive.color : styles.iconInactive.color;
   return (
-    <View style={agentIconWrapperStyle}>
+    <StatusIcon
+      statusBucket={presentation.statusBucket}
+      size={size}
+      statusDotBorderColor={statusDotBorderColor}
+      backdrop={backdrop}
+    >
       <Icon size={size} color={iconColor} strokeWidth={strokeWidth} />
-      {isRunning ? (
-        <View
-          style={styles.statusRing}
-          accessibilityRole="progressbar"
-          accessibilityLabel="Agent running"
-        >
-          <StatusRing backdrop={backdrop} />
-        </View>
-      ) : null}
-      {statusDotColor ? <View style={statusDotStyle} /> : null}
-      {showNeedsInputAlert ? (
-        <View style={styles.statusAlertOverlay}>
-          <ThemedCircleAlert size={STATUS_INDICATOR_ALERT_SIZE} uniProps={needsInputAlertMapping} />
-        </View>
-      ) : null}
-    </View>
+    </StatusIcon>
   );
 }
 
@@ -262,43 +216,6 @@ export function WorkspaceTabOptionRow({
 }
 
 const styles = StyleSheet.create((theme) => ({
-  agentIconWrapper: {
-    position: "relative",
-    alignItems: "center",
-    justifyContent: "center",
-    flexShrink: 0,
-  },
-  statusDot: {
-    position: "absolute",
-    right: DEFAULT_STATUS_DOT_OFFSET,
-    bottom: DEFAULT_STATUS_DOT_OFFSET,
-    width: STATUS_INDICATOR_DOT_SIZE,
-    height: STATUS_INDICATOR_DOT_SIZE,
-    borderRadius: theme.borderRadius.full,
-    borderWidth: 1,
-  },
-  statusRing: {
-    position: "absolute",
-    right: getStatusRingOffset(DEFAULT_STATUS_DOT_OFFSET, STATUS_INDICATOR_DOT_SIZE),
-    bottom: getStatusRingOffset(DEFAULT_STATUS_DOT_OFFSET, STATUS_INDICATOR_DOT_SIZE),
-  },
-  statusDotBorderDefault: {
-    borderColor: theme.colors.surface0,
-  },
-  statusAlertOverlay: {
-    position: "absolute",
-    right: STATUS_ALERT_OFFSET,
-    bottom: STATUS_ALERT_OFFSET,
-  },
-  statusDotFailed: {
-    color: getStatusDotColor({ theme, bucket: "failed" }) ?? undefined,
-  },
-  statusDotRunning: {
-    color: getStatusDotColor({ theme, bucket: "running" }) ?? undefined,
-  },
-  statusDotAttention: {
-    color: getStatusDotColor({ theme, bucket: "attention" }) ?? undefined,
-  },
   iconActive: {
     color: theme.colors.foreground,
   },

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

@@ -1,3 +1,5 @@
+import { revealWorkspaceTab } from "@/workspace-tabs/navigation";
+import { usePanelStore } from "@/stores/panel-store";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import { useLocalSearchParams, usePathname } from "expo-router";
 import { useEffect, useSyncExternalStore } from "react";
@@ -34,6 +36,12 @@ const lastWorkspaceSelectionStore = createLastWorkspaceSelectionStore(
 
 function navigateDeps(): NavigateToWorkspaceDeps {
   return {
+    revealTab: revealWorkspaceTab,
+    revealWorkspace: () => {
+      if (useWorkspaceLayoutStore.getState().layoutMode === "compact") {
+        usePanelStore.getState().showMobileAgent();
+      }
+    },
     getSessionWorkspaces: (serverId) => useSessionStore.getState().sessions[serverId]?.workspaces,
     getSessionAgents: (serverId) =>
       useSessionStore.getState().sessions[serverId]?.agents.values() ?? [],

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

@@ -22,7 +22,14 @@ function createFakeDeps(overrides: Partial<NavigateToWorkspaceDeps> = {}) {
   const remembered: ActiveWorkspaceSelection[] = [];
   const openedTabs: RecordedTab[] = [];
   const deferredTabs: unknown[] = [];
+  const revealed: Array<string | null> = [];
   const deps: NavigateToWorkspaceDeps = {
+    revealTab: (_key, tabId) => {
+      revealed.push(tabId);
+    },
+    revealWorkspace: () => {
+      revealed.push(null);
+    },
     deferOpenTab: (input) => {
       deferredTabs.push(input);
       return null;
@@ -38,7 +45,7 @@ function createFakeDeps(overrides: Partial<NavigateToWorkspaceDeps> = {}) {
     navigateToRoute: (route) => navigations.push(route),
     ...overrides,
   };
-  return { deps, navigations, remembered, openedTabs, deferredTabs };
+  return { deps, navigations, remembered, openedTabs, deferredTabs, revealed };
 }
 
 function createLastSelectionDeps(
@@ -65,6 +72,24 @@ function createLastSelectionDeps(
 }
 
 describe("workspace navigation", () => {
+  it("reveals even a current workspace without agents", () => {
+    const { deps, revealed } = createFakeDeps();
+    navigateToWorkspace({ serverId: "server", workspaceId: "workspace" }, deps);
+    expect(revealed).toEqual([null]);
+  });
+
+  it("reveals an explicit target after opening instead of forcing center", () => {
+    const workspace = { id: "workspace" } as WorkspaceDescriptor;
+    const { deps, revealed } = createFakeDeps({
+      getSessionWorkspaces: () => new Map([[workspace.id, workspace]]),
+    });
+    navigateToWorkspace(
+      { serverId: "server", workspaceId: "workspace", target: { kind: "agent", agentId: "root" } },
+      deps,
+    );
+    expect(revealed).toEqual(["root"]);
+  });
+
   it("reports when no last workspace is known", () => {
     const { deps } = createLastSelectionDeps(null);
 

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

@@ -38,6 +38,8 @@ export interface NavigateToWorkspaceDeps extends PrepareWorkspaceTabDeps {
   deferOpenTab: (input: OpenWorkspaceTabInput) => null;
   rememberLastWorkspace: (selection: ActiveWorkspaceSelection) => void;
   navigateToRoute: (route: string) => void;
+  revealTab: (workspaceKey: string, tabId: string | null) => void;
+  revealWorkspace: () => void;
 }
 
 export interface NavigateToLastWorkspaceDeps extends NavigateToWorkspaceDeps {
@@ -93,8 +95,13 @@ export function navigateToWorkspace(
     workspaceId: input.workspaceId,
   });
   const shouldDeferOpen = !resolvedWorkspaceId || !deps.isWorkspaceLayoutHydrated();
+  const openTab: NavigateToWorkspaceDeps["openTab"] = (request) => {
+    if (shouldDeferOpen) return deps.deferOpenTab(request);
+    const tabId = deps.openTab(request);
+    deps.revealTab(request.workspaceKey, tabId);
+    return tabId;
+  };
   if (input.target) {
-    const openTab = shouldDeferOpen ? deps.deferOpenTab : deps.openTab;
     prepareWorkspaceTab({ ...input, target: input.target }, { openTab });
   } else {
     const workspaceAgents = resolvedWorkspaceId
@@ -104,11 +111,13 @@ export function navigateToWorkspace(
       : [];
     const attentionAgentId = pickAttentionAgent(workspaceAgents);
     if (attentionAgentId && resolvedWorkspaceId) {
-      deps.openTab({
+      openTab({
         workspaceKey: `${input.serverId}:${resolvedWorkspaceId}`,
         target: { kind: "agent", agentId: attentionAgentId },
         intent: "reveal",
       });
+    } else {
+      deps.revealWorkspace();
     }
   }
 

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

@@ -79,6 +79,39 @@ function createDeterministicWorkspaceLayoutIds() {
 const workspaceLayoutIds = createDeterministicWorkspaceLayoutIds();
 const workspaceLayoutStore = createWorkspaceLayoutStore(workspaceLayoutIds);
 
+it("bumps panel params revision when the same tab is opened again", () => {
+  const storage = {
+    getItem: async () => null,
+    setItem: async () => {},
+    removeItem: async () => {},
+  };
+  const store = createWorkspaceLayoutStore(workspaceLayoutIds, storage);
+  const workspaceKey = "server-1:workspace-params";
+  const targets = [
+    { kind: "file" as const, path: "notes.md", lineStart: 3 },
+    {
+      kind: "plugin" as const,
+      pluginId: "notes",
+      panelId: "workspace",
+      context: "workspace" as const,
+    },
+    {
+      kind: "plugin" as const,
+      pluginId: "notes",
+      panelId: "agent",
+      context: "agent" as const,
+      agentId: "agent-1",
+    },
+  ];
+  for (const target of targets) {
+    const first = store.getState().openTab({ workspaceKey, target, intent: "reveal" })!;
+    const revision = store.getState().panelRevisionByWorkspace[workspaceKey][first];
+    const second = store.getState().openTab({ workspaceKey, target, intent: "reveal" });
+    expect(second).toBe(first);
+    expect(store.getState().panelRevisionByWorkspace[workspaceKey][first]).toBe(revision + 1);
+  }
+});
+
 it("observes open chats across unmounted workspaces until their tabs close", () => {
   const store = createWorkspaceLayoutStore(workspaceLayoutIds);
   store.setState({ layoutByWorkspace: {} });

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

@@ -128,6 +128,7 @@ export type WorkspaceTabDestination =
   | { kind: "sheet"; tabId: string };
 
 interface WorkspaceLayoutStore {
+  panelRevisionByWorkspace: Record<string, Record<string, number>>;
   /** Published once by the app shell; callers never pass a form factor to open a tab. */
   layoutMode: WorkspaceLayoutMode;
   pendingOpenByWorkspace: Record<string, OpenWorkspaceTabInput>;
@@ -997,6 +998,22 @@ function createPersistedStateProjection() {
   };
 }
 
+function advancePanelRevision(
+  state: WorkspaceLayoutStore,
+  workspaceKey: string,
+  tabId: string,
+  target: WorkspaceTabTarget,
+) {
+  if (target.kind !== "file" && target.kind !== "plugin") return {};
+  const revisions = state.panelRevisionByWorkspace[workspaceKey] ?? {};
+  return {
+    panelRevisionByWorkspace: {
+      ...state.panelRevisionByWorkspace,
+      [workspaceKey]: { ...revisions, [tabId]: (revisions[tabId] ?? 0) + 1 },
+    },
+  };
+}
+
 export function createWorkspaceLayoutStore(
   ids: WorkspaceLayoutIdSource = defaultWorkspaceLayoutIds,
   storage: StateStorage = AsyncStorage,
@@ -1023,6 +1040,7 @@ export function createWorkspaceLayoutStore(
           }
           return tabId;
         },
+        panelRevisionByWorkspace: {},
         pendingOpenByWorkspace: {},
         deferOpenTab: (input) => {
           set((state) => ({
@@ -1095,7 +1113,15 @@ export function createWorkspaceLayoutStore(
                       ? [existing]
                       : [];
                   });
-            set((state) => withSheets(state, normalizedWorkspaceKey, next));
+            set((state) => ({
+              ...withSheets(state, normalizedWorkspaceKey, next),
+              ...advancePanelRevision(
+                state,
+                normalizedWorkspaceKey,
+                sheet.tab.tabId,
+                normalizedTarget,
+              ),
+            }));
             return sheet.tab.tabId;
           }
           const placement = getOpenTabPlacement(
@@ -1151,6 +1177,7 @@ export function createWorkspaceLayoutStore(
           const shouldPinAgent = input.pin === true && normalizedTarget.kind === "agent";
           set((state) => ({
             ...withoutFocusRestoration(state, normalizedWorkspaceKey),
+            ...advancePanelRevision(state, normalizedWorkspaceKey, result.tabId, normalizedTarget),
             // A tab brought to the front dismisses the sheet over it.
             ...(input.intent === "background" ? {} : dismissSheets(state, normalizedWorkspaceKey)),
             hiddenAgentIdsByWorkspace:
@@ -1530,7 +1557,15 @@ export function createWorkspaceLayoutStore(
               })),
             };
             if (policy) {
-              set({ sheetsByWorkspace: next.sheetsByWorkspace });
+              set((state) => ({
+                sheetsByWorkspace: next.sheetsByWorkspace,
+                ...advancePanelRevision(
+                  state,
+                  normalizedWorkspaceKey,
+                  normalizedTabId,
+                  normalizedTarget,
+                ),
+              }));
               return normalizedTabId;
             }
             // A target sheets do not host becomes the tab it would have opened as.
@@ -1548,6 +1583,7 @@ export function createWorkspaceLayoutStore(
           if (!result) return null;
           set((state) => ({
             ...withoutFocusRestoration(state, normalizedWorkspaceKey),
+            ...advancePanelRevision(state, normalizedWorkspaceKey, result.tabId, normalizedTarget),
             hiddenAgentIdsByWorkspace:
               normalizedTarget.kind !== "agent"
                 ? state.hiddenAgentIdsByWorkspace
@@ -2380,12 +2416,14 @@ interface PendingWorkspaceOpenReadiness {
   workspaceKey: string | null;
   hasHydratedWorkspaces: boolean;
   workspaceExists: boolean;
+  onOpened: (workspaceKey: string, tabId: string | null) => void;
 }
 
 export function usePendingWorkspaceOpen({
   workspaceKey,
   hasHydratedWorkspaces,
   workspaceExists,
+  onOpened,
 }: PendingWorkspaceOpenReadiness): WorkspaceTabTarget | null {
   const workspaceReady = hasHydratedWorkspaces && workspaceExists;
   const pending = useWorkspaceLayoutStore((state) =>
@@ -2394,8 +2432,8 @@ export function usePendingWorkspaceOpen({
   const layoutHydrated = useWorkspaceLayoutStoreHydrated();
   useLayoutEffect(() => {
     if (workspaceKey && workspaceReady && layoutHydrated && pending) {
-      useWorkspaceLayoutStore.getState().consumePendingOpen(workspaceKey);
+      onOpened(workspaceKey, useWorkspaceLayoutStore.getState().consumePendingOpen(workspaceKey));
     }
-  }, [workspaceKey, workspaceReady, layoutHydrated, pending]);
+  }, [workspaceKey, workspaceReady, layoutHydrated, pending, onOpened]);
   return pending ? pending.target : null;
 }

packages/app/src/workspace-status/index.ts

@@ -0,0 +1,74 @@
+import { useShallow } from "zustand/shallow";
+import { useCreateFlowStore, type PendingCreateAttempt } from "@/stores/create-flow-store";
+import { useSessionStore, type WorkspaceDescriptor } from "@/stores/session-store";
+import type { WorkspaceAgentActivity } from "@/utils/workspace-agent-activity";
+import { resolveWorkspaceMapKeyByIdentity } from "@/utils/workspace-identity";
+
+interface EffectiveWorkspaceStatus {
+  status: WorkspaceDescriptor["status"];
+  enteredAt: Date | null;
+}
+
+export function deriveEffectiveWorkspaceStatus(input: {
+  serverId: string;
+  workspace: WorkspaceDescriptor;
+  pendingCreateAttempts?: Record<string, PendingCreateAttempt>;
+  workspaceAgentActivity?: ReadonlyMap<string, WorkspaceAgentActivity>;
+}): EffectiveWorkspaceStatus {
+  if (input.workspace.status !== "done") {
+    return { status: input.workspace.status, enteredAt: input.workspace.statusEnteredAt };
+  }
+
+  const pendingStartedAt = getPendingInitialAgentCreateStartedAt({
+    serverId: input.serverId,
+    workspaceId: input.workspace.id,
+    pendingCreateAttempts: input.pendingCreateAttempts,
+  });
+  if (pendingStartedAt) {
+    return { status: "running", enteredAt: pendingStartedAt };
+  }
+
+  const rootAgentActivity = input.workspaceAgentActivity?.get(input.workspace.id);
+  if (rootAgentActivity && rootAgentActivity.status !== "done") {
+    return rootAgentActivity;
+  }
+
+  return { status: input.workspace.status, enteredAt: input.workspace.statusEnteredAt };
+}
+
+function getPendingInitialAgentCreateStartedAt(input: {
+  serverId: string;
+  workspaceId: string;
+  pendingCreateAttempts: Record<string, PendingCreateAttempt> | undefined;
+}): Date | null {
+  let latestStartedAt: Date | null = null;
+  for (const pending of Object.values(input.pendingCreateAttempts ?? {})) {
+    if (pending.serverId !== input.serverId) continue;
+    if (pending.workspaceId !== input.workspaceId) continue;
+    if (pending.lifecycle === "abandoned") continue;
+    const startedAt = new Date(pending.timestamp);
+    if (!latestStartedAt || startedAt > latestStartedAt) {
+      latestStartedAt = startedAt;
+    }
+  }
+  return latestStartedAt;
+}
+
+export function useWorkspaceStatus(serverId: string, workspaceId: string) {
+  const pendingCreateAttempts = useCreateFlowStore((state) => state.pendingByDraftId);
+  return useSessionStore(
+    useShallow((state) => {
+      const session = state.sessions[serverId];
+      if (!session) return null;
+      const key = resolveWorkspaceMapKeyByIdentity({ workspaces: session.workspaces, workspaceId });
+      const workspace = key ? session.workspaces.get(key) : null;
+      if (!workspace) return null;
+      return deriveEffectiveWorkspaceStatus({
+        serverId,
+        workspace,
+        pendingCreateAttempts,
+        workspaceAgentActivity: session.workspaceAgentActivity,
+      }).status;
+    }),
+  );
+}

packages/app/src/workspace-tabs/navigation.test.ts

@@ -85,3 +85,26 @@ it("preserves dock visibility intent while compact targets are opened and reveal
     false,
   );
 });
+it.each(["agent-list", "file-explorer"] as const)(
+  "preserves %s under a deferred file sheet and reveals deferred agents",
+  (panel) => {
+    const store = useWorkspaceLayoutStore.getState();
+    store.setLayoutMode("compact");
+    if (panel === "agent-list") usePanelStore.getState().showMobileAgentList();
+    const before = usePanelStore.getState().mobilePanel;
+    store.deferOpenTab({
+      workspaceKey,
+      target: { kind: "file", path: "pending.ts" },
+      intent: "reveal",
+    });
+    revealWorkspaceTab(workspaceKey, store.consumePendingOpen(workspaceKey));
+    expect(usePanelStore.getState().mobilePanel).toEqual(before);
+    store.deferOpenTab({
+      workspaceKey,
+      target: { kind: "agent", agentId: "root" },
+      intent: "reveal",
+    });
+    revealWorkspaceTab(workspaceKey, store.consumePendingOpen(workspaceKey));
+    expect(usePanelStore.getState().mobilePanel.target).toBe("agent");
+  },
+);

packages/app/vitest.config.ts

@@ -121,10 +121,32 @@ export default defineConfig({
   // so it scans the native files and dies on imports react-native-web has no answer for.
   // Unbundled, the same imports go through the resolver below and land on the web files.
   optimizeDeps: {
+    // Expo's public navigation barrel also loads screens. Match Metro's web-first resolution
+    // while optimizing its CJS dependencies, including DebugContainer.web.js.
+    esbuildOptions: {
+      resolveExtensions: [
+        ".web.js",
+        ".web.jsx",
+        ".web.ts",
+        ".web.tsx",
+        ".js",
+        ".jsx",
+        ".ts",
+        ".tsx",
+        ".json",
+      ],
+    },
     // Bundle the CJS dependencies of the excluded gesture-handler package for the browser.
     include: [
       "react/jsx-runtime",
       "react/compiler-runtime",
+      "expo-router/react-navigation",
+      "@testing-library/react",
+      "@tanstack/react-query",
+      "react-i18next",
+      "i18next",
+      "@marijn/find-cluster-break",
+      "tiny-invariant",
       "react-native-gesture-handler > hoist-non-react-statics",
       "react-native-gesture-handler > invariant",
     ],

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/cli",
-  "version": "0.13.0-beta.1",
+  "version": "0.13.0-beta.2",
   "description": "Paseo CLI - control your AI coding agents from the command line",
   "bin": {
     "paseo": "bin/paseo"
@@ -28,9 +28,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.0.0",
-    "@getpaseo/client": "0.13.0-beta.1",
-    "@getpaseo/protocol": "0.13.0-beta.1",
-    "@getpaseo/server": "0.13.0-beta.1",
+    "@getpaseo/client": "0.13.0-beta.2",
+    "@getpaseo/protocol": "0.13.0-beta.2",
+    "@getpaseo/server": "0.13.0-beta.2",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "mime-types": "^2.1.35",

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/client",
-  "version": "0.13.0-beta.1",
+  "version": "0.13.0-beta.2",
   "description": "Paseo client SDK package",
   "files": [
     "dist",
@@ -47,8 +47,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@getpaseo/protocol": "0.13.0-beta.1",
-    "@getpaseo/relay": "0.13.0-beta.1",
+    "@getpaseo/protocol": "0.13.0-beta.2",
+    "@getpaseo/relay": "0.13.0-beta.2",
     "ws": "^8.20.0",
     "zod": "^4.4.3"
   },

packages/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/desktop",
-  "version": "0.13.0-beta.1",
+  "version": "0.13.0-beta.2",
   "private": true,
   "description": "Paseo desktop app (Electron wrapper)",
   "homepage": "https://paseo.sh",

packages/expo-two-way-audio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/expo-two-way-audio",
-  "version": "0.13.0-beta.1",
+  "version": "0.13.0-beta.2",
   "description": "Native module for two way audio streaming",
   "keywords": [
     "ExpoTwoWayAudio",

packages/highlight/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/highlight",
-  "version": "0.13.0-beta.1",
+  "version": "0.13.0-beta.2",
   "files": [
     "dist",
     "!dist/**/*.map",

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/plugin",
-  "version": "0.13.0-beta.1",
+  "version": "0.13.0-beta.2",
   "description": "Paseo plugin SDK package",
   "files": [
     "dist",
@@ -72,8 +72,8 @@
     "use-sync-external-store": "^1.6.0"
   },
   "devDependencies": {
-    "@getpaseo/client": "0.13.0-beta.1",
-    "@getpaseo/protocol": "0.13.0-beta.1",
+    "@getpaseo/client": "0.13.0-beta.2",
+    "@getpaseo/protocol": "0.13.0-beta.2",
     "@types/node": "^20.9.0",
     "@types/react": "~19.2.0",
     "react": "19.2.3",
@@ -83,8 +83,8 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@getpaseo/client": "0.13.0-beta.1",
-    "@getpaseo/protocol": "0.13.0-beta.1",
+    "@getpaseo/client": "0.13.0-beta.2",
+    "@getpaseo/protocol": "0.13.0-beta.2",
     "react": ">=19.1.0 <20",
     "react-native": ">=0.81.5",
     "zod": "^4.4.3"