diff options
| author | Adam Malczewski <[email protected]> | 2026-06-03 14:49:04 +0900 |
|---|---|---|
| committer | Adam Malczewski <[email protected]> | 2026-06-03 14:49:04 +0900 |
| commit | 656aad2752991ff32e98fed270fa330355650c17 (patch) | |
| tree | ef6ca33b8bf988f6790c19eb021432c34e7ae798 /packages/core | |
| parent | e87e6b39285c8001045d1ebdac873b182c0f7868 (diff) | |
| download | dispatch-656aad2752991ff32e98fed270fa330355650c17.tar.gz dispatch-656aad2752991ff32e98fed270fa330355650c17.zip | |
fix: warm the SAME Anthropic message-cache bucket as real turns
Root cause of the 'first warmup misses' + 'switch to chat misses' bugs:
Anthropic keys the MESSAGE-level prompt cache on `tool_choice` AND the
extended-thinking parameters (both rows in their cache-invalidation table mark
the messages cache as invalidated on change). The original warmCache() sent
toolChoice:'none' and NO thinking providerOptions, while real turns send
toolChoice:'auto' + thinking config for the effort. So warming and chat wrote
TWO different message-cache buckets:
- warmup #1 missed (no warm-only bucket existed yet), every later warmup hit
its own bucket;
- the next real chat message read the OTHER bucket → miss.
Fix: extract a shared buildStreamOptions() that produces the cache-affecting
params (toolChoice + thinking providerOptions + maxOutputTokens). Both run()
and warmCache() now call it with the SAME resolved reasoning effort, so the
warming replay refreshes the exact cache the next real message reads. The
trivial probe turn is still appended AFTER the last cache breakpoint, so it
never disturbs the cached prefix.
Threaded the per-tab reasoning effort (per-model -> per-tab selector -> default,
mirroring processMessage) from the frontend resolver through POST /chat/warm to
warmCacheForTab to warmCache.
Tests: updated the warmCache toolChoice test to assert it MATCHES a real turn,
added an invariant test driving run() and warmCache() and asserting identical
cache-affecting params, and assert effort forwarding in the frontend store.
check / test (780) / frontend build / typecheck all green.
Diffstat (limited to 'packages/core')
| -rw-r--r-- | packages/core/src/agent/agent.ts | bin | 65763 -> 66313 bytes | |||
| -rw-r--r-- | packages/core/tests/agent/agent.test.ts | 43 |
2 files changed, 41 insertions, 2 deletions
diff --git a/packages/core/src/agent/agent.ts b/packages/core/src/agent/agent.ts Binary files differindex d0a3bb9..2e2dbb2 100644 --- a/packages/core/src/agent/agent.ts +++ b/packages/core/src/agent/agent.ts diff --git a/packages/core/tests/agent/agent.test.ts b/packages/core/tests/agent/agent.test.ts index 86a7a5b..797aea2 100644 --- a/packages/core/tests/agent/agent.test.ts +++ b/packages/core/tests/agent/agent.test.ts @@ -1709,7 +1709,12 @@ describe("anthropicThinkingProviderOptions — adaptive-thinking model detection expect(userMsgs).toHaveLength(2); }); - it("sends Anthropic cache_control breakpoints + toolChoice none", async () => { + it("sends Anthropic cache_control breakpoints with the SAME toolChoice/thinking as a real turn", async () => { + // Anthropic keys the MESSAGE cache on `tool_choice` AND the extended- + // thinking parameters. If warming sent a different value than a real + // turn, it would warm a DIFFERENT message-cache bucket and the user's + // next real message would still miss. So warming MUST mirror run(): + // toolChoice "auto" + the thinking providerOptions for the effort. vi.mocked(streamText).mockReturnValue( makeWarmStream({ inputTokens: 10, cacheReadTokens: 5, cacheWriteTokens: 0 }), ); @@ -1717,7 +1722,9 @@ describe("anthropicThinkingProviderOptions — adaptive-thinking model detection await agent.warmCache(history); const callArgs = vi.mocked(streamText).mock.calls.at(-1)?.[0]; - expect(callArgs?.toolChoice).toBe("none"); + expect(callArgs?.toolChoice).toBe("auto"); + // Thinking providerOptions present (effort defaults to "max"). + expect(callArgs?.providerOptions?.anthropic).toBeDefined(); const messages = callArgs?.messages as Array<{ role: string; providerOptions?: { anthropic?: { cacheControl?: unknown } }; @@ -1728,6 +1735,38 @@ describe("anthropicThinkingProviderOptions — adaptive-thinking model detection expect(hasBreakpoint).toBe(true); }); + it("warming and a real turn send IDENTICAL cache-affecting params (same bucket)", async () => { + // The core invariant of the whole feature: warmCache() and run() must + // produce the same toolChoice + thinking providerOptions + maxOutputTokens + // so the warming replay refreshes the EXACT cache the next real message + // reads. Drive both and compare the cache-key inputs streamText receives. + const cfg = makeConfig({ provider: "anthropic" }); + + // 1) Real turn for the same history + the probe text as the user msg. + const realAgent = new Agent(cfg); + realAgent.messages.push(...history.map((m) => ({ ...m }))); + vi.mocked(streamText).mockReturnValue( + makeMockStreamResult([{ type: "text-delta", id: "t0", text: "." }, finishStop]), + ); + for await (const _ of realAgent.run("reply with just a .")) { + // consume + } + const realArgs = vi.mocked(streamText).mock.calls.at(-1)?.[0]; + + // 2) Warming replay for the same history. + const warmAgent = new Agent(cfg); + vi.mocked(streamText).mockReturnValue( + makeWarmStream({ inputTokens: 10, cacheReadTokens: 5, cacheWriteTokens: 0 }), + ); + await warmAgent.warmCache(history); + const warmArgs = vi.mocked(streamText).mock.calls.at(-1)?.[0]; + + // The cache-affecting parameters must be byte-identical. + expect(warmArgs?.toolChoice).toEqual(realArgs?.toolChoice); + expect(warmArgs?.maxOutputTokens).toEqual(realArgs?.maxOutputTokens); + expect(warmArgs?.providerOptions).toEqual(realArgs?.providerOptions); + }); + it("does NOT mutate the agent's own message history", async () => { vi.mocked(streamText).mockReturnValue( makeWarmStream({ inputTokens: 10, cacheReadTokens: 5, cacheWriteTokens: 0 }), |
