Skip to content

Commit 611a011

Browse files
committed
fix(checkpoint): filter out missing checkpoints when calculating turn counts
1 parent 04462bd commit 611a011

2 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎apps/server/src/checkpointing/Layers/CheckpointDiffQuery.ts‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@ const make = Effect.gen(function* () {
5050
});
5151
}
5252

53-
const maxTurnCount = thread.checkpoints.reduce(
54-
(max, checkpoint) => Math.max(max, checkpoint.checkpointTurnCount),
55-
0,
56-
);
53+
const maxTurnCount = thread.checkpoints
54+
.filter((checkpoint) => checkpoint.status !== "missing")
55+
.reduce((max, checkpoint) => Math.max(max, checkpoint.checkpointTurnCount), 0);
5756
if (input.toTurnCount > maxTurnCount) {
5857
return yield* new CheckpointUnavailableError({
5958
threadId: input.threadId,
@@ -76,9 +75,11 @@ const make = Effect.gen(function* () {
7675
const fromCheckpointRef =
7776
input.fromTurnCount === 0
7877
? checkpointRefForThreadTurn(input.threadId, 0)
79-
: thread.checkpoints.find(
80-
(checkpoint) => checkpoint.checkpointTurnCount === input.fromTurnCount,
81-
)?.checkpointRef;
78+
: thread.checkpoints
79+
.filter((checkpoint) => checkpoint.status !== "missing")
80+
.find(
81+
(checkpoint) => checkpoint.checkpointTurnCount === input.fromTurnCount,
82+
)?.checkpointRef;
8283
if (!fromCheckpointRef) {
8384
return yield* new CheckpointUnavailableError({
8485
threadId: input.threadId,
@@ -87,9 +88,11 @@ const make = Effect.gen(function* () {
8788
});
8889
}
8990

90-
const toCheckpointRef = thread.checkpoints.find(
91-
(checkpoint) => checkpoint.checkpointTurnCount === input.toTurnCount,
92-
)?.checkpointRef;
91+
const toCheckpointRef = thread.checkpoints
92+
.filter((checkpoint) => checkpoint.status !== "missing")
93+
.find(
94+
(checkpoint) => checkpoint.checkpointTurnCount === input.toTurnCount,
95+
)?.checkpointRef;
9396
if (!toCheckpointRef) {
9497
return yield* new CheckpointUnavailableError({
9598
threadId: input.threadId,

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,9 @@ const make = Effect.gen(function* () {
333333
return;
334334
}
335335

336-
const currentTurnCount = thread.checkpoints.reduce(
337-
(maxTurnCount, checkpoint) => Math.max(maxTurnCount, checkpoint.checkpointTurnCount),
338-
0,
339-
);
336+
const currentTurnCount = thread.checkpoints
337+
.filter((checkpoint) => checkpoint.status !== "missing")
338+
.reduce((maxTurnCount, checkpoint) => Math.max(maxTurnCount, checkpoint.checkpointTurnCount), 0);
340339
const baselineCheckpointRef = checkpointRefForThreadTurn(thread.id, currentTurnCount);
341340
const baselineExists = yield* checkpointStore.hasCheckpointRef({
342341
cwd: checkpointCwd,
@@ -395,10 +394,9 @@ const make = Effect.gen(function* () {
395394
return;
396395
}
397396

398-
const currentTurnCount = thread.checkpoints.reduce(
399-
(maxTurnCount, checkpoint) => Math.max(maxTurnCount, checkpoint.checkpointTurnCount),
400-
0,
401-
);
397+
const currentTurnCount = thread.checkpoints
398+
.filter((checkpoint) => checkpoint.status !== "missing")
399+
.reduce((maxTurnCount, checkpoint) => Math.max(maxTurnCount, checkpoint.checkpointTurnCount), 0);
402400
const baselineCheckpointRef = checkpointRefForThreadTurn(threadId, currentTurnCount);
403401
const baselineExists = yield* checkpointStore.hasCheckpointRef({
404402
cwd: checkpointCwd,
@@ -451,10 +449,9 @@ const make = Effect.gen(function* () {
451449
return;
452450
}
453451

454-
const currentTurnCount = thread.checkpoints.reduce(
455-
(maxTurnCount, checkpoint) => Math.max(maxTurnCount, checkpoint.checkpointTurnCount),
456-
0,
457-
);
452+
const currentTurnCount = thread.checkpoints
453+
.filter((checkpoint) => checkpoint.status !== "missing")
454+
.reduce((maxTurnCount, checkpoint) => Math.max(maxTurnCount, checkpoint.checkpointTurnCount), 0);
458455

459456
if (event.payload.turnCount > currentTurnCount) {
460457
yield* appendRevertFailureActivity({

0 commit comments

Comments
 (0)