@office-ai/aioncli-core 0.26.0 → 0.30.0

package/dist/src/telemetry/loggers.test.circular.js

@@ -10,10 +10,12 @@ import { describe, it, expect } from 'vitest';
 import { logToolCall } from './loggers.js';
 import { ToolCallEvent } from './types.js';
 import {} from '../scheduler/types.js';
+import { CoreToolCallStatus } from '../scheduler/types.js';
 import { MockTool } from '../test-utils/mock-tool.js';
 describe('Circular Reference Handling', () => {
     it('should handle circular references in tool function arguments', () => {
         // Create a mock config
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         const mockConfig = {
             getTelemetryEnabled: () => true,
             getUsageStatisticsEnabled: () => true,
@@ -49,7 +51,7 @@ describe('Circular Reference Handling', () => {
         };
         const tool = new MockTool({ name: 'mock-tool' });
         const mockCompletedToolCall = {
-            status: 'success',
+            status: CoreToolCallStatus.Success,
             request: mockRequest,
             response: mockResponse,
             tool,
@@ -63,6 +65,7 @@ describe('Circular Reference Handling', () => {
         }).not.toThrow();
     });
     it('should handle normal objects without circular references', () => {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         const mockConfig = {
             getTelemetryEnabled: () => true,
             getUsageStatisticsEnabled: () => true,
@@ -91,7 +94,7 @@ describe('Circular Reference Handling', () => {
         };
         const tool = new MockTool({ name: 'mock-tool' });
         const mockCompletedToolCall = {
-            status: 'success',
+            status: CoreToolCallStatus.Success,
             request: mockRequest,
             response: mockResponse,
             tool,

package/dist/src/telemetry/loggers.test.circular.js.map

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

package/dist/src/telemetry/loggers.test.js

@@ -3,12 +3,12 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { AuthType, EditTool, GeminiClient, ToolConfirmationOutcome, ToolErrorType, ToolRegistry, } from '../index.js';
+import { CoreToolCallStatus, AuthType, EditTool, GeminiClient, ToolConfirmationOutcome, ToolErrorType, ToolRegistry, } from '../index.js';
 import { OutputFormat } from '../output/types.js';
 import { logs } from '@opentelemetry/api-logs';
 import { logApiError, logApiRequest, logApiResponse, logCliConfiguration, logUserPrompt, logToolCall, logFlashFallback, logChatCompression, logMalformedJsonResponse, logFileOperation, logRipgrepFallback, logToolOutputTruncated, logModelRouting, logExtensionEnable, logExtensionDisable, logExtensionInstallEvent, logExtensionUninstall, logAgentStart, logAgentFinish, logWebFetchFallbackAttempt, logExtensionUpdateEvent, logHookCall, } from './loggers.js';
 import { ToolCallDecision } from './tool-call-decision.js';
-import { EVENT_API_ERROR, EVENT_API_REQUEST, EVENT_API_RESPONSE, EVENT_CLI_CONFIG, EVENT_TOOL_CALL, EVENT_USER_PROMPT, EVENT_FLASH_FALLBACK, EVENT_MALFORMED_JSON_RESPONSE, EVENT_FILE_OPERATION, EVENT_RIPGREP_FALLBACK, EVENT_MODEL_ROUTING, EVENT_EXTENSION_ENABLE, EVENT_EXTENSION_DISABLE, EVENT_EXTENSION_INSTALL, EVENT_EXTENSION_UNINSTALL, EVENT_TOOL_OUTPUT_TRUNCATED, EVENT_AGENT_START, EVENT_AGENT_FINISH, EVENT_WEB_FETCH_FALLBACK_ATTEMPT, ApiErrorEvent, ApiRequestEvent, ApiResponseEvent, StartSessionEvent, ToolCallEvent, UserPromptEvent, FlashFallbackEvent, RipgrepFallbackEvent, MalformedJsonResponseEvent, makeChatCompressionEvent, FileOperationEvent, ToolOutputTruncatedEvent, ModelRoutingEvent, ExtensionEnableEvent, ExtensionDisableEvent, ExtensionInstallEvent, ExtensionUninstallEvent, AgentStartEvent, AgentFinishEvent, WebFetchFallbackAttemptEvent, ExtensionUpdateEvent, EVENT_EXTENSION_UPDATE, HookCallEvent, EVENT_HOOK_CALL, } from './types.js';
+import { EVENT_API_ERROR, EVENT_API_REQUEST, EVENT_API_RESPONSE, EVENT_CLI_CONFIG, EVENT_TOOL_CALL, EVENT_USER_PROMPT, EVENT_FLASH_FALLBACK, EVENT_MALFORMED_JSON_RESPONSE, EVENT_FILE_OPERATION, EVENT_RIPGREP_FALLBACK, EVENT_MODEL_ROUTING, EVENT_EXTENSION_ENABLE, EVENT_EXTENSION_DISABLE, EVENT_EXTENSION_INSTALL, EVENT_EXTENSION_UNINSTALL, EVENT_TOOL_OUTPUT_TRUNCATED, EVENT_AGENT_START, EVENT_AGENT_FINISH, EVENT_WEB_FETCH_FALLBACK_ATTEMPT, ApiErrorEvent, ApiRequestEvent, ApiResponseEvent, StartSessionEvent, ToolCallEvent, UserPromptEvent, FlashFallbackEvent, RipgrepFallbackEvent, MalformedJsonResponseEvent, makeChatCompressionEvent, FileOperationEvent, ToolOutputTruncatedEvent, ModelRoutingEvent, ExtensionEnableEvent, ExtensionDisableEvent, ExtensionInstallEvent, ExtensionUninstallEvent, AgentStartEvent, AgentFinishEvent, WebFetchFallbackAttemptEvent, ExtensionUpdateEvent, EVENT_EXTENSION_UPDATE, HookCallEvent, EVENT_HOOK_CALL, LlmRole, } from './types.js';
 import * as metrics from './metrics.js';
 import { FileOperation } from './metrics.js';
 import * as sdk from './sdk.js';
@@ -23,6 +23,13 @@ import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
 import { UserAccountManager } from '../utils/userAccountManager.js';
 import { InstallationManager } from '../utils/installationManager.js';
 import { AgentTerminateMode } from '../agents/types.js';
+vi.mock('systeminformation', () => ({
+    default: {
+        graphics: vi.fn().mockResolvedValue({
+            controllers: [{ model: 'Mock GPU' }],
+        }),
+    },
+}));
 describe('loggers', () => {
     const mockLogger = {
         emit: vi.fn(),
@@ -65,7 +72,7 @@ describe('loggers', () => {
         });
     });
     describe('logCliConfiguration', () => {
-        it('should log the cli configuration', () => {
+        it('should log the cli configuration', async () => {
             const mockConfig = {
                 getSessionId: () => 'test-session-id',
                 getModel: () => 'test-model',
@@ -103,9 +110,12 @@ describe('loggers', () => {
                     }),
                 }),
                 isInteractive: () => false,
+                getExperiments: () => undefined,
+                getExperimentsAsync: async () => undefined,
             };
             const startSessionEvent = new StartSessionEvent(mockConfig);
             logCliConfiguration(mockConfig, startSessionEvent);
+            await new Promise(process.nextTick);
             expect(mockLogger.emit).toHaveBeenCalledWith({
                 body: 'CLI configuration loaded.',
                 attributes: {
@@ -145,6 +155,8 @@ describe('loggers', () => {
             getTelemetryLogPromptsEnabled: () => true,
             getUsageStatisticsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         it('should log a user prompt', () => {
             const event = new UserPromptEvent(11, 'prompt-id-8', AuthType.USE_VERTEX_AI, 'test-prompt');
@@ -173,6 +185,8 @@ describe('loggers', () => {
                 getTargetDir: () => 'target-dir',
                 getUsageStatisticsEnabled: () => true,
                 isInteractive: () => false,
+                getExperiments: () => undefined,
+                getExperimentsAsync: async () => undefined,
             };
             const event = new UserPromptEvent(11, 'prompt-id-9', AuthType.COMPUTE_ADC, 'test-prompt');
             logUserPrompt(mockConfig, event);
@@ -200,6 +214,8 @@ describe('loggers', () => {
             getTelemetryEnabled: () => true,
             getTelemetryLogPromptsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         const mockMetrics = {
             recordApiResponseMetrics: vi.fn(),
@@ -330,6 +346,18 @@ describe('loggers', () => {
                 'event.timestamp': '2025-01-01T00:00:00.000Z',
             });
         });
+        it('should log an API response with a role', () => {
+            const event = new ApiResponseEvent('test-model', 100, { prompt_id: 'prompt-id-role', contents: [] }, { candidates: [] }, AuthType.LOGIN_WITH_GOOGLE, {}, 'test-response', LlmRole.SUBAGENT);
+            logApiResponse(mockConfig, event);
+            expect(mockLogger.emit).toHaveBeenCalledWith({
+                body: 'API response from test-model. Status: 200. Duration: 100ms.',
+                attributes: expect.objectContaining({
+                    'event.name': EVENT_API_RESPONSE,
+                    prompt_id: 'prompt-id-role',
+                    role: 'subagent',
+                }),
+            });
+        });
     });
     describe('logApiError', () => {
         const mockConfig = {
@@ -339,6 +367,8 @@ describe('loggers', () => {
             getTelemetryEnabled: () => true,
             getTelemetryLogPromptsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         const mockMetrics = {
             recordApiResponseMetrics: vi.fn(),
@@ -431,6 +461,18 @@ describe('loggers', () => {
                 'event.timestamp': '2025-01-01T00:00:00.000Z',
             });
         });
+        it('should log an API error with a role', () => {
+            const event = new ApiErrorEvent('test-model', 'error', 100, { prompt_id: 'prompt-id-role', contents: [] }, AuthType.LOGIN_WITH_GOOGLE, 'ApiError', 503, LlmRole.SUBAGENT);
+            logApiError(mockConfig, event);
+            expect(mockLogger.emit).toHaveBeenCalledWith({
+                body: 'API error for test-model. Error: error. Duration: 100ms.',
+                attributes: expect.objectContaining({
+                    'event.name': EVENT_API_ERROR,
+                    prompt_id: 'prompt-id-role',
+                    role: 'subagent',
+                }),
+            });
+        });
     });
     describe('logApiRequest', () => {
         const mockConfig = {
@@ -440,6 +482,8 @@ describe('loggers', () => {
             getTelemetryEnabled: () => true,
             getTelemetryLogPromptsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
             getContentGeneratorConfig: () => ({
                 authType: AuthType.LOGIN_WITH_GOOGLE,
             }),
@@ -503,6 +547,8 @@ describe('loggers', () => {
                 getTelemetryEnabled: () => true,
                 getTelemetryLogPromptsEnabled: () => true, // Enabled
                 isInteractive: () => false,
+                getExperiments: () => undefined,
+                getExperimentsAsync: async () => undefined,
                 getContentGeneratorConfig: () => ({
                     authType: AuthType.USE_GEMINI,
                 }),
@@ -579,6 +625,8 @@ describe('loggers', () => {
                 getTelemetryEnabled: () => true,
                 getTelemetryLogPromptsEnabled: () => false, // Disabled
                 isInteractive: () => false,
+                getExperiments: () => undefined,
+                getExperimentsAsync: async () => undefined,
                 getContentGeneratorConfig: () => ({
                     authType: AuthType.USE_VERTEX_AI,
                 }),
@@ -616,6 +664,8 @@ describe('loggers', () => {
                 getTelemetryEnabled: () => true,
                 getTelemetryLogPromptsEnabled: () => true,
                 isInteractive: () => false,
+                getExperiments: () => undefined,
+                getExperimentsAsync: async () => undefined,
                 getUsageStatisticsEnabled: () => true,
                 getContentGeneratorConfig: () => ({
                     authType: AuthType.USE_GEMINI,
@@ -637,12 +687,26 @@ describe('loggers', () => {
                 }),
             });
         });
+        it('should log an API request with a role', () => {
+            const event = new ApiRequestEvent('test-model', { prompt_id: 'prompt-id-role', contents: [] }, 'request text', LlmRole.SUBAGENT);
+            logApiRequest(mockConfig, event);
+            expect(mockLogger.emit).toHaveBeenCalledWith({
+                body: 'API request to test-model.',
+                attributes: expect.objectContaining({
+                    'event.name': EVENT_API_REQUEST,
+                    prompt_id: 'prompt-id-role',
+                    role: 'subagent',
+                }),
+            });
+        });
     });
     describe('logFlashFallback', () => {
         const mockConfig = {
             getSessionId: () => 'test-session-id',
             getUsageStatisticsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         it('should log flash fallback event', () => {
             const event = new FlashFallbackEvent(AuthType.USE_VERTEX_AI);
@@ -666,6 +730,8 @@ describe('loggers', () => {
             getSessionId: () => 'test-session-id',
             getUsageStatisticsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         beforeEach(() => {
             vi.spyOn(ClearcutLogger.prototype, 'logRipgrepFallbackEvent');
@@ -738,6 +804,8 @@ describe('loggers', () => {
             getTelemetryEnabled: () => true,
             getTelemetryLogPromptsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         const mockMetrics = {
             recordToolCallMetrics: vi.fn(),
@@ -751,7 +819,7 @@ describe('loggers', () => {
         it('should log a tool call with all fields', () => {
             const tool = new EditTool(mockConfig, createMockMessageBus());
             const call = {
-                status: 'success',
+                status: CoreToolCallStatus.Success,
                 request: {
                     name: 'test-function',
                     args: {
@@ -768,6 +836,7 @@ describe('loggers', () => {
                     resultDisplay: {
                         fileDiff: 'diff',
                         fileName: 'file.txt',
+                        filePath: 'file.txt',
                         originalContent: 'old content',
                         newContent: 'new content',
                         diffStat: {
@@ -842,9 +911,52 @@ describe('loggers', () => {
             expect(mockMetrics.recordLinesChanged).toHaveBeenCalledWith(mockConfig, 1, 'added', { function_name: 'test-function' });
             expect(mockMetrics.recordLinesChanged).toHaveBeenCalledWith(mockConfig, 2, 'removed', { function_name: 'test-function' });
         });
+        it('should merge data from response into metadata', () => {
+            const call = {
+                status: CoreToolCallStatus.Success,
+                request: {
+                    name: 'ask_user',
+                    args: { questions: [] },
+                    callId: 'test-call-id',
+                    isClientInitiated: true,
+                    prompt_id: 'prompt-id-1',
+                },
+                response: {
+                    callId: 'test-call-id',
+                    responseParts: [{ text: 'test-response' }],
+                    resultDisplay: 'User answered: ...',
+                    error: undefined,
+                    errorType: undefined,
+                    data: {
+                        ask_user: {
+                            question_types: ['choice'],
+                            dismissed: false,
+                        },
+                    },
+                },
+                tool: undefined,
+                invocation: {},
+                durationMs: 100,
+                outcome: ToolConfirmationOutcome.ProceedOnce,
+            };
+            const event = new ToolCallEvent(call);
+            logToolCall(mockConfig, event);
+            expect(mockLogger.emit).toHaveBeenCalledWith({
+                body: 'Tool call: ask_user. Decision: accept. Success: true. Duration: 100ms.',
+                attributes: expect.objectContaining({
+                    function_name: 'ask_user',
+                    metadata: expect.objectContaining({
+                        ask_user: {
+                            question_types: ['choice'],
+                            dismissed: false,
+                        },
+                    }),
+                }),
+            });
+        });
         it('should log a tool call with a reject decision', () => {
             const call = {
-                status: 'error',
+                status: CoreToolCallStatus.Error,
                 request: {
                     name: 'test-function',
                     args: {
@@ -909,7 +1021,7 @@ describe('loggers', () => {
         });
         it('should log a tool call with a modify decision', () => {
             const call = {
-                status: 'success',
+                status: CoreToolCallStatus.Success,
                 request: {
                     name: 'test-function',
                     args: {
@@ -976,7 +1088,7 @@ describe('loggers', () => {
         });
         it('should log a tool call without a decision', () => {
             const call = {
-                status: 'success',
+                status: CoreToolCallStatus.Success,
                 request: {
                     name: 'test-function',
                     args: {
@@ -1043,7 +1155,7 @@ describe('loggers', () => {
         it('should log a failed tool call with an error', () => {
             const errorMessage = 'test-error';
             const call = {
-                status: 'error',
+                status: CoreToolCallStatus.Error,
                 request: {
                     name: 'test-function',
                     args: {
@@ -1115,9 +1227,9 @@ describe('loggers', () => {
                     arg2: { type: 'number' },
                 },
                 required: ['arg1', 'arg2'],
-            }, createMockMessageBus(), false, undefined, undefined, 'test-extension', 'test-extension-id');
+            }, createMockMessageBus(), false, undefined, undefined, undefined, 'test-extension', 'test-extension-id');
             const call = {
-                status: 'success',
+                status: CoreToolCallStatus.Success,
                 request: {
                     name: 'mock_mcp_tool',
                     args: { arg1: 'value1', arg2: 2 },
@@ -1199,6 +1311,8 @@ describe('loggers', () => {
             getTelemetryEnabled: () => true,
             getTelemetryLogPromptsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         const mockMetrics = {
             recordFileOperationMetric: vi.fn(),
@@ -1240,6 +1354,8 @@ describe('loggers', () => {
             getSessionId: () => 'test-session-id',
             getUsageStatisticsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         it('should log a tool output truncated event', () => {
             const event = new ToolOutputTruncatedEvent('prompt-id-1', {
@@ -1247,7 +1363,6 @@ describe('loggers', () => {
                 originalContentLength: 1000,
                 truncatedContentLength: 100,
                 threshold: 500,
-                lines: 10,
             });
             logToolOutputTruncated(mockConfig, event);
             expect(mockLogger.emit).toHaveBeenCalledWith({
@@ -1265,7 +1380,6 @@ describe('loggers', () => {
                     original_content_length: 1000,
                     truncated_content_length: 100,
                     threshold: 500,
-                    lines: 10,
                 },
             });
         });
@@ -1275,6 +1389,8 @@ describe('loggers', () => {
             getSessionId: () => 'test-session-id',
             getUsageStatisticsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         beforeEach(() => {
             vi.spyOn(ClearcutLogger.prototype, 'logModelRoutingEvent');
@@ -1297,6 +1413,22 @@ describe('loggers', () => {
             });
             expect(metrics.recordModelRoutingMetrics).toHaveBeenCalledWith(mockConfig, event);
         });
+        it('should log the event with numerical routing fields', () => {
+            const event = new ModelRoutingEvent('gemini-pro', 'NumericalClassifier (Strict)', 150, '[Score: 90 / Threshold: 80] reasoning', false, undefined, true, '80');
+            logModelRouting(mockConfig, event);
+            expect(ClearcutLogger.prototype.logModelRoutingEvent).toHaveBeenCalledWith(event);
+            expect(mockLogger.emit).toHaveBeenCalledWith({
+                body: 'Model routing decision. Model: gemini-pro, Source: NumericalClassifier (Strict)',
+                attributes: {
+                    'session.id': 'test-session-id',
+                    'user.email': 'test-user@example.com',
+                    'installation.id': 'test-installation-id',
+                    ...event,
+                    'event.name': EVENT_MODEL_ROUTING,
+                    interactive: false,
+                },
+            });
+        });
         it('should only log to Clearcut if OTEL SDK is not initialized', () => {
             vi.spyOn(sdk, 'isTelemetrySdkInitialized').mockReturnValue(false);
             vi.spyOn(sdk, 'bufferTelemetryEvent').mockImplementation(() => { });
@@ -1313,6 +1445,8 @@ describe('loggers', () => {
             getUsageStatisticsEnabled: () => true,
             getContentGeneratorConfig: () => null,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         beforeEach(() => {
             vi.spyOn(ClearcutLogger.prototype, 'logExtensionInstallEvent');
@@ -1321,7 +1455,7 @@ describe('loggers', () => {
             vi.clearAllMocks();
         });
         it('should log extension install event', async () => {
-            const event = new ExtensionInstallEvent('testing', 'testing-hash', 'testing-id', '0.1.0', 'git', 'success');
+            const event = new ExtensionInstallEvent('testing', 'testing-hash', 'testing-id', '0.1.0', 'git', CoreToolCallStatus.Success);
             await logExtensionInstallEvent(mockConfig, event);
             expect(ClearcutLogger.prototype.logExtensionInstallEvent).toHaveBeenCalledWith(event);
             expect(mockLogger.emit).toHaveBeenCalledWith({
@@ -1336,7 +1470,7 @@ describe('loggers', () => {
                     extension_name: 'testing',
                     extension_version: '0.1.0',
                     extension_source: 'git',
-                    status: 'success',
+                    status: CoreToolCallStatus.Success,
                 },
             });
         });
@@ -1347,6 +1481,8 @@ describe('loggers', () => {
             getUsageStatisticsEnabled: () => true,
             getContentGeneratorConfig: () => null,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         beforeEach(() => {
             vi.spyOn(ClearcutLogger.prototype, 'logExtensionUpdateEvent');
@@ -1355,7 +1491,7 @@ describe('loggers', () => {
             vi.clearAllMocks();
         });
         it('should log extension update event', async () => {
-            const event = new ExtensionUpdateEvent('testing', 'testing-hash', 'testing-id', '0.1.0', '0.1.1', 'git', 'success');
+            const event = new ExtensionUpdateEvent('testing', 'testing-hash', 'testing-id', '0.1.0', '0.1.1', 'git', CoreToolCallStatus.Success);
             await logExtensionUpdateEvent(mockConfig, event);
             expect(ClearcutLogger.prototype.logExtensionUpdateEvent).toHaveBeenCalledWith(event);
             expect(mockLogger.emit).toHaveBeenCalledWith({
@@ -1371,7 +1507,7 @@ describe('loggers', () => {
                     extension_version: '0.1.0',
                     extension_previous_version: '0.1.1',
                     extension_source: 'git',
-                    status: 'success',
+                    status: CoreToolCallStatus.Success,
                 },
             });
         });
@@ -1382,6 +1518,8 @@ describe('loggers', () => {
             getUsageStatisticsEnabled: () => true,
             getContentGeneratorConfig: () => null,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         beforeEach(() => {
             vi.spyOn(ClearcutLogger.prototype, 'logExtensionUninstallEvent');
@@ -1390,7 +1528,7 @@ describe('loggers', () => {
             vi.clearAllMocks();
         });
         it('should log extension uninstall event', async () => {
-            const event = new ExtensionUninstallEvent('testing', 'testing-hash', 'testing-id', 'success');
+            const event = new ExtensionUninstallEvent('testing', 'testing-hash', 'testing-id', CoreToolCallStatus.Success);
             await logExtensionUninstall(mockConfig, event);
             expect(ClearcutLogger.prototype.logExtensionUninstallEvent).toHaveBeenCalledWith(event);
             expect(mockLogger.emit).toHaveBeenCalledWith({
@@ -1403,7 +1541,7 @@ describe('loggers', () => {
                     'event.timestamp': '2025-01-01T00:00:00.000Z',
                     interactive: false,
                     extension_name: 'testing',
-                    status: 'success',
+                    status: CoreToolCallStatus.Success,
                 },
             });
         });
@@ -1413,6 +1551,8 @@ describe('loggers', () => {
             getSessionId: () => 'test-session-id',
             getUsageStatisticsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         beforeEach(() => {
             vi.spyOn(ClearcutLogger.prototype, 'logExtensionEnableEvent');
@@ -1444,6 +1584,8 @@ describe('loggers', () => {
             getSessionId: () => 'test-session-id',
             getUsageStatisticsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         beforeEach(() => {
             vi.spyOn(ClearcutLogger.prototype, 'logExtensionDisableEvent');
@@ -1475,6 +1617,8 @@ describe('loggers', () => {
             getSessionId: () => 'test-session-id',
             getUsageStatisticsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         beforeEach(() => {
             vi.spyOn(ClearcutLogger.prototype, 'logAgentStartEvent');
@@ -1503,6 +1647,8 @@ describe('loggers', () => {
             getSessionId: () => 'test-session-id',
             getUsageStatisticsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         beforeEach(() => {
             vi.spyOn(ClearcutLogger.prototype, 'logAgentFinishEvent');
@@ -1536,6 +1682,8 @@ describe('loggers', () => {
             getSessionId: () => 'test-session-id',
             getUsageStatisticsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
         };
         beforeEach(() => {
             vi.spyOn(ClearcutLogger.prototype, 'logWebFetchFallbackAttemptEvent');
@@ -1563,6 +1711,8 @@ describe('loggers', () => {
             getSessionId: () => 'test-session-id',
             getUsageStatisticsEnabled: () => true,
             isInteractive: () => false,
+            getExperiments: () => undefined,
+            getExperimentsAsync: async () => undefined,
             getTelemetryLogPromptsEnabled: () => false,
         };
         beforeEach(() => {
@@ -1594,7 +1744,7 @@ describe('loggers', () => {
         });
     });
     describe('Telemetry Buffering', () => {
-        it('should buffer events when SDK is not initialized', () => {
+        it('should buffer events when SDK is not initialized', async () => {
             vi.spyOn(sdk, 'isTelemetrySdkInitialized').mockReturnValue(false);
             const bufferSpy = vi
                 .spyOn(sdk, 'bufferTelemetryEvent')