@purista/harness-anthropic 1.2.1 → 1.2.2

package/dist/index.js

@@ -85,9 +85,11 @@ class AnthropicModelProvider extends BaseModelProvider {
         req.signal.throwIfAborted();
         const response = await createMessage(this.client, req, false, true);
         const toolUse = response.content?.find((block) => block.type === 'tool_use' && block.name === 'harness_response');
+        const toolCalls = withoutObjectTool(extractToolCalls(response, req, 'object'));
         const object = (toolUse?.input ?? parseJson(response.content?.filter((block) => block.type === 'text').map((block) => block.text).join('') || '{}', req, 'object'));
         return {
             object,
+            ...(toolCalls ? { toolCalls } : {}),
             usage: toUsage(response.usage?.input_tokens, response.usage?.output_tokens),
             finishReason: toFinishReason(response.stop_reason),
             raw: response
@@ -136,23 +138,35 @@ async function createMessage(client, req, stream, forceObject = false) {
         ...(req.defaults?.providerOptions ?? {}),
         ...(req.call?.providerOptions ?? {})
     };
-    const { requestOptions, ...bodyOptions } = providerOptions;
+    const { requestOptions, tool_choice: providerToolChoice, ...bodyOptions } = providerOptions;
     const { system, messages } = toAnthropicMessages(req.messages);
-    const tools = forceObject ? [toObjectTool(req)] : toTools(req.tools);
+    const modelTools = toTools(req.tools) ?? [];
+    const tools = forceObject ? [...modelTools, toObjectTool(req)] : modelTools;
+    const forceObjectTool = forceObject && modelTools.length === 0;
+    const toolChoice = anthropicToolChoice(providerToolChoice, forceObjectTool, req.call?.parallelToolCalls ?? req.defaults?.parallelToolCalls);
     return client.messages.create({
         model: req.model,
         messages,
         stream,
         max_tokens: req.call?.maxTokens ?? req.defaults?.maxTokens ?? 1024,
         ...(system ? { system } : {}),
-        ...(tools ? { tools } : {}),
-        ...(forceObject ? { tool_choice: { type: 'tool', name: 'harness_response' } } : {}),
-        ...(req.call?.temperature ?? req.defaults?.temperature !== undefined ? { temperature: req.call?.temperature ?? req.defaults?.temperature } : {}),
-        ...(req.call?.topP ?? req.defaults?.topP !== undefined ? { top_p: req.call?.topP ?? req.defaults?.topP } : {}),
-        ...(req.call?.stopSequences ?? req.defaults?.stopSequences ? { stop_sequences: req.call?.stopSequences ?? req.defaults?.stopSequences } : {}),
+        ...(tools.length > 0 ? { tools } : {}),
+        ...(toolChoice ? { tool_choice: toolChoice } : {}),
+        ...((req.call?.temperature ?? req.defaults?.temperature) !== undefined ? { temperature: req.call?.temperature ?? req.defaults?.temperature } : {}),
+        ...((req.call?.topP ?? req.defaults?.topP) !== undefined ? { top_p: req.call?.topP ?? req.defaults?.topP } : {}),
+        ...((req.call?.stopSequences ?? req.defaults?.stopSequences) !== undefined ? { stop_sequences: req.call?.stopSequences ?? req.defaults?.stopSequences } : {}),
         ...bodyOptions
     }, { ...requestOptions, signal: req.signal });
 }
+function anthropicToolChoice(providerToolChoice, forceObjectTool, parallelToolCalls) {
+    if (providerToolChoice !== undefined)
+        return providerToolChoice;
+    if (forceObjectTool)
+        return { type: 'tool', name: 'harness_response' };
+    if (parallelToolCalls === false)
+        return { type: 'auto', disable_parallel_tool_use: true };
+    return undefined;
+}
 function toAnthropicMessages(messages) {
     const system = messages.filter((message) => message.role === 'system').map((message) => message.content).join('\n\n');
     const converted = messages.filter((message) => message.role !== 'system').map((message) => {
@@ -218,6 +232,10 @@ function extractToolCalls(response, req, method) {
         arguments: typeof call.input === 'string' ? parseJson(call.input, req, method) : call.input ?? {}
     }));
 }
+function withoutObjectTool(calls) {
+    const filtered = calls?.filter((call) => call.name !== 'harness_response');
+    return filtered && filtered.length > 0 ? filtered : undefined;
+}
 function parseJson(content, req, method) {
     try {
         return JSON.parse(content);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purista/harness-anthropic",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Anthropic model provider adapter for @purista/harness.",
   "type": "module",
   "main": "./dist/index.js",