@zhushanwen/pi-permission 1.4.9 → 1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-permission",
-  "version": "1.4.9",
+  "version": "1.5.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",
@@ -52,7 +52,7 @@
     "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-llm-shared": "0.11.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "^0.84.4",

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

@@ -17,6 +17,7 @@
  *   - 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 +134,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 +234,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/types.ts

@@ -5,7 +5,6 @@
  * 对应 slice plan 的 DM1-DM5 数据模型。
  */
 
-import type { ModelThinkingLevel } from "@earendil-works/pi-ai";
 
 // ──────────────────────── DM1: PermissionMode ────────────────────────
 
@@ -108,11 +107,11 @@ export interface ClassifierConfig {
 	/** 高风险是否强制 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 ────────────────────────