Skip to content

Commit a204547

Browse files
morgan yemorgan ye
authored andcommitted
Fix checkpoint refresh on turn completion
1 parent 52c900c commit a204547

2 files changed

Lines changed: 233 additions & 24 deletions

File tree

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

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,190 @@ describe("CheckpointReactor", () => {
415415
).toBe("v2\n");
416416
});
417417

418+
it("refreshes an existing real checkpoint on completed turn completion without duplicating activity", async () => {
419+
const harness = await createHarness({ seedFilesystemCheckpoints: false });
420+
const createdAt = new Date().toISOString();
421+
422+
await Effect.runPromise(
423+
harness.engine.dispatch({
424+
type: "thread.session.set",
425+
commandId: CommandId.makeUnsafe("cmd-session-set-refresh-existing-checkpoint"),
426+
threadId: ThreadId.makeUnsafe("thread-1"),
427+
session: {
428+
threadId: ThreadId.makeUnsafe("thread-1"),
429+
status: "ready",
430+
providerName: "codex",
431+
runtimeMode: "approval-required",
432+
activeTurnId: null,
433+
lastError: null,
434+
updatedAt: createdAt,
435+
},
436+
createdAt,
437+
}),
438+
);
439+
440+
harness.provider.emit({
441+
type: "turn.started",
442+
eventId: EventId.makeUnsafe("evt-turn-started-refresh-existing-checkpoint"),
443+
provider: "codex",
444+
createdAt: new Date().toISOString(),
445+
threadId: ThreadId.makeUnsafe("thread-1"),
446+
turnId: asTurnId("turn-refresh"),
447+
});
448+
await waitForGitRefExists(
449+
harness.cwd,
450+
checkpointRefForThreadTurn(ThreadId.makeUnsafe("thread-1"), 0),
451+
);
452+
453+
fs.writeFileSync(path.join(harness.cwd, "README.md"), "v2\n", "utf8");
454+
await Effect.runPromise(
455+
harness.engine.dispatch({
456+
type: "thread.turn.diff.complete",
457+
commandId: CommandId.makeUnsafe("cmd-placeholder-diff-refresh-existing-checkpoint"),
458+
threadId: ThreadId.makeUnsafe("thread-1"),
459+
turnId: asTurnId("turn-refresh"),
460+
completedAt: new Date().toISOString(),
461+
checkpointRef: checkpointRefForThreadTurn(ThreadId.makeUnsafe("thread-1"), 1),
462+
status: "missing",
463+
files: [],
464+
checkpointTurnCount: 1,
465+
createdAt: new Date().toISOString(),
466+
}),
467+
);
468+
469+
await waitForGitRefExists(
470+
harness.cwd,
471+
checkpointRefForThreadTurn(ThreadId.makeUnsafe("thread-1"), 1),
472+
);
473+
expect(
474+
gitShowFileAtRef(
475+
harness.cwd,
476+
checkpointRefForThreadTurn(ThreadId.makeUnsafe("thread-1"), 1),
477+
"README.md",
478+
),
479+
).toBe("v2\n");
480+
481+
fs.writeFileSync(path.join(harness.cwd, "README.md"), "v3\n", "utf8");
482+
harness.provider.emit({
483+
type: "turn.completed",
484+
eventId: EventId.makeUnsafe("evt-turn-completed-refresh-existing-checkpoint"),
485+
provider: "codex",
486+
createdAt: new Date().toISOString(),
487+
threadId: ThreadId.makeUnsafe("thread-1"),
488+
turnId: asTurnId("turn-refresh"),
489+
payload: { state: "completed" },
490+
});
491+
492+
await harness.drain();
493+
expect(
494+
gitShowFileAtRef(
495+
harness.cwd,
496+
checkpointRefForThreadTurn(ThreadId.makeUnsafe("thread-1"), 1),
497+
"README.md",
498+
),
499+
).toBe("v3\n");
500+
501+
const readModel = await Effect.runPromise(harness.engine.getReadModel());
502+
const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
503+
expect(thread?.checkpoints).toHaveLength(1);
504+
expect(thread?.checkpoints[0]?.checkpointTurnCount).toBe(1);
505+
expect(
506+
thread?.activities.filter((activity) => activity.kind === "checkpoint.captured"),
507+
).toHaveLength(1);
508+
});
509+
510+
it("does not refresh an existing real checkpoint for non-completed turn completion", async () => {
511+
const harness = await createHarness({ seedFilesystemCheckpoints: false });
512+
const createdAt = new Date().toISOString();
513+
514+
await Effect.runPromise(
515+
harness.engine.dispatch({
516+
type: "thread.session.set",
517+
commandId: CommandId.makeUnsafe("cmd-session-set-skip-refresh-interrupted"),
518+
threadId: ThreadId.makeUnsafe("thread-1"),
519+
session: {
520+
threadId: ThreadId.makeUnsafe("thread-1"),
521+
status: "ready",
522+
providerName: "codex",
523+
runtimeMode: "approval-required",
524+
activeTurnId: null,
525+
lastError: null,
526+
updatedAt: createdAt,
527+
},
528+
createdAt,
529+
}),
530+
);
531+
532+
harness.provider.emit({
533+
type: "turn.started",
534+
eventId: EventId.makeUnsafe("evt-turn-started-skip-refresh-interrupted"),
535+
provider: "codex",
536+
createdAt: new Date().toISOString(),
537+
threadId: ThreadId.makeUnsafe("thread-1"),
538+
turnId: asTurnId("turn-interrupted-refresh"),
539+
});
540+
await waitForGitRefExists(
541+
harness.cwd,
542+
checkpointRefForThreadTurn(ThreadId.makeUnsafe("thread-1"), 0),
543+
);
544+
545+
fs.writeFileSync(path.join(harness.cwd, "README.md"), "v2\n", "utf8");
546+
await Effect.runPromise(
547+
harness.engine.dispatch({
548+
type: "thread.turn.diff.complete",
549+
commandId: CommandId.makeUnsafe("cmd-placeholder-diff-skip-refresh-interrupted"),
550+
threadId: ThreadId.makeUnsafe("thread-1"),
551+
turnId: asTurnId("turn-interrupted-refresh"),
552+
completedAt: new Date().toISOString(),
553+
checkpointRef: checkpointRefForThreadTurn(ThreadId.makeUnsafe("thread-1"), 1),
554+
status: "missing",
555+
files: [],
556+
checkpointTurnCount: 1,
557+
createdAt: new Date().toISOString(),
558+
}),
559+
);
560+
561+
await waitForGitRefExists(
562+
harness.cwd,
563+
checkpointRefForThreadTurn(ThreadId.makeUnsafe("thread-1"), 1),
564+
);
565+
expect(
566+
gitShowFileAtRef(
567+
harness.cwd,
568+
checkpointRefForThreadTurn(ThreadId.makeUnsafe("thread-1"), 1),
569+
"README.md",
570+
),
571+
).toBe("v2\n");
572+
573+
fs.writeFileSync(path.join(harness.cwd, "README.md"), "v3\n", "utf8");
574+
harness.provider.emit({
575+
type: "turn.completed",
576+
eventId: EventId.makeUnsafe("evt-turn-completed-skip-refresh-interrupted"),
577+
provider: "codex",
578+
createdAt: new Date().toISOString(),
579+
threadId: ThreadId.makeUnsafe("thread-1"),
580+
turnId: asTurnId("turn-interrupted-refresh"),
581+
payload: { state: "interrupted" },
582+
});
583+
584+
await harness.drain();
585+
expect(
586+
gitShowFileAtRef(
587+
harness.cwd,
588+
checkpointRefForThreadTurn(ThreadId.makeUnsafe("thread-1"), 1),
589+
"README.md",
590+
),
591+
).toBe("v2\n");
592+
593+
const readModel = await Effect.runPromise(harness.engine.getReadModel());
594+
const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
595+
expect(thread?.checkpoints).toHaveLength(1);
596+
expect(thread?.checkpoints[0]?.checkpointTurnCount).toBe(1);
597+
expect(
598+
thread?.activities.filter((activity) => activity.kind === "checkpoint.captured"),
599+
).toHaveLength(1);
600+
});
601+
418602
it("ignores auxiliary thread turn completion while primary turn is active", async () => {
419603
const harness = await createHarness({ seedFilesystemCheckpoints: false });
420604
const createdAt = new Date().toISOString();

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

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ const make = Effect.gen(function* () {
202202
readonly status: "ready" | "missing" | "error";
203203
readonly assistantMessageId: MessageId | undefined;
204204
readonly createdAt: string;
205+
readonly emitCapturedActivity?: boolean | undefined;
205206
}) {
206207
const fromTurnCount = Math.max(0, input.turnCount - 1);
207208
const fromCheckpointRef = checkpointRefForThreadTurn(input.threadId, fromTurnCount);
@@ -299,24 +300,26 @@ const make = Effect.gen(function* () {
299300
createdAt: input.createdAt,
300301
});
301302

302-
yield* orchestrationEngine.dispatch({
303-
type: "thread.activity.append",
304-
commandId: serverCommandId("checkpoint-captured-activity"),
305-
threadId: input.threadId,
306-
activity: {
307-
id: EventId.makeUnsafe(crypto.randomUUID()),
308-
tone: "info",
309-
kind: "checkpoint.captured",
310-
summary: "Checkpoint captured",
311-
payload: {
312-
turnCount: input.turnCount,
313-
status: input.status,
303+
if (input.emitCapturedActivity ?? true) {
304+
yield* orchestrationEngine.dispatch({
305+
type: "thread.activity.append",
306+
commandId: serverCommandId("checkpoint-captured-activity"),
307+
threadId: input.threadId,
308+
activity: {
309+
id: EventId.makeUnsafe(crypto.randomUUID()),
310+
tone: "info",
311+
kind: "checkpoint.captured",
312+
summary: "Checkpoint captured",
313+
payload: {
314+
turnCount: input.turnCount,
315+
status: input.status,
316+
},
317+
turnId: input.turnId,
318+
createdAt: input.createdAt,
314319
},
315-
turnId: input.turnId,
316320
createdAt: input.createdAt,
317-
},
318-
createdAt: input.createdAt,
319-
});
321+
});
322+
}
320323
});
321324

322325
// Captures a real git checkpoint when a turn completes via a runtime event.
@@ -339,14 +342,36 @@ const make = Effect.gen(function* () {
339342
return;
340343
}
341344

342-
// Only skip if a real (non-placeholder) checkpoint already exists for this turn.
343-
// ProviderRuntimeIngestion may insert placeholder entries with status "missing"
344-
// before this reactor runs; those must not prevent real git capture.
345-
if (
346-
thread.checkpoints.some(
347-
(checkpoint) => checkpoint.turnId === turnId && checkpoint.status !== "missing",
348-
)
349-
) {
345+
const existingNonMissing = thread.checkpoints.find(
346+
(checkpoint) => checkpoint.turnId === turnId && checkpoint.status !== "missing",
347+
);
348+
// If a real checkpoint was already captured mid-turn (first turn.diff.updated),
349+
// re-capture at turn completion only for successful turns so the diff
350+
// includes all edits from that turn without changing non-success semantics.
351+
if (existingNonMissing && event.payload.state === "completed") {
352+
const checkpointCwdForRefresh = yield* resolveCheckpointCwd({
353+
threadId: thread.id,
354+
thread,
355+
projects: readModel.projects,
356+
preferSessionRuntime: true,
357+
});
358+
if (!checkpointCwdForRefresh) {
359+
return;
360+
}
361+
yield* captureAndDispatchCheckpoint({
362+
threadId: thread.id,
363+
turnId,
364+
thread,
365+
cwd: checkpointCwdForRefresh,
366+
turnCount: existingNonMissing.checkpointTurnCount,
367+
status: checkpointStatusFromRuntime(event.payload.state),
368+
assistantMessageId: existingNonMissing.assistantMessageId ?? undefined,
369+
createdAt: event.createdAt,
370+
emitCapturedActivity: false,
371+
});
372+
return;
373+
}
374+
if (existingNonMissing) {
350375
return;
351376
}
352377

0 commit comments

Comments
 (0)