@zhushanwen/pi-session-reader 0.8.1 → 0.9.1

package/src/__tests__/tool-handler.test.ts

@@ -1570,66 +1570,6 @@ async function wfStateFile(
   return path
 }
 
-/** 向 main session 追加 workflow-state-link custom entry（resolveWorkflows 的输入）。 */
-async function wfLink(
-  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-12T00:00:00Z' },
-    timestamp: '2026-08-12T00:00:00Z',
-  })
-  await writeFile(sessionPath, line + '\n', { flag: 'a' })
-}
-
-/** 构造 NEW 格式 wf-state 快照 JSON 行（calls 含 sessionId/sessionFile，parseRunSnapshot 透传）。 */
-function wfSnapshotNew(
-  runId: string,
-  calls: Array<{ sessionId: string; sessionFile: string; description?: string }>,
-): string {
-  return JSON.stringify({
-    v: 'wf-run-v1',
-    runId,
-    spec: { scriptName: 'test-wf', name: 'Test' },
-    state: {
-      status: 'done',
-      reason: 'completed',
-      budget: {
-        usedTokens: 100,
-        usedCost: 0,
-        totalCallCount: calls.length,
-        maxTokens: 10000,
-      },
-      calls: calls.map((c, i) => ({
-        id: i,
-        opts: {
-          prompt: 'do work',
-          model: 'test-model',
-          description: c.description ?? `step-${i}`,
-        },
-        status: 'done',
-        attempts: 1,
-        result: {
-          content: 'ok',
-          durationMs: 100,
-          sessionId: c.sessionId,
-          sessionFile: c.sessionFile,
-        },
-        sessionId: c.sessionId,
-        sessionFile: c.sessionFile,
-      })),
-    },
-    meta: { startedAt: '2026-01-01T00:00:00Z', completedAt: '2026-01-01T00:01:00Z' },
-  })
-}
-
 describe('doWorkflow（w6，fixture）', () => {
   let dir: string
 
@@ -1640,9 +1580,9 @@ describe('doWorkflow（w6，fixture）', () => {
     await rm(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 })
   })
 
-  // ---- [D16③] v2 record 流档概览（journalPath 锚点 = record 流路径）----
+  // ---- [D16③] v2 record 流档概览（recordPath 锚点 = record 流路径）----
 
-  /** 向 main session 追加 workflow-record v2 注册条目行（journalPath 锚点指向 record 流）。 */
+  /** 向 main session 追加 workflow-record v2 注册条目行（recordPath 锚点指向 record 流）。 */
   async function wfV2Registered(
     dir: string,
     slug: string,
@@ -1656,12 +1596,36 @@ describe('doWorkflow（w6，fixture）', () => {
       id: `wf-reg-${runId}`,
       parentId: id,
       customType: 'workflow-record',
-      data: { v: 2, kind: 'registered', runId, workflowName: 'rec-flow', scriptName: 'rec-flow', slug: 'rec-flow', startedAt: 1758000000000, journalPath: recordPath },
+      data: { v: 2, kind: 'registered', runId, workflowName: 'rec-flow', scriptName: 'rec-flow', slug: 'rec-flow', startedAt: 1758000000000, recordPath: recordPath },
       timestamp: '2026-09-28T00:00:00Z',
     })
     await writeFile(sessionPath, line + '\n', { flag: 'a' })
   }
 
+  /** 构造 v2 record 流文件（run-created + agent-settled[+终局] 帧提 calls）并写注册条目——
+   *  [ADR-0095] v1 读面删除后的单档 fixture 形态（替代 wf-state 快照 + link 指针）。 */
+  async function wfV2Run(
+    dir: string,
+    slug: string,
+    id: string,
+    runId: string,
+    calls: Array<{ sessionId: string; sessionFile: string }>,
+    opts: { settled?: boolean } = {},
+  ): Promise<string> {
+    const lines = [
+      JSON.stringify({ type: 'run-created', seq: 1, ts: 1758000000000, runId, workflowName: 'test-wf', argsSummary: '{}' }),
+      ...calls.map((c, i) =>
+        JSON.stringify({ type: 'agent-settled', seq: 2 + i, ts: 1758000001000 + i, taskIndex: i, attempt: 1, outcome: 'done', durationMs: 100, result: { content: 'ok', sessionId: c.sessionId, sessionFile: c.sessionFile } }),
+      ),
+    ]
+    if (opts.settled) {
+      lines.push(JSON.stringify({ type: 'run-settled', seq: 2 + calls.length, ts: 1758000002000, outcome: 'done' }))
+    }
+    const recordPath = await wfStateFile(dir, slug, `${runId}.record.jsonl`, lines)
+    await wfV2Registered(dir, slug, id, runId, recordPath)
+    return recordPath
+  }
+
   it('[D16③] v2 档 record 流概览：注册条目锚点直读流——steps 提 sessionFile、status 三态、不进 skippedRuns（活跃 run 红线）', async () => {
     const slug = '--wf-record--'
     await wfMainSession(dir, slug, WF_ROOT)
@@ -1726,12 +1690,9 @@ describe('doWorkflow（w6，fixture）', () => {
     const slug = '--wf-single--'
     await wfMainSession(dir, slug, WF_ROOT)
     const callSession = join(dir, 'sessions', slug, `${WF_CALL}.jsonl`)
-    const wfPath = await wfStateFile(dir, slug, 'wf-single.jsonl', [
-      wfSnapshotNew('wf-single-1', [
-        { sessionId: WF_CALL, sessionFile: callSession, description: 'probe-step' },
-      ]),
-    ])
-    await wfLink(dir, slug, WF_ROOT, { runId: 'wf-single-1', path: wfPath })
+    await wfV2Run(dir, slug, WF_ROOT, 'wf-single-1', [
+      { sessionId: WF_CALL, sessionFile: callSession },
+    ], { settled: true })
 
     const r = await handleSessionRead({ action: 'workflow', session: WF_ROOT }, { agentDir: dir })
     const d = r.details as {
@@ -1762,14 +1723,8 @@ describe('doWorkflow（w6，fixture）', () => {
   it('TC-w6-multi-run：多 run 拼接，content 含两段 overview，runs.length===2', async () => {
     const slug = '--wf-multi--'
     await wfMainSession(dir, slug, WF_ROOT)
-    const wf1 = await wfStateFile(dir, slug, 'wf-1.jsonl', [
-      wfSnapshotNew('wf-multi-1', [{ sessionId: WF_CALL, sessionFile: '/abs/a.jsonl' }]),
-    ])
-    const wf2 = await wfStateFile(dir, slug, 'wf-2.jsonl', [
-      wfSnapshotNew('wf-multi-2', [{ sessionId: WF_CALL, sessionFile: '/abs/b.jsonl' }]),
-    ])
-    await wfLink(dir, slug, WF_ROOT, { runId: 'wf-multi-1', path: wf1 })
-    await wfLink(dir, slug, WF_ROOT, { runId: 'wf-multi-2', path: wf2 })
+    await wfV2Run(dir, slug, WF_ROOT, 'wf-multi-1', [{ sessionId: WF_CALL, sessionFile: '/abs/a.jsonl' }], { settled: true })
+    await wfV2Run(dir, slug, WF_ROOT, 'wf-multi-2', [{ sessionId: WF_CALL, sessionFile: '/abs/b.jsonl' }], { settled: true })
 
     const r = await handleSessionRead({ action: 'workflow', session: WF_ROOT }, { agentDir: dir })
     const d = r.details as { runs: Array<{ runId: string }>; runIds: string[] }
@@ -1785,14 +1740,8 @@ describe('doWorkflow（w6，fixture）', () => {
   it('TC-w6-runid-filter：runId 过滤命中单 run', async () => {
     const slug = '--wf-filter--'
     await wfMainSession(dir, slug, WF_ROOT)
-    const wf1 = await wfStateFile(dir, slug, 'wf-1.jsonl', [
-      wfSnapshotNew('wf-filter-1', [{ sessionId: WF_CALL, sessionFile: '/abs/a.jsonl' }]),
-    ])
-    const wf2 = await wfStateFile(dir, slug, 'wf-2.jsonl', [
-      wfSnapshotNew('wf-filter-2', [{ sessionId: WF_CALL, sessionFile: '/abs/b.jsonl' }]),
-    ])
-    await wfLink(dir, slug, WF_ROOT, { runId: 'wf-filter-1', path: wf1 })
-    await wfLink(dir, slug, WF_ROOT, { runId: 'wf-filter-2', path: wf2 })
+    await wfV2Run(dir, slug, WF_ROOT, 'wf-filter-1', [{ sessionId: WF_CALL, sessionFile: '/abs/a.jsonl' }], { settled: true })
+    await wfV2Run(dir, slug, WF_ROOT, 'wf-filter-2', [{ sessionId: WF_CALL, sessionFile: '/abs/b.jsonl' }], { settled: true })
 
     const r = await handleSessionRead(
       { action: 'workflow', session: WF_ROOT, runId: 'wf-filter-1' },
@@ -1814,14 +1763,8 @@ describe('doWorkflow（w6，fixture）', () => {
   it('TC-w6-runid-not-found：runId 无匹配→ES-wf-runid-not-found（列候选+👉，不抛错）', async () => {
     const slug = '--wf-notfound--'
     await wfMainSession(dir, slug, WF_ROOT)
-    const wf1 = await wfStateFile(dir, slug, 'wf-1.jsonl', [
-      wfSnapshotNew('wf-nf-1', [{ sessionId: WF_CALL, sessionFile: '/abs/a.jsonl' }]),
-    ])
-    const wf2 = await wfStateFile(dir, slug, 'wf-2.jsonl', [
-      wfSnapshotNew('wf-nf-2', [{ sessionId: WF_CALL, sessionFile: '/abs/b.jsonl' }]),
-    ])
-    await wfLink(dir, slug, WF_ROOT, { runId: 'wf-nf-1', path: wf1 })
-    await wfLink(dir, slug, WF_ROOT, { runId: 'wf-nf-2', path: wf2 })
+    await wfV2Run(dir, slug, WF_ROOT, 'wf-nf-1', [{ sessionId: WF_CALL, sessionFile: '/abs/a.jsonl' }], { settled: true })
+    await wfV2Run(dir, slug, WF_ROOT, 'wf-nf-2', [{ sessionId: WF_CALL, sessionFile: '/abs/b.jsonl' }], { settled: true })
 
     const r = await handleSessionRead(
       { action: 'workflow', session: WF_ROOT, runId: 'wf-nonexist' },
@@ -1855,45 +1798,16 @@ describe('doWorkflow（w6，fixture）', () => {
     expect(text).toContain('family')
   })
 
-  it('TC-w6-snapshot-skip：run1 wf-state 不存在→跳过，run2 正常（ES-wf-snapshot-read-fail）', async () => {
-    const slug = '--wf-skip--'
-    await wfMainSession(dir, slug, WF_ROOT)
-    // run1 的 wf-state 文件不存在（link 指向不存在路径，模拟 GC）
-    const ghostPath = join(dir, 'sessions', slug, 'workflow-state', 'wf-ghost.jsonl')
-    const wf2 = await wfStateFile(dir, slug, 'wf-2.jsonl', [
-      wfSnapshotNew('wf-skip-2', [{ sessionId: WF_CALL, sessionFile: '/abs/b.jsonl' }]),
-    ])
-    await wfLink(dir, slug, WF_ROOT, { runId: 'wf-skip-1', path: ghostPath })
-    await wfLink(dir, slug, WF_ROOT, { runId: 'wf-skip-2', path: wf2 })
-
-    const r = await handleSessionRead({ action: 'workflow', session: WF_ROOT }, { agentDir: dir })
-    const d = r.details as {
-      runs: Array<{ runId: string }>
-      runIds: string[]
-      skippedRuns?: Array<{ runId: string; stateFile: string; reason: string }>
-    }
-    expect(d.runs).toHaveLength(1)
-    expect(d.runs[0].runId).toBe('wf-skip-2')
-    expect(d.runIds).toEqual(['wf-skip-2'])
-    expect(d.skippedRuns).toBeDefined()
-    expect(d.skippedRuns).toHaveLength(1)
-    expect(d.skippedRuns![0].runId).toBe('wf-skip-1')
-    expect(d.skippedRuns![0].reason).toBe('snapshot-unreadable')
-    const text = r.content[0].text
-    expect(text).toContain('wf-skip-1')
-    expect(text).toContain('已跳过')
-    expect(text).toContain('run: wf-skip-2')
-  })
+  // [ADR-0095] TC-w6-snapshot-skip（快照不可读 → skippedRuns）随 v1 读面删除：
+  // 发现链收敛 v2 后 run 一律 record 流直读（读失败 → running 兜底不 skipped），
+  // skippedRuns 快照链对 v2 档不可达。
 
   it('TC-w6-call-jump：workflow 概览 call sessionId 可被 resolveSessionId 深读（outline 跳转，§7 场景 2）', async () => {
     const slug = '--wf-jump--'
     await wfMainSession(dir, slug, WF_ROOT)
     // 真实存在的 call session（main session 形态，findSessions 可匹配）
     const callPath = await wfMainSession(dir, slug, WF_CALL, { cwd: '/proj/call' })
-    const wfPath = await wfStateFile(dir, slug, 'wf-jump.jsonl', [
-      wfSnapshotNew('wf-jump-1', [{ sessionId: WF_CALL, sessionFile: callPath }]),
-    ])
-    await wfLink(dir, slug, WF_ROOT, { runId: 'wf-jump-1', path: wfPath })
+    await wfV2Run(dir, slug, WF_ROOT, 'wf-jump-1', [{ sessionId: WF_CALL, sessionFile: callPath }], { settled: true })
 
     // 第一次：workflow 概览，拿 call sessionId
     const rWf = await handleSessionRead({ action: 'workflow', session: WF_ROOT }, { agentDir: dir })
@@ -1925,21 +1839,21 @@ describe('doWorkflow（w6，fixture）', () => {
       JSON.stringify({ type: 'session', id: SUB_WF_ROOT, cwd: `/proj/${slug}` }) + '\n',
     )
     const callSession = join(dir, 'sessions', slug, `${WF_CALL}.jsonl`)
-    const wfPath = await wfStateFile(dir, slug, 'wf-sub.jsonl', [
-      wfSnapshotNew('wf-sub-1', [
-        { sessionId: WF_CALL, sessionFile: callSession, description: 'sub-step' },
-      ]),
+    // subagent session 的 v2 注册条目（[ADR-0095] v1 link 形态删除；record 流直读同源）
+    const recordPath = await wfStateFile(dir, slug, 'wf-sub-1.record.jsonl', [
+      JSON.stringify({ type: 'run-created', seq: 1, ts: 1758000000000, runId: 'wf-sub-1', workflowName: 'test-wf', argsSummary: '{}' }),
+      JSON.stringify({ type: 'agent-settled', seq: 2, ts: 1758000001000, taskIndex: 0, attempt: 1, outcome: 'done', durationMs: 100, result: { content: 'ok', sessionId: WF_CALL, sessionFile: callSession } }),
+      JSON.stringify({ type: 'run-settled', seq: 3, ts: 1758000002000, outcome: 'done' }),
     ])
-    // subagent session 的 workflow-state-link（wfLink helper 只写 sessions/，此处直接追加）
     await writeFile(
       subPath,
       JSON.stringify({
         type: 'custom',
-        id: 'wf-link-wf-sub-1',
+        id: 'wf-reg-wf-sub-1',
         parentId: SUB_WF_ROOT,
-        customType: 'workflow-state-link',
-        data: { runId: 'wf-sub-1', path: wfPath, updatedAt: '2026-08-12T00:00:00Z' },
-        timestamp: '2026-08-12T00:00:00Z',
+        customType: 'workflow-record',
+        data: { v: 2, kind: 'registered', runId: 'wf-sub-1', workflowName: 'test-wf', scriptName: 'test-wf', slug: 'wf-sub', startedAt: 1758000000000, recordPath },
+        timestamp: '2026-09-28T00:00:00Z',
       }) + '\n',
       { flag: 'a' },
     )

package/src/__tests__/workflow.test.ts

@@ -6,12 +6,10 @@ import { join } from 'node:path'
 import {
   WORKFLOW_RECORD_CUSTOM_TYPE,
   WORKFLOW_RECORD_ENTRY_VERSION,
-  WORKFLOW_STATE_LINK_CUSTOM_TYPE,
 } from '@zhushanwen/subagent-core'
 
 import { parseRunSnapshot, renderWorkflowOverview } from '../core/workflow.js'
 import {
-  extractCallSessionFiles,
   extractRecordStreamSessionFiles,
   readRunSnapshot,
   resolveWorkflows,
@@ -215,54 +213,6 @@ describe('parseRunSnapshot', () => {
   })
 })
 
-// ============================================================
-// extractCallSessionFiles（纯逻辑，family/workflows 腿的 sessionFile 提取入口）
-// ============================================================
-
-describe('extractCallSessionFiles', () => {
-  it('v2 快照（wf-run-v2）state.calls 的 sessionFile 能被读出，不因版本字面量挡读', () => {
-    const files = extractCallSessionFiles(V2_SNAPSHOT_FIXTURE)
-    // 顶层 sessionFile + result.sessionFile 回退，两个 call 都读出
-    expect(files).toEqual(['/abs/v2-call0.jsonl', '/abs/v2-call1.jsonl'])
-  })
-
-  it('v1 快照（wf-run-v1）行为不变：state.calls 提取', () => {
-    const files = extractCallSessionFiles(NEW_SNAPSHOT_FIXTURE)
-    expect(files).toEqual(['/abs/session.jsonl'])
-  })
-
-  it('OLD 快照（无 v，callCache）从 value 顶层与 value.result 提取 sessionFile', () => {
-    const files = extractCallSessionFiles({
-      callCache: [
-        { key: 0, value: { sessionFile: '/abs/old-call0.jsonl' } },
-        { key: 1, value: { result: { sessionFile: '/abs/old-call1.jsonl' } } },
-      ],
-    })
-    expect(files).toEqual(['/abs/old-call0.jsonl', '/abs/old-call1.jsonl'])
-  })
-
-  it('OLD 快照 value 无 sessionFile / value 非对象 → 跳过该 call，不产出路径', () => {
-    // 对齐 OLD_SNAPSHOT_FIXTURE 形状（旧 pi 不持久化 sessionFile）+ value 非对象脏数据回退 call 本身
-    const files = extractCallSessionFiles({
-      callCache: [
-        { key: 7, value: { content: '', usage: { input: 0 } } },
-        { key: 8, value: 42 },
-        { key: 9, sessionFile: '/abs/bare-call.jsonl' },
-      ],
-    })
-    expect(files).toEqual(['/abs/bare-call.jsonl'])
-  })
-
-  it('快照非对象 / calls 容器缺失 / call 元素非对象 → 空数组', () => {
-    expect(extractCallSessionFiles(null)).toEqual([])
-    expect(extractCallSessionFiles('wf-run-v1')).toEqual([])
-    expect(extractCallSessionFiles({ v: 'wf-run-v1', state: null })).toEqual([])
-    expect(extractCallSessionFiles({ v: 'wf-run-v1', state: {} })).toEqual([])
-    expect(extractCallSessionFiles({ callCache: 'not-an-array' })).toEqual([])
-    expect(extractCallSessionFiles({ callCache: [null, 7, 'x'] })).toEqual([])
-  })
-})
-
 // ============================================================
 // renderWorkflowOverview（纯逻辑，TC-w5-render-new/old）
 // ============================================================
@@ -377,33 +327,11 @@ describe('readRunSnapshot', () => {
 })
 
 // ============================================================
-// resolveWorkflows 三档发现链（W1 D10 断链修复：v2 journalPath 主源 / v1 快照层 /
-// 旧指针 fallback——W17 前 / W17~W1 / W1+ 三类 run 全部有发现通道）
+// resolveWorkflows 发现链（[ADR-0095] v1 读面删除后的单档形态：v2 注册条目
+// recordPath 主源；历史格式条目——v1 快照 / workflow-state-link 指针——静默消失）
 // ============================================================
 
-/** v1 快照对象（RunSnapshot 形态：v/runId/state.calls——v1 workflow-record 条目的 snapshot 载荷）。 */
-function v1Snapshot(runId: string, sessionFiles: string[]): Record<string, unknown> {
-  return {
-    v: 'wf-run-v2',
-    runId,
-    spec: { scriptName: 'mid-window', name: 'Mid' },
-    state: {
-      status: 'done',
-      reason: 'completed',
-      budget: { usedTokens: 10, usedCost: 0, totalCallCount: sessionFiles.length, maxTokens: 1000 },
-      calls: sessionFiles.map((sf, i) => ({
-        id: i,
-        opts: { prompt: 'work', model: 'm', description: `step-${i}` },
-        status: 'done',
-        attempts: 1,
-        result: { content: 'ok', durationMs: 1, sessionId: `019v1${i}`, sessionFile: sf },
-      })),
-    },
-    meta: { startedAt: '2026-09-20T00:00:00.000Z', completedAt: '2026-09-20T00:01:00.000Z' },
-  }
-}
-
-describe('resolveWorkflows 三档发现链（W1 D10）', () => {
+describe('resolveWorkflows（v2 注册条目单档发现链）', () => {
   let dir: string
   afterEach(async () => {
     if (dir) await rm(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 }).catch(() => {})
@@ -420,15 +348,6 @@ describe('resolveWorkflows 三档发现链（W1 D10）', () => {
     return { path, sessionIdToPath: new Map([[sessionId, path]]) }
   }
 
-  /** 写 wf-state 快照文件（尾行最新快照）。返回绝对路径。 */
-  async function writeStateFile(runId: string, snapshot: Record<string, unknown>): Promise<string> {
-    const wfDir = join(dir, 'workflow-state')
-    await mkdir(wfDir, { recursive: true })
-    const path = join(wfDir, `${runId}.jsonl`)
-    await writeFile(path, JSON.stringify(snapshot) + '\n')
-    return path
-  }
-
   /** 写 record 流文件（[D16③] v2 档数据源——目录自建）。 */
   async function writeRecordStream(runId: string, lines: string[]): Promise<string> {
     const wfDir = join(dir, 'workflow-state')
@@ -438,8 +357,8 @@ describe('resolveWorkflows 三档发现链（W1 D10）', () => {
     return p
   }
 
-  /** workflow-record v2 注册条目行（journalPath 锚点）。 */
-  function v2RegisteredLine(runId: string, journalPath: string): string {
+  /** workflow-record v2 注册条目行（recordPath 锚点）。 */
+  function v2RegisteredLine(runId: string, recordPath: string): string {
     return JSON.stringify({
       type: 'custom',
       customType: 'workflow-record',
@@ -453,23 +372,12 @@ describe('resolveWorkflows 三档发现链（W1 D10）', () => {
         scriptName: 'probe-flow',
         slug: 'probe',
         startedAt: 1,
-        journalPath,
+        recordPath,
       },
     })
   }
 
-  /** workflow-record v1 快照条目行（W17~W1 中间档形态：{v:1, snapshot, updatedAt}）。 */
-  function v1SnapshotLine(runId: string, sessionFiles: string[]): string {
-    return JSON.stringify({
-      type: 'custom',
-      customType: 'workflow-record',
-      id: `e-${runId}`,
-      parentId: null,
-      data: { v: 1, snapshot: v1Snapshot(runId, sessionFiles), updatedAt: 2 },
-    })
-  }
-
-  /** workflow-record v2 终态条目行（不携带 journalPath——非发现链数据源）。 */
+  /** workflow-record v2 终态条目行（不携带 recordPath——非发现链数据源）。 */
   function v2SettledLine(runId: string): string {
     return JSON.stringify({
       type: 'custom',
@@ -504,7 +412,7 @@ describe('resolveWorkflows 三档发现链（W1 D10）', () => {
   const CALL_A = '/abs/subagents/--proj--/sessions/call-a.jsonl'
   const CALL_B = '/abs/subagents/--proj--/sessions/call-b.jsonl'
 
-  it('v2 journalPath 主源（[D16③] 重锚）：注册条目 → record 流直读提 calls，stateFile = 流路径', async () => {
+  it('v2 recordPath 主源（[D16③] 重锚）：注册条目 → record 流直读提 calls，stateFile = 流路径', async () => {
     dir = await mkdtemp(join(tmpdir(), 'wf-v2-tier-'))
     // record 流内容：run-created + agent-started + agent-settled（result 携带 sessionFile）
     const recordPath = await writeRecordStream('wf-v2-1', [
@@ -518,7 +426,7 @@ describe('resolveWorkflows 三档发现链（W1 D10）', () => {
 
     expect(workflows).toHaveLength(1)
     expect(workflows[0].runId).toBe('wf-v2-1')
-    // stateFile = record 流路径（journalPath 锚点语义重定义——[D16③]）
+    // stateFile = record 流路径（recordPath 锚点语义重定义——[D16③]）
     expect(workflows[0].stateFile).toBe(recordPath)
     expect(workflows[0].calls).toHaveLength(1)
     expect(workflows[0].calls[0].fileName).toBe(CALL_A)
@@ -560,58 +468,79 @@ describe('resolveWorkflows 三档发现链（W1 D10）', () => {
     expect(odd[0].calls).toEqual([])
   })
 
-  it('v1 快照层（W17~W1 中间档恢复）：v1 快照条目直接提 snapshot.calls，无指针条目也可见', async () => {
-    // 该档现状发现链恒空（只认指针）——本用例锚定中间档恢复：升级窗口期的旧格式会话
-    dir = await mkdtemp(join(tmpdir(), 'wf-v1-tier-'))
-    const { sessionIdToPath } = await writeMain([v1SnapshotLine('wf-mid-1', [CALL_A, CALL_B])])
-
-    const workflows = await resolveWorkflows('main-session-1', sessionIdToPath, new Map())
-
-    expect(workflows).toHaveLength(1)
-    expect(workflows[0].runId).toBe('wf-mid-1')
-    // v1 条目不携带 state 路径 → stateFile 空串（概览消费面自然降级，家族链 calls 完整）
-    expect(workflows[0].stateFile).toBe('')
-    expect(workflows[0].calls.map((c) => c.fileName)).toEqual([CALL_A, CALL_B])
-  })
-
-  it('旧指针 fallback：workflow-state-link 指针条目照旧读 link 指向的快照文件', async () => {
-    dir = await mkdtemp(join(tmpdir(), 'wf-link-tier-'))
-    const stateFile = await writeStateFile('wf-old-1', v1Snapshot('wf-old-1', [CALL_B]))
-    const { sessionIdToPath } = await writeMain([linkLine('wf-old-1', stateFile)])
+  // [ADR-0095] 删除回归：历史格式条目（v1 全量快照 / workflow-state-link 指针）
+  // 不再识别——静默从发现链消失（不拒读、不报错），历史 run 退空即预期行为。
+  it('历史格式条目（v1 快照 / state-link 指针）静默消失——不产 WorkflowRef、不影响 v2 条目', async () => {
+    dir = await mkdtemp(join(tmpdir(), 'wf-legacy-silent-'))
+    const recordPath = await writeRecordStream('wf-v2-live', [
+      JSON.stringify({ type: 'run-created', seq: 1, ts: 1000, runId: 'wf-v2-live', workflowName: 'v2-flow', argsSummary: '{}' }),
+      JSON.stringify({ type: 'agent-settled', seq: 2, ts: 1500, taskIndex: 0, attempt: 1, outcome: 'done', durationMs: 400, result: { content: 'ok', sessionFile: CALL_A } }),
+    ])
+    // 首见序：v1 快照条目（早）→ link 指针条目（中）→ v2 注册条目（晚）
+    const { sessionIdToPath } = await writeMain([
+      JSON.stringify({
+        type: 'custom',
+        customType: 'workflow-record',
+        id: 'e-v1-mid',
+        parentId: null,
+        data: {
+          v: 1,
+          snapshot: {
+            v: 'wf-run-v2',
+            runId: 'wf-mid-1',
+            spec: { scriptName: 'mid-window' },
+            state: {
+              status: 'done',
+              budget: { usedTokens: 10, usedCost: 0, totalCallCount: 1, maxTokens: 1000 },
+              calls: [{ id: 0, status: 'done', result: { sessionFile: CALL_B } }],
+            },
+            meta: { startedAt: '2026-09-20T00:00:00.000Z' },
+          },
+          updatedAt: 2,
+        },
+      }),
+      JSON.stringify({
+        type: 'custom',
+        customType: 'workflow-state-link',
+        id: 'e-link-old',
+        parentId: null,
+        data: { runId: 'wf-old-1', path: '/abs/wf-old-1.jsonl', updatedAt: '2026-08-07T16:48:24.933Z' },
+      }),
+      v2RegisteredLine('wf-v2-live', recordPath),
+    ])
 
     const workflows = await resolveWorkflows('main-session-1', sessionIdToPath, new Map())
 
+    // 只剩 v2 档一条；v1/link 条目不产 runId 幻影
     expect(workflows).toHaveLength(1)
-    expect(workflows[0].runId).toBe('wf-old-1')
-    expect(workflows[0].stateFile).toBe(stateFile)
-    expect(workflows[0].calls.map((c) => c.fileName)).toEqual([CALL_B])
+    expect(workflows[0].runId).toBe('wf-v2-live')
+    expect(workflows[0].stateFile).toBe(recordPath)
+    expect(workflows[0].calls.map((c) => c.fileName)).toEqual([CALL_A])
   })
 
-  it('三档混合会话：三个 run 各处一档 → 各自正确，按条目首见序输出（[D16③] v2 档 = record 流直读）', async () => {
-    dir = await mkdtemp(join(tmpdir(), 'wf-mixed-'))
-    const recordPath = await writeRecordStream('wf-v2-1', [
-      JSON.stringify({ type: 'run-created', seq: 1, ts: 1000, runId: 'wf-v2-1', workflowName: 'v2-flow', argsSummary: '{}' }),
-      JSON.stringify({ type: 'agent-started', seq: 2, ts: 1100, taskIndex: 0, agentName: 's0', attempt: 1 }),
-      JSON.stringify({ type: 'agent-settled', seq: 3, ts: 1500, taskIndex: 0, attempt: 1, outcome: 'done', durationMs: 400, result: { content: 'ok', sessionFile: CALL_A } }),
+  it('同 runId 多条 v2 注册条目：后写覆盖（取最新锚点），首见序输出', async () => {
+    dir = await mkdtemp(join(tmpdir(), 'wf-rewrite-'))
+    const firstPath = await writeRecordStream('wf-rewrite-1', [
+      JSON.stringify({ type: 'run-created', seq: 1, ts: 1000, runId: 'wf-rewrite-1', workflowName: 'v1-flow', argsSummary: '{}' }),
+    ])
+    const secondPath = await writeRecordStream('wf-rewrite-1-retry', [
+      JSON.stringify({ type: 'run-created', seq: 1, ts: 2000, runId: 'wf-rewrite-1', workflowName: 'v2-flow', argsSummary: '{}' }),
+      JSON.stringify({ type: 'agent-settled', seq: 2, ts: 2500, taskIndex: 0, attempt: 1, outcome: 'done', durationMs: 300, result: { content: 'ok', sessionFile: CALL_A } }),
     ])
-    const oldState = await writeStateFile('wf-old-1', v1Snapshot('wf-old-1', [CALL_B]))
-    // 首见序：指针（早）→ v1 快照（中）→ v2 注册（晚）
     const { sessionIdToPath } = await writeMain([
-      linkLine('wf-old-1', oldState),
-      v1SnapshotLine('wf-mid-1', [CALL_A]),
-      v2RegisteredLine('wf-v2-1', recordPath),
+      v2RegisteredLine('wf-rewrite-1', firstPath),
+      v2RegisteredLine('wf-rewrite-1', secondPath),
     ])
 
     const workflows = await resolveWorkflows('main-session-1', sessionIdToPath, new Map())
 
-    expect(workflows.map((w) => w.runId)).toEqual(['wf-old-1', 'wf-mid-1', 'wf-v2-1'])
-    expect(workflows[0].stateFile).toBe(oldState)
-    expect(workflows[1].stateFile).toBe('')
-    expect(workflows[2].stateFile).toBe(recordPath)
-    expect(workflows[2].calls[0].fileName).toBe(CALL_A)
+    expect(workflows).toHaveLength(1)
+    // 后写覆盖：stateFile 取最新锚点，calls 来自新流
+    expect(workflows[0].stateFile).toBe(secondPath)
+    expect(workflows[0].calls.map((c) => c.fileName)).toEqual([CALL_A])
   })
 
-  it('v2 终态条目（settled，无 journalPath）不参与发现链——不产 runId 幻影', async () => {
+  it('v2 终态条目（settled，无 recordPath）不参与发现链——不产 runId 幻影', async () => {
     dir = await mkdtemp(join(tmpdir(), 'wf-settled-'))
     const { sessionIdToPath } = await writeMain([v2SettledLine('wf-settled-1')])
 
@@ -620,34 +549,11 @@ describe('resolveWorkflows 三档发现链（W1 D10）', () => {
     expect(workflows).toEqual([])
   })
 
-  it('同 runId 跨档坏数据防御：v2 注册条目在 → 用 v2 档（高档在即用高档；[D16③] v2 档 = record 流）', async () => {
-    dir = await mkdtemp(join(tmpdir(), 'wf-tier-prio-'))
-    const recordPath = await writeRecordStream('wf-both-1', [
-      JSON.stringify({ type: 'run-created', seq: 1, ts: 1000, runId: 'wf-both-1', workflowName: 'both', argsSummary: '{}' }),
-      JSON.stringify({ type: 'agent-started', seq: 2, ts: 1100, taskIndex: 0, agentName: 's0', attempt: 1 }),
-      JSON.stringify({ type: 'agent-settled', seq: 3, ts: 1500, taskIndex: 0, attempt: 1, outcome: 'done', durationMs: 400, result: { content: 'ok', sessionFile: CALL_A } }),
-    ])
-    const oldState = await writeStateFile('wf-both-1-old', v1Snapshot('wf-both-1', [CALL_B]))
-    const { sessionIdToPath } = await writeMain([
-      linkLine('wf-both-1', oldState),
-      v2RegisteredLine('wf-both-1', recordPath),
-    ])
-
-    const workflows = await resolveWorkflows('main-session-1', sessionIdToPath, new Map())
-
-    expect(workflows).toHaveLength(1)
-    // v2 档胜出：stateFile 是 record 流路径（非 link 的 oldState），calls 来自流
-    expect(workflows[0].stateFile).toBe(recordPath)
-    expect(workflows[0].calls.map((c) => c.fileName)).toEqual([CALL_A])
-  })
-
-  it('跨包契约守卫：三档判别的本地字面量 === subagent-core 写侧单源（[D1] record 后缀）', () => {
+  it('跨包契约守卫：发现链判别的本地字面量 === subagent-core 写侧单源（[D1] record 后缀）', () => {
     // 源码本地持有磁盘协议字符串与版本/尾段（生产依赖面不引 subagent-core），锚定两侧同值
     expect(WORKFLOW_RECORD_CUSTOM_TYPE).toBe('workflow-record')
     expect(WORKFLOW_RECORD_ENTRY_VERSION).toBe(2)
     expect(RUN_RECORD_STREAM_SUFFIX).toBe('.record.jsonl')
-    // legacy 指针档：collectWorkflowEntryTiers 本地字面量与 core 常量同值
-    expect(WORKFLOW_STATE_LINK_CUSTOM_TYPE).toBe('workflow-state-link')
   })
 })
 

package/src/__tests__/zcode-manifest.test.ts

@@ -65,7 +65,10 @@ function recordLine(saId: string, sessionRef: Record<string, string>): string {
     customType: 'subagent-record',
     id: `e-${saId}`,
     parentId: null,
-    data: { v: 1, id: saId, engine: 'zcode', engineHandle: { sessionRef, poolKey: 'shared' } },
+    data: {
+      v: 2, kind: 'settled', id: saId, status: 'idle', stopReason: 'completed', endedAt: 2,
+      turns: 1, totalTokens: 10, engine: 'zcode', engineHandle: { sessionRef, poolKey: 'shared' },
+    },
   })
 }
 

package/src/__tests__/zcode-routing.test.ts

@@ -201,7 +201,10 @@ function recordLine(entryId: string, saId: string, sessionRef: Record<string, st
     customType: 'subagent-record',
     id: entryId,
     parentId: null,
-    data: { v: 1, id: saId, engine: 'zcode', engineHandle: { sessionRef, poolKey: 'shared' } },
+    data: {
+      v: 2, kind: 'settled', id: saId, status: 'idle', stopReason: 'completed', endedAt: BASE_MS + 1,
+      turns: 1, totalTokens: 10, engine: 'zcode', engineHandle: { sessionRef, poolKey: 'shared' },
+    },
   })
 }
 
@@ -217,21 +220,15 @@ function piRecordLine(entryId: string, saId: string): string {
     id: entryId,
     parentId: null,
     data: {
-      v: 1,
+      // 登记 §3.3：条目面 = v2 族——pi 形态 = 注册条（身份）+ 终态条（engineHandle 半键）。
+      v: 2,
+      kind: 'settled',
       id: saId,
-      agent: 'pi-agent',
-      task: 'pi task',
-      slug: 'pi-sub',
-      status: 'running',
-      mode: 'subagent',
-      startedAt: BASE_MS,
-      rootSessionId: ROOT_SESSION,
-      parentRecordId: null,
-      depth: 0,
-      turns: 0,
-      totalTokens: 0,
-      eventLog: [],
-      displayItems: [],
+      status: 'idle',
+      stopReason: 'completed',
+      endedAt: BASE_MS + 1,
+      turns: 1,
+      totalTokens: 10,
       engineHandle: { sessionRef: { sessionId: SESS_A }, poolKey: 'shared' },
     },
   })