@zhushanwen/pi-session-reader 0.1.0

package/src/__tests__/parser.test.ts

@@ -0,0 +1,166 @@
+import { describe, it, expect } from 'vitest'
+import { parseSessionContent, parseSessionFile } from '../core/parser.js'
+import type { Entry } from '../core/parser.js'
+import { REAL_SESSION, HAS_REAL_SESSION } from './real-data.js'
+
+/** 构造单行 JSONL entry 字符串 */
+function line(obj: Record<string, unknown>): string {
+  return JSON.stringify(obj)
+}
+
+describe('parseSessionContent', () => {
+  it('正常多类型 entry 全解析，字段完整保留', () => {
+    const content = [
+      line({ type: 'session', id: 's1', parentId: null, timestamp: 't0', cwd: '/x', parentSession: '/p.jsonl', version: 3 }),
+      line({ type: 'message', id: 'm1', parentId: 's1', timestamp: 't1', message: { role: 'user', content: [{ type: 'text', text: 'hi' }] } }),
+      line({ type: 'message', id: 'm2', parentId: 'm1', timestamp: 't2', message: { role: 'assistant', content: [{ type: 'text', text: 'hello' }], toolCalls: [{ name: 'bash', args: {} }] } }),
+      line({ type: 'compaction', id: 'c1', parentId: 'm2', timestamp: 't3', summary: { kept: 5 }, firstKeptEntryId: 'm1' }),
+      line({ type: 'custom', id: 'u1', parentId: 'c1', timestamp: 't4', customType: 'subagent-identity', data: { slug: 'fix' } }),
+    ].join('\n')
+
+    const result = parseSessionContent(content)
+
+    expect(result.skippedLines).toBe(0)
+    expect(result.lastLinePartial).toBe(false)
+    expect(result.entries).toHaveLength(5)
+
+    const [s, u, a, c, custom] = result.entries
+
+    // session header：cwd/parentSession 保留；接口未列的 version 不暴露
+    expect(s.type).toBe('session')
+    expect(s.id).toBe('s1')
+    expect(s.parentId).toBeNull()
+    expect(s.cwd).toBe('/x')
+    expect(s.parentSession).toBe('/p.jsonl')
+    expect((s as Entry).version).toBeUndefined()
+
+    // user message
+    expect(u.type).toBe('message')
+    expect(u.id).toBe('m1')
+    expect(u.parentId).toBe('s1')
+    expect(u.message?.role).toBe('user')
+    expect(u.message?.content).toEqual([{ type: 'text', text: 'hi' }])
+
+    // assistant message + toolCalls
+    expect(a.message?.role).toBe('assistant')
+    expect(a.message?.toolCalls).toEqual([{ name: 'bash', args: {} }])
+
+    // compaction summary
+    expect(c.type).toBe('compaction')
+    expect(c.summary).toEqual({ kept: 5 })
+
+    // custom
+    expect(custom.type).toBe('custom')
+    expect(custom.customType).toBe('subagent-identity')
+    expect(custom.data).toEqual({ slug: 'fix' })
+  })
+
+  it('中间夹坏行：skippedLines 正确，坏行前后 entry 保留', () => {
+    const content = [
+      line({ type: 'message', id: 'a', parentId: null }),
+      'THIS IS NOT JSON {{{',
+      line({ type: 'message', id: 'b', parentId: 'a' }),
+    ].join('\n')
+
+    const result = parseSessionContent(content)
+
+    expect(result.entries).toHaveLength(2)
+    expect(result.entries[0].id).toBe('a')
+    expect(result.entries[1].id).toBe('b')
+    expect(result.skippedLines).toBe(1)
+    // 最后一行解析成功 → 非 partial
+    expect(result.lastLinePartial).toBe(false)
+  })
+
+  it('空字符串：entries 为空，skippedLines=0，非 partial', () => {
+    const result = parseSessionContent('')
+
+    expect(result.entries).toEqual([])
+    expect(result.skippedLines).toBe(0)
+    expect(result.lastLinePartial).toBe(false)
+    expect(result.totalBytes).toBe(0)
+  })
+
+  it('末尾换行不产生幽灵行（不计 skipped/partial）', () => {
+    const content = line({ type: 'message', id: 'a', parentId: null }) + '\n'
+    const result = parseSessionContent(content)
+
+    expect(result.entries).toHaveLength(1)
+    expect(result.skippedLines).toBe(0)
+    expect(result.lastLinePartial).toBe(false)
+  })
+
+  it('最后一行是半 JSON：lastLinePartial=true，仍计入 skippedLines', () => {
+    const content =
+      line({ type: 'message', id: 'a', parentId: null }) + '\n' + '{"type":"message","id":"x"'
+    const result = parseSessionContent(content)
+
+    expect(result.entries).toHaveLength(1)
+    expect(result.entries[0].id).toBe('a')
+    expect(result.skippedLines).toBe(1)
+    expect(result.lastLinePartial).toBe(true)
+  })
+
+  it('JSON 合法但缺必填结构字段（type/id）视为坏行', () => {
+    const content = [
+      line({ type: 'message', id: 'ok', parentId: null }),
+      line({ foo: 'bar' }), // 缺 type/id
+      '{"id":"no_type"}', // 缺 type
+    ].join('\n')
+
+    const result = parseSessionContent(content)
+
+    expect(result.entries).toHaveLength(1)
+    expect(result.entries[0].id).toBe('ok')
+    expect(result.skippedLines).toBe(2)
+    // 最后那条坏行也是最后一行 → partial
+    expect(result.lastLinePartial).toBe(true)
+  })
+
+  it('custom entry 无顶层 id 时 fallback 到 data.id（pi subagent-identity 等格式）', () => {
+    const content = line({
+      type: 'custom',
+      customType: 'subagent-identity',
+      data: { id: 'sa-abc123', rootSessionId: 'sess-1', slug: 'fix' },
+    })
+    const result = parseSessionContent(content)
+
+    expect(result.entries).toHaveLength(1)
+    expect(result.entries[0].id).toBe('sa-abc123')
+    expect(result.entries[0].customType).toBe('subagent-identity')
+    expect(result.skippedLines).toBe(0)
+  })
+
+  it('session header 无 parentId → 归一化为 null（root 判定）', () => {
+    const content = '{"type":"session","id":"root","timestamp":"t"}'
+    const result = parseSessionContent(content)
+
+    expect(result.entries).toHaveLength(1)
+    expect(result.entries[0].parentId).toBeNull()
+  })
+
+  it('message 缺/非法 role → 丢弃 message 字段但保留 entry', () => {
+    const content = [
+      line({ type: 'message', id: 'm1', parentId: null, message: { role: 'system', content: 'x' } }),
+      line({ type: 'message', id: 'm2', parentId: null, message: { content: 'x' } }),
+    ].join('\n')
+
+    const result = parseSessionContent(content)
+
+    expect(result.entries).toHaveLength(2)
+    expect(result.entries[0].message).toBeUndefined()
+    expect(result.entries[1].message).toBeUndefined()
+  })
+})
+
+describe('parseSessionFile', () => {
+  it.skipIf(!HAS_REAL_SESSION)('真实 session 019e6c96：1204 entries / 0 skipped / 非 partial', async () => {
+    const result = await parseSessionFile(REAL_SESSION)
+
+    expect(result.entries).toHaveLength(1204)
+    expect(result.skippedLines).toBe(0)
+    expect(result.lastLinePartial).toBe(false)
+    // 5.4MB 量级
+    expect(result.totalBytes).toBeGreaterThan(5_000_000)
+  })
+})

package/src/__tests__/real-data.ts

@@ -0,0 +1,53 @@
+import { existsSync } from 'node:fs'
+import { execSync } from 'node:child_process'
+import { join } from 'node:path'
+
+/**
+ * 真实 pi agent 数据常量 + 存在性探测（MF-1：CI 无本机 ~/.pi/agent 目录，
+ * 依赖真实数据的用例必须 skipIf 守卫，否则 CI `pnpm extensions:test` 必红）。
+ *
+ * 用法：测试文件 `import { REAL_AGENT_DIR, HAS_E6 } from './real-data.js'`，
+ * 真实数据用例套 `it.skipIf(!HAS_X)` / `describe.skipIf(!HAS_X)`；
+ * fixture 用例保持无条件跑。
+ *
+ * 本文件无 .test.ts 后缀，vitest include 只收集 `src/__tests__/` 下以 .test.ts 结尾的文件，不收集本文件。
+ */
+
+/** 真实 pi agent 目录（本机），用于集成测试。 */
+export const REAL_AGENT_DIR = '/Users/zhushanwen/.pi/agent'
+
+/** 5.4MB / 32 turn / 1204 entry 的真实 session（feat-plugin-arch-3 目录）。 */
+export const E6 = '019e6c96-0a0c-74b8-a73f-d1854d88e2a7'
+/** 真实 fork 家族根（fork 子代 019fe632，隔代 subagent 019fe635 挂在 019fe632 下）。 */
+export const FAM = '019fe620-8ae1-78a7-b76a-43a1ba4cc3c7'
+
+/** E6 的完整文件路径（parser/turns/render 直接 parseSessionFile 用）。 */
+export const REAL_SESSION = join(
+  REAL_AGENT_DIR,
+  'sessions',
+  '--Users-zhushanwen-Code-xyz-agent-workspace-feat-plugin-arch-3--',
+  `2026-05-28T03-17-12-844Z_${E6}.jsonl`,
+)
+
+/** 同步探测真实 session 文件是否存在（不存在则 skip，避免在无该数据的机器上硬失败）。 */
+export function hasRealSession(sid: string): boolean {
+  if (!existsSync(REAL_AGENT_DIR)) return false
+  try {
+    return (
+      execSync(
+        `find ${REAL_AGENT_DIR}/sessions -name '*${sid}*' -name '*.jsonl' ! -name '*.finalized' 2>/dev/null | head -1`,
+        { encoding: 'utf8' },
+      ).trim().length > 0
+    )
+  } catch {
+    return false
+  }
+}
+
+export const HAS_REAL_AGENT_DIR = existsSync(REAL_AGENT_DIR)
+export const HAS_REAL_SUBAGENTS_DIR = existsSync(join(REAL_AGENT_DIR, 'subagents'))
+export const HAS_REAL_SESSION = existsSync(REAL_SESSION)
+export const HAS_E6 = hasRealSession(E6)
+export const HAS_FAM = hasRealSession(FAM)
+/** tool-handler 的 handleSessionRead 套件同时依赖 E6 + FAM。 */
+export const HAS_REAL = HAS_E6 && HAS_FAM

package/src/__tests__/render.test.ts

@@ -0,0 +1,367 @@
+import { describe, it, expect } from 'vitest'
+import { renderOutline, renderExpand, renderDetail, type ToolResultSummaryEntry } from '../core/render.js'
+import type { Entry } from '../core/parser.js'
+import type { Turn } from '../core/turns.js'
+import type { TreeView } from '../core/tree.js'
+import { parseSessionFile } from '../core/parser.js'
+import { buildTreeView } from '../core/tree.js'
+import { segmentTurns } from '../core/turns.js'
+import { REAL_SESSION, HAS_REAL_SESSION } from './real-data.js'
+
+// ---- 构造助手 ----
+
+function uEntry(id: string, text: string): Entry {
+  return {
+    type: 'message',
+    id,
+    parentId: null,
+    message: { role: 'user', content: [{ type: 'text', text }] },
+  }
+}
+
+function aEntry(
+  id: string,
+  text: string,
+  toolCalls?: Array<{ name: string; id?: string; arguments?: Record<string, unknown> }>,
+  thinking?: string,
+): Entry {
+  // v2：toolCalls 进 content 的 toolCall block（真实结构，probe 实测 519），不再设 message.toolCalls
+  const content: unknown[] = [{ type: 'text', text }]
+  if (thinking !== undefined) content.push({ type: 'thinking', thinking })
+  if (toolCalls !== undefined) {
+    for (const tc of toolCalls) {
+      content.push({
+        type: 'toolCall',
+        id: tc.id ?? `call_${tc.name}`,
+        name: tc.name,
+        arguments: tc.arguments ?? {},
+      })
+    }
+  }
+  return { type: 'message', id, parentId: null, message: { role: 'assistant', content } }
+}
+
+function tEntry(
+  id: string,
+  content: string,
+  opts?: { toolCallId?: string; toolName?: string },
+): Entry {
+  // v2：content 保持 string（测试简化，toolResultText 对 string/数组都处理）；
+  // 加 toolCallId/toolName 供 O2 类型化摘要关联测试
+  const message: NonNullable<Entry['message']> = { role: 'toolResult', content }
+  if (opts?.toolName !== undefined) message.toolName = opts.toolName
+  if (opts?.toolCallId !== undefined) message.toolCallId = opts.toolCallId
+  return { type: 'message', id, parentId: null, message }
+}
+
+function turn(
+  idx: number,
+  entries: Entry[],
+  opts: { userEntry?: Entry; isCompaction?: boolean; startTime?: string } = {},
+): Turn {
+  const t: Turn = {
+    index: idx,
+    entries,
+    userEntry: opts.userEntry,
+    isCompaction: opts.isCompaction ?? false,
+  }
+  if (opts.startTime !== undefined) t.startTime = opts.startTime
+  return t
+}
+
+function emptyTree(): TreeView {
+  return { leafPath: [], branches: new Map(), orphans: [] }
+}
+
+describe('renderOutline', () => {
+  it('1. 预算充足 → 全部字段完整渲染（userBrief 截断 / toolSummary 聚合 / omittedBytes 正确）', () => {
+    const t = turn(0, [
+      uEntry('U', 'do something'),
+      aEntry('A', 'sure', [{ name: 'bash' }, { name: 'bash' }, { name: 'read' }, { name: 'read' }], 'secret'),
+      tEntry('T', 'output'),
+    ], { userEntry: uEntry('U', 'do something') })
+
+    const result = renderOutline([t], emptyTree(), { budget: 2000 })
+    const b = result.turns[0]
+
+    expect(b.userBrief).toBe('do something') // 12 chars，未截断
+    expect(b.toolSummary).toBe('bash×2,read×2')
+    expect(b.assistantBrief).toBe('sure')
+    // thinking 'secret'(6B) + toolResult 'output'(6B)
+    expect(b.omittedBytes).toBe(12)
+    expect(result.truncated).toBeUndefined()
+  })
+
+  it('2a. 降级：单行 toolSummary 过长超 perTurnBudget → 砍 toolSummary，保 userBrief 骨架', () => {
+    // L1 行不含 assistantBrief（design §3.5 算法1 step2）；budget=40, 3 turns → perTurnCharBudget≈53
+    // 行 = head + userBrief(10) + toolSummary(20 个工具名≈63 chars) → ~80 > 53 → 砍 toolSummary
+    const toolCalls = Array.from({ length: 20 }, (_, k) => ({ name: `t${String(k).padStart(2, '0')}` }))
+    const turns = [0, 1, 2].map((i) =>
+      turn(i, [uEntry(`U${i}`, 'u'.repeat(10)), aEntry(`A${i}`, 'a'.repeat(10), toolCalls)], {
+        userEntry: uEntry(`U${i}`, 'u'.repeat(10)),
+      }),
+    )
+    const result = renderOutline(turns, emptyTree(), { budget: 40 })
+
+    expect(result.turns).toHaveLength(3)
+    for (const b of result.turns) {
+      expect(b.toolSummary).toBe('') // 被砍（降级）
+      expect(b.userBrief).toBe('u'.repeat(10)) // 骨架保留
+    }
+    expect(result.truncated).toBeUndefined()
+  })
+
+  it('3. 总超预算 → truncated 计数 > 0（从尾部丢弃）', () => {
+    // budget=10, 5 turns → 每行降级到骨架 17 chars；total 85/4=21>10 → 截断保留 2，truncated=3
+    const turns = [0, 1, 2, 3, 4].map((i) =>
+      turn(i, [uEntry(`U${i}`, 'u'.repeat(10)), aEntry(`A${i}`, 'a'.repeat(10))], {
+        userEntry: uEntry(`U${i}`, 'u'.repeat(10)),
+      }),
+    )
+    const result = renderOutline(turns, emptyTree(), { budget: 10 })
+
+    expect(result.truncated).toBe(3)
+    expect(result.turns).toHaveLength(2)
+  })
+
+  it('4. toolSummary 聚合：同名计数 ×N，不同名逗号分隔', () => {
+    const t = turn(
+      0,
+      [uEntry('U', 'q'), aEntry('A', 'r', [{ name: 'bash' }, { name: 'bash' }, { name: 'read' }, { name: 'read' }, { name: 'edit' }])],
+      { userEntry: uEntry('U', 'q') },
+    )
+    const result = renderOutline([t], emptyTree(), { budget: 2000 })
+    expect(result.turns[0].toolSummary).toBe('bash×2,read×2,edit')
+  })
+
+  it('5. omittedBytes = toolResult content + thinking 字节和', () => {
+    const t = turn(
+      0,
+      [uEntry('U', 'q'), aEntry('A', 'r', undefined, 'th'), tEntry('T', 'out')],
+      { userEntry: uEntry('U', 'q') },
+    )
+    const result = renderOutline([t], emptyTree(), { budget: 2000 })
+    // thinking 'th'(2B) + toolResult 'out'(3B) = 5
+    expect(result.turns[0].omittedBytes).toBe(5)
+  })
+
+  it('6. granularity:entry → 不聚合，每 entry 一行', () => {
+    const turns = [
+      turn(0, [uEntry('U0', 'a'), aEntry('A0', 'b')], { userEntry: uEntry('U0', 'a') }),
+      turn(1, [uEntry('U1', 'c')], { userEntry: uEntry('U1', 'c') }),
+    ]
+    const result = renderOutline(turns, emptyTree(), { granularity: 'entry', budget: 2000 })
+    // 3 leaf entries → 3 行
+    expect(result.turns).toHaveLength(3)
+    expect(result.turns.map((b) => b.index)).toEqual([0, 1, 2])
+  })
+
+  it('7. allBranches:true → forkPoint 处标注 branch', () => {
+    const tree: TreeView = { leafPath: ['U'], branches: new Map([['U', 3]]), orphans: [] }
+    const userEntry = uEntry('U', 'hi')
+    const turns = [turn(0, [userEntry], { userEntry })]
+
+    const withBranches = renderOutline(turns, tree, { allBranches: true })
+    expect(withBranches.turns[0].branch).toBe('U')
+
+    const withoutBranches = renderOutline(turns, tree, { allBranches: false })
+    expect(withoutBranches.turns[0].branch).toBeUndefined()
+  })
+
+  it.skipIf(!HAS_REAL_SESSION)('8. 真实 019e6c96：outline tokenEstimate <= 1500 + assistantBrief/toolSummary 非空（v2 O1）', async () => {
+    // v2 O1：加 assistantBrief + 修 toolSummary bug 后 outline 变长，阈值 600→1500（design §3.3 D4）
+    const parsed = await parseSessionFile(REAL_SESSION)
+    const tree = buildTreeView(parsed.entries)
+    const turns = segmentTurns(parsed.entries, new Set(tree.leafPath))
+    const result = renderOutline(turns, tree, { budget: 2000 })
+
+    expect(result.turns.length).toBe(32)
+    expect(result.tokenEstimate).toBeLessThanOrEqual(1500)
+    // v2 O1 验证：assistant 结论行存在（非空）+ toolSummary 显示真实工具（修 v1 恒空 bug）
+    expect(result.turns.some((b) => b.assistantBrief !== '')).toBe(true)
+    expect(result.turns.some((b) => b.toolSummary !== '')).toBe(true)
+    // stats 完整性
+    expect(result.stats.totalTurns).toBe(32)
+    // totalEntries 近似（leaf+branch+orphan）不含 session header（segmentTurns 规则1 跳过）；
+    // 准确值由 M2 工具层用 ParseResult.totalEntries 覆盖。M1 验量级。
+    expect(result.stats.totalEntries).toBeGreaterThan(1000)
+  })
+})
+
+describe('renderExpand', () => {
+  it('单轮展开：header 含 entry 数 + 每个 entry brief', () => {
+    const t = turn(
+      0,
+      [uEntry('U', 'hello world'), aEntry('A', 'ok'), tEntry('T', 'result text')],
+      { userEntry: uEntry('U', 'hello world'), startTime: '2026-05-28T03:17:12.844Z' },
+    )
+    const out = renderExpand(t)
+
+    expect(out.turn).toContain('3 entries')
+    expect(out.turn).toContain('03:17')
+    expect(out.entries).toHaveLength(3)
+    expect(out.entries[0]).toMatchObject({ index: 0, type: 'message', role: 'user' })
+    expect(out.entries[0].brief).toBe('hello world')
+    expect(out.entries[1].role).toBe('assistant')
+    expect(out.entries[2].role).toBe('toolResult')
+    // toolResult 的 omittedBytes = content 字节
+    expect(out.entries[2].omittedBytes).toBe(Buffer.byteLength('result text', 'utf8'))
+  })
+
+  it('v2 O2：toolResult 类型化摘要（bash: <cmd> (N行)，toolCallId 关联取 args）', () => {
+    // 构造带 toolCallId 关联的 turn：assistant 调 bash，toolResult 靠 toolCallId 关联回去取 command
+    const tcId = 'call_bash1'
+    const t = turn(
+      0,
+      [
+        uEntry('U', '查一下文件'),
+        aEntry('A', '好的', [{ name: 'bash', id: tcId, arguments: { command: 'ls -la src/' } }]),
+        tEntry('T', 'file1\nfile2\nfile3', { toolCallId: tcId, toolName: 'bash' }),
+      ],
+      { userEntry: uEntry('U', '查一下文件') },
+    )
+    const out = renderExpand(t)
+    const trBrief = out.entries.find((e) => e.role === 'toolResult')!
+    // 类型化摘要：bash: <cmd> (N行)，不是结果文本前 100 字（file1/file2...）
+    expect(trBrief.brief).toContain('bash: ls -la src/')
+    expect(trBrief.brief).toContain('3行')
+    expect(trBrief.brief).not.toContain('file1')
+  })
+
+  it('v2 O2：read/edit/write 等工具的类型化摘要', () => {
+    const t = turn(
+      0,
+      [
+        uEntry('U', '改代码'),
+        aEntry('A1', '读文件', [{ name: 'read', id: 'r1', arguments: { path: '/a/b/src/index.ts' } }]),
+        tEntry('TR1', 'content', { toolCallId: 'r1', toolName: 'read' }),
+        aEntry('A2', '编辑', [{ name: 'edit', id: 'e1', arguments: { path: '/a/b/foo.ts', edits: [{}, {}] } }]),
+        tEntry('TR2', 'ok', { toolCallId: 'e1', toolName: 'edit' }),
+        aEntry('A3', '写', [{ name: 'write', id: 'w1', arguments: { path: '/a/b/out.txt', content: 'x'.repeat(2048) } }]),
+        tEntry('TR3', 'ok', { toolCallId: 'w1', toolName: 'write' }),
+      ],
+      { userEntry: uEntry('U', '改代码') },
+    )
+    const out = renderExpand(t)
+    const briefs = out.entries.filter((e) => e.role === 'toolResult').map((e) => e.brief)
+    // read: read: index.ts (NKB)（结果 KB）
+    expect(briefs[0]).toMatch(/^read: index\.ts \(\d+KB\)$/) // 点号转义
+    // edit: edit: foo.ts (2 blocks)（参数 blocks）
+    expect(briefs[1]).toBe('edit: foo.ts (2 blocks)')
+    // write: write: out.txt (NKB)（参数 content KB）
+    expect(briefs[2]).toMatch(/^write: out\.txt \(\d+KB\)$/) // 修正：out.txt
+  })
+})
+
+describe('renderDetail', () => {
+  it('默认 toolResult 摘要态（O3）+ thinking 剥离；includeToolResult/includeThinking 取回', () => {
+    const t = turn(0, [
+      uEntry('U', 'q'),
+      aEntry('A', 'visible', undefined, 'hidden-thinking'),
+      tEntry('T', 'tool-output'),
+    ], { userEntry: uEntry('U', 'q') })
+
+    // v2 O3：默认不再 continue 跳过 toolResult，条目数不减少（toolResult 变摘要态）
+    const defaultOut = renderDetail([t])
+    expect(defaultOut).toHaveLength(3)
+    expect(defaultOut.some((e) => e.type === 'toolResultSummary')).toBe(true)
+    // thinking 块被剥离（assistant 副本，无 thinking）
+    const entries = defaultOut.filter((e): e is Entry => e.type !== 'toolResultSummary')
+    const assistantDefault = entries.find((e) => e.message?.role === 'assistant')!
+    expect(extractTextForTest(assistantDefault.message!.content)).toBe('visible')
+
+    // includeToolResult：toolResult 原文 entry 回来（非摘要态）
+    const withTool = renderDetail([t], { includeToolResult: true })
+    expect(withTool).toHaveLength(3)
+    expect(
+      withTool.some(
+        (e): e is Entry => e.type !== 'toolResultSummary' && e.message?.role === 'toolResult',
+      ),
+    ).toBe(true)
+
+    // includeThinking：thinking 块回来
+    const withThinking = renderDetail([t], { includeThinking: true })
+    const entriesT = withThinking.filter((e): e is Entry => e.type !== 'toolResultSummary')
+    const assistantThinking = entriesT.find((e) => e.message?.role === 'assistant')!
+    expect(extractTextForTest(assistantThinking.message!.content)).toBe('visible')
+    expect(extractThinkingForTest(assistantThinking.message!.content)).toBe('hidden-thinking')
+  })
+
+  it('v2 O3：renderDetail 默认摘要态 + includeToolResult 全文', () => {
+    const tcId = 'call_r1'
+    const t = turn(
+      0,
+      [
+        uEntry('U', 'q'),
+        aEntry('A', 'r', [{ name: 'read', id: tcId, arguments: { path: '/x/y/f.ts' } }]),
+        tEntry('T', 'line1\nline2\nline3\nline4', { toolCallId: tcId, toolName: 'read' }),
+      ],
+      { userEntry: uEntry('U', 'q') },
+    )
+
+    // 默认摘要态
+    const def = renderDetail([t])
+    expect(def).toHaveLength(3)
+    const summary = def.find(
+      (e): e is ToolResultSummaryEntry => e.type === 'toolResultSummary',
+    )!
+    expect(summary).toBeDefined()
+    expect(summary.summary).toMatch(/^read: f\.ts \(\d+KB\)$/)
+    expect(summary.totalLines).toBe(4)
+    expect(summary.headLines).toContain('line1')
+    expect(summary.fullEntry.message?.role).toBe('toolResult')
+
+    // includeToolResult 全文：返回原 Entry
+    const full = renderDetail([t], { includeToolResult: true })
+    expect(full).toHaveLength(3)
+    expect(
+      full.some(
+        (e): e is Entry => e.type !== 'toolResultSummary' && e.message?.role === 'toolResult',
+      ),
+    ).toBe(true)
+  })
+
+  it('v2 S1：空 content 的 toolResult totalLines=0（与 formatToolResultSummary 口径一致）', () => {
+    // 同一空 toolResult：summary 显示 "(0行)"，totalLines 必须也是 0（非 ''.split('\n') 的 1）
+    const tcId = 'call_bash1'
+    const t = turn(
+      0,
+      [
+        uEntry('U', 'q'),
+        aEntry('A', 'r', [{ name: 'bash', id: tcId, arguments: { command: 'ls' } }]),
+        tEntry('T', '', { toolCallId: tcId, toolName: 'bash' }), // 空 content
+      ],
+      { userEntry: uEntry('U', 'q') },
+    )
+    const def = renderDetail([t])
+    const summary = def.find(
+      (e): e is ToolResultSummaryEntry => e.type === 'toolResultSummary',
+    )!
+    expect(summary).toBeDefined()
+    expect(summary.totalLines).toBe(0) // 空结果 = 0 行（非 1）
+    expect(summary.headLines).toBe('') // 空结果无头行
+    // 对照：summary 文案也不含行数（formatToolResultSummary 空结果不 append (N行)）
+    expect(summary.summary).not.toContain('行)')
+  })
+})
+
+// 测试内联的类型守卫镜像（验证 renderDetail 剥离效果，不依赖 render 内部导出）
+function extractTextForTest(content: unknown): string {
+  if (typeof content === 'string') return content
+  if (Array.isArray(content)) {
+    return content
+      .filter((b) => (b as { type?: string }).type !== 'thinking')
+      .map((b) => ((b as { text?: string }).text) ?? '')
+      .join('')
+  }
+  return ''
+}
+function extractThinkingForTest(content: unknown): string {
+  if (Array.isArray(content)) {
+    return content
+      .filter((b) => (b as { type?: string }).type === 'thinking')
+      .map((b) => ((b as { thinking?: string }).thinking) ?? '')
+      .join('')
+  }
+  return ''
+}