@zhushanwen/pi-permission 1.0.0 → 1.2.0

package/src/__tests__/extension.test.ts

@@ -2,13 +2,33 @@
  * WT8/WT9: 扩展入口注册 + 占位 tool_call 测试
  *
  * 用 mock pi 对象记录调用，不依赖真实 Pi 运行时。
+ * PI_CODING_AGENT_DIR 隔离到临时目录：permissionExtension 工厂初始化时会
+ * loadAndWatchConfig → ensureConfigFile 创建默认配置，不隔离会污染真实 agentDir。
  */
-import { describe, expect, it } from "vitest";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
 
 // Mock Pi SDK 模块（extension.ts import 的 @earendil-works/pi-coding-agent 类型在 node_modules 有完整定义，
 // 这里 import 工厂函数，用 mock pi 调用它）
 import permissionExtension from "../index.js";
 
+let tempAgentDir: string;
+let originalAgentDirEnv: string | undefined;
+
+beforeEach(() => {
+	tempAgentDir = mkdtempSync(join(tmpdir(), "pi-perm-ext-test-"));
+	originalAgentDirEnv = process.env.PI_CODING_AGENT_DIR;
+	process.env.PI_CODING_AGENT_DIR = tempAgentDir;
+});
+
+afterEach(() => {
+	if (originalAgentDirEnv === undefined) delete process.env.PI_CODING_AGENT_DIR;
+	else process.env.PI_CODING_AGENT_DIR = originalAgentDirEnv;
+	rmSync(tempAgentDir, { recursive: true, force: true });
+});
+
 /** 最小 mock：只记录 registerCommand 和 on 调用 */
 interface MockPi {
 	registerCommand: (name: string, options: unknown) => void;
@@ -143,7 +163,7 @@ describe("WT9: tool_call handler（W5 三层管道接入）", () => {
 			ctx: unknown,
 		) => Promise<unknown>;
 
-		// 注：handler 实际读取磁盘上的 permission-config.json（无法从测试注入 config）。
+		// 注：handler 实际读取磁盘上的 config/permission-ext-config.json（无法从测试注入 config）。
 		// 默认 user config 含 allow 规则 `python *`（user-1），故 `python script.py` 命中 allow → resolve undefined。
 		// 此前测试断言「yolo 放行任意命令（含 git push --force）」依赖磁盘 config.mode==='yolo'，
 		// 但 config 已改为 auto 且 bd-005 危险规则即使 yolo 之外的模式会拦截 force push。

package/src/__tests__/index-integration.test.ts

@@ -9,18 +9,18 @@
  *  - fail-closed（异常 → block）
  *  - session_start 重载 config
  *
- * 用 PI_CODING_AGENT_DIR 指向临时目录，写入 controlled permission-config.json，
+ * 用 PI_CODING_AGENT_DIR 指向临时目录，写入 controlled permission.json，
  * 让 loadAndWatchConfig 读到指定 mode。mock pi 对象记录 handler 调用。
  */
-import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, rmSync, writeFileSync, readFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
-import { FOOTER_HANDSHAKE_KEY, REQUEST_RENDER_KEY } from "../footer-provider.js";
 import permissionExtension from "../index.js";
+import { FOOTER_HANDSHAKE_KEY, REQUEST_RENDER_KEY } from "../footer-provider.js";
 
 // ──────────────────────── mock pi ────────────────────────
 
@@ -112,10 +112,11 @@ function bashEvent(command: string): { toolName: string; input: { command: strin
 
 const TMP_ROOT = join(tmpdir(), "pi-perm-test-" + process.pid);
 const AGENT_DIR = join(TMP_ROOT, "agent");
-const CONFIG_PATH = join(AGENT_DIR, "permission-config.json");
+const CONFIG_PATH = join(AGENT_DIR, "config", "permission-ext-config.json");
 
 function writeConfig(mode: string, enabled = true): void {
 	mkdirSync(AGENT_DIR, { recursive: true });
+	mkdirSync(join(AGENT_DIR, "config"), { recursive: true });
 	const config = {
 		mode,
 		enabled,
@@ -126,6 +127,9 @@ function writeConfig(mode: string, enabled = true): void {
 }
 
 beforeEach(() => {
+	// 清理 footer 握手 slot（防 footer 测试跨用例污染）
+	Reflect.deleteProperty(globalThis, FOOTER_HANDSHAKE_KEY);
+	Reflect.deleteProperty(globalThis, REQUEST_RENDER_KEY);
 	process.env.PI_CODING_AGENT_DIR = AGENT_DIR;
 	mkdirSync(AGENT_DIR, { recursive: true });
 	// 默认 yolo config（大多数测试需要可预测起点）
@@ -134,10 +138,9 @@ beforeEach(() => {
 
 afterEach(() => {
 	delete process.env.PI_CODING_AGENT_DIR;
-	if (existsSync(TMP_ROOT)) rmSync(TMP_ROOT, { recursive: true, force: true });
-	// 清理 footer 握手 slot（session_start/session_tree handler 会写 globalThis）
 	Reflect.deleteProperty(globalThis, FOOTER_HANDSHAKE_KEY);
 	Reflect.deleteProperty(globalThis, REQUEST_RENDER_KEY);
+	if (existsSync(TMP_ROOT)) rmSync(TMP_ROOT, { recursive: true, force: true });
 });
 
 // ──────────────────────── 测试 ────────────────────────
@@ -294,91 +297,165 @@ describe("W8 /permission rule 命令集成", () => {
 	});
 });
 
-// ──────────────────────── footer line 注册（duck typing + session_tree）────────────────────────
+
+
+// ──────────────────────── footer line 注册（consumer 端握手 + render 读时刷新）────────────────────────
 
 describe("footer line 注册", () => {
-	it("session_start：ctx.ui 无 theme → registerFooterLineFor 返回 noop dispose，不抛异常", () => {
-		writeConfig("yolo");
+	it("session_start：ctx.ui 无 theme → 仍注册 renderer（不依赖 ctx.ui），render(null theme) 返回 null", () => {
 		const { pi, calls } = createMockPi();
 		permissionExtension(pi);
 		const sessionHandler = getSessionStartHandler(calls);
-
-		// ctx.ui 完全无 theme 字段（headless/mock 形状）。
-		// registerFooterLineFor 的 duck typing 守卫应命中，返回 () => {} 而不调
-		// registerPermissionFooterLine（故 globalThis 不应出现握手 slot）。
 		const ctxNoTheme = { mode: "json", cwd: "/tmp", ui: {}, signal: undefined };
 		expect(() => sessionHandler({}, ctxNoTheme)).not.toThrow();
-		expect(Reflect.get(globalThis, FOOTER_HANDSHAKE_KEY)).toBeUndefined();
+		// 不再依赖 ctx.ui.theme（pi 的 ExtensionUIContext 无此字段）：无条件注册
+		const slot = Reflect.get(globalThis, FOOTER_HANDSHAKE_KEY) as {
+			pending: Array<{ id: string; renderer: unknown }>;
+		} | undefined;
+		expect(slot).toBeDefined();
+		expect(slot!.pending.length).toBe(1);
+		const renderer = slot!.pending[0]!.renderer as {
+			render: (ctx: unknown, theme: unknown) => string | null;
+		};
+		// headless：theme 无效（undefined）→ null（statusline 跳过）
+		expect(renderer.render(undefined, undefined)).toBeNull();
 	});
 
-	it("session_start：ctx.ui.theme 存在但 fg 非函数 → noop dispose，不抛异常", () => {
-		writeConfig("yolo");
+	it("render：theme 无 fg 函数 → 返回 null（不抛）", () => {
 		const { pi, calls } = createMockPi();
 		permissionExtension(pi);
 		const sessionHandler = getSessionStartHandler(calls);
-
-		// theme 存在但 fg 缺失/非函数 → duck typing 失败 → noop dispose。
-		const ctxBadFg = {
-			mode: "json",
-			cwd: "/tmp",
-			ui: { theme: { fg: "not-a-function" } },
-			signal: undefined,
+		sessionHandler({}, { mode: "json", cwd: "/tmp", ui: {}, signal: undefined });
+		const slot = Reflect.get(globalThis, FOOTER_HANDSHAKE_KEY) as {
+			pending: Array<{ id: string; renderer: unknown }>;
+		} | undefined;
+		const renderer = slot!.pending[0]!.renderer as {
+			render: (ctx: unknown, theme: unknown) => string | null;
 		};
-		expect(() => sessionHandler({}, ctxBadFg)).not.toThrow();
-		// 未注册 renderer → 不应触碰 globalThis 握手 slot
-		expect(Reflect.get(globalThis, FOOTER_HANDSHAKE_KEY)).toBeUndefined();
+		expect(renderer.render(undefined, { fg: "not-a-fn" })).toBeNull();
 	});
 
-	it("session_tree：触发两次 handler 不抛异常（dispose 旧 renderer → refreshConfig → 重注册）", () => {
+	it("session_start：注册 renderer，render(ctx, theme) 用传入 theme 构造 palette + 读时刷新", () => {
 		writeConfig("yolo");
 		const { pi, calls } = createMockPi();
 		permissionExtension(pi);
-		const sessionTreeHandler = getSessionTreeHandler(calls);
-
-		// ctx.ui.theme 为合法 fg 函数 → 真实注册 renderer（写 globalThis slot）。
-		const ctxWithTheme = {
-			mode: "json",
-			cwd: "/tmp",
-			ui: {
-				theme: {
-					fg: (_token: string, text: string): string => text,
-				},
-			},
-			signal: undefined,
-		};
-
-		// 第一次：注册 renderer（无旧 renderer，dispose 是 noop）。
-		expect(() => sessionTreeHandler({}, ctxWithTheme)).not.toThrow();
-		expect(Reflect.get(globalThis, FOOTER_HANDSHAKE_KEY)).toBeDefined();
-
-		// 切换 config（模拟分支切换后 permission-config.json 变化）。
-		writeConfig("strict");
-
-		// 第二次：dispose 上次的 renderer → refreshConfig 读到 strict → 重新注册。
-		// disposeFooterLine 是闭包私有变量，这里间接验证：多次触发不抛、不破坏 slot 结构。
-		expect(() => sessionTreeHandler({}, ctxWithTheme)).not.toThrow();
-		// slot 仍存在且结构合规（version=1，pending 是数组）
+		const sessionHandler = getSessionStartHandler(calls);
+		// 注册不依赖 ctx.ui.theme；theme 由 statusline 在 render 时传入
+		sessionHandler({}, { mode: "json", cwd: "/tmp", ui: {}, signal: undefined });
+		// consumer 端：owner(pi-statusline) 未加载 → registry 未就绪 → renderer 进 pending
 		const slot = Reflect.get(globalThis, FOOTER_HANDSHAKE_KEY) as {
 			version: number;
-			pending: unknown[];
-		};
+			pending: Array<{ id: string; renderer: unknown }>;
+		} | undefined;
 		expect(slot).toBeDefined();
-		expect(slot.version).toBe(1);
-		expect(Array.isArray(slot.pending)).toBe(true);
-		// 两次注册 + 一次 dispose（第二次触发前）→ pending 应至多 1 项（旧 renderer 已 dispose 移除）
-		expect(slot.pending.length).toBeLessThanOrEqual(1);
+		expect(slot!.version).toBe(1);
+		expect(slot!.pending.length).toBe(1);
+		expect(slot!.pending[0]!.id).toBe("pi-permission");
+		const renderer = slot!.pending[0]!.renderer as {
+			render: (ctx: unknown, theme: unknown) => string | null;
+		};
+		// statusline render hook 传入的 theme 参数（pi Theme 对象，fg(token, text)）
+		const theme = { fg: (_t: string, text: string): string => text };
+		// render 用传入 theme 构造 palette + 读最新 config（yolo）→ 含 YOLO label
+		expect(renderer.render(undefined, theme)).toContain("YOLO");
+		// 读时刷新：改 config mode 后再次 render → 反映 Strict（验证 render 内 loadAndWatchConfig）
+		writeConfig("strict");
+		const out2 = renderer.render(undefined, theme);
+		expect(out2).toContain("Strict");
+		expect(out2).not.toContain("YOLO");
 	});
 
-	it("session_tree：ctx.ui 无 theme 时多次触发仍安全（noop dispose 重复调用）", () => {
-		writeConfig("yolo");
+	it("session_tree：触发不抛异常（只 requestRender，不改注册状态）", () => {
 		const { pi, calls } = createMockPi();
 		permissionExtension(pi);
 		const sessionTreeHandler = getSessionTreeHandler(calls);
+		expect(() => sessionTreeHandler({}, undefined)).not.toThrow();
+	});
+});
 
-		// 无 theme → 两次都是 noop dispose，不应抛、不应写 globalThis。
-		const ctxNoTheme = { mode: "json", cwd: "/tmp", ui: {}, signal: undefined };
-		expect(() => sessionTreeHandler({}, ctxNoTheme)).not.toThrow();
-		expect(() => sessionTreeHandler({}, ctxNoTheme)).not.toThrow();
-		expect(Reflect.get(globalThis, FOOTER_HANDSHAKE_KEY)).toBeUndefined();
+// ──────────────────────── session_start 配置路径迁移接线（index.ts migrateLegacyConfig 调用）────────────────────────
+// 模块级 once flag（configMigrationChecked）跨用例残留：用 vi.resetModules() + 动态 import
+// 取新鲜模块实例，否则前面用例已触发过 session_start，迁移分支永不执行（静默不测）。
+describe("session_start 配置路径迁移接线", () => {
+	const LEGACY_PATH = join(AGENT_DIR, "permission-config.json");
+
+	/** 重置模块 + 动态 import，返回新鲜 permissionExtension 工厂。 */
+	async function freshExtension(): Promise<(pi: Pick<ExtensionAPI, "on" | "registerCommand">) => void> {
+		vi.resetModules();
+		const mod = await import("../index.js");
+		return mod.default as (pi: Pick<ExtensionAPI, "on" | "registerCommand">) => void;
+	}
+
+		/** 写旧路径配置文件（permission-config.json）。 */
+	function writeLegacyConfig(mode: string): void {
+		mkdirSync(AGENT_DIR, { recursive: true });
+		writeFileSync(
+			LEGACY_PATH,
+			JSON.stringify({ mode, enabled: true, classifier: { enabled: true }, userRules: [] }, null, 2) + "\n",
+			{ mode: 0o600 },
+		);
+	}
+
+	it("旧路径存在 + 新路径不存在 → session_start 触发 renameSync 迁移（内容保留 + 旧文件消失）", async () => {
+		// 前置：beforeEach 已写新路径 yolo 配置，迁移场景要求新路径不存在
+		rmSync(CONFIG_PATH, { force: true });
+		writeLegacyConfig("strict");
+
+		const extension = await freshExtension();
+		const { pi, calls } = createMockPi();
+		extension(pi);
+		const handler = getSessionStartHandler(calls);
+		handler({}, makeCtx("json"));
+
+		// 新路径存在且内容来自旧文件（renameSync 保留内容），旧文件消失
+		expect(existsSync(CONFIG_PATH)).toBe(true);
+		const migrated = JSON.parse(readFileSync(CONFIG_PATH, "utf-8"));
+		expect(migrated.mode).toBe("strict");
+		expect(existsSync(LEGACY_PATH)).toBe(false);
+	});
+
+	it("once flag：同进程第二次 session_start 不重复迁移（重建旧文件不动）", async () => {
+		rmSync(CONFIG_PATH, { force: true });
+		writeLegacyConfig("auto");
+
+		const extension = await freshExtension();
+		const { pi, calls } = createMockPi();
+		extension(pi);
+		const handler = getSessionStartHandler(calls);
+		handler({}, makeCtx("json"));
+		expect(existsSync(LEGACY_PATH)).toBe(false); // 首次已迁移
+
+		// 重建旧文件（模拟外部残留），再次触发 session_start → once flag 跳过迁移
+		writeLegacyConfig("yolo");
+		handler({}, makeCtx("json"));
+		expect(existsSync(LEGACY_PATH)).toBe(true); // 未被再次消费
+		expect(existsSync(CONFIG_PATH)).toBe(true);
+	});
+
+	it("旧路径存在 + 新路径已存在 → 删除旧文件（残留副本清理），新配置内容不变", async () => {
+		// beforeEach 已写新路径 yolo；再放旧文件 → session_start 删旧文件，新内容保持 yolo
+		writeLegacyConfig("strict");
+
+		const extension = await freshExtension();
+		const { pi, calls } = createMockPi();
+		extension(pi);
+		const handler = getSessionStartHandler(calls);
+		handler({}, makeCtx("json"));
+
+		expect(existsSync(LEGACY_PATH)).toBe(false);
+		const current = JSON.parse(readFileSync(CONFIG_PATH, "utf-8"));
+		expect(current.mode).toBe("yolo");
+	});
+
+	it("旧路径不存在（全新安装）→ noop，不创建新路径之外的东西", async () => {
+		rmSync(CONFIG_PATH, { force: true });
+		expect(existsSync(LEGACY_PATH)).toBe(false);
+
+		const extension = await freshExtension();
+		const { pi, calls } = createMockPi();
+		extension(pi);
+		const handler = getSessionStartHandler(calls);
+		expect(() => handler({}, makeCtx("json"))).not.toThrow();
+		expect(existsSync(CONFIG_PATH)).toBe(false); // 迁移不凭空造新配置
 	});
 });

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

@@ -2,7 +2,7 @@
  * model-picker.test.ts — W7 T5：model picker 单元测试。
  *
  * 覆盖：
- *  - listAvailableModels（5）：空文件 / 无 apiKey 过滤 / 多 provider 排序 / cost 升序 / 无 model 的 provider 不进 Map
+ *  - listAvailableModels（2）：E2 后走 mock ctx.modelRegistry（详细覆盖在 model-resolver.test.ts）
  *  - pickModelViaOverlay（3）：TUI mock custom / RPC mock select / headless 降级
  *  - ProviderModelSelectorComponent（5，含 WR1 handleInput 锁定）：
  *      构造 / 初始 stage / provider onSelect / switchToModelStage / model onSelect
@@ -10,12 +10,10 @@
  *
  * 用真实 pi-tui SelectList（不 mock），验证键盘委托集成通路（WR1 critical）。
  */
-import { existsSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
+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 {
@@ -26,103 +24,70 @@ import {
 	type SelectionResult,
 } from "../model-picker.js";
 
-// ──────────────────────── 临时文件 fixtures（listAvailableModels） ────────────────────────
-
-let tempDir: string;
-let modelsJsonPath: string;
-
-beforeEach(() => {
-	tempDir = mkdtempSync(join(tmpdir(), "pi-perm-mp-"));
-	modelsJsonPath = join(tempDir, "models.json");
-});
-
-afterEach(() => {
-	rmSync(tempDir, { recursive: true, force: true });
-});
-
-function writeModels(data: unknown): void {
-	writeFileSync(modelsJsonPath, JSON.stringify(data), "utf-8");
-}
+// ──────────────────────── mock fixtures（listAvailableModels） ────────────────────────
 
 /** 构造一条 ResolvedModelEntry（测试 helper）。 */
-function makeEntry(provider: string, id: string, inputCost: number, hasApiKey = true): ResolvedModelEntry {
+function makeEntry(provider: string, id: string, inputCost: number): ResolvedModelEntry {
 	return {
 		provider,
 		id,
 		name: id,
 		api: "openai-completions",
 		cost: { input: inputCost, output: 0, cacheRead: 0, cacheWrite: 0 },
-		hasApiKey,
 	};
 }
 
-/** 构造 models Map（用于 component / pickModelViaOverlay 测试，避免读盘）。 */
+/** 构造 mock Model（modelRegistry.getAll 用）。 */
+function makeMockModel(provider: string, id: string): Model<Api> {
+	return {
+		id,
+		name: id,
+		api: "openai-completions" as Api,
+		provider,
+		baseUrl: "",
+		reasoning: false,
+		cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+	} as Model<Api>;
+}
+
+/** 构造 models Map（用于 component / pickModelViaOverlay 测试，避免真实数据源）。 */
 function makeModelsMap(providers: Record<string, ResolvedModelEntry[]>): Map<string, ResolvedModelEntry[]> {
 	return new Map(Object.entries(providers));
 }
 
-// ──────────────────────── listAvailableModels（5 cases） ────────────────────────
-
-describe("MPT1: listAvailableModels", () => {
-	it("文件缺失 → 空 Map（不 throw）", () => {
-		expect(existsSync(modelsJsonPath)).toBe(false);
-		const map = listAvailableModels(undefined, modelsJsonPath);
-		expect(map.size).toBe(0);
-	});
+// ──────────────────────── listAvailableModels（E2 数据源接入） ────────────────────────
 
-	it("无 apiKey 的 provider 被过滤（不进 Map）", () => {
-		writeModels({
-			providers: {
-				"auth-co": { apiKey: "k1", api: "openai-completions", models: [{ id: "m1", cost: { input: 0.1, output: 0, cacheRead: 0, cacheWrite: 0 } }] },
-				"noauth-co": { api: "openai-completions", models: [{ id: "m2", cost: { input: 0.2, output: 0, cacheRead: 0, cacheWrite: 0 } }] },
-			},
-		});
-		const map = listAvailableModels(undefined, modelsJsonPath);
-		expect(map.has("auth-co")).toBe(true);
-		expect(map.has("noauth-co")).toBe(false); // 无 apiKey 过滤
-	});
-
-	it("多 provider 按 provider 名字母序排序（Map 插入序）", () => {
-		writeModels({
-			providers: {
-				"zebra-co": { apiKey: "k1", api: "openai-completions", models: [{ id: "m1", cost: { input: 0.1, output: 0, cacheRead: 0, cacheWrite: 0 } }] },
-				"alpha-co": { apiKey: "k2", api: "openai-completions", models: [{ id: "m2", cost: { input: 0.2, output: 0, cacheRead: 0, cacheWrite: 0 } }] },
+describe("MPT1: listAvailableModels（E2 走 ctx.modelRegistry）", () => {
+	it("mock ctx.modelRegistry：hasConfiguredAuth 过滤后按 provider 分组（OAuth provider 可见）", () => {
+		const ctx: ModelPickerContext = {
+			mode: "rpc",
+			modelRegistry: {
+				getAll: () => [makeMockModel("auth-co", "m1"), makeMockModel("noauth-co", "m2")],
+				hasConfiguredAuth: (m) => m.provider === "auth-co",
 			},
-		});
-		const map = listAvailableModels(undefined, modelsJsonPath);
-		const providers = [...map.keys()];
-		expect(providers).toEqual(["alpha-co", "zebra-co"]); // 字母序
-	});
-
-	it("provider 内 model 按 cost.input 升序 + id 字母序 tiebreaker", () => {
-		writeModels({
-			providers: {
-				"co": {
-					apiKey: "k1",
-					api: "openai-completions",
-					models: [
-						{ id: "expensive", cost: { input: 1.0, output: 0, cacheRead: 0, cacheWrite: 0 } },
-						{ id: "cheap-b", cost: { input: 0.1, output: 0, cacheRead: 0, cacheWrite: 0 } },
-						{ id: "cheap-a", cost: { input: 0.1, output: 0, cacheRead: 0, cacheWrite: 0 } },
-					],
-				},
+			ui: {
+				notify: vi.fn(),
+				select: vi.fn(() => Promise.resolve(undefined)),
+				custom: vi.fn(() => Promise.resolve(undefined)),
 			},
-		});
-		const map = listAvailableModels(undefined, modelsJsonPath);
-		const models = map.get("co")!;
-		expect(models.map((m) => m.id)).toEqual(["cheap-a", "cheap-b", "expensive"]);
+		};
+		const map = listAvailableModels(ctx);
+		expect(map.has("auth-co")).toBe(true);
+		expect(map.has("noauth-co")).toBe(false);
 	});
 
-	it("provider 有 apiKey 但无 model → 不进 Map（无 model 项被过滤）", () => {
-		writeModels({
-			providers: {
-				"empty-co": { apiKey: "k1", api: "openai-completions", models: [] },
-				"has-co": { apiKey: "k2", api: "openai-completions", models: [{ id: "m1", cost: { input: 0.1, output: 0, cacheRead: 0, cacheWrite: 0 } }] },
+	it("registry 无可选模型 → 空 Map（picker 降级提示）", () => {
+		const ctx: ModelPickerContext = {
+			mode: "rpc",
+			modelRegistry: { getAll: () => [], hasConfiguredAuth: () => false },
+			ui: {
+				notify: vi.fn(),
+				select: vi.fn(() => Promise.resolve(undefined)),
+				custom: vi.fn(() => Promise.resolve(undefined)),
 			},
-		});
-		const map = listAvailableModels(undefined, modelsJsonPath);
-		expect(map.has("empty-co")).toBe(false); // 无 model 不进 Map
-		expect(map.has("has-co")).toBe(true);
+		};
+		const map = listAvailableModels(ctx);
+		expect(map.size).toBe(0);
 	});
 });
 
@@ -131,13 +96,21 @@ describe("MPT1: listAvailableModels", () => {
 function makePickerCtx(overrides: Partial<ModelPickerContext> = {}): ModelPickerContext {
 	const base: ModelPickerContext = {
 		mode: "tui",
+		modelRegistry: {
+			getAll: vi.fn(() => []),
+			hasConfiguredAuth: vi.fn(() => false),
+		},
 		ui: {
 			notify: vi.fn(),
 			select: vi.fn(() => Promise.resolve(undefined)),
 			custom: vi.fn(() => Promise.resolve(undefined)),
 		},
 	};
-	return { mode: overrides.mode ?? base.mode, ui: { ...base.ui, ...overrides.ui } };
+	return {
+		mode: overrides.mode ?? base.mode,
+		modelRegistry: overrides.modelRegistry ?? base.modelRegistry,
+		ui: { ...base.ui, ...overrides.ui },
+	};
 }
 
 describe("MPT2: pickModelViaOverlay 分发", () => {
@@ -296,7 +269,7 @@ describe("MPT5: ProviderModelSelectorComponent model onSelect", () => {
 		// 下移到 'co'，Enter 进 model stage
 		comp.handleInput("\x1b[B"); // Down
 		comp.handleInput("\r"); // Enter → model stage
-		// model stage 预选 m1（cost 升序第一个）
+		// model stage 预选 m1（provider + id 字典序第一个）
 		comp.handleInput("\r"); // Enter 选 m1
 		expect(done).toHaveBeenCalledWith({ kind: "specific", provider: "co", modelId: "m1" });
 	});