@opencode/ai 0.0.0-dev-19629 → 0.0.0-dev-19631

package/dist/provider-error.js

@@ -52,9 +52,26 @@ const SERVER_CODES = new Set([
     "serviceunavailableexception",
 ]);
 const INVALID_REQUEST_CODES = new Set(["invalid_prompt", "invalid_request_error", "validationexception"]);
+// Azure OpenAI reports `content_filter` with `innererror.code` ResponsibleAIPolicyViolation.
+// OpenRouter tags provider failures with a typed `error_type`; its Responses skin also
+// emits `image_content_policy_violation` as the native code.
+const CONTENT_POLICY_CODES = new Set([
+    "content_filter",
+    "responsibleaipolicyviolation",
+    "content_policy_violation",
+    "image_content_policy_violation",
+    "refusal",
+]);
+// OpenCode Zen replaces upstream codes outside its allow-list but keeps the original
+// as a `[code]` label at the start of the rewritten message.
+const GATEWAY_CODE_LABEL = /^[^:\n]+: \[([A-Za-z0-9_.-]+)\]/;
 const RATE_LIMIT_TEXT = /rate increased too quickly|rate[-_\s]?limit|too[_\s]?many[_\s]?requests/i;
 const QUOTA_TEXT = /insufficient[-_\s]?quota|quota[-_\s]?exceeded/i;
-const CONTENT_POLICY_TEXT = /content[-_\s]?policy|content_filter|safety/i;
+// Policy rejections without a dedicated code, matched against the provider's own
+// explanation only. OpenAI reuses `invalid_prompt` for usage-policy rejections while
+// Bedrock Mantle reuses it for schema validation; Anthropic reports blocked output
+// under `invalid_request_error`.
+const CONTENT_POLICY_TEXT = /violating our usage policy|blocked by content filtering policy|content[-_\s]?policy|rejected as a result of our safety system/i;
 const SERVER_ERROR_TEXT = /\b(?:try again|(?:please |you can )?retry (?:the |this |your )?request|try (?:the |this |your )?request again|(?:currently |temporarily )?at capacity|overloaded|temporarily unavailable|service[-_\s]?unavailable|(?:server|internal)[-_\s]?error|server (?:is )?busy|provider returned (?:an )?error|resource[-_\s]?exhausted|upstream (?:connect|connection|request)|request buffer limit while retrying upstream)\b/i;
 // Classification records affirmative evidence about a failure. Deterministic
 // failures need positive identification (a 4xx status, quota/auth/policy
@@ -65,7 +82,12 @@ const SERVER_ERROR_TEXT = /\b(?:try again|(?:please |you can )?retry (?:the |thi
 export function classifyProviderFailure(input) {
     const details = { message: input.message, body: input.rawBody, http: input.http, cause: input.cause };
     const body = input.rawBody ?? "";
-    const codes = [...providerCodes(input.data), ...providerCodes(body), ...providerCodes(input.message)].map((code) => code.toLowerCase());
+    const codes = [
+        ...providerCodes(input.data),
+        ...providerCodes(body),
+        ...providerCodes(input.message),
+        ...(GATEWAY_CODE_LABEL.exec(input.message)?.slice(1) ?? []),
+    ].map((code) => code.toLowerCase());
     // Scan the raw payload too so signals missing from the summary message
     // (e.g. overflow phrases nested in a JSON error body) still classify.
     const text = [input.message, body].filter((value) => value.length > 0).join("\n");
@@ -78,7 +100,7 @@ export function classifyProviderFailure(input) {
         return new InvalidRequestError({ ...details, classification: "context-overflow" });
     if (input.status === 413 || isPayloadTooLarge(text))
         return new InvalidRequestError({ ...details, classification: "payload-too-large" });
-    if (CONTENT_POLICY_TEXT.test(text))
+    if (codes.some((code) => CONTENT_POLICY_CODES.has(code)) || (clientScoped && CONTENT_POLICY_TEXT.test(input.message)))
         return new ContentPolicyError(details);
     if (codes.some((code) => QUOTA_CODES.has(code)) || (input.status === 429 && QUOTA_TEXT.test(text)))
         return new QuotaExceededError(details);
@@ -115,10 +137,24 @@ function providerCodes(value) {
     if (!isRecord(decoded))
         return [];
     const error = isRecord(decoded.error) ? decoded.error : undefined;
+    const inner = error && isRecord(error.innererror) ? error.innererror : undefined;
+    const metadata = error && isRecord(error.metadata) ? error.metadata : undefined;
     const response = isRecord(decoded.response) ? decoded.response : undefined;
     const responseError = response && isRecord(response.error) ? response.error : undefined;
     const exception = isRecord(decoded.exception) ? decoded.exception : undefined;
-    return [decoded.code, error?.code, error?.type, error?.status, responseError?.code, exception?.type].filter((value) => typeof value === "string");
+    return [
+        decoded.code,
+        decoded.error_type,
+        error?.code,
+        error?.type,
+        error?.status,
+        error?.error_type,
+        inner?.code,
+        metadata?.error_type,
+        responseError?.code,
+        response?.error_type,
+        exception?.type,
+    ].filter((value) => typeof value === "string");
 }
 function isRecord(value) {
     return typeof value === "object" && value !== null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.0.0-dev-19629",
+  "version": "0.0.0-dev-19631",
   "name": "@opencode/ai",
   "type": "module",
   "license": "MIT",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@clack/prompts": "1.0.0-alpha.1",
     "@effect/platform-node": "4.0.0-rc.112",
-    "@opencode/http-recorder": "0.0.0-dev-19629",
+    "@opencode/http-recorder": "0.0.0-dev-19631",
     "@tsconfig/bun": "1.0.9",
     "@types/bun": "1.4.0",
     "@typescript/native-preview": "7.0.0-dev.20251207.1",
@@ -40,7 +40,7 @@
     "@aws-sdk/credential-providers": "3.1057.0",
     "@smithy/eventstream-codec": "4.2.14",
     "@smithy/util-utf8": "4.2.2",
-    "@opencode/schema": "0.0.0-dev-19629",
+    "@opencode/schema": "0.0.0-dev-19631",
     "aws4fetch": "1.0.20",
     "effect": "4.0.0-rc.112",
     "google-auth-library": "10.5.0"