@zhushanwen/pi-llm-shared 0.3.1 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-llm-shared",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "Shared LLM invocation library for Pi extensions — model resolution (ref exact only), LLM calling (completeSimple), and config read/write with mtime caching. Shared library, not a Pi extension.",
   "type": "module",
   "main": "src/index.ts",
@@ -18,11 +18,12 @@
     "index.ts"
   ],
   "dependencies": {
-    "@zhushanwen/pi-file-lock": "0.1.1"
+    "@zhushanwen/pi-extension-logger": "0.3.0",
+    "@zhushanwen/pi-file-lock": "0.1.2"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": "*"
+    "@earendil-works/pi-ai": "^0.84.1",
+    "@earendil-works/pi-coding-agent": "^0.84.1"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-ai": {
@@ -33,8 +34,8 @@
     }
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-ai": "^0.84.2",
+    "@earendil-works/pi-coding-agent": "^0.84.2",
     "@vitest/coverage-v8": "^4.1.9",
     "vitest": "^4.1.8"
   },

package/src/__tests__/config.test.ts

@@ -7,15 +7,29 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { clearConfigCache, getConfigPath, loadConfig, saveConfig } from "../config.ts";
 import * as fileLock from "@zhushanwen/pi-file-lock";
 
+// mock 掉共享 logger，使 loggerMock.warn 可被断言（saveConfig 非致命降级路径的留痕）
+const { loggerMock } = vi.hoisted(() => ({
+	loggerMock: { debug: vi.fn(), warn: vi.fn(), error: vi.fn() },
+}));
+vi.mock("@zhushanwen/pi-extension-logger", () => ({
+	getLogger: () => loggerMock,
+	createLogger: () => loggerMock,
+	setPiHandle: vi.fn(),
+}));
+
 // node:fs 的 ESM namespace 不可配置，vi.spyOn 对具名导出失效（vitest 限制）。
-// 用 vi.mock 包装 readFileSync/renameSync（默认走 actual，个别 test override），
-// 其他 fs 操作（writeFileSync/existsSync/statSync/mkdirSync...）原样透传 actual。
+// 用 vi.mock 包装 readFileSync/renameSync/statSync/unlinkSync（默认走 actual，
+// 个别 test override），其他 fs 操作（writeFileSync/existsSync/mkdirSync...）原样
+// 透传 actual。statSync/unlinkSync 供 U4 logger.warn 留痕用例 override。
+// 注意：proper-lockfile（withFileLockSync 内部）走 graceful-fs，不受本 mock 影响。
 vi.mock("node:fs", async (importOriginal) => {
 	const actual = await importOriginal() as typeof import("node:fs");
 	return {
 		...actual,
 		readFileSync: vi.fn(actual.readFileSync),
 		renameSync: vi.fn(actual.renameSync),
+		statSync: vi.fn(actual.statSync),
+		unlinkSync: vi.fn(actual.unlinkSync),
 	};
 });
 
@@ -33,6 +47,9 @@ beforeEach(() => {
 afterEach(() => {
 	vi.mocked(fs.readFileSync).mockClear();
 	vi.mocked(fs.renameSync).mockClear();
+	vi.mocked(fs.statSync).mockClear();
+	vi.mocked(fs.unlinkSync).mockClear();
+	loggerMock.warn.mockClear();
 	rmSync(dir, { recursive: true, force: true });
 	vi.unstubAllEnvs();
 });
@@ -217,6 +234,55 @@ describe("saveConfig", () => {
 		expect(existsSync(join(dir, "config", "eperm-ext-config.json"))).toBe(false);
 	});
 
+	it("U4: rename 成功但写后 stat 失败 → logger.warn 留痕 + 保存仍成功（缓存未更新，下次 load 重读）", () => {
+		// saveConfig 流程内 node:fs 的 statSync 只有写后更新缓存这一次调用
+		// （withFileLockSync 走 graceful-fs，不经过本 mock），once 必命中
+		vi.mocked(fs.statSync).mockImplementationOnce(() => {
+			throw new Error("EACCES: permission denied, stat");
+		});
+
+		const result = saveConfig("statfail", { x: 1 });
+
+		// stat 失败不影响保存成功语义（缓存下次 load 时会重读）
+		expect(result.success).toBe(true);
+		expect(loggerMock.warn).toHaveBeenCalledTimes(1);
+		expect(String(loggerMock.warn.mock.calls[0]![0])).toContain("saveConfig stat after write failed");
+		expect(JSON.stringify(loggerMock.warn.mock.calls[0]![1])).toContain("EACCES");
+		// 文件已落盘（rename 已成功）
+		expect(JSON.parse(readFileSync(join(dir, "config", "statfail-ext-config.json"), "utf-8"))).toEqual({ x: 1 });
+		// 缓存未更新（stat 失败跳过 set）→ 下次 load 重读盘而非命中缓存
+		vi.mocked(fs.readFileSync).mockClear();
+		const loaded = loadConfig("statfail", { a: 0 }, normalize);
+		expect(loaded).toEqual({ a: 0 }); // normalize({x:1}) 不含 a → defaults
+		expect(vi.mocked(fs.readFileSync)).toHaveBeenCalledTimes(1);
+	});
+
+	it("U4: rename 失败且 tmp 清理也失败 → logger.warn 留痕 + {success:false}（清理失败不吞保存失败）", () => {
+		vi.mocked(fs.renameSync).mockImplementationOnce(() => {
+			throw new Error("EPERM: operation not permitted, rename");
+		});
+		// unlinkSync 在本流程内只有 catch 路径的 tmp 清理这一次调用，once 必命中
+		vi.mocked(fs.unlinkSync).mockImplementationOnce(() => {
+			throw new Error("EBUSY: resource busy or locked, unlink");
+		});
+		const onWarning = vi.fn();
+
+		const result = saveConfig("cleanupfail", { x: 1 }, onWarning);
+
+		// 保存失败的返回不被清理失败吞掉
+		expect(result.success).toBe(false);
+		expect(result.error).toContain("EPERM");
+		expect(onWarning).toHaveBeenCalledTimes(1);
+		// tmp 清理失败留痕
+		expect(loggerMock.warn).toHaveBeenCalledTimes(1);
+		expect(String(loggerMock.warn.mock.calls[0]![0])).toContain("saveConfig tmp cleanup failed");
+		expect(JSON.stringify(loggerMock.warn.mock.calls[0]![1])).toContain("EBUSY");
+		// unlink 失败 → tmp 残留（反向证明清理路径确实失败）
+		expect(tmpResidues("cleanupfail")).toHaveLength(1);
+		// 目标文件未被创建（rename 失败）
+		expect(existsSync(join(dir, "config", "cleanupfail-ext-config.json"))).toBe(false);
+	});
+
 	it("saveConfig 多次写同文件 → 每次成功 + 最新内容", () => {
 		expect(saveConfig("test", { v: 1 }).success).toBe(true);
 		expect(saveConfig("test", { v: 2 }).success).toBe(true);

package/src/config.ts

@@ -23,8 +23,11 @@ import { existsSync, mkdirSync, readFileSync, renameSync, statSync, unlinkSync,
 import { dirname, join } from "node:path";
 
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { getLogger } from "@zhushanwen/pi-extension-logger";
 import { withFileLockSync } from "@zhushanwen/pi-file-lock";
 
+const logger = getLogger("llm-shared");
+
 /** JSON 序列化缩进格数（permission/config.ts 同款）。 */
 const JSON_INDENT = 2;
 
@@ -179,10 +182,7 @@ export function saveConfig(
 				});
 			} catch (statErr) {
 				// stat 失败不影响保存成功；缓存下次 load 时会重读
-				console.warn(
-					`[llm-shared] saveConfig stat after write failed:`,
-					statErr instanceof Error ? statErr.message : String(statErr),
-				);
+				logger.warn("saveConfig stat after write failed", { detail: { err: statErr instanceof Error ? statErr.message : String(statErr) } });
 			}
 
 			return { success: true };
@@ -192,10 +192,7 @@ export function saveConfig(
 				if (existsSync(tmpPath)) unlinkSync(tmpPath);
 			} catch (cleanupErr) {
 				// tmp 清理失败不能阻塞保存失败的返回；记录原因
-				console.warn(
-					`[llm-shared] saveConfig tmp cleanup failed:`,
-					cleanupErr instanceof Error ? cleanupErr.message : String(cleanupErr),
-				);
+				logger.warn("saveConfig tmp cleanup failed", { detail: { err: cleanupErr instanceof Error ? cleanupErr.message : String(cleanupErr) } });
 			}
 			const message = error instanceof Error ? error.message : String(error);
 			onWarning?.(`[llm-shared] Failed to save config at '${configPath}': ${message}`);

package/src/index.ts

@@ -2,7 +2,7 @@
 // resolve: 模型解析（仅 ref 精确指定）
 // call: LLM 调用（completeSimple + 凭证 + 文本提取）
 // config: 泛型配置读写（mtime 缓存 + 原子写）
-export { resolveModel, type ModelSelector } from "./resolve.ts";
+export { resolveModel, getCurrentModelId, type ModelSelector } from "./resolve.ts";
 export { callLLM, extractText, type CallLLMOptions, type CallLLMResult } from "./call.ts";
 export { getConfigPath, loadConfig, saveConfig, clearConfigCache } from "./config.ts";
 export { migrateLegacyConfig, type MigrationResult } from "./migrate.ts";

package/src/migrate.ts

@@ -15,6 +15,10 @@
 import { existsSync, mkdirSync, renameSync, unlinkSync } from "node:fs";
 import { dirname, join } from "node:path";
 
+import { getLogger } from "@zhushanwen/pi-extension-logger";
+
+const logger = getLogger("migrate-config");
+
 export interface MigrationResult {
 	migrated: boolean;
 	/** 新路径已存在时已删除旧文件（清理残留副本），true 表示旧文件被删。 */
@@ -39,14 +43,14 @@ export function migrateLegacyConfig(agentDir: string, oldRel: string, newRel: st
 			// pi 运行时只读新路径，旧文件无用。安全前提：session_start 迁移在 pi 进程内、
 			// 用户主动启动时触发（非 postinstall 开发环境误触发；e112a14fc 场景随 session_start 消除）。
 			unlinkSync(oldPath);
-			console.warn(`[migrate-config] new config already exists, removed legacy file: ${oldPath}`);
+			logger.warn("new config already exists, removed legacy file", { detail: { oldPath } });
 			return { migrated: false, removedLegacy: true };
 		}
 		renameSync(oldPath, newPath);
-		console.warn(`[migrate-config] migrated: ${oldPath} -> ${newPath}`);
+		logger.warn("migrated", { detail: { oldPath, newPath } });
 		return { migrated: true };
 	} catch (e) {
-		console.warn(`[migrate-config] migration failed for ${oldPath} -> ${newPath}:`, e);
+		logger.warn("migration failed", { detail: { oldPath, newPath, err: String(e) } });
 		return { migrated: false, error: e };
 	}
 }

package/src/resolve.ts

@@ -44,3 +44,9 @@ function resolveRef(ctx: ExtensionContext, ref: string): Model<Api> | null {
 export function resolveModel(ctx: ExtensionContext, selector: ModelSelector): Model<Api> | null {
 	return resolveRef(ctx, selector.ref);
 }
+
+/** 当前模型的 "provider/modelId" 复合串（model 缺失返回空串）——smart-context 消费口径。 */
+export function getCurrentModelId(model: { provider?: string; id?: string } | undefined | null): string {
+	if (!model) return "";
+	return `${model.provider ?? ""}/${model.id ?? ""}`;
+}