Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -2714,6 +2714,48 @@ describe("ProviderRuntimeIngestion", () => {
expect(thread.session?.lastError).toBe("runtime exploded");
});

it("settles an active turn when an error session exit arrives without runtime.error", async () => {
const harness = await createHarness();
const turnId = asTurnId("turn-session-exit-error");

harness.emit({
type: "turn.started",
eventId: asEventId("evt-session-exit-error-turn-started"),
provider: ProviderDriverKind.make("codex"),
createdAt: "2026-01-01T00:00:00.000Z",
threadId: asThreadId("thread-1"),
turnId,
});

await waitForThread(
harness.readModel,
(entry) => entry.session?.status === "running" && entry.session.activeTurnId === turnId,
);

harness.emit({
type: "session.exited",
eventId: asEventId("evt-session-exit-error"),
provider: ProviderDriverKind.make("codex"),
createdAt: "2026-01-01T00:00:01.000Z",
threadId: asThreadId("thread-1"),
payload: {
reason: "Provider process exited unexpectedly (137).",
exitKind: "error",
},
});

const thread = await waitForThread(
harness.readModel,
(entry) =>
entry.session?.status === "error" &&
entry.session.activeTurnId === null &&
entry.session.lastError === "Provider process exited unexpectedly (137).",
);
expect(thread.session?.status).toBe("error");
expect(thread.session?.activeTurnId).toBeNull();
expect(thread.session?.lastError).toBe("Provider process exited unexpectedly (137).");
});

it("records runtime.error activities from the typed payload message", async () => {
const harness = await createHarness();
const now = "2026-01-01T00:00:00.000Z";
Expand Down
25 changes: 16 additions & 9 deletions apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1572,6 +1572,8 @@ const make = Effect.gen(function* () {
event.type === "turn.started" ||
event.type === "turn.completed"
) {
const unexpectedSessionExit =
event.type === "session.exited" && event.payload.exitKind === "error";
const status = (() => {
switch (event.type) {
case "session.state.changed": {
Expand All @@ -1593,6 +1595,7 @@ const make = Effect.gen(function* () {
return activeTurnId !== null ? "running" : hasPendingTurnStart ? "starting" : "ready";
}
})();
const lifecycleStatus = unexpectedSessionExit ? "error" : status;
const nextActiveTurnId =
event.type === "turn.started"
? (eventTurnId ?? null)
Expand All @@ -1605,14 +1608,18 @@ const make = Effect.gen(function* () {
? null
: activeTurnId;
const lastError =
event.type === "session.state.changed" && event.payload.state === "error"
? (event.payload.reason ?? thread.session?.lastError ?? "Provider session error")
: event.type === "turn.completed" &&
normalizeRuntimeTurnState(event.payload.state) === "failed"
? (event.payload.errorMessage ?? thread.session?.lastError ?? "Turn failed")
: status === "ready"
? null
: (thread.session?.lastError ?? null);
unexpectedSessionExit
? (event.payload.reason ??
thread.session?.lastError ??
"Provider session exited unexpectedly")
: event.type === "session.state.changed" && event.payload.state === "error"
? (event.payload.reason ?? thread.session?.lastError ?? "Provider session error")
: event.type === "turn.completed" &&
normalizeRuntimeTurnState(event.payload.state) === "failed"
? (event.payload.errorMessage ?? thread.session?.lastError ?? "Turn failed")
: lifecycleStatus === "ready"
? null
: (thread.session?.lastError ?? null);

if (shouldApplyThreadLifecycle) {
if (event.type === "turn.started" && acceptedTurnStartedSourcePlan !== null) {
Expand Down Expand Up @@ -1641,7 +1648,7 @@ const make = Effect.gen(function* () {
threadId: thread.id,
session: {
threadId: thread.id,
status,
status: lifecycleStatus,
providerName: event.provider,
...(event.providerInstanceId !== undefined
? { providerInstanceId: event.providerInstanceId }
Expand Down
Loading