@office-ai/aioncli-core 0.2.3 → 0.18.4

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

@@ -5,20 +5,25 @@
  */
 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';
+import { DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES, DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD, ToolErrorType, ApprovalMode, } from '../index.js';
+import { MockTool } from '../test-utils/mock-tool.js';
 describe('executeToolCall', () => {
     let mockToolRegistry;
     let mockTool;
+    let executeFn;
     let abortController;
     let mockConfig;
     beforeEach(() => {
-        mockTool = new MockTool();
+        executeFn = vi.fn();
+        mockTool = new MockTool({ name: 'testTool', execute: executeFn });
         mockToolRegistry = {
             getTool: vi.fn(),
-            // Add other ToolRegistry methods if needed, or use a more complete mock
+            getAllToolNames: vi.fn(),
         };
         mockConfig = {
+            getToolRegistry: () => mockToolRegistry,
+            getApprovalMode: () => ApprovalMode.DEFAULT,
+            getAllowedTools: () => [],
             getSessionId: () => 'test-session-id',
             getUsageStatisticsEnabled: () => true,
             getDebugMode: () => false,
@@ -26,7 +31,22 @@ describe('executeToolCall', () => {
                 model: 'test-model',
                 authType: 'oauth-personal',
             }),
-            getToolRegistry: () => mockToolRegistry,
+            getShellExecutionConfig: () => ({
+                terminalWidth: 90,
+                terminalHeight: 30,
+            }),
+            storage: {
+                getProjectTempDir: () => '/tmp',
+            },
+            getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
+            getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
+            getUseSmartEdit: () => false,
+            getUseModelRouter: () => false,
+            getGeminiClient: () => null, // No client needed for these tests
+            getEnableMessageBusIntegration: () => false,
+            getMessageBus: () => null,
+            getPolicyEngine: () => null,
+            isInteractive: () => false,
         };
         abortController = new AbortController();
     });
@@ -43,19 +63,28 @@ describe('executeToolCall', () => {
             returnDisplay: 'Success!',
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-        vi.spyOn(mockTool, 'validateBuildAndExecute').mockResolvedValue(toolResult);
-        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        executeFn.mockResolvedValue(toolResult);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
         expect(mockToolRegistry.getTool).toHaveBeenCalledWith('testTool');
-        expect(mockTool.validateBuildAndExecute).toHaveBeenCalledWith(request.args, abortController.signal);
-        expect(response.callId).toBe('call1');
-        expect(response.error).toBeUndefined();
-        expect(response.resultDisplay).toBe('Success!');
-        expect(response.responseParts).toEqual({
-            functionResponse: {
-                name: 'testTool',
-                id: 'call1',
-                response: { output: 'Tool executed successfully' },
-            },
+        expect(executeFn).toHaveBeenCalledWith(request.args);
+        expect(response).toStrictEqual({
+            callId: 'call1',
+            error: undefined,
+            errorType: undefined,
+            outputFile: undefined,
+            resultDisplay: 'Success!',
+            contentLength: typeof toolResult.llmContent === 'string'
+                ? toolResult.llmContent.length
+                : undefined,
+            responseParts: [
+                {
+                    functionResponse: {
+                        name: 'testTool',
+                        id: 'call1',
+                        response: { output: 'Tool executed successfully' },
+                    },
+                },
+            ],
         });
     });
     it('should return an error if tool is not found', async () => {
@@ -67,20 +96,30 @@ describe('executeToolCall', () => {
             prompt_id: 'prompt-id-2',
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(undefined);
-        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.');
-        expect(response.resultDisplay).toBe('Tool "nonexistentTool" not found in registry.');
-        expect(response.responseParts).toEqual([
-            {
-                functionResponse: {
-                    name: 'nonexistentTool',
-                    id: 'call2',
-                    response: { error: 'Tool "nonexistentTool" not found in registry.' },
-                },
-            },
+        vi.mocked(mockToolRegistry.getAllToolNames).mockReturnValue([
+            'testTool',
+            'anotherTool',
         ]);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
+        const expectedErrorMessage = 'Tool "nonexistentTool" not found in registry. Tools must use the exact names that are registered. Did you mean one of: "testTool", "anotherTool"?';
+        expect(response).toStrictEqual({
+            callId: 'call2',
+            error: new Error(expectedErrorMessage),
+            errorType: ToolErrorType.TOOL_NOT_REGISTERED,
+            resultDisplay: expectedErrorMessage,
+            contentLength: expectedErrorMessage.length,
+            responseParts: [
+                {
+                    functionResponse: {
+                        name: 'nonexistentTool',
+                        id: 'call2',
+                        response: {
+                            error: expectedErrorMessage,
+                        },
+                    },
+                },
+            ],
+        });
     });
     it('should return an error if tool validation fails', async () => {
         const request = {
@@ -90,31 +129,28 @@ describe('executeToolCall', () => {
             isClientInitiated: false,
             prompt_id: 'prompt-id-3',
         };
-        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, 'validateBuildAndExecute').mockResolvedValue(validationErrorResult);
-        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        vi.spyOn(mockTool, 'build').mockImplementation(() => {
+            throw new Error('Invalid parameters');
+        });
+        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: {
-                    id: 'call3',
-                    name: 'testTool',
-                    response: {
-                        output: 'Error: Invalid parameters',
+            responseParts: [
+                {
+                    functionResponse: {
+                        id: 'call3',
+                        name: 'testTool',
+                        response: {
+                            error: 'Invalid parameters',
+                        },
                     },
                 },
-            },
+            ],
             resultDisplay: 'Invalid parameters',
+            contentLength: 'Invalid parameters'.length,
         });
     });
     it('should return an error if tool execution fails', async () => {
@@ -134,22 +170,25 @@ describe('executeToolCall', () => {
             },
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-        vi.spyOn(mockTool, 'validateBuildAndExecute').mockResolvedValue(executionErrorResult);
-        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        executeFn.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',
+            responseParts: [
+                {
+                    functionResponse: {
+                        id: 'call4',
+                        name: 'testTool',
+                        response: {
+                            error: 'Execution failed',
+                        },
                     },
                 },
-            },
+            ],
             resultDisplay: 'Execution failed',
+            contentLength: 'Execution failed'.length,
         });
     });
     it('should return an unhandled exception error if execution throws', async () => {
@@ -160,23 +199,25 @@ describe('executeToolCall', () => {
             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' },
+        executeFn.mockRejectedValue(new Error('Something went very wrong'));
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
+        expect(response).toStrictEqual({
+            callId: 'call5',
+            error: new Error('Something went very wrong'),
+            errorType: ToolErrorType.UNHANDLED_EXCEPTION,
+            resultDisplay: 'Something went very wrong',
+            contentLength: 'Something went very wrong'.length,
+            responseParts: [
+                {
+                    functionResponse: {
+                        name: 'testTool',
+                        id: 'call5',
+                        response: { error: 'Something went very wrong' },
+                    },
                 },
-            },
-        ]);
+            ],
+        });
     });
     it('should correctly format llmContent with inlineData', async () => {
         const request = {
@@ -194,21 +235,64 @@ describe('executeToolCall', () => {
             returnDisplay: 'Image processed',
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-        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: 'call6',
-                    response: {
-                        output: 'Binary content of type image/png was processed.',
+        executeFn.mockResolvedValue(toolResult);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
+        expect(response).toStrictEqual({
+            callId: 'call6',
+            error: undefined,
+            errorType: undefined,
+            outputFile: undefined,
+            resultDisplay: 'Image processed',
+            contentLength: undefined,
+            responseParts: [
+                {
+                    functionResponse: {
+                        name: 'testTool',
+                        id: 'call6',
+                        response: {
+                            output: 'Binary content of type image/png was processed.',
+                        },
                     },
                 },
-            },
-            imageDataPart,
-        ]);
+                imageDataPart,
+            ],
+        });
+    });
+    it('should calculate contentLength for a string llmContent', async () => {
+        const request = {
+            callId: 'call7',
+            name: 'testTool',
+            args: {},
+            isClientInitiated: false,
+            prompt_id: 'prompt-id-7',
+        };
+        const toolResult = {
+            llmContent: 'This is a test string.',
+            returnDisplay: 'String returned',
+        };
+        vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
+        executeFn.mockResolvedValue(toolResult);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
+        expect(response.contentLength).toBe(typeof toolResult.llmContent === 'string'
+            ? toolResult.llmContent.length
+            : undefined);
+    });
+    it('should have undefined contentLength for array llmContent with no string parts', async () => {
+        const request = {
+            callId: 'call8',
+            name: 'testTool',
+            args: {},
+            isClientInitiated: false,
+            prompt_id: 'prompt-id-8',
+        };
+        const toolResult = {
+            llmContent: [{ inlineData: { mimeType: 'image/png', data: 'fakedata' } }],
+            returnDisplay: 'Image data returned',
+        };
+        vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
+        executeFn.mockResolvedValue(toolResult);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
+        expect(response.contentLength).toBeUndefined();
     });
 });
 //# sourceMappingURL=nonInteractiveToolExecutor.test.js.map

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

@@ -3,10 +3,11 @@
  * Copyright 2025 QWEN
  * SPDX-License-Identifier: Apache-2.0
  */
-import { CountTokensResponse, GenerateContentResponse, GenerateContentParameters, CountTokensParameters, EmbedContentResponse, EmbedContentParameters } from '@google/genai';
-import { ContentGenerator } from './contentGenerator.js';
+import type { CountTokensResponse, GenerateContentParameters, CountTokensParameters, EmbedContentResponse, EmbedContentParameters } from '@google/genai';
+import { GenerateContentResponse } from '@google/genai';
+import type { ContentGenerator } from './contentGenerator.js';
 import OpenAI from 'openai';
-import { Config } from '../config/config.js';
+import type { Config } from '../config/config.js';
 export declare class OpenAIContentGenerator implements ContentGenerator {
     protected client: OpenAI;
     private model;

package/dist/src/core/openaiContentGenerator.js

@@ -3,9 +3,10 @@
  * Copyright 2025 QWEN
  * SPDX-License-Identifier: Apache-2.0
  */
-import { GenerateContentResponse, FinishReason, } from '@google/genai';
+import { GenerateContentResponse, FinishReason } from '@google/genai';
 import OpenAI from 'openai';
 import { logApiResponse } from '../telemetry/loggers.js';
+import { toContents } from '../code_assist/converter.js';
 import { ApiResponseEvent } from '../telemetry/types.js';
 import { safeJsonParse } from '../utils/safeJsonParse.js';
 export class OpenAIContentGenerator {
@@ -78,8 +79,7 @@ export class OpenAIContentGenerator {
         catch (_e) {
             return false;
         }
-        return (hostname === 'api.openai.com' ||
-            hostname === 'dashscope.aliyuncs.com');
+        return (hostname === 'api.openai.com' || hostname === 'dashscope.aliyuncs.com');
     }
     /**
      * Build metadata object conditionally
@@ -147,7 +147,8 @@ export class OpenAIContentGenerator {
                 createParams.store = true;
             }
             // Handle JSON schema requests (for generateJson calls)
-            if (request.config?.responseJsonSchema && request.config?.responseMimeType === 'application/json') {
+            if (request.config?.responseJsonSchema &&
+                request.config?.responseMimeType === 'application/json') {
                 // Convert JSON schema request to tool call (like qwen-code approach)
                 const jsonSchemaFunction = {
                     type: 'function',
@@ -165,11 +166,18 @@ export class OpenAIContentGenerator {
             // console.log('createParams', createParams);
             const completion = (await this.client.chat.completions.create(createParams));
             // Check if this was a JSON schema request
-            const isJsonSchemaRequest = !!(request.config?.responseJsonSchema && request.config?.responseMimeType === 'application/json');
+            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);
+            const responseEvent = new ApiResponseEvent(this.model, durationMs, {
+                prompt_id: userPromptId,
+                contents: toContents(request.contents),
+                generate_content_config: request.config,
+            }, {
+                candidates: response.candidates,
+            }, this.config.getContentGeneratorConfig()?.authType, response.usageMetadata);
             logApiResponse(this.config, responseEvent);
             return response;
         }
@@ -187,7 +195,7 @@ export class OpenAIContentGenerator {
             let estimatedUsage;
             try {
                 const tokenCountResult = await this.countTokens({
-                    contents: request.contents,
+                    contents: toContents(request.contents),
                     model: this.model,
                 });
                 estimatedUsage = {
@@ -207,7 +215,11 @@ export class OpenAIContentGenerator {
                 };
             }
             // Log API error event for UI telemetry with estimated usage
-            const errorEvent = new ApiResponseEvent(this.model, durationMs, userPromptId, this.config.getContentGeneratorConfig()?.authType, estimatedUsage, undefined, errorMessage);
+            const errorEvent = new ApiResponseEvent(this.model, durationMs, {
+                prompt_id: userPromptId,
+                contents: toContents(request.contents),
+                generate_content_config: request.config,
+            }, {}, this.config.getContentGeneratorConfig()?.authType, estimatedUsage, errorMessage);
             logApiResponse(this.config, errorEvent);
             // Log error interaction if enabled
             // Allow subclasses to suppress error logging for specific scenarios
@@ -248,7 +260,8 @@ export class OpenAIContentGenerator {
                 createParams.store = true;
             }
             // Handle JSON schema requests (for generateJson calls) - same as non-streaming
-            if (request.config?.responseJsonSchema && request.config?.responseMimeType === 'application/json') {
+            if (request.config?.responseJsonSchema &&
+                request.config?.responseMimeType === 'application/json') {
                 // Convert JSON schema request to tool call (like qwen-code approach)
                 const jsonSchemaFunction = {
                     type: 'function',
@@ -266,7 +279,8 @@ export class OpenAIContentGenerator {
             // console.log('createParams', createParams);
             const stream = (await this.client.chat.completions.create(createParams));
             // Check if this was a JSON schema request
-            const isJsonSchemaRequest = !!(request.config?.responseJsonSchema && request.config?.responseMimeType === 'application/json');
+            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 = [];
@@ -284,7 +298,11 @@ export class OpenAIContentGenerator {
                         .reverse()
                         .find((r) => r.usageMetadata)?.usageMetadata;
                     // Log API response event for UI telemetry
-                    const responseEvent = new ApiResponseEvent(this.model, durationMs, userPromptId, this.config.getContentGeneratorConfig()?.authType, finalUsageMetadata);
+                    const responseEvent = new ApiResponseEvent(this.model, durationMs, {
+                        prompt_id: userPromptId,
+                        contents: toContents(request.contents),
+                        generate_content_config: request.config,
+                    }, {}, this.config.getContentGeneratorConfig()?.authType, finalUsageMetadata);
                     logApiResponse(this.config, responseEvent);
                 }
                 catch (error) {
@@ -300,7 +318,7 @@ export class OpenAIContentGenerator {
                     let estimatedUsage;
                     try {
                         const tokenCountResult = await this.countTokens({
-                            contents: request.contents,
+                            contents: toContents(request.contents),
                             model: this.model,
                         });
                         estimatedUsage = {
@@ -320,7 +338,11 @@ export class OpenAIContentGenerator {
                         };
                     }
                     // Log API error event for UI telemetry with estimated usage
-                    const errorEvent = new ApiResponseEvent(this.model, durationMs, userPromptId, this.config.getContentGeneratorConfig()?.authType, estimatedUsage, undefined, errorMessage);
+                    const errorEvent = new ApiResponseEvent(this.model, durationMs, {
+                        prompt_id: userPromptId,
+                        contents: toContents(request.contents),
+                        generate_content_config: request.config,
+                    }, {}, this.config.getContentGeneratorConfig()?.authType, estimatedUsage, errorMessage);
                     logApiResponse(this.config, errorEvent);
                     // Provide helpful timeout-specific error message for streaming
                     if (isTimeoutError) {
@@ -348,7 +370,7 @@ export class OpenAIContentGenerator {
             let estimatedUsage;
             try {
                 const tokenCountResult = await this.countTokens({
-                    contents: request.contents,
+                    contents: toContents(request.contents),
                     model: this.model,
                 });
                 estimatedUsage = {
@@ -368,7 +390,11 @@ export class OpenAIContentGenerator {
                 };
             }
             // Log API error event for UI telemetry with estimated usage
-            const errorEvent = new ApiResponseEvent(this.model, durationMs, userPromptId, this.config.getContentGeneratorConfig()?.authType, estimatedUsage, undefined, errorMessage);
+            const errorEvent = new ApiResponseEvent(this.model, durationMs, {
+                prompt_id: userPromptId,
+                contents: toContents(request.contents),
+                generate_content_config: request.config,
+            }, {}, this.config.getContentGeneratorConfig()?.authType, estimatedUsage, errorMessage);
             logApiResponse(this.config, errorEvent);
             // Allow subclasses to suppress error logging for specific scenarios
             if (!this.shouldSuppressErrorLogging(error, request)) {
@@ -891,7 +917,8 @@ export class OpenAIContentGenerator {
                         args = safeJsonParse(toolCall.function.arguments, {});
                     }
                     // Special handling for JSON schema requests (like qwen-code)
-                    if (isJsonSchemaRequest && toolCall.function.name === 'respond_in_schema') {
+                    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) });
                     }
@@ -992,7 +1019,8 @@ export class OpenAIContentGenerator {
                             args = safeJsonParse(accumulatedCall.arguments, {});
                         }
                         // Special handling for JSON schema requests (like qwen-code)
-                        if (isJsonSchemaRequest && accumulatedCall.name === 'respond_in_schema') {
+                        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) });
                         }
@@ -1105,8 +1133,10 @@ export class OpenAIContentGenerator {
         };
         // Force temperature to 1 for GPT-5 and GPT-4o models if temperature is present
         const modelName = this.model.toLowerCase();
-        if ((modelName.includes('gpt-5') || modelName.includes('gpt5') ||
-            modelName.includes('gpt-4o') || modelName.includes('gpt4o')) &&
+        if ((modelName.includes('gpt-5') ||
+            modelName.includes('gpt5') ||
+            modelName.includes('gpt-4o') ||
+            modelName.includes('gpt4o')) &&
             params.temperature !== undefined) {
             params.temperature = 1.0;
         }