Handle generic provider internal errors (#49401) · openclaw/openclaw@3b9796c

Recent Commits to openclaw:main

y471823206 · 2026-05-13 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ Docs: https://docs.openclaw.ai`
`36`	`36`	`- Auto-reply: surface a visible error when the configured model backend fails and fallback produces no visible reply, while preserving intentional silent turns and side-effect-only deliveries. (#80917) Thanks @dutifulbob.`
`37`	`37`	`- Agents/exec: skip redundant heartbeat wake-ups for subagent session exec completions, preventing spurious LLM invocations on parent sessions. Fixes #66748. (#66749) Thanks @ggzeng.`
`38`	`38`	`- Provider streams: keep OpenAI-compatible SSE and JSON fallback streams draining across split chunks and fail Azure Responses streams with a bounded first-event diagnostic instead of stalling. Refs #80926. (#80927) Thanks @galiniliev and @CaptainTimon.`
	`39`	`+- Agents: rewrite generic provider internal errors with support request IDs into user-friendly transient error copy. (#49401) Thanks @y471823206.`
`39`	`40`
`40`	`41`	`### Changes`
`41`	`42`

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,22 @@ describe("formatAssistantErrorText", () => {`
`66`	`66`	`"The AI service is temporarily overloaded. Please try again in a moment.",`
`67`	`67`	`);`
`68`	`68`	`});`
	`69`	`+it("rewrites generic provider internal errors without support request ids", () => {`
	`70`	`+const msg = makeAssistantError(`
	`71`	`+"An error occurred while processing your request. You can retry your request, or contact us through our help center at help.openai.com if the error persists. Please include the request ID synthetic-provider-request-001 in your message.",`
	`72`	`+);`
	`73`	`+expect(formatAssistantErrorText(msg)).toBe(`
	`74`	`+"The AI service returned an internal error. Please try again in a moment.",`
	`75`	`+);`
	`76`	`+});`
	`77`	`+it("rewrites request-id-only generic provider internal errors without exposing the id", () => {`
	`78`	`+const msg = makeAssistantError(`
	`79`	`+"An error occurred while processing your request. Please include request ID req_synthetic_provider_request_001 in your message.",`
	`80`	`+);`
	`81`	`+expect(formatAssistantErrorText(msg)).toBe(`
	`82`	`+"The AI service returned an internal error. Please try again in a moment.",`
	`83`	`+);`
	`84`	`+});`
`69`	`85`	`it("returns a model-switch hint for OpenAI model capacity errors", () => {`
`70`	`86`	`const msg = makeAssistantError("Selected model is at capacity. Please try a different model.");`
`71`	`87`	`expect(formatAssistantErrorText(msg)).toBe(`
`@@ -407,6 +423,14 @@ describe("formatRawAssistantErrorForUi", () => {`
`407`	`423`	`expect(formatRawAssistantErrorForUi("HTTP 410: No body")).toBe("HTTP 410: No body");`
`408`	`424`	`});`
`409`	`425`
	`426`	`+it("formats plain provider internal errors without request ids", () => {`
	`427`	`+expect(`
	`428`	`+formatRawAssistantErrorForUi(`
	`429`	`+"An error occurred while processing your request. Please include the request ID synthetic-provider-request-001 in your message.",`
	`430`	`+),`
	`431`	`+).toBe("The AI service returned an internal error. Please try again in a moment.");`
	`432`	`+});`
	`433`	`+`
`410`	`434`	`it("sanitizes HTML error pages into a clean unavailable message", () => {`
`411`	`435`	const htmlError = `521 <!DOCTYPE html>
`412`	`436`	`<html lang="en-US">`

Original file line number	Diff line number	Diff line change
`@@ -1182,6 +1182,11 @@ describe("classifyFailoverReason provider messages", () => {`
`1182`	`1182`	`),`
`1183`	`1183`	`).toBe("timeout");`
`1184`	`1184`	`expect(classifyFailoverReason(OPENAI_SERVER_ERROR_PAYLOAD)).toBe("server_error");`
	`1185`	`+expect(`
	`1186`	`+classifyFailoverReason(`
	`1187`	`+"An error occurred while processing your request. You can retry your request, or contact us through our help center at help.openai.com if the error persists. Please include the request ID synthetic-provider-request-001 in your message.",`
	`1188`	`+),`
	`1189`	`+).toBe("timeout");`
`1185`	`1190`	expect(classifyFailoverReason(`402 Payment Required ${OPENAI_SERVER_ERROR_PAYLOAD}`)).toBe(
`1186`	`1191`	`"billing",`
`1187`	`1192`	`);`

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import { createSubsystemLogger } from "../../logging/subsystem.js";`
`4`	`4`	`import {`
`5`	`5`	`extractLeadingHttpStatus,`
`6`	`6`	`formatRawAssistantErrorForUi,`
	`7`	`+isGenericProviderInternalError,`
`7`	`8`	`} from "../../shared/assistant-error-format.js";`
`8`	`9`	`import {`
`9`	`10`	`normalizeLowercaseStringOrEmpty,`
`@@ -13,6 +14,7 @@ export {`
`13`	`14`	`extractLeadingHttpStatus,`
`14`	`15`	`formatRawAssistantErrorForUi,`
`15`	`16`	`isCloudflareOrHtmlErrorPage,`
	`17`	`+isGenericProviderInternalError,`
`16`	`18`	`parseApiErrorInfo,`
`17`	`19`	`} from "../../shared/assistant-error-format.js";`
`18`	`20`	`import { classifyOAuthRefreshFailure } from "../auth-profiles/oauth-refresh-failure.js";`
`@@ -843,6 +845,9 @@ function classifyFailoverClassificationFromMessage(`
`843`	`845`	`}`
`844`	`846`	`return toReasonClassification("timeout");`
`845`	`847`	`}`
	`848`	`+if (isGenericProviderInternalError(raw)) {`
	`849`	`+return toReasonClassification("timeout");`
	`850`	`+}`
`846`	`851`	`// Billing and auth classifiers run before the broad isJsonApiInternalServerError`
`847`	`852`	`// check so that provider errors like {"type":"api_error","message":"insufficient`
`848`	`853`	`// balance"} are correctly classified as "billing"/"auth" rather than "timeout".`
`@@ -1128,6 +1133,10 @@ export function formatAssistantErrorText(`
`1128`	`1133`	`return transientCopy;`
`1129`	`1134`	`}`
`1130`	`1135`
	`1136`	`+if (isGenericProviderInternalError(raw)) {`
	`1137`	`+return formatRawAssistantErrorForUi(raw);`
	`1138`	`+}`
	`1139`	`+`
`1131`	`1140`	`const transportCopy = formatTransportErrorCopy(raw);`
`1132`	`1141`	`if (transportCopy) {`
`1133`	`1142`	`return transportCopy;`

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import {`
`3`	`3`	`extractLeadingHttpStatus,`
`4`	`4`	`formatRawAssistantErrorForUi,`
`5`	`5`	`isCloudflareOrHtmlErrorPage,`
	`6`	`+isGenericProviderInternalError,`
`6`	`7`	`MALFORMED_STREAMING_FRAGMENT_ERROR_MESSAGE,`
`7`	`8`	`parseApiErrorInfo,`
`8`	`9`	`parseApiErrorPayload,`
`@@ -451,6 +452,9 @@ export function sanitizeUserFacingText(text: unknown, opts?: { errorContext?: bo`
`451`	`452`	`if (isBillingErrorMessage(trimmed)) {`
`452`	`453`	`return BILLING_ERROR_USER_MESSAGE;`
`453`	`454`	`}`
	`455`	`+if (isGenericProviderInternalError(trimmed)) {`
	`456`	`+return formatRawAssistantErrorForUi(trimmed);`
	`457`	`+}`
`454`	`458`	`if (isInvalidStreamingEventOrderError(trimmed)) {`
`455`	`459`	`return "LLM request failed: provider returned an invalid streaming response. Please try again.";`
`456`	`460`	`}`

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,24 @@ describe("buildEmbeddedRunPayloads", () => {`
`137`	`137`	`expectNoPayloadTextContaining(payloads, "request_id");`
`138`	`138`	`});`
`139`	`139`
	`140`	`+it("does not expose provider request ids from generic internal errors", () => {`
	`141`	`+const rawError =`
	`142`	`+"An error occurred while processing your request. Please include request ID req_synthetic_provider_request_001 in your message.";`
	`143`	`+const payloads = buildPayloads({`
	`144`	`+lastAssistant: makeAssistant({`
	`145`	`+errorMessage: rawError,`
	`146`	`+content: [{ type: "text", text: rawError }],`
	`147`	`+}),`
	`148`	`+});`
	`149`	`+`
	`150`	`+expectSinglePayloadSummary(payloads, {`
	`151`	`+text: "The AI service returned an internal error. Please try again in a moment.",`
	`152`	`+isError: true,`
	`153`	`+});`
	`154`	`+expectNoPayloadTextContaining(payloads, "request ID");`
	`155`	`+expectNoPayloadTextContaining(payloads, "req_synthetic_provider_request_001");`
	`156`	`+});`
	`157`	`+`
`140`	`158`	`it("surfaces OpenAI model capacity errors instead of generic empty-response copy", () => {`
`141`	`159`	`const payloads = buildPayloads({`
`142`	`160`	`lastAssistant: makeAssistant({`

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@ const HTML_CLOSE_RE = /<\/html>/i;`
`14`	`14`	`const CLOUDFLARE_HTML_ERROR_CODES = new Set([521, 522, 523, 524, 525, 526, 530]);`
`15`	`15`	`const STANDALONE_HTML_ERROR_HINT_RE =`
`16`	`16`	`/\bcloudflare\b\|cdn-cgi\/challenge-platform\|challenge-error-text\|enable javascript and cookies to continue\|access denied\|forbidden\|service unavailable\|bad gateway\|web server is down\|captcha\|attention required/i;`
	`17`	`+const GENERIC_PROVIDER_INTERNAL_ERROR_RE = /an error occurred while processing your request/i;`
	`18`	`+const SUPPORT_REQUEST_ID_RE = /(?:request[\s_-]id)\s[:#]?\s*([a-z0-9][a-z0-9_-]{6,}[a-z0-9])/i;`
	`19`	`+const GENERIC_PROVIDER_INTERNAL_ERROR_USER_MESSAGE =`
	`20`	`+"The AI service returned an internal error. Please try again in a moment.";`
`17`	`21`
`18`	`22`	`export const MALFORMED_STREAMING_FRAGMENT_ERROR_MESSAGE =`
`19`	`23`	`"OpenClaw transport error: malformed_streaming_fragment";`
`@@ -128,6 +132,17 @@ export function isCloudflareOrHtmlErrorPage(raw: string): boolean {`
`128`	`132`	`);`
`129`	`133`	`}`
`130`	`134`
	`135`	`+export function isGenericProviderInternalError(raw: string): boolean {`
	`136`	`+const trimmed = raw.trim();`
	`137`	`+if (!trimmed) {`
	`138`	`+return false;`
	`139`	`+}`
	`140`	`+return (`
	`141`	`+GENERIC_PROVIDER_INTERNAL_ERROR_RE.test(trimmed) &&`
	`142`	`+(/help\.openai\.com/i.test(trimmed) \|\| SUPPORT_REQUEST_ID_RE.test(trimmed))`
	`143`	`+);`
	`144`	`+}`
	`145`	`+`
`131`	`146`	`export function parseApiErrorInfo(raw?: string): ApiErrorInfo \| null {`
`132`	`147`	`if (!raw) {`
`133`	`148`	`return null;`
`@@ -197,6 +212,10 @@ export function formatRawAssistantErrorForUi(raw?: string): string {`
`197`	`212`	`return MALFORMED_STREAMING_FRAGMENT_USER_MESSAGE;`
`198`	`213`	`}`
`199`	`214`
	`215`	`+if (isGenericProviderInternalError(trimmed)) {`
	`216`	`+return GENERIC_PROVIDER_INTERNAL_ERROR_USER_MESSAGE;`
	`217`	`+}`
	`218`	`+`
`200`	`219`	`const leadingStatus = extractLeadingHttpStatus(trimmed);`
`201`	`220`	`const isHtmlChallenge = isCloudflareOrHtmlErrorPage(trimmed);`
`202`	`221`	`if (leadingStatus && isHtmlChallenge) {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main