190proof 1.0.109 → 1.0.110

package/README.md

@@ -278,6 +278,8 @@ Optional per-request knobs live on `payload` (`GenericPayload`):
 - `payload.requestTimeoutMs`: `number` - Per-attempt HTTP timeout in ms (default: 120000), honored by every adapter — except streaming OpenRouter attempts, which it deliberately does NOT bound (see below). For OpenRouter's non-streaming transport the default is 180000.
 - `payload.streaming`: `boolean` - OpenRouter-only (default: true). Streams the completion over SSE. A streaming attempt is bounded by two independent timers instead of `requestTimeoutMs`: `streamTimeoutMs` (total wall clock, default 600000) and the per-useful-chunk stall timeout (`chunkTimeoutMs` argument, default 15000). A chunk is "useful" only if it advances content, reasoning, tool-call fragments, finish_reason, or usage — SSE comment keep-alives (`: OPENROUTER PROCESSING`) and role-only deltas don't reset the stall timer, so a hung provider dies within one stall window while a healthy long generation can run to the total budget. Set `streaming: false` for the old single-JSON-body transport.
 - `payload.streamTimeoutMs`: `number` - OpenRouter-only: total wall-clock budget per streaming attempt (default: 600000).
+
+OpenRouter retries also perform **moderation eviction**: a provider content-moderation rejection (e.g. "Upstream error from Alibaba: Output data may contain inappropriate content.") is deterministic for a given payload, so on the first one the refusing provider is removed from the request's provider preferences (`ignore` += slug, `order` -= slug) and every remaining attempt reroutes to the next provider. Non-moderation errors retry with unchanged preferences, and `fallbackModel` still applies if the whole pool refuses.
 - `payload.signal`: `AbortSignal` - Caller-supplied cancellation. When it aborts, the in-flight provider request is cancelled and `callWithRetries` **rejects immediately — it does not retry or fall back** (both the retry loop and the fallback branch bail on `signal.aborted`). Threaded to the underlying fetch/axios/SDK call of each provider.
 
 #### Returns

package/dist/index.js

@@ -28,8 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // index.ts
-var index_exports = {};
-__export(index_exports, {
+var proof_exports = {};
+__export(proof_exports, {
   ClaudeModel: () => ClaudeModel,
   GPTModel: () => GPTModel,
   GeminiModel: () => GeminiModel,
@@ -40,7 +40,7 @@ __export(index_exports, {
   callWithRetries: () => callWithRetries,
   parseModelString: () => parseModelString
 });
-module.exports = __toCommonJS(index_exports);
+module.exports = __toCommonJS(proof_exports);
 
 // interfaces.ts
 var ClaudeModel = /* @__PURE__ */ ((ClaudeModel2) => {
@@ -171,7 +171,8 @@ async function withRetries(identifier, apiName, fn, options = {}) {
       return await fn();
     } catch (error3) {
       lastError = error3;
-      if ((_a = options.signal) == null ? void 0 : _a.aborted) throw error3;
+      if ((_a = options.signal) == null ? void 0 : _a.aborted)
+        throw error3;
       if (onError) {
         onError(error3, attempt);
       } else {
@@ -195,7 +196,8 @@ function parseStreamedResponse(identifier, paragraph, toolCallAccumulators, allo
   const functionCalls = [];
   for (let i = 0; i < toolCallAccumulators.length; i++) {
     const acc = toolCallAccumulators[i];
-    if (!acc.name || !acc.arguments) continue;
+    if (!acc.name || !acc.arguments)
+      continue;
     if (allowedFunctionNames && !allowedFunctionNames.has(acc.name)) {
       throw new Error(
         `Stream error: received function call with unknown name: ${acc.name}`
@@ -334,7 +336,8 @@ function buildOpenAIRequestConfig(identifier, model, config) {
   };
 }
 function filterOpenAICompatReasoningDetails(details) {
-  if (!Array.isArray(details)) return details || void 0;
+  if (!Array.isArray(details))
+    return details || void 0;
   const blocks = details.filter(
     (block) => typeof (block == null ? void 0 : block.type) === "string" && block.type.startsWith("reasoning.")
   );
@@ -405,11 +408,13 @@ async function prepareOpenAIPayload(identifier, payload) {
         };
       });
     }
-    if (message.reasoning) outMessage.reasoning = message.reasoning;
+    if (message.reasoning)
+      outMessage.reasoning = message.reasoning;
     const reasoningDetails = filterOpenAICompatReasoningDetails(
       message.reasoningDetails
     );
-    if (reasoningDetails) outMessage.reasoning_details = reasoningDetails;
+    if (reasoningDetails)
+      outMessage.reasoning_details = reasoningDetails;
     preparedPayload.messages.push(outMessage);
   }
   return preparedPayload;
@@ -471,7 +476,8 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs,
     }
     const jsonStrings = chunk.split(/^data: /gm);
     for (const jsonString of jsonStrings) {
-      if (!jsonString) continue;
+      if (!jsonString)
+        continue;
       if (jsonString.includes("[DONE]")) {
         clearTimeout(overallTimeout);
         return parseStreamedResponse(
@@ -509,7 +515,8 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs,
           while (toolCallAccumulators.length <= idx) {
             toolCallAccumulators.push({ name: "", arguments: "" });
           }
-          if (toolCall.id) toolCallAccumulators[idx].id = toolCall.id;
+          if (toolCall.id)
+            toolCallAccumulators[idx].id = toolCall.id;
           if ((_e = toolCall.function) == null ? void 0 : _e.name)
             toolCallAccumulators[idx].name += toolCall.function.name;
           if ((_f = toolCall.function) == null ? void 0 : _f.arguments)
@@ -517,9 +524,11 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs,
         }
       }
       const text = (_h = (_g = json.choices[0]) == null ? void 0 : _g.delta) == null ? void 0 : _h.content;
-      if (text) paragraph += text;
+      if (text)
+        paragraph += text;
       const reasoningDelta = (_j = (_i = json.choices[0]) == null ? void 0 : _i.delta) == null ? void 0 : _j.reasoning;
-      if (reasoningDelta) reasoning += reasoningDelta;
+      if (reasoningDelta)
+        reasoning += reasoningDelta;
     }
   }
 }
@@ -664,7 +673,8 @@ function jigAnthropicMessages(messages) {
     ];
   }
   jiggedMessages = jiggedMessages.reduce((acc, message) => {
-    if (acc.length === 0) return [message];
+    if (acc.length === 0)
+      return [message];
     const lastMessage = acc[acc.length - 1];
     if (lastMessage.role === message.role) {
       const lastContent = Array.isArray(lastMessage.content) ? lastMessage.content : [{ type: "text", text: lastMessage.content }];
@@ -918,7 +928,8 @@ function jigGoogleMessages(messages) {
     ];
   }
   jiggedMessages = jiggedMessages.reduce((acc, message) => {
-    if (acc.length === 0) return [message];
+    if (acc.length === 0)
+      return [message];
     const lastMessage = acc[acc.length - 1];
     if (lastMessage.role === message.role) {
       lastMessage.parts = [...lastMessage.parts, ...message.parts];
@@ -956,7 +967,8 @@ async function prepareGoogleAIPayload(_identifier, payload) {
   const toolNameById = /* @__PURE__ */ new Map();
   for (const m of payload.messages) {
     for (const fc of m.functionCalls || []) {
-      if (fc.id) toolNameById.set(fc.id, fc.name);
+      if (fc.id)
+        toolNameById.set(fc.id, fc.name);
     }
   }
   for (const message of payload.messages) {
@@ -1033,7 +1045,8 @@ async function callGoogleAI(id, payload, requestTimeoutMs = 12e4, signal) {
     contents,
     generationConfig: { responseModalities: ["TEXT"] }
   };
-  if (payload.tools) requestBody.tools = [payload.tools];
+  if (payload.tools)
+    requestBody.tools = [payload.tools];
   if (payload.tools && payload.toolConfig) {
     requestBody.toolConfig = payload.toolConfig;
   }
@@ -1091,7 +1104,8 @@ async function callGoogleAI(id, payload, requestTimeoutMs = 12e4, signal) {
       });
       continue;
     }
-    if (part.text) text += part.text;
+    if (part.text)
+      text += part.text;
     if ((_m = part.inlineData) == null ? void 0 : _m.data) {
       files.push({ mimeType: "image/png", data: part.inlineData.data });
     }
@@ -1168,15 +1182,21 @@ async function callGoogleAIWithRetries(id, payload, retries = 5, requestTimeoutM
         finishReason: error2.finishReason,
         modelVersion: error2.modelVersion
       };
-      if (error2.safetyRatings) errorDetails.safetyRatings = error2.safetyRatings;
-      if (error2.usageMetadata) errorDetails.usageMetadata = error2.usageMetadata;
+      if (error2.safetyRatings)
+        errorDetails.safetyRatings = error2.safetyRatings;
+      if (error2.usageMetadata)
+        errorDetails.usageMetadata = error2.usageMetadata;
       if (error2.promptFeedback)
         errorDetails.promptFeedback = error2.promptFeedback;
-      if (error2.status) errorDetails.httpStatus = error2.status;
-      if (error2.code) errorDetails.errorCode = error2.code;
-      if (error2.details) errorDetails.errorDetails = error2.details;
+      if (error2.status)
+        errorDetails.httpStatus = error2.status;
+      if (error2.code)
+        errorDetails.errorCode = error2.code;
+      if (error2.details)
+        errorDetails.errorDetails = error2.details;
       const fileUris = payload.messages.flatMap((m) => m.parts).filter((p) => "fileData" in p).map((p) => p.fileData.fileUri);
-      if (fileUris.length) errorDetails.fileUris = fileUris;
+      if (fileUris.length)
+        errorDetails.fileUris = fileUris;
       logger_default.error(
         id,
         `Retry #${attempt} error: ${error2.message}`,
@@ -1256,13 +1276,16 @@ function prepareOpenAICompatMessages(messages) {
           }
         };
       });
-      if (!message.content) outMessage.content = null;
+      if (!message.content)
+        outMessage.content = null;
     }
-    if (message.reasoning) outMessage.reasoning = message.reasoning;
+    if (message.reasoning)
+      outMessage.reasoning = message.reasoning;
     const reasoningDetails = filterOpenAICompatReasoningDetails(
       message.reasoningDetails
     );
-    if (reasoningDetails) outMessage.reasoning_details = reasoningDetails;
+    if (reasoningDetails)
+      outMessage.reasoning_details = reasoningDetails;
     out.push(outMessage);
   }
   return out;
@@ -1405,7 +1428,8 @@ function parseDsmlToolCalls(content) {
   let last = -1;
   let tag;
   while ((tag = DSML_ANY_TAG_RE.exec(content)) !== null) {
-    if (first === -1) first = tag.index;
+    if (first === -1)
+      first = tag.index;
     last = tag.index + tag[0].length;
   }
   const remaining = first === -1 ? content : (content.slice(0, first) + content.slice(last)).trim();
@@ -1421,7 +1445,8 @@ function finalizeOpenRouterMessage(id, raw) {
   const functionCalls = [];
   for (let i = 0; i < raw.toolCalls.length; i++) {
     const tc = raw.toolCalls[i];
-    if (!tc.name) continue;
+    if (!tc.name)
+      continue;
     functionCalls.push({
       id: (_a = tc.id) != null ? _a : `call_${i}`,
       name: tc.name,
@@ -1472,7 +1497,8 @@ async function callOpenRouterStream(id, payload, streamTimeoutMs = OPENROUTER_ST
     controller.abort();
   };
   const unref = (t) => {
-    if (typeof t === "object" && "unref" in t) t.unref();
+    if (typeof t === "object" && "unref" in t)
+      t.unref();
     return t;
   };
   const totalTimer = unref(
@@ -1538,88 +1564,98 @@ async function callOpenRouterStream(id, payload, streamTimeoutMs = OPENROUTER_ST
     const reader = response.body.getReader();
     const decoder = new TextDecoder();
     let lineBuffer = "";
-    outer: while (true) {
-      const { done, value } = await reader.read();
-      if (done) break;
-      lineBuffer += decoder.decode(value, { stream: true });
-      let newlineIdx;
-      while ((newlineIdx = lineBuffer.indexOf("\n")) !== -1) {
-        let line = lineBuffer.slice(0, newlineIdx);
-        lineBuffer = lineBuffer.slice(newlineIdx + 1);
-        if (line.endsWith("\r")) line = line.slice(0, -1);
-        if (!line) continue;
-        if (line.startsWith(":")) continue;
-        if (!line.startsWith("data:")) continue;
-        const dataStr = line.slice(5).trimStart();
-        if (dataStr === "[DONE]") {
-          sawDone = true;
-          break outer;
-        }
-        let json;
-        try {
-          json = JSON.parse(dataStr);
-        } catch (e) {
-          logger_default.error(
-            id,
-            "OpenRouter stream: unparseable data line:",
-            dataStr.slice(0, 200)
-          );
-          continue;
-        }
-        dataChunks++;
-        if (json.error) {
-          logger_default.error(id, "OpenRouter stream error event:", json.error);
-          const error2 = new Error(
-            `OpenRouter error: ${json.error.message}`
-          );
-          error2.data = json.error;
-          throw error2;
-        }
-        if (json.provider) provider = json.provider;
-        let useful = false;
-        if (json.usage) {
-          usage = json.usage;
-          useful = true;
-        }
-        const choice = (_c = json.choices) == null ? void 0 : _c[0];
-        if (choice) {
-          const delta = (_d = choice.delta) != null ? _d : {};
-          if (delta.content) {
-            paragraph += delta.content;
-            useful = true;
+    outer:
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done)
+          break;
+        lineBuffer += decoder.decode(value, { stream: true });
+        let newlineIdx;
+        while ((newlineIdx = lineBuffer.indexOf("\n")) !== -1) {
+          let line = lineBuffer.slice(0, newlineIdx);
+          lineBuffer = lineBuffer.slice(newlineIdx + 1);
+          if (line.endsWith("\r"))
+            line = line.slice(0, -1);
+          if (!line)
+            continue;
+          if (line.startsWith(":"))
+            continue;
+          if (!line.startsWith("data:"))
+            continue;
+          const dataStr = line.slice(5).trimStart();
+          if (dataStr === "[DONE]") {
+            sawDone = true;
+            break outer;
           }
-          if (delta.reasoning) {
-            reasoning += delta.reasoning;
-            useful = true;
+          let json;
+          try {
+            json = JSON.parse(dataStr);
+          } catch (e) {
+            logger_default.error(
+              id,
+              "OpenRouter stream: unparseable data line:",
+              dataStr.slice(0, 200)
+            );
+            continue;
+          }
+          dataChunks++;
+          if (json.error) {
+            logger_default.error(id, "OpenRouter stream error event:", json.error);
+            const error2 = new Error(
+              `OpenRouter error: ${json.error.message}`
+            );
+            error2.data = json.error;
+            throw error2;
           }
-          if (Array.isArray(delta.reasoning_details) && delta.reasoning_details.length) {
-            reasoningDetails.push(...delta.reasoning_details);
+          if (json.provider)
+            provider = json.provider;
+          let useful = false;
+          if (json.usage) {
+            usage = json.usage;
             useful = true;
           }
-          if (Array.isArray(delta.tool_calls)) {
-            for (const toolCall of delta.tool_calls) {
-              const idx = (_e = toolCall.index) != null ? _e : 0;
-              while (toolCalls.length <= idx) {
-                toolCalls.push({ name: "", argumentsJson: "" });
+          const choice = (_c = json.choices) == null ? void 0 : _c[0];
+          if (choice) {
+            const delta = (_d = choice.delta) != null ? _d : {};
+            if (delta.content) {
+              paragraph += delta.content;
+              useful = true;
+            }
+            if (delta.reasoning) {
+              reasoning += delta.reasoning;
+              useful = true;
+            }
+            if (Array.isArray(delta.reasoning_details) && delta.reasoning_details.length) {
+              reasoningDetails.push(...delta.reasoning_details);
+              useful = true;
+            }
+            if (Array.isArray(delta.tool_calls)) {
+              for (const toolCall of delta.tool_calls) {
+                const idx = (_e = toolCall.index) != null ? _e : 0;
+                while (toolCalls.length <= idx) {
+                  toolCalls.push({ name: "", argumentsJson: "" });
+                }
+                if (toolCall.id)
+                  toolCalls[idx].id = toolCall.id;
+                if ((_f = toolCall.function) == null ? void 0 : _f.name)
+                  toolCalls[idx].name += toolCall.function.name;
+                if ((_g = toolCall.function) == null ? void 0 : _g.arguments)
+                  toolCalls[idx].argumentsJson += toolCall.function.arguments;
+                useful = true;
               }
-              if (toolCall.id) toolCalls[idx].id = toolCall.id;
-              if ((_f = toolCall.function) == null ? void 0 : _f.name)
-                toolCalls[idx].name += toolCall.function.name;
-              if ((_g = toolCall.function) == null ? void 0 : _g.arguments)
-                toolCalls[idx].argumentsJson += toolCall.function.arguments;
+            }
+            if (choice.finish_reason) {
+              finishReason = choice.finish_reason;
               useful = true;
             }
           }
-          if (choice.finish_reason) {
-            finishReason = choice.finish_reason;
-            useful = true;
-          }
+          if (useful)
+            armStallTimer();
         }
-        if (useful) armStallTimer();
       }
-    }
-    if (sawDone) reader.cancel().catch(() => {
-    });
+    if (sawDone)
+      reader.cancel().catch(() => {
+      });
     if (!sawDone && !finishReason) {
       logger_default.error(
         id,
@@ -1658,7 +1694,9 @@ function parseOpenRouterBody(id, data) {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   if (data.error) {
     logger_default.error(id, "OpenRouter error:", data.error);
-    throw new Error(`OpenRouter error: ${data.error.message}`);
+    const error2 = new Error(`OpenRouter error: ${data.error.message}`);
+    error2.data = data.error;
+    throw error2;
   }
   const answer = (_b = (_a = data.choices) == null ? void 0 : _a[0]) == null ? void 0 : _b.message;
   if (!answer) {
@@ -1695,11 +1733,32 @@ async function callOpenRouterNonStreaming(id, payload, requestTimeoutMs = OPENRO
   );
   return parseOpenRouterBody(id, response.data);
 }
+var normalizeProviderKey = (name) => name.split("/")[0].toLowerCase().replace(/[^a-z0-9]/g, "");
+var MODERATION_RE = /moderat|inappropriate content|content polic|content management|flagged/i;
+function moderationEvictionSlug(error2, payload) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  const body = (_c = error2 == null ? void 0 : error2.data) != null ? _c : (_b = (_a = error2 == null ? void 0 : error2.response) == null ? void 0 : _a.data) == null ? void 0 : _b.error;
+  if (!body)
+    return null;
+  const message = String((_d = body.message) != null ? _d : "");
+  const isModeration = body.code === 403 || Array.isArray((_e = body.metadata) == null ? void 0 : _e.reasons) || MODERATION_RE.test(message);
+  if (!isModeration)
+    return null;
+  const display = (_h = (_f = body.metadata) == null ? void 0 : _f.provider_name) != null ? _h : (_g = /Upstream error from ([^:]+):/.exec(message)) == null ? void 0 : _g[1];
+  if (!display)
+    return null;
+  const key = normalizeProviderKey(display);
+  const fromOrder = (_j = (_i = payload.provider) == null ? void 0 : _i.order) == null ? void 0 : _j.find(
+    (entry) => normalizeProviderKey(entry) === key
+  );
+  return fromOrder ? fromOrder.split("/")[0] : display.toLowerCase();
+}
 async function callOpenRouterWithRetries(id, payload, retries = 5, options, signal) {
+  const evicted = [];
   return withRetries(
     id,
     "OpenRouter",
-    () => options.streaming ? callOpenRouterStream(
+    () => (options.streaming ? callOpenRouterStream(
       id,
       payload,
       options.streamTimeoutMs,
@@ -1710,7 +1769,25 @@ async function callOpenRouterWithRetries(id, payload, retries = 5, options, sign
       payload,
       options.requestTimeoutMs,
       signal
-    ),
+    )).catch((error2) => {
+      var _a, _b, _c, _d;
+      const slug = moderationEvictionSlug(error2, payload);
+      if (slug && !evicted.includes(slug)) {
+        evicted.push(slug);
+        payload.provider = {
+          ...payload.provider,
+          ignore: [...(_b = (_a = payload.provider) == null ? void 0 : _a.ignore) != null ? _b : [], slug],
+          order: (_d = (_c = payload.provider) == null ? void 0 : _c.order) == null ? void 0 : _d.filter(
+            (entry) => normalizeProviderKey(entry) !== normalizeProviderKey(slug)
+          )
+        };
+        logger_default.log(
+          id,
+          `OpenRouter moderation eviction: ignoring provider "${slug}" for remaining attempts`
+        );
+      }
+      throw error2;
+    }),
     { retries, signal }
   );
 }
@@ -1817,7 +1894,8 @@ async function callWithRetries(id, aiPayload, aiConfig, retries = 5, chunkTimeou
     (_e = result.provider) != null ? _e : result.provider = provider;
     return result;
   } catch (error2) {
-    if ((_f = aiPayload.signal) == null ? void 0 : _f.aborted) throw error2;
+    if ((_f = aiPayload.signal) == null ? void 0 : _f.aborted)
+      throw error2;
     if (aiPayload.fallbackModel) {
       logger_default.error(
         id,