fix(client): address trajectory review feedback

2026-07-28 22:16:45 +08:00
parent 62dd2ab38e
commit f942c30f4b
14 changed files with 116 additions and 18 deletions
--- a/packages/client/runtime/src/client/sessions/request-inspection.ts
+++ b/packages/client/runtime/src/client/sessions/request-inspection.ts
@@ -229,10 +229,11 @@ function deriveRequests(events: readonly SessionEvent[]): readonly RequestView[]
      continue
    }
    if (sourceEvent.type === 'request/header') {
+      const tools: unknown = sourceEvent.data.header.tools
      const prompt: ConversationPromptSnapshot = {
        config: sourceEvent.data.header.config,
        system: sourceEvent.data.header.system ?? '',
-        tools: sourceEvent.data.header.tools ?? [],
+        tools: Array.isArray(tools) ? tools as ToolSchema[] : [],
      }
      const change = promptChange(activePrompt, prompt, sourceEvent)
      activePrompt = prompt
--- a/packages/client/runtime/tests/request-inspection.spec.ts
+++ b/packages/client/runtime/tests/request-inspection.spec.ts
@@ -111,14 +111,15 @@ describe('inspectRequests', () => {

  it('treats a scrubbed durable-fixture tool catalog as unavailable', () => {
    const snapshot = inspectRequests(entriesOf([
-      at(0, 'request/header', {
+      at(0, 'step/start', { turn: 1, step: 1 }),
+      at(1, 'request/header', {
        reason: 'initial',
        header: {
          config: { provider: 'fake', model: 'model' },
          tools: '{{tools}}',
        },
      }),
-      at(1, 'tool/call', {
+      at(2, 'tool/call', {
        turn: 1,
        step: 1,
        callId: 'call-1',
@@ -128,5 +129,6 @@ describe('inspectRequests', () => {
    ]))

    expect(snapshot.callSchemas).toEqual(new Map())
+    expect(snapshot.requests[0]?.prompt?.tools).toEqual([])
  })
 })
--- 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: 51ddecf93240c2196483d3fb2bcfaca4104da31a
-README.zh.md: d98cbcc69b875d2f426d9bdd9f2fa81874ec614a
+README.md: b5067a0a4ad98b784439fa16211b6269fc44139d
+README.zh.md: 5a8ba493c25f38d8be366d29462a258d8ba79ee9
--- a/packages/client/ui-conversation/README.md
+++ b/packages/client/ui-conversation/README.md
@@ -16,7 +16,7 @@ The todo surfaces are two registrations over that shape, both plain registrant p

 Per-session UI state for selection and the active view lives in the declared chat store (`stores.ts` `createChatStore`); the InputHub owns the composer state machine and mirrors its draft into that store for persistence. Apply passes one store handle to the strict session subtree, chat view, and details registrations, so each session shares one instance and the framework owns its lifecycle. Components are pure: the framework standard kit supplies `useSession`/`sessionId`, global `useSessions`/`useWorkspaces`, and the input machine's `useInput`/`inputActions`; store faces and inject factories supply the remaining state and callbacks.

-The composer bar declares session-scoped single seats for `'conversation.input.plan'` and `'conversation.input.model'`, plus list slots for overlay, dock, left, and right input extensions. InputBar renders the model seat immediately before its pending indicator and send/stop button. Feature packages own each control and its state; ui-conversation supplies placement, the `locked` owner prop, and the standard slot shares. The resident no-session shell uses `DisabledInputBar` and therefore dispatches no session-scoped control seats.
+The composer bar declares session-scoped single seats for `'conversation.input.plan'` and `'conversation.input.model'`, plus list slots for overlay, dock, left, and right input extensions. InputBar renders the model seat immediately before its pending indicator and send/stop button. Feature packages own each control and its state; ui-conversation supplies placement, the `locked` owner prop, and the standard slot shares. A pending composer takeover remains mounted when another conversation view is active so the blocked agent can still receive its answer; without a pending interaction, the active-session composer belongs to Chat. The resident no-session shell uses `DisabledInputBar` and therefore dispatches no session-scoped control seats.

 `src/client/` is organized for the future package split: `contract/` is the sole inter-domain shared face (`slots.ts` slot declarations + composed slot props including the tool-row contract, `views.ts` shared primitives, `tool-call-model.ts`); the `skeleton/`, `chat/`, and `toolviews/` (sample registrants) domain directories import contract files and never each other; `apply.ts` is the only assembly point allowed to import all three domains. The `/client` export surface is the contract only — `apply`/`inject`, the two service classes, and the `contract/` type families; implementation components (skeleton, chat rows) and the store factory stay internal and reach the page exclusively through apply's slot registrations (tests take them via the `./src/*` subpath).

--- a/packages/client/ui-conversation/README.zh.md
+++ b/packages/client/ui-conversation/README.zh.md
@@ -16,7 +16,7 @@ todo 两个面就是在该形状上的两个注册项，都是普通注册方插

 逐 Session UI 状态中的选择与活跃视图位于已声明的聊天 store（`stores.ts` `createChatStore`）中；InputHub 拥有输入区状态机，并将草稿镜像到该 store 以便持久化。apply 将同一个 store handle 传给严格限定于会话的子树、聊天视图和详情注册，因此每个会话内共享一个实例，框架拥有其生命周期。组件保持纯粹：框架标准工具包提供 `useSession`／`sessionId`、全局 `useSessions`／`useWorkspaces`，以及输入状态机的 `useInput`／`inputActions`；store 表层与 inject factory 提供其余状态和回调。

-输入栏为 `'conversation.input.plan'` 和 `'conversation.input.model'` 声明会话作用域的单实例 seat，并为 overlay、dock、left 和 right 输入扩展声明列表 slot。InputBar 将模型 seat 渲染在 pending 指示器与发送／停止按钮之前。各功能包拥有相应控件及其状态；ui-conversation 提供放置位置、`locked` owner prop 和标准 slot share。常驻无会话壳使用 `DisabledInputBar`，因此不会分发任何会话作用域的控件 seat。
+输入栏为 `'conversation.input.plan'` 和 `'conversation.input.model'` 声明会话作用域的单实例 seat，并为 overlay、dock、left 和 right 输入扩展声明列表 slot。InputBar 将模型 seat 渲染在 pending 指示器与发送／停止按钮之前。各功能包拥有相应控件及其状态；ui-conversation 提供放置位置、`locked` owner prop 和标准 slot share。另一个会话视图活跃时，待处理的 composer 接管仍保持挂载，使被阻塞的 agent（智能体）仍能收到回答；没有待处理交互时，活跃会话的 composer 归 Chat 所有。常驻无会话壳使用 `DisabledInputBar`，因此不会分发任何会话作用域的控件 seat。

 `src/client/` 按未来的包拆分组织：`contract/` 是唯一的跨领域共享表层（`slots.ts` slot 声明 + 组合后的 slot props，包括工具行契约、`views.ts` 共享原语、`tool-call-model.ts`）；`skeleton/`、`chat/` 和 `toolviews/`（示例注册方）领域目录只导入 contract 文件，彼此绝不导入；`apply.ts` 是唯一允许导入全部三个领域的组装点。`/client` 导出表层只包含契约：`apply`／`inject`、两个服务类和 `contract/` 类型家族；实现组件（骨架、聊天行）与 store factory 保持内部状态，只能通过 apply 的 slot 注册到达页面（测试通过 `./src/*` 子路径获取它们）。

--- a/packages/client/ui-conversation/src/client/skeleton/ConversationSession.tsx
+++ b/packages/client/ui-conversation/src/client/skeleton/ConversationSession.tsx
@@ -32,6 +32,7 @@ export function ConversationSession({
  const active = tabs.find(view => view.id === activeId) ?? tabs[0]
  const ancestry = useSessions(s => deriveAncestry(s, sessionId), shallowEqual)
  const composerPhase = useSession(s => s.composerPhase)
+  const hasPending = useSession(s => s.pending.length > 0)
  const blank = useSession(s => s.blank)
  const inputState = useInput(s => s)
  const storedDraft = useStore(s => s.draft)
@@ -90,7 +91,9 @@ export function ConversationSession({
      {!blankHero && <div className={css.viewArea}>
        {active !== undefined && renderSlot('conversation.view', {}, { only: active.id })}
      </div>}
-      {(blankHero || active?.id === 'chat') && <Fragment key="composer">{composer}</Fragment>}
+      {(blankHero || active?.id === 'chat' || hasPending) && (
+        <Fragment key="composer">{composer}</Fragment>
+      )}
    </>
  )
 }
--- a/packages/client/ui-conversation/tests/skeleton.spec.tsx
+++ b/packages/client/ui-conversation/tests/skeleton.spec.tsx
@@ -103,7 +103,14 @@ function mount(
          useStore={bindSnapshotSelector(chat)}
          actions={chat.actions}
          renderSlot={renderSlot as never}
-          views={{ list: () => [{ id: 'chat', label: 'Chat' }], subscribe: () => () => {}, version: () => 1 }}
+          views={{
+            list: () => [
+              { id: 'chat', label: 'Chat' },
+              { id: 'trajectory', label: 'Trajectory' },
+            ],
+            subscribe: () => () => {},
+            version: () => 1,
+          }}
          bindDraftMirror={write => wiring.bindMirror(write)}
          open={open}
        />
@@ -210,6 +217,13 @@ describe('ConversationRoot resident composer', () => {
    expect(b.view.getByTestId('view-chat')).toBeTruthy()
  })

+  it('keeps pending takeover interaction accessible outside the Chat view', () => {
+    const b = mount(conversationSnapshot({ pending: [{} as never] }))
+    act(() => { b.chat.actions.setView('trajectory') })
+    expect(b.view.getByTestId('view-trajectory')).toBeTruthy()
+    expect(b.view.getByRole('textbox')).toBeTruthy()
+  })
+
  it('rolls the pending workspace label back when switching fails', async () => {
    const selectWorkspace = vi.fn(async () => { throw new Error('connect failed') })
    const b = mount(
--- a/packages/client/ui-trajectory/README.i18n.yaml
+++ b/packages/client/ui-trajectory/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-trajectory/README.md
-README.md: ee6fb97894ec7503ccb9c0cb6a74c122fbcd852c
-README.zh.md: 238a499f646a4bf637c037f8906be6ae684bb013
+README.md: c92f44a6dc15ce3a12d9e9662ac0f52a7ba8bdc4
+README.zh.md: fe49a4c9cda603f1b9346a8d79d9c699f1ff5b34
--- a/packages/client/ui-trajectory/README.md
+++ b/packages/client/ui-trajectory/README.md
@@ -2,7 +2,7 @@

 English | [中文](README.zh.md)

-Trajectory renders a turn-aware event ledger with selectable User, Assistant, Tool, and nested Subtool records. Thick rules mark Turn boundaries, compact inline markers identify Steps, and the main ledger keeps only index, event, and content; selection opens a local inspector for token usage, duration, Input, Output, and Timing. A fixed Overview above the ledger projects real record start/duration timing from left to right; dragging an interval focuses the ledger on every record active at any point in that inclusive range, while clearing the selection restores the full branch. The package remains a pure-consumer plugin (registers one view tab into the conversation's `'conversation.view'` slot ring, provides no service, declares no Context merge). Contract: api-contracts v3 §8.
+Trajectory renders a turn-aware event ledger with selectable User, Assistant, Tool, and nested Subtool records. Thick rules mark Turn boundaries, compact inline markers identify Steps, and the main ledger keeps only index, event, and content; selection opens a local inspector for token usage, duration, Input, Output, and Timing. A fixed Overview above the ledger projects real record start/duration timing from left to right; dragging an interval focuses the ledger on every record active at any point in that inclusive range, while clearing the selection restores the full branch. Raw context lineage selects the active branch, while cancellation-frozen Assistant and Tool records from the live session snapshot remain visible on that branch even though they have no durable source event. The package remains a pure-consumer plugin (registers one view tab into the conversation's `'conversation.view'` slot ring, provides no service, declares no Context merge). Contract: api-contracts v3 §8.

 ## Model Experience

--- a/packages/client/ui-trajectory/README.zh.md
+++ b/packages/client/ui-trajectory/README.zh.md
@@ -2,7 +2,7 @@

 [English](README.md) | 中文

-Trajectory 渲染按轮次组织的事件记录表，其中可选择用户、助手、工具和嵌套子工具记录。较粗的分割线标示轮次边界，紧凑的行内标记标识步骤，主记录表仅保留索引、事件和内容；选择记录则会打开局部检查器，查看 token 用量、耗时、输入、输出和计时。固定在记录表上方的 Overview 区域从左到右投影记录的真实开始时间与耗时；拖选一个区间会将记录表聚焦到活动区间与该闭区间有重叠的所有记录，清除选择则恢复完整分支。该包（package）保持为纯消费方插件（向会话的 `'conversation.view'` slot 环注册一个视图标签页，不提供服务，也不声明 Context 合并）。契约：api-contracts v3 §8。
+Trajectory 渲染按轮次组织的事件记录表，其中可选择用户、助手、工具和嵌套子工具记录。较粗的分割线标示轮次边界，紧凑的行内标记标识步骤，主记录表仅保留索引、事件和内容；选择记录则会打开局部检查器，查看 token 用量、耗时、输入、输出和计时。固定在记录表上方的 Overview 区域从左到右投影记录的真实开始时间与耗时；拖选一个区间会将记录表聚焦到活动区间与该闭区间有重叠的所有记录，清除选择则恢复完整分支。原始上下文谱系选择活跃分支；实时会话快照中因取消而冻结的助手和工具记录即使没有持久源事件，也仍会显示在该分支上。该包（package）保持为纯消费方插件（向会话的 `'conversation.view'` slot 环注册一个视图标签页，不提供服务，也不声明 Context 合并）。契约：api-contracts v3 §8。

 ## 模型体验

--- a/packages/client/ui-trajectory/src/client/TrajectoryView.tsx
+++ b/packages/client/ui-trajectory/src/client/TrajectoryView.tsx
@@ -3,7 +3,7 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import type { ConvViewProps } from '@deepseek-ai/dsh-client-ui-conversation/client'
 import type {
-  AssistantMessageNode, ConversationContext, RequestView,
+  AssistantMessageNode, ConversationContext, ConversationNode, RequestView,
 } from '@deepseek-ai/dsh-client-runtime/client'
 import {
  deriveTrajectoryContextBranches, trajectoryBranchContainsSeq,
@@ -84,6 +84,12 @@ function searchableJson(value: unknown): string {
  }
 }

+function isInterruptedNode(node: ConversationNode): boolean {
+  return node.kind === 'assistant'
+    ? node.interrupted === true
+    : node.kind === 'tool-result' && node.error?.code === 'interrupted'
+}
+
 function searchMatches(
  turns: ReturnType<typeof deriveTrajectoryLayout>,
  query: string,
@@ -170,7 +176,13 @@ export function TrajectoryView({ useSession, loadAllHistory }: ConvViewProps & T
  )
  const currentBranch = branches.at(-1)
  if (currentBranch === undefined) throw new Error('trajectory branch projection must not be empty')
-  const selectedNodes = currentBranch.nodes
+  const selectedNodes = useMemo(() => {
+    const selected = new Map(currentBranch.nodes.map(node => [node.seq, node]))
+    for (const node of nodes) {
+      if (isInterruptedNode(node)) selected.set(node.seq, node)
+    }
+    return [...selected.values()].sort((left, right) => left.seq - right.seq)
+  }, [currentBranch, nodes])
  const selectedRequests = useMemo(
    () => requests.filter(request =>
      trajectoryBranchContainsSeq(currentBranch, request.startSeq),
--- a/packages/client/ui-trajectory/src/client/layout.ts
+++ b/packages/client/ui-trajectory/src/client/layout.ts
@@ -538,7 +538,10 @@ function expandAssistant(
  let index = startIndex - 1
  const usage = node.usage as UsageLike | undefined
  const streaming = opts?.streaming === true
-  const messageDuration = streaming ? null : durationSeconds(node.time, prevAbsTime)
+  const recordedStart = finiteTime(node.timing?.stepStartTime)
+  const messageDuration = streaming
+    ? null
+    : durationSeconds(node.time, recordedStart ?? prevAbsTime)
  const nodeAbs = streaming ? null : finiteTime(node.time)
  const messageText = node.blocks
    .filter(block => block.kind === 'text' && (!streaming || block.text !== ''))
@@ -561,7 +564,7 @@ function expandAssistant(
    ...(thinkingText !== '' ? { thinkingDetail: thinkingText } : {}),
    sourceBlocks: node.blocks.map(block => assistantSourceBlock(block)),
    timeSeconds: messageDuration,
-    startedAt: finiteTime(node.timing?.stepStartTime),
+    startedAt: recordedStart,
  }
  attachUsage(message, usage)
  message.assistantMetrics = {
--- a/packages/client/ui-trajectory/tests/layout.spec.tsx
+++ b/packages/client/ui-trajectory/tests/layout.spec.tsx
@@ -204,6 +204,23 @@ describe('deriveTrajectoryLayout', () => {
    // From context at 9s, not from the earlier user/tool surfaces.
    expect(message?.timeSeconds).toBe(1)
  })
+
+  it('uses the recorded step start for assistant duration when timing exists', () => {
+    const nodes = [
+      { kind: 'user', seq: 1, time: 1_000, content: [{ type: 'text', text: 'hi' }], source: null },
+      {
+        kind: 'assistant', seq: 2, time: 4_000, turn: 1, step: 1,
+        blocks: [{ kind: 'text', text: 'done' }],
+        timing: { stepStartTime: 3_000, firstTokenTime: 3_500, completedTime: 4_000 },
+      },
+    ] as unknown as ConversationSnapshot['nodes']
+    const turns = deriveTrajectoryLayout({
+      codeDispatches: new Map(), nodes, partial: null, runningCalls: [],
+    })
+    const message = turns[0]?.groups.flatMap(group => group.cells)
+      .find(cell => cell.kind === 'message')
+    expect(message).toMatchObject({ startedAt: 3_000, timeSeconds: 1 })
+  })
 })

 describe('run_code sub-dispatch cells', () => {
--- a/packages/client/ui-trajectory/tests/views.spec.tsx
+++ b/packages/client/ui-trajectory/tests/views.spec.tsx
@@ -56,7 +56,8 @@ const NODES = [

 function fakeSession(nodes: ConversationSnapshot['nodes']) {
  const store = createSnapshotStore({
-    nodes, partial: null, runningCalls: [] as ConversationSnapshot['runningCalls'], codeDispatches: new Map(),
+    nodes, pending: [], partial: null,
+    runningCalls: [] as ConversationSnapshot['runningCalls'], codeDispatches: new Map(),
  })
  return { store, useSession: bindSnapshotSelector(store) as unknown as UseSession<ConversationSnapshot> }
 }
@@ -123,6 +124,7 @@ function tabsOf(slots: SlotsService): ViewTab[] {
 function mount(slots: SlotsService, nodes: ConversationSnapshot['nodes'] = NODES) {
  const sessionSnapshot = createSnapshotStore({
    running: false, removed: false, promptError: null, nodes,
+    pending: [],
    openState: 'open' as const, hasMore: true, loadingOlder: false,
    partial: null, runningCalls: [] as ConversationSnapshot['runningCalls'], codeDispatches: new Map(),
  })
@@ -405,6 +407,50 @@ describe('TrajectoryView branches', () => {
    expect(screen.getByRole('row', { name: /Request 2, ASSISTANT/ })).toBeTruthy()
    expect(view.container.querySelectorAll('[data-request-only="true"]')).toHaveLength(0)
  })
+
+  it('retains cancellation-frozen assistant and tool nodes outside raw contexts', () => {
+    const retained = {
+      kind: 'user', seq: 1, time: 1_000,
+      content: [{ type: 'text', text: 'stop the task' }], source: null,
+    } as unknown as ConversationSnapshot['nodes'][number]
+    const interruptedAssistant = {
+      kind: 'assistant', seq: 2.1, time: 2_000, turn: 1, step: 1,
+      blocks: [{ kind: 'text', text: 'partial response retained' }],
+      interrupted: true,
+    } as unknown as ConversationSnapshot['nodes'][number]
+    const interruptedTool = {
+      kind: 'tool-result', seq: 2.2, time: 2_100, callId: 'slow-call',
+      call: { name: 'bash', argsRaw: '{"command":"sleep 30"}' }, callTime: 1_900,
+      content: [], isError: true,
+      error: { name: 'Interrupted', code: 'interrupted' },
+      callView: null, resultView: null,
+    } as unknown as ConversationSnapshot['nodes'][number]
+    const store = createSnapshotStore({
+      nodes: [retained, interruptedAssistant, interruptedTool],
+      inspection: {
+        eventNodes: [retained],
+        contexts: [{ id: 0, nodes: [retained] }],
+        requests: [],
+        callSchemas: new Map(),
+      },
+      openState: 'open' as const,
+      hasMore: false,
+      partial: null,
+      runningCalls: [] as ConversationSnapshot['runningCalls'],
+      codeDispatches: new Map(),
+    })
+
+    render(
+      <TrajectoryView
+        {...standaloneProps([])}
+        useSession={bindSnapshotSelector(store) as unknown as UseSession<ConversationSnapshot>}
+        loadAllHistory={vi.fn(() => Promise.resolve())}
+      />,
+    )
+
+    expect(screen.getByText('partial response retained')).toBeTruthy()
+    expect(screen.getByRole('row', { name: /TOOL, bash/ })).toBeTruthy()
+  })
 })

 describe('node half', () => {