@agentionai/agents 1.8.0-beta-0 → 1.8.0

package/dist/agents/openrouter/OpenRouterAgent.js

@@ -331,10 +331,11 @@ class OpenRouterAgent extends BaseAgent_1.BaseAgent {
             return error;
         const err = error;
         if (typeof err?.statusCode === "number") {
+            const message = unwrapOpenRouterMessage(parseOpenRouterErrorBody(err.body), err.message ?? "Unknown error");
             if (err.statusCode === 429) {
-                return this.rateLimitError(err);
+                return this.rateLimitError(err, message);
             }
-            return new AgentError_1.ApiError(`OpenRouter API error: ${err.message ?? "Unknown error"}`, err.statusCode, error);
+            return new AgentError_1.ApiError(`OpenRouter API error: ${message}`, err.statusCode, error);
         }
         return new AgentError_1.ExecutionError(`OpenRouter error: ${error instanceof Error ? error.message : "Unknown error"}`);
     }
@@ -344,7 +345,7 @@ class OpenRouterAgent extends BaseAgent_1.BaseAgent {
      * a 429 passed through from an upstream provider carries neither, which is why
      * every field is optional.
      */
-    rateLimitError(err) {
+    rateLimitError(err, message) {
         const headers = err.headers;
         const num = (name) => {
             const raw = headers?.get(name);
@@ -358,7 +359,7 @@ class OpenRouterAgent extends BaseAgent_1.BaseAgent {
         // legal and costs one branch to accept.
         const retryAfterRaw = headers?.get("retry-after");
         const retryAfterMs = parseRetryAfter(retryAfterRaw);
-        return new AgentError_1.RateLimitError(`OpenRouter rate limit: ${err.message ?? "Too many requests"}`, retryAfterMs, num("x-ratelimit-limit"), num("x-ratelimit-remaining"), parseResetAt(num("x-ratelimit-reset")), err);
+        return new AgentError_1.RateLimitError(`OpenRouter rate limit: ${message}`, retryAfterMs, num("x-ratelimit-limit"), num("x-ratelimit-remaining"), parseResetAt(num("x-ratelimit-reset")), err);
     }
     closeViz(name, message, throttled) {
         if (!this.vizEventId)
@@ -548,7 +549,7 @@ class OpenRouterAgent extends BaseAgent_1.BaseAgent {
         // turn — writing partial text to history and emitting DONE.
         (0, cancellation_1.throwIfAborted)(options?.signal, `Execution of agent ${this.getName()}`);
         if (streamError) {
-            throw new AgentError_1.ApiError(`OpenRouter stream error: ${streamError.message ?? "no message"}`, streamError.code, streamError);
+            throw new AgentError_1.ApiError(`OpenRouter stream error: ${unwrapOpenRouterMessage(streamError, streamError.message ?? "no message")}`, streamError.code, streamError);
         }
         if (finishReason === "length") {
             const error = new AgentError_1.MaxTokensExceededError("Response exceeded maximum token limit", this.config.maxTokens);
@@ -708,4 +709,46 @@ function parseResetAt(value) {
         return new Date(value * 1000);
     return new Date(value);
 }
+/**
+ * Parse an OpenRouter HTTP error body (`OpenRouterError.body`) down to its
+ * `error` field. Returns `undefined` for a missing or non-JSON body rather
+ * than throwing, since a malformed body is itself just something to fall back
+ * from, not a reason to lose the original error.
+ */
+function parseOpenRouterErrorBody(body) {
+    if (!body)
+        return undefined;
+    try {
+        return JSON.parse(body)?.error;
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Best-effort extraction of the most specific message an OpenRouter error
+ * payload carries, unwrapping `metadata.raw` when present. `raw` holds the
+ * upstream provider's exact error text (e.g. OpenAI's own `{error: {message}}`
+ * shape) — falls back to the payload's own `message`, then to `fallback`, so an
+ * unfamiliar or non-JSON `raw` still yields something rather than throwing.
+ */
+function unwrapOpenRouterMessage(payload, fallback) {
+    const topMessage = payload?.message ?? fallback;
+    const raw = payload?.metadata?.raw;
+    if (typeof raw !== "string" || !raw)
+        return topMessage;
+    try {
+        const parsedRaw = JSON.parse(raw);
+        const upstreamMessage = parsedRaw?.error?.message ?? parsedRaw?.message;
+        if (typeof upstreamMessage === "string" && upstreamMessage)
+            return upstreamMessage;
+    }
+    catch {
+        // Not JSON — some upstreams return plain text. Use it directly if short
+        // enough to be a message rather than a stack trace or HTML error page.
+        if (raw.length < 500)
+            return raw;
+    }
+    return topMessage;
+}
 //# sourceMappingURL=OpenRouterAgent.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agentionai/agents",
   "author": "Laurent Zuijdwijk",
-  "version": "1.8.0-beta-0",
+  "version": "1.8.0",
   "description": "Agent Library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",