@google/gemini-cli-core 0.1.12 → 0.1.14
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 +30 -3
- package/dist/google-gemini-cli-core-0.1.13.tgz +0 -0
- package/dist/src/code_assist/codeAssist.js +2 -2
- package/dist/src/code_assist/codeAssist.js.map +1 -1
- package/dist/src/code_assist/oauth2.js +46 -5
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +100 -3
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.d.ts +4 -6
- package/dist/src/code_assist/server.js +4 -69
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +10 -2
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/code_assist/setup.d.ts +6 -1
- package/dist/src/code_assist/setup.js +4 -1
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/setup.test.js +4 -1
- package/dist/src/code_assist/setup.test.js.map +1 -1
- package/dist/src/code_assist/types.d.ts +2 -2
- package/dist/src/config/config.d.ts +52 -11
- package/dist/src/config/config.js +79 -33
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +29 -26
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/flashFallback.test.js +1 -1
- package/dist/src/config/flashFallback.test.js.map +1 -1
- package/dist/src/core/client.d.ts +8 -3
- package/dist/src/core/client.js +62 -3
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +145 -37
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +3 -2
- package/dist/src/core/contentGenerator.js +5 -4
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +12 -5
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.js +14 -1
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +84 -2
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +4 -3
- package/dist/src/core/geminiChat.js +8 -11
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiRequest.js +2 -37
- package/dist/src/core/geminiRequest.js.map +1 -1
- package/dist/src/core/logger.js +6 -0
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/logger.test.js +1 -1
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/modelCheck.d.ts +1 -1
- package/dist/src/core/modelCheck.js +10 -3
- package/dist/src/core/modelCheck.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +8 -5
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.js +42 -18
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/prompts.test.js +121 -4
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/core/turn.d.ts +12 -3
- package/dist/src/core/turn.js +10 -0
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +129 -0
- package/dist/src/core/turn.test.js.map +1 -1
- package/dist/src/ide/ide-client.d.ts +28 -0
- package/dist/src/ide/ide-client.js +79 -0
- package/dist/src/ide/ide-client.js.map +1 -0
- package/dist/src/ide/ideContext.d.ts +174 -0
- package/dist/src/ide/ideContext.js +101 -0
- package/dist/src/ide/ideContext.js.map +1 -0
- package/dist/src/ide/ideContext.test.js +111 -0
- package/dist/src/ide/ideContext.test.js.map +1 -0
- package/dist/src/index.d.ts +11 -0
- package/dist/src/index.js +11 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/google-auth-provider.d.ts +23 -0
- package/dist/src/mcp/google-auth-provider.js +63 -0
- package/dist/src/mcp/google-auth-provider.js.map +1 -0
- package/dist/src/mcp/google-auth-provider.test.d.ts +6 -0
- package/dist/src/mcp/google-auth-provider.test.js +54 -0
- package/dist/src/mcp/google-auth-provider.test.js.map +1 -0
- package/dist/src/mcp/oauth-provider.d.ts +142 -0
- package/dist/src/mcp/oauth-provider.js +446 -0
- package/dist/src/mcp/oauth-provider.js.map +1 -0
- package/dist/src/mcp/oauth-provider.test.d.ts +6 -0
- package/dist/src/mcp/oauth-provider.test.js +520 -0
- package/dist/src/mcp/oauth-provider.test.js.map +1 -0
- package/dist/src/mcp/oauth-token-storage.d.ts +81 -0
- package/dist/src/mcp/oauth-token-storage.js +149 -0
- package/dist/src/mcp/oauth-token-storage.js.map +1 -0
- package/dist/src/mcp/oauth-token-storage.test.d.ts +6 -0
- package/dist/src/mcp/oauth-token-storage.test.js +205 -0
- package/dist/src/mcp/oauth-token-storage.test.js.map +1 -0
- package/dist/src/mcp/oauth-utils.d.ts +109 -0
- package/dist/src/mcp/oauth-utils.js +183 -0
- package/dist/src/mcp/oauth-utils.js.map +1 -0
- package/dist/src/mcp/oauth-utils.test.d.ts +6 -0
- package/dist/src/mcp/oauth-utils.test.js +144 -0
- package/dist/src/mcp/oauth-utils.test.js.map +1 -0
- package/dist/src/services/gitService.js +1 -5
- package/dist/src/services/gitService.js.map +1 -1
- package/dist/src/services/gitService.test.js +1 -6
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/loopDetectionService.d.ts +94 -0
- package/dist/src/services/loopDetectionService.js +318 -0
- package/dist/src/services/loopDetectionService.js.map +1 -0
- package/dist/src/services/loopDetectionService.test.d.ts +6 -0
- package/dist/src/services/loopDetectionService.test.js +266 -0
- package/dist/src/services/loopDetectionService.test.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +5 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +69 -4
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +4 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +9 -0
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/constants.d.ts +1 -0
- package/dist/src/telemetry/constants.js +1 -0
- package/dist/src/telemetry/constants.js.map +1 -1
- package/dist/src/telemetry/file-exporters.d.ts +28 -0
- package/dist/src/telemetry/file-exporters.js +62 -0
- package/dist/src/telemetry/file-exporters.js.map +1 -0
- package/dist/src/telemetry/integration.test.circular.d.ts +6 -0
- package/dist/src/telemetry/integration.test.circular.js +53 -0
- package/dist/src/telemetry/integration.test.circular.js.map +1 -0
- package/dist/src/telemetry/loggers.d.ts +3 -1
- package/dist/src/telemetry/loggers.js +34 -2
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.circular.d.ts +6 -0
- package/dist/src/telemetry/loggers.test.circular.js +100 -0
- package/dist/src/telemetry/loggers.test.circular.js.map +1 -0
- package/dist/src/telemetry/sdk.js +17 -6
- package/dist/src/telemetry/sdk.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +19 -1
- package/dist/src/telemetry/types.js +28 -0
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +1 -0
- package/dist/src/telemetry/uiTelemetry.js +7 -0
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +92 -0
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/tools/edit.d.ts +7 -12
- package/dist/src/tools/edit.js +34 -32
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +12 -0
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +1 -14
- package/dist/src/tools/glob.js +13 -36
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +4 -3
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.d.ts +3 -6
- package/dist/src/tools/grep.js +12 -18
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +5 -2
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/ls.d.ts +6 -14
- package/dist/src/tools/ls.js +47 -40
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +59 -1
- package/dist/src/tools/mcp-client.js +557 -146
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +166 -623
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +11 -5
- package/dist/src/tools/mcp-tool.js +34 -10
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +74 -24
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/memoryTool.js +2 -2
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/read-file.d.ts +3 -3
- package/dist/src/tools/read-file.js +10 -10
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +100 -70
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +6 -10
- package/dist/src/tools/read-many-files.js +74 -43
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +7 -3
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +2 -23
- package/dist/src/tools/shell.js +58 -138
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +85 -311
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +13 -2
- package/dist/src/tools/tool-registry.js +57 -10
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +112 -41
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +37 -2
- package/dist/src/tools/tools.js +25 -2
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.js +7 -2
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +1 -0
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/tools/web-search.js +2 -2
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/write-file.d.ts +0 -8
- package/dist/src/tools/write-file.js +14 -23
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.d.ts +2 -0
- package/dist/src/utils/bfsFileSearch.js +4 -1
- package/dist/src/utils/bfsFileSearch.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.test.js +108 -105
- package/dist/src/utils/bfsFileSearch.test.js.map +1 -1
- package/dist/src/utils/browser.d.ts +13 -0
- package/dist/src/utils/browser.js +49 -0
- package/dist/src/utils/browser.js.map +1 -0
- package/dist/src/utils/editCorrector.js +4 -4
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +1 -1
- package/dist/src/utils/editor.js +16 -10
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +128 -28
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/errorReporting.d.ts +1 -1
- package/dist/src/utils/errorReporting.js +2 -2
- package/dist/src/utils/errorReporting.js.map +1 -1
- package/dist/src/utils/errorReporting.test.js +44 -38
- package/dist/src/utils/errorReporting.test.js.map +1 -1
- package/dist/src/utils/errors.js +4 -4
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/fileUtils.d.ts +4 -4
- package/dist/src/utils/fileUtils.js +33 -17
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +37 -37
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/getFolderStructure.d.ts +3 -2
- package/dist/src/utils/getFolderStructure.js +27 -28
- package/dist/src/utils/getFolderStructure.js.map +1 -1
- package/dist/src/utils/getFolderStructure.test.js +169 -187
- package/dist/src/utils/getFolderStructure.test.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.js +4 -7
- package/dist/src/utils/gitIgnoreParser.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.test.js +70 -61
- package/dist/src/utils/gitIgnoreParser.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.d.ts +2 -1
- package/dist/src/utils/memoryDiscovery.js +11 -5
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +160 -371
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/partUtils.d.ts +14 -0
- package/dist/src/utils/partUtils.js +65 -0
- package/dist/src/utils/partUtils.js.map +1 -0
- package/dist/src/utils/partUtils.test.d.ts +6 -0
- package/dist/src/utils/partUtils.test.js +130 -0
- package/dist/src/utils/partUtils.test.js.map +1 -0
- package/dist/src/utils/paths.d.ts +11 -0
- package/dist/src/utils/paths.js +17 -1
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/quotaErrorDetection.js +2 -11
- package/dist/src/utils/quotaErrorDetection.js.map +1 -1
- package/dist/src/utils/retry.d.ts +6 -0
- package/dist/src/utils/retry.js +2 -2
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/safeJsonStringify.d.ts +13 -0
- package/dist/src/utils/safeJsonStringify.js +25 -0
- package/dist/src/utils/safeJsonStringify.js.map +1 -0
- package/dist/src/utils/safeJsonStringify.test.d.ts +6 -0
- package/dist/src/utils/safeJsonStringify.test.js +61 -0
- package/dist/src/utils/safeJsonStringify.test.js.map +1 -0
- package/dist/src/utils/schemaValidator.d.ts +1 -1
- package/dist/src/utils/schemaValidator.js +6 -3
- package/dist/src/utils/schemaValidator.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +44 -0
- package/dist/src/utils/shell-utils.js +243 -0
- package/dist/src/utils/shell-utils.js.map +1 -0
- package/dist/src/utils/shell-utils.test.d.ts +6 -0
- package/dist/src/utils/shell-utils.test.js +450 -0
- package/dist/src/utils/shell-utils.test.js.map +1 -0
- package/dist/src/utils/summarizer.d.ts +1 -1
- package/dist/src/utils/summarizer.js +11 -39
- package/dist/src/utils/summarizer.js.map +1 -1
- package/dist/src/utils/summarizer.test.js +1 -1
- package/dist/src/utils/systemEncoding.d.ts +40 -0
- package/dist/src/utils/systemEncoding.js +149 -0
- package/dist/src/utils/systemEncoding.js.map +1 -0
- package/dist/src/utils/systemEncoding.test.d.ts +6 -0
- package/dist/src/utils/systemEncoding.test.js +368 -0
- package/dist/src/utils/systemEncoding.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -3
- package/dist/google-gemini-cli-core-0.1.11.tgz +0 -0
- package/dist/src/core/geminiRequest.test.js +0 -72
- package/dist/src/core/geminiRequest.test.js.map +0 -1
- /package/dist/src/{core/geminiRequest.test.d.ts → ide/ideContext.test.d.ts} +0 -0
|
@@ -0,0 +1,318 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { createHash } from 'crypto';
|
|
7
|
+
import { GeminiEventType } from '../core/turn.js';
|
|
8
|
+
import { logLoopDetected } from '../telemetry/loggers.js';
|
|
9
|
+
import { LoopDetectedEvent, LoopType } from '../telemetry/types.js';
|
|
10
|
+
import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/config.js';
|
|
11
|
+
import { Type } from '@google/genai';
|
|
12
|
+
const TOOL_CALL_LOOP_THRESHOLD = 5;
|
|
13
|
+
const CONTENT_LOOP_THRESHOLD = 10;
|
|
14
|
+
const CONTENT_CHUNK_SIZE = 50;
|
|
15
|
+
const MAX_HISTORY_LENGTH = 1000;
|
|
16
|
+
/**
|
|
17
|
+
* The number of recent conversation turns to include in the history when asking the LLM to check for a loop.
|
|
18
|
+
*/
|
|
19
|
+
const LLM_LOOP_CHECK_HISTORY_COUNT = 20;
|
|
20
|
+
/**
|
|
21
|
+
* The number of turns that must pass in a single prompt before the LLM-based loop check is activated.
|
|
22
|
+
*/
|
|
23
|
+
const LLM_CHECK_AFTER_TURNS = 30;
|
|
24
|
+
/**
|
|
25
|
+
* The default interval, in number of turns, at which the LLM-based loop check is performed.
|
|
26
|
+
* This value is adjusted dynamically based on the LLM's confidence.
|
|
27
|
+
*/
|
|
28
|
+
const DEFAULT_LLM_CHECK_INTERVAL = 3;
|
|
29
|
+
/**
|
|
30
|
+
* The minimum interval for LLM-based loop checks.
|
|
31
|
+
* This is used when the confidence of a loop is high, to check more frequently.
|
|
32
|
+
*/
|
|
33
|
+
const MIN_LLM_CHECK_INTERVAL = 5;
|
|
34
|
+
/**
|
|
35
|
+
* The maximum interval for LLM-based loop checks.
|
|
36
|
+
* This is used when the confidence of a loop is low, to check less frequently.
|
|
37
|
+
*/
|
|
38
|
+
const MAX_LLM_CHECK_INTERVAL = 15;
|
|
39
|
+
/**
|
|
40
|
+
* Service for detecting and preventing infinite loops in AI responses.
|
|
41
|
+
* Monitors tool call repetitions and content sentence repetitions.
|
|
42
|
+
*/
|
|
43
|
+
export class LoopDetectionService {
|
|
44
|
+
config;
|
|
45
|
+
promptId = '';
|
|
46
|
+
// Tool call tracking
|
|
47
|
+
lastToolCallKey = null;
|
|
48
|
+
toolCallRepetitionCount = 0;
|
|
49
|
+
// Content streaming tracking
|
|
50
|
+
streamContentHistory = '';
|
|
51
|
+
contentStats = new Map();
|
|
52
|
+
lastContentIndex = 0;
|
|
53
|
+
loopDetected = false;
|
|
54
|
+
// LLM loop track tracking
|
|
55
|
+
turnsInCurrentPrompt = 0;
|
|
56
|
+
llmCheckInterval = DEFAULT_LLM_CHECK_INTERVAL;
|
|
57
|
+
lastCheckTurn = 0;
|
|
58
|
+
constructor(config) {
|
|
59
|
+
this.config = config;
|
|
60
|
+
}
|
|
61
|
+
getToolCallKey(toolCall) {
|
|
62
|
+
const argsString = JSON.stringify(toolCall.args);
|
|
63
|
+
const keyString = `${toolCall.name}:${argsString}`;
|
|
64
|
+
return createHash('sha256').update(keyString).digest('hex');
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* Processes a stream event and checks for loop conditions.
|
|
68
|
+
* @param event - The stream event to process
|
|
69
|
+
* @returns true if a loop is detected, false otherwise
|
|
70
|
+
*/
|
|
71
|
+
addAndCheck(event) {
|
|
72
|
+
if (this.loopDetected) {
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
switch (event.type) {
|
|
76
|
+
case GeminiEventType.ToolCallRequest:
|
|
77
|
+
// content chanting only happens in one single stream, reset if there
|
|
78
|
+
// is a tool call in between
|
|
79
|
+
this.resetContentTracking();
|
|
80
|
+
this.loopDetected = this.checkToolCallLoop(event.value);
|
|
81
|
+
break;
|
|
82
|
+
case GeminiEventType.Content:
|
|
83
|
+
this.loopDetected = this.checkContentLoop(event.value);
|
|
84
|
+
break;
|
|
85
|
+
default:
|
|
86
|
+
break;
|
|
87
|
+
}
|
|
88
|
+
return this.loopDetected;
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Signals the start of a new turn in the conversation.
|
|
92
|
+
*
|
|
93
|
+
* This method increments the turn counter and, if specific conditions are met,
|
|
94
|
+
* triggers an LLM-based check to detect potential conversation loops. The check
|
|
95
|
+
* is performed periodically based on the `llmCheckInterval`.
|
|
96
|
+
*
|
|
97
|
+
* @param signal - An AbortSignal to allow for cancellation of the asynchronous LLM check.
|
|
98
|
+
* @returns A promise that resolves to `true` if a loop is detected, and `false` otherwise.
|
|
99
|
+
*/
|
|
100
|
+
async turnStarted(signal) {
|
|
101
|
+
this.turnsInCurrentPrompt++;
|
|
102
|
+
if (this.turnsInCurrentPrompt >= LLM_CHECK_AFTER_TURNS &&
|
|
103
|
+
this.turnsInCurrentPrompt - this.lastCheckTurn >= this.llmCheckInterval) {
|
|
104
|
+
this.lastCheckTurn = this.turnsInCurrentPrompt;
|
|
105
|
+
return await this.checkForLoopWithLLM(signal);
|
|
106
|
+
}
|
|
107
|
+
return false;
|
|
108
|
+
}
|
|
109
|
+
checkToolCallLoop(toolCall) {
|
|
110
|
+
const key = this.getToolCallKey(toolCall);
|
|
111
|
+
if (this.lastToolCallKey === key) {
|
|
112
|
+
this.toolCallRepetitionCount++;
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
this.lastToolCallKey = key;
|
|
116
|
+
this.toolCallRepetitionCount = 1;
|
|
117
|
+
}
|
|
118
|
+
if (this.toolCallRepetitionCount >= TOOL_CALL_LOOP_THRESHOLD) {
|
|
119
|
+
logLoopDetected(this.config, new LoopDetectedEvent(LoopType.CONSECUTIVE_IDENTICAL_TOOL_CALLS, this.promptId));
|
|
120
|
+
return true;
|
|
121
|
+
}
|
|
122
|
+
return false;
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
* Detects content loops by analyzing streaming text for repetitive patterns.
|
|
126
|
+
*
|
|
127
|
+
* The algorithm works by:
|
|
128
|
+
* 1. Appending new content to the streaming history
|
|
129
|
+
* 2. Truncating history if it exceeds the maximum length
|
|
130
|
+
* 3. Analyzing content chunks for repetitive patterns using hashing
|
|
131
|
+
* 4. Detecting loops when identical chunks appear frequently within a short distance
|
|
132
|
+
*/
|
|
133
|
+
checkContentLoop(content) {
|
|
134
|
+
this.streamContentHistory += content;
|
|
135
|
+
this.truncateAndUpdate();
|
|
136
|
+
return this.analyzeContentChunksForLoop();
|
|
137
|
+
}
|
|
138
|
+
/**
|
|
139
|
+
* Truncates the content history to prevent unbounded memory growth.
|
|
140
|
+
* When truncating, adjusts all stored indices to maintain their relative positions.
|
|
141
|
+
*/
|
|
142
|
+
truncateAndUpdate() {
|
|
143
|
+
if (this.streamContentHistory.length <= MAX_HISTORY_LENGTH) {
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
// Calculate how much content to remove from the beginning
|
|
147
|
+
const truncationAmount = this.streamContentHistory.length - MAX_HISTORY_LENGTH;
|
|
148
|
+
this.streamContentHistory =
|
|
149
|
+
this.streamContentHistory.slice(truncationAmount);
|
|
150
|
+
this.lastContentIndex = Math.max(0, this.lastContentIndex - truncationAmount);
|
|
151
|
+
// Update all stored chunk indices to account for the truncation
|
|
152
|
+
for (const [hash, oldIndices] of this.contentStats.entries()) {
|
|
153
|
+
const adjustedIndices = oldIndices
|
|
154
|
+
.map((index) => index - truncationAmount)
|
|
155
|
+
.filter((index) => index >= 0);
|
|
156
|
+
if (adjustedIndices.length > 0) {
|
|
157
|
+
this.contentStats.set(hash, adjustedIndices);
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
this.contentStats.delete(hash);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
/**
|
|
165
|
+
* Analyzes content in fixed-size chunks to detect repetitive patterns.
|
|
166
|
+
*
|
|
167
|
+
* Uses a sliding window approach:
|
|
168
|
+
* 1. Extract chunks of fixed size (CONTENT_CHUNK_SIZE)
|
|
169
|
+
* 2. Hash each chunk for efficient comparison
|
|
170
|
+
* 3. Track positions where identical chunks appear
|
|
171
|
+
* 4. Detect loops when chunks repeat frequently within a short distance
|
|
172
|
+
*/
|
|
173
|
+
analyzeContentChunksForLoop() {
|
|
174
|
+
while (this.hasMoreChunksToProcess()) {
|
|
175
|
+
// Extract current chunk of text
|
|
176
|
+
const currentChunk = this.streamContentHistory.substring(this.lastContentIndex, this.lastContentIndex + CONTENT_CHUNK_SIZE);
|
|
177
|
+
const chunkHash = createHash('sha256').update(currentChunk).digest('hex');
|
|
178
|
+
if (this.isLoopDetectedForChunk(currentChunk, chunkHash)) {
|
|
179
|
+
logLoopDetected(this.config, new LoopDetectedEvent(LoopType.CHANTING_IDENTICAL_SENTENCES, this.promptId));
|
|
180
|
+
return true;
|
|
181
|
+
}
|
|
182
|
+
// Move to next position in the sliding window
|
|
183
|
+
this.lastContentIndex++;
|
|
184
|
+
}
|
|
185
|
+
return false;
|
|
186
|
+
}
|
|
187
|
+
hasMoreChunksToProcess() {
|
|
188
|
+
return (this.lastContentIndex + CONTENT_CHUNK_SIZE <=
|
|
189
|
+
this.streamContentHistory.length);
|
|
190
|
+
}
|
|
191
|
+
/**
|
|
192
|
+
* Determines if a content chunk indicates a loop pattern.
|
|
193
|
+
*
|
|
194
|
+
* Loop detection logic:
|
|
195
|
+
* 1. Check if we've seen this hash before (new chunks are stored for future comparison)
|
|
196
|
+
* 2. Verify actual content matches to prevent hash collisions
|
|
197
|
+
* 3. Track all positions where this chunk appears
|
|
198
|
+
* 4. A loop is detected when the same chunk appears CONTENT_LOOP_THRESHOLD times
|
|
199
|
+
* within a small average distance (≤ 1.5 * chunk size)
|
|
200
|
+
*/
|
|
201
|
+
isLoopDetectedForChunk(chunk, hash) {
|
|
202
|
+
const existingIndices = this.contentStats.get(hash);
|
|
203
|
+
if (!existingIndices) {
|
|
204
|
+
this.contentStats.set(hash, [this.lastContentIndex]);
|
|
205
|
+
return false;
|
|
206
|
+
}
|
|
207
|
+
if (!this.isActualContentMatch(chunk, existingIndices[0])) {
|
|
208
|
+
return false;
|
|
209
|
+
}
|
|
210
|
+
existingIndices.push(this.lastContentIndex);
|
|
211
|
+
if (existingIndices.length < CONTENT_LOOP_THRESHOLD) {
|
|
212
|
+
return false;
|
|
213
|
+
}
|
|
214
|
+
// Analyze the most recent occurrences to see if they're clustered closely together
|
|
215
|
+
const recentIndices = existingIndices.slice(-CONTENT_LOOP_THRESHOLD);
|
|
216
|
+
const totalDistance = recentIndices[recentIndices.length - 1] - recentIndices[0];
|
|
217
|
+
const averageDistance = totalDistance / (CONTENT_LOOP_THRESHOLD - 1);
|
|
218
|
+
const maxAllowedDistance = CONTENT_CHUNK_SIZE * 1.5;
|
|
219
|
+
return averageDistance <= maxAllowedDistance;
|
|
220
|
+
}
|
|
221
|
+
/**
|
|
222
|
+
* Verifies that two chunks with the same hash actually contain identical content.
|
|
223
|
+
* This prevents false positives from hash collisions.
|
|
224
|
+
*/
|
|
225
|
+
isActualContentMatch(currentChunk, originalIndex) {
|
|
226
|
+
const originalChunk = this.streamContentHistory.substring(originalIndex, originalIndex + CONTENT_CHUNK_SIZE);
|
|
227
|
+
return originalChunk === currentChunk;
|
|
228
|
+
}
|
|
229
|
+
async checkForLoopWithLLM(signal) {
|
|
230
|
+
const recentHistory = this.config
|
|
231
|
+
.getGeminiClient()
|
|
232
|
+
.getHistory()
|
|
233
|
+
.slice(-LLM_LOOP_CHECK_HISTORY_COUNT);
|
|
234
|
+
const prompt = `You are a sophisticated AI diagnostic agent specializing in identifying when a conversational AI is stuck in an unproductive state. Your task is to analyze the provided conversation history and determine if the assistant has ceased to make meaningful progress.
|
|
235
|
+
|
|
236
|
+
An unproductive state is characterized by one or more of the following patterns over the last 5 or more assistant turns:
|
|
237
|
+
|
|
238
|
+
Repetitive Actions: The assistant repeats the same tool calls or conversational responses a decent number of times. This includes simple loops (e.g., tool_A, tool_A, tool_A) and alternating patterns (e.g., tool_A, tool_B, tool_A, tool_B, ...).
|
|
239
|
+
|
|
240
|
+
Cognitive Loop: The assistant seems unable to determine the next logical step. It might express confusion, repeatedly ask the same questions, or generate responses that don't logically follow from the previous turns, indicating it's stuck and not advancing the task.
|
|
241
|
+
|
|
242
|
+
Crucially, differentiate between a true unproductive state and legitimate, incremental progress.
|
|
243
|
+
For example, a series of 'tool_A' or 'tool_B' tool calls that make small, distinct changes to the same file (like adding docstrings to functions one by one) is considered forward progress and is NOT a loop. A loop would be repeatedly replacing the same text with the same content, or cycling between a small set of files with no net change.
|
|
244
|
+
|
|
245
|
+
Please analyze the conversation history to determine the possibility that the conversation is stuck in a repetitive, non-productive state.`;
|
|
246
|
+
const contents = [
|
|
247
|
+
...recentHistory,
|
|
248
|
+
{ role: 'user', parts: [{ text: prompt }] },
|
|
249
|
+
];
|
|
250
|
+
const schema = {
|
|
251
|
+
type: Type.OBJECT,
|
|
252
|
+
properties: {
|
|
253
|
+
reasoning: {
|
|
254
|
+
type: Type.STRING,
|
|
255
|
+
description: 'Your reasoning on if the conversation is looping without forward progress.',
|
|
256
|
+
},
|
|
257
|
+
confidence: {
|
|
258
|
+
type: Type.NUMBER,
|
|
259
|
+
description: 'A number between 0.0 and 1.0 representing your confidence that the conversation is in an unproductive state.',
|
|
260
|
+
},
|
|
261
|
+
},
|
|
262
|
+
required: ['reasoning', 'confidence'],
|
|
263
|
+
};
|
|
264
|
+
let result;
|
|
265
|
+
try {
|
|
266
|
+
result = await this.config
|
|
267
|
+
.getGeminiClient()
|
|
268
|
+
.generateJson(contents, schema, signal, DEFAULT_GEMINI_FLASH_MODEL);
|
|
269
|
+
}
|
|
270
|
+
catch (e) {
|
|
271
|
+
// Do nothing, treat it as a non-loop.
|
|
272
|
+
this.config.getDebugMode() ? console.error(e) : console.debug(e);
|
|
273
|
+
return false;
|
|
274
|
+
}
|
|
275
|
+
if (typeof result.confidence === 'number') {
|
|
276
|
+
if (result.confidence > 0.9) {
|
|
277
|
+
if (typeof result.reasoning === 'string' && result.reasoning) {
|
|
278
|
+
console.warn(result.reasoning);
|
|
279
|
+
}
|
|
280
|
+
logLoopDetected(this.config, new LoopDetectedEvent(LoopType.LLM_DETECTED_LOOP, this.promptId));
|
|
281
|
+
return true;
|
|
282
|
+
}
|
|
283
|
+
else {
|
|
284
|
+
this.llmCheckInterval = Math.round(MIN_LLM_CHECK_INTERVAL +
|
|
285
|
+
(MAX_LLM_CHECK_INTERVAL - MIN_LLM_CHECK_INTERVAL) *
|
|
286
|
+
(1 - result.confidence));
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
return false;
|
|
290
|
+
}
|
|
291
|
+
/**
|
|
292
|
+
* Resets all loop detection state.
|
|
293
|
+
*/
|
|
294
|
+
reset(promptId) {
|
|
295
|
+
this.promptId = promptId;
|
|
296
|
+
this.resetToolCallCount();
|
|
297
|
+
this.resetContentTracking();
|
|
298
|
+
this.resetLlmCheckTracking();
|
|
299
|
+
this.loopDetected = false;
|
|
300
|
+
}
|
|
301
|
+
resetToolCallCount() {
|
|
302
|
+
this.lastToolCallKey = null;
|
|
303
|
+
this.toolCallRepetitionCount = 0;
|
|
304
|
+
}
|
|
305
|
+
resetContentTracking(resetHistory = true) {
|
|
306
|
+
if (resetHistory) {
|
|
307
|
+
this.streamContentHistory = '';
|
|
308
|
+
}
|
|
309
|
+
this.contentStats.clear();
|
|
310
|
+
this.lastContentIndex = 0;
|
|
311
|
+
}
|
|
312
|
+
resetLlmCheckTracking() {
|
|
313
|
+
this.turnsInCurrentPrompt = 0;
|
|
314
|
+
this.llmCheckInterval = DEFAULT_LLM_CHECK_INTERVAL;
|
|
315
|
+
this.lastCheckTurn = 0;
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
//# sourceMappingURL=loopDetectionService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loopDetectionService.js","sourceRoot":"","sources":["../../../src/services/loopDetectionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,266 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
7
|
+
import { GeminiEventType, } from '../core/turn.js';
|
|
8
|
+
import * as loggers from '../telemetry/loggers.js';
|
|
9
|
+
import { LoopType } from '../telemetry/types.js';
|
|
10
|
+
import { LoopDetectionService } from './loopDetectionService.js';
|
|
11
|
+
vi.mock('../telemetry/loggers.js', () => ({
|
|
12
|
+
logLoopDetected: vi.fn(),
|
|
13
|
+
}));
|
|
14
|
+
const TOOL_CALL_LOOP_THRESHOLD = 5;
|
|
15
|
+
const CONTENT_LOOP_THRESHOLD = 10;
|
|
16
|
+
const CONTENT_CHUNK_SIZE = 50;
|
|
17
|
+
describe('LoopDetectionService', () => {
|
|
18
|
+
let service;
|
|
19
|
+
let mockConfig;
|
|
20
|
+
beforeEach(() => {
|
|
21
|
+
mockConfig = {
|
|
22
|
+
getTelemetryEnabled: () => true,
|
|
23
|
+
};
|
|
24
|
+
service = new LoopDetectionService(mockConfig);
|
|
25
|
+
vi.clearAllMocks();
|
|
26
|
+
});
|
|
27
|
+
const createToolCallRequestEvent = (name, args) => ({
|
|
28
|
+
type: GeminiEventType.ToolCallRequest,
|
|
29
|
+
value: {
|
|
30
|
+
name,
|
|
31
|
+
args,
|
|
32
|
+
callId: 'test-id',
|
|
33
|
+
isClientInitiated: false,
|
|
34
|
+
prompt_id: 'test-prompt-id',
|
|
35
|
+
},
|
|
36
|
+
});
|
|
37
|
+
const createContentEvent = (content) => ({
|
|
38
|
+
type: GeminiEventType.Content,
|
|
39
|
+
value: content,
|
|
40
|
+
});
|
|
41
|
+
describe('Tool Call Loop Detection', () => {
|
|
42
|
+
it(`should not detect a loop for fewer than TOOL_CALL_LOOP_THRESHOLD identical calls`, () => {
|
|
43
|
+
const event = createToolCallRequestEvent('testTool', { param: 'value' });
|
|
44
|
+
for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD - 1; i++) {
|
|
45
|
+
expect(service.addAndCheck(event)).toBe(false);
|
|
46
|
+
}
|
|
47
|
+
expect(loggers.logLoopDetected).not.toHaveBeenCalled();
|
|
48
|
+
});
|
|
49
|
+
it(`should detect a loop on the TOOL_CALL_LOOP_THRESHOLD-th identical call`, () => {
|
|
50
|
+
const event = createToolCallRequestEvent('testTool', { param: 'value' });
|
|
51
|
+
for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD - 1; i++) {
|
|
52
|
+
service.addAndCheck(event);
|
|
53
|
+
}
|
|
54
|
+
expect(service.addAndCheck(event)).toBe(true);
|
|
55
|
+
expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
|
|
56
|
+
});
|
|
57
|
+
it('should detect a loop on subsequent identical calls', () => {
|
|
58
|
+
const event = createToolCallRequestEvent('testTool', { param: 'value' });
|
|
59
|
+
for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD; i++) {
|
|
60
|
+
service.addAndCheck(event);
|
|
61
|
+
}
|
|
62
|
+
expect(service.addAndCheck(event)).toBe(true);
|
|
63
|
+
expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
|
|
64
|
+
});
|
|
65
|
+
it('should not detect a loop for different tool calls', () => {
|
|
66
|
+
const event1 = createToolCallRequestEvent('testTool', {
|
|
67
|
+
param: 'value1',
|
|
68
|
+
});
|
|
69
|
+
const event2 = createToolCallRequestEvent('testTool', {
|
|
70
|
+
param: 'value2',
|
|
71
|
+
});
|
|
72
|
+
const event3 = createToolCallRequestEvent('anotherTool', {
|
|
73
|
+
param: 'value1',
|
|
74
|
+
});
|
|
75
|
+
for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD - 2; i++) {
|
|
76
|
+
expect(service.addAndCheck(event1)).toBe(false);
|
|
77
|
+
expect(service.addAndCheck(event2)).toBe(false);
|
|
78
|
+
expect(service.addAndCheck(event3)).toBe(false);
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
it('should not reset tool call counter for other event types', () => {
|
|
82
|
+
const toolCallEvent = createToolCallRequestEvent('testTool', {
|
|
83
|
+
param: 'value',
|
|
84
|
+
});
|
|
85
|
+
const otherEvent = {
|
|
86
|
+
type: 'thought',
|
|
87
|
+
};
|
|
88
|
+
// Send events just below the threshold
|
|
89
|
+
for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD - 1; i++) {
|
|
90
|
+
expect(service.addAndCheck(toolCallEvent)).toBe(false);
|
|
91
|
+
}
|
|
92
|
+
// Send a different event type
|
|
93
|
+
expect(service.addAndCheck(otherEvent)).toBe(false);
|
|
94
|
+
// Send the tool call event again, which should now trigger the loop
|
|
95
|
+
expect(service.addAndCheck(toolCallEvent)).toBe(true);
|
|
96
|
+
expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
describe('Content Loop Detection', () => {
|
|
100
|
+
const generateRandomString = (length) => {
|
|
101
|
+
let result = '';
|
|
102
|
+
const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
|
|
103
|
+
const charactersLength = characters.length;
|
|
104
|
+
for (let i = 0; i < length; i++) {
|
|
105
|
+
result += characters.charAt(Math.floor(Math.random() * charactersLength));
|
|
106
|
+
}
|
|
107
|
+
return result;
|
|
108
|
+
};
|
|
109
|
+
it('should not detect a loop for random content', () => {
|
|
110
|
+
service.reset('');
|
|
111
|
+
for (let i = 0; i < 1000; i++) {
|
|
112
|
+
const content = generateRandomString(10);
|
|
113
|
+
const isLoop = service.addAndCheck(createContentEvent(content));
|
|
114
|
+
expect(isLoop).toBe(false);
|
|
115
|
+
}
|
|
116
|
+
expect(loggers.logLoopDetected).not.toHaveBeenCalled();
|
|
117
|
+
});
|
|
118
|
+
it('should detect a loop when a chunk of content repeats consecutively', () => {
|
|
119
|
+
service.reset('');
|
|
120
|
+
const repeatedContent = 'a'.repeat(CONTENT_CHUNK_SIZE);
|
|
121
|
+
let isLoop = false;
|
|
122
|
+
for (let i = 0; i < CONTENT_LOOP_THRESHOLD; i++) {
|
|
123
|
+
for (const char of repeatedContent) {
|
|
124
|
+
isLoop = service.addAndCheck(createContentEvent(char));
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
expect(isLoop).toBe(true);
|
|
128
|
+
expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
|
|
129
|
+
});
|
|
130
|
+
it('should not detect a loop if repetitions are very far apart', () => {
|
|
131
|
+
service.reset('');
|
|
132
|
+
const repeatedContent = 'b'.repeat(CONTENT_CHUNK_SIZE);
|
|
133
|
+
const fillerContent = generateRandomString(500);
|
|
134
|
+
let isLoop = false;
|
|
135
|
+
for (let i = 0; i < CONTENT_LOOP_THRESHOLD; i++) {
|
|
136
|
+
for (const char of repeatedContent) {
|
|
137
|
+
isLoop = service.addAndCheck(createContentEvent(char));
|
|
138
|
+
}
|
|
139
|
+
for (const char of fillerContent) {
|
|
140
|
+
isLoop = service.addAndCheck(createContentEvent(char));
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
expect(isLoop).toBe(false);
|
|
144
|
+
expect(loggers.logLoopDetected).not.toHaveBeenCalled();
|
|
145
|
+
});
|
|
146
|
+
});
|
|
147
|
+
describe('Edge Cases', () => {
|
|
148
|
+
it('should handle empty content', () => {
|
|
149
|
+
const event = createContentEvent('');
|
|
150
|
+
expect(service.addAndCheck(event)).toBe(false);
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
describe('Reset Functionality', () => {
|
|
154
|
+
it('tool call should reset content count', () => {
|
|
155
|
+
const contentEvent = createContentEvent('Some content.');
|
|
156
|
+
const toolEvent = createToolCallRequestEvent('testTool', {
|
|
157
|
+
param: 'value',
|
|
158
|
+
});
|
|
159
|
+
for (let i = 0; i < 9; i++) {
|
|
160
|
+
service.addAndCheck(contentEvent);
|
|
161
|
+
}
|
|
162
|
+
service.addAndCheck(toolEvent);
|
|
163
|
+
// Should start fresh
|
|
164
|
+
expect(service.addAndCheck(createContentEvent('Fresh content.'))).toBe(false);
|
|
165
|
+
});
|
|
166
|
+
});
|
|
167
|
+
describe('General Behavior', () => {
|
|
168
|
+
it('should return false for unhandled event types', () => {
|
|
169
|
+
const otherEvent = {
|
|
170
|
+
type: 'unhandled_event',
|
|
171
|
+
};
|
|
172
|
+
expect(service.addAndCheck(otherEvent)).toBe(false);
|
|
173
|
+
expect(service.addAndCheck(otherEvent)).toBe(false);
|
|
174
|
+
});
|
|
175
|
+
});
|
|
176
|
+
});
|
|
177
|
+
describe('LoopDetectionService LLM Checks', () => {
|
|
178
|
+
let service;
|
|
179
|
+
let mockConfig;
|
|
180
|
+
let mockGeminiClient;
|
|
181
|
+
let abortController;
|
|
182
|
+
beforeEach(() => {
|
|
183
|
+
mockGeminiClient = {
|
|
184
|
+
getHistory: vi.fn().mockReturnValue([]),
|
|
185
|
+
generateJson: vi.fn(),
|
|
186
|
+
};
|
|
187
|
+
mockConfig = {
|
|
188
|
+
getGeminiClient: () => mockGeminiClient,
|
|
189
|
+
getDebugMode: () => false,
|
|
190
|
+
getTelemetryEnabled: () => true,
|
|
191
|
+
};
|
|
192
|
+
service = new LoopDetectionService(mockConfig);
|
|
193
|
+
abortController = new AbortController();
|
|
194
|
+
vi.clearAllMocks();
|
|
195
|
+
});
|
|
196
|
+
afterEach(() => {
|
|
197
|
+
vi.restoreAllMocks();
|
|
198
|
+
});
|
|
199
|
+
const advanceTurns = async (count) => {
|
|
200
|
+
for (let i = 0; i < count; i++) {
|
|
201
|
+
await service.turnStarted(abortController.signal);
|
|
202
|
+
}
|
|
203
|
+
};
|
|
204
|
+
it('should not trigger LLM check before LLM_CHECK_AFTER_TURNS', async () => {
|
|
205
|
+
await advanceTurns(29);
|
|
206
|
+
expect(mockGeminiClient.generateJson).not.toHaveBeenCalled();
|
|
207
|
+
});
|
|
208
|
+
it('should trigger LLM check on the 30th turn', async () => {
|
|
209
|
+
mockGeminiClient.generateJson = vi
|
|
210
|
+
.fn()
|
|
211
|
+
.mockResolvedValue({ confidence: 0.1 });
|
|
212
|
+
await advanceTurns(30);
|
|
213
|
+
expect(mockGeminiClient.generateJson).toHaveBeenCalledTimes(1);
|
|
214
|
+
});
|
|
215
|
+
it('should detect a cognitive loop when confidence is high', async () => {
|
|
216
|
+
// First check at turn 30
|
|
217
|
+
mockGeminiClient.generateJson = vi
|
|
218
|
+
.fn()
|
|
219
|
+
.mockResolvedValue({ confidence: 0.85, reasoning: 'Repetitive actions' });
|
|
220
|
+
await advanceTurns(30);
|
|
221
|
+
expect(mockGeminiClient.generateJson).toHaveBeenCalledTimes(1);
|
|
222
|
+
// The confidence of 0.85 will result in a low interval.
|
|
223
|
+
// The interval will be: 5 + (15 - 5) * (1 - 0.85) = 5 + 10 * 0.15 = 6.5 -> rounded to 7
|
|
224
|
+
await advanceTurns(6); // advance to turn 36
|
|
225
|
+
mockGeminiClient.generateJson = vi
|
|
226
|
+
.fn()
|
|
227
|
+
.mockResolvedValue({ confidence: 0.95, reasoning: 'Repetitive actions' });
|
|
228
|
+
const finalResult = await service.turnStarted(abortController.signal); // This is turn 37
|
|
229
|
+
expect(finalResult).toBe(true);
|
|
230
|
+
expect(loggers.logLoopDetected).toHaveBeenCalledWith(mockConfig, expect.objectContaining({
|
|
231
|
+
'event.name': 'loop_detected',
|
|
232
|
+
loop_type: LoopType.LLM_DETECTED_LOOP,
|
|
233
|
+
}));
|
|
234
|
+
});
|
|
235
|
+
it('should not detect a loop when confidence is low', async () => {
|
|
236
|
+
mockGeminiClient.generateJson = vi
|
|
237
|
+
.fn()
|
|
238
|
+
.mockResolvedValue({ confidence: 0.5, reasoning: 'Looks okay' });
|
|
239
|
+
await advanceTurns(30);
|
|
240
|
+
const result = await service.turnStarted(abortController.signal);
|
|
241
|
+
expect(result).toBe(false);
|
|
242
|
+
expect(loggers.logLoopDetected).not.toHaveBeenCalled();
|
|
243
|
+
});
|
|
244
|
+
it('should adjust the check interval based on confidence', async () => {
|
|
245
|
+
// Confidence is 0.0, so interval should be MAX_LLM_CHECK_INTERVAL (15)
|
|
246
|
+
mockGeminiClient.generateJson = vi
|
|
247
|
+
.fn()
|
|
248
|
+
.mockResolvedValue({ confidence: 0.0 });
|
|
249
|
+
await advanceTurns(30); // First check at turn 30
|
|
250
|
+
expect(mockGeminiClient.generateJson).toHaveBeenCalledTimes(1);
|
|
251
|
+
await advanceTurns(14); // Advance to turn 44
|
|
252
|
+
expect(mockGeminiClient.generateJson).toHaveBeenCalledTimes(1);
|
|
253
|
+
await service.turnStarted(abortController.signal); // Turn 45
|
|
254
|
+
expect(mockGeminiClient.generateJson).toHaveBeenCalledTimes(2);
|
|
255
|
+
});
|
|
256
|
+
it('should handle errors from generateJson gracefully', async () => {
|
|
257
|
+
mockGeminiClient.generateJson = vi
|
|
258
|
+
.fn()
|
|
259
|
+
.mockRejectedValue(new Error('API error'));
|
|
260
|
+
await advanceTurns(30);
|
|
261
|
+
const result = await service.turnStarted(abortController.signal);
|
|
262
|
+
expect(result).toBe(false);
|
|
263
|
+
expect(loggers.logLoopDetected).not.toHaveBeenCalled();
|
|
264
|
+
});
|
|
265
|
+
});
|
|
266
|
+
//# sourceMappingURL=loopDetectionService.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loopDetectionService.test.js","sourceRoot":"","sources":["../../../src/services/loopDetectionService.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAGzE,OAAO,EACL,eAAe,GAIhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,OAAO,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;CACzB,CAAC,CAAC,CAAC;AAEJ,MAAM,wBAAwB,GAAG,CAAC,CAAC;AACnC,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAClC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAE9B,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,IAAI,OAA6B,CAAC;IAClC,IAAI,UAAkB,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,GAAG;YACX,mBAAmB,EAAE,GAAG,EAAE,CAAC,IAAI;SACX,CAAC;QACvB,OAAO,GAAG,IAAI,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC/C,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,MAAM,0BAA0B,GAAG,CACjC,IAAY,EACZ,IAA6B,EACK,EAAE,CAAC,CAAC;QACtC,IAAI,EAAE,eAAe,CAAC,eAAe;QACrC,KAAK,EAAE;YACL,IAAI;YACJ,IAAI;YACJ,MAAM,EAAE,SAAS;YACjB,iBAAiB,EAAE,KAAK;YACxB,SAAS,EAAE,gBAAgB;SAC5B;KACF,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAA4B,EAAE,CAAC,CAAC;QACzE,IAAI,EAAE,eAAe,CAAC,OAAO;QAC7B,KAAK,EAAE,OAAO;KACf,CAAC,CAAC;IAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACxC,EAAE,CAAC,kFAAkF,EAAE,GAAG,EAAE;YAC1F,MAAM,KAAK,GAAG,0BAA0B,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YACzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAwB,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjD,CAAC;YACD,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;YAChF,MAAM,KAAK,GAAG,0BAA0B,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YACzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAwB,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtD,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;YACD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,MAAM,KAAK,GAAG,0BAA0B,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YACzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAwB,EAAE,CAAC,EAAE,EAAE,CAAC;gBAClD,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;YACD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAC3D,MAAM,MAAM,GAAG,0BAA0B,CAAC,UAAU,EAAE;gBACpD,KAAK,EAAE,QAAQ;aAChB,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,0BAA0B,CAAC,UAAU,EAAE;gBACpD,KAAK,EAAE,QAAQ;aAChB,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,0BAA0B,CAAC,aAAa,EAAE;gBACvD,KAAK,EAAE,QAAQ;aAChB,CAAC,CAAC;YAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAwB,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAClE,MAAM,aAAa,GAAG,0BAA0B,CAAC,UAAU,EAAE;gBAC3D,KAAK,EAAE,OAAO;aACf,CAAC,CAAC;YACH,MAAM,UAAU,GAAG;gBACjB,IAAI,EAAE,SAAS;aACsB,CAAC;YAExC,uCAAuC;YACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAwB,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzD,CAAC;YAED,8BAA8B;YAC9B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEpD,oEAAoE;YACpE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtD,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAE,EAAE;YAC9C,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,MAAM,UAAU,GACd,gEAAgE,CAAC;YACnE,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC;YAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChC,MAAM,IAAI,UAAU,CAAC,MAAM,CACzB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,gBAAgB,CAAC,CAC7C,CAAC;YACJ,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACrD,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC9B,MAAM,OAAO,GAAG,oBAAoB,CAAC,EAAE,CAAC,CAAC;gBACzC,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;gBAChE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;YACD,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;YAC5E,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAClB,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;YAEvD,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,sBAAsB,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChD,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;oBACnC,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC;YACD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1B,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;YACpE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAClB,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;YACvD,MAAM,aAAa,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAEhD,IAAI,MAAM,GAAG,KAAK,CAAC;YACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,sBAAsB,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChD,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;oBACnC,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzD,CAAC;gBACD,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;oBACjC,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC;YACD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3B,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACzD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACrC,MAAM,KAAK,GAAG,kBAAkB,CAAC,EAAE,CAAC,CAAC;YACrC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;YAC9C,MAAM,YAAY,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;YACzD,MAAM,SAAS,GAAG,0BAA0B,CAAC,UAAU,EAAE;gBACvD,KAAK,EAAE,OAAO;aACf,CAAC,CAAC;YACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3B,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YACpC,CAAC;YAED,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAE/B,qBAAqB;YACrB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CACpE,KAAK,CACN,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACvD,MAAM,UAAU,GAAG;gBACjB,IAAI,EAAE,iBAAiB;aACc,CAAC;YACxC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,IAAI,OAA6B,CAAC;IAClC,IAAI,UAAkB,CAAC;IACvB,IAAI,gBAA8B,CAAC;IACnC,IAAI,eAAgC,CAAC;IAErC,UAAU,CAAC,GAAG,EAAE;QACd,gBAAgB,GAAG;YACjB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;YACvC,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE;SACK,CAAC;QAE7B,UAAU,GAAG;YACX,eAAe,EAAE,GAAG,EAAE,CAAC,gBAAgB;YACvC,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK;YACzB,mBAAmB,EAAE,GAAG,EAAE,CAAC,IAAI;SACX,CAAC;QAEvB,OAAO,GAAG,IAAI,oBAAoB,CAAC,UAAU,CAAC,CAAC;QAC/C,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QACxC,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,KAAK,EAAE,KAAa,EAAE,EAAE;QAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/B,MAAM,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;IACH,CAAC,CAAC;IAEF,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,YAAY,CAAC,EAAE,CAAC,CAAC;QACvB,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,gBAAgB,CAAC,YAAY,GAAG,EAAE;aAC/B,EAAE,EAAE;aACJ,iBAAiB,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1C,MAAM,YAAY,CAAC,EAAE,CAAC,CAAC;QACvB,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,yBAAyB;QACzB,gBAAgB,CAAC,YAAY,GAAG,EAAE;aAC/B,EAAE,EAAE;aACJ,iBAAiB,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAC5E,MAAM,YAAY,CAAC,EAAE,CAAC,CAAC;QACvB,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAE/D,wDAAwD;QACxD,wFAAwF;QACxF,MAAM,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB;QAE5C,gBAAgB,CAAC,YAAY,GAAG,EAAE;aAC/B,EAAE,EAAE;aACJ,iBAAiB,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAC5E,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB;QAEzF,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAClD,UAAU,EACV,MAAM,CAAC,gBAAgB,CAAC;YACtB,YAAY,EAAE,eAAe;YAC7B,SAAS,EAAE,QAAQ,CAAC,iBAAiB;SACtC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAC/D,gBAAgB,CAAC,YAAY,GAAG,EAAE;aAC/B,EAAE,EAAE;aACJ,iBAAiB,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;QACnE,MAAM,YAAY,CAAC,EAAE,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,uEAAuE;QACvE,gBAAgB,CAAC,YAAY,GAAG,EAAE;aAC/B,EAAE,EAAE;aACJ,iBAAiB,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;QAC1C,MAAM,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAyB;QACjD,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAE/D,MAAM,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB;QAC7C,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAE/D,MAAM,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU;QAC7D,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,gBAAgB,CAAC,YAAY,GAAG,EAAE;aAC/B,EAAE,EAAE;aACJ,iBAAiB,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QAC7C,MAAM,YAAY,CAAC,EAAE,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { Buffer } from 'buffer';
|
|
7
|
-
import {
|
|
7
|
+
import { HttpsProxyAgent } from 'https-proxy-agent';
|
|
8
|
+
import { StartSessionEvent, EndSessionEvent, UserPromptEvent, ToolCallEvent, ApiRequestEvent, ApiResponseEvent, ApiErrorEvent, FlashFallbackEvent, LoopDetectedEvent, FlashDecidedToContinueEvent } from '../types.js';
|
|
8
9
|
import { Config } from '../../config/config.js';
|
|
9
10
|
export interface LogResponse {
|
|
10
11
|
nextRequestWaitMs?: number;
|
|
@@ -29,6 +30,9 @@ export declare class ClearcutLogger {
|
|
|
29
30
|
logApiResponseEvent(event: ApiResponseEvent): void;
|
|
30
31
|
logApiErrorEvent(event: ApiErrorEvent): void;
|
|
31
32
|
logFlashFallbackEvent(event: FlashFallbackEvent): void;
|
|
33
|
+
logLoopDetectedEvent(event: LoopDetectedEvent): void;
|
|
34
|
+
logFlashDecidedToContinueEvent(event: FlashDecidedToContinueEvent): void;
|
|
32
35
|
logEndSessionEvent(event: EndSessionEvent): void;
|
|
36
|
+
getProxyAgent(): HttpsProxyAgent<string> | undefined;
|
|
33
37
|
shutdown(): void;
|
|
34
38
|
}
|