@google/gemini-cli 0.18.0-nightly.20251118.7cc5234b9 → 0.18.0-preview.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (240) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +1 -0
  3. package/dist/package.json +4 -4
  4. package/dist/src/commands/extensions/disable.test.js +19 -13
  5. package/dist/src/commands/extensions/disable.test.js.map +1 -1
  6. package/dist/src/commands/extensions/enable.test.js +16 -9
  7. package/dist/src/commands/extensions/enable.test.js.map +1 -1
  8. package/dist/src/commands/extensions/link.test.js +18 -11
  9. package/dist/src/commands/extensions/link.test.js.map +1 -1
  10. package/dist/src/commands/extensions/list.test.js +20 -13
  11. package/dist/src/commands/extensions/list.test.js.map +1 -1
  12. package/dist/src/commands/extensions/uninstall.test.js +26 -18
  13. package/dist/src/commands/extensions/uninstall.test.js.map +1 -1
  14. package/dist/src/commands/extensions/update.test.js +20 -13
  15. package/dist/src/commands/extensions/update.test.js.map +1 -1
  16. package/dist/src/commands/mcp/add.test.js +8 -3
  17. package/dist/src/commands/mcp/add.test.js.map +1 -1
  18. package/dist/src/commands/mcp/list.test.js +1 -6
  19. package/dist/src/commands/mcp/list.test.js.map +1 -1
  20. package/dist/src/commands/mcp/remove.test.js +23 -12
  21. package/dist/src/commands/mcp/remove.test.js.map +1 -1
  22. package/dist/src/config/config.d.ts +2 -1
  23. package/dist/src/config/config.js +38 -14
  24. package/dist/src/config/config.js.map +1 -1
  25. package/dist/src/config/config.test.js +64 -10
  26. package/dist/src/config/config.test.js.map +1 -1
  27. package/dist/src/config/extension.test.js +131 -125
  28. package/dist/src/config/extension.test.js.map +1 -1
  29. package/dist/src/config/settingsSchema.d.ts +2 -2
  30. package/dist/src/config/settingsSchema.js +3 -3
  31. package/dist/src/config/settingsSchema.js.map +1 -1
  32. package/dist/src/config/settingsSchema.test.js +1 -1
  33. package/dist/src/config/settingsSchema.test.js.map +1 -1
  34. package/dist/src/gemini.js +65 -7
  35. package/dist/src/gemini.js.map +1 -1
  36. package/dist/src/gemini.test.js +55 -15
  37. package/dist/src/gemini.test.js.map +1 -1
  38. package/dist/src/generated/git-commit.d.ts +2 -2
  39. package/dist/src/generated/git-commit.js +2 -2
  40. package/dist/src/generated/git-commit.js.map +1 -1
  41. package/dist/src/nonInteractiveCli.js +4 -1
  42. package/dist/src/nonInteractiveCli.js.map +1 -1
  43. package/dist/src/nonInteractiveCli.test.js +2 -2
  44. package/dist/src/nonInteractiveCli.test.js.map +1 -1
  45. package/dist/src/services/CommandService.test.js +3 -2
  46. package/dist/src/services/CommandService.test.js.map +1 -1
  47. package/dist/src/services/McpPromptLoader.js +5 -3
  48. package/dist/src/services/McpPromptLoader.js.map +1 -1
  49. package/dist/src/services/McpPromptLoader.test.js +29 -1
  50. package/dist/src/services/McpPromptLoader.test.js.map +1 -1
  51. package/dist/src/test-utils/render.d.ts +26 -2
  52. package/dist/src/test-utils/render.js +76 -3
  53. package/dist/src/test-utils/render.js.map +1 -1
  54. package/dist/src/ui/AppContainer.js +57 -32
  55. package/dist/src/ui/AppContainer.js.map +1 -1
  56. package/dist/src/ui/AppContainer.test.js +169 -102
  57. package/dist/src/ui/AppContainer.test.js.map +1 -1
  58. package/dist/src/ui/auth/AuthDialog.test.js +2 -2
  59. package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
  60. package/dist/src/ui/commands/aboutCommand.js +8 -1
  61. package/dist/src/ui/commands/aboutCommand.js.map +1 -1
  62. package/dist/src/ui/commands/aboutCommand.test.js +4 -0
  63. package/dist/src/ui/commands/aboutCommand.test.js.map +1 -1
  64. package/dist/src/ui/commands/clearCommand.js +12 -0
  65. package/dist/src/ui/commands/clearCommand.js.map +1 -1
  66. package/dist/src/ui/commands/clearCommand.test.js +5 -0
  67. package/dist/src/ui/commands/clearCommand.test.js.map +1 -1
  68. package/dist/src/ui/commands/memoryCommand.js +1 -0
  69. package/dist/src/ui/commands/memoryCommand.js.map +1 -1
  70. package/dist/src/ui/commands/memoryCommand.test.js +3 -0
  71. package/dist/src/ui/commands/memoryCommand.test.js.map +1 -1
  72. package/dist/src/ui/commands/setupGithubCommand.d.ts +1 -0
  73. package/dist/src/ui/commands/setupGithubCommand.js +82 -45
  74. package/dist/src/ui/commands/setupGithubCommand.js.map +1 -1
  75. package/dist/src/ui/commands/setupGithubCommand.test.js +35 -5
  76. package/dist/src/ui/commands/setupGithubCommand.test.js.map +1 -1
  77. package/dist/src/ui/components/AboutBox.d.ts +1 -0
  78. package/dist/src/ui/components/AboutBox.js +1 -1
  79. package/dist/src/ui/components/AboutBox.js.map +1 -1
  80. package/dist/src/ui/components/AppHeader.js +3 -8
  81. package/dist/src/ui/components/AppHeader.js.map +1 -1
  82. package/dist/src/ui/components/Banner.d.ts +4 -2
  83. package/dist/src/ui/components/Banner.js +18 -4
  84. package/dist/src/ui/components/Banner.js.map +1 -1
  85. package/dist/src/ui/components/DebugProfiler.d.ts +1 -0
  86. package/dist/src/ui/components/DebugProfiler.js +23 -34
  87. package/dist/src/ui/components/DebugProfiler.js.map +1 -1
  88. package/dist/src/ui/components/DebugProfiler.test.js +1 -0
  89. package/dist/src/ui/components/DebugProfiler.test.js.map +1 -1
  90. package/dist/src/ui/components/DialogManager.js +1 -1
  91. package/dist/src/ui/components/DialogManager.js.map +1 -1
  92. package/dist/src/ui/components/GradientRegression.test.js +22 -1
  93. package/dist/src/ui/components/GradientRegression.test.js.map +1 -1
  94. package/dist/src/ui/components/Header.test.js +27 -2
  95. package/dist/src/ui/components/Header.test.js.map +1 -1
  96. package/dist/src/ui/components/HistoryItemDisplay.js +1 -1
  97. package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
  98. package/dist/src/ui/components/InputPrompt.js +16 -24
  99. package/dist/src/ui/components/InputPrompt.js.map +1 -1
  100. package/dist/src/ui/components/InputPrompt.test.js +84 -24
  101. package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
  102. package/dist/src/ui/components/ModelDialog.js +2 -2
  103. package/dist/src/ui/components/ModelDialog.js.map +1 -1
  104. package/dist/src/ui/components/SettingsDialog.d.ts +3 -1
  105. package/dist/src/ui/components/SettingsDialog.js +4 -1
  106. package/dist/src/ui/components/SettingsDialog.js.map +1 -1
  107. package/dist/src/ui/components/ThemedGradient.js +2 -1
  108. package/dist/src/ui/components/ThemedGradient.js.map +1 -1
  109. package/dist/src/ui/components/messages/ShellToolMessage.d.ts +14 -0
  110. package/dist/src/ui/components/messages/ShellToolMessage.js +76 -0
  111. package/dist/src/ui/components/messages/ShellToolMessage.js.map +1 -0
  112. package/dist/src/ui/components/messages/ShellToolMessage.test.d.ts +6 -0
  113. package/dist/src/ui/components/messages/ShellToolMessage.test.js +123 -0
  114. package/dist/src/ui/components/messages/ShellToolMessage.test.js.map +1 -0
  115. package/dist/src/ui/components/messages/ToolGroupMessage.js +19 -1
  116. package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
  117. package/dist/src/ui/components/messages/ToolMessage.d.ts +3 -6
  118. package/dist/src/ui/components/messages/ToolMessage.js +5 -121
  119. package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
  120. package/dist/src/ui/components/messages/ToolMessage.test.js +13 -5
  121. package/dist/src/ui/components/messages/ToolMessage.test.js.map +1 -1
  122. package/dist/src/ui/components/messages/ToolResultDisplay.d.ts +13 -0
  123. package/dist/src/ui/components/messages/ToolResultDisplay.js +54 -0
  124. package/dist/src/ui/components/messages/ToolResultDisplay.js.map +1 -0
  125. package/dist/src/ui/components/messages/ToolShared.d.ts +23 -0
  126. package/dist/src/ui/components/messages/ToolShared.js +40 -0
  127. package/dist/src/ui/components/messages/ToolShared.js.map +1 -0
  128. package/dist/src/ui/components/shared/text-buffer.js +4 -1
  129. package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
  130. package/dist/src/ui/contexts/KeypressContext.js +21 -11
  131. package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
  132. package/dist/src/ui/contexts/KeypressContext.test.js +29 -10
  133. package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
  134. package/dist/src/ui/contexts/UIActionsContext.d.ts +1 -0
  135. package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
  136. package/dist/src/ui/hooks/shellCommandProcessor.js +8 -4
  137. package/dist/src/ui/hooks/shellCommandProcessor.js.map +1 -1
  138. package/dist/src/ui/hooks/shellCommandProcessor.test.js +4 -3
  139. package/dist/src/ui/hooks/shellCommandProcessor.test.js.map +1 -1
  140. package/dist/src/ui/hooks/slashCommandProcessor.d.ts +1 -1
  141. package/dist/src/ui/hooks/slashCommandProcessor.js +5 -3
  142. package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
  143. package/dist/src/ui/hooks/useBracketedPaste.js +3 -2
  144. package/dist/src/ui/hooks/useBracketedPaste.js.map +1 -1
  145. package/dist/src/ui/hooks/useCommandCompletion.test.js +5 -5
  146. package/dist/src/ui/hooks/useCommandCompletion.test.js.map +1 -1
  147. package/dist/src/ui/hooks/useConsoleMessages.d.ts +0 -1
  148. package/dist/src/ui/hooks/useConsoleMessages.js +26 -1
  149. package/dist/src/ui/hooks/useConsoleMessages.js.map +1 -1
  150. package/dist/src/ui/hooks/useConsoleMessages.test.js +37 -5
  151. package/dist/src/ui/hooks/useConsoleMessages.test.js.map +1 -1
  152. package/dist/src/ui/hooks/useEditorSettings.d.ts +2 -2
  153. package/dist/src/ui/hooks/useEditorSettings.js.map +1 -1
  154. package/dist/src/ui/hooks/useEditorSettings.test.js.map +1 -1
  155. package/dist/src/ui/hooks/useGeminiStream.d.ts +1 -1
  156. package/dist/src/ui/hooks/useGeminiStream.js +48 -10
  157. package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
  158. package/dist/src/ui/hooks/useGeminiStream.test.js +20 -21
  159. package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
  160. package/dist/src/ui/hooks/useHistoryManager.d.ts +5 -2
  161. package/dist/src/ui/hooks/useHistoryManager.js +39 -3
  162. package/dist/src/ui/hooks/useHistoryManager.js.map +1 -1
  163. package/dist/src/ui/hooks/useIncludeDirsTrust.js +0 -1
  164. package/dist/src/ui/hooks/useIncludeDirsTrust.js.map +1 -1
  165. package/dist/src/ui/hooks/useInputHistoryStore.test.js +4 -1
  166. package/dist/src/ui/hooks/useInputHistoryStore.test.js.map +1 -1
  167. package/dist/src/ui/hooks/useKittyKeyboardProtocol.d.ts +0 -1
  168. package/dist/src/ui/hooks/useKittyKeyboardProtocol.js +1 -2
  169. package/dist/src/ui/hooks/useKittyKeyboardProtocol.js.map +1 -1
  170. package/dist/src/ui/hooks/useMouseClick.d.ts +12 -0
  171. package/dist/src/ui/hooks/useMouseClick.js +28 -0
  172. package/dist/src/ui/hooks/useMouseClick.js.map +1 -0
  173. package/dist/src/ui/hooks/useMouseClick.test.d.ts +6 -0
  174. package/dist/src/ui/hooks/useMouseClick.test.js +59 -0
  175. package/dist/src/ui/hooks/useMouseClick.test.js.map +1 -0
  176. package/dist/src/ui/hooks/useReactToolScheduler.d.ts +1 -1
  177. package/dist/src/ui/hooks/useReactToolScheduler.js +1 -8
  178. package/dist/src/ui/hooks/useReactToolScheduler.js.map +1 -1
  179. package/dist/src/ui/hooks/useReactToolScheduler.test.js +1 -8
  180. package/dist/src/ui/hooks/useReactToolScheduler.test.js.map +1 -1
  181. package/dist/src/ui/hooks/useReverseSearchCompletion.test.js +18 -12
  182. package/dist/src/ui/hooks/useReverseSearchCompletion.test.js.map +1 -1
  183. package/dist/src/ui/hooks/useSessionBrowser.js +13 -4
  184. package/dist/src/ui/hooks/useSessionBrowser.js.map +1 -1
  185. package/dist/src/ui/hooks/useSessionBrowser.test.js +37 -0
  186. package/dist/src/ui/hooks/useSessionBrowser.test.js.map +1 -1
  187. package/dist/src/ui/hooks/useSessionResume.js +1 -1
  188. package/dist/src/ui/hooks/useSessionResume.js.map +1 -1
  189. package/dist/src/ui/hooks/useSessionResume.test.js +4 -4
  190. package/dist/src/ui/hooks/useSessionResume.test.js.map +1 -1
  191. package/dist/src/ui/hooks/useThemeCommand.d.ts +2 -2
  192. package/dist/src/ui/hooks/useThemeCommand.js.map +1 -1
  193. package/dist/src/ui/hooks/useToolScheduler.test.js +2 -2
  194. package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
  195. package/dist/src/ui/themes/theme-manager.test.js +2 -1
  196. package/dist/src/ui/themes/theme-manager.test.js.map +1 -1
  197. package/dist/src/ui/types.d.ts +2 -0
  198. package/dist/src/ui/types.js.map +1 -1
  199. package/dist/src/ui/utils/ConsolePatcher.js +6 -9
  200. package/dist/src/ui/utils/ConsolePatcher.js.map +1 -1
  201. package/dist/src/ui/utils/kittyProtocolDetector.d.ts +6 -2
  202. package/dist/src/ui/utils/kittyProtocolDetector.js +48 -43
  203. package/dist/src/ui/utils/kittyProtocolDetector.js.map +1 -1
  204. package/dist/src/ui/utils/mouse.js +3 -3
  205. package/dist/src/ui/utils/mouse.js.map +1 -1
  206. package/dist/src/utils/cleanup.d.ts +2 -0
  207. package/dist/src/utils/cleanup.js +16 -0
  208. package/dist/src/utils/cleanup.js.map +1 -1
  209. package/dist/src/utils/errors.js +10 -0
  210. package/dist/src/utils/errors.js.map +1 -1
  211. package/dist/src/utils/events.d.ts +0 -2
  212. package/dist/src/utils/events.js +0 -1
  213. package/dist/src/utils/events.js.map +1 -1
  214. package/dist/src/utils/installationInfo.test.js +8 -9
  215. package/dist/src/utils/installationInfo.test.js.map +1 -1
  216. package/dist/src/utils/sessionCleanup.test.js +4 -2
  217. package/dist/src/utils/sessionCleanup.test.js.map +1 -1
  218. package/dist/src/utils/sessionUtils.d.ts +5 -0
  219. package/dist/src/utils/sessionUtils.js +6 -1
  220. package/dist/src/utils/sessionUtils.js.map +1 -1
  221. package/dist/src/utils/sessions.test.d.ts +6 -0
  222. package/dist/src/utils/sessions.test.js +516 -0
  223. package/dist/src/utils/sessions.test.js.map +1 -0
  224. package/dist/src/utils/stdio.d.ts +32 -0
  225. package/dist/src/utils/stdio.js +85 -0
  226. package/dist/src/utils/stdio.js.map +1 -0
  227. package/dist/src/utils/stdio.test.d.ts +6 -0
  228. package/dist/src/utils/stdio.test.js +47 -0
  229. package/dist/src/utils/stdio.test.js.map +1 -0
  230. package/dist/src/validateNonInterActiveAuth.js +2 -0
  231. package/dist/src/validateNonInterActiveAuth.js.map +1 -1
  232. package/dist/src/validateNonInterActiveAuth.test.js +10 -6
  233. package/dist/src/validateNonInterActiveAuth.test.js.map +1 -1
  234. package/dist/src/zed-integration/schema.d.ts +30 -30
  235. package/dist/src/zed-integration/zedIntegration.d.ts +0 -7
  236. package/dist/src/zed-integration/zedIntegration.js +9 -21
  237. package/dist/src/zed-integration/zedIntegration.js.map +1 -1
  238. package/dist/tsconfig.tsbuildinfo +1 -1
  239. package/package.json +5 -5
  240. package/dist/google-gemini-cli-0.18.0-nightly.20251118.86828bb56.tgz +0 -0
@@ -0,0 +1,6 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ export {};
@@ -0,0 +1,47 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
7
+ import { patchStdio, createInkStdio } from './stdio.js';
8
+ import { coreEvents } from '@google/gemini-cli-core';
9
+ vi.mock('@google/gemini-cli-core', () => ({
10
+ coreEvents: {
11
+ emitOutput: vi.fn(),
12
+ },
13
+ }));
14
+ describe('stdio utils', () => {
15
+ let originalStdoutWrite;
16
+ let originalStderrWrite;
17
+ beforeEach(() => {
18
+ originalStdoutWrite = process.stdout.write;
19
+ originalStderrWrite = process.stderr.write;
20
+ });
21
+ afterEach(() => {
22
+ process.stdout.write = originalStdoutWrite;
23
+ process.stderr.write = originalStderrWrite;
24
+ vi.restoreAllMocks();
25
+ });
26
+ it('patchStdio redirects stdout and stderr to coreEvents', () => {
27
+ const cleanup = patchStdio();
28
+ process.stdout.write('test stdout');
29
+ expect(coreEvents.emitOutput).toHaveBeenCalledWith(false, 'test stdout', undefined);
30
+ process.stderr.write('test stderr');
31
+ expect(coreEvents.emitOutput).toHaveBeenCalledWith(true, 'test stderr', undefined);
32
+ cleanup();
33
+ // Verify cleanup
34
+ expect(process.stdout.write).toBe(originalStdoutWrite);
35
+ expect(process.stderr.write).toBe(originalStderrWrite);
36
+ });
37
+ it('createInkStdio writes to real stdout/stderr bypassing patch', () => {
38
+ const cleanup = patchStdio();
39
+ const { stdout: inkStdout, stderr: inkStderr } = createInkStdio();
40
+ inkStdout.write('ink stdout');
41
+ expect(coreEvents.emitOutput).not.toHaveBeenCalled();
42
+ inkStderr.write('ink stderr');
43
+ expect(coreEvents.emitOutput).not.toHaveBeenCalled();
44
+ cleanup();
45
+ });
46
+ });
47
+ //# sourceMappingURL=stdio.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"stdio.test.js","sourceRoot":"","sources":["../../../src/utils/stdio.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,UAAU,EAAE;QACV,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;KACpB;CACF,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,IAAI,mBAAgD,CAAC;IACrD,IAAI,mBAAgD,CAAC;IAErD,UAAU,CAAC,GAAG,EAAE;QACd,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QAC3C,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;QAC3C,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAC;QAC3C,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;QAE7B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAChD,KAAK,EACL,aAAa,EACb,SAAS,CACV,CAAC;QAEF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACpC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAChD,IAAI,EACJ,aAAa,EACb,SAAS,CACV,CAAC;QAEF,OAAO,EAAE,CAAC;QAEV,iBAAiB;QACjB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;QAC7B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,cAAc,EAAE,CAAC;QAElE,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC9B,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAErD,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC9B,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAErD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -8,6 +8,7 @@ import { USER_SETTINGS_PATH } from './config/settings.js';
8
8
  import { validateAuthMethod } from './config/auth.js';
9
9
  import {} from './config/settings.js';
10
10
  import { handleError } from './utils/errors.js';
11
+ import { runExitCleanup } from './utils/cleanup.js';
11
12
  function getAuthTypeFromEnv() {
12
13
  if (process.env['GOOGLE_GENAI_USE_GCA'] === 'true') {
13
14
  return AuthType.LOGIN_WITH_GOOGLE;
@@ -50,6 +51,7 @@ export async function validateNonInteractiveAuth(configuredAuthType, useExternal
50
51
  }
51
52
  else {
52
53
  debugLogger.error(error instanceof Error ? error.message : String(error));
54
+ await runExitCleanup();
53
55
  process.exit(1);
54
56
  }
55
57
  }
@@ -1 +1 @@
1
- {"version":3,"file":"validateNonInterActiveAuth.js","sourceRoot":"","sources":["../../src/validateNonInterActiveAuth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAuB,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,SAAS,kBAAkB;IACzB,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,MAAM,EAAE,CAAC;QACnD,OAAO,QAAQ,CAAC,iBAAiB,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,KAAK,MAAM,EAAE,CAAC;QACxD,OAAO,QAAQ,CAAC,aAAa,CAAC;IAChC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,OAAO,QAAQ,CAAC,UAAU,CAAC;IAC7B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,kBAAwC,EACxC,eAAoC,EACpC,oBAA4B,EAC5B,QAAwB;IAExB,IAAI,CAAC;QACH,MAAM,iBAAiB,GAAG,kBAAkB,IAAI,kBAAkB,EAAE,CAAC;QAErE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC;QAClE,IAAI,YAAY,IAAI,iBAAiB,KAAK,YAAY,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,iBAAiB;gBAC/B,CAAC,CAAC,wCAAwC,YAAY,+BAA+B,iBAAiB,kDAAkD;gBACxJ,CAAC,CAAC,kBAAkB,YAAY,qDAAqD,CAAC;YACxF,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,qCAAqC,kBAAkB,wIAAwI,CAAC;YAChN,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,QAAQ,GAAa,iBAA6B,CAAC;QAEzD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YACjD,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QAED,MAAM,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACjD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,oBAAoB,CAAC,eAAe,EAAE,KAAK,YAAY,CAAC,IAAI,EAAE,CAAC;YACjE,WAAW,CACT,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EACzD,oBAAoB,EACpB,CAAC,CACF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"validateNonInterActiveAuth.js","sourceRoot":"","sources":["../../src/validateNonInterActiveAuth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAuB,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,SAAS,kBAAkB;IACzB,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,MAAM,EAAE,CAAC;QACnD,OAAO,QAAQ,CAAC,iBAAiB,CAAC;IACpC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,KAAK,MAAM,EAAE,CAAC;QACxD,OAAO,QAAQ,CAAC,aAAa,CAAC;IAChC,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,OAAO,QAAQ,CAAC,UAAU,CAAC;IAC7B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,kBAAwC,EACxC,eAAoC,EACpC,oBAA4B,EAC5B,QAAwB;IAExB,IAAI,CAAC;QACH,MAAM,iBAAiB,GAAG,kBAAkB,IAAI,kBAAkB,EAAE,CAAC;QAErE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC;QAClE,IAAI,YAAY,IAAI,iBAAiB,KAAK,YAAY,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,iBAAiB;gBAC/B,CAAC,CAAC,wCAAwC,YAAY,+BAA+B,iBAAiB,kDAAkD;gBACxJ,CAAC,CAAC,kBAAkB,YAAY,qDAAqD,CAAC;YACxF,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,qCAAqC,kBAAkB,wIAAwI,CAAC;YAChN,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,QAAQ,GAAa,iBAA6B,CAAC;QAEzD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YACjD,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QAED,MAAM,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACjD,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,oBAAoB,CAAC,eAAe,EAAE,KAAK,YAAY,CAAC,IAAI,EAAE,CAAC;YACjE,WAAW,CACT,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EACzD,oBAAoB,EACpB,CAAC,CACF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1E,MAAM,cAAc,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;AACH,CAAC"}
@@ -5,7 +5,7 @@
5
5
  */
6
6
  import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
7
7
  import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
8
- import { AuthType, OutputFormat, makeFakeConfig, } from '@google/gemini-cli-core';
8
+ import { AuthType, OutputFormat, makeFakeConfig, debugLogger, } from '@google/gemini-cli-core';
9
9
  import * as auth from './config/auth.js';
10
10
  import {} from './config/settings.js';
11
11
  function createLocalMockConfig(overrides = {}) {
@@ -18,6 +18,7 @@ describe('validateNonInterActiveAuth', () => {
18
18
  let originalEnvVertexAi;
19
19
  let originalEnvGcp;
20
20
  let consoleErrorSpy;
21
+ let debugLoggerErrorSpy;
21
22
  let processExitSpy;
22
23
  let refreshAuthMock;
23
24
  let mockSettings;
@@ -29,6 +30,9 @@ describe('validateNonInterActiveAuth', () => {
29
30
  delete process.env['GOOGLE_GENAI_USE_VERTEXAI'];
30
31
  delete process.env['GOOGLE_GENAI_USE_GCA'];
31
32
  consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
33
+ debugLoggerErrorSpy = vi
34
+ .spyOn(debugLogger, 'error')
35
+ .mockImplementation(() => { });
32
36
  processExitSpy = vi
33
37
  .spyOn(process, 'exit')
34
38
  .mockImplementation((code) => {
@@ -92,7 +96,7 @@ describe('validateNonInterActiveAuth', () => {
92
96
  catch (e) {
93
97
  expect(e.message).toContain('process.exit(1) called');
94
98
  }
95
- expect(consoleErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Please set an Auth method'));
99
+ expect(debugLoggerErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Please set an Auth method'));
96
100
  expect(processExitSpy).toHaveBeenCalledWith(1);
97
101
  });
98
102
  it('uses LOGIN_WITH_GOOGLE if GOOGLE_GENAI_USE_GCA is set', async () => {
@@ -189,7 +193,7 @@ describe('validateNonInterActiveAuth', () => {
189
193
  catch (e) {
190
194
  expect(e.message).toContain('process.exit(1) called');
191
195
  }
192
- expect(consoleErrorSpy).toHaveBeenCalledWith('Auth error!');
196
+ expect(debugLoggerErrorSpy).toHaveBeenCalledWith('Auth error!');
193
197
  expect(processExitSpy).toHaveBeenCalledWith(1);
194
198
  });
195
199
  it('skips validation if useExternalAuth is true', async () => {
@@ -205,7 +209,7 @@ describe('validateNonInterActiveAuth', () => {
205
209
  await validateNonInteractiveAuth('invalid-auth-type', true, // useExternalAuth = true
206
210
  nonInteractiveConfig, mockSettings);
207
211
  expect(validateAuthMethodSpy).not.toHaveBeenCalled();
208
- expect(consoleErrorSpy).not.toHaveBeenCalled();
212
+ expect(debugLoggerErrorSpy).not.toHaveBeenCalled();
209
213
  expect(processExitSpy).not.toHaveBeenCalled();
210
214
  // We still expect refreshAuth to be called with the (invalid) type
211
215
  expect(refreshAuthMock).toHaveBeenCalledWith('invalid-auth-type');
@@ -233,7 +237,7 @@ describe('validateNonInterActiveAuth', () => {
233
237
  catch (e) {
234
238
  expect(e.message).toContain('process.exit(1) called');
235
239
  }
236
- expect(consoleErrorSpy).toHaveBeenCalledWith("The enforced authentication type is 'oauth-personal', but the current type is 'gemini-api-key'. Please re-authenticate with the correct type.");
240
+ expect(debugLoggerErrorSpy).toHaveBeenCalledWith("The enforced authentication type is 'oauth-personal', but the current type is 'gemini-api-key'. Please re-authenticate with the correct type.");
237
241
  expect(processExitSpy).toHaveBeenCalledWith(1);
238
242
  });
239
243
  it('exits if auth from env var does not match enforcedAuthType', async () => {
@@ -251,7 +255,7 @@ describe('validateNonInterActiveAuth', () => {
251
255
  catch (e) {
252
256
  expect(e.message).toContain('process.exit(1) called');
253
257
  }
254
- expect(consoleErrorSpy).toHaveBeenCalledWith("The enforced authentication type is 'oauth-personal', but the current type is 'gemini-api-key'. Please re-authenticate with the correct type.");
258
+ expect(debugLoggerErrorSpy).toHaveBeenCalledWith("The enforced authentication type is 'oauth-personal', but the current type is 'gemini-api-key'. Please re-authenticate with the correct type.");
255
259
  expect(processExitSpy).toHaveBeenCalledWith(1);
256
260
  });
257
261
  describe('JSON output mode', () => {
@@ -1 +1 @@
1
- {"version":3,"file":"validateNonInterActiveAuth.test.js","sourceRoot":"","sources":["../../src/validateNonInterActiveAuth.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validateNonInterActiveAuth.test.js","sourceRoot":"","sources":["../../src/validateNonInterActiveAuth.test.ts"],"names":[],"mappings":"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"}
@@ -1616,7 +1616,7 @@ export declare const toolCallSchema: z.ZodObject<{
1616
1616
  }, "strip", z.ZodTypeAny, {
1617
1617
  status: "failed" | "pending" | "in_progress" | "completed";
1618
1618
  title: string;
1619
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
1619
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
1620
1620
  toolCallId: string;
1621
1621
  content?: ({
1622
1622
  content: {
@@ -1690,7 +1690,7 @@ export declare const toolCallSchema: z.ZodObject<{
1690
1690
  }, {
1691
1691
  status: "failed" | "pending" | "in_progress" | "completed";
1692
1692
  title: string;
1693
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
1693
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
1694
1694
  toolCallId: string;
1695
1695
  content?: ({
1696
1696
  content: {
@@ -3521,7 +3521,7 @@ export declare const sessionUpdateSchema: z.ZodUnion<[z.ZodObject<{
3521
3521
  }, "strip", z.ZodTypeAny, {
3522
3522
  status: "failed" | "pending" | "in_progress" | "completed";
3523
3523
  title: string;
3524
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
3524
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
3525
3525
  toolCallId: string;
3526
3526
  sessionUpdate: "tool_call";
3527
3527
  content?: ({
@@ -3596,7 +3596,7 @@ export declare const sessionUpdateSchema: z.ZodUnion<[z.ZodObject<{
3596
3596
  }, {
3597
3597
  status: "failed" | "pending" | "in_progress" | "completed";
3598
3598
  title: string;
3599
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
3599
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
3600
3600
  toolCallId: string;
3601
3601
  sessionUpdate: "tool_call";
3602
3602
  content?: ({
@@ -4110,7 +4110,7 @@ export declare const sessionUpdateSchema: z.ZodUnion<[z.ZodObject<{
4110
4110
  })[] | null | undefined;
4111
4111
  status?: "failed" | "pending" | "in_progress" | "completed" | null | undefined;
4112
4112
  title?: string | null | undefined;
4113
- kind?: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch" | null | undefined;
4113
+ kind?: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch" | null | undefined;
4114
4114
  locations?: {
4115
4115
  path: string;
4116
4116
  line?: number | null | undefined;
@@ -4185,7 +4185,7 @@ export declare const sessionUpdateSchema: z.ZodUnion<[z.ZodObject<{
4185
4185
  })[] | null | undefined;
4186
4186
  status?: "failed" | "pending" | "in_progress" | "completed" | null | undefined;
4187
4187
  title?: string | null | undefined;
4188
- kind?: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch" | null | undefined;
4188
+ kind?: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch" | null | undefined;
4189
4189
  locations?: {
4190
4190
  path: string;
4191
4191
  line?: number | null | undefined;
@@ -4699,7 +4699,7 @@ export declare const requestPermissionRequestSchema: z.ZodObject<{
4699
4699
  }, "strip", z.ZodTypeAny, {
4700
4700
  status: "failed" | "pending" | "in_progress" | "completed";
4701
4701
  title: string;
4702
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
4702
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
4703
4703
  toolCallId: string;
4704
4704
  content?: ({
4705
4705
  content: {
@@ -4773,7 +4773,7 @@ export declare const requestPermissionRequestSchema: z.ZodObject<{
4773
4773
  }, {
4774
4774
  status: "failed" | "pending" | "in_progress" | "completed";
4775
4775
  title: string;
4776
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
4776
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
4777
4777
  toolCallId: string;
4778
4778
  content?: ({
4779
4779
  content: {
@@ -4855,7 +4855,7 @@ export declare const requestPermissionRequestSchema: z.ZodObject<{
4855
4855
  toolCall: {
4856
4856
  status: "failed" | "pending" | "in_progress" | "completed";
4857
4857
  title: string;
4858
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
4858
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
4859
4859
  toolCallId: string;
4860
4860
  content?: ({
4861
4861
  content: {
@@ -4937,7 +4937,7 @@ export declare const requestPermissionRequestSchema: z.ZodObject<{
4937
4937
  toolCall: {
4938
4938
  status: "failed" | "pending" | "in_progress" | "completed";
4939
4939
  title: string;
4940
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
4940
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
4941
4941
  toolCallId: string;
4942
4942
  content?: ({
4943
4943
  content: {
@@ -6449,7 +6449,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
6449
6449
  }, "strip", z.ZodTypeAny, {
6450
6450
  status: "failed" | "pending" | "in_progress" | "completed";
6451
6451
  title: string;
6452
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
6452
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
6453
6453
  toolCallId: string;
6454
6454
  sessionUpdate: "tool_call";
6455
6455
  content?: ({
@@ -6524,7 +6524,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
6524
6524
  }, {
6525
6525
  status: "failed" | "pending" | "in_progress" | "completed";
6526
6526
  title: string;
6527
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
6527
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
6528
6528
  toolCallId: string;
6529
6529
  sessionUpdate: "tool_call";
6530
6530
  content?: ({
@@ -7038,7 +7038,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
7038
7038
  })[] | null | undefined;
7039
7039
  status?: "failed" | "pending" | "in_progress" | "completed" | null | undefined;
7040
7040
  title?: string | null | undefined;
7041
- kind?: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch" | null | undefined;
7041
+ kind?: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch" | null | undefined;
7042
7042
  locations?: {
7043
7043
  path: string;
7044
7044
  line?: number | null | undefined;
@@ -7113,7 +7113,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
7113
7113
  })[] | null | undefined;
7114
7114
  status?: "failed" | "pending" | "in_progress" | "completed" | null | undefined;
7115
7115
  title?: string | null | undefined;
7116
- kind?: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch" | null | undefined;
7116
+ kind?: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch" | null | undefined;
7117
7117
  locations?: {
7118
7118
  path: string;
7119
7119
  line?: number | null | undefined;
@@ -7328,7 +7328,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
7328
7328
  } | {
7329
7329
  status: "failed" | "pending" | "in_progress" | "completed";
7330
7330
  title: string;
7331
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
7331
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
7332
7332
  toolCallId: string;
7333
7333
  sessionUpdate: "tool_call";
7334
7334
  content?: ({
@@ -7469,7 +7469,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
7469
7469
  })[] | null | undefined;
7470
7470
  status?: "failed" | "pending" | "in_progress" | "completed" | null | undefined;
7471
7471
  title?: string | null | undefined;
7472
- kind?: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch" | null | undefined;
7472
+ kind?: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch" | null | undefined;
7473
7473
  locations?: {
7474
7474
  path: string;
7475
7475
  line?: number | null | undefined;
@@ -7662,7 +7662,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
7662
7662
  } | {
7663
7663
  status: "failed" | "pending" | "in_progress" | "completed";
7664
7664
  title: string;
7665
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
7665
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
7666
7666
  toolCallId: string;
7667
7667
  sessionUpdate: "tool_call";
7668
7668
  content?: ({
@@ -7803,7 +7803,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
7803
7803
  })[] | null | undefined;
7804
7804
  status?: "failed" | "pending" | "in_progress" | "completed" | null | undefined;
7805
7805
  title?: string | null | undefined;
7806
- kind?: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch" | null | undefined;
7806
+ kind?: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch" | null | undefined;
7807
7807
  locations?: {
7808
7808
  path: string;
7809
7809
  line?: number | null | undefined;
@@ -8235,7 +8235,7 @@ export declare const clientRequestSchema: z.ZodUnion<[z.ZodObject<{
8235
8235
  }, "strip", z.ZodTypeAny, {
8236
8236
  status: "failed" | "pending" | "in_progress" | "completed";
8237
8237
  title: string;
8238
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
8238
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
8239
8239
  toolCallId: string;
8240
8240
  content?: ({
8241
8241
  content: {
@@ -8309,7 +8309,7 @@ export declare const clientRequestSchema: z.ZodUnion<[z.ZodObject<{
8309
8309
  }, {
8310
8310
  status: "failed" | "pending" | "in_progress" | "completed";
8311
8311
  title: string;
8312
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
8312
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
8313
8313
  toolCallId: string;
8314
8314
  content?: ({
8315
8315
  content: {
@@ -8391,7 +8391,7 @@ export declare const clientRequestSchema: z.ZodUnion<[z.ZodObject<{
8391
8391
  toolCall: {
8392
8392
  status: "failed" | "pending" | "in_progress" | "completed";
8393
8393
  title: string;
8394
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
8394
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
8395
8395
  toolCallId: string;
8396
8396
  content?: ({
8397
8397
  content: {
@@ -8473,7 +8473,7 @@ export declare const clientRequestSchema: z.ZodUnion<[z.ZodObject<{
8473
8473
  toolCall: {
8474
8474
  status: "failed" | "pending" | "in_progress" | "completed";
8475
8475
  title: string;
8476
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
8476
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
8477
8477
  toolCallId: string;
8478
8478
  content?: ({
8479
8479
  content: {
@@ -10467,7 +10467,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
10467
10467
  }, "strip", z.ZodTypeAny, {
10468
10468
  status: "failed" | "pending" | "in_progress" | "completed";
10469
10469
  title: string;
10470
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
10470
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
10471
10471
  toolCallId: string;
10472
10472
  sessionUpdate: "tool_call";
10473
10473
  content?: ({
@@ -10542,7 +10542,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
10542
10542
  }, {
10543
10543
  status: "failed" | "pending" | "in_progress" | "completed";
10544
10544
  title: string;
10545
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
10545
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
10546
10546
  toolCallId: string;
10547
10547
  sessionUpdate: "tool_call";
10548
10548
  content?: ({
@@ -11056,7 +11056,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
11056
11056
  })[] | null | undefined;
11057
11057
  status?: "failed" | "pending" | "in_progress" | "completed" | null | undefined;
11058
11058
  title?: string | null | undefined;
11059
- kind?: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch" | null | undefined;
11059
+ kind?: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch" | null | undefined;
11060
11060
  locations?: {
11061
11061
  path: string;
11062
11062
  line?: number | null | undefined;
@@ -11131,7 +11131,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
11131
11131
  })[] | null | undefined;
11132
11132
  status?: "failed" | "pending" | "in_progress" | "completed" | null | undefined;
11133
11133
  title?: string | null | undefined;
11134
- kind?: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch" | null | undefined;
11134
+ kind?: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch" | null | undefined;
11135
11135
  locations?: {
11136
11136
  path: string;
11137
11137
  line?: number | null | undefined;
@@ -11346,7 +11346,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
11346
11346
  } | {
11347
11347
  status: "failed" | "pending" | "in_progress" | "completed";
11348
11348
  title: string;
11349
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
11349
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
11350
11350
  toolCallId: string;
11351
11351
  sessionUpdate: "tool_call";
11352
11352
  content?: ({
@@ -11487,7 +11487,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
11487
11487
  })[] | null | undefined;
11488
11488
  status?: "failed" | "pending" | "in_progress" | "completed" | null | undefined;
11489
11489
  title?: string | null | undefined;
11490
- kind?: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch" | null | undefined;
11490
+ kind?: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch" | null | undefined;
11491
11491
  locations?: {
11492
11492
  path: string;
11493
11493
  line?: number | null | undefined;
@@ -11680,7 +11680,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
11680
11680
  } | {
11681
11681
  status: "failed" | "pending" | "in_progress" | "completed";
11682
11682
  title: string;
11683
- kind: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch";
11683
+ kind: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch";
11684
11684
  toolCallId: string;
11685
11685
  sessionUpdate: "tool_call";
11686
11686
  content?: ({
@@ -11821,7 +11821,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
11821
11821
  })[] | null | undefined;
11822
11822
  status?: "failed" | "pending" | "in_progress" | "completed" | null | undefined;
11823
11823
  title?: string | null | undefined;
11824
- kind?: "search" | "move" | "delete" | "other" | "edit" | "read" | "execute" | "think" | "fetch" | null | undefined;
11824
+ kind?: "search" | "read" | "move" | "delete" | "other" | "edit" | "execute" | "think" | "fetch" | null | undefined;
11825
11825
  locations?: {
11826
11826
  path: string;
11827
11827
  line?: number | null | undefined;
@@ -6,11 +6,4 @@
6
6
  import type { Config } from '@google/gemini-cli-core';
7
7
  import type { LoadedSettings } from '../config/settings.js';
8
8
  import type { CliArgs } from '../config/config.js';
9
- /**
10
- * Resolves the model to use based on the current configuration.
11
- *
12
- * If the model is set to "auto", it will use the flash model if in fallback
13
- * mode, otherwise it will use the default model.
14
- */
15
- export declare function resolveModel(model: string, isInFallbackMode: boolean): string;
16
9
  export declare function runZedIntegration(config: Config, settings: LoadedSettings, argv: CliArgs): Promise<void>;
@@ -3,7 +3,7 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { AuthType, logToolCall, convertToFunctionResponse, ToolConfirmationOutcome, clearCachedCredentialFile, isNodeError, getErrorMessage, isWithinRoot, getErrorStatus, MCPServerConfig, DiscoveredMCPTool, StreamEventType, ToolCallEvent, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_FLASH_MODEL, debugLogger, } from '@google/gemini-cli-core';
6
+ import { AuthType, logToolCall, convertToFunctionResponse, ToolConfirmationOutcome, clearCachedCredentialFile, isNodeError, getErrorMessage, isWithinRoot, getErrorStatus, MCPServerConfig, DiscoveredMCPTool, StreamEventType, ToolCallEvent, debugLogger, ReadManyFilesTool, getEffectiveModel, } from '@google/gemini-cli-core';
7
7
  import * as acp from './acp.js';
8
8
  import { AcpFileSystemService } from './fileSystemService.js';
9
9
  import { Readable, Writable } from 'node:stream';
@@ -13,18 +13,6 @@ import * as path from 'node:path';
13
13
  import { z } from 'zod';
14
14
  import { randomUUID } from 'node:crypto';
15
15
  import { loadCliConfig } from '../config/config.js';
16
- /**
17
- * Resolves the model to use based on the current configuration.
18
- *
19
- * If the model is set to "auto", it will use the flash model if in fallback
20
- * mode, otherwise it will use the default model.
21
- */
22
- export function resolveModel(model, isInFallbackMode) {
23
- if (model === DEFAULT_GEMINI_MODEL_AUTO) {
24
- return isInFallbackMode ? DEFAULT_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_MODEL;
25
- }
26
- return model;
27
- }
28
16
  export async function runZedIntegration(config, settings, argv) {
29
17
  const stdout = Writable.toWeb(process.stdout);
30
18
  const stdin = Readable.toWeb(process.stdin);
@@ -177,12 +165,8 @@ class Session {
177
165
  }
178
166
  const functionCalls = [];
179
167
  try {
180
- const responseStream = await chat.sendMessageStream(resolveModel(this.config.getModel(), this.config.isInFallbackMode()), {
181
- message: nextMessage?.parts ?? [],
182
- config: {
183
- abortSignal: pendingSend.signal,
184
- },
185
- }, promptId);
168
+ const model = getEffectiveModel(this.config.isInFallbackMode(), this.config.getModel(), this.config.getPreviewFeatures());
169
+ const responseStream = await chat.sendMessageStream({ model }, nextMessage?.parts ?? [], promptId, pendingSend.signal);
186
170
  nextMessage = null;
187
171
  for await (const resp of responseStream) {
188
172
  if (pendingSend.signal.aborted) {
@@ -217,6 +201,10 @@ class Session {
217
201
  if (getErrorStatus(error) === 429) {
218
202
  throw new acp.RequestError(429, 'Rate limit exceeded. Try again later.');
219
203
  }
204
+ if (pendingSend.signal.aborted ||
205
+ (error instanceof Error && error.name === 'AbortError')) {
206
+ return { stopReason: 'cancelled' };
207
+ }
220
208
  throw error;
221
209
  }
222
210
  if (functionCalls.length > 0) {
@@ -400,7 +388,7 @@ class Session {
400
388
  const contentLabelsForDisplay = [];
401
389
  const ignoredPaths = [];
402
390
  const toolRegistry = this.config.getToolRegistry();
403
- const readManyFilesTool = toolRegistry.getTool('read_many_files');
391
+ const readManyFilesTool = new ReadManyFilesTool(this.config);
404
392
  const globTool = toolRegistry.getTool('glob');
405
393
  if (!readManyFilesTool) {
406
394
  throw new Error('Error: read_many_files tool not found.');
@@ -533,7 +521,7 @@ class Session {
533
521
  }
534
522
  if (pathSpecsToRead.length > 0) {
535
523
  const toolArgs = {
536
- paths: pathSpecsToRead,
524
+ include: pathSpecsToRead,
537
525
  };
538
526
  const callId = `${readManyFilesTool.name}-${Date.now()}`;
539
527
  try {