@machina.ai/cell-cli 1.41.1-rc1 → 1.45.1-rc1

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 (562) hide show
  1. package/dist/index.js +17 -17
  2. package/dist/index.js.map +1 -1
  3. package/dist/package.json +5 -5
  4. package/dist/src/acp/README.md +81 -0
  5. package/dist/src/acp/{commandHandler.d.ts → acpCommandHandler.d.ts} +1 -1
  6. package/dist/src/acp/{commandHandler.js → acpCommandHandler.js} +2 -2
  7. package/dist/src/acp/acpCommandHandler.js.map +1 -0
  8. package/dist/src/acp/{commandHandler.test.js → acpCommandHandler.test.js} +4 -5
  9. package/dist/src/acp/acpCommandHandler.test.js.map +1 -0
  10. package/dist/src/acp/acpErrors.d.ts +1 -1
  11. package/dist/src/acp/acpErrors.js +1 -1
  12. package/dist/src/acp/acpErrors.test.d.ts +1 -1
  13. package/dist/src/acp/acpErrors.test.js +1 -1
  14. package/dist/src/acp/{fileSystemService.d.ts → acpFileSystemService.d.ts} +1 -1
  15. package/dist/src/acp/{fileSystemService.js → acpFileSystemService.js} +7 -4
  16. package/dist/src/acp/acpFileSystemService.js.map +1 -0
  17. package/dist/src/acp/{fileSystemService.test.js → acpFileSystemService.test.js} +3 -3
  18. package/dist/src/acp/acpFileSystemService.test.js.map +1 -0
  19. package/dist/src/acp/acpResume.test.d.ts +1 -1
  20. package/dist/src/acp/acpResume.test.js +12 -7
  21. package/dist/src/acp/acpResume.test.js.map +1 -1
  22. package/dist/src/acp/acpRpcDispatcher.d.ts +28 -0
  23. package/dist/src/acp/acpRpcDispatcher.js +177 -0
  24. package/dist/src/acp/acpRpcDispatcher.js.map +1 -0
  25. package/dist/src/acp/acpRpcDispatcher.test.d.ts +6 -0
  26. package/dist/src/acp/acpRpcDispatcher.test.js +238 -0
  27. package/dist/src/acp/acpRpcDispatcher.test.js.map +1 -0
  28. package/dist/src/acp/acpSession.d.ts +36 -0
  29. package/dist/src/acp/{acpClient.js → acpSession.js} +333 -774
  30. package/dist/src/acp/acpSession.js.map +1 -0
  31. package/dist/src/acp/acpSession.test.d.ts +6 -0
  32. package/dist/src/acp/acpSession.test.js +739 -0
  33. package/dist/src/acp/acpSession.test.js.map +1 -0
  34. package/dist/src/acp/acpSessionManager.d.ts +30 -0
  35. package/dist/src/acp/acpSessionManager.js +206 -0
  36. package/dist/src/acp/acpSessionManager.js.map +1 -0
  37. package/dist/src/acp/acpSessionManager.test.d.ts +6 -0
  38. package/dist/src/acp/acpSessionManager.test.js +283 -0
  39. package/dist/src/acp/acpSessionManager.test.js.map +1 -0
  40. package/dist/src/acp/acpStdioTransport.d.ts +9 -0
  41. package/dist/src/acp/acpStdioTransport.js +23 -0
  42. package/dist/src/acp/acpStdioTransport.js.map +1 -0
  43. package/dist/src/acp/acpUtils.d.ts +56 -0
  44. package/dist/src/acp/acpUtils.js +288 -0
  45. package/dist/src/acp/acpUtils.js.map +1 -0
  46. package/dist/src/acp/commands/commandRegistry.d.ts +1 -1
  47. package/dist/src/acp/commands/commandRegistry.js +1 -1
  48. package/dist/src/acp/commands/extensions.d.ts +1 -1
  49. package/dist/src/acp/commands/extensions.js +1 -1
  50. package/dist/src/acp/commands/extensions.test.d.ts +6 -0
  51. package/dist/src/acp/commands/extensions.test.js +70 -0
  52. package/dist/src/acp/commands/extensions.test.js.map +1 -0
  53. package/dist/src/acp/commands/init.d.ts +1 -1
  54. package/dist/src/acp/commands/init.js +1 -1
  55. package/dist/src/acp/commands/memory.d.ts +3 -8
  56. package/dist/src/acp/commands/memory.js +18 -47
  57. package/dist/src/acp/commands/memory.js.map +1 -1
  58. package/dist/src/acp/commands/restore.d.ts +1 -1
  59. package/dist/src/acp/commands/restore.js +1 -1
  60. package/dist/src/acp/commands/restore.test.js +7 -13
  61. package/dist/src/acp/commands/restore.test.js.map +1 -1
  62. package/dist/src/acp/commands/types.d.ts +1 -1
  63. package/dist/src/acp/commands/types.js +1 -1
  64. package/dist/src/commands/extensions/configure.test.js +6 -2
  65. package/dist/src/commands/extensions/configure.test.js.map +1 -1
  66. package/dist/src/commands/extensions/utils.d.ts +1 -1
  67. package/dist/src/commands/extensions/utils.js +1 -2
  68. package/dist/src/commands/extensions/utils.js.map +1 -1
  69. package/dist/src/commands/mcp/list.js +19 -5
  70. package/dist/src/commands/mcp/list.js.map +1 -1
  71. package/dist/src/commands/mcp/list.test.js +285 -100
  72. package/dist/src/commands/mcp/list.test.js.map +1 -1
  73. package/dist/src/config/auth.d.ts +1 -1
  74. package/dist/src/config/auth.js +4 -3
  75. package/dist/src/config/auth.js.map +1 -1
  76. package/dist/src/config/auth.test.js +11 -4
  77. package/dist/src/config/auth.test.js.map +1 -1
  78. package/dist/src/config/config.d.ts +4 -0
  79. package/dist/src/config/config.js +65 -47
  80. package/dist/src/config/config.js.map +1 -1
  81. package/dist/src/config/config.test.js +25 -106
  82. package/dist/src/config/config.test.js.map +1 -1
  83. package/dist/src/config/extension-manager-agents.test.js +2 -0
  84. package/dist/src/config/extension-manager-agents.test.js.map +1 -1
  85. package/dist/src/config/extension-manager-hydration.test.js +2 -0
  86. package/dist/src/config/extension-manager-hydration.test.js.map +1 -1
  87. package/dist/src/config/extension-manager-scope.test.js +4 -2
  88. package/dist/src/config/extension-manager-scope.test.js.map +1 -1
  89. package/dist/src/config/extension-manager-themes.spec.js +2 -0
  90. package/dist/src/config/extension-manager-themes.spec.js.map +1 -1
  91. package/dist/src/config/extension-manager.d.ts +2 -2
  92. package/dist/src/config/extension-manager.js +2 -1
  93. package/dist/src/config/extension-manager.js.map +1 -1
  94. package/dist/src/config/extensionRegistryClient.js +0 -1
  95. package/dist/src/config/extensionRegistryClient.js.map +1 -1
  96. package/dist/src/config/extensions/consent.d.ts +1 -1
  97. package/dist/src/config/extensions/consent.js +5 -4
  98. package/dist/src/config/extensions/consent.js.map +1 -1
  99. package/dist/src/config/extensions/consent.test.js +22 -0
  100. package/dist/src/config/extensions/consent.test.js.map +1 -1
  101. package/dist/src/config/extensions/extensionEnablement.js +4 -2
  102. package/dist/src/config/extensions/extensionEnablement.js.map +1 -1
  103. package/dist/src/config/extensions/extensionSettings.d.ts +3 -3
  104. package/dist/src/config/extensions/extensionSettings.js +7 -3
  105. package/dist/src/config/extensions/extensionSettings.js.map +1 -1
  106. package/dist/src/config/extensions/variables.js +1 -3
  107. package/dist/src/config/extensions/variables.js.map +1 -1
  108. package/dist/src/config/footerItems.d.ts +4 -0
  109. package/dist/src/config/footerItems.js +6 -0
  110. package/dist/src/config/footerItems.js.map +1 -1
  111. package/dist/src/config/footerItems.test.js +1 -0
  112. package/dist/src/config/footerItems.test.js.map +1 -1
  113. package/dist/src/config/mcp/mcpServerEnablement.js +1 -1
  114. package/dist/src/config/mcp/mcpServerEnablement.js.map +1 -1
  115. package/dist/src/config/mutual-exclusivity.test.js +33 -0
  116. package/dist/src/config/mutual-exclusivity.test.js.map +1 -0
  117. package/dist/src/config/settings-env-isolation.test.d.ts +6 -0
  118. package/dist/src/config/settings-env-isolation.test.js +188 -0
  119. package/dist/src/config/settings-env-isolation.test.js.map +1 -0
  120. package/dist/src/config/settings.d.ts +15 -1
  121. package/dist/src/config/settings.js +89 -17
  122. package/dist/src/config/settings.js.map +1 -1
  123. package/dist/src/config/settings.test.js +167 -0
  124. package/dist/src/config/settings.test.js.map +1 -1
  125. package/dist/src/config/settingsSchema.d.ts +56 -25
  126. package/dist/src/config/settingsSchema.js +66 -27
  127. package/dist/src/config/settingsSchema.js.map +1 -1
  128. package/dist/src/config/settingsSchema.test.js +8 -0
  129. package/dist/src/config/settingsSchema.test.js.map +1 -1
  130. package/dist/src/config/skipExtensions.test.d.ts +6 -0
  131. package/dist/src/config/skipExtensions.test.js +49 -0
  132. package/dist/src/config/skipExtensions.test.js.map +1 -0
  133. package/dist/src/config/workspace-policy-cli.test.js +0 -5
  134. package/dist/src/config/workspace-policy-cli.test.js.map +1 -1
  135. package/dist/src/gemini.d.ts +2 -2
  136. package/dist/src/gemini.js +120 -31
  137. package/dist/src/gemini.js.map +1 -1
  138. package/dist/src/gemini.test.js +147 -16
  139. package/dist/src/gemini.test.js.map +1 -1
  140. package/dist/src/gemini_cleanup.test.js +1 -1
  141. package/dist/src/gemini_cleanup.test.js.map +1 -1
  142. package/dist/src/generated/git-commit.d.ts +2 -2
  143. package/dist/src/generated/git-commit.js +2 -2
  144. package/dist/src/interactiveCli.js +1 -1
  145. package/dist/src/interactiveCli.js.map +1 -1
  146. package/dist/src/nonInteractiveCli.d.ts +7 -0
  147. package/dist/src/nonInteractiveCli.js +56 -6
  148. package/dist/src/nonInteractiveCli.js.map +1 -1
  149. package/dist/src/nonInteractiveCli.test.js +253 -18
  150. package/dist/src/nonInteractiveCli.test.js.map +1 -1
  151. package/dist/src/nonInteractiveCliAgentSession.d.ts +7 -0
  152. package/dist/src/nonInteractiveCliAgentSession.js +22 -3
  153. package/dist/src/nonInteractiveCliAgentSession.js.map +1 -1
  154. package/dist/src/nonInteractiveCliAgentSession.test.js +200 -20
  155. package/dist/src/nonInteractiveCliAgentSession.test.js.map +1 -1
  156. package/dist/src/output-redirection.test.d.ts +6 -0
  157. package/dist/src/output-redirection.test.js +77 -0
  158. package/dist/src/output-redirection.test.js.map +1 -0
  159. package/dist/src/patches/http-proxy-agent.d.ts +6 -0
  160. package/dist/src/patches/http-proxy-agent.js +8 -0
  161. package/dist/src/patches/http-proxy-agent.js.map +1 -0
  162. package/dist/src/patches/https-proxy-agent.d.ts +6 -0
  163. package/dist/src/patches/https-proxy-agent.js +8 -0
  164. package/dist/src/patches/https-proxy-agent.js.map +1 -0
  165. package/dist/src/services/BuiltinCommandLoader.js +5 -1
  166. package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
  167. package/dist/src/services/BuiltinCommandLoader.test.js +6 -1
  168. package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
  169. package/dist/src/services/FileCommandLoader.d.ts +21 -0
  170. package/dist/src/services/FileCommandLoader.js +58 -6
  171. package/dist/src/services/FileCommandLoader.js.map +1 -1
  172. package/dist/src/services/FileCommandLoader.test.js +27 -1
  173. package/dist/src/services/FileCommandLoader.test.js.map +1 -1
  174. package/dist/src/test-utils/mockCommandContext.js +6 -1
  175. package/dist/src/test-utils/mockCommandContext.js.map +1 -1
  176. package/dist/src/test-utils/mockConfig.js +0 -3
  177. package/dist/src/test-utils/mockConfig.js.map +1 -1
  178. package/dist/src/test-utils/render.js +1 -0
  179. package/dist/src/test-utils/render.js.map +1 -1
  180. package/dist/src/test-utils/settings.d.ts +1 -0
  181. package/dist/src/test-utils/settings.js.map +1 -1
  182. package/dist/src/ui/AppContainer.js +60 -73
  183. package/dist/src/ui/AppContainer.js.map +1 -1
  184. package/dist/src/ui/AppContainer.test.js +101 -1
  185. package/dist/src/ui/AppContainer.test.js.map +1 -1
  186. package/dist/src/ui/auth/AuthDialog.js +6 -3
  187. package/dist/src/ui/auth/AuthDialog.js.map +1 -1
  188. package/dist/src/ui/auth/AuthDialog.test.js +33 -10
  189. package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
  190. package/dist/src/ui/auth/LoginRestartDialog.d.ts +13 -0
  191. package/dist/src/ui/auth/{LoginWithGoogleRestartDialog.js → LoginRestartDialog.js} +7 -6
  192. package/dist/src/ui/auth/LoginRestartDialog.js.map +1 -0
  193. package/dist/src/ui/auth/LoginRestartDialog.test.d.ts +6 -0
  194. package/dist/src/ui/auth/{LoginWithGoogleRestartDialog.test.js → LoginRestartDialog.test.js} +13 -8
  195. package/dist/src/ui/auth/LoginRestartDialog.test.js.map +1 -0
  196. package/dist/src/ui/auth/useAuth.d.ts +1 -1
  197. package/dist/src/ui/auth/useAuth.js +2 -2
  198. package/dist/src/ui/auth/useAuth.js.map +1 -1
  199. package/dist/src/ui/auth/useAuth.test.js +10 -10
  200. package/dist/src/ui/auth/useAuth.test.js.map +1 -1
  201. package/dist/src/ui/commands/agentsCommand.js +19 -2
  202. package/dist/src/ui/commands/agentsCommand.js.map +1 -1
  203. package/dist/src/ui/commands/agentsCommand.test.js +34 -3
  204. package/dist/src/ui/commands/agentsCommand.test.js.map +1 -1
  205. package/dist/src/ui/commands/bugCommand.js +36 -0
  206. package/dist/src/ui/commands/bugCommand.js.map +1 -1
  207. package/dist/src/ui/commands/bugCommand.test.js +106 -1
  208. package/dist/src/ui/commands/bugCommand.test.js.map +1 -1
  209. package/dist/src/ui/commands/bugMemoryCommand.d.ts +7 -0
  210. package/dist/src/ui/commands/bugMemoryCommand.js +62 -0
  211. package/dist/src/ui/commands/bugMemoryCommand.js.map +1 -0
  212. package/dist/src/ui/commands/bugMemoryCommand.test.js +100 -0
  213. package/dist/src/ui/commands/bugMemoryCommand.test.js.map +1 -0
  214. package/dist/src/ui/commands/commandsCommand.js +52 -4
  215. package/dist/src/ui/commands/commandsCommand.js.map +1 -1
  216. package/dist/src/ui/commands/commandsCommand.test.js +75 -2
  217. package/dist/src/ui/commands/commandsCommand.test.js.map +1 -1
  218. package/dist/src/ui/commands/compressCommand.js +28 -26
  219. package/dist/src/ui/commands/compressCommand.js.map +1 -1
  220. package/dist/src/ui/commands/compressCommand.test.js +5 -0
  221. package/dist/src/ui/commands/compressCommand.test.js.map +1 -1
  222. package/dist/src/ui/commands/directoryCommand.js +2 -2
  223. package/dist/src/ui/commands/directoryCommand.js.map +1 -1
  224. package/dist/src/ui/commands/directoryCommand.test.js +1 -0
  225. package/dist/src/ui/commands/directoryCommand.test.js.map +1 -1
  226. package/dist/src/ui/commands/exportSessionCommand.d.ts +7 -0
  227. package/dist/src/ui/commands/exportSessionCommand.js +74 -0
  228. package/dist/src/ui/commands/exportSessionCommand.js.map +1 -0
  229. package/dist/src/ui/commands/exportSessionCommand.test.js +100 -0
  230. package/dist/src/ui/commands/exportSessionCommand.test.js.map +1 -0
  231. package/dist/src/ui/commands/extensionsCommand.js +1 -0
  232. package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
  233. package/dist/src/ui/commands/extensionsCommand.test.js +4 -0
  234. package/dist/src/ui/commands/extensionsCommand.test.js.map +1 -1
  235. package/dist/src/ui/commands/marketplaceCommand.js +13 -1
  236. package/dist/src/ui/commands/marketplaceCommand.js.map +1 -1
  237. package/dist/src/ui/commands/memoryCommand.d.ts +2 -1
  238. package/dist/src/ui/commands/memoryCommand.js +110 -117
  239. package/dist/src/ui/commands/memoryCommand.js.map +1 -1
  240. package/dist/src/ui/commands/memoryCommand.test.js +18 -71
  241. package/dist/src/ui/commands/memoryCommand.test.js.map +1 -1
  242. package/dist/src/ui/commands/quitCommand.js +3 -1
  243. package/dist/src/ui/commands/quitCommand.js.map +1 -1
  244. package/dist/src/ui/commands/quitCommand.test.js +46 -1
  245. package/dist/src/ui/commands/quitCommand.test.js.map +1 -1
  246. package/dist/src/ui/commands/rewindCommand.js.map +1 -1
  247. package/dist/src/ui/commands/skillsCommand.js +1 -1
  248. package/dist/src/ui/commands/skillsCommand.js.map +1 -1
  249. package/dist/src/ui/commands/skillsCommand.test.js +19 -0
  250. package/dist/src/ui/commands/skillsCommand.test.js.map +1 -1
  251. package/dist/src/ui/commands/types.d.ts +3 -1
  252. package/dist/src/ui/commands/types.js.map +1 -1
  253. package/dist/src/ui/components/AsciiArt.d.ts +6 -6
  254. package/dist/src/ui/components/AsciiArt.js +6 -6
  255. package/dist/src/ui/components/AskUserDialog.js +3 -1
  256. package/dist/src/ui/components/AskUserDialog.js.map +1 -1
  257. package/dist/src/ui/components/AskUserDialog.test.js +43 -0
  258. package/dist/src/ui/components/AskUserDialog.test.js.map +1 -1
  259. package/dist/src/ui/components/Composer.js +1 -1
  260. package/dist/src/ui/components/Composer.js.map +1 -1
  261. package/dist/src/ui/components/DialogManager.js +4 -0
  262. package/dist/src/ui/components/DialogManager.js.map +1 -1
  263. package/dist/src/ui/components/EditorSettingsDialog.js +3 -6
  264. package/dist/src/ui/components/EditorSettingsDialog.js.map +1 -1
  265. package/dist/src/ui/components/Footer.js +6 -0
  266. package/dist/src/ui/components/Footer.js.map +1 -1
  267. package/dist/src/ui/components/FooterConfigDialog.js +1 -0
  268. package/dist/src/ui/components/FooterConfigDialog.js.map +1 -1
  269. package/dist/src/ui/components/FooterConfigDialog.test.js +1 -1
  270. package/dist/src/ui/components/FooterConfigDialog.test.js.map +1 -1
  271. package/dist/src/ui/components/HistoryItemDisplay.js +3 -1
  272. package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
  273. package/dist/src/ui/components/HistoryItemDisplay.test.js +15 -0
  274. package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
  275. package/dist/src/ui/components/{SkillInboxDialog.d.ts → InboxDialog.d.ts} +3 -2
  276. package/dist/src/ui/components/InboxDialog.js +756 -0
  277. package/dist/src/ui/components/InboxDialog.js.map +1 -0
  278. package/dist/src/ui/components/InboxDialog.test.d.ts +6 -0
  279. package/dist/src/ui/components/InboxDialog.test.js +824 -0
  280. package/dist/src/ui/components/InboxDialog.test.js.map +1 -0
  281. package/dist/src/ui/components/InputPrompt.d.ts +3 -0
  282. package/dist/src/ui/components/InputPrompt.js +35 -17
  283. package/dist/src/ui/components/InputPrompt.js.map +1 -1
  284. package/dist/src/ui/components/InputPrompt.test.js +95 -46
  285. package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
  286. package/dist/src/ui/components/ListeningIndicator.d.ts +10 -0
  287. package/dist/src/ui/components/ListeningIndicator.js +30 -0
  288. package/dist/src/ui/components/ListeningIndicator.js.map +1 -0
  289. package/dist/src/ui/components/MainContent.test.js +23 -3
  290. package/dist/src/ui/components/MainContent.test.js.map +1 -1
  291. package/dist/src/ui/components/ModelDialog.js +40 -34
  292. package/dist/src/ui/components/ModelDialog.js.map +1 -1
  293. package/dist/src/ui/components/ModelDialog.test.js +30 -27
  294. package/dist/src/ui/components/ModelDialog.test.js.map +1 -1
  295. package/dist/src/ui/components/ModelStatsDisplay.js +1 -1
  296. package/dist/src/ui/components/ModelStatsDisplay.js.map +1 -1
  297. package/dist/src/ui/components/ModelStatsDisplay.test.js +41 -0
  298. package/dist/src/ui/components/ModelStatsDisplay.test.js.map +1 -1
  299. package/dist/src/ui/components/SessionBrowser.js +7 -0
  300. package/dist/src/ui/components/SessionBrowser.js.map +1 -1
  301. package/dist/src/ui/components/SessionSummaryDisplay.js +9 -4
  302. package/dist/src/ui/components/SessionSummaryDisplay.js.map +1 -1
  303. package/dist/src/ui/components/SessionSummaryDisplay.test.js +12 -23
  304. package/dist/src/ui/components/SessionSummaryDisplay.test.js.map +1 -1
  305. package/dist/src/ui/components/SettingsDialog.js +37 -17
  306. package/dist/src/ui/components/SettingsDialog.js.map +1 -1
  307. package/dist/src/ui/components/SettingsDialog.test.js +83 -1
  308. package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
  309. package/dist/src/ui/components/StatsDisplay.js +2 -2
  310. package/dist/src/ui/components/StatsDisplay.js.map +1 -1
  311. package/dist/src/ui/components/StatsDisplay.test.js +24 -0
  312. package/dist/src/ui/components/StatsDisplay.test.js.map +1 -1
  313. package/dist/src/ui/components/ThemeDialog.constants.d.ts +26 -0
  314. package/dist/src/ui/components/ThemeDialog.constants.js +27 -0
  315. package/dist/src/ui/components/ThemeDialog.constants.js.map +1 -0
  316. package/dist/src/ui/components/ThemeDialog.js +5 -15
  317. package/dist/src/ui/components/ThemeDialog.js.map +1 -1
  318. package/dist/src/ui/components/ToolConfirmationQueue.test.js +1 -1
  319. package/dist/src/ui/components/ToolConfirmationQueue.test.js.map +1 -1
  320. package/dist/src/ui/components/VoiceModelDialog.js +7 -2
  321. package/dist/src/ui/components/VoiceModelDialog.js.map +1 -1
  322. package/dist/src/ui/components/VoiceModelDialog.test.d.ts +6 -0
  323. package/dist/src/ui/components/VoiceModelDialog.test.js +68 -0
  324. package/dist/src/ui/components/VoiceModelDialog.test.js.map +1 -0
  325. package/dist/src/ui/components/messages/ExportSessionMessage.d.ts +11 -0
  326. package/dist/src/ui/components/messages/ExportSessionMessage.js +15 -0
  327. package/dist/src/ui/components/messages/ExportSessionMessage.js.map +1 -0
  328. package/dist/src/ui/components/messages/ExportSessionMessage.test.d.ts +6 -0
  329. package/dist/src/ui/components/messages/ExportSessionMessage.test.js +31 -0
  330. package/dist/src/ui/components/messages/ExportSessionMessage.test.js.map +1 -0
  331. package/dist/src/ui/components/messages/ShellToolMessage.js +6 -2
  332. package/dist/src/ui/components/messages/ShellToolMessage.js.map +1 -1
  333. package/dist/src/ui/components/messages/ShellToolMessage.test.js +33 -0
  334. package/dist/src/ui/components/messages/ShellToolMessage.test.js.map +1 -1
  335. package/dist/src/ui/components/messages/SubagentGroupDisplay.js +13 -13
  336. package/dist/src/ui/components/messages/SubagentGroupDisplay.js.map +1 -1
  337. package/dist/src/ui/components/messages/SubagentGroupDisplay.test.js +5 -5
  338. package/dist/src/ui/components/messages/SubagentGroupDisplay.test.js.map +1 -1
  339. package/dist/src/ui/components/messages/SubagentHistoryMessage.test.js +4 -3
  340. package/dist/src/ui/components/messages/SubagentHistoryMessage.test.js.map +1 -1
  341. package/dist/src/ui/components/messages/SubagentProgressDisplay.d.ts +1 -1
  342. package/dist/src/ui/components/messages/SubagentProgressDisplay.js +7 -6
  343. package/dist/src/ui/components/messages/SubagentProgressDisplay.js.map +1 -1
  344. package/dist/src/ui/components/messages/SubagentProgressDisplay.test.js +10 -9
  345. package/dist/src/ui/components/messages/SubagentProgressDisplay.test.js.map +1 -1
  346. package/dist/src/ui/components/messages/ToolConfirmationMessage.js +3 -9
  347. package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
  348. package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +60 -0
  349. package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -1
  350. package/dist/src/ui/components/messages/ToolGroupDisplay.d.ts +13 -0
  351. package/dist/src/ui/components/messages/ToolGroupDisplay.js +78 -0
  352. package/dist/src/ui/components/messages/ToolGroupDisplay.js.map +1 -0
  353. package/dist/src/ui/components/messages/ToolGroupDisplay.test.d.ts +6 -0
  354. package/dist/src/ui/components/messages/ToolGroupDisplay.test.js +210 -0
  355. package/dist/src/ui/components/messages/ToolGroupDisplay.test.js.map +1 -0
  356. package/dist/src/ui/components/messages/ToolGroupMessage.js +4 -2
  357. package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
  358. package/dist/src/ui/components/messages/ToolGroupMessage.test.js +28 -0
  359. package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map +1 -1
  360. package/dist/src/ui/components/messages/ToolGroupMessageRegression.test.js +3 -3
  361. package/dist/src/ui/components/messages/ToolGroupMessageRegression.test.js.map +1 -1
  362. package/dist/src/ui/components/messages/ToolMessage.js +6 -2
  363. package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
  364. package/dist/src/ui/components/messages/ToolShared.d.ts +1 -0
  365. package/dist/src/ui/components/messages/ToolShared.js +5 -3
  366. package/dist/src/ui/components/messages/ToolShared.js.map +1 -1
  367. package/dist/src/ui/components/messages/ToolShared.test.js +18 -1
  368. package/dist/src/ui/components/messages/ToolShared.test.js.map +1 -1
  369. package/dist/src/ui/components/shared/BaseSettingsDialog.d.ts +6 -1
  370. package/dist/src/ui/components/shared/BaseSettingsDialog.js +8 -8
  371. package/dist/src/ui/components/shared/BaseSettingsDialog.js.map +1 -1
  372. package/dist/src/ui/components/shared/performance.test.js +9 -0
  373. package/dist/src/ui/components/shared/performance.test.js.map +1 -1
  374. package/dist/src/ui/components/shared/text-buffer.js +22 -5
  375. package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
  376. package/dist/src/ui/components/shared/text-buffer.test.js +211 -0
  377. package/dist/src/ui/components/shared/text-buffer.test.js.map +1 -1
  378. package/dist/src/ui/constants/tips.js +0 -1
  379. package/dist/src/ui/constants/tips.js.map +1 -1
  380. package/dist/src/ui/contexts/UIActionsContext.d.ts +1 -0
  381. package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
  382. package/dist/src/ui/contexts/UIStateContext.d.ts +2 -0
  383. package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
  384. package/dist/src/ui/hooks/atCommandProcessor.js +83 -73
  385. package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
  386. package/dist/src/ui/hooks/atCommandProcessor.test.js +134 -42
  387. package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -1
  388. package/dist/src/ui/hooks/slashCommandProcessor.js +13 -0
  389. package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
  390. package/dist/src/ui/hooks/slashCommandProcessor.test.js +85 -0
  391. package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
  392. package/dist/src/ui/hooks/useAgentStream.d.ts +2 -2
  393. package/dist/src/ui/hooks/useAgentStream.js +63 -30
  394. package/dist/src/ui/hooks/useAgentStream.js.map +1 -1
  395. package/dist/src/ui/hooks/useAgentStream.test.js +1 -1
  396. package/dist/src/ui/hooks/useAgentStream.test.js.map +1 -1
  397. package/dist/src/ui/hooks/useAtCompletion.js +0 -2
  398. package/dist/src/ui/hooks/useAtCompletion.js.map +1 -1
  399. package/dist/src/ui/hooks/useGeminiStream.d.ts +2 -2
  400. package/dist/src/ui/hooks/useGeminiStream.js +48 -29
  401. package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
  402. package/dist/src/ui/hooks/useGeminiStream.test.js +44 -82
  403. package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
  404. package/dist/src/ui/hooks/useGitBranchName.js +29 -16
  405. package/dist/src/ui/hooks/useGitBranchName.js.map +1 -1
  406. package/dist/src/ui/hooks/useGitBranchName.test.js +102 -51
  407. package/dist/src/ui/hooks/useGitBranchName.test.js.map +1 -1
  408. package/dist/src/ui/hooks/useIncludeDirsTrust.js +2 -2
  409. package/dist/src/ui/hooks/useIncludeDirsTrust.js.map +1 -1
  410. package/dist/src/ui/hooks/useIncludeDirsTrust.test.js +2 -0
  411. package/dist/src/ui/hooks/useIncludeDirsTrust.test.js.map +1 -1
  412. package/dist/src/ui/hooks/useMessageQueue.d.ts +2 -1
  413. package/dist/src/ui/hooks/useMessageQueue.js +3 -1
  414. package/dist/src/ui/hooks/useMessageQueue.js.map +1 -1
  415. package/dist/src/ui/hooks/useMessageQueue.test.js +38 -0
  416. package/dist/src/ui/hooks/useMessageQueue.test.js.map +1 -1
  417. package/dist/src/ui/hooks/useSessionBrowser.d.ts +3 -3
  418. package/dist/src/ui/hooks/useSessionBrowser.js.map +1 -1
  419. package/dist/src/ui/hooks/useSessionBrowser.test.js +44 -38
  420. package/dist/src/ui/hooks/useSessionBrowser.test.js.map +1 -1
  421. package/dist/src/ui/hooks/useSessionResume.d.ts +3 -3
  422. package/dist/src/ui/hooks/useSessionResume.js.map +1 -1
  423. package/dist/src/ui/hooks/useSessionResume.test.js +6 -4
  424. package/dist/src/ui/hooks/useSessionResume.test.js.map +1 -1
  425. package/dist/src/ui/hooks/useSuspend.d.ts +1 -3
  426. package/dist/src/ui/hooks/useSuspend.js +3 -17
  427. package/dist/src/ui/hooks/useSuspend.js.map +1 -1
  428. package/dist/src/ui/hooks/useSuspend.test.js +0 -14
  429. package/dist/src/ui/hooks/useSuspend.test.js.map +1 -1
  430. package/dist/src/ui/hooks/useToolScheduler.test.js +6 -6
  431. package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
  432. package/dist/src/ui/hooks/useVoiceMode.js +25 -19
  433. package/dist/src/ui/hooks/useVoiceMode.js.map +1 -1
  434. package/dist/src/ui/hooks/vim-passthrough.test.js +10 -0
  435. package/dist/src/ui/hooks/vim-passthrough.test.js.map +1 -1
  436. package/dist/src/ui/hooks/vim.js +8 -0
  437. package/dist/src/ui/hooks/vim.js.map +1 -1
  438. package/dist/src/ui/hooks/vim.test.js +61 -0
  439. package/dist/src/ui/hooks/vim.test.js.map +1 -1
  440. package/dist/src/ui/key/keyBindings.d.ts +2 -0
  441. package/dist/src/ui/key/keyBindings.js +26 -9
  442. package/dist/src/ui/key/keyBindings.js.map +1 -1
  443. package/dist/src/ui/key/keyBindings.test.js +24 -0
  444. package/dist/src/ui/key/keyBindings.test.js.map +1 -1
  445. package/dist/src/ui/key/keyMatchers.test.js +26 -5
  446. package/dist/src/ui/key/keyMatchers.test.js.map +1 -1
  447. package/dist/src/ui/themes/theme-manager.js +0 -2
  448. package/dist/src/ui/themes/theme-manager.js.map +1 -1
  449. package/dist/src/ui/types.d.ts +23 -2
  450. package/dist/src/ui/types.js +3 -2
  451. package/dist/src/ui/types.js.map +1 -1
  452. package/dist/src/ui/utils/TableRenderer.js +6 -6
  453. package/dist/src/ui/utils/TableRenderer.js.map +1 -1
  454. package/dist/src/ui/utils/TableRenderer.test.js +10 -0
  455. package/dist/src/ui/utils/TableRenderer.test.js.map +1 -1
  456. package/dist/src/ui/utils/directoryUtils.test.js +0 -5
  457. package/dist/src/ui/utils/directoryUtils.test.js.map +1 -1
  458. package/dist/src/ui/utils/editorUtils.d.ts +2 -1
  459. package/dist/src/ui/utils/editorUtils.js +75 -28
  460. package/dist/src/ui/utils/editorUtils.js.map +1 -1
  461. package/dist/src/ui/utils/latexToUnicode.d.ts +21 -0
  462. package/dist/src/ui/utils/latexToUnicode.js +538 -0
  463. package/dist/src/ui/utils/latexToUnicode.js.map +1 -0
  464. package/dist/src/ui/utils/latexToUnicode.test.d.ts +6 -0
  465. package/dist/src/ui/utils/latexToUnicode.test.js +222 -0
  466. package/dist/src/ui/utils/latexToUnicode.test.js.map +1 -0
  467. package/dist/src/ui/utils/markdownParsingUtils.d.ts +1 -5
  468. package/dist/src/ui/utils/markdownParsingUtils.js +36 -1
  469. package/dist/src/ui/utils/markdownParsingUtils.js.map +1 -1
  470. package/dist/src/ui/utils/markdownParsingUtils.test.js +35 -0
  471. package/dist/src/ui/utils/markdownParsingUtils.test.js.map +1 -1
  472. package/dist/src/ui/utils/memorySnapshot.d.ts +19 -0
  473. package/dist/src/ui/utils/memorySnapshot.js +28 -0
  474. package/dist/src/ui/utils/memorySnapshot.js.map +1 -0
  475. package/dist/src/ui/utils/memorySnapshot.test.d.ts +6 -0
  476. package/dist/src/ui/utils/memorySnapshot.test.js +62 -0
  477. package/dist/src/ui/utils/memorySnapshot.test.js.map +1 -0
  478. package/dist/src/ui/utils/updateCheck.js +11 -2
  479. package/dist/src/ui/utils/updateCheck.js.map +1 -1
  480. package/dist/src/ui/utils/updateCheck.test.js +73 -0
  481. package/dist/src/ui/utils/updateCheck.test.js.map +1 -1
  482. package/dist/src/utils/commands.d.ts +1 -1
  483. package/dist/src/utils/commands.js +1 -1
  484. package/dist/src/utils/commands.test.js +14 -14
  485. package/dist/src/utils/commands.test.js.map +1 -1
  486. package/dist/src/utils/envVarResolver.js +10 -7
  487. package/dist/src/utils/envVarResolver.js.map +1 -1
  488. package/dist/src/utils/gitUtils.js +1 -2
  489. package/dist/src/utils/gitUtils.js.map +1 -1
  490. package/dist/src/utils/handleAutoUpdate.d.ts +1 -1
  491. package/dist/src/utils/handleAutoUpdate.js +15 -3
  492. package/dist/src/utils/handleAutoUpdate.js.map +1 -1
  493. package/dist/src/utils/handleAutoUpdate.test.js +45 -16
  494. package/dist/src/utils/handleAutoUpdate.test.js.map +1 -1
  495. package/dist/src/utils/installationInfo.d.ts +1 -0
  496. package/dist/src/utils/installationInfo.js +16 -1
  497. package/dist/src/utils/installationInfo.js.map +1 -1
  498. package/dist/src/utils/installationInfo.test.js +16 -0
  499. package/dist/src/utils/installationInfo.test.js.map +1 -1
  500. package/dist/src/utils/jsonoutput.js +0 -2
  501. package/dist/src/utils/jsonoutput.js.map +1 -1
  502. package/dist/src/utils/processUtils.d.ts +28 -0
  503. package/dist/src/utils/processUtils.js +71 -0
  504. package/dist/src/utils/processUtils.js.map +1 -1
  505. package/dist/src/utils/processUtils.test.js +122 -1
  506. package/dist/src/utils/processUtils.test.js.map +1 -1
  507. package/dist/src/utils/readStdin.js +22 -4
  508. package/dist/src/utils/readStdin.js.map +1 -1
  509. package/dist/src/utils/readStdin.test.js +32 -0
  510. package/dist/src/utils/readStdin.test.js.map +1 -1
  511. package/dist/src/utils/relaunch.js +6 -13
  512. package/dist/src/utils/relaunch.js.map +1 -1
  513. package/dist/src/utils/relaunch.test.js +82 -86
  514. package/dist/src/utils/relaunch.test.js.map +1 -1
  515. package/dist/src/utils/sandbox.js +34 -24
  516. package/dist/src/utils/sandbox.js.map +1 -1
  517. package/dist/src/utils/sandbox.test.js +108 -9
  518. package/dist/src/utils/sandbox.test.js.map +1 -1
  519. package/dist/src/utils/sandboxUtils.js +12 -7
  520. package/dist/src/utils/sandboxUtils.js.map +1 -1
  521. package/dist/src/utils/sandboxUtils.test.js +68 -0
  522. package/dist/src/utils/sandboxUtils.test.js.map +1 -1
  523. package/dist/src/utils/sessionCleanup.js +49 -14
  524. package/dist/src/utils/sessionCleanup.js.map +1 -1
  525. package/dist/src/utils/sessionCleanup.test.js +63 -0
  526. package/dist/src/utils/sessionCleanup.test.js.map +1 -1
  527. package/dist/src/utils/sessionUtils.js +22 -7
  528. package/dist/src/utils/sessionUtils.js.map +1 -1
  529. package/dist/src/utils/sessionUtils.test.js +99 -0
  530. package/dist/src/utils/sessionUtils.test.js.map +1 -1
  531. package/dist/src/utils/sessions.js +2 -4
  532. package/dist/src/utils/sessions.js.map +1 -1
  533. package/dist/src/utils/sessions.test.js +9 -12
  534. package/dist/src/utils/sessions.test.js.map +1 -1
  535. package/dist/src/utils/userStartupWarnings.js +4 -3
  536. package/dist/src/utils/userStartupWarnings.js.map +1 -1
  537. package/dist/src/utils/userStartupWarnings.test.js +40 -3
  538. package/dist/src/utils/userStartupWarnings.test.js.map +1 -1
  539. package/dist/src/validateNonInterActiveAuth.js +1 -1
  540. package/dist/src/validateNonInterActiveAuth.js.map +1 -1
  541. package/dist/tsconfig.tsbuildinfo +1 -1
  542. package/package.json +5 -5
  543. package/dist/src/acp/acpClient.d.ts +0 -56
  544. package/dist/src/acp/acpClient.js.map +0 -1
  545. package/dist/src/acp/acpClient.test.js +0 -1814
  546. package/dist/src/acp/acpClient.test.js.map +0 -1
  547. package/dist/src/acp/commandHandler.js.map +0 -1
  548. package/dist/src/acp/commandHandler.test.js.map +0 -1
  549. package/dist/src/acp/fileSystemService.js.map +0 -1
  550. package/dist/src/acp/fileSystemService.test.js.map +0 -1
  551. package/dist/src/ui/auth/LoginWithGoogleRestartDialog.d.ts +0 -12
  552. package/dist/src/ui/auth/LoginWithGoogleRestartDialog.js.map +0 -1
  553. package/dist/src/ui/auth/LoginWithGoogleRestartDialog.test.js.map +0 -1
  554. package/dist/src/ui/components/SkillInboxDialog.js +0 -420
  555. package/dist/src/ui/components/SkillInboxDialog.js.map +0 -1
  556. package/dist/src/ui/components/SkillInboxDialog.test.js +0 -467
  557. package/dist/src/ui/components/SkillInboxDialog.test.js.map +0 -1
  558. /package/dist/src/acp/{commandHandler.test.d.ts → acpCommandHandler.test.d.ts} +0 -0
  559. /package/dist/src/{ui/components/SkillInboxDialog.test.d.ts → acp/acpFileSystemService.test.d.ts} +0 -0
  560. /package/dist/src/{acp/acpClient.test.d.ts → config/mutual-exclusivity.test.d.ts} +0 -0
  561. /package/dist/src/{acp/fileSystemService.test.d.ts → ui/commands/bugMemoryCommand.test.d.ts} +0 -0
  562. /package/dist/src/ui/{auth/LoginWithGoogleRestartDialog.test.d.ts → commands/exportSessionCommand.test.d.ts} +0 -0
@@ -5,12 +5,13 @@
5
5
  */
6
6
  import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
7
7
  import { listMcpServers } from './list.js';
8
- import { loadSettings, mergeSettings, } from '../../config/settings.js';
9
- import { createTransport, debugLogger } from '@google/gemini-cli-core';
8
+ import { loadSettings } from '../../config/settings.js';
9
+ import { createTransport, debugLogger, } from '@google/gemini-cli-core';
10
10
  import { Client } from '@modelcontextprotocol/sdk/client/index.js';
11
11
  import { ExtensionStorage } from '../../config/extensions/storage.js';
12
12
  import { ExtensionManager } from '../../config/extension-manager.js';
13
13
  import { McpServerEnablementManager } from '../../config/mcp/index.js';
14
+ import { createMockSettings } from '../../test-utils/settings.js';
14
15
  vi.mock('../../config/settings.js', async (importOriginal) => {
15
16
  const actual = await importOriginal();
16
17
  return {
@@ -86,31 +87,24 @@ describe('mcp list command', () => {
86
87
  vi.restoreAllMocks();
87
88
  });
88
89
  it('should display message when no servers configured', async () => {
89
- const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
90
- mockedLoadSettings.mockReturnValue({
91
- merged: { ...defaultMergedSettings, mcpServers: {} },
92
- });
90
+ mockedLoadSettings.mockReturnValue(createMockSettings({ mcpServers: {} }));
93
91
  await listMcpServers();
94
92
  expect(debugLogger.log).toHaveBeenCalledWith('No MCP servers configured.');
95
93
  });
96
94
  it('should display different server types with connected status', async () => {
97
- const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
98
- mockedLoadSettings.mockReturnValue({
99
- merged: {
100
- ...defaultMergedSettings,
101
- mcpServers: {
102
- 'stdio-server': { command: '/path/to/server', args: ['arg1'] },
103
- 'sse-server': { url: 'https://example.com/sse', type: 'sse' },
104
- 'http-server': { httpUrl: 'https://example.com/http' },
105
- 'http-server-by-default': { url: 'https://example.com/http' },
106
- 'http-server-with-type': {
107
- url: 'https://example.com/http',
108
- type: 'http',
109
- },
95
+ mockedLoadSettings.mockReturnValue(createMockSettings({
96
+ mcpServers: {
97
+ 'stdio-server': { command: '/path/to/server', args: ['arg1'] },
98
+ 'sse-server': { url: 'https://example.com/sse', type: 'sse' },
99
+ 'http-server': { httpUrl: 'https://example.com/http' },
100
+ 'http-server-by-default': { url: 'https://example.com/http' },
101
+ 'http-server-with-type': {
102
+ url: 'https://example.com/http',
103
+ type: 'http',
110
104
  },
111
105
  },
112
106
  isTrusted: true,
113
- });
107
+ }));
114
108
  mockClient.connect.mockResolvedValue(undefined);
115
109
  mockClient.ping.mockResolvedValue(undefined);
116
110
  await listMcpServers();
@@ -122,78 +116,59 @@ describe('mcp list command', () => {
122
116
  expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('http-server-with-type: https://example.com/http (http) - Connected'));
123
117
  });
124
118
  it('should display disconnected status when connection fails', async () => {
125
- const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
126
- mockedLoadSettings.mockReturnValue({
127
- merged: {
128
- ...defaultMergedSettings,
129
- mcpServers: {
130
- 'test-server': { command: '/test/server' },
131
- },
119
+ mockedLoadSettings.mockReturnValue(createMockSettings({
120
+ mcpServers: {
121
+ 'test-server': { command: '/test/server' },
132
122
  },
133
- });
123
+ isTrusted: true,
124
+ }));
134
125
  mockClient.connect.mockRejectedValue(new Error('Connection failed'));
135
126
  await listMcpServers();
136
127
  expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('test-server: /test/server (stdio) - Disconnected'));
137
128
  });
138
129
  it('should display connected status even if ping fails', async () => {
139
- const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
140
- mockedLoadSettings.mockReturnValue({
141
- merged: {
142
- ...defaultMergedSettings,
143
- mcpServers: {
144
- 'test-server': { command: '/test/server' },
145
- },
130
+ mockedLoadSettings.mockReturnValue(createMockSettings({
131
+ mcpServers: {
132
+ 'test-server': { command: '/test/server' },
146
133
  },
147
134
  isTrusted: true,
148
- });
135
+ }));
149
136
  mockClient.connect.mockResolvedValue(undefined);
150
137
  mockClient.ping.mockRejectedValue(new Error('Ping failed'));
151
138
  await listMcpServers();
152
139
  expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('test-server: /test/server (stdio) - Connected'));
153
140
  });
154
141
  it('should use configured timeout for connection', async () => {
155
- const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
156
- mockedLoadSettings.mockReturnValue({
157
- merged: {
158
- ...defaultMergedSettings,
159
- mcpServers: {
160
- 'test-server': { command: '/test/server', timeout: 12345 },
161
- },
142
+ mockedLoadSettings.mockReturnValue(createMockSettings({
143
+ mcpServers: {
144
+ 'test-server': { command: '/test/server', timeout: 12345 },
162
145
  },
163
146
  isTrusted: true,
164
- });
147
+ }));
165
148
  mockClient.connect.mockResolvedValue(undefined);
166
149
  await listMcpServers();
167
150
  expect(mockClient.connect).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({ timeout: 12345 }));
168
151
  expect(mockClient.ping).toHaveBeenCalledWith(expect.objectContaining({ timeout: 12345 }));
169
152
  });
170
153
  it('should use default timeout for connection when not configured', async () => {
171
- const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
172
- mockedLoadSettings.mockReturnValue({
173
- merged: {
174
- ...defaultMergedSettings,
175
- mcpServers: {
176
- 'test-server': { command: '/test/server' },
177
- },
154
+ mockedLoadSettings.mockReturnValue(createMockSettings({
155
+ mcpServers: {
156
+ 'test-server': { command: '/test/server' },
178
157
  },
179
158
  isTrusted: true,
180
- });
159
+ }));
181
160
  mockClient.connect.mockResolvedValue(undefined);
182
161
  await listMcpServers();
183
162
  expect(mockClient.connect).toHaveBeenCalledWith(expect.anything(), expect.objectContaining({ timeout: 5000 }));
184
163
  expect(mockClient.ping).toHaveBeenCalledWith(expect.objectContaining({ timeout: 5000 }));
185
164
  });
186
165
  it('should merge extension servers with config servers', async () => {
187
- const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
188
- mockedLoadSettings.mockReturnValue({
189
- merged: {
190
- ...defaultMergedSettings,
191
- mcpServers: {
192
- 'config-server': { command: '/config/server' },
193
- },
166
+ mockedLoadSettings.mockReturnValue(createMockSettings({
167
+ mcpServers: {
168
+ 'config-server': { command: '/config/server' },
194
169
  },
195
170
  isTrusted: true,
196
- });
171
+ }));
197
172
  mockExtensionManager.loadExtensions.mockReturnValue([
198
173
  {
199
174
  name: 'test-extension',
@@ -207,85 +182,295 @@ describe('mcp list command', () => {
207
182
  expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('extension-server (from test-extension): /ext/server (stdio) - Connected'));
208
183
  });
209
184
  it('should filter servers based on admin allowlist passed in settings', async () => {
210
- const settingsWithAllowlist = mergeSettings({}, {}, {}, {}, true);
211
- settingsWithAllowlist.admin = {
212
- secureModeEnabled: false,
213
- extensions: { enabled: true },
214
- skills: { enabled: true },
215
- mcp: {
216
- enabled: true,
217
- config: {
218
- 'allowed-server': { url: 'http://allowed' },
185
+ const adminControls = {
186
+ strictModeDisabled: true,
187
+ mcpSetting: {
188
+ mcpEnabled: true,
189
+ mcpConfig: {
190
+ mcpServers: {
191
+ 'allowed-server': { url: 'http://allowed' },
192
+ },
219
193
  },
220
- requiredConfig: {},
221
194
  },
222
195
  };
223
- settingsWithAllowlist.mcpServers = {
196
+ const mcpServers = {
224
197
  'allowed-server': { command: 'cmd1' },
225
198
  'forbidden-server': { command: 'cmd2' },
226
199
  };
227
- mockedLoadSettings.mockReturnValue({
228
- merged: settingsWithAllowlist,
200
+ const mockSettings = createMockSettings({
201
+ mcpServers,
202
+ isTrusted: true,
229
203
  });
204
+ // setRemoteAdminSettings is the correct way to set admin settings in tests
205
+ mockSettings.setRemoteAdminSettings(adminControls);
206
+ mockedLoadSettings.mockReturnValue(mockSettings);
230
207
  mockClient.connect.mockResolvedValue(undefined);
231
208
  mockClient.ping.mockResolvedValue(undefined);
232
- await listMcpServers({
233
- merged: settingsWithAllowlist,
234
- isTrusted: true,
235
- });
209
+ await listMcpServers(mockSettings);
236
210
  expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('allowed-server'));
237
211
  expect(debugLogger.log).not.toHaveBeenCalledWith(expect.stringContaining('forbidden-server'));
238
212
  expect(mockedCreateTransport).toHaveBeenCalledWith('allowed-server', expect.objectContaining({ url: 'http://allowed' }), // Should use admin config
239
213
  false, expect.anything());
240
214
  });
241
- it('should show stdio servers as disconnected in untrusted folders', async () => {
242
- const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
243
- mockedLoadSettings.mockReturnValue({
244
- merged: {
245
- ...defaultMergedSettings,
246
- mcpServers: {
247
- 'test-server': { command: '/test/server' },
248
- },
215
+ it('should show stdio servers as disabled in untrusted folders', async () => {
216
+ mockedLoadSettings.mockReturnValue(createMockSettings({
217
+ mcpServers: {
218
+ 'test-server': { command: '/test/server' },
249
219
  },
250
220
  isTrusted: false,
251
- });
252
- // createTransport will throw in core if not trusted
253
- mockedCreateTransport.mockRejectedValue(new Error('Folder not trusted'));
221
+ }));
254
222
  await listMcpServers();
255
- expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('test-server: /test/server (stdio) - Disconnected'));
223
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('Warning: MCP servers are configured but disabled because this folder is untrusted.'));
224
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('test-server: /test/server (stdio) - Disabled'));
256
225
  });
257
226
  it('should display blocked status for servers in excluded list', async () => {
258
- const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
259
- mockedLoadSettings.mockReturnValue({
227
+ mockedLoadSettings.mockReturnValue(createMockSettings({
228
+ mcp: {
229
+ excluded: ['blocked-server'],
230
+ },
231
+ mcpServers: {
232
+ 'blocked-server': { command: '/test/server' },
233
+ },
234
+ isTrusted: true,
235
+ }));
236
+ await listMcpServers();
237
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('blocked-server: /test/server (stdio) - Blocked'));
238
+ expect(mockedCreateTransport).not.toHaveBeenCalled();
239
+ });
240
+ it('should display disabled status for servers disabled via enablement manager', async () => {
241
+ mockedLoadSettings.mockReturnValue(createMockSettings({
242
+ mcpServers: {
243
+ 'disabled-server': { command: '/test/server' },
244
+ },
245
+ isTrusted: true,
246
+ }));
247
+ vi.spyOn(McpServerEnablementManager.prototype, 'isFileEnabled').mockResolvedValue(false);
248
+ await listMcpServers();
249
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('disabled-server: /test/server (stdio) - Disabled'));
250
+ expect(mockedCreateTransport).not.toHaveBeenCalled();
251
+ });
252
+ it('should display warning and disabled status in untrusted folders', async () => {
253
+ const userMcpServers = {
254
+ 'user-server': { url: 'https://example.com/user' },
255
+ };
256
+ const workspaceMcpServers = {
257
+ 'project-server': { command: '/path/to/project/server' },
258
+ };
259
+ mockedLoadSettings.mockReturnValue(createMockSettings({
260
+ user: {
261
+ settings: { mcpServers: userMcpServers },
262
+ originalSettings: { mcpServers: userMcpServers },
263
+ path: '/mock/user/settings.json',
264
+ },
265
+ workspace: {
266
+ settings: { mcpServers: workspaceMcpServers },
267
+ originalSettings: { mcpServers: workspaceMcpServers },
268
+ path: '/mock/workspace/settings.json',
269
+ },
270
+ isTrusted: false,
271
+ }));
272
+ await listMcpServers();
273
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('Warning: MCP servers are configured but disabled because this folder is untrusted.'));
274
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('project-server: /path/to/project/server (stdio) - Disabled'));
275
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('user-server: https://example.com/user (http) - Disabled'));
276
+ expect(mockedCreateTransport).not.toHaveBeenCalled();
277
+ });
278
+ it('should block servers excluded by user settings even if workspace settings override/clear the excluded list', async () => {
279
+ const mockSettings = createMockSettings({
280
+ user: {
281
+ path: '/user/settings.json',
282
+ settings: {
283
+ mcp: {
284
+ excluded: ['blocked-server'],
285
+ },
286
+ },
287
+ originalSettings: {
288
+ mcp: {
289
+ excluded: ['blocked-server'],
290
+ },
291
+ },
292
+ },
293
+ workspace: {
294
+ path: '/workspace/settings.json',
295
+ settings: {
296
+ mcp: {
297
+ excluded: [],
298
+ },
299
+ },
300
+ originalSettings: {
301
+ mcp: {
302
+ excluded: [],
303
+ },
304
+ },
305
+ },
306
+ mcpServers: {
307
+ 'blocked-server': { command: '/test/server' },
308
+ },
309
+ isTrusted: true,
260
310
  merged: {
261
- ...defaultMergedSettings,
262
311
  mcp: {
263
- excluded: ['blocked-server'],
312
+ excluded: [], // workspace has overridden user settings!
264
313
  },
265
314
  mcpServers: {
266
315
  'blocked-server': { command: '/test/server' },
267
316
  },
268
317
  },
318
+ });
319
+ mockedLoadSettings.mockReturnValue(mockSettings);
320
+ await listMcpServers();
321
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('blocked-server: /test/server (stdio) - Blocked'));
322
+ expect(mockedCreateTransport).not.toHaveBeenCalled();
323
+ });
324
+ it('should block servers case-insensitively when excluded', async () => {
325
+ const mockSettings = createMockSettings({
326
+ user: {
327
+ path: '/user/settings.json',
328
+ settings: {
329
+ mcp: {
330
+ excluded: ['BLOCKED-server'],
331
+ },
332
+ },
333
+ originalSettings: {
334
+ mcp: {
335
+ excluded: ['BLOCKED-server'],
336
+ },
337
+ },
338
+ },
339
+ mcpServers: {
340
+ 'blocked-server': { command: '/test/server' },
341
+ },
269
342
  isTrusted: true,
343
+ merged: {
344
+ mcpServers: {
345
+ 'blocked-server': { command: '/test/server' },
346
+ },
347
+ },
270
348
  });
349
+ mockedLoadSettings.mockReturnValue(mockSettings);
271
350
  await listMcpServers();
272
351
  expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('blocked-server: /test/server (stdio) - Blocked'));
273
352
  expect(mockedCreateTransport).not.toHaveBeenCalled();
274
353
  });
275
- it('should display disabled status for servers disabled via enablement manager', async () => {
276
- const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
277
- mockedLoadSettings.mockReturnValue({
354
+ it('should restrict allowed servers to the intersection of all defined allowlists', async () => {
355
+ const mockSettings = createMockSettings({
356
+ user: {
357
+ path: '/user/settings.json',
358
+ settings: {
359
+ mcp: {
360
+ allowed: ['allowed-server-1', 'allowed-server-2'],
361
+ },
362
+ },
363
+ originalSettings: {
364
+ mcp: {
365
+ allowed: ['allowed-server-1', 'allowed-server-2'],
366
+ },
367
+ },
368
+ },
369
+ workspace: {
370
+ path: '/workspace/settings.json',
371
+ settings: {
372
+ mcp: {
373
+ allowed: ['allowed-server-1', 'malicious-server'],
374
+ },
375
+ },
376
+ originalSettings: {
377
+ mcp: {
378
+ allowed: ['allowed-server-1', 'malicious-server'],
379
+ },
380
+ },
381
+ },
382
+ mcpServers: {
383
+ 'allowed-server-1': { command: '/allowed/1' },
384
+ 'allowed-server-2': { command: '/allowed/2' },
385
+ 'malicious-server': { command: '/malicious' },
386
+ },
387
+ isTrusted: true,
278
388
  merged: {
279
- ...defaultMergedSettings,
389
+ mcp: {
390
+ allowed: ['allowed-server-1', 'malicious-server'], // workspace overrode user settings!
391
+ },
280
392
  mcpServers: {
281
- 'disabled-server': { command: '/test/server' },
393
+ 'allowed-server-1': { command: '/allowed/1' },
394
+ 'allowed-server-2': { command: '/allowed/2' },
395
+ 'malicious-server': { command: '/malicious' },
396
+ },
397
+ },
398
+ });
399
+ mockedLoadSettings.mockReturnValue(mockSettings);
400
+ mockClient.connect.mockResolvedValue(undefined);
401
+ mockClient.ping.mockResolvedValue(undefined);
402
+ await listMcpServers();
403
+ // allowed-server-1 is in the intersection, so it should connect
404
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('allowed-server-1: /allowed/1 (stdio) - Connected'));
405
+ // allowed-server-2 and malicious-server are not in the intersection, so they should be Blocked
406
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('allowed-server-2: /allowed/2 (stdio) - Blocked'));
407
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('malicious-server: /malicious (stdio) - Blocked'));
408
+ expect(mockedCreateTransport).toHaveBeenCalledTimes(1);
409
+ expect(mockedCreateTransport).toHaveBeenCalledWith('allowed-server-1', expect.any(Object), false, expect.any(Object));
410
+ });
411
+ it('should block all servers if the intersection of user and workspace allowlists is empty (disjoint allowlists)', async () => {
412
+ const mockSettings = createMockSettings({
413
+ user: {
414
+ path: '/user/settings.json',
415
+ settings: {
416
+ mcp: {
417
+ allowed: ['user-allowed-server'],
418
+ },
282
419
  },
420
+ originalSettings: {
421
+ mcp: {
422
+ allowed: ['user-allowed-server'],
423
+ },
424
+ },
425
+ },
426
+ workspace: {
427
+ path: '/workspace/settings.json',
428
+ settings: {
429
+ mcp: {
430
+ allowed: ['workspace-allowed-server'],
431
+ },
432
+ },
433
+ originalSettings: {
434
+ mcp: {
435
+ allowed: ['workspace-allowed-server'],
436
+ },
437
+ },
438
+ },
439
+ mcpServers: {
440
+ 'user-allowed-server': { command: '/allowed/user' },
441
+ 'workspace-allowed-server': { command: '/allowed/workspace' },
283
442
  },
284
443
  isTrusted: true,
444
+ merged: {
445
+ mcp: {
446
+ allowed: ['workspace-allowed-server'], // workspace override
447
+ },
448
+ mcpServers: {
449
+ 'user-allowed-server': { command: '/allowed/user' },
450
+ 'workspace-allowed-server': { command: '/allowed/workspace' },
451
+ },
452
+ },
285
453
  });
286
- vi.spyOn(McpServerEnablementManager.prototype, 'isFileEnabled').mockResolvedValue(false);
454
+ mockedLoadSettings.mockReturnValue(mockSettings);
287
455
  await listMcpServers();
288
- expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('disabled-server: /test/server (stdio) - Disabled'));
456
+ // Since the intersection is empty ([]), both servers should be Blocked!
457
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('user-allowed-server: /allowed/user (stdio) - Blocked'));
458
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('workspace-allowed-server: /allowed/workspace (stdio) - Blocked'));
459
+ expect(mockedCreateTransport).not.toHaveBeenCalled();
460
+ });
461
+ it('should block all servers if allowlist is configured as empty array []', async () => {
462
+ const mockSettings = createMockSettings({
463
+ mcp: {
464
+ allowed: [], // empty allowlist configured!
465
+ },
466
+ mcpServers: {
467
+ 'test-server': { command: '/test/server' },
468
+ },
469
+ isTrusted: true,
470
+ });
471
+ mockedLoadSettings.mockReturnValue(mockSettings);
472
+ await listMcpServers();
473
+ expect(debugLogger.log).toHaveBeenCalledWith(expect.stringContaining('test-server: /test/server (stdio) - Blocked'));
289
474
  expect(mockedCreateTransport).not.toHaveBeenCalled();
290
475
  });
291
476
  });
@@ -1 +1 @@
1
- {"version":3,"file":"list.test.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"list.test.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.test.ts"],"names":[],"mappings":"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"}
@@ -3,4 +3,4 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- export declare const validateAuthMethod: (authMethod: string) => string | null;
6
+ export declare const validateAuthMethod: (authMethod: string) => Promise<string | null>;
@@ -3,15 +3,16 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { AuthType } from '@google/gemini-cli-core';
6
+ import { AuthType, loadApiKey } from '@google/gemini-cli-core';
7
7
  import { loadEnvironment, loadSettings } from './settings.js';
8
- export const validateAuthMethod = (authMethod) => {
8
+ export const validateAuthMethod = async (authMethod) => {
9
9
  loadEnvironment(loadSettings(process.cwd()).merged, process.cwd());
10
10
  if (authMethod === AuthType.KEYCLOAK) {
11
11
  return null;
12
12
  }
13
13
  if (authMethod === AuthType.USE_GEMINI) {
14
- if (!process.env['GEMINI_API_KEY']) {
14
+ const key = process.env['GEMINI_API_KEY'] || (await loadApiKey());
15
+ if (!key) {
15
16
  return ('When using Gemini API, you must specify the GEMINI_API_KEY environment variable.\n' +
16
17
  'Update your environment and try again (no reload needed if using .env)!');
17
18
  }
@@ -1 +1 @@
1
- {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/config/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAiB,EAAE;IACtE,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnE,IAAI,UAAU,KAAK,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACnC,OAAO,CACL,oFAAoF;gBACpF,yEAAyE,CAC1E,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,+BAA+B,CAAC;AACzC,CAAC,CAAC"}
1
+ {"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/config/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,UAAkB,EACM,EAAE;IAC1B,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnE,IAAI,UAAU,KAAK,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,UAAU,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,CACL,oFAAoF;gBACpF,yEAAyE,CAC1E,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,+BAA+B,CAAC;AACzC,CAAC,CAAC"}
@@ -6,6 +6,13 @@
6
6
  import { AuthType } from '@google/gemini-cli-core';
7
7
  import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
8
8
  import { validateAuthMethod } from './auth.js';
9
+ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
10
+ const actual = await importOriginal();
11
+ return {
12
+ ...actual,
13
+ loadApiKey: vi.fn().mockResolvedValue(null),
14
+ };
15
+ });
9
16
  vi.mock('./settings.js', () => ({
10
17
  loadEnvironment: vi.fn(),
11
18
  loadSettings: vi.fn().mockReturnValue({
@@ -22,11 +29,11 @@ describe('validateAuthMethod', () => {
22
29
  afterEach(() => {
23
30
  vi.unstubAllEnvs();
24
31
  });
25
- it('should return null for KEYCLOAK', () => {
26
- expect(validateAuthMethod(AuthType.KEYCLOAK)).toBeNull();
32
+ it('should return null for KEYCLOAK', async () => {
33
+ expect(await validateAuthMethod(AuthType.KEYCLOAK)).toBeNull();
27
34
  });
28
- it('should return an error message for an invalid auth method', () => {
29
- expect(validateAuthMethod('invalid-method')).toBe('Invalid auth method selected.');
35
+ it('should return an error message for an invalid auth method', async () => {
36
+ expect(await validateAuthMethod('invalid-method')).toBe('Invalid auth method selected.');
30
37
  });
31
38
  });
32
39
  //# sourceMappingURL=auth.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/config/auth.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9B,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;IACxB,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;QACpC,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;KACpC,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QACxC,EAAE,CAAC,OAAO,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;QAC9C,EAAE,CAAC,OAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;QAC/C,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAC/C,+BAA+B,CAChC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/config/auth.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC1D,MAAM,MAAM,GACV,MAAM,cAAc,EAA4C,CAAC;IACnE,OAAO;QACL,GAAG,MAAM;QACT,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;KAC5C,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9B,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;IACxB,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;QACpC,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;KACpC,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QACxC,EAAE,CAAC,OAAO,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;QAC9C,EAAE,CAAC,OAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;QAC/C,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,CAAC,MAAM,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,CAAC,MAAM,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CACrD,+BAA+B,CAChC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}