Skip to content

Commit 54e9dac

Browse files
fix(server): recover uncertain Codex delivery without losing native transfers
1 parent 5d10163 commit 54e9dac

3 files changed

Lines changed: 38 additions & 8 deletions

File tree

‎apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,9 +506,11 @@ function makeLocalCommandHarness(input: {
506506
driver: providerThread.driver,
507507
resumeThread: () =>
508508
Effect.fail(
509-
new ProviderAdapter.ProviderAdapterEventStreamError({
509+
new ProviderAdapter.ProviderAdapterResumeThreadError({
510510
driver: providerThread.driver,
511511
providerSessionId,
512+
providerThreadId,
513+
preserveNativeThread: input.nativeResumeFailure !== undefined,
512514
cause: input.nativeResumeFailure ?? "native thread is gone",
513515
}),
514516
),

‎apps/server/src/orchestration-v2/ProviderTurnStartService.ts‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,15 @@ export const layer: Layer.Layer<
595595
});
596596
return undefined;
597597
});
598+
const isNativeAccountTransfer = (target: OrchestrationV2Run) => {
599+
const previous = projection.runs.findLast(
600+
(source) =>
601+
source.ordinal < target.ordinal &&
602+
source.providerThreadId === target.providerThreadId &&
603+
source.startedAt !== null,
604+
);
605+
return previous !== undefined && previous.providerInstanceId !== target.providerInstanceId;
606+
};
598607
let effectiveHandoffs = handoffs;
599608
const loadedProviderThread = yield* Effect.gen(function* () {
600609
if (nativeForkTransfer !== undefined) {
@@ -679,17 +688,22 @@ export const layer: Layer.Layer<
679688
return resumed.success;
680689
}
681690

682-
if (session.driver === "codex") {
683-
// A transcript summary cannot recover native Codex context. Preserve
684-
// the reference so retries keep resuming the same conversation.
691+
if (
692+
session.driver === "codex" &&
693+
!uncertainDelivery &&
694+
(isNativeAccountTransfer(run) ||
695+
(resumed.failure._tag === "ProviderAdapterResumeThreadError" &&
696+
resumed.failure.preserveNativeThread === true))
697+
) {
698+
// A portable handoff cannot repair native account ownership or an
699+
// unresolved writer. Ambiguous injection instead needs a fresh thread.
685700
if (input.willRetry === true) return yield* resumed.failure;
686701
yield* settleStartFailure({
687702
signal: "provider-native-resume-failure",
688703
title: "Codex native conversation could not resume",
689704
error: resumed.failure,
690-
message: uncertainDelivery
691-
? "Codex history delivery was not acknowledged. Check the native history before retrying. The saved native conversation has been preserved."
692-
: "Codex could not resume the saved native conversation. Check account access, the shared Codex home, and other writers before retrying. The saved native conversation has been preserved.",
705+
message:
706+
"Codex could not resume the saved native conversation. Check account access, the shared Codex home, and other writers before retrying. The saved native conversation has been preserved.",
693707
});
694708
return undefined;
695709
}
@@ -1075,6 +1089,14 @@ export const layer: Layer.Layer<
10751089
source.ordinal < run.ordinal &&
10761090
source.providerThreadId === providerThread.id &&
10771091
(source.status === "failed" || source.status === "interrupted") &&
1092+
// A refused account load never sent its prompt to the native conversation.
1093+
// Recovery resumes that conversation with the new request alone.
1094+
!(
1095+
session.driver === "codex" &&
1096+
sameNativeThread &&
1097+
source.startedAt === null &&
1098+
isNativeAccountTransfer(source)
1099+
) &&
10781100
!deliveredAttemptIds.has(source.activeAttemptId),
10791101
);
10801102
const missedRunIds = new Set(missedRuns.map((source) => source.id));

‎apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,13 @@ function makeTestAdapter(input: {
194194
(input.failResumeOnce !== undefined &&
195195
(yield* Ref.getAndSet(input.failResumeOnce, false)))
196196
)
197-
return yield* unimplemented(input.driver, "simulated native resume failure");
197+
return yield* new ProviderAdapter.ProviderAdapterResumeThreadError({
198+
driver: input.driver,
199+
providerSessionId: sessionInput.providerSessionId,
200+
providerThreadId: providerThread.id,
201+
preserveNativeThread: input.driver === CODEX_DRIVER,
202+
cause: "simulated native resume failure",
203+
});
198204
return providerThread;
199205
}),
200206
...(input.injectedHistory === undefined

0 commit comments

Comments
 (0)