AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.
HTML ai-agentcloudflarecloudflare-d1cloudflare-r2cloudflare-workersdockerelectronevernoteevernote-alternativeknowledge-basemcpnote-takingobsidian-alternativeoffline-firstpersonal-knowledge-basepwaself-hostedsqlitetiptapweb-clipper
fix(ai): distinguish model timeouts from rejected requests
tianma-ifd3f51964db46
diff --git a/packages/shared/src/companion-failure.test.mjs b/packages/shared/src/companion-failure.test.mjsindex 4d5f4130..517f3c3b 100644--- a/packages/shared/src/companion-failure.test.mjs+++ b/packages/shared/src/companion-failure.test.mjs@@ -23,6 +23,19 @@ test("distinguishes stream validation, network, empty output, and output limit",expect(companionFailureDiagnostics(new Error("Response limit exceeded."))).toEqual({ reason: "responseLimit" });});+test("distinguishes gateway timeouts and server failures from rejected requests", () => {+ for (const status of [408, 504]) {+ expect(companionFailureDiagnostics({ statusCode: status, responseBody: "private upstream response" }))+ .toEqual({ reason: "timeout", status });+ }+ for (const status of [500, 502, 503]) {+ expect(companionFailureDiagnostics({ status })).toEqual({ reason: "server", status });+ }+ for (const status of [400, 401, 403, 404, 429]) {+ expect(companionFailureDiagnostics({ status })).toEqual({ reason: "http", status });+ }+});+test("classifies wrapped network errors without exposing cause data or looping", () => {expect(companionFailureDiagnostics({ name: "AI_APICallError", cause: new TypeError("fetch failed") })).toEqual({ reason: "network" });diff --git a/packages/shared/src/companion.ts b/packages/shared/src/companion.tsindex f663cf9c..bfa92bcf 100644--- a/packages/shared/src/companion.ts+++ b/packages/shared/src/companion.ts@@ -375,7 +375,7 @@ export const CompanionMemoryImportSchema = z.object({/** Only fixed categories and HTTP status cross the UI boundary. Never forward SDK* messages, request bodies, response bodies, URLs, headers, or credentials. */export type CompanionFailureDiagnostics = {- reason: "http" | "network" | "invalidResponse" | "emptyResponse" | "responseLimit";+ reason: "http" | "timeout" | "server" | "network" | "invalidResponse" | "emptyResponse" | "responseLimit";status?: number;};@@ -384,6 +384,8 @@ export const companionFailureDiagnostics = (error: unknown, depth = 0): Companioconst record = error as { statusCode?: unknown; status?: unknown; name?: unknown; message?: unknown; cause?: unknown };const status = record.statusCode ?? record.status;if (typeof status === "number" && Number.isInteger(status) && status >= 400 && status <= 599) {+ if (status === 408 || status === 504) return { reason: "timeout", status };+ if (status >= 500) return { reason: "server", status };return { reason: "http", status };}if (record.name === "AI_InvalidResponseDataError" || record.name === "AI_JSONParseError"diff --git a/packages/shared/src/i18n/en-US.ts b/packages/shared/src/i18n/en-US.tsindex 3554f972..64dd7de4 100644--- a/packages/shared/src/i18n/en-US.ts+++ b/packages/shared/src/i18n/en-US.ts@@ -364,6 +364,8 @@ export const enUS = {"providerRateLimited": "The model provider rate-limited this request. Wait a moment and try again.","providerRequestRejected": "The default model rejected this request. Confirm it supports tool calling, or choose a different default model.","failureDetails": {+ "timeout": "The model request timed out. Try again later; if it persists, check the model service and network proxy.",+ "server": "The model service returned a server error. Try again later; if it persists, check the provider status.","http": "The request was rejected. Check the provider URL, model ID, and supported request features.","network": "This device could not connect directly to the model service. Check the URL and network. Browser access also requires the model service to allow CORS.","invalidResponse": "The provider returned an incompatible response. Check the selected API protocol and streaming support.",diff --git a/packages/shared/src/i18n/ja.ts b/packages/shared/src/i18n/ja.tsindex 3a64eb22..9893da29 100644--- a/packages/shared/src/i18n/ja.ts+++ b/packages/shared/src/i18n/ja.ts@@ -353,6 +353,8 @@ export const ja = {"providerRateLimited": "モデル提供元がレート制限しています。しばらく待ってから再試行してください。","providerRequestRejected": "デフォルトモデルがこのリクエストを拒否しました。ツール呼び出しに対応しているか確認するか、別のデフォルトモデルを選んでください。","failureDetails": {+ "timeout": "モデルへのリクエストがタイムアウトしました。時間をおいて再試行し、続く場合はモデルサービスとネットワークプロキシを確認してください。",+ "server": "モデルサービスでサーバーエラーが発生しました。時間をおいて再試行し、続く場合はサービスの稼働状況を確認してください。","http": "リクエストが拒否されました。提供元のURL、モデルID、対応機能を確認してください。","network": "この端末からモデルサービスに直接接続できません。URL とネットワークを確認してください。ブラウザーからのアクセスには、モデルサービスで CORS を許可する必要があります。","invalidResponse": "応答形式に互換性がありません。APIプロトコルとストリーミング対応を確認してください。",diff --git a/packages/shared/src/i18n/pl.ts b/packages/shared/src/i18n/pl.tsindex c592e776..af00e00f 100644--- a/packages/shared/src/i18n/pl.ts+++ b/packages/shared/src/i18n/pl.ts@@ -353,6 +353,8 @@ export const pl = {"providerRateLimited": "Dostawca modelu ograniczył liczbę żądań. Odczekaj chwilę i spróbuj ponownie.","providerRequestRejected": "Domyślny model odrzucił to żądanie. Upewnij się, że obsługuje wywoływanie narzędzi, lub wybierz inny model domyślny.","failureDetails": {+ "timeout": "Upłynął limit czasu żądania modelu. Spróbuj ponownie później; jeśli problem się powtarza, sprawdź usługę modelu i serwer proxy.",+ "server": "Usługa modelu zwróciła błąd serwera. Spróbuj ponownie później; jeśli problem się powtarza, sprawdź status dostawcy.","http": "Żądanie zostało odrzucone. Sprawdź adres dostawcy, identyfikator modelu i obsługiwane funkcje.","network": "To urządzenie nie może połączyć się bezpośrednio z usługą modelu. Sprawdź adres i sieć. Dostęp z przeglądarki wymaga też zezwolenia na CORS po stronie usługi modelu.","invalidResponse": "Dostawca zwrócił niezgodną odpowiedź. Sprawdź protokół API i obsługę strumieniowania.",diff --git a/packages/shared/src/i18n/zh-CN.ts b/packages/shared/src/i18n/zh-CN.tsindex ac7549d6..51bd947d 100644--- a/packages/shared/src/i18n/zh-CN.ts+++ b/packages/shared/src/i18n/zh-CN.ts@@ -364,6 +364,8 @@ export const zhCN = {"providerRateLimited": "模型服务商限流,请稍后再试。","providerRequestRejected": "默认模型拒绝了这次请求。请确认该模型支持工具调用,或更换默认模型。","failureDetails": {+ "timeout": "模型请求超时,请稍后重试;若持续失败,请检查模型服务及网络代理。",+ "server": "模型服务返回了服务端错误,请稍后重试;若持续失败,请检查服务商状态。","http": "请求被拒绝,请检查服务商地址、模型 ID 和请求功能支持。","network": "当前设备无法直连模型服务。请检查模型地址和网络;在浏览器中使用时,模型服务还需允许跨域访问(CORS)。","invalidResponse": "服务商返回了不兼容的响应,请检查所选 API 协议及流式响应支持。",