Skip to content

Commit 7d8de88

Browse files
committed
fix(onboarding): make recent agent thread imports safe to retry
1 parent e2725bb commit 7d8de88

19 files changed

Lines changed: 1216 additions & 260 deletions

‎apps/server/src/orchestration/Layers/ProjectionPipeline.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ function retainProjectionMessagesAfterRevert(
253253
}
254254

255255
for (const message of messages) {
256-
if (message.role === "system") {
256+
if (message.role === "system" || isImportedAgentSessionMessageId(message.messageId)) {
257257
retainedMessageIds.add(message.messageId);
258258
continue;
259259
}
@@ -263,7 +263,10 @@ function retainProjectionMessagesAfterRevert(
263263
}
264264

265265
const retainedUserCount = messages.filter(
266-
(message) => message.role === "user" && retainedMessageIds.has(message.messageId),
266+
(message) =>
267+
message.role === "user" &&
268+
!isImportedAgentSessionMessageId(message.messageId) &&
269+
retainedMessageIds.has(message.messageId),
267270
).length;
268271
const missingUserCount = Math.max(0, turnCount - retainedUserCount);
269272
if (missingUserCount > 0) {
@@ -286,7 +289,10 @@ function retainProjectionMessagesAfterRevert(
286289
}
287290

288291
const retainedAssistantCount = messages.filter(
289-
(message) => message.role === "assistant" && retainedMessageIds.has(message.messageId),
292+
(message) =>
293+
message.role === "assistant" &&
294+
!isImportedAgentSessionMessageId(message.messageId) &&
295+
retainedMessageIds.has(message.messageId),
290296
).length;
291297
const missingAssistantCount = Math.max(0, turnCount - retainedAssistantCount);
292298
if (missingAssistantCount > 0) {

‎apps/server/src/orchestration/decider.import.test.ts‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ it.layer(NodeServices.layer)("thread history import", (it) => {
1818
it.effect("emits completed user and assistant messages without starting a turn", () =>
1919
Effect.gen(function* () {
2020
const createdAt = "2026-08-24T10:00:00.000Z";
21-
const threadId = ThreadId.make("thread-imported");
21+
const threadId = ThreadId.make("import:codex:session-1");
2222
const readModel = yield* projectEvent(createEmptyReadModel(createdAt), {
2323
sequence: 1,
2424
eventId: EventId.make("event-thread-created"),
@@ -51,13 +51,13 @@ it.layer(NodeServices.layer)("thread history import", (it) => {
5151
threadId,
5252
messages: [
5353
{
54-
messageId: MessageId.make("message-user"),
54+
messageId: MessageId.make(`${threadId}:000000`),
5555
role: "user",
5656
text: "Fix the bug",
5757
createdAt,
5858
},
5959
{
60-
messageId: MessageId.make("message-assistant"),
60+
messageId: MessageId.make(`${threadId}:000001`),
6161
role: "assistant",
6262
text: "Fixed",
6363
createdAt: "2026-08-24T10:01:00.000Z",
@@ -78,6 +78,38 @@ it.layer(NodeServices.layer)("thread history import", (it) => {
7878
metadata: { historyImport: true },
7979
payload: { role: "assistant", text: "Fixed", turnId: null, streaming: false },
8080
},
81+
{
82+
type: "thread.settled",
83+
metadata: { historyImport: true },
84+
occurredAt: "2026-08-24T10:01:00.000Z",
85+
payload: {
86+
settledAt: "2026-08-24T10:01:00.000Z",
87+
updatedAt: "2026-08-24T10:01:00.000Z",
88+
},
89+
},
90+
]);
91+
92+
let projected = readModel;
93+
const plannedEvents = Array.isArray(events) ? events : [events];
94+
for (const [index, event] of plannedEvents.entries()) {
95+
projected = yield* projectEvent(projected, { ...event, sequence: index + 2 });
96+
}
97+
projected = yield* projectEvent(projected, {
98+
sequence: 5,
99+
eventId: EventId.make("event-import-reverted"),
100+
aggregateKind: "thread",
101+
aggregateId: threadId,
102+
type: "thread.reverted",
103+
occurredAt: "2026-08-24T10:02:00.000Z",
104+
commandId: CommandId.make("command-import-reverted"),
105+
causationEventId: null,
106+
correlationId: CommandId.make("command-import-reverted"),
107+
metadata: {},
108+
payload: { threadId, turnCount: 0 },
109+
});
110+
expect(projected.threads[0]?.messages.map((message) => message.text)).toEqual([
111+
"Fix the bug",
112+
"Fixed",
81113
]);
82114
}),
83115
);

‎apps/server/src/orchestration/decider.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,6 +1295,13 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
12951295
command,
12961296
threadId: command.threadId,
12971297
});
1298+
const firstMessage = command.messages[0];
1299+
if (firstMessage === undefined) {
1300+
return yield* new OrchestrationCommandInvariantError({
1301+
commandType: command.type,
1302+
detail: "Thread history imports require at least one message.",
1303+
});
1304+
}
12981305

12991306
const events: Array<PlannedOrchestrationEvent> = [];
13001307
for (const message of command.messages) {
@@ -1319,6 +1326,25 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
13191326
},
13201327
});
13211328
}
1329+
const settledAt = command.messages.reduce(
1330+
(latest, message) => (message.createdAt > latest ? message.createdAt : latest),
1331+
firstMessage.createdAt,
1332+
);
1333+
events.push({
1334+
...(yield* withEventBase({
1335+
aggregateKind: "thread",
1336+
aggregateId: command.threadId,
1337+
occurredAt: settledAt,
1338+
commandId: command.commandId,
1339+
metadata: { historyImport: true },
1340+
})),
1341+
type: "thread.settled",
1342+
payload: {
1343+
threadId: command.threadId,
1344+
settledAt,
1345+
updatedAt: settledAt,
1346+
},
1347+
});
13221348
return events;
13231349
}
13241350

‎apps/server/src/orchestration/projector.ts‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { OrchestrationEvent, OrchestrationReadModel, ThreadId } from "@t3tools/contracts";
22
import {
3+
isImportedAgentSessionMessageId,
34
OrchestrationCheckpointSummary,
45
OrchestrationMessage,
56
OrchestrationSession,
@@ -94,7 +95,7 @@ function retainThreadMessagesAfterRevert(
9495
): ReadonlyArray<OrchestrationMessage> {
9596
const retainedMessageIds = new Set<string>();
9697
for (const message of messages) {
97-
if (message.role === "system") {
98+
if (message.role === "system" || isImportedAgentSessionMessageId(message.id)) {
9899
retainedMessageIds.add(message.id);
99100
continue;
100101
}
@@ -104,7 +105,10 @@ function retainThreadMessagesAfterRevert(
104105
}
105106

106107
const retainedUserCount = messages.filter(
107-
(message) => message.role === "user" && retainedMessageIds.has(message.id),
108+
(message) =>
109+
message.role === "user" &&
110+
!isImportedAgentSessionMessageId(message.id) &&
111+
retainedMessageIds.has(message.id),
108112
).length;
109113
const missingUserCount = Math.max(0, turnCount - retainedUserCount);
110114
if (missingUserCount > 0) {
@@ -126,7 +130,10 @@ function retainThreadMessagesAfterRevert(
126130
}
127131

128132
const retainedAssistantCount = messages.filter(
129-
(message) => message.role === "assistant" && retainedMessageIds.has(message.id),
133+
(message) =>
134+
message.role === "assistant" &&
135+
!isImportedAgentSessionMessageId(message.id) &&
136+
retainedMessageIds.has(message.id),
130137
).length;
131138
const missingAssistantCount = Math.max(0, turnCount - retainedAssistantCount);
132139
if (missingAssistantCount > 0) {

0 commit comments

Comments
 (0)