smoltalk 0.8.0 → 0.8.1

package/dist/clients/anthropic.d.ts

@@ -2,6 +2,7 @@ import type { MessageParam, Tool } from "@anthropic-ai/sdk/resources/messages.js
 import { PromptResult, Result, SmolClient, SmolConfig, StreamChunk, HostedToolResult } from "../types.js";
 import { BaseClient } from "./baseClient.js";
 import { ModelName } from "../models.js";
+export declare function mergeConsecutiveMessages(messages: MessageParam[]): MessageParam[];
 export declare function anthropicWebSearchEntries(hostedTools?: string[]): any[];
 export declare function parseAnthropicHostedTools(response: any, provider: string): HostedToolResult[];
 type EphemeralCacheControl = {

package/dist/clients/anthropic.js

@@ -12,6 +12,40 @@ import { BaseClient } from "./baseClient.js";
 import { getModel, isTextModel } from "../models.js";
 import { Model } from "../model.js";
 const DEFAULT_MAX_TOKENS = 4096;
+// Normalize an Anthropic message's content to a block array for merging.
+// Array content is passed through; a non-empty string becomes a single text
+// block; an empty string (or any other unexpected value) becomes no blocks
+// (Anthropic rejects empty text blocks). Guarding non-array values keeps the
+// exported merge helper from throwing on a spread if a caller passes content
+// that isn't the string | block[] the type promises.
+function anthropicContentToBlocks(content) {
+    if (Array.isArray(content)) {
+        return content;
+    }
+    if (typeof content === "string" && content.length > 0) {
+        return [{ type: "text", text: content }];
+    }
+    return [];
+}
+// Anthropic requires strict user/assistant turn alternation. Collapse any run of
+// consecutive messages that share a role into a single message by concatenating
+// their content blocks. Does not mutate the input.
+export function mergeConsecutiveMessages(messages) {
+    const merged = [];
+    for (const msg of messages) {
+        const last = merged[merged.length - 1];
+        if (last && last.role === msg.role) {
+            const content = [
+                ...anthropicContentToBlocks(last.content),
+                ...anthropicContentToBlocks(msg.content),
+            ];
+            merged[merged.length - 1] = { ...last, content };
+            continue;
+        }
+        merged.push(msg);
+    }
+    return merged;
+}
 export function anthropicWebSearchEntries(hostedTools) {
     if (hostedTools && hostedTools.includes(WEB_SEARCH)) {
         return [{ type: "web_search_20250305", name: "web_search" }];
@@ -187,30 +221,21 @@ export class SmolAnthropic extends BaseClient {
             .filter((m) => m instanceof SystemMessage || m instanceof DeveloperMessage)
             .map((m) => m.content);
         const system = systemParts.length > 0 ? systemParts.join("\n") : undefined;
-        // Convert remaining messages, merging consecutive tool_result user messages
-        const anthropicMessages = [];
+        // Convert remaining messages into Anthropic message params.
+        const converted = [];
         for (const msg of config.messages) {
             if (msg instanceof SystemMessage || msg instanceof DeveloperMessage) {
                 continue;
             }
-            const converted = msg.toAnthropicMessage();
-            if (converted === null)
+            const c = msg.toAnthropicMessage();
+            if (c === null)
                 continue;
-            // Merge consecutive tool_result user messages into one (required by Anthropic)
-            if (converted.role === "user" &&
-                Array.isArray(converted.content) &&
-                converted.content.every((c) => c.type === "tool_result")) {
-                const last = anthropicMessages[anthropicMessages.length - 1];
-                if (last &&
-                    last.role === "user" &&
-                    Array.isArray(last.content) &&
-                    last.content.every((c) => c.type === "tool_result")) {
-                    last.content.push(...converted.content);
-                    continue;
-                }
-            }
-            anthropicMessages.push(converted);
+            converted.push(c);
         }
+        // Anthropic requires strict user/assistant alternation — merge any run of
+        // consecutive same-role messages into one (e.g. two user turns, or a user
+        // turn followed by tool results, which also map to role "user").
+        const anthropicMessages = mergeConsecutiveMessages(converted);
         const functionTools = config.tools && config.tools.length > 0
             ? config.tools.map((tool) => zodToAnthropicTool(tool.name, tool.schema, {
                 description: tool.description,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smoltalk",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "A common interface for LLM APIs",
   "homepage": "https://github.com/egonSchiele/smoltalk",
   "files": [