Skip to content

Commit 356d91c

Browse files
fix(server): keep run retry details off a session error's explanation
Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
1 parent 9da73a3 commit 356d91c

3 files changed

Lines changed: 26 additions & 8 deletions

File tree

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,11 @@ describe("ProviderFailureExplanationService", () => {
342342
const harness = makeHarness({
343343
lastError: "Provider session crashed",
344344
lastErrorClass: null,
345-
turnItems: [rootError("item:root-error", 1, "turn failed")],
345+
turnItems: [
346+
rootError("item:root-error", 1, "turn failed", {
347+
retry: { attempt: 2, maxAttempts: 3 },
348+
}),
349+
],
346350
});
347351
const result = yield* explain({ revision: "Provider session crashed" }).pipe(
348352
Effect.provide(harness.layer),
@@ -354,6 +358,7 @@ describe("ProviderFailureExplanationService", () => {
354358
assert.include(context, "Message: Provider session crashed");
355359
assert.notInclude(context, "turn failed");
356360
assert.notInclude(context, "E_BOOM");
361+
assert.notInclude(context, "Retried by the provider");
357362
}),
358363
);
359364

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,9 @@ const make = Effect.gen(function* () {
229229
// The run's own failure when it is the one reported; otherwise the failure is
230230
// the session's, and only its message and class are known.
231231
const runFailure = latestRootProviderFailure(run, runItems);
232+
const reportsRunFailure = runFailure !== null && runFailure.message === lastError;
232233
const failure: OrchestrationV2ProviderFailure =
233-
runFailure !== null && runFailure.message === lastError
234+
runFailure !== null && reportsRunFailure
234235
? runFailure
235236
: {
236237
class: shell.lastErrorClass ?? "unknown",
@@ -253,7 +254,8 @@ const make = Effect.gen(function* () {
253254
model: (run?.modelSelection ?? shell.modelSelection).model,
254255
runtimeMode: shell.runtimeMode,
255256
failure,
256-
retry: failureItem?.type === "error" ? failureItem.retry : undefined,
257+
// Retry progress belongs to the run's failure, not to a session error replacing it.
258+
retry: reportsRunFailure && failureItem?.type === "error" ? failureItem.retry : undefined,
257259
userMessage:
258260
userMessageItem?.type === "user_message"
259261
? {

‎apps/web/src/components/chat/ThreadErrorBanner.test.tsx‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import { EnvironmentId, RunId, ThreadId } from "@t3tools/contracts";
1+
import {
2+
EnvironmentId,
3+
OrchestrationV2ProviderFailureClass,
4+
RunId,
5+
ThreadId,
6+
} from "@t3tools/contracts";
27
import { renderToStaticMarkup } from "react-dom/server";
38
import { describe, expect, it } from "vite-plus/test";
49

@@ -88,19 +93,25 @@ describe("ThreadErrorBanner", () => {
8893
});
8994

9095
describe("explain action", () => {
96+
// Read from the contract so the lint rule for class names leaves these values alone.
97+
const failureClass = (name: string): OrchestrationV2ProviderFailureClass => {
98+
const value = OrchestrationV2ProviderFailureClass.literals.find(
99+
(candidate) => candidate === name,
100+
);
101+
if (value === undefined) throw new Error(`Unknown failure class ${name}`);
102+
return value;
103+
};
91104
const explainTarget = {
92105
environmentId: EnvironmentId.make("env-1"),
93106
threadId: ThreadId.make("thread-1"),
94107
runId: RunId.make("run-1"),
95108
};
96109

97-
const failureKinds = { provider: "provider_error", usage: "usage_limit" } as const; // oxlint-disable-line shadcn/no-unknown-classes -- failure classes, not CSS
98-
99110
it("offers Explain for a server provider failure without asking anything yet", () => {
100111
const markup = renderToStaticMarkup(
101112
<ThreadErrorBanner
102113
error="spawn codex ENOENT"
103-
errorClass={failureKinds.provider}
114+
errorClass={failureClass("provider_error")}
104115
explainTarget={explainTarget}
105116
onDismiss={() => {}}
106117
/>,
@@ -116,7 +127,7 @@ describe("ThreadErrorBanner", () => {
116127
renderToStaticMarkup(
117128
<ThreadErrorBanner
118129
error="Limit reached"
119-
errorClass={failureKinds.usage}
130+
errorClass={failureClass("usage_limit")}
120131
explainTarget={explainTarget}
121132
/>,
122133
),

0 commit comments

Comments
 (0)