Skip to content

A desktop coding agent with free access to frontier models.

TypeScript

fix: number parts sent ahead

ogsamratcef732f48180
diff --git a/apps/server/src/session-archive/PARITY.sha256 b/apps/server/src/session-archive/PARITY.sha256
index dcd6d1b0..63129780 100644
--- a/apps/server/src/session-archive/PARITY.sha256
+++ b/apps/server/src/session-archive/PARITY.sha256
@@ -8,4 +8,4 @@ c7f2e9a9c126ea9dfef714d36385e611e2190b0af8043cd52368a08bd0590af5 auto-compact.t
55e5e322b2c372b77714eb3677bee6ea0f3e0a11120ba6edc7d202c264a3d7e8 turn-prompts.ts
ca3bd7e89143925e6d35ae37757e736b9f8c20f6e5911a4f66433684fa185f1c code-files.ts
21459ba1d35b71195e98c7b5385277838248eb6bae316ad16fa9fcc93646d706 account-park.ts
-11431f5e1bcb96bbbbd792afc036602da79a939c19c540ffb86c1e4e9454c716 turn-progress.ts
+70a8ebf69a89f1c785ff61b8419fbe5ddd9c625a3c7f6ef0f16a3c28bb190e67 turn-progress.ts
diff --git a/apps/server/src/session-archive/turn-progress.ts b/apps/server/src/session-archive/turn-progress.ts
index b2c70d78..9f815030 100644
--- a/apps/server/src/session-archive/turn-progress.ts
+++ b/apps/server/src/session-archive/turn-progress.ts
@@ -20,7 +20,10 @@
* still being written is sent when the turn ends, with its final content.
*
* The root session's settled messages go ahead as `turn.messages` (the
- * events a long turn's backlog already uses, `progress: true`), each
+ * events a long turn's backlog already uses, `progress: true`, numbered
+ * `part` of `parts` within one send: the server keeps a trace's events
+ * apart by time, type and part, and the pieces of one send may share a
+ * millisecond), each
* sub-agent's as a `session.child` event. No checkpoint moves: the turn's
* end reads every session from where the turn started, as without
* progress, and sends only the messages not sent ahead, or sent ahead and
@@ -57,6 +60,11 @@ export function turnProgressIntervalMs(value: string | undefined): number {
return Math.max(TURN_PROGRESS_FLOOR_MS, Math.floor(parsed));
}
+/** The `turn.messages` event data of one send ahead, split in pieces: each numbered `part` of `parts`. */
+export function progressEvents<T>(pieces: readonly T[], messagesOf: (piece: T) => unknown[]): Array<{ messages: unknown[]; part: number; parts: number; progress: true }> {
+ return pieces.map((piece, index) => ({ messages: messagesOf(piece), part: index + 1, parts: pieces.length, progress: true as const }));
+}
+
/** An engine message's id, or null. */
export function progressMessageId(message: unknown): string | null {
if (!isRecord(message)) return null;
diff --git a/apps/server/src/session-upload-observer-progress.test.ts b/apps/server/src/session-upload-observer-progress.test.ts
index 6f96ecd3..40c0fea5 100644
--- a/apps/server/src/session-upload-observer-progress.test.ts
+++ b/apps/server/src/session-upload-observer-progress.test.ts
@@ -1,7 +1,7 @@
import { afterEach, expect, test } from "bun:test";
import { createSessionObservers, observeUploadedSession, type EngineTarget, type ObservedUploader } from "./session-upload-observer.js";
-import { settledMessage, settledPrefix, TurnProgress, turnProgressIntervalMs, TURN_PROGRESS_FLOOR_MS, TURN_PROGRESS_INTERVAL_MS } from "./session-archive/turn-progress.js";
+import { progressEvents, settledMessage, settledPrefix, TurnProgress, turnProgressIntervalMs, TURN_PROGRESS_FLOOR_MS, TURN_PROGRESS_INTERVAL_MS } from "./session-archive/turn-progress.js";
// A long turn sends what is final while it runs (session-archive/turn-progress.ts,
// the same file as the CLI's, PARITY.sha256): the parent's settled messages
@@ -28,6 +28,15 @@ test("settled messages: a user message, an ended answer with no open tool call",
expect(settledPrefix([user("u", "x", 1), done("a", 2), running("b", 3), done("c", 4)])).toBe(2);
});
+test("the pieces of one send ahead are numbered part of parts (the server keeps events apart by time, type and part)", () => {
+ expect(progressEvents([{ messages: [1] }, { messages: [2, 3] }, { messages: [4] }], (piece) => piece.messages)).toEqual([
+ { messages: [1], part: 1, parts: 3, progress: true },
+ { messages: [2, 3], part: 2, parts: 3, progress: true },
+ { messages: [4], part: 3, parts: 3, progress: true },
+ ]);
+ expect(progressEvents([] as unknown[][], (piece) => piece)).toEqual([]);
+});
+
test("the interval: default, off, floor, unreadable", () => {
expect(turnProgressIntervalMs(undefined)).toBe(TURN_PROGRESS_INTERVAL_MS);
expect(turnProgressIntervalMs("0")).toBe(0);
@@ -174,6 +183,7 @@ test("a long turn with a sub-agent: progress while it runs, the end sends the re
const ahead = events.filter((event) => event.type === "turn.messages" && (event.data as { progress?: boolean }).progress === true);
expect(ahead.map((event) => ids((event.data as { messages: unknown }).messages))).toEqual([["u1"], ["a1"]]);
+ for (const event of ahead) expect([(event.data as { part: number }).part, (event.data as { parts: number }).parts]).toEqual([1, 1]);
const end = flushes.filter((flush) => flush.final);
expect(end.length).toBe(1);
const final = end[0]!.final as { messages: Message[] };
diff --git a/apps/server/src/session-upload-observer.ts b/apps/server/src/session-upload-observer.ts
index f8bdd1aa..ac84f2e3 100644
--- a/apps/server/src/session-upload-observer.ts
+++ b/apps/server/src/session-upload-observer.ts
@@ -16,7 +16,7 @@ import { turnWriters, type WriterSessionMessages } from "./session-archive/turn-
import { watchToolStarts } from "./session-archive/tool-start.js";
import { watchToolEvents } from "./context/tool-events.js";
import { closeOpenToolParts } from "./context/open-tools.js";
-import { TurnProgress, turnProgressIntervalMs, type TurnProgressReason } from "./session-archive/turn-progress.js";
+import { progressEvents, TurnProgress, turnProgressIntervalMs, type TurnProgressReason } from "./session-archive/turn-progress.js";
import type { ContextCapture } from "./context/index.js";
/** The engine a captured request went to: base URL, request headers (the engine's auth), query and API generation. */
@@ -1162,9 +1162,10 @@ export function observeUploadedSession(input: {
const history = await readEngineHistory(messages(), observer.lastMessageIds.get(sessionId), MAX_BACKLOG_MESSAGE_BYTES);
if (history.omitted === 0 && !history.checkpointMissing) {
const ahead = current.ahead(history.delta, history.sizes);
- for (const part of ahead.messages.length > 0 ? messageParts(ahead.messages, ahead.sizes) : []) {
- room(part.bytes);
- sessionUploader.recordTrace(sessionId, "turn.messages", { messages: part.messages, progress: true });
+ const pieces = ahead.messages.length > 0 ? messageParts(ahead.messages, ahead.sizes) : [];
+ for (const [index, data] of progressEvents(pieces, (piece) => piece.messages).entries()) {
+ room(pieces[index]!.bytes);
+ sessionUploader.recordTrace(sessionId, "turn.messages", data);
}
current.markSent(ahead.messages, ahead.sizes);
rootMessages = ahead.messages.length;