@node-llm/core 1.15.2 → 1.16.0

package/dist/providers/gemini/Capabilities.js

@@ -2,141 +2,87 @@ import { ModelRegistry } from "../../models/ModelRegistry.js";
 import { PricingRegistry } from "../../models/PricingRegistry.js";
 export class Capabilities {
     static getContextWindow(modelId) {
-        const val = ModelRegistry.getContextWindow(modelId, "gemini");
-        if (val !== undefined && val !== null)
-            return val;
-        const id = this.normalizeModelId(modelId);
-        if (id.match(/gemini-2\.5-pro-exp-03-25|gemini-2\.0-flash|gemini-2\.0-flash-lite|gemini-1\.5-flash|gemini-1\.5-flash-8b/)) {
-            return 1_048_576;
-        }
-        if (id.match(/gemini-1\.5-pro/)) {
-            return 2_097_152;
-        }
-        if (id.match(/gemini-embedding-exp/)) {
-            return 8_192;
-        }
-        if (id.match(/text-embedding-004|embedding-001/)) {
-            return 2_048;
-        }
-        if (id.match(/aqa/)) {
-            return 7_168;
-        }
-        return 32_768;
+        return ModelRegistry.getContextWindow(modelId, "gemini") ?? 32_768;
     }
     static getMaxOutputTokens(modelId) {
-        const val = ModelRegistry.getMaxOutputTokens(modelId, "gemini");
-        if (val !== undefined && val !== null)
-            return val;
-        const id = this.normalizeModelId(modelId);
-        if (id.match(/gemini-2\.5-pro-exp-03-25/)) {
-            return 64_000;
-        }
-        if (id.match(/gemini-2\.0-flash|gemini-2\.0-flash-lite|gemini-1\.5-flash|gemini-1\.5-flash-8b|gemini-1\.5-pro/)) {
-            return 8_192;
-        }
-        if (id.match(/text-embedding-004|embedding-001/)) {
-            return 768;
-        }
-        if (id.match(/imagen-3/)) {
-            return 4;
-        }
-        return 4_096;
+        return ModelRegistry.getMaxOutputTokens(modelId, "gemini") ?? 4_096;
     }
     static supportsVision(modelId) {
-        const model = this.findModel(modelId);
-        if (model?.modalities?.input?.includes("image"))
-            return true;
-        const id = this.normalizeModelId(modelId);
-        if (id.match(/text-embedding|embedding-001|aqa/)) {
-            return false;
-        }
-        return !!id.match(/gemini|flash|pro|imagen/);
+        return ModelRegistry.supports(modelId, "vision", "gemini");
     }
     static supportsTools(modelId) {
-        const model = this.findModel(modelId);
-        if (model?.capabilities?.includes("function_calling"))
-            return true;
-        const id = this.normalizeModelId(modelId);
-        if (id.match(/text-embedding|embedding-001|aqa|flash-lite|imagen|gemini-2\.0-flash-lite/)) {
-            return false;
-        }
-        return !!id.match(/gemini|pro|flash/);
+        return (ModelRegistry.supports(modelId, "tools", "gemini") ||
+            ModelRegistry.supports(modelId, "function_calling", "gemini"));
     }
     static supportsStructuredOutput(modelId) {
-        const model = this.findModel(modelId);
-        if (model?.capabilities?.includes("structured_output"))
-            return true;
-        const id = this.normalizeModelId(modelId);
-        if (id.match(/text-embedding|embedding-001|aqa|imagen/)) {
-            return false;
-        }
-        return true;
+        return ModelRegistry.supports(modelId, "structured_output", "gemini");
     }
     static supportsSystemInstructions(_modelId) {
         return true;
     }
     static supportsJsonMode(modelId) {
-        return this.supportsStructuredOutput(modelId);
+        return (ModelRegistry.supports(modelId, "json_mode", "gemini") ||
+            this.supportsStructuredOutput(modelId));
     }
     static supportsEmbeddings(modelId) {
         const model = this.findModel(modelId);
-        if (model?.modalities?.output?.includes("embeddings"))
-            return true;
-        const id = this.normalizeModelId(modelId);
-        return !!id.match(/text-embedding|embedding|gemini-embedding/);
+        return model?.modalities?.output?.includes("embeddings") ?? modelId.includes("embedding");
     }
     static supportsImageGeneration(modelId) {
         const model = this.findModel(modelId);
-        if (model?.capabilities?.includes("image_generation") ||
-            model?.modalities?.output?.includes("image"))
-            return true;
-        const id = this.normalizeModelId(modelId);
-        return !!id.match(/imagen/);
+        return (model?.capabilities?.includes("image_generation") ||
+            model?.modalities?.output?.includes("image") ||
+            modelId.includes("imagen"));
     }
     static supportsTranscription(modelId) {
         const model = this.findModel(modelId);
-        if (model?.modalities?.input?.includes("audio"))
-            return true;
-        const id = this.normalizeModelId(modelId);
-        return !!id.match(/gemini|flash|pro/);
+        return (model?.modalities?.input?.includes("audio") ?? modelId.match(/gemini|flash|pro/) !== null);
     }
     static supportsModeration(_modelId) {
         return false;
     }
+    static supportsToolChoice(_modelId) {
+        return true;
+    }
     static normalizeTemperature(temperature, _model) {
         return temperature;
     }
     static getModalities(modelId) {
+        const model = this.findModel(modelId);
+        if (model?.modalities)
+            return model.modalities;
         const input = ["text"];
         const output = ["text"];
-        const id = this.normalizeModelId(modelId);
-        if (this.supportsVision(id))
+        if (this.supportsVision(modelId))
             input.push("image", "video", "audio", "pdf");
-        if (this.supportsImageGeneration(id))
+        if (this.supportsImageGeneration(modelId))
             output.push("image");
-        if (this.supportsEmbeddings(id))
+        if (this.supportsEmbeddings(modelId))
             output.push("embeddings");
         return { input, output };
     }
     static getCapabilities(modelId) {
+        const model = this.findModel(modelId);
+        if (model?.capabilities) {
+            const caps = [...model.capabilities];
+            if (!caps.includes("streaming"))
+                caps.push("streaming");
+            return caps;
+        }
         const caps = ["streaming"];
-        const id = this.normalizeModelId(modelId);
-        if (this.supportsTools(id))
+        if (this.supportsTools(modelId))
             caps.push("function_calling");
-        if (this.supportsStructuredOutput(id))
+        if (this.supportsStructuredOutput(modelId))
             caps.push("structured_output");
-        if (this.supportsEmbeddings(id))
+        if (this.supportsEmbeddings(modelId))
             caps.push("embeddings");
-        if (this.supportsImageGeneration(id))
+        if (this.supportsImageGeneration(modelId))
             caps.push("image_generation");
         return caps;
     }
     static getPricing(modelId) {
         return PricingRegistry.getPricing(modelId, "gemini");
     }
-    static normalizeModelId(modelId) {
-        return modelId.replace("models/", "");
-    }
     static findModel(modelId) {
         return ModelRegistry.find(modelId, "gemini");
     }

package/dist/providers/gemini/Chat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../../src/providers/gemini/Chat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAS3D,qBAAa,UAAU;IAEnB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM;IAG3B,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAmH1D,OAAO,CAAC,cAAc;CAwBvB"}
+{"version":3,"file":"Chat.d.ts","sourceRoot":"","sources":["../../../src/providers/gemini/Chat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAS3D,qBAAa,UAAU;IAEnB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM;IAG3B,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IA0J1D,OAAO,CAAC,cAAc;CAuBvB"}

package/dist/providers/gemini/Chat.js

@@ -28,7 +28,7 @@ export class GeminiChat {
                 generationConfig.responseSchema = this.sanitizeSchema(request.response_format.json_schema.schema);
             }
         }
-        const { model: _model, messages: _messages, tools: _tools, temperature: _temp, max_tokens: _max, response_format: _format, headers: _headers, requestTimeout, ...rest } = request;
+        const { model: _model, messages: _messages, tools: _tools, temperature: _temp, max_tokens: _max, response_format: _format, headers: _headers, tool_choice: _choice, parallel_tool_calls: _parallel, requestTimeout, ...rest } = request;
         const payload = {
             contents,
             generationConfig: {
@@ -50,6 +50,34 @@ export class GeminiChat {
                     }))
                 }
             ];
+            if (request.tool_choice) {
+                const modeMap = {
+                    auto: "AUTO",
+                    required: "ANY",
+                    none: "NONE"
+                };
+                const mode = modeMap[request.tool_choice];
+                if (mode) {
+                    payload.toolConfig = { functionCallingConfig: { mode } };
+                }
+                else if (typeof request.tool_choice === "string") {
+                    payload.toolConfig = {
+                        functionCallingConfig: {
+                            mode: "ANY",
+                            allowedFunctionNames: [request.tool_choice]
+                        }
+                    };
+                }
+                else if (typeof request.tool_choice === "object" &&
+                    "function" in request.tool_choice) {
+                    payload.toolConfig = {
+                        functionCallingConfig: {
+                            mode: "ANY",
+                            allowedFunctionNames: [request.tool_choice.function.name]
+                        }
+                    };
+                }
+            }
         }
         logger.logRequest("Gemini", "POST", url, payload);
         const response = await fetchWithTimeout(url, {
@@ -65,12 +93,13 @@ export class GeminiChat {
         const json = (await response.json());
         logger.logResponse("Gemini", response.status, response.statusText, json);
         const candidate = json.candidates?.[0];
-        const content = candidate?.content?.parts
-            ?.filter((p) => p.text)
+        const contentParts = candidate?.content?.parts || [];
+        const content = contentParts
+            .filter((p) => p.text)
             .map((p) => p.text)
             .join("\n") || null;
-        const tool_calls = candidate?.content?.parts
-            ?.filter((p) => p.functionCall)
+        const tool_calls = contentParts
+            .filter((p) => p.functionCall)
             .map((p) => ({
             id: p.functionCall.name,
             type: "function",
@@ -79,24 +108,30 @@ export class GeminiChat {
                 arguments: JSON.stringify(p.functionCall.args)
             }
         }));
+        const attachments = contentParts
+            .filter((p) => p.inlineData)
+            .map((p) => ({
+            mimeType: p.inlineData.mimeType,
+            data: p.inlineData.data
+        }));
         const usage = json.usageMetadata
             ? {
                 input_tokens: json.usageMetadata.promptTokenCount,
                 output_tokens: json.usageMetadata.candidatesTokenCount,
-                total_tokens: json.usageMetadata.totalTokenCount
+                total_tokens: json.usageMetadata.totalTokenCount,
+                cached_tokens: json.usageMetadata.cachedContentTokenCount
             }
             : undefined;
         const calculatedUsage = usage
             ? ModelRegistry.calculateCost(usage, request.model, "gemini")
             : undefined;
-        return { content, tool_calls, usage: calculatedUsage };
+        return { content, tool_calls, usage: calculatedUsage, attachments };
     }
     sanitizeSchema(schema) {
         if (typeof schema !== "object" || schema === null)
             return schema;
         const sanitized = { ...schema };
-        // Remove unsupported fields
-        delete sanitized.additionalProperties;
+        // Clean up internal metadata fields that Gemini definitely rejects
         delete sanitized.$schema;
         delete sanitized.$id;
         delete sanitized.definitions;

package/dist/providers/gemini/ChatUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChatUtils.d.ts","sourceRoot":"","sources":["../../../src/providers/gemini/ChatUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGvD,qBAAa,eAAe;WACb,eAAe,CAC1B,QAAQ,EAAE,OAAO,EAAE,GAClB,OAAO,CAAC;QAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;QAAC,sBAAsB,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;CAgFhF"}
+{"version":3,"file":"ChatUtils.d.ts","sourceRoot":"","sources":["../../../src/providers/gemini/ChatUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGvD,qBAAa,eAAe;WACb,eAAe,CAC1B,QAAQ,EAAE,OAAO,EAAE,GAClB,OAAO,CAAC;QAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;QAAC,sBAAsB,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;CAyFhF"}

package/dist/providers/gemini/ChatUtils.js

@@ -3,79 +3,89 @@ export class GeminiChatUtils {
     static async convertMessages(messages) {
         const contents = [];
         const systemInstructionParts = [];
-        for (const msg of messages) {
+        for (let i = 0; i < messages.length; i++) {
+            const msg = messages[i];
+            if (!msg)
+                continue;
             if (msg.role === "system" || msg.role === "developer") {
                 if (msg.content) {
                     systemInstructionParts.push({ text: String(msg.content) });
                 }
             }
-            else if (msg.role === "user" || msg.role === "assistant" || msg.role === "tool") {
+            else if (msg.role === "tool") {
                 const parts = [];
-                if (msg.role === "tool") {
+                let j = i;
+                while (j < messages.length) {
+                    const toolMsg = messages[j];
+                    if (!toolMsg || toolMsg.role !== "tool")
+                        break;
                     parts.push({
                         functionResponse: {
-                            name: msg.tool_call_id || "unknown",
-                            response: { result: msg.content }
+                            name: toolMsg.tool_call_id || "unknown",
+                            response: { result: toolMsg.content }
                         }
                     });
-                    contents.push({ role: "user", parts });
+                    j++;
                 }
-                else {
-                    const role = msg.role === "assistant" ? "model" : "user";
-                    if (msg.content && (typeof msg.content === "string" || msg.content instanceof String)) {
-                        parts.push({ text: String(msg.content) });
-                    }
-                    else if (Array.isArray(msg.content)) {
-                        for (const part of msg.content) {
-                            if (part.type === "text") {
-                                parts.push({ text: part.text });
-                            }
-                            else if (part.type === "image_url") {
-                                const binary = await BinaryUtils.toBase64(part.image_url.url);
-                                if (binary) {
-                                    parts.push({
-                                        inlineData: {
-                                            mimeType: binary.mimeType,
-                                            data: binary.data
-                                        }
-                                    });
-                                }
-                            }
-                            else if (part.type === "input_audio") {
+                contents.push({ role: "user", parts });
+                i = j - 1;
+            }
+            else if (msg.role === "user" || msg.role === "assistant") {
+                const parts = [];
+                const role = msg.role === "assistant" ? "model" : "user";
+                if (msg.content && (typeof msg.content === "string" || msg.content instanceof String)) {
+                    parts.push({ text: String(msg.content) });
+                }
+                else if (Array.isArray(msg.content)) {
+                    for (const part of msg.content) {
+                        if (part.type === "text") {
+                            parts.push({ text: part.text });
+                        }
+                        else if (part.type === "image_url") {
+                            const binary = await BinaryUtils.toBase64(part.image_url.url);
+                            if (binary) {
                                 parts.push({
                                     inlineData: {
-                                        mimeType: `audio/${part.input_audio.format}`,
-                                        data: part.input_audio.data
+                                        mimeType: binary.mimeType,
+                                        data: binary.data
                                     }
                                 });
                             }
-                            else if (part.type === "video_url") {
-                                const binary = await BinaryUtils.toBase64(part.video_url.url);
-                                if (binary) {
-                                    parts.push({
-                                        inlineData: {
-                                            mimeType: binary.mimeType,
-                                            data: binary.data
-                                        }
-                                    });
-                                }
-                            }
                         }
-                    }
-                    if (msg.role === "assistant" && msg.tool_calls) {
-                        for (const call of msg.tool_calls) {
+                        else if (part.type === "input_audio") {
                             parts.push({
-                                functionCall: {
-                                    name: call.function.name,
-                                    args: JSON.parse(call.function.arguments)
+                                inlineData: {
+                                    mimeType: `audio/${part.input_audio.format}`,
+                                    data: part.input_audio.data
                                 }
                             });
                         }
+                        else if (part.type === "video_url") {
+                            const binary = await BinaryUtils.toBase64(part.video_url.url);
+                            if (binary) {
+                                parts.push({
+                                    inlineData: {
+                                        mimeType: binary.mimeType,
+                                        data: binary.data
+                                    }
+                                });
+                            }
+                        }
                     }
-                    if (parts.length > 0) {
-                        contents.push({ role, parts });
+                }
+                if (msg.role === "assistant" && msg.tool_calls) {
+                    for (const call of msg.tool_calls) {
+                        parts.push({
+                            functionCall: {
+                                name: call.function.name,
+                                args: JSON.parse(call.function.arguments)
+                            }
+                        });
                     }
                 }
+                if (parts.length > 0) {
+                    contents.push({ role, parts });
+                }
             }
         }
         return { contents, systemInstructionParts };

package/dist/providers/gemini/GeminiProvider.js

@@ -51,7 +51,7 @@ export class GeminiProvider extends BaseProvider {
         return "Gemini";
     }
     defaultModel(_feature) {
-        return "gemini-2.0-flash-exp";
+        return "gemini-1.5-flash";
     }
     async chat(request) {
         return this.chatHandler.execute(request);

package/dist/providers/gemini/Image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../../src/providers/gemini/Image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI7D,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM;IAG3B,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;CAmD7D"}
+{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["../../../src/providers/gemini/Image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAK7D,qBAAa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM;IAG3B,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;CAiE7D"}

package/dist/providers/gemini/Image.js

@@ -1,5 +1,6 @@
 import { handleGeminiError } from "./Errors.js";
 import { logger } from "../../utils/logger.js";
+import { BinaryUtils } from "../../utils/Binary.js";
 export class GeminiImage {
     baseUrl;
     apiKey;
@@ -13,12 +14,23 @@ export class GeminiImage {
         if (request.size) {
             logger.warn(`[Gemini] Ignoring size ${request.size}. Gemini does not support image size customization.`);
         }
+        const instance = {
+            prompt: request.prompt
+        };
+        if (request.images && request.images.length > 0) {
+            // For Imagen, typically the first image is the source image
+            const binary = await BinaryUtils.toBase64(request.images[0]);
+            if (binary) {
+                instance.image = {
+                    bytesBase64Encoded: binary.data,
+                    mimeType: binary.mimeType
+                };
+            }
+            // If more attachments exist, they could be style references
+            // Currently, we'll just handle the first one as primary.
+        }
         const body = {
-            instances: [
-                {
-                    prompt: request.prompt
-                }
-            ],
+            instances: [instance],
             parameters: {
                 sampleCount: 1
             }

package/dist/providers/gemini/Streaming.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Streaming.d.ts","sourceRoot":"","sources":["../../../src/providers/gemini/Streaming.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AASxD,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM;IAG1B,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,eAAe,GAAG,cAAc,CAAC,SAAS,CAAC;IA+K7F,OAAO,CAAC,cAAc;CAyBvB"}
+{"version":3,"file":"Streaming.d.ts","sourceRoot":"","sources":["../../../src/providers/gemini/Streaming.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAUxD,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM;IAG1B,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,eAAe,GAAG,cAAc,CAAC,SAAS,CAAC;IAyN7F,OAAO,CAAC,cAAc;CAyBvB"}

package/dist/providers/gemini/Streaming.js

@@ -1,6 +1,7 @@
 import { Capabilities } from "./Capabilities.js";
 import { handleGeminiError } from "./Errors.js";
 import { GeminiChatUtils } from "./ChatUtils.js";
+import { ModelRegistry } from "../../models/ModelRegistry.js";
 import { logger } from "../../utils/logger.js";
 import { fetchWithTimeout } from "../../utils/fetch.js";
 export class GeminiStreaming {
@@ -45,7 +46,7 @@ export class GeminiStreaming {
         if (systemInstructionParts.length > 0) {
             payload.systemInstruction = { parts: systemInstructionParts };
         }
-        if (request.tools && request.tools.length > 0) {
+        if (request.tools && request.tools.length > 0 && request.tool_choice !== "none") {
             payload.tools = [
                 {
                     functionDeclarations: request.tools.map((t) => ({
@@ -55,6 +56,34 @@ export class GeminiStreaming {
                     }))
                 }
             ];
+            if (request.tool_choice) {
+                const modeMap = {
+                    auto: "AUTO",
+                    required: "ANY",
+                    none: "NONE"
+                };
+                const mode = modeMap[request.tool_choice];
+                if (mode) {
+                    payload.toolConfig = { functionCallingConfig: { mode } };
+                }
+                else if (typeof request.tool_choice === "string") {
+                    payload.toolConfig = {
+                        functionCallingConfig: {
+                            mode: "ANY",
+                            allowedFunctionNames: [request.tool_choice]
+                        }
+                    };
+                }
+                else if (typeof request.tool_choice === "object" &&
+                    "function" in request.tool_choice) {
+                    payload.toolConfig = {
+                        functionCallingConfig: {
+                            mode: "ANY",
+                            allowedFunctionNames: [request.tool_choice.function.name]
+                        }
+                    };
+                }
+            }
         }
         let done = false;
         const toolCalls = [];
@@ -127,6 +156,17 @@ export class GeminiStreaming {
                                     });
                                 }
                             }
+                            // Capture usage metadata (usually in the last chunk)
+                            if (json.usageMetadata) {
+                                const usage = {
+                                    input_tokens: json.usageMetadata.promptTokenCount,
+                                    output_tokens: json.usageMetadata.candidatesTokenCount,
+                                    total_tokens: json.usageMetadata.totalTokenCount,
+                                    cached_tokens: json.usageMetadata.cachedContentTokenCount
+                                };
+                                const calculatedUsage = ModelRegistry.calculateCost(usage, request.model, "gemini");
+                                yield { content: "", usage: calculatedUsage, done: true };
+                            }
                         }
                         catch {
                             // Ignore parse errors

package/dist/providers/gemini/types.d.ts

@@ -61,6 +61,7 @@ export interface GeminiGenerateContentResponse {
         promptTokenCount: number;
         candidatesTokenCount: number;
         totalTokenCount: number;
+        cachedContentTokenCount?: number;
     };
     modelVersion?: string;
 }

package/dist/providers/gemini/types.d.ts.map

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

package/dist/providers/mistral/Capabilities.d.ts

@@ -11,6 +11,7 @@ export declare class MistralCapabilities {
     static supportsTranscription(modelId: string): boolean;
     static supportsModeration(modelId: string): boolean;
     static supportsReasoning(modelId: string): boolean;
+    static supportsToolChoice(_modelId: string): boolean;
     static findModel(modelId: string): import("../../models/types.js").Model | undefined;
     static getPricing(modelId: string): ModelPricing | undefined;
     static getInputModalities(modelId: string): string[];

package/dist/providers/mistral/Capabilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Capabilities.d.ts","sourceRoot":"","sources":["../../../src/providers/mistral/Capabilities.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,mBAAmB;IAC9B,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBjD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAcvD,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAQzD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAQ/C,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAS9C,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAQzD,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAOnD,MAAM,CAAC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIzD,MAAM,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAQtD,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAOnD,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAQlD,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM;IAIhC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAO5D,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE;IASpD,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE;CAOtD"}
+{"version":3,"file":"Capabilities.d.ts","sourceRoot":"","sources":["../../../src/providers/mistral/Capabilities.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,mBAAmB;IAC9B,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE;IAiBjD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIvD,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAIzD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAI/C,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAQ9C,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAQzD,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAKnD,MAAM,CAAC,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIzD,MAAM,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAMtD,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAMnD,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIlD,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIpD,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM;IAIhC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAI5D,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE;IASpD,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE;CAOtD"}