@google/gemini-cli-core 0.1.18 → 0.1.19-nightly.250814.514e883a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +199 -132
- package/dist/index.d.ts +3 -0
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/src/code_assist/converter.d.ts +3 -2
- package/dist/src/code_assist/converter.js +2 -2
- package/dist/src/code_assist/converter.js.map +1 -1
- package/dist/src/code_assist/converter.test.js +48 -1
- package/dist/src/code_assist/converter.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.js +1 -1
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/server.test.js +4 -1
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/code_assist/setup.js +48 -17
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/setup.test.js +105 -5
- package/dist/src/code_assist/setup.test.js.map +1 -1
- package/dist/src/config/config.d.ts +25 -6
- package/dist/src/config/config.js +47 -16
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +95 -1
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/core/client.d.ts +8 -5
- package/dist/src/core/client.js +184 -119
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +342 -37
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.js +3 -2
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +3 -2
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +21 -8
- package/dist/src/core/coreToolScheduler.js +170 -61
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +183 -41
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +7 -6
- package/dist/src/core/geminiChat.js +43 -43
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/logger.d.ts +1 -0
- package/dist/src/core/logger.js +18 -0
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/logger.test.js +29 -0
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.d.ts +29 -0
- package/dist/src/core/loggingContentGenerator.js +97 -0
- package/dist/src/core/loggingContentGenerator.js.map +1 -0
- package/dist/src/core/nonInteractiveToolExecutor.js +20 -1
- package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +7 -31
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/subagent.d.ts +230 -0
- package/dist/src/core/subagent.js +447 -0
- package/dist/src/core/subagent.js.map +1 -0
- package/dist/src/core/subagent.test.d.ts +6 -0
- package/dist/src/core/subagent.test.js +515 -0
- package/dist/src/core/subagent.test.js.map +1 -0
- package/dist/src/core/turn.js +1 -0
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +4 -0
- package/dist/src/core/turn.test.js.map +1 -1
- package/dist/src/ide/detect-ide.d.ts +12 -2
- package/dist/src/ide/detect-ide.js +64 -5
- package/dist/src/ide/detect-ide.js.map +1 -1
- package/dist/src/ide/detect-ide.test.d.ts +6 -0
- package/dist/src/ide/detect-ide.test.js +65 -0
- package/dist/src/ide/detect-ide.test.js.map +1 -0
- package/dist/src/ide/ide-client.d.ts +20 -1
- package/dist/src/ide/ide-client.js +145 -19
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-installer.js +1 -26
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +0 -4
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/ide/ideContext.d.ts +95 -0
- package/dist/src/ide/ideContext.js +45 -0
- package/dist/src/ide/ideContext.js.map +1 -1
- package/dist/src/index.d.ts +2 -1
- package/dist/src/index.js +2 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/google-auth-provider.js +9 -0
- package/dist/src/mcp/google-auth-provider.js.map +1 -1
- package/dist/src/mcp/google-auth-provider.test.js +45 -10
- package/dist/src/mcp/google-auth-provider.test.js.map +1 -1
- package/dist/src/mcp/oauth-provider.d.ts +0 -1
- package/dist/src/mcp/oauth-provider.js +0 -1
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mocks/msw.d.ts +6 -0
- package/dist/src/mocks/msw.js +8 -0
- package/dist/src/mocks/msw.js.map +1 -0
- package/dist/src/services/loopDetectionService.js +14 -11
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/loopDetectionService.test.js +191 -0
- package/dist/src/services/loopDetectionService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.js +29 -9
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +8 -0
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +50 -7
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +236 -116
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.d.ts +6 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +281 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +8 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +17 -0
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +2 -2
- package/dist/src/telemetry/index.js +2 -2
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +2 -1
- package/dist/src/telemetry/loggers.js +15 -0
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.circular.js +7 -2
- package/dist/src/telemetry/loggers.test.circular.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +7 -2
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +3 -2
- package/dist/src/telemetry/metrics.js +7 -1
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +50 -0
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/sdk.d.ts +1 -1
- package/dist/src/telemetry/sdk.js +13 -5
- package/dist/src/telemetry/sdk.js.map +1 -1
- package/dist/src/telemetry/telemetry.test.js +2 -2
- package/dist/src/telemetry/telemetry.test.js.map +1 -1
- package/dist/src/telemetry/tool-call-decision.d.ts +13 -0
- package/dist/src/telemetry/tool-call-decision.js +29 -0
- package/dist/src/telemetry/tool-call-decision.js.map +1 -0
- package/dist/src/telemetry/types.d.ts +37 -21
- package/dist/src/telemetry/types.js +55 -44
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +4 -1
- package/dist/src/telemetry/uiTelemetry.js +3 -1
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +13 -2
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/test-utils/config.d.ts +16 -0
- package/dist/src/test-utils/config.js +32 -0
- package/dist/src/test-utils/config.js.map +1 -0
- package/dist/src/test-utils/tools.d.ts +23 -0
- package/dist/src/test-utils/tools.js +41 -0
- package/dist/src/test-utils/tools.js.map +1 -0
- package/dist/src/tools/diffOptions.d.ts +2 -0
- package/dist/src/tools/diffOptions.js +28 -0
- package/dist/src/tools/diffOptions.js.map +1 -1
- package/dist/src/tools/diffOptions.test.d.ts +6 -0
- package/dist/src/tools/diffOptions.test.js +119 -0
- package/dist/src/tools/diffOptions.test.js.map +1 -0
- package/dist/src/tools/edit.d.ts +9 -33
- package/dist/src/tools/edit.js +142 -132
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +115 -51
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +3 -10
- package/dist/src/tools/glob.js +85 -89
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +22 -12
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.d.ts +3 -35
- package/dist/src/tools/grep.js +111 -83
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +40 -23
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/ls.d.ts +3 -22
- package/dist/src/tools/ls.js +81 -78
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/ls.test.js +62 -34
- package/dist/src/tools/ls.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +14 -3
- package/dist/src/tools/mcp-client.js +82 -6
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +340 -5
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +6 -13
- package/dist/src/tools/mcp-tool.js +41 -31
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +53 -51
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +10 -14
- package/dist/src/tools/memoryTool.js +128 -121
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/memoryTool.test.js +38 -18
- package/dist/src/tools/memoryTool.test.js.map +1 -1
- package/dist/src/tools/modifiable-tool.d.ts +8 -5
- package/dist/src/tools/modifiable-tool.js +4 -1
- package/dist/src/tools/modifiable-tool.js.map +1 -1
- package/dist/src/tools/modifiable-tool.test.js +3 -3
- package/dist/src/tools/modifiable-tool.test.js.map +1 -1
- package/dist/src/tools/read-file.d.ts +4 -6
- package/dist/src/tools/read-file.js +92 -45
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +192 -130
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +4 -5
- package/dist/src/tools/read-many-files.js +120 -103
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +81 -47
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +4 -6
- package/dist/src/tools/shell.js +99 -101
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +43 -28
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-error.d.ts +4 -0
- package/dist/src/tools/tool-error.js +4 -0
- package/dist/src/tools/tool-error.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +17 -20
- package/dist/src/tools/tool-registry.js +35 -77
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +19 -192
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +156 -54
- package/dist/src/tools/tools.js +196 -25
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/tools.test.d.ts +6 -0
- package/dist/src/tools/tools.test.js +117 -0
- package/dist/src/tools/tools.test.js.map +1 -0
- package/dist/src/tools/web-fetch.d.ts +4 -7
- package/dist/src/tools/web-fetch.js +62 -63
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +8 -4
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/tools/web-search.js +3 -3
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/write-file.d.ts +8 -3
- package/dist/src/tools/write-file.js +89 -22
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +112 -8
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.test.js +28 -56
- package/dist/src/utils/bfsFileSearch.test.js.map +1 -1
- package/dist/src/utils/editCorrector.js +8 -9
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/environmentContext.d.ts +21 -0
- package/dist/src/utils/environmentContext.js +90 -0
- package/dist/src/utils/environmentContext.js.map +1 -0
- package/dist/src/utils/environmentContext.test.d.ts +6 -0
- package/dist/src/utils/environmentContext.test.js +139 -0
- package/dist/src/utils/environmentContext.test.js.map +1 -0
- package/dist/src/utils/errorParsing.d.ts +8 -0
- package/dist/src/utils/errorParsing.js +93 -0
- package/dist/src/utils/errorParsing.js.map +1 -0
- package/dist/src/utils/errorParsing.test.d.ts +6 -0
- package/dist/src/utils/errorParsing.test.js +172 -0
- package/dist/src/utils/errorParsing.test.js.map +1 -0
- package/dist/src/utils/fileUtils.d.ts +7 -0
- package/dist/src/utils/fileUtils.js +15 -12
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +6 -5
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/filesearch/crawlCache.d.ts +1 -1
- package/dist/src/utils/filesearch/crawlCache.js +4 -1
- package/dist/src/utils/filesearch/crawlCache.js.map +1 -1
- package/dist/src/utils/filesearch/crawlCache.test.js +10 -0
- package/dist/src/utils/filesearch/crawlCache.test.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.d.ts +2 -0
- package/dist/src/utils/filesearch/fileSearch.js +33 -8
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.test.js +139 -0
- package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -1
- package/dist/src/utils/filesearch/result-cache.d.ts +1 -2
- package/dist/src/utils/filesearch/result-cache.js +1 -3
- package/dist/src/utils/filesearch/result-cache.js.map +1 -1
- package/dist/src/utils/filesearch/result-cache.test.js +3 -4
- package/dist/src/utils/filesearch/result-cache.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.js +4 -1
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.js +1 -1
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.test.js +17 -20
- package/dist/src/utils/memoryImportProcessor.test.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.js +5 -6
- package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.test.js +2 -2
- package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
- package/dist/src/utils/quotaErrorDetection.d.ts +1 -5
- package/dist/src/utils/quotaErrorDetection.js.map +1 -1
- package/dist/src/utils/schemaValidator.d.ts +1 -8
- package/dist/src/utils/schemaValidator.js +1 -32
- package/dist/src/utils/schemaValidator.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -1
- package/dist/google-gemini-cli-core-0.1.17.tgz +0 -0
|
@@ -0,0 +1,281 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { vi, describe, it, expect, afterEach, beforeAll, afterAll, } from 'vitest';
|
|
7
|
+
import { ClearcutLogger, TEST_ONLY } from './clearcut-logger.js';
|
|
8
|
+
import * as userAccount from '../../utils/user_account.js';
|
|
9
|
+
import * as userId from '../../utils/user_id.js';
|
|
10
|
+
import { EventMetadataKey } from './event-metadata-key.js';
|
|
11
|
+
import { makeFakeConfig } from '../../test-utils/config.js';
|
|
12
|
+
import { http, HttpResponse } from 'msw';
|
|
13
|
+
import { server } from '../../mocks/msw.js';
|
|
14
|
+
vi.mock('../../utils/user_account');
|
|
15
|
+
vi.mock('../../utils/user_id');
|
|
16
|
+
const mockUserAccount = vi.mocked(userAccount);
|
|
17
|
+
const mockUserId = vi.mocked(userId);
|
|
18
|
+
// TODO(richieforeman): Consider moving this to test setup globally.
|
|
19
|
+
beforeAll(() => {
|
|
20
|
+
server.listen({});
|
|
21
|
+
});
|
|
22
|
+
afterEach(() => {
|
|
23
|
+
server.resetHandlers();
|
|
24
|
+
});
|
|
25
|
+
afterAll(() => {
|
|
26
|
+
server.close();
|
|
27
|
+
});
|
|
28
|
+
describe('ClearcutLogger', () => {
|
|
29
|
+
const NEXT_WAIT_MS = 1234;
|
|
30
|
+
const CLEARCUT_URL = 'https://play.googleapis.com/log';
|
|
31
|
+
const MOCK_DATE = new Date('2025-01-02T00:00:00.000Z');
|
|
32
|
+
const EXAMPLE_RESPONSE = `["${NEXT_WAIT_MS}",null,[[["ANDROID_BACKUP",0],["BATTERY_STATS",0],["SMART_SETUP",0],["TRON",0]],-3334737594024971225],[]]`;
|
|
33
|
+
// A helper to get the internal events array for testing
|
|
34
|
+
const getEvents = (l) => l['events'].toArray();
|
|
35
|
+
const getEventsSize = (l) => l['events'].size;
|
|
36
|
+
const requeueFailedEvents = (l, events) => l['requeueFailedEvents'](events);
|
|
37
|
+
afterEach(() => {
|
|
38
|
+
vi.unstubAllEnvs();
|
|
39
|
+
});
|
|
40
|
+
function setup({ config = {}, lifetimeGoogleAccounts = 1, cachedGoogleAccount = 'test@google.com', installationId = 'test-installation-id', } = {}) {
|
|
41
|
+
server.resetHandlers(http.post(CLEARCUT_URL, () => HttpResponse.text(EXAMPLE_RESPONSE)));
|
|
42
|
+
vi.useFakeTimers();
|
|
43
|
+
vi.setSystemTime(MOCK_DATE);
|
|
44
|
+
const loggerConfig = makeFakeConfig({
|
|
45
|
+
...config,
|
|
46
|
+
});
|
|
47
|
+
ClearcutLogger.clearInstance();
|
|
48
|
+
mockUserAccount.getCachedGoogleAccount.mockReturnValue(cachedGoogleAccount);
|
|
49
|
+
mockUserAccount.getLifetimeGoogleAccounts.mockReturnValue(lifetimeGoogleAccounts);
|
|
50
|
+
mockUserId.getInstallationId.mockReturnValue(installationId);
|
|
51
|
+
const logger = ClearcutLogger.getInstance(loggerConfig);
|
|
52
|
+
return { logger, loggerConfig };
|
|
53
|
+
}
|
|
54
|
+
afterEach(() => {
|
|
55
|
+
ClearcutLogger.clearInstance();
|
|
56
|
+
vi.useRealTimers();
|
|
57
|
+
vi.restoreAllMocks();
|
|
58
|
+
});
|
|
59
|
+
describe('getInstance', () => {
|
|
60
|
+
it.each([
|
|
61
|
+
{ usageStatisticsEnabled: false, expectedValue: undefined },
|
|
62
|
+
{
|
|
63
|
+
usageStatisticsEnabled: true,
|
|
64
|
+
expectedValue: expect.any(ClearcutLogger),
|
|
65
|
+
},
|
|
66
|
+
])('returns an instance if usage statistics are enabled', ({ usageStatisticsEnabled, expectedValue }) => {
|
|
67
|
+
ClearcutLogger.clearInstance();
|
|
68
|
+
const { logger } = setup({
|
|
69
|
+
config: {
|
|
70
|
+
usageStatisticsEnabled,
|
|
71
|
+
},
|
|
72
|
+
});
|
|
73
|
+
expect(logger).toEqual(expectedValue);
|
|
74
|
+
});
|
|
75
|
+
it('is a singleton', () => {
|
|
76
|
+
ClearcutLogger.clearInstance();
|
|
77
|
+
const { loggerConfig } = setup();
|
|
78
|
+
const logger1 = ClearcutLogger.getInstance(loggerConfig);
|
|
79
|
+
const logger2 = ClearcutLogger.getInstance(loggerConfig);
|
|
80
|
+
expect(logger1).toBe(logger2);
|
|
81
|
+
});
|
|
82
|
+
});
|
|
83
|
+
describe('createLogEvent', () => {
|
|
84
|
+
it('logs the total number of google accounts', () => {
|
|
85
|
+
const { logger } = setup({
|
|
86
|
+
lifetimeGoogleAccounts: 9001,
|
|
87
|
+
});
|
|
88
|
+
const event = logger?.createLogEvent('abc', []);
|
|
89
|
+
expect(event?.event_metadata[0][0]).toEqual({
|
|
90
|
+
gemini_cli_key: EventMetadataKey.GEMINI_CLI_GOOGLE_ACCOUNTS_COUNT,
|
|
91
|
+
value: '9001',
|
|
92
|
+
});
|
|
93
|
+
});
|
|
94
|
+
it('logs the current surface from a github action', () => {
|
|
95
|
+
const { logger } = setup({});
|
|
96
|
+
vi.stubEnv('GITHUB_SHA', '8675309');
|
|
97
|
+
const event = logger?.createLogEvent('abc', []);
|
|
98
|
+
expect(event?.event_metadata[0][1]).toEqual({
|
|
99
|
+
gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
|
|
100
|
+
value: 'GitHub',
|
|
101
|
+
});
|
|
102
|
+
});
|
|
103
|
+
it('honors the value from env.SURFACE over all others', () => {
|
|
104
|
+
const { logger } = setup({});
|
|
105
|
+
vi.stubEnv('TERM_PROGRAM', 'vscode');
|
|
106
|
+
vi.stubEnv('SURFACE', 'ide-1234');
|
|
107
|
+
const event = logger?.createLogEvent('abc', []);
|
|
108
|
+
expect(event?.event_metadata[0][1]).toEqual({
|
|
109
|
+
gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
|
|
110
|
+
value: 'ide-1234',
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
it.each([
|
|
114
|
+
{
|
|
115
|
+
env: {
|
|
116
|
+
CURSOR_TRACE_ID: 'abc123',
|
|
117
|
+
GITHUB_SHA: undefined,
|
|
118
|
+
},
|
|
119
|
+
expectedValue: 'cursor',
|
|
120
|
+
},
|
|
121
|
+
{
|
|
122
|
+
env: {
|
|
123
|
+
TERM_PROGRAM: 'vscode',
|
|
124
|
+
GITHUB_SHA: undefined,
|
|
125
|
+
},
|
|
126
|
+
expectedValue: 'vscode',
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
env: {
|
|
130
|
+
MONOSPACE_ENV: 'true',
|
|
131
|
+
GITHUB_SHA: undefined,
|
|
132
|
+
},
|
|
133
|
+
expectedValue: 'firebasestudio',
|
|
134
|
+
},
|
|
135
|
+
{
|
|
136
|
+
env: {
|
|
137
|
+
__COG_BASHRC_SOURCED: 'true',
|
|
138
|
+
GITHUB_SHA: undefined,
|
|
139
|
+
},
|
|
140
|
+
expectedValue: 'devin',
|
|
141
|
+
},
|
|
142
|
+
{
|
|
143
|
+
env: {
|
|
144
|
+
CLOUD_SHELL: 'true',
|
|
145
|
+
GITHUB_SHA: undefined,
|
|
146
|
+
},
|
|
147
|
+
expectedValue: 'cloudshell',
|
|
148
|
+
},
|
|
149
|
+
])('logs the current surface for as $expectedValue, preempting vscode detection', ({ env, expectedValue }) => {
|
|
150
|
+
const { logger } = setup({});
|
|
151
|
+
for (const [key, value] of Object.entries(env)) {
|
|
152
|
+
vi.stubEnv(key, value);
|
|
153
|
+
}
|
|
154
|
+
vi.stubEnv('TERM_PROGRAM', 'vscode');
|
|
155
|
+
const event = logger?.createLogEvent('abc', []);
|
|
156
|
+
expect(event?.event_metadata[0][1]).toEqual({
|
|
157
|
+
gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
|
|
158
|
+
value: expectedValue,
|
|
159
|
+
});
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
describe('enqueueLogEvent', () => {
|
|
163
|
+
it('should add events to the queue', () => {
|
|
164
|
+
const { logger } = setup();
|
|
165
|
+
logger.enqueueLogEvent({ test: 'event1' });
|
|
166
|
+
expect(getEventsSize(logger)).toBe(1);
|
|
167
|
+
});
|
|
168
|
+
it('should evict the oldest event when the queue is full', () => {
|
|
169
|
+
const { logger } = setup();
|
|
170
|
+
for (let i = 0; i < TEST_ONLY.MAX_EVENTS; i++) {
|
|
171
|
+
logger.enqueueLogEvent({ event_id: i });
|
|
172
|
+
}
|
|
173
|
+
expect(getEventsSize(logger)).toBe(TEST_ONLY.MAX_EVENTS);
|
|
174
|
+
const firstEvent = JSON.parse(getEvents(logger)[0][0].source_extension_json);
|
|
175
|
+
expect(firstEvent.event_id).toBe(0);
|
|
176
|
+
// This should push out the first event
|
|
177
|
+
logger.enqueueLogEvent({ event_id: TEST_ONLY.MAX_EVENTS });
|
|
178
|
+
expect(getEventsSize(logger)).toBe(TEST_ONLY.MAX_EVENTS);
|
|
179
|
+
const newFirstEvent = JSON.parse(getEvents(logger)[0][0].source_extension_json);
|
|
180
|
+
expect(newFirstEvent.event_id).toBe(1);
|
|
181
|
+
const lastEvent = JSON.parse(getEvents(logger)[TEST_ONLY.MAX_EVENTS - 1][0].source_extension_json);
|
|
182
|
+
expect(lastEvent.event_id).toBe(TEST_ONLY.MAX_EVENTS);
|
|
183
|
+
});
|
|
184
|
+
});
|
|
185
|
+
describe('flushToClearcut', () => {
|
|
186
|
+
it('allows for usage with a configured proxy agent', async () => {
|
|
187
|
+
const { logger } = setup({
|
|
188
|
+
config: {
|
|
189
|
+
proxy: 'http://mycoolproxy.whatever.com:3128',
|
|
190
|
+
},
|
|
191
|
+
});
|
|
192
|
+
logger.enqueueLogEvent({ event_id: 1 });
|
|
193
|
+
const response = await logger.flushToClearcut();
|
|
194
|
+
expect(response.nextRequestWaitMs).toBe(NEXT_WAIT_MS);
|
|
195
|
+
});
|
|
196
|
+
it('should clear events on successful flush', async () => {
|
|
197
|
+
const { logger } = setup();
|
|
198
|
+
logger.enqueueLogEvent({ event_id: 1 });
|
|
199
|
+
const response = await logger.flushToClearcut();
|
|
200
|
+
expect(getEvents(logger)).toEqual([]);
|
|
201
|
+
expect(response.nextRequestWaitMs).toBe(NEXT_WAIT_MS);
|
|
202
|
+
});
|
|
203
|
+
it('should handle a network error and requeue events', async () => {
|
|
204
|
+
const { logger } = setup();
|
|
205
|
+
server.resetHandlers(http.post(CLEARCUT_URL, () => HttpResponse.error()));
|
|
206
|
+
logger.enqueueLogEvent({ event_id: 1 });
|
|
207
|
+
logger.enqueueLogEvent({ event_id: 2 });
|
|
208
|
+
expect(getEventsSize(logger)).toBe(2);
|
|
209
|
+
const x = logger.flushToClearcut();
|
|
210
|
+
await x;
|
|
211
|
+
expect(getEventsSize(logger)).toBe(2);
|
|
212
|
+
const events = getEvents(logger);
|
|
213
|
+
expect(JSON.parse(events[0][0].source_extension_json).event_id).toBe(1);
|
|
214
|
+
});
|
|
215
|
+
it('should handle an HTTP error and requeue events', async () => {
|
|
216
|
+
const { logger } = setup();
|
|
217
|
+
server.resetHandlers(http.post(CLEARCUT_URL, () => new HttpResponse({ 'the system is down': true }, {
|
|
218
|
+
status: 500,
|
|
219
|
+
})));
|
|
220
|
+
logger.enqueueLogEvent({ event_id: 1 });
|
|
221
|
+
logger.enqueueLogEvent({ event_id: 2 });
|
|
222
|
+
expect(getEvents(logger).length).toBe(2);
|
|
223
|
+
await logger.flushToClearcut();
|
|
224
|
+
expect(getEvents(logger).length).toBe(2);
|
|
225
|
+
const events = getEvents(logger);
|
|
226
|
+
expect(JSON.parse(events[0][0].source_extension_json).event_id).toBe(1);
|
|
227
|
+
});
|
|
228
|
+
});
|
|
229
|
+
describe('requeueFailedEvents logic', () => {
|
|
230
|
+
it('should limit the number of requeued events to max_retry_events', () => {
|
|
231
|
+
const { logger } = setup();
|
|
232
|
+
const maxRetryEvents = TEST_ONLY.MAX_RETRY_EVENTS;
|
|
233
|
+
const eventsToLogCount = maxRetryEvents + 5;
|
|
234
|
+
const eventsToSend = [];
|
|
235
|
+
for (let i = 0; i < eventsToLogCount; i++) {
|
|
236
|
+
eventsToSend.push([
|
|
237
|
+
{
|
|
238
|
+
event_time_ms: Date.now(),
|
|
239
|
+
source_extension_json: JSON.stringify({ event_id: i }),
|
|
240
|
+
},
|
|
241
|
+
]);
|
|
242
|
+
}
|
|
243
|
+
requeueFailedEvents(logger, eventsToSend);
|
|
244
|
+
expect(getEventsSize(logger)).toBe(maxRetryEvents);
|
|
245
|
+
const firstRequeuedEvent = JSON.parse(getEvents(logger)[0][0].source_extension_json);
|
|
246
|
+
// The last `maxRetryEvents` are kept. The oldest of those is at index `eventsToLogCount - maxRetryEvents`.
|
|
247
|
+
expect(firstRequeuedEvent.event_id).toBe(eventsToLogCount - maxRetryEvents);
|
|
248
|
+
});
|
|
249
|
+
it('should not requeue more events than available space in the queue', () => {
|
|
250
|
+
const { logger } = setup();
|
|
251
|
+
const maxEvents = TEST_ONLY.MAX_EVENTS;
|
|
252
|
+
const spaceToLeave = 5;
|
|
253
|
+
const initialEventCount = maxEvents - spaceToLeave;
|
|
254
|
+
for (let i = 0; i < initialEventCount; i++) {
|
|
255
|
+
logger.enqueueLogEvent({ event_id: `initial_${i}` });
|
|
256
|
+
}
|
|
257
|
+
expect(getEventsSize(logger)).toBe(initialEventCount);
|
|
258
|
+
const failedEventsCount = 10; // More than spaceToLeave
|
|
259
|
+
const eventsToSend = [];
|
|
260
|
+
for (let i = 0; i < failedEventsCount; i++) {
|
|
261
|
+
eventsToSend.push([
|
|
262
|
+
{
|
|
263
|
+
event_time_ms: Date.now(),
|
|
264
|
+
source_extension_json: JSON.stringify({ event_id: `failed_${i}` }),
|
|
265
|
+
},
|
|
266
|
+
]);
|
|
267
|
+
}
|
|
268
|
+
requeueFailedEvents(logger, eventsToSend);
|
|
269
|
+
// availableSpace is 5. eventsToRequeue is min(10, 5) = 5.
|
|
270
|
+
// Total size should be initialEventCount + 5 = maxEvents.
|
|
271
|
+
expect(getEventsSize(logger)).toBe(maxEvents);
|
|
272
|
+
// The requeued events are the *last* 5 of the failed events.
|
|
273
|
+
// startIndex = max(0, 10 - 5) = 5.
|
|
274
|
+
// Loop unshifts events from index 9 down to 5.
|
|
275
|
+
// The first element in the deque is the one with id 'failed_5'.
|
|
276
|
+
const firstRequeuedEvent = JSON.parse(getEvents(logger)[0][0].source_extension_json);
|
|
277
|
+
expect(firstRequeuedEvent.event_id).toBe('failed_5');
|
|
278
|
+
});
|
|
279
|
+
});
|
|
280
|
+
});
|
|
281
|
+
//# sourceMappingURL=clearcut-logger.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clearcut-logger.test.js","sourceRoot":"","sources":["../../../../src/telemetry/clearcut-logger/clearcut-logger.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,EAAE,EACF,QAAQ,EACR,EAAE,EACF,MAAM,EACN,SAAS,EACT,SAAS,EACT,QAAQ,GACT,MAAM,QAAQ,CAAC;AAEhB,OAAO,EAAE,cAAc,EAAiB,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEhF,OAAO,KAAK,WAAW,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,EAAE,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;AACpC,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;AAE/B,MAAM,eAAe,GAAG,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAC/C,MAAM,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAErC,oEAAoE;AACpE,SAAS,CAAC,GAAG,EAAE;IACb,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AACpB,CAAC,CAAC,CAAC;AAEH,SAAS,CAAC,GAAG,EAAE;IACb,MAAM,CAAC,aAAa,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,GAAG,EAAE;IACZ,MAAM,CAAC,KAAK,EAAE,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,MAAM,YAAY,GAAG,IAAI,CAAC;IAC1B,MAAM,YAAY,GAAG,iCAAiC,CAAC;IACvD,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,KAAK,YAAY,2GAA2G,CAAC;IACtJ,wDAAwD;IACxD,MAAM,SAAS,GAAG,CAAC,CAAiB,EAAqB,EAAE,CACzD,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAuB,CAAC;IAE7C,MAAM,aAAa,GAAG,CAAC,CAAiB,EAAU,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC;IAEtE,MAAM,mBAAmB,GAAG,CAAC,CAAiB,EAAE,MAAyB,EAAE,EAAE,CAC3E,CAAC,CAAC,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC;IAEnC,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,KAAK,CAAC,EACb,MAAM,GAAG,EAA+B,EACxC,sBAAsB,GAAG,CAAC,EAC1B,mBAAmB,GAAG,iBAAiB,EACvC,cAAc,GAAG,sBAAsB,MACrC,EAAE;QACJ,MAAM,CAAC,aAAa,CAClB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CACnE,CAAC;QAEF,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAE5B,MAAM,YAAY,GAAG,cAAc,CAAC;YAClC,GAAG,MAAM;SACV,CAAC,CAAC;QACH,cAAc,CAAC,aAAa,EAAE,CAAC;QAE/B,eAAe,CAAC,sBAAsB,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;QAC5E,eAAe,CAAC,yBAAyB,CAAC,eAAe,CACvD,sBAAsB,CACvB,CAAC;QACF,UAAU,CAAC,iBAAiB,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QAE7D,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAExD,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;IAClC,CAAC;IAED,SAAS,CAAC,GAAG,EAAE;QACb,cAAc,CAAC,aAAa,EAAE,CAAC;QAC/B,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,IAAI,CAAC;YACN,EAAE,sBAAsB,EAAE,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE;YAC3D;gBACE,sBAAsB,EAAE,IAAI;gBAC5B,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;aAC1C;SACF,CAAC,CACA,qDAAqD,EACrD,CAAC,EAAE,sBAAsB,EAAE,aAAa,EAAE,EAAE,EAAE;YAC5C,cAAc,CAAC,aAAa,EAAE,CAAC;YAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;gBACvB,MAAM,EAAE;oBACN,sBAAsB;iBACvB;aACF,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QACxC,CAAC,CACF,CAAC;QAEF,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;YACxB,cAAc,CAAC,aAAa,EAAE,CAAC;YAC/B,MAAM,EAAE,YAAY,EAAE,GAAG,KAAK,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YACzD,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YACzD,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAClD,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;gBACvB,sBAAsB,EAAE,IAAI;aAC7B,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,MAAM,EAAE,cAAc,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAEhD,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC1C,cAAc,EAAE,gBAAgB,CAAC,gCAAgC;gBACjE,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACvD,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;YAE7B,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;YAEpC,MAAM,KAAK,GAAG,MAAM,EAAE,cAAc,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAEhD,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC1C,cAAc,EAAE,gBAAgB,CAAC,kBAAkB;gBACnD,KAAK,EAAE,QAAQ;aAChB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAC3D,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;YAE7B,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;YACrC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAElC,MAAM,KAAK,GAAG,MAAM,EAAE,cAAc,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAEhD,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC1C,cAAc,EAAE,gBAAgB,CAAC,kBAAkB;gBACnD,KAAK,EAAE,UAAU;aAClB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,IAAI,CAAC;YACN;gBACE,GAAG,EAAE;oBACH,eAAe,EAAE,QAAQ;oBACzB,UAAU,EAAE,SAAS;iBACtB;gBACD,aAAa,EAAE,QAAQ;aACxB;YACD;gBACE,GAAG,EAAE;oBACH,YAAY,EAAE,QAAQ;oBACtB,UAAU,EAAE,SAAS;iBACtB;gBACD,aAAa,EAAE,QAAQ;aACxB;YACD;gBACE,GAAG,EAAE;oBACH,aAAa,EAAE,MAAM;oBACrB,UAAU,EAAE,SAAS;iBACtB;gBACD,aAAa,EAAE,gBAAgB;aAChC;YACD;gBACE,GAAG,EAAE;oBACH,oBAAoB,EAAE,MAAM;oBAC5B,UAAU,EAAE,SAAS;iBACtB;gBACD,aAAa,EAAE,OAAO;aACvB;YACD;gBACE,GAAG,EAAE;oBACH,WAAW,EAAE,MAAM;oBACnB,UAAU,EAAE,SAAS;iBACtB;gBACD,aAAa,EAAE,YAAY;aAC5B;SACF,CAAC,CACA,6EAA6E,EAC7E,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE;YACzB,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;YAC7B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC/C,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACzB,CAAC;YACD,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;YACrC,MAAM,KAAK,GAAG,MAAM,EAAE,cAAc,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAChD,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC1C,cAAc,EAAE,gBAAgB,CAAC,kBAAkB;gBACnD,KAAK,EAAE,aAAa;aACrB,CAAC,CAAC;QACL,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACxC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YAC3B,MAAO,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5C,MAAM,CAAC,aAAa,CAAC,MAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;YAC9D,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YAE3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC9C,MAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;YAC3C,CAAC;YAED,MAAM,CAAC,aAAa,CAAC,MAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAC1D,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAC3B,SAAS,CAAC,MAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAC/C,CAAC;YACF,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAEpC,uCAAuC;YACvC,MAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC;YAE5D,MAAM,CAAC,aAAa,CAAC,MAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAC1D,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAC9B,SAAS,CAAC,MAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAC/C,CAAC;YACF,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAC1B,SAAS,CAAC,MAAO,CAAC,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CACtE,CAAC;YACF,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;YAC9D,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;gBACvB,MAAM,EAAE;oBACN,KAAK,EAAE,sCAAsC;iBAC9C;aACF,CAAC,CAAC;YAEH,MAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;YAEzC,MAAM,QAAQ,GAAG,MAAM,MAAO,CAAC,eAAe,EAAE,CAAC;YAEjD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YAE3B,MAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;YACzC,MAAM,QAAQ,GAAG,MAAM,MAAO,CAAC,eAAe,EAAE,CAAC;YAEjD,MAAM,CAAC,SAAS,CAAC,MAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACvC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAChE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YAE3B,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC1E,MAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;YACzC,MAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;YACzC,MAAM,CAAC,aAAa,CAAC,MAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAEvC,MAAM,CAAC,GAAG,MAAO,CAAC,eAAe,EAAE,CAAC;YACpC,MAAM,CAAC,CAAC;YAER,MAAM,CAAC,aAAa,CAAC,MAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,MAAM,GAAG,SAAS,CAAC,MAAO,CAAC,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;YAC9D,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YAE3B,MAAM,CAAC,aAAa,CAClB,IAAI,CAAC,IAAI,CACP,YAAY,EACZ,GAAG,EAAE,CACH,IAAI,YAAY,CACd,EAAE,oBAAoB,EAAE,IAAI,EAAE,EAC9B;gBACE,MAAM,EAAE,GAAG;aACZ,CACF,CACJ,CACF,CAAC;YAEF,MAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;YACzC,MAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;YAEzC,MAAM,CAAC,SAAS,CAAC,MAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,MAAO,CAAC,eAAe,EAAE,CAAC;YAEhC,MAAM,CAAC,SAAS,CAAC,MAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,SAAS,CAAC,MAAO,CAAC,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;YACxE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YAC3B,MAAM,cAAc,GAAG,SAAS,CAAC,gBAAgB,CAAC;YAClD,MAAM,gBAAgB,GAAG,cAAc,GAAG,CAAC,CAAC;YAC5C,MAAM,YAAY,GAAsB,EAAE,CAAC;YAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC1C,YAAY,CAAC,IAAI,CAAC;oBAChB;wBACE,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE;wBACzB,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;qBACvD;iBACF,CAAC,CAAC;YACL,CAAC;YAED,mBAAmB,CAAC,MAAO,EAAE,YAAY,CAAC,CAAC;YAE3C,MAAM,CAAC,aAAa,CAAC,MAAO,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACpD,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CACnC,SAAS,CAAC,MAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAC/C,CAAC;YACF,2GAA2G;YAC3G,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,IAAI,CACtC,gBAAgB,GAAG,cAAc,CAClC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;YAC1E,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC;YACvC,MAAM,YAAY,GAAG,CAAC,CAAC;YACvB,MAAM,iBAAiB,GAAG,SAAS,GAAG,YAAY,CAAC;YACnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3C,MAAO,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;YACxD,CAAC;YACD,MAAM,CAAC,aAAa,CAAC,MAAO,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAEvD,MAAM,iBAAiB,GAAG,EAAE,CAAC,CAAC,yBAAyB;YACvD,MAAM,YAAY,GAAsB,EAAE,CAAC;YAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3C,YAAY,CAAC,IAAI,CAAC;oBAChB;wBACE,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE;wBACzB,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC;qBACnE;iBACF,CAAC,CAAC;YACL,CAAC;YAED,mBAAmB,CAAC,MAAO,EAAE,YAAY,CAAC,CAAC;YAE3C,0DAA0D;YAC1D,0DAA0D;YAC1D,MAAM,CAAC,aAAa,CAAC,MAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAE/C,6DAA6D;YAC7D,mCAAmC;YACnC,+CAA+C;YAC/C,gEAAgE;YAChE,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CACnC,SAAS,CAAC,MAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAC/C,CAAC;YACF,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -47,9 +47,16 @@ export declare enum EventMetadataKey {
|
|
|
47
47
|
GEMINI_CLI_LOOP_DETECTED_TYPE = 38,
|
|
48
48
|
GEMINI_CLI_SLASH_COMMAND_NAME = 41,
|
|
49
49
|
GEMINI_CLI_SLASH_COMMAND_SUBCOMMAND = 42,
|
|
50
|
+
GEMINI_CLI_SLASH_COMMAND_STATUS = 51,
|
|
50
51
|
GEMINI_CLI_RESPONSE_FINISH_REASON = 43,
|
|
51
52
|
GEMINI_CLI_NEXT_SPEAKER_CHECK_RESULT = 44,
|
|
52
53
|
GEMINI_CLI_MALFORMED_JSON_RESPONSE_MODEL = 45,
|
|
53
|
-
GEMINI_CLI_IDE_CONNECTION_TYPE = 46
|
|
54
|
+
GEMINI_CLI_IDE_CONNECTION_TYPE = 46,
|
|
55
|
+
GEMINI_CLI_AI_ADDED_LINES = 47,
|
|
56
|
+
GEMINI_CLI_AI_REMOVED_LINES = 48,
|
|
57
|
+
GEMINI_CLI_USER_ADDED_LINES = 49,
|
|
58
|
+
GEMINI_CLI_USER_REMOVED_LINES = 50,
|
|
59
|
+
GEMINI_CLI_KITTY_SEQUENCE_LENGTH = 53,
|
|
60
|
+
GEMINI_CLI_KITTY_TRUNCATED_SEQUENCE = 52
|
|
54
61
|
}
|
|
55
62
|
export declare function getEventMetadataKey(keyName: string): EventMetadataKey | undefined;
|
|
@@ -121,6 +121,8 @@ export var EventMetadataKey;
|
|
|
121
121
|
EventMetadataKey[EventMetadataKey["GEMINI_CLI_SLASH_COMMAND_NAME"] = 41] = "GEMINI_CLI_SLASH_COMMAND_NAME";
|
|
122
122
|
// Logs the subcommand of the slash command.
|
|
123
123
|
EventMetadataKey[EventMetadataKey["GEMINI_CLI_SLASH_COMMAND_SUBCOMMAND"] = 42] = "GEMINI_CLI_SLASH_COMMAND_SUBCOMMAND";
|
|
124
|
+
// Logs the status of the slash command (e.g. 'success', 'error')
|
|
125
|
+
EventMetadataKey[EventMetadataKey["GEMINI_CLI_SLASH_COMMAND_STATUS"] = 51] = "GEMINI_CLI_SLASH_COMMAND_STATUS";
|
|
124
126
|
// ==========================================================================
|
|
125
127
|
// Next Speaker Check Event Keys
|
|
126
128
|
// ===========================================================================
|
|
@@ -138,6 +140,21 @@ export var EventMetadataKey;
|
|
|
138
140
|
// ===========================================================================
|
|
139
141
|
// Logs the type of the IDE connection.
|
|
140
142
|
EventMetadataKey[EventMetadataKey["GEMINI_CLI_IDE_CONNECTION_TYPE"] = 46] = "GEMINI_CLI_IDE_CONNECTION_TYPE";
|
|
143
|
+
// Logs AI added lines in edit/write tool response.
|
|
144
|
+
EventMetadataKey[EventMetadataKey["GEMINI_CLI_AI_ADDED_LINES"] = 47] = "GEMINI_CLI_AI_ADDED_LINES";
|
|
145
|
+
// Logs AI removed lines in edit/write tool response.
|
|
146
|
+
EventMetadataKey[EventMetadataKey["GEMINI_CLI_AI_REMOVED_LINES"] = 48] = "GEMINI_CLI_AI_REMOVED_LINES";
|
|
147
|
+
// Logs user added lines in edit/write tool response.
|
|
148
|
+
EventMetadataKey[EventMetadataKey["GEMINI_CLI_USER_ADDED_LINES"] = 49] = "GEMINI_CLI_USER_ADDED_LINES";
|
|
149
|
+
// Logs user removed lines in edit/write tool response.
|
|
150
|
+
EventMetadataKey[EventMetadataKey["GEMINI_CLI_USER_REMOVED_LINES"] = 50] = "GEMINI_CLI_USER_REMOVED_LINES";
|
|
151
|
+
// ==========================================================================
|
|
152
|
+
// Kitty Sequence Overflow Event Keys
|
|
153
|
+
// ===========================================================================
|
|
154
|
+
// Logs the length of the kitty sequence that overflowed.
|
|
155
|
+
EventMetadataKey[EventMetadataKey["GEMINI_CLI_KITTY_SEQUENCE_LENGTH"] = 53] = "GEMINI_CLI_KITTY_SEQUENCE_LENGTH";
|
|
156
|
+
// Logs the truncated kitty sequence.
|
|
157
|
+
EventMetadataKey[EventMetadataKey["GEMINI_CLI_KITTY_TRUNCATED_SEQUENCE"] = 52] = "GEMINI_CLI_KITTY_TRUNCATED_SEQUENCE";
|
|
141
158
|
})(EventMetadataKey || (EventMetadataKey = {}));
|
|
142
159
|
export function getEventMetadataKey(keyName) {
|
|
143
160
|
// Access the enum member by its string name
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-metadata-key.js","sourceRoot":"","sources":["../../../../src/telemetry/clearcut-logger/event-metadata-key.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,0DAA0D;AAC1D,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"event-metadata-key.js","sourceRoot":"","sources":["../../../../src/telemetry/clearcut-logger/event-metadata-key.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,8 @@ declare const DEFAULT_TELEMETRY_TARGET = TelemetryTarget.LOCAL;
|
|
|
11
11
|
declare const DEFAULT_OTLP_ENDPOINT = "http://localhost:4317";
|
|
12
12
|
export { DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT };
|
|
13
13
|
export { initializeTelemetry, shutdownTelemetry, isTelemetrySdkInitialized, } from './sdk.js';
|
|
14
|
-
export { logCliConfiguration, logUserPrompt, logToolCall, logApiRequest, logApiError, logApiResponse, logFlashFallback, logSlashCommand, } from './loggers.js';
|
|
15
|
-
export { StartSessionEvent, EndSessionEvent, UserPromptEvent, ToolCallEvent, ApiRequestEvent, ApiErrorEvent, ApiResponseEvent, TelemetryEvent, FlashFallbackEvent, SlashCommandEvent, } from './types.js';
|
|
14
|
+
export { logCliConfiguration, logUserPrompt, logToolCall, logApiRequest, logApiError, logApiResponse, logFlashFallback, logSlashCommand, logKittySequenceOverflow, } from './loggers.js';
|
|
15
|
+
export { StartSessionEvent, EndSessionEvent, UserPromptEvent, ToolCallEvent, ApiRequestEvent, ApiErrorEvent, ApiResponseEvent, TelemetryEvent, FlashFallbackEvent, KittySequenceOverflowEvent, SlashCommandEvent, makeSlashCommandEvent, SlashCommandStatus, } from './types.js';
|
|
16
16
|
export { SpanStatusCode, ValueType } from '@opentelemetry/api';
|
|
17
17
|
export { SemanticAttributes } from '@opentelemetry/semantic-conventions';
|
|
18
18
|
export * from './uiTelemetry.js';
|
|
@@ -12,8 +12,8 @@ const DEFAULT_TELEMETRY_TARGET = TelemetryTarget.LOCAL;
|
|
|
12
12
|
const DEFAULT_OTLP_ENDPOINT = 'http://localhost:4317';
|
|
13
13
|
export { DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT };
|
|
14
14
|
export { initializeTelemetry, shutdownTelemetry, isTelemetrySdkInitialized, } from './sdk.js';
|
|
15
|
-
export { logCliConfiguration, logUserPrompt, logToolCall, logApiRequest, logApiError, logApiResponse, logFlashFallback, logSlashCommand, } from './loggers.js';
|
|
16
|
-
export { StartSessionEvent, EndSessionEvent, UserPromptEvent, ToolCallEvent, ApiRequestEvent, ApiErrorEvent, ApiResponseEvent, FlashFallbackEvent,
|
|
15
|
+
export { logCliConfiguration, logUserPrompt, logToolCall, logApiRequest, logApiError, logApiResponse, logFlashFallback, logSlashCommand, logKittySequenceOverflow, } from './loggers.js';
|
|
16
|
+
export { StartSessionEvent, EndSessionEvent, UserPromptEvent, ToolCallEvent, ApiRequestEvent, ApiErrorEvent, ApiResponseEvent, FlashFallbackEvent, KittySequenceOverflowEvent, makeSlashCommandEvent, SlashCommandStatus, } from './types.js';
|
|
17
17
|
export { SpanStatusCode, ValueType } from '@opentelemetry/api';
|
|
18
18
|
export { SemanticAttributes } from '@opentelemetry/semantic-conventions';
|
|
19
19
|
export * from './uiTelemetry.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,CAAN,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,8BAAW,CAAA;IACX,kCAAe,CAAA;AACjB,CAAC,EAHW,eAAe,KAAf,eAAe,QAG1B;AAED,MAAM,wBAAwB,GAAG,eAAe,CAAC,KAAK,CAAC;AACvD,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,CAAC;AAC3D,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,WAAW,EACX,aAAa,EACb,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,eAAe,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,CAAN,IAAY,eAGX;AAHD,WAAY,eAAe;IACzB,8BAAW,CAAA;IACX,kCAAe,CAAA;AACjB,CAAC,EAHW,eAAe,KAAf,eAAe,QAG1B;AAED,MAAM,wBAAwB,GAAG,eAAe,CAAC,KAAK,CAAC;AACvD,MAAM,qBAAqB,GAAG,uBAAuB,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,CAAC;AAC3D,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,WAAW,EACX,aAAa,EACb,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,wBAAwB,GACzB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,aAAa,EACb,eAAe,EACf,aAAa,EACb,gBAAgB,EAEhB,kBAAkB,EAClB,0BAA0B,EAE1B,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,cAAc,kBAAkB,CAAC"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { Config } from '../config/config.js';
|
|
7
|
-
import { ApiErrorEvent, ApiRequestEvent, ApiResponseEvent, IdeConnectionEvent, StartSessionEvent, ToolCallEvent, UserPromptEvent, FlashFallbackEvent, NextSpeakerCheckEvent, LoopDetectedEvent, SlashCommandEvent } from './types.js';
|
|
7
|
+
import { ApiErrorEvent, ApiRequestEvent, ApiResponseEvent, IdeConnectionEvent, StartSessionEvent, ToolCallEvent, UserPromptEvent, FlashFallbackEvent, NextSpeakerCheckEvent, LoopDetectedEvent, SlashCommandEvent, KittySequenceOverflowEvent } from './types.js';
|
|
8
8
|
export declare function logCliConfiguration(config: Config, event: StartSessionEvent): void;
|
|
9
9
|
export declare function logUserPrompt(config: Config, event: UserPromptEvent): void;
|
|
10
10
|
export declare function logToolCall(config: Config, event: ToolCallEvent): void;
|
|
@@ -16,3 +16,4 @@ export declare function logLoopDetected(config: Config, event: LoopDetectedEvent
|
|
|
16
16
|
export declare function logNextSpeakerCheck(config: Config, event: NextSpeakerCheckEvent): void;
|
|
17
17
|
export declare function logSlashCommand(config: Config, event: SlashCommandEvent): void;
|
|
18
18
|
export declare function logIdeConnection(config: Config, event: IdeConnectionEvent): void;
|
|
19
|
+
export declare function logKittySequenceOverflow(config: Config, event: KittySequenceOverflowEvent): void;
|
|
@@ -265,4 +265,19 @@ export function logIdeConnection(config, event) {
|
|
|
265
265
|
};
|
|
266
266
|
logger.emit(logRecord);
|
|
267
267
|
}
|
|
268
|
+
export function logKittySequenceOverflow(config, event) {
|
|
269
|
+
ClearcutLogger.getInstance(config)?.logKittySequenceOverflowEvent(event);
|
|
270
|
+
if (!isTelemetrySdkInitialized())
|
|
271
|
+
return;
|
|
272
|
+
const attributes = {
|
|
273
|
+
...getCommonAttributes(config),
|
|
274
|
+
...event,
|
|
275
|
+
};
|
|
276
|
+
const logger = logs.getLogger(SERVICE_NAME);
|
|
277
|
+
const logRecord = {
|
|
278
|
+
body: `Kitty sequence buffer overflow: ${event.sequence_length} bytes`,
|
|
279
|
+
attributes,
|
|
280
|
+
};
|
|
281
|
+
logger.emit(logRecord);
|
|
282
|
+
}
|
|
268
283
|
//# sourceMappingURL=loggers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loggers.js","sourceRoot":"","sources":["../../../src/telemetry/loggers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAA4B,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAEzE,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,EACpB,eAAe,EACf,iBAAiB,EACjB,oBAAoB,EACpB,wBAAwB,EACxB,YAAY,EACZ,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"loggers.js","sourceRoot":"","sources":["../../../src/telemetry/loggers.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
import { describe, it, expect } from 'vitest';
|
|
10
10
|
import { logToolCall } from './loggers.js';
|
|
11
11
|
import { ToolCallEvent } from './types.js';
|
|
12
|
+
import { MockTool } from '../test-utils/tools.js';
|
|
12
13
|
describe('Circular Reference Handling', () => {
|
|
13
14
|
it('should handle circular references in tool function arguments', () => {
|
|
14
15
|
// Create a mock config
|
|
@@ -45,11 +46,13 @@ describe('Circular Reference Handling', () => {
|
|
|
45
46
|
error: undefined, // undefined means success
|
|
46
47
|
errorType: undefined,
|
|
47
48
|
};
|
|
49
|
+
const tool = new MockTool('mock-tool');
|
|
48
50
|
const mockCompletedToolCall = {
|
|
49
51
|
status: 'success',
|
|
50
52
|
request: mockRequest,
|
|
51
53
|
response: mockResponse,
|
|
52
|
-
tool
|
|
54
|
+
tool,
|
|
55
|
+
invocation: tool.build({}),
|
|
53
56
|
durationMs: 100,
|
|
54
57
|
};
|
|
55
58
|
// Create a tool call event with circular references in function_args
|
|
@@ -86,11 +89,13 @@ describe('Circular Reference Handling', () => {
|
|
|
86
89
|
error: undefined, // undefined means success
|
|
87
90
|
errorType: undefined,
|
|
88
91
|
};
|
|
92
|
+
const tool = new MockTool('mock-tool');
|
|
89
93
|
const mockCompletedToolCall = {
|
|
90
94
|
status: 'success',
|
|
91
95
|
request: mockRequest,
|
|
92
96
|
response: mockResponse,
|
|
93
|
-
tool
|
|
97
|
+
tool,
|
|
98
|
+
invocation: tool.build({}),
|
|
94
99
|
durationMs: 100,
|
|
95
100
|
};
|
|
96
101
|
const event = new ToolCallEvent(mockCompletedToolCall);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loggers.test.circular.js","sourceRoot":"","sources":["../../../src/telemetry/loggers.test.circular.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"loggers.test.circular.js","sourceRoot":"","sources":["../../../src/telemetry/loggers.test.circular.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,8 @@ import { logs } from '@opentelemetry/api-logs';
|
|
|
8
8
|
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
|
|
9
9
|
import { EVENT_API_REQUEST, EVENT_API_RESPONSE, EVENT_CLI_CONFIG, EVENT_TOOL_CALL, EVENT_USER_PROMPT, EVENT_FLASH_FALLBACK, } from './constants.js';
|
|
10
10
|
import { logApiRequest, logApiResponse, logCliConfiguration, logUserPrompt, logToolCall, logFlashFallback, } from './loggers.js';
|
|
11
|
-
import {
|
|
11
|
+
import { ToolCallDecision } from './tool-call-decision.js';
|
|
12
|
+
import { ApiRequestEvent, ApiResponseEvent, StartSessionEvent, ToolCallEvent, UserPromptEvent, FlashFallbackEvent, } from './types.js';
|
|
12
13
|
import * as metrics from './metrics.js';
|
|
13
14
|
import * as sdk from './sdk.js';
|
|
14
15
|
import { vi, describe, beforeEach, it, expect } from 'vitest';
|
|
@@ -308,6 +309,7 @@ describe('loggers', () => {
|
|
|
308
309
|
mockLogger.emit.mockReset();
|
|
309
310
|
});
|
|
310
311
|
it('should log a tool call with all fields', () => {
|
|
312
|
+
const tool = new EditTool(mockConfig);
|
|
311
313
|
const call = {
|
|
312
314
|
status: 'success',
|
|
313
315
|
request: {
|
|
@@ -327,7 +329,8 @@ describe('loggers', () => {
|
|
|
327
329
|
error: undefined,
|
|
328
330
|
errorType: undefined,
|
|
329
331
|
},
|
|
330
|
-
tool
|
|
332
|
+
tool,
|
|
333
|
+
invocation: {},
|
|
331
334
|
durationMs: 100,
|
|
332
335
|
outcome: ToolConfirmationOutcome.ProceedOnce,
|
|
333
336
|
};
|
|
@@ -428,6 +431,7 @@ describe('loggers', () => {
|
|
|
428
431
|
},
|
|
429
432
|
outcome: ToolConfirmationOutcome.ModifyWithEditor,
|
|
430
433
|
tool: new EditTool(mockConfig),
|
|
434
|
+
invocation: {},
|
|
431
435
|
durationMs: 100,
|
|
432
436
|
};
|
|
433
437
|
const event = new ToolCallEvent(call);
|
|
@@ -477,6 +481,7 @@ describe('loggers', () => {
|
|
|
477
481
|
errorType: undefined,
|
|
478
482
|
},
|
|
479
483
|
tool: new EditTool(mockConfig),
|
|
484
|
+
invocation: {},
|
|
480
485
|
durationMs: 100,
|
|
481
486
|
};
|
|
482
487
|
const event = new ToolCallEvent(call);
|