mirror of
https://github.com/getpaseo/paseo.git
synced 2026-11-22 16:25:39 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b2ca56ee73 | ||
|
|
59f19e4e5e | ||
|
|
884adbcc2f | ||
|
|
91247c8218 | ||
|
|
2d09c47672 | ||
|
|
52377f595a | ||
|
|
9cb521dda2 | ||
|
|
234ddf8dd7 | ||
|
|
3914893aa1 | ||
|
|
ede181d39a | ||
|
|
c28aa2570c | ||
|
|
08ad7c7271 | ||
|
|
b2ecec8719 | ||
|
|
fa37fd20ca | ||
|
|
ff5a83bc5a | ||
|
|
9cb0625cf5 | ||
|
|
03adc4d4ba | ||
|
|
4b429c0030 | ||
|
|
20f217b8cb | ||
|
|
984e2ea5e7 | ||
|
|
133b078ac4 | ||
|
|
6ea095cb49 |
@@ -20,6 +20,8 @@ env:
|
||||
# CI does not use the CUDA execution provider, and the onnxruntime-node
|
||||
# postinstall download from NuGet is large enough to make npm ci flaky.
|
||||
ONNXRUNTIME_NODE_INSTALL: skip
|
||||
NPM_CONFIG_AUDIT: "false"
|
||||
NPM_CONFIG_FUND: "false"
|
||||
|
||||
jobs:
|
||||
changes:
|
||||
@@ -165,8 +167,29 @@ jobs:
|
||||
- name: Run website tests
|
||||
run: npx vitest run packages/website/src --bail=1
|
||||
|
||||
# WebKit needs about 180 system packages (125 MB) from the Ubuntu mirror. The mirror
|
||||
# sometimes serves them at under 100 kB/s, which turns a 1-minute step into 25 minutes.
|
||||
# Keep the downloaded .deb files in the Actions cache so apt installs them without the mirror.
|
||||
- name: Restore website browser system packages
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/website-browser-debs
|
||||
key: website-browser-debs-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
|
||||
restore-keys: website-browser-debs-${{ runner.os }}-
|
||||
|
||||
- name: Install website test browsers
|
||||
run: npx playwright install --with-deps chromium webkit
|
||||
run: |
|
||||
mkdir -p ~/website-browser-debs
|
||||
shopt -s nullglob
|
||||
cached_debs=(~/website-browser-debs/*.deb)
|
||||
if (( ${#cached_debs[@]} > 0 )); then
|
||||
sudo cp "${cached_debs[@]}" /var/cache/apt/archives/
|
||||
fi
|
||||
npx playwright install --with-deps chromium webkit
|
||||
archive_debs=(/var/cache/apt/archives/*.deb)
|
||||
if (( ${#archive_debs[@]} > 0 )); then
|
||||
cp "${archive_debs[@]}" ~/website-browser-debs/
|
||||
fi
|
||||
|
||||
- name: Verify website mockups
|
||||
run: npm run test:e2e --workspace=@getpaseo/website
|
||||
@@ -278,8 +301,8 @@ jobs:
|
||||
|
||||
# native-recursive.ts serves darwin and win32, but windows-latest above is the only
|
||||
# runner that exercises it. macOS — the platform the reported watcher bug was on —
|
||||
# otherwise has no server-test coverage. Scoped to the observer/watcher suites to
|
||||
# bound runtime.
|
||||
# otherwise has no server-test coverage. Keep this job scoped to regressions
|
||||
# reported on macOS.
|
||||
server-tests-macos:
|
||||
name: server-tests (macos-latest, file observation)
|
||||
needs: changes
|
||||
@@ -307,6 +330,12 @@ jobs:
|
||||
src/server/workspace-git-service.observation.integration.test.ts \
|
||||
--bail=1
|
||||
|
||||
- name: Verify plugin compiler children are reaped
|
||||
run: |
|
||||
npm run test:unit --workspace=@getpaseo/server -- \
|
||||
src/server/plugins/index.posix.test.ts \
|
||||
-t "reaps compiler children" --bail=1
|
||||
|
||||
desktop-tests-ubuntu:
|
||||
name: desktop-tests (ubuntu-latest)
|
||||
needs: changes
|
||||
@@ -460,9 +489,9 @@ jobs:
|
||||
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
|
||||
E2E_WORKERS: "2"
|
||||
# File groups are weighted by observed reporter durations.
|
||||
# Share of the test list per shard, rebalanced from the Playwright step
|
||||
# minutes of five eight-shard runs so the slowest and fastest shards meet.
|
||||
PWTEST_SHARD_WEIGHTS: "85:94:117:128:91:103:127:85"
|
||||
# Share of the test list per shard, rebalanced from main and PR eight-shard
|
||||
# durations so the slowest and fastest shards meet.
|
||||
PWTEST_SHARD_WEIGHTS: "90:114:100:104:108:112:112:90"
|
||||
|
||||
- name: Upload test artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
@@ -576,7 +605,7 @@ jobs:
|
||||
# Source tests do not read PASEO_CLI_TEST_SHARD. Run them once, on the
|
||||
# shortest E2E shard, after its runner has built the server stack.
|
||||
- name: Run CLI source tests
|
||||
if: ${{ env.PASEO_CLI_TEST_SHARD == '3' }}
|
||||
if: ${{ env.PASEO_CLI_TEST_SHARD == '2' }}
|
||||
run: npm run test:unit --workspace=@getpaseo/cli
|
||||
|
||||
# The dependency watchers write build outputs, so run them after the parallel CLI tests.
|
||||
|
||||
+77
-15
@@ -1,56 +1,118 @@
|
||||
# Changelog
|
||||
|
||||
## 0.17.0-beta.1 - 2026-11-19
|
||||
## 0.17.2 - 2026-11-22
|
||||
|
||||
- **Use existing worktrees:** Start a workspace in a worktree you already have, or create one from any branch or pull request. ([#10190](https://github.com/getpaseo/paseo/pull/10190))
|
||||
- **Antigravity approvals and history:** Pick a permission mode, answer tool approvals, import CLI sessions and see your history when you reopen a chat. ([#10193](https://github.com/getpaseo/paseo/pull/10193))
|
||||
- **Watch pull requests:** Agents can watch a GitHub PR and get notified when checks, reviews or comments change. ([#10148](https://github.com/getpaseo/paseo/pull/10148))
|
||||
- **Turn and session stats:** View per-turn and session timing, token, cache, and cost metrics for Claude, OpenCode v2, Pi, Oh My Pi, and plugin providers. ([#10496](https://github.com/getpaseo/paseo/pull/10496), [#10510](https://github.com/getpaseo/paseo/pull/10510))
|
||||
- **Automatic model list refresh:** Enabled providers refresh their model lists in the background every 30 minutes. ([#10481](https://github.com/getpaseo/paseo/pull/10481))
|
||||
- **Sidebar usage by default:** The sidebar usage summary is enabled by default, sources for inactive providers start hidden, and source toggles move to a Sources list. ([#10491](https://github.com/getpaseo/paseo/pull/10491))
|
||||
- **Agents can steer turns:** Agents can steer another agent's running turn alongside queueing or interrupting it, and receive delivery guidance in the response. ([#10483](https://github.com/getpaseo/paseo/pull/10483))
|
||||
|
||||
### Added
|
||||
|
||||
- Added Archive workspace to the mobile workspace actions menu ([#10507](https://github.com/getpaseo/paseo/pull/10507))
|
||||
- Added provider docs links, fuller diagnostic reports, and a scrollable Models list with inline refresh to provider settings ([#10487](https://github.com/getpaseo/paseo/pull/10487))
|
||||
|
||||
### Changed
|
||||
|
||||
- Removed the "This chat uses OpenCode v2." info row from OpenCode v2 chats ([#10490](https://github.com/getpaseo/paseo/pull/10490))
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fixed pressing Tab or Enter in the slash menu running a stale `/exit` choice and archiving the agent ([#10484](https://github.com/getpaseo/paseo/pull/10484) by [@3ae3ae](https://github.com/3ae3ae))
|
||||
- Fixed busy host connections dropping to reconnect when multiple connections are saved ([#10395](https://github.com/getpaseo/paseo/pull/10395))
|
||||
- Fixed retrying an edited New workspace form hitting a conflict error after a failed start, and unified composer error alerts ([#10482](https://github.com/getpaseo/paseo/pull/10482))
|
||||
- Fixed Antigravity turns staying running after creating a recurring schedule ([#10469](https://github.com/getpaseo/paseo/pull/10469))
|
||||
- Fixed daemon startup and plugin reloads leaving zombie child processes for local directory plugins ([#10470](https://github.com/getpaseo/paseo/pull/10470))
|
||||
|
||||
## 0.17.1 - 2026-11-21
|
||||
|
||||
- **Antigravity approvals and history:** Choose a permission mode, answer tool approvals, and import or reopen sessions. Requires [Antigravity CLI 1.5.0 or later](https://paseo.sh/docs/supported-providers/antigravity). ([#10193](https://github.com/getpaseo/paseo/pull/10193))
|
||||
- **Use existing worktrees:** Start a workspace in a worktree you already have, or create one from a branch or pull request. ([#10190](https://github.com/getpaseo/paseo/pull/10190))
|
||||
- **Update providers in Paseo:** See each provider's status and installed version, and update supported CLIs from the app. ([#9568](https://github.com/getpaseo/paseo/pull/9568), [#9661](https://github.com/getpaseo/paseo/pull/9661))
|
||||
- **Provider quota forecasts:** Usage shows when your current pace will use up a quota before it resets. ([#10289](https://github.com/getpaseo/paseo/pull/10289), [#10385](https://github.com/getpaseo/paseo/pull/10385))
|
||||
- **Watch PRs and MRs:** Ask an agent to watch a pull or merge request for new checks, reviews, and comments. ([#10148](https://github.com/getpaseo/paseo/pull/10148), [#10279](https://github.com/getpaseo/paseo/pull/10279), [#10280](https://github.com/getpaseo/paseo/pull/10280))
|
||||
- **Heartbeats in Background work:** See and stop an agent's heartbeats next to its background tasks. ([#10097](https://github.com/getpaseo/paseo/pull/10097), [#10216](https://github.com/getpaseo/paseo/pull/10216))
|
||||
- **Agent messages wait their turn:** Reports and notifications from other agents arrive when the current turn ends instead of interrupting it. ([#9757](https://github.com/getpaseo/paseo/pull/9757))
|
||||
- **Agent messages wait their turn:** By default, messages from other agents wait for the current turn to end. ([#9757](https://github.com/getpaseo/paseo/pull/9757), [#10404](https://github.com/getpaseo/paseo/pull/10404))
|
||||
- **More goose models:** Select models from every provider configured in goose. ([#9719](https://github.com/getpaseo/paseo/pull/9719) by [@i386](https://github.com/i386))
|
||||
- **Plugin agent instructions:** Plugins can add their own instructions to agents. ([#9781](https://github.com/getpaseo/paseo/pull/9781))
|
||||
|
||||
### Added
|
||||
|
||||
- Added OpenRouter credit balances and API key spending to Usage and `paseo usage` ([#10269](https://github.com/getpaseo/paseo/pull/10269))
|
||||
- Added Antigravity account quotas to Usage ([#10232](https://github.com/getpaseo/paseo/pull/10232) by [@luoph](https://github.com/luoph), [@RRD-dev](https://github.com/RRD-dev))
|
||||
- Added Antigravity skills to `/` suggestions ([#10383](https://github.com/getpaseo/paseo/pull/10383))
|
||||
- Added bundled orchestration skills to Antigravity ([#10273](https://github.com/getpaseo/paseo/pull/10273))
|
||||
- Added shortcuts to open the model picker and cycle thinking levels with Cmd/Ctrl+/ and Cmd/Ctrl+Shift+/ ([#10147](https://github.com/getpaseo/paseo/pull/10147))
|
||||
- Added agent settings to Command Center search before the first message ([#10182](https://github.com/getpaseo/paseo/pull/10182) by [@cleiter](https://github.com/cleiter))
|
||||
- Added Rewind to Command Center for the latest turn ([#10144](https://github.com/getpaseo/paseo/pull/10144))
|
||||
- Added a separate Ultracode toggle for eligible Claude models ([#10150](https://github.com/getpaseo/paseo/pull/10150) by [@fivetaku](https://github.com/fivetaku))
|
||||
- Added a separate Ultracode toggle for Claude ([#10150](https://github.com/getpaseo/paseo/pull/10150) by [@fivetaku](https://github.com/fivetaku))
|
||||
- Added Flex speed for Codex ([#9809](https://github.com/getpaseo/paseo/pull/9809) by [@qjqqyy](https://github.com/qjqqyy))
|
||||
- Added syntax highlighting for shell scripts and Dockerfiles ([#10178](https://github.com/getpaseo/paseo/pull/10178))
|
||||
- Added project listing on connected daemons for Hub sessions ([#10392](https://github.com/getpaseo/paseo/pull/10392))
|
||||
- Added labels and workspace IDs to `paseo ls --json` ([#10076](https://github.com/getpaseo/paseo/pull/10076))
|
||||
|
||||
### Changed
|
||||
|
||||
- Changed content width to Default, Wide, and Full presets that also resize open chats and Markdown previews ([#10231](https://github.com/getpaseo/paseo/pull/10231))
|
||||
- Changed Antigravity tool cards to show shell commands, output, and file diffs ([#10379](https://github.com/getpaseo/paseo/pull/10379))
|
||||
- Changed Clone from GitHub to show matching private repositories first ([#10264](https://github.com/getpaseo/paseo/pull/10264))
|
||||
- Changed healthy quota bars in Usage to green ([#10397](https://github.com/getpaseo/paseo/pull/10397))
|
||||
- Changed worktree teardown to keep the worktree when the command times out ([#9852](https://github.com/getpaseo/paseo/pull/9852) by [@ragokan](https://github.com/ragokan))
|
||||
- Changed workspace navigation on mobile to acknowledge taps sooner ([#9887](https://github.com/getpaseo/paseo/pull/9887))
|
||||
- Changed workspace Git status to skip its reload after a short reconnect with no file changes ([#10142](https://github.com/getpaseo/paseo/pull/10142) by [@VladimirGVP](https://github.com/VladimirGVP))
|
||||
- Changed `browser_new_tab` to ask agents to choose a Desktop when several are connected ([#10189](https://github.com/getpaseo/paseo/pull/10189))
|
||||
- Changed workspace Git status to reuse its snapshot after a short reconnect when the checkout has not changed ([#10142](https://github.com/getpaseo/paseo/pull/10142) by [@VladimirGVP](https://github.com/VladimirGVP))
|
||||
- Changed workspace navigation to acknowledge taps promptly and initially load fewer offscreen chat rows on mobile ([#9887](https://github.com/getpaseo/paseo/pull/9887))
|
||||
- Changed worktree teardown to stop after one minute by default and keep the worktree; set `worktree.teardownTimeoutMs` in `paseo.json` for longer commands ([#9852](https://github.com/getpaseo/paseo/pull/9852) by [@ragokan](https://github.com/ragokan))
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fixed an online host's workspaces going missing ([#10318](https://github.com/getpaseo/paseo/pull/10318))
|
||||
- Fixed chat history timing out when many open chats refresh after reconnecting ([#10368](https://github.com/getpaseo/paseo/pull/10368))
|
||||
- Fixed slow reopening of long Claude chats while the daemon is busy ([#10369](https://github.com/getpaseo/paseo/pull/10369))
|
||||
- Fixed images from a live reply waiting for images in another chat's history to load ([#10371](https://github.com/getpaseo/paseo/pull/10371))
|
||||
- Fixed agents failing to recover after stopping a foreground daemon with Ctrl+C ([#10381](https://github.com/getpaseo/paseo/pull/10381))
|
||||
- Fixed long Antigravity chats losing the end of their history after a daemon restart ([#10428](https://github.com/getpaseo/paseo/pull/10428))
|
||||
- Fixed Antigravity turns ending while a background command is still running ([#10310](https://github.com/getpaseo/paseo/pull/10310))
|
||||
- Fixed the Add model sheet staying open after saving a custom model ([#10432](https://github.com/getpaseo/paseo/pull/10432))
|
||||
- Fixed slash suggestions failing when a provider reports duplicate command names ([#10275](https://github.com/getpaseo/paseo/pull/10275))
|
||||
- Fixed resumed Codex sessions using their previous working directory for configuration and MCP servers ([#10390](https://github.com/getpaseo/paseo/pull/10390) by [@tabulius-ux](https://github.com/tabulius-ux))
|
||||
- Fixed stale Codex subagent statuses after reopening or rewinding the parent chat ([#10171](https://github.com/getpaseo/paseo/pull/10171) by [@AnalyticETH](https://github.com/AnalyticETH))
|
||||
- Fixed Usage showing the previous Claude account's quota after switching accounts ([#10236](https://github.com/getpaseo/paseo/pull/10236))
|
||||
- Fixed the sidebar usage row dropping period labels when several usage windows are pinned ([#10274](https://github.com/getpaseo/paseo/pull/10274))
|
||||
- Fixed Changes failing to recognize a checkout immediately after restoring its worktree ([#10224](https://github.com/getpaseo/paseo/pull/10224), [#10304](https://github.com/getpaseo/paseo/pull/10304), [#10406](https://github.com/getpaseo/paseo/pull/10406))
|
||||
- Fixed split-pane dividers stopping or lagging during drags ([#5996](https://github.com/getpaseo/paseo/pull/5996))
|
||||
- Fixed double-click word selection and triple-click line selection in diffs ([#10252](https://github.com/getpaseo/paseo/pull/10252) by [@pedrovieira](https://github.com/pedrovieira))
|
||||
- Fixed the composer and chat column losing alignment when Chat outline is enabled ([#10277](https://github.com/getpaseo/paseo/pull/10277))
|
||||
- Fixed the web composer's focus shortcut hint overlapping the placeholder ([#6200](https://github.com/getpaseo/paseo/pull/6200))
|
||||
- Fixed the archive shortcut failing when the active workspace's sidebar group is collapsed ([#10356](https://github.com/getpaseo/paseo/pull/10356) by [@hiennd-ctrl](https://github.com/hiennd-ctrl), [@neihyud](https://github.com/neihyud))
|
||||
- Fixed other sessions and plugins seeing a workspace as active while another session is archiving it ([#10391](https://github.com/getpaseo/paseo/pull/10391) by [@tabulius-ux](https://github.com/tabulius-ux))
|
||||
- Fixed Android composer buttons requiring a second tap after typing or zooming a chat image ([#10057](https://github.com/getpaseo/paseo/pull/10057), [#10308](https://github.com/getpaseo/paseo/pull/10308))
|
||||
- Fixed swiping a terminal in an Android browser opening the keyboard ([#10225](https://github.com/getpaseo/paseo/pull/10225) by [@tonylt](https://github.com/tonylt))
|
||||
- Fixed Collapse turns hiding a finished OMP or Pi reply when an idle provider notice appears ([#10135](https://github.com/getpaseo/paseo/pull/10135))
|
||||
- Fixed repeated finish notifications while an agent responds to background tasks and its earlier finish is unread ([#10200](https://github.com/getpaseo/paseo/pull/10200))
|
||||
- Fixed repeated finish notifications while an agent responds to background tasks ([#10200](https://github.com/getpaseo/paseo/pull/10200))
|
||||
- Fixed an empty chat losing the prompt and start of a reply after reconnecting mid-reply ([#9723](https://github.com/getpaseo/paseo/pull/9723) by [@ragokan](https://github.com/ragokan))
|
||||
- Fixed changes between Claude thinking levels stopping its background work ([#10008](https://github.com/getpaseo/paseo/pull/10008) by [@gilad-rubin](https://github.com/gilad-rubin))
|
||||
- Fixed changing the Claude thinking level stopping its background work ([#10008](https://github.com/getpaseo/paseo/pull/10008) by [@gilad-rubin](https://github.com/gilad-rubin))
|
||||
- Fixed OpenCode turns staying running after a shared OpenCode service stops ([#10187](https://github.com/getpaseo/paseo/pull/10187))
|
||||
- Fixed OMP denying an approved tool call when session or grant choices were offered ([#10126](https://github.com/getpaseo/paseo/pull/10126) by [@dsingal0](https://github.com/dsingal0))
|
||||
- Fixed a Codex message stopped before its turn starts showing an error instead of canceled ([#9931](https://github.com/getpaseo/paseo/pull/9931) by [@3ae3ae](https://github.com/3ae3ae))
|
||||
- Fixed Changes failing to open when Git metadata watching reaches its limit ([#10188](https://github.com/getpaseo/paseo/pull/10188))
|
||||
- Fixed copying selected reply text into plain-text targets with unwanted Markdown syntax ([#10079](https://github.com/getpaseo/paseo/pull/10079) by [@danberindei](https://github.com/danberindei))
|
||||
- Fixed file views losing their scroll position when switching Preview and Source, except HTML previews on iOS ([#10195](https://github.com/getpaseo/paseo/pull/10195) by [@apple-ouyang](https://github.com/apple-ouyang))
|
||||
- Fixed Markdown previews and source views losing their scroll position when switching between them ([#10195](https://github.com/getpaseo/paseo/pull/10195) by [@apple-ouyang](https://github.com/apple-ouyang))
|
||||
- Fixed file tabs in split panes showing or focusing the wrong file ([#9888](https://github.com/getpaseo/paseo/pull/9888) by [@KosmoCHE](https://github.com/KosmoCHE))
|
||||
- Fixed touch-screen submenus closing as soon as they open ([#10175](https://github.com/getpaseo/paseo/pull/10175) by [@christiantwu](https://github.com/christiantwu))
|
||||
- Fixed dictation failing after another chat that used the microphone closes ([#10185](https://github.com/getpaseo/paseo/pull/10185) by [@Brandon168](https://github.com/Brandon168))
|
||||
- Fixed composer taps being lost on Android after zooming a chat image ([#10057](https://github.com/getpaseo/paseo/pull/10057))
|
||||
- Fixed clipped text on Samsung DeX ([#9995](https://github.com/getpaseo/paseo/pull/9995) by [@easyhunjune](https://github.com/easyhunjune))
|
||||
- Fixed workspace images in chat failing to load after a slow host connection ([#10111](https://github.com/getpaseo/paseo/pull/10111) by [@ragokan](https://github.com/ragokan))
|
||||
- Fixed desktop browser screenshots returning fully transparent images ([#9807](https://github.com/getpaseo/paseo/pull/9807) by [@monarchmaisuriya](https://github.com/monarchmaisuriya))
|
||||
- Fixed Mermaid flowcharts with `@` in labels showing source instead of the diagram ([#10165](https://github.com/getpaseo/paseo/pull/10165) by [@monarchmaisuriya](https://github.com/monarchmaisuriya))
|
||||
- Fixed hidden background workspaces triggering the dock badge and favicon ([#9983](https://github.com/getpaseo/paseo/pull/9983))
|
||||
- Fixed desktop sidebar navigation crowding out workspaces ([#9903](https://github.com/getpaseo/paseo/pull/9903) by [@pentatonic-alex](https://github.com/pentatonic-alex))
|
||||
- Fixed closed PR badges appearing on a repository's default branch ([#10053](https://github.com/getpaseo/paseo/pull/10053))
|
||||
- Fixed plugin agents failing to reopen after their provider closes the session ([#10153](https://github.com/getpaseo/paseo/pull/10153))
|
||||
- Fixed plugin screens and settings failing to use plugin state hooks ([#10049](https://github.com/getpaseo/paseo/pull/10049))
|
||||
- Fixed a Codex message stopped before its turn starts showing an error instead of canceled ([#9931](https://github.com/getpaseo/paseo/pull/9931) by [@3ae3ae](https://github.com/3ae3ae))
|
||||
- Fixed historical closed PR badges appearing on a repository's default branch ([#10053](https://github.com/getpaseo/paseo/pull/10053))
|
||||
|
||||
### Plugins
|
||||
|
||||
- Added plugin control of worktree creation, removal, and restoration ([#10278](https://github.com/getpaseo/paseo/pull/10278))
|
||||
- Added a `focusHost` navigation option that selects the destination host in the sidebar ([#5574](https://github.com/getpaseo/paseo/pull/5574) by [@discwl](https://github.com/discwl))
|
||||
|
||||
## 0.16.2 - 2026-11-18
|
||||
|
||||
|
||||
+76
-14
@@ -1,56 +1,118 @@
|
||||
# Changelog
|
||||
|
||||
## 0.17.0-beta.1 - 2026-11-19
|
||||
## 0.17.2 - 2026-11-22
|
||||
|
||||
- **使用现有 worktree**:在已有的 worktree 中启动工作区,或从任意分支或 PR 创建 worktree。([#10190](https://github.com/getpaseo/paseo/pull/10190))
|
||||
- **Antigravity 审批和历史记录**:选择权限模式、回复工具审批、导入 CLI 会话,并在重新打开对话时查看历史记录。([#10193](https://github.com/getpaseo/paseo/pull/10193))
|
||||
- **监视 PR**:Agent 可以监视 GitHub PR,在检查、审查或评论有变化时收到通知。([#10148](https://github.com/getpaseo/paseo/pull/10148))
|
||||
- **回合和会话统计**:查看 Claude、OpenCode v2、Pi、Oh My Pi 和插件 Provider 的单轮及会话耗时、token、缓存和费用指标。([#10496](https://github.com/getpaseo/paseo/pull/10496), [#10510](https://github.com/getpaseo/paseo/pull/10510))
|
||||
- **自动刷新模型列表**:已启用的 Provider 每 30 分钟在后台刷新一次模型列表。([#10481](https://github.com/getpaseo/paseo/pull/10481))
|
||||
- **默认显示侧边栏用量**:侧边栏用量摘要现在默认开启,未启用 Provider 的用量来源默认隐藏,来源开关移至“来源”列表。([#10491](https://github.com/getpaseo/paseo/pull/10491))
|
||||
- **Agent 可引导进行中的轮次**:Agent 除了排队或中断外,现在可以引导另一个 Agent 正在运行的轮次,并在响应中收到投递指引。([#10483](https://github.com/getpaseo/paseo/pull/10483))
|
||||
|
||||
### 新增
|
||||
|
||||
- 在移动端工作区操作菜单中新增“归档工作区” ([#10507](https://github.com/getpaseo/paseo/pull/10507))
|
||||
- 在 Provider 设置中新增文档链接、更完整的诊断报告,以及带内联刷新按钮的可滚动 Models 列表 ([#10487](https://github.com/getpaseo/paseo/pull/10487))
|
||||
|
||||
### 变更
|
||||
|
||||
- 移除 OpenCode v2 对话中的“This chat uses OpenCode v2.”提示行 ([#10490](https://github.com/getpaseo/paseo/pull/10490))
|
||||
|
||||
### 修复
|
||||
|
||||
- 修复在斜杠菜单中按 Tab 或 Enter 时误触发过期的 `/exit` 选项并归档 Agent 的问题 ([#10484](https://github.com/getpaseo/paseo/pull/10484),贡献者:[@3ae3ae](https://github.com/3ae3ae))
|
||||
- 修复保存了多个主机连接时,繁忙的正常连接会断开重连的问题 ([#10395](https://github.com/getpaseo/paseo/pull/10395))
|
||||
- 修复新建工作区启动失败后,修改表单再重试时出现冲突错误的问题,并统一了 Composer 错误提示 ([#10482](https://github.com/getpaseo/paseo/pull/10482))
|
||||
- 修复 Antigravity 创建循环定时任务后轮次一直停留在运行状态的问题 ([#10469](https://github.com/getpaseo/paseo/pull/10469))
|
||||
- 修复启动 daemon 和重载本地目录插件后遗留僵尸子进程的问题 ([#10470](https://github.com/getpaseo/paseo/pull/10470))
|
||||
|
||||
## 0.17.1 - 2026-11-21
|
||||
|
||||
- **Antigravity 审批和历史记录**:选择权限模式、回复工具审批,以及导入或重新打开会话。需要 [Antigravity CLI 1.5.0 或更高版本](https://paseo.sh/zh-CN/docs/supported-providers/antigravity)。([#10193](https://github.com/getpaseo/paseo/pull/10193))
|
||||
- **使用现有 worktree**:在已有的 worktree 中启动工作区,或从分支或 PR 创建 worktree。([#10190](https://github.com/getpaseo/paseo/pull/10190))
|
||||
- **在 Paseo 中更新 Provider**:查看各 Provider 的状态和已安装版本,并在应用内更新受支持的 CLI。([#9568](https://github.com/getpaseo/paseo/pull/9568), [#9661](https://github.com/getpaseo/paseo/pull/9661))
|
||||
- **Provider 配额预测**:“使用情况”页面会显示配额按当前使用速度将在重置前何时用完。([#10289](https://github.com/getpaseo/paseo/pull/10289), [#10385](https://github.com/getpaseo/paseo/pull/10385))
|
||||
- **监视 PR 和 MR**:让 Agent 监视 PR 或 MR 的检查、审查和评论更新。([#10148](https://github.com/getpaseo/paseo/pull/10148), [#10279](https://github.com/getpaseo/paseo/pull/10279), [#10280](https://github.com/getpaseo/paseo/pull/10280))
|
||||
- **在后台任务中查看 heartbeat**:在 Agent 的后台任务旁查看和停止 heartbeat。([#10097](https://github.com/getpaseo/paseo/pull/10097), [#10216](https://github.com/getpaseo/paseo/pull/10216))
|
||||
- **Agent 消息排队等待**:其他 Agent 的报告和通知会在当前轮次结束后到达,不会打断当前轮次。([#9757](https://github.com/getpaseo/paseo/pull/9757))
|
||||
- **Agent 消息排队等待**:默认情况下,其他 Agent 的消息会等当前轮次结束后再送达。([#9757](https://github.com/getpaseo/paseo/pull/9757), [#10404](https://github.com/getpaseo/paseo/pull/10404))
|
||||
- **更多 goose 模型**:从 goose 中已配置的所有 Provider 选择模型。([#9719](https://github.com/getpaseo/paseo/pull/9719),贡献者:[@i386](https://github.com/i386))
|
||||
- **插件 Agent 指令**:插件可以向 Agent 添加自己的指令。([#9781](https://github.com/getpaseo/paseo/pull/9781))
|
||||
|
||||
### 新增
|
||||
|
||||
- 在“使用情况”页面和 `paseo usage` 中新增 OpenRouter 余额和 API 密钥支出 ([#10269](https://github.com/getpaseo/paseo/pull/10269))
|
||||
- 在“使用情况”页面新增 Antigravity 账号配额 ([#10232](https://github.com/getpaseo/paseo/pull/10232),贡献者:[@luoph](https://github.com/luoph), [@RRD-dev](https://github.com/RRD-dev))
|
||||
- 在 `/` 建议中新增 Antigravity 技能 ([#10383](https://github.com/getpaseo/paseo/pull/10383))
|
||||
- 为 Antigravity 新增内置编排技能 ([#10273](https://github.com/getpaseo/paseo/pull/10273))
|
||||
- 新增 Cmd/Ctrl+/ 和 Cmd/Ctrl+Shift+/ 快捷键,用于打开模型选择器和切换思考级别 ([#10147](https://github.com/getpaseo/paseo/pull/10147))
|
||||
- 新增在发送第一条消息前通过命令中心搜索 Agent 设置 ([#10182](https://github.com/getpaseo/paseo/pull/10182),贡献者:[@cleiter](https://github.com/cleiter))
|
||||
- 新增在命令中心回退最近轮次的操作 ([#10144](https://github.com/getpaseo/paseo/pull/10144))
|
||||
- 新增符合条件的 Claude 模型的独立 Ultracode 开关 ([#10150](https://github.com/getpaseo/paseo/pull/10150),贡献者:[@fivetaku](https://github.com/fivetaku))
|
||||
- 新增 Claude 的独立 Ultracode 开关 ([#10150](https://github.com/getpaseo/paseo/pull/10150),贡献者:[@fivetaku](https://github.com/fivetaku))
|
||||
- 新增 Codex Flex 速度选项 ([#9809](https://github.com/getpaseo/paseo/pull/9809),贡献者:[@qjqqyy](https://github.com/qjqqyy))
|
||||
- 新增 shell 脚本和 Dockerfile 的语法高亮 ([#10178](https://github.com/getpaseo/paseo/pull/10178))
|
||||
- 为 Hub 会话新增列出已连接 daemon 项目的能力 ([#10392](https://github.com/getpaseo/paseo/pull/10392))
|
||||
- 新增 `paseo ls --json` 输出的标签和工作区 ID ([#10076](https://github.com/getpaseo/paseo/pull/10076))
|
||||
|
||||
### 变更
|
||||
|
||||
- 将内容宽度改为默认、宽版和全宽预设,并同时调整已打开对话和 Markdown 预览的宽度 ([#10231](https://github.com/getpaseo/paseo/pull/10231))
|
||||
- Antigravity 工具卡片现在显示 shell 命令、输出和文件 diff ([#10379](https://github.com/getpaseo/paseo/pull/10379))
|
||||
- 从 GitHub 克隆时,优先显示匹配的私有仓库 ([#10264](https://github.com/getpaseo/paseo/pull/10264))
|
||||
- “使用情况”页面中健康的配额进度条改为绿色 ([#10397](https://github.com/getpaseo/paseo/pull/10397))
|
||||
- worktree 清理命令超时时保留 worktree ([#9852](https://github.com/getpaseo/paseo/pull/9852),贡献者:[@ragokan](https://github.com/ragokan))
|
||||
- 手机端工作区导航更快响应点击 ([#9887](https://github.com/getpaseo/paseo/pull/9887))
|
||||
- 短暂重连且文件未更改时,工作区 Git 状态不再重新加载 ([#10142](https://github.com/getpaseo/paseo/pull/10142),贡献者:[@VladimirGVP](https://github.com/VladimirGVP))
|
||||
- 连接多个 Desktop 时,`browser_new_tab` 会让 Agent 选择打开标签页的 Desktop ([#10189](https://github.com/getpaseo/paseo/pull/10189))
|
||||
- 工作区 Git 状态在短暂重连且检出的内容未更改时复用之前的快照 ([#10142](https://github.com/getpaseo/paseo/pull/10142),贡献者:[@VladimirGVP](https://github.com/VladimirGVP))
|
||||
- 工作区导航会立即响应点击,并在手机端初始加载时减少屏幕外的对话行数 ([#9887](https://github.com/getpaseo/paseo/pull/9887))
|
||||
- worktree 清理命令默认在一分钟后停止并保留 worktree;如需更长时间,可在 `paseo.json` 中设置 `worktree.teardownTimeoutMs` ([#9852](https://github.com/getpaseo/paseo/pull/9852),贡献者:[@ragokan](https://github.com/ragokan))
|
||||
|
||||
### 修复
|
||||
|
||||
- 修复在线主机的工作区不显示的问题 ([#10318](https://github.com/getpaseo/paseo/pull/10318))
|
||||
- 修复重新连接后多个已打开的对话同时刷新时,历史记录加载超时的问题 ([#10368](https://github.com/getpaseo/paseo/pull/10368))
|
||||
- 修复 daemon 繁忙时,重新打开较长的 Claude 对话速度慢的问题 ([#10369](https://github.com/getpaseo/paseo/pull/10369))
|
||||
- 修复当前回复中的图片等待另一个对话的历史图片加载的问题 ([#10371](https://github.com/getpaseo/paseo/pull/10371))
|
||||
- 修复用 Ctrl+C 停止前台 daemon 后 Agent 恢复失败的问题 ([#10381](https://github.com/getpaseo/paseo/pull/10381))
|
||||
- 修复 daemon 重启后较长的 Antigravity 对话丢失末尾历史记录的问题 ([#10428](https://github.com/getpaseo/paseo/pull/10428))
|
||||
- 修复 Antigravity 后台命令仍在运行时轮次就已结束的问题 ([#10310](https://github.com/getpaseo/paseo/pull/10310))
|
||||
- 修复保存自定义模型后“添加模型”弹窗一直保持打开的问题 ([#10432](https://github.com/getpaseo/paseo/pull/10432))
|
||||
- 修复 Provider 返回重复命令名称时,斜杠建议列表出错的问题 ([#10275](https://github.com/getpaseo/paseo/pull/10275))
|
||||
- 修复恢复的 Codex 会话的配置和 MCP 服务器仍沿用旧工作目录的问题 ([#10390](https://github.com/getpaseo/paseo/pull/10390),贡献者:[@tabulius-ux](https://github.com/tabulius-ux))
|
||||
- 修复重新打开或回退父对话后,Codex 子 Agent 状态未更新的问题 ([#10171](https://github.com/getpaseo/paseo/pull/10171),贡献者:[@AnalyticETH](https://github.com/AnalyticETH))
|
||||
- 修复切换 Claude 账号后,“使用情况”页面仍显示上一个账号配额的问题 ([#10236](https://github.com/getpaseo/paseo/pull/10236))
|
||||
- 修复固定多个用量窗口时,侧边栏用量行隐藏周期标签的问题 ([#10274](https://github.com/getpaseo/paseo/pull/10274))
|
||||
- 修复恢复 worktree 后,“更改”无法立即识别检出目录的问题 ([#10224](https://github.com/getpaseo/paseo/pull/10224), [#10304](https://github.com/getpaseo/paseo/pull/10304), [#10406](https://github.com/getpaseo/paseo/pull/10406))
|
||||
- 修复拖动分屏分隔条时卡住或跟手缓慢的问题 ([#5996](https://github.com/getpaseo/paseo/pull/5996))
|
||||
- 修复 diff 中双击选词和三击选行的问题 ([#10252](https://github.com/getpaseo/paseo/pull/10252),贡献者:[@pedrovieira](https://github.com/pedrovieira))
|
||||
- 修复启用聊天大纲时,Composer 与对话栏对不齐的问题 ([#10277](https://github.com/getpaseo/paseo/pull/10277))
|
||||
- 修复网页版 Composer 的聚焦快捷键提示遮挡占位符文字的问题 ([#6200](https://github.com/getpaseo/paseo/pull/6200))
|
||||
- 修复当前工作区所在的侧边栏分组折叠时,归档快捷键失效的问题 ([#10356](https://github.com/getpaseo/paseo/pull/10356),贡献者:[@hiennd-ctrl](https://github.com/hiennd-ctrl), [@neihyud](https://github.com/neihyud))
|
||||
- 修复一个会话正在归档工作区时,其他会话和插件仍将其显示为活跃状态的问题 ([#10391](https://github.com/getpaseo/paseo/pull/10391),贡献者:[@tabulius-ux](https://github.com/tabulius-ux))
|
||||
- 修复在 Android 上输入文字或缩放对话图片后,首次点击 Composer 按钮无效的问题 ([#10057](https://github.com/getpaseo/paseo/pull/10057), [#10308](https://github.com/getpaseo/paseo/pull/10308))
|
||||
- 修复在 Android 浏览器中滑动终端时弹出键盘的问题 ([#10225](https://github.com/getpaseo/paseo/pull/10225),贡献者:[@tonylt](https://github.com/tonylt))
|
||||
- 修复启用“折叠轮次”时,空闲的 Provider 通知导致已完成的 OMP 或 Pi 回复被隐藏的问题 ([#10135](https://github.com/getpaseo/paseo/pull/10135))
|
||||
- 修复 Agent 响应后台任务时,在之前的完成状态未读的情况下重复发送完成通知的问题 ([#10200](https://github.com/getpaseo/paseo/pull/10200))
|
||||
- 修复 Agent 响应后台任务时重复发送完成通知的问题 ([#10200](https://github.com/getpaseo/paseo/pull/10200))
|
||||
- 修复空对话在回复中途重连后丢失提示词和回复开头的问题 ([#9723](https://github.com/getpaseo/paseo/pull/9723),贡献者:[@ragokan](https://github.com/ragokan))
|
||||
- 修复切换 Claude 思考级别时停止后台任务的问题 ([#10008](https://github.com/getpaseo/paseo/pull/10008),贡献者:[@gilad-rubin](https://github.com/gilad-rubin))
|
||||
- 修复共享 OpenCode 服务停止后轮次一直显示为运行中的问题 ([#10187](https://github.com/getpaseo/paseo/pull/10187))
|
||||
- 修复 OMP 提供会话或授权选项时拒绝已批准工具调用的问题 ([#10126](https://github.com/getpaseo/paseo/pull/10126),贡献者:[@dsingal0](https://github.com/dsingal0))
|
||||
- 修复 Codex 消息在轮次开始前停止时显示错误而非已取消的问题 ([#9931](https://github.com/getpaseo/paseo/pull/9931),贡献者:[@3ae3ae](https://github.com/3ae3ae))
|
||||
- 修复 Git 元数据监听达到上限时无法打开“更改”的问题 ([#10188](https://github.com/getpaseo/paseo/pull/10188))
|
||||
- 修复将选中的回复复制到纯文本目标时出现多余 Markdown 语法的问题 ([#10079](https://github.com/getpaseo/paseo/pull/10079),贡献者:[@danberindei](https://github.com/danberindei))
|
||||
- 修复在预览和源码之间切换时文件视图丢失滚动位置的问题,iOS 的 HTML 预览除外 ([#10195](https://github.com/getpaseo/paseo/pull/10195),贡献者:[@apple-ouyang](https://github.com/apple-ouyang))
|
||||
- 修复在预览和源码之间切换时 Markdown 预览和源码视图丢失滚动位置的问题 ([#10195](https://github.com/getpaseo/paseo/pull/10195),贡献者:[@apple-ouyang](https://github.com/apple-ouyang))
|
||||
- 修复拆分窗格中的文件标签页显示或聚焦错误文件的问题 ([#9888](https://github.com/getpaseo/paseo/pull/9888),贡献者:[@KosmoCHE](https://github.com/KosmoCHE))
|
||||
- 修复触摸屏上的子菜单打开后立即关闭的问题 ([#10175](https://github.com/getpaseo/paseo/pull/10175),贡献者:[@christiantwu](https://github.com/christiantwu))
|
||||
- 修复关闭另一个使用过麦克风的对话后无法听写的问题 ([#10185](https://github.com/getpaseo/paseo/pull/10185),贡献者:[@Brandon168](https://github.com/Brandon168))
|
||||
- 修复 Android 缩放对话图片后 Composer 点击失效的问题 ([#10057](https://github.com/getpaseo/paseo/pull/10057))
|
||||
- 修复 Samsung DeX 上的文字被裁剪的问题 ([#9995](https://github.com/getpaseo/paseo/pull/9995),贡献者:[@easyhunjune](https://github.com/easyhunjune))
|
||||
- 修复主机连接缓慢后对话中的工作区图片无法加载的问题 ([#10111](https://github.com/getpaseo/paseo/pull/10111),贡献者:[@ragokan](https://github.com/ragokan))
|
||||
- 修复桌面浏览器截图返回全透明图片的问题 ([#9807](https://github.com/getpaseo/paseo/pull/9807),贡献者:[@monarchmaisuriya](https://github.com/monarchmaisuriya))
|
||||
- 修复 Mermaid 流程图标签含有 `@` 时显示源码而非图表的问题 ([#10165](https://github.com/getpaseo/paseo/pull/10165),贡献者:[@monarchmaisuriya](https://github.com/monarchmaisuriya))
|
||||
- 修复隐藏的后台工作区触发程序坞徽标和网站图标状态的问题 ([#9983](https://github.com/getpaseo/paseo/pull/9983))
|
||||
- 修复桌面侧边栏导航占满工作区列表空间的问题 ([#9903](https://github.com/getpaseo/paseo/pull/9903),贡献者:[@pentatonic-alex](https://github.com/pentatonic-alex))
|
||||
- 修复仓库默认分支显示已关闭 PR 徽标的问题 ([#10053](https://github.com/getpaseo/paseo/pull/10053))
|
||||
- 修复 Provider 关闭会话后插件 Agent 无法重新打开的问题 ([#10153](https://github.com/getpaseo/paseo/pull/10153))
|
||||
- 修复插件页面和设置无法使用插件状态钩子的问题 ([#10049](https://github.com/getpaseo/paseo/pull/10049))
|
||||
- 修复 Codex 消息在轮次开始前停止时显示错误而非已取消的问题 ([#9931](https://github.com/getpaseo/paseo/pull/9931),贡献者:[@3ae3ae](https://github.com/3ae3ae))
|
||||
- 修复仓库默认分支显示历史已关闭 PR 徽标的问题 ([#10053](https://github.com/getpaseo/paseo/pull/10053))
|
||||
|
||||
### 插件
|
||||
|
||||
- 新增插件对 worktree 创建、移除和恢复的管理能力 ([#10278](https://github.com/getpaseo/paseo/pull/10278))
|
||||
- 新增插件导航 `focusHost` 选项,用于在侧边栏选中目标主机 ([#5574](https://github.com/getpaseo/paseo/pull/5574),贡献者:[@discwl](https://github.com/discwl))
|
||||
|
||||
## 0.16.2 - 2026-11-18
|
||||
|
||||
|
||||
+12
-5
@@ -152,14 +152,21 @@ 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. The module keeps one ordered queue per recipient, and the recipient reads its prompts in the order the daemon admitted them. Nothing overtakes an older queued message. A prompt takes its place when the daemon admits it, even while the provider is still starting an earlier turn, and a message stays in the queue until the turn that carries it starts. The turn has started when the agent manager acknowledges the run start; a turn that fails after that point is not delivered again.
|
||||
|
||||
- **`steer`** (the agent default) waits. An idle recipient gets the queue after two quiet seconds; steady arrivals cannot hold that window open past ten seconds. While the recipient has a running or starting turn (including compaction), the queue waits and is delivered together when that turn ends on its own or fails. The daemon releases it when it observes the recipient settle; a two-second timer also retries.
|
||||
- **`interrupt`** waits for neither the quiet window nor the turn. It is dispatched at admission as one prompt that replaces the running turn: the messages queued before it, then the interrupt. An older `steer` cannot start a turn after the newer `interrupt` that countermands it.
|
||||
An agent sender picks `queue`, `steer`, or `interrupt` with `activeTurnBehavior`. `steer` and `interrupt` mean what they mean for a person. A person's send has no `queue`. Each kind of prompt is released this way:
|
||||
|
||||
- **`queue`** (the agent default) waits. An idle recipient gets the queue after two quiet seconds; steady arrivals cannot hold that window open past ten seconds. While the recipient has a running or starting turn (including compaction), the queue waits and is delivered together when that turn ends on its own or fails. The daemon releases it when it observes the recipient settle; a two-second timer also retries. Finish notifications and change-request updates always queue.
|
||||
- **`steer`** waits for neither the quiet window nor the turn. It is dispatched at admission as one prompt that enters the running turn: the messages queued before it, then the steer. A provider that cannot steer, or that refuses this steer, gets the prompt as a replacing turn instead, the same as a person's steer.
|
||||
- **`interrupt`** is dispatched at admission the same way, as one prompt that replaces the running turn. An older queued message cannot start a turn after the newer `interrupt` that countermands it.
|
||||
- **A person's prompt** (app, CLI, top-level MCP) is dispatched directly with its existing steer or interrupt behavior and takes the queue along the same way: the messages admitted before it first, then the person's text, in one provider prompt. Messages admitted after it follow it. The person's text keeps its own transcript row. When the turn does not start, the messages return to the queue in their place. That covers a start the provider rejects and a start that is not acknowledged within 60 seconds; a provider that starts the turn after those 60 seconds receives the messages twice.
|
||||
- **Stop** (the stop button, Escape, `cancel_agent`, a Hub interrupt) starts nothing. Messages admitted before the Stop are held, not dropped, including an interrupt whose turn had not started yet. They go ahead of the recipient's next prompt, in that prompt's turn: a person's prompt, or an agent message or notification admitted after the Stop. A held interrupt no longer interrupts; it waits like a `steer`. A queue step or dispatch decided before the Stop is void, and the queue is held again when the message that reopened it is withdrawn. A replacing prompt, a reload, and a rewind are not a Stop. Neither is `cancel_agent` on a recipient with no running or starting turn: it stops nothing, reports that it canceled no run, and a queued `steer` keeps its quiet window.
|
||||
- **Stop** (the stop button, Escape, `cancel_agent`, a Hub interrupt) starts nothing. Messages admitted before the Stop are held, not dropped, including an interrupt whose turn had not started yet. They go ahead of the recipient's next prompt, in that prompt's turn: a person's prompt, or an agent message or notification admitted after the Stop. A held steer or interrupt no longer enters the turn; it waits like a queued message. A queue step or dispatch decided before the Stop is void, and the queue is held again when the message that reopened it is withdrawn. A replacing prompt, a reload, and a rewind are not a Stop. Neither is `cancel_agent` on a recipient with no running or starting turn: it stops nothing, reports that it canceled no run, and a queued message keeps its quiet window.
|
||||
|
||||
A command the provider accepts out of band is the one exception to admission order: it runs alone without ending the turn. A queued command runs ahead of older messages, and an `interrupt` that runs this way takes no queued message along. A person's command leaves the queue where it is. A prompt is a command when it starts with a slash and a name that has no second slash, so `/compact` is one and `/tmp/build.log is stale` is plain text.
|
||||
The queued receipt carries the applied behavior and guidance text for the sender. The text comes from two facts known at admission: whether the recipient has a running turn, and whether its provider can steer (`AgentManager.canSteer`, which is true when the session offers `steerActiveTurn`). It does not wait for the outcome. Guidance for a message queued behind a running turn tells the sender to send a short `steer` or `interrupt` follow-up instead of resending, because the follow-up carries the queued message ahead of it and a resend would be read twice. The MCP tool, the WebSocket `send_agent_message_response`, the CLI, and the connected-host path all relay this one text.
|
||||
|
||||
One provider prompt has one session mode. A batch released by an interrupt or a person's prompt uses the latest explicit choice in it, the person's own first. Steers with conflicting choices keep separate ordered dispatches.
|
||||
Older CLIs and connected hosts send an explicit `steer` for every default agent send. The daemon reads an agent sender's `steer` as `queue` unless the client advertises the `agent_active_turn_behaviors` capability. A new client talking to a daemon without `server_info.features.agentActiveTurnBehaviors` sends no behavior for `queue` and refuses a `steer`.
|
||||
|
||||
A command the provider accepts out of band is the one exception to admission order: it runs alone without ending the turn. A queued command runs ahead of older messages, and a `steer` or `interrupt` that runs this way takes no queued message along. A person's command leaves the queue where it is. A prompt is a command when it starts with a slash and a name that has no second slash, so `/compact` is one and `/tmp/build.log is stale` is plain text.
|
||||
|
||||
One provider prompt has one session mode. A batch released by a steer, an interrupt, or a person's prompt uses the latest explicit choice in it, the person's own first. Queued messages with conflicting choices keep separate ordered dispatches.
|
||||
|
||||
The pending message window is in memory. Clean shutdown flushes it, held messages included, before
|
||||
closing agents; an abrupt crash can lose queued prompts. A durable send receipt remains pending until actual dispatch
|
||||
|
||||
@@ -102,6 +102,7 @@ Each agent is stored as a separate JSON file, grouped by project directory.
|
||||
| `config` | `SerializableConfig?` | Agent session configuration (see below) |
|
||||
| `runtimeInfo` | `RuntimeInfo?` | Live runtime state (see below) |
|
||||
| `features` | `AgentFeature[]?` | Provider-reported features (toggles/selects) |
|
||||
| `sessionMetrics` | `AgentMetric[]?` | Provider-reported session metrics, already formatted for display; the latest report replaces the list |
|
||||
| `persistence` | `PersistenceHandle?` | Handle for resuming sessions |
|
||||
| `lastError` | `string?` (nullable) | Last error message, if any |
|
||||
| `requiresAttention` | `boolean?` | Whether the agent needs user attention |
|
||||
|
||||
+2
-2
@@ -78,7 +78,7 @@ In the composer, the first glyph's ink starts on the text column's edge, and the
|
||||
|
||||
One gate, `resolveControlSizing`, picks touch or pointer sizing: touch when the layout is compact or touch is the primary input. An iPad with the sidebar docked is wide and touch-sized; a desktop is pointer-sized; a phone is both compact and touch. The primary input comes from `(pointer: coarse)` (`hasTouchPrimaryPointer` in `hooks/pointer-capabilities.ts`), not from whether a touch screen exists: WebKit keeps touch primary on an iPad with a trackpad attached, and Chromium reports a fine primary pointer for a laptop with a touch screen that its trackpad drives. The fact is read once at startup: attaching a pointer to a tablet does not shrink its controls, and a 2-in-1 launched with a pointer keeps pointer sizes after it switches to tablet mode until the app reloads. Stylesheets take sizes from `bySizing({ touch, pointer })`, which resolves to a breakpoint value, so a caller never sees which sizing it got. Rows, icon buttons and icon slots take theirs from `styles/density.ts`, which uses the same gate. An `{ xs, md }` literal for a hit target or glyph is wrong: on an iPad it yields the pointer size.
|
||||
|
||||
Buttons are pills (`borderRadius.full`) with medium-weight labels; an icon-only button is a circle. `<Switch>` follows the same two sizes: a 34×20 track by default and in `sm`, 44×26 where controls are touch-sized, and it reserves its size's control height so a row holding one lines up with a row holding a button. Buttons, text fields, dropdown triggers, and `<SegmentedControl>` (`packages/app/src/components/ui/segmented-control.tsx`) share the size contract — the same size name means the same height and label size on every control kind, so controls in one row line up. Segments run tighter than a button, because the gap between segments already reads as padding. The selected segment is a `surface3` fill with `foreground` text, not an inverted one — inverting it inside thin chrome puts a white slab in the toolbar. A settings row sizes the controls in its trailing slot itself, default in a card and `sm` when nested (`packages/app/src/components/ui/control-size.tsx`), so don't pass a size to a button, dropdown or field placed in a row. Code that computes with a control's height outside a stylesheet uses `controlHeightForLayout`. Never shrink a control's font or padding locally to fit a context — if the context needs a smaller control, the size tier is missing or the wrong one is in use.
|
||||
Buttons are pills (`borderRadius.full`) with medium-weight labels; an icon-only button is a circle. `<Switch>` follows the same two sizes: a 34×20 track by default and in `sm`, 44×26 where controls are touch-sized, and it takes presses over its size's control height without adding that height to its row. Buttons, text fields, dropdown triggers, and `<SegmentedControl>` (`packages/app/src/components/ui/segmented-control.tsx`) share the size contract — the same size name means the same height and label size on every control kind, so controls in one row line up. Segments run tighter than a button, because the gap between segments already reads as padding. The selected segment is a `surface3` fill with `foreground` text, not an inverted one — inverting it inside thin chrome puts a white slab in the toolbar. A settings row sizes the controls in its trailing slot itself, default in a card and `sm` when nested (`packages/app/src/components/ui/control-size.tsx`), so don't pass a size to a button, dropdown or field placed in a row. Code that computes with a control's height outside a stylesheet uses `controlHeightForLayout`. Never shrink a control's font or padding locally to fit a context — if the context needs a smaller control, the size tier is missing or the wrong one is in use.
|
||||
|
||||
A `<Pressable>` wrapping a `<Text>` is a sixth variant. It is wrong. `<Button>` accepts `style`, `textStyle`, `leftIcon`, `disabled`, `size`, and `variant`.
|
||||
|
||||
@@ -134,7 +134,7 @@ A section or group explains itself through the `info` prop on `<SettingsSection>
|
||||
|
||||
Cards inside a section sit closer than sections. Rows inside a card touch — only the divider separates them. The rhythm is page → spacious; section → spacious; card → tight.
|
||||
|
||||
Rows have generous vertical padding: roughly 16px of content plus 16px of vertical padding for settings rows, 8–12px for sidebar list items where many rows must fit. A row that opens something (`<SettingsDetailRow>`, a collapsible row's header) is at least as tall as one holding a default control, so a list where only some of those rows carry a switch keeps one row height. Other rows take their content's height. Compressing rows below the established density to fit more on the screen is wrong. Too many rows means more cards or more sections, not smaller rows.
|
||||
Rows have generous vertical padding: roughly 16px of content plus 16px of vertical padding for settings rows, 8–12px for sidebar list items where many rows must fit. Every row is at least as tall as one holding a switch, so text rows, switch rows and rows that open something (`<SettingsDetailRow>`, a collapsible row's header) line up. A row holding a button or a select is taller. Compressing rows below the established density to fit more on the screen is wrong. Too many rows means more cards or more sections, not smaller rows.
|
||||
|
||||
Rows revealed under a `<SettingsCollapsibleRow>` are nested rows, one step smaller than card rows: 8px of vertical padding, `fontSize.sm` text, `sm` controls, and one fixed height so rows with and without a trailing button line up. The collapsible row sets this for everything under it (`packages/app/src/components/settings/row-density.tsx`). Never pass a density to a row, and never pad or resize a nested row by hand. Settings rows that share a menu surface with menu rows, such as Usage's options, go inside `<MenuSettingsRows>`, which puts their labels on the menu rows' label rail (`menuRowContentInset`).
|
||||
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ Authoritative terminology. UI label wins. Don't invent synonyms; use what's here
|
||||
- **Agent controls** — Provider, model, mode, thinking, and provider-feature controls for an agent or draft agent. Code: `AgentControls` / `DraftAgentControls` (`packages/app/src/composer/agent-controls/index.tsx`). Forbidden: "Agent status bar".
|
||||
- **Composer footer** — Optional area rendered below the composer input but still inside the keyboard-shifted composer layout. Code: `Composer.footer` (`packages/app/src/composer/index.tsx`).
|
||||
- **Composer track** — A contextual lane at the foot of a pane, by the composer input. Specific tracks use the `<thing> track` form: **Queue track**, **Subagents track**, **Tasks track**. The subagents and tasks tracks are pills floating over the transcript, each opening a panel with its rows; the queue track is a lane inside the composer itself. Code: queue track inside `Composer` (`packages/app/src/composer/index.tsx`), pill and panel frame in `packages/app/src/composer/tracks.tsx`, `SubagentsTrack` (`packages/app/src/subagents/track.tsx`), `AgentTaskList` (`packages/app/src/composer/task-list/index.tsx`).
|
||||
- **Steer** — A follow-up admitted into an agent's already-running turn instead of interrupting it. Interrupting the turn discards steers the provider has not read yet; there is no take-back short of that, and no provider offers one. The stop button and Escape both interrupt. A steer the provider never read keeps its transcript row, matching Codex. Sending while the agent waits on a permission denies that request first, so the message reaches the same turn instead of stalling behind it. UI: "Send and steer". Code: `steerActiveTurn` (`packages/server/src/server/agent/agent-sdk-types.ts`). Don't confuse with **Queue track**, which holds messages client-side until the turn ends and never enters the running turn. Forbidden: "Delivery", "Queued prompt".
|
||||
- **Steer** — A follow-up admitted into an agent's already-running turn instead of interrupting it. Interrupting the turn discards steers the provider has not read yet; there is no take-back short of that, and no provider offers one. The stop button and Escape both interrupt. A steer the provider never read keeps its transcript row, matching Codex. Sending while the agent waits on a permission denies that request first, so the message reaches the same turn instead of stalling behind it. UI: "Send and steer". Code: `steerActiveTurn` (`packages/server/src/server/agent/agent-sdk-types.ts`). Don't confuse with **Queue track**, which holds messages client-side until the turn ends and never enters the running turn. An agent sender's `activeTurnBehavior: "steer"` (CLI `--behavior steer`) means the same as a person's steer. Agent senders default to `queue` instead: the daemon holds the message until the running turn ends, as the queue track does for a person. Forbidden: "Delivery", "Queued prompt".
|
||||
- **Subagent** — User-facing term for an agent session related to a parent agent session. Use **subagents** in UI copy and docs. Internal daemon/provider plumbing may say "child agent" or `child_session`, especially for provider-managed imports; do not surface "child agent" as a product term.
|
||||
- **Attachment tray** — The selected-attachments row inside the composer input, above the text input. Code: `renderAttachmentTray` (`packages/app/src/composer/index.tsx`). Forbidden: "Attachment bar".
|
||||
- **Fork** — Starting a NEW agent session seeded with a copy of another session's curated chat history. The history rides along as a `chat_history` composer attachment on a draft; the fork does **not** resume or branch the provider-side session, and the source session keeps running untouched. Two targets, one surface, one RPC (`agent.fork_context`, gated on the `agentForkContext` host feature). UI: the fork menu lives in the assistant turn footer and offers "Fork in a new tab" / "Fork in a new workspace". On a **completed** turn it sits beside the copy button and pins a boundary to that turn, so the fork stops where the turn ended. On the **in-flight** turn it sits beside the progress loader and elapsed timer, and omits the boundary entirely — `selectForkContextRows` projects the whole timeline when no boundary is given, so the fork captures everything **up to now**, including the response still streaming. That omission is what makes mid-run forking work; pinning a boundary there would silently drop the live response. Forbidden on provider-subagent (read-only) panes. Code: `useForkAgent` (`packages/app/src/hooks/use-fork-agent.ts`), `selectForkContextRows` (`packages/server/src/server/agent/activity-curator.ts`). Don't confuse with: git fork (unrelated; Paseo has no such concept), **Worktree** (filesystem isolation, not history copying).
|
||||
|
||||
+3
-2
@@ -72,8 +72,9 @@ hashes, never prompts, environment values, or credentials.
|
||||
|
||||
Before messaging an archived workspace, call `workspace.recovery.inspect.request`, then
|
||||
`workspace.recovery.restore.request` and await success. The native message handler unarchives the
|
||||
agent and loads its persisted provider session. `activeTurnBehavior: "steer"` uses the provider's
|
||||
native steering behavior, including Paseo's existing behavior when that provider cannot steer.
|
||||
agent and loads its persisted provider session. A Hub message is a direct send (no `sourceAgentId`), so
|
||||
`activeTurnBehavior: "steer"` uses the provider's native steering and interrupts the running turn
|
||||
when that provider cannot steer. The daemon rejects `queue` on a direct send.
|
||||
Execution completion and arrival-specific output authority remain Hub responsibilities.
|
||||
|
||||
The older `hub.execution.*` RPCs remain accepted for existing clients. Their execution ownership
|
||||
|
||||
+23
-2
@@ -221,11 +221,32 @@ Plugin callbacks follow the same contract; see [plugin providers](plugins.md#con
|
||||
`ProviderSnapshotManager` owns one refresh deadline per provider. The deadline starts before the
|
||||
availability check and covers that check plus the complete catalog probe. Providers that make
|
||||
multiple catalog requests must not apply this deadline separately to each request. The manager
|
||||
aborts the shared refresh signal at the deadline. Providers name active catalog operations and
|
||||
aborts the shared refresh signal at the deadline, and when it stops. Shutdown waits for running
|
||||
probes to settle before it shuts down provider clients, so a probe cannot start provider work,
|
||||
such as an OpenCode server, after its client has cleaned up. Providers name active catalog operations and
|
||||
finish subprocess, server, or session cleanup before rejecting. Timeout errors list the operations
|
||||
that were still active when the deadline expired.
|
||||
|
||||
Catalogue results stay cached by identity until explicit refresh or a change to that provider's configuration.
|
||||
Catalogue results stay cached by identity until a refresh or a change to that provider's configuration.
|
||||
Providers change their model lists on the server without a CLI update, so the daemon refreshes
|
||||
each enabled provider about every 30 minutes (`ProviderRefreshSchedule`). One timer ticks
|
||||
`30 min / enabled providers` apart, and each tick starts at most one refresh: the provider refreshed
|
||||
longest ago, if that was a full interval ago. Ticks do not wait for refreshes, so a provider that
|
||||
probes many workspace targets does not delay the others, and provider CLIs never start in a burst.
|
||||
Any forced refresh, configuration change, or newly enabled provider counts as a refresh and pushes
|
||||
that provider's next one back a full interval.
|
||||
The background refresh takes the settings refresh path for one provider, with these differences:
|
||||
|
||||
- It joins discovery already in flight.
|
||||
- It passes `force: false`, because providers treat `force` as a requested hard refresh. OpenCode
|
||||
rotates its shared server on it.
|
||||
- An unchanged catalogue keeps the published record and its `fetchedAt`, so idle clients receive
|
||||
no update.
|
||||
- A result that is not ready, or a catalogue the provider marks `incomplete`, keeps a ready
|
||||
catalogue. Plugin status probes report a failed startup as unavailable, so that counts as
|
||||
transient. Set `ProviderCatalog.incomplete` when discovery fails and you fall back to a partial
|
||||
list, as Claude does when model discovery times out. A manual refresh still publishes all three.
|
||||
|
||||
Keys are resolved on each read so project configuration can select a different cached catalogue.
|
||||
Selector opening may read a loading or stale query, but does not force provider probing.
|
||||
|
||||
|
||||
+38
-16
@@ -659,6 +659,7 @@ No prefix (`v`), no extra text. `Release Notes Sync` matches the `## X.Y.Z` (or
|
||||
- `CHANGELOG.md` holds stable releases and at most one entry for the current beta series.
|
||||
- The first beta of a version inserts a top entry like `## 0.1.60-beta.1 - YYYY-MM-DD`.
|
||||
- Each subsequent beta rewrites that entry in place: the heading becomes the new beta number and date, and the body describes the full change from the previous stable release to this beta. Never add a second beta entry.
|
||||
- The entry announces changes and leaves setup steps, click paths, migration notes, configuration keys, hedges and edge cases to product docs. The headline change is the first highlight. [Changelog conciseness](#changelog-conciseness) and [Changelog ordering](#changelog-ordering) hold the rules.
|
||||
- The entry is a list of changes, not of PRs. When a later beta reverts, reworks, or follows up on something an earlier beta added, rewrite the bullet to the current behavior or delete it. A stable user never saw the earlier beta behavior, so fixes to it are not "Fixed" bullets.
|
||||
- Anything that already shipped to stable through a patch release on an older line stays out of the beta entry.
|
||||
- Stable promotion renames the entry to `## 0.1.60 - YYYY-MM-DD` after a final review.
|
||||
@@ -714,14 +715,30 @@ claims a general improvement, rewrite it with the concrete change.
|
||||
|
||||
## Changelog conciseness
|
||||
|
||||
Every section bullet must be scannable at a glance. The changelog is not release documentation — it's a list. [Highlights](#changelog-highlights) get more room; every other bullet follows these limits.
|
||||
An entry announces what changed. Product docs own setup, navigation, migration and edge cases, and the PR link leads to the rest. These rules apply to highlights and section bullets.
|
||||
|
||||
- **One sentence per bullet, max.** If a bullet contains two sentences, the second one is doing work that belongs in product docs, not the changelog. Cut it.
|
||||
- **No instructions.** Cut setup steps, click paths, configuration keys, flags and migration notes. "Open a provider's settings from Settings, setup, or the model picker" is a click path. "Existing goose settings and sessions carry over to the bundled plugin" is a migration note.
|
||||
- **One warning for a breaking requirement.** When the update stops something working until the user acts, state the requirement in one short sentence after the announcement, and link the product doc that has the steps: "Requires [Antigravity CLI 1.5.0 or later](https://paseo.sh/docs/supported-providers/antigravity)." Nothing else earns a second sentence.
|
||||
- **No hedges or exception clauses.** Cut "when needed", "for eligible models", "on hosts where…", "except…", "with a hint shown when…" and "across common install shapes". Keep the condition that triggers a fixed failure, as in `Fixed <failure> when <condition>`.
|
||||
- **The shorter bullet is still true.** When a change reaches only some providers, platforms or file types, name what it covers in the sentence's own words: "update supported CLIs" where one provider has no update command, "Markdown previews and source views" where HTML previews on iOS are left out, "by default" where an explicit interrupt still replaces the turn. Do not widen the claim to remove a clause.
|
||||
- **State the outcome and stop.** Say what the user gets. Leave out queues, snapshots, caches, timeouts, LAN/WAN topology, TLS handshakes and IPC.
|
||||
|
||||
Each row is from the first draft of 0.17.1:
|
||||
|
||||
| Avoid | Write |
|
||||
| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
|
||||
| Open a provider's settings from Settings, setup, or the model picker to update supported CLIs and watch their output | Update supported CLIs from the app |
|
||||
| Use Antigravity CLI 1.5.0 or later on the daemon host, and include `acp` if you override its command | Requires Antigravity CLI 1.5.0 or later |
|
||||
| Reports and notifications from other agents arrive in order when the current turn ends instead of interrupting it. An interrupt or your own prompt carries earlier queued messages in the same turn, and Stop holds queued messages until the next prompt | By default, messages from other agents wait for the current turn to end |
|
||||
| Changed worktree teardown to keep the worktree when the command exceeds one minute or the `worktree.teardownTimeoutMs` limit in `paseo.json` | Changed worktree teardown to keep the worktree when the command times out |
|
||||
| Fixed file views losing their scroll position when switching Preview and Source, except HTML previews on iOS | Fixed Markdown previews and source views losing their scroll position when switching between them |
|
||||
|
||||
Section bullets also follow these limits:
|
||||
|
||||
- **One sentence per bullet, max.** A second sentence is documentation. Cut it.
|
||||
- **No trailing periods.** Bullets are list items, not prose. Drop the period at the end of every bullet, including the period inside any bolded lead-in. `**Configurable terminal scrollback**` not `**Configurable terminal scrollback.**`.
|
||||
- **One line per bullet.** If a bullet wraps to three lines in a narrow column, it's too long.
|
||||
- **Split bullets that pack multiple distinct changes.** If a bullet uses "and", "plus", a comma list, or an em-dash to chain several independent improvements, break them into separate bullets — even when they share a theme or author. One bullet = one user-facing change.
|
||||
- **Trim qualifying clauses.** Drop "with a hint shown when…", "matching the CLI's behaviour", "across common install shapes". If the detail doesn't change whether a user cares, cut it.
|
||||
- **Stop after identifying the change.** Do not explain LAN/WAN topology, TLS handshakes, IPC, or other architecture in a changelog bullet. Put necessary background in product docs.
|
||||
- **Attribution follows the split.** When you split a dense bullet, move each PR/author to the bullet it belongs to. Never duplicate the same PR across multiple bullets.
|
||||
|
||||
## Changelog highlights
|
||||
@@ -734,7 +751,7 @@ reader who stops after the highlights should have missed nothing they would ask
|
||||
```markdown
|
||||
## 0.16.0 - 2026-11-20
|
||||
|
||||
- **Undo workspace archive:** Archiving a workspace in the app now shows a "Workspace archived" toast for six seconds. Undo, or Cmd/Ctrl+Z, restores the workspace with its tabs and agents. ([#8904](https://github.com/getpaseo/paseo/pull/8904))
|
||||
- **Undo workspace archive:** Restore an archived workspace with Undo or Cmd/Ctrl+Z. ([#8904](https://github.com/getpaseo/paseo/pull/8904))
|
||||
|
||||
### Added
|
||||
```
|
||||
@@ -745,17 +762,19 @@ reader who stops after the highlights should have missed nothing they would ask
|
||||
- **The lead-in is not a place or something Paseo already had.** A device, screen or area names
|
||||
where the change landed. A feature name that was true of the last release hides the news: Paseo
|
||||
already had keyboard shortcuts, so the lead-in says they now work on mobile.
|
||||
- **The first sentence says the plain thing.** Write what a user would tell a friend: Paseo now
|
||||
- **One short sentence says the plain thing.** Write what a user would tell a friend: Paseo now
|
||||
shows the background tasks an agent is running. Leave out the conditions and mechanics that make
|
||||
it true.
|
||||
it true. A second sentence is only for a
|
||||
[breaking requirement](#changelog-conciseness).
|
||||
- **Describe the new behavior, not the old one.** Say what is faster or better now, and do not
|
||||
dwell on how slow or broken it was before. A number is welcome as a short aside after the new
|
||||
behavior is stated: seconds, a percentage, a multiple.
|
||||
- **Do not list what a sentence already covers.** After "the same shortcuts as desktop", naming
|
||||
five of them adds nothing. Keep a list only when it sets the scope, such as the providers a
|
||||
feature works with.
|
||||
- **The description runs one to three sentences.** Sentences end with periods, and the attribution
|
||||
follows the last one. [Changelog wording](#changelog-wording) applies in full.
|
||||
- **Sentences end with periods, and the attribution follows the last one.**
|
||||
[Changelog wording](#changelog-wording) and [Changelog conciseness](#changelog-conciseness)
|
||||
apply.
|
||||
- **A highlight replaces the section bullets it covers.** A PR appears once in an entry, so its
|
||||
attribution moves to the highlight.
|
||||
- **A highlight is something a user would name.** Everything else stays a section bullet. A patch
|
||||
@@ -764,13 +783,13 @@ reader who stops after the highlights should have missed nothing they would ask
|
||||
of related fixes, becomes a highlight only when it passes the same test as a feature, and then
|
||||
it is written as what works now: `**Fewer reconnects on return:**`.
|
||||
|
||||
| Avoid | Write |
|
||||
| ------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------- |
|
||||
| `**iPad and touch screens:**` | `**Touch-sized tablet controls:**` |
|
||||
| `**Hardware keyboard shortcuts:**` | `**Keyboard shortcuts on mobile:**` |
|
||||
| When an agent ends its turn while shells it started are still running, a pill lists them | Paseo now shows the background tasks an agent is running |
|
||||
| A diff no longer waits 4 to 40 seconds behind worktree scans | Opening Changes shows the file tree right away, and diffs load about 6 times sooner on hosts with many worktrees |
|
||||
| The same shortcuts as desktop: command center, file picker, new workspace, workspace jumps | The same shortcuts as desktop, including your custom bindings |
|
||||
| Avoid | Write |
|
||||
| ------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------- |
|
||||
| `**iPad and touch screens:**` | `**Touch-sized tablet controls:**` |
|
||||
| `**Hardware keyboard shortcuts:**` | `**Keyboard shortcuts on mobile:**` |
|
||||
| When an agent ends its turn while shells it started are still running, a pill lists them | Paseo now shows the background tasks an agent is running |
|
||||
| A diff no longer waits 4 to 40 seconds behind worktree scans | Opening Changes shows the file tree right away, and diffs load about 6 times sooner |
|
||||
| The same shortcuts as desktop: command center, file picker, new workspace, workspace jumps | The same shortcuts as desktop, including your custom bindings |
|
||||
|
||||
Before showing a draft, read only the bold lead-ins top to bottom. Each one must answer "what is
|
||||
new?" without its description, and each must outrank the one below it.
|
||||
@@ -820,6 +839,9 @@ question.
|
||||
for them: `Undo workspace archive`, `Fewer reconnects on return`. Fixes are routine, so one
|
||||
that earned a highlight still follows everything new or improved.
|
||||
|
||||
- **The headline change goes first, whatever its group.** It is the change the release is announced
|
||||
with. 0.17.1 leads with `Antigravity approvals and history`, which needs one provider. The groups
|
||||
rank everything after it.
|
||||
- **Reach decides before kind.** A new capability that needs a hardware keyboard is in group 3.
|
||||
- **Rank the whole list in one pass.** The order you collected the pull requests in, the alphabet
|
||||
and the order of the sections below are not rankings.
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
- Antigravity approvals and history: Choose a permission mode, answer tool approvals, and import or reopen sessions. Requires Antigravity CLI 1.5.0 or later.
|
||||
- Use existing worktrees: Start a workspace in a worktree you already have, or create one from a branch or pull request.
|
||||
- Update providers in Paseo: See each provider's status and installed version, and update supported CLIs from the app.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -0,0 +1,5 @@
|
||||
- Antigravity approvals and history: Choose a permission mode, answer tool approvals, and import or reopen sessions. Requires Antigravity CLI 1.5.0 or later.
|
||||
- Use existing worktrees: Start a workspace in a worktree you already have, or create one from a branch or pull request.
|
||||
- Update providers in Paseo: See each provider's status and installed version, and update supported CLIs from the app.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -0,0 +1,5 @@
|
||||
- Antigravity approvals and history: Choose a permission mode, answer tool approvals, and import or reopen sessions. Requires Antigravity CLI 1.5.0 or later.
|
||||
- Use existing worktrees: Start a workspace in a worktree you already have, or create one from a branch or pull request.
|
||||
- Update providers in Paseo: See each provider's status and installed version, and update supported CLIs from the app.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -0,0 +1,5 @@
|
||||
- Antigravity approvals and history: Choose a permission mode, answer tool approvals, and import or reopen sessions. Requires Antigravity CLI 1.5.0 or later.
|
||||
- Use existing worktrees: Start a workspace in a worktree you already have, or create one from a branch or pull request.
|
||||
- Update providers in Paseo: See each provider's status and installed version, and update supported CLIs from the app.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -0,0 +1,5 @@
|
||||
- Turn and session stats: View per-turn and session timing, token, cache, and cost metrics for Claude, OpenCode v2, Pi, Oh My Pi, and plugin providers.
|
||||
- Automatic model list refresh: Enabled providers refresh their model lists in the background every 30 minutes.
|
||||
- Sidebar usage by default: The sidebar usage summary is enabled by default, sources for inactive providers start hidden, and source toggles move to a Sources list.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -0,0 +1,5 @@
|
||||
- Turn and session stats: View per-turn and session timing, token, cache, and cost metrics for Claude, OpenCode v2, Pi, Oh My Pi, and plugin providers.
|
||||
- Automatic model list refresh: Enabled providers refresh their model lists in the background every 30 minutes.
|
||||
- Sidebar usage by default: The sidebar usage summary is enabled by default, sources for inactive providers start hidden, and source toggles move to a Sources list.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -0,0 +1,5 @@
|
||||
- Turn and session stats: View per-turn and session timing, token, cache, and cost metrics for Claude, OpenCode v2, Pi, Oh My Pi, and plugin providers.
|
||||
- Automatic model list refresh: Enabled providers refresh their model lists in the background every 30 minutes.
|
||||
- Sidebar usage by default: The sidebar usage summary is enabled by default, sources for inactive providers start hidden, and source toggles move to a Sources list.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -0,0 +1,5 @@
|
||||
- Turn and session stats: View per-turn and session timing, token, cache, and cost metrics for Claude, OpenCode v2, Pi, Oh My Pi, and plugin providers.
|
||||
- Automatic model list refresh: Enabled providers refresh their model lists in the background every 30 minutes.
|
||||
- Sidebar usage by default: The sidebar usage summary is enabled by default, sources for inactive providers start hidden, and source toggles move to a Sources list.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
+1
-1
@@ -1 +1 @@
|
||||
sha256-esZ6cghL+VfK01yLZlFIK/M94+q0a2e+od3rvA3lPqo=
|
||||
sha256-vtzoUMnKaAdBFd/hhnk9p2WwHGgL70RXh26vkkyRIH0=
|
||||
|
||||
Generated
+28
-28
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "paseo",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "paseo",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"hasInstallScript": true,
|
||||
"license": "Apache-2.0",
|
||||
"workspaces": [
|
||||
@@ -37477,7 +37477,7 @@
|
||||
},
|
||||
"packages/app": {
|
||||
"name": "@getpaseo/app",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"dependencies": {
|
||||
"@codemirror/commands": "6.10.4",
|
||||
"@codemirror/language": "6.12.4",
|
||||
@@ -39647,13 +39647,13 @@
|
||||
},
|
||||
"packages/cli": {
|
||||
"name": "@getpaseo/cli",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@clack/prompts": "^1.0.0",
|
||||
"@getpaseo/client": "0.17.0-beta.1",
|
||||
"@getpaseo/protocol": "0.17.0-beta.1",
|
||||
"@getpaseo/server": "0.17.0-beta.1",
|
||||
"@getpaseo/client": "0.17.2",
|
||||
"@getpaseo/protocol": "0.17.2",
|
||||
"@getpaseo/server": "0.17.2",
|
||||
"chalk": "^5.3.0",
|
||||
"commander": "^12.0.0",
|
||||
"mime-types": "^2.1.35",
|
||||
@@ -39900,11 +39900,11 @@
|
||||
},
|
||||
"packages/client": {
|
||||
"name": "@getpaseo/client",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@getpaseo/protocol": "0.17.0-beta.1",
|
||||
"@getpaseo/relay": "0.17.0-beta.1",
|
||||
"@getpaseo/protocol": "0.17.2",
|
||||
"@getpaseo/relay": "0.17.2",
|
||||
"ws": "^8.20.0",
|
||||
"zod": "^4.4.3"
|
||||
},
|
||||
@@ -39916,7 +39916,7 @@
|
||||
},
|
||||
"packages/desktop": {
|
||||
"name": "@getpaseo/desktop",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@getpaseo/cli": "*",
|
||||
@@ -40159,7 +40159,7 @@
|
||||
},
|
||||
"packages/expo-two-way-audio": {
|
||||
"name": "@getpaseo/expo-two-way-audio",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@types/jest": "^29.5.14",
|
||||
@@ -40205,7 +40205,7 @@
|
||||
},
|
||||
"packages/highlight": {
|
||||
"name": "@getpaseo/highlight",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@codemirror/language": "6.12.4",
|
||||
@@ -40235,7 +40235,7 @@
|
||||
},
|
||||
"packages/plugin": {
|
||||
"name": "@getpaseo/plugin",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@agentclientprotocol/sdk": "^1.4.0",
|
||||
@@ -40243,8 +40243,8 @@
|
||||
"use-sync-external-store": "^1.6.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@getpaseo/client": "0.17.0-beta.1",
|
||||
"@getpaseo/protocol": "0.17.0-beta.1",
|
||||
"@getpaseo/client": "0.17.2",
|
||||
"@getpaseo/protocol": "0.17.2",
|
||||
"@types/node": "^20.9.0",
|
||||
"@types/react": "~19.2.0",
|
||||
"react": "19.2.3",
|
||||
@@ -40254,8 +40254,8 @@
|
||||
"zod": "^4.4.3"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@getpaseo/client": "0.17.0-beta.1",
|
||||
"@getpaseo/protocol": "0.17.0-beta.1",
|
||||
"@getpaseo/client": "0.17.2",
|
||||
"@getpaseo/protocol": "0.17.2",
|
||||
"react": ">=19.1.0 <20",
|
||||
"react-native": ">=0.81.5",
|
||||
"zod": "^4.4.3"
|
||||
@@ -40277,7 +40277,7 @@
|
||||
},
|
||||
"packages/protocol": {
|
||||
"name": "@getpaseo/protocol",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"semver": "^7.8.5",
|
||||
@@ -40305,7 +40305,7 @@
|
||||
},
|
||||
"packages/relay": {
|
||||
"name": "@getpaseo/relay",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@noble/ciphers": "^2.4.0",
|
||||
@@ -40527,17 +40527,17 @@
|
||||
},
|
||||
"packages/server": {
|
||||
"name": "@getpaseo/server",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@agentclientprotocol/sdk": "^0.17.1",
|
||||
"@anthropic-ai/claude-agent-sdk": "0.3.326",
|
||||
"@anthropic-ai/sdk": "^0.104.2",
|
||||
"@getpaseo/client": "0.17.0-beta.1",
|
||||
"@getpaseo/highlight": "0.17.0-beta.1",
|
||||
"@getpaseo/plugin": "0.17.0-beta.1",
|
||||
"@getpaseo/protocol": "0.17.0-beta.1",
|
||||
"@getpaseo/relay": "0.17.0-beta.1",
|
||||
"@getpaseo/client": "0.17.2",
|
||||
"@getpaseo/highlight": "0.17.2",
|
||||
"@getpaseo/plugin": "0.17.2",
|
||||
"@getpaseo/protocol": "0.17.2",
|
||||
"@getpaseo/relay": "0.17.2",
|
||||
"@isaacs/ttlcache": "^2.1.4",
|
||||
"@modelcontextprotocol/sdk": "1.29.0",
|
||||
"@opencode-ai/sdk": "1.14.46",
|
||||
@@ -41484,7 +41484,7 @@
|
||||
},
|
||||
"packages/website": {
|
||||
"name": "@getpaseo/website",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"dependencies": {
|
||||
"@cloudflare/vite-plugin": "^1.29.1",
|
||||
"@cloudflare/workers-types": "^4.20260317.1",
|
||||
@@ -43095,7 +43095,7 @@
|
||||
},
|
||||
"plugins": {
|
||||
"name": "@getpaseo/builtin-plugins",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"dependencies": {
|
||||
"@getpaseo/plugin": "*",
|
||||
"zod": "^4.4.3"
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "paseo",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"private": true,
|
||||
"description": "Paseo: voice-controlled development environment for local AI coding agents",
|
||||
"keywords": [
|
||||
|
||||
@@ -430,7 +430,8 @@ async function expectFooterWithinWidth(page: Page, width: number): Promise<void>
|
||||
const label = page.getByRole("button", { name: /^Worked for/ }).last();
|
||||
await expect(label).toBeVisible();
|
||||
await expectTimingInsideFooter(page);
|
||||
const controls = footer.getByRole("button", { name: /Copy turn|Fork chat/ });
|
||||
await expect(footer.getByRole("button", { name: "Turn stats" })).toBeVisible();
|
||||
const controls = footer.getByRole("button", { name: /Copy turn|Fork chat|Turn stats/ });
|
||||
const before = await controls.evaluateAll((elements) =>
|
||||
elements.map((element) => {
|
||||
const rect = element.getBoundingClientRect();
|
||||
|
||||
@@ -59,6 +59,35 @@ async function selectClientSlashCommand(page: Page, query: string, label: string
|
||||
await input.press("Enter");
|
||||
}
|
||||
|
||||
async function typeBeforeMenuFilters(
|
||||
page: Page,
|
||||
input: { text: string; key: "Tab" | "Enter" },
|
||||
): Promise<void> {
|
||||
await composerLocator(page).evaluate(async (element, { text, key }) => {
|
||||
if (!(element instanceof HTMLTextAreaElement)) {
|
||||
throw new Error("Composer input is not a textarea");
|
||||
}
|
||||
const setValue = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, "value")?.set;
|
||||
if (!setValue) throw new Error("Textarea value setter is unavailable");
|
||||
setValue.call(element, text);
|
||||
element.setSelectionRange(text.length, text.length);
|
||||
element.dispatchEvent(new Event("input", { bubbles: true }));
|
||||
await Promise.resolve();
|
||||
element.dispatchEvent(new KeyboardEvent("keydown", { key, bubbles: true, cancelable: true }));
|
||||
await new Promise((resolve) => requestAnimationFrame(() => setTimeout(resolve, 0)));
|
||||
}, input);
|
||||
}
|
||||
|
||||
async function showExitSuggestion(page: Page, query: string): Promise<void> {
|
||||
await composerLocator(page).fill(query);
|
||||
await expect(page.getByText("/exit", { exact: true }).first()).toBeVisible();
|
||||
}
|
||||
|
||||
async function expectOpenAgentWithInput(page: Page, agentId: string, text: string): Promise<void> {
|
||||
await expect(composerLocator(page)).toHaveValue(text);
|
||||
await expectWorkspaceTabVisible(page, agentId);
|
||||
}
|
||||
|
||||
async function expectAgentArchivedInSessions(page: Page, title: string): Promise<void> {
|
||||
await openSessions(page);
|
||||
await expectSessionRowArchived(page, title);
|
||||
@@ -131,6 +160,16 @@ test.describe("Client slash commands", () => {
|
||||
);
|
||||
});
|
||||
|
||||
for (const key of ["Tab", "Enter"] as const) {
|
||||
test(`${key} ignores an exit suggestion for an earlier query`, async ({ page }) => {
|
||||
await withOpenReadyMockAgent(page, { title: "Stale slash command" }, async ({ agentId }) => {
|
||||
await showExitSuggestion(page, "/e");
|
||||
await typeBeforeMenuFilters(page, { text: "/co", key });
|
||||
await expectOpenAgentWithInput(page, agentId, "/co");
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
test("slash clear replaces the active agent with a matching draft", async ({ page }) => {
|
||||
await withOpenReadyMockAgent(
|
||||
page,
|
||||
|
||||
@@ -1,4 +1,21 @@
|
||||
import { execFileSync } from "node:child_process";
|
||||
import { mkdtempSync, rmSync } from "node:fs";
|
||||
import { tmpdir } from "node:os";
|
||||
import path from "node:path";
|
||||
import type { createCreationScenario } from "../support/helpers/creation";
|
||||
import { gotoAppShell } from "../support/helpers/app";
|
||||
import { fillComposerDraft } from "../support/helpers/composer";
|
||||
import {
|
||||
connectNewWorkspaceDaemonClient,
|
||||
openNewWorkspaceComposer,
|
||||
selectWorkspaceIsolation,
|
||||
} from "../support/helpers/new-workspace";
|
||||
import {
|
||||
seedTerminalProfiles,
|
||||
selectLaunchOption,
|
||||
submitTerminalLaunch,
|
||||
} from "../support/helpers/new-workspace-launch";
|
||||
import { waitForSidebarHydration } from "../support/helpers/workspace-ui";
|
||||
import { expect } from "../support/fixtures";
|
||||
import { test } from "../support/creation-fixtures";
|
||||
|
||||
@@ -116,12 +133,14 @@ for (const scenario of [
|
||||
test(`retrying failed agent initialization preserves its workspace${scenario.suffix}`, async ({
|
||||
creation,
|
||||
startup,
|
||||
page,
|
||||
}) => {
|
||||
await creation.openWorkspaceForm("local");
|
||||
await creation.submitPrompt("Retry this workspace and agent together.", "Create");
|
||||
await creation.expectAgentStillStarting();
|
||||
await startup.fail();
|
||||
await creation.expectStartupFailure();
|
||||
await expect(page.getByTestId("app-toast")).toHaveCount(0);
|
||||
await creation.expectOneCreatedWorkspace();
|
||||
await scenario.prepare(creation);
|
||||
await creation.submitPrompt("Retry this workspace and agent together.");
|
||||
@@ -180,6 +199,105 @@ test("an edited agent draft starts after its first start failed", async ({
|
||||
await expect(page.getByText(/request_key_conflict/)).toHaveCount(0);
|
||||
});
|
||||
|
||||
test("editing a failed New workspace submission starts without a request key conflict", async ({
|
||||
page,
|
||||
}) => {
|
||||
// An empty git repository naturally rejects worktree creation before workspace_ready.
|
||||
const repoDir = mkdtempSync(path.join(tmpdir(), "paseo-empty-git-ws-"));
|
||||
execFileSync("git", ["init"], { cwd: repoDir, stdio: "ignore" });
|
||||
const client = await connectNewWorkspaceDaemonClient();
|
||||
let projectId: string | null = null;
|
||||
try {
|
||||
const seeded = await client.createWorkspace({
|
||||
source: { kind: "directory", path: repoDir },
|
||||
});
|
||||
if (!seeded.workspace) throw new Error(seeded.error ?? "Failed to seed empty git project");
|
||||
projectId = seeded.workspace.projectId;
|
||||
const listed = await client.listProjects();
|
||||
const project = listed.projects.find((entry) => entry.projectId === projectId);
|
||||
if (!project?.projectKey) throw new Error("Seeded project has no projectKey");
|
||||
|
||||
await gotoAppShell(page);
|
||||
await waitForSidebarHydration(page);
|
||||
await openNewWorkspaceComposer(page, {
|
||||
projectKey: project.projectKey,
|
||||
projectDisplayName: seeded.workspace.projectDisplayName,
|
||||
});
|
||||
await selectWorkspaceIsolation(page, "worktree");
|
||||
await fillComposerDraft(page, "Start original worktree task.");
|
||||
await page.getByRole("button", { name: "Create", exact: true }).click();
|
||||
|
||||
const composerError = page.getByTestId("composer-error").filter({ visible: true }).first();
|
||||
await expect(composerError).toContainText("Unable to resolve repository default branch");
|
||||
// The failure renders once in the composer alert, not duplicated in a top toast.
|
||||
await expect(page.getByText("Unable to resolve repository default branch")).toHaveCount(1);
|
||||
|
||||
await selectWorkspaceIsolation(page, "local");
|
||||
await fillComposerDraft(page, "hi");
|
||||
await page.getByRole("button", { name: "Create", exact: true }).click();
|
||||
|
||||
await expect(page).toHaveURL(/\/workspace\//);
|
||||
await expect(page.getByText(/request_key_conflict/)).toHaveCount(0);
|
||||
await expect(
|
||||
page.getByTestId("user-message").filter({ hasText: "hi", visible: true }),
|
||||
).toBeVisible();
|
||||
} finally {
|
||||
if (projectId) await client.removeProject(projectId).catch(() => undefined);
|
||||
await client.close();
|
||||
rmSync(repoDir, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("switching only the launch target after a failed New workspace creation starts a new workspace", async ({
|
||||
creation,
|
||||
workspaceProvision,
|
||||
page,
|
||||
}) => {
|
||||
const profiles = await seedTerminalProfiles([
|
||||
{
|
||||
id: "promptless-shell",
|
||||
name: "Promptless Shell",
|
||||
command: "sh",
|
||||
args: ["-c", "echo ready; sleep 5"],
|
||||
promptArg: "none",
|
||||
},
|
||||
]);
|
||||
try {
|
||||
await creation.openWorkspaceForm("local");
|
||||
await workspaceProvision.fail();
|
||||
await page.getByRole("button", { name: "Create", exact: true }).click();
|
||||
await expect(
|
||||
page.getByTestId("composer-error").filter({ visible: true }).first(),
|
||||
).toContainText("Workspace provisioning failed for test");
|
||||
|
||||
await selectLaunchOption(page, "promptless-shell");
|
||||
await submitTerminalLaunch(page);
|
||||
await creation.expectOneCreatedWorkspace();
|
||||
await expect(
|
||||
page.locator('[data-testid^="workspace-tab-terminal_"]').filter({ visible: true }).first(),
|
||||
).toBeVisible();
|
||||
} finally {
|
||||
await profiles.restore();
|
||||
}
|
||||
});
|
||||
|
||||
test("failing New workspace creation after switching workspaces shows an error toast", async ({
|
||||
creation,
|
||||
workspaceProvision,
|
||||
page,
|
||||
}) => {
|
||||
await creation.openWorkspaceForm("local");
|
||||
await workspaceProvision.hold();
|
||||
await page.getByRole("button", { name: "Create", exact: true }).click();
|
||||
await page.locator('[data-testid^="sidebar-workspace-row-"]').first().click();
|
||||
await expect(page).toHaveURL(/\/workspace\//);
|
||||
|
||||
await workspaceProvision.fail();
|
||||
await expect(page.getByTestId("app-toast")).toContainText(
|
||||
"Workspace provisioning failed for test",
|
||||
);
|
||||
});
|
||||
|
||||
for (const entry of [
|
||||
{
|
||||
name: "agent draft",
|
||||
|
||||
@@ -118,7 +118,8 @@ async function exerciseProviderSettingsStack(page: Page) {
|
||||
|
||||
await page.getByRole("button", { name: "Refresh", exact: true }).click();
|
||||
await expectProviderSettingsVisible(page);
|
||||
await expect(page.getByText("Checked just now", { exact: true })).toBeVisible({
|
||||
// The Models header puts the model count before it: "12 · Checked just now".
|
||||
await expect(page.getByText(/Checked just now$/)).toBeVisible({
|
||||
timeout: 30_000,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -34,6 +34,7 @@ import {
|
||||
openUsageFromItem,
|
||||
pinRow,
|
||||
openUsageOptions,
|
||||
openUsageSources,
|
||||
closeUsageOptions,
|
||||
pickUsageHost,
|
||||
usageModalHost,
|
||||
@@ -250,16 +251,15 @@ test.describe("usage modal", () => {
|
||||
await expect(alphaHandle).toHaveCSS("opacity", "1");
|
||||
await alphaHandle.blur();
|
||||
|
||||
// The off card collapses to its header, which still names the account.
|
||||
await setUsageCardOn(page, "beta plan (work)", false);
|
||||
const work = page.getByTestId("usage-report-beta:work");
|
||||
await expect(work.getByText("12% used")).toHaveCount(0);
|
||||
await expect(work.getByText("work", { exact: true })).toBeVisible();
|
||||
// Turning a source off in the dedicated Sources list removes its card and sidebar summary.
|
||||
await setUsageCardOn(page, "beta:work", false);
|
||||
await expectUsageCardOrder(page, ["alpha:a", "beta:home"]);
|
||||
await expect(page.getByTestId("usage-report-beta:work")).toHaveCount(0);
|
||||
await expectPinnedUsage(page, ["31% Weekly", "20% Weekly"]);
|
||||
|
||||
const stopRecording = await recordUsageCardPositionsAfterRelease(page);
|
||||
await dragUsageCardAbove(page, "beta:home", "alpha:a");
|
||||
await expectUsageCardOrder(page, ["beta:home", "alpha:a", "beta:work"]);
|
||||
await expectUsageCardOrder(page, ["beta:home", "alpha:a"]);
|
||||
await expectPinnedUsage(page, ["20% Weekly", "31% Weekly"]);
|
||||
// The cards are in their new slots from the first frame after the drop.
|
||||
const framesAfterDrop = await stopRecording();
|
||||
@@ -270,10 +270,114 @@ test.describe("usage modal", () => {
|
||||
await page.reload();
|
||||
await expectPinnedUsage(page, ["20% Weekly", "31% Weekly"]);
|
||||
await openUsageFromItem(page);
|
||||
await expectUsageCardOrder(page, ["beta:home", "alpha:a", "beta:work"]);
|
||||
await expect(page.getByTestId("usage-report-beta:work").getByText("12% used")).toHaveCount(0);
|
||||
await expectUsageCardOrder(page, ["beta:home", "alpha:a"]);
|
||||
await expect(page.getByTestId("usage-report-beta:work")).toHaveCount(0);
|
||||
});
|
||||
|
||||
for (const [size, viewport] of Object.entries({
|
||||
desktop: { width: 1440, height: 900 },
|
||||
compact: { width: 390, height: 844 },
|
||||
})) {
|
||||
test(`dedicated Sources list manages default-off sources without clutter (${size})`, async ({
|
||||
page,
|
||||
}) => {
|
||||
test.setTimeout(120_000);
|
||||
const [claude, codex] = claudeAndCodexReports();
|
||||
const fetchedAt = twoHoursAgo();
|
||||
await installUsageReportsFixture(page, {
|
||||
lists: [
|
||||
() => [
|
||||
claude!,
|
||||
codex!,
|
||||
{
|
||||
id: "copilot:default",
|
||||
account: {},
|
||||
fetchedAt,
|
||||
sourceId: "copilot",
|
||||
sourceLabel: "GitHub Copilot",
|
||||
defaultEnabled: false,
|
||||
report: {
|
||||
status: "unavailable",
|
||||
problem: { kind: "rejected", status: 403 },
|
||||
},
|
||||
},
|
||||
{
|
||||
id: "cursor:default",
|
||||
account: { label: "dev@example.com" },
|
||||
fetchedAt,
|
||||
sourceId: "cursor",
|
||||
sourceLabel: "Cursor",
|
||||
defaultEnabled: false,
|
||||
report: {
|
||||
status: "available",
|
||||
windows: [
|
||||
{ id: "monthly", label: "Monthly", shortLabel: "mo", summary: true, usedPct: 18 },
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
],
|
||||
});
|
||||
await page.setViewportSize(viewport);
|
||||
await gotoAppShell(page);
|
||||
if (size === "compact") await openCompactSidebar(page);
|
||||
// Only active sources appear in the sidebar summary and modal cards.
|
||||
await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
|
||||
await openUsageFromItem(page);
|
||||
await expectUsageCardOrder(page, ["claude:default", "codex:default"]);
|
||||
await expect(page.getByTestId("usage-report-copilot:default")).toHaveCount(0);
|
||||
await expect(page.getByTestId("usage-report-cursor:default")).toHaveCount(0);
|
||||
await qaScreenshot(page, `usage-sources-${size}-cards`);
|
||||
|
||||
await openUsageOptions(page);
|
||||
await expect(page.getByTestId("usage-options-sources")).toContainText("2 of 4");
|
||||
await qaScreenshot(page, `usage-sources-${size}-settings`);
|
||||
|
||||
if (size === "compact") {
|
||||
// Compact sheets expose menu rows in the browser Tab order so keyboard users can open
|
||||
// Sources and toggle checkboxes without a pointer.
|
||||
await page.getByTestId("usage-options-sources").focus();
|
||||
await expect(page.getByTestId("usage-options-sources")).toBeFocused();
|
||||
await expect(page.getByTestId("usage-options-sources")).toHaveAttribute("tabindex", "0");
|
||||
await page.keyboard.press("Enter");
|
||||
} else {
|
||||
await openUsageSources(page);
|
||||
}
|
||||
const claudeToggle = page.getByRole("checkbox", { name: /^Claude/ });
|
||||
const copilotToggle = page.getByRole("checkbox", { name: /^GitHub Copilot/ });
|
||||
const cursorToggle = page.getByRole("checkbox", { name: /^Cursor/ });
|
||||
await expect(claudeToggle).toBeChecked();
|
||||
await expect(copilotToggle).not.toBeChecked();
|
||||
await expect(copilotToggle).toContainText("Provider inactive");
|
||||
await qaScreenshot(page, `usage-sources-${size}-list`);
|
||||
|
||||
// Opting into a default-off source brings its card and summary window in immediately.
|
||||
if (size === "compact") {
|
||||
await cursorToggle.focus();
|
||||
await expect(cursorToggle).toBeFocused();
|
||||
await expect(cursorToggle).toHaveAttribute("tabindex", "0");
|
||||
await page.keyboard.press("Space");
|
||||
} else {
|
||||
await cursorToggle.click();
|
||||
}
|
||||
await expect(cursorToggle).toBeChecked();
|
||||
await closeUsageOptions(page);
|
||||
await expectUsageCardOrder(page, ["claude:default", "codex:default", "cursor:default"]);
|
||||
|
||||
// Hiding every source shows a quiet empty state with a shortcut back to Settings.
|
||||
await openUsageSources(page);
|
||||
await page.getByTestId("usage-source-toggle-claude:default").click();
|
||||
await page.getByTestId("usage-source-toggle-codex:default").click();
|
||||
await page.getByTestId("usage-source-toggle-cursor:default").click();
|
||||
await closeUsageOptions(page);
|
||||
await expect(page.getByTestId("usage-all-hidden")).toBeVisible();
|
||||
await expect(page.getByTestId("usage-choose-sources")).toBeVisible();
|
||||
await qaScreenshot(page, `usage-sources-${size}-empty`);
|
||||
await page.getByTestId("usage-choose-sources").click();
|
||||
await expect(page.getByTestId("usage-options-sources")).toContainText("0 of 4");
|
||||
});
|
||||
}
|
||||
|
||||
test("refreshes one report from its card", async ({ page }) => {
|
||||
test.setTimeout(120_000);
|
||||
const serverId = getServerId();
|
||||
|
||||
@@ -291,12 +291,12 @@ test.describe("Usage item", () => {
|
||||
await gotoAppShell(page);
|
||||
const screen = page.getByTestId(`usage-host-${serverId}`);
|
||||
|
||||
await test.step("a fresh device shows default windows once the Usage item is on", async () => {
|
||||
// The Usage item starts off on every layout; turning it on stores the choice.
|
||||
await expectNoUsageItem(page);
|
||||
await test.step("a fresh device shows default windows in the sidebar automatically", async () => {
|
||||
// The Usage item starts on by default on every layout.
|
||||
await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
|
||||
await qaScreenshot(page, "desktop-footer-defaults", { kind: "footer" });
|
||||
await openSidebarNavSettings(page);
|
||||
await expectFooterItemSetting(page, "usage", false);
|
||||
await setFooterItemVisible(page, "usage", true);
|
||||
await expectFooterItemSetting(page, "usage", true);
|
||||
await qaScreenshot(page, "desktop-settings-sidebar-footer");
|
||||
await page.setViewportSize(COMPACT);
|
||||
await expectFooterItemSetting(page, "usage", true);
|
||||
@@ -308,7 +308,6 @@ test.describe("Usage item", () => {
|
||||
await page.setViewportSize(WIDE);
|
||||
await gotoAppShell(page);
|
||||
await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
|
||||
await qaScreenshot(page, "desktop-footer-defaults", { kind: "footer" });
|
||||
await openUsageFromItem(page);
|
||||
await qaScreenshot(page, "default-pins-card");
|
||||
await expect(pinRow(screen, "Claude", "Session")).toBeChecked();
|
||||
@@ -478,7 +477,7 @@ test("without summary data the footer drops the Usage item and keeps the Usage i
|
||||
await openUsageFromIcon(page);
|
||||
});
|
||||
|
||||
test("the Usage Settings switch turns on the sidebar summary and the pins with it", async ({
|
||||
test("the Usage Settings switch turns the sidebar summary and pins off and back on", async ({
|
||||
page,
|
||||
}) => {
|
||||
const serverId = getServerId();
|
||||
@@ -488,8 +487,17 @@ test("the Usage Settings switch turns on the sidebar summary and the pins with i
|
||||
const screen = page.getByTestId(`usage-host-${serverId}`);
|
||||
const claude = screen.getByTestId("usage-report-claude:default");
|
||||
|
||||
await test.step("off by default: no Usage item, and rows that do not pin", async () => {
|
||||
await openUsageFromIcon(page);
|
||||
await test.step("on by default: the Usage item and pins appear", async () => {
|
||||
await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
|
||||
await openUsageFromItem(page);
|
||||
await expect(pinRow(screen, "Claude", "Weekly")).toBeChecked();
|
||||
await togglePin(screen, "Claude", "Weekly");
|
||||
await expectPinnedUsage(page, ["31% 5h", "7% 5h", "12% wk"]);
|
||||
await qaScreenshot(page, "usage-summary-on");
|
||||
});
|
||||
|
||||
await test.step("off: no Usage item, and rows that do not pin", async () => {
|
||||
await setSummaryInSidebar(page, false);
|
||||
await expectNoUsageItem(page);
|
||||
await expect(claude.getByText("Session", { exact: true })).toBeVisible({ timeout: 10_000 });
|
||||
await expectUnpinnableRows(claude);
|
||||
@@ -498,19 +506,7 @@ test("the Usage Settings switch turns on the sidebar summary and the pins with i
|
||||
await qaScreenshot(page, "usage-summary-off");
|
||||
});
|
||||
|
||||
await test.step("on: the Usage item and the pins appear", async () => {
|
||||
await setSummaryInSidebar(page, true);
|
||||
await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
|
||||
await expect(pinRow(screen, "Claude", "Weekly")).toBeChecked();
|
||||
await togglePin(screen, "Claude", "Weekly");
|
||||
await expectPinnedUsage(page, ["31% 5h", "7% 5h", "12% wk"]);
|
||||
await qaScreenshot(page, "usage-summary-on");
|
||||
});
|
||||
|
||||
await test.step("off then on again, after a reload, brings back the saved pins", async () => {
|
||||
await setSummaryInSidebar(page, false);
|
||||
await expectNoUsageItem(page);
|
||||
await expectUnpinnableRows(claude);
|
||||
await test.step("after a reload, turning it back on brings back the saved pins", async () => {
|
||||
await page.reload();
|
||||
await openUsageFromIcon(page);
|
||||
await expectSummaryInSidebar(page, false);
|
||||
@@ -554,6 +550,7 @@ test("released hosts supply source logos through the client conversion", async (
|
||||
test("hidden usage sends no requests until opened", async ({ page }) => {
|
||||
test.setTimeout(180_000);
|
||||
const usage = await installUsageReportsFixture(page, { lists: [() => claudeAndCodexReports()] });
|
||||
await seedSidebarFooterPreferences(page, [{ key: "usage", visible: false }]);
|
||||
await page.setViewportSize(WIDE);
|
||||
await gotoAppShell(page);
|
||||
await expectNoUsageItem(page);
|
||||
@@ -569,10 +566,9 @@ test("hidden usage sends no requests until opened", async ({ page }) => {
|
||||
expect(usage.listRequests()).toHaveLength(1);
|
||||
});
|
||||
|
||||
test("visible usage summary requests reports on load", async ({ page }) => {
|
||||
test("visible usage summary requests reports on load by default", async ({ page }) => {
|
||||
test.setTimeout(180_000);
|
||||
const usage = await installUsageReportsFixture(page, { lists: [() => claudeAndCodexReports()] });
|
||||
await seedSidebarFooterPreferences(page, [{ key: "usage", visible: true }]);
|
||||
await page.setViewportSize(WIDE);
|
||||
await gotoAppShell(page);
|
||||
await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
|
||||
|
||||
@@ -15,6 +15,11 @@ import { delayBrowserAgentCreatedStatus } from "./helpers/new-workspace";
|
||||
|
||||
export const test = base.extend<{
|
||||
startup: { release(): Promise<void>; fail(): Promise<void> };
|
||||
workspaceProvision: {
|
||||
hold(): Promise<void>;
|
||||
fail(): Promise<void>;
|
||||
release(): Promise<void>;
|
||||
};
|
||||
promptRejection: void;
|
||||
composerMetadata: { set(patch: Record<string, string>): Promise<void> };
|
||||
creation: Awaited<ReturnType<typeof createCreationScenario>>;
|
||||
@@ -70,6 +75,57 @@ export default function contribute(server) {
|
||||
await client.close();
|
||||
}
|
||||
},
|
||||
workspaceProvision: async ({ page }, provide) => {
|
||||
void page;
|
||||
const client = await connectNewWorkspaceDaemonClient();
|
||||
const plugin = await copyPluginExample("lifecycle-logger");
|
||||
const gate = path.join(plugin.directory, "workspace-provision.txt");
|
||||
const holdFile = path.join(plugin.directory, "workspace-provision-hold.txt");
|
||||
const failFile = path.join(plugin.directory, "workspace-provision-fail.txt");
|
||||
const previous = await client.getDaemonConfig();
|
||||
try {
|
||||
await writeFile(
|
||||
path.join(plugin.directory, "index.server.ts"),
|
||||
`
|
||||
import { readFile, rm } from "node:fs/promises";
|
||||
export default function contribute(server) {
|
||||
return server.before("workspace.create", async ({ request }) => {
|
||||
const gate = ${JSON.stringify(gate)};
|
||||
let command = await readFile(gate, "utf8").catch(() => "release");
|
||||
while (command === "hold") {
|
||||
await new Promise(resolve => setTimeout(resolve, 20));
|
||||
command = await readFile(gate, "utf8").catch(() => "release");
|
||||
}
|
||||
if (command === "fail") {
|
||||
await rm(gate, { force: true });
|
||||
throw new Error("Workspace provisioning failed for test");
|
||||
}
|
||||
return request;
|
||||
});
|
||||
}
|
||||
`,
|
||||
);
|
||||
await client.patchDaemonConfig({ pluginsEnabled: true });
|
||||
await client.installDirectoryPlugin(plugin.directory);
|
||||
await provide({
|
||||
hold: async () => {
|
||||
await writeFile(holdFile, "hold");
|
||||
await rename(holdFile, gate);
|
||||
},
|
||||
fail: async () => {
|
||||
await writeFile(failFile, "fail");
|
||||
await rename(failFile, gate);
|
||||
},
|
||||
release: () => rm(gate, { force: true }),
|
||||
});
|
||||
} finally {
|
||||
await rm(gate, { force: true });
|
||||
await client.removePlugin("lifecycle-logger");
|
||||
await client.patchDaemonConfig({ pluginsEnabled: previous.config.pluginsEnabled });
|
||||
await plugin.cleanup();
|
||||
await client.close();
|
||||
}
|
||||
},
|
||||
promptRejection: async ({ page }, provide) => {
|
||||
void page;
|
||||
const client = await connectNewWorkspaceDaemonClient();
|
||||
|
||||
@@ -6,6 +6,7 @@ import {
|
||||
type ChildProcess,
|
||||
type SpawnOptions,
|
||||
} from "node:child_process";
|
||||
import { existsSync } from "node:fs";
|
||||
import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
|
||||
import net from "node:net";
|
||||
import { tmpdir } from "node:os";
|
||||
@@ -229,7 +230,11 @@ export async function startIsolatedHostDaemon(
|
||||
stdio: ["ignore", "ignore", "pipe"],
|
||||
detached: false,
|
||||
};
|
||||
const spawned = publishedPackageRoot
|
||||
const builtSupervisor = path.join(serverDir, "dist/scripts/supervisor-entrypoint.js");
|
||||
const useBuiltSupervisor = Boolean(
|
||||
publishedPackageRoot || (process.env.CI && existsSync(builtSupervisor)),
|
||||
);
|
||||
const spawned = useBuiltSupervisor
|
||||
? spawn(process.execPath, ["dist/scripts/supervisor-entrypoint.js"], spawnOptions)
|
||||
: spawnTsx("scripts/supervisor-entrypoint.ts", ["--dev"], spawnOptions);
|
||||
|
||||
|
||||
@@ -567,7 +567,9 @@ export async function expectProviderPageLoaded(page: Page, providerName: string)
|
||||
await expect(page.getByTestId("provider-detail-title")).toHaveText(providerName, {
|
||||
timeout: 30_000,
|
||||
});
|
||||
await expect(page.getByText("Provider status")).toBeVisible({ timeout: 30_000 });
|
||||
await expect(page.getByRole("button", { name: "Diagnostic report" })).toBeVisible({
|
||||
timeout: 30_000,
|
||||
});
|
||||
}
|
||||
|
||||
export async function expectProviderNotOnHost(page: Page): Promise<void> {
|
||||
|
||||
@@ -160,11 +160,23 @@ export async function expectUsageCardOrder(page: Page, reportIds: string[]): Pro
|
||||
.toEqual(reportIds);
|
||||
}
|
||||
|
||||
/** Turns a card on or off from its header switch, named by its source and account. */
|
||||
export async function setUsageCardOn(page: Page, name: string, on: boolean): Promise<void> {
|
||||
const cardSwitch = usageModal(page).getByRole("switch", { name: `Show ${name}`, exact: true });
|
||||
await cardSwitch.click();
|
||||
await expect(cardSwitch).toBeChecked({ checked: on });
|
||||
/** Turns a source on or off from the Sources page in Usage Settings, by report id. */
|
||||
export async function setUsageCardOn(page: Page, reportId: string, on: boolean): Promise<void> {
|
||||
await openUsageSources(page);
|
||||
const item = visible(page, `usage-source-toggle-${reportId}`);
|
||||
const checked = (await item.getAttribute("aria-checked")) === "true";
|
||||
if (checked !== on) {
|
||||
await item.click();
|
||||
await expect(item).toHaveAttribute("aria-checked", String(on));
|
||||
}
|
||||
await closeUsageOptions(page);
|
||||
}
|
||||
|
||||
/** Opens the Sources submenu inside Usage Settings (flyout on wide, in-place page on compact). */
|
||||
export async function openUsageSources(page: Page): Promise<void> {
|
||||
await openUsageOptions(page);
|
||||
await visible(page, "usage-options-sources").click();
|
||||
await expect(page.locator('[data-testid^="usage-source-toggle-"]:visible').first()).toBeVisible();
|
||||
}
|
||||
|
||||
/** Drags a card by its handle until it sits above another card, with the mouse. */
|
||||
@@ -245,18 +257,14 @@ export function pinRow(scope: Locator, source: string, window: string): Locator
|
||||
|
||||
/**
|
||||
* A report card whose window rows do not pin: no pin toggle, no pin glyph, and nothing focusable
|
||||
* but the header's buttons and on/off switch, so no row presses or highlights on hover.
|
||||
* but the header's buttons, so no row presses or highlights on hover.
|
||||
*/
|
||||
export async function expectUnpinnableRows(card: Locator): Promise<void> {
|
||||
await expect(card.getByRole("checkbox")).toHaveCount(0);
|
||||
await expect(card.locator('[data-testid^="usage-pin-"]')).toHaveCount(0);
|
||||
const focusable = await card
|
||||
.locator("[tabindex]")
|
||||
.evaluateAll(
|
||||
(nodes) =>
|
||||
nodes.filter((node) => !["button", "switch"].includes(node.getAttribute("role") ?? ""))
|
||||
.length,
|
||||
);
|
||||
.evaluateAll((nodes) => nodes.filter((node) => node.getAttribute("role") !== "button").length);
|
||||
expect(focusable).toBe(0);
|
||||
}
|
||||
|
||||
@@ -388,6 +396,7 @@ export async function closeUsageOptions(page: Page): Promise<void> {
|
||||
await waitForSettledPosition(usageOptionsSurface(page));
|
||||
await page.mouse.click(0, 0);
|
||||
await expect(page.getByTestId("usage-display-used")).toHaveCount(0);
|
||||
await expect(page.locator('[data-testid^="usage-source-toggle-"]:visible')).toHaveCount(0);
|
||||
}
|
||||
|
||||
export async function showUsageAs(page: Page, displayAs: "used" | "remaining") {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@getpaseo/app",
|
||||
"version": "0.17.0-beta.1",
|
||||
"version": "0.17.2",
|
||||
"private": true,
|
||||
"main": "index.ts",
|
||||
"scripts": {
|
||||
|
||||
+19
@@ -29,6 +29,25 @@ export function agentCommandsQueryRoot(serverId: string) {
|
||||
return [AGENT_COMMANDS_QUERY_ROOT, serverId] as const;
|
||||
}
|
||||
|
||||
function queryCommandsCwd(query: { queryKey: readonly unknown[]; meta?: Record<string, unknown> }) {
|
||||
const isDraft = query.queryKey[2] === "draft";
|
||||
const cwd = query.meta?.agentCommandCwd ?? (isDraft ? query.queryKey[4] : undefined);
|
||||
return typeof cwd === "string" ? normalizeAgentCommandsCwd(cwd) : undefined;
|
||||
}
|
||||
|
||||
/** Marks every catalog for a directory stale. Only observed catalogs refetch; the rest refetch
|
||||
* when next mounted. Used when a provider change is announced without its new snapshot. */
|
||||
export function invalidateCommandsForDirectory(input: {
|
||||
queryClient: QueryClient;
|
||||
serverId: string;
|
||||
cwd: string | null;
|
||||
}): Promise<void> {
|
||||
return input.queryClient.invalidateQueries({
|
||||
queryKey: agentCommandsQueryRoot(input.serverId),
|
||||
predicate: (query) => !input.cwd || queryCommandsCwd(query) === input.cwd,
|
||||
});
|
||||
}
|
||||
|
||||
/** Snapshot announcements contain provider metadata, not command catalogs. Ignore initial
|
||||
* discovery and unrelated providers; explicit refresh still invalidates every catalog. */
|
||||
export function invalidateCommandsForProviderChange(input: {
|
||||
|
||||
@@ -393,6 +393,39 @@ describe("layoutStream", () => {
|
||||
expect(findLayoutItem(layout, thinking.id).toolSequence).toBe("last");
|
||||
});
|
||||
|
||||
it.each(["web", "android"] as const)(
|
||||
"carries turn metrics from the footer's source row on %s",
|
||||
(platform) => {
|
||||
const metrics = [{ label: "Model", value: "opus" }];
|
||||
const earlier = { ...assistantMessage("a1", 2), turnMetrics: metrics };
|
||||
const latest = { ...toolCall("tool-2", 5), turnMetrics: [{ label: "Steps", value: "2" }] };
|
||||
const layout = layoutFor({
|
||||
platform,
|
||||
tail: [userMessage("u1", 1), earlier, toolCall("tool-1", 3), userMessage("u2", 4), latest],
|
||||
});
|
||||
|
||||
expect(findLayoutItem(layout, "tool-1").completedFooter?.turnMetrics).toBe(metrics);
|
||||
expect(layout.auxiliaryTurnFooter?.turnMetrics).toBe(latest.turnMetrics);
|
||||
},
|
||||
);
|
||||
|
||||
it("lays out the footer again when its source row gains turn metrics", () => {
|
||||
const assistant = assistantMessage("a1", 2);
|
||||
const trailing = toolCall("tool-2", 4);
|
||||
const tail = [userMessage("u1", 1), assistant, toolCall("tool-1", 3), trailing];
|
||||
const next = userMessage("u2", 5);
|
||||
const before = layoutFor({ platform: "android", tail: [...tail, next] });
|
||||
|
||||
const metrics = [{ label: "Model", value: "opus" }];
|
||||
const stamped = [...tail];
|
||||
stamped[1] = { ...assistant, turnMetrics: metrics };
|
||||
const after = layoutFor({ platform: "android", tail: [...stamped, next] });
|
||||
|
||||
expect(findLayoutItem(before, trailing.id).completedFooter?.turnMetrics).toBeUndefined();
|
||||
expect(findLayoutItem(after, trailing.id).completedFooter?.turnMetrics).toBe(metrics);
|
||||
expect(findLayoutItem(after, next.id)).toBe(findLayoutItem(before, next.id));
|
||||
});
|
||||
|
||||
it("keeps bottom and inline footer ownership mutually exclusive", () => {
|
||||
const assistant = assistantMessage("a1", 2);
|
||||
const layout = layoutFor({
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import type { TurnTiming } from "@/timeline/turn-time";
|
||||
import type { StreamItem } from "@/types/stream";
|
||||
import { getAssistantMessageSpacing, getGapBetweenStreamItems } from "./spacing";
|
||||
@@ -10,6 +11,7 @@ export interface TurnFooterHost {
|
||||
itemId: string;
|
||||
items: StreamItem[];
|
||||
timing?: TurnTiming;
|
||||
turnMetrics?: AgentMetric[];
|
||||
startIndex: number;
|
||||
}
|
||||
|
||||
@@ -69,10 +71,15 @@ function createTurnFooterHost(input: {
|
||||
index: number;
|
||||
timingByItemId: Map<string, TurnTiming>;
|
||||
}): TurnFooterHost {
|
||||
const turnMetrics =
|
||||
input.item.kind === "assistant_message" || input.item.kind === "tool_call"
|
||||
? input.item.turnMetrics
|
||||
: undefined;
|
||||
return {
|
||||
itemId: input.item.id,
|
||||
items: input.items,
|
||||
timing: input.timingByItemId.get(input.item.id),
|
||||
...(turnMetrics ? { turnMetrics } : {}),
|
||||
startIndex: input.index,
|
||||
};
|
||||
}
|
||||
@@ -247,6 +254,7 @@ function areTurnFooterHostsEqual(
|
||||
return (
|
||||
left.itemId === right.itemId &&
|
||||
left.timing === right.timing &&
|
||||
left.turnMetrics === right.turnMetrics &&
|
||||
left.startIndex === right.startIndex &&
|
||||
left.items === right.items
|
||||
);
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
import React, { act } from "react";
|
||||
import { createRoot, type Root } from "react-dom/client";
|
||||
import { afterEach, beforeEach, expect, it, vi } from "vitest";
|
||||
import { PortalProvider } from "@gorhom/portal";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { page } from "vitest/browser";
|
||||
import { FloatingPanelPortalHost } from "@/components/ui/floating-panel-portal";
|
||||
import { i18n } from "@/i18n/i18next";
|
||||
import type { TurnTiming } from "@/timeline/turn-time";
|
||||
import type { StreamItem } from "@/types/stream";
|
||||
@@ -92,3 +96,57 @@ it.each([
|
||||
"Friday 11:11 PM": 1,
|
||||
});
|
||||
});
|
||||
|
||||
const COMPLETED_TIMING: TurnTiming = { completedAt: FRIDAY_NIGHT, durationMs: 26_000 };
|
||||
|
||||
describe("turn stats", () => {
|
||||
const metrics: AgentMetric[] = [
|
||||
{ label: "Model", value: "opus" },
|
||||
{ label: "Cost", value: "$0.42", tone: "warning" },
|
||||
];
|
||||
|
||||
function renderFooterWithMetrics(turnMetrics?: AgentMetric[]): void {
|
||||
act(() =>
|
||||
root.render(
|
||||
<PortalProvider>
|
||||
<CompletedTurnFooterRow
|
||||
strategy={createNativeStreamStrategy()}
|
||||
items={[reply]}
|
||||
timing={COMPLETED_TIMING}
|
||||
startIndex={0}
|
||||
supportsTimelineCursor={false}
|
||||
turnMetrics={turnMetrics}
|
||||
/>
|
||||
<FloatingPanelPortalHost />
|
||||
</PortalProvider>,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
it("has no trigger when the provider reported nothing for the turn", () => {
|
||||
renderFooterWithMetrics(undefined);
|
||||
|
||||
expect(page.getByRole("button", { name: "Turn stats" }).elements()).toHaveLength(0);
|
||||
});
|
||||
|
||||
it("shows the turn's metrics while the pointer is on the trigger", async () => {
|
||||
renderFooterWithMetrics(metrics);
|
||||
|
||||
await page.getByRole("button", { name: "Turn stats" }).hover();
|
||||
|
||||
const card = page.getByRole("dialog", { name: "Turn stats" });
|
||||
await expect.element(card).toBeVisible();
|
||||
await expect.element(card.getByText("Model")).toBeVisible();
|
||||
await expect.element(card.getByText("opus")).toBeVisible();
|
||||
await expect.element(card.getByText("$0.42")).toBeVisible();
|
||||
});
|
||||
|
||||
it("keeps the footer's height when the trigger appears", () => {
|
||||
renderFooterWithMetrics(undefined);
|
||||
const without = host.getBoundingClientRect().height;
|
||||
|
||||
renderFooterWithMetrics(metrics);
|
||||
|
||||
expect(host.getBoundingClientRect().height).toBe(without);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import React, { memo, useCallback, useMemo, type ReactNode } from "react";
|
||||
import { View } from "react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
@@ -81,6 +82,7 @@ export const TurnFooter = memo(function TurnFooter({
|
||||
items={host.items}
|
||||
timing={host.timing}
|
||||
startIndex={host.startIndex}
|
||||
turnMetrics={host.turnMetrics}
|
||||
supportsTimelineCursor={supportsTimelineCursor}
|
||||
onForkAssistantTurn={onForkAssistantTurn}
|
||||
/>
|
||||
@@ -92,6 +94,7 @@ export const CompletedTurnFooterRow = memo(function CompletedTurnFooterRow({
|
||||
items,
|
||||
timing,
|
||||
startIndex,
|
||||
turnMetrics,
|
||||
supportsTimelineCursor,
|
||||
onForkAssistantTurn,
|
||||
}: {
|
||||
@@ -99,6 +102,7 @@ export const CompletedTurnFooterRow = memo(function CompletedTurnFooterRow({
|
||||
items: StreamItem[];
|
||||
timing?: TurnTiming;
|
||||
startIndex: number;
|
||||
turnMetrics?: AgentMetric[];
|
||||
supportsTimelineCursor: boolean;
|
||||
onForkAssistantTurn?: AssistantTurnForkHandler;
|
||||
}) {
|
||||
@@ -109,6 +113,7 @@ export const CompletedTurnFooterRow = memo(function CompletedTurnFooterRow({
|
||||
items={items}
|
||||
timing={timing}
|
||||
startIndex={startIndex}
|
||||
turnMetrics={turnMetrics}
|
||||
supportsTimelineCursor={supportsTimelineCursor}
|
||||
onForkAssistantTurn={onForkAssistantTurn}
|
||||
/>
|
||||
@@ -165,6 +170,7 @@ function CompletedTurnFooter({
|
||||
items,
|
||||
timing,
|
||||
startIndex,
|
||||
turnMetrics,
|
||||
supportsTimelineCursor,
|
||||
onForkAssistantTurn,
|
||||
}: {
|
||||
@@ -172,6 +178,7 @@ function CompletedTurnFooter({
|
||||
items: StreamItem[];
|
||||
timing?: TurnTiming;
|
||||
startIndex: number;
|
||||
turnMetrics?: AgentMetric[];
|
||||
supportsTimelineCursor: boolean;
|
||||
onForkAssistantTurn?: AssistantTurnForkHandler;
|
||||
}) {
|
||||
@@ -205,6 +212,7 @@ function CompletedTurnFooter({
|
||||
completedAt={timing?.completedAt}
|
||||
durationMs={timing?.durationMs}
|
||||
onFork={boundary && onForkAssistantTurn ? handleFork : undefined}
|
||||
metrics={turnMetrics}
|
||||
/>
|
||||
</View>
|
||||
);
|
||||
|
||||
@@ -188,6 +188,7 @@ function renderStreamItemWithTurnFooter(input: {
|
||||
items={footerHost.items}
|
||||
timing={footerHost.timing}
|
||||
startIndex={footerHost.startIndex}
|
||||
turnMetrics={footerHost.turnMetrics}
|
||||
supportsTimelineCursor={input.supportsTimelineCursor}
|
||||
onForkAssistantTurn={input.onForkAssistantTurn}
|
||||
/>
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
import React, { act } from "react";
|
||||
import { createRoot, type Root } from "react-dom/client";
|
||||
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import { afterEach, beforeEach, expect, it, vi } from "vitest";
|
||||
import { page } from "vitest/browser";
|
||||
import { i18n } from "@/i18n/i18next";
|
||||
import { ContextWindowDetails } from "./context-window-details";
|
||||
|
||||
const CONTEXT = { percentage: 40, usedTokens: 80_000, maxTokens: 200_000 };
|
||||
|
||||
let root: Root;
|
||||
let host: HTMLDivElement;
|
||||
|
||||
beforeEach(async () => {
|
||||
await i18n.changeLanguage("en");
|
||||
vi.stubGlobal("React", React);
|
||||
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
|
||||
host = document.createElement("div");
|
||||
document.body.appendChild(host);
|
||||
root = createRoot(host);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
act(() => root.unmount());
|
||||
host.remove();
|
||||
vi.unstubAllGlobals();
|
||||
});
|
||||
|
||||
function renderDetails(sessionMetrics: AgentMetric[]): void {
|
||||
act(() =>
|
||||
root.render(
|
||||
<QueryClientProvider client={new QueryClient()}>
|
||||
<ContextWindowDetails
|
||||
serverId="server"
|
||||
agentId="agent"
|
||||
context={CONTEXT}
|
||||
sessionCost="$1.20"
|
||||
sessionMetrics={sessionMetrics}
|
||||
showTitle
|
||||
refreshable={false}
|
||||
/>
|
||||
</QueryClientProvider>,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
it("shows what the provider reports about the session", async () => {
|
||||
renderDetails([
|
||||
{ label: "Model", value: "opus" },
|
||||
{ label: "Requests", value: "12" },
|
||||
]);
|
||||
|
||||
await expect.element(page.getByText("Model")).toBeVisible();
|
||||
await expect.element(page.getByText("opus")).toBeVisible();
|
||||
await expect.element(page.getByText("Requests")).toBeVisible();
|
||||
await expect.element(page.getByText("Session cost $1.20")).toBeVisible();
|
||||
});
|
||||
|
||||
it("leaves the cost to the provider when it reports one", async () => {
|
||||
renderDetails([{ label: "Cost", value: "$1.25" }]);
|
||||
|
||||
await expect.element(page.getByText("$1.25")).toBeVisible();
|
||||
expect(page.getByText("Session cost $1.20").elements()).toHaveLength(0);
|
||||
});
|
||||
@@ -1,8 +1,10 @@
|
||||
import { Text, View } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import { AgentUsage } from "@/usage";
|
||||
import { formatTokenCount } from "./context-window-meter.utils";
|
||||
import { MetricsList } from "./metrics-list";
|
||||
|
||||
interface ContextWindowDetailsProps {
|
||||
serverId: string;
|
||||
@@ -13,6 +15,8 @@ interface ContextWindowDetailsProps {
|
||||
maxTokens: number;
|
||||
} | null;
|
||||
sessionCost: string | null;
|
||||
/** What the provider reports about the session. A reported cost replaces `sessionCost`. */
|
||||
sessionMetrics: AgentMetric[];
|
||||
/** The hover card and tooltip title themselves; the sheet's header carries the title instead. */
|
||||
showTitle: boolean;
|
||||
/** Whether the usage cards have a Refresh button; without one they show their freshness. */
|
||||
@@ -20,18 +24,22 @@ interface ContextWindowDetailsProps {
|
||||
}
|
||||
|
||||
/**
|
||||
* What the context window meter opens: how full the window is, then the usage of the agent's
|
||||
* account. The desktop hover card, the native wide tooltip, and the compact sheet all render it.
|
||||
* What the context window meter opens: how full the window is, what the provider reports about the
|
||||
* session, then the usage of the agent's account. The desktop hover card, the native wide tooltip, and the compact sheet all render it.
|
||||
*/
|
||||
export function ContextWindowDetails({
|
||||
serverId,
|
||||
agentId,
|
||||
context,
|
||||
sessionCost,
|
||||
sessionMetrics,
|
||||
showTitle,
|
||||
refreshable,
|
||||
}: ContextWindowDetailsProps) {
|
||||
const { t } = useTranslation();
|
||||
const providerReportsCost = sessionMetrics.some(
|
||||
(metric) => metric.label.toLowerCase() === "cost",
|
||||
);
|
||||
return (
|
||||
<>
|
||||
<View style={styles.summary}>
|
||||
@@ -51,10 +59,11 @@ export function ContextWindowDetails({
|
||||
) : (
|
||||
<Text style={styles.detail}>{t("contextWindow.noData")}</Text>
|
||||
)}
|
||||
{sessionCost ? (
|
||||
{sessionCost && !providerReportsCost ? (
|
||||
<Text style={styles.detail}>{t("contextWindow.sessionCost", { cost: sessionCost })}</Text>
|
||||
) : null}
|
||||
</View>
|
||||
{sessionMetrics.length > 0 ? <MetricsList metrics={sessionMetrics} /> : null}
|
||||
<AgentUsage serverId={serverId} agentId={agentId} refreshable={refreshable} />
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -13,11 +13,12 @@ import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/h
|
||||
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { isNative } from "@/constants/platform";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import { useHostReportsUsage } from "@/usage";
|
||||
import type { Theme } from "@/styles/theme";
|
||||
import { TOOLBAR_DISC_SIZE, type ToolbarRing } from "@/components/ui/control-geometry";
|
||||
import { ContextWindowDetails } from "./context-window-details";
|
||||
import { ContextWindowSheet } from "./context-window-sheet";
|
||||
import { DetailsSheet } from "./details-sheet";
|
||||
import { formatContextPercentage } from "./context-window-meter.utils";
|
||||
|
||||
interface ContextWindowMeterProps {
|
||||
@@ -26,11 +27,14 @@ interface ContextWindowMeterProps {
|
||||
maxTokens: number | null;
|
||||
usedTokens: number | null;
|
||||
totalCostUsd?: number | null;
|
||||
/** What the provider reports about the session, shown in the details. */
|
||||
sessionMetrics?: AgentMetric[];
|
||||
showPercentage?: boolean;
|
||||
/** The ring's box and stroke when it sits in an icon toolbar. */
|
||||
toolbarRing?: ToolbarRing;
|
||||
}
|
||||
|
||||
const EMPTY_METRICS: AgentMetric[] = [];
|
||||
const SVG_SIZE = 14;
|
||||
const USAGE_POPOVER_WIDTH = 300;
|
||||
const COMPACT_SVG_SIZE = 12;
|
||||
@@ -156,13 +160,16 @@ export function ContextWindowMeter({
|
||||
maxTokens,
|
||||
usedTokens,
|
||||
totalCostUsd,
|
||||
sessionMetrics = EMPTY_METRICS,
|
||||
showPercentage = false,
|
||||
toolbarRing,
|
||||
}: ContextWindowMeterProps) {
|
||||
const { t, i18n } = useTranslation();
|
||||
const { width } = useWindowDimensions();
|
||||
// Usage cards need a wider popover; without them it keeps the plain tooltip shape.
|
||||
// Usage cards and session metrics need a wider popover; without them it keeps the plain tooltip
|
||||
// shape.
|
||||
const showsUsage = useHostReportsUsage(serverId);
|
||||
const isWide = showsUsage || sessionMetrics.length > 0;
|
||||
const popoverWidth = Math.min(USAGE_POPOVER_WIDTH, width - 24);
|
||||
// Compact screens open the details in a sheet, which can hold a pressable Refresh.
|
||||
const isCompact = useIsCompactFormFactor();
|
||||
@@ -226,21 +233,22 @@ export function ContextWindowMeter({
|
||||
{ring}
|
||||
{percentageLabel}
|
||||
</Pressable>
|
||||
<ContextWindowSheet open={isSheetOpen} onClose={closeSheet}>
|
||||
<DetailsSheet open={isSheetOpen} onClose={closeSheet} title={t("contextWindow.title")}>
|
||||
<ContextWindowDetails
|
||||
serverId={serverId}
|
||||
agentId={agentId}
|
||||
context={context}
|
||||
sessionCost={formattedSessionCost}
|
||||
sessionMetrics={sessionMetrics}
|
||||
showTitle={false}
|
||||
refreshable
|
||||
/>
|
||||
</ContextWindowSheet>
|
||||
</DetailsSheet>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
const popoverStyle = showsUsage
|
||||
const popoverStyle = isWide
|
||||
? [styles.usagePopover, { width: popoverWidth }]
|
||||
: styles.plainPopover;
|
||||
|
||||
@@ -264,7 +272,7 @@ export function ContextWindowMeter({
|
||||
side="top"
|
||||
align="center"
|
||||
offset={8}
|
||||
maxWidth={showsUsage ? popoverWidth : undefined}
|
||||
maxWidth={isWide ? popoverWidth : undefined}
|
||||
style={popoverStyle}
|
||||
testID="context-window-meter-tooltip"
|
||||
>
|
||||
@@ -273,6 +281,7 @@ export function ContextWindowMeter({
|
||||
agentId={agentId}
|
||||
context={context}
|
||||
sessionCost={formattedSessionCost}
|
||||
sessionMetrics={sessionMetrics}
|
||||
showTitle
|
||||
refreshable={false}
|
||||
/>
|
||||
@@ -307,6 +316,7 @@ export function ContextWindowMeter({
|
||||
agentId={agentId}
|
||||
context={context}
|
||||
sessionCost={formattedSessionCost}
|
||||
sessionMetrics={sessionMetrics}
|
||||
showTitle
|
||||
refreshable
|
||||
/>
|
||||
|
||||
+9
-8
@@ -1,7 +1,6 @@
|
||||
import { useMemo, type ReactNode } from "react";
|
||||
import { View, useWindowDimensions } from "react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { BottomSheetScrollView } from "@gorhom/bottom-sheet";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
import { SheetHeaderView, SHEET_HORIZONTAL_PADDING_SCALE } from "@/components/adaptive-modal-sheet";
|
||||
@@ -23,23 +22,24 @@ const ThemedBottomSheetModal = withUnistyles(IsolatedBottomSheetModal, (theme) =
|
||||
}));
|
||||
|
||||
/**
|
||||
* The context window meter's details on compact screens, in a sheet as tall as its content.
|
||||
* Gorhom mounts the content only while the sheet is presented, so whatever it fetches stops once
|
||||
* the sheet closes.
|
||||
* What a hover card or tooltip shows on wide screens, shown on compact screens in a sheet as tall
|
||||
* as its content. Gorhom mounts the content only while the sheet is presented, so whatever it
|
||||
* fetches stops once the sheet closes.
|
||||
*/
|
||||
export function ContextWindowSheet({
|
||||
export function DetailsSheet({
|
||||
open,
|
||||
onClose,
|
||||
title,
|
||||
children,
|
||||
}: {
|
||||
open: boolean;
|
||||
onClose: () => void;
|
||||
title: string;
|
||||
children: ReactNode;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const { height } = useWindowDimensions();
|
||||
const insets = useSafeAreaInsets();
|
||||
const header = useMemo(() => ({ title: t("contextWindow.title") }), [t]);
|
||||
const header = useMemo(() => ({ title }), [title]);
|
||||
const scrollContentStyle = useMemo(() => ({ paddingBottom: insets.bottom }), [insets.bottom]);
|
||||
const { sheetRef, handleSheetChange, handleSheetDismiss } = useIsolatedBottomSheetVisibility({
|
||||
visible: open,
|
||||
@@ -50,7 +50,8 @@ export function ContextWindowSheet({
|
||||
<ThemedBottomSheetModal
|
||||
ref={sheetRef}
|
||||
contextBridge={null}
|
||||
// Content-sized rather than fixed snap points: the usage cards stream in one at a time.
|
||||
// Content-sized rather than fixed snap points: a few rows of details, or usage cards that
|
||||
// stream in one at a time.
|
||||
enableDynamicSizing
|
||||
maxDynamicContentSize={height * 0.8}
|
||||
onChange={handleSheetChange}
|
||||
@@ -3,6 +3,7 @@ import { MessagePreview, MessageSender } from "@/components/user-message";
|
||||
import { useStableEvent } from "@/hooks/use-stable-event";
|
||||
import { getAgentAttachmentPillContent } from "@/attachments/attachment-pill-content";
|
||||
import { AssistantForkMenu, type AssistantForkTarget } from "@/components/assistant-fork-menu";
|
||||
import { TurnMetricsButton } from "@/components/turn-metrics";
|
||||
import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
|
||||
import {
|
||||
AttachmentFrame,
|
||||
@@ -36,7 +37,11 @@ import { useToolCallExpanded } from "@/tool-calls/expansion-context";
|
||||
import { useTargetAgentTitle } from "@/tool-calls/use-target-agent-title";
|
||||
import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
|
||||
import type { AgentMessage } from "@getpaseo/protocol/agent-message";
|
||||
import type { AgentCapabilityFlags, ToolCallDetail } from "@getpaseo/protocol/agent-types";
|
||||
import type {
|
||||
AgentCapabilityFlags,
|
||||
AgentMetric,
|
||||
ToolCallDetail,
|
||||
} from "@getpaseo/protocol/agent-types";
|
||||
import type { AgentAttachment } from "@getpaseo/protocol/messages";
|
||||
import MaskedView from "@react-native-masked-view/masked-view";
|
||||
import {
|
||||
@@ -560,6 +565,8 @@ interface AssistantTurnFooterProps {
|
||||
completedAt?: Date;
|
||||
durationMs?: number | null;
|
||||
onFork?: (target: AssistantForkTarget) => Promise<void> | void;
|
||||
/** What the provider reported about the turn. Without any, the footer has no stats button. */
|
||||
metrics?: AgentMetric[];
|
||||
}
|
||||
|
||||
const assistantTurnFooterStylesheet = StyleSheet.create((theme) => ({
|
||||
@@ -596,6 +603,8 @@ const assistantTurnFooterStylesheet = StyleSheet.create((theme) => ({
|
||||
flexShrink: 0,
|
||||
color: theme.colors.foregroundMuted,
|
||||
fontSize: STREAM_METADATA_FONT_SIZE,
|
||||
// React Native Web preserves trailing spaces at line wraps by default.
|
||||
...(isWeb ? { whiteSpace: "normal" } : {}),
|
||||
},
|
||||
overlappingLabel: {
|
||||
marginLeft: "-100%",
|
||||
@@ -617,6 +626,7 @@ export const AssistantTurnFooter = memo(function AssistantTurnFooter({
|
||||
completedAt,
|
||||
durationMs,
|
||||
onFork,
|
||||
metrics,
|
||||
}: AssistantTurnFooterProps) {
|
||||
const { t } = useTranslation();
|
||||
const [hovered, setHovered] = useState(false);
|
||||
@@ -666,10 +676,11 @@ export const AssistantTurnFooter = memo(function AssistantTurnFooter({
|
||||
[onFork],
|
||||
);
|
||||
const canFork = Boolean(onFork);
|
||||
const hasMetrics = metrics !== undefined && metrics.length > 0;
|
||||
|
||||
return (
|
||||
<View style={assistantTurnFooterStylesheet.container}>
|
||||
{getContent || canFork ? (
|
||||
{getContent || canFork || hasMetrics ? (
|
||||
<View style={assistantTurnFooterStylesheet.actions}>
|
||||
{getContent ? (
|
||||
<TurnCopyButton
|
||||
@@ -678,6 +689,7 @@ export const AssistantTurnFooter = memo(function AssistantTurnFooter({
|
||||
/>
|
||||
) : null}
|
||||
{canFork ? <AssistantForkMenu onFork={handleFork} /> : null}
|
||||
{hasMetrics ? <TurnMetricsButton metrics={metrics} /> : null}
|
||||
</View>
|
||||
) : null}
|
||||
{primaryLabel ? (
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
import { memo } from "react";
|
||||
import { Text, View } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
|
||||
/**
|
||||
* Label and value rows a provider reports for a session or a turn. The provider owns the words and
|
||||
* the tone; the list only lines them up.
|
||||
*/
|
||||
export const MetricsList = memo(function MetricsList({
|
||||
metrics,
|
||||
testID,
|
||||
}: {
|
||||
metrics: AgentMetric[];
|
||||
testID?: string;
|
||||
}) {
|
||||
return (
|
||||
<View style={styles.list} testID={testID}>
|
||||
{metrics.map((metric) => (
|
||||
<View key={metric.label} style={styles.row}>
|
||||
<Text style={styles.label} numberOfLines={1}>
|
||||
{metric.label}
|
||||
</Text>
|
||||
<Text style={[styles.value, toneStyle(metric.tone)]} numberOfLines={1}>
|
||||
{metric.value}
|
||||
</Text>
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
);
|
||||
});
|
||||
|
||||
function toneStyle(tone: AgentMetric["tone"]) {
|
||||
switch (tone) {
|
||||
case "ok":
|
||||
return styles.ok;
|
||||
case "warning":
|
||||
return styles.warning;
|
||||
case "danger":
|
||||
return styles.danger;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
list: {
|
||||
gap: theme.spacing[1.5],
|
||||
},
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "baseline",
|
||||
gap: theme.spacing[6],
|
||||
},
|
||||
label: {
|
||||
flexShrink: 1,
|
||||
color: theme.colors.foregroundMuted,
|
||||
fontSize: theme.fontSize.sm,
|
||||
lineHeight: theme.fontSize.sm * 1.4,
|
||||
},
|
||||
value: {
|
||||
flex: 1,
|
||||
textAlign: "right",
|
||||
color: theme.colors.foreground,
|
||||
fontSize: theme.fontSize.sm,
|
||||
lineHeight: theme.fontSize.sm * 1.4,
|
||||
fontVariant: ["tabular-nums"],
|
||||
},
|
||||
ok: { color: theme.colors.statusSuccess },
|
||||
warning: { color: theme.colors.statusWarning },
|
||||
danger: { color: theme.colors.statusDanger },
|
||||
}));
|
||||
@@ -1,13 +1,15 @@
|
||||
import { AppearanceText as Text } from "@/appearance/text";
|
||||
import { ChevronRight } from "lucide-react-native";
|
||||
import { useMemo, type ReactNode } from "react";
|
||||
import { Platform, ScrollView, View } from "react-native";
|
||||
import { Platform, ScrollView, View, type PressableStateCallbackType } from "react-native";
|
||||
import { KeyboardAwareScrollView } from "react-native-keyboard-controller";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import { BackHeader } from "@/components/headers/back-header";
|
||||
import { MenuHeader } from "@/components/headers/menu-header";
|
||||
import { PressHighlight } from "@/components/ui/press-highlight";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { SPACING } from "@/styles/theme";
|
||||
import { ICON_SIZE, SPACING, type Theme } from "@/styles/theme";
|
||||
|
||||
const PageScrollView = Platform.OS === "android" ? KeyboardAwareScrollView : ScrollView;
|
||||
|
||||
@@ -58,14 +60,7 @@ export function PageLayout({
|
||||
testID={testID}
|
||||
>
|
||||
<View style={width === "wide" ? styles.contentWide : styles.content}>
|
||||
{showTitle ? (
|
||||
<View style={styles.titleRow} testID={titleTestID}>
|
||||
<Text style={styles.title} testID="page-title">
|
||||
{title}
|
||||
</Text>
|
||||
{actions}
|
||||
</View>
|
||||
) : null}
|
||||
{showTitle ? <PageTitle title={title} actions={actions} testID={titleTestID} /> : null}
|
||||
{children}
|
||||
</View>
|
||||
</PageScrollView>
|
||||
@@ -73,6 +68,77 @@ export function PageLayout({
|
||||
);
|
||||
}
|
||||
|
||||
/** The page that holds this one. Its name is the first part of the title and goes back to it. */
|
||||
export interface PageTitleParent {
|
||||
label: string;
|
||||
/** What the press does, such as "Back to providers". */
|
||||
accessibilityLabel: string;
|
||||
onPress: () => void;
|
||||
testID?: string;
|
||||
}
|
||||
|
||||
interface PageTitleProps {
|
||||
parent?: PageTitleParent;
|
||||
/** Drawn before the title, such as the icon of the thing the page is about. */
|
||||
icon?: ReactNode;
|
||||
title?: string;
|
||||
/** A control that belongs to the title, drawn right after it. */
|
||||
adornment?: ReactNode;
|
||||
/** Controls for the whole page, drawn at the trailing edge. */
|
||||
actions?: ReactNode;
|
||||
testID?: string;
|
||||
titleTestID?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* The heading of a desktop page. A page that opens from another page, such as one provider from
|
||||
* Providers, names that page first: "Providers > Antigravity".
|
||||
*/
|
||||
export function PageTitle({
|
||||
parent,
|
||||
icon,
|
||||
title,
|
||||
adornment,
|
||||
actions,
|
||||
testID,
|
||||
titleTestID = "page-title",
|
||||
}: PageTitleProps) {
|
||||
return (
|
||||
<View style={styles.titleRow} testID={testID}>
|
||||
<View style={styles.titleParts}>
|
||||
{parent ? (
|
||||
<PressHighlight
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={parent.accessibilityLabel}
|
||||
onPress={parent.onPress}
|
||||
testID={parent.testID}
|
||||
>
|
||||
{({ hovered }: PressableStateCallbackType & { hovered?: boolean }) => (
|
||||
<Text style={[styles.title, styles.parent, hovered && styles.parentHovered]}>
|
||||
{parent.label}
|
||||
</Text>
|
||||
)}
|
||||
</PressHighlight>
|
||||
) : null}
|
||||
{parent && title !== undefined ? (
|
||||
<ThemedChevronRight size={ICON_SIZE.lg} uniProps={separatorColor} />
|
||||
) : null}
|
||||
{icon}
|
||||
{title !== undefined ? (
|
||||
<Text style={[styles.title, styles.titleLeaf]} numberOfLines={1} testID={titleTestID}>
|
||||
{title}
|
||||
</Text>
|
||||
) : null}
|
||||
{adornment}
|
||||
</View>
|
||||
{actions}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
const ThemedChevronRight = withUnistyles(ChevronRight);
|
||||
const separatorColor = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
container: {
|
||||
flex: 1,
|
||||
@@ -102,11 +168,27 @@ const styles = StyleSheet.create((theme) => ({
|
||||
gap: theme.spacing[4],
|
||||
marginBottom: theme.spacing[6],
|
||||
},
|
||||
title: {
|
||||
titleParts: {
|
||||
// Line up with the section titles, which sit inset from their cards.
|
||||
marginLeft: theme.spacing[1],
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: theme.spacing[2],
|
||||
flexShrink: 1,
|
||||
minWidth: 0,
|
||||
},
|
||||
title: {
|
||||
fontSize: theme.fontSize["4xl"],
|
||||
fontWeight: theme.fontWeight.medium,
|
||||
color: theme.colors.foreground,
|
||||
},
|
||||
titleLeaf: {
|
||||
flexShrink: 1,
|
||||
},
|
||||
parent: {
|
||||
color: theme.colors.foregroundMuted,
|
||||
},
|
||||
parentHovered: {
|
||||
color: theme.colors.foreground,
|
||||
},
|
||||
}));
|
||||
|
||||
@@ -2,7 +2,9 @@ import { ArrowLeft } from "lucide-react-native";
|
||||
import type { ReactNode } from "react";
|
||||
import { Text, View } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { PageTitle, type PageTitleParent } from "@/components/page-layout";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
|
||||
/**
|
||||
* "Back to …" above a settings detail page on wide layouts, where the page has no header of its
|
||||
@@ -32,32 +34,43 @@ export function SettingsBackLink({
|
||||
}
|
||||
|
||||
/**
|
||||
* The top of a settings detail page: "Back to …" when the page has no header of its own, then the
|
||||
* icon and name the page is about, with an optional action after the name.
|
||||
* The top of a settings detail page: the icon and name of the thing the page is about, with an
|
||||
* optional action after the name. On wide layouts it is the page's title and names the parent page
|
||||
* first, which goes back to it. On compact layouts the back header already names the parent.
|
||||
*/
|
||||
export function SettingsDetailHeader({
|
||||
back,
|
||||
parent,
|
||||
icon,
|
||||
title,
|
||||
trailing,
|
||||
titleTestID,
|
||||
}: {
|
||||
back?: { label: string; onPress: () => void; testID?: string };
|
||||
icon: ReactNode;
|
||||
title: string;
|
||||
parent: PageTitleParent;
|
||||
icon?: ReactNode;
|
||||
/** Absent while the page has nothing to name, such as a project that no longer exists. */
|
||||
title?: string;
|
||||
trailing?: ReactNode;
|
||||
titleTestID?: string;
|
||||
}) {
|
||||
const isCompact = useIsCompactFormFactor();
|
||||
if (!isCompact)
|
||||
return (
|
||||
<PageTitle
|
||||
parent={parent}
|
||||
icon={icon}
|
||||
title={title}
|
||||
adornment={trailing}
|
||||
titleTestID={titleTestID}
|
||||
/>
|
||||
);
|
||||
if (title === undefined) return null;
|
||||
return (
|
||||
<View style={styles.header}>
|
||||
{back ? <SettingsBackLink {...back} /> : null}
|
||||
<View style={styles.titleRow}>
|
||||
{icon}
|
||||
<Text style={styles.title} numberOfLines={1} testID={titleTestID}>
|
||||
{title}
|
||||
</Text>
|
||||
{trailing}
|
||||
</View>
|
||||
<View style={styles.titleRow}>
|
||||
{icon}
|
||||
<Text style={styles.title} numberOfLines={1} testID={titleTestID}>
|
||||
{title}
|
||||
</Text>
|
||||
{trailing}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
@@ -67,15 +80,13 @@ const styles = StyleSheet.create((theme) => ({
|
||||
alignSelf: "flex-start",
|
||||
paddingHorizontal: 0,
|
||||
},
|
||||
header: {
|
||||
gap: theme.spacing[2],
|
||||
marginBottom: theme.spacing[4],
|
||||
},
|
||||
titleRow: {
|
||||
marginTop: theme.spacing[2],
|
||||
// Line up with the section titles, which sit inset from their cards.
|
||||
marginLeft: theme.spacing[1],
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: theme.spacing[3],
|
||||
marginBottom: theme.spacing[4],
|
||||
},
|
||||
title: {
|
||||
color: theme.colors.foreground,
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
import type { ReactNode } from "react";
|
||||
import { View } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
|
||||
/**
|
||||
* The action at a heading's end. It adds no height, so a heading with a button is as tall as one
|
||||
* without and both sit the same distance from their cards. The button stays centered on the title
|
||||
* and its hit area grows past the heading.
|
||||
*/
|
||||
export function HeadingTrailing({ children }: { children: ReactNode }) {
|
||||
if (children === null || children === undefined || children === false) return null;
|
||||
return <View style={styles.trailing}>{children}</View>;
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
trailing: {
|
||||
height: 0,
|
||||
justifyContent: "center",
|
||||
// A long trailing gives way to the title.
|
||||
flexShrink: 1,
|
||||
},
|
||||
});
|
||||
@@ -1,6 +1,7 @@
|
||||
import { useMemo, type ReactNode } from "react";
|
||||
import { Text, View, type StyleProp, type ViewStyle } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { HeadingTrailing } from "./heading-trailing";
|
||||
import { SettingsInfoTip } from "./settings-info-tip";
|
||||
|
||||
interface SettingsGroupProps {
|
||||
@@ -40,7 +41,7 @@ export function SettingsGroup({
|
||||
/>
|
||||
) : null}
|
||||
</View>
|
||||
{trailing}
|
||||
<HeadingTrailing>{trailing}</HeadingTrailing>
|
||||
</View>
|
||||
{children}
|
||||
</View>
|
||||
|
||||
@@ -3,6 +3,7 @@ import { useMemo, type ReactNode } from "react";
|
||||
import { View, type StyleProp, type ViewStyle } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { ExternalLink, type ExternalLinkProps } from "@/components/ui/external-link";
|
||||
import { HeadingTrailing } from "./heading-trailing";
|
||||
import { SettingsInfoTip } from "./settings-info-tip";
|
||||
import { settingsStyles } from "@/styles/settings";
|
||||
|
||||
@@ -67,7 +68,7 @@ export function SettingsSection({
|
||||
<ExternalLink {...link} />
|
||||
</View>
|
||||
) : null}
|
||||
{trailing}
|
||||
<HeadingTrailing>{trailing}</HeadingTrailing>
|
||||
</View>
|
||||
<View style={styles.content}>{children}</View>
|
||||
</View>
|
||||
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
SettingsCollapsibleRow,
|
||||
SettingsDetailRow,
|
||||
SettingsRow,
|
||||
SettingsSwitch,
|
||||
} from "@/components/settings";
|
||||
|
||||
let root: Root | null = null;
|
||||
@@ -20,6 +21,7 @@ afterEach(() => {
|
||||
});
|
||||
|
||||
function openNothing() {}
|
||||
function toggleNothing() {}
|
||||
|
||||
function mountRows() {
|
||||
container = document.createElement("div");
|
||||
@@ -33,6 +35,13 @@ function mountRows() {
|
||||
Download
|
||||
</Button>
|
||||
</SettingsRow>
|
||||
<SettingsRow label="Text only" testID="text-row" />
|
||||
<SettingsSwitch
|
||||
label="Toggles"
|
||||
value={false}
|
||||
onValueChange={toggleNothing}
|
||||
testID="switch-row"
|
||||
/>
|
||||
<SettingsDetailRow label="Opens a page" onPress={openNothing} testID="detail-row" />
|
||||
<SettingsCollapsibleRow label="Group" defaultExpanded testID="group">
|
||||
<SettingsRow label="Nested with a button" testID="nested-with-button">
|
||||
@@ -74,11 +83,13 @@ describe("settings row density", () => {
|
||||
expect(heightOf("group-toggle")).toBeGreaterThan(heightOf("nested-without-button"));
|
||||
});
|
||||
|
||||
it("keeps a row that opens something as tall as a row holding a control", () => {
|
||||
it("lines up text, switch, and opening rows below a row holding a button", () => {
|
||||
mountRows();
|
||||
|
||||
expect(heightOf("detail-row")).toBe(heightOf("card-row"));
|
||||
expect(heightOf("group-toggle")).toBe(heightOf("card-row"));
|
||||
expect(heightOf("switch-row")).toBe(heightOf("text-row"));
|
||||
expect(heightOf("detail-row")).toBe(heightOf("text-row"));
|
||||
expect(heightOf("group-toggle")).toBe(heightOf("text-row"));
|
||||
expect(heightOf("card-row")).toBeGreaterThan(heightOf("text-row"));
|
||||
});
|
||||
|
||||
it("sizes nested text and controls one step below card rows", () => {
|
||||
|
||||
@@ -27,11 +27,6 @@ export function MenuSettingsRows({ children }: { children: ReactNode }) {
|
||||
|
||||
export interface SettingsRowLayout {
|
||||
row: StyleProp<ViewStyle>;
|
||||
/**
|
||||
* A row as tall as one holding a control of `controlSize`, whether or not it holds one. In a menu
|
||||
* it keeps the menu's row height.
|
||||
*/
|
||||
controlRow: StyleProp<ViewStyle>;
|
||||
title: StyleProp<TextStyle>;
|
||||
hint: StyleProp<TextStyle>;
|
||||
/** The size of the controls in the row's trailing slot. */
|
||||
@@ -43,7 +38,6 @@ function layoutFor(placement: RowPlacement): SettingsRowLayout {
|
||||
case "nested":
|
||||
return {
|
||||
row: [settingsStyles.row, styles.nestedRow],
|
||||
controlRow: [settingsStyles.row, styles.nestedRow],
|
||||
title: [settingsStyles.rowTitle, styles.nestedText],
|
||||
hint: [settingsStyles.rowHint, styles.nestedText],
|
||||
controlSize: "sm",
|
||||
@@ -51,7 +45,6 @@ function layoutFor(placement: RowPlacement): SettingsRowLayout {
|
||||
case "menu":
|
||||
return {
|
||||
row: [settingsStyles.row, styles.menuRow],
|
||||
controlRow: [settingsStyles.row, styles.menuRow],
|
||||
title: settingsStyles.rowTitle,
|
||||
hint: settingsStyles.rowHint,
|
||||
controlSize: "md",
|
||||
@@ -59,7 +52,6 @@ function layoutFor(placement: RowPlacement): SettingsRowLayout {
|
||||
case "card":
|
||||
return {
|
||||
row: settingsStyles.row,
|
||||
controlRow: [settingsStyles.row, styles.cardControlRow],
|
||||
title: settingsStyles.rowTitle,
|
||||
hint: settingsStyles.rowHint,
|
||||
controlSize: "md",
|
||||
@@ -74,9 +66,6 @@ export function useSettingsRowLayout(): SettingsRowLayout {
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
cardControlRow: {
|
||||
minHeight: mapLayout(CONTROL_HEIGHTS.md, (height) => height + theme.spacing[4] * 2),
|
||||
},
|
||||
// Every nested row is as tall as one holding an `sm` control, so rows with and without a
|
||||
// trailing button line up.
|
||||
nestedRow: {
|
||||
|
||||
@@ -86,7 +86,7 @@ export function SettingsRowHeader({
|
||||
const handlePointerEnter = useCallback(() => setPointerOver(true), []);
|
||||
const handlePointerLeave = useCallback(() => setPointerOver(false), []);
|
||||
const hovered = pointerOver && !disabled;
|
||||
const rowStyle = useMemo(() => [layout.controlRow, hovered && styles.hovered], [hovered, layout]);
|
||||
const rowStyle = useMemo(() => [layout.row, hovered && styles.hovered], [hovered, layout]);
|
||||
const chevronStyle = useMemo(
|
||||
() => [styles.chevron, expanded && styles.chevronExpanded],
|
||||
[expanded],
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
import { memo, useCallback, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Text, View } from "react-native";
|
||||
import { ChartNoAxesColumn } from "lucide-react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import {
|
||||
HoverCard,
|
||||
HoverCardContent,
|
||||
HoverCardTrigger,
|
||||
useHoverCardOpen,
|
||||
} from "@/components/ui/hover-card";
|
||||
import { PressHighlight } from "@/components/ui/press-highlight";
|
||||
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { isNative } from "@/constants/platform";
|
||||
import { ICON_SIZE, type Theme } from "@/styles/theme";
|
||||
import { DetailsSheet } from "./details-sheet";
|
||||
import { MetricsList } from "./metrics-list";
|
||||
|
||||
const ThemedChart = withUnistyles(ChartNoAxesColumn);
|
||||
const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
|
||||
const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
|
||||
|
||||
/**
|
||||
* The turn footer's stats button: what the provider reported about this turn, in a hover card on
|
||||
* web, a tooltip opened by press on native wide screens, and a sheet on compact screens.
|
||||
*/
|
||||
export const TurnMetricsButton = memo(function TurnMetricsButton({
|
||||
metrics,
|
||||
}: {
|
||||
metrics: AgentMetric[];
|
||||
}) {
|
||||
const isCompact = useIsCompactFormFactor();
|
||||
if (isCompact) return <TurnMetricsSheetButton metrics={metrics} />;
|
||||
if (isNative) return <TurnMetricsTooltipButton metrics={metrics} />;
|
||||
return <TurnMetricsHoverCardButton metrics={metrics} />;
|
||||
});
|
||||
|
||||
function TurnMetricsSheetButton({ metrics }: { metrics: AgentMetric[] }) {
|
||||
const { t } = useTranslation();
|
||||
const [open, setOpen] = useState(false);
|
||||
const openSheet = useCallback(() => setOpen(true), []);
|
||||
const closeSheet = useCallback(() => setOpen(false), []);
|
||||
return (
|
||||
<>
|
||||
<PressHighlight
|
||||
style={styles.trigger}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={t("message.actions.turnStats")}
|
||||
onPress={openSheet}
|
||||
testID="turn-metrics-trigger"
|
||||
>
|
||||
{({ hovered }) => <TurnMetricsIcon active={open || Boolean(hovered)} />}
|
||||
</PressHighlight>
|
||||
<DetailsSheet open={open} onClose={closeSheet} title={t("message.actions.turnStats")}>
|
||||
<MetricsList metrics={metrics} />
|
||||
</DetailsSheet>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
function TurnMetricsTooltipButton({ metrics }: { metrics: AgentMetric[] }) {
|
||||
const { t } = useTranslation();
|
||||
const [open, setOpen] = useState(false);
|
||||
return (
|
||||
<Tooltip open={open} onOpenChange={setOpen} delayDuration={0} enabledOnDesktop enabledOnMobile>
|
||||
<TooltipTrigger asChild triggerRefProp="ref">
|
||||
<PressHighlight
|
||||
style={styles.trigger}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={t("message.actions.turnStats")}
|
||||
testID="turn-metrics-trigger"
|
||||
>
|
||||
{({ hovered }) => <TurnMetricsIcon active={open || Boolean(hovered)} />}
|
||||
</PressHighlight>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent side="top" align="start" offset={8} style={styles.popover}>
|
||||
<TurnMetricsDetails metrics={metrics} />
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
|
||||
function TurnMetricsHoverCardButton({ metrics }: { metrics: AgentMetric[] }) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<HoverCard>
|
||||
<HoverCardTrigger focusable accessibilityLabel={t("message.actions.turnStats")}>
|
||||
<View style={styles.trigger} testID="turn-metrics-trigger">
|
||||
<HoverCardTurnMetricsIcon />
|
||||
</View>
|
||||
</HoverCardTrigger>
|
||||
<HoverCardContent
|
||||
placement="top"
|
||||
alignment="start"
|
||||
offset={8}
|
||||
role="dialog"
|
||||
accessibilityLabel={t("message.actions.turnStats")}
|
||||
testID="turn-metrics-details"
|
||||
style={styles.popover}
|
||||
>
|
||||
<TurnMetricsDetails metrics={metrics} />
|
||||
</HoverCardContent>
|
||||
</HoverCard>
|
||||
);
|
||||
}
|
||||
|
||||
function HoverCardTurnMetricsIcon() {
|
||||
return <TurnMetricsIcon active={useHoverCardOpen()} />;
|
||||
}
|
||||
|
||||
function TurnMetricsIcon({ active }: { active: boolean }) {
|
||||
return (
|
||||
<ThemedChart
|
||||
size={ICON_SIZE.sm}
|
||||
uniProps={active ? foregroundColorMapping : foregroundMutedColorMapping}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function TurnMetricsDetails({ metrics }: { metrics: AgentMetric[] }) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<>
|
||||
<Text style={styles.title}>{t("message.actions.turnStats")}</Text>
|
||||
<MetricsList metrics={metrics} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
// Matches the Copy and Fork buttons beside it, so the glyphs share one row and one spacing.
|
||||
trigger: {
|
||||
alignSelf: "center",
|
||||
padding: theme.spacing[1],
|
||||
borderRadius: theme.borderRadius.md,
|
||||
},
|
||||
popover: {
|
||||
minWidth: 220,
|
||||
padding: theme.spacing[3],
|
||||
gap: theme.spacing[2],
|
||||
},
|
||||
title: {
|
||||
color: theme.colors.foreground,
|
||||
fontSize: theme.fontSize.base,
|
||||
},
|
||||
}));
|
||||
@@ -302,23 +302,23 @@ describe("control geometry", () => {
|
||||
trackHeight: 20,
|
||||
thumbSize: 16,
|
||||
thumbTravel: 14,
|
||||
reservedHeight: 32,
|
||||
hitHeight: 32,
|
||||
});
|
||||
expect(switchGeometryForLayout("md", true)).toEqual({
|
||||
trackWidth: 44,
|
||||
trackHeight: 26,
|
||||
thumbSize: 22,
|
||||
thumbTravel: 18,
|
||||
reservedHeight: 44,
|
||||
hitHeight: 44,
|
||||
});
|
||||
// Tight chrome keeps the pointer-sized track on every layout and reserves its row's height.
|
||||
// Tight chrome keeps the pointer-sized track on every layout and takes presses over its row's control height.
|
||||
expect(switchGeometryForLayout("sm", true)).toMatchObject({
|
||||
trackWidth: 34,
|
||||
reservedHeight: 32,
|
||||
hitHeight: 32,
|
||||
});
|
||||
expect(switchGeometryForLayout("sm", false)).toMatchObject({
|
||||
trackWidth: 34,
|
||||
reservedHeight: 28,
|
||||
hitHeight: 28,
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -223,8 +223,11 @@ export interface SwitchGeometry {
|
||||
thumbSize: number;
|
||||
/** How far the thumb slides between off and on. */
|
||||
thumbTravel: number;
|
||||
/** The control height the switch reserves, so its row lines up with one holding a button. */
|
||||
reservedHeight: number;
|
||||
/**
|
||||
* The height of the area that takes the press: the control height of the switch's size. The
|
||||
* switch itself is only as tall as its track, so it never makes a row taller.
|
||||
*/
|
||||
hitHeight: number;
|
||||
}
|
||||
|
||||
function switchSize(trackWidth: number, trackHeight: number, thumbSize: number) {
|
||||
@@ -235,6 +238,15 @@ function switchSize(trackWidth: number, trackHeight: number, thumbSize: number)
|
||||
const SWITCH_POINTER = switchSize(34, 20, 16);
|
||||
const SWITCH_TOUCH = switchSize(44, 26, 22);
|
||||
|
||||
/**
|
||||
* The height of a default switch. Exported so a row can be as tall as one holding a switch whether
|
||||
* or not it holds one. A breakpoint value, so it only works inside a Unistyles stylesheet.
|
||||
*/
|
||||
export const SWITCH_HEIGHT = bySizing({
|
||||
touch: SWITCH_TOUCH.trackHeight,
|
||||
pointer: SWITCH_POINTER.trackHeight,
|
||||
});
|
||||
|
||||
/**
|
||||
* A switch follows the same two sizes as every other control. Its thumb travel feeds an
|
||||
* animation, so the size is resolved to plain numbers here instead of a stylesheet breakpoint.
|
||||
@@ -242,7 +254,7 @@ const SWITCH_TOUCH = switchSize(44, 26, 22);
|
||||
export function switchGeometryForLayout(size: ControlSize, isCompact: boolean): SwitchGeometry {
|
||||
const touchSized = controlSizingForLayout(isCompact) === "touch";
|
||||
const track = size === "md" && touchSized ? SWITCH_TOUCH : SWITCH_POINTER;
|
||||
return { ...track, reservedHeight: controlHeightForLayout(size, isCompact) };
|
||||
return { ...track, hitHeight: controlHeightForLayout(size, isCompact) };
|
||||
}
|
||||
|
||||
function fieldLineHeight(fontSize: number): number {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useCallback, type ReactElement } from "react";
|
||||
import {
|
||||
MenuCheckboxItem,
|
||||
MenuHint,
|
||||
MenuItem,
|
||||
MenuLabel,
|
||||
@@ -23,11 +24,16 @@ import {
|
||||
export { MenuRoot as DropdownMenu };
|
||||
export { MenuTrigger as DropdownMenuTrigger };
|
||||
export { MenuItem as DropdownMenuItem };
|
||||
export { MenuCheckboxItem as DropdownMenuCheckboxItem };
|
||||
export { MenuLabel as DropdownMenuLabel };
|
||||
export { MenuSeparator as DropdownMenuSeparator };
|
||||
export { MenuHint as DropdownMenuHint };
|
||||
export type { MenuTriggerProps as DropdownMenuTriggerProps };
|
||||
export type { ActionStatus, MenuItemProps as DropdownMenuItemProps } from "@/components/ui/menu";
|
||||
export type {
|
||||
ActionStatus,
|
||||
MenuCheckboxItemProps as DropdownMenuCheckboxItemProps,
|
||||
MenuItemProps as DropdownMenuItemProps,
|
||||
} from "@/components/ui/menu";
|
||||
export type { MenuPageDefinition } from "@/components/ui/menu";
|
||||
export { MenuSubTrigger as DropdownMenuSubTrigger } from "@/components/ui/menu";
|
||||
|
||||
|
||||
@@ -267,6 +267,11 @@ function WebHoverCard({
|
||||
);
|
||||
}
|
||||
|
||||
/** Whether the enclosing card is open, so its trigger can look active while it is. */
|
||||
export function useHoverCardOpen(): boolean {
|
||||
return useContext(HoverCardContext)?.open ?? false;
|
||||
}
|
||||
|
||||
export function HoverCardTrigger({
|
||||
children,
|
||||
focusable = false,
|
||||
|
||||
@@ -19,6 +19,7 @@ export {
|
||||
} from "./menu-surface";
|
||||
export { MenuSubTrigger } from "./menu-sub";
|
||||
export {
|
||||
MenuCheckboxItem,
|
||||
MenuHint,
|
||||
MenuItem,
|
||||
MenuLabel,
|
||||
@@ -26,6 +27,7 @@ export {
|
||||
MenuTextField,
|
||||
menuRowContentInset,
|
||||
type ActionStatus,
|
||||
type MenuCheckboxItemProps,
|
||||
type MenuItemProps,
|
||||
} from "./menu-item";
|
||||
export { MENU_ITEM_HEIGHT } from "./menu-geometry";
|
||||
|
||||
@@ -18,6 +18,7 @@ import { Check, CheckCircle } from "lucide-react-native";
|
||||
import { AdaptiveTextInput } from "@/components/adaptive-modal-sheet";
|
||||
import { LoadingSpinner } from "@/components/ui/loading-spinner";
|
||||
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||
import { isWeb } from "@/constants/platform";
|
||||
import type { Theme } from "@/styles/theme";
|
||||
import { MenuDepthProvider, useMenuContext } from "./menu-context";
|
||||
import { MENU_ITEM_HEIGHT } from "./menu-geometry";
|
||||
@@ -221,6 +222,36 @@ function resolveItemLabel(input: {
|
||||
return children;
|
||||
}
|
||||
|
||||
function resolveTrailingContent(input: {
|
||||
trailing: ReactElement | null | undefined;
|
||||
showSelectedCheck: boolean;
|
||||
selected: boolean | undefined;
|
||||
}): ReactElement | null {
|
||||
if (input.trailing !== undefined) return input.trailing;
|
||||
if (!input.showSelectedCheck && input.selected) {
|
||||
return <ThemedCheck size={16} uniProps={mutedMapping} />;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
function useSheetSpaceKeyProps(
|
||||
enabled: boolean,
|
||||
onPress: () => void,
|
||||
): { onKeyDown?: (event: { key?: string; preventDefault?: () => void }) => void } {
|
||||
return useMemo(() => {
|
||||
if (!isWeb || !enabled) return {};
|
||||
return {
|
||||
// React Native Web's Pressable activates Space only for role="button", not menuitem/checkbox.
|
||||
onKeyDown: (event: { key?: string; preventDefault?: () => void }) => {
|
||||
if (event.key === " " || event.key === "Spacebar") {
|
||||
event.preventDefault?.();
|
||||
onPress();
|
||||
}
|
||||
},
|
||||
};
|
||||
}, [enabled, onPress]);
|
||||
}
|
||||
|
||||
export interface MenuItemProps {
|
||||
description?: string;
|
||||
onSelect?: () => void;
|
||||
@@ -253,7 +284,37 @@ export interface MenuItemProps {
|
||||
tooltip?: string;
|
||||
}
|
||||
|
||||
export function MenuItem({
|
||||
export function MenuItem(props: PropsWithChildren<MenuItemProps>): ReactElement {
|
||||
return <MenuRow {...props} accessibilityRole="menuitem" />;
|
||||
}
|
||||
|
||||
export interface MenuCheckboxItemProps extends Omit<MenuItemProps, "selected" | "onSelect"> {
|
||||
checked: boolean;
|
||||
onToggle: () => void;
|
||||
}
|
||||
|
||||
/**
|
||||
* A toggleable menu row that stays open on press by default and exposes `checkbox` semantics so
|
||||
* screen readers announce its checked state.
|
||||
*/
|
||||
export function MenuCheckboxItem({
|
||||
checked,
|
||||
onToggle,
|
||||
closeOnSelect = false,
|
||||
...rest
|
||||
}: PropsWithChildren<MenuCheckboxItemProps>): ReactElement {
|
||||
return (
|
||||
<MenuRow
|
||||
{...rest}
|
||||
selected={checked}
|
||||
onSelect={onToggle}
|
||||
closeOnSelect={closeOnSelect}
|
||||
accessibilityRole="checkbox"
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function MenuRow({
|
||||
children,
|
||||
description,
|
||||
onSelect,
|
||||
@@ -272,8 +333,11 @@ export function MenuItem({
|
||||
closeOnSelect = true,
|
||||
testID,
|
||||
tooltip,
|
||||
}: PropsWithChildren<MenuItemProps>): ReactElement {
|
||||
const { selectItem } = useMenuContext("MenuItem");
|
||||
accessibilityRole,
|
||||
}: PropsWithChildren<
|
||||
MenuItemProps & { accessibilityRole: "menuitem" | "checkbox" }
|
||||
>): ReactElement {
|
||||
const { selectItem, presentation } = useMenuContext("MenuItem");
|
||||
const isPending = status === "pending" || loading;
|
||||
const isSuccess = status === "success";
|
||||
const isDisabled = disabled || isPending || isSuccess;
|
||||
@@ -286,14 +350,14 @@ export function MenuItem({
|
||||
|
||||
const label = resolveItemLabel({ children, isPending, isSuccess, pendingLabel, successLabel });
|
||||
|
||||
const trailingContent =
|
||||
trailing ??
|
||||
(!showSelectedCheck && selected ? <ThemedCheck size={16} uniProps={mutedMapping} /> : null);
|
||||
const trailingContent = resolveTrailingContent({ trailing, showSelectedCheck, selected });
|
||||
|
||||
const handleItemPress = useCallback(() => {
|
||||
if (isDisabled) return;
|
||||
selectItem(onSelect, closeOnSelect);
|
||||
}, [isDisabled, selectItem, onSelect, closeOnSelect]);
|
||||
const isSheet = presentation === "sheet";
|
||||
const sheetKeyProps = useSheetSpaceKeyProps(isSheet, handleItemPress);
|
||||
|
||||
// A row that draws a check has to say so as well: a multi-select page is a list of things that
|
||||
// are on or off, and the check is the only thing telling a sighted user which. Rows that answer
|
||||
@@ -336,11 +400,13 @@ export function MenuItem({
|
||||
|
||||
const content = (
|
||||
<Pressable
|
||||
{...sheetKeyProps}
|
||||
testID={testID}
|
||||
accessibilityRole="menuitem"
|
||||
accessibilityRole={accessibilityRole}
|
||||
accessibilityState={accessibilityState}
|
||||
aria-checked={selected}
|
||||
tabIndex={-1}
|
||||
// Popovers manage focus via arrow keys; compact sheets rely on the browser's Tab order.
|
||||
tabIndex={isSheet ? 0 : -1}
|
||||
dataSet={itemDataSet}
|
||||
disabled={isDisabled}
|
||||
onPress={handleItemPress}
|
||||
|
||||
@@ -25,6 +25,8 @@ export interface SearchFieldProps {
|
||||
/** Falls back to `placeholder`, which already names the field. */
|
||||
accessibilityLabel?: string;
|
||||
clearAccessibilityLabel: string;
|
||||
/** Fill the container, for a search that heads one list. Defaults to the filter rail's width. */
|
||||
fullWidth?: boolean;
|
||||
testID?: string;
|
||||
clearTestID?: string;
|
||||
}
|
||||
@@ -42,6 +44,7 @@ export function SearchField({
|
||||
placeholder,
|
||||
accessibilityLabel,
|
||||
clearAccessibilityLabel,
|
||||
fullWidth = false,
|
||||
testID,
|
||||
clearTestID,
|
||||
}: SearchFieldProps): ReactElement {
|
||||
@@ -55,7 +58,9 @@ export function SearchField({
|
||||
}, [onChangeText]);
|
||||
|
||||
return (
|
||||
<View style={[styles.field, isFocused && styles.fieldFocused]}>
|
||||
<View
|
||||
style={[styles.field, fullWidth && styles.fieldFullWidth, isFocused && styles.fieldFocused]}
|
||||
>
|
||||
<ThemedSearch size={14} uniProps={mutedColorMapping} />
|
||||
<ThemedTextInput
|
||||
testID={testID}
|
||||
@@ -103,6 +108,9 @@ const styles = StyleSheet.create((theme) => ({
|
||||
borderWidth: theme.borderWidth[1],
|
||||
borderColor: theme.colors.border,
|
||||
},
|
||||
fieldFullWidth: {
|
||||
maxWidth: "100%",
|
||||
},
|
||||
fieldFocused: {
|
||||
borderColor: theme.colors.borderAccent,
|
||||
backgroundColor: theme.colors.surface2,
|
||||
|
||||
@@ -123,11 +123,16 @@ export function Switch({
|
||||
const pressableStyle = useMemo(
|
||||
() => [
|
||||
styles.switchControl,
|
||||
{ minHeight: geometry.reservedHeight },
|
||||
// The press area is a full control tall and grows out of the track; the layout only sees
|
||||
// the track.
|
||||
{
|
||||
minHeight: geometry.hitHeight,
|
||||
marginVertical: (geometry.trackHeight - geometry.hitHeight) / 2,
|
||||
},
|
||||
disabled ? styles.disabled : null,
|
||||
style,
|
||||
],
|
||||
[disabled, geometry.reservedHeight, style],
|
||||
[disabled, geometry.hitHeight, geometry.trackHeight, style],
|
||||
);
|
||||
|
||||
return (
|
||||
|
||||
@@ -12,6 +12,7 @@ import { Composer } from "@/composer";
|
||||
import { ProjectIconView } from "@/components/project-icon-view";
|
||||
import { ICON_SIZE } from "@/styles/theme";
|
||||
import { useToast } from "@/contexts/toast-context";
|
||||
import { draftCreationKey } from "@/composer/draft/creation-key";
|
||||
import { useAgentInputDraft } from "@/composer/draft/input-draft";
|
||||
import { useProjectIcon } from "@/projects/icons";
|
||||
import { useHostRuntimeClient, useHostRuntimeIsConnected } from "@/runtime/host-runtime";
|
||||
@@ -96,13 +97,16 @@ async function callWorkspaceCreation({
|
||||
worktreeSlug: string;
|
||||
input: { cwd: string; agent?: CreateWorkspaceRequestOptions["agent"] };
|
||||
}) {
|
||||
return connectedClient.createWorkspace({
|
||||
idempotencyKey: creationId,
|
||||
const request: Omit<CreateWorkspaceRequestOptions, "idempotencyKey"> = {
|
||||
agent: input.agent,
|
||||
source:
|
||||
creationMethod === "create_worktree"
|
||||
? { kind: "worktree", cwd: input.cwd, worktreeSlug }
|
||||
: { kind: "directory", path: input.cwd },
|
||||
};
|
||||
return connectedClient.createWorkspace({
|
||||
...request,
|
||||
idempotencyKey: draftCreationKey(creationId, request),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -363,7 +367,9 @@ export function WorkspaceSetupDialog() {
|
||||
} catch (error) {
|
||||
const message = toErrorMessage(error);
|
||||
setErrorMessage(message);
|
||||
toast.error(message);
|
||||
if (!getIsStillActive()) {
|
||||
toast.error(message);
|
||||
}
|
||||
} finally {
|
||||
if (getIsStillActive()) {
|
||||
setPendingAction(null);
|
||||
@@ -455,11 +461,10 @@ export function WorkspaceSetupDialog() {
|
||||
commandDraft={composerState?.commandDraft}
|
||||
agentControls={agentControlsWithDisabled}
|
||||
inputWrapperStyle={styles.composerInputWrapper}
|
||||
error={errorMessage}
|
||||
/>
|
||||
</KeyboardTranslateView>
|
||||
</FileDropZone>
|
||||
|
||||
{errorMessage ? <Text style={styles.errorText}>{errorMessage}</Text> : null}
|
||||
</AdaptiveModalSheet>
|
||||
);
|
||||
}
|
||||
@@ -482,11 +487,6 @@ const styles = StyleSheet.create((theme) => ({
|
||||
marginHorizontal: -theme.spacing[6],
|
||||
marginVertical: -theme.spacing[2],
|
||||
},
|
||||
errorText: {
|
||||
fontSize: theme.fontSize.base,
|
||||
color: theme.colors.destructive,
|
||||
lineHeight: 20,
|
||||
},
|
||||
composerSlot: {
|
||||
paddingBottom: theme.spacing[4],
|
||||
},
|
||||
|
||||
@@ -8,6 +8,21 @@ const request = {
|
||||
clientMessageId: "draft-1:initial-message",
|
||||
};
|
||||
|
||||
const workspaceRequest = {
|
||||
source: {
|
||||
kind: "worktree" as const,
|
||||
cwd: "/repo",
|
||||
projectId: "prj_1",
|
||||
worktreeSlug: "clever-fox",
|
||||
},
|
||||
firstAgentContext: { prompt: "Start the original task.", attachments: [] },
|
||||
agent: {
|
||||
config: { provider: "codex", cwd: "/repo", model: "gpt-6" },
|
||||
initialPrompt: "Start the original task.",
|
||||
clientMessageId: "draft-1:initial-message",
|
||||
},
|
||||
};
|
||||
|
||||
describe("draftCreationKey", () => {
|
||||
it("keeps the key for a retry of the same request, whatever its key order", () => {
|
||||
const reordered = {
|
||||
@@ -27,4 +42,52 @@ describe("draftCreationKey", () => {
|
||||
expect(key).not.toBe(draftCreationKey("draft-1", request));
|
||||
expect(key.startsWith("draft-1:")).toBe(true);
|
||||
});
|
||||
|
||||
it.each([
|
||||
{
|
||||
name: "isolation",
|
||||
edited: {
|
||||
...workspaceRequest,
|
||||
source: { kind: "directory" as const, path: "/repo", projectId: "prj_1" },
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "project",
|
||||
edited: {
|
||||
...workspaceRequest,
|
||||
source: { ...workspaceRequest.source, projectId: "prj_2", cwd: "/other" },
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prompt",
|
||||
edited: {
|
||||
...workspaceRequest,
|
||||
firstAgentContext: { prompt: "hi", attachments: [] },
|
||||
agent: { ...workspaceRequest.agent, initialPrompt: "hi" },
|
||||
},
|
||||
},
|
||||
])(
|
||||
"gives a New workspace request with edited $name a new key on the same draft",
|
||||
({ edited }) => {
|
||||
const key = draftCreationKey("draft-1", edited);
|
||||
expect(key).not.toBe(draftCreationKey("draft-1", workspaceRequest));
|
||||
expect(key.startsWith("draft-1:")).toBe(true);
|
||||
},
|
||||
);
|
||||
|
||||
it("gives a New workspace request with a changed launch target a new key even when the wire request matches", () => {
|
||||
const emptyRequest = {
|
||||
source: { kind: "directory" as const, path: "/repo", projectId: "prj_1" },
|
||||
};
|
||||
const chatKey = draftCreationKey("draft-1", {
|
||||
request: emptyRequest,
|
||||
launchTarget: { kind: "chat" },
|
||||
});
|
||||
const terminalKey = draftCreationKey("draft-1", {
|
||||
request: emptyRequest,
|
||||
launchTarget: { kind: "terminal", profileId: "shell" },
|
||||
});
|
||||
expect(terminalKey).not.toBe(chatKey);
|
||||
expect(terminalKey.startsWith("draft-1:")).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { ComposerOptionControls } from "@/agent-controls/option-controls";
|
||||
import { useCallback, useEffect, useMemo, useRef } from "react";
|
||||
import type { JsonValue } from "@getpaseo/protocol/agent-types";
|
||||
import { Keyboard, StyleSheet as RNStyleSheet, Text, View } from "react-native";
|
||||
import { Keyboard, StyleSheet as RNStyleSheet, View } from "react-native";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { CHAT_COLUMN_RAIL_DATASET } from "@/chat-rail";
|
||||
@@ -536,16 +536,6 @@ export function WorkspaceDraftComposer({
|
||||
);
|
||||
return (
|
||||
<View style={animatedStaticStyles.inputAreaWrapper} onLayout={onInputAreaLayout}>
|
||||
{formErrorMessage ? (
|
||||
<View
|
||||
style={styles.formErrorRow}
|
||||
dataSet={isComposerFullscreen ? undefined : CHAT_COLUMN_RAIL_DATASET}
|
||||
>
|
||||
<View style={styles.formError}>
|
||||
<Text style={styles.errorText}>{formErrorMessage}</Text>
|
||||
</View>
|
||||
</View>
|
||||
) : null}
|
||||
{importPillPress && !isComposerFullscreen ? (
|
||||
<View style={styles.importPillRow} dataSet={CHAT_COLUMN_RAIL_DATASET}>
|
||||
<View style={styles.importPillContent}>
|
||||
@@ -577,6 +567,7 @@ export function WorkspaceDraftComposer({
|
||||
commandDraft={composerState.commandDraft}
|
||||
agentControls={composerAgentControls}
|
||||
isCompactLayout={isCompactComposerLayout}
|
||||
error={formErrorMessage || null}
|
||||
/>
|
||||
</View>
|
||||
);
|
||||
@@ -592,11 +583,6 @@ const animatedStaticStyles = RNStyleSheet.create({
|
||||
});
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
formErrorRow: {
|
||||
width: "100%",
|
||||
paddingHorizontal: theme.spacing[4],
|
||||
alignItems: "center",
|
||||
},
|
||||
importPillRow: {
|
||||
width: "100%",
|
||||
paddingHorizontal: theme.spacing[4],
|
||||
@@ -615,18 +601,4 @@ const styles = StyleSheet.create((theme) => ({
|
||||
maxWidth: theme.contentMaxWidth,
|
||||
flexDirection: "row",
|
||||
},
|
||||
formError: {
|
||||
width: "100%",
|
||||
maxWidth: theme.contentMaxWidth,
|
||||
marginBottom: theme.spacing[2],
|
||||
paddingHorizontal: theme.spacing[3],
|
||||
paddingVertical: theme.spacing[2],
|
||||
borderRadius: theme.borderRadius.md,
|
||||
backgroundColor: theme.colors.surface2,
|
||||
borderWidth: 1,
|
||||
borderColor: theme.colors.destructive,
|
||||
},
|
||||
errorText: {
|
||||
color: theme.colors.destructive,
|
||||
},
|
||||
}));
|
||||
|
||||
@@ -8,6 +8,7 @@ import { createStore, type StoreApi } from "zustand/vanilla";
|
||||
import { useStore } from "zustand";
|
||||
import { getHostRuntimeStore } from "@/runtime/host-runtime";
|
||||
import { LoadingSpinner } from "@/components/ui/loading-spinner";
|
||||
import { Alert } from "@/components/ui/alert";
|
||||
import {
|
||||
View,
|
||||
Pressable,
|
||||
@@ -146,6 +147,7 @@ import { RenderProfile } from "@/utils/render-profiler";
|
||||
import { AfterPaintPublication } from "@/composer/after-paint-publication";
|
||||
import { isWeb, isNative } from "@/constants/platform";
|
||||
import type { ForgeSearchItem } from "@getpaseo/protocol/messages";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import type {
|
||||
AttachmentMetadata,
|
||||
ComposerAttachment,
|
||||
@@ -294,6 +296,8 @@ function buildRealtimeVoiceButtonStyle(pressed: boolean, voiceButtonDisabled: bo
|
||||
);
|
||||
}
|
||||
|
||||
const EMPTY_METRICS: AgentMetric[] = [];
|
||||
|
||||
function buildAgentStateSelector(serverId: string, agentId: string) {
|
||||
return (state: ReturnType<typeof useSessionStore.getState>) => {
|
||||
const agent = state.sessions[serverId]?.agents?.get(agentId) ?? null;
|
||||
@@ -302,6 +306,7 @@ function buildAgentStateSelector(serverId: string, agentId: string) {
|
||||
contextWindowMaxTokens: agent?.lastUsage?.contextWindowMaxTokens ?? null,
|
||||
contextWindowUsedTokens: agent?.lastUsage?.contextWindowUsedTokens ?? null,
|
||||
totalCostUsd: agent?.lastUsage?.totalCostUsd ?? null,
|
||||
sessionMetrics: agent?.sessionMetrics ?? EMPTY_METRICS,
|
||||
model: agent?.model ?? null,
|
||||
};
|
||||
};
|
||||
@@ -1016,6 +1021,8 @@ interface ComposerProps {
|
||||
* `inputMode`.
|
||||
*/
|
||||
editingSession?: ComposerEditingSession;
|
||||
/** Caller-owned submission error rendered in the composer's shared error slot. */
|
||||
error?: string | null;
|
||||
}
|
||||
|
||||
const EMPTY_ARRAY: readonly QueuedMessage[] = [];
|
||||
@@ -1319,6 +1326,7 @@ function ComposerContentImpl({
|
||||
isCompactLayout: isCompactLayoutOverride,
|
||||
inputMode = "chat",
|
||||
editingSession: providedEditingSession,
|
||||
error: externalError,
|
||||
readOnly = false,
|
||||
submitLabel,
|
||||
placeholder,
|
||||
@@ -2221,6 +2229,7 @@ function ComposerContentImpl({
|
||||
maxTokens={agentState.contextWindowMaxTokens}
|
||||
usedTokens={agentState.contextWindowUsedTokens}
|
||||
totalCostUsd={agentState.totalCostUsd}
|
||||
sessionMetrics={agentState.sessionMetrics}
|
||||
toolbarRing={TOOLBAR_RINGS[controlSizing]}
|
||||
/>
|
||||
</View>
|
||||
@@ -2232,6 +2241,7 @@ function ComposerContentImpl({
|
||||
agentState.contextWindowMaxTokens,
|
||||
agentState.contextWindowUsedTokens,
|
||||
agentState.totalCostUsd,
|
||||
agentState.sessionMetrics,
|
||||
controlSizing,
|
||||
],
|
||||
);
|
||||
@@ -2544,14 +2554,13 @@ function ComposerContentImpl({
|
||||
// Focusing the composer on a touch screen raises the on-screen keyboard over the conversation.
|
||||
const messageInputAutoFocus = autoFocus && isDesktopWebBreakpoint && hasFinePointer;
|
||||
const submitLoadingPressHandler = isAgentRunning ? handleCancelAgent : undefined;
|
||||
const displayError = externalError || sendError;
|
||||
const sendErrorNode = useMemo(
|
||||
() =>
|
||||
sendError ? (
|
||||
<Text accessibilityRole="alert" style={styles.sendErrorText}>
|
||||
{sendError}
|
||||
</Text>
|
||||
displayError ? (
|
||||
<Alert variant="error" size="sm" description={displayError} testID="composer-error" />
|
||||
) : null,
|
||||
[sendError],
|
||||
[displayError],
|
||||
);
|
||||
const githubEmptyText = githubSearchResultsQuery.isFetching
|
||||
? t("composer.github.searching")
|
||||
@@ -2837,10 +2846,6 @@ const styles = StyleSheet.create((theme: Theme) => ({
|
||||
queueSendButton: {
|
||||
backgroundColor: theme.colors.accent,
|
||||
},
|
||||
sendErrorText: {
|
||||
color: theme.colors.palette.red[500],
|
||||
fontSize: theme.fontSize.base,
|
||||
},
|
||||
})) as unknown as Record<string, object>;
|
||||
|
||||
const ThemedAttachmentSpinner = withUnistyles(LoadingSpinner);
|
||||
|
||||
@@ -637,7 +637,7 @@ it("stores and expands identical content once across directory associations", as
|
||||
});
|
||||
|
||||
it("coalesces missing bodies and keeps a newer pushed association when an older pull completes", async () => {
|
||||
const { QueryClient } = await import("@tanstack/react-query");
|
||||
const { QueryClient, QueryObserver } = await import("@tanstack/react-query");
|
||||
const { applyProvidersSnapshotUpdate } = await import("./push-router");
|
||||
const { fetchProvidersSnapshot, providersSnapshotQueryKey } =
|
||||
await import("./providers-snapshot");
|
||||
@@ -653,6 +653,16 @@ it("coalesces missing bodies and keeps a newer pushed association when an older
|
||||
fetchedAt: { pi: fetchedAt },
|
||||
requestId: hash,
|
||||
});
|
||||
// Announcements only download for directories a screen is showing.
|
||||
const unsubscribers = ["/a", "/b", "/c"].map((cwd) => {
|
||||
const queryKey = providersSnapshotQueryKey(serverId, cwd);
|
||||
queryClient.setQueryData(queryKey, snapshot("seed"));
|
||||
return new QueryObserver(queryClient, {
|
||||
queryKey,
|
||||
queryFn: async () => snapshot("seed"),
|
||||
staleTime: Infinity,
|
||||
}).subscribe(() => {});
|
||||
});
|
||||
let transfers = 0;
|
||||
const client = {
|
||||
async getProvidersSnapshot() {
|
||||
@@ -776,6 +786,7 @@ it("coalesces missing bodies and keeps a newer pushed association when an older
|
||||
entries: [{ models: [{ id: "shared" }] }],
|
||||
});
|
||||
} finally {
|
||||
for (const unsubscribe of unsubscribers) unsubscribe();
|
||||
queryClient.clear();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { createRequire } from "node:module";
|
||||
import { QueryClient, CancelledError } from "@tanstack/react-query";
|
||||
import { QueryClient, CancelledError, QueryObserver } from "@tanstack/react-query";
|
||||
import type { ProviderSnapshotEntry } from "@getpaseo/protocol/agent-types";
|
||||
import type { GetProvidersSnapshotResponseMessage } from "@getpaseo/protocol/messages";
|
||||
import { compactProviderSnapshot } from "@getpaseo/protocol/provider-snapshot-codec";
|
||||
@@ -307,6 +307,14 @@ describe("provider snapshot publication identity", () => {
|
||||
snapshotHash: "next-hash",
|
||||
compactSnapshot: compactProviderSnapshot([{ ...entries[0]!, label: "Updated provider" }]),
|
||||
};
|
||||
// Announcements only publish into a directory a screen is showing.
|
||||
const shownKey = providersSnapshotQueryKey(serverId, snapshot.cwd);
|
||||
queryClient.setQueryData(shownKey, snapshot);
|
||||
const unsubscribe = new QueryObserver(queryClient, {
|
||||
queryKey: shownKey,
|
||||
queryFn: async () => snapshot,
|
||||
staleTime: Infinity,
|
||||
}).subscribe(() => {});
|
||||
try {
|
||||
for (const body of [snapshot, changed, changed]) {
|
||||
await applyProvidersSnapshotUpdate({
|
||||
@@ -325,6 +333,7 @@ describe("provider snapshot publication identity", () => {
|
||||
expect(published.entries[0]!.models).toBe(canonical.entries[0]!.models);
|
||||
}
|
||||
} finally {
|
||||
unsubscribe();
|
||||
queryClient.clear();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -8,8 +8,12 @@ import { checkoutDiffQueryKey } from "@/git/query-keys";
|
||||
import { buildTerminalsQueryKey } from "@/screens/workspace/terminals/state";
|
||||
import { daemonConfigQueryKey } from "@/data/daemon-config";
|
||||
import { daemonPairingOfferQueryKey } from "@/data/daemon-pairing";
|
||||
import { providersSnapshotQueryKey } from "@/data/providers-snapshot";
|
||||
import { providersSnapshotQuery, providersSnapshotQueryKey } from "@/data/providers-snapshot";
|
||||
import { replicaQueryOptions } from "@/data/query";
|
||||
import { createProviderSnapshotCache } from "@/data/provider-snapshot-cache";
|
||||
import { draftAgentCommandsQueryKey } from "@/agent-commands/cache";
|
||||
import {
|
||||
applyProvidersSnapshotUpdate,
|
||||
checkoutDiffPushRoute,
|
||||
invalidateServerDataQueriesAfterReconnect,
|
||||
mountServerDataPushRouter,
|
||||
@@ -594,6 +598,13 @@ describe("server data push router", () => {
|
||||
const serverId = "server-1";
|
||||
const pairingOfferKey = daemonPairingOfferQueryKey(serverId);
|
||||
queryClient.setQueryData(pairingOfferKey, { relayEnabled: true, url: "https://pairing" });
|
||||
const snapshotKey = providersSnapshotQueryKey(serverId);
|
||||
queryClient.setQueryData(snapshotKey, { entries: [], generatedAt: "seed", requestId: "seed" });
|
||||
const unsubscribeSnapshot = new QueryObserver(queryClient, {
|
||||
queryKey: snapshotKey,
|
||||
queryFn: async () => ({ entries: [], generatedAt: "seed", requestId: "seed" }),
|
||||
staleTime: Infinity,
|
||||
}).subscribe(() => undefined);
|
||||
const unmount = mountServerDataPushRouter({ client: fake.client, queryClient, serverId });
|
||||
|
||||
fake.emit(providerUpdate("2026-01-01T00:00:00.000Z"));
|
||||
@@ -622,6 +633,7 @@ describe("server data push router", () => {
|
||||
generatedAt: "2026-01-01T00:00:00.000Z",
|
||||
requestId: "providers_snapshot_update",
|
||||
});
|
||||
unsubscribeSnapshot();
|
||||
});
|
||||
|
||||
it.each(["base", "all"] as const)("routes %s diff snapshots and updates", (mode) => {
|
||||
@@ -982,3 +994,158 @@ describe("server data push router", () => {
|
||||
expect(queryClient.getQueryState(otherProviderKey)?.isInvalidated).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("applyProvidersSnapshotUpdate by observation", () => {
|
||||
const serverId = "observed-host";
|
||||
const cwd = "/repo";
|
||||
|
||||
function createStorage() {
|
||||
const values = new Map<string, string>();
|
||||
return {
|
||||
values,
|
||||
async getItem(key: string) {
|
||||
return values.get(key) ?? null;
|
||||
},
|
||||
async setItem(key: string, value: string) {
|
||||
values.set(key, value);
|
||||
},
|
||||
async removeItem(key: string) {
|
||||
values.delete(key);
|
||||
},
|
||||
async getAllKeys() {
|
||||
return [...values.keys()];
|
||||
},
|
||||
async multiGet(keys: readonly string[]) {
|
||||
return keys.map((key) => [key, values.get(key) ?? null] as const);
|
||||
},
|
||||
async multiRemove(keys: readonly string[]) {
|
||||
for (const key of keys) values.delete(key);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function snapshotFor(label: string) {
|
||||
return {
|
||||
requestId: label,
|
||||
cwd,
|
||||
entries: [
|
||||
{
|
||||
provider: "codex",
|
||||
status: "ready",
|
||||
enabled: true,
|
||||
label,
|
||||
models: [{ provider: "codex", id: label, label, thinkingOptions: [] }],
|
||||
},
|
||||
],
|
||||
generatedAt: "2026-01-01T00:00:00.000Z",
|
||||
} as never;
|
||||
}
|
||||
|
||||
function setup() {
|
||||
const storage = createStorage();
|
||||
const cache = createProviderSnapshotCache(storage);
|
||||
const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });
|
||||
const calls: unknown[] = [];
|
||||
let current = "v1";
|
||||
const client = {
|
||||
async getProvidersSnapshot(options?: unknown) {
|
||||
calls.push(options);
|
||||
return snapshotFor(current);
|
||||
},
|
||||
};
|
||||
const observe = () =>
|
||||
new QueryObserver(
|
||||
queryClient,
|
||||
replicaQueryOptions(
|
||||
providersSnapshotQuery({ serverId, cwd, client: () => client, queryClient, cache }),
|
||||
),
|
||||
);
|
||||
const announce = () =>
|
||||
applyProvidersSnapshotUpdate({
|
||||
serverId,
|
||||
queryClient,
|
||||
cache,
|
||||
client,
|
||||
message: {
|
||||
type: "providers_snapshot_update",
|
||||
payload: {
|
||||
cwd,
|
||||
entries: [],
|
||||
snapshotHash: "hash-v2",
|
||||
generatedAt: "2026-01-01T00:00:01Z",
|
||||
},
|
||||
} as never,
|
||||
});
|
||||
return {
|
||||
queryClient,
|
||||
calls,
|
||||
storage,
|
||||
observe,
|
||||
announce,
|
||||
setCurrent: (value: string) => {
|
||||
current = value;
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
it("does nothing for a directory this client never opened", async () => {
|
||||
const { queryClient, calls, storage, announce } = setup();
|
||||
|
||||
await announce();
|
||||
|
||||
expect(calls).toEqual([]);
|
||||
expect(
|
||||
queryClient.getQueryCache().find({ queryKey: providersSnapshotQueryKey(serverId, cwd) }),
|
||||
).toBeUndefined();
|
||||
expect(storage.values.size).toBe(0);
|
||||
queryClient.clear();
|
||||
});
|
||||
|
||||
it("marks an unobserved cached directory stale without downloading and refetches it on mount", async () => {
|
||||
const { queryClient, calls, observe, announce, setCurrent } = setup();
|
||||
const queryKey = providersSnapshotQueryKey(serverId, cwd);
|
||||
const commandsKey = draftAgentCommandsQueryKey({
|
||||
serverId,
|
||||
draftConfig: { provider: "codex", cwd },
|
||||
});
|
||||
queryClient.setQueryData(queryKey, snapshotFor("v1"));
|
||||
queryClient.setQueryData(commandsKey, [{ name: "review" }]);
|
||||
setCurrent("v2");
|
||||
|
||||
await announce();
|
||||
|
||||
expect(calls).toEqual([]);
|
||||
expect(queryClient.getQueryState(queryKey)?.isInvalidated).toBe(true);
|
||||
expect(queryClient.getQueryState(commandsKey)?.isInvalidated).toBe(true);
|
||||
|
||||
const observer = observe();
|
||||
const unsubscribe = observer.subscribe(() => {});
|
||||
await queryClient.getQueryCache().find({ queryKey })?.promise;
|
||||
|
||||
expect(calls).toHaveLength(1);
|
||||
expect(
|
||||
(queryClient.getQueryData(queryKey) as { entries: Array<{ label: string }> }).entries[0]!
|
||||
.label,
|
||||
).toBe("v2");
|
||||
unsubscribe();
|
||||
queryClient.clear();
|
||||
});
|
||||
|
||||
it("keeps the reference-aware fetch for an observed directory", async () => {
|
||||
const { queryClient, calls, observe, announce } = setup();
|
||||
const queryKey = providersSnapshotQueryKey(serverId, cwd);
|
||||
const observer = observe();
|
||||
const unsubscribe = observer.subscribe(() => {});
|
||||
await queryClient.getQueryCache().find({ queryKey })?.promise;
|
||||
expect(calls).toHaveLength(1);
|
||||
|
||||
await announce();
|
||||
|
||||
// The announced hash is not resident, so exactly one content transfer is fetched and
|
||||
// published to the observed query.
|
||||
expect(calls).toHaveLength(2);
|
||||
expect(queryClient.getQueryState(queryKey)?.isInvalidated).toBe(false);
|
||||
unsubscribe();
|
||||
queryClient.clear();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -8,7 +8,10 @@ import type {
|
||||
MutableDaemonConfig,
|
||||
SessionOutboundMessage,
|
||||
} from "@getpaseo/protocol/messages";
|
||||
import { invalidateCommandsForProviderChange } from "@/agent-commands/cache";
|
||||
import {
|
||||
invalidateCommandsForDirectory,
|
||||
invalidateCommandsForProviderChange,
|
||||
} from "@/agent-commands/cache";
|
||||
import { shareCheckoutDiff } from "@/git/diff-sharing";
|
||||
import { orderCheckoutDiffFiles } from "@/git/diff-order";
|
||||
import { daemonConfigQueryKey } from "@/data/daemon-config";
|
||||
@@ -184,6 +187,20 @@ export async function applyProvidersSnapshotUpdate(input: {
|
||||
const snapshot = { ...input.message.payload, requestId: "providers_snapshot_update" };
|
||||
const cwd = normalizeProvidersSnapshotCwd(snapshot.cwd);
|
||||
const queryKey = providersSnapshotQueryKey(input.serverId, cwd);
|
||||
const cached = input.queryClient.getQueryCache().find({ queryKey, exact: true });
|
||||
// Only a screen showing this directory is worth a download. A cached but unobserved
|
||||
// directory refetches on its next mount; one this client never opened needs nothing.
|
||||
if (!cached) return;
|
||||
if (!cached.isActive()) {
|
||||
await input.queryClient.cancelQueries({ queryKey, exact: true });
|
||||
await input.queryClient.invalidateQueries({ queryKey, exact: true, refetchType: "none" });
|
||||
await invalidateCommandsForDirectory({
|
||||
queryClient: input.queryClient,
|
||||
serverId: input.serverId,
|
||||
cwd,
|
||||
});
|
||||
return;
|
||||
}
|
||||
const previous = input.queryClient.getQueryData<{ entries: ProviderSnapshotEntry[] }>(queryKey);
|
||||
let announcement: typeof snapshot | undefined = snapshot;
|
||||
void input.queryClient.cancelQueries({ queryKey, exact: true });
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
import { QueryClient, QueryObserver } from "@tanstack/react-query";
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { replicaQueryOptions } from "./query";
|
||||
|
||||
function setup() {
|
||||
const queryClient = new QueryClient();
|
||||
const queryKey = ["replica", "value"] as const;
|
||||
let fetches = 0;
|
||||
const options = replicaQueryOptions({
|
||||
queryKey,
|
||||
pushEvent: "value_update",
|
||||
queryFn: async () => {
|
||||
fetches++;
|
||||
return `fetch-${fetches}`;
|
||||
},
|
||||
});
|
||||
return { queryClient, queryKey, options, fetchCount: () => fetches };
|
||||
}
|
||||
|
||||
describe("replicaQueryOptions mount behavior", () => {
|
||||
it("does not refetch on mount while the cached value is not invalidated", async () => {
|
||||
const { queryClient, queryKey, options, fetchCount } = setup();
|
||||
queryClient.setQueryData(queryKey, "cached");
|
||||
|
||||
const observer = new QueryObserver(queryClient, options);
|
||||
const unsubscribe = observer.subscribe(() => {});
|
||||
await Promise.resolve();
|
||||
|
||||
expect(fetchCount()).toBe(0);
|
||||
expect(observer.getCurrentResult().data).toBe("cached");
|
||||
unsubscribe();
|
||||
queryClient.clear();
|
||||
});
|
||||
|
||||
it("refetches on mount when the cached value was invalidated while unobserved", async () => {
|
||||
const { queryClient, queryKey, options, fetchCount } = setup();
|
||||
queryClient.setQueryData(queryKey, "cached");
|
||||
await queryClient.invalidateQueries({ queryKey, refetchType: "none" });
|
||||
expect(fetchCount()).toBe(0);
|
||||
|
||||
const observer = new QueryObserver(queryClient, options);
|
||||
const unsubscribe = observer.subscribe(() => {});
|
||||
await queryClient.getQueryCache().find({ queryKey })?.promise;
|
||||
|
||||
expect(fetchCount()).toBe(1);
|
||||
expect(observer.getCurrentResult().data).toBe("fetch-1");
|
||||
unsubscribe();
|
||||
queryClient.clear();
|
||||
});
|
||||
});
|
||||
@@ -86,7 +86,9 @@ export function replicaQueryOptions<
|
||||
},
|
||||
},
|
||||
queryFn: options.queryFn ?? skipToken,
|
||||
refetchOnMount: false,
|
||||
// Pushes keep a replica fresh; a mount only refetches what an invalidation marked stale
|
||||
// while nothing observed it.
|
||||
refetchOnMount: (query) => query.state.isInvalidated,
|
||||
refetchOnReconnect: false,
|
||||
refetchOnWindowFocus: false,
|
||||
staleTime: Infinity,
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
import { useCallback } from "react";
|
||||
import {
|
||||
useActiveWorkspaceSelection,
|
||||
type ActiveWorkspaceSelection,
|
||||
} from "@/stores/navigation-active-workspace-store";
|
||||
import { getFocusedWorkspaceSelection } from "@/navigation/workspace-route-navigation";
|
||||
import { useSessionStore } from "@/stores/session-store";
|
||||
import { useWorkspaceFields } from "@/stores/session-store-hooks";
|
||||
import { resolveWorkspaceMapKeyByIdentity } from "@/utils/workspace-identity";
|
||||
import { redirectIfArchivingActiveWorkspace } from "@/utils/sidebar-workspace-archive-redirect";
|
||||
import { useWorkspaceArchive } from "@/workspace/use-workspace-archive";
|
||||
import { isWorkspaceListed, type WorkspaceArchiveTarget } from "@/workspace/workspace-archive";
|
||||
|
||||
// The redirect compares descriptor ids; the route's id is not guaranteed to equal one (see
|
||||
// use-global-workspace-pin-action.ts), so resolve it through the session store.
|
||||
function readActiveDescriptorSelection(): ActiveWorkspaceSelection | null {
|
||||
const selection = getFocusedWorkspaceSelection();
|
||||
if (!selection) {
|
||||
return null;
|
||||
}
|
||||
const workspaces = useSessionStore.getState().sessions[selection.serverId]?.workspaces;
|
||||
const key = resolveWorkspaceMapKeyByIdentity({
|
||||
workspaces,
|
||||
workspaceId: selection.workspaceId,
|
||||
});
|
||||
const descriptor = key ? workspaces?.get(key) : undefined;
|
||||
return descriptor ? { serverId: selection.serverId, workspaceId: descriptor.id } : null;
|
||||
}
|
||||
|
||||
export interface ActiveWorkspaceArchive {
|
||||
/** False when no workspace is routed, or the routed one is already archiving. */
|
||||
canArchive: boolean;
|
||||
/** Starts the archive for the routed workspace. Returns false when nothing was started. */
|
||||
archive: () => boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Archives the workspace the route points at. Keyed on the route selection rather than a rendered
|
||||
* row, so it works from the keyboard shortcut and from the compact header menu alike.
|
||||
*/
|
||||
export function useActiveWorkspaceArchive(): ActiveWorkspaceArchive {
|
||||
const selection = useActiveWorkspaceSelection();
|
||||
const serverId = selection?.serverId ?? null;
|
||||
const routeWorkspaceId = selection?.workspaceId ?? null;
|
||||
// `id` is the descriptor id, not the route id; see use-global-workspace-pin-action.ts.
|
||||
const fields = useWorkspaceFields(serverId, routeWorkspaceId, (workspace) => ({
|
||||
id: workspace.id,
|
||||
workspaceKind: workspace.workspaceKind,
|
||||
workspaceDirectory: workspace.workspaceDirectory,
|
||||
name: workspace.name,
|
||||
archivingAt: workspace.archivingAt,
|
||||
diffStat: workspace.diffStat,
|
||||
}));
|
||||
|
||||
// The archive starts after the host answers and you confirm, by which time the header that began
|
||||
// it may be gone (a resize swaps it, and on native switching workspaces unmounts it), and you may
|
||||
// have left workspace routes. So the redirect reads the focused route now, not this render's.
|
||||
const redirectAfterArchive = useCallback((workspace: WorkspaceArchiveTarget) => {
|
||||
redirectIfArchivingActiveWorkspace({
|
||||
...workspace,
|
||||
activeWorkspaceSelection: readActiveDescriptorSelection(),
|
||||
});
|
||||
}, []);
|
||||
|
||||
const archiveController = useWorkspaceArchive({
|
||||
serverId: serverId ?? "",
|
||||
workspaceId: fields?.id ?? "",
|
||||
workspaceKind: fields?.workspaceKind ?? "directory",
|
||||
workspaceDirectory: fields?.workspaceDirectory ?? "",
|
||||
name: fields?.name ?? "",
|
||||
diffStat: fields?.diffStat,
|
||||
onArchiveStarted: redirectAfterArchive,
|
||||
});
|
||||
|
||||
const canArchive = fields !== null && fields.archivingAt === null;
|
||||
|
||||
const archive = useCallback(() => {
|
||||
if (!canArchive || !serverId) {
|
||||
return false;
|
||||
}
|
||||
// Archiving hides its target immediately. Read the store in case this runs again before
|
||||
// React renders that update.
|
||||
if (!isWorkspaceListed({ serverId, workspaceId: fields.id })) {
|
||||
return false;
|
||||
}
|
||||
archiveController.archive();
|
||||
return true;
|
||||
}, [archiveController, canArchive, fields, serverId]);
|
||||
|
||||
return { canArchive, archive };
|
||||
}
|
||||
@@ -110,6 +110,10 @@ function resolveAgentAutocompleteSnapshot(input: {
|
||||
};
|
||||
}
|
||||
|
||||
function isSameSlashCommand(a: SlashCommandRange | null, b: SlashCommandRange | null): boolean {
|
||||
return a?.start === b?.start && a?.query === b?.query;
|
||||
}
|
||||
|
||||
interface DirectorySuggestionEntry {
|
||||
path: string;
|
||||
kind: "file" | "directory";
|
||||
@@ -746,9 +750,25 @@ export function useAgentAutocomplete(input: UseAgentAutocompleteInput): AgentAut
|
||||
);
|
||||
|
||||
const selectOptionFromKeyPress = useCallback(
|
||||
(option: AutocompleteOption, event?: AgentAutocompleteKeyPressEvent) =>
|
||||
onSelectOption(option, event?.input),
|
||||
[onSelectOption],
|
||||
(option: AutocompleteOption, event?: AgentAutocompleteKeyPressEvent) => {
|
||||
// The cursor reaches the menu after paint, so a key can land while the options still
|
||||
// belong to an older query. Never pick from that list. A click picks what the user sees.
|
||||
if (
|
||||
mode === "command" &&
|
||||
event &&
|
||||
!isSameSlashCommand(
|
||||
findActiveSlashCommand({
|
||||
text: event.input.text,
|
||||
cursorIndex: event.input.selection.start,
|
||||
}),
|
||||
activeSlashCommand,
|
||||
)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
onSelectOption(option, event?.input);
|
||||
},
|
||||
[activeSlashCommand, mode, onSelectOption],
|
||||
);
|
||||
|
||||
const { selectedIndex, onKeyPress } = useAutocomplete({
|
||||
|
||||
@@ -1,11 +1,6 @@
|
||||
import { useCallback } from "react";
|
||||
import { useActiveWorkspaceArchive } from "@/hooks/use-active-workspace-archive";
|
||||
import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
|
||||
import type { KeyboardActionId } from "@/keyboard/keyboard-action-dispatcher";
|
||||
import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
|
||||
import { useWorkspaceFields } from "@/stores/session-store-hooks";
|
||||
import { redirectIfArchivingActiveWorkspace } from "@/utils/sidebar-workspace-archive-redirect";
|
||||
import { useWorkspaceArchive } from "@/workspace/use-workspace-archive";
|
||||
import { isWorkspaceListed, type WorkspaceArchiveTarget } from "@/workspace/workspace-archive";
|
||||
|
||||
const WORKSPACE_ARCHIVE_ACTIONS: readonly KeyboardActionId[] = ["workspace.archive"];
|
||||
|
||||
@@ -14,64 +9,13 @@ const WORKSPACE_ARCHIVE_ACTIONS: readonly KeyboardActionId[] = ["workspace.archi
|
||||
// the pin shortcut (see use-global-workspace-pin-action.ts), it is one registration keyed on the
|
||||
// active route selection.
|
||||
export function useGlobalWorkspaceArchiveAction() {
|
||||
const selection = useActiveWorkspaceSelection();
|
||||
const serverId = selection?.serverId ?? null;
|
||||
const routeWorkspaceId = selection?.workspaceId ?? null;
|
||||
// `id` is the descriptor id, not the route id; see use-global-workspace-pin-action.ts.
|
||||
const fields = useWorkspaceFields(serverId, routeWorkspaceId, (workspace) => ({
|
||||
id: workspace.id,
|
||||
workspaceKind: workspace.workspaceKind,
|
||||
workspaceDirectory: workspace.workspaceDirectory,
|
||||
name: workspace.name,
|
||||
archivingAt: workspace.archivingAt,
|
||||
diffStat: workspace.diffStat,
|
||||
}));
|
||||
|
||||
// useWorkspaceArchive calls the latest render's callback, so `activeWorkspaceId` is whatever is
|
||||
// routed when the archive starts, after any confirmation. It is the descriptor id, which is what
|
||||
// the redirect compares against.
|
||||
const activeWorkspaceId = fields?.id ?? null;
|
||||
const redirectAfterArchive = useCallback(
|
||||
(workspace: WorkspaceArchiveTarget) => {
|
||||
redirectIfArchivingActiveWorkspace({
|
||||
...workspace,
|
||||
activeWorkspaceSelection:
|
||||
serverId && activeWorkspaceId ? { serverId, workspaceId: activeWorkspaceId } : null,
|
||||
});
|
||||
},
|
||||
[activeWorkspaceId, serverId],
|
||||
);
|
||||
|
||||
const archiveController = useWorkspaceArchive({
|
||||
serverId: serverId ?? "",
|
||||
workspaceId: fields?.id ?? "",
|
||||
workspaceKind: fields?.workspaceKind ?? "directory",
|
||||
workspaceDirectory: fields?.workspaceDirectory ?? "",
|
||||
name: fields?.name ?? "",
|
||||
diffStat: fields?.diffStat,
|
||||
onArchiveStarted: redirectAfterArchive,
|
||||
});
|
||||
|
||||
const canArchive = fields !== null && fields.archivingAt === null;
|
||||
|
||||
const handle = useCallback(() => {
|
||||
if (!canArchive || !serverId) {
|
||||
return false;
|
||||
}
|
||||
// Archiving hides its target immediately. Read the store in case the shortcut
|
||||
// runs again before React renders that update.
|
||||
if (!isWorkspaceListed({ serverId, workspaceId: fields.id })) {
|
||||
return false;
|
||||
}
|
||||
archiveController.archive();
|
||||
return true;
|
||||
}, [archiveController, canArchive, fields, serverId]);
|
||||
const { canArchive, archive } = useActiveWorkspaceArchive();
|
||||
|
||||
useKeyboardActionHandler({
|
||||
handlerId: "workspace-archive-global",
|
||||
actions: WORKSPACE_ARCHIVE_ACTIONS,
|
||||
enabled: canArchive,
|
||||
priority: 0,
|
||||
handle,
|
||||
handle: archive,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -352,6 +352,19 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
queryClient = new QueryClient();
|
||||
});
|
||||
|
||||
// Announcements only download for directories a screen is showing, so these tests mount one.
|
||||
function showSnapshot(cwd?: string) {
|
||||
const queryKey = providersSnapshotQueryKey(serverId, cwd);
|
||||
if (queryClient.getQueryData(queryKey) === undefined) {
|
||||
queryClient.setQueryData(queryKey, providersSnapshot([]));
|
||||
}
|
||||
return new QueryObserver(queryClient, {
|
||||
queryKey,
|
||||
queryFn: async () => providersSnapshot([]),
|
||||
staleTime: Infinity,
|
||||
}).subscribe(() => {});
|
||||
}
|
||||
|
||||
function updateMessage(entries: ProviderSnapshotEntry[], cwd?: string): ProvidersSnapshotUpdate {
|
||||
return {
|
||||
type: "providers_snapshot_update",
|
||||
@@ -364,6 +377,7 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
}
|
||||
|
||||
it("refreshes active commands only when their provider changes after discovery", async () => {
|
||||
showSnapshot("/repo-a");
|
||||
const key = sessionAgentCommandsQueryKey({ serverId, agentId: "agent-1" });
|
||||
let requests = 0;
|
||||
const observer = new QueryObserver(queryClient, {
|
||||
@@ -447,6 +461,7 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
});
|
||||
|
||||
it("retries a failed command discovery when its provider first becomes ready", async () => {
|
||||
showSnapshot("/repo-a");
|
||||
const key = sessionAgentCommandsQueryKey({ serverId, agentId: "agent-1" });
|
||||
let ready = false;
|
||||
let requests = 0;
|
||||
@@ -493,6 +508,7 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
providersSnapshotQueryKey(serverId, "/repo-a"),
|
||||
providersSnapshot([codexEntry("ready", [readyCodexModel])]),
|
||||
);
|
||||
showSnapshot("/repo-a");
|
||||
const send = (label: string) =>
|
||||
applyProvidersSnapshotUpdate({
|
||||
client: createClient(),
|
||||
@@ -511,6 +527,7 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
});
|
||||
|
||||
it("routes updates to the home query cache when the message carries no cwd", async () => {
|
||||
showSnapshot();
|
||||
await applyProvidersSnapshotUpdate({
|
||||
client: createClient(),
|
||||
serverId,
|
||||
@@ -527,6 +544,7 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
|
||||
it("routes workspace updates to the matching scope without touching siblings", async () => {
|
||||
queryClient.setQueryData(providersSnapshotQueryKey(serverId, "/repo-b"), providersSnapshot([]));
|
||||
showSnapshot("/repo-a");
|
||||
|
||||
await applyProvidersSnapshotUpdate({
|
||||
client: createClient(),
|
||||
@@ -546,6 +564,7 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
});
|
||||
|
||||
it("persists compact push updates", async () => {
|
||||
showSnapshot("/repo-a");
|
||||
const entries = [codexEntry("ready", [readyCodexModel])];
|
||||
const compactSnapshot = compactProviderSnapshot(entries);
|
||||
const cache = createCache();
|
||||
@@ -579,6 +598,7 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
providersSnapshotQueryKey(serverId, workspaceCwd),
|
||||
providersSnapshot([codexEntry("loading")]),
|
||||
);
|
||||
showSnapshot(workspaceCwd);
|
||||
|
||||
await applyProvidersSnapshotUpdate({
|
||||
client: createClient(),
|
||||
@@ -606,6 +626,7 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
providersSnapshotQueryKey(serverId, "/repo-a"),
|
||||
providersSnapshot([codexEntry("ready")]),
|
||||
);
|
||||
showSnapshot("/repo-a");
|
||||
|
||||
await applyProvidersSnapshotUpdate({
|
||||
client: createClient(),
|
||||
|
||||
@@ -331,7 +331,7 @@ describe("loadAppSettingsFromStorage", () => {
|
||||
pins: null,
|
||||
serverId: null,
|
||||
cardOrder: [],
|
||||
cardsOff: [],
|
||||
cardVisibility: {},
|
||||
});
|
||||
|
||||
const deps = makeDeps({
|
||||
@@ -357,7 +357,7 @@ describe("loadAppSettingsFromStorage", () => {
|
||||
],
|
||||
serverId: "server",
|
||||
cardOrder: [],
|
||||
cardsOff: [],
|
||||
cardVisibility: {},
|
||||
});
|
||||
});
|
||||
|
||||
@@ -374,7 +374,7 @@ describe("loadAppSettingsFromStorage", () => {
|
||||
pins: [],
|
||||
serverId: "server",
|
||||
cardOrder: [],
|
||||
cardsOff: [],
|
||||
cardVisibility: {},
|
||||
});
|
||||
});
|
||||
|
||||
@@ -396,7 +396,7 @@ describe("loadAppSettingsFromStorage", () => {
|
||||
pins: [{ sourceId: "claude", windowId: "weekly" }],
|
||||
serverId: null,
|
||||
cardOrder: [],
|
||||
cardsOff: [],
|
||||
cardVisibility: {},
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -349,6 +349,7 @@ export const ar: TranslationResources = {
|
||||
copyTurn: "نسخ بدوره",
|
||||
copyMessage: "انسخ الرسالة",
|
||||
forkMenu: "تفريع الرسالة",
|
||||
turnStats: "إحصاءات الدور",
|
||||
forkInNewTab: "تفريع في تبويب جديد",
|
||||
forkInNewWorkspace: "تفريع في مساحة عمل جديدة",
|
||||
forkUnavailable: "حدّث المضيف لاستخدام هذا.",
|
||||
@@ -2264,7 +2265,11 @@ export const ar: TranslationResources = {
|
||||
title: "استخدام الخطة",
|
||||
refresh: "تحديث",
|
||||
reorderCard: "إعادة ترتيب {{source}}",
|
||||
showCard: "إظهار {{source}}",
|
||||
sources: "المصادر",
|
||||
sourcesCount: "{{shown}} من {{total}}",
|
||||
providerInactive: "المزود غير نشط",
|
||||
allSourcesHidden: "لا توجد مصادر استخدام معروضة",
|
||||
chooseSources: "اختيار المصادر",
|
||||
refreshAll: "تحديث الكل",
|
||||
refreshing: "جارٍ التحديث...",
|
||||
loading: "جارٍ تحميل بيانات الاستخدام...",
|
||||
@@ -3113,6 +3118,7 @@ export const ar: TranslationResources = {
|
||||
status: "حالة المزود",
|
||||
checked: "تم الفحص {{time}}",
|
||||
diagnosticReport: "تقرير التشخيص",
|
||||
docs: "الوثائق",
|
||||
dangerZone: "منطقة الخطر",
|
||||
removeHint: "يحذف هذا المزود من config.json",
|
||||
},
|
||||
@@ -3158,7 +3164,7 @@ export const ar: TranslationResources = {
|
||||
noSearchMatches: "لا توجد نماذج تطابق بحثك",
|
||||
noneDetected: "لم يتم اكتشاف أي نماذج",
|
||||
noCustom: "لا توجد نماذج مخصصة",
|
||||
discovered: "اكتشف",
|
||||
title: "النماذج",
|
||||
custom: "نماذج مخصصة",
|
||||
updated: "تم تحديث{{time}}",
|
||||
},
|
||||
|
||||
@@ -348,6 +348,7 @@ export const en = {
|
||||
copyTurn: "Copy turn",
|
||||
copyMessage: "Copy message",
|
||||
forkMenu: "Fork chat from here",
|
||||
turnStats: "Turn stats",
|
||||
forkInNewTab: "Fork in a new tab",
|
||||
forkInNewWorkspace: "Fork in a new workspace",
|
||||
forkUnavailable: "Update the host to use this.",
|
||||
@@ -2292,7 +2293,11 @@ export const en = {
|
||||
title: "Plan usage",
|
||||
refresh: "Refresh",
|
||||
reorderCard: "Reorder {{source}}",
|
||||
showCard: "Show {{source}}",
|
||||
sources: "Sources",
|
||||
sourcesCount: "{{shown}} of {{total}}",
|
||||
providerInactive: "Provider inactive",
|
||||
allSourcesHidden: "No usage sources shown",
|
||||
chooseSources: "Choose sources",
|
||||
refreshAll: "Refresh all",
|
||||
refreshing: "Refreshing...",
|
||||
loading: "Loading usage...",
|
||||
@@ -3211,6 +3216,7 @@ export const en = {
|
||||
status: "Provider status",
|
||||
checked: "Checked {{time}}",
|
||||
diagnosticReport: "Diagnostic report",
|
||||
docs: "Docs",
|
||||
dangerZone: "Danger zone",
|
||||
removeHint: "Deletes this provider from config.json",
|
||||
},
|
||||
@@ -3256,7 +3262,7 @@ export const en = {
|
||||
noSearchMatches: "No models match your search",
|
||||
noneDetected: "No models detected",
|
||||
noCustom: "No custom models",
|
||||
discovered: "Discovered",
|
||||
title: "Models",
|
||||
custom: "Custom models",
|
||||
updated: "Updated {{time}}",
|
||||
},
|
||||
|
||||
@@ -354,6 +354,7 @@ export const es: TranslationResources = {
|
||||
copyTurn: "Copiar turno",
|
||||
copyMessage: "Copiar mensaje",
|
||||
forkMenu: "Bifurcar mensaje",
|
||||
turnStats: "Estadísticas del turno",
|
||||
forkInNewTab: "Bifurcar en una pestaña nueva",
|
||||
forkInNewWorkspace: "Bifurcar en un espacio de trabajo nuevo",
|
||||
forkUnavailable: "Actualiza el host para usar esto.",
|
||||
@@ -2313,7 +2314,11 @@ export const es: TranslationResources = {
|
||||
title: "Uso del plan",
|
||||
refresh: "Actualizar",
|
||||
reorderCard: "Reordenar {{source}}",
|
||||
showCard: "Mostrar {{source}}",
|
||||
sources: "Fuentes",
|
||||
sourcesCount: "{{shown}} de {{total}}",
|
||||
providerInactive: "Proveedor inactivo",
|
||||
allSourcesHidden: "No hay fuentes de uso visibles",
|
||||
chooseSources: "Elegir fuentes",
|
||||
refreshAll: "Actualizar todo",
|
||||
refreshing: "Actualizando...",
|
||||
loading: "Cargando uso...",
|
||||
@@ -3141,6 +3146,7 @@ export const es: TranslationResources = {
|
||||
status: "Estado del proveedor",
|
||||
checked: "Comprobado {{time}}",
|
||||
diagnosticReport: "Informe de diagnóstico",
|
||||
docs: "Documentación",
|
||||
dangerZone: "Zona de peligro",
|
||||
removeHint: "Elimina este proveedor de config.json",
|
||||
},
|
||||
@@ -3186,7 +3192,7 @@ export const es: TranslationResources = {
|
||||
noSearchMatches: "Ningún modelo coincide con tu búsqueda",
|
||||
noneDetected: "No se detectaron modelos",
|
||||
noCustom: "No hay modelos personalizados",
|
||||
discovered: "descubierto",
|
||||
title: "Modelos",
|
||||
custom: "Modelos personalizados",
|
||||
updated: "{{time}}actualizado",
|
||||
},
|
||||
|
||||
@@ -354,6 +354,7 @@ export const fr: TranslationResources = {
|
||||
copyTurn: "Copier l’échange",
|
||||
copyMessage: "Copier le message",
|
||||
forkMenu: "Forker la conversation à partir d’ici",
|
||||
turnStats: "Statistiques de l’échange",
|
||||
forkInNewTab: "Forker dans un nouvel onglet",
|
||||
forkInNewWorkspace: "Forker dans un nouvel espace de travail",
|
||||
forkUnavailable: "Mettez à jour l’hôte pour utiliser cette fonction.",
|
||||
@@ -2314,7 +2315,11 @@ export const fr: TranslationResources = {
|
||||
title: "Utilisation du forfait",
|
||||
refresh: "Actualiser",
|
||||
reorderCard: "Réorganiser {{source}}",
|
||||
showCard: "Afficher {{source}}",
|
||||
sources: "Sources",
|
||||
sourcesCount: "{{shown}} sur {{total}}",
|
||||
providerInactive: "Fournisseur inactif",
|
||||
allSourcesHidden: "Aucune source d'utilisation affichée",
|
||||
chooseSources: "Choisir les sources",
|
||||
refreshAll: "Tout actualiser",
|
||||
refreshing: "Actualisation...",
|
||||
loading: "Chargement de l’utilisation...",
|
||||
@@ -3147,6 +3152,7 @@ export const fr: TranslationResources = {
|
||||
status: "État du fournisseur",
|
||||
checked: "Vérifié {{time}}",
|
||||
diagnosticReport: "Rapport de diagnostic",
|
||||
docs: "Documentation",
|
||||
dangerZone: "Zone de danger",
|
||||
removeHint: "Supprime ce fournisseur de config.json",
|
||||
},
|
||||
@@ -3193,7 +3199,7 @@ export const fr: TranslationResources = {
|
||||
noSearchMatches: "Aucun modèle ne correspond à votre recherche",
|
||||
noneDetected: "Aucun modèle détecté",
|
||||
noCustom: "Aucun modèle personnalisé",
|
||||
discovered: "Détectés",
|
||||
title: "Modèles",
|
||||
custom: "Modèles personnalisés",
|
||||
updated: "Mis à jour {{time}}",
|
||||
},
|
||||
|
||||
@@ -354,6 +354,7 @@ export const ja: TranslationResources = {
|
||||
copyTurn: "ターンをコピー",
|
||||
copyMessage: "メッセージをコピー",
|
||||
forkMenu: "メッセージをフォーク",
|
||||
turnStats: "ターンの統計",
|
||||
forkInNewTab: "新しいタブにフォーク",
|
||||
forkInNewWorkspace: "新しいワークスペースにフォーク",
|
||||
forkUnavailable: "これを使用するにはホストを更新してください。",
|
||||
@@ -2287,7 +2288,11 @@ export const ja: TranslationResources = {
|
||||
title: "プラン使用量",
|
||||
refresh: "更新",
|
||||
reorderCard: "{{source}} を並べ替え",
|
||||
showCard: "{{source}} を表示",
|
||||
sources: "ソース",
|
||||
sourcesCount: "{{shown}} / {{total}}",
|
||||
providerInactive: "プロバイダー無効",
|
||||
allSourcesHidden: "表示中の使用量ソースはありません",
|
||||
chooseSources: "ソースを選択",
|
||||
refreshAll: "すべて更新",
|
||||
refreshing: "更新中...",
|
||||
loading: "使用状況を読み込み中...",
|
||||
@@ -3109,6 +3114,7 @@ export const ja: TranslationResources = {
|
||||
status: "プロバイダーの状態",
|
||||
checked: "{{time}}に確認",
|
||||
diagnosticReport: "診断レポート",
|
||||
docs: "ドキュメント",
|
||||
dangerZone: "危険な操作",
|
||||
removeHint: "このプロバイダーを config.json から削除します",
|
||||
},
|
||||
@@ -3154,7 +3160,7 @@ export const ja: TranslationResources = {
|
||||
noSearchMatches: "検索に一致するモデルがありません",
|
||||
noneDetected: "モデルが検出されませんでした",
|
||||
noCustom: "カスタムモデルはありません",
|
||||
discovered: "検出済み",
|
||||
title: "モデル",
|
||||
custom: "カスタムモデル",
|
||||
updated: "{{time}}に更新",
|
||||
},
|
||||
|
||||
@@ -350,6 +350,7 @@ export const ko: TranslationResources = {
|
||||
copyTurn: "턴 복사",
|
||||
copyMessage: "메시지 복사",
|
||||
forkMenu: "여기에서 채팅 분기",
|
||||
turnStats: "턴 통계",
|
||||
forkInNewTab: "새 탭으로 분기",
|
||||
forkInNewWorkspace: "새 워크스페이스로 분기",
|
||||
forkUnavailable: "이를 사용하려면 호스트를 업데이트하세요.",
|
||||
@@ -2275,7 +2276,11 @@ export const ko: TranslationResources = {
|
||||
title: "플랜 사용량",
|
||||
refresh: "새로 고침",
|
||||
reorderCard: "{{source}} 순서 변경",
|
||||
showCard: "{{source}} 표시",
|
||||
sources: "소스",
|
||||
sourcesCount: "{{shown}} / {{total}}",
|
||||
providerInactive: "제공업체 비활성",
|
||||
allSourcesHidden: "표시된 사용량 소스가 없습니다",
|
||||
chooseSources: "소스 선택",
|
||||
refreshAll: "모두 새로 고침",
|
||||
refreshing: "새로 고치는 중...",
|
||||
loading: "사용량 불러오는 중...",
|
||||
@@ -3094,6 +3099,7 @@ export const ko: TranslationResources = {
|
||||
status: "프로바이더 상태",
|
||||
checked: "{{time}} 확인됨",
|
||||
diagnosticReport: "진단 보고서",
|
||||
docs: "문서",
|
||||
dangerZone: "위험 구역",
|
||||
removeHint: "config.json에서 이 프로바이더를 삭제합니다",
|
||||
},
|
||||
@@ -3140,7 +3146,7 @@ export const ko: TranslationResources = {
|
||||
noSearchMatches: "검색과 일치하는 모델이 없습니다",
|
||||
noneDetected: "감지된 모델이 없습니다",
|
||||
noCustom: "사용자 지정 모델 없음",
|
||||
discovered: "발견됨",
|
||||
title: "모델",
|
||||
custom: "사용자 지정 모델",
|
||||
updated: "{{time}} 업데이트됨",
|
||||
},
|
||||
|
||||
@@ -353,6 +353,7 @@ export const ptBR: TranslationResources = {
|
||||
copyTurn: "Copiar turno",
|
||||
copyMessage: "Copiar mensagem",
|
||||
forkMenu: "Bifurcar mensagem",
|
||||
turnStats: "Estatísticas do turno",
|
||||
forkInNewTab: "Bifurcar em uma nova aba",
|
||||
forkInNewWorkspace: "Bifurcar em um novo workspace",
|
||||
forkUnavailable: "Atualize o host para usar isto.",
|
||||
@@ -2298,7 +2299,11 @@ export const ptBR: TranslationResources = {
|
||||
title: "Uso do plano",
|
||||
refresh: "Atualizar",
|
||||
reorderCard: "Reordenar {{source}}",
|
||||
showCard: "Mostrar {{source}}",
|
||||
sources: "Fontes",
|
||||
sourcesCount: "{{shown}} de {{total}}",
|
||||
providerInactive: "Provedor inativo",
|
||||
allSourcesHidden: "Nenhuma fonte de uso exibida",
|
||||
chooseSources: "Escolher fontes",
|
||||
refreshAll: "Atualizar tudo",
|
||||
refreshing: "Atualizando...",
|
||||
loading: "Carregando uso...",
|
||||
@@ -3122,6 +3127,7 @@ export const ptBR: TranslationResources = {
|
||||
status: "Status do provedor",
|
||||
checked: "Verificado {{time}}",
|
||||
diagnosticReport: "Relatório de diagnóstico",
|
||||
docs: "Documentação",
|
||||
dangerZone: "Zona de perigo",
|
||||
removeHint: "Exclui este provedor do config.json",
|
||||
},
|
||||
@@ -3167,7 +3173,7 @@ export const ptBR: TranslationResources = {
|
||||
noSearchMatches: "Nenhum modelo corresponde à sua busca",
|
||||
noneDetected: "Nenhum modelo detectado",
|
||||
noCustom: "Nenhum modelo personalizado",
|
||||
discovered: "Descobertos",
|
||||
title: "Modelos",
|
||||
custom: "Modelos personalizados",
|
||||
updated: "Atualizado {{time}}",
|
||||
},
|
||||
|
||||
@@ -353,6 +353,7 @@ export const ru: TranslationResources = {
|
||||
copyTurn: "Скопировать ответ",
|
||||
copyMessage: "Копировать сообщение",
|
||||
forkMenu: "Форкнуть чат отсюда",
|
||||
turnStats: "Статистика ответа",
|
||||
forkInNewTab: "Создать форк в новой вкладке",
|
||||
forkInNewWorkspace: "Создать форк в новом рабочем пространстве",
|
||||
forkUnavailable: "Обновите хост, чтобы использовать эту функцию.",
|
||||
@@ -2300,7 +2301,11 @@ export const ru: TranslationResources = {
|
||||
title: "Использование плана",
|
||||
refresh: "Обновить",
|
||||
reorderCard: "Переместить {{source}}",
|
||||
showCard: "Показывать {{source}}",
|
||||
sources: "Источники",
|
||||
sourcesCount: "{{shown}} из {{total}}",
|
||||
providerInactive: "Провайдер неактивен",
|
||||
allSourcesHidden: "Источники использования скрыты",
|
||||
chooseSources: "Выбрать источники",
|
||||
refreshAll: "Обновить всё",
|
||||
refreshing: "Обновление...",
|
||||
loading: "Загрузка данных об использовании...",
|
||||
@@ -3133,6 +3138,7 @@ export const ru: TranslationResources = {
|
||||
status: "Состояние провайдера",
|
||||
checked: "Проверено {{time}}",
|
||||
diagnosticReport: "Диагностический отчёт",
|
||||
docs: "Документация",
|
||||
dangerZone: "Опасная зона",
|
||||
removeHint: "Удаляет этого провайдера из config.json",
|
||||
},
|
||||
@@ -3179,7 +3185,7 @@ export const ru: TranslationResources = {
|
||||
noSearchMatches: "Ни одна модель не соответствует вашему запросу",
|
||||
noneDetected: "Модели не обнаружены",
|
||||
noCustom: "Нет пользовательских моделей",
|
||||
discovered: "Обнаруженные модели",
|
||||
title: "Модели",
|
||||
custom: "Пользовательские модели",
|
||||
updated: "Обновлено {{time}}",
|
||||
},
|
||||
|
||||
@@ -349,6 +349,7 @@ export const zhCN: TranslationResources = {
|
||||
copyTurn: "复制回合",
|
||||
copyMessage: "复制消息",
|
||||
forkMenu: "分叉消息",
|
||||
turnStats: "回合统计",
|
||||
forkInNewTab: "分叉到新标签页",
|
||||
forkInNewWorkspace: "分叉到新工作区",
|
||||
forkUnavailable: "请更新主机以使用此功能。",
|
||||
@@ -2241,7 +2242,11 @@ export const zhCN: TranslationResources = {
|
||||
title: "套餐用量",
|
||||
refresh: "刷新",
|
||||
reorderCard: "重新排序 {{source}}",
|
||||
showCard: "显示 {{source}}",
|
||||
sources: "来源",
|
||||
sourcesCount: "{{shown}} / {{total}}",
|
||||
providerInactive: "提供商未启用",
|
||||
allSourcesHidden: "未显示任何用量来源",
|
||||
chooseSources: "选择来源",
|
||||
refreshAll: "全部刷新",
|
||||
refreshing: "刷新中...",
|
||||
loading: "正在加载用量...",
|
||||
@@ -3042,6 +3047,7 @@ export const zhCN: TranslationResources = {
|
||||
status: "Provider 状态",
|
||||
checked: "{{time}}检查",
|
||||
diagnosticReport: "诊断报告",
|
||||
docs: "文档",
|
||||
dangerZone: "危险操作",
|
||||
removeHint: "从 config.json 中删除此 Provider",
|
||||
},
|
||||
@@ -3087,7 +3093,7 @@ export const zhCN: TranslationResources = {
|
||||
noSearchMatches: "没有匹配搜索的 Model",
|
||||
noneDetected: "未检测到 Model",
|
||||
noCustom: "没有自定义模型",
|
||||
discovered: "已发现",
|
||||
title: "Models",
|
||||
custom: "自定义 Models",
|
||||
updated: "已更新 {{time}}",
|
||||
},
|
||||
|
||||
@@ -1,17 +1,22 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import type { NavigationContainerRefWithCurrent } from "expo-router/react-navigation";
|
||||
import {
|
||||
getFocusedWorkspaceSelection,
|
||||
navigateToHostWorkspaceRoute,
|
||||
registerWorkspaceRouteNavigationRef,
|
||||
} from "./workspace-route-navigation";
|
||||
|
||||
function createNavigationRef(rootState: unknown, options: { ready?: boolean } = {}) {
|
||||
function createNavigationRef(
|
||||
rootState: unknown,
|
||||
options: { ready?: boolean; currentRoute?: { name: string; params?: object } } = {},
|
||||
) {
|
||||
const dispatch = vi.fn();
|
||||
let ready = options.ready ?? true;
|
||||
const readyListeners = new Set<() => void>();
|
||||
const navigation = {
|
||||
isReady: () => ready,
|
||||
getRootState: () => rootState,
|
||||
getCurrentRoute: () => options.currentRoute,
|
||||
dispatch,
|
||||
addListener: (event: string, listener: () => void) => {
|
||||
if (event === "ready") readyListeners.add(listener);
|
||||
@@ -215,3 +220,27 @@ describe("navigateToHostWorkspaceRoute", () => {
|
||||
expect(dismissTo).toHaveBeenCalledWith("/h/server-1/workspace/workspace-a");
|
||||
});
|
||||
});
|
||||
|
||||
describe("getFocusedWorkspaceSelection", () => {
|
||||
function focus(currentRoute?: { name: string; params?: object }) {
|
||||
registerWorkspaceRouteNavigationRef(createNavigationRef({}, { currentRoute }).navigationRef);
|
||||
}
|
||||
|
||||
it("returns the workspace on screen", () => {
|
||||
focus({
|
||||
name: "workspace/[workspaceId]/index",
|
||||
params: { serverId: "server-1", workspaceId: "workspace-a" },
|
||||
});
|
||||
|
||||
expect(getFocusedWorkspaceSelection()).toEqual({
|
||||
serverId: "server-1",
|
||||
workspaceId: "workspace-a",
|
||||
});
|
||||
});
|
||||
|
||||
it("returns null when a non-workspace screen is focused", () => {
|
||||
focus({ name: "settings/[section]", params: { section: "general" } });
|
||||
|
||||
expect(getFocusedWorkspaceSelection()).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -5,6 +5,7 @@ import type {
|
||||
} from "expo-router/react-navigation";
|
||||
import { router, type Href } from "expo-router";
|
||||
import {
|
||||
decodeWorkspaceIdFromPathSegment,
|
||||
encodeWorkspaceIdForPathSegment,
|
||||
getHostWorkspaceOpenParamFromPathname,
|
||||
parseHostWorkspaceRouteFromPathname,
|
||||
@@ -39,6 +40,27 @@ export function registerWorkspaceRouteNavigationRef(
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* The workspace on screen right now, read from the focused route, or null on any other screen
|
||||
* (Settings, New workspace, ...). Unlike a component's last render, it stays correct for work that
|
||||
* finishes after the screen that started it is gone.
|
||||
*/
|
||||
export function getFocusedWorkspaceSelection(): { serverId: string; workspaceId: string } | null {
|
||||
// Typed routes narrow the container's route to `never`; this only reads name and params.
|
||||
const route = rootNavigationRef?.current?.getCurrentRoute() as
|
||||
| { name: string; params?: { serverId?: unknown; workspaceId?: unknown } }
|
||||
| undefined;
|
||||
if (route?.name !== HOST_WORKSPACE_ROUTE_NAME) {
|
||||
return null;
|
||||
}
|
||||
const params = route.params;
|
||||
if (typeof params?.serverId !== "string" || typeof params.workspaceId !== "string") {
|
||||
return null;
|
||||
}
|
||||
const workspaceId = decodeWorkspaceIdFromPathSegment(params.workspaceId);
|
||||
return workspaceId ? { serverId: params.serverId, workspaceId } : null;
|
||||
}
|
||||
|
||||
interface MountedRouteStack {
|
||||
key: string;
|
||||
focusedRouteName: string | null;
|
||||
|
||||
@@ -1,44 +1,53 @@
|
||||
import { useMemo } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { View } from "react-native";
|
||||
import { withUnistyles } from "react-native-unistyles";
|
||||
import { SettingsDetailHeader } from "@/components/settings";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { ICON_SIZE, type Theme } from "@/styles/theme";
|
||||
import { ProviderDetail, useProviderDetail } from "./provider-detail";
|
||||
import { ProviderGlyph } from "./provider-glyph";
|
||||
|
||||
/**
|
||||
* A provider's detail as a Settings page, shaped like a project's: the screen titles it
|
||||
* "Providers", the page names the provider. On wide layouts the page has no back button of its
|
||||
* own, so it draws "Back to providers".
|
||||
* A provider's detail as a Settings page, shaped like a project's. On wide layouts the page is
|
||||
* titled "Providers > name" and "Providers" goes back. On compact layouts the screen titles it
|
||||
* "Providers" and the page names the provider.
|
||||
*/
|
||||
export function ProviderDetailPage({
|
||||
serverId,
|
||||
provider,
|
||||
onBack,
|
||||
showBack,
|
||||
}: {
|
||||
serverId: string;
|
||||
provider: string;
|
||||
onBack: () => void;
|
||||
showBack: boolean;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const isCompact = useIsCompactFormFactor();
|
||||
const detail = useProviderDetail({ serverId, provider, onRemoved: onBack });
|
||||
const back = useMemo(
|
||||
const parent = useMemo(
|
||||
() => ({
|
||||
label: t("settings.providers.detail.backToProviders"),
|
||||
label: t("settings.hostSections.providers"),
|
||||
accessibilityLabel: t("settings.providers.detail.backToProviders"),
|
||||
onPress: onBack,
|
||||
testID: "provider-detail-back",
|
||||
}),
|
||||
[onBack, t],
|
||||
);
|
||||
const icon = useMemo(
|
||||
() => <ProviderGlyph serverId={serverId} provider={provider} />,
|
||||
[provider, serverId],
|
||||
() => (
|
||||
<ThemedProviderGlyph
|
||||
serverId={serverId}
|
||||
provider={provider}
|
||||
uniProps={isCompact ? rowTitleSize : pageTitleSize}
|
||||
/>
|
||||
),
|
||||
[isCompact, provider, serverId],
|
||||
);
|
||||
return (
|
||||
<View testID="provider-detail-page">
|
||||
<SettingsDetailHeader
|
||||
back={showBack ? back : undefined}
|
||||
parent={parent}
|
||||
icon={icon}
|
||||
title={detail.label}
|
||||
titleTestID="provider-detail-title"
|
||||
@@ -47,3 +56,8 @@ export function ProviderDetailPage({
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
// The glyph is as large as the name beside it. The page title scales with the interface size.
|
||||
const ThemedProviderGlyph = withUnistyles(ProviderGlyph);
|
||||
const pageTitleSize = (theme: Theme) => ({ size: theme.fontSize["4xl"] });
|
||||
const rowTitleSize = () => ({ size: ICON_SIZE.md });
|
||||
|
||||
@@ -14,9 +14,9 @@ import { Alert } from "@/components/ui/alert";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { readAcpProviderInstallGuide } from "@/hooks/use-acp-provider-catalog";
|
||||
import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
|
||||
import { useTimeAgo } from "@/hooks/use-time-ago";
|
||||
import { useHostRuntimeIsConnected } from "@/runtime/host-runtime";
|
||||
import { settingsStyles } from "@/styles/settings";
|
||||
import { openExternalUrl } from "@/utils/open-external-url";
|
||||
import {
|
||||
readDetailPresence,
|
||||
readDetailSections,
|
||||
@@ -27,6 +27,7 @@ import { DiagnosticSheet } from "./diagnostic-sheet";
|
||||
import { useProviderConfigActions, type ProviderEntry } from "./provider-config";
|
||||
import { ProviderModels } from "./provider-models";
|
||||
import { ProviderNotice } from "./provider-notice";
|
||||
import { ProviderRefreshButton, useCheckedLabel, type ProviderRefresh } from "./provider-refresh";
|
||||
|
||||
export interface ProviderDetailState {
|
||||
provider: string;
|
||||
@@ -81,6 +82,9 @@ export function useProviderDetail({
|
||||
/**
|
||||
* Everything about one provider, top to bottom: what is wrong, whether it runs, its installation,
|
||||
* its models, then the rare actions. The page and the sheet frame the same body.
|
||||
*
|
||||
* Refresh sits with the model list, which is what it is most often pressed for. A provider that
|
||||
* lists no models of its own keeps it under Troubleshooting.
|
||||
*/
|
||||
export function ProviderDetail({
|
||||
serverId,
|
||||
@@ -106,6 +110,13 @@ export function ProviderDetail({
|
||||
installGuide: readAcpProviderInstallGuide(provider),
|
||||
});
|
||||
const sections = readDetailSections(entry, shownInstallation);
|
||||
const listsModels = sections.models === "all";
|
||||
const providerRefresh: ProviderRefresh = {
|
||||
checkedAt: entry.fetchedAt,
|
||||
// The probe running again is a refresh too, whoever asked for it.
|
||||
busy: isRefreshing || installation.refreshing || entry.status === "loading",
|
||||
run: handleRefresh,
|
||||
};
|
||||
|
||||
return (
|
||||
<View testID="provider-detail">
|
||||
@@ -117,13 +128,16 @@ export function ProviderDetail({
|
||||
action={installation.action}
|
||||
/>
|
||||
{sections.models ? (
|
||||
<ProviderModels serverId={serverId} entry={entry} discovered={sections.models === "all"} />
|
||||
<ProviderModels
|
||||
serverId={serverId}
|
||||
entry={entry}
|
||||
refresh={listsModels ? providerRefresh : null}
|
||||
/>
|
||||
) : null}
|
||||
<Troubleshooting
|
||||
serverId={serverId}
|
||||
entry={entry}
|
||||
refreshing={isRefreshing || installation.refreshing}
|
||||
onRefresh={handleRefresh}
|
||||
refresh={listsModels ? null : providerRefresh}
|
||||
/>
|
||||
{/* Config no longer owns a provider whose removal has succeeded. */}
|
||||
{detail.removing || detail.canRemove(entry) ? (
|
||||
@@ -182,42 +196,39 @@ function EnabledCard({ serverId, entry }: { serverId: string; entry: ProviderEnt
|
||||
function Troubleshooting({
|
||||
serverId,
|
||||
entry,
|
||||
refreshing,
|
||||
onRefresh,
|
||||
refresh,
|
||||
}: {
|
||||
serverId: string;
|
||||
entry: ProviderEntry;
|
||||
refreshing: boolean;
|
||||
onRefresh: () => void;
|
||||
/** Null when the model list carries Refresh. */
|
||||
refresh: ProviderRefresh | null;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const [diagnosticOpen, setDiagnosticOpen] = useState(false);
|
||||
const openDiagnostic = useCallback(() => setDiagnosticOpen(true), []);
|
||||
const closeDiagnostic = useCallback(() => setDiagnosticOpen(false), []);
|
||||
const checked = useTimeAgo(entry.fetchedAt ? new Date(entry.fetchedAt) : null);
|
||||
// The probe running again is a refresh too, whoever asked for it.
|
||||
const busy = refreshing || entry.status === "loading";
|
||||
const docsUrl = entry.docsUrl;
|
||||
const openDocs = useCallback(() => {
|
||||
if (docsUrl) void openExternalUrl(docsUrl);
|
||||
}, [docsUrl]);
|
||||
|
||||
return (
|
||||
<SettingsSection title={t("settings.providers.detail.troubleshooting")}>
|
||||
<SettingsCard>
|
||||
<SettingsRow
|
||||
label={t("settings.providers.detail.status")}
|
||||
hint={
|
||||
entry.fetchedAt ? t("settings.providers.detail.checked", { time: checked }) : undefined
|
||||
}
|
||||
>
|
||||
<Button variant="outline" onPress={onRefresh} loading={busy} testID="provider-refresh">
|
||||
{busy
|
||||
? t("settings.providers.diagnostic.refreshing")
|
||||
: t("settings.providers.diagnostic.refresh")}
|
||||
</Button>
|
||||
</SettingsRow>
|
||||
{refresh ? <ProviderStatusRow refresh={refresh} /> : null}
|
||||
<SettingsDetailRow
|
||||
label={t("settings.providers.detail.diagnosticReport")}
|
||||
onPress={openDiagnostic}
|
||||
testID="provider-diagnostic-report"
|
||||
/>
|
||||
{docsUrl ? (
|
||||
<SettingsDetailRow
|
||||
label={t("settings.providers.detail.docs")}
|
||||
onPress={openDocs}
|
||||
external
|
||||
testID="provider-docs"
|
||||
/>
|
||||
) : null}
|
||||
</SettingsCard>
|
||||
<DiagnosticSheet
|
||||
serverId={serverId}
|
||||
@@ -229,6 +240,16 @@ function Troubleshooting({
|
||||
);
|
||||
}
|
||||
|
||||
function ProviderStatusRow({ refresh }: { refresh: ProviderRefresh }) {
|
||||
const { t } = useTranslation();
|
||||
const checked = useCheckedLabel(refresh);
|
||||
return (
|
||||
<SettingsRow label={t("settings.providers.detail.status")} hint={checked}>
|
||||
<ProviderRefreshButton refresh={refresh} form="labelled" />
|
||||
</SettingsRow>
|
||||
);
|
||||
}
|
||||
|
||||
function DangerZone({ removing, onRemove }: { removing: boolean; onRemove: () => void }) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
|
||||
@@ -2,10 +2,18 @@ import { StyleSheet } from "react-native-unistyles";
|
||||
import { useProviderIcon } from "@/components/provider-icons";
|
||||
import { ICON_SIZE } from "@/styles/theme";
|
||||
|
||||
/** A provider's icon at row size, drawn in the foreground colour. */
|
||||
export function ProviderGlyph({ serverId, provider }: { serverId: string; provider: string }) {
|
||||
/** A provider's icon in the foreground colour, at row size unless the caller names another. */
|
||||
export function ProviderGlyph({
|
||||
serverId,
|
||||
provider,
|
||||
size = ICON_SIZE.md,
|
||||
}: {
|
||||
serverId: string;
|
||||
provider: string;
|
||||
size?: number;
|
||||
}) {
|
||||
const Icon = useProviderIcon(provider, serverId);
|
||||
return <Icon size={ICON_SIZE.md} color={styles.glyph.color} />;
|
||||
return <Icon size={size} color={styles.glyph.color} />;
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Plus, Trash2 } from "lucide-react-native";
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Text, View } from "react-native";
|
||||
import { ScrollView, Text, View } from "react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import type { AgentModelDefinition } from "@getpaseo/protocol/agent-types";
|
||||
import type { ProviderProfileModel } from "@getpaseo/protocol/provider-config";
|
||||
@@ -26,6 +26,7 @@ import {
|
||||
type ProviderDiscoveredModelsCache,
|
||||
} from "./discovered-models";
|
||||
import type { ProviderEntry } from "./provider-config";
|
||||
import { ProviderRefreshButton, useCheckedLabel, type ProviderRefresh } from "./provider-refresh";
|
||||
|
||||
const ThemedTrash = withUnistyles(Trash2);
|
||||
const destructiveColorMapping = (theme: Theme) => ({ color: theme.colors.destructive });
|
||||
@@ -51,15 +52,19 @@ function rankModels<T>(items: T[], query: string, fields: (item: T) => string[])
|
||||
export function ProviderModels({
|
||||
serverId,
|
||||
entry,
|
||||
discovered,
|
||||
refresh,
|
||||
}: {
|
||||
serverId: string;
|
||||
entry: ProviderEntry;
|
||||
/** List the models the provider reports, with search. Only a running provider reports them. */
|
||||
discovered: boolean;
|
||||
/**
|
||||
* Lists the models the provider reports, with search and the way to ask for them again. Null for
|
||||
* a provider that is not running, which reports none.
|
||||
*/
|
||||
refresh: ProviderRefresh | null;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const provider = entry.provider;
|
||||
const discovered = refresh !== null;
|
||||
const { config, patchConfig } = useDaemonConfig(serverId);
|
||||
const [query, setQuery] = useState("");
|
||||
const [addSheetOpen, setAddSheetOpen] = useState(false);
|
||||
@@ -130,10 +135,8 @@ export function ProviderModels({
|
||||
|
||||
const discoveredTrailing = useMemo(
|
||||
() =>
|
||||
discoveredModels.length > 0 ? (
|
||||
<Text style={settingsStyles.sectionHeaderTitle}>{discoveredModels.length}</Text>
|
||||
) : null,
|
||||
[discoveredModels.length],
|
||||
refresh ? <DiscoveredTrailing count={discoveredModels.length} refresh={refresh} /> : null,
|
||||
[discoveredModels.length, refresh],
|
||||
);
|
||||
|
||||
let discoveredBody: React.ReactNode;
|
||||
@@ -173,23 +176,29 @@ export function ProviderModels({
|
||||
return (
|
||||
<View testID="provider-models">
|
||||
{discovered ? (
|
||||
<>
|
||||
<View style={styles.searchRail}>
|
||||
<SettingsSection title={t("settings.providers.models.title")} trailing={discoveredTrailing}>
|
||||
<View style={styles.searchRow}>
|
||||
<SearchField
|
||||
value={query}
|
||||
onChangeText={setQuery}
|
||||
placeholder={t("settings.providers.models.searchPlaceholder")}
|
||||
clearAccessibilityLabel={t("sessions.actions.clearSearch")}
|
||||
fullWidth
|
||||
testID="provider-settings-search"
|
||||
/>
|
||||
</View>
|
||||
<SettingsSection
|
||||
title={t("settings.providers.models.discovered")}
|
||||
trailing={discoveredTrailing}
|
||||
>
|
||||
<View style={settingsStyles.card}>{discoveredBody}</View>
|
||||
</SettingsSection>
|
||||
</>
|
||||
<View style={settingsStyles.card}>
|
||||
{/* A provider can report hundreds of models; the rest of the page stays in reach. */}
|
||||
<ScrollView
|
||||
style={styles.discoveredList}
|
||||
// Android scrolls a ScrollView nested in the page or the sheet only with this flag.
|
||||
nestedScrollEnabled
|
||||
testID="provider-discovered-models"
|
||||
>
|
||||
{discoveredBody}
|
||||
</ScrollView>
|
||||
</View>
|
||||
</SettingsSection>
|
||||
) : null}
|
||||
<SettingsSection title={t("settings.providers.models.custom")} trailing={customTrailing}>
|
||||
<View style={settingsStyles.card}>{customBody}</View>
|
||||
@@ -205,6 +214,22 @@ export function ProviderModels({
|
||||
);
|
||||
}
|
||||
|
||||
/** How many models the provider reports, when it last reported them, and the way to ask again. */
|
||||
function DiscoveredTrailing({ count, refresh }: { count: number; refresh: ProviderRefresh }) {
|
||||
const checked = useCheckedLabel(refresh);
|
||||
const facts = [count > 0 ? String(count) : null, checked].filter(Boolean).join(" · ");
|
||||
return (
|
||||
<View style={styles.headerTrailing}>
|
||||
{facts ? (
|
||||
<Text style={[settingsStyles.sectionHeaderTitle, styles.headerFacts]} numberOfLines={1}>
|
||||
{facts}
|
||||
</Text>
|
||||
) : null}
|
||||
<ProviderRefreshButton refresh={refresh} form="icon" />
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
function MutedRow({ children }: { children: string }) {
|
||||
return (
|
||||
<View style={styles.modelRow}>
|
||||
@@ -367,15 +392,23 @@ function AddCustomModelSheet({
|
||||
const ADD_SNAP_POINTS = ["40%"];
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
searchRail: {
|
||||
// The search field sizes itself along a row.
|
||||
searchRow: {
|
||||
flexDirection: "row",
|
||||
marginBottom: theme.spacing[3],
|
||||
},
|
||||
// Nine rows and part of a tenth, so a longer list visibly continues.
|
||||
discoveredList: {
|
||||
maxHeight: 320,
|
||||
},
|
||||
headerTrailing: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: theme.spacing[1],
|
||||
},
|
||||
// The facts give way before the button does.
|
||||
headerFacts: {
|
||||
flexShrink: 1,
|
||||
},
|
||||
modelRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
import { RotateCw } from "lucide-react-native";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { useTimeAgo } from "@/hooks/use-time-ago";
|
||||
|
||||
/** Asking the provider again for its status, version and models. */
|
||||
export interface ProviderRefresh {
|
||||
/** When the provider last answered. Absent before its first answer. */
|
||||
checkedAt: string | undefined;
|
||||
/** A check is running, whoever asked for it. */
|
||||
busy: boolean;
|
||||
run: () => void;
|
||||
}
|
||||
|
||||
/** "Checked 5m ago", kept current, or nothing before the provider's first answer. */
|
||||
export function useCheckedLabel(refresh: ProviderRefresh): string | undefined {
|
||||
const { t } = useTranslation();
|
||||
const time = useTimeAgo(refresh.checkedAt ? new Date(refresh.checkedAt) : null);
|
||||
return refresh.checkedAt ? t("settings.providers.detail.checked", { time }) : undefined;
|
||||
}
|
||||
|
||||
export function ProviderRefreshButton({
|
||||
refresh,
|
||||
form,
|
||||
}: {
|
||||
refresh: ProviderRefresh;
|
||||
/** `icon` in a section header, `labelled` in a row. */
|
||||
form: "icon" | "labelled";
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const label = refresh.busy
|
||||
? t("settings.providers.diagnostic.refreshing")
|
||||
: t("settings.providers.diagnostic.refresh");
|
||||
if (form === "icon")
|
||||
return (
|
||||
<Button
|
||||
variant="ghost"
|
||||
leftIcon={RotateCw}
|
||||
onPress={refresh.run}
|
||||
loading={refresh.busy}
|
||||
accessibilityLabel={label}
|
||||
testID="provider-refresh"
|
||||
/>
|
||||
);
|
||||
return (
|
||||
<Button
|
||||
variant="outline"
|
||||
onPress={refresh.run}
|
||||
loading={refresh.busy}
|
||||
testID="provider-refresh"
|
||||
>
|
||||
{label}
|
||||
</Button>
|
||||
);
|
||||
}
|
||||
@@ -21,6 +21,7 @@ import { useSessionStore, type Agent } from "@/stores/session-store";
|
||||
import { normalizeAgentSnapshot } from "@/utils/agent-snapshots";
|
||||
import { isAgentArchiving, setAgentArchiving } from "@/hooks/use-archive-agent";
|
||||
import { queryClient } from "@/data/query-client";
|
||||
import { checkoutStatusQueryKey } from "@/git/query-keys";
|
||||
import {
|
||||
HostRuntimeController,
|
||||
HostRuntimeStore,
|
||||
@@ -1748,7 +1749,7 @@ describe("HostRuntimeController", () => {
|
||||
});
|
||||
|
||||
latencies["relay:relay.paseo.sh:443"] = 30;
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
await vi.advanceTimersByTimeAsync(240_000);
|
||||
await controller.runProbeCycleNow();
|
||||
expect(controller.getSnapshot().activeConnectionId).toBe("direct:lan:6767");
|
||||
|
||||
@@ -1807,6 +1808,429 @@ describe("HostRuntimeController", () => {
|
||||
await controller.stop();
|
||||
});
|
||||
|
||||
it("ignores busy active heartbeat spikes when comparing against an idle alternate probe", async () => {
|
||||
// Replays the recorded 10:04-10:08 relay sequence (#9149): the active relay has a ~250-300 ms
|
||||
// baseline over its recent heartbeats, spikes to 383/503/491 ms right before each alternate
|
||||
// probe, and the idle alternate measures 236/322/291 ms.
|
||||
useHostRuntimeClock();
|
||||
const host = makeHost({
|
||||
connections: [relayPrimary, relayAlternate],
|
||||
preferredConnectionId: relayPrimary.id,
|
||||
});
|
||||
const clients: FakeDaemonClient[] = [];
|
||||
let alternateProbes = 0;
|
||||
const latencies: Record<string, number | Error> = {
|
||||
[relayPrimary.id]: 260,
|
||||
[relayAlternate.id]: 280,
|
||||
};
|
||||
const baseDeps = makeDeps(latencies, clients);
|
||||
const controller = new HostRuntimeController({
|
||||
host,
|
||||
deps: {
|
||||
...baseDeps,
|
||||
connectToDaemon: async (input) => {
|
||||
if (input.connection.id === relayAlternate.id) {
|
||||
alternateProbes += 1;
|
||||
}
|
||||
return baseDeps.connectToDaemon(input);
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
await controller.start({ autoProbe: false });
|
||||
expect(controller.getSnapshot().activeConnectionId).toBe(relayPrimary.id);
|
||||
const activeClient = controller.getSnapshot().client as unknown as FakeDaemonClient;
|
||||
|
||||
const rounds = [
|
||||
{ intervalMs: 120_000, baseline: 295, spike: 383, alternate: 236 },
|
||||
{ intervalMs: 240_000, baseline: 251, spike: 503, alternate: 322 },
|
||||
{ intervalMs: 480_000, baseline: 341, spike: 491, alternate: 291 },
|
||||
];
|
||||
for (const round of rounds) {
|
||||
await vi.advanceTimersByTimeAsync(round.intervalMs - 10_000);
|
||||
activeClient.heartbeatReportsRtt(round.baseline);
|
||||
await controller.runProbeCycleNow();
|
||||
await vi.advanceTimersByTimeAsync(10_000);
|
||||
activeClient.heartbeatReportsRtt(round.spike);
|
||||
latencies[relayAlternate.id] = round.alternate;
|
||||
await controller.runProbeCycleNow();
|
||||
}
|
||||
|
||||
expect(alternateProbes).toBe(4);
|
||||
expect(controller.getSnapshot().activeConnectionId).toBe(relayPrimary.id);
|
||||
expect(controller.getSnapshot().client).toBe(activeClient);
|
||||
expect(activeClient.isDisposed()).toBe(false);
|
||||
await controller.stop();
|
||||
});
|
||||
|
||||
it("requires a proportional RTT improvement before switching away from a high-latency link", async () => {
|
||||
useHostRuntimeClock();
|
||||
const host = makeHost({
|
||||
connections: [relayPrimary, relayAlternate],
|
||||
preferredConnectionId: relayPrimary.id,
|
||||
});
|
||||
const clients: FakeDaemonClient[] = [];
|
||||
const latencies: Record<string, number | Error> = {
|
||||
[relayPrimary.id]: 300,
|
||||
[relayAlternate.id]: 320,
|
||||
};
|
||||
const controller = new HostRuntimeController({
|
||||
host,
|
||||
deps: makeDeps(latencies, clients),
|
||||
});
|
||||
|
||||
await controller.start({ autoProbe: false });
|
||||
expect(controller.getSnapshot().activeConnectionId).toBe(relayPrimary.id);
|
||||
const activeClient = controller.getSnapshot().client as unknown as FakeDaemonClient;
|
||||
|
||||
// 60 ms faster on a 300 ms link (20%) is noise, not enough to justify a switch.
|
||||
activeClient.heartbeatReportsRtt(300);
|
||||
latencies[relayAlternate.id] = 240;
|
||||
for (let index = 0; index < 3; index += 1) {
|
||||
await vi.advanceTimersByTimeAsync(30 * 60_000);
|
||||
await controller.runProbeCycleNow();
|
||||
}
|
||||
expect(controller.getSnapshot().activeConnectionId).toBe(relayPrimary.id);
|
||||
|
||||
// 150 ms faster on a 300 ms link (50%) is a real win and switches after 3 consecutive probes.
|
||||
latencies[relayAlternate.id] = 150;
|
||||
for (let index = 0; index < 3; index += 1) {
|
||||
await vi.advanceTimersByTimeAsync(index === 0 ? 30 * 60_000 : 120_000);
|
||||
await controller.runProbeCycleNow();
|
||||
}
|
||||
expect(controller.getSnapshot().activeConnectionId).toBe(relayAlternate.id);
|
||||
await controller.stop();
|
||||
});
|
||||
|
||||
it("exponentially backs off inactive connection probes while the active connection keeps winning", async () => {
|
||||
useHostRuntimeClock();
|
||||
const host = makeHost({
|
||||
connections: [relayPrimary, relayAlternate],
|
||||
preferredConnectionId: relayPrimary.id,
|
||||
});
|
||||
const clients: FakeDaemonClient[] = [];
|
||||
let alternateProbes = 0;
|
||||
const baseDeps = makeDeps(
|
||||
{
|
||||
[relayPrimary.id]: 250,
|
||||
[relayAlternate.id]: 260,
|
||||
},
|
||||
clients,
|
||||
);
|
||||
const controller = new HostRuntimeController({
|
||||
host,
|
||||
deps: {
|
||||
...baseDeps,
|
||||
connectToDaemon: async (input) => {
|
||||
if (input.connection.id === relayAlternate.id) {
|
||||
alternateProbes += 1;
|
||||
}
|
||||
return baseDeps.connectToDaemon(input);
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
await controller.start({ autoProbe: false });
|
||||
const activeClient = controller.getSnapshot().client as unknown as FakeDaemonClient;
|
||||
activeClient.heartbeatReportsRtt(250);
|
||||
expect(alternateProbes).toBe(1);
|
||||
|
||||
// First inactive online probe runs at 2m -> active wins, next interval backs off to 4m.
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
await controller.runProbeCycleNow();
|
||||
expect(alternateProbes).toBe(2);
|
||||
|
||||
// At +2m (still < 4m), no inactive probe runs.
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
await controller.runProbeCycleNow();
|
||||
expect(alternateProbes).toBe(2);
|
||||
|
||||
// At +4m total, second inactive probe runs -> backs off to 8m.
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
await controller.runProbeCycleNow();
|
||||
expect(alternateProbes).toBe(3);
|
||||
|
||||
// At +6m (< 8m), still quiet; at +8m, third inactive probe runs -> backs off to 16m.
|
||||
await vi.advanceTimersByTimeAsync(6 * 60_000);
|
||||
await controller.runProbeCycleNow();
|
||||
expect(alternateProbes).toBe(3);
|
||||
await vi.advanceTimersByTimeAsync(2 * 60_000);
|
||||
await controller.runProbeCycleNow();
|
||||
expect(alternateProbes).toBe(4);
|
||||
|
||||
// Foreground verification resets backoff back to 2m without forcing an immediate probe.
|
||||
await vi.advanceTimersByTimeAsync(3 * 60_000);
|
||||
controller.ensureConnected({ verify: true });
|
||||
await controller.runProbeCycleNow();
|
||||
expect(alternateProbes).toBe(5);
|
||||
await controller.stop();
|
||||
});
|
||||
|
||||
it("keeps the active connection online while connecting the replacement during an adaptive switch", async () => {
|
||||
useHostRuntimeClock();
|
||||
const host = makeHost({
|
||||
connections: [relayPrimary, relayAlternate],
|
||||
preferredConnectionId: relayPrimary.id,
|
||||
});
|
||||
const clients: FakeDaemonClient[] = [];
|
||||
const latencies: Record<string, number | Error> = {
|
||||
[relayPrimary.id]: 300,
|
||||
[relayAlternate.id]: 320,
|
||||
};
|
||||
let replacementConnectGate: ReturnType<typeof createDeferred<void>> | null = null;
|
||||
let shouldFailReplacement = false;
|
||||
const baseDeps = makeDeps(latencies, clients);
|
||||
const controller = new HostRuntimeController({
|
||||
host,
|
||||
deps: {
|
||||
...baseDeps,
|
||||
createClient: (input) => {
|
||||
const client = baseDeps.createClient(input) as unknown as FakeDaemonClient;
|
||||
if (input.connection.id === relayAlternate.id) {
|
||||
const origConnect = client.connect.bind(client);
|
||||
client.connect = async () => {
|
||||
if (replacementConnectGate) {
|
||||
await replacementConnectGate.promise;
|
||||
}
|
||||
if (shouldFailReplacement) {
|
||||
throw new Error("replacement handshake failed");
|
||||
}
|
||||
return origConnect();
|
||||
};
|
||||
}
|
||||
return client as unknown as DaemonClient;
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
await controller.start({ autoProbe: false });
|
||||
const initialClient = controller.getSnapshot().client as unknown as FakeDaemonClient;
|
||||
initialClient.heartbeatReportsRtt(300);
|
||||
latencies[relayAlternate.id] = 100;
|
||||
|
||||
const observedSnapshots: Array<{
|
||||
status: string;
|
||||
connectionId: string | null;
|
||||
hasClient: boolean;
|
||||
}> = [];
|
||||
const unsubscribe = controller.subscribe(() => {
|
||||
const snap = controller.getSnapshot();
|
||||
observedSnapshots.push({
|
||||
status: snap.connectionStatus,
|
||||
connectionId: snap.activeConnectionId,
|
||||
hasClient: snap.client !== null,
|
||||
});
|
||||
});
|
||||
|
||||
// Two wins first.
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
await controller.runProbeCycleNow();
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
await controller.runProbeCycleNow();
|
||||
|
||||
// Third win triggers a switch, but replacement connect fails: active client must stay online.
|
||||
shouldFailReplacement = true;
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
await controller.runProbeCycleNow();
|
||||
expect(controller.getSnapshot().activeConnectionId).toBe(relayPrimary.id);
|
||||
expect(controller.getSnapshot().connectionStatus).toBe("online");
|
||||
expect(controller.getSnapshot().client).toBe(initialClient);
|
||||
expect(initialClient.isDisposed()).toBe(false);
|
||||
|
||||
// Now let replacement succeed after a delay: host must stay online on initialClient while
|
||||
// replacement connects, and never emit connecting or client=null.
|
||||
shouldFailReplacement = false;
|
||||
observedSnapshots.length = 0;
|
||||
for (let index = 0; index < 2; index += 1) {
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
await controller.runProbeCycleNow();
|
||||
}
|
||||
replacementConnectGate = createDeferred<void>();
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
const switchingCycle = controller.runProbeCycleNow();
|
||||
await vi.advanceTimersByTimeAsync(0);
|
||||
|
||||
expect(controller.getSnapshot().activeConnectionId).toBe(relayPrimary.id);
|
||||
expect(controller.getSnapshot().connectionStatus).toBe("online");
|
||||
expect(controller.getSnapshot().client).toBe(initialClient);
|
||||
expect(initialClient.isDisposed()).toBe(false);
|
||||
|
||||
replacementConnectGate.resolve();
|
||||
await switchingCycle;
|
||||
|
||||
expect(controller.getSnapshot().activeConnectionId).toBe(relayAlternate.id);
|
||||
expect(controller.getSnapshot().connectionStatus).toBe("online");
|
||||
expect(controller.getSnapshot().client).not.toBeNull();
|
||||
expect(controller.getSnapshot().client).not.toBe(initialClient);
|
||||
expect(initialClient.isDisposed()).toBe(true);
|
||||
expect(observedSnapshots.some((snap) => snap.status !== "online" || !snap.hasClient)).toBe(
|
||||
false,
|
||||
);
|
||||
|
||||
unsubscribe();
|
||||
await controller.stop();
|
||||
});
|
||||
|
||||
it("keeps active client status updates working after a failed make-before-break upgrade", async () => {
|
||||
useHostRuntimeClock();
|
||||
const host = makeHost({
|
||||
connections: [relayPrimary, relayAlternate],
|
||||
preferredConnectionId: relayPrimary.id,
|
||||
});
|
||||
const clients: FakeDaemonClient[] = [];
|
||||
const latencies: Record<string, number | Error> = {
|
||||
[relayPrimary.id]: 300,
|
||||
[relayAlternate.id]: 320,
|
||||
};
|
||||
const baseDeps = makeDeps(latencies, clients);
|
||||
const controller = new HostRuntimeController({
|
||||
host,
|
||||
deps: {
|
||||
...baseDeps,
|
||||
createClient: (input) => {
|
||||
const client = baseDeps.createClient(input) as unknown as FakeDaemonClient;
|
||||
if (input.connection.id === relayAlternate.id) {
|
||||
client.connect = async () => {
|
||||
throw new Error("replacement handshake failed");
|
||||
};
|
||||
}
|
||||
return client as unknown as DaemonClient;
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
await controller.start({ autoProbe: false });
|
||||
const initialClient = controller.getSnapshot().client as unknown as FakeDaemonClient;
|
||||
initialClient.heartbeatReportsRtt(300);
|
||||
latencies[relayAlternate.id] = 100;
|
||||
|
||||
for (let index = 0; index < 3; index += 1) {
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
await controller.runProbeCycleNow();
|
||||
}
|
||||
expect(controller.getSnapshot().activeConnectionId).toBe(relayPrimary.id);
|
||||
expect(controller.getSnapshot().connectionStatus).toBe("online");
|
||||
|
||||
initialClient.setConnectionState({ status: "disconnected", reason: "transport closed" });
|
||||
expect(controller.getSnapshot().connectionStatus).toBe("error");
|
||||
expect(controller.getSnapshot().lastError).toBe("transport closed");
|
||||
await controller.stop();
|
||||
});
|
||||
|
||||
it("aborts a pending make-before-break upgrade when the candidate connection is removed", async () => {
|
||||
useHostRuntimeClock();
|
||||
const host = makeHost({
|
||||
connections: [relayPrimary, relayAlternate],
|
||||
preferredConnectionId: relayPrimary.id,
|
||||
});
|
||||
const clients: FakeDaemonClient[] = [];
|
||||
const latencies: Record<string, number | Error> = {
|
||||
[relayPrimary.id]: 300,
|
||||
[relayAlternate.id]: 320,
|
||||
};
|
||||
const replacementGate = createDeferred<void>();
|
||||
const replacementClients: FakeDaemonClient[] = [];
|
||||
const baseDeps = makeDeps(latencies, clients);
|
||||
const controller = new HostRuntimeController({
|
||||
host,
|
||||
deps: {
|
||||
...baseDeps,
|
||||
createClient: (input) => {
|
||||
const client = baseDeps.createClient(input) as unknown as FakeDaemonClient;
|
||||
if (input.connection.id === relayAlternate.id) {
|
||||
replacementClients.push(client);
|
||||
const origConnect = client.connect.bind(client);
|
||||
client.connect = async () => {
|
||||
await replacementGate.promise;
|
||||
return origConnect();
|
||||
};
|
||||
}
|
||||
return client as unknown as DaemonClient;
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
await controller.start({ autoProbe: false });
|
||||
const initialClient = controller.getSnapshot().client as unknown as FakeDaemonClient;
|
||||
initialClient.heartbeatReportsRtt(300);
|
||||
latencies[relayAlternate.id] = 100;
|
||||
|
||||
for (let index = 0; index < 2; index += 1) {
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
await controller.runProbeCycleNow();
|
||||
}
|
||||
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
const switchingCycle = controller.runProbeCycleNow();
|
||||
await vi.advanceTimersByTimeAsync(0);
|
||||
expect(replacementClients).toHaveLength(1);
|
||||
|
||||
const updatePromise = controller.updateHost({
|
||||
...host,
|
||||
connections: [relayPrimary],
|
||||
});
|
||||
await vi.advanceTimersByTimeAsync(0);
|
||||
replacementGate.resolve();
|
||||
await Promise.all([switchingCycle, updatePromise]);
|
||||
|
||||
expect(controller.getSnapshot().activeConnectionId).toBe(relayPrimary.id);
|
||||
expect(controller.getSnapshot().connectionStatus).toBe("online");
|
||||
expect(controller.getSnapshot().client).toBe(initialClient);
|
||||
expect(initialClient.isDisposed()).toBe(false);
|
||||
expect(replacementClients[0]?.isDisposed()).toBe(true);
|
||||
await controller.stop();
|
||||
});
|
||||
|
||||
it("runs store cache recovery when a make-before-break adaptive switch advances the online epoch", async () => {
|
||||
useHostRuntimeClock();
|
||||
const host = makeHost({
|
||||
serverId: "srv_upgrade_cache_recovery",
|
||||
connections: [relayPrimary, relayAlternate],
|
||||
preferredConnectionId: relayPrimary.id,
|
||||
});
|
||||
const clients: FakeDaemonClient[] = [];
|
||||
const latencies: Record<string, number | Error> = {
|
||||
[relayPrimary.id]: 300,
|
||||
[relayAlternate.id]: 320,
|
||||
};
|
||||
const store = new HostRuntimeStore({
|
||||
storage: createMemoryHostRuntimeStorage(),
|
||||
deps: makeDeps(latencies, clients),
|
||||
});
|
||||
const queryKey = checkoutStatusQueryKey(host.serverId, "/repo");
|
||||
|
||||
try {
|
||||
store.syncHosts([host]);
|
||||
await vi.advanceTimersByTimeAsync(0);
|
||||
expect(store.getSnapshot(host.serverId)?.connectionStatus).toBe("online");
|
||||
const initialEpoch = store.getSnapshot(host.serverId)?.connectionEpoch ?? 0;
|
||||
const activeClient = store.getSnapshot(host.serverId)?.client as unknown as FakeDaemonClient;
|
||||
const initialHistoryGen =
|
||||
useSessionStore.getState().sessions[host.serverId]?.historySyncGeneration ?? 0;
|
||||
|
||||
queryClient.setQueryData(queryKey, { branch: "main" });
|
||||
expect(queryClient.getQueryState(queryKey)?.isInvalidated).toBe(false);
|
||||
|
||||
activeClient.heartbeatReportsRtt(300);
|
||||
latencies[relayAlternate.id] = 100;
|
||||
for (let index = 0; index < 3; index += 1) {
|
||||
await vi.advanceTimersByTimeAsync(120_000);
|
||||
await store.runProbeCycleNow(host.serverId);
|
||||
}
|
||||
|
||||
expect(store.getSnapshot(host.serverId)?.activeConnectionId).toBe(relayAlternate.id);
|
||||
expect(store.getSnapshot(host.serverId)?.connectionStatus).toBe("online");
|
||||
expect(store.getSnapshot(host.serverId)?.connectionEpoch).toBeGreaterThan(initialEpoch);
|
||||
expect(queryClient.getQueryState(queryKey)?.isInvalidated).toBe(true);
|
||||
expect(
|
||||
useSessionStore.getState().sessions[host.serverId]?.historySyncGeneration ?? 0,
|
||||
).toBeGreaterThan(initialHistoryGen);
|
||||
} finally {
|
||||
queryClient.removeQueries({ queryKey });
|
||||
store.syncHosts([]);
|
||||
}
|
||||
});
|
||||
|
||||
it("exposes one snapshot with active connection and status from same source", async () => {
|
||||
const host = makeHost();
|
||||
const clients: FakeDaemonClient[] = [];
|
||||
|
||||
@@ -245,8 +245,11 @@ export interface HostRuntimeStartOptions {
|
||||
const PROBE_TICK_MS = 2_000;
|
||||
const PROBE_STEADY_MS = 10_000;
|
||||
const PROBE_MAX_BACKOFF_MS = 30_000;
|
||||
const PROBE_INACTIVE_WHILE_ONLINE_MS = 120_000;
|
||||
const PROBE_INACTIVE_WHILE_ONLINE_INITIAL_MS = 120_000;
|
||||
const PROBE_INACTIVE_WHILE_ONLINE_MAX_MS = 30 * 60_000;
|
||||
const ACTIVE_RTT_WINDOW_MS = 60_000;
|
||||
const ADAPTIVE_SWITCH_THRESHOLD_MS = 40;
|
||||
const ADAPTIVE_SWITCH_MIN_IMPROVEMENT_RATIO = 0.35;
|
||||
const ADAPTIVE_SWITCH_CONSECUTIVE_PROBES = 3;
|
||||
const CONFIGURED_OVERRIDE_BOOTSTRAP_RETRY_MS = 1_000;
|
||||
|
||||
@@ -549,13 +552,14 @@ function probeIntervalForConnection(
|
||||
firstSeenAt: number,
|
||||
isActiveOnline: boolean,
|
||||
hasActiveOnlineConnection: boolean,
|
||||
inactiveOnlineIntervalMs: number,
|
||||
now: number,
|
||||
): number {
|
||||
if (isActiveOnline) {
|
||||
return PROBE_STEADY_MS;
|
||||
}
|
||||
if (hasActiveOnlineConnection) {
|
||||
return PROBE_INACTIVE_WHILE_ONLINE_MS;
|
||||
return inactiveOnlineIntervalMs;
|
||||
}
|
||||
const age = now - firstSeenAt;
|
||||
if (age < 10_000) return 2_000;
|
||||
@@ -728,6 +732,8 @@ export class HostRuntimeController {
|
||||
private connectionLastProbedAt = new Map<string, number>();
|
||||
private switchCandidateConnectionId: string | null = null;
|
||||
private switchCandidateHitCount = 0;
|
||||
private inactiveOnlineProbeBackoffStep = 0;
|
||||
private activeRttSamples: Array<{ at: number; rttMs: number }> = [];
|
||||
private clientIdPromise: Promise<string> | null = null;
|
||||
private clientIdHash: string | null = null;
|
||||
private switchRequestVersion = 0;
|
||||
@@ -823,6 +829,9 @@ export class HostRuntimeController {
|
||||
this.activeClient = null;
|
||||
await prev.close().catch(() => undefined);
|
||||
}
|
||||
this.resetSwitchCandidate();
|
||||
this.clearActiveRttSamples();
|
||||
this.resetInactiveOnlineProbeBackoff();
|
||||
this.applyConnectionEvent({ type: "stopped" });
|
||||
this.updateSnapshot({
|
||||
...toSnapshotConnectionPatch(this.connectionMachineState, this.connectionEpoch),
|
||||
@@ -832,11 +841,15 @@ export class HostRuntimeController {
|
||||
|
||||
async updateHost(host: HostProfile): Promise<void> {
|
||||
const passwordChanged = this.host.password !== host.password;
|
||||
const connectionsChanged = !equal(this.host.connections, host.connections);
|
||||
if (passwordChanged) {
|
||||
this.probeRequestVersion += 1;
|
||||
this.authRejectedConnectionIds.clear();
|
||||
this.updateSnapshot({ authFailureReason: null });
|
||||
}
|
||||
if (passwordChanged || connectionsChanged) {
|
||||
this.resetInactiveOnlineProbeBackoff();
|
||||
}
|
||||
const activeConnectionId = this.snapshot.activeConnectionId;
|
||||
const previousActiveConnection = findConnectionById(this.host, activeConnectionId);
|
||||
this.host = host;
|
||||
@@ -862,6 +875,9 @@ export class HostRuntimeController {
|
||||
}
|
||||
|
||||
ensureConnected(options?: { verify?: boolean }): void {
|
||||
if (options?.verify) {
|
||||
this.resetInactiveOnlineProbeBackoff();
|
||||
}
|
||||
this.activeClient?.ensureConnected(options);
|
||||
}
|
||||
|
||||
@@ -962,6 +978,7 @@ export class HostRuntimeController {
|
||||
const activeConnectionId = this.snapshot.activeConnectionId;
|
||||
const hasActiveOnlineConnection = isOnline && activeConnectionId !== null;
|
||||
|
||||
const inactiveOnlineIntervalMs = this.inactiveOnlineProbeIntervalMs();
|
||||
const connectionsToProbe = this.host.connections.filter((connection) => {
|
||||
if (this.authRejectedConnectionIds.has(connection.id)) return false;
|
||||
const lastProbed = this.connectionLastProbedAt.get(connection.id);
|
||||
@@ -974,6 +991,7 @@ export class HostRuntimeController {
|
||||
firstSeen,
|
||||
isActiveOnline,
|
||||
hasActiveOnlineConnection,
|
||||
inactiveOnlineIntervalMs,
|
||||
now,
|
||||
);
|
||||
return now - lastProbed >= interval;
|
||||
@@ -1081,10 +1099,10 @@ export class HostRuntimeController {
|
||||
|
||||
// Adaptive switching counts fresh comparisons only. The probe map keeps the last known
|
||||
// sample per connection for display and failover; a streak hit needs a candidate measured
|
||||
// in this cycle and a heartbeat RTT from the socket that is active right now. Re-reading
|
||||
// the cached map at every ten-second active tick turned one idle-probe sample into three
|
||||
// "consecutive" wins, and a reconnected socket inherited its predecessor's RTT, so a
|
||||
// working relay connection was replaced within seconds of coming online.
|
||||
// in this cycle and a baseline RTT from the socket that is active right now. Using the
|
||||
// rolling minimum of recent active heartbeats filters out single busy/stalled ticks so a
|
||||
// loaded working socket does not lose to an idle probe, and a proportional threshold avoids
|
||||
// flapping on normal jitter on high-RTT links.
|
||||
const sampledCandidates = connectionsToProbe.filter(
|
||||
(connection) => connection.id !== currentActiveConnectionId,
|
||||
);
|
||||
@@ -1102,22 +1120,29 @@ export class HostRuntimeController {
|
||||
})
|
||||
.sort((left, right) => left.latencyMs - right.latencyMs)[0] ?? null;
|
||||
if (!fastest) {
|
||||
// Every candidate sampled this cycle failed: that breaks the streak.
|
||||
// Every candidate sampled this cycle failed: that breaks the streak and backs off.
|
||||
this.resetSwitchCandidate();
|
||||
this.advanceInactiveOnlineProbeBackoff();
|
||||
return;
|
||||
}
|
||||
|
||||
const activeRttMs = this.currentActiveSocketRttMs();
|
||||
const activeRttMs = this.currentActiveSocketBaselineRttMs(performance.now());
|
||||
if (activeRttMs === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
const requiredImprovementMs = Math.max(
|
||||
ADAPTIVE_SWITCH_THRESHOLD_MS,
|
||||
activeRttMs * ADAPTIVE_SWITCH_MIN_IMPROVEMENT_RATIO,
|
||||
);
|
||||
const improvement = activeRttMs - fastest.latencyMs;
|
||||
if (improvement < ADAPTIVE_SWITCH_THRESHOLD_MS) {
|
||||
if (improvement < requiredImprovementMs) {
|
||||
this.resetSwitchCandidate();
|
||||
this.advanceInactiveOnlineProbeBackoff();
|
||||
return;
|
||||
}
|
||||
|
||||
this.resetInactiveOnlineProbeBackoff();
|
||||
if (this.switchCandidateConnectionId === fastest.connectionId) {
|
||||
this.switchCandidateHitCount += 1;
|
||||
} else {
|
||||
@@ -1130,6 +1155,7 @@ export class HostRuntimeController {
|
||||
await this.switchToConnection({
|
||||
connectionId: fastest.connectionId,
|
||||
expectedProbeVersion: requestVersion,
|
||||
keepActiveUntilConnected: true,
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -1194,6 +1220,7 @@ export class HostRuntimeController {
|
||||
return;
|
||||
}
|
||||
if (rttMs !== null) {
|
||||
this.recordActiveRttSample(rttMs, performance.now());
|
||||
probeByConnectionId.set(connection.id, {
|
||||
status: "available",
|
||||
latencyMs: rttMs,
|
||||
@@ -1245,6 +1272,45 @@ export class HostRuntimeController {
|
||||
return client.getLastLivenessRttMs();
|
||||
}
|
||||
|
||||
private recordActiveRttSample(rttMs: number, now: number): void {
|
||||
this.activeRttSamples = this.activeRttSamples.filter(
|
||||
(sample) => now - sample.at <= ACTIVE_RTT_WINDOW_MS,
|
||||
);
|
||||
this.activeRttSamples.push({ at: now, rttMs });
|
||||
}
|
||||
|
||||
private clearActiveRttSamples(): void {
|
||||
this.activeRttSamples = [];
|
||||
}
|
||||
|
||||
private currentActiveSocketBaselineRttMs(now: number): number | null {
|
||||
const currentRttMs = this.currentActiveSocketRttMs();
|
||||
if (currentRttMs === null) return null;
|
||||
this.recordActiveRttSample(currentRttMs, now);
|
||||
let baseline = this.activeRttSamples[0]!.rttMs;
|
||||
for (const sample of this.activeRttSamples) {
|
||||
if (sample.rttMs < baseline) baseline = sample.rttMs;
|
||||
}
|
||||
return baseline;
|
||||
}
|
||||
|
||||
private inactiveOnlineProbeIntervalMs(): number {
|
||||
return Math.min(
|
||||
PROBE_INACTIVE_WHILE_ONLINE_INITIAL_MS * 2 ** this.inactiveOnlineProbeBackoffStep,
|
||||
PROBE_INACTIVE_WHILE_ONLINE_MAX_MS,
|
||||
);
|
||||
}
|
||||
|
||||
private advanceInactiveOnlineProbeBackoff(): void {
|
||||
if (this.inactiveOnlineProbeIntervalMs() < PROBE_INACTIVE_WHILE_ONLINE_MAX_MS) {
|
||||
this.inactiveOnlineProbeBackoffStep += 1;
|
||||
}
|
||||
}
|
||||
|
||||
private resetInactiveOnlineProbeBackoff(): void {
|
||||
this.inactiveOnlineProbeBackoffStep = 0;
|
||||
}
|
||||
|
||||
private resetSwitchCandidate(): void {
|
||||
this.switchCandidateConnectionId = null;
|
||||
this.switchCandidateHitCount = 0;
|
||||
@@ -1434,6 +1500,7 @@ export class HostRuntimeController {
|
||||
connectionId: string;
|
||||
expectedProbeVersion?: number;
|
||||
existingClient?: DaemonClient;
|
||||
keepActiveUntilConnected?: boolean;
|
||||
}): Promise<void> {
|
||||
const { connectionId, expectedProbeVersion, existingClient } = input;
|
||||
if (!this.canProceedForProbe(expectedProbeVersion)) {
|
||||
@@ -1455,6 +1522,24 @@ export class HostRuntimeController {
|
||||
return;
|
||||
}
|
||||
|
||||
const makeBeforeBreak =
|
||||
Boolean(input.keepActiveUntilConnected) &&
|
||||
!existingClient &&
|
||||
this.activeClient !== null &&
|
||||
this.connectionMachineState.tag === "online";
|
||||
|
||||
const nextGeneration = this.snapshot.clientGeneration + 1;
|
||||
if (makeBeforeBreak) {
|
||||
await this.switchToConnectionMakeBeforeBreak({
|
||||
connection,
|
||||
clientId,
|
||||
nextGeneration,
|
||||
requestVersion,
|
||||
expectedProbeVersion,
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
await this.disposePreviousActiveClient();
|
||||
|
||||
if (!this.isSwitchStillValid(requestVersion, expectedProbeVersion)) {
|
||||
@@ -1462,7 +1547,6 @@ export class HostRuntimeController {
|
||||
return;
|
||||
}
|
||||
|
||||
const nextGeneration = this.snapshot.clientGeneration + 1;
|
||||
const client =
|
||||
existingClient ??
|
||||
this.deps.createClient({
|
||||
@@ -1479,6 +1563,8 @@ export class HostRuntimeController {
|
||||
}
|
||||
|
||||
this.activeClient = client;
|
||||
this.clearActiveRttSamples();
|
||||
this.resetInactiveOnlineProbeBackoff();
|
||||
this.applyConnectionEvent({
|
||||
type: "select_connection",
|
||||
connectionId: connection.id,
|
||||
@@ -1490,67 +1576,148 @@ export class HostRuntimeController {
|
||||
client: null,
|
||||
});
|
||||
|
||||
const failConnection = async (error: unknown) => {
|
||||
if (!this.isCurrentSwitchRequest(requestVersion) || this.activeClient !== client) return;
|
||||
const authFailure = getConnectionAuthFailureReason(error);
|
||||
if (authFailure) this.authRejectedConnectionIds.add(connection.id);
|
||||
this.unsubscribeClientStatus?.();
|
||||
this.unsubscribeClientStatus = null;
|
||||
this.unsubscribeClientHandlers?.();
|
||||
this.unsubscribeClientHandlers = null;
|
||||
client.setReconnectEnabled(false);
|
||||
this.applyConnectionEvent({ type: "connect_failed", message: toErrorMessage(error) });
|
||||
this.updateSnapshot({
|
||||
...toSnapshotConnectionPatch(this.connectionMachineState, this.connectionEpoch),
|
||||
client: null,
|
||||
authFailureReason: authFailure,
|
||||
});
|
||||
if (authFailure) {
|
||||
const probes = new Map(this.snapshot.probeByConnectionId);
|
||||
probes.set(connection.id, { status: "unavailable", latencyMs: null });
|
||||
this.updateSnapshot({ probeByConnectionId: probes });
|
||||
for (const candidate of this.host.connections) {
|
||||
if (!this.authRejectedConnectionIds.has(candidate.id)) {
|
||||
this.connectionLastProbedAt.delete(candidate.id);
|
||||
}
|
||||
}
|
||||
}
|
||||
try {
|
||||
await client.close();
|
||||
} catch {
|
||||
/* Preserve the compatibility/connection error. */
|
||||
}
|
||||
if (
|
||||
authFailure &&
|
||||
this.host.connections.some((candidate) => !this.authRejectedConnectionIds.has(candidate.id))
|
||||
) {
|
||||
void this.runProbeCycleNow();
|
||||
}
|
||||
};
|
||||
try {
|
||||
if (!existingClient) await client.connect();
|
||||
if (!this.isCurrentSwitchRequest(requestVersion) || this.activeClient !== client) return;
|
||||
this.unsubscribeClientHandlers =
|
||||
this.deps.mountClientHandlers?.({ client, host: this.host, connection }) ?? null;
|
||||
this.unsubscribeClientStatus = client.subscribeConnectionStatus((state) => {
|
||||
if (!this.isCurrentSwitchRequest(requestVersion) || this.activeClient !== client) return;
|
||||
if (client.authFailureReason) {
|
||||
void failConnection(new DaemonAuthenticationError(client.authFailureReason));
|
||||
return;
|
||||
}
|
||||
if (state.status === "connected") this.learnRelaySecurity(client, connection.id);
|
||||
// Switch evidence belongs to the socket it was measured against.
|
||||
if (state.status !== "connected") this.resetSwitchCandidate();
|
||||
this.applyConnectionEvent({ type: "client_state", state, lastError: client.lastError });
|
||||
this.updateSnapshot({
|
||||
...toSnapshotConnectionPatch(this.connectionMachineState, this.connectionEpoch),
|
||||
...this.buildAgentDirectoryStatusPatch(),
|
||||
client,
|
||||
authFailureReason: null,
|
||||
});
|
||||
});
|
||||
this.attachActiveClient({ client, connection });
|
||||
} catch (error) {
|
||||
await failConnection(error);
|
||||
await this.failActiveConnection({ client, connection, error });
|
||||
}
|
||||
}
|
||||
|
||||
private async switchToConnectionMakeBeforeBreak(input: {
|
||||
connection: HostConnection;
|
||||
clientId: string;
|
||||
nextGeneration: number;
|
||||
requestVersion: number;
|
||||
expectedProbeVersion?: number;
|
||||
}): Promise<void> {
|
||||
const { connection, clientId, nextGeneration, requestVersion, expectedProbeVersion } = input;
|
||||
const replacement = this.deps.createClient({
|
||||
host: this.host,
|
||||
connection,
|
||||
clientId,
|
||||
runtimeGeneration: nextGeneration,
|
||||
});
|
||||
replacement.setReconnectEnabled(false);
|
||||
try {
|
||||
await replacement.connect();
|
||||
} catch (error) {
|
||||
const authFailure = getConnectionAuthFailureReason(error);
|
||||
if (authFailure) {
|
||||
this.authRejectedConnectionIds.add(connection.id);
|
||||
const probes = new Map(this.snapshot.probeByConnectionId);
|
||||
probes.set(connection.id, { status: "unavailable", latencyMs: null });
|
||||
this.updateSnapshot({ probeByConnectionId: probes });
|
||||
}
|
||||
await replacement.close().catch(() => undefined);
|
||||
return;
|
||||
}
|
||||
|
||||
const resolveValidTarget = (): HostConnection | null => {
|
||||
if (!this.isSwitchStillValid(requestVersion, expectedProbeVersion)) return null;
|
||||
const saved = findConnectionById(this.host, connection.id);
|
||||
if (!saved || connectionNeedsNewClient(connection, saved, replacement)) return null;
|
||||
return saved;
|
||||
};
|
||||
|
||||
if (!resolveValidTarget()) {
|
||||
await replacement.close().catch(() => undefined);
|
||||
return;
|
||||
}
|
||||
|
||||
replacement.setReconnectEnabled(true);
|
||||
await this.disposePreviousActiveClient();
|
||||
|
||||
const target = resolveValidTarget();
|
||||
if (!target) {
|
||||
await replacement.close().catch(() => undefined);
|
||||
return;
|
||||
}
|
||||
|
||||
this.activeClient = replacement;
|
||||
this.clearActiveRttSamples();
|
||||
this.resetInactiveOnlineProbeBackoff();
|
||||
this.applyConnectionEvent({
|
||||
type: "select_connection",
|
||||
connectionId: target.id,
|
||||
connection: toActiveConnection(target),
|
||||
});
|
||||
this.snapshot = { ...this.snapshot, clientGeneration: nextGeneration };
|
||||
this.attachActiveClient({ client: replacement, connection: target });
|
||||
}
|
||||
|
||||
private attachActiveClient(input: { client: DaemonClient; connection: HostConnection }): void {
|
||||
const { client, connection } = input;
|
||||
this.unsubscribeClientHandlers =
|
||||
this.deps.mountClientHandlers?.({ client, host: this.host, connection }) ?? null;
|
||||
this.unsubscribeClientStatus = client.subscribeConnectionStatus((state) => {
|
||||
if (this.activeClient !== client) return;
|
||||
if (client.authFailureReason) {
|
||||
void this.failActiveConnection({
|
||||
client,
|
||||
connection,
|
||||
error: new DaemonAuthenticationError(client.authFailureReason),
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (state.status === "connected") this.learnRelaySecurity(client, connection.id);
|
||||
// Switch evidence belongs to the socket it was measured against.
|
||||
if (state.status !== "connected") {
|
||||
this.resetSwitchCandidate();
|
||||
this.clearActiveRttSamples();
|
||||
this.resetInactiveOnlineProbeBackoff();
|
||||
}
|
||||
this.applyConnectionEvent({ type: "client_state", state, lastError: client.lastError });
|
||||
this.updateSnapshot({
|
||||
...toSnapshotConnectionPatch(this.connectionMachineState, this.connectionEpoch),
|
||||
...this.buildAgentDirectoryStatusPatch(),
|
||||
client,
|
||||
authFailureReason: null,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private async failActiveConnection(input: {
|
||||
client: DaemonClient;
|
||||
connection: HostConnection;
|
||||
error: unknown;
|
||||
}): Promise<void> {
|
||||
const { client, connection, error } = input;
|
||||
if (this.activeClient !== client) return;
|
||||
const authFailure = getConnectionAuthFailureReason(error);
|
||||
if (authFailure) this.authRejectedConnectionIds.add(connection.id);
|
||||
this.unsubscribeClientStatus?.();
|
||||
this.unsubscribeClientStatus = null;
|
||||
this.unsubscribeClientHandlers?.();
|
||||
this.unsubscribeClientHandlers = null;
|
||||
client.setReconnectEnabled(false);
|
||||
this.applyConnectionEvent({ type: "connect_failed", message: toErrorMessage(error) });
|
||||
this.updateSnapshot({
|
||||
...toSnapshotConnectionPatch(this.connectionMachineState, this.connectionEpoch),
|
||||
client: null,
|
||||
authFailureReason: authFailure,
|
||||
});
|
||||
if (authFailure) {
|
||||
const probes = new Map(this.snapshot.probeByConnectionId);
|
||||
probes.set(connection.id, { status: "unavailable", latencyMs: null });
|
||||
this.updateSnapshot({ probeByConnectionId: probes });
|
||||
for (const candidate of this.host.connections) {
|
||||
if (!this.authRejectedConnectionIds.has(candidate.id)) {
|
||||
this.connectionLastProbedAt.delete(candidate.id);
|
||||
}
|
||||
}
|
||||
}
|
||||
try {
|
||||
await client.close();
|
||||
} catch {
|
||||
/* Preserve the compatibility/connection error. */
|
||||
}
|
||||
if (
|
||||
authFailure &&
|
||||
this.host.connections.some((candidate) => !this.authRejectedConnectionIds.has(candidate.id))
|
||||
) {
|
||||
void this.runProbeCycleNow();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1693,6 +1860,7 @@ export class HostRuntimeStore {
|
||||
private hostRegistryStatus: HostRegistryStatus = "loading";
|
||||
private deps: HostRuntimeControllerDeps;
|
||||
private lastConnectionStatusByServer = new Map<string, HostRuntimeConnectionStatus>();
|
||||
private lastOnlineEpochByServer = new Map<string, number>();
|
||||
private connectionStatusStartedAtByServer = new Map<string, number>();
|
||||
private queuedAgentDrainInFlight = new Set<string>();
|
||||
private directorySyncByServer = new Map<string, DirectorySync>();
|
||||
@@ -1950,6 +2118,7 @@ export class HostRuntimeStore {
|
||||
|
||||
rekeyMap(this.controllers, oldServerId, newServerId);
|
||||
rekeyMap(this.lastConnectionStatusByServer, oldServerId, newServerId);
|
||||
rekeyMap(this.lastOnlineEpochByServer, oldServerId, newServerId);
|
||||
rekeyMap(this.connectionStatusStartedAtByServer, oldServerId, newServerId);
|
||||
this.replicaCache.reconcileServerId(oldServerId, newServerId);
|
||||
projectIconCache.reconcileServerId(oldServerId, newServerId);
|
||||
@@ -2442,6 +2611,7 @@ export class HostRuntimeStore {
|
||||
this.fleetDirectoryDemand.delete(serverId);
|
||||
this.controllers.delete(serverId);
|
||||
this.lastConnectionStatusByServer.delete(serverId);
|
||||
this.lastOnlineEpochByServer.delete(serverId);
|
||||
this.connectionStatusStartedAtByServer.delete(serverId);
|
||||
this.directorySyncByServer.get(serverId)?.dispose();
|
||||
this.directorySyncByServer.delete(serverId);
|
||||
@@ -2492,6 +2662,9 @@ export class HostRuntimeStore {
|
||||
);
|
||||
const initialSnapshot = controller.getSnapshot();
|
||||
this.lastConnectionStatusByServer.set(host.serverId, initialSnapshot.connectionStatus);
|
||||
if (initialSnapshot.connectionStatus === "online") {
|
||||
this.lastOnlineEpochByServer.set(host.serverId, initialSnapshot.connectionEpoch);
|
||||
}
|
||||
this.connectionStatusStartedAtByServer.set(host.serverId, Date.now());
|
||||
controller.subscribe(() => {
|
||||
const snapshot = controller.getSnapshot();
|
||||
@@ -2591,6 +2764,7 @@ export class HostRuntimeStore {
|
||||
const controller = this.controllers.get(serverId);
|
||||
if (!controller) {
|
||||
this.lastConnectionStatusByServer.delete(serverId);
|
||||
this.lastOnlineEpochByServer.delete(serverId);
|
||||
this.connectionStatusStartedAtByServer.delete(serverId);
|
||||
return;
|
||||
}
|
||||
@@ -2605,6 +2779,7 @@ export class HostRuntimeStore {
|
||||
},
|
||||
});
|
||||
const previousStatus = this.lastConnectionStatusByServer.get(serverId);
|
||||
const previousOnlineEpoch = this.lastOnlineEpochByServer.get(serverId);
|
||||
const statusChanged = previousStatus !== snapshot.connectionStatus;
|
||||
const isUnavailable =
|
||||
snapshot.connectionStatus !== "online" && snapshot.connectionStatus !== "idle";
|
||||
@@ -2615,7 +2790,11 @@ export class HostRuntimeStore {
|
||||
}
|
||||
this.lastConnectionStatusByServer.set(serverId, snapshot.connectionStatus);
|
||||
const didTransitionOnline =
|
||||
snapshot.connectionStatus === "online" && previousStatus !== "online";
|
||||
snapshot.connectionStatus === "online" &&
|
||||
(previousStatus !== "online" || previousOnlineEpoch !== snapshot.connectionEpoch);
|
||||
if (snapshot.connectionStatus === "online") {
|
||||
this.lastOnlineEpochByServer.set(serverId, snapshot.connectionEpoch);
|
||||
}
|
||||
if (didTransitionOnline) {
|
||||
useSessionStore.getState().bumpHistorySyncGeneration(serverId);
|
||||
for (const child of this.controllers.values()) void child.reconnectVia(serverId);
|
||||
|
||||
@@ -806,6 +806,28 @@ describe("ReplicaCache", () => {
|
||||
expect((await cache.readTimeline(SERVER_ID, "agent-1"))?.items).toEqual([timelineItem("New")]);
|
||||
});
|
||||
|
||||
it("keeps a turn's stats on its footer row across cache reopen", async () => {
|
||||
const storage = new MemoryStorage();
|
||||
const writer = createCache(storage);
|
||||
const answer: StreamItem = {
|
||||
...(timelineItem("Done") as Extract<StreamItem, { kind: "assistant_message" }>),
|
||||
turnMetrics: [
|
||||
{ label: "Model", value: "gemini-3.6-flash" },
|
||||
{ label: "Cache", value: "64%", tone: "ok" },
|
||||
],
|
||||
};
|
||||
writer.commitTimeline(SERVER_ID, "agent-1", {
|
||||
agentId: "agent-1",
|
||||
items: [answer],
|
||||
range: { epoch: "epoch-1", startSeq: 12, endSeq: 12 },
|
||||
hasOlder: false,
|
||||
});
|
||||
await writer.flush();
|
||||
|
||||
const reader = createCache(storage);
|
||||
expect((await reader.readTimeline(SERVER_ID, "agent-1"))?.items).toEqual([answer]);
|
||||
});
|
||||
|
||||
it("round-trips plugin timeline items", async () => {
|
||||
const storage = new MemoryStorage();
|
||||
const writer = createCache(storage);
|
||||
|
||||
@@ -2,6 +2,7 @@ import { findMountedWindowStart } from "@/agent-stream/history-window";
|
||||
import { z } from "zod";
|
||||
import {
|
||||
AgentBackgroundWorkSummarySchema,
|
||||
AgentMetricSchema,
|
||||
AgentStatusSchema,
|
||||
AgentTimelineItemPayloadSchema,
|
||||
ForgeWebSchema,
|
||||
@@ -129,6 +130,7 @@ const StoredTimelineItemSchema = z.discriminatedUnion("kind", [
|
||||
...TimelineItemBaseShape,
|
||||
kind: z.literal("assistant_message"),
|
||||
messageId: z.string().optional(),
|
||||
turnMetrics: z.array(AgentMetricSchema).optional(),
|
||||
text: z.string(),
|
||||
// Reject old caches containing display fragments; refetch the complete source text.
|
||||
}),
|
||||
@@ -163,6 +165,7 @@ const StoredTimelineItemSchema = z.discriminatedUnion("kind", [
|
||||
...TimelineItemBaseShape,
|
||||
kind: z.literal("tool_call"),
|
||||
provider: AgentProviderSchema,
|
||||
turnMetrics: z.array(AgentMetricSchema).optional(),
|
||||
item: AgentTimelineItemPayloadSchema.refine((item) => item.type === "tool_call"),
|
||||
}),
|
||||
z.strictObject({
|
||||
@@ -482,6 +485,7 @@ function serializeTimelineItem(item: StreamItem): StoredTimelineItem | null {
|
||||
...base,
|
||||
kind: item.kind,
|
||||
...(item.messageId ? { messageId: item.messageId } : {}),
|
||||
...(item.turnMetrics ? { turnMetrics: item.turnMetrics } : {}),
|
||||
text: item.text,
|
||||
};
|
||||
case "thought":
|
||||
@@ -516,6 +520,7 @@ function serializeTimelineItem(item: StreamItem): StoredTimelineItem | null {
|
||||
...base,
|
||||
kind: item.kind,
|
||||
provider: item.payload.data.provider,
|
||||
...(item.turnMetrics ? { turnMetrics: item.turnMetrics } : {}),
|
||||
item: serializeAgentToolCall(item.payload.data),
|
||||
};
|
||||
case "plugin":
|
||||
@@ -575,6 +580,7 @@ function deserializeBuiltinTimelineItem(
|
||||
...base,
|
||||
kind: item.kind,
|
||||
...(item.messageId ? { messageId: item.messageId } : {}),
|
||||
...(item.turnMetrics ? { turnMetrics: item.turnMetrics } : {}),
|
||||
text: item.text,
|
||||
};
|
||||
case "thought":
|
||||
@@ -611,6 +617,7 @@ function deserializeBuiltinTimelineItem(
|
||||
return {
|
||||
...base,
|
||||
kind: item.kind,
|
||||
...(item.turnMetrics ? { turnMetrics: item.turnMetrics } : {}),
|
||||
payload: {
|
||||
source: "agent",
|
||||
data: {
|
||||
|
||||
@@ -24,6 +24,7 @@ import { TitlebarDragRegion } from "@/components/desktop/titlebar-drag-region";
|
||||
import { MenuHeader } from "@/components/headers/menu-header";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { useToast } from "@/contexts/toast-context";
|
||||
import { draftCreationKey } from "@/composer/draft/creation-key";
|
||||
import { useAgentInputDraft } from "@/composer/draft/input-draft";
|
||||
import { useForgeSearchQuery } from "@/git/use-forge-search-query";
|
||||
import { getForgePresentation } from "@/git/forge";
|
||||
@@ -336,6 +337,7 @@ interface WorkspaceCreationResult {
|
||||
|
||||
async function createMultiplicityWorkspace(input: {
|
||||
idempotencyKey: string;
|
||||
launchTarget: LaunchTarget;
|
||||
worktreeSlug: string;
|
||||
client: NonNullable<ReturnType<typeof useHostRuntimeClient>>;
|
||||
isolation: "local" | "worktree";
|
||||
@@ -365,10 +367,8 @@ async function createMultiplicityWorkspace(input: {
|
||||
prompt: input.prompt,
|
||||
attachments: input.attachments,
|
||||
});
|
||||
const payload = await input.client.createWorkspace({
|
||||
idempotencyKey: input.idempotencyKey,
|
||||
const request: Omit<CreateWorkspaceRequestOptions, "idempotencyKey" | "onEvent"> = {
|
||||
agent: input.agent,
|
||||
onEvent: input.onEvent,
|
||||
source: isWorktree
|
||||
? {
|
||||
kind: "worktree",
|
||||
@@ -387,6 +387,14 @@ async function createMultiplicityWorkspace(input: {
|
||||
},
|
||||
...(firstAgentContext ? { firstAgentContext } : {}),
|
||||
...(Object.keys(input.metadata).length > 0 ? { metadata: { ...input.metadata } } : {}),
|
||||
};
|
||||
const payload = await input.client.createWorkspace({
|
||||
...request,
|
||||
idempotencyKey: draftCreationKey(input.idempotencyKey, {
|
||||
request,
|
||||
launchTarget: input.launchTarget,
|
||||
}),
|
||||
onEvent: input.onEvent,
|
||||
});
|
||||
if (payload.error || !payload.workspace) {
|
||||
throw new Error(payload.error ?? input.createFailedMessage);
|
||||
@@ -508,7 +516,7 @@ async function createWorkspaceChatAgent(input: CreateChatAgentInput): Promise<Su
|
||||
});
|
||||
const images = await encodeImages(wirePayload.images);
|
||||
let navigated = false;
|
||||
let outcome: SubmitOutcome = "background";
|
||||
const delivery: { outcome: SubmitOutcome } = { outcome: "background" };
|
||||
const initialAgent: NonNullable<CreateWorkspaceRequestOptions["agent"]> = {
|
||||
config: {
|
||||
provider,
|
||||
@@ -545,7 +553,7 @@ async function createWorkspaceChatAgent(input: CreateChatAgentInput): Promise<Su
|
||||
provider,
|
||||
composerState,
|
||||
});
|
||||
outcome = submitWorkspaceDraft({
|
||||
delivery.outcome = submitWorkspaceDraft({
|
||||
clearConsumedDraft,
|
||||
draftKey: input.draftKey,
|
||||
draftContextScopeKey: input.draftContextScopeKey,
|
||||
@@ -571,9 +579,15 @@ async function createWorkspaceChatAgent(input: CreateChatAgentInput): Promise<Su
|
||||
};
|
||||
// A retry after a failed agent start belongs to the ready workspace's draft, not to this creation.
|
||||
const agentCreation = { result: Promise.resolve().then(() => execute()) };
|
||||
await agentCreation.result;
|
||||
if (outcome === "background") clearConsumedDraft();
|
||||
return outcome;
|
||||
try {
|
||||
await agentCreation.result;
|
||||
} catch (error) {
|
||||
// Once handed off to the workspace draft tab, that tab owns surfacing agent startup errors.
|
||||
if (delivery.outcome === "navigated") return delivery.outcome;
|
||||
throw error;
|
||||
}
|
||||
if (delivery.outcome === "background") clearConsumedDraft();
|
||||
return delivery.outcome;
|
||||
}
|
||||
|
||||
function buildComposerConfig(input: {
|
||||
@@ -1349,6 +1363,7 @@ export function NewWorkspaceScreen({
|
||||
: undefined;
|
||||
const normalizedWorkspace = await createMultiplicityWorkspace({
|
||||
idempotencyKey: creationIdentity.draftId,
|
||||
launchTarget,
|
||||
worktreeSlug: creationIdentity.worktreeSlug,
|
||||
client: connectedClient,
|
||||
isolation: createsWorktree ? "worktree" : "local",
|
||||
@@ -1373,6 +1388,7 @@ export function NewWorkspaceScreen({
|
||||
creationIdentity,
|
||||
creationResult,
|
||||
effectiveIsolation,
|
||||
launchTarget,
|
||||
mergeWorkspaces,
|
||||
queryClient,
|
||||
selectedItem,
|
||||
@@ -1443,7 +1459,9 @@ export function NewWorkspaceScreen({
|
||||
const message = toErrorMessage(error);
|
||||
setPendingAction(null);
|
||||
setErrorMessage(message);
|
||||
toast.error(message);
|
||||
if (!isStillOnCreateScreen()) {
|
||||
toast.error(message);
|
||||
}
|
||||
}
|
||||
},
|
||||
[
|
||||
@@ -1524,7 +1542,9 @@ export function NewWorkspaceScreen({
|
||||
const message = toErrorMessage(error);
|
||||
setPendingAction(null);
|
||||
setErrorMessage(message);
|
||||
toast.error(message);
|
||||
if (!isStillOnCreateScreen()) {
|
||||
toast.error(message);
|
||||
}
|
||||
}
|
||||
}, [
|
||||
ensureWorkspace,
|
||||
@@ -1662,6 +1682,7 @@ export function NewWorkspaceScreen({
|
||||
clearDraft={noopClearDraft}
|
||||
autoFocus={terminalTakesPrompt}
|
||||
autoFocusKey={launchFocusKey}
|
||||
error={errorMessage}
|
||||
/>
|
||||
) : (
|
||||
<Composer
|
||||
@@ -1693,6 +1714,7 @@ export function NewWorkspaceScreen({
|
||||
autoFocusKey={launchFocusKey}
|
||||
commandDraft={composerState?.commandDraft}
|
||||
agentControls={agentControlsWithDisabled}
|
||||
error={errorMessage}
|
||||
/>
|
||||
);
|
||||
return (
|
||||
@@ -1705,7 +1727,6 @@ export function NewWorkspaceScreen({
|
||||
onImportSession={importSession.open}
|
||||
>
|
||||
{composer}
|
||||
{errorMessage ? <Text style={styles.errorText}>{errorMessage}</Text> : null}
|
||||
</NewWorkspaceLayout>
|
||||
{importSession.sheet}
|
||||
</FileDropZone>
|
||||
@@ -1867,11 +1888,6 @@ const styles = StyleSheet.create((theme) => ({
|
||||
fontWeight: theme.fontWeight.normal,
|
||||
color: theme.colors.foreground,
|
||||
},
|
||||
errorText: {
|
||||
fontSize: theme.fontSize.base,
|
||||
color: theme.colors.destructive,
|
||||
lineHeight: 20,
|
||||
},
|
||||
}));
|
||||
|
||||
/**
|
||||
|
||||
@@ -29,7 +29,9 @@ import { EditingTextInput as TextInput } from "@/components/ui/text-input";
|
||||
import { SettingsTextAreaCard } from "@/components/settings-textarea";
|
||||
import { SettingsGroup } from "@/components/settings/headings/settings-group";
|
||||
import { SettingsSection } from "@/components/settings/headings/settings-section";
|
||||
import { SettingsBackLink, SettingsDetailHeader } from "@/components/settings";
|
||||
import type { PageTitleParent } from "@/components/page-layout";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { SettingsDetailHeader } from "@/components/settings";
|
||||
import { settingsStyles } from "@/styles/settings";
|
||||
import { useProjects } from "@/hooks/use-projects";
|
||||
import type { ProjectEditFormSnapshot } from "@/projects/edit-form";
|
||||
@@ -95,14 +97,12 @@ export interface ProjectSettingsScreenProps {
|
||||
serverId: string;
|
||||
projectId: string;
|
||||
onBackToProjects: () => void;
|
||||
showBackToProjects: boolean;
|
||||
}
|
||||
|
||||
export default function ProjectSettingsScreen({
|
||||
serverId,
|
||||
projectId,
|
||||
onBackToProjects,
|
||||
showBackToProjects,
|
||||
}: ProjectSettingsScreenProps) {
|
||||
const { projects } = useProjects();
|
||||
const project = useMemo(
|
||||
@@ -123,12 +123,7 @@ export default function ProjectSettingsScreen({
|
||||
selectedHost.repoRoot.trim().length > 0;
|
||||
|
||||
if (!project || !selectedHost || !client || !canEdit) {
|
||||
return (
|
||||
<NoEditableTarget
|
||||
onBackToProjects={onBackToProjects}
|
||||
showBackToProjects={showBackToProjects}
|
||||
/>
|
||||
);
|
||||
return <NoProject onBackToProjects={onBackToProjects} />;
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -138,24 +133,29 @@ export default function ProjectSettingsScreen({
|
||||
client={client}
|
||||
isHostGone={isHostGone}
|
||||
onBackToProjects={onBackToProjects}
|
||||
showBackToProjects={showBackToProjects}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function NoEditableTarget({
|
||||
onBackToProjects,
|
||||
showBackToProjects,
|
||||
}: {
|
||||
onBackToProjects: () => void;
|
||||
showBackToProjects: boolean;
|
||||
}) {
|
||||
/** A project page with no project to name: the title is the way back to Projects. */
|
||||
function NoProject({ onBackToProjects }: { onBackToProjects: () => void }) {
|
||||
const parent = useProjectsParent(onBackToProjects);
|
||||
return (
|
||||
<>
|
||||
<SettingsDetailHeader parent={parent} />
|
||||
<NoEditableTarget onBackToProjects={onBackToProjects} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
function NoEditableTarget({ onBackToProjects }: { onBackToProjects: () => void }) {
|
||||
const { t } = useTranslation();
|
||||
// The compact back header already goes back to Projects.
|
||||
const isCompact = useIsCompactFormFactor();
|
||||
return (
|
||||
<View style={styles.noTargetContainer}>
|
||||
{showBackToProjects ? <BackToProjectsButton onPress={onBackToProjects} /> : null}
|
||||
<Text style={styles.noTargetText}>{t("settings.project.noEditableTarget")}</Text>
|
||||
{showBackToProjects ? (
|
||||
{isCompact ? null : (
|
||||
<Button
|
||||
testID="project-settings-back-button"
|
||||
onPress={onBackToProjects}
|
||||
@@ -163,19 +163,22 @@ function NoEditableTarget({
|
||||
>
|
||||
{t("settings.project.backToProjects")}
|
||||
</Button>
|
||||
) : null}
|
||||
)}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
function BackToProjectsButton({ onPress }: { onPress: () => void }) {
|
||||
/** Projects as the first part of a project page's title, which goes back to the list. */
|
||||
function useProjectsParent(onPress: () => void): PageTitleParent {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<SettingsBackLink
|
||||
label={t("settings.project.backToProjects")}
|
||||
onPress={onPress}
|
||||
testID="project-settings-back-link"
|
||||
/>
|
||||
return useMemo(
|
||||
() => ({
|
||||
label: t("settings.projects"),
|
||||
accessibilityLabel: t("settings.project.backToProjects"),
|
||||
onPress,
|
||||
testID: "project-settings-back-link",
|
||||
}),
|
||||
[onPress, t],
|
||||
);
|
||||
}
|
||||
|
||||
@@ -185,7 +188,6 @@ interface ProjectSettingsBodyProps {
|
||||
client: DaemonClient;
|
||||
isHostGone: boolean;
|
||||
onBackToProjects: () => void;
|
||||
showBackToProjects: boolean;
|
||||
}
|
||||
|
||||
function ProjectSettingsBody({
|
||||
@@ -194,7 +196,6 @@ function ProjectSettingsBody({
|
||||
client,
|
||||
isHostGone,
|
||||
onBackToProjects,
|
||||
showBackToProjects,
|
||||
}: ProjectSettingsBodyProps) {
|
||||
const { t } = useTranslation();
|
||||
const [isEditSheetOpen, setIsEditSheetOpen] = useState(false);
|
||||
@@ -256,17 +257,7 @@ function ProjectSettingsBody({
|
||||
const handleReload = useCallback(() => {
|
||||
void readQuery.refetch();
|
||||
}, [readQuery]);
|
||||
const backLink = useMemo(
|
||||
() =>
|
||||
showBackToProjects
|
||||
? {
|
||||
label: t("settings.project.backToProjects"),
|
||||
onPress: onBackToProjects,
|
||||
testID: "project-settings-back-link",
|
||||
}
|
||||
: undefined,
|
||||
[onBackToProjects, showBackToProjects, t],
|
||||
);
|
||||
const parent = useProjectsParent(onBackToProjects);
|
||||
const titleIcon = useMemo(
|
||||
() => (
|
||||
<ProjectTitleIcon
|
||||
@@ -294,9 +285,9 @@ function ProjectSettingsBody({
|
||||
);
|
||||
|
||||
return (
|
||||
<View role="main" style={styles.body}>
|
||||
<View role="main">
|
||||
<SettingsDetailHeader
|
||||
back={backLink}
|
||||
parent={parent}
|
||||
icon={titleIcon}
|
||||
title={selectedHost.projectName}
|
||||
trailing={editButton}
|
||||
@@ -327,7 +318,6 @@ function ProjectSettingsBody({
|
||||
onReload: handleReload,
|
||||
isHostGone,
|
||||
onBackToProjects,
|
||||
showBackToProjects,
|
||||
})}
|
||||
</View>
|
||||
);
|
||||
@@ -345,7 +335,6 @@ interface RenderContentInput {
|
||||
onReload: () => void;
|
||||
isHostGone: boolean;
|
||||
onBackToProjects: () => void;
|
||||
showBackToProjects: boolean;
|
||||
}
|
||||
|
||||
function renderContent({
|
||||
@@ -360,7 +349,6 @@ function renderContent({
|
||||
onReload,
|
||||
isHostGone,
|
||||
onBackToProjects,
|
||||
showBackToProjects,
|
||||
}: RenderContentInput) {
|
||||
if (readQuery.isLoading) {
|
||||
return (
|
||||
@@ -379,12 +367,7 @@ function renderContent({
|
||||
}
|
||||
|
||||
if (isHostGone) {
|
||||
return (
|
||||
<NoEditableTarget
|
||||
onBackToProjects={onBackToProjects}
|
||||
showBackToProjects={showBackToProjects}
|
||||
/>
|
||||
);
|
||||
return <NoEditableTarget onBackToProjects={onBackToProjects} />;
|
||||
}
|
||||
|
||||
if (!loadedConfig) {
|
||||
@@ -1118,10 +1101,6 @@ const styles = StyleSheet.create((theme) => ({
|
||||
color: theme.colors.foregroundMuted,
|
||||
fontSize: theme.fontSize.base,
|
||||
},
|
||||
body: {
|
||||
padding: theme.spacing[4],
|
||||
gap: theme.spacing[2],
|
||||
},
|
||||
editButton: {
|
||||
padding: theme.spacing[1],
|
||||
},
|
||||
|
||||
@@ -1335,7 +1335,6 @@ export default function SettingsScreen({ view }: SettingsScreenProps) {
|
||||
serverId={view.serverId}
|
||||
projectId={view.projectId}
|
||||
onBackToProjects={handleBackFromDetail}
|
||||
showBackToProjects={!isCompactLayout}
|
||||
/>
|
||||
);
|
||||
}
|
||||
@@ -1345,7 +1344,6 @@ export default function SettingsScreen({ view }: SettingsScreenProps) {
|
||||
serverId={view.serverId}
|
||||
provider={view.providerId}
|
||||
onBack={handleBackFromDetail}
|
||||
showBack={!isCompactLayout}
|
||||
/>
|
||||
);
|
||||
}
|
||||
@@ -1450,7 +1448,8 @@ export default function SettingsScreen({ view }: SettingsScreenProps) {
|
||||
<WindowChromeRegion corners="top-right">
|
||||
<View style={desktopStyles.contentPane} testID="settings-detail-pane">
|
||||
<PageLayout
|
||||
title={detailTitle}
|
||||
// A project or provider page draws its own title, which names the list it came from.
|
||||
title={view.kind === "project" || view.kind === "provider" ? undefined : detailTitle}
|
||||
actions={detailActions}
|
||||
width={detailWidth}
|
||||
titleTestID="settings-detail-header-title"
|
||||
|
||||
@@ -3,7 +3,14 @@ import React, { useCallback, useMemo } from "react";
|
||||
import { View } from "react-native";
|
||||
import { useRouter, type Href } from "expo-router";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Copy, Ellipsis, Globe, Import as ImportIcon, Settings } from "lucide-react-native";
|
||||
import {
|
||||
Archive,
|
||||
Copy,
|
||||
Ellipsis,
|
||||
Globe,
|
||||
Import as ImportIcon,
|
||||
Settings,
|
||||
} from "lucide-react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import type { TerminalProfile } from "@getpaseo/protocol/messages";
|
||||
import {
|
||||
@@ -21,6 +28,7 @@ import {
|
||||
useIconButtonChromeStyle,
|
||||
} from "@/components/ui/icon-button-chrome";
|
||||
import { TerminalProfileIcon } from "@/components/terminal-profile-icon";
|
||||
import { useActiveWorkspaceArchive } from "@/hooks/use-active-workspace-archive";
|
||||
import { useDaemonConfig } from "@/hooks/use-daemon-config";
|
||||
import {
|
||||
getTerminalProfileIcon,
|
||||
@@ -35,6 +43,7 @@ import {
|
||||
import { usePluginWorkspaceMenu } from "@/plugins";
|
||||
|
||||
const ThemedEllipsis = withUnistyles(Ellipsis);
|
||||
const ThemedArchive = withUnistyles(Archive);
|
||||
const ThemedCopy = withUnistyles(Copy);
|
||||
const ThemedGlobe = withUnistyles(Globe);
|
||||
const ThemedImport = withUnistyles(ImportIcon);
|
||||
@@ -45,6 +54,7 @@ const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMut
|
||||
const MENU_NEW_BROWSER_ICON = <ThemedGlobe size={16} uniProps={mutedColorMapping} />;
|
||||
const MENU_IMPORT_ICON = <ThemedImport size={16} uniProps={mutedColorMapping} />;
|
||||
const MENU_COPY_ICON = <ThemedCopy size={16} uniProps={mutedColorMapping} />;
|
||||
const MENU_ARCHIVE_ICON = <ThemedArchive size={16} uniProps={mutedColorMapping} />;
|
||||
const MENU_SETTINGS_ICON = <ThemedSettings size={16} uniProps={mutedColorMapping} />;
|
||||
function WorkspaceHeaderMenuTriggerIcon() {
|
||||
return (
|
||||
@@ -259,6 +269,10 @@ export function WorkspaceHeaderMenuMobile({
|
||||
const handleEditProfiles = useCallback(() => {
|
||||
router.push(buildSettingsHostSectionRoute(normalizedServerId, "terminals") as Href);
|
||||
}, [normalizedServerId, router]);
|
||||
const { canArchive, archive } = useActiveWorkspaceArchive();
|
||||
const handleArchiveWorkspace = useCallback(() => {
|
||||
archive();
|
||||
}, [archive]);
|
||||
const scriptsMenu = useWorkspaceScriptsMenuPages(scripts);
|
||||
const pluginMenu = usePluginWorkspaceMenu(normalizedServerId, normalizedWorkspaceId);
|
||||
const pages = useMemo(
|
||||
@@ -330,6 +344,15 @@ export function WorkspaceHeaderMenuMobile({
|
||||
) : null}
|
||||
<WorkspaceHeaderWorkspaceActionItems {...workspaceActions} />
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem
|
||||
testID="workspace-header-archive-workspace"
|
||||
leading={MENU_ARCHIVE_ICON}
|
||||
disabled={!canArchive}
|
||||
onSelect={handleArchiveWorkspace}
|
||||
>
|
||||
{t("sidebar.workspace.actions.archiveWorkspace")}
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuLabel>{t("workspace.tabs.actions.terminalProfilesMenu")}</DropdownMenuLabel>
|
||||
{profiles.map((profile) => (
|
||||
<HeaderMenuProfileItem
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user