@office-ai/aioncli-core 0.8.1 → 0.18.4

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

@@ -0,0 +1,180 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const logApiRequest = vi.hoisted(() => vi.fn());
+const logApiResponse = vi.hoisted(() => vi.fn());
+const logApiError = vi.hoisted(() => vi.fn());
+vi.mock('../telemetry/loggers.js', () => ({
+    logApiRequest,
+    logApiResponse,
+    logApiError,
+}));
+const runInDevTraceSpan = vi.hoisted(() => vi.fn(async (meta, fn) => fn({ metadata: {}, endSpan: vi.fn() })));
+vi.mock('../telemetry/trace.js', () => ({
+    runInDevTraceSpan,
+}));
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { LoggingContentGenerator } from './loggingContentGenerator.js';
+import { ApiRequestEvent } from '../telemetry/types.js';
+describe('LoggingContentGenerator', () => {
+    let wrapped;
+    let config;
+    let loggingContentGenerator;
+    beforeEach(() => {
+        wrapped = {
+            generateContent: vi.fn(),
+            generateContentStream: vi.fn(),
+            countTokens: vi.fn(),
+            embedContent: vi.fn(),
+        };
+        config = {
+            getGoogleAIConfig: vi.fn(),
+            getVertexAIConfig: vi.fn(),
+            getContentGeneratorConfig: vi.fn().mockReturnValue({
+                authType: 'API_KEY',
+            }),
+        };
+        loggingContentGenerator = new LoggingContentGenerator(wrapped, config);
+        vi.useFakeTimers();
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+        vi.useRealTimers();
+    });
+    describe('generateContent', () => {
+        it('should log request and response on success', async () => {
+            const req = {
+                contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
+                model: 'gemini-pro',
+            };
+            const userPromptId = 'prompt-123';
+            const response = {
+                candidates: [],
+                usageMetadata: {
+                    promptTokenCount: 1,
+                    candidatesTokenCount: 2,
+                    totalTokenCount: 3,
+                },
+                text: undefined,
+                functionCalls: undefined,
+                executableCode: undefined,
+                codeExecutionResult: undefined,
+                data: undefined,
+            };
+            vi.mocked(wrapped.generateContent).mockResolvedValue(response);
+            const startTime = new Date('2025-01-01T00:00:00.000Z');
+            vi.setSystemTime(startTime);
+            const promise = loggingContentGenerator.generateContent(req, userPromptId);
+            vi.advanceTimersByTime(1000);
+            await promise;
+            expect(wrapped.generateContent).toHaveBeenCalledWith(req, userPromptId);
+            expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
+            const responseEvent = vi.mocked(logApiResponse).mock.calls[0][1];
+            expect(responseEvent.duration_ms).toBe(1000);
+        });
+        it('should log error on failure', async () => {
+            const req = {
+                contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
+                model: 'gemini-pro',
+            };
+            const userPromptId = 'prompt-123';
+            const error = new Error('test error');
+            vi.mocked(wrapped.generateContent).mockRejectedValue(error);
+            const startTime = new Date('2025-01-01T00:00:00.000Z');
+            vi.setSystemTime(startTime);
+            const promise = loggingContentGenerator.generateContent(req, userPromptId);
+            vi.advanceTimersByTime(1000);
+            await expect(promise).rejects.toThrow(error);
+            expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
+            const errorEvent = vi.mocked(logApiError).mock.calls[0][1];
+            expect(errorEvent.duration_ms).toBe(1000);
+        });
+    });
+    describe('generateContentStream', () => {
+        it('should log request and response on success', async () => {
+            const req = {
+                contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
+                model: 'gemini-pro',
+            };
+            const userPromptId = 'prompt-123';
+            const response = {
+                candidates: [],
+                usageMetadata: {
+                    promptTokenCount: 1,
+                    candidatesTokenCount: 2,
+                    totalTokenCount: 3,
+                },
+            };
+            async function* createAsyncGenerator() {
+                yield response;
+            }
+            vi.mocked(wrapped.generateContentStream).mockResolvedValue(createAsyncGenerator());
+            const startTime = new Date('2025-01-01T00:00:00.000Z');
+            vi.setSystemTime(startTime);
+            const stream = await loggingContentGenerator.generateContentStream(req, userPromptId);
+            vi.advanceTimersByTime(1000);
+            for await (const _ of stream) {
+                // consume stream
+            }
+            expect(wrapped.generateContentStream).toHaveBeenCalledWith(req, userPromptId);
+            expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
+            const responseEvent = vi.mocked(logApiResponse).mock.calls[0][1];
+            expect(responseEvent.duration_ms).toBe(1000);
+        });
+        it('should log error on failure', async () => {
+            const req = {
+                contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
+                model: 'gemini-pro',
+            };
+            const userPromptId = 'prompt-123';
+            const error = new Error('test error');
+            async function* createAsyncGenerator() {
+                yield Promise.reject(error);
+            }
+            vi.mocked(wrapped.generateContentStream).mockResolvedValue(createAsyncGenerator());
+            const startTime = new Date('2025-01-01T00:00:00.000Z');
+            vi.setSystemTime(startTime);
+            const stream = await loggingContentGenerator.generateContentStream(req, userPromptId);
+            vi.advanceTimersByTime(1000);
+            await expect(async () => {
+                for await (const _ of stream) {
+                    // do nothing
+                }
+            }).rejects.toThrow(error);
+            expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
+            const errorEvent = vi.mocked(logApiError).mock.calls[0][1];
+            expect(errorEvent.duration_ms).toBe(1000);
+        });
+    });
+    describe('getWrapped', () => {
+        it('should return the wrapped content generator', () => {
+            expect(loggingContentGenerator.getWrapped()).toBe(wrapped);
+        });
+    });
+    describe('countTokens', () => {
+        it('should call the wrapped countTokens method', async () => {
+            const req = { contents: [], model: 'gemini-pro' };
+            const response = { totalTokens: 10 };
+            vi.mocked(wrapped.countTokens).mockResolvedValue(response);
+            const result = await loggingContentGenerator.countTokens(req);
+            expect(wrapped.countTokens).toHaveBeenCalledWith(req);
+            expect(result).toBe(response);
+        });
+    });
+    describe('embedContent', () => {
+        it('should call the wrapped embedContent method', async () => {
+            const req = {
+                contents: [{ role: 'user', parts: [] }],
+                model: 'gemini-pro',
+            };
+            const response = { embeddings: [{ values: [] }] };
+            vi.mocked(wrapped.embedContent).mockResolvedValue(response);
+            const result = await loggingContentGenerator.embedContent(req);
+            expect(wrapped.embedContent).toHaveBeenCalledWith(req);
+            expect(result).toBe(response);
+        });
+    });
+});
+//# sourceMappingURL=loggingContentGenerator.test.js.map

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

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

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

@@ -3,8 +3,9 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { ToolCallRequestInfo, ToolCallResponseInfo, Config } from '../index.js';
+import type { ToolCallRequestInfo, Config } from '../index.js';
+import { type CompletedToolCall } from './coreToolScheduler.js';
 /**
  * Executes a single tool call non-interactively by leveraging the CoreToolScheduler.
  */
-export declare function executeToolCall(config: Config, toolCallRequest: ToolCallRequestInfo, abortSignal: AbortSignal): Promise<ToolCallResponseInfo>;
+export declare function executeToolCall(config: Config, toolCallRequest: ToolCallRequestInfo, abortSignal: AbortSignal): Promise<CompletedToolCall>;

package/dist/src/core/nonInteractiveToolExecutor.js

@@ -3,22 +3,27 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { CoreToolScheduler } from './coreToolScheduler.js';
+import { CoreToolScheduler, } from './coreToolScheduler.js';
 /**
  * Executes a single tool call non-interactively by leveraging the CoreToolScheduler.
  */
 export async function executeToolCall(config, toolCallRequest, abortSignal) {
     return new Promise((resolve, reject) => {
-        new CoreToolScheduler({
+        const scheduler = new CoreToolScheduler({
             config,
             getPreferredEditor: () => undefined,
-            onEditorClose: () => { },
             onAllToolCallsComplete: async (completedToolCalls) => {
-                resolve(completedToolCalls[0].response);
+                if (completedToolCalls.length > 0) {
+                    resolve(completedToolCalls[0]);
+                }
+                else {
+                    reject(new Error('No completed tool calls returned.'));
+                }
             },
-        })
-            .schedule(toolCallRequest, abortSignal)
-            .catch(reject);
+        });
+        scheduler.schedule(toolCallRequest, abortSignal).catch((error) => {
+            reject(error);
+        });
     });
 }
 //# sourceMappingURL=nonInteractiveToolExecutor.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"nonInteractiveToolExecutor.js","sourceRoot":"","sources":["../../../src/core/nonInteractiveToolExecutor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAAc,EACd,eAAoC,EACpC,WAAwB;IAExB,OAAO,IAAI,OAAO,CAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3D,IAAI,iBAAiB,CAAC;YACpB,MAAM;YACN,kBAAkB,EAAE,GAAG,EAAE,CAAC,SAAS;YACnC,aAAa,EAAE,GAAG,EAAE,GAAE,CAAC;YACvB,sBAAsB,EAAE,KAAK,EAAE,kBAAkB,EAAE,EAAE;gBACnD,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC1C,CAAC;SACF,CAAC;aACC,QAAQ,CAAC,eAAe,EAAE,WAAW,CAAC;aACtC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"nonInteractiveToolExecutor.js","sourceRoot":"","sources":["../../../src/core/nonInteractiveToolExecutor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,iBAAiB,GAElB,MAAM,wBAAwB,CAAC;AAEhC;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAAc,EACd,eAAoC,EACpC,WAAwB;IAExB,OAAO,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACxD,MAAM,SAAS,GAAG,IAAI,iBAAiB,CAAC;YACtC,MAAM;YACN,kBAAkB,EAAE,GAAG,EAAE,CAAC,SAAS;YACnC,sBAAsB,EAAE,KAAK,EAAE,kBAAkB,EAAE,EAAE;gBACnD,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAClC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjC,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QAEH,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/D,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}

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

@@ -43,6 +43,10 @@ describe('executeToolCall', () => {
             getUseSmartEdit: () => false,
             getUseModelRouter: () => false,
             getGeminiClient: () => null, // No client needed for these tests
+            getEnableMessageBusIntegration: () => false,
+            getMessageBus: () => null,
+            getPolicyEngine: () => null,
+            isInteractive: () => false,
         };
         abortController = new AbortController();
     });
@@ -60,7 +64,7 @@ describe('executeToolCall', () => {
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
         executeFn.mockResolvedValue(toolResult);
-        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
         expect(mockToolRegistry.getTool).toHaveBeenCalledWith('testTool');
         expect(executeFn).toHaveBeenCalledWith(request.args);
         expect(response).toStrictEqual({
@@ -96,7 +100,7 @@ describe('executeToolCall', () => {
             'testTool',
             'anotherTool',
         ]);
-        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        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',
@@ -129,7 +133,7 @@ describe('executeToolCall', () => {
         vi.spyOn(mockTool, 'build').mockImplementation(() => {
             throw new Error('Invalid parameters');
         });
-        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
         expect(response).toStrictEqual({
             callId: 'call3',
             error: new Error('Invalid parameters'),
@@ -167,7 +171,7 @@ describe('executeToolCall', () => {
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
         executeFn.mockResolvedValue(executionErrorResult);
-        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
         expect(response).toStrictEqual({
             callId: 'call4',
             error: new Error('Execution failed'),
@@ -197,7 +201,7 @@ describe('executeToolCall', () => {
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
         executeFn.mockRejectedValue(new Error('Something went very wrong'));
-        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
         expect(response).toStrictEqual({
             callId: 'call5',
             error: new Error('Something went very wrong'),
@@ -232,7 +236,7 @@ describe('executeToolCall', () => {
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
         executeFn.mockResolvedValue(toolResult);
-        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
         expect(response).toStrictEqual({
             callId: 'call6',
             error: undefined,
@@ -268,7 +272,7 @@ describe('executeToolCall', () => {
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
         executeFn.mockResolvedValue(toolResult);
-        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
         expect(response.contentLength).toBe(typeof toolResult.llmContent === 'string'
             ? toolResult.llmContent.length
             : undefined);
@@ -287,7 +291,7 @@ describe('executeToolCall', () => {
         };
         vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
         executeFn.mockResolvedValue(toolResult);
-        const response = await executeToolCall(mockConfig, request, abortController.signal);
+        const { response } = await executeToolCall(mockConfig, request, abortController.signal);
         expect(response.contentLength).toBeUndefined();
     });
 });

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.js

@@ -6,6 +6,7 @@
 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 {
@@ -170,7 +171,13 @@ export class OpenAIContentGenerator {
             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;
         }
@@ -188,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 = {
@@ -208,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, 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
@@ -287,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) {
@@ -303,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 = {
@@ -323,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, 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) {
@@ -351,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 = {
@@ -371,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, 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)) {