fix(claude): cache a tool loop's final tool results with the 4th breakpoint

A tool loop's request ends with the results of the last assistant
turn's tool calls -- after that turn's breakpoint, so they are billed
as uncached input and written to cache only by the next request.
When the final user turn carries tool_result blocks and the 4-marker
budget has room, markFinalToolResults puts a 5m breakpoint on its
last cacheable block, in both prepareClaudeRequest and
anchorClaudeCache. Never exceeds 4 markers; requests ending with a
typed user message are unchanged.
This commit is contained in:
Daniel Imaino authored and decolua committed 2026-10-01 10:18:26 +07:00
1 parent dec820b97e
commit 49c761cd67
3 files changed
+104

No files matched your search

+21
View File
@@ -346,6 +346,21 @@ function markLastCacheableBlock(msg) {
return false;
}
// In an agent's tool loop, a request ends with the results of the last
// assistant turn's tool calls -- after that turn's breakpoint. They go at the
// full input price, and the next request (which appends to them) writes them
// into the cache. When the 4-marker budget has room, a 5m breakpoint on that
// final user turn caches them now, and the next request reads them.
function markFinalToolResults(body) {
const messages = body?.messages;
const last = Array.isArray(messages) ? messages[messages.length - 1] : null;
if (last?.role !== ROLE.USER || !Array.isArray(last.content)) return false;
if (!last.content.some((block) => block?.type === CLAUDE_BLOCK.TOOL_RESULT)) return false;
if (last.content.some((block) => block?.cache_control)) return false;
if (countCacheControlBlocks(body) >= 4) return false;
return markLastCacheableBlock(last);
}
// Re-anchor cache breakpoints on a Claude passthrough body (same policy as
// prepareClaudeRequest): last tool + last system block at 1h, last assistant at 5m.
// The client's own markers point at pre-normalization offsets, so they are dropped.
@@ -415,6 +430,9 @@ export function anchorClaudeCache(body) {
anchored = markLastCacheableBlock(body.messages[i]);
}
}
// ...and a tool loop's final tool results, so the next step reads them.
markFinalToolResults(body);
}
return body;
@@ -672,6 +690,9 @@ export function prepareClaudeRequest(body, provider = null, apiKey = null, conne
body = hoistToolResultImages(body);
}
// A tool loop's final tool results: cached now, so the next step reads them.
markFinalToolResults(body);
// Apply cloaking for OAuth tokens (billing header + fake user ID)
// session_id in user_id must match X-Claude-Code-Session-Id for fingerprint consistency
if ((provider === "claude" || provider?.startsWith("anthropic-compatible")) && apiKey) {
@@ -40,6 +40,9 @@ exports[`GOLDEN request: OpenAI → Claude > full body (system/image/tool/tool_r
{
"content": [
{
"cache_control": {
"type": "ephemeral",
},
"content": "sunny",
"tool_use_id": "call_1",
"type": "tool_result",
@@ -0,0 +1,80 @@
// A tool loop's request ends with the last assistant turn's tool results, after that turn's
// breakpoint: without a 4th breakpoint on them they go at the full input price, and are written
// into the cache only by the next request, which appends to them.
import { describe, it, expect } from "vitest";
import { anchorClaudeCache, prepareClaudeRequest } from "../../open-sse/translator/formats/claude.js";
const CC = { type: "ephemeral" };
const text = (t, extra = {}) => ({ type: "text", text: t, ...extra });
const tool = (name, extra = {}) => ({ name, description: "d", input_schema: { type: "object", properties: {} }, ...extra });
const use = (id) => ({ role: "assistant", content: [text("Reading."), { type: "tool_use", id, name: "read_file", input: { path: "a" } }] });
const result = (id, content = "file") => ({ type: "tool_result", tool_use_id: id, content });
function markers(body) {
const out = [];
(body.system || []).forEach((b, i) => b?.cache_control && out.push(`system[${i}]`));
(body.tools || []).forEach((t, i) => t?.cache_control && out.push(`tools[${i}]`));
(body.messages || []).forEach((m, i) => Array.isArray(m?.content) && m.content.forEach((b, j) => b?.cache_control && out.push(`messages[${i}].${j}`)));
return out;
}
const loop = () => ({
model: "claude-sonnet-4-5",
max_tokens: 1024,
system: [text("You are an agent.")],
tools: [tool("read_file"), tool("run_command")],
messages: [
{ role: "user", content: [text("Fix the bug.")] },
use("t1"),
{ role: "user", content: [result("t1")] },
use("t2"),
{ role: "user", content: [result("t2", "a"), result("t2b", "b")] },
],
});
describe("prepareClaudeRequest: a tool loop's final tool results", () => {
it("get the 4th breakpoint, after the last assistant turn's", () => {
const out = prepareClaudeRequest(loop(), "claude");
expect(markers(out)).toEqual(["system[0]", "tools[1]", "messages[3].1", "messages[4].1"]);
expect(out.messages[4].content[1].cache_control).toEqual({ type: "ephemeral" });
});
it("leave a request that ends with a typed message as it was", () => {
const body = loop();
body.messages.push({ role: "assistant", content: [text("Done.")] }, { role: "user", content: [text("Thanks, and the tests?")] });
const out = prepareClaudeRequest(body, "claude");
expect(markers(out)).toEqual(["system[0]", "tools[1]", "messages[5].0"]);
});
it("need no tools array to be marked", () => {
const body = loop();
delete body.tools;
const out = prepareClaudeRequest(body, "claude");
expect(markers(out)).toEqual(["system[0]", "messages[3].1", "messages[4].1"]);
});
it("never take the request past four markers", () => {
const body = loop();
body.system = [text("a", { cache_control: CC }), text("b", { cache_control: CC })];
body.tools = body.tools.map((t) => ({ ...t, cache_control: CC }));
body.messages.forEach((m) => m.content.forEach((b) => (b.cache_control = CC)));
const out = prepareClaudeRequest(body, "claude");
expect(markers(out).length).toBeLessThanOrEqual(4);
expect(out.messages[4].content.at(-1).cache_control).toBeTruthy();
});
});
describe("anchorClaudeCache: a passthrough tool loop's final tool results", () => {
it("are re-anchored with the last assistant turn", () => {
const out = anchorClaudeCache(loop());
expect(markers(out)).toEqual(["system[0]", "tools[1]", "messages[3].1", "messages[4].1"]);
});
it("keep a client's own full budget as it is", () => {
const body = loop();
body.messages[0].content[0].cache_control = CC;
body.messages[2].content[0].cache_control = CC;
const out = anchorClaudeCache(body);
expect(markers(out).length).toBeLessThanOrEqual(4);
});
});