@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
@@ -7,9 +7,9 @@ import { ExtensionUpdateState, } from '../../ui/state/extensions.js';
7
7
  import { loadInstallMetadata } from '../extension.js';
8
8
  import { checkForExtensionUpdate } from './github.js';
9
9
  import { debugLogger, getErrorMessage, IntegrityDataStatus, } from '@google/gemini-cli-core';
10
- import * as fs from 'node:fs';
11
10
  import { copyExtension } from '../extension-manager.js';
12
11
  import { ExtensionStorage } from './storage.js';
12
+ import { removeDirectoryWithRetry } from '../../utils/retry.js';
13
13
  export async function updateExtension(extension, extensionManager, currentState, dispatchExtensionStateUpdate, enableExtensionReloading) {
14
14
  if (currentState === ExtensionUpdateState.UPDATING) {
15
15
  return undefined;
@@ -98,7 +98,12 @@ export async function updateExtension(extension, extensionManager, currentState,
98
98
  throw e;
99
99
  }
100
100
  finally {
101
- await fs.promises.rm(tempDir, { recursive: true, force: true });
101
+ try {
102
+ await removeDirectoryWithRetry(tempDir);
103
+ }
104
+ catch (cleanupError) {
105
+ debugLogger.warn(`Failed to clean up temp directory ${tempDir}: ${getErrorMessage(cleanupError)}`);
106
+ }
102
107
  }
103
108
  }
104
109
  export async function updateAllUpdatableExtensions(extensions, extensionsState, extensionManager, dispatch, enableExtensionReloading) {
@@ -1 +1 @@
1
- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/config/extensions/update.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/config/extensions/update.ts"],"names":[],"mappings":"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"}
@@ -137,6 +137,19 @@ describe('Extension Update Logic', () => {
137
137
  force: true,
138
138
  });
139
139
  });
140
+ it('should succeed when tempDir removal transiently fails with EBUSY on Windows', async () => {
141
+ const ebusyError = Object.assign(new Error("EBUSY: resource busy or locked, rmdir '/tmp/mock-dir'"), { code: 'EBUSY' });
142
+ vi.mocked(fs.promises.rm)
143
+ .mockRejectedValueOnce(ebusyError)
144
+ .mockResolvedValueOnce(undefined);
145
+ const result = await updateExtension(mockExtension, mockExtensionManager, ExtensionUpdateState.UPDATE_AVAILABLE, mockDispatch);
146
+ expect(result).toEqual({
147
+ name: 'test-extension',
148
+ originalVersion: '1.0.0',
149
+ updatedVersion: '1.1.0',
150
+ });
151
+ expect(fs.promises.rm).toHaveBeenCalledTimes(2);
152
+ });
140
153
  it('should migrate source if migratedTo is set and an update is available', async () => {
141
154
  vi.mocked(mockExtensionManager.loadExtensionConfig).mockReturnValue(Promise.resolve({
142
155
  name: 'test-extension',
@@ -196,6 +209,14 @@ describe('Extension Update Logic', () => {
196
209
  });
197
210
  expect(fs.promises.rm).toHaveBeenCalled();
198
211
  });
212
+ it('should not mask primary update error if tempDir cleanup fails in finally', async () => {
213
+ vi.mocked(mockExtensionManager.installOrUpdateExtension).mockRejectedValueOnce(new Error('Install failed'));
214
+ const cleanupError = Object.assign(new Error('EACCES: permission denied'), {
215
+ code: 'EACCES',
216
+ });
217
+ vi.mocked(fs.promises.rm).mockRejectedValueOnce(cleanupError);
218
+ await expect(updateExtension(mockExtension, mockExtensionManager, ExtensionUpdateState.UPDATE_AVAILABLE, mockDispatch)).rejects.toThrow('Updated extension not found after installation');
219
+ });
199
220
  describe('Integrity Verification', () => {
200
221
  it('should fail update with security alert if integrity is invalid', async () => {
201
222
  vi.mocked(mockExtensionManager.verifyExtensionIntegrity).mockResolvedValue(IntegrityDataStatus.INVALID);
@@ -1 +1 @@
1
- {"version":3,"file":"update.test.js","sourceRoot":"","sources":["../../../../src/config/extensions/update.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update.test.js","sourceRoot":"","sources":["../../../../src/config/extensions/update.test.ts"],"names":[],"mappings":"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"}
@@ -93,6 +93,7 @@ export declare class McpServerEnablementManager {
93
93
  /**
94
94
  * Check if server is enabled in FILE (persistent config only).
95
95
  * Does NOT include session state.
96
+ * Fails closed (`false`) if the config file exists on disk but cannot be read or parsed.
96
97
  */
97
98
  isFileEnabled(serverName: string): Promise<boolean>;
98
99
  /**
@@ -107,11 +108,13 @@ export declare class McpServerEnablementManager {
107
108
  /**
108
109
  * Enable a server persistently.
109
110
  * Removes the server from config file (defaults to enabled).
111
+ * Does not overwrite the config file if existing contents cannot be read or parsed.
110
112
  */
111
113
  enable(serverName: string): Promise<void>;
112
114
  /**
113
115
  * Disable a server persistently.
114
116
  * Adds server to config file with enabled: false.
117
+ * Does not overwrite the config file if existing contents cannot be read or parsed.
115
118
  */
116
119
  disable(serverName: string): Promise<void>;
117
120
  /**
@@ -141,6 +144,8 @@ export declare class McpServerEnablementManager {
141
144
  autoEnableServers(serverNames: string[]): Promise<string[]>;
142
145
  /**
143
146
  * Read config from file asynchronously.
147
+ * Returns `{}` if the file does not exist (`ENOENT`), or `null` if the file
148
+ * cannot be read or parsed as a valid JSON object.
144
149
  */
145
150
  private readConfig;
146
151
  /**
@@ -138,9 +138,13 @@ export class McpServerEnablementManager {
138
138
  /**
139
139
  * Check if server is enabled in FILE (persistent config only).
140
140
  * Does NOT include session state.
141
+ * Fails closed (`false`) if the config file exists on disk but cannot be read or parsed.
141
142
  */
142
143
  async isFileEnabled(serverName) {
143
144
  const config = await this.readConfig();
145
+ if (!config) {
146
+ return false;
147
+ }
144
148
  const state = config[normalizeServerId(serverName)];
145
149
  return state?.enabled ?? true;
146
150
  }
@@ -163,10 +167,14 @@ export class McpServerEnablementManager {
163
167
  /**
164
168
  * Enable a server persistently.
165
169
  * Removes the server from config file (defaults to enabled).
170
+ * Does not overwrite the config file if existing contents cannot be read or parsed.
166
171
  */
167
172
  async enable(serverName) {
168
173
  const normalizedName = normalizeServerId(serverName);
169
174
  const config = await this.readConfig();
175
+ if (!config) {
176
+ return;
177
+ }
170
178
  if (normalizedName in config) {
171
179
  delete config[normalizedName];
172
180
  await this.writeConfig(config);
@@ -175,9 +183,13 @@ export class McpServerEnablementManager {
175
183
  /**
176
184
  * Disable a server persistently.
177
185
  * Adds server to config file with enabled: false.
186
+ * Does not overwrite the config file if existing contents cannot be read or parsed.
178
187
  */
179
188
  async disable(serverName) {
180
189
  const config = await this.readConfig();
190
+ if (!config) {
191
+ return;
192
+ }
181
193
  config[normalizeServerId(serverName)] = { enabled: false };
182
194
  await this.writeConfig(config);
183
195
  }
@@ -237,7 +249,9 @@ export class McpServerEnablementManager {
237
249
  let wasDisabled = false;
238
250
  if (state.isPersistentDisabled) {
239
251
  await this.enable(normalizedName);
240
- wasDisabled = true;
252
+ if (await this.isFileEnabled(normalizedName)) {
253
+ wasDisabled = true;
254
+ }
241
255
  }
242
256
  if (state.isSessionDisabled) {
243
257
  this.clearSessionDisable(normalizedName);
@@ -251,12 +265,21 @@ export class McpServerEnablementManager {
251
265
  }
252
266
  /**
253
267
  * Read config from file asynchronously.
268
+ * Returns `{}` if the file does not exist (`ENOENT`), or `null` if the file
269
+ * cannot be read or parsed as a valid JSON object.
254
270
  */
255
271
  async readConfig() {
256
272
  try {
257
273
  const content = await fs.readFile(this.configFilePath, 'utf-8');
274
+ const parsed = JSON.parse(content);
275
+ if (typeof parsed !== 'object' ||
276
+ parsed === null ||
277
+ Array.isArray(parsed)) {
278
+ coreEvents.emitFeedback('error', 'Failed to read MCP server enablement config.', new Error('MCP server enablement config must be a JSON object.'));
279
+ return null;
280
+ }
258
281
  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
259
- return JSON.parse(content);
282
+ return parsed;
260
283
  }
261
284
  catch (error) {
262
285
  if (error instanceof Error &&
@@ -265,7 +288,7 @@ export class McpServerEnablementManager {
265
288
  return {};
266
289
  }
267
290
  coreEvents.emitFeedback('error', 'Failed to read MCP server enablement config.', error);
268
- return {};
291
+ return null;
269
292
  }
270
293
  }
271
294
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"mcpServerEnablement.js","sourceRoot":"","sources":["../../../../src/config/mcp/mcpServerEnablement.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mcpServerEnablement.js","sourceRoot":"","sources":["../../../../src/config/mcp/mcpServerEnablement.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
6
  import fs from 'node:fs/promises';
7
+ import path from 'node:path';
7
8
  import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
8
9
  vi.mock('@google/gemini-cli-core', async (importOriginal) => {
9
10
  const actual = await importOriginal();
@@ -88,6 +89,32 @@ describe('McpServerEnablementManager', () => {
88
89
  expect(instance2.isSessionDisabled('test-server')).toBe(true);
89
90
  expect(instance1).toBe(instance2);
90
91
  });
92
+ it('should fail closed and preserve the config file when JSON is malformed', async () => {
93
+ const configPath = path.join('/virtual-home/.cell-cli', 'mcp-server-enablement.json');
94
+ const malformedContent = '{\n "disabled-server": { "enabled": false },\n "truncated": ';
95
+ inMemoryFs[configPath] = malformedContent;
96
+ // 1. isFileEnabled should fail closed (false) rather than defaulting to true
97
+ expect(await manager.isFileEnabled('disabled-server')).toBe(false);
98
+ expect(await manager.isFileEnabled('other-server')).toBe(false);
99
+ // 2. disable() should not overwrite the malformed file
100
+ await manager.disable('another-server');
101
+ expect(inMemoryFs[configPath]).toBe(malformedContent);
102
+ expect(fs.writeFile).not.toHaveBeenCalled();
103
+ // 3. enable() should not overwrite the malformed file
104
+ await manager.enable('disabled-server');
105
+ expect(inMemoryFs[configPath]).toBe(malformedContent);
106
+ expect(fs.writeFile).not.toHaveBeenCalled();
107
+ // 4. autoEnableServers() should not report persistent-disabled servers as enabled when file cannot be updated
108
+ expect(await manager.autoEnableServers(['disabled-server'])).toEqual([]);
109
+ });
110
+ it('should fail closed and preserve the config file when JSON root is not a plain object', async () => {
111
+ const configPath = path.join('/virtual-home/.cell-cli', 'mcp-server-enablement.json');
112
+ inMemoryFs[configPath] = '["not-an-object"]';
113
+ expect(await manager.isFileEnabled('server')).toBe(false);
114
+ await manager.disable('server');
115
+ expect(inMemoryFs[configPath]).toBe('["not-an-object"]');
116
+ expect(fs.writeFile).not.toHaveBeenCalled();
117
+ });
91
118
  });
92
119
  describe('canLoadServer', () => {
93
120
  it('blocks when admin has disabled MCP', async () => {
@@ -1 +1 @@
1
- {"version":3,"file":"mcpServerEnablement.test.js","sourceRoot":"","sources":["../../../../src/config/mcp/mcpServerEnablement.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mcpServerEnablement.test.js","sourceRoot":"","sources":["../../../../src/config/mcp/mcpServerEnablement.test.ts"],"names":[],"mappings":"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"}
@@ -241,6 +241,28 @@ describe('Settings Loading and Merging', () => {
241
241
  expect(settings[scope].settings).toEqual(expectedScopeSettings);
242
242
  expect(settings.merged).toMatchObject(expectedWithMerged);
243
243
  });
244
+ it('should unconditionally override selectedType when CELL_CLI_AUTH_OVERRIDE is present and delete it from process.env', () => {
245
+ mockFsExistsSync.mockImplementation((pathLike) => path.normalize(pathLike.toString()) ===
246
+ path.normalize(USER_SETTINGS_PATH));
247
+ fs.readFileSync.mockImplementation((pathDesc) => {
248
+ if (path.normalize(pathDesc.toString()) ===
249
+ path.normalize(USER_SETTINGS_PATH)) {
250
+ return JSON.stringify({
251
+ security: {
252
+ auth: {
253
+ selectedType: AuthType.USE_GEMINI,
254
+ },
255
+ },
256
+ });
257
+ }
258
+ return '{}';
259
+ });
260
+ vi.stubEnv('CELL_CLI_AUTH_OVERRIDE', AuthType.LOGIN_WITH_GOOGLE);
261
+ const settings = loadSettings(MOCK_WORKSPACE_DIR);
262
+ expect(settings.user.settings.security?.auth?.selectedType).toBe(AuthType.LOGIN_WITH_GOOGLE);
263
+ expect(settings.merged.security.auth.selectedType).toBe(AuthType.LOGIN_WITH_GOOGLE);
264
+ expect(process.env['CELL_CLI_AUTH_OVERRIDE']).toBeUndefined();
265
+ });
244
266
  it('should merge system, user and workspace settings, with system taking precedence over workspace, and workspace over user', () => {
245
267
  mockFsExistsSync.mockImplementation((p) => {
246
268
  const normP = path.normalize(p.toString());