@purista/harness-anthropic 1.2.5 → 1.5.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { BaseModelProvider, ModelError } from '@purista/harness';
+import { BaseModelProvider, parseProviderJson, safePartialJson, toTokenUsage, withoutObjectTool } from '@purista/harness';
 import Anthropic, {} from '@anthropic-ai/sdk';
 /**
  * Creates an Anthropic-backed harness `ModelProvider`.
@@ -34,8 +34,9 @@ class AnthropicModelProvider extends BaseModelProvider {
         return {
             content: response.content?.filter((block) => block.type === 'text').map((block) => block.text).join('') ?? '',
             ...(toolCalls ? { toolCalls } : {}),
-            usage: toUsage(response.usage?.input_tokens, response.usage?.output_tokens),
+            usage: toTokenUsage(response.usage?.input_tokens, response.usage?.output_tokens),
             finishReason: toFinishReason(response.stop_reason),
+            outcome: toOutcome(response.stop_reason),
             raw: response
         };
     }
@@ -45,16 +46,18 @@ class AnthropicModelProvider extends BaseModelProvider {
         const toolState = new Map();
         let usage = { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
         let finishReason = 'stop';
+        let providerFinishReason;
         for await (const event of stream) {
             req.signal.throwIfAborted();
             if (event.type === 'message_start') {
-                usage = toUsage(event.message?.usage?.input_tokens, event.message?.usage?.output_tokens);
+                usage = toTokenUsage(event.message?.usage?.input_tokens, event.message?.usage?.output_tokens);
             }
             else if (event.type === 'content_block_start' && event.content_block?.type === 'tool_use') {
                 toolState.set(event.index, {
                     id: String(event.content_block.id),
                     name: String(event.content_block.name),
-                    input: JSON.stringify(event.content_block.input ?? {})
+                    input: '',
+                    startInput: event.content_block.input
                 });
             }
             else if (event.type === 'content_block_delta') {
@@ -70,16 +73,19 @@ class AnthropicModelProvider extends BaseModelProvider {
             else if (event.type === 'content_block_stop') {
                 const state = toolState.get(event.index);
                 if (state) {
-                    yield { kind: 'tool_call', call: { id: state.id, name: state.name, arguments: parseJson(state.input, req, 'textStream') } };
+                    yield { kind: 'tool_call', call: { id: state.id, name: state.name, arguments: parseJson(toolBlockInputJson(state), req, 'textStream') } };
                     toolState.delete(event.index);
                 }
             }
             else if (event.type === 'message_delta') {
-                finishReason = toFinishReason(event.delta?.stop_reason);
-                usage = toUsage(usage.inputTokens, event.usage?.output_tokens ?? usage.outputTokens);
+                if (event.delta?.stop_reason) {
+                    providerFinishReason = event.delta.stop_reason;
+                    finishReason = toFinishReason(providerFinishReason);
+                }
+                usage = toTokenUsage(usage.inputTokens, event.usage?.output_tokens ?? usage.outputTokens);
             }
         }
-        yield { kind: 'finish', usage, finishReason };
+        yield { kind: 'finish', usage, finishReason, outcome: streamOutcome(finishReason, providerFinishReason) };
     }
     async doObject(req) {
         req.signal.throwIfAborted();
@@ -90,8 +96,9 @@ class AnthropicModelProvider extends BaseModelProvider {
         return {
             object,
             ...(toolCalls ? { toolCalls } : {}),
-            usage: toUsage(response.usage?.input_tokens, response.usage?.output_tokens),
+            usage: toTokenUsage(response.usage?.input_tokens, response.usage?.output_tokens),
             finishReason: toFinishReason(response.stop_reason),
+            outcome: toOutcome(response.stop_reason),
             raw: response
         };
     }
@@ -100,15 +107,33 @@ class AnthropicModelProvider extends BaseModelProvider {
         const stream = await createMessage(this.client, req, true, true);
         let text = '';
         let objectInput = '';
+        let objectBlockIndex;
+        let objectStartInput;
+        const toolState = new Map();
         let usage = { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
         let finishReason = 'stop';
+        let providerFinishReason;
         for await (const event of stream) {
             req.signal.throwIfAborted();
             if (event.type === 'message_start') {
-                usage = toUsage(event.message?.usage?.input_tokens, event.message?.usage?.output_tokens);
+                usage = toTokenUsage(event.message?.usage?.input_tokens, event.message?.usage?.output_tokens);
             }
-            else if (event.type === 'content_block_start' && event.content_block?.type === 'tool_use' && event.content_block.name === 'harness_response') {
-                objectInput = JSON.stringify(event.content_block.input ?? {});
+            else if (event.type === 'content_block_start' && event.content_block?.type === 'tool_use') {
+                // Only the synthetic `harness_response` block carries the structured
+                // object; other tool blocks are real tool calls and must not bleed
+                // into the object JSON (parity with the OpenAI/Azure adapters).
+                if (event.content_block.name === 'harness_response' && objectBlockIndex === undefined) {
+                    objectBlockIndex = event.index;
+                    objectStartInput = event.content_block.input;
+                }
+                else {
+                    toolState.set(event.index, {
+                        id: String(event.content_block.id),
+                        name: String(event.content_block.name),
+                        input: '',
+                        startInput: event.content_block.input
+                    });
+                }
             }
             else if (event.type === 'content_block_delta') {
                 if (event.delta?.type === 'text_delta') {
@@ -116,22 +141,48 @@ class AnthropicModelProvider extends BaseModelProvider {
                     yield { kind: 'partial', partial: safePartialJson(text) };
                 }
                 else if (event.delta?.type === 'input_json_delta') {
-                    objectInput += event.delta.partial_json;
-                    yield { kind: 'partial', partial: safePartialJson(objectInput) };
+                    if (event.index === objectBlockIndex) {
+                        objectInput += event.delta.partial_json;
+                        yield { kind: 'partial', partial: safePartialJson(objectInput) };
+                    }
+                    else {
+                        const state = toolState.get(event.index);
+                        if (state)
+                            state.input += event.delta.partial_json;
+                    }
+                }
+            }
+            else if (event.type === 'content_block_stop') {
+                const state = toolState.get(event.index);
+                if (state) {
+                    yield { kind: 'tool_call', call: { id: state.id, name: state.name, arguments: parseJson(toolBlockInputJson(state), req, 'objectStream') } };
+                    toolState.delete(event.index);
                 }
             }
             else if (event.type === 'message_delta') {
-                finishReason = toFinishReason(event.delta?.stop_reason);
-                usage = toUsage(usage.inputTokens, event.usage?.output_tokens ?? usage.outputTokens);
+                if (event.delta?.stop_reason) {
+                    providerFinishReason = event.delta.stop_reason;
+                    finishReason = toFinishReason(providerFinishReason);
+                }
+                usage = toTokenUsage(usage.inputTokens, event.usage?.output_tokens ?? usage.outputTokens);
             }
         }
-        const object = parseJson(objectInput || text || '{}', req, 'objectStream');
-        yield { kind: 'finish', object, usage, finishReason };
+        const objectSource = objectInput
+            || (objectStartInput !== undefined ? JSON.stringify(objectStartInput) : '')
+            || text
+            || '{}';
+        const object = parseJson(objectSource, req, 'objectStream');
+        yield { kind: 'finish', object, usage, finishReason, outcome: streamOutcome(finishReason, providerFinishReason) };
     }
 }
+function toolBlockInputJson(state) {
+    if (state.input)
+        return state.input;
+    return JSON.stringify(state.startInput ?? {});
+}
 function toClientOptions(options) {
     const { client: _client, harnessLogger: _harnessLogger, telemetry: _telemetry, harnessTimeoutMs: _harnessTimeoutMs, ...clientOptions } = options;
-    return clientOptions;
+    return { maxRetries: 0, ...clientOptions };
 }
 async function createMessage(client, req, stream, forceObject = false) {
     const providerOptions = {
@@ -232,39 +283,12 @@ 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;
+const MALFORMED_JSON_MESSAGE = 'Anthropic returned malformed structured JSON.';
+function callContext(req, method) {
+    return { provider: 'anthropic', model: req.model, method };
 }
 function parseJson(content, req, method) {
-    try {
-        return JSON.parse(content);
-    }
-    catch (error) {
-        throw malformedResponseError(req, method, 'Anthropic returned malformed structured JSON.', content, error);
-    }
-}
-function malformedResponseError(req, method, message, body, cause) {
-    return new ModelError(message, {
-        provider: 'anthropic',
-        model: req.model,
-        method,
-        reason: 'malformed_response',
-        providerBody: body
-    }, cause);
-}
-function safePartialJson(content) {
-    try {
-        return JSON.parse(content);
-    }
-    catch {
-        return { _partial: content };
-    }
-}
-function toUsage(inputTokens, outputTokens) {
-    const input = inputTokens ?? 0;
-    const output = outputTokens ?? 0;
-    return { inputTokens: input, outputTokens: output, totalTokens: input + output };
+    return parseProviderJson(content, callContext(req, method), MALFORMED_JSON_MESSAGE);
 }
 function toFinishReason(value) {
     switch (value) {
@@ -275,7 +299,30 @@ function toFinishReason(value) {
             return 'length';
         case 'tool_use':
             return 'tool_calls';
+        case 'pause_turn':
+            return 'pause';
+        case 'refusal':
+            return 'refusal';
+        case 'model_context_window_exceeded':
+            return 'context_limit';
         default:
             return 'error';
     }
 }
+function toOutcome(value) {
+    const finishReason = toFinishReason(value);
+    return {
+        finishReason,
+        ...(typeof value === 'string' ? { providerFinishReason: value } : {})
+    };
+}
+/**
+ * Stream outcome built from the tracked finish reason; `providerFinishReason`
+ * is omitted entirely when the provider never sent a stop reason.
+ */
+function streamOutcome(finishReason, providerFinishReason) {
+    return {
+        finishReason,
+        ...(typeof providerFinishReason === 'string' ? { providerFinishReason } : {})
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purista/harness-anthropic",
-  "version": "1.2.5",
+  "version": "1.5.0",
   "description": "Anthropic model provider adapter for @purista/harness.",
   "type": "module",
   "main": "./dist/index.js",
@@ -48,7 +48,7 @@
     "vitest": "^4.1.8"
   },
   "peerDependencies": {
-    "@purista/harness": "*"
+    "@purista/harness": "^1.5.0"
   },
   "engines": {
     "node": ">=24.15.0"