@zhushanwen/pi-plan 0.5.2 → 1.1.0

package/src/__tests__/{compact-criteria-array.test.ts → success-criteria-array.test.ts}

@@ -1,5 +1,5 @@
 /**
- * plan/compact.ts — buildPlanSuccessCriteria 数组形态测试
+ * plan/execution-notice.ts — buildPlanSuccessCriteria 数组形态测试
  *
  * 形态契约（U25）：1 条总述 `All N steps of <basename> executed and verified`
  * + 前 3 条 step preview（编号前缀、单条截断 ≤80 chars），合计 ≤4 条
@@ -11,7 +11,7 @@ vi.mock("node:fs", () => ({
   readFileSync: vi.fn(),
 }));
 
-import { buildPlanSuccessCriteria, handlePlanComplete } from "../compact.js";
+import { buildPlanSuccessCriteria, handlePlanComplete } from "../execution-notice.js";
 import { PLAN_CONTEXT_CUSTOM_TYPE } from "../state.js";
 
 const fsMock = vi.mocked(await import("node:fs"));
@@ -25,25 +25,18 @@ function makePi() {
 }
 
 function makeCtx() {
-  const onCompleteFns: Array<() => void> = [];
-  const onErrorFns: Array<(e: Error) => void> = [];
-
   return {
-    sessionManager: { getSessionId: () => "test-session", getEntries: () => [] as unknown[] },
+    sessionManager: { getSessionId: () => "test-session", getLeafId: () => null, getEntries: () => [] as unknown[] },
     ui: { notify: vi.fn() },
-    compact: vi.fn((opts: { onComplete?: () => void; onError?: (e: Error) => void }) => {
-      if (opts.onComplete) onCompleteFns.push(opts.onComplete);
-      if (opts.onError) onErrorFns.push(opts.onError);
-    }),
-    _onCompleteFns: onCompleteFns,
-    _onErrorFns: onErrorFns,
   };
 }
 
 function makeActiveState() {
   return {
     isActive: true,
-    planFilePath: "/tmp/plan.md",
+    // 生产真实形态（enter.ts：<project>/.tmp/plans/<slug>/plan.md）——buildPlanSlug 取
+    // 目录名（requirement slug 段），合成单层路径会让 slug 派生在测试数据上失真
+    planFilePath: "/tmp/test-project/.tmp/plans/login-page/plan.md",
     requirement: "Add login page",
     templateName: "default",
   };
@@ -66,46 +59,37 @@ function expectSingleLineArray(value: unknown): string[] {
 // --- buildPlanSuccessCriteria 单元 ---
 
 describe("buildPlanSuccessCriteria — 1 总述 + 前 3 条 preview", () => {
+  // 生产真实形态（enter.ts：<project>/.tmp/plans/<slug>/plan.md）——总述身份取目录名
+  const PLAN_PATH = "/tmp/test-project/.tmp/plans/login-page/plan.md";
+
   it("5 步 plan → 4 条：总述 + 前 3 条 preview", () => {
     const steps = ["Alpha", "Bravo", "Charlie", "Delta", "Echo"];
-    const items = expectSingleLineArray(buildPlanSuccessCriteria("/tmp/plan.md", steps));
+    const items = expectSingleLineArray(buildPlanSuccessCriteria(PLAN_PATH, steps));
 
     expect(items).toHaveLength(4);
-    expect(items[0]).toBe("All 5 steps of plan executed and verified");
+    expect(items[0]).toBe("All 5 steps of login-page executed and verified");
     expect(items.slice(1)).toEqual(["1. Alpha", "2. Bravo", "3. Charlie"]);
   });
 
-  it("1 步 plan → 2 条", () => {
-    const items = expectSingleLineArray(buildPlanSuccessCriteria("/tmp/plan.md", ["Only step"]));
-
-    expect(items).toHaveLength(2);
-    expect(items[0]).toBe("All 1 steps of plan executed and verified");
-    expect(items[1]).toBe("1. Only step");
-  });
-
   it("0 步 → 仅总述 1 条", () => {
-    const items = expectSingleLineArray(buildPlanSuccessCriteria("/tmp/plan.md", []));
+    const items = expectSingleLineArray(buildPlanSuccessCriteria(PLAN_PATH, []));
 
-    expect(items).toEqual(["All 0 steps of plan executed and verified"]);
+    expect(items).toEqual(["All 0 steps of login-page executed and verified"]);
   });
 
-  it("12 步 → 仍 4 条，总述含实际总数", () => {
-    const steps = Array.from({ length: 12 }, (_, i) => `S${i + 1}`);
-    const items = expectSingleLineArray(buildPlanSuccessCriteria("/tmp/plan.md", steps));
-
-    expect(items).toHaveLength(4);
-    expect(items[0]).toBe("All 12 steps of plan executed and verified");
-    expect(items.slice(1)).toEqual(["1. S1", "2. S2", "3. S3"]);
+  it("目录名混合大小写 → kebab 链小写折叠（非生产形态防御）", () => {
+    const items = buildPlanSuccessCriteria("/work/FeatLogin/plan.md", ["S1"]);
+    expect(items[0]).toBe("All 1 steps of featlogin executed and verified");
   });
 
-  it("basename 为 plan 文件名去扩展名（含大写 .MD）", () => {
-    const items = buildPlanSuccessCriteria("/work/feat-login-plan.MD", ["S1"]);
-    expect(items[0]).toBe("All 1 steps of feat-login-plan executed and verified");
+  it("非生产形态裸文件路径 → 提取为空回兜底名", () => {
+    const items = buildPlanSuccessCriteria("/plan-x.md", ["S1"]);
+    expect(items[0]).toBe("All 1 steps of plan-execution executed and verified");
   });
 
   it("超长 step → 截断至 ≤80 chars 且以 ... 结尾，保留编号前缀", () => {
     const long = "x".repeat(120);
-    const items = expectSingleLineArray(buildPlanSuccessCriteria("/tmp/plan.md", [long]));
+    const items = expectSingleLineArray(buildPlanSuccessCriteria(PLAN_PATH, [long]));
 
     expect(items[1]).toHaveLength(80);
     expect(items[1].endsWith("...")).toBe(true);
@@ -114,7 +98,7 @@ describe("buildPlanSuccessCriteria — 1 总述 + 前 3 条 preview", () => {
 
   it("恰好 80 chars 的条目 → 不截断、不加省略号", () => {
     const exact = "y".repeat(77); // "1. " 前缀 + 77 = 80
-    const items = buildPlanSuccessCriteria("/tmp/plan.md", [exact]);
+    const items = buildPlanSuccessCriteria(PLAN_PATH, [exact]);
 
     expect(items[1]).toBe(`1. ${exact}`);
     expect(items[1]).toHaveLength(80);
@@ -122,7 +106,7 @@ describe("buildPlanSuccessCriteria — 1 总述 + 前 3 条 preview", () => {
   });
 
   it("step 文本含换行符 → 折叠为单行空格分隔（goal handler 拒 \r\n）", () => {
-    const items = expectSingleLineArray(buildPlanSuccessCriteria("/tmp/plan.md", ["line1\nline2\r\nline3"]));
+    const items = expectSingleLineArray(buildPlanSuccessCriteria(PLAN_PATH, ["line1\nline2\r\nline3"]));
 
     expect(items[1]).toBe("1. line1 line2 line3");
   });
@@ -131,7 +115,7 @@ describe("buildPlanSuccessCriteria — 1 总述 + 前 3 条 preview", () => {
 // --- handlePlanComplete → tryGoalInit 端到端 ---
 
 /**
- * goal 桥 slot key——与 compact.ts / goal 侧 index.ts 的字符串一致（本地声明，
+ * goal 桥 slot key——与 execution-notice.ts / goal 侧 index.ts 的字符串一致（本地声明，
  * 不 import 对方包：pi-goal 是 optional peer）。mock 挂 slot 与真实通道同构。
  */
 const GOAL_INIT_SLOT_KEY = Symbol.for("@zhushanwen/pi-goal.goalInit");
@@ -158,51 +142,26 @@ describe("handlePlanComplete — goalInit slot 第 5 参数为新形态 string[]
     return expectSingleLineArray(goalInitMock.mock.calls[0][4]);
   }
 
-  it("direct isolation: 3 步 plan → 总述 + 3 条 preview", () => {
+  it("直接投递：3 步 plan → 总述 + 3 条 preview", () => {
     fsMock.readFileSync.mockReturnValue(makePlanContent(["Step A", "Step B", "Step C"]));
 
-    handlePlanComplete(pi as never, ctx as never, makeActiveState(), "direct", "execute");
+    handlePlanComplete(pi as never, ctx as never, makeActiveState(), "execute");
 
     expect(getCriteriaArg()).toEqual([
-      "All 3 steps of plan executed and verified",
+      "All 3 steps of login-page executed and verified",
       "1. Step A",
       "2. Step B",
       "3. Step C",
     ]);
   });
 
-  it("compact isolation: onComplete 后 goalInit 收到同形态数组", () => {
-    fsMock.readFileSync.mockReturnValue(makePlanContent(["Step one", "Step two"]));
-
-    handlePlanComplete(pi as never, ctx as never, makeActiveState(), "compact", "execute");
-    ctx._onCompleteFns[0]();
-
-    expect(getCriteriaArg()).toEqual([
-      "All 2 steps of plan executed and verified",
-      "1. Step one",
-      "2. Step two",
-    ]);
-  });
-
-  it("12 步 plan → 数组长度固定 4（1 总述 + 3 preview），不再按 8 条上限截断", () => {
-    const steps = Array.from({ length: 12 }, (_, i) => `Step ${i + 1}`);
-    fsMock.readFileSync.mockReturnValue(makePlanContent(steps));
-
-    handlePlanComplete(pi as never, ctx as never, makeActiveState(), "direct", "execute");
-
-    const items = getCriteriaArg();
-    expect(items).toHaveLength(4);
-    expect(items[0]).toContain("12 steps");
-    expect(items[0]).toContain("plan");
-  });
-
   it("CRLF plan 文件 → 每条 criteria 仍单行不含 \\r \\n", () => {
     fsMock.readFileSync.mockReturnValue("## 实现步骤\r\n1. Step one\r\n2. Step two\r\n3. Step three");
 
-    handlePlanComplete(pi as never, ctx as never, makeActiveState(), "direct", "execute");
+    handlePlanComplete(pi as never, ctx as never, makeActiveState(), "execute");
 
     expect(getCriteriaArg()).toEqual([
-      "All 3 steps of plan executed and verified",
+      "All 3 steps of login-page executed and verified",
       "1. Step one",
       "2. Step two",
       "3. Step three",
@@ -212,7 +171,7 @@ describe("handlePlanComplete — goalInit slot 第 5 参数为新形态 string[]
   it("0 步 plan → tryGoalInit 提前退出，goalInit 不被调用", () => {
     (fsMock.readFileSync as ReturnType<typeof vi.fn>).mockReturnValue("## Overview\nNo numbered steps here.");
 
-    handlePlanComplete(pi as never, ctx as never, makeActiveState(), "direct", "execute");
+    handlePlanComplete(pi as never, ctx as never, makeActiveState(), "execute");
 
     expect(goalInitMock).not.toHaveBeenCalled();
     // steer 仍发出（执行流程不因 goal 缺席中断）——custom message 三要素 + steer options（A6）

package/src/__tests__/templates.test.ts

@@ -7,12 +7,11 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 
 import { getLogger } from "@zhushanwen/pi-extension-logger";
 
-import { extractPlanSteps } from "../compact.js";
+import { extractPlanSteps } from "../execution-notice.js";
 import {
   formatAvailablePlans,
   getBuiltinTemplateDir,
   listTemplates,
-  loadTemplate,
 } from "../templates.js";
 
 const BUILTIN_TEMPLATE_NAMES = [
@@ -46,7 +45,7 @@ function absentDir(label: string): string {
   return join(tmpdir(), `plan-absent-${label}-${randomUUID()}`);
 }
 
-/** loadTemplate 用隔离源（用户级缺位 → 只剩内置源，不受运行机真实 ~/.agents/plans 干扰） */
+/** 发现视图用隔离源（用户级缺位 → 只剩内置源，不受运行机真实 ~/.agents/plans 干扰） */
 function isolatedSources(): { userPlansDir: string } {
   return { userPlansDir: absentDir("user") };
 }
@@ -170,24 +169,6 @@ describe("空发现 warn（bundle 布局事故信号）", () => {
   });
 });
 
-describe("loadTemplate（发现视图的读取侧）", () => {
-  it("returns content for existing builtin template（隔离用户源）", () => {
-    const content = loadTemplate("feature-plan", isolatedSources());
-    expect(content).not.toBeNull();
-    expect(content).toContain("## ");
-  });
-
-  it("returns null for non-existent template", () => {
-    expect(loadTemplate("non-existent-template", isolatedSources())).toBeNull();
-  });
-
-  it("从合并视图解析：同名时用户级胜者内容被加载", () => {
-    const userDir = mkTmpDir("plan-lt-user-");
-    writeTemplate(userDir, "feature-plan.md", "# user-owned skeleton\n");
-    expect(loadTemplate("feature-plan", { userPlansDir: userDir })).toBe("# user-owned skeleton\n");
-  });
-});
-
 describe("<available-plans> 段拼装纯函数（D6）", () => {
   it("空清单返回空串（不注入段）", () => {
     expect(formatAvailablePlans([])).toBe("");
@@ -233,12 +214,14 @@ describe("template ↔ extractPlanSteps alignment guard (D4)", () => {
   // ① 模板标题改名 → 恰一节断言失败；
   // ② 解析正则与标题脱节 → 提取退化到 fallback 收进其他节的噪音项 → toEqual 失败。
   it.each(BUILTIN_TEMPLATE_NAMES)("template '%s' has exactly one '## Implementation Steps' section that extractPlanSteps consumes", (name) => {
-    const content = loadTemplate(name, isolatedSources());
-    expect(content).not.toBeNull();
+    // 胜者 path 直读（读取侧已随 select-template 单次扫描复用收口——不另有按名读取 API）
+    const winner = listTemplates(isolatedSources()).find((t) => t.name === name);
+    expect(winner).toBeDefined();
+    const content = winner ? fs.readFileSync(winner.path, "utf-8") : "";
 
-    expect(content!.match(/^## Implementation Steps$/gm)).toHaveLength(1);
+    expect(content.match(/^## Implementation Steps$/gm)).toHaveLength(1);
 
-    const plan = content!
+    const plan = content
       // 在第一个非步骤节标题后放噪音编号项（模拟 Requirements 等节含编号列表）
       .replace(/^(## (?!Implementation Steps).+)$/m, "$1\n1. noise-from-other-section")
       // 在步骤节标题后填编号步骤（模拟 AI 按模板写 plan.md）