@zhushanwen/subagent-core 0.4.0 → 0.6.0

package/src/execution/__tests__/helpers/spawn-mock.ts

@@ -47,7 +47,7 @@
 //     };
 //   });
 //   vi.mock("../alive-store.ts", () => ({ writeAliveMarker: vi.fn() }));
-//   vi.mock("../temp-prompt.ts", () => ({
+//   vi.mock("../engine/engines/pi/temp-prompt.ts", () => ({
 //     writePromptToTempFile: vi.fn(async (agent: string) => {
 //       const safeName = agent.replace(/[^\w.-]+/g, "_");
 //       return { dir: `/tmp/fake-${safeName}`, filePath: `/tmp/fake-${safeName}/prompt-${safeName}.md` };
@@ -60,8 +60,10 @@ import type { ChildProcess } from "node:child_process";
 import { EventEmitter } from "node:events";
 import { PassThrough } from "node:stream";
 
+import { vi } from "vitest";
+
 import { createRecord } from "../../execution-record.ts";
-import type { RunOptions, SessionRunnerContext } from "../../session-runner.ts";
+import type { RunOptions, SessionRunnerContext } from "../../engine/engines/pi/session-runner.ts";
 
 /** FakeChild 的假 pid（满足 ChildProcess.pid 形状，无真实进程语义）。 */
 const FAKE_PID = 12345;
@@ -194,8 +196,9 @@ export function makeRecord(id = "run-1") {
   return createRecord(id, {
     agent: "general-purpose",
     model: "test-model",
-    mode: "sync",
+    mode: "background",
     task: "do something",
+    slug: "spawn-mock",
     startedAt: 1_000_000,
     rootSessionId: "root-session",
     parentRecordId: undefined,
@@ -240,3 +243,147 @@ export function makeCtx(overrides: Partial<SessionRunnerContext> = {}): SessionR
     ...overrides,
   };
 }
+
+// ── mock 模块工厂（session-runner 系测试共享，从 keep-alive-no-progress /
+// recursive-visibility-env 的逐字重复 mock 块收敛为单源）──
+//
+// 使用模式（vi.mock 工厂内 await import 本文件，免疫 hoist 时序）：
+//   vi.mock("node:child_process", async () =>
+//     (await import("./helpers/spawn-mock.ts")).childProcessModule());
+//
+// 本段保持「无 session-runner / alive-store / session-pending 值依赖」——本文件会被
+// 各 vi.mock 工厂 await import（求值时机 = 被 mock 模块首次请求），若再值依赖
+// session-runner 会构成「mock 工厂 → 本文件 → session-runner → node:child_process
+// （mock 求值中）」循环。需要值依赖这些模块的测试文件侧装配放
+// session-runner-mocks.ts（只被测试文件顶层静态 import）。
+
+/** 共享 logger mock 单例（复核失败 warn 留痕断言用；vi.clearAllMocks 统一重置）。 */
+export const loggerMock = { debug: vi.fn(), warn: vi.fn(), error: vi.fn() };
+
+/** "../../core/logger.ts" mock 工厂。 */
+export function coreLoggerModule() {
+  return { getLogger: () => loggerMock };
+}
+
+/** "node:child_process" mock 工厂（spawn 返回 FakeChild + execFile err-first 兜底）。 */
+export function childProcessModule() {
+  return {
+    spawn: vi.fn(() => new FakeChild()),
+    // buildEnvBlock 用 execFile 异步取 git branch：默认 err-first 兜底（catch → branch=""），
+    // 形态同 worktree-manager.test.ts 的 setupExecFile
+    execFile: vi.fn(
+      (
+        _cmd: string,
+        _args: readonly string[],
+        _opts: unknown,
+        cb: (err: Error | null, stdout?: string, stderr?: string) => void,
+      ) => cb(new Error("execFile not configured in this test")),
+    ),
+  };
+}
+
+/** "node:fs" mock 工厂（fs 侧写方法 vi.fn 化，promises 保留 actual）。 */
+export async function fsModule(): Promise<Record<string, unknown>> {
+  const actual = await vi.importActual<typeof import("node:fs")>("node:fs");
+  return {
+    default: {
+      ...actual,
+      mkdirSync: vi.fn(),
+      existsSync: vi.fn(() => false),
+      appendFileSync: vi.fn(),
+      writeFileSync: vi.fn(),
+      readdirSync: vi.fn(() => []),
+    },
+    mkdirSync: vi.fn(),
+    existsSync: vi.fn(() => false),
+    appendFileSync: vi.fn(),
+    writeFileSync: vi.fn(),
+    readdirSync: vi.fn(() => []),
+    promises: actual.promises,
+  };
+}
+
+/** "../alive-store.ts" mock 工厂（keep-alive 系超集：marker 读写 + pid 存活判定兜底）。 */
+export function aliveStoreModule() {
+  return {
+    writeAliveMarker: vi.fn(),
+    // [T5②] keep-alive 心跳刷新读取现有 marker id（缺失兜底 record.id）
+    readAliveMarker: vi.fn(() => undefined),
+    isProcessAlive: vi.fn(() => false),
+  };
+}
+
+/** "../session-pending.ts" mock 工厂（keep-alive 判定统一 count>0：有活跃后代 → keep-alive 分支）。 */
+export function sessionPendingModule() {
+  return {
+    readActivePendingFromSessionFile: vi.fn(() => ({ count: 1, recentUnregister: false })),
+    prunePendingCursor: vi.fn(),
+    listActivePendingFromSessionFile: vi.fn(() => ({ items: [] })),
+  };
+}
+
+/** "../engine/engines/pi/temp-prompt.ts" mock 工厂（prompt 落 /tmp/fake-<agent>，收尾 no-op）。 */
+export function tempPromptModule() {
+  return {
+    writePromptToTempFile: vi.fn(async (agent: string) => {
+      const safeName = agent.replace(/[^\w.-]+/g, "_");
+      return { dir: `/tmp/fake-${safeName}`, filePath: `/tmp/fake-${safeName}/prompt-${safeName}.md` };
+    }),
+    cleanupTempPrompt: vi.fn(async () => {}),
+  };
+}
+
+// ── recursive-visibility / schema-env 族 fixture（env 断言族专用，与上方 makeRecord 系
+// 默认值不同：/fake/* 路径 + test/model 形态参与 PI_SUBAGENT_* 断言，逐字保留原值）──
+
+/** 构造 env 注入断言族的 ExecutionRecord（可 override id/depth）。 */
+export function makeVisibilityRecord(overrides: { id?: string; depth?: number } = {}) {
+  return createRecord(overrides.id ?? "sa-test-record", {
+    agent: "general-purpose",
+    model: "test/model",
+    mode: "background",
+    slug: "t",
+    task: "test task",
+    startedAt: Date.now(),
+    rootSessionId: "should-be-overridden-by-sessionRootId-source",
+    parentRecordId: undefined,
+    depth: overrides.depth ?? 0,
+  });
+}
+
+/** 构造 env 注入断言族的 RunOptions（可 override 关键字段）。 */
+export function makeRunOpts(overrides: Partial<RunOptions> = {}): RunOptions {
+  return {
+    resolved: { model: { provider: "test", id: "model", name: "Model", reasoning: false }, thinkingLevel: undefined },
+    agentConfig: undefined,
+    appendSystemPrompt: undefined,
+    skillPath: undefined,
+    schema: undefined,
+    maxTurns: undefined,
+    graceTurns: undefined,
+    signal: undefined,
+    onEvent: undefined,
+    ...overrides,
+  };
+}
+
+/** 构造 env 注入断言族的 SessionRunnerContext（可 override 关键字段）。 */
+export function makeVisibilityCtx(overrides: Partial<SessionRunnerContext> = {}): SessionRunnerContext {
+  return {
+    cwd: "/fake/cwd",
+    agentDir: "/fake/agent",
+    skillDirs: [],
+    mainCwd: "/fake/cwd",
+    sessionRootId: "root-main-session",
+    rootCwd: "/fake/cwd",
+    ...overrides,
+  };
+}
+
+/** 取最近一次 spawn 调用传入的 env（跨进程身份注入断言用）。 */
+export function getLastSpawnEnv<T extends { mock: { calls: unknown[][] } }>(
+  mockSpawn: T,
+): Record<string, string | undefined> {
+  const opts = mockSpawn.mock.calls.at(-1)?.[2] as { env?: Record<string, string | undefined> } | undefined;
+  return opts?.env ?? {};
+}

package/src/execution/__tests__/helpers/subagent-service-mocks.ts

@@ -0,0 +1,137 @@
+// src/execution/__tests__/helpers/subagent-service-mocks.ts
+//
+// SubagentService 编排层测试（execute-and-await-worktree / execute-nesting /
+// nested-visibility-env-propagation / recursive-visibility-baseline 四文件）共享的
+// spawn 链 mock 模块工厂。原四文件各自内联 ~85 行逐字重复的 vi.mock 工厂体（fallow
+// duplication 告警），收敛到本 module 单源——桩形变更改此文件，全量消费方同步生效。
+//
+// 消费方式（与 __tests__/helpers/system-page-mount.ts、spawn-mock.ts 同款先例）：
+// vi.mock 调用留在测试文件（mock 注册是文件作用域），import 本 module 的语句写在
+// vi.mock 调用之前（工厂执行发生在被测模块链请求被 mock 模块时，届时本 module 已加载）。
+//
+// node:fs / ../alive-store.ts 两个工厂需要真实模块做基底（...actual 展开）：真实实现
+// 经工厂的 importOriginal 参数由测试文件传入——本 module 不能顶层静态 import 它们
+// （测试文件的 vi.mock 注册先于一切 import，本 module 属其依赖图，静态 import 会拿到
+// mock 版自身 → 展开循环）。
+//
+// FakeChild 复用 ./spawn-mock.ts 的 class（结构超集：多 stdin / exitCode / signalCode
+// 字段，四文件原内联 FakeChild 只访问 stdout/stderr/kill/emit，行为等价）。
+
+import { vi } from "vitest";
+
+
+
+import { FakeChild, emitStdoutLine, sessionHeader } from "./spawn-mock.ts";
+
+/**
+ * node:child_process mock 模块。
+ * spawn → FakeChild（测试经 mockSpawn.mock.results 取回控制器）；
+ * execFile → err-first 兜底（buildEnvBlock 的 git branch 调用失败 → catch → branch=""）。
+ */
+export function childProcessModule() {
+  return {
+    spawn: vi.fn(() => new FakeChild()),
+    execFile: vi.fn(
+      (
+        _cmd: string,
+        _args: readonly string[],
+        _opts: unknown,
+        cb: (err: Error | null, stdout?: string, stderr?: string) => void,
+      ) => cb(new Error("execFile not configured in this test")),
+    ),
+  };
+}
+
+/**
+ * node:fs mock 模块：同步方法 mock（runSpawn 用到的全部），promises 保留真实实现
+ * （temp-prompt 已整体 mock，不触发真实 I/O）。default 与顶层具名是两套独立 vi.fn
+ * 实例（与收敛前四文件内联形态同构）。
+ */
+// 显式返回类型（typeof import 表达式可命名）——否则推导的返回类型引用 fs 内部
+// 未导出的 ReadStreamOptions/WriteStreamOptions，触发 TS4058 可命名性检查
+export function fsSyncModule(
+  actual: typeof import("node:fs"),
+): {
+  /** 真实 fs + 同步 mock 的合并视图（vi.mock 工厂消费面宽松） */
+  default: unknown;
+  promises: typeof import("node:fs")["promises"];
+  mkdirSync: ReturnType<typeof vi.fn>;
+  existsSync: ReturnType<typeof vi.fn>;
+  appendFileSync: ReturnType<typeof vi.fn>;
+  writeFileSync: ReturnType<typeof vi.fn>;
+  readdirSync: ReturnType<typeof vi.fn>;
+} {
+  const syncMocks = () => ({
+    mkdirSync: vi.fn(),
+    existsSync: vi.fn(() => false),
+    appendFileSync: vi.fn(),
+    writeFileSync: vi.fn(),
+    readdirSync: vi.fn(() => []),
+  });
+  return {
+    default: { ...actual, ...syncMocks() },
+    ...syncMocks(),
+    promises: actual.promises,
+  };
+}
+
+/**
+ * ../alive-store.ts mock 模块：writeAliveMarker（runSpawn 写 .alive sidecar）+
+ * removeAliveMarker（finalizeRecord 收尾删 .alive）mock；其余导出保留真实实现
+ * （worktree-manager / record-store 消费，本组用例不涉及但保留以避免间接报错）。
+ */
+export function aliveStoreModule(actual: typeof import("../../alive-store.ts")) {
+  return {
+    ...actual,
+    writeAliveMarker: vi.fn(),
+    removeAliveMarker: vi.fn(),
+  };
+}
+
+/** ../finalized-marker.ts mock 模块（避免真实 fs 写 sidecar）。 */
+export function finalizedMarkerModule() {
+  return {
+    writeFinalized: vi.fn(),
+    readFinalized: vi.fn(() => false),
+  };
+}
+
+/**
+ * ../manifest-store.ts mock 模块。vi.fn 包裹构造器（普通 function，箭头函数不能被 new）：
+ * 构造参数 recordsDir 可从 mock.calls 断言（[MF-3] 目录统一验证用）。
+ * no-op 化的根因：writeManifest 真实链路的异步 console 经 worker RPC 回流，与 vitest
+ * teardown 形成 race（unhandled rejection / exit 1）——本组用例测编排逻辑不测持久化。
+ */
+export function manifestStoreModule() {
+  class FakeManifestStore {
+    writeManifest = vi.fn(async () => {});
+    readManifest = vi.fn(async () => null);
+    listAllSync = vi.fn(() => []);
+    recoverTmpFiles = vi.fn(async () => []);
+  }
+  return { ManifestStore: vi.fn(function (_recordsDir: string) { return new FakeManifestStore(); }) };
+}
+
+/** ../engine/engines/pi/temp-prompt.ts mock 模块（固定路径，消除 fake-timers 下 flaky 竞态）。 */
+export function tempPromptModule() {
+  return {
+    writePromptToTempFile: vi.fn(async (agent: string) => {
+      const safeName = agent.replace(/[^\w.-]+/g, "_");
+      return { dir: `/tmp/fake-${safeName}`, filePath: `/tmp/fake-${safeName}/prompt-${safeName}.md` };
+    }),
+    cleanupTempPrompt: vi.fn(async () => {}),
+  };
+}
+
+/**
+ * 驱动 FakeChild 完成 session：写 header + 可选事件 + close(0)。
+ * runSpawn 在 close 后判定 success（exitCode=0），并跑 identity 补写 + finalizeRecord
+ * ——「让 runSpawn 自然 resolve」的标准收尾路径。
+ */
+export async function driveChildToCompletion(child: FakeChild, events: Record<string, unknown>[] = []): Promise<void> {
+  emitStdoutLine(child, sessionHeader());
+  for (const e of events) emitStdoutLine(child, e);
+  child.stdout.end();
+  child.stderr.end();
+  child.emit("close", 0);
+}

package/src/execution/__tests__/keep-alive-no-progress.test.ts

@@ -13,102 +13,52 @@
 //     语义保留，A1-1：显式 maxTurns<=0 与 fail-fast 降级也不挂）。
 //
 // mock 布局与 run-spawn-edges.test.ts 一致（FakeChild + mock session-pending）。
+// mock 工厂与 loggerMock 单源收敛 helpers/spawn-mock.ts；vi.mocked 取回与
+// spawn/keep-alive 前奏收敛 helpers/session-runner-mocks.ts（分工见后者头注释）。
 
-import { spawn } from "node:child_process";
-import * as fs from "node:fs";
-
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 
 // [A1-2③] Mock 共享 logger：复核失败的 warn 留痕可被断言（对齐 run-spawn-edges 模式）。
-const { loggerMock } = vi.hoisted(() => ({
-  loggerMock: { debug: vi.fn(), warn: vi.fn(), error: vi.fn() },
-}));
-vi.mock("../../core/logger.ts", () => ({
-  getLogger: () => loggerMock,
-}));
-
-vi.mock("node:child_process", async () => {
-  const { FakeChild } = await import("./helpers/spawn-mock.ts");
-  return {
-    spawn: vi.fn(() => new FakeChild()),
-    execFile: vi.fn(
-      (
-        _cmd: string,
-        _args: readonly string[],
-        _opts: unknown,
-        cb: (err: Error | null, stdout?: string, stderr?: string) => void,
-      ) => cb(new Error("execFile not configured in this test")),
-    ),
-  };
-});
+vi.mock("../../core/logger.ts", async () =>
+  (await import("./helpers/spawn-mock.ts")).coreLoggerModule());
 
-vi.mock("node:fs", async () => {
-  const actual = await import("node:fs");
-  return {
-    default: {
-      ...actual,
-      mkdirSync: vi.fn(),
-      existsSync: vi.fn(() => false),
-      appendFileSync: vi.fn(),
-      writeFileSync: vi.fn(),
-      readdirSync: vi.fn(() => []),
-    },
-    mkdirSync: vi.fn(),
-    existsSync: vi.fn(() => false),
-    appendFileSync: vi.fn(),
-    writeFileSync: vi.fn(),
-    readdirSync: vi.fn(() => []),
-    promises: actual.promises,
-  };
-});
-
-vi.mock("../alive-store.ts", () => ({
-  writeAliveMarker: vi.fn(),
-  // [T5②] keep-alive 心跳刷新读取现有 marker id（缺失兜底 record.id）
-  readAliveMarker: vi.fn(() => undefined),
-  isProcessAlive: vi.fn(() => false),
-}));
+vi.mock("node:child_process", async () =>
+  (await import("./helpers/spawn-mock.ts")).childProcessModule());
+vi.mock("node:fs", async () => (await import("./helpers/spawn-mock.ts")).fsModule());
+vi.mock("../alive-store.ts", async () =>
+  (await import("./helpers/spawn-mock.ts")).aliveStoreModule());
 
 // keep-alive 判定：本文件统一 count>0（有活跃后代 → keep-alive 分支）。
-vi.mock("../session-pending.ts", () => ({
-  readActivePendingFromSessionFile: vi.fn(() => ({ count: 1, recentUnregister: false })),
-  prunePendingCursor: vi.fn(),
-  listActivePendingFromSessionFile: vi.fn(() => ({ items: [] })),
-}));
-
-vi.mock("../temp-prompt.ts", () => ({
-  writePromptToTempFile: vi.fn(async (agent: string) => {
-    const safeName = agent.replace(/[^\w.-]+/g, "_");
-    return { dir: `/tmp/fake-${safeName}`, filePath: `/tmp/fake-${safeName}/prompt-${safeName}.md` };
-  }),
-  cleanupTempPrompt: vi.fn(async () => {}),
-}));
+vi.mock("../session-pending.ts", async () =>
+  (await import("./helpers/spawn-mock.ts")).sessionPendingModule());
+
+vi.mock("../engine/engines/pi/temp-prompt.ts", async () =>
+  (await import("./helpers/spawn-mock.ts")).tempPromptModule());
 
 import {
   KEEP_ALIVE_NO_PROGRESS_TIMEOUT_MS,
   maxTurnsToWatchdogMs,
-  runSpawn,
   SPAWN_WATCHDOG_ENV,
-} from "../session-runner.ts";
-import { listActivePendingFromSessionFile, readActivePendingFromSessionFile } from "../session-pending.ts";
-import { isProcessAlive, readAliveMarker, writeAliveMarker } from "../alive-store.ts";
+} from "../engine/engines/pi/session-runner.ts";
 import {
   emitStdoutLine,
   type FakeChild,
   lastSpawnedChild as lastSpawnedChildOf,
-  makeCtx,
+  loggerMock,
   makeOpts,
-  makeRecord,
   waitForSpawn as waitForSpawnOf,
 } from "./helpers/spawn-mock.ts";
-
-const mockSpawn = vi.mocked(spawn);
-const mockPending = vi.mocked(readActivePendingFromSessionFile);
-const mockListPending = vi.mocked(listActivePendingFromSessionFile);
-const mockReadAliveMarker = vi.mocked(readAliveMarker);
-const mockWriteAliveMarker = vi.mocked(writeAliveMarker);
-const mockIsProcessAlive = vi.mocked(isProcessAlive);
-const mockReaddirSync = vi.mocked(fs.readdirSync);
+import { keepAliveTestHooks, spawnAndReachKeepAlive, takeSessionRunnerMocks } from "./helpers/session-runner-mocks.ts";
+
+const {
+  mockSpawn,
+  mockPending,
+  mockListPending,
+  mockReadAliveMarker,
+  mockWriteAliveMarker,
+  mockIsProcessAlive,
+  mockReaddirSync,
+} = takeSessionRunnerMocks();
 
 /** A1-2 复核用例的后代 pid（存/死两形态，对齐 descendant-sweep.test.ts 数值风格）。 */
 const LIVE_DESCENDANT_PID = 424_242;
@@ -117,48 +67,22 @@ const DEAD_DESCENDANT_PID = 999_999;
 const lastSpawnedChild = (): FakeChild => lastSpawnedChildOf(mockSpawn);
 const waitForSpawn = (timeoutMs = 1000): Promise<void> => waitForSpawnOf(mockSpawn, timeoutMs);
 
-/** 非 chatMode 层主 + fake timers + agent_end keep-alive 落位的公共前奏。 */
-async function spawnAndReachKeepAlive(opts = makeOpts()): Promise<{
-  child: FakeChild;
-  finish: (code?: number) => Promise<Awaited<ReturnType<typeof runSpawn>>>;
-}> {
-  const record = makeRecord();
-  const promise = runSpawn(record, "Task: keep-alive no-progress", opts, makeCtx());
-  await waitForSpawn();
-  const child = lastSpawnedChild();
-  // fake timers 必须在 emit agent_end 之前启用（keep-alive timer 新建于 agent_end
-  // 处理器内；不 fake setImmediate——stream flush 靠真实事件循环交付，见 MF-3 先例）。
-  vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout", "Date"] });
-  emitStdoutLine(child, sessionHeaderLine());
-  emitStdoutLine(child, { type: "agent_end", messages: [], willRetry: false });
-  await new Promise((r) => setImmediate(r));
-  return {
-    child,
-    finish: (code = 143) => {
-      child.stdout.end();
-      child.stderr.end();
-      child.emit("close", code);
-      return promise as Promise<Awaited<ReturnType<typeof runSpawn>>>;
-    },
-  };
-}
-
-function sessionHeaderLine(): Record<string, unknown> {
-  return { type: "session", id: "sess-ka", timestamp: "2026-09-01T00:00:00.000Z", cwd: "/tmp/test" };
+/** A1-2 复核用例的差集后代装配：pending 项 + session 文件名 + marker + pid 存活形态。 */
+function mockDescendant(sessionId: string, pid: number, alive: boolean): void {
+  mockListPending.mockReturnValue({
+    items: [{ id: "bg-1", sessionId, type: "session" }],
+  });
+  mockReaddirSync.mockReturnValue([`20260901T000000-000_${sessionId}.jsonl`]);
+  mockReadAliveMarker.mockImplementation((f: unknown) =>
+    String(f).endsWith(`_${sessionId}.jsonl`)
+      ? { pid, id: sessionId, startedAt: 0 }
+      : undefined,
+  );
+  mockIsProcessAlive.mockImplementation((p: number) => (p === pid ? alive : false));
 }
 
 describe("[T2-①] keep-alive 裸缺省无进展检测上界（P-T2 降级路径 B）", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.stubEnv(SPAWN_WATCHDOG_ENV, "");
-    mockPending.mockReturnValue({ count: 1, recentUnregister: false });
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-    vi.unstubAllEnvs();
-    vi.useRealTimers();
-  });
+  keepAliveTestHooks(mockPending);
 
   it("裸缺省：agent_end keep-alive 挂无进展 timer，连续静默 30min 触发 SIGTERM 处置", async () => {
     const { child, finish } = await spawnAndReachKeepAlive();
@@ -235,16 +159,7 @@ describe("[T2-①] keep-alive 裸缺省无进展检测上界（P-T2 降级路径
     mockPending
       .mockReturnValueOnce({ count: 1, recentUnregister: false })
       .mockReturnValueOnce({ count: 0, recentUnregister: false });
-    const record = makeRecord();
-    const promise = runSpawn(record, "Task: keep-then-final", makeOpts(), makeCtx());
-    await waitForSpawn();
-    const child = lastSpawnedChild();
-
-    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout", "Date"] });
-    emitStdoutLine(child, sessionHeaderLine());
-    // 第一次 agent_end：keep-alive（挂无进展 timer）
-    emitStdoutLine(child, { type: "agent_end", messages: [], willRetry: false });
-    await new Promise((r) => setImmediate(r));
+    const { child, promise } = await spawnAndReachKeepAlive(undefined, "Task: keep-then-final");
     expect(child.killed).toBe(false);
 
     // 第二次 agent_end：后代已完成 → final kill（keep-alive 结束，无进展 timer 同撤）
@@ -253,10 +168,15 @@ describe("[T2-①] keep-alive 裸缺省无进展检测上界（P-T2 降级路径
     expect(child.killed).toBe(true);
 
     // 反证 timer 已撤：advance 30min 不再有任何残留 kill 副作用（进程已 close 收尾）
+    // 真实 ChildProcess 语义：被 SIGTERM 杀死 → 先 exit(null,'SIGTERM') 再 close。只发
+    // close 不发 exit 时 killChain 升级窗口不结算（waitForExit 挂 exit 事件），下方
+    // advance 30min+ 会越过 30s grace 误触发 SIGKILL 升级——补 exit 忠实模拟进程已死。
+    child.signalCode = "SIGTERM";
+    child.emit("exit", null, "SIGTERM");
     child.stdout.end();
     child.stderr.end();
     child.emit("close", 143);
-    const result = (await promise) as Awaited<ReturnType<typeof runSpawn>>;
+    const result = await promise;
     expect(result.success).toBe(true);
     await vi.advanceTimersByTimeAsync(KEEP_ALIVE_NO_PROGRESS_TIMEOUT_MS + 60_000);
     expect(child.killSignal).toBe("SIGTERM"); // 仅 final kill 一次，无二次信号
@@ -296,16 +216,7 @@ describe("[T2-①] keep-alive 裸缺省无进展检测上界（P-T2 降级路径
 
   it("A1-2①: fire 复核有存活活跃后代 → 视为有进展重挂（30min 固定复核节奏），不处置层主", async () => {
     // 后代 pending 差集非空 + pid 存活（与 descendant sweep 同源判据）
-    mockListPending.mockReturnValue({
-      items: [{ id: "bg-1", sessionId: "ka-desc-sess", type: "session" }],
-    });
-    mockReaddirSync.mockReturnValue(["20260901T000000-000_ka-desc-sess.jsonl"]);
-    mockReadAliveMarker.mockImplementation((f: unknown) =>
-      String(f).endsWith("_ka-desc-sess.jsonl")
-        ? { pid: LIVE_DESCENDANT_PID, id: "ka-desc-sess", startedAt: 0 }
-        : undefined,
-    );
-    mockIsProcessAlive.mockImplementation((pid: number) => pid === LIVE_DESCENDANT_PID);
+    mockDescendant("ka-desc-sess", LIVE_DESCENDANT_PID, true);
 
     const { child, finish } = await spawnAndReachKeepAlive();
     expect(child.killed).toBe(false);
@@ -336,16 +247,7 @@ describe("[T2-①] keep-alive 裸缺省无进展检测上界（P-T2 降级路径
   });
 
   it("A1-2②: fire 复核后代差集非空但 pid 全部已死 → 真静默，执行处置", async () => {
-    mockListPending.mockReturnValue({
-      items: [{ id: "bg-1", sessionId: "ka-dead-sess", type: "session" }],
-    });
-    mockReaddirSync.mockReturnValue(["20260901T000000-000_ka-dead-sess.jsonl"]);
-    mockReadAliveMarker.mockImplementation((f: unknown) =>
-      String(f).endsWith("_ka-dead-sess.jsonl")
-        ? { pid: DEAD_DESCENDANT_PID, id: "ka-dead-sess", startedAt: 0 }
-        : undefined,
-    );
-    mockIsProcessAlive.mockReturnValue(false); // 全部已死
+    mockDescendant("ka-dead-sess", DEAD_DESCENDANT_PID, false); // 差集非空但 pid 全部已死
 
     const { child, finish } = await spawnAndReachKeepAlive();
 

package/src/execution/__tests__/kill-all-escalation.test.ts

@@ -56,7 +56,7 @@ vi.mock("../session-pending.ts", () => ({
   prunePendingCursor: vi.fn(),
   listActivePendingFromSessionFile: vi.fn(() => ({ items: [] })),
 }));
-vi.mock("../temp-prompt.ts", () => ({
+vi.mock("../engine/engines/pi/temp-prompt.ts", () => ({
   writePromptToTempFile: vi.fn(async (agent: string) => {
     const safeName = agent.replace(/[^\w.-]+/g, "_");
     return { dir: `/tmp/fake-${safeName}`, filePath: `/tmp/fake-${safeName}/prompt-${safeName}.md` };
@@ -64,7 +64,7 @@ vi.mock("../temp-prompt.ts", () => ({
   cleanupTempPrompt: vi.fn(async () => {}),
 }));
 
-import { killAllSpawnedChildren, runSpawn, spawnedChildren } from "../session-runner.ts";
+import { killAllSpawnedChildren, runSpawn, spawnedChildren } from "../engine/engines/pi/session-runner.ts";
 import {
   emitStdoutLine,
   type FakeChild,

package/src/execution/__tests__/lifecycle-predicates.test.ts

@@ -10,7 +10,7 @@ import {
   disarmIdleTimer,
   _resetLifecycleState,
 } from "../lifecycle-manager.ts";
-import { spawnedChildren } from "../session-runner.ts";
+import { spawnedChildren } from "../engine/engines/pi/session-runner.ts";
 import type { ChildProcess } from "node:child_process";
 import type { ExecutionRecord } from "../types.ts";
 
@@ -25,7 +25,6 @@ function makeRecord(overrides: Partial<ExecutionRecord> = {}): ExecutionRecord {
     thinkingLevel: undefined,
     mode: "background",
     task: "test",
-    slug: "test",
     startedAt: Date.now(),
     rootSessionId: "root",
     parentRecordId: undefined,

package/src/execution/__tests__/manifest-parentid.test.ts

@@ -22,7 +22,7 @@ function makeBaseManifest(overrides: Partial<ManifestRecord> = {}): ManifestReco
     id: "rec-test",
     rootSessionId: "session-main",
     agentName: "worker",
-    status: "completed",
+    status: "closed",
     createdAt: 1000,
     ...overrides,
   };
@@ -38,7 +38,7 @@ describe("ManifestStore — parentRecordId 落盘 (M3a)", () => {
   });
 
   afterEach(() => {
-    fs.rmSync(tmpDir, { recursive: true, force: true });
+    fs.rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   // ── TC-m3a-new-record-parentid ──
@@ -71,7 +71,7 @@ describe("ManifestStore — parentRecordId 落盘 (M3a)", () => {
       id: "rec-old",
       rootSessionId: "session-main",
       agentName: "worker",
-      status: "completed",
+      status: "closed",
       createdAt: 2000,
       // 无 parentRecordId —— 旧版本写的
     };
@@ -104,7 +104,7 @@ describe("ManifestStore — parentRecordId 落盘 (M3a)", () => {
       id: "rec-minimal",
       rootSessionId: "session-main",
       agentName: "worker",
-      status: "completed",
+      status: "closed",
       createdAt: 3000,
     };
     fs.writeFileSync(

package/src/execution/__tests__/manifest-store-tmp-recovery.test.ts

@@ -54,7 +54,7 @@ describe("T5④ recoverTmpFiles per-file tolerance", () => {
 
   afterEach(() => {
     vi.restoreAllMocks();
-    fs.rmSync(dir, { recursive: true, force: true });
+    fs.rmSync(dir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   it("processes remaining tmp files when one unlink fails mid-loop", async () => {

package/src/execution/__tests__/max-turns-to-watchdog-ms.test.ts

@@ -23,7 +23,7 @@ import {
   maxTurnsToWatchdogMs,
   resolveSpawnWatchdogMs,
   SPAWN_WATCHDOG_ENV,
-} from "../session-runner.ts";
+} from "../engine/engines/pi/session-runner.ts";
 
 const MIN_MS = 60_000;
 /** watchdog floor（session-runner WATCHDOG_FLOOR_MINUTES=30 的毫秒值）。 */