@google/gemini-cli-core 0.26.0-preview.4 → 0.27.0-nightly.20260126.cb772a5b7
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 +18 -1
- package/dist/docs/changelogs/index.md +87 -0
- package/dist/docs/changelogs/latest.md +355 -150
- package/dist/docs/changelogs/preview.md +318 -210
- package/dist/docs/cli/commands.md +0 -6
- package/dist/docs/cli/keyboard-shortcuts.md +32 -31
- package/dist/docs/cli/settings.md +16 -18
- package/dist/docs/cli/system-prompt.md +32 -0
- package/dist/docs/cli/uninstall.md +18 -0
- package/dist/docs/extensions/index.md +1 -1
- package/dist/docs/get-started/configuration.md +9 -34
- package/dist/docs/hooks/best-practices.md +219 -398
- package/dist/docs/hooks/index.md +111 -656
- package/dist/docs/hooks/reference.md +280 -136
- package/dist/docs/hooks/writing-hooks.md +202 -796
- package/dist/docs/sidebar.json +1 -5
- package/dist/docs/tools/mcp-server.md +24 -1
- package/dist/google-gemini-cli-core-0.27.0-nightly.20260121.97aac696f.tgz +0 -0
- package/dist/src/agents/agentLoader.js +10 -10
- package/dist/src/agents/agentLoader.js.map +1 -1
- package/dist/src/agents/agentLoader.test.js +16 -19
- package/dist/src/agents/agentLoader.test.js.map +1 -1
- package/dist/src/agents/cli-help-agent.js +8 -5
- package/dist/src/agents/cli-help-agent.js.map +1 -1
- package/dist/src/agents/cli-help-agent.test.js +4 -2
- package/dist/src/agents/cli-help-agent.test.js.map +1 -1
- package/dist/src/agents/codebase-investigator.d.ts +2 -1
- package/dist/src/agents/codebase-investigator.js +62 -41
- package/dist/src/agents/codebase-investigator.js.map +1 -1
- package/dist/src/agents/codebase-investigator.test.js +15 -8
- package/dist/src/agents/codebase-investigator.test.js.map +1 -1
- package/dist/src/agents/generalist-agent.js +9 -11
- package/dist/src/agents/generalist-agent.js.map +1 -1
- package/dist/src/agents/generalist-agent.test.js +3 -3
- package/dist/src/agents/generalist-agent.test.js.map +1 -1
- package/dist/src/agents/local-executor.js +25 -9
- package/dist/src/agents/local-executor.js.map +1 -1
- package/dist/src/agents/local-executor.test.js +74 -7
- package/dist/src/agents/local-executor.test.js.map +1 -1
- package/dist/src/agents/local-invocation.test.js +7 -3
- package/dist/src/agents/local-invocation.test.js.map +1 -1
- package/dist/src/agents/registry.d.ts +8 -5
- package/dist/src/agents/registry.js +31 -75
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/registry.test.js +93 -30
- package/dist/src/agents/registry.test.js.map +1 -1
- package/dist/src/agents/remote-invocation.js +2 -1
- package/dist/src/agents/remote-invocation.js.map +1 -1
- package/dist/src/agents/remote-invocation.test.js +15 -3
- package/dist/src/agents/remote-invocation.test.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.js +1 -3
- package/dist/src/agents/subagent-tool-wrapper.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.test.js +10 -25
- package/dist/src/agents/subagent-tool-wrapper.test.js.map +1 -1
- package/dist/src/agents/subagent-tool.d.ts +15 -0
- package/dist/src/agents/subagent-tool.js +61 -0
- package/dist/src/agents/subagent-tool.js.map +1 -0
- package/dist/src/agents/types.d.ts +6 -9
- package/dist/src/agents/types.js +4 -0
- package/dist/src/agents/types.js.map +1 -1
- package/dist/src/code_assist/codeAssist.js +1 -1
- package/dist/src/code_assist/codeAssist.js.map +1 -1
- package/dist/src/code_assist/codeAssist.test.js +2 -2
- package/dist/src/code_assist/codeAssist.test.js.map +1 -1
- package/dist/src/code_assist/experiments/experiments.test.js +1 -0
- package/dist/src/code_assist/experiments/experiments.test.js.map +1 -1
- package/dist/src/code_assist/experiments/experiments_local.test.js +11 -6
- package/dist/src/code_assist/experiments/experiments_local.test.js.map +1 -1
- package/dist/src/code_assist/experiments/flagNames.d.ts +2 -0
- package/dist/src/code_assist/experiments/flagNames.js +2 -0
- package/dist/src/code_assist/experiments/flagNames.js.map +1 -1
- package/dist/src/code_assist/oauth2.js +3 -3
- package/dist/src/code_assist/oauth2.test.js +1 -1
- package/dist/src/code_assist/server.d.ts +2 -1
- package/dist/src/code_assist/server.js +3 -1
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/setup.d.ts +1 -0
- package/dist/src/code_assist/setup.js +5 -1
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/setup.test.js +10 -4
- package/dist/src/code_assist/setup.test.js.map +1 -1
- package/dist/src/config/config.d.ts +25 -18
- package/dist/src/config/config.js +70 -40
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +48 -21
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/confirmation-bus/message-bus.js +2 -32
- package/dist/src/confirmation-bus/message-bus.js.map +1 -1
- package/dist/src/confirmation-bus/types.d.ts +35 -21
- package/dist/src/confirmation-bus/types.js +8 -3
- package/dist/src/confirmation-bus/types.js.map +1 -1
- package/dist/src/core/client.js +25 -7
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +52 -6
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +1 -0
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/coreToolHookTriggers.d.ts +2 -38
- package/dist/src/core/coreToolHookTriggers.js +12 -159
- package/dist/src/core/coreToolHookTriggers.js.map +1 -1
- package/dist/src/core/coreToolHookTriggers.test.js +62 -94
- package/dist/src/core/coreToolHookTriggers.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.js +3 -5
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +3 -0
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/fakeContentGenerator.d.ts +1 -0
- package/dist/src/core/fakeContentGenerator.js +1 -0
- package/dist/src/core/fakeContentGenerator.js.map +1 -1
- package/dist/src/core/geminiChat.js +1 -0
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +21 -0
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/geminiChat_network_retry.test.js +17 -12
- package/dist/src/core/geminiChat_network_retry.test.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.d.ts +3 -0
- package/dist/src/core/loggingContentGenerator.js +6 -0
- package/dist/src/core/loggingContentGenerator.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.test.js +11 -0
- package/dist/src/core/loggingContentGenerator.test.js.map +1 -1
- package/dist/src/core/prompts-substitution.test.js +101 -0
- package/dist/src/core/prompts-substitution.test.js.map +1 -0
- package/dist/src/core/prompts.js +115 -31
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/prompts.test.js +32 -0
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/core/recordingContentGenerator.d.ts +2 -1
- package/dist/src/core/recordingContentGenerator.js +6 -1
- package/dist/src/core/recordingContentGenerator.js.map +1 -1
- package/dist/src/core/turn.d.ts +2 -0
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/hooks/hookAggregator.js +13 -3
- package/dist/src/hooks/hookAggregator.js.map +1 -1
- package/dist/src/hooks/hookEventHandler.d.ts +1 -13
- package/dist/src/hooks/hookEventHandler.js +1 -289
- package/dist/src/hooks/hookEventHandler.js.map +1 -1
- package/dist/src/hooks/hookEventHandler.test.js +1 -4
- package/dist/src/hooks/hookEventHandler.test.js.map +1 -1
- package/dist/src/hooks/hookSystem.d.ts +47 -3
- package/dist/src/hooks/hookSystem.js +90 -6
- package/dist/src/hooks/hookSystem.js.map +1 -1
- package/dist/src/hooks/hookSystem.test.js +19 -8
- package/dist/src/hooks/hookSystem.test.js.map +1 -1
- package/dist/src/hooks/types.d.ts +23 -1
- package/dist/src/hooks/types.js +28 -2
- package/dist/src/hooks/types.js.map +1 -1
- package/dist/src/hooks/types.test.js +9 -1
- package/dist/src/hooks/types.test.js.map +1 -1
- package/dist/src/ide/detect-ide.d.ts +41 -0
- package/dist/src/ide/detect-ide.js +47 -3
- package/dist/src/ide/detect-ide.js.map +1 -1
- package/dist/src/ide/detect-ide.test.js +46 -0
- package/dist/src/ide/detect-ide.test.js.map +1 -1
- package/dist/src/ide/ide-client.d.ts +1 -0
- package/dist/src/ide/ide-client.js +36 -9
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-client.test.js +154 -6
- package/dist/src/ide/ide-client.test.js.map +1 -1
- package/dist/src/index.d.ts +2 -0
- package/dist/src/index.js +2 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/oauth-provider.d.ts +1 -2
- package/dist/src/mcp/oauth-provider.js +4 -8
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-provider.test.js +32 -0
- package/dist/src/mcp/oauth-provider.test.js.map +1 -1
- package/dist/src/mcp/oauth-utils.d.ts +13 -4
- package/dist/src/mcp/oauth-utils.js +23 -19
- package/dist/src/mcp/oauth-utils.js.map +1 -1
- package/dist/src/mcp/oauth-utils.test.js +13 -8
- package/dist/src/mcp/oauth-utils.test.js.map +1 -1
- package/dist/src/policy/policy-engine.d.ts +1 -8
- package/dist/src/policy/policy-engine.js +1 -75
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/policy-engine.test.js +0 -222
- package/dist/src/policy/policy-engine.test.js.map +1 -1
- package/dist/src/routing/modelRouterService.js +18 -8
- package/dist/src/routing/modelRouterService.js.map +1 -1
- package/dist/src/routing/modelRouterService.test.js +14 -6
- package/dist/src/routing/modelRouterService.test.js.map +1 -1
- package/dist/src/routing/strategies/classifierStrategy.js +4 -7
- package/dist/src/routing/strategies/classifierStrategy.js.map +1 -1
- package/dist/src/routing/strategies/classifierStrategy.test.js +10 -4
- package/dist/src/routing/strategies/classifierStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/numericalClassifierStrategy.d.ts +13 -0
- package/dist/src/routing/strategies/numericalClassifierStrategy.js +178 -0
- package/dist/src/routing/strategies/numericalClassifierStrategy.js.map +1 -0
- package/dist/src/routing/strategies/numericalClassifierStrategy.test.js +347 -0
- package/dist/src/routing/strategies/numericalClassifierStrategy.test.js.map +1 -0
- package/dist/src/scheduler/confirmation.js +2 -3
- package/dist/src/scheduler/confirmation.js.map +1 -1
- package/dist/src/scheduler/confirmation.test.js +8 -8
- package/dist/src/scheduler/confirmation.test.js.map +1 -1
- package/dist/src/scheduler/scheduler.test.js +0 -3
- package/dist/src/scheduler/scheduler.test.js.map +1 -1
- package/dist/src/scheduler/state-manager.js +4 -0
- package/dist/src/scheduler/state-manager.js.map +1 -1
- package/dist/src/scheduler/state-manager.test.js +11 -0
- package/dist/src/scheduler/state-manager.test.js.map +1 -1
- package/dist/src/scheduler/tool-executor.js +2 -4
- package/dist/src/scheduler/tool-executor.js.map +1 -1
- package/dist/src/scheduler/tool-executor.test.js +1 -1
- package/dist/src/scheduler/tool-executor.test.js.map +1 -1
- package/dist/src/services/chatRecordingService.d.ts +1 -1
- package/dist/src/services/chatRecordingService.js +23 -1
- package/dist/src/services/chatRecordingService.js.map +1 -1
- package/dist/src/services/chatRecordingService.test.js +111 -0
- package/dist/src/services/chatRecordingService.test.js.map +1 -1
- package/dist/src/services/sessionSummaryService.test.js +1 -1
- package/dist/src/services/sessionSummaryService.test.js.map +1 -1
- package/dist/src/telemetry/metrics.js +15 -4
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +7 -0
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +3 -1
- package/dist/src/telemetry/types.js +19 -4
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/test-utils/mock-message-bus.d.ts +1 -19
- package/dist/src/test-utils/mock-message-bus.js +1 -65
- package/dist/src/test-utils/mock-message-bus.js.map +1 -1
- package/dist/src/tools/ask-user.d.ts +20 -0
- package/dist/src/tools/ask-user.js +142 -0
- package/dist/src/tools/ask-user.js.map +1 -0
- package/dist/src/{core/geminiChatHookTriggers.test.d.ts → tools/ask-user.test.d.ts} +1 -1
- package/dist/src/tools/ask-user.test.js +187 -0
- package/dist/src/tools/ask-user.test.js.map +1 -0
- package/dist/src/tools/confirmation-policy.test.js +1 -1
- package/dist/src/tools/confirmation-policy.test.js.map +1 -1
- package/dist/src/tools/diffOptions.d.ts +1 -1
- package/dist/src/tools/diffOptions.js +7 -3
- package/dist/src/tools/diffOptions.js.map +1 -1
- package/dist/src/tools/diffOptions.test.js +17 -0
- package/dist/src/tools/diffOptions.test.js.map +1 -1
- package/dist/src/tools/edit.js +1 -1
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +11 -3
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.d.ts +13 -4
- package/dist/src/tools/mcp-client-manager.js +53 -21
- package/dist/src/tools/mcp-client-manager.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.test.js +1 -0
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +1 -2
- package/dist/src/tools/mcp-client.test.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-many-files.js +3 -2
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/ripGrep.js +7 -2
- package/dist/src/tools/ripGrep.js.map +1 -1
- package/dist/src/tools/ripGrep.test.js +2 -2
- package/dist/src/tools/ripGrep.test.js.map +1 -1
- package/dist/src/tools/tool-names.d.ts +8 -2
- package/dist/src/tools/tool-names.js +14 -2
- package/dist/src/tools/tool-names.js.map +1 -1
- package/dist/src/tools/tools.d.ts +1 -0
- package/dist/src/tools/tools.js +2 -1
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/write-file.test.js +7 -7
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/constants.d.ts +7 -0
- package/dist/src/utils/constants.js +8 -0
- package/dist/src/utils/constants.js.map +1 -0
- package/dist/src/utils/editCorrector.js +1 -1
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editor.js +4 -1
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +6 -4
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/events.d.ts +2 -0
- package/dist/src/utils/events.js +1 -0
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/extensionLoader.js +1 -0
- package/dist/src/utils/extensionLoader.js.map +1 -1
- package/dist/src/utils/extensionLoader.test.js +11 -0
- package/dist/src/utils/extensionLoader.test.js.map +1 -1
- package/dist/src/utils/googleQuotaErrors.d.ts +3 -3
- package/dist/src/utils/googleQuotaErrors.js +6 -17
- package/dist/src/utils/googleQuotaErrors.js.map +1 -1
- package/dist/src/utils/googleQuotaErrors.test.js +4 -22
- package/dist/src/utils/googleQuotaErrors.test.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.js +4 -7
- package/dist/src/utils/llm-edit-fixer.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.test.js +2 -2
- package/dist/src/utils/llm-edit-fixer.test.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.js +7 -24
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/dist/src/utils/promptIdContext.d.ts +6 -0
- package/dist/src/utils/promptIdContext.js +15 -0
- package/dist/src/utils/promptIdContext.js.map +1 -1
- package/dist/src/utils/schemaValidator.d.ts +6 -0
- package/dist/src/utils/schemaValidator.js +12 -1
- package/dist/src/utils/schemaValidator.js.map +1 -1
- package/dist/src/utils/workspaceContext.d.ts +15 -0
- package/dist/src/utils/workspaceContext.js +32 -11
- package/dist/src/utils/workspaceContext.js.map +1 -1
- package/dist/src/utils/workspaceContext.test.js +55 -0
- package/dist/src/utils/workspaceContext.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -3
- package/dist/docs/changelogs/releases.md +0 -1543
- package/dist/google-gemini-cli-core-0.26.0-preview.3.tgz +0 -0
- package/dist/src/agents/delegate-to-agent-tool.d.ts +0 -19
- package/dist/src/agents/delegate-to-agent-tool.js +0 -178
- package/dist/src/agents/delegate-to-agent-tool.js.map +0 -1
- package/dist/src/agents/delegate-to-agent-tool.test.js +0 -213
- package/dist/src/agents/delegate-to-agent-tool.test.js.map +0 -1
- package/dist/src/agents/schema-utils.d.ts +0 -39
- package/dist/src/agents/schema-utils.js +0 -57
- package/dist/src/agents/schema-utils.js.map +0 -1
- package/dist/src/agents/schema-utils.test.js +0 -144
- package/dist/src/agents/schema-utils.test.js.map +0 -1
- package/dist/src/core/clientHookTriggers.d.ts +0 -36
- package/dist/src/core/clientHookTriggers.js +0 -76
- package/dist/src/core/clientHookTriggers.js.map +0 -1
- package/dist/src/core/geminiChatHookTriggers.d.ts +0 -68
- package/dist/src/core/geminiChatHookTriggers.js +0 -158
- package/dist/src/core/geminiChatHookTriggers.js.map +0 -1
- package/dist/src/core/geminiChatHookTriggers.test.js +0 -153
- package/dist/src/core/geminiChatHookTriggers.test.js.map +0 -1
- /package/dist/src/{agents/delegate-to-agent-tool.test.d.ts → core/prompts-substitution.test.d.ts} +0 -0
- /package/dist/src/{agents/schema-utils.test.d.ts → routing/strategies/numericalClassifierStrategy.test.d.ts} +0 -0
|
@@ -0,0 +1,347 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
7
|
+
import { NumericalClassifierStrategy } from './numericalClassifierStrategy.js';
|
|
8
|
+
import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, } from '../../config/models.js';
|
|
9
|
+
import { promptIdContext } from '../../utils/promptIdContext.js';
|
|
10
|
+
import { debugLogger } from '../../utils/debugLogger.js';
|
|
11
|
+
vi.mock('../../core/baseLlmClient.js');
|
|
12
|
+
describe('NumericalClassifierStrategy', () => {
|
|
13
|
+
let strategy;
|
|
14
|
+
let mockContext;
|
|
15
|
+
let mockConfig;
|
|
16
|
+
let mockBaseLlmClient;
|
|
17
|
+
let mockResolvedConfig;
|
|
18
|
+
beforeEach(() => {
|
|
19
|
+
vi.clearAllMocks();
|
|
20
|
+
strategy = new NumericalClassifierStrategy();
|
|
21
|
+
mockContext = {
|
|
22
|
+
history: [],
|
|
23
|
+
request: [{ text: 'simple task' }],
|
|
24
|
+
signal: new AbortController().signal,
|
|
25
|
+
};
|
|
26
|
+
mockResolvedConfig = {
|
|
27
|
+
model: 'classifier',
|
|
28
|
+
generateContentConfig: {},
|
|
29
|
+
};
|
|
30
|
+
mockConfig = {
|
|
31
|
+
modelConfigService: {
|
|
32
|
+
getResolvedConfig: vi.fn().mockReturnValue(mockResolvedConfig),
|
|
33
|
+
},
|
|
34
|
+
getModel: () => DEFAULT_GEMINI_MODEL_AUTO,
|
|
35
|
+
getPreviewFeatures: () => false,
|
|
36
|
+
getSessionId: vi.fn().mockReturnValue('control-group-id'), // Default to Control Group (Hash 71 >= 50)
|
|
37
|
+
getNumericalRoutingEnabled: vi.fn().mockResolvedValue(true),
|
|
38
|
+
getClassifierThreshold: vi.fn().mockResolvedValue(undefined),
|
|
39
|
+
};
|
|
40
|
+
mockBaseLlmClient = {
|
|
41
|
+
generateJson: vi.fn(),
|
|
42
|
+
};
|
|
43
|
+
vi.spyOn(promptIdContext, 'getStore').mockReturnValue('test-prompt-id');
|
|
44
|
+
});
|
|
45
|
+
afterEach(() => {
|
|
46
|
+
vi.restoreAllMocks();
|
|
47
|
+
});
|
|
48
|
+
it('should return null if numerical routing is disabled', async () => {
|
|
49
|
+
vi.mocked(mockConfig.getNumericalRoutingEnabled).mockResolvedValue(false);
|
|
50
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
51
|
+
expect(decision).toBeNull();
|
|
52
|
+
expect(mockBaseLlmClient.generateJson).not.toHaveBeenCalled();
|
|
53
|
+
});
|
|
54
|
+
it('should call generateJson with the correct parameters and wrapped user content', async () => {
|
|
55
|
+
const mockApiResponse = {
|
|
56
|
+
complexity_reasoning: 'Simple task',
|
|
57
|
+
complexity_score: 10,
|
|
58
|
+
};
|
|
59
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
60
|
+
await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
61
|
+
const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock
|
|
62
|
+
.calls[0][0];
|
|
63
|
+
expect(generateJsonCall).toMatchObject({
|
|
64
|
+
modelConfigKey: { model: mockResolvedConfig.model },
|
|
65
|
+
promptId: 'test-prompt-id',
|
|
66
|
+
});
|
|
67
|
+
// Verify user content parts
|
|
68
|
+
const userContent = generateJsonCall.contents[generateJsonCall.contents.length - 1];
|
|
69
|
+
const textPart = userContent.parts?.[0];
|
|
70
|
+
expect(textPart?.text).toBe('simple task');
|
|
71
|
+
});
|
|
72
|
+
describe('A/B Testing Logic (Deterministic)', () => {
|
|
73
|
+
it('Control Group (SessionID "control-group-id" -> Threshold 50): Score 40 -> FLASH', async () => {
|
|
74
|
+
vi.mocked(mockConfig.getSessionId).mockReturnValue('control-group-id'); // Hash 71 -> Control
|
|
75
|
+
const mockApiResponse = {
|
|
76
|
+
complexity_reasoning: 'Standard task',
|
|
77
|
+
complexity_score: 40,
|
|
78
|
+
};
|
|
79
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
80
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
81
|
+
expect(decision).toEqual({
|
|
82
|
+
model: DEFAULT_GEMINI_FLASH_MODEL,
|
|
83
|
+
metadata: {
|
|
84
|
+
source: 'Classifier (Control)',
|
|
85
|
+
latencyMs: expect.any(Number),
|
|
86
|
+
reasoning: expect.stringContaining('Score: 40 / Threshold: 50'),
|
|
87
|
+
},
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
it('Control Group (SessionID "control-group-id" -> Threshold 50): Score 60 -> PRO', async () => {
|
|
91
|
+
vi.mocked(mockConfig.getSessionId).mockReturnValue('control-group-id');
|
|
92
|
+
const mockApiResponse = {
|
|
93
|
+
complexity_reasoning: 'Complex task',
|
|
94
|
+
complexity_score: 60,
|
|
95
|
+
};
|
|
96
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
97
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
98
|
+
expect(decision).toEqual({
|
|
99
|
+
model: DEFAULT_GEMINI_MODEL,
|
|
100
|
+
metadata: {
|
|
101
|
+
source: 'Classifier (Control)',
|
|
102
|
+
latencyMs: expect.any(Number),
|
|
103
|
+
reasoning: expect.stringContaining('Score: 60 / Threshold: 50'),
|
|
104
|
+
},
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
it('Strict Group (SessionID "test-session-1" -> Threshold 80): Score 60 -> FLASH', async () => {
|
|
108
|
+
vi.mocked(mockConfig.getSessionId).mockReturnValue('test-session-1'); // FNV Normalized 18 < 50 -> Strict
|
|
109
|
+
const mockApiResponse = {
|
|
110
|
+
complexity_reasoning: 'Complex task',
|
|
111
|
+
complexity_score: 60,
|
|
112
|
+
};
|
|
113
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
114
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
115
|
+
expect(decision).toEqual({
|
|
116
|
+
model: DEFAULT_GEMINI_FLASH_MODEL, // Routed to Flash because 60 < 80
|
|
117
|
+
metadata: {
|
|
118
|
+
source: 'Classifier (Strict)',
|
|
119
|
+
latencyMs: expect.any(Number),
|
|
120
|
+
reasoning: expect.stringContaining('Score: 60 / Threshold: 80'),
|
|
121
|
+
},
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
it('Strict Group (SessionID "test-session-1" -> Threshold 80): Score 90 -> PRO', async () => {
|
|
125
|
+
vi.mocked(mockConfig.getSessionId).mockReturnValue('test-session-1');
|
|
126
|
+
const mockApiResponse = {
|
|
127
|
+
complexity_reasoning: 'Extreme task',
|
|
128
|
+
complexity_score: 90,
|
|
129
|
+
};
|
|
130
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
131
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
132
|
+
expect(decision).toEqual({
|
|
133
|
+
model: DEFAULT_GEMINI_MODEL,
|
|
134
|
+
metadata: {
|
|
135
|
+
source: 'Classifier (Strict)',
|
|
136
|
+
latencyMs: expect.any(Number),
|
|
137
|
+
reasoning: expect.stringContaining('Score: 90 / Threshold: 80'),
|
|
138
|
+
},
|
|
139
|
+
});
|
|
140
|
+
});
|
|
141
|
+
});
|
|
142
|
+
describe('Remote Threshold Logic', () => {
|
|
143
|
+
it('should use the remote CLASSIFIER_THRESHOLD if provided (int value)', async () => {
|
|
144
|
+
vi.mocked(mockConfig.getClassifierThreshold).mockResolvedValue(70);
|
|
145
|
+
const mockApiResponse = {
|
|
146
|
+
complexity_reasoning: 'Test task',
|
|
147
|
+
complexity_score: 60,
|
|
148
|
+
};
|
|
149
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
150
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
151
|
+
expect(decision).toEqual({
|
|
152
|
+
model: DEFAULT_GEMINI_FLASH_MODEL, // Score 60 < Threshold 70
|
|
153
|
+
metadata: {
|
|
154
|
+
source: 'Classifier (Remote)',
|
|
155
|
+
latencyMs: expect.any(Number),
|
|
156
|
+
reasoning: expect.stringContaining('Score: 60 / Threshold: 70'),
|
|
157
|
+
},
|
|
158
|
+
});
|
|
159
|
+
});
|
|
160
|
+
it('should use the remote CLASSIFIER_THRESHOLD if provided (float value)', async () => {
|
|
161
|
+
vi.mocked(mockConfig.getClassifierThreshold).mockResolvedValue(45.5);
|
|
162
|
+
const mockApiResponse = {
|
|
163
|
+
complexity_reasoning: 'Test task',
|
|
164
|
+
complexity_score: 40,
|
|
165
|
+
};
|
|
166
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
167
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
168
|
+
expect(decision).toEqual({
|
|
169
|
+
model: DEFAULT_GEMINI_FLASH_MODEL, // Score 40 < Threshold 45.5
|
|
170
|
+
metadata: {
|
|
171
|
+
source: 'Classifier (Remote)',
|
|
172
|
+
latencyMs: expect.any(Number),
|
|
173
|
+
reasoning: expect.stringContaining('Score: 40 / Threshold: 45.5'),
|
|
174
|
+
},
|
|
175
|
+
});
|
|
176
|
+
});
|
|
177
|
+
it('should use PRO model if score >= remote CLASSIFIER_THRESHOLD', async () => {
|
|
178
|
+
vi.mocked(mockConfig.getClassifierThreshold).mockResolvedValue(30);
|
|
179
|
+
const mockApiResponse = {
|
|
180
|
+
complexity_reasoning: 'Test task',
|
|
181
|
+
complexity_score: 35,
|
|
182
|
+
};
|
|
183
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
184
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
185
|
+
expect(decision).toEqual({
|
|
186
|
+
model: DEFAULT_GEMINI_MODEL, // Score 35 >= Threshold 30
|
|
187
|
+
metadata: {
|
|
188
|
+
source: 'Classifier (Remote)',
|
|
189
|
+
latencyMs: expect.any(Number),
|
|
190
|
+
reasoning: expect.stringContaining('Score: 35 / Threshold: 30'),
|
|
191
|
+
},
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
it('should fall back to A/B testing if CLASSIFIER_THRESHOLD is not present in experiments', async () => {
|
|
195
|
+
// Mock getClassifierThreshold to return undefined
|
|
196
|
+
vi.mocked(mockConfig.getClassifierThreshold).mockResolvedValue(undefined);
|
|
197
|
+
vi.mocked(mockConfig.getSessionId).mockReturnValue('control-group-id'); // Should resolve to Control (50)
|
|
198
|
+
const mockApiResponse = {
|
|
199
|
+
complexity_reasoning: 'Test task',
|
|
200
|
+
complexity_score: 40,
|
|
201
|
+
};
|
|
202
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
203
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
204
|
+
expect(decision).toEqual({
|
|
205
|
+
model: DEFAULT_GEMINI_FLASH_MODEL, // Score 40 < Default A/B Threshold 50
|
|
206
|
+
metadata: {
|
|
207
|
+
source: 'Classifier (Control)',
|
|
208
|
+
latencyMs: expect.any(Number),
|
|
209
|
+
reasoning: expect.stringContaining('Score: 40 / Threshold: 50'),
|
|
210
|
+
},
|
|
211
|
+
});
|
|
212
|
+
});
|
|
213
|
+
it('should fall back to A/B testing if CLASSIFIER_THRESHOLD is out of range (less than 0)', async () => {
|
|
214
|
+
vi.mocked(mockConfig.getClassifierThreshold).mockResolvedValue(-10);
|
|
215
|
+
vi.mocked(mockConfig.getSessionId).mockReturnValue('control-group-id');
|
|
216
|
+
const mockApiResponse = {
|
|
217
|
+
complexity_reasoning: 'Test task',
|
|
218
|
+
complexity_score: 40,
|
|
219
|
+
};
|
|
220
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
221
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
222
|
+
expect(decision).toEqual({
|
|
223
|
+
model: DEFAULT_GEMINI_FLASH_MODEL,
|
|
224
|
+
metadata: {
|
|
225
|
+
source: 'Classifier (Control)',
|
|
226
|
+
latencyMs: expect.any(Number),
|
|
227
|
+
reasoning: expect.stringContaining('Score: 40 / Threshold: 50'),
|
|
228
|
+
},
|
|
229
|
+
});
|
|
230
|
+
});
|
|
231
|
+
it('should fall back to A/B testing if CLASSIFIER_THRESHOLD is out of range (greater than 100)', async () => {
|
|
232
|
+
vi.mocked(mockConfig.getClassifierThreshold).mockResolvedValue(110);
|
|
233
|
+
vi.mocked(mockConfig.getSessionId).mockReturnValue('control-group-id');
|
|
234
|
+
const mockApiResponse = {
|
|
235
|
+
complexity_reasoning: 'Test task',
|
|
236
|
+
complexity_score: 60,
|
|
237
|
+
};
|
|
238
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
239
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
240
|
+
expect(decision).toEqual({
|
|
241
|
+
model: DEFAULT_GEMINI_MODEL,
|
|
242
|
+
metadata: {
|
|
243
|
+
source: 'Classifier (Control)',
|
|
244
|
+
latencyMs: expect.any(Number),
|
|
245
|
+
reasoning: expect.stringContaining('Score: 60 / Threshold: 50'),
|
|
246
|
+
},
|
|
247
|
+
});
|
|
248
|
+
});
|
|
249
|
+
});
|
|
250
|
+
it('should return null if the classifier API call fails', async () => {
|
|
251
|
+
const consoleWarnSpy = vi
|
|
252
|
+
.spyOn(debugLogger, 'warn')
|
|
253
|
+
.mockImplementation(() => { });
|
|
254
|
+
const testError = new Error('API Failure');
|
|
255
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockRejectedValue(testError);
|
|
256
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
257
|
+
expect(decision).toBeNull();
|
|
258
|
+
expect(consoleWarnSpy).toHaveBeenCalled();
|
|
259
|
+
});
|
|
260
|
+
it('should return null if the classifier returns a malformed JSON object', async () => {
|
|
261
|
+
const consoleWarnSpy = vi
|
|
262
|
+
.spyOn(debugLogger, 'warn')
|
|
263
|
+
.mockImplementation(() => { });
|
|
264
|
+
const malformedApiResponse = {
|
|
265
|
+
complexity_reasoning: 'This is a simple task.',
|
|
266
|
+
// complexity_score is missing
|
|
267
|
+
};
|
|
268
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(malformedApiResponse);
|
|
269
|
+
const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
270
|
+
expect(decision).toBeNull();
|
|
271
|
+
expect(consoleWarnSpy).toHaveBeenCalled();
|
|
272
|
+
});
|
|
273
|
+
it('should include tool-related history when sending to classifier', async () => {
|
|
274
|
+
mockContext.history = [
|
|
275
|
+
{ role: 'user', parts: [{ text: 'call a tool' }] },
|
|
276
|
+
{ role: 'model', parts: [{ functionCall: { name: 'test_tool' } }] },
|
|
277
|
+
{
|
|
278
|
+
role: 'user',
|
|
279
|
+
parts: [
|
|
280
|
+
{ functionResponse: { name: 'test_tool', response: { ok: true } } },
|
|
281
|
+
],
|
|
282
|
+
},
|
|
283
|
+
{ role: 'user', parts: [{ text: 'another user turn' }] },
|
|
284
|
+
];
|
|
285
|
+
const mockApiResponse = {
|
|
286
|
+
complexity_reasoning: 'Simple.',
|
|
287
|
+
complexity_score: 10,
|
|
288
|
+
};
|
|
289
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
290
|
+
await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
291
|
+
const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock
|
|
292
|
+
.calls[0][0];
|
|
293
|
+
const contents = generateJsonCall.contents;
|
|
294
|
+
const expectedContents = [
|
|
295
|
+
...mockContext.history,
|
|
296
|
+
// The last user turn is the request part
|
|
297
|
+
{
|
|
298
|
+
role: 'user',
|
|
299
|
+
parts: [{ text: 'simple task' }],
|
|
300
|
+
},
|
|
301
|
+
];
|
|
302
|
+
expect(contents).toEqual(expectedContents);
|
|
303
|
+
});
|
|
304
|
+
it('should respect HISTORY_TURNS_FOR_CONTEXT', async () => {
|
|
305
|
+
const longHistory = [];
|
|
306
|
+
for (let i = 0; i < 30; i++) {
|
|
307
|
+
longHistory.push({ role: 'user', parts: [{ text: `Message ${i}` }] });
|
|
308
|
+
}
|
|
309
|
+
mockContext.history = longHistory;
|
|
310
|
+
const mockApiResponse = {
|
|
311
|
+
complexity_reasoning: 'Simple.',
|
|
312
|
+
complexity_score: 10,
|
|
313
|
+
};
|
|
314
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
315
|
+
await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
316
|
+
const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock
|
|
317
|
+
.calls[0][0];
|
|
318
|
+
const contents = generateJsonCall.contents;
|
|
319
|
+
// Manually calculate what the history should be
|
|
320
|
+
const HISTORY_TURNS_FOR_CONTEXT = 8;
|
|
321
|
+
const finalHistory = longHistory.slice(-HISTORY_TURNS_FOR_CONTEXT);
|
|
322
|
+
// Last part is the request
|
|
323
|
+
const requestPart = {
|
|
324
|
+
role: 'user',
|
|
325
|
+
parts: [{ text: 'simple task' }],
|
|
326
|
+
};
|
|
327
|
+
expect(contents).toEqual([...finalHistory, requestPart]);
|
|
328
|
+
expect(contents).toHaveLength(9);
|
|
329
|
+
});
|
|
330
|
+
it('should use a fallback promptId if not found in context', async () => {
|
|
331
|
+
const consoleWarnSpy = vi
|
|
332
|
+
.spyOn(debugLogger, 'warn')
|
|
333
|
+
.mockImplementation(() => { });
|
|
334
|
+
vi.spyOn(promptIdContext, 'getStore').mockReturnValue(undefined);
|
|
335
|
+
const mockApiResponse = {
|
|
336
|
+
complexity_reasoning: 'Simple.',
|
|
337
|
+
complexity_score: 10,
|
|
338
|
+
};
|
|
339
|
+
vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
|
|
340
|
+
await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
|
|
341
|
+
const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock
|
|
342
|
+
.calls[0][0];
|
|
343
|
+
expect(generateJsonCall.promptId).toMatch(/^classifier-router-fallback-\d+-\w+$/);
|
|
344
|
+
expect(consoleWarnSpy).toHaveBeenCalledWith(expect.stringContaining('Could not find promptId in context for classifier-router. This is unexpected. Using a fallback ID:'));
|
|
345
|
+
});
|
|
346
|
+
});
|
|
347
|
+
//# sourceMappingURL=numericalClassifierStrategy.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"numericalClassifierStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/numericalClassifierStrategy.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ import { on } from 'node:events';
|
|
|
7
7
|
import { randomUUID } from 'node:crypto';
|
|
8
8
|
import { MessageBusType, } from '../confirmation-bus/types.js';
|
|
9
9
|
import { ToolConfirmationOutcome, } from '../tools/tools.js';
|
|
10
|
-
import { fireToolNotificationHook } from '../core/coreToolHookTriggers.js';
|
|
11
10
|
import { debugLogger } from '../utils/debugLogger.js';
|
|
12
11
|
/**
|
|
13
12
|
* Waits for a confirmation response with the matching correlationId.
|
|
@@ -99,8 +98,8 @@ export async function resolveConfirmation(toolCall, signal, deps) {
|
|
|
99
98
|
* Fires hook notifications.
|
|
100
99
|
*/
|
|
101
100
|
async function notifyHooks(deps, details) {
|
|
102
|
-
if (deps.config.
|
|
103
|
-
await
|
|
101
|
+
if (deps.config.getHookSystem()) {
|
|
102
|
+
await deps.config.getHookSystem()?.fireToolNotificationEvent({
|
|
104
103
|
...details,
|
|
105
104
|
// Pass no-op onConfirm to satisfy type definition; side-effects via
|
|
106
105
|
// callbacks are disallowed.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirmation.js","sourceRoot":"","sources":["../../../src/scheduler/confirmation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EACL,cAAc,GAGf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,uBAAuB,GAGxB,MAAM,mBAAmB,CAAC;AAO3B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"confirmation.js","sourceRoot":"","sources":["../../../src/scheduler/confirmation.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,14 +9,10 @@ import { awaitConfirmation, resolveConfirmation } from './confirmation.js';
|
|
|
9
9
|
import { MessageBusType, } from '../confirmation-bus/types.js';
|
|
10
10
|
import { ToolConfirmationOutcome, } from '../tools/tools.js';
|
|
11
11
|
import { randomUUID } from 'node:crypto';
|
|
12
|
-
import { fireToolNotificationHook } from '../core/coreToolHookTriggers.js';
|
|
13
12
|
// Mock Dependencies
|
|
14
13
|
vi.mock('node:crypto', () => ({
|
|
15
14
|
randomUUID: vi.fn(),
|
|
16
15
|
}));
|
|
17
|
-
vi.mock('../core/coreToolHookTriggers.js', () => ({
|
|
18
|
-
fireToolNotificationHook: vi.fn(),
|
|
19
|
-
}));
|
|
20
16
|
describe('confirmation.ts', () => {
|
|
21
17
|
let mockMessageBus;
|
|
22
18
|
beforeEach(() => {
|
|
@@ -90,12 +86,16 @@ describe('confirmation.ts', () => {
|
|
|
90
86
|
get: vi.fn(),
|
|
91
87
|
configurable: true,
|
|
92
88
|
});
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
applyInlineModify: vi.fn(),
|
|
89
|
+
const mockHookSystem = {
|
|
90
|
+
fireToolNotificationEvent: vi.fn().mockResolvedValue(undefined),
|
|
96
91
|
};
|
|
97
92
|
mockConfig = {
|
|
98
93
|
getEnableHooks: vi.fn().mockReturnValue(true),
|
|
94
|
+
getHookSystem: vi.fn().mockReturnValue(mockHookSystem),
|
|
95
|
+
};
|
|
96
|
+
mockModifier = {
|
|
97
|
+
handleModifyWithEditor: vi.fn(),
|
|
98
|
+
applyInlineModify: vi.fn(),
|
|
99
99
|
};
|
|
100
100
|
getPreferredEditor = vi.fn().mockReturnValue('vim');
|
|
101
101
|
invocationMock = {
|
|
@@ -184,7 +184,7 @@ describe('confirmation.ts', () => {
|
|
|
184
184
|
confirmed: true,
|
|
185
185
|
});
|
|
186
186
|
await promise;
|
|
187
|
-
expect(
|
|
187
|
+
expect(mockConfig.getHookSystem()?.fireToolNotificationEvent).toHaveBeenCalledWith(expect.objectContaining({
|
|
188
188
|
type: details.type,
|
|
189
189
|
prompt: details.prompt,
|
|
190
190
|
title: details.title,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirmation.test.js","sourceRoot":"","sources":["../../../src/scheduler/confirmation.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EACR,EAAE,EACF,MAAM,EACN,EAAE,EACF,UAAU,EACV,SAAS,GAGV,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EACL,cAAc,GAEf,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,uBAAuB,GAGxB,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"confirmation.test.js","sourceRoot":"","sources":["../../../src/scheduler/confirmation.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,9 +19,6 @@ vi.mock('../telemetry/loggers.js', () => ({
|
|
|
19
19
|
vi.mock('../telemetry/types.js', () => ({
|
|
20
20
|
ToolCallEvent: vi.fn().mockImplementation((call) => ({ ...call })),
|
|
21
21
|
}));
|
|
22
|
-
vi.mock('../core/coreToolHookTriggers.js', () => ({
|
|
23
|
-
fireToolNotificationHook: vi.fn(),
|
|
24
|
-
}));
|
|
25
22
|
import { SchedulerStateManager } from './state-manager.js';
|
|
26
23
|
import { resolveConfirmation } from './confirmation.js';
|
|
27
24
|
import { checkPolicy, updatePolicy } from './policy.js';
|