@google/gemini-cli-core 0.1.9-nightly.250709.c8cf954e → 0.1.9-rc.1

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.
Files changed (132) hide show
  1. package/README.md +3 -17
  2. package/dist/google-gemini-cli-core-0.1.9-rc.1.tgz +0 -0
  3. package/dist/src/code_assist/codeAssist.js +2 -3
  4. package/dist/src/code_assist/codeAssist.js.map +1 -1
  5. package/dist/src/code_assist/converter.js.map +1 -1
  6. package/dist/src/code_assist/oauth2.d.ts +2 -3
  7. package/dist/src/code_assist/oauth2.js +25 -56
  8. package/dist/src/code_assist/oauth2.js.map +1 -1
  9. package/dist/src/code_assist/oauth2.test.js +7 -83
  10. package/dist/src/code_assist/oauth2.test.js.map +1 -1
  11. package/dist/src/code_assist/server.js +1 -0
  12. package/dist/src/code_assist/server.js.map +1 -1
  13. package/dist/src/code_assist/setup.js +1 -1
  14. package/dist/src/code_assist/setup.js.map +1 -1
  15. package/dist/src/config/config.d.ts +2 -19
  16. package/dist/src/config/config.js +56 -78
  17. package/dist/src/config/config.js.map +1 -1
  18. package/dist/src/config/config.test.js +0 -25
  19. package/dist/src/config/config.test.js.map +1 -1
  20. package/dist/src/core/client.d.ts +3 -18
  21. package/dist/src/core/client.js +14 -55
  22. package/dist/src/core/client.js.map +1 -1
  23. package/dist/src/core/client.test.js +4 -209
  24. package/dist/src/core/client.test.js.map +1 -1
  25. package/dist/src/core/contentGenerator.d.ts +4 -3
  26. package/dist/src/core/contentGenerator.js +13 -14
  27. package/dist/src/core/contentGenerator.js.map +1 -1
  28. package/dist/src/core/contentGenerator.test.js +3 -49
  29. package/dist/src/core/contentGenerator.test.js.map +1 -1
  30. package/dist/src/core/coreToolScheduler.d.ts +2 -9
  31. package/dist/src/core/coreToolScheduler.js +2 -28
  32. package/dist/src/core/coreToolScheduler.js.map +1 -1
  33. package/dist/src/core/coreToolScheduler.test.js +0 -78
  34. package/dist/src/core/coreToolScheduler.test.js.map +1 -1
  35. package/dist/src/core/logger.d.ts +4 -3
  36. package/dist/src/core/logger.js +11 -7
  37. package/dist/src/core/logger.js.map +1 -1
  38. package/dist/src/core/logger.test.js +15 -6
  39. package/dist/src/core/logger.test.js.map +1 -1
  40. package/dist/src/core/modelCheck.js +1 -1
  41. package/dist/src/core/modelCheck.js.map +1 -1
  42. package/dist/src/services/fileDiscoveryService.d.ts +0 -4
  43. package/dist/src/services/fileDiscoveryService.js +0 -13
  44. package/dist/src/services/fileDiscoveryService.js.map +1 -1
  45. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +11 -34
  46. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
  47. package/dist/src/tools/edit.d.ts +2 -1
  48. package/dist/src/tools/edit.js +12 -11
  49. package/dist/src/tools/edit.js.map +1 -1
  50. package/dist/src/tools/edit.test.js +9 -7
  51. package/dist/src/tools/edit.test.js.map +1 -1
  52. package/dist/src/tools/glob.d.ts +1 -5
  53. package/dist/src/tools/glob.js +9 -14
  54. package/dist/src/tools/glob.js.map +1 -1
  55. package/dist/src/tools/glob.test.js +3 -3
  56. package/dist/src/tools/glob.test.js.map +1 -1
  57. package/dist/src/tools/grep.js +7 -8
  58. package/dist/src/tools/grep.js.map +1 -1
  59. package/dist/src/tools/grep.test.js +3 -3
  60. package/dist/src/tools/grep.test.js.map +1 -1
  61. package/dist/src/tools/ls.js +8 -9
  62. package/dist/src/tools/ls.js.map +1 -1
  63. package/dist/src/tools/mcp-client.d.ts +2 -0
  64. package/dist/src/tools/mcp-client.js +30 -31
  65. package/dist/src/tools/mcp-client.js.map +1 -1
  66. package/dist/src/tools/mcp-client.test.js +4 -85
  67. package/dist/src/tools/mcp-client.test.js.map +1 -1
  68. package/dist/src/tools/mcp-tool.d.ts +3 -3
  69. package/dist/src/tools/mcp-tool.js.map +1 -1
  70. package/dist/src/tools/memoryTool.js +2 -3
  71. package/dist/src/tools/memoryTool.js.map +1 -1
  72. package/dist/src/tools/read-file.js +8 -8
  73. package/dist/src/tools/read-file.js.map +1 -1
  74. package/dist/src/tools/read-file.test.js +4 -4
  75. package/dist/src/tools/read-file.test.js.map +1 -1
  76. package/dist/src/tools/read-many-files.js +38 -24
  77. package/dist/src/tools/read-many-files.js.map +1 -1
  78. package/dist/src/tools/read-many-files.test.js +4 -4
  79. package/dist/src/tools/read-many-files.test.js.map +1 -1
  80. package/dist/src/tools/shell.d.ts +1 -20
  81. package/dist/src/tools/shell.js +16 -53
  82. package/dist/src/tools/shell.js.map +1 -1
  83. package/dist/src/tools/shell.test.js +65 -85
  84. package/dist/src/tools/shell.test.js.map +1 -1
  85. package/dist/src/tools/tool-registry.d.ts +2 -16
  86. package/dist/src/tools/tool-registry.js +19 -150
  87. package/dist/src/tools/tool-registry.js.map +1 -1
  88. package/dist/src/tools/tool-registry.test.js +75 -186
  89. package/dist/src/tools/tool-registry.test.js.map +1 -1
  90. package/dist/src/tools/tools.d.ts +4 -7
  91. package/dist/src/tools/tools.js.map +1 -1
  92. package/dist/src/tools/web-fetch.js +5 -6
  93. package/dist/src/tools/web-fetch.js.map +1 -1
  94. package/dist/src/tools/web-search.d.ts +0 -5
  95. package/dist/src/tools/web-search.js +6 -12
  96. package/dist/src/tools/web-search.js.map +1 -1
  97. package/dist/src/tools/write-file.d.ts +1 -7
  98. package/dist/src/tools/write-file.js +11 -17
  99. package/dist/src/tools/write-file.js.map +1 -1
  100. package/dist/src/tools/write-file.test.js +4 -4
  101. package/dist/src/tools/write-file.test.js.map +1 -1
  102. package/dist/src/utils/editCorrector.d.ts +1 -1
  103. package/dist/src/utils/editCorrector.js +2 -106
  104. package/dist/src/utils/editCorrector.js.map +1 -1
  105. package/dist/src/utils/editCorrector.test.js +19 -65
  106. package/dist/src/utils/editCorrector.test.js.map +1 -1
  107. package/dist/src/utils/editor.d.ts +1 -1
  108. package/dist/src/utils/editor.js +1 -1
  109. package/dist/src/utils/fileUtils.d.ts +1 -1
  110. package/dist/src/utils/fileUtils.js +0 -17
  111. package/dist/src/utils/fileUtils.js.map +1 -1
  112. package/dist/src/utils/fileUtils.test.js +0 -17
  113. package/dist/src/utils/fileUtils.test.js.map +1 -1
  114. package/dist/src/utils/messageInspectors.d.ts +0 -1
  115. package/dist/src/utils/messageInspectors.js +0 -5
  116. package/dist/src/utils/messageInspectors.js.map +1 -1
  117. package/dist/src/utils/nextSpeakerChecker.js +1 -1
  118. package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
  119. package/dist/src/utils/schemaValidator.d.ts +5 -10
  120. package/dist/src/utils/schemaValidator.js +32 -44
  121. package/dist/src/utils/schemaValidator.js.map +1 -1
  122. package/dist/src/utils/user_id.d.ts +1 -1
  123. package/dist/src/utils/user_id.js +5 -5
  124. package/dist/src/utils/user_id.js.map +1 -1
  125. package/dist/src/utils/user_id.test.js +11 -15
  126. package/dist/src/utils/user_id.test.js.map +1 -1
  127. package/dist/tsconfig.tsbuildinfo +1 -1
  128. package/package.json +12 -11
  129. package/dist/google-gemini-cli-core-0.1.9.tgz +0 -0
  130. package/dist/src/code_assist/setup.test.d.ts +0 -6
  131. package/dist/src/code_assist/setup.test.js +0 -62
  132. package/dist/src/code_assist/setup.test.js.map +0 -1
@@ -5,7 +5,7 @@
5
5
  */
6
6
  import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
7
7
  import { GoogleGenAI, } from '@google/genai';
8
- import { findIndexAfterFraction, GeminiClient } from './client.js';
8
+ import { GeminiClient } from './client.js';
9
9
  import { AuthType } from './contentGenerator.js';
10
10
  import { Config } from '../config/config.js';
11
11
  import { Turn } from './turn.js';
@@ -13,7 +13,6 @@ import { getCoreSystemPrompt } from './prompts.js';
13
13
  import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
14
14
  import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
15
15
  import { setSimulate429 } from '../utils/testUtils.js';
16
- import { tokenLimit } from './tokenLimits.js';
17
16
  // --- Mocks ---
18
17
  const mockChatCreateFn = vi.fn();
19
18
  const mockGenerateContentFn = vi.fn();
@@ -51,43 +50,6 @@ vi.mock('../telemetry/index.js', () => ({
51
50
  logApiResponse: vi.fn(),
52
51
  logApiError: vi.fn(),
53
52
  }));
54
- describe('findIndexAfterFraction', () => {
55
- const history = [
56
- { role: 'user', parts: [{ text: 'This is the first message.' }] },
57
- { role: 'model', parts: [{ text: 'This is the second message.' }] },
58
- { role: 'user', parts: [{ text: 'This is the third message.' }] },
59
- { role: 'model', parts: [{ text: 'This is the fourth message.' }] },
60
- { role: 'user', parts: [{ text: 'This is the fifth message.' }] },
61
- ];
62
- it('should throw an error for non-positive numbers', () => {
63
- expect(() => findIndexAfterFraction(history, 0)).toThrow('Fraction must be between 0 and 1');
64
- });
65
- it('should throw an error for a fraction greater than or equal to 1', () => {
66
- expect(() => findIndexAfterFraction(history, 1)).toThrow('Fraction must be between 0 and 1');
67
- });
68
- it('should handle a fraction in the middle', () => {
69
- // Total length is 257. 257 * 0.5 = 128.5
70
- // 0: 53
71
- // 1: 53 + 54 = 107
72
- // 2: 107 + 53 = 160
73
- // 160 >= 128.5, so index is 2
74
- expect(findIndexAfterFraction(history, 0.5)).toBe(2);
75
- });
76
- it('should handle an empty history', () => {
77
- expect(findIndexAfterFraction([], 0.5)).toBe(0);
78
- });
79
- it('should handle a history with only one item', () => {
80
- expect(findIndexAfterFraction(history.slice(0, 1), 0.5)).toBe(0);
81
- });
82
- it('should handle history with weird parts', () => {
83
- const historyWithEmptyParts = [
84
- { role: 'user', parts: [{ text: 'Message 1' }] },
85
- { role: 'model', parts: [{ fileData: { fileUri: 'derp' } }] },
86
- { role: 'user', parts: [{ text: 'Message 2' }] },
87
- ];
88
- expect(findIndexAfterFraction(historyWithEmptyParts, 0.5)).toBe(1);
89
- });
90
- });
91
53
  describe('Gemini Client (client.ts)', () => {
92
54
  let client;
93
55
  beforeEach(async () => {
@@ -104,6 +66,7 @@ describe('Gemini Client (client.ts)', () => {
104
66
  embedContent: mockEmbedContentFn,
105
67
  },
106
68
  };
69
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
107
70
  return mock;
108
71
  });
109
72
  mockChatCreateFn.mockResolvedValue({});
@@ -149,10 +112,12 @@ describe('Gemini Client (client.ts)', () => {
149
112
  getWorkingDir: vi.fn().mockReturnValue('/test/dir'),
150
113
  getFileService: vi.fn().mockReturnValue(fileService),
151
114
  };
115
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
152
116
  return mock;
153
117
  });
154
118
  // We can instantiate the client here since Config is mocked
155
119
  // and the constructor will use the mocked GoogleGenAI
120
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
156
121
  const mockConfig = new Config({});
157
122
  client = new GeminiClient(mockConfig);
158
123
  await client.initialize(contentGeneratorConfig);
@@ -331,92 +296,6 @@ describe('Gemini Client (client.ts)', () => {
331
296
  expect(JSON.stringify(newHistory)).not.toContain('some old message');
332
297
  });
333
298
  });
334
- describe('tryCompressChat', () => {
335
- const mockCountTokens = vi.fn();
336
- const mockSendMessage = vi.fn();
337
- beforeEach(() => {
338
- vi.mock('./tokenLimits', () => ({
339
- tokenLimit: vi.fn(),
340
- }));
341
- const mockGenerator = {
342
- countTokens: mockCountTokens,
343
- };
344
- client['contentGenerator'] = mockGenerator;
345
- // Mock the chat's sendMessage method
346
- const mockChat = {
347
- getHistory: vi
348
- .fn()
349
- .mockReturnValue([
350
- { role: 'user', parts: [{ text: '...history...' }] },
351
- ]),
352
- addHistory: vi.fn(),
353
- setHistory: vi.fn(),
354
- sendMessage: mockSendMessage,
355
- };
356
- client['chat'] = mockChat;
357
- });
358
- it('should not trigger summarization if token count is below threshold', async () => {
359
- const MOCKED_TOKEN_LIMIT = 1000;
360
- vi.mocked(tokenLimit).mockReturnValue(MOCKED_TOKEN_LIMIT);
361
- mockCountTokens.mockResolvedValue({
362
- totalTokens: MOCKED_TOKEN_LIMIT * 0.699, // TOKEN_THRESHOLD_FOR_SUMMARIZATION = 0.7
363
- });
364
- const initialChat = client.getChat();
365
- const result = await client.tryCompressChat();
366
- const newChat = client.getChat();
367
- expect(tokenLimit).toHaveBeenCalled();
368
- expect(result).toBeNull();
369
- expect(newChat).toBe(initialChat);
370
- });
371
- it('should trigger summarization if token count is at threshold', async () => {
372
- const MOCKED_TOKEN_LIMIT = 1000;
373
- vi.mocked(tokenLimit).mockReturnValue(MOCKED_TOKEN_LIMIT);
374
- const originalTokenCount = 1000 * 0.7;
375
- const newTokenCount = 100;
376
- mockCountTokens
377
- .mockResolvedValueOnce({ totalTokens: originalTokenCount }) // First call for the check
378
- .mockResolvedValueOnce({ totalTokens: newTokenCount }); // Second call for the new history
379
- // Mock the summary response from the chat
380
- mockSendMessage.mockResolvedValue({
381
- role: 'model',
382
- parts: [{ text: 'This is a summary.' }],
383
- });
384
- const initialChat = client.getChat();
385
- const result = await client.tryCompressChat();
386
- const newChat = client.getChat();
387
- expect(tokenLimit).toHaveBeenCalled();
388
- expect(mockSendMessage).toHaveBeenCalled();
389
- // Assert that summarization happened and returned the correct stats
390
- expect(result).toEqual({
391
- originalTokenCount,
392
- newTokenCount,
393
- });
394
- // Assert that the chat was reset
395
- expect(newChat).not.toBe(initialChat);
396
- });
397
- it('should always trigger summarization when force is true, regardless of token count', async () => {
398
- const originalTokenCount = 10; // Well below threshold
399
- const newTokenCount = 5;
400
- mockCountTokens
401
- .mockResolvedValueOnce({ totalTokens: originalTokenCount })
402
- .mockResolvedValueOnce({ totalTokens: newTokenCount });
403
- // Mock the summary response from the chat
404
- mockSendMessage.mockResolvedValue({
405
- role: 'model',
406
- parts: [{ text: 'This is a summary.' }],
407
- });
408
- const initialChat = client.getChat();
409
- const result = await client.tryCompressChat(true); // force = true
410
- const newChat = client.getChat();
411
- expect(mockSendMessage).toHaveBeenCalled();
412
- expect(result).toEqual({
413
- originalTokenCount,
414
- newTokenCount,
415
- });
416
- // Assert that the chat was reset
417
- expect(newChat).not.toBe(initialChat);
418
- });
419
- });
420
299
  describe('sendMessageStream', () => {
421
300
  it('should return the turn instance after the stream is complete', async () => {
422
301
  // Arrange
@@ -581,89 +460,5 @@ describe('Gemini Client (client.ts)', () => {
581
460
  `${eventCount} events generated (properly bounded by MAX_TURNS)`);
582
461
  });
583
462
  });
584
- describe('generateContent', () => {
585
- it('should use current model from config for content generation', async () => {
586
- const initialModel = client['config'].getModel();
587
- const contents = [{ role: 'user', parts: [{ text: 'test' }] }];
588
- const currentModel = initialModel + '-changed';
589
- vi.spyOn(client['config'], 'getModel').mockReturnValueOnce(currentModel);
590
- const mockGenerator = {
591
- countTokens: vi.fn().mockResolvedValue({ totalTokens: 1 }),
592
- generateContent: mockGenerateContentFn,
593
- };
594
- client['contentGenerator'] = mockGenerator;
595
- await client.generateContent(contents, {}, new AbortController().signal);
596
- expect(mockGenerateContentFn).not.toHaveBeenCalledWith({
597
- model: initialModel,
598
- config: expect.any(Object),
599
- contents,
600
- });
601
- expect(mockGenerateContentFn).toHaveBeenCalledWith({
602
- model: currentModel,
603
- config: expect.any(Object),
604
- contents,
605
- });
606
- });
607
- });
608
- describe('tryCompressChat', () => {
609
- it('should use current model from config for token counting after sendMessage', async () => {
610
- const initialModel = client['config'].getModel();
611
- const mockCountTokens = vi
612
- .fn()
613
- .mockResolvedValueOnce({ totalTokens: 100000 })
614
- .mockResolvedValueOnce({ totalTokens: 5000 });
615
- const mockSendMessage = vi.fn().mockResolvedValue({ text: 'Summary' });
616
- const mockChatHistory = [
617
- { role: 'user', parts: [{ text: 'Long conversation' }] },
618
- { role: 'model', parts: [{ text: 'Long response' }] },
619
- ];
620
- const mockChat = {
621
- getHistory: vi.fn().mockReturnValue(mockChatHistory),
622
- setHistory: vi.fn(),
623
- sendMessage: mockSendMessage,
624
- };
625
- const mockGenerator = {
626
- countTokens: mockCountTokens,
627
- };
628
- // mock the model has been changed between calls of `countTokens`
629
- const firstCurrentModel = initialModel + '-changed-1';
630
- const secondCurrentModel = initialModel + '-changed-2';
631
- vi.spyOn(client['config'], 'getModel')
632
- .mockReturnValueOnce(firstCurrentModel)
633
- .mockReturnValueOnce(secondCurrentModel);
634
- client['chat'] = mockChat;
635
- client['contentGenerator'] = mockGenerator;
636
- client['startChat'] = vi.fn().mockResolvedValue(mockChat);
637
- const result = await client.tryCompressChat(true);
638
- expect(mockCountTokens).toHaveBeenCalledTimes(2);
639
- expect(mockCountTokens).toHaveBeenNthCalledWith(1, {
640
- model: firstCurrentModel,
641
- contents: mockChatHistory,
642
- });
643
- expect(mockCountTokens).toHaveBeenNthCalledWith(2, {
644
- model: secondCurrentModel,
645
- contents: expect.any(Array),
646
- });
647
- expect(result).toEqual({
648
- originalTokenCount: 100000,
649
- newTokenCount: 5000,
650
- });
651
- });
652
- });
653
- describe('handleFlashFallback', () => {
654
- it('should use current model from config when checking for fallback', async () => {
655
- const initialModel = client['config'].getModel();
656
- const fallbackModel = DEFAULT_GEMINI_FLASH_MODEL;
657
- // mock config been changed
658
- const currentModel = initialModel + '-changed';
659
- vi.spyOn(client['config'], 'getModel').mockReturnValueOnce(currentModel);
660
- const mockFallbackHandler = vi.fn().mockResolvedValue(true);
661
- client['config'].flashFallbackHandler = mockFallbackHandler;
662
- client['config'].setModel = vi.fn();
663
- const result = await client['handleFlashFallback'](AuthType.LOGIN_WITH_GOOGLE);
664
- expect(result).toBe(fallbackModel);
665
- expect(mockFallbackHandler).toHaveBeenCalledWith(currentModel, fallbackModel);
666
- });
667
- });
668
463
  });
669
464
  //# sourceMappingURL=client.test.js.map
@@ -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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"}
@@ -16,8 +16,7 @@ export interface ContentGenerator {
16
16
  export declare enum AuthType {
17
17
  LOGIN_WITH_GOOGLE = "oauth-personal",
18
18
  USE_GEMINI = "gemini-api-key",
19
- USE_VERTEX_AI = "vertex-ai",
20
- CLOUD_SHELL = "cloud-shell"
19
+ USE_VERTEX_AI = "vertex-ai"
21
20
  }
22
21
  export type ContentGeneratorConfig = {
23
22
  model: string;
@@ -25,5 +24,7 @@ export type ContentGeneratorConfig = {
25
24
  vertexai?: boolean;
26
25
  authType?: AuthType | undefined;
27
26
  };
28
- export declare function createContentGeneratorConfig(model: string | undefined, authType: AuthType | undefined): Promise<ContentGeneratorConfig>;
27
+ export declare function createContentGeneratorConfig(model: string | undefined, authType: AuthType | undefined, config?: {
28
+ getModel?: () => string;
29
+ }): Promise<ContentGeneratorConfig>;
29
30
  export declare function createContentGenerator(config: ContentGeneratorConfig, sessionId?: string): Promise<ContentGenerator>;
@@ -12,34 +12,34 @@ 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";
16
15
  })(AuthType || (AuthType = {}));
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;
16
+ export async function createContentGeneratorConfig(model, authType, config) {
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;
22
21
  // Use runtime model from config if available, otherwise fallback to parameter or default
23
- const effectiveModel = model || DEFAULT_GEMINI_MODEL;
22
+ const effectiveModel = config?.getModel?.() || model || DEFAULT_GEMINI_MODEL;
24
23
  const contentGeneratorConfig = {
25
24
  model: effectiveModel,
26
25
  authType,
27
26
  };
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) {
27
+ // if we are using google auth nothing else to validate for now
28
+ if (authType === AuthType.LOGIN_WITH_GOOGLE) {
31
29
  return contentGeneratorConfig;
32
30
  }
33
31
  if (authType === AuthType.USE_GEMINI && geminiApiKey) {
34
32
  contentGeneratorConfig.apiKey = geminiApiKey;
35
- contentGeneratorConfig.vertexai = false;
36
33
  contentGeneratorConfig.model = await getEffectiveModel(contentGeneratorConfig.apiKey, contentGeneratorConfig.model);
37
34
  return contentGeneratorConfig;
38
35
  }
39
36
  if (authType === AuthType.USE_VERTEX_AI &&
40
- (googleApiKey || (googleCloudProject && googleCloudLocation))) {
37
+ !!googleApiKey &&
38
+ googleCloudProject &&
39
+ googleCloudLocation) {
41
40
  contentGeneratorConfig.apiKey = googleApiKey;
42
41
  contentGeneratorConfig.vertexai = true;
42
+ contentGeneratorConfig.model = await getEffectiveModel(contentGeneratorConfig.apiKey, contentGeneratorConfig.model);
43
43
  return contentGeneratorConfig;
44
44
  }
45
45
  return contentGeneratorConfig;
@@ -51,8 +51,7 @@ export async function createContentGenerator(config, sessionId) {
51
51
  'User-Agent': `GeminiCLI/${version} (${process.platform}; ${process.arch})`,
52
52
  },
53
53
  };
54
- if (config.authType === AuthType.LOGIN_WITH_GOOGLE ||
55
- config.authType === AuthType.CLOUD_SHELL) {
54
+ if (config.authType === AuthType.LOGIN_WITH_GOOGLE) {
56
55
  return createCodeAssistContentGenerator(httpOptions, config.authType, sessionId);
57
56
  }
58
57
  if (config.authType === AuthType.USE_GEMINI ||
@@ -1 +1 @@
1
- {"version":3,"file":"contentGenerator.js","sourceRoot":"","sources":["../../../src/core/contentGenerator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"contentGenerator.js","sourceRoot":"","sources":["../../../src/core/contentGenerator.ts"],"names":[],"mappings":"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"}
@@ -3,13 +3,13 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { describe, it, expect, vi, beforeEach, afterAll } from 'vitest';
7
- import { createContentGenerator, AuthType, createContentGeneratorConfig, } from './contentGenerator.js';
6
+ import { describe, it, expect, vi } from 'vitest';
7
+ import { createContentGenerator, AuthType } 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
- describe('createContentGenerator', () => {
12
+ describe('contentGenerator', () => {
13
13
  it('should create a CodeAssistContentGenerator', async () => {
14
14
  const mockGenerator = {};
15
15
  vi.mocked(createCodeAssistContentGenerator).mockResolvedValue(mockGenerator);
@@ -42,50 +42,4 @@ describe('createContentGenerator', () => {
42
42
  expect(generator).toBe(mockGenerator.models);
43
43
  });
44
44
  });
45
- describe('createContentGeneratorConfig', () => {
46
- const originalEnv = process.env;
47
- beforeEach(() => {
48
- // Reset modules to re-evaluate imports and environment variables
49
- vi.resetModules();
50
- // Restore process.env before each test
51
- process.env = { ...originalEnv };
52
- });
53
- afterAll(() => {
54
- // Restore original process.env after all tests
55
- process.env = originalEnv;
56
- });
57
- it('should configure for Gemini using GEMINI_API_KEY when set', async () => {
58
- process.env.GEMINI_API_KEY = 'env-gemini-key';
59
- const config = await createContentGeneratorConfig(undefined, AuthType.USE_GEMINI);
60
- expect(config.apiKey).toBe('env-gemini-key');
61
- expect(config.vertexai).toBe(false);
62
- });
63
- it('should not configure for Gemini if GEMINI_API_KEY is empty', async () => {
64
- process.env.GEMINI_API_KEY = '';
65
- const config = await createContentGeneratorConfig(undefined, AuthType.USE_GEMINI);
66
- expect(config.apiKey).toBeUndefined();
67
- expect(config.vertexai).toBeUndefined();
68
- });
69
- it('should configure for Vertex AI using GOOGLE_API_KEY when set', async () => {
70
- process.env.GOOGLE_API_KEY = 'env-google-key';
71
- const config = await createContentGeneratorConfig(undefined, AuthType.USE_VERTEX_AI);
72
- expect(config.apiKey).toBe('env-google-key');
73
- expect(config.vertexai).toBe(true);
74
- });
75
- it('should configure for Vertex AI using GCP project and location when set', async () => {
76
- process.env.GOOGLE_CLOUD_PROJECT = 'env-gcp-project';
77
- process.env.GOOGLE_CLOUD_LOCATION = 'env-gcp-location';
78
- const config = await createContentGeneratorConfig(undefined, AuthType.USE_VERTEX_AI);
79
- expect(config.vertexai).toBe(true);
80
- expect(config.apiKey).toBeUndefined();
81
- });
82
- it('should not configure for Vertex AI if required env vars are empty', async () => {
83
- process.env.GOOGLE_API_KEY = '';
84
- process.env.GOOGLE_CLOUD_PROJECT = '';
85
- process.env.GOOGLE_CLOUD_LOCATION = '';
86
- const config = await createContentGeneratorConfig(undefined, AuthType.USE_VERTEX_AI);
87
- expect(config.apiKey).toBeUndefined();
88
- expect(config.vertexai).toBeUndefined();
89
- });
90
- });
91
45
  //# sourceMappingURL=contentGenerator.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"contentGenerator.test.js","sourceRoot":"","sources":["../../../src/core/contentGenerator.test.ts"],"names":[],"mappings":"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"}
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;AAClD,OAAO,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,EAAE,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;AACxC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AAEzB,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,aAAa,GAAG,EAAa,CAAC;QACpC,EAAE,CAAC,MAAM,CAAC,gCAAgC,CAAC,CAAC,iBAAiB,CAC3D,aAAsB,CACvB,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC;YAC7C,KAAK,EAAE,YAAY;YACnB,QAAQ,EAAE,QAAQ,CAAC,iBAAiB;SACrC,CAAC,CAAC;QACH,MAAM,CAAC,gCAAgC,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC5D,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,aAAa,GAAG;YACpB,MAAM,EAAE,EAAE;SACA,CAAC;QACb,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,aAAsB,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC;YAC7C,KAAK,EAAE,YAAY;YACnB,MAAM,EAAE,cAAc;YACtB,QAAQ,EAAE,QAAQ,CAAC,UAAU;SAC9B,CAAC,CAAC;QACH,MAAM,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC;YACvC,MAAM,EAAE,cAAc;YACtB,QAAQ,EAAE,SAAS;YACnB,WAAW,EAAE;gBACX,OAAO,EAAE;oBACP,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;iBACjC;aACF;SACF,CAAC,CAAC;QACH,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CAAE,aAA6B,CAAC,MAAM,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -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, ToolConfirmationPayload } from '../index.js';
6
+ import { ToolCallRequestInfo, ToolCallResponseInfo, ToolConfirmationOutcome, Tool, ToolCallConfirmationDetails, ToolRegistry, ApprovalMode, EditorType, Config } from '../index.js';
7
7
  import { PartListUnion } from '@google/genai';
8
8
  export type ValidatingToolCall = {
9
9
  status: 'validating';
@@ -89,14 +89,7 @@ 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, 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;
92
+ handleConfirmationResponse(callId: string, originalOnConfirm: (outcome: ToolConfirmationOutcome) => Promise<void>, outcome: ToolConfirmationOutcome, signal: AbortSignal): Promise<void>;
100
93
  private attemptExecutionOfScheduledCalls;
101
94
  private checkAndNotifyCompletion;
102
95
  private notifyToolCallsUpdate;
@@ -6,7 +6,6 @@
6
6
  import { ToolConfirmationOutcome, ApprovalMode, logToolCall, ToolCallEvent, } from '../index.js';
7
7
  import { getResponseTextFromParts } from '../utils/generateContentResponseUtilities.js';
8
8
  import { isModifiableTool, modifyWithEditor, } from '../tools/modifiable-tool.js';
9
- import * as Diff from 'diff';
10
9
  /**
11
10
  * Formats tool output for a Gemini FunctionResponse.
12
11
  */
@@ -241,7 +240,7 @@ export class CoreToolScheduler {
241
240
  const originalOnConfirm = confirmationDetails.onConfirm;
242
241
  const wrappedConfirmationDetails = {
243
242
  ...confirmationDetails,
244
- onConfirm: (outcome, payload) => this.handleConfirmationResponse(reqInfo.callId, originalOnConfirm, outcome, signal, payload),
243
+ onConfirm: (outcome) => this.handleConfirmationResponse(reqInfo.callId, originalOnConfirm, outcome, signal),
245
244
  };
246
245
  this.setStatusInternal(reqInfo.callId, 'awaiting_approval', wrappedConfirmationDetails);
247
246
  }
@@ -257,7 +256,7 @@ export class CoreToolScheduler {
257
256
  this.attemptExecutionOfScheduledCalls(signal);
258
257
  this.checkAndNotifyCompletion();
259
258
  }
260
- async handleConfirmationResponse(callId, originalOnConfirm, outcome, signal, payload) {
259
+ async handleConfirmationResponse(callId, originalOnConfirm, outcome, signal) {
261
260
  const toolCall = this.toolCalls.find((c) => c.request.callId === callId && c.status === 'awaiting_approval');
262
261
  if (toolCall && toolCall.status === 'awaiting_approval') {
263
262
  await originalOnConfirm(outcome);
@@ -295,35 +294,10 @@ export class CoreToolScheduler {
295
294
  }
296
295
  }
297
296
  else {
298
- // If the client provided new content, apply it before scheduling.
299
- if (payload?.newContent && toolCall) {
300
- await this._applyInlineModify(toolCall, payload, signal);
301
- }
302
297
  this.setStatusInternal(callId, 'scheduled');
303
298
  }
304
299
  this.attemptExecutionOfScheduledCalls(signal);
305
300
  }
306
- /**
307
- * Applies user-provided content changes to a tool call that is awaiting confirmation.
308
- * This method updates the tool's arguments and refreshes the confirmation prompt with a new diff
309
- * before the tool is scheduled for execution.
310
- * @private
311
- */
312
- async _applyInlineModify(toolCall, payload, signal) {
313
- if (toolCall.confirmationDetails.type !== 'edit' ||
314
- !isModifiableTool(toolCall.tool)) {
315
- return;
316
- }
317
- const modifyContext = toolCall.tool.getModifyContext(signal);
318
- const currentContent = await modifyContext.getCurrentContent(toolCall.request.args);
319
- const updatedParams = modifyContext.createUpdatedParams(currentContent, payload.newContent, toolCall.request.args);
320
- const updatedDiff = Diff.createPatch(modifyContext.getFilePath(toolCall.request.args), currentContent, payload.newContent, 'Current', 'Proposed');
321
- this.setArgsInternal(toolCall.request.callId, updatedParams);
322
- this.setStatusInternal(toolCall.request.callId, 'awaiting_approval', {
323
- ...toolCall.confirmationDetails,
324
- fileDiff: updatedDiff,
325
- });
326
- }
327
301
  attemptExecutionOfScheduledCalls(signal) {
328
302
  const allCallsFinalOrScheduled = this.toolCalls.every((call) => call.status === 'scheduled' ||
329
303
  call.status === 'cancelled' ||