@zhushanwen/pi-rename-session 0.5.2 → 0.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-rename-session",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "type": "module",
   "main": "index.ts",
   "xyz-agent": {
@@ -18,7 +18,8 @@
     "pi-package"
   ],
   "dependencies": {
-    "@zhushanwen/pi-llm-shared": "0.4.0"
+    "@zhushanwen/pi-extension-logger": "0.3.0",
+    "@zhushanwen/pi-llm-shared": "0.4.1"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.1.9",

package/src/__tests__/index.test.ts

@@ -1,5 +1,15 @@
 /* eslint-disable taste/no-unsafe-cast */
 
+// Mock 共享 logger，让 logger.warn/error 可被 spy（源码已从 console 改为 logger）
+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(),
+}));
+
 import type { Api, Model } from "@earendil-works/pi-ai";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
@@ -135,19 +145,20 @@ function fire(setup: MockSetup, ctx: ExtensionContext, message?: unknown): Promi
 	) as Promise<void>;
 }
 
-/** 开 debug 开关 + 静音 warn，返回 spy 供日志断言（还原由顶层 afterEach 统一负责）。 */
-function debugWarnSpy(): ReturnType<typeof vi.spyOn> {
+/** 开 debug 开关 + 清空 warn mock，返回 loggerMock.warn 供日志断言（还原由顶层 afterEach 统一负责）。 */
+function debugWarnSpy(): ReturnType<typeof vi.fn> {
 	vi.stubEnv("XYZ_AGENT_DEBUG", "1");
-	return vi.spyOn(console, "warn").mockImplementation(() => {});
+	loggerMock.warn.mockClear();
+	return loggerMock.warn;
 }
 
 /** warn spy 的全部调用文本行（debug 日志断言用）。 */
-function warnLines(warnSpy: ReturnType<typeof vi.spyOn>): string[] {
+function warnLines(warnSpy: ReturnType<typeof vi.fn>): string[] {
 	return warnSpy.mock.calls.map((c) => String(c[0]));
 }
 
 /** 拼接 warn spy 的全部调用为单行文本（debug 日志断言用）。 */
-function warnText(warnSpy: ReturnType<typeof vi.spyOn>): string {
+function warnText(warnSpy: ReturnType<typeof vi.fn>): string {
 	return warnLines(warnSpy).join("\n");
 }
 
@@ -183,9 +194,9 @@ describe("renameSessionExtension", () => {
 		expect(setup.setSessionNameMock).not.toHaveBeenCalled();
 	});
 
-	it("TC15: getEntries 抛错时 handler 不抛（catch console.error）", async () => {
+	it("TC15: getEntries 抛错时 handler 不抛（catch logger.error）", async () => {
 		vi.mocked(loadRenameConfig).mockReturnValue(ENABLED_CONFIG);
-		const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+		loggerMock.error.mockClear();
 		const ctx = {
 			sessionManager: {
 				getEntries: () => {
@@ -199,9 +210,8 @@ describe("renameSessionExtension", () => {
 
 		await expect(fire(setup, ctx)).resolves.toBeUndefined();
 
-		expect(errorSpy).toHaveBeenCalled();
+		expect(loggerMock.error).toHaveBeenCalled();
 		expect(setup.setSessionNameMock).not.toHaveBeenCalled();
-		errorSpy.mockRestore();
 	});
 
 	// ────────────────────────────────────────────────────
@@ -221,7 +231,7 @@ describe("renameSessionExtension", () => {
 			const expected = `turnIndex=${FIRE_TURN_INDEX} skip: stopReason=${String(r)}`;
 			expect(warnText(warnSpy)).toContain(expected);
 			const line = warnLines(warnSpy).find((l) => l.includes(`skip: stopReason=${String(r)}`));
-			expect(line).toMatch(/^\[rename-session\] t=\d{4}-\d{2}-\d{2}T/);
+			expect(line).toMatch(/^t=\d{4}-\d{2}-\d{2}T/);
 		}
 
 		expect(resolveModel).not.toHaveBeenCalled();
@@ -360,13 +370,12 @@ describe("renameSessionExtension", () => {
 		vi.mocked(loadRenameConfig).mockReturnValue(ENABLED_CONFIG);
 		vi.mocked(resolveModel).mockReturnValue(STUB_MODEL);
 		vi.mocked(callLLM).mockRejectedValue(new Error("llm down"));
-		const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+		loggerMock.error.mockClear();
 
 		await expect(fire(setup, createMockCtx())).resolves.toBeUndefined();
 		await vi.waitFor(() => expect(callLLM).toHaveBeenCalledTimes(1));
 
 		expect(setup.setSessionNameMock).not.toHaveBeenCalled();
-		errorSpy.mockRestore();
 	});
 
 	it("LTC13: 首 turn 判定（成功 assistant 回复数 !== 1）→ 不调 resolveModel", async () => {
@@ -419,9 +428,9 @@ describe("renameSessionExtension", () => {
 
 		const renamedIdx = warnLines(warnSpy).findIndex((l) => l.includes('renamed to "自动生成的标题"'));
 		expect(renamedIdx).toBeGreaterThanOrEqual(0);
-		// handler 侧日志契约（C3）：[rename-session] + t=<ISO> + turnIndex=<n> + renamed to "<title>"
+		// handler 侧日志契约（C3）：t=<ISO> + turnIndex=<n> + renamed to "<title>"（[rename-session] 前缀由共享 logger 自动补）
 		expect(String(warnSpy.mock.calls[renamedIdx][0])).toMatch(
-			new RegExp(`^\\[rename-session\\] t=\\d{4}-\\d{2}-\\d{2}T.* turnIndex=${FIRE_TURN_INDEX} renamed to "自动生成的标题"$`),
+			new RegExp(`^t=\\d{4}-\\d{2}-\\d{2}T.* turnIndex=${FIRE_TURN_INDEX} renamed to "自动生成的标题"$`),
 		);
 		// 移位契约（时序）：日志调用序晚于 setSessionName——先落库后报捷
 		expect(warnSpy.mock.invocationCallOrder[renamedIdx]).toBeGreaterThan(
@@ -436,7 +445,8 @@ describe("renameSessionExtension", () => {
 	it("TC9: XYZ_AGENT_DEBUG 未设 → 全流程 7 条 debug 契约文案零输出（既有 A1 日志除外）", async () => {
 		// 显式清除（防宿主环境泄漏 XYZ_AGENT_DEBUG 影响判定）
 		vi.stubEnv("XYZ_AGENT_DEBUG", undefined);
-		const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+		loggerMock.warn.mockClear();
+		const warnSpy = loggerMock.warn;
 		vi.mocked(loadRenameConfig).mockReturnValue(ENABLED_CONFIG);
 		vi.mocked(resolveModel).mockReturnValue(STUB_MODEL);
 

package/src/__tests__/llm.test.ts

@@ -1,5 +1,15 @@
 /* eslint-disable taste/no-unsafe-cast */
 
+// Mock 共享 logger，让 logger.warn/error 可被 spy（源码已从 console 改为 logger）
+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(),
+}));
+
 import type { Api, Model } from "@earendil-works/pi-ai";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
@@ -245,14 +255,15 @@ describe("RENAME_SYSTEM_PROMPT / RENAME_INSTRUCTION", () => {
 // callRenameLLM（mock resolveModel + callLLM @ llm-shared 边界）
 // ────────────────────────────────────────────────────
 
-/** 开 debug 开关 + 静音 warn，返回 spy 供日志断言（还原由顶层 afterEach 统一负责）。 */
-function debugWarnSpy(): ReturnType<typeof vi.spyOn> {
+/** 开 debug 开关 + 清空 warn mock，返回 loggerMock.warn 供日志断言（还原由顶层 afterEach 统一负责）。 */
+function debugWarnSpy(): ReturnType<typeof vi.fn> {
 	vi.stubEnv("XYZ_AGENT_DEBUG", "1");
-	return vi.spyOn(console, "warn").mockImplementation(() => {});
+	loggerMock.warn.mockClear();
+	return loggerMock.warn;
 }
 
 /** warn spy 的全部调用文本行（debug 日志断言用）。 */
-function warnLines(warnSpy: ReturnType<typeof vi.spyOn>): string[] {
+function warnLines(warnSpy: ReturnType<typeof vi.fn>): string[] {
 	return warnSpy.mock.calls.map((c) => String(c[0]));
 }
 
@@ -480,9 +491,9 @@ describe("callRenameLLM", () => {
 
 		expect(result).toBeNull();
 		expect(callLLM).not.toHaveBeenCalled();
-		// C3 契约：[rename-session] + t=<ISO>（llm.ts 侧不含 turnIndex）
+		// C3 契约：t=<ISO>（llm.ts 侧不含 turnIndex；[rename-session] 前缀由共享 logger prefixMsg 自动补，spy 捕获原始入参）
 		const line = warnLines(warnSpy).find((l) => l.includes("skip: no user prompt"));
-		expect(line).toMatch(/^\[rename-session\] t=\d{4}-\d{2}-\d{2}T/);
+		expect(line).toMatch(/^t=\d{4}-\d{2}-\d{2}T/);
 	});
 
 	it("TC7: callLLM ok:false（超时/模型错误）→ 返回 null 不抛错（失败归一静默跳过）", async () => {
@@ -501,7 +512,7 @@ describe("callRenameLLM", () => {
 		expect(result).toBeNull();
 		// 该日志在 cleanTitle 清洗为空、返回 null 前打出（7 条契约文案之一）
 		const line = warnLines(warnSpy).find((l) => l.includes("skip: title empty"));
-		expect(line).toMatch(/^\[rename-session\] t=\d{4}-\d{2}-\d{2}T/);
+		expect(line).toMatch(/^t=\d{4}-\d{2}-\d{2}T/);
 	});
 
 	it("maxTitleLength 截断生效（config.maxTitleLength 透传给 cleanTitle）", async () => {
@@ -548,65 +559,50 @@ describe("callRenameLLM A1 日志", () => {
 	});
 
 	it("TC1: resolveModel null → console 输出 '[rename-session] model not available, skipping'，返回 null", async () => {
-		const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
-		try {
-			vi.mocked(resolveModel).mockReturnValue(null);
-			const result = await callRenameLLM(createCtx(), BASE_CONFIG, FINAL_MESSAGE);
-			expect(result).toBeNull();
-			expect(warnSpy).toHaveBeenCalledWith("[rename-session] model not available, skipping");
-		} finally {
-			warnSpy.mockRestore();
-		}
+		loggerMock.warn.mockClear();
+		vi.mocked(resolveModel).mockReturnValue(null);
+		const result = await callRenameLLM(createCtx(), BASE_CONFIG, FINAL_MESSAGE);
+		expect(result).toBeNull();
+		expect(loggerMock.warn).toHaveBeenCalledWith("model not available, skipping");
 	});
 
 	it("TC2: callLLM {ok:false} → console 输出 '[rename-session] rename LLM call failed: <error>'，返回 null", async () => {
-		const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
-		try {
-			vi.mocked(resolveModel).mockReturnValue(STUB_MODEL);
-			vi.mocked(callLLM).mockResolvedValue({ ok: false, error: "boom", recoverable: true });
-			const result = await callRenameLLM(createCtx(), BASE_CONFIG, FINAL_MESSAGE);
-			expect(result).toBeNull();
-			expect(warnSpy).toHaveBeenCalledWith("[rename-session] rename LLM call failed: boom");
-		} finally {
-			warnSpy.mockRestore();
-		}
+		loggerMock.warn.mockClear();
+		vi.mocked(resolveModel).mockReturnValue(STUB_MODEL);
+		vi.mocked(callLLM).mockResolvedValue({ ok: false, error: "boom", recoverable: true });
+		const result = await callRenameLLM(createCtx(), BASE_CONFIG, FINAL_MESSAGE);
+		expect(result).toBeNull();
+		expect(loggerMock.warn).toHaveBeenCalledWith("rename LLM call failed", { error: "boom" });
 	});
 
 	it("TC2b: callLLM {ok:false} → 不输出 'rename with model' 成功日志（B2 位置修正：成功日志已移到 result.ok 分支后），但仍输出 failed 日志", async () => {
-		const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
-		try {
-			vi.mocked(resolveModel).mockReturnValue(STUB_MODEL);
-			vi.mocked(callLLM).mockResolvedValue({ ok: false, error: "boom", recoverable: true });
-			const result = await callRenameLLM(createCtx(), BASE_CONFIG, FINAL_MESSAGE);
-			expect(result).toBeNull();
-			// 失败分支仍输出 failed 日志
-			expect(warnSpy).toHaveBeenCalledWith(
-				"[rename-session] rename LLM call failed: boom",
-			);
-			// 失败分支不应输出成功日志（B2：成功日志移到 result.ok=true 之后）
-			const successLogCalls = warnSpy.mock.calls.filter((c) =>
-				String(c[0]).includes("rename with model"),
-			);
-			expect(successLogCalls).toHaveLength(0);
-		} finally {
-			warnSpy.mockRestore();
-		}
+		loggerMock.warn.mockClear();
+		vi.mocked(resolveModel).mockReturnValue(STUB_MODEL);
+		vi.mocked(callLLM).mockResolvedValue({ ok: false, error: "boom", recoverable: true });
+		const result = await callRenameLLM(createCtx(), BASE_CONFIG, FINAL_MESSAGE);
+		expect(result).toBeNull();
+		// 失败分支仍输出 failed 日志
+		expect(loggerMock.warn).toHaveBeenCalledWith(
+			"rename LLM call failed",
+			{ error: "boom" },
+		);
+		// 失败分支不应输出成功日志（B2：成功日志移到 result.ok=true 之后）
+		const successLogCalls = loggerMock.warn.mock.calls.filter((c) =>
+			String(c[0]).includes("rename with model"),
+		);
+		expect(successLogCalls).toHaveLength(0);
 	});
 
 	it("TC3: callLLM 成功 → 默认不输出 'rename with model'（避免常开日志污染 Pi 输入框），返回标题", async () => {
-		const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
-		try {
-			vi.mocked(resolveModel).mockReturnValue(STUB_MODEL);
-			vi.mocked(callLLM).mockResolvedValue({ ok: true, content: "修复登录bug" });
-			const result = await callRenameLLM(createCtx(), BASE_CONFIG, FINAL_MESSAGE);
-			expect(result).toBe("修复登录bug");
-			const successLogCalls = warnSpy.mock.calls.filter((c) =>
-				String(c[0]).includes("rename with model"),
-			);
-			expect(successLogCalls).toHaveLength(0);
-		} finally {
-			warnSpy.mockRestore();
-		}
+		loggerMock.warn.mockClear();
+		vi.mocked(resolveModel).mockReturnValue(STUB_MODEL);
+		vi.mocked(callLLM).mockResolvedValue({ ok: true, content: "修复登录bug" });
+		const result = await callRenameLLM(createCtx(), BASE_CONFIG, FINAL_MESSAGE);
+		expect(result).toBe("修复登录bug");
+		const successLogCalls = loggerMock.warn.mock.calls.filter((c) =>
+			String(c[0]).includes("rename with model"),
+		);
+		expect(successLogCalls).toHaveLength(0);
 	});
 
 	it("TC3b: debug 开启 + callLLM 成功 → 输出 'rename with model <provider>/<modelId>'（B3 带 provider 前缀），返回标题", async () => {
@@ -617,7 +613,7 @@ describe("callRenameLLM A1 日志", () => {
 		expect(result).toBe("修复登录bug");
 		const line = warnLines(warnSpy).find((l) => l.includes("rename with model"));
 		expect(line).toMatch(
-			/^\[rename-session\] t=\d{4}-\d{2}-\d{2}T.*rename with model stub\/stub-model/,
+			/^t=\d{4}-\d{2}-\d{2}T.*rename with model stub\/stub-model/,
 		);
 	});
 });

package/src/index.ts

@@ -1,9 +1,12 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { getLogger } from "@zhushanwen/pi-extension-logger";
 
 import { registerAutoRenameCommand } from "./commands.js";
 import { callRenameLLM, debugLog as llmDebugLog, isSubagentSession } from "./llm.js";
 import { countSuccessfulAssistantReplies, loadRenameConfig } from "./pure.js";
 
+const logger = getLogger("rename-session");
+
 /**
  * turn_end 事件的宽松类型（参考 pi extensions/types.ts 的 TurnEndEvent）。
  * message 收紧为带 stopReason 的宽松结构（D2 快速路径读取），不依赖 pi 类型导出。
@@ -73,13 +76,13 @@ export default function renameSessionExtension(pi: ExtensionAPI): void {
 					// 防覆盖 return 在前，竞态命中时本日志不出现，避免「日志称 renamed 但未落库」）
 					debugLog(`renamed to "${title}"`);
 				})
-				.catch((e) => console.error("[pi-rename-session] rename LLM failed:", e));
+				.catch((e) => logger.error("rename LLM failed", { error: String(e) }));
 			// rename 是 best-effort，任何 LLM 失败（网络/提取/auth/model 不可用）都静默跳过保留原 label，
 			// 不进 session history。
 		} catch (e) {
 			// best-effort 降级：turn_end handler 同步部分（开关/subagent/判定）抛错时记录但不阻断
 			// agent 循环——rename 是非关键副作用，任何失败不得干扰主对话。
-			console.error("[pi-rename-session] failed:", e);
+			logger.error("failed", { error: String(e) });
 		}
 	});
 }

package/src/llm.ts

@@ -2,10 +2,13 @@ import path from "node:path";
 
 import type { AssistantMessage, Message } from "@earendil-works/pi-ai";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { getLogger } from "@zhushanwen/pi-extension-logger";
 import { callLLM, resolveModel } from "@zhushanwen/pi-llm-shared";
 
 import { type RenameSessionConfig, cleanTitle } from "./pure.js";
 
+const logger = getLogger("rename-session");
+
 // ──────────────────────── prompt 常量 ────────────────────────
 
 /**
@@ -161,7 +164,7 @@ export function isRenameDebugEnabled(): boolean {
  */
 export function debugLog(message: string): void {
 	if (isRenameDebugEnabled()) {
-		console.warn(`[rename-session] t=${new Date().toISOString()} ${message}`);
+		logger.warn(`t=${new Date().toISOString()} ${message}`);
 	}
 }
 
@@ -221,7 +224,7 @@ export async function callRenameLLM(
 	const model = resolveModel(ctx, config.model);
 	if (!model) {
 		// A1 日志：不可用不静默（可排查）
-		console.warn("[rename-session] model not available, skipping");
+		logger.warn("model not available, skipping");
 		return null;
 	}
 
@@ -266,7 +269,7 @@ export async function callRenameLLM(
 	});
 	if (!result.ok) {
 		// A1 失败路径日志：调用失败不静默（不抛错，靠日志留痕）。
-		console.warn(`[rename-session] rename LLM call failed: ${result.error ?? "unknown error"}`);
+		logger.warn("rename LLM call failed", { error: result.error ?? "unknown error" });
 		return null;
 	}