mohdel 0.95.0 → 0.97.0

package/js/session/adapters/_errors.js

@@ -1,12 +1,17 @@
 /**
  * Shared error classification for provider adapters.
  *
- * Maps SDK errors (by HTTP status) to a canonical `TypedError` with
- * stable `type` tags (AUTH_INVALID, RATE_LIMIT, PROVIDER_COOLDOWN,
- * PROVIDER_UNAVAILABLE, …). 401/403 messages stay generic to avoid
- * echoing provider bodies that may contain the API key back on the
- * wire; for other statuses the provider's own detail is preserved
- * on `.detail` so callers can debug 400s (schema rejects, etc).
+ * Maps SDK errors to a canonical `TypedError`. Inspects provider
+ * error codes / messages first (so semantically meaningful tags like
+ * `CONTEXT_OVERFLOW` and `QUOTA_EXHAUSTED` aren't lost in generic
+ * status buckets), then falls back to HTTP status. 401/403 messages
+ * stay generic to avoid echoing provider bodies that may contain the
+ * API key back on the wire; for other statuses the provider's own
+ * detail is preserved on `.detail` so callers can debug 400s.
+ *
+ * Type tags: `AUTH_INVALID`, `RATE_LIMIT`, `QUOTA_EXHAUSTED`,
+ * `CONTEXT_OVERFLOW`, `CONTENT_BLOCKED`, `PROVIDER_UNAVAILABLE`,
+ * `PROVIDER_ERROR`, `NET_ERROR`.
  *
  * @module session/adapters/_errors
  */
@@ -22,8 +27,6 @@ const DETAIL_CAP = 500
  */
 function extractDetail (err) {
   if (!err) return undefined
-  // OpenAI SDK: err.error.message; Google SDK: err.message is the full
-  // body sometimes. Prefer the structured field when present.
   const nested = err.error?.message || err.response?.data?.error?.message
   const raw = nested || err.message
   if (!raw) return undefined
@@ -31,6 +34,49 @@ function extractDetail (err) {
   return str.length > DETAIL_CAP ? str.slice(0, DETAIL_CAP) + '…' : str
 }
 
+/**
+ * Pull a provider-supplied error code/type out of any of the shapes
+ * the SDKs use. OpenAI/xAI/DeepSeek expose `err.code` or
+ * `err.error.code`; Anthropic surfaces `err.error.error.type`;
+ * Gemini buries everything in `err.message`. Lower-cased for a
+ * single substring/equality check site.
+ * @param {any} err
+ * @returns {string}
+ */
+function extractCode (err) {
+  if (!err) return ''
+  const candidates = [
+    err.code,
+    err.error?.code,
+    err.error?.type,
+    err.error?.error?.type,
+    err.error?.error?.code,
+    err.response?.data?.error?.code,
+    err.response?.data?.error?.type
+  ]
+  for (const c of candidates) {
+    if (typeof c === 'string' && c) return c.toLowerCase()
+  }
+  return ''
+}
+
+/**
+ * Match common context-overflow phrasings used by providers that
+ * don't expose a dedicated error code (Gemini, some compat gateways).
+ * @param {string} msg
+ * @returns {boolean}
+ */
+function matchesContextOverflow (msg) {
+  const m = (msg || '').toLowerCase()
+  if (!m) return false
+  if (m.includes('context_length') || m.includes('context length')) return true
+  if (m.includes('maximum context') || m.includes('context window')) return true
+  if (m.includes('prompt is too long') || m.includes('input is too long')) return true
+  if (m.includes('too many tokens') || m.includes('token limit')) return true
+  if (m.includes('max_tokens') && m.includes('exceed')) return true
+  return false
+}
+
 /**
  * @param {unknown} e
  * @returns {import('#core/errors.js').TypedError}
@@ -38,6 +84,62 @@ function extractDetail (err) {
 export function classifyProviderError (e) {
   const err = /** @type {any} */(e)
   const status = err?.status
+  const code = extractCode(err)
+  const message = err?.message || ''
+  const detail = extractDetail(err)
+
+  // --- Code-driven classification (runs before status buckets so
+  //     specific tags survive even when the upstream HTTP status is
+  //     a generic 400/429). ---
+
+  if (
+    code === 'context_length_exceeded' ||
+    code === 'string_above_max_length' ||
+    code === 'context_length' ||
+    matchesContextOverflow(message) ||
+    matchesContextOverflow(detail)
+  ) {
+    return {
+      message: 'context length exceeded',
+      severity: 'warn',
+      retryable: false,
+      type: 'CONTEXT_OVERFLOW',
+      detail
+    }
+  }
+
+  if (
+    code === 'insufficient_quota' ||
+    code === 'billing_hard_limit_reached' ||
+    code === 'account_deactivated' ||
+    code === 'credit_balance_too_low'
+  ) {
+    return {
+      message: 'provider quota exhausted',
+      severity: 'error',
+      retryable: false,
+      type: 'QUOTA_EXHAUSTED',
+      detail
+    }
+  }
+
+  if (
+    code === 'content_filter' ||
+    code === 'content_policy_violation' ||
+    code === 'safety' ||
+    code === 'blocked' ||
+    code === 'prohibited_content'
+  ) {
+    return {
+      message: 'content blocked by provider safety filter',
+      severity: 'warn',
+      retryable: false,
+      type: 'CONTENT_BLOCKED',
+      detail
+    }
+  }
+
+  // --- Status-driven fallback. ---
 
   if (status === 401 || status === 403) {
     // Deliberately no detail — 401/403 bodies can echo the key.
@@ -54,7 +156,7 @@ export function classifyProviderError (e) {
       severity: 'warn',
       retryable: true,
       type: 'RATE_LIMIT',
-      detail: extractDetail(err)
+      detail
     }
   }
   if (typeof status === 'number' && status >= 500) {
@@ -63,7 +165,7 @@ export function classifyProviderError (e) {
       severity: 'warn',
       retryable: true,
       type: 'PROVIDER_UNAVAILABLE',
-      detail: extractDetail(err)
+      detail
     }
   }
   if (typeof status === 'number' && status >= 400) {
@@ -72,14 +174,14 @@ export function classifyProviderError (e) {
       severity: 'error',
       retryable: false,
       type: 'PROVIDER_ERROR',
-      detail: extractDetail(err)
+      detail
     }
   }
   return {
-    message: err?.message ? String(err.message).slice(0, 200) : 'network error',
+    message: message ? String(message).slice(0, 200) : 'network error',
     severity: 'warn',
     retryable: true,
     type: 'NET_ERROR',
-    detail: extractDetail(err)
+    detail
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mohdel",
-  "version": "0.95.0",
+  "version": "0.97.0",
   "license": "MIT",
   "author": {
     "name": "Christophe Le Bars",
@@ -87,7 +87,7 @@
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.215.0",
     "@opentelemetry/sdk-node": "^0.215.0",
     "chalk": "^5.4.0",
-    "mohdel-thin-gate-linux-x64-gnu": "0.95.0"
+    "mohdel-thin-gate-linux-x64-gnu": "0.97.0"
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.91.0",

package/src/lib/errors.js

@@ -26,16 +26,6 @@ export const getSeverityNumber = (severitySymbol) => {
   }
 }
 
-// NOTE used to mock upstream Error
-export class APIError extends Error {
-  constructor (message, status = 500) {
-    super(message)
-    this.name = 'APIError'
-    this.status = status
-  }
-}
-
-// usually Severity at least info
 export class MohdelError extends Error {
   constructor (
     message,
@@ -51,76 +41,3 @@ export class MohdelError extends Error {
     this.silent = silent
   }
 }
-
-// Convert any error to the serialized transport shape. Duck-types on
-// `detail` to distinguish typed errors (MohdelError) from plain Error.
-export const toTransportError = (err, span) => {
-  const isTyped = err.detail !== undefined
-  return {
-    message: isTyped ? err.message : 'UNEXPECTED_ERROR',
-    detail: isTyped ? err.detail : 'An unexpected error occurred',
-    trace: span?.spanContext()?.traceId,
-    component: err.component || undefined,
-    context: err.context || undefined,
-    retryable: err.retryable ?? false,
-    silent: err.silent ?? false
-  }
-}
-
-export const retryableWarn = (err, detail) => {
-  return {
-    message: 'PROVIDER_OVERLOADED',
-    severity: Severity.WARN,
-    retryable: true,
-    detail,
-    cause: err
-  }
-}
-export const reportRetryable = (err, provider, detail) => {
-  detail ||= `**An unexpected error occurred**: ${provider}'s API failed to respond. Try again or switch to a different model. If the issue persists, please contact support and provide the Trace ID.`
-  return {
-    message: 'PROVIDER_RETRYABLE_ERROR',
-    severity: Severity.ERROR,
-    detail,
-    retryable: true,
-    cause: err
-  }
-}
-
-export const reportDefault = (err, provider) => {
-  return {
-    message: 'PROVIDER_ERROR',
-    severity: Severity.ERROR,
-    detail: `**An unexpected error occurred**: ${provider}'s API failed to respond. Try switching to a different model or please contact support and provide the Trace ID.`,
-    retryable: isConnectionError(err),
-    cause: err
-  }
-}
-
-export const reportContextOverflow = (err, provider) => {
-  return {
-    message: 'CONTEXT_OVERFLOW',
-    severity: Severity.WARN,
-    detail: `The prompt exceeds ${provider}'s context limit. Reduce input or switch to a larger context model.`,
-    retryable: false,
-    cause: err
-  }
-}
-
-export function isContextOverflowMessage (errMessage) {
-  const msg = (errMessage || '').toLowerCase()
-  if (msg.includes('context_length') || msg.includes('context length')) return true
-  if (msg.includes('token limit') || msg.includes('too long') || msg.includes('too many tokens')) return true
-  if (msg.includes('maximum context') || msg.includes('prompt is too long')) return true
-  if (msg.includes('max_tokens') && msg.includes('exceed')) return true
-  return false
-}
-
-function isConnectionError (err) {
-  const code = err?.code || err?.cause?.code
-  if (code === 'ECONNRESET' || code === 'ECONNREFUSED' || code === 'ETIMEDOUT' ||
-      code === 'EPIPE' || code === 'ENOTFOUND' || code === 'UND_ERR_CONNECT_TIMEOUT') return true
-  const msg = (err?.message || '').toLowerCase()
-  if (msg.includes('fetch failed') || msg.includes('socket hang up') || msg.includes('network')) return true
-  return false
-}