@office-ai/aioncli-core 0.1.1-8.1

package/dist/src/core/modelCheck.js

@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { setGlobalDispatcher, ProxyAgent } from 'undici';
+import { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, } from '../config/models.js';
+/**
+ * Checks if the default "pro" model is rate-limited and returns a fallback "flash"
+ * model if necessary. This function is designed to be silent.
+ * @param apiKey The API key to use for the check.
+ * @param currentConfiguredModel The model currently configured in settings.
+ * @returns An object indicating the model to use, whether a switch occurred,
+ *          and the original model if a switch happened.
+ */
+export async function getEffectiveModel(apiKey, currentConfiguredModel, proxy) {
+    if (currentConfiguredModel !== DEFAULT_GEMINI_MODEL) {
+        // Only check if the user is trying to use the specific pro model we want to fallback from.
+        return currentConfiguredModel;
+    }
+    const modelToTest = DEFAULT_GEMINI_MODEL;
+    const fallbackModel = DEFAULT_GEMINI_FLASH_MODEL;
+    const endpoint = `https://generativelanguage.googleapis.com/v1beta/models/${modelToTest}:generateContent`;
+    const body = JSON.stringify({
+        contents: [{ parts: [{ text: 'test' }] }],
+        generationConfig: {
+            maxOutputTokens: 1,
+            temperature: 0,
+            topK: 1,
+            thinkingConfig: { thinkingBudget: 128, includeThoughts: false },
+        },
+    });
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 2000); // 500ms timeout for the request
+    try {
+        if (proxy) {
+            setGlobalDispatcher(new ProxyAgent(proxy));
+        }
+        const response = await fetch(endpoint, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'x-goog-api-key': apiKey,
+            },
+            body,
+            signal: controller.signal,
+        });
+        clearTimeout(timeoutId);
+        if (response.status === 429) {
+            console.log(`[INFO] Your configured model (${modelToTest}) was temporarily unavailable. Switched to ${fallbackModel} for this session.`);
+            return fallbackModel;
+        }
+        // For any other case (success, other error codes), we stick to the original model.
+        return currentConfiguredModel;
+    }
+    catch (_error) {
+        clearTimeout(timeoutId);
+        // On timeout or any other fetch error, stick to the original model.
+        return currentConfiguredModel;
+    }
+}
+//# sourceMappingURL=modelCheck.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"modelCheck.js","sourceRoot":"","sources":["../../../src/core/modelCheck.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EACL,oBAAoB,EACpB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAE7B;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAAc,EACd,sBAA8B,EAC9B,KAAc;IAEd,IAAI,sBAAsB,KAAK,oBAAoB,EAAE,CAAC;QACpD,2FAA2F;QAC3F,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,MAAM,WAAW,GAAG,oBAAoB,CAAC;IACzC,MAAM,aAAa,GAAG,0BAA0B,CAAC;IACjD,MAAM,QAAQ,GAAG,2DAA2D,WAAW,kBAAkB,CAAC;IAC1G,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;QAC1B,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACzC,gBAAgB,EAAE;YAChB,eAAe,EAAE,CAAC;YAClB,WAAW,EAAE,CAAC;YACd,IAAI,EAAE,CAAC;YACP,cAAc,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE;SAChE;KACF,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,gCAAgC;IAE9F,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,CAAC;YACV,mBAAmB,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;YACrC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,MAAM;aACzB;YACD,IAAI;YACJ,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B,CAAC,CAAC;QAEH,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CACT,iCAAiC,WAAW,8CAA8C,aAAa,oBAAoB,CAC5H,CAAC;YACF,OAAO,aAAa,CAAC;QACvB,CAAC;QACD,mFAAmF;QACnF,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,YAAY,CAAC,SAAS,CAAC,CAAC;QACxB,oEAAoE;QACpE,OAAO,sBAAsB,CAAC;IAChC,CAAC;AACH,CAAC"}

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

@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ToolCallRequestInfo, ToolCallResponseInfo, ToolRegistry } from '../index.js';
+import { Config } from '../config/config.js';
+/**
+ * Executes a single tool call non-interactively.
+ * It does not handle confirmations, multiple calls, or live updates.
+ */
+export declare function executeToolCall(config: Config, toolCallRequest: ToolCallRequestInfo, toolRegistry: ToolRegistry, abortSignal?: AbortSignal): Promise<ToolCallResponseInfo>;

package/dist/src/core/nonInteractiveToolExecutor.js

@@ -0,0 +1,124 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { logToolCall, ToolErrorType, } from '../index.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);
+    const startTime = Date.now();
+    if (!tool) {
+        const error = new Error(`Tool "${toolCallRequest.name}" not found in registry.`);
+        const durationMs = Date.now() - startTime;
+        logToolCall(config, {
+            'event.name': 'tool_call',
+            'event.timestamp': new Date().toISOString(),
+            function_name: toolCallRequest.name,
+            function_args: toolCallRequest.args,
+            duration_ms: durationMs,
+            success: false,
+            error: error.message,
+            prompt_id: toolCallRequest.prompt_id,
+        });
+        // Ensure the response structure matches what the API expects for an error
+        return {
+            callId: toolCallRequest.callId,
+            responseParts: [
+                {
+                    functionResponse: {
+                        id: toolCallRequest.callId,
+                        name: toolCallRequest.name,
+                        response: { error: error.message },
+                    },
+                },
+            ],
+            resultDisplay: error.message,
+            error,
+            errorType: ToolErrorType.TOOL_NOT_REGISTERED,
+        };
+    }
+    try {
+        // Directly execute without confirmation or live output handling
+        const effectiveAbortSignal = abortSignal ?? new AbortController().signal;
+        const toolResult = await tool.buildAndExecute(toolCallRequest.args, effectiveAbortSignal);
+        const tool_output = toolResult.llmContent;
+        const tool_display = toolResult.returnDisplay;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        let metadata = {};
+        if (toolResult.error === undefined &&
+            typeof tool_display === 'object' &&
+            tool_display !== null &&
+            'diffStat' in tool_display) {
+            const diffStat = tool_display.diffStat;
+            if (diffStat) {
+                metadata = {
+                    ai_added_lines: diffStat.ai_added_lines,
+                    ai_removed_lines: diffStat.ai_removed_lines,
+                    user_added_lines: diffStat.user_added_lines,
+                    user_removed_lines: diffStat.user_removed_lines,
+                };
+            }
+        }
+        const durationMs = Date.now() - startTime;
+        logToolCall(config, {
+            'event.name': 'tool_call',
+            'event.timestamp': new Date().toISOString(),
+            function_name: toolCallRequest.name,
+            function_args: toolCallRequest.args,
+            duration_ms: durationMs,
+            success: toolResult.error === undefined,
+            error: toolResult.error === undefined ? undefined : toolResult.error.message,
+            error_type: toolResult.error === undefined ? undefined : toolResult.error.type,
+            prompt_id: toolCallRequest.prompt_id,
+            metadata,
+            decision: ToolCallDecision.AUTO_ACCEPT,
+        });
+        const response = convertToFunctionResponse(toolCallRequest.name, toolCallRequest.callId, tool_output);
+        return {
+            callId: toolCallRequest.callId,
+            responseParts: response,
+            resultDisplay: tool_display,
+            error: toolResult.error === undefined
+                ? undefined
+                : new Error(toolResult.error.message),
+            errorType: toolResult.error === undefined ? undefined : toolResult.error.type,
+        };
+    }
+    catch (e) {
+        const error = e instanceof Error ? e : new Error(String(e));
+        const durationMs = Date.now() - startTime;
+        logToolCall(config, {
+            'event.name': 'tool_call',
+            'event.timestamp': new Date().toISOString(),
+            function_name: toolCallRequest.name,
+            function_args: toolCallRequest.args,
+            duration_ms: durationMs,
+            success: false,
+            error: error.message,
+            error_type: ToolErrorType.UNHANDLED_EXCEPTION,
+            prompt_id: toolCallRequest.prompt_id,
+        });
+        return {
+            callId: toolCallRequest.callId,
+            responseParts: [
+                {
+                    functionResponse: {
+                        id: toolCallRequest.callId,
+                        name: toolCallRequest.name,
+                        response: { error: error.message },
+                    },
+                },
+            ],
+            resultDisplay: error.message,
+            error,
+            errorType: ToolErrorType.UNHANDLED_EXCEPTION,
+        };
+    }
+}
+//# sourceMappingURL=nonInteractiveToolExecutor.js.map

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

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

package/dist/src/core/nonInteractiveToolExecutor.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

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

@@ -0,0 +1,165 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { executeToolCall } from './nonInteractiveToolExecutor.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;
+    beforeEach(() => {
+        mockTool = new MockTool();
+        mockToolRegistry = {
+            getTool: vi.fn(),
+            // Add other ToolRegistry methods if needed, or use a more complete mock
+        };
+        abortController = new AbortController();
+    });
+    it('should execute a tool successfully', async () => {
+        const request = {
+            callId: 'call1',
+            name: 'testTool',
+            args: { param1: 'value1' },
+            isClientInitiated: false,
+            prompt_id: 'prompt-id-1',
+        };
+        const toolResult = {
+            llmContent: 'Tool executed successfully',
+            returnDisplay: 'Success!',
+        };
+        vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
+        vi.spyOn(mockTool, 'buildAndExecute').mockResolvedValue(toolResult);
+        const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
+        expect(mockToolRegistry.getTool).toHaveBeenCalledWith('testTool');
+        expect(mockTool.buildAndExecute).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' },
+            },
+        });
+    });
+    it('should return an error if tool is not found', async () => {
+        const request = {
+            callId: 'call2',
+            name: 'nonexistentTool',
+            args: {},
+            isClientInitiated: false,
+            prompt_id: 'prompt-id-2',
+        };
+        vi.mocked(mockToolRegistry.getTool).mockReturnValue(undefined);
+        const response = await executeToolCall(mockConfig, request, mockToolRegistry, 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.' },
+                },
+            },
+        ]);
+    });
+    it('should return an error if tool execution fails', async () => {
+        const request = {
+            callId: 'call3',
+            name: 'testTool',
+            args: { param1: 'value1' },
+            isClientInitiated: false,
+            prompt_id: 'prompt-id-3',
+        };
+        const executionError = new Error('Tool execution failed');
+        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([
+            {
+                functionResponse: {
+                    name: 'testTool',
+                    id: 'call3',
+                    response: { error: 'Tool execution failed' },
+                },
+            },
+        ]);
+    });
+    it('should handle cancellation during tool execution', async () => {
+        const request = {
+            callId: 'call4',
+            name: 'testTool',
+            args: { param1: 'value1' },
+            isClientInitiated: false,
+            prompt_id: 'prompt-id-4',
+        };
+        const cancellationError = new Error('Operation cancelled');
+        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));
+            });
+        });
+        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 () => {
+        const request = {
+            callId: 'call5',
+            name: 'testTool',
+            args: {},
+            isClientInitiated: false,
+            prompt_id: 'prompt-id-5',
+        };
+        const imageDataPart = {
+            inlineData: { mimeType: 'image/png', data: 'base64data' },
+        };
+        const toolResult = {
+            llmContent: [imageDataPart],
+            returnDisplay: 'Image processed',
+        };
+        vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
+        vi.spyOn(mockTool, 'buildAndExecute').mockResolvedValue(toolResult);
+        const response = await executeToolCall(mockConfig, request, mockToolRegistry, abortController.signal);
+        expect(response.resultDisplay).toBe('Image processed');
+        expect(response.responseParts).toEqual([
+            {
+                functionResponse: {
+                    name: 'testTool',
+                    id: 'call5',
+                    response: {
+                        output: 'Binary content of type image/png was processed.',
+                    },
+                },
+            },
+            imageDataPart,
+        ]);
+    });
+});
+//# sourceMappingURL=nonInteractiveToolExecutor.test.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,77 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { CountTokensResponse, GenerateContentResponse, GenerateContentParameters, CountTokensParameters, EmbedContentResponse, EmbedContentParameters } from '@google/genai';
+import { ContentGenerator } from './contentGenerator.js';
+import OpenAI from 'openai';
+import { Config } from '../config/config.js';
+export declare class OpenAIContentGenerator implements ContentGenerator {
+    protected client: OpenAI;
+    private model;
+    private config;
+    private streamingToolCalls;
+    constructor(apiKey: string, model: string, config: Config);
+    /**
+     * Hook for subclasses to customize error handling behavior
+     * @param error The error that occurred
+     * @param request The original request
+     * @returns true if error logging should be suppressed, false otherwise
+     */
+    protected shouldSuppressErrorLogging(_error: unknown, _request: GenerateContentParameters): boolean;
+    /**
+     * Check if an error is a timeout error
+     */
+    private isTimeoutError;
+    generateContent(request: GenerateContentParameters, userPromptId: string): Promise<GenerateContentResponse>;
+    generateContentStream(request: GenerateContentParameters, userPromptId: string): Promise<AsyncGenerator<GenerateContentResponse>>;
+    private streamGenerator;
+    /**
+     * Combine streaming responses for logging purposes
+     */
+    private combineStreamResponsesForLogging;
+    countTokens(request: CountTokensParameters): Promise<CountTokensResponse>;
+    embedContent(request: EmbedContentParameters): Promise<EmbedContentResponse>;
+    private convertGeminiParametersToOpenAI;
+    private convertGeminiToolsToOpenAI;
+    private convertToOpenAIFormat;
+    /**
+     * Clean up orphaned tool calls from message history to prevent OpenAI API errors
+     */
+    private cleanOrphanedToolCalls;
+    /**
+     * Merge consecutive assistant messages to combine split text and tool calls
+     */
+    private mergeConsecutiveAssistantMessages;
+    private convertToGeminiFormat;
+    private convertStreamChunkToGeminiFormat;
+    /**
+     * Build sampling parameters with clear priority:
+     * 1. Config-level sampling parameters (highest priority)
+     * 2. Request-level parameters (medium priority)
+     * 3. Default values (lowest priority)
+     */
+    private buildSamplingParameters;
+    private mapFinishReason;
+    /**
+     * Convert Gemini request format to OpenAI chat completion format for logging
+     */
+    private convertGeminiRequestToOpenAI;
+    /**
+     * Clean up orphaned tool calls for logging purposes
+     */
+    private cleanOrphanedToolCallsForLogging;
+    /**
+     * Merge consecutive assistant messages to combine split text and tool calls for logging
+     */
+    private mergeConsecutiveAssistantMessagesForLogging;
+    /**
+     * Convert Gemini response format to OpenAI chat completion format for logging
+     */
+    private convertGeminiResponseToOpenAI;
+    /**
+     * Map Gemini finish reasons to OpenAI finish reasons
+     */
+    private mapGeminiFinishReasonToOpenAI;
+}