mirror of
https://github.com/getpaseo/paseo.git
synced 2026-11-22 16:25:39 +00:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b5913fd2a2 | ||
|
|
43ec56d07f | ||
|
|
5251a74a6a | ||
|
|
a1ae05e56c | ||
|
|
eda906f6ee |
@@ -50,6 +50,7 @@ desktop:
|
||||
app:
|
||||
- "packages/app/**"
|
||||
- "packages/expo-two-way-audio/**"
|
||||
- "packages/react-native-enriched-markdown/**"
|
||||
|
||||
sdk:
|
||||
- "packages/plugin/**"
|
||||
@@ -80,6 +81,7 @@ browser:
|
||||
- "packages/app/index.ts"
|
||||
- "packages/app/*config.{cjs,js,ts}"
|
||||
- "packages/app/package.json"
|
||||
- "packages/react-native-enriched-markdown/**"
|
||||
|
||||
relay:
|
||||
- "packages/relay/**"
|
||||
|
||||
@@ -20,8 +20,6 @@ env:
|
||||
# CI does not use the CUDA execution provider, and the onnxruntime-node
|
||||
# postinstall download from NuGet is large enough to make npm ci flaky.
|
||||
ONNXRUNTIME_NODE_INSTALL: skip
|
||||
NPM_CONFIG_AUDIT: "false"
|
||||
NPM_CONFIG_FUND: "false"
|
||||
|
||||
jobs:
|
||||
changes:
|
||||
@@ -167,29 +165,8 @@ jobs:
|
||||
- name: Run website tests
|
||||
run: npx vitest run packages/website/src --bail=1
|
||||
|
||||
# WebKit needs about 180 system packages (125 MB) from the Ubuntu mirror. The mirror
|
||||
# sometimes serves them at under 100 kB/s, which turns a 1-minute step into 25 minutes.
|
||||
# Keep the downloaded .deb files in the Actions cache so apt installs them without the mirror.
|
||||
- name: Restore website browser system packages
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/website-browser-debs
|
||||
key: website-browser-debs-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
|
||||
restore-keys: website-browser-debs-${{ runner.os }}-
|
||||
|
||||
- name: Install website test browsers
|
||||
run: |
|
||||
mkdir -p ~/website-browser-debs
|
||||
shopt -s nullglob
|
||||
cached_debs=(~/website-browser-debs/*.deb)
|
||||
if (( ${#cached_debs[@]} > 0 )); then
|
||||
sudo cp "${cached_debs[@]}" /var/cache/apt/archives/
|
||||
fi
|
||||
npx playwright install --with-deps chromium webkit
|
||||
archive_debs=(/var/cache/apt/archives/*.deb)
|
||||
if (( ${#archive_debs[@]} > 0 )); then
|
||||
cp "${archive_debs[@]}" ~/website-browser-debs/
|
||||
fi
|
||||
run: npx playwright install --with-deps chromium webkit
|
||||
|
||||
- name: Verify website mockups
|
||||
run: npm run test:e2e --workspace=@getpaseo/website
|
||||
@@ -489,9 +466,9 @@ jobs:
|
||||
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
|
||||
E2E_WORKERS: "2"
|
||||
# File groups are weighted by observed reporter durations.
|
||||
# Share of the test list per shard, rebalanced from main and PR eight-shard
|
||||
# durations so the slowest and fastest shards meet.
|
||||
PWTEST_SHARD_WEIGHTS: "90:114:100:104:108:112:112:90"
|
||||
# Share of the test list per shard, rebalanced from the Playwright step
|
||||
# minutes of five eight-shard runs so the slowest and fastest shards meet.
|
||||
PWTEST_SHARD_WEIGHTS: "85:94:117:128:91:103:127:85"
|
||||
|
||||
- name: Upload test artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
@@ -605,7 +582,7 @@ jobs:
|
||||
# Source tests do not read PASEO_CLI_TEST_SHARD. Run them once, on the
|
||||
# shortest E2E shard, after its runner has built the server stack.
|
||||
- name: Run CLI source tests
|
||||
if: ${{ env.PASEO_CLI_TEST_SHARD == '2' }}
|
||||
if: ${{ env.PASEO_CLI_TEST_SHARD == '3' }}
|
||||
run: npm run test:unit --workspace=@getpaseo/cli
|
||||
|
||||
# The dependency watchers write build outputs, so run them after the parallel CLI tests.
|
||||
|
||||
+6
-1
@@ -11,5 +11,10 @@
|
||||
"arrowParens": "always",
|
||||
"bracketSameLine": false,
|
||||
"bracketSpacing": true,
|
||||
"ignorePatterns": ["*.lock", "**/*.gen.ts", "**/*.gen.tsx"]
|
||||
"ignorePatterns": [
|
||||
"*.lock",
|
||||
"**/*.gen.ts",
|
||||
"**/*.gen.tsx",
|
||||
"packages/react-native-enriched-markdown/**"
|
||||
]
|
||||
}
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
"options": {
|
||||
"typeAware": false
|
||||
},
|
||||
"ignorePatterns": [".dev/**"],
|
||||
"ignorePatterns": [".dev/**", "packages/react-native-enriched-markdown/**"],
|
||||
"plugins": ["react", "react-perf", "unicorn", "typescript", "oxc", "import", "promise"],
|
||||
"jsPlugins": ["./scripts/oxlint/paseo-plugin.mjs"],
|
||||
"categories": {
|
||||
|
||||
@@ -1,29 +1,5 @@
|
||||
# Changelog
|
||||
|
||||
## 0.17.2 - 2026-11-22
|
||||
|
||||
- **Turn and session stats:** View per-turn and session timing, token, cache, and cost metrics for Claude, OpenCode v2, Pi, Oh My Pi, and plugin providers. ([#10496](https://github.com/getpaseo/paseo/pull/10496), [#10510](https://github.com/getpaseo/paseo/pull/10510))
|
||||
- **Automatic model list refresh:** Enabled providers refresh their model lists in the background every 30 minutes. ([#10481](https://github.com/getpaseo/paseo/pull/10481))
|
||||
- **Sidebar usage by default:** The sidebar usage summary is enabled by default, sources for inactive providers start hidden, and source toggles move to a Sources list. ([#10491](https://github.com/getpaseo/paseo/pull/10491))
|
||||
- **Agents can steer turns:** Agents can steer another agent's running turn alongside queueing or interrupting it, and receive delivery guidance in the response. ([#10483](https://github.com/getpaseo/paseo/pull/10483))
|
||||
|
||||
### Added
|
||||
|
||||
- Added Archive workspace to the mobile workspace actions menu ([#10507](https://github.com/getpaseo/paseo/pull/10507))
|
||||
- Added provider docs links, fuller diagnostic reports, and a scrollable Models list with inline refresh to provider settings ([#10487](https://github.com/getpaseo/paseo/pull/10487))
|
||||
|
||||
### Changed
|
||||
|
||||
- Removed the "This chat uses OpenCode v2." info row from OpenCode v2 chats ([#10490](https://github.com/getpaseo/paseo/pull/10490))
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fixed pressing Tab or Enter in the slash menu running a stale `/exit` choice and archiving the agent ([#10484](https://github.com/getpaseo/paseo/pull/10484) by [@3ae3ae](https://github.com/3ae3ae))
|
||||
- Fixed busy host connections dropping to reconnect when multiple connections are saved ([#10395](https://github.com/getpaseo/paseo/pull/10395))
|
||||
- Fixed retrying an edited New workspace form hitting a conflict error after a failed start, and unified composer error alerts ([#10482](https://github.com/getpaseo/paseo/pull/10482))
|
||||
- Fixed Antigravity turns staying running after creating a recurring schedule ([#10469](https://github.com/getpaseo/paseo/pull/10469))
|
||||
- Fixed daemon startup and plugin reloads leaving zombie child processes for local directory plugins ([#10470](https://github.com/getpaseo/paseo/pull/10470))
|
||||
|
||||
## 0.17.1 - 2026-11-21
|
||||
|
||||
- **Antigravity approvals and history:** Choose a permission mode, answer tool approvals, and import or reopen sessions. Requires [Antigravity CLI 1.5.0 or later](https://paseo.sh/docs/supported-providers/antigravity). ([#10193](https://github.com/getpaseo/paseo/pull/10193))
|
||||
|
||||
@@ -1,29 +1,5 @@
|
||||
# Changelog
|
||||
|
||||
## 0.17.2 - 2026-11-22
|
||||
|
||||
- **回合和会话统计**:查看 Claude、OpenCode v2、Pi、Oh My Pi 和插件 Provider 的单轮及会话耗时、token、缓存和费用指标。([#10496](https://github.com/getpaseo/paseo/pull/10496), [#10510](https://github.com/getpaseo/paseo/pull/10510))
|
||||
- **自动刷新模型列表**:已启用的 Provider 每 30 分钟在后台刷新一次模型列表。([#10481](https://github.com/getpaseo/paseo/pull/10481))
|
||||
- **默认显示侧边栏用量**:侧边栏用量摘要现在默认开启,未启用 Provider 的用量来源默认隐藏,来源开关移至“来源”列表。([#10491](https://github.com/getpaseo/paseo/pull/10491))
|
||||
- **Agent 可引导进行中的轮次**:Agent 除了排队或中断外,现在可以引导另一个 Agent 正在运行的轮次,并在响应中收到投递指引。([#10483](https://github.com/getpaseo/paseo/pull/10483))
|
||||
|
||||
### 新增
|
||||
|
||||
- 在移动端工作区操作菜单中新增“归档工作区” ([#10507](https://github.com/getpaseo/paseo/pull/10507))
|
||||
- 在 Provider 设置中新增文档链接、更完整的诊断报告,以及带内联刷新按钮的可滚动 Models 列表 ([#10487](https://github.com/getpaseo/paseo/pull/10487))
|
||||
|
||||
### 变更
|
||||
|
||||
- 移除 OpenCode v2 对话中的“This chat uses OpenCode v2.”提示行 ([#10490](https://github.com/getpaseo/paseo/pull/10490))
|
||||
|
||||
### 修复
|
||||
|
||||
- 修复在斜杠菜单中按 Tab 或 Enter 时误触发过期的 `/exit` 选项并归档 Agent 的问题 ([#10484](https://github.com/getpaseo/paseo/pull/10484),贡献者:[@3ae3ae](https://github.com/3ae3ae))
|
||||
- 修复保存了多个主机连接时,繁忙的正常连接会断开重连的问题 ([#10395](https://github.com/getpaseo/paseo/pull/10395))
|
||||
- 修复新建工作区启动失败后,修改表单再重试时出现冲突错误的问题,并统一了 Composer 错误提示 ([#10482](https://github.com/getpaseo/paseo/pull/10482))
|
||||
- 修复 Antigravity 创建循环定时任务后轮次一直停留在运行状态的问题 ([#10469](https://github.com/getpaseo/paseo/pull/10469))
|
||||
- 修复启动 daemon 和重载本地目录插件后遗留僵尸子进程的问题 ([#10470](https://github.com/getpaseo/paseo/pull/10470))
|
||||
|
||||
## 0.17.1 - 2026-11-21
|
||||
|
||||
- **Antigravity 审批和历史记录**:选择权限模式、回复工具审批,以及导入或重新打开会话。需要 [Antigravity CLI 1.5.0 或更高版本](https://paseo.sh/zh-CN/docs/supported-providers/antigravity)。([#10193](https://github.com/getpaseo/paseo/pull/10193))
|
||||
|
||||
@@ -56,7 +56,7 @@ At the start of non-trivial work, list `docs/` and skim anything relevant to the
|
||||
| [docs/terminal-rendering.md](docs/terminal-rendering.md) | Native terminal view: xterm owns the grid, cluster placement, emoji widths, mixed-direction limits, render regression |
|
||||
| [docs/agent-stream-performance.md](docs/agent-stream-performance.md) | Assistant text pipeline — coalescing window, paced reveal, why arrival lumps are smoothed at render |
|
||||
| [docs/agent-stream-disclosure.md](docs/agent-stream-disclosure.md) | Expand/collapse in the chat timeline — hold contract, native anchor sequence, frame spacing, render-window cost |
|
||||
| [docs/markdown-renderer.md](docs/markdown-renderer.md) | Shared Markdown engine, native selection, links, images and library constraints |
|
||||
| [docs/markdown-renderer.md](docs/markdown-renderer.md) | Shared Markdown engine, the vendored library fork, native selection, links, images and library constraints |
|
||||
| [docs/native-text-selection.md](docs/native-text-selection.md) | Native diagram grouping, selection boundaries and leading inline image limitations |
|
||||
| [docs/file-observation.md](docs/file-observation.md) | Recursive watcher ownership, Linux constraints, teardown invariants, and Parcel comparison |
|
||||
| [docs/testing.md](docs/testing.md) | TDD workflow, determinism, real dependencies over mocks, test organization |
|
||||
|
||||
@@ -102,7 +102,6 @@ Each agent is stored as a separate JSON file, grouped by project directory.
|
||||
| `config` | `SerializableConfig?` | Agent session configuration (see below) |
|
||||
| `runtimeInfo` | `RuntimeInfo?` | Live runtime state (see below) |
|
||||
| `features` | `AgentFeature[]?` | Provider-reported features (toggles/selects) |
|
||||
| `sessionMetrics` | `AgentMetric[]?` | Provider-reported session metrics, already formatted for display; the latest report replaces the list |
|
||||
| `persistence` | `PersistenceHandle?` | Handle for resuming sessions |
|
||||
| `lastError` | `string?` (nullable) | Last error message, if any |
|
||||
| `requiresAttention` | `boolean?` | Whether the agent needs user attention |
|
||||
|
||||
+2
-2
@@ -78,7 +78,7 @@ In the composer, the first glyph's ink starts on the text column's edge, and the
|
||||
|
||||
One gate, `resolveControlSizing`, picks touch or pointer sizing: touch when the layout is compact or touch is the primary input. An iPad with the sidebar docked is wide and touch-sized; a desktop is pointer-sized; a phone is both compact and touch. The primary input comes from `(pointer: coarse)` (`hasTouchPrimaryPointer` in `hooks/pointer-capabilities.ts`), not from whether a touch screen exists: WebKit keeps touch primary on an iPad with a trackpad attached, and Chromium reports a fine primary pointer for a laptop with a touch screen that its trackpad drives. The fact is read once at startup: attaching a pointer to a tablet does not shrink its controls, and a 2-in-1 launched with a pointer keeps pointer sizes after it switches to tablet mode until the app reloads. Stylesheets take sizes from `bySizing({ touch, pointer })`, which resolves to a breakpoint value, so a caller never sees which sizing it got. Rows, icon buttons and icon slots take theirs from `styles/density.ts`, which uses the same gate. An `{ xs, md }` literal for a hit target or glyph is wrong: on an iPad it yields the pointer size.
|
||||
|
||||
Buttons are pills (`borderRadius.full`) with medium-weight labels; an icon-only button is a circle. `<Switch>` follows the same two sizes: a 34×20 track by default and in `sm`, 44×26 where controls are touch-sized, and it takes presses over its size's control height without adding that height to its row. Buttons, text fields, dropdown triggers, and `<SegmentedControl>` (`packages/app/src/components/ui/segmented-control.tsx`) share the size contract — the same size name means the same height and label size on every control kind, so controls in one row line up. Segments run tighter than a button, because the gap between segments already reads as padding. The selected segment is a `surface3` fill with `foreground` text, not an inverted one — inverting it inside thin chrome puts a white slab in the toolbar. A settings row sizes the controls in its trailing slot itself, default in a card and `sm` when nested (`packages/app/src/components/ui/control-size.tsx`), so don't pass a size to a button, dropdown or field placed in a row. Code that computes with a control's height outside a stylesheet uses `controlHeightForLayout`. Never shrink a control's font or padding locally to fit a context — if the context needs a smaller control, the size tier is missing or the wrong one is in use.
|
||||
Buttons are pills (`borderRadius.full`) with medium-weight labels; an icon-only button is a circle. `<Switch>` follows the same two sizes: a 34×20 track by default and in `sm`, 44×26 where controls are touch-sized, and it reserves its size's control height so a row holding one lines up with a row holding a button. Buttons, text fields, dropdown triggers, and `<SegmentedControl>` (`packages/app/src/components/ui/segmented-control.tsx`) share the size contract — the same size name means the same height and label size on every control kind, so controls in one row line up. Segments run tighter than a button, because the gap between segments already reads as padding. The selected segment is a `surface3` fill with `foreground` text, not an inverted one — inverting it inside thin chrome puts a white slab in the toolbar. A settings row sizes the controls in its trailing slot itself, default in a card and `sm` when nested (`packages/app/src/components/ui/control-size.tsx`), so don't pass a size to a button, dropdown or field placed in a row. Code that computes with a control's height outside a stylesheet uses `controlHeightForLayout`. Never shrink a control's font or padding locally to fit a context — if the context needs a smaller control, the size tier is missing or the wrong one is in use.
|
||||
|
||||
A `<Pressable>` wrapping a `<Text>` is a sixth variant. It is wrong. `<Button>` accepts `style`, `textStyle`, `leftIcon`, `disabled`, `size`, and `variant`.
|
||||
|
||||
@@ -134,7 +134,7 @@ A section or group explains itself through the `info` prop on `<SettingsSection>
|
||||
|
||||
Cards inside a section sit closer than sections. Rows inside a card touch — only the divider separates them. The rhythm is page → spacious; section → spacious; card → tight.
|
||||
|
||||
Rows have generous vertical padding: roughly 16px of content plus 16px of vertical padding for settings rows, 8–12px for sidebar list items where many rows must fit. Every row is at least as tall as one holding a switch, so text rows, switch rows and rows that open something (`<SettingsDetailRow>`, a collapsible row's header) line up. A row holding a button or a select is taller. Compressing rows below the established density to fit more on the screen is wrong. Too many rows means more cards or more sections, not smaller rows.
|
||||
Rows have generous vertical padding: roughly 16px of content plus 16px of vertical padding for settings rows, 8–12px for sidebar list items where many rows must fit. A row that opens something (`<SettingsDetailRow>`, a collapsible row's header) is at least as tall as one holding a default control, so a list where only some of those rows carry a switch keeps one row height. Other rows take their content's height. Compressing rows below the established density to fit more on the screen is wrong. Too many rows means more cards or more sections, not smaller rows.
|
||||
|
||||
Rows revealed under a `<SettingsCollapsibleRow>` are nested rows, one step smaller than card rows: 8px of vertical padding, `fontSize.sm` text, `sm` controls, and one fixed height so rows with and without a trailing button line up. The collapsible row sets this for everything under it (`packages/app/src/components/settings/row-density.tsx`). Never pass a density to a row, and never pad or resize a nested row by hand. Settings rows that share a menu surface with menu rows, such as Usage's options, go inside `<MenuSettingsRows>`, which puts their labels on the menu rows' label rail (`menuRowContentInset`).
|
||||
|
||||
|
||||
@@ -14,19 +14,38 @@ Workspace file links use the shared file-link resolver. The workspace supplies i
|
||||
|
||||
Pass `external` for author-controlled Markdown from outside the host, such as a plugin README. It follows the registry's overview contract in `packages/protocol/src/plugin-overview.ts`, which the website also uses: only absolute https links and images work, and any other destination renders as its label or alt text. The parser still autolinks bare `http://`, `www.` and email text, so a link press checks the URL again and opens only https. None of the workspace recognition above applies, so `Node.js` is prose, not a file. The lines of a paragraph join, as they do on the README's forge.
|
||||
|
||||
Resolve workspace image paths over the existing session RPC, then give the library a cached native file URL or web blob URL. HTTP(S) images pass through unchanged. This preserves relay, SSH and local socket connections, which do not expose a daemon HTTP endpoint. Each mounted renderer owns its image acquisition identity, so a later reply reads a rewritten path again while the earlier mounted reply retains its snapshot. Image taps open the attachment lightbox. File previews resolve relative images against the Markdown file's directory. An image alone on its line becomes its own paragraph before the library sees it, so it renders as a block on every platform; the library only treats sole-child paragraph images as blocks, and with hard soft breaks every newline is a break node, which left own-line images inline on iOS and web. Images that share a line with text stay inline at line height and keep their aspect ratio. A linked image counts as an image, so review-bot badges such as `[](url) Confidence` stay inline on web; the library's web renderer only checked direct paragraph children, so it rendered them as full-width block images (local patch in `patches/react-native-enriched-markdown+*.patch`).
|
||||
Resolve workspace image paths over the existing session RPC, then give the library a cached native file URL or web blob URL. HTTP(S) images pass through unchanged. This preserves relay, SSH and local socket connections, which do not expose a daemon HTTP endpoint. Each mounted renderer owns its image acquisition identity, so a later reply reads a rewritten path again while the earlier mounted reply retains its snapshot. Image taps open the attachment lightbox. File previews resolve relative images against the Markdown file's directory. An image alone on its line becomes its own paragraph before the library sees it, so it renders as a block on every platform; the library only treats sole-child paragraph images as blocks, and with hard soft breaks every newline is a break node, which left own-line images inline on iOS and web. Images that share a line with text stay inline at line height and keep their aspect ratio. A linked image counts as an image, so review-bot badges such as `[](url) Confidence` stay inline on web; the library's web renderer only checked direct paragraph children, so it rendered them as full-width block images (fixed in the fork).
|
||||
|
||||
## The fork
|
||||
|
||||
The library is a private workspace, `packages/react-native-enriched-markdown`. It is upstream [enriched-markdown](https://github.com/software-mansion/enriched-markdown) at npm `1.2.0-nightly-20261014-766fc0e67` (upstream commit `766fc0e67`) plus Paseo's changes, which lived in a `patch-package` patch until the package moved into the repository. It is never published. Keep the name `react-native-enriched-markdown`: autolinking, the Gradle project `:react-native-enriched-markdown`, the CocoaPods spec and app imports all use it.
|
||||
|
||||
The package keeps the npm tarball's layout, including its build output:
|
||||
|
||||
- Metro, Vitest and TypeScript load `lib/`, not `src/`. A JavaScript change edits `src/` and the matching `lib/module` and `lib/typescript` files.
|
||||
- `android/generated` and `ios/generated` are checked-in codegen output (`includesGeneratedCode`). A change to a native component spec regenerates both; `scripts/postinstall-patches.test.mjs` compares them against the specs.
|
||||
- `src/web/wasm/md4c.js` and `lib/module/web/wasm/md4c.js` are an Emscripten build of `cpp/md4c`. A parser change rebuilds them with upstream's `packages/core/cpp/wasm/build.sh`.
|
||||
- Upstream's Gradle, CMake and CocoaPods scripts detect upstream's own monorepo by the paths `packages/core` and a root `vendor/`. Do not add either path to this repository.
|
||||
- `postinstall.mjs` downloads the tree-sitter grammars into the ignored `cpp/highlight/vendor/grammars` and `vendor/tree-sitter`. The `enriched-markdown` block in `packages/app/package.json` chooses the languages.
|
||||
|
||||
CI does not build native code or run the fork's Robolectric suites. Run `npm run test:android --workspace=@getpaseo/app` for Android changes. Native changes require a client rebuild; JavaScript refresh cannot enable compiled grammars.
|
||||
|
||||
Some fork changes are backports. A sync past the upstream version drops them in favour of upstream's code:
|
||||
|
||||
| Fork change | Upstream | Released in |
|
||||
| ----------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------- |
|
||||
| Android measurements survive parent clones | [#924](https://github.com/software-mansion/enriched-markdown/pull/924) | after `1.2.0-nightly-20261019-926ef06f0` |
|
||||
| Android nested list items start their text after their own marker | [#1015](https://github.com/software-mansion/enriched-markdown/pull/1015), [#1023](https://github.com/software-mansion/enriched-markdown/pull/1023) (Android) | `1.2.0` |
|
||||
|
||||
## Engine constraints
|
||||
|
||||
The pinned nightly has the same React Native package and core source trees as upstream commit `73ac5085eb1fdc743973b3473d4dba65abad5261`. Compatibility was checked with React Native 0.81.5. Native dependencies must be rebuilt when changing the highlighting configuration; JavaScript refresh cannot enable compiled grammars.
|
||||
|
||||
Math and video are disabled. Task lists and admonitions are enabled; task checkboxes are read-only. Source adaptation spaces adjacent empty GFM table delimiters before escaping prose spoiler delimiters and decodes entity text before the engine can discard it. Code spans and fences keep their literal source. Comment HTML is normalized to Markdown before parsing; details show their summary and body expanded.
|
||||
|
||||
Mermaid fences use the existing isolated diagram runtime and fullscreen viewer. Web dispatches them through the library’s code-block override. Native has no block-renderer hook, so the renderer extracts only Mermaid fences and places the existing WebView host between library-rendered segments. This is the only block exception; see [native selection limitations](native-text-selection.md) for diagram grouping and leading inline images. Streaming keeps the last valid diagram visible while the next revision renders.
|
||||
|
||||
Native code blocks use the library's copy control and compiled grammars. Web code blocks use `HighlightedCodeBlock` through the library's `renderers.codeBlock` override. Selection copy has to tell links Paseo recognized in the text (paths, forge references, code spans) from links in the Markdown, so the web link renderer marks the recognized ones. Plain-text paste carries them as the text the reply showed, and rich paste keeps them as links only when they point to an `http` or `https` URL. Authored links and parser autolinks such as a bare `www.example.com` copy as links. The patch also keeps the library's block spacing around the web code block override, preserves web list numbering and link titles, marks pending parses with `aria-busy` so Find waits for rendered text, and carries link syntax through native and web tap events. Web inline code inside a link inherits only the link colour; its code font, size and background stay intact. Keep link variants colour-only: native pills replace text runs and prevent paths from wrapping; Android pills also use the surrounding block’s font size. The package patch is tracked by [upstream PR #997](https://github.com/software-mansion/enriched-markdown/pull/997); remove the patch when the pinned release includes it.
|
||||
Native code blocks use the library's copy control and compiled grammars. Web code blocks use `HighlightedCodeBlock` through the library's `renderers.codeBlock` override. Selection copy has to tell links Paseo recognized in the text (paths, forge references, code spans) from links in the Markdown, so the web link renderer marks the recognized ones. Plain-text paste carries them as the text the reply showed, and rich paste keeps them as links only when they point to an `http` or `https` URL. Authored links and parser autolinks such as a bare `www.example.com` copy as links. The fork also keeps the library's block spacing around the web code block override, preserves web list numbering and link titles, marks pending parses with `aria-busy` so Find waits for rendered text, and carries link syntax through native and web tap events. Web inline code inside a link inherits only the link colour; its code font, size and background stay intact. Keep link variants colour-only: native pills replace text runs and prevent paths from wrapping; Android pills also use the surrounding block’s font size. [Upstream PR #997](https://github.com/software-mansion/enriched-markdown/pull/997) tracks these changes.
|
||||
|
||||
The package patch also keeps overflowing native horizontal blocks in control of their drags: Android claims parent interception at touch-down and releases it for vertical drags so the chat list can scroll; iOS keeps its scroll recognizer active for outward drags at the leading edge. This prevents compact sidebar pans from taking block scrolling without changing sidebar swipes on prose or non-overflowing blocks. Native changes require a client rebuild.
|
||||
The fork also keeps overflowing native horizontal blocks in control of their drags: Android claims parent interception at touch-down and releases it for vertical drags so the chat list can scroll; iOS keeps its scroll recognizer active for outward drags at the leading edge. This prevents compact sidebar pans from taking block scrolling without changing sidebar swipes on prose or non-overflowing blocks. Native changes require a client rebuild.
|
||||
|
||||
On iOS a newly mounted Markdown view paints empty for a frame or more after it is laid out at its measured height: the library parses even a view's first content on a background queue and applies it in a later main-queue turn. Expanding a turn in chat therefore shows its rows in place with the text arriving a frame later (165 ms when the mount keeps the main thread busy). Android paints the text in the first frame. Rendering a view's first content synchronously fixes the frame but costs frame time when a fling mounts history rows, so the app keeps the library's behavior until [enriched-markdown #1131](https://github.com/software-mansion/enriched-markdown/issues/1131) is resolved.
|
||||
|
||||
|
||||
+2
-23
@@ -221,32 +221,11 @@ 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, 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
|
||||
aborts the shared refresh signal at the deadline. 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 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.
|
||||
|
||||
Catalogue results stay cached by identity until explicit refresh or a change to that provider's configuration.
|
||||
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.
|
||||
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
- Turn and session stats: View per-turn and session timing, token, cache, and cost metrics for Claude, OpenCode v2, Pi, Oh My Pi, and plugin providers.
|
||||
- Automatic model list refresh: Enabled providers refresh their model lists in the background every 30 minutes.
|
||||
- Sidebar usage by default: The sidebar usage summary is enabled by default, sources for inactive providers start hidden, and source toggles move to a Sources list.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -1,5 +0,0 @@
|
||||
- Turn and session stats: View per-turn and session timing, token, cache, and cost metrics for Claude, OpenCode v2, Pi, Oh My Pi, and plugin providers.
|
||||
- Automatic model list refresh: Enabled providers refresh their model lists in the background every 30 minutes.
|
||||
- Sidebar usage by default: The sidebar usage summary is enabled by default, sources for inactive providers start hidden, and source toggles move to a Sources list.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -1,5 +0,0 @@
|
||||
- Turn and session stats: View per-turn and session timing, token, cache, and cost metrics for Claude, OpenCode v2, Pi, Oh My Pi, and plugin providers.
|
||||
- Automatic model list refresh: Enabled providers refresh their model lists in the background every 30 minutes.
|
||||
- Sidebar usage by default: The sidebar usage summary is enabled by default, sources for inactive providers start hidden, and source toggles move to a Sources list.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -1,5 +0,0 @@
|
||||
- Turn and session stats: View per-turn and session timing, token, cache, and cost metrics for Claude, OpenCode v2, Pi, Oh My Pi, and plugin providers.
|
||||
- Automatic model list refresh: Enabled providers refresh their model lists in the background every 30 minutes.
|
||||
- Sidebar usage by default: The sidebar usage summary is enabled by default, sources for inactive providers start hidden, and source toggles move to a Sources list.
|
||||
|
||||
Full notes: https://paseo.sh/changelog
|
||||
@@ -72,6 +72,7 @@
|
||||
"project": ["src/**/*.ts"]
|
||||
}
|
||||
},
|
||||
"ignoreWorkspaces": ["packages/react-native-enriched-markdown"],
|
||||
"ignoreDependencies": [
|
||||
"sherpa-onnx-node",
|
||||
"@playwright/test",
|
||||
|
||||
@@ -30,6 +30,8 @@ buildNpmPackage {
|
||||
# Exclude mobile-only platform code (we only need the web/electron build)
|
||||
!(lib.hasPrefix "/packages/app/android" relPath)
|
||||
&& !(lib.hasPrefix "/packages/app/ios" relPath)
|
||||
&& !(lib.hasPrefix "/packages/react-native-enriched-markdown/android" relPath)
|
||||
&& !(lib.hasPrefix "/packages/react-native-enriched-markdown/ios" relPath)
|
||||
# Website is unrelated to the desktop app
|
||||
&& !(lib.hasPrefix "/packages/website" relPath)
|
||||
# Documentation, CI definitions and agent/editor configuration. None of
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
sha256-vtzoUMnKaAdBFd/hhnk9p2WwHGgL70RXh26vkkyRIH0=
|
||||
sha256-qZCOSeT264mXP2RcV+eD7lEkc3WAH1re6NjTtbQOHqY=
|
||||
|
||||
Generated
+49
-46
@@ -1,17 +1,18 @@
|
||||
{
|
||||
"name": "paseo",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "paseo",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"hasInstallScript": true,
|
||||
"license": "Apache-2.0",
|
||||
"workspaces": [
|
||||
"plugins",
|
||||
"packages/expo-two-way-audio",
|
||||
"packages/react-native-enriched-markdown",
|
||||
"packages/highlight",
|
||||
"packages/plugin",
|
||||
"packages/protocol",
|
||||
@@ -31902,6 +31903,10 @@
|
||||
"react-native": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/react-native-enriched-markdown": {
|
||||
"resolved": "packages/react-native-enriched-markdown",
|
||||
"link": true
|
||||
},
|
||||
"node_modules/react-native-gesture-handler": {
|
||||
"version": "2.32.0",
|
||||
"resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.32.0.tgz",
|
||||
@@ -37477,7 +37482,7 @@
|
||||
},
|
||||
"packages/app": {
|
||||
"name": "@getpaseo/app",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"dependencies": {
|
||||
"@codemirror/commands": "6.10.4",
|
||||
"@codemirror/language": "6.12.4",
|
||||
@@ -37561,7 +37566,7 @@
|
||||
"react-native": "0.86.3",
|
||||
"react-native-draggable-flatlist": "^4.0.3",
|
||||
"react-native-edge-to-edge": "^1.7.0",
|
||||
"react-native-enriched-markdown": "1.2.0-nightly-20261014-766fc0e67",
|
||||
"react-native-enriched-markdown": "*",
|
||||
"react-native-gesture-handler": "~2.32.0",
|
||||
"react-native-keyboard-controller": "1.21.12",
|
||||
"react-native-nitro-modules": "0.35.5",
|
||||
@@ -39474,23 +39479,6 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"packages/app/node_modules/react-native-enriched-markdown": {
|
||||
"version": "1.2.0-nightly-20261014-766fc0e67",
|
||||
"resolved": "https://registry.npmjs.org/react-native-enriched-markdown/-/react-native-enriched-markdown-1.2.0-nightly-20261014-766fc0e67.tgz",
|
||||
"integrity": "sha512-PyYAAVJAyjlcqHXgSnzxok13MDmyxs/nt46hHIOBdCc0prfaL2Ef6nYkZu7fFCeaETOJXd/xQr4n2/79I+gvdA==",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"katex": ">=0.16.0",
|
||||
"react": "*",
|
||||
"react-native": "*"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"katex": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"packages/app/node_modules/react-native-keyboard-controller": {
|
||||
"version": "1.21.12",
|
||||
"resolved": "https://registry.npmjs.org/react-native-keyboard-controller/-/react-native-keyboard-controller-1.21.12.tgz",
|
||||
@@ -39647,13 +39635,13 @@
|
||||
},
|
||||
"packages/cli": {
|
||||
"name": "@getpaseo/cli",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@clack/prompts": "^1.0.0",
|
||||
"@getpaseo/client": "0.17.2",
|
||||
"@getpaseo/protocol": "0.17.2",
|
||||
"@getpaseo/server": "0.17.2",
|
||||
"@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",
|
||||
@@ -39900,11 +39888,11 @@
|
||||
},
|
||||
"packages/client": {
|
||||
"name": "@getpaseo/client",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@getpaseo/protocol": "0.17.2",
|
||||
"@getpaseo/relay": "0.17.2",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"@getpaseo/relay": "0.17.1",
|
||||
"ws": "^8.20.0",
|
||||
"zod": "^4.4.3"
|
||||
},
|
||||
@@ -39916,7 +39904,7 @@
|
||||
},
|
||||
"packages/desktop": {
|
||||
"name": "@getpaseo/desktop",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@getpaseo/cli": "*",
|
||||
@@ -40159,7 +40147,7 @@
|
||||
},
|
||||
"packages/expo-two-way-audio": {
|
||||
"name": "@getpaseo/expo-two-way-audio",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@types/jest": "^29.5.14",
|
||||
@@ -40205,7 +40193,7 @@
|
||||
},
|
||||
"packages/highlight": {
|
||||
"name": "@getpaseo/highlight",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@codemirror/language": "6.12.4",
|
||||
@@ -40235,7 +40223,7 @@
|
||||
},
|
||||
"packages/plugin": {
|
||||
"name": "@getpaseo/plugin",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@agentclientprotocol/sdk": "^1.4.0",
|
||||
@@ -40243,8 +40231,8 @@
|
||||
"use-sync-external-store": "^1.6.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@getpaseo/client": "0.17.2",
|
||||
"@getpaseo/protocol": "0.17.2",
|
||||
"@getpaseo/client": "0.17.1",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"@types/node": "^20.9.0",
|
||||
"@types/react": "~19.2.0",
|
||||
"react": "19.2.3",
|
||||
@@ -40254,8 +40242,8 @@
|
||||
"zod": "^4.4.3"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@getpaseo/client": "0.17.2",
|
||||
"@getpaseo/protocol": "0.17.2",
|
||||
"@getpaseo/client": "0.17.1",
|
||||
"@getpaseo/protocol": "0.17.1",
|
||||
"react": ">=19.1.0 <20",
|
||||
"react-native": ">=0.81.5",
|
||||
"zod": "^4.4.3"
|
||||
@@ -40277,7 +40265,7 @@
|
||||
},
|
||||
"packages/protocol": {
|
||||
"name": "@getpaseo/protocol",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"semver": "^7.8.5",
|
||||
@@ -40303,9 +40291,24 @@
|
||||
"node": ">=10"
|
||||
}
|
||||
},
|
||||
"packages/react-native-enriched-markdown": {
|
||||
"version": "0.17.1",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"katex": ">=0.16.0",
|
||||
"react": "*",
|
||||
"react-native": "*"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"katex": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"packages/relay": {
|
||||
"name": "@getpaseo/relay",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"@noble/ciphers": "^2.4.0",
|
||||
@@ -40527,17 +40530,17 @@
|
||||
},
|
||||
"packages/server": {
|
||||
"name": "@getpaseo/server",
|
||||
"version": "0.17.2",
|
||||
"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.2",
|
||||
"@getpaseo/highlight": "0.17.2",
|
||||
"@getpaseo/plugin": "0.17.2",
|
||||
"@getpaseo/protocol": "0.17.2",
|
||||
"@getpaseo/relay": "0.17.2",
|
||||
"@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",
|
||||
@@ -41484,7 +41487,7 @@
|
||||
},
|
||||
"packages/website": {
|
||||
"name": "@getpaseo/website",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"dependencies": {
|
||||
"@cloudflare/vite-plugin": "^1.29.1",
|
||||
"@cloudflare/workers-types": "^4.20260317.1",
|
||||
@@ -43095,7 +43098,7 @@
|
||||
},
|
||||
"plugins": {
|
||||
"name": "@getpaseo/builtin-plugins",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"dependencies": {
|
||||
"@getpaseo/plugin": "*",
|
||||
"zod": "^4.4.3"
|
||||
|
||||
+2
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "paseo",
|
||||
"version": "0.17.2",
|
||||
"version": "0.17.1",
|
||||
"private": true,
|
||||
"description": "Paseo: voice-controlled development environment for local AI coding agents",
|
||||
"keywords": [
|
||||
@@ -23,6 +23,7 @@
|
||||
"workspaces": [
|
||||
"plugins",
|
||||
"packages/expo-two-way-audio",
|
||||
"packages/react-native-enriched-markdown",
|
||||
"packages/highlight",
|
||||
"packages/plugin",
|
||||
"packages/protocol",
|
||||
|
||||
@@ -430,8 +430,7 @@ async function expectFooterWithinWidth(page: Page, width: number): Promise<void>
|
||||
const label = page.getByRole("button", { name: /^Worked for/ }).last();
|
||||
await expect(label).toBeVisible();
|
||||
await expectTimingInsideFooter(page);
|
||||
await expect(footer.getByRole("button", { name: "Turn stats" })).toBeVisible();
|
||||
const controls = footer.getByRole("button", { name: /Copy turn|Fork chat|Turn stats/ });
|
||||
const controls = footer.getByRole("button", { name: /Copy turn|Fork chat/ });
|
||||
const before = await controls.evaluateAll((elements) =>
|
||||
elements.map((element) => {
|
||||
const rect = element.getBoundingClientRect();
|
||||
|
||||
@@ -118,8 +118,7 @@ async function exerciseProviderSettingsStack(page: Page) {
|
||||
|
||||
await page.getByRole("button", { name: "Refresh", exact: true }).click();
|
||||
await expectProviderSettingsVisible(page);
|
||||
// The Models header puts the model count before it: "12 · Checked just now".
|
||||
await expect(page.getByText(/Checked just now$/)).toBeVisible({
|
||||
await expect(page.getByText("Checked just now", { exact: true })).toBeVisible({
|
||||
timeout: 30_000,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -34,7 +34,6 @@ import {
|
||||
openUsageFromItem,
|
||||
pinRow,
|
||||
openUsageOptions,
|
||||
openUsageSources,
|
||||
closeUsageOptions,
|
||||
pickUsageHost,
|
||||
usageModalHost,
|
||||
@@ -251,15 +250,16 @@ test.describe("usage modal", () => {
|
||||
await expect(alphaHandle).toHaveCSS("opacity", "1");
|
||||
await alphaHandle.blur();
|
||||
|
||||
// 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);
|
||||
// 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();
|
||||
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"]);
|
||||
await expectUsageCardOrder(page, ["beta:home", "alpha:a", "beta:work"]);
|
||||
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,114 +270,10 @@ test.describe("usage modal", () => {
|
||||
await page.reload();
|
||||
await expectPinnedUsage(page, ["20% Weekly", "31% Weekly"]);
|
||||
await openUsageFromItem(page);
|
||||
await expectUsageCardOrder(page, ["beta:home", "alpha:a"]);
|
||||
await expect(page.getByTestId("usage-report-beta:work")).toHaveCount(0);
|
||||
await expectUsageCardOrder(page, ["beta:home", "alpha:a", "beta:work"]);
|
||||
await expect(page.getByTestId("usage-report-beta:work").getByText("12% used")).toHaveCount(0);
|
||||
});
|
||||
|
||||
for (const [size, viewport] of Object.entries({
|
||||
desktop: { width: 1440, height: 900 },
|
||||
compact: { width: 390, height: 844 },
|
||||
})) {
|
||||
test(`dedicated Sources list manages default-off sources without clutter (${size})`, async ({
|
||||
page,
|
||||
}) => {
|
||||
test.setTimeout(120_000);
|
||||
const [claude, codex] = claudeAndCodexReports();
|
||||
const fetchedAt = twoHoursAgo();
|
||||
await installUsageReportsFixture(page, {
|
||||
lists: [
|
||||
() => [
|
||||
claude!,
|
||||
codex!,
|
||||
{
|
||||
id: "copilot:default",
|
||||
account: {},
|
||||
fetchedAt,
|
||||
sourceId: "copilot",
|
||||
sourceLabel: "GitHub Copilot",
|
||||
defaultEnabled: false,
|
||||
report: {
|
||||
status: "unavailable",
|
||||
problem: { kind: "rejected", status: 403 },
|
||||
},
|
||||
},
|
||||
{
|
||||
id: "cursor:default",
|
||||
account: { label: "dev@example.com" },
|
||||
fetchedAt,
|
||||
sourceId: "cursor",
|
||||
sourceLabel: "Cursor",
|
||||
defaultEnabled: false,
|
||||
report: {
|
||||
status: "available",
|
||||
windows: [
|
||||
{ id: "monthly", label: "Monthly", shortLabel: "mo", summary: true, usedPct: 18 },
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
],
|
||||
});
|
||||
await page.setViewportSize(viewport);
|
||||
await gotoAppShell(page);
|
||||
if (size === "compact") await openCompactSidebar(page);
|
||||
// Only active sources appear in the sidebar summary and modal cards.
|
||||
await expectPinnedUsage(page, ["31% 5h", "54% wk", "7% 5h", "12% wk"]);
|
||||
await openUsageFromItem(page);
|
||||
await expectUsageCardOrder(page, ["claude:default", "codex:default"]);
|
||||
await expect(page.getByTestId("usage-report-copilot:default")).toHaveCount(0);
|
||||
await expect(page.getByTestId("usage-report-cursor:default")).toHaveCount(0);
|
||||
await qaScreenshot(page, `usage-sources-${size}-cards`);
|
||||
|
||||
await openUsageOptions(page);
|
||||
await expect(page.getByTestId("usage-options-sources")).toContainText("2 of 4");
|
||||
await qaScreenshot(page, `usage-sources-${size}-settings`);
|
||||
|
||||
if (size === "compact") {
|
||||
// Compact sheets expose menu rows in the browser Tab order so keyboard users can open
|
||||
// Sources and toggle checkboxes without a pointer.
|
||||
await page.getByTestId("usage-options-sources").focus();
|
||||
await expect(page.getByTestId("usage-options-sources")).toBeFocused();
|
||||
await expect(page.getByTestId("usage-options-sources")).toHaveAttribute("tabindex", "0");
|
||||
await page.keyboard.press("Enter");
|
||||
} else {
|
||||
await openUsageSources(page);
|
||||
}
|
||||
const claudeToggle = page.getByRole("checkbox", { name: /^Claude/ });
|
||||
const copilotToggle = page.getByRole("checkbox", { name: /^GitHub Copilot/ });
|
||||
const cursorToggle = page.getByRole("checkbox", { name: /^Cursor/ });
|
||||
await expect(claudeToggle).toBeChecked();
|
||||
await expect(copilotToggle).not.toBeChecked();
|
||||
await expect(copilotToggle).toContainText("Provider inactive");
|
||||
await qaScreenshot(page, `usage-sources-${size}-list`);
|
||||
|
||||
// Opting into a default-off source brings its card and summary window in immediately.
|
||||
if (size === "compact") {
|
||||
await cursorToggle.focus();
|
||||
await expect(cursorToggle).toBeFocused();
|
||||
await expect(cursorToggle).toHaveAttribute("tabindex", "0");
|
||||
await page.keyboard.press("Space");
|
||||
} else {
|
||||
await cursorToggle.click();
|
||||
}
|
||||
await expect(cursorToggle).toBeChecked();
|
||||
await closeUsageOptions(page);
|
||||
await expectUsageCardOrder(page, ["claude:default", "codex:default", "cursor:default"]);
|
||||
|
||||
// Hiding every source shows a quiet empty state with a shortcut back to Settings.
|
||||
await openUsageSources(page);
|
||||
await page.getByTestId("usage-source-toggle-claude:default").click();
|
||||
await page.getByTestId("usage-source-toggle-codex:default").click();
|
||||
await page.getByTestId("usage-source-toggle-cursor:default").click();
|
||||
await closeUsageOptions(page);
|
||||
await expect(page.getByTestId("usage-all-hidden")).toBeVisible();
|
||||
await expect(page.getByTestId("usage-choose-sources")).toBeVisible();
|
||||
await qaScreenshot(page, `usage-sources-${size}-empty`);
|
||||
await page.getByTestId("usage-choose-sources").click();
|
||||
await expect(page.getByTestId("usage-options-sources")).toContainText("0 of 4");
|
||||
});
|
||||
}
|
||||
|
||||
test("refreshes one report from its card", async ({ page }) => {
|
||||
test.setTimeout(120_000);
|
||||
const serverId = getServerId();
|
||||
|
||||
@@ -291,12 +291,12 @@ test.describe("Usage item", () => {
|
||||
await gotoAppShell(page);
|
||||
const screen = page.getByTestId(`usage-host-${serverId}`);
|
||||
|
||||
await test.step("a fresh device shows default windows 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 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 openSidebarNavSettings(page);
|
||||
await expectFooterItemSetting(page, "usage", true);
|
||||
await expectFooterItemSetting(page, "usage", false);
|
||||
await setFooterItemVisible(page, "usage", true);
|
||||
await qaScreenshot(page, "desktop-settings-sidebar-footer");
|
||||
await page.setViewportSize(COMPACT);
|
||||
await expectFooterItemSetting(page, "usage", true);
|
||||
@@ -308,6 +308,7 @@ 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();
|
||||
@@ -477,7 +478,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 the sidebar summary and pins off and back on", async ({
|
||||
test("the Usage Settings switch turns on the sidebar summary and the pins with it", async ({
|
||||
page,
|
||||
}) => {
|
||||
const serverId = getServerId();
|
||||
@@ -487,17 +488,8 @@ test("the Usage Settings switch turns the sidebar summary and pins off and back
|
||||
const screen = page.getByTestId(`usage-host-${serverId}`);
|
||||
const claude = screen.getByTestId("usage-report-claude:default");
|
||||
|
||||
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 test.step("off by default: no Usage item, and rows that do not pin", async () => {
|
||||
await openUsageFromIcon(page);
|
||||
await expectNoUsageItem(page);
|
||||
await expect(claude.getByText("Session", { exact: true })).toBeVisible({ timeout: 10_000 });
|
||||
await expectUnpinnableRows(claude);
|
||||
@@ -506,7 +498,19 @@ test("the Usage Settings switch turns the sidebar summary and pins off and back
|
||||
await qaScreenshot(page, "usage-summary-off");
|
||||
});
|
||||
|
||||
await test.step("after a reload, turning it back on brings back the saved pins", async () => {
|
||||
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 page.reload();
|
||||
await openUsageFromIcon(page);
|
||||
await expectSummaryInSidebar(page, false);
|
||||
@@ -550,7 +554,6 @@ 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);
|
||||
@@ -566,9 +569,10 @@ test("hidden usage sends no requests until opened", async ({ page }) => {
|
||||
expect(usage.listRequests()).toHaveLength(1);
|
||||
});
|
||||
|
||||
test("visible usage summary requests reports on load by default", async ({ page }) => {
|
||||
test("visible usage summary requests reports on load", 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"]);
|
||||
|
||||
@@ -28,12 +28,13 @@ bounds cannot establish measurement parity.
|
||||
compares them with the shipped headers. This catches missing C++ fields in the
|
||||
measurement path, which the Kotlin tests cannot exercise.
|
||||
|
||||
The package patch contains `InlineCodeFormattingTest`, which exercises actual
|
||||
Android spans in Robolectric native graphics mode, covering draw and measurement,
|
||||
span order, code inside paragraph/heading sizes, bold/italic composition, and
|
||||
links preserving code and emphasized prose fonts.
|
||||
It runs in the existing `test:android` CI job. To run only this regression locally,
|
||||
from `packages/app/android` after Expo prebuild:
|
||||
The vendored library (`packages/react-native-enriched-markdown`) contains
|
||||
`InlineCodeFormattingTest`, which exercises actual Android spans in Robolectric
|
||||
native graphics mode, covering draw and measurement, span order, code inside
|
||||
paragraph/heading sizes, bold/italic composition, and links preserving code and
|
||||
emphasized prose fonts. It runs in `npm run test:android`; CI does not run it.
|
||||
To run only this regression locally, from `packages/app/android` after Expo
|
||||
prebuild:
|
||||
|
||||
```sh
|
||||
./gradlew :react-native-enriched-markdown:testDebugUnitTest \
|
||||
|
||||
@@ -6,7 +6,6 @@ import {
|
||||
type ChildProcess,
|
||||
type SpawnOptions,
|
||||
} from "node:child_process";
|
||||
import { existsSync } from "node:fs";
|
||||
import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
|
||||
import net from "node:net";
|
||||
import { tmpdir } from "node:os";
|
||||
@@ -230,11 +229,7 @@ export async function startIsolatedHostDaemon(
|
||||
stdio: ["ignore", "ignore", "pipe"],
|
||||
detached: false,
|
||||
};
|
||||
const builtSupervisor = path.join(serverDir, "dist/scripts/supervisor-entrypoint.js");
|
||||
const useBuiltSupervisor = Boolean(
|
||||
publishedPackageRoot || (process.env.CI && existsSync(builtSupervisor)),
|
||||
);
|
||||
const spawned = useBuiltSupervisor
|
||||
const spawned = publishedPackageRoot
|
||||
? spawn(process.execPath, ["dist/scripts/supervisor-entrypoint.js"], spawnOptions)
|
||||
: spawnTsx("scripts/supervisor-entrypoint.ts", ["--dev"], spawnOptions);
|
||||
|
||||
|
||||
@@ -567,9 +567,7 @@ export async function expectProviderPageLoaded(page: Page, providerName: string)
|
||||
await expect(page.getByTestId("provider-detail-title")).toHaveText(providerName, {
|
||||
timeout: 30_000,
|
||||
});
|
||||
await expect(page.getByRole("button", { name: "Diagnostic report" })).toBeVisible({
|
||||
timeout: 30_000,
|
||||
});
|
||||
await expect(page.getByText("Provider status")).toBeVisible({ timeout: 30_000 });
|
||||
}
|
||||
|
||||
export async function expectProviderNotOnHost(page: Page): Promise<void> {
|
||||
|
||||
@@ -160,23 +160,11 @@ export async function expectUsageCardOrder(page: Page, reportIds: string[]): Pro
|
||||
.toEqual(reportIds);
|
||||
}
|
||||
|
||||
/** 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();
|
||||
/** 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 });
|
||||
}
|
||||
|
||||
/** Drags a card by its handle until it sits above another card, with the mouse. */
|
||||
@@ -257,14 +245,18 @@ 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, so no row presses or highlights on hover.
|
||||
* but the header's buttons and on/off switch, 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) => node.getAttribute("role") !== "button").length);
|
||||
.evaluateAll(
|
||||
(nodes) =>
|
||||
nodes.filter((node) => !["button", "switch"].includes(node.getAttribute("role") ?? ""))
|
||||
.length,
|
||||
);
|
||||
expect(focusable).toBe(0);
|
||||
}
|
||||
|
||||
@@ -396,7 +388,6 @@ 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.2",
|
||||
"version": "0.17.1",
|
||||
"private": true,
|
||||
"main": "index.ts",
|
||||
"scripts": {
|
||||
@@ -40,7 +40,7 @@
|
||||
"dev:ios": "npm --prefix ../.. run build:client && cross-env APP_VARIANT=development expo run:ios",
|
||||
"build:apk": "npm --prefix ../.. run build:apk",
|
||||
"build:apk:arm64": "npm --prefix ../.. run build:apk:arm64",
|
||||
"test:android": "expo prebuild --platform android --no-install && cd android && ./gradlew :paseo-native-trace:testReleaseUnitTest :paseo-hardware-keyboard:testReleaseUnitTest :react-native-enriched-markdown:testReleaseUnitTest --tests '*InlineCodeFormattingTest' --no-daemon --max-workers=2 -Dorg.gradle.parallel=false"
|
||||
"test:android": "expo prebuild --platform android --no-install && cd android && ./gradlew :paseo-native-trace:testReleaseUnitTest :paseo-hardware-keyboard:testReleaseUnitTest :react-native-enriched-markdown:testReleaseUnitTest --tests '*InlineCodeFormattingTest' --tests '*ListRenderingTest' --tests '*TaskListInteractionTest' --tests '*ListBlockquoteMeasurementTest' --no-daemon --max-workers=2 -Dorg.gradle.parallel=false"
|
||||
},
|
||||
"dependencies": {
|
||||
"@codemirror/commands": "6.10.4",
|
||||
@@ -125,7 +125,7 @@
|
||||
"react-native": "0.86.3",
|
||||
"react-native-draggable-flatlist": "^4.0.3",
|
||||
"react-native-edge-to-edge": "^1.7.0",
|
||||
"react-native-enriched-markdown": "1.2.0-nightly-20261014-766fc0e67",
|
||||
"react-native-enriched-markdown": "*",
|
||||
"react-native-gesture-handler": "~2.32.0",
|
||||
"react-native-keyboard-controller": "1.21.12",
|
||||
"react-native-nitro-modules": "0.35.5",
|
||||
|
||||
-19
@@ -29,25 +29,6 @@ export function agentCommandsQueryRoot(serverId: string) {
|
||||
return [AGENT_COMMANDS_QUERY_ROOT, serverId] as const;
|
||||
}
|
||||
|
||||
function queryCommandsCwd(query: { queryKey: readonly unknown[]; meta?: Record<string, unknown> }) {
|
||||
const isDraft = query.queryKey[2] === "draft";
|
||||
const cwd = query.meta?.agentCommandCwd ?? (isDraft ? query.queryKey[4] : undefined);
|
||||
return typeof cwd === "string" ? normalizeAgentCommandsCwd(cwd) : undefined;
|
||||
}
|
||||
|
||||
/** Marks every catalog for a directory stale. Only observed catalogs refetch; the rest refetch
|
||||
* when next mounted. Used when a provider change is announced without its new snapshot. */
|
||||
export function invalidateCommandsForDirectory(input: {
|
||||
queryClient: QueryClient;
|
||||
serverId: string;
|
||||
cwd: string | null;
|
||||
}): Promise<void> {
|
||||
return input.queryClient.invalidateQueries({
|
||||
queryKey: agentCommandsQueryRoot(input.serverId),
|
||||
predicate: (query) => !input.cwd || queryCommandsCwd(query) === input.cwd,
|
||||
});
|
||||
}
|
||||
|
||||
/** Snapshot announcements contain provider metadata, not command catalogs. Ignore initial
|
||||
* discovery and unrelated providers; explicit refresh still invalidates every catalog. */
|
||||
export function invalidateCommandsForProviderChange(input: {
|
||||
|
||||
@@ -393,39 +393,6 @@ describe("layoutStream", () => {
|
||||
expect(findLayoutItem(layout, thinking.id).toolSequence).toBe("last");
|
||||
});
|
||||
|
||||
it.each(["web", "android"] as const)(
|
||||
"carries turn metrics from the footer's source row on %s",
|
||||
(platform) => {
|
||||
const metrics = [{ label: "Model", value: "opus" }];
|
||||
const earlier = { ...assistantMessage("a1", 2), turnMetrics: metrics };
|
||||
const latest = { ...toolCall("tool-2", 5), turnMetrics: [{ label: "Steps", value: "2" }] };
|
||||
const layout = layoutFor({
|
||||
platform,
|
||||
tail: [userMessage("u1", 1), earlier, toolCall("tool-1", 3), userMessage("u2", 4), latest],
|
||||
});
|
||||
|
||||
expect(findLayoutItem(layout, "tool-1").completedFooter?.turnMetrics).toBe(metrics);
|
||||
expect(layout.auxiliaryTurnFooter?.turnMetrics).toBe(latest.turnMetrics);
|
||||
},
|
||||
);
|
||||
|
||||
it("lays out the footer again when its source row gains turn metrics", () => {
|
||||
const assistant = assistantMessage("a1", 2);
|
||||
const trailing = toolCall("tool-2", 4);
|
||||
const tail = [userMessage("u1", 1), assistant, toolCall("tool-1", 3), trailing];
|
||||
const next = userMessage("u2", 5);
|
||||
const before = layoutFor({ platform: "android", tail: [...tail, next] });
|
||||
|
||||
const metrics = [{ label: "Model", value: "opus" }];
|
||||
const stamped = [...tail];
|
||||
stamped[1] = { ...assistant, turnMetrics: metrics };
|
||||
const after = layoutFor({ platform: "android", tail: [...stamped, next] });
|
||||
|
||||
expect(findLayoutItem(before, trailing.id).completedFooter?.turnMetrics).toBeUndefined();
|
||||
expect(findLayoutItem(after, trailing.id).completedFooter?.turnMetrics).toBe(metrics);
|
||||
expect(findLayoutItem(after, next.id)).toBe(findLayoutItem(before, next.id));
|
||||
});
|
||||
|
||||
it("keeps bottom and inline footer ownership mutually exclusive", () => {
|
||||
const assistant = assistantMessage("a1", 2);
|
||||
const layout = layoutFor({
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import type { TurnTiming } from "@/timeline/turn-time";
|
||||
import type { StreamItem } from "@/types/stream";
|
||||
import { getAssistantMessageSpacing, getGapBetweenStreamItems } from "./spacing";
|
||||
@@ -11,7 +10,6 @@ export interface TurnFooterHost {
|
||||
itemId: string;
|
||||
items: StreamItem[];
|
||||
timing?: TurnTiming;
|
||||
turnMetrics?: AgentMetric[];
|
||||
startIndex: number;
|
||||
}
|
||||
|
||||
@@ -71,15 +69,10 @@ function createTurnFooterHost(input: {
|
||||
index: number;
|
||||
timingByItemId: Map<string, TurnTiming>;
|
||||
}): TurnFooterHost {
|
||||
const turnMetrics =
|
||||
input.item.kind === "assistant_message" || input.item.kind === "tool_call"
|
||||
? input.item.turnMetrics
|
||||
: undefined;
|
||||
return {
|
||||
itemId: input.item.id,
|
||||
items: input.items,
|
||||
timing: input.timingByItemId.get(input.item.id),
|
||||
...(turnMetrics ? { turnMetrics } : {}),
|
||||
startIndex: input.index,
|
||||
};
|
||||
}
|
||||
@@ -254,7 +247,6 @@ function areTurnFooterHostsEqual(
|
||||
return (
|
||||
left.itemId === right.itemId &&
|
||||
left.timing === right.timing &&
|
||||
left.turnMetrics === right.turnMetrics &&
|
||||
left.startIndex === right.startIndex &&
|
||||
left.items === right.items
|
||||
);
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
import React, { act } from "react";
|
||||
import { createRoot, type Root } from "react-dom/client";
|
||||
import { PortalProvider } from "@gorhom/portal";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { page } from "vitest/browser";
|
||||
import { FloatingPanelPortalHost } from "@/components/ui/floating-panel-portal";
|
||||
import { afterEach, beforeEach, expect, it, vi } from "vitest";
|
||||
import { i18n } from "@/i18n/i18next";
|
||||
import type { TurnTiming } from "@/timeline/turn-time";
|
||||
import type { StreamItem } from "@/types/stream";
|
||||
@@ -96,57 +92,3 @@ it.each([
|
||||
"Friday 11:11 PM": 1,
|
||||
});
|
||||
});
|
||||
|
||||
const COMPLETED_TIMING: TurnTiming = { completedAt: FRIDAY_NIGHT, durationMs: 26_000 };
|
||||
|
||||
describe("turn stats", () => {
|
||||
const metrics: AgentMetric[] = [
|
||||
{ label: "Model", value: "opus" },
|
||||
{ label: "Cost", value: "$0.42", tone: "warning" },
|
||||
];
|
||||
|
||||
function renderFooterWithMetrics(turnMetrics?: AgentMetric[]): void {
|
||||
act(() =>
|
||||
root.render(
|
||||
<PortalProvider>
|
||||
<CompletedTurnFooterRow
|
||||
strategy={createNativeStreamStrategy()}
|
||||
items={[reply]}
|
||||
timing={COMPLETED_TIMING}
|
||||
startIndex={0}
|
||||
supportsTimelineCursor={false}
|
||||
turnMetrics={turnMetrics}
|
||||
/>
|
||||
<FloatingPanelPortalHost />
|
||||
</PortalProvider>,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
it("has no trigger when the provider reported nothing for the turn", () => {
|
||||
renderFooterWithMetrics(undefined);
|
||||
|
||||
expect(page.getByRole("button", { name: "Turn stats" }).elements()).toHaveLength(0);
|
||||
});
|
||||
|
||||
it("shows the turn's metrics while the pointer is on the trigger", async () => {
|
||||
renderFooterWithMetrics(metrics);
|
||||
|
||||
await page.getByRole("button", { name: "Turn stats" }).hover();
|
||||
|
||||
const card = page.getByRole("dialog", { name: "Turn stats" });
|
||||
await expect.element(card).toBeVisible();
|
||||
await expect.element(card.getByText("Model")).toBeVisible();
|
||||
await expect.element(card.getByText("opus")).toBeVisible();
|
||||
await expect.element(card.getByText("$0.42")).toBeVisible();
|
||||
});
|
||||
|
||||
it("keeps the footer's height when the trigger appears", () => {
|
||||
renderFooterWithMetrics(undefined);
|
||||
const without = host.getBoundingClientRect().height;
|
||||
|
||||
renderFooterWithMetrics(metrics);
|
||||
|
||||
expect(host.getBoundingClientRect().height).toBe(without);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import React, { memo, useCallback, useMemo, type ReactNode } from "react";
|
||||
import { View } from "react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
@@ -82,7 +81,6 @@ export const TurnFooter = memo(function TurnFooter({
|
||||
items={host.items}
|
||||
timing={host.timing}
|
||||
startIndex={host.startIndex}
|
||||
turnMetrics={host.turnMetrics}
|
||||
supportsTimelineCursor={supportsTimelineCursor}
|
||||
onForkAssistantTurn={onForkAssistantTurn}
|
||||
/>
|
||||
@@ -94,7 +92,6 @@ export const CompletedTurnFooterRow = memo(function CompletedTurnFooterRow({
|
||||
items,
|
||||
timing,
|
||||
startIndex,
|
||||
turnMetrics,
|
||||
supportsTimelineCursor,
|
||||
onForkAssistantTurn,
|
||||
}: {
|
||||
@@ -102,7 +99,6 @@ export const CompletedTurnFooterRow = memo(function CompletedTurnFooterRow({
|
||||
items: StreamItem[];
|
||||
timing?: TurnTiming;
|
||||
startIndex: number;
|
||||
turnMetrics?: AgentMetric[];
|
||||
supportsTimelineCursor: boolean;
|
||||
onForkAssistantTurn?: AssistantTurnForkHandler;
|
||||
}) {
|
||||
@@ -113,7 +109,6 @@ export const CompletedTurnFooterRow = memo(function CompletedTurnFooterRow({
|
||||
items={items}
|
||||
timing={timing}
|
||||
startIndex={startIndex}
|
||||
turnMetrics={turnMetrics}
|
||||
supportsTimelineCursor={supportsTimelineCursor}
|
||||
onForkAssistantTurn={onForkAssistantTurn}
|
||||
/>
|
||||
@@ -170,7 +165,6 @@ function CompletedTurnFooter({
|
||||
items,
|
||||
timing,
|
||||
startIndex,
|
||||
turnMetrics,
|
||||
supportsTimelineCursor,
|
||||
onForkAssistantTurn,
|
||||
}: {
|
||||
@@ -178,7 +172,6 @@ function CompletedTurnFooter({
|
||||
items: StreamItem[];
|
||||
timing?: TurnTiming;
|
||||
startIndex: number;
|
||||
turnMetrics?: AgentMetric[];
|
||||
supportsTimelineCursor: boolean;
|
||||
onForkAssistantTurn?: AssistantTurnForkHandler;
|
||||
}) {
|
||||
@@ -212,7 +205,6 @@ function CompletedTurnFooter({
|
||||
completedAt={timing?.completedAt}
|
||||
durationMs={timing?.durationMs}
|
||||
onFork={boundary && onForkAssistantTurn ? handleFork : undefined}
|
||||
metrics={turnMetrics}
|
||||
/>
|
||||
</View>
|
||||
);
|
||||
|
||||
@@ -188,7 +188,6 @@ function renderStreamItemWithTurnFooter(input: {
|
||||
items={footerHost.items}
|
||||
timing={footerHost.timing}
|
||||
startIndex={footerHost.startIndex}
|
||||
turnMetrics={footerHost.turnMetrics}
|
||||
supportsTimelineCursor={input.supportsTimelineCursor}
|
||||
onForkAssistantTurn={input.onForkAssistantTurn}
|
||||
/>
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
import React, { act } from "react";
|
||||
import { createRoot, type Root } from "react-dom/client";
|
||||
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import { afterEach, beforeEach, expect, it, vi } from "vitest";
|
||||
import { page } from "vitest/browser";
|
||||
import { i18n } from "@/i18n/i18next";
|
||||
import { ContextWindowDetails } from "./context-window-details";
|
||||
|
||||
const CONTEXT = { percentage: 40, usedTokens: 80_000, maxTokens: 200_000 };
|
||||
|
||||
let root: Root;
|
||||
let host: HTMLDivElement;
|
||||
|
||||
beforeEach(async () => {
|
||||
await i18n.changeLanguage("en");
|
||||
vi.stubGlobal("React", React);
|
||||
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
|
||||
host = document.createElement("div");
|
||||
document.body.appendChild(host);
|
||||
root = createRoot(host);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
act(() => root.unmount());
|
||||
host.remove();
|
||||
vi.unstubAllGlobals();
|
||||
});
|
||||
|
||||
function renderDetails(sessionMetrics: AgentMetric[]): void {
|
||||
act(() =>
|
||||
root.render(
|
||||
<QueryClientProvider client={new QueryClient()}>
|
||||
<ContextWindowDetails
|
||||
serverId="server"
|
||||
agentId="agent"
|
||||
context={CONTEXT}
|
||||
sessionCost="$1.20"
|
||||
sessionMetrics={sessionMetrics}
|
||||
showTitle
|
||||
refreshable={false}
|
||||
/>
|
||||
</QueryClientProvider>,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
it("shows what the provider reports about the session", async () => {
|
||||
renderDetails([
|
||||
{ label: "Model", value: "opus" },
|
||||
{ label: "Requests", value: "12" },
|
||||
]);
|
||||
|
||||
await expect.element(page.getByText("Model")).toBeVisible();
|
||||
await expect.element(page.getByText("opus")).toBeVisible();
|
||||
await expect.element(page.getByText("Requests")).toBeVisible();
|
||||
await expect.element(page.getByText("Session cost $1.20")).toBeVisible();
|
||||
});
|
||||
|
||||
it("leaves the cost to the provider when it reports one", async () => {
|
||||
renderDetails([{ label: "Cost", value: "$1.25" }]);
|
||||
|
||||
await expect.element(page.getByText("$1.25")).toBeVisible();
|
||||
expect(page.getByText("Session cost $1.20").elements()).toHaveLength(0);
|
||||
});
|
||||
@@ -1,10 +1,8 @@
|
||||
import { Text, View } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import { AgentUsage } from "@/usage";
|
||||
import { formatTokenCount } from "./context-window-meter.utils";
|
||||
import { MetricsList } from "./metrics-list";
|
||||
|
||||
interface ContextWindowDetailsProps {
|
||||
serverId: string;
|
||||
@@ -15,8 +13,6 @@ interface ContextWindowDetailsProps {
|
||||
maxTokens: number;
|
||||
} | null;
|
||||
sessionCost: string | null;
|
||||
/** What the provider reports about the session. A reported cost replaces `sessionCost`. */
|
||||
sessionMetrics: AgentMetric[];
|
||||
/** The hover card and tooltip title themselves; the sheet's header carries the title instead. */
|
||||
showTitle: boolean;
|
||||
/** Whether the usage cards have a Refresh button; without one they show their freshness. */
|
||||
@@ -24,22 +20,18 @@ interface ContextWindowDetailsProps {
|
||||
}
|
||||
|
||||
/**
|
||||
* What the context window meter opens: how full the window is, what the provider reports about the
|
||||
* session, then the usage of the agent's account. The desktop hover card, the native wide tooltip, and the compact sheet all render it.
|
||||
* What the context window meter opens: how full the window is, then the usage of the agent's
|
||||
* account. The desktop hover card, the native wide tooltip, and the compact sheet all render it.
|
||||
*/
|
||||
export function ContextWindowDetails({
|
||||
serverId,
|
||||
agentId,
|
||||
context,
|
||||
sessionCost,
|
||||
sessionMetrics,
|
||||
showTitle,
|
||||
refreshable,
|
||||
}: ContextWindowDetailsProps) {
|
||||
const { t } = useTranslation();
|
||||
const providerReportsCost = sessionMetrics.some(
|
||||
(metric) => metric.label.toLowerCase() === "cost",
|
||||
);
|
||||
return (
|
||||
<>
|
||||
<View style={styles.summary}>
|
||||
@@ -59,11 +51,10 @@ export function ContextWindowDetails({
|
||||
) : (
|
||||
<Text style={styles.detail}>{t("contextWindow.noData")}</Text>
|
||||
)}
|
||||
{sessionCost && !providerReportsCost ? (
|
||||
{sessionCost ? (
|
||||
<Text style={styles.detail}>{t("contextWindow.sessionCost", { cost: sessionCost })}</Text>
|
||||
) : null}
|
||||
</View>
|
||||
{sessionMetrics.length > 0 ? <MetricsList metrics={sessionMetrics} /> : null}
|
||||
<AgentUsage serverId={serverId} agentId={agentId} refreshable={refreshable} />
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -13,12 +13,11 @@ import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/h
|
||||
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { isNative } from "@/constants/platform";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import { useHostReportsUsage } from "@/usage";
|
||||
import type { Theme } from "@/styles/theme";
|
||||
import { TOOLBAR_DISC_SIZE, type ToolbarRing } from "@/components/ui/control-geometry";
|
||||
import { ContextWindowDetails } from "./context-window-details";
|
||||
import { DetailsSheet } from "./details-sheet";
|
||||
import { ContextWindowSheet } from "./context-window-sheet";
|
||||
import { formatContextPercentage } from "./context-window-meter.utils";
|
||||
|
||||
interface ContextWindowMeterProps {
|
||||
@@ -27,14 +26,11 @@ interface ContextWindowMeterProps {
|
||||
maxTokens: number | null;
|
||||
usedTokens: number | null;
|
||||
totalCostUsd?: number | null;
|
||||
/** What the provider reports about the session, shown in the details. */
|
||||
sessionMetrics?: AgentMetric[];
|
||||
showPercentage?: boolean;
|
||||
/** The ring's box and stroke when it sits in an icon toolbar. */
|
||||
toolbarRing?: ToolbarRing;
|
||||
}
|
||||
|
||||
const EMPTY_METRICS: AgentMetric[] = [];
|
||||
const SVG_SIZE = 14;
|
||||
const USAGE_POPOVER_WIDTH = 300;
|
||||
const COMPACT_SVG_SIZE = 12;
|
||||
@@ -160,16 +156,13 @@ export function ContextWindowMeter({
|
||||
maxTokens,
|
||||
usedTokens,
|
||||
totalCostUsd,
|
||||
sessionMetrics = EMPTY_METRICS,
|
||||
showPercentage = false,
|
||||
toolbarRing,
|
||||
}: ContextWindowMeterProps) {
|
||||
const { t, i18n } = useTranslation();
|
||||
const { width } = useWindowDimensions();
|
||||
// Usage cards and session metrics need a wider popover; without them it keeps the plain tooltip
|
||||
// shape.
|
||||
// Usage cards need a wider popover; without them it keeps the plain tooltip shape.
|
||||
const showsUsage = useHostReportsUsage(serverId);
|
||||
const isWide = showsUsage || sessionMetrics.length > 0;
|
||||
const popoverWidth = Math.min(USAGE_POPOVER_WIDTH, width - 24);
|
||||
// Compact screens open the details in a sheet, which can hold a pressable Refresh.
|
||||
const isCompact = useIsCompactFormFactor();
|
||||
@@ -233,22 +226,21 @@ export function ContextWindowMeter({
|
||||
{ring}
|
||||
{percentageLabel}
|
||||
</Pressable>
|
||||
<DetailsSheet open={isSheetOpen} onClose={closeSheet} title={t("contextWindow.title")}>
|
||||
<ContextWindowSheet open={isSheetOpen} onClose={closeSheet}>
|
||||
<ContextWindowDetails
|
||||
serverId={serverId}
|
||||
agentId={agentId}
|
||||
context={context}
|
||||
sessionCost={formattedSessionCost}
|
||||
sessionMetrics={sessionMetrics}
|
||||
showTitle={false}
|
||||
refreshable
|
||||
/>
|
||||
</DetailsSheet>
|
||||
</ContextWindowSheet>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
const popoverStyle = isWide
|
||||
const popoverStyle = showsUsage
|
||||
? [styles.usagePopover, { width: popoverWidth }]
|
||||
: styles.plainPopover;
|
||||
|
||||
@@ -272,7 +264,7 @@ export function ContextWindowMeter({
|
||||
side="top"
|
||||
align="center"
|
||||
offset={8}
|
||||
maxWidth={isWide ? popoverWidth : undefined}
|
||||
maxWidth={showsUsage ? popoverWidth : undefined}
|
||||
style={popoverStyle}
|
||||
testID="context-window-meter-tooltip"
|
||||
>
|
||||
@@ -281,7 +273,6 @@ export function ContextWindowMeter({
|
||||
agentId={agentId}
|
||||
context={context}
|
||||
sessionCost={formattedSessionCost}
|
||||
sessionMetrics={sessionMetrics}
|
||||
showTitle
|
||||
refreshable={false}
|
||||
/>
|
||||
@@ -316,7 +307,6 @@ export function ContextWindowMeter({
|
||||
agentId={agentId}
|
||||
context={context}
|
||||
sessionCost={formattedSessionCost}
|
||||
sessionMetrics={sessionMetrics}
|
||||
showTitle
|
||||
refreshable
|
||||
/>
|
||||
|
||||
+8
-9
@@ -1,6 +1,7 @@
|
||||
import { useMemo, type ReactNode } from "react";
|
||||
import { View, useWindowDimensions } from "react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { BottomSheetScrollView } from "@gorhom/bottom-sheet";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
import { SheetHeaderView, SHEET_HORIZONTAL_PADDING_SCALE } from "@/components/adaptive-modal-sheet";
|
||||
@@ -22,24 +23,23 @@ const ThemedBottomSheetModal = withUnistyles(IsolatedBottomSheetModal, (theme) =
|
||||
}));
|
||||
|
||||
/**
|
||||
* What a hover card or tooltip shows on wide screens, shown on compact screens in a sheet as tall
|
||||
* as its content. Gorhom mounts the content only while the sheet is presented, so whatever it
|
||||
* fetches stops once the sheet closes.
|
||||
* The context window meter's details on compact screens, in a sheet as tall as its content.
|
||||
* Gorhom mounts the content only while the sheet is presented, so whatever it fetches stops once
|
||||
* the sheet closes.
|
||||
*/
|
||||
export function DetailsSheet({
|
||||
export function ContextWindowSheet({
|
||||
open,
|
||||
onClose,
|
||||
title,
|
||||
children,
|
||||
}: {
|
||||
open: boolean;
|
||||
onClose: () => void;
|
||||
title: string;
|
||||
children: ReactNode;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const { height } = useWindowDimensions();
|
||||
const insets = useSafeAreaInsets();
|
||||
const header = useMemo(() => ({ title }), [title]);
|
||||
const header = useMemo(() => ({ title: t("contextWindow.title") }), [t]);
|
||||
const scrollContentStyle = useMemo(() => ({ paddingBottom: insets.bottom }), [insets.bottom]);
|
||||
const { sheetRef, handleSheetChange, handleSheetDismiss } = useIsolatedBottomSheetVisibility({
|
||||
visible: open,
|
||||
@@ -50,8 +50,7 @@ export function DetailsSheet({
|
||||
<ThemedBottomSheetModal
|
||||
ref={sheetRef}
|
||||
contextBridge={null}
|
||||
// Content-sized rather than fixed snap points: a few rows of details, or usage cards that
|
||||
// stream in one at a time.
|
||||
// Content-sized rather than fixed snap points: the usage cards stream in one at a time.
|
||||
enableDynamicSizing
|
||||
maxDynamicContentSize={height * 0.8}
|
||||
onChange={handleSheetChange}
|
||||
@@ -3,7 +3,6 @@ import { MessagePreview, MessageSender } from "@/components/user-message";
|
||||
import { useStableEvent } from "@/hooks/use-stable-event";
|
||||
import { getAgentAttachmentPillContent } from "@/attachments/attachment-pill-content";
|
||||
import { AssistantForkMenu, type AssistantForkTarget } from "@/components/assistant-fork-menu";
|
||||
import { TurnMetricsButton } from "@/components/turn-metrics";
|
||||
import { AttachmentLightbox, type ImageLightboxSource } from "@/components/attachment-lightbox";
|
||||
import {
|
||||
AttachmentFrame,
|
||||
@@ -37,11 +36,7 @@ import { useToolCallExpanded } from "@/tool-calls/expansion-context";
|
||||
import { useTargetAgentTitle } from "@/tool-calls/use-target-agent-title";
|
||||
import type { DaemonClient } from "@getpaseo/client/internal/daemon-client";
|
||||
import type { AgentMessage } from "@getpaseo/protocol/agent-message";
|
||||
import type {
|
||||
AgentCapabilityFlags,
|
||||
AgentMetric,
|
||||
ToolCallDetail,
|
||||
} from "@getpaseo/protocol/agent-types";
|
||||
import type { AgentCapabilityFlags, ToolCallDetail } from "@getpaseo/protocol/agent-types";
|
||||
import type { AgentAttachment } from "@getpaseo/protocol/messages";
|
||||
import MaskedView from "@react-native-masked-view/masked-view";
|
||||
import {
|
||||
@@ -565,8 +560,6 @@ interface AssistantTurnFooterProps {
|
||||
completedAt?: Date;
|
||||
durationMs?: number | null;
|
||||
onFork?: (target: AssistantForkTarget) => Promise<void> | void;
|
||||
/** What the provider reported about the turn. Without any, the footer has no stats button. */
|
||||
metrics?: AgentMetric[];
|
||||
}
|
||||
|
||||
const assistantTurnFooterStylesheet = StyleSheet.create((theme) => ({
|
||||
@@ -603,8 +596,6 @@ const assistantTurnFooterStylesheet = StyleSheet.create((theme) => ({
|
||||
flexShrink: 0,
|
||||
color: theme.colors.foregroundMuted,
|
||||
fontSize: STREAM_METADATA_FONT_SIZE,
|
||||
// React Native Web preserves trailing spaces at line wraps by default.
|
||||
...(isWeb ? { whiteSpace: "normal" } : {}),
|
||||
},
|
||||
overlappingLabel: {
|
||||
marginLeft: "-100%",
|
||||
@@ -626,7 +617,6 @@ export const AssistantTurnFooter = memo(function AssistantTurnFooter({
|
||||
completedAt,
|
||||
durationMs,
|
||||
onFork,
|
||||
metrics,
|
||||
}: AssistantTurnFooterProps) {
|
||||
const { t } = useTranslation();
|
||||
const [hovered, setHovered] = useState(false);
|
||||
@@ -676,11 +666,10 @@ export const AssistantTurnFooter = memo(function AssistantTurnFooter({
|
||||
[onFork],
|
||||
);
|
||||
const canFork = Boolean(onFork);
|
||||
const hasMetrics = metrics !== undefined && metrics.length > 0;
|
||||
|
||||
return (
|
||||
<View style={assistantTurnFooterStylesheet.container}>
|
||||
{getContent || canFork || hasMetrics ? (
|
||||
{getContent || canFork ? (
|
||||
<View style={assistantTurnFooterStylesheet.actions}>
|
||||
{getContent ? (
|
||||
<TurnCopyButton
|
||||
@@ -689,7 +678,6 @@ export const AssistantTurnFooter = memo(function AssistantTurnFooter({
|
||||
/>
|
||||
) : null}
|
||||
{canFork ? <AssistantForkMenu onFork={handleFork} /> : null}
|
||||
{hasMetrics ? <TurnMetricsButton metrics={metrics} /> : null}
|
||||
</View>
|
||||
) : null}
|
||||
{primaryLabel ? (
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
import { memo } from "react";
|
||||
import { Text, View } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
|
||||
/**
|
||||
* Label and value rows a provider reports for a session or a turn. The provider owns the words and
|
||||
* the tone; the list only lines them up.
|
||||
*/
|
||||
export const MetricsList = memo(function MetricsList({
|
||||
metrics,
|
||||
testID,
|
||||
}: {
|
||||
metrics: AgentMetric[];
|
||||
testID?: string;
|
||||
}) {
|
||||
return (
|
||||
<View style={styles.list} testID={testID}>
|
||||
{metrics.map((metric) => (
|
||||
<View key={metric.label} style={styles.row}>
|
||||
<Text style={styles.label} numberOfLines={1}>
|
||||
{metric.label}
|
||||
</Text>
|
||||
<Text style={[styles.value, toneStyle(metric.tone)]} numberOfLines={1}>
|
||||
{metric.value}
|
||||
</Text>
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
);
|
||||
});
|
||||
|
||||
function toneStyle(tone: AgentMetric["tone"]) {
|
||||
switch (tone) {
|
||||
case "ok":
|
||||
return styles.ok;
|
||||
case "warning":
|
||||
return styles.warning;
|
||||
case "danger":
|
||||
return styles.danger;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
list: {
|
||||
gap: theme.spacing[1.5],
|
||||
},
|
||||
row: {
|
||||
flexDirection: "row",
|
||||
alignItems: "baseline",
|
||||
gap: theme.spacing[6],
|
||||
},
|
||||
label: {
|
||||
flexShrink: 1,
|
||||
color: theme.colors.foregroundMuted,
|
||||
fontSize: theme.fontSize.sm,
|
||||
lineHeight: theme.fontSize.sm * 1.4,
|
||||
},
|
||||
value: {
|
||||
flex: 1,
|
||||
textAlign: "right",
|
||||
color: theme.colors.foreground,
|
||||
fontSize: theme.fontSize.sm,
|
||||
lineHeight: theme.fontSize.sm * 1.4,
|
||||
fontVariant: ["tabular-nums"],
|
||||
},
|
||||
ok: { color: theme.colors.statusSuccess },
|
||||
warning: { color: theme.colors.statusWarning },
|
||||
danger: { color: theme.colors.statusDanger },
|
||||
}));
|
||||
@@ -1,15 +1,13 @@
|
||||
import { AppearanceText as Text } from "@/appearance/text";
|
||||
import { ChevronRight } from "lucide-react-native";
|
||||
import { useMemo, type ReactNode } from "react";
|
||||
import { Platform, ScrollView, View, type PressableStateCallbackType } from "react-native";
|
||||
import { Platform, ScrollView, View } from "react-native";
|
||||
import { KeyboardAwareScrollView } from "react-native-keyboard-controller";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { BackHeader } from "@/components/headers/back-header";
|
||||
import { MenuHeader } from "@/components/headers/menu-header";
|
||||
import { PressHighlight } from "@/components/ui/press-highlight";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { ICON_SIZE, SPACING, type Theme } from "@/styles/theme";
|
||||
import { SPACING } from "@/styles/theme";
|
||||
|
||||
const PageScrollView = Platform.OS === "android" ? KeyboardAwareScrollView : ScrollView;
|
||||
|
||||
@@ -60,7 +58,14 @@ export function PageLayout({
|
||||
testID={testID}
|
||||
>
|
||||
<View style={width === "wide" ? styles.contentWide : styles.content}>
|
||||
{showTitle ? <PageTitle title={title} actions={actions} testID={titleTestID} /> : null}
|
||||
{showTitle ? (
|
||||
<View style={styles.titleRow} testID={titleTestID}>
|
||||
<Text style={styles.title} testID="page-title">
|
||||
{title}
|
||||
</Text>
|
||||
{actions}
|
||||
</View>
|
||||
) : null}
|
||||
{children}
|
||||
</View>
|
||||
</PageScrollView>
|
||||
@@ -68,77 +73,6 @@ export function PageLayout({
|
||||
);
|
||||
}
|
||||
|
||||
/** The page that holds this one. Its name is the first part of the title and goes back to it. */
|
||||
export interface PageTitleParent {
|
||||
label: string;
|
||||
/** What the press does, such as "Back to providers". */
|
||||
accessibilityLabel: string;
|
||||
onPress: () => void;
|
||||
testID?: string;
|
||||
}
|
||||
|
||||
interface PageTitleProps {
|
||||
parent?: PageTitleParent;
|
||||
/** Drawn before the title, such as the icon of the thing the page is about. */
|
||||
icon?: ReactNode;
|
||||
title?: string;
|
||||
/** A control that belongs to the title, drawn right after it. */
|
||||
adornment?: ReactNode;
|
||||
/** Controls for the whole page, drawn at the trailing edge. */
|
||||
actions?: ReactNode;
|
||||
testID?: string;
|
||||
titleTestID?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* The heading of a desktop page. A page that opens from another page, such as one provider from
|
||||
* Providers, names that page first: "Providers > Antigravity".
|
||||
*/
|
||||
export function PageTitle({
|
||||
parent,
|
||||
icon,
|
||||
title,
|
||||
adornment,
|
||||
actions,
|
||||
testID,
|
||||
titleTestID = "page-title",
|
||||
}: PageTitleProps) {
|
||||
return (
|
||||
<View style={styles.titleRow} testID={testID}>
|
||||
<View style={styles.titleParts}>
|
||||
{parent ? (
|
||||
<PressHighlight
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={parent.accessibilityLabel}
|
||||
onPress={parent.onPress}
|
||||
testID={parent.testID}
|
||||
>
|
||||
{({ hovered }: PressableStateCallbackType & { hovered?: boolean }) => (
|
||||
<Text style={[styles.title, styles.parent, hovered && styles.parentHovered]}>
|
||||
{parent.label}
|
||||
</Text>
|
||||
)}
|
||||
</PressHighlight>
|
||||
) : null}
|
||||
{parent && title !== undefined ? (
|
||||
<ThemedChevronRight size={ICON_SIZE.lg} uniProps={separatorColor} />
|
||||
) : null}
|
||||
{icon}
|
||||
{title !== undefined ? (
|
||||
<Text style={[styles.title, styles.titleLeaf]} numberOfLines={1} testID={titleTestID}>
|
||||
{title}
|
||||
</Text>
|
||||
) : null}
|
||||
{adornment}
|
||||
</View>
|
||||
{actions}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
const ThemedChevronRight = withUnistyles(ChevronRight);
|
||||
const separatorColor = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
container: {
|
||||
flex: 1,
|
||||
@@ -168,27 +102,11 @@ const styles = StyleSheet.create((theme) => ({
|
||||
gap: theme.spacing[4],
|
||||
marginBottom: theme.spacing[6],
|
||||
},
|
||||
titleParts: {
|
||||
title: {
|
||||
// Line up with the section titles, which sit inset from their cards.
|
||||
marginLeft: theme.spacing[1],
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: theme.spacing[2],
|
||||
flexShrink: 1,
|
||||
minWidth: 0,
|
||||
},
|
||||
title: {
|
||||
fontSize: theme.fontSize["4xl"],
|
||||
fontWeight: theme.fontWeight.medium,
|
||||
color: theme.colors.foreground,
|
||||
},
|
||||
titleLeaf: {
|
||||
flexShrink: 1,
|
||||
},
|
||||
parent: {
|
||||
color: theme.colors.foregroundMuted,
|
||||
},
|
||||
parentHovered: {
|
||||
color: theme.colors.foreground,
|
||||
},
|
||||
}));
|
||||
|
||||
@@ -2,9 +2,7 @@ import { ArrowLeft } from "lucide-react-native";
|
||||
import type { ReactNode } from "react";
|
||||
import { Text, View } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { PageTitle, type PageTitleParent } from "@/components/page-layout";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
|
||||
/**
|
||||
* "Back to …" above a settings detail page on wide layouts, where the page has no header of its
|
||||
@@ -34,43 +32,32 @@ export function SettingsBackLink({
|
||||
}
|
||||
|
||||
/**
|
||||
* The top of a settings detail page: the icon and name of the thing the page is about, with an
|
||||
* optional action after the name. On wide layouts it is the page's title and names the parent page
|
||||
* first, which goes back to it. On compact layouts the back header already names the parent.
|
||||
* The top of a settings detail page: "Back to …" when the page has no header of its own, then the
|
||||
* icon and name the page is about, with an optional action after the name.
|
||||
*/
|
||||
export function SettingsDetailHeader({
|
||||
parent,
|
||||
back,
|
||||
icon,
|
||||
title,
|
||||
trailing,
|
||||
titleTestID,
|
||||
}: {
|
||||
parent: PageTitleParent;
|
||||
icon?: ReactNode;
|
||||
/** Absent while the page has nothing to name, such as a project that no longer exists. */
|
||||
title?: string;
|
||||
back?: { label: string; onPress: () => void; testID?: string };
|
||||
icon: ReactNode;
|
||||
title: string;
|
||||
trailing?: ReactNode;
|
||||
titleTestID?: string;
|
||||
}) {
|
||||
const isCompact = useIsCompactFormFactor();
|
||||
if (!isCompact)
|
||||
return (
|
||||
<PageTitle
|
||||
parent={parent}
|
||||
icon={icon}
|
||||
title={title}
|
||||
adornment={trailing}
|
||||
titleTestID={titleTestID}
|
||||
/>
|
||||
);
|
||||
if (title === undefined) return null;
|
||||
return (
|
||||
<View style={styles.titleRow}>
|
||||
{icon}
|
||||
<Text style={styles.title} numberOfLines={1} testID={titleTestID}>
|
||||
{title}
|
||||
</Text>
|
||||
{trailing}
|
||||
<View style={styles.header}>
|
||||
{back ? <SettingsBackLink {...back} /> : null}
|
||||
<View style={styles.titleRow}>
|
||||
{icon}
|
||||
<Text style={styles.title} numberOfLines={1} testID={titleTestID}>
|
||||
{title}
|
||||
</Text>
|
||||
{trailing}
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
@@ -80,13 +67,15 @@ const styles = StyleSheet.create((theme) => ({
|
||||
alignSelf: "flex-start",
|
||||
paddingHorizontal: 0,
|
||||
},
|
||||
header: {
|
||||
gap: theme.spacing[2],
|
||||
marginBottom: theme.spacing[4],
|
||||
},
|
||||
titleRow: {
|
||||
// Line up with the section titles, which sit inset from their cards.
|
||||
marginLeft: theme.spacing[1],
|
||||
marginTop: theme.spacing[2],
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: theme.spacing[3],
|
||||
marginBottom: theme.spacing[4],
|
||||
},
|
||||
title: {
|
||||
color: theme.colors.foreground,
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
import type { ReactNode } from "react";
|
||||
import { View } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
|
||||
/**
|
||||
* The action at a heading's end. It adds no height, so a heading with a button is as tall as one
|
||||
* without and both sit the same distance from their cards. The button stays centered on the title
|
||||
* and its hit area grows past the heading.
|
||||
*/
|
||||
export function HeadingTrailing({ children }: { children: ReactNode }) {
|
||||
if (children === null || children === undefined || children === false) return null;
|
||||
return <View style={styles.trailing}>{children}</View>;
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
trailing: {
|
||||
height: 0,
|
||||
justifyContent: "center",
|
||||
// A long trailing gives way to the title.
|
||||
flexShrink: 1,
|
||||
},
|
||||
});
|
||||
@@ -1,7 +1,6 @@
|
||||
import { useMemo, type ReactNode } from "react";
|
||||
import { Text, View, type StyleProp, type ViewStyle } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { HeadingTrailing } from "./heading-trailing";
|
||||
import { SettingsInfoTip } from "./settings-info-tip";
|
||||
|
||||
interface SettingsGroupProps {
|
||||
@@ -41,7 +40,7 @@ export function SettingsGroup({
|
||||
/>
|
||||
) : null}
|
||||
</View>
|
||||
<HeadingTrailing>{trailing}</HeadingTrailing>
|
||||
{trailing}
|
||||
</View>
|
||||
{children}
|
||||
</View>
|
||||
|
||||
@@ -3,7 +3,6 @@ import { useMemo, type ReactNode } from "react";
|
||||
import { View, type StyleProp, type ViewStyle } from "react-native";
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { ExternalLink, type ExternalLinkProps } from "@/components/ui/external-link";
|
||||
import { HeadingTrailing } from "./heading-trailing";
|
||||
import { SettingsInfoTip } from "./settings-info-tip";
|
||||
import { settingsStyles } from "@/styles/settings";
|
||||
|
||||
@@ -68,7 +67,7 @@ export function SettingsSection({
|
||||
<ExternalLink {...link} />
|
||||
</View>
|
||||
) : null}
|
||||
<HeadingTrailing>{trailing}</HeadingTrailing>
|
||||
{trailing}
|
||||
</View>
|
||||
<View style={styles.content}>{children}</View>
|
||||
</View>
|
||||
|
||||
@@ -7,7 +7,6 @@ import {
|
||||
SettingsCollapsibleRow,
|
||||
SettingsDetailRow,
|
||||
SettingsRow,
|
||||
SettingsSwitch,
|
||||
} from "@/components/settings";
|
||||
|
||||
let root: Root | null = null;
|
||||
@@ -21,7 +20,6 @@ afterEach(() => {
|
||||
});
|
||||
|
||||
function openNothing() {}
|
||||
function toggleNothing() {}
|
||||
|
||||
function mountRows() {
|
||||
container = document.createElement("div");
|
||||
@@ -35,13 +33,6 @@ function mountRows() {
|
||||
Download
|
||||
</Button>
|
||||
</SettingsRow>
|
||||
<SettingsRow label="Text only" testID="text-row" />
|
||||
<SettingsSwitch
|
||||
label="Toggles"
|
||||
value={false}
|
||||
onValueChange={toggleNothing}
|
||||
testID="switch-row"
|
||||
/>
|
||||
<SettingsDetailRow label="Opens a page" onPress={openNothing} testID="detail-row" />
|
||||
<SettingsCollapsibleRow label="Group" defaultExpanded testID="group">
|
||||
<SettingsRow label="Nested with a button" testID="nested-with-button">
|
||||
@@ -83,13 +74,11 @@ describe("settings row density", () => {
|
||||
expect(heightOf("group-toggle")).toBeGreaterThan(heightOf("nested-without-button"));
|
||||
});
|
||||
|
||||
it("lines up text, switch, and opening rows below a row holding a button", () => {
|
||||
it("keeps a row that opens something as tall as a row holding a control", () => {
|
||||
mountRows();
|
||||
|
||||
expect(heightOf("switch-row")).toBe(heightOf("text-row"));
|
||||
expect(heightOf("detail-row")).toBe(heightOf("text-row"));
|
||||
expect(heightOf("group-toggle")).toBe(heightOf("text-row"));
|
||||
expect(heightOf("card-row")).toBeGreaterThan(heightOf("text-row"));
|
||||
expect(heightOf("detail-row")).toBe(heightOf("card-row"));
|
||||
expect(heightOf("group-toggle")).toBe(heightOf("card-row"));
|
||||
});
|
||||
|
||||
it("sizes nested text and controls one step below card rows", () => {
|
||||
|
||||
@@ -27,6 +27,11 @@ export function MenuSettingsRows({ children }: { children: ReactNode }) {
|
||||
|
||||
export interface SettingsRowLayout {
|
||||
row: StyleProp<ViewStyle>;
|
||||
/**
|
||||
* A row as tall as one holding a control of `controlSize`, whether or not it holds one. In a menu
|
||||
* it keeps the menu's row height.
|
||||
*/
|
||||
controlRow: StyleProp<ViewStyle>;
|
||||
title: StyleProp<TextStyle>;
|
||||
hint: StyleProp<TextStyle>;
|
||||
/** The size of the controls in the row's trailing slot. */
|
||||
@@ -38,6 +43,7 @@ function layoutFor(placement: RowPlacement): SettingsRowLayout {
|
||||
case "nested":
|
||||
return {
|
||||
row: [settingsStyles.row, styles.nestedRow],
|
||||
controlRow: [settingsStyles.row, styles.nestedRow],
|
||||
title: [settingsStyles.rowTitle, styles.nestedText],
|
||||
hint: [settingsStyles.rowHint, styles.nestedText],
|
||||
controlSize: "sm",
|
||||
@@ -45,6 +51,7 @@ function layoutFor(placement: RowPlacement): SettingsRowLayout {
|
||||
case "menu":
|
||||
return {
|
||||
row: [settingsStyles.row, styles.menuRow],
|
||||
controlRow: [settingsStyles.row, styles.menuRow],
|
||||
title: settingsStyles.rowTitle,
|
||||
hint: settingsStyles.rowHint,
|
||||
controlSize: "md",
|
||||
@@ -52,6 +59,7 @@ function layoutFor(placement: RowPlacement): SettingsRowLayout {
|
||||
case "card":
|
||||
return {
|
||||
row: settingsStyles.row,
|
||||
controlRow: [settingsStyles.row, styles.cardControlRow],
|
||||
title: settingsStyles.rowTitle,
|
||||
hint: settingsStyles.rowHint,
|
||||
controlSize: "md",
|
||||
@@ -66,6 +74,9 @@ export function useSettingsRowLayout(): SettingsRowLayout {
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
cardControlRow: {
|
||||
minHeight: mapLayout(CONTROL_HEIGHTS.md, (height) => height + theme.spacing[4] * 2),
|
||||
},
|
||||
// Every nested row is as tall as one holding an `sm` control, so rows with and without a
|
||||
// trailing button line up.
|
||||
nestedRow: {
|
||||
|
||||
@@ -86,7 +86,7 @@ export function SettingsRowHeader({
|
||||
const handlePointerEnter = useCallback(() => setPointerOver(true), []);
|
||||
const handlePointerLeave = useCallback(() => setPointerOver(false), []);
|
||||
const hovered = pointerOver && !disabled;
|
||||
const rowStyle = useMemo(() => [layout.row, hovered && styles.hovered], [hovered, layout]);
|
||||
const rowStyle = useMemo(() => [layout.controlRow, hovered && styles.hovered], [hovered, layout]);
|
||||
const chevronStyle = useMemo(
|
||||
() => [styles.chevron, expanded && styles.chevronExpanded],
|
||||
[expanded],
|
||||
|
||||
@@ -1,148 +0,0 @@
|
||||
import { memo, useCallback, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Text, View } from "react-native";
|
||||
import { ChartNoAxesColumn } from "lucide-react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import {
|
||||
HoverCard,
|
||||
HoverCardContent,
|
||||
HoverCardTrigger,
|
||||
useHoverCardOpen,
|
||||
} from "@/components/ui/hover-card";
|
||||
import { PressHighlight } from "@/components/ui/press-highlight";
|
||||
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { isNative } from "@/constants/platform";
|
||||
import { ICON_SIZE, type Theme } from "@/styles/theme";
|
||||
import { DetailsSheet } from "./details-sheet";
|
||||
import { MetricsList } from "./metrics-list";
|
||||
|
||||
const ThemedChart = withUnistyles(ChartNoAxesColumn);
|
||||
const foregroundColorMapping = (theme: Theme) => ({ color: theme.colors.foreground });
|
||||
const foregroundMutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMuted });
|
||||
|
||||
/**
|
||||
* The turn footer's stats button: what the provider reported about this turn, in a hover card on
|
||||
* web, a tooltip opened by press on native wide screens, and a sheet on compact screens.
|
||||
*/
|
||||
export const TurnMetricsButton = memo(function TurnMetricsButton({
|
||||
metrics,
|
||||
}: {
|
||||
metrics: AgentMetric[];
|
||||
}) {
|
||||
const isCompact = useIsCompactFormFactor();
|
||||
if (isCompact) return <TurnMetricsSheetButton metrics={metrics} />;
|
||||
if (isNative) return <TurnMetricsTooltipButton metrics={metrics} />;
|
||||
return <TurnMetricsHoverCardButton metrics={metrics} />;
|
||||
});
|
||||
|
||||
function TurnMetricsSheetButton({ metrics }: { metrics: AgentMetric[] }) {
|
||||
const { t } = useTranslation();
|
||||
const [open, setOpen] = useState(false);
|
||||
const openSheet = useCallback(() => setOpen(true), []);
|
||||
const closeSheet = useCallback(() => setOpen(false), []);
|
||||
return (
|
||||
<>
|
||||
<PressHighlight
|
||||
style={styles.trigger}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={t("message.actions.turnStats")}
|
||||
onPress={openSheet}
|
||||
testID="turn-metrics-trigger"
|
||||
>
|
||||
{({ hovered }) => <TurnMetricsIcon active={open || Boolean(hovered)} />}
|
||||
</PressHighlight>
|
||||
<DetailsSheet open={open} onClose={closeSheet} title={t("message.actions.turnStats")}>
|
||||
<MetricsList metrics={metrics} />
|
||||
</DetailsSheet>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
function TurnMetricsTooltipButton({ metrics }: { metrics: AgentMetric[] }) {
|
||||
const { t } = useTranslation();
|
||||
const [open, setOpen] = useState(false);
|
||||
return (
|
||||
<Tooltip open={open} onOpenChange={setOpen} delayDuration={0} enabledOnDesktop enabledOnMobile>
|
||||
<TooltipTrigger asChild triggerRefProp="ref">
|
||||
<PressHighlight
|
||||
style={styles.trigger}
|
||||
accessibilityRole="button"
|
||||
accessibilityLabel={t("message.actions.turnStats")}
|
||||
testID="turn-metrics-trigger"
|
||||
>
|
||||
{({ hovered }) => <TurnMetricsIcon active={open || Boolean(hovered)} />}
|
||||
</PressHighlight>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent side="top" align="start" offset={8} style={styles.popover}>
|
||||
<TurnMetricsDetails metrics={metrics} />
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
|
||||
function TurnMetricsHoverCardButton({ metrics }: { metrics: AgentMetric[] }) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<HoverCard>
|
||||
<HoverCardTrigger focusable accessibilityLabel={t("message.actions.turnStats")}>
|
||||
<View style={styles.trigger} testID="turn-metrics-trigger">
|
||||
<HoverCardTurnMetricsIcon />
|
||||
</View>
|
||||
</HoverCardTrigger>
|
||||
<HoverCardContent
|
||||
placement="top"
|
||||
alignment="start"
|
||||
offset={8}
|
||||
role="dialog"
|
||||
accessibilityLabel={t("message.actions.turnStats")}
|
||||
testID="turn-metrics-details"
|
||||
style={styles.popover}
|
||||
>
|
||||
<TurnMetricsDetails metrics={metrics} />
|
||||
</HoverCardContent>
|
||||
</HoverCard>
|
||||
);
|
||||
}
|
||||
|
||||
function HoverCardTurnMetricsIcon() {
|
||||
return <TurnMetricsIcon active={useHoverCardOpen()} />;
|
||||
}
|
||||
|
||||
function TurnMetricsIcon({ active }: { active: boolean }) {
|
||||
return (
|
||||
<ThemedChart
|
||||
size={ICON_SIZE.sm}
|
||||
uniProps={active ? foregroundColorMapping : foregroundMutedColorMapping}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function TurnMetricsDetails({ metrics }: { metrics: AgentMetric[] }) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<>
|
||||
<Text style={styles.title}>{t("message.actions.turnStats")}</Text>
|
||||
<MetricsList metrics={metrics} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
// Matches the Copy and Fork buttons beside it, so the glyphs share one row and one spacing.
|
||||
trigger: {
|
||||
alignSelf: "center",
|
||||
padding: theme.spacing[1],
|
||||
borderRadius: theme.borderRadius.md,
|
||||
},
|
||||
popover: {
|
||||
minWidth: 220,
|
||||
padding: theme.spacing[3],
|
||||
gap: theme.spacing[2],
|
||||
},
|
||||
title: {
|
||||
color: theme.colors.foreground,
|
||||
fontSize: theme.fontSize.base,
|
||||
},
|
||||
}));
|
||||
@@ -302,23 +302,23 @@ describe("control geometry", () => {
|
||||
trackHeight: 20,
|
||||
thumbSize: 16,
|
||||
thumbTravel: 14,
|
||||
hitHeight: 32,
|
||||
reservedHeight: 32,
|
||||
});
|
||||
expect(switchGeometryForLayout("md", true)).toEqual({
|
||||
trackWidth: 44,
|
||||
trackHeight: 26,
|
||||
thumbSize: 22,
|
||||
thumbTravel: 18,
|
||||
hitHeight: 44,
|
||||
reservedHeight: 44,
|
||||
});
|
||||
// Tight chrome keeps the pointer-sized track on every layout and takes presses over its row's control height.
|
||||
// Tight chrome keeps the pointer-sized track on every layout and reserves its row's height.
|
||||
expect(switchGeometryForLayout("sm", true)).toMatchObject({
|
||||
trackWidth: 34,
|
||||
hitHeight: 32,
|
||||
reservedHeight: 32,
|
||||
});
|
||||
expect(switchGeometryForLayout("sm", false)).toMatchObject({
|
||||
trackWidth: 34,
|
||||
hitHeight: 28,
|
||||
reservedHeight: 28,
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -223,11 +223,8 @@ export interface SwitchGeometry {
|
||||
thumbSize: number;
|
||||
/** How far the thumb slides between off and on. */
|
||||
thumbTravel: number;
|
||||
/**
|
||||
* The height of the area that takes the press: the control height of the switch's size. The
|
||||
* switch itself is only as tall as its track, so it never makes a row taller.
|
||||
*/
|
||||
hitHeight: number;
|
||||
/** The control height the switch reserves, so its row lines up with one holding a button. */
|
||||
reservedHeight: number;
|
||||
}
|
||||
|
||||
function switchSize(trackWidth: number, trackHeight: number, thumbSize: number) {
|
||||
@@ -238,15 +235,6 @@ function switchSize(trackWidth: number, trackHeight: number, thumbSize: number)
|
||||
const SWITCH_POINTER = switchSize(34, 20, 16);
|
||||
const SWITCH_TOUCH = switchSize(44, 26, 22);
|
||||
|
||||
/**
|
||||
* The height of a default switch. Exported so a row can be as tall as one holding a switch whether
|
||||
* or not it holds one. A breakpoint value, so it only works inside a Unistyles stylesheet.
|
||||
*/
|
||||
export const SWITCH_HEIGHT = bySizing({
|
||||
touch: SWITCH_TOUCH.trackHeight,
|
||||
pointer: SWITCH_POINTER.trackHeight,
|
||||
});
|
||||
|
||||
/**
|
||||
* A switch follows the same two sizes as every other control. Its thumb travel feeds an
|
||||
* animation, so the size is resolved to plain numbers here instead of a stylesheet breakpoint.
|
||||
@@ -254,7 +242,7 @@ export const SWITCH_HEIGHT = bySizing({
|
||||
export function switchGeometryForLayout(size: ControlSize, isCompact: boolean): SwitchGeometry {
|
||||
const touchSized = controlSizingForLayout(isCompact) === "touch";
|
||||
const track = size === "md" && touchSized ? SWITCH_TOUCH : SWITCH_POINTER;
|
||||
return { ...track, hitHeight: controlHeightForLayout(size, isCompact) };
|
||||
return { ...track, reservedHeight: controlHeightForLayout(size, isCompact) };
|
||||
}
|
||||
|
||||
function fieldLineHeight(fontSize: number): number {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { useCallback, type ReactElement } from "react";
|
||||
import {
|
||||
MenuCheckboxItem,
|
||||
MenuHint,
|
||||
MenuItem,
|
||||
MenuLabel,
|
||||
@@ -24,16 +23,11 @@ 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,
|
||||
MenuCheckboxItemProps as DropdownMenuCheckboxItemProps,
|
||||
MenuItemProps as DropdownMenuItemProps,
|
||||
} from "@/components/ui/menu";
|
||||
export type { ActionStatus, MenuItemProps as DropdownMenuItemProps } from "@/components/ui/menu";
|
||||
export type { MenuPageDefinition } from "@/components/ui/menu";
|
||||
export { MenuSubTrigger as DropdownMenuSubTrigger } from "@/components/ui/menu";
|
||||
|
||||
|
||||
@@ -267,11 +267,6 @@ function WebHoverCard({
|
||||
);
|
||||
}
|
||||
|
||||
/** Whether the enclosing card is open, so its trigger can look active while it is. */
|
||||
export function useHoverCardOpen(): boolean {
|
||||
return useContext(HoverCardContext)?.open ?? false;
|
||||
}
|
||||
|
||||
export function HoverCardTrigger({
|
||||
children,
|
||||
focusable = false,
|
||||
|
||||
@@ -19,7 +19,6 @@ export {
|
||||
} from "./menu-surface";
|
||||
export { MenuSubTrigger } from "./menu-sub";
|
||||
export {
|
||||
MenuCheckboxItem,
|
||||
MenuHint,
|
||||
MenuItem,
|
||||
MenuLabel,
|
||||
@@ -27,7 +26,6 @@ export {
|
||||
MenuTextField,
|
||||
menuRowContentInset,
|
||||
type ActionStatus,
|
||||
type MenuCheckboxItemProps,
|
||||
type MenuItemProps,
|
||||
} from "./menu-item";
|
||||
export { MENU_ITEM_HEIGHT } from "./menu-geometry";
|
||||
|
||||
@@ -18,7 +18,6 @@ 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";
|
||||
@@ -222,36 +221,6 @@ 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;
|
||||
@@ -284,37 +253,7 @@ export interface MenuItemProps {
|
||||
tooltip?: string;
|
||||
}
|
||||
|
||||
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({
|
||||
export function MenuItem({
|
||||
children,
|
||||
description,
|
||||
onSelect,
|
||||
@@ -333,11 +272,8 @@ function MenuRow({
|
||||
closeOnSelect = true,
|
||||
testID,
|
||||
tooltip,
|
||||
accessibilityRole,
|
||||
}: PropsWithChildren<
|
||||
MenuItemProps & { accessibilityRole: "menuitem" | "checkbox" }
|
||||
>): ReactElement {
|
||||
const { selectItem, presentation } = useMenuContext("MenuItem");
|
||||
}: PropsWithChildren<MenuItemProps>): ReactElement {
|
||||
const { selectItem } = useMenuContext("MenuItem");
|
||||
const isPending = status === "pending" || loading;
|
||||
const isSuccess = status === "success";
|
||||
const isDisabled = disabled || isPending || isSuccess;
|
||||
@@ -350,14 +286,14 @@ function MenuRow({
|
||||
|
||||
const label = resolveItemLabel({ children, isPending, isSuccess, pendingLabel, successLabel });
|
||||
|
||||
const trailingContent = resolveTrailingContent({ trailing, showSelectedCheck, selected });
|
||||
const trailingContent =
|
||||
trailing ??
|
||||
(!showSelectedCheck && selected ? <ThemedCheck size={16} uniProps={mutedMapping} /> : null);
|
||||
|
||||
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
|
||||
@@ -400,13 +336,11 @@ function MenuRow({
|
||||
|
||||
const content = (
|
||||
<Pressable
|
||||
{...sheetKeyProps}
|
||||
testID={testID}
|
||||
accessibilityRole={accessibilityRole}
|
||||
accessibilityRole="menuitem"
|
||||
accessibilityState={accessibilityState}
|
||||
aria-checked={selected}
|
||||
// Popovers manage focus via arrow keys; compact sheets rely on the browser's Tab order.
|
||||
tabIndex={isSheet ? 0 : -1}
|
||||
tabIndex={-1}
|
||||
dataSet={itemDataSet}
|
||||
disabled={isDisabled}
|
||||
onPress={handleItemPress}
|
||||
|
||||
@@ -25,8 +25,6 @@ export interface SearchFieldProps {
|
||||
/** Falls back to `placeholder`, which already names the field. */
|
||||
accessibilityLabel?: string;
|
||||
clearAccessibilityLabel: string;
|
||||
/** Fill the container, for a search that heads one list. Defaults to the filter rail's width. */
|
||||
fullWidth?: boolean;
|
||||
testID?: string;
|
||||
clearTestID?: string;
|
||||
}
|
||||
@@ -44,7 +42,6 @@ export function SearchField({
|
||||
placeholder,
|
||||
accessibilityLabel,
|
||||
clearAccessibilityLabel,
|
||||
fullWidth = false,
|
||||
testID,
|
||||
clearTestID,
|
||||
}: SearchFieldProps): ReactElement {
|
||||
@@ -58,9 +55,7 @@ export function SearchField({
|
||||
}, [onChangeText]);
|
||||
|
||||
return (
|
||||
<View
|
||||
style={[styles.field, fullWidth && styles.fieldFullWidth, isFocused && styles.fieldFocused]}
|
||||
>
|
||||
<View style={[styles.field, isFocused && styles.fieldFocused]}>
|
||||
<ThemedSearch size={14} uniProps={mutedColorMapping} />
|
||||
<ThemedTextInput
|
||||
testID={testID}
|
||||
@@ -108,9 +103,6 @@ const styles = StyleSheet.create((theme) => ({
|
||||
borderWidth: theme.borderWidth[1],
|
||||
borderColor: theme.colors.border,
|
||||
},
|
||||
fieldFullWidth: {
|
||||
maxWidth: "100%",
|
||||
},
|
||||
fieldFocused: {
|
||||
borderColor: theme.colors.borderAccent,
|
||||
backgroundColor: theme.colors.surface2,
|
||||
|
||||
@@ -123,16 +123,11 @@ export function Switch({
|
||||
const pressableStyle = useMemo(
|
||||
() => [
|
||||
styles.switchControl,
|
||||
// The press area is a full control tall and grows out of the track; the layout only sees
|
||||
// the track.
|
||||
{
|
||||
minHeight: geometry.hitHeight,
|
||||
marginVertical: (geometry.trackHeight - geometry.hitHeight) / 2,
|
||||
},
|
||||
{ minHeight: geometry.reservedHeight },
|
||||
disabled ? styles.disabled : null,
|
||||
style,
|
||||
],
|
||||
[disabled, geometry.hitHeight, geometry.trackHeight, style],
|
||||
[disabled, geometry.reservedHeight, style],
|
||||
);
|
||||
|
||||
return (
|
||||
|
||||
@@ -147,7 +147,6 @@ import { RenderProfile } from "@/utils/render-profiler";
|
||||
import { AfterPaintPublication } from "@/composer/after-paint-publication";
|
||||
import { isWeb, isNative } from "@/constants/platform";
|
||||
import type { ForgeSearchItem } from "@getpaseo/protocol/messages";
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import type {
|
||||
AttachmentMetadata,
|
||||
ComposerAttachment,
|
||||
@@ -296,8 +295,6 @@ function buildRealtimeVoiceButtonStyle(pressed: boolean, voiceButtonDisabled: bo
|
||||
);
|
||||
}
|
||||
|
||||
const EMPTY_METRICS: AgentMetric[] = [];
|
||||
|
||||
function buildAgentStateSelector(serverId: string, agentId: string) {
|
||||
return (state: ReturnType<typeof useSessionStore.getState>) => {
|
||||
const agent = state.sessions[serverId]?.agents?.get(agentId) ?? null;
|
||||
@@ -306,7 +303,6 @@ function buildAgentStateSelector(serverId: string, agentId: string) {
|
||||
contextWindowMaxTokens: agent?.lastUsage?.contextWindowMaxTokens ?? null,
|
||||
contextWindowUsedTokens: agent?.lastUsage?.contextWindowUsedTokens ?? null,
|
||||
totalCostUsd: agent?.lastUsage?.totalCostUsd ?? null,
|
||||
sessionMetrics: agent?.sessionMetrics ?? EMPTY_METRICS,
|
||||
model: agent?.model ?? null,
|
||||
};
|
||||
};
|
||||
@@ -2229,7 +2225,6 @@ function ComposerContentImpl({
|
||||
maxTokens={agentState.contextWindowMaxTokens}
|
||||
usedTokens={agentState.contextWindowUsedTokens}
|
||||
totalCostUsd={agentState.totalCostUsd}
|
||||
sessionMetrics={agentState.sessionMetrics}
|
||||
toolbarRing={TOOLBAR_RINGS[controlSizing]}
|
||||
/>
|
||||
</View>
|
||||
@@ -2241,7 +2236,6 @@ function ComposerContentImpl({
|
||||
agentState.contextWindowMaxTokens,
|
||||
agentState.contextWindowUsedTokens,
|
||||
agentState.totalCostUsd,
|
||||
agentState.sessionMetrics,
|
||||
controlSizing,
|
||||
],
|
||||
);
|
||||
|
||||
@@ -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, QueryObserver } = await import("@tanstack/react-query");
|
||||
const { QueryClient } = await import("@tanstack/react-query");
|
||||
const { applyProvidersSnapshotUpdate } = await import("./push-router");
|
||||
const { fetchProvidersSnapshot, providersSnapshotQueryKey } =
|
||||
await import("./providers-snapshot");
|
||||
@@ -653,16 +653,6 @@ 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() {
|
||||
@@ -786,7 +776,6 @@ 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, QueryObserver } from "@tanstack/react-query";
|
||||
import { QueryClient, CancelledError } 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,14 +307,6 @@ 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({
|
||||
@@ -333,7 +325,6 @@ describe("provider snapshot publication identity", () => {
|
||||
expect(published.entries[0]!.models).toBe(canonical.entries[0]!.models);
|
||||
}
|
||||
} finally {
|
||||
unsubscribe();
|
||||
queryClient.clear();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -8,12 +8,8 @@ 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 { 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 { providersSnapshotQueryKey } from "@/data/providers-snapshot";
|
||||
import {
|
||||
applyProvidersSnapshotUpdate,
|
||||
checkoutDiffPushRoute,
|
||||
invalidateServerDataQueriesAfterReconnect,
|
||||
mountServerDataPushRouter,
|
||||
@@ -598,13 +594,6 @@ 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"));
|
||||
@@ -633,7 +622,6 @@ 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) => {
|
||||
@@ -994,158 +982,3 @@ 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,10 +8,7 @@ import type {
|
||||
MutableDaemonConfig,
|
||||
SessionOutboundMessage,
|
||||
} from "@getpaseo/protocol/messages";
|
||||
import {
|
||||
invalidateCommandsForDirectory,
|
||||
invalidateCommandsForProviderChange,
|
||||
} from "@/agent-commands/cache";
|
||||
import { invalidateCommandsForProviderChange } from "@/agent-commands/cache";
|
||||
import { shareCheckoutDiff } from "@/git/diff-sharing";
|
||||
import { orderCheckoutDiffFiles } from "@/git/diff-order";
|
||||
import { daemonConfigQueryKey } from "@/data/daemon-config";
|
||||
@@ -187,20 +184,6 @@ 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 });
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
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,9 +86,7 @@ export function replicaQueryOptions<
|
||||
},
|
||||
},
|
||||
queryFn: options.queryFn ?? skipToken,
|
||||
// Pushes keep a replica fresh; a mount only refetches what an invalidation marked stale
|
||||
// while nothing observed it.
|
||||
refetchOnMount: (query) => query.state.isInvalidated,
|
||||
refetchOnMount: false,
|
||||
refetchOnReconnect: false,
|
||||
refetchOnWindowFocus: false,
|
||||
staleTime: Infinity,
|
||||
|
||||
@@ -1,91 +0,0 @@
|
||||
import { useCallback } from "react";
|
||||
import {
|
||||
useActiveWorkspaceSelection,
|
||||
type ActiveWorkspaceSelection,
|
||||
} from "@/stores/navigation-active-workspace-store";
|
||||
import { getFocusedWorkspaceSelection } from "@/navigation/workspace-route-navigation";
|
||||
import { useSessionStore } from "@/stores/session-store";
|
||||
import { useWorkspaceFields } from "@/stores/session-store-hooks";
|
||||
import { resolveWorkspaceMapKeyByIdentity } from "@/utils/workspace-identity";
|
||||
import { redirectIfArchivingActiveWorkspace } from "@/utils/sidebar-workspace-archive-redirect";
|
||||
import { useWorkspaceArchive } from "@/workspace/use-workspace-archive";
|
||||
import { isWorkspaceListed, type WorkspaceArchiveTarget } from "@/workspace/workspace-archive";
|
||||
|
||||
// The redirect compares descriptor ids; the route's id is not guaranteed to equal one (see
|
||||
// use-global-workspace-pin-action.ts), so resolve it through the session store.
|
||||
function readActiveDescriptorSelection(): ActiveWorkspaceSelection | null {
|
||||
const selection = getFocusedWorkspaceSelection();
|
||||
if (!selection) {
|
||||
return null;
|
||||
}
|
||||
const workspaces = useSessionStore.getState().sessions[selection.serverId]?.workspaces;
|
||||
const key = resolveWorkspaceMapKeyByIdentity({
|
||||
workspaces,
|
||||
workspaceId: selection.workspaceId,
|
||||
});
|
||||
const descriptor = key ? workspaces?.get(key) : undefined;
|
||||
return descriptor ? { serverId: selection.serverId, workspaceId: descriptor.id } : null;
|
||||
}
|
||||
|
||||
export interface ActiveWorkspaceArchive {
|
||||
/** False when no workspace is routed, or the routed one is already archiving. */
|
||||
canArchive: boolean;
|
||||
/** Starts the archive for the routed workspace. Returns false when nothing was started. */
|
||||
archive: () => boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Archives the workspace the route points at. Keyed on the route selection rather than a rendered
|
||||
* row, so it works from the keyboard shortcut and from the compact header menu alike.
|
||||
*/
|
||||
export function useActiveWorkspaceArchive(): ActiveWorkspaceArchive {
|
||||
const selection = useActiveWorkspaceSelection();
|
||||
const serverId = selection?.serverId ?? null;
|
||||
const routeWorkspaceId = selection?.workspaceId ?? null;
|
||||
// `id` is the descriptor id, not the route id; see use-global-workspace-pin-action.ts.
|
||||
const fields = useWorkspaceFields(serverId, routeWorkspaceId, (workspace) => ({
|
||||
id: workspace.id,
|
||||
workspaceKind: workspace.workspaceKind,
|
||||
workspaceDirectory: workspace.workspaceDirectory,
|
||||
name: workspace.name,
|
||||
archivingAt: workspace.archivingAt,
|
||||
diffStat: workspace.diffStat,
|
||||
}));
|
||||
|
||||
// The archive starts after the host answers and you confirm, by which time the header that began
|
||||
// it may be gone (a resize swaps it, and on native switching workspaces unmounts it), and you may
|
||||
// have left workspace routes. So the redirect reads the focused route now, not this render's.
|
||||
const redirectAfterArchive = useCallback((workspace: WorkspaceArchiveTarget) => {
|
||||
redirectIfArchivingActiveWorkspace({
|
||||
...workspace,
|
||||
activeWorkspaceSelection: readActiveDescriptorSelection(),
|
||||
});
|
||||
}, []);
|
||||
|
||||
const archiveController = useWorkspaceArchive({
|
||||
serverId: serverId ?? "",
|
||||
workspaceId: fields?.id ?? "",
|
||||
workspaceKind: fields?.workspaceKind ?? "directory",
|
||||
workspaceDirectory: fields?.workspaceDirectory ?? "",
|
||||
name: fields?.name ?? "",
|
||||
diffStat: fields?.diffStat,
|
||||
onArchiveStarted: redirectAfterArchive,
|
||||
});
|
||||
|
||||
const canArchive = fields !== null && fields.archivingAt === null;
|
||||
|
||||
const archive = useCallback(() => {
|
||||
if (!canArchive || !serverId) {
|
||||
return false;
|
||||
}
|
||||
// Archiving hides its target immediately. Read the store in case this runs again before
|
||||
// React renders that update.
|
||||
if (!isWorkspaceListed({ serverId, workspaceId: fields.id })) {
|
||||
return false;
|
||||
}
|
||||
archiveController.archive();
|
||||
return true;
|
||||
}, [archiveController, canArchive, fields, serverId]);
|
||||
|
||||
return { canArchive, archive };
|
||||
}
|
||||
@@ -1,6 +1,11 @@
|
||||
import { useActiveWorkspaceArchive } from "@/hooks/use-active-workspace-archive";
|
||||
import { useCallback } from "react";
|
||||
import { useKeyboardActionHandler } from "@/hooks/use-keyboard-action-handler";
|
||||
import type { KeyboardActionId } from "@/keyboard/keyboard-action-dispatcher";
|
||||
import { useActiveWorkspaceSelection } from "@/stores/navigation-active-workspace-store";
|
||||
import { useWorkspaceFields } from "@/stores/session-store-hooks";
|
||||
import { redirectIfArchivingActiveWorkspace } from "@/utils/sidebar-workspace-archive-redirect";
|
||||
import { useWorkspaceArchive } from "@/workspace/use-workspace-archive";
|
||||
import { isWorkspaceListed, type WorkspaceArchiveTarget } from "@/workspace/workspace-archive";
|
||||
|
||||
const WORKSPACE_ARCHIVE_ACTIONS: readonly KeyboardActionId[] = ["workspace.archive"];
|
||||
|
||||
@@ -9,13 +14,64 @@ const WORKSPACE_ARCHIVE_ACTIONS: readonly KeyboardActionId[] = ["workspace.archi
|
||||
// the pin shortcut (see use-global-workspace-pin-action.ts), it is one registration keyed on the
|
||||
// active route selection.
|
||||
export function useGlobalWorkspaceArchiveAction() {
|
||||
const { canArchive, archive } = useActiveWorkspaceArchive();
|
||||
const selection = useActiveWorkspaceSelection();
|
||||
const serverId = selection?.serverId ?? null;
|
||||
const routeWorkspaceId = selection?.workspaceId ?? null;
|
||||
// `id` is the descriptor id, not the route id; see use-global-workspace-pin-action.ts.
|
||||
const fields = useWorkspaceFields(serverId, routeWorkspaceId, (workspace) => ({
|
||||
id: workspace.id,
|
||||
workspaceKind: workspace.workspaceKind,
|
||||
workspaceDirectory: workspace.workspaceDirectory,
|
||||
name: workspace.name,
|
||||
archivingAt: workspace.archivingAt,
|
||||
diffStat: workspace.diffStat,
|
||||
}));
|
||||
|
||||
// useWorkspaceArchive calls the latest render's callback, so `activeWorkspaceId` is whatever is
|
||||
// routed when the archive starts, after any confirmation. It is the descriptor id, which is what
|
||||
// the redirect compares against.
|
||||
const activeWorkspaceId = fields?.id ?? null;
|
||||
const redirectAfterArchive = useCallback(
|
||||
(workspace: WorkspaceArchiveTarget) => {
|
||||
redirectIfArchivingActiveWorkspace({
|
||||
...workspace,
|
||||
activeWorkspaceSelection:
|
||||
serverId && activeWorkspaceId ? { serverId, workspaceId: activeWorkspaceId } : null,
|
||||
});
|
||||
},
|
||||
[activeWorkspaceId, serverId],
|
||||
);
|
||||
|
||||
const archiveController = useWorkspaceArchive({
|
||||
serverId: serverId ?? "",
|
||||
workspaceId: fields?.id ?? "",
|
||||
workspaceKind: fields?.workspaceKind ?? "directory",
|
||||
workspaceDirectory: fields?.workspaceDirectory ?? "",
|
||||
name: fields?.name ?? "",
|
||||
diffStat: fields?.diffStat,
|
||||
onArchiveStarted: redirectAfterArchive,
|
||||
});
|
||||
|
||||
const canArchive = fields !== null && fields.archivingAt === null;
|
||||
|
||||
const handle = useCallback(() => {
|
||||
if (!canArchive || !serverId) {
|
||||
return false;
|
||||
}
|
||||
// Archiving hides its target immediately. Read the store in case the shortcut
|
||||
// runs again before React renders that update.
|
||||
if (!isWorkspaceListed({ serverId, workspaceId: fields.id })) {
|
||||
return false;
|
||||
}
|
||||
archiveController.archive();
|
||||
return true;
|
||||
}, [archiveController, canArchive, fields, serverId]);
|
||||
|
||||
useKeyboardActionHandler({
|
||||
handlerId: "workspace-archive-global",
|
||||
actions: WORKSPACE_ARCHIVE_ACTIONS,
|
||||
enabled: canArchive,
|
||||
priority: 0,
|
||||
handle: archive,
|
||||
handle,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -352,19 +352,6 @@ 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",
|
||||
@@ -377,7 +364,6 @@ 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, {
|
||||
@@ -461,7 +447,6 @@ 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;
|
||||
@@ -508,7 +493,6 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
providersSnapshotQueryKey(serverId, "/repo-a"),
|
||||
providersSnapshot([codexEntry("ready", [readyCodexModel])]),
|
||||
);
|
||||
showSnapshot("/repo-a");
|
||||
const send = (label: string) =>
|
||||
applyProvidersSnapshotUpdate({
|
||||
client: createClient(),
|
||||
@@ -527,7 +511,6 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
});
|
||||
|
||||
it("routes updates to the home query cache when the message carries no cwd", async () => {
|
||||
showSnapshot();
|
||||
await applyProvidersSnapshotUpdate({
|
||||
client: createClient(),
|
||||
serverId,
|
||||
@@ -544,7 +527,6 @@ 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(),
|
||||
@@ -564,7 +546,6 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
});
|
||||
|
||||
it("persists compact push updates", async () => {
|
||||
showSnapshot("/repo-a");
|
||||
const entries = [codexEntry("ready", [readyCodexModel])];
|
||||
const compactSnapshot = compactProviderSnapshot(entries);
|
||||
const cache = createCache();
|
||||
@@ -598,7 +579,6 @@ describe("applyProvidersSnapshotUpdate", () => {
|
||||
providersSnapshotQueryKey(serverId, workspaceCwd),
|
||||
providersSnapshot([codexEntry("loading")]),
|
||||
);
|
||||
showSnapshot(workspaceCwd);
|
||||
|
||||
await applyProvidersSnapshotUpdate({
|
||||
client: createClient(),
|
||||
@@ -626,7 +606,6 @@ 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: [],
|
||||
cardVisibility: {},
|
||||
cardsOff: [],
|
||||
});
|
||||
|
||||
const deps = makeDeps({
|
||||
@@ -357,7 +357,7 @@ describe("loadAppSettingsFromStorage", () => {
|
||||
],
|
||||
serverId: "server",
|
||||
cardOrder: [],
|
||||
cardVisibility: {},
|
||||
cardsOff: [],
|
||||
});
|
||||
});
|
||||
|
||||
@@ -374,7 +374,7 @@ describe("loadAppSettingsFromStorage", () => {
|
||||
pins: [],
|
||||
serverId: "server",
|
||||
cardOrder: [],
|
||||
cardVisibility: {},
|
||||
cardsOff: [],
|
||||
});
|
||||
});
|
||||
|
||||
@@ -396,7 +396,7 @@ describe("loadAppSettingsFromStorage", () => {
|
||||
pins: [{ sourceId: "claude", windowId: "weekly" }],
|
||||
serverId: null,
|
||||
cardOrder: [],
|
||||
cardVisibility: {},
|
||||
cardsOff: [],
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -349,7 +349,6 @@ export const ar: TranslationResources = {
|
||||
copyTurn: "نسخ بدوره",
|
||||
copyMessage: "انسخ الرسالة",
|
||||
forkMenu: "تفريع الرسالة",
|
||||
turnStats: "إحصاءات الدور",
|
||||
forkInNewTab: "تفريع في تبويب جديد",
|
||||
forkInNewWorkspace: "تفريع في مساحة عمل جديدة",
|
||||
forkUnavailable: "حدّث المضيف لاستخدام هذا.",
|
||||
@@ -2265,11 +2264,7 @@ export const ar: TranslationResources = {
|
||||
title: "استخدام الخطة",
|
||||
refresh: "تحديث",
|
||||
reorderCard: "إعادة ترتيب {{source}}",
|
||||
sources: "المصادر",
|
||||
sourcesCount: "{{shown}} من {{total}}",
|
||||
providerInactive: "المزود غير نشط",
|
||||
allSourcesHidden: "لا توجد مصادر استخدام معروضة",
|
||||
chooseSources: "اختيار المصادر",
|
||||
showCard: "إظهار {{source}}",
|
||||
refreshAll: "تحديث الكل",
|
||||
refreshing: "جارٍ التحديث...",
|
||||
loading: "جارٍ تحميل بيانات الاستخدام...",
|
||||
@@ -3118,7 +3113,6 @@ export const ar: TranslationResources = {
|
||||
status: "حالة المزود",
|
||||
checked: "تم الفحص {{time}}",
|
||||
diagnosticReport: "تقرير التشخيص",
|
||||
docs: "الوثائق",
|
||||
dangerZone: "منطقة الخطر",
|
||||
removeHint: "يحذف هذا المزود من config.json",
|
||||
},
|
||||
@@ -3164,7 +3158,7 @@ export const ar: TranslationResources = {
|
||||
noSearchMatches: "لا توجد نماذج تطابق بحثك",
|
||||
noneDetected: "لم يتم اكتشاف أي نماذج",
|
||||
noCustom: "لا توجد نماذج مخصصة",
|
||||
title: "النماذج",
|
||||
discovered: "اكتشف",
|
||||
custom: "نماذج مخصصة",
|
||||
updated: "تم تحديث{{time}}",
|
||||
},
|
||||
|
||||
@@ -348,7 +348,6 @@ export const en = {
|
||||
copyTurn: "Copy turn",
|
||||
copyMessage: "Copy message",
|
||||
forkMenu: "Fork chat from here",
|
||||
turnStats: "Turn stats",
|
||||
forkInNewTab: "Fork in a new tab",
|
||||
forkInNewWorkspace: "Fork in a new workspace",
|
||||
forkUnavailable: "Update the host to use this.",
|
||||
@@ -2293,11 +2292,7 @@ export const en = {
|
||||
title: "Plan usage",
|
||||
refresh: "Refresh",
|
||||
reorderCard: "Reorder {{source}}",
|
||||
sources: "Sources",
|
||||
sourcesCount: "{{shown}} of {{total}}",
|
||||
providerInactive: "Provider inactive",
|
||||
allSourcesHidden: "No usage sources shown",
|
||||
chooseSources: "Choose sources",
|
||||
showCard: "Show {{source}}",
|
||||
refreshAll: "Refresh all",
|
||||
refreshing: "Refreshing...",
|
||||
loading: "Loading usage...",
|
||||
@@ -3216,7 +3211,6 @@ export const en = {
|
||||
status: "Provider status",
|
||||
checked: "Checked {{time}}",
|
||||
diagnosticReport: "Diagnostic report",
|
||||
docs: "Docs",
|
||||
dangerZone: "Danger zone",
|
||||
removeHint: "Deletes this provider from config.json",
|
||||
},
|
||||
@@ -3262,7 +3256,7 @@ export const en = {
|
||||
noSearchMatches: "No models match your search",
|
||||
noneDetected: "No models detected",
|
||||
noCustom: "No custom models",
|
||||
title: "Models",
|
||||
discovered: "Discovered",
|
||||
custom: "Custom models",
|
||||
updated: "Updated {{time}}",
|
||||
},
|
||||
|
||||
@@ -354,7 +354,6 @@ export const es: TranslationResources = {
|
||||
copyTurn: "Copiar turno",
|
||||
copyMessage: "Copiar mensaje",
|
||||
forkMenu: "Bifurcar mensaje",
|
||||
turnStats: "Estadísticas del turno",
|
||||
forkInNewTab: "Bifurcar en una pestaña nueva",
|
||||
forkInNewWorkspace: "Bifurcar en un espacio de trabajo nuevo",
|
||||
forkUnavailable: "Actualiza el host para usar esto.",
|
||||
@@ -2314,11 +2313,7 @@ export const es: TranslationResources = {
|
||||
title: "Uso del plan",
|
||||
refresh: "Actualizar",
|
||||
reorderCard: "Reordenar {{source}}",
|
||||
sources: "Fuentes",
|
||||
sourcesCount: "{{shown}} de {{total}}",
|
||||
providerInactive: "Proveedor inactivo",
|
||||
allSourcesHidden: "No hay fuentes de uso visibles",
|
||||
chooseSources: "Elegir fuentes",
|
||||
showCard: "Mostrar {{source}}",
|
||||
refreshAll: "Actualizar todo",
|
||||
refreshing: "Actualizando...",
|
||||
loading: "Cargando uso...",
|
||||
@@ -3146,7 +3141,6 @@ export const es: TranslationResources = {
|
||||
status: "Estado del proveedor",
|
||||
checked: "Comprobado {{time}}",
|
||||
diagnosticReport: "Informe de diagnóstico",
|
||||
docs: "Documentación",
|
||||
dangerZone: "Zona de peligro",
|
||||
removeHint: "Elimina este proveedor de config.json",
|
||||
},
|
||||
@@ -3192,7 +3186,7 @@ export const es: TranslationResources = {
|
||||
noSearchMatches: "Ningún modelo coincide con tu búsqueda",
|
||||
noneDetected: "No se detectaron modelos",
|
||||
noCustom: "No hay modelos personalizados",
|
||||
title: "Modelos",
|
||||
discovered: "descubierto",
|
||||
custom: "Modelos personalizados",
|
||||
updated: "{{time}}actualizado",
|
||||
},
|
||||
|
||||
@@ -354,7 +354,6 @@ export const fr: TranslationResources = {
|
||||
copyTurn: "Copier l’échange",
|
||||
copyMessage: "Copier le message",
|
||||
forkMenu: "Forker la conversation à partir d’ici",
|
||||
turnStats: "Statistiques de l’échange",
|
||||
forkInNewTab: "Forker dans un nouvel onglet",
|
||||
forkInNewWorkspace: "Forker dans un nouvel espace de travail",
|
||||
forkUnavailable: "Mettez à jour l’hôte pour utiliser cette fonction.",
|
||||
@@ -2315,11 +2314,7 @@ export const fr: TranslationResources = {
|
||||
title: "Utilisation du forfait",
|
||||
refresh: "Actualiser",
|
||||
reorderCard: "Réorganiser {{source}}",
|
||||
sources: "Sources",
|
||||
sourcesCount: "{{shown}} sur {{total}}",
|
||||
providerInactive: "Fournisseur inactif",
|
||||
allSourcesHidden: "Aucune source d'utilisation affichée",
|
||||
chooseSources: "Choisir les sources",
|
||||
showCard: "Afficher {{source}}",
|
||||
refreshAll: "Tout actualiser",
|
||||
refreshing: "Actualisation...",
|
||||
loading: "Chargement de l’utilisation...",
|
||||
@@ -3152,7 +3147,6 @@ export const fr: TranslationResources = {
|
||||
status: "État du fournisseur",
|
||||
checked: "Vérifié {{time}}",
|
||||
diagnosticReport: "Rapport de diagnostic",
|
||||
docs: "Documentation",
|
||||
dangerZone: "Zone de danger",
|
||||
removeHint: "Supprime ce fournisseur de config.json",
|
||||
},
|
||||
@@ -3199,7 +3193,7 @@ export const fr: TranslationResources = {
|
||||
noSearchMatches: "Aucun modèle ne correspond à votre recherche",
|
||||
noneDetected: "Aucun modèle détecté",
|
||||
noCustom: "Aucun modèle personnalisé",
|
||||
title: "Modèles",
|
||||
discovered: "Détectés",
|
||||
custom: "Modèles personnalisés",
|
||||
updated: "Mis à jour {{time}}",
|
||||
},
|
||||
|
||||
@@ -354,7 +354,6 @@ export const ja: TranslationResources = {
|
||||
copyTurn: "ターンをコピー",
|
||||
copyMessage: "メッセージをコピー",
|
||||
forkMenu: "メッセージをフォーク",
|
||||
turnStats: "ターンの統計",
|
||||
forkInNewTab: "新しいタブにフォーク",
|
||||
forkInNewWorkspace: "新しいワークスペースにフォーク",
|
||||
forkUnavailable: "これを使用するにはホストを更新してください。",
|
||||
@@ -2288,11 +2287,7 @@ export const ja: TranslationResources = {
|
||||
title: "プラン使用量",
|
||||
refresh: "更新",
|
||||
reorderCard: "{{source}} を並べ替え",
|
||||
sources: "ソース",
|
||||
sourcesCount: "{{shown}} / {{total}}",
|
||||
providerInactive: "プロバイダー無効",
|
||||
allSourcesHidden: "表示中の使用量ソースはありません",
|
||||
chooseSources: "ソースを選択",
|
||||
showCard: "{{source}} を表示",
|
||||
refreshAll: "すべて更新",
|
||||
refreshing: "更新中...",
|
||||
loading: "使用状況を読み込み中...",
|
||||
@@ -3114,7 +3109,6 @@ export const ja: TranslationResources = {
|
||||
status: "プロバイダーの状態",
|
||||
checked: "{{time}}に確認",
|
||||
diagnosticReport: "診断レポート",
|
||||
docs: "ドキュメント",
|
||||
dangerZone: "危険な操作",
|
||||
removeHint: "このプロバイダーを config.json から削除します",
|
||||
},
|
||||
@@ -3160,7 +3154,7 @@ export const ja: TranslationResources = {
|
||||
noSearchMatches: "検索に一致するモデルがありません",
|
||||
noneDetected: "モデルが検出されませんでした",
|
||||
noCustom: "カスタムモデルはありません",
|
||||
title: "モデル",
|
||||
discovered: "検出済み",
|
||||
custom: "カスタムモデル",
|
||||
updated: "{{time}}に更新",
|
||||
},
|
||||
|
||||
@@ -350,7 +350,6 @@ export const ko: TranslationResources = {
|
||||
copyTurn: "턴 복사",
|
||||
copyMessage: "메시지 복사",
|
||||
forkMenu: "여기에서 채팅 분기",
|
||||
turnStats: "턴 통계",
|
||||
forkInNewTab: "새 탭으로 분기",
|
||||
forkInNewWorkspace: "새 워크스페이스로 분기",
|
||||
forkUnavailable: "이를 사용하려면 호스트를 업데이트하세요.",
|
||||
@@ -2276,11 +2275,7 @@ export const ko: TranslationResources = {
|
||||
title: "플랜 사용량",
|
||||
refresh: "새로 고침",
|
||||
reorderCard: "{{source}} 순서 변경",
|
||||
sources: "소스",
|
||||
sourcesCount: "{{shown}} / {{total}}",
|
||||
providerInactive: "제공업체 비활성",
|
||||
allSourcesHidden: "표시된 사용량 소스가 없습니다",
|
||||
chooseSources: "소스 선택",
|
||||
showCard: "{{source}} 표시",
|
||||
refreshAll: "모두 새로 고침",
|
||||
refreshing: "새로 고치는 중...",
|
||||
loading: "사용량 불러오는 중...",
|
||||
@@ -3099,7 +3094,6 @@ export const ko: TranslationResources = {
|
||||
status: "프로바이더 상태",
|
||||
checked: "{{time}} 확인됨",
|
||||
diagnosticReport: "진단 보고서",
|
||||
docs: "문서",
|
||||
dangerZone: "위험 구역",
|
||||
removeHint: "config.json에서 이 프로바이더를 삭제합니다",
|
||||
},
|
||||
@@ -3146,7 +3140,7 @@ export const ko: TranslationResources = {
|
||||
noSearchMatches: "검색과 일치하는 모델이 없습니다",
|
||||
noneDetected: "감지된 모델이 없습니다",
|
||||
noCustom: "사용자 지정 모델 없음",
|
||||
title: "모델",
|
||||
discovered: "발견됨",
|
||||
custom: "사용자 지정 모델",
|
||||
updated: "{{time}} 업데이트됨",
|
||||
},
|
||||
|
||||
@@ -353,7 +353,6 @@ export const ptBR: TranslationResources = {
|
||||
copyTurn: "Copiar turno",
|
||||
copyMessage: "Copiar mensagem",
|
||||
forkMenu: "Bifurcar mensagem",
|
||||
turnStats: "Estatísticas do turno",
|
||||
forkInNewTab: "Bifurcar em uma nova aba",
|
||||
forkInNewWorkspace: "Bifurcar em um novo workspace",
|
||||
forkUnavailable: "Atualize o host para usar isto.",
|
||||
@@ -2299,11 +2298,7 @@ export const ptBR: TranslationResources = {
|
||||
title: "Uso do plano",
|
||||
refresh: "Atualizar",
|
||||
reorderCard: "Reordenar {{source}}",
|
||||
sources: "Fontes",
|
||||
sourcesCount: "{{shown}} de {{total}}",
|
||||
providerInactive: "Provedor inativo",
|
||||
allSourcesHidden: "Nenhuma fonte de uso exibida",
|
||||
chooseSources: "Escolher fontes",
|
||||
showCard: "Mostrar {{source}}",
|
||||
refreshAll: "Atualizar tudo",
|
||||
refreshing: "Atualizando...",
|
||||
loading: "Carregando uso...",
|
||||
@@ -3127,7 +3122,6 @@ export const ptBR: TranslationResources = {
|
||||
status: "Status do provedor",
|
||||
checked: "Verificado {{time}}",
|
||||
diagnosticReport: "Relatório de diagnóstico",
|
||||
docs: "Documentação",
|
||||
dangerZone: "Zona de perigo",
|
||||
removeHint: "Exclui este provedor do config.json",
|
||||
},
|
||||
@@ -3173,7 +3167,7 @@ export const ptBR: TranslationResources = {
|
||||
noSearchMatches: "Nenhum modelo corresponde à sua busca",
|
||||
noneDetected: "Nenhum modelo detectado",
|
||||
noCustom: "Nenhum modelo personalizado",
|
||||
title: "Modelos",
|
||||
discovered: "Descobertos",
|
||||
custom: "Modelos personalizados",
|
||||
updated: "Atualizado {{time}}",
|
||||
},
|
||||
|
||||
@@ -353,7 +353,6 @@ export const ru: TranslationResources = {
|
||||
copyTurn: "Скопировать ответ",
|
||||
copyMessage: "Копировать сообщение",
|
||||
forkMenu: "Форкнуть чат отсюда",
|
||||
turnStats: "Статистика ответа",
|
||||
forkInNewTab: "Создать форк в новой вкладке",
|
||||
forkInNewWorkspace: "Создать форк в новом рабочем пространстве",
|
||||
forkUnavailable: "Обновите хост, чтобы использовать эту функцию.",
|
||||
@@ -2301,11 +2300,7 @@ export const ru: TranslationResources = {
|
||||
title: "Использование плана",
|
||||
refresh: "Обновить",
|
||||
reorderCard: "Переместить {{source}}",
|
||||
sources: "Источники",
|
||||
sourcesCount: "{{shown}} из {{total}}",
|
||||
providerInactive: "Провайдер неактивен",
|
||||
allSourcesHidden: "Источники использования скрыты",
|
||||
chooseSources: "Выбрать источники",
|
||||
showCard: "Показывать {{source}}",
|
||||
refreshAll: "Обновить всё",
|
||||
refreshing: "Обновление...",
|
||||
loading: "Загрузка данных об использовании...",
|
||||
@@ -3138,7 +3133,6 @@ export const ru: TranslationResources = {
|
||||
status: "Состояние провайдера",
|
||||
checked: "Проверено {{time}}",
|
||||
diagnosticReport: "Диагностический отчёт",
|
||||
docs: "Документация",
|
||||
dangerZone: "Опасная зона",
|
||||
removeHint: "Удаляет этого провайдера из config.json",
|
||||
},
|
||||
@@ -3185,7 +3179,7 @@ export const ru: TranslationResources = {
|
||||
noSearchMatches: "Ни одна модель не соответствует вашему запросу",
|
||||
noneDetected: "Модели не обнаружены",
|
||||
noCustom: "Нет пользовательских моделей",
|
||||
title: "Модели",
|
||||
discovered: "Обнаруженные модели",
|
||||
custom: "Пользовательские модели",
|
||||
updated: "Обновлено {{time}}",
|
||||
},
|
||||
|
||||
@@ -349,7 +349,6 @@ export const zhCN: TranslationResources = {
|
||||
copyTurn: "复制回合",
|
||||
copyMessage: "复制消息",
|
||||
forkMenu: "分叉消息",
|
||||
turnStats: "回合统计",
|
||||
forkInNewTab: "分叉到新标签页",
|
||||
forkInNewWorkspace: "分叉到新工作区",
|
||||
forkUnavailable: "请更新主机以使用此功能。",
|
||||
@@ -2242,11 +2241,7 @@ export const zhCN: TranslationResources = {
|
||||
title: "套餐用量",
|
||||
refresh: "刷新",
|
||||
reorderCard: "重新排序 {{source}}",
|
||||
sources: "来源",
|
||||
sourcesCount: "{{shown}} / {{total}}",
|
||||
providerInactive: "提供商未启用",
|
||||
allSourcesHidden: "未显示任何用量来源",
|
||||
chooseSources: "选择来源",
|
||||
showCard: "显示 {{source}}",
|
||||
refreshAll: "全部刷新",
|
||||
refreshing: "刷新中...",
|
||||
loading: "正在加载用量...",
|
||||
@@ -3047,7 +3042,6 @@ export const zhCN: TranslationResources = {
|
||||
status: "Provider 状态",
|
||||
checked: "{{time}}检查",
|
||||
diagnosticReport: "诊断报告",
|
||||
docs: "文档",
|
||||
dangerZone: "危险操作",
|
||||
removeHint: "从 config.json 中删除此 Provider",
|
||||
},
|
||||
@@ -3093,7 +3087,7 @@ export const zhCN: TranslationResources = {
|
||||
noSearchMatches: "没有匹配搜索的 Model",
|
||||
noneDetected: "未检测到 Model",
|
||||
noCustom: "没有自定义模型",
|
||||
title: "Models",
|
||||
discovered: "已发现",
|
||||
custom: "自定义 Models",
|
||||
updated: "已更新 {{time}}",
|
||||
},
|
||||
|
||||
@@ -1,22 +1,17 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import type { NavigationContainerRefWithCurrent } from "expo-router/react-navigation";
|
||||
import {
|
||||
getFocusedWorkspaceSelection,
|
||||
navigateToHostWorkspaceRoute,
|
||||
registerWorkspaceRouteNavigationRef,
|
||||
} from "./workspace-route-navigation";
|
||||
|
||||
function createNavigationRef(
|
||||
rootState: unknown,
|
||||
options: { ready?: boolean; currentRoute?: { name: string; params?: object } } = {},
|
||||
) {
|
||||
function createNavigationRef(rootState: unknown, options: { ready?: boolean } = {}) {
|
||||
const dispatch = vi.fn();
|
||||
let ready = options.ready ?? true;
|
||||
const readyListeners = new Set<() => void>();
|
||||
const navigation = {
|
||||
isReady: () => ready,
|
||||
getRootState: () => rootState,
|
||||
getCurrentRoute: () => options.currentRoute,
|
||||
dispatch,
|
||||
addListener: (event: string, listener: () => void) => {
|
||||
if (event === "ready") readyListeners.add(listener);
|
||||
@@ -220,27 +215,3 @@ describe("navigateToHostWorkspaceRoute", () => {
|
||||
expect(dismissTo).toHaveBeenCalledWith("/h/server-1/workspace/workspace-a");
|
||||
});
|
||||
});
|
||||
|
||||
describe("getFocusedWorkspaceSelection", () => {
|
||||
function focus(currentRoute?: { name: string; params?: object }) {
|
||||
registerWorkspaceRouteNavigationRef(createNavigationRef({}, { currentRoute }).navigationRef);
|
||||
}
|
||||
|
||||
it("returns the workspace on screen", () => {
|
||||
focus({
|
||||
name: "workspace/[workspaceId]/index",
|
||||
params: { serverId: "server-1", workspaceId: "workspace-a" },
|
||||
});
|
||||
|
||||
expect(getFocusedWorkspaceSelection()).toEqual({
|
||||
serverId: "server-1",
|
||||
workspaceId: "workspace-a",
|
||||
});
|
||||
});
|
||||
|
||||
it("returns null when a non-workspace screen is focused", () => {
|
||||
focus({ name: "settings/[section]", params: { section: "general" } });
|
||||
|
||||
expect(getFocusedWorkspaceSelection()).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -5,7 +5,6 @@ import type {
|
||||
} from "expo-router/react-navigation";
|
||||
import { router, type Href } from "expo-router";
|
||||
import {
|
||||
decodeWorkspaceIdFromPathSegment,
|
||||
encodeWorkspaceIdForPathSegment,
|
||||
getHostWorkspaceOpenParamFromPathname,
|
||||
parseHostWorkspaceRouteFromPathname,
|
||||
@@ -40,27 +39,6 @@ export function registerWorkspaceRouteNavigationRef(
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* The workspace on screen right now, read from the focused route, or null on any other screen
|
||||
* (Settings, New workspace, ...). Unlike a component's last render, it stays correct for work that
|
||||
* finishes after the screen that started it is gone.
|
||||
*/
|
||||
export function getFocusedWorkspaceSelection(): { serverId: string; workspaceId: string } | null {
|
||||
// Typed routes narrow the container's route to `never`; this only reads name and params.
|
||||
const route = rootNavigationRef?.current?.getCurrentRoute() as
|
||||
| { name: string; params?: { serverId?: unknown; workspaceId?: unknown } }
|
||||
| undefined;
|
||||
if (route?.name !== HOST_WORKSPACE_ROUTE_NAME) {
|
||||
return null;
|
||||
}
|
||||
const params = route.params;
|
||||
if (typeof params?.serverId !== "string" || typeof params.workspaceId !== "string") {
|
||||
return null;
|
||||
}
|
||||
const workspaceId = decodeWorkspaceIdFromPathSegment(params.workspaceId);
|
||||
return workspaceId ? { serverId: params.serverId, workspaceId } : null;
|
||||
}
|
||||
|
||||
interface MountedRouteStack {
|
||||
key: string;
|
||||
focusedRouteName: string | null;
|
||||
|
||||
@@ -1,53 +1,44 @@
|
||||
import { useMemo } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { View } from "react-native";
|
||||
import { withUnistyles } from "react-native-unistyles";
|
||||
import { SettingsDetailHeader } from "@/components/settings";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { ICON_SIZE, type Theme } from "@/styles/theme";
|
||||
import { ProviderDetail, useProviderDetail } from "./provider-detail";
|
||||
import { ProviderGlyph } from "./provider-glyph";
|
||||
|
||||
/**
|
||||
* A provider's detail as a Settings page, shaped like a project's. On wide layouts the page is
|
||||
* titled "Providers > name" and "Providers" goes back. On compact layouts the screen titles it
|
||||
* "Providers" and the page names the provider.
|
||||
* A provider's detail as a Settings page, shaped like a project's: the screen titles it
|
||||
* "Providers", the page names the provider. On wide layouts the page has no back button of its
|
||||
* own, so it draws "Back to providers".
|
||||
*/
|
||||
export function ProviderDetailPage({
|
||||
serverId,
|
||||
provider,
|
||||
onBack,
|
||||
showBack,
|
||||
}: {
|
||||
serverId: string;
|
||||
provider: string;
|
||||
onBack: () => void;
|
||||
showBack: boolean;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const isCompact = useIsCompactFormFactor();
|
||||
const detail = useProviderDetail({ serverId, provider, onRemoved: onBack });
|
||||
const parent = useMemo(
|
||||
const back = useMemo(
|
||||
() => ({
|
||||
label: t("settings.hostSections.providers"),
|
||||
accessibilityLabel: t("settings.providers.detail.backToProviders"),
|
||||
label: t("settings.providers.detail.backToProviders"),
|
||||
onPress: onBack,
|
||||
testID: "provider-detail-back",
|
||||
}),
|
||||
[onBack, t],
|
||||
);
|
||||
const icon = useMemo(
|
||||
() => (
|
||||
<ThemedProviderGlyph
|
||||
serverId={serverId}
|
||||
provider={provider}
|
||||
uniProps={isCompact ? rowTitleSize : pageTitleSize}
|
||||
/>
|
||||
),
|
||||
[isCompact, provider, serverId],
|
||||
() => <ProviderGlyph serverId={serverId} provider={provider} />,
|
||||
[provider, serverId],
|
||||
);
|
||||
return (
|
||||
<View testID="provider-detail-page">
|
||||
<SettingsDetailHeader
|
||||
parent={parent}
|
||||
back={showBack ? back : undefined}
|
||||
icon={icon}
|
||||
title={detail.label}
|
||||
titleTestID="provider-detail-title"
|
||||
@@ -56,8 +47,3 @@ export function ProviderDetailPage({
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
// The glyph is as large as the name beside it. The page title scales with the interface size.
|
||||
const ThemedProviderGlyph = withUnistyles(ProviderGlyph);
|
||||
const pageTitleSize = (theme: Theme) => ({ size: theme.fontSize["4xl"] });
|
||||
const rowTitleSize = () => ({ size: ICON_SIZE.md });
|
||||
|
||||
@@ -14,9 +14,9 @@ import { Alert } from "@/components/ui/alert";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { readAcpProviderInstallGuide } from "@/hooks/use-acp-provider-catalog";
|
||||
import { useProvidersSnapshot } from "@/hooks/use-providers-snapshot";
|
||||
import { useTimeAgo } from "@/hooks/use-time-ago";
|
||||
import { useHostRuntimeIsConnected } from "@/runtime/host-runtime";
|
||||
import { settingsStyles } from "@/styles/settings";
|
||||
import { openExternalUrl } from "@/utils/open-external-url";
|
||||
import {
|
||||
readDetailPresence,
|
||||
readDetailSections,
|
||||
@@ -27,7 +27,6 @@ import { DiagnosticSheet } from "./diagnostic-sheet";
|
||||
import { useProviderConfigActions, type ProviderEntry } from "./provider-config";
|
||||
import { ProviderModels } from "./provider-models";
|
||||
import { ProviderNotice } from "./provider-notice";
|
||||
import { ProviderRefreshButton, useCheckedLabel, type ProviderRefresh } from "./provider-refresh";
|
||||
|
||||
export interface ProviderDetailState {
|
||||
provider: string;
|
||||
@@ -82,9 +81,6 @@ export function useProviderDetail({
|
||||
/**
|
||||
* Everything about one provider, top to bottom: what is wrong, whether it runs, its installation,
|
||||
* its models, then the rare actions. The page and the sheet frame the same body.
|
||||
*
|
||||
* Refresh sits with the model list, which is what it is most often pressed for. A provider that
|
||||
* lists no models of its own keeps it under Troubleshooting.
|
||||
*/
|
||||
export function ProviderDetail({
|
||||
serverId,
|
||||
@@ -110,13 +106,6 @@ export function ProviderDetail({
|
||||
installGuide: readAcpProviderInstallGuide(provider),
|
||||
});
|
||||
const sections = readDetailSections(entry, shownInstallation);
|
||||
const listsModels = sections.models === "all";
|
||||
const providerRefresh: ProviderRefresh = {
|
||||
checkedAt: entry.fetchedAt,
|
||||
// The probe running again is a refresh too, whoever asked for it.
|
||||
busy: isRefreshing || installation.refreshing || entry.status === "loading",
|
||||
run: handleRefresh,
|
||||
};
|
||||
|
||||
return (
|
||||
<View testID="provider-detail">
|
||||
@@ -128,16 +117,13 @@ export function ProviderDetail({
|
||||
action={installation.action}
|
||||
/>
|
||||
{sections.models ? (
|
||||
<ProviderModels
|
||||
serverId={serverId}
|
||||
entry={entry}
|
||||
refresh={listsModels ? providerRefresh : null}
|
||||
/>
|
||||
<ProviderModels serverId={serverId} entry={entry} discovered={sections.models === "all"} />
|
||||
) : null}
|
||||
<Troubleshooting
|
||||
serverId={serverId}
|
||||
entry={entry}
|
||||
refresh={listsModels ? null : providerRefresh}
|
||||
refreshing={isRefreshing || installation.refreshing}
|
||||
onRefresh={handleRefresh}
|
||||
/>
|
||||
{/* Config no longer owns a provider whose removal has succeeded. */}
|
||||
{detail.removing || detail.canRemove(entry) ? (
|
||||
@@ -196,39 +182,42 @@ function EnabledCard({ serverId, entry }: { serverId: string; entry: ProviderEnt
|
||||
function Troubleshooting({
|
||||
serverId,
|
||||
entry,
|
||||
refresh,
|
||||
refreshing,
|
||||
onRefresh,
|
||||
}: {
|
||||
serverId: string;
|
||||
entry: ProviderEntry;
|
||||
/** Null when the model list carries Refresh. */
|
||||
refresh: ProviderRefresh | null;
|
||||
refreshing: boolean;
|
||||
onRefresh: () => void;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const [diagnosticOpen, setDiagnosticOpen] = useState(false);
|
||||
const openDiagnostic = useCallback(() => setDiagnosticOpen(true), []);
|
||||
const closeDiagnostic = useCallback(() => setDiagnosticOpen(false), []);
|
||||
const docsUrl = entry.docsUrl;
|
||||
const openDocs = useCallback(() => {
|
||||
if (docsUrl) void openExternalUrl(docsUrl);
|
||||
}, [docsUrl]);
|
||||
const checked = useTimeAgo(entry.fetchedAt ? new Date(entry.fetchedAt) : null);
|
||||
// The probe running again is a refresh too, whoever asked for it.
|
||||
const busy = refreshing || entry.status === "loading";
|
||||
|
||||
return (
|
||||
<SettingsSection title={t("settings.providers.detail.troubleshooting")}>
|
||||
<SettingsCard>
|
||||
{refresh ? <ProviderStatusRow refresh={refresh} /> : null}
|
||||
<SettingsRow
|
||||
label={t("settings.providers.detail.status")}
|
||||
hint={
|
||||
entry.fetchedAt ? t("settings.providers.detail.checked", { time: checked }) : undefined
|
||||
}
|
||||
>
|
||||
<Button variant="outline" onPress={onRefresh} loading={busy} testID="provider-refresh">
|
||||
{busy
|
||||
? t("settings.providers.diagnostic.refreshing")
|
||||
: t("settings.providers.diagnostic.refresh")}
|
||||
</Button>
|
||||
</SettingsRow>
|
||||
<SettingsDetailRow
|
||||
label={t("settings.providers.detail.diagnosticReport")}
|
||||
onPress={openDiagnostic}
|
||||
testID="provider-diagnostic-report"
|
||||
/>
|
||||
{docsUrl ? (
|
||||
<SettingsDetailRow
|
||||
label={t("settings.providers.detail.docs")}
|
||||
onPress={openDocs}
|
||||
external
|
||||
testID="provider-docs"
|
||||
/>
|
||||
) : null}
|
||||
</SettingsCard>
|
||||
<DiagnosticSheet
|
||||
serverId={serverId}
|
||||
@@ -240,16 +229,6 @@ function Troubleshooting({
|
||||
);
|
||||
}
|
||||
|
||||
function ProviderStatusRow({ refresh }: { refresh: ProviderRefresh }) {
|
||||
const { t } = useTranslation();
|
||||
const checked = useCheckedLabel(refresh);
|
||||
return (
|
||||
<SettingsRow label={t("settings.providers.detail.status")} hint={checked}>
|
||||
<ProviderRefreshButton refresh={refresh} form="labelled" />
|
||||
</SettingsRow>
|
||||
);
|
||||
}
|
||||
|
||||
function DangerZone({ removing, onRemove }: { removing: boolean; onRemove: () => void }) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
|
||||
@@ -2,18 +2,10 @@ import { StyleSheet } from "react-native-unistyles";
|
||||
import { useProviderIcon } from "@/components/provider-icons";
|
||||
import { ICON_SIZE } from "@/styles/theme";
|
||||
|
||||
/** A provider's icon in the foreground colour, at row size unless the caller names another. */
|
||||
export function ProviderGlyph({
|
||||
serverId,
|
||||
provider,
|
||||
size = ICON_SIZE.md,
|
||||
}: {
|
||||
serverId: string;
|
||||
provider: string;
|
||||
size?: number;
|
||||
}) {
|
||||
/** A provider's icon at row size, drawn in the foreground colour. */
|
||||
export function ProviderGlyph({ serverId, provider }: { serverId: string; provider: string }) {
|
||||
const Icon = useProviderIcon(provider, serverId);
|
||||
return <Icon size={size} color={styles.glyph.color} />;
|
||||
return <Icon size={ICON_SIZE.md} color={styles.glyph.color} />;
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Plus, Trash2 } from "lucide-react-native";
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { ScrollView, Text, View } from "react-native";
|
||||
import { Text, View } from "react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import type { AgentModelDefinition } from "@getpaseo/protocol/agent-types";
|
||||
import type { ProviderProfileModel } from "@getpaseo/protocol/provider-config";
|
||||
@@ -26,7 +26,6 @@ import {
|
||||
type ProviderDiscoveredModelsCache,
|
||||
} from "./discovered-models";
|
||||
import type { ProviderEntry } from "./provider-config";
|
||||
import { ProviderRefreshButton, useCheckedLabel, type ProviderRefresh } from "./provider-refresh";
|
||||
|
||||
const ThemedTrash = withUnistyles(Trash2);
|
||||
const destructiveColorMapping = (theme: Theme) => ({ color: theme.colors.destructive });
|
||||
@@ -52,19 +51,15 @@ function rankModels<T>(items: T[], query: string, fields: (item: T) => string[])
|
||||
export function ProviderModels({
|
||||
serverId,
|
||||
entry,
|
||||
refresh,
|
||||
discovered,
|
||||
}: {
|
||||
serverId: string;
|
||||
entry: ProviderEntry;
|
||||
/**
|
||||
* Lists the models the provider reports, with search and the way to ask for them again. Null for
|
||||
* a provider that is not running, which reports none.
|
||||
*/
|
||||
refresh: ProviderRefresh | null;
|
||||
/** List the models the provider reports, with search. Only a running provider reports them. */
|
||||
discovered: boolean;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const provider = entry.provider;
|
||||
const discovered = refresh !== null;
|
||||
const { config, patchConfig } = useDaemonConfig(serverId);
|
||||
const [query, setQuery] = useState("");
|
||||
const [addSheetOpen, setAddSheetOpen] = useState(false);
|
||||
@@ -135,8 +130,10 @@ export function ProviderModels({
|
||||
|
||||
const discoveredTrailing = useMemo(
|
||||
() =>
|
||||
refresh ? <DiscoveredTrailing count={discoveredModels.length} refresh={refresh} /> : null,
|
||||
[discoveredModels.length, refresh],
|
||||
discoveredModels.length > 0 ? (
|
||||
<Text style={settingsStyles.sectionHeaderTitle}>{discoveredModels.length}</Text>
|
||||
) : null,
|
||||
[discoveredModels.length],
|
||||
);
|
||||
|
||||
let discoveredBody: React.ReactNode;
|
||||
@@ -176,29 +173,23 @@ export function ProviderModels({
|
||||
return (
|
||||
<View testID="provider-models">
|
||||
{discovered ? (
|
||||
<SettingsSection title={t("settings.providers.models.title")} trailing={discoveredTrailing}>
|
||||
<View style={styles.searchRow}>
|
||||
<>
|
||||
<View style={styles.searchRail}>
|
||||
<SearchField
|
||||
value={query}
|
||||
onChangeText={setQuery}
|
||||
placeholder={t("settings.providers.models.searchPlaceholder")}
|
||||
clearAccessibilityLabel={t("sessions.actions.clearSearch")}
|
||||
fullWidth
|
||||
testID="provider-settings-search"
|
||||
/>
|
||||
</View>
|
||||
<View style={settingsStyles.card}>
|
||||
{/* A provider can report hundreds of models; the rest of the page stays in reach. */}
|
||||
<ScrollView
|
||||
style={styles.discoveredList}
|
||||
// Android scrolls a ScrollView nested in the page or the sheet only with this flag.
|
||||
nestedScrollEnabled
|
||||
testID="provider-discovered-models"
|
||||
>
|
||||
{discoveredBody}
|
||||
</ScrollView>
|
||||
</View>
|
||||
</SettingsSection>
|
||||
<SettingsSection
|
||||
title={t("settings.providers.models.discovered")}
|
||||
trailing={discoveredTrailing}
|
||||
>
|
||||
<View style={settingsStyles.card}>{discoveredBody}</View>
|
||||
</SettingsSection>
|
||||
</>
|
||||
) : null}
|
||||
<SettingsSection title={t("settings.providers.models.custom")} trailing={customTrailing}>
|
||||
<View style={settingsStyles.card}>{customBody}</View>
|
||||
@@ -214,22 +205,6 @@ export function ProviderModels({
|
||||
);
|
||||
}
|
||||
|
||||
/** How many models the provider reports, when it last reported them, and the way to ask again. */
|
||||
function DiscoveredTrailing({ count, refresh }: { count: number; refresh: ProviderRefresh }) {
|
||||
const checked = useCheckedLabel(refresh);
|
||||
const facts = [count > 0 ? String(count) : null, checked].filter(Boolean).join(" · ");
|
||||
return (
|
||||
<View style={styles.headerTrailing}>
|
||||
{facts ? (
|
||||
<Text style={[settingsStyles.sectionHeaderTitle, styles.headerFacts]} numberOfLines={1}>
|
||||
{facts}
|
||||
</Text>
|
||||
) : null}
|
||||
<ProviderRefreshButton refresh={refresh} form="icon" />
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
function MutedRow({ children }: { children: string }) {
|
||||
return (
|
||||
<View style={styles.modelRow}>
|
||||
@@ -392,23 +367,15 @@ function AddCustomModelSheet({
|
||||
const ADD_SNAP_POINTS = ["40%"];
|
||||
|
||||
const styles = StyleSheet.create((theme) => ({
|
||||
// The search field sizes itself along a row.
|
||||
searchRow: {
|
||||
searchRail: {
|
||||
flexDirection: "row",
|
||||
},
|
||||
// Nine rows and part of a tenth, so a longer list visibly continues.
|
||||
discoveredList: {
|
||||
maxHeight: 320,
|
||||
marginBottom: theme.spacing[3],
|
||||
},
|
||||
headerTrailing: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: theme.spacing[1],
|
||||
},
|
||||
// The facts give way before the button does.
|
||||
headerFacts: {
|
||||
flexShrink: 1,
|
||||
},
|
||||
modelRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
import { RotateCw } from "lucide-react-native";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { useTimeAgo } from "@/hooks/use-time-ago";
|
||||
|
||||
/** Asking the provider again for its status, version and models. */
|
||||
export interface ProviderRefresh {
|
||||
/** When the provider last answered. Absent before its first answer. */
|
||||
checkedAt: string | undefined;
|
||||
/** A check is running, whoever asked for it. */
|
||||
busy: boolean;
|
||||
run: () => void;
|
||||
}
|
||||
|
||||
/** "Checked 5m ago", kept current, or nothing before the provider's first answer. */
|
||||
export function useCheckedLabel(refresh: ProviderRefresh): string | undefined {
|
||||
const { t } = useTranslation();
|
||||
const time = useTimeAgo(refresh.checkedAt ? new Date(refresh.checkedAt) : null);
|
||||
return refresh.checkedAt ? t("settings.providers.detail.checked", { time }) : undefined;
|
||||
}
|
||||
|
||||
export function ProviderRefreshButton({
|
||||
refresh,
|
||||
form,
|
||||
}: {
|
||||
refresh: ProviderRefresh;
|
||||
/** `icon` in a section header, `labelled` in a row. */
|
||||
form: "icon" | "labelled";
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
const label = refresh.busy
|
||||
? t("settings.providers.diagnostic.refreshing")
|
||||
: t("settings.providers.diagnostic.refresh");
|
||||
if (form === "icon")
|
||||
return (
|
||||
<Button
|
||||
variant="ghost"
|
||||
leftIcon={RotateCw}
|
||||
onPress={refresh.run}
|
||||
loading={refresh.busy}
|
||||
accessibilityLabel={label}
|
||||
testID="provider-refresh"
|
||||
/>
|
||||
);
|
||||
return (
|
||||
<Button
|
||||
variant="outline"
|
||||
onPress={refresh.run}
|
||||
loading={refresh.busy}
|
||||
testID="provider-refresh"
|
||||
>
|
||||
{label}
|
||||
</Button>
|
||||
);
|
||||
}
|
||||
@@ -806,28 +806,6 @@ describe("ReplicaCache", () => {
|
||||
expect((await cache.readTimeline(SERVER_ID, "agent-1"))?.items).toEqual([timelineItem("New")]);
|
||||
});
|
||||
|
||||
it("keeps a turn's stats on its footer row across cache reopen", async () => {
|
||||
const storage = new MemoryStorage();
|
||||
const writer = createCache(storage);
|
||||
const answer: StreamItem = {
|
||||
...(timelineItem("Done") as Extract<StreamItem, { kind: "assistant_message" }>),
|
||||
turnMetrics: [
|
||||
{ label: "Model", value: "gemini-3.6-flash" },
|
||||
{ label: "Cache", value: "64%", tone: "ok" },
|
||||
],
|
||||
};
|
||||
writer.commitTimeline(SERVER_ID, "agent-1", {
|
||||
agentId: "agent-1",
|
||||
items: [answer],
|
||||
range: { epoch: "epoch-1", startSeq: 12, endSeq: 12 },
|
||||
hasOlder: false,
|
||||
});
|
||||
await writer.flush();
|
||||
|
||||
const reader = createCache(storage);
|
||||
expect((await reader.readTimeline(SERVER_ID, "agent-1"))?.items).toEqual([answer]);
|
||||
});
|
||||
|
||||
it("round-trips plugin timeline items", async () => {
|
||||
const storage = new MemoryStorage();
|
||||
const writer = createCache(storage);
|
||||
|
||||
@@ -2,7 +2,6 @@ import { findMountedWindowStart } from "@/agent-stream/history-window";
|
||||
import { z } from "zod";
|
||||
import {
|
||||
AgentBackgroundWorkSummarySchema,
|
||||
AgentMetricSchema,
|
||||
AgentStatusSchema,
|
||||
AgentTimelineItemPayloadSchema,
|
||||
ForgeWebSchema,
|
||||
@@ -130,7 +129,6 @@ const StoredTimelineItemSchema = z.discriminatedUnion("kind", [
|
||||
...TimelineItemBaseShape,
|
||||
kind: z.literal("assistant_message"),
|
||||
messageId: z.string().optional(),
|
||||
turnMetrics: z.array(AgentMetricSchema).optional(),
|
||||
text: z.string(),
|
||||
// Reject old caches containing display fragments; refetch the complete source text.
|
||||
}),
|
||||
@@ -165,7 +163,6 @@ const StoredTimelineItemSchema = z.discriminatedUnion("kind", [
|
||||
...TimelineItemBaseShape,
|
||||
kind: z.literal("tool_call"),
|
||||
provider: AgentProviderSchema,
|
||||
turnMetrics: z.array(AgentMetricSchema).optional(),
|
||||
item: AgentTimelineItemPayloadSchema.refine((item) => item.type === "tool_call"),
|
||||
}),
|
||||
z.strictObject({
|
||||
@@ -485,7 +482,6 @@ function serializeTimelineItem(item: StreamItem): StoredTimelineItem | null {
|
||||
...base,
|
||||
kind: item.kind,
|
||||
...(item.messageId ? { messageId: item.messageId } : {}),
|
||||
...(item.turnMetrics ? { turnMetrics: item.turnMetrics } : {}),
|
||||
text: item.text,
|
||||
};
|
||||
case "thought":
|
||||
@@ -520,7 +516,6 @@ function serializeTimelineItem(item: StreamItem): StoredTimelineItem | null {
|
||||
...base,
|
||||
kind: item.kind,
|
||||
provider: item.payload.data.provider,
|
||||
...(item.turnMetrics ? { turnMetrics: item.turnMetrics } : {}),
|
||||
item: serializeAgentToolCall(item.payload.data),
|
||||
};
|
||||
case "plugin":
|
||||
@@ -580,7 +575,6 @@ function deserializeBuiltinTimelineItem(
|
||||
...base,
|
||||
kind: item.kind,
|
||||
...(item.messageId ? { messageId: item.messageId } : {}),
|
||||
...(item.turnMetrics ? { turnMetrics: item.turnMetrics } : {}),
|
||||
text: item.text,
|
||||
};
|
||||
case "thought":
|
||||
@@ -617,7 +611,6 @@ function deserializeBuiltinTimelineItem(
|
||||
return {
|
||||
...base,
|
||||
kind: item.kind,
|
||||
...(item.turnMetrics ? { turnMetrics: item.turnMetrics } : {}),
|
||||
payload: {
|
||||
source: "agent",
|
||||
data: {
|
||||
|
||||
@@ -29,9 +29,7 @@ import { EditingTextInput as TextInput } from "@/components/ui/text-input";
|
||||
import { SettingsTextAreaCard } from "@/components/settings-textarea";
|
||||
import { SettingsGroup } from "@/components/settings/headings/settings-group";
|
||||
import { SettingsSection } from "@/components/settings/headings/settings-section";
|
||||
import type { PageTitleParent } from "@/components/page-layout";
|
||||
import { useIsCompactFormFactor } from "@/constants/layout";
|
||||
import { SettingsDetailHeader } from "@/components/settings";
|
||||
import { SettingsBackLink, SettingsDetailHeader } from "@/components/settings";
|
||||
import { settingsStyles } from "@/styles/settings";
|
||||
import { useProjects } from "@/hooks/use-projects";
|
||||
import type { ProjectEditFormSnapshot } from "@/projects/edit-form";
|
||||
@@ -97,12 +95,14 @@ export interface ProjectSettingsScreenProps {
|
||||
serverId: string;
|
||||
projectId: string;
|
||||
onBackToProjects: () => void;
|
||||
showBackToProjects: boolean;
|
||||
}
|
||||
|
||||
export default function ProjectSettingsScreen({
|
||||
serverId,
|
||||
projectId,
|
||||
onBackToProjects,
|
||||
showBackToProjects,
|
||||
}: ProjectSettingsScreenProps) {
|
||||
const { projects } = useProjects();
|
||||
const project = useMemo(
|
||||
@@ -123,7 +123,12 @@ export default function ProjectSettingsScreen({
|
||||
selectedHost.repoRoot.trim().length > 0;
|
||||
|
||||
if (!project || !selectedHost || !client || !canEdit) {
|
||||
return <NoProject onBackToProjects={onBackToProjects} />;
|
||||
return (
|
||||
<NoEditableTarget
|
||||
onBackToProjects={onBackToProjects}
|
||||
showBackToProjects={showBackToProjects}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -133,29 +138,24 @@ export default function ProjectSettingsScreen({
|
||||
client={client}
|
||||
isHostGone={isHostGone}
|
||||
onBackToProjects={onBackToProjects}
|
||||
showBackToProjects={showBackToProjects}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
/** A project page with no project to name: the title is the way back to Projects. */
|
||||
function NoProject({ onBackToProjects }: { onBackToProjects: () => void }) {
|
||||
const parent = useProjectsParent(onBackToProjects);
|
||||
return (
|
||||
<>
|
||||
<SettingsDetailHeader parent={parent} />
|
||||
<NoEditableTarget onBackToProjects={onBackToProjects} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
function NoEditableTarget({ onBackToProjects }: { onBackToProjects: () => void }) {
|
||||
function NoEditableTarget({
|
||||
onBackToProjects,
|
||||
showBackToProjects,
|
||||
}: {
|
||||
onBackToProjects: () => void;
|
||||
showBackToProjects: boolean;
|
||||
}) {
|
||||
const { t } = useTranslation();
|
||||
// The compact back header already goes back to Projects.
|
||||
const isCompact = useIsCompactFormFactor();
|
||||
return (
|
||||
<View style={styles.noTargetContainer}>
|
||||
{showBackToProjects ? <BackToProjectsButton onPress={onBackToProjects} /> : null}
|
||||
<Text style={styles.noTargetText}>{t("settings.project.noEditableTarget")}</Text>
|
||||
{isCompact ? null : (
|
||||
{showBackToProjects ? (
|
||||
<Button
|
||||
testID="project-settings-back-button"
|
||||
onPress={onBackToProjects}
|
||||
@@ -163,22 +163,19 @@ function NoEditableTarget({ onBackToProjects }: { onBackToProjects: () => void }
|
||||
>
|
||||
{t("settings.project.backToProjects")}
|
||||
</Button>
|
||||
)}
|
||||
) : null}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
/** Projects as the first part of a project page's title, which goes back to the list. */
|
||||
function useProjectsParent(onPress: () => void): PageTitleParent {
|
||||
function BackToProjectsButton({ onPress }: { onPress: () => void }) {
|
||||
const { t } = useTranslation();
|
||||
return useMemo(
|
||||
() => ({
|
||||
label: t("settings.projects"),
|
||||
accessibilityLabel: t("settings.project.backToProjects"),
|
||||
onPress,
|
||||
testID: "project-settings-back-link",
|
||||
}),
|
||||
[onPress, t],
|
||||
return (
|
||||
<SettingsBackLink
|
||||
label={t("settings.project.backToProjects")}
|
||||
onPress={onPress}
|
||||
testID="project-settings-back-link"
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -188,6 +185,7 @@ interface ProjectSettingsBodyProps {
|
||||
client: DaemonClient;
|
||||
isHostGone: boolean;
|
||||
onBackToProjects: () => void;
|
||||
showBackToProjects: boolean;
|
||||
}
|
||||
|
||||
function ProjectSettingsBody({
|
||||
@@ -196,6 +194,7 @@ function ProjectSettingsBody({
|
||||
client,
|
||||
isHostGone,
|
||||
onBackToProjects,
|
||||
showBackToProjects,
|
||||
}: ProjectSettingsBodyProps) {
|
||||
const { t } = useTranslation();
|
||||
const [isEditSheetOpen, setIsEditSheetOpen] = useState(false);
|
||||
@@ -257,7 +256,17 @@ function ProjectSettingsBody({
|
||||
const handleReload = useCallback(() => {
|
||||
void readQuery.refetch();
|
||||
}, [readQuery]);
|
||||
const parent = useProjectsParent(onBackToProjects);
|
||||
const backLink = useMemo(
|
||||
() =>
|
||||
showBackToProjects
|
||||
? {
|
||||
label: t("settings.project.backToProjects"),
|
||||
onPress: onBackToProjects,
|
||||
testID: "project-settings-back-link",
|
||||
}
|
||||
: undefined,
|
||||
[onBackToProjects, showBackToProjects, t],
|
||||
);
|
||||
const titleIcon = useMemo(
|
||||
() => (
|
||||
<ProjectTitleIcon
|
||||
@@ -285,9 +294,9 @@ function ProjectSettingsBody({
|
||||
);
|
||||
|
||||
return (
|
||||
<View role="main">
|
||||
<View role="main" style={styles.body}>
|
||||
<SettingsDetailHeader
|
||||
parent={parent}
|
||||
back={backLink}
|
||||
icon={titleIcon}
|
||||
title={selectedHost.projectName}
|
||||
trailing={editButton}
|
||||
@@ -318,6 +327,7 @@ function ProjectSettingsBody({
|
||||
onReload: handleReload,
|
||||
isHostGone,
|
||||
onBackToProjects,
|
||||
showBackToProjects,
|
||||
})}
|
||||
</View>
|
||||
);
|
||||
@@ -335,6 +345,7 @@ interface RenderContentInput {
|
||||
onReload: () => void;
|
||||
isHostGone: boolean;
|
||||
onBackToProjects: () => void;
|
||||
showBackToProjects: boolean;
|
||||
}
|
||||
|
||||
function renderContent({
|
||||
@@ -349,6 +360,7 @@ function renderContent({
|
||||
onReload,
|
||||
isHostGone,
|
||||
onBackToProjects,
|
||||
showBackToProjects,
|
||||
}: RenderContentInput) {
|
||||
if (readQuery.isLoading) {
|
||||
return (
|
||||
@@ -367,7 +379,12 @@ function renderContent({
|
||||
}
|
||||
|
||||
if (isHostGone) {
|
||||
return <NoEditableTarget onBackToProjects={onBackToProjects} />;
|
||||
return (
|
||||
<NoEditableTarget
|
||||
onBackToProjects={onBackToProjects}
|
||||
showBackToProjects={showBackToProjects}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
if (!loadedConfig) {
|
||||
@@ -1101,6 +1118,10 @@ const styles = StyleSheet.create((theme) => ({
|
||||
color: theme.colors.foregroundMuted,
|
||||
fontSize: theme.fontSize.base,
|
||||
},
|
||||
body: {
|
||||
padding: theme.spacing[4],
|
||||
gap: theme.spacing[2],
|
||||
},
|
||||
editButton: {
|
||||
padding: theme.spacing[1],
|
||||
},
|
||||
|
||||
@@ -1335,6 +1335,7 @@ export default function SettingsScreen({ view }: SettingsScreenProps) {
|
||||
serverId={view.serverId}
|
||||
projectId={view.projectId}
|
||||
onBackToProjects={handleBackFromDetail}
|
||||
showBackToProjects={!isCompactLayout}
|
||||
/>
|
||||
);
|
||||
}
|
||||
@@ -1344,6 +1345,7 @@ export default function SettingsScreen({ view }: SettingsScreenProps) {
|
||||
serverId={view.serverId}
|
||||
provider={view.providerId}
|
||||
onBack={handleBackFromDetail}
|
||||
showBack={!isCompactLayout}
|
||||
/>
|
||||
);
|
||||
}
|
||||
@@ -1448,8 +1450,7 @@ export default function SettingsScreen({ view }: SettingsScreenProps) {
|
||||
<WindowChromeRegion corners="top-right">
|
||||
<View style={desktopStyles.contentPane} testID="settings-detail-pane">
|
||||
<PageLayout
|
||||
// A project or provider page draws its own title, which names the list it came from.
|
||||
title={view.kind === "project" || view.kind === "provider" ? undefined : detailTitle}
|
||||
title={detailTitle}
|
||||
actions={detailActions}
|
||||
width={detailWidth}
|
||||
titleTestID="settings-detail-header-title"
|
||||
|
||||
@@ -3,14 +3,7 @@ import React, { useCallback, useMemo } from "react";
|
||||
import { View } from "react-native";
|
||||
import { useRouter, type Href } from "expo-router";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import {
|
||||
Archive,
|
||||
Copy,
|
||||
Ellipsis,
|
||||
Globe,
|
||||
Import as ImportIcon,
|
||||
Settings,
|
||||
} from "lucide-react-native";
|
||||
import { Copy, Ellipsis, Globe, Import as ImportIcon, Settings } from "lucide-react-native";
|
||||
import { StyleSheet, withUnistyles } from "react-native-unistyles";
|
||||
import type { TerminalProfile } from "@getpaseo/protocol/messages";
|
||||
import {
|
||||
@@ -28,7 +21,6 @@ import {
|
||||
useIconButtonChromeStyle,
|
||||
} from "@/components/ui/icon-button-chrome";
|
||||
import { TerminalProfileIcon } from "@/components/terminal-profile-icon";
|
||||
import { useActiveWorkspaceArchive } from "@/hooks/use-active-workspace-archive";
|
||||
import { useDaemonConfig } from "@/hooks/use-daemon-config";
|
||||
import {
|
||||
getTerminalProfileIcon,
|
||||
@@ -43,7 +35,6 @@ import {
|
||||
import { usePluginWorkspaceMenu } from "@/plugins";
|
||||
|
||||
const ThemedEllipsis = withUnistyles(Ellipsis);
|
||||
const ThemedArchive = withUnistyles(Archive);
|
||||
const ThemedCopy = withUnistyles(Copy);
|
||||
const ThemedGlobe = withUnistyles(Globe);
|
||||
const ThemedImport = withUnistyles(ImportIcon);
|
||||
@@ -54,7 +45,6 @@ const mutedColorMapping = (theme: Theme) => ({ color: theme.colors.foregroundMut
|
||||
const MENU_NEW_BROWSER_ICON = <ThemedGlobe size={16} uniProps={mutedColorMapping} />;
|
||||
const MENU_IMPORT_ICON = <ThemedImport size={16} uniProps={mutedColorMapping} />;
|
||||
const MENU_COPY_ICON = <ThemedCopy size={16} uniProps={mutedColorMapping} />;
|
||||
const MENU_ARCHIVE_ICON = <ThemedArchive size={16} uniProps={mutedColorMapping} />;
|
||||
const MENU_SETTINGS_ICON = <ThemedSettings size={16} uniProps={mutedColorMapping} />;
|
||||
function WorkspaceHeaderMenuTriggerIcon() {
|
||||
return (
|
||||
@@ -269,10 +259,6 @@ export function WorkspaceHeaderMenuMobile({
|
||||
const handleEditProfiles = useCallback(() => {
|
||||
router.push(buildSettingsHostSectionRoute(normalizedServerId, "terminals") as Href);
|
||||
}, [normalizedServerId, router]);
|
||||
const { canArchive, archive } = useActiveWorkspaceArchive();
|
||||
const handleArchiveWorkspace = useCallback(() => {
|
||||
archive();
|
||||
}, [archive]);
|
||||
const scriptsMenu = useWorkspaceScriptsMenuPages(scripts);
|
||||
const pluginMenu = usePluginWorkspaceMenu(normalizedServerId, normalizedWorkspaceId);
|
||||
const pages = useMemo(
|
||||
@@ -344,15 +330,6 @@ export function WorkspaceHeaderMenuMobile({
|
||||
) : null}
|
||||
<WorkspaceHeaderWorkspaceActionItems {...workspaceActions} />
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuItem
|
||||
testID="workspace-header-archive-workspace"
|
||||
leading={MENU_ARCHIVE_ICON}
|
||||
disabled={!canArchive}
|
||||
onSelect={handleArchiveWorkspace}
|
||||
>
|
||||
{t("sidebar.workspace.actions.archiveWorkspace")}
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuSeparator />
|
||||
<DropdownMenuLabel>{t("workspace.tabs.actions.terminalProfilesMenu")}</DropdownMenuLabel>
|
||||
{profiles.map((profile) => (
|
||||
<HeaderMenuProfileItem
|
||||
|
||||
@@ -115,12 +115,12 @@ describe("resolveSidebarNavItems", () => {
|
||||
});
|
||||
|
||||
describe("resolveSidebarNavItems for the Usage item", () => {
|
||||
it("shows the Usage item by default and honors an explicit off choice", () => {
|
||||
it("hides the Usage item until it is turned on", () => {
|
||||
const resolve = (preferences: SidebarNavPreference[]) =>
|
||||
summarize(resolveSidebarNavItems({ section: "footer", pluginGroups: [], preferences }));
|
||||
|
||||
expect(resolve([])).toEqual([{ key: "usage", visible: true }]);
|
||||
expect(resolve([{ key: "usage", visible: false }])).toEqual([{ key: "usage", visible: false }]);
|
||||
expect(resolve([])).toEqual([{ key: "usage", visible: false }]);
|
||||
expect(resolve([{ key: "usage", visible: true }])).toEqual([{ key: "usage", visible: true }]);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -297,7 +297,7 @@ describe("footer section", () => {
|
||||
});
|
||||
|
||||
expect(summarize(items)).toEqual([
|
||||
{ key: "usage", visible: true },
|
||||
{ key: "usage", visible: false },
|
||||
{ key: syncKey, visible: true },
|
||||
]);
|
||||
});
|
||||
@@ -309,7 +309,7 @@ describe("footer section", () => {
|
||||
preferences: [{ key: "history", visible: false }],
|
||||
});
|
||||
|
||||
expect(summarize(items)).toEqual([{ key: "usage", visible: true }]);
|
||||
expect(summarize(items)).toEqual([{ key: "usage", visible: false }]);
|
||||
});
|
||||
|
||||
it("ignores the footer icon buttons, which are fixed and not items", () => {
|
||||
|
||||
@@ -69,8 +69,11 @@ export function builtinSidebarNavShortcutAction(id: BuiltinSidebarItemId): strin
|
||||
return BUILTIN_SHORTCUT_ACTIONS[id];
|
||||
}
|
||||
|
||||
function builtinVisibleByDefault(_id: BuiltinSidebarItemId): boolean {
|
||||
return true;
|
||||
/** 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);
|
||||
}
|
||||
|
||||
export function pluginSidebarNavKey(
|
||||
|
||||
@@ -33,7 +33,6 @@ import type {
|
||||
AgentMode,
|
||||
AgentCapabilityFlags,
|
||||
AgentUsage,
|
||||
AgentMetric,
|
||||
AgentPersistenceHandle,
|
||||
} from "@getpaseo/protocol/agent-types";
|
||||
import type {
|
||||
@@ -94,8 +93,6 @@ export interface Agent {
|
||||
runtimeInfo?: AgentRuntimeInfo;
|
||||
usageScopeKey?: string;
|
||||
lastUsage?: AgentUsage;
|
||||
/** What the provider reports about the session, as label and value rows. */
|
||||
sessionMetrics?: AgentMetric[];
|
||||
lastError?: string | null;
|
||||
title: string | null;
|
||||
cwd: string;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { StyleSheet } from "react-native-unistyles";
|
||||
import { mapLayout, SWITCH_HEIGHT } from "@/components/ui/control-geometry";
|
||||
|
||||
export const settingsStyles = StyleSheet.create((theme) => ({
|
||||
section: {
|
||||
@@ -35,8 +34,6 @@ export const settingsStyles = StyleSheet.create((theme) => ({
|
||||
justifyContent: "space-between",
|
||||
paddingVertical: theme.spacing[4],
|
||||
paddingHorizontal: theme.spacing[4],
|
||||
// As tall as a row holding a switch, so rows with and without one line up.
|
||||
minHeight: mapLayout(SWITCH_HEIGHT, (height) => height + theme.spacing[4] * 2),
|
||||
},
|
||||
rowBorder: {
|
||||
borderTopWidth: 1,
|
||||
|
||||
@@ -4558,262 +4558,3 @@ describe("createAgentStreamReducerQueue", () => {
|
||||
expect(scheduler.size).toBe(0);
|
||||
});
|
||||
});
|
||||
|
||||
describe("turn metrics", () => {
|
||||
const metrics = [
|
||||
{ label: "Model", value: "opus" },
|
||||
{ label: "Cache", value: "82%", tone: "ok" as const },
|
||||
];
|
||||
|
||||
function liveTurn(events: AgentStreamEventPayload[]) {
|
||||
let seq = 0;
|
||||
return processAgentStreamEvents({
|
||||
events: events.map((event) =>
|
||||
event.type === "timeline"
|
||||
? makeStreamReducerEvent(event, ++seq)
|
||||
: { event, seq: undefined, epoch: undefined, timestamp: new Date(1000 + seq) },
|
||||
),
|
||||
currentTail: [],
|
||||
currentHead: [],
|
||||
currentCursor: undefined,
|
||||
});
|
||||
}
|
||||
|
||||
function inTurn(event: AgentStreamEventPayload, turnId: string): AgentStreamEventPayload {
|
||||
return { ...event, turnId } as AgentStreamEventPayload;
|
||||
}
|
||||
|
||||
function turnCompleted(turnId?: string, turnMetrics = metrics): AgentStreamEventPayload {
|
||||
return {
|
||||
type: "turn_completed",
|
||||
provider: "claude",
|
||||
...(turnId ? { turnId } : {}),
|
||||
metrics: turnMetrics,
|
||||
};
|
||||
}
|
||||
|
||||
function metricsByKind(items: StreamItem[]) {
|
||||
return items.map((item) => ({
|
||||
kind: item.kind,
|
||||
turnMetrics: "turnMetrics" in item ? item.turnMetrics : undefined,
|
||||
}));
|
||||
}
|
||||
|
||||
it("puts a live turn's metrics on its last assistant message", () => {
|
||||
const result = liveTurn([
|
||||
inTurn(makeTimelineEvent("question", "user_message"), "turn-1"),
|
||||
inTurn(makeAssistantTimelineEvent("Looking."), "turn-1"),
|
||||
inTurn(makeToolCallTimelineEvent("read-1"), "turn-1"),
|
||||
inTurn(makeAssistantTimelineEvent("Done."), "turn-1"),
|
||||
turnCompleted("turn-1"),
|
||||
]);
|
||||
|
||||
expect(metricsByKind([...result.tail, ...result.head])).toEqual([
|
||||
{ kind: "user_message", turnMetrics: undefined },
|
||||
{ kind: "assistant_message", turnMetrics: undefined },
|
||||
{ kind: "tool_call", turnMetrics: undefined },
|
||||
{ kind: "assistant_message", turnMetrics: metrics },
|
||||
]);
|
||||
});
|
||||
|
||||
it("puts a live tool-only turn's metrics on its last tool call", () => {
|
||||
const result = liveTurn([
|
||||
inTurn(makeTimelineEvent("question", "user_message"), "turn-1"),
|
||||
inTurn(makeToolCallTimelineEvent("read-1"), "turn-1"),
|
||||
inTurn(makeToolCallTimelineEvent("read-2"), "turn-1"),
|
||||
turnCompleted("turn-1"),
|
||||
]);
|
||||
|
||||
expect(metricsByKind(result.tail)).toEqual([
|
||||
{ kind: "user_message", turnMetrics: undefined },
|
||||
{ kind: "tool_call", turnMetrics: undefined },
|
||||
{ kind: "tool_call", turnMetrics: metrics },
|
||||
]);
|
||||
});
|
||||
|
||||
it("does not put a turn's metrics on an earlier turn's reply", () => {
|
||||
const result = liveTurn([
|
||||
inTurn(makeTimelineEvent("first", "user_message"), "turn-1"),
|
||||
inTurn(makeAssistantTimelineEvent("First reply."), "turn-1"),
|
||||
turnCompleted("turn-1", [{ label: "Model", value: "first" }]),
|
||||
inTurn(makeTimelineEvent("second", "user_message"), "turn-2"),
|
||||
inTurn(makeToolCallTimelineEvent("read-1"), "turn-2"),
|
||||
inTurn(makeTimelineEvent("thinking", "reasoning"), "turn-2"),
|
||||
turnCompleted("turn-2"),
|
||||
]);
|
||||
|
||||
expect(metricsByKind(result.tail)).toEqual([
|
||||
{ kind: "user_message", turnMetrics: undefined },
|
||||
{ kind: "assistant_message", turnMetrics: [{ label: "Model", value: "first" }] },
|
||||
{ kind: "user_message", turnMetrics: undefined },
|
||||
{ kind: "tool_call", turnMetrics: undefined },
|
||||
{ kind: "thought", turnMetrics: undefined },
|
||||
]);
|
||||
});
|
||||
|
||||
it("leaves the timeline untouched when a turn completes without metrics", () => {
|
||||
const before = liveTurn([
|
||||
inTurn(makeTimelineEvent("question", "user_message"), "turn-1"),
|
||||
inTurn(makeAssistantTimelineEvent("Done."), "turn-1"),
|
||||
turnCompleted("turn-1", []),
|
||||
]);
|
||||
const after = processAgentStreamEvent({
|
||||
...baseStreamInput,
|
||||
event: { type: "turn_completed", provider: "claude", turnId: "turn-1" },
|
||||
currentTail: before.tail,
|
||||
currentHead: before.head,
|
||||
});
|
||||
|
||||
expect(after.tail).toBe(before.tail);
|
||||
expect(metricsByKind(after.tail)).toEqual([
|
||||
{ kind: "user_message", turnMetrics: undefined },
|
||||
{ kind: "assistant_message", turnMetrics: undefined },
|
||||
]);
|
||||
});
|
||||
|
||||
it("hydrates turn metrics from a replaced history page", () => {
|
||||
const result = processTimelineResponse({
|
||||
...baseTimelineInput,
|
||||
payload: {
|
||||
...baseTimelineInput.payload,
|
||||
reset: true,
|
||||
startCursor: { seq: 1 },
|
||||
endCursor: { seq: 4 },
|
||||
entries: [
|
||||
makeTimelineEntry(1, "question", "user_message"),
|
||||
{ ...makeTimelineEntry(2, "Reply."), turnMetrics: metrics },
|
||||
makeTimelineEntry(3, "next question", "user_message"),
|
||||
{
|
||||
...makeToolCallTimelineEntry(4, "read-1", "completed", {
|
||||
type: "read",
|
||||
filePath: "/tmp/a.ts",
|
||||
}),
|
||||
turnMetrics: [{ label: "Model", value: "sonnet" }],
|
||||
},
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
expect(metricsByKind(result.tail)).toEqual([
|
||||
{ kind: "user_message", turnMetrics: undefined },
|
||||
{ kind: "assistant_message", turnMetrics: metrics },
|
||||
{ kind: "user_message", turnMetrics: undefined },
|
||||
{ kind: "tool_call", turnMetrics: [{ label: "Model", value: "sonnet" }] },
|
||||
]);
|
||||
});
|
||||
|
||||
it("hydrates turn metrics from an older history page", () => {
|
||||
const currentTail: StreamItem[] = [
|
||||
{ kind: "user_message", id: "current-3", text: "current-3", timestamp: new Date(3000) },
|
||||
];
|
||||
const result = processTimelineResponse({
|
||||
...baseTimelineInput,
|
||||
currentTail,
|
||||
currentCursor: { epoch: "epoch-1", startSeq: 3, endSeq: 3 },
|
||||
payload: {
|
||||
...baseTimelineInput.payload,
|
||||
direction: "before",
|
||||
startCursor: { seq: 1 },
|
||||
endCursor: { seq: 2 },
|
||||
entries: [
|
||||
makeTimelineEntry(1, "older question", "user_message"),
|
||||
{ ...makeTimelineEntry(2, "Older reply."), turnMetrics: metrics },
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
expect(metricsByKind(result.tail)).toEqual([
|
||||
{ kind: "user_message", turnMetrics: undefined },
|
||||
{ kind: "assistant_message", turnMetrics: metrics },
|
||||
{ kind: "user_message", turnMetrics: undefined },
|
||||
]);
|
||||
});
|
||||
|
||||
it("hydrates turn metrics on a projected reply that replaces the live one", () => {
|
||||
const live = processAgentStreamEvents({
|
||||
events: [makeStreamReducerEvent(makeAssistantTimelineEvent("Partial"), 2)],
|
||||
currentTail: [],
|
||||
currentHead: [],
|
||||
currentCursor: { epoch: "epoch-1", startSeq: 1, endSeq: 1 },
|
||||
});
|
||||
|
||||
const result = processTimelineResponse({
|
||||
...baseTimelineInput,
|
||||
currentTail: live.tail,
|
||||
currentHead: live.head,
|
||||
currentCursor: live.cursor ?? undefined,
|
||||
payload: {
|
||||
...baseTimelineInput.payload,
|
||||
startCursor: { seq: 3 },
|
||||
endCursor: { seq: 3 },
|
||||
entries: [
|
||||
{
|
||||
...makeTimelineEntry(2, "Partial reply.", "assistant_message", 3),
|
||||
sourceSeqRanges: [{ startSeq: 2, endSeq: 3 }],
|
||||
turnMetrics: metrics,
|
||||
},
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
expect(metricsByKind([...result.tail, ...result.head])).toEqual([
|
||||
{ kind: "assistant_message", turnMetrics: metrics },
|
||||
]);
|
||||
});
|
||||
|
||||
it("keeps live turn metrics when canonical history replaces the timeline", () => {
|
||||
const live = liveTurn([
|
||||
makeTimelineEvent("question", "user_message"),
|
||||
makeAssistantTimelineEvent("Done."),
|
||||
turnCompleted(),
|
||||
]);
|
||||
|
||||
const result = processTimelineResponse({
|
||||
...baseTimelineInput,
|
||||
currentTail: live.tail,
|
||||
currentHead: live.head,
|
||||
currentCursor: live.cursor ?? undefined,
|
||||
payload: {
|
||||
...baseTimelineInput.payload,
|
||||
reset: true,
|
||||
startCursor: { seq: 1 },
|
||||
endCursor: { seq: 2 },
|
||||
entries: [
|
||||
makeTimelineEntry(1, "question", "user_message"),
|
||||
{ ...makeTimelineEntry(2, "Done."), turnMetrics: metrics },
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
expect(metricsByKind(result.tail)).toEqual([
|
||||
{ kind: "user_message", turnMetrics: undefined },
|
||||
{ kind: "assistant_message", turnMetrics: metrics },
|
||||
]);
|
||||
});
|
||||
|
||||
it("keeps row identity when a page repeats metrics the row already has", () => {
|
||||
const first = processTimelineResponse({
|
||||
...baseTimelineInput,
|
||||
payload: {
|
||||
...baseTimelineInput.payload,
|
||||
reset: true,
|
||||
startCursor: { seq: 1 },
|
||||
endCursor: { seq: 1 },
|
||||
entries: [{ ...makeTimelineEntry(1, "Reply."), turnMetrics: metrics }],
|
||||
},
|
||||
});
|
||||
const repeated = processTimelineResponse({
|
||||
...baseTimelineInput,
|
||||
currentTail: first.tail,
|
||||
currentCursor: first.cursor ?? undefined,
|
||||
payload: {
|
||||
...baseTimelineInput.payload,
|
||||
startCursor: { seq: 1 },
|
||||
endCursor: { seq: 1 },
|
||||
entries: [{ ...makeTimelineEntry(1, "Reply."), turnMetrics: [...metrics] }],
|
||||
},
|
||||
});
|
||||
|
||||
expect(repeated.tail).toBe(first.tail);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import type { AgentMetric, AgentTimelineItem } from "@getpaseo/protocol/agent-types";
|
||||
import type { AgentTimelineItem } from "@getpaseo/protocol/agent-types";
|
||||
import type { AgentStreamEventPayload } from "@getpaseo/protocol/messages";
|
||||
import { selectAgentTimelineState, useSessionStore } from "@/stores/session-store";
|
||||
import type { AssistantMessageItem, StreamItem, TodoEntry } from "@/types/stream";
|
||||
import type { TurnLivenessTransition } from "@/timeline/turn-liveness";
|
||||
import { stampTimelineTurnMetrics } from "@/timeline/turn-metrics";
|
||||
import {
|
||||
applyStreamEvent,
|
||||
flushHeadToTail,
|
||||
@@ -134,7 +133,6 @@ interface TimelineResponseEntry {
|
||||
turnId?: string;
|
||||
item: AgentTimelineItem;
|
||||
timestamp: string;
|
||||
turnMetrics?: AgentMetric[];
|
||||
}
|
||||
|
||||
export interface ProcessTimelineResponseInput {
|
||||
@@ -1270,8 +1268,7 @@ export function processTimelineResponse(
|
||||
// ------------------------------------------------------------------
|
||||
// Convert entries to timeline units
|
||||
// ------------------------------------------------------------------
|
||||
const pageEntries = selectEntriesOwnedByTimelinePage(payload);
|
||||
const timelineUnits = pageEntries.map((entry) => ({
|
||||
const timelineUnits = selectEntriesOwnedByTimelinePage(payload).map((entry) => ({
|
||||
seq: entry.seqStart,
|
||||
seqEnd: entry.seqEnd,
|
||||
sourceSeqRanges:
|
||||
@@ -1382,8 +1379,8 @@ export function processTimelineResponse(
|
||||
});
|
||||
}
|
||||
|
||||
const nextTail = stampTimelineTurnMetrics(timelineResult.tail, payload.epoch, pageEntries);
|
||||
const nextHead = stampTimelineTurnMetrics(timelineResult.head, payload.epoch, pageEntries);
|
||||
const nextTail = timelineResult.tail;
|
||||
const nextHead = timelineResult.head;
|
||||
const nextCursor = timelineResult.cursor;
|
||||
const cursorChanged = timelineResult.cursorChanged;
|
||||
sideEffects.push(...timelineResult.sideEffects);
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
import type { AgentMetric } from "@getpaseo/protocol/agent-types";
|
||||
import { continuesResponse } from "@/agent-stream/turn-membership";
|
||||
import type { StreamItem, TimelinePosition } from "@/types/stream";
|
||||
|
||||
type TurnFooterAnchor = Extract<StreamItem, { kind: "assistant_message" | "tool_call" }>;
|
||||
|
||||
/**
|
||||
* Puts a completed turn's metrics on the row its footer hangs on: the turn's last assistant
|
||||
* message, else its last row when that row is a tool call. The daemon stamps the same row, so a
|
||||
* later timeline fetch agrees with what the live event showed.
|
||||
*/
|
||||
export function stampCompletedTurnMetrics(
|
||||
items: StreamItem[],
|
||||
metrics: AgentMetric[] | undefined,
|
||||
turnId: string | undefined,
|
||||
): StreamItem[] {
|
||||
if (!metrics || metrics.length === 0) return items;
|
||||
const index = findTurnFooterAnchorIndex(items, turnId);
|
||||
if (index === null) return items;
|
||||
return replaceAt(items, index, metrics);
|
||||
}
|
||||
|
||||
/**
|
||||
* Puts the metrics a timeline page carries on the rows it wrote. Every reducer path leaves a row
|
||||
* with the cursor of the last entry that wrote it, which is the entry the daemon stamped.
|
||||
*/
|
||||
export function stampTimelineTurnMetrics(
|
||||
items: StreamItem[],
|
||||
epoch: string,
|
||||
entries: ReadonlyArray<{ seqEnd: number; turnMetrics?: AgentMetric[] }>,
|
||||
): StreamItem[] {
|
||||
const metricsBySeq = new Map<number, AgentMetric[]>();
|
||||
for (const entry of entries) {
|
||||
if (entry.turnMetrics && entry.turnMetrics.length > 0) {
|
||||
metricsBySeq.set(entry.seqEnd, entry.turnMetrics);
|
||||
}
|
||||
}
|
||||
if (metricsBySeq.size === 0) return items;
|
||||
|
||||
let next = items;
|
||||
items.forEach((item, index) => {
|
||||
const metrics = isTurnFooterAnchor(item)
|
||||
? metricsBySeq.get(cursorSeqIn(item.timelineCursor, epoch) ?? -1)
|
||||
: undefined;
|
||||
if (metrics) next = replaceAt(next, index, metrics);
|
||||
});
|
||||
return next;
|
||||
}
|
||||
|
||||
function findTurnFooterAnchorIndex(items: StreamItem[], turnId: string | undefined): number | null {
|
||||
const last = lastIndexOfTurn(items, turnId);
|
||||
if (last === null) return null;
|
||||
for (let index = last; index >= 0; index--) {
|
||||
if (index < last && !continuesResponse(items[index], items[index + 1])) break;
|
||||
if (items[index].kind === "assistant_message") return index;
|
||||
}
|
||||
return items[last].kind === "tool_call" ? last : null;
|
||||
}
|
||||
|
||||
function lastIndexOfTurn(items: StreamItem[], turnId: string | undefined): number | null {
|
||||
const tail = items.length - 1;
|
||||
if (tail < 0) return null;
|
||||
if (turnId === undefined) return tail;
|
||||
const index = items.findLastIndex((item) => item.turnId === turnId);
|
||||
if (index >= 0) return index;
|
||||
// Rows from daemons without turn ids belong to the trailing turn. A tail owned by another
|
||||
// turn means this turn wrote no rows.
|
||||
return items[tail].turnId === undefined ? tail : null;
|
||||
}
|
||||
|
||||
function isTurnFooterAnchor(item: StreamItem): item is TurnFooterAnchor {
|
||||
return item.kind === "assistant_message" || item.kind === "tool_call";
|
||||
}
|
||||
|
||||
function cursorSeqIn(cursor: TimelinePosition | undefined, epoch: string): number | null {
|
||||
return cursor?.epoch === epoch ? cursor.seq : null;
|
||||
}
|
||||
|
||||
/** Returns `items` itself when the row already shows these metrics, so unchanged rows keep identity. */
|
||||
function replaceAt(items: StreamItem[], index: number, metrics: AgentMetric[]): StreamItem[] {
|
||||
const item = items[index];
|
||||
if (!item || !isTurnFooterAnchor(item) || areMetricsEqual(item.turnMetrics, metrics)) {
|
||||
return items;
|
||||
}
|
||||
const next = [...items];
|
||||
next[index] = { ...item, turnMetrics: metrics };
|
||||
return next;
|
||||
}
|
||||
|
||||
function areMetricsEqual(left: AgentMetric[] | undefined, right: AgentMetric[]): boolean {
|
||||
return (
|
||||
left !== undefined &&
|
||||
left.length === right.length &&
|
||||
left.every(
|
||||
(metric, index) =>
|
||||
metric.label === right[index].label &&
|
||||
metric.value === right[index].value &&
|
||||
metric.tone === right[index].tone,
|
||||
)
|
||||
);
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
import type { AgentMessage } from "@getpaseo/protocol/agent-message";
|
||||
import type {
|
||||
AgentMetric,
|
||||
AgentProvider,
|
||||
AgentTimelineItem,
|
||||
JsonValue,
|
||||
@@ -10,7 +9,6 @@ import { timelineItemIdentity } from "@getpaseo/protocol/timeline-identity";
|
||||
import type { AgentAttachment, AgentStreamEventPayload } from "@getpaseo/protocol/messages";
|
||||
import type { AttachmentMetadata } from "@/attachments/types";
|
||||
import type { OverviewSummary } from "@/tool-calls/detail-level/overview/model";
|
||||
import { stampCompletedTurnMetrics } from "@/timeline/turn-metrics";
|
||||
import { extractTaskEntriesFromToolCall } from "../utils/tool-call-parsers";
|
||||
|
||||
/**
|
||||
@@ -717,8 +715,6 @@ export interface AssistantMessageItem {
|
||||
timelineCursor?: TimelinePosition;
|
||||
text: string;
|
||||
timestamp: Date;
|
||||
/** Set when this message carries its turn's footer. */
|
||||
turnMetrics?: AgentMetric[];
|
||||
/** Display-only fields, assigned after source-item plugin transforms. */
|
||||
}
|
||||
|
||||
@@ -773,8 +769,6 @@ export interface ToolCallItem {
|
||||
turnId?: string;
|
||||
timestamp: Date;
|
||||
payload: ToolCallPayload;
|
||||
/** Set when this call carries its turn's footer. */
|
||||
turnMetrics?: AgentMetric[];
|
||||
}
|
||||
|
||||
export type AgentToolCallItem = ToolCallItem & {
|
||||
@@ -1636,10 +1630,9 @@ export function reduceStreamUpdate(
|
||||
);
|
||||
return event.item.type === "reasoning" ? updated : finalizeActiveThoughts(updated);
|
||||
}
|
||||
case "turn_completed":
|
||||
return stampCompletedTurnMetrics(finalizeActiveThoughts(state), event.metrics, event.turnId);
|
||||
case "thread_started":
|
||||
case "turn_started":
|
||||
case "turn_completed":
|
||||
case "turn_failed":
|
||||
case "turn_canceled":
|
||||
case "permission_requested":
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { GripVertical, RotateCw } from "lucide-react-native";
|
||||
import { useMemo } from "react";
|
||||
import { useCallback, 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,13 +9,14 @@ 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";
|
||||
@@ -36,8 +37,10 @@ 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. */
|
||||
/** A card in the user's arrangement: dragged by its handle, turned off from its switch. */
|
||||
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;
|
||||
}
|
||||
@@ -61,7 +64,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. */
|
||||
/** Present where the user arranges cards. An off card collapses to its header. */
|
||||
arrangement?: UsageCardArrangement;
|
||||
compact?: boolean;
|
||||
}) {
|
||||
@@ -72,6 +75,7 @@ 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;
|
||||
|
||||
@@ -101,15 +105,23 @@ export function UsageCard({
|
||||
<Text style={styles.name} numberOfLines={1}>
|
||||
{entry.sourceLabel}
|
||||
</Text>
|
||||
{planLabel ? <StatusBadge label={planLabel} variant="muted" size="xs" /> : null}
|
||||
{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}
|
||||
<View style={styles.headerSpacer} />
|
||||
{status ? (
|
||||
{status && !collapsed ? (
|
||||
<View style={styles.statusRow}>
|
||||
<View style={dotStyle} />
|
||||
<Text style={styles.statusLabel}>{status}</Text>
|
||||
</View>
|
||||
) : null}
|
||||
{refreshable ? (
|
||||
{refreshable && !collapsed ? (
|
||||
<UsageRefreshButton
|
||||
sourceLabel={entry.sourceLabel}
|
||||
successfulAt={successfulAt}
|
||||
@@ -119,16 +131,31 @@ 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>
|
||||
|
||||
<UsageCardBody
|
||||
entry={entry}
|
||||
display={display}
|
||||
pinnable={pinnable}
|
||||
report={report}
|
||||
showsFreshnessInline={showsFreshnessInline}
|
||||
refreshState={refreshState}
|
||||
/>
|
||||
{collapsed ? null : (
|
||||
<UsageCardBody
|
||||
entry={entry}
|
||||
display={display}
|
||||
pinnable={pinnable}
|
||||
report={report}
|
||||
showsFreshnessInline={showsFreshnessInline}
|
||||
refreshState={refreshState}
|
||||
/>
|
||||
)}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
@@ -407,6 +434,11 @@ 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,
|
||||
},
|
||||
@@ -478,6 +510,10 @@ 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,7 +3,6 @@ import {
|
||||
arrangeUsageCards,
|
||||
arrangeUsageReports,
|
||||
DEFAULT_USAGE_PREFERENCES,
|
||||
isUsageCardOn,
|
||||
setUsageCardOn,
|
||||
UsagePreferencesSchema,
|
||||
usageReportsOn,
|
||||
@@ -12,19 +11,13 @@ import {
|
||||
import { resolvePinnedUsage } from "./pinned";
|
||||
import type { UsageReportEntry } from "./types";
|
||||
|
||||
function report(
|
||||
sourceId: string,
|
||||
sourceLabel: string,
|
||||
account?: string,
|
||||
defaultEnabled?: boolean,
|
||||
): UsageReportEntry {
|
||||
function report(sourceId: string, sourceLabel: string, account?: string): 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 }],
|
||||
@@ -121,31 +114,8 @@ 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.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",
|
||||
]);
|
||||
expect(off.cardsOff).toEqual(["codex:default"]);
|
||||
expect(setUsageCardOn(off, "codex:default", true).cardsOff).toEqual([]);
|
||||
});
|
||||
|
||||
it("leaves off cards out of the sidebar summary", () => {
|
||||
@@ -173,24 +143,11 @@ 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", cardVisibility: [1] }),
|
||||
UsagePreferencesSchema.parse({ displayAs: "used", cardOrder: "bad", cardsOff: [1] }),
|
||||
).toEqual(DEFAULT_USAGE_PREFERENCES);
|
||||
});
|
||||
});
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user