diff --git a/.agents/notes/implemented/feature/2026-07-30-web-search-card.i18n.yaml b/.agents/notes/implemented/feature/2026-07-30-web-search-card.i18n.yaml index 9edc74a0d2..179580e4d2 100644 --- a/.agents/notes/implemented/feature/2026-07-30-web-search-card.i18n.yaml +++ b/.agents/notes/implemented/feature/2026-07-30-web-search-card.i18n.yaml @@ -2,5 +2,5 @@ # side as of the last confirmed-consistent state. Both languages carry equal authority; # after editing either side, bring the other along and re-record with: # pnpm run verify-translation-pairing --write .agents/notes/implemented/feature/2026-07-30-web-search-card.md -2026-07-30-web-search-card.md: 1dff5ae5a4d789b1e57fcaef349959764583fbdf -2026-07-30-web-search-card.zh.md: 09d38066bf16923655b27a30c717d97ccbe434bb +2026-07-30-web-search-card.md: a3e3d7c3da1f686b4147e629fb4724d7750f8b6c +2026-07-30-web-search-card.zh.md: c333ebf434f2f6798c2e1758e4a534dc35ea2ef9 diff --git a/.agents/notes/implemented/feature/2026-07-30-web-search-card.md b/.agents/notes/implemented/feature/2026-07-30-web-search-card.md index 1dff5ae5a4..a3e3d7c3da 100644 --- a/.agents/notes/implemented/feature/2026-07-30-web-search-card.md +++ b/.agents/notes/implemented/feature/2026-07-30-web-search-card.md @@ -12,7 +12,7 @@ This is the follow-up the search render card note names: that PR was the backend ## Decision -`SearchBlock` is a `ui-primitives` component that renders a completed search as either shape, and the Web render sites for a `grep`/`glob` call consume the search render intent through it. `ui-conversation/src/client/contract/search-card-model.ts` is the single place that turns the snapshot's `resultView` into the component's props, so no render site re-derives the shape. It returns null — the generic path — whenever the result view is not a search card, including a still-running call (a search card is result-time only, so there is nothing before `execute`), a generic result a `grep`/`glob` failure or a nested `run_code` dispatch produces, a terminal result view, and a `card` value this client version does not know. +`SearchBlock` is a `ui-primitives` component that renders a completed search as either shape, and the Web render sites for a `grep`/`glob` call consume the search render intent through it. `ui-conversation/src/client/contract/search-card-model.ts` is the single place that turns the snapshot's `resultView` into the component's props, so no render site re-derives the shape. It returns null — the generic path — whenever the result view is not a search card, including a still-running call (a search card is result-time only, so there is nothing before `execute`), a generic result a `grep`/`glob` failure or a nested `run_code` dispatch produces, a terminal result view, a `card` value this client version does not know, a `card: 'search'` view whose `kind` this version does not compile, and — because `kind` and the grouped/flat shape ride the same untrusted wire frame the host schema only string-checks — a known `kind` whose `files`/`paths` is missing or malformed (which would otherwise crash `SearchBlock` at `.reduce`/`.map`). The asymmetry with the terminal card is deliberate and inherited from the backend contract: `terminalCardModel` reads both `callView` and `resultView` because a command, cwd, and description exist at call time; `searchCardModel` reads only `resultView` because a search's matches or paths exist only after execution. A running search row therefore shows its summary alone, with no card. @@ -22,7 +22,8 @@ The component's contract: - **Grouped matches, collapsible per file.** Each file is a header row (a bold path plus its match count, the whole row the collapse control) followed by its `lineNumber: line` rows. Collapsing a group drops its match rows from the flattened list and from the height cap's arithmetic, but never from the copy text. - **Flat path list.** The paths shape renders one path per row, no headers. -- **A capped indicator.** When `truncated`, the banner summary folds the pre-cap total in — `显示 X / 共 N 处匹配 · K 个文件` for grep, `显示 X / 共 N 个路径` for glob — so the card never presents a capped page as the complete result; a reader who wants the rest follows the spill locator in the model-facing text, exactly as the model does. When not `truncated` the summary is a plain structural count (`{n} 处匹配 · {m} 个文件`, or `{n} 个路径`). +- **A capped indicator.** When `truncated`, the banner summary folds the pre-cap total in — `显示 X / 共 N 处匹配 · K 个文件` for grep, `显示 X / 共 N 个路径` for glob — so the card never presents a capped page as the complete result. When not `truncated` the summary is a plain structural count (`{n} 处匹配 · {m} 个文件`, or `{n} 个路径`). +- **A recovery footer for a capped result.** The card holds only the retained page, but the locator to the rest — grep/glob's `Full … stored at: ` footer — lives only in the result view's `content` text, not in the structured matches/paths. Because every render site replaces the raw result with the card, `searchCardModel` surfaces that flattened `content` as `SearchCardModel.recovery` when (and only when) the result was capped, and each render site draws it below the card. Without this the one path to the dropped rows would vanish from the UI; an uncapped result carries every row, so its `content` adds nothing and is dropped. - **No soft wrapping.** Result rows are `white-space: pre` inside a horizontally scrolling box, so a long match line or a deep path scrolls sideways rather than folding. - **Height cap with an expand control.** More than `DEFAULT_SEARCH_MAX_LINES` (16) rows shows a head/tail slice with a button reporting the hidden count, the same shape and arithmetic as `TerminalBlock`. - **Copy.** The copy control writes the whole structured result — every file and match, or every path — regardless of the height cap or which groups are collapsed, so the clipboard carries the result rather than what the card happens to be showing. @@ -33,9 +34,9 @@ Geometry, radius, and fonts mirror `CodeBlock` and `TerminalBlock`, so a search Three sites consume the derivation, mirroring the terminal card's placement exactly: -- **The keyed `SearchRow`** (`toolviews/search-row.tsx`) registers ONE component under both `grep` and `glob` in the `conversation.chat.toolview` keyed hole, and renders the card RESIDENT under the summary row, capped at `CHAT_SEARCH_MAX_LINES` (8) — the same posture `BashRow` takes for its terminal card. Both tool names get the same row because the derived `kind` decides the shape, so a second component would duplicate it. (This resident posture matches the current terminal/diff cards; a separate later PR unifies the whole-row collapse/expand interaction and flips all resident cards at once — out of scope here.) -- **The generic fallback** (`chat/GenericToolCard` → `chat/ToolRow`) threads the derived model as an expand-gated body, the same arm `terminal` uses: a `grep`/`glob` result with no keyed row (none in the shipped app, since both are registered) still renders its card behind the row's expand toggle. -- **The details panel** (`skeleton/DetailsPanel`) renders the card at the primitive's own full height in the Output section, keeping the JSON Input section. +- **The keyed `SearchRow`** (`toolviews/search-row.tsx`) registers ONE component under both `grep` and `glob` in the `conversation.chat.toolview` keyed hole, and renders the card RESIDENT under the summary row, capped at `CHAT_SEARCH_MAX_LINES` (8) — the same posture `BashRow` takes for its terminal card. Both tool names get the same row because the derived `kind` decides the shape, so a second component would duplicate it. A capped result's recovery footer sits below the card. Because the keyed row owns this render slot, a settled call with no search card — an errored search (grep/glob emit no result view on error), a successful nested `run_code` sub-dispatch (the backend computes no `presentationMeta`, so `resultView` is null), or a legacy generic result — would otherwise show only its summary with its content lost; the row surfaces that model-facing text as a fallback body, keyed on `search === null && settled` rather than on the error state alone. (This resident posture matches the current terminal/diff cards; a separate later PR unifies the whole-row collapse/expand interaction and flips all resident cards at once — out of scope here.) +- **The generic fallback** (`chat/GenericToolCard` → `chat/ToolRow`) threads the derived model as an expand-gated body, the same arm `terminal` uses: a `grep`/`glob` result with no keyed row (none in the shipped app, since both are registered) still renders its card, with the recovery footer, behind the row's expand toggle. +- **The details panel** (`skeleton/DetailsPanel`) renders the card at the primitive's own full height in the Output section, with the recovery footer below it, keeping the JSON Input section. `CHAT_SEARCH_MAX_LINES` (8) is the row cap, half the primitive's default the panel keeps, for the same reason as `CHAT_TERMINAL_MAX_LINES`: the chat flow is a summary surface read across many calls, the panel is the single-call reading surface. @@ -55,7 +56,7 @@ Three sites consume the derivation, mirroring the terminal card's placement exac `packages/client/ui-primitives/tests/search-block.spec.tsx` pins the component at per-file 100%: both kinds, the folded pre-cap total in the summary, the empty arm, per-file collapse/re-expand without touching neighbours, a file header counting as one capped row alongside its matches, the tail slice restoring its owning file header when the cut falls mid-file, the head/tail cap and its expand control across both shapes and the no-tail and default-cap edges, and the copy control writing the whole structured result on the accepted and refused clipboard paths. -`packages/client/ui-conversation/tests/search-card.spec.tsx` pins the wiring at every render site: `searchCardModel`'s derivation for both kinds, the truncation signal, the replacement title, and each null arm (running, no views, generic, terminal, unknown card); the chat row's expand-gated matches and paths bodies through `GenericToolCard` against the non-search args-JSON body; `SearchRow`'s resident card for both kinds, its agreement with the summary row's run state, the replacement-title precedence, and the keyed registration under both `grep` and `glob` with one component; and the details panel's Output section for both kinds against the non-search flattened form. `packages/client/ui-conversation/src/*` sits on the coverage exclude list, so this file is written against no gate pressure. `packages/client/connection/src/client/fixture.ts` gains a `grep` turn emitting `kind: 'matches'` and a `glob` turn emitting `kind: 'paths'` as `resultView`, both truncated, driving the built-boot snapshot and the live `?fixture` server. +`packages/client/ui-conversation/tests/search-card.spec.tsx` pins the wiring at every render site: `searchCardModel`'s derivation for both kinds, the truncation signal, the replacement title, the recovery text surfaced only when capped, each null arm (running, no views, generic, terminal, unknown card, an uncompiled `kind`, and a known kind with a missing/malformed shape); the chat row's expand-gated matches and paths bodies through `GenericToolCard` (with the recovery footer) against the non-search args-JSON body; `SearchRow`'s resident card for both kinds, its recovery footer, its fallback body for both an errored search and a settled cardless result, its agreement with the summary row's run state, the replacement-title precedence, and the keyed registration under both `grep` and `glob` with one component; and the details panel's Output section for both kinds (with the recovery footer) against the non-search flattened form. `packages/client/ui-conversation/src/*` sits on the coverage exclude list, so this file is written against no gate pressure. `packages/client/connection/src/client/fixture.ts` gains a `grep` turn emitting `kind: 'matches'` (three files, twelve rows over the row cap, `truncated` with a spill-recovery footer, so it exercises the head/tail cap and the recovery footer in the assembled snapshot) and a `glob` turn emitting `kind: 'paths'`, both driving the built-boot snapshot and the live `?fixture` server. `apps/web/tests/search-card.snapshot.ts` is the assembled-output check the repo contract asks for: it boots the real built `client.js` bundles through the keyless fixture transport, opens the fixture session, and pins the grep card's assembled shape — kind, truncation summary, the head/tail slice, and its expand control — under `apps/web/tests/snapshots/search-card/`, so a broken SearchRow registration or a dropped card fails a golden the built-boot smoke (boot-only by contract) cannot. ## Related diff --git a/.agents/notes/implemented/feature/2026-07-30-web-search-card.zh.md b/.agents/notes/implemented/feature/2026-07-30-web-search-card.zh.md index 09d38066bf..c333ebf434 100644 --- a/.agents/notes/implemented/feature/2026-07-30-web-search-card.zh.md +++ b/.agents/notes/implemented/feature/2026-07-30-web-search-card.zh.md @@ -12,7 +12,7 @@ Status: implemented ## Decision -`SearchBlock` 是一个 `ui-primitives` 组件,把一次已完成的搜索渲染成两种形态之一,`grep`/`glob` 调用的 Web 渲染点都通过它消费搜索 render intent。`ui-conversation/src/client/contract/search-card-model.ts` 是把 snapshot 的 `resultView` 转成组件 props 的唯一位置,因此没有渲染点重新推导形态。当结果视图不是搜索卡片时它返回 null(走 generic 路径),包括仍在运行的调用(搜索卡片仅在结果阶段存在,`execute` 前无内容)、`grep`/`glob` 失败或嵌套 `run_code` dispatch 产生的 generic 结果、terminal 结果视图,以及本客户端版本不认识的 `card` 值。 +`SearchBlock` 是一个 `ui-primitives` 组件,把一次已完成的搜索渲染成两种形态之一,`grep`/`glob` 调用的 Web 渲染点都通过它消费搜索 render intent。`ui-conversation/src/client/contract/search-card-model.ts` 是把 snapshot 的 `resultView` 转成组件 props 的唯一位置,因此没有渲染点重新推导形态。当结果视图不是搜索卡片时它返回 null(走 generic 路径),包括仍在运行的调用(搜索卡片仅在结果阶段存在,`execute` 前无内容)、`grep`/`glob` 失败或嵌套 `run_code` dispatch 产生的 generic 结果、terminal 结果视图、本客户端版本不认识的 `card` 值、`kind` 是本版本无法编译的 `card: 'search'` 视图,以及 —— 因为 `kind` 和分组/扁平形态与 host schema 只做字符串校验的那同一个不可信 wire 帧同行 —— 一个 `kind` 已知但 `files`/`paths` 缺失或格式错误的视图(否则会让 `SearchBlock` 在 `.reduce`/`.map` 处崩溃)。 与终端卡片的不对称是刻意的,继承自后端契约:`terminalCardModel` 同时读 `callView` 和 `resultView`,因为命令、cwd、description 在调用时就存在;`searchCardModel` 只读 `resultView`,因为搜索的匹配或路径只在执行后存在。因此运行中的搜索行只显示摘要,没有卡片。 @@ -22,7 +22,8 @@ Status: implemented - **按文件分组的匹配,逐文件可折叠。** 每个文件是一个头行(加粗路径加它的匹配计数,整行即折叠控件),后面跟它的 `lineNumber: line` 行。折叠一个组会把它的匹配行从压平列表和高度上限的算术里去掉,但绝不从复制文本里去掉。 - **扁平路径列表。** paths 形态每行一个路径,无头行。 -- **截断指示。** `truncated` 时,横幅摘要把截断前总数折入 —— grep 为 `显示 X / 共 N 处匹配 · K 个文件`,glob 为 `显示 X / 共 N 个路径` —— 因此卡片绝不把一个被截断的页面呈现为完整结果;想要其余部分的读者跟随面向模型文本里的溢出定位符,与模型的做法完全一致。未 `truncated` 时摘要是一个朴素的结构计数(`{n} 处匹配 · {m} 个文件`,或 `{n} 个路径`)。 +- **截断指示。** `truncated` 时,横幅摘要把截断前总数折入 —— grep 为 `显示 X / 共 N 处匹配 · K 个文件`,glob 为 `显示 X / 共 N 个路径` —— 因此卡片绝不把一个被截断的页面呈现为完整结果。未 `truncated` 时摘要是一个朴素的结构计数(`{n} 处匹配 · {m} 个文件`,或 `{n} 个路径`)。 +- **被截断结果的恢复脚注。** 卡片只持有保留的那一页,但通往其余部分的定位符 —— grep/glob 的 `Full … stored at: ` 脚注 —— 只存在于结果视图的 `content` 文本里,而非结构化的 matches/paths 中。由于每个渲染点都用卡片替换了原始结果,`searchCardModel` 在(且仅在)结果被截断时把压平后的 `content` 作为 `SearchCardModel.recovery` 暴露出来,每个渲染点把它画在卡片下方。没有它,通往被丢弃行的唯一路径就会从 UI 里消失;未截断的结果携带了每一行,其 `content` 不增加任何信息,因此被丢弃。 - **不软换行。** 结果行在一个横向滚动的盒子里 `white-space: pre`,因此一条长匹配行或一个深路径横向滚动而不折叠。 - **带展开控件的高度上限。** 超过 `DEFAULT_SEARCH_MAX_LINES`(16)行时显示一个头/尾切片,中间一个按钮报告被隐藏的行数,形状和算术与 `TerminalBlock` 相同。 - **复制。** 复制控件写入整个结构化结果 —— 每个文件与匹配,或每个路径 —— 无关高度上限或哪些组被折叠,因此剪贴板携带的是结果本身,而不是卡片此刻恰好显示的内容。 @@ -33,9 +34,9 @@ Status: implemented 三个渲染点消费该推导,与终端卡片的落位完全一致: -- **keyed `SearchRow`**(`toolviews/search-row.tsx`)把一个组件同时注册到 `conversation.chat.toolview` keyed hole 的 `grep` 与 `glob` 键下,并把卡片作为常驻(resident)渲染在摘要行下方,上限为 `CHAT_SEARCH_MAX_LINES`(8)—— 与 `BashRow` 对其终端卡片采取的姿态相同。两个工具名共用同一行,因为推导出的 `kind` 决定形态,第二个组件只会重复它。(该常驻姿态与当前的 terminal/diff 卡片一致;一个单独的后续 PR 会统一整行折叠/展开交互并一次性翻转所有常驻卡片 —— 不在本 PR 范围内。) -- **generic fallback**(`chat/GenericToolCard` → `chat/ToolRow`)把推导出的 model 作为展开门控的 body 传入,与 `terminal` 用的是同一分支:没有 keyed 行的 `grep`/`glob` 结果(发布应用里没有,因为两者都注册了)仍在行的展开开关后渲染其卡片。 -- **details panel**(`skeleton/DetailsPanel`)在 Output 段以 primitive 自身的完整高度渲染卡片,保留 JSON Input 段。 +- **keyed `SearchRow`**(`toolviews/search-row.tsx`)把一个组件同时注册到 `conversation.chat.toolview` keyed hole 的 `grep` 与 `glob` 键下,并把卡片作为常驻(resident)渲染在摘要行下方,上限为 `CHAT_SEARCH_MAX_LINES`(8)—— 与 `BashRow` 对其终端卡片采取的姿态相同。两个工具名共用同一行,因为推导出的 `kind` 决定形态,第二个组件只会重复它。被截断结果的恢复脚注画在卡片下方。因为 keyed 行占据了这个渲染槽,一个没有搜索卡片的已结算调用 —— 出错的搜索(grep/glob 出错时不产出结果视图)、成功的嵌套 `run_code` 子派发(后端不为其计算 `presentationMeta`,故 `resultView` 为 null)、或旧日志的 generic 结果 —— 否则只会显示摘要而丢失内容;该行把这段面向模型的文本作为 fallback body 暴露出来,判据是 `search === null && 已结算`,而非仅凭错误状态。(该常驻姿态与当前的 terminal/diff 卡片一致;一个单独的后续 PR 会统一整行折叠/展开交互并一次性翻转所有常驻卡片 —— 不在本 PR 范围内。) +- **generic fallback**(`chat/GenericToolCard` → `chat/ToolRow`)把推导出的 model 作为展开门控的 body 传入,与 `terminal` 用的是同一分支:没有 keyed 行的 `grep`/`glob` 结果(发布应用里没有,因为两者都注册了)仍在行的展开开关后渲染其卡片,并带恢复脚注。 +- **details panel**(`skeleton/DetailsPanel`)在 Output 段以 primitive 自身的完整高度渲染卡片,恢复脚注画在其下方,保留 JSON Input 段。 `CHAT_SEARCH_MAX_LINES`(8)是行内上限,为 primitive 默认值的一半(panel 保留默认值),理由与 `CHAT_TERMINAL_MAX_LINES` 相同:chat 流是跨多次调用扫读的摘要表面,panel 是单次调用的阅读表面。 @@ -55,7 +56,7 @@ Status: implemented `packages/client/ui-primitives/tests/search-block.spec.tsx` 以 per-file 100% 覆盖固定组件:两种 kind、折入摘要的截断前总数、空结果分支、逐文件折叠/再展开且不影响邻居、一个文件头与其匹配一起计为一个被截断行、切口落在文件中间时尾部切片恢复其所属文件头、跨两种形态的头/尾上限及其展开控件(含无尾与默认上限的边界),以及复制控件在接受与拒绝的剪贴板路径上写入整个结构化结果。 -`packages/client/ui-conversation/tests/search-card.spec.tsx` 固定每个渲染点的接线:`searchCardModel` 对两种 kind 的推导、截断信号、替换标题,以及每个 null 分支(运行中、无视图、generic、terminal、未知卡片);通过 `GenericToolCard` 的展开门控 matches 与 paths body,对照非搜索的 args-JSON body;`SearchRow` 对两种 kind 的常驻卡片、它与摘要行运行状态的一致、替换标题优先级,以及一个组件在 `grep` 与 `glob` 两个键下的 keyed 注册;以及 details panel 的 Output 段对两种 kind,对照非搜索的压平形态。`packages/client/ui-conversation/src/*` 在覆盖排除清单上,因此该文件不受 gate 压力。`packages/client/connection/src/client/fixture.ts` 新增一个发出 `kind: 'matches'` 的 `grep` turn 与一个发出 `kind: 'paths'` 的 `glob` turn 作为 `resultView`,两者都截断,驱动 built-boot snapshot 与实时 `?fixture` 服务。 +`packages/client/ui-conversation/tests/search-card.spec.tsx` 固定每个渲染点的接线:`searchCardModel` 对两种 kind 的推导、截断信号、替换标题、仅在截断时暴露的恢复文本,以及每个 null 分支(运行中、无视图、generic、terminal、未知卡片、本版本无法编译的 `kind`、以及一个形态缺失/错误的已知 kind);通过 `GenericToolCard` 的展开门控 matches 与 paths body(含恢复脚注),对照非搜索的 args-JSON body;`SearchRow` 对两种 kind 的常驻卡片、它的恢复脚注、它对出错搜索与已结算无卡片结果两者的 fallback body、它与摘要行运行状态的一致、替换标题优先级,以及一个组件在 `grep` 与 `glob` 两个键下的 keyed 注册;以及 details panel 的 Output 段对两种 kind(含恢复脚注),对照非搜索的压平形态。`packages/client/ui-conversation/src/*` 在覆盖排除清单上,因此该文件不受 gate 压力。`packages/client/connection/src/client/fixture.ts` 新增一个发出 `kind: 'matches'` 的 `grep` turn(三个文件、十二行超过行内上限、`truncated` 且带溢出恢复脚注,因此在组装快照里同时演练头/尾上限与恢复脚注)与一个发出 `kind: 'paths'` 的 `glob` turn,两者都驱动 built-boot snapshot 与实时 `?fixture` 服务。`apps/web/tests/search-card.snapshot.ts` 是仓库契约要求的组装输出检查:它通过 keyless fixture 传输启动真实构建的 `client.js` bundle,打开 fixture 会话,并把 grep 卡片的组装形态——kind、截断摘要、头/尾切片及其展开控件——固定在 `apps/web/tests/snapshots/search-card/` 下,因此一个损坏的 SearchRow 注册或被丢弃的卡片会让一个 golden 失败,而 built-boot smoke(按契约只测启动)无法捕获它。 ## Related diff --git a/apps/web/tests/search-card.snapshot.ts b/apps/web/tests/search-card.snapshot.ts new file mode 100644 index 0000000000..7eca80d8bf --- /dev/null +++ b/apps/web/tests/search-card.snapshot.ts @@ -0,0 +1,161 @@ +// @vitest-environment jsdom +// Assembled search-card snapshot: boots the real built `packages/client/*/lib/ +// client.js` bundles through AppWebEntry's ModuleLoader path against the keyless +// FixtureApiClient transport (no API key, no model round), opens the fixture +// session, and pins the search card the `grep` turn (fixture turn 66) renders in +// the assembled application. The built-boot smoke proves the graph boots but +// carries no behavior assertions by contract; this is the assembled-output check +// that a broken SearchRow registration or a dropped card would fail — the +// per-package suites bench over src and cannot see the bundled wiring. +// +// Keyless and deterministic: the fixture is the fake server, so the grep turn's +// matches, its truncation summary, and its head/tail cap are fixed in the +// fixture, not harvested from a live model. The recovery-footer arm is a pure +// derivation over the result view, pinned at every render site by the +// ui-conversation suite; here the fixture turn exercises the assembled card +// shape and its cap. +import { mkdirSync, readFileSync, writeFileSync } from 'node:fs' +import { dirname, join } from 'node:path' +import { act, cleanup, fireEvent, screen, waitFor, within } from '@testing-library/react' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import type { WebBootEntry } from '@deepseek-ai/dsh-client-modules/client' +import { AppWebEntry } from '@deepseek-ai/dsh-client-web' + +const EXPECTED = join(process.cwd(), 'apps/web/tests/snapshots/search-card/grep-card.expected.txt') +const refreshing = process.env.DSH_SNAPSHOT === 'record' || process.env.DSH_SNAPSHOT === 'refresh' + +const PLUGINS: readonly (WebBootEntry & { dir: string })[] = [ + { id: '@deepseek-ai/dsh-client-connection', dir: 'connection', url: '/plugins/connection.js', rev: 'fx', inject: [], immediately: true }, + { id: '@deepseek-ai/dsh-client-runtime', dir: 'runtime', url: '/plugins/runtime.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-connection'], immediately: true }, + { id: '@deepseek-ai/dsh-client-ui-theme', dir: 'ui-theme', url: '/plugins/ui-theme.js', rev: 'fx', inject: [], immediately: true }, + { id: '@deepseek-ai/dsh-client-locale', dir: 'locale', url: '/plugins/locale.js', rev: 'fx', inject: [], immediately: true }, + { id: '@deepseek-ai/dsh-client-ui-layout', dir: 'ui-layout', url: '/plugins/ui-layout.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-runtime'] }, + { id: '@deepseek-ai/dsh-client-ui-sidebar', dir: 'ui-sidebar', url: '/plugins/ui-sidebar.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] }, + { id: '@deepseek-ai/dsh-client-ui-conversation', dir: 'ui-conversation', url: '/plugins/ui-conversation.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-layout'] }, + { + id: '@deepseek-ai/dsh-client-ui-workspace', + dir: 'ui-workspace', + url: '/plugins/ui-workspace.js', + rev: 'fx', + inject: [ + '@deepseek-ai/dsh-client-runtime', + '@deepseek-ai/dsh-client-ui-conversation', + '@deepseek-ai/dsh-client-ui-sidebar', + ], + }, + { id: '@deepseek-ai/dsh-client-ui-trajectory', dir: 'ui-trajectory', url: '/plugins/ui-trajectory.js', rev: 'fx', inject: ['@deepseek-ai/dsh-client-ui-conversation'] }, +] + +const bundles = new Map(PLUGINS.map(plugin => [ + plugin.url, + readFileSync(join(process.cwd(), 'packages/client', plugin.dir, 'lib/client.js'), 'utf8'), +])) + +interface FixtureWindow extends Window { + __DSH_BOOT__?: { rev: string; entries: WebBootEntry[] } + __ModuleLoader__?: unknown +} + +class ResizeObserverStub { + observe(): void {} + disconnect(): void {} + unobserve(): void {} +} + +const win = window as FixtureWindow +let unmount: (() => void) | undefined + +/** Normalize a rendered search card to a stable text shape: the kind, the banner + * summary, each file header (path + count), each visible match line, the expand + * control label, and the recovery footer. CSS-module class names carry a + * per-build hash in one of two schemes — ui-primitives emits `__` + * (name bounded by underscores), ui-conversation emits `_` (name at + * the end). `hasClass` matches a module class by its logical name under either, + * without matching a longer name that contains it (`line` must not hit + * `lineNumber`). */ +function hasClass(el: Element, name: string): boolean { + return [...el.classList].some(cls => cls === name || cls.endsWith(`_${name}`) || cls.startsWith(`_${name}_`) || cls.includes(`_${name}_`)) +} + +function cardShape(root: Element): string { + const card = root.querySelector('[data-search]') + if (card === null) return '' + const pick = (from: Element, name: string): Element[] => + [...from.querySelectorAll('*')].filter(el => hasClass(el, name)) + const lines: string[] = [`kind=${card.getAttribute('data-search')}`] + const summary = pick(card, 'summary')[0]?.textContent?.trim() + if (summary !== undefined && summary !== '') lines.push(`summary=${summary}`) + for (const header of pick(card, 'fileHeader')) lines.push(`file=${header.textContent?.trim() ?? ''}`) + for (const row of pick(card, 'line')) lines.push(`line=${row.textContent?.trim() ?? ''}`) + const expand = pick(card, 'expand')[0]?.textContent?.trim() + if (expand !== undefined && expand !== '') lines.push(`expand=${expand}`) + const recovery = pick(root, 'searchRecovery')[0]?.textContent?.trim() + if (recovery !== undefined && recovery !== '') lines.push(`recovery=${recovery}`) + return lines.join('\n') +} + +beforeEach(() => { + localStorage.clear() + document.title = 'DeepSeek Harness' + vi.stubGlobal('ResizeObserver', ResizeObserverStub) + vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => + setTimeout(() => { callback(0) }, 0) as unknown as number) + vi.stubGlobal('cancelAnimationFrame', (id: number) => { clearTimeout(id) }) +}) + +afterEach(() => { + act(() => { unmount?.() }) + unmount = undefined + cleanup() + delete win.__DSH_BOOT__ + delete win.__ModuleLoader__ + document.body.innerHTML = '' + document.head.querySelectorAll('style[data-plugin]').forEach((style) => { style.remove() }) + document.title = '' + history.replaceState(null, '', '/') + vi.unstubAllGlobals() +}) + +describe('assembled search card', () => { + it('renders the grep card, its truncation summary, and its capped head/tail slice from the built bundles', async () => { + history.replaceState(null, '', '/?fixture') + const root = document.createElement('div') + root.id = 'root' + document.body.appendChild(root) + win.__DSH_BOOT__ = { rev: 'fx', entries: PLUGINS.map(({ dir: _dir, ...plugin }) => plugin) } + act(() => { + const entry = new AppWebEntry(root, { + fetchBundle: (url) => { + const code = bundles.get(url) + return code === undefined ? Promise.reject(new Error(`missing built bundle ${url}`)) : Promise.resolve(code) + }, + executeBundle: (code) => { (0, eval)(code) }, + }) + void entry.run() + unmount = () => { entry.dispose() } + }) + + const tree = await screen.findByRole('tree', { name: 'Sessions' }, { timeout: 10_000 }) + fireEvent.click(await within(tree).findByText('Fixture 历史会话')) + // Wait for chat content to reach the fixture's later turns (the bash sample + // is turn 65, the grep card turn 66). + await waitFor(() => { + expect(document.querySelector('[data-sample="bash-global"]')).not.toBeNull() + }, { timeout: 10_000 }) + // The grep turn's keyed SearchRow renders the card resident: wait for it. + await waitFor(() => { + const tools = [...document.querySelectorAll('[data-tool]')].map(el => el.getAttribute('data-tool')) + expect(tools, `tools present: ${tools.join(', ')}`).toContain('grep') + }, { timeout: 10_000 }) + + // `data-tool` sits on the summary row; the card and recovery footer are its + // siblings inside the SearchRow wrapper, so shape the wrapper (its parent). + const grepRow = document.querySelector('[data-tool="grep"]')!.parentElement! + const shape = cardShape(grepRow) + if (refreshing) { + mkdirSync(dirname(EXPECTED), { recursive: true }) + writeFileSync(EXPECTED, shape) + } + await expect(shape).toMatchFileSnapshot(EXPECTED) + }) +}) diff --git a/apps/web/tests/snapshots/search-card/grep-card.expected.txt b/apps/web/tests/snapshots/search-card/grep-card.expected.txt new file mode 100644 index 0000000000..3d0efb3ecd --- /dev/null +++ b/apps/web/tests/snapshots/search-card/grep-card.expected.txt @@ -0,0 +1,11 @@ +kind=matches +summary=显示 9 / 共 42 处匹配 · 3 个文件 +file=packages/client/ui-primitives/src/SearchBlock.tsx3 +file=packages/client/ui-conversation/src/client/toolviews/search-row.tsx4 +line=16: export const DEFAULT_SEARCH_MAX_LINES = 16 +line=138: export function SearchBlock(props: SearchBlockProps) { +line=141: const [collapsed, setCollapsed] = useState>(() => new Set()) +line=73: const search = searchCardModel(block) +line=90: +line=113: ctx.slots.register({ name: 'conversation.chat.toolview', key: 'grep' }, SearchRow) +expand=… 其余 4 行 \ No newline at end of file diff --git a/packages/client/connection/src/client/fixture.ts b/packages/client/connection/src/client/fixture.ts index 64c4229e65..46a17332ae 100644 --- a/packages/client/connection/src/client/fixture.ts +++ b/packages/client/connection/src/client/fixture.ts @@ -159,6 +159,15 @@ const SEARCH_MATCHES_FIXTURE: { path: string; matches: { lineNumber: number; lin { lineNumber: 60, line: 'export function searchCardModel(block: ToolCallBlock): SearchCardModel | null {' }, ], }, + { + path: 'packages/client/ui-conversation/src/client/toolviews/search-row.tsx', + matches: [ + { lineNumber: 71, line: 'export function SearchRow({ toolName, block }: ToolRowProps) {' }, + { lineNumber: 73, line: ' const search = searchCardModel(block)' }, + { lineNumber: 90, line: ' ' }, + { lineNumber: 113, line: " ctx.slots.register({ name: 'conversation.chat.toolview', key: 'grep' }, SearchRow)" }, + ], + }, ] /** @@ -169,7 +178,7 @@ const SEARCH_MATCHES_FIXTURE: { path: string; matches: { lineNumber: number; lin * `Line N:` rows, then a spill-recovery footer. */ const SEARCH_MATCHES_TEXT = [ - 'Found 5 of 42 matches', + 'Found 9 of 42 matches', '', ...SEARCH_MATCHES_FIXTURE.map(file => [file.path, ...file.matches.map(m => `Line ${m.lineNumber}: ${m.line}`)].join('\n')), diff --git a/packages/client/ui-conversation/README.i18n.yaml b/packages/client/ui-conversation/README.i18n.yaml index 1588367646..c5b5d63e9f 100644 --- a/packages/client/ui-conversation/README.i18n.yaml +++ b/packages/client/ui-conversation/README.i18n.yaml @@ -2,5 +2,5 @@ # side as of the last confirmed-consistent state. Both languages carry equal authority; # after editing either side, bring the other along and re-record with: # pnpm run verify-translation-pairing --write packages/client/ui-conversation/README.md -README.md: fc466190a744a1c13094ca6ebf62755d5bf49c98 -README.zh.md: f6fbff9c1e5d005b64e928680bbf401d94e4ce79 +README.md: e5e006b761020b8dfaf25eac191d1745326ae1f6 +README.zh.md: 3b19e2b5a0e9cc764bad74671e16c4428452e61f diff --git a/packages/client/ui-conversation/README.md b/packages/client/ui-conversation/README.md index fc466190a7..e5e006b761 100644 --- a/packages/client/ui-conversation/README.md +++ b/packages/client/ui-conversation/README.md @@ -16,6 +16,8 @@ Generic tool rows classify the built-in bash, read, search, write, edit, and run A tool call declaring the `terminal` render intent renders its command output inline, at both conversation render sites, through ui-primitives' `TerminalBlock`. `contract/terminal-card-model.ts` is the single derivation from the snapshot's `callView`/`resultView` pair, so the sites cannot disagree about a command, its cwd, or its exit status; it yields null — the generic path — for any other card tag, including one this client version does not know. Both sites therefore also show the card's run-state dot, which is the same `StateDot` semantic a tool row's leading icon carries, so a row and its own card always agree about one command's state. A multi-line command gets one prompt row per line, with the dot marking the call once on the first row — the exit status is the whole call's, so a dot per line would claim a per-line outcome bash does not report. The keyed `BashRow` carries the card resident below its summary row; since tool rows are no longer details-panel click targets, the card's copy and expand controls are the row's only interactions. The render-site fallback row keeps the card behind its existing expand control. Rows cap at `CHAT_TERMINAL_MAX_LINES` (8) against the panel's 16, which is what keeps a summary surface bounded — the panel stays the single-call reading surface. Inline output is licensed for this intent alone; a generic tool's content remains panel-only ([decision](../../../.agents/notes/implemented/feature/2026-07-28-web-terminal-card.md)). +A `grep`/`glob` call declaring the `search` render intent renders its result inline, at the same render sites, through ui-primitives' `SearchBlock` — grep's matches grouped by file (each a collapsible header of `lineNumber: line` rows), glob's flat path list. `contract/search-card-model.ts` is the single derivation from the snapshot's `resultView`; unlike the terminal card it reads no `callView`, since a search has no matches or paths before `execute`, so a running search shows its summary alone. It yields null — the generic path — for any non-search result view, a `card` or `kind` this client version does not compile, and (because those ride the untrusted wire frame) a known kind whose `files`/`paths` is malformed. The keyed `SearchRow`, registered under both `grep` and `glob` since the derived `kind` decides the shape, carries the card resident below its summary; the render-site fallback keeps it behind the expand control. Both cap at `CHAT_SEARCH_MAX_LINES` (8) against the panel's 16. A capped search drops rows from the card, but the locator to the rest — grep/glob's `Full … stored at …` footer — lives only in the result text, so the derivation surfaces that as a recovery footer below the card when (and only when) the result was truncated; a settled call with no card at all (an errored search, a nested `run_code` sub-dispatch, a legacy generic result) falls back to its flattened result text so nothing is lost behind a bare summary ([decision](../../../.agents/notes/implemented/feature/2026-07-30-web-search-card.md)). + Tool rows are slots too — the standalone tool ring (`ToolViewRegistry`/`ctx.toolviews`/outlet) is retired. The chat entry declares the keyed `'conversation.chat.toolview'` hole (session scope; the key space is runtime-open); its render site dispatches per row via `entryKey: toolName` with `GenericToolCard` as the call-site `fallback`. The owner payload is the uniform `ToolRowOwnerProps` (`callId`/`toolName`/`block`/`openFile`) and `ToolRowProps` pre-composes it with the session standard kit. A registrant is a plain plugin: `ctx.slots.register({ name: 'conversation.chat.toolview', key: '', inject? }, Row)` with `inject: ['slots', 'conversation']` as the load-order seam (apply mounts ConversationService after the chat registration, so the service being present guarantees the slot is declared); session differentiation happens inside the component (`useSessions` reading `parentId` — the bash sample is the third-party-posture exemplar). Trajectory/waterfall toolview slots share this shape and land with their own render sites (RendersCheck rejects a declaration nobody renders). The todo surfaces are two registrations over that shape, both plain registrant plugins with `inject: ['slots', 'conversation']`. `TodoRow` takes the `'conversation.chat.toolview'` key `todo_write` and summarizes what the call attempted (`/ 已完成 · ` parsed from its args, falling back to the generic summary on malformed or wrongly-shaped model JSON, and keeping the generic dot for non-ok execution states so a cancelled call never reads as a completed update). `TodoDock` takes the `'conversation.input.dock'` list slot at `order: 10` — between Goal and Queue — and is the plan strip: it reads the host-computed `todos` projection via `useProjection` (standing plan: latest `todo/write` with no later `turn/start`) and renders `TodoPanel`, which takes the plain list, hides itself while the list is empty, and starts collapsed as a header of title plus `"/ tasks · in progress"` (status glyphs are the figma check / progress / dashed-pending set). The dock adapter owns the selection so the panel stays a pure function of its props; the standing list lives here rather than in the row so the row stays one line. Anything the input-zone composer chain hides (a `conversation.composer` takeover such as ui-question's) hides the whole dock, this strip included. diff --git a/packages/client/ui-conversation/README.zh.md b/packages/client/ui-conversation/README.zh.md index f6fbff9c1e..3b19e2b5a0 100644 --- a/packages/client/ui-conversation/README.zh.md +++ b/packages/client/ui-conversation/README.zh.md @@ -14,6 +14,8 @@ 声明 `terminal` 渲染意图的工具调用,会在两个对话渲染点上都通过 ui-primitives 的 `TerminalBlock` 内联渲染其命令输出。`contract/terminal-card-model.ts` 是从快照的 `callView`/`resultView` 对推导的唯一位置,因此两个渲染点不可能在命令、cwd 或退出状态上产生分歧;对任何其他 card 标签——包括当前客户端版本不认识的标签——它返回 null,落回通用路径。因此两个渲染点也都显示卡片的运行状态点,它与工具行行首图标承载同一套 `StateDot` 语义,所以一行与其自身的卡片对同一条命令的状态总是一致。多行命令的每一行各占一个提示行,状态点只在第一行为整次调用标记一次——退出状态属于整次调用,因此每行一枚就会声称一个 bash 并不报告的逐行结果。键控的 `BashRow` 把卡片常驻在摘要行下方;由于工具行已不再是详情面板的点击目标,卡片的复制与展开控件就是该行唯一的交互。渲染点兜底行则保持其既有的展开控件。行的上限是 `CHAT_TERMINAL_MAX_LINES`(8),面板为 16,正是这一点让摘要面保持有界——面板仍是单次调用的阅读面。内联输出只对该意图开放;通用工具的内容仍然只在面板中呈现([决策](../../../.agents/notes/implemented/feature/2026-07-28-web-terminal-card.md))。 +声明 `search` 渲染意图的 `grep`/`glob` 调用,会在同样的渲染点上通过 ui-primitives 的 `SearchBlock` 内联渲染其结果——grep 的匹配按文件分组(每个是一个可折叠的头,下辖 `lineNumber: line` 行),glob 是扁平路径列表。`contract/search-card-model.ts` 是从快照的 `resultView` 推导的唯一位置;与终端卡片不同,它不读 `callView`,因为搜索在 `execute` 前没有匹配或路径,所以运行中的搜索只显示摘要。对任何非搜索的结果视图、当前客户端版本无法编译的 `card` 或 `kind`、以及(因为这些都与不可信的 wire 帧同行)一个 `files`/`paths` 格式错误的已知 kind,它都返回 null,落回通用路径。键控的 `SearchRow` 因推导出的 `kind` 决定形态而同时注册在 `grep` 与 `glob` 下,把卡片常驻在摘要行下方;渲染点兜底行则把它保持在展开控件之后。两者上限都是 `CHAT_SEARCH_MAX_LINES`(8),面板为 16。被截断的搜索会从卡片里丢掉一些行,但通往其余部分的定位符——grep/glob 的 `Full … stored at …` 脚注——只存在于结果文本里,因此推导在(且仅在)结果被截断时把它作为恢复脚注画在卡片下方;一个完全没有卡片的已结算调用(出错的搜索、嵌套 `run_code` 子派发、旧日志的 generic 结果)则回退到其压平后的结果文本,从而不让任何内容丢失在一个光秃秃的摘要之后([决策](../../../.agents/notes/implemented/feature/2026-07-30-web-search-card.md))。 + 工具行同样是 slot:独立工具环(`ToolViewRegistry`/`ctx.toolviews`/outlet)已经退役。聊天配置项声明键控的 `'conversation.chat.toolview'` 空位(Session scope;key 空间在运行时开放);其渲染点逐行通过 `entryKey: toolName` 分发,并以 `GenericToolCard` 作为调用点 `fallback`。owner 载荷是统一的 `ToolRowOwnerProps`(`callId`/`toolName`/`block`/`openFile`),`ToolRowProps` 则预先将其与 Session 标准工具包组合。注册方只是普通插件:`ctx.slots.register({ name: 'conversation.chat.toolview', key: '', inject? }, Row)`,以 `inject: ['slots', 'conversation']` 作为加载顺序 seam(apply 在聊天注册后挂载 ConversationService,因此服务存在即可保证 slot 已声明);Session 区分在组件内部完成(`useSessions` 读取 `parentId`,bash 示例是第三方姿态的范例)。Trajectory/waterfall 工具视图 slot 共享此形状,并随各自的渲染点落地(RendersCheck 会拒绝没有任何渲染方的声明)。 审批经由本包声明的链接管编辑器:`ApprovalPanel` 注册为按选择器路由的 `'conversation.composer'` 配置项(ui-question 模式),在审批等待未决期间取代 InputBar 占据编辑器(琥珀色条、理由标题、来自运行中调用参数的配对命令行、一次性的拒绝/允许)。`contract/slots.ts` 中的 `PendingApproval` 领域面在运行时 `PendingWait` 载体之上拥有 wire 编码——带审计关联的 `ApprovalResponsePayload` 值;广播的 `approval/resolved` 帧使等待落定并恢复编辑器。侧边栏通过 manager 跟踪的 `waitingApproval` 列表位(未实例化会话同样点亮)镜像该阻塞状态,其优先级高于运行中圆环,直至问题解决。未决等待完全离开消息流:问题(ui-question)与审批(ApprovalPanel)都经编辑器接管作答,不再保留只读占位卡。编辑器底行的 Access 席位挂载 `PermissionSelect`,由 host 计算的 `permissions` 投影经标准工具包 `useProjection` 供数(key 缺席即隐藏 chip);chip 打开 Menu 原语下拉,kebab-case 预设名渲染为 Title Case 标签(与 `/permission` popup 的显示变换孪生),选中会经由输入栏注入的 `command` 回调提交 `/permission ` 命令行。 diff --git a/packages/client/ui-conversation/src/client/chat/ToolRow.module.css b/packages/client/ui-conversation/src/client/chat/ToolRow.module.css index e046313128..a02608c11b 100644 --- a/packages/client/ui-conversation/src/client/chat/ToolRow.module.css +++ b/packages/client/ui-conversation/src/client/chat/ToolRow.module.css @@ -125,6 +125,17 @@ margin: 4px 0 4px 22px; } +/* The recovery footer for a capped search: the result text (its `Full … stored + at …` locator) below the card in the muted tone, since the card holds only the + retained rows. Same column indent as the card body. */ +.searchRecovery { + margin: 4px 0 4px 22px; + white-space: pre-wrap; + overflow-wrap: anywhere; + font: var(--dsw-font-xs-13); + color: var(--dsw-alias-label-tertiary); +} + /* Indented to the body's own column so the description reads as the card's heading rather than as another summary row, and sits tight against the card below it. Its own rule: grouping it with a body would put description diff --git a/packages/client/ui-conversation/src/client/chat/ToolRow.tsx b/packages/client/ui-conversation/src/client/chat/ToolRow.tsx index 596ea0e1cd..37a6350a21 100644 --- a/packages/client/ui-conversation/src/client/chat/ToolRow.tsx +++ b/packages/client/ui-conversation/src/client/chat/ToolRow.tsx @@ -137,7 +137,16 @@ export function ToolRow({ {terminalBody !== null ? : searchBody !== null - ? + ? ( + <> + + {/* A capped search's recovery locator lives only in the result + text; show it below the card so the dropped rows survive. */} + {searchBody.recovery !== undefined && ( +
{searchBody.recovery}
+ )} + + ) : variant === 'code' ? :
{text}
} diff --git a/packages/client/ui-conversation/src/client/contract/search-card-model.ts b/packages/client/ui-conversation/src/client/contract/search-card-model.ts index 9bb65a3092..f871e7d6dc 100644 --- a/packages/client/ui-conversation/src/client/contract/search-card-model.ts +++ b/packages/client/ui-conversation/src/client/contract/search-card-model.ts @@ -12,9 +12,15 @@ * therefore reads only `resultView` and returns null for a still-running call, * unlike the terminal card whose call view carries the command before * execution. + * + * A capped result also carries a recovery locator (grep/glob's `Full … stored + * at …` footer) that lives only in the view's `content` text, not in the + * structured matches/paths. Since both render sites replace the raw result with + * the card, this derivation surfaces that text as {@link SearchCardModel.recovery} + * so the one path to the dropped rows is not lost. * @module */ -import type { SearchBlockProps } from '@deepseek-ai/dsh-client-ui-primitives' +import type { SearchBlockProps, SearchFileGroup } from '@deepseek-ai/dsh-client-ui-primitives' import type { ToolCallBlock } from './tool-call-model.ts' /** @@ -55,6 +61,54 @@ export interface SearchCardModel { * row then keeps its args-derived summary. */ title: string | undefined + /** + * The model-facing result text (the view's `content`, flattened), surfaced + * only when the search was capped. The card renders the retained matches or + * paths, but the recovery locator a capped result carries — grep/glob's + * `Full … stored at: ` footer, the one way to reach the rows the cap + * dropped — lives only in this text. A UI that replaces the raw result with + * the card would otherwise lose it. Absent when the result was not capped + * (the card holds every result) or the presenter supplied no content. + */ + recovery: string | undefined +} + +/** + * Whether every file group in a matches view is structurally valid: the wire + * frame carries `kind` and `card` as strings the host schema checks, but not the + * grouped shape, so a version mismatch or loose producer could deliver + * `kind: 'matches'` with a missing or malformed `files`. Rendering that would + * crash {@link SearchBlock} at `.reduce`/`.map`; an invalid shape falls to the + * generic path instead. + * @param files - the candidate `files` field off the untrusted result view. + * @returns whether `files` is a valid {@link SearchFileGroup} array. + */ +function isValidFiles(files: unknown): files is SearchFileGroup[] { + return Array.isArray(files) && files.every(file => + typeof file === 'object' && file !== null + && typeof (file as { path?: unknown }).path === 'string' + && Array.isArray((file as { matches?: unknown }).matches) + && (file as { matches: unknown[] }).matches.every(match => + typeof match === 'object' && match !== null + && typeof (match as { lineNumber?: unknown }).lineNumber === 'number' + && typeof (match as { line?: unknown }).line === 'string')) +} + +/** + * Flatten a result view's `content` blocks to their text, joined by newlines. + * The search views carry `content` (the model-facing result text) so a UI + * without a search card can show it; here it is the source of the truncation + * recovery footer. Non-text blocks (a search result carries none) are skipped. + * @param content - the result view's optional content blocks. + * @returns the joined text, or undefined when absent or empty. + */ +function flattenContent(content: readonly { type: string; text?: string }[] | undefined): string | undefined { + if (content === undefined) return undefined + const text = content + .filter((block): block is { type: 'text'; text: string } => block.type === 'text' && typeof block.text === 'string') + .map(block => block.text) + .join('\n') + return text === '' ? undefined : text } /** @@ -78,8 +132,17 @@ export function searchCardModel(block: ToolCallBlock): SearchCardModel | null { const result = block.resultView?.card === 'search' ? block.resultView : null if (result === null) return null const common = { truncated: result.truncated, total: result.total } + // The recovery footer only matters when the tool capped the result: an + // uncapped card holds every match/path, so its content adds nothing the card + // does not already show. When capped, the content's `Full … stored at …` + // locator is the only path to the dropped rows, so surface it. + const recovery = result.truncated ? flattenContent(result.content) : undefined if (result.kind === 'matches') { - return { title: result.title, card: { kind: 'matches', files: result.files, ...common } } + // `files` rides the untrusted wire frame: the host schema checks `card`/`kind` + // strings but not the grouped shape, so validate it before SearchBlock, which + // would crash on a missing/malformed `files`. An invalid shape falls to generic. + if (!isValidFiles(result.files)) return null + return { title: result.title, recovery, card: { kind: 'matches', files: result.files, ...common } } } // `kind` rides the same untrusted wire frame as `card`, so a version mismatch // or a loose protocol producer could deliver a `card: 'search'` subtype this @@ -88,5 +151,8 @@ export function searchCardModel(block: ToolCallBlock): SearchCardModel | null { // would leave SearchBlock calling `.length`/`.map` on an absent `paths`. // oxlint-disable-next-line typescript/no-unnecessary-condition -- kind is wire data; the compiled union cannot prove this exhaustive. if (result.kind !== 'paths') return null - return { title: result.title, card: { kind: 'paths', paths: result.paths, ...common } } + // `paths` is likewise unchecked by the wire schema; a known kind with a + // missing/malformed array would crash the paths card at `.map`. + if (!Array.isArray(result.paths) || !result.paths.every((path): path is string => typeof path === 'string')) return null + return { title: result.title, recovery, card: { kind: 'paths', paths: result.paths, ...common } } } diff --git a/packages/client/ui-conversation/src/client/skeleton/DetailsPanel.module.css b/packages/client/ui-conversation/src/client/skeleton/DetailsPanel.module.css index cb0c301c1b..1efca98969 100644 --- a/packages/client/ui-conversation/src/client/skeleton/DetailsPanel.module.css +++ b/packages/client/ui-conversation/src/client/skeleton/DetailsPanel.module.css @@ -107,3 +107,14 @@ .terminal { margin: 0; } + +/* The recovery footer for a capped search: the result text (its `Full … stored + at …` locator) below the card in the muted tone, since the card holds only the + retained rows. */ +.searchRecovery { + margin: 6px 0 0; + white-space: pre-wrap; + overflow-wrap: anywhere; + color: var(--dsw-alias-label-tertiary); + font: var(--dsw-font-xs-13); +} diff --git a/packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx b/packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx index e164d955b9..8cc14cb4a0 100644 --- a/packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx +++ b/packages/client/ui-conversation/src/client/skeleton/DetailsPanel.tsx @@ -130,8 +130,9 @@ export function DetailsPanel({ useSession, useSessions, sessionId, useStore, clo * at the primitive's own full height allowance, so column-aligned output keeps * its alignment and scrolls sideways instead of folding. A search-card call — * a `grep`/`glob` result view — renders through the shared SearchBlock at the - * same full height allowance. Every other call, and a running call with no card - * yet, keeps the flattened text form. + * same full height allowance, with a capped search's recovery footer below it. + * Every other call, and a running call with no card yet, keeps the flattened + * text form. * @param props.material - the selected call's material from {@link materialFor}. * @param props.cwd - the session workspace root, resolving the terminal view's cwd. * @returns the Output section's body element. @@ -151,7 +152,18 @@ function OutputBody({ material, cwd }: { material: CallMaterial; cwd: string | u ) } const search = searchCardModel(material.block) - if (search !== null) return + if (search !== null) { + return ( + <> + + {/* A capped search's recovery locator lives only in the result text; + show it below the card so the dropped rows stay reachable. */} + {search.recovery !== undefined && ( +
{search.recovery}
+ )} + + ) + } // A settled call always carries the result node the flattened form needs; // the running shape has no result to flatten. if (!('kind' in material.block)) return
运行中…
diff --git a/packages/client/ui-conversation/src/client/toolviews/search-row.module.css b/packages/client/ui-conversation/src/client/toolviews/search-row.module.css index dd0395ec1d..21908bd9e1 100644 --- a/packages/client/ui-conversation/src/client/toolviews/search-row.module.css +++ b/packages/client/ui-conversation/src/client/toolviews/search-row.module.css @@ -104,3 +104,14 @@ font: var(--dsw-font-xs-13); color: var(--dsw-alias-state-error-primary); } + +/* The recovery footer for a capped search: the model-facing result text (its + `Full … stored at …` locator) shown below the card in the muted tone, since + the card holds only the retained rows. Same column indent as the card body. */ +.recovery { + margin: 4px 0 4px 22px; + white-space: pre-wrap; + overflow-wrap: anywhere; + font: var(--dsw-font-xs-13); + color: var(--dsw-alias-label-tertiary); +} diff --git a/packages/client/ui-conversation/src/client/toolviews/search-row.tsx b/packages/client/ui-conversation/src/client/toolviews/search-row.tsx index 0726f30a3c..8c0181ba78 100644 --- a/packages/client/ui-conversation/src/client/toolviews/search-row.tsx +++ b/packages/client/ui-conversation/src/client/toolviews/search-row.tsx @@ -42,11 +42,14 @@ function stateStatus(state: ToolRowState): string | null { /** * A settled result's text, flattened from its content blocks, for the arm that - * shows a failure the search card cannot: grep/glob have no `presentResult` on - * an error result, so an errored search has no card, and the keyed row is not a - * details-panel target. Without this the failure — a bad pattern, a missing - * path, a nested run_code dispatch that returned no card — would read as a bare - * red dot with the model-facing error text nowhere on screen. + * shows a result the search card cannot. Two cases reach it: an errored search + * (grep/glob emit no `presentResult` on an error result, so an errored search + * has no card), and a settled call whose result view is not a search card at all + * — a nested `run_code` sub-dispatch (the backend computes no presentationMeta + * for it, so `resultView` is null) or a legacy generic result. In both the keyed + * SearchRow owns the render slot, so without this arm the model-facing text would + * have nowhere to go: an errored search would read as a bare red dot, and a + * successful cardless result would show only its summary with its content lost. * @param block - the frozen call slice. * @returns the result text, or null for a running call or an empty result. */ @@ -63,18 +66,24 @@ function errorText(block: ToolRowProps['block']): string | null { /** * Search row: icon + Search · {summary} in the shared ToolRow chrome, with the - * completed search's card resident below it. The summary row is not a - * details-panel control, so the card's copy, per-file collapse, and expand - * controls are the row's only interactions. Registered under both `grep` and - * `glob`; the derived model's `kind` decides the card shape. + * completed search's card resident below it, and — when the result was capped — + * the recovery footer below the card. The summary row is not a details-panel + * control, so the card's copy, per-file collapse, and expand controls are the + * row's only interactions. Registered under both `grep` and `glob`; the derived + * model's `kind` decides the card shape. */ export function SearchRow({ toolName, block }: ToolRowProps) { const model = toolRowModel(toolName, block) const search = searchCardModel(block) const status = stateStatus(model.state) - // An errored search has no card (grep/glob return no presentResult on error); - // surface its result text so the failure is more than a red dot. - const failure = search === null && model.state === 'error' ? errorText(block) : null + // A settled call with no search card — an errored search (grep/glob emit no + // result view on error), a successful nested run_code sub-dispatch, or a + // legacy generic result — has its model-facing text nowhere else to go, since + // the keyed SearchRow owns this render slot. Surface it as the fallback body. + // A running call ('kind' absent) has no result to flatten; errorText returns + // null for it, so the arm stays closed until settle. + const settled = 'kind' in block + const fallback = search === null && settled ? errorText(block) : null return (
@@ -89,7 +98,11 @@ export function SearchRow({ toolName, block }: ToolRowProps) { {search !== null && ( )} - {failure !== null &&
{failure}
} + {/* A capped search drops rows from the card; its recovery locator (the + `Full … stored at …` footer) lives only in the result text, so show it + below the card so the one path to the dropped rows survives. */} + {search?.recovery !== undefined &&
{search.recovery}
} + {fallback !== null &&
{fallback}
}
) } diff --git a/packages/client/ui-conversation/tests/search-card.spec.tsx b/packages/client/ui-conversation/tests/search-card.spec.tsx index 6d566b1b01..26eb16a7f9 100644 --- a/packages/client/ui-conversation/tests/search-card.spec.tsx +++ b/packages/client/ui-conversation/tests/search-card.spec.tsx @@ -77,6 +77,7 @@ describe('searchCardModel', () => { it('derives a matches card from the grep result view', () => { expect(searchCardModel(settledGrep())).toEqual({ title: undefined, + recovery: undefined, card: { kind: 'matches', files: [ @@ -91,6 +92,7 @@ describe('searchCardModel', () => { it('derives a paths card from the glob result view, carrying the truncation signal', () => { expect(searchCardModel(settledGlob({ resultView: resultPaths({ truncated: true, total: 20 }) }))).toEqual({ title: undefined, + recovery: undefined, card: { kind: 'paths', paths: ['src/a.ts', 'src/b.ts'], truncated: true, total: 20 }, }) }) @@ -115,6 +117,55 @@ describe('searchCardModel', () => { const future = { card: 'chart' } as unknown as ToolResultView expect(searchCardModel(settledGrep({ resultView: future }))).toBeNull() }) + + it('returns null for a card:search view whose kind this version does not compile', () => { + // `kind` rides the same untrusted wire frame as `card`; a subtype this client + // does not know must fall to the generic path, never render as a paths card + // that would crash SearchBlock on an absent `paths`. + const futureKind = { + card: 'search', kind: 'future', truncated: false, total: 0, + } as unknown as ToolResultView + expect(searchCardModel(settledGrep({ resultView: futureKind }))).toBeNull() + }) + + it('returns null for a known kind whose structured shape is missing or malformed', () => { + // The host wire schema checks the `card`/`kind` strings but not the grouped + // shape, so a version mismatch could deliver kind:'matches' with no `files` + // (or kind:'paths' with no `paths`). Rendering that crashes SearchBlock at + // `.reduce`/`.map`; the derivation drops to the generic path instead. + const noFiles = { card: 'search', kind: 'matches', truncated: false, total: 0 } as unknown as ToolResultView + expect(searchCardModel(settledGrep({ resultView: noFiles }))).toBeNull() + const badFile = { + card: 'search', kind: 'matches', truncated: false, total: 1, + files: [{ path: 'a.ts', matches: [{ lineNumber: 'x', line: 1 }] }], + } as unknown as ToolResultView + expect(searchCardModel(settledGrep({ resultView: badFile }))).toBeNull() + const noPaths = { card: 'search', kind: 'paths', truncated: false, total: 0 } as unknown as ToolResultView + expect(searchCardModel(settledGlob({ resultView: noPaths }))).toBeNull() + const badPaths = { + card: 'search', kind: 'paths', truncated: false, total: 1, paths: [42], + } as unknown as ToolResultView + expect(searchCardModel(settledGlob({ resultView: badPaths }))).toBeNull() + }) + + it('surfaces the recovery text only when the result was capped', () => { + const recovery = 'a.ts\n 12: const foo = 1\n\n(Full grep result stored at: spill://grep-1. Read it to see every match.)' + // Capped: the content (its `Full … stored at …` locator) rides through so the + // dropped rows stay reachable. + const capped = searchCardModel(settledGrep({ + resultView: resultMatches({ truncated: true, total: 42, content: [{ type: 'text', text: recovery }] }), + })) + expect(capped?.recovery).toBe(recovery) + // Not capped: the card holds every match, so the content adds nothing and is + // dropped. + const whole = searchCardModel(settledGrep({ + resultView: resultMatches({ truncated: false, content: [{ type: 'text', text: recovery }] }), + })) + expect(whole?.recovery).toBeUndefined() + // Capped but the presenter attached no content: nothing to surface. + const noContent = searchCardModel(settledGrep({ resultView: resultMatches({ truncated: true, total: 42 }) })) + expect(noContent?.recovery).toBeUndefined() + }) }) describe('chat row search body (GenericToolCard fallback)', () => { @@ -150,6 +201,16 @@ describe('chat row search body (GenericToolCard fallback)', () => { expect(view.getByText(/"pattern"/)).toBeTruthy() expect(searchKindOf(view.container)).toBeNull() }) + + it('the expanded body shows the recovery footer below a capped card', () => { + const recovery = 'a.ts\n 12: const foo = 1\n\n(Full grep result stored at: spill://grep-1. Read it to see every match.)' + const view = render() + fireEvent.click(view.container.querySelector('button')!) + expect(searchKindOf(view.container)).toBe('matches') + expect(view.getByText(/Full grep result stored at: spill:\/\/grep-1/)).toBeTruthy() + }) }) describe('SearchRow keyed card', () => { @@ -195,6 +256,34 @@ describe('SearchRow keyed card', () => { expect(view.getByText('grep: invalid regular expression')).toBeTruthy() }) + it('surfaces the result text for a settled non-error call with no card', () => { + // A successful nested run_code sub-dispatch (backend computes no + // presentationMeta, so resultView is null) or a legacy generic result settles + // with search === null and state ok. The keyed SearchRow owns the slot, so + // without the widened arm the content would be lost behind a bare summary. + const view = render() + expect(view.container.querySelector('[data-variant="search"]')?.getAttribute('data-state')).toBe('ok') + expect(searchKindOf(view.container)).toBeNull() + expect(view.getByText('nested run_code output line')).toBeTruthy() + }) + + it('renders the recovery footer below the card when the search was capped', () => { + const recovery = 'a.ts\n 12: const foo = 1\n\n(Full grep result stored at: spill://grep-1. Read it to see every match.)' + const view = render() + expect(searchKindOf(view.container)).toBe('matches') + expect(view.getByText(/Full grep result stored at: spill:\/\/grep-1/)).toBeTruthy() + }) + + it('shows no recovery footer for an uncapped search', () => { + const view = render() + expect(view.container.textContent).not.toMatch(/stored at/) + }) + it('falls back to the error name/code when an errored result has no text block', () => { const view = render( { expect(searchKindOf(view.container)).toBe('paths') }) + it('renders the recovery footer below the card for a capped search', () => { + const recovery = 'src/a.ts\nsrc/b.ts\n\n(Showing 2 of 23 paths. Full sorted result stored at: spill://glob-7.)' + const view = mount(snapshot({ + nodes: [settledGlob({ resultView: resultPaths({ truncated: true, total: 23, content: [{ type: 'text', text: recovery }] }) })], + }), globTarget) + expect(searchKindOf(view.container)).toBe('paths') + expect(view.getByText(/Full sorted result stored at: spill:\/\/glob-7/)).toBeTruthy() + }) + it('a non-search result keeps the flattened pre form', () => { const view = mount(snapshot({ nodes: [settledGrep({ callView: null, resultView: null })], diff --git a/packages/client/ui-primitives/src/SearchBlock.tsx b/packages/client/ui-primitives/src/SearchBlock.tsx index 843b947491..5210b2fdc6 100644 --- a/packages/client/ui-primitives/src/SearchBlock.tsx +++ b/packages/client/ui-primitives/src/SearchBlock.tsx @@ -209,17 +209,23 @@ export function SearchBlock(props: SearchBlockProps) { const headLines = Math.ceil(maxLines / 2) const tailLines = maxLines - headLines const head = capped ? rows.slice(0, headLines) : rows - const tail = capped ? rows.slice(rows.length - tailLines) : [] + const naturalTail = capped ? rows.slice(rows.length - tailLines) : [] // When the tail slice begins inside a file's matches, its own header sits // above the cut and is not shown, so those rows could not be attributed to a // file. Restore the owning header at the top of the tail — unless the head // slice already carries it (a single large file), where it would duplicate. - const tailLead = tail[0] + const tailLead = naturalTail[0] const tailHeader = tailLead?.type === 'match' && !head.some(row => row.type === 'file' && row.index === tailLead.fileIndex) ? rows.find((row): row is Extract => row.type === 'file' && row.index === tailLead.fileIndex) : undefined + // The restored header is itself a row. Left extra it would push the card to + // maxLines + 1 and overstate `hidden` by one, so it consumes a tail slot: drop + // the tail's first row (the match whose header this is) for it. Visible rows + // hold at maxLines and `hidden` stays exact; the dropped match joins the + // hidden middle. + const tail = tailHeader === undefined ? naturalTail : naturalTail.slice(1) const renderRow = (row: SearchRow): ReactNode => { if (row.type === 'path') return
{row.path}
diff --git a/packages/client/ui-primitives/tests/search-block.spec.tsx b/packages/client/ui-primitives/tests/search-block.spec.tsx index 45a6664924..29cf87fb91 100644 --- a/packages/client/ui-primitives/tests/search-block.spec.tsx +++ b/packages/client/ui-primitives/tests/search-block.spec.tsx @@ -140,16 +140,20 @@ describe('SearchBlock height cap', () => { it('restores the owning file header above a tail slice that begins mid-file', () => { // Two files of 10 matches each → 22 rows. Cap 8: head 4 (a.ts header + 3 - // matches), tail 4 (last 4 of b.ts, whose header sits above the cut). + // matches), tail 4. The tail begins mid-b.ts, so its header is restored — + // and, being a row itself, it consumes one tail slot rather than pushing the + // card to 9 rows: the tail keeps its last 3 matches, total visible = 8. const view = render() - // The tail's own header is restored so its rows can be attributed to b.ts. expect(fileHeaders(view.container)).toEqual(['a.ts10', 'b.ts10']) expect(lines(view.container)).toEqual([ '1: hit 1', '2: hit 2', '3: hit 3', - '17: hit 17', '18: hit 18', '19: hit 19', '20: hit 20', + '18: hit 18', '19: hit 19', '20: hit 20', ]) + // Visible rows hold at maxLines (2 headers + 6 matches = 8), so the hidden + // count stays exact: 22 − 8 = 14. + expect(view.getByRole('button', { name: '展开其余 14 行结果' })).toBeTruthy() }) it('caps at the documented default when maxLines is absent', () => {