@zhushanwen/pi-session-reader 0.13.1 → 0.13.3

package/src/__tests__/rebuild-manifest-dual-write.test.ts

@@ -1,188 +0,0 @@
-// 跨包集成（[U4c / G4-S5③] record 持久化收敛 P4c 验收锚点）：
-// subagent-core 重建/终态写侧产出的 manifest → session-reader identity 派生视图不降级。
-//
-// 断言链（设计 subagent-record-persistence-consolidation D5 前向兼容判定 + S5③）：
-//   1. manifest 被人为删除（S5 缓存可丢场景）→ subagent-core RecordStore.rebuildIndexes
-//      全量重建 → session-reader listRecordManifests 重新可见；
-//   2. 重建窗口前后，session-reader identity 派生视图的输入字段集（rootSessionId/slug/
-//      task/agentName/model/status/sessionFile/parentRecordId）逐字段一致——双写过渡
-//      字段（executionStatus）在场且不被本包消费（旧 status 三态派生视图继续生效）；
-//   3. 重建源 = 事件流折叠 + identity entry（[③ .state 退场] 后终态位消失）——
-//      身份/富字段逐字段保真；legacy status 不再保真 closed（重建单规则恒 idle +
-//      无 closedReason → derivedManifestRecord 如实派生 legacy "running"，终态语义
-//      由 record-settled 事件帧承载）。
-//
-// 形态同 cross-package-subagent-core.test.ts：subagent-core 真实 tmpdir 产出磁盘
-// 状态，本包零 mock 读同一 tmpdir；不触碰真实数据目录（红线）。
-
-import * as fs from 'node:fs'
-import * as os from 'node:os'
-import * as path from 'node:path'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-
-import { RecordStore } from '@zhushanwen/subagent-core'
-// barrel 外符号按包名 .ts 深路径消费（vitest alias 重写，同 cross-package 先例）
-import { createRecord } from '@zhushanwen/subagent-core/execution/persistence/execution-record.ts'
-import {
-  getSubagentRecordsDir,
-  getSubagentSessionDir,
-} from '@zhushanwen/subagent-core/execution/assembly/path-encoding.ts'
-
-import { listRecordManifests, type RecordManifest } from '../discovery/subagents.js'
-
-const ROOT_SESSION = 'root-dual-write'
-
-/** session-reader identity 派生视图（manifestIdentityData）消费的字段集——重建窗口
- *  前后必须逐字段一致（降级 = 任一字段缺失/漂移）。 */
-function identityView(m: RecordManifest) {
-  return {
-    id: m.id,
-    rootSessionId: m.rootSessionId,
-    agentName: m.agentName,
-    task: m.task,
-    slug: m.slug,
-    model: m.model,
-    status: m.status,
-    sessionFile: m.sessionFile,
-    parentRecordId: m.parentRecordId,
-  }
-}
-
-describe('跨包集成：subagent-core rebuildIndexes 重建 manifest → session-reader 投影不降级', () => {
-  let dataDir: string
-  let agentDir: string
-  let sessionsDir: string
-  let recordsDir: string
-  let childFile: string
-
-  beforeEach(() => {
-    // 生产拓扑复刻（[session-store-layout-inversion 域 9]）：agentDir = <dataDir>/agent
-    //（session-reader 的 agentDir 语义），subagent-core 写侧经新公式落存储树
-    // <dataDir>/ext-sessions/<rootSid>/subagents/——listRecordManifests 双根扫描的新根
-    //（dirname(agentDir)/ext-sessions）与写侧落点相遇
-    dataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'sr-rebuild-dualwrite-'))
-    agentDir = path.join(dataDir, 'agent')
-    sessionsDir = getSubagentSessionDir(ROOT_SESSION, dataDir)
-    recordsDir = getSubagentRecordsDir(ROOT_SESSION, dataDir)
-    fs.mkdirSync(sessionsDir, { recursive: true })
-    fs.mkdirSync(recordsDir, { recursive: true })
-
-    // 子 session 文件：session header + model_change（light 重建的 model 源——
-    // identity 前途经 entry best-effort 提取）+ identity entry（session-reader
-    // 步骤 2 首行 header 探测 + manifest 主路径的数据锚）
-    childFile = path.join(sessionsDir, '20260912T000000_sa-dw.jsonl')
-    const ts = new Date(1000).toISOString()
-    fs.writeFileSync(
-      childFile,
-      [
-        JSON.stringify({ type: 'session', version: 3, id: 'sess-sa-dw', timestamp: ts, cwd: agentDir }),
-        JSON.stringify({ type: 'model_change', id: 'mc-1', parentId: null, timestamp: ts, provider: 'prov', modelId: 'm1' }),
-        JSON.stringify({
-          type: 'custom',
-          id: 'id-1',
-          parentId: null,
-          timestamp: ts,
-          customType: 'subagent-identity',
-          data: {
-            id: 'sa-dw',
-            agent: 'worker',
-            mode: 'background',
-            task: 'dual write task',
-            slug: 'dual',
-            startedAt: 1000,
-            rootSessionId: ROOT_SESSION,
-            parentRecordId: 'sa-parent',
-            depth: 1,
-          },
-        }),
-      ].join('\n') + '\n',
-      'utf-8',
-    )
-  })
-
-  afterEach(() => {
-    fs.rmSync(dataDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 })
-  })
-
-  it('S5③: manifest 删除 → rebuildIndexes 重建 → identity 派生视图字段集前后一致（双写字段在场）', async () => {
-    // ── 初始 manifest：subagent-core 终态写侧（markFinalized）真实产出 ──
-    const record = createRecord('sa-dw', {
-      agent: 'worker',
-      model: 'prov/m1',
-      mode: 'background',
-      task: 'dual write task',
-      slug: 'dual',
-      startedAt: 1000,
-      rootSessionId: ROOT_SESSION,
-      parentRecordId: 'sa-parent',
-      depth: 1,
-      chatMode: false,
-      controller: new AbortController(),
-    })
-    Object.assign(record, {
-      sessionFile: childFile,
-      status: 'closed' as const,
-      closedReason: 'gc' as const,
-      endedAt: 2000,
-    })
-    // [u-subagent dir 晚绑定] RecordStore 构造 = 目录取值函数（非目录字符串）
-    const writer = new RecordStore(() => sessionsDir, undefined, undefined, () => recordsDir)
-    expect(writer.markFinalized(record, 'gc')).toBe(true)
-    writer.dispose()
-
-    const before = (await listRecordManifests(agentDir)).find((m) => m.id === 'sa-dw')
-    expect(before).toBeDefined()
-    const viewBefore = identityView(before!)
-
-    // 双写过渡字段在写侧就位（本包不消费，但前向兼容锚要求其在场）。
-    // [U2 两态] executionStatus 是内部权威词汇（running|idle 两态，终态概念删除）
-    // → 终态化后恒 'idle'；status 旧三态是 session-reader 直读派生视图（永久保留）→ 'closed'。
-    const rawBefore = JSON.parse(fs.readFileSync(path.join(recordsDir, 'sa-dw.json'), 'utf-8')) as Record<string, unknown>
-    expect(rawBefore.executionStatus).toBe('idle')
-    expect(rawBefore.status).toBe('closed')
-
-    // ── S5 场景：人为删除全部 manifest（缓存可丢）→ 全量重建 ──
-    for (const f of fs.readdirSync(recordsDir)) fs.rmSync(path.join(recordsDir, f))
-    expect((await listRecordManifests(agentDir)).filter((m) => m.id === 'sa-dw')).toHaveLength(0)
-
-    const rebuilder = new RecordStore(() => sessionsDir, undefined, undefined, () => recordsDir)
-    expect(rebuilder.rebuildIndexes()).toBe(1)
-    rebuilder.dispose()
-
-    // ── session-reader 视角：重建后 identity 派生视图不降级 ──
-    const after = (await listRecordManifests(agentDir)).find((m) => m.id === 'sa-dw')
-    expect(after).toBeDefined()
-    // 字段集保真（身份/富字段逐字段一致）；仅 legacy status 按 ③ 后重建语义如实
-    // 派生 running（终态权威 = 事件流 record-settled 帧，磁盘重建无 closedReason 载体）。
-    expect(identityView(after!)).toEqual({ ...viewBefore, status: 'running' })
-
-    const rawAfter = JSON.parse(fs.readFileSync(path.join(recordsDir, 'sa-dw.json'), 'utf-8')) as Record<string, unknown>
-    expect(rawAfter.status).toBe('running')
-    expect(rawAfter.executionStatus).toBe('idle')
-    // closedReason 无重建载体（`.state` 退场）→ 如实缺席。
-    expect(rawAfter.closedReason).toBeUndefined()
-  })
-
-  it('惰性通道：查询结果（collectRecords）补建的 manifest 同样可被本包读取派生视图', async () => {
-    // 不经终态写侧（无 manifest 初始形态）：磁盘 record 只有 identity + 无 sidecar
-    // → 查询触发惰性补建。
-    const store = new RecordStore(() => sessionsDir, undefined, undefined, () => recordsDir)
-    expect(store.collectRecords(10).map((r) => r.id)).toContain('sa-dw')
-    store.dispose()
-
-    const manifests = await listRecordManifests(agentDir)
-    const found = manifests.find((m) => m.id === 'sa-dw')
-    expect(found).toBeDefined()
-    expect(found!.status).toBe('running')
-    expect(found!.task).toBe('dual write task')
-    expect(found!.agentName).toBe('worker')
-    expect(found!.sessionFile).toBe(childFile)
-    expect(found!.parentRecordId).toBe('sa-parent')
-    // 双写过渡字段（[U3 重建单规则] 无 sidecar 重建一律 idle：executionStatus 如实
-    // 派生两态词汇；legacy status 经桥接判据派生——无 closedReason 遗留位的 idle
-    // 派生 "running"（session-reader 视角的活跃成员，§3.2.8 下行映射）。
-    const raw = JSON.parse(fs.readFileSync(path.join(recordsDir, 'sa-dw.json'), 'utf-8')) as Record<string, unknown>
-    expect(raw.executionStatus).toBe('idle')
-    expect(raw.status).toBe('running')
-  })
-})

package/src/__tests__/render.test.ts

@@ -1,481 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import { renderOutline, renderExpand, renderDetail, type ToolResultSummaryEntry } from '../core/render.js'
-import type { Entry } from '@zhushanwen/session-core'
-import type { Turn } from '../core/turns.js'
-import type { TreeView } from '../core/tree.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()
-    // E7 行渲染统一：lines 随结果返回，与 turns 一一对应（预算度量 = 展示行同一份）
-    expect(result.lines).toEqual(['T000 · do something · bash×2,read×2 · → sure · [12B omitted]'])
-  })
-
-  it('2a. 降级：单行 toolSummary 过长超 perTurnBudget → 砍 toolSummary，保 userBrief 骨架', () => {
-    // 预算紧张降级后 L1 行不含 assistantBrief（预算充足 level 0 行含）；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)) // 骨架保留
-    }
-    // E7：降级后的渲染行（骨架形态）与 briefs 字段同步——行内无 → 结论段、无工具聚合段
-    expect(result.lines).toHaveLength(3)
-    expect(result.lines).toEqual(['T000 · uuuuuuuuuu', 'T001 · uuuuuuuuuu', 'T002 · uuuuuuuuuu'])
-    expect(result.truncated).toBeUndefined()
-  })
-
-  it('2b. 降级（砍 assistantBrief 档）：行内 → 结论段消失、toolSummary 保留，与改前语义一致', () => {
-    // budget=20 → perTurnCharBudget=80；level 0 行 = T000 · u*10 · bash×2 · → a*80… ≈112 > 80
-    // → 砍 assistantBrief 后 ≈26 ≤ 80 停（S3：该档形态与改前 handler 侧渲染降级后 briefs 等价）
-    const t = turn(
-      0,
-      [uEntry('U', 'u'.repeat(10)), aEntry('A', 'a'.repeat(100), [{ name: 'bash' }, { name: 'bash' }])],
-      { userEntry: uEntry('U', 'u'.repeat(10)) },
-    )
-    const result = renderOutline([t], emptyTree(), { budget: 20 })
-
-    expect(result.turns[0].assistantBrief).toBe('') // 被砍
-    expect(result.turns[0].toolSummary).toBe('bash×2') // 保留
-    expect(result.lines).toEqual(['T000 · uuuuuuuuuu · bash×2'])
-    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)
-    // E7：lines 与 turns 同步截短（truncateToTotalBudget 双数组一致）
-    expect(result.lines).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('7b. E7 旁支标记统一：渲染行 `[旁支 N entries]`（N = 该 forkPoint 下旁支子树 entry 数）', () => {
-    // branches: U → 3 entries 旁支子树（E7/D3：outline 与 export 两条路径共用此形态）
-    const tree: TreeView = { leafPath: ['U'], branches: new Map([['U', 3]]), orphans: [] }
-    const userEntry = uEntry('U', 'hi')
-    const turns = [turn(0, [userEntry], { userEntry })]
-
-    const result = renderOutline(turns, tree, { allBranches: true })
-    expect(result.lines).toEqual(['T000 · hi · [旁支 3 entries]'])
-    // branchSize 缺失（allBranches:false）不标旁支
-    const noBranch = renderOutline(turns, tree, { allBranches: false })
-    expect(noBranch.lines).toEqual(['T000 · hi'])
-  })
-
-  it('8. 多 turn outline：tokenEstimate <= 1500 + assistantBrief/toolSummary 非空 + stats 完整（v2 O1）', () => {
-    // v2 O1：加 assistantBrief + 修 toolSummary bug 后 outline 行含结论与工具聚合，
-    // 阈值 1500（design §3.3 D4）。3 turn 合成数据，每 turn 带 toolCall + toolResult
-    const turns = [0, 1, 2].map((i) =>
-      turn(
-        i,
-        [
-          uEntry(`U${i}`, `问题 ${i}`),
-          aEntry(`A${i}`, `结论 ${i}`, [{ name: 'bash' }, { name: 'read' }]),
-          tEntry(`T${i}`, 'output'),
-        ],
-        { userEntry: uEntry(`U${i}`, `问题 ${i}`) },
-      ),
-    )
-    const result = renderOutline(turns, emptyTree(), { budget: 2000 })
-
-    expect(result.turns.length).toBe(3)
-    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(3)
-    // totalEntries 近似（leaf+branch+orphan）不含 session header（segmentTurns 规则1 跳过）
-    expect(result.stats.totalEntries).toBeGreaterThan(0)
-  })
-
-  // ---- D9② 占位行折叠：纯记录条目 turn 不产 outline 行、不占轮次 ----
-
-  function recEntry(id: string, type: string): Entry {
-    // pi 1.0 纯记录条目形态（usage/session_info/model_change 等，无 message 字段）
-    return { type, id, parentId: null }
-  }
-
-  function sysEntry(id: string): Entry {
-    // pi 1.0 system 消息（role=system，工具集变更高频追加）——非对话轴，随折叠
-    return { type: 'message', id, parentId: null, message: { role: 'system', content: 'sys' } }
-  }
-
-  it('9. D9② 纯记录条目 turn 折叠：不产行、totalTurns 只数对话轮，对话 turn 的 T 序号保留原 index', () => {
-    const turns = [
-      turn(0, [recEntry('MC', 'model_change'), recEntry('TL', 'thinking_level_change')]),
-      turn(1, [uEntry('U1', 'first question')], { userEntry: uEntry('U1', 'first question') }),
-      turn(2, [recEntry('US', 'usage')]),
-      turn(3, [uEntry('U2', 'second question')], { userEntry: uEntry('U2', 'second question') }),
-    ]
-    const result = renderOutline(turns, emptyTree(), { budget: 2000 })
-
-    // 记录 turn（0/2）折叠：行只剩两个对话 turn
-    expect(result.turns).toHaveLength(2)
-    expect(result.lines).toHaveLength(2)
-    expect(result.stats.totalTurns).toBe(2)
-    // T 序号 = 原 turn.index（expand/detail 的入口地址稳定，折叠不重编号）
-    expect(result.turns.map((b) => b.index)).toEqual([1, 3])
-    // 字节/条目统计保持全量口径（折叠是展示层行为，不丢数据）：2+1+1+1 = 5
-    expect(result.stats.totalEntries).toBe(5)
-  })
-
-  it('10. D9② system 消息与 custom 审计条目同折叠；custom_message 参与对话流保留', () => {
-    const turns = [
-      turn(0, [sysEntry('S1'), recEntry('C1', 'custom')]),
-      turn(1, [uEntry('U1', 'q')], { userEntry: uEntry('U1', 'q') }),
-    ]
-    const result = renderOutline(turns, emptyTree(), { budget: 2000 })
-    expect(result.turns).toHaveLength(1)
-    expect(result.stats.totalTurns).toBe(1)
-
-    const cm: Entry = { type: 'custom_message', id: 'CM', parentId: null, customType: 'plan-context', content: 'prompt' }
-    const withCm = renderOutline([turn(0, [cm]), turn(1, [uEntry('U1', 'q')], { userEntry: uEntry('U1', 'q') })], emptyTree(), { budget: 2000 })
-    expect(withCm.turns).toHaveLength(2)
-  })
-
-  it('11. D9② entry 粒度同谓词：纯记录条目不产行，entryIdx 只数对话条目', () => {
-    const turns = [
-      turn(0, [recEntry('MC', 'model_change'), uEntry('U0', 'a')], { userEntry: uEntry('U0', 'a') }),
-      turn(1, [recEntry('US', 'usage')]),
-    ]
-    const result = renderOutline(turns, emptyTree(), { granularity: 'entry', budget: 2000 })
-    expect(result.turns).toHaveLength(1)
-    expect(result.turns[0]?.userBrief).toBe('a')
-  })
-
-  it('12. D9② branch_summary 归纯记录折叠：前置 turn 成 turn 不产行（pi 1.0 纯记录类）', () => {
-    // pi 1.0 dist branchWithSummary 落盘形态：{type:'branch_summary', id, parentId, fromId,
-    // summary, details, usage, fromHook}，无 message 字段。归类 = 纯记录（分叉操作痕迹，
-    // 非当前路径对话内容；taiji 无消息编辑入口不产生该形态）
-    const bs: Entry = { type: 'branch_summary', id: 'BS', parentId: null, summary: 'original path digest' }
-    const turns = [
-      turn(0, [bs]),
-      turn(1, [uEntry('U1', 'new branch question')], { userEntry: uEntry('U1', 'new branch question') }),
-    ]
-    const result = renderOutline(turns, emptyTree(), { budget: 2000 })
-    // 折叠：前置 turn 不产行，outline 只剩新路径对话 turn
-    expect(result.turns).toHaveLength(1)
-    expect(result.lines).toHaveLength(1)
-    expect(result.stats.totalTurns).toBe(1)
-    // T 序号保留原 turn.index（expand/detail 入口地址稳定）
-    expect(result.turns.map((b) => b.index)).toEqual([1])
-    // 字节/条目统计保持全量口径：BS + U1 = 2
-    expect(result.stats.totalEntries).toBe(2)
-  })
-})
-
-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')
-
-    // 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 ''
-}