@ducci/jarvis 1.0.94 → 1.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ducci/jarvis",
-  "version": "1.0.94",
+  "version": "1.0.95",
   "description": "A fully automated agent system that lives on a server.",
   "main": "./src/index.js",
   "type": "module",

package/src/server/agent.js

@@ -131,6 +131,18 @@ function extractApiError(err, model) {
   };
 }
 
+// Extract the most specific error description available.
+// Provider-specific APIs (e.g. z.ai) return a code + message in err.error;
+// the OpenAI SDK sets err.message to the body message but sometimes prepends
+// the HTTP status code, making it less readable. Prefer err.error.message + code.
+function describeApiError(err) {
+  const bodyMsg = err?.error?.message;
+  const bodyCode = err?.error?.code;
+  if (bodyMsg && bodyCode) return `${bodyMsg} (code: ${bodyCode})`;
+  if (bodyMsg) return bodyMsg;
+  return err?.message ?? String(err);
+}
+
 async function callModelWithFallback(client, config, messages, tools) {
   let primaryErr = null;
   try {
@@ -141,9 +153,21 @@ async function callModelWithFallback(client, config, messages, tools) {
   try {
     return await callModel(client, config.fallbackModel, messages, tools);
   } catch (fallbackErr) {
-    const combined = new Error(
-      `Both primary (${config.selectedModel}) and fallback (${config.fallbackModel}) models failed. Last error: ${fallbackErr.message}`
-    );
+    const primaryDesc = describeApiError(primaryErr);
+    const fallbackDesc = describeApiError(fallbackErr);
+    const sameModel = config.selectedModel === config.fallbackModel;
+    const sameError = primaryDesc === fallbackDesc;
+
+    let msg;
+    if (sameModel && sameError) {
+      msg = `Model (${config.selectedModel}) failed: ${fallbackDesc}`;
+    } else if (sameModel) {
+      msg = `Model (${config.selectedModel}) failed. Primary: ${primaryDesc} | Fallback: ${fallbackDesc}`;
+    } else {
+      msg = `Both primary (${config.selectedModel}) and fallback (${config.fallbackModel}) models failed. Primary: ${primaryDesc} | Fallback: ${fallbackDesc}`;
+    }
+
+    const combined = new Error(msg);
     combined.apiErrors = {
       primary: extractApiError(primaryErr, config.selectedModel),
       fallback: extractApiError(fallbackErr, config.fallbackModel),