@zhushanwen/pi-subagent-workflow 8.6.0 → 8.7.0

package/src/orchestration/__tests__/agent-call-catch-fallback.test.ts

@@ -1,202 +0,0 @@
-// src/orchestration/__tests__/agent-call-catch-fallback.test.ts
-//
-// U7: dispatchAgentCall catch 分支回发 agent-result 给 worker（吞错兜底）
-//
-// 场景：executeAgentCall（或 gate.withSlot）抛非 Abort 异常时，原 catch 块仅
-// console.error，worker 内对应 callId 的 pending Promise 永不 resolve → agent()
-// 永久 await → worker 脚本挂死。修复后 catch 块构造 failed AgentResult 并
-// postAgentResult 回 worker，使 pending Promise 能 resolve（结果为 error）。
-//
-// 通过 handleWorkerMessage 触发 dispatchAgentCall（内部函数不 export）。
-// Mock 构造模式参考 agent-call-stream.test.ts。
-
-import { describe, expect, it, vi } from "vitest";
-
-import { handleWorkerMessage } from "../error-recovery.ts";
-import type { LifecycleDeps, WorkerHandlers } from "../models/ports.ts";
-import { Trace } from "../models/trace.ts";
-import type { WorkflowRun } from "../models/workflow-run.ts";
-import type { AgentResult } from "../models/types.ts";
-
-// ── helpers ──────────────────────────────────────────────────
-
-/** 构造 status="running" 的 mock WorkflowRun，含 trace/budget/calls/runtime。
- *  worker.postMessage 为 vi.fn spy，便于断言回发内容。gate.withSlot 直接 await fn()
- *  让异常透传到外层 .catch（模拟 executeAgentCall 抛错的真实链路）。 */
-function makeRunningRun(runId: string): WorkflowRun {
-  const trace = new Trace();
-  const controller = new AbortController();
-  return {
-    runId,
-    spec: { scriptName: "test-wf", scriptSource: "agent('hi')", args: {}, runId, slug: undefined },
-    state: {
-      status: "running" as const,
-      reason: undefined,
-      trace,
-      budget: {
-        usedTokens: 0,
-        usedCost: 0,
-        totalCallCount: 0,
-        consume: vi.fn(),
-        isExceeded: vi.fn(() => false),
-        incrementCallCount: vi.fn(),
-      },
-      calls: new Map(),
-      scriptResult: undefined,
-    },
-    meta: { startedAt: new Date().toISOString(), workerErrorCount: 0, scriptErrorCount: 0 },
-    runtime: {
-      controller,
-      worker: { postMessage: vi.fn() },
-    },
-    transition: vi.fn(),
-    replaceRuntime: vi.fn(),
-  } as unknown as WorkflowRun;
-}
-
-/** LifecycleDeps mock，runner.run 可配置为 reject 指定 error。 */
-function makeDeps(opts: { runnerError?: Error } = {}): LifecycleDeps {
-  const runnerRun = vi.fn(async () => {
-    if (opts.runnerError) throw opts.runnerError;
-    return { content: "OK", durationMs: 10, error: undefined, toolCalls: [] } as AgentResult;
-  });
-  return {
-    store: { save: vi.fn(async () => {}) },
-    workerHost: { start: vi.fn() },
-    runner: { run: runnerRun },
-    runs: new Map(),
-    eventBus: { emit: vi.fn() },
-    onRunDone: vi.fn(),
-    log: vi.fn(),
-    // streamSink 不设 = undefined（本测试不关心 stream）
-  } as unknown as LifecycleDeps;
-}
-
-function makeHandlers(): WorkerHandlers {
-  return {
-    onMessage: vi.fn(async () => {}),
-    onError: vi.fn(async () => {}),
-    onExit: vi.fn(async () => {}),
-  } as unknown as WorkerHandlers;
-}
-
-/** agent-call 消息 */
-function makeAgentCallMsg(callId: number): unknown {
-  return {
-    type: "agent-call",
-    callId,
-    phase: "test-phase",
-    opts: { prompt: "test task", agent: "worker", description: "test-slug" },
-  };
-}
-
-/** 从 postMessage spy 的所有调用中找 type:"agent-result" 且 callId 匹配的参数。 */
-function findAgentResultPost(
-  postMessage: ReturnType<typeof vi.fn>,
-  callId: number,
-): { type: string; callId: number; result: AgentResult; cached: boolean } | undefined {
-  for (const call of postMessage.mock.calls) {
-    const msg = call[0] as { type?: string; callId?: number; result?: AgentResult; cached?: boolean };
-    if (msg?.type === "agent-result" && msg.callId === callId) return msg as never;
-  }
-  return undefined;
-}
-
-/** 静默 console.error（catch 块会打印失败日志，避免污染测试输出）。 */
-function silenceConsoleError(): () => void {
-  const spy = vi.spyOn(console, "error").mockImplementation(() => {});
-  return () => spy.mockRestore();
-}
-
-// ── U7a: 非 Abort 异常 → postAgentResult 回发 failed result ──
-
-describe("U7a: catch 分支兜底回发 agent-result（非 Abort 异常）", () => {
-  it("runner.run reject 'runner exploded' → worker 收到 {success:false, error:'runner exploded'}", async () => {
-    const restore = silenceConsoleError();
-    try {
-      const deps = makeDeps({ runnerError: new Error("runner exploded") });
-      const run = makeRunningRun("wf-catch-001");
-      const handlers = makeHandlers();
-      const postMessage = run.runtime!.worker.postMessage as ReturnType<typeof vi.fn>;
-
-      await handleWorkerMessage(run, makeAgentCallMsg(2), deps, handlers);
-
-      // dispatchAgentCall 内 void withSlot(...)（fire-and-forget），需等微任务完成
-      await vi.waitFor(() => {
-        expect(findAgentResultPost(postMessage, 2)).toBeDefined();
-      });
-
-      const posted = findAgentResultPost(postMessage, 2)!;
-      expect(posted.type).toBe("agent-result");
-      expect(posted.callId).toBe(2);
-      expect(posted.cached).toBe(false);
-      // AgentResult.error 字段承载错误信息（与 resolveAgentOpts 失败路径一致）
-      expect(posted.result.error).toBe("runner exploded");
-      expect(posted.result.content).toBe("");
-
-      // state 一致性三件套（review should_fix）：
-      // trace node 标 failed（不遗留 running 幽灵节点）
-      const traceNode = run.state.trace.find(2);
-      expect(traceNode?.status).toBe("failed");
-      expect(traceNode?.result?.error).toBe("runner exploded");
-      // node.live 清除（防内存泄漏）
-      expect(traceNode?.live).toBeUndefined();
-      // 持久化（catch 是最需留证的场景）
-      expect(deps.store.save).toHaveBeenCalled();
-    } finally {
-      restore();
-    }
-  });
-
-  it("非 Error 值 reject（字符串）→ error 字段为该字符串", async () => {
-    const restore = silenceConsoleError();
-    try {
-      const deps = makeDeps({ runnerError: "string failure" as unknown as Error });
-      const run = makeRunningRun("wf-catch-002");
-      const handlers = makeHandlers();
-      const postMessage = run.runtime!.worker.postMessage as ReturnType<typeof vi.fn>;
-
-      await handleWorkerMessage(run, makeAgentCallMsg(7), deps, handlers);
-
-      await vi.waitFor(() => {
-        expect(findAgentResultPost(postMessage, 7)).toBeDefined();
-      });
-
-      const posted = findAgentResultPost(postMessage, 7)!;
-      expect(posted.result.error).toBe("string failure");
-    } finally {
-      restore();
-    }
-  });
-});
-
-// ── U7b: AbortError → 不回发（预期路径，吞掉） ──
-
-describe("U7b: AbortError 不回发 agent-result", () => {
-  it("runner.run reject AbortError → postAgentResult 不被调用", async () => {
-    const restore = silenceConsoleError();
-    try {
-      const abortErr = new Error("aborted");
-      abortErr.name = "AbortError";
-      const deps = makeDeps({ runnerError: abortErr });
-      const run = makeRunningRun("wf-catch-003");
-      const handlers = makeHandlers();
-      const postMessage = run.runtime!.worker.postMessage as ReturnType<typeof vi.fn>;
-
-      await handleWorkerMessage(run, makeAgentCallMsg(3), deps, handlers);
-
-      // 等待 fire-and-forget 链路稳定：无 agent-result 回发。
-      // 先 flush 微任务队列（多次确保 withSlot promise 已 settle），
-      // 再断言断言期内无 agent-result。vi.waitFor 用反向断言会一满足就 return，
-      // 故采用：跑若干 microtask tick 后静态断言。
-      for (let i = 0; i < 5; i++) {
-        // eslint-disable-next-line no-await-in-loop
-        await Promise.resolve();
-      }
-      const posted = findAgentResultPost(postMessage, 3);
-      expect(posted).toBeUndefined();
-    } finally {
-      restore();
-    }
-  });
-});

package/src/orchestration/__tests__/agent-call-stream.test.ts

@@ -1,152 +0,0 @@
-// src/orchestration/__tests__/agent-call-stream.test.ts
-//
-// U4: dispatchAgentCall 创建 SubagentStream 并在 agent call 结束后 dispose
-// U5: dispatchAgentCall widgetKey 格式 = subagent-stream-<runId>-<stepIndex>
-// U6: streamSink 为 undefined 时 dispatchAgentCall 不创建 stream 不报错
-//
-// 通过 handleWorkerMessage 触发 dispatchAgentCall（内部函数不 export）。
-
-import { describe, expect, it, vi } from "vitest";
-
-import { handleWorkerMessage } from "../error-recovery.ts";
-import type { LifecycleDeps, WorkerHandlers } from "../models/ports.ts";
-import { Trace } from "../models/trace.ts";
-import type { WorkflowRun } from "../models/workflow-run.ts";
-import type { AgentResult } from "../models/types.ts";
-
-// ── helpers ──────────────────────────────────────────────────
-
-function makeMockResult(): AgentResult {
-  return { content: "OK", durationMs: 10, error: undefined, toolCalls: [] };
-}
-
-/** 构造 status="running" 的 mock WorkflowRun，含 trace/budget/calls/runtime */
-function makeRunningRun(runId: string): WorkflowRun {
-  const trace = new Trace();
-  const controller = new AbortController();
-  return {
-    runId,
-    spec: { scriptName: "test-wf", scriptSource: "agent('hi')", args: {}, runId, slug: undefined },
-    state: {
-      status: "running" as const,
-      reason: undefined,
-      trace,
-      budget: {
-        usedTokens: 0,
-        usedCost: 0,
-        totalCallCount: 0,
-        consume: vi.fn(),
-        isExceeded: vi.fn(() => false),
-        incrementCallCount: vi.fn(),
-      },
-      calls: new Map(),
-      scriptResult: undefined,
-    },
-    meta: { startedAt: new Date().toISOString(), workerErrorCount: 0, scriptErrorCount: 0 },
-    runtime: {
-      controller,
-      worker: { postMessage: vi.fn() },
-    },
-    transition: vi.fn(),
-    replaceRuntime: vi.fn(),
-  } as unknown as WorkflowRun;
-}
-
-/** LifecycleDeps mock，runner.run 可控制返回值，streamSink 可配置 */
-function makeDeps(opts: {
-  streamSink?: { setWidget: ReturnType<typeof vi.fn> };
-  runnerResult?: AgentResult;
-} = {}): LifecycleDeps {
-  return {
-    store: { save: vi.fn(async () => {}) },
-    workerHost: { start: vi.fn() },
-    runner: { run: vi.fn(async () => opts.runnerResult ?? makeMockResult()) },
-    runs: new Map(),
-    eventBus: { emit: vi.fn() },
-    onRunDone: vi.fn(),
-    log: vi.fn(),
-    streamSink: opts.streamSink,
-  } as unknown as LifecycleDeps;
-}
-
-function makeHandlers(): WorkerHandlers {
-  return {
-    onMessage: vi.fn(async () => {}),
-    onError: vi.fn(async () => {}),
-    onExit: vi.fn(async () => {}),
-  } as unknown as WorkerHandlers;
-}
-
-/** agent-call 消息 */
-function makeAgentCallMsg(callId: number): unknown {
-  return {
-    type: "agent-call",
-    callId,
-    phase: "test-phase",
-    opts: { prompt: "test task", agent: "worker", description: "test-slug" },
-  };
-}
-
-// ── U4: dispatchAgentCall 创建 SubagentStream 并 dispose ──
-
-describe("U4: dispatchAgentCall stream dispose", () => {
-  it("agent call 结束后 stream.dispose 被调用（setWidget 末次 lines=undefined）", async () => {
-    const setWidget = vi.fn();
-    const deps = makeDeps({ streamSink: { setWidget } });
-    const run = makeRunningRun("wf-test-123");
-    const handlers = makeHandlers();
-
-    await handleWorkerMessage(run, makeAgentCallMsg(0), deps, handlers);
-    // dispatchAgentCall 内部 void withSlot(...)（fire-and-forget），需等 microtask 完成
-    await vi.waitFor(() => {
-      expect(setWidget.mock.calls.length).toBeGreaterThanOrEqual(1);
-    });
-
-    const calls = setWidget.mock.calls;
-    const lastCall = calls[calls.length - 1];
-    expect(lastCall[1]).toBeUndefined();
-  });
-});
-
-// ── U5: widgetKey 格式 ──
-
-describe("U5: widgetKey 格式", () => {
-  it("widgetKey = subagent-stream-<runId>-<stepIndex>", async () => {
-    const setWidget = vi.fn();
-    const deps = makeDeps({ streamSink: { setWidget } });
-    const run = makeRunningRun("wf-test-123");
-    const handlers = makeHandlers();
-
-    await handleWorkerMessage(run, makeAgentCallMsg(2), deps, handlers);
-    await vi.waitFor(() => {
-      expect(setWidget.mock.calls.length).toBeGreaterThanOrEqual(1);
-    });
-
-    const widgetKey = setWidget.mock.calls[0][0] as string;
-    expect(widgetKey).toBe("subagent-stream-wf-test-123-2");
-  });
-});
-
-// ── U6: streamSink 为 undefined 时不报错 ──
-
-describe("U6: streamSink undefined 降级", () => {
-  it("streamSink=undefined → runner.run 仍被调用，无异常", async () => {
-    const runnerRun = vi.fn(async () => makeMockResult());
-    const deps = {
-      store: { save: vi.fn(async () => {}) },
-      workerHost: { start: vi.fn() },
-      runner: { run: runnerRun },
-      runs: new Map(),
-      eventBus: { emit: vi.fn() },
-      onRunDone: vi.fn(),
-      log: vi.fn(),
-      // streamSink 不设 = undefined
-    } as unknown as LifecycleDeps;
-    const run = makeRunningRun("wf-test-456");
-    const handlers = makeHandlers();
-
-    await handleWorkerMessage(run, makeAgentCallMsg(0), deps, handlers);
-
-    expect(runnerRun).toHaveBeenCalledTimes(1);
-  });
-});

package/src/orchestration/__tests__/args-validator.test.ts

@@ -1,143 +0,0 @@
-// m3: args-validator 单元测试（TC1-TC7）
-//
-// TC1  校验通过：review-fix-loop 真实 schema 的合法 args
-// TC2  必填缺失 fail → ArgsValidationError
-// TC3  类型错误 + null/空串 required fail（design-review major-1 回归）
-// TC4  字符串 coerce 原地生效（m2 MAJOR-1 m3 闭环）
-// TC5  无 parameters 跳过（安全退化）
-// TC6  畸形 schema → ArgsValidationError；strictSchema:false 容忍自定义关键字
-// TC7  无缓存：每次均校验
-
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
-
-import { describe, expect, it } from "vitest";
-
-import { ArgsValidationError, validateRunArgs } from "../args-validator.ts";
-import type { RunSpec } from "../models/run-spec.ts";
-import { parseResourceMeta } from "../../shared/meta-parser.ts";
-
-const WORKFLOWS_DIR = join(__dirname, "../../../workflows");
-
-function reviewFixLoopParameters(): Record<string, unknown> {
-  const src = readFileSync(join(WORKFLOWS_DIR, "review-fix-loop.js"), "utf-8");
-  const meta = parseResourceMeta(src, "workflow");
-  if (!meta || meta.kind !== "workflow" || !meta.parameters) {
-    throw new Error("review-fix-loop parameters not parsed");
-  }
-  return meta.parameters;
-}
-
-function makeSpec(parameters: Record<string, unknown> | undefined, args: Record<string, unknown>): RunSpec {
-  return {
-    scriptSource: "",
-    args,
-    parameters,
-    scriptName: "test-wf",
-    scriptPath: "/x/test-wf.js",
-  };
-}
-
-describe("validateRunArgs — 校验语义", () => {
-  it("TC1: 合法 args 通过校验（review-fix-loop 真实 schema）", () => {
-    const spec = makeSpec(reviewFixLoopParameters(), {
-      targetType: "git-diff",
-      target: "main",
-      batch1: "code-reviewer",
-      autoCommit: false,
-    });
-    expect(() => validateRunArgs(spec)).not.toThrow();
-  });
-
-  it("TC2: 必填缺失 → ArgsValidationError（含 workflow 名 + 缺失字段 + info 指引）", () => {
-    const spec = makeSpec(reviewFixLoopParameters(), { batch1: "code-reviewer" });
-    try {
-      validateRunArgs(spec);
-      expect.unreachable("should throw");
-    } catch (err) {
-      expect(err).toBeInstanceOf(ArgsValidationError);
-      const e = err as ArgsValidationError;
-      expect(e.workflowName).toBe("test-wf");
-      expect(e.message).toContain("Invalid args for workflow 'test-wf'");
-      expect(e.message).toContain("targetType");
-      expect(e.message).toContain("Read the workflow script file");
-    }
-  });
-
-  it("TC3a: 不可转换类型 'yes' → ArgsValidationError", () => {
-    const spec = makeSpec(reviewFixLoopParameters(), {
-      targetType: "git-diff",
-      target: "main",
-      autoCommit: "yes",
-    });
-    expect(() => validateRunArgs(spec)).toThrow(ArgsValidationError);
-  });
-
-  it("TC3b: required 字段 null 视为缺失 → ArgsValidationError（design-review major-1 回归）", () => {
-    const spec = makeSpec(reviewFixLoopParameters(), {
-      targetType: "git-diff",
-      target: null,
-    });
-    expect(() => validateRunArgs(spec)).toThrow(ArgsValidationError);
-  });
-
-  it("TC3c: required 字符串空串 → ArgsValidationError（与脚本 !target 语义对齐）", () => {
-    const spec = makeSpec(reviewFixLoopParameters(), {
-      targetType: "git-diff",
-      target: "",
-    });
-    expect(() => validateRunArgs(spec)).toThrow(ArgsValidationError);
-  });
-
-  it("TC4: 字符串 'false'/'10' coerce 原地生效，args 引用不变（m2 MAJOR-1 m3 闭环）", () => {
-    const args = { targetType: "git-diff", target: "main", autoCommit: "false", maxRounds: "10" };
-    const spec = makeSpec(reviewFixLoopParameters(), args);
-    expect(() => validateRunArgs(spec)).not.toThrow();
-    expect(spec.args).toBe(args); // 原地 mutate，引用不变（worker 启动/崩溃重跑同一对象）
-    expect(spec.args.autoCommit).toBe(false);
-    expect(spec.args.maxRounds).toBe(10);
-  });
-
-  it("TC5: 无 parameters → 不校验不 throw（安全退化）", () => {
-    const spec = makeSpec(undefined, { whatever: "x" });
-    expect(() => validateRunArgs(spec)).not.toThrow();
-  });
-
-  it("M1 回归: nullable schema 的 null 是合法输入（null-scan 不删 nullable 键）", () => {
-    const spec = makeSpec(
-      { type: "object", properties: { model: { type: ["string", "null"] } }, required: ["model"] },
-      { model: null },
-    );
-    expect(() => validateRunArgs(spec)).not.toThrow();
-    expect(spec.args.model).toBeNull(); // 未被删除
-  });
-
-  it("TC6a: 真畸形 schema → ArgsValidationError「schema 无效」（不泄漏原始 throw）", () => {
-    const spec = makeSpec({ type: "not-a-type" }, { a: 1 });
-    try {
-      validateRunArgs(spec);
-      expect.unreachable("should throw");
-    } catch (err) {
-      expect(err).toBeInstanceOf(ArgsValidationError);
-      expect((err as ArgsValidationError).message).toContain("invalid parameter schema");
-    }
-  });
-
-  it("TC6b: strictSchema:false 容忍自定义关键字与 format（design-review major-3 回归）", () => {
-    const spec = makeSpec(
-      { type: "object", properties: { target: { type: "string", format: "uri" } }, required: ["target"], "x-custom": true },
-      { target: "https://example.com" },
-    );
-    expect(() => validateRunArgs(spec)).not.toThrow();
-  });
-
-  it("TC7: 无缓存——每次 validateRunArgs 均校验（compile 0.006ms 实测，缓存无价值；无缓存声明本身靠 [P-compile] 探针实证，本用例是行为冒烟）", () => {
-    const params = reviewFixLoopParameters();
-    const good = makeSpec(params, { targetType: "git-diff", target: "main" });
-    const bad = makeSpec(params, { targetType: "git-diff" });
-    // 同一 schema 对象校验 3 次：每次均正确执行（无缓存命中概念）
-    expect(() => validateRunArgs(good)).not.toThrow();
-    expect(() => validateRunArgs(bad)).toThrow(ArgsValidationError);
-    expect(() => validateRunArgs(good)).not.toThrow();
-  });
-});