@google/gemini-cli 0.0.8999999 → 0.0.77777773

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 (465) hide show
  1. package/README.md +105 -62
  2. package/dist/package.json +13 -5
  3. package/dist/src/commands/extensions/examples/context/GEMINI.md +9 -3
  4. package/dist/src/commands/extensions/examples/context/gemini-extension.json +1 -2
  5. package/dist/src/commands/extensions/examples/mcp-server/gemini-extension.json +3 -2
  6. package/dist/src/commands/extensions/examples/mcp-server/package.json +18 -0
  7. package/dist/src/commands/extensions/examples/mcp-server/tsconfig.json +13 -0
  8. package/dist/src/commands/extensions/install.d.ts +2 -2
  9. package/dist/src/commands/extensions/install.js +35 -36
  10. package/dist/src/commands/extensions/install.js.map +1 -1
  11. package/dist/src/commands/extensions/install.test.js +25 -25
  12. package/dist/src/commands/extensions/install.test.js.map +1 -1
  13. package/dist/src/commands/extensions/link.js +2 -2
  14. package/dist/src/commands/extensions/link.js.map +1 -1
  15. package/dist/src/commands/extensions/list.js +1 -1
  16. package/dist/src/commands/extensions/list.js.map +1 -1
  17. package/dist/src/commands/extensions/new.js +28 -8
  18. package/dist/src/commands/extensions/new.js.map +1 -1
  19. package/dist/src/commands/extensions/new.test.js +14 -5
  20. package/dist/src/commands/extensions/new.test.js.map +1 -1
  21. package/dist/src/commands/extensions/uninstall.js +1 -1
  22. package/dist/src/commands/extensions/uninstall.js.map +1 -1
  23. package/dist/src/commands/extensions/uninstall.test.js +4 -1
  24. package/dist/src/commands/extensions/uninstall.test.js.map +1 -1
  25. package/dist/src/commands/extensions/update.js +35 -24
  26. package/dist/src/commands/extensions/update.js.map +1 -1
  27. package/dist/src/commands/mcp/add.js +6 -1
  28. package/dist/src/commands/mcp/add.js.map +1 -1
  29. package/dist/src/commands/mcp/list.js +5 -4
  30. package/dist/src/commands/mcp/list.js.map +1 -1
  31. package/dist/src/config/config.d.ts +7 -4
  32. package/dist/src/config/config.js +125 -39
  33. package/dist/src/config/config.js.map +1 -1
  34. package/dist/src/config/extension.d.ts +44 -18
  35. package/dist/src/config/extension.js +250 -143
  36. package/dist/src/config/extension.js.map +1 -1
  37. package/dist/src/config/extensions/extensionEnablement.d.ts +12 -9
  38. package/dist/src/config/extensions/extensionEnablement.js +36 -9
  39. package/dist/src/config/extensions/extensionEnablement.js.map +1 -1
  40. package/dist/src/config/extensions/extensionEnablement.test.js +74 -1
  41. package/dist/src/config/extensions/extensionEnablement.test.js.map +1 -1
  42. package/dist/src/config/extensions/github.d.ts +14 -2
  43. package/dist/src/config/extensions/github.js +111 -89
  44. package/dist/src/config/extensions/github.js.map +1 -1
  45. package/dist/src/config/extensions/github.test.js +124 -13
  46. package/dist/src/config/extensions/github.test.js.map +1 -1
  47. package/dist/src/config/extensions/github_fetch.d.ts +7 -0
  48. package/dist/src/config/extensions/github_fetch.js +34 -0
  49. package/dist/src/config/extensions/github_fetch.js.map +1 -0
  50. package/dist/src/config/extensions/update.d.ts +4 -5
  51. package/dist/src/config/extensions/update.js +64 -42
  52. package/dist/src/config/extensions/update.js.map +1 -1
  53. package/dist/src/config/extensions/update.test.js +121 -71
  54. package/dist/src/config/extensions/update.test.js.map +1 -1
  55. package/dist/src/config/keyBindings.js +1 -1
  56. package/dist/src/config/keyBindings.js.map +1 -1
  57. package/dist/src/config/policy.js +2 -2
  58. package/dist/src/config/policy.js.map +1 -1
  59. package/dist/src/config/settings.d.ts +10 -1
  60. package/dist/src/config/settings.js +21 -6
  61. package/dist/src/config/settings.js.map +1 -1
  62. package/dist/src/config/settingsSchema.d.ts +97 -5
  63. package/dist/src/config/settingsSchema.js +96 -4
  64. package/dist/src/config/settingsSchema.js.map +1 -1
  65. package/dist/src/config/settingsSchema.test.js +8 -0
  66. package/dist/src/config/settingsSchema.test.js.map +1 -1
  67. package/dist/src/config/trustedFolders.d.ts +10 -2
  68. package/dist/src/config/trustedFolders.js +41 -16
  69. package/dist/src/config/trustedFolders.js.map +1 -1
  70. package/dist/src/config/trustedFolders.test.js +95 -14
  71. package/dist/src/config/trustedFolders.test.js.map +1 -1
  72. package/dist/src/gemini.js +114 -132
  73. package/dist/src/gemini.js.map +1 -1
  74. package/dist/src/gemini.test.js +95 -14
  75. package/dist/src/gemini.test.js.map +1 -1
  76. package/dist/src/generated/git-commit.d.ts +2 -2
  77. package/dist/src/generated/git-commit.js +2 -2
  78. package/dist/src/generated/git-commit.js.map +1 -1
  79. package/dist/src/services/BuiltinCommandLoader.js +7 -0
  80. package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
  81. package/dist/src/services/BuiltinCommandLoader.test.js +87 -1
  82. package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
  83. package/dist/src/services/FileCommandLoader.d.ts +1 -1
  84. package/dist/src/services/FileCommandLoader.js +4 -4
  85. package/dist/src/services/FileCommandLoader.js.map +1 -1
  86. package/dist/src/services/prompt-processors/shellProcessor.js +1 -1
  87. package/dist/src/services/prompt-processors/shellProcessor.js.map +1 -1
  88. package/dist/src/test-utils/render.d.ts +12 -1
  89. package/dist/src/test-utils/render.js +56 -1
  90. package/dist/src/test-utils/render.js.map +1 -1
  91. package/dist/src/ui/App.js +7 -9
  92. package/dist/src/ui/App.js.map +1 -1
  93. package/dist/src/ui/AppContainer.js +99 -27
  94. package/dist/src/ui/AppContainer.js.map +1 -1
  95. package/dist/src/ui/AppContainer.test.js +300 -7
  96. package/dist/src/ui/AppContainer.test.js.map +1 -1
  97. package/dist/src/ui/IdeIntegrationNudge.js +3 -0
  98. package/dist/src/ui/IdeIntegrationNudge.js.map +1 -1
  99. package/dist/src/ui/auth/AuthDialog.js +8 -1
  100. package/dist/src/ui/auth/AuthDialog.js.map +1 -1
  101. package/dist/src/ui/auth/AuthDialog.test.js +1 -0
  102. package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
  103. package/dist/src/ui/auth/AuthInProgress.js +2 -2
  104. package/dist/src/ui/auth/AuthInProgress.js.map +1 -1
  105. package/dist/src/ui/commands/chatCommand.js +21 -27
  106. package/dist/src/ui/commands/chatCommand.js.map +1 -1
  107. package/dist/src/ui/commands/extensionsCommand.js +39 -34
  108. package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
  109. package/dist/src/ui/commands/mcpCommand.js +78 -260
  110. package/dist/src/ui/commands/mcpCommand.js.map +1 -1
  111. package/dist/src/ui/commands/memoryCommand.js +23 -5
  112. package/dist/src/ui/commands/memoryCommand.js.map +1 -1
  113. package/dist/src/ui/commands/modelCommand.d.ts +7 -0
  114. package/dist/src/ui/commands/modelCommand.js +16 -0
  115. package/dist/src/ui/commands/modelCommand.js.map +1 -0
  116. package/dist/src/ui/commands/modelCommand.test.js +30 -0
  117. package/dist/src/ui/commands/modelCommand.test.js.map +1 -0
  118. package/dist/src/ui/commands/permissionsCommand.d.ts +7 -0
  119. package/dist/src/ui/commands/permissionsCommand.js +16 -0
  120. package/dist/src/ui/commands/permissionsCommand.js.map +1 -0
  121. package/dist/src/ui/commands/permissionsCommand.test.d.ts +6 -0
  122. package/dist/src/ui/commands/permissionsCommand.test.js +30 -0
  123. package/dist/src/ui/commands/permissionsCommand.test.js.map +1 -0
  124. package/dist/src/ui/commands/profileCommand.d.ts +7 -0
  125. package/dist/src/ui/commands/profileCommand.js +23 -0
  126. package/dist/src/ui/commands/profileCommand.js.map +1 -0
  127. package/dist/src/ui/commands/setupGithubCommand.test.js +2 -1
  128. package/dist/src/ui/commands/setupGithubCommand.test.js.map +1 -1
  129. package/dist/src/ui/commands/toolsCommand.js +10 -24
  130. package/dist/src/ui/commands/toolsCommand.js.map +1 -1
  131. package/dist/src/ui/commands/types.d.ts +8 -6
  132. package/dist/src/ui/commands/types.js.map +1 -1
  133. package/dist/src/ui/components/AnsiOutput.d.ts +1 -0
  134. package/dist/src/ui/components/AnsiOutput.js +5 -5
  135. package/dist/src/ui/components/AnsiOutput.js.map +1 -1
  136. package/dist/src/ui/components/AnsiOutput.test.js +6 -6
  137. package/dist/src/ui/components/AnsiOutput.test.js.map +1 -1
  138. package/dist/src/ui/components/AppHeader.js +2 -5
  139. package/dist/src/ui/components/AppHeader.js.map +1 -1
  140. package/dist/src/ui/components/CliSpinner.d.ts +10 -0
  141. package/dist/src/ui/components/CliSpinner.js +20 -0
  142. package/dist/src/ui/components/CliSpinner.js.map +1 -0
  143. package/dist/src/ui/components/Composer.js +7 -29
  144. package/dist/src/ui/components/Composer.js.map +1 -1
  145. package/dist/src/ui/components/ConsentPrompt.d.ts +13 -0
  146. package/dist/src/ui/components/ConsentPrompt.js +19 -0
  147. package/dist/src/ui/components/ConsentPrompt.js.map +1 -0
  148. package/dist/src/ui/components/ConsentPrompt.test.d.ts +6 -0
  149. package/dist/src/ui/components/ConsentPrompt.test.js +67 -0
  150. package/dist/src/ui/components/ConsentPrompt.test.js.map +1 -0
  151. package/dist/src/ui/components/ContextSummaryDisplay.js +2 -2
  152. package/dist/src/ui/components/ContextSummaryDisplay.js.map +1 -1
  153. package/dist/src/ui/components/ContextUsageDisplay.d.ts +2 -1
  154. package/dist/src/ui/components/ContextUsageDisplay.js +4 -2
  155. package/dist/src/ui/components/ContextUsageDisplay.js.map +1 -1
  156. package/dist/src/ui/components/DebugProfiler.d.ts +18 -0
  157. package/dist/src/ui/components/DebugProfiler.js +158 -12
  158. package/dist/src/ui/components/DebugProfiler.js.map +1 -1
  159. package/dist/src/ui/components/DebugProfiler.test.d.ts +6 -0
  160. package/dist/src/ui/components/DebugProfiler.test.js +140 -0
  161. package/dist/src/ui/components/DebugProfiler.test.js.map +1 -0
  162. package/dist/src/ui/components/DialogManager.d.ts +7 -1
  163. package/dist/src/ui/components/DialogManager.js +18 -9
  164. package/dist/src/ui/components/DialogManager.js.map +1 -1
  165. package/dist/src/ui/components/EditorSettingsDialog.js +11 -2
  166. package/dist/src/ui/components/EditorSettingsDialog.js.map +1 -1
  167. package/dist/src/ui/components/ExitWarning.d.ts +7 -0
  168. package/dist/src/ui/components/ExitWarning.js +9 -0
  169. package/dist/src/ui/components/ExitWarning.js.map +1 -0
  170. package/dist/src/ui/components/FolderTrustDialog.js +3 -0
  171. package/dist/src/ui/components/FolderTrustDialog.js.map +1 -1
  172. package/dist/src/ui/components/FolderTrustDialog.test.js +2 -2
  173. package/dist/src/ui/components/FolderTrustDialog.test.js.map +1 -1
  174. package/dist/src/ui/components/Footer.d.ts +1 -19
  175. package/dist/src/ui/components/Footer.js +35 -17
  176. package/dist/src/ui/components/Footer.js.map +1 -1
  177. package/dist/src/ui/components/GeminiRespondingSpinner.js +2 -2
  178. package/dist/src/ui/components/GeminiRespondingSpinner.js.map +1 -1
  179. package/dist/src/ui/components/Help.js +1 -1
  180. package/dist/src/ui/components/Help.js.map +1 -1
  181. package/dist/src/ui/components/HistoryItemDisplay.d.ts +2 -1
  182. package/dist/src/ui/components/HistoryItemDisplay.js +10 -1
  183. package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
  184. package/dist/src/ui/components/HistoryItemDisplay.test.js +90 -9
  185. package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
  186. package/dist/src/ui/components/IdeTrustChangeDialog.d.ts +11 -0
  187. package/dist/src/ui/components/IdeTrustChangeDialog.js +32 -0
  188. package/dist/src/ui/components/IdeTrustChangeDialog.js.map +1 -0
  189. package/dist/src/ui/components/IdeTrustChangeDialog.test.d.ts +6 -0
  190. package/dist/src/ui/components/IdeTrustChangeDialog.test.js +57 -0
  191. package/dist/src/ui/components/IdeTrustChangeDialog.test.js.map +1 -0
  192. package/dist/src/ui/components/InputPrompt.d.ts +8 -2
  193. package/dist/src/ui/components/InputPrompt.js +66 -32
  194. package/dist/src/ui/components/InputPrompt.js.map +1 -1
  195. package/dist/src/ui/components/LoadingIndicator.js +1 -1
  196. package/dist/src/ui/components/LoadingIndicator.js.map +1 -1
  197. package/dist/src/ui/components/LoadingIndicator.test.js +4 -0
  198. package/dist/src/ui/components/LoadingIndicator.test.js.map +1 -1
  199. package/dist/src/ui/components/LoopDetectionConfirmation.js +2 -0
  200. package/dist/src/ui/components/LoopDetectionConfirmation.js.map +1 -1
  201. package/dist/src/ui/components/MainContent.js +7 -2
  202. package/dist/src/ui/components/MainContent.js.map +1 -1
  203. package/dist/src/ui/components/ModelDialog.d.ts +11 -0
  204. package/dist/src/ui/components/ModelDialog.js +57 -0
  205. package/dist/src/ui/components/ModelDialog.js.map +1 -0
  206. package/dist/src/ui/components/ModelDialog.test.d.ts +6 -0
  207. package/dist/src/ui/components/ModelDialog.test.js +153 -0
  208. package/dist/src/ui/components/ModelDialog.test.js.map +1 -0
  209. package/dist/src/ui/components/Notifications.js +12 -4
  210. package/dist/src/ui/components/Notifications.js.map +1 -1
  211. package/dist/src/ui/components/PermissionsModifyTrustDialog.d.ts +13 -0
  212. package/dist/src/ui/components/PermissionsModifyTrustDialog.js +48 -0
  213. package/dist/src/ui/components/PermissionsModifyTrustDialog.js.map +1 -0
  214. package/dist/src/ui/components/PermissionsModifyTrustDialog.test.d.ts +6 -0
  215. package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js +154 -0
  216. package/dist/src/ui/components/PermissionsModifyTrustDialog.test.js.map +1 -0
  217. package/dist/src/ui/components/ProQuotaDialog.js +2 -0
  218. package/dist/src/ui/components/ProQuotaDialog.js.map +1 -1
  219. package/dist/src/ui/components/ProQuotaDialog.test.js +2 -0
  220. package/dist/src/ui/components/ProQuotaDialog.test.js.map +1 -1
  221. package/dist/src/ui/components/SettingsDialog.js +6 -3
  222. package/dist/src/ui/components/SettingsDialog.js.map +1 -1
  223. package/dist/src/ui/components/SettingsDialog.test.js +47 -13
  224. package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
  225. package/dist/src/ui/components/ShellConfirmationDialog.js +3 -0
  226. package/dist/src/ui/components/ShellConfirmationDialog.js.map +1 -1
  227. package/dist/src/ui/components/ThemeDialog.js +2 -0
  228. package/dist/src/ui/components/ThemeDialog.js.map +1 -1
  229. package/dist/src/ui/components/WorkspaceMigrationDialog.d.ts +2 -2
  230. package/dist/src/ui/components/WorkspaceMigrationDialog.js +7 -5
  231. package/dist/src/ui/components/WorkspaceMigrationDialog.js.map +1 -1
  232. package/dist/src/ui/components/messages/CompressionMessage.js +2 -2
  233. package/dist/src/ui/components/messages/CompressionMessage.js.map +1 -1
  234. package/dist/src/ui/components/messages/ToolConfirmationMessage.js +15 -1
  235. package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
  236. package/dist/src/ui/components/messages/ToolGroupMessage.d.ts +1 -1
  237. package/dist/src/ui/components/messages/ToolGroupMessage.js +5 -5
  238. package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
  239. package/dist/src/ui/components/messages/ToolMessage.d.ts +1 -1
  240. package/dist/src/ui/components/messages/ToolMessage.js +28 -5
  241. package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
  242. package/dist/src/ui/components/messages/UserMessage.js +1 -2
  243. package/dist/src/ui/components/messages/UserMessage.js.map +1 -1
  244. package/dist/src/ui/components/shared/BaseSelectionList.d.ts +38 -0
  245. package/dist/src/ui/components/shared/BaseSelectionList.js +72 -0
  246. package/dist/src/ui/components/shared/BaseSelectionList.js.map +1 -0
  247. package/dist/src/ui/components/shared/BaseSelectionList.test.d.ts +6 -0
  248. package/dist/src/ui/components/shared/BaseSelectionList.test.js +376 -0
  249. package/dist/src/ui/components/shared/BaseSelectionList.test.js.map +1 -0
  250. package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.d.ts +35 -0
  251. package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.js +13 -0
  252. package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.js.map +1 -0
  253. package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.test.d.ts +6 -0
  254. package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.test.js +79 -0
  255. package/dist/src/ui/components/shared/DescriptiveRadioButtonSelect.test.js.map +1 -0
  256. package/dist/src/ui/components/shared/RadioButtonSelect.d.ts +2 -3
  257. package/dist/src/ui/components/shared/RadioButtonSelect.js +9 -104
  258. package/dist/src/ui/components/shared/RadioButtonSelect.js.map +1 -1
  259. package/dist/src/ui/components/shared/RadioButtonSelect.test.js +115 -92
  260. package/dist/src/ui/components/shared/RadioButtonSelect.test.js.map +1 -1
  261. package/dist/src/ui/components/shared/ScopeSelector.js +4 -1
  262. package/dist/src/ui/components/shared/ScopeSelector.js.map +1 -1
  263. package/dist/src/ui/components/views/ChatList.d.ts +12 -0
  264. package/dist/src/ui/components/views/ChatList.js +17 -0
  265. package/dist/src/ui/components/views/ChatList.js.map +1 -0
  266. package/dist/src/ui/components/views/ChatList.test.d.ts +6 -0
  267. package/dist/src/ui/components/views/ChatList.test.js +42 -0
  268. package/dist/src/ui/components/views/ChatList.test.js.map +1 -0
  269. package/dist/src/ui/components/views/ExtensionsList.test.js +1 -1
  270. package/dist/src/ui/components/views/ExtensionsList.test.js.map +1 -1
  271. package/dist/src/ui/components/views/McpStatus.d.ts +27 -0
  272. package/dist/src/ui/components/views/McpStatus.js +77 -0
  273. package/dist/src/ui/components/views/McpStatus.js.map +1 -0
  274. package/dist/src/ui/components/views/McpStatus.test.d.ts +6 -0
  275. package/dist/src/ui/components/views/McpStatus.test.js +117 -0
  276. package/dist/src/ui/components/views/McpStatus.test.js.map +1 -0
  277. package/dist/src/ui/components/views/ToolsList.d.ts +14 -0
  278. package/dist/src/ui/components/views/ToolsList.js +7 -0
  279. package/dist/src/ui/components/views/ToolsList.js.map +1 -0
  280. package/dist/src/ui/components/views/ToolsList.test.d.ts +6 -0
  281. package/dist/src/ui/components/views/ToolsList.test.js +45 -0
  282. package/dist/src/ui/components/views/ToolsList.test.js.map +1 -0
  283. package/dist/src/ui/contexts/KeypressContext.js +3 -0
  284. package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
  285. package/dist/src/ui/contexts/ShellFocusContext.d.ts +7 -0
  286. package/dist/src/ui/contexts/ShellFocusContext.js +9 -0
  287. package/dist/src/ui/contexts/ShellFocusContext.js.map +1 -0
  288. package/dist/src/ui/contexts/UIActionsContext.d.ts +2 -0
  289. package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
  290. package/dist/src/ui/contexts/UIStateContext.d.ts +11 -2
  291. package/dist/src/ui/contexts/UIStateContext.js +2 -0
  292. package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
  293. package/dist/src/ui/hooks/shellCommandProcessor.js +5 -6
  294. package/dist/src/ui/hooks/shellCommandProcessor.js.map +1 -1
  295. package/dist/src/ui/hooks/shellCommandProcessor.test.js +19 -32
  296. package/dist/src/ui/hooks/shellCommandProcessor.test.js.map +1 -1
  297. package/dist/src/ui/hooks/slashCommandProcessor.d.ts +8 -5
  298. package/dist/src/ui/hooks/slashCommandProcessor.js +11 -2
  299. package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
  300. package/dist/src/ui/hooks/useExtensionUpdates.d.ts +10 -1
  301. package/dist/src/ui/hooks/useExtensionUpdates.js +140 -38
  302. package/dist/src/ui/hooks/useExtensionUpdates.js.map +1 -1
  303. package/dist/src/ui/hooks/useExtensionUpdates.test.js +163 -84
  304. package/dist/src/ui/hooks/useExtensionUpdates.test.js.map +1 -1
  305. package/dist/src/ui/hooks/useFlickerDetector.d.ts +14 -0
  306. package/dist/src/ui/hooks/useFlickerDetector.js +37 -0
  307. package/dist/src/ui/hooks/useFlickerDetector.js.map +1 -0
  308. package/dist/src/ui/hooks/useFlickerDetector.test.d.ts +6 -0
  309. package/dist/src/ui/hooks/useFlickerDetector.test.js +102 -0
  310. package/dist/src/ui/hooks/useFlickerDetector.test.js.map +1 -0
  311. package/dist/src/ui/hooks/useFocus.js +10 -0
  312. package/dist/src/ui/hooks/useFocus.js.map +1 -1
  313. package/dist/src/ui/hooks/useFolderTrust.d.ts +2 -1
  314. package/dist/src/ui/hooks/useFolderTrust.js +13 -9
  315. package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
  316. package/dist/src/ui/hooks/useGeminiStream.js +38 -3
  317. package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
  318. package/dist/src/ui/hooks/useGitBranchName.test.js.map +1 -1
  319. package/dist/src/ui/hooks/useHistoryManager.js +3 -3
  320. package/dist/src/ui/hooks/useHistoryManager.js.map +1 -1
  321. package/dist/src/ui/hooks/useIdeTrustListener.d.ts +4 -2
  322. package/dist/src/ui/hooks/useIdeTrustListener.js +40 -14
  323. package/dist/src/ui/hooks/useIdeTrustListener.js.map +1 -1
  324. package/dist/src/ui/hooks/useIdeTrustListener.test.d.ts +6 -0
  325. package/dist/src/ui/hooks/useIdeTrustListener.test.js +183 -0
  326. package/dist/src/ui/hooks/useIdeTrustListener.test.js.map +1 -0
  327. package/dist/src/ui/hooks/useModelCommand.d.ts +12 -0
  328. package/dist/src/ui/hooks/useModelCommand.js +21 -0
  329. package/dist/src/ui/hooks/useModelCommand.js.map +1 -0
  330. package/dist/src/ui/hooks/useModelCommand.test.d.ts +6 -0
  331. package/dist/src/ui/hooks/useModelCommand.test.js +35 -0
  332. package/dist/src/ui/hooks/useModelCommand.test.js.map +1 -0
  333. package/dist/src/ui/hooks/usePermissionsModifyTrust.d.ts +17 -0
  334. package/dist/src/ui/hooks/usePermissionsModifyTrust.js +78 -0
  335. package/dist/src/ui/hooks/usePermissionsModifyTrust.js.map +1 -0
  336. package/dist/src/ui/hooks/usePermissionsModifyTrust.test.d.ts +6 -0
  337. package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js +182 -0
  338. package/dist/src/ui/hooks/usePermissionsModifyTrust.test.js.map +1 -0
  339. package/dist/src/ui/hooks/usePhraseCycler.js +1 -0
  340. package/dist/src/ui/hooks/usePhraseCycler.js.map +1 -1
  341. package/dist/src/ui/hooks/useQuotaAndFallback.js +3 -17
  342. package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
  343. package/dist/src/ui/hooks/useQuotaAndFallback.test.js +13 -43
  344. package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -1
  345. package/dist/src/ui/hooks/useSelectionList.d.ts +34 -0
  346. package/dist/src/ui/hooks/useSelectionList.js +272 -0
  347. package/dist/src/ui/hooks/useSelectionList.js.map +1 -0
  348. package/dist/src/ui/hooks/useSelectionList.test.d.ts +6 -0
  349. package/dist/src/ui/hooks/useSelectionList.test.js +725 -0
  350. package/dist/src/ui/hooks/useSelectionList.test.js.map +1 -0
  351. package/dist/src/ui/hooks/useShellHistory.test.js +12 -8
  352. package/dist/src/ui/hooks/useShellHistory.test.js.map +1 -1
  353. package/dist/src/ui/hooks/useSlashCompletion.js +7 -2
  354. package/dist/src/ui/hooks/useSlashCompletion.js.map +1 -1
  355. package/dist/src/ui/hooks/useSlashCompletion.test.js +33 -0
  356. package/dist/src/ui/hooks/useSlashCompletion.test.js.map +1 -1
  357. package/dist/src/ui/hooks/useTerminalSize.js +2 -3
  358. package/dist/src/ui/hooks/useTerminalSize.js.map +1 -1
  359. package/dist/src/ui/hooks/useToolScheduler.test.js +2 -2
  360. package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
  361. package/dist/src/ui/hooks/useWorkspaceMigration.d.ts +2 -2
  362. package/dist/src/ui/hooks/useWorkspaceMigration.js +13 -8
  363. package/dist/src/ui/hooks/useWorkspaceMigration.js.map +1 -1
  364. package/dist/src/ui/layouts/DefaultAppLayout.d.ts +7 -0
  365. package/dist/src/ui/layouts/DefaultAppLayout.js +16 -0
  366. package/dist/src/ui/layouts/DefaultAppLayout.js.map +1 -0
  367. package/dist/src/ui/layouts/ScreenReaderAppLayout.d.ts +7 -0
  368. package/dist/src/ui/layouts/ScreenReaderAppLayout.js +17 -0
  369. package/dist/src/ui/layouts/ScreenReaderAppLayout.js.map +1 -0
  370. package/dist/src/ui/noninteractive/nonInteractiveUi.js +3 -1
  371. package/dist/src/ui/noninteractive/nonInteractiveUi.js.map +1 -1
  372. package/dist/src/ui/privacy/CloudFreePrivacyNotice.js +5 -5
  373. package/dist/src/ui/privacy/CloudFreePrivacyNotice.js.map +1 -1
  374. package/dist/src/ui/state/extensions.d.ts +47 -1
  375. package/dist/src/ui/state/extensions.js +68 -1
  376. package/dist/src/ui/state/extensions.js.map +1 -1
  377. package/dist/src/ui/themes/theme.js +2 -2
  378. package/dist/src/ui/themes/theme.js.map +1 -1
  379. package/dist/src/ui/types.d.ts +54 -3
  380. package/dist/src/ui/types.js +3 -0
  381. package/dist/src/ui/types.js.map +1 -1
  382. package/dist/src/ui/utils/MarkdownDisplay.js +1 -2
  383. package/dist/src/ui/utils/MarkdownDisplay.js.map +1 -1
  384. package/dist/src/ui/utils/MarkdownDisplay.test.js +94 -91
  385. package/dist/src/ui/utils/MarkdownDisplay.test.js.map +1 -1
  386. package/dist/src/ui/utils/displayUtils.d.ts +1 -0
  387. package/dist/src/ui/utils/displayUtils.js +4 -1
  388. package/dist/src/ui/utils/displayUtils.js.map +1 -1
  389. package/dist/src/ui/utils/displayUtils.test.js +36 -17
  390. package/dist/src/ui/utils/displayUtils.test.js.map +1 -1
  391. package/dist/src/ui/utils/textUtils.d.ts +1 -0
  392. package/dist/src/ui/utils/textUtils.js +56 -0
  393. package/dist/src/ui/utils/textUtils.js.map +1 -1
  394. package/dist/src/ui/utils/textUtils.test.d.ts +6 -0
  395. package/dist/src/ui/utils/textUtils.test.js +132 -0
  396. package/dist/src/ui/utils/textUtils.test.js.map +1 -0
  397. package/dist/src/ui/utils/ui-sizing.d.ts +7 -0
  398. package/dist/src/ui/utils/ui-sizing.js +23 -0
  399. package/dist/src/ui/utils/ui-sizing.js.map +1 -0
  400. package/dist/src/utils/commentJson.js +95 -13
  401. package/dist/src/utils/commentJson.js.map +1 -1
  402. package/dist/src/utils/commentJson.test.js +161 -0
  403. package/dist/src/utils/commentJson.test.js.map +1 -1
  404. package/dist/src/utils/deepMerge.d.ts +2 -3
  405. package/dist/src/utils/errors.d.ts +8 -3
  406. package/dist/src/utils/errors.js +23 -13
  407. package/dist/src/utils/errors.js.map +1 -1
  408. package/dist/src/utils/errors.test.js +40 -46
  409. package/dist/src/utils/errors.test.js.map +1 -1
  410. package/dist/src/utils/events.d.ts +2 -1
  411. package/dist/src/utils/events.js +1 -0
  412. package/dist/src/utils/events.js.map +1 -1
  413. package/dist/src/utils/handleAutoUpdate.js +4 -1
  414. package/dist/src/utils/handleAutoUpdate.js.map +1 -1
  415. package/dist/src/utils/installationInfo.d.ts +1 -0
  416. package/dist/src/utils/installationInfo.js +2 -0
  417. package/dist/src/utils/installationInfo.js.map +1 -1
  418. package/dist/src/utils/math.d.ts +13 -0
  419. package/dist/src/utils/math.js +14 -0
  420. package/dist/src/utils/math.js.map +1 -0
  421. package/dist/src/utils/relaunch.d.ts +7 -0
  422. package/dist/src/utils/relaunch.js +57 -0
  423. package/dist/src/utils/relaunch.js.map +1 -0
  424. package/dist/src/utils/relaunch.test.d.ts +6 -0
  425. package/dist/src/utils/relaunch.test.js +273 -0
  426. package/dist/src/utils/relaunch.test.js.map +1 -0
  427. package/dist/src/utils/sandbox.js +31 -17
  428. package/dist/src/utils/sandbox.js.map +1 -1
  429. package/dist/src/utils/sessionCleanup.d.ts +22 -0
  430. package/dist/src/utils/sessionCleanup.integration.test.d.ts +6 -0
  431. package/dist/src/utils/sessionCleanup.integration.test.js +182 -0
  432. package/dist/src/utils/sessionCleanup.integration.test.js.map +1 -0
  433. package/dist/src/utils/sessionCleanup.js +214 -0
  434. package/dist/src/utils/sessionCleanup.js.map +1 -0
  435. package/dist/src/utils/sessionCleanup.test.d.ts +6 -0
  436. package/dist/src/utils/sessionCleanup.test.js +1232 -0
  437. package/dist/src/utils/sessionCleanup.test.js.map +1 -0
  438. package/dist/src/utils/sessionUtils.d.ts +37 -0
  439. package/dist/src/utils/sessionUtils.js +71 -0
  440. package/dist/src/utils/sessionUtils.js.map +1 -0
  441. package/dist/src/utils/windowTitle.d.ts +12 -0
  442. package/dist/src/utils/windowTitle.js +19 -0
  443. package/dist/src/utils/windowTitle.js.map +1 -0
  444. package/dist/src/utils/windowTitle.test.d.ts +6 -0
  445. package/dist/src/utils/windowTitle.test.js +49 -0
  446. package/dist/src/utils/windowTitle.test.js.map +1 -0
  447. package/dist/src/validateNonInterActiveAuth.js +6 -7
  448. package/dist/src/validateNonInterActiveAuth.js.map +1 -1
  449. package/dist/src/zed-integration/acp.js +1 -2
  450. package/dist/src/zed-integration/acp.js.map +1 -1
  451. package/dist/src/zed-integration/fileSystemService.d.ts +1 -0
  452. package/dist/src/zed-integration/fileSystemService.js +3 -0
  453. package/dist/src/zed-integration/fileSystemService.js.map +1 -1
  454. package/dist/src/zed-integration/schema.d.ts +70 -70
  455. package/dist/src/zed-integration/zedIntegration.d.ts +9 -3
  456. package/dist/src/zed-integration/zedIntegration.js +23 -28
  457. package/dist/src/zed-integration/zedIntegration.js.map +1 -1
  458. package/dist/tsconfig.tsbuildinfo +1 -1
  459. package/package.json +13 -5
  460. package/dist/src/commands/extensions/examples/mcp-server/example.js +0 -46
  461. package/dist/src/commands/extensions/examples/mcp-server/example.js.map +0 -1
  462. package/dist/src/ui/contexts/FocusContext.d.ts +0 -7
  463. package/dist/src/ui/contexts/FocusContext.js +0 -9
  464. package/dist/src/ui/contexts/FocusContext.js.map +0 -1
  465. /package/dist/src/{commands/extensions/examples/mcp-server/example.d.ts → ui/commands/modelCommand.test.d.ts} +0 -0
@@ -6,25 +6,26 @@
6
6
  import { describe, it, expect, vi } from 'vitest';
7
7
  import { handleInstall, installCommand } from './install.js';
8
8
  import yargs from 'yargs';
9
- const mockInstallExtension = vi.hoisted(() => vi.fn());
9
+ const mockInstallOrUpdateExtension = vi.hoisted(() => vi.fn());
10
+ const mockRequestConsentNonInteractive = vi.hoisted(() => vi.fn());
11
+ const mockStat = vi.hoisted(() => vi.fn());
10
12
  vi.mock('../../config/extension.js', () => ({
11
- installExtension: mockInstallExtension,
13
+ installOrUpdateExtension: mockInstallOrUpdateExtension,
14
+ requestConsentNonInteractive: mockRequestConsentNonInteractive,
12
15
  }));
13
16
  vi.mock('../../utils/errors.js', () => ({
14
17
  getErrorMessage: vi.fn((error) => error.message),
15
18
  }));
19
+ vi.mock('node:fs/promises', () => ({
20
+ stat: mockStat,
21
+ default: {
22
+ stat: mockStat,
23
+ },
24
+ }));
16
25
  describe('extensions install command', () => {
17
26
  it('should fail if no source is provided', () => {
18
27
  const validationParser = yargs([]).command(installCommand).fail(false);
19
- expect(() => validationParser.parse('install')).toThrow('Either source or --path must be provided.');
20
- });
21
- it('should fail if both git source and local path are provided', () => {
22
- const validationParser = yargs([]).command(installCommand).fail(false);
23
- expect(() => validationParser.parse('install some-url --path /some/path')).toThrow('Arguments source and path are mutually exclusive');
24
- });
25
- it('should fail if both auto update and local path are provided', () => {
26
- const validationParser = yargs([]).command(installCommand).fail(false);
27
- expect(() => validationParser.parse('install some-url --path /some/path --auto-update')).toThrow('Arguments path and auto-update are mutually exclusive');
28
+ expect(() => validationParser.parse('install')).toThrow('Not enough non-option arguments: got 0, need at least 1');
28
29
  });
29
30
  });
30
31
  describe('handleInstall', () => {
@@ -39,58 +40,57 @@ describe('handleInstall', () => {
39
40
  .mockImplementation(() => undefined);
40
41
  });
41
42
  afterEach(() => {
42
- mockInstallExtension.mockClear();
43
+ mockInstallOrUpdateExtension.mockClear();
44
+ mockRequestConsentNonInteractive.mockClear();
45
+ mockStat.mockClear();
43
46
  vi.resetAllMocks();
44
47
  });
45
48
  it('should install an extension from a http source', async () => {
46
- mockInstallExtension.mockResolvedValue('http-extension');
49
+ mockInstallOrUpdateExtension.mockResolvedValue('http-extension');
47
50
  await handleInstall({
48
51
  source: 'http://google.com',
49
52
  });
50
53
  expect(consoleLogSpy).toHaveBeenCalledWith('Extension "http-extension" installed successfully and enabled.');
51
54
  });
52
55
  it('should install an extension from a https source', async () => {
53
- mockInstallExtension.mockResolvedValue('https-extension');
56
+ mockInstallOrUpdateExtension.mockResolvedValue('https-extension');
54
57
  await handleInstall({
55
58
  source: 'https://google.com',
56
59
  });
57
60
  expect(consoleLogSpy).toHaveBeenCalledWith('Extension "https-extension" installed successfully and enabled.');
58
61
  });
59
62
  it('should install an extension from a git source', async () => {
60
- mockInstallExtension.mockResolvedValue('git-extension');
63
+ mockInstallOrUpdateExtension.mockResolvedValue('git-extension');
61
64
  await handleInstall({
62
65
  source: 'git@some-url',
63
66
  });
64
67
  expect(consoleLogSpy).toHaveBeenCalledWith('Extension "git-extension" installed successfully and enabled.');
65
68
  });
66
69
  it('throws an error from an unknown source', async () => {
70
+ mockStat.mockRejectedValue(new Error('ENOENT: no such file or directory'));
67
71
  await handleInstall({
68
72
  source: 'test://google.com',
69
73
  });
70
- expect(consoleErrorSpy).toHaveBeenCalledWith('The source "test://google.com" is not a valid URL format.');
74
+ expect(consoleErrorSpy).toHaveBeenCalledWith('Install source not found.');
71
75
  expect(processSpy).toHaveBeenCalledWith(1);
72
76
  });
73
77
  it('should install an extension from a sso source', async () => {
74
- mockInstallExtension.mockResolvedValue('sso-extension');
78
+ mockInstallOrUpdateExtension.mockResolvedValue('sso-extension');
75
79
  await handleInstall({
76
80
  source: 'sso://google.com',
77
81
  });
78
82
  expect(consoleLogSpy).toHaveBeenCalledWith('Extension "sso-extension" installed successfully and enabled.');
79
83
  });
80
84
  it('should install an extension from a local path', async () => {
81
- mockInstallExtension.mockResolvedValue('local-extension');
85
+ mockInstallOrUpdateExtension.mockResolvedValue('local-extension');
86
+ mockStat.mockResolvedValue({});
82
87
  await handleInstall({
83
- path: '/some/path',
88
+ source: '/some/path',
84
89
  });
85
90
  expect(consoleLogSpy).toHaveBeenCalledWith('Extension "local-extension" installed successfully and enabled.');
86
91
  });
87
- it('should throw an error if no source or path is provided', async () => {
88
- await handleInstall({});
89
- expect(consoleErrorSpy).toHaveBeenCalledWith('Either --source or --path must be provided.');
90
- expect(processSpy).toHaveBeenCalledWith(1);
91
- });
92
92
  it('should throw an error if install extension fails', async () => {
93
- mockInstallExtension.mockRejectedValue(new Error('Install extension failed'));
93
+ mockInstallOrUpdateExtension.mockRejectedValue(new Error('Install extension failed'));
94
94
  await handleInstall({ source: 'git@some-url' });
95
95
  expect(consoleErrorSpy).toHaveBeenCalledWith('Install extension failed');
96
96
  expect(processSpy).toHaveBeenCalledWith(1);
@@ -1 +1 @@
1
- {"version":3,"file":"install.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/install.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"install.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/install.test.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 { installExtension } from '../../config/extension.js';
6
+ import { installOrUpdateExtension, requestConsentNonInteractive, } from '../../config/extension.js';
7
7
  import { getErrorMessage } from '../../utils/errors.js';
8
8
  export async function handleLink(args) {
9
9
  try {
@@ -11,7 +11,7 @@ export async function handleLink(args) {
11
11
  source: args.path,
12
12
  type: 'link',
13
13
  };
14
- const extensionName = await installExtension(installMetadata);
14
+ const extensionName = await installOrUpdateExtension(installMetadata, requestConsentNonInteractive);
15
15
  console.log(`Extension "${extensionName}" linked successfully and enabled.`);
16
16
  }
17
17
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"link.js","sourceRoot":"","sources":["../../../../src/commands/extensions/link.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAiB;IAChD,IAAI,CAAC;QACH,MAAM,eAAe,GAA6B;YAChD,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM;SACb,CAAC;QACF,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,eAAe,CAAC,CAAC;QAC9D,OAAO,CAAC,GAAG,CACT,cAAc,aAAa,oCAAoC,CAChE,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAkB;IACxC,OAAO,EAAE,aAAa;IACtB,QAAQ,EACN,gGAAgG;IAClG,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,oCAAoC;QAC9C,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC;IACvB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,UAAU,CAAC;YACf,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;SAC7B,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"link.js","sourceRoot":"","sources":["../../../../src/commands/extensions/link.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAiB;IAChD,IAAI,CAAC;QACH,MAAM,eAAe,GAA6B;YAChD,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM;SACb,CAAC;QACF,MAAM,aAAa,GAAG,MAAM,wBAAwB,CAClD,eAAe,EACf,4BAA4B,CAC7B,CAAC;QACF,OAAO,CAAC,GAAG,CACT,cAAc,aAAa,oCAAoC,CAChE,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAkB;IACxC,OAAO,EAAE,aAAa;IACtB,QAAQ,EACN,gGAAgG;IAClG,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,oCAAoC;QAC9C,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC;IACvB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,UAAU,CAAC;YACf,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;SAC7B,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
@@ -13,7 +13,7 @@ export async function handleList() {
13
13
  return;
14
14
  }
15
15
  console.log(extensions
16
- .map((extension, _) => toOutputString(extension))
16
+ .map((extension, _) => toOutputString(extension, process.cwd()))
17
17
  .join('\n\n'));
18
18
  }
19
19
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/extensions/list.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,KAAK,UAAU,UAAU;IAC9B,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC;QACxC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;YACxC,OAAO;QACT,CAAC;QACD,OAAO,CAAC,GAAG,CACT,UAAU;aACP,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,EAAU,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;aACxD,IAAI,CAAC,MAAM,CAAC,CAChB,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAkB;IACxC,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,6BAA6B;IACvC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;IACzB,OAAO,EAAE,KAAK,IAAI,EAAE;QAClB,MAAM,UAAU,EAAE,CAAC;IACrB,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/extensions/list.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,KAAK,UAAU,UAAU;IAC9B,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC;QACxC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;YACxC,OAAO;QACT,CAAC;QACD,OAAO,CAAC,GAAG,CACT,UAAU;aACP,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,EAAU,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;aACvE,IAAI,CAAC,MAAM,CAAC,CAChB,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAkB;IACxC,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,6BAA6B;IACvC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;IACzB,OAAO,EAAE,KAAK,IAAI,EAAE;QAClB,MAAM,UAAU,EAAE,CAAC;IACrB,CAAC;CACF,CAAC"}
@@ -3,8 +3,8 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { access, cp, mkdir, readdir } from 'node:fs/promises';
7
- import { join, dirname } from 'node:path';
6
+ import { access, cp, mkdir, readdir, writeFile } from 'node:fs/promises';
7
+ import { join, dirname, basename } from 'node:path';
8
8
  import { fileURLToPath } from 'node:url';
9
9
  import { getErrorMessage } from '../../utils/errors.js';
10
10
  const __filename = fileURLToPath(import.meta.url);
@@ -19,18 +19,38 @@ async function pathExists(path) {
19
19
  return false;
20
20
  }
21
21
  }
22
- async function copyDirectory(template, path) {
22
+ async function createDirectory(path) {
23
23
  if (await pathExists(path)) {
24
24
  throw new Error(`Path already exists: ${path}`);
25
25
  }
26
- const examplePath = join(EXAMPLES_PATH, template);
27
26
  await mkdir(path, { recursive: true });
28
- await cp(examplePath, path, { recursive: true });
27
+ }
28
+ async function copyDirectory(template, path) {
29
+ await createDirectory(path);
30
+ const examplePath = join(EXAMPLES_PATH, template);
31
+ const entries = await readdir(examplePath, { withFileTypes: true });
32
+ for (const entry of entries) {
33
+ const srcPath = join(examplePath, entry.name);
34
+ const destPath = join(path, entry.name);
35
+ await cp(srcPath, destPath, { recursive: true });
36
+ }
29
37
  }
30
38
  async function handleNew(args) {
31
39
  try {
32
- await copyDirectory(args.template, args.path);
33
- console.log(`Successfully created new extension from template "${args.template}" at ${args.path}.`);
40
+ if (args.template) {
41
+ await copyDirectory(args.template, args.path);
42
+ console.log(`Successfully created new extension from template "${args.template}" at ${args.path}.`);
43
+ }
44
+ else {
45
+ await createDirectory(args.path);
46
+ const extensionName = basename(args.path);
47
+ const manifest = {
48
+ name: extensionName,
49
+ version: '1.0.0',
50
+ };
51
+ await writeFile(join(args.path, 'gemini-extension.json'), JSON.stringify(manifest, null, 2));
52
+ console.log(`Successfully created new extension at ${args.path}.`);
53
+ }
34
54
  console.log(`You can install this using "gemini extensions link ${args.path}" to test it out.`);
35
55
  }
36
56
  catch (error) {
@@ -45,7 +65,7 @@ async function getBoilerplateChoices() {
45
65
  .map((entry) => entry.name);
46
66
  }
47
67
  export const newCommand = {
48
- command: 'new <path> <template>',
68
+ command: 'new <path> [template]',
49
69
  describe: 'Create a new extension from a boilerplate example.',
50
70
  builder: async (yargs) => {
51
71
  const choices = await getBoilerplateChoices();
@@ -1 +1 @@
1
- {"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../src/commands/extensions/new.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../src/commands/extensions/new.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
7
7
  import { newCommand } from './new.js';
8
8
  import yargs from 'yargs';
9
9
  import * as fsPromises from 'node:fs/promises';
10
+ import path from 'node:path';
10
11
  vi.mock('node:fs/promises');
11
12
  const mockedFs = vi.mocked(fsPromises);
12
13
  describe('extensions new command', () => {
@@ -21,12 +22,18 @@ describe('extensions new command', () => {
21
22
  mockedFs.readdir.mockResolvedValue(fakeFiles);
22
23
  });
23
24
  it('should fail if no path is provided', async () => {
24
- const parser = yargs([]).command(newCommand).fail(false);
25
- await expect(parser.parseAsync('new')).rejects.toThrow('Not enough non-option arguments: got 0, need at least 2');
25
+ const parser = yargs([]).command(newCommand).fail(false).locale('en');
26
+ await expect(parser.parseAsync('new')).rejects.toThrow('Not enough non-option arguments: got 0, need at least 1');
26
27
  });
27
- it('should fail if no template is provided', async () => {
28
+ it('should create directory when no template is provided', async () => {
29
+ mockedFs.access.mockRejectedValue(new Error('ENOENT'));
30
+ mockedFs.mkdir.mockResolvedValue(undefined);
28
31
  const parser = yargs([]).command(newCommand).fail(false);
29
- await expect(parser.parseAsync('new /some/path')).rejects.toThrow('Not enough non-option arguments: got 1, need at least 2');
32
+ await parser.parseAsync('new /some/path');
33
+ expect(mockedFs.mkdir).toHaveBeenCalledWith('/some/path', {
34
+ recursive: true,
35
+ });
36
+ expect(mockedFs.cp).not.toHaveBeenCalled();
30
37
  });
31
38
  it('should create directory and copy files when path does not exist', async () => {
32
39
  mockedFs.access.mockRejectedValue(new Error('ENOENT'));
@@ -37,7 +44,9 @@ describe('extensions new command', () => {
37
44
  expect(mockedFs.mkdir).toHaveBeenCalledWith('/some/path', {
38
45
  recursive: true,
39
46
  });
40
- expect(mockedFs.cp).toHaveBeenCalledWith(expect.stringContaining('context'), '/some/path', { recursive: true });
47
+ expect(mockedFs.cp).toHaveBeenCalledWith(expect.stringContaining(path.normalize('context/context')), path.normalize('/some/path/context'), { recursive: true });
48
+ expect(mockedFs.cp).toHaveBeenCalledWith(expect.stringContaining(path.normalize('context/custom-commands')), path.normalize('/some/path/custom-commands'), { recursive: true });
49
+ expect(mockedFs.cp).toHaveBeenCalledWith(expect.stringContaining(path.normalize('context/mcp-server')), path.normalize('/some/path/mcp-server'), { recursive: true });
41
50
  });
42
51
  it('should throw an error if the path already exists', async () => {
43
52
  mockedFs.access.mockResolvedValue(undefined);
@@ -1 +1 @@
1
- {"version":3,"file":"new.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/new.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"new.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/new.test.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ import { uninstallExtension } from '../../config/extension.js';
7
7
  import { getErrorMessage } from '../../utils/errors.js';
8
8
  export async function handleUninstall(args) {
9
9
  try {
10
- await uninstallExtension(args.name);
10
+ await uninstallExtension(args.name, false);
11
11
  console.log(`Extension "${args.name}" successfully uninstalled.`);
12
12
  }
13
13
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../src/commands/extensions/uninstall.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAmB;IACvD,IAAI,CAAC;QACH,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,IAAI,6BAA6B,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAkB;IAC7C,OAAO,EAAE,kBAAkB;IAC3B,QAAQ,EAAE,0BAA0B;IACpC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,wDAAwD;QAClE,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;QACd,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,eAAe,CAAC;YACpB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;SAC7B,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../src/commands/extensions/uninstall.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMxD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAAmB;IACvD,IAAI,CAAC;QACH,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,IAAI,6BAA6B,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAkB;IAC7C,OAAO,EAAE,kBAAkB;IAC3B,QAAQ,EAAE,0BAA0B;IACpC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,wDAAwD;QAClE,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;QACd,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,iFAAiF,CAClF,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,eAAe,CAAC;YACpB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;SAC7B,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
@@ -8,7 +8,10 @@ import { uninstallCommand } from './uninstall.js';
8
8
  import yargs from 'yargs';
9
9
  describe('extensions uninstall command', () => {
10
10
  it('should fail if no source is provided', () => {
11
- const validationParser = yargs([]).command(uninstallCommand).fail(false);
11
+ const validationParser = yargs([])
12
+ .command(uninstallCommand)
13
+ .fail(false)
14
+ .locale('en');
12
15
  expect(() => validationParser.parse('uninstall')).toThrow('Not enough non-option arguments: got 0, need at least 1');
13
16
  });
14
17
  });
@@ -1 +1 @@
1
- {"version":3,"file":"uninstall.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/uninstall.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,gBAAgB,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzE,MAAM,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CACvD,yDAAyD,CAC1D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"uninstall.test.js","sourceRoot":"","sources":["../../../../src/commands/extensions/uninstall.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,gBAAgB,GAAG,KAAK,CAAC,EAAE,CAAC;aAC/B,OAAO,CAAC,gBAAgB,CAAC;aACzB,IAAI,CAAC,KAAK,CAAC;aACX,MAAM,CAAC,IAAI,CAAC,CAAC;QAChB,MAAM,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CACvD,yDAAyD,CAC1D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -3,51 +3,39 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { loadExtensions, annotateActiveExtensions, } from '../../config/extension.js';
6
+ import { loadExtensions, annotateActiveExtensions, ExtensionStorage, requestConsentNonInteractive, } from '../../config/extension.js';
7
7
  import { updateAllUpdatableExtensions, checkForAllExtensionUpdates, updateExtension, } from '../../config/extensions/update.js';
8
8
  import { checkForExtensionUpdate } from '../../config/extensions/github.js';
9
9
  import { getErrorMessage } from '../../utils/errors.js';
10
10
  import { ExtensionUpdateState } from '../../ui/state/extensions.js';
11
+ import { ExtensionEnablementManager } from '../../config/extensions/extensionEnablement.js';
11
12
  const updateOutput = (info) => `Extension "${info.name}" successfully updated: ${info.originalVersion} → ${info.updatedVersion}.`;
12
13
  export async function handleUpdate(args) {
13
14
  const workingDir = process.cwd();
14
- const allExtensions = loadExtensions();
15
- const extensions = annotateActiveExtensions(allExtensions, allExtensions.map((e) => e.config.name), workingDir);
16
- if (args.all) {
17
- try {
18
- let updateInfos = await updateAllUpdatableExtensions(workingDir, extensions, await checkForAllExtensionUpdates(extensions, new Map(), (_) => { }), () => { });
19
- updateInfos = updateInfos.filter((info) => info.originalVersion !== info.updatedVersion);
20
- if (updateInfos.length === 0) {
21
- console.log('No extensions to update.');
22
- return;
23
- }
24
- console.log(updateInfos.map((info) => updateOutput(info)).join('\n'));
25
- }
26
- catch (error) {
27
- console.error(getErrorMessage(error));
28
- }
29
- }
30
- if (args.name)
15
+ const extensionEnablementManager = new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir(),
16
+ // Force enable named extensions, otherwise we will only update the enabled
17
+ // ones.
18
+ args.name ? [args.name] : []);
19
+ const allExtensions = loadExtensions(extensionEnablementManager);
20
+ const extensions = annotateActiveExtensions(allExtensions, workingDir, extensionEnablementManager);
21
+ if (args.name) {
31
22
  try {
32
23
  const extension = extensions.find((extension) => extension.name === args.name);
33
24
  if (!extension) {
34
25
  console.log(`Extension "${args.name}" not found.`);
35
26
  return;
36
27
  }
37
- let updateState;
38
28
  if (!extension.installMetadata) {
39
29
  console.log(`Unable to install extension "${args.name}" due to missing install metadata`);
40
30
  return;
41
31
  }
42
- await checkForExtensionUpdate(extension, (newState) => {
43
- updateState = newState;
44
- });
32
+ const updateState = await checkForExtensionUpdate(extension);
45
33
  if (updateState !== ExtensionUpdateState.UPDATE_AVAILABLE) {
46
34
  console.log(`Extension "${args.name}" is already up to date.`);
47
35
  return;
48
36
  }
49
37
  // TODO(chrstnb): we should list extensions if the requested extension is not installed.
50
- const updatedExtensionInfo = (await updateExtension(extension, workingDir, updateState, () => { }));
38
+ const updatedExtensionInfo = (await updateExtension(extension, workingDir, requestConsentNonInteractive, updateState, () => { }));
51
39
  if (updatedExtensionInfo.originalVersion !==
52
40
  updatedExtensionInfo.updatedVersion) {
53
41
  console.log(`Extension "${args.name}" successfully updated: ${updatedExtensionInfo.originalVersion} → ${updatedExtensionInfo.updatedVersion}.`);
@@ -59,9 +47,32 @@ export async function handleUpdate(args) {
59
47
  catch (error) {
60
48
  console.error(getErrorMessage(error));
61
49
  }
50
+ }
51
+ if (args.all) {
52
+ try {
53
+ const extensionState = new Map();
54
+ await checkForAllExtensionUpdates(extensions, (action) => {
55
+ if (action.type === 'SET_STATE') {
56
+ extensionState.set(action.payload.name, {
57
+ status: action.payload.state,
58
+ });
59
+ }
60
+ }, workingDir);
61
+ let updateInfos = await updateAllUpdatableExtensions(workingDir, requestConsentNonInteractive, extensions, extensionState, () => { });
62
+ updateInfos = updateInfos.filter((info) => info.originalVersion !== info.updatedVersion);
63
+ if (updateInfos.length === 0) {
64
+ console.log('No extensions to update.');
65
+ return;
66
+ }
67
+ console.log(updateInfos.map((info) => updateOutput(info)).join('\n'));
68
+ }
69
+ catch (error) {
70
+ console.error(getErrorMessage(error));
71
+ }
72
+ }
62
73
  }
63
74
  export const updateCommand = {
64
- command: 'update [--all] [name]',
75
+ command: 'update [<name>] [--all]',
65
76
  describe: 'Updates all extensions or a named extension to the latest version.',
66
77
  builder: (yargs) => yargs
67
78
  .positional('name', {
@@ -1 +1 @@
1
- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/extensions/update.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/extensions/update.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,cAAc,EACd,wBAAwB,EACxB,gBAAgB,EAChB,4BAA4B,GAC7B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,4BAA4B,EAE5B,2BAA2B,EAC3B,eAAe,GAChB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AAO5F,MAAM,YAAY,GAAG,CAAC,IAAyB,EAAE,EAAE,CACjD,cAAc,IAAI,CAAC,IAAI,2BAA2B,IAAI,CAAC,eAAe,MAAM,IAAI,CAAC,cAAc,GAAG,CAAC;AAErG,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAgB;IACjD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACjC,MAAM,0BAA0B,GAAG,IAAI,0BAA0B,CAC/D,gBAAgB,CAAC,oBAAoB,EAAE;IACvC,2EAA2E;IAC3E,QAAQ;IACR,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAC7B,CAAC;IACF,MAAM,aAAa,GAAG,cAAc,CAAC,0BAA0B,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,wBAAwB,CACzC,aAAa,EACb,UAAU,EACV,0BAA0B,CAC3B,CAAC;IACF,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAC/B,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAC5C,CAAC;YACF,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,IAAI,cAAc,CAAC,CAAC;gBACnD,OAAO;YACT,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;gBAC/B,OAAO,CAAC,GAAG,CACT,gCAAgC,IAAI,CAAC,IAAI,mCAAmC,CAC7E,CAAC;gBACF,OAAO;YACT,CAAC;YACD,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,SAAS,CAAC,CAAC;YAC7D,IAAI,WAAW,KAAK,oBAAoB,CAAC,gBAAgB,EAAE,CAAC;gBAC1D,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,IAAI,0BAA0B,CAAC,CAAC;gBAC/D,OAAO;YACT,CAAC;YACD,wFAAwF;YACxF,MAAM,oBAAoB,GAAG,CAAC,MAAM,eAAe,CACjD,SAAS,EACT,UAAU,EACV,4BAA4B,EAC5B,WAAW,EACX,GAAG,EAAE,GAAE,CAAC,CACT,CAAE,CAAC;YACJ,IACE,oBAAoB,CAAC,eAAe;gBACpC,oBAAoB,CAAC,cAAc,EACnC,CAAC;gBACD,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,2BAA2B,oBAAoB,CAAC,eAAe,MAAM,oBAAoB,CAAC,cAAc,GAAG,CACnI,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,IAAI,0BAA0B,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IACD,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;YACjC,MAAM,2BAA2B,CAC/B,UAAU,EACV,CAAC,MAAM,EAAE,EAAE;gBACT,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAChC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;wBACtC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK;qBAC7B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,EACD,UAAU,CACX,CAAC;YACF,IAAI,WAAW,GAAG,MAAM,4BAA4B,CAClD,UAAU,EACV,4BAA4B,EAC5B,UAAU,EACV,cAAc,EACd,GAAG,EAAE,GAAE,CAAC,CACT,CAAC;YACF,WAAW,GAAG,WAAW,CAAC,MAAM,CAC9B,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,KAAK,IAAI,CAAC,cAAc,CACvD,CAAC;YACF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;gBACxC,OAAO;YACT,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAkB;IAC1C,OAAO,EAAE,yBAAyB;IAClC,QAAQ,EACN,oEAAoE;IACtE,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,sCAAsC;QAChD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACb,QAAQ,EAAE,wBAAwB;QAClC,IAAI,EAAE,SAAS;KAChB,CAAC;SACD,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC;SACxB,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;QACd,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,YAAY,CAAC;YACjB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAuB;YACxC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAwB;SACxC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
@@ -6,8 +6,13 @@
6
6
  import { loadSettings, SettingScope } from '../../config/settings.js';
7
7
  async function addMcpServer(name, commandOrUrl, args, options) {
8
8
  const { scope, transport, env, header, timeout, trust, description, includeTools, excludeTools, } = options;
9
+ const settings = loadSettings(process.cwd());
10
+ const inHome = settings.workspace.path === settings.user.path;
11
+ if (scope === 'project' && inHome) {
12
+ console.error('Error: Please use --scope user to edit settings in the home directory.');
13
+ process.exit(1);
14
+ }
9
15
  const settingsScope = scope === 'user' ? SettingScope.User : SettingScope.Workspace;
10
- const settings = loadSettings();
11
16
  let newServer = {};
12
17
  const headers = header?.reduce((acc, curr) => {
13
18
  const [key, ...valueParts] = curr.split(':');
@@ -1 +1 @@
1
- {"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/commands/mcp/add.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../src/commands/mcp/add.ts"],"names":[],"mappings":"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"}
@@ -6,23 +6,24 @@
6
6
  import { loadSettings } from '../../config/settings.js';
7
7
  import { MCPServerStatus, createTransport } from '@google/gemini-cli-core';
8
8
  import { Client } from '@modelcontextprotocol/sdk/client/index.js';
9
- import { loadExtensions } from '../../config/extension.js';
9
+ import { ExtensionStorage, loadExtensions } from '../../config/extension.js';
10
+ import { ExtensionEnablementManager } from '../../config/extensions/extensionEnablement.js';
10
11
  const COLOR_GREEN = '\u001b[32m';
11
12
  const COLOR_YELLOW = '\u001b[33m';
12
13
  const COLOR_RED = '\u001b[31m';
13
14
  const RESET_COLOR = '\u001b[0m';
14
15
  async function getMcpServersFromConfig() {
15
16
  const settings = loadSettings();
16
- const extensions = loadExtensions();
17
+ const extensions = loadExtensions(new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()));
17
18
  const mcpServers = { ...(settings.merged.mcpServers || {}) };
18
19
  for (const extension of extensions) {
19
- Object.entries(extension.config.mcpServers || {}).forEach(([key, server]) => {
20
+ Object.entries(extension.mcpServers || {}).forEach(([key, server]) => {
20
21
  if (mcpServers[key]) {
21
22
  return;
22
23
  }
23
24
  mcpServers[key] = {
24
25
  ...server,
25
- extensionName: extension.config.name,
26
+ extensionName: extension.name,
26
27
  };
27
28
  });
28
29
  }
@@ -1 +1 @@
1
- {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.ts"],"names":[],"mappings":"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"}
@@ -3,11 +3,12 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import type { FileFilteringOptions } from '@google/gemini-cli-core';
6
+ import type { FileFilteringOptions, GeminiCLIExtension } from '@google/gemini-cli-core';
7
7
  import { Config, FileDiscoveryService } from '@google/gemini-cli-core';
8
8
  import type { Settings } from './settings.js';
9
- import type { Extension } from './extension.js';
9
+ import type { ExtensionEnablementManager } from './extensions/extensionEnablement.js';
10
10
  export interface CliArgs {
11
+ query: string | undefined;
11
12
  model: string | undefined;
12
13
  sandbox: boolean | string | undefined;
13
14
  sandboxImage: string | undefined;
@@ -34,12 +35,14 @@ export interface CliArgs {
34
35
  includeDirectories: string[] | undefined;
35
36
  screenReader: boolean | undefined;
36
37
  useSmartEdit: boolean | undefined;
37
- promptWords: string[] | undefined;
38
+ useWriteTodos: boolean | undefined;
38
39
  outputFormat: string | undefined;
39
40
  }
40
41
  export declare function parseArguments(settings: Settings): Promise<CliArgs>;
41
42
  export declare function loadHierarchicalGeminiMemory(currentWorkingDirectory: string, includeDirectoriesToReadGemini: readonly string[] | undefined, debugMode: boolean, fileService: FileDiscoveryService, settings: Settings, extensionContextFilePaths: string[] | undefined, folderTrust: boolean, memoryImportFormat?: 'flat' | 'tree', fileFilteringOptions?: FileFilteringOptions): Promise<{
42
43
  memoryContent: string;
43
44
  fileCount: number;
45
+ filePaths: string[];
44
46
  }>;
45
- export declare function loadCliConfig(settings: Settings, extensions: Extension[], sessionId: string, argv: CliArgs, cwd?: string): Promise<Config>;
47
+ export declare function isDebugMode(argv: CliArgs): boolean;
48
+ export declare function loadCliConfig(settings: Settings, extensions: GeminiCLIExtension[], extensionEnablementManager: ExtensionEnablementManager, sessionId: string, argv: CliArgs, cwd?: string): Promise<Config>;