@machina.ai/cell-cli 1.60.0-rc1 → 1.64.0-rc2

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 (276) hide show
  1. package/dist/index.js +7 -0
  2. package/dist/index.js.map +1 -1
  3. package/dist/package.json +3 -3
  4. package/dist/src/acp/acpResume.test.js +50 -0
  5. package/dist/src/acp/acpResume.test.js.map +1 -1
  6. package/dist/src/acp/acpRpcDispatcher.d.ts +1 -1
  7. package/dist/src/acp/acpRpcDispatcher.js +2 -2
  8. package/dist/src/acp/acpRpcDispatcher.js.map +1 -1
  9. package/dist/src/acp/acpRpcDispatcher.test.js +9 -0
  10. package/dist/src/acp/acpRpcDispatcher.test.js.map +1 -1
  11. package/dist/src/acp/acpSession.d.ts +1 -1
  12. package/dist/src/acp/acpSession.js +90 -80
  13. package/dist/src/acp/acpSession.js.map +1 -1
  14. package/dist/src/acp/acpSession.test.js +279 -2
  15. package/dist/src/acp/acpSession.test.js.map +1 -1
  16. package/dist/src/acp/acpSessionManager.d.ts +2 -2
  17. package/dist/src/acp/acpSessionManager.js +165 -73
  18. package/dist/src/acp/acpSessionManager.js.map +1 -1
  19. package/dist/src/acp/acpSessionManager.test.js +204 -1
  20. package/dist/src/acp/acpSessionManager.test.js.map +1 -1
  21. package/dist/src/acp/acpUtils.js +5 -3
  22. package/dist/src/acp/acpUtils.js.map +1 -1
  23. package/dist/src/config/config.js +1 -0
  24. package/dist/src/config/config.js.map +1 -1
  25. package/dist/src/config/extension-manager.js +8 -5
  26. package/dist/src/config/extension-manager.js.map +1 -1
  27. package/dist/src/config/extension-manager.test.js +27 -0
  28. package/dist/src/config/extension-manager.test.js.map +1 -1
  29. package/dist/src/config/extensions/update.js +7 -2
  30. package/dist/src/config/extensions/update.js.map +1 -1
  31. package/dist/src/config/extensions/update.test.js +21 -0
  32. package/dist/src/config/extensions/update.test.js.map +1 -1
  33. package/dist/src/config/mcp/mcpServerEnablement.d.ts +5 -0
  34. package/dist/src/config/mcp/mcpServerEnablement.js +26 -3
  35. package/dist/src/config/mcp/mcpServerEnablement.js.map +1 -1
  36. package/dist/src/config/mcp/mcpServerEnablement.test.js +27 -0
  37. package/dist/src/config/mcp/mcpServerEnablement.test.js.map +1 -1
  38. package/dist/src/config/settings.test.js +22 -0
  39. package/dist/src/config/settings.test.js.map +1 -1
  40. package/dist/src/config/settingsSchema.d.ts +10 -1
  41. package/dist/src/config/settingsSchema.js +38 -2
  42. package/dist/src/config/settingsSchema.js.map +1 -1
  43. package/dist/src/core/auth.test.js +1 -1
  44. package/dist/src/core/auth.test.js.map +1 -1
  45. package/dist/src/gemini.js +110 -18
  46. package/dist/src/gemini.js.map +1 -1
  47. package/dist/src/gemini_uncaught.test.d.ts +6 -0
  48. package/dist/src/gemini_uncaught.test.js +91 -0
  49. package/dist/src/gemini_uncaught.test.js.map +1 -0
  50. package/dist/src/generated/git-commit.d.ts +2 -2
  51. package/dist/src/generated/git-commit.js +2 -2
  52. package/dist/src/patches/http-proxy-agent.d.ts +4 -1
  53. package/dist/src/patches/http-proxy-agent.js +38 -2
  54. package/dist/src/patches/http-proxy-agent.js.map +1 -1
  55. package/dist/src/patches/https-proxy-agent.d.ts +4 -1
  56. package/dist/src/patches/https-proxy-agent.js +38 -2
  57. package/dist/src/patches/https-proxy-agent.js.map +1 -1
  58. package/dist/src/services/FileCommandLoader.js +3 -5
  59. package/dist/src/services/FileCommandLoader.js.map +1 -1
  60. package/dist/src/services/FileCommandLoader.test.js +68 -6
  61. package/dist/src/services/FileCommandLoader.test.js.map +1 -1
  62. package/dist/src/ui/AppContainer.js +42 -39
  63. package/dist/src/ui/AppContainer.js.map +1 -1
  64. package/dist/src/ui/AppContainer.test.js +30 -0
  65. package/dist/src/ui/AppContainer.test.js.map +1 -1
  66. package/dist/src/ui/auth/AuthDialog.js +11 -3
  67. package/dist/src/ui/auth/AuthDialog.js.map +1 -1
  68. package/dist/src/ui/auth/useAuth.test.js +1 -1
  69. package/dist/src/ui/auth/useAuth.test.js.map +1 -1
  70. package/dist/src/ui/commands/bugCommand.js +3 -3
  71. package/dist/src/ui/commands/bugCommand.js.map +1 -1
  72. package/dist/src/ui/commands/bugCommand.test.js +44 -0
  73. package/dist/src/ui/commands/bugCommand.test.js.map +1 -1
  74. package/dist/src/ui/commands/bugMemoryCommand.js +2 -2
  75. package/dist/src/ui/commands/bugMemoryCommand.js.map +1 -1
  76. package/dist/src/ui/commands/bugMemoryCommand.test.js +12 -0
  77. package/dist/src/ui/commands/bugMemoryCommand.test.js.map +1 -1
  78. package/dist/src/ui/components/AsciiArt.d.ts +6 -6
  79. package/dist/src/ui/components/AsciiArt.js +6 -6
  80. package/dist/src/ui/components/AskUserDialog.js +7 -2
  81. package/dist/src/ui/components/AskUserDialog.js.map +1 -1
  82. package/dist/src/ui/components/AskUserDialog.test.js +33 -0
  83. package/dist/src/ui/components/AskUserDialog.test.js.map +1 -1
  84. package/dist/src/ui/components/Composer.js +4 -4
  85. package/dist/src/ui/components/Composer.js.map +1 -1
  86. package/dist/src/ui/components/Composer.test.js +50 -2
  87. package/dist/src/ui/components/Composer.test.js.map +1 -1
  88. package/dist/src/ui/components/InputPrompt.js +17 -11
  89. package/dist/src/ui/components/InputPrompt.js.map +1 -1
  90. package/dist/src/ui/components/InputPrompt.test.js +103 -7
  91. package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
  92. package/dist/src/ui/components/LoadingIndicator.d.ts +1 -0
  93. package/dist/src/ui/components/LoadingIndicator.js +13 -11
  94. package/dist/src/ui/components/LoadingIndicator.js.map +1 -1
  95. package/dist/src/ui/components/LoadingIndicator.test.js +29 -0
  96. package/dist/src/ui/components/LoadingIndicator.test.js.map +1 -1
  97. package/dist/src/ui/components/MainContent.js +79 -14
  98. package/dist/src/ui/components/MainContent.js.map +1 -1
  99. package/dist/src/ui/components/MainContent.test.js +218 -5
  100. package/dist/src/ui/components/MainContent.test.js.map +1 -1
  101. package/dist/src/ui/components/ModelDialog.js +1 -2
  102. package/dist/src/ui/components/ModelDialog.js.map +1 -1
  103. package/dist/src/ui/components/ModelDialog.test.js +4 -3
  104. package/dist/src/ui/components/ModelDialog.test.js.map +1 -1
  105. package/dist/src/ui/components/ProgressBar.js +4 -3
  106. package/dist/src/ui/components/ProgressBar.js.map +1 -1
  107. package/dist/src/ui/components/ProgressBar.test.js +12 -0
  108. package/dist/src/ui/components/ProgressBar.test.js.map +1 -1
  109. package/dist/src/ui/components/RewindViewer.js +2 -1
  110. package/dist/src/ui/components/RewindViewer.js.map +1 -1
  111. package/dist/src/ui/components/RewindViewer.test.js +38 -0
  112. package/dist/src/ui/components/RewindViewer.test.js.map +1 -1
  113. package/dist/src/ui/components/StatusRow.d.ts +2 -0
  114. package/dist/src/ui/components/StatusRow.js +11 -6
  115. package/dist/src/ui/components/StatusRow.js.map +1 -1
  116. package/dist/src/ui/components/StatusRow.test.js +158 -0
  117. package/dist/src/ui/components/StatusRow.test.js.map +1 -1
  118. package/dist/src/ui/components/ToolConfirmationQueue.js +4 -2
  119. package/dist/src/ui/components/ToolConfirmationQueue.js.map +1 -1
  120. package/dist/src/ui/components/ToolConfirmationQueue.test.js +30 -0
  121. package/dist/src/ui/components/ToolConfirmationQueue.test.js.map +1 -1
  122. package/dist/src/ui/components/messages/DenseToolMessage.js +5 -5
  123. package/dist/src/ui/components/messages/DenseToolMessage.js.map +1 -1
  124. package/dist/src/ui/components/messages/DenseToolMessage.test.js +13 -0
  125. package/dist/src/ui/components/messages/DenseToolMessage.test.js.map +1 -1
  126. package/dist/src/ui/components/messages/DiffRenderer.d.ts +1 -0
  127. package/dist/src/ui/components/messages/DiffRenderer.js +16 -8
  128. package/dist/src/ui/components/messages/DiffRenderer.js.map +1 -1
  129. package/dist/src/ui/components/messages/DiffRenderer.test.js +42 -0
  130. package/dist/src/ui/components/messages/DiffRenderer.test.js.map +1 -1
  131. package/dist/src/ui/components/messages/ShellToolMessage.js +4 -3
  132. package/dist/src/ui/components/messages/ShellToolMessage.js.map +1 -1
  133. package/dist/src/ui/components/messages/ToolConfirmationMessage.js +74 -16
  134. package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
  135. package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +80 -7
  136. package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -1
  137. package/dist/src/ui/components/messages/ToolGroupMessage.js +6 -5
  138. package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
  139. package/dist/src/ui/components/messages/ToolMessage.js +2 -1
  140. package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
  141. package/dist/src/ui/components/messages/ToolResultDisplay.js +11 -8
  142. package/dist/src/ui/components/messages/ToolResultDisplay.js.map +1 -1
  143. package/dist/src/ui/components/messages/ToolShared.js +5 -4
  144. package/dist/src/ui/components/messages/ToolShared.js.map +1 -1
  145. package/dist/src/ui/components/shared/HalfLinePaddedBox.js +4 -2
  146. package/dist/src/ui/components/shared/HalfLinePaddedBox.js.map +1 -1
  147. package/dist/src/ui/components/shared/HalfLinePaddedBox.test.js +8 -0
  148. package/dist/src/ui/components/shared/HalfLinePaddedBox.test.js.map +1 -1
  149. package/dist/src/ui/components/shared/SearchableList.js +1 -1
  150. package/dist/src/ui/components/shared/SearchableList.js.map +1 -1
  151. package/dist/src/ui/components/shared/SearchableList.test.js +13 -0
  152. package/dist/src/ui/components/shared/SearchableList.test.js.map +1 -1
  153. package/dist/src/ui/components/shared/TextInput.js +2 -2
  154. package/dist/src/ui/components/shared/TextInput.js.map +1 -1
  155. package/dist/src/ui/components/views/ExtensionRegistryView.test.js +2 -0
  156. package/dist/src/ui/components/views/ExtensionRegistryView.test.js.map +1 -1
  157. package/dist/src/ui/contexts/KeypressContext.js +20 -2
  158. package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
  159. package/dist/src/ui/contexts/KeypressContext.test.js +24 -0
  160. package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
  161. package/dist/src/ui/contexts/UIStateContext.d.ts +1 -0
  162. package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
  163. package/dist/src/ui/emergency-stop.test.d.ts +6 -0
  164. package/dist/src/ui/emergency-stop.test.js +116 -0
  165. package/dist/src/ui/emergency-stop.test.js.map +1 -0
  166. package/dist/src/ui/hooks/atCommandProcessor.d.ts +8 -5
  167. package/dist/src/ui/hooks/atCommandProcessor.js +47 -16
  168. package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
  169. package/dist/src/ui/hooks/atCommandProcessor.test.js +160 -0
  170. package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -1
  171. package/dist/src/ui/hooks/useComposerStatus.d.ts +1 -0
  172. package/dist/src/ui/hooks/useComposerStatus.js +1 -0
  173. package/dist/src/ui/hooks/useComposerStatus.js.map +1 -1
  174. package/dist/src/ui/hooks/useFocus.js +1 -0
  175. package/dist/src/ui/hooks/useFocus.js.map +1 -1
  176. package/dist/src/ui/hooks/useFolderTrust.js +16 -16
  177. package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
  178. package/dist/src/ui/hooks/useFolderTrust.test.js +186 -3
  179. package/dist/src/ui/hooks/useFolderTrust.test.js.map +1 -1
  180. package/dist/src/ui/hooks/useGeminiStream.js +4 -12
  181. package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
  182. package/dist/src/ui/hooks/useGeminiStream.test.js +134 -2
  183. package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
  184. package/dist/src/ui/hooks/useLoadingIndicator.d.ts +1 -0
  185. package/dist/src/ui/hooks/useLoadingIndicator.js +1 -0
  186. package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
  187. package/dist/src/ui/hooks/useLoadingIndicator.test.js +2 -0
  188. package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
  189. package/dist/src/ui/hooks/useQuotaAndFallback.js +2 -2
  190. package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
  191. package/dist/src/ui/hooks/useSelectionList.js +24 -1
  192. package/dist/src/ui/hooks/useSelectionList.js.map +1 -1
  193. package/dist/src/ui/hooks/useSelectionList.test.js +63 -1
  194. package/dist/src/ui/hooks/useSelectionList.test.js.map +1 -1
  195. package/dist/src/ui/hooks/useVoiceMode.js +2 -2
  196. package/dist/src/ui/hooks/useVoiceMode.js.map +1 -1
  197. package/dist/src/ui/utils/CodeColorizer.d.ts +1 -0
  198. package/dist/src/ui/utils/CodeColorizer.js +13 -7
  199. package/dist/src/ui/utils/CodeColorizer.js.map +1 -1
  200. package/dist/src/ui/utils/TableRenderer.js +3 -2
  201. package/dist/src/ui/utils/TableRenderer.js.map +1 -1
  202. package/dist/src/ui/utils/borderStyles.d.ts +1 -0
  203. package/dist/src/ui/utils/borderStyles.js +1 -0
  204. package/dist/src/ui/utils/borderStyles.js.map +1 -1
  205. package/dist/src/ui/utils/fileUtils.d.ts +4 -0
  206. package/dist/src/ui/utils/fileUtils.js +13 -0
  207. package/dist/src/ui/utils/fileUtils.js.map +1 -1
  208. package/dist/src/ui/utils/renderBorder.d.ts +27 -0
  209. package/dist/src/ui/utils/renderBorder.js +46 -0
  210. package/dist/src/ui/utils/renderBorder.js.map +1 -0
  211. package/dist/src/ui/utils/renderBorder.test.d.ts +6 -0
  212. package/dist/src/ui/utils/renderBorder.test.js +74 -0
  213. package/dist/src/ui/utils/renderBorder.test.js.map +1 -0
  214. package/dist/src/ui/utils/rewindFileOps.d.ts +9 -0
  215. package/dist/src/ui/utils/rewindFileOps.js +25 -1
  216. package/dist/src/ui/utils/rewindFileOps.js.map +1 -1
  217. package/dist/src/ui/utils/rewindFileOps.test.js +94 -1
  218. package/dist/src/ui/utils/rewindFileOps.test.js.map +1 -1
  219. package/dist/src/ui/utils/terminalCapabilityManager.js +7 -0
  220. package/dist/src/ui/utils/terminalCapabilityManager.js.map +1 -1
  221. package/dist/src/ui/utils/terminalCapabilityManager.stdin-flow.test.d.ts +6 -0
  222. package/dist/src/ui/utils/terminalCapabilityManager.stdin-flow.test.js +105 -0
  223. package/dist/src/ui/utils/terminalCapabilityManager.stdin-flow.test.js.map +1 -0
  224. package/dist/src/utils/commentJson.js +66 -5
  225. package/dist/src/utils/commentJson.js.map +1 -1
  226. package/dist/src/utils/commentJson.test.js +21 -0
  227. package/dist/src/utils/commentJson.test.js.map +1 -1
  228. package/dist/src/utils/handleAutoUpdate.test.js +2 -2
  229. package/dist/src/utils/persistentState.js +84 -15
  230. package/dist/src/utils/persistentState.js.map +1 -1
  231. package/dist/src/utils/persistentState.test.js +66 -9
  232. package/dist/src/utils/persistentState.test.js.map +1 -1
  233. package/dist/src/utils/persistentStateRecovery.test.d.ts +6 -0
  234. package/dist/src/utils/persistentStateRecovery.test.js +84 -0
  235. package/dist/src/utils/persistentStateRecovery.test.js.map +1 -0
  236. package/dist/src/utils/processUtils.d.ts +3 -1
  237. package/dist/src/utils/processUtils.js +26 -1
  238. package/dist/src/utils/processUtils.js.map +1 -1
  239. package/dist/src/utils/processUtils.test.js +58 -1
  240. package/dist/src/utils/processUtils.test.js.map +1 -1
  241. package/dist/src/utils/relaunch.js +7 -0
  242. package/dist/src/utils/relaunch.js.map +1 -1
  243. package/dist/src/utils/relaunch.test.js +16 -0
  244. package/dist/src/utils/relaunch.test.js.map +1 -1
  245. package/dist/src/utils/retry.d.ts +22 -0
  246. package/dist/src/utils/retry.js +54 -0
  247. package/dist/src/utils/retry.js.map +1 -0
  248. package/dist/src/utils/retry.test.d.ts +6 -0
  249. package/dist/src/utils/retry.test.js +141 -0
  250. package/dist/src/utils/retry.test.js.map +1 -0
  251. package/dist/src/utils/sandbox-macos-permissive-open.sb +36 -1
  252. package/dist/src/utils/sandbox-macos-permissive-proxied.sb +36 -1
  253. package/dist/src/utils/sandbox-macos-profiles.test.js +93 -0
  254. package/dist/src/utils/sandbox-macos-profiles.test.js.map +1 -1
  255. package/dist/src/utils/sandbox-macos-restrictive-open.sb +39 -1
  256. package/dist/src/utils/sandbox-macos-restrictive-proxied.sb +40 -1
  257. package/dist/src/utils/sandbox-macos-strict-open.sb +38 -2
  258. package/dist/src/utils/sandbox-macos-strict-proxied.sb +38 -2
  259. package/dist/src/utils/sandbox.js +120 -47
  260. package/dist/src/utils/sandbox.js.map +1 -1
  261. package/dist/src/utils/sandbox.test.js +312 -5
  262. package/dist/src/utils/sandbox.test.js.map +1 -1
  263. package/dist/src/utils/sandboxBuiltinProfiles.js +198 -8
  264. package/dist/src/utils/sandboxBuiltinProfiles.js.map +1 -1
  265. package/dist/src/utils/sandboxUtils.d.ts +11 -0
  266. package/dist/src/utils/sandboxUtils.js +150 -2
  267. package/dist/src/utils/sandboxUtils.js.map +1 -1
  268. package/dist/src/utils/sandboxUtils.test.js +257 -3
  269. package/dist/src/utils/sandboxUtils.test.js.map +1 -1
  270. package/dist/src/utils/sessionUtils.d.ts +21 -1
  271. package/dist/src/utils/sessionUtils.js +66 -2
  272. package/dist/src/utils/sessionUtils.js.map +1 -1
  273. package/dist/src/utils/sessionUtils.test.js +143 -0
  274. package/dist/src/utils/sessionUtils.test.js.map +1 -1
  275. package/dist/tsconfig.tsbuildinfo +1 -1
  276. package/package.json +3 -3
@@ -3,7 +3,7 @@
3
3
  * Copyright 2026 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { AuthType, MCPServerConfig, debugLogger, startupProfiler, convertSessionToClientHistory, createPolicyUpdater, } from '@google/gemini-cli-core';
6
+ import { AuthType, MCPServerConfig, debugLogger, startupProfiler, convertSessionToClientHistory, createPolicyUpdater, Storage, } from '@google/gemini-cli-core';
7
7
  import * as acp from '@agentclientprotocol/sdk';
8
8
  import { randomUUID } from 'node:crypto';
9
9
  import { loadSettings } from '../config/settings.js';
@@ -31,10 +31,16 @@ export class AcpSessionManager {
31
31
  getSession(sessionId) {
32
32
  return this.sessions.get(sessionId);
33
33
  }
34
- dispose() {
35
- for (const session of this.sessions.values()) {
36
- session.dispose();
37
- }
34
+ async dispose() {
35
+ const disposePromises = Array.from(this.sessions.entries()).map(async ([sessionId, session]) => {
36
+ try {
37
+ await session.dispose();
38
+ }
39
+ catch (err) {
40
+ debugLogger.error(`Error disposing session ${sessionId}: ${err}`);
41
+ }
42
+ });
43
+ await Promise.all(disposePromises);
38
44
  this.sessions.clear();
39
45
  }
40
46
  async newSession({ cwd, mcpServers }, authDetails) {
@@ -66,75 +72,149 @@ export class AcpSessionManager {
66
72
  debugLogger.error(`Authentication failed: ${e instanceof Error ? e.stack : e}`);
67
73
  }
68
74
  if (!isAuthenticated) {
75
+ try {
76
+ await config?.dispose?.();
77
+ }
78
+ catch (disposeError) {
79
+ debugLogger.error(`Error disposing config: ${disposeError}`);
80
+ }
69
81
  throw new acp.RequestError(-32000, authErrorMessage || 'Authentication required.');
70
82
  }
71
- if (this.clientCapabilities?.fs) {
72
- const acpFileSystemService = new AcpFileSystemService(this.connection, sessionId, this.clientCapabilities.fs, config.getFileSystemService(), cwd);
73
- config.setFileSystemService(acpFileSystemService);
83
+ let session;
84
+ try {
85
+ if (this.clientCapabilities?.fs) {
86
+ const acpFileSystemService = new AcpFileSystemService(this.connection, sessionId, this.clientCapabilities.fs, config.getFileSystemService(), cwd);
87
+ config.setFileSystemService(acpFileSystemService);
88
+ }
89
+ await config.initialize();
90
+ startupProfiler.flush(config);
91
+ startAutoMemoryIfEnabled(config);
92
+ const geminiClient = config.getGeminiClient();
93
+ const chat = geminiClient.isInitialized?.()
94
+ ? geminiClient.getChat()
95
+ : await geminiClient.startChat();
96
+ session = new Session(sessionId, chat, config, this.connection, this.settings);
97
+ this.sessions.set(sessionId, session);
98
+ const { availableModels, currentModelId } = buildAvailableModels(config, loadedSettings);
99
+ const response = {
100
+ sessionId,
101
+ modes: {
102
+ availableModes: buildAvailableModes(config.isPlanEnabled()),
103
+ currentModeId: config.getApprovalMode(),
104
+ },
105
+ models: {
106
+ availableModels,
107
+ currentModelId,
108
+ },
109
+ };
110
+ setTimeout(() => {
111
+ session?.sendAvailableCommands().catch((err) => {
112
+ debugLogger.error(`Error sending available commands: ${err}`);
113
+ });
114
+ }, 0);
115
+ return response;
116
+ }
117
+ catch (error) {
118
+ if (session) {
119
+ this.sessions.delete(sessionId);
120
+ try {
121
+ await session.dispose();
122
+ }
123
+ catch (disposeError) {
124
+ debugLogger.error(`Error disposing session in newSession: ${disposeError}`);
125
+ }
126
+ }
127
+ else if (config) {
128
+ try {
129
+ await config.dispose?.();
130
+ }
131
+ catch (disposeError) {
132
+ debugLogger.error(`Error disposing config in newSession: ${disposeError}`);
133
+ }
134
+ }
135
+ throw error;
74
136
  }
75
- await config.initialize();
76
- startupProfiler.flush(config);
77
- startAutoMemoryIfEnabled(config);
78
- const geminiClient = config.getGeminiClient();
79
- const chat = await geminiClient.startChat();
80
- const session = new Session(sessionId, chat, config, this.connection, this.settings);
81
- this.sessions.set(sessionId, session);
82
- setTimeout(() => {
83
- // eslint-disable-next-line @typescript-eslint/no-floating-promises
84
- session.sendAvailableCommands();
85
- }, 0);
86
- const { availableModels, currentModelId } = buildAvailableModels(config, loadedSettings);
87
- const response = {
88
- sessionId,
89
- modes: {
90
- availableModes: buildAvailableModes(config.isPlanEnabled()),
91
- currentModeId: config.getApprovalMode(),
92
- },
93
- models: {
94
- availableModels,
95
- currentModelId,
96
- },
97
- };
98
- return response;
99
137
  }
100
138
  async loadSession({ sessionId, cwd, mcpServers }, authDetails) {
101
- const config = await this.initializeSessionConfig(sessionId, cwd, mcpServers, authDetails);
102
- const sessionSelector = new SessionSelector(config.storage);
103
- const { sessionData, sessionPath } = await sessionSelector.resolveSession(sessionId);
104
- const clientHistory = convertSessionToClientHistory(sessionData.messages);
105
- const geminiClient = config.getGeminiClient();
106
- await geminiClient.initialize();
107
- await geminiClient.resumeChat(clientHistory, {
108
- conversation: sessionData,
109
- filePath: sessionPath,
110
- });
111
- const session = new Session(sessionId, geminiClient.getChat(), config, this.connection, this.settings);
139
+ if (!/^[a-zA-Z0-9-_]+$/.test(sessionId)) {
140
+ throw new acp.RequestError(-32602, 'Invalid session identifier format.');
141
+ }
142
+ const storage = new Storage(cwd);
143
+ await storage.initialize();
144
+ const sessionSelector = new SessionSelector(storage);
145
+ const { sessionData, sessionPath } = await sessionSelector.resolveSession(sessionId, { allowEmpty: true });
112
146
  const existingSession = this.sessions.get(sessionId);
113
147
  if (existingSession) {
114
- existingSession.dispose();
148
+ try {
149
+ await existingSession.dispose();
150
+ }
151
+ catch (err) {
152
+ debugLogger.error(`Error disposing existing session ${sessionId}: ${err}`);
153
+ }
154
+ finally {
155
+ this.sessions.delete(sessionId);
156
+ }
157
+ }
158
+ let config;
159
+ let session;
160
+ try {
161
+ config = await this.prepareSessionConfig(sessionId, cwd, mcpServers, authDetails);
162
+ await config.initialize();
163
+ startupProfiler.flush(config);
164
+ startAutoMemoryIfEnabled(config);
165
+ const messages = sessionData.messages ?? [];
166
+ const clientHistory = convertSessionToClientHistory(messages);
167
+ const geminiClient = config.getGeminiClient();
168
+ await geminiClient.resumeChat(clientHistory, {
169
+ conversation: sessionData,
170
+ filePath: sessionPath,
171
+ });
172
+ session = new Session(sessionId, geminiClient.getChat(), config, this.connection, this.settings);
173
+ this.sessions.set(sessionId, session);
174
+ const { availableModels, currentModelId } = buildAvailableModels(config, this.settings);
175
+ const response = {
176
+ modes: {
177
+ availableModes: buildAvailableModes(config.isPlanEnabled()),
178
+ currentModeId: config.getApprovalMode(),
179
+ },
180
+ models: {
181
+ availableModels,
182
+ currentModelId,
183
+ },
184
+ };
185
+ // Stream history back to client
186
+ session.streamHistory(messages).catch((err) => {
187
+ debugLogger.error(`Error streaming history: ${err}`);
188
+ });
189
+ setTimeout(() => {
190
+ session?.sendAvailableCommands().catch((err) => {
191
+ debugLogger.error(`Error sending available commands: ${err}`);
192
+ });
193
+ }, 0);
194
+ return response;
195
+ }
196
+ catch (error) {
197
+ if (session) {
198
+ this.sessions.delete(sessionId);
199
+ try {
200
+ await session.dispose();
201
+ }
202
+ catch (disposeError) {
203
+ debugLogger.error(`Error disposing session in loadSession: ${disposeError}`);
204
+ }
205
+ }
206
+ else if (config) {
207
+ try {
208
+ await config.dispose?.();
209
+ }
210
+ catch (disposeError) {
211
+ debugLogger.error(`Error disposing config: ${disposeError}`);
212
+ }
213
+ }
214
+ throw error;
115
215
  }
116
- this.sessions.set(sessionId, session);
117
- // Stream history back to client
118
- // eslint-disable-next-line @typescript-eslint/no-floating-promises
119
- session.streamHistory(sessionData.messages);
120
- setTimeout(() => {
121
- // eslint-disable-next-line @typescript-eslint/no-floating-promises
122
- session.sendAvailableCommands();
123
- }, 0);
124
- const { availableModels, currentModelId } = buildAvailableModels(config, this.settings);
125
- const response = {
126
- modes: {
127
- availableModes: buildAvailableModes(config.isPlanEnabled()),
128
- currentModeId: config.getApprovalMode(),
129
- },
130
- models: {
131
- availableModels,
132
- currentModelId,
133
- },
134
- };
135
- return response;
136
216
  }
137
- async initializeSessionConfig(sessionId, cwd, mcpServers, authDetails) {
217
+ async prepareSessionConfig(sessionId, cwd, mcpServers, authDetails) {
138
218
  const selectedAuthType = this.settings.merged.security.auth.selectedType ||
139
219
  (authDetails.baseUrl || process.env['GOOGLE_GEMINI_BASE_URL']
140
220
  ? AuthType.GATEWAY
@@ -154,18 +234,30 @@ export class AcpSessionManager {
154
234
  }
155
235
  catch (e) {
156
236
  debugLogger.error(`Authentication failed: ${e}`);
237
+ try {
238
+ await config?.dispose?.();
239
+ }
240
+ catch (disposeError) {
241
+ debugLogger.error(`Error disposing config: ${disposeError}`);
242
+ }
157
243
  throw acp.RequestError.authRequired();
158
244
  }
159
245
  // 3. Set the ACP FileSystemService (if supported) before config initialization
160
- if (this.clientCapabilities?.fs) {
161
- const acpFileSystemService = new AcpFileSystemService(this.connection, sessionId, this.clientCapabilities.fs, config.getFileSystemService(), cwd);
162
- config.setFileSystemService(acpFileSystemService);
246
+ try {
247
+ if (this.clientCapabilities?.fs) {
248
+ const acpFileSystemService = new AcpFileSystemService(this.connection, sessionId, this.clientCapabilities.fs, config.getFileSystemService(), cwd);
249
+ config.setFileSystemService(acpFileSystemService);
250
+ }
251
+ }
252
+ catch (e) {
253
+ try {
254
+ await config?.dispose?.();
255
+ }
256
+ catch (disposeError) {
257
+ debugLogger.error(`Error disposing config: ${disposeError}`);
258
+ }
259
+ throw e;
163
260
  }
164
- // 4. Now that we are authenticated, it is safe to initialize the config
165
- // which starts the MCP servers and other heavy resources.
166
- await config.initialize();
167
- startupProfiler.flush(config);
168
- startAutoMemoryIfEnabled(config);
169
261
  return config;
170
262
  }
171
263
  async newSessionConfig(sessionId, cwd, mcpServers, loadedSettings) {
@@ -1 +1 @@
1
- {"version":3,"file":"acpSessionManager.js","sourceRoot":"","sources":["../../../src/acp/acpSessionManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"acpSessionManager.js","sourceRoot":"","sources":["../../../src/acp/acpSessionManager.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,11 @@
5
5
  */
6
6
  import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
7
7
  import { AcpSessionManager } from './acpSessionManager.js';
8
- import { AuthType, GEMINI_MODEL_ALIAS_AUTO, } from '@google/gemini-cli-core';
8
+ import * as fs from 'node:fs/promises';
9
+ import * as path from 'node:path';
10
+ import * as os from 'node:os';
11
+ import * as acp from '@agentclientprotocol/sdk';
12
+ import { AuthType, CoreEvent, coreEvents, GEMINI_MODEL_ALIAS_AUTO, Storage, } from '@google/gemini-cli-core';
9
13
  import { loadCliConfig } from '../config/config.js';
10
14
  import { loadSettings } from '../config/settings.js';
11
15
  vi.mock('../config/config.js', () => ({
@@ -32,6 +36,7 @@ describe('AcpSessionManager', () => {
32
36
  mockConfig = {
33
37
  refreshAuth: vi.fn(),
34
38
  initialize: vi.fn(),
39
+ dispose: vi.fn(),
35
40
  waitForMcpInit: vi.fn(),
36
41
  getFileSystemService: vi.fn(),
37
42
  setFileSystemService: vi.fn(),
@@ -40,6 +45,8 @@ describe('AcpSessionManager', () => {
40
45
  getModel: vi.fn().mockReturnValue('gemini-pro'),
41
46
  getGeminiClient: vi.fn().mockReturnValue({
42
47
  startChat: vi.fn().mockResolvedValue({}),
48
+ resumeChat: vi.fn().mockResolvedValue(undefined),
49
+ getChat: vi.fn().mockReturnValue({}),
43
50
  }),
44
51
  getMessageBus: vi.fn().mockReturnValue({
45
52
  publish: vi.fn(),
@@ -279,5 +286,201 @@ describe('AcpSessionManager', () => {
279
286
  }, {});
280
287
  expect(startAutoMemoryIfEnabledMock).toHaveBeenCalledWith(mockConfig);
281
288
  });
289
+ it('should successfully load an ACP session created by newSession without resumable content filters', async () => {
290
+ const testDir = await fs.mkdtemp(path.join(os.tmpdir(), 'acp-load-test-'));
291
+ const sessionId = 'test-session-uuid-123';
292
+ const storage = new Storage(testDir, sessionId);
293
+ await storage.initialize();
294
+ const chatsDir = path.join(storage.getProjectTempDir(), 'chats');
295
+ await fs.mkdir(chatsDir, { recursive: true });
296
+ // Initial header written by ChatRecordingService on newSession (hasResumableContent is false)
297
+ const initialRecord = {
298
+ sessionId,
299
+ projectHash: 'test-hash',
300
+ startTime: new Date().toISOString(),
301
+ lastUpdated: new Date().toISOString(),
302
+ kind: 'main',
303
+ messages: [],
304
+ };
305
+ await fs.writeFile(path.join(chatsDir, `session-2026-09-30-${sessionId.slice(0, 8)}.jsonl`), JSON.stringify(initialRecord) + '\n');
306
+ const response = await manager.loadSession({
307
+ sessionId,
308
+ cwd: testDir,
309
+ mcpServers: [],
310
+ }, {});
311
+ expect(response).toBeDefined();
312
+ expect(response.modes).toBeDefined();
313
+ expect(response.models).toBeDefined();
314
+ expect(mockConfig.getGeminiClient().resumeChat).toHaveBeenCalledWith([], expect.objectContaining({
315
+ conversation: expect.objectContaining({ sessionId }),
316
+ }));
317
+ });
318
+ it('should successfully load an ACP session with conversational content', async () => {
319
+ const testDir = await fs.mkdtemp(path.join(os.tmpdir(), 'acp-load-chat-'));
320
+ const sessionId = 'test-session-with-chat';
321
+ const storage = new Storage(testDir, sessionId);
322
+ await storage.initialize();
323
+ const chatsDir = path.join(storage.getProjectTempDir(), 'chats');
324
+ await fs.mkdir(chatsDir, { recursive: true });
325
+ const sessionRecord = {
326
+ sessionId,
327
+ projectHash: 'test-hash',
328
+ startTime: new Date().toISOString(),
329
+ lastUpdated: new Date().toISOString(),
330
+ kind: 'main',
331
+ messages: [
332
+ { type: 'user', content: 'hello' },
333
+ { type: 'gemini', content: 'world' },
334
+ ],
335
+ };
336
+ await fs.writeFile(path.join(chatsDir, `session-2026-09-30-${sessionId.slice(0, 8)}.jsonl`), JSON.stringify(sessionRecord) + '\n');
337
+ const response = await manager.loadSession({
338
+ sessionId,
339
+ cwd: testDir,
340
+ mcpServers: [],
341
+ }, {});
342
+ expect(response).toBeDefined();
343
+ expect(mockConfig.getGeminiClient().resumeChat).toHaveBeenCalled();
344
+ });
345
+ it('should reject loading an invalid session identifier without leaking event listeners', async () => {
346
+ const testDir = await fs.mkdtemp(path.join(os.tmpdir(), 'acp-load-invalid-'));
347
+ const initialListenerCount = coreEvents.listenerCount(CoreEvent.ModelChanged);
348
+ // Call loadSession with an invalid/non-existent session ID 15 times
349
+ for (let i = 0; i < 15; i++) {
350
+ await expect(manager.loadSession({
351
+ sessionId: `non-existent-id-${i}`,
352
+ cwd: testDir,
353
+ mcpServers: [],
354
+ }, {})).rejects.toThrow('Invalid session identifier');
355
+ }
356
+ // Verify no listeners were leaked
357
+ expect(coreEvents.listenerCount(CoreEvent.ModelChanged)).toBe(initialListenerCount);
358
+ });
359
+ it('should reject loading a session identifier containing path traversal without performing file operations', async () => {
360
+ const testDir = await fs.mkdtemp(path.join(os.tmpdir(), 'acp-load-traversal-'));
361
+ await expect(manager.loadSession({
362
+ sessionId: '../../evil',
363
+ cwd: testDir,
364
+ mcpServers: [],
365
+ }, {})).rejects.toSatisfy((error) => {
366
+ expect(error).toBeInstanceOf(acp.RequestError);
367
+ expect(error.code).toBe(-32602);
368
+ expect(error.message).toBe('Invalid session identifier format.');
369
+ return true;
370
+ });
371
+ await expect(manager.loadSession({
372
+ sessionId: 'path/with/slash',
373
+ cwd: testDir,
374
+ mcpServers: [],
375
+ }, {})).rejects.toThrow('Invalid session identifier format.');
376
+ await expect(manager.loadSession({
377
+ sessionId: 'path\\with\\backslash',
378
+ cwd: testDir,
379
+ mcpServers: [],
380
+ }, {})).rejects.toThrow('Invalid session identifier format.');
381
+ });
382
+ it('should dispose an existing session before initializing new config when reloading a session', async () => {
383
+ const testDir = await fs.mkdtemp(path.join(os.tmpdir(), 'acp-reload-test-'));
384
+ const sessionId = 'test-session-reload-123';
385
+ const storage = new Storage(testDir, sessionId);
386
+ await storage.initialize();
387
+ const chatsDir = path.join(storage.getProjectTempDir(), 'chats');
388
+ await fs.mkdir(chatsDir, { recursive: true });
389
+ const sessionRecord = {
390
+ sessionId,
391
+ projectHash: 'test-hash',
392
+ startTime: new Date().toISOString(),
393
+ lastUpdated: new Date().toISOString(),
394
+ kind: 'main',
395
+ messages: [{ type: 'user', content: 'hello' }],
396
+ };
397
+ await fs.writeFile(path.join(chatsDir, `session-2026-09-30-${sessionId.slice(0, 8)}.jsonl`), JSON.stringify(sessionRecord) + '\n');
398
+ // First load
399
+ await manager.loadSession({
400
+ sessionId,
401
+ cwd: testDir,
402
+ mcpServers: [],
403
+ }, {});
404
+ const firstSession = manager.getSession(sessionId);
405
+ expect(firstSession).toBeDefined();
406
+ const disposeSpy = vi.spyOn(firstSession, 'dispose');
407
+ // Second load with the same sessionId
408
+ await manager.loadSession({
409
+ sessionId,
410
+ cwd: testDir,
411
+ mcpServers: [],
412
+ }, {});
413
+ expect(disposeSpy).toHaveBeenCalledTimes(1);
414
+ const secondSession = manager.getSession(sessionId);
415
+ expect(secondSession).toBeDefined();
416
+ expect(secondSession).not.toBe(firstSession);
417
+ });
418
+ it('should dispose config when newSession initialization fails', async () => {
419
+ mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
420
+ apiKey: 'test-key',
421
+ });
422
+ mockConfig.initialize = vi.fn().mockRejectedValue(new Error('Init failed'));
423
+ await expect(manager.newSession({
424
+ cwd: '/tmp',
425
+ mcpServers: [],
426
+ }, {})).rejects.toThrow('Init failed');
427
+ expect(mockConfig.dispose).toHaveBeenCalled();
428
+ });
429
+ it('should await session disposals and clear sessions on dispose', async () => {
430
+ mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
431
+ apiKey: 'test-key',
432
+ });
433
+ const response = await manager.newSession({
434
+ cwd: '/tmp',
435
+ mcpServers: [],
436
+ }, {});
437
+ const session = manager.getSession(response.sessionId);
438
+ expect(session).toBeDefined();
439
+ const disposeSpy = vi.spyOn(session, 'dispose');
440
+ await manager.dispose();
441
+ expect(disposeSpy).toHaveBeenCalledTimes(1);
442
+ expect(manager.getSession(response.sessionId)).toBeUndefined();
443
+ });
444
+ it('should dispose session and remove from manager when newSession fails after session instantiation', async () => {
445
+ mockConfig.getContentGeneratorConfig = vi.fn().mockReturnValue({
446
+ apiKey: 'test-key',
447
+ });
448
+ mockConfig.getModel = vi.fn().mockImplementation(() => {
449
+ throw new Error('Post-session failure');
450
+ });
451
+ await expect(manager.newSession({
452
+ cwd: '/tmp',
453
+ mcpServers: [],
454
+ }, {})).rejects.toThrow('Post-session failure');
455
+ expect(mockConfig.dispose).toHaveBeenCalled();
456
+ expect(manager.getSession('test-session-id')).toBeUndefined();
457
+ });
458
+ it('should dispose session and remove from manager when loadSession fails after session instantiation', async () => {
459
+ const testDir = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-test-'));
460
+ const sessionId = '11111111-2222-3333-4444-555555555555';
461
+ const storage = new Storage(testDir);
462
+ await storage.initialize();
463
+ const chatsDir = path.join(storage.getProjectTempDir(), 'chats');
464
+ await fs.mkdir(chatsDir, { recursive: true });
465
+ const sessionRecord = {
466
+ sessionId,
467
+ projectHash: 'test-hash',
468
+ startTime: new Date().toISOString(),
469
+ lastUpdated: new Date().toISOString(),
470
+ kind: 'main',
471
+ messages: [{ type: 'user', content: 'hello' }],
472
+ };
473
+ await fs.writeFile(path.join(chatsDir, `session-2026-09-30-${sessionId.slice(0, 8)}.jsonl`), JSON.stringify(sessionRecord) + '\n');
474
+ mockConfig.getModel = vi.fn().mockImplementation(() => {
475
+ throw new Error('Post-session load failure');
476
+ });
477
+ await expect(manager.loadSession({
478
+ sessionId,
479
+ cwd: testDir,
480
+ mcpServers: [],
481
+ }, {})).rejects.toThrow('Post-session load failure');
482
+ expect(mockConfig.dispose).toHaveBeenCalled();
483
+ expect(manager.getSession(sessionId)).toBeUndefined();
484
+ });
282
485
  });
283
486
  //# sourceMappingURL=acpSessionManager.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"acpSessionManager.test.js","sourceRoot":"","sources":["../../../src/acp/acpSessionManager.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"acpSessionManager.test.js","sourceRoot":"","sources":["../../../src/acp/acpSessionManager.test.ts"],"names":[],"mappings":"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"}
@@ -208,7 +208,8 @@ export function buildAvailableModels(config, settings) {
208
208
  const preferredModel = config.getModel() || GEMINI_MODEL_ALIAS_AUTO;
209
209
  const shouldShowPreviewModels = config.getHasAccessToPreviewModel();
210
210
  const useGemini31 = config.getGemini31LaunchedSync?.() ?? false;
211
- const useGemini3_5Flash = config.hasGemini35FlashGAAccess?.() ?? false;
211
+ const useLatestFlash = config.hasLatestFlashGAAccess?.() ?? false;
212
+ const useLatestFlashLite = config.hasLatestFlashLiteGAAccess?.() ?? false;
212
213
  const selectedAuthType = settings.merged.security.auth.selectedType;
213
214
  const useCustomToolModel = useGemini31 && selectedAuthType === AuthType.USE_GEMINI;
214
215
  // --- DYNAMIC PATH ---
@@ -216,7 +217,8 @@ export function buildAvailableModels(config, settings) {
216
217
  config.getModelConfigService) {
217
218
  const options = config.getModelConfigService().getAvailableModelOptions({
218
219
  useGemini3_1: useGemini31,
219
- useGemini3_5Flash,
220
+ useLatestFlash,
221
+ useLatestFlashLite,
220
222
  useCustomTools: useCustomToolModel,
221
223
  hasAccessToPreview: shouldShowPreviewModels,
222
224
  });
@@ -230,7 +232,7 @@ export function buildAvailableModels(config, settings) {
230
232
  {
231
233
  value: GEMINI_MODEL_ALIAS_AUTO,
232
234
  title: getDisplayString(GEMINI_MODEL_ALIAS_AUTO),
233
- description: getAutoModelDescription(shouldShowPreviewModels, useGemini31, useGemini3_5Flash),
235
+ description: getAutoModelDescription(shouldShowPreviewModels, useGemini31, useLatestFlash),
234
236
  },
235
237
  ];
236
238
  const manualOptions = [