@zhushanwen/pi-rename-session 0.9.5 → 0.10.0

package/README.md

@@ -131,7 +131,7 @@ node e2e/run-all.mjs   # 顺序全跑：单场景失败不阻断后续，汇总
 - harness API 与断言纯函数（单测 `e2e/harness.test.mjs` 随 vitest 跑）：`e2e/harness.mjs`
 - A2 的标题记录与人工抽查表（词组形态/语义相关/语言跟随三列）：`e2e/RESULTS.md`（run-a2 自动追加，人工填写）
 - 保留现场调试：`E2E_KEEP_TMP=1 node e2e/run-all.mjs`
-- 测试模型固定 `xiaomi-token-plan-cn/mimo-v2.5-pro`（项目规范，禁 kimi）
+- 测试模型缺省 `xiaomi-token-plan-cn/mimo-v2.6-flash`（`E2E_MODEL` 环境变量可覆盖，禁 kimi）
 
 ## 子 session 自动排除
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-rename-session",
-  "version": "0.9.5",
+  "version": "0.10.0",
   "type": "module",
   "main": "index.ts",
   "taiji": {
@@ -33,9 +33,9 @@
     "pi-package"
   ],
   "dependencies": {
-    "@zhushanwen/pi-ext-guards": "0.4.1",
+    "@zhushanwen/pi-ext-guards": "0.4.2",
     "@zhushanwen/pi-extension-logger": "0.6.1",
-    "@zhushanwen/pi-llm-shared": "0.10.0"
+    "@zhushanwen/pi-llm-shared": "0.11.0"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.1.9",

package/src/__tests__/llm.test.ts

@@ -380,7 +380,9 @@ const STUB_MODEL: Model<Api> = {
 	api: "anthropic-messages",
 	provider: "stub",
 	baseUrl: "https://stub.invalid",
-	reasoning: false,
+	// reasoning=true：档位按模型 supportedLevels 数据驱动判定（pi-ai getSupportedThinkingLevels），
+	// 不支持思考的模型只支持 "off"——用例要断言档位透传，故此处声明支持。
+	reasoning: true,
 	input: ["text"],
 	cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
 	contextWindow: 128_000,
@@ -672,6 +674,21 @@ describe("callRenameLLM", () => {
 		const callOpts = vi.mocked(callLLM).mock.calls[0][1] as { reasoning?: unknown };
 		expect(callOpts.reasoning).toBe("high");
 	});
+
+	it("thinkingLevel 为该模型不支持的档位 → warn 留痕 + 不传 reasoning（数据驱动判定，不静默换档）", async () => {
+		loggerMock.warn.mockClear();
+		vi.mocked(resolveModel).mockReturnValue(STUB_MODEL);
+		vi.mocked(callLLM).mockResolvedValue({ ok: true, content: "标题" });
+		// STUB_MODEL（reasoning=true）的 supportedLevels = off/minimal/low/medium/high，
+		// "ultra" 词表外 → reasoningLevel undefined → 不传档位
+		await callRenameLLM(createCtx(), { ...BASE_CONFIG, thinkingLevel: "ultra" }, FINAL_MESSAGE);
+
+		const callOpts = vi.mocked(callLLM).mock.calls[0][1] as { reasoning?: unknown };
+		expect(callOpts.reasoning).toBeUndefined();
+		expect(loggerMock.warn).toHaveBeenCalledWith(
+			expect.stringContaining('thinkingLevel "ultra" is not supported'),
+		);
+	});
 });
 
 // ────────────────────────────────────────────────────

package/src/__tests__/pure.test.ts

@@ -301,8 +301,10 @@ describe("normalizeRenameConfig", () => {
 		expect(normalizeRenameConfig({ thinkingLevel: "off" }).thinkingLevel).toBe("off");
 	});
 
-	it("thinkingLevel 非法（未知值 / 非字符串）→ 回默认 off", () => {
-		expect(normalizeRenameConfig({ thinkingLevel: "ultra" }).thinkingLevel).toBe("off");
+	it("thinkingLevel：非空字符串原样采信（含词表外值），非字符串/缺失 → 默认 off", () => {
+		// 词表不在本层（合法性归写入侧 UI 与 pi）：显式写了未知档位不再被静默换成缺省档
+		expect(normalizeRenameConfig({ thinkingLevel: "ultra" }).thinkingLevel).toBe("ultra");
+		expect(normalizeRenameConfig({ thinkingLevel: "xhigh" }).thinkingLevel).toBe("xhigh");
 		expect(normalizeRenameConfig({ thinkingLevel: 5 }).thinkingLevel).toBe("off");
 		expect(normalizeRenameConfig({ thinkingLevel: null }).thinkingLevel).toBe("off");
 		// 缺失字段 → 默认 off（旧配置文件兼容：无 thinkingLevel 字段的存量配置自动回填）

package/src/llm.ts

@@ -1,5 +1,6 @@
 import path from "node:path";
 
+import { getSupportedThinkingLevels } from "@earendil-works/pi-ai";
 import type { AssistantMessage, Message, Usage } from "@earendil-works/pi-ai";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { isRecord } from "@zhushanwen/pi-ext-guards";
@@ -268,6 +269,12 @@ export async function callRenameLLM(
 		logger.warn("model not available, skipping");
 		return null;
 	}
+	const reasoningLevel = getSupportedThinkingLevels(model).find((l) => l === config.thinkingLevel);
+	if (config.thinkingLevel !== undefined && reasoningLevel === undefined) {
+		logger.warn(
+			`configured thinkingLevel "${config.thinkingLevel}" is not supported by ${model.provider}/${model.id}; calling without a thinking level`,
+		);
+	}
 
 	const userPrompt =
 		options?.promptText ??
@@ -307,8 +314,10 @@ export async function callRenameLLM(
 		maxTokens: 2048,
 		// 固定 30s 超时（网络抖动归一为 ok:false 走静默跳过，不悬挂 fire-and-forget promise）
 		timeoutMs: RENAME_TIMEOUT_MS,
-		// thinkingLevel 直接透传（含 "off"）；llm-shared 内部会把 "off" 映射为不传 reasoning（provider 默认）
-		reasoning: config.thinkingLevel,
+		// 档位按「该模型自己的 supportedLevels」判定（pi-ai 数据驱动，本层不自持词表）：
+		// 配置写了该模型不支持的档位 → 留痕并按「不传档位」处理（不静默换成别的档）。
+		// llm-shared 内部会把 "off" 映射为不传 reasoning（provider 默认）。
+		reasoning: reasoningLevel,
 		// 保留随 session abort 取消调用的语义（旧版 llm.ts 同样透传 ctx.signal）
 		signal: ctx.signal,
 		sessionId,

package/src/pure.ts

@@ -2,11 +2,10 @@ import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
-import type { ModelThinkingLevel } from "@earendil-works/pi-ai";
 
 import { isEnoentError } from "@zhushanwen/pi-ext-guards";
 import {
-	isThinkingLevel,
+	normalizeThinkingLevel,
 	loadConfig,
 	normalizeModelSelector,
 	saveConfig,
@@ -40,11 +39,11 @@ export interface RenameSessionConfig {
 	/** 标题最大长度（Unicode 码点数）。 */
 	maxTitleLength: number;
 	/**
-	 * 标题生成 LLM 的 thinking 级别（pi 的 ModelThinkingLevel，THINKING_ORDER SSOT）。
+	 * 标题生成 LLM 的 thinking 级别（字符串透传；合法档位按模型 supportedLevels 在调用点判定）。
 	 * 默认 "off"：不传 pi-ai reasoning（provider 默认行为，与旧版本一致）；
 	 * "minimal"~"max" 透传给 SimpleStreamOptions.reasoning（provider 不支持时静默忽略）。
 	 */
-	thinkingLevel: ModelThinkingLevel;
+	thinkingLevel: string;
 }
 
 // ──────────────────────── 枚举校验 ────────────────────────
@@ -144,9 +143,7 @@ export function normalizeRenameConfig(raw: unknown): RenameSessionConfig {
 	// normalizeModelSelector：llm-shared 导出（ext-simplify-17 D6 收口）
 	const model = normalizeModelSelector(obj.model) ?? DEFAULT_RENAME_CONFIG.model;
 
-	const thinkingLevel = isThinkingLevel(obj.thinkingLevel)
-		? obj.thinkingLevel
-		: DEFAULT_RENAME_CONFIG.thinkingLevel;
+	const thinkingLevel = normalizeThinkingLevel(obj.thinkingLevel) ?? DEFAULT_RENAME_CONFIG.thinkingLevel;
 
 	return { enabled, model, mode, maxTitleLength, thinkingLevel };
 }