veryfront 0.1.965 → 0.1.967

package/esm/cli/commands/eval/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/eval/command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/eval/command.ts"],"names":[],"mappings":"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"}

package/esm/cli/commands/eval/command.js

@@ -340,7 +340,11 @@ function usageRows(usage) {
         ["Total tokens", numberCell(usage.totalTokens)],
         ["Billable input tokens", numberCell(usage.billableInputTokens)],
         ["Billable output tokens", numberCell(usage.billableOutputTokens)],
+        ["Provider input cost USD", usdCell(usage.providerInputCostUsd)],
+        ["Provider output cost USD", usdCell(usage.providerOutputCostUsd)],
         ["Provider cost USD", usdCell(usage.providerCostUsd ?? usage.costUsd)],
+        ["Veryfront input charge USD", usdCell(usage.veryfrontInputChargeUsd)],
+        ["Veryfront output charge USD", usdCell(usage.veryfrontOutputChargeUsd)],
         ["Veryfront charge USD", usdCell(usage.veryfrontChargeUsd)],
         ["Veryfront billed USD", usdCell(usage.veryfrontBilledUsd)],
         ["Cost credits", decimalCell(usage.costCredits)],
@@ -477,9 +481,21 @@ export function normalizeUsage(response) {
                 ? { billableOutputTokens: response.usage.billableOutputTokens }
                 : {}),
             ...(response.usage.costUsd !== undefined ? { costUsd: response.usage.costUsd } : {}),
+            ...(response.usage.providerInputCostUsd !== undefined
+                ? { providerInputCostUsd: response.usage.providerInputCostUsd }
+                : {}),
+            ...(response.usage.providerOutputCostUsd !== undefined
+                ? { providerOutputCostUsd: response.usage.providerOutputCostUsd }
+                : {}),
             ...(response.usage.providerCostUsd !== undefined
                 ? { providerCostUsd: response.usage.providerCostUsd }
                 : {}),
+            ...(response.usage.veryfrontInputChargeUsd !== undefined
+                ? { veryfrontInputChargeUsd: response.usage.veryfrontInputChargeUsd }
+                : {}),
+            ...(response.usage.veryfrontOutputChargeUsd !== undefined
+                ? { veryfrontOutputChargeUsd: response.usage.veryfrontOutputChargeUsd }
+                : {}),
             ...(response.usage.veryfrontChargeUsd !== undefined
                 ? { veryfrontChargeUsd: response.usage.veryfrontChargeUsd }
                 : {}),

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.965",
+    "version": "0.1.967",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "minimumDependencyAge": {

package/esm/extensions/ext-llm-anthropic/src/anthropic-stream.d.ts

@@ -1,8 +1,12 @@
 import type { RuntimeUsage } from "../../../src/provider/shared/index.js";
+type AnthropicStreamOptions = {
+    clientToolUseTrailingUsageGraceMs?: number;
+};
 export declare function normalizeAnthropicFinishReason(raw: unknown): string | {
     unified: string;
     raw: string;
 } | null;
 export declare function extractAnthropicUsage(payload: unknown): RuntimeUsage | undefined;
-export declare function streamAnthropicCompatibleParts(stream: ReadableStream<Uint8Array>): AsyncIterable<unknown>;
+export declare function streamAnthropicCompatibleParts(stream: ReadableStream<Uint8Array>, options?: AnthropicStreamOptions): AsyncIterable<unknown>;
+export {};
 //# sourceMappingURL=anthropic-stream.d.ts.map

package/esm/extensions/ext-llm-anthropic/src/anthropic-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic-stream.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-llm-anthropic/src/anthropic-stream.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAyB1E,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,CAiDhF;AAED,wBAAuB,8BAA8B,CACnD,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GACjC,aAAa,CAAC,OAAO,CAAC,CA6QxB"}
+{"version":3,"file":"anthropic-stream.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-llm-anthropic/src/anthropic-stream.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAgB1E,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,CA6DhF;AAoED,wBAAuB,8BAA8B,CACnD,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,OAAO,GAAE,sBAA2B,GACnC,aAAa,CAAC,OAAO,CAAC,CAoUxB"}

package/esm/extensions/ext-llm-anthropic/src/anthropic-stream.js

@@ -1,4 +1,7 @@
+import * as dntShim from "../../../_dnt.shims.js";
 import { mergeUsage, parseSseChunk, readRecord, stringifyJsonValue, } from "../../../src/provider/shared/index.js";
+const CLIENT_TOOL_USE_FINISH_REASON = { unified: "tool-calls", raw: "tool_use" };
+const DEFAULT_CLIENT_TOOL_USE_TRAILING_USAGE_GRACE_MS = 100;
 function isEmptyRecord(value) {
     return Boolean(value &&
         typeof value === "object" &&
@@ -49,9 +52,21 @@ export function extractAnthropicUsage(payload) {
         ...(typeof veryfront?.billable_output_tokens === "number"
             ? { billableOutputTokens: veryfront.billable_output_tokens }
             : {}),
+        ...(typeof veryfront?.provider_input_cost_usd === "number"
+            ? { providerInputCostUsd: veryfront.provider_input_cost_usd }
+            : {}),
+        ...(typeof veryfront?.provider_output_cost_usd === "number"
+            ? { providerOutputCostUsd: veryfront.provider_output_cost_usd }
+            : {}),
         ...(typeof veryfront?.provider_cost_usd === "number"
             ? { providerCostUsd: veryfront.provider_cost_usd }
             : {}),
+        ...(typeof veryfront?.veryfront_input_charge_usd === "number"
+            ? { veryfrontInputChargeUsd: veryfront.veryfront_input_charge_usd }
+            : {}),
+        ...(typeof veryfront?.veryfront_output_charge_usd === "number"
+            ? { veryfrontOutputChargeUsd: veryfront.veryfront_output_charge_usd }
+            : {}),
         ...(typeof veryfront?.veryfront_charge_usd === "number"
             ? { veryfrontChargeUsd: veryfront.veryfront_charge_usd }
             : {}),
@@ -69,231 +84,327 @@ export function extractAnthropicUsage(payload) {
             : {}),
     };
 }
-export async function* streamAnthropicCompatibleParts(stream) {
+function isToolCallsFinishReason(finishReason) {
+    return finishReason === "tool-calls" ||
+        (typeof finishReason === "object" && finishReason?.unified === "tool-calls");
+}
+function hasGatewayUsageMetadata(usage) {
+    return usage?.billableInputTokens !== undefined ||
+        usage?.billableOutputTokens !== undefined ||
+        usage?.providerInputCostUsd !== undefined ||
+        usage?.providerOutputCostUsd !== undefined ||
+        usage?.providerCostUsd !== undefined ||
+        usage?.veryfrontInputChargeUsd !== undefined ||
+        usage?.veryfrontOutputChargeUsd !== undefined ||
+        usage?.veryfrontChargeUsd !== undefined ||
+        usage?.veryfrontBilledUsd !== undefined ||
+        usage?.costCredits !== undefined ||
+        usage?.costSource !== undefined ||
+        usage?.usageCaptureStatus !== undefined;
+}
+async function readStreamChunk(reader, timeoutMs) {
+    if (timeoutMs === undefined) {
+        const read = await reader.read();
+        return read.done ? { kind: "done" } : { kind: "chunk", chunk: read.value };
+    }
+    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));
+    });
+    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");
+        }
+        return result;
+    }
+    finally {
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+    }
+}
+async function cancelStreamReader(reader, reason) {
+    try {
+        await reader.cancel(reason);
+    }
+    catch {
+        // The upstream body may already be closed or canceled by the runtime.
+    }
+}
+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;
     let buffer = "";
     const toolCalls = new Map();
     const reasoningBlocks = new Map();
     let finishReason = null;
     let usage;
     let completedClientToolUseStep = false;
-    for await (const chunk of stream) {
-        buffer += decoder.decode(chunk, { stream: true });
-        const parsed = parseSseChunk(buffer);
+    let clientToolUseIdleDeadlineMs = null;
+    let clientToolUseTerminalDeadlineMs = null;
+    const mergeTrailingBufferUsage = () => {
+        if (buffer.trim().length === 0) {
+            return;
+        }
+        const parsed = parseSseChunk(`${buffer}\n\n`);
         buffer = parsed.remainder;
         for (const event of parsed.events) {
             if (event === "[DONE]") {
                 continue;
             }
             const record = readRecord(event);
-            const eventType = typeof record?.type === "string" ? record.type : undefined;
             usage = mergeUsage(usage, extractAnthropicUsage(record));
-            if (eventType === "message_start") {
-                usage = mergeUsage(usage, extractAnthropicUsage(record?.message));
-                continue;
+        }
+    };
+    const getClientToolUseReadTimeoutMs = () => {
+        if (!completedClientToolUseStep || toolCalls.size > 0) {
+            return undefined;
+        }
+        const deadline = isToolCallsFinishReason(finishReason)
+            ? clientToolUseTerminalDeadlineMs
+            : clientToolUseIdleDeadlineMs;
+        return deadline === null ? undefined : Math.max(1, deadline - Date.now());
+    };
+    const buildFinishPart = () => ({
+        type: "finish",
+        finishReason: finishReason ??
+            (completedClientToolUseStep ? CLIENT_TOOL_USE_FINISH_REASON : null),
+        ...(usage ? { usage } : {}),
+    });
+    try {
+        while (true) {
+            const read = await readStreamChunk(reader, getClientToolUseReadTimeoutMs());
+            if (read.kind === "timeout") {
+                mergeTrailingBufferUsage();
+                finishReason ??= CLIENT_TOOL_USE_FINISH_REASON;
+                yield buildFinishPart();
+                return;
+            }
+            if (read.kind === "done") {
+                break;
             }
-            if (eventType === "content_block_start") {
-                const index = typeof record?.index === "number" ? record.index : 0;
-                const contentBlock = readRecord(record?.content_block);
-                const blockType = typeof contentBlock?.type === "string" ? contentBlock.type : undefined;
-                if (blockType === "text" && typeof contentBlock?.text === "string" &&
-                    contentBlock.text.length > 0) {
-                    yield { type: "text-delta", delta: contentBlock.text };
+            buffer += decoder.decode(read.chunk, { stream: true });
+            const parsed = parseSseChunk(buffer);
+            buffer = parsed.remainder;
+            for (const event of parsed.events) {
+                if (event === "[DONE]") {
                     continue;
                 }
-                if (blockType === "thinking") {
-                    const reasoningId = `thinking-${index}`;
-                    reasoningBlocks.set(index, { id: reasoningId, text: "" });
-                    yield {
-                        type: "reasoning-start",
-                        id: reasoningId,
-                    };
-                    if (typeof contentBlock?.thinking === "string" && contentBlock.thinking.length > 0) {
-                        const current = reasoningBlocks.get(index);
-                        if (current) {
-                            current.text += contentBlock.thinking;
+                const record = readRecord(event);
+                const eventType = typeof record?.type === "string" ? record.type : undefined;
+                usage = mergeUsage(usage, extractAnthropicUsage(record));
+                if (eventType === "message_start") {
+                    usage = mergeUsage(usage, extractAnthropicUsage(record?.message));
+                    continue;
+                }
+                if (eventType === "content_block_start") {
+                    const index = typeof record?.index === "number" ? record.index : 0;
+                    const contentBlock = readRecord(record?.content_block);
+                    const blockType = typeof contentBlock?.type === "string" ? contentBlock.type : undefined;
+                    if (blockType === "text" && typeof contentBlock?.text === "string" &&
+                        contentBlock.text.length > 0) {
+                        yield { type: "text-delta", delta: contentBlock.text };
+                        continue;
+                    }
+                    if (blockType === "thinking") {
+                        const reasoningId = `thinking-${index}`;
+                        reasoningBlocks.set(index, { id: reasoningId, text: "" });
+                        yield {
+                            type: "reasoning-start",
+                            id: reasoningId,
+                        };
+                        if (typeof contentBlock?.thinking === "string" && contentBlock.thinking.length > 0) {
+                            const current = reasoningBlocks.get(index);
+                            if (current) {
+                                current.text += contentBlock.thinking;
+                            }
+                            yield {
+                                type: "reasoning-delta",
+                                id: reasoningId,
+                                delta: contentBlock.thinking,
+                            };
                         }
+                        continue;
+                    }
+                    // Redacted thinking blocks arrive as opaque encrypted payloads when
+                    // Claude's safety classifier flags the reasoning trace. Surface them
+                    // as a zero-length reasoning block so callers know thinking happened
+                    // without leaking the (legitimately hidden) contents.
+                    if (blockType === "redacted_thinking") {
+                        const reasoningId = `thinking-${index}`;
+                        reasoningBlocks.set(index, {
+                            id: reasoningId,
+                            text: "",
+                            ...(typeof contentBlock?.data === "string"
+                                ? { redactedData: contentBlock.data }
+                                : {}),
+                        });
                         yield {
-                            type: "reasoning-delta",
+                            type: "reasoning-start",
                             id: reasoningId,
-                            delta: contentBlock.thinking,
                         };
+                        continue;
                     }
-                    continue;
-                }
-                // Redacted thinking blocks arrive as opaque encrypted payloads when
-                // Claude's safety classifier flags the reasoning trace. Surface them
-                // as a zero-length reasoning block so callers know thinking happened
-                // without leaking the (legitimately hidden) contents.
-                if (blockType === "redacted_thinking") {
-                    const reasoningId = `thinking-${index}`;
-                    reasoningBlocks.set(index, {
-                        id: reasoningId,
-                        text: "",
-                        ...(typeof contentBlock?.data === "string" ? { redactedData: contentBlock.data } : {}),
-                    });
-                    yield {
-                        type: "reasoning-start",
-                        id: reasoningId,
-                    };
-                    continue;
-                }
-                if ((blockType === "tool_use" || blockType === "server_tool_use") &&
-                    typeof contentBlock?.id === "string" &&
-                    typeof contentBlock?.name === "string") {
-                    const providerExecuted = blockType === "server_tool_use" ? true : undefined;
-                    const current = {
-                        id: contentBlock.id,
-                        name: contentBlock.name,
-                        input: "",
-                        ...(providerExecuted ? { providerExecuted } : {}),
-                    };
-                    toolCalls.set(index, current);
-                    yield {
-                        type: "tool-input-start",
-                        id: current.id,
-                        toolName: current.name,
-                        ...(providerExecuted ? { providerExecuted } : {}),
-                    };
-                    const initialInput = contentBlock.input;
-                    if (initialInput !== undefined && !isEmptyRecord(initialInput)) {
-                        const serializedInput = stringifyJsonValue(initialInput);
-                        current.input += serializedInput;
+                    if ((blockType === "tool_use" || blockType === "server_tool_use") &&
+                        typeof contentBlock?.id === "string" &&
+                        typeof contentBlock?.name === "string") {
+                        const providerExecuted = blockType === "server_tool_use" ? true : undefined;
+                        const current = {
+                            id: contentBlock.id,
+                            name: contentBlock.name,
+                            input: "",
+                            ...(providerExecuted ? { providerExecuted } : {}),
+                        };
+                        toolCalls.set(index, current);
+                        clientToolUseIdleDeadlineMs = null;
+                        clientToolUseTerminalDeadlineMs = null;
                         yield {
-                            type: "tool-input-delta",
+                            type: "tool-input-start",
                             id: current.id,
-                            delta: serializedInput,
+                            toolName: current.name,
+                            ...(providerExecuted ? { providerExecuted } : {}),
+                        };
+                        const initialInput = contentBlock.input;
+                        if (initialInput !== undefined && !isEmptyRecord(initialInput)) {
+                            const serializedInput = stringifyJsonValue(initialInput);
+                            current.input += serializedInput;
+                            yield {
+                                type: "tool-input-delta",
+                                id: current.id,
+                                delta: serializedInput,
+                            };
+                        }
+                        continue;
+                    }
+                    if (blockType === "web_search_tool_result" &&
+                        typeof contentBlock?.tool_use_id === "string" &&
+                        Array.isArray(contentBlock?.content)) {
+                        yield {
+                            type: "tool-result",
+                            toolCallId: contentBlock.tool_use_id,
+                            toolName: "web_search",
+                            result: contentBlock.content,
+                            providerExecuted: true,
+                        };
+                    }
+                    if (blockType === "web_fetch_tool_result" &&
+                        typeof contentBlock?.tool_use_id === "string" &&
+                        readRecord(contentBlock?.content)) {
+                        yield {
+                            type: "tool-result",
+                            toolCallId: contentBlock.tool_use_id,
+                            toolName: "web_fetch",
+                            result: contentBlock.content,
+                            providerExecuted: true,
                         };
                     }
                     continue;
                 }
-                if (blockType === "web_search_tool_result" &&
-                    typeof contentBlock?.tool_use_id === "string" &&
-                    Array.isArray(contentBlock?.content)) {
-                    yield {
-                        type: "tool-result",
-                        toolCallId: contentBlock.tool_use_id,
-                        toolName: "web_search",
-                        result: contentBlock.content,
-                        providerExecuted: true,
-                    };
-                }
-                if (blockType === "web_fetch_tool_result" &&
-                    typeof contentBlock?.tool_use_id === "string" &&
-                    readRecord(contentBlock?.content)) {
-                    yield {
-                        type: "tool-result",
-                        toolCallId: contentBlock.tool_use_id,
-                        toolName: "web_fetch",
-                        result: contentBlock.content,
-                        providerExecuted: true,
-                    };
-                }
-                continue;
-            }
-            if (eventType === "content_block_delta") {
-                const index = typeof record?.index === "number" ? record.index : 0;
-                const delta = readRecord(record?.delta);
-                const deltaType = typeof delta?.type === "string" ? delta.type : undefined;
-                if (deltaType === "text_delta" && typeof delta?.text === "string" && delta.text.length > 0) {
-                    yield { type: "text-delta", delta: delta.text };
-                    continue;
-                }
-                if (deltaType === "thinking_delta" && typeof delta?.thinking === "string" &&
-                    delta.thinking.length > 0) {
-                    const current = reasoningBlocks.get(index);
-                    if (!current) {
+                if (eventType === "content_block_delta") {
+                    const index = typeof record?.index === "number" ? record.index : 0;
+                    const delta = readRecord(record?.delta);
+                    const deltaType = typeof delta?.type === "string" ? delta.type : undefined;
+                    if (deltaType === "text_delta" && typeof delta?.text === "string" && delta.text.length > 0) {
+                        yield { type: "text-delta", delta: delta.text };
                         continue;
                     }
-                    current.text += delta.thinking;
-                    yield {
-                        type: "reasoning-delta",
-                        id: current.id,
-                        delta: delta.thinking,
-                    };
-                    continue;
-                }
-                if (deltaType === "signature_delta" && typeof delta?.signature === "string") {
-                    const current = reasoningBlocks.get(index);
-                    if (current) {
-                        current.signature = delta.signature;
+                    if (deltaType === "thinking_delta" && typeof delta?.thinking === "string" &&
+                        delta.thinking.length > 0) {
+                        const current = reasoningBlocks.get(index);
+                        if (!current) {
+                            continue;
+                        }
+                        current.text += delta.thinking;
+                        yield {
+                            type: "reasoning-delta",
+                            id: current.id,
+                            delta: delta.thinking,
+                        };
+                        continue;
+                    }
+                    if (deltaType === "signature_delta" && typeof delta?.signature === "string") {
+                        const current = reasoningBlocks.get(index);
+                        if (current) {
+                            current.signature = delta.signature;
+                        }
+                        continue;
+                    }
+                    if (deltaType === "input_json_delta" && typeof delta?.partial_json === "string") {
+                        const current = toolCalls.get(index);
+                        if (!current) {
+                            continue;
+                        }
+                        current.input += delta.partial_json;
+                        yield {
+                            type: "tool-input-delta",
+                            id: current.id,
+                            delta: delta.partial_json,
+                        };
                     }
                     continue;
                 }
-                if (deltaType === "input_json_delta" && typeof delta?.partial_json === "string") {
+                if (eventType === "content_block_stop") {
+                    const index = typeof record?.index === "number" ? record.index : 0;
+                    const reasoning = reasoningBlocks.get(index);
+                    if (reasoning) {
+                        yield {
+                            type: "reasoning-end",
+                            id: reasoning.id,
+                            ...(reasoning.signature ? { signature: reasoning.signature } : {}),
+                            ...(reasoning.redactedData ? { redactedData: reasoning.redactedData } : {}),
+                        };
+                        reasoningBlocks.delete(index);
+                        continue;
+                    }
                     const current = toolCalls.get(index);
                     if (!current) {
                         continue;
                     }
-                    current.input += delta.partial_json;
-                    yield {
-                        type: "tool-input-delta",
-                        id: current.id,
-                        delta: delta.partial_json,
-                    };
-                }
-                continue;
-            }
-            if (eventType === "content_block_stop") {
-                const index = typeof record?.index === "number" ? record.index : 0;
-                const reasoning = reasoningBlocks.get(index);
-                if (reasoning) {
                     yield {
-                        type: "reasoning-end",
-                        id: reasoning.id,
-                        ...(reasoning.signature ? { signature: reasoning.signature } : {}),
-                        ...(reasoning.redactedData ? { redactedData: reasoning.redactedData } : {}),
+                        type: "tool-call",
+                        toolCallId: current.id,
+                        toolName: current.name,
+                        input: current.input.length > 0 ? current.input : "{}",
+                        ...(current.providerExecuted ? { providerExecuted: true } : {}),
                     };
-                    reasoningBlocks.delete(index);
-                    continue;
-                }
-                const current = toolCalls.get(index);
-                if (!current) {
+                    if (!current.providerExecuted) {
+                        completedClientToolUseStep = true;
+                        clientToolUseIdleDeadlineMs = null;
+                    }
+                    toolCalls.delete(index);
                     continue;
                 }
-                yield {
-                    type: "tool-call",
-                    toolCallId: current.id,
-                    toolName: current.name,
-                    input: current.input.length > 0 ? current.input : "{}",
-                    ...(current.providerExecuted ? { providerExecuted: true } : {}),
-                };
-                if (!current.providerExecuted) {
-                    completedClientToolUseStep = true;
+                if (eventType === "message_delta") {
+                    const delta = readRecord(record?.delta);
+                    const normalizedFinishReason = normalizeAnthropicFinishReason(delta?.stop_reason);
+                    if (normalizedFinishReason) {
+                        finishReason = normalizedFinishReason;
+                    }
                 }
-                toolCalls.delete(index);
-                continue;
             }
-            if (eventType === "message_delta") {
-                const delta = readRecord(record?.delta);
-                const normalizedFinishReason = normalizeAnthropicFinishReason(delta?.stop_reason);
-                if (normalizedFinishReason) {
-                    finishReason = normalizedFinishReason;
+            if (completedClientToolUseStep && toolCalls.size === 0) {
+                if (isToolCallsFinishReason(finishReason)) {
+                    clientToolUseIdleDeadlineMs = null;
+                    clientToolUseTerminalDeadlineMs ??= Date.now() + trailingUsageGraceMs;
+                    if (hasGatewayUsageMetadata(usage)) {
+                        await cancelStreamReader(reader, "Finished Anthropic tool-use turn after gateway usage metadata");
+                        yield buildFinishPart();
+                        return;
+                    }
+                }
+                else {
+                    clientToolUseIdleDeadlineMs ??= Date.now() + trailingUsageGraceMs;
                 }
             }
         }
-        if (completedClientToolUseStep && toolCalls.size === 0) {
-            yield {
-                type: "finish",
-                finishReason: { unified: "tool-calls", raw: "tool_use" },
-                ...(usage ? { usage } : {}),
-            };
-            return;
-        }
     }
-    if (buffer.trim().length > 0) {
-        const parsed = parseSseChunk(`${buffer}\n\n`);
-        for (const event of parsed.events) {
-            if (event === "[DONE]") {
-                continue;
-            }
-            const record = readRecord(event);
-            usage = mergeUsage(usage, extractAnthropicUsage(record));
-        }
+    finally {
+        reader.releaseLock();
     }
-    yield {
-        type: "finish",
-        finishReason,
-        ...(usage ? { usage } : {}),
-    };
+    mergeTrailingBufferUsage();
+    yield buildFinishPart();
 }

package/esm/extensions/ext-llm-openai/src/openai-chat-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openai-chat-stream.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-llm-openai/src/openai-chat-stream.ts"],"names":[],"mappings":"AA2IA,wBAAuB,2BAA2B,CAChD,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GACjC,aAAa,CAAC,OAAO,CAAC,CAsJxB"}
+{"version":3,"file":"openai-chat-stream.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-llm-openai/src/openai-chat-stream.ts"],"names":[],"mappings":"AA2JA,wBAAuB,2BAA2B,CAChD,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GACjC,aAAa,CAAC,OAAO,CAAC,CAsJxB"}

package/esm/extensions/ext-llm-openai/src/openai-chat-stream.js

@@ -40,9 +40,21 @@ function extractOpenAIUsage(payload) {
             ? { billableOutputTokens: veryfront.billable_output_tokens }
             : {}),
         ...(typeof veryfront?.cost_usd === "number" ? { costUsd: veryfront.cost_usd } : {}),
+        ...(typeof veryfront?.provider_input_cost_usd === "number"
+            ? { providerInputCostUsd: veryfront.provider_input_cost_usd }
+            : {}),
+        ...(typeof veryfront?.provider_output_cost_usd === "number"
+            ? { providerOutputCostUsd: veryfront.provider_output_cost_usd }
+            : {}),
         ...(typeof veryfront?.provider_cost_usd === "number"
             ? { providerCostUsd: veryfront.provider_cost_usd }
             : {}),
+        ...(typeof veryfront?.veryfront_input_charge_usd === "number"
+            ? { veryfrontInputChargeUsd: veryfront.veryfront_input_charge_usd }
+            : {}),
+        ...(typeof veryfront?.veryfront_output_charge_usd === "number"
+            ? { veryfrontOutputChargeUsd: veryfront.veryfront_output_charge_usd }
+            : {}),
         ...(typeof veryfront?.veryfront_charge_usd === "number"
             ? { veryfrontChargeUsd: veryfront.veryfront_charge_usd }
             : {}),