@zhushanwen/pi-permission 1.6.4 → 1.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-permission",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "description": "Pi permission extension — four permission modes (yolo/auto/approve/strict) with three-layer pipeline (AST + rules + AI classifier).",
   "type": "module",
   "main": "src/index.ts",
@@ -50,6 +50,7 @@
   "dependencies": {
     "tree-sitter-bash": "^0.25.1",
     "web-tree-sitter": "^0.26.11",
+    "@zhushanwen/extension-protocol": "0.24.0",
     "@zhushanwen/pi-ext-guards": "0.5.0",
     "@zhushanwen/pi-extension-logger": "0.6.2",
     "@zhushanwen/pi-llm-shared": "0.12.0"

package/src/__tests__/approval.test.ts

@@ -11,6 +11,9 @@ import {
 	renderApprovalView,
 	requestUserApproval,
 } from "../approval.js";
+// 对拍符号：runtime event-adapter 判定键与本扩展 title 构造引用同一常量（值锁定在
+// extension-protocol markers.test.ts），单源化后双端文案漂移在编译期即报错
+import { PERMISSION_APPROVAL_TITLE } from "@zhushanwen/extension-protocol";
 import type { ApprovalRequest } from "../pipeline.js";
 import type { ClassifierResult, ToolInvocationContext, UserDecision } from "../types.js";
 
@@ -176,7 +179,7 @@ describe("requestUserApproval: rpc 模式", () => {
 		const lines = capturedTitle.split("\n");
 		// RPC title 5→6 行：补 `  reasoning: <AI 理由>` 行（与 TUI 字段集同源，M6 漂移修复）
 		expect(lines).toHaveLength(6);
-		expect(lines[0]).toBe("[pi-permission] Approval required");
+		expect(lines[0]).toBe(PERMISSION_APPROVAL_TITLE);
 		expect(lines[1]).toBe("Tool: bash");
 		expect(lines[2]).toBe("Command: rm -rf /tmp");
 		expect(lines[3]).toBe("Reason: no allow rule");

package/src/__tests__/legacy-tool-names.test.ts

@@ -14,6 +14,9 @@
  *     注册，D3「旧名不保留别名」），不对其迁移后结论作断言；
  *  5b. 反向混合集（wildcard deny 在前、精确 allow 在后）——与分支5互为镜像，
  *     区分度弱，承重位置锚 = 精确条目仍在 wildcard 之前。
+ *  6. subagents → subagent_batch（2026-10-23 批量工具改名入表）——单目标展开：
+ *     展开正确 + 字段保留 + 幂等 + 保序位置锚 + 真实 matcher 结论等价四维度合并
+ *     锁定（单元素展开无次序承重，四维度一用例足够）。
  *
  * 匹配器行为注释：matchNonBashTool 的 tool 字段经 wildcardToRegExp 全锚定匹配
  * （精确名 = 精确匹配，'*' = 匹配全部）；pattern 对 path 匹配（path 缺省时对
@@ -34,7 +37,7 @@ function userRule(overrides: Partial<Rule> & { id: string; tool: string }): Rule
 	};
 }
 
-describe("旧工具名精确规则迁移（D3）— 表驱动六用例（五分支 + 分支5b 反向混合集）", () => {
+describe("旧工具名精确规则迁移（D3）— 表驱动七用例（六分支 + 分支5b 反向混合集）", () => {
 	it("分支1：精确旧名展开（subagent 三条 + workflow 两条，展开顺序承重，其余字段保留）", () => {
 		const rules: Rule[] = [
 			userRule({ id: "user-1", tool: "subagent", pattern: "*", action: "deny", description: "no subagent" }),
@@ -196,4 +199,36 @@ describe("旧工具名精确规则迁移（D3）— 表驱动六用例（五分
 		expect(matchNonBashTool("bash", "/x", migrated).action).toBe(matchNonBashTool("bash", "/x", mixed).action);
 		expect(matchNonBashTool("bash", "/x", mixed).action).toBe("deny");
 	});
+
+	it("分支6：subagents → subagent_batch（2026-10-23 批量工具改名入表）— 展开 + 幂等 + 保序 + matcher 结论等价", () => {
+		// 展开正确 + 字段保留：单目标展开（一条旧名规则 → 一条 subagent_batch）
+		const rules: Rule[] = [
+			userRule({ id: "user-1", tool: "subagents", pattern: "*", action: "deny", description: "no batch" }),
+			userRule({ id: "user-2", tool: "*", pattern: "*", action: "allow" }),
+		];
+		const migrated = migrateLegacyToolRules(rules);
+
+		// 保序位置锚：展开条目原位替换，wildcard 仍在后（单目标无展开次序承重）
+		expect(migrated).toHaveLength(2);
+		expect(migrated.map((r) => r.tool)).toEqual(["subagent_batch", "*"]);
+		// pattern/action/source/description 保留（只换 tool 名与 id）
+		expect(migrated[0]).toMatchObject({ pattern: "*", action: "deny", source: "user", description: "no batch" });
+		// 新 id（D3 契约②）：不克隆原 id，形态 user-N
+		expect(migrated[0]?.id).not.toBe("user-1");
+		expect(migrated[0]?.id).toMatch(/^user-\d+$/);
+		// 纯函数：原数组不改写
+		expect(rules).toHaveLength(2);
+		expect(rules[0]?.tool).toBe("subagents");
+
+		// 幂等：新名不在旧名集合，再迁移深度相等
+		expect(migrateLegacyToolRules(migrated)).toEqual(migrated);
+
+		// 真实 matcher 结论等价：场景同分支5（尾部 wildcard allow 覆盖精确 deny）——
+		// 若实装错误地把展开条目追加到数组尾部，subagent_batch deny 落到 wildcard
+		// allow 之后 → 结论翻成 deny ≠ 迁移前 allow，本断言即红灯。
+		const beforeSubagents = matchNonBashTool("subagents", "/x", rules).action;
+		const afterBatch = matchNonBashTool("subagent_batch", "/x", migrated).action;
+		expect(beforeSubagents).toBe("allow");
+		expect(afterBatch).toBe(beforeSubagents);
+	});
 });

package/src/approval.ts

@@ -22,6 +22,10 @@
 
 import { type Component, matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
 
+// 审批 select title 首行判定键单源：runtime event-adapter 按此串精确匹配落
+// permission: true 键（侧栏等待可见性），双端 import 同一符号防文案漂移静默失联。
+import { PERMISSION_APPROVAL_TITLE } from "@zhushanwen/extension-protocol";
+
 import type { ApprovalRequest } from "./pipeline.js";
 import type { ToolInvocationContext, UserDecision } from "./types.js";
 
@@ -223,7 +227,7 @@ interface ApprovalFieldSet {
 /** 构造审批卡字段集（title/tool/command/reason + 可选 AI 四元组含 reasoning）。 */
 function buildApprovalFieldSet(req: ApprovalRequest): ApprovalFieldSet {
 	return {
-		title: "[pi-permission] Approval required",
+		title: PERMISSION_APPROVAL_TITLE,
 		tool: req.toolName,
 		// 空字符串与 undefined 同义（两外壳的 Command 行都只在非空时渲染）
 		command: req.command !== undefined && req.command.length > 0 ? req.command : undefined,

package/src/rules/legacy-tool-names.ts

@@ -5,6 +5,7 @@
  * subagent_start/subagent_manage/subagent_message 与 workflow_run/workflow_control，
  * 旧名不保留别名（探针 PB-fork）。用户权限规则按工具名匹配（`Rule.tool`）并持久化
  * 落盘（config.ts saveConfig），旧名精确规则随改名失配——deny 静默退化成 ask/AI 分类。
+ * 批量工具 `subagents` → `subagent_batch` 改名（2026-10-23）同机制入表。
  *
  * 迁移语义（D3 两条契约）：
  *  ① 展开落位与保序——精确匹配旧名的用户规则**原地替换**为其新名展开（展开顺序
@@ -38,6 +39,7 @@ import { makeNextIdCounter } from "../rule-templates.js";
 const LEGACY_TOOL_NAME_EXPANSION: Readonly<Record<string, readonly string[]>> = {
 	subagent: ["subagent_start", "subagent_manage", "subagent_message"],
 	workflow: ["workflow_run", "workflow_control"],
+	subagents: ["subagent_batch"],
 };
 
 /**