@crewai-ts/core 0.1.3 → 0.1.6

package/dist/agent.d.ts

@@ -427,6 +427,7 @@ export declare class Agent {
     private callAndTrackLLM;
     private messagesWithInputFilesForClient;
     private clientSupportsMultimodal;
+    private clientSupportsFunctionCalling;
     private modelNameForClient;
     private applyGuardrail;
     private emitStep;

package/dist/index.cjs

@@ -44139,8 +44139,13 @@ Result: ${output4}`, {
     const beforeUsage = getLLMUsageMetrics(llmClient);
     const model = this.modelNameForClient(llmClient);
     const responseModel = responseModelFromOptions(options);
+    const nativeToolOptions = tools.length > 0 && this.clientSupportsFunctionCalling(llmClient) ? (() => {
+      const [, availableFunctions] = setupNativeTools(tools);
+      return { availableFunctions, available_functions: availableFunctions };
+    })() : {};
     const result = await callLLM(llmClient, messagesForCall, {
       tools,
+      ...nativeToolOptions,
       ...responseModel === void 0 ? {} : { responseModel },
       metadata: {
         agent: this,
@@ -44173,6 +44178,13 @@ Result: ${output4}`, {
     }
     return typeof candidate.supports_multimodal === "function" && candidate.supports_multimodal();
   }
+  clientSupportsFunctionCalling(llmClient) {
+    const candidate = llmClient;
+    if (typeof candidate.supportsFunctionCalling === "function" && candidate.supportsFunctionCalling()) {
+      return true;
+    }
+    return typeof candidate.supports_function_calling === "function" && candidate.supports_function_calling();
+  }
   modelNameForClient(llmClient) {
     if (llmClient === this.llmClient && typeof this.llm === "string") {
       return this.llm;
@@ -46193,6 +46205,7 @@ function readStringNumberBooleanRecord(value) {
 
 // src/provider-completions.ts
 init_cjs_shims();
+init_string_utils();
 var TOOL_SEARCH_TOOL_TYPES = Object.freeze([
   "tool_search_tool_regex_20251119",
   "tool_search_tool_bm25_20251119"
@@ -47347,33 +47360,37 @@ var GeminiCompletion = class _GeminiCompletion extends ConfiguredLLM {
     delete generationConfigBody.safety_settings;
     const model = this.model.replace(/^(?:gemini|google)\//, "");
     const baseUrl = this.baseUrl ?? "https://generativelanguage.googleapis.com/v1beta";
-    const requestInit = {
+    const buildRequestInit = (currentContents) => ({
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
-        contents,
+        contents: currentContents,
         ...Object.keys(generationConfigBody).length > 0 ? { generationConfig: generationConfigBody } : {},
         ..."system_instruction" in requestBody ? { system_instruction: requestBody.system_instruction } : {},
         ..."tools" in requestBody ? { tools: requestBody.tools } : {},
         ..."safety_settings" in requestBody ? { safety_settings: requestBody.safety_settings } : {}
-      })
-    };
-    if (options?.signal) {
-      requestInit.signal = options.signal;
-    }
-    return fetch(
-      `${baseUrl.replace(/\/$/, "")}/models/${encodeURIComponent(model)}:generateContent?key=${encodeURIComponent(apiKey)}`,
-      requestInit
-    ).then(async (response) => {
+      }),
+      ...options?.signal ? { signal: options.signal } : {}
+    });
+    const generateContent = async (currentContents) => {
+      const response = await fetch(
+        `${baseUrl.replace(/\/$/, "")}/models/${encodeURIComponent(model)}:generateContent?key=${encodeURIComponent(apiKey)}`,
+        buildRequestInit(currentContents)
+      );
       const body = await response.json();
       if (!response.ok) {
         const error = readObject2(readObject2(body).error);
         throw new Error(scalarToString(error.message) ?? `Gemini request failed with HTTP ${response.status.toString()}.`);
       }
+      return body;
+    };
+    return generateContent(contents).then(async (body) => {
       return await this.processResponseWithTools(
         body,
         contents,
-        options?.availableFunctions ?? options?.available_functions ?? null
+        options?.availableFunctions ?? options?.available_functions ?? null,
+        generateContent,
+        geminiMaxToolRounds(options)
       );
     });
   }
@@ -47673,42 +47690,69 @@ ${textContent}` : textContent;
   static extract_structured_output_from_response(response) {
     return _GeminiCompletion.extractStructuredOutputFromResponse(response);
   }
-  async processResponseWithTools(response, contents = [], availableFunctions = null) {
-    void contents;
-    const candidates = readObject2(response).candidates;
-    if (!Array.isArray(candidates)) {
-      return _GeminiCompletion.extractTextFromResponse(response);
-    }
-    const first = readObject2(candidates[0]);
-    const rawParts = Array.isArray(readObject2(first.content).parts) ? readObject2(first.content).parts : [];
-    const functionCallParts = rawParts.filter((part) => Object.keys(readObject2(readObject2(part).functionCall ?? readObject2(part).function_call)).length > 0);
-    const nonStructuredParts = functionCallParts.filter((part) => {
-      const partRecord = readObject2(part);
-      const functionCall = readObject2(partRecord.functionCall ?? partRecord.function_call);
-      return (scalarToString(functionCall.name) ?? "") !== STRUCTURED_OUTPUT_TOOL_NAME;
-    });
-    if (nonStructuredParts.length > 0 && !availableFunctions) {
-      return nonStructuredParts;
-    }
-    if (nonStructuredParts.length > 0 && availableFunctions) {
+  async processResponseWithTools(response, contents = [], availableFunctions = null, generateContent = null, maxToolRounds = DEFAULT_GEMINI_MAX_TOOL_ROUNDS) {
+    let currentResponse = response;
+    let currentContents = [...contents];
+    for (let round = 0; round <= maxToolRounds; round += 1) {
+      const candidates = readObject2(currentResponse).candidates;
+      if (!Array.isArray(candidates)) {
+        return _GeminiCompletion.extractTextFromResponse(currentResponse);
+      }
+      const first = readObject2(candidates[0]);
+      const rawParts = Array.isArray(readObject2(first.content).parts) ? readObject2(first.content).parts : [];
+      const functionCallParts = rawParts.filter((part) => Object.keys(readObject2(readObject2(part).functionCall ?? readObject2(part).function_call)).length > 0);
+      const structuredOutput = _GeminiCompletion.extractStructuredOutputFromResponse(currentResponse);
+      const nonStructuredParts = functionCallParts.filter((part) => {
+        const partRecord = readObject2(part);
+        const functionCall = readObject2(partRecord.functionCall ?? partRecord.function_call);
+        return (scalarToString(functionCall.name) ?? "") !== STRUCTURED_OUTPUT_TOOL_NAME;
+      });
+      if (nonStructuredParts.length === 0) {
+        return structuredOutput ?? _GeminiCompletion.extractTextFromResponse(currentResponse);
+      }
+      if (!availableFunctions) {
+        return nonStructuredParts;
+      }
+      if (round >= maxToolRounds) {
+        throw new Error(`Gemini tool loop exceeded max tool rounds (${String(maxToolRounds)}).`);
+      }
+      const functionResponseParts = [];
+      let firstToolResult = null;
       for (const part of nonStructuredParts) {
         const partRecord = readObject2(part);
         const functionCall = readObject2(partRecord.functionCall ?? partRecord.function_call);
-        const functionName = scalarToString(functionCall.name);
+        const rawFunctionName = scalarToString(functionCall.name) ?? "";
+        const functionName = resolveGeminiFunctionName(rawFunctionName, availableFunctions);
         if (!functionName) {
-          continue;
+          throw new Error(`Gemini requested unknown function '${rawFunctionName}'.`);
         }
         const result = await this.handleToolExecution({
           functionName,
           functionArgs: readObject2(functionCall.args),
           availableFunctions
         });
-        if (result !== null) {
-          return result;
+        if (result === null) {
+          throw new Error(`Gemini failed to execute function '${rawFunctionName}'.`);
         }
+        firstToolResult ??= result;
+        functionResponseParts.push({
+          functionResponse: {
+            name: rawFunctionName,
+            response: { result }
+          }
+        });
       }
+      if (!generateContent) {
+        return firstToolResult;
+      }
+      currentContents = [
+        ...currentContents,
+        { role: "model", parts: rawParts },
+        { role: "user", parts: functionResponseParts }
+      ];
+      currentResponse = await generateContent(currentContents);
     }
-    return _GeminiCompletion.extractTextFromResponse(response);
+    throw new Error(`Gemini tool loop exceeded max tool rounds (${String(maxToolRounds)}).`);
   }
   async _process_response_with_tools(response, contents = [], availableFunctions = null) {
     return await this.processResponseWithTools(response, contents, availableFunctions);
@@ -48797,6 +48841,19 @@ function geminiVersion(model) {
   const match = /gemini-(\d+(?:\.\d+)?)/iu.exec(model.toLowerCase());
   return match ? Number.parseFloat(match[1] ?? "0") : 0;
 }
+var DEFAULT_GEMINI_MAX_TOOL_ROUNDS = 8;
+function geminiMaxToolRounds(options) {
+  const record = readObject2(options);
+  const configured = record.maxToolRounds ?? record.max_tool_rounds;
+  return typeof configured === "number" && Number.isInteger(configured) && configured > 0 ? configured : DEFAULT_GEMINI_MAX_TOOL_ROUNDS;
+}
+function resolveGeminiFunctionName(functionName, availableFunctions) {
+  if (functionName in availableFunctions) {
+    return functionName;
+  }
+  const sanitizedName = sanitizeToolName(functionName);
+  return sanitizedName in availableFunctions ? sanitizedName : null;
+}
 function geminiTextParts(content) {
   if (Array.isArray(content)) {
     return content.map((item) => {
@@ -52088,9 +52145,11 @@ ${todo.description}`);
     if (this.tools.length === 0) {
       return Object.keys(options).length > 0 ? options : void 0;
     }
-    const [tools] = setupNativeTools(this.tools);
+    const [tools, availableFunctions] = setupNativeTools(this.tools);
     if (tools.length > 0) {
       options.tools = tools;
+      options.availableFunctions = availableFunctions;
+      options.available_functions = availableFunctions;
     }
     return Object.keys(options).length > 0 ? options : void 0;
   }

package/dist/index.js

@@ -27809,8 +27809,13 @@ Result: ${output4}`, {
     const beforeUsage = getLLMUsageMetrics(llmClient);
     const model = this.modelNameForClient(llmClient);
     const responseModel = responseModelFromOptions(options);
+    const nativeToolOptions = tools.length > 0 && this.clientSupportsFunctionCalling(llmClient) ? (() => {
+      const [, availableFunctions] = setupNativeTools(tools);
+      return { availableFunctions, available_functions: availableFunctions };
+    })() : {};
     const result = await callLLM(llmClient, messagesForCall, {
       tools,
+      ...nativeToolOptions,
       ...responseModel === void 0 ? {} : { responseModel },
       metadata: {
         agent: this,
@@ -27843,6 +27848,13 @@ Result: ${output4}`, {
     }
     return typeof candidate.supports_multimodal === "function" && candidate.supports_multimodal();
   }
+  clientSupportsFunctionCalling(llmClient) {
+    const candidate = llmClient;
+    if (typeof candidate.supportsFunctionCalling === "function" && candidate.supportsFunctionCalling()) {
+      return true;
+    }
+    return typeof candidate.supports_function_calling === "function" && candidate.supports_function_calling();
+  }
   modelNameForClient(llmClient) {
     if (llmClient === this.llmClient && typeof this.llm === "string") {
       return this.llm;
@@ -31009,33 +31021,37 @@ var GeminiCompletion = class _GeminiCompletion extends ConfiguredLLM {
     delete generationConfigBody.safety_settings;
     const model = this.model.replace(/^(?:gemini|google)\//, "");
     const baseUrl = this.baseUrl ?? "https://generativelanguage.googleapis.com/v1beta";
-    const requestInit = {
+    const buildRequestInit = (currentContents) => ({
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
-        contents,
+        contents: currentContents,
         ...Object.keys(generationConfigBody).length > 0 ? { generationConfig: generationConfigBody } : {},
         ..."system_instruction" in requestBody ? { system_instruction: requestBody.system_instruction } : {},
         ..."tools" in requestBody ? { tools: requestBody.tools } : {},
         ..."safety_settings" in requestBody ? { safety_settings: requestBody.safety_settings } : {}
-      })
-    };
-    if (options?.signal) {
-      requestInit.signal = options.signal;
-    }
-    return fetch(
-      `${baseUrl.replace(/\/$/, "")}/models/${encodeURIComponent(model)}:generateContent?key=${encodeURIComponent(apiKey)}`,
-      requestInit
-    ).then(async (response) => {
+      }),
+      ...options?.signal ? { signal: options.signal } : {}
+    });
+    const generateContent = async (currentContents) => {
+      const response = await fetch(
+        `${baseUrl.replace(/\/$/, "")}/models/${encodeURIComponent(model)}:generateContent?key=${encodeURIComponent(apiKey)}`,
+        buildRequestInit(currentContents)
+      );
       const body = await response.json();
       if (!response.ok) {
         const error = readObject2(readObject2(body).error);
         throw new Error(scalarToString(error.message) ?? `Gemini request failed with HTTP ${response.status.toString()}.`);
       }
+      return body;
+    };
+    return generateContent(contents).then(async (body) => {
       return await this.processResponseWithTools(
         body,
         contents,
-        options?.availableFunctions ?? options?.available_functions ?? null
+        options?.availableFunctions ?? options?.available_functions ?? null,
+        generateContent,
+        geminiMaxToolRounds(options)
       );
     });
   }
@@ -31335,42 +31351,69 @@ ${textContent}` : textContent;
   static extract_structured_output_from_response(response) {
     return _GeminiCompletion.extractStructuredOutputFromResponse(response);
   }
-  async processResponseWithTools(response, contents = [], availableFunctions = null) {
-    void contents;
-    const candidates = readObject2(response).candidates;
-    if (!Array.isArray(candidates)) {
-      return _GeminiCompletion.extractTextFromResponse(response);
-    }
-    const first = readObject2(candidates[0]);
-    const rawParts = Array.isArray(readObject2(first.content).parts) ? readObject2(first.content).parts : [];
-    const functionCallParts = rawParts.filter((part) => Object.keys(readObject2(readObject2(part).functionCall ?? readObject2(part).function_call)).length > 0);
-    const nonStructuredParts = functionCallParts.filter((part) => {
-      const partRecord = readObject2(part);
-      const functionCall = readObject2(partRecord.functionCall ?? partRecord.function_call);
-      return (scalarToString(functionCall.name) ?? "") !== STRUCTURED_OUTPUT_TOOL_NAME;
-    });
-    if (nonStructuredParts.length > 0 && !availableFunctions) {
-      return nonStructuredParts;
-    }
-    if (nonStructuredParts.length > 0 && availableFunctions) {
+  async processResponseWithTools(response, contents = [], availableFunctions = null, generateContent = null, maxToolRounds = DEFAULT_GEMINI_MAX_TOOL_ROUNDS) {
+    let currentResponse = response;
+    let currentContents = [...contents];
+    for (let round = 0; round <= maxToolRounds; round += 1) {
+      const candidates = readObject2(currentResponse).candidates;
+      if (!Array.isArray(candidates)) {
+        return _GeminiCompletion.extractTextFromResponse(currentResponse);
+      }
+      const first = readObject2(candidates[0]);
+      const rawParts = Array.isArray(readObject2(first.content).parts) ? readObject2(first.content).parts : [];
+      const functionCallParts = rawParts.filter((part) => Object.keys(readObject2(readObject2(part).functionCall ?? readObject2(part).function_call)).length > 0);
+      const structuredOutput = _GeminiCompletion.extractStructuredOutputFromResponse(currentResponse);
+      const nonStructuredParts = functionCallParts.filter((part) => {
+        const partRecord = readObject2(part);
+        const functionCall = readObject2(partRecord.functionCall ?? partRecord.function_call);
+        return (scalarToString(functionCall.name) ?? "") !== STRUCTURED_OUTPUT_TOOL_NAME;
+      });
+      if (nonStructuredParts.length === 0) {
+        return structuredOutput ?? _GeminiCompletion.extractTextFromResponse(currentResponse);
+      }
+      if (!availableFunctions) {
+        return nonStructuredParts;
+      }
+      if (round >= maxToolRounds) {
+        throw new Error(`Gemini tool loop exceeded max tool rounds (${String(maxToolRounds)}).`);
+      }
+      const functionResponseParts = [];
+      let firstToolResult = null;
       for (const part of nonStructuredParts) {
         const partRecord = readObject2(part);
         const functionCall = readObject2(partRecord.functionCall ?? partRecord.function_call);
-        const functionName = scalarToString(functionCall.name);
+        const rawFunctionName = scalarToString(functionCall.name) ?? "";
+        const functionName = resolveGeminiFunctionName(rawFunctionName, availableFunctions);
         if (!functionName) {
-          continue;
+          throw new Error(`Gemini requested unknown function '${rawFunctionName}'.`);
         }
         const result = await this.handleToolExecution({
           functionName,
           functionArgs: readObject2(functionCall.args),
           availableFunctions
         });
-        if (result !== null) {
-          return result;
+        if (result === null) {
+          throw new Error(`Gemini failed to execute function '${rawFunctionName}'.`);
         }
+        firstToolResult ??= result;
+        functionResponseParts.push({
+          functionResponse: {
+            name: rawFunctionName,
+            response: { result }
+          }
+        });
       }
+      if (!generateContent) {
+        return firstToolResult;
+      }
+      currentContents = [
+        ...currentContents,
+        { role: "model", parts: rawParts },
+        { role: "user", parts: functionResponseParts }
+      ];
+      currentResponse = await generateContent(currentContents);
     }
-    return _GeminiCompletion.extractTextFromResponse(response);
+    throw new Error(`Gemini tool loop exceeded max tool rounds (${String(maxToolRounds)}).`);
   }
   async _process_response_with_tools(response, contents = [], availableFunctions = null) {
     return await this.processResponseWithTools(response, contents, availableFunctions);
@@ -32459,6 +32502,19 @@ function geminiVersion(model) {
   const match = /gemini-(\d+(?:\.\d+)?)/iu.exec(model.toLowerCase());
   return match ? Number.parseFloat(match[1] ?? "0") : 0;
 }
+var DEFAULT_GEMINI_MAX_TOOL_ROUNDS = 8;
+function geminiMaxToolRounds(options) {
+  const record = readObject2(options);
+  const configured = record.maxToolRounds ?? record.max_tool_rounds;
+  return typeof configured === "number" && Number.isInteger(configured) && configured > 0 ? configured : DEFAULT_GEMINI_MAX_TOOL_ROUNDS;
+}
+function resolveGeminiFunctionName(functionName, availableFunctions) {
+  if (functionName in availableFunctions) {
+    return functionName;
+  }
+  const sanitizedName = sanitizeToolName(functionName);
+  return sanitizedName in availableFunctions ? sanitizedName : null;
+}
 function geminiTextParts(content) {
   if (Array.isArray(content)) {
     return content.map((item) => {
@@ -35736,9 +35792,11 @@ ${todo.description}`);
     if (this.tools.length === 0) {
       return Object.keys(options).length > 0 ? options : void 0;
     }
-    const [tools] = setupNativeTools(this.tools);
+    const [tools, availableFunctions] = setupNativeTools(this.tools);
     if (tools.length > 0) {
       options.tools = tools;
+      options.availableFunctions = availableFunctions;
+      options.available_functions = availableFunctions;
     }
     return Object.keys(options).length > 0 ? options : void 0;
   }

package/dist/provider-completions.d.ts

@@ -358,7 +358,7 @@ export declare class GeminiCompletion extends ConfiguredLLM {
     static extract_function_calls_from_response(response: unknown): Record<string, unknown>[];
     static extractStructuredOutputFromResponse(response: unknown): Record<string, unknown> | null;
     static extract_structured_output_from_response(response: unknown): Record<string, unknown> | null;
-    processResponseWithTools(response: unknown, contents?: readonly unknown[], availableFunctions?: Record<string, LLMAvailableFunction> | null): Promise<unknown>;
+    processResponseWithTools(response: unknown, contents?: readonly unknown[], availableFunctions?: Record<string, LLMAvailableFunction> | null, generateContent?: ((contents: readonly unknown[]) => Promise<unknown>) | null, maxToolRounds?: number): Promise<unknown>;
     _process_response_with_tools(response: unknown, contents?: readonly unknown[], availableFunctions?: Record<string, LLMAvailableFunction> | null): Promise<unknown>;
     static addPropertyOrdering<T extends Record<string, unknown>>(schema: T): T;
     static add_property_ordering<T extends Record<string, unknown>>(schema: T): T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crewai-ts/core",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "description": "Unofficial TypeScript port of CrewAI (not affiliated with crewAI, Inc.).",
   "keywords": [
     "crewai",