@office-ai/aioncli-core 0.1.20 → 0.2.2

package/dist/src/core/nonInteractiveToolExecutor.js

@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { logToolCall, ToolErrorType, } from '../index.js';
+import { DiscoveredMCPTool } from '../tools/mcp-tool.js';
 import { convertToFunctionResponse } from './coreToolScheduler.js';
 import { ToolCallDecision } from '../telemetry/tool-call-decision.js';
 /**
  * Executes a single tool call non-interactively.
  * It does not handle confirmations, multiple calls, or live updates.
  */
-export async function executeToolCall(config, toolCallRequest, toolRegistry, abortSignal) {
-    const tool = toolRegistry.getTool(toolCallRequest.name);
+export async function executeToolCall(config, toolCallRequest, abortSignal) {
+    const tool = config.getToolRegistry().getTool(toolCallRequest.name);
     const startTime = Date.now();
     if (!tool) {
         const error = new Error(`Tool "${toolCallRequest.name}" not found in registry.`);
@@ -25,6 +26,7 @@ export async function executeToolCall(config, toolCallRequest, toolRegistry, abo
             success: false,
             error: error.message,
             prompt_id: toolCallRequest.prompt_id,
+            tool_type: 'native',
         });
         // Ensure the response structure matches what the API expects for an error
         return {
@@ -46,7 +48,7 @@ export async function executeToolCall(config, toolCallRequest, toolRegistry, abo
     try {
         // Directly execute without confirmation or live output handling
         const effectiveAbortSignal = abortSignal ?? new AbortController().signal;
-        const toolResult = await tool.buildAndExecute(toolCallRequest.args, effectiveAbortSignal);
+        const toolResult = await tool.validateBuildAndExecute(toolCallRequest.args, effectiveAbortSignal);
         const tool_output = toolResult.llmContent;
         const tool_display = toolResult.returnDisplay;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -78,6 +80,9 @@ export async function executeToolCall(config, toolCallRequest, toolRegistry, abo
             prompt_id: toolCallRequest.prompt_id,
             metadata,
             decision: ToolCallDecision.AUTO_ACCEPT,
+            tool_type: typeof tool !== 'undefined' && tool instanceof DiscoveredMCPTool
+                ? 'mcp'
+                : 'native',
         });
         const response = convertToFunctionResponse(toolCallRequest.name, toolCallRequest.callId, tool_output);
         return {
@@ -103,6 +108,9 @@ export async function executeToolCall(config, toolCallRequest, toolRegistry, abo
             error: error.message,
             error_type: ToolErrorType.UNHANDLED_EXCEPTION,
             prompt_id: toolCallRequest.prompt_id,
+            tool_type: typeof tool !== 'undefined' && tool instanceof DiscoveredMCPTool
+                ? 'mcp'
+                : 'native',
         });
         return {
             callId: toolCallRequest.callId,

package/dist/src/core/nonInteractiveToolExecutor.js.map

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

package/dist/src/core/nonInteractiveToolExecutor.test.js

@@ -5,22 +5,29 @@
  */
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { executeToolCall } from './nonInteractiveToolExecutor.js';
+import { ToolErrorType, } from '../index.js';
 import { MockTool } from '../test-utils/tools.js';
-const mockConfig = {
-    getSessionId: () => 'test-session-id',
-    getUsageStatisticsEnabled: () => true,
-    getDebugMode: () => false,
-};
 describe('executeToolCall', () => {
     let mockToolRegistry;
     let mockTool;
     let abortController;
+    let mockConfig;
     beforeEach(() => {
         mockTool = new MockTool();
         mockToolRegistry = {
             getTool: vi.fn(),
             // Add other ToolRegistry methods if needed, or use a more complete mock
         };
+        mockConfig = {
+            getSessionId: () => 'test-session-id',
+            getUsageStatisticsEnabled: () => true,
+            getDebugMode: () => false,
+            getContentGeneratorConfig: () => ({
+                model: 'test-model',
+                authType: 'oauth-personal',
+            }),
+            getToolRegistry: () => mockToolRegistry,
+        };
         abortController = new AbortController();
     });
     it('should execute a tool successfully', async () => {
@@ -36,10 +43,10 @@ describe('executeToolCall', () => {
             returnDisplay: 'Success!',
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-        vi.spyOn(mockTool, 'buildAndExecute').mockResolvedValue(toolResult);
-        const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
+        vi.spyOn(mockTool, 'validateBuildAndExecute').mockResolvedValue(toolResult);
+        const response = await executeToolCall(mockConfig, request, abortController.signal);
         expect(mockToolRegistry.getTool).toHaveBeenCalledWith('testTool');
-        expect(mockTool.buildAndExecute).toHaveBeenCalledWith(request.args, abortController.signal);
+        expect(mockTool.validateBuildAndExecute).toHaveBeenCalledWith(request.args, abortController.signal);
         expect(response.callId).toBe('call1');
         expect(response.error).toBeUndefined();
         expect(response.resultDisplay).toBe('Success!');
@@ -60,7 +67,7 @@ describe('executeToolCall', () => {
             prompt_id: 'prompt-id-2',
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(undefined);
-        const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
+        const response = await executeToolCall(mockConfig, request, abortController.signal);
         expect(response.callId).toBe('call2');
         expect(response.error).toBeInstanceOf(Error);
         expect(response.error?.message).toBe('Tool "nonexistentTool" not found in registry.');
@@ -75,32 +82,42 @@ describe('executeToolCall', () => {
             },
         ]);
     });
-    it('should return an error if tool execution fails', async () => {
+    it('should return an error if tool validation fails', async () => {
         const request = {
             callId: 'call3',
             name: 'testTool',
-            args: { param1: 'value1' },
+            args: { param1: 'invalid' },
             isClientInitiated: false,
             prompt_id: 'prompt-id-3',
         };
-        const executionError = new Error('Tool execution failed');
+        const validationErrorResult = {
+            llmContent: 'Error: Invalid parameters',
+            returnDisplay: 'Invalid parameters',
+            error: {
+                message: 'Invalid parameters',
+                type: ToolErrorType.INVALID_TOOL_PARAMS,
+            },
+        };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-        vi.spyOn(mockTool, 'buildAndExecute').mockRejectedValue(executionError);
-        const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
-        expect(response.callId).toBe('call3');
-        expect(response.error).toBe(executionError);
-        expect(response.resultDisplay).toBe('Tool execution failed');
-        expect(response.responseParts).toEqual([
-            {
+        vi.spyOn(mockTool, 'validateBuildAndExecute').mockResolvedValue(validationErrorResult);
+        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        expect(response).toStrictEqual({
+            callId: 'call3',
+            error: new Error('Invalid parameters'),
+            errorType: ToolErrorType.INVALID_TOOL_PARAMS,
+            responseParts: {
                 functionResponse: {
-                    name: 'testTool',
                     id: 'call3',
-                    response: { error: 'Tool execution failed' },
+                    name: 'testTool',
+                    response: {
+                        output: 'Error: Invalid parameters',
+                    },
                 },
             },
-        ]);
+            resultDisplay: 'Invalid parameters',
+        });
     });
-    it('should handle cancellation during tool execution', async () => {
+    it('should return an error if tool execution fails', async () => {
         const request = {
             callId: 'call4',
             name: 'testTool',
@@ -108,35 +125,67 @@ describe('executeToolCall', () => {
             isClientInitiated: false,
             prompt_id: 'prompt-id-4',
         };
-        const cancellationError = new Error('Operation cancelled');
+        const executionErrorResult = {
+            llmContent: 'Error: Execution failed',
+            returnDisplay: 'Execution failed',
+            error: {
+                message: 'Execution failed',
+                type: ToolErrorType.EXECUTION_FAILED,
+            },
+        };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-        vi.spyOn(mockTool, 'buildAndExecute').mockImplementation(async (_args, signal) => {
-            if (signal?.aborted) {
-                return Promise.reject(cancellationError);
-            }
-            return new Promise((_resolve, reject) => {
-                signal?.addEventListener('abort', () => {
-                    reject(cancellationError);
-                });
-                // Simulate work that might happen if not aborted immediately
-                const timeoutId = setTimeout(() => reject(new Error('Should have been cancelled if not aborted prior')), 100);
-                signal?.addEventListener('abort', () => clearTimeout(timeoutId));
-            });
+        vi.spyOn(mockTool, 'validateBuildAndExecute').mockResolvedValue(executionErrorResult);
+        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        expect(response).toStrictEqual({
+            callId: 'call4',
+            error: new Error('Execution failed'),
+            errorType: ToolErrorType.EXECUTION_FAILED,
+            responseParts: {
+                functionResponse: {
+                    id: 'call4',
+                    name: 'testTool',
+                    response: {
+                        output: 'Error: Execution failed',
+                    },
+                },
+            },
+            resultDisplay: 'Execution failed',
         });
-        abortController.abort(); // Abort before calling
-        const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
-        expect(response.callId).toBe('call4');
-        expect(response.error?.message).toBe(cancellationError.message);
-        expect(response.resultDisplay).toBe('Operation cancelled');
     });
-    it('should correctly format llmContent with inlineData', async () => {
+    it('should return an unhandled exception error if execution throws', async () => {
         const request = {
             callId: 'call5',
             name: 'testTool',
-            args: {},
+            args: { param1: 'value1' },
             isClientInitiated: false,
             prompt_id: 'prompt-id-5',
         };
+        const executionError = new Error('Something went very wrong');
+        vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
+        vi.spyOn(mockTool, 'validateBuildAndExecute').mockRejectedValue(executionError);
+        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        expect(response.callId).toBe('call5');
+        expect(response.error).toBe(executionError);
+        expect(response.errorType).toBe(ToolErrorType.UNHANDLED_EXCEPTION);
+        expect(response.resultDisplay).toBe('Something went very wrong');
+        expect(response.responseParts).toEqual([
+            {
+                functionResponse: {
+                    name: 'testTool',
+                    id: 'call5',
+                    response: { error: 'Something went very wrong' },
+                },
+            },
+        ]);
+    });
+    it('should correctly format llmContent with inlineData', async () => {
+        const request = {
+            callId: 'call6',
+            name: 'testTool',
+            args: {},
+            isClientInitiated: false,
+            prompt_id: 'prompt-id-6',
+        };
         const imageDataPart = {
             inlineData: { mimeType: 'image/png', data: 'base64data' },
         };
@@ -145,14 +194,14 @@ describe('executeToolCall', () => {
             returnDisplay: 'Image processed',
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-        vi.spyOn(mockTool, 'buildAndExecute').mockResolvedValue(toolResult);
-        const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
+        vi.spyOn(mockTool, 'validateBuildAndExecute').mockResolvedValue(toolResult);
+        const response = await executeToolCall(mockConfig, request, abortController.signal);
         expect(response.resultDisplay).toBe('Image processed');
         expect(response.responseParts).toEqual([
             {
                 functionResponse: {
                     name: 'testTool',
-                    id: 'call5',
+                    id: 'call6',
                     response: {
                         output: 'Binary content of type image/png was processed.',
                     },

package/dist/src/core/nonInteractiveToolExecutor.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"nonInteractiveToolExecutor.test.js","sourceRoot":"","sources":["../../../src/core/nonInteractiveToolExecutor.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nonInteractiveToolExecutor.test.js","sourceRoot":"","sources":["../../../src/core/nonInteractiveToolExecutor.test.ts"],"names":[],"mappings":"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"}

package/dist/src/core/openaiContentGenerator.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 QWEN
  * SPDX-License-Identifier: Apache-2.0
  */
 import { CountTokensResponse, GenerateContentResponse, GenerateContentParameters, CountTokensParameters, EmbedContentResponse, EmbedContentParameters } from '@google/genai';
@@ -20,6 +20,17 @@ export declare class OpenAIContentGenerator implements ContentGenerator {
      * @returns true if error logging should be suppressed, false otherwise
      */
     protected shouldSuppressErrorLogging(_error: unknown, _request: GenerateContentParameters): boolean;
+    /**
+     * Check if metadata should be included in the request
+     * Only include metadata for specific providers that support it
+     */
+    private shouldIncludeMetadata;
+    /**
+     * Build metadata object conditionally
+     * @param userPromptId The prompt ID for this request
+     * @returns metadata object if should be included, undefined otherwise
+     */
+    private buildMetadata;
     /**
      * Check if an error is a timeout error
      */

package/dist/src/core/openaiContentGenerator.js

@@ -1,12 +1,13 @@
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 QWEN
  * SPDX-License-Identifier: Apache-2.0
  */
 import { GenerateContentResponse, FinishReason, } from '@google/genai';
 import OpenAI from 'openai';
 import { logApiResponse } from '../telemetry/loggers.js';
 import { ApiResponseEvent } from '../telemetry/types.js';
+import { safeJsonParse } from '../utils/safeJsonParse.js';
 export class OpenAIContentGenerator {
     client;
     model;
@@ -15,7 +16,7 @@ export class OpenAIContentGenerator {
     constructor(apiKey, model, config) {
         this.model = model;
         this.config = config;
-        const baseURL = process.env.OPENAI_BASE_URL || '';
+        const baseURL = process.env['OPENAI_BASE_URL'] || '';
         // Configure timeout settings - using progressive timeouts
         const timeoutConfig = {
             // Base timeout for most requests (2 minutes)
@@ -34,7 +35,7 @@ export class OpenAIContentGenerator {
             timeoutConfig.maxRetries = contentGeneratorConfig.maxRetries;
         }
         // Set up User-Agent header (same format as contentGenerator.ts)
-        const version = process.env.CLI_VERSION || process.version;
+        const version = process.env['CLI_VERSION'] || process.version;
         const userAgent = `QwenCode/${version} (${process.platform}; ${process.arch})`;
         // Check if using OpenRouter and add required headers
         const isOpenRouter = baseURL.includes('openrouter.ai');
@@ -64,6 +65,36 @@ export class OpenAIContentGenerator {
     shouldSuppressErrorLogging(_error, _request) {
         return false; // Default behavior: never suppress error logging
     }
+    /**
+     * Check if metadata should be included in the request
+     * Only include metadata for specific providers that support it
+     */
+    shouldIncludeMetadata() {
+        const baseURL = this.client?.baseURL || '';
+        let hostname;
+        try {
+            hostname = new URL(baseURL).hostname;
+        }
+        catch (_e) {
+            return false;
+        }
+        return (hostname === 'api.openai.com' ||
+            hostname === 'dashscope.aliyuncs.com');
+    }
+    /**
+     * Build metadata object conditionally
+     * @param userPromptId The prompt ID for this request
+     * @returns metadata object if should be included, undefined otherwise
+     */
+    buildMetadata(userPromptId) {
+        if (!this.shouldIncludeMetadata()) {
+            return undefined;
+        }
+        return {
+            sessionId: this.config.getSessionId?.() || '',
+            promptId: userPromptId,
+        };
+    }
     /**
      * Check if an error is a timeout error
      */
@@ -101,14 +132,12 @@ export class OpenAIContentGenerator {
             // 2. Config-level sampling parameters (medium priority)
             // 3. Default values (lowest priority)
             const samplingParams = this.buildSamplingParameters(request);
+            const metadata = this.buildMetadata(userPromptId);
             const createParams = {
                 model: this.model,
                 messages,
                 ...samplingParams,
-                metadata: {
-                    sessionId: this.config.getSessionId?.(),
-                    promptId: userPromptId,
-                },
+                ...(metadata && { metadata }),
             };
             // Enable store for GPT-5 and GPT-4o models when using metadata
             const modelName = this.model.toLowerCase();
@@ -117,12 +146,27 @@ export class OpenAIContentGenerator {
                 modelName.includes('gpt4')) {
                 createParams.store = true;
             }
-            if (request.config?.tools) {
+            // Handle JSON schema requests (for generateJson calls)
+            if (request.config?.responseJsonSchema && request.config?.responseMimeType === 'application/json') {
+                // Convert JSON schema request to tool call (like qwen-code approach)
+                const jsonSchemaFunction = {
+                    type: 'function',
+                    function: {
+                        name: 'respond_in_schema',
+                        description: 'Provide the response in the specified JSON schema format',
+                        parameters: request.config.responseJsonSchema,
+                    },
+                };
+                createParams.tools = [jsonSchemaFunction];
+            }
+            else if (request.config?.tools) {
                 createParams.tools = await this.convertGeminiToolsToOpenAI(request.config.tools);
             }
             // console.log('createParams', createParams);
             const completion = (await this.client.chat.completions.create(createParams));
-            const response = this.convertToGeminiFormat(completion);
+            // Check if this was a JSON schema request
+            const isJsonSchemaRequest = !!(request.config?.responseJsonSchema && request.config?.responseMimeType === 'application/json');
+            const response = this.convertToGeminiFormat(completion, isJsonSchemaRequest);
             const durationMs = Date.now() - startTime;
             // Log API response event for UI telemetry
             const responseEvent = new ApiResponseEvent(this.model, durationMs, userPromptId, this.config.getContentGeneratorConfig()?.authType, response.usageMetadata);
@@ -187,16 +231,14 @@ export class OpenAIContentGenerator {
         try {
             // Build sampling parameters with clear priority
             const samplingParams = this.buildSamplingParameters(request);
+            const metadata = this.buildMetadata(userPromptId);
             const createParams = {
                 model: this.model,
                 messages,
                 ...samplingParams,
                 stream: true,
                 stream_options: { include_usage: true },
-                metadata: {
-                    sessionId: this.config.getSessionId?.(),
-                    promptId: userPromptId,
-                },
+                ...(metadata && { metadata }),
             };
             // Enable store for GPT-5 and GPT-4 models when using metadata
             const modelNameStream = this.model.toLowerCase();
@@ -205,12 +247,27 @@ export class OpenAIContentGenerator {
                 modelNameStream.includes('gpt4')) {
                 createParams.store = true;
             }
-            if (request.config?.tools) {
+            // Handle JSON schema requests (for generateJson calls) - same as non-streaming
+            if (request.config?.responseJsonSchema && request.config?.responseMimeType === 'application/json') {
+                // Convert JSON schema request to tool call (like qwen-code approach)
+                const jsonSchemaFunction = {
+                    type: 'function',
+                    function: {
+                        name: 'respond_in_schema',
+                        description: 'Provide the response in the specified JSON schema format',
+                        parameters: request.config.responseJsonSchema,
+                    },
+                };
+                createParams.tools = [jsonSchemaFunction];
+            }
+            else if (request.config?.tools) {
                 createParams.tools = await this.convertGeminiToolsToOpenAI(request.config.tools);
             }
             // console.log('createParams', createParams);
             const stream = (await this.client.chat.completions.create(createParams));
-            const originalStream = this.streamGenerator(stream);
+            // Check if this was a JSON schema request
+            const isJsonSchemaRequest = !!(request.config?.responseJsonSchema && request.config?.responseMimeType === 'application/json');
+            const originalStream = this.streamGenerator(stream, isJsonSchemaRequest);
             // Collect all responses for final logging (don't log during streaming)
             const responses = [];
             // Return a new generator that both yields responses and collects them
@@ -328,11 +385,11 @@ export class OpenAIContentGenerator {
             throw error;
         }
     }
-    async *streamGenerator(stream) {
+    async *streamGenerator(stream, isJsonSchemaRequest = false) {
         // Reset the accumulator for each new stream
         this.streamingToolCalls.clear();
         for await (const chunk of stream) {
-            yield this.convertStreamChunkToGeminiFormat(chunk);
+            yield this.convertStreamChunkToGeminiFormat(chunk, isJsonSchemaRequest);
         }
     }
     /**
@@ -817,7 +874,7 @@ export class OpenAIContentGenerator {
         }
         return merged;
     }
-    convertToGeminiFormat(openaiResponse) {
+    convertToGeminiFormat(openaiResponse, isJsonSchemaRequest = false) {
         const choice = openaiResponse.choices[0];
         const response = new GenerateContentResponse();
         const parts = [];
@@ -828,24 +885,26 @@ export class OpenAIContentGenerator {
         // Handle tool calls
         if (choice.message.tool_calls) {
             for (const toolCall of choice.message.tool_calls) {
-                if (toolCall.function) {
+                if (toolCall.type === 'function' && toolCall.function) {
                     let args = {};
                     if (toolCall.function.arguments) {
-                        try {
-                            args = JSON.parse(toolCall.function.arguments);
-                        }
-                        catch (error) {
-                            console.error('Failed to parse function arguments:', error);
-                            args = {};
-                        }
+                        args = safeJsonParse(toolCall.function.arguments, {});
+                    }
+                    // Special handling for JSON schema requests (like qwen-code)
+                    if (isJsonSchemaRequest && toolCall.function.name === 'respond_in_schema') {
+                        // Convert the function call result to a text response (simulate Gemini's JSON response)
+                        parts.push({ text: JSON.stringify(args) });
+                    }
+                    else {
+                        // Regular tool call handling
+                        parts.push({
+                            functionCall: {
+                                id: toolCall.id,
+                                name: toolCall.function.name,
+                                args,
+                            },
+                        });
                     }
-                    parts.push({
-                        functionCall: {
-                            id: toolCall.id,
-                            name: toolCall.function.name,
-                            args,
-                        },
-                    });
                 }
             }
         }
@@ -891,7 +950,7 @@ export class OpenAIContentGenerator {
         }
         return response;
     }
-    convertStreamChunkToGeminiFormat(chunk) {
+    convertStreamChunkToGeminiFormat(chunk, isJsonSchemaRequest = false) {
         const choice = chunk.choices?.[0];
         const response = new GenerateContentResponse();
         if (choice) {
@@ -930,20 +989,23 @@ export class OpenAIContentGenerator {
                     if (accumulatedCall.name) {
                         let args = {};
                         if (accumulatedCall.arguments) {
-                            try {
-                                args = JSON.parse(accumulatedCall.arguments);
-                            }
-                            catch (error) {
-                                console.error('Failed to parse final tool call arguments:', error);
-                            }
+                            args = safeJsonParse(accumulatedCall.arguments, {});
+                        }
+                        // Special handling for JSON schema requests (like qwen-code)
+                        if (isJsonSchemaRequest && accumulatedCall.name === 'respond_in_schema') {
+                            // Convert the function call result to a text response (simulate Gemini's JSON response)
+                            parts.push({ text: JSON.stringify(args) });
+                        }
+                        else {
+                            // Regular tool call handling
+                            parts.push({
+                                functionCall: {
+                                    id: accumulatedCall.id,
+                                    name: accumulatedCall.name,
+                                    args,
+                                },
+                            });
                         }
-                        parts.push({
-                            functionCall: {
-                                id: accumulatedCall.id,
-                                name: accumulatedCall.name,
-                                args,
-                            },
-                        });
                     }
                 }
                 // Clear all accumulated tool calls