fix(client): address trajectory review feedback

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

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
 

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。
 
 ## 模型体验
 

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),

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 = {

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', () => {

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', () => {