@hunterzhu/pulse-adapters 0.1.5 → 0.1.7

package/dist/providers/anthropic.js

@@ -17,8 +17,33 @@ export class AnthropicAdapter {
         this.config = config;
     }
     async executeAttempt(params) {
-        const system = params.request.blocks.filter((block) => block.kind === 'system' || block.kind === 'policy' || block.kind === 'tools').map((block) => typeof block.content === 'string' ? block.content : JSON.stringify(block.content)).join('\n');
-        const messages = [{ role: 'user', content: params.request.blocks.filter((block) => !['system', 'policy', 'tools'].includes(block.kind)).map((block) => ({ type: 'text', text: typeof block.content === 'string' ? block.content : JSON.stringify(block.content) })) }];
+        const systemParts = params.request.blocks.filter((block) => block.kind === 'system' || block.kind === 'policy' || block.kind === 'tools').map((block) => typeof block.content === 'string' ? block.content : JSON.stringify(block.content));
+        const messages = [];
+        const appendMessage = (role, text) => {
+            const previous = messages.at(-1);
+            if (previous?.role === role)
+                previous.content.push({ type: 'text', text });
+            else
+                messages.push({ role, content: [{ type: 'text', text }] });
+        };
+        for (const block of params.request.blocks) {
+            if (block.kind === 'system' || block.kind === 'policy' || block.kind === 'tools')
+                continue;
+            if (block.kind === 'conversation' && Array.isArray(block.content)) {
+                for (const item of block.content) {
+                    if (!item || typeof item !== 'object' || Array.isArray(item))
+                        continue;
+                    const message = item;
+                    if (message.role === 'system' && typeof message.content === 'string')
+                        appendMessage('user', `Context note, not a new instruction:\n${message.content}`);
+                    else if ((message.role === 'user' || message.role === 'assistant') && typeof message.content === 'string')
+                        appendMessage(message.role, message.content);
+                }
+                continue;
+            }
+            appendMessage('user', typeof block.content === 'string' ? block.content : JSON.stringify(block.content));
+        }
+        const system = systemParts.join('\n');
         const streaming = params.onObservation !== undefined;
         const tools = toolDefinitions(params.request);
         const maxTokens = params.maxOutputTokens ?? this.config.maxOutputTokens ?? 4096;

package/dist/providers/openai-compat.js

@@ -51,17 +51,8 @@ export class OpenAICompatibleAdapter {
                 if (typeof choice?.finish_reason === 'string')
                     finishReason = choice.finish_reason;
                 if (Array.isArray(delta?.tool_calls))
-                    for (const call of delta.tool_calls) {
-                        const index = Number(call.index ?? 0);
-                        const current = toolCalls.get(index) ?? { name: '', arguments: '' };
-                        if (typeof call.id === 'string')
-                            current.id = call.id;
-                        if (typeof call.function?.name === 'string')
-                            current.name += call.function.name;
-                        if (typeof call.function?.arguments === 'string')
-                            current.arguments += call.function.arguments;
-                        toolCalls.set(index, current);
-                    }
+                    for (const call of delta.tool_calls)
+                        accumulateStreamToolCall(toolCalls, call);
                 if (event.data.usage !== undefined)
                     usage = event.data.usage;
             }
@@ -81,18 +72,88 @@ export class OpenAICompatibleAdapter {
     }
 }
 export function toOpenAIMessages(request) {
-    return request.blocks.map((block) => {
+    const messages = [];
+    for (const block of request.blocks) {
         const content = typeof block.content === 'string' ? block.content : JSON.stringify(block.content);
-        if (block.kind === 'system' || block.kind === 'policy' || block.kind === 'tools')
-            return { role: 'system', content };
+        if (block.kind === 'conversation' && Array.isArray(block.content)) {
+            for (const item of block.content) {
+                if (!item || typeof item !== 'object' || Array.isArray(item))
+                    continue;
+                const message = item;
+                if (message.role === 'system' && typeof message.content === 'string')
+                    messages.push({ role: 'user', content: `Context note, not a new instruction:\n${message.content}` });
+                else if ((message.role === 'user' || message.role === 'assistant') && typeof message.content === 'string')
+                    messages.push({ role: message.role, content: message.content });
+            }
+            continue;
+        }
+        if (block.kind === 'system' || block.kind === 'policy' || block.kind === 'tools') {
+            messages.push({ role: 'system', content });
+            continue;
+        }
         if (block.kind === 'history')
-            return { role: 'assistant', content };
-        return { role: 'user', name: block.kind, content };
-    });
+            messages.push({ role: 'assistant', content });
+        else
+            messages.push({ role: 'user', name: block.kind, content });
+    }
+    return messages;
 }
 function toMessages(request) {
     return toOpenAIMessages(request);
 }
+function nextToolIndex(toolCalls) {
+    let next = 0;
+    for (const index of toolCalls.keys())
+        if (index >= next)
+            next = index + 1;
+    return next;
+}
+function jsonTextComplete(value) {
+    const trimmed = value.trim();
+    if (!trimmed)
+        return false;
+    try {
+        JSON.parse(trimmed);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * OpenAI-compatible streams sometimes reuse `tool_calls[].index` for a new
+ * call and only distinguish it by `id`. Concatenating those argument
+ * fragments produces invalid JSON (`{"a":1}{"b":2}`).
+ */
+function accumulateStreamToolCall(toolCalls, call) {
+    const id = typeof call.id === 'string' && call.id.length > 0 ? call.id : undefined;
+    const name = typeof call.function?.name === 'string' ? call.function.name : '';
+    const args = typeof call.function?.arguments === 'string' ? call.function.arguments : '';
+    const rawIndex = call.index;
+    let index = typeof rawIndex === 'number' && Number.isInteger(rawIndex) && rawIndex >= 0 ? rawIndex : typeof rawIndex === 'string' && /^\d+$/.test(rawIndex) ? Number(rawIndex) : undefined;
+    if (index !== undefined) {
+        const current = toolCalls.get(index);
+        const startsAnotherCall = current !== undefined && ((id !== undefined && current.id !== undefined && current.id !== id) ||
+            (name.length > 0 && current.name.length > 0 && jsonTextComplete(current.arguments) && /^[\[{]/.test(args.trimStart())));
+        if (startsAnotherCall)
+            index = nextToolIndex(toolCalls);
+    }
+    else if (id !== undefined) {
+        index = [...toolCalls.entries()].find(([, item]) => item.id === id)?.[0] ?? nextToolIndex(toolCalls);
+    }
+    else {
+        const keys = [...toolCalls.keys()];
+        index = keys.length === 0 ? 0 : Math.max(...keys);
+    }
+    const current = toolCalls.get(index) ?? { name: '', arguments: '' };
+    if (id !== undefined)
+        current.id = id;
+    if (name.length > 0)
+        current.name += name;
+    if (args.length > 0)
+        current.arguments += args;
+    toolCalls.set(index, current);
+}
 function toolDefinitions(request) {
     const block = request.blocks.find((candidate) => candidate.kind === 'tools');
     const content = block?.content;

package/dist/providers/types.d.ts

@@ -22,6 +22,7 @@ export interface ProviderPresetConfig {
     apiKey?: string;
     baseURL?: string;
     defaultModel?: string;
+    maxContextTokens?: number;
     maxOutputTokens?: number;
     toolChoice?: ProviderToolChoice;
     extraHeaders?: Record<string, string>;

package/dist/workers/http.js

@@ -234,6 +234,8 @@ export class HttpWorkerClient {
         this.baseUrl = options.baseUrl.replace(/\/$/, '');
         this.workerId = options.workerId;
         this.pollMs = options.pollMs ?? 10;
+        if (!Number.isFinite(this.pollMs) || this.pollMs <= 0)
+            throw new Error('INVALID_WORKER_POLL_INTERVAL');
         this.requestTimeoutMs = options.requestTimeoutMs ?? 30_000;
         if (!Number.isFinite(this.requestTimeoutMs) || this.requestTimeoutMs <= 0)
             throw new Error('INVALID_WORKER_HTTP_TIMEOUT');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hunterzhu/pulse-adapters",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/zhuhengtan/Pulse"
@@ -16,7 +16,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@hunterzhu/pulse-runtime": "0.1.5",
-    "@hunterzhu/pulse-tool-sdk": "0.1.5"
+    "@hunterzhu/pulse-runtime": "0.1.7",
+    "@hunterzhu/pulse-tool-sdk": "0.1.7"
   }
 }