Skip to content

Commit 7f7810f

Browse files
fix(server): ignore provider diffs for missing turns
1 parent 198be6e commit 7f7810f

2 files changed

Lines changed: 57 additions & 1 deletion

File tree

‎apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4192,13 +4192,58 @@ describe("ProviderRuntimeIngestion", () => {
41924192
}),
41934193
);
41944194

4195+
effectIt.effect("ignores a diff for a missing turn without moving the latest turn", () =>
4196+
Effect.gen(function* () {
4197+
const harness = yield* Effect.promise(() => createHarness());
4198+
const base = {
4199+
provider: ProviderDriverKind.make("codex"),
4200+
threadId: asThreadId("thread-1"),
4201+
createdAt: "2026-01-01T00:00:00.000Z",
4202+
};
4203+
yield* Effect.promise(() =>
4204+
harness.emitAndDrain([
4205+
{
4206+
...base,
4207+
type: "turn.started",
4208+
eventId: asEventId("evt-existing-turn"),
4209+
turnId: asTurnId("current-turn"),
4210+
},
4211+
{
4212+
...base,
4213+
type: "turn.diff.updated",
4214+
eventId: asEventId("evt-missing-turn-diff"),
4215+
turnId: asTurnId("missing-turn"),
4216+
payload: { unifiedDiff: "diff --git a/file.ts b/file.ts\n+late\n" },
4217+
},
4218+
]),
4219+
);
4220+
const snapshot = yield* Effect.promise(harness.readModel);
4221+
expect(snapshot.threads[0]?.checkpoints).toEqual([]);
4222+
expect(snapshot.threads[0]?.latestTurn).toMatchObject({
4223+
turnId: "current-turn",
4224+
state: "running",
4225+
});
4226+
expect(
4227+
yield* Effect.promise(() => harness.readTurn(asTurnId("missing-turn"))),
4228+
).toBeUndefined();
4229+
}),
4230+
);
4231+
41954232
effectIt.effect("tracks provider diff updates from a nested Git workspace", () =>
41964233
Effect.gen(function* () {
41974234
const harness = yield* Effect.promise(() =>
41984235
createHarness({ workspaceSubdirectory: "apps/server" }),
41994236
);
42004237
yield* Effect.promise(() =>
42014238
harness.emitAndDrain([
4239+
{
4240+
type: "turn.started",
4241+
eventId: asEventId("evt-nested-turn-started"),
4242+
provider: ProviderDriverKind.make("codex"),
4243+
createdAt: "2026-01-01T00:00:00.000Z",
4244+
threadId: asThreadId("thread-1"),
4245+
turnId: asTurnId("nested-turn"),
4246+
},
42024247
{
42034248
type: "turn.diff.updated",
42044249
eventId: asEventId("evt-nested-diff"),
@@ -4223,6 +4268,17 @@ describe("ProviderRuntimeIngestion", () => {
42234268
const harness = await createHarness();
42244269
const now = "2026-01-01T00:00:00.000Z";
42254270

4271+
await harness.emitAndDrain([
4272+
{
4273+
type: "turn.started",
4274+
eventId: asEventId("evt-p1-turn-started"),
4275+
provider: ProviderDriverKind.make("codex"),
4276+
createdAt: now,
4277+
threadId: asThreadId("thread-1"),
4278+
turnId: asTurnId("turn-p1"),
4279+
},
4280+
]);
4281+
42264282
harness.emit({
42274283
type: "thread.metadata.updated",
42284284
eventId: asEventId("evt-thread-metadata-updated"),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2601,7 +2601,7 @@ const make = Effect.gen(function* () {
26012601
const turnId = toTurnId(event.turnId);
26022602
if (!thread || !turnId) return;
26032603
const turn = yield* projectionTurnRepository.getByTurnId({ threadId: thread.id, turnId });
2604-
if (Option.isSome(turn) && turn.value.state !== "running") return;
2604+
if (Option.isNone(turn) || turn.value.state !== "running") return;
26052605
const checkpointContext = yield* projectionSnapshotQuery
26062606
.getThreadCheckpointContext(thread.id)
26072607
.pipe(Effect.map(Option.getOrUndefined));

0 commit comments

Comments
 (0)