Skip to content

Commit 1b7badf

Browse files
fix(server): a differing session error lets a usage-limited thread settle
The shell drops the usage-limit class when the provider session reports a different, newer error, so it shows no recovery controls. The settlement query now applies the same rule instead of holding such a thread.
1 parent b2c9981 commit 1b7badf

2 files changed

Lines changed: 43 additions & 2 deletions

File tree

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
ProjectId,
99
ProviderDriverKind,
1010
ProviderInstanceId,
11+
ProviderSessionId,
1112
ProviderThreadId,
1213
RunId,
1314
RuntimeRequestId,
@@ -19,6 +20,7 @@ import * as Effect from "effect/Effect";
1920
import * as Layer from "effect/Layer";
2021

2122
import * as SqlitePersistence from "../persistence/Sqlite.ts";
23+
import { CodexProviderCapabilitiesV2 } from "./Adapters/CodexAdapterV2.ts";
2224
import * as ProjectionStore from "./ProjectionStore.ts";
2325
import { isAutoSettlementCandidate, resolveAutoSettlementAt } from "./ThreadSettlementService.ts";
2426

@@ -271,6 +273,33 @@ it.effect(
271273
yield* createRun(limitEndedLast, "failed", 2),
272274
"provider_error",
273275
);
276+
// A newer, different session error replaces the limit, as in threadErrorSummary.
277+
const sessionErrorAfterLimit = yield* createThread("session-error-after-limit");
278+
yield* createFailure(
279+
sessionErrorAfterLimit,
280+
yield* createRun(sessionErrorAfterLimit, "failed"),
281+
"usage_limit",
282+
);
283+
yield* store.apply({
284+
id: EventId.make("event:settlement:session-error"),
285+
type: "provider-session.attached",
286+
threadId: sessionErrorAfterLimit,
287+
driver: ProviderDriverKind.make("codex"),
288+
providerInstanceId,
289+
occurredAt: old,
290+
payload: {
291+
id: ProviderSessionId.make("provider-session:settlement:session-error"),
292+
driver: ProviderDriverKind.make("codex"),
293+
providerInstanceId,
294+
status: "error",
295+
cwd: "/workspace",
296+
model: modelSelection.model,
297+
capabilities: CodexProviderCapabilitiesV2,
298+
createdAt: old,
299+
updatedAt: old,
300+
lastError: "Session crashed.",
301+
},
302+
});
274303
const providerFailed = yield* createThread("provider-failed");
275304
yield* createFailure(
276305
providerFailed,
@@ -323,6 +352,7 @@ it.effect(
323352
queued,
324353
woke,
325354
providerFailed,
355+
sessionErrorAfterLimit,
326356
background,
327357
persistent,
328358
rolledBack,

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6319,15 +6319,26 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
63196319
LIMIT 1
63206320
)
63216321
AND blocked.status = 'failed'
6322+
-- threadErrorSummary: a differing session error replaces the failure.
63226323
AND (
6323-
SELECT json_extract(error.payload_json, '$.failure.class')
6324+
SELECT json_extract(error.payload_json, '$.failure.class') = 'usage_limit'
6325+
AND COALESCE((
6326+
SELECT json_extract(session.payload_json, '$.lastError')
6327+
FROM orchestration_v2_projection_provider_session_bindings binding
6328+
CROSS JOIN orchestration_v2_projection_provider_sessions session
6329+
ON session.provider_session_id = binding.provider_session_id
6330+
WHERE binding.thread_id = t.thread_id
6331+
AND session.provider_instance_id = t.provider_instance_id
6332+
ORDER BY session.updated_at DESC, session.provider_session_id DESC
6333+
LIMIT 1
6334+
) = json_extract(error.payload_json, '$.failure.message'), 1)
63246335
FROM orchestration_v2_projection_turn_items error
63256336
WHERE error.thread_id = t.thread_id AND error.run_id = blocked.run_id
63266337
AND error.type = 'error' AND error.status = 'failed'
63276338
AND error.node_id IS json_extract(blocked.payload_json, '$.rootNodeId')
63286339
ORDER BY error.updated_at DESC, error.ordinal DESC, error.turn_item_id DESC
63296340
LIMIT 1
6330-
) = 'usage_limit'
6341+
) = 1
63316342
)
63326343
)
63336344
ORDER BY t.updated_at ASC, t.thread_id ASC

0 commit comments

Comments
 (0)