Skip to content

Commit bfcd2eb

Browse files
committed
fix(opencode): shorten the <none> error helper
1 parent 7de6d57 commit bfcd2eb

3 files changed

Lines changed: 20 additions & 34 deletions

File tree

‎packages/provider-opencode/src/server/adapter.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -862,11 +862,11 @@ function openCodeErrorMessage(event: Extract<OpenCodeEvent, { type: "session.err
862862
if (error === undefined) return "OpenCode session failed without an error payload.";
863863
const statusCode = recordValue(error.data, "statusCode");
864864
return (
865-
readableProviderErrorMessage({
866-
message: recordString(error.data, "message"),
867-
statusCode: typeof statusCode === "number" ? statusCode : undefined,
868-
responseBody: recordString(error.data, "responseBody"),
869-
}) ?? error.name
865+
readableProviderErrorMessage(
866+
recordString(error.data, "message"),
867+
typeof statusCode === "number" ? statusCode : undefined,
868+
recordString(error.data, "responseBody"),
869+
) ?? error.name
870870
);
871871
}
872872

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
/** OpenCode stores `<none>` when it cannot read the provider body. */
2-
export function readableProviderErrorMessage(input: {
3-
readonly message?: string | null | undefined;
4-
readonly statusCode?: number | null | undefined;
5-
readonly responseBody?: string | null | undefined;
6-
}): string | undefined {
7-
const message = input.message?.trim() ?? "";
8-
if (message.length > 0 && message.toLowerCase() !== "<none>") return message;
9-
10-
const title = input.responseBody
2+
export function readableProviderErrorMessage(
3+
message?: string,
4+
status?: number,
5+
body?: string,
6+
): string | undefined {
7+
const text = message?.trim() ?? "";
8+
if (text && text.toLowerCase() !== "<none>") return text;
9+
const title = body
1110
?.match(/<title[^>]*>([^<]*)<\/title>/i)?.[1]
1211
?.replace(/\s+/g, " ")
1312
.trim();
14-
const status =
15-
typeof input.statusCode === "number" && Number.isInteger(input.statusCode)
16-
? input.statusCode
17-
: undefined;
18-
if (title) return status === undefined ? title : `${title} (HTTP ${status}).`;
19-
if (status !== undefined) return `The model provider failed the request (HTTP ${status}).`;
20-
if (message.length > 0) {
21-
return "The model provider failed the request and did not include an error message.";
22-
}
23-
return undefined;
13+
if (title) return typeof status === "number" ? `${title} (HTTP ${status}).` : title;
14+
if (typeof status === "number") return `The model provider failed the request (HTTP ${status}).`;
15+
return text
16+
? "The model provider failed the request and did not include an error message."
17+
: undefined;
2418
}

‎packages/provider-opencode/src/server/v2/adapter.ts‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,11 +1109,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
11091109
retryDelayMs: Math.max(0, Math.trunc(delayMs)),
11101110
},
11111111
failure: makeProviderFailure({
1112-
message: readableProviderErrorMessage({
1113-
message: error.message,
1114-
statusCode: error.status,
1115-
responseBody: error.response?.body,
1116-
}),
1112+
message: readableProviderErrorMessage(error.message, error.status, error.response?.body),
11171113
code: error.type,
11181114
class: "provider_error",
11191115
retryable: true,
@@ -2196,11 +2192,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
21962192
return yield* endExecution(state, turn, {
21972193
status: "failed",
21982194
failure: makeProviderFailure({
2199-
message: readableProviderErrorMessage({
2200-
message,
2201-
statusCode: status,
2202-
responseBody: response?.body,
2203-
}),
2195+
message: readableProviderErrorMessage(message, status, response?.body),
22042196
code: type,
22052197
class: usageLimit ? "usage_limit" : "provider_error",
22062198
}),

0 commit comments

Comments
 (0)