@zhushanwen/pi-permission 1.3.3 → 1.3.4

package/package.json

@@ -1,11 +1,29 @@
 {
   "name": "@zhushanwen/pi-permission",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "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",
   "xyz-agent": {
-    "role": "universal"
+    "role": "universal",
+    "startupConfig": [
+      {
+        "path": "config/permission-ext-config.json",
+        "content": {
+          "mode": "yolo",
+          "enabled": true,
+          "classifier": {
+            "enabled": true,
+            "model": "auto",
+            "timeout": 90,
+            "autoApproveLowRisk": true,
+            "autoDenyHighRisk": true,
+            "thinkingLevel": "off"
+          },
+          "userRules": []
+        }
+      }
+    ]
   },
   "pi": {
     "extensions": [
@@ -32,13 +50,13 @@
   "dependencies": {
     "tree-sitter-bash": "^0.25.1",
     "web-tree-sitter": "^0.26.11",
-    "@zhushanwen/pi-extension-logger": "0.3.0",
-    "@zhushanwen/pi-llm-shared": "0.4.1"
+    "@zhushanwen/pi-extension-logger": "0.3.1",
+    "@zhushanwen/pi-llm-shared": "0.4.2"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": "^0.84.1",
-    "@earendil-works/pi-coding-agent": "^0.84.1",
-    "@earendil-works/pi-tui": "^0.84.1"
+    "@earendil-works/pi-ai": "^0.84.4",
+    "@earendil-works/pi-coding-agent": "^0.84.4",
+    "@earendil-works/pi-tui": "^0.84.4"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-ai": {
@@ -52,9 +70,9 @@
     }
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "^0.84.2",
-    "@earendil-works/pi-coding-agent": "^0.84.2",
-    "@earendil-works/pi-tui": "^0.84.2",
+    "@earendil-works/pi-ai": "^0.84.4",
+    "@earendil-works/pi-coding-agent": "^0.84.4",
+    "@earendil-works/pi-tui": "^0.84.4",
     "@vitest/coverage-v8": "^4.1.9",
     "vitest": "^4.1.8"
   },

package/src/__tests__/startup-config-declaration.test.ts

@@ -0,0 +1,34 @@
+/**
+ * startupConfig 声明守护测试：断言 package.json `xyz-agent.startupConfig` 声明的
+ * content 与代码 DEFAULT_CONFIG 常量深相等，防止两侧任一改动未同步（漂移）。
+ * 机制：runtime 启动序列统一 ensure（extension-startup-config.ts），声明即首建内容。
+ *
+ * 运行：cd extensions/universal/permission && npx vitest run src/__tests__/startup-config-declaration.test.ts
+ */
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { fileURLToPath } from "node:url";
+
+import { describe, expect, it } from "vitest";
+
+import { DEFAULT_CONFIG } from "../types.js";
+
+/** package.json `xyz-agent.startupConfig` 声明条目的最小形状（守护断言用）。 */
+interface StartupConfigEntry {
+	path: string;
+	content: unknown;
+}
+
+const pkg = JSON.parse(
+	readFileSync(join(fileURLToPath(import.meta.url), "../../../package.json"), "utf-8"),
+) as { "xyz-agent"?: { startupConfig?: StartupConfigEntry[] } };
+
+describe("startupConfig 声明守护", () => {
+	it("声明 content 与代码 DEFAULT_CONFIG 深相等", () => {
+		const entry = pkg["xyz-agent"]?.startupConfig?.find(
+			(e: StartupConfigEntry) => e.path === "config/permission-ext-config.json",
+		);
+		expect(entry).toBeDefined();
+		expect(entry?.content).toEqual(DEFAULT_CONFIG);
+	});
+});

package/src/ast/analyzer.ts

@@ -29,6 +29,9 @@ const logger = getLogger("pi-permission/ast");
 /** 超过此长度的输入直接拒（防止 wasm 解析巨型 payload DoS）。 */
 const MAX_COMMAND_LENGTH = 65536;
 
+/** 带引号 token 的最小长度（首尾引号各占 1 字符）；满足才能安全剥引号。 */
+const MIN_QUOTED_TOKEN_LENGTH = 2;
+
 /**
  * Codex ALLOWED_KINDS（11 个 named node）。
  * 遇到不在此集合的 named node 即判定为危险结构。
@@ -76,7 +79,7 @@ function parseDoubleQuotedString(node: Node): string | null {
 	}
 	const raw = node.text;
 	// 去掉首尾的 `"`（raw 形如 `"hello world"`）
-	if (raw.startsWith('"') && raw.endsWith('"') && raw.length >= 2) {
+	if (raw.startsWith('"') && raw.endsWith('"') && raw.length >= MIN_QUOTED_TOKEN_LENGTH) {
 		return raw.slice(1, -1);
 	}
 	// 异常 grammar（理论上不会到这）—— 原样返回
@@ -92,7 +95,7 @@ function parseRawString(node: Node): string | null {
 		return null;
 	}
 	const raw = node.text;
-	if (raw.startsWith("'") && raw.endsWith("'") && raw.length >= 2) {
+	if (raw.startsWith("'") && raw.endsWith("'") && raw.length >= MIN_QUOTED_TOKEN_LENGTH) {
 		return raw.slice(1, -1);
 	}
 	return raw;

package/src/commands.ts

@@ -55,6 +55,9 @@ export function handlePermissionCommand(
 
 // ──────────────────────── 消息格式化 ────────────────────────
 
+/** 模式列表 mode 列的 padEnd 宽度（最长 'approve' 7 字符 + 1 间隔，保证描述列对齐）。 */
+const MODE_COLUMN_WIDTH = 8;
+
 function formatStatusMessage(config: PermissionConfig): string {
 	const lines: string[] = [];
 	lines.push("[pi-permission] Current mode: " + modeHighlight(config.mode));
@@ -62,7 +65,7 @@ function formatStatusMessage(config: PermissionConfig): string {
 	lines.push("Available modes (by strictness, low → high):");
 	for (const mode of PERMISSION_MODES) {
 		const marker = mode === config.mode ? "►" : " ";
-		lines.push(`  ${marker} ${mode.padEnd(8)} — ${MODE_DESCRIPTIONS[mode]}`);
+		lines.push(`  ${marker} ${mode.padEnd(MODE_COLUMN_WIDTH)} — ${MODE_DESCRIPTIONS[mode]}`);
 	}
 	lines.push("");
 	lines.push("Switch with: /permission <mode>");

package/src/config.ts

@@ -116,8 +116,11 @@ function normalizeConfig(raw: unknown): PermissionConfig {
 
 // ──────────────────────── 默认配置文件创建 ────────────────────────
 
+/** 默认配置文件 JSON 序列化的缩进空格数。 */
+const CONFIG_JSON_INDENT_SPACES = 2;
+
 function createDefaultConfigContent(): string {
-	return `${JSON.stringify(DEFAULT_CONFIG, null, 2)}\n`;
+	return `${JSON.stringify(DEFAULT_CONFIG, null, CONFIG_JSON_INDENT_SPACES)}\n`;
 }
 
 function ensureConfigFile(configPath: string, onWarning?: (msg: string) => void): void {

package/src/index.ts

@@ -70,6 +70,14 @@ interface ToolCallResult {
 	reason?: string;
 }
 
+/**
+ * ctx.ui.select / ctx.ui.input 的 opts 参数索引（第 3 个参数，0-based）。
+ * 类型位置提取 opts 时用 `Parameters<typeof ...>[typeof _UI_OPTIONS_PARAM_INDEX]`
+ * （字面量索引会触发 no-magic-numbers，typeof 常量索引语义等价）。
+ * 仅类型位置使用、运行时无值引用，按项目约定加 `_` 前缀豁免 no-unused-vars。
+ */
+const _UI_OPTIONS_PARAM_INDEX = 2;
+
 // ──────────────────────── 扩展工厂 ────────────────────────
 
 /**
@@ -135,7 +143,7 @@ export default function permissionExtension(pi: ExtensionAPI): void {
 						mode: ctx.mode,
 						ui: {
 							notify: (msg: string, type?: "info" | "warning" | "error") => ctx.ui.notify(msg, type),
-							select: (title: string, options: string[], opts?: Parameters<typeof ctx.ui.select>[2]) =>
+							select: (title: string, options: string[], opts?: Parameters<typeof ctx.ui.select>[typeof _UI_OPTIONS_PARAM_INDEX]) =>
 								ctx.ui.select(title, options, opts),
 							custom: <T,>(
 								factory: (tui: unknown, theme: unknown, kb: unknown, done: (result: T) => void) => unknown,
@@ -145,7 +153,7 @@ export default function permissionExtension(pi: ExtensionAPI): void {
 							// 连接 ctx.ui.input（rule-editor custom 模板文本输入用）。
 							// approval.ts 已声明可选 input（SDK 提供，mock 可能缺失）。
 							...(typeof ctx.ui.input === "function"
-								? { input: (title: string, placeholder?: string, opts?: Parameters<typeof ctx.ui.input>[2]) => ctx.ui.input(title, placeholder, opts) }
+								? { input: (title: string, placeholder?: string, opts?: Parameters<typeof ctx.ui.input>[typeof _UI_OPTIONS_PARAM_INDEX]) => ctx.ui.input(title, placeholder, opts) }
 								: {}),
 						},
 					},
@@ -172,7 +180,7 @@ export default function permissionExtension(pi: ExtensionAPI): void {
 						modelRegistry: ctx.modelRegistry,
 						ui: {
 							notify: (msg: string, type?: "info" | "warning" | "error") => ctx.ui.notify(msg, type),
-							select: (title: string, options: string[], opts?: Parameters<typeof ctx.ui.select>[2]) =>
+							select: (title: string, options: string[], opts?: Parameters<typeof ctx.ui.select>[typeof _UI_OPTIONS_PARAM_INDEX]) =>
 								ctx.ui.select(title, options, opts),
 							custom: <T,>(
 								factory: (tui: unknown, theme: unknown, kb: unknown, done: (result: T) => void) => unknown,
@@ -181,7 +189,7 @@ export default function permissionExtension(pi: ExtensionAPI): void {
 								ctx.ui.custom<T>(factory as Parameters<typeof ctx.ui.custom<T>>[0], options),
 							// 连接 ctx.ui.input（与 rule handler 一致；model picker 当前不用，但保持 ctx 对称）。
 							...(typeof ctx.ui.input === "function"
-								? { input: (title: string, placeholder?: string, opts?: Parameters<typeof ctx.ui.input>[2]) => ctx.ui.input(title, placeholder, opts) }
+								? { input: (title: string, placeholder?: string, opts?: Parameters<typeof ctx.ui.input>[typeof _UI_OPTIONS_PARAM_INDEX]) => ctx.ui.input(title, placeholder, opts) }
 								: {}),
 						},
 					},
@@ -315,7 +323,7 @@ async function processToolCall(
 		mode: ctx.mode,
 		ui: {
 			notify: (msg: string, type?: "info" | "warning" | "error") => ctx.ui.notify(msg, type),
-			select: (title: string, options: string[], opts?: Parameters<typeof ctx.ui.select>[2]) => ctx.ui.select(title, options, opts),
+			select: (title: string, options: string[], opts?: Parameters<typeof ctx.ui.select>[typeof _UI_OPTIONS_PARAM_INDEX]) => ctx.ui.select(title, options, opts),
 			custom: <T,>(
 				factory: (tui: unknown, theme: unknown, kb: unknown, done: (result: T) => void) => unknown,
 				options?: { overlay?: boolean },
@@ -324,7 +332,7 @@ async function processToolCall(
 			// W6 T9 G3：Reject-with-Reason。ctx.ui.input 存在则透传（采集真实拒绝理由）。
 			// approval.ts 的 collectRejectReason 会用 typeof 判断是否可用，不可用则 fallback。
 			...(typeof ctx.ui.input === "function"
-				? { input: (title: string, placeholder?: string, opts?: Parameters<typeof ctx.ui.input>[2]) => ctx.ui.input(title, placeholder, opts) }
+				? { input: (title: string, placeholder?: string, opts?: Parameters<typeof ctx.ui.input>[typeof _UI_OPTIONS_PARAM_INDEX]) => ctx.ui.input(title, placeholder, opts) }
 				: {}),
 		},
 	};

package/src/model-picker.ts

@@ -53,6 +53,9 @@ const AUTO_VALUE = "__auto__";
 /** SelectList 最大可见行数（picker overlay 不超过终端高度）。 */
 const MAX_VISIBLE_ITEMS = 10;
 
+/** box 边框左右各占用 1 列（│ × 2）。 */
+const BORDER_OVERHEAD = 2;
+
 // ──────────────────────── 辅助组件（inline Component stub，避免依赖 Box 的 padding/bg） ────────────────────────
 
 /**
@@ -127,14 +130,11 @@ export class ProviderModelSelectorComponent extends Container {
 		this.currentList?.handleInput(data);
 	}
 
-	/** box 边框左右各占用 1 列（│ × 2） */
-	private static readonly BORDER_OVERHEAD = 2;
-
 	/**
 	 * 重写 render：用 box 边框包裹 Container 子组件的输出。
 	 */
 	override render(width: number): string[] {
-		const innerWidth = Math.max(0, width - ProviderModelSelectorComponent.BORDER_OVERHEAD);
+		const innerWidth = Math.max(0, width - BORDER_OVERHEAD);
 		const inner = super.render(innerWidth);
 		const lines: string[] = [];
 		lines.push(`\u250C${"\u2500".repeat(innerWidth)}\u2510`);

package/src/rule-editor-component.ts

@@ -11,7 +11,7 @@
  * WR8：focusIndex 模 5（Custom form 5 项 Tab 循环）。
  */
 
-import { type Component, Container, Input, type SelectItem, SelectList, type SelectListTheme, truncateToWidth } from "@earendil-works/pi-tui";
+import { type Component, Container, Input, isFocusable, type SelectItem, SelectList, type SelectListTheme, truncateToWidth } from "@earendil-works/pi-tui";
 import { matchesKey } from "@earendil-works/pi-tui";
 
 import {
@@ -36,6 +36,19 @@ const THEME: SelectListTheme = {
 
 const MAX_VISIBLE = 12;
 
+/** box 边框左右各占用 1 列（│ × 2）。 */
+const BORDER_OVERHEAD = 2;
+
+/** custom form 焦点指示前缀（▶ + 空格，1 显示列 + 1 空格）。 */
+const FOCUS_INDICATOR_PREFIX = "\u25B6 ";
+
+/** scope 选择：all/subcmd 二选一全可见。 */
+const SCOPE_LIST_MAX_VISIBLE = 2;
+/** action 选择：allow/deny/ask 三选一全可见。 */
+const ACTION_LIST_MAX_VISIBLE = 3;
+/** submit 选择：Submit/Cancel 二选一全可见。 */
+const SUBMIT_LIST_MAX_VISIBLE = 2;
+
 // ──────────────────────── TextLines component ────────────────────────
 
 class TextLines implements Component {
@@ -123,11 +136,8 @@ export class RuleEditorComponent extends Container {
 
 	// ──────────────────────── 边框渲染 ────────────────────────
 
-	/** box 边框左右各占用 1 列（│ × 2） */
-	private static readonly BORDER_OVERHEAD = 2;
-
 	override render(width: number): string[] {
-		const innerWidth = Math.max(0, width - RuleEditorComponent.BORDER_OVERHEAD);
+		const innerWidth = Math.max(0, width - BORDER_OVERHEAD);
 		let inner = super.render(innerWidth);
 
 		// custom form 焦点指示（M4）：当前焦点字段的标签加 ▶ 前缀
@@ -169,11 +179,11 @@ export class RuleEditorComponent extends Container {
 		return lines.map((line) => {
 			// 精确匹配当前焦点标签 → 加 ▶ 前缀
 			if (line === focusedLabel) {
-				return `\u25B6 ${line}`;
+				return FOCUS_INDICATOR_PREFIX + line;
 			}
 			// 焦点已转移：去掉其他标签行残留的 ▶ 前缀（避免重复渲染累积）
-			if (line.startsWith("\u25B6 ") && fieldLabels.includes(line.slice(2))) {
-				return line.slice(2);
+			if (line.startsWith(FOCUS_INDICATOR_PREFIX) && fieldLabels.includes(line.slice(FOCUS_INDICATOR_PREFIX.length))) {
+				return line.slice(FOCUS_INDICATOR_PREFIX.length);
 			}
 			return line;
 		});
@@ -468,7 +478,7 @@ export class RuleEditorComponent extends Container {
 			{ value: "__all__", label: `${cmd} * (all subcommands)`, description: `Allow/deny all invocations of ${cmd}` },
 			{ value: "__subcmd__", label: `${cmd} <subcommand> *`, description: `Allow/deny a specific subcommand` },
 		];
-		const list = new SelectList(scopeItems, 2, this.theme);
+		const list = new SelectList(scopeItems, SCOPE_LIST_MAX_VISIBLE, this.theme);
 		list.onSelect = (item: SelectItem): void => {
 			if (item.value === "__all__") {
 				this.fillSelections.cmd = cmd;
@@ -674,7 +684,7 @@ export class RuleEditorComponent extends Container {
 			{ value: "deny", label: "deny" },
 			{ value: "ask", label: "ask" },
 		];
-		const actionList = new SelectList(actionItems, 3, this.theme);
+		const actionList = new SelectList(actionItems, ACTION_LIST_MAX_VISIBLE, this.theme);
 		actionList.onSelect = (item: SelectItem): void => {
 			this.fillSelections.action = item.value as PermissionAction;
 		};
@@ -709,7 +719,7 @@ export class RuleEditorComponent extends Container {
 			{ value: "__submit__", label: "[Submit]" },
 			{ value: "__cancel__", label: "[Cancel]" },
 		];
-		const submitList = new SelectList(submitItems, 2, this.theme);
+		const submitList = new SelectList(submitItems, SUBMIT_LIST_MAX_VISIBLE, this.theme);
 		submitList.onSelect = (item: SelectItem): void => {
 			if (item.value === "__submit__") {
 				this.commitFill();
@@ -875,8 +885,8 @@ export class RuleEditorComponent extends Container {
 	private syncCustomFocus(): void {
 		for (let i = 0; i < this.customChildren.length; i++) {
 			const child = this.customChildren[i];
-			if (child !== undefined && "focused" in child) {
-				(child as unknown as { focused: boolean }).focused = i === this.customFocusIndex;
+			if (child !== undefined && isFocusable(child)) {
+				child.focused = i === this.customFocusIndex;
 			}
 		}
 	}

package/src/rules/builtins.ts

@@ -117,6 +117,9 @@ function executableNameLookupKey(raw: string): string | undefined {
 
 // ── 合并短 flag 检查工具（G4: 合并 flag 如 -fo 需检测任意位置的 -o）──
 
+/** 短 flag 簇（`-x`）的最小长度：`-` + 至少 1 个 flag 字符。 */
+const MIN_SHORT_FLAG_CLUSTER_LENGTH = 2;
+
 /**
  * 检查短 flag 簇中是否含某个字符（如 `-fo` 含 `o`）。
  *
@@ -129,7 +132,7 @@ function executableNameLookupKey(raw: string): string | undefined {
  */
 function shortFlagClusterHasChar(arg: string, flagChar: string): boolean {
 	// 只处理短 flag 簇：单个 - 开头，非 --，长度 ≥ 2
-	if (!arg.startsWith("-") || arg.startsWith("--") || arg.length < 2) return false;
+	if (!arg.startsWith("-") || arg.startsWith("--") || arg.length < MIN_SHORT_FLAG_CLUSTER_LENGTH) return false;
 	// arg 去掉开头的 -，检查剩余字符
 	return arg.slice(1).includes(flagChar);
 }