@hunterzhu/pulse-adapters 0.4.3 → 0.4.4

package/dist/providers/normalize.js

@@ -232,23 +232,81 @@ function parseDsmlJson(value) {
         return undefined;
     }
 }
-/** DeepSeek sometimes writes only JSON tool objects instead of tool_calls. Each object needs an explicit tool name; argument-shaped JSON and trailing prose stay text. */
+/** DeepSeek sometimes writes tool calls as JSON or markdown fences instead of tool_calls. A bare object still needs an explicit tool name. Argument-shaped JSON, a single tool object after prose, and any trailing prose stay text. */
 function recoverDeepSeekJsonToolCalls(text, toolNameAliases) {
-    const leading = takeLeadingJsonValues(text.trim());
+    const trimmed = text.trim();
+    return recoverStrictJsonToolCalls(trimmed, toolNameAliases) ?? recoverMarkdownToolFences(trimmed, toolNameAliases);
+}
+function recoverStrictJsonToolCalls(text, toolNameAliases) {
+    const leading = takeLeadingJsonValues(text);
     if (leading === undefined || leading.values.length === 0 || leading.rest.trim().length > 0)
         return undefined;
     const objects = leading.values.filter((value) => !isEmptyJsonValue(value));
     if (objects.length === 0)
         return undefined;
+    if (objects.length === 1 && Array.isArray(objects[0]) && objects[0].every((item) => argumentObject(item) !== undefined))
+        return toolCallsFrom(objects[0], toolNameAliases);
     if (objects.length === 1 && objects[0] && typeof objects[0] === 'object' && !Array.isArray(objects[0])) {
         const batch = objects[0].tool_calls ?? objects[0].toolCalls;
-        if (Array.isArray(batch)) {
-            const calls = batch.map((item) => jsonToolCall(item, toolNameAliases));
-            return calls.every((call) => call !== undefined) && calls.length > 0 ? calls : undefined;
+        if (Array.isArray(batch))
+            return toolCallsFrom(batch, toolNameAliases);
+    }
+    return toolCallsFrom(objects, toolNameAliases);
+}
+/** A message that is only `tool.name` headings followed by JSON fences is a tool batch, not a finished answer. */
+function recoverMarkdownToolFences(text, toolNameAliases) {
+    const lines = text.split(/\r?\n/);
+    const calls = [];
+    let index = 0;
+    const skipBlank = () => { while (index < lines.length && lines[index].trim() === '')
+        index++; };
+    skipBlank();
+    if (index >= lines.length)
+        return undefined;
+    while (index < lines.length) {
+        skipBlank();
+        if (index >= lines.length)
+            break;
+        const providerToolName = lines[index].trim();
+        if (!/^[A-Za-z][\w-]*(?:\.[\w-]+)+$/.test(providerToolName))
+            return undefined;
+        index++;
+        if (lines[index]?.trim() !== '```json' && lines[index]?.trim() !== '```')
+            return undefined;
+        index++;
+        const body = [];
+        while (index < lines.length && lines[index].trim() !== '```')
+            body.push(lines[index++]);
+        if (index >= lines.length)
+            return undefined;
+        index++;
+        let parsed;
+        try {
+            parsed = JSON.parse(body.join('\n'));
         }
+        catch {
+            return undefined;
+        }
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+            return undefined;
+        const input = parsed;
+        calls.push({ providerToolName, name: toolNameAliases?.get(providerToolName) ?? providerToolName, input, providerToolArguments: JSON.stringify(input) });
     }
-    const calls = objects.map((value) => jsonToolCall(value, toolNameAliases));
-    return calls.every((call) => call !== undefined) ? calls : undefined;
+    return calls.length > 0 ? calls : undefined;
+}
+function toolCallsFrom(values, toolNameAliases) {
+    const calls = values.map((value) => jsonToolCall(value, toolNameAliases));
+    return calls.every((call) => call !== undefined) && calls.length > 0 ? calls : undefined;
+}
+function argumentObject(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return undefined;
+    const record = value;
+    const named = typeof record.tool === 'string' && record.tool.length > 0 ? record.tool : typeof record.name === 'string' && record.name.length > 0 ? record.name : undefined;
+    const raw = record.arguments ?? record.input ?? record.parameters ?? record.args;
+    if (named === undefined || !raw || typeof raw !== 'object' || Array.isArray(raw))
+        return undefined;
+    return raw;
 }
 function isEmptyJsonValue(value) {
     if (Array.isArray(value))
@@ -263,7 +321,7 @@ function jsonToolCall(value, toolNameAliases) {
     const providerToolName = named;
     if (providerToolName === undefined)
         return undefined;
-    const raw = record.arguments ?? record.input ?? record.parameters;
+    const raw = record.arguments ?? record.input ?? record.parameters ?? record.args;
     const input = raw && typeof raw === 'object' && !Array.isArray(raw) ? { ...raw } : { ...record };
     if (raw === undefined) {
         delete input.tool;

package/dist/providers/runtime-executor.js

@@ -47,6 +47,53 @@ class SlotPool {
         this.slots.set(key, slot);
     } ; return slot; }
 }
+function jsonCandidates(text) {
+    const found = [];
+    const push = (value) => {
+        try {
+            const parsed = JSON.parse(value);
+            found.push(parsed);
+            if (typeof parsed === 'string' && parsed !== value)
+                push(parsed);
+        }
+        catch { /* keep scanning */ }
+    };
+    const trimmed = text.trim();
+    if (trimmed)
+        push(trimmed);
+    for (let start = 0; start < text.length; start++) {
+        if (text[start] !== '{')
+            continue;
+        let depth = 0;
+        let inString = false;
+        let escaped = false;
+        for (let end = start; end < text.length; end++) {
+            const char = text[end];
+            if (inString) {
+                if (escaped)
+                    escaped = false;
+                else if (char === '\\')
+                    escaped = true;
+                else if (char === '"')
+                    inString = false;
+                continue;
+            }
+            if (char === '"')
+                inString = true;
+            else if (char === '{')
+                depth++;
+            else if (char === '}') {
+                depth--;
+                if (depth === 0) {
+                    push(text.slice(start, end + 1));
+                    start = end;
+                    break;
+                }
+            }
+        }
+    }
+    return found;
+}
 function toJson(value, seen = new Set()) {
     if (value === null || typeof value === 'string' || typeof value === 'boolean')
         return value;
@@ -172,13 +219,15 @@ export function createModelEffectExecutor(config) {
                     throw new OutputValidationError('adapter', 'MODEL_REFUSAL', output.refusal ?? 'Provider refused the request.');
                 }
                 if (input.outputSchema !== undefined) {
-                    const candidateValue = output.structured ?? output.text;
-                    if (!validateJsonSchema(candidateValue, input.outputSchema)) {
-                        lastSchemaViolation = toJson(candidateValue);
+                    const candidates = output.structured === undefined ? jsonCandidates(output.text) : [output.structured, ...jsonCandidates(output.text)];
+                    const matched = candidates.find((candidate) => validateJsonSchema(candidate, input.outputSchema));
+                    if (matched === undefined) {
+                        lastSchemaViolation = toJson(candidates[0] ?? output.text);
                         failedForSchema = true;
                         recordFeedback('schema_rejected', 0);
                         throw new OutputValidationError('structured', 'OUTPUT_SCHEMA_VIOLATION', 'Provider output did not match the declared schema');
                     }
+                    output.structured = matched;
                 }
                 failedForSchema = false;
                 recordFeedback('succeeded', 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hunterzhu/pulse-adapters",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "license": "PolyForm-Noncommercial-1.0.0",
   "repository": {
     "type": "git",
@@ -18,8 +18,8 @@
   },
   "dependencies": {
     "@anthropic-ai/sandbox-runtime": "0.0.77",
-    "@hunterzhu/pulse-runtime": "0.4.3",
-    "@hunterzhu/pulse-tool-sdk": "0.4.3",
+    "@hunterzhu/pulse-runtime": "0.4.4",
+    "@hunterzhu/pulse-tool-sdk": "0.4.4",
     "exceljs": "4.4.0",
     "pdfjs-dist": "4.10.38"
   }