Skip to content

Commit ccdecf1

Browse files
fix(server): settle error exits without runtime errors
1 parent 592c598 commit ccdecf1

2 files changed

Lines changed: 58 additions & 9 deletions

File tree

‎apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2714,6 +2714,48 @@ describe("ProviderRuntimeIngestion", () => {
27142714
expect(thread.session?.lastError).toBe("runtime exploded");
27152715
});
27162716

2717+
it("settles an active turn when an error session exit arrives without runtime.error", async () => {
2718+
const harness = await createHarness();
2719+
const turnId = asTurnId("turn-session-exit-error");
2720+
2721+
harness.emit({
2722+
type: "turn.started",
2723+
eventId: asEventId("evt-session-exit-error-turn-started"),
2724+
provider: ProviderDriverKind.make("codex"),
2725+
createdAt: "2026-01-01T00:00:00.000Z",
2726+
threadId: asThreadId("thread-1"),
2727+
turnId,
2728+
});
2729+
2730+
await waitForThread(
2731+
harness.readModel,
2732+
(entry) => entry.session?.status === "running" && entry.session.activeTurnId === turnId,
2733+
);
2734+
2735+
harness.emit({
2736+
type: "session.exited",
2737+
eventId: asEventId("evt-session-exit-error"),
2738+
provider: ProviderDriverKind.make("codex"),
2739+
createdAt: "2026-01-01T00:00:01.000Z",
2740+
threadId: asThreadId("thread-1"),
2741+
payload: {
2742+
reason: "Provider process exited unexpectedly (137).",
2743+
exitKind: "error",
2744+
},
2745+
});
2746+
2747+
const thread = await waitForThread(
2748+
harness.readModel,
2749+
(entry) =>
2750+
entry.session?.status === "error" &&
2751+
entry.session.activeTurnId === null &&
2752+
entry.session.lastError === "Provider process exited unexpectedly (137).",
2753+
);
2754+
expect(thread.session?.status).toBe("error");
2755+
expect(thread.session?.activeTurnId).toBeNull();
2756+
expect(thread.session?.lastError).toBe("Provider process exited unexpectedly (137).");
2757+
});
2758+
27172759
it("records runtime.error activities from the typed payload message", async () => {
27182760
const harness = await createHarness();
27192761
const now = "2026-01-01T00:00:00.000Z";

‎apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,6 +1572,8 @@ const make = Effect.gen(function* () {
15721572
event.type === "turn.started" ||
15731573
event.type === "turn.completed"
15741574
) {
1575+
const unexpectedSessionExit =
1576+
event.type === "session.exited" && event.payload.exitKind === "error";
15751577
const status = (() => {
15761578
switch (event.type) {
15771579
case "session.state.changed": {
@@ -1593,6 +1595,7 @@ const make = Effect.gen(function* () {
15931595
return activeTurnId !== null ? "running" : hasPendingTurnStart ? "starting" : "ready";
15941596
}
15951597
})();
1598+
const lifecycleStatus = unexpectedSessionExit ? "error" : status;
15961599
const nextActiveTurnId =
15971600
event.type === "turn.started"
15981601
? (eventTurnId ?? null)
@@ -1605,14 +1608,18 @@ const make = Effect.gen(function* () {
16051608
? null
16061609
: activeTurnId;
16071610
const lastError =
1608-
event.type === "session.state.changed" && event.payload.state === "error"
1609-
? (event.payload.reason ?? thread.session?.lastError ?? "Provider session error")
1610-
: event.type === "turn.completed" &&
1611-
normalizeRuntimeTurnState(event.payload.state) === "failed"
1612-
? (event.payload.errorMessage ?? thread.session?.lastError ?? "Turn failed")
1613-
: status === "ready"
1614-
? null
1615-
: (thread.session?.lastError ?? null);
1611+
unexpectedSessionExit
1612+
? (event.payload.reason ??
1613+
thread.session?.lastError ??
1614+
"Provider session exited unexpectedly")
1615+
: event.type === "session.state.changed" && event.payload.state === "error"
1616+
? (event.payload.reason ?? thread.session?.lastError ?? "Provider session error")
1617+
: event.type === "turn.completed" &&
1618+
normalizeRuntimeTurnState(event.payload.state) === "failed"
1619+
? (event.payload.errorMessage ?? thread.session?.lastError ?? "Turn failed")
1620+
: lifecycleStatus === "ready"
1621+
? null
1622+
: (thread.session?.lastError ?? null);
16161623

16171624
if (shouldApplyThreadLifecycle) {
16181625
if (event.type === "turn.started" && acceptedTurnStartedSourcePlan !== null) {
@@ -1641,7 +1648,7 @@ const make = Effect.gen(function* () {
16411648
threadId: thread.id,
16421649
session: {
16431650
threadId: thread.id,
1644-
status,
1651+
status: lifecycleStatus,
16451652
providerName: event.provider,
16461653
...(event.providerInstanceId !== undefined
16471654
? { providerInstanceId: event.providerInstanceId }

0 commit comments

Comments
 (0)