@zhushanwen/pi-subagent-workflow 8.5.0 → 8.7.0

package/src/execution/__tests__/notifier-golden-snapshot.test.ts

@@ -1,261 +0,0 @@
-/**
- * Golden snapshot 固化测试：记录 notifier.buildLlmContent 在各种输入下的输出。
- *
- * 此测试在迁移**前**运行并固化结果——迁移后必须逐字节一致（G4）。
- *
- * 这些测试直接测试 BgNotifier 的输出内容，不涉及 send/handle 机制，
- * 因此迁移后应通过内核装配 + 同一 buildLlmContent 产生相同输出。
- */
-import type { Theme } from "@earendil-works/pi-coding-agent";
-import { describe, expect, it } from "vitest";
-import { createNotifier, type BgNotifyRecord, type NotifierHost } from "../notifier.ts";
-import { renderBgNotifyMessage } from "../../interface/bg-notify-render.ts";
-
-/** 渲染锁用 mock theme（与 bg-notify-render.test.ts 同款：透传文本，记录色 token）。 */
-function makeRenderTheme(): { theme: Theme } {
-  return {
-    theme: {
-      fg: (_tag: string, text: string) => text,
-      bold: (text: string) => text,
-      bg: (_color: string, text: string) => text,
-    } as unknown as Theme,
-  };
-}
-
-/** 创建 mock host，notifier 会立即 flush（hasRunningBackground=false）。 */
-function makeMockHost(): NotifierHost {
-  return {
-    sendMessage: () => {},
-    hasRunningBackground: () => false,
-    isIdle: () => true,
-  };
-}
-
-/**
- * 调用 notifier.notify 并捕获 sendMessage 的 content 参数。
- * 前置条件：hasRunningBackground=false → notify 立即 flush。
- */
-function captureNotificationContent(record: BgNotifyRecord): string {
-  let capturedContent = "";
-  const host: NotifierHost = {
-    sendMessage: (msg) => {
-      capturedContent = (msg as { content: string }).content;
-    },
-    hasRunningBackground: () => false,
-    isIdle: () => true,
-  };
-  const notifier = createNotifier(host);
-  notifier.notify(record);
-  notifier.dispose();
-  return capturedContent;
-}
-
-describe("U3_UNIT notifier golden snapshots (pre-migration freeze)", () => {
-  it("single closed success — one-shot completed notification", () => {
-    const content = captureNotificationContent({
-      id: "sa-ptr-7",
-      status: "closed",
-      agent: "worker",
-      result: "done",
-      startedAt: 1,
-      endedAt: 2,
-    });
-    expect(content).toBe('Subagent "worker" (sa-ptr-7) completed. Result:\ndone');
-  });
-
-  it("single closed + sessionFile — pointer line appended", () => {
-    const content = captureNotificationContent({
-      id: "sa-ptr-2",
-      status: "closed",
-      agent: "w",
-      result: "final result",
-      sessionFile: "/tmp/sessions/child-2.jsonl",
-      startedAt: 1,
-      endedAt: 2,
-    });
-    expect(content).toBe(
-      'Subagent "w" (sa-ptr-2) completed. Result:\nfinal result\n\nFull transcript: /tmp/sessions/child-2.jsonl',
-    );
-  });
-
-  it("single running round (chatMode) — round notification", () => {
-    const content = captureNotificationContent({
-      id: "sa-ptr-4",
-      status: "running",
-      agent: "w",
-      round: 2,
-      result: "round2 text",
-      startedAt: 1,
-      endedAt: 2,
-    });
-    expect(content).toBe('Subagent "w" (sa-ptr-4) finished a round. Reply:\nround2 text');
-  });
-
-  it("single running round + sessionFile — pointer appended to round notification", () => {
-    const content = captureNotificationContent({
-      id: "sa-ptr-1",
-      status: "running",
-      agent: "w",
-      round: 1,
-      result: "round1 text",
-      sessionFile: "/tmp/sessions/child-1.jsonl",
-      startedAt: 1,
-      endedAt: 2,
-    });
-    expect(content).toBe(
-      'Subagent "w" (sa-ptr-1) finished a round. Reply:\nround1 text\n\nFull transcript: /tmp/sessions/child-1.jsonl',
-    );
-  });
-
-  it("single cancelled — cancelled message, no pointer", () => {
-    const content = captureNotificationContent({
-      id: "sa-ptr-5",
-      status: "closed",
-      closedReason: "cancelled",
-      agent: "w",
-      startedAt: 1,
-      endedAt: 2,
-    });
-    expect(content).toBe('Subagent "w" (sa-ptr-5) cancelled.');
-  });
-
-  it("single gc-failed — error message, no pointer", () => {
-    const content = captureNotificationContent({
-      id: "sa-ptr-6",
-      status: "closed",
-      closedReason: "gc",
-      agent: "w",
-      error: "spawn EPIPE",
-      startedAt: 1,
-      endedAt: 2,
-    });
-    expect(content).toBe('Subagent "w" (sa-ptr-6) failed: spawn EPIPE');
-  });
-
-  it("single gc-failed + patchFile — failed takes priority, no patch hint", () => {
-    const content = captureNotificationContent({
-      id: "sa-ptr-8",
-      status: "closed",
-      closedReason: "gc",
-      agent: "w",
-      error: "spawn EPIPE",
-      patchFile: "/tmp/patches/sa-ptr-8.patch",
-      startedAt: 1,
-      endedAt: 2,
-    });
-    expect(content).toBe('Subagent "w" (sa-ptr-8) failed: spawn EPIPE');
-  });
-
-  it("single closed + patchFile + sessionFile — patch hint + pointer", () => {
-    const content = captureNotificationContent({
-      id: "sa-ptr-3",
-      status: "closed",
-      agent: "w",
-      result: "did work",
-      patchFile: "/tmp/patches/sa-ptr-3.patch",
-      sessionFile: "/tmp/sessions/child-3.jsonl",
-      startedAt: 1,
-      endedAt: 2,
-    });
-    expect(content).toContain("git apply /tmp/patches/sa-ptr-3.patch");
-    expect(content.endsWith("\n\nFull transcript: /tmp/sessions/child-3.jsonl")).toBe(true);
-  });
-
-  it("closed + totalRounds — chatMode close with round stats", () => {
-    const content = captureNotificationContent({
-      id: "sa-rounds-1",
-      status: "closed",
-      agent: "w",
-      totalRounds: 3,
-      result: "",
-      sessionFile: "/tmp/sessions/child-rounds.jsonl",
-      startedAt: 1,
-      endedAt: 2,
-    });
-    expect(content).toBe(
-      "Subagent \"w\" (sa-rounds-1) completed after 3 rounds. Result:\n\n\nFull transcript: /tmp/sessions/child-rounds.jsonl",
-    );
-  });
-
-  it("closed no totalRounds — one-shot, no round stats", () => {
-    const content = captureNotificationContent({
-      id: "sa-rounds-2",
-      status: "closed",
-      agent: "w",
-      result: "done",
-      sessionFile: "/tmp/sessions/child-oneshot.jsonl",
-      startedAt: 1,
-      endedAt: 2,
-    });
-    expect(content).toBe(
-      'Subagent "w" (sa-rounds-2) completed. Result:\ndone\n\nFull transcript: /tmp/sessions/child-oneshot.jsonl',
-    );
-  });
-});
-
-describe("notifier golden — batch merge (60s window, two records)", () => {
-  it("two closed records joined with separator", () => {
-    let capturedContent = "";
-    let capturedDetails: unknown;
-    const host: NotifierHost = {
-      sendMessage: (msg) => {
-        capturedContent = (msg as { content: string }).content;
-        capturedDetails = (msg as { details: unknown }).details;
-      },
-      hasRunningBackground: () => true, // true → 合批窗口激活
-      isIdle: () => true,
-    };
-    const notifier = createNotifier(host);
-
-    // 两条通知入队（不立即 flush——hasRunningBackground=true）
-    notifier.notify({
-      id: "batch-1", status: "closed", agent: "w1", result: "result1",
-      startedAt: 1, endedAt: 2,
-    });
-    notifier.notify({
-      id: "batch-2", status: "closed", agent: "w2", result: "result2",
-      startedAt: 3, "endedAt": 4,
-    });
-
-    // 手动 flush（模拟窗口到期）
-    notifier.flushPendingNotifications();
-
-    expect(capturedContent).toBe(
-      'Subagent "w1" (batch-1) completed. Result:\nresult1\n\n---\n\nSubagent "w2" (batch-2) completed. Result:\nresult2',
-    );
-    // details 结构（must-fix #13 / #6 锁死）：items 元素必须是 record 本体（顶层
-    // status/agent/id/result——bg-notify-render 的 extractBgNotifyRecord 按此读取），
-    // 拦截内核 items 规则回归（曾错装 payload 导致渲染降级默认样式）。
-    const details = capturedDetails as { batch: boolean; items: unknown[] };
-    expect(details.batch).toBe(true);
-    expect(details.items).toHaveLength(2);
-    expect(details.items[0]).toMatchObject({
-      id: "batch-1",
-      status: "closed",
-      agent: "w1",
-      result: "result1",
-      startedAt: 1,
-      endedAt: 2,
-    });
-    expect(details.items[1]).toMatchObject({
-      id: "batch-2",
-      status: "closed",
-      agent: "w2",
-      result: "result2",
-    });
-    // 端到端渲染锁（#6）：合批 details 直接喂 bg-notify-render 必须走批量分支成功渲染
-    // （非 undefined 兜底），两条 agent 均可见。
-    const { theme } = makeRenderTheme();
-    const comp = renderBgNotifyMessage(
-      { details: capturedDetails },
-      { expanded: false },
-      theme,
-    );
-    expect(comp).toBeDefined();
-    const joined = comp!.render(80).join("\n");
-    expect(joined).toContain("w1");
-    expect(joined).toContain("w2");
-
-    notifier.dispose();
-  });
-});

package/src/execution/__tests__/one-shot-upgrade.test.ts

@@ -1,205 +0,0 @@
-// src/execution/__tests__/one-shot-upgrade.test.ts
-//
-// SP-5 one-shot upgrade：非 chatMode active record 收到 message 时自动升级 chatMode。
-//
-// 场景：one-shot subagent（conversation=false）完成首轮后 record 仍在内存（running/idle），
-// LLM 调 message 续聊 → messageHandler 检测非 chatMode + active → 置 chatMode=true（upgrade）→
-// 走 deliverMessage 统一路径（热路径或冷路径 resume）。
-//
-// mock 策略：真实 SubagentService + mock runSpawn（受控），getChildByRecord/spawnedChildren
-// 提供真实 Map 语义（deliverMessage 热路径需要 child 存在）。
-
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
-
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-// mock logger
-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 type { SessionRunnerContext } from "../session-runner.ts";
-import { createRecord } from "../execution-record.ts";
-import { ModelConfigService } from "../model-config-service.ts";
-import type { ModelInfo } from "../model-resolver.ts";
-import { RecordStore } from "../record-store.ts";
-import { SubagentService } from "../subagent-service.ts";
-import type { PiLike } from "../subagent-service.ts";
-import type { AgentResult, ExecutionRecord } from "../types.ts";
-import { messageHandler } from "../../interface/subagent-actions.ts";
-
-const mockRunSpawn = vi.mocked(runSpawn);
-
-const STUB_MODEL: ModelInfo = { id: "test-model", name: "Test", provider: "test", reasoning: false };
-
-function makeTmpAgentDir(): string {
-  return fs.mkdtempSync(path.join(os.tmpdir(), "upgrade-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: [],
-  };
-}
-
-interface ServiceInternals {
-  store: RecordStore;
-  sessionRootId: string | null;
-}
-
-/** 非 chatMode background record（one-shot 模式）。 */
-function makeOneShotRecord(
-  sessionRootId: string,
-  status: "running" = "running",
-  id = "sa-oneshot",
-): ExecutionRecord {
-  const record = createRecord(id, {
-    agent: "general-purpose",
-    model: "test/test-model",
-    thinkingLevel: "low",
-    mode: "background",
-    task: "one-shot task",
-    slug: "oneshot",
-    startedAt: 1000,
-    rootSessionId: sessionRootId,
-    // chatMode 不传 = undefined = 非 chatMode（one-shot）
-  });
-  record.status = status;
-  record.controller = new AbortController();
-  // v4 B-1：one-shot 完成后 record 为 running（idle 折入 running）+ isResumable（无活进程）。
-  // sessionFile 总设（resumeRound 冷路径校验需要，热路径无害）。
-  record.sessionFile = "/tmp/fake-session.jsonl";
-  record.round = 1;
-  return record;
-}
-
-// ============================================================
-// SP-5 one-shot upgrade
-// ============================================================
-
-describe("SP-5 one-shot upgrade（message → chatMode + 冷 resume）", () => {
-  let agentDir: string;
-  let service: SubagentService;
-  let store: RecordStore;
-  let sessionRootId: string;
-
-  beforeEach(() => {
-    agentDir = makeTmpAgentDir();
-    const modelService = new ModelConfigService({ agentDir });
-    service = new SubagentService({ cwd: agentDir, modelService });
-    service.initSession({ pi: makePi(), sessionId: "root-session" });
-    const internals = service as unknown as ServiceInternals;
-    store = internals.store;
-    sessionRootId = internals.sessionRootId!;
-  });
-
-  afterEach(() => {
-    service.dispose();
-    fs.rmSync(agentDir, { recursive: true, force: true });
-  });
-
-  // TC-1: one-shot done 后 message 触发 upgrade（chatMode=true）
-  // 场景：one-shot running record → message → chatMode 被置 true → deliverMessage 热路径（child 存在）
-  it("TC-1: one-shot running record 收到 message → chatMode 升级为 true", async () => {
-    const record = makeOneShotRecord(sessionRootId, "running");
-    store.register(record);
-
-    // 注册 mock child 让 deliverMessage 走热路径
-    const mockChild = { killed: false, pid: 12345, stdin: { write: vi.fn(() => true) } };
-    spawnedChildren.set(record.id, mockChild as unknown);
-
-    // 验证升级前 chatMode 为 falsy
-    expect(record.chatMode).toBeFalsy();
-
-    await messageHandler(service, { subagentId: record.id, text: "follow-up" });
-
-    // 验证 chatMode 被升级
-    expect(record.chatMode).toBe(true);
-    // 验证 record 仍为 running（deliverMessage 热路径设 running）
-    expect(record.status).toBe("running");
-    // 验证 record 在内存中（非终态，未被 archive）
-    expect(store.getMutable(record.id)).toBeDefined();
-
-    // 清理
-    spawnedChildren.delete(record.id);
-  });
-
-  // TC-2: upgrade 后走冷路径 resume
-  // 场景：one-shot idle record（进程已死）→ message → chatMode=true → deliverMessage 冷路径 → resumeRound
-  it("TC-2: one-shot idle record 收到 message → chatMode 升级 + 冷路径 resume", async () => {
-    // one-shot 完成态 record（running + isResumable）需要 sessionFile（resumeRound 冷路径校验）
-    fs.writeFileSync("/tmp/fake-session.jsonl", "");
-    const record = makeOneShotRecord(sessionRootId);
-    store.register(record);
-
-    // mock runSpawn 返回成功（resume 后的 spawn）
-    mockRunSpawn.mockImplementation(async (_ctx: SessionRunnerContext) => {
-      return makeResult(true);
-    });
-
-    expect(record.chatMode).toBeFalsy();
-
-    await messageHandler(service, { subagentId: record.id, text: "resume message" });
-
-    // 验证 chatMode 被升级
-    expect(record.chatMode).toBe(true);
-    // 验证走了 resumeRound → runSpawn（冷路径）
-    expect(mockRunSpawn).toHaveBeenCalled();
-    // record 被 resumeRound 设为 running，runAndFinalize 完成后保持 running（v4 B-1 idle 折入 running）
-    // 关键是 record 不在终态
-    expect(record.status).not.toBe("closed");
-  });
-
-  // TC-3: upgrade 后 record 可续聊（非终态）
-  // 场景：验证升级后的 record 不会被 finalize 为终态，仍可接受后续 message
-  it("TC-3: upgrade 后 record 可续聊（非终态，仍在内存）", async () => {
-    const record = makeOneShotRecord(sessionRootId);
-    store.register(record);
-
-    // runSpawn 返回成功
-    mockRunSpawn.mockImplementation(async () => makeResult(true));
-
-    await messageHandler(service, { subagentId: record.id, text: "first resume" });
-
-    // chatMode 已升级
-    expect(record.chatMode).toBe(true);
-
-    // 关键验证：record 仍在内存（getMutable 返回非 undefined）——未被 archive 到终态
-    const mutable = store.getMutable(record.id);
-    expect(mutable).toBeDefined();
-    expect(mutable!.chatMode).toBe(true);
-
-    // 验证 status 不是终态（closed 是终态；running 是非终态，v4 B-1 idle 折入 running）
-    expect(record.status).toBe("running");
-  });
-});

package/src/execution/__tests__/output-collector.test.ts

@@ -1,61 +0,0 @@
-// src/__tests__/output-collector.test.ts
-//
-// 锁定 extractParsedOutput 纯函数契约——它被 collectResult 直接消费，决定
-// AgentResult.parsedOutput 字段。toUsageTotal / collectResponseText 已删除
-// （usage 收口进 getTotalUsage，text 收口进 getFullText，均在 execution-record.test 测）。
-import { describe, expect, it } from "vitest";
-
-import { extractParsedOutput } from "../output-collector.ts";
-import type { ToolCall } from "../types.ts";
-
-// ============================================================
-// extractParsedOutput
-// ============================================================
-
-describe("extractParsedOutput", () => {
-  it("returns undefined for empty toolCalls", () => {
-    expect(extractParsedOutput([])).toBeUndefined();
-  });
-
-  it("returns undefined when no structured-output call exists", () => {
-    const calls: ToolCall[] = [
-      { toolName: "bash", result: { details: "x" } },
-      { toolName: "read", result: { details: "y" } },
-    ];
-    expect(extractParsedOutput(calls)).toBeUndefined();
-  });
-
-  it("returns undefined when structured-output has no result.details", () => {
-    const calls: ToolCall[] = [
-      { toolName: "structured-output", result: { content: [] } },
-      { toolName: "structured-output", result: {} },
-      { toolName: "structured-output" },
-    ];
-    expect(extractParsedOutput(calls)).toBeUndefined();
-  });
-
-  it("returns details when exactly one structured-output call has details", () => {
-    const calls: ToolCall[] = [
-      { toolName: "bash" },
-      { toolName: "structured-output", result: { details: { answer: 42 } } },
-    ];
-    expect(extractParsedOutput(calls)).toEqual({ answer: 42 });
-  });
-
-  it("returns the LAST structured-output details (reverse iteration)", () => {
-    const calls: ToolCall[] = [
-      { toolName: "structured-output", result: { details: "first" } },
-      { toolName: "bash" },
-      { toolName: "structured-output", result: { details: "second" } },
-    ];
-    expect(extractParsedOutput(calls)).toBe("second");
-  });
-
-  it("ignores isError structured-output calls without details, picks one with details", () => {
-    const calls: ToolCall[] = [
-      { toolName: "structured-output", isError: true, result: { content: [{ type: "text", text: "bad" }] } },
-      { toolName: "structured-output", result: { details: { ok: true } } },
-    ];
-    expect(extractParsedOutput(calls)).toEqual({ ok: true });
-  });
-});