@zhushanwen/pi-permission 1.4.9 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-permission",
-  "version": "1.4.9",
+  "version": "1.6.0",
   "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",
@@ -15,7 +15,7 @@
           "classifier": {
             "enabled": true,
             "model": "auto",
-            "timeout": 90,
+            "timeout": 0,
             "autoApproveLowRisk": true,
             "autoDenyHighRisk": true,
             "thinkingLevel": "off"
@@ -50,14 +50,14 @@
   "dependencies": {
     "tree-sitter-bash": "^0.25.1",
     "web-tree-sitter": "^0.26.11",
-    "@zhushanwen/pi-ext-guards": "0.4.2",
-    "@zhushanwen/pi-extension-logger": "0.6.1",
-    "@zhushanwen/pi-llm-shared": "0.10.1"
+    "@zhushanwen/pi-ext-guards": "0.4.3",
+    "@zhushanwen/pi-extension-logger": "0.6.2",
+    "@zhushanwen/pi-llm-shared": "0.11.1"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": "^0.84.4",
-    "@earendil-works/pi-coding-agent": "^0.84.4",
-    "@earendil-works/pi-tui": "^0.84.4"
+    "@earendil-works/pi-ai": "^1.0.0",
+    "@earendil-works/pi-coding-agent": "^1.0.0",
+    "@earendil-works/pi-tui": "^1.0.0"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-ai": {
@@ -71,9 +71,9 @@
     }
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "^0.84.4",
-    "@earendil-works/pi-coding-agent": "^0.84.4",
-    "@earendil-works/pi-tui": "^0.84.4",
+    "@earendil-works/pi-ai": "^1.0.0",
+    "@earendil-works/pi-coding-agent": "^1.0.0",
+    "@earendil-works/pi-tui": "^1.0.0",
     "@vitest/coverage-v8": "^4.1.9",
     "vitest": "^4.1.8"
   },

package/src/__tests__/config.test.ts

@@ -54,7 +54,7 @@ describe("WT1: 默认配置生成（首次无配置文件）", () => {
 		expect(config.enabled).toBe(true);
 		expect(config.classifier.enabled).toBe(true);
 		expect(config.classifier.model).toBe("auto");
-		expect(config.classifier.timeout).toBe(90);
+		expect(config.classifier.timeout).toBe(0);
 		expect(config.classifier.autoApproveLowRisk).toBe(true);
 		expect(config.classifier.autoDenyHighRisk).toBe(true);
 		expect(config.userRules).toEqual([]);
@@ -130,7 +130,7 @@ describe("WT3: 配置解析容错（malformed JSON）", () => {
 		const config = loadAndWatchConfig();
 		expect(config.mode).toBe("strict");
 		expect(config.classifier.model).toBe("auto"); // 默认
-		expect(config.classifier.timeout).toBe(90); // 默认
+		expect(config.classifier.timeout).toBe(0); // 默认
 	});
 
 	it("TC6 (C3b): classifier.model 传对象形式 → console.warn + 回落默认 auto", () => {

package/src/__tests__/pipeline.test.ts

@@ -844,16 +844,19 @@ describe("m3: bash 工具收到非字符串 command 时 logger.warn（不静默
 	});
 });
 
-// ──────────────────────── M3: realUserPromise 超时兜底 ────────────────────────
+// ──────────────────────── M3: AI-ask 分支等待用户决策（无包内超时） ────────────────────────
 
-describe("M3: runLayer3WithRacing AI-ask 分支超时兜底（防永久挂起）", () => {
-	it("AI ask + requestUserApproval 永挂 → 5 分钟超时 fail-closed deny（不永久阻塞）", async () => {
-		// 用 fake timer 模拟 5 分钟流逝，避免真实等待
+describe("M3: runLayer3WithRacing AI-ask 分支（ADR-0122：无包内超时兜底）", () => {
+	it("AI ask → 无超时兜底等待；远超原 5min 后用户决策照常生效", async () => {
 		vi.useFakeTimers();
 		try {
+			let resolveApproval: (d: UserDecision) => void = () => {};
 			const deps = makeDeps({
 				classify: () => Promise.resolve(fallbackClassifier()), // outcome=ask
-				approve: () => new Promise<UserDecision>(() => undefined), // 永不 resolve（模拟挂起）
+				approve: () =>
+					new Promise<UserDecision>((resolve) => {
+						resolveApproval = resolve;
+					}),
 			});
 			const { runLayer3WithRacing } = await import("../pipeline.js");
 			const decisionPromise = runLayer3WithRacing(
@@ -862,11 +865,19 @@ describe("M3: runLayer3WithRacing AI-ask 分支超时兜底（防永久挂起）
 				DEFAULT_CFG,
 				undefined,
 			);
-			// 推进 5 分钟（超过 APPROVAL_TIMEOUT_MS=300_000）
-			await vi.advanceTimersByTimeAsync(300_001);
+			// 推进 10 分钟（远超原 APPROVAL_TIMEOUT_MS=300_000）：决策未出（无超时兜底，等待用户是交互语义）
+			await vi.advanceTimersByTimeAsync(600_000);
+			let settled = false;
+			void decisionPromise.then(() => {
+				settled = true;
+			});
+			await Promise.resolve();
+			expect(settled).toBe(false);
+			// 用户最终决策 → 按决策返回（用户晚到不被超时截杀）
+			resolveApproval({ approved: true, reason: "late approval" });
 			const decision = await decisionPromise;
-			expect(decision.action).toBe("deny"); // fail-closed
-			expect(decision.reason).toContain("timeout");
+			expect(decision.action).toBe("allow");
+			expect(decision.source).toBe("user");
 		} finally {
 			vi.useRealTimers();
 		}

package/src/__tests__/types.test.ts

@@ -51,7 +51,7 @@ describe("WT6: PermissionMode 枚举完整性", () => {
 		expect(DEFAULT_CONFIG.enabled).toBe(true);
 		expect(DEFAULT_CONFIG.classifier.enabled).toBe(true);
 		expect(DEFAULT_CONFIG.classifier.model).toBe("auto");
-		expect(DEFAULT_CONFIG.classifier.timeout).toBe(90);
+		expect(DEFAULT_CONFIG.classifier.timeout).toBe(0);
 		expect(DEFAULT_CONFIG.classifier.autoApproveLowRisk).toBe(true);
 		expect(DEFAULT_CONFIG.classifier.autoDenyHighRisk).toBe(true);
 		expect(DEFAULT_CONFIG.userRules).toEqual([]);

package/src/classifier/__tests__/classifier.test.ts

@@ -282,4 +282,27 @@ describe("CT5: callLLM opts 构造（model/messages/timeoutMs/signal）", () =>
 		const opts = getLastOpts();
 		expect(opts?.signal).toBe(ac.signal);
 	});
+
+	it("配置 thinkingLevel 不被模型支持 → warn 留痕 + reasoning 不传（不静默降级）", async () => {
+		// FIXED_MODEL_OBJ reasoning:false → supportedLevels = ["off"]，配置 "high" 判定落空；
+		// changeset pi-permission-thinking-level-datadriven 承诺 warn 留痕（同族 rename-session 对齐）
+		const onLog = vi.fn();
+		const { spy, getLastOpts } = capturingCallLLM(okResult('{"outcome":"allow","risk_level":"low","reasoning":"x","confidence":0.9}'));
+		const classifier = createClassifier(makeDeps({ callLLM: spy, onLog }));
+		const r = await classifier.classifyRisk(CTX, { ...CONFIG, thinkingLevel: "high" });
+		expect(r.outcome).toBe("allow");
+		expect(onLog).toHaveBeenCalledWith(
+			expect.stringContaining('configured thinkingLevel "high" is not supported by test-co/test-model; calling without a thinking level'),
+		);
+		expect(getLastOpts()?.reasoning).toBeUndefined();
+	});
+
+	it("配置 thinkingLevel 被模型支持 → 命中透传，无 warn", async () => {
+		const onLog = vi.fn();
+		const { spy, getLastOpts } = capturingCallLLM(okResult('{"outcome":"allow","risk_level":"low","reasoning":"x","confidence":0.9}'));
+		const classifier = createClassifier(makeDeps({ callLLM: spy, onLog }));
+		await classifier.classifyRisk(CTX, { ...CONFIG, thinkingLevel: "off" });
+		expect(onLog).not.toHaveBeenCalledWith(expect.stringContaining("not supported"));
+		expect(getLastOpts()?.reasoning).toBe("off");
+	});
 });

package/src/classifier/classifier.ts

@@ -13,10 +13,13 @@
  *   - G3 修正（由 callLLM 承接）：completeSimple 的 EventStream.result() 只 resolve 不 reject，
  *     error/aborted 也 resolve（带 stopReason）。callLLM 已把 error/aborted 归一为 ok:false +
  *     stopReason 独立透传；classifier 消费透传字段保留日志区分（abort 与 error 分开记）
- *   - 外层超时/中止兜底保留：防御 provider 不支持 timeoutMs 时 result() 永挂
+ *   - 外层超时/中止兜底：仅在用户显式配置 timeout > 0 时武装（默认 0 = 不限时，ADR-0122：
+ *     无包内挂死兜底）；abort 竞速为事件驱动恒在。武装时防御 provider 不支持 timeoutMs
+ *     时 result() 永挂
  *   - fail-closed：timeout / 抛错 / 解析失败 / 无可用模型 → 一律 ask
  */
 
+import { getSupportedThinkingLevels } from "@earendil-works/pi-ai";
 import type { Api, Message, Model } from "@earendil-works/pi-ai";
 import { toErrorMessage } from "@zhushanwen/pi-ext-guards";
 import type { CallLLMOptions, CallLLMResult } from "@zhushanwen/pi-llm-shared";
@@ -133,15 +136,25 @@ function buildCallOptions(
 	config: ClassifierConfig,
 	timeoutMs: number | undefined,
 	signal: AbortSignal | undefined,
+	onLog?: (msg: string) => void,
 ): CallLLMOptions {
+	// 档位按「该模型自己的 supportedLevels」判定（pi-ai 数据驱动，本层不自持词表）；
+	// 不支持则按「不传档位」处理，不静默换成别的档（clamp），并 warn 留痕
+	// （changeset pi-permission-thinking-level-datadriven 的承诺，与 rename-session 同族对齐）。
+	// llm-shared 会把 "off" 映射为不传。
+	const reasoning = getSupportedThinkingLevels(model).find((l) => l === config.thinkingLevel);
+	if (config.thinkingLevel !== undefined && config.thinkingLevel !== "" && reasoning === undefined) {
+		onLog?.(
+			`[pi-permission] classifier: configured thinkingLevel "${config.thinkingLevel}" is not supported by ${model.provider}/${model.id}; calling without a thinking level`,
+		);
+	}
 	return {
 		model,
 		systemPrompt: CLASSIFIER_SYSTEM_PROMPT,
 		messages: buildMessages(ctx),
 		...(timeoutMs !== undefined ? { timeoutMs } : {}),
 		...(signal !== undefined ? { signal } : {}),
-		// thinkingLevel 直接透传（含 "off"）；llm-shared 内部会把 "off" 映射为不传 reasoning（provider 默认）
-		reasoning: config.thinkingLevel,
+		reasoning,
 	};
 }
 
@@ -223,7 +236,7 @@ export function createClassifier(deps: ClassifierDeps): {
 
 		// 2. 构造 CallLLMOptions
 		const timeoutMs = config.timeout > 0 ? config.timeout * MILLIS_PER_SECOND : undefined;
-		const callPromise = callLLM(buildCallOptions(model, ctx, config, timeoutMs, signal));
+		const callPromise = callLLM(buildCallOptions(model, ctx, config, timeoutMs, signal, onLog));
 
 		// 3. 等待 callLLM + 外层超时/中止兜底（provider 不支持 timeoutMs/signal 时防永挂）
 		let settled: SettledRace;

package/src/config.ts

@@ -22,7 +22,7 @@ import { isRecord, toErrorMessage } from "@zhushanwen/pi-ext-guards";
 import {
 	clearConfigCache,
 	getConfigPath as getLlmConfigPath,
-	isThinkingLevel,
+	normalizeThinkingLevel,
 	loadConfig,
 	saveConfig as saveLlmConfig,
 } from "@zhushanwen/pi-llm-shared";
@@ -59,10 +59,8 @@ function normalizeClassifierConfig(raw: unknown): ClassifierConfig {
 	if (record.model !== undefined && !(typeof record.model === "string" && record.model.length > 0)) {
 		logger.warn("Ignoring invalid classifier.model (expected string 'auto' or 'provider/model-id'), using default auto");
 	}
-	// thinkingLevel 校验：合法值为 'off'|'minimal'|'low'|'medium'|'high'|'xhigh'|'max'
-	const thinkingLevel = isThinkingLevel(record.thinkingLevel)
-		? record.thinkingLevel
-		: DEFAULT_CLASSIFIER_CONFIG.thinkingLevel;
+	// thinkingLevel：非空字符串即采信（合法档位由写入侧 UI 与 pi 判定；本层不再自持词表）
+	const thinkingLevel = normalizeThinkingLevel(record.thinkingLevel) ?? DEFAULT_CLASSIFIER_CONFIG.thinkingLevel;
 	return {
 		enabled: record.enabled !== false,
 		model: typeof record.model === "string" && record.model.length > 0 ? record.model : DEFAULT_CLASSIFIER_CONFIG.model,

package/src/pipeline.ts

@@ -301,24 +301,19 @@ function settleAiWin(
 
 /**
  * AI ask → 转 human（等用户最终决策，不关闭对话框）。
- * M3：超时兜底防止永久挂起。若 AI 返回 ask 后用户恰好与 AI 在同一 tick 操作，
- * comp.cancel() 因 _resolved 守卫不调 done → requestUserApproval promise 永不
- * resolve → realUserPromise pending → 永久挂起（G5 串行化放大为全链卡死）。
- * 5 分钟超时后 fail-closed 拒绝（不静默放行）。
+ *
+ * 无超时（ADR-0122）：等待用户审批是交互语义（审批对话框无上界等待 = 权限系统
+ * fail-closed 本职：用户不动 = 不放行也不拒绝），非挂死保护。promise 落定由结构
+ * 保证——pi 实装 showExtensionCustom（1.0.0 dist/modes/interactive/interactive-mode.js）
+ * 中 close 即 resolve 函数、调用必 resolve；abort 路径经 comp.cancel→done / rpc select signal 短路。
+ * 原 M3 的 5min APPROVAL_TIMEOUT_MS 兜底已删：其登记的根因（同 tick 操作致
+ * _resolved 置位但 done 未调 → promise 永不 resolve）经现行代码 + pi 实装核实
+ * 不存在——ApprovalComponent 的 approve/deny/cancel 三个 settle 点均同步紧跟 done。
  */
 async function awaitUserAfterAiAsk(
 	realUserPromise: Promise<UserDecision>,
 ): Promise<PermissionDecision> {
-	const APPROVAL_TIMEOUT_MS = 300_000;
-	const userFinal = await Promise.race<UserDecision>([
-		realUserPromise,
-		new Promise<UserDecision>((resolve) =>
-			setTimeout(
-				() => resolve({ approved: false, reason: "approval dialog timeout (fail-closed)" }),
-				APPROVAL_TIMEOUT_MS,
-			),
-		),
-	]);
+	const userFinal = await realUserPromise;
 	const action: PermissionAction = userFinal.approved ? "allow" : "deny";
 	return {
 		action,

package/src/types.ts

@@ -5,7 +5,6 @@
  * 对应 slice plan 的 DM1-DM5 数据模型。
  */
 
-import type { ModelThinkingLevel } from "@earendil-works/pi-ai";
 
 // ──────────────────────── DM1: PermissionMode ────────────────────────
 
@@ -101,18 +100,21 @@ export interface ClassifierConfig {
 	enabled: boolean;
 	/** 模型：'auto'（取 modelRegistry.getAvailable() 首个可用）或精确 'provider/model-id'（如 'zhipu/glm-4-flash'） */
 	model: string;
-	/** 超时秒数 */
+	/**
+	 * 超时秒数（仅用户显式配置时生效的 C2 业务超时；0 = 不限时）。
+	 * 包内默认 0（ADR-0122：无包内挂死兜底，LLM 挂死由上层失败直报，不设时间窗猜测）。
+	 */
 	timeout: number;
 	/** 低风险是否自动放行 */
 	autoApproveLowRisk: boolean;
 	/** 高风险是否强制 deny（不问人：high+allow 时直接拒绝） */
 	autoDenyHighRisk: boolean;
 	/**
-	 * 标题生成 LLM 的 thinking 级别（pi 的 ModelThinkingLevel，THINKING_ORDER SSOT）。
+	 * 标题生成 LLM 的 thinking 级别（字符串透传；合法档位按模型 supportedLevels 在调用点判定）。
 	 * 默认 "off"：不传 pi-ai reasoning（provider 默认行为）；
 	 * "minimal"~"max" 透传给 SimpleStreamOptions.reasoning（provider 不支持时静默忽略）。
 	 */
-	thinkingLevel: ModelThinkingLevel;
+	thinkingLevel: string;
 }
 
 // ──────────────────────── DM5: PermissionConfig ────────────────────────
@@ -134,7 +136,7 @@ export interface PermissionConfig {
 export const DEFAULT_CLASSIFIER_CONFIG: ClassifierConfig = {
 	enabled: true,
 	model: "auto",
-	timeout: 90,
+	timeout: 0,
 	autoApproveLowRisk: true,
 	autoDenyHighRisk: true,
 	thinkingLevel: "off",