@zhushanwen/pi-permission 1.4.2 → 1.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-permission",
-  "version": "1.4.2",
+  "version": "1.4.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",
@@ -50,9 +50,9 @@
   "dependencies": {
     "tree-sitter-bash": "^0.25.1",
     "web-tree-sitter": "^0.26.11",
-    "@zhushanwen/pi-ext-guards": "0.2.1",
-    "@zhushanwen/pi-extension-logger": "0.4.1",
-    "@zhushanwen/pi-llm-shared": "0.6.0"
+    "@zhushanwen/pi-ext-guards": "0.4.0",
+    "@zhushanwen/pi-llm-shared": "0.8.0",
+    "@zhushanwen/pi-extension-logger": "0.6.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-ai": "^0.84.4",

package/src/__tests__/approval.test.ts

@@ -154,6 +154,53 @@ describe("requestUserApproval: rpc 模式", () => {
 		expect(decision.approved).toBe(true);
 		expect(selectMock).toHaveBeenCalledOnce();
 	});
+
+	it("E6/M6：有 preClassification → title 6 行，含 AI 摘要行 + reasoning 行（漂移修复）", async () => {
+		const pc: ClassifierResult = {
+			risk_level: "high",
+			outcome: "deny",
+			reasoning: "dangerous pipe to shell",
+			confidence: 0.95,
+		};
+		const reqWithPc: ApprovalRequest = { ...req, preClassification: pc };
+		let capturedTitle = "";
+		const selectMock = vi.fn((title: string) => {
+			capturedTitle = title;
+			return Promise.resolve("Deny");
+		});
+		const approvalCtx = makeApprovalCtx({
+			mode: "rpc",
+			ui: { notify: vi.fn(), select: selectMock, custom: vi.fn() },
+		});
+		await requestUserApproval(reqWithPc, ctx, undefined, approvalCtx);
+		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[1]).toBe("Tool: bash");
+		expect(lines[2]).toBe("Command: rm -rf /tmp");
+		expect(lines[3]).toBe("Reason: no allow rule");
+		expect(lines[4]).toBe("AI: risk=high outcome=deny (conf=0.95)");
+		expect(lines[5]).toBe("  reasoning: dangerous pipe to shell");
+	});
+
+	it("E6/M6：无 preClassification → title 仍 4 行（无 AI 摘要/reasoning 行）", async () => {
+		let capturedTitle = "";
+		const selectMock = vi.fn((title: string) => {
+			capturedTitle = title;
+			return Promise.resolve("Approve (once)");
+		});
+		const approvalCtx = makeApprovalCtx({
+			mode: "rpc",
+			ui: { notify: vi.fn(), select: selectMock, custom: vi.fn() },
+		});
+		await requestUserApproval(req, ctx, undefined, approvalCtx);
+		const lines = capturedTitle.split("\n");
+		// 无 AI 预分类：title/Tool/Command/Reason 共 4 行（设计「5→6」指有 preClassification 时）
+		expect(lines).toHaveLength(4);
+		expect(lines.join("\n")).not.toContain("reasoning");
+		expect(lines.join("\n")).not.toContain("AI:");
+	});
 });
 
 // ──────────────────────── tui 分支 + G3 ────────────────────────
@@ -200,7 +247,7 @@ describe("ApprovalComponent（G4 invalidate）", () => {
 		const first = comp.render(80);
 		expect(first.length).toBeGreaterThan(0);
 
-		// invalidate 清缓存（不直接 requestRender；rerender 才 requestRender）
+		// invalidate 清缓存（不直接 requestRender）
 		requestRender.mockClear();
 		comp.invalidate();
 		// 再次 render → 重新计算（非缓存）

package/src/__tests__/commands.test.ts

@@ -7,19 +7,37 @@
  *  - invalid mode → 错误提示
  *  - status → 详细配置
  *  - 当前状态（已是目标模式）→ "Already in X mode"
+ *  - model/rule 异步 handler（D4 后直调模块函数，测试在模块边界 vi.mock 控制）
  *
  * handlePermissionCommand 是纯函数（输入 args + config + onSave，输出 string），
  * 不依赖 Pi 运行时，便于单测。
  */
-import { describe, expect, it, vi } from "vitest";
-
-import type { ResolvedModelEntry } from "../classifier/model-resolver.js";
-import { handlePermissionCommand, handlePermissionModelCommand, handlePermissionRuleCommand, type PermissionModelCommandDeps, type PermissionRuleCommandDeps } from "../commands.js";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+// D4：model/rule handler 直调模块函数，测试边界移到模块真实依赖位置
+// （model-resolver / rule-editor）。vi.mock factory 被提升到文件顶部，不能引用
+// 外部变量，因此默认返回值统一在 beforeEach 设置（每用例可覆盖）。
+vi.mock("../classifier/model-resolver.js", () => ({
+	listAvailableModels: vi.fn(),
+}));
+vi.mock("../rule-editor.js", () => ({
+	editRulesViaOverlay: vi.fn(),
+}));
+
+import { listAvailableModels } from "../classifier/model-resolver.js";
+import { handlePermissionCommand, handlePermissionModelCommand, handlePermissionRuleCommand } from "../commands.js";
 import type { ModelPickerContext } from "../model-picker.js";
-import type { RuleEditorContext } from "../rule-editor.js";
+import { editRulesViaOverlay, type RuleEditorContext } from "../rule-editor.js";
 import type { RuleOp } from "../rule-templates.js";
 import { DEFAULT_CONFIG, type PermissionConfig, type Rule } from "../types.js";
 
+beforeEach(() => {
+	vi.mocked(listAvailableModels).mockReset();
+	vi.mocked(listAvailableModels).mockReturnValue(new Map());
+	vi.mocked(editRulesViaOverlay).mockReset();
+	vi.mocked(editRulesViaOverlay).mockResolvedValue(undefined);
+});
+
 // ──────────────────────── mock helpers ────────────────────────
 
 /** 构造一个可变 config 副本（默认 yolo）。 */
@@ -210,16 +228,19 @@ describe("/permission 边界", () => {
 // ──────────────────────── /permission model（W7 T6） ────────────────────────
 
 /** 构造一条 ResolvedModelEntry（测试 helper）。 */
-function makeModelEntry(provider: string, id: string, inputCost: number): ResolvedModelEntry {
+function makeModelEntry(provider: string, id: string): ResolvedModelEntry {
 	return {
 		provider,
 		id,
-		name: id,
 		api: "openai-completions",
-		cost: { input: inputCost, output: 0, cacheRead: 0, cacheWrite: 0 },
 	};
 }
 
+/** 默认可用模型：co → [m1]（非空，供正常选择流程用例）。 */
+function defaultModels(): Map<string, ResolvedModelEntry[]> {
+	return new Map([["co", [makeModelEntry("co", "m1")]]]);
+}
+
 /** 构造 mock ctx（mode + modelRegistry + ui.notify/custom/select）。 */
 function makeModelPickerCtx(overrides: Partial<ModelPickerContext> = {}): ModelPickerContext {
 	const base: ModelPickerContext = {
@@ -241,20 +262,12 @@ function makeModelPickerCtx(overrides: Partial<ModelPickerContext> = {}): ModelP
 	};
 }
 
-/** 构造 mock deps（listModels + save）。 */
-function makeModelDeps(overrides: Partial<PermissionModelCommandDeps> = {}): PermissionModelCommandDeps {
-	return {
-		listModels: overrides.listModels ?? (() => new Map([["co", [makeModelEntry("co", "m1", 0.1)]]])),
-		save: overrides.save ?? vi.fn(() => ({ success: true })),
-	};
-}
-
 describe("/permission model（W7）", () => {
 	it("无可用 model（空 Map）→ notify 降级提示，不调 save", async () => {
 		const ctx = makeModelPickerCtx();
 		const save = vi.fn(() => ({ success: true }));
-		const deps = makeModelDeps({ listModels: () => new Map(), save });
-		await handlePermissionModelCommand(ctx, makeConfig(), deps);
+		vi.mocked(listAvailableModels).mockReturnValue(new Map());
+		await handlePermissionModelCommand(ctx, makeConfig(), save);
 		expect(ctx.ui.notify).toHaveBeenCalledOnce();
 		const [msg, level] = (ctx.ui.notify as ReturnType<typeof vi.fn>).mock.calls[0]!;
 		expect(msg).toContain("No available models");
@@ -271,9 +284,9 @@ describe("/permission model（W7）", () => {
 			},
 		});
 		const save = vi.fn(() => ({ success: true }));
-		const deps = makeModelDeps({ save });
+		vi.mocked(listAvailableModels).mockReturnValue(defaultModels());
 		const config = makeConfig({ classifier: { enabled: true, model: "co/old", timeout: 90, autoApproveLowRisk: true, autoDenyHighRisk: true } });
-		await handlePermissionModelCommand(ctx, config, deps);
+		await handlePermissionModelCommand(ctx, config, save);
 		expect(save).toHaveBeenCalledOnce();
 		const savedConfig = save.mock.calls[0]![0] as PermissionConfig;
 		expect(savedConfig.classifier.model).toBe("auto");
@@ -288,8 +301,8 @@ describe("/permission model（W7）", () => {
 			ui: { notify: vi.fn(), select: selectMock, custom: vi.fn() },
 		});
 		const save = vi.fn(() => ({ success: true }));
-		const deps = makeModelDeps({ save });
-		await handlePermissionModelCommand(ctx, makeConfig(), deps);
+		vi.mocked(listAvailableModels).mockReturnValue(defaultModels());
+		await handlePermissionModelCommand(ctx, makeConfig(), save);
 		expect(save).toHaveBeenCalledOnce();
 		const savedConfig = save.mock.calls[0]![0] as PermissionConfig;
 		expect(savedConfig.classifier.model).toBe("co/m1");
@@ -305,8 +318,8 @@ describe("/permission model（W7）", () => {
 			},
 		});
 		const save = vi.fn(() => ({ success: true }));
-		const deps = makeModelDeps({ save });
-		await handlePermissionModelCommand(ctx, makeConfig(), deps);
+		vi.mocked(listAvailableModels).mockReturnValue(defaultModels());
+		await handlePermissionModelCommand(ctx, makeConfig(), save);
 		expect(ctx.ui.notify).toHaveBeenCalledWith(expect.stringContaining("cancelled"), "info");
 		expect(save).not.toHaveBeenCalled();
 	});
@@ -320,15 +333,16 @@ describe("/permission model（W7）", () => {
 			},
 		});
 		const save = vi.fn(() => ({ success: false, error: "disk full" }));
-		const deps = makeModelDeps({ save });
-		await handlePermissionModelCommand(ctx, makeConfig(), deps);
+		vi.mocked(listAvailableModels).mockReturnValue(defaultModels());
+		await handlePermissionModelCommand(ctx, makeConfig(), save);
 		expect(ctx.ui.notify).toHaveBeenCalledWith(expect.stringContaining("disk full"), "error");
 	});
 
 	it("handler 返回 Promise（async 签名）", () => {
 		const ctx = makeModelPickerCtx();
-		const deps = makeModelDeps();
-		const result = handlePermissionModelCommand(ctx, makeConfig(), deps);
+		const save = vi.fn(() => ({ success: true }));
+		vi.mocked(listAvailableModels).mockReturnValue(defaultModels());
+		const result = handlePermissionModelCommand(ctx, makeConfig(), save);
 		// Promise.is 兼容检查
 		expect(result).toBeInstanceOf(Promise);
 		// 避免 unhandled rejection
@@ -344,14 +358,14 @@ describe("/permission model（W7）", () => {
 			},
 		});
 		const save = vi.fn(() => ({ success: true }));
-		const deps = makeModelDeps({ save });
+		vi.mocked(listAvailableModels).mockReturnValue(defaultModels());
 		const config = makeConfig({
 			mode: "strict",
 			enabled: false,
 			classifier: { enabled: false, model: "co/old", timeout: 30, autoApproveLowRisk: false, autoDenyHighRisk: false },
 			userRules: [{ id: "u1", tool: "bash", pattern: "rm *", action: "deny", source: "user" }],
 		});
-		await handlePermissionModelCommand(ctx, config, deps);
+		await handlePermissionModelCommand(ctx, config, save);
 		const saved = save.mock.calls[0]![0] as PermissionConfig;
 		expect(saved.mode).toBe("strict"); // 保留
 		expect(saved.enabled).toBe(false); // 保留
@@ -376,14 +390,6 @@ function makeRuleEditorCtx(overrides: Partial<RuleEditorContext> = {}): RuleEdit
 	};
 }
 
-/** 构造 PermissionRuleCommandDeps mock。 */
-function makeRuleDeps(overrides: Partial<PermissionRuleCommandDeps> = {}): PermissionRuleCommandDeps {
-	return {
-		save: overrides.save ?? vi.fn(() => ({ success: true })),
-		editRulesViaOverlay: overrides.editRulesViaOverlay ?? vi.fn(() => Promise.resolve(undefined)),
-	};
-}
-
 function makeRule(overrides: Partial<Rule> = {}): Rule {
 	return {
 		id: "user-1",
@@ -405,11 +411,8 @@ describe("/permission rule（W8）", () => {
 		const notify = vi.fn();
 		const save = vi.fn(() => ({ success: true }));
 		const ctx = makeRuleEditorCtx({ ui: { notify, select: vi.fn(), custom: vi.fn() } });
-		const deps = makeRuleDeps({
-			save,
-			editRulesViaOverlay: vi.fn(() => Promise.resolve(undefined)),
-		});
-		await handlePermissionRuleCommand(ctx, makeConfig(), makeCounter(), deps);
+		vi.mocked(editRulesViaOverlay).mockResolvedValue(undefined);
+		await handlePermissionRuleCommand(ctx, makeConfig(), makeCounter(), save);
 		expect(notify).toHaveBeenCalledWith(expect.stringContaining("No changes"), "info");
 		expect(save).not.toHaveBeenCalled();
 	});
@@ -418,11 +421,8 @@ describe("/permission rule（W8）", () => {
 		const notify = vi.fn();
 		const save = vi.fn(() => ({ success: true }));
 		const ctx = makeRuleEditorCtx({ ui: { notify, select: vi.fn(), custom: vi.fn() } });
-		const deps = makeRuleDeps({
-			save,
-			editRulesViaOverlay: vi.fn(() => Promise.resolve([])),
-		});
-		await handlePermissionRuleCommand(ctx, makeConfig(), makeCounter(), deps);
+		vi.mocked(editRulesViaOverlay).mockResolvedValue([]);
+		await handlePermissionRuleCommand(ctx, makeConfig(), makeCounter(), save);
 		expect(notify).toHaveBeenCalledWith(expect.stringContaining("No changes"), "info");
 		expect(save).not.toHaveBeenCalled();
 	});
@@ -432,12 +432,9 @@ describe("/permission rule（W8）", () => {
 		const save = vi.fn(() => ({ success: true }));
 		const ops: RuleOp[] = [{ kind: "add", rule: makeRule({ id: "user-1", pattern: "git *" }) }];
 		const ctx = makeRuleEditorCtx({ ui: { notify, select: vi.fn(), custom: vi.fn() } });
-		const deps = makeRuleDeps({
-			save,
-			editRulesViaOverlay: vi.fn(() => Promise.resolve(ops)),
-		});
+		vi.mocked(editRulesViaOverlay).mockResolvedValue(ops);
 		const config = makeConfig({ userRules: [] });
-		await handlePermissionRuleCommand(ctx, config, makeCounter(), deps);
+		await handlePermissionRuleCommand(ctx, config, makeCounter(), save);
 		expect(save).toHaveBeenCalledOnce();
 		expect(notify).toHaveBeenCalledWith(expect.stringContaining("1 change(s)"), "info");
 		// save 收到的 config.userRules 含新规则
@@ -451,11 +448,8 @@ describe("/permission rule（W8）", () => {
 		const save = vi.fn(() => ({ success: false, error: "disk full" }));
 		const ops: RuleOp[] = [{ kind: "add", rule: makeRule({ id: "user-1" }) }];
 		const ctx = makeRuleEditorCtx({ ui: { notify, select: vi.fn(), custom: vi.fn() } });
-		const deps = makeRuleDeps({
-			save,
-			editRulesViaOverlay: vi.fn(() => Promise.resolve(ops)),
-		});
-		await handlePermissionRuleCommand(ctx, makeConfig(), makeCounter(), deps);
+		vi.mocked(editRulesViaOverlay).mockResolvedValue(ops);
+		await handlePermissionRuleCommand(ctx, makeConfig(), makeCounter(), save);
 		expect(notify).toHaveBeenCalledWith(expect.stringContaining("disk full"), "error");
 	});
 
@@ -463,16 +457,13 @@ describe("/permission rule（W8）", () => {
 		const save = vi.fn(() => ({ success: true }));
 		const ops: RuleOp[] = [{ kind: "add", rule: makeRule({ id: "user-1" }) }];
 		const ctx = makeRuleEditorCtx({ ui: { notify: vi.fn(), select: vi.fn(), custom: vi.fn() } });
-		const deps = makeRuleDeps({
-			save,
-			editRulesViaOverlay: vi.fn(() => Promise.resolve(ops)),
-		});
+		vi.mocked(editRulesViaOverlay).mockResolvedValue(ops);
 		const config = makeConfig({
 			mode: "strict",
 			enabled: false,
 			classifier: { enabled: false, model: "custom", timeout: 10, autoApproveLowRisk: false, autoDenyHighRisk: false },
 		});
-		await handlePermissionRuleCommand(ctx, config, makeCounter(), deps);
+		await handlePermissionRuleCommand(ctx, config, makeCounter(), save);
 		const saved = save.mock.calls[0]![0] as PermissionConfig;
 		expect(saved.mode).toBe("strict");
 		expect(saved.enabled).toBe(false);
@@ -480,14 +471,14 @@ describe("/permission rule（W8）", () => {
 	});
 
 	it("editRulesViaOverlay 收到正确的 initialRules 和 sessionIdCounter", async () => {
-		const editMock = vi.fn(() => Promise.resolve(undefined));
+		const save = vi.fn(() => ({ success: true }));
 		const ctx = makeRuleEditorCtx({ ui: { notify: vi.fn(), select: vi.fn(), custom: vi.fn() } });
 		const existingRules = [makeRule({ id: "user-5" })];
 		const counter = makeCounter();
-		const deps = makeRuleDeps({ editRulesViaOverlay: editMock });
-		await handlePermissionRuleCommand(ctx, makeConfig({ userRules: existingRules }), counter, deps);
-		expect(editMock).toHaveBeenCalledOnce();
-		const [_callCtx, callRules, callCounter] = editMock.mock.calls[0]!;
+		vi.mocked(editRulesViaOverlay).mockResolvedValue(undefined);
+		await handlePermissionRuleCommand(ctx, makeConfig({ userRules: existingRules }), counter, save);
+		expect(editRulesViaOverlay).toHaveBeenCalledOnce();
+		const [_callCtx, callRules, callCounter] = vi.mocked(editRulesViaOverlay).mock.calls[0]!;
 		expect(callRules).toEqual(existingRules);
 		expect(typeof callCounter).toBe("function");
 	});

package/src/__tests__/model-picker.test.ts

@@ -17,23 +17,21 @@ import type { Api, Model } from "@earendil-works/pi-ai";
 import type { ResolvedModelEntry } from "../classifier/model-resolver.js";
 import { listAvailableModels } from "../classifier/model-resolver.js";
 import {
-	DEFAULT_SELECT_THEME,
 	type ModelPickerContext,
 	pickModelViaOverlay,
 	ProviderModelSelectorComponent,
 	type SelectionResult,
 } from "../model-picker.js";
+import { DEFAULT_SELECT_THEME } from "../select-theme.js";
 
 // ──────────────────────── mock fixtures（listAvailableModels） ────────────────────────
 
-/** 构造一条 ResolvedModelEntry（测试 helper）。 */
-function makeEntry(provider: string, id: string, inputCost: number): ResolvedModelEntry {
+/** 构造一条 ResolvedModelEntry（测试 helper；E5 后仅 provider/id/api）。 */
+function makeEntry(provider: string, id: string): ResolvedModelEntry {
 	return {
 		provider,
 		id,
-		name: id,
 		api: "openai-completions",
-		cost: { input: inputCost, output: 0, cacheRead: 0, cacheWrite: 0 },
 	};
 }
 
@@ -116,7 +114,7 @@ function makePickerCtx(overrides: Partial<ModelPickerContext> = {}): ModelPicker
 describe("MPT2: pickModelViaOverlay 分发", () => {
 	it("headless（json）→ 返回 undefined（降级）", async () => {
 		const ctx = makePickerCtx({ mode: "json" });
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const result = await pickModelViaOverlay(ctx, "auto", models);
 		expect(result).toBeUndefined();
 	});
@@ -136,7 +134,7 @@ describe("MPT2: pickModelViaOverlay 分发", () => {
 				custom: vi.fn(),
 			},
 		});
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const result = await pickModelViaOverlay(ctx, "auto", models);
 		expect(result).toBe("auto");
 		expect(ctx.ui.select).toHaveBeenCalledOnce();
@@ -150,7 +148,7 @@ describe("MPT2: pickModelViaOverlay 分发", () => {
 			mode: "rpc",
 			ui: { notify: vi.fn(), select: selectMock, custom: vi.fn() },
 		});
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const result = await pickModelViaOverlay(ctx, "auto", models);
 		expect(result).toBe("co/m1");
 		expect(ctx.ui.select).toHaveBeenCalledTimes(2);
@@ -165,13 +163,13 @@ describe("MPT2: pickModelViaOverlay 分发", () => {
 				custom: vi.fn(),
 			},
 		});
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const result = await pickModelViaOverlay(ctx, "auto", models);
 		expect(result).toBeUndefined();
 	});
 
 	it("TUI 模式：custom factory 被调用，comp done settle 结果", async () => {
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		// 模拟 ctx.ui.custom：构造 comp 并模拟 done({kind:'auto'})
 		const customMock = vi.fn(
 			<T,>(factory: (tui: unknown, theme: unknown, kb: unknown, done: (r: T) => void) => unknown) =>
@@ -181,7 +179,7 @@ describe("MPT2: pickModelViaOverlay 分发", () => {
 		);
 		const ctx = makePickerCtx({ mode: "tui", ui: { notify: vi.fn(), select: vi.fn(), custom: customMock } });
 		// 在 factory 内拿到 comp，但这里 mock 直接调 done({kind:'auto'})
-		// 改写 mock：构造真实 comp 并用 cancel/settle
+		// 改写 mock：构造真实 comp 并用 handleInput('\r') 触发 onSelect
 		customMock.mockImplementationOnce(
 			<T,>(factory: (tui: unknown, theme: unknown, kb: unknown, done: (r: T) => void) => unknown) =>
 				new Promise<T>((resolve) => {
@@ -201,7 +199,7 @@ describe("MPT2: pickModelViaOverlay 分发", () => {
 describe("MPT3: ProviderModelSelectorComponent 构造 + 初始 stage", () => {
 	it("构造：初始 stage='provider'，render 非空含 'Select Provider'", () => {
 		const done = vi.fn();
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const comp = new ProviderModelSelectorComponent("auto", ["co"], models, done);
 		const lines = comp.render(80);
 		const joined = lines.join("\n");
@@ -212,7 +210,7 @@ describe("MPT3: ProviderModelSelectorComponent 构造 + 初始 stage", () => {
 
 	it("currentSpec='auto' → 预选 'Auto'（index 0）", () => {
 		const done = vi.fn();
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const comp = new ProviderModelSelectorComponent("auto", ["co"], models, done);
 		comp.handleInput("\r"); // Enter 选中预选项（Auto）
 		expect(done).toHaveBeenCalledOnce();
@@ -222,7 +220,7 @@ describe("MPT3: ProviderModelSelectorComponent 构造 + 初始 stage", () => {
 
 	it("currentSpec='provider/modelId' → 预选该 provider（Enter 直接到 model stage）", () => {
 		const done = vi.fn();
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const comp = new ProviderModelSelectorComponent("co/m1", ["co"], models, done);
 		// 预选 'co'（index 1），Enter 触发 switchToModelStage（不 done）
 		comp.handleInput("\r");
@@ -235,7 +233,7 @@ describe("MPT3: ProviderModelSelectorComponent 构造 + 初始 stage", () => {
 describe("MPT4: ProviderModelSelectorComponent provider onSelect", () => {
 	it("provider stage 选 Auto → done({kind:'auto'})", () => {
 		const done = vi.fn();
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const comp = new ProviderModelSelectorComponent("auto", ["co"], models, done);
 		comp.handleInput("\r"); // Enter 选中预选 Auto
 		expect(done).toHaveBeenCalledWith({ kind: "auto" });
@@ -243,7 +241,7 @@ describe("MPT4: ProviderModelSelectorComponent provider onSelect", () => {
 
 	it("provider stage 选具体 provider → switchToModelStage（不 done）", () => {
 		const done = vi.fn();
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const comp = new ProviderModelSelectorComponent("auto", ["co"], models, done);
 		// 下移到 'co'（index 1），Enter 进入 model stage
 		comp.handleInput("\x1b[B"); // Down arrow
@@ -254,7 +252,7 @@ describe("MPT4: ProviderModelSelectorComponent provider onSelect", () => {
 
 	it("provider stage Esc → done(undefined)（cancel）", () => {
 		const done = vi.fn();
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const comp = new ProviderModelSelectorComponent("auto", ["co"], models, done);
 		comp.handleInput("\x1b"); // Esc
 		expect(done).toHaveBeenCalledWith(undefined);
@@ -264,7 +262,7 @@ describe("MPT4: ProviderModelSelectorComponent provider onSelect", () => {
 describe("MPT5: ProviderModelSelectorComponent model onSelect", () => {
 	it("model stage 选 model → done({kind:'specific', provider, modelId})", () => {
 		const done = vi.fn();
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1), makeEntry("co", "m2", 0.2)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1"), makeEntry("co", "m2")] });
 		const comp = new ProviderModelSelectorComponent("auto", ["co"], models, done);
 		// 下移到 'co'，Enter 进 model stage
 		comp.handleInput("\x1b[B"); // Down
@@ -276,7 +274,7 @@ describe("MPT5: ProviderModelSelectorComponent model onSelect", () => {
 
 	it("model stage Esc → 回退到 provider stage（不 done）", () => {
 		const done = vi.fn();
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const comp = new ProviderModelSelectorComponent("auto", ["co"], models, done);
 		// 进 model stage
 		comp.handleInput("\x1b[B"); // Down
@@ -289,7 +287,7 @@ describe("MPT5: ProviderModelSelectorComponent model onSelect", () => {
 
 	it("_resolved 守卫：done 后再 handleInput no-op", () => {
 		const done = vi.fn();
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const comp = new ProviderModelSelectorComponent("auto", ["co"], models, done);
 		comp.handleInput("\r"); // Auto → done
 		expect(done).toHaveBeenCalledOnce();
@@ -304,7 +302,7 @@ describe("MPT5: ProviderModelSelectorComponent model onSelect", () => {
 describe("MPT6: WR1 handleInput 委托 SelectList.onSelect（critical）", () => {
 	it("handleInput('\\r') 直接触发 SelectList.onSelect（不绕过键盘委托通路）", () => {
 		const done = vi.fn();
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const comp = new ProviderModelSelectorComponent("auto", ["co"], models, done);
 		// 直接调 handleInput('\r')，验证：
 		// 1. Container.handleInput 不存在，组件 override 委托给 SelectList
@@ -317,7 +315,7 @@ describe("MPT6: WR1 handleInput 委托 SelectList.onSelect（critical）", () =>
 
 	it("handleInput(down + enter) 链式触发 SelectList 导航 + onSelect", () => {
 		const done = vi.fn();
-		const models = makeModelsMap({ "co": [makeEntry("co", "m1", 0.1)] });
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
 		const comp = new ProviderModelSelectorComponent("auto", ["co"], models, done);
 		// Down 移动到 'co'，Enter 选中 → 进 model stage（done 未调）
 		comp.handleInput("\x1b[B"); // Down
@@ -342,3 +340,29 @@ describe("MPT7: DEFAULT_SELECT_THEME（G2/WR2 修正）", () => {
 		expect(result.startsWith("\u25B6")).toBe(true);
 	});
 });
+
+// ──────────────────────── V2b: currentSpec 预选钉值（ext-simplify-18 D4 parseModelRef 采用） ────────────────────────
+
+describe("MPT8: V2b currentSpec 预选钉值（parseModelRef 采用后行为锁定）", () => {
+	it("合法 ref：provider 与 model 双预选命中（两 stage Enter 落到 currentSpec 对应项）", () => {
+		const done = vi.fn();
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1"), makeEntry("co", "m2")] });
+		const comp = new ProviderModelSelectorComponent("co/m2", ["other", "co"], models, done);
+		// provider stage 预选 'co'（index 2：Auto + other + co），Enter → model stage（不 settle）
+		comp.handleInput("\r");
+		expect(done).not.toHaveBeenCalled();
+		// model stage 预选 m2（非列表第一个 m1），Enter → done(specific co/m2)
+		comp.handleInput("\r");
+		expect(done).toHaveBeenCalledWith({ kind: "specific", provider: "co", modelId: "m2" });
+	});
+
+	it("病态输入 'provider/'（尾空 modelId）：parseModelRef 返 null → provider 预选回 Auto", () => {
+		const done = vi.fn();
+		const models = makeModelsMap({ "co": [makeEntry("co", "m1")] });
+		// 行为微变（ext-simplify-18 D4 登记）：旧版 provider 预选命中 idx+1，
+		// 新版整 ref 无效 → 整体回 Auto（Enter → done({kind:'auto'})）
+		const comp = new ProviderModelSelectorComponent("co/", ["co"], models, done);
+		comp.handleInput("\r"); // 预选 index 0（Auto），Enter → done({kind:'auto'})
+		expect(done).toHaveBeenCalledWith({ kind: "auto" });
+	});
+});

package/src/__tests__/pipeline.test.ts

@@ -454,6 +454,30 @@ describe("G1: matchNonBashTool（非 bash 工具规则匹配，M5 pattern 对 pa
 	it("空 toolName → ask", () => {
 		expect(matchNonBashTool("", "/x", [])).toEqual({ action: "ask", matchedRule: undefined });
 	});
+
+	it("E7/T3：pattern 编译走 resolvePattern patternCache（matcher 与 pipeline 复用同一缓存）", async () => {
+		// E7（M10）后 matchNonBashTool 的 pattern 双语义分发改调 matcher.resolvePattern，
+		// 第二次调用应命中 patternCache（不再重新编译）。可观测信号：wildcardToRegExp
+		// 收到该 pattern 的编译次数恰为 1（改前的本地三元无缓存，会是 2）。
+		// tool 字段编译不走缓存（每次调用编译一次），与 pattern 计数解耦。
+		const wildcardModule = await import("../rules/wildcard.js");
+		const spy = vi.spyOn(wildcardModule, "wildcardToRegExp");
+		try {
+			const rule: Rule = {
+				id: "pc-1",
+				tool: "read",
+				pattern: "/tmp/e7-unique-cache/*",
+				action: "deny",
+				source: "user",
+			};
+			expect(matchNonBashTool("read", "/tmp/e7-unique-cache/a", [rule]).action).toBe("deny");
+			expect(matchNonBashTool("read", "/tmp/e7-unique-cache/b", [rule]).action).toBe("deny");
+			const patternCompiles = spy.mock.calls.filter((call) => call[0] === rule.pattern);
+			expect(patternCompiles).toHaveLength(1);
+		} finally {
+			spy.mockRestore();
+		}
+	});
 });
 
 // ──────────────────────── runLayer2 ────────────────────────