mirror of
https://github.com/deepseek-ai/deepseek-harness.git
synced 2026-08-29 04:26:38 +00:00
perf(web): accumulate the Turn rail instead of scanning the loaded window
The rail's items now ride the Chat snapshot: a structural upsert re-derives the loaded Turn set, a content-only upsert re-derives only the Turns whose nodes changed, and each preview is capped so navigation state never holds a copy of the transcript. The published array keeps its identity until an item changes, so ChatView selects it as both data and change signal — and a streaming reply's preview follows the in-place node update instead of the last structural publication. A scroll frame resolves the active mark with one hit test at the reading line, falling back to a single row scan, rather than a DOM query per mark. Flow-height changes resync through the existing column observer, navigating during a pending page keeps the paging anchor, and the rail height no longer holds a floor taller than the band it centers in.
This commit is contained in:
@@ -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-08-25-loaded-turn-chat-navigation.md
|
||||
2026-08-25-loaded-turn-chat-navigation.md: 92e92323115c5da51ced09092d9ecd4e376f874f
|
||||
2026-08-25-loaded-turn-chat-navigation.zh.md: b0cba5e78fad8b2ff3559d6cbfc12fb2160a2dc8
|
||||
2026-08-25-loaded-turn-chat-navigation.md: 5d9d93b07f7a8c527bf7376bf111c6a709afa4d1
|
||||
2026-08-25-loaded-turn-chat-navigation.zh.md: 21dba024710b306848fee9bc4fe1f16913c475b3
|
||||
|
||||
@@ -10,13 +10,15 @@ Long Chat transcripts require repeated scrolling to revisit an earlier Turn. Ses
|
||||
|
||||
## Decision
|
||||
|
||||
ChatView derives one navigation item for every currently loaded Turn that has a visible transcript node. Each item uses the Turn number as its stable React key and the first loaded user node, falling back to the Turn's first loaded node, as its scroll anchor. This is a pure projection of the Chat snapshot: the feature adds no Session event, persisted index, or pagination request.
|
||||
The Chat snapshot builder accumulates one navigation item for every currently loaded Turn that has a visible transcript node. Each item uses the Turn number as its stable React key and the first loaded user node, falling back to the Turn's first loaded node, as its scroll anchor. This is a pure projection of loaded Chat state: the feature adds no Session event, persisted index, or pagination request.
|
||||
|
||||
Accumulation, not a render-time scan: a structural upsert re-derives the loaded Turn set, a content-only upsert re-derives only the Turns whose nodes changed, and each preview is capped at 160 characters so navigation state never holds a copy of the transcript. The published array keeps its identity until an item changes, so ChatView selects it as both the rail's data and its change signal — the renderer never walks the loaded window, and a streaming reply's preview follows the in-place node update instead of the last structural publication.
|
||||
|
||||
The rail renders the complete loaded Turn set with a 10px natural interval and never renders an ellipsis or unloaded-history placeholder. Its height shrink-wraps small sets; when the loaded set exceeds the available height, percentage positions compress every mark into the capped rail. When an earlier page arrives, existing Turn keys and DOM elements remain stable while their resolved positions change; CSS transitions animate that redistribution. A Turn split by the page boundary initially previews its Turn number and loaded assistant response, then gains the user prompt when the preceding page supplies it.
|
||||
|
||||
The rail sits against the scrollport's right edge and centers on the band the sticky composer leaves visible. That band is the scrollport's own height minus the seat's, so ConversationRoot publishes `--dsh-conversation-viewport-height` beside the `--dsh-composer-height` it already measures on the same element, and the rail centers on their difference instead of a viewport height that ignores the Session header.
|
||||
|
||||
The active mark follows a reading line near the top of the shared Chat scrollport. Scroll updates are coalesced with `requestAnimationFrame`; reaching the bottom selects the final loaded Turn. Activating a mark computes the target node's position in the existing scroll coordinate system, moves that same scrollport, and records the resulting Chat scroll-restoration anchor.
|
||||
The active mark follows a reading line near the top of the shared Chat scrollport. A scroll frame resolves the owning Turn with one hit test at that line, falling back to a single row scan where layout cannot answer, so cost does not grow with the number of marks. Flow-height changes that move rows across the line without a scroll event resync through the existing column observer. Scroll updates are coalesced with `requestAnimationFrame`; reaching the bottom selects the final loaded Turn. Activating a mark computes the target node's position in the existing scroll coordinate system, moves that same scrollport, and records the resulting Chat scroll-restoration anchor.
|
||||
|
||||
Every Turn remains an accessible button even when dense marks visually overlap. The rail maps pointer height to the nearest loaded Turn, while keyboard focus and activation operate the individual buttons. Hover and focus show a compact prompt-and-response preview, the active mark is longer and darker, the rail is hidden when the Chat container is at most 900px wide, and reduced-motion preferences disable redistribution and mark-entry animation.
|
||||
|
||||
@@ -28,6 +30,8 @@ Every Turn remains an accessible button even when dense marks visually overlap.
|
||||
|
||||
**Always spread marks across the available height.** Rejected: a small loaded set produces visually unrelated marks separated by large empty regions. A fixed natural interval preserves a compact index while percentage compression still admits dense histories.
|
||||
|
||||
**Derive the rail in the renderer from the Chat snapshot.** Rejected: renderers do not scan the loaded Chat Nodes ([client discipline](../../../../packages/client/AGENTS.md)). A render-time projection also re-copied every Turn's prompt and reply text on each structural publication, and could not see the in-place node updates a streaming reply produces, so previews froze at the first chunk.
|
||||
|
||||
**Key marks by loaded-array position.** Rejected: prepending a page would reuse each DOM element for a different Turn, lose focus and preview identity, and prevent the existing marks from animating to their new positions.
|
||||
|
||||
**Call `scrollIntoView` on the Turn row.** Rejected: Chat owns a shared scroller, bottom-follow state, paging anchors, and persisted restoration coordinates. An opaque browser scroll would bypass those state updates.
|
||||
@@ -38,4 +42,4 @@ Desktop-width Chat views can jump among all currently loaded Turns and inspect a
|
||||
|
||||
## Testing
|
||||
|
||||
Component tests pin Turn derivation, accessible previews, scroll-coordinate jumps, DOM identity, and percentage redistribution after prepend. The long-interaction Chromium scenario pins the real paginated boundary, prompt completion after `Load earlier`, stable-mark movement, keyboard activation, and active-state update. The multi-Turn recorded Web snapshot includes the navigation landmark and buttons.
|
||||
Builder tests pin the accumulated projection, the bounded preview, and preview freshness under an in-place chunk update. Component tests pin the published items, accessible previews, scroll-coordinate jumps, DOM identity, and percentage redistribution after prepend. The long-interaction Chromium scenario pins the real paginated boundary, prompt completion after `Load earlier`, stable-mark movement, keyboard activation, active-state update, and the narrow-container hide. The multi-Turn recorded Web snapshot includes the navigation landmark and buttons.
|
||||
|
||||
@@ -10,13 +10,15 @@ Status: implemented
|
||||
|
||||
## 决定
|
||||
|
||||
ChatView 为当前已加载且含可见 transcript node 的每个 Turn 派生一项导航。每项使用 Turn 编号作为稳定的 React key,并以首个已加载用户 node 为滚动锚点;没有用户 node 时回退到该 Turn 的首个已加载 node。这只是 Chat snapshot 的纯投影:本功能不新增 Session event、持久化索引或分页请求。
|
||||
Chat snapshot 构建层为当前已加载且含可见 transcript node 的每个 Turn 累积一项导航。每项使用 Turn 编号作为稳定的 React key,并以首个已加载用户 node 为滚动锚点;没有用户 node 时回退到该 Turn 的首个已加载 node。这只是已加载 Chat 状态的纯投影:本功能不新增 Session event、持久化索引或分页请求。
|
||||
|
||||
累积而非渲染期扫描:结构性 upsert 重算已加载 Turn 集合,仅内容变化的 upsert 只重算受影响 Turn,每条预览截断到 160 字符,导航状态因此不会持有 transcript 副本。发布的数组在条目未变时保持引用不变,ChatView 直接选取它,既作为轨道数据也作为变化信号——渲染层不遍历已加载窗口,流式回复的预览也跟随节点原地更新,而不是停在上一次结构性发布。
|
||||
|
||||
导航轨道以 10px 自然间距渲染完整的已加载 Turn 集合,永不显示省略号或未加载历史占位。集合较小时轨道随内容收缩;已加载集合超过可用高度后,百分比位置会把所有刻度压缩到设定上限内。更早一页到达后,已有 Turn 的 key 和 DOM 元素保持不变,最终位置随之变化;CSS transition 为这次重排添加动画。如果一个 Turn 被分页边界截断,预览最初显示其 Turn 编号与已加载的助手回复,上一页补齐后再显示用户问题。
|
||||
|
||||
轨道紧贴滚动视口右缘,并在粘性输入区之外的可见区间内垂直居中。该区间等于滚动视口自身高度减去输入区高度,因此 ConversationRoot 在同一元素上除已有的 `--dsh-composer-height` 外再发布 `--dsh-conversation-viewport-height`,轨道按两者之差居中,而不是按忽略 Session 头部的视口高度居中。
|
||||
|
||||
活跃刻度跟随共享 Chat 滚动区顶部附近的阅读线。滚动更新由 `requestAnimationFrame` 合并;到达底部时选择最后一个已加载 Turn。激活刻度会在现有滚动坐标系中计算目标 node 的位置,移动同一个滚动区,并记录由此产生的 Chat 滚动恢复锚点。
|
||||
活跃刻度跟随共享 Chat 滚动区顶部附近的阅读线。每个滚动帧用一次命中测试解析该行所属 Turn,布局无法作答时退化为一次行扫描,成本不随刻度数量增长。图片加载、工具卡展开等不产生滚动事件的高度变化,通过既有的 column observer 重新同步。滚动更新由 `requestAnimationFrame` 合并;到达底部时选择最后一个已加载 Turn。激活刻度会在现有滚动坐标系中计算目标 node 的位置,移动同一个滚动区,并记录由此产生的 Chat 滚动恢复锚点。
|
||||
|
||||
即使密集刻度在视觉上重叠,每个 Turn 仍是可访问的按钮。轨道把指针高度映射到最近的已加载 Turn,键盘聚焦和激活则作用于各个按钮。悬停或聚焦显示紧凑的问题与回复预览,活跃刻度更长、更深;Chat 容器宽度不超过 900px 时隐藏轨道,用户偏好减少动态效果时关闭重排和刻度入场动画。
|
||||
|
||||
@@ -28,6 +30,8 @@ ChatView 为当前已加载且含可见 transcript node 的每个 Turn 派生一
|
||||
|
||||
**始终把刻度铺满可用高度。**否决:已加载集合较小时,各刻度会被大片空白隔开,在视觉上失去关联。固定自然间距保持紧凑索引,百分比压缩仍能容纳密集历史。
|
||||
|
||||
**在渲染层从 Chat snapshot 派生轨道。**否决:渲染层不扫描已加载的 Chat Nodes(见 [client 纪律](../../../../packages/client/AGENTS.md))。渲染期投影还会在每次结构性发布时重新复制每个 Turn 的问题与回复文本,且看不到流式回复的节点原地更新,预览会停在首个 chunk。
|
||||
|
||||
**按已加载数组位置给刻度设置 key。**否决:前插一页会让每个 DOM 元素改为代表另一个 Turn,丢失焦点与预览身份,也无法让已有刻度移动到新位置。
|
||||
|
||||
**对 Turn 行调用 `scrollIntoView`。**否决:Chat 拥有共享滚动区、底部跟随状态、分页锚点与持久化恢复坐标。浏览器的黑盒滚动会绕过这些状态更新。
|
||||
@@ -38,4 +42,4 @@ ChatView 为当前已加载且含可见 transcript node 的每个 Turn 派生一
|
||||
|
||||
## 测试
|
||||
|
||||
组件测试固定 Turn 派生、可访问预览、滚动坐标跳转、DOM 身份以及前插后的百分比重排。长交互 Chromium 场景固定真实分页边界、`加载更早` 后补齐问题、稳定刻度移动、键盘激活与活跃状态更新。多 Turn 的 Web 录制快照包含导航 landmark 和按钮。
|
||||
构建层测试固定累积投影、预览截断,以及原地 chunk 更新后的预览新鲜度。组件测试固定已发布条目、可访问预览、滚动坐标跳转、DOM 身份以及前插后的百分比重排。长交互 Chromium 场景固定真实分页边界、`加载更早` 后补齐问题、稳定刻度移动、键盘激活、活跃状态更新与窄容器隐藏。多 Turn 的 Web 录制快照包含导航 landmark 和按钮。
|
||||
|
||||
@@ -153,7 +153,7 @@ describe('web e2e: long Chat interaction contract', () => {
|
||||
})
|
||||
await seedSession(scaffold, FIXTURE.log, SESSION_ID)
|
||||
browser = await chromium.launch()
|
||||
page = await newEnglishPage(browser, 1_280)
|
||||
page = await newEnglishPage(browser, 900)
|
||||
tripwire = watchConsole(page)
|
||||
await page.goto(scaffold.baseUrl, { waitUntil: 'load' })
|
||||
await page.waitForSelector('[class*="frame"]', { timeout: 30_000 })
|
||||
@@ -235,6 +235,12 @@ describe('web e2e: long Chat interaction contract', () => {
|
||||
{ timeout: 5_000 },
|
||||
).toBe(1)
|
||||
|
||||
// Desktop-only affordance: a narrow Chat container hides the rail outright.
|
||||
await page.setViewportSize({ width: 800, height: 900 })
|
||||
await turnNavigation.waitFor({ state: 'hidden', timeout: 5_000 })
|
||||
await page.setViewportSize({ width: 1_680, height: 900 })
|
||||
await turnNavigation.waitFor({ state: 'visible', timeout: 5_000 })
|
||||
|
||||
await wheelUntilMounted(page, `[data-chat-call-id="${TARGET_CALL_2}"]`, -1_100)
|
||||
const toolUserKey = messageKey(toolUserEvent)
|
||||
const toolAssistantKey = assistantKey(toolAssistantEvent)
|
||||
|
||||
@@ -7,10 +7,10 @@ import type {
|
||||
} from '@deepseek-ai/dsh-client-ui-conversation/client'
|
||||
import { Button, IconChevronDownOutline14, Modal } from '@deepseek-ai/dsh-client-ui-primitives'
|
||||
import type { ChatViewSlotProps } from '../contract/slots.ts'
|
||||
import type { TurnNavigationItem } from '../contract/snapshot.ts'
|
||||
import { PendingSteeringBubble } from './MessageItem.tsx'
|
||||
import { ChatNodeSeat } from './ChatNodeSeat.tsx'
|
||||
import { TurnNavigator } from './TurnNavigator.tsx'
|
||||
import { deriveTurnNavigationItems, type TurnNavigationItem } from './turn-navigation.ts'
|
||||
import { formatRunDuration } from './message-chrome.ts'
|
||||
import css from './ChatView.module.css'
|
||||
|
||||
@@ -36,6 +36,32 @@ function anchorElement(list: HTMLElement, key: string): HTMLElement | null {
|
||||
return null
|
||||
}
|
||||
|
||||
/**
|
||||
* Turn owning the row at a scrollport line. Scroll frames are hot, so this
|
||||
* hit-tests the line first and falls back to one row scan when layout cannot
|
||||
* answer (jsdom, pre-paint); neither path queries per navigation item.
|
||||
* @param list - the ChatView list element.
|
||||
* @param line - viewport y of the reading line.
|
||||
* @returns the Turn number, or null when no loaded row covers the line.
|
||||
*/
|
||||
function turnAtLine(list: HTMLElement, line: number): number | null {
|
||||
const content = list.getBoundingClientRect()
|
||||
if (typeof document.elementsFromPoint === 'function' && content.width > 0) {
|
||||
for (const element of document.elementsFromPoint(content.left + content.width / 2, line)) {
|
||||
const row = element instanceof HTMLElement ? element.closest<HTMLElement>('[data-chat-turn]') : null
|
||||
const turn = Number(row?.dataset.chatTurn)
|
||||
if (row !== null && list.contains(row) && Number.isSafeInteger(turn)) return turn
|
||||
}
|
||||
}
|
||||
let found: number | null = null
|
||||
for (const row of list.querySelectorAll<HTMLElement>('[data-chat-turn]')) {
|
||||
if (row.getBoundingClientRect().top > line) break
|
||||
const turn = Number(row.dataset.chatTurn)
|
||||
if (Number.isSafeInteger(turn)) found = turn
|
||||
}
|
||||
return found
|
||||
}
|
||||
|
||||
/** Row position in scrollport coordinates (viewport-independent). */
|
||||
function flowTop(row: HTMLElement, scrollport: HTMLElement): number {
|
||||
return row.getBoundingClientRect().top - scrollport.getBoundingClientRect().top
|
||||
@@ -153,7 +179,10 @@ export function ChatView({
|
||||
}: ChatViewSlotProps) {
|
||||
const order = useChat(s => s.order)
|
||||
const nodeStore = useChat(s => s.nodes)
|
||||
const locations = useChat(s => s.locations)
|
||||
// The rail's items are accumulated in the Chat snapshot, so this selector is
|
||||
// both the data and its change signal: the array identity moves only when a
|
||||
// Turn enters, leaves, or changes its preview.
|
||||
const turnNavigationItems = useChat(s => s.navigation.items())
|
||||
const timeline = useChat(s => s.timeline)
|
||||
const inbox = useSession(s => s.queue)
|
||||
// Workspace root off the session list row: path summaries display relative to it.
|
||||
@@ -211,10 +240,6 @@ export function ChatView({
|
||||
[loadImage, renderSlot],
|
||||
)
|
||||
const runningTurnStart = useMemo(() => runningTurnStartTime(timeline), [timeline])
|
||||
const turnNavigationItems = useMemo(
|
||||
() => deriveTurnNavigationItems({ timeline, locations, nodes: nodeStore }),
|
||||
[locations, nodeStore, order, timeline],
|
||||
)
|
||||
|
||||
const listRef = useRef<HTMLDivElement | null>(null)
|
||||
const columnRef = useRef<HTMLDivElement | null>(null)
|
||||
@@ -252,13 +277,17 @@ export function ChatView({
|
||||
return
|
||||
}
|
||||
const el = scrollerOf(local)
|
||||
const scrollport = el.getBoundingClientRect()
|
||||
const readingLine = scrollport.top + Math.min(96, el.clientHeight * 0.2)
|
||||
const readingLine = el.getBoundingClientRect().top + Math.min(96, el.clientHeight * 0.2)
|
||||
const reading = turnAtLine(local, readingLine)
|
||||
// No row reaches the line yet: the flow head still owns the mark. Otherwise
|
||||
// the row's Turn may be one the rail does not offer (all its nodes hidden),
|
||||
// so the newest offered Turn at or above it owns the mark.
|
||||
let next = first.turn
|
||||
for (const item of turnNavigationItems) {
|
||||
const row = anchorElement(local, item.anchorKey)
|
||||
if (row === null || row.getBoundingClientRect().top > readingLine) break
|
||||
next = item.turn
|
||||
if (reading !== null) {
|
||||
for (const item of turnNavigationItems) {
|
||||
if (item.turn > reading) break
|
||||
next = item.turn
|
||||
}
|
||||
}
|
||||
if (el.scrollHeight - el.scrollTop - el.clientHeight <= FOLLOW_THRESHOLD + 1) {
|
||||
next = turnNavigationItems.at(-1)?.turn ?? next
|
||||
@@ -266,6 +295,7 @@ export function ChatView({
|
||||
setActiveTurn(current => current === next ? current : next)
|
||||
}, [turnNavigationItems])
|
||||
|
||||
const activeTurnRef = useRef<(() => void) | null>(null)
|
||||
const activeFrameRef = useRef<number | null>(null)
|
||||
const scheduleActiveTurn = useCallback((): void => {
|
||||
if (activeFrameRef.current !== null) return
|
||||
@@ -285,6 +315,8 @@ export function ChatView({
|
||||
}
|
||||
}, [])
|
||||
|
||||
activeTurnRef.current = scheduleActiveTurn
|
||||
|
||||
useLayoutEffect(() => {
|
||||
scheduleActiveTurn()
|
||||
}, [scheduleActiveTurn])
|
||||
@@ -434,7 +466,12 @@ export function ChatView({
|
||||
if (column === null || local === null || typeof ResizeObserver === 'undefined') return
|
||||
const scrollport = scrollerOf(local)
|
||||
const composer = scrollport.querySelector<HTMLElement>('[data-composer-seat]')
|
||||
const observer = new ResizeObserver(() => { followRef.current?.() })
|
||||
// Flow-height changes (image loads, tool disclosures) move rows across the
|
||||
// reading line without a scroll event, so the active mark resyncs here too.
|
||||
const observer = new ResizeObserver(() => {
|
||||
followRef.current?.()
|
||||
activeTurnRef.current?.()
|
||||
})
|
||||
observer.observe(column)
|
||||
if (composer !== null) observer.observe(composer)
|
||||
return () => { observer.disconnect() }
|
||||
@@ -467,10 +504,15 @@ export function ChatView({
|
||||
if (local === null) return
|
||||
const row = anchorElement(local, item.anchorKey)
|
||||
if (row === null) return
|
||||
anchorRef.current = null
|
||||
const el = scrollerOf(local)
|
||||
el.scrollTop += flowTop(row, el) - 24
|
||||
observedTopRef.current = el.scrollTop
|
||||
// A pending older page still has to compensate the prepended height, so
|
||||
// navigation moves that anchor to the new position instead of dropping it.
|
||||
const landed = loadingOlder ? pagingAnchor(local, el) : null
|
||||
anchorRef.current = landed === null || landed.dataset.chatAnchorKey === undefined
|
||||
? null
|
||||
: { key: landed.dataset.chatAnchorKey, top: flowTop(landed, el) }
|
||||
const isAtBottom = el.scrollHeight - el.scrollTop - el.clientHeight <= FOLLOW_THRESHOLD + 1
|
||||
atBottomRef.current = isAtBottom
|
||||
setAtBottom(isAtBottom)
|
||||
|
||||
@@ -24,9 +24,13 @@
|
||||
padding, so the rail gives that inset back and keeps 12px of its own. */
|
||||
right: calc(12px - (var(--dsh-composer-side-clearance) + 16px));
|
||||
width: 28px;
|
||||
/* Never taller than the band it centers in: a short window (a tall composer,
|
||||
a low viewport) shrinks the rail instead of pushing marks under the
|
||||
composer or above the scrollport. */
|
||||
height: min(
|
||||
var(--turn-natural-height),
|
||||
clamp(120px, calc(var(--turn-rail-band) - 64px), 420px)
|
||||
max(0px, calc(var(--turn-rail-band) - 64px)),
|
||||
420px
|
||||
);
|
||||
cursor: pointer;
|
||||
pointer-events: auto;
|
||||
|
||||
@@ -2,7 +2,7 @@ import {
|
||||
useId, useState, type CSSProperties, type MouseEvent, type PointerEvent,
|
||||
} from 'react'
|
||||
import type { ChatViewSlotProps } from '../contract/slots.ts'
|
||||
import type { TurnNavigationItem } from './turn-navigation.ts'
|
||||
import type { TurnNavigationItem } from '../contract/snapshot.ts'
|
||||
import css from './TurnNavigator.module.css'
|
||||
|
||||
interface TurnNavigatorProps {
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
import type { ChatNode } from '../contract/chat-nodes.ts'
|
||||
import type { ChatSnapshot } from '../contract/snapshot.ts'
|
||||
|
||||
/** One loaded Turn projected into the compact Chat navigation rail. */
|
||||
export interface TurnNavigationItem {
|
||||
readonly turn: number
|
||||
readonly anchorKey: string
|
||||
readonly prompt: string
|
||||
readonly response: string
|
||||
}
|
||||
|
||||
function compactText(parts: readonly string[]): string {
|
||||
return parts.join(' ').replace(/\s+/g, ' ').trim()
|
||||
}
|
||||
|
||||
function promptText(node: ChatNode): string {
|
||||
if (node.kind !== 'user') return ''
|
||||
return compactText(node.data.content.flatMap(block => block.type === 'text' ? [block.text] : []))
|
||||
}
|
||||
|
||||
function responseText(node: ChatNode): string {
|
||||
if (node.kind !== 'assistant-step') return ''
|
||||
return compactText(node.data.blocks.flatMap(block => block.kind === 'text' ? [block.text] : []))
|
||||
}
|
||||
|
||||
/**
|
||||
* Project the currently loaded Chat window into stable Turn navigation items.
|
||||
* @param snapshot - current incremental Chat snapshot.
|
||||
* @returns loaded Turns that have at least one visible rendered anchor.
|
||||
*/
|
||||
export function deriveTurnNavigationItems(
|
||||
snapshot: Pick<ChatSnapshot, 'timeline' | 'locations' | 'nodes'>,
|
||||
): readonly TurnNavigationItem[] {
|
||||
return snapshot.timeline.turnOrder.flatMap((turn): TurnNavigationItem[] => {
|
||||
const nodes = snapshot.locations.getTurn(turn)
|
||||
.map(key => snapshot.nodes.get(key))
|
||||
.filter((node): node is ChatNode => node !== undefined && node.visibility === 'visible')
|
||||
const user = nodes.find(node => node.kind === 'user')
|
||||
const anchor = user ?? nodes[0]
|
||||
if (anchor === undefined) return []
|
||||
const response = nodes.findLast(node => responseText(node) !== '')
|
||||
return [{
|
||||
turn,
|
||||
anchorKey: anchor.key,
|
||||
prompt: user === undefined ? '' : promptText(user),
|
||||
response: response === undefined ? '' : responseText(response),
|
||||
}]
|
||||
})
|
||||
}
|
||||
@@ -18,6 +18,28 @@ export interface ChatNodeStore {
|
||||
values(): readonly ChatConversationViewNode[]
|
||||
}
|
||||
|
||||
/** One loaded Turn projected into the compact Chat navigation rail. */
|
||||
export interface TurnNavigationItem {
|
||||
readonly turn: number
|
||||
/** Stable Conversation Context key the rail scrolls to. */
|
||||
readonly anchorKey: string
|
||||
/** Bounded prompt preview; empty when the loaded window starts mid-Turn. */
|
||||
readonly prompt: string
|
||||
/** Bounded assistant-response preview; empty until the Turn answers. */
|
||||
readonly response: string
|
||||
}
|
||||
|
||||
/** Stable live navigation projection of the loaded Turns. */
|
||||
export interface ChatTurnNavigationIndex {
|
||||
/**
|
||||
* Loaded Turns that have a visible anchor, in timeline order. The array
|
||||
* identity changes exactly when a Turn enters, leaves, or changes preview,
|
||||
* so a renderer can select it directly as its change signal.
|
||||
* @returns current navigation items.
|
||||
*/
|
||||
items(): readonly TurnNavigationItem[]
|
||||
}
|
||||
|
||||
/** Stable live Location index for Chat nodes. */
|
||||
export interface ChatLocationNodeIndex {
|
||||
/** @param turn - owning turn. @returns ordered Chat Node keys in the turn. */
|
||||
@@ -40,6 +62,7 @@ export interface ChatSnapshot {
|
||||
readonly order: readonly string[]
|
||||
readonly nodes: ChatNodeStore
|
||||
readonly locations: ChatLocationNodeIndex
|
||||
readonly navigation: ChatTurnNavigationIndex
|
||||
readonly timeline: ConversationTimelineSnapshot
|
||||
readonly legacy: LegacyConversationSlice
|
||||
}
|
||||
@@ -64,6 +87,9 @@ export const EMPTY_CHAT_SNAPSHOT: ChatSnapshot = {
|
||||
getTurn: () => EMPTY_LIST,
|
||||
getStep: () => EMPTY_LIST,
|
||||
},
|
||||
navigation: {
|
||||
items: () => EMPTY_LIST,
|
||||
},
|
||||
timeline: EMPTY_TIMELINE,
|
||||
legacy: {
|
||||
nodes: EMPTY_LIST,
|
||||
|
||||
@@ -6,13 +6,15 @@ import type {
|
||||
import type { ChatConversationViewNode, ChatNode } from '../contract/chat-nodes.ts'
|
||||
import { isRunningTool } from '../contract/chat-nodes.ts'
|
||||
import type {
|
||||
ChatLocationNodeIndex, ChatNodeStore, ChatSnapshot, ConversationNode,
|
||||
LegacyConversationSlice, PartialAssistant, RunningToolCall,
|
||||
ChatLocationNodeIndex, ChatNodeStore, ChatSnapshot, ChatTurnNavigationIndex, ConversationNode,
|
||||
LegacyConversationSlice, PartialAssistant, RunningToolCall, TurnNavigationItem,
|
||||
} from '../contract/snapshot.ts'
|
||||
import { sessionRecallLabels } from './event-projection.ts'
|
||||
import { sameTurnNavigationItem, turnNavigationItem } from './turn-navigation.ts'
|
||||
|
||||
const EMPTY_KEYS: readonly string[] = []
|
||||
const EMPTY_TURNS: readonly number[] = []
|
||||
const EMPTY_ITEMS: readonly TurnNavigationItem[] = []
|
||||
const EMPTY_LIST: readonly never[] = []
|
||||
|
||||
function sameReferences<T>(left: readonly T[], right: readonly T[]): boolean {
|
||||
@@ -125,6 +127,61 @@ function updateIndex<Key>(
|
||||
return next
|
||||
}
|
||||
|
||||
/**
|
||||
* Loaded-Turn rail projection accumulated alongside the node store: a
|
||||
* structural change re-derives the Turn set, a content-only upsert re-derives
|
||||
* only the Turns whose nodes moved, and the published array keeps its identity
|
||||
* until an item actually changes. Renderers therefore consume final Turn data
|
||||
* instead of scanning the loaded window per frame.
|
||||
*/
|
||||
class MutableTurnNavigationIndex implements ChatTurnNavigationIndex {
|
||||
private current: readonly TurnNavigationItem[] = EMPTY_ITEMS
|
||||
private byTurn = new Map<number, TurnNavigationItem>()
|
||||
|
||||
items(): readonly TurnNavigationItem[] {
|
||||
return this.current
|
||||
}
|
||||
|
||||
/** Re-derive the whole Turn set; runs only when the loaded structure moves. */
|
||||
rebuild(
|
||||
timeline: ConversationTimelineSnapshot,
|
||||
locations: ChatLocationNodeIndex,
|
||||
nodes: ChatNodeStore,
|
||||
): void {
|
||||
const next: TurnNavigationItem[] = []
|
||||
const byTurn = new Map<number, TurnNavigationItem>()
|
||||
for (const turn of timeline.turnOrder) {
|
||||
const derived = turnNavigationItem(turn, locations, nodes)
|
||||
if (derived === undefined) continue
|
||||
const previous = this.byTurn.get(turn)
|
||||
const item = previous !== undefined && sameTurnNavigationItem(previous, derived) ? previous : derived
|
||||
next.push(item)
|
||||
byTurn.set(turn, item)
|
||||
}
|
||||
this.byTurn = byTurn
|
||||
const unchanged = next.length === this.current.length
|
||||
&& next.every((item, index) => item === this.current[index])
|
||||
if (!unchanged) this.current = next
|
||||
}
|
||||
|
||||
/** Re-derive only the Turns a content-only upsert touched. */
|
||||
touch(
|
||||
turns: ReadonlySet<number>,
|
||||
locations: ChatLocationNodeIndex,
|
||||
nodes: ChatNodeStore,
|
||||
): void {
|
||||
if (turns.size === 0) return
|
||||
const next = this.current.map((item) => {
|
||||
if (!turns.has(item.turn)) return item
|
||||
const derived = turnNavigationItem(item.turn, locations, nodes)
|
||||
if (derived === undefined || sameTurnNavigationItem(item, derived)) return item
|
||||
this.byTurn.set(item.turn, derived)
|
||||
return derived
|
||||
})
|
||||
if (next.some((item, index) => item !== this.current[index])) this.current = next
|
||||
}
|
||||
}
|
||||
|
||||
function stepKey(turn: number, step: number): string {
|
||||
return `${turn}:${step}`
|
||||
}
|
||||
@@ -479,9 +536,12 @@ function partialContributionChanged(
|
||||
export class ChatSnapshotBuilder implements ConversationViewBuilder<ChatConversationViewNode, ChatSnapshot> {
|
||||
private readonly store = new MutableChatNodeStore()
|
||||
private readonly locations = new MutableChatLocationIndex()
|
||||
private readonly navigation = new MutableTurnNavigationIndex()
|
||||
private readonly legacy = new LegacySliceBuilder()
|
||||
private readonly referenceLabels = new ReferenceLabelProjector()
|
||||
private order: readonly string[] = EMPTY_KEYS
|
||||
/** Last published timeline: a Turn boundary can land without a new node. */
|
||||
private timeline: ConversationTimelineSnapshot | null = null
|
||||
readonly empty: ChatSnapshot
|
||||
|
||||
constructor() {
|
||||
@@ -496,6 +556,8 @@ export class ChatSnapshotBuilder implements ConversationViewBuilder<ChatConversa
|
||||
this.store.replace(nodes)
|
||||
this.order = orderedVisible(nodes).map(node => node.key)
|
||||
this.locations.rebuild(this.order, this.store)
|
||||
this.navigation.rebuild(input.timeline, this.locations, this.store)
|
||||
this.timeline = input.timeline
|
||||
return this.snapshot(input.timeline, this.legacy.replace(nodes, input.timeline))
|
||||
}
|
||||
|
||||
@@ -522,6 +584,12 @@ export class ChatSnapshotBuilder implements ConversationViewBuilder<ChatConversa
|
||||
this.locations.rebuild(this.order, this.store)
|
||||
}
|
||||
this.locations.touch(contentOnly)
|
||||
if (structural || input.timeline !== this.timeline) {
|
||||
this.navigation.rebuild(input.timeline, this.locations, this.store)
|
||||
} else {
|
||||
this.navigation.touch(turnsOf(contentOnly), this.locations, this.store)
|
||||
}
|
||||
this.timeline = input.timeline
|
||||
return this.snapshot(input.timeline, this.legacy.apply(upserts, input.timeline))
|
||||
}
|
||||
|
||||
@@ -533,12 +601,23 @@ export class ChatSnapshotBuilder implements ConversationViewBuilder<ChatConversa
|
||||
order: this.order,
|
||||
nodes: this.store,
|
||||
locations: this.locations,
|
||||
navigation: this.navigation,
|
||||
timeline,
|
||||
legacy,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Turns owning the given nodes, for the content-only navigation update. */
|
||||
function turnsOf(nodes: readonly ChatConversationViewNode[]): ReadonlySet<number> {
|
||||
const turns = new Set<number>()
|
||||
for (const node of nodes) {
|
||||
const turn = locationCoordinates(node.location).turn
|
||||
if (turn !== undefined) turns.add(turn)
|
||||
}
|
||||
return turns
|
||||
}
|
||||
|
||||
function locationIdentity(location: ConversationLocation): string {
|
||||
const coordinates = locationCoordinates(location)
|
||||
return `${location.kind}:${coordinates.turn ?? ''}:${coordinates.step ?? ''}`
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
import type { ChatNode } from '../contract/chat-nodes.ts'
|
||||
import type { ChatLocationNodeIndex, ChatNodeStore, TurnNavigationItem } from '../contract/snapshot.ts'
|
||||
|
||||
/**
|
||||
* Preview budget per field. The rail clamps two short lines, so anything past
|
||||
* this is invisible; copying whole transcripts into navigation state would
|
||||
* otherwise grow with the loaded window on every structural update.
|
||||
*/
|
||||
const PREVIEW_LIMIT = 160
|
||||
|
||||
/** Join rendered text until the preview budget is met, then stop reading. */
|
||||
function preview(parts: Iterable<string>): string {
|
||||
let text = ''
|
||||
for (const part of parts) {
|
||||
text += text === '' ? part : ` ${part}`
|
||||
if (text.length >= PREVIEW_LIMIT) break
|
||||
}
|
||||
return text.replace(/\s+/g, ' ').trim().slice(0, PREVIEW_LIMIT)
|
||||
}
|
||||
|
||||
function promptText(node: ChatNode): string {
|
||||
if (node.kind !== 'user') return ''
|
||||
return preview(node.data.content.flatMap(block => block.type === 'text' ? [block.text] : []))
|
||||
}
|
||||
|
||||
function responseText(node: ChatNode): string {
|
||||
if (node.kind !== 'assistant-step') return ''
|
||||
return preview(node.data.blocks.flatMap(block => block.kind === 'text' ? [block.text] : []))
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether two items carry the same rail state, so the reader can keep its array.
|
||||
* @param left - previously published item, when the Turn had one.
|
||||
* @param right - freshly derived item, when the Turn still has one.
|
||||
* @returns whether both sides describe the same mark.
|
||||
*/
|
||||
export function sameTurnNavigationItem(
|
||||
left: TurnNavigationItem | undefined,
|
||||
right: TurnNavigationItem | undefined,
|
||||
): boolean {
|
||||
if (left === undefined || right === undefined) return left === right
|
||||
return left.turn === right.turn && left.anchorKey === right.anchorKey
|
||||
&& left.prompt === right.prompt && left.response === right.response
|
||||
}
|
||||
|
||||
/**
|
||||
* Project one loaded Turn into its rail item.
|
||||
* @param turn - Turn number the item addresses.
|
||||
* @param locations - live Location index supplying the Turn's node keys.
|
||||
* @param nodes - live Chat node store.
|
||||
* @returns the item, or undefined when the Turn has no visible loaded node.
|
||||
*/
|
||||
export function turnNavigationItem(
|
||||
turn: number,
|
||||
locations: ChatLocationNodeIndex,
|
||||
nodes: ChatNodeStore,
|
||||
): TurnNavigationItem | undefined {
|
||||
const loaded = locations.getTurn(turn)
|
||||
.map(key => nodes.get(key))
|
||||
.filter((node): node is ChatNode => node !== undefined && node.visibility === 'visible')
|
||||
const user = loaded.find(node => node.kind === 'user')
|
||||
const anchor = user ?? loaded[0]
|
||||
if (anchor === undefined) return undefined
|
||||
const response = loaded.findLast(node => responseText(node) !== '')
|
||||
return {
|
||||
turn,
|
||||
anchorKey: anchor.key,
|
||||
prompt: user === undefined ? '' : promptText(user),
|
||||
response: response === undefined ? '' : responseText(response),
|
||||
}
|
||||
}
|
||||
@@ -13,10 +13,11 @@ export type {} from './conversation-nodes/turn-tail.ts'
|
||||
|
||||
export type {
|
||||
AssistantBlock, AssistantMessageNode, AssistantProvenanceView, AssistantRequestConfig,
|
||||
AssistantTiming, ChatLocationNodeIndex, ChatNodeStore, ChatSnapshot, CommandNode,
|
||||
CompactionSummaryNode, ContextMessageNode, ConversationNode, LegacyConversationSlice,
|
||||
ModelRetryNode, PartialAssistant, RunningToolCall, SteeringMessageNode, ToolCallBlock,
|
||||
ToolResultNode, TurnErrorNode, TurnMaxTokensNode, UnknownSurfaceNode, UserMessageNode,
|
||||
AssistantTiming, ChatLocationNodeIndex, ChatNodeStore, ChatSnapshot, ChatTurnNavigationIndex,
|
||||
CommandNode, CompactionSummaryNode, ContextMessageNode, ConversationNode,
|
||||
LegacyConversationSlice, ModelRetryNode, PartialAssistant, RunningToolCall,
|
||||
SteeringMessageNode, ToolCallBlock, ToolResultNode, TurnErrorNode, TurnMaxTokensNode,
|
||||
TurnNavigationItem, UnknownSurfaceNode, UserMessageNode,
|
||||
} from './contract/snapshot.ts'
|
||||
export type {
|
||||
AssistantChatData, ChatConversationViewNode, ChatNode, ChatNodeKind,
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
import type {
|
||||
AssistantMessageNode, ChatConversationViewNode, ChatSnapshot, ConversationNode,
|
||||
ChatLocationNodeIndex, ChatNodeStore, CompactionSummaryNode, LegacyConversationSlice,
|
||||
PartialAssistant, RunningToolCall, ToolCallBlock,
|
||||
PartialAssistant, RunningToolCall, ToolCallBlock, TurnNavigationItem,
|
||||
} from '@deepseek-ai/dsh-client-ui-chat/client'
|
||||
import type {
|
||||
ConversationLocationDataStore, ConversationTurnDataMap, TurnLocation,
|
||||
} from '@deepseek-ai/dsh-client-ui-conversation/client'
|
||||
import { deriveTurnMetrics } from '../src/client/contract/turn-metrics.ts'
|
||||
import {
|
||||
sameTurnNavigationItem, turnNavigationItem,
|
||||
} from '../src/client/conversation-nodes/turn-navigation.ts'
|
||||
|
||||
const EMPTY: readonly never[] = []
|
||||
|
||||
@@ -290,10 +293,19 @@ export function chatSnapshotFixture(input: {
|
||||
&& previous.legacy.turnEnds === legacy.turnEnds
|
||||
? previous.timeline
|
||||
: { turnOrder: [...turns.keys()], turns }
|
||||
const derived = timeline.turnOrder
|
||||
.map(turn => turnNavigationItem(turn, locations, store))
|
||||
.filter((item): item is TurnNavigationItem => item !== undefined)
|
||||
const kept = previous?.navigation.items() ?? []
|
||||
const items = kept.length === derived.length
|
||||
&& derived.every((item, index) => sameTurnNavigationItem(kept[index], item))
|
||||
? kept
|
||||
: derived
|
||||
return {
|
||||
order,
|
||||
nodes: store,
|
||||
locations,
|
||||
navigation: { items: () => items },
|
||||
timeline,
|
||||
legacy,
|
||||
}
|
||||
|
||||
@@ -32,7 +32,6 @@ import {
|
||||
} from '../src/client/chat/MessageItem.tsx'
|
||||
import { TurnTailNodeView } from '../src/client/chat/TurnTailNodeView.tsx'
|
||||
import { formatRunDuration } from '../src/client/chat/message-chrome.ts'
|
||||
import { deriveTurnNavigationItems } from '../src/client/chat/turn-navigation.ts'
|
||||
import { chatSnapshotFixture } from './chat-snapshot-fixture.client.ts'
|
||||
|
||||
afterEach(() => {
|
||||
@@ -423,7 +422,7 @@ describe('ChatView', () => {
|
||||
],
|
||||
turnEnds: new Map([[1, 3], [2, 6]]),
|
||||
})
|
||||
expect(deriveTurnNavigationItems(snapshot)).toEqual([
|
||||
expect(snapshot.navigation.items()).toEqual([
|
||||
{ turn: 1, anchorKey: 'fixture:user:1', prompt: 'first prompt', response: 'first response' },
|
||||
{ turn: 2, anchorKey: 'fixture:user:4', prompt: 'second prompt', response: 'second response' },
|
||||
])
|
||||
|
||||
@@ -140,6 +140,46 @@ describe('built-in conversation node Definitions', () => {
|
||||
expect(chatViewDefinition.isActive?.(current)).toBe(false)
|
||||
})
|
||||
|
||||
it('keeps the Turn rail projection current when a chunk updates one node in place', () => {
|
||||
const value = assembler([
|
||||
at(1, 'turn/start', { turn: 1 }),
|
||||
at(2, 'user/message', textMessage('user-1', 'navigate here'), { surfaceOp: 'append' }),
|
||||
at(3, 'step/start', { turn: 1, step: 1 }),
|
||||
at(4, 'assistant/chunk', {
|
||||
turn: 1,
|
||||
step: 1,
|
||||
chunk: { type: 'text-delta', index: 0, text: 'first' },
|
||||
}),
|
||||
])
|
||||
const opening = snapshot(value).navigation.items()
|
||||
expect(opening).toHaveLength(1)
|
||||
expect(opening[0]?.turn).toBe(1)
|
||||
expect(opening[0]?.prompt).toBe('navigate here')
|
||||
expect(opening[0]?.response).toBe('first')
|
||||
|
||||
// Content-only upsert: the node keeps its key, so the rail's preview has to
|
||||
// follow the in-place update rather than the last structural publication.
|
||||
value.append(at(5, 'assistant/chunk', {
|
||||
turn: 1,
|
||||
step: 1,
|
||||
chunk: { type: 'text-delta', index: 0, text: ' and more' },
|
||||
}))
|
||||
value.flush()
|
||||
const streamed = snapshot(value).navigation.items()
|
||||
expect(streamed[0]?.response).toBe('first and more')
|
||||
expect(streamed).not.toBe(opening)
|
||||
})
|
||||
|
||||
it('bounds each rail preview instead of copying the whole transcript', () => {
|
||||
const long = 'x'.repeat(400)
|
||||
const value = assembler([
|
||||
at(1, 'turn/start', { turn: 1 }),
|
||||
at(2, 'user/message', textMessage('user-1', long), { surfaceOp: 'append' }),
|
||||
])
|
||||
const items = snapshot(value).navigation.items()
|
||||
expect(items[0]?.prompt.length).toBe(160)
|
||||
})
|
||||
|
||||
it('keeps one keyed Assistant node while streaming settles and materializes interruption from Location', () => {
|
||||
const value = assembler([
|
||||
at(1, 'turn/start', { turn: 1 }),
|
||||
|
||||
@@ -56,6 +56,7 @@ export function toolChatSnapshot(
|
||||
getTurn: () => empty,
|
||||
getStep: () => empty,
|
||||
},
|
||||
navigation: { items: () => [] },
|
||||
timeline: { turnOrder: [], turns: new Map() },
|
||||
legacy: {
|
||||
nodes: settled,
|
||||
|
||||
@@ -66,6 +66,7 @@ const chatState: ChatState = {
|
||||
order: emptyKeys,
|
||||
nodes: { get: () => undefined, values: () => [] },
|
||||
locations: { getTurn: () => emptyKeys, getStep: () => emptyKeys },
|
||||
navigation: { items: () => [] },
|
||||
timeline: { turnOrder: [], turns: new Map() },
|
||||
legacy: {
|
||||
nodes: [],
|
||||
|
||||
@@ -64,6 +64,7 @@ const chatState: ChatState = {
|
||||
order: emptyKeys,
|
||||
nodes: { get: () => undefined, values: () => [] },
|
||||
locations: { getTurn: () => emptyKeys, getStep: () => emptyKeys },
|
||||
navigation: { items: () => [] },
|
||||
timeline: { turnOrder: [], turns: new Map() },
|
||||
legacy: {
|
||||
nodes: [],
|
||||
|
||||
Reference in New Issue
Block a user