@zhushanwen/subagent-core 0.4.0 → 0.5.1

package/src/execution/__tests__/spawn-worktree-guidance.test.ts

@@ -71,7 +71,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, content: string) => {
     captured.content = content;
     const safeName = agent.replace(/[^\w.-]+/g, "_");
@@ -83,7 +83,7 @@ vi.mock("../temp-prompt.ts", () => ({
 import { spawn } from "node:child_process";
 
 import { createRecord } from "../execution-record.ts";
-import { runSpawn, type RunOptions, type SessionRunnerContext } from "../session-runner.ts";
+import { runSpawn, type RunOptions, type SessionRunnerContext } from "../engine/engines/pi/session-runner.ts";
 
 const mockSpawn = vi.mocked(spawn);
 
@@ -117,8 +117,9 @@ function makeRecord() {
   return createRecord("wt-guidance-1", {
     agent: "general-purpose",
     model: "test/model",
-    mode: "sync",
+    mode: "background",
     task: "test task",
+    slug: "test",
     startedAt: Date.now(),
     rootSessionId: "s1",
     parentRecordId: undefined,
@@ -128,7 +129,7 @@ function makeRecord() {
 
 function makeRunOpts(overrides: Partial<RunOptions> = {}): RunOptions {
   return {
-    resolved: { model: { provider: "test", id: "model" }, thinkingLevel: undefined },
+    resolved: { model: { provider: "test", id: "model", name: "Model", reasoning: false }, thinkingLevel: undefined },
     agentConfig: undefined,
     appendSystemPrompt: undefined,
     skillPath: undefined,

package/src/execution/__tests__/spawned-children.test.ts

@@ -29,7 +29,7 @@ vi.mock("../../core/logger.ts", () => ({ getLogger: () => loggerMock }));
 
 import type { EnginePort } from "../engine/port.ts";
 import { clearEngines, getEngine, registerEngine } from "../engine/registry.ts";
-import { getChildByRecord, killAllSpawnedChildren, spawnedChildren } from "../session-runner.ts";
+import { getChildByRecord, killAllSpawnedChildren, spawnedChildren } from "../engine/engines/pi/session-runner.ts";
 
 /**
  * 假 child：只关心 killed 标记 + kill 调用（killAllSpawnedChildren 遍历用）。
@@ -63,6 +63,7 @@ function makeDisposingEngine(
       resume: "unsupported",
       interrupt: "kill-only",
       permissionMode: "fixed",
+      maxTurns: false,
     }),
     probe: () =>
       Promise.resolve({ ok: true, engineVersion: "0.0.0-test", checks: [{ name: "stub", ok: true }] }),

package/src/execution/__tests__/start-sync-model-guard.test.ts

@@ -30,14 +30,14 @@ vi.mock("node:child_process", async () => {
 });
 
 // buildSpawnArgs 包装为 spy（保留真实实现）——「非全等拒单不触达 spawn 参数组装」的承重断言。
-vi.mock("../session-runner.ts", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../session-runner.ts")>();
+vi.mock("../engine/engines/pi/session-runner.ts", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../engine/engines/pi/session-runner.ts")>();
   return { ...actual, buildSpawnArgs: vi.fn(actual.buildSpawnArgs) };
 });
 
 import { ModelConfigService } from "../model-config-service.ts";
 import type { ModelInfo, ModelRegistryLike } from "../model-resolver.ts";
-import { buildSpawnArgs } from "../session-runner.ts";
+import { buildSpawnArgs } from "../engine/engines/pi/session-runner.ts";
 import type { PiLike } from "../subagent-service.ts";
 import { SubagentService } from "../subagent-service.ts";
 
@@ -128,7 +128,7 @@ describe("start 同步期裁决（U1 验收 3：非全等 → isError 且无 spa
   });
 
   it("全等入参通过裁决（reject 不发生，放行链路触达 spawn 参数组装）——守卫零误伤对照", async () => {
-    // 放行路径会进入 kickOffBackground（detached）；execute resolve 即视为裁决放行。
+    // 放行路径会进入轮次 kick-off（detached）；execute resolve 即视为裁决放行。
     // spawn 本身由 FakeChild 缺失抛错收口——本断言只关心「越过了同步裁决」：
     // execute 不 reject，且 buildSpawnArgs 已被调（或即将被调的 record 已创建）。
     const promise = service.execute({

package/src/execution/__tests__/stdin-writer.test.ts

@@ -33,7 +33,7 @@ vi.mock("../../core/logger.ts", () => ({
   getLogger: () => loggerMock,
 }));
 
-import { respond, sendGetStateCommand, sendPromptCommand } from "../stdin-writer.ts";
+import { respond, sendGetStateCommand, sendPromptCommand } from "../engine/engines/pi/stdin-writer.ts";
 
 // ── helpers ──
 
@@ -362,8 +362,10 @@ describe("sendGetStateCommand", () => {
 describe("writeStdinLine 背压 — write 返回 false 时 warn 不 throw", () => {
   it("child.stdin.write 返回 false → warn 一次，函数正常返回（不 throw）", () => {
     // 构造 write 永远返回 false 的假 stream（模拟内核缓冲满/HWM 到达）
+    // 保留 vi.fn 引用（经 PassThrough 视图后 write 的 mock 面不可达）
+    const fakeWrite = vi.fn((_chunk: unknown) => false);
     const fakeStdin = {
-      write: vi.fn(() => false),
+      write: fakeWrite,
       destroyed: false,
     } as unknown as PassThrough;
     const child = { stdin: fakeStdin } as unknown as ChildProcess;
@@ -371,8 +373,8 @@ describe("writeStdinLine 背压 — write 返回 false 时 warn 不 throw", () =
     expect(() => respond(child, "req-backpressure", { value: "x" })).not.toThrow();
 
     // write 被调一次（写入 command 行）
-    expect(fakeStdin.write).toHaveBeenCalledTimes(1);
-    const writtenArg = fakeStdin.write.mock.calls[0]?.[0] as string;
+    expect(fakeWrite).toHaveBeenCalledTimes(1);
+    const writtenArg = fakeWrite.mock.calls[0]![0] as string;
     expect(writtenArg).toContain("extension_ui_response");
     expect(writtenArg).toContain("req-backpressure");
     expect(writtenArg.endsWith("\n")).toBe(true);

package/src/execution/__tests__/stream-sink-retirement.test.ts

@@ -3,7 +3,7 @@
 // widget 私货通道退役步骤 2（E 方案 §6.3）测试，两层：
 //   判定层：createBackgroundStream 真实函数（vi.importActual 绕过文件级 mock）——
 //   gui+relay 激活不创建；tui / relay 未激活 / headless 原样创建；sink=null 恒降级。
-//   接线层：SubagentService.execute（background → kickOffBackground 同步段）透传
+//   接线层：SubagentService.execute（background → kickOffChatRound 同步段）透传
 //   mode/streamSink 给工厂——mode 传错 = 判定失效，故接线面必须锁定。
 //
 // spawn 层 mock（FakeChild），与 nested-visibility-env-propagation.test.ts 同模式。
@@ -103,7 +103,7 @@ vi.mock("../manifest-store.ts", () => {
   return { ManifestStore: vi.fn(function (_recordsDir: string) { return new FakeManifestStore(); }) };
 });
 
-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` };
@@ -156,7 +156,7 @@ const ctxModel: ModelInfo = { id: "m", name: "M", provider: "p", reasoning: fals
 
 function setupService(mode: ExtensionMode | undefined, sessionId = "retire-it"): SubagentService {
   const agentDir = "/tmp/stream-retire-it";
-  const modelService = new ModelConfigService({ agentDir });
+  const modelService = new ModelConfigService({ agentDir, cwd: agentDir });
   modelService.initModel({
     modelRegistry: makeEmptyRegistry(),
     sessionId,
@@ -176,7 +176,7 @@ function setupService(mode: ExtensionMode | undefined, sessionId = "retire-it"):
   return service;
 }
 
-/** 等 kickOffBackground 的 detached runAndFinalize 走到 spawn（stream 创建先于此）。 */
+/** 等 kickOffChatRound 的 detached 轮次执行走到 spawn（stream 创建先于此）。 */
 async function waitForSpawnCall(): Promise<void> {
   const baseline = mockSpawn.mock.calls.length;
   const deadline = Date.now() + 2000;
@@ -187,7 +187,7 @@ async function waitForSpawnCall(): Promise<void> {
 }
 
 async function executeBackground(service: SubagentService): Promise<void> {
-  await service.execute({ task: "retire test", ctxModel });
+  await service.execute({ task: "retire test", slug: "test", ctxModel });
   await waitForSpawnCall();
   // 推进 detached runSpawn 收尾（FakeChild close），防句柄悬挂干扰后续用例
   lastSpawnedChild().emit("close", 0);
@@ -234,7 +234,7 @@ describe("退役步骤 2 判定层：createBackgroundStream", () => {
 
 // ── 接线层：service → 工厂的参数透传（mode 传错 = 判定失效）──
 
-describe("退役步骤 2 接线层：kickOffBackground 透传 mode/sink 给工厂", () => {
+describe("退役步骤 2 接线层：kickOffChatRound 透传 mode/sink 给工厂", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     for (const key of RELAY_ENV_KEYS) delete process.env[key];

package/src/execution/__tests__/subagent-actions-core.test.ts

@@ -42,9 +42,9 @@ import type {
   ExecutionHandle,
   ExecutionRecord,
   SubagentRecord,
-  SubagentService,
   SubagentToolDetails,
 } from "../types.ts";
+import type { SubagentService } from "../subagent-service.ts";
 
 // ── 时钟固定（duration 快照确定性，见文件头）──
 const FROZEN_NOW = 1788189209000;
@@ -132,17 +132,35 @@ function makeRec(over: Partial<SubagentRecord> = {}): SubagentRecord {
 }
 
 function makeService(over: Record<string, unknown> = {}): SubagentService {
-  return {
+  // 聚合面形态对齐 subagent-service.ts D4：queries（读模型）与 chatActions（对话
+  // action 面）分组挂载，mock 按同构 key 装配（over 仍传平铺 key，最小化快照用例改动）。
+  const m = {
     execute: vi.fn(),
-    findRecord: vi.fn(() => undefined),
     cancel: vi.fn(() => false),
+    findRecord: vi.fn(() => undefined),
     collectRecords: vi.fn(() => [] as SubagentRecord[]),
     getFullRecord: vi.fn(() => undefined as SubagentRecord | undefined),
     lookupRecordAnyState: vi.fn(() => undefined as SubagentRecord | undefined),
     getRecordForAction: vi.fn(),
     closeSubagent: vi.fn(),
-    deliverMessage: vi.fn(),
+    deliverChatMessage: vi.fn(),
     ...over,
+  };
+  return {
+    execute: m.execute,
+    cancel: m.cancel,
+    queries: {
+      findRecord: m.findRecord,
+      lookupRecordAnyState: m.lookupRecordAnyState,
+      collectRecords: m.collectRecords,
+      getFullRecord: m.getFullRecord,
+      onChange: vi.fn(() => () => {}),
+    },
+    chatActions: {
+      getRecordForAction: m.getRecordForAction,
+      closeSubagent: m.closeSubagent,
+      deliverChatMessage: m.deliverChatMessage,
+    },
   } as unknown as SubagentService;
 }
 
@@ -290,7 +308,7 @@ describe("⛔4 startHandler（校验 + 启动，快照 = pi-sw 实测）", () =>
   });
 
   it("正常启动 → 领域对象全字段 + execute 参数（task/slug trim、拍平透传、ctxModel/signal）", async () => {
-    const execute = vi.fn(async (): Promise<ExecutionHandle> => ({
+    const execute = vi.fn(async (_opts: { task: string; slug?: string; agent?: string }): Promise<ExecutionHandle> => ({
       mode: "background",
       subagentId: "bg-9-abc",
       sessionFile: "sess-9.jsonl",
@@ -334,7 +352,7 @@ describe("⛔4 startHandler（校验 + 启动，快照 = pi-sw 实测）", () =>
       },
     });
     expect(execute).toHaveBeenCalledTimes(1);
-    expect(execute.mock.calls[0][0]).toEqual({
+    expect(execute.mock.calls[0]![0]).toEqual({
       task: "long task", // trim 生效
       slug: "long-running",
       agent: "/x/agent.md",
@@ -489,6 +507,8 @@ describe("⛔4 cancelHandler（守卫 + 归属判定 + CAS 失败映射，快照
     expect(
       await errOf(() =>
         cancelHandler(
+          // "sync" 是历史已裁撤值（ExecutionMode 现仅 "background"）——经 as never
+          // 注入非法值专测守卫分支，运行时守卫按 !== "background" 拦截
           makeService({ findRecord: vi.fn(() => makeRec({ id: "bg-1", mode: "sync" as never })) }),
           { subagentId: "bg-1" },
         ),
@@ -587,11 +607,11 @@ describe("⛔4 messageHandler（守卫 + upgrade + 投递，快照 = pi-sw 实
     });
   });
 
-  it("chatMode record → deliverMessage(text trim + interrupt) + 领域对象", async () => {
-    const deliverMessage = vi.fn(async () => {});
+  it("chatMode record → deliverChatMessage(text trim + interrupt) + 领域对象", async () => {
+    const deliverChatMessage = vi.fn(async () => {});
     const chatRecord = makeExecRecord({ id: "bg-1", chatMode: true, slug: "src-slug" });
     const r = await messageHandler(
-      makeService({ getRecordForAction: vi.fn(() => chatRecord), deliverMessage }),
+      makeService({ getRecordForAction: vi.fn(() => chatRecord), deliverChatMessage }),
       { subagentId: "bg-1", text: "  go on  ", interrupt: true },
     );
     expect(r).toEqual({
@@ -600,18 +620,18 @@ describe("⛔4 messageHandler（守卫 + upgrade + 投递，快照 = pi-sw 实
       slug: "src-slug",
       response: { delivered: true },
     });
-    expect(deliverMessage).toHaveBeenCalledWith(chatRecord, "go on", true);
+    expect(deliverChatMessage).toHaveBeenCalledWith(chatRecord, "go on", true);
   });
 
   it("one-shot upgrade：非 chatMode running record 收 message → 置位 chatMode 后投递", async () => {
-    const deliverMessage = vi.fn(async () => {});
+    const deliverChatMessage = vi.fn(async () => {});
     const upgradeRec = makeExecRecord({ id: "bg-1", chatMode: false, status: "running" });
     await messageHandler(
-      makeService({ getRecordForAction: vi.fn(() => upgradeRec), deliverMessage }),
+      makeService({ getRecordForAction: vi.fn(() => upgradeRec), deliverChatMessage }),
       { subagentId: "bg-1", text: "hi" },
     );
     expect(upgradeRec.chatMode).toBe(true);
-    expect(deliverMessage).toHaveBeenCalledWith(upgradeRec, "hi", false);
+    expect(deliverChatMessage).toHaveBeenCalledWith(upgradeRec, "hi", false);
   });
 
   it("getRecordForAction 拒绝 + 无终态快照 → 原错误透传（文案最准原则）", async () => {
@@ -774,7 +794,7 @@ describe("⛔4 closeHandler（force 语义透传，快照 = pi-sw 实测）", ()
 // forkFromHandler（守卫链 1–6）
 // ============================================================
 describe("⛔4 forkFromHandler（守卫链 + slug 派生 + prompt 包装，快照 = pi-sw 实测）", () => {
-  function makeForkService(source: SubagentRecord | undefined, execute = vi.fn(async (): Promise<ExecutionHandle> => ({
+  function makeForkService(source: SubagentRecord | undefined, execute = vi.fn(async (_opts: { task: string; slug?: string; agent?: string }): Promise<ExecutionHandle> => ({
     mode: "background",
     subagentId: "bg-new-1",
     sessionFile: "sess-new.jsonl",
@@ -899,7 +919,7 @@ describe("⛔4 forkFromHandler（守卫链 + slug 派生 + prompt 包装，快
   });
 
   it("正常：显式 prompt → wrapForkFromPrompt 包装 + slug 派生 'src-slug-resumed' + execute 参数", async () => {
-    const execute = vi.fn(async (): Promise<ExecutionHandle> => ({
+    const execute = vi.fn(async (_opts: { task: string; slug?: string; agent?: string }): Promise<ExecutionHandle> => ({
       mode: "background",
       subagentId: "bg-new-1",
       sessionFile: "sess-new.jsonl",
@@ -928,7 +948,7 @@ describe("⛔4 forkFromHandler（守卫链 + slug 派生 + prompt 包装，快
   });
 
   it("无 prompt → FORK_FROM_DEFAULT_PROMPT 逐字", async () => {
-    const execute = vi.fn(async (): Promise<ExecutionHandle> => ({
+    const execute = vi.fn(async (_opts: { task: string; slug?: string; agent?: string }): Promise<ExecutionHandle> => ({
       mode: "background",
       subagentId: "bg-new-2",
       sessionFile: "sess-new-2.jsonl",
@@ -955,7 +975,7 @@ describe("⛔4 forkFromHandler（守卫链 + slug 派生 + prompt 包装，快
   });
 
   it("slug 派生：34 字符源 slug 截 27 + '-resumed'；fallback 链 slug||agent||'resumed'", async () => {
-    const execute34 = vi.fn(async (): Promise<ExecutionHandle> => ({
+    const execute34 = vi.fn(async (_opts: { task: string; slug?: string; agent?: string }): Promise<ExecutionHandle> => ({
       mode: "background",
       subagentId: "bg-new-3",
       sessionFile: undefined,
@@ -965,9 +985,9 @@ describe("⛔4 forkFromHandler（守卫链 + slug 派生 + prompt 包装，快
       makeForkService(makeRec({ id: "bg-1", slug: "s".repeat(34), sessionFile: "sess-1.jsonl" }), execute34),
       { sourceSubagentId: "bg-1", prompt: "p" },
     );
-    expect(execute34.mock.calls[0][0].slug).toBe(`${"s".repeat(27)}-resumed`);
+    expect(execute34.mock.calls[0]![0].slug).toBe(`${"s".repeat(27)}-resumed`);
 
-    const executeAgent = vi.fn(async (): Promise<ExecutionHandle> => ({
+    const executeAgent = vi.fn(async (_opts: { task: string; slug?: string; agent?: string }): Promise<ExecutionHandle> => ({
       mode: "background",
       subagentId: "bg-new-4",
       sessionFile: undefined,
@@ -980,9 +1000,9 @@ describe("⛔4 forkFromHandler（守卫链 + slug 派生 + prompt 包装，快
       ),
       { sourceSubagentId: "bg-1", prompt: "p" },
     );
-    expect(executeAgent.mock.calls[0][0].slug).toBe("/home/u/agents/helper.md-resumed");
+    expect(executeAgent.mock.calls[0]![0].slug).toBe("/home/u/agents/helper.md-resumed");
 
-    const executeResumed = vi.fn(async (): Promise<ExecutionHandle> => ({
+    const executeResumed = vi.fn(async (_opts: { task: string; slug?: string; agent?: string }): Promise<ExecutionHandle> => ({
       mode: "background",
       subagentId: "bg-new-5",
       sessionFile: undefined,
@@ -992,6 +1012,6 @@ describe("⛔4 forkFromHandler（守卫链 + slug 派生 + prompt 包装，快
       makeForkService(makeRec({ id: "bg-1", slug: "", agent: "", sessionFile: "sess-1.jsonl" }), executeResumed),
       { sourceSubagentId: "bg-1", prompt: "p" },
     );
-    expect(executeResumed.mock.calls[0][0].slug).toBe("resumed-resumed");
+    expect(executeResumed.mock.calls[0]![0].slug).toBe("resumed-resumed");
   });
 });

package/src/execution/__tests__/subagent-service-message-close.test.ts

@@ -20,7 +20,7 @@ const { loggerMock, killEscalationSpy } = vi.hoisted(() => ({
 vi.mock("../../core/logger.ts", () => ({ getLogger: () => loggerMock }));
 
 // mock session-runner（import 链需要 runSpawn/killAllSpawnedChildren/getChildByRecord 存在）
-vi.mock("../session-runner.ts", () => ({
+vi.mock("../engine/engines/pi/session-runner.ts", () => ({
   runSpawn: vi.fn(),
   killAllSpawnedChildren: vi.fn(),
   getChildByRecord: vi.fn(() => undefined),
@@ -30,12 +30,13 @@ vi.mock("../session-runner.ts", () => ({
 }));
 
 import { createRecord, updateFromEvent } from "../execution-record.ts";
+import { createNotifyHost } from "../notify-host.ts";
 import { ModelConfigService } from "../model-config-service.ts";
 import { RecordStore } from "../record-store.ts";
 import { SubagentService } from "../subagent-service.ts";
 import type { PiLike } from "../subagent-service.ts";
 import type { ExecutionRecord } from "../types.ts";
-import { getChildByRecord } from "../session-runner.ts";
+import { getChildByRecord } from "../engine/engines/pi/session-runner.ts";
 
 // [T2④] kill 收敛入口 spy（工厂引用，断言服务侧三条路径收敛到它）
 const killRecordChildWithEscalationMock = killEscalationSpy;
@@ -95,7 +96,7 @@ function setup(): {
   pi: MockPi;
 } {
   const agentDir = makeTmpAgentDir();
-  const modelService = new ModelConfigService({ agentDir });
+  const modelService = new ModelConfigService({ agentDir, cwd: agentDir });
   const service = new SubagentService({ cwd: agentDir, modelService });
   // [C2] pi 提为外层引用（对照 real-chain :139-140 形态）——close 现状语义断言需读
   // pi.sendMessage.mock.calls（末条通知 content 指针行），内联构造不保留引用。
@@ -121,23 +122,23 @@ describe("getRecordForAction 归属守卫（决策 3）", () => {
 
   afterEach(() => {
     service.dispose();
-    fs.rmSync(agentDir, { recursive: true, force: true });
+    fs.rmSync(agentDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   it("正常（rootSessionId 匹配）→ 返回可变 record", () => {
     const record = makeRecord({ rootSessionId: sessionRootId });
     store.register(record);
-    expect(service.getRecordForAction(record.id)).toBe(record);
+    expect(service.chatActions.getRecordForAction(record.id)).toBe(record);
   });
 
   it("不存在 → throw not found or not owned", () => {
-    expect(() => service.getRecordForAction("sa-nonexistent")).toThrow(/not found or not owned/);
+    expect(() => service.chatActions.getRecordForAction("sa-nonexistent")).toThrow(/not found or not owned/);
   });
 
   it("rootSessionId 不匹配 → throw not found or not owned（不区分 not found vs not owned，防信息泄露）", () => {
     const record = makeRecord({ id: "sa-other", rootSessionId: "other-session" });
     store.register(record);
-    expect(() => service.getRecordForAction("sa-other")).toThrow(/not found or not owned/);
+    expect(() => service.chatActions.getRecordForAction("sa-other")).toThrow(/not found or not owned/);
   });
 });
 
@@ -157,7 +158,7 @@ describe("closeSubagent 行为分流", () => {
 
   afterEach(() => {
     service.dispose();
-    fs.rmSync(agentDir, { recursive: true, force: true });
+    fs.rmSync(agentDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   it("running + force:false + 有活进程 → 置 closeAfterRound=true（不立即终态，等轮完）", async () => {
@@ -167,7 +168,7 @@ describe("closeSubagent 行为分流", () => {
     const record = makeRecord({ status: "running" });
     store.register(record);
 
-    await service.closeSubagent(record, false);
+    await service.chatActions.closeSubagent(record, false);
 
     expect(record.closeAfterRound).toBe(true);
     expect(record.status).toBe("running"); // 仍 running
@@ -181,7 +182,7 @@ describe("closeSubagent 行为分流", () => {
     record.sessionFile = path.join(agentDir, "test.jsonl");
     store.register(record);
 
-    await service.closeSubagent(record, false);
+    await service.chatActions.closeSubagent(record, false);
 
     expect(record.status).toBe("closed");
     expect(store.getMutable(record.id)).toBeUndefined(); // archived
@@ -191,7 +192,7 @@ describe("closeSubagent 行为分流", () => {
     const record = makeRecord({ status: "running", sessionFile: path.join(agentDir, "run.jsonl") });
     store.register(record);
 
-    await service.closeSubagent(record, true);
+    await service.chatActions.closeSubagent(record, true);
 
     // v4 B-1：cancelled 折入 closed（closedReason='cancelled' 区分用户取消语义）
     expect(record.status).toBe("closed");
@@ -203,7 +204,7 @@ describe("closeSubagent 行为分流", () => {
     const record = makeRecord({ status: "closed" });
     store.register(record);
 
-    await service.closeSubagent(record, false);
+    await service.chatActions.closeSubagent(record, false);
 
     expect(record.status).toBe("closed"); // 不变
   });
@@ -223,7 +224,7 @@ describe("closeSubagent 行为分流", () => {
     expect(hasIdleTimer(record.id)).toBe(true);
 
     try {
-      await service.closeSubagent(record, false);
+      await service.chatActions.closeSubagent(record, false);
     } finally {
       disarmIdleTimer(record.id); // 断言失败路径的兜底清理
     }
@@ -242,7 +243,7 @@ describe("closeSubagent 行为分流", () => {
     record.sessionFile = path.join(agentDir, "path-b.jsonl");
     store.register(record);
 
-    await service.closeSubagent(record, false);
+    await service.chatActions.closeSubagent(record, false);
 
     expect(record.status).toBe("closed");
     expect(record.closedReason).toBe("user-close");
@@ -269,7 +270,7 @@ describe("closeSubagent 行为分流", () => {
     expect(hasIdleTimer(record.id)).toBe(true);
 
     try {
-      await service.closeSubagent(record, true);
+      await service.chatActions.closeSubagent(record, true);
     } finally {
       disarmIdleTimer(record.id); // 断言失败路径的兜底清理
     }
@@ -299,7 +300,7 @@ describe("cancelBackground CAS 抢锁（A2-1）——cancel 迟到不覆写已
 
   afterEach(() => {
     service.dispose();
-    fs.rmSync(agentDir, { recursive: true, force: true });
+    fs.rmSync(agentDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   it("record 已 closed 未 archive（doFinalizeRecord Step 0 await 窗口形态）→ cancel 返回 false，不覆写终态/不写 tombstone/不 notify/不 archive", () => {
@@ -354,7 +355,7 @@ describe("[M5] closeAfterRound 消费点挂 onRoundSettled（chatMode 轮完成
   afterEach(() => {
     service.dispose();
     _resetLifecycleState();
-    fs.rmSync(agentDir, { recursive: true, force: true });
+    fs.rmSync(agentDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   it("热路径轮完成（onRoundSettled）+ closeAfterRound=true → 消费标志终态化（closed+user-close + archive）", async () => {
@@ -428,7 +429,7 @@ describe("[C2] close 现状语义 + sessionFile 条件透传", () => {
   afterEach(() => {
     service.dispose();
     _resetLifecycleState();
-    fs.rmSync(agentDir, { recursive: true, force: true });
+    fs.rmSync(agentDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
 	it("close 语义：轮次通知（含指针行）发出后 closeAfterRoundSettled 终态化 + 终态通知，两条都送达", async () => {
@@ -473,8 +474,10 @@ describe("[C2] close 现状语义 + sessionFile 条件透传", () => {
 
     // running + 无活进程（getChildByRecord mock undefined）→ isResumable 放行 →
     // 非 chatMode 映射 closed 通知，立即 flush（无其他 running background）
-    const svc = service as unknown as { notifyComplete(r: ExecutionRecord): void };
-    svc.notifyComplete(record);
+    // [D4-①] notifyComplete 已随通知簇搬至 notify-host——按轴直接构造（同 pi/store
+    // 注入，行为与经 Service 的原路径等价；dedup 集为空与单次调用断言相容）
+    createNotifyHost({ getPi: () => pi, listRunning: () => store.listRunning(), getIsIdle: () => undefined })
+      .notifyComplete(record);
 
     expect(pi.sendMessage).toHaveBeenCalledTimes(1);
     const msg = pi.sendMessage.mock.calls[0]![0] as {
@@ -493,8 +496,8 @@ describe("[C2] close 现状语义 + sessionFile 条件透传", () => {
     record.sessionFile = path.join(agentDir, "c2-chat.jsonl");
     store.register(record);
 
-    const svc = service as unknown as { notifyComplete(r: ExecutionRecord): void };
-    svc.notifyComplete(record);
+    createNotifyHost({ getPi: () => pi, listRunning: () => store.listRunning(), getIsIdle: () => undefined })
+      .notifyComplete(record);
 
     expect(pi.sendMessage).toHaveBeenCalledTimes(1);
     const msg = pi.sendMessage.mock.calls[0]![0] as {
@@ -526,7 +529,7 @@ describe("[C-4] onRoundSettled 轮次增量 + [C-1] close 终态通知", () => {
   afterEach(() => {
     service.dispose();
     _resetLifecycleState();
-    fs.rmSync(agentDir, { recursive: true, force: true });
+    fs.rmSync(agentDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   /** 真实回调链（与生产一致：agent_settled → onRoundSettled），turns 经 updateFromEvent 累积。 */
@@ -601,7 +604,7 @@ describe("[C-4] onRoundSettled 轮次增量 + [C-1] close 终态通知", () => {
       updateFromEvent(record, { type: "text_delta", delta: "LAST-ROUND-INCREMENT" });
       updateFromEvent(record, { type: "turn_end" });
       settleRound(record); // 第 1 条：轮次通知
-      await service.closeSubagent(record, false); // idle close（D2 路径②）
+      await service.chatActions.closeSubagent(record, false); // idle close（D2 路径②）
     } finally {
       disarmIdleTimer(record.id);
     }
@@ -651,7 +654,7 @@ describe("[C-4] onRoundSettled 轮次增量 + [C-1] close 终态通知", () => {
     record.sessionFile = path.join(agentDir, "oneshot-close.jsonl");
     store.register(record);
 
-    await service.closeSubagent(record, false); // resumable → closeChatIdle → notifyClosed 拒绝
+    await service.chatActions.closeSubagent(record, false); // resumable → closeChatIdle → notifyClosed 拒绝
 
     expect(record.status).toBe("closed");
     expect(pi.sendMessage).not.toHaveBeenCalled();
@@ -672,7 +675,7 @@ describe("[C-4] onRoundSettled 轮次增量 + [C-1] close 终态通知", () => {
       updateFromEvent(record, { type: "turn_end" });
       settleRound(record); // 轮终：onRoundSettled 写 record.result = "ok"
       expect(record.result).toBe("ok"); // 前提锚点：轮终真实值在位
-      await service.closeSubagent(record, false); // idle close → completeRecord + archive
+      await service.chatActions.closeSubagent(record, false); // idle close → completeRecord + archive
     } finally {
       disarmIdleTimer(record.id);
     }

package/src/execution/__tests__/subagent-service-multiproc-guard.test.ts

@@ -34,7 +34,7 @@ vi.mock("../alive-store.ts", () => ({
   findForeignLiveInstance: foreignLiveSpy,
 }));
 
-vi.mock("../session-runner.ts", () => ({
+vi.mock("../engine/engines/pi/session-runner.ts", () => ({
   runSpawn: vi.fn(),
   killAllSpawnedChildren: vi.fn(),
   getChildByRecord: vi.fn(() => undefined),
@@ -63,7 +63,7 @@ function makePi(): PiLike {
 
 function setup(): { agentDir: string; service: SubagentService; store: RecordStore } {
   const agentDir = makeTmpAgentDir();
-  const modelService = new ModelConfigService({ agentDir });
+  const modelService = new ModelConfigService({ agentDir, cwd: agentDir });
   const service = new SubagentService({ cwd: agentDir, modelService });
   service.initSession({ pi: makePi(), sessionId: "root-session" });
   const store = (service as unknown as { store: RecordStore }).store;
@@ -79,7 +79,7 @@ describe("T5① child process skips orphan recovery scan", () => {
     recover: ReturnType<typeof vi.spyOn>;
     entryOnly: ReturnType<typeof vi.spyOn>;
   } => {
-    const modelService = new ModelConfigService({ agentDir });
+    const modelService = new ModelConfigService({ agentDir, cwd: agentDir });
     const svc = new SubagentService({ cwd: agentDir, modelService });
     const store = (svc as unknown as { store: RecordStore }).store;
     const recover = vi.spyOn(store, "recoverOrphanRecords").mockImplementation(() => {});
@@ -95,7 +95,7 @@ describe("T5① child process skips orphan recovery scan", () => {
   afterEach(() => {
     vi.unstubAllEnvs();
     vi.restoreAllMocks();
-    fs.rmSync(agentDir, { recursive: true, force: true });
+    fs.rmSync(agentDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   it("root process (no self-record env) runs the orphan recovery scan", () => {
@@ -127,7 +127,7 @@ describe("T5③ cold-lookup running candidate foreign-instance guard", () => {
 
   afterEach(() => {
     vi.restoreAllMocks();
-    fs.rmSync(agentDir, { recursive: true, force: true });
+    fs.rmSync(agentDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
   });
 
   const stubColdCandidate = (record: {
@@ -150,9 +150,9 @@ describe("T5③ cold-lookup running candidate foreign-instance guard", () => {
     });
     foreignLiveSpy.mockReturnValue({ pid: 4242, id: "sa-foreign", startedAt: Date.now() });
 
-    expect(() => service.getRecordForAction("sa-foreign")).toThrow(ResurrectDeniedError);
+    expect(() => service["getRecordForAction"]("sa-foreign")).toThrow(ResurrectDeniedError);
     try {
-      service.getRecordForAction("sa-foreign");
+      service["getRecordForAction"]("sa-foreign");
     } catch (err) {
       expect((err as Error).message).toContain("4242");
       expect((err as Error).message).toContain("double-write");
@@ -168,7 +168,7 @@ describe("T5③ cold-lookup running candidate foreign-instance guard", () => {
       sessionFile: "/tmp/fake-session-2.jsonl",
       rootSessionId: "root-session",
     });
-    const found = service.getRecordForAction("sa-cold");
+    const found = service["getRecordForAction"]("sa-cold");
     expect(found.id).toBe("sa-cold");
   });
 });