The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 08:30 UTC
fix(server): images from refused Claude starts survive a fresh-session recovery (#38241)
Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Wout Stiens committed
Nov 17, 2026 at 21:00 UTC
33892dcc71175c7fa8bc63a696c1d50e01e48485
2 files changed
+18
-8
apps/server/src/orchestration-v2/ProviderTurnStartService.ts
+4
-5
@@ -1049,11 +1049,8 @@ export const layer: Layer.Layer<
1049
...loadedProviderThread,
1050
contextUsage: handoffUsage,
1051
};
1052
- // The resume fallback summary already covers every earlier run in order. A
1053
- // retry copy after it would rank older missed requests as the newest history.
1052
const missedRuns = projection.runs.filter(
1053
(source) =>
1056
- !resumeFellBack &&
1054
source.ordinal < run.ordinal &&
1055
source.providerThreadId === providerThread.id &&
1056
(source.status === "failed" || source.status === "interrupted") &&
@@ -1097,8 +1094,10 @@ export const layer: Layer.Layer<
1094
const missedItems = missedHistory.filter(
1095
(item) => !coveredItemIds.has(item.id) && historicalMessage(item) !== null,
1096
);
1097
+ // The resume fallback summary already covers every earlier run in order. A
1098
+ // retry copy after it would rank older missed requests as the newest history.
1099
const handoffs =
1101
- missedItems.length === 0
1100
+ missedItems.length === 0 || resumeFellBack
1101
? []
1102
: [
1103
yield* contextHandoffService.prepareProviderHandoff({
@@ -1494,7 +1493,7 @@ export const layer: Layer.Layer<
1493
}
1494
}
1495
resumedHandoffContext = undefined;
1497
- resumedRetryHandoff = { handoffs: [], attachments: [] };
1496
+ resumedRetryHandoff = undefined;
1497
if (!(yield* isCurrentAttemptInStatus("starting"))) return undefined;
1498
// Another client is still writing to the native thread. A fresh
1499
// session here would silently split the conversation from it.
apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts
+14
-3
@@ -1973,9 +1973,16 @@ describe("orchestration v2 provider switching", () => {
1973
new ClaudeBackgroundWorkBlocksQueryReplacementError(),
1974
true,
1975
],
1976
- ] as const)("keeps the native session after turns refused for %s", ([, refusalCause, inject]) =>
1976
+ [
1977
+ "background work followed by a lost native session",
1978
+ new ClaudeBackgroundWorkBlocksQueryReplacementError(),
1979
+ false,
1980
+ true,
1981
+ ],
1982
+ ] as const)("retains missed images after %s", ([, refusalCause, inject, loseSession]) =>
1983
Effect.gen(function* () {
1984
const cwd = yield* checkpointWorkspace("refused-start-keeps-native");
1985
+ const failResumeOnce = yield* Ref.make(false);
1986
const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
1987
const injectedHistory = yield* Ref.make<ReadonlyArray<unknown>>([]);
1988
const refuseStarts = yield* Ref.make(0);
@@ -1990,6 +1997,7 @@ describe("orchestration v2 provider switching", () => {
1997
capturedTurns,
1998
refuseStarts,
1999
refusalCause,
2000
+ failResumeOnce,
2001
nativeThreadGeneration: generation,
2002
...(inject === true ? { injectedHistory } : {}),
2003
}),
@@ -2047,12 +2055,15 @@ describe("orchestration v2 provider switching", () => {
2055
yield* Ref.set(refuseStarts, 2);
2056
assert.equal(yield* run(2), "failed");
2057
assert.equal(yield* run(3), "failed");
2058
+ yield* Ref.set(failResumeOnce, loseSession === true);
2059
assert.equal(yield* run(4), "completed");
2060
2061
const turns = yield* Ref.get(capturedTurns);
2062
assert.equal(turns.length, 2);
2054
- assert.equal(yield* Ref.get(generation), 1);
2055
- assert.equal(turns[1]?.nativeThreadId, turns[0]?.nativeThreadId);
2063
+ assert.equal(yield* Ref.get(generation), loseSession === true ? 2 : 1);
2064
+ if (loseSession !== true) {
2065
+ assert.equal(turns[1]?.nativeThreadId, turns[0]?.nativeThreadId);
2066
+ }
2067
const delivered = `${turns[1]?.text}${JSON.stringify(yield* Ref.get(injectedHistory))}`;
2068
assert.include(delivered, "Request 2");
2069
assert.include(delivered, "Request 3");