@veryfront/ext-llm-anthropic 0.1.1050 → 0.1.1052

package/esm/anthropic-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic-provider.d.ts","sourceRoot":"","sources":["../src/anthropic-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE/E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EACL,kBAAkB,EAIlB,aAAa,EACb,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,oBAAoB,EAKpB,+BAA+B,EAC/B,8BAA8B,EAC/B,MAAM,2BAA2B,CAAC;AAWnC,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,oBAAoB,EACpB,+BAA+B,EAC/B,8BAA8B,GAC/B,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AA4KD,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,MAAM,GACd,YAAY,CAyEd;AAED,qBAAa,iBAAkB,YAAW,WAAW;IACnD,QAAQ,CAAC,EAAE,eAAe;IAE1B,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,YAAY;CAYtE"}
+{"version":3,"file":"anthropic-provider.d.ts","sourceRoot":"","sources":["../src/anthropic-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE/E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EACL,kBAAkB,EAIlB,aAAa,EACb,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,oBAAoB,EAKpB,+BAA+B,EAC/B,8BAA8B,EAC/B,MAAM,2BAA2B,CAAC;AAWnC,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,oBAAoB,EACpB,+BAA+B,EAC/B,8BAA8B,GAC/B,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CACjC;AA4KD,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,MAAM,GACd,YAAY,CAgFd;AAED,qBAAa,iBAAkB,YAAW,WAAW;IACnD,QAAQ,CAAC,EAAE,eAAe;IAE1B,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,YAAY;CAYtE"}

package/esm/anthropic-provider.js

@@ -134,8 +134,12 @@ function buildAnthropicGenerateResult(payload) {
 }
 export function createAnthropicModelRuntime(config, modelId) {
     const fetchImpl = config.fetch ?? globalThis.fetch;
+    const providerName = config.name ?? "anthropic";
+    const streamOptions = providerName === "veryfront-cloud"
+        ? { clientToolUseTrailingUsageTimeoutMode: "drain" }
+        : undefined;
     return {
-        provider: config.name ?? "anthropic",
+        provider: providerName,
         modelId,
         specificationVersion: "v3",
         supportedUrls: {},
@@ -185,7 +189,7 @@ export function createAnthropicModelRuntime(config, modelId) {
             }).then((responseStream) => {
                 const drained = warnings.drain();
                 return {
-                    stream: ReadableStream.from(withToolInputStatusTransitions(streamAnthropicCompatibleParts(responseStream))),
+                    stream: ReadableStream.from(withToolInputStatusTransitions(streamAnthropicCompatibleParts(responseStream, streamOptions))),
                     ...(drained.length > 0 ? { warnings: drained } : {}),
                 };
             });

package/esm/anthropic-stream.d.ts

@@ -1,6 +1,8 @@
 import type { RuntimeUsage } from "veryfront/provider/shared";
 type AnthropicStreamOptions = {
     clientToolUseTrailingUsageGraceMs?: number;
+    clientToolUseTrailingUsageTimeoutMode?: "cancel" | "drain";
+    clientToolUseTrailingUsageDrainTimeoutMs?: number;
 };
 export declare function normalizeAnthropicFinishReason(raw: unknown): string | {
     unified: string;

package/esm/anthropic-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic-stream.d.ts","sourceRoot":"","sources":["../src/anthropic-stream.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAgB9D,KAAK,sBAAsB,GAAG;IAC5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;CAC5C,CAAC;AAmBF,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,OAAO,GACX,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAgBlD;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,SAAS,CA+DhF;AAqDD,wBAAuB,8BAA8B,CACnD,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,OAAO,GAAE,sBAA2B,GACnC,aAAa,CAAC,OAAO,CAAC,CA4TxB"}
+{"version":3,"file":"anthropic-stream.d.ts","sourceRoot":"","sources":["../src/anthropic-stream.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAgB9D,KAAK,sBAAsB,GAAG;IAC5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,qCAAqC,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC3D,wCAAwC,CAAC,EAAE,MAAM,CAAC;CACnD,CAAC;AAoBF,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,OAAO,GACX,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAgBlD;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,GAAG,SAAS,CA+DhF;AA+FD,wBAAuB,8BAA8B,CACnD,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,OAAO,GAAE,sBAA2B,GACnC,aAAa,CAAC,OAAO,CAAC,CAwUxB"}

package/esm/anthropic-stream.js

@@ -2,6 +2,7 @@ import * as dntShim from "./_dnt.shims.js";
 import { mergeUsage, parseSseChunk, readGatewayBillingMode, readRecord, stringifyJsonValue, } from "veryfront/provider/shared";
 const CLIENT_TOOL_USE_FINISH_REASON = { unified: "tool-calls", raw: "tool_use" };
 const DEFAULT_CLIENT_TOOL_USE_TRAILING_USAGE_GRACE_MS = 100;
+const DEFAULT_CLIENT_TOOL_USE_TRAILING_USAGE_DRAIN_TIMEOUT_MS = 15_000;
 function isEmptyRecord(value) {
     return Boolean(value &&
         typeof value === "object" &&
@@ -90,7 +91,7 @@ function isToolCallsFinishReason(finishReason) {
     return finishReason === "tool-calls" ||
         (typeof finishReason === "object" && finishReason?.unified === "tool-calls");
 }
-async function readStreamChunk(reader, timeoutMs) {
+async function readStreamChunk(reader, timeoutMs, timeoutMode = "cancel", drainTimeoutMs = DEFAULT_CLIENT_TOOL_USE_TRAILING_USAGE_DRAIN_TIMEOUT_MS) {
     if (timeoutMs === undefined) {
         const read = await reader.read();
         return read.done ? { kind: "done" } : { kind: "chunk", chunk: read.value };
@@ -98,12 +99,17 @@ async function readStreamChunk(reader, timeoutMs) {
     let timeoutId;
     const readPromise = reader.read().then((read) => read.done ? { kind: "done" } : { kind: "chunk", chunk: read.value });
     const timeoutPromise = new Promise((resolve) => {
-        timeoutId = dntShim.setTimeout(() => resolve({ kind: "timeout" }), Math.max(1, timeoutMs));
+        timeoutId = dntShim.setTimeout(() => resolve({ kind: "timeout", readerMode: timeoutMode }), Math.max(1, timeoutMs));
     });
     try {
         const result = await Promise.race([readPromise, timeoutPromise]);
         if (result.kind === "timeout") {
-            await cancelStreamReader(reader, "Timed out waiting for trailing Anthropic tool-use usage metadata");
+            if (timeoutMode === "drain") {
+                void drainStreamReaderAfterTimeout(reader, readPromise, drainTimeoutMs);
+            }
+            else {
+                await cancelStreamReader(reader, "Timed out waiting for trailing Anthropic tool-use usage metadata");
+            }
         }
         return result;
     }
@@ -121,11 +127,40 @@ async function cancelStreamReader(reader, reason) {
         // The upstream body may already be closed or canceled by the runtime.
     }
 }
+async function drainStreamReaderAfterTimeout(reader, pendingRead, timeoutMs) {
+    const timeoutId = dntShim.setTimeout(() => {
+        void cancelStreamReader(reader, "Timed out draining trailing Anthropic tool-use usage metadata");
+    }, Math.max(1, timeoutMs));
+    try {
+        const firstRead = await pendingRead;
+        if (firstRead.kind === "done") {
+            return;
+        }
+        while (true) {
+            const read = await reader.read();
+            if (read.done) {
+                return;
+            }
+        }
+    }
+    catch {
+        // The caller has already emitted a finish event; late drain failures should
+        // not fail the completed tool turn.
+    }
+    finally {
+        clearTimeout(timeoutId);
+        reader.releaseLock();
+    }
+}
 export async function* streamAnthropicCompatibleParts(stream, options = {}) {
     const decoder = new TextDecoder();
     const reader = stream.getReader();
     const trailingUsageGraceMs = options.clientToolUseTrailingUsageGraceMs ??
         DEFAULT_CLIENT_TOOL_USE_TRAILING_USAGE_GRACE_MS;
+    const trailingUsageTimeoutMode = options.clientToolUseTrailingUsageTimeoutMode ?? "cancel";
+    const trailingUsageDrainTimeoutMs = options.clientToolUseTrailingUsageDrainTimeoutMs ??
+        DEFAULT_CLIENT_TOOL_USE_TRAILING_USAGE_DRAIN_TIMEOUT_MS;
+    let readerReleased = false;
     let buffer = "";
     const toolCalls = new Map();
     const reasoningBlocks = new Map();
@@ -165,8 +200,9 @@ export async function* streamAnthropicCompatibleParts(stream, options = {}) {
     });
     try {
         while (true) {
-            const read = await readStreamChunk(reader, getClientToolUseReadTimeoutMs());
+            const read = await readStreamChunk(reader, getClientToolUseReadTimeoutMs(), trailingUsageTimeoutMode, trailingUsageDrainTimeoutMs);
             if (read.kind === "timeout") {
+                readerReleased = read.readerMode === "drain";
                 mergeTrailingBufferUsage();
                 finishReason ??= CLIENT_TOOL_USE_FINISH_REASON;
                 yield buildFinishPart();
@@ -386,7 +422,9 @@ export async function* streamAnthropicCompatibleParts(stream, options = {}) {
         }
     }
     finally {
-        reader.releaseLock();
+        if (!readerReleased) {
+            reader.releaseLock();
+        }
     }
     mergeTrailingBufferUsage();
     yield buildFinishPart();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veryfront/ext-llm-anthropic",
-  "version": "0.1.1050",
+  "version": "0.1.1052",
   "description": "Veryfront first-party extension package for ext-llm-anthropic",
   "keywords": [
     "veryfront",
@@ -50,7 +50,7 @@
     "@deno/shim-timers": "~0.1.0"
   },
   "peerDependencies": {
-    "veryfront": "^0.1.1050"
+    "veryfront": "^0.1.1052"
   },
   "type": "module",
   "types": "./esm/index.d.ts",