@zhushanwen/pi-subagent-workflow 8.5.0 → 8.7.0

package/src/execution/__tests__/execute-nesting.test.ts

@@ -1,323 +0,0 @@
-// src/__tests__/execute-nesting.test.ts
-//
-// D-030~D-033 嵌套 / 并发池 / 节流回归锁。独立于 execute-integration.test.ts。
-//
-// 用例：
-//   D-032  background 进并发池（分层配额：max(1, maxConcurrent - depth)）
-//   D-033  execute 入口通用嵌套护栏（execCtxAls 计 fork+非 fork 嵌套，深度>MAX 拒）
-//   （原「嵌套抑制 onUpdate」「节流清理 throttleState」用例组已随 onEventThrottled
-//   死路径删除一并移除——swf-perf-impl ledger #22 / cleanup-slice TC4）
-//
-// ── mock 策略 ──
-//
-// [关键] runSpawn（session-runner.ts）通过 child_process.spawn("pi",...) 启动子进程，
-//   事件经 stdout JSON 流回流。它 **不走 getSdk / createAgentSession**。
-//   因此本文件 mock 的是 node:child_process.spawn（返回 FakeChild），而非 getSdk/fakeSession
-//   （那是对 in-process run() 的旧 mock，在 spawn 改造后是死代码）。
-//
-//   mock 模式参考 run-spawn-integration.test.ts（该文件是 spawn 改造后的正确 mock 范式）：
-//     - node:child_process.spawn → FakeChild（EventEmitter + PassThrough），测试控制器
-//       emit stdout JSON 行（header + SdkEvent）/ stderr / close 时序。
-//     - node:child_process.execFile → err-first callback 默认兜底（buildEnvBlock 的 git
-//       branch 调用失败 → catch → branch=""，避免副作用）。
-//     - node:fs 同步方法 → mock（mkdirSync/existsSync/appendFileSync/writeFileSync/readdirSync），
-//       避免 sessionDir/sessionFile 触碰真实文件系统。
-//     - fs.promises.* → 保留真实实现（temp-prompt 整体被 mock，不触发真实 I/O）。
-//     - temp-prompt → mock（writePromptToTempFile 返回固定路径，消除 fake-timers flaky）。
-//     - alive-store.writeAliveMarker → mock（避免写 .alive sidecar）。
-//
-//   所有断言语义不变：它们测的是 SubagentService 的 **编排逻辑**
-//   （pool.acquire / execCtxAls 深度），这些逻辑
-//   无论事件来自 fakeSession.subscribe 还是 FakeChild.stdout 都一致。
-
-import type { PassThrough } from "node:stream";
-
-import { afterEach, describe, expect, it, vi } from "vitest";
-
-// ── mock modules ──
-//
-// vitest 会把 vi.mock 提升到文件顶部（早于其他 import / 声明）。mock 工厂若要引用
-// FakeChild，需在工厂内部 import（async 工厂可用 await import），而非引用顶部
-// 顶层 import（它们在 vi.mock 执行时尚未绑定）。
-
-vi.mock("node:child_process", async () => {
-  const { EventEmitter } = await import("node:events");
-  const { PassThrough } = await import("node:stream");
-
-  // FakeChild：模拟 ChildProcess（EventEmitter + PassThrough streams）。
-  // 测试通过 lastSpawnedChild() 取回实例，控制 emit stdout JSON 行 / close 时序。
-  class FakeChild extends EventEmitter {
-    pid = 12345;
-    stdout = new PassThrough();
-    stderr = new PassThrough();
-    killed = false;
-    killSignal: string | undefined;
-    kill(sig?: string): boolean {
-      this.killed = true;
-      this.killSignal = sig;
-      return true;
-    }
-  }
-
-  return {
-    spawn: vi.fn(() => new FakeChild()),
-    // buildEnvBlock 的 git branch 调用（execFile 异步）：默认 err-first 兜底 → catch → branch=""
-    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（runSpawn 用到的全部），promises 保留真实实现（temp-prompt 用）。
-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(() => []),
-    },
-    // 具名导出与 default 保持一致
-    mkdirSync: vi.fn(),
-    existsSync: vi.fn(() => false),
-    appendFileSync: vi.fn(),
-    writeFileSync: vi.fn(),
-    readdirSync: vi.fn(() => []),
-    // promises 保留真实实现——temp-prompt 已被 mock（见下方 vi.mock），不再触发真实 I/O
-    promises: actual.promises,
-  };
-});
-
-// alive-store：mock writeAliveMarker（runSpawn 写 .alive sidecar）+ removeAliveMarker
-// （finalizeRecord 收尾删 .alive）。其余导出（readAliveMarker/isProcessAlive）保留真实实现
-// （worktree-manager/record-store 用，本组用例不涉及但保留以避免间接报错）。
-vi.mock("../alive-store.ts", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../alive-store.ts")>();
-  return {
-    ...actual,
-    writeAliveMarker: vi.fn(),
-    removeAliveMarker: vi.fn(),
-  };
-});
-
-// finalized-marker mock：避免真实 fs 写 sidecar（测试不关心 finalized 行为）
-vi.mock("../finalized-marker.ts", () => ({
-  writeFinalized: vi.fn(),
-  readFinalized: vi.fn(() => false),
-}));
-
-// manifest-store mock：writeManifest 用真实 fs.promises 写盘，但本文件 fs 同步方法已 mock
-// （目录从不真实创建）→ open/rename/unlink 全 ENOENT → bestEffort 异步 console.debug。
-// 这些延迟 console 通过 worker RPC（onUserConsoleLog）回流，与 vitest teardown 形成 race：
-// "Closing rpc while onUserConsoleLog was pending" → unhandled rejection / exit 1（flaky）。
-// 本组用例测编排逻辑（pool / depth / throttle），不测 manifest 持久化（有 manifest-store.test.ts
-// 独立覆盖）。故 mock 成 no-op，消除 teardown race 的根因——异步 console 输出。
-vi.mock("../manifest-store.ts", () => {
-  class FakeManifestStore {
-    writeManifest = vi.fn(async () => {});
-    readManifest = vi.fn(async () => null);
-    listAllSync = vi.fn(() => []);
-    recoverTmpFiles = vi.fn(async () => []);
-  }
-  return { ManifestStore: FakeManifestStore };
-});
-
-// temp-prompt：mock 掉真实 fs.promises I/O，消除 fake-timers 下的 flaky 竞态
-// （详见 run-spawn-integration.test.ts 同名 mock 的注释）。
-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 () => {}),
-}));
-
-import { spawn } from "node:child_process";
-
-import { waitForSpawn } from "./helpers/spawn-mock.ts";
-import { ModelConfigService } from "../model-config-service.ts";
-import type { ModelInfo, ModelRegistryLike } from "../model-resolver.ts";
-import { MAX_FORK_DEPTH } from "../session-context-resolver.ts";
-import { SubagentService } from "../subagent-service.ts";
-
-const mockSpawn = vi.mocked(spawn);
-
-/**
- * spawn mock 返回的 fake child 类型。
- * 由于 FakeChild 定义在 vi.mock 工厂内部（作用域隔离），此处用结构子集类型描述，
- * 测试代码通过此类型访问 stdout/stderr/kill 等成员。
- */
-interface FakeChild {
-  pid: number;
-  stdout: PassThrough;
-  stderr: PassThrough;
-  killed: boolean;
-  killSignal: string | undefined;
-  kill(sig?: string): boolean;
-  emit(event: string, ...args: unknown[]): boolean;
-}
-
-/** 从最近一次 spawn 调用取回返回的 FakeChild（测试控制器）。 */
-function lastSpawnedChild(): FakeChild {
-  const result = mockSpawn.mock.results.at(-1);
-  if (!result) throw new Error("spawn was not called yet");
-  return result.value as FakeChild;
-}
-
-// ============================================================
-// 辅助：FakeChild stdout 驱动（替代旧 fakeSession.subscribe 的事件注入）
-// ============================================================
-
-/** 构造 session header 行（stdout 首行，runSpawn 据此回填 record.sessionFile）。 */
-function sessionHeader(id = "nest-session"): Record<string, unknown> {
-  return {
-    type: "session",
-    id,
-    timestamp: "2026-07-03T12-00-00-000Z",
-    cwd: "/tmp/test",
-  };
-}
-
-/** 向 stdout 写一行 JSON（自动补换行，runSpawn 按 \n split 行）。 */
-function emitStdoutLine(child: FakeChild, obj: Record<string, unknown>): void {
-  child.stdout.write(`${JSON.stringify(obj)}\n`);
-}
-
-/**
- * 驱动 FakeChild 完成 session：写 header + 可选事件 + close(0)。
- *
- * 这是「让 runSpawn 自然 resolve」的标准收尾路径。runSpawn 在 close 后判定 success
- * （exitCode=0 → success=true），并跑 identity 补写 + finalizeRecord。
- *
- * @param events  header 之后、close 之前 emit 的 SdkEvent 行（tool/message/turn 等）
- */
-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);
-}
-
-// ============================================================
-// 辅助：service 构造（与旧 setup 等价，但不再装配 fakeSdk）
-// ============================================================
-
-function makeEmptyRegistry(): ModelRegistryLike {
-  return { getAvailable: () => [], find: () => undefined, hasConfiguredAuth: () => true };
-}
-
-function makePi() {
-  return { sendMessage: vi.fn(), appendEntry: vi.fn(), events: { emit: vi.fn() } };
-}
-
-interface SetupResult {
-  service: SubagentService;
-}
-
-function setup(): SetupResult {
-  const agentDir = "/tmp/nest-it"; // fs 已 mock，路径不需真实存在
-  const modelService = new ModelConfigService({ agentDir });
-  modelService.initModel({
-    modelRegistry: makeEmptyRegistry(),
-    sessionId: "nest-it",
-    ctxModel: { id: "m", name: "M", provider: "p", reasoning: false },
-  });
-  const service = new SubagentService({
-    cwd: agentDir,
-    modelService,
-    getMainSessionFile: () => "/mock/main-session.jsonl",
-  });
-  service.initSession({ pi: makePi(), sessionId: "nest-it" });
-  return { service };
-}
-
-const ctxModel: ModelInfo = { id: "m", name: "M", provider: "p", reasoning: false };
-
-/** execCtxAls.run 的 duck-type（绕过 import AsyncLocalStorage，足够本组用例）。 */
-interface ExecCtxAls {
-  run: <T>(store: { recordId: string | undefined; depth: number }, cb: () => T) => T;
-}
-
-describe("嵌套护栏 / 并发池 / 节流（D-030~D-033 回归锁）", () => {
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
-  // ============================================================
-  // D-032: background execute 进并发池（分层配额）
-  // ============================================================
-
-  it("[D-032] background execute 调 pool.acquire（进池限流）", async () => {
-    const { service } = setup();
-
-    const pool = Reflect.get(service, "pool") as { acquire: ReturnType<typeof vi.fn>; release: ReturnType<typeof vi.fn> };
-    const acquireSpy = vi.spyOn(pool, "acquire");
-
-    const execPromise = service.execute({ task: "bg in pool", ctxModel });
-    // detached runAndFinalize → acquire。等 spawn 拿到 child 再驱动完成。
-    await waitForSpawn(mockSpawn);
-    await driveChildToCompletion(lastSpawnedChild());
-
-    // 等 detached promise 链跑完（kickOffBackground 的 .then notify）
-    await new Promise<void>((r) => setTimeout(r, 10));
-
-    expect(acquireSpy).toHaveBeenCalled();
-    // background execute 立即返回 handle（不等完成）
-    const handle = await execPromise;
-    expect(handle.mode).toBe("background");
-  });
-
-  // ============================================================
-  // D-033: 通用嵌套护栏（execute 入口，execCtxAls 非 fork 路径）
-  // ============================================================
-
-  it("[D-033] execCtxAls depth=MAX 时 execute 抛错（nestingDepth=MAX+1 被拒）", async () => {
-    const { service } = setup();
-
-    const execCtxAls = Reflect.get(service, "execCtxAls") as ExecCtxAls;
-
-    await expect(
-      execCtxAls.run({ recordId: "parent", depth: MAX_FORK_DEPTH }, () =>
-        service.execute({ task: "too deep", ctxModel }),
-      ),
-    ).rejects.toThrow(/nesting depth/);
-
-    // 无副作用：guard 在 createRecordForMode 之前，record 未创建
-    expect(service.collectRecords(10)).toHaveLength(0);
-    // guard 在 spawn 之前——不应 spawn 任何子进程
-    expect(mockSpawn).not.toHaveBeenCalled();
-  });
-
-  it("[D-033] execCtxAls depth=MAX-1 时 execute 不抛（nestingDepth=MAX 允许）", async () => {
-    const { service } = setup();
-
-    const execCtxAls = Reflect.get(service, "execCtxAls") as ExecCtxAls;
-
-    const execPromise = execCtxAls.run({ recordId: "parent", depth: MAX_FORK_DEPTH - 1 }, () =>
-      service.execute({ task: "at limit", ctxModel }),
-    );
-    await waitForSpawn(mockSpawn);
-    await driveChildToCompletion(lastSpawnedChild(), [
-      { type: "turn_end" },
-      { type: "message_end", message: { usage: { input: 1 } } },
-    ]);
-    const result = await execPromise;
-
-    expect(result.mode).toBe("background");
-  });
-
-  // ============================================================
-  // 原嵌套抑制 onUpdate / 节流清理 throttleState 用例组（:322-355）已删除——
-  // onEventThrottled 死路径删除（swf-perf-impl ledger #22 / cleanup-slice TC4/IF14，
-  // 详见 .cw/swf-perf-impl/cleanup-slice-design.json）。恢复点：本 slice 前的 git 历史。
-  // ============================================================
-});

package/src/execution/__tests__/execute-options-mapper.test.ts

@@ -1,189 +0,0 @@
-// src/execution/__tests__/execute-options-mapper.test.ts
-//
-// T3.4 (边界): cwd 透传（非 git worktree）
-// T3.5 (边界): model 填底——opts.model 空 → ctxModel（D-008）
-// T3.9 (边界): schemaEnv 透传——opts.schemaEnv → ExecuteOptions.schemaEnv
-// T3.6 (异常): timeoutMs 超时 → 合并 signal abort → T3.17 listener 清理
-//
-// 测试范围: mapToExecuteOptions 全字段映射 + mergeTimeoutSignal 行为
-
-import { describe, expect, it, vi } from "vitest";
-
-import type { AgentCallOpts } from "../../orchestration/models/types.ts";
-import { mapToExecuteOptions, mergeTimeoutSignal } from "../execute-options-mapper.ts";
-import type { ModelInfo } from "../model-resolver.ts";
-
-describe("mapToExecuteOptions (D-A2)", () => {
-  const baseOpts: AgentCallOpts = {
-    prompt: "test task",
-    agent: "worker",
-    schema: { type: "object" },
-    cwd: "/tmp/work",
-    skillPath: "/path/to/skill.md",
-  };
-
-  it("T3.10 slug 截断: description > SLUG_MAX_LENGTH(35) → 截断到 35", () => {
-    const opts: AgentCallOpts = { ...baseOpts, description: "a".repeat(36) };
-    const result = mapToExecuteOptions(opts);
-    expect(result.slug).toHaveLength(35);
-    expect(result.slug).toBe("a".repeat(35));
-  });
-
-  it("T3.10 slug 边界: description = 35 → 不截断", () => {
-    const opts: AgentCallOpts = { ...baseOpts, description: "a".repeat(35) };
-    const result = mapToExecuteOptions(opts);
-    expect(result.slug).toHaveLength(35);
-    expect(result.slug).toBe("a".repeat(35));
-  });
-
-  it("T3.10 slug 回落: 无 description → agentName", () => {
-    const result = mapToExecuteOptions(baseOpts);
-    expect(result.slug).toBe("worker");
-  });
-
-  it("T3.4 基本映射: prompt→task, agent→agent, cwd→cwd", () => {
-    const result = mapToExecuteOptions(baseOpts);
-    expect(result.task).toBe("test task");
-    expect(result.agent).toBe("worker");
-    expect(result.cwd).toBe("/tmp/work");
-  });
-
-  it("T3.4 schema 透传", () => {
-    const result = mapToExecuteOptions(baseOpts);
-    expect(result.schema).toEqual({ type: "object" });
-  });
-
-  it("T3.9 schemaEnv 透传 (D-A6 bridge)", () => {
-    const opts: AgentCallOpts = { ...baseOpts, schemaEnv: '{"type":"object"}' };
-    const result = mapToExecuteOptions(opts);
-    expect(result.schemaEnv).toBe('{"type":"object"}');
-  });
-
-  it("T3.9 schemaEnv 不传 → schemaEnv undefined", () => {
-    const result = mapToExecuteOptions(baseOpts);
-    expect(result.schemaEnv).toBeUndefined();
-  });
-
-  it("T3.5 model: opts.model 优先（显式 override 透传，不与 ctxModel 混合）", () => {
-    const opts: AgentCallOpts = { ...baseOpts, model: "explicit-model" };
-    const ctxModel: ModelInfo = { id: "ctx-model", provider: "test", input: [] } as ModelInfo;
-    const result = mapToExecuteOptions(opts, ctxModel);
-    expect(result.model).toBe("explicit-model");
-  });
-
-  it("T3.5 model: opts.model 空 → model undefined（不再从 ctxModel.id 填底）", () => {
-    const ctxModel: ModelInfo = { id: "ctx-model", provider: "test", input: [] } as ModelInfo;
-    const result = mapToExecuteOptions(baseOpts, ctxModel);
-    expect(result.model).toBeUndefined();
-  });
-
-  it("T3.5 ctxModel 透传: opts.model 空时 ctxModel 作为完整 ModelInfo 对象传入 ExecuteOptions.ctxModel", () => {
-    const ctxModel: ModelInfo = { id: "mimo-v2.5-pro", provider: "router-openai", input: [] } as ModelInfo;
-    const result = mapToExecuteOptions(baseOpts, ctxModel);
-    expect(result.ctxModel).toBe(ctxModel);
-    expect(result.ctxModel?.id).toBe("mimo-v2.5-pro");
-    expect(result.ctxModel?.provider).toBe("router-openai");
-  });
-
-  it("T3.5 ctxModel 透传: opts.model 有值时 ctxModel 仍透传（双层可用）", () => {
-    const opts: AgentCallOpts = { ...baseOpts, model: "explicit-model" };
-    const ctxModel: ModelInfo = { id: "ctx-model", provider: "test", input: [] } as ModelInfo;
-    const result = mapToExecuteOptions(opts, ctxModel);
-    expect(result.model).toBe("explicit-model");
-    expect(result.ctxModel).toBe(ctxModel);
-  });
-
-  it("T3.5 ctxModel: 两层均空 → model/ctxModel 都 undefined", () => {
-    const result = mapToExecuteOptions(baseOpts);
-    expect(result.model).toBeUndefined();
-    expect(result.ctxModel).toBeUndefined();
-  });
-
-  it("skillPath 透传", () => {
-    const result = mapToExecuteOptions(baseOpts);
-    expect(result.skillPath).toBe("/path/to/skill.md");
-  });
-
-  it("thinkingLevel 透传 (M1)", () => {
-    const opts: AgentCallOpts = { ...baseOpts, thinkingLevel: "high" };
-    const result = mapToExecuteOptions(opts);
-    expect(result.thinkingLevel).toBe("high");
-  });
-
-  it("thinkingLevel 不传 → thinkingLevel undefined", () => {
-    const result = mapToExecuteOptions(baseOpts);
-    expect(result.thinkingLevel).toBeUndefined();
-  });
-
-  it("appendSystemPrompt → appendSystemPrompt 透传", () => {
-    const opts: AgentCallOpts = { ...baseOpts, appendSystemPrompt: ["SO instruction content"] };
-    const result = mapToExecuteOptions(opts);
-    expect(result.appendSystemPrompt).toEqual(["SO instruction content"]);
-  });
-
-  it("appendSystemPrompt 不传 → appendSystemPrompt undefined", () => {
-    const result = mapToExecuteOptions(baseOpts);
-    expect(result.appendSystemPrompt).toBeUndefined();
-  });
-});
-
-describe("mergeTimeoutSignal (D-A9)", () => {
-  it("T3.6 timeoutMs===undefined → 原样返回 external signal", () => {
-    const ctrl = new AbortController();
-    const result = mergeTimeoutSignal(ctrl.signal, undefined);
-    expect(result).toBe(ctrl.signal);
-  });
-
-  it("T3.6 timeoutMs<=0 → 原样返回 external signal", () => {
-    const ctrl = new AbortController();
-    const result = mergeTimeoutSignal(ctrl.signal, 0);
-    expect(result).toBe(ctrl.signal);
-  });
-
-  it("T3.6 timeoutMs>0 → 返回新 signal（合并外部+超时两路）", () => {
-    const ctrl = new AbortController();
-    const result = mergeTimeoutSignal(ctrl.signal, 50);
-    expect(result).not.toBe(ctrl.signal);
-    expect(result.aborted).toBe(false);
-  });
-
-  it("T3.6 timeoutMs 到期 → merged signal abort", async () => {
-    vi.useFakeTimers();
-    const ctrl = new AbortController();
-    const merged = mergeTimeoutSignal(ctrl.signal, 50);
-
-    expect(merged.aborted).toBe(false);
-    vi.advanceTimersByTime(51);
-    expect(merged.aborted).toBe(true);
-    vi.useRealTimers();
-  });
-
-  it("T3.6 外部 signal abort → merged signal abort", () => {
-    const ctrl = new AbortController();
-    const merged = mergeTimeoutSignal(ctrl.signal, 5000);
-    ctrl.abort();
-    expect(merged.aborted).toBe(true);
-  });
-
-  it("T3.6 外部 signal 已 abort → 返回已 abort 的 signal", () => {
-    const ctrl = new AbortController();
-    ctrl.abort();
-    const merged = mergeTimeoutSignal(ctrl.signal, 5000);
-    expect(merged.aborted).toBe(true);
-  });
-
-  it("T3.17 NFR: merged signal abort → timeout timer 清理", () => {
-    vi.useFakeTimers();
-    const ctrl = new AbortController();
-    const merged = mergeTimeoutSignal(ctrl.signal, 50);
-
-    ctrl.abort(); // 外部 abort → merged 也 abort
-    expect(merged.aborted).toBe(true);
-
-    // 推进时间，不应再有副作用
-    vi.advanceTimersByTime(100);
-    // timer 应被清理（通过 abort event listener）
-    // 无异常 = timer 已正确清理
-    vi.useRealTimers();
-  });
-});