@zhushanwen/pi-subagent-workflow 8.5.0 → 8.7.0

package/src/execution/__tests__/epipe-fallback.test.ts

@@ -1,241 +0,0 @@
-// src/execution/__tests__/epipe-fallback.test.ts
-//
-// deliverMessage EPIPE 兜底集成测试——热路径 stdin 写入 EPIPE 时自动转冷路径 resume + 消息重放。
-//
-// 场景覆盖：
-//   1. 首次 EPIPE → 自动转冷路径 resumeRound（runSpawn 收到 resume 参数 + 原消息）
-//   2. 连续 2 次 EPIPE → throw 含恢复指引（防无限循环）
-//   3. 热路径成功写入后清零 EPIPE 计数（正常路径不受影响）
-
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
-import type { ChildProcess } from "node:child_process";
-import { PassThrough } from "node:stream";
-
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-const { loggerMock } = vi.hoisted(() => ({
-  loggerMock: { debug: vi.fn(), warn: vi.fn(), error: vi.fn(), info: vi.fn() },
-}));
-vi.mock("@zhushanwen/pi-extension-logger", () => ({ getLogger: () => loggerMock }));
-
-// mock session-runner：runSpawn 受控 + killAllSpawnedChildren 空实现；
-// getChildByRecord/spawnedChildren 提供真实 Map 语义。
-vi.mock("../session-runner.ts", () => {
-  const spawnedChildren = new Map<string, unknown>();
-  return {
-    runSpawn: vi.fn(),
-    killAllSpawnedChildren: vi.fn(),
-    spawnedChildren,
-    getChildByRecord: (id: string): unknown => spawnedChildren.get(id),
-  };
-});
-
-import { runSpawn, spawnedChildren } from "../session-runner.ts";
-import * as lifecycle from "../lifecycle-manager.ts";
-import { createRecord } from "../execution-record.ts";
-import { ModelConfigService } from "../model-config-service.ts";
-import type { ModelInfo } from "../model-resolver.ts";
-import { SubagentService } from "../subagent-service.ts";
-import type { PiLike } from "../subagent-service.ts";
-import type { AgentResult, ExecutionRecord } from "../types.ts";
-
-const mockRunSpawn = vi.mocked(runSpawn);
-
-function makeTmpAgentDir(): string {
-  return fs.mkdtempSync(path.join(os.tmpdir(), "epipe-test-"));
-}
-
-function makePi(): PiLike & {
-  appendEntry: ReturnType<typeof vi.fn>;
-  events: { emit: ReturnType<typeof vi.fn> };
-  sendMessage: ReturnType<typeof vi.fn>;
-} {
-  return { appendEntry: vi.fn(), events: { emit: vi.fn() }, sendMessage: vi.fn() };
-}
-
-function makeResult(success: boolean): AgentResult {
-  return {
-    text: success ? "done" : "err",
-    turns: 1,
-    durationMs: 100,
-    success,
-    error: success ? undefined : "boom",
-    sessionId: "sess-1",
-    toolCalls: [],
-  };
-}
-
-/** chatMode running-resumable record（第一轮已完成，等待续聊；v4 B-1 旧 idle 折入 running）。 */
-function makeIdleRecord(id = "sa-epipe"): ExecutionRecord {
-  const record = createRecord(id, {
-    agent: "general-purpose",
-    model: "test/test-model",
-    thinkingLevel: "low",
-    mode: "background",
-    task: "initial task",
-    slug: "epipe-chat",
-    startedAt: 1000,
-    rootSessionId: "root-session",
-    chatMode: true,
-  });
-  record.status = "running";
-  record.round = 1;
-  record.controller = new AbortController();
-  return record;
-}
-
-/**
- * 构造 EPIPE child：stdin.write 抛 {code:'EPIPE'}，模拟子进程已退出但 close 事件尚未到达的窗口。
- */
-function makeEpipeChild(): ChildProcess {
-  const fakeStdin = {
-    write: vi.fn(() => {
-      const err = Object.assign(new Error("write after end"), { code: "EPIPE" });
-      throw err;
-    }),
-    destroyed: false,
-  } as unknown as PassThrough;
-  return { stdin: fakeStdin, pid: 99999 } as unknown as ChildProcess;
-}
-
-/**
- * 构造正常 child：PassThrough stdin（可正常写入）。
- */
-function makeNormalChild(): ChildProcess {
-  return { stdin: new PassThrough(), pid: 88888 } as unknown as ChildProcess;
-}
-
-// ============================================================
-// deliverMessage EPIPE 兜底
-// ============================================================
-
-describe("deliverMessage EPIPE 兜底（热路径 stdin EPIPE → 冷路径 resume）", () => {
-  let agentDir: string;
-  let service: SubagentService;
-  let record: ExecutionRecord;
-
-  beforeEach(() => {
-    agentDir = makeTmpAgentDir();
-    const modelService = new ModelConfigService({ agentDir });
-    service = new SubagentService({ cwd: agentDir, modelService });
-    service.initSession({ pi: makePi(), sessionId: "root-session" });
-    record = makeIdleRecord();
-    record.sessionFile = path.join(agentDir, "fake-session.jsonl");
-    spawnedChildren.clear();
-    mockRunSpawn.mockReset();
-    lifecycle._resetLifecycleState();
-    loggerMock.warn.mockClear();
-  });
-
-  afterEach(() => {
-    service.dispose();
-    spawnedChildren.clear();
-    lifecycle._resetLifecycleState();
-    fs.rmSync(agentDir, { recursive: true, force: true });
-  });
-
-  it("首次 EPIPE → 自动转冷路径 resumeRound + 原消息重放", async () => {
-    mockRunSpawn.mockResolvedValueOnce(makeResult(true));
-    // 注册 EPIPE child（热路径会命中但 stdin.write 抛 EPIPE）
-    spawnedChildren.set(record.id, makeEpipeChild());
-
-    // deliverMessage 不 throw（首次 EPIPE 走 resume 兜底）
-    await expect(service.deliverMessage(record, "msg after epipe", false)).resolves.toBeUndefined();
-
-    // spawnedChildren 中的死进程条目已清理（EPIPE catch 块 delete）
-    expect(spawnedChildren.has(record.id)).toBe(false);
-
-    // resumeRound 被触发（冷路径），runSpawn 收到 resume 参数 + 原消息
-    await vi.waitFor(() => expect(mockRunSpawn).toHaveBeenCalledTimes(1));
-    const call = mockRunSpawn.mock.calls[0]!;
-    expect(call[1]).toBe("msg after epipe");
-    expect(call[4]).toEqual({
-      sessionFile: record.sessionFile,
-      model: record.model,
-      thinkingLevel: record.thinkingLevel,
-    });
-
-    // warn 日志包含 EPIPE 关键词
-    expect(loggerMock.warn).toHaveBeenCalled();
-    const warnCalls = loggerMock.warn.mock.calls;
-    const epipeWarn = warnCalls.find((c: unknown[]) =>
-      typeof c[0] === "string" && c[0].includes("EPIPE"),
-    );
-    expect(epipeWarn).toBeDefined();
-  });
-
-  it("连续 2 次 EPIPE → throw 含恢复指引（防无限循环）", async () => {
-    mockRunSpawn.mockResolvedValue(makeResult(true));
-    // 注册 EPIPE child
-    spawnedChildren.set(record.id, makeEpipeChild());
-
-    // 第 1 次：EPIPE → resume（不 throw）
-    await service.deliverMessage(record, "first epipe", false);
-    await vi.waitFor(() => expect(mockRunSpawn).toHaveBeenCalledTimes(1));
-
-    // resume 完成后 record 回 running（v4 B-1：finalizeRoundToIdle 设 running，旧 idle 折入）
-    await vi.waitFor(() => expect(record.status).toBe("running"));
-
-    // 第 2 次：再次注入 EPIPE child + EPIPE
-    spawnedChildren.set(record.id, makeEpipeChild());
-
-    // 第 2 次 EPIPE → throw 含恢复指引（连续 2 次触发 exhaustion）
-    // 注意：第二 EPIPE 时 count 已为 2，catch 块立即 throw（不经过 resumeRound）。
-    let thrown: unknown;
-    try {
-      await service.deliverMessage(record, "second epipe", false);
-    } catch (err) {
-      thrown = err;
-    }
-    expect(thrown).toBeInstanceOf(Error);
-    expect((thrown as Error).message).toContain("EPIPE fallback exhausted");
-    expect((thrown as Error).message).toContain("2 consecutive EPIPE");
-    expect((thrown as Error).message).toContain("action:'close'");
-    expect((thrown as Error).message).toContain("action:'start'");
-  });
-
-  it("热路径成功写入后清零 EPIPE 计数（正常路径不受 EPIPE 计数影响）", async () => {
-    mockRunSpawn.mockResolvedValue(makeResult(true));
-
-    // 第 1 轮：EPIPE → resume
-    spawnedChildren.set(record.id, makeEpipeChild());
-    await service.deliverMessage(record, "epipe msg", false);
-    await vi.waitFor(() => expect(mockRunSpawn).toHaveBeenCalledTimes(1));
-    await vi.waitFor(() => expect(record.status).toBe("running"));
-
-    // 第 2 轮：正常 child，成功写入（清零 EPIPE 计数）
-    spawnedChildren.set(record.id, makeNormalChild());
-    await service.deliverMessage(record, "normal msg", true);
-    // 不 throw，status=running（热路径成功）
-    expect(record.status).toBe("running");
-
-    // 第 3 轮：再次 EPIPE → 但因为第 2 轮清零了计数，这次是首次 EPIPE（不 throw）
-    // 需要先让 record 回 running（等待续聊态）
-    record.status = "running";
-    spawnedChildren.set(record.id, makeEpipeChild());
-    await expect(service.deliverMessage(record, "after reset", false)).resolves.toBeUndefined();
-  });
-
-  it("EPIPE 兜底与冷路径共用 in-flight 守卫：resume 在途时 EPIPE 兜底不再二次 spawn（review round2 MF1）", async () => {
-    // 冷路径发起 resume，runSpawn 挂起（spawn 异步窗口内）
-    let releaseFirst!: (r: AgentResult) => void;
-    mockRunSpawn.mockImplementationOnce(
-      () => new Promise<AgentResult>((res) => { releaseFirst = res; }),
-    );
-    await service.deliverMessage(record, "cold path first", false);
-    await vi.waitFor(() => expect(mockRunSpawn).toHaveBeenCalledTimes(1));
-
-    // 注册 EPIPE child → deliverMessage 走热路径 → stdin EPIPE → 兜底调 resumeRound
-    // → in-flight 命中 → throw（不再走第二次 spawn。EPIPE 计数仍 +1 但未达阈值 2，
-    // exhaustion 分支不触发；throw 由兜底路径的 resumeRound 守卫抛出）
-    spawnedChildren.set(record.id, makeEpipeChild());
-    await expect(service.deliverMessage(record, "epipe during resume", false)).rejects.toThrow(
-      /already starting a new round/,
-    );
-    expect(mockRunSpawn).toHaveBeenCalledTimes(1);
-
-    releaseFirst(makeResult(true));
-  });
-});

package/src/execution/__tests__/execute-and-await-worktree.test.ts

@@ -1,243 +0,0 @@
-// src/__tests__/execute-and-await-worktree.test.ts
-//
-// executeAndAwait 的 worktree 失败收尾测试（W1 code review 修复回归锁）。
-//
-// 覆盖：worktreeManager.create 抛错时 record 被 finalizeFailed（status→failed）且原错外抛。
-// （worktree 与 fork 解耦后，worktree:true+fork:false 的解耦验证见 subagent-service.test.ts。）
-//
-// ── mock 策略 ──
-//
-// 复用 execute-nesting.test.ts 的 spawn / node:fs / manifest-store / temp-prompt / alive-store
-// / finalized-marker mock 范式（见该文件头部详细注释）。本文件 **不驱动 FakeChild 完成**——
-// 被测的两个分支都在 runSpawn 之前抛/收尾（worktree create 在步骤 2.5，runSpawn 在步骤 5），
-// 因此 spawn 即使被调也无人驱动，测试在抛错后立即断言即可结束。
-//
-// worktreeManager 是 SubagentService 构造时 new 出的私有字段（WorktreeManager 实例，非模块）。
-// 测试 2 用 vi.spyOn(Reflect.get(service, "worktreeManager"), "create") 注入抛错，无需模块级 mock。
-
-import { PassThrough } from "node:stream";
-
-import { afterEach, describe, expect, it, vi } from "vitest";
-
-// ── mock modules（与 execute-nesting.test.ts 同范式）──
-
-vi.mock("node:child_process", async () => {
-  const { EventEmitter } = await import("node:events");
-  const { PassThrough } = await import("node:stream");
-
-  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")),
-    ),
-  };
-});
-
-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", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("../alive-store.ts")>();
-  return {
-    ...actual,
-    writeAliveMarker: vi.fn(),
-    removeAliveMarker: vi.fn(),
-  };
-});
-
-vi.mock("../finalized-marker.ts", () => ({
-  writeFinalized: vi.fn(),
-  readFinalized: vi.fn(() => false),
-}));
-
-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 };
-});
-
-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 { ModelConfigService } from "../model-config-service.ts";
-import type { ModelInfo, ModelRegistryLike } from "../model-resolver.ts";
-import type { RecordStore } from "../record-store.ts";
-import type { WorktreeManager } from "../worktree-manager.ts";
-import { SubagentService } from "../subagent-service.ts";
-
-// ── 辅助：service 构造（与 execute-nesting.test.ts setup 等价）──
-
-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;
-  worktreeManager: WorktreeManager;
-}
-
-function setup(): SetupResult {
-  const agentDir = "/tmp/exec-await-worktree-it"; // fs 已 mock，路径不需真实存在
-  const modelService = new ModelConfigService({ agentDir });
-  modelService.initModel({
-    modelRegistry: makeEmptyRegistry(),
-    sessionId: "exec-await-worktree-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: "exec-await-worktree-it" });
-  // worktreeManager 是 SubagentService 构造时 new 的 private 字段（无外部注入入口），
-  // 测试经 Reflect.get 访问后 cast 到生产导出类型 WorktreeManager（已在文件顶部 import），
-  // 让字段/方法签名与生产类型契约绑定。
-  const worktreeManager = Reflect.get(service, "worktreeManager") as WorktreeManager;
-  return { service, worktreeManager };
-}
-
-const ctxModel: ModelInfo = { id: "m", name: "M", provider: "p", reasoning: false };
-
-/**
- * 从 service 取出 private store（断言 record 终态用）。
- *
- * worktreeManager 与 store 都是 SubagentService 构造时 new 出的 private 字段——
- * 无外部注入入口，测试只能经 Reflect.get 访问。这里 cast 到生产导出类型
- * （RecordStore / WorktreeManager）而非内联匿名 shape，让测试与生产类型契约绑定：
- * 字段改名/签名变更时 tsc 立即报错（而非静默漂移）。
- */
-function getStore(service: SubagentService): RecordStore {
-  return Reflect.get(service, "store") as RecordStore;
-}
-
-describe("executeAndAwait worktree 失败收尾", () => {
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  // ============================================================
-  // worktreeManager.create 抛错 → record 收尾为 failed + 原错外抛
-  // ============================================================
-  it("worktreeManager.create 失败时 finalizeFailed 收尾 record 并抛原错", async () => {
-    const { service, worktreeManager } = setup();
-
-    const createErr = new Error("worktree create boom");
-    vi.spyOn(worktreeManager, "create").mockImplementation(() => {
-      throw createErr;
-    });
-
-    // spy store.archive：finalizeFailed 真实收尾链（CAS→completeRecord→archive）的最末一步。
-    // 捕获传入 archive 的 record，断言其 status 已被推向 "failed"（证明 finalizeFailed 完整执行，
-    // 而非仅 tryTransition 中途返回）。archive 真实执行（不 mockImplementation）以保留移出 running map 的语义。
-    const store = getStore(service);
-    const archiveSpy = vi.spyOn(store, "archive");
-
-    await expect(
-      service.executeAndAwait({
-        task: "worktree create will fail",
-        slug: "worktree-create-fail",
-        worktree: true,
-        fork: true,
-        ctxModel,
-      }),
-    ).rejects.toBe(createErr);
-
-    // finalizeFailed 完整执行：record 经 CAS→completeRecord 推到 failed 终态后 archive。
-    expect(archiveSpy).toHaveBeenCalledTimes(1);
-    // store 现已强类型为 RecordStore → archive 入参为 ExecutionRecord，无需 `as` 断言。
-    const archivedRecord = archiveSpy.mock.calls[0]![0];
-    expect(archivedRecord.status).toBe("closed");
-    // archive 后 record 已移出 running map → listRunning 空、getMutable 取不到。
-    expect(store.listRunning()).toHaveLength(0);
-    expect(store.getMutable(archivedRecord.id)).toBeUndefined();
-  });
-
-  // ============================================================
-  // create-await 竞态守卫（Phase 2）：create await 窗口内 dispose 抢先把
-  // record CAS 成 closed → 守卫 cleanup + throw cancelled（失败 throw 语义，
-  // SAR.run 的 catch 会转 AgentResult.error）。守卫 throw 不落在 try 内
-  // （否则被上方 catch 当 create 失败再走 finalizeFailed，对已 closed record 语义未定义）。
-  // ============================================================
-  it("守卫：create await 窗口内 dispose 抢先 → cleanup 被调 + throw cancelled（不进 runAndFinalize）", async () => {
-    const { service, worktreeManager } = setup();
-
-    const handle = Object.freeze({
-      path: "/tmp/wt-guard2",
-      branch: "pi-sub-guard2",
-      baseCommit: "abc123",
-      mainCwd: "/repo",
-    }) as Parameters<WorktreeManager["cleanup"]>[0];
-    let resolveCreate!: (h: unknown) => void;
-    vi.spyOn(worktreeManager, "create").mockImplementation(
-      () => new Promise((r) => { resolveCreate = r; }) as ReturnType<WorktreeManager["create"]>,
-    );
-    const cleanupSpy = vi.spyOn(worktreeManager, "cleanup").mockResolvedValue(undefined);
-
-    const execP = service.executeAndAwait({
-      task: "guard test",
-      slug: "guard-test",
-      worktree: true,
-      fork: true,
-      ctxModel,
-    });
-    // 微任务推进：record 已建 + executeAndAwait 挂在 pending create 上
-    await new Promise((r) => { setTimeout(r, 0); });
-    // dispose 抢先：CAS running → closed（此刻 worktreeHandle 仍 undefined，
-    // dispose 的 fire-and-forget cleanup 跳过）——守卫是唯一清理点
-    service.disposeAllRecords("parent-shutdown");
-    resolveCreate(handle);
-
-    await expect(execP).rejects.toThrow("cancelled during worktree creation");
-    expect(cleanupSpy).toHaveBeenCalledWith(handle);
-  });
-});