@google/gemini-cli-core 0.67.0-preview.0 → 0.68.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.
Files changed (145) hide show
  1. package/README.md +18 -24
  2. package/dist/docs/changelogs/index.md +24 -0
  3. package/dist/docs/changelogs/latest.md +83 -90
  4. package/dist/docs/changelogs/preview.md +89 -87
  5. package/dist/docs/cli/sandbox.md +8 -2
  6. package/dist/docs/cli/themes.md +6 -3
  7. package/dist/docs/extensions/releasing.md +32 -0
  8. package/dist/docs/reference/configuration.md +2 -10
  9. package/dist/src/availability/autoRoutingFallback.integration.test.js +95 -2
  10. package/dist/src/availability/autoRoutingFallback.integration.test.js.map +1 -1
  11. package/dist/src/availability/errorClassification.d.ts +2 -0
  12. package/dist/src/availability/errorClassification.js +8 -0
  13. package/dist/src/availability/errorClassification.js.map +1 -1
  14. package/dist/src/availability/errorClassification.test.d.ts +6 -0
  15. package/dist/src/availability/errorClassification.test.js +56 -0
  16. package/dist/src/availability/errorClassification.test.js.map +1 -0
  17. package/dist/src/availability/policyHelpers.test.js +8 -1
  18. package/dist/src/availability/policyHelpers.test.js.map +1 -1
  19. package/dist/src/code_assist/oauth2.test.js +4 -1
  20. package/dist/src/code_assist/oauth2.test.js.map +1 -1
  21. package/dist/src/code_assist/server.js +24 -15
  22. package/dist/src/code_assist/server.js.map +1 -1
  23. package/dist/src/code_assist/server.test.js +165 -0
  24. package/dist/src/code_assist/server.test.js.map +1 -1
  25. package/dist/src/config/config.js +1 -0
  26. package/dist/src/config/config.js.map +1 -1
  27. package/dist/src/config/config.test.js +4 -1
  28. package/dist/src/config/config.test.js.map +1 -1
  29. package/dist/src/config/defaultModelConfigs.js +1 -7
  30. package/dist/src/config/defaultModelConfigs.js.map +1 -1
  31. package/dist/src/config/models.d.ts +2 -1
  32. package/dist/src/config/models.js +20 -7
  33. package/dist/src/config/models.js.map +1 -1
  34. package/dist/src/config/models.test.js +43 -1
  35. package/dist/src/config/models.test.js.map +1 -1
  36. package/dist/src/core/baseLlmClient.js +15 -0
  37. package/dist/src/core/baseLlmClient.js.map +1 -1
  38. package/dist/src/core/baseLlmClient.test.js +37 -0
  39. package/dist/src/core/baseLlmClient.test.js.map +1 -1
  40. package/dist/src/core/client.js +26 -1
  41. package/dist/src/core/client.js.map +1 -1
  42. package/dist/src/core/client.test.js +8 -3
  43. package/dist/src/core/client.test.js.map +1 -1
  44. package/dist/src/core/geminiChat.js +29 -4
  45. package/dist/src/core/geminiChat.js.map +1 -1
  46. package/dist/src/core/geminiChat.test.js +80 -0
  47. package/dist/src/core/geminiChat.test.js.map +1 -1
  48. package/dist/src/fallback/handler.js +13 -5
  49. package/dist/src/fallback/handler.js.map +1 -1
  50. package/dist/src/fallback/handler.test.js +30 -2
  51. package/dist/src/fallback/handler.test.js.map +1 -1
  52. package/dist/src/generated/git-commit.d.ts +2 -2
  53. package/dist/src/generated/git-commit.js +2 -2
  54. package/dist/src/ide/process-utils.integration.test.d.ts +6 -0
  55. package/dist/src/ide/process-utils.integration.test.js +276 -0
  56. package/dist/src/ide/process-utils.integration.test.js.map +1 -0
  57. package/dist/src/ide/process-utils.js +69 -20
  58. package/dist/src/ide/process-utils.js.map +1 -1
  59. package/dist/src/ide/process-utils.test.js +161 -18
  60. package/dist/src/ide/process-utils.test.js.map +1 -1
  61. package/dist/src/routing/strategies/defaultStrategy.js +1 -1
  62. package/dist/src/routing/strategies/defaultStrategy.js.map +1 -1
  63. package/dist/src/routing/strategies/defaultStrategy.test.js +14 -0
  64. package/dist/src/routing/strategies/defaultStrategy.test.js.map +1 -1
  65. package/dist/src/routing/strategies/fallbackStrategy.js +3 -2
  66. package/dist/src/routing/strategies/fallbackStrategy.js.map +1 -1
  67. package/dist/src/routing/strategies/fallbackStrategy.test.js +32 -0
  68. package/dist/src/routing/strategies/fallbackStrategy.test.js.map +1 -1
  69. package/dist/src/routing/strategies/overrideStrategy.js +1 -1
  70. package/dist/src/routing/strategies/overrideStrategy.js.map +1 -1
  71. package/dist/src/routing/strategies/overrideStrategy.test.js +11 -0
  72. package/dist/src/routing/strategies/overrideStrategy.test.js.map +1 -1
  73. package/dist/src/services/executionLifecycleService.d.ts +7 -1
  74. package/dist/src/services/executionLifecycleService.js +9 -2
  75. package/dist/src/services/executionLifecycleService.js.map +1 -1
  76. package/dist/src/services/executionLifecycleService.test.js +27 -0
  77. package/dist/src/services/executionLifecycleService.test.js.map +1 -1
  78. package/dist/src/services/gitService.js +136 -2
  79. package/dist/src/services/gitService.js.map +1 -1
  80. package/dist/src/services/gitService.test.js +208 -3
  81. package/dist/src/services/gitService.test.js.map +1 -1
  82. package/dist/src/services/modelConfigService.test.js +23 -0
  83. package/dist/src/services/modelConfigService.test.js.map +1 -1
  84. package/dist/src/services/sessionSummaryService.js +5 -2
  85. package/dist/src/services/sessionSummaryService.js.map +1 -1
  86. package/dist/src/services/sessionSummaryService.test.js +18 -0
  87. package/dist/src/services/sessionSummaryService.test.js.map +1 -1
  88. package/dist/src/services/shellExecutionService.d.ts +2 -1
  89. package/dist/src/services/shellExecutionService.js +15 -5
  90. package/dist/src/services/shellExecutionService.js.map +1 -1
  91. package/dist/src/services/shellExecutionService.test.js +22 -2
  92. package/dist/src/services/shellExecutionService.test.js.map +1 -1
  93. package/dist/src/tools/ask-user.js +2 -1
  94. package/dist/src/tools/ask-user.js.map +1 -1
  95. package/dist/src/tools/ask-user.test.js +28 -0
  96. package/dist/src/tools/ask-user.test.js.map +1 -1
  97. package/dist/src/tools/glob.js +19 -4
  98. package/dist/src/tools/glob.js.map +1 -1
  99. package/dist/src/tools/glob.test.js +91 -0
  100. package/dist/src/tools/glob.test.js.map +1 -1
  101. package/dist/src/tools/shellBackgroundTools.test.js +4 -0
  102. package/dist/src/tools/shellBackgroundTools.test.js.map +1 -1
  103. package/dist/src/tools/write-file.js +1 -1
  104. package/dist/src/tools/write-file.js.map +1 -1
  105. package/dist/src/tools/write-file.test.js +18 -0
  106. package/dist/src/tools/write-file.test.js.map +1 -1
  107. package/dist/src/utils/editCorrector.js +12 -12
  108. package/dist/src/utils/editCorrector.js.map +1 -1
  109. package/dist/src/utils/editCorrector.test.js +16 -0
  110. package/dist/src/utils/editCorrector.test.js.map +1 -1
  111. package/dist/src/utils/events.d.ts +1 -0
  112. package/dist/src/utils/events.js.map +1 -1
  113. package/dist/src/utils/fileUtils.js +39 -19
  114. package/dist/src/utils/fileUtils.js.map +1 -1
  115. package/dist/src/utils/fileUtils.test.js +284 -0
  116. package/dist/src/utils/fileUtils.test.js.map +1 -1
  117. package/dist/src/utils/filesearch/fileSearch.js +36 -5
  118. package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
  119. package/dist/src/utils/filesearch/fileSearch.test.js +146 -0
  120. package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -1
  121. package/dist/src/utils/ignorePathUtils.js +3 -2
  122. package/dist/src/utils/ignorePathUtils.js.map +1 -1
  123. package/dist/src/utils/ignorePathUtils.test.js +20 -1
  124. package/dist/src/utils/ignorePathUtils.test.js.map +1 -1
  125. package/dist/src/utils/llm-edit-fixer.js +13 -10
  126. package/dist/src/utils/llm-edit-fixer.js.map +1 -1
  127. package/dist/src/utils/llm-edit-fixer.test.js +30 -0
  128. package/dist/src/utils/llm-edit-fixer.test.js.map +1 -1
  129. package/dist/src/utils/summarizer.js +7 -3
  130. package/dist/src/utils/summarizer.js.map +1 -1
  131. package/dist/src/utils/summarizer.test.js +14 -0
  132. package/dist/src/utils/summarizer.test.js.map +1 -1
  133. package/dist/src/utils/textUtils.d.ts +7 -0
  134. package/dist/src/utils/textUtils.js +157 -0
  135. package/dist/src/utils/textUtils.js.map +1 -1
  136. package/dist/src/utils/textUtils.test.js +41 -1
  137. package/dist/src/utils/textUtils.test.js.map +1 -1
  138. package/dist/src/voice/whisperModelManager.d.ts +4 -1
  139. package/dist/src/voice/whisperModelManager.js +175 -8
  140. package/dist/src/voice/whisperModelManager.js.map +1 -1
  141. package/dist/src/voice/whisperModelManager.test.d.ts +6 -0
  142. package/dist/src/voice/whisperModelManager.test.js +514 -0
  143. package/dist/src/voice/whisperModelManager.test.js.map +1 -0
  144. package/dist/tsconfig.tsbuildinfo +1 -1
  145. package/package.json +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../../src/ide/process-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"process-utils.js","sourceRoot":"","sources":["../../../src/ide/process-utils.ts"],"names":[],"mappings":"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"}
@@ -5,22 +5,33 @@
5
5
  */
6
6
  import { describe, it, expect, vi, afterEach, beforeEach, } from 'vitest';
7
7
  import { getIdeProcessInfo } from './process-utils.js';
8
+ import { debugLogger } from '../utils/debugLogger.js';
8
9
  import os from 'node:os';
9
10
  const mockedExec = vi.hoisted(() => vi.fn());
10
- vi.mock('node:util', () => ({
11
- promisify: vi.fn().mockReturnValue(mockedExec),
12
- }));
11
+ vi.mock('node:util', async (importOriginal) => {
12
+ const actual = await importOriginal();
13
+ return {
14
+ ...actual,
15
+ promisify: vi.fn().mockReturnValue(mockedExec),
16
+ };
17
+ });
13
18
  vi.mock('node:os', () => ({
14
19
  default: {
15
20
  platform: vi.fn(),
16
21
  },
17
22
  }));
18
23
  describe('getIdeProcessInfo', () => {
24
+ let originalPidDescriptor;
19
25
  beforeEach(() => {
26
+ originalPidDescriptor = Object.getOwnPropertyDescriptor(process, 'pid');
20
27
  Object.defineProperty(process, 'pid', { value: 1000, configurable: true });
21
28
  mockedExec.mockReset();
29
+ vi.spyOn(debugLogger, 'warn').mockImplementation(() => { });
22
30
  });
23
31
  afterEach(() => {
32
+ if (originalPidDescriptor) {
33
+ Object.defineProperty(process, 'pid', originalPidDescriptor);
34
+ }
24
35
  vi.restoreAllMocks();
25
36
  vi.unstubAllEnvs();
26
37
  });
@@ -33,24 +44,39 @@ describe('getIdeProcessInfo', () => {
33
44
  expect(result).toEqual({ pid: 12345, command: 'my-ide-command' });
34
45
  expect(mockedExec).toHaveBeenCalledWith(expect.stringContaining('ps -o ppid=,command= -p 12345'), { timeout: 3000 });
35
46
  });
36
- it('should use GEMINI_CLI_IDE_PID and fetch command on Windows', async () => {
47
+ it('should use GEMINI_CLI_IDE_PID and fetch command on Windows via single-PID CIM query', async () => {
37
48
  os.platform.mockReturnValue('win32');
38
49
  vi.stubEnv('GEMINI_CLI_IDE_PID', '54321');
39
- const processes = [
40
- {
50
+ mockedExec.mockResolvedValueOnce({
51
+ stdout: JSON.stringify({
41
52
  ProcessId: 54321,
42
53
  ParentProcessId: 0,
43
54
  Name: 'Code.exe',
44
55
  CommandLine: 'C:\\Program Files\\VSCode\\Code.exe',
45
- },
46
- ];
47
- mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(processes) });
56
+ }),
57
+ });
48
58
  const result = await getIdeProcessInfo();
49
59
  expect(result).toEqual({
50
60
  pid: 54321,
51
61
  command: 'C:\\Program Files\\VSCode\\Code.exe',
52
62
  });
53
- expect(mockedExec).toHaveBeenCalledWith(expect.stringContaining('Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine'), expect.anything());
63
+ expect(mockedExec).toHaveBeenCalledTimes(1);
64
+ expect(mockedExec).toHaveBeenCalledWith(expect.stringContaining("Get-CimInstance Win32_Process -Filter 'ProcessId=54321'"), { timeout: 3000 });
65
+ expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
66
+ });
67
+ it('should handle failure gracefully when single-PID CIM query fails for GEMINI_CLI_IDE_PID on Windows', async () => {
68
+ os.platform.mockReturnValue('win32');
69
+ vi.stubEnv('GEMINI_CLI_IDE_PID', '54321');
70
+ mockedExec.mockRejectedValueOnce(new Error('CIM query failed'));
71
+ const result = await getIdeProcessInfo();
72
+ expect(result).toEqual({
73
+ pid: 54321,
74
+ command: '',
75
+ });
76
+ expect(mockedExec).toHaveBeenCalledTimes(1);
77
+ expect(mockedExec).toHaveBeenCalledWith(expect.stringContaining("Get-CimInstance Win32_Process -Filter 'ProcessId=54321'"), { timeout: 3000 });
78
+ expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
79
+ expect(debugLogger.warn).toHaveBeenCalled();
54
80
  });
55
81
  });
56
82
  describe('on Unix', () => {
@@ -122,6 +148,7 @@ describe('getIdeProcessInfo', () => {
122
148
  const result = await getIdeProcessInfo();
123
149
  expect(result).toEqual({ pid: 900, command: 'powershell.exe' });
124
150
  expect(mockedExec).toHaveBeenCalledWith(expect.stringContaining('Get-CimInstance Win32_Process'), expect.anything());
151
+ expect(debugLogger.warn).not.toHaveBeenCalled();
125
152
  });
126
153
  it('should handle short process chains', async () => {
127
154
  os.platform.mockReturnValue('win32');
@@ -138,21 +165,137 @@ describe('getIdeProcessInfo', () => {
138
165
  const result = await getIdeProcessInfo();
139
166
  expect(result).toEqual({ pid: 1000, command: 'node.exe' });
140
167
  });
141
- it('should handle PowerShell failure gracefully', async () => {
168
+ it('should fall back to single-PID PowerShell CIM query and never invoke ps when snapshot fails', async () => {
169
+ os.platform.mockReturnValue('win32');
170
+ mockedExec
171
+ .mockRejectedValueOnce(new Error('PowerShell snapshot timed out'))
172
+ .mockResolvedValueOnce({
173
+ stdout: JSON.stringify({
174
+ ProcessId: 1000,
175
+ ParentProcessId: 900,
176
+ Name: 'node.exe',
177
+ CommandLine: 'C:\\Program Files\\nodejs\\node.exe gemini.js',
178
+ }),
179
+ });
180
+ const result = await getIdeProcessInfo();
181
+ expect(result).toEqual({
182
+ pid: 1000,
183
+ command: 'C:\\Program Files\\nodejs\\node.exe gemini.js',
184
+ });
185
+ expect(mockedExec).toHaveBeenCalledTimes(2);
186
+ expect(mockedExec).toHaveBeenNthCalledWith(2, expect.stringContaining("Get-CimInstance Win32_Process -Filter 'ProcessId=1000'"), { timeout: 3000 });
187
+ expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
188
+ expect(debugLogger.warn).toHaveBeenCalled();
189
+ });
190
+ it('should fall back to single-PID PowerShell CIM query when snapshot omits current PID', async () => {
191
+ os.platform.mockReturnValue('win32');
192
+ const otherProcesses = [
193
+ {
194
+ ProcessId: 2000,
195
+ ParentProcessId: 0,
196
+ Name: 'explorer.exe',
197
+ CommandLine: 'C:\\Windows\\explorer.exe',
198
+ },
199
+ ];
200
+ mockedExec
201
+ .mockResolvedValueOnce({ stdout: JSON.stringify(otherProcesses) })
202
+ .mockResolvedValueOnce({
203
+ stdout: JSON.stringify({
204
+ ProcessId: 1000,
205
+ ParentProcessId: 900,
206
+ Name: 'node.exe',
207
+ CommandLine: 'node.exe cli.js',
208
+ }),
209
+ });
210
+ const result = await getIdeProcessInfo();
211
+ expect(result).toEqual({ pid: 1000, command: 'node.exe cli.js' });
212
+ expect(mockedExec).toHaveBeenNthCalledWith(2, expect.stringContaining("Get-CimInstance Win32_Process -Filter 'ProcessId=1000'"), { timeout: 3000 });
213
+ expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
214
+ expect(debugLogger.warn).toHaveBeenCalled();
215
+ });
216
+ it('should handle PowerShell failure gracefully when both snapshot and CIM fallback fail', async () => {
142
217
  os.platform.mockReturnValue('win32');
143
- mockedExec.mockRejectedValueOnce(new Error('PowerShell failed'));
144
- // Fallback to getProcessInfo for current PID
145
- mockedExec.mockResolvedValueOnce({ stdout: '' }); // ps command fails on windows
218
+ mockedExec
219
+ .mockRejectedValueOnce(new Error('PowerShell snapshot failed'))
220
+ .mockRejectedValueOnce(new Error('PowerShell CIM fallback failed'));
146
221
  const result = await getIdeProcessInfo();
147
222
  expect(result).toEqual({ pid: 1000, command: '' });
223
+ expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
224
+ expect(debugLogger.warn).toHaveBeenCalled();
148
225
  });
149
- it('should handle malformed JSON output gracefully', async () => {
226
+ it('should handle malformed JSON output in snapshot and recover via single-PID CIM fallback', async () => {
150
227
  os.platform.mockReturnValue('win32');
151
- mockedExec.mockResolvedValueOnce({ stdout: '{"invalid":json}' });
152
- // Fallback to getProcessInfo for current PID
153
- mockedExec.mockResolvedValueOnce({ stdout: '' });
228
+ mockedExec
229
+ .mockResolvedValueOnce({ stdout: '{"invalid":json}' })
230
+ .mockResolvedValueOnce({
231
+ stdout: JSON.stringify({
232
+ ProcessId: 1000,
233
+ ParentProcessId: 0,
234
+ Name: 'node.exe',
235
+ CommandLine: 'node.exe',
236
+ }),
237
+ });
238
+ const result = await getIdeProcessInfo();
239
+ expect(result).toEqual({ pid: 1000, command: 'node.exe' });
240
+ expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
241
+ expect(debugLogger.warn).toHaveBeenCalled();
242
+ });
243
+ it('should handle empty or null CommandLine output in single-PID CIM fallback gracefully', async () => {
244
+ os.platform.mockReturnValue('win32');
245
+ mockedExec.mockResolvedValueOnce({ stdout: '' }).mockResolvedValueOnce({
246
+ stdout: JSON.stringify({
247
+ ProcessId: 1000,
248
+ ParentProcessId: 0,
249
+ Name: 'node.exe',
250
+ CommandLine: null,
251
+ }),
252
+ });
154
253
  const result = await getIdeProcessInfo();
155
254
  expect(result).toEqual({ pid: 1000, command: '' });
255
+ expect(mockedExec).not.toHaveBeenCalledWith(expect.stringContaining('ps '), expect.anything());
256
+ expect(debugLogger.warn).toHaveBeenCalled();
257
+ });
258
+ it('should handle empty stdout, null JSON, array JSON, and malformed JSON in single-PID CIM fallback', async () => {
259
+ os.platform.mockReturnValue('win32');
260
+ // Empty stdout on fallback (e.g. process exited)
261
+ mockedExec
262
+ .mockResolvedValueOnce({ stdout: '' })
263
+ .mockResolvedValueOnce({ stdout: ' ' });
264
+ await expect(getIdeProcessInfo()).resolves.toEqual({
265
+ pid: 1000,
266
+ command: '',
267
+ });
268
+ // Literal JSON null on fallback
269
+ mockedExec
270
+ .mockResolvedValueOnce({ stdout: '' })
271
+ .mockResolvedValueOnce({ stdout: 'null' });
272
+ await expect(getIdeProcessInfo()).resolves.toEqual({
273
+ pid: 1000,
274
+ command: '',
275
+ });
276
+ // Array JSON output on fallback
277
+ mockedExec.mockResolvedValueOnce({ stdout: '' }).mockResolvedValueOnce({
278
+ stdout: JSON.stringify([
279
+ {
280
+ ProcessId: 1000,
281
+ ParentProcessId: 0,
282
+ Name: 'node.exe',
283
+ CommandLine: 'node.exe --array',
284
+ },
285
+ ]),
286
+ });
287
+ await expect(getIdeProcessInfo()).resolves.toEqual({
288
+ pid: 1000,
289
+ command: 'node.exe --array',
290
+ });
291
+ // Malformed JSON on fallback
292
+ mockedExec
293
+ .mockResolvedValueOnce({ stdout: '' })
294
+ .mockResolvedValueOnce({ stdout: '{bad-json' });
295
+ await expect(getIdeProcessInfo()).resolves.toEqual({
296
+ pid: 1000,
297
+ command: '',
298
+ });
156
299
  });
157
300
  it('should handle single process output from ConvertTo-Json', async () => {
158
301
  os.platform.mockReturnValue('win32');
@@ -1 +1 @@
1
- {"version":3,"file":"process-utils.test.js","sourceRoot":"","sources":["../../../src/ide/process-utils.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"process-utils.test.js","sourceRoot":"","sources":["../../../src/ide/process-utils.test.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ import { resolveModel } from '../../config/models.js';
7
7
  export class DefaultStrategy {
8
8
  name = 'default';
9
9
  async route(_context, config, _baseLlmClient, _localLiteRtLmClient) {
10
- const defaultModel = resolveModel(config.getModel(), config.getGemini31LaunchedSync?.() ?? false, false, config.getHasAccessToPreviewModel?.() ?? true, config, config.hasLatestFlashGAAccess?.() ?? false, config.hasLatestFlashLiteGAAccess?.() ?? false);
10
+ const defaultModel = resolveModel(config.getModel(), config.getGemini31LaunchedSync?.() ?? false, config.getUseCustomToolModelSync?.() ?? false, config.getHasAccessToPreviewModel?.() ?? true, config, config.hasLatestFlashGAAccess?.() ?? false, config.hasLatestFlashLiteGAAccess?.() ?? false);
11
11
  return {
12
12
  model: defaultModel,
13
13
  metadata: {
@@ -1 +1 @@
1
- {"version":3,"file":"defaultStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/defaultStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,MAAM,OAAO,eAAe;IACjB,IAAI,GAAG,SAAS,CAAC;IAE1B,KAAK,CAAC,KAAK,CACT,QAAwB,EACxB,MAAc,EACd,cAA6B,EAC7B,oBAAyC;QAEzC,MAAM,YAAY,GAAG,YAAY,CAC/B,MAAM,CAAC,QAAQ,EAAE,EACjB,MAAM,CAAC,uBAAuB,EAAE,EAAE,IAAI,KAAK,EAC3C,KAAK,EACL,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,IAAI,EAC7C,MAAM,EACN,MAAM,CAAC,sBAAsB,EAAE,EAAE,IAAI,KAAK,EAC1C,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,KAAK,CAC/C,CAAC;QACF,OAAO;YACL,KAAK,EAAE,YAAY;YACnB,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,6BAA6B,YAAY,EAAE;aACvD;SACF,CAAC;IACJ,CAAC;CACF"}
1
+ {"version":3,"file":"defaultStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/defaultStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,MAAM,OAAO,eAAe;IACjB,IAAI,GAAG,SAAS,CAAC;IAE1B,KAAK,CAAC,KAAK,CACT,QAAwB,EACxB,MAAc,EACd,cAA6B,EAC7B,oBAAyC;QAEzC,MAAM,YAAY,GAAG,YAAY,CAC/B,MAAM,CAAC,QAAQ,EAAE,EACjB,MAAM,CAAC,uBAAuB,EAAE,EAAE,IAAI,KAAK,EAC3C,MAAM,CAAC,yBAAyB,EAAE,EAAE,IAAI,KAAK,EAC7C,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,IAAI,EAC7C,MAAM,EACN,MAAM,CAAC,sBAAsB,EAAE,EAAE,IAAI,KAAK,EAC1C,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,KAAK,CAC/C,CAAC;QACF,OAAO;YACL,KAAK,EAAE,YAAY;YACnB,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,6BAA6B,YAAY,EAAE;aACvD;SACF,CAAC;IACJ,CAAC;CACF"}
@@ -80,5 +80,19 @@ describe('DefaultStrategy', () => {
80
80
  },
81
81
  });
82
82
  });
83
+ it('should route to gemini-3.1-pro-preview-customtools when auto and custom tools are enabled', async () => {
84
+ const strategy = new DefaultStrategy();
85
+ const mockContext = {};
86
+ const mockConfig = {
87
+ getModel: vi.fn().mockReturnValue(GEMINI_MODEL_ALIAS_AUTO),
88
+ getGemini31LaunchedSync: vi.fn().mockReturnValue(true),
89
+ getUseCustomToolModelSync: vi.fn().mockReturnValue(true),
90
+ getHasAccessToPreviewModel: vi.fn().mockReturnValue(true),
91
+ };
92
+ const mockClient = {};
93
+ const mockLocalLiteRtLmClient = {};
94
+ const decision = await strategy.route(mockContext, mockConfig, mockClient, mockLocalLiteRtLmClient);
95
+ expect(decision.model).toBe('gemini-3.1-pro-preview-customtools');
96
+ });
83
97
  });
84
98
  //# sourceMappingURL=defaultStrategy.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"defaultStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/defaultStrategy.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"defaultStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/defaultStrategy.test.ts"],"names":[],"mappings":"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"}
@@ -9,7 +9,7 @@ export class FallbackStrategy {
9
9
  name = 'fallback';
10
10
  async route(context, config, _baseLlmClient, _localLiteRtLmClient) {
11
11
  const requestedModel = context.requestedModel ?? config.getModel();
12
- const resolvedModel = resolveModel(requestedModel, config.getGemini31LaunchedSync?.() ?? false, false, config.getHasAccessToPreviewModel?.() ?? true, config, config.hasLatestFlashGAAccess?.() ?? false, config.hasLatestFlashLiteGAAccess?.() ?? false);
12
+ const resolvedModel = resolveModel(requestedModel, config.getGemini31LaunchedSync?.() ?? false, config.getUseCustomToolModelSync?.() ?? false, config.getHasAccessToPreviewModel?.() ?? true, config, config.hasLatestFlashGAAccess?.() ?? false, config.hasLatestFlashLiteGAAccess?.() ?? false);
13
13
  const service = config.getModelAvailabilityService();
14
14
  const snapshot = service.snapshot(resolvedModel);
15
15
  if (snapshot.available) {
@@ -17,7 +17,8 @@ export class FallbackStrategy {
17
17
  }
18
18
  const selection = selectModelForAvailability(config, requestedModel);
19
19
  if (selection?.selectedModel &&
20
- selection.selectedModel !== requestedModel) {
20
+ selection.selectedModel !== requestedModel &&
21
+ selection.selectedModel !== resolvedModel) {
21
22
  return {
22
23
  model: selection.selectedModel,
23
24
  metadata: {
@@ -1 +1 @@
1
- {"version":3,"file":"fallbackStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/fallbackStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAStD,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,OAAuB,EACvB,MAAc,EACd,cAA6B,EAC7B,oBAAyC;QAEzC,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACnE,MAAM,aAAa,GAAG,YAAY,CAChC,cAAc,EACd,MAAM,CAAC,uBAAuB,EAAE,EAAE,IAAI,KAAK,EAC3C,KAAK,EACL,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,IAAI,EAC7C,MAAM,EACN,MAAM,CAAC,sBAAsB,EAAE,EAAE,IAAI,KAAK,EAC1C,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,KAAK,CAC/C,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,CAAC,2BAA2B,EAAE,CAAC;QACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAEjD,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAG,0BAA0B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAErE,IACE,SAAS,EAAE,aAAa;YACxB,SAAS,CAAC,aAAa,KAAK,cAAc,EAC1C,CAAC;YACD,OAAO;gBACL,KAAK,EAAE,SAAS,CAAC,aAAa;gBAC9B,QAAQ,EAAE;oBACR,MAAM,EAAE,IAAI,CAAC,IAAI;oBACjB,SAAS,EAAE,CAAC;oBACZ,SAAS,EAAE,SAAS,cAAc,oBAAoB,QAAQ,CAAC,MAAM,sBAAsB,SAAS,CAAC,aAAa,EAAE;iBACrH;aACF,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
1
+ {"version":3,"file":"fallbackStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/fallbackStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAStD,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,OAAuB,EACvB,MAAc,EACd,cAA6B,EAC7B,oBAAyC;QAEzC,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACnE,MAAM,aAAa,GAAG,YAAY,CAChC,cAAc,EACd,MAAM,CAAC,uBAAuB,EAAE,EAAE,IAAI,KAAK,EAC3C,MAAM,CAAC,yBAAyB,EAAE,EAAE,IAAI,KAAK,EAC7C,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,IAAI,EAC7C,MAAM,EACN,MAAM,CAAC,sBAAsB,EAAE,EAAE,IAAI,KAAK,EAC1C,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,KAAK,CAC/C,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,CAAC,2BAA2B,EAAE,CAAC;QACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAEjD,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAG,0BAA0B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAErE,IACE,SAAS,EAAE,aAAa;YACxB,SAAS,CAAC,aAAa,KAAK,cAAc;YAC1C,SAAS,CAAC,aAAa,KAAK,aAAa,EACzC,CAAC;YACD,OAAO;gBACL,KAAK,EAAE,SAAS,CAAC,aAAa;gBAC9B,QAAQ,EAAE;oBACR,MAAM,EAAE,IAAI,CAAC,IAAI;oBACjB,SAAS,EAAE,CAAC;oBACZ,SAAS,EAAE,SAAS,cAAc,oBAAoB,QAAQ,CAAC,MAAM,sBAAsB,SAAS,CAAC,aAAa,EAAE;iBACrH;aACF,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
@@ -92,5 +92,37 @@ describe('FallbackStrategy', () => {
92
92
  // Should check availability of the requested model from context
93
93
  expect(mockService.snapshot).toHaveBeenCalledWith(requestedModel);
94
94
  });
95
+ it('should resolve custom tool model variant when useCustomToolModel is enabled', async () => {
96
+ const configWithCustomTools = createMockConfig({
97
+ getModelAvailabilityService: vi.fn().mockReturnValue(mockService),
98
+ getModel: vi.fn().mockReturnValue('pro'),
99
+ getGemini31LaunchedSync: vi.fn().mockReturnValue(true),
100
+ getUseCustomToolModelSync: vi.fn().mockReturnValue(true),
101
+ getHasAccessToPreviewModel: vi.fn().mockReturnValue(true),
102
+ });
103
+ vi.mocked(mockService.snapshot).mockReturnValue({ available: true });
104
+ const decision = await strategy.route(mockContext, configWithCustomTools, mockClient, mockLocalLiteRtLmClient);
105
+ expect(decision).toBeNull();
106
+ expect(mockService.snapshot).toHaveBeenCalledWith('gemini-3.1-pro-preview-customtools');
107
+ });
108
+ it('should return null if fallback selection equals resolved model', async () => {
109
+ const configWithCustomTools = createMockConfig({
110
+ getModelAvailabilityService: vi.fn().mockReturnValue(mockService),
111
+ getModel: vi.fn().mockReturnValue('pro'),
112
+ getGemini31LaunchedSync: vi.fn().mockReturnValue(true),
113
+ getUseCustomToolModelSync: vi.fn().mockReturnValue(true),
114
+ getHasAccessToPreviewModel: vi.fn().mockReturnValue(true),
115
+ });
116
+ vi.mocked(mockService.snapshot).mockReturnValue({
117
+ available: false,
118
+ reason: 'retry_once_per_turn',
119
+ });
120
+ vi.mocked(selectModelForAvailability).mockReturnValue({
121
+ selectedModel: 'gemini-3.1-pro-preview-customtools',
122
+ skipped: [],
123
+ });
124
+ const decision = await strategy.route(mockContext, configWithCustomTools, mockClient, mockLocalLiteRtLmClient);
125
+ expect(decision).toBeNull();
126
+ });
95
127
  });
96
128
  //# sourceMappingURL=fallbackStrategy.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"fallbackStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/fallbackStrategy.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fallbackStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/fallbackStrategy.test.ts"],"names":[],"mappings":"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"}
@@ -17,7 +17,7 @@ export class OverrideStrategy {
17
17
  }
18
18
  // Return the overridden model name.
19
19
  return {
20
- model: resolveModel(overrideModel, config.getGemini31LaunchedSync?.() ?? false, false, config.getHasAccessToPreviewModel?.() ?? true, config, config.hasLatestFlashGAAccess?.() ?? false, config.hasLatestFlashLiteGAAccess?.() ?? false),
20
+ model: resolveModel(overrideModel, config.getGemini31LaunchedSync?.() ?? false, config.getUseCustomToolModelSync?.() ?? false, config.getHasAccessToPreviewModel?.() ?? true, config, config.hasLatestFlashGAAccess?.() ?? false, config.hasLatestFlashLiteGAAccess?.() ?? false),
21
21
  metadata: {
22
22
  source: this.name,
23
23
  latencyMs: 0,
@@ -1 +1 @@
1
- {"version":3,"file":"overrideStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AASnE;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,OAAuB,EACvB,MAAc,EACd,cAA6B,EAC7B,oBAAyC;QAEzC,MAAM,aAAa,GAAG,OAAO,CAAC,cAAc,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAElE,8DAA8D;QAC9D,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,oCAAoC;QACpC,OAAO;YACL,KAAK,EAAE,YAAY,CACjB,aAAa,EACb,MAAM,CAAC,uBAAuB,EAAE,EAAE,IAAI,KAAK,EAC3C,KAAK,EACL,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,IAAI,EAC7C,MAAM,EACN,MAAM,CAAC,sBAAsB,EAAE,EAAE,IAAI,KAAK,EAC1C,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,KAAK,CAC/C;YACD,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,sDAAsD,aAAa,EAAE;aACjF;SACF,CAAC;IACJ,CAAC;CACF"}
1
+ {"version":3,"file":"overrideStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AASnE;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,OAAuB,EACvB,MAAc,EACd,cAA6B,EAC7B,oBAAyC;QAEzC,MAAM,aAAa,GAAG,OAAO,CAAC,cAAc,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAElE,8DAA8D;QAC9D,IAAI,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,oCAAoC;QACpC,OAAO;YACL,KAAK,EAAE,YAAY,CACjB,aAAa,EACb,MAAM,CAAC,uBAAuB,EAAE,EAAE,IAAI,KAAK,EAC3C,MAAM,CAAC,yBAAyB,EAAE,EAAE,IAAI,KAAK,EAC7C,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,IAAI,EAC7C,MAAM,EACN,MAAM,CAAC,sBAAsB,EAAE,EAAE,IAAI,KAAK,EAC1C,MAAM,CAAC,0BAA0B,EAAE,EAAE,IAAI,KAAK,CAC/C;YACD,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,sDAAsD,aAAa,EAAE;aACjF;SACF,CAAC;IACJ,CAAC;CACF"}
@@ -52,5 +52,16 @@ describe('OverrideStrategy', () => {
52
52
  expect(decision).not.toBeNull();
53
53
  expect(decision?.model).toBe(requestedModel);
54
54
  });
55
+ it('should resolve gemini-3.1-pro-preview-customtools when custom tools are enabled', async () => {
56
+ const mockConfig = {
57
+ getModel: () => 'pro',
58
+ getGemini31LaunchedSync: () => true,
59
+ getUseCustomToolModelSync: () => true,
60
+ getHasAccessToPreviewModel: () => true,
61
+ };
62
+ const decision = await strategy.route(mockContext, mockConfig, mockClient, mockLocalLiteRtLmClient);
63
+ expect(decision).not.toBeNull();
64
+ expect(decision?.model).toBe('gemini-3.1-pro-preview-customtools');
65
+ });
55
66
  });
56
67
  //# sourceMappingURL=overrideStrategy.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"overrideStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"overrideStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.test.ts"],"names":[],"mappings":"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"}
@@ -147,7 +147,13 @@ export declare class ExecutionLifecycleService {
147
147
  private static settleExecution;
148
148
  static completeExecution(executionId: number, options?: ExecutionCompletionOptions): void;
149
149
  static completeWithResult(executionId: number, result: ExecutionResult): void;
150
- static background(executionId: number): void;
150
+ /**
151
+ * Transitions an active execution to the background and resolves its initial result.
152
+ *
153
+ * @param executionId The ID of the execution to move to the background.
154
+ * @returns true if the execution was active and successfully transitioned to the background; false otherwise.
155
+ */
156
+ static background(executionId: number): boolean;
151
157
  static subscribe(executionId: number, listener: (event: ExecutionOutputEvent) => void): () => void;
152
158
  static onExit(executionId: number, callback: (exitCode: number, signal?: number) => void): () => void;
153
159
  static kill(executionId: number): void;
@@ -274,14 +274,20 @@ export class ExecutionLifecycleService {
274
274
  static completeWithResult(executionId, result) {
275
275
  this.settleExecution(executionId, result);
276
276
  }
277
+ /**
278
+ * Transitions an active execution to the background and resolves its initial result.
279
+ *
280
+ * @param executionId The ID of the execution to move to the background.
281
+ * @returns true if the execution was active and successfully transitioned to the background; false otherwise.
282
+ */
277
283
  static background(executionId) {
278
284
  const resolve = this.activeResolvers.get(executionId);
279
285
  if (!resolve) {
280
- return;
286
+ return false;
281
287
  }
282
288
  const execution = this.activeExecutions.get(executionId);
283
289
  if (!execution) {
284
- return;
290
+ return false;
285
291
  }
286
292
  const output = execution.getBackgroundOutput?.() ?? execution.output;
287
293
  resolve({
@@ -309,6 +315,7 @@ export class ExecutionLifecycleService {
309
315
  for (const listener of this.backgroundStartListeners) {
310
316
  listener(info);
311
317
  }
318
+ return true;
312
319
  }
313
320
  static subscribe(executionId, listener) {
314
321
  if (!this.activeListeners.has(executionId)) {