Skip to content

fix(server): reopen Codex sessions whose app-server exited #990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rynfar merged 1 commit into from
Oct 3, 2026
Merged

fix(server): reopen Codex sessions whose app-server exited #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 23 additions & 2 deletions apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ import {
} from "../AttachmentPrompt.ts";
import {
ProviderAdapterEnsureThreadError,
ProviderAdapterEventStreamError,
ProviderAdapterForkThreadError,
ProviderAdapterInterruptError,
ProviderAdapterOpenSessionError,
Expand Down Expand Up @@ -1630,7 +1631,27 @@ export function makeCodexAdapterV2(adapterOptions: CodexAdapterV2Options): Provi
model: input.modelSelection.model,
now,
});
const events = yield* Queue.unbounded<ProviderAdapterV2Event>();
const events = yield* Queue.unbounded<
ProviderAdapterV2Event,
ProviderAdapterEventStreamError
>();
// An app-server that exits leaves this runtime unable to start turns.
// Fail its event stream once already-queued events drain, so the
// session manager releases the session as runtime_error and the next
// turn opens a fresh app-server that resumes the native thread.
yield* client.awaitTermination.pipe(
Effect.flatMap((cause) =>
Queue.fail(
events,
new ProviderAdapterEventStreamError({
driver: CODEX_PROVIDER,
providerSessionId: input.providerSessionId,
cause,
}),
),
),
Effect.forkIn(scope),
);
const rateLimitSnapshot = yield* Ref.make<CodexRateLimitSnapshot | undefined>(undefined);
const limitedTurnItems = yield* Ref.make(
new Map<ProviderThreadId, Extract<OrchestrationV2TurnItem, { type: "error" }>>(),
Expand Down Expand Up @@ -5350,7 +5371,7 @@ export function makeCodexAdapterV2(adapterOptions: CodexAdapterV2Options): Provi
driver: CODEX_PROVIDER,
providerSessionId: input.providerSessionId,
providerSession: session,
events: Stream.fromEffectRepeat(Queue.take(events)),
events: Stream.fromQueue(events),
canReuseContextUsage: canReuseCodexContextUsage,
// Known gap: a subagent that Codex resumes later reads as completed
// (not pending) between turns, so idle release can win the race
Expand Down
Loading
Loading