mirror of
https://github.com/getpaseo/paseo.git
synced 2026-11-22 08:15:05 +00:00
Compare commits
31
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
25febf8511 | ||
|
|
521a2fa679 | ||
|
|
d72ce40474 | ||
|
|
e6c7111404 | ||
|
|
c4d471cc74 | ||
|
|
5dbf156b7e | ||
|
|
ede181d39a | ||
|
|
c28aa2570c | ||
|
|
08ad7c7271 | ||
|
|
b2ecec8719 | ||
|
|
fa37fd20ca | ||
|
|
ff5a83bc5a | ||
|
|
9cb0625cf5 | ||
|
|
03adc4d4ba | ||
|
|
4b429c0030 | ||
|
|
20f217b8cb | ||
|
|
984e2ea5e7 | ||
|
|
133b078ac4 | ||
|
|
6ea095cb49 | ||
|
|
f7e2ab4076 | ||
|
|
2445adecdf | ||
|
|
0c02cfdfb1 | ||
|
|
2098eb787c | ||
|
|
9c4106561a | ||
|
|
c1c29fcb56 | ||
|
|
1e30f9e046 | ||
|
|
6946d0a429 | ||
|
|
344da5d088 | ||
|
|
01aa8b3406 | ||
|
|
d816b94c54 | ||
|
|
4c0bf97dbf |
@@ -2,7 +2,7 @@ name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
branches: [main, "release/**"]
|
||||
# Every base branch, so stacked PRs and PRs into any base get the same checks.
|
||||
pull_request:
|
||||
merge_group:
|
||||
@@ -56,7 +56,7 @@ jobs:
|
||||
filters: .github/ci-paths.yml
|
||||
|
||||
- name: Validate CI contracts
|
||||
run: node --test scripts/ci-workflow.test.mjs scripts/daemon-launch-contract.test.mjs scripts/changelog-utils.test.mjs scripts/sync-fdroid-changelogs.test.mjs scripts/sync-release-notes-from-changelog.test.mjs scripts/upload-release-assets.test.mjs
|
||||
run: node --test scripts/ci-workflow.test.mjs scripts/daemon-launch-contract.test.mjs scripts/changelog-utils.test.mjs scripts/release-version-utils.test.mjs scripts/publish-release-packages.test.mjs scripts/push-current-release-tag.test.mjs scripts/reconcile-release.test.mjs scripts/sync-fdroid-changelogs.test.mjs scripts/sync-release-notes-from-changelog.test.mjs scripts/upload-release-assets.test.mjs
|
||||
|
||||
quality:
|
||||
name: quality
|
||||
@@ -278,8 +278,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 +307,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
|
||||
|
||||
@@ -2,7 +2,7 @@ name: Desktop Packages
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
branches: [main, "release/**"]
|
||||
# Packaging leaves ordinary PR CI, but a PR that changes what gets packaged
|
||||
# or how it is smoked still proves the real artifacts before merge.
|
||||
pull_request:
|
||||
@@ -11,10 +11,11 @@ on:
|
||||
- "plugins/**"
|
||||
- "nix/**"
|
||||
- ".github/workflows/desktop-packages.yml"
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: desktop-packages-${{ github.ref }}
|
||||
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
@@ -170,33 +170,11 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
export PASEO_REAL_XCRUN="$(command -v xcrun)"
|
||||
stapler_bin="$(mktemp -d)"
|
||||
trap 'rm -rf "$stapler_bin"' EXIT
|
||||
cat > "$stapler_bin/xcrun" <<'STAPLER'
|
||||
#!/bin/bash
|
||||
if [[ "${1:-}" != stapler || "${2:-}" != staple ]]; then
|
||||
exec "$PASEO_REAL_XCRUN" "$@"
|
||||
fi
|
||||
output="$(mktemp)"
|
||||
trap 'rm -f "$output"' EXIT
|
||||
for attempt in 1 2 3 4; do
|
||||
if "$PASEO_REAL_XCRUN" "$@" >"$output" 2>&1; then
|
||||
cat "$output"
|
||||
exit 0
|
||||
else
|
||||
status=$?
|
||||
fi
|
||||
cat "$output"
|
||||
if [[ "$status" != 68 || "$attempt" == 4 ]] ||
|
||||
! grep -Fq 'NSURLErrorDomain Code=-1005' "$output"; then
|
||||
exit "$status"
|
||||
fi
|
||||
echo "::warning::Apple staple connection lost; retrying the same signed app ($attempt/4)" >&2
|
||||
sleep 30
|
||||
done
|
||||
STAPLER
|
||||
chmod +x "$stapler_bin/xcrun"
|
||||
export PATH="$stapler_bin:$PATH"
|
||||
xcrun_bin="$(mktemp -d)"
|
||||
trap 'rm -rf "$xcrun_bin"' EXIT
|
||||
cp scripts/macos-xcrun-retry.sh "$xcrun_bin/xcrun"
|
||||
chmod +x "$xcrun_bin/xcrun"
|
||||
export PATH="$xcrun_bin:$PATH"
|
||||
build_args=(-- --publish never --mac --${{ matrix.electron_arch }})
|
||||
build_args+=("-c.publish.releaseType=$RELEASE_TYPE")
|
||||
build_args+=("-c.publish.channel=$RELEASE_CHANNEL")
|
||||
@@ -502,6 +480,7 @@ jobs:
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
mkdir -p release-manifests
|
||||
cd release-manifests
|
||||
manifests_dir="$PWD/final"
|
||||
mkdir -p "$manifests_dir"
|
||||
|
||||
@@ -29,8 +29,8 @@ on:
|
||||
- "true"
|
||||
|
||||
concurrency:
|
||||
group: docker-${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: false
|
||||
group: docker-${{ github.workflow }}-${{ github.event_name == 'workflow_dispatch' && inputs.publish == 'true' && format('publish-{0}', inputs.paseo_version || github.run_id) || github.ref }}
|
||||
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/') && !(github.event_name == 'workflow_dispatch' && inputs.publish == 'true') }}
|
||||
|
||||
env:
|
||||
REGISTRY: ghcr.io
|
||||
|
||||
@@ -3,6 +3,7 @@ name: Nix
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
+36
-28
@@ -1,70 +1,77 @@
|
||||
# Changelog
|
||||
|
||||
## 0.17.0 - 2026-11-21
|
||||
## 0.17.1 - 2026-11-21
|
||||
|
||||
- **Use existing worktrees:** Start a workspace in a worktree you already have, or create one from a branch or pull request. Plugins can manage worktree creation, removal, and restoration. When you branch off a fork PR or MR, choose Run setup to approve workspace automation. ([#10190](https://github.com/getpaseo/paseo/pull/10190), [#10278](https://github.com/getpaseo/paseo/pull/10278))
|
||||
- **Update providers in Paseo:** See each provider's status, installed version, and available updates in the provider list. Open a provider's settings from Settings, setup, or the model picker to update supported CLIs and watch their output. ([#9568](https://github.com/getpaseo/paseo/pull/9568), [#9661](https://github.com/getpaseo/paseo/pull/9661))
|
||||
- **Provider quota forecasts:** Usage estimates when a quota will run out or how much will remain at reset, based on your current pace. The forecast appears inline with the reset time. ([#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 GitHub, GitLab, Gitea, Forgejo, or Codeberg change request for updates to checks, reviews, or comments. Stop a watch from Background work. ([#10148](https://github.com/getpaseo/paseo/pull/10148), [#10279](https://github.com/getpaseo/paseo/pull/10279), [#10280](https://github.com/getpaseo/paseo/pull/10280))
|
||||
- **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))
|
||||
- **Antigravity approvals and history:** Choose a permission mode, respond to tool approvals, and import or reopen sessions. Use Antigravity CLI 1.5.0 or later on the daemon host, and include `acp` if you override its command. In Hub, reselect the model and thinking level if a saved model ID includes an old effort suffix. ([#10193](https://github.com/getpaseo/paseo/pull/10193))
|
||||
- **More goose models:** Select models from all providers configured in goose. Existing goose settings and sessions carry over to the bundled plugin. ([#9719](https://github.com/getpaseo/paseo/pull/9719) by [@i386](https://github.com/i386))
|
||||
- **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 skill suggestions when you type `/` inside a prompt ([#10383](https://github.com/getpaseo/paseo/pull/10383))
|
||||
- Added bundled orchestration skills to Antigravity on hosts where Paseo skills are installed ([#10273](https://github.com/getpaseo/paseo/pull/10273))
|
||||
- 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 with `hub.execute` ([#10392](https://github.com/getpaseo/paseo/pull/10392))
|
||||
- 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 Appearance content width to Default (820 px), Wide (1,200 px), and Full presets that resize open chats, the composer, and Markdown previews together ([#10231](https://github.com/getpaseo/paseo/pull/10231))
|
||||
- Changed Antigravity tool cards to show shell commands and output, file diffs, and Paseo tool details ([#10379](https://github.com/getpaseo/paseo/pull/10379))
|
||||
- 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 worktree teardown to keep the worktree when the command exceeds one minute or the `worktree.teardownTimeoutMs` limit in `paseo.json` ([#9852](https://github.com/getpaseo/paseo/pull/9852) by [@ragokan](https://github.com/ragokan))
|
||||
- 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 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 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))
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fixed an online host's workspaces staying missing after the app evicts its cached directory ([#10318](https://github.com/getpaseo/paseo/pull/10318))
|
||||
- Fixed chat history timing out when many open chats refresh at once after reconnecting ([#10368](https://github.com/getpaseo/paseo/pull/10368))
|
||||
- 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 agent recovery failing and idle agents showing errors after stopping a foreground daemon with Ctrl+C on macOS or Linux ([#10381](https://github.com/getpaseo/paseo/pull/10381))
|
||||
- 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 such as `5h` and `wk` when multiple 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))
|
||||
- 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 when it was closed ([#10225](https://github.com/getpaseo/paseo/pull/10225) by [@tonylt](https://github.com/tonylt))
|
||||
- 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))
|
||||
@@ -74,13 +81,14 @@
|
||||
- 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 historical closed PR badges appearing on a repository's default branch ([#10053](https://github.com/getpaseo/paseo/pull/10053))
|
||||
- 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))
|
||||
|
||||
### Plugins
|
||||
|
||||
- Added a `focusHost` navigation option for plugins to select the destination host in the sidebar when opening a workspace or agent ([#5574](https://github.com/getpaseo/paseo/pull/5574) by [@discwl](https://github.com/discwl))
|
||||
- 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
|
||||
|
||||
|
||||
+34
-26
@@ -1,62 +1,69 @@
|
||||
# Changelog
|
||||
|
||||
## 0.17.0 - 2026-11-21
|
||||
## 0.17.1 - 2026-11-21
|
||||
|
||||
- **使用现有 worktree**:在已有的 worktree 中启动工作区,或从分支或 PR 创建 worktree。插件可以管理 worktree 的创建、移除和恢复。从 fork 的 PR 或 MR 创建分支时,选择“运行设置”以批准工作区自动化。([#10190](https://github.com/getpaseo/paseo/pull/10190), [#10278](https://github.com/getpaseo/paseo/pull/10278))
|
||||
- **在 Paseo 中更新 Provider**:在 Provider 列表中查看各 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 监视 GitHub、GitLab、Gitea、Forgejo 或 Codeberg 上的 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))
|
||||
- **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))
|
||||
- **Antigravity 审批和历史记录**:选择权限模式、回复工具审批,以及导入或重新打开会话。请在 daemon 主机上使用 Antigravity CLI 1.5.0 或更新版本,如果覆盖了启动命令请包含 `acp`。如果 Hub 中保存的模型 ID 含有旧的推理强度后缀,请重新选择模型和思考级别。([#10193](https://github.com/getpaseo/paseo/pull/10193))
|
||||
- **更多 goose 模型**:从 goose 中已配置的所有 Provider 选择模型。现有 goose 设置和会话会迁移到内置插件。([#9719](https://github.com/getpaseo/paseo/pull/9719),贡献者:[@i386](https://github.com/i386))
|
||||
- **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))
|
||||
- 在已安装 Paseo 技能的主机上,为 Antigravity 新增内置编排技能 ([#10273](https://github.com/getpaseo/paseo/pull/10273))
|
||||
- 在 `/` 建议中新增 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.execute` 权限的 Hub 会话新增列出已连接 daemon 活跃项目的能力 ([#10392](https://github.com/getpaseo/paseo/pull/10392))
|
||||
- 为 Hub 会话新增列出已连接 daemon 项目的能力 ([#10392](https://github.com/getpaseo/paseo/pull/10392))
|
||||
- 新增 `paseo ls --json` 输出的标签和工作区 ID ([#10076](https://github.com/getpaseo/paseo/pull/10076))
|
||||
|
||||
### 变更
|
||||
|
||||
- 将“外观”中的内容宽度改为默认(820 px)、宽版(1,200 px)和全宽预设,同时调整已打开对话、Composer 和 Markdown 预览的宽度 ([#10231](https://github.com/getpaseo/paseo/pull/10231))
|
||||
- Antigravity 工具卡片现在显示 shell 命令及输出、文件 diff 和 Paseo 工具详情 ([#10379](https://github.com/getpaseo/paseo/pull/10379))
|
||||
- 将内容宽度改为默认、宽版和全宽预设,并同时调整已打开对话和 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))
|
||||
- worktree 清理命令在超过默认的一分钟或 `paseo.json` 中 `worktree.teardownTimeoutMs` 限制时保留 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))
|
||||
- “使用情况”页面中健康的配额进度条改为绿色 ([#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))
|
||||
|
||||
### 修复
|
||||
|
||||
- 修复应用清除主机目录缓存后,在线主机的工作区一直不显示的问题 ([#10318](https://github.com/getpaseo/paseo/pull/10318))
|
||||
- 修复在线主机的工作区不显示的问题 ([#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))
|
||||
- 修复在 macOS 或 Linux 上用 Ctrl+C 停止前台 daemon 后,Agent 恢复失败且空闲 Agent 显示错误的问题 ([#10381](https://github.com/getpaseo/paseo/pull/10381))
|
||||
- 修复用 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))
|
||||
- 修复固定多个用量窗口时,侧边栏用量行隐藏 `5h` 和 `wk` 等周期标签的问题 ([#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))
|
||||
- 修复固定多个用量窗口时,侧边栏用量行隐藏周期标签的问题 ([#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))
|
||||
- 修复在 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))
|
||||
@@ -64,7 +71,7 @@
|
||||
- 修复 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))
|
||||
@@ -74,13 +81,14 @@
|
||||
- 修复 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))
|
||||
- 修复仓库默认分支显示已关闭 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))
|
||||
|
||||
### 插件
|
||||
|
||||
- 新增插件导航 `focusHost` 选项,打开工作区或 Agent 时在侧边栏选中目标主机 ([#5574](https://github.com/getpaseo/paseo/pull/5574),贡献者:[@discwl](https://github.com/discwl))
|
||||
- 新增插件对 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
|
||||
|
||||
|
||||
+21
-5
@@ -150,13 +150,29 @@ Users can also detach an existing subagent from the subagents track. Detach is d
|
||||
|
||||
`notifyOnFinish` defaults to `true` for agent-scoped creation and prompt follow-ups because most delegated work needs to report back to the creating agent. Set it to `false` for explicit reporting or no completion callback.
|
||||
|
||||
Agent-originated messages and automatic notifications share a recipient-daemon delivery module. A queued receipt acknowledges admission before provider dispatch. Idle recipients retain the two-second quiet window. While a recipient has a running or starting turn (including compaction), messages stay queued across quiet windows and are delivered together after that turn settles, including failure or cancellation. A ready batch is released when the daemon observes the recipient settle; the two-second timer also retries it. Agent callers using `steer`, including the default, wait for the turn to end; only explicit `interrupt` replaces a running turn. An explicit interrupt or a command the provider accepts out of band runs before earlier queued messages. Those messages stay queued and are delivered after the running or replacement turn ends. Human prompts dispatch directly with their existing behavior. Conflicting session-mode choices retain separate ordered dispatches.
|
||||
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.
|
||||
|
||||
The pending message window is in memory. Clean shutdown flushes it before closing agents; an abrupt
|
||||
crash can lose queued prompts. A durable send receipt remains pending until actual dispatch
|
||||
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 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.
|
||||
|
||||
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.
|
||||
|
||||
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
|
||||
acknowledgment, so a lost window never becomes a completed receipt. Completion waits cover queued
|
||||
admission within their original timeout and cancellation scope, and return permission checkpoints
|
||||
while messages are waiting.
|
||||
admission within their original timeout and cancellation scope, and return at permission
|
||||
checkpoints and when a Stop holds the queue.
|
||||
|
||||
Finish notification intent has a separate daemon-owned lifetime. The finish-subscriptions module
|
||||
persists caller, child, host, and ownership policy through an injectable store; its JSON adapter uses
|
||||
|
||||
+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.
|
||||
|
||||
|
||||
+187
-111
@@ -6,21 +6,26 @@ All workspaces share one version and release together.
|
||||
|
||||
A release has exactly two steps. The agent does the first, the user authorizes the second.
|
||||
|
||||
**Preparation** (reversible — agent does this):
|
||||
**Preparation** (reversible — agent does this on the release branch):
|
||||
|
||||
- format, lint, typecheck all green
|
||||
- resolve the [release base](#release-base-and-source), get the [release inventory](#release-inventory) approved when one applies, and confirm CI for the resulting release source is green
|
||||
- resolve the [release base](#release-base-and-source) and get the [release inventory](#release-inventory) approved when one applies
|
||||
- classify the diff from the previous stable to the release source as patch or minor, then show the
|
||||
target version and rationale to the user
|
||||
- draft the changelog, show it to the user, wait for review
|
||||
- run the pre-release sanity check, surface findings to the user
|
||||
- draft `CHANGELOG.md` and `CHANGELOG.zh-CN.md`, show the draft to the user, and wait for review
|
||||
- run the pre-release sanity check (stable only) and surface findings to the user
|
||||
- commit the approved changelog and any requested ACP update, run format, lint, and typecheck, then
|
||||
run `npm run release:prep:<mode>` to create the `chore(release): cut <version>` commit without a tag
|
||||
- push the `release/vX.Y.Z` or `release/vX.Y.Z-beta.N` branch and confirm its `CI` and
|
||||
`Desktop Packages` runs pass (never wait on `main` CI)
|
||||
|
||||
**Go-ahead** (user says "go ahead"):
|
||||
|
||||
- commit the approved release inputs locally on the release branch
|
||||
- run the release, which publishes npm and pushes the release branch and tag
|
||||
- run `npm run release:ship` (stable) or `npm run release:ship:beta` (beta), which publishes npm
|
||||
with retry and registry visibility checks, advances the `beta` dist-tag on stable when newer, and
|
||||
pushes the tag on the already-verified commit
|
||||
- create the release heartbeat immediately and babysit it to completion
|
||||
- [reconcile `main`](#reconcile-main) with what shipped
|
||||
- open the [reconcile `main`](#reconcile-main) PR right away so its CI runs in parallel with release
|
||||
builds, then delete the remote release branch once the PR merges
|
||||
|
||||
Rules that apply to both steps:
|
||||
|
||||
@@ -87,29 +92,42 @@ An explicit user instruction can select another base.
|
||||
|
||||
1. Fetch `origin` with tags and resolve the base to one commit.
|
||||
2. Create the release workspace through Paseo MCP on a new branch from the base, named
|
||||
`release/vX.Y.Z` or `release/vX.Y.Z-beta.N` for the version being cut. Run the release from
|
||||
this workspace: `release:push` pushes `HEAD` to the current branch.
|
||||
`release/vX.Y.Z` or `release/vX.Y.Z-beta.N` for the version being cut. `release:push` refuses
|
||||
`main` and any branch outside `release/*`.
|
||||
3. Cherry-pick the approved commits in their `main` order with `git cherry-pick -x`, so each
|
||||
commit records the `main` commit it came from. Include the prerequisites the inventory listed.
|
||||
Resolve conflicts within the approved changes and report how. A resolution that needs new
|
||||
behavior is a scope addition: surface it for selection.
|
||||
4. Confirm CI for the release source. When the source is a commit whose CI already passed (the
|
||||
captured `origin/main`, or the beta tag being promoted), use that run and watch pending CI to
|
||||
completion. Otherwise push the release branch and run `gh workflow run ci.yml --ref <branch>`,
|
||||
because CI push runs target only `main`.
|
||||
5. Keep the changelog, any explicitly requested ACP catalog update, lockfile preparation, and the
|
||||
version commit local until the go-ahead. The release command pushes the release branch and tag
|
||||
as one batch, and the tag push starts the release workflows. Then run
|
||||
`gh workflow run ci.yml --ref <branch>` so CI covers the complete release commit.
|
||||
6. [Reconcile `main`](#reconcile-main).
|
||||
4. Commit the approved `CHANGELOG.md`, `CHANGELOG.zh-CN.md`, and any explicitly requested ACP
|
||||
catalog update on the release branch. Run `npm run format`, `npm run lint`, and
|
||||
`npm run typecheck`, then run `npm run release:prep:<mode>`. This checks the packages, bumps all
|
||||
workspace versions, generates stable F-Droid changelogs, updates `package-lock.json`, and creates
|
||||
`chore(release): cut <version>` without a tag.
|
||||
5. Push the release branch (`git push -u origin HEAD`). Pushing any `release/**` branch triggers
|
||||
`CI` (all 21 jobs) and `Desktop Packages` (Linux user-namespace smoke) in their own concurrency
|
||||
groups, isolated from `main` traffic. Never wait on `main` CI, because `main` cancels in-progress
|
||||
runs on every merge. Wait for both runs on the release branch commit to pass before shipping.
|
||||
Pushing a `release/**` branch without a `v*` tag triggers no publish workflows.
|
||||
6. After go-ahead, run `npm run release:ship` (stable) or `npm run release:ship:beta` (beta). This
|
||||
publishes to npm and pushes the `v*` tag on the already-verified commit. Because the release
|
||||
branch is already pushed at `HEAD`, no second CI run starts and only the tag release workflows
|
||||
run.
|
||||
7. Start [Reconcile `main`](#reconcile-main) immediately so its PR checks overlap with desktop and
|
||||
EAS builds.
|
||||
|
||||
When promoting or branching from a tag created before `release:prep:*`, `release:ship`, and the
|
||||
`release/**` workflow triggers existed (for example `v0.17.0-beta.1`), either cherry-pick the
|
||||
release-tooling commit onto the release branch (leaving product code unchanged) or follow the
|
||||
older tag's scripts (`version:all:*`, manual `gh workflow run ci.yml --ref <branch>`,
|
||||
`release:publish`, and `release:push`) until the next tag carries the new tooling.
|
||||
|
||||
A stable hotfix can take the version a patch beta line would promote to, such as `0.13.3`
|
||||
shipping while `0.13.3-beta.2` soaks. Never republish or reuse a shipped version. Continue the line
|
||||
as the next unused patch beta, `0.13.4-beta.1`, from the tested beta tag. No `version:all:*` mode
|
||||
computes that from a prerelease, so follow the [manual steps](#manual-step-by-step) with
|
||||
`npm version 0.13.4-beta.1 --include-workspace-root --message "chore(release): cut %s"` and
|
||||
`npm run release:publish:beta`. Record the tested beta tag as its source so its soak still counts
|
||||
for the unchanged content.
|
||||
computes that from a prerelease, so run `npm run release:check`, bump with
|
||||
`npm version 0.13.4-beta.1 --include-workspace-root --no-git-tag-version && git commit -m "chore(release): cut 0.13.4-beta.1"`,
|
||||
push the release branch for `CI` and `Desktop Packages`, then ship with `npm run release:ship:beta`.
|
||||
Record the tested beta tag as its source so its soak still counts for the unchanged content.
|
||||
|
||||
## Release inventory
|
||||
|
||||
@@ -137,19 +155,31 @@ For a promotion, every item defaults to defer.
|
||||
|
||||
## Reconcile main
|
||||
|
||||
After the release push, open a PR into `main` that brings in what shipped and keeps newer
|
||||
development on `main`:
|
||||
Right after the tag push (in parallel with desktop and EAS builds), open a PR into `main` from a
|
||||
fresh branch off `origin/main` named `reconcile/vX.Y.Z` or `reconcile/vX.Y.Z-beta.N`:
|
||||
|
||||
- The shipped `CHANGELOG.md` and `CHANGELOG.zh-CN.md` entries, exactly as tagged. A beta or
|
||||
promotion entry replaces the series entry on `main`. A stable hotfix on an older line goes
|
||||
below any newer entries.
|
||||
- The shipped version in every `package.json` and `package-lock.json`, unless `main` already
|
||||
carries a newer version, plus the F-Droid changelog files a stable release generates.
|
||||
- No claims about unshipped work: a shipped entry describes only the tagged content, and notes
|
||||
`main` holds for changes that have not shipped stay out of it.
|
||||
```bash
|
||||
git fetch origin --tags
|
||||
git checkout -b reconcile/vX.Y.Z origin/main
|
||||
npm run release:reconcile -- --tag vX.Y.Z
|
||||
```
|
||||
|
||||
Delete the release branch once the PR merges. The tag is the record of shipped source; Paseo
|
||||
maintains no release track besides `main`.
|
||||
`scripts/reconcile-release.mjs` updates the working tree without cherry-picking stale lockfile
|
||||
hunks from the release base:
|
||||
|
||||
- Copies the tagged `CHANGELOG.md` and `CHANGELOG.zh-CN.md` entries verbatim. A beta or promotion
|
||||
entry replaces the series beta entry on `main`. A stable hotfix on an older line is placed below
|
||||
any newer entries.
|
||||
- Copies the generated F-Droid changelog files from the tag for stable releases.
|
||||
- Updates every `package.json` version and regenerates `package-lock.json` on top of current `main`
|
||||
only when the shipped version is newer than `main`'s version.
|
||||
- Leaves unshipped work on `main` untouched and makes no claims about unshipped work in the
|
||||
changelog entry.
|
||||
|
||||
Commit, open the PR into `main`, and merge once its checks pass. After the reconcile PR merges and
|
||||
the release completes, delete the remote release branch (`git push origin --delete release/vX.Y.Z`
|
||||
or `release/vX.Y.Z-beta.N`). The tag is the record of shipped source; Paseo maintains no release
|
||||
track besides `main`.
|
||||
|
||||
## ACP catalog updates
|
||||
|
||||
@@ -189,35 +219,42 @@ as described in **Fixing a failed release build**.
|
||||
|
||||
## Standard release (stable)
|
||||
|
||||
Before running any stable release command:
|
||||
Before preparing a stable release on `release/vX.Y.Z`:
|
||||
|
||||
- Make sure the release source passed CI, the approved release inputs are committed locally on the release branch, and the working tree is clean.
|
||||
- **Run `npm run format`, `npm run lint`, and `npm run typecheck` and commit any resulting changes BEFORE you start any `release:*` command.** `release:check` runs `npm install --workspaces --include-workspace-root` as part of `release:prepare`, which can mutate `package-lock.json` (e.g. churning `"dev": true` markers on optional deps). The next step, `version:all:*`, runs `npm version` which aborts when the working tree is dirty. If this happens mid-flight you have to commit the lockfile churn before retrying — and the pre-commit format hook will reject a lockfile-only commit because oxfmt internally skips `package-lock.json` while lefthook's glob still matches it. Avoid the whole mess by running format/lint/typecheck first, then `release:prepare` once on its own to absorb any lockfile churn into a normal commit, then start the release.
|
||||
- Do not use a release command as a substitute for checking whether the current commit is actually ready.
|
||||
- Commit the approved `CHANGELOG.md`, `CHANGELOG.zh-CN.md`, and any requested ACP update.
|
||||
- Run `npm run format`, `npm run lint`, and `npm run typecheck`, commit any resulting changes, and
|
||||
confirm the working tree is clean.
|
||||
- Do not use a release command as a substitute for checking whether the current commit is ready.
|
||||
|
||||
```bash
|
||||
# Run exactly one, matching the approved decision:
|
||||
npm run release:patch
|
||||
npm run release:minor
|
||||
# 1. Preparation (reversible): run checks and commit the version bump without tagging.
|
||||
npm run release:prep:patch
|
||||
# or:
|
||||
npm run release:prep:minor
|
||||
|
||||
# 2. Push the release branch and wait for CI + Desktop Packages on this commit.
|
||||
git push -u origin HEAD
|
||||
|
||||
# 3. After go-ahead and green release-branch checks: publish npm and push the tag.
|
||||
npm run release:ship
|
||||
```
|
||||
|
||||
This bumps the version across all workspaces, runs checks, publishes to npm, and pushes the branch + tag. The tag push triggers `Desktop Release`, `Android APK Release`, `Docker`, and `Release Notes Sync` on GitHub Actions. The workflows create the GitHub Release as a draft while builds and release-note sync run. EAS picks up the same tag via the EAS GitHub app and starts the iOS + Android store builds in parallel (see "Mobile builds (EAS)" below) — there is no mobile-release workflow under `.github/workflows`.
|
||||
`release:ship` runs `scripts/publish-release-packages.mjs` and `scripts/push-current-release-tag.mjs`:
|
||||
|
||||
After the stable release succeeds, check `npm view @getpaseo/cli dist-tags`. When the new stable
|
||||
is newer than `beta`, move `beta` to it for every published package. This changes dist-tags only;
|
||||
do not republish the packages:
|
||||
- Publishes all seven `@getpaseo/*` packages in dependency order, skips versions already on npm,
|
||||
retries transient 429/5xx/network errors, and waits until each version is visible on npm before
|
||||
continuing.
|
||||
- Checks `npm view @getpaseo/cli dist-tags` and moves npm's `beta` dist-tag to the new stable
|
||||
version across all seven packages whenever the stable version is newer than `beta` (leaving
|
||||
`beta` untouched during a stable hotfix on an older line).
|
||||
- Refuses non-`release/*` branches, tags `HEAD` with `vX.Y.Z`, and pushes the tag. Because `HEAD`
|
||||
is already on the release branch, no second CI run starts.
|
||||
|
||||
```bash
|
||||
PASEO_VERSION=$(node -p "require('./package.json').version")
|
||||
for package in highlight relay protocol client plugin server cli; do
|
||||
npm dist-tag add "@getpaseo/$package@$PASEO_VERSION" beta
|
||||
done
|
||||
```
|
||||
The tag push triggers `Desktop Release`, `Android APK Release`, `Docker`, and `Release Notes Sync` on GitHub Actions. The workflows create the GitHub Release as a draft while builds and release-note sync run. EAS picks up the same tag via the EAS GitHub app and starts the iOS + Android store builds in parallel (see "Mobile builds (EAS)" below) — there is no mobile-release workflow under `.github/workflows`.
|
||||
|
||||
Verify `latest` resolves to `PASEO_VERSION`, and `beta` resolves to `PASEO_VERSION` or the
|
||||
active newer beta, before considering the stable release complete.
|
||||
Verify `npm view @getpaseo/cli dist-tags` shows `latest` at the shipped version, and `beta` at the shipped version or an active newer beta, before considering the stable release complete.
|
||||
|
||||
The Docker workflow builds images from the checked-out source tree on pull requests and on `main` as non-publishing checks. Stable `vX.Y.Z` tag pushes publish `ghcr.io/getpaseo/paseo:X.Y.Z` and `ghcr.io/getpaseo/paseo:latest`; beta `vX.Y.Z-beta.N` tag pushes publish only `ghcr.io/getpaseo/paseo:X.Y.Z-beta.N` and never move `latest`.
|
||||
The Docker workflow builds images from the checked-out source tree on `main` as non-publishing checks (cancelling superseded `main` runs). Stable `vX.Y.Z` tag pushes publish `ghcr.io/getpaseo/paseo:X.Y.Z` and `ghcr.io/getpaseo/paseo:latest`; beta `vX.Y.Z-beta.N` tag pushes publish only `ghcr.io/getpaseo/paseo:X.Y.Z-beta.N` and never move `latest`.
|
||||
|
||||
The production relay is the Elixir service in [getpaseo/paseo-relay](https://github.com/getpaseo/paseo-relay), with its own deployment process. Paseo releases and pushes to this repository do not deploy it. The Cloudflare relay code and workflow in this repository are legacy and are not used in production.
|
||||
|
||||
@@ -228,29 +265,43 @@ The production relay is the Elixir service in [getpaseo/paseo-relay](https://git
|
||||
```bash
|
||||
npm run typecheck # Verify the exact commit you intend to release
|
||||
npm run release:check # Typecheck, build, dry-run pack
|
||||
# Run exactly one approved version command:
|
||||
# Run exactly one approved version command (commits without tagging):
|
||||
npm run version:all:patch
|
||||
npm run version:all:minor
|
||||
npm run release:publish # Publish to npm
|
||||
npm run release:push # Push HEAD + tag (triggers CI workflows)
|
||||
# Then move npm's beta dist-tag to this stable version when it is newer than beta (see above).
|
||||
git push -u origin HEAD # Trigger CI + Desktop Packages on release/vX.Y.Z
|
||||
# Wait for CI and Desktop Packages on this branch to pass, then after go-ahead:
|
||||
npm run release:publish # Publish to npm (idempotent, with propagation + beta dist-tag sync)
|
||||
npm run release:push # Create tag vX.Y.Z on HEAD and push (triggers release workflows)
|
||||
```
|
||||
|
||||
## Beta flow
|
||||
|
||||
```bash
|
||||
npm run release:beta:patch # Start the next patch beta line
|
||||
npm run release:beta:minor # Start the next minor beta line
|
||||
# ... test desktop and APK prerelease assets from GitHub Releases ...
|
||||
npm run release:beta:next # Optional: cut X.Y.Z-beta.2, beta.3, ...
|
||||
npm run release:promote # Promote X.Y.Z-beta.N to stable X.Y.Z
|
||||
# 1. Preparation (reversible) on release/vX.Y.Z-beta.N:
|
||||
npm run release:prep:beta:patch # Start the next patch beta line
|
||||
# or:
|
||||
npm run release:prep:beta:minor # Start the next minor beta line
|
||||
# or for follow-up betas:
|
||||
npm run release:prep:beta:next # Cut X.Y.Z-beta.2, beta.3, ...
|
||||
|
||||
# 2. Push the release branch and wait for CI + Desktop Packages to pass:
|
||||
git push -u origin HEAD
|
||||
|
||||
# 3. After go-ahead:
|
||||
npm run release:ship:beta
|
||||
|
||||
# Later, after soak, promote on release/vX.Y.Z:
|
||||
npm run release:prep:promote
|
||||
git push -u origin HEAD
|
||||
# Wait for CI + Desktop Packages to pass, then after go-ahead:
|
||||
npm run release:ship
|
||||
```
|
||||
|
||||
- Beta tags are published GitHub prereleases like `v0.1.41-beta.1`
|
||||
- Betas publish npm packages with `--tag beta`, so `npm install @getpaseo/cli@beta` opts in while plain `npm install @getpaseo/cli` stays on `latest`
|
||||
- The user-facing beta instructions, including the public TestFlight join link for the `Paseo Beta` group, live in `public-docs/updates.md` and its `zh-CN` pair. Update them when a beta path is added or removed.
|
||||
- Betas publish desktop assets and APKs for testing. They also build iOS, upload it to TestFlight, add it to the `Paseo Beta` external group, and submit it for Beta App Review. They do not submit mobile builds to the production stores.
|
||||
- `release:promote` creates a fresh stable tag like `v0.1.41`; the final release never reuses the beta tag
|
||||
- `release:prep:promote` + `release:ship` creates a fresh stable tag like `v0.1.41`; the final release never reuses the beta tag
|
||||
- Desktop assets now come from the Electron package at `packages/desktop`
|
||||
- Require the Linux artifact CI checks with both restricted and usable user namespaces to pass before publication; see [packaged desktop smoke](testing.md#packaged-desktop-smoke). Keep the installed-package and AppImage checks together.
|
||||
- Beta releases use Electron's `beta` update channel. Users on the stable channel only receive stable releases; users on the beta channel receive beta releases and the final stable release when it is published.
|
||||
@@ -278,17 +329,17 @@ Drafts do not appear in GitHub's releases feed. Updater clients continue to see
|
||||
|
||||
### Default behavior
|
||||
|
||||
`npm run release:patch` or `npm run release:minor` → tag push → 36h ramp. No extra action needed.
|
||||
`npm run release:prep:patch` or `npm run release:prep:minor` → push release branch → green checks → `npm run release:ship` → tag push → 36h ramp. No extra action needed.
|
||||
|
||||
The `rollout_hours` input on `desktop-release.yml` is **only read on `workflow_dispatch`** — tag-push runs always default to 36. To get any other rollout duration on a fresh release, use the post-publish flip below.
|
||||
|
||||
### Instant-admit release (rollout_hours=0)
|
||||
|
||||
`npm run release:patch` and `npm run release:minor` tag-push, and tag-push runs always stamp 36 hours. To admit everyone immediately (hotfix, doc-only change, a release you want out fast), cut the release normally, wait for it to publish, then flip the manifests:
|
||||
Tag-push runs from `npm run release:ship` always stamp 36 hours. To admit everyone immediately (hotfix, doc-only change, a release you want out fast), ship the release normally, wait for it to publish, then flip the manifests:
|
||||
|
||||
```bash
|
||||
# 1. Cut and publish (36h ramp from tag push).
|
||||
npm run release:patch
|
||||
# 1. Ship the verified release branch (36h ramp from tag push).
|
||||
npm run release:ship
|
||||
|
||||
# 2. Wait for Desktop Release to publish the GitHub Release.
|
||||
gh run watch <desktop-release-run-id> --exit-status
|
||||
@@ -339,7 +390,7 @@ gh workflow run desktop-release.yml \
|
||||
-f rollout_hours=6
|
||||
```
|
||||
|
||||
This does **not** apply to fresh releases cut via `npm run release:patch` or `npm run release:minor` — those paths always tag-push and stamp 36. For a fresh release with a custom ramp, cut normally and then dispatch `desktop-rollout.yml` (same pattern as the instant-admit flow above, with your chosen `rollout_hours`).
|
||||
This does **not** apply to fresh releases shipped via `npm run release:ship` — tag-push runs always stamp 36. For a fresh release with a custom ramp, ship normally and then dispatch `desktop-rollout.yml` (same pattern as the instant-admit flow above, with your chosen `rollout_hours`).
|
||||
|
||||
### Releasing during an active rollout
|
||||
|
||||
@@ -449,10 +500,11 @@ that resumes the release in the current conversation. Create it automatically
|
||||
with `create_heartbeat`. The heartbeat owns the release until it either reaches
|
||||
the completion checklist or finds a failure that needs new user authority.
|
||||
|
||||
Each heartbeat checks the release tag commit, all GitHub Actions runs for the
|
||||
release branch and tag, npm dist-tags, the GitHub Release body and assets,
|
||||
desktop updater manifests, the published Docker image, and the applicable EAS
|
||||
workflow. Inspect the GitHub Release itself and confirm that the macOS, Linux,
|
||||
Each heartbeat checks the release tag commit, `CI` and `Desktop Packages` for the release branch,
|
||||
every tag-triggered GitHub Actions run (`Desktop Release`, `Android APK Release`, `Docker`,
|
||||
`Release Notes Sync`), npm dist-tags, the GitHub Release body and assets, desktop updater
|
||||
manifests, the published Docker image, the applicable EAS workflow, the reconcile PR, and remote
|
||||
release branch cleanup. Inspect the GitHub Release itself and confirm that the macOS, Linux,
|
||||
Windows, and Android APK assets are present along with the channel manifests
|
||||
(`latest-mac.yml`, `latest-linux.yml`, and `latest.yml` for stable;
|
||||
`beta-mac.yml`, `beta-linux.yml`, and `beta.yml` for beta).
|
||||
@@ -461,8 +513,9 @@ For stable releases, also confirm every required mobile build, external
|
||||
TestFlight distribution, Beta App Review submission, and store submission job
|
||||
for the release commit. For betas, confirm
|
||||
the beta EAS workflow completed its TestFlight distribution and Beta App Review
|
||||
path. Delete the heartbeat only after every applicable checklist item passes,
|
||||
then report the release as shipped.
|
||||
path. Once the reconcile PR merges and every applicable checklist item passes,
|
||||
delete the remote release branch (`git push origin --delete release/vX.Y.Z` or
|
||||
`release/vX.Y.Z-beta.N`), delete the heartbeat, and report the release as shipped.
|
||||
|
||||
Pattern:
|
||||
|
||||
@@ -474,7 +527,7 @@ Pattern:
|
||||
"timezone": "UTC",
|
||||
"maxRuns": 120,
|
||||
"expiresIn": "24h",
|
||||
"prompt": "Resume the vX.Y.Z release babysit for commit <sha>. Check npm tags; every GitHub Actions run for the release branch and tag; the published GitHub Release body, expected desktop/APK assets, and channel manifests; the Docker image; and the matching EAS workflow. Completion requires every applicable checklist item. For stable, require build_ios, distribute_ios (Paseo Beta external distribution and Beta App Review submission), submit_ios_for_review, build_android, and submit_android to succeed. For beta, require the beta TestFlight distribution and Beta App Review path. If work is pending, wait for the next heartbeat. If a failure can be retried safely for the same version, follow the failed-release procedure; otherwise report the blocker. When every applicable completion-checklist item passes, delete THIS heartbeat, report shipped, and stop.",
|
||||
"prompt": "Resume the vX.Y.Z release babysit for commit <sha>. Check npm tags; CI and Desktop Packages on release/vX.Y.Z; every tag-triggered GitHub Actions run; the published GitHub Release body, expected desktop/APK assets, and channel manifests; the Docker image; the matching EAS workflow; and the reconcile PR into main. Completion requires every applicable checklist item. For stable, require build_ios, distribute_ios (Paseo Beta external distribution and Beta App Review submission), submit_ios_for_review, build_android, and submit_android to succeed. For beta, require the beta TestFlight distribution and Beta App Review path. If work is pending, wait for the next heartbeat. If a failure can be retried safely for the same version, follow the failed-release procedure; otherwise report the blocker. When every applicable completion-checklist item passes and the reconcile PR is merged, delete origin/release/vX.Y.Z, delete THIS heartbeat, report shipped, and stop.",
|
||||
}
|
||||
```
|
||||
|
||||
@@ -576,12 +629,16 @@ intentionally unavailable to desktop updater clients.
|
||||
|
||||
## Notes
|
||||
|
||||
- `version:all:*` bumps root + syncs workspace versions and `@getpaseo/*` dependency versions
|
||||
- The npm `version` lifecycle regenerates F-Droid changelog files from `CHANGELOG.md` for stable releases only (`npm run fdroid:changelogs`) and stages them, so the release tag carries them. Betas are a no-op. A stable run **aborts the release** if `CHANGELOG.md` has no entry for the version being cut — commit the changelog entry first. See [docs/android.md](android.md) for why these files are generated per ABI.
|
||||
- `release:prepare` refreshes workspace `node_modules` links to prevent stale types
|
||||
- `npm run dev:desktop` and `npm run build:desktop` target the Electron desktop package in `packages/desktop`
|
||||
- If `release:publish` partially fails, re-run it — npm skips already-published versions
|
||||
- If `release:publish:beta` partially fails, re-run it — npm skips already-published versions and keeps prereleases off `latest` because every publish uses `--tag beta`
|
||||
- `version:all:*` bumps root, syncs workspace versions and `@getpaseo/*` dependency versions, and
|
||||
commits `chore(release): cut <version>` without creating a tag. `release:push` creates and pushes
|
||||
the tag atomically after release-branch CI passes.
|
||||
- `release:push` refuses `main` and any branch outside `release/*`.
|
||||
- The npm `version` lifecycle regenerates F-Droid changelog files from `CHANGELOG.md` for stable releases only (`npm run fdroid:changelogs`) and stages them, so the release commit and tag carry them. Betas are a no-op. A stable run **aborts the release** if `CHANGELOG.md` has no entry for the version being cut — commit the changelog entry first. See [docs/android.md](android.md) for why these files are generated per ABI.
|
||||
- `release:prepare` refreshes workspace `node_modules` links to prevent stale types.
|
||||
- `npm run dev:desktop` and `npm run build:desktop` target the Electron desktop package in `packages/desktop`.
|
||||
- `release:publish` and `release:publish:beta` run `scripts/publish-release-packages.mjs`: if a run
|
||||
fails partway through, re-running skips versions already published on npm, retries transient
|
||||
registry errors, and waits for each version to become visible on npm before continuing.
|
||||
- The website uses GitHub's latest published release API for download links, so published beta prereleases do not replace the stable download target.
|
||||
|
||||
## Changelog format
|
||||
@@ -602,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.
|
||||
@@ -657,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
|
||||
@@ -677,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
|
||||
```
|
||||
@@ -688,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
|
||||
@@ -707,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.
|
||||
@@ -763,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.
|
||||
@@ -802,13 +881,12 @@ Every entry covers `previous stable release → release source`: first beta, lat
|
||||
|
||||
### Beta release
|
||||
|
||||
- [ ] The release base and changes match the [release base table](#release-base-and-source) and any approved [inventory](#release-inventory), and CI for the release source is green
|
||||
- [ ] The release base and changes match the [release base table](#release-base-and-source) and any approved [inventory](#release-inventory)
|
||||
- [ ] Every PR in the release range has been opened, and its full description and every linked issue have been read before drafting the changelog
|
||||
- [ ] Fold this beta into the series' single `CHANGELOG.md` entry (heading `## X.Y.Z-beta.N - YYYY-MM-DD`, previous stable → release source), review it against the changelog policy, get approval, and commit it with its [`CHANGELOG.zh-CN.md` translation](#changelog-translations) before cutting the release
|
||||
- [ ] Fold this beta into the series' single `CHANGELOG.md` entry (heading `## X.Y.Z-beta.N - YYYY-MM-DD`, previous stable → release source), review it against the changelog policy, get approval, and commit it with its [`CHANGELOG.zh-CN.md` translation](#changelog-translations) before running `release:prep:*`
|
||||
- [ ] The diff from the previous stable to the resolved release source is classified as patch or minor, with the target version and rationale approved
|
||||
- [ ] The changelog, ACP, lockfile, and version commits stayed local until the approved release command pushed the release branch and tag
|
||||
- [ ] `npm run release:beta:patch`, `npm run release:beta:minor`, or `npm run release:beta:next` completes successfully
|
||||
- [ ] Every GitHub Actions run for the complete release commit and tag is green
|
||||
- [ ] `npm run release:prep:beta:patch`, `release:prep:beta:minor`, or `release:prep:beta:next` created the version commit on `release/vX.Y.Z-beta.N` without a tag, and the pushed branch passed `CI` and `Desktop Packages` before shipping (never relying on `main` CI)
|
||||
- [ ] After go-ahead, `npm run release:ship:beta` published npm and pushed the `vX.Y.Z-beta.N` tag without triggering a second CI run
|
||||
- [ ] npm shows the version under the `beta` dist-tag, not `latest`
|
||||
- [ ] The GitHub prerelease was published only after the three beta manifests were uploaded, and it has the changelog body and every expected macOS, Linux, Windows, and Android APK asset
|
||||
- [ ] GitHub `Desktop Release` workflow for the `v*-beta.N` tag is green
|
||||
@@ -817,23 +895,21 @@ Every entry covers `previous stable release → release source`: first beta, lat
|
||||
- [ ] GitHub `Docker` workflow is green and the versioned beta image is published without moving `latest`
|
||||
- [ ] GitHub `Release Notes Sync` mirrored the beta entry into the prerelease body
|
||||
- [ ] EAS `Release iOS Beta` completed its build, TestFlight distribution, external beta group, and Beta App Review path
|
||||
- [ ] The [reconcile PR](#reconcile-main) brought the shipped changelog entries and version into `main`
|
||||
- [ ] The [reconcile PR](#reconcile-main) brought the shipped changelog entries and version into `main`, and `origin/release/vX.Y.Z-beta.N` was deleted
|
||||
- [ ] The release heartbeat was created after the tag push and deleted only after every item above passed
|
||||
|
||||
### Stable release (or promotion)
|
||||
|
||||
- [ ] Run the pre-release sanity check (see above) and address any findings
|
||||
- [ ] The diff from the previous stable to the resolved release source is classified as patch or minor, with the target version and rationale approved
|
||||
- [ ] The release base and changes match the [release base table](#release-base-and-source) and any approved [inventory](#release-inventory), and CI for the release source is green
|
||||
- [ ] The release base and changes match the [release base table](#release-base-and-source) and any approved [inventory](#release-inventory)
|
||||
- [ ] A promotion ships the tested beta's product content after its soak, unless the user explicitly overrode either default
|
||||
- [ ] Every PR in the release range has been opened, and its full description and every linked issue have been read before drafting the changelog
|
||||
- [ ] Ensure the approved release inputs are committed locally and the git worktree is clean before running any release command
|
||||
- [ ] Ensure local `npm run typecheck` passes on that exact commit before running any release command
|
||||
- [ ] Update `CHANGELOG.md` with user-facing release notes (features, fixes — not refactors). Promotion renames the series' `## X.Y.Z-beta.N` entry to `## X.Y.Z - YYYY-MM-DD` and re-checks it covers the full release. Commit the matching [`CHANGELOG.zh-CN.md` entry](#changelog-translations) with it
|
||||
- [ ] Verify the changelog heading follows strict `## X.Y.Z - YYYY-MM-DD` format
|
||||
- [ ] The changelog, ACP, lockfile, and version commits stayed local until the approved release command pushed the release branch and tag
|
||||
- [ ] `npm run release:patch`, `npm run release:minor`, or `npm run release:promote` completes successfully
|
||||
- [ ] Every GitHub Actions run for the complete release commit and tag is green
|
||||
- [ ] Ensure local format, lint, and typecheck pass and the working tree is clean before running `release:prep:*`
|
||||
- [ ] `npm run release:prep:patch`, `release:prep:minor`, or `release:prep:promote` created the version commit on `release/vX.Y.Z` without a tag, and the pushed branch passed `CI` and `Desktop Packages` before shipping (never relying on `main` CI)
|
||||
- [ ] After go-ahead, `npm run release:ship` published npm, updated dist-tags, and pushed the `vX.Y.Z` tag without triggering a second CI run
|
||||
- [ ] `latest` resolves to the new stable, and `beta` resolves to it too unless an active newer beta holds `beta`
|
||||
- [ ] The GitHub Release was published only after the three stable manifests were uploaded, and it has the changelog body and every expected macOS, Linux, Windows, and Android APK asset
|
||||
- [ ] GitHub `Desktop Release` workflow for the `v*` tag is green
|
||||
@@ -848,5 +924,5 @@ Every entry covers `previous stable release → release source`: first beta, lat
|
||||
- [ ] EAS iOS `submit_ios_for_review` succeeds, putting the build into App Store review
|
||||
- [ ] EAS Android `build_android` completes for the same tag
|
||||
- [ ] EAS Android `submit_android` succeeds, putting the build on its Play Store track
|
||||
- [ ] The [reconcile PR](#reconcile-main) brought the shipped changelog entries and version into `main`
|
||||
- [ ] The [reconcile PR](#reconcile-main) brought the shipped changelog entries, F-Droid changelogs, and version into `main`, and `origin/release/vX.Y.Z` was deleted
|
||||
- [ ] The release heartbeat was created after the tag push and deleted only after every item above passed
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
- Use existing worktrees: Start a workspace in a worktree you already have, or create one from a branch or pull request. Plugins can manage worktree creation, removal, and restoration. When you branch off a fork PR or MR, choose Run setup to approve workspace automation.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -1,3 +0,0 @@
|
||||
- Use existing worktrees: Start a workspace in a worktree you already have, or create one from a branch or pull request. Plugins can manage worktree creation, removal, and restoration. When you branch off a fork PR or MR, choose Run setup to approve workspace automation.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -1,3 +0,0 @@
|
||||
- Use existing worktrees: Start a workspace in a worktree you already have, or create one from a branch or pull request. Plugins can manage worktree creation, removal, and restoration. When you branch off a fork PR or MR, choose Run setup to approve workspace automation.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -1,3 +0,0 @@
|
||||
- Use existing worktrees: Start a workspace in a worktree you already have, or create one from a branch or pull request. Plugins can manage worktree creation, removal, and restoration. When you branch off a fork PR or MR, choose Run setup to approve workspace automation.
|
||||
|
||||
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 @@
|
||||
- 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
|
||||
+1
-1
@@ -1 +1 @@
|
||||
sha256-gUBXG6rGxAAMUDgSXQw6GzkJ8U0xEoL9X/kZkLM4uxg=
|
||||
sha256-qZCOSeT264mXP2RcV+eD7lEkc3WAH1re6NjTtbQOHqY=
|
||||
|
||||
Generated
+38
-28
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "paseo",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "paseo",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"hasInstallScript": true,
|
||||
"license": "Apache-2.0",
|
||||
"workspaces": [
|
||||
@@ -6651,6 +6651,15 @@
|
||||
"url": "https://github.com/sponsors/ayuhito"
|
||||
}
|
||||
},
|
||||
"node_modules/@fontsource-variable/plus-jakarta-sans": {
|
||||
"version": "5.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@fontsource-variable/plus-jakarta-sans/-/plus-jakarta-sans-5.3.0.tgz",
|
||||
"integrity": "sha512-/l/4r0yyWK9JzAlmA0LiYgGgmJe/Gswt4jTJEzr5QhJfwMbvJZDmYWyW0M4X7yCK69BajMVlV/Lx8g7WDc1+sw==",
|
||||
"license": "OFL-1.1",
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ayuhito"
|
||||
}
|
||||
},
|
||||
"node_modules/@getpaseo/app": {
|
||||
"resolved": "packages/app",
|
||||
"link": true
|
||||
@@ -37468,7 +37477,7 @@
|
||||
},
|
||||
"packages/app": {
|
||||
"name": "@getpaseo/app",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"dependencies": {
|
||||
"@codemirror/commands": "6.10.4",
|
||||
"@codemirror/language": "6.12.4",
|
||||
@@ -39638,13 +39647,13 @@
|
||||
},
|
||||
"packages/cli": {
|
||||
"name": "@getpaseo/cli",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@clack/prompts": "^1.0.0",
|
||||
"@getpaseo/client": "0.17.0",
|
||||
"@getpaseo/protocol": "0.17.0",
|
||||
"@getpaseo/server": "0.17.0",
|
||||
"@getpaseo/client": "0.17.1",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"@getpaseo/server": "0.17.1",
|
||||
"chalk": "^5.3.0",
|
||||
"commander": "^12.0.0",
|
||||
"mime-types": "^2.1.35",
|
||||
@@ -39891,11 +39900,11 @@
|
||||
},
|
||||
"packages/client": {
|
||||
"name": "@getpaseo/client",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@getpaseo/protocol": "0.17.0",
|
||||
"@getpaseo/relay": "0.17.0",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"@getpaseo/relay": "0.17.1",
|
||||
"ws": "^8.20.0",
|
||||
"zod": "^4.4.3"
|
||||
},
|
||||
@@ -39907,7 +39916,7 @@
|
||||
},
|
||||
"packages/desktop": {
|
||||
"name": "@getpaseo/desktop",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@getpaseo/cli": "*",
|
||||
@@ -40150,7 +40159,7 @@
|
||||
},
|
||||
"packages/expo-two-way-audio": {
|
||||
"name": "@getpaseo/expo-two-way-audio",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@types/jest": "^29.5.14",
|
||||
@@ -40196,7 +40205,7 @@
|
||||
},
|
||||
"packages/highlight": {
|
||||
"name": "@getpaseo/highlight",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@codemirror/language": "6.12.4",
|
||||
@@ -40226,7 +40235,7 @@
|
||||
},
|
||||
"packages/plugin": {
|
||||
"name": "@getpaseo/plugin",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@agentclientprotocol/sdk": "^1.4.0",
|
||||
@@ -40234,8 +40243,8 @@
|
||||
"use-sync-external-store": "^1.6.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@getpaseo/client": "0.17.0",
|
||||
"@getpaseo/protocol": "0.17.0",
|
||||
"@getpaseo/client": "0.17.1",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"@types/node": "^20.9.0",
|
||||
"@types/react": "~19.2.0",
|
||||
"react": "19.2.3",
|
||||
@@ -40245,8 +40254,8 @@
|
||||
"zod": "^4.4.3"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@getpaseo/client": "0.17.0",
|
||||
"@getpaseo/protocol": "0.17.0",
|
||||
"@getpaseo/client": "0.17.1",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"react": ">=19.1.0 <20",
|
||||
"react-native": ">=0.81.5",
|
||||
"zod": "^4.4.3"
|
||||
@@ -40268,7 +40277,7 @@
|
||||
},
|
||||
"packages/protocol": {
|
||||
"name": "@getpaseo/protocol",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"semver": "^7.8.5",
|
||||
@@ -40296,7 +40305,7 @@
|
||||
},
|
||||
"packages/relay": {
|
||||
"name": "@getpaseo/relay",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@noble/ciphers": "^2.4.0",
|
||||
@@ -40518,17 +40527,17 @@
|
||||
},
|
||||
"packages/server": {
|
||||
"name": "@getpaseo/server",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"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",
|
||||
"@getpaseo/highlight": "0.17.0",
|
||||
"@getpaseo/plugin": "0.17.0",
|
||||
"@getpaseo/protocol": "0.17.0",
|
||||
"@getpaseo/relay": "0.17.0",
|
||||
"@getpaseo/client": "0.17.1",
|
||||
"@getpaseo/highlight": "0.17.1",
|
||||
"@getpaseo/plugin": "0.17.1",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"@getpaseo/relay": "0.17.1",
|
||||
"@isaacs/ttlcache": "^2.1.4",
|
||||
"@modelcontextprotocol/sdk": "1.29.0",
|
||||
"@opencode-ai/sdk": "1.14.46",
|
||||
@@ -41475,11 +41484,12 @@
|
||||
},
|
||||
"packages/website": {
|
||||
"name": "@getpaseo/website",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"dependencies": {
|
||||
"@cloudflare/vite-plugin": "^1.29.1",
|
||||
"@cloudflare/workers-types": "^4.20260317.1",
|
||||
"@fontsource-variable/geist": "^5.3.0",
|
||||
"@fontsource-variable/plus-jakarta-sans": "^5.3.0",
|
||||
"@getpaseo/protocol": "*",
|
||||
"@tanstack/react-router": "^1.170.16",
|
||||
"@tanstack/react-start": "^1.168.26",
|
||||
@@ -43085,7 +43095,7 @@
|
||||
},
|
||||
"plugins": {
|
||||
"name": "@getpaseo/builtin-plugins",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"dependencies": {
|
||||
"@getpaseo/plugin": "*",
|
||||
"zod": "^4.4.3"
|
||||
|
||||
+16
-13
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "paseo",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"private": true,
|
||||
"description": "Paseo: voice-controlled development environment for local AI coding agents",
|
||||
"keywords": [
|
||||
@@ -110,19 +110,22 @@
|
||||
"version:all:beta:next": "node scripts/set-release-version.mjs --mode beta-next",
|
||||
"version:all:promote": "node scripts/set-release-version.mjs --mode promote",
|
||||
"release:check": "npm run release:prepare && npm run typecheck --workspace=@getpaseo/highlight && npm run typecheck --workspace=@getpaseo/relay && npm run typecheck --workspace=@getpaseo/protocol && npm run build:client:clean && npm run typecheck --workspace=@getpaseo/client && npm run typecheck --workspace=@getpaseo/plugin && npm run build:server:clean && npm run typecheck --workspace=@getpaseo/server && npm run typecheck --workspace=@getpaseo/cli && npm pack --dry-run --workspace=@getpaseo/highlight && npm pack --dry-run --workspace=@getpaseo/relay && npm pack --dry-run --workspace=@getpaseo/protocol && npm pack --dry-run --workspace=@getpaseo/client && npm pack --dry-run --workspace=@getpaseo/plugin && npm pack --dry-run --workspace=@getpaseo/server && npm pack --dry-run --workspace=@getpaseo/cli",
|
||||
"release:publish:dry-run": "npm publish --dry-run --workspace=@getpaseo/highlight --access public && npm publish --dry-run --workspace=@getpaseo/relay --access public && npm publish --dry-run --workspace=@getpaseo/protocol --access public && npm publish --dry-run --workspace=@getpaseo/client --access public && npm publish --dry-run --workspace=@getpaseo/plugin --access public && npm publish --dry-run --workspace=@getpaseo/server --access public && npm publish --dry-run --workspace=@getpaseo/cli --access public",
|
||||
"release:publish:beta:dry-run": "npm publish --dry-run --workspace=@getpaseo/highlight --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/relay --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/protocol --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/client --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/plugin --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/server --access public --tag beta && npm publish --dry-run --workspace=@getpaseo/cli --access public --tag beta",
|
||||
"release:publish": "npm publish --workspace=@getpaseo/highlight --access public && npm publish --workspace=@getpaseo/relay --access public && npm publish --workspace=@getpaseo/protocol --access public && npm publish --workspace=@getpaseo/client --access public && npm publish --workspace=@getpaseo/plugin --access public && npm publish --workspace=@getpaseo/server --access public && npm publish --workspace=@getpaseo/cli --access public",
|
||||
"release:publish:beta": "npm publish --workspace=@getpaseo/highlight --access public --tag beta && npm publish --workspace=@getpaseo/relay --access public --tag beta && npm publish --workspace=@getpaseo/protocol --access public --tag beta && npm publish --workspace=@getpaseo/client --access public --tag beta && npm publish --workspace=@getpaseo/plugin --access public --tag beta && npm publish --workspace=@getpaseo/server --access public --tag beta && npm publish --workspace=@getpaseo/cli --access public --tag beta",
|
||||
"release:prep:patch": "npm run release:check && npm run version:all:patch",
|
||||
"release:prep:minor": "npm run release:check && npm run version:all:minor",
|
||||
"release:prep:major": "npm run release:check && npm run version:all:major",
|
||||
"release:prep:beta:patch": "npm run release:check && npm run version:all:beta:patch",
|
||||
"release:prep:beta:minor": "npm run release:check && npm run version:all:beta:minor",
|
||||
"release:prep:beta:major": "npm run release:check && npm run version:all:beta:major",
|
||||
"release:prep:beta:next": "npm run release:check && npm run version:all:beta:next",
|
||||
"release:prep:promote": "npm run release:check && npm run version:all:promote",
|
||||
"release:publish:dry-run": "node scripts/publish-release-packages.mjs --dry-run",
|
||||
"release:publish:beta:dry-run": "node scripts/publish-release-packages.mjs --beta --dry-run",
|
||||
"release:publish": "node scripts/publish-release-packages.mjs",
|
||||
"release:publish:beta": "node scripts/publish-release-packages.mjs --beta",
|
||||
"release:push": "node scripts/push-current-release-tag.mjs",
|
||||
"release:beta:patch": "npm run release:check && npm run version:all:beta:patch && npm run release:publish:beta && npm run release:push",
|
||||
"release:beta:minor": "npm run release:check && npm run version:all:beta:minor && npm run release:publish:beta && npm run release:push",
|
||||
"release:beta:major": "npm run release:check && npm run version:all:beta:major && npm run release:publish:beta && npm run release:push",
|
||||
"release:beta:next": "npm run release:check && npm run version:all:beta:next && npm run release:publish:beta && npm run release:push",
|
||||
"release:promote": "npm run release:check && npm run version:all:promote && npm run release:publish && npm run release:push",
|
||||
"release:patch": "npm run release:check && npm run version:all:patch && npm run release:publish && npm run release:push",
|
||||
"release:minor": "npm run release:check && npm run version:all:minor && npm run release:publish && npm run release:push",
|
||||
"release:major": "npm run release:check && npm run version:all:major && npm run release:publish && npm run release:push"
|
||||
"release:ship": "node scripts/push-current-release-tag.mjs --check && npm run release:publish && npm run release:push",
|
||||
"release:ship:beta": "node scripts/push-current-release-tag.mjs --check && npm run release:publish:beta && npm run release:push",
|
||||
"release:reconcile": "node scripts/reconcile-release.mjs"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/ws": "^8.5.14",
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -0,0 +1,143 @@
|
||||
import type { Locator } from "@playwright/test";
|
||||
import { expect, test, type Page } from "../support/fixtures";
|
||||
import { openAgentRoute, seedMockAgentWorkspace } from "../support/helpers/mock-agent";
|
||||
|
||||
const APP_SETTINGS_KEY = "@paseo:app-settings";
|
||||
|
||||
async function useLanguage(page: Page, language: string): Promise<void> {
|
||||
await page.addInitScript(
|
||||
({ key, language: value }) => {
|
||||
localStorage.setItem(key, JSON.stringify({ language: value }));
|
||||
},
|
||||
{ key: APP_SETTINGS_KEY, language },
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Lays the placeholder out the way the textarea does, in a mirror element with
|
||||
* the same box and font, and reports whether any of its lines reach the hint.
|
||||
*/
|
||||
async function placeholderOverlaps(input: Locator, hint: Locator): Promise<boolean> {
|
||||
const hintBox = await hint.boundingBox();
|
||||
if (!hintBox) throw new Error("Focus hint has no layout box");
|
||||
return input.evaluate((element, box) => {
|
||||
const textarea = element as HTMLTextAreaElement;
|
||||
const style = getComputedStyle(textarea);
|
||||
const rect = textarea.getBoundingClientRect();
|
||||
const mirror = document.createElement("div");
|
||||
for (const property of [
|
||||
"boxSizing",
|
||||
"paddingTop",
|
||||
"paddingRight",
|
||||
"paddingBottom",
|
||||
"paddingLeft",
|
||||
"borderTopWidth",
|
||||
"borderRightWidth",
|
||||
"borderBottomWidth",
|
||||
"borderLeftWidth",
|
||||
"fontFamily",
|
||||
"fontSize",
|
||||
"fontWeight",
|
||||
"letterSpacing",
|
||||
"lineHeight",
|
||||
"textIndent",
|
||||
"wordSpacing",
|
||||
] as const) {
|
||||
mirror.style[property] = style[property];
|
||||
}
|
||||
Object.assign(mirror.style, {
|
||||
position: "fixed",
|
||||
left: `${rect.left}px`,
|
||||
top: `${rect.top}px`,
|
||||
width: `${rect.width}px`,
|
||||
borderStyle: "solid",
|
||||
borderColor: "transparent",
|
||||
whiteSpace: "pre-wrap",
|
||||
overflowWrap: "break-word",
|
||||
visibility: "hidden",
|
||||
});
|
||||
const text = document.createTextNode(textarea.placeholder);
|
||||
mirror.appendChild(text);
|
||||
document.body.appendChild(mirror);
|
||||
const range = document.createRange();
|
||||
range.selectNodeContents(text);
|
||||
const lines = Array.from(range.getClientRects());
|
||||
mirror.remove();
|
||||
return lines.some(
|
||||
(line) =>
|
||||
line.right > box.x &&
|
||||
line.left < box.x + box.width &&
|
||||
line.bottom > box.y &&
|
||||
line.top < box.y + box.height,
|
||||
);
|
||||
}, hintBox);
|
||||
}
|
||||
|
||||
async function recordFirstVisibleHint(page: Page): Promise<void> {
|
||||
await page.addInitScript(() => {
|
||||
function sample() {
|
||||
const root = document.querySelector('[data-testid="message-input-root"]');
|
||||
const input = root?.querySelector("textarea");
|
||||
const hint = Array.from(root?.querySelectorAll("div") ?? []).find(
|
||||
(element) => !element.childElementCount && element.textContent?.endsWith("pour saisir"),
|
||||
);
|
||||
if (!input || !hint || Number(getComputedStyle(hint).opacity) === 0) {
|
||||
requestAnimationFrame(sample);
|
||||
return;
|
||||
}
|
||||
|
||||
const inputRight = input.getBoundingClientRect().right;
|
||||
const textRight = inputRight - parseFloat(getComputedStyle(input).paddingRight);
|
||||
const hintLeft = hint.getBoundingClientRect().left;
|
||||
Reflect.set(window, "__firstVisibleHintHasSpace", textRight <= hintLeft + 1);
|
||||
}
|
||||
requestAnimationFrame(sample);
|
||||
});
|
||||
}
|
||||
|
||||
async function expectFirstVisibleHintHasSpace(page: Page): Promise<void> {
|
||||
await expect
|
||||
.poll(() => page.evaluate(() => Reflect.get(window, "__firstVisibleHintHasSpace")))
|
||||
.toBe(true);
|
||||
}
|
||||
|
||||
const FRENCH_LAYOUTS = [
|
||||
{ name: "phone width", width: 390, placeholder: "Message, @fichiers, /commandes" },
|
||||
{
|
||||
name: "desktop width",
|
||||
width: 1024,
|
||||
placeholder:
|
||||
"Écrivez à l’agent, mentionnez des @fichiers ou utilisez les /commandes et /skills",
|
||||
},
|
||||
];
|
||||
|
||||
for (const layout of FRENCH_LAYOUTS) {
|
||||
test.describe(`French composer at ${layout.name}`, () => {
|
||||
test.use({ viewport: { width: layout.width, height: 844 } });
|
||||
|
||||
test("the focus hint does not cover the placeholder", async ({ page }) => {
|
||||
const agent = await seedMockAgentWorkspace({
|
||||
repoPrefix: "composer-focus-hint-",
|
||||
title: "Composer focus hint",
|
||||
});
|
||||
|
||||
try {
|
||||
await useLanguage(page, "fr");
|
||||
await recordFirstVisibleHint(page);
|
||||
await openAgentRoute(page, agent);
|
||||
const input = page.getByRole("textbox", { name: "Écrire à l’agent…" }).first();
|
||||
await expect(input).toBeVisible();
|
||||
await expect(input).toHaveAttribute("placeholder", layout.placeholder);
|
||||
await input.blur();
|
||||
|
||||
const hint = page.getByText(/pour saisir$/).first();
|
||||
await expect(hint).toBeVisible();
|
||||
// The input takes the hint's width on the render after the hint lays out.
|
||||
await expect.poll(() => placeholderOverlaps(input, hint)).toBe(false);
|
||||
await expectFirstVisibleHintHasSpace(page);
|
||||
} finally {
|
||||
await agent.cleanup();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -18,6 +18,7 @@ import {
|
||||
expectComposerFullscreenControls,
|
||||
sendComposerWithButton,
|
||||
queueComposerWithButton,
|
||||
fillComposerDraft,
|
||||
configureComposerQueueSend,
|
||||
activateRetainedComposerTab,
|
||||
switchComposerTabWithKeyboard,
|
||||
@@ -450,6 +451,32 @@ test("fullscreen Send keeps the configured queue behavior while an agent runs",
|
||||
}
|
||||
});
|
||||
|
||||
test("editing a queued draft restores its original height with the focus hint visible", async ({
|
||||
page,
|
||||
}) => {
|
||||
await configureComposerQueueSend(page);
|
||||
await resizeComposerViewport(page, "portrait");
|
||||
const agent = await startRunningMockAgent(page, {
|
||||
prefix: "composer-queued-draft-height-",
|
||||
model: "one-minute-stream",
|
||||
prompt: "Stay running while a draft is queued.",
|
||||
});
|
||||
try {
|
||||
const draft = "Please review the latest changes.\nPlease review the latest changes.";
|
||||
await fillComposerDraft(page, draft);
|
||||
const originalHeight = await composerHeight(page);
|
||||
await queueComposerWithButton(page);
|
||||
await expect(composerLocator(page)).toHaveValue("");
|
||||
await composerLocator(page).blur();
|
||||
await expect(page.getByText(/ to focus$/)).toBeVisible();
|
||||
await page.getByRole("button", { name: "Edit queued message", exact: true }).click();
|
||||
await expect(composerLocator(page)).toHaveValue(draft);
|
||||
await expectComposerHeight(page, originalHeight);
|
||||
} finally {
|
||||
await agent.cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
test("image paste stays attached to the active editor across fullscreen entry and exit", async ({
|
||||
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",
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { mkdir, rm, writeFile } from "node:fs/promises";
|
||||
import { dirname } from "node:path";
|
||||
import { expect, test } from "../support/fixtures";
|
||||
import { gotoAppShell, openSettings } from "../support/helpers/app";
|
||||
import {
|
||||
@@ -49,8 +51,10 @@ interface ProviderConfigClient {
|
||||
}): Promise<unknown>;
|
||||
}
|
||||
|
||||
test("adds and removes a custom model while the provider fails", async ({ page }) => {
|
||||
test("adds and removes a custom model while the provider fails", async ({ page }, testInfo) => {
|
||||
test.setTimeout(120_000);
|
||||
const discoveryGate = testInfo.outputPath("hold-provider-discovery");
|
||||
await mkdir(dirname(discoveryGate), { recursive: true });
|
||||
const client = await connectDaemonClient<ProviderConfigClient>({
|
||||
clientIdPrefix: "custom-model-failing-e2e",
|
||||
});
|
||||
@@ -60,7 +64,14 @@ test("adds and removes a custom model while the provider fails", async ({ page }
|
||||
[FAILING_PROVIDER.id]: {
|
||||
extends: "acp",
|
||||
label: FAILING_PROVIDER.name,
|
||||
command: ["node", "-e", "process.exit(1)"],
|
||||
command: [
|
||||
"node",
|
||||
"-e",
|
||||
'const { existsSync } = require("node:fs");' +
|
||||
"const exitIfReleased = () => { if (!existsSync(process.argv[1])) process.exit(1); };" +
|
||||
"exitIfReleased(); setInterval(exitIfReleased, 25);",
|
||||
discoveryGate,
|
||||
],
|
||||
},
|
||||
},
|
||||
});
|
||||
@@ -76,9 +87,15 @@ test("adds and removes a custom model while the provider fails", async ({ page }
|
||||
await expect(page.getByRole("textbox", { name: "Search models" })).toHaveCount(0);
|
||||
});
|
||||
|
||||
await addCustomModel(page, shortModelId);
|
||||
await test.step("saving closes the Add sheet while provider discovery is still pending", async () => {
|
||||
await writeFile(discoveryGate, "");
|
||||
await addCustomModel(page, shortModelId);
|
||||
});
|
||||
await rm(discoveryGate);
|
||||
await expect(page.getByTestId("provider-error")).toBeVisible({ timeout: 30_000 });
|
||||
await removeListedCustomModel(page, shortModelId);
|
||||
} finally {
|
||||
await rm(discoveryGate, { force: true });
|
||||
await client
|
||||
.patchDaemonConfig({ removeProviders: [FAILING_PROVIDER.id] })
|
||||
.catch(() => undefined);
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
import { expect, type Locator, type Page } from "@playwright/test";
|
||||
import { test } from "../support/fixtures";
|
||||
import { runWorkspaceActionFromCommandCenter } from "../support/helpers/command-center-workspace-actions";
|
||||
import { clickNewChat, gotoWorkspace } from "../support/helpers/launcher";
|
||||
import { seedWorkspace } from "../support/helpers/seed-client";
|
||||
import { waitForWorkspaceTabsVisible } from "../support/helpers/workspace-tabs";
|
||||
|
||||
const DRAG_DISTANCE = -40;
|
||||
|
||||
function splitDividers(page: Page): Locator {
|
||||
return page.getByTestId("workspace-split-resize-handle").filter({ visible: true });
|
||||
}
|
||||
|
||||
async function dividerX(divider: Locator): Promise<number> {
|
||||
const box = await divider.boundingBox();
|
||||
if (!box) throw new Error("Divider has no bounding box");
|
||||
return box.x;
|
||||
}
|
||||
|
||||
async function dragDivider(divider: Locator, deltaX: number): Promise<void> {
|
||||
const page = divider.page();
|
||||
const box = await divider.boundingBox();
|
||||
if (!box) throw new Error("Divider has no bounding box");
|
||||
const x = box.x + box.width / 2;
|
||||
const y = box.y + box.height / 2;
|
||||
await page.mouse.move(x, y);
|
||||
await page.mouse.down();
|
||||
await page.mouse.move(x + deltaX / 2, y, { steps: 4 });
|
||||
await page.mouse.move(x + deltaX, y, { steps: 4 });
|
||||
await page.mouse.up();
|
||||
}
|
||||
|
||||
async function expectDividerFollowsDrag({
|
||||
page,
|
||||
index,
|
||||
}: {
|
||||
page: Page;
|
||||
index: number;
|
||||
}): Promise<void> {
|
||||
const divider = splitDividers(page).nth(index);
|
||||
const before = await dividerX(divider);
|
||||
await dragDivider(divider, DRAG_DISTANCE);
|
||||
await expect
|
||||
.poll(async () => (await dividerX(divider)) - before, {
|
||||
message: `divider ${index + 1} should follow the drag`,
|
||||
})
|
||||
.toBeLessThan(DRAG_DISTANCE * 0.75);
|
||||
}
|
||||
|
||||
async function splitRight({
|
||||
page,
|
||||
expectedDividers,
|
||||
}: {
|
||||
page: Page;
|
||||
expectedDividers: number;
|
||||
}): Promise<void> {
|
||||
await runWorkspaceActionFromCommandCenter(page, "Split pane right");
|
||||
await expect(splitDividers(page)).toHaveCount(expectedDividers);
|
||||
}
|
||||
|
||||
test.describe("Split pane resize", () => {
|
||||
test("every divider drags in a four-pane row", async ({ page }) => {
|
||||
await page.setViewportSize({ width: 1600, height: 900 });
|
||||
const workspace = await seedWorkspace({ repoPrefix: "split-resize-fresh-" });
|
||||
try {
|
||||
await gotoWorkspace(page, workspace.workspaceId);
|
||||
await waitForWorkspaceTabsVisible(page);
|
||||
await clickNewChat(page);
|
||||
await splitRight({ page, expectedDividers: 1 });
|
||||
await splitRight({ page, expectedDividers: 2 });
|
||||
await splitRight({ page, expectedDividers: 3 });
|
||||
|
||||
for (const index of [0, 1, 2]) {
|
||||
await expectDividerFollowsDrag({ page, index });
|
||||
}
|
||||
} finally {
|
||||
await workspace.cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
test("every divider drags after panes are added to a resized row", async ({ page }) => {
|
||||
await page.setViewportSize({ width: 1600, height: 900 });
|
||||
const workspace = await seedWorkspace({ repoPrefix: "split-resize-grown-" });
|
||||
try {
|
||||
await gotoWorkspace(page, workspace.workspaceId);
|
||||
await waitForWorkspaceTabsVisible(page);
|
||||
await clickNewChat(page);
|
||||
await splitRight({ page, expectedDividers: 1 });
|
||||
await expectDividerFollowsDrag({ page, index: 0 });
|
||||
|
||||
await splitRight({ page, expectedDividers: 2 });
|
||||
await splitRight({ page, expectedDividers: 3 });
|
||||
|
||||
for (const index of [0, 1, 2]) {
|
||||
await expectDividerFollowsDrag({ page, index });
|
||||
}
|
||||
} finally {
|
||||
await workspace.cleanup();
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -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();
|
||||
@@ -836,6 +940,8 @@ test("usage percentages state their meaning and follow the selected language", a
|
||||
}
|
||||
});
|
||||
|
||||
const exhaustionClock = /^runs out (?:[A-Z][a-z]{2} )?\d{1,2}:\d{2}(?: [AP]M)?$/;
|
||||
|
||||
test("open usage clocks advance without refreshing or reopening", async ({ page }) => {
|
||||
test.setTimeout(120_000);
|
||||
const now = new Date();
|
||||
@@ -853,12 +959,16 @@ test("open usage clocks advance without refreshing or reopening", async ({ page
|
||||
const card = page.getByTestId("usage-report-login-journey:account");
|
||||
await expect(card.getByTestId("usage-freshness")).toHaveText("Updated just now");
|
||||
await expect(card.getByText("resets in 30m", { exact: false }).first()).toBeVisible();
|
||||
const forecast = card.getByText(exhaustionClock);
|
||||
await expect(forecast).toBeVisible();
|
||||
const forecastTime = (await forecast.innerText()).replace(/^[^0-9]+/, "");
|
||||
// The shared minute clock is wall-aligned, and the daemon timestamps use real time.
|
||||
// After two browser minutes the latest displayed tick is one or two minutes old.
|
||||
await advanceUsageClock(page, 120_000);
|
||||
await expect(card.getByTestId("usage-freshness")).toHaveText(/^Updated [12]m ago$/);
|
||||
await expect(card.getByText(/resets in (28|29)m/).first()).toBeVisible();
|
||||
await expect(card.getByText(/runs out in (28|29)m/)).toBeVisible();
|
||||
// The weekday drops off at local midnight, but the forecast time stays fixed.
|
||||
await expect(forecast).toHaveText(new RegExp(` ${forecastTime}$`));
|
||||
await expect(card.getByTestId("provider-usage-balance-credits-reset")).toHaveText(
|
||||
/^resets in (28|29)m\s·\s/,
|
||||
);
|
||||
@@ -867,7 +977,7 @@ test("open usage clocks advance without refreshing or reopening", async ({ page
|
||||
}
|
||||
});
|
||||
|
||||
test("Refresh all keeps quota visible and restores the forecast after a timeout", async ({
|
||||
test("Refresh all keeps quota visible after a timeout and shows only reset details when back on track", async ({
|
||||
page,
|
||||
}) => {
|
||||
const reading = new Date();
|
||||
@@ -875,7 +985,7 @@ test("Refresh all keeps quota visible and restores the forecast after a timeout"
|
||||
try {
|
||||
const transport = await installDaemonWebSocketGate(page);
|
||||
await openCompactUsageWithClock(page, reading);
|
||||
await expectQuota(page, "40% used", /runs out in /);
|
||||
await expectQuota(page, "40% used", exhaustionClock);
|
||||
|
||||
await timeOutUsageRefresh(page, transport);
|
||||
await expectQuota(page, "40% used", null);
|
||||
@@ -884,7 +994,7 @@ test("Refresh all keeps quota visible and restores the forecast after a timeout"
|
||||
await login.setReport(usageReading(reading, 10));
|
||||
transport.releaseHeldClientRequest();
|
||||
await refreshAllUsage(page);
|
||||
await expectQuota(page, "10% used", "~50% left at reset");
|
||||
await expectQuota(page, "10% used", null);
|
||||
await expectUsageRefreshError(page).toBeHidden();
|
||||
} finally {
|
||||
await login.cleanup();
|
||||
@@ -897,23 +1007,29 @@ test("a card refresh timeout is visible alongside a newer quota forecast", async
|
||||
try {
|
||||
const transport = await installDaemonWebSocketGate(page);
|
||||
await openCompactUsageWithClock(page, reading);
|
||||
await expectQuota(page, "40% used", /runs out in /);
|
||||
await expectQuota(page, "40% used", exhaustionClock);
|
||||
|
||||
await delayCardRefreshResponse(page, transport);
|
||||
await login.setReport(usageReading(reading, 10));
|
||||
await login.setReport(usageReading(reading, 45));
|
||||
await refreshAllUsage(page);
|
||||
await expectQuota(page, "10% used", "~50% left at reset");
|
||||
await expectQuota(page, "45% used", exhaustionClock);
|
||||
|
||||
await advanceUsageClock(page, 61_000);
|
||||
await expectUsageRefreshError(page).toBeVisible();
|
||||
await expectQuota(page, "10% used", "~50% left at reset");
|
||||
await expect(
|
||||
usageModal(page)
|
||||
.getByTestId("usage-report-login-journey:account")
|
||||
.getByTestId("usage-refresh-error"),
|
||||
).toHaveText("Unable to refresh usage");
|
||||
await expectQuota(page, "45% used", exhaustionClock);
|
||||
} finally {
|
||||
await login.cleanup();
|
||||
}
|
||||
});
|
||||
|
||||
function expectUsageRefreshError(page: Page) {
|
||||
return expect(usageModal(page).getByText("Unable to refresh usage", { exact: true }));
|
||||
return expect(
|
||||
usageModal(page).getByRole("alert").getByText("Unable to refresh usage", { exact: true }),
|
||||
);
|
||||
}
|
||||
|
||||
async function delayCardRefreshResponse(
|
||||
@@ -947,7 +1063,10 @@ async function expectQuota(page: Page, amount: string, forecast: string | RegExp
|
||||
await expect(usage.getByText(amount, { exact: true })).toBeVisible();
|
||||
await expect(usage.getByText(/^resets in /)).toBeVisible();
|
||||
if (forecast === null) {
|
||||
await expect(usage.getByText(/^runs out in /)).toBeHidden();
|
||||
await expect(usage.getByRole("checkbox", { name: /^Pin Claude Session/ })).toHaveAccessibleName(
|
||||
/^Pin Claude Session, \d+% used · resets in [^·]+ · [^·]+$/,
|
||||
);
|
||||
await expect(usage.getByText(/^runs out /)).toBeHidden();
|
||||
return;
|
||||
}
|
||||
await expect(usage.getByText(forecast)).toBeVisible();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -19,8 +19,6 @@ export async function addCustomModel(page: Page, id: string): Promise<void> {
|
||||
.getByRole("button", { name: "Add", exact: true })
|
||||
.click();
|
||||
await expect(page.getByRole("button", { name: `Remove ${id}`, exact: true })).toHaveCount(1);
|
||||
// Config updates before provider refresh finishes and dismisses the add sheet.
|
||||
// Resizing or interacting with the model list must wait for that save to finish.
|
||||
await expect(page.getByTestId("add-custom-model-sheet")).toBeHidden();
|
||||
}
|
||||
|
||||
|
||||
@@ -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",
|
||||
"version": "0.17.1",
|
||||
"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: {
|
||||
|
||||
@@ -462,8 +462,12 @@ function SplitNodeView({
|
||||
groupId ? state.splitSizesByWorkspace[workspaceKey]?.[groupId] : undefined,
|
||||
);
|
||||
const groupChildren = node.kind === "group" ? node.group.children : EMPTY_SPLIT_NODES;
|
||||
// Dragged sizes live per group id, apart from the layout tree, and a group keeps its id when
|
||||
// panes are added or removed. They only apply while they still have one entry per child;
|
||||
// otherwise the dividers past the end of the list could not move.
|
||||
const layoutGroupSizes = node.kind === "group" ? node.group.sizes : EMPTY_SPLIT_SIZES;
|
||||
const groupSizes =
|
||||
storedGroupSizes ?? (node.kind === "group" ? node.group.sizes : EMPTY_SPLIT_SIZES);
|
||||
storedGroupSizes?.length === groupChildren.length ? storedGroupSizes : layoutGroupSizes;
|
||||
const visibleFlex = useMemo(
|
||||
() => resolveVisibleGroupFlex(groupChildren, groupSizes, maximizedPaneId),
|
||||
[groupChildren, groupSizes, maximizedPaneId],
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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,
|
||||
@@ -1016,6 +1017,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 +1322,7 @@ function ComposerContentImpl({
|
||||
isCompactLayout: isCompactLayoutOverride,
|
||||
inputMode = "chat",
|
||||
editingSession: providedEditingSession,
|
||||
error: externalError,
|
||||
readOnly = false,
|
||||
submitLabel,
|
||||
placeholder,
|
||||
@@ -2544,14 +2548,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 +2840,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);
|
||||
|
||||
@@ -117,10 +117,11 @@ export function useComposerHeight({
|
||||
useEffect(() => {
|
||||
const source = textareaRef.current;
|
||||
if (!source || typeof ResizeObserver === "undefined") return;
|
||||
let previousWidth = source.clientWidth;
|
||||
const observer = new ResizeObserver(() => {
|
||||
const nextWidth = source.clientWidth;
|
||||
if (Math.abs(nextWidth - previousWidth) < 1) return;
|
||||
let previousWidth: number | undefined;
|
||||
const observer = new ResizeObserver(([entry]) => {
|
||||
// Hint padding changes the width text wraps at even when clientWidth stays fixed.
|
||||
const nextWidth = entry.contentRect.width;
|
||||
if (nextWidth === previousWidth) return;
|
||||
previousWidth = nextWidth;
|
||||
measure(paramsRef.current.getText());
|
||||
});
|
||||
|
||||
@@ -677,24 +677,6 @@ function MessageInputOverlay({
|
||||
return null;
|
||||
}
|
||||
|
||||
function FocusHint({
|
||||
visible,
|
||||
focusInputKeys,
|
||||
label,
|
||||
}: {
|
||||
visible: boolean;
|
||||
focusInputKeys: ShortcutChord | null | undefined;
|
||||
label: string;
|
||||
}) {
|
||||
const { isActiveComposer } = useComposerKeyboardScope();
|
||||
if (!isActiveComposer || !visible || !focusInputKeys || !label.trim()) return null;
|
||||
return (
|
||||
<Text style={styles.focusHintText} pointerEvents="none">
|
||||
{label}
|
||||
</Text>
|
||||
);
|
||||
}
|
||||
|
||||
interface ComposerTextSurfaceProps {
|
||||
readOnly: boolean;
|
||||
value: string;
|
||||
@@ -745,6 +727,32 @@ function ComposerTextSurface(props: ComposerTextSurfaceProps): React.ReactElemen
|
||||
onRenderedLinesChange(event.nativeEvent.lines.length),
|
||||
[onRenderedLinesChange],
|
||||
);
|
||||
const { isActiveComposer } = useComposerKeyboardScope();
|
||||
const { focusHintLabel, focusHintVisible, focusInputKeys } = props;
|
||||
const [focusHintLayout, setFocusHintLayout] = useState<{ label: string; width: number }>();
|
||||
const handleFocusHintLayout = useCallback(
|
||||
(event: LayoutChangeEvent) => {
|
||||
setFocusHintLayout({ label: focusHintLabel, width: event.nativeEvent.layout.width });
|
||||
},
|
||||
[focusHintLabel],
|
||||
);
|
||||
const shouldShowFocusHint =
|
||||
isActiveComposer &&
|
||||
focusHintVisible &&
|
||||
Boolean(focusInputKeys) &&
|
||||
focusHintLabel.trim().length > 0;
|
||||
const focusHintWidth =
|
||||
shouldShowFocusHint && focusHintLayout?.label === focusHintLabel
|
||||
? focusHintLayout.width
|
||||
: undefined;
|
||||
// Make room for the hint in the same render that reveals it.
|
||||
const textInputStyle = useMemo(
|
||||
() =>
|
||||
focusHintWidth === undefined
|
||||
? props.textInputStyle
|
||||
: [props.textInputStyle, { paddingRight: focusHintWidth }],
|
||||
[focusHintWidth, props.textInputStyle],
|
||||
);
|
||||
if (props.readOnly) {
|
||||
return (
|
||||
<View style={styles.textInputScrollWrapper}>
|
||||
@@ -775,7 +783,7 @@ function ComposerTextSurface(props: ComposerTextSurfaceProps): React.ReactElemen
|
||||
accessibilityLabel={props.accessibilityLabel}
|
||||
onFocus={props.onFocus}
|
||||
onBlur={props.onBlur}
|
||||
style={props.textInputStyle}
|
||||
style={textInputStyle}
|
||||
multiline
|
||||
scrollEnabled={props.scrollEnabled}
|
||||
editable={props.editable}
|
||||
@@ -785,11 +793,16 @@ function ComposerTextSurface(props: ComposerTextSurfaceProps): React.ReactElemen
|
||||
onPasteError={props.onPasteError}
|
||||
autoFocus={props.autoFocus}
|
||||
/>
|
||||
<FocusHint
|
||||
visible={props.focusHintVisible}
|
||||
focusInputKeys={props.focusInputKeys}
|
||||
label={props.focusHintLabel}
|
||||
/>
|
||||
{shouldShowFocusHint ? (
|
||||
<Text
|
||||
key={focusHintLabel}
|
||||
style={[styles.focusHintText, focusHintWidth === undefined && styles.unmeasuredFocusHint]}
|
||||
pointerEvents="none"
|
||||
onLayout={handleFocusHintLayout}
|
||||
>
|
||||
{focusHintLabel}
|
||||
</Text>
|
||||
) : null}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
@@ -2460,10 +2473,12 @@ const styles = StyleSheet.create((theme: Theme) => ({
|
||||
position: "absolute",
|
||||
top: 0,
|
||||
right: 0,
|
||||
paddingLeft: theme.spacing[2],
|
||||
fontSize: theme.fontSize.sm,
|
||||
color: theme.colors.foregroundMuted,
|
||||
opacity: 0.5,
|
||||
},
|
||||
unmeasuredFocusHint: { opacity: 0 },
|
||||
textInput: {
|
||||
// Preserve the controls when an ancestor constrains an overlong draft.
|
||||
flexShrink: 1,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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({
|
||||
|
||||
@@ -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: {},
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -2264,7 +2264,11 @@ export const ar: TranslationResources = {
|
||||
title: "استخدام الخطة",
|
||||
refresh: "تحديث",
|
||||
reorderCard: "إعادة ترتيب {{source}}",
|
||||
showCard: "إظهار {{source}}",
|
||||
sources: "المصادر",
|
||||
sourcesCount: "{{shown}} من {{total}}",
|
||||
providerInactive: "المزود غير نشط",
|
||||
allSourcesHidden: "لا توجد مصادر استخدام معروضة",
|
||||
chooseSources: "اختيار المصادر",
|
||||
refreshAll: "تحديث الكل",
|
||||
refreshing: "جارٍ التحديث...",
|
||||
loading: "جارٍ تحميل بيانات الاستخدام...",
|
||||
@@ -2323,11 +2327,9 @@ export const ar: TranslationResources = {
|
||||
resetsIn: "تتم إعادة التعيين خلال {{duration}}",
|
||||
resetsAtWeekday: "{{weekday}} {{time}}",
|
||||
resetsAtDate: "{{date}}، {{time}}",
|
||||
projectedLeftAtReset: "نحو {{percentage}} متبقية عند إعادة التعيين",
|
||||
limitReached: "تم بلوغ الحد",
|
||||
mayHaveRunOut: "ربما نفدت الحصة",
|
||||
runsOutNow: "ينفد الآن",
|
||||
runsOutIn: "ينفد خلال {{duration}}",
|
||||
runsOutAt: "ينفد عند {{time}}",
|
||||
justNow: "الآن",
|
||||
daysAgo: "قبل {{value}} يومًا",
|
||||
daysAgo_zero: "قبل {{value}} يوم",
|
||||
|
||||
@@ -2292,7 +2292,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...",
|
||||
@@ -2333,11 +2337,9 @@ export const en = {
|
||||
resetsIn: "resets in {{duration}}",
|
||||
resetsAtWeekday: "{{weekday}} {{time}}",
|
||||
resetsAtDate: "{{date}}, {{time}}",
|
||||
projectedLeftAtReset: "~{{percentage}} left at reset",
|
||||
limitReached: "Limit reached",
|
||||
mayHaveRunOut: "May have run out",
|
||||
runsOutNow: "runs out now",
|
||||
runsOutIn: "runs out in {{duration}}",
|
||||
runsOutAt: "runs out {{time}}",
|
||||
justNow: "just now",
|
||||
daysAgo: "{{value}}d ago",
|
||||
hoursAgo: "{{value}}h ago",
|
||||
|
||||
@@ -2313,7 +2313,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...",
|
||||
@@ -2354,11 +2358,9 @@ export const es: TranslationResources = {
|
||||
resetsIn: "se restablece en {{duration}}",
|
||||
resetsAtWeekday: "{{weekday}} {{time}}",
|
||||
resetsAtDate: "{{date}}, {{time}}",
|
||||
projectedLeftAtReset: "~{{percentage}} restante al restablecerse",
|
||||
limitReached: "Límite alcanzado",
|
||||
mayHaveRunOut: "Puede que ya se haya agotado",
|
||||
runsOutNow: "se agota ahora",
|
||||
runsOutIn: "se agota en {{duration}}",
|
||||
runsOutAt: "agotamiento previsto {{time}}",
|
||||
justNow: "ahora mismo",
|
||||
daysAgo: "hace {{value}} d",
|
||||
hoursAgo: "hace {{value}} h",
|
||||
|
||||
@@ -2314,7 +2314,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...",
|
||||
@@ -2355,11 +2359,9 @@ export const fr: TranslationResources = {
|
||||
resetsIn: "se réinitialise dans {{duration}}",
|
||||
resetsAtWeekday: "{{weekday}} {{time}}",
|
||||
resetsAtDate: "{{date}}, {{time}}",
|
||||
projectedLeftAtReset: "~{{percentage}} restant à la réinitialisation",
|
||||
limitReached: "Limite atteinte",
|
||||
mayHaveRunOut: "Le quota est peut-être épuisé",
|
||||
runsOutNow: "s’épuise maintenant",
|
||||
runsOutIn: "s’épuise dans {{duration}}",
|
||||
runsOutAt: "épuisement prévu {{time}}",
|
||||
justNow: "à l’instant",
|
||||
daysAgo: "il y a {{value}} j",
|
||||
hoursAgo: "il y a {{value}} h",
|
||||
|
||||
@@ -2287,7 +2287,11 @@ export const ja: TranslationResources = {
|
||||
title: "プラン使用量",
|
||||
refresh: "更新",
|
||||
reorderCard: "{{source}} を並べ替え",
|
||||
showCard: "{{source}} を表示",
|
||||
sources: "ソース",
|
||||
sourcesCount: "{{shown}} / {{total}}",
|
||||
providerInactive: "プロバイダー無効",
|
||||
allSourcesHidden: "表示中の使用量ソースはありません",
|
||||
chooseSources: "ソースを選択",
|
||||
refreshAll: "すべて更新",
|
||||
refreshing: "更新中...",
|
||||
loading: "使用状況を読み込み中...",
|
||||
@@ -2328,11 +2332,9 @@ export const ja: TranslationResources = {
|
||||
resetsIn: "{{duration}}後にリセット",
|
||||
resetsAtWeekday: "{{weekday}} {{time}}",
|
||||
resetsAtDate: "{{date}} {{time}}",
|
||||
projectedLeftAtReset: "リセット時に約{{percentage}}残る見込み",
|
||||
limitReached: "上限に達しました",
|
||||
mayHaveRunOut: "上限に達した可能性があります",
|
||||
runsOutNow: "まもなく上限に到達",
|
||||
runsOutIn: "{{duration}}後に上限に到達",
|
||||
runsOutAt: "{{time}}に上限に到達",
|
||||
justNow: "たった今",
|
||||
daysAgo: "{{value}}日前",
|
||||
hoursAgo: "{{value}}時間前",
|
||||
|
||||
@@ -2275,7 +2275,11 @@ export const ko: TranslationResources = {
|
||||
title: "플랜 사용량",
|
||||
refresh: "새로 고침",
|
||||
reorderCard: "{{source}} 순서 변경",
|
||||
showCard: "{{source}} 표시",
|
||||
sources: "소스",
|
||||
sourcesCount: "{{shown}} / {{total}}",
|
||||
providerInactive: "제공업체 비활성",
|
||||
allSourcesHidden: "표시된 사용량 소스가 없습니다",
|
||||
chooseSources: "소스 선택",
|
||||
refreshAll: "모두 새로 고침",
|
||||
refreshing: "새로 고치는 중...",
|
||||
loading: "사용량 불러오는 중...",
|
||||
@@ -2316,11 +2320,9 @@ export const ko: TranslationResources = {
|
||||
resetsIn: "{{duration}} 후 재설정",
|
||||
resetsAtWeekday: "{{weekday}} {{time}}",
|
||||
resetsAtDate: "{{date}} {{time}}",
|
||||
projectedLeftAtReset: "초기화 시 약 {{percentage}} 남을 예정",
|
||||
limitReached: "한도에 도달함",
|
||||
mayHaveRunOut: "한도를 소진했을 수 있음",
|
||||
runsOutNow: "지금 한도에 도달",
|
||||
runsOutIn: "{{duration}} 후 한도에 도달",
|
||||
runsOutAt: "{{time}}에 한도에 도달",
|
||||
justNow: "방금",
|
||||
daysAgo: "{{value}}일 전",
|
||||
hoursAgo: "{{value}}시간 전",
|
||||
|
||||
@@ -2298,7 +2298,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...",
|
||||
@@ -2339,11 +2343,9 @@ export const ptBR: TranslationResources = {
|
||||
resetsIn: "redefine em {{duration}}",
|
||||
resetsAtWeekday: "{{weekday}} {{time}}",
|
||||
resetsAtDate: "{{date}}, {{time}}",
|
||||
projectedLeftAtReset: "~{{percentage}} restará na renovação",
|
||||
limitReached: "Limite atingido",
|
||||
mayHaveRunOut: "A cota pode ter se esgotado",
|
||||
runsOutNow: "esgota agora",
|
||||
runsOutIn: "esgota em {{duration}}",
|
||||
runsOutAt: "esgotamento previsto para {{time}}",
|
||||
justNow: "agora mesmo",
|
||||
daysAgo: "há {{value}} d",
|
||||
hoursAgo: "há {{value}} h",
|
||||
|
||||
@@ -2300,7 +2300,11 @@ export const ru: TranslationResources = {
|
||||
title: "Использование плана",
|
||||
refresh: "Обновить",
|
||||
reorderCard: "Переместить {{source}}",
|
||||
showCard: "Показывать {{source}}",
|
||||
sources: "Источники",
|
||||
sourcesCount: "{{shown}} из {{total}}",
|
||||
providerInactive: "Провайдер неактивен",
|
||||
allSourcesHidden: "Источники использования скрыты",
|
||||
chooseSources: "Выбрать источники",
|
||||
refreshAll: "Обновить всё",
|
||||
refreshing: "Обновление...",
|
||||
loading: "Загрузка данных об использовании...",
|
||||
@@ -2341,11 +2345,9 @@ export const ru: TranslationResources = {
|
||||
resetsIn: "сброс через {{duration}}",
|
||||
resetsAtWeekday: "{{weekday}} {{time}}",
|
||||
resetsAtDate: "{{date}}, {{time}}",
|
||||
projectedLeftAtReset: "К сбросу останется ~{{percentage}}",
|
||||
limitReached: "Лимит исчерпан",
|
||||
mayHaveRunOut: "Лимит мог уже исчерпаться",
|
||||
runsOutNow: "закончится сейчас",
|
||||
runsOutIn: "закончится через {{duration}}",
|
||||
runsOutAt: "закончится {{time}}",
|
||||
justNow: "только что",
|
||||
daysAgo: "{{value}} дн. назад",
|
||||
hoursAgo: "{{value}} ч назад",
|
||||
|
||||
@@ -2241,7 +2241,11 @@ export const zhCN: TranslationResources = {
|
||||
title: "套餐用量",
|
||||
refresh: "刷新",
|
||||
reorderCard: "重新排序 {{source}}",
|
||||
showCard: "显示 {{source}}",
|
||||
sources: "来源",
|
||||
sourcesCount: "{{shown}} / {{total}}",
|
||||
providerInactive: "提供商未启用",
|
||||
allSourcesHidden: "未显示任何用量来源",
|
||||
chooseSources: "选择来源",
|
||||
refreshAll: "全部刷新",
|
||||
refreshing: "刷新中...",
|
||||
loading: "正在加载用量...",
|
||||
@@ -2282,11 +2286,9 @@ export const zhCN: TranslationResources = {
|
||||
resetsIn: "将在 {{duration}}后重置",
|
||||
resetsAtWeekday: "{{weekday}} {{time}}",
|
||||
resetsAtDate: "{{date}} {{time}}",
|
||||
projectedLeftAtReset: "重置时约剩余 {{percentage}}",
|
||||
limitReached: "已达到上限",
|
||||
mayHaveRunOut: "额度可能已用完",
|
||||
runsOutNow: "即将用尽",
|
||||
runsOutIn: "将在 {{duration}}后用尽",
|
||||
runsOutAt: "将在 {{time}} 用尽",
|
||||
justNow: "刚刚",
|
||||
daysAgo: "{{value}}天前",
|
||||
hoursAgo: "{{value}}小时前",
|
||||
|
||||
@@ -117,12 +117,7 @@ export function ProviderDetail({
|
||||
action={installation.action}
|
||||
/>
|
||||
{sections.models ? (
|
||||
<ProviderModels
|
||||
serverId={serverId}
|
||||
entry={entry}
|
||||
discovered={sections.models === "all"}
|
||||
refresh={refresh}
|
||||
/>
|
||||
<ProviderModels serverId={serverId} entry={entry} discovered={sections.models === "all"} />
|
||||
) : null}
|
||||
<Troubleshooting
|
||||
serverId={serverId}
|
||||
|
||||
@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Text, View } from "react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import type { AgentModelDefinition, AgentProvider } from "@getpaseo/protocol/agent-types";
|
||||
import type { AgentModelDefinition } from "@getpaseo/protocol/agent-types";
|
||||
import type { ProviderProfileModel } from "@getpaseo/protocol/provider-config";
|
||||
import { compareMatchScores, scoreTextFields } from "@getpaseo/protocol/search/text-match";
|
||||
import {
|
||||
@@ -52,13 +52,11 @@ 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;
|
||||
refresh: (providers?: AgentProvider[]) => Promise<void>;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const provider = entry.provider;
|
||||
@@ -105,13 +103,11 @@ export function ProviderModels({
|
||||
additionalModels: additionalModels.filter((model) => model.id !== modelId),
|
||||
},
|
||||
},
|
||||
})
|
||||
.then(() => refresh([provider]))
|
||||
.finally(() => {
|
||||
setDeletingModelId((current) => (current === modelId ? null : current));
|
||||
});
|
||||
}).finally(() => {
|
||||
setDeletingModelId((current) => (current === modelId ? null : current));
|
||||
});
|
||||
},
|
||||
[additionalModels, patchConfig, provider, refresh],
|
||||
[additionalModels, patchConfig, provider],
|
||||
);
|
||||
|
||||
const customTrailing = useMemo(
|
||||
@@ -204,7 +200,6 @@ export function ProviderModels({
|
||||
additionalModels={additionalModels}
|
||||
visible={addSheetOpen}
|
||||
onClose={handleCloseAddSheet}
|
||||
refresh={refresh}
|
||||
/>
|
||||
</View>
|
||||
);
|
||||
@@ -286,14 +281,12 @@ function AddCustomModelSheet({
|
||||
additionalModels,
|
||||
visible,
|
||||
onClose,
|
||||
refresh,
|
||||
}: {
|
||||
serverId: string;
|
||||
provider: string;
|
||||
additionalModels: ProviderProfileModel[];
|
||||
visible: boolean;
|
||||
onClose: () => void;
|
||||
refresh: (providers?: AgentProvider[]) => Promise<void>;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const { patchConfig } = useDaemonConfig(serverId);
|
||||
@@ -322,13 +315,12 @@ function AddCustomModelSheet({
|
||||
},
|
||||
},
|
||||
})
|
||||
.then(() => refresh([provider]))
|
||||
.then(() => onClose())
|
||||
.catch((err: unknown) => {
|
||||
setError(err instanceof Error ? err.message : t("settings.providers.models.failedToSave"));
|
||||
})
|
||||
.finally(() => setSaving(false));
|
||||
}, [additionalModels, canAdd, onClose, patchConfig, provider, refresh, t, trimmed]);
|
||||
}, [additionalModels, canAdd, onClose, patchConfig, provider, t, trimmed]);
|
||||
|
||||
const header = useMemo<SheetHeader>(
|
||||
() => ({ title: t("settings.providers.models.addCustomTitle") }),
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
}));
|
||||
|
||||
/**
|
||||
|
||||
@@ -115,12 +115,12 @@ describe("resolveSidebarNavItems", () => {
|
||||
});
|
||||
|
||||
describe("resolveSidebarNavItems for the Usage item", () => {
|
||||
it("hides the Usage item until it is turned on", () => {
|
||||
it("shows the Usage item by default and honors an explicit off choice", () => {
|
||||
const resolve = (preferences: SidebarNavPreference[]) =>
|
||||
summarize(resolveSidebarNavItems({ section: "footer", pluginGroups: [], preferences }));
|
||||
|
||||
expect(resolve([])).toEqual([{ key: "usage", visible: false }]);
|
||||
expect(resolve([{ key: "usage", visible: true }])).toEqual([{ key: "usage", visible: true }]);
|
||||
expect(resolve([])).toEqual([{ key: "usage", visible: true }]);
|
||||
expect(resolve([{ key: "usage", visible: false }])).toEqual([{ key: "usage", visible: false }]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -297,7 +297,7 @@ describe("footer section", () => {
|
||||
});
|
||||
|
||||
expect(summarize(items)).toEqual([
|
||||
{ key: "usage", visible: false },
|
||||
{ key: "usage", visible: true },
|
||||
{ key: syncKey, visible: true },
|
||||
]);
|
||||
});
|
||||
@@ -309,7 +309,7 @@ describe("footer section", () => {
|
||||
preferences: [{ key: "history", visible: false }],
|
||||
});
|
||||
|
||||
expect(summarize(items)).toEqual([{ key: "usage", visible: false }]);
|
||||
expect(summarize(items)).toEqual([{ key: "usage", visible: true }]);
|
||||
});
|
||||
|
||||
it("ignores the footer icon buttons, which are fixed and not items", () => {
|
||||
|
||||
@@ -69,11 +69,8 @@ export function builtinSidebarNavShortcutAction(id: BuiltinSidebarItemId): strin
|
||||
return BUILTIN_SHORTCUT_ACTIONS[id];
|
||||
}
|
||||
|
||||
/** Builtins that start hidden until the user turns them on: the Usage summary is opt-in. */
|
||||
const HIDDEN_BY_DEFAULT: ReadonlySet<BuiltinSidebarItemId> = new Set(["usage"]);
|
||||
|
||||
function builtinVisibleByDefault(id: BuiltinSidebarItemId): boolean {
|
||||
return !HIDDEN_BY_DEFAULT.has(id);
|
||||
function builtinVisibleByDefault(_id: BuiltinSidebarItemId): boolean {
|
||||
return true;
|
||||
}
|
||||
|
||||
export function pluginSidebarNavKey(
|
||||
|
||||
@@ -5,8 +5,10 @@ import { i18n } from "@/i18n/i18next";
|
||||
import { UsageWindowBar } from "./window-bar";
|
||||
import type { UsageBalance, UsageWindow } from "./types";
|
||||
import { UsageBalanceBar } from "./balance-bar";
|
||||
import { UsageMeter } from "./meter";
|
||||
|
||||
const window: UsageWindow = { id: "session", label: "Session", usedPct: 70 };
|
||||
const exhaustedWindow: UsageWindow = { ...window, usedPct: 100 };
|
||||
const balance: UsageBalance = { id: "credits", label: "Credits", unit: "usd", remaining: 12 };
|
||||
const ignorePin = () => {};
|
||||
|
||||
@@ -53,16 +55,97 @@ it("translates mounted usage rows when the language changes", async () => {
|
||||
expect(container.textContent).toContain("クレジット");
|
||||
});
|
||||
|
||||
it("colors healthy quota bars green and keeps the warning and danger colors", () => {
|
||||
act(() =>
|
||||
root.render(
|
||||
<>
|
||||
<UsageMeter percent={20} tone="default" />
|
||||
<UsageMeter percent={20} tone="ok" />
|
||||
<UsageMeter percent={20} tone="warning" />
|
||||
<UsageMeter percent={20} tone="danger" />
|
||||
<UsageMeter percent={20} tone="danger" quiet />
|
||||
</>,
|
||||
),
|
||||
);
|
||||
const colors = Array.from(
|
||||
container.children,
|
||||
(track) => getComputedStyle(track.firstElementChild!).backgroundColor,
|
||||
);
|
||||
expect(colors).toEqual([
|
||||
"rgb(21, 128, 61)",
|
||||
"rgb(21, 128, 61)",
|
||||
"rgb(217, 119, 6)",
|
||||
"rgb(185, 28, 28)",
|
||||
"rgb(212, 212, 216)",
|
||||
]);
|
||||
});
|
||||
|
||||
it("keeps an exhausted quota red when a failed refresh removes its forecast", () => {
|
||||
act(() =>
|
||||
root.render(
|
||||
<UsageWindowBar
|
||||
window={exhaustedWindow}
|
||||
forecastAt={null}
|
||||
retained
|
||||
displayAs="used"
|
||||
pinnable={false}
|
||||
pinned={false}
|
||||
onTogglePin={ignorePin}
|
||||
pinLabel=""
|
||||
pinTestID=""
|
||||
/>,
|
||||
),
|
||||
);
|
||||
expect(container.textContent).toBe("Session100% used");
|
||||
const fill = container.firstElementChild!.children[1].firstElementChild!;
|
||||
expect(getComputedStyle(fill).backgroundColor).toBe("rgb(185, 28, 28)");
|
||||
});
|
||||
|
||||
const narrowReadingMs = Date.now();
|
||||
const narrowForecastAt = new Date(narrowReadingMs).toISOString();
|
||||
const narrowWindow: UsageWindow = {
|
||||
id: "weekly",
|
||||
label: "Weekly",
|
||||
usedPct: 0.2,
|
||||
usedPct: 6,
|
||||
durationSeconds: 604_800,
|
||||
resetsAt: new Date(narrowReadingMs + 165.5 * 3_600_000).toISOString(),
|
||||
};
|
||||
|
||||
const onTrackWindow: UsageWindow = {
|
||||
id: "session",
|
||||
label: "Session",
|
||||
usedPct: 40,
|
||||
durationSeconds: 18_000,
|
||||
resetsAt: new Date(narrowReadingMs + 3_600_000).toISOString(),
|
||||
};
|
||||
const tightWindow: UsageWindow = { ...onTrackWindow, usedPct: 77 };
|
||||
|
||||
it.each([
|
||||
["green", onTrackWindow, "rgb(21, 128, 61)"],
|
||||
["amber", tightWindow, "rgb(217, 119, 6)"],
|
||||
] as const)("shows only the reset details for an on-track %s bar", (_, usageWindow, color) => {
|
||||
act(() =>
|
||||
root.render(
|
||||
<UsageWindowBar
|
||||
window={usageWindow}
|
||||
forecastAt={narrowForecastAt}
|
||||
displayAs="used"
|
||||
pinnable={false}
|
||||
pinned={false}
|
||||
onTogglePin={ignorePin}
|
||||
pinLabel=""
|
||||
pinTestID=""
|
||||
/>,
|
||||
),
|
||||
);
|
||||
|
||||
const row = container.firstElementChild!;
|
||||
const [label, track, datapoints] = row.children;
|
||||
expect(label.textContent).toBe(`Session${usageWindow.usedPct}% used`);
|
||||
expect(datapoints.textContent).toMatch(/^resets in [^·]+\s· [^·]+$/);
|
||||
expect(getComputedStyle(track.firstElementChild!).backgroundColor).toBe(color);
|
||||
});
|
||||
|
||||
it("shows the forecast as one more datapoint after the reset countdown, in the same line", async () => {
|
||||
act(() =>
|
||||
root.render(
|
||||
@@ -82,7 +165,7 @@ it("shows the forecast as one more datapoint after the reset countdown, in the s
|
||||
const line = Array.from(container.querySelectorAll("*")).find((node) =>
|
||||
node.textContent.startsWith("resets in"),
|
||||
);
|
||||
expect(line?.textContent).toMatch(/^resets in .+\s· .+\s· ~\d+% left at reset$/);
|
||||
expect(line?.textContent).toMatch(/^resets in [^·]+\s· [^·]+\s· runs out .+$/);
|
||||
});
|
||||
|
||||
it("wraps the forecast below the countdown in a narrow French card instead of overlapping it", async () => {
|
||||
@@ -114,6 +197,6 @@ it("wraps the forecast below the countdown in a narrow French card instead of ov
|
||||
}
|
||||
|
||||
const countdown = textBounds("se réinitialise");
|
||||
const forecast = textBounds("~");
|
||||
const forecast = textBounds("épuisement prévu");
|
||||
expect(forecast.left >= countdown.right || forecast.top >= countdown.bottom).toBe(true);
|
||||
});
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { GripVertical, RotateCw } from "lucide-react-native";
|
||||
import { useCallback, useMemo } from "react";
|
||||
import { useMemo } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Text, View, type StyleProp, type TextStyle } from "react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
@@ -9,14 +9,13 @@ import {
|
||||
smallIconButtonChromeFrameSize,
|
||||
} from "@/components/ui/icon-button-chrome";
|
||||
import { DraggableListHandle } from "@/components/draggable-list";
|
||||
import { ControlSizeProvider } from "@/components/ui/control-size";
|
||||
import { LoadingSpinner } from "@/components/ui/loading-spinner";
|
||||
import { ToolbarButton, paneContentToolbarIconSize } from "@/components/ui/pane-content-toolbar";
|
||||
import { StatusBadge } from "@/components/ui/status-badge";
|
||||
import { Switch } from "@/components/ui/switch";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { isNative } from "@/constants/platform";
|
||||
import type { TFunction } from "i18next";
|
||||
import { useCallback } from "react";
|
||||
import { UsageBalanceBar } from "./balance-bar";
|
||||
import type { UsageDisplay } from "./display";
|
||||
import { formatAgo, formatProviderUsageLabel, formatUsageAccountName } from "./format";
|
||||
@@ -37,10 +36,8 @@ function statusText(report: UsageReport, t: TFunction): string | null {
|
||||
const ThemedRotateCw = withUnistyles(RotateCw);
|
||||
const ThemedGripVertical = withUnistyles(GripVertical);
|
||||
|
||||
/** A card in the user's arrangement: dragged by its handle, turned off from its switch. */
|
||||
/** A card in the user's arrangement: dragged by its handle. */
|
||||
export interface UsageCardArrangement {
|
||||
on: boolean;
|
||||
onSetOn: (on: boolean) => void;
|
||||
/** The handle is always there; it shows while the card is hovered or where there is no hover. */
|
||||
handleVisible: boolean;
|
||||
}
|
||||
@@ -64,7 +61,7 @@ export function UsageCard({
|
||||
pinnable: boolean;
|
||||
/** Whether the header has a Refresh button. Without one the freshness shows on the card. */
|
||||
refreshable: boolean;
|
||||
/** Present where the user arranges cards. An off card collapses to its header. */
|
||||
/** Present where the user arranges cards. */
|
||||
arrangement?: UsageCardArrangement;
|
||||
compact?: boolean;
|
||||
}) {
|
||||
@@ -75,7 +72,6 @@ export function UsageCard({
|
||||
const showsFreshnessInline = isNative || isCompact || !refreshable;
|
||||
const usage = entry.report;
|
||||
const status = statusText(usage, t);
|
||||
const collapsed = arrangement?.on === false;
|
||||
const report = resolveUsageReport(entry, t);
|
||||
const { planLabel, successfulAt, retained } = report;
|
||||
|
||||
@@ -105,23 +101,15 @@ export function UsageCard({
|
||||
<Text style={styles.name} numberOfLines={1}>
|
||||
{entry.sourceLabel}
|
||||
</Text>
|
||||
{collapsed && entry.account.label ? (
|
||||
// The body that names the account is gone, and two off cards of one source must differ.
|
||||
<Text style={styles.collapsedAccount} numberOfLines={1}>
|
||||
{entry.account.label}
|
||||
</Text>
|
||||
) : null}
|
||||
{planLabel && !collapsed ? (
|
||||
<StatusBadge label={planLabel} variant="muted" size="xs" />
|
||||
) : null}
|
||||
{planLabel ? <StatusBadge label={planLabel} variant="muted" size="xs" /> : null}
|
||||
<View style={styles.headerSpacer} />
|
||||
{status && !collapsed ? (
|
||||
{status ? (
|
||||
<View style={styles.statusRow}>
|
||||
<View style={dotStyle} />
|
||||
<Text style={styles.statusLabel}>{status}</Text>
|
||||
</View>
|
||||
) : null}
|
||||
{refreshable && !collapsed ? (
|
||||
{refreshable ? (
|
||||
<UsageRefreshButton
|
||||
sourceLabel={entry.sourceLabel}
|
||||
successfulAt={successfulAt}
|
||||
@@ -131,31 +119,16 @@ export function UsageCard({
|
||||
compact={isCompact}
|
||||
/>
|
||||
) : null}
|
||||
{arrangement ? (
|
||||
<ControlSizeProvider size="sm">
|
||||
<Switch
|
||||
value={arrangement.on}
|
||||
onValueChange={arrangement.onSetOn}
|
||||
accessibilityLabel={t("providerUsage.showCard", {
|
||||
source: formatUsageAccountName(entry),
|
||||
})}
|
||||
style={styles.cardSwitch}
|
||||
testID={`usage-card-switch-${entry.id}`}
|
||||
/>
|
||||
</ControlSizeProvider>
|
||||
) : null}
|
||||
</View>
|
||||
|
||||
{collapsed ? null : (
|
||||
<UsageCardBody
|
||||
entry={entry}
|
||||
display={display}
|
||||
pinnable={pinnable}
|
||||
report={report}
|
||||
showsFreshnessInline={showsFreshnessInline}
|
||||
refreshState={refreshState}
|
||||
/>
|
||||
)}
|
||||
<UsageCardBody
|
||||
entry={entry}
|
||||
display={display}
|
||||
pinnable={pinnable}
|
||||
report={report}
|
||||
showsFreshnessInline={showsFreshnessInline}
|
||||
refreshState={refreshState}
|
||||
/>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
@@ -434,11 +407,6 @@ const styles = StyleSheet.create((theme) => ({
|
||||
color: theme.colors.foreground,
|
||||
fontSize: theme.fontSize.base,
|
||||
},
|
||||
collapsedAccount: {
|
||||
flexShrink: 1,
|
||||
color: theme.colors.foregroundMuted,
|
||||
fontSize: theme.fontSize.sm,
|
||||
},
|
||||
headerSpacer: {
|
||||
flex: 1,
|
||||
},
|
||||
@@ -510,10 +478,6 @@ const styles = StyleSheet.create((theme) => ({
|
||||
},
|
||||
dragHandle: dragHandleSlot(theme.spacing),
|
||||
dragHandleHidden: { ...dragHandleSlot(theme.spacing), opacity: 0 },
|
||||
// The switch's reserved control height overhangs the header like the Refresh button's hitbox.
|
||||
cardSwitch: {
|
||||
marginVertical: -theme.spacing[2],
|
||||
},
|
||||
refreshButton: iconHitboxOverhang(false),
|
||||
refreshButtonCompact: iconHitboxOverhang(true),
|
||||
}));
|
||||
|
||||
@@ -3,6 +3,7 @@ import {
|
||||
arrangeUsageCards,
|
||||
arrangeUsageReports,
|
||||
DEFAULT_USAGE_PREFERENCES,
|
||||
isUsageCardOn,
|
||||
setUsageCardOn,
|
||||
UsagePreferencesSchema,
|
||||
usageReportsOn,
|
||||
@@ -11,13 +12,19 @@ import {
|
||||
import { resolvePinnedUsage } from "./pinned";
|
||||
import type { UsageReportEntry } from "./types";
|
||||
|
||||
function report(sourceId: string, sourceLabel: string, account?: string): UsageReportEntry {
|
||||
function report(
|
||||
sourceId: string,
|
||||
sourceLabel: string,
|
||||
account?: string,
|
||||
defaultEnabled?: boolean,
|
||||
): UsageReportEntry {
|
||||
return {
|
||||
id: `${sourceId}:${account ?? "default"}`,
|
||||
sourceId,
|
||||
sourceLabel,
|
||||
account: account ? { label: account } : {},
|
||||
fetchedAt: "2026-01-01T00:00:00.000Z",
|
||||
...(defaultEnabled === undefined ? {} : { defaultEnabled }),
|
||||
report: {
|
||||
status: "available",
|
||||
windows: [{ id: "weekly", label: "Weekly", summary: true, usedPct: 40 }],
|
||||
@@ -114,8 +121,31 @@ describe("usage card order", () => {
|
||||
describe("usage cards turned off", () => {
|
||||
it("turns a card off and back on", () => {
|
||||
const off = setUsageCardOn(DEFAULT_USAGE_PREFERENCES, "codex:default", false);
|
||||
expect(off.cardsOff).toEqual(["codex:default"]);
|
||||
expect(setUsageCardOn(off, "codex:default", true).cardsOff).toEqual([]);
|
||||
expect(off.cardVisibility).toEqual({ "codex:default": false });
|
||||
expect(isUsageCardOn(off, codex)).toBe(false);
|
||||
const on = setUsageCardOn(off, "codex:default", true);
|
||||
expect(on.cardVisibility).toEqual({ "codex:default": true });
|
||||
expect(isUsageCardOn(on, codex)).toBe(true);
|
||||
});
|
||||
|
||||
it("hides sources hinted off by default until the user explicitly turns them on", () => {
|
||||
const uninstalledCopilot = report("copilot", "GitHub Copilot", undefined, false);
|
||||
expect(isUsageCardOn(DEFAULT_USAGE_PREFERENCES, uninstalledCopilot)).toBe(false);
|
||||
expect(ids(usageReportsOn([codex, uninstalledCopilot], DEFAULT_USAGE_PREFERENCES))).toEqual([
|
||||
"codex:default",
|
||||
]);
|
||||
expect(
|
||||
resolvePinnedUsage([codex, uninstalledCopilot], DEFAULT_USAGE_PREFERENCES).map(
|
||||
(source) => source.key,
|
||||
),
|
||||
).toEqual(["codex:default"]);
|
||||
|
||||
const optedIn = setUsageCardOn(DEFAULT_USAGE_PREFERENCES, uninstalledCopilot.id, true);
|
||||
expect(isUsageCardOn(optedIn, uninstalledCopilot)).toBe(true);
|
||||
expect(ids(usageReportsOn([codex, uninstalledCopilot], optedIn))).toEqual([
|
||||
"codex:default",
|
||||
"copilot:default",
|
||||
]);
|
||||
});
|
||||
|
||||
it("leaves off cards out of the sidebar summary", () => {
|
||||
@@ -143,11 +173,24 @@ describe("stored card preferences", () => {
|
||||
);
|
||||
});
|
||||
|
||||
it("migrates legacy cardsOff into cardVisibility", () => {
|
||||
expect(
|
||||
UsagePreferencesSchema.parse({
|
||||
displayAs: "used",
|
||||
serverId: null,
|
||||
cardsOff: ["codex:default"],
|
||||
}),
|
||||
).toEqual({
|
||||
...DEFAULT_USAGE_PREFERENCES,
|
||||
cardVisibility: { "codex:default": false },
|
||||
});
|
||||
});
|
||||
|
||||
it("survives a save and reload, and ignores a malformed arrangement", () => {
|
||||
const saved = setUsageCardOn(arranged(["codex:default"]), "claude:work", false);
|
||||
expect(UsagePreferencesSchema.parse(JSON.parse(JSON.stringify(saved)))).toEqual(saved);
|
||||
expect(
|
||||
UsagePreferencesSchema.parse({ displayAs: "used", cardOrder: "bad", cardsOff: [1] }),
|
||||
UsagePreferencesSchema.parse({ displayAs: "used", cardOrder: "bad", cardVisibility: [1] }),
|
||||
).toEqual(DEFAULT_USAGE_PREFERENCES);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { View } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { useMemo, type ReactElement } from "react";
|
||||
import { useCallback, useMemo, useState, type ReactElement } from "react";
|
||||
import { UsageRefreshButton } from "./refresh-button";
|
||||
import { UsageOptions } from "./options";
|
||||
import { useUsageDisplay, type UsageDisplay } from "./display";
|
||||
import { hasHostChoice, type UsageHostSelection } from "./hosts";
|
||||
import { useHostUsage } from "./queries";
|
||||
import type { UsageView } from "./types";
|
||||
@@ -15,13 +16,19 @@ import type { UsageView } from "./types";
|
||||
export function UsageControls({
|
||||
view,
|
||||
serverId,
|
||||
display,
|
||||
onRefresh,
|
||||
hostSelection,
|
||||
optionsOpen,
|
||||
onOptionsOpenChange,
|
||||
}: {
|
||||
view: UsageView;
|
||||
serverId: string;
|
||||
display?: UsageDisplay;
|
||||
onRefresh: () => void;
|
||||
hostSelection?: UsageHostSelection;
|
||||
optionsOpen?: boolean;
|
||||
onOptionsOpenChange?: (open: boolean) => void;
|
||||
}) {
|
||||
const busy = view.kind === "loading" || (view.kind === "ready" && view.isRefreshing);
|
||||
if (!hasUsageControls(view, hostSelection)) return null;
|
||||
@@ -30,7 +37,14 @@ export function UsageControls({
|
||||
{view.kind === "off" || view.kind === "unavailable" ? null : (
|
||||
<UsageRefreshButton busy={busy} onRefresh={onRefresh} />
|
||||
)}
|
||||
<UsageOptions serverId={serverId} hostSelection={hostSelection} />
|
||||
<UsageOptions
|
||||
serverId={serverId}
|
||||
hostSelection={hostSelection}
|
||||
reports={view.kind === "ready" ? view.reports : []}
|
||||
display={display}
|
||||
open={optionsOpen}
|
||||
onOpenChange={onOptionsOpenChange}
|
||||
/>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
@@ -54,10 +68,15 @@ const styles = StyleSheet.create((theme) => ({
|
||||
*/
|
||||
export function useHostUsageWithControls(hostSelection: UsageHostSelection): {
|
||||
view: UsageView;
|
||||
display: UsageDisplay;
|
||||
refresh: () => void;
|
||||
controls: ReactElement | null;
|
||||
openOptions: () => void;
|
||||
} {
|
||||
const { view, refresh } = useHostUsage(hostSelection.serverId);
|
||||
const { display } = useUsageDisplay(view.kind === "ready" ? view.reports : []);
|
||||
const [optionsOpen, setOptionsOpen] = useState(false);
|
||||
const openOptions = useCallback(() => setOptionsOpen(true), []);
|
||||
const controls = useMemo(
|
||||
() =>
|
||||
hasUsageControls(view, hostSelection) ? (
|
||||
@@ -67,11 +86,14 @@ export function useHostUsageWithControls(hostSelection: UsageHostSelection): {
|
||||
key={hostSelection.serverId}
|
||||
serverId={hostSelection.serverId}
|
||||
view={view}
|
||||
display={display}
|
||||
onRefresh={refresh}
|
||||
hostSelection={hostSelection}
|
||||
optionsOpen={optionsOpen}
|
||||
onOptionsOpenChange={setOptionsOpen}
|
||||
/>
|
||||
) : null,
|
||||
[hostSelection, refresh, view],
|
||||
[display, hostSelection, optionsOpen, refresh, view],
|
||||
);
|
||||
return { view, refresh, controls };
|
||||
return { view, display, refresh, controls, openOptions };
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import { useAppSettings } from "@/hooks/use-settings";
|
||||
import {
|
||||
arrangeUsageCards,
|
||||
arrangeUsageReports,
|
||||
isUsageCardOff,
|
||||
isUsageCardOn,
|
||||
isUsagePinned,
|
||||
setUsageCardOn,
|
||||
setUsageDisplayAs,
|
||||
@@ -25,7 +25,7 @@ export interface UsageDisplay {
|
||||
arrange: (reports: readonly UsageReportEntry[]) => UsageReportEntry[];
|
||||
/** Saves the order of the shown cards after the user drops one. */
|
||||
arrangeCards: (drop: UsageCardDrop) => void;
|
||||
isCardOn: (reportId: string) => boolean;
|
||||
isCardOn: (entry: Pick<UsageReportEntry, "id" | "defaultEnabled">) => boolean;
|
||||
setCardOn: (reportId: string, on: boolean) => void;
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ export function useUsageDisplay(reports: readonly UsageReportEntry[]): UsagePref
|
||||
togglePin,
|
||||
arrange: (shown) => arrangeUsageReports(shown, preferences),
|
||||
arrangeCards,
|
||||
isCardOn: (reportId) => !isUsageCardOff(preferences, reportId),
|
||||
isCardOn: (entry) => isUsageCardOn(preferences, entry),
|
||||
setCardOn,
|
||||
}),
|
||||
[arrangeCards, preferences, reports, setCardOn, setDisplayAs, togglePin],
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { i18n } from "@/i18n/i18next";
|
||||
import {
|
||||
formatDisplayPct,
|
||||
@@ -38,11 +38,9 @@ describe("formatAmount", () => {
|
||||
|
||||
expect(formatPct(7, "en")).toBe("7%");
|
||||
expect(formatResetLabel(twoHoursFromNow, false, NOW)).toBe("resets in 2h");
|
||||
expect(formatRunsOutLabel(twoHoursFromNow, NOW)).toBe("runs out in 2h");
|
||||
|
||||
await i18n.changeLanguage("ja");
|
||||
expect(formatResetLabel(twoHoursFromNow, false, NOW)).toBe("2時間後にリセット");
|
||||
expect(formatRunsOutLabel(twoHoursFromNow, NOW)).toBe("2時間後に上限に到達");
|
||||
expect(formatAgo(threeDaysAgo, NOW)).toBe("3日前");
|
||||
});
|
||||
|
||||
@@ -57,18 +55,15 @@ describe("formatAmount", () => {
|
||||
const daysAgo = new Date(NOW - days * 24 * 60 * 60 * 1000).toISOString();
|
||||
|
||||
expect(formatResetLabel(daysFromNow, false, NOW)).toBe("se réinitialise dans 1\u202f234 j");
|
||||
expect(formatRunsOutLabel(daysFromNow, NOW)).toBe("s’épuise dans 1\u202f234 j");
|
||||
expect(formatAgo(daysAgo, NOW)).toBe("il y a 1\u202f234 j");
|
||||
});
|
||||
|
||||
it("selects Arabic plural forms for relative durations", async () => {
|
||||
await i18n.changeLanguage("ar");
|
||||
const twoHoursFromNow = new Date(NOW + 2 * 60 * 60 * 1000).toISOString();
|
||||
const threeHoursFromNow = new Date(NOW + 3 * 60 * 60 * 1000).toISOString();
|
||||
const twoDaysAgo = new Date(NOW - 2 * 24 * 60 * 60 * 1000).toISOString();
|
||||
|
||||
expect(formatResetLabel(twoHoursFromNow, false, NOW)).toBe("تتم إعادة التعيين خلال ساعتين");
|
||||
expect(formatRunsOutLabel(threeHoursFromNow, NOW)).toBe("ينفد خلال 3 ساعات");
|
||||
expect(formatAgo(twoDaysAgo, NOW)).toBe("قبل يومين");
|
||||
});
|
||||
|
||||
@@ -111,20 +106,21 @@ describe("reset countdown", () => {
|
||||
});
|
||||
|
||||
it("says two units, dropping a unit that is zero", () => {
|
||||
expect(countdown(DAY + 30 * MINUTE)).toBe("resets in 1d");
|
||||
expect(countdown(4 * HOUR + 59 * MINUTE)).toBe("resets in 4h 59m");
|
||||
expect(countdown(HOUR)).toBe("resets in 1h");
|
||||
expect(countdown(37 * MINUTE)).toBe("resets in 37m");
|
||||
expect(countdown(59 * 1000)).toBe("resets in 0m");
|
||||
});
|
||||
|
||||
it("joins the at-risk countdown the same way", () => {
|
||||
const iso = new Date(NOW + 3 * HOUR + 5 * MINUTE).toISOString();
|
||||
expect(formatRunsOutLabel(iso, NOW)).toBe("runs out in 3h 5m");
|
||||
it("shows a single day as 24 hours in the reset countdown", () => {
|
||||
expect(countdown(DAY)).toBe("resets in 24h");
|
||||
expect(countdown(DAY + 30 * MINUTE)).toBe("resets in 24h");
|
||||
expect(countdown(DAY + HOUR)).toBe("resets in 1d 1h");
|
||||
expect(countdown(2 * DAY)).toBe("resets in 2d");
|
||||
});
|
||||
});
|
||||
|
||||
describe("exact reset time", () => {
|
||||
describe("exact quota times", () => {
|
||||
// Local-time dates, so the thresholds hold in any timezone the tests run in.
|
||||
const now = new Date(2026, 9, 29, 12, 0).getTime();
|
||||
const at = (...args: [number, number, number, number, number]) =>
|
||||
@@ -134,18 +130,51 @@ describe("exact reset time", () => {
|
||||
await i18n.changeLanguage("en");
|
||||
});
|
||||
|
||||
it("shows only the time within 24 hours", () => {
|
||||
it("shows only the time for the same local day", () => {
|
||||
expect(at(2026, 9, 29, 15, 0)).toMatch(/^(3:00 PM|15:00)$/);
|
||||
expect(at(2026, 9, 30, 11, 59)).toMatch(/^(11:59 AM|11:59)$/);
|
||||
});
|
||||
|
||||
it("adds the weekday within 7 days", () => {
|
||||
expect(at(2026, 9, 30, 12, 0)).toMatch(/^Fri (12:00 PM|12:00)$/);
|
||||
expect(at(2026, 10, 5, 11, 59)).toMatch(/^Thu (11:59 AM|11:59)$/);
|
||||
it("shows the weekday for tomorrow even when it is less than 24 hours away", () => {
|
||||
expect(at(2026, 9, 30, 11, 59)).toMatch(/^Fri (11:59 AM|11:59)$/);
|
||||
expect(at(2026, 10, 4, 15, 0)).toMatch(/^Wed (3:00 PM|15:00)$/);
|
||||
});
|
||||
|
||||
it("adds the date after 7 days", () => {
|
||||
expect(at(2026, 10, 5, 12, 0)).toMatch(/^Nov 5, (12:00 PM|12:00)$/);
|
||||
it("includes the date on the same weekday next week even when fewer than 7 days elapse", () => {
|
||||
expect(at(2026, 10, 5, 10, 0)).toMatch(/^Thu, Nov 5, (10:00 AM|10:00)$/);
|
||||
});
|
||||
|
||||
it("includes the weekday and date seven or more calendar days out", () => {
|
||||
expect(at(2026, 10, 5, 12, 0)).toMatch(/^Thu, Nov 5, (12:00 PM|12:00)$/);
|
||||
expect(at(2026, 10, 6, 15, 0)).toMatch(/^Fri, Nov 6, (3:00 PM|15:00)$/);
|
||||
});
|
||||
|
||||
it("counts calendar days across the spring daylight-saving transition", () => {
|
||||
vi.stubEnv("TZ", "America/New_York");
|
||||
try {
|
||||
const before = new Date(2026, 2, 7, 12);
|
||||
const after = new Date(2026, 2, 14, 12);
|
||||
expect(after.getTime() - before.getTime()).toBe(167 * 3_600_000);
|
||||
expect(formatResetTime(after.toISOString(), before.getTime())).toMatch(/^Sat, Mar 14, /);
|
||||
} finally {
|
||||
vi.unstubAllEnvs();
|
||||
}
|
||||
});
|
||||
|
||||
it("shows the exhaustion clock time with the same weekday and date rules as reset time", () => {
|
||||
const runsOut = (...args: [number, number, number, number, number]) =>
|
||||
formatRunsOutLabel(new Date(...args).toISOString(), now)?.replace(/\s/g, " ");
|
||||
|
||||
expect(runsOut(2026, 9, 29, 15, 0)).toMatch(/^runs out (3:00 PM|15:00)$/);
|
||||
expect(runsOut(2026, 9, 30, 9, 32)).toMatch(/^runs out Fri (9:32 AM|09:32|9:32)$/);
|
||||
expect(runsOut(2026, 10, 5, 15, 30)).toMatch(/^runs out Thu, Nov 5, (3:30 PM|15:30)$/);
|
||||
});
|
||||
|
||||
it("uses the app language for the exhaustion label and weekday", async () => {
|
||||
await i18n.changeLanguage("ja");
|
||||
const time = new Date(2026, 9, 30, 15, 30).toISOString();
|
||||
expect(formatRunsOutLabel(time, now)?.replace(/\s/g, " ")).toMatch(
|
||||
/^金 (?:3:30 PM|15:30)に上限に到達$/,
|
||||
);
|
||||
});
|
||||
|
||||
it("names the weekday in the app language", async () => {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import type { TFunction } from "i18next";
|
||||
import { i18n } from "@/i18n/i18next";
|
||||
import { formatTimeOfDay } from "@/utils/time";
|
||||
import { formatTimeOfDay, localCalendarDaysBetween } from "@/utils/time";
|
||||
import type { UsageDisplayAs } from "./preferences";
|
||||
import type { UsageBalanceUnit, UsageReportEntry } from "./types";
|
||||
|
||||
@@ -79,6 +79,7 @@ function relativeDuration(iso: string, now: number): RelativeDuration | null {
|
||||
const days = Math.floor(diffMs / DAY_MS);
|
||||
const hours = Math.floor((diffMs % DAY_MS) / HOUR_MS);
|
||||
const minutes = Math.floor((diffMs % HOUR_MS) / MINUTE_MS);
|
||||
if (days === 1 && hours === 0) return remaining({ unit: "hours", count: 24 });
|
||||
if (days > 0) return remaining({ unit: "days", count: days }, { unit: "hours", count: hours });
|
||||
if (hours > 0)
|
||||
return remaining({ unit: "hours", count: hours }, { unit: "minutes", count: minutes });
|
||||
@@ -120,8 +121,8 @@ export function formatResetLabel(
|
||||
}
|
||||
|
||||
/**
|
||||
* When a window resets on the clock: "3:00 PM" within a day, "Fri 3:00 PM" within a week,
|
||||
* "Oct 31, 3:00 PM" after that. Names follow the app language; 12/24h follows the device.
|
||||
* A clock time today, a weekday for the next six calendar days, and a weekday plus date after that.
|
||||
* Names follow the app language. The clock uses the device's 12/24h preference.
|
||||
* Nothing for a time that has passed, where the countdown already says so.
|
||||
*/
|
||||
export function formatResetTime(
|
||||
@@ -135,12 +136,13 @@ export function formatResetTime(
|
||||
if (!Number.isFinite(diffMs) || diffMs <= 0) return null;
|
||||
const time = formatTimeOfDay(at);
|
||||
const locale = i18n.resolvedLanguage;
|
||||
if (diffMs < DAY_MS) return time;
|
||||
if (diffMs < 7 * DAY_MS) {
|
||||
const dayDiff = localCalendarDaysBetween(new Date(now), at);
|
||||
if (dayDiff === 0) return time;
|
||||
if (dayDiff <= 6) {
|
||||
const weekday = at.toLocaleDateString(locale, { weekday: "short" });
|
||||
return t("providerUsage.timing.resetsAtWeekday", { weekday, time });
|
||||
}
|
||||
const date = at.toLocaleDateString(locale, { month: "short", day: "numeric" });
|
||||
const date = at.toLocaleDateString(locale, { weekday: "short", month: "short", day: "numeric" });
|
||||
return t("providerUsage.timing.resetsAtDate", { date, time });
|
||||
}
|
||||
|
||||
@@ -149,11 +151,8 @@ export function formatRunsOutLabel(
|
||||
now = Date.now(),
|
||||
t: TFunction = i18n.t,
|
||||
): string | null {
|
||||
if (!iso) return null;
|
||||
const rel = relativeDuration(iso, now);
|
||||
if (!rel) return null;
|
||||
if (rel.kind === "now") return t("providerUsage.timing.runsOutNow");
|
||||
return t("providerUsage.timing.runsOutIn", { duration: formatRelativeDuration(rel, t) });
|
||||
const time = formatResetTime(iso, now, t);
|
||||
return time ? t("providerUsage.timing.runsOutAt", { time }) : null;
|
||||
}
|
||||
|
||||
export function formatAgo(
|
||||
|
||||
@@ -16,8 +16,8 @@ function reportKey(entry: UsageReportEntry): string {
|
||||
}
|
||||
|
||||
/**
|
||||
* One card per report (source + account), in the user's order. Each card drags by its handle and
|
||||
* turns off from its switch. Window rows pin while the sidebar summary is on.
|
||||
* One card per shown report (source + account), in the user's order. Each card drags by its handle.
|
||||
* Window rows pin while the sidebar summary is on.
|
||||
*/
|
||||
export function UsageList({
|
||||
serverId,
|
||||
@@ -29,8 +29,7 @@ export function UsageList({
|
||||
display: UsageDisplay;
|
||||
}) {
|
||||
const { inSidebar } = useUsageInSidebar();
|
||||
const { arrange, arrangeCards } = display;
|
||||
const arranged = useMemo(() => arrange(reports), [arrange, reports]);
|
||||
const { arrangeCards } = display;
|
||||
const handleDragEnd = useCallback(
|
||||
(next: UsageReportEntry[], moved: string) =>
|
||||
arrangeCards({ moved, after: next.map(reportKey) }),
|
||||
@@ -52,7 +51,7 @@ export function UsageList({
|
||||
);
|
||||
return (
|
||||
<DraggableList
|
||||
data={arranged}
|
||||
data={reports}
|
||||
keyExtractor={reportKey}
|
||||
renderItem={renderItem}
|
||||
onDragEnd={handleDragEnd}
|
||||
@@ -90,19 +89,11 @@ function UsageListCard({
|
||||
const [hasFocus, setHasFocus] = useState(false);
|
||||
const handleFocus = useCallback(() => setHasFocus(true), []);
|
||||
const handleBlur = useCallback(() => setHasFocus(false), []);
|
||||
const { isCardOn, setCardOn } = display;
|
||||
const on = isCardOn(entry.id);
|
||||
const handleSetOn = useCallback(
|
||||
(next: boolean) => setCardOn(entry.id, next),
|
||||
[entry.id, setCardOn],
|
||||
);
|
||||
const arrangement = useMemo(
|
||||
() => ({
|
||||
on,
|
||||
onSetOn: handleSetOn,
|
||||
handleVisible: isHovered || hasFocus || dragging || isNative || isCompact,
|
||||
}),
|
||||
[dragging, handleSetOn, hasFocus, isCompact, isHovered, on],
|
||||
[dragging, hasFocus, isCompact, isHovered],
|
||||
);
|
||||
return (
|
||||
<View
|
||||
|
||||
@@ -6,14 +6,12 @@ import type { UsageTone } from "./types";
|
||||
|
||||
function fillToneStyle(tone: UsageTone) {
|
||||
switch (tone) {
|
||||
case "ok":
|
||||
return styles.fillOk;
|
||||
case "warning":
|
||||
return styles.fillWarning;
|
||||
case "danger":
|
||||
return styles.fillDanger;
|
||||
default:
|
||||
return styles.fillDefault;
|
||||
return styles.fillOk;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,9 +57,6 @@ const styles = StyleSheet.create((theme) => ({
|
||||
fillQuiet: {
|
||||
backgroundColor: theme.colors.surface4,
|
||||
},
|
||||
fillDefault: {
|
||||
backgroundColor: theme.colors.foregroundMuted,
|
||||
},
|
||||
fillOk: {
|
||||
backgroundColor: theme.colors.statusSuccess,
|
||||
},
|
||||
|
||||
@@ -2,9 +2,10 @@ import { useTranslation } from "react-i18next";
|
||||
import { View } from "react-native";
|
||||
import { Settings } from "lucide-react-native";
|
||||
import { withUnistyles } from "react-native-unistyles";
|
||||
import { useMemo } from "react";
|
||||
import { useCallback, useMemo } from "react";
|
||||
import {
|
||||
DropdownMenu,
|
||||
DropdownMenuCheckboxItem,
|
||||
DropdownMenuContent,
|
||||
DropdownMenuSubTrigger,
|
||||
type MenuPageDefinition,
|
||||
@@ -23,26 +24,36 @@ import { Alert } from "@/components/ui/alert";
|
||||
import { useHosts } from "@/runtime/host-runtime";
|
||||
import { settingsStyles } from "@/styles/settings";
|
||||
import { useUsageSetting } from "./setting";
|
||||
import { useUsageDisplay } from "./display";
|
||||
import { useUsageDisplay, type UsageDisplay } from "./display";
|
||||
import { useUsageInSidebar } from "./in-sidebar";
|
||||
import { hasHostChoice, type UsageHostSelection } from "./hosts";
|
||||
import type { UsageDisplayAs } from "./preferences";
|
||||
import { UsageSourceIcon } from "./source-icon";
|
||||
import type { UsageReportEntry } from "./types";
|
||||
|
||||
const ThemedSettings = withUnistyles(Settings);
|
||||
|
||||
const HOST_PAGE = "host";
|
||||
const SOURCES_PAGE = "sources";
|
||||
|
||||
/**
|
||||
* The shared usage preferences, opened from a cog as a popover or compact sheet. With more than
|
||||
* one host, it leads with the host whose usage shows: the row reads as the current host, and the
|
||||
* hosts are a page of the same surface, so a compact sheet never opens a second sheet over it.
|
||||
* The shared usage preferences, opened from a cog as a popover or compact sheet. Host and Sources
|
||||
* open as pages of the same surface, so a compact sheet never opens a second sheet over it.
|
||||
*/
|
||||
export function UsageOptions({
|
||||
serverId,
|
||||
hostSelection,
|
||||
reports = [],
|
||||
display: providedDisplay,
|
||||
open,
|
||||
onOpenChange,
|
||||
}: {
|
||||
serverId: string | null;
|
||||
hostSelection?: UsageHostSelection;
|
||||
reports?: readonly UsageReportEntry[];
|
||||
display?: UsageDisplay;
|
||||
open?: boolean;
|
||||
onOpenChange?: (open: boolean) => void;
|
||||
}) {
|
||||
const setting = useUsageSetting(serverId);
|
||||
const hostLabel = useHosts().find((host) => host.serverId === serverId)?.label ?? serverId;
|
||||
@@ -57,24 +68,37 @@ export function UsageOptions({
|
||||
];
|
||||
const compact = useIsCompactFormFactor();
|
||||
const glyphSize = useIconButtonChromeGlyphSize("small", compact);
|
||||
const { display } = useUsageDisplay([]);
|
||||
const fallbackDisplay = useUsageDisplay(providedDisplay ? [] : reports).display;
|
||||
const display = providedDisplay ?? fallbackDisplay;
|
||||
const { inSidebar, setInSidebar } = useUsageInSidebar();
|
||||
const hostChoice = hasHostChoice(hostSelection) ? hostSelection : null;
|
||||
const pages = useMemo<MenuPageDefinition[] | undefined>(
|
||||
() =>
|
||||
hostChoice
|
||||
? [
|
||||
{
|
||||
id: HOST_PAGE,
|
||||
title: t("providerUsage.host"),
|
||||
content: <UsageHostPage hostSelection={hostChoice} />,
|
||||
},
|
||||
]
|
||||
: undefined,
|
||||
[hostChoice, t],
|
||||
const arrangedReports = useMemo(() => display.arrange(reports), [display, reports]);
|
||||
const hasSources = arrangedReports.length > 0;
|
||||
const shownCount = useMemo(
|
||||
() => arrangedReports.filter((entry) => display.isCardOn(entry)).length,
|
||||
[arrangedReports, display],
|
||||
);
|
||||
const pages = useMemo<MenuPageDefinition[] | undefined>(() => {
|
||||
const definitions: MenuPageDefinition[] = [];
|
||||
if (hostChoice) {
|
||||
definitions.push({
|
||||
id: HOST_PAGE,
|
||||
title: t("providerUsage.host"),
|
||||
content: <UsageHostPage hostSelection={hostChoice} />,
|
||||
});
|
||||
}
|
||||
if (hasSources) {
|
||||
definitions.push({
|
||||
id: SOURCES_PAGE,
|
||||
title: t("providerUsage.sources"),
|
||||
content: <UsageSourcesPage reports={arrangedReports} display={display} />,
|
||||
});
|
||||
}
|
||||
return definitions.length > 0 ? definitions : undefined;
|
||||
}, [arrangedReports, display, hasSources, hostChoice, t]);
|
||||
const hasSubTriggers = Boolean(hostChoice || hasSources);
|
||||
return (
|
||||
<DropdownMenu compactMode="sheet">
|
||||
<DropdownMenu compactMode="sheet" open={open} onOpenChange={onOpenChange}>
|
||||
<ToolbarButton
|
||||
kind="menu"
|
||||
label={t("providerUsage.options")}
|
||||
@@ -99,8 +123,20 @@ export function UsageOptions({
|
||||
{t("providerUsage.host")}
|
||||
</DropdownMenuSubTrigger>
|
||||
) : null}
|
||||
{hasSources ? (
|
||||
<DropdownMenuSubTrigger
|
||||
id={SOURCES_PAGE}
|
||||
value={t("providerUsage.sourcesCount", {
|
||||
shown: shownCount,
|
||||
total: arrangedReports.length,
|
||||
})}
|
||||
testID="usage-options-sources"
|
||||
>
|
||||
{t("providerUsage.sources")}
|
||||
</DropdownMenuSubTrigger>
|
||||
) : null}
|
||||
<View
|
||||
style={hostChoice ? settingsStyles.rowBorder : undefined}
|
||||
style={hasSubTriggers ? settingsStyles.rowBorder : undefined}
|
||||
testID="usage-options-fields"
|
||||
>
|
||||
<MenuSettingsRows>
|
||||
@@ -156,3 +192,60 @@ function UsageHostPage({ hostSelection }: { hostSelection: UsageHostSelection })
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
function UsageSourcesPage({
|
||||
reports,
|
||||
display,
|
||||
}: {
|
||||
reports: readonly UsageReportEntry[];
|
||||
display: UsageDisplay;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const inactiveLabel = t("providerUsage.providerInactive");
|
||||
return (
|
||||
<>
|
||||
{reports.map((entry) => (
|
||||
<UsageSourceMenuItem
|
||||
key={entry.id}
|
||||
entry={entry}
|
||||
on={display.isCardOn(entry)}
|
||||
onToggle={display.setCardOn}
|
||||
inactiveLabel={inactiveLabel}
|
||||
/>
|
||||
))}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
function UsageSourceMenuItem({
|
||||
entry,
|
||||
on,
|
||||
onToggle,
|
||||
inactiveLabel,
|
||||
}: {
|
||||
entry: UsageReportEntry;
|
||||
on: boolean;
|
||||
onToggle: (reportId: string, on: boolean) => void;
|
||||
inactiveLabel: string;
|
||||
}) {
|
||||
const handleSelect = useCallback(() => onToggle(entry.id, !on), [entry.id, on, onToggle]);
|
||||
const leading = useMemo(
|
||||
() => <UsageSourceIcon svg={entry.icon ?? null} size={14} />,
|
||||
[entry.icon],
|
||||
);
|
||||
const description =
|
||||
[entry.account.label, !on && entry.defaultEnabled === false ? inactiveLabel : null]
|
||||
.filter(Boolean)
|
||||
.join(" · ") || undefined;
|
||||
return (
|
||||
<DropdownMenuCheckboxItem
|
||||
leading={leading}
|
||||
description={description}
|
||||
checked={on}
|
||||
onToggle={handleSelect}
|
||||
testID={`usage-source-toggle-${entry.id}`}
|
||||
>
|
||||
{entry.sourceLabel}
|
||||
</DropdownMenuCheckboxItem>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -23,12 +23,25 @@ describe("usage pace", () => {
|
||||
it("updates after a later reading and works with a remaining percentage", () => {
|
||||
const close = reading("13:30");
|
||||
const safe = reading("14:00");
|
||||
const forecast = usagePace(window, close, Date.parse(close));
|
||||
expect(forecast.kind).toBe("remaining");
|
||||
if (forecast.kind === "remaining") expect(forecast.remainingAtResetPct).toBeCloseTo(7.14);
|
||||
expect(usagePace(window, close, Date.parse(close))).toEqual({ kind: "tight" });
|
||||
expect(
|
||||
usagePace({ ...window, usedPct: undefined, remainingPct: 35 }, safe, Date.parse(safe)),
|
||||
).toEqual({ kind: "remaining", remainingAtResetPct: 18.75 });
|
||||
).toEqual({ kind: "onTrack" });
|
||||
});
|
||||
|
||||
it("projects a weekly window after 100 minutes when 6% is already used", () => {
|
||||
const sampledAt = "2026-11-21T10:28:17.000Z";
|
||||
const weekly: UsageWindow = {
|
||||
id: "gemini-weekly",
|
||||
label: "Gemini · Weekly",
|
||||
durationSeconds: 604_800,
|
||||
usedPct: 6,
|
||||
resetsAt: "2026-11-28T08:48:17.000Z",
|
||||
};
|
||||
expect(usagePace(weekly, sampledAt, Date.parse("2026-11-21T10:33:03Z"))).toEqual({
|
||||
kind: "runsOut",
|
||||
at: "2026-11-22T12:34:57.000Z",
|
||||
});
|
||||
});
|
||||
|
||||
it("only forecasts with timing and an active, usable reading", () => {
|
||||
|
||||
@@ -5,7 +5,7 @@ type UsagePace =
|
||||
| { kind: "unknown" }
|
||||
| { kind: "reached" }
|
||||
| { kind: "runsOut"; at: string }
|
||||
| { kind: "remaining"; remainingAtResetPct: number };
|
||||
| { kind: "onTrack" | "tight" };
|
||||
|
||||
/** Estimate from the window's average pace as of the reading. The clock only expires the estimate. */
|
||||
export function usagePace(window: UsageWindow, observedAt: string | null, now: number): UsagePace {
|
||||
@@ -25,13 +25,15 @@ export function usagePace(window: UsageWindow, observedAt: string | null, now: n
|
||||
const duration = (window.durationSeconds ?? 0) * 1_000;
|
||||
const sampled = Date.parse(observedAt);
|
||||
const elapsed = sampled - (reset - duration);
|
||||
// Wait for an initial sample without holding back multi-day forecasts for several hours.
|
||||
const minimumElapsed = Math.max(60_000, Math.min(duration * 0.01, 3_600_000));
|
||||
if (
|
||||
used == null ||
|
||||
!Number.isFinite(used) ||
|
||||
used < 0 ||
|
||||
!Number.isFinite(elapsed) ||
|
||||
sampled >= reset ||
|
||||
elapsed < Math.max(60_000, duration * 0.01)
|
||||
elapsed < minimumElapsed
|
||||
) {
|
||||
return { kind: "unknown" };
|
||||
}
|
||||
@@ -41,5 +43,5 @@ export function usagePace(window: UsageWindow, observedAt: string | null, now: n
|
||||
const runsOut = sampled + ((100 - used) / used) * elapsed;
|
||||
return { kind: "runsOut", at: new Date(runsOut).toISOString() };
|
||||
}
|
||||
return { kind: "remaining", remainingAtResetPct: 100 - projectedAtReset };
|
||||
return { kind: projectedAtReset >= 90 ? "tight" : "onTrack" };
|
||||
}
|
||||
|
||||
@@ -20,8 +20,8 @@ export interface UsagePreferences {
|
||||
serverId: string | null;
|
||||
/** Report IDs the user arranged, in their order. Shared by every host. */
|
||||
cardOrder: string[];
|
||||
/** Report IDs the user turned off. Their cards collapse and leave the sidebar summary. */
|
||||
cardsOff: string[];
|
||||
/** Explicit per-report visibility overrides; absent IDs follow the host's `defaultEnabled` hint. */
|
||||
cardVisibility: Record<string, boolean>;
|
||||
}
|
||||
|
||||
export const DEFAULT_USAGE_PREFERENCES: UsagePreferences = {
|
||||
@@ -29,11 +29,12 @@ export const DEFAULT_USAGE_PREFERENCES: UsagePreferences = {
|
||||
pins: null,
|
||||
serverId: null,
|
||||
cardOrder: [],
|
||||
cardsOff: [],
|
||||
cardVisibility: {},
|
||||
};
|
||||
|
||||
const pinsSchema = z.array(z.object({ sourceId: z.string(), windowId: z.string() }));
|
||||
const reportIdsSchema = z.array(z.string()).optional().catch(undefined);
|
||||
const cardVisibilitySchema = z.record(z.string(), z.boolean()).optional().catch(undefined);
|
||||
|
||||
export const UsagePreferencesSchema = z
|
||||
.object({
|
||||
@@ -44,18 +45,34 @@ export const UsagePreferencesSchema = z
|
||||
pinned: pinsSchema.optional().catch([]),
|
||||
serverId: z.string().nullable().catch(null),
|
||||
cardOrder: reportIdsSchema,
|
||||
cardVisibility: cardVisibilitySchema,
|
||||
// COMPAT(usageCardsOff): replaced by cardVisibility in v0.18, remove after 2027-05-22.
|
||||
cardsOff: reportIdsSchema,
|
||||
})
|
||||
.transform(({ displayAs, pins, pinned, serverId, cardOrder, cardsOff }): UsagePreferences => {
|
||||
const legacyPins = pinned && pinned.length > 0 ? pinned : null;
|
||||
return {
|
||||
.transform(
|
||||
({
|
||||
displayAs,
|
||||
pins: pins === undefined ? legacyPins : pins,
|
||||
pins,
|
||||
pinned,
|
||||
serverId,
|
||||
cardOrder: cardOrder ?? [],
|
||||
cardsOff: cardsOff ?? [],
|
||||
};
|
||||
})
|
||||
cardOrder,
|
||||
cardVisibility,
|
||||
cardsOff,
|
||||
}): UsagePreferences => {
|
||||
const legacyPins = pinned && pinned.length > 0 ? pinned : null;
|
||||
const legacyVisibility =
|
||||
cardsOff && cardsOff.length > 0
|
||||
? Object.fromEntries(cardsOff.map((id) => [id, false] as const))
|
||||
: {};
|
||||
return {
|
||||
displayAs,
|
||||
pins: pins === undefined ? legacyPins : pins,
|
||||
serverId,
|
||||
cardOrder: cardOrder ?? [],
|
||||
cardVisibility: cardVisibility ?? legacyVisibility,
|
||||
};
|
||||
},
|
||||
)
|
||||
.catch(DEFAULT_USAGE_PREFERENCES);
|
||||
|
||||
function samePin(a: UsagePin, b: UsagePin): boolean {
|
||||
@@ -154,8 +171,8 @@ export function usageReportsOn(
|
||||
reports: readonly UsageReportEntry[],
|
||||
preferences: UsagePreferences,
|
||||
): UsageReportEntry[] {
|
||||
return arrangeUsageReports(reports, preferences).filter(
|
||||
(entry) => !isUsageCardOff(preferences, entry.id),
|
||||
return arrangeUsageReports(reports, preferences).filter((entry) =>
|
||||
isUsageCardOn(preferences, entry),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -188,8 +205,14 @@ export function arrangeUsageCards(
|
||||
return { ...preferences, cardOrder: rest };
|
||||
}
|
||||
|
||||
export function isUsageCardOff(preferences: UsagePreferences, reportId: string): boolean {
|
||||
return preferences.cardsOff.includes(reportId);
|
||||
/** Whether a report card is shown, honoring an explicit user override before the host's default hint. */
|
||||
export function isUsageCardOn(
|
||||
preferences: UsagePreferences,
|
||||
entry: Pick<UsageReportEntry, "id" | "defaultEnabled">,
|
||||
): boolean {
|
||||
const explicit = preferences.cardVisibility[entry.id];
|
||||
if (explicit !== undefined) return explicit;
|
||||
return entry.defaultEnabled !== false;
|
||||
}
|
||||
|
||||
export function setUsageCardOn(
|
||||
@@ -197,6 +220,8 @@ export function setUsageCardOn(
|
||||
reportId: string,
|
||||
on: boolean,
|
||||
): UsagePreferences {
|
||||
const others = preferences.cardsOff.filter((id) => id !== reportId);
|
||||
return { ...preferences, cardsOff: on ? others : [...others, reportId] };
|
||||
return {
|
||||
...preferences,
|
||||
cardVisibility: { ...preferences.cardVisibility, [reportId]: on },
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import { View } from "react-native";
|
||||
import { AdaptiveModalSheet, SheetHeaderSubtitle } from "@/components/adaptive-modal-sheet";
|
||||
import { builtinSidebarNavLabelKey } from "@/sidebar-nav/model";
|
||||
import { useHostUsageWithControls } from "./controls";
|
||||
import { useUsageDisplay } from "./display";
|
||||
import { getHostPickerLabel } from "@/components/hosts/host-picker";
|
||||
import { hasHostChoice, useUsageHostSelection } from "./hosts";
|
||||
import type { UsageHost } from "./model";
|
||||
@@ -50,8 +49,7 @@ function HostUsageModal({
|
||||
() => ({ hosts, serverId, onSelect: onSelectHost }),
|
||||
[hosts, onSelectHost, serverId],
|
||||
);
|
||||
const { view, refresh, controls } = useHostUsageWithControls(hostSelection);
|
||||
const { display } = useUsageDisplay(view.kind === "ready" ? view.reports : []);
|
||||
const { view, display, refresh, controls, openOptions } = useHostUsageWithControls(hostSelection);
|
||||
const hostLabel = hasHostChoice(hostSelection)
|
||||
? getHostPickerLabel(hostSelection.hosts, hostSelection.serverId)
|
||||
: undefined;
|
||||
@@ -61,7 +59,13 @@ function HostUsageModal({
|
||||
host's cards. The frame is not keyed: remounting it would dismiss a compact sheet, and Usage
|
||||
with it. */}
|
||||
<View key={serverId} testID={`usage-host-${serverId}`}>
|
||||
<UsageBody serverId={serverId} view={view} display={display} onRefresh={refresh} />
|
||||
<UsageBody
|
||||
serverId={serverId}
|
||||
view={view}
|
||||
display={display}
|
||||
onRefresh={refresh}
|
||||
onOpenSources={openOptions}
|
||||
/>
|
||||
</View>
|
||||
</UsageModalFrame>
|
||||
);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useMemo } from "react";
|
||||
import { useCallback, useMemo, useState } from "react";
|
||||
import { Text, View } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { Alert } from "@/components/ui/alert";
|
||||
@@ -27,14 +27,31 @@ export function UsageSection({
|
||||
onRefresh: () => void;
|
||||
testID?: string;
|
||||
}) {
|
||||
const [optionsOpen, setOptionsOpen] = useState(false);
|
||||
const openOptions = useCallback(() => setOptionsOpen(true), []);
|
||||
const trailing = useMemo(
|
||||
() => <UsageControls serverId={serverId} view={view} onRefresh={onRefresh} />,
|
||||
[onRefresh, view, serverId],
|
||||
() => (
|
||||
<UsageControls
|
||||
serverId={serverId}
|
||||
view={view}
|
||||
display={display}
|
||||
onRefresh={onRefresh}
|
||||
optionsOpen={optionsOpen}
|
||||
onOptionsOpenChange={setOptionsOpen}
|
||||
/>
|
||||
),
|
||||
[display, onRefresh, optionsOpen, serverId, view],
|
||||
);
|
||||
|
||||
return (
|
||||
<SettingsSection title={title} testID={testID} trailing={trailing}>
|
||||
<UsageBody serverId={serverId} view={view} display={display} onRefresh={onRefresh} />
|
||||
<UsageBody
|
||||
serverId={serverId}
|
||||
view={view}
|
||||
display={display}
|
||||
onRefresh={onRefresh}
|
||||
onOpenSources={openOptions}
|
||||
/>
|
||||
</SettingsSection>
|
||||
);
|
||||
}
|
||||
@@ -45,14 +62,23 @@ export function UsageBody({
|
||||
view,
|
||||
display,
|
||||
onRefresh,
|
||||
onOpenSources,
|
||||
}: {
|
||||
serverId: string;
|
||||
view: UsageView;
|
||||
display: UsageDisplay;
|
||||
onRefresh: () => void;
|
||||
onOpenSources?: () => void;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const setting = useUsageSetting(serverId);
|
||||
const visibleReports = useMemo(
|
||||
() =>
|
||||
view.kind === "ready"
|
||||
? display.arrange(view.reports).filter((entry) => display.isCardOn(entry))
|
||||
: [],
|
||||
[display, view],
|
||||
);
|
||||
if (view.kind === "off")
|
||||
return (
|
||||
<View>
|
||||
@@ -84,16 +110,30 @@ export function UsageBody({
|
||||
);
|
||||
}
|
||||
|
||||
let content: React.ReactNode;
|
||||
if (view.reports.length === 0) {
|
||||
content = <UsageMessage text={t("providerUsage.empty")} />;
|
||||
} else if (visibleReports.length === 0) {
|
||||
content = (
|
||||
<View style={[settingsStyles.card, styles.emptyCard]} testID="usage-all-hidden">
|
||||
<Text style={styles.emptyText}>{t("providerUsage.allSourcesHidden")}</Text>
|
||||
{onOpenSources ? (
|
||||
<Button variant="outline" onPress={onOpenSources} testID="usage-choose-sources">
|
||||
{t("providerUsage.chooseSources")}
|
||||
</Button>
|
||||
) : null}
|
||||
</View>
|
||||
);
|
||||
} else {
|
||||
content = <UsageList serverId={serverId} reports={visibleReports} display={display} />;
|
||||
}
|
||||
|
||||
return (
|
||||
<View style={styles.reports}>
|
||||
{view.refreshFailed ? (
|
||||
<Alert size="sm" variant="error" title={t("providerUsage.refreshFailed")} />
|
||||
) : null}
|
||||
{view.reports.length === 0 ? (
|
||||
<UsageMessage text={t("providerUsage.empty")} />
|
||||
) : (
|
||||
<UsageList serverId={serverId} reports={view.reports} display={display} />
|
||||
)}
|
||||
{content}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
@@ -110,6 +150,7 @@ const styles = StyleSheet.create((theme) => ({
|
||||
reports: { gap: theme.spacing[3] },
|
||||
emptyCard: {
|
||||
padding: theme.spacing[4],
|
||||
gap: theme.spacing[3],
|
||||
alignItems: "center",
|
||||
},
|
||||
emptyText: {
|
||||
|
||||
@@ -7,7 +7,6 @@ import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||
import {
|
||||
formatDisplayPct,
|
||||
formatPct,
|
||||
formatProviderUsageLabel,
|
||||
formatResetLabel,
|
||||
formatResetTime,
|
||||
@@ -18,6 +17,7 @@ import { displayPercent, usageWindowRowLabel } from "./model";
|
||||
import { usagePace } from "./pace";
|
||||
import { UsageDatapointLine } from "./datapoint-line";
|
||||
import type { UsageDisplayAs } from "./preferences";
|
||||
import { windowTone } from "./tone";
|
||||
import type { UsageTone, UsageWindow } from "./types";
|
||||
import { useRelativeTimeTick } from "./use-relative-time-tick";
|
||||
|
||||
@@ -55,13 +55,13 @@ export function UsageWindowBar({
|
||||
const value =
|
||||
shownPct != null ? formatDisplayPct(shownPct, displayAs, i18n.resolvedLanguage, t) : "—";
|
||||
const accessibilityState = useMemo(() => ({ checked: pinned }), [pinned]);
|
||||
const datapoints = [countdown, exactTime, forecast?.label ?? null];
|
||||
const content = {
|
||||
label: formatProviderUsageLabel(window.id, window.label, t),
|
||||
value,
|
||||
countdown,
|
||||
exactTime,
|
||||
forecast,
|
||||
datapoints,
|
||||
percent: shownPct ?? 0,
|
||||
tone: forecast?.tone ?? windowTone(window),
|
||||
pinned,
|
||||
};
|
||||
|
||||
@@ -81,7 +81,7 @@ export function UsageWindowBar({
|
||||
accessibilityLabel={usageWindowRowLabel({
|
||||
pinLabel,
|
||||
value,
|
||||
trailing: [countdown, exactTime, forecast?.label].filter(Boolean).join(" · "),
|
||||
trailing: datapoints.filter(Boolean).join(" · "),
|
||||
})}
|
||||
accessibilityState={accessibilityState}
|
||||
aria-checked={pinned}
|
||||
@@ -96,19 +96,17 @@ export function UsageWindowBar({
|
||||
function WindowRowContent({
|
||||
label,
|
||||
value,
|
||||
countdown,
|
||||
exactTime,
|
||||
forecast,
|
||||
datapoints,
|
||||
percent,
|
||||
tone,
|
||||
pinnable,
|
||||
pinned,
|
||||
}: {
|
||||
label: string;
|
||||
value: string;
|
||||
countdown: string | null;
|
||||
exactTime: string | null;
|
||||
forecast: PaceLabel | null;
|
||||
datapoints: readonly (string | null)[];
|
||||
percent: number;
|
||||
tone: UsageTone;
|
||||
pinnable: boolean;
|
||||
pinned: boolean;
|
||||
}) {
|
||||
@@ -123,14 +121,14 @@ function WindowRowContent({
|
||||
</Text>
|
||||
{pinnable ? <UsagePinGlyph pinned={pinned} /> : null}
|
||||
</View>
|
||||
<UsageMeter percent={percent} tone={forecast?.tone ?? "default"} />
|
||||
<UsageDatapointLine datapoints={[countdown, exactTime, forecast?.label ?? null]} />
|
||||
<UsageMeter percent={percent} tone={tone} />
|
||||
<UsageDatapointLine datapoints={datapoints} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
interface PaceLabel {
|
||||
label: string;
|
||||
interface PaceDisplay {
|
||||
label: string | null;
|
||||
tone: UsageTone;
|
||||
}
|
||||
|
||||
@@ -138,7 +136,7 @@ function formatPace(
|
||||
pace: ReturnType<typeof usagePace>,
|
||||
now: number,
|
||||
t: TFunction,
|
||||
): PaceLabel | null {
|
||||
): PaceDisplay | null {
|
||||
switch (pace.kind) {
|
||||
case "reached":
|
||||
return { label: t("providerUsage.timing.limitReached"), tone: "danger" };
|
||||
@@ -149,13 +147,10 @@ function formatPace(
|
||||
: formatRunsOutLabel(pace.at, now, t);
|
||||
return label ? { label, tone: "danger" } : null;
|
||||
}
|
||||
case "remaining":
|
||||
return {
|
||||
label: t("providerUsage.timing.projectedLeftAtReset", {
|
||||
percentage: formatPct(pace.remainingAtResetPct),
|
||||
}),
|
||||
tone: pace.remainingAtResetPct <= 10 ? "warning" : "default",
|
||||
};
|
||||
case "tight":
|
||||
return { label: null, tone: "warning" };
|
||||
case "onTrack":
|
||||
return { label: null, tone: "default" };
|
||||
case "unknown":
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -97,14 +97,10 @@ export function formatCompactTimeAgoAsProse(label: string): string {
|
||||
return label;
|
||||
}
|
||||
|
||||
/**
|
||||
* How many local midnights lie between two instants: 0 for the same day, 1 for yesterday.
|
||||
* Counted on the calendar rather than in elapsed time, so six days and 23 hours ago on
|
||||
* today's weekday is 7, and rounded so a DST day of 23 or 25 hours still counts as one.
|
||||
*/
|
||||
function localCalendarDaysBetween(earlier: Date, later: Date): number {
|
||||
const startOfDay = (d: Date) => new Date(d.getFullYear(), d.getMonth(), d.getDate());
|
||||
return Math.round((startOfDay(later).getTime() - startOfDay(earlier).getTime()) / DAY_MS);
|
||||
/** Count local calendar dates using equally spaced UTC values for their year, month and day. */
|
||||
export function localCalendarDaysBetween(earlier: Date, later: Date): number {
|
||||
const calendarDay = (date: Date) => Date.UTC(date.getFullYear(), date.getMonth(), date.getDate());
|
||||
return (calendarDay(later) - calendarDay(earlier)) / DAY_MS;
|
||||
}
|
||||
|
||||
// Cached Intl formatter. Explicitly carrying `hourCycle` from the resolved
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@getpaseo/cli",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"description": "Paseo CLI - control your AI coding agents from the command line",
|
||||
"license": "Apache-2.0",
|
||||
"bin": {
|
||||
@@ -29,9 +29,9 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@clack/prompts": "^1.0.0",
|
||||
"@getpaseo/client": "0.17.0",
|
||||
"@getpaseo/protocol": "0.17.0",
|
||||
"@getpaseo/server": "0.17.0",
|
||||
"@getpaseo/client": "0.17.1",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"@getpaseo/server": "0.17.1",
|
||||
"chalk": "^5.3.0",
|
||||
"commander": "^12.0.0",
|
||||
"mime-types": "^2.1.35",
|
||||
|
||||
@@ -12,9 +12,11 @@ describe("canonical CLI surface", () => {
|
||||
expect(send.opts().behavior).toBe("interrupt");
|
||||
await send.parseAsync(["target", "message", "--behavior", "steer"], { from: "user" });
|
||||
expect(send.opts().behavior).toBe("steer");
|
||||
await send.parseAsync(["target", "message", "--behavior", "queue"], { from: "user" });
|
||||
expect(send.opts().behavior).toBe("queue");
|
||||
send.exitOverride().configureOutput({ writeErr: () => {} });
|
||||
await expect(
|
||||
send.parseAsync(["target", "message", "--behavior", "queue"], { from: "user" }),
|
||||
send.parseAsync(["target", "message", "--behavior", "wait"], { from: "user" }),
|
||||
).rejects.toThrow();
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { buildNoWaitResult } from "./send.js";
|
||||
|
||||
const agentId = "11111111-1111-4111-8111-111111111111";
|
||||
|
||||
describe("buildNoWaitResult", () => {
|
||||
it("reports the behavior the host applied to an agent's message", () => {
|
||||
expect(
|
||||
buildNoWaitResult(agentId, {
|
||||
deliveryStatus: "queued",
|
||||
activeTurnBehavior: "steer",
|
||||
guidance: "The agent is idle, so your message starts a turn now.",
|
||||
}),
|
||||
).toEqual({
|
||||
agentId,
|
||||
status: "queued",
|
||||
activeTurnBehavior: "steer",
|
||||
message: "The agent is idle, so your message starts a turn now.",
|
||||
});
|
||||
});
|
||||
|
||||
it("leaves the behavior out when the host does not report one", () => {
|
||||
expect(buildNoWaitResult(agentId, {})).toEqual({
|
||||
agentId,
|
||||
status: "sent",
|
||||
message: "Message sent, not waiting for completion",
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,7 +1,8 @@
|
||||
import { type Command, Option } from "commander";
|
||||
import type { ActiveTurnBehavior } from "@getpaseo/protocol/messages";
|
||||
import type { AgentActiveTurnBehavior } from "@getpaseo/protocol/messages";
|
||||
import { collectMultiple } from "../../utils/command-options.js";
|
||||
import { connectToDaemon } from "../../utils/client.js";
|
||||
import type { AgentMessageReceipt } from "@getpaseo/client/internal/daemon-client";
|
||||
import type {
|
||||
CommandOptions,
|
||||
SingleResult,
|
||||
@@ -15,6 +16,8 @@ import { extname, resolve } from "node:path";
|
||||
export interface AgentSendResult {
|
||||
agentId: string;
|
||||
status: "queued" | "sent" | "completed" | "timeout" | "permission" | "error";
|
||||
/** What the host applied to an agent's message with a running turn. */
|
||||
activeTurnBehavior?: AgentActiveTurnBehavior;
|
||||
message: string;
|
||||
}
|
||||
|
||||
@@ -29,7 +32,7 @@ export const agentSendSchema: OutputSchema<AgentSendResult> = {
|
||||
};
|
||||
|
||||
export interface AgentSendOptions extends CommandOptions {
|
||||
behavior?: ActiveTurnBehavior;
|
||||
behavior?: AgentActiveTurnBehavior;
|
||||
wait?: boolean;
|
||||
image?: string[];
|
||||
prompt?: string;
|
||||
@@ -47,8 +50,8 @@ export function addSendOptions(cmd: Command): Command {
|
||||
.addOption(
|
||||
new Option(
|
||||
"--behavior <behavior>",
|
||||
"Active-turn behavior (agent default: steer waits for turn end; otherwise: interrupt)",
|
||||
).choices(["interrupt", "steer"]),
|
||||
"Leave out unless the message cannot wait. From an agent (PASEO_AGENT_ID set): queue (default) waits for the running turn to end, steer joins it, interrupt replaces it. From a person: interrupt (default) or steer",
|
||||
).choices(["queue", "steer", "interrupt"]),
|
||||
)
|
||||
.option("--no-wait", "Return immediately without waiting for completion");
|
||||
}
|
||||
@@ -170,6 +173,22 @@ function buildSendResult(agentIdArg: string, state: SendWaitState): AgentSendRes
|
||||
return { agentId, status: "completed", message: "Agent completed processing the message" };
|
||||
}
|
||||
|
||||
export function buildNoWaitResult(agentId: string, receipt: AgentMessageReceipt): AgentSendResult {
|
||||
return {
|
||||
agentId,
|
||||
status: receipt.deliveryStatus ?? "sent",
|
||||
...(receipt.activeTurnBehavior ? { activeTurnBehavior: receipt.activeTurnBehavior } : {}),
|
||||
message: sendReceiptMessage(receipt),
|
||||
};
|
||||
}
|
||||
|
||||
function sendReceiptMessage(receipt: AgentMessageReceipt): string {
|
||||
if (receipt.deliveryStatus !== "queued") return "Message sent, not waiting for completion";
|
||||
// COMPAT(agentActiveTurnBehaviors): added in v0.17.2, remove after 2027-05-22 once daemon
|
||||
// floor >= v0.17.2. Older hosts return no guidance.
|
||||
return receipt.guidance ?? "Message queued for delivery after the current turn ends";
|
||||
}
|
||||
|
||||
export async function runSendCommand(
|
||||
agentIdArg: string,
|
||||
prompt: string | undefined,
|
||||
@@ -204,7 +223,7 @@ export async function runSendCommand(
|
||||
const receipt = await client.sendAgentMessage(agentIdArg, promptInput, {
|
||||
images,
|
||||
sourceAgentId,
|
||||
activeTurnBehavior: options.behavior ?? (sourceAgentId ? "steer" : "interrupt"),
|
||||
activeTurnBehavior: options.behavior,
|
||||
});
|
||||
|
||||
// If --no-wait, return immediately
|
||||
@@ -213,14 +232,7 @@ export async function runSendCommand(
|
||||
|
||||
return {
|
||||
type: "single",
|
||||
data: {
|
||||
agentId: agentIdArg,
|
||||
status: receipt.deliveryStatus ?? "sent",
|
||||
message:
|
||||
receipt.deliveryStatus === "queued"
|
||||
? "Message queued for delivery after two quiet seconds and the current turn ends, unless interrupt was requested"
|
||||
: "Message sent, not waiting for completion",
|
||||
},
|
||||
data: buildNoWaitResult(agentIdArg, receipt),
|
||||
schema: agentSendSchema,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@getpaseo/client",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"description": "Paseo client SDK package",
|
||||
"license": "Apache-2.0",
|
||||
"files": [
|
||||
@@ -49,8 +49,8 @@
|
||||
"measure:diff-materialization": "tsx scripts/measure-diff-materialization.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"@getpaseo/protocol": "0.17.0",
|
||||
"@getpaseo/relay": "0.17.0",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"@getpaseo/relay": "0.17.1",
|
||||
"ws": "^8.20.0",
|
||||
"zod": "^4.4.3"
|
||||
},
|
||||
|
||||
@@ -125,6 +125,7 @@ export class ConnectionSubscriptions extends OwnedSubscriptions {
|
||||
// Protocol support belongs to the installed client. Only browser hosting needs
|
||||
// a resource supplied by the caller. Keep this exhaustive as the protocol evolves.
|
||||
export const DEFAULT_CLIENT_CAPABILITIES = {
|
||||
[CLIENT_CAPS.agentActiveTurnBehaviors]: true,
|
||||
[CLIENT_CAPS.terminalChunkedReplay]: true,
|
||||
[CLIENT_CAPS.binaryChunkingV1]: true,
|
||||
[CLIENT_CAPS.helloRejection]: true,
|
||||
|
||||
@@ -1127,6 +1127,7 @@ test("advertises client capabilities in hello", async () => {
|
||||
clientType: "cli",
|
||||
protocolVersion: 1,
|
||||
capabilities: {
|
||||
agent_active_turn_behaviors: true,
|
||||
all_providers: true,
|
||||
selective_agent_timeline: true,
|
||||
timeline_replacement_invalidation: true,
|
||||
@@ -8828,6 +8829,97 @@ test.each([false, true])(
|
||||
},
|
||||
);
|
||||
|
||||
describe("agent sender active-turn behaviors", () => {
|
||||
async function connect(features: Record<string, boolean>) {
|
||||
const transport = createMockTransport();
|
||||
const client = new DaemonClient({
|
||||
url: "ws://test",
|
||||
clientId: "agent-behaviors",
|
||||
transportFactory: () => transport.transport,
|
||||
reconnect: { enabled: false },
|
||||
});
|
||||
clients.push(client);
|
||||
const connecting = client.connect();
|
||||
transport.triggerOpen({ features: { agentMessageProvenance: true, ...features } });
|
||||
await connecting;
|
||||
return { client, transport };
|
||||
}
|
||||
|
||||
function respond(
|
||||
transport: ReturnType<typeof createMockTransport>,
|
||||
payload: Record<string, unknown> = {},
|
||||
) {
|
||||
const request = parseSentFrame(transport.sent.at(-1));
|
||||
transport.triggerMessage(
|
||||
wrapSessionMessage({
|
||||
type: "send_agent_message_response",
|
||||
payload: {
|
||||
requestId: request.requestId,
|
||||
agentId: "recipient",
|
||||
accepted: true,
|
||||
error: null,
|
||||
...payload,
|
||||
},
|
||||
}),
|
||||
);
|
||||
return request;
|
||||
}
|
||||
|
||||
test("a capable host gets the behavior as asked and returns the applied behavior with guidance", async () => {
|
||||
const { client, transport } = await connect({ agentActiveTurnBehaviors: true });
|
||||
const send = client.sendAgentMessage("recipient", "review", {
|
||||
sourceAgentId: "sender",
|
||||
activeTurnBehavior: "steer",
|
||||
});
|
||||
const request = respond(transport, {
|
||||
deliveryStatus: "queued",
|
||||
activeTurnBehavior: "steer",
|
||||
guidance: "Steering the running turn.",
|
||||
});
|
||||
expect(request.activeTurnBehavior).toBe("steer");
|
||||
await expect(send).resolves.toEqual({
|
||||
deliveryStatus: "queued",
|
||||
activeTurnBehavior: "steer",
|
||||
guidance: "Steering the running turn.",
|
||||
});
|
||||
});
|
||||
|
||||
test("an older host gets its own agent default for queue and refuses a steer", async () => {
|
||||
const { client, transport } = await connect({});
|
||||
const queued = client.sendAgentMessage("recipient", "review", {
|
||||
sourceAgentId: "sender",
|
||||
activeTurnBehavior: "queue",
|
||||
});
|
||||
const request = respond(transport, { deliveryStatus: "queued" });
|
||||
expect("activeTurnBehavior" in request).toBe(false);
|
||||
await expect(queued).resolves.toEqual({ deliveryStatus: "queued" });
|
||||
|
||||
const interrupt = client.sendAgentMessage("recipient", "stop", {
|
||||
sourceAgentId: "sender",
|
||||
activeTurnBehavior: "interrupt",
|
||||
});
|
||||
expect(respond(transport, { deliveryStatus: "queued" }).activeTurnBehavior).toBe("interrupt");
|
||||
await interrupt;
|
||||
|
||||
const sentBefore = transport.sent.length;
|
||||
await expect(
|
||||
client.sendAgentMessage("recipient", "now", {
|
||||
sourceAgentId: "sender",
|
||||
activeTurnBehavior: "steer",
|
||||
}),
|
||||
).rejects.toThrow("Update the Paseo host to steer a running turn from an agent");
|
||||
expect(transport.sent).toHaveLength(sentBefore);
|
||||
});
|
||||
|
||||
test("queue needs an agent sender", async () => {
|
||||
const { client, transport } = await connect({ agentActiveTurnBehaviors: true });
|
||||
await expect(
|
||||
client.sendAgentMessage("recipient", "review", { activeTurnBehavior: "queue" }),
|
||||
).rejects.toThrow('activeTurnBehavior "queue" needs an agent sender');
|
||||
expect(transport.sent).toHaveLength(0);
|
||||
});
|
||||
});
|
||||
|
||||
test("measures an outbound message in UTF-8 bytes against the daemon's message limit", async () => {
|
||||
const mock = createMockTransport();
|
||||
const client = new DaemonClient({
|
||||
|
||||
@@ -47,7 +47,7 @@ import {
|
||||
ShutdownRequestedStatusPayloadSchema,
|
||||
DaemonUpdateResponseSchema,
|
||||
SessionInboundMessageSchema,
|
||||
type ActiveTurnBehavior,
|
||||
type AgentActiveTurnBehavior,
|
||||
type ServerInfoStatusPayload,
|
||||
} from "@getpaseo/protocol/messages";
|
||||
import { validateWSOutboundMessage } from "@getpaseo/protocol/validation/ws-outbound";
|
||||
@@ -481,13 +481,23 @@ export interface DaemonClientTrace {
|
||||
endSection(): void;
|
||||
}
|
||||
|
||||
/** A queued agent message carries the applied behavior and what happens next. */
|
||||
export interface AgentMessageReceipt {
|
||||
deliveryStatus?: "queued";
|
||||
activeTurnBehavior?: AgentActiveTurnBehavior;
|
||||
guidance?: string;
|
||||
}
|
||||
|
||||
export interface SendMessageOptions {
|
||||
sourceAgentId?: string;
|
||||
sourceAgentServerId?: string;
|
||||
sessionMode?: string;
|
||||
messageId?: string;
|
||||
/** Agent sources wait for turn end unless interrupt is explicit. Human sources default to interrupt. */
|
||||
activeTurnBehavior?: ActiveTurnBehavior;
|
||||
/**
|
||||
* Agent sources default to queue: wait for the running turn to end. Human sources default to
|
||||
* interrupt and cannot queue.
|
||||
*/
|
||||
activeTurnBehavior?: AgentActiveTurnBehavior;
|
||||
images?: Array<{ data: string; mimeType: string }>;
|
||||
attachments?: SendAgentMessageRequest["attachments"];
|
||||
}
|
||||
@@ -4262,7 +4272,7 @@ export class DaemonClient {
|
||||
agentId: string,
|
||||
text: string,
|
||||
options: SendMessageOptions = {},
|
||||
): Promise<{ deliveryStatus?: "queued" }> {
|
||||
): Promise<AgentMessageReceipt> {
|
||||
if (
|
||||
options.sourceAgentId &&
|
||||
this.lastServerInfoMessage?.features?.agentMessageProvenance !== true
|
||||
@@ -4275,6 +4285,7 @@ export class DaemonClient {
|
||||
) {
|
||||
throw new Error("Update the Paseo host to send messages with a qualified agent address.");
|
||||
}
|
||||
const activeTurnBehavior = this.activeTurnBehaviorForHost(options);
|
||||
const requestId = this.createRequestId();
|
||||
const messageId = options.messageId ?? crypto.randomUUID();
|
||||
const message = SessionInboundMessageSchema.parse({
|
||||
@@ -4286,7 +4297,7 @@ export class DaemonClient {
|
||||
sourceAgentServerId: options.sourceAgentServerId,
|
||||
sessionMode: options.sessionMode,
|
||||
...(messageId ? { messageId } : {}),
|
||||
activeTurnBehavior: options.activeTurnBehavior,
|
||||
activeTurnBehavior,
|
||||
images: options.images,
|
||||
attachments: options.attachments,
|
||||
});
|
||||
@@ -4307,14 +4318,39 @@ export class DaemonClient {
|
||||
if (!payload.accepted) {
|
||||
throw new Error(payload.error ?? "sendAgentMessage rejected");
|
||||
}
|
||||
return payload.deliveryStatus ? { deliveryStatus: payload.deliveryStatus } : {};
|
||||
return {
|
||||
...(payload.deliveryStatus ? { deliveryStatus: payload.deliveryStatus } : {}),
|
||||
...(payload.activeTurnBehavior ? { activeTurnBehavior: payload.activeTurnBehavior } : {}),
|
||||
...(payload.guidance ? { guidance: payload.guidance } : {}),
|
||||
};
|
||||
}
|
||||
|
||||
/** The behavior to put on the wire for this host. */
|
||||
private activeTurnBehaviorForHost(
|
||||
options: SendMessageOptions,
|
||||
): AgentActiveTurnBehavior | undefined {
|
||||
const requested = options.activeTurnBehavior;
|
||||
if (!options.sourceAgentId) {
|
||||
if (requested === "queue")
|
||||
throw new Error('activeTurnBehavior "queue" needs an agent sender (sourceAgentId).');
|
||||
return requested;
|
||||
}
|
||||
if (this.lastServerInfoMessage?.features?.agentActiveTurnBehaviors === true) return requested;
|
||||
// COMPAT(agentActiveTurnBehaviors): added in v0.17.2, remove after 2027-05-22 once daemon
|
||||
// floor >= v0.17.2. Older hosts reject queue and read an agent's steer as queue, so queue
|
||||
// goes out as the host's own agent default and a real steer needs an update.
|
||||
if (requested === "steer")
|
||||
throw new Error(
|
||||
"Update the Paseo host to steer a running turn from an agent. Leave the behavior out to queue the message, or use interrupt.",
|
||||
);
|
||||
return requested === "interrupt" ? "interrupt" : undefined;
|
||||
}
|
||||
|
||||
async sendMessage(
|
||||
agentId: string,
|
||||
text: string,
|
||||
options?: SendMessageOptions,
|
||||
): Promise<{ deliveryStatus?: "queued" }> {
|
||||
): Promise<AgentMessageReceipt> {
|
||||
return this.sendAgentMessage(agentId, text, options);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@getpaseo/desktop",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"private": true,
|
||||
"description": "Paseo desktop app (Electron wrapper)",
|
||||
"homepage": "https://paseo.sh",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@getpaseo/expo-two-way-audio",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"description": "Native module for two way audio streaming",
|
||||
"keywords": [
|
||||
"ExpoTwoWayAudio",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@getpaseo/highlight",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"files": [
|
||||
"dist",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@getpaseo/plugin",
|
||||
"version": "0.17.0",
|
||||
"version": "0.17.1",
|
||||
"description": "Paseo plugin SDK package",
|
||||
"license": "Apache-2.0",
|
||||
"files": [
|
||||
@@ -78,8 +78,8 @@
|
||||
"use-sync-external-store": "^1.6.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@getpaseo/client": "0.17.0",
|
||||
"@getpaseo/protocol": "0.17.0",
|
||||
"@getpaseo/client": "0.17.1",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"@types/node": "^20.9.0",
|
||||
"@types/react": "~19.2.0",
|
||||
"react": "19.2.3",
|
||||
@@ -89,8 +89,8 @@
|
||||
"zod": "^4.4.3"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@getpaseo/client": "0.17.0",
|
||||
"@getpaseo/protocol": "0.17.0",
|
||||
"@getpaseo/client": "0.17.1",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"react": ">=19.1.0 <20",
|
||||
"react-native": ">=0.81.5",
|
||||
"zod": "^4.4.3"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user