@zhushanwen/subagent-core 0.6.0 → 0.7.0

package/src/execution/__tests__/turn-limiter-semantics.test.ts

@@ -1,194 +0,0 @@
-// src/execution/__tests__/turn-limiter-semantics.test.ts
-//
-// SP-9: turn-limiter chatMode 语义——chatMode 下 maxTurns 每轮 reset（不跨轮累计）。
-// 设计 D9 决策：续聊本质是无限轮，累计上限违背 G1。
-
-import { describe, expect, it, vi } from "vitest";
-
-import { createTurnLimiter } from "../engine/engines/pi/turn-limiter.ts";
-
-describe("SP-9: turn-limiter chatMode semantics (maxTurns reset per round)", () => {
-  describe("TC-1: chatMode 多轮后 maxTurns 每轮 reset（不累计）", () => {
-    it("reset 后 maxTurns 不累计——第二轮从 0 开始，不触发 steer/abort", () => {
-      const steer = vi.fn();
-      const abort = vi.fn();
-      const limiter = createTurnLimiter({ maxTurns: 3, graceTurns: 2, steer, abort });
-
-      // 第一轮：3 turns → steer（达到 maxTurns=3）
-      limiter.onTurnEnd(1);
-      limiter.onTurnEnd(2);
-      limiter.onTurnEnd(3);
-      expect(steer).toHaveBeenCalledTimes(1);
-      expect(abort).not.toHaveBeenCalled();
-
-      // agent_settled → reset（模拟 chatMode 每轮 reset）
-      limiter.reset();
-
-      // 第二轮从 turnCount=0 开始（record.turnCount 由 session-runner 归零）：
-      // 2 turns 不触发 steer（距离 maxTurns=3 还差 1）
-      limiter.onTurnEnd(1);
-      limiter.onTurnEnd(2);
-      // steer 仍然是 1 次（第一轮那次），第二轮未触发
-      expect(steer).toHaveBeenCalledTimes(1);
-      expect(abort).not.toHaveBeenCalled();
-    });
-
-    it("reset 后第二轮同样达到 maxTurns 时仍触发 steer", () => {
-      const steer = vi.fn();
-      const abort = vi.fn();
-      const limiter = createTurnLimiter({ maxTurns: 2, graceTurns: 1, steer, abort });
-
-      // 第一轮：steer + grace + abort
-      limiter.onTurnEnd(1);
-      limiter.onTurnEnd(2); // steer
-      limiter.onTurnEnd(3); // abort
-      expect(steer).toHaveBeenCalledTimes(1);
-      expect(abort).toHaveBeenCalledTimes(1);
-
-      // reset（chatMode 新轮）
-      limiter.reset();
-      expect(limiter.didSteer).toBe(false);
-      expect(limiter.didAbort).toBe(false);
-
-      // 第二轮：同样走完 steer + grace 路径
-      limiter.onTurnEnd(1);
-      limiter.onTurnEnd(2); // steer again
-      expect(steer).toHaveBeenCalledTimes(2);
-      expect(abort).toHaveBeenCalledTimes(1); // 还没到 abort
-
-      limiter.onTurnEnd(3); // abort again
-      expect(abort).toHaveBeenCalledTimes(2);
-    });
-
-    it("多轮连续 reset 后 limiter 始终可用", () => {
-      const steer = vi.fn();
-      const abort = vi.fn();
-      const limiter = createTurnLimiter({ maxTurns: 2, graceTurns: 0, steer, abort });
-
-      for (let round = 1; round <= 5; round++) {
-        limiter.onTurnEnd(1);
-        limiter.onTurnEnd(2); // steer + abort (graceTurns=0)
-        expect(steer).toHaveBeenCalledTimes(round);
-        expect(abort).toHaveBeenCalledTimes(round);
-        limiter.reset();
-      }
-    });
-  });
-
-  describe("TC-2: graceTurns 每轮 reset", () => {
-    it("reset 后 graceTurns 从 0 重新计数", () => {
-      const steer = vi.fn();
-      const abort = vi.fn();
-      const limiter = createTurnLimiter({ maxTurns: 2, graceTurns: 3, steer, abort });
-
-      // 第一轮：steer at turn 2，用掉 1 个 grace turn
-      limiter.onTurnEnd(1);
-      limiter.onTurnEnd(2); // steer
-      limiter.onTurnEnd(3); // grace turn 1
-      expect(abort).not.toHaveBeenCalled();
-
-      // reset（模拟 chatMode agent_settled）
-      limiter.reset();
-
-      // 第二轮：从 turn 1 开始，graceTurns 重新从 0 计数
-      limiter.onTurnEnd(1);
-      limiter.onTurnEnd(2); // steer again
-      limiter.onTurnEnd(3); // grace turn 1（重计）
-      limiter.onTurnEnd(4); // grace turn 2
-      limiter.onTurnEnd(5); // grace turn 3 → abort
-      expect(abort).toHaveBeenCalledTimes(1);
-    });
-
-    it("reset 前未 steer 时 reset 后仍正常工作", () => {
-      const steer = vi.fn();
-      const abort = vi.fn();
-      const limiter = createTurnLimiter({ maxTurns: 5, graceTurns: 2, steer, abort });
-
-      // 第一轮：只走了 2 turns（未达 maxTurns）
-      limiter.onTurnEnd(1);
-      limiter.onTurnEnd(2);
-      expect(steer).not.toHaveBeenCalled();
-
-      limiter.reset();
-
-      // 第二轮：从 turn 1 开始，到 maxTurns=5 触发 steer
-      limiter.onTurnEnd(1);
-      limiter.onTurnEnd(2);
-      limiter.onTurnEnd(3);
-      limiter.onTurnEnd(4);
-      limiter.onTurnEnd(5); // steer
-      expect(steer).toHaveBeenCalledTimes(1);
-      limiter.onTurnEnd(6);
-      limiter.onTurnEnd(7); // abort (5+2)
-      expect(abort).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe("TC-3: 非 chatMode 行为不变（全程累计）", () => {
-    it("不调用 reset 时 turn-limiter 行为与原来完全一致", () => {
-      const steer = vi.fn();
-      const abort = vi.fn();
-      const limiter = createTurnLimiter({ maxTurns: 3, graceTurns: 2, steer, abort });
-
-      // 全程累计（非 chatMode，不 reset）：3→steer，5→abort
-      limiter.onTurnEnd(1);
-      limiter.onTurnEnd(2);
-      limiter.onTurnEnd(3); // steer
-      expect(steer).toHaveBeenCalledTimes(1);
-      limiter.onTurnEnd(4); // grace 1
-      limiter.onTurnEnd(5); // grace 2 → abort
-      expect(abort).toHaveBeenCalledTimes(1);
-      expect(limiter.didSteer).toBe(true);
-      expect(limiter.didAbort).toBe(true);
-    });
-
-    it("maxTurns=0（禁用）不因 reset 而误启用", () => {
-      const steer = vi.fn();
-      const abort = vi.fn();
-      const limiter = createTurnLimiter({ maxTurns: 0, graceTurns: 2, steer, abort });
-
-      limiter.onTurnEnd(100);
-      expect(steer).not.toHaveBeenCalled();
-
-      limiter.reset();
-      limiter.onTurnEnd(100);
-      // maxTurns=0（禁用），即使 reset 也不触发
-      expect(steer).not.toHaveBeenCalled();
-      expect(abort).not.toHaveBeenCalled();
-    });
-
-    it("全程累计（不 reset）达到 maxTurns+graceTurns 后不再触发", () => {
-      const steer = vi.fn();
-      const abort = vi.fn();
-      const limiter = createTurnLimiter({ maxTurns: 2, graceTurns: 1, steer, abort });
-
-      limiter.onTurnEnd(1);
-      limiter.onTurnEnd(2); // steer
-      limiter.onTurnEnd(3); // abort
-      expect(steer).toHaveBeenCalledTimes(1);
-      expect(abort).toHaveBeenCalledTimes(1);
-
-      // 已 abort 后继续调用 onTurnEnd（不应再次触发）
-      limiter.onTurnEnd(4);
-      limiter.onTurnEnd(5);
-      expect(steer).toHaveBeenCalledTimes(1);
-      expect(abort).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe("TC-4: reset 诊断属性", () => {
-    it("reset 清除 didSteer 和 didAbort 诊断标志", () => {
-      const steer = vi.fn();
-      const abort = vi.fn();
-      const limiter = createTurnLimiter({ maxTurns: 1, graceTurns: 0, steer, abort });
-
-      limiter.onTurnEnd(1); // steer + abort (graceTurns=0)
-      expect(limiter.didSteer).toBe(true);
-      expect(limiter.didAbort).toBe(true);
-
-      limiter.reset();
-      expect(limiter.didSteer).toBe(false);
-      expect(limiter.didAbort).toBe(false);
-    });
-  });
-});

package/src/execution/__tests__/turn-limiter.test.ts

@@ -1,65 +0,0 @@
-// src/__tests__/turn-limiter.test.ts
-import { describe, expect, it, vi } from "vitest";
-
-import { createTurnLimiter } from "../engine/engines/pi/turn-limiter.ts";
-
-describe("createTurnLimiter", () => {
-  it("does nothing before maxTurns", () => {
-    const steer = vi.fn();
-    const abort = vi.fn();
-    const limiter = createTurnLimiter({ maxTurns: 3, graceTurns: 2, steer, abort });
-    limiter.onTurnEnd(1);
-    limiter.onTurnEnd(2);
-    expect(steer).not.toHaveBeenCalled();
-    expect(abort).not.toHaveBeenCalled();
-    expect(limiter.didSteer).toBe(false);
-    expect(limiter.didAbort).toBe(false);
-  });
-
-  it("steers on maxTurns and aborts after graceTurns", () => {
-    const steer = vi.fn();
-    const abort = vi.fn();
-    const limiter = createTurnLimiter({ maxTurns: 3, graceTurns: 2, steer, abort });
-    limiter.onTurnEnd(3); // 达到 maxTurns → steer
-    expect(steer).toHaveBeenCalledWith(expect.stringContaining("You have reached your turn limit"));
-    expect(abort).not.toHaveBeenCalled();
-    expect(limiter.didSteer).toBe(true);
-    limiter.onTurnEnd(4); // grace turn 1
-    expect(abort).not.toHaveBeenCalled();
-    limiter.onTurnEnd(5); // grace turn 2 → abort
-    expect(abort).toHaveBeenCalledTimes(1);
-    expect(limiter.didAbort).toBe(true);
-  });
-
-  it("disables when maxTurns is 0", () => {
-    const steer = vi.fn();
-    const abort = vi.fn();
-    const limiter = createTurnLimiter({ maxTurns: 0, graceTurns: 2, steer, abort });
-    limiter.onTurnEnd(100);
-    expect(steer).not.toHaveBeenCalled();
-    expect(abort).not.toHaveBeenCalled();
-    expect(limiter.didSteer).toBe(false);
-  });
-
-  it("steers only once", () => {
-    const steer = vi.fn();
-    const abort = vi.fn();
-    const limiter = createTurnLimiter({ maxTurns: 2, graceTurns: 3, steer, abort });
-    limiter.onTurnEnd(2);
-    limiter.onTurnEnd(3);
-    expect(steer).toHaveBeenCalledTimes(1);
-    expect(limiter.didSteer).toBe(true);
-  });
-
-  it("aborts on the same turn as steer when graceTurns is 0", () => {
-    const steer = vi.fn();
-    const abort = vi.fn();
-    const limiter = createTurnLimiter({ maxTurns: 2, graceTurns: 0, steer, abort });
-    // grace=0 → limit+grace == limit，steer 后同一 turn 即满足 abort 条件
-    limiter.onTurnEnd(2); // maxTurns → steer + abort（同 turn）
-    expect(steer).toHaveBeenCalledTimes(1);
-    expect(abort).toHaveBeenCalledTimes(1);
-    expect(limiter.didSteer).toBe(true);
-    expect(limiter.didAbort).toBe(true);
-  });
-});

package/src/execution/__tests__/ui-request-handler.test.ts

@@ -1,205 +0,0 @@
-// src/__tests__/ui-request-handler.test.ts
-//
-// W2 测试（TC-W2 / SR-2）：UI 请求处理 —— Pi 原生协议格式。
-//
-// 测试对象：session-runner.ts 的 handleUiRequest + spawn-event-adapter.ts 的 parseSpawnLine
-// 契约来源：.fix-plans/00-master-summary.md §二 2.1（ExtensionUiRequest）+ 2.2（UiRequest/channel）
-//          + 2.3（stdin 回写 extension_ui_response 格式）+ §一冲突 2（channel 提取在 session-runner 层）
-//
-// 修复原因（FR-12/SR-2）：
-//   旧测试用错误的 JSON-RPC 2.0 格式 mock（jsonrpc:"2.0" + params.marker:"ASK_USER"
-//   + params.questions），测试绿但生产红（Pi 实际发 {type, method, title, options} 平铺）。
-//   改为 Pi 真实格式 + channel/channelPayload 断言 + extension_ui_response 回写格式。
-//
-// 红灯原因：handleUiRequest 签名仍是旧的 (child, id, params, ctx, signal)
-//   + parseChannel 未接入 session-runner，编译失败。W2 改完签名后转绿。
-
-import { PassThrough } from "node:stream";
-
-import { describe, expect, it, vi } from "vitest";
-
-import { ASK_USER_RPC_PROMPT } from "../engine/engines/pi/session-runner.ts";
-import { parseSpawnLine } from "../engine/engines/pi/spawn-event-adapter.ts";
-import { parseChannel } from "../ui-channels.ts";
-import { createUiRequestQueue, type UiRequest, type UiRequestHandler } from "../ui-request-queue.ts";
-
-// ── Pi 原生协议样本构造 ────────────────────────────────────
-// 真实格式：{type:"extension_ui_request", id, method:"select",
-//           title:"\0XYZ_ASK_USER", options:[JSON.stringify({questions, allowCancel})]}
-// 无 jsonrpc 字段、无 params 包裹、method 在顶层（非 method:"extension_ui_request"）。
-
-const ASK_USER_MARKER = "\0XYZ_ASK_USER";
-const askUserPayload = {
-  questions: [
-    {
-      question: "What is your preference?",
-      options: [{ label: "Option A" }, { label: "Option B" }],
-    },
-  ],
-  allowCancel: true,
-};
-
-function askUserLine(id: string): string {
-  return JSON.stringify({
-    type: "extension_ui_request",
-    id,
-    method: "select",
-    title: ASK_USER_MARKER,
-    options: [JSON.stringify(askUserPayload)],
-  });
-}
-
-// ── 解析：Pi 原生格式 → ExtensionUiRequest（method 平铺，无 params） ─────
-
-describe("parseSpawnLine — ask_user 请求解析（Pi 原生格式）", () => {
-  it("ask_user 行被识别为 extension_ui_request kind", () => {
-    const result = parseSpawnLine(askUserLine("ui-req-001"));
-    expect(result?.kind).toBe("extension_ui_request");
-  });
-
-  it("request.method === 'select'（ask_user 借道 select dialog 通道）", () => {
-    const result = parseSpawnLine(askUserLine("ui-req-001"));
-    if (result?.kind !== "extension_ui_request") {
-      expect.fail("expected extension_ui_request kind");
-      return;
-    }
-    expect(result.request.method).toBe("select");
-  });
-
-  it("request.title === ASK_USER_MARKER（NUL 前缀 marker 原样保留，由 parseChannel 提取）", () => {
-    const result = parseSpawnLine(askUserLine("ui-req-001"));
-    if (result?.kind !== "extension_ui_request") return;
-    if (result.request.method !== "select") return expect.fail("request.method 应为 select");
-    expect((result.request as { title?: string }).title).toBe(ASK_USER_MARKER);
-  });
-
-  it("id 被正确提取（用于 response 关联）", () => {
-    const result = parseSpawnLine(askUserLine("ui-req-001"));
-    if (result?.kind !== "extension_ui_request") return;
-    expect(result.id).toBe("ui-req-001");
-  });
-});
-
-// ── channel 提取（session-runner 层消费 parseChannel） ──────────────
-// adapter 层只做协议解析（method + 字段平铺），channel 提取在 session-runner 层。
-// 对 select.title 的 NUL 前缀解析出 channel='ask_user' + payload={questions, allowCancel}。
-
-describe("parseChannel — ask_user channel 提取（session-runner 层）", () => {
-  it("select.title 含 ASK_USER_MARKER → channel='ask_user'", () => {
-    const result = parseSpawnLine(askUserLine("ui-req-001"));
-    if (result?.kind !== "extension_ui_request") return;
-    const channel = parseChannel(result.request);
-    expect(channel.channel).toBe("ask_user");
-  });
-
-  it("channelPayload 已 parse 为 {questions, allowCancel}", () => {
-    const result = parseSpawnLine(askUserLine("ui-req-001"));
-    if (result?.kind !== "extension_ui_request") return;
-    const channel = parseChannel(result.request);
-    expect(channel.channelPayload).toEqual(askUserPayload);
-  });
-});
-
-// ── stdin 回写格式：extension_ui_response（非 JSON-RPC 2.0 result） ─────
-
-describe("handleUiRequest — stdin 回写 extension_ui_response（Pi 原生格式）", () => {
-  it("handler 返回 {value} → stdin 写入 {type:extension_ui_response, id, value}", async () => {
-    const stdin = new PassThrough();
-    const written: string[] = [];
-    stdin.on("data", (chunk: Buffer) => written.push(chunk.toString()));
-
-    const child = { stdin, on: vi.fn(), removeListener: vi.fn() } as unknown as Parameters<
-      typeof createUiRequestQueue
-    >[0];
-
-    const handler: UiRequestHandler = vi.fn(
-      async (req: UiRequest) => ({ value: `answer-for-${req.id}` }),
-    );
-    const ctx = { uiRequestHandler: handler } as unknown as Parameters<
-      typeof createUiRequestQueue
-    >[1];
-
-    const enqueue = createUiRequestQueue(child, ctx);
-    // W2 新签名：enqueue(id, request) —— request 是 ExtensionUiRequest（method 平铺）
-    enqueue("ui-req-002", {
-      method: "select",
-      title: ASK_USER_MARKER,
-      options: [JSON.stringify(askUserPayload)],
-    });
-
-    // 等微任务 + stdin flush
-    await new Promise((r) => setImmediate(r));
-
-    const raw = written.join("");
-    expect(raw).toContain('"type":"extension_ui_response"');
-    expect(raw).toContain('"id":"ui-req-002"');
-    expect(raw).toContain('"value":"answer-for-ui-req-002"');
-    // 旧 JSON-RPC 2.0 格式不应出现
-    expect(raw).not.toContain('"jsonrpc"');
-    expect(raw).not.toContain('"result"');
-  });
-});
-
-// ── handler 抛错兜底（M5）：catch → 回 cancelled → 写 stdin ─────
-// session-runner.ts:489-494 的 catch 分支：handler reject 时兜底写 cancelled。
-
-describe("handleUiRequest — handler 抛错兜底回 cancelled", () => {
-  it("handler reject(new Error('boom')) → stdin 写入 cancelled:true", async () => {
-    const stdin = new PassThrough();
-    const written: string[] = [];
-    stdin.on("data", (chunk: Buffer) => written.push(chunk.toString()));
-
-    const child = { stdin, on: vi.fn(), removeListener: vi.fn() } as unknown as Parameters<
-      typeof createUiRequestQueue
-    >[0];
-
-    // handler 抛错（reject）
-    const handler: UiRequestHandler = vi.fn(
-      async () => Promise.reject(new Error("boom")),
-    );
-    const ctx = { uiRequestHandler: handler } as unknown as Parameters<
-      typeof createUiRequestQueue
-    >[1];
-
-    const enqueue = createUiRequestQueue(child, ctx);
-    enqueue("ui-req-err", {
-      method: "select",
-      title: ASK_USER_MARKER,
-      options: [JSON.stringify(askUserPayload)],
-    });
-
-    // 等微任务 + stdin flush
-    await new Promise((r) => setImmediate(r));
-
-    const raw = written.join("");
-    expect(raw).toContain('"type":"extension_ui_response"');
-    expect(raw).toContain('"id":"ui-req-err"');
-    expect(raw).toContain('"cancelled":true');
-  });
-});
-
-// ── W4 提示词（保留，不受格式修复影响） ──────────────────────────
-
-describe("W4: ask_user RPC 系统提示词注入", () => {
-  it("ASK_USER_RPC_PROMPT 常量已导出且非空", () => {
-    expect(ASK_USER_RPC_PROMPT).toBeDefined();
-    expect(typeof ASK_USER_RPC_PROMPT).toBe("string");
-    expect(ASK_USER_RPC_PROMPT.length).toBeGreaterThan(0);
-  });
-
-  it("提示词包含 ask_user 工具说明", () => {
-    expect(ASK_USER_RPC_PROMPT).toContain("ask_user");
-    expect(ASK_USER_RPC_PROMPT).toContain("Tool Availability");
-  });
-
-  it("提示词告知 LLM ask_user 走 RPC 转发", () => {
-    expect(ASK_USER_RPC_PROMPT).toContain("RPC");
-    expect(ASK_USER_RPC_PROMPT).toContain("main agent");
-    expect(ASK_USER_RPC_PROMPT).toContain("forwarded");
-  });
-
-  it("提示词说明用户在主 agent 界面回答", () => {
-    expect(ASK_USER_RPC_PROMPT).toContain("user");
-    expect(ASK_USER_RPC_PROMPT).toContain("answers");
-  });
-});