diff --git a/apps/mobile/src/features/threads/UsageLimitRecoveryCard.tsx b/apps/mobile/src/features/threads/UsageLimitRecoveryCard.tsx index 2231ba5ee70f..754ba76c4202 100644 --- a/apps/mobile/src/features/threads/UsageLimitRecoveryCard.tsx +++ b/apps/mobile/src/features/threads/UsageLimitRecoveryCard.tsx @@ -1,3 +1,4 @@ +import { providerFailureTitle } from "@t3tools/shared/orchestrationV2ThreadError"; import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime"; import { errorDisplayMessage } from "@t3tools/client-runtime/errors"; import { AsyncResult } from "effect/reactivity"; @@ -11,7 +12,7 @@ import { CHATGPT_WORKSPACE_USAGE_LIMIT_CODE, } from "@t3tools/shared/usageLimits"; import * as Clipboard from "expo-clipboard"; -import { T, useGT } from "gt-react-native"; +import { T, useGT, useMessages } from "gt-react-native"; import { m } from "../../i18n/messages"; import { useState } from "react"; import { Linking, Pressable, View } from "react-native"; @@ -29,6 +30,7 @@ export function UsageLimitRecoveryCard({ environmentId: EnvironmentId; }) { const gt = useGT(); + const resolve = useMessages(); const updateMetadata = useAtomCommand(threadEnvironment.updateMetadata); const [pending, setPending] = useState(false); const [error, setError] = useState(null); @@ -168,13 +170,10 @@ export function UsageLimitRecoveryCard({ ) : chatGptLimit ? (resetText ?? gt("Review your usage settings in ChatGPT.")) - : resetDate !== null - ? resumes - ? gt("Usage limit reached. Resumes {date}.", { date: resetDate }) - : gt("Usage limit reached. Resets {date}.", { date: resetDate }) - : gt( - "Usage limit reached. The provider did not report a reset time. Retry manually when your limit is available.", - )} + : gt("{title}. {resetDescription}", { + title: providerFailureTitle(thread.runtime.lastErrorClass, code, resolve), + resetDescription: resetText ?? gt("No reset time reported; retry manually."), + })} {chatGptLimit || canSchedule ? ( // The margins cancel the 44pt touch height so the links sit 8pt under the text. diff --git a/apps/mobile/src/features/threads/thread-work-log.tsx b/apps/mobile/src/features/threads/thread-work-log.tsx index 33b8613d9972..c2d6dc07394d 100644 --- a/apps/mobile/src/features/threads/thread-work-log.tsx +++ b/apps/mobile/src/features/threads/thread-work-log.tsx @@ -1,3 +1,4 @@ +import { providerFailureTitle } from "@t3tools/shared/orchestrationV2ThreadError"; import { Button } from "../../components/ui/Button"; import { ThreadSubagentGroup } from "./thread-subagent-group"; import { ProposedPlanCard } from "./ProposedPlanCard"; @@ -908,21 +909,22 @@ const ThreadWorkLogRow = function ThreadWorkLogRow( minute: "2-digit", })} (${new Intl.DateTimeFormat().resolvedOptions().timeZone})` : null; + const title = providerFailureTitle( + failureItem.failure.class, + failureItem.failure.code, + messages, + ); const label = warning ? resetTime - ? gt("Usage limit reached. Retry after {resetTime}.", { resetTime }) - : gt("Usage limit reached.") + ? gt("{title}. Retry after {resetTime}.", { title, resetTime }) + : gt("{title}.", { title }) : row.summary; return ( props.onCopyRow(row.id, row.getCopyText())} > @@ -961,11 +963,9 @@ const ThreadWorkLogRow = function ThreadWorkLogRow( })} - {!warning ? ( - - {failureItem.failure.message} - - ) : null} + + {failureItem.failure.message} + {failureItem.failure.code === ORCHESTRATION_V2_WORKSPACE_PREPARATION_FAILURE_CODE && failureItem.runId !== null ? ( { +it.each([ + ["provider_error", null, "Provider error"], + ["usage_limit", "usageLimitExceeded", "Usage limit reached"], + ["usage_limit", "responseTooManyFailedAttempts", "Provider rate limit (HTTP 429)"], +] as const)( + "keeps a historical %s / %s failure and preceding work visible without disclosures", + (failureClass, code, summary) => { const at = "2026-06-20T00:00:03.000Z"; const error: OrchestrationV2TurnItem = { ...base("failure", at, 2), type: "error", status: "failed", + title: failureClass === "usage_limit" ? "Usage limit reached" : null, failure: { class: failureClass, message: "The provider stopped this turn.\nRetry later.", - code: null, + code, retryable: true, }, }; @@ -1966,11 +1971,16 @@ it.each(["provider_error", "usage_limit"] as const)( "failure", ]); expect(activities.at(-1)).toMatchObject({ + summary, detail: error.failure.message, createdAt: at, canExpand: false, prominent: true, }); + const recovered = buildThreadFeed([ + projected({ ...error, status: "completed", title: "Provider recovered" }, 0), + ]).flatMap((entry) => (entry.type === "activity-group" ? entry.activities : [])); + expect(recovered[0]?.summary).toBe("Provider recovered"); }, ); diff --git a/apps/mobile/src/lib/threadActivity.ts b/apps/mobile/src/lib/threadActivity.ts index 4254404a39a9..13964ef758b2 100644 --- a/apps/mobile/src/lib/threadActivity.ts +++ b/apps/mobile/src/lib/threadActivity.ts @@ -1,3 +1,4 @@ +import { providerFailureTitle } from "@t3tools/shared/orchestrationV2ThreadError"; import type { ThreadPendingApproval, ThreadPendingUserInput, @@ -640,6 +641,9 @@ function itemSummary( if (item.type === "notification") return item.summary; if (item.type === "system_notice") return item.message; if (item.type === "compaction") return contextCompactionLabel(item, resolve); + if (item.type === "error" && item.status === "failed" && item.failure.class === "usage_limit") { + return providerFailureTitle(item.failure.class, item.failure.code, resolve); + } const title = (item.type === "dynamic_tool" ? dynamicToolTitle(item.toolName, item.input, item.title, resolve) @@ -677,9 +681,7 @@ function itemSummary( case "run_interrupt_result": return resolve(msg("Run interrupted")); case "error": - return item.failure.class === "usage_limit" - ? resolve(msg("Usage limit reached")) - : resolve(msg("Provider error")); + return providerFailureTitle(item.failure.class, item.failure.code, resolve); case "handoff": return resolve(msg("Context handed off")); case "fork": diff --git a/apps/web/src/components/ThreadNotificationCoordinator.tsx b/apps/web/src/components/ThreadNotificationCoordinator.tsx index e2801c97d6e8..6cc1cf905631 100644 --- a/apps/web/src/components/ThreadNotificationCoordinator.tsx +++ b/apps/web/src/components/ThreadNotificationCoordinator.tsx @@ -1,3 +1,4 @@ +import { providerFailureTitle } from "@t3tools/shared/orchestrationV2ThreadError"; import { msg } from "gt-react"; import { m } from "../i18n/messages"; import { @@ -150,7 +151,7 @@ export function startThreadNotifications( : status === "approval" ? m(msg("Approval needed")) : status === "limited" - ? m(msg("Usage limit reached")) + ? providerFailureTitle(thread.runtime?.lastErrorClass, thread.runtime?.lastErrorCode, m) : status === "failed" ? m(msg("Thread failed")) : status === "request" diff --git a/apps/web/src/components/chat/TimelineWorkEntryRow.tsx b/apps/web/src/components/chat/TimelineWorkEntryRow.tsx index 385123fb21b4..7dbfc21ab053 100644 --- a/apps/web/src/components/chat/TimelineWorkEntryRow.tsx +++ b/apps/web/src/components/chat/TimelineWorkEntryRow.tsx @@ -1,3 +1,4 @@ +import { providerFailureTitle } from "@t3tools/shared/orchestrationV2ThreadError"; import { TimelinePendingApprovalRow } from "./TimelinePendingApprovalRow"; import { WorkLogDetails, WorkLogRow } from "./WorkLog"; import { @@ -328,10 +329,11 @@ function WorkEntryLogRow(props: WorkEntryRowProps) { const resetTime = resetAt ? `${formatUpcomingTimestamp(resetAt, timestampFormat, undefined, timeZone, m)} (${timeZone})` : null; + const title = providerFailureTitle(failureItem.failure.class, failureItem.failure.code, m); const label = warning ? resetTime - ? gt("Usage limit reached. Retry after {resetTime}.", { resetTime }) - : gt("Usage limit reached.") + ? gt("{title}. Retry after {resetTime}.", { title, resetTime }) + : gt("{title}.", { title }) : workEntry.label; const retryRunId = failureItem.runId !== null && @@ -364,11 +366,9 @@ function WorkEntryLogRow(props: WorkEntryRowProps) { /> } > - {!warning ? ( -

- {failureItem.failure.message} -

- ) : null} +

+ {failureItem.failure.message} +

{retryRunId !== null && onRetryWorkspacePreparation ? (
diff --git a/apps/web/src/i18n/translations/de.json b/apps/web/src/i18n/translations/de.json index 4c9f0f6d27e4..c8e934ece871 100644 --- a/apps/web/src/i18n/translations/de.json +++ b/apps/web/src/i18n/translations/de.json @@ -1015,6 +1015,9 @@ "40bc7efea699741f": "{minutes} Min. {seconds} s", "93918bb7fbf62e92": "{hours} Std. {minutes} Min. {seconds} s", "d3a9046187e04d81": "{hours} Std. {seconds} s", + "81d48ad533f04c08": "Anbieterfehler", + "80f23e8b2d046d00": "Ratenlimit des Anbieters (HTTP 429)", + "d407926eb12273d6": "Nutzungslimit erreicht", "8e551e83aa1b35ca": "PR", "70c699d18aaa4c6c": "Branch", "a147a2509d4fcfd5": "Projekt", @@ -1305,10 +1308,9 @@ "52e824623cffe356": "Kehre zum Anbieter zurück und versuche es erneut.", "68883cb3342998e5": "Verbinde dich erneut mit der Umgebung und versuche es noch einmal.", "cb4b97318340b585": "Gerät", - "d407926eb12273d6": "Nutzungslimit erreicht", - "81d48ad533f04c08": "Anbieterfehler", "17783248201b6e43": "Anbieter wird erneut versucht ({progress})", "3ec9f7301a7e06dc": "{attempt, plural, one {Anbieter wiederhergestellt ({progress} Versuche)} other {Anbieter wiederhergestellt ({progress} Versuche)}}", + "97fafa05eb66e9a5": "Ratenlimit des Anbieters (HTTP 429) nach {progress} Wiederholungsversuchen", "2d707aa220f213ec": "{attempt, plural, one {Nutzungslimit nach {progress} Versuchen erreicht} other {Nutzungslimit nach {progress} Versuchen erreicht}}", "7988500254403038": "{attempt, plural, one {Anbieterfehler nach {progress} Versuchen} other {Anbieterfehler nach {progress} Versuchen}}", "ed8b45cc0303e955": "Wiederholung beim Anbieter gestoppt ({progress})", @@ -4201,8 +4203,8 @@ "918cd5477d0c0e9b": "Vollständige Nachricht anzeigen", "513b0929ca7dde1b": "Tool-Eingabe\n{input}", "c6e000ea79ae6a2b": "{status, select, inProgress {Thread „{title}“ wird gelesen} completed {Thread „{title}“ gelesen} failed {Thread „{title}“ konnte nicht gelesen werden} declined {Lesen von Thread „{title}“ abgelehnt} stopped {Lesen von Thread „{title}“ abgebrochen} other {Thread „{title}“ wird gelesen}}", - "93435595c79fd659": "Nutzungslimit erreicht. Versuche es nach {resetTime} erneut.", - "5a2d803b3ea43f18": "Nutzungslimit erreicht.", + "28eb53dc727dc676": "{title}. Nach {resetTime} erneut versuchen.", + "dd414046c22e4adf": "{title}.", "1afc4f46bc0675aa": "{label}, Tool-Aufruf fehlgeschlagen", "e05d1bee2862c2be": "Tool-Aufruf fehlgeschlagen", "ce591b4de647ecda": "{title} öffnen", @@ -4348,7 +4350,7 @@ "275a97b4af3c6482": "Befehl für ein Terminal kopieren", "2b07985d23563374": "Wird {time} fortgesetzt", "c0c3aa756405c1df": "Wird {time} zurückgesetzt", - "a7bfaa71c8b3030b": "Zeitpunkt der Zurücksetzung nicht verfügbar; manuell erneut versuchen", + "80bcb29b776000c4": "Keine Rücksetzzeit gemeldet; manuell erneut versuchen", "77a70e5c3fd83ed8": "ChatGPT-Nutzungslimit erreicht", "c6c8d924b76b5a14": "Du hast das Limit deines Workspaces für die Nutzung deines ChatGPT-Abos in anderen Apps erreicht.", "babea77bd5527a74": "Der Zeitpunkt der Zurücksetzung ist vorbei. Versuche den Thread manuell erneut.", diff --git a/apps/web/src/i18n/translations/en.json b/apps/web/src/i18n/translations/en.json index c40470b46e6a..785bd2924a80 100644 --- a/apps/web/src/i18n/translations/en.json +++ b/apps/web/src/i18n/translations/en.json @@ -1015,6 +1015,9 @@ "40bc7efea699741f": "{minutes}m {seconds}s", "93918bb7fbf62e92": "{hours}h {minutes}m {seconds}s", "d3a9046187e04d81": "{hours}h {seconds}s", + "81d48ad533f04c08": "Provider error", + "80f23e8b2d046d00": "Provider rate limit (HTTP 429)", + "d407926eb12273d6": "Usage limit reached", "8e551e83aa1b35ca": "PR", "70c699d18aaa4c6c": "Branch", "a147a2509d4fcfd5": "Project", @@ -1305,10 +1308,9 @@ "52e824623cffe356": "Return to the provider and try again.", "68883cb3342998e5": "Reconnect to the environment and try again.", "cb4b97318340b585": "Device", - "d407926eb12273d6": "Usage limit reached", - "81d48ad533f04c08": "Provider error", "17783248201b6e43": "Retrying provider ({progress})", "3ec9f7301a7e06dc": "{attempt, plural, one {Provider recovered ({progress} retries)} other {Provider recovered ({progress} retries)}}", + "97fafa05eb66e9a5": "{attempt, plural, one {Provider rate limit (HTTP 429) after {progress} retries} other {Provider rate limit (HTTP 429) after {progress} retries}}", "2d707aa220f213ec": "{attempt, plural, one {Usage limit reached after {progress} retries} other {Usage limit reached after {progress} retries}}", "7988500254403038": "{attempt, plural, one {Provider error after {progress} retries} other {Provider error after {progress} retries}}", "ed8b45cc0303e955": "Provider retry stopped ({progress})", @@ -4200,8 +4202,8 @@ "918cd5477d0c0e9b": "Show full message", "513b0929ca7dde1b": "Tool input\n{input}", "c6e000ea79ae6a2b": "{status, select, inProgress {Reading thread “{title}”} completed {Read thread “{title}”} failed {Failed to read thread “{title}”} declined {Declined to read thread “{title}”} stopped {Stopped reading thread “{title}”} other {Reading thread “{title}”}}", - "93435595c79fd659": "Usage limit reached. Retry after {resetTime}.", - "5a2d803b3ea43f18": "Usage limit reached.", + "28eb53dc727dc676": "{title}. Retry after {resetTime}.", + "dd414046c22e4adf": "{title}.", "1afc4f46bc0675aa": "{label}, tool call failed", "e05d1bee2862c2be": "Tool call failed", "ce591b4de647ecda": "Open {title}", @@ -4347,7 +4349,7 @@ "275a97b4af3c6482": "Copy command, for a terminal", "2b07985d23563374": "Resumes {time}", "c0c3aa756405c1df": "Resets {time}", - "a7bfaa71c8b3030b": "Reset time unavailable; retry manually", + "80bcb29b776000c4": "No reset time reported; retry manually", "77a70e5c3fd83ed8": "ChatGPT usage limit reached", "c6c8d924b76b5a14": "You've reached your workspace's limit for using your ChatGPT plan in other apps.", "babea77bd5527a74": "The reset time has passed. Retry the thread manually.", diff --git a/apps/web/src/i18n/translations/es.json b/apps/web/src/i18n/translations/es.json index 68f63f589f51..15f4f623c6f2 100644 --- a/apps/web/src/i18n/translations/es.json +++ b/apps/web/src/i18n/translations/es.json @@ -1015,6 +1015,9 @@ "40bc7efea699741f": "{minutes} min {seconds} s", "93918bb7fbf62e92": "{hours} h {minutes} min {seconds} s", "d3a9046187e04d81": "{hours} h {seconds} s", + "81d48ad533f04c08": "Error del proveedor", + "80f23e8b2d046d00": "Límite de frecuencia del proveedor (HTTP 429)", + "d407926eb12273d6": "Límite de uso alcanzado", "8e551e83aa1b35ca": "PR", "70c699d18aaa4c6c": "Rama", "a147a2509d4fcfd5": "Proyecto", @@ -1305,10 +1308,9 @@ "52e824623cffe356": "Vuelve al proveedor e inténtalo de nuevo.", "68883cb3342998e5": "Vuelve a conectarte al entorno e inténtalo de nuevo.", "cb4b97318340b585": "Dispositivo", - "d407926eb12273d6": "Límite de uso alcanzado", - "81d48ad533f04c08": "Error del proveedor", "17783248201b6e43": "Reintentando con el proveedor ({progress})", "3ec9f7301a7e06dc": "{attempt, plural, one {El proveedor se recuperó ({progress} reintentos)} other {El proveedor se recuperó ({progress} reintentos)}}", + "97fafa05eb66e9a5": "Límite de frecuencia del proveedor (HTTP 429) tras {progress} reintentos", "2d707aa220f213ec": "{attempt, plural, one {Límite de uso alcanzado tras {progress} reintentos} other {Límite de uso alcanzado tras {progress} reintentos}}", "7988500254403038": "{attempt, plural, one {Error del proveedor tras {progress} reintentos} other {Error del proveedor tras {progress} reintentos}}", "ed8b45cc0303e955": "Se detuvieron los reintentos con el proveedor ({progress})", @@ -4198,8 +4200,8 @@ "918cd5477d0c0e9b": "Mostrar el mensaje completo", "513b0929ca7dde1b": "Entrada de la herramienta\n{input}", "c6e000ea79ae6a2b": "{status, select, inProgress {Leyendo el hilo “{title}”} completed {Leyó el hilo “{title}”} failed {No se pudo leer el hilo “{title}”} declined {Se rechazó leer el hilo “{title}”} stopped {Se dejó de leer el hilo “{title}”} other {Leyendo el hilo “{title}”}}", - "93435595c79fd659": "Se alcanzó el límite de uso. Vuelve a intentarlo después de {resetTime}.", - "5a2d803b3ea43f18": "Se alcanzó el límite de uso.", + "28eb53dc727dc676": "{title}. Vuelve a intentarlo después de {resetTime}.", + "dd414046c22e4adf": "{title}.", "1afc4f46bc0675aa": "{label}, falló la llamada a herramienta", "e05d1bee2862c2be": "Falló la llamada a herramienta", "ce591b4de647ecda": "Abrir {title}", @@ -4345,7 +4347,7 @@ "275a97b4af3c6482": "Copiar comando, para una terminal", "2b07985d23563374": "Se reanuda {time}", "c0c3aa756405c1df": "Se restablece {time}", - "a7bfaa71c8b3030b": "Hora de restablecimiento no disponible; vuelve a intentarlo manualmente", + "80bcb29b776000c4": "No se informó una hora de restablecimiento; vuelve a intentarlo manualmente", "77a70e5c3fd83ed8": "Se alcanzó el límite de uso de ChatGPT", "c6c8d924b76b5a14": "Has alcanzado el límite de tu espacio de trabajo para usar tu plan de ChatGPT en otras apps.", "babea77bd5527a74": "La hora de restablecimiento ya pasó. Vuelve a intentar el hilo manualmente.", diff --git a/apps/web/src/i18n/translations/fr.json b/apps/web/src/i18n/translations/fr.json index 442c22ed3a2d..0bdf735b5dcf 100644 --- a/apps/web/src/i18n/translations/fr.json +++ b/apps/web/src/i18n/translations/fr.json @@ -1015,6 +1015,9 @@ "40bc7efea699741f": "{minutes} min {seconds} s", "93918bb7fbf62e92": "{hours} h {minutes} min {seconds} s", "d3a9046187e04d81": "{hours} h {seconds} s", + "81d48ad533f04c08": "Erreur du fournisseur", + "80f23e8b2d046d00": "Limite de débit du fournisseur (HTTP 429)", + "d407926eb12273d6": "Limite d’utilisation atteinte", "8e551e83aa1b35ca": "PR", "70c699d18aaa4c6c": "Branche", "a147a2509d4fcfd5": "Projet", @@ -1305,10 +1308,9 @@ "52e824623cffe356": "Revenez chez le fournisseur et réessayez.", "68883cb3342998e5": "Reconnectez-vous à l’environnement et réessayez.", "cb4b97318340b585": "Appareil", - "d407926eb12273d6": "Limite d’utilisation atteinte", - "81d48ad533f04c08": "Erreur du fournisseur", "17783248201b6e43": "Nouvelle tentative auprès du fournisseur ({progress})", "3ec9f7301a7e06dc": "{attempt, plural, one {Fournisseur rétabli ({progress} tentative)} other {Fournisseur rétabli ({progress} tentatives)}}", + "97fafa05eb66e9a5": "Limite de débit du fournisseur (HTTP 429) après {progress} tentatives", "2d707aa220f213ec": "{attempt, plural, one {Limite d’utilisation atteinte après {progress} tentative} other {Limite d’utilisation atteinte après {progress} tentatives}}", "7988500254403038": "{attempt, plural, one {Erreur du fournisseur après {progress} tentative} other {Erreur du fournisseur après {progress} tentatives}}", "ed8b45cc0303e955": "Nouvelles tentatives auprès du fournisseur arrêtées ({progress})", @@ -4199,8 +4201,8 @@ "918cd5477d0c0e9b": "Afficher le message complet", "513b0929ca7dde1b": "Entrée de l’outil\n{input}", "c6e000ea79ae6a2b": "{status, select, inProgress {Lecture du fil « {title} »} completed {Fil « {title} » lu} failed {Impossible de lire le fil « {title} »} declined {Refus de lire le fil « {title} »} stopped {Arrêt de la lecture du fil « {title} »} other {Lecture du fil « {title} »}}", - "93435595c79fd659": "Limite d’utilisation atteinte. Réessayez après {resetTime}.", - "5a2d803b3ea43f18": "Limite d’utilisation atteinte.", + "28eb53dc727dc676": "{title}. Réessayez après {resetTime}.", + "dd414046c22e4adf": "{title}.", "1afc4f46bc0675aa": "{label}, échec de l’appel d’outil", "e05d1bee2862c2be": "Échec de l’appel d’outil", "ce591b4de647ecda": "Ouvrir {title}", @@ -4346,7 +4348,7 @@ "275a97b4af3c6482": "Copier la commande, pour un terminal", "2b07985d23563374": "Reprise {time}", "c0c3aa756405c1df": "Réinitialisation {time}", - "a7bfaa71c8b3030b": "Heure de réinitialisation indisponible ; réessayez manuellement", + "80bcb29b776000c4": "Aucune heure de réinitialisation indiquée ; réessayez manuellement", "77a70e5c3fd83ed8": "Limite d’utilisation ChatGPT atteinte", "c6c8d924b76b5a14": "Vous avez atteint la limite de votre espace de travail pour l’utilisation de votre forfait ChatGPT dans d’autres apps.", "babea77bd5527a74": "L’heure de réinitialisation est passée. Relancez le fil manuellement.", diff --git a/apps/web/src/i18n/translations/ja.json b/apps/web/src/i18n/translations/ja.json index c9417551b208..d9fd0a9d6565 100644 --- a/apps/web/src/i18n/translations/ja.json +++ b/apps/web/src/i18n/translations/ja.json @@ -1015,6 +1015,9 @@ "40bc7efea699741f": "{minutes}分{seconds}秒", "93918bb7fbf62e92": "{hours}時間{minutes}分{seconds}秒", "d3a9046187e04d81": "{hours}時間{seconds}秒", + "81d48ad533f04c08": "プロバイダーのエラー", + "80f23e8b2d046d00": "プロバイダーのレート制限(HTTP 429)", + "d407926eb12273d6": "使用量の上限に達しました", "8e551e83aa1b35ca": "PR", "70c699d18aaa4c6c": "ブランチ", "a147a2509d4fcfd5": "プロジェクト", @@ -1305,10 +1308,9 @@ "52e824623cffe356": "プロバイダーに戻って、もう一度お試しください。", "68883cb3342998e5": "環境に再接続して、もう一度お試しください。", "cb4b97318340b585": "デバイス", - "d407926eb12273d6": "使用量の上限に達しました", - "81d48ad533f04c08": "プロバイダーのエラー", "17783248201b6e43": "プロバイダーを再試行しています ({progress})", "3ec9f7301a7e06dc": "{attempt, plural, other {プロバイダーが復旧しました (再試行 {progress} 回)}}", + "97fafa05eb66e9a5": "{progress}回の再試行後もプロバイダーのレート制限(HTTP 429)", "2d707aa220f213ec": "{attempt, plural, other {{progress} 回の再試行後に使用量の上限に達しました}}", "7988500254403038": "{attempt, plural, other {{progress} 回の再試行後にプロバイダーエラーが発生しました}}", "ed8b45cc0303e955": "プロバイダーの再試行を停止しました ({progress})", @@ -4189,8 +4191,8 @@ "918cd5477d0c0e9b": "メッセージ全体を表示", "513b0929ca7dde1b": "ツールの入力\n{input}", "c6e000ea79ae6a2b": "{status, select, inProgress {スレッド「{title}」を読み取っています} completed {スレッド「{title}」を読み取りました} failed {スレッド「{title}」を読み取れませんでした} declined {スレッド「{title}」の読み取りは拒否されました} stopped {スレッド「{title}」の読み取りを中止しました} other {スレッド「{title}」を読み取っています}}", - "93435595c79fd659": "使用量の上限に達しました。{resetTime} 以降に再試行してください。", - "5a2d803b3ea43f18": "使用量の上限に達しました。", + "28eb53dc727dc676": "{title}。{resetTime}以降に再試行してください。", + "dd414046c22e4adf": "{title}。", "1afc4f46bc0675aa": "{label}、ツール呼び出しに失敗しました", "e05d1bee2862c2be": "ツール呼び出しに失敗しました", "ce591b4de647ecda": "{title} を開く", @@ -4336,7 +4338,7 @@ "275a97b4af3c6482": "ターミナル用のコマンドをコピー", "2b07985d23563374": "{time} に再開", "c0c3aa756405c1df": "{time} にリセット", - "a7bfaa71c8b3030b": "リセット時刻が不明です。手動で再試行してください", + "80bcb29b776000c4": "リセット時刻が報告されていません。手動で再試行してください", "77a70e5c3fd83ed8": "ChatGPT の使用量の上限に達しました", "c6c8d924b76b5a14": "ChatGPT プランを他のアプリで使用する際の、ワークスペースの上限に達しました。", "babea77bd5527a74": "リセット時刻を過ぎました。スレッドを手動で再試行してください。", diff --git a/apps/web/src/i18n/translations/ko.json b/apps/web/src/i18n/translations/ko.json index 362d29d071a8..26a20bf7937c 100644 --- a/apps/web/src/i18n/translations/ko.json +++ b/apps/web/src/i18n/translations/ko.json @@ -1015,6 +1015,9 @@ "40bc7efea699741f": "{minutes}분 {seconds}초", "93918bb7fbf62e92": "{hours}시간 {minutes}분 {seconds}초", "d3a9046187e04d81": "{hours}시간 {seconds}초", + "81d48ad533f04c08": "제공자 오류", + "80f23e8b2d046d00": "공급자 요청 속도 제한(HTTP 429)", + "d407926eb12273d6": "사용량 한도에 도달함", "8e551e83aa1b35ca": "PR", "70c699d18aaa4c6c": "브랜치", "a147a2509d4fcfd5": "프로젝트", @@ -1305,10 +1308,9 @@ "52e824623cffe356": "제공자로 돌아가 다시 시도하세요.", "68883cb3342998e5": "환경에 다시 연결한 후 다시 시도하세요.", "cb4b97318340b585": "기기", - "d407926eb12273d6": "사용량 한도에 도달함", - "81d48ad533f04c08": "제공자 오류", "17783248201b6e43": "제공자 재시도 중({progress})", "3ec9f7301a7e06dc": "{attempt, plural, other {제공자 복구됨(재시도 {progress}회)}}", + "97fafa05eb66e9a5": "{progress}회 재시도 후 공급자 요청 속도 제한(HTTP 429)", "2d707aa220f213ec": "{attempt, plural, other {재시도 {progress}회 후 사용량 한도에 도달함}}", "7988500254403038": "{attempt, plural, other {재시도 {progress}회 후 제공자 오류}}", "ed8b45cc0303e955": "제공자 재시도 중지됨({progress})", @@ -4186,8 +4188,8 @@ "918cd5477d0c0e9b": "전체 메시지 표시", "513b0929ca7dde1b": "도구 입력\n{input}", "c6e000ea79ae6a2b": "{status, select, inProgress {스레드 “{title}” 읽는 중} completed {스레드 “{title}” 읽음} failed {스레드 “{title}” 읽기 실패} declined {스레드 “{title}” 읽기 거부됨} stopped {스레드 “{title}” 읽기 중지됨} other {스레드 “{title}” 읽는 중}}", - "93435595c79fd659": "사용량 한도에 도달했습니다. {resetTime} 후에 다시 시도하세요.", - "5a2d803b3ea43f18": "사용량 한도에 도달했습니다.", + "28eb53dc727dc676": "{title}. {resetTime} 이후에 다시 시도하세요.", + "dd414046c22e4adf": "{title}.", "1afc4f46bc0675aa": "{label}, 도구 호출 실패", "e05d1bee2862c2be": "도구 호출 실패", "ce591b4de647ecda": "{title} 열기", @@ -4333,7 +4335,7 @@ "275a97b4af3c6482": "터미널용 명령 복사", "2b07985d23563374": "{time}에 재개", "c0c3aa756405c1df": "{time}에 초기화", - "a7bfaa71c8b3030b": "초기화 시간을 알 수 없습니다. 직접 다시 시도하세요", + "80bcb29b776000c4": "초기화 시간이 보고되지 않았습니다. 수동으로 다시 시도하세요", "77a70e5c3fd83ed8": "ChatGPT 사용량 한도에 도달함", "c6c8d924b76b5a14": "다른 앱에서 ChatGPT 요금제를 사용할 수 있는 작업 공간 한도에 도달했습니다.", "babea77bd5527a74": "초기화 시간이 지났습니다. 스레드를 직접 다시 시도하세요.", diff --git a/apps/web/src/i18n/translations/pt-BR.json b/apps/web/src/i18n/translations/pt-BR.json index b598943e9238..2079a3b75a56 100644 --- a/apps/web/src/i18n/translations/pt-BR.json +++ b/apps/web/src/i18n/translations/pt-BR.json @@ -1015,6 +1015,9 @@ "40bc7efea699741f": "{minutes}min {seconds}s", "93918bb7fbf62e92": "{hours}h {minutes}min {seconds}s", "d3a9046187e04d81": "{hours}h {seconds}s", + "81d48ad533f04c08": "Erro do provedor", + "80f23e8b2d046d00": "Limite de taxa do provedor (HTTP 429)", + "d407926eb12273d6": "Limite de uso atingido", "8e551e83aa1b35ca": "PR", "70c699d18aaa4c6c": "Branch", "a147a2509d4fcfd5": "Projeto", @@ -1305,10 +1308,9 @@ "52e824623cffe356": "Volte ao provedor e tente novamente.", "68883cb3342998e5": "Reconecte-se ao ambiente e tente novamente.", "cb4b97318340b585": "Dispositivo", - "d407926eb12273d6": "Limite de uso atingido", - "81d48ad533f04c08": "Erro do provedor", "17783248201b6e43": "Tentando o provedor novamente ({progress})", "3ec9f7301a7e06dc": "{attempt, plural, one {Provedor recuperado ({progress} tentativas)} other {Provedor recuperado ({progress} tentativas)}}", + "97fafa05eb66e9a5": "Limite de taxa do provedor (HTTP 429) após {progress} tentativas", "2d707aa220f213ec": "{attempt, plural, one {Limite de uso atingido após {progress} tentativas} other {Limite de uso atingido após {progress} tentativas}}", "7988500254403038": "{attempt, plural, one {Erro do provedor após {progress} tentativas} other {Erro do provedor após {progress} tentativas}}", "ed8b45cc0303e955": "Novas tentativas no provedor interrompidas ({progress})", @@ -4198,8 +4200,8 @@ "918cd5477d0c0e9b": "Mostrar mensagem completa", "513b0929ca7dde1b": "Entrada da ferramenta\n{input}", "c6e000ea79ae6a2b": "{status, select, inProgress {Lendo a thread “{title}”} completed {Leu a thread “{title}”} failed {Falha ao ler a thread “{title}”} declined {Recusou-se a ler a thread “{title}”} stopped {Parou de ler a thread “{title}”} other {Lendo a thread “{title}”}}", - "93435595c79fd659": "Limite de uso atingido. Tente novamente após {resetTime}.", - "5a2d803b3ea43f18": "Limite de uso atingido.", + "28eb53dc727dc676": "{title}. Tente novamente após {resetTime}.", + "dd414046c22e4adf": "{title}.", "1afc4f46bc0675aa": "{label}, falha na chamada de ferramenta", "e05d1bee2862c2be": "Falha na chamada de ferramenta", "ce591b4de647ecda": "Abrir {title}", @@ -4345,7 +4347,7 @@ "275a97b4af3c6482": "Copiar comando para um terminal", "2b07985d23563374": "Retoma {time}", "c0c3aa756405c1df": "Renova {time}", - "a7bfaa71c8b3030b": "Horário de renovação indisponível; tente novamente manualmente", + "80bcb29b776000c4": "Nenhum horário de redefinição informado; tente novamente manualmente", "77a70e5c3fd83ed8": "Limite de uso do ChatGPT atingido", "c6c8d924b76b5a14": "Você atingiu o limite do seu workspace para usar o plano do ChatGPT em outros apps.", "babea77bd5527a74": "O horário de renovação já passou. Tente a thread novamente manualmente.", diff --git a/apps/web/src/i18n/translations/ru.json b/apps/web/src/i18n/translations/ru.json index a8a54a6500e5..f822b7c59105 100644 --- a/apps/web/src/i18n/translations/ru.json +++ b/apps/web/src/i18n/translations/ru.json @@ -1015,6 +1015,9 @@ "40bc7efea699741f": "{minutes} мин {seconds} с", "93918bb7fbf62e92": "{hours} ч {minutes} мин {seconds} с", "d3a9046187e04d81": "{hours} ч {seconds} с", + "81d48ad533f04c08": "Ошибка провайдера", + "80f23e8b2d046d00": "Ограничение частоты запросов провайдера (HTTP 429)", + "d407926eb12273d6": "Достигнут лимит использования", "8e551e83aa1b35ca": "PR", "70c699d18aaa4c6c": "Ветка", "a147a2509d4fcfd5": "Проект", @@ -1305,10 +1308,9 @@ "52e824623cffe356": "Вернитесь к провайдеру и повторите попытку.", "68883cb3342998e5": "Переподключитесь к окружению и повторите попытку.", "cb4b97318340b585": "Устройство", - "d407926eb12273d6": "Достигнут лимит использования", - "81d48ad533f04c08": "Ошибка провайдера", "17783248201b6e43": "Повтор запроса к провайдеру ({progress})", "3ec9f7301a7e06dc": "{attempt, plural, one {Провайдер восстановился (повторов: {progress})} few {Провайдер восстановился (повторов: {progress})} many {Провайдер восстановился (повторов: {progress})} other {Провайдер восстановился (повторов: {progress})}}", + "97fafa05eb66e9a5": "Ограничение частоты запросов провайдера (HTTP 429) после {progress} повторных попыток", "2d707aa220f213ec": "{attempt, plural, one {Достигнут лимит использования (повторов: {progress})} few {Достигнут лимит использования (повторов: {progress})} many {Достигнут лимит использования (повторов: {progress})} other {Достигнут лимит использования (повторов: {progress})}}", "7988500254403038": "{attempt, plural, one {Ошибка провайдера (повторов: {progress})} few {Ошибка провайдера (повторов: {progress})} many {Ошибка провайдера (повторов: {progress})} other {Ошибка провайдера (повторов: {progress})}}", "ed8b45cc0303e955": "Повторы запроса к провайдеру остановлены ({progress})", @@ -4198,8 +4200,8 @@ "918cd5477d0c0e9b": "Показать сообщение полностью", "513b0929ca7dde1b": "Входные данные инструмента\n{input}", "c6e000ea79ae6a2b": "{status, select, inProgress {Чтение треда «{title}»} completed {Прочитан тред «{title}»} failed {Не удалось прочитать тред «{title}»} declined {Отклонено чтение треда «{title}»} stopped {Остановлено чтение треда «{title}»} other {Чтение треда «{title}»}}", - "93435595c79fd659": "Достигнут лимит использования. Повторите после {resetTime}.", - "5a2d803b3ea43f18": "Достигнут лимит использования.", + "28eb53dc727dc676": "{title}. Повторите попытку после {resetTime}.", + "dd414046c22e4adf": "{title}.", "1afc4f46bc0675aa": "{label}, ошибка вызова инструмента", "e05d1bee2862c2be": "Ошибка вызова инструмента", "ce591b4de647ecda": "Открыть {title}", @@ -4345,7 +4347,7 @@ "275a97b4af3c6482": "Копировать команду для терминала", "2b07985d23563374": "Возобновится {time}", "c0c3aa756405c1df": "Сброс {time}", - "a7bfaa71c8b3030b": "Время сброса неизвестно; повторите вручную", + "80bcb29b776000c4": "Время сброса не указано; повторите попытку вручную", "77a70e5c3fd83ed8": "Достигнут лимит использования ChatGPT", "c6c8d924b76b5a14": "Вы достигли лимита рабочего пространства на использование тарифа ChatGPT в других приложениях.", "babea77bd5527a74": "Время сброса прошло. Повторите тред вручную.", diff --git a/apps/web/src/i18n/translations/sv.json b/apps/web/src/i18n/translations/sv.json index adaf8566b641..dceb3069a7fd 100644 --- a/apps/web/src/i18n/translations/sv.json +++ b/apps/web/src/i18n/translations/sv.json @@ -1015,6 +1015,9 @@ "40bc7efea699741f": "{minutes} min {seconds} s", "93918bb7fbf62e92": "{hours} h {minutes} min {seconds} s", "d3a9046187e04d81": "{hours} h {seconds} s", + "81d48ad533f04c08": "Leverantörsfel", + "80f23e8b2d046d00": "Leverantörens frekvensgräns (HTTP 429)", + "d407926eb12273d6": "Användningsgränsen har nåtts", "8e551e83aa1b35ca": "PR", "70c699d18aaa4c6c": "Gren", "a147a2509d4fcfd5": "Projekt", @@ -1305,10 +1308,9 @@ "52e824623cffe356": "Gå tillbaka till leverantören och försök igen.", "68883cb3342998e5": "Återanslut till miljön och försök igen.", "cb4b97318340b585": "Enhet", - "d407926eb12273d6": "Användningsgränsen har nåtts", - "81d48ad533f04c08": "Leverantörsfel", "17783248201b6e43": "Försöker igen med leverantören ({progress})", "3ec9f7301a7e06dc": "{attempt, plural, one {Leverantören återhämtade sig ({progress} försök)} other {Leverantören återhämtade sig ({progress} försök)}}", + "97fafa05eb66e9a5": "Leverantörens frekvensgräns (HTTP 429) efter {progress} återförsök", "2d707aa220f213ec": "{attempt, plural, one {Användningsgränsen nåddes efter {progress} försök} other {Användningsgränsen nåddes efter {progress} försök}}", "7988500254403038": "{attempt, plural, one {Leverantörsfel efter {progress} försök} other {Leverantörsfel efter {progress} försök}}", "ed8b45cc0303e955": "Nya försök med leverantören stoppades ({progress})", @@ -4199,8 +4201,8 @@ "918cd5477d0c0e9b": "Visa hela meddelandet", "513b0929ca7dde1b": "Verktygsindata\n{input}", "c6e000ea79ae6a2b": "{status, select, inProgress {Läser tråden ”{title}”} completed {Läste tråden ”{title}”} failed {Kunde inte läsa tråden ”{title}”} declined {Avböjde att läsa tråden ”{title}”} stopped {Slutade läsa tråden ”{title}”} other {Läser tråden ”{title}”}}", - "93435595c79fd659": "Användningsgränsen har nåtts. Försök igen efter {resetTime}.", - "5a2d803b3ea43f18": "Användningsgränsen har nåtts.", + "28eb53dc727dc676": "{title}. Försök igen efter {resetTime}.", + "dd414046c22e4adf": "{title}.", "1afc4f46bc0675aa": "{label}, verktygsanropet misslyckades", "e05d1bee2862c2be": "Verktygsanropet misslyckades", "ce591b4de647ecda": "Öppna {title}", @@ -4346,7 +4348,7 @@ "275a97b4af3c6482": "Kopiera kommando, för en terminal", "2b07985d23563374": "Återupptas {time}", "c0c3aa756405c1df": "Återställs {time}", - "a7bfaa71c8b3030b": "Återställningstiden är inte tillgänglig; försök igen manuellt", + "80bcb29b776000c4": "Ingen återställningstid rapporterad; försök igen manuellt", "77a70e5c3fd83ed8": "Användningsgränsen för ChatGPT har nåtts", "c6c8d924b76b5a14": "Du har nått arbetsytans gräns för att använda ditt ChatGPT-abonnemang i andra appar.", "babea77bd5527a74": "Återställningstiden har passerat. Försök med tråden igen manuellt.", diff --git a/apps/web/src/i18n/translations/zh.json b/apps/web/src/i18n/translations/zh.json index f386e717a061..9e5ba1ea4f19 100644 --- a/apps/web/src/i18n/translations/zh.json +++ b/apps/web/src/i18n/translations/zh.json @@ -1015,6 +1015,9 @@ "40bc7efea699741f": "{minutes} 分 {seconds} 秒", "93918bb7fbf62e92": "{hours} 小时 {minutes} 分 {seconds} 秒", "d3a9046187e04d81": "{hours} 小时 {seconds} 秒", + "81d48ad533f04c08": "提供方错误", + "80f23e8b2d046d00": "提供商速率限制(HTTP 429)", + "d407926eb12273d6": "已达到用量上限", "8e551e83aa1b35ca": "PR", "70c699d18aaa4c6c": "分支", "a147a2509d4fcfd5": "项目", @@ -1305,10 +1308,9 @@ "52e824623cffe356": "请回到提供方并重试。", "68883cb3342998e5": "请重新连接环境后重试。", "cb4b97318340b585": "设备", - "d407926eb12273d6": "已达到用量上限", - "81d48ad533f04c08": "提供方错误", "17783248201b6e43": "正在重试提供方({progress})", "3ec9f7301a7e06dc": "{attempt, plural, other {提供方已恢复({progress} 次重试)}}", + "97fafa05eb66e9a5": "重试 {progress} 次后仍触发提供商速率限制(HTTP 429)", "2d707aa220f213ec": "{attempt, plural, other {重试 {progress} 次后达到用量限制}}", "7988500254403038": "{attempt, plural, other {重试 {progress} 次后提供方出错}}", "ed8b45cc0303e955": "已停止重试提供方({progress})", @@ -4205,8 +4207,8 @@ "918cd5477d0c0e9b": "显示完整消息", "513b0929ca7dde1b": "工具输入\n{input}", "c6e000ea79ae6a2b": "{status, select, inProgress {正在读取会话“{title}”} completed {已读取会话“{title}”} failed {读取会话“{title}”失败} declined {已拒绝读取会话“{title}”} stopped {已停止读取会话“{title}”} other {正在读取会话“{title}”}}", - "93435595c79fd659": "已达到用量限制。请在 {resetTime} 后重试。", - "5a2d803b3ea43f18": "已达到用量上限。", + "28eb53dc727dc676": "{title}。请在 {resetTime} 后重试。", + "dd414046c22e4adf": "{title}。", "1afc4f46bc0675aa": "{label},工具调用失败", "e05d1bee2862c2be": "工具调用失败", "ce591b4de647ecda": "打开 {title}", @@ -4352,7 +4354,7 @@ "275a97b4af3c6482": "复制命令,在终端中运行", "2b07985d23563374": "{time} 自动继续", "c0c3aa756405c1df": "{time} 重置", - "a7bfaa71c8b3030b": "重置时间未知,请手动重试", + "80bcb29b776000c4": "未报告重置时间;请手动重试", "77a70e5c3fd83ed8": "已达到 ChatGPT 用量上限", "c6c8d924b76b5a14": "你已达到工作区允许在其他应用中使用 ChatGPT 套餐的上限。", "babea77bd5527a74": "重置时间已过,请手动重试这个会话。", diff --git a/apps/web/src/session-logic.test.ts b/apps/web/src/session-logic.test.ts index 53697f82d84b..d36b0f919400 100644 --- a/apps/web/src/session-logic.test.ts +++ b/apps/web/src/session-logic.test.ts @@ -22,6 +22,7 @@ import type { ThreadRuntimeSummary } from "@t3tools/client-runtime/state/shell"; import { deriveMessagesTimelineRows } from "./components/chat/MessagesTimeline.logic"; import * as DateTime from "effect/DateTime"; import { describe, expect, it } from "vite-plus/test"; +import { m as resolveEnglish, type MessageResolver } from "./i18n/messages"; import { deriveCanInterruptRunningThread, @@ -153,13 +154,42 @@ describe("V2 session presentation", () => { }, } satisfies Extract; - expect( - providerErrorPresentation({ + for (const [code, label] of [ + ["responseTooManyFailedAttempts", "Provider rate limit (HTTP 429)"], + ["usageLimitExceeded", "Usage limit reached"], + ] as const) { + const failed = { ...retryItem, - status: "failed", - failure: { ...retryItem.failure, class: "usage_limit" }, - }), - ).toMatchObject({ label: "Usage limit reached after 2/10 retries" }); + status: "failed" as const, + title: "Usage limit reached", + failure: { + class: "usage_limit" as const, + code, + message: "exceeded retry limit, last status: 429 Too Many Requests", + retryable: null, + }, + }; + expect(providerErrorPresentation(failed)).toEqual({ + label: `${label} after 2/10 retries`, + detail: failed.failure.message, + }); + expect(providerErrorPresentation({ ...failed, retry: undefined })).toEqual({ + label, + detail: failed.failure.message, + }); + const translate: MessageResolver = (message, options) => { + const english = resolveEnglish(message, options); + return ( + typeof english === "string" ? english.replace(label, "Translated failure") : english + ) as typeof english; + }; + expect(providerErrorPresentation(failed, translate).label).toBe( + "Translated failure after 2/10 retries", + ); + expect(providerErrorPresentation({ ...failed, retry: undefined }, translate).label).toBe( + "Translated failure", + ); + } const recoveredLimit = { ...retryItem, status: "completed" as const, diff --git a/apps/web/src/session-logic.ts b/apps/web/src/session-logic.ts index 482c92756448..012ed37fc903 100644 --- a/apps/web/src/session-logic.ts +++ b/apps/web/src/session-logic.ts @@ -1,3 +1,4 @@ +import { providerFailureTitle } from "@t3tools/shared/orchestrationV2ThreadError"; import type { ThreadStructureRuntime } from "@t3tools/client-runtime/state/shell"; import { msg } from "gt-react"; import { resolveThreadWorkingStartedAt } from "@t3tools/client-runtime/state/models"; @@ -312,7 +313,7 @@ export function providerErrorPresentation( return { label: item.failure.class === "usage_limit" - ? resolve(msg("Usage limit reached")) + ? providerFailureTitle(item.failure.class, item.failure.code, resolve) : item.title?.trim() || resolve(msg("Provider error")), detail: item.failure.message, }; @@ -334,12 +335,19 @@ export function providerErrorPresentation( ) : item.status === "failed" ? item.failure.class === "usage_limit" - ? resolve( - msg( - "{attempt, plural, one {Usage limit reached after {progress} retries} other {Usage limit reached after {progress} retries}}", - ), - counts, - ) + ? item.failure.code === "responseTooManyFailedAttempts" + ? resolve( + msg( + "{attempt, plural, one {Provider rate limit (HTTP 429) after {progress} retries} other {Provider rate limit (HTTP 429) after {progress} retries}}", + ), + counts, + ) + : resolve( + msg( + "{attempt, plural, one {Usage limit reached after {progress} retries} other {Usage limit reached after {progress} retries}}", + ), + counts, + ) : resolve( msg( "{attempt, plural, one {Provider error after {progress} retries} other {Provider error after {progress} retries}}", diff --git a/packages/provider-core/src/server/failure.test.ts b/packages/provider-core/src/server/failure.test.ts index a07ef21a6221..47f778a38d2e 100644 --- a/packages/provider-core/src/server/failure.test.ts +++ b/packages/provider-core/src/server/failure.test.ts @@ -18,6 +18,7 @@ import { knownProviderFailureMessage, makeProviderFailure, makeProviderFailureTurnItem, + makeProviderRetryTurnItem, MAX_PROVIDER_FAILURE_MESSAGE_LENGTH, ContextHandoffBudgetError, ContextHandoffBackgroundWorkError, @@ -319,6 +320,47 @@ it("does not serialize arbitrary provider causes", () => { }); }); +it.each([ + ["usage_limit", "responseTooManyFailedAttempts", "Provider rate limit (HTTP 429)"], + ["usage_limit", "usageLimitExceeded", "Usage limit reached"], + ["provider_error", "responseTooManyFailedAttempts", "Provider error"], +] as const)( + "titles %s / %s failures without changing recovery evidence", + (failureClass, code, title) => { + const failure = makeProviderFailure({ + class: failureClass, + code, + message: "Provider explanation retained.", + retryable: null, + }); + const occurredAt = DateTime.makeUnsafe("2026-10-28T15:03:08.000Z"); + const base = { + driver: ProviderDriverKind.make("codex"), + threadId: ThreadId.make("thread:failure-title"), + runId: RunId.make("run:failure-title"), + nodeId: null, + providerThreadId: ProviderThreadId.make("provider-thread:failure-title"), + providerTurnId: ProviderTurnId.make("provider-turn:failure-title"), + itemOrdinal: 1, + failure, + }; + const terminal = makeProviderFailureTurnItem({ ...base, occurredAt }); + const exhausted = makeProviderRetryTurnItem({ + ...base, + retry: { attempt: 2, maxAttempts: null, retryDelayMs: null }, + status: "failed", + startedAt: occurredAt, + updatedAt: occurredAt, + }); + for (const item of [terminal, exhausted]) { + assert.equal(item.title, title); + assert.deepEqual(item.failure, failure); + assert.equal(item.status, "failed"); + assert.isUndefined(item.failure.resetAt); + } + }, +); + it.effect("keys terminal failure items by provider turn across retries and fallback paths", () => Effect.gen(function* () { const idAllocator = yield* IdAllocator.IdAllocatorV2; diff --git a/packages/provider-core/src/server/failure.ts b/packages/provider-core/src/server/failure.ts index c416596dd45d..2976b4ef8478 100644 --- a/packages/provider-core/src/server/failure.ts +++ b/packages/provider-core/src/server/failure.ts @@ -12,6 +12,7 @@ import type { } from "@t3tools/contracts"; import * as DateTime from "effect/DateTime"; import * as Cause from "effect/Cause"; +import { providerFailureTitle } from "@t3tools/shared/orchestrationV2ThreadError"; import * as IdAllocator from "./IdAllocator.ts"; import type { ProviderAdapterFailureReason } from "./ProviderAdapter.ts"; @@ -342,7 +343,7 @@ export function makeProviderFailureTurnItem(input: { parentItemId: null, ordinal: input.itemOrdinal, status: "failed", - title: input.failure.class === "usage_limit" ? "Usage limit reached" : "Provider error", + title: providerFailureTitle(input.failure.class, input.failure.code), startedAt: input.retryStartedAt ?? input.occurredAt, completedAt: input.occurredAt, updatedAt: input.occurredAt, @@ -381,7 +382,7 @@ export function makeProviderRetryTurnItem(input: { if (input.status === "completed") { title = "Provider recovered"; } else if (input.status === "failed") { - title = input.failure.class === "usage_limit" ? "Usage limit reached" : "Provider error"; + title = providerFailureTitle(input.failure.class, input.failure.code); } else if (input.status === "interrupted" || input.status === "cancelled") { title = "Provider retry stopped"; } diff --git a/packages/shared/src/orchestrationV2ThreadError.ts b/packages/shared/src/orchestrationV2ThreadError.ts index 141d73f40254..01ff0868c019 100644 --- a/packages/shared/src/orchestrationV2ThreadError.ts +++ b/packages/shared/src/orchestrationV2ThreadError.ts @@ -4,6 +4,20 @@ import type { OrchestrationV2TurnItem, } from "@t3tools/contracts"; import * as DateTime from "effect/DateTime"; +import { mFallback, msg } from "gt-i18n"; +import type { MFunctionType } from "gt-i18n/types"; + +export function providerFailureTitle( + failureClass: OrchestrationV2ProviderFailure["class"] | null | undefined, + code: string | null | undefined, + resolve: MFunctionType = mFallback, +): string { + if (failureClass !== "usage_limit") return resolve(msg("Provider error")); + // Codex's usage_limit retry exhaustion retains HTTP 429, but loses the upstream reason. + return code === "responseTooManyFailedAttempts" + ? resolve(msg("Provider rate limit (HTTP 429)")) + : resolve(msg("Usage limit reached")); +} type ErrorTurnItem = Extract; /** Only error items are read, so callers may pass items stripped of other fields. */