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
12 changes: 10 additions & 2 deletions src/cache-ledger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,9 @@ const INBOUND_MSG_CAP = 8192;
* the outbound body diverges mid-list. */
export interface InboundSlot {
msgs: number;
/** sha256-16 of each message's canonical JSON, in list order. */
/** sha256-16 of each message's JSON minus bili-generated fields
* (thinkingTokens, #4054 — its only producer is the #1320 projection,
* so it must never read as client-origin evidence), in list order. */
fps: string[];
/** Parallel to `fps`: role + JSON length + coarse content class of each
* message, recorded so a divergent index can report WHAT the client
Expand All @@ -478,7 +480,13 @@ 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: thinkingTokens has exactly one producer — bili's own #1320
// projection (projectThinkingMass mutates these same objects before
// capture) — so a meter delta must never read as client-origin
// evidence. Strip the TOP-LEVEL field only before fingerprinting
// (nested client content that happens to use the name is untouched);
// the fast path keeps zero overhead when the field is absent.
const j = m.thinkingTokens !== undefined ? JSON.stringify({ ...m, thinkingTokens: undefined }) : JSON.stringify(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) });
}
Expand Down
76 changes: 76 additions & 0 deletions tests/issue4054-cache-meter-client-attribution.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
// #4054: bili's own #1320 thinking-mass projection must not read as
// client-origin evidence for the #3023 seam-attribution arm. The first three
// cases are the synthetic fixtures shipped in the #4042 report bundle
// (cache-metering.test.ts) verbatim — they were RED on master bc4a3f87e and
// pin the settle-side behavior; the last two pin the capture-side invariant
// directly.
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" });
}
function inboundFps(s: Session): string[] {
const t = s as unknown as { transient?: { inBody?: { fps?: string[] } } };
return t.transient?.inBody?.fps ?? [];
}

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");
});

test("inbound fingerprints are immune to projected thinkingTokens deltas", () => {
const a = session();
const b = session();
noteInboundMessages(a, inbound(10));
noteInboundMessages(b, inbound(20));
assert.deepEqual(inboundFps(b), inboundFps(a));
});

test("real signature changes still flip the inbound fingerprint", () => {
const a = session();
const b = session();
noteInboundMessages(a, inbound(10, "synthetic-signature-before"));
noteInboundMessages(b, inbound(10, "synthetic-signature-after"));
assert.notDeepEqual(inboundFps(b), inboundFps(a));
});
Loading