Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions apps/server/src/orchestration-v2/ProviderTurnStartService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1049,11 +1049,8 @@ export const layer: Layer.Layer<
...loadedProviderThread,
contextUsage: handoffUsage,
};
// The resume fallback summary already covers every earlier run in order. A
// retry copy after it would rank older missed requests as the newest history.
const missedRuns = projection.runs.filter(
(source) =>
!resumeFellBack &&
source.ordinal < run.ordinal &&
source.providerThreadId === providerThread.id &&
(source.status === "failed" || source.status === "interrupted") &&
Expand Down Expand Up @@ -1097,8 +1094,10 @@ export const layer: Layer.Layer<
const missedItems = missedHistory.filter(
(item) => !coveredItemIds.has(item.id) && historicalMessage(item) !== null,
);
// The resume fallback summary already covers every earlier run in order. A
// retry copy after it would rank older missed requests as the newest history.
const handoffs =
missedItems.length === 0
missedItems.length === 0 || resumeFellBack
? []
: [
yield* contextHandoffService.prepareProviderHandoff({
Expand Down Expand Up @@ -1494,7 +1493,7 @@ export const layer: Layer.Layer<
}
}
resumedHandoffContext = undefined;
resumedRetryHandoff = { handoffs: [], attachments: [] };
resumedRetryHandoff = undefined;
if (!(yield* isCurrentAttemptInStatus("starting"))) return undefined;
// Another client is still writing to the native thread. A fresh
// session here would silently split the conversation from it.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1973,9 +1973,16 @@ describe("orchestration v2 provider switching", () => {
new ClaudeBackgroundWorkBlocksQueryReplacementError(),
true,
],
] as const)("keeps the native session after turns refused for %s", ([, refusalCause, inject]) =>
[
"background work followed by a lost native session",
new ClaudeBackgroundWorkBlocksQueryReplacementError(),
false,
true,
],
] as const)("retains missed images after %s", ([, refusalCause, inject, loseSession]) =>
Effect.gen(function* () {
const cwd = yield* checkpointWorkspace("refused-start-keeps-native");
const failResumeOnce = yield* Ref.make(false);
const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
const injectedHistory = yield* Ref.make<ReadonlyArray<unknown>>([]);
const refuseStarts = yield* Ref.make(0);
Expand All @@ -1990,6 +1997,7 @@ describe("orchestration v2 provider switching", () => {
capturedTurns,
refuseStarts,
refusalCause,
failResumeOnce,
nativeThreadGeneration: generation,
...(inject === true ? { injectedHistory } : {}),
}),
Expand Down Expand Up @@ -2047,12 +2055,15 @@ describe("orchestration v2 provider switching", () => {
yield* Ref.set(refuseStarts, 2);
assert.equal(yield* run(2), "failed");
assert.equal(yield* run(3), "failed");
yield* Ref.set(failResumeOnce, loseSession === true);
assert.equal(yield* run(4), "completed");

const turns = yield* Ref.get(capturedTurns);
assert.equal(turns.length, 2);
assert.equal(yield* Ref.get(generation), 1);
assert.equal(turns[1]?.nativeThreadId, turns[0]?.nativeThreadId);
assert.equal(yield* Ref.get(generation), loseSession === true ? 2 : 1);
if (loseSession !== true) {
assert.equal(turns[1]?.nativeThreadId, turns[0]?.nativeThreadId);
}
const delivered = `${turns[1]?.text}${JSON.stringify(yield* Ref.get(injectedHistory))}`;
assert.include(delivered, "Request 2");
assert.include(delivered, "Request 3");
Expand Down
Loading