@google/gemini-cli-core 0.1.10-dev.15 → 0.1.11-nightly.250713.4442e893
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 +16 -2
- package/dist/google-gemini-cli-core-0.1.11.tgz +0 -0
- package/dist/src/code_assist/codeAssist.d.ts +2 -1
- package/dist/src/code_assist/codeAssist.js +4 -3
- package/dist/src/code_assist/codeAssist.js.map +1 -1
- package/dist/src/code_assist/converter.js.map +1 -1
- package/dist/src/code_assist/oauth2.d.ts +3 -8
- package/dist/src/code_assist/oauth2.js +117 -75
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +134 -34
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.d.ts +4 -0
- package/dist/src/code_assist/server.js +68 -2
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/setup.js +1 -1
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/setup.test.d.ts +6 -0
- package/dist/src/code_assist/setup.test.js +62 -0
- package/dist/src/code_assist/setup.test.js.map +1 -0
- package/dist/src/config/config.d.ts +31 -3
- package/dist/src/config/config.js +102 -56
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +48 -23
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/core/client.d.ts +23 -6
- package/dist/src/core/client.js +88 -24
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +131 -12
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +7 -5
- package/dist/src/core/contentGenerator.js +16 -15
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +52 -5
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +9 -2
- package/dist/src/core/coreToolScheduler.js +52 -5
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +80 -0
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +2 -2
- package/dist/src/core/geminiChat.js +52 -32
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +4 -2
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/modelCheck.js +1 -1
- package/dist/src/core/modelCheck.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.js +11 -2
- package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +5 -0
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.js +9 -8
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/turn.d.ts +9 -3
- package/dist/src/core/turn.js +6 -2
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +2 -2
- package/dist/src/core/turn.test.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/services/fileDiscoveryService.d.ts +4 -0
- package/dist/src/services/fileDiscoveryService.js +13 -0
- package/dist/src/services/fileDiscoveryService.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +3 -2
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +70 -28
- 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/index.d.ts +2 -2
- package/dist/src/telemetry/index.js +2 -2
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +2 -1
- package/dist/src/telemetry/loggers.js +18 -1
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +42 -9
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +19 -5
- package/dist/src/telemetry/types.js +30 -4
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +1 -0
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/tools/edit.d.ts +1 -2
- package/dist/src/tools/edit.js +11 -12
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +7 -9
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.js +9 -8
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +3 -3
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.js +8 -7
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +4 -4
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/ls.js +9 -8
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +0 -9
- package/dist/src/tools/mcp-client.js +29 -48
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +131 -5
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.d.ts +3 -3
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/memoryTool.js +3 -2
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/read-file.js +9 -10
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +4 -4
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.js +25 -39
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +25 -14
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +5 -2
- package/dist/src/tools/shell.js +41 -18
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +85 -65
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +16 -2
- package/dist/src/tools/tool-registry.js +153 -20
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +186 -75
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +25 -4
- package/dist/src/tools/tools.js +8 -1
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.js +6 -5
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-search.d.ts +1 -1
- package/dist/src/tools/web-search.js +7 -6
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/write-file.d.ts +0 -1
- package/dist/src/tools/write-file.js +10 -11
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +4 -4
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/editCorrector.d.ts +1 -1
- package/dist/src/utils/editCorrector.js +106 -2
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +69 -19
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/editor.d.ts +1 -1
- package/dist/src/utils/editor.js +1 -1
- package/dist/src/utils/fileUtils.d.ts +1 -1
- package/dist/src/utils/fileUtils.js +17 -0
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +17 -0
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/flashFallback.integration.test.js +1 -1
- package/dist/src/utils/flashFallback.integration.test.js.map +1 -1
- package/dist/src/utils/messageInspectors.d.ts +1 -0
- package/dist/src/utils/messageInspectors.js +5 -0
- package/dist/src/utils/messageInspectors.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.js +1 -1
- package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
- package/dist/src/utils/paths.d.ts +1 -0
- package/dist/src/utils/paths.js +1 -0
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/quotaErrorDetection.d.ts +22 -0
- package/dist/src/utils/quotaErrorDetection.js +74 -0
- package/dist/src/utils/quotaErrorDetection.js.map +1 -0
- package/dist/src/utils/retry.d.ts +1 -1
- package/dist/src/utils/retry.js +58 -2
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js +1 -1
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/schemaValidator.d.ts +10 -5
- package/dist/src/utils/schemaValidator.js +44 -32
- package/dist/src/utils/schemaValidator.js.map +1 -1
- package/dist/src/utils/summarizer.d.ts +25 -0
- package/dist/src/utils/summarizer.js +79 -0
- package/dist/src/utils/summarizer.js.map +1 -0
- package/dist/src/utils/summarizer.test.d.ts +6 -0
- package/dist/src/utils/summarizer.test.js +131 -0
- package/dist/src/utils/summarizer.test.js.map +1 -0
- package/dist/src/utils/user_account.d.ts +9 -0
- package/dist/src/utils/user_account.js +99 -0
- package/dist/src/utils/user_account.js.map +1 -0
- package/dist/src/utils/user_account.test.d.ts +6 -0
- package/dist/src/utils/user_account.test.js +153 -0
- package/dist/src/utils/user_account.test.js.map +1 -0
- package/dist/src/utils/user_id.d.ts +0 -6
- package/dist/src/utils/user_id.js +0 -21
- package/dist/src/utils/user_id.js.map +1 -1
- package/dist/src/utils/user_id.test.js +1 -22
- package/dist/src/utils/user_id.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -6
|
@@ -5,10 +5,10 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
7
7
|
import { GoogleGenAI, } from '@google/genai';
|
|
8
|
-
import { GeminiClient } from './client.js';
|
|
8
|
+
import { findIndexAfterFraction, GeminiClient } from './client.js';
|
|
9
9
|
import { AuthType } from './contentGenerator.js';
|
|
10
10
|
import { Config } from '../config/config.js';
|
|
11
|
-
import { Turn } from './turn.js';
|
|
11
|
+
import { GeminiEventType, Turn } from './turn.js';
|
|
12
12
|
import { getCoreSystemPrompt } from './prompts.js';
|
|
13
13
|
import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
|
|
14
14
|
import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
|
|
@@ -31,7 +31,13 @@ vi.mock('./turn', () => {
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
// Export the mock class as 'Turn'
|
|
34
|
-
return {
|
|
34
|
+
return {
|
|
35
|
+
Turn: MockTurn,
|
|
36
|
+
GeminiEventType: {
|
|
37
|
+
MaxSessionTurns: 'MaxSessionTurns',
|
|
38
|
+
ChatCompressed: 'ChatCompressed',
|
|
39
|
+
},
|
|
40
|
+
};
|
|
35
41
|
});
|
|
36
42
|
vi.mock('../config/config.js');
|
|
37
43
|
vi.mock('./prompts');
|
|
@@ -51,6 +57,52 @@ vi.mock('../telemetry/index.js', () => ({
|
|
|
51
57
|
logApiResponse: vi.fn(),
|
|
52
58
|
logApiError: vi.fn(),
|
|
53
59
|
}));
|
|
60
|
+
describe('findIndexAfterFraction', () => {
|
|
61
|
+
const history = [
|
|
62
|
+
{ role: 'user', parts: [{ text: 'This is the first message.' }] }, // JSON length: 66
|
|
63
|
+
{ role: 'model', parts: [{ text: 'This is the second message.' }] }, // JSON length: 68
|
|
64
|
+
{ role: 'user', parts: [{ text: 'This is the third message.' }] }, // JSON length: 66
|
|
65
|
+
{ role: 'model', parts: [{ text: 'This is the fourth message.' }] }, // JSON length: 68
|
|
66
|
+
{ role: 'user', parts: [{ text: 'This is the fifth message.' }] }, // JSON length: 65
|
|
67
|
+
];
|
|
68
|
+
// Total length: 333
|
|
69
|
+
it('should throw an error for non-positive numbers', () => {
|
|
70
|
+
expect(() => findIndexAfterFraction(history, 0)).toThrow('Fraction must be between 0 and 1');
|
|
71
|
+
});
|
|
72
|
+
it('should throw an error for a fraction greater than or equal to 1', () => {
|
|
73
|
+
expect(() => findIndexAfterFraction(history, 1)).toThrow('Fraction must be between 0 and 1');
|
|
74
|
+
});
|
|
75
|
+
it('should handle a fraction in the middle', () => {
|
|
76
|
+
// 333 * 0.5 = 166.5
|
|
77
|
+
// 0: 66
|
|
78
|
+
// 1: 66 + 68 = 134
|
|
79
|
+
// 2: 134 + 66 = 200
|
|
80
|
+
// 200 >= 166.5, so index is 2
|
|
81
|
+
expect(findIndexAfterFraction(history, 0.5)).toBe(2);
|
|
82
|
+
});
|
|
83
|
+
it('should handle a fraction that results in the last index', () => {
|
|
84
|
+
// 333 * 0.9 = 299.7
|
|
85
|
+
// ...
|
|
86
|
+
// 3: 200 + 68 = 268
|
|
87
|
+
// 4: 268 + 65 = 333
|
|
88
|
+
// 333 >= 299.7, so index is 4
|
|
89
|
+
expect(findIndexAfterFraction(history, 0.9)).toBe(4);
|
|
90
|
+
});
|
|
91
|
+
it('should handle an empty history', () => {
|
|
92
|
+
expect(findIndexAfterFraction([], 0.5)).toBe(0);
|
|
93
|
+
});
|
|
94
|
+
it('should handle a history with only one item', () => {
|
|
95
|
+
expect(findIndexAfterFraction(history.slice(0, 1), 0.5)).toBe(0);
|
|
96
|
+
});
|
|
97
|
+
it('should handle history with weird parts', () => {
|
|
98
|
+
const historyWithEmptyParts = [
|
|
99
|
+
{ role: 'user', parts: [{ text: 'Message 1' }] },
|
|
100
|
+
{ role: 'model', parts: [{ fileData: { fileUri: 'derp' } }] },
|
|
101
|
+
{ role: 'user', parts: [{ text: 'Message 2' }] },
|
|
102
|
+
];
|
|
103
|
+
expect(findIndexAfterFraction(historyWithEmptyParts, 0.5)).toBe(1);
|
|
104
|
+
});
|
|
105
|
+
});
|
|
54
106
|
describe('Gemini Client (client.ts)', () => {
|
|
55
107
|
let client;
|
|
56
108
|
beforeEach(async () => {
|
|
@@ -111,6 +163,10 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
111
163
|
getProxy: vi.fn().mockReturnValue(undefined),
|
|
112
164
|
getWorkingDir: vi.fn().mockReturnValue('/test/dir'),
|
|
113
165
|
getFileService: vi.fn().mockReturnValue(fileService),
|
|
166
|
+
getMaxSessionTurns: vi.fn().mockReturnValue(0),
|
|
167
|
+
getQuotaErrorOccurred: vi.fn().mockReturnValue(false),
|
|
168
|
+
setQuotaErrorOccurred: vi.fn(),
|
|
169
|
+
getNoBrowser: vi.fn().mockReturnValue(false),
|
|
114
170
|
};
|
|
115
171
|
return mock;
|
|
116
172
|
});
|
|
@@ -244,7 +300,7 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
244
300
|
client['contentGenerator'] = mockGenerator;
|
|
245
301
|
await client.generateJson(contents, schema, abortSignal);
|
|
246
302
|
expect(mockGenerateContentFn).toHaveBeenCalledWith({
|
|
247
|
-
model:
|
|
303
|
+
model: 'test-model', // Should use current model from config
|
|
248
304
|
config: {
|
|
249
305
|
abortSignal,
|
|
250
306
|
systemInstruction: getCoreSystemPrompt(''),
|
|
@@ -256,6 +312,32 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
256
312
|
contents,
|
|
257
313
|
});
|
|
258
314
|
});
|
|
315
|
+
it('should allow overriding model and config', async () => {
|
|
316
|
+
const contents = [{ role: 'user', parts: [{ text: 'hello' }] }];
|
|
317
|
+
const schema = { type: 'string' };
|
|
318
|
+
const abortSignal = new AbortController().signal;
|
|
319
|
+
const customModel = 'custom-json-model';
|
|
320
|
+
const customConfig = { temperature: 0.9, topK: 20 };
|
|
321
|
+
const mockGenerator = {
|
|
322
|
+
countTokens: vi.fn().mockResolvedValue({ totalTokens: 1 }),
|
|
323
|
+
generateContent: mockGenerateContentFn,
|
|
324
|
+
};
|
|
325
|
+
client['contentGenerator'] = mockGenerator;
|
|
326
|
+
await client.generateJson(contents, schema, abortSignal, customModel, customConfig);
|
|
327
|
+
expect(mockGenerateContentFn).toHaveBeenCalledWith({
|
|
328
|
+
model: customModel,
|
|
329
|
+
config: {
|
|
330
|
+
abortSignal,
|
|
331
|
+
systemInstruction: getCoreSystemPrompt(''),
|
|
332
|
+
temperature: 0.9,
|
|
333
|
+
topP: 1, // from default
|
|
334
|
+
topK: 20,
|
|
335
|
+
responseSchema: schema,
|
|
336
|
+
responseMimeType: 'application/json',
|
|
337
|
+
},
|
|
338
|
+
contents,
|
|
339
|
+
});
|
|
340
|
+
});
|
|
259
341
|
});
|
|
260
342
|
describe('addHistory', () => {
|
|
261
343
|
it('should call chat.addHistory with the provided content', async () => {
|
|
@@ -313,6 +395,7 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
313
395
|
{ role: 'user', parts: [{ text: '...history...' }] },
|
|
314
396
|
]),
|
|
315
397
|
addHistory: vi.fn(),
|
|
398
|
+
setHistory: vi.fn(),
|
|
316
399
|
sendMessage: mockSendMessage,
|
|
317
400
|
};
|
|
318
401
|
client['chat'] = mockChat;
|
|
@@ -324,7 +407,7 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
324
407
|
totalTokens: MOCKED_TOKEN_LIMIT * 0.699, // TOKEN_THRESHOLD_FOR_SUMMARIZATION = 0.7
|
|
325
408
|
});
|
|
326
409
|
const initialChat = client.getChat();
|
|
327
|
-
const result = await client.tryCompressChat();
|
|
410
|
+
const result = await client.tryCompressChat('prompt-id-2');
|
|
328
411
|
const newChat = client.getChat();
|
|
329
412
|
expect(tokenLimit).toHaveBeenCalled();
|
|
330
413
|
expect(result).toBeNull();
|
|
@@ -344,7 +427,7 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
344
427
|
parts: [{ text: 'This is a summary.' }],
|
|
345
428
|
});
|
|
346
429
|
const initialChat = client.getChat();
|
|
347
|
-
const result = await client.tryCompressChat();
|
|
430
|
+
const result = await client.tryCompressChat('prompt-id-3');
|
|
348
431
|
const newChat = client.getChat();
|
|
349
432
|
expect(tokenLimit).toHaveBeenCalled();
|
|
350
433
|
expect(mockSendMessage).toHaveBeenCalled();
|
|
@@ -368,7 +451,7 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
368
451
|
parts: [{ text: 'This is a summary.' }],
|
|
369
452
|
});
|
|
370
453
|
const initialChat = client.getChat();
|
|
371
|
-
const result = await client.tryCompressChat(true); // force = true
|
|
454
|
+
const result = await client.tryCompressChat('prompt-id-1', true); // force = true
|
|
372
455
|
const newChat = client.getChat();
|
|
373
456
|
expect(mockSendMessage).toHaveBeenCalled();
|
|
374
457
|
expect(result).toEqual({
|
|
@@ -396,7 +479,7 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
396
479
|
};
|
|
397
480
|
client['contentGenerator'] = mockGenerator;
|
|
398
481
|
// Act
|
|
399
|
-
const stream = client.sendMessageStream([{ text: 'Hi' }], new AbortController().signal);
|
|
482
|
+
const stream = client.sendMessageStream([{ text: 'Hi' }], new AbortController().signal, 'prompt-id-1');
|
|
400
483
|
// Consume the stream manually to get the final return value.
|
|
401
484
|
let finalResult;
|
|
402
485
|
while (true) {
|
|
@@ -435,7 +518,7 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
435
518
|
const abortController = new AbortController();
|
|
436
519
|
const signal = abortController.signal;
|
|
437
520
|
// Act - Start the stream that should loop
|
|
438
|
-
const stream = client.sendMessageStream([{ text: 'Start conversation' }], signal);
|
|
521
|
+
const stream = client.sendMessageStream([{ text: 'Start conversation' }], signal, 'prompt-id-2');
|
|
439
522
|
// Count how many stream events we get
|
|
440
523
|
let eventCount = 0;
|
|
441
524
|
let finalResult;
|
|
@@ -480,6 +563,41 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
480
563
|
expect(eventCount).toBeGreaterThanOrEqual(1);
|
|
481
564
|
expect(eventCount).toBeLessThan(200); // Should not exceed our safety limit
|
|
482
565
|
});
|
|
566
|
+
it('should yield MaxSessionTurns and stop when session turn limit is reached', async () => {
|
|
567
|
+
// Arrange
|
|
568
|
+
const MAX_SESSION_TURNS = 5;
|
|
569
|
+
vi.spyOn(client['config'], 'getMaxSessionTurns').mockReturnValue(MAX_SESSION_TURNS);
|
|
570
|
+
const mockStream = (async function* () {
|
|
571
|
+
yield { type: 'content', value: 'Hello' };
|
|
572
|
+
})();
|
|
573
|
+
mockTurnRunFn.mockReturnValue(mockStream);
|
|
574
|
+
const mockChat = {
|
|
575
|
+
addHistory: vi.fn(),
|
|
576
|
+
getHistory: vi.fn().mockReturnValue([]),
|
|
577
|
+
};
|
|
578
|
+
client['chat'] = mockChat;
|
|
579
|
+
const mockGenerator = {
|
|
580
|
+
countTokens: vi.fn().mockResolvedValue({ totalTokens: 0 }),
|
|
581
|
+
};
|
|
582
|
+
client['contentGenerator'] = mockGenerator;
|
|
583
|
+
// Act & Assert
|
|
584
|
+
// Run up to the limit
|
|
585
|
+
for (let i = 0; i < MAX_SESSION_TURNS; i++) {
|
|
586
|
+
const stream = client.sendMessageStream([{ text: 'Hi' }], new AbortController().signal, 'prompt-id-4');
|
|
587
|
+
// consume stream
|
|
588
|
+
for await (const _event of stream) {
|
|
589
|
+
// do nothing
|
|
590
|
+
}
|
|
591
|
+
}
|
|
592
|
+
// This call should exceed the limit
|
|
593
|
+
const stream = client.sendMessageStream([{ text: 'Hi' }], new AbortController().signal, 'prompt-id-5');
|
|
594
|
+
const events = [];
|
|
595
|
+
for await (const event of stream) {
|
|
596
|
+
events.push(event);
|
|
597
|
+
}
|
|
598
|
+
expect(events).toEqual([{ type: GeminiEventType.MaxSessionTurns }]);
|
|
599
|
+
expect(mockTurnRunFn).toHaveBeenCalledTimes(MAX_SESSION_TURNS);
|
|
600
|
+
});
|
|
483
601
|
it('should respect MAX_TURNS limit even when turns parameter is set to a large value', async () => {
|
|
484
602
|
// This test verifies that the infinite loop protection works even when
|
|
485
603
|
// someone tries to bypass it by calling with a very large turns value
|
|
@@ -509,7 +627,7 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
509
627
|
const signal = abortController.signal;
|
|
510
628
|
// Act - Start the stream with an extremely high turns value
|
|
511
629
|
// This simulates a case where the turns protection is bypassed
|
|
512
|
-
const stream = client.sendMessageStream([{ text: 'Start conversation' }], signal, Number.MAX_SAFE_INTEGER);
|
|
630
|
+
const stream = client.sendMessageStream([{ text: 'Start conversation' }], signal, 'prompt-id-3', Number.MAX_SAFE_INTEGER);
|
|
513
631
|
// Count how many stream events we get
|
|
514
632
|
let eventCount = 0;
|
|
515
633
|
const maxTestIterations = 1000; // Higher limit to show the loop continues
|
|
@@ -581,6 +699,7 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
581
699
|
];
|
|
582
700
|
const mockChat = {
|
|
583
701
|
getHistory: vi.fn().mockReturnValue(mockChatHistory),
|
|
702
|
+
setHistory: vi.fn(),
|
|
584
703
|
sendMessage: mockSendMessage,
|
|
585
704
|
};
|
|
586
705
|
const mockGenerator = {
|
|
@@ -595,7 +714,7 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
595
714
|
client['chat'] = mockChat;
|
|
596
715
|
client['contentGenerator'] = mockGenerator;
|
|
597
716
|
client['startChat'] = vi.fn().mockResolvedValue(mockChat);
|
|
598
|
-
const result = await client.tryCompressChat(true);
|
|
717
|
+
const result = await client.tryCompressChat('prompt-id-4', true);
|
|
599
718
|
expect(mockCountTokens).toHaveBeenCalledTimes(2);
|
|
600
719
|
expect(mockCountTokens).toHaveBeenNthCalledWith(1, {
|
|
601
720
|
model: firstCurrentModel,
|
|
@@ -623,7 +742,7 @@ describe('Gemini Client (client.ts)', () => {
|
|
|
623
742
|
client['config'].setModel = vi.fn();
|
|
624
743
|
const result = await client['handleFlashFallback'](AuthType.LOGIN_WITH_GOOGLE);
|
|
625
744
|
expect(result).toBe(fallbackModel);
|
|
626
|
-
expect(mockFallbackHandler).toHaveBeenCalledWith(currentModel, fallbackModel);
|
|
745
|
+
expect(mockFallbackHandler).toHaveBeenCalledWith(currentModel, fallbackModel, undefined);
|
|
627
746
|
});
|
|
628
747
|
});
|
|
629
748
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.test.js","sourceRoot":"","sources":["../../../src/core/client.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.test.js","sourceRoot":"","sources":["../../../src/core/client.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { CountTokensResponse, GenerateContentResponse, GenerateContentParameters, CountTokensParameters, EmbedContentResponse, EmbedContentParameters } from '@google/genai';
|
|
7
|
+
import { Config } from '../config/config.js';
|
|
8
|
+
import { UserTierId } from '../code_assist/types.js';
|
|
7
9
|
/**
|
|
8
10
|
* Interface abstracting the core functionalities for generating content and counting tokens.
|
|
9
11
|
*/
|
|
@@ -12,11 +14,13 @@ export interface ContentGenerator {
|
|
|
12
14
|
generateContentStream(request: GenerateContentParameters): Promise<AsyncGenerator<GenerateContentResponse>>;
|
|
13
15
|
countTokens(request: CountTokensParameters): Promise<CountTokensResponse>;
|
|
14
16
|
embedContent(request: EmbedContentParameters): Promise<EmbedContentResponse>;
|
|
17
|
+
getTier?(): Promise<UserTierId | undefined>;
|
|
15
18
|
}
|
|
16
19
|
export declare enum AuthType {
|
|
17
20
|
LOGIN_WITH_GOOGLE = "oauth-personal",
|
|
18
21
|
USE_GEMINI = "gemini-api-key",
|
|
19
|
-
USE_VERTEX_AI = "vertex-ai"
|
|
22
|
+
USE_VERTEX_AI = "vertex-ai",
|
|
23
|
+
CLOUD_SHELL = "cloud-shell"
|
|
20
24
|
}
|
|
21
25
|
export type ContentGeneratorConfig = {
|
|
22
26
|
model: string;
|
|
@@ -24,7 +28,5 @@ export type ContentGeneratorConfig = {
|
|
|
24
28
|
vertexai?: boolean;
|
|
25
29
|
authType?: AuthType | undefined;
|
|
26
30
|
};
|
|
27
|
-
export declare function createContentGeneratorConfig(model: string | undefined, authType: AuthType | undefined
|
|
28
|
-
|
|
29
|
-
}): Promise<ContentGeneratorConfig>;
|
|
30
|
-
export declare function createContentGenerator(config: ContentGeneratorConfig, sessionId?: string): Promise<ContentGenerator>;
|
|
31
|
+
export declare function createContentGeneratorConfig(model: string | undefined, authType: AuthType | undefined): Promise<ContentGeneratorConfig>;
|
|
32
|
+
export declare function createContentGenerator(config: ContentGeneratorConfig, gcConfig: Config, sessionId?: string): Promise<ContentGenerator>;
|
|
@@ -12,47 +12,48 @@ export var AuthType;
|
|
|
12
12
|
AuthType["LOGIN_WITH_GOOGLE"] = "oauth-personal";
|
|
13
13
|
AuthType["USE_GEMINI"] = "gemini-api-key";
|
|
14
14
|
AuthType["USE_VERTEX_AI"] = "vertex-ai";
|
|
15
|
+
AuthType["CLOUD_SHELL"] = "cloud-shell";
|
|
15
16
|
})(AuthType || (AuthType = {}));
|
|
16
|
-
export async function createContentGeneratorConfig(model, authType
|
|
17
|
-
const geminiApiKey = process.env.GEMINI_API_KEY;
|
|
18
|
-
const googleApiKey = process.env.GOOGLE_API_KEY;
|
|
19
|
-
const googleCloudProject = process.env.GOOGLE_CLOUD_PROJECT;
|
|
20
|
-
const googleCloudLocation = process.env.GOOGLE_CLOUD_LOCATION;
|
|
17
|
+
export async function createContentGeneratorConfig(model, authType) {
|
|
18
|
+
const geminiApiKey = process.env.GEMINI_API_KEY || undefined;
|
|
19
|
+
const googleApiKey = process.env.GOOGLE_API_KEY || undefined;
|
|
20
|
+
const googleCloudProject = process.env.GOOGLE_CLOUD_PROJECT || undefined;
|
|
21
|
+
const googleCloudLocation = process.env.GOOGLE_CLOUD_LOCATION || undefined;
|
|
21
22
|
// Use runtime model from config if available, otherwise fallback to parameter or default
|
|
22
|
-
const effectiveModel =
|
|
23
|
+
const effectiveModel = model || DEFAULT_GEMINI_MODEL;
|
|
23
24
|
const contentGeneratorConfig = {
|
|
24
25
|
model: effectiveModel,
|
|
25
26
|
authType,
|
|
26
27
|
};
|
|
27
|
-
//
|
|
28
|
-
if (authType === AuthType.LOGIN_WITH_GOOGLE
|
|
28
|
+
// If we are using Google auth or we are in Cloud Shell, there is nothing else to validate for now
|
|
29
|
+
if (authType === AuthType.LOGIN_WITH_GOOGLE ||
|
|
30
|
+
authType === AuthType.CLOUD_SHELL) {
|
|
29
31
|
return contentGeneratorConfig;
|
|
30
32
|
}
|
|
31
33
|
if (authType === AuthType.USE_GEMINI && geminiApiKey) {
|
|
32
34
|
contentGeneratorConfig.apiKey = geminiApiKey;
|
|
35
|
+
contentGeneratorConfig.vertexai = false;
|
|
33
36
|
contentGeneratorConfig.model = await getEffectiveModel(contentGeneratorConfig.apiKey, contentGeneratorConfig.model);
|
|
34
37
|
return contentGeneratorConfig;
|
|
35
38
|
}
|
|
36
39
|
if (authType === AuthType.USE_VERTEX_AI &&
|
|
37
|
-
|
|
38
|
-
googleCloudProject &&
|
|
39
|
-
googleCloudLocation) {
|
|
40
|
+
(googleApiKey || (googleCloudProject && googleCloudLocation))) {
|
|
40
41
|
contentGeneratorConfig.apiKey = googleApiKey;
|
|
41
42
|
contentGeneratorConfig.vertexai = true;
|
|
42
|
-
contentGeneratorConfig.model = await getEffectiveModel(contentGeneratorConfig.apiKey, contentGeneratorConfig.model);
|
|
43
43
|
return contentGeneratorConfig;
|
|
44
44
|
}
|
|
45
45
|
return contentGeneratorConfig;
|
|
46
46
|
}
|
|
47
|
-
export async function createContentGenerator(config, sessionId) {
|
|
47
|
+
export async function createContentGenerator(config, gcConfig, sessionId) {
|
|
48
48
|
const version = process.env.CLI_VERSION || process.version;
|
|
49
49
|
const httpOptions = {
|
|
50
50
|
headers: {
|
|
51
51
|
'User-Agent': `GeminiCLI/${version} (${process.platform}; ${process.arch})`,
|
|
52
52
|
},
|
|
53
53
|
};
|
|
54
|
-
if (config.authType === AuthType.LOGIN_WITH_GOOGLE
|
|
55
|
-
|
|
54
|
+
if (config.authType === AuthType.LOGIN_WITH_GOOGLE ||
|
|
55
|
+
config.authType === AuthType.CLOUD_SHELL) {
|
|
56
|
+
return createCodeAssistContentGenerator(httpOptions, config.authType, gcConfig, sessionId);
|
|
56
57
|
}
|
|
57
58
|
if (config.authType === AuthType.USE_GEMINI ||
|
|
58
59
|
config.authType === AuthType.USE_VERTEX_AI) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contentGenerator.js","sourceRoot":"","sources":["../../../src/core/contentGenerator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAOL,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"contentGenerator.js","sourceRoot":"","sources":["../../../src/core/contentGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,20 +3,21 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { describe, it, expect, vi } from 'vitest';
|
|
7
|
-
import { createContentGenerator, AuthType } from './contentGenerator.js';
|
|
6
|
+
import { describe, it, expect, vi, beforeEach, afterAll } from 'vitest';
|
|
7
|
+
import { createContentGenerator, AuthType, createContentGeneratorConfig, } from './contentGenerator.js';
|
|
8
8
|
import { createCodeAssistContentGenerator } from '../code_assist/codeAssist.js';
|
|
9
9
|
import { GoogleGenAI } from '@google/genai';
|
|
10
10
|
vi.mock('../code_assist/codeAssist.js');
|
|
11
11
|
vi.mock('@google/genai');
|
|
12
|
-
|
|
12
|
+
const mockConfig = {};
|
|
13
|
+
describe('createContentGenerator', () => {
|
|
13
14
|
it('should create a CodeAssistContentGenerator', async () => {
|
|
14
15
|
const mockGenerator = {};
|
|
15
16
|
vi.mocked(createCodeAssistContentGenerator).mockResolvedValue(mockGenerator);
|
|
16
17
|
const generator = await createContentGenerator({
|
|
17
18
|
model: 'test-model',
|
|
18
19
|
authType: AuthType.LOGIN_WITH_GOOGLE,
|
|
19
|
-
});
|
|
20
|
+
}, mockConfig);
|
|
20
21
|
expect(createCodeAssistContentGenerator).toHaveBeenCalled();
|
|
21
22
|
expect(generator).toBe(mockGenerator);
|
|
22
23
|
});
|
|
@@ -29,7 +30,7 @@ describe('contentGenerator', () => {
|
|
|
29
30
|
model: 'test-model',
|
|
30
31
|
apiKey: 'test-api-key',
|
|
31
32
|
authType: AuthType.USE_GEMINI,
|
|
32
|
-
});
|
|
33
|
+
}, mockConfig);
|
|
33
34
|
expect(GoogleGenAI).toHaveBeenCalledWith({
|
|
34
35
|
apiKey: 'test-api-key',
|
|
35
36
|
vertexai: undefined,
|
|
@@ -42,4 +43,50 @@ describe('contentGenerator', () => {
|
|
|
42
43
|
expect(generator).toBe(mockGenerator.models);
|
|
43
44
|
});
|
|
44
45
|
});
|
|
46
|
+
describe('createContentGeneratorConfig', () => {
|
|
47
|
+
const originalEnv = process.env;
|
|
48
|
+
beforeEach(() => {
|
|
49
|
+
// Reset modules to re-evaluate imports and environment variables
|
|
50
|
+
vi.resetModules();
|
|
51
|
+
// Restore process.env before each test
|
|
52
|
+
process.env = { ...originalEnv };
|
|
53
|
+
});
|
|
54
|
+
afterAll(() => {
|
|
55
|
+
// Restore original process.env after all tests
|
|
56
|
+
process.env = originalEnv;
|
|
57
|
+
});
|
|
58
|
+
it('should configure for Gemini using GEMINI_API_KEY when set', async () => {
|
|
59
|
+
process.env.GEMINI_API_KEY = 'env-gemini-key';
|
|
60
|
+
const config = await createContentGeneratorConfig(undefined, AuthType.USE_GEMINI);
|
|
61
|
+
expect(config.apiKey).toBe('env-gemini-key');
|
|
62
|
+
expect(config.vertexai).toBe(false);
|
|
63
|
+
});
|
|
64
|
+
it('should not configure for Gemini if GEMINI_API_KEY is empty', async () => {
|
|
65
|
+
process.env.GEMINI_API_KEY = '';
|
|
66
|
+
const config = await createContentGeneratorConfig(undefined, AuthType.USE_GEMINI);
|
|
67
|
+
expect(config.apiKey).toBeUndefined();
|
|
68
|
+
expect(config.vertexai).toBeUndefined();
|
|
69
|
+
});
|
|
70
|
+
it('should configure for Vertex AI using GOOGLE_API_KEY when set', async () => {
|
|
71
|
+
process.env.GOOGLE_API_KEY = 'env-google-key';
|
|
72
|
+
const config = await createContentGeneratorConfig(undefined, AuthType.USE_VERTEX_AI);
|
|
73
|
+
expect(config.apiKey).toBe('env-google-key');
|
|
74
|
+
expect(config.vertexai).toBe(true);
|
|
75
|
+
});
|
|
76
|
+
it('should configure for Vertex AI using GCP project and location when set', async () => {
|
|
77
|
+
process.env.GOOGLE_CLOUD_PROJECT = 'env-gcp-project';
|
|
78
|
+
process.env.GOOGLE_CLOUD_LOCATION = 'env-gcp-location';
|
|
79
|
+
const config = await createContentGeneratorConfig(undefined, AuthType.USE_VERTEX_AI);
|
|
80
|
+
expect(config.vertexai).toBe(true);
|
|
81
|
+
expect(config.apiKey).toBeUndefined();
|
|
82
|
+
});
|
|
83
|
+
it('should not configure for Vertex AI if required env vars are empty', async () => {
|
|
84
|
+
process.env.GOOGLE_API_KEY = '';
|
|
85
|
+
process.env.GOOGLE_CLOUD_PROJECT = '';
|
|
86
|
+
process.env.GOOGLE_CLOUD_LOCATION = '';
|
|
87
|
+
const config = await createContentGeneratorConfig(undefined, AuthType.USE_VERTEX_AI);
|
|
88
|
+
expect(config.apiKey).toBeUndefined();
|
|
89
|
+
expect(config.vertexai).toBeUndefined();
|
|
90
|
+
});
|
|
91
|
+
});
|
|
45
92
|
//# sourceMappingURL=contentGenerator.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contentGenerator.test.js","sourceRoot":"","sources":["../../../src/core/contentGenerator.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"contentGenerator.test.js","sourceRoot":"","sources":["../../../src/core/contentGenerator.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { ToolCallRequestInfo, ToolCallResponseInfo, ToolConfirmationOutcome, Tool, ToolCallConfirmationDetails, ToolRegistry, ApprovalMode, EditorType, Config } from '../index.js';
|
|
6
|
+
import { ToolCallRequestInfo, ToolCallResponseInfo, ToolConfirmationOutcome, Tool, ToolCallConfirmationDetails, ToolRegistry, ApprovalMode, EditorType, Config, ToolConfirmationPayload } from '../index.js';
|
|
7
7
|
import { PartListUnion } from '@google/genai';
|
|
8
8
|
export type ValidatingToolCall = {
|
|
9
9
|
status: 'validating';
|
|
@@ -89,7 +89,14 @@ export declare class CoreToolScheduler {
|
|
|
89
89
|
private setArgsInternal;
|
|
90
90
|
private isRunning;
|
|
91
91
|
schedule(request: ToolCallRequestInfo | ToolCallRequestInfo[], signal: AbortSignal): Promise<void>;
|
|
92
|
-
handleConfirmationResponse(callId: string, originalOnConfirm: (outcome: ToolConfirmationOutcome) => Promise<void>, outcome: ToolConfirmationOutcome, signal: AbortSignal): Promise<void>;
|
|
92
|
+
handleConfirmationResponse(callId: string, originalOnConfirm: (outcome: ToolConfirmationOutcome) => Promise<void>, outcome: ToolConfirmationOutcome, signal: AbortSignal, payload?: ToolConfirmationPayload): Promise<void>;
|
|
93
|
+
/**
|
|
94
|
+
* Applies user-provided content changes to a tool call that is awaiting confirmation.
|
|
95
|
+
* This method updates the tool's arguments and refreshes the confirmation prompt with a new diff
|
|
96
|
+
* before the tool is scheduled for execution.
|
|
97
|
+
* @private
|
|
98
|
+
*/
|
|
99
|
+
private _applyInlineModify;
|
|
93
100
|
private attemptExecutionOfScheduledCalls;
|
|
94
101
|
private checkAndNotifyCompletion;
|
|
95
102
|
private notifyToolCallsUpdate;
|