Skip to content

Commit ee6017c

Browse files
t3dotggclaude
andcommitted
perf(server): compaction drops superseded provider-turn updates
Provider turns emit an update for every token usage report, about 36 per turn, and compaction kept all of them. Compact them like nodes and messages: keep the first and newest update per turn, plus the newest update that carries token usage, since later updates without usage inherit it. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 5d27ecd commit ee6017c

2 files changed

Lines changed: 59 additions & 9 deletions

File tree

‎apps/server/src/orchestration-v2/FoundationPersistence.test.ts‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import {
2222
ProviderInstanceId,
2323
ProviderSessionId,
2424
ProviderThreadId,
25+
ProviderTurnId,
2526
RunAttemptId,
2627
RunId,
2728
ThreadId,
@@ -907,6 +908,30 @@ it.layer(layerTest)("orchestration V2 foundation persistence", (it) => {
907908
},
908909
});
909910

911+
// Updates without usage inherit it from an earlier update, so the
912+
// newest update carrying usage must outlive compaction.
913+
const providerTurnEvent = (
914+
suffix: string,
915+
usedTokens: number | null,
916+
): OrchestrationV2DomainEvent => ({
917+
id: EventId.make(`event:foundation-compact:${suffix}`),
918+
type: "provider-turn.updated",
919+
threadId,
920+
occurredAt: now,
921+
payload: {
922+
id: ProviderTurnId.make("provider-turn:foundation-compact"),
923+
providerThreadId: ProviderThreadId.make("provider-thread:foundation-compact"),
924+
nodeId,
925+
runAttemptId: null,
926+
nativeTurnRef: null,
927+
ordinal: 1,
928+
status: usedTokens === null ? "completed" : "running",
929+
startedAt: now,
930+
completedAt: null,
931+
...(usedTokens === null ? {} : { tokenUsage: { usedTokens, updatedAt: nowIso } }),
932+
},
933+
});
934+
910935
yield* eventSink.write({
911936
events: [
912937
threadCreatedEvent({ id: "event:foundation-compact:create", thread, now }),
@@ -915,13 +940,17 @@ it.layer(layerTest)("orchestration V2 foundation persistence", (it) => {
915940
messageEvent("message-1", "streaming"),
916941
nodeEvent("node-1", "running"),
917942
itemEvent("item-1", "streaming"),
943+
providerTurnEvent("turn-1", null),
918944
...Array.from({ length: 501 }, (_, index) =>
919945
threadStateEvent(`history-${index}`, "thread.visited"),
920946
),
921947
threadStateEvent("visit-2", "thread.visited"),
922948
messageEvent("message-2", "final"),
923949
nodeEvent("node-2", "completed"),
924950
itemEvent("item-2", "final"),
951+
providerTurnEvent("turn-2", 10),
952+
providerTurnEvent("turn-3", 20),
953+
providerTurnEvent("turn-4", null),
925954
],
926955
});
927956
const beforeCompaction = yield* projections.getThreadProjection(threadId);
@@ -963,9 +992,10 @@ it.layer(layerTest)("orchestration V2 foundation persistence", (it) => {
963992

964993
const summary = yield* maintenance.compactEventStore;
965994
// Superseded state spans several discovery pages. Both turn-item updates
966-
// stay, and so do the first message and node events (replay order). The
995+
// stay, and so do the first message, node, and provider-turn events
996+
// (replay order) plus the newest provider-turn usage. The
967997
// rename stays too: visits are read state and only supersede each other.
968-
assert.isAtLeast(summary.deletedEventCount, 504);
998+
assert.isAtLeast(summary.deletedEventCount, 505);
969999
assert.isAtLeast(summary.deletedReceiptCount, 1);
9701000

9711001
const remaining = yield* sql<{ readonly event_id: string }>`
@@ -983,10 +1013,13 @@ it.layer(layerTest)("orchestration V2 foundation persistence", (it) => {
9831013
"event:foundation-compact:message-1",
9841014
"event:foundation-compact:node-1",
9851015
"event:foundation-compact:item-1",
1016+
"event:foundation-compact:turn-1",
9861017
"event:foundation-compact:visit-2",
9871018
"event:foundation-compact:message-2",
9881019
"event:foundation-compact:node-2",
9891020
"event:foundation-compact:item-2",
1021+
"event:foundation-compact:turn-3",
1022+
"event:foundation-compact:turn-4",
9901023
],
9911024
);
9921025

‎apps/server/src/orchestration-v2/ProjectionMaintenance.ts‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,12 @@ export const layer: Layer.Layer<
232232

233233
/**
234234
* Scan newest first to retain the newest state for each entity. Keyed
235-
* entities (messages, nodes, PR links) also keep their oldest event: client
236-
* reducers append an entity where they first see it, so a replay from any
237-
* cursor must either carry that first event or find the entity already
238-
* present. Only the events in between are deleted.
235+
* entities (messages, nodes, provider turns, PR links) also keep their
236+
* oldest event: client reducers append an entity where they first see it,
237+
* so a replay from any cursor must either carry that first event or find
238+
* the entity already present. Only the events in between are deleted.
239+
* Provider turns also keep their newest event with token usage, because
240+
* reducers carry usage forward from earlier updates that omit it.
239241
* Page every event, including non-candidates: filtering before LIMIT could
240242
* still scan the entire history when superseded events are sparse.
241243
* turn-item.updated stays intact because replay assigns positions on first write.
@@ -256,6 +258,7 @@ export const layer: Layer.Layer<
256258
// Per key: the lowest sequence seen so far after the newest. It is
257259
// deleted once an even older event turns up and kept otherwise.
258260
const oldestCandidateByEntityKey = new Map<string, number | null>();
261+
const providerTurnKeysWithRetainedUsage = new Set<string>();
259262
let deletedEventCount = 0;
260263
let deletedReceiptCount = 0;
261264

@@ -267,6 +270,7 @@ export const layer: Layer.Layer<
267270
readonly stream_id: string;
268271
readonly event_type: string;
269272
readonly entity_id: string | null;
273+
readonly carries_token_usage: number;
270274
readonly imported_legacy_thread: number;
271275
}>`
272276
SELECT
@@ -277,7 +281,7 @@ export const layer: Layer.Layer<
277281
event.event_type,
278282
CASE
279283
WHEN event.application_event_version = 2
280-
AND event.event_type IN ('message.updated', 'node.updated')
284+
AND event.event_type IN ('message.updated', 'node.updated', 'provider-turn.updated')
281285
THEN json_extract(event.payload_json, '$.id')
282286
WHEN event.application_event_version = 2
283287
AND event.event_type = 'thread.pull-request-link-updated'
@@ -286,6 +290,12 @@ export const layer: Layer.Layer<
286290
json_extract(event.payload_json, '$.number'))
287291
ELSE NULL
288292
END AS entity_id,
293+
CASE
294+
WHEN event.application_event_version = 2
295+
AND event.event_type = 'provider-turn.updated'
296+
THEN json_extract(event.payload_json, '$.tokenUsage') IS NOT NULL
297+
ELSE 0
298+
END AS carries_token_usage,
289299
CASE
290300
WHEN event.application_event_version = 1 AND event.aggregate_kind = 'thread'
291301
THEN EXISTS (
@@ -330,11 +340,18 @@ export const layer: Layer.Layer<
330340
} else if (
331341
row.event_type === "thread.pull-request-link-updated" ||
332342
row.event_type === "message.updated" ||
333-
row.event_type === "node.updated"
343+
row.event_type === "node.updated" ||
344+
row.event_type === "provider-turn.updated"
334345
) {
335346
const key = encodeEntityKey([row.event_type, row.stream_id, row.entity_id]);
336347
const candidate = oldestCandidateByEntityKey.get(key);
337-
if (candidate === undefined) oldestCandidateByEntityKey.set(key, null);
348+
const retainsUsage =
349+
row.carries_token_usage === 1 && !providerTurnKeysWithRetainedUsage.has(key);
350+
if (retainsUsage) {
351+
providerTurnKeysWithRetainedUsage.add(key);
352+
if (candidate !== undefined && candidate !== null) obsolete.push(candidate);
353+
oldestCandidateByEntityKey.set(key, null);
354+
} else if (candidate === undefined) oldestCandidateByEntityKey.set(key, null);
338355
else {
339356
if (candidate !== null) obsolete.push(candidate);
340357
oldestCandidateByEntityKey.set(key, row.sequence);

0 commit comments

Comments
 (0)