Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/cache-ledger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -478,13 +478,29 @@ export function noteInboundMessages(session: Session, msgs: CoreMessage[]): void
const fps: string[] = [];
const meta: { role: string; len: number; cls: string }[] = [];
for (const m of msgs) {
const j = JSON.stringify(m);
// #4054: fingerprint CLIENT bytes only — drop bili's projected meter first.
const j = JSON.stringify(stripProjectedMeter(m));
fps.push(createHash("sha256").update(j).digest("hex").slice(0, 16));
meta.push({ role: String((m as { role?: unknown }).role ?? "?"), len: j.length, cls: inboundMessageClass(m) });
}
transient.inBody = { msgs: msgs.length, fps, meta };
}

/** #4054: strip the top-level projected thinking-token meter so the inbound
* fingerprint reflects CLIENT bytes only. `thinkingTokens`' sole producer is
* bili's own #1320 projection (`projectThinkingMass`, budget.ts:175) — no wire
* codec fills it from client bytes — so any change between two requests is by
* definition NOT a client change and must not drive the #3023 client arm. */
function stripProjectedMeter(m: CoreMessage): unknown {
const r = m as unknown as Record<string, unknown>;
if (!("thinkingTokens" in r)) return m;
const rest: Record<string, unknown> = {};
for (const key of Object.keys(r)) {
if (key !== "thinkingTokens") rest[key] = r[key];
}
return rest;
}

function inboundMessageClass(m: CoreMessage): string {
const r = m as unknown as Record<string, unknown>;
if (r.tool_calls !== undefined || r.tool_use !== undefined) return "tool-call";
Expand Down
74 changes: 74 additions & 0 deletions tests/issue4054-cache-metering.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
// #4054: the cache report (/acp-cache, web session page) booked a cache break as
// prov:"client" (clientInserts+1) when the ONLY inbound change between two requests
// was bili's own projected thinking-token meter (#1320 projectThinkingMass). The
// #3023 client arm fingerprints each inbound message's full JSON; a fluctuating meter
// flipped a mid-history message's fingerprint and handed a SEPARATE outbound break to
// the client bucket, masking the real cause. Fix: noteInboundMessages strips the
// top-level thinkingTokens before hashing, so the client view reflects client bytes
// only (the field's sole writer is budget.ts:175 — no wire codec fills it).
// Split from #4042: the three end-to-end cases below are adopted VERBATIM from
// #4042's attached cache-metering fixture (loopback-only, no network); the fourth is
// a direct pin on the fingerprint itself.
import { test } from "node:test";
import assert from "node:assert/strict";
import type { BiliMessage } from "acp-kernel/wire";
import type { Session } from "../src/session.ts";
import { getCacheLedger, noteForwardedBody, noteInboundMessages, settleUsageReport } from "../src/cache-ledger.ts";

function session(): Session {
return {
id: "synthetic-metering-fixture", metadata: {}, stats: {},
state: { blocks: [], messageRefs: { byRaw: {}, byRef: {} }, tokenSnapshot: {} },
} as unknown as Session;
}
function inbound(tokens: number, signature = "synthetic-fixed-signature"): BiliMessage[] {
return [
{ id: "fixture-a", role: "user", contentType: "text", text: "a", wireIndex: 0 },
{ id: "fixture-b", role: "assistant", contentType: "reasoning", text: "", thinkingSignature: signature, thinkingTokens: tokens, wireIndex: 1 },
{ id: "fixture-c", role: "user", contentType: "text", text: "c", wireIndex: 2 },
];
}
function sample(s: Session, messages: BiliMessage[], middleWire: string, cached: number): void {
noteInboundMessages(s, messages);
noteForwardedBody(s, JSON.stringify({ model: "synthetic-fixture", messages: ["a", middleWire, "c"].map(content => ({ role: "user", content })) }));
// Synthetic usage only. No network, provider SDK, or real model is involved.
settleUsageReport(s, { total: 100_000, reportedCached: cached, output: 0, protocol: "openai", upstream: "http://fixture.invalid" });
}

test("generated thinkingTokens must not alone establish client origin of a separate outbound break", () => {
const s = session();
sample(s, inbound(10), "before-outbound", 99_000);
sample(s, inbound(20), "changed-outbound", 20_000);
const ledger = getCacheLedger(s);
assert(ledger.lines.at(-1)!.tr > 8192, "actual unexplained miss must remain recorded");
assert.equal(ledger.agg.clientInserts, 0, "proxy-owned metering is not client-origin evidence");
assert.equal(ledger.lines.at(-1)?.prov, undefined);
});

test("metering change with identical outbound bytes does not itself trigger client attribution", () => {
const s = session();
sample(s, inbound(10), "same-outbound", 99_000);
sample(s, inbound(20), "same-outbound", 20_000);
assert.equal(getCacheLedger(s).agg.clientInserts, 0);
});

test("real signature changes remain detectable when outbound bytes also diverge", () => {
const s = session();
sample(s, inbound(10, "synthetic-signature-before"), "before-outbound", 99_000);
sample(s, inbound(20, "synthetic-signature-after"), "changed-outbound", 20_000);
assert.equal(getCacheLedger(s).agg.clientInserts, 1);
assert.equal(getCacheLedger(s).lines.at(-1)?.prov, "client");
});

// Direct pin on the mechanism: the per-message fingerprint must be INVARIANT to
// thinkingTokens fluctuation — the exact property the three end-to-end cases above
// exercise through detectSeam. Nails the strip even if the attribution path reshapes.
test("inbound fingerprint is immune to projected thinkingTokens fluctuation", () => {
const s = session();
noteInboundMessages(s, inbound(10));
const before = [...(s.transient?.inBody?.fps ?? [])];
noteInboundMessages(s, inbound(20));
const after = s.transient?.inBody?.fps ?? [];
assert.equal(before.length, 3, "all three messages fingerprinted");
assert.deepEqual(after, before, "fingerprint array unchanged when only bili's projected meter moves");
});
Loading