@machina.ai/cell-cli-core 1.0.13-rc8 → 1.0.17-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 (312) hide show
  1. package/dist/package.json +4 -3
  2. package/dist/src/code_assist/converter.d.ts +2 -1
  3. package/dist/src/code_assist/converter.js +2 -1
  4. package/dist/src/code_assist/converter.js.map +1 -1
  5. package/dist/src/code_assist/converter.test.js +13 -10
  6. package/dist/src/code_assist/converter.test.js.map +1 -1
  7. package/dist/src/code_assist/oauth2.js +8 -0
  8. package/dist/src/code_assist/oauth2.js.map +1 -1
  9. package/dist/src/code_assist/oauth2.test.js +97 -7
  10. package/dist/src/code_assist/oauth2.test.js.map +1 -1
  11. package/dist/src/code_assist/server.d.ts +2 -2
  12. package/dist/src/code_assist/server.js +4 -4
  13. package/dist/src/code_assist/server.js.map +1 -1
  14. package/dist/src/code_assist/server.test.js +9 -9
  15. package/dist/src/code_assist/server.test.js.map +1 -1
  16. package/dist/src/code_assist/setup.js +1 -1
  17. package/dist/src/code_assist/setup.js.map +1 -1
  18. package/dist/src/code_assist/setup.test.js +2 -2
  19. package/dist/src/code_assist/setup.test.js.map +1 -1
  20. package/dist/src/config/config.d.ts +37 -9
  21. package/dist/src/config/config.js +84 -29
  22. package/dist/src/config/config.js.map +1 -1
  23. package/dist/src/config/config.test.js +95 -24
  24. package/dist/src/config/config.test.js.map +1 -1
  25. package/dist/src/config/flashFallback.test.js +23 -47
  26. package/dist/src/config/flashFallback.test.js.map +1 -1
  27. package/dist/src/config/models.d.ts +1 -0
  28. package/dist/src/config/models.js +1 -0
  29. package/dist/src/config/models.js.map +1 -1
  30. package/dist/src/core/client.d.ts +4 -1
  31. package/dist/src/core/client.js +82 -22
  32. package/dist/src/core/client.js.map +1 -1
  33. package/dist/src/core/client.test.js +188 -38
  34. package/dist/src/core/client.test.js.map +1 -1
  35. package/dist/src/core/contentGenerator.d.ts +2 -2
  36. package/dist/src/core/contentGenerator.js.map +1 -1
  37. package/dist/src/core/coreToolScheduler.d.ts +1 -3
  38. package/dist/src/core/coreToolScheduler.js +25 -16
  39. package/dist/src/core/coreToolScheduler.js.map +1 -1
  40. package/dist/src/core/coreToolScheduler.test.js +76 -1
  41. package/dist/src/core/coreToolScheduler.test.js.map +1 -1
  42. package/dist/src/core/geminiChat.d.ts +2 -1
  43. package/dist/src/core/geminiChat.js +9 -11
  44. package/dist/src/core/geminiChat.js.map +1 -1
  45. package/dist/src/core/geminiChat.test.js +2 -2
  46. package/dist/src/core/geminiChat.test.js.map +1 -1
  47. package/dist/src/core/geminiRequest.js +2 -37
  48. package/dist/src/core/geminiRequest.js.map +1 -1
  49. package/dist/src/core/logger.d.ts +1 -0
  50. package/dist/src/core/logger.js +24 -4
  51. package/dist/src/core/logger.js.map +1 -1
  52. package/dist/src/core/logger.test.js +60 -9
  53. package/dist/src/core/logger.test.js.map +1 -1
  54. package/dist/src/core/nonInteractiveToolExecutor.js +11 -3
  55. package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
  56. package/dist/src/core/prompts.js +41 -17
  57. package/dist/src/core/prompts.js.map +1 -1
  58. package/dist/src/core/prompts.test.js +118 -1
  59. package/dist/src/core/prompts.test.js.map +1 -1
  60. package/dist/src/core/tokenLimits.js +1 -0
  61. package/dist/src/core/tokenLimits.js.map +1 -1
  62. package/dist/src/core/turn.d.ts +3 -0
  63. package/dist/src/core/turn.js +3 -0
  64. package/dist/src/core/turn.js.map +1 -1
  65. package/dist/src/ide/detect-ide.d.ts +10 -0
  66. package/dist/src/ide/detect-ide.js +27 -0
  67. package/dist/src/ide/detect-ide.js.map +1 -0
  68. package/dist/src/ide/ide-client.d.ts +40 -0
  69. package/dist/src/ide/ide-client.js +152 -0
  70. package/dist/src/ide/ide-client.js.map +1 -0
  71. package/dist/src/ide/ide-installer.d.ts +14 -0
  72. package/dist/src/ide/ide-installer.js +109 -0
  73. package/dist/src/ide/ide-installer.js.map +1 -0
  74. package/dist/src/ide/ide-installer.test.js +55 -0
  75. package/dist/src/ide/ide-installer.test.js.map +1 -0
  76. package/dist/src/ide/ideContext.d.ts +279 -0
  77. package/dist/src/ide/ideContext.js +102 -0
  78. package/dist/src/ide/ideContext.js.map +1 -0
  79. package/dist/src/ide/ideContext.test.js +265 -0
  80. package/dist/src/ide/ideContext.test.js.map +1 -0
  81. package/dist/src/index.d.ts +11 -1
  82. package/dist/src/index.js +14 -1
  83. package/dist/src/index.js.map +1 -1
  84. package/dist/src/mcp/google-auth-provider.d.ts +23 -0
  85. package/dist/src/mcp/google-auth-provider.js +63 -0
  86. package/dist/src/mcp/google-auth-provider.js.map +1 -0
  87. package/dist/src/mcp/google-auth-provider.test.d.ts +6 -0
  88. package/dist/src/mcp/google-auth-provider.test.js +54 -0
  89. package/dist/src/mcp/google-auth-provider.test.js.map +1 -0
  90. package/dist/src/mcp/oauth-provider.d.ts +5 -1
  91. package/dist/src/mcp/oauth-provider.js +44 -15
  92. package/dist/src/mcp/oauth-provider.js.map +1 -1
  93. package/dist/src/mcp/oauth-provider.test.js +94 -14
  94. package/dist/src/mcp/oauth-provider.test.js.map +1 -1
  95. package/dist/src/mcp/oauth-token-storage.d.ts +3 -1
  96. package/dist/src/mcp/oauth-token-storage.js +3 -1
  97. package/dist/src/mcp/oauth-token-storage.js.map +1 -1
  98. package/dist/src/mcp/oauth-utils.js +2 -2
  99. package/dist/src/mcp/oauth-utils.js.map +1 -1
  100. package/dist/src/mcp/oauth-utils.test.js +1 -1
  101. package/dist/src/mcp/oauth-utils.test.js.map +1 -1
  102. package/dist/src/prompts/mcp-prompts.d.ts +8 -0
  103. package/dist/src/prompts/mcp-prompts.js +13 -0
  104. package/dist/src/prompts/mcp-prompts.js.map +1 -0
  105. package/dist/src/prompts/prompt-registry.d.ts +26 -0
  106. package/dist/src/prompts/prompt-registry.js +47 -0
  107. package/dist/src/prompts/prompt-registry.js.map +1 -0
  108. package/dist/src/services/fileDiscoveryService.test.js +101 -60
  109. package/dist/src/services/fileDiscoveryService.test.js.map +1 -1
  110. package/dist/src/services/gitService.test.js +67 -86
  111. package/dist/src/services/gitService.test.js.map +1 -1
  112. package/dist/src/services/loopDetectionService.d.ts +51 -5
  113. package/dist/src/services/loopDetectionService.js +140 -36
  114. package/dist/src/services/loopDetectionService.js.map +1 -1
  115. package/dist/src/services/loopDetectionService.test.js +105 -99
  116. package/dist/src/services/loopDetectionService.test.js.map +1 -1
  117. package/dist/src/services/shellExecutionService.d.ts +70 -0
  118. package/dist/src/services/shellExecutionService.js +155 -0
  119. package/dist/src/services/shellExecutionService.js.map +1 -0
  120. package/dist/src/services/shellExecutionService.test.d.ts +6 -0
  121. package/dist/src/services/shellExecutionService.test.js +264 -0
  122. package/dist/src/services/shellExecutionService.test.js.map +1 -0
  123. package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +4 -1
  124. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +97 -34
  125. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
  126. package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +6 -1
  127. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +19 -0
  128. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
  129. package/dist/src/telemetry/constants.d.ts +2 -0
  130. package/dist/src/telemetry/constants.js +2 -0
  131. package/dist/src/telemetry/constants.js.map +1 -1
  132. package/dist/src/telemetry/file-exporters.d.ts +28 -0
  133. package/dist/src/telemetry/file-exporters.js +62 -0
  134. package/dist/src/telemetry/file-exporters.js.map +1 -0
  135. package/dist/src/telemetry/index.d.ts +2 -2
  136. package/dist/src/telemetry/index.js +2 -2
  137. package/dist/src/telemetry/index.js.map +1 -1
  138. package/dist/src/telemetry/loggers.d.ts +3 -1
  139. package/dist/src/telemetry/loggers.js +33 -1
  140. package/dist/src/telemetry/loggers.js.map +1 -1
  141. package/dist/src/telemetry/loggers.test.circular.js +2 -0
  142. package/dist/src/telemetry/loggers.test.circular.js.map +1 -1
  143. package/dist/src/telemetry/loggers.test.js +8 -3
  144. package/dist/src/telemetry/loggers.test.js.map +1 -1
  145. package/dist/src/telemetry/sdk.js +17 -6
  146. package/dist/src/telemetry/sdk.js.map +1 -1
  147. package/dist/src/telemetry/telemetry.test.js +2 -0
  148. package/dist/src/telemetry/telemetry.test.js.map +1 -1
  149. package/dist/src/telemetry/types.d.ts +24 -2
  150. package/dist/src/telemetry/types.js +40 -2
  151. package/dist/src/telemetry/types.js.map +1 -1
  152. package/dist/src/telemetry/uiTelemetry.test.js +3 -0
  153. package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
  154. package/dist/src/test-utils/mockWorkspaceContext.d.ts +13 -0
  155. package/dist/src/test-utils/mockWorkspaceContext.js +24 -0
  156. package/dist/src/test-utils/mockWorkspaceContext.js.map +1 -0
  157. package/dist/src/tools/edit.js +27 -3
  158. package/dist/src/tools/edit.js.map +1 -1
  159. package/dist/src/tools/edit.test.js +104 -1
  160. package/dist/src/tools/edit.test.js.map +1 -1
  161. package/dist/src/tools/glob.js +53 -17
  162. package/dist/src/tools/glob.js.map +1 -1
  163. package/dist/src/tools/glob.test.js +32 -6
  164. package/dist/src/tools/glob.test.js.map +1 -1
  165. package/dist/src/tools/grep.d.ts +1 -1
  166. package/dist/src/tools/grep.js +81 -29
  167. package/dist/src/tools/grep.js.map +1 -1
  168. package/dist/src/tools/grep.test.js +76 -9
  169. package/dist/src/tools/grep.test.js.map +1 -1
  170. package/dist/src/tools/ls.js +4 -3
  171. package/dist/src/tools/ls.js.map +1 -1
  172. package/dist/src/tools/ls.test.d.ts +6 -0
  173. package/dist/src/tools/ls.test.js +356 -0
  174. package/dist/src/tools/ls.test.js.map +1 -0
  175. package/dist/src/tools/mcp-client.d.ts +31 -3
  176. package/dist/src/tools/mcp-client.js +503 -57
  177. package/dist/src/tools/mcp-client.js.map +1 -1
  178. package/dist/src/tools/mcp-client.test.js +133 -7
  179. package/dist/src/tools/mcp-client.test.js.map +1 -1
  180. package/dist/src/tools/mcp-tool.js +104 -45
  181. package/dist/src/tools/mcp-tool.js.map +1 -1
  182. package/dist/src/tools/mcp-tool.test.js +314 -2
  183. package/dist/src/tools/mcp-tool.test.js.map +1 -1
  184. package/dist/src/tools/memoryTool.d.ts +17 -2
  185. package/dist/src/tools/memoryTool.js +130 -13
  186. package/dist/src/tools/memoryTool.js.map +1 -1
  187. package/dist/src/tools/memoryTool.test.js +88 -3
  188. package/dist/src/tools/memoryTool.test.js.map +1 -1
  189. package/dist/src/tools/modifiable-tool.test.js +51 -62
  190. package/dist/src/tools/modifiable-tool.test.js.map +1 -1
  191. package/dist/src/tools/read-file.js +8 -6
  192. package/dist/src/tools/read-file.js.map +1 -1
  193. package/dist/src/tools/read-file.test.js +125 -68
  194. package/dist/src/tools/read-file.test.js.map +1 -1
  195. package/dist/src/tools/read-many-files.d.ts +0 -1
  196. package/dist/src/tools/read-many-files.js +29 -20
  197. package/dist/src/tools/read-many-files.js.map +1 -1
  198. package/dist/src/tools/read-many-files.test.js +35 -2
  199. package/dist/src/tools/read-many-files.test.js.map +1 -1
  200. package/dist/src/tools/shell.d.ts +3 -23
  201. package/dist/src/tools/shell.js +173 -300
  202. package/dist/src/tools/shell.js.map +1 -1
  203. package/dist/src/tools/shell.test.js +278 -384
  204. package/dist/src/tools/shell.test.js.map +1 -1
  205. package/dist/src/tools/tool-error.d.ts +22 -0
  206. package/dist/src/tools/tool-error.js +27 -0
  207. package/dist/src/tools/tool-error.js.map +1 -0
  208. package/dist/src/tools/tool-registry.d.ts +13 -1
  209. package/dist/src/tools/tool-registry.js +46 -2
  210. package/dist/src/tools/tool-registry.js.map +1 -1
  211. package/dist/src/tools/tool-registry.test.js +13 -5
  212. package/dist/src/tools/tool-registry.test.js.map +1 -1
  213. package/dist/src/tools/tools.d.ts +8 -0
  214. package/dist/src/tools/tools.js.map +1 -1
  215. package/dist/src/tools/write-file.js +7 -5
  216. package/dist/src/tools/write-file.js.map +1 -1
  217. package/dist/src/tools/write-file.test.js +56 -2
  218. package/dist/src/tools/write-file.test.js.map +1 -1
  219. package/dist/src/utils/bfsFileSearch.js +51 -27
  220. package/dist/src/utils/bfsFileSearch.js.map +1 -1
  221. package/dist/src/utils/bfsFileSearch.test.js +163 -134
  222. package/dist/src/utils/bfsFileSearch.test.js.map +1 -1
  223. package/dist/src/utils/editCorrector.js +2 -2
  224. package/dist/src/utils/editCorrector.js.map +1 -1
  225. package/dist/src/utils/editor.d.ts +1 -1
  226. package/dist/src/utils/editor.js +9 -0
  227. package/dist/src/utils/editor.js.map +1 -1
  228. package/dist/src/utils/editor.test.js +21 -1
  229. package/dist/src/utils/editor.test.js.map +1 -1
  230. package/dist/src/utils/errorReporting.d.ts +1 -1
  231. package/dist/src/utils/errorReporting.js +2 -2
  232. package/dist/src/utils/errorReporting.js.map +1 -1
  233. package/dist/src/utils/errorReporting.test.js +44 -38
  234. package/dist/src/utils/errorReporting.test.js.map +1 -1
  235. package/dist/src/utils/fileUtils.js +13 -2
  236. package/dist/src/utils/fileUtils.js.map +1 -1
  237. package/dist/src/utils/fileUtils.test.js +42 -1
  238. package/dist/src/utils/fileUtils.test.js.map +1 -1
  239. package/dist/src/utils/flashFallback.integration.test.js +8 -0
  240. package/dist/src/utils/flashFallback.integration.test.js.map +1 -1
  241. package/dist/src/utils/formatters.d.ts +6 -0
  242. package/dist/src/utils/formatters.js +16 -0
  243. package/dist/src/utils/formatters.js.map +1 -0
  244. package/dist/src/utils/getFolderStructure.test.js +11 -13
  245. package/dist/src/utils/getFolderStructure.test.js.map +1 -1
  246. package/dist/src/utils/gitIgnoreParser.js +5 -11
  247. package/dist/src/utils/gitIgnoreParser.js.map +1 -1
  248. package/dist/src/utils/gitIgnoreParser.test.js +58 -61
  249. package/dist/src/utils/gitIgnoreParser.test.js.map +1 -1
  250. package/dist/src/utils/memoryDiscovery.d.ts +1 -1
  251. package/dist/src/utils/memoryDiscovery.js +69 -79
  252. package/dist/src/utils/memoryDiscovery.js.map +1 -1
  253. package/dist/src/utils/memoryDiscovery.test.js +119 -370
  254. package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
  255. package/dist/src/utils/memoryImportProcessor.d.ts +19 -12
  256. package/dist/src/utils/memoryImportProcessor.js +241 -82
  257. package/dist/src/utils/memoryImportProcessor.js.map +1 -1
  258. package/dist/src/utils/memoryImportProcessor.test.js +595 -50
  259. package/dist/src/utils/memoryImportProcessor.test.js.map +1 -1
  260. package/dist/src/utils/nextSpeakerChecker.js +3 -23
  261. package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
  262. package/dist/src/utils/nextSpeakerChecker.test.js +2 -2
  263. package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
  264. package/dist/src/utils/partUtils.d.ts +14 -0
  265. package/dist/src/utils/partUtils.js +65 -0
  266. package/dist/src/utils/partUtils.js.map +1 -0
  267. package/dist/src/utils/partUtils.test.d.ts +6 -0
  268. package/dist/src/utils/partUtils.test.js +130 -0
  269. package/dist/src/utils/partUtils.test.js.map +1 -0
  270. package/dist/src/utils/paths.d.ts +11 -2
  271. package/dist/src/utils/paths.js +24 -7
  272. package/dist/src/utils/paths.js.map +1 -1
  273. package/dist/src/utils/paths.test.d.ts +6 -0
  274. package/dist/src/utils/paths.test.js +153 -0
  275. package/dist/src/utils/paths.test.js.map +1 -0
  276. package/dist/src/utils/retry.d.ts +3 -0
  277. package/dist/src/utils/retry.js.map +1 -1
  278. package/dist/src/utils/retry.test.js.map +1 -1
  279. package/dist/src/utils/secure-browser-launcher.d.ts +23 -0
  280. package/dist/src/utils/secure-browser-launcher.js +164 -0
  281. package/dist/src/utils/secure-browser-launcher.js.map +1 -0
  282. package/dist/src/utils/secure-browser-launcher.test.d.ts +6 -0
  283. package/dist/src/utils/secure-browser-launcher.test.js +149 -0
  284. package/dist/src/utils/secure-browser-launcher.test.js.map +1 -0
  285. package/dist/src/utils/shell-utils.d.ts +78 -0
  286. package/dist/src/utils/shell-utils.js +306 -0
  287. package/dist/src/utils/shell-utils.js.map +1 -0
  288. package/dist/src/utils/shell-utils.test.d.ts +6 -0
  289. package/dist/src/utils/shell-utils.test.js +200 -0
  290. package/dist/src/utils/shell-utils.test.js.map +1 -0
  291. package/dist/src/utils/summarizer.js +3 -32
  292. package/dist/src/utils/summarizer.js.map +1 -1
  293. package/dist/src/utils/textUtils.d.ts +13 -0
  294. package/dist/src/utils/textUtils.js +28 -0
  295. package/dist/src/utils/textUtils.js.map +1 -0
  296. package/dist/src/utils/workspaceContext.d.ts +51 -0
  297. package/dist/src/utils/workspaceContext.js +139 -0
  298. package/dist/src/utils/workspaceContext.js.map +1 -0
  299. package/dist/src/utils/workspaceContext.test.d.ts +6 -0
  300. package/dist/src/utils/workspaceContext.test.js +209 -0
  301. package/dist/src/utils/workspaceContext.test.js.map +1 -0
  302. package/dist/tsconfig.tsbuildinfo +1 -1
  303. package/package.json +4 -3
  304. package/dist/src/core/geminiRequest.test.js +0 -72
  305. package/dist/src/core/geminiRequest.test.js.map +0 -1
  306. package/dist/src/services/ideContext.d.ts +0 -178
  307. package/dist/src/services/ideContext.js +0 -105
  308. package/dist/src/services/ideContext.js.map +0 -1
  309. package/dist/src/services/ideContext.test.js +0 -111
  310. package/dist/src/services/ideContext.test.js.map +0 -1
  311. /package/dist/src/{core/geminiRequest.test.d.ts → ide/ide-installer.test.d.ts} +0 -0
  312. /package/dist/src/{services → ide}/ideContext.test.d.ts +0 -0
@@ -83,7 +83,10 @@ describe('DiscoveredMCPTool', () => {
83
83
  details: 'executed',
84
84
  };
85
85
  const mockFunctionResponseContent = [
86
- { text: JSON.stringify(mockToolSuccessResultObject) },
86
+ {
87
+ type: 'text',
88
+ text: JSON.stringify(mockToolSuccessResultObject),
89
+ },
87
90
  ];
88
91
  const mockMcpToolResponseParts = [
89
92
  {
@@ -98,8 +101,10 @@ describe('DiscoveredMCPTool', () => {
98
101
  expect(mockCallTool).toHaveBeenCalledWith([
99
102
  { name: serverToolName, args: params },
100
103
  ]);
101
- expect(toolResult.llmContent).toEqual(mockMcpToolResponseParts);
102
104
  const stringifiedResponseContent = JSON.stringify(mockToolSuccessResultObject);
105
+ expect(toolResult.llmContent).toEqual([
106
+ { text: stringifiedResponseContent },
107
+ ]);
103
108
  expect(toolResult.returnDisplay).toBe(stringifiedResponseContent);
104
109
  });
105
110
  it('should handle empty result from getStringifiedResultForDisplay', async () => {
@@ -109,6 +114,9 @@ describe('DiscoveredMCPTool', () => {
109
114
  mockCallTool.mockResolvedValue(mockMcpToolResponsePartsEmpty);
110
115
  const toolResult = await tool.execute(params);
111
116
  expect(toolResult.returnDisplay).toBe('```json\n[]\n```');
117
+ expect(toolResult.llmContent).toEqual([
118
+ { text: '[Error: Could not parse tool response]' },
119
+ ]);
112
120
  });
113
121
  it('should propagate rejection if mcpTool.callTool rejects', async () => {
114
122
  const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
@@ -117,6 +125,276 @@ describe('DiscoveredMCPTool', () => {
117
125
  mockCallTool.mockRejectedValue(expectedError);
118
126
  await expect(tool.execute(params)).rejects.toThrow(expectedError);
119
127
  });
128
+ it('should handle a simple text response correctly', async () => {
129
+ const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
130
+ const params = { query: 'test' };
131
+ const successMessage = 'This is a success message.';
132
+ // Simulate the response from the GenAI SDK, which wraps the MCP
133
+ // response in a functionResponse Part.
134
+ const sdkResponse = [
135
+ {
136
+ functionResponse: {
137
+ name: serverToolName,
138
+ response: {
139
+ // The `content` array contains MCP ContentBlocks.
140
+ content: [{ type: 'text', text: successMessage }],
141
+ },
142
+ },
143
+ },
144
+ ];
145
+ mockCallTool.mockResolvedValue(sdkResponse);
146
+ const toolResult = await tool.execute(params);
147
+ // 1. Assert that the llmContent sent to the scheduler is a clean Part array.
148
+ expect(toolResult.llmContent).toEqual([{ text: successMessage }]);
149
+ // 2. Assert that the display output is the simple text message.
150
+ expect(toolResult.returnDisplay).toBe(successMessage);
151
+ // 3. Verify that the underlying callTool was made correctly.
152
+ expect(mockCallTool).toHaveBeenCalledWith([
153
+ { name: serverToolName, args: params },
154
+ ]);
155
+ });
156
+ it('should handle an AudioBlock response', async () => {
157
+ const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
158
+ const params = { action: 'play' };
159
+ const sdkResponse = [
160
+ {
161
+ functionResponse: {
162
+ name: serverToolName,
163
+ response: {
164
+ content: [
165
+ {
166
+ type: 'audio',
167
+ data: 'BASE64_AUDIO_DATA',
168
+ mimeType: 'audio/mp3',
169
+ },
170
+ ],
171
+ },
172
+ },
173
+ },
174
+ ];
175
+ mockCallTool.mockResolvedValue(sdkResponse);
176
+ const toolResult = await tool.execute(params);
177
+ expect(toolResult.llmContent).toEqual([
178
+ {
179
+ text: `[Tool '${serverToolName}' provided the following audio data with mime-type: audio/mp3]`,
180
+ },
181
+ {
182
+ inlineData: {
183
+ mimeType: 'audio/mp3',
184
+ data: 'BASE64_AUDIO_DATA',
185
+ },
186
+ },
187
+ ]);
188
+ expect(toolResult.returnDisplay).toBe('[Audio: audio/mp3]');
189
+ });
190
+ it('should handle a ResourceLinkBlock response', async () => {
191
+ const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
192
+ const params = { resource: 'get' };
193
+ const sdkResponse = [
194
+ {
195
+ functionResponse: {
196
+ name: serverToolName,
197
+ response: {
198
+ content: [
199
+ {
200
+ type: 'resource_link',
201
+ uri: 'file:///path/to/thing',
202
+ name: 'resource-name',
203
+ title: 'My Resource',
204
+ },
205
+ ],
206
+ },
207
+ },
208
+ },
209
+ ];
210
+ mockCallTool.mockResolvedValue(sdkResponse);
211
+ const toolResult = await tool.execute(params);
212
+ expect(toolResult.llmContent).toEqual([
213
+ {
214
+ text: 'Resource Link: My Resource at file:///path/to/thing',
215
+ },
216
+ ]);
217
+ expect(toolResult.returnDisplay).toBe('[Link to My Resource: file:///path/to/thing]');
218
+ });
219
+ it('should handle an embedded text ResourceBlock response', async () => {
220
+ const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
221
+ const params = { resource: 'get' };
222
+ const sdkResponse = [
223
+ {
224
+ functionResponse: {
225
+ name: serverToolName,
226
+ response: {
227
+ content: [
228
+ {
229
+ type: 'resource',
230
+ resource: {
231
+ uri: 'file:///path/to/text.txt',
232
+ text: 'This is the text content.',
233
+ mimeType: 'text/plain',
234
+ },
235
+ },
236
+ ],
237
+ },
238
+ },
239
+ },
240
+ ];
241
+ mockCallTool.mockResolvedValue(sdkResponse);
242
+ const toolResult = await tool.execute(params);
243
+ expect(toolResult.llmContent).toEqual([
244
+ { text: 'This is the text content.' },
245
+ ]);
246
+ expect(toolResult.returnDisplay).toBe('This is the text content.');
247
+ });
248
+ it('should handle an embedded binary ResourceBlock response', async () => {
249
+ const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
250
+ const params = { resource: 'get' };
251
+ const sdkResponse = [
252
+ {
253
+ functionResponse: {
254
+ name: serverToolName,
255
+ response: {
256
+ content: [
257
+ {
258
+ type: 'resource',
259
+ resource: {
260
+ uri: 'file:///path/to/data.bin',
261
+ blob: 'BASE64_BINARY_DATA',
262
+ mimeType: 'application/octet-stream',
263
+ },
264
+ },
265
+ ],
266
+ },
267
+ },
268
+ },
269
+ ];
270
+ mockCallTool.mockResolvedValue(sdkResponse);
271
+ const toolResult = await tool.execute(params);
272
+ expect(toolResult.llmContent).toEqual([
273
+ {
274
+ text: `[Tool '${serverToolName}' provided the following embedded resource with mime-type: application/octet-stream]`,
275
+ },
276
+ {
277
+ inlineData: {
278
+ mimeType: 'application/octet-stream',
279
+ data: 'BASE64_BINARY_DATA',
280
+ },
281
+ },
282
+ ]);
283
+ expect(toolResult.returnDisplay).toBe('[Embedded Resource: application/octet-stream]');
284
+ });
285
+ it('should handle a mix of content block types', async () => {
286
+ const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
287
+ const params = { action: 'complex' };
288
+ const sdkResponse = [
289
+ {
290
+ functionResponse: {
291
+ name: serverToolName,
292
+ response: {
293
+ content: [
294
+ { type: 'text', text: 'First part.' },
295
+ {
296
+ type: 'image',
297
+ data: 'BASE64_IMAGE_DATA',
298
+ mimeType: 'image/jpeg',
299
+ },
300
+ { type: 'text', text: 'Second part.' },
301
+ ],
302
+ },
303
+ },
304
+ },
305
+ ];
306
+ mockCallTool.mockResolvedValue(sdkResponse);
307
+ const toolResult = await tool.execute(params);
308
+ expect(toolResult.llmContent).toEqual([
309
+ { text: 'First part.' },
310
+ {
311
+ text: `[Tool '${serverToolName}' provided the following image data with mime-type: image/jpeg]`,
312
+ },
313
+ {
314
+ inlineData: {
315
+ mimeType: 'image/jpeg',
316
+ data: 'BASE64_IMAGE_DATA',
317
+ },
318
+ },
319
+ { text: 'Second part.' },
320
+ ]);
321
+ expect(toolResult.returnDisplay).toBe('First part.\n[Image: image/jpeg]\nSecond part.');
322
+ });
323
+ it('should ignore unknown content block types', async () => {
324
+ const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
325
+ const params = { action: 'test' };
326
+ const sdkResponse = [
327
+ {
328
+ functionResponse: {
329
+ name: serverToolName,
330
+ response: {
331
+ content: [
332
+ { type: 'text', text: 'Valid part.' },
333
+ { type: 'future_block', data: 'some-data' },
334
+ ],
335
+ },
336
+ },
337
+ },
338
+ ];
339
+ mockCallTool.mockResolvedValue(sdkResponse);
340
+ const toolResult = await tool.execute(params);
341
+ expect(toolResult.llmContent).toEqual([{ text: 'Valid part.' }]);
342
+ expect(toolResult.returnDisplay).toBe('Valid part.\n[Unknown content type: future_block]');
343
+ });
344
+ it('should handle a complex mix of content block types', async () => {
345
+ const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
346
+ const params = { action: 'super-complex' };
347
+ const sdkResponse = [
348
+ {
349
+ functionResponse: {
350
+ name: serverToolName,
351
+ response: {
352
+ content: [
353
+ { type: 'text', text: 'Here is a resource.' },
354
+ {
355
+ type: 'resource_link',
356
+ uri: 'file:///path/to/resource',
357
+ name: 'resource-name',
358
+ title: 'My Resource',
359
+ },
360
+ {
361
+ type: 'resource',
362
+ resource: {
363
+ uri: 'file:///path/to/text.txt',
364
+ text: 'Embedded text content.',
365
+ mimeType: 'text/plain',
366
+ },
367
+ },
368
+ {
369
+ type: 'image',
370
+ data: 'BASE64_IMAGE_DATA',
371
+ mimeType: 'image/jpeg',
372
+ },
373
+ ],
374
+ },
375
+ },
376
+ },
377
+ ];
378
+ mockCallTool.mockResolvedValue(sdkResponse);
379
+ const toolResult = await tool.execute(params);
380
+ expect(toolResult.llmContent).toEqual([
381
+ { text: 'Here is a resource.' },
382
+ {
383
+ text: 'Resource Link: My Resource at file:///path/to/resource',
384
+ },
385
+ { text: 'Embedded text content.' },
386
+ {
387
+ text: `[Tool '${serverToolName}' provided the following image data with mime-type: image/jpeg]`,
388
+ },
389
+ {
390
+ inlineData: {
391
+ mimeType: 'image/jpeg',
392
+ data: 'BASE64_IMAGE_DATA',
393
+ },
394
+ },
395
+ ]);
396
+ expect(toolResult.returnDisplay).toBe('Here is a resource.\n[Link to My Resource: file:///path/to/resource]\nEmbedded text content.\n[Image: image/jpeg]');
397
+ });
120
398
  });
121
399
  describe('shouldConfirmExecute', () => {
122
400
  // beforeEach is already clearing allowlist
@@ -184,6 +462,40 @@ describe('DiscoveredMCPTool', () => {
184
462
  throw new Error('Confirmation details or onConfirm not in expected format');
185
463
  }
186
464
  });
465
+ it('should handle Cancel confirmation outcome', async () => {
466
+ const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
467
+ const confirmation = await tool.shouldConfirmExecute({}, new AbortController().signal);
468
+ expect(confirmation).not.toBe(false);
469
+ if (confirmation &&
470
+ typeof confirmation === 'object' &&
471
+ 'onConfirm' in confirmation &&
472
+ typeof confirmation.onConfirm === 'function') {
473
+ // Cancel should not add anything to allowlist
474
+ await confirmation.onConfirm(ToolConfirmationOutcome.Cancel);
475
+ expect(DiscoveredMCPTool.allowlist.has(serverName)).toBe(false);
476
+ expect(DiscoveredMCPTool.allowlist.has(`${serverName}.${serverToolName}`)).toBe(false);
477
+ }
478
+ else {
479
+ throw new Error('Confirmation details or onConfirm not in expected format');
480
+ }
481
+ });
482
+ it('should handle ProceedOnce confirmation outcome', async () => {
483
+ const tool = new DiscoveredMCPTool(mockCallableToolInstance, serverName, serverToolName, baseDescription, inputSchema);
484
+ const confirmation = await tool.shouldConfirmExecute({}, new AbortController().signal);
485
+ expect(confirmation).not.toBe(false);
486
+ if (confirmation &&
487
+ typeof confirmation === 'object' &&
488
+ 'onConfirm' in confirmation &&
489
+ typeof confirmation.onConfirm === 'function') {
490
+ // ProceedOnce should not add anything to allowlist
491
+ await confirmation.onConfirm(ToolConfirmationOutcome.ProceedOnce);
492
+ expect(DiscoveredMCPTool.allowlist.has(serverName)).toBe(false);
493
+ expect(DiscoveredMCPTool.allowlist.has(`${serverName}.${serverToolName}`)).toBe(false);
494
+ }
495
+ else {
496
+ throw new Error('Confirmation details or onConfirm not in expected format');
497
+ }
498
+ });
187
499
  });
188
500
  });
189
501
  //# sourceMappingURL=mcp-tool.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"mcp-tool.test.js","sourceRoot":"","sources":["../../../src/tools/mcp-tool.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mcp-tool.test.js","sourceRoot":"","sources":["../../../src/tools/mcp-tool.test.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,8 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { BaseTool, ToolResult } from './tools.js';
6
+ import { BaseTool, ToolResult, ToolEditConfirmationDetails } from './tools.js';
7
+ import { ModifiableTool, ModifyContext } from './modifiable-tool.js';
7
8
  export declare const GEMINI_CONFIG_DIR = ".gemini";
8
9
  export declare const DEFAULT_CONTEXT_FILENAME = "GEMINI.md";
9
10
  export declare const MEMORY_SECTION_HEADER = "## Gemini Added Memories";
@@ -12,10 +13,23 @@ export declare function getCurrentGeminiMdFilename(): string;
12
13
  export declare function getAllGeminiMdFilenames(): string[];
13
14
  interface SaveMemoryParams {
14
15
  fact: string;
16
+ modified_by_user?: boolean;
17
+ modified_content?: string;
15
18
  }
16
- export declare class MemoryTool extends BaseTool<SaveMemoryParams, ToolResult> {
19
+ export declare class MemoryTool extends BaseTool<SaveMemoryParams, ToolResult> implements ModifiableTool<SaveMemoryParams> {
20
+ private static readonly allowlist;
17
21
  static readonly Name: string;
18
22
  constructor();
23
+ getDescription(_params: SaveMemoryParams): string;
24
+ /**
25
+ * Reads the current content of the memory file
26
+ */
27
+ private readMemoryFileContent;
28
+ /**
29
+ * Computes the new content that would result from adding a memory entry
30
+ */
31
+ private computeNewContent;
32
+ shouldConfirmExecute(params: SaveMemoryParams, _abortSignal: AbortSignal): Promise<ToolEditConfirmationDetails | false>;
19
33
  static performAddMemoryEntry(text: string, memoryFilePath: string, fsAdapter: {
20
34
  readFile: (path: string, encoding: 'utf-8') => Promise<string>;
21
35
  writeFile: (path: string, data: string, encoding: 'utf-8') => Promise<void>;
@@ -24,5 +38,6 @@ export declare class MemoryTool extends BaseTool<SaveMemoryParams, ToolResult> {
24
38
  }) => Promise<string | undefined>;
25
39
  }): Promise<void>;
26
40
  execute(params: SaveMemoryParams, _signal: AbortSignal): Promise<ToolResult>;
41
+ getModifyContext(_abortSignal: AbortSignal): ModifyContext<SaveMemoryParams>;
27
42
  }
28
43
  export {};
@@ -3,11 +3,14 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { BaseTool, Icon } from './tools.js';
6
+ import { BaseTool, ToolConfirmationOutcome, Icon, } from './tools.js';
7
7
  import { Type } from '@google/genai';
8
8
  import * as fs from 'fs/promises';
9
9
  import * as path from 'path';
10
10
  import { homedir } from 'os';
11
+ import * as Diff from 'diff';
12
+ import { DEFAULT_DIFF_OPTIONS } from './diffOptions.js';
13
+ import { tildeifyPath } from '../utils/paths.js';
11
14
  const memoryToolSchemaData = {
12
15
  name: 'save_memory',
13
16
  description: 'Saves a specific piece of information or fact to your long-term memory. Use this when the user explicitly asks you to remember something, or when they state a clear, concise fact that seems important to retain for future interactions.',
@@ -84,10 +87,89 @@ function ensureNewlineSeparation(currentContent) {
84
87
  return '\n\n';
85
88
  }
86
89
  export class MemoryTool extends BaseTool {
90
+ static allowlist = new Set();
87
91
  static Name = memoryToolSchemaData.name;
88
92
  constructor() {
89
93
  super(MemoryTool.Name, 'Save Memory', memoryToolDescription, Icon.LightBulb, memoryToolSchemaData.parameters);
90
94
  }
95
+ getDescription(_params) {
96
+ const memoryFilePath = getGlobalMemoryFilePath();
97
+ return `in ${tildeifyPath(memoryFilePath)}`;
98
+ }
99
+ /**
100
+ * Reads the current content of the memory file
101
+ */
102
+ async readMemoryFileContent() {
103
+ try {
104
+ return await fs.readFile(getGlobalMemoryFilePath(), 'utf-8');
105
+ }
106
+ catch (err) {
107
+ const error = err;
108
+ if (!(error instanceof Error) || error.code !== 'ENOENT')
109
+ throw err;
110
+ return '';
111
+ }
112
+ }
113
+ /**
114
+ * Computes the new content that would result from adding a memory entry
115
+ */
116
+ computeNewContent(currentContent, fact) {
117
+ let processedText = fact.trim();
118
+ processedText = processedText.replace(/^(-+\s*)+/, '').trim();
119
+ const newMemoryItem = `- ${processedText}`;
120
+ const headerIndex = currentContent.indexOf(MEMORY_SECTION_HEADER);
121
+ if (headerIndex === -1) {
122
+ // Header not found, append header and then the entry
123
+ const separator = ensureNewlineSeparation(currentContent);
124
+ return (currentContent +
125
+ `${separator}${MEMORY_SECTION_HEADER}\n${newMemoryItem}\n`);
126
+ }
127
+ else {
128
+ // Header found, find where to insert the new memory entry
129
+ const startOfSectionContent = headerIndex + MEMORY_SECTION_HEADER.length;
130
+ let endOfSectionIndex = currentContent.indexOf('\n## ', startOfSectionContent);
131
+ if (endOfSectionIndex === -1) {
132
+ endOfSectionIndex = currentContent.length; // End of file
133
+ }
134
+ const beforeSectionMarker = currentContent
135
+ .substring(0, startOfSectionContent)
136
+ .trimEnd();
137
+ let sectionContent = currentContent
138
+ .substring(startOfSectionContent, endOfSectionIndex)
139
+ .trimEnd();
140
+ const afterSectionMarker = currentContent.substring(endOfSectionIndex);
141
+ sectionContent += `\n${newMemoryItem}`;
142
+ return (`${beforeSectionMarker}\n${sectionContent.trimStart()}\n${afterSectionMarker}`.trimEnd() +
143
+ '\n');
144
+ }
145
+ }
146
+ async shouldConfirmExecute(params, _abortSignal) {
147
+ const memoryFilePath = getGlobalMemoryFilePath();
148
+ const allowlistKey = memoryFilePath;
149
+ if (MemoryTool.allowlist.has(allowlistKey)) {
150
+ return false;
151
+ }
152
+ // Read current content of the memory file
153
+ const currentContent = await this.readMemoryFileContent();
154
+ // Calculate the new content that will be written to the memory file
155
+ const newContent = this.computeNewContent(currentContent, params.fact);
156
+ const fileName = path.basename(memoryFilePath);
157
+ const fileDiff = Diff.createPatch(fileName, currentContent, newContent, 'Current', 'Proposed', DEFAULT_DIFF_OPTIONS);
158
+ const confirmationDetails = {
159
+ type: 'edit',
160
+ title: `Confirm Memory Save: ${tildeifyPath(memoryFilePath)}`,
161
+ fileName: memoryFilePath,
162
+ fileDiff,
163
+ originalContent: currentContent,
164
+ newContent,
165
+ onConfirm: async (outcome) => {
166
+ if (outcome === ToolConfirmationOutcome.ProceedAlways) {
167
+ MemoryTool.allowlist.add(allowlistKey);
168
+ }
169
+ },
170
+ };
171
+ return confirmationDetails;
172
+ }
91
173
  static async performAddMemoryEntry(text, memoryFilePath, fsAdapter) {
92
174
  let processedText = text.trim();
93
175
  // Remove leading hyphens and spaces that might be misinterpreted as markdown list items
@@ -135,7 +217,7 @@ export class MemoryTool extends BaseTool {
135
217
  }
136
218
  }
137
219
  async execute(params, _signal) {
138
- const { fact } = params;
220
+ const { fact, modified_by_user, modified_content } = params;
139
221
  if (!fact || typeof fact !== 'string' || fact.trim() === '') {
140
222
  const errorMessage = 'Parameter "fact" must be a non-empty string.';
141
223
  return {
@@ -144,17 +226,37 @@ export class MemoryTool extends BaseTool {
144
226
  };
145
227
  }
146
228
  try {
147
- // Use the static method with actual fs promises
148
- await MemoryTool.performAddMemoryEntry(fact, getGlobalMemoryFilePath(), {
149
- readFile: fs.readFile,
150
- writeFile: fs.writeFile,
151
- mkdir: fs.mkdir,
152
- });
153
- const successMessage = `Okay, I've remembered that: "${fact}"`;
154
- return {
155
- llmContent: JSON.stringify({ success: true, message: successMessage }),
156
- returnDisplay: successMessage,
157
- };
229
+ if (modified_by_user && modified_content !== undefined) {
230
+ // User modified the content in external editor, write it directly
231
+ await fs.mkdir(path.dirname(getGlobalMemoryFilePath()), {
232
+ recursive: true,
233
+ });
234
+ await fs.writeFile(getGlobalMemoryFilePath(), modified_content, 'utf-8');
235
+ const successMessage = `Okay, I've updated the memory file with your modifications.`;
236
+ return {
237
+ llmContent: JSON.stringify({
238
+ success: true,
239
+ message: successMessage,
240
+ }),
241
+ returnDisplay: successMessage,
242
+ };
243
+ }
244
+ else {
245
+ // Use the normal memory entry logic
246
+ await MemoryTool.performAddMemoryEntry(fact, getGlobalMemoryFilePath(), {
247
+ readFile: fs.readFile,
248
+ writeFile: fs.writeFile,
249
+ mkdir: fs.mkdir,
250
+ });
251
+ const successMessage = `Okay, I've remembered that: "${fact}"`;
252
+ return {
253
+ llmContent: JSON.stringify({
254
+ success: true,
255
+ message: successMessage,
256
+ }),
257
+ returnDisplay: successMessage,
258
+ };
259
+ }
158
260
  }
159
261
  catch (error) {
160
262
  const errorMessage = error instanceof Error ? error.message : String(error);
@@ -168,5 +270,20 @@ export class MemoryTool extends BaseTool {
168
270
  };
169
271
  }
170
272
  }
273
+ getModifyContext(_abortSignal) {
274
+ return {
275
+ getFilePath: (_params) => getGlobalMemoryFilePath(),
276
+ getCurrentContent: async (_params) => this.readMemoryFileContent(),
277
+ getProposedContent: async (params) => {
278
+ const currentContent = await this.readMemoryFileContent();
279
+ return this.computeNewContent(currentContent, params.fact);
280
+ },
281
+ createUpdatedParams: (_oldContent, modifiedProposedContent, originalParams) => ({
282
+ ...originalParams,
283
+ modified_by_user: true,
284
+ modified_content: modifiedProposedContent,
285
+ }),
286
+ };
287
+ }
171
288
  }
172
289
  //# sourceMappingURL=memoryTool.js.map