@google/gemini-cli-core 0.18.0-nightly.20251118.7cc5234b9 → 0.18.0-preview.0
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/LICENSE +1 -1
- package/README.md +1 -0
- package/dist/src/agents/executor.js +12 -21
- package/dist/src/agents/executor.js.map +1 -1
- package/dist/src/agents/executor.test.js +53 -57
- package/dist/src/agents/executor.test.js.map +1 -1
- package/dist/src/agents/registry.d.ts +4 -0
- package/dist/src/agents/registry.js +23 -0
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/registry.test.js +30 -16
- package/dist/src/agents/registry.test.js.map +1 -1
- package/dist/src/code_assist/oauth-credential-storage.test.js +1 -0
- package/dist/src/code_assist/oauth-credential-storage.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +5 -4
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/config/config.d.ts +5 -0
- package/dist/src/config/config.js +10 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +1 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/defaultModelConfigs.js +31 -4
- package/dist/src/config/defaultModelConfigs.js.map +1 -1
- package/dist/src/core/client.d.ts +1 -2
- package/dist/src/core/client.js +11 -25
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +14 -34
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +0 -2
- package/dist/src/core/coreToolScheduler.js +1 -3
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +1 -17
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +10 -5
- package/dist/src/core/geminiChat.js +37 -20
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +96 -54
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/logger.test.js +12 -11
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.js +6 -2
- package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
- package/dist/src/core/prompts.test.js +4 -1
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/core/turn.d.ts +2 -1
- package/dist/src/core/turn.js +2 -7
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +18 -21
- package/dist/src/core/turn.test.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/index.d.ts +1 -0
- package/dist/src/index.js +1 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/oauth-provider.test.js +1 -0
- package/dist/src/mcp/oauth-provider.test.js.map +1 -1
- package/dist/src/prompts/mcp-prompts.test.js +0 -1
- package/dist/src/prompts/mcp-prompts.test.js.map +1 -1
- package/dist/src/prompts/prompt-registry.test.js +0 -15
- package/dist/src/prompts/prompt-registry.test.js.map +1 -1
- package/dist/src/routing/modelRouterService.js +1 -1
- package/dist/src/routing/modelRouterService.js.map +1 -1
- package/dist/src/routing/strategies/classifierStrategy.test.js +4 -3
- package/dist/src/routing/strategies/classifierStrategy.test.js.map +1 -1
- package/dist/src/services/chatCompressionService.d.ts +1 -1
- package/dist/src/services/chatCompressionService.js +1 -1
- package/dist/src/services/chatRecordingService.d.ts +1 -1
- package/dist/src/services/modelConfig.integration.test.js +34 -0
- package/dist/src/services/modelConfig.integration.test.js.map +1 -1
- package/dist/src/services/modelConfigService.d.ts +2 -0
- package/dist/src/services/modelConfigService.js +7 -2
- package/dist/src/services/modelConfigService.js.map +1 -1
- package/dist/src/services/modelConfigService.test.js +22 -0
- package/dist/src/services/modelConfigService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.js +4 -3
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/test-data/resolved-aliases.golden.json +37 -4
- package/dist/src/telemetry/activity-monitor.test.js +4 -1
- package/dist/src/telemetry/activity-monitor.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +33 -21
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +18 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +1 -0
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +3 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/test-utils/config.d.ts +1 -1
- package/dist/src/test-utils/config.js +1 -1
- package/dist/src/tools/mcp-client.js +85 -108
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +7 -2
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/modifiable-tool.d.ts +1 -1
- package/dist/src/tools/modifiable-tool.js +2 -2
- package/dist/src/tools/modifiable-tool.js.map +1 -1
- package/dist/src/tools/modifiable-tool.test.js +12 -11
- package/dist/src/tools/modifiable-tool.test.js.map +1 -1
- package/dist/src/tools/write-todos.d.ts +1 -1
- package/dist/src/tools/write-todos.js +1 -1
- package/dist/src/utils/debugLogger.test.js +27 -25
- package/dist/src/utils/debugLogger.test.js.map +1 -1
- package/dist/src/utils/editor.d.ts +1 -1
- package/dist/src/utils/editor.js +3 -2
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +7 -46
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/events.d.ts +33 -3
- package/dist/src/utils/events.js +35 -15
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/events.test.js +86 -5
- package/dist/src/utils/events.test.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.js +1 -1
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
- package/dist/src/utils/installationManager.test.js +2 -1
- package/dist/src/utils/installationManager.test.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.test.js +2 -1
- package/dist/src/utils/llm-edit-fixer.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +3 -2
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.js +1 -1
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.test.js +8 -14
- package/dist/src/utils/memoryImportProcessor.test.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.test.js +3 -1
- package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
- package/dist/src/utils/systemEncoding.test.js +2 -1
- package/dist/src/utils/systemEncoding.test.js.map +1 -1
- package/dist/src/utils/userAccountManager.test.js +7 -6
- package/dist/src/utils/userAccountManager.test.js.map +1 -1
- package/dist/src/utils/workspaceContext.test.js +5 -4
- package/dist/src/utils/workspaceContext.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/dist/google-gemini-cli-core-0.18.0-nightly.20251118.86828bb56.tgz +0 -0
|
@@ -16,11 +16,6 @@ describe('PromptRegistry', () => {
|
|
|
16
16
|
const prompt1 = {
|
|
17
17
|
name: 'prompt1',
|
|
18
18
|
serverName: 'server1',
|
|
19
|
-
tool: {
|
|
20
|
-
name: 'prompt1',
|
|
21
|
-
description: 'Prompt 1',
|
|
22
|
-
inputSchema: {},
|
|
23
|
-
},
|
|
24
19
|
invoke: async () => ({
|
|
25
20
|
messages: [
|
|
26
21
|
{ role: 'assistant', content: { type: 'text', text: 'response1' } },
|
|
@@ -30,11 +25,6 @@ describe('PromptRegistry', () => {
|
|
|
30
25
|
const prompt2 = {
|
|
31
26
|
name: 'prompt2',
|
|
32
27
|
serverName: 'server1',
|
|
33
|
-
tool: {
|
|
34
|
-
name: 'prompt2',
|
|
35
|
-
description: 'Prompt 2',
|
|
36
|
-
inputSchema: {},
|
|
37
|
-
},
|
|
38
28
|
invoke: async () => ({
|
|
39
29
|
messages: [
|
|
40
30
|
{ role: 'assistant', content: { type: 'text', text: 'response2' } },
|
|
@@ -44,11 +34,6 @@ describe('PromptRegistry', () => {
|
|
|
44
34
|
const prompt3 = {
|
|
45
35
|
name: 'prompt1',
|
|
46
36
|
serverName: 'server2',
|
|
47
|
-
tool: {
|
|
48
|
-
name: 'prompt1',
|
|
49
|
-
description: 'Prompt 3',
|
|
50
|
-
inputSchema: {},
|
|
51
|
-
},
|
|
52
37
|
invoke: async () => ({
|
|
53
38
|
messages: [
|
|
54
39
|
{ role: 'assistant', content: { type: 'text', text: 'response3' } },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-registry.test.js","sourceRoot":"","sources":["../../../src/prompts/prompt-registry.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,WAAW,EAAE;QACX,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;KACd;CACF,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,IAAI,QAAwB,CAAC;IAE7B,MAAM,OAAO,GAAwB;QACnC,IAAI,EAAE,SAAS;QACf,UAAU,EAAE,SAAS;QACrB,
|
|
1
|
+
{"version":3,"file":"prompt-registry.test.js","sourceRoot":"","sources":["../../../src/prompts/prompt-registry.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ export class ModelRouterService {
|
|
|
47
47
|
// we attempt to upgrade to 'gemini-3.0-pro' (Preview Model).
|
|
48
48
|
if (decision.model === DEFAULT_GEMINI_MODEL &&
|
|
49
49
|
this.config.getPreviewFeatures() &&
|
|
50
|
-
decision.metadata.source
|
|
50
|
+
!decision.metadata.source.includes('override')) {
|
|
51
51
|
// We ALWAYS attempt to upgrade to Preview Model here.
|
|
52
52
|
// If we are in fallback mode, the 'previewModelBypassMode' flag (handled in handler.ts/geminiChat.ts)
|
|
53
53
|
// will ensure we downgrade to 2.5 Pro for the actual API call if needed.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelRouterService.js","sourceRoot":"","sources":["../../../src/routing/modelRouterService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;GAEG;AACH,MAAM,OAAO,kBAAkB;IACrB,MAAM,CAAS;IACf,QAAQ,CAAmB;IAEnC,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;IACnD,CAAC;IAEO,yBAAyB;QAC/B,qEAAqE;QACrE,2DAA2D;QAC3D,OAAO,IAAI,iBAAiB,CAC1B;YACE,IAAI,gBAAgB,EAAE;YACtB,IAAI,gBAAgB,EAAE;YACtB,IAAI,kBAAkB,EAAE;YACxB,IAAI,eAAe,EAAE;SACtB,EACD,cAAc,CACf,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAK,CAAC,OAAuB;QACjC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,IAAI,QAAyB,CAAC;QAE9B,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAClC,OAAO,EACP,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAC/B,CAAC;YAEF,+BAA+B;YAC/B,+EAA+E;YAC/E,6DAA6D;YAC7D,IACE,QAAQ,CAAC,KAAK,KAAK,oBAAoB;gBACvC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE;gBAChC,QAAQ,CAAC,QAAQ,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"modelRouterService.js","sourceRoot":"","sources":["../../../src/routing/modelRouterService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;GAEG;AACH,MAAM,OAAO,kBAAkB;IACrB,MAAM,CAAS;IACf,QAAQ,CAAmB;IAEnC,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;IACnD,CAAC;IAEO,yBAAyB;QAC/B,qEAAqE;QACrE,2DAA2D;QAC3D,OAAO,IAAI,iBAAiB,CAC1B;YACE,IAAI,gBAAgB,EAAE;YACtB,IAAI,gBAAgB,EAAE;YACtB,IAAI,kBAAkB,EAAE;YACxB,IAAI,eAAe,EAAE;SACtB,EACD,cAAc,CACf,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAK,CAAC,OAAuB;QACjC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,IAAI,QAAyB,CAAC;QAE9B,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAClC,OAAO,EACP,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAC/B,CAAC;YAEF,+BAA+B;YAC/B,+EAA+E;YAC/E,6DAA6D;YAC7D,IACE,QAAQ,CAAC,KAAK,KAAK,oBAAoB;gBACvC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE;gBAChC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAC9C,CAAC;gBACD,sDAAsD;gBACtD,sGAAsG;gBACtG,yEAAyE;gBACzE,4GAA4G;gBAC5G,QAAQ,CAAC,KAAK,GAAG,oBAAoB,CAAC;gBACtC,QAAQ,CAAC,QAAQ,CAAC,MAAM,IAAI,kBAAkB,CAAC;gBAC/C,QAAQ,CAAC,QAAQ,CAAC,SAAS,IAAI,8BAA8B,CAAC;YAChE,CAAC;YAED,MAAM,KAAK,GAAG,IAAI,iBAAiB,CACjC,QAAQ,CAAC,KAAK,EACd,QAAQ,CAAC,QAAQ,CAAC,MAAM,EACxB,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAC3B,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAC3B,KAAK,EAAE,SAAS;YAChB,SAAS,CACV,CAAC;YACF,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAEpC,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,IAAI,CAAC;YACpB,MAAM,aAAa,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjE,kDAAkD;YAClD,uEAAuE;YACvE,sDAAsD;YACtD,QAAQ,GAAG;gBACT,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;gBAC7B,QAAQ,EAAE;oBACR,MAAM,EAAE,kBAAkB;oBAC1B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;oBACjC,SAAS,EAAE,uCAAuC;oBAClD,KAAK,EAAE,aAAa;iBACrB;aACF,CAAC;YAEF,MAAM,KAAK,GAAG,IAAI,iBAAiB,CACjC,QAAQ,CAAC,KAAK,EACd,QAAQ,CAAC,QAAQ,CAAC,MAAM,EACxB,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAC3B,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAC3B,MAAM,EACN,aAAa,CACd,CAAC;YAEF,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAEpC,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;CACF"}
|
|
@@ -8,6 +8,7 @@ import { ClassifierStrategy } from './classifierStrategy.js';
|
|
|
8
8
|
import { isFunctionCall, isFunctionResponse, } from '../../utils/messageInspectors.js';
|
|
9
9
|
import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, } from '../../config/models.js';
|
|
10
10
|
import { promptIdContext } from '../../utils/promptIdContext.js';
|
|
11
|
+
import { debugLogger } from '../../utils/debugLogger.js';
|
|
11
12
|
vi.mock('../../core/baseLlmClient.js');
|
|
12
13
|
vi.mock('../../utils/promptIdContext.js');
|
|
13
14
|
describe('ClassifierStrategy', () => {
|
|
@@ -88,7 +89,7 @@ describe('ClassifierStrategy', () => {
|
|
|
88
89
|
});
|
|
89
90
|
it('should return null if the classifier API call fails', async () => {
|
|
90
91
|
const consoleWarnSpy = vi
|
|
91
|
-
.spyOn(
|
|
92
|
+
.spyOn(debugLogger, 'warn')
|
|
92
93
|
.mockImplementation(() => { });
|
|
93
94
|
const testError = new Error('API Failure');
|
|
94
95
|
vi.mocked(mockBaseLlmClient.generateJson).mockRejectedValue(testError);
|
|
@@ -99,7 +100,7 @@ describe('ClassifierStrategy', () => {
|
|
|
99
100
|
});
|
|
100
101
|
it('should return null if the classifier returns a malformed JSON object', async () => {
|
|
101
102
|
const consoleWarnSpy = vi
|
|
102
|
-
.spyOn(
|
|
103
|
+
.spyOn(debugLogger, 'warn')
|
|
103
104
|
.mockImplementation(() => { });
|
|
104
105
|
const malformedApiResponse = {
|
|
105
106
|
reasoning: 'This is a simple task.',
|
|
@@ -176,7 +177,7 @@ describe('ClassifierStrategy', () => {
|
|
|
176
177
|
});
|
|
177
178
|
it('should use a fallback promptId if not found in context', async () => {
|
|
178
179
|
const consoleWarnSpy = vi
|
|
179
|
-
.spyOn(
|
|
180
|
+
.spyOn(debugLogger, 'warn')
|
|
180
181
|
.mockImplementation(() => { });
|
|
181
182
|
vi.mocked(promptIdContext.getStore).mockReturnValue(undefined);
|
|
182
183
|
const mockApiResponse = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classifierStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/classifierStrategy.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAI7D,OAAO,EACL,cAAc,EACd,kBAAkB,GACnB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,GACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"classifierStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/classifierStrategy.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ import { type ChatCompressionInfo } from '../core/turn.js';
|
|
|
11
11
|
* Default threshold for compression token count as a fraction of the model's
|
|
12
12
|
* token limit. If the chat history exceeds this threshold, it will be compressed.
|
|
13
13
|
*/
|
|
14
|
-
export declare const DEFAULT_COMPRESSION_TOKEN_THRESHOLD = 0.
|
|
14
|
+
export declare const DEFAULT_COMPRESSION_TOKEN_THRESHOLD = 0.5;
|
|
15
15
|
/**
|
|
16
16
|
* The fraction of the latest chat history to keep. A value of 0.3
|
|
17
17
|
* means that only the last 30% of the chat history will be kept after compression.
|
|
@@ -14,7 +14,7 @@ import { getInitialChatHistory } from '../utils/environmentContext.js';
|
|
|
14
14
|
* Default threshold for compression token count as a fraction of the model's
|
|
15
15
|
* token limit. If the chat history exceeds this threshold, it will be compressed.
|
|
16
16
|
*/
|
|
17
|
-
export const DEFAULT_COMPRESSION_TOKEN_THRESHOLD = 0.
|
|
17
|
+
export const DEFAULT_COMPRESSION_TOKEN_THRESHOLD = 0.5;
|
|
18
18
|
/**
|
|
19
19
|
* The fraction of the latest chat history to keep. A value of 0.3
|
|
20
20
|
* means that only the last 30% of the chat history will be kept after compression.
|
|
@@ -46,7 +46,7 @@ export interface ToolCallRecord {
|
|
|
46
46
|
* Message type and message type-specific fields.
|
|
47
47
|
*/
|
|
48
48
|
export type ConversationRecordExtra = {
|
|
49
|
-
type: 'user';
|
|
49
|
+
type: 'user' | 'info' | 'error' | 'warning';
|
|
50
50
|
} | {
|
|
51
51
|
type: 'gemini';
|
|
52
52
|
toolCalls?: ToolCallRecord[];
|
|
@@ -209,5 +209,39 @@ describe('ModelConfigService Integration', () => {
|
|
|
209
209
|
topP: 0.95, // from base
|
|
210
210
|
});
|
|
211
211
|
});
|
|
212
|
+
it('should correctly merge static aliases, runtime aliases, and overrides', () => {
|
|
213
|
+
// Re-instantiate service for this isolated test to not pollute other tests
|
|
214
|
+
const service = new ModelConfigService(complexConfig);
|
|
215
|
+
// Register a runtime alias, simulating what AgentExecutor does.
|
|
216
|
+
// This alias extends a static base and provides its own settings.
|
|
217
|
+
service.registerRuntimeModelConfig('agent-runtime:my-agent', {
|
|
218
|
+
extends: 'creative-writer', // extends a multi-level alias
|
|
219
|
+
modelConfig: {
|
|
220
|
+
generateContentConfig: {
|
|
221
|
+
temperature: 0.1, // Overrides parent
|
|
222
|
+
maxOutputTokens: 8192, // Adds a new property
|
|
223
|
+
},
|
|
224
|
+
},
|
|
225
|
+
});
|
|
226
|
+
// Resolve the configuration for the runtime alias, with a matching agent scope
|
|
227
|
+
const resolved = service.getResolvedConfig({
|
|
228
|
+
model: 'agent-runtime:my-agent',
|
|
229
|
+
overrideScope: 'core',
|
|
230
|
+
});
|
|
231
|
+
// Assert the final merged configuration.
|
|
232
|
+
expect(resolved.model).toBe('gemini-1.5-pro-latest'); // from 'default-text-model'
|
|
233
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
234
|
+
// from 'core' agent override, wins over runtime alias's 0.1 and creative-writer's 0.9
|
|
235
|
+
temperature: 0.5,
|
|
236
|
+
// from 'base' alias
|
|
237
|
+
topP: 0.95,
|
|
238
|
+
// from 'creative-writer' alias
|
|
239
|
+
topK: 50,
|
|
240
|
+
// from runtime alias
|
|
241
|
+
maxOutputTokens: 8192,
|
|
242
|
+
// from 'core' agent override
|
|
243
|
+
stopSequences: ['AGENT_STOP'],
|
|
244
|
+
});
|
|
245
|
+
});
|
|
212
246
|
});
|
|
213
247
|
//# sourceMappingURL=modelConfig.integration.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelConfig.integration.test.js","sourceRoot":"","sources":["../../../src/services/modelConfig.integration.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"modelConfig.integration.test.js","sourceRoot":"","sources":["../../../src/services/modelConfig.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,9 @@ export interface _ResolvedModelConfig {
|
|
|
36
36
|
}
|
|
37
37
|
export declare class ModelConfigService {
|
|
38
38
|
private readonly config;
|
|
39
|
+
private readonly runtimeAliases;
|
|
39
40
|
constructor(config: ModelConfigServiceConfig);
|
|
41
|
+
registerRuntimeModelConfig(aliasName: string, alias: ModelConfigAlias): void;
|
|
40
42
|
private resolveAlias;
|
|
41
43
|
private internalGetResolvedConfig;
|
|
42
44
|
getResolvedConfig(context: ModelConfigKey): ResolvedModelConfig;
|
|
@@ -5,10 +5,14 @@
|
|
|
5
5
|
*/
|
|
6
6
|
export class ModelConfigService {
|
|
7
7
|
config;
|
|
8
|
+
runtimeAliases = {};
|
|
8
9
|
// TODO(12597): Process config to build a typed alias hierarchy.
|
|
9
10
|
constructor(config) {
|
|
10
11
|
this.config = config;
|
|
11
12
|
}
|
|
13
|
+
registerRuntimeModelConfig(aliasName, alias) {
|
|
14
|
+
this.runtimeAliases[aliasName] = alias;
|
|
15
|
+
}
|
|
12
16
|
resolveAlias(aliasName, aliases, visited = new Set()) {
|
|
13
17
|
if (visited.has(aliasName)) {
|
|
14
18
|
throw new Error(`Circular alias dependency: ${[...visited, aliasName].join(' -> ')}`);
|
|
@@ -32,11 +36,12 @@ export class ModelConfigService {
|
|
|
32
36
|
internalGetResolvedConfig(context) {
|
|
33
37
|
const config = this.config || {};
|
|
34
38
|
const { aliases = {}, overrides = [] } = config;
|
|
39
|
+
const allAliases = { ...aliases, ...this.runtimeAliases };
|
|
35
40
|
let baseModel = context.model;
|
|
36
41
|
let resolvedConfig = {};
|
|
37
42
|
// Step 1: Alias Resolution
|
|
38
|
-
if (
|
|
39
|
-
const resolvedAlias = this.resolveAlias(context.model,
|
|
43
|
+
if (allAliases[context.model]) {
|
|
44
|
+
const resolvedAlias = this.resolveAlias(context.model, allAliases);
|
|
40
45
|
baseModel = resolvedAlias.modelConfig.model; // This can now be undefined
|
|
41
46
|
resolvedConfig = this.deepMerge(resolvedConfig, resolvedAlias.modelConfig.generateContentConfig);
|
|
42
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelConfigService.js","sourceRoot":"","sources":["../../../src/services/modelConfigService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAqDH,MAAM,OAAO,kBAAkB;
|
|
1
|
+
{"version":3,"file":"modelConfigService.js","sourceRoot":"","sources":["../../../src/services/modelConfigService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAqDH,MAAM,OAAO,kBAAkB;IAIA;IAHZ,cAAc,GAAqC,EAAE,CAAC;IAEvE,gEAAgE;IAChE,YAA6B,MAAgC;QAAhC,WAAM,GAAN,MAAM,CAA0B;IAAG,CAAC;IAEjE,0BAA0B,CAAC,SAAiB,EAAE,KAAuB;QACnE,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;IACzC,CAAC;IAEO,YAAY,CAClB,SAAiB,EACjB,OAAyC,EACzC,UAAU,IAAI,GAAG,EAAU;QAE3B,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,8BAA8B,CAAC,GAAG,OAAO,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CACrE,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEvB,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,cAAc,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAErE,OAAO;YACL,WAAW,EAAE;gBACX,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,SAAS,CAAC,WAAW,CAAC,KAAK;gBAC7D,qBAAqB,EAAE,IAAI,CAAC,SAAS,CACnC,SAAS,CAAC,WAAW,CAAC,qBAAqB,EAC3C,KAAK,CAAC,WAAW,CAAC,qBAAqB,CACxC;aACF;SACF,CAAC;IACJ,CAAC;IAEO,yBAAyB,CAAC,OAAuB;QAIvD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;QACjC,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;QAChD,MAAM,UAAU,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1D,IAAI,SAAS,GAAuB,OAAO,CAAC,KAAK,CAAC;QAClD,IAAI,cAAc,GAA0B,EAAE,CAAC;QAE/C,2BAA2B;QAC3B,IAAI,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YACnE,SAAS,GAAG,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,4BAA4B;YACzE,cAAc,GAAG,IAAI,CAAC,SAAS,CAC7B,cAAc,EACd,aAAa,CAAC,WAAW,CAAC,qBAAqB,CAChD,CAAC;QACJ,CAAC;QAED,gFAAgF;QAChF,kFAAkF;QAClF,4CAA4C;QAC5C,MAAM,gBAAgB,GAAG,SAAS,IAAI,OAAO,CAAC,KAAK,CAAC;QAEpD,MAAM,YAAY,GAAG;YACnB,GAAG,OAAO;YACV,KAAK,EAAE,gBAAgB;SACxB,CAAC;QAEF,+BAA+B;QAC/B,MAAM,OAAO,GAAG,SAAS;aACtB,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;YACvB,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAClD,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;oBACpB,OAAO,KAAK,KAAK,OAAO,CAAC,KAAK,IAAI,KAAK,KAAK,YAAY,CAAC,KAAK,CAAC;gBACjE,CAAC;gBACD,IAAI,GAAG,KAAK,eAAe,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;oBAChD,8DAA8D;oBAC9D,6DAA6D;oBAC7D,oBAAoB;oBACpB,OAAO,OAAO,CAAC,aAAa,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;gBACpE,CAAC;gBACD,OAAO,YAAY,CAAC,GAA2B,CAAC,KAAK,KAAK,CAAC;YAC7D,CAAC,CAAC,CAAC;YAEH,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO;oBACL,WAAW,EAAE,YAAY,CAAC,MAAM;oBAChC,WAAW,EAAE,QAAQ,CAAC,WAAW;oBACjC,KAAK;iBACN,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,KAAK,EAAsC,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;QAEzE,6EAA6E;QAC7E,4EAA4E;QAC5E,4EAA4E;QAC5E,uEAAuE;QACvE,sEAAsE;QACtE,mFAAmF;QACnF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACpB,IAAI,CAAC,CAAC,WAAW,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;gBACpC,OAAO,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC;YACvC,CAAC;YACD,OAAO,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,2BAA2B;QAC3B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;gBAC5B,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC;YACtC,CAAC;YACD,IAAI,KAAK,CAAC,WAAW,CAAC,qBAAqB,EAAE,CAAC;gBAC5C,cAAc,GAAG,IAAI,CAAC,SAAS,CAC7B,cAAc,EACd,KAAK,CAAC,WAAW,CAAC,qBAAqB,CACxC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO;YACL,KAAK,EAAE,SAAS;YAChB,qBAAqB,EAAE,cAAc;SACtC,CAAC;IACJ,CAAC;IAED,iBAAiB,CAAC,OAAuB;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAEzD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CACb,6CAA6C,OAAO,CAAC,KAAK,4EAA4E,CACvI,CAAC;QACJ,CAAC;QAED,OAAO;YACL,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,qBAAqB,EAAE,QAAQ,CAAC,qBAAqB;SAC/B,CAAC;IAC3B,CAAC;IAEO,QAAQ,CAAC,IAAa;QAC5B,OAAO,CAAC,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,CAAC;IAEO,SAAS,CACf,OAA0C,EAC1C,OAA0C;QAE1C,OAAO,IAAI,CAAC,gBAAgB,CAC1B,OAA8C,EAC9C,OAA8C,CAC/C,CAAC;IACJ,CAAC;IAEO,gBAAgB,CACtB,GAAG,OAAmD;QAEtD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,GAA4B,EAAE,GAAG,EAAE,EAAE;YAC1D,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,OAAO,GAAG,CAAC;YACb,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC/B,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC1B,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;gBAE1B,uEAAuE;gBACvE,sEAAsE;gBACtE,2BAA2B;gBAC3B,qEAAqE;gBACrE,kCAAkC;gBAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACvD,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CACvB,QAAmC,EACnC,QAAmC,CACpC,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;gBACtB,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;CACF"}
|
|
@@ -505,5 +505,27 @@ describe('ModelConfigService', () => {
|
|
|
505
505
|
]);
|
|
506
506
|
});
|
|
507
507
|
});
|
|
508
|
+
describe('runtime aliases', () => {
|
|
509
|
+
it('should resolve a simple runtime-registered alias', () => {
|
|
510
|
+
const config = {
|
|
511
|
+
aliases: {},
|
|
512
|
+
overrides: [],
|
|
513
|
+
};
|
|
514
|
+
const service = new ModelConfigService(config);
|
|
515
|
+
service.registerRuntimeModelConfig('runtime-alias', {
|
|
516
|
+
modelConfig: {
|
|
517
|
+
model: 'gemini-runtime-model',
|
|
518
|
+
generateContentConfig: {
|
|
519
|
+
temperature: 0.123,
|
|
520
|
+
},
|
|
521
|
+
},
|
|
522
|
+
});
|
|
523
|
+
const resolved = service.getResolvedConfig({ model: 'runtime-alias' });
|
|
524
|
+
expect(resolved.model).toBe('gemini-runtime-model');
|
|
525
|
+
expect(resolved.generateContentConfig).toEqual({
|
|
526
|
+
temperature: 0.123,
|
|
527
|
+
});
|
|
528
|
+
});
|
|
529
|
+
});
|
|
508
530
|
});
|
|
509
531
|
//# sourceMappingURL=modelConfigService.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelConfigService.test.js","sourceRoot":"","sources":["../../../src/services/modelConfigService.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"modelConfigService.test.js","sourceRoot":"","sources":["../../../src/services/modelConfigService.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -577,9 +577,10 @@ export class ShellExecutionService {
|
|
|
577
577
|
catch (e) {
|
|
578
578
|
// Ignore errors if the pty has already exited, which can happen
|
|
579
579
|
// due to a race condition between the exit event and this call.
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
580
|
+
const err = e;
|
|
581
|
+
const isEsrch = err.code === 'ESRCH';
|
|
582
|
+
const isWindowsPtyError = err.message?.includes('Cannot resize a pty that has already exited');
|
|
583
|
+
if (isEsrch || isWindowsPtyError) {
|
|
583
584
|
// On Unix, we get an ESRCH error.
|
|
584
585
|
// On Windows, we get a message-based error.
|
|
585
586
|
// In both cases, it's safe to ignore.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shellExecutionService.js","sourceRoot":"","sources":["../../../src/services/shellExecutionService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"shellExecutionService.js","sourceRoot":"","sources":["../../../src/services/shellExecutionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,12 +6,45 @@
|
|
|
6
6
|
}
|
|
7
7
|
},
|
|
8
8
|
"chat-base": {
|
|
9
|
+
"generateContentConfig": {
|
|
10
|
+
"temperature": 1,
|
|
11
|
+
"topP": 0.95,
|
|
12
|
+
"thinkingConfig": {
|
|
13
|
+
"includeThoughts": true
|
|
14
|
+
},
|
|
15
|
+
"topK": 64
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
"chat-base-2.5": {
|
|
19
|
+
"generateContentConfig": {
|
|
20
|
+
"temperature": 1,
|
|
21
|
+
"topP": 0.95,
|
|
22
|
+
"thinkingConfig": {
|
|
23
|
+
"includeThoughts": true,
|
|
24
|
+
"thinkingBudget": 8192
|
|
25
|
+
},
|
|
26
|
+
"topK": 64
|
|
27
|
+
}
|
|
28
|
+
},
|
|
29
|
+
"chat-base-3": {
|
|
30
|
+
"generateContentConfig": {
|
|
31
|
+
"temperature": 1,
|
|
32
|
+
"topP": 0.95,
|
|
33
|
+
"thinkingConfig": {
|
|
34
|
+
"includeThoughts": true,
|
|
35
|
+
"thinkingLevel": "HIGH"
|
|
36
|
+
},
|
|
37
|
+
"topK": 64
|
|
38
|
+
}
|
|
39
|
+
},
|
|
40
|
+
"gemini-3-pro-preview": {
|
|
41
|
+
"model": "gemini-3-pro-preview",
|
|
9
42
|
"generateContentConfig": {
|
|
10
43
|
"temperature": 1,
|
|
11
44
|
"topP": 0.95,
|
|
12
45
|
"thinkingConfig": {
|
|
13
46
|
"includeThoughts": true,
|
|
14
|
-
"
|
|
47
|
+
"thinkingLevel": "HIGH"
|
|
15
48
|
},
|
|
16
49
|
"topK": 64
|
|
17
50
|
}
|
|
@@ -23,7 +56,7 @@
|
|
|
23
56
|
"topP": 0.95,
|
|
24
57
|
"thinkingConfig": {
|
|
25
58
|
"includeThoughts": true,
|
|
26
|
-
"thinkingBudget":
|
|
59
|
+
"thinkingBudget": 8192
|
|
27
60
|
},
|
|
28
61
|
"topK": 64
|
|
29
62
|
}
|
|
@@ -35,7 +68,7 @@
|
|
|
35
68
|
"topP": 0.95,
|
|
36
69
|
"thinkingConfig": {
|
|
37
70
|
"includeThoughts": true,
|
|
38
|
-
"thinkingBudget":
|
|
71
|
+
"thinkingBudget": 8192
|
|
39
72
|
},
|
|
40
73
|
"topK": 64
|
|
41
74
|
}
|
|
@@ -47,7 +80,7 @@
|
|
|
47
80
|
"topP": 0.95,
|
|
48
81
|
"thinkingConfig": {
|
|
49
82
|
"includeThoughts": true,
|
|
50
|
-
"thinkingBudget":
|
|
83
|
+
"thinkingBudget": 8192
|
|
51
84
|
},
|
|
52
85
|
"topK": 64
|
|
53
86
|
}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
|
|
7
7
|
import { ActivityMonitor, DEFAULT_ACTIVITY_CONFIG, initializeActivityMonitor, getActivityMonitor, recordGlobalActivity, startGlobalActivityMonitoring, stopGlobalActivityMonitoring, } from './activity-monitor.js';
|
|
8
8
|
import { ActivityType } from './activity-types.js';
|
|
9
|
+
import { debugLogger } from '../utils/debugLogger.js';
|
|
9
10
|
// Mock the dependencies
|
|
10
11
|
vi.mock('./metrics.js', () => ({
|
|
11
12
|
isPerformanceMonitoringActive: vi.fn(() => true),
|
|
@@ -137,7 +138,9 @@ describe('ActivityMonitor', () => {
|
|
|
137
138
|
listenerCallCount++;
|
|
138
139
|
};
|
|
139
140
|
// Spy on console.debug to check error handling
|
|
140
|
-
const debugSpy = vi
|
|
141
|
+
const debugSpy = vi
|
|
142
|
+
.spyOn(debugLogger, 'debug')
|
|
143
|
+
.mockImplementation(() => { });
|
|
141
144
|
activityMonitor.addListener(faultyListener);
|
|
142
145
|
activityMonitor.addListener(goodListener);
|
|
143
146
|
activityMonitor.recordActivity(ActivityType.USER_INPUT_START);
|