@machina.ai/cell-cli 1.2.2-rc1 → 1.4.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 (288) hide show
  1. package/dist/index.js +1 -1
  2. package/dist/index.js.map +1 -1
  3. package/dist/package.json +4 -5
  4. package/dist/src/commands/extensions/enable.js +1 -1
  5. package/dist/src/commands/extensions/enable.js.map +1 -1
  6. package/dist/src/commands/extensions/examples/context/GEMINI.md +8 -0
  7. package/dist/src/commands/extensions/examples/context/gemini-extension.json +5 -0
  8. package/dist/src/commands/extensions/examples/custom-commands/commands/fs/grep-code.toml +6 -0
  9. package/dist/src/commands/extensions/examples/custom-commands/gemini-extension.json +4 -0
  10. package/dist/src/commands/extensions/examples/exclude-tools/gemini-extension.json +5 -0
  11. package/dist/src/commands/extensions/examples/mcp-server/example.d.ts +6 -0
  12. package/dist/src/commands/extensions/examples/mcp-server/example.js +46 -0
  13. package/dist/src/commands/extensions/examples/mcp-server/example.js.map +1 -0
  14. package/dist/src/commands/extensions/examples/mcp-server/example.ts +60 -0
  15. package/dist/src/commands/extensions/examples/mcp-server/gemini-extension.json +10 -0
  16. package/dist/src/commands/extensions/install.js +32 -11
  17. package/dist/src/commands/extensions/install.js.map +1 -1
  18. package/dist/src/commands/extensions/install.test.js +5 -2
  19. package/dist/src/commands/extensions/install.test.js.map +1 -1
  20. package/dist/src/commands/extensions/link.d.ts +12 -0
  21. package/dist/src/commands/extensions/link.js +37 -0
  22. package/dist/src/commands/extensions/link.js.map +1 -0
  23. package/dist/src/commands/extensions/new.d.ts +7 -0
  24. package/dist/src/commands/extensions/new.js +70 -0
  25. package/dist/src/commands/extensions/new.js.map +1 -0
  26. package/dist/src/commands/extensions/new.test.d.ts +6 -0
  27. package/dist/src/commands/extensions/new.test.js +50 -0
  28. package/dist/src/commands/extensions/new.test.js.map +1 -0
  29. package/dist/src/commands/extensions/update.js +0 -1
  30. package/dist/src/commands/extensions/update.js.map +1 -1
  31. package/dist/src/commands/extensions.js +4 -0
  32. package/dist/src/commands/extensions.js.map +1 -1
  33. package/dist/src/commands/mcp/add.js +1 -1
  34. package/dist/src/commands/mcp/add.js.map +1 -1
  35. package/dist/src/commands/mcp/list.js +3 -3
  36. package/dist/src/commands/mcp/list.js.map +1 -1
  37. package/dist/src/commands/mcp/remove.js +1 -1
  38. package/dist/src/commands/mcp/remove.js.map +1 -1
  39. package/dist/src/config/auth.js +1 -1
  40. package/dist/src/config/auth.js.map +1 -1
  41. package/dist/src/config/auth.test.js +5 -1
  42. package/dist/src/config/auth.test.js.map +1 -1
  43. package/dist/src/config/config.d.ts +3 -2
  44. package/dist/src/config/config.js +12 -16
  45. package/dist/src/config/config.js.map +1 -1
  46. package/dist/src/config/extension.d.ts +4 -3
  47. package/dist/src/config/extension.js +106 -49
  48. package/dist/src/config/extension.js.map +1 -1
  49. package/dist/src/config/keyBindings.d.ts +1 -0
  50. package/dist/src/config/keyBindings.js +6 -25
  51. package/dist/src/config/keyBindings.js.map +1 -1
  52. package/dist/src/config/sandboxConfig.d.ts +1 -1
  53. package/dist/src/config/sandboxConfig.js +1 -1
  54. package/dist/src/config/sandboxConfig.js.map +1 -1
  55. package/dist/src/config/settings.d.ts +4 -4
  56. package/dist/src/config/settings.js +92 -169
  57. package/dist/src/config/settings.js.map +1 -1
  58. package/dist/src/config/settingsSchema.d.ts +97 -15
  59. package/dist/src/config/settingsSchema.js +95 -14
  60. package/dist/src/config/settingsSchema.js.map +1 -1
  61. package/dist/src/config/trustedFolders.js +15 -8
  62. package/dist/src/config/trustedFolders.js.map +1 -1
  63. package/dist/src/config/trustedFolders.test.js +47 -2
  64. package/dist/src/config/trustedFolders.test.js.map +1 -1
  65. package/dist/src/gemini.d.ts +2 -2
  66. package/dist/src/gemini.js +6 -38
  67. package/dist/src/gemini.js.map +1 -1
  68. package/dist/src/gemini.test.js +2 -30
  69. package/dist/src/gemini.test.js.map +1 -1
  70. package/dist/src/generated/git-commit.d.ts +2 -2
  71. package/dist/src/generated/git-commit.js +2 -2
  72. package/dist/src/nonInteractiveCli.d.ts +1 -1
  73. package/dist/src/nonInteractiveCli.js +1 -1
  74. package/dist/src/nonInteractiveCli.js.map +1 -1
  75. package/dist/src/services/BuiltinCommandLoader.d.ts +1 -1
  76. package/dist/src/services/BuiltinCommandLoader.js +1 -1
  77. package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
  78. package/dist/src/services/BuiltinCommandLoader.test.js +3 -3
  79. package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
  80. package/dist/src/services/FileCommandLoader.d.ts +1 -1
  81. package/dist/src/services/FileCommandLoader.js +1 -1
  82. package/dist/src/services/FileCommandLoader.js.map +1 -1
  83. package/dist/src/services/McpPromptLoader.d.ts +1 -1
  84. package/dist/src/services/McpPromptLoader.js +1 -1
  85. package/dist/src/services/McpPromptLoader.js.map +1 -1
  86. package/dist/src/services/prompt-processors/argumentProcessor.js +1 -1
  87. package/dist/src/services/prompt-processors/argumentProcessor.js.map +1 -1
  88. package/dist/src/services/prompt-processors/atFileProcessor.js +1 -1
  89. package/dist/src/services/prompt-processors/atFileProcessor.js.map +1 -1
  90. package/dist/src/services/prompt-processors/atFileProcessor.test.js +1 -1
  91. package/dist/src/services/prompt-processors/atFileProcessor.test.js.map +1 -1
  92. package/dist/src/services/prompt-processors/shellProcessor.js +1 -1
  93. package/dist/src/services/prompt-processors/shellProcessor.js.map +1 -1
  94. package/dist/src/ui/App.d.ts +1 -1
  95. package/dist/src/ui/App.js +38 -8
  96. package/dist/src/ui/App.js.map +1 -1
  97. package/dist/src/ui/IdeIntegrationNudge.d.ts +1 -1
  98. package/dist/src/ui/IdeIntegrationNudge.js +1 -1
  99. package/dist/src/ui/IdeIntegrationNudge.js.map +1 -1
  100. package/dist/src/ui/commands/aboutCommand.js +9 -3
  101. package/dist/src/ui/commands/aboutCommand.js.map +1 -1
  102. package/dist/src/ui/commands/bugCommand.js +9 -4
  103. package/dist/src/ui/commands/bugCommand.js.map +1 -1
  104. package/dist/src/ui/commands/chatCommand.js +1 -1
  105. package/dist/src/ui/commands/chatCommand.js.map +1 -1
  106. package/dist/src/ui/commands/clearCommand.js +1 -1
  107. package/dist/src/ui/commands/clearCommand.js.map +1 -1
  108. package/dist/src/ui/commands/directoryCommand.js +1 -1
  109. package/dist/src/ui/commands/directoryCommand.js.map +1 -1
  110. package/dist/src/ui/commands/ideCommand.d.ts +1 -2
  111. package/dist/src/ui/commands/ideCommand.js +17 -8
  112. package/dist/src/ui/commands/ideCommand.js.map +1 -1
  113. package/dist/src/ui/commands/mcpCommand.js +8 -6
  114. package/dist/src/ui/commands/mcpCommand.js.map +1 -1
  115. package/dist/src/ui/commands/memoryCommand.js +1 -1
  116. package/dist/src/ui/commands/memoryCommand.js.map +1 -1
  117. package/dist/src/ui/commands/restoreCommand.d.ts +1 -1
  118. package/dist/src/ui/commands/types.d.ts +1 -1
  119. package/dist/src/ui/components/AsciiArt.d.ts +3 -3
  120. package/dist/src/ui/components/AsciiArt.js +3 -3
  121. package/dist/src/ui/components/AuthDialog.d.ts +1 -1
  122. package/dist/src/ui/components/AuthDialog.js +10 -4
  123. package/dist/src/ui/components/AuthDialog.js.map +1 -1
  124. package/dist/src/ui/components/AuthDialog.test.js +48 -5
  125. package/dist/src/ui/components/AuthDialog.test.js.map +1 -1
  126. package/dist/src/ui/components/AutoAcceptIndicator.d.ts +1 -1
  127. package/dist/src/ui/components/AutoAcceptIndicator.js +1 -1
  128. package/dist/src/ui/components/AutoAcceptIndicator.js.map +1 -1
  129. package/dist/src/ui/components/ContextSummaryDisplay.d.ts +1 -1
  130. package/dist/src/ui/components/ContextSummaryDisplay.js +1 -1
  131. package/dist/src/ui/components/ContextSummaryDisplay.js.map +1 -1
  132. package/dist/src/ui/components/ContextUsageDisplay.js +1 -1
  133. package/dist/src/ui/components/ContextUsageDisplay.js.map +1 -1
  134. package/dist/src/ui/components/EditorSettingsDialog.d.ts +1 -1
  135. package/dist/src/ui/components/EditorSettingsDialog.js +1 -1
  136. package/dist/src/ui/components/EditorSettingsDialog.js.map +1 -1
  137. package/dist/src/ui/components/Footer.d.ts +3 -0
  138. package/dist/src/ui/components/Footer.js +5 -4
  139. package/dist/src/ui/components/Footer.js.map +1 -1
  140. package/dist/src/ui/components/HistoryItemDisplay.d.ts +1 -1
  141. package/dist/src/ui/components/InputPrompt.d.ts +1 -1
  142. package/dist/src/ui/components/InputPrompt.js +34 -24
  143. package/dist/src/ui/components/InputPrompt.js.map +1 -1
  144. package/dist/src/ui/components/LoadingIndicator.d.ts +1 -1
  145. package/dist/src/ui/components/MemoryUsageDisplay.js +1 -1
  146. package/dist/src/ui/components/MemoryUsageDisplay.js.map +1 -1
  147. package/dist/src/ui/components/SettingsDialog.test.js +2 -2
  148. package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
  149. package/dist/src/ui/components/ShellConfirmationDialog.d.ts +1 -1
  150. package/dist/src/ui/components/ShellConfirmationDialog.js +1 -1
  151. package/dist/src/ui/components/ShellConfirmationDialog.js.map +1 -1
  152. package/dist/src/ui/components/Tips.d.ts +1 -1
  153. package/dist/src/ui/components/Tips.js +1 -1
  154. package/dist/src/ui/components/Tips.js.map +1 -1
  155. package/dist/src/ui/components/messages/ToolConfirmationMessage.d.ts +1 -1
  156. package/dist/src/ui/components/messages/ToolConfirmationMessage.js +2 -2
  157. package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
  158. package/dist/src/ui/components/messages/ToolGroupMessage.d.ts +1 -1
  159. package/dist/src/ui/components/shared/text-buffer.js +36 -52
  160. package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
  161. package/dist/src/ui/contexts/KeypressContext.d.ts +1 -1
  162. package/dist/src/ui/contexts/KeypressContext.js +256 -43
  163. package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
  164. package/dist/src/ui/contexts/KeypressContext.test.js +115 -1
  165. package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
  166. package/dist/src/ui/contexts/SessionContext.d.ts +1 -1
  167. package/dist/src/ui/contexts/SessionContext.js +1 -1
  168. package/dist/src/ui/contexts/SessionContext.js.map +1 -1
  169. package/dist/src/ui/editors/editorSettingsManager.d.ts +1 -1
  170. package/dist/src/ui/editors/editorSettingsManager.js +1 -1
  171. package/dist/src/ui/editors/editorSettingsManager.js.map +1 -1
  172. package/dist/src/ui/hooks/atCommandProcessor.d.ts +1 -1
  173. package/dist/src/ui/hooks/atCommandProcessor.js +1 -1
  174. package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
  175. package/dist/src/ui/hooks/atCommandProcessor.test.js +1 -1
  176. package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -1
  177. package/dist/src/ui/hooks/shellCommandProcessor.d.ts +1 -1
  178. package/dist/src/ui/hooks/shellCommandProcessor.js +1 -1
  179. package/dist/src/ui/hooks/shellCommandProcessor.js.map +1 -1
  180. package/dist/src/ui/hooks/shellCommandProcessor.test.js +2 -2
  181. package/dist/src/ui/hooks/shellCommandProcessor.test.js.map +1 -1
  182. package/dist/src/ui/hooks/slashCommandProcessor.d.ts +2 -2
  183. package/dist/src/ui/hooks/slashCommandProcessor.js +9 -4
  184. package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
  185. package/dist/src/ui/hooks/useAtCompletion.d.ts +1 -1
  186. package/dist/src/ui/hooks/useAtCompletion.js +1 -1
  187. package/dist/src/ui/hooks/useAtCompletion.js.map +1 -1
  188. package/dist/src/ui/hooks/useAuthCommand.d.ts +1 -1
  189. package/dist/src/ui/hooks/useAuthCommand.js +2 -2
  190. package/dist/src/ui/hooks/useAuthCommand.js.map +1 -1
  191. package/dist/src/ui/hooks/useAutoAcceptIndicator.d.ts +1 -1
  192. package/dist/src/ui/hooks/useAutoAcceptIndicator.js +1 -1
  193. package/dist/src/ui/hooks/useAutoAcceptIndicator.js.map +1 -1
  194. package/dist/src/ui/hooks/useAutoAcceptIndicator.test.js +3 -3
  195. package/dist/src/ui/hooks/useAutoAcceptIndicator.test.js.map +1 -1
  196. package/dist/src/ui/hooks/useCommandCompletion.d.ts +1 -1
  197. package/dist/src/ui/hooks/useEditorSettings.d.ts +1 -1
  198. package/dist/src/ui/hooks/useEditorSettings.js +1 -1
  199. package/dist/src/ui/hooks/useEditorSettings.js.map +1 -1
  200. package/dist/src/ui/hooks/useEditorSettings.test.js +3 -3
  201. package/dist/src/ui/hooks/useEditorSettings.test.js.map +1 -1
  202. package/dist/src/ui/hooks/useFolderTrust.js +1 -3
  203. package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
  204. package/dist/src/ui/hooks/useGeminiStream.d.ts +1 -1
  205. package/dist/src/ui/hooks/useGeminiStream.js +18 -4
  206. package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
  207. package/dist/src/ui/hooks/useIdeTrustListener.d.ts +14 -0
  208. package/dist/src/ui/hooks/useIdeTrustListener.js +39 -0
  209. package/dist/src/ui/hooks/useIdeTrustListener.js.map +1 -0
  210. package/dist/src/ui/hooks/useLoadingIndicator.d.ts +1 -1
  211. package/dist/src/ui/hooks/useLoadingIndicator.js +2 -2
  212. package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
  213. package/dist/src/ui/hooks/useLoadingIndicator.test.js +2 -2
  214. package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
  215. package/dist/src/ui/hooks/useLogger.d.ts +2 -2
  216. package/dist/src/ui/hooks/useLogger.js +1 -1
  217. package/dist/src/ui/hooks/useLogger.js.map +1 -1
  218. package/dist/src/ui/hooks/usePhraseCycler.d.ts +1 -1
  219. package/dist/src/ui/hooks/usePhraseCycler.js +11 -8
  220. package/dist/src/ui/hooks/usePhraseCycler.js.map +1 -1
  221. package/dist/src/ui/hooks/usePrivacySettings.d.ts +1 -1
  222. package/dist/src/ui/hooks/usePrivacySettings.js +8 -13
  223. package/dist/src/ui/hooks/usePrivacySettings.js.map +1 -1
  224. package/dist/src/ui/hooks/usePrivacySettings.test.js +33 -97
  225. package/dist/src/ui/hooks/usePrivacySettings.test.js.map +1 -1
  226. package/dist/src/ui/hooks/usePromptCompletion.d.ts +1 -1
  227. package/dist/src/ui/hooks/usePromptCompletion.js +1 -1
  228. package/dist/src/ui/hooks/usePromptCompletion.js.map +1 -1
  229. package/dist/src/ui/hooks/useReactToolScheduler.d.ts +1 -1
  230. package/dist/src/ui/hooks/useReactToolScheduler.js +1 -1
  231. package/dist/src/ui/hooks/useReactToolScheduler.js.map +1 -1
  232. package/dist/src/ui/hooks/useShellHistory.d.ts +1 -1
  233. package/dist/src/ui/hooks/useShellHistory.js +1 -1
  234. package/dist/src/ui/hooks/useShellHistory.js.map +1 -1
  235. package/dist/src/ui/hooks/useShellHistory.test.js +1 -1
  236. package/dist/src/ui/hooks/useShellHistory.test.js.map +1 -1
  237. package/dist/src/ui/hooks/useShowMemoryCommand.d.ts +1 -1
  238. package/dist/src/ui/hooks/useToolScheduler.test.js +5 -3
  239. package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
  240. package/dist/src/ui/hooks/useWorkspaceMigration.js +2 -1
  241. package/dist/src/ui/hooks/useWorkspaceMigration.js.map +1 -1
  242. package/dist/src/ui/keyMatchers.test.js +9 -0
  243. package/dist/src/ui/keyMatchers.test.js.map +1 -1
  244. package/dist/src/ui/privacy/CloudFreePrivacyNotice.d.ts +1 -1
  245. package/dist/src/ui/privacy/PrivacyNotice.d.ts +1 -1
  246. package/dist/src/ui/privacy/PrivacyNotice.js +1 -1
  247. package/dist/src/ui/privacy/PrivacyNotice.js.map +1 -1
  248. package/dist/src/ui/types.d.ts +1 -1
  249. package/dist/src/ui/utils/MarkdownDisplay.test.js +2 -2
  250. package/dist/src/ui/utils/MarkdownDisplay.test.js.map +1 -1
  251. package/dist/src/ui/utils/highlight.d.ts +10 -0
  252. package/dist/src/ui/utils/highlight.js +41 -0
  253. package/dist/src/ui/utils/highlight.js.map +1 -0
  254. package/dist/src/ui/utils/highlight.test.d.ts +6 -0
  255. package/dist/src/ui/utils/highlight.test.js +93 -0
  256. package/dist/src/ui/utils/highlight.test.js.map +1 -0
  257. package/dist/src/ui/utils/platformConstants.d.ts +24 -1
  258. package/dist/src/ui/utils/platformConstants.js +26 -1
  259. package/dist/src/ui/utils/platformConstants.js.map +1 -1
  260. package/dist/src/utils/cleanup.js +1 -1
  261. package/dist/src/utils/cleanup.js.map +1 -1
  262. package/dist/src/utils/deepMerge.d.ts +10 -0
  263. package/dist/src/utils/deepMerge.js +58 -0
  264. package/dist/src/utils/deepMerge.js.map +1 -0
  265. package/dist/src/utils/deepMerge.test.d.ts +6 -0
  266. package/dist/src/utils/deepMerge.test.js +143 -0
  267. package/dist/src/utils/deepMerge.test.js.map +1 -0
  268. package/dist/src/utils/installationInfo.js +1 -1
  269. package/dist/src/utils/installationInfo.js.map +1 -1
  270. package/dist/src/utils/installationInfo.test.js +2 -2
  271. package/dist/src/utils/installationInfo.test.js.map +1 -1
  272. package/dist/src/utils/sandbox.d.ts +1 -1
  273. package/dist/src/utils/sandbox.js +1 -1
  274. package/dist/src/utils/sandbox.js.map +1 -1
  275. package/dist/src/utils/startupWarnings.js +1 -1
  276. package/dist/src/utils/startupWarnings.js.map +1 -1
  277. package/dist/src/utils/userStartupWarnings.d.ts +1 -1
  278. package/dist/src/utils/userStartupWarnings.js +1 -1
  279. package/dist/src/utils/userStartupWarnings.js.map +1 -1
  280. package/dist/src/validateNonInterActiveAuth.d.ts +2 -2
  281. package/dist/src/validateNonInterActiveAuth.js +1 -1
  282. package/dist/src/validateNonInterActiveAuth.js.map +1 -1
  283. package/dist/src/zed-integration/fileSystemService.d.ts +1 -1
  284. package/dist/src/zed-integration/zedIntegration.d.ts +1 -1
  285. package/dist/src/zed-integration/zedIntegration.js +7 -5
  286. package/dist/src/zed-integration/zedIntegration.js.map +1 -1
  287. package/dist/tsconfig.tsbuildinfo +1 -1
  288. package/package.json +4 -6
@@ -1 +1 @@
1
- {"version":3,"file":"extension.js","sourceRoot":"","sources":["../../../src/config/extension.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"extension.js","sourceRoot":"","sources":["../../../src/config/extension.ts"],"names":[],"mappings":"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"}
@@ -14,6 +14,7 @@ export declare enum Command {
14
14
  KILL_LINE_RIGHT = "killLineRight",
15
15
  KILL_LINE_LEFT = "killLineLeft",
16
16
  CLEAR_INPUT = "clearInput",
17
+ DELETE_WORD_BACKWARD = "deleteWordBackward",
17
18
  CLEAR_SCREEN = "clearScreen",
18
19
  HISTORY_UP = "historyUp",
19
20
  HISTORY_DOWN = "historyDown",
@@ -18,6 +18,7 @@ export var Command;
18
18
  Command["KILL_LINE_RIGHT"] = "killLineRight";
19
19
  Command["KILL_LINE_LEFT"] = "killLineLeft";
20
20
  Command["CLEAR_INPUT"] = "clearInput";
21
+ Command["DELETE_WORD_BACKWARD"] = "deleteWordBackward";
21
22
  // Screen control
22
23
  Command["CLEAR_SCREEN"] = "clearScreen";
23
24
  // History navigation
@@ -54,40 +55,32 @@ export var Command;
54
55
  export const defaultKeyBindings = {
55
56
  // Basic bindings
56
57
  [Command.RETURN]: [{ key: 'return' }],
57
- // Original: key.name === 'escape'
58
58
  [Command.ESCAPE]: [{ key: 'escape' }],
59
59
  // Cursor movement
60
- // Original: key.ctrl && key.name === 'a'
61
60
  [Command.HOME]: [{ key: 'a', ctrl: true }],
62
- // Original: key.ctrl && key.name === 'e'
63
61
  [Command.END]: [{ key: 'e', ctrl: true }],
64
62
  // Text deletion
65
- // Original: key.ctrl && key.name === 'k'
66
63
  [Command.KILL_LINE_RIGHT]: [{ key: 'k', ctrl: true }],
67
- // Original: key.ctrl && key.name === 'u'
68
64
  [Command.KILL_LINE_LEFT]: [{ key: 'u', ctrl: true }],
69
- // Original: key.ctrl && key.name === 'c'
70
65
  [Command.CLEAR_INPUT]: [{ key: 'c', ctrl: true }],
66
+ // Added command (meta/alt/option) for mac compatibility
67
+ [Command.DELETE_WORD_BACKWARD]: [
68
+ { key: 'backspace', ctrl: true },
69
+ { key: 'backspace', command: true },
70
+ ],
71
71
  // Screen control
72
- // Original: key.ctrl && key.name === 'l'
73
72
  [Command.CLEAR_SCREEN]: [{ key: 'l', ctrl: true }],
74
73
  // History navigation
75
- // Original: key.ctrl && key.name === 'p'
76
74
  [Command.HISTORY_UP]: [{ key: 'p', ctrl: true }],
77
- // Original: key.ctrl && key.name === 'n'
78
75
  [Command.HISTORY_DOWN]: [{ key: 'n', ctrl: true }],
79
- // Original: key.name === 'up'
80
76
  [Command.NAVIGATION_UP]: [{ key: 'up' }],
81
- // Original: key.name === 'down'
82
77
  [Command.NAVIGATION_DOWN]: [{ key: 'down' }],
83
78
  // Auto-completion
84
- // Original: key.name === 'tab' || (key.name === 'return' && !key.ctrl)
85
79
  [Command.ACCEPT_SUGGESTION]: [{ key: 'tab' }, { key: 'return', ctrl: false }],
86
80
  // Completion navigation (arrow or Ctrl+P/N)
87
81
  [Command.COMPLETION_UP]: [{ key: 'up' }, { key: 'p', ctrl: true }],
88
82
  [Command.COMPLETION_DOWN]: [{ key: 'down' }, { key: 'n', ctrl: true }],
89
83
  // Text input
90
- // Original: key.name === 'return' && !key.ctrl && !key.meta && !key.paste
91
84
  // Must also exclude shift to allow shift+enter for newline
92
85
  [Command.SUBMIT]: [
93
86
  {
@@ -98,7 +91,6 @@ export const defaultKeyBindings = {
98
91
  shift: false,
99
92
  },
100
93
  ],
101
- // Original: key.name === 'return' && (key.ctrl || key.meta || key.paste)
102
94
  // Split into multiple data-driven bindings
103
95
  // Now also includes shift+enter for multi-line input
104
96
  [Command.NEWLINE]: [
@@ -109,33 +101,22 @@ export const defaultKeyBindings = {
109
101
  { key: 'j', ctrl: true },
110
102
  ],
111
103
  // External tools
112
- // Original: key.ctrl && (key.name === 'x' || key.sequence === '\x18')
113
104
  [Command.OPEN_EXTERNAL_EDITOR]: [
114
105
  { key: 'x', ctrl: true },
115
106
  { sequence: '\x18', ctrl: true },
116
107
  ],
117
- // Original: key.ctrl && key.name === 'v'
118
108
  [Command.PASTE_CLIPBOARD_IMAGE]: [{ key: 'v', ctrl: true }],
119
109
  // App level bindings
120
- // Original: key.ctrl && key.name === 'o'
121
110
  [Command.SHOW_ERROR_DETAILS]: [{ key: 'o', ctrl: true }],
122
- // Original: key.ctrl && key.name === 't'
123
111
  [Command.TOGGLE_TOOL_DESCRIPTIONS]: [{ key: 't', ctrl: true }],
124
- // Original: key.ctrl && key.name === 'g'
125
112
  [Command.TOGGLE_IDE_CONTEXT_DETAIL]: [{ key: 'g', ctrl: true }],
126
- // Original: key.ctrl && (key.name === 'c' || key.name === 'C')
127
113
  [Command.QUIT]: [{ key: 'c', ctrl: true }],
128
- // Original: key.ctrl && (key.name === 'd' || key.name === 'D')
129
114
  [Command.EXIT]: [{ key: 'd', ctrl: true }],
130
- // Original: key.ctrl && key.name === 's'
131
115
  [Command.SHOW_MORE_LINES]: [{ key: 's', ctrl: true }],
132
116
  // Shell commands
133
- // Original: key.ctrl && key.name === 'r'
134
117
  [Command.REVERSE_SEARCH]: [{ key: 'r', ctrl: true }],
135
- // Original: key.name === 'return' && !key.ctrl
136
118
  // Note: original logic ONLY checked ctrl=false, ignored meta/shift/paste
137
119
  [Command.SUBMIT_REVERSE_SEARCH]: [{ key: 'return', ctrl: false }],
138
- // Original: key.name === 'tab'
139
120
  [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: [{ key: 'tab' }],
140
121
  };
141
122
  //# sourceMappingURL=keyBindings.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"keyBindings.js","sourceRoot":"","sources":["../../../src/config/keyBindings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keyBindings.js","sourceRoot":"","sources":["../../../src/config/keyBindings.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import type { SandboxConfig } from '@machina.ai/cell-cli-core';
6
+ import type { SandboxConfig } from '@google/gemini-cli-core';
7
7
  import type { Settings } from './settings.js';
8
8
  interface SandboxCliArgs {
9
9
  sandbox?: boolean | string;
@@ -3,7 +3,7 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { FatalSandboxError } from '@machina.ai/cell-cli-core';
6
+ import { FatalSandboxError } from '@google/gemini-cli-core';
7
7
  import commandExists from 'command-exists';
8
8
  import * as os from 'node:os';
9
9
  import { getPackageJson } from '../utils/package.js';
@@ -1 +1 @@
1
- {"version":3,"file":"sandboxConfig.js","sourceRoot":"","sources":["../../../src/config/sandboxConfig.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sandboxConfig.js","sourceRoot":"","sources":["../../../src/config/sandboxConfig.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import type { Settings, MemoryImportFormat } from './settingsSchema.js';
6
+ import { type Settings, type MemoryImportFormat } from './settingsSchema.js';
7
7
  export type { Settings, MemoryImportFormat };
8
8
  export declare const SETTINGS_DIRECTORY_NAME = ".cell-cli";
9
9
  export declare const USER_SETTINGS_PATH: string;
@@ -36,14 +36,14 @@ export interface SettingsFile {
36
36
  settings: Settings;
37
37
  path: string;
38
38
  }
39
+ export declare function needsMigration(settings: Record<string, unknown>): boolean;
39
40
  export declare function migrateSettingsToV1(v2Settings: Record<string, unknown>): Record<string, unknown>;
40
41
  export declare class LoadedSettings {
41
- constructor(system: SettingsFile, systemDefaults: SettingsFile, user: SettingsFile, workspace: SettingsFile, errors: SettingsError[], isTrusted: boolean, migratedInMemorScopes: Set<SettingScope>);
42
+ constructor(system: SettingsFile, systemDefaults: SettingsFile, user: SettingsFile, workspace: SettingsFile, isTrusted: boolean, migratedInMemorScopes: Set<SettingScope>);
42
43
  readonly system: SettingsFile;
43
44
  readonly systemDefaults: SettingsFile;
44
45
  readonly user: SettingsFile;
45
46
  readonly workspace: SettingsFile;
46
- readonly errors: SettingsError[];
47
47
  readonly isTrusted: boolean;
48
48
  readonly migratedInMemorScopes: Set<SettingScope>;
49
49
  private _merged;
@@ -58,5 +58,5 @@ export declare function loadEnvironment(settings: Settings): void;
58
58
  * Loads settings from user and workspace directories.
59
59
  * Project settings override user settings.
60
60
  */
61
- export declare function loadSettings(workspaceDir: string): LoadedSettings;
61
+ export declare function loadSettings(workspaceDir?: string): LoadedSettings;
62
62
  export declare function saveSettings(settingsFile: SettingsFile): void;
@@ -8,71 +8,93 @@ import * as path from 'node:path';
8
8
  import { homedir, platform } from 'node:os';
9
9
  import * as dotenv from 'dotenv';
10
10
  import process from 'node:process';
11
- import { CELL_CONFIG_DIR as CELL_DIR, getErrorMessage, Storage, } from '@machina.ai/cell-cli-core';
12
- /*
11
+ import { FatalConfigError, CELL_CONFIG_DIR as CELL_DIR, getErrorMessage, Storage, } from '@google/gemini-cli-core';
13
12
  import { loadYamlConfig } from '@machina.ai/config-yaml';
14
- */
15
13
  import stripJsonComments from 'strip-json-comments';
16
14
  import { DefaultLight } from '../ui/themes/default-light.js';
17
15
  import { DefaultDark } from '../ui/themes/default.js';
18
16
  import { isWorkspaceTrusted } from './trustedFolders.js';
17
+ import { SETTINGS_SCHEMA, } from './settingsSchema.js';
19
18
  import { resolveEnvVarsInObject } from '../utils/envVarResolver.js';
20
- import { mergeWith } from 'lodash-es';
19
+ import { customDeepMerge } from '../utils/deepMerge.js';
20
+ function getMergeStrategyForPath(path) {
21
+ let current = undefined;
22
+ let currentSchema = SETTINGS_SCHEMA;
23
+ for (const key of path) {
24
+ if (!currentSchema || !currentSchema[key]) {
25
+ return undefined;
26
+ }
27
+ current = currentSchema[key];
28
+ currentSchema = current.properties;
29
+ }
30
+ return current?.mergeStrategy;
31
+ }
21
32
  export const SETTINGS_DIRECTORY_NAME = '.cell-cli';
22
33
  export const USER_SETTINGS_PATH = Storage.getGlobalSettingsPath();
23
34
  export const USER_SETTINGS_DIR = path.dirname(USER_SETTINGS_PATH);
24
35
  export const DEFAULT_EXCLUDED_ENV_VARS = ['DEBUG', 'DEBUG_MODE'];
25
36
  const MIGRATE_V2_OVERWRITE = false;
26
- // As defined in spec.md
27
37
  const MIGRATION_MAP = {
28
- preferredEditor: 'general.preferredEditor',
29
- vimMode: 'general.vimMode',
30
- disableAutoUpdate: 'general.disableAutoUpdate',
31
- disableUpdateNag: 'general.disableUpdateNag',
38
+ accessibility: 'ui.accessibility',
39
+ allowedTools: 'tools.allowed',
40
+ allowMCPServers: 'mcp.allowed',
41
+ autoAccept: 'tools.autoAccept',
42
+ autoConfigureMaxOldSpaceSize: 'advanced.autoConfigureMemory',
43
+ bugCommand: 'advanced.bugCommand',
44
+ chatCompression: 'model.chatCompression',
32
45
  checkpointing: 'general.checkpointing',
33
- theme: 'ui.theme',
46
+ coreTools: 'tools.core',
47
+ contextFileName: 'context.fileName',
34
48
  customThemes: 'ui.customThemes',
49
+ debugKeystrokeLogging: 'general.debugKeystrokeLogging',
50
+ disableAutoUpdate: 'general.disableAutoUpdate',
51
+ disableUpdateNag: 'general.disableUpdateNag',
52
+ dnsResolutionOrder: 'advanced.dnsResolutionOrder',
53
+ enablePromptCompletion: 'general.enablePromptCompletion',
54
+ enforcedAuthType: 'security.auth.enforcedType',
55
+ excludeTools: 'tools.exclude',
56
+ excludeMCPServers: 'mcp.excluded',
57
+ excludedProjectEnvVars: 'advanced.excludedEnvVars',
58
+ extensionManagement: 'experimental.extensionManagement',
59
+ extensions: 'extensions',
60
+ fileFiltering: 'context.fileFiltering',
61
+ folderTrustFeature: 'security.folderTrust.featureEnabled',
62
+ folderTrust: 'security.folderTrust.enabled',
63
+ hasSeenIdeIntegrationNudge: 'ide.hasSeenNudge',
35
64
  hideWindowTitle: 'ui.hideWindowTitle',
36
65
  hideTips: 'ui.hideTips',
37
66
  hideBanner: 'ui.hideBanner',
38
67
  hideFooter: 'ui.hideFooter',
68
+ hideCWD: 'ui.footer.hideCWD',
69
+ hideSandboxStatus: 'ui.footer.hideSandboxStatus',
70
+ hideModelInfo: 'ui.footer.hideModelInfo',
71
+ hideContextSummary: 'ui.hideContextSummary',
39
72
  showMemoryUsage: 'ui.showMemoryUsage',
40
73
  showLineNumbers: 'ui.showLineNumbers',
41
74
  showCitations: 'ui.showCitations',
42
- accessibility: 'ui.accessibility',
43
75
  ideMode: 'ide.enabled',
44
- hasSeenIdeIntegrationNudge: 'ide.hasSeenNudge',
45
- usageStatisticsEnabled: 'privacy.usageStatisticsEnabled',
46
- telemetry: 'telemetry',
47
- model: 'model.name',
76
+ includeDirectories: 'context.includeDirectories',
77
+ loadMemoryFromIncludeDirectories: 'context.loadFromIncludeDirectories',
48
78
  maxSessionTurns: 'model.maxSessionTurns',
49
- summarizeToolOutput: 'model.summarizeToolOutput',
50
- chatCompression: 'model.chatCompression',
51
- skipNextSpeakerCheck: 'model.skipNextSpeakerCheck',
52
- contextFileName: 'context.fileName',
79
+ mcpServers: 'mcpServers',
80
+ mcpServerCommand: 'mcp.serverCommand',
53
81
  memoryImportFormat: 'context.importFormat',
54
82
  memoryDiscoveryMaxDirs: 'context.discoveryMaxDirs',
55
- includeDirectories: 'context.includeDirectories',
56
- loadMemoryFromIncludeDirectories: 'context.loadFromIncludeDirectories',
57
- fileFiltering: 'context.fileFiltering',
83
+ model: 'model.name',
84
+ preferredEditor: 'general.preferredEditor',
58
85
  sandbox: 'tools.sandbox',
86
+ selectedAuthType: 'security.auth.selectedType',
59
87
  shouldUseNodePtyShell: 'tools.usePty',
60
- allowedTools: 'tools.allowed',
61
- coreTools: 'tools.core',
62
- excludeTools: 'tools.exclude',
88
+ skipNextSpeakerCheck: 'model.skipNextSpeakerCheck',
89
+ summarizeToolOutput: 'model.summarizeToolOutput',
90
+ telemetry: 'telemetry',
91
+ theme: 'ui.theme',
63
92
  toolDiscoveryCommand: 'tools.discoveryCommand',
64
93
  toolCallCommand: 'tools.callCommand',
65
- mcpServerCommand: 'mcp.serverCommand',
66
- allowMCPServers: 'mcp.allowed',
67
- excludeMCPServers: 'mcp.excluded',
68
- folderTrustFeature: 'security.folderTrust.featureEnabled',
69
- folderTrust: 'security.folderTrust.enabled',
70
- selectedAuthType: 'security.auth.selectedType',
94
+ usageStatisticsEnabled: 'privacy.usageStatisticsEnabled',
71
95
  useExternalAuth: 'security.auth.useExternal',
72
- autoConfigureMaxOldSpaceSize: 'advanced.autoConfigureMemory',
73
- dnsResolutionOrder: 'advanced.dnsResolutionOrder',
74
- excludedProjectEnvVars: 'advanced.excludedEnvVars',
75
- bugCommand: 'advanced.bugCommand',
96
+ useRipgrep: 'tools.useRipgrep',
97
+ vimMode: 'general.vimMode',
76
98
  };
77
99
  export function getSystemSettingsPath() {
78
100
  if (process.env['CELL_CLI_SYSTEM_SETTINGS_PATH']) {
@@ -122,8 +144,24 @@ function setNestedProperty(obj, path, value) {
122
144
  }
123
145
  current[lastKey] = value;
124
146
  }
125
- function needsMigration(settings) {
126
- return !('general' in settings);
147
+ export function needsMigration(settings) {
148
+ // A file needs migration if it contains any top-level key that is moved to a
149
+ // nested location in V2.
150
+ const hasV1Keys = Object.entries(MIGRATION_MAP).some(([v1Key, v2Path]) => {
151
+ if (v1Key === v2Path || !(v1Key in settings)) {
152
+ return false;
153
+ }
154
+ // If a key exists that is both a V1 key and a V2 container (like 'model'),
155
+ // we need to check the type. If it's an object, it's a V2 container and not
156
+ // a V1 key that needs migration.
157
+ if (KNOWN_V2_CONTAINERS.has(v1Key) &&
158
+ typeof settings[v1Key] === 'object' &&
159
+ settings[v1Key] !== null) {
160
+ return false;
161
+ }
162
+ return true;
163
+ });
164
+ return hasV1Keys;
127
165
  }
128
166
  function migrateSettingsToV2(flatSettings) {
129
167
  if (!needsMigration(flatSettings)) {
@@ -197,138 +235,20 @@ export function migrateSettingsToV1(v2Settings) {
197
235
  }
198
236
  function mergeSettings(system, systemDefaults, user, workspace, isTrusted) {
199
237
  const safeWorkspace = isTrusted ? workspace : {};
200
- // folderTrust is not supported at workspace level.
201
- const { security, ...restOfWorkspace } = safeWorkspace;
202
- const safeWorkspaceWithoutFolderTrust = security
203
- ? {
204
- ...restOfWorkspace,
205
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
206
- security: (({ folderTrust, ...rest }) => rest)(security),
207
- }
208
- : {
209
- ...restOfWorkspace,
210
- security: {},
211
- };
212
238
  // Settings are merged with the following precedence (last one wins for
213
239
  // single values):
214
240
  // 1. System Defaults
215
241
  // 2. User Settings
216
242
  // 3. Workspace Settings
217
243
  // 4. System Settings (as overrides)
218
- //
219
- // For properties that are arrays (e.g., includeDirectories), the arrays
220
- // are concatenated. For objects (e.g., customThemes), they are merged.
221
- return {
222
- ...systemDefaults,
223
- ...user,
224
- ...safeWorkspaceWithoutFolderTrust,
225
- ...system,
226
- general: {
227
- ...(systemDefaults.general || {}),
228
- ...(user.general || {}),
229
- ...(safeWorkspaceWithoutFolderTrust.general || {}),
230
- ...(system.general || {}),
231
- },
232
- ui: {
233
- ...(systemDefaults.ui || {}),
234
- ...(user.ui || {}),
235
- ...(safeWorkspaceWithoutFolderTrust.ui || {}),
236
- ...(system.ui || {}),
237
- customThemes: {
238
- ...(systemDefaults.ui?.customThemes || {}),
239
- ...(user.ui?.customThemes || {}),
240
- ...(safeWorkspaceWithoutFolderTrust.ui?.customThemes || {}),
241
- ...(system.ui?.customThemes || {}),
242
- },
243
- },
244
- security: {
245
- ...(systemDefaults.security || {}),
246
- ...(user.security || {}),
247
- ...(safeWorkspaceWithoutFolderTrust.security || {}),
248
- ...(system.security || {}),
249
- },
250
- mcp: {
251
- ...(systemDefaults.mcp || {}),
252
- ...(user.mcp || {}),
253
- ...(safeWorkspaceWithoutFolderTrust.mcp || {}),
254
- ...(system.mcp || {}),
255
- },
256
- mcpServers: {
257
- ...(systemDefaults.mcpServers || {}),
258
- ...(user.mcpServers || {}),
259
- ...(safeWorkspaceWithoutFolderTrust.mcpServers || {}),
260
- ...(system.mcpServers || {}),
261
- },
262
- context: {
263
- ...(systemDefaults.context || {}),
264
- ...(user.context || {}),
265
- ...(safeWorkspaceWithoutFolderTrust.context || {}),
266
- ...(system.context || {}),
267
- includeDirectories: [
268
- ...(systemDefaults.context?.includeDirectories || []),
269
- ...(user.context?.includeDirectories || []),
270
- ...(safeWorkspaceWithoutFolderTrust.context?.includeDirectories || []),
271
- ...(system.context?.includeDirectories || []),
272
- ],
273
- },
274
- model: {
275
- ...(systemDefaults.model || {}),
276
- ...(user.model || {}),
277
- ...(safeWorkspaceWithoutFolderTrust.model || {}),
278
- ...(system.model || {}),
279
- chatCompression: {
280
- ...(systemDefaults.model?.chatCompression || {}),
281
- ...(user.model?.chatCompression || {}),
282
- ...(safeWorkspaceWithoutFolderTrust.model?.chatCompression || {}),
283
- ...(system.model?.chatCompression || {}),
284
- },
285
- },
286
- advanced: {
287
- ...(systemDefaults.advanced || {}),
288
- ...(user.advanced || {}),
289
- ...(safeWorkspaceWithoutFolderTrust.advanced || {}),
290
- ...(system.advanced || {}),
291
- excludedEnvVars: [
292
- ...new Set([
293
- ...(systemDefaults.advanced?.excludedEnvVars || []),
294
- ...(user.advanced?.excludedEnvVars || []),
295
- ...(safeWorkspaceWithoutFolderTrust.advanced?.excludedEnvVars || []),
296
- ...(system.advanced?.excludedEnvVars || []),
297
- ]),
298
- ],
299
- },
300
- extensions: {
301
- ...(systemDefaults.extensions || {}),
302
- ...(user.extensions || {}),
303
- ...(safeWorkspaceWithoutFolderTrust.extensions || {}),
304
- ...(system.extensions || {}),
305
- disabled: [
306
- ...new Set([
307
- ...(systemDefaults.extensions?.disabled || []),
308
- ...(user.extensions?.disabled || []),
309
- ...(safeWorkspaceWithoutFolderTrust.extensions?.disabled || []),
310
- ...(system.extensions?.disabled || []),
311
- ]),
312
- ],
313
- workspacesWithMigrationNudge: [
314
- ...new Set([
315
- ...(systemDefaults.extensions?.workspacesWithMigrationNudge || []),
316
- ...(user.extensions?.workspacesWithMigrationNudge || []),
317
- ...(safeWorkspaceWithoutFolderTrust.extensions
318
- ?.workspacesWithMigrationNudge || []),
319
- ...(system.extensions?.workspacesWithMigrationNudge || []),
320
- ]),
321
- ],
322
- },
323
- };
244
+ return customDeepMerge(getMergeStrategyForPath, {}, systemDefaults, user, safeWorkspace, system);
324
245
  }
325
246
  export class LoadedSettings {
326
- constructor(system, systemDefaults, user, workspace, errors, isTrusted, migratedInMemorScopes) {
247
+ constructor(system, systemDefaults, user, workspace, isTrusted, migratedInMemorScopes) {
327
248
  this.system = system;
328
249
  this.systemDefaults = systemDefaults;
329
250
  this.user = user;
330
251
  this.workspace = workspace;
331
- this.errors = errors;
332
252
  this.isTrusted = isTrusted;
333
253
  this.migratedInMemorScopes = migratedInMemorScopes;
334
254
  this._merged = this.computeMergedSettings();
@@ -337,7 +257,6 @@ export class LoadedSettings {
337
257
  systemDefaults;
338
258
  user;
339
259
  workspace;
340
- errors;
341
260
  isTrusted;
342
261
  migratedInMemorScopes;
343
262
  _merged;
@@ -458,7 +377,7 @@ export function loadEnvironment(settings) {
458
377
  * Loads settings from user and workspace directories.
459
378
  * Project settings override user settings.
460
379
  */
461
- export function loadSettings(workspaceDir) {
380
+ export function loadSettings(workspaceDir = process.cwd()) {
462
381
  let systemSettings = {};
463
382
  let systemDefaultSettings = {};
464
383
  let userSettings = {};
@@ -511,7 +430,7 @@ export function loadSettings(workspaceDir) {
511
430
  const defaultMcpServerConfig = {
512
431
  Cell: {
513
432
  url: 'https://api.machina.ai/mcp/v1/cell/sse',
514
- timeout: 10000,
433
+ timeout: 600000,
515
434
  },
516
435
  };
517
436
  let settingsModified = false;
@@ -523,17 +442,18 @@ export function loadSettings(workspaceDir) {
523
442
  userSettings.mcpServers['Cell'] = defaultMcpServerConfig.Cell;
524
443
  settingsModified = true;
525
444
  }
445
+ // Load YAML config and merge
446
+ const yamlSettings = loadYamlConfig() || {};
447
+ if (Object.keys(yamlSettings).length > 0) {
448
+ userSettings = { ...userSettings, ...yamlSettings };
449
+ settingsModified = true;
450
+ }
526
451
  if (settingsModified) {
527
452
  saveSettings({
528
453
  path: USER_SETTINGS_PATH,
529
454
  settings: userSettings,
530
455
  });
531
456
  }
532
- /*
533
- // Load YAML config and merge
534
- const yamlSettings = loadYamlConfig();
535
- userSettings = { ...userSettings, ...yamlSettings };
536
- */
537
457
  const loadAndMigrate = (filePath, scope) => {
538
458
  try {
539
459
  if (fs.existsSync(filePath)) {
@@ -598,7 +518,7 @@ export function loadSettings(workspaceDir) {
598
518
  workspaceSettings.ui.theme = DefaultDark.name;
599
519
  }
600
520
  // For the initial trust check, we can only use user and system settings.
601
- const initialTrustCheckSettings = mergeWith({}, systemSettings, userSettings);
521
+ const initialTrustCheckSettings = customDeepMerge(getMergeStrategyForPath, {}, systemSettings, userSettings);
602
522
  const isTrusted = isWorkspaceTrusted(initialTrustCheckSettings) ?? true;
603
523
  // Create a temporary merged settings object to pass to loadEnvironment.
604
524
  const tempMergedSettings = mergeSettings(systemSettings, systemDefaultSettings, userSettings, workspaceSettings, isTrusted);
@@ -610,7 +530,11 @@ export function loadSettings(workspaceDir) {
610
530
  userSettings = resolveEnvVarsInObject(userSettings);
611
531
  workspaceSettings = resolveEnvVarsInObject(workspaceSettings);
612
532
  // Create LoadedSettings first
613
- const loadedSettings = new LoadedSettings({
533
+ if (settingsErrors.length > 0) {
534
+ const errorMessages = settingsErrors.map((error) => `Error in ${error.path}: ${error.message}`);
535
+ throw new FatalConfigError(`${errorMessages.join('\n')}\nPlease fix the configuration file(s) and try again.`);
536
+ }
537
+ return new LoadedSettings({
614
538
  path: systemSettingsPath,
615
539
  settings: systemSettings,
616
540
  }, {
@@ -622,8 +546,7 @@ export function loadSettings(workspaceDir) {
622
546
  }, {
623
547
  path: workspaceSettingsPath,
624
548
  settings: workspaceSettings,
625
- }, settingsErrors, isTrusted, migratedInMemorScopes);
626
- return loadedSettings;
549
+ }, isTrusted, migratedInMemorScopes);
627
550
  }
628
551
  export function saveSettings(settingsFile) {
629
552
  try {