Skip to content

A desktop coding agent with free access to frontier models.

TypeScript

fix(collector): a long turn keeps the user's prompt in its trace

Samrat Talukdar63aea2fa1d85
diff --git a/apps/server/src/collector-observer.test.ts b/apps/server/src/collector-observer.test.ts
index 8ed8367f..cc0edf69 100644
--- a/apps/server/src/collector-observer.test.ts
+++ b/apps/server/src/collector-observer.test.ts
@@ -612,18 +612,19 @@ describe("collector observer with the collector", () => {
// The archive delta counts every completed turn the engine holds.
expect(archive.turns.at(-1)).toHaveLength(13);
- // A backlog past 32 MiB keeps the newest messages and counts the rest, as a single turn did before.
+ // A backlog past 32 MiB keeps the newest messages and counts the rest, as a single turn did before,
+ // but never drops the user's prompt.
const beforeOmission = traces().length;
engine.control.messages.push(message("msg_user_0004", "user"));
for (let index = 1; index <= 12; index += 1) engine.control.messages.push(longAnswer(`msg_huge_${String(index).padStart(4, "0")}`, 3));
await turn(60_000);
const omitted = traces().slice(beforeOmission);
expect(omitted.flatMap((envelope) => events(envelope)).filter((event) => event.type === "session.messages_omitted").map((event) => event.data))
- .toEqual([{ count: 3 }]);
+ .toEqual([{ count: 2 }]);
const kept = omitted.flatMap((envelope) => events(envelope))
.filter((event) => event.type === "turn.messages" || event.type === "turn.completed")
.flatMap((event) => ids(event.data?.messages));
- expect(kept).toEqual(Array.from({ length: 10 }, (_, index) => `msg_huge_${String(index + 3).padStart(4, "0")}`));
+ expect(kept).toEqual(["msg_user_0004", ...Array.from({ length: 10 }, (_, index) => `msg_huge_${String(index + 3).padStart(4, "0")}`)]);
for (const envelope of omitted) expect(document(envelope)).toMatchObject({ trace_truncated: false, dropped_event_count: 0 });
}, 60_000);
});
diff --git a/apps/server/src/collector-observer.ts b/apps/server/src/collector-observer.ts
index 1884dcc6..71045516 100644
--- a/apps/server/src/collector-observer.ts
+++ b/apps/server/src/collector-observer.ts
@@ -431,6 +431,13 @@ type EngineHistory = {
* them, and every message in outline, so a history of any length keeps its
* transcript and turn count.
*/
+/** Whether an engine message is the user's (a prompt), by its info.role or role. */
+function isUserMessage(message: unknown): boolean {
+ if (!isRecord(message)) return false;
+ const info = isRecord(message.info) ? message.info : message;
+ return info.role === "user";
+}
+
async function readEngineHistory(
messages: AsyncIterable<EngineMessage>,
checkpoint: string | undefined,
@@ -447,15 +454,23 @@ async function readEngineHistory(
if (checkpoint && traceMessageId(message) === checkpoint) afterCheckpoint = false;
outline.push(messageOutline(message));
if (!afterCheckpoint) continue;
- const bytes = whole && !budgetSpent ? Buffer.byteLength(JSON.stringify(message)) : 0;
+ const user = whole && isUserMessage(message);
+ const bytes = whole && (!budgetSpent || user) ? Buffer.byteLength(JSON.stringify(message)) : 0;
if (whole && !budgetSpent && deltaBytes + bytes <= budget) {
delta.push(message);
sizes.push(bytes);
deltaBytes += bytes;
continue;
}
- // Newest first: once the budget is spent, every older message is left out too.
+ // Newest first: once the budget is spent, every older message is left
+ // out too, except the user's own prompts: a long turn's first message
+ // is its prompt, and a turn without it has no question to its answers.
if (whole) budgetSpent = true;
+ if (user && bytes <= budget) {
+ delta.push(message);
+ sizes.push(bytes);
+ continue;
+ }
omitted += 1;
}
return { outline: outline.reverse(), delta: delta.reverse(), sizes: sizes.reverse(), omitted };