Skip to content

Commit 6af161d

Browse files
author
韩梦凡
committed
fix(grok): show context-window usage in the composer
Grok ACP does not emit usage_update. Occupancy lives on session/update _meta.totalTokens. Map that onto the existing thread.token-usage.updated path so ContextWindowMeter can render. Do not use prompt-response usage.totalTokens; that is billed API tokens, not context fill. Closes #8382
1 parent 70cd258 commit 6af161d

10 files changed

Lines changed: 396 additions & 1 deletion

‎apps/server/scripts/acp-mock-agent.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ const emitOverlappingXAiPromptCompleteOutOfOrder =
4646
const failPrompt = process.env.T3_ACP_FAIL_PROMPT === "1";
4747
const failSetConfigOption = process.env.T3_ACP_FAIL_SET_CONFIG_OPTION === "1";
4848
const exitOnSetConfigOption = process.env.T3_ACP_EXIT_ON_SET_CONFIG_OPTION === "1";
49+
const emitContextUsage = process.env.T3_ACP_EMIT_CONTEXT_USAGE === "1";
4950
const promptResponseText = process.env.T3_ACP_PROMPT_RESPONSE_TEXT;
5051
const initialGrokReasoningEffort =
5152
process.env.T3_ACP_INITIAL_GROK_REASONING_EFFORT?.trim() || undefined;
@@ -1061,6 +1062,7 @@ const program = Effect.gen(function* () {
10611062

10621063
yield* agent.client.sessionUpdate({
10631064
sessionId: requestedSessionId,
1065+
...(emitContextUsage ? { _meta: { totalTokens: 1615 } } : {}),
10641066
update: {
10651067
sessionUpdate: "agent_message_chunk",
10661068
content: { type: "text", text: promptResponseText ?? "hello from mock" },

‎apps/server/src/provider/Layers/CursorAdapter.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ import {
5757
makeAcpPlanUpdatedEvent,
5858
makeAcpRequestOpenedEvent,
5959
makeAcpRequestResolvedEvent,
60+
makeAcpTokenUsageEvent,
6061
makeAcpToolCallEvent,
6162
} from "../acp/AcpCoreRuntimeEvents.ts";
6263
import {
@@ -867,6 +868,27 @@ export function makeCursorAdapter(
867868
}),
868869
);
869870
return;
871+
case "UsageUpdated": {
872+
yield* logNative(
873+
ctx.threadId,
874+
"session/update",
875+
event.rawPayload,
876+
"acp.jsonrpc",
877+
);
878+
const usageEvent = makeAcpTokenUsageEvent({
879+
stamp: yield* makeEventStamp(),
880+
provider: PROVIDER,
881+
threadId: ctx.threadId,
882+
turnId: ctx.activeTurnId,
883+
used: event.used,
884+
size: event.size,
885+
rawPayload: event.rawPayload,
886+
});
887+
if (usageEvent) {
888+
yield* offerRuntimeEvent(usageEvent);
889+
}
890+
return;
891+
}
870892
}
871893
}),
872894
),

‎apps/server/src/provider/Layers/GrokAdapter.test.ts‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,56 @@ it.layer(grokAdapterTestLayer)("GrokAdapterLive", (it) => {
278278
}),
279279
);
280280

281+
it.effect("emits context occupancy from session-update _meta.totalTokens", () =>
282+
Effect.gen(function* () {
283+
const threadId = ThreadId.make("grok-context-window-thread");
284+
const wrapperPath = yield* Effect.promise(() =>
285+
makeMockGrokWrapper({ T3_ACP_EMIT_CONTEXT_USAGE: "1" }),
286+
);
287+
const adapter = yield* makeTestAdapter(wrapperPath);
288+
289+
const runtimeEvents: ProviderRuntimeEvent[] = [];
290+
const turnCompleted = yield* Deferred.make<void>();
291+
const runtimeEventsFiber = yield* Stream.runForEach(adapter.streamEvents, (event) =>
292+
Effect.sync(() => {
293+
runtimeEvents.push(event);
294+
}).pipe(
295+
Effect.andThen(
296+
event.type === "turn.completed"
297+
? Deferred.succeed(turnCompleted, undefined)
298+
: Effect.void,
299+
),
300+
),
301+
).pipe(Effect.forkChild);
302+
303+
yield* adapter.startSession({
304+
threadId,
305+
provider: ProviderDriverKind.make("grok"),
306+
cwd: process.cwd(),
307+
runtimeMode: "full-access",
308+
modelSelection: { instanceId: ProviderInstanceId.make("grok"), model: "grok-4.6" },
309+
});
310+
311+
yield* adapter.sendTurn({
312+
threadId,
313+
input: "hello grok",
314+
attachments: [],
315+
});
316+
317+
yield* Deferred.await(turnCompleted);
318+
yield* Fiber.interrupt(runtimeEventsFiber);
319+
320+
const usageEvent = runtimeEvents.find((event) => event.type === "thread.token-usage.updated");
321+
assert.equal(usageEvent?.type, "thread.token-usage.updated");
322+
if (usageEvent?.type === "thread.token-usage.updated") {
323+
assert.equal(usageEvent.payload.usage.usedTokens, 1615);
324+
assert.equal(usageEvent.payload.usage.maxTokens, 500_000);
325+
}
326+
327+
yield* adapter.stopSession(threadId);
328+
}),
329+
);
330+
281331
it.effect("closes the ACP child process when a session stops", () =>
282332
Effect.gen(function* () {
283333
const threadId = ThreadId.make("grok-stop-session-close");

‎apps/server/src/provider/Layers/GrokAdapter.ts‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,14 @@ import {
5555
makeAcpPlanUpdatedEvent,
5656
makeAcpRequestOpenedEvent,
5757
makeAcpRequestResolvedEvent,
58+
makeAcpTokenUsageEvent,
5859
makeAcpToolCallEvent,
5960
} from "../acp/AcpCoreRuntimeEvents.ts";
6061
import { parsePermissionRequest } from "../acp/AcpRuntimeModel.ts";
6162
import { makeAcpNativeLoggerFactory } from "../acp/AcpNativeLogging.ts";
6263
import {
6364
applyGrokAcpModelSelection,
65+
contextWindowFromGrokSessionSetup,
6466
currentGrokModelIdFromSessionSetup,
6567
currentGrokReasoningEffortFromSessionSetup,
6668
makeGrokAcpRuntime,
@@ -169,6 +171,8 @@ interface GrokSessionContext {
169171
promptResponsesReady: number;
170172
currentModelId: string | undefined;
171173
currentReasoningEffort: string | undefined;
174+
lastContextTokens: number | undefined;
175+
lastKnownMaxTokens: number | undefined;
172176
stopped: boolean;
173177
}
174178

@@ -314,6 +318,8 @@ function selectAutoApprovedPermissionOption(
314318
);
315319
}
316320

321+
const GROK_DEFAULT_CONTEXT_WINDOW = 500_000;
322+
317323
function completedStopReasonFromPromptResponse(
318324
response: EffectAcpSchema.PromptResponse | undefined,
319325
): EffectAcpSchema.StopReason | null {
@@ -1300,6 +1306,11 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
13001306
requestedStartReasoningEffort !== undefined
13011307
? normalizeGrokReasoningEffort(requestedStartReasoningEffort)
13021308
: currentStartReasoningEffort,
1309+
lastContextTokens: undefined,
1310+
lastKnownMaxTokens: contextWindowFromGrokSessionSetup(
1311+
started.sessionSetupResult,
1312+
boundModelId,
1313+
),
13031314
stopped: false,
13041315
};
13051316

@@ -1313,7 +1324,8 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
13131324
if (
13141325
event._tag === "PlanUpdated" ||
13151326
event._tag === "ToolCallUpdated" ||
1316-
event._tag === "ContentDelta"
1327+
event._tag === "ContentDelta" ||
1328+
event._tag === "UsageUpdated"
13171329
) {
13181330
yield* logNative(ctx.threadId, "session/update", event.rawPayload);
13191331
}
@@ -1322,6 +1334,36 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
13221334
return;
13231335
}
13241336

1337+
if (event._tag === "UsageUpdated") {
1338+
const usageTurnId = resolveNotificationTurnId(ctx);
1339+
if (usageTurnId !== undefined && ctx.interruptedTurnIds.has(usageTurnId)) {
1340+
return;
1341+
}
1342+
if (ctx.lastContextTokens === event.used) {
1343+
return;
1344+
}
1345+
ctx.lastContextTokens = event.used;
1346+
if (event.size > 0) {
1347+
ctx.lastKnownMaxTokens = event.size;
1348+
}
1349+
const usageEvent = makeAcpTokenUsageEvent({
1350+
stamp: yield* makeEventStamp(),
1351+
provider: PROVIDER,
1352+
threadId: ctx.threadId,
1353+
turnId: usageTurnId,
1354+
used: event.used,
1355+
size:
1356+
event.size > 0
1357+
? event.size
1358+
: (ctx.lastKnownMaxTokens ?? GROK_DEFAULT_CONTEXT_WINDOW),
1359+
rawPayload: event.rawPayload,
1360+
});
1361+
if (usageEvent) {
1362+
yield* offerRuntimeEvent(usageEvent);
1363+
}
1364+
return;
1365+
}
1366+
13251367
const notificationTurnId = resolveNotificationTurnId(ctx);
13261368
if (
13271369
notificationTurnId === undefined ||

‎apps/server/src/provider/acp/AcpCoreRuntimeEvents.test.ts‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
makeAcpPlanUpdatedEvent,
88
makeAcpRequestOpenedEvent,
99
makeAcpRequestResolvedEvent,
10+
makeAcpTokenUsageEvent,
1011
makeAcpToolCallEvent,
1112
} from "./AcpCoreRuntimeEvents.ts";
1213

@@ -191,5 +192,37 @@ describe("AcpCoreRuntimeEvents", () => {
191192
status: "inProgress",
192193
},
193194
});
195+
196+
expect(
197+
makeAcpTokenUsageEvent({
198+
stamp,
199+
provider: ProviderDriverKind.make("grok"),
200+
threadId: "thread-1" as never,
201+
turnId,
202+
used: 12_345,
203+
size: 200_000,
204+
rawPayload: { sessionUpdate: "usage_update" },
205+
}),
206+
).toMatchObject({
207+
type: "thread.token-usage.updated",
208+
payload: {
209+
usage: {
210+
usedTokens: 12_345,
211+
maxTokens: 200_000,
212+
},
213+
},
214+
});
215+
216+
expect(
217+
makeAcpTokenUsageEvent({
218+
stamp,
219+
provider: ProviderDriverKind.make("grok"),
220+
threadId: "thread-1" as never,
221+
turnId,
222+
used: 0,
223+
size: 200_000,
224+
rawPayload: { sessionUpdate: "usage_update" },
225+
}),
226+
).toBeNull();
194227
});
195228
});

‎apps/server/src/provider/acp/AcpCoreRuntimeEvents.ts‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
type ProviderRuntimeEvent,
99
type RuntimeRequestId,
1010
type ThreadId,
11+
type ThreadTokenUsageSnapshot,
1112
type TurnId,
1213
} from "@t3tools/contracts";
1314

@@ -228,3 +229,41 @@ export function makeAcpContentDeltaEvent(input: {
228229
},
229230
};
230231
}
232+
233+
export function makeAcpTokenUsageEvent(input: {
234+
readonly stamp: AcpEventStamp;
235+
readonly provider: ProviderDriverKind;
236+
readonly threadId: ThreadId;
237+
readonly turnId: TurnId | undefined;
238+
readonly used: number;
239+
readonly size: number;
240+
readonly rawPayload: unknown;
241+
}): ProviderRuntimeEvent | null {
242+
if (!Number.isFinite(input.used) || input.used <= 0) {
243+
return null;
244+
}
245+
const usedTokens = Math.round(input.used);
246+
const maxTokens =
247+
Number.isFinite(input.size) && input.size >= 1 ? Math.round(input.size) : undefined;
248+
const clamped = maxTokens !== undefined ? Math.min(usedTokens, maxTokens) : usedTokens;
249+
const usage: ThreadTokenUsageSnapshot = {
250+
usedTokens: clamped,
251+
lastUsedTokens: clamped,
252+
...(maxTokens !== undefined ? { maxTokens } : {}),
253+
};
254+
return {
255+
type: "thread.token-usage.updated",
256+
...input.stamp,
257+
provider: input.provider,
258+
threadId: input.threadId,
259+
turnId: input.turnId,
260+
payload: {
261+
usage,
262+
},
263+
raw: {
264+
source: "acp.jsonrpc",
265+
method: "session/update",
266+
payload: input.rawPayload,
267+
},
268+
};
269+
}

‎apps/server/src/provider/acp/AcpRuntimeModel.test.ts‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,80 @@ describe("AcpRuntimeModel", () => {
339339
]);
340340
});
341341

342+
it("reads Grok context occupancy from session-update _meta.totalTokens", () => {
343+
const result = parseSessionUpdateEvent({
344+
sessionId: "session-1",
345+
_meta: { totalTokens: 1615, contextWindowTokens: 500_000 },
346+
update: {
347+
sessionUpdate: "agent_message_chunk",
348+
content: {
349+
type: "text",
350+
text: "hello",
351+
},
352+
},
353+
} satisfies EffectAcpSchema.SessionNotification);
354+
355+
expect(result.events).toContainEqual({
356+
_tag: "UsageUpdated",
357+
used: 1615,
358+
size: 500_000,
359+
rawPayload: {
360+
sessionId: "session-1",
361+
_meta: { totalTokens: 1615, contextWindowTokens: 500_000 },
362+
update: {
363+
sessionUpdate: "agent_message_chunk",
364+
content: {
365+
type: "text",
366+
text: "hello",
367+
},
368+
},
369+
},
370+
});
371+
});
372+
373+
it("does not treat billed prompt-response usage as context occupancy", () => {
374+
const result = parseSessionUpdateEvent({
375+
sessionId: "session-1",
376+
_meta: { usage: { totalTokens: 20_554, inputTokens: 18_000, outputTokens: 2_554 } },
377+
update: {
378+
sessionUpdate: "agent_message_chunk",
379+
content: {
380+
type: "text",
381+
text: "hello",
382+
},
383+
},
384+
} satisfies EffectAcpSchema.SessionNotification);
385+
386+
expect(result.events.some((event) => event._tag === "UsageUpdated")).toBe(false);
387+
});
388+
389+
it("projects ACP usage updates for the context-window meter", () => {
390+
const result = parseSessionUpdateEvent({
391+
sessionId: "session-1",
392+
update: {
393+
sessionUpdate: "usage_update",
394+
used: 12_345,
395+
size: 200_000,
396+
},
397+
} satisfies EffectAcpSchema.SessionNotification);
398+
399+
expect(result.events).toEqual([
400+
{
401+
_tag: "UsageUpdated",
402+
used: 12_345,
403+
size: 200_000,
404+
rawPayload: {
405+
sessionId: "session-1",
406+
update: {
407+
sessionUpdate: "usage_update",
408+
used: 12_345,
409+
size: 200_000,
410+
},
411+
},
412+
},
413+
]);
414+
});
415+
342416
it("keeps permission request parsing compatible with loose extension payloads", () => {
343417
const request = parsePermissionRequest({
344418
sessionId: "session-1",

0 commit comments

Comments
 (0)