@zhushanwen/pi-session-reader 0.8.1 → 0.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-session-reader",
-  "version": "0.8.1",
+  "version": "0.9.1",
   "type": "module",
   "main": "index.ts",
   "taiji": {
@@ -18,13 +18,13 @@
   "dependencies": {
     "@zhushanwen/pi-extension-logger": "0.6.1",
     "@zhushanwen/pi-ext-guards": "0.4.2",
-    "@zhushanwen/session-core": "0.11.0",
-    "@zhushanwen/zcode-session-source": "0.2.2"
+    "@zhushanwen/zcode-session-source": "0.2.4",
+    "@zhushanwen/session-core": "0.11.0"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.1.9",
     "vitest": "^4.1.8",
-    "@zhushanwen/subagent-core": "0.13.0"
+    "@zhushanwen/subagent-core": "1.2.1"
   },
   "files": [
     "index.ts",

package/src/__tests__/cross-package-subagent-core.test.ts

@@ -9,6 +9,7 @@ import { handleSessionRead } from '../tool-handler.js'
 import {
   ModelConfigService,
   RecordStore,
+  SUBAGENT_RECORD_CUSTOM_TYPE,
   SubagentService,
   type SubagentRecord,
 } from '@zhushanwen/subagent-core'
@@ -135,7 +136,9 @@ describe('跨包集成：subagent-core 重建 manifest → session-reader result
     fs.rmSync(agentDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 })
   })
 
-  /** 真实 RecordStore（写文件 pi：种子经真实 toSubagentRecordEntry 序列化落主文件）。 */
+  /** 真实 RecordStore（写文件 pi：种子经真实 register 通路 + v2 条目构造器
+   *  （toRegisteredEntryData，[v1 兼容层删除] v1 快照写点 toSubagentRecordEntry 已删）
+   *  落主文件）。 */
   function makeSeedStore(): RecordStore {
     return new RecordStore(
       getSubagentSessionDir(agentDir, agentDir),
@@ -199,12 +202,12 @@ describe('跨包集成：subagent-core 重建 manifest → session-reader result
         data: { id: m.id, agent: '/agents/worker.md', mode: 'background', task: 'cross-package task', startedAt: 1000, rootSessionId: ROOT_SESSION, depth: 0 },
       }),
       JSON.stringify({
+        // 登记 §3.3：主/子文件条目面 = v2 注册条（身份域；运行态事实源在 record 事件文件）。
         type: 'custom', id: `cid-${m.id}-2`, parentId: `cid-${m.id}-1`, timestamp: ts,
         customType: 'subagent-record',
         data: {
-          v: 1, id: m.id, agent: '/agents/worker.md', task: 'cross-package task', slug: 'cross',
-          status: 'running', mode: 'background', startedAt: 1000, rootSessionId: ROOT_SESSION,
-          depth: 0, turns: 1, totalTokens: 10, model: m.model, eventLog: [], displayItems: [],
+          v: 2, kind: 'registered', id: m.id, agent: '/agents/worker.md', task: 'cross-package task',
+          slug: 'cross', origin: 'tool', rootSessionId: ROOT_SESSION, depth: 0, startedAt: 1000,
         },
       }),
     )
@@ -216,11 +219,31 @@ describe('跨包集成：subagent-core 重建 manifest → session-reader result
    *  全文 + sessionFile）——[U4/D4] 翻边后成功成员崩溃时的真实末条形态（U5 前的
    *  running+resumable 桥接形态已随字段退役消亡）。 */
   function seedRoundTerminalEntries(m: MemberSeed, childFile: string): void {
-    const store = makeSeedStore()
-    store.reportSubagentRecord(memberRecord({ id: m.id, sessionFile: childFile, model: m.model }))
-    store.reportSubagentRecord(
-      memberRecord({ id: m.id, sessionFile: childFile, model: m.model, status: 'idle', result: m.resultText }),
-    )
+    // 登记 §3.3：v1 快照写点已删——经写入型 pi 落 v2 条目族（注册 + 终态）。
+    const pi = makeWritingPi(mainFile)
+    const seed = (record: SubagentRecord): void => {
+      for (const entry of v2Entries(record)) pi.appendEntry(SUBAGENT_RECORD_CUSTOM_TYPE, entry)
+    }
+    seed(memberRecord({ id: m.id, sessionFile: childFile, model: m.model }))
+    seed(memberRecord({ id: m.id, sessionFile: childFile, model: m.model, status: 'idle', result: m.resultText }))
+  }
+
+  /** record → v2 条目族（注册恒在场；非 running 再补终态条）。 */
+  function v2Entries(record: SubagentRecord): Array<Record<string, unknown>> {
+    const registered = {
+      v: 2, kind: 'registered', id: record.id, agent: record.agent, task: record.task, slug: record.slug,
+      origin: record.origin ?? 'tool', rootSessionId: record.rootSessionId, depth: record.depth,
+      startedAt: record.startedAt,
+    }
+    if (record.status === 'running') return [registered]
+    return [registered, {
+      v: 2, kind: 'settled', id: record.id, status: 'idle',
+      stopReason: record.stopReason ?? 'end_turn', endedAt: record.endedAt ?? record.startedAt,
+      turns: record.turns, totalTokens: record.totalTokens, model: record.model,
+      thinkingLevel: record.thinkingLevel,
+      ...(record.sessionFile !== undefined ? { sessionFile: record.sessionFile } : {}),
+      ...(record.result !== undefined ? { result: record.result } : {}),
+    }]
   }
 
   /** 全链路驱动：种子 → 恢复 service（orphan 覆写）→ rebuildIndexes（现行 boot

package/src/__tests__/entry-anchor.test.ts

@@ -32,14 +32,26 @@ function recordLine(
   entryId: string,
   saId: string,
   sessionRef: Record<string, string>,
-  v = 1,
+  v = 2,
 ): string {
+  // 登记 §3.3：v1 全量快照形态已删——锚源 = v2 终态条（settled 携带 engine/engineHandle）。
   return JSON.stringify({
     type: 'custom',
     customType: 'subagent-record',
     id: entryId,
     parentId: null,
-    data: { v, id: saId, engine: 'zcode', engineHandle: { sessionRef, poolKey: 'shared' } },
+    data: {
+      v,
+      kind: 'settled',
+      id: saId,
+      status: 'idle',
+      stopReason: 'completed',
+      endedAt: 2,
+      turns: 1,
+      totalTokens: 1,
+      engine: 'zcode',
+      engineHandle: { sessionRef, poolKey: 'shared' },
+    },
   })
 }
 
@@ -208,7 +220,7 @@ describe('形状校验窄而严：缺键条目不算命中，继续找更早条
     expect(await findZcodeEntryAnchor([file], 'sa-1')).toBeUndefined()
   })
 
-  it('data.v 为认识的 v1/v2 之外的版本（future-v，如 3）不算命中，更早 v=1 条目仍可命中', async () => {
+  it('data.v 非当前版本（future-v，如 3）不算命中，更早 v=2 条目仍可命中', async () => {
     const file = writeMainSession('main.jsonl', [
       JSON.stringify({ type: 'session', id: 'main-1' }),
       recordLine('e1', 'sa-1', { sessionId: 'sess-A', dbPath: DB_PATH }),
@@ -251,22 +263,22 @@ describe('v2 终态条锚定：kind="settled" + engineHandle.sessionRef 双键',
     expect(await findZcodeEntryAnchor([file], 'sa-1')).toBeUndefined()
   })
 
-  it('v1 快照条（早）+ v2 终态条（晚）→ 末条 v2 胜（末条锚定跨版本一致）', async () => {
+  it('同 id 两条 v2 终态条（早/晚）→ 末条胜（末条锚定语义）', async () => {
     const file = writeMainSession('main.jsonl', [
       JSON.stringify({ type: 'session', id: 'main-1' }),
-      recordLine('e1', 'sa-1', { sessionId: 'sess-V1OLD', dbPath: DB_PATH }),
+      recordLine('e1', 'sa-1', { sessionId: 'sess-OLD', dbPath: DB_PATH }),
       v2SettledLine('e2', 'sa-1', {
         engine: 'zcode',
-        sessionRef: { sessionId: 'sess-V2NEW', dbPath: DB_PATH },
+        sessionRef: { sessionId: 'sess-NEW', dbPath: DB_PATH },
       }),
     ])
 
     const anchor = await findZcodeEntryAnchor([file], 'sa-1')
-    expect(anchor?.sessionId).toBe('sess-V2NEW')
-    expect(anchor?.sessionId).not.toBe('sess-V1OLD')
+    expect(anchor?.sessionId).toBe('sess-NEW')
+    expect(anchor?.sessionId).not.toBe('sess-OLD')
   })
 
-  it('v2 终态条锚残缺（缺 engineHandle）→ 不命中，更早 v1 完整条目仍可命中（缺键不遮蔽）', async () => {
+  it('v2 终态条锚残缺（缺 engineHandle）→ 不命中，更早完整条目仍可命中（缺键不遮蔽）', async () => {
     const file = writeMainSession('main.jsonl', [
       JSON.stringify({ type: 'session', id: 'main-1' }),
       recordLine('e1', 'sa-1', { sessionId: 'sess-EARLY', dbPath: DB_PATH }),

package/src/__tests__/execution-tree.test.ts

@@ -114,42 +114,45 @@ async function writeRecordManifest(
   await writeFile(join(recordsDir, `${id}.json`), JSON.stringify({ id, ...fields }))
 }
 
-/** 写 wf-state 文件（NEW 格式 v=wf-run-v1，calls[].sessionFile）。返回绝对路径。 */
-async function writeWfState(
+/** [ADR-0095] v2 单档 fixture：写 record 流（agent-settled 帧提 calls）并向 session 文件
+ *  追加 v2 注册条目——替代已删除的 wf-state 快照 + workflow-state-link 组合。 */
+async function writeWfV2Run(
   dir: string,
-  slug: string,
+  cwdSlug: string,
+  sessionPath: string,
+  sessionId: string,
   runId: string,
   callSessionFiles: string[],
 ): Promise<string> {
-  const wfDir = join(dir, 'sessions', slug, 'workflow-state')
+  const wfDir = join(dir, 'sessions', cwdSlug, 'workflow-state')
   await mkdir(wfDir, { recursive: true })
-  const path = join(wfDir, `${runId}.jsonl`)
-  const snap = JSON.stringify({
-    v: 'wf-run-v1',
-    runId,
-    state: {
-      status: 'done',
-      calls: callSessionFiles.map((sf, i) => ({ id: i, status: 'done', sessionFile: sf })),
-    },
-  })
-  await writeFile(path, snap + '\n')
-  return path
-}
-
-/** 向 session 文件追加 workflow-state-link custom entry。 */
-async function writeWfLink(
-  sessionPath: string,
-  sessionId: string,
-  link: { runId: string; path: string },
-): Promise<void> {
+  const recordPath = join(wfDir, `${runId}.record.jsonl`)
+  const lines = [
+    JSON.stringify({ type: 'run-created', seq: 1, ts: 1758000000000, runId, workflowName: 'tree-flow', argsSummary: '{}' }),
+    ...callSessionFiles.map((sf, i) =>
+      JSON.stringify({ type: 'agent-settled', seq: 2 + i, ts: 1758000001000 + i, taskIndex: i, attempt: 1, outcome: 'done', durationMs: 100, result: { content: 'ok', sessionFile: sf } }),
+    ),
+  ]
+  await writeFile(recordPath, lines.join('\n') + '\n')
   const line = JSON.stringify({
     type: 'custom',
-    id: `wf-link-${link.runId}`,
+    id: `wf-reg-${runId}`,
     parentId: sessionId,
-    customType: 'workflow-state-link',
-    data: { runId: link.runId, path: link.path, updatedAt: '2026-08-07T16:48:24.933Z' },
+    customType: 'workflow-record',
+    data: {
+      v: 2,
+      kind: 'registered',
+      runId,
+      workflowName: 'tree-flow',
+      scriptName: 'tree-flow',
+      slug: 'tree',
+      startedAt: 1758000000000,
+      recordPath,
+    },
+    timestamp: '2026-09-28T00:00:00Z',
   })
   await writeFile(sessionPath, line + '\n', { flag: 'a' })
+  return recordPath
 }
 
 /** 在节点树里按 type+sessionId 查找节点（DFS）。 */
@@ -207,7 +210,7 @@ describe('buildExecutionTree - fixture', () => {
       status: 'completed',
       parentRecordId: recAId,
     })
-    // workflow-call B：A 的 sessionFile 的 workflow-state-link → wf-state → calls[].sessionFile = SB
+    // workflow-call B：A 的 sessionFile 的 v2 注册条目 → record 流 → calls[].sessionFile = SB
     const sbB = join(
       dir,
       'subagents',
@@ -218,8 +221,7 @@ describe('buildExecutionTree - fixture', () => {
     // B call session 文件需存在（resolveWorkflows 读 call sessionFile；这里只需路径，不读内容建树）
     await mkdir(join(dir, 'subagents', '--main-cwd--', 'sessions'), { recursive: true })
     await writeFile(sbB, JSON.stringify({ type: 'session', id: B_REAL, cwd: '/proj/wf' }) + '\n')
-    const wfPath = await writeWfState(dir, '--main-cwd--', RUN_A, [sbB])
-    await writeWfLink(saA, A_REAL, { runId: RUN_A, path: wfPath })
+    await writeWfV2Run(dir, '--main-cwd--', saA, A_REAL, RUN_A, [sbB])
 
     const tree = await buildExecutionTree(MAIN, dir)
 
@@ -311,10 +313,8 @@ describe('buildExecutionTree - fixture', () => {
       agentName: 'explorer',
       sessionFile: saB,
     })
-    const wfA = await writeWfState(dir, '--main-cwd--', RUN_A, [saB])
-    const wfB = await writeWfState(dir, '--main-cwd--', RUN_B, [saA])
-    await writeWfLink(saA, A_REAL, { runId: RUN_A, path: wfA })
-    await writeWfLink(saB, B_REAL, { runId: RUN_B, path: wfB })
+    await writeWfV2Run(dir, '--main-cwd--', saA, A_REAL, RUN_A, [saB])
+    await writeWfV2Run(dir, '--main-cwd--', saB, B_REAL, RUN_B, [saA])
 
     const tree = await buildExecutionTree(MAIN, dir)
 
@@ -459,9 +459,8 @@ describe('buildExecutionTree - fixture', () => {
       status: 'completed',
       parentRecordId: recBId,
     })
-    // A 的 workflow-state-link → wf-state → calls[0].sessionFile = sbB
-    const wfPath = await writeWfState(dir, '--main-cwd--', RUN_A, [sbB])
-    await writeWfLink(saA, A_REAL, { runId: RUN_A, path: wfPath })
+    // A 的 v2 注册条目 → record 流 → calls[0].sessionFile = sbB
+    await writeWfV2Run(dir, '--main-cwd--', saA, A_REAL, RUN_A, [sbB])
 
     const tree = await buildExecutionTree(MAIN, dir)
 
@@ -564,7 +563,7 @@ describe('buildExecutionTree - fixture', () => {
 
   it('TC-m3b-mf1-main-root：main root 填 sessionFile 后 main 自身发起的 workflow run 入树（MF-1）', async () => {
     const mainPath = await writeMainSession(dir, '--main-cwd--', MAIN)
-    // main 的 workflow-state-link → wf-state → call session B
+    // main 的 v2 注册条目 → record 流 → call session B
     const sbB = join(
       dir,
       'subagents',
@@ -574,12 +573,11 @@ describe('buildExecutionTree - fixture', () => {
     )
     await mkdir(join(dir, 'subagents', '--main-cwd--', 'sessions'), { recursive: true })
     await writeFile(sbB, JSON.stringify({ type: 'session', id: B_REAL, cwd: '/proj/wf' }) + '\n')
-    const wfPath = await writeWfState(dir, '--main-cwd--', RUN_A, [sbB])
-    await writeWfLink(mainPath, MAIN, { runId: RUN_A, path: wfPath })
+    await writeWfV2Run(dir, '--main-cwd--', mainPath, MAIN, RUN_A, [sbB])
 
     const tree = await buildExecutionTree(MAIN, dir, mainPath)
 
-    // main root 携带 sessionFile，workflow-state-link 被读取 → wf-call 子节点入树
+    // main root 携带 sessionFile，v2 注册条目被读取 → wf-call 子节点入树
     expect(tree.root.type).toBe('main')
     expect(tree.root.sessionFile).toBe(mainPath)
     const nodeB = findNode(tree.root, 'workflow-call', B_REAL)

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

@@ -7,8 +7,10 @@
 //   2. 重建窗口前后，session-reader identity 投影的输入字段集（rootSessionId/slug/
 //      task/agentName/model/status/sessionFile/parentRecordId）逐字段一致——双写过渡
 //      字段（executionStatus）在场且不被本包消费（旧 status 三态投影继续生效）；
-//   3. 重建源 = `.state` 权威（closedReason 从终态位派生，旧三态 cancelled 形态
-//      保真——buildRecord 分支 1 → derivedManifestRecord 派生）。
+//   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；不触碰真实数据目录（红线）。
@@ -143,13 +145,15 @@ describe('跨包集成：subagent-core rebuildIndexes 重建 manifest → sessio
     // ── session-reader 视角：重建后 identity 投影不降级 ──
     const after = (await listRecordManifests(agentDir)).find((m) => m.id === 'sa-dw')
     expect(after).toBeDefined()
-    expect(identityView(after!)).toEqual(viewBefore)
+    // 字段集保真（身份/富字段逐字段一致）；仅 legacy status 按 ③ 后重建语义如实
+    // 投影 running（终态权威 = 事件流 record-settled 帧，磁盘重建无 closedReason 载体）。
+    expect(identityView(after!)).toEqual({ ...viewBefore, status: 'running' })
 
-    // 重建源 = `.state` 权威：closedReason 从终态位派生回 manifest（旧三态 closed）
     const rawAfter = JSON.parse(fs.readFileSync(path.join(recordsDir, 'sa-dw.json'), 'utf-8')) as Record<string, unknown>
-    expect(rawAfter.status).toBe('closed')
+    expect(rawAfter.status).toBe('running')
     expect(rawAfter.executionStatus).toBe('idle')
-    expect(rawAfter.closedReason).toBe('gc')
+    // closedReason 无重建载体（`.state` 退场）→ 如实缺席。
+    expect(rawAfter.closedReason).toBeUndefined()
   })
 
   it('惰性通道：查询面（collectRecords）补建的 manifest 同样可被本包读取投影', async () => {

package/src/__tests__/subagents.test.ts

@@ -103,34 +103,6 @@ async function writeAliveSubagentNoIdentity(
   return path
 }
 
-/** 写 wf-state 文件（每行一个快照；字符串按原样写入，可注入坏行）。返回绝对路径。 */
-async function writeWfState(dir: string, slug: string, lines: string[]): Promise<string> {
-  const wfDir = join(dir, 'sessions', slug, 'workflow-state')
-  await mkdir(wfDir, { recursive: true })
-  const path = join(wfDir, 'wf-test.jsonl')
-  await writeFile(path, lines.join('\n') + '\n')
-  return path
-}
-
-/** 向主 session 文件追加 workflow-state-link custom entry（resolveWorkflows 的输入）。 */
-async function writeWfLink(
-  dir: string,
-  slug: string,
-  id: string,
-  link: { runId: string; path: string },
-): Promise<void> {
-  const sessionPath = join(dir, 'sessions', slug, `${id}.jsonl`)
-  const line = JSON.stringify({
-    type: 'custom',
-    id: `wf-link-${link.runId}`,
-    parentId: id,
-    customType: 'workflow-state-link',
-    data: { runId: link.runId, path: link.path, updatedAt: '2026-08-07T16:48:24.933Z' },
-    timestamp: '2026-08-07T16:48:24.933Z',
-  })
-  await writeFile(sessionPath, line + '\n', { flag: 'a' })
-}
-
 /** 写 records manifest（孤儿源）。U4 扩展：fields 支持富字段 task/slug/model/status。 */
 async function writeRecordManifest(
   dir: string,
@@ -256,14 +228,14 @@ describe('buildFamilyFromFs - fixture', () => {
     await expect(buildFamilyFromFs('nonexistent-session-id', dir)).rejects.toThrow(/not found/)
   })
 
-  it('workflows：NEW 格式（v=wf-run-v1）state.calls 解析；命中 pathToRef 取完整 ref，GC\'d 路径回退最小 ref', async () => {
+  it('workflows：v2 注册条目 record 流直读提 calls；命中 pathToRef 取完整 ref，GC\'d 路径回退最小 ref', async () => {
     await writeMainSession(dir, '--root-cwd--', ROOT, { cwd: '/proj/root' })
     // 真实存在的 subagent（步骤 2 扫到 → pathToRef 命中 → 完整 SessionRef）
     const subPath = await writeSubagentSession(dir, '--root-cwd--', SUB_REAL, {
       rootSessionId: ROOT,
       slug: 'wf-sub',
     })
-    // GC\'d 路径（文件不存在 → pathToRef 未命中 → sessionRefFromPath 最小 ref）
+    // GC'd 路径（文件不存在 → pathToRef 未命中 → sessionRefFromPath 最小 ref）
     const gced = join(
       dir,
       'subagents',
@@ -271,27 +243,43 @@ describe('buildFamilyFromFs - fixture', () => {
       'sessions',
       '2026-08-07T16-49-48-393Z_019fdd21-8169-7a02-8f11-eef6c9ca11cc.jsonl',
     )
-    const wfPath = await writeWfState(dir, '--root-cwd--', [
-      JSON.stringify({
-        v: 'wf-run-v1',
-        runId: 'wf-1786121304924-r7vgov',
-        state: {
-          status: 'done',
-          calls: [
-            { id: 0, status: 'done', sessionFile: subPath, sessionId: 'sa-x' },
-            { id: 1, status: 'done', result: { sessionFile: gced, durationMs: 1 } },
-          ],
-        },
-      }),
-    ])
-    await writeWfLink(dir, '--root-cwd--', ROOT, { runId: 'wf-1786121304924-r7vgov', path: wfPath })
+    // record 流：agent-settled 帧携带 result.sessionFile（两 call：命中 + GC 各一）
+    const wfDir = join(dir, 'sessions', '--root-cwd--', 'workflow-state')
+    await mkdir(wfDir, { recursive: true })
+    const recordPath = join(wfDir, 'wf-v2-rich.record.jsonl')
+    await writeFile(
+      recordPath,
+      [
+        JSON.stringify({ type: 'run-created', seq: 1, ts: 1000, runId: 'wf-v2-rich', workflowName: 'rich', argsSummary: '{}' }),
+        JSON.stringify({ type: 'agent-settled', seq: 2, ts: 1100, taskIndex: 0, attempt: 1, outcome: 'done', durationMs: 1, result: { content: 'ok', sessionFile: subPath } }),
+        JSON.stringify({ type: 'agent-settled', seq: 3, ts: 1200, taskIndex: 1, attempt: 1, outcome: 'done', durationMs: 1, result: { content: 'ok', sessionFile: gced } }),
+      ].join('\n') + '\n',
+    )
+    const line = JSON.stringify({
+      type: 'custom',
+      id: 'wf-record-wf-v2-rich',
+      parentId: ROOT,
+      customType: 'workflow-record',
+      data: {
+        v: 2,
+        kind: 'registered',
+        runId: 'wf-v2-rich',
+        workflowName: 'rich',
+        scriptName: 'rich',
+        slug: 'rich',
+        startedAt: 1,
+        recordPath,
+      },
+      timestamp: '2026-08-07T16:48:24.933Z',
+    })
+    await writeFile(join(dir, 'sessions', '--root-cwd--', `${ROOT}.jsonl`), line + '\n', { flag: 'a' })
 
     const family = await buildFamilyFromFs(ROOT, dir)
 
     expect(family.workflows).toHaveLength(1)
     const wf = family.workflows[0]
-    expect(wf.runId).toBe('wf-1786121304924-r7vgov')
-    expect(wf.stateFile).toBe(wfPath)
+    expect(wf.runId).toBe('wf-v2-rich')
+    expect(wf.stateFile).toBe(recordPath)
     expect(wf.calls).toHaveLength(2)
     // 命中 pathToRef：完整 ref（真实 id / mtime / size / cwd）
     expect(wf.calls[0].fileName).toBe(subPath)
@@ -299,7 +287,7 @@ describe('buildFamilyFromFs - fixture', () => {
     expect(wf.calls[0].mtime).toBeGreaterThan(0)
     expect(wf.calls[0].sizeBytes).toBeGreaterThan(0)
     expect(wf.calls[0].cwd).toBe('/proj/--root-cwd--')
-    // GC\'d 未命中：fileName-only 最小 ref（sessionId 从文件名提取，mtime/size/cwd 占位）
+    // GC'd 未命中：fileName-only 最小 ref（sessionId 从文件名提取，mtime/size/cwd 占位）
     expect(wf.calls[1].fileName).toBe(gced)
     expect(wf.calls[1].sessionId).toBe('019fdd21-8169-7a02-8f11-eef6c9ca11cc')
     expect(wf.calls[1].mtime).toBe(0)
@@ -307,83 +295,6 @@ describe('buildFamilyFromFs - fixture', () => {
     expect(wf.calls[1].cwd).toBe('')
   })
 
-  it('workflows：NEW 格式坏尾行回退上一快照；顶层 sessionFile 优先于 result.sessionFile', async () => {
-    await writeMainSession(dir, '--root-cwd--', ROOT, { cwd: '/proj/root' })
-    const topLevel = join(
-      dir,
-      'subagents',
-      '--root-cwd--',
-      'sessions',
-      '2026-08-01T00-00-00-000Z_019fdd11-1111-1111-1111-111111111111.jsonl',
-    )
-    const inResult = join(
-      dir,
-      'subagents',
-      '--root-cwd--',
-      'sessions',
-      '2026-08-02T00-00-00-000Z_019fdd22-2222-2222-2222-222222222222.jsonl',
-    )
-    const snap = JSON.stringify({
-      v: 'wf-run-v1',
-      runId: 'wf-x',
-      state: { calls: [{ id: 0, sessionFile: topLevel, result: { sessionFile: inResult } }] },
-    })
-    // 尾行坏 JSON → readWorkflowCallSessionFiles 从尾向头回退到上一有效快照
-    const wfPath = await writeWfState(dir, '--root-cwd--', [snap, '{broken json'])
-    await writeWfLink(dir, '--root-cwd--', ROOT, { runId: 'wf-x', path: wfPath })
-
-    const family = await buildFamilyFromFs(ROOT, dir)
-
-    expect(family.workflows).toHaveLength(1)
-    expect(family.workflows[0].calls).toHaveLength(1)
-    // 顶层 sessionFile 优先（result.sessionFile 不覆盖）
-    expect(family.workflows[0].calls[0].fileName).toBe(topLevel)
-  })
-
-  it('workflows：OLD 格式（无 v）callCache [{key,value}] → value.sessionFile + value.result.sessionFile 回退；无 sessionFile 的 call 不产出', async () => {
-    await writeMainSession(dir, '--root-cwd--', ROOT, { cwd: '/proj/root' })
-    const viaValue = join(
-      dir,
-      'subagents',
-      '--root-cwd--',
-      'sessions',
-      '2026-08-03T00-00-00-000Z_019fdd33-3333-3333-3333-333333333333.jsonl',
-    )
-    const viaResult = join(
-      dir,
-      'subagents',
-      '--root-cwd--',
-      'sessions',
-      '2026-08-04T00-00-00-000Z_019fdd44-4444-4444-4444-444444444444.jsonl',
-    )
-    const wfPath = await writeWfState(dir, '--root-cwd--', [
-      JSON.stringify({
-        runId: 'wf-old-1',
-        name: 'old-wf',
-        status: 'done',
-        callCache: [
-          // 真实 OLD 数据形态：value 无 sessionFile（旧 pi 不持久化）→ 不产出
-          { key: 1, value: { content: 'PASS', durationMs: 100 } },
-          // value.sessionFile（源码注释 OLD 分支读取点）
-          { key: 2, value: { sessionFile: viaValue, content: 'ok' } },
-          // value.result.sessionFile 回退
-          { key: 3, value: { result: { sessionFile: viaResult, durationMs: 1 } } },
-          // value 非对象 → 整项兜底（无 sessionFile → 不产出）
-          { key: 4, value: 'str' },
-        ],
-      }),
-    ])
-    await writeWfLink(dir, '--root-cwd--', ROOT, { runId: 'wf-old-1', path: wfPath })
-
-    const family = await buildFamilyFromFs(ROOT, dir)
-
-    expect(family.workflows).toHaveLength(1)
-    expect(family.workflows[0].calls.map((c) => c.fileName)).toEqual([viaValue, viaResult])
-    // 未命中 pathToRef → 最小 ref：sessionId 从文件名提取，mtime 占位 0
-    expect(family.workflows[0].calls[0].sessionId).toBe('019fdd33-3333-3333-3333-333333333333')
-    expect(family.workflows[0].calls[0].mtime).toBe(0)
-  })
-
   it('MF-3 回归：alive 但无 identity 的 subagent（运行中）不被收编为 cleanedUp——U4 后 manifest 主路径建族', async () => {
     await writeMainSession(dir, '--root-cwd--', ROOT, { cwd: '/proj/root' })
     // 运行中 subagent：有效 header、无 identity 尾行（identity 完成时才写入），manifest 已存在
@@ -416,66 +327,6 @@ describe('buildFamilyFromFs - fixture', () => {
   })
 })
 
-// ============================================================
-// family workflows 富 run（多 call）契约（fixture）
-// ============================================================
-
-describe('buildFamilyFromFs - workflow 富 run（多 call）', () => {
-  let dir: string
-
-  beforeEach(async () => {
-    dir = await makeAgentDir()
-  })
-  afterEach(async () => {
-    await rm(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 })
-  })
-
-  it('workflows 非空，多 call（4 个）workflow 的 fileName/stateFile/runId 契约', async () => {
-    await writeMainSession(dir, '--root-cwd--', ROOT, { cwd: '/proj/root' })
-    // 1 个存活 subagent（pathToRef 命中 → 完整 ref）+ 3 个 GC 路径（未命中 → 最小 ref，
-    // fileName 仍非空——calls 的 sessionFile 路径恒落入 fileName）
-    const subPath = await writeSubagentSession(dir, '--root-cwd--', SUB_REAL, {
-      rootSessionId: ROOT,
-      slug: 'wf-rich',
-    })
-    const ghost = (n: number): string =>
-      join(
-        dir,
-        'subagents',
-        '--root-cwd--',
-        'sessions',
-        `2026-08-0${n}T00-00-00-000Z_019fdd55-1111-1111-1111-11111111111${n}.jsonl`,
-      )
-    const wfPath = await writeWfState(dir, '--root-cwd--', [
-      JSON.stringify({
-        v: 'wf-run-v1',
-        runId: 'wf-rich-run-1',
-        state: {
-          status: 'done',
-          calls: [
-            { id: 0, status: 'done', sessionFile: subPath, sessionId: SUB_REAL },
-            { id: 1, status: 'done', sessionFile: ghost(1) },
-            { id: 2, status: 'done', sessionFile: ghost(2) },
-            { id: 3, status: 'done', sessionFile: ghost(3) },
-          ],
-        },
-      }),
-    ])
-    await writeWfLink(dir, '--root-cwd--', ROOT, { runId: 'wf-rich-run-1', path: wfPath })
-
-    const family = await buildFamilyFromFs(ROOT, dir)
-
-    expect(family.workflows.length).toBeGreaterThan(0)
-    const rich = family.workflows.find((w) => w.calls.length >= 4)
-    expect(rich).toBeDefined()
-    // calls 的 sessionFile 路径已落入 fileName（sessionRefFromPath）
-    expect(rich!.calls.every((c) => c.fileName.length > 0)).toBe(true)
-    // stateFile 是 wf-state 文件绝对路径
-    expect(rich!.stateFile.endsWith('.jsonl')).toBe(true)
-    expect(rich!.runId.startsWith('wf-')).toBe(true)
-  })
-})
-
 // ============================================================
 // w2 TC1：listRecordManifests + RecordManifest 导出（IF2/DM2，行为零变更验证）
 // ============================================================
@@ -662,7 +513,7 @@ describe('U4 buildFamilyFromFs 富化（manifest 主 / P-fallback）', () => {
 // ① 结构性忽略——subagents 树扫描只收 .jsonl，.events 天然不进候选集（D3「无后缀
 //    的结构性收益」：被忽略或被误读两类风险一次排空）；
 // ② 首行头行读者兼容——.events 首行是自描述头行 {"type":"record-journal","id":...}
-//    （写侧 record-events.ts toRecordJournalHeader 契约），session-reader 对未知文件
+//    （写侧 record-events.ts toRecordEventHeader 契约），session-reader 对未知文件
 //    读首行判 header 时命中非 session header 即忽略（检查点④：零成本兼容——不改
 //    扫描器即可与该文件族共存）。