llm-relay 0.32.2 → 0.33.0

package/dist/tool-dialects.js

@@ -0,0 +1,205 @@
+/**
+ * Recovering tool calls a HOST failed to parse.
+ *
+ * A model emits tool calls in its own dialect; the serving host is supposed to parse that into the
+ * OpenAI `message.tool_calls` field. NIM and OpenRouter do. Some free hosts do not, and hand back
+ * the raw envelope as ordinary assistant TEXT. Before this module the consequence was silent and
+ * total: no `tool_calls` ⇒ `stop_reason: end_turn` ⇒ zero `tool_use` blocks ⇒ the validator finds
+ * nothing malformed and PASSES ⇒ repair never engages ⇒ the client receives markup it treats as a
+ * final answer. Measured 2026-08-08: a task wrote its output correctly and then emitted
+ * `</｜DSML｜parameter></｜DSML｜invoke></｜DSML｜tool_calls>` as its entire visible response.
+ * See docs/tool-call-dialect-leak.md.
+ *
+ * ⚠ This is PARSING, not inference — the same side of the repair boundary as fixing args that
+ * violate a schema. The envelope set is CLOSED (same reasoning as the effort vocabulary in
+ * sync-tiers.mjs and the alias list in authEnv.ts): prose that merely mentions a tool name is not a
+ * tool call, and promoting it to one would be fabricating intent, which is the one thing the repair
+ * path must never do. A dialect we do not recognize yields `detected` at most, never a guess.
+ */
+/**
+ * Marker substrings that mean "a tool-call envelope is present". Detection is deliberately broader
+ * than parsing: a truncated envelope must still be recognized as one, because returning its
+ * fragment as an answer is what made this failure read as "the job died".
+ */
+/**
+ * ⚠ Markers deliberately omit the `<` / `</` prefix so a CLOSING tag matches too. The truncated
+ * tail of a stream is mostly closing tags — one of the two measured failure bodies was exactly
+ * `</｜DSML｜parameter></｜DSML｜invoke></｜DSML｜tool_calls>`, which an open-tag-only marker set
+ * reports as ordinary prose. That is the single case where detection matters most, because there
+ * is no call left to recover and the alternative is handing the fragment back as an answer.
+ */
+const DIALECT_MARKERS = [
+    { dialect: "deepseek", markers: ["｜tool▁calls▁begin｜", "｜tool▁call▁begin｜", "｜tool▁sep｜", "｜tool▁call▁end｜", "｜tool▁calls▁end｜"] },
+    { dialect: "dsml", markers: ["｜DSML｜tool_calls", "｜DSML｜invoke", "｜DSML｜parameter"] },
+    { dialect: "hermes", markers: ["<tool_call>", "</tool_call>"] },
+    { dialect: "xml-invoke", markers: ["<function_calls>", "</function_calls>", "<invoke name=", "</invoke>"] },
+    { dialect: "functionary", markers: ["<function="] },
+];
+export function detectDialect(text) {
+    for (const { dialect, markers } of DIALECT_MARKERS) {
+        if (markers.some((m) => text.includes(m)))
+            return dialect;
+    }
+    return null;
+}
+/** Coerce a stringly-typed dialect parameter using the tool's declared schema. */
+function coerce(raw, schema) {
+    const t = Array.isArray(schema?.type) ? schema?.type[0] : schema?.type;
+    const s = raw.trim();
+    switch (t) {
+        case "number":
+        case "integer": {
+            const n = Number(s);
+            return Number.isFinite(n) ? n : raw;
+        }
+        case "boolean":
+            return s === "true" ? true : s === "false" ? false : raw;
+        case "object":
+        case "array":
+            try {
+                return JSON.parse(s);
+            }
+            catch {
+                return raw;
+            }
+        case "string":
+            return raw;
+        default:
+            // No declared type: keep the literal. Guessing a shape here would silently rewrite an
+            // argument the model meant as text.
+            return raw;
+    }
+}
+/** `{"name": "x", "arguments": {...}}` — the JSON payload shape shared by several dialects. */
+function fromJsonPayload(raw) {
+    let j;
+    try {
+        j = JSON.parse(raw.trim());
+    }
+    catch {
+        return null;
+    }
+    if (typeof j !== "object" || j === null)
+        return null;
+    const o = j;
+    const name = typeof o.name === "string" ? o.name : null;
+    if (!name)
+        return null;
+    const args = o.arguments ?? o.parameters ?? o.input ?? {};
+    if (typeof args === "string") {
+        try {
+            return { name, input: JSON.parse(args) };
+        }
+        catch {
+            return null;
+        }
+    }
+    if (typeof args !== "object" || args === null)
+        return null;
+    return { name, input: args };
+}
+/** `<invoke name="x"><parameter name="p">v</parameter></invoke>`, with or without DSML markers. */
+function fromInvokeForm(text, schemas) {
+    const calls = [];
+    const invoke = /<(?:｜DSML｜)?invoke\s+name="([^"]+)"\s*>([\s\S]*?)<\/(?:｜DSML｜)?invoke>/g;
+    for (const m of text.matchAll(invoke)) {
+        const name = m[1];
+        const bodyText = m[2];
+        if (!name || bodyText === undefined)
+            continue;
+        const input = {};
+        const param = /<(?:｜DSML｜)?parameter\s+name="([^"]+)"\s*>([\s\S]*?)<\/(?:｜DSML｜)?parameter>/g;
+        for (const p of bodyText.matchAll(param)) {
+            const key = p[1];
+            const value = p[2];
+            if (!key || value === undefined)
+                continue;
+            input[key] = coerce(value, schemas.get(name)?.properties?.[key]);
+        }
+        calls.push({ name, input });
+    }
+    return calls;
+}
+/** DeepSeek native: `…begin｜>function<｜tool▁sep｜>NAME\n```json\n{…}\n``` `. */
+function fromDeepSeekForm(text) {
+    const calls = [];
+    const re = /<｜tool▁sep｜>([^\n<]+)\n+(?:```(?:json)?\n)?([\s\S]*?)(?:\n?```)?\s*<｜tool▁call▁end｜>/g;
+    for (const m of text.matchAll(re)) {
+        const name = m[1];
+        const payload = m[2];
+        if (!name || payload === undefined)
+            continue;
+        let input = {};
+        try {
+            const parsed = JSON.parse(payload.trim());
+            if (typeof parsed === "object" && parsed !== null)
+                input = parsed;
+        }
+        catch { /* an unparseable body leaves `detected` to the caller */
+            return [];
+        }
+        calls.push({ name: name.trim(), input });
+    }
+    return calls;
+}
+/** `<tool_call>{json}</tool_call>` (Hermes/Qwen) and `<function=NAME>{json}</function>`. */
+function fromTaggedJsonForms(text) {
+    const calls = [];
+    for (const m of text.matchAll(/<tool_call>([\s\S]*?)<\/tool_call>/g)) {
+        if (m[1] === undefined)
+            continue;
+        const c = fromJsonPayload(m[1]);
+        if (c)
+            calls.push(c);
+    }
+    for (const m of text.matchAll(/<function=([^>]+)>([\s\S]*?)<\/function>/g)) {
+        const name = m[1];
+        const payload = m[2];
+        if (!name || payload === undefined)
+            continue;
+        let input = {};
+        try {
+            const parsed = JSON.parse(payload.trim());
+            if (typeof parsed === "object" && parsed !== null)
+                input = parsed;
+        }
+        catch {
+            continue;
+        }
+        calls.push({ name: name.trim(), input });
+    }
+    return calls;
+}
+/** Everything the envelope occupied, so the surviving prose can stay a text block. */
+function stripEnvelopes(text) {
+    return text
+        .replace(/<(?:｜DSML｜)?function_calls>[\s\S]*?<\/(?:｜DSML｜)?function_calls>/g, "")
+        .replace(/<｜DSML｜tool_calls>[\s\S]*?(?:<\/｜DSML｜tool_calls>|$)/g, "")
+        .replace(/<(?:｜DSML｜)?invoke\s+name="[^"]*"\s*>[\s\S]*?<\/(?:｜DSML｜)?invoke>/g, "")
+        .replace(/<｜tool▁calls▁begin｜>[\s\S]*?(?:<｜tool▁calls▁end｜>|$)/g, "")
+        .replace(/<tool_call>[\s\S]*?<\/tool_call>/g, "")
+        .replace(/<function=[^>]+>[\s\S]*?<\/function>/g, "")
+        .replace(/<\/?think>/g, "")
+        .trim();
+}
+/**
+ * Recover tool calls from a text block a host failed to parse.
+ *
+ * `schemas` supplies declared parameter types for the dialects that carry parameters as strings;
+ * without it those values stay strings and the validator reports the type error, which is the
+ * correct visible failure rather than a silent coercion.
+ */
+export function recoverToolCalls(text, schemas = new Map()) {
+    const dialect = detectDialect(text);
+    if (!dialect)
+        return { status: "none" };
+    const calls = [
+        ...fromInvokeForm(text, schemas),
+        ...fromDeepSeekForm(text),
+        ...fromTaggedJsonForms(text),
+    ].filter((c) => c.name.length > 0);
+    if (calls.length === 0)
+        return { status: "detected", dialect };
+    return { status: "parsed", calls, text: stripEnvelopes(text), dialect };
+}
+//# sourceMappingURL=tool-dialects.js.map

package/dist/tool-dialects.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-dialects.js","sourceRoot":"","sources":["../src/tool-dialects.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAyBH;;;;GAIG;AACH;;;;;;GAMG;AACH,MAAM,eAAe,GAAmE;IACtF,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,YAAY,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,EAAE;IAClI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,kBAAkB,EAAE,cAAc,EAAE,iBAAiB,CAAC,EAAE;IACrF,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC,EAAE;IAC/D,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,eAAe,EAAE,WAAW,CAAC,EAAE;IAC3G,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,YAAY,CAAC,EAAE;CACpD,CAAC;AAEF,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,KAAK,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,eAAe,EAAE,CAAC;QACnD,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAAE,OAAO,OAAO,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,kFAAkF;AAClF,SAAS,MAAM,CAAC,GAAW,EAAE,MAA8B;IACzD,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC;IACvE,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC;QACV,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACpB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACtC,CAAC;QACD,KAAK,SAAS;YACZ,OAAO,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;QAC3D,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO;YACV,IAAI,CAAC;gBAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC;gBAAC,OAAO,GAAG,CAAC;YAAC,CAAC;QACrD,KAAK,QAAQ;YACX,OAAO,GAAG,CAAC;QACb;YACE,sFAAsF;YACtF,oCAAoC;YACpC,OAAO,GAAG,CAAC;IACf,CAAC;AACH,CAAC;AAED,+FAA+F;AAC/F,SAAS,eAAe,CAAC,GAAW;IAClC,IAAI,CAAU,CAAC;IACf,IAAI,CAAC;QAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC1D,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACrD,MAAM,CAAC,GAAG,CAA4B,CAAC;IACvC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,MAAM,IAAI,GAAG,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;IAC1D,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC;YAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAA4B,EAAE,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;IACrG,CAAC;IACD,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC3D,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAA+B,EAAE,CAAC;AAC1D,CAAC;AAED,mGAAmG;AACnG,SAAS,cAAc,CAAC,IAAY,EAAE,OAAgC;IACpE,MAAM,KAAK,GAAsB,EAAE,CAAC;IACpC,MAAM,MAAM,GAAG,yEAAyE,CAAC;IACzF,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAClB,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,CAAC,IAAI,IAAI,QAAQ,KAAK,SAAS;YAAE,SAAS;QAC9C,MAAM,KAAK,GAA4B,EAAE,CAAC;QAC1C,MAAM,KAAK,GAAG,+EAA+E,CAAC;QAC9F,KAAK,MAAM,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACjB,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACnB,IAAI,CAAC,GAAG,IAAI,KAAK,KAAK,SAAS;gBAAE,SAAS;YAC1C,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,+EAA+E;AAC/E,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,KAAK,GAAsB,EAAE,CAAC;IACpC,MAAM,EAAE,GAAG,uFAAuF,CAAC;IACnG,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAClB,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,IAAI,OAAO,KAAK,SAAS;YAAE,SAAS;QAC7C,IAAI,KAAK,GAA4B,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAY,CAAC;YACrD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;gBAAE,KAAK,GAAG,MAAiC,CAAC;QAC/F,CAAC;QAAC,MAAM,CAAC,CAAC,yDAAyD;YAAC,OAAO,EAAE,CAAC;QAAC,CAAC;QAChF,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,4FAA4F;AAC5F,SAAS,mBAAmB,CAAC,IAAY;IACvC,MAAM,KAAK,GAAsB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,qCAAqC,CAAC,EAAE,CAAC;QACrE,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS;YAAE,SAAS;QACjC,MAAM,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,2CAA2C,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAClB,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,IAAI,OAAO,KAAK,SAAS;YAAE,SAAS;QAC7C,IAAI,KAAK,GAA4B,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAY,CAAC;YACrD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;gBAAE,KAAK,GAAG,MAAiC,CAAC;QAC/F,CAAC;QAAC,MAAM,CAAC;YAAC,SAAS;QAAC,CAAC;QACrB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,sFAAsF;AACtF,SAAS,cAAc,CAAC,IAAY;IAClC,OAAO,IAAI;SACR,OAAO,CAAC,mEAAmE,EAAE,EAAE,CAAC;SAChF,OAAO,CAAC,uDAAuD,EAAE,EAAE,CAAC;SACpE,OAAO,CAAC,qEAAqE,EAAE,EAAE,CAAC;SAClF,OAAO,CAAC,uDAAuD,EAAE,EAAE,CAAC;SACpE,OAAO,CAAC,mCAAmC,EAAE,EAAE,CAAC;SAChD,OAAO,CAAC,uCAAuC,EAAE,EAAE,CAAC;SACpD,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;SAC1B,IAAI,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,IAAY,EACZ,UAAmC,IAAI,GAAG,EAAE;IAE5C,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAExC,MAAM,KAAK,GAAG;QACZ,GAAG,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC;QAChC,GAAG,gBAAgB,CAAC,IAAI,CAAC;QACzB,GAAG,mBAAmB,CAAC,IAAI,CAAC;KAC7B,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEnC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;IAC/D,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC;AAC1E,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-relay",
-  "version": "0.32.2",
+  "version": "0.33.0",
   "description": "Loopback bidirectional Anthropic/OpenAI API proxy with tool-call validation and multi-provider routing.",
   "type": "module",
   "engines": {