Skip to content

Commit d8dbb78

Browse files
fix(clients): retain response cuts with unloaded ancestors
1 parent 7160933 commit d8dbb78

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

‎packages/client-runtime/src/state/threadWorkflows.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,5 +493,7 @@ describe("response fork boundaries", () => {
493493
expect(cutFor(v2ThreadId, true)).toBe(cutId);
494494
expect(cutFor(firstFork, false)).toBe(cutId);
495495
expect(cutFor(secondFork, false)).toBe(cutId);
496+
ancestry.delete(firstFork);
497+
expect(cutFor(secondFork, false)).toBe(cutId);
496498
});
497499
});

‎packages/client-runtime/src/state/threadWorkflows.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@ export function forkCutTurnItemId(input: {
205205
while (!seen.has(threadId)) {
206206
seen.add(threadId);
207207
const forkedFrom = input.readForkedFrom(threadId);
208+
// An archived ancestor may be absent from the client's shell index.
209+
if (forkedFrom === undefined && input.projectedItem.sourceThreadId !== input.threadId) {
210+
return input.projectedItem.item.id;
211+
}
208212
if (forkedFrom?.type !== "run") return undefined;
209213
if (forkedFrom.threadId === input.projectedItem.sourceThreadId) {
210214
return forkedFrom.throughTurnItemId === input.projectedItem.sourceItemId

0 commit comments

Comments
 (0)