190proof 1.0.100 → 1.0.102

package/README.md

@@ -273,6 +273,11 @@ Main function to make requests to any supported AI provider.
 - `retries`: `number` - Number of retry attempts (default: 5)
 - `chunkTimeoutMs`: `number` - Timeout for streaming chunks in ms (default: 15000)
 
+Two optional per-request knobs live on `payload` (`GenericPayload`):
+
+- `payload.requestTimeoutMs`: `number` - Per-attempt HTTP timeout in ms (default: 120000), honored by every adapter.
+- `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
 
 `Promise<ParsedResponseMessage>`:

package/dist/index.d.mts

@@ -265,6 +265,14 @@ interface GenericPayload {
      * valid response isn't cut short.
      */
     requestTimeoutMs?: number;
+    /**
+     * Optional caller-supplied cancellation signal. When it aborts, the in-flight
+     * provider request is cancelled and `callWithRetries` rejects immediately —
+     * it does NOT retry or fall back (both retry loop and fallback branch bail on
+     * `signal.aborted`). Threaded through every adapter to the underlying
+     * fetch/axios/SDK call, mirroring `requestTimeoutMs`.
+     */
+    signal?: AbortSignal;
 }
 
 declare function parseModelString(model: string): {

package/dist/index.d.ts

@@ -265,6 +265,14 @@ interface GenericPayload {
      * valid response isn't cut short.
      */
     requestTimeoutMs?: number;
+    /**
+     * Optional caller-supplied cancellation signal. When it aborts, the in-flight
+     * provider request is cancelled and `callWithRetries` rejects immediately —
+     * it does NOT retry or fall back (both retry loop and fallback branch bail on
+     * `signal.aborted`). Threaded through every adapter to the underlying
+     * fetch/axios/SDK call, mirroring `requestTimeoutMs`.
+     */
+    signal?: AbortSignal;
 }
 
 declare function parseModelString(model: string): {

package/dist/index.js

@@ -141,8 +141,13 @@ function isHeicImage(name, mime) {
 // index.ts
 var sharp = require("sharp");
 var decode = require("heic-decode");
+function anySignal(signals) {
+  return AbortSignal.any(
+    signals
+  );
+}
 async function withRetries(identifier, apiName, fn, options = {}) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   const { retries = 5, baseDelayMs = 125, onError } = options;
   logger_default.log(identifier, `Calling ${apiName} API with retries`);
   let lastError;
@@ -151,19 +156,21 @@ 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 (onError) {
         onError(error3, attempt);
       } else {
         logger_default.error(
           identifier,
           `Retry #${attempt} error: ${error3.message}`,
-          ((_a = error3.response) == null ? void 0 : _a.data) || error3
+          ((_b = error3.response) == null ? void 0 : _b.data) || error3
         );
       }
       await timeout(baseDelayMs * attempt);
     }
   }
-  const detail = ((_d = (_c = (_b = lastError == null ? void 0 : lastError.response) == null ? void 0 : _b.data) == null ? void 0 : _c.error) == null ? void 0 : _d.message) || (lastError == null ? void 0 : lastError.message) || String(lastError);
+  const detail = ((_e = (_d = (_c = lastError == null ? void 0 : lastError.response) == null ? void 0 : _c.data) == null ? void 0 : _d.error) == null ? void 0 : _e.message) || (lastError == null ? void 0 : lastError.message) || String(lastError);
   const error2 = new Error(
     `Failed to call ${apiName} API after ${retries} attempts: ${detail}`
   );
@@ -386,7 +393,7 @@ async function prepareOpenAIPayload(identifier, payload) {
   }
   return preparedPayload;
 }
-async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs, requestTimeoutMs = 12e4) {
+async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs, requestTimeoutMs = 12e4, signal) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const functionNames = openAiPayload.tools ? new Set(openAiPayload.tools.map((fn) => fn.function.name)) : null;
   const { endpoint, headers } = buildOpenAIRequestConfig(
@@ -406,7 +413,10 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs,
     method: "POST",
     headers,
     body: JSON.stringify({ ...openAiPayload, stream: true }),
-    signal: controller.signal
+    // Merge (don't overwrite) the internal timeout controller with the caller's
+    // cancellation signal so both an internal timeout and an external abort stop
+    // the stream.
+    signal: signal ? anySignal([controller.signal, signal]) : controller.signal
   });
   if (!response.body) {
     throw new Error("Stream error: no response body");
@@ -496,7 +506,7 @@ async function callOpenAIStream(id, openAiPayload, openAiConfig, chunkTimeoutMs,
     }
   }
 }
-async function callOpenAI(id, openAiPayload, openAiConfig, requestTimeoutMs = 12e4) {
+async function callOpenAI(id, openAiPayload, openAiConfig, requestTimeoutMs = 12e4, signal) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const { endpoint, headers } = buildOpenAIRequestConfig(
     id,
@@ -511,7 +521,8 @@ async function callOpenAI(id, openAiPayload, openAiConfig, requestTimeoutMs = 12
       method: "POST",
       headers,
       body: JSON.stringify({ ...openAiPayload, stream: false }),
-      signal: controller.signal
+      // Merge the internal timeout controller with the caller's cancellation signal.
+      signal: signal ? anySignal([controller.signal, signal]) : controller.signal
     });
     if (!response.ok) {
       const errorData = await response.json();
@@ -574,7 +585,7 @@ async function callOpenAI(id, openAiPayload, openAiConfig, requestTimeoutMs = 12
     } : null
   };
 }
-async function callOpenAiWithRetries(id, openAiPayload, openAiConfig, retries = 5, chunkTimeoutMs = 15e3, requestTimeoutMs = 12e4) {
+async function callOpenAiWithRetries(id, openAiPayload, openAiConfig, retries = 5, chunkTimeoutMs = 15e3, requestTimeoutMs = 12e4, signal) {
   logger_default.log(
     id,
     "Calling OpenAI API with retries:",
@@ -593,14 +604,16 @@ async function callOpenAiWithRetries(id, openAiPayload, openAiConfig, retries =
           openAiPayload,
           openAiConfig,
           chunkTimeoutMs,
-          requestTimeoutMs
+          requestTimeoutMs,
+          signal
         );
       } else {
-        return callOpenAI(id, openAiPayload, openAiConfig, requestTimeoutMs);
+        return callOpenAI(id, openAiPayload, openAiConfig, requestTimeoutMs, signal);
       }
     },
     {
       retries,
+      signal,
       baseDelayMs: 250,
       onError: (error2, attempt) => {
         var _a, _b;
@@ -732,7 +745,7 @@ async function prepareAnthropicPayload(_identifier, payload) {
   }
   return preparedPayload;
 }
-async function callAnthropic(id, payload, config, requestTimeoutMs = 12e4) {
+async function callAnthropic(id, payload, config, requestTimeoutMs = 12e4, signal) {
   var _a, _b, _c;
   const anthropicMessages = jigAnthropicMessages(payload.messages);
   const tools = (_a = payload.functions) == null ? void 0 : _a.map((f) => ({
@@ -756,7 +769,8 @@ async function callAnthropic(id, payload, config, requestTimeoutMs = 12e4) {
         contentType: "application/json",
         body: JSON.stringify(bedrockPayload),
         modelId: MODEL_ID
-      })
+      }),
+      { abortSignal: signal }
     );
     const decodedResponseBody = new TextDecoder().decode(response.body);
     data = JSON.parse(decodedResponseBody);
@@ -782,7 +796,8 @@ async function callAnthropic(id, payload, config, requestTimeoutMs = 12e4) {
           "anthropic-version": "2023-06-01",
           "anthropic-beta": "tools-2024-04-04"
         },
-        timeout: requestTimeoutMs
+        timeout: requestTimeoutMs,
+        signal
       }
     );
     data = response.data;
@@ -852,13 +867,14 @@ ${text}` : text;
     usage
   };
 }
-async function callAnthropicWithRetries(id, payload, config, retries = 5, requestTimeoutMs = 12e4) {
+async function callAnthropicWithRetries(id, payload, config, retries = 5, requestTimeoutMs = 12e4, signal) {
   return withRetries(
     id,
     "Anthropic",
-    () => callAnthropic(id, payload, config, requestTimeoutMs),
+    () => callAnthropic(id, payload, config, requestTimeoutMs, signal),
     {
-      retries
+      retries,
+      signal
     }
   );
 }
@@ -976,7 +992,7 @@ async function prepareGoogleAIPayload(_identifier, payload) {
   }
   return preparedPayload;
 }
-async function callGoogleAI(id, payload, requestTimeoutMs = 12e4) {
+async function callGoogleAI(id, payload, requestTimeoutMs = 12e4, signal) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
   const contents = jigGoogleMessages(payload.messages);
   const requestBody = {
@@ -1000,7 +1016,8 @@ async function callGoogleAI(id, payload, requestTimeoutMs = 12e4) {
           "content-type": "application/json",
           "x-goog-api-key": process.env.GEMINI_API_KEY
         },
-        timeout: requestTimeoutMs
+        timeout: requestTimeoutMs,
+        signal
       }
     );
     response = httpResponse.data;
@@ -1099,10 +1116,11 @@ function removeImagesFromGooglePayload(payload) {
   }
   return removedImages;
 }
-async function callGoogleAIWithRetries(id, payload, retries = 5, requestTimeoutMs = 12e4) {
+async function callGoogleAIWithRetries(id, payload, retries = 5, requestTimeoutMs = 12e4, signal) {
   let hasTriedWithoutImages = false;
-  return withRetries(id, "Google AI", () => callGoogleAI(id, payload, requestTimeoutMs), {
+  return withRetries(id, "Google AI", () => callGoogleAI(id, payload, requestTimeoutMs, signal), {
     retries,
+    signal,
     onError: (error2, attempt) => {
       var _a, _b;
       const errorDetails = {
@@ -1228,7 +1246,7 @@ function prepareGroqPayload(payload) {
     temperature: payload.temperature
   };
 }
-async function callGroq(id, payload, requestTimeoutMs = 12e4) {
+async function callGroq(id, payload, requestTimeoutMs = 12e4, signal) {
   var _a, _b, _c, _d, _e, _f, _g;
   const response = await import_axios.default.post(
     "https://api.groq.com/openai/v1/chat/completions",
@@ -1238,7 +1256,8 @@ async function callGroq(id, payload, requestTimeoutMs = 12e4) {
         "content-type": "application/json",
         Authorization: `Bearer ${process.env.GROQ_API_KEY}`
       },
-      timeout: requestTimeoutMs
+      timeout: requestTimeoutMs,
+      signal
     }
   );
   if (response.data.error) {
@@ -1286,9 +1305,10 @@ async function callGroq(id, payload, requestTimeoutMs = 12e4) {
     } : null
   };
 }
-async function callGroqWithRetries(id, payload, retries = 5, requestTimeoutMs = 12e4) {
-  return withRetries(id, "Groq", () => callGroq(id, payload, requestTimeoutMs), {
-    retries
+async function callGroqWithRetries(id, payload, retries = 5, requestTimeoutMs = 12e4, signal) {
+  return withRetries(id, "Groq", () => callGroq(id, payload, requestTimeoutMs, signal), {
+    retries,
+    signal
   });
 }
 function prepareOpenRouterPayload(payload) {
@@ -1305,8 +1325,56 @@ function prepareOpenRouterPayload(payload) {
     provider: payload.provider
   };
 }
-async function callOpenRouter(id, payload, requestTimeoutMs = 12e4) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+var DSML_ENVELOPE_RE = /<｜+DSML｜+tool_calls>/;
+var DSML_DELIMITER_RE = /<\/?｜+DSML｜+/;
+var DSML_INVOKE_RE = /<｜+DSML｜+invoke\s+name="([^"]+)"\s*>([\s\S]*?)<\/｜+DSML｜+invoke>/g;
+var DSML_PARAM_RE = /<｜+DSML｜+parameter\s+name="([^"]+)"(?:\s+string="(true|false)")?\s*>([\s\S]*?)<\/｜+DSML｜+parameter>/g;
+var DSML_ANY_TAG_RE = /<\/?｜+DSML｜+[^>]*>/g;
+function parseDsmlToolCalls(content) {
+  const calls = [];
+  DSML_INVOKE_RE.lastIndex = 0;
+  let invokeMatch;
+  while ((invokeMatch = DSML_INVOKE_RE.exec(content)) !== null) {
+    const name = invokeMatch[1];
+    const inner = invokeMatch[2];
+    const args = {};
+    let ok = true;
+    DSML_PARAM_RE.lastIndex = 0;
+    let paramMatch;
+    while ((paramMatch = DSML_PARAM_RE.exec(inner)) !== null) {
+      const [, paramName, stringAttr, rawValue] = paramMatch;
+      if (stringAttr === "false") {
+        try {
+          args[paramName] = JSON.parse(rawValue);
+        } catch (e) {
+          ok = false;
+          break;
+        }
+      } else {
+        args[paramName] = rawValue;
+      }
+    }
+    if (ok && name) {
+      calls.push({ id: `call_${calls.length}`, name, arguments: args });
+    }
+  }
+  if (!calls.length) {
+    return { calls, remainingContent: content };
+  }
+  DSML_ANY_TAG_RE.lastIndex = 0;
+  let first = -1;
+  let last = -1;
+  let tag;
+  while ((tag = DSML_ANY_TAG_RE.exec(content)) !== null) {
+    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();
+  return { calls, remainingContent: remaining.length ? remaining : null };
+}
+async function callOpenRouter(id, payload, requestTimeoutMs = 12e4, signal) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const response = await import_axios.default.post(
     "https://openrouter.ai/api/v1/chat/completions",
     payload,
@@ -1315,7 +1383,8 @@ async function callOpenRouter(id, payload, requestTimeoutMs = 12e4) {
         "content-type": "application/json",
         Authorization: `Bearer ${process.env.OPENROUTER_API_KEY}`
       },
-      timeout: requestTimeoutMs
+      timeout: requestTimeoutMs,
+      signal
     }
   );
   if (response.data.error) {
@@ -1338,38 +1407,47 @@ async function callOpenRouter(id, payload, requestTimeoutMs = 12e4) {
       });
     }
   }
-  if (!answer.content && !functionCalls.length) {
+  let content = (_e = answer.content) != null ? _e : null;
+  if (!functionCalls.length && content && DSML_ENVELOPE_RE.test(content)) {
+    const { calls, remainingContent } = parseDsmlToolCalls(content);
+    if (calls.length) {
+      functionCalls.push(...calls);
+      content = remainingContent;
+    }
+  }
+  const hasUnparsedDsml = !!content && DSML_DELIMITER_RE.test(content);
+  if (!functionCalls.length && (!content || hasUnparsedDsml)) {
     logger_default.error(
       id,
-      "OpenRouter: received message without content or function_call:",
+      "OpenRouter: empty or unparseable completion:",
       JSON.stringify(response.data)
     );
     throw new Error(
-      "OpenRouter: received message without content or function_call"
+      "OpenRouter: received message without usable content or function_call"
     );
   }
   return {
     role: "assistant",
-    content: answer.content || null,
+    content: content || null,
     function_call: functionCalls[0] || null,
     function_calls: functionCalls,
     files: [],
-    reasoning: (_e = answer.reasoning) != null ? _e : void 0,
-    reasoningDetails: (_f = answer.reasoning_details) != null ? _f : void 0,
+    reasoning: (_f = answer.reasoning) != null ? _f : void 0,
+    reasoningDetails: (_g = answer.reasoning_details) != null ? _g : void 0,
     usage: response.data.usage ? {
       prompt_tokens: response.data.usage.prompt_tokens,
       completion_tokens: response.data.usage.completion_tokens,
       total_tokens: response.data.usage.total_tokens,
-      cached_tokens: (_h = (_g = response.data.usage.prompt_tokens_details) == null ? void 0 : _g.cached_tokens) != null ? _h : 0
+      cached_tokens: (_i = (_h = response.data.usage.prompt_tokens_details) == null ? void 0 : _h.cached_tokens) != null ? _i : 0
     } : null
   };
 }
-async function callOpenRouterWithRetries(id, payload, retries = 5, requestTimeoutMs = 12e4) {
+async function callOpenRouterWithRetries(id, payload, retries = 5, requestTimeoutMs = 12e4, signal) {
   return withRetries(
     id,
     "OpenRouter",
-    () => callOpenRouter(id, payload, requestTimeoutMs),
-    { retries }
+    () => callOpenRouter(id, payload, requestTimeoutMs, signal),
+    { retries, signal }
   );
 }
 var VALID_PROVIDERS = ["openai", "anthropic", "google", "groq", "openrouter"];
@@ -1410,11 +1488,12 @@ function parseModelString(model) {
   );
 }
 async function callWithRetries(id, aiPayload, aiConfig, retries = 5, chunkTimeoutMs = 15e3) {
-  var _a;
+  var _a, _b;
   try {
     const { provider, modelId } = parseModelString(aiPayload.model);
     const routingPayload = { ...aiPayload, model: modelId };
     const requestTimeoutMs = (_a = aiPayload.requestTimeoutMs) != null ? _a : 12e4;
+    const signal = aiPayload.signal;
     switch (provider) {
       case "anthropic":
         return await callAnthropicWithRetries(
@@ -1422,7 +1501,8 @@ async function callWithRetries(id, aiPayload, aiConfig, retries = 5, chunkTimeou
           await prepareAnthropicPayload(id, routingPayload),
           aiConfig,
           retries,
-          requestTimeoutMs
+          requestTimeoutMs,
+          signal
         );
       case "openai":
         return await callOpenAiWithRetries(
@@ -1431,31 +1511,37 @@ async function callWithRetries(id, aiPayload, aiConfig, retries = 5, chunkTimeou
           aiConfig,
           retries,
           chunkTimeoutMs,
-          requestTimeoutMs
+          requestTimeoutMs,
+          signal
         );
       case "groq":
         return await callGroqWithRetries(
           id,
           prepareGroqPayload(routingPayload),
           retries,
-          requestTimeoutMs
+          requestTimeoutMs,
+          signal
         );
       case "google":
         return await callGoogleAIWithRetries(
           id,
           await prepareGoogleAIPayload(id, routingPayload),
           retries,
-          requestTimeoutMs
+          requestTimeoutMs,
+          signal
         );
       case "openrouter":
         return await callOpenRouterWithRetries(
           id,
           prepareOpenRouterPayload(routingPayload),
           retries,
-          requestTimeoutMs
+          requestTimeoutMs,
+          signal
         );
     }
   } catch (error2) {
+    if ((_b = aiPayload.signal) == null ? void 0 : _b.aborted)
+      throw error2;
     if (aiPayload.fallbackModel) {
       logger_default.error(
         id,