diff --git a/apps/buddy/service/src/agent/events/PiEventBridge.ts b/apps/buddy/service/src/agent/events/PiEventBridge.ts index b9cbad606..2e5097d89 100644 --- a/apps/buddy/service/src/agent/events/PiEventBridge.ts +++ b/apps/buddy/service/src/agent/events/PiEventBridge.ts @@ -239,7 +239,24 @@ class ActivePiEventChannel implements PiCompactionEventChannel, PiTurnEventChann #enqueueEvent(event: AgentSessionEvent): void { const observedAt = Date.now() - this.#eventTail = this.#eventTail.then(() => this.#handleEvent(event, observedAt)) + const message = this.#recordEventUsage && event.type === 'message_start' && event.message.role === 'assistant' + ? event.message + : null + const estimate = message ? this.#session.getContextUsageEstimate?.() : null + const contextUsage = estimate && estimate.totalTokens > 0 && message + ? { ...estimate, model: message.model, provider: message.provider } + : null + this.#eventTail = this.#eventTail.then(async () => { + await this.#handleEvent(event, observedAt) + if (contextUsage) { + await this.#eventWriter.drain() + await this.#eventLog.append({ + runId: this.#runId, + type: 'context.usage.updated', + payload: contextUsage, + }) + } + }) } #flushPendingTerminalToolUpdates(): void { diff --git a/apps/buddy/service/src/agent/events/__tests__/PiEventBridge.spec.ts b/apps/buddy/service/src/agent/events/__tests__/PiEventBridge.spec.ts index 2b3613e88..1891f7848 100644 --- a/apps/buddy/service/src/agent/events/__tests__/PiEventBridge.spec.ts +++ b/apps/buddy/service/src/agent/events/__tests__/PiEventBridge.spec.ts @@ -208,7 +208,7 @@ describe('piEventBridge', () => { .toEqual(['first', 'second']) }) - it('reports actual input context instead of billing total tokens', async () => { + it('publishes context while thinking, then replaces the estimate with actual input rather than billing tokens', async () => { const appended: AppendBuddyRunEventInput[] = [] let sequence = 0 let listener: ((event: AgentSessionEvent) => void) | undefined @@ -266,6 +266,7 @@ describe('piEventBridge', () => { provider: 'openai-codex', runId: 'run-1', session: { + getContextUsageEstimate: () => ({ ...getContextUsageBreakdown(250_000), totalTokens: 250_000 }), getContextUsageBreakdown, subscribe(nextListener) { listener = nextListener @@ -293,15 +294,25 @@ describe('piEventBridge', () => { totalTokens: 292_900, }, } - listener?.({ message, type: 'message_start' }) - listener?.({ message, type: 'message_end' }) - + listener?.({ message: { ...message, content: [{ type: 'thinking', thinking: '' }], usage: usage() }, type: 'message_start' }) await channel.flush() + expect(appended.filter(event => event.type === 'context.usage.updated')).toEqual([{ + runId: 'run-1', + type: 'context.usage.updated', + payload: { + ...getContextUsageBreakdown(250_000), + totalTokens: 250_000, + model: message.model, + provider: message.provider, + }, + }]) - expect(appended.find(event => event.type === 'context.usage.updated')?.payload).toMatchObject({ - messageTokens: 271_000, - totalTokens: 271_000, - }) + listener?.({ message, type: 'message_end' }) + await channel.flush() + expect(appended.filter(event => event.type === 'context.usage.updated').map(event => event.payload)).toEqual([ + { ...getContextUsageBreakdown(250_000), totalTokens: 250_000, model: message.model, provider: message.provider }, + { ...getContextUsageBreakdown(271_000), totalTokens: 271_000, model: message.model, provider: message.provider }, + ]) }) it('propagates a failure to record the usage degradation fact', async () => { diff --git a/apps/buddy/service/src/agent/sessions/ReusableBuddySession.ts b/apps/buddy/service/src/agent/sessions/ReusableBuddySession.ts index 510a2b543..cbd228b78 100644 --- a/apps/buddy/service/src/agent/sessions/ReusableBuddySession.ts +++ b/apps/buddy/service/src/agent/sessions/ReusableBuddySession.ts @@ -7,7 +7,7 @@ import type { ToolExecutionPhaseChange } from '../../../../shared/runs/toolExecu import type { SkillReference } from '../../../../shared/skills/skillApi' import type { BuddyExecutionIdentity } from '../../buddies/BuddyExecutionDefinition' import type { BuddyInputReferenceV1 } from '../context/BuddyInputReference' -import type { BuddyContextUsageBreakdown } from '../context/contextUsageBreakdown' +import type { BuddyContextUsageBreakdown, BuddyEstimatedContextUsage } from '../context/contextUsageBreakdown' export interface BuddySessionModelSelection { provider: string @@ -22,6 +22,7 @@ export type BuddySessionShutdownReason = 'evict' | 'invalidate' | 'quit' | 'reso export interface BuddySessionEventSource { getToolLabel?: (name: string) => string | undefined + getContextUsageEstimate?: () => BuddyEstimatedContextUsage | null getContextUsageBreakdown?: ( totalTokens: number, ) => BuddyContextUsageBreakdown | null | Promise diff --git a/apps/buddy/service/src/agent/sessions/createReusableBuddySession.ts b/apps/buddy/service/src/agent/sessions/createReusableBuddySession.ts index b556602b1..7c880b96f 100644 --- a/apps/buddy/service/src/agent/sessions/createReusableBuddySession.ts +++ b/apps/buddy/service/src/agent/sessions/createReusableBuddySession.ts @@ -33,7 +33,7 @@ import { getModelImageLimits, getModelRequestBytesLimit, getModelRequestOverhead import { BuddyAgentRunError } from '../../runs/runError' import { SkillError } from '../../skills/skillFiles' import { createBuddyInputReferenceMessage, readBuddyInputReference } from '../context/BuddyInputReference' -import { createContextUsageBreakdown } from '../context/contextUsageBreakdown' +import { createContextUsageBreakdown, createEstimatedContextUsage } from '../context/contextUsageBreakdown' import { prepareBuddyInputHistory } from '../context/prepareBuddyInputHistory' import { projectBuddyInput, projectMessageImages } from '../context/projectBuddyInput' import { readExecutionMailboxEntries, renderMailboxMessage } from '../execution/executionMailboxEntries' @@ -338,6 +338,7 @@ export function createReusableBuddySession( return converted } session.agent.streamFunction = (model, context, streamOptions) => { + latestContext = null const request = requestInputs.get(context.messages) if (request?.failed) return createInputMaterializationFailure(model, request.failureCode) @@ -430,6 +431,7 @@ export function createReusableBuddySession( options.assertCodemodeReady?.() input.signal.throwIfAborted() finishingTurn = undefined + latestContext = null preparedModelRun = null completedTurn = undefined generation = input.generation @@ -496,6 +498,7 @@ export function createReusableBuddySession( }, ), getToolLabel: name => session.getToolDefinition(name)?.label, + getContextUsageEstimate: () => latestContext ? createEstimatedContextUsage(latestContext) : null, getContextUsageBreakdown: totalTokens => latestContext ? createContextUsageBreakdown(latestContext, totalTokens) : null,