@zhushanwen/pi-plan 1.0.0 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-plan",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Lightweight plan mode for Pi coding agent",
   "type": "module",
   "main": "index.ts",
@@ -21,11 +21,11 @@
   ],
   "license": "MIT",
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.84.4",
-    "@earendil-works/pi-tui": "^0.84.4",
-    "typebox": "*",
-    "@earendil-works/pi-ai": "^0.84.4",
-    "@zhushanwen/pi-goal": "0.14.10"
+    "@earendil-works/pi-coding-agent": "^1.0.0",
+    "@earendil-works/pi-tui": "^1.0.0",
+    "typebox": "1.3.27",
+    "@earendil-works/pi-ai": "^1.0.0",
+    "@zhushanwen/pi-goal": "0.14.11"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-tui": {
@@ -39,7 +39,7 @@
     }
   },
   "devDependencies": {
-    "@earendil-works/pi-tui": "^0.84.4",
+    "@earendil-works/pi-tui": "^1.0.0",
     "@vitest/coverage-v8": "^4.1.9",
     "vitest": "^4.1.8"
   },
@@ -50,11 +50,11 @@
     "templates/"
   ],
   "dependencies": {
-    "@zhushanwen/extension-protocol": "0.17.0",
-    "@zhushanwen/pi-exec-skills": "0.2.0",
-    "@zhushanwen/pi-ext-guards": "0.4.2",
-    "@zhushanwen/pi-extension-logger": "0.6.1",
-    "@zhushanwen/pi-llm-shared": "0.11.0",
+    "@zhushanwen/extension-protocol": "0.18.0",
+    "@zhushanwen/pi-exec-skills": "0.2.1",
+    "@zhushanwen/pi-ext-guards": "0.4.3",
+    "@zhushanwen/pi-extension-logger": "0.6.2",
+    "@zhushanwen/pi-llm-shared": "0.11.1",
     "@zhushanwen/pi-session-path": "0.1.0"
   },
   "scripts": {

package/src/__tests__/command.test.ts

@@ -295,6 +295,53 @@ describe("registerPlanCommand", () => {
     return payload.content;
   }
 
+  // --- D10②：命令反馈 notify（display:false 注入仅 LLM 可见，用户可见性由 notify 承担） ---
+
+  it("重入分支（存在既有 plan 文件）：notify 提示 + 选项清单仍走 display:false 注入", async () => {
+    vi.mocked(fs.readdirSync).mockReturnValue(["old-plan"] as unknown as ReturnType<typeof fs.readdirSync>);
+    vi.mocked(fs.statSync).mockImplementation(() => ({ isDirectory: () => true }) as unknown as fs.Stats);
+    vi.mocked(fs.existsSync).mockImplementation((p) => String(p).endsWith("/.tmp/plans/old-plan/plan.md"));
+    try {
+      await handler("", ctx);
+    } finally {
+      vi.mocked(fs.existsSync).mockImplementation(() => false);
+    }
+
+    const notify = (ctx as unknown as { ui: { notify: ReturnType<typeof vi.fn> } }).ui.notify;
+    expect(notify).toHaveBeenCalledWith(expect.stringContaining("1 existing plan file(s)"), "info");
+    // LLM 注入通路不变：custom message display:false + 选项清单全文
+    const message = sentMessage();
+    expect(message).toContain("[PLAN MODE] Found existing plan files:");
+    const calls = (pi.sendMessage as ReturnType<typeof vi.fn>).mock.calls;
+    const payload = calls[0][0] as { display: boolean };
+    expect(payload.display).toBe(false);
+  });
+
+  it("--skills 未知技能 fail-fast：notify error + 注入通路保留", async () => {
+    await handler("复盘 --skills nope", ctx);
+
+    const notify = (ctx as unknown as { ui: { notify: ReturnType<typeof vi.fn> } }).ui.notify;
+    expect(notify).toHaveBeenCalledWith(expect.stringContaining("unknown skill(s): nope"), "error");
+    expect(sentMessage()).toContain("Failed to enter: unknown skill(s): nope");
+  });
+
+  it("--template 文件缺失 fail-fast：notify error", async () => {
+    await handler("复盘 --template tpl.md", ctx);
+
+    const notify = (ctx as unknown as { ui: { notify: ReturnType<typeof vi.fn> } }).ui.notify;
+    expect(notify).toHaveBeenCalledWith(expect.stringContaining("Template file not found"), "error");
+  });
+
+  it("进入成功：notify info 携带 planFilePath（命令反馈通道，widget 之外补可达）", async () => {
+    await handler("复盘需求", ctx);
+
+    const notify = (ctx as unknown as { ui: { notify: ReturnType<typeof vi.fn> } }).ui.notify;
+    expect(notify).toHaveBeenCalledWith(
+      expect.stringContaining("Plan mode entered: /tmp/test-project/.tmp/plans/"),
+      "info",
+    );
+  });
+
   describe("--template via /plan handler", () => {
     afterEach(() => {
       // 还原默认 existsSync=false，避免路径实现泄漏到后续用例

package/src/command.ts

@@ -149,6 +149,9 @@ export function registerPlanCommand(
         const plansDir = path.join(projectDir, ".tmp", "plans");
         const existingPlans = findExistingPlans(plansDir);
         if (existingPlans.length > 0) {
+          // D10②：选项清单经 display:false 注入（LLM 消费），用户可见性由 notify 承担
+          // （现状 display:false 消息用户零可见——反馈矩阵修复）
+          ctx.ui.notify(`Found ${existingPlans.length} existing plan file(s) in .tmp/plans — options sent to the model.`, "info");
           sendPlanContextMessage(
             pi,
             `[PLAN MODE] Found existing plan files:\n${existingPlans.map((p, i) => `  ${i + 1}. ${p}`).join("\n")}\n\n` +
@@ -229,13 +232,15 @@ function sendPlanContextMessage(pi: ExtensionAPI, content: string): void {
 }
 
 /** E1 fail-fast 回复：不进入计划模式（不写 entry / 不限制工具 / 不注入计划提示词），回复可用技能清单与纠正命令 */
-function reportUnknownSkills(pi: ExtensionAPI, resolution: Extract<SkillResolution, { ok: false }>): void {
+function reportUnknownSkills(pi: ExtensionAPI, ctx: ExtensionContext, resolution: Extract<SkillResolution, { ok: false }>): void {
   const available = resolution.available.length > 0
     ? resolution.available.map((n) => `  - ${n}`).join("\n")
     : "  (no skills installed)";
   const problem = resolution.missing.length > 0
     ? `unknown skill(s): ${resolution.missing.join(", ")}`
     : "--skills was given but no skill names followed it";
+  // D10②：fail-fast 错误的用户可见性由 notify 承担（display:false 注入仅 LLM 可见）
+  ctx.ui.notify(`Plan mode not entered: ${problem}`, "error");
   sendPlanContextMessage(
     pi,
     `[PLAN MODE] Failed to enter: ${problem}.\n\n` +
@@ -249,7 +254,9 @@ function reportUnknownSkills(pi: ExtensionAPI, resolution: Extract<SkillResoluti
  * 不限制工具 / 不注入计划提示词），回复问题句（互斥/不存在/非 md，problem 内
  * 已带用法样例）。
  */
-function reportTemplateFlagError(pi: ExtensionAPI, problem: string): void {
+function reportTemplateFlagError(pi: ExtensionAPI, ctx: ExtensionContext, problem: string): void {
+  // D10②：fail-fast 错误的用户可见性由 notify 承担（display:false 注入仅 LLM 可见）
+  ctx.ui.notify(`Plan mode not entered: ${problem}`, "error");
   sendPlanContextMessage(
     pi,
     `[PLAN MODE] Failed to enter: ${problem}.\n\n` +
@@ -274,6 +281,7 @@ function handleEnterPlanMode(
   if (parsed.skills !== undefined && parsed.templatePath !== undefined) {
     reportTemplateFlagError(
       pi,
+      ctx,
       "--template and --skills are mutually exclusive. Use one: /plan <requirement> --skills a,b | /plan <requirement> --template <path>",
     );
     return;
@@ -284,7 +292,7 @@ function handleEnterPlanMode(
   if (parsed.templatePath !== undefined) {
     const resolution = resolveTemplateFile(parsed.templatePath, ctx.cwd);
     if (!resolution.ok) {
-      reportTemplateFlagError(pi, resolution.problem);
+      reportTemplateFlagError(pi, ctx, resolution.problem);
       return;
     }
     // 全文在校验通过后、任何进入副作用（entry/工具限制）之前读好——读失败
@@ -293,7 +301,7 @@ function handleEnterPlanMode(
     try {
       templateContent = fs.readFileSync(resolution.absPath, "utf-8");
     } catch {
-      reportTemplateFlagError(pi, `Template file not readable: ${resolution.absPath}. ${TEMPLATE_USAGE_SAMPLE}`);
+      reportTemplateFlagError(pi, ctx, `Template file not readable: ${resolution.absPath}. ${TEMPLATE_USAGE_SAMPLE}`);
       return;
     }
     templateAbsPath = resolution.absPath;
@@ -309,14 +317,14 @@ function handleEnterPlanMode(
     if (failed.ok) {
       throw new Error("plan: empty --skills must fail skill resolution (invariant)");
     }
-    reportUnknownSkills(pi, failed);
+    reportUnknownSkills(pi, ctx, failed);
     return;
   }
   let resolved: SkillRef[] = [];
   if (requested.length > 0) {
     const resolution = resolveSkills(pi, requested);
     if (!resolution.ok) {
-      reportUnknownSkills(pi, resolution);
+      reportUnknownSkills(pi, ctx, resolution);
       return;
     }
     resolved = resolution.resolved;
@@ -326,7 +334,7 @@ function handleEnterPlanMode(
   // 进入核心收敛到 enter.ts（plan(enter) tool 与 slash 命令共用）；本入口只负责
   // flag 解析/校验（上方）与提示词投递（下方 sendMessage custom message 注入）。
   // state 由 activatePlanMode 就地改 + persist（getPlanState 缓存同一对象）。
-  const { prompt } = activatePlanMode(pi, planCtx.states, sessionId, ctx, {
+  const { state: activated, prompt } = activatePlanMode(pi, planCtx.states, sessionId, ctx, {
     requirement,
     skills: resolved,
     projectDir: ctx.cwd,
@@ -334,6 +342,9 @@ function handleEnterPlanMode(
       ? { template: { absPath: templateAbsPath, content: templateContent } }
       : {}),
   });
+  // D10②：进入成功的用户可见性由 notify 承担（提示词注入 display:false 仅 LLM 可见；
+  // widget 已呈激活态，notify 补命令反馈通道）
+  ctx.ui.notify(`Plan mode entered: ${activated.planFilePath}`, "info");
 
   // Inject plan mode prompt as custom message（display/triggerTurn 语义见 sendPlanContextMessage。
   // 非 streaming 直调 _runAgentPrompt 跳过 prompt() 前置链，首轮 systemPrompt 叠加

package/src/execution-notice.ts

@@ -41,7 +41,7 @@ const GOAL_INIT_SLOT_KEY = Symbol.for("@zhushanwen/pi-goal.goalInit");
 
 /**
  * goal 桥的单一断言点：goal 扩展挂在 globalThis slot 上的编程式接口（发现 7——
- * 桥通道从 pi API 对象挂载迁到 slot：pi 0.84.4 per-extension API 隔离使
+ * 桥通道从 pi API 对象挂载迁到 slot：pi per-extension API 隔离（1.0.0 复核）使
  * pi.__goalInit 形态跨扩展恒不可见，slot 是 C-ext-06 惯例的进程级共享形态）。
  */
 function getGoalInit(): GoalInitFn | undefined {

package/src/state.ts

@@ -91,9 +91,9 @@ export const DEFAULT_PLAN_STATE: PlanState = {
  *
  * ask_user（D10/F9）：提示词 Phase B 本就指示「Use ask_user tool if available」，白名单
  * 曾把它排除（结构性禁言）。feature-tier 依赖降级：ask-user 是可禁扩展，pi setActiveTools
- * 对不存在的工具名静默跳过——pi 实装锚点：dist/core/agent-session.js:655（0.84.4，
+ * 对不存在的工具名静默跳过——pi 实装锚点（1.0.0 复核）：dist/core/agent-session.js
  * setActiveToolsByName docstring "Only tools in the registry can be enabled. Unknown
- * tool names are ignored."）——被禁时不报错不生效，提示词 "if available"
+ * and hidden tool names are ignored."——被禁时不报错不生效，提示词 "if available"
  * 条件语义即降级（回退对话流提问）。
  */
 export const PLAN_MODE_TOOLS = ["read", "bash", "grep", "find", "ls", "plan", "ask_user"];
@@ -176,7 +176,7 @@ export type PlanAbortControllers = Map<string, PendingSelect>;
  * 发挂起 select 前新建 PendingSelect 并登记。禁复用已 abort 的 controller——
  * pi 实装对已 abort 的 signal 在 createDialogPromise 首行短路立即 resolve undefined，
  * 复用会让退出后再入 plan 的 submit-review 瞬时静默取消。
- * pi 实装锚点：dist/modes/rpc/rpc-mode.js:48（0.84.4）——createDialogPromise 首行
+ * pi 实装锚点：dist/modes/rpc/rpc-mode.js createDialogPromise 首行
  * `opts?.signal?.aborted` 即 `return Promise.resolve(defaultValue)`，select 的
  * defaultValue = undefined（E10 生命周期设计依据）。
  */

package/src/tool.ts

@@ -895,8 +895,8 @@ async function executeSubmitReview(
 
     case "revise": {
       // custom message 形态注入：streaming 时显式
-      // deliverAs:'steer' 排队至下一次 LLM 调用（pi 实装锚点：dist/core/agent-session.js
-      // :859-868（0.84.4）——isStreaming 分支 steer 走 :868 _queueSteer；sendMessage 缺省
+      // deliverAs:'steer' 排队至下一次 LLM 调用（语义登记 PS-58，verifiedWith 以
+      // pi-semantics.json 为准——isStreaming 分支 steer 走 _queueSteer；sendMessage 缺省
       // deliverAs 同为 steer，显式传保持排队语义自明）；非 streaming 由 triggerTurn:true 开轮
       // 状态写走 transition()（D1 'revise' 边：reviewing → revising）且先于 steer 注入：
       // ok:false = 审批已被交错操作推进，此时注入评论并报成功会让 agent 空跑一轮——
@@ -1072,7 +1072,7 @@ async function resolveCompleteChoice(
       // 泛型组件工厂签名比 GuiContext 的宽松形状窄，整 ctx 直传类型不兼容）。
       // select 必须 .bind(ctx.ui)（对齐 ask-user / scheduler 同协议形态）：callMarkerRpc 先
       // 解构再裸调用，this 依赖 pi 实装 select 为箭头闭包——显式 bind 消除该隐式依赖
-      // （pi 实装锚点：dist/modes/rpc/rpc-mode.js:84（0.84.4）——select 为箭头函数闭包）。
+      // （pi 实装锚点：dist/modes/rpc/rpc-mode.js select 为箭头函数闭包）。
       const form = await uiFormInteract(
         { mode: ctx.mode, hasUI: ctx.hasUI, ui: { select: ctx.ui.select.bind(ctx.ui) } },
         [question],
@@ -1279,11 +1279,11 @@ export function registerPlanTool(
     name: "plan",
     label: "Plan Mode",
     // 串行声明（D-B1-4）：全部 action 就地突变共享 PlanState，声明串行消除并行交错类
-    //（A1 死锁机理的调度半边）。pi 0.84.4 声明粒度是工具级——同批任一 sequential 工具
-    // 使整批工具顺序执行。pi 实装锚点：dist/core/extensions/types.d.ts:363-370（0.84.4，
-    // executionMode 是 per-tool 声明，"sequential" = this tool must execute one at a time
-    // with other tool calls）+ @earendil-works/pi-agent-core dist/agent-loop.js:287-288
-    //（0.84.4，hasSequentialToolCall = toolCalls.some(...) 命中即整批走
+    //（A1 死锁机理的调度半边）。pi 声明粒度是工具级——同批任一 sequential 工具
+    // 使整批工具顺序执行。pi 实装锚点（1.0.0 复核）：dist/core/extensions/types.d.ts
+    // executionMode（per-tool 声明，"sequential" = this tool must execute one at a time
+    // with other tool calls）+ @earendil-works/pi-agent-core dist/agent-loop.js
+    //（hasSequentialToolCall = toolCalls.some(...) 命中即整批走
     // executeToolCallsSequential）。单行回退通道 = 移除本声明即回默认并行。
     executionMode: "sequential",
     description: