@zhushanwen/pi-smart-context 0.1.4 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-smart-context",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "type": "module",
   "main": "index.ts",
   "xyz-agent": {
@@ -37,7 +37,7 @@
   ],
   "dependencies": {
     "@zhushanwen/pi-extension-logger": "0.4.1",
-    "@zhushanwen/pi-llm-shared": "0.5.1"
+    "@zhushanwen/pi-llm-shared": "0.6.0"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.1.9",

package/src/__tests__/compact-handler.test.ts

@@ -43,14 +43,17 @@ function makeEvent(overrides?: Partial<BeforeCompactLikeEvent["preparation"]>):
 	};
 }
 
-function makeCtx(): ExtensionContext {
+function makeCtx(crossModel?: { provider: string; id: string } | null): ExtensionContext {
 	return {
 		model: { provider: "zai", id: "glm" },
 		getSystemPrompt: () => "sys",
 		sessionManager: { getSessionId: () => "s1", getSessionFile: () => "/tmp/s1.jsonl" },
 		modelRegistry: {
 			getApiKeyAndHeaders: async () => ({ ok: true, apiKey: "k" }),
-			find: () => null,
+			// resolveRef 精确匹配：仅 (provider,id) 同时命中时返回模型（配合 hasConfiguredAuth 放行）
+			find: (provider: string, id: string) =>
+				crossModel && provider === crossModel.provider && id === crossModel.id ? crossModel : null,
+			hasConfiguredAuth: () => crossModel != null,
 		},
 	} as unknown as ExtensionContext;
 }
@@ -84,11 +87,12 @@ describe("session_before_compact 接管 handler", () => {
 		expect(mockedCall).not.toHaveBeenCalled();
 	});
 
-	it("same-model 成功 → compaction 带 engine/mode 标记 + preamble + fileOps 清单 + transcript 指针", async () => {
+	it("same-model 成功 → compaction 带 engine/mode/model 标记 + preamble + fileOps 清单 + transcript 指针", async () => {
 		mockedCall.mockResolvedValue({ ok: true, text: "summary body", usage: { input: 1, output: 2 } });
 		const { handler } = makeHandler(normalizeSmartContextConfig({ compactModel: { type: "ref", ref: "" } }));
 		const decision = await handler(makeEvent(), makeCtx());
-		expect(decision.compaction?.details).toEqual({ engine: "smart-context", mode: "same-model" });
+		// details.model = `${ctx.model.provider}/${ctx.model.id}`（§3.3 ①，用量归属数据源）
+		expect(decision.compaction?.details).toEqual({ engine: "smart-context", mode: "same-model", model: "zai/glm" });
 		expect(decision.compaction?.summary).toContain("summary body");
 		// D13-9 preamble 在最前；D11-2 fileOps；D13-4 transcript
 		expect(decision.compaction?.summary.startsWith("This is an automatically generated checkpoint")).toBe(true);
@@ -115,6 +119,32 @@ describe("session_before_compact 接管 handler", () => {
 		expect(mockedNative).not.toHaveBeenCalled();
 	});
 
+	it("cross-model 成功 → details.model=compactModel 解析结果，native details 字段保留", async () => {
+		mockedNative.mockResolvedValue({
+			summary: "native checkpoint",
+			firstKeptEntryId: "kept-1",
+			tokensBefore: 500_000,
+			usage: {
+				input: 5, output: 6, cacheRead: 0, cacheWrite: 0, totalTokens: 11,
+				cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
+			},
+			details: { nativeMarker: "keep" },
+		});
+		const { handler } = makeHandler(
+			normalizeSmartContextConfig({ compactModel: { type: "ref", ref: "xiaomi/mimo" } }),
+		);
+		const decision = await handler(makeEvent(), makeCtx({ provider: "xiaomi", id: "mimo" }));
+		// details.model = `${resolveModel(...).provider}/${id}`（§3.3 ①）；native details 字段原样保留（spread 增量，不改变其他字段）
+		expect(decision.compaction?.details).toEqual({
+			engine: "smart-context",
+			mode: "cross-model",
+			model: "xiaomi/mimo",
+			nativeMarker: "keep",
+		});
+		// nativeCompact 收到的 model 就是解析结果（details.model 与实际执行模型同源）
+		expect(mockedNative.mock.calls[0][1]).toEqual({ provider: "xiaomi", id: "mimo" });
+	});
+
 	it("收缩校验失败（摘要 ≥ 被压段）→ 拒绝 + 同段记录不重试（D13-1）", async () => {
 		mockedCall.mockResolvedValue({ ok: true, text: "z".repeat(10_000) });
 		const { handler, state } = makeHandler(normalizeSmartContextConfig({}));

package/src/compact-handler.ts

@@ -6,7 +6,9 @@
  * - same-model 模式：完整上下文 + 会话原 system prompt + tools + 末尾追加压缩指令（kv-cache 前缀命中）
  * - cross-model 模式：直接调用包导出的 compact(preparation, 压缩Model, ...)（原生组装零复刻，R4 结论）
  *
- * 输出 CompactionResult.details 携带 {engine:"smart-context", mode} 标记（D1 entry 标记）。
+ * 输出 CompactionResult.details 携带 {engine:"smart-context", mode, model} 标记（D1 entry 标记）。
+ * model = `${model.provider}/${model.id}`（执行压缩的实际模型）——用量页 compaction 归属数据源
+ * （usage-page-fixes §3.3 ①）；pi appendCompaction 对 details 逐字透传落盘（pi-semantics PS-28）。
  */
 
 import { buildSessionContext, compact as nativeCompact, convertToLlm } from "@earendil-works/pi-coding-agent";
@@ -93,6 +95,8 @@ function warnLog(message: string, data?: unknown): void {
 export interface SmartContextDetails {
 	engine: "smart-context";
 	mode: "same-model" | "cross-model";
+	/** 执行压缩的模型 `${provider}/${modelId}`（用量归属数据源，usage-page-fixes §3.3 ①）。 */
+	model: string;
 }
 
 /** sessionManager 上会话文件字段/方法的宽松形状（D13-4，消费侧可选链兜底）。 */
@@ -219,7 +223,11 @@ async function generateSameMode(
 		firstKeptEntryId: event.preparation.firstKeptEntryId,
 		tokensBefore: event.preparation.tokensBefore,
 		usage: result.usage as CompactionResult["usage"],
-		details: { engine: "smart-context", mode: "same-model" } satisfies SmartContextDetails,
+		details: {
+			engine: "smart-context",
+			mode: "same-model",
+			model: `${model.provider}/${model.id}`,
+		} satisfies SmartContextDetails,
 	};
 }
 
@@ -266,7 +274,12 @@ async function generateCrossMode(
 	// D13-2：原生 compact 内部对截断的处理沿用原生语义；此处补 engine 标记
 	return {
 		...result,
-		details: { ...(result.details as object | undefined), engine: "smart-context", mode: "cross-model" } as SmartContextDetails,
+		details: {
+			...(result.details as object | undefined),
+			engine: "smart-context",
+			mode: "cross-model",
+			model: `${model.provider}/${model.id}`,
+		} as SmartContextDetails,
 	};
 }