The best way to control Claude Code, Codex and more from any computer or phone
perf(server): bound ordinal recovery to selected messages (#27495)
Co-authored-by: maria-rcks <maria@kuuro.net>
Behzad Motaghi committed
Nov 3, 2026 at 02:33 UTC
0b2c13a23fcc25d04e6c7cbab5e58a8c8bc7b0f3
2 files changed
+72
apps/server/src/orchestration-v2/ProjectionStore.test.ts
+63
@@ -2364,6 +2364,69 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
2364
byteIds,
2365
Array.from({ length: 70 }, (_, index) => `turn-item:bounded-sql-history:${index + 1}`),
2366
);
2367
+
2368
+ // Selected message reads recover ordinals for only the loaded messages, while 69
2369
+ // unloaded assistant messages remain in the thread's history.
2370
+ const firstMessageId = MessageId.make("message:bounded-sql-history:1");
2371
+ const lastMessageId = MessageId.make("message:bounded-sql-history:1000");
2372
+ const insertMessageItem = (
2373
+ suffix: string,
2374
+ itemThreadId: string,
2375
+ ordinal: number,
2376
+ messageId: string | null | undefined,
2377
+ ) => sql`
2378
+ INSERT INTO orchestration_v2_projection_turn_items (
2379
+ turn_item_id, thread_id, run_id, node_id, provider_thread_id, provider_turn_id,
2380
+ parent_item_id, ordinal, type, status, updated_at, payload_json
2381
+ ) VALUES (
2382
+ ${`turn-item:bounded-sql-history:ordinal-${suffix}`}, ${itemThreadId}, NULL, NULL, NULL,
2383
+ NULL, NULL, ${ordinal}, 'assistant_message', 'completed', ${nowIso},
2384
+ ${encodeUnknownJsonString({ messageId })}
2385
+ )
2386
+ `;
2387
+ yield* insertMessageItem("duplicate", threadId, 0, lastMessageId);
2388
+ yield* insertMessageItem(
2389
+ "other-thread",
2390
+ "thread:bounded-sql-history:other",
2391
+ -1,
2392
+ firstMessageId,
2393
+ );
2394
+ yield* insertMessageItem("null-id", threadId, -2, null);
2395
+ yield* insertMessageItem("missing-id", threadId, -3, undefined);
2396
+ const readMessageIds = (filter?: ProjectionStore.ProjectionRecordFilter) =>
2397
+ projectionStore
2398
+ .getThreadRecords(threadId, ["messages"], filter)
2399
+ .pipe(Effect.map(({ messages }) => messages.map((message) => message.id)));
2400
+ assert.deepEqual(yield* readMessageIds(), [lastMessageId, firstMessageId]);
2401
+ assert.deepEqual(yield* readMessageIds({ messageRoles: ["user", "assistant"] }), [
2402
+ lastMessageId,
2403
+ firstMessageId,
2404
+ ]);
2405
+ for (const filter of [
2406
+ {
2407
+ messageIds: [
2408
+ firstMessageId,
2409
+ lastMessageId,
2410
+ MessageId.make("message:bounded-sql-history:absent"),
2411
+ ],
2412
+ },
2413
+ { messageRoles: ["user" as const] },
2414
+ {
2415
+ messageRunIds: [
2416
+ RunId.make("run:bounded-sql-history:1"),
2417
+ RunId.make("run:bounded-sql-history:1000"),
2418
+ ],
2419
+ },
2420
+ ]) {
2421
+ assert.deepEqual(yield* readMessageIds(filter), [lastMessageId, firstMessageId]);
2422
+ }
2423
+ assert.deepEqual(yield* readMessageIds({ messageIds: [] }), []);
2424
+ assert.deepEqual(yield* readMessageIds({ messageIds: [firstMessageId] }), [firstMessageId]);
2425
+ yield* sql`
2426
+ DELETE FROM orchestration_v2_projection_turn_items
2427
+ WHERE turn_item_id LIKE 'turn-item:bounded-sql-history:ordinal-%'
2428
+ `;
2429
+
2430
yield* sql`
2431
UPDATE orchestration_v2_projection_turn_items
2432
SET type = 'command_execution', payload_json = json_set(payload_json, '$.type', 'command_execution')
apps/server/src/orchestration-v2/ProjectionStore.ts
+9
@@ -3653,10 +3653,19 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
3653
]);
3654
const messageOrdinals = new Map<string, number>();
3655
if (fields !== undefined && fields.includes("messages") && messages.length > 1) {
3656
+ // Broad role reads keep the original query to avoid per-ID lookup overhead.
3657
+ const loadedMessageIds =
3658
+ filter?.messageIds === undefined &&
3659
+ filter?.messageRunIds === undefined &&
3660
+ (filter?.messageRoles === undefined ||
3661
+ (filter.messageRoles.includes("user") && filter.messageRoles.includes("assistant")))
3662
+ ? undefined
3663
+ : messages.map((message) => message.id);
3664
const rows = yield* sql<{ message_id: string; ordinal: number }>`
3665
SELECT json_extract(payload_json, '$.messageId') AS message_id, MIN(ordinal) AS ordinal
3666
FROM orchestration_v2_projection_turn_items
3667
WHERE thread_id = ${threadId} AND type IN ('user_message', 'assistant_message')
3668
+ ${loadedMessageIds === undefined ? sql`` : sql`AND json_extract(payload_json, '$.messageId') IN (SELECT value FROM json_each(${encodeIdList(loadedMessageIds)}))`}
3669
GROUP BY json_extract(payload_json, '$.messageId')
3670
`;
3671
for (const row of rows) messageOrdinals.set(row.message_id, row.ordinal);