@machina.ai/cell-cli-core 1.0.21-rc4 → 1.4.0-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 (505) hide show
  1. package/dist/index.d.ts +6 -2
  2. package/dist/index.js +6 -2
  3. package/dist/index.js.map +1 -1
  4. package/dist/package.json +25 -11
  5. package/dist/src/code_assist/codeAssist.d.ts +6 -3
  6. package/dist/src/code_assist/codeAssist.js +12 -0
  7. package/dist/src/code_assist/codeAssist.js.map +1 -1
  8. package/dist/src/code_assist/converter.d.ts +3 -1
  9. package/dist/src/code_assist/converter.js +37 -5
  10. package/dist/src/code_assist/converter.js.map +1 -1
  11. package/dist/src/code_assist/converter.test.js +83 -0
  12. package/dist/src/code_assist/converter.test.js.map +1 -1
  13. package/dist/src/code_assist/oauth2.d.ts +2 -1
  14. package/dist/src/code_assist/oauth2.js +85 -49
  15. package/dist/src/code_assist/oauth2.js.map +1 -1
  16. package/dist/src/code_assist/oauth2.test.js +317 -15
  17. package/dist/src/code_assist/oauth2.test.js.map +1 -1
  18. package/dist/src/code_assist/server.d.ts +5 -5
  19. package/dist/src/code_assist/server.js +1 -1
  20. package/dist/src/code_assist/server.js.map +1 -1
  21. package/dist/src/code_assist/setup.d.ts +1 -1
  22. package/dist/src/code_assist/setup.js +1 -1
  23. package/dist/src/code_assist/setup.js.map +1 -1
  24. package/dist/src/code_assist/setup.test.js.map +1 -1
  25. package/dist/src/config/config.d.ts +53 -15
  26. package/dist/src/config/config.js +127 -47
  27. package/dist/src/config/config.js.map +1 -1
  28. package/dist/src/config/config.test.js +151 -6
  29. package/dist/src/config/config.test.js.map +1 -1
  30. package/dist/src/config/models.d.ts +1 -0
  31. package/dist/src/config/models.js +2 -0
  32. package/dist/src/config/models.js.map +1 -1
  33. package/dist/src/config/storage.d.ts +32 -0
  34. package/dist/src/config/storage.js +90 -0
  35. package/dist/src/config/storage.js.map +1 -0
  36. package/dist/src/config/storage.test.js +43 -0
  37. package/dist/src/config/storage.test.js.map +1 -0
  38. package/dist/src/core/client.d.ts +21 -11
  39. package/dist/src/core/client.js +83 -26
  40. package/dist/src/core/client.js.map +1 -1
  41. package/dist/src/core/client.test.js +398 -88
  42. package/dist/src/core/client.test.js.map +1 -1
  43. package/dist/src/core/contentGenerator.d.ts +6 -6
  44. package/dist/src/core/contentGenerator.js +4 -3
  45. package/dist/src/core/contentGenerator.js.map +1 -1
  46. package/dist/src/core/contentGenerator.test.js.map +1 -1
  47. package/dist/src/core/coreToolScheduler.d.ts +14 -5
  48. package/dist/src/core/coreToolScheduler.js +120 -49
  49. package/dist/src/core/coreToolScheduler.js.map +1 -1
  50. package/dist/src/core/coreToolScheduler.test.js +383 -72
  51. package/dist/src/core/coreToolScheduler.test.js.map +1 -1
  52. package/dist/src/core/geminiChat.d.ts +48 -15
  53. package/dist/src/core/geminiChat.js +327 -154
  54. package/dist/src/core/geminiChat.js.map +1 -1
  55. package/dist/src/core/geminiChat.test.js +1041 -257
  56. package/dist/src/core/geminiChat.test.js.map +1 -1
  57. package/dist/src/core/geminiRequest.js +1 -0
  58. package/dist/src/core/geminiRequest.js.map +1 -1
  59. package/dist/src/core/logger.d.ts +4 -2
  60. package/dist/src/core/logger.js +4 -3
  61. package/dist/src/core/logger.js.map +1 -1
  62. package/dist/src/core/logger.test.js +19 -18
  63. package/dist/src/core/logger.test.js.map +1 -1
  64. package/dist/src/core/loggingContentGenerator.d.ts +3 -3
  65. package/dist/src/core/loggingContentGenerator.js +11 -9
  66. package/dist/src/core/loggingContentGenerator.js.map +1 -1
  67. package/dist/src/core/nonInteractiveToolExecutor.d.ts +3 -5
  68. package/dist/src/core/nonInteractiveToolExecutor.js +15 -123
  69. package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
  70. package/dist/src/core/nonInteractiveToolExecutor.test.js +116 -90
  71. package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
  72. package/dist/src/core/prompts.js +8 -7
  73. package/dist/src/core/prompts.js.map +1 -1
  74. package/dist/src/core/prompts.test.js +21 -21
  75. package/dist/src/core/prompts.test.js.map +1 -1
  76. package/dist/src/core/subagent.d.ts +24 -18
  77. package/dist/src/core/subagent.js +126 -89
  78. package/dist/src/core/subagent.js.map +1 -1
  79. package/dist/src/core/subagent.test.js +51 -35
  80. package/dist/src/core/subagent.test.js.map +1 -1
  81. package/dist/src/core/turn.d.ts +33 -8
  82. package/dist/src/core/turn.js +59 -14
  83. package/dist/src/core/turn.js.map +1 -1
  84. package/dist/src/core/turn.test.js +349 -90
  85. package/dist/src/core/turn.test.js.map +1 -1
  86. package/dist/src/generated/git-commit.d.ts +2 -2
  87. package/dist/src/generated/git-commit.js +2 -2
  88. package/dist/src/generated/git-commit.js.map +1 -1
  89. package/dist/src/ide/constants.d.ts +1 -1
  90. package/dist/src/ide/constants.js +1 -1
  91. package/dist/src/ide/constants.js.map +1 -1
  92. package/dist/src/ide/detect-ide.d.ts +8 -3
  93. package/dist/src/ide/detect-ide.js +29 -11
  94. package/dist/src/ide/detect-ide.js.map +1 -1
  95. package/dist/src/ide/detect-ide.test.js +96 -52
  96. package/dist/src/ide/detect-ide.test.js.map +1 -1
  97. package/dist/src/ide/ide-client.d.ts +18 -9
  98. package/dist/src/ide/ide-client.js +151 -33
  99. package/dist/src/ide/ide-client.js.map +1 -1
  100. package/dist/src/ide/ide-client.test.js +147 -25
  101. package/dist/src/ide/ide-client.test.js.map +1 -1
  102. package/dist/src/ide/ide-installer.d.ts +1 -1
  103. package/dist/src/ide/ide-installer.js +31 -22
  104. package/dist/src/ide/ide-installer.js.map +1 -1
  105. package/dist/src/ide/ide-installer.test.js +82 -22
  106. package/dist/src/ide/ide-installer.test.js.map +1 -1
  107. package/dist/src/ide/ideContext.d.ts +12 -0
  108. package/dist/src/ide/ideContext.js +1 -0
  109. package/dist/src/ide/ideContext.js.map +1 -1
  110. package/dist/src/ide/process-utils.d.ts +13 -6
  111. package/dist/src/ide/process-utils.js +142 -35
  112. package/dist/src/ide/process-utils.js.map +1 -1
  113. package/dist/src/ide/process-utils.test.js +158 -0
  114. package/dist/src/ide/process-utils.test.js.map +1 -0
  115. package/dist/src/index.d.ts +12 -2
  116. package/dist/src/index.js +11 -1
  117. package/dist/src/index.js.map +1 -1
  118. package/dist/src/mcp/google-auth-provider.d.ts +3 -3
  119. package/dist/src/mcp/google-auth-provider.test.js.map +1 -1
  120. package/dist/src/mcp/oauth-provider.d.ts +13 -13
  121. package/dist/src/mcp/oauth-provider.js +32 -31
  122. package/dist/src/mcp/oauth-provider.js.map +1 -1
  123. package/dist/src/mcp/oauth-provider.test.js +75 -36
  124. package/dist/src/mcp/oauth-provider.test.js.map +1 -1
  125. package/dist/src/mcp/oauth-token-storage.d.ts +9 -31
  126. package/dist/src/mcp/oauth-token-storage.js +10 -13
  127. package/dist/src/mcp/oauth-token-storage.js.map +1 -1
  128. package/dist/src/mcp/oauth-token-storage.test.js +30 -27
  129. package/dist/src/mcp/oauth-token-storage.test.js.map +1 -1
  130. package/dist/src/mcp/oauth-utils.d.ts +9 -1
  131. package/dist/src/mcp/oauth-utils.js +41 -27
  132. package/dist/src/mcp/oauth-utils.js.map +1 -1
  133. package/dist/src/mcp/oauth-utils.test.js +41 -1
  134. package/dist/src/mcp/oauth-utils.test.js.map +1 -1
  135. package/dist/src/mcp/token-storage/base-token-storage.d.ts +19 -0
  136. package/dist/src/mcp/token-storage/base-token-storage.js +36 -0
  137. package/dist/src/mcp/token-storage/base-token-storage.js.map +1 -0
  138. package/dist/src/mcp/token-storage/base-token-storage.test.d.ts +6 -0
  139. package/dist/src/mcp/token-storage/base-token-storage.test.js +160 -0
  140. package/dist/src/mcp/token-storage/base-token-storage.test.js.map +1 -0
  141. package/dist/src/mcp/token-storage/file-token-storage.d.ts +24 -0
  142. package/dist/src/mcp/token-storage/file-token-storage.js +144 -0
  143. package/dist/src/mcp/token-storage/file-token-storage.js.map +1 -0
  144. package/dist/src/mcp/token-storage/file-token-storage.test.d.ts +6 -0
  145. package/dist/src/mcp/token-storage/file-token-storage.test.js +235 -0
  146. package/dist/src/mcp/token-storage/file-token-storage.test.js.map +1 -0
  147. package/dist/src/mcp/token-storage/hybrid-token-storage.d.ts +23 -0
  148. package/dist/src/mcp/token-storage/hybrid-token-storage.js +78 -0
  149. package/dist/src/mcp/token-storage/hybrid-token-storage.js.map +1 -0
  150. package/dist/src/mcp/token-storage/hybrid-token-storage.test.d.ts +6 -0
  151. package/dist/src/mcp/token-storage/hybrid-token-storage.test.js +193 -0
  152. package/dist/src/mcp/token-storage/hybrid-token-storage.test.js.map +1 -0
  153. package/dist/src/mcp/token-storage/keychain-token-storage.d.ts +31 -0
  154. package/dist/src/mcp/token-storage/keychain-token-storage.js +190 -0
  155. package/dist/src/mcp/token-storage/keychain-token-storage.js.map +1 -0
  156. package/dist/src/mcp/token-storage/keychain-token-storage.test.d.ts +6 -0
  157. package/dist/src/mcp/token-storage/keychain-token-storage.test.js +254 -0
  158. package/dist/src/mcp/token-storage/keychain-token-storage.test.js.map +1 -0
  159. package/dist/src/mcp/token-storage/types.d.ts +38 -0
  160. package/dist/src/mcp/token-storage/types.js +11 -0
  161. package/dist/src/mcp/token-storage/types.js.map +1 -0
  162. package/dist/src/prompts/mcp-prompts.d.ts +2 -2
  163. package/dist/src/prompts/prompt-registry.d.ts +1 -1
  164. package/dist/src/services/chatRecordingService.d.ts +6 -13
  165. package/dist/src/services/chatRecordingService.js +31 -19
  166. package/dist/src/services/chatRecordingService.js.map +1 -1
  167. package/dist/src/services/chatRecordingService.test.js +64 -25
  168. package/dist/src/services/chatRecordingService.test.js.map +1 -1
  169. package/dist/src/services/fileDiscoveryService.js +1 -1
  170. package/dist/src/services/fileDiscoveryService.js.map +1 -1
  171. package/dist/src/services/fileDiscoveryService.test.js +3 -3
  172. package/dist/src/services/fileDiscoveryService.test.js.map +1 -1
  173. package/dist/src/services/fileSystemService.js +1 -1
  174. package/dist/src/services/fileSystemService.js.map +1 -1
  175. package/dist/src/services/fileSystemService.test.js +1 -1
  176. package/dist/src/services/fileSystemService.test.js.map +1 -1
  177. package/dist/src/services/gitService.d.ts +3 -1
  178. package/dist/src/services/gitService.js +21 -12
  179. package/dist/src/services/gitService.js.map +1 -1
  180. package/dist/src/services/gitService.test.js +22 -19
  181. package/dist/src/services/gitService.test.js.map +1 -1
  182. package/dist/src/services/loopDetectionService.d.ts +3 -2
  183. package/dist/src/services/loopDetectionService.js +28 -4
  184. package/dist/src/services/loopDetectionService.js.map +1 -1
  185. package/dist/src/services/loopDetectionService.test.js +23 -1
  186. package/dist/src/services/loopDetectionService.test.js.map +1 -1
  187. package/dist/src/services/shellExecutionService.d.ts +8 -10
  188. package/dist/src/services/shellExecutionService.js +292 -135
  189. package/dist/src/services/shellExecutionService.js.map +1 -1
  190. package/dist/src/services/shellExecutionService.test.js +277 -42
  191. package/dist/src/services/shellExecutionService.test.js.map +1 -1
  192. package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +18 -4
  193. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +171 -11
  194. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
  195. package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +103 -11
  196. package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
  197. package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +31 -1
  198. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +75 -0
  199. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
  200. package/dist/src/telemetry/constants.d.ts +9 -0
  201. package/dist/src/telemetry/constants.js +9 -0
  202. package/dist/src/telemetry/constants.js.map +1 -1
  203. package/dist/src/telemetry/file-exporters.d.ts +5 -4
  204. package/dist/src/telemetry/file-exporters.js +1 -1
  205. package/dist/src/telemetry/file-exporters.js.map +1 -1
  206. package/dist/src/telemetry/index.d.ts +5 -2
  207. package/dist/src/telemetry/index.js +3 -2
  208. package/dist/src/telemetry/index.js.map +1 -1
  209. package/dist/src/telemetry/loggers.d.ts +8 -2
  210. package/dist/src/telemetry/loggers.js +130 -2
  211. package/dist/src/telemetry/loggers.js.map +1 -1
  212. package/dist/src/telemetry/loggers.test.circular.js.map +1 -1
  213. package/dist/src/telemetry/loggers.test.js +105 -9
  214. package/dist/src/telemetry/loggers.test.js.map +1 -1
  215. package/dist/src/telemetry/metrics.d.ts +15 -4
  216. package/dist/src/telemetry/metrics.js +46 -8
  217. package/dist/src/telemetry/metrics.js.map +1 -1
  218. package/dist/src/telemetry/metrics.test.js +5 -25
  219. package/dist/src/telemetry/metrics.test.js.map +1 -1
  220. package/dist/src/telemetry/sdk.d.ts +1 -1
  221. package/dist/src/telemetry/sdk.js +3 -3
  222. package/dist/src/telemetry/sdk.js.map +1 -1
  223. package/dist/src/telemetry/telemetry-utils.d.ts +6 -0
  224. package/dist/src/telemetry/telemetry-utils.js +14 -0
  225. package/dist/src/telemetry/telemetry-utils.js.map +1 -0
  226. package/dist/src/telemetry/telemetry-utils.test.d.ts +6 -0
  227. package/dist/src/telemetry/telemetry-utils.test.js +40 -0
  228. package/dist/src/telemetry/telemetry-utils.test.js.map +1 -0
  229. package/dist/src/telemetry/types.d.ts +61 -6
  230. package/dist/src/telemetry/types.js +105 -4
  231. package/dist/src/telemetry/types.js.map +1 -1
  232. package/dist/src/telemetry/uiTelemetry.d.ts +2 -2
  233. package/dist/src/telemetry/uiTelemetry.js +5 -5
  234. package/dist/src/telemetry/uiTelemetry.js.map +1 -1
  235. package/dist/src/telemetry/uiTelemetry.test.js +20 -16
  236. package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
  237. package/dist/src/test-utils/config.d.ts +2 -1
  238. package/dist/src/test-utils/config.js.map +1 -1
  239. package/dist/src/test-utils/index.d.ts +6 -0
  240. package/dist/src/test-utils/index.js +7 -0
  241. package/dist/src/test-utils/index.js.map +1 -0
  242. package/dist/src/test-utils/mock-tool.d.ts +41 -0
  243. package/dist/src/test-utils/mock-tool.js +51 -0
  244. package/dist/src/test-utils/mock-tool.js.map +1 -0
  245. package/dist/src/test-utils/mockWorkspaceContext.d.ts +1 -1
  246. package/dist/src/test-utils/tools.d.ts +3 -2
  247. package/dist/src/test-utils/tools.js.map +1 -1
  248. package/dist/src/tools/diffOptions.d.ts +1 -1
  249. package/dist/src/tools/diffOptions.js +21 -13
  250. package/dist/src/tools/diffOptions.js.map +1 -1
  251. package/dist/src/tools/diffOptions.test.js +58 -22
  252. package/dist/src/tools/diffOptions.test.js.map +1 -1
  253. package/dist/src/tools/edit.d.ts +6 -5
  254. package/dist/src/tools/edit.js +47 -36
  255. package/dist/src/tools/edit.js.map +1 -1
  256. package/dist/src/tools/edit.test.js +77 -12
  257. package/dist/src/tools/edit.test.js.map +1 -1
  258. package/dist/src/tools/glob.d.ts +3 -2
  259. package/dist/src/tools/glob.js +17 -6
  260. package/dist/src/tools/glob.js.map +1 -1
  261. package/dist/src/tools/glob.test.js +29 -4
  262. package/dist/src/tools/glob.test.js.map +1 -1
  263. package/dist/src/tools/grep.d.ts +3 -2
  264. package/dist/src/tools/grep.js +35 -15
  265. package/dist/src/tools/grep.js.map +1 -1
  266. package/dist/src/tools/grep.test.js +26 -3
  267. package/dist/src/tools/grep.test.js.map +1 -1
  268. package/dist/src/tools/ls.d.ts +3 -2
  269. package/dist/src/tools/ls.js +12 -7
  270. package/dist/src/tools/ls.js.map +1 -1
  271. package/dist/src/tools/ls.test.js +7 -2
  272. package/dist/src/tools/ls.test.js.map +1 -1
  273. package/dist/src/tools/mcp-client-manager.d.ts +8 -6
  274. package/dist/src/tools/mcp-client-manager.js +30 -5
  275. package/dist/src/tools/mcp-client-manager.js.map +1 -1
  276. package/dist/src/tools/mcp-client-manager.test.js +20 -1
  277. package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
  278. package/dist/src/tools/mcp-client.d.ts +18 -11
  279. package/dist/src/tools/mcp-client.js +67 -57
  280. package/dist/src/tools/mcp-client.js.map +1 -1
  281. package/dist/src/tools/mcp-client.test.js +29 -4
  282. package/dist/src/tools/mcp-client.test.js.map +1 -1
  283. package/dist/src/tools/mcp-tool.d.ts +6 -4
  284. package/dist/src/tools/mcp-tool.js +21 -11
  285. package/dist/src/tools/mcp-tool.js.map +1 -1
  286. package/dist/src/tools/mcp-tool.test.js +49 -12
  287. package/dist/src/tools/mcp-tool.test.js.map +1 -1
  288. package/dist/src/tools/memoryTool.d.ts +4 -3
  289. package/dist/src/tools/memoryTool.js +15 -38
  290. package/dist/src/tools/memoryTool.js.map +1 -1
  291. package/dist/src/tools/memoryTool.test.js +24 -12
  292. package/dist/src/tools/memoryTool.test.js.map +1 -1
  293. package/dist/src/tools/modifiable-tool.d.ts +2 -2
  294. package/dist/src/tools/modifiable-tool.js +3 -3
  295. package/dist/src/tools/modifiable-tool.js.map +1 -1
  296. package/dist/src/tools/modifiable-tool.test.js +4 -4
  297. package/dist/src/tools/modifiable-tool.test.js.map +1 -1
  298. package/dist/src/tools/read-file.d.ts +3 -2
  299. package/dist/src/tools/read-file.js +12 -34
  300. package/dist/src/tools/read-file.js.map +1 -1
  301. package/dist/src/tools/read-file.test.js +9 -6
  302. package/dist/src/tools/read-file.test.js.map +1 -1
  303. package/dist/src/tools/read-many-files.d.ts +3 -2
  304. package/dist/src/tools/read-many-files.js +35 -58
  305. package/dist/src/tools/read-many-files.js.map +1 -1
  306. package/dist/src/tools/read-many-files.test.js +64 -11
  307. package/dist/src/tools/read-many-files.test.js.map +1 -1
  308. package/dist/src/tools/ripGrep.d.ts +47 -0
  309. package/dist/src/tools/ripGrep.js +368 -0
  310. package/dist/src/tools/ripGrep.js.map +1 -0
  311. package/dist/src/tools/ripGrep.test.d.ts +6 -0
  312. package/dist/src/tools/ripGrep.test.js +874 -0
  313. package/dist/src/tools/ripGrep.test.js.map +1 -0
  314. package/dist/src/tools/shell.d.ts +3 -2
  315. package/dist/src/tools/shell.js +30 -25
  316. package/dist/src/tools/shell.js.map +1 -1
  317. package/dist/src/tools/shell.test.js +34 -25
  318. package/dist/src/tools/shell.test.js.map +1 -1
  319. package/dist/src/tools/smart-edit.d.ts +73 -0
  320. package/dist/src/tools/smart-edit.js +607 -0
  321. package/dist/src/tools/smart-edit.js.map +1 -0
  322. package/dist/src/tools/smart-edit.test.d.ts +6 -0
  323. package/dist/src/tools/smart-edit.test.js +405 -0
  324. package/dist/src/tools/smart-edit.test.js.map +1 -0
  325. package/dist/src/tools/tool-error.d.ts +17 -1
  326. package/dist/src/tools/tool-error.js +26 -0
  327. package/dist/src/tools/tool-error.js.map +1 -1
  328. package/dist/src/tools/tool-registry.d.ts +10 -4
  329. package/dist/src/tools/tool-registry.js +19 -7
  330. package/dist/src/tools/tool-registry.js.map +1 -1
  331. package/dist/src/tools/tool-registry.test.js +86 -3
  332. package/dist/src/tools/tool-registry.test.js.map +1 -1
  333. package/dist/src/tools/tools.d.ts +15 -9
  334. package/dist/src/tools/tools.js +12 -0
  335. package/dist/src/tools/tools.js.map +1 -1
  336. package/dist/src/tools/tools.test.js +1 -2
  337. package/dist/src/tools/tools.test.js.map +1 -1
  338. package/dist/src/tools/web-fetch.d.ts +3 -2
  339. package/dist/src/tools/web-fetch.js +14 -10
  340. package/dist/src/tools/web-fetch.js.map +1 -1
  341. package/dist/src/tools/web-fetch.test.js +55 -16
  342. package/dist/src/tools/web-fetch.test.js.map +1 -1
  343. package/dist/src/tools/web-search.d.ts +4 -3
  344. package/dist/src/tools/web-search.js +31 -8
  345. package/dist/src/tools/web-search.js.map +1 -1
  346. package/dist/src/tools/web-search.test.js +69 -1
  347. package/dist/src/tools/web-search.test.js.map +1 -1
  348. package/dist/src/tools/write-file.d.ts +4 -3
  349. package/dist/src/tools/write-file.js +14 -14
  350. package/dist/src/tools/write-file.js.map +1 -1
  351. package/dist/src/tools/write-file.test.js +14 -14
  352. package/dist/src/tools/write-file.test.js.map +1 -1
  353. package/dist/src/utils/bfsFileSearch.d.ts +2 -2
  354. package/dist/src/utils/bfsFileSearch.js +2 -2
  355. package/dist/src/utils/bfsFileSearch.js.map +1 -1
  356. package/dist/src/utils/bfsFileSearch.test.js +3 -3
  357. package/dist/src/utils/bfsFileSearch.test.js.map +1 -1
  358. package/dist/src/utils/editCorrector.d.ts +2 -2
  359. package/dist/src/utils/editCorrector.js +1 -1
  360. package/dist/src/utils/editCorrector.js.map +1 -1
  361. package/dist/src/utils/editCorrector.test.js +3 -3
  362. package/dist/src/utils/editCorrector.test.js.map +1 -1
  363. package/dist/src/utils/editor.js +2 -2
  364. package/dist/src/utils/editor.js.map +1 -1
  365. package/dist/src/utils/editor.test.js +2 -2
  366. package/dist/src/utils/editor.test.js.map +1 -1
  367. package/dist/src/utils/environmentContext.d.ts +2 -2
  368. package/dist/src/utils/environmentContext.js +1 -1
  369. package/dist/src/utils/environmentContext.js.map +1 -1
  370. package/dist/src/utils/environmentContext.test.js +1 -1
  371. package/dist/src/utils/environmentContext.test.js.map +1 -1
  372. package/dist/src/utils/errorReporting.d.ts +1 -1
  373. package/dist/src/utils/errors.d.ts +19 -0
  374. package/dist/src/utils/errors.js +32 -0
  375. package/dist/src/utils/errors.js.map +1 -1
  376. package/dist/src/utils/fetch.js +1 -1
  377. package/dist/src/utils/fetch.js.map +1 -1
  378. package/dist/src/utils/fileUtils.d.ts +23 -12
  379. package/dist/src/utils/fileUtils.js +160 -79
  380. package/dist/src/utils/fileUtils.js.map +1 -1
  381. package/dist/src/utils/fileUtils.test.js +314 -21
  382. package/dist/src/utils/fileUtils.test.js.map +1 -1
  383. package/dist/src/utils/filesearch/crawler.d.ts +1 -1
  384. package/dist/src/utils/filesearch/crawler.test.js +2 -2
  385. package/dist/src/utils/filesearch/crawler.test.js.map +1 -1
  386. package/dist/src/utils/filesearch/fileSearch.d.ts +1 -0
  387. package/dist/src/utils/filesearch/fileSearch.js +14 -9
  388. package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
  389. package/dist/src/utils/filesearch/fileSearch.test.js +90 -0
  390. package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -1
  391. package/dist/src/utils/generateContentResponseUtilities.d.ts +1 -2
  392. package/dist/src/utils/generateContentResponseUtilities.js +1 -13
  393. package/dist/src/utils/generateContentResponseUtilities.js.map +1 -1
  394. package/dist/src/utils/generateContentResponseUtilities.test.js +2 -40
  395. package/dist/src/utils/generateContentResponseUtilities.test.js.map +1 -1
  396. package/dist/src/utils/getFolderStructure.d.ts +2 -2
  397. package/dist/src/utils/getFolderStructure.js +2 -2
  398. package/dist/src/utils/getFolderStructure.js.map +1 -1
  399. package/dist/src/utils/getFolderStructure.test.js +13 -13
  400. package/dist/src/utils/getFolderStructure.test.js.map +1 -1
  401. package/dist/src/utils/getPty.d.ts +19 -0
  402. package/dist/src/utils/getPty.js +23 -0
  403. package/dist/src/utils/getPty.js.map +1 -0
  404. package/dist/src/utils/gitIgnoreParser.d.ts +1 -0
  405. package/dist/src/utils/gitIgnoreParser.js +104 -13
  406. package/dist/src/utils/gitIgnoreParser.js.map +1 -1
  407. package/dist/src/utils/gitIgnoreParser.test.js +69 -3
  408. package/dist/src/utils/gitIgnoreParser.test.js.map +1 -1
  409. package/dist/src/utils/gitUtils.js +2 -2
  410. package/dist/src/utils/gitUtils.js.map +1 -1
  411. package/dist/src/utils/ide-trust.d.ts +10 -0
  412. package/dist/src/utils/ide-trust.js +14 -0
  413. package/dist/src/utils/ide-trust.js.map +1 -0
  414. package/dist/src/utils/ignorePatterns.d.ts +103 -0
  415. package/dist/src/utils/ignorePatterns.js +220 -0
  416. package/dist/src/utils/ignorePatterns.js.map +1 -0
  417. package/dist/src/utils/ignorePatterns.test.d.ts +6 -0
  418. package/dist/src/utils/ignorePatterns.test.js +250 -0
  419. package/dist/src/utils/ignorePatterns.test.js.map +1 -0
  420. package/dist/src/utils/installationManager.d.ts +16 -0
  421. package/dist/src/utils/installationManager.js +50 -0
  422. package/dist/src/utils/installationManager.js.map +1 -0
  423. package/dist/src/utils/installationManager.test.d.ts +6 -0
  424. package/dist/src/utils/installationManager.test.js +83 -0
  425. package/dist/src/utils/installationManager.test.js.map +1 -0
  426. package/dist/src/utils/language-detection.d.ts +6 -0
  427. package/dist/src/utils/language-detection.js +101 -0
  428. package/dist/src/utils/language-detection.js.map +1 -0
  429. package/dist/src/utils/llm-edit-fixer.d.ts +25 -0
  430. package/dist/src/utils/llm-edit-fixer.js +112 -0
  431. package/dist/src/utils/llm-edit-fixer.js.map +1 -0
  432. package/dist/src/utils/memoryDiscovery.d.ts +7 -6
  433. package/dist/src/utils/memoryDiscovery.js +68 -33
  434. package/dist/src/utils/memoryDiscovery.js.map +1 -1
  435. package/dist/src/utils/memoryDiscovery.test.js +76 -20
  436. package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
  437. package/dist/src/utils/memoryImportProcessor.js +2 -2
  438. package/dist/src/utils/memoryImportProcessor.js.map +1 -1
  439. package/dist/src/utils/memoryImportProcessor.test.js +2 -141
  440. package/dist/src/utils/memoryImportProcessor.test.js.map +1 -1
  441. package/dist/src/utils/messageInspectors.d.ts +1 -1
  442. package/dist/src/utils/nextSpeakerChecker.d.ts +2 -2
  443. package/dist/src/utils/nextSpeakerChecker.test.js +33 -0
  444. package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
  445. package/dist/src/utils/partUtils.d.ts +22 -1
  446. package/dist/src/utils/partUtils.js +68 -0
  447. package/dist/src/utils/partUtils.js.map +1 -1
  448. package/dist/src/utils/partUtils.test.js +112 -1
  449. package/dist/src/utils/partUtils.test.js.map +1 -1
  450. package/dist/src/utils/pathReader.d.ts +17 -0
  451. package/dist/src/utils/pathReader.js +92 -0
  452. package/dist/src/utils/pathReader.js.map +1 -0
  453. package/dist/src/utils/pathReader.test.d.ts +6 -0
  454. package/dist/src/utils/pathReader.test.js +363 -0
  455. package/dist/src/utils/pathReader.test.js.map +1 -0
  456. package/dist/src/utils/paths.d.ts +1 -18
  457. package/dist/src/utils/paths.js +3 -29
  458. package/dist/src/utils/paths.js.map +1 -1
  459. package/dist/src/utils/quotaErrorDetection.d.ts +1 -1
  460. package/dist/src/utils/retry.test.js +4 -1
  461. package/dist/src/utils/retry.test.js.map +1 -1
  462. package/dist/src/utils/schemaValidator.js +4 -0
  463. package/dist/src/utils/schemaValidator.js.map +1 -1
  464. package/dist/src/utils/session.js +1 -1
  465. package/dist/src/utils/session.js.map +1 -1
  466. package/dist/src/utils/shell-utils.d.ts +1 -1
  467. package/dist/src/utils/shell-utils.js +23 -29
  468. package/dist/src/utils/shell-utils.js.map +1 -1
  469. package/dist/src/utils/shell-utils.test.js +7 -0
  470. package/dist/src/utils/shell-utils.test.js.map +1 -1
  471. package/dist/src/utils/summarizer.d.ts +2 -2
  472. package/dist/src/utils/summarizer.test.js.map +1 -1
  473. package/dist/src/utils/systemEncoding.js +2 -2
  474. package/dist/src/utils/systemEncoding.js.map +1 -1
  475. package/dist/src/utils/systemEncoding.test.js +2 -2
  476. package/dist/src/utils/systemEncoding.test.js.map +1 -1
  477. package/dist/src/utils/tool-utils.d.ts +19 -0
  478. package/dist/src/utils/tool-utils.js +58 -0
  479. package/dist/src/utils/tool-utils.js.map +1 -0
  480. package/dist/src/utils/tool-utils.test.d.ts +6 -0
  481. package/dist/src/utils/tool-utils.test.js +61 -0
  482. package/dist/src/utils/tool-utils.test.js.map +1 -0
  483. package/dist/src/utils/userAccountManager.d.ts +20 -0
  484. package/dist/src/utils/userAccountManager.js +114 -0
  485. package/dist/src/utils/userAccountManager.js.map +1 -0
  486. package/dist/src/utils/userAccountManager.test.d.ts +6 -0
  487. package/dist/src/utils/{user_account.test.js → userAccountManager.test.js} +33 -30
  488. package/dist/src/utils/userAccountManager.test.js.map +1 -0
  489. package/dist/src/utils/workspaceContext.js +13 -7
  490. package/dist/src/utils/workspaceContext.js.map +1 -1
  491. package/dist/src/utils/workspaceContext.test.js +41 -16
  492. package/dist/src/utils/workspaceContext.test.js.map +1 -1
  493. package/dist/tsconfig.tsbuildinfo +1 -1
  494. package/package.json +27 -13
  495. package/dist/src/utils/user_account.d.ts +0 -9
  496. package/dist/src/utils/user_account.js +0 -109
  497. package/dist/src/utils/user_account.js.map +0 -1
  498. package/dist/src/utils/user_account.test.js.map +0 -1
  499. package/dist/src/utils/user_id.d.ts +0 -11
  500. package/dist/src/utils/user_id.js +0 -49
  501. package/dist/src/utils/user_id.js.map +0 -1
  502. package/dist/src/utils/user_id.test.js +0 -21
  503. package/dist/src/utils/user_id.test.js.map +0 -1
  504. /package/dist/src/{utils/user_account.test.d.ts → config/storage.test.d.ts} +0 -0
  505. /package/dist/src/{utils/user_id.test.d.ts → ide/process-utils.test.d.ts} +0 -0
@@ -3,13 +3,26 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { spawn } from 'child_process';
7
- import { TextDecoder } from 'util';
8
- import os from 'os';
9
- import stripAnsi from 'strip-ansi';
6
+ import { getPty } from '../utils/getPty.js';
7
+ import { spawn as cpSpawn } from 'node:child_process';
8
+ import { TextDecoder } from 'node:util';
9
+ import os from 'node:os';
10
10
  import { getCachedEncodingForBuffer } from '../utils/systemEncoding.js';
11
11
  import { isBinary } from '../utils/textUtils.js';
12
+ import pkg from '@xterm/headless';
13
+ import stripAnsi from 'strip-ansi';
14
+ const { Terminal } = pkg;
12
15
  const SIGKILL_TIMEOUT_MS = 200;
16
+ // @ts-expect-error getFullText is not a public API.
17
+ const getFullText = (terminal) => {
18
+ const buffer = terminal.buffer.active;
19
+ const lines = [];
20
+ for (let i = 0; i < buffer.length; i++) {
21
+ const line = buffer.getLine(i);
22
+ lines.push(line ? line.translateToString(true) : '');
23
+ }
24
+ return lines.join('\n').trim();
25
+ };
13
26
  /**
14
27
  * A centralized service for executing shell commands with robust process
15
28
  * management, cross-platform compatibility, and streaming output capabilities.
@@ -17,7 +30,7 @@ const SIGKILL_TIMEOUT_MS = 200;
17
30
  */
18
31
  export class ShellExecutionService {
19
32
  /**
20
- * Executes a shell command using `spawn`, capturing all output and lifecycle events.
33
+ * Executes a shell command using `node-pty`, capturing all output and lifecycle events.
21
34
  *
22
35
  * @param commandToExecute The exact command string to run.
23
36
  * @param cwd The working directory to execute the command in.
@@ -26,150 +39,294 @@ export class ShellExecutionService {
26
39
  * @returns An object containing the process ID (pid) and a promise that
27
40
  * resolves with the complete execution result.
28
41
  */
29
- static execute(commandToExecute, cwd, onOutputEvent, abortSignal) {
30
- const isWindows = os.platform() === 'win32';
31
- const child = spawn(commandToExecute, [], {
32
- cwd,
33
- stdio: ['ignore', 'pipe', 'pipe'],
34
- // Use bash unless in Windows (since it doesn't support bash).
35
- // For windows, just use the default.
36
- shell: isWindows ? true : 'bash',
37
- // Use process groups on non-Windows for robust killing.
38
- // Windows process termination is handled by `taskkill /t`.
39
- detached: !isWindows,
40
- env: {
41
- ...process.env,
42
- GEMINI_CLI: '1',
43
- },
44
- });
45
- const result = new Promise((resolve) => {
46
- // Use decoders to handle multi-byte characters safely (for streaming output).
47
- let stdoutDecoder = null;
48
- let stderrDecoder = null;
49
- let stdout = '';
50
- let stderr = '';
51
- const outputChunks = [];
52
- let error = null;
53
- let exited = false;
54
- let isStreamingRawContent = true;
55
- const MAX_SNIFF_SIZE = 4096;
56
- let sniffedBytes = 0;
57
- const handleOutput = (data, stream) => {
58
- if (!stdoutDecoder || !stderrDecoder) {
59
- const encoding = getCachedEncodingForBuffer(data);
60
- try {
61
- stdoutDecoder = new TextDecoder(encoding);
62
- stderrDecoder = new TextDecoder(encoding);
42
+ static async execute(commandToExecute, cwd, onOutputEvent, abortSignal, shouldUseNodePty, terminalColumns, terminalRows) {
43
+ if (shouldUseNodePty) {
44
+ const ptyInfo = await getPty();
45
+ if (ptyInfo) {
46
+ try {
47
+ return this.executeWithPty(commandToExecute, cwd, onOutputEvent, abortSignal, terminalColumns, terminalRows, ptyInfo);
48
+ }
49
+ catch (_e) {
50
+ // Fallback to child_process
51
+ }
52
+ }
53
+ }
54
+ return this.childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal);
55
+ }
56
+ static childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal) {
57
+ try {
58
+ const isWindows = os.platform() === 'win32';
59
+ const child = cpSpawn(commandToExecute, [], {
60
+ cwd,
61
+ stdio: ['ignore', 'pipe', 'pipe'],
62
+ windowsVerbatimArguments: true,
63
+ shell: isWindows ? true : 'bash',
64
+ detached: !isWindows,
65
+ env: {
66
+ ...process.env,
67
+ GEMINI_CLI: '1',
68
+ TERM: 'xterm-256color',
69
+ PAGER: 'cat',
70
+ },
71
+ });
72
+ const result = new Promise((resolve) => {
73
+ let stdoutDecoder = null;
74
+ let stderrDecoder = null;
75
+ let stdout = '';
76
+ let stderr = '';
77
+ const outputChunks = [];
78
+ let error = null;
79
+ let exited = false;
80
+ let isStreamingRawContent = true;
81
+ const MAX_SNIFF_SIZE = 4096;
82
+ let sniffedBytes = 0;
83
+ const handleOutput = (data, stream) => {
84
+ if (!stdoutDecoder || !stderrDecoder) {
85
+ const encoding = getCachedEncodingForBuffer(data);
86
+ try {
87
+ stdoutDecoder = new TextDecoder(encoding);
88
+ stderrDecoder = new TextDecoder(encoding);
89
+ }
90
+ catch {
91
+ stdoutDecoder = new TextDecoder('utf-8');
92
+ stderrDecoder = new TextDecoder('utf-8');
93
+ }
63
94
  }
64
- catch {
65
- // If the encoding is not supported, fall back to utf-8.
66
- // This can happen on some platforms for certain encodings like 'utf-32le'.
67
- stdoutDecoder = new TextDecoder('utf-8');
68
- stderrDecoder = new TextDecoder('utf-8');
95
+ outputChunks.push(data);
96
+ if (isStreamingRawContent && sniffedBytes < MAX_SNIFF_SIZE) {
97
+ const sniffBuffer = Buffer.concat(outputChunks.slice(0, 20));
98
+ sniffedBytes = sniffBuffer.length;
99
+ if (isBinary(sniffBuffer)) {
100
+ isStreamingRawContent = false;
101
+ onOutputEvent({ type: 'binary_detected' });
102
+ }
69
103
  }
70
- }
71
- outputChunks.push(data);
72
- // Binary detection logic. This only runs until we've made a determination.
73
- if (isStreamingRawContent && sniffedBytes < MAX_SNIFF_SIZE) {
74
- const sniffBuffer = Buffer.concat(outputChunks.slice(0, 20));
75
- sniffedBytes = sniffBuffer.length;
76
- if (isBinary(sniffBuffer)) {
77
- // Change state to stop streaming raw content.
78
- isStreamingRawContent = false;
79
- onOutputEvent({ type: 'binary_detected' });
104
+ const decoder = stream === 'stdout' ? stdoutDecoder : stderrDecoder;
105
+ const decodedChunk = decoder.decode(data, { stream: true });
106
+ const strippedChunk = stripAnsi(decodedChunk);
107
+ if (stream === 'stdout') {
108
+ stdout += strippedChunk;
80
109
  }
110
+ else {
111
+ stderr += strippedChunk;
112
+ }
113
+ if (isStreamingRawContent) {
114
+ onOutputEvent({ type: 'data', chunk: strippedChunk });
115
+ }
116
+ else {
117
+ const totalBytes = outputChunks.reduce((sum, chunk) => sum + chunk.length, 0);
118
+ onOutputEvent({
119
+ type: 'binary_progress',
120
+ bytesReceived: totalBytes,
121
+ });
122
+ }
123
+ };
124
+ const handleExit = (code, signal) => {
125
+ const { finalBuffer } = cleanup();
126
+ // Ensure we don't add an extra newline if stdout already ends with one.
127
+ const separator = stdout.endsWith('\n') ? '' : '\n';
128
+ const combinedOutput = stdout + (stderr ? (stdout ? separator : '') + stderr : '');
129
+ resolve({
130
+ rawOutput: finalBuffer,
131
+ output: combinedOutput.trim(),
132
+ exitCode: code,
133
+ signal: signal ? os.constants.signals[signal] : null,
134
+ error,
135
+ aborted: abortSignal.aborted,
136
+ pid: child.pid,
137
+ executionMethod: 'child_process',
138
+ });
139
+ };
140
+ child.stdout.on('data', (data) => handleOutput(data, 'stdout'));
141
+ child.stderr.on('data', (data) => handleOutput(data, 'stderr'));
142
+ child.on('error', (err) => {
143
+ error = err;
144
+ handleExit(1, null);
145
+ });
146
+ const abortHandler = async () => {
147
+ if (child.pid && !exited) {
148
+ if (isWindows) {
149
+ cpSpawn('taskkill', ['/pid', child.pid.toString(), '/f', '/t']);
150
+ }
151
+ else {
152
+ try {
153
+ process.kill(-child.pid, 'SIGTERM');
154
+ await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
155
+ if (!exited) {
156
+ process.kill(-child.pid, 'SIGKILL');
157
+ }
158
+ }
159
+ catch (_e) {
160
+ if (!exited)
161
+ child.kill('SIGKILL');
162
+ }
163
+ }
164
+ }
165
+ };
166
+ abortSignal.addEventListener('abort', abortHandler, { once: true });
167
+ child.on('exit', (code, signal) => {
168
+ handleExit(code, signal);
169
+ });
170
+ function cleanup() {
171
+ exited = true;
172
+ abortSignal.removeEventListener('abort', abortHandler);
173
+ if (stdoutDecoder) {
174
+ const remaining = stdoutDecoder.decode();
175
+ if (remaining) {
176
+ stdout += stripAnsi(remaining);
177
+ }
178
+ }
179
+ if (stderrDecoder) {
180
+ const remaining = stderrDecoder.decode();
181
+ if (remaining) {
182
+ stderr += stripAnsi(remaining);
183
+ }
184
+ }
185
+ const finalBuffer = Buffer.concat(outputChunks);
186
+ return { stdout, stderr, finalBuffer };
81
187
  }
82
- const decodedChunk = stream === 'stdout'
83
- ? stdoutDecoder.decode(data, { stream: true })
84
- : stderrDecoder.decode(data, { stream: true });
85
- const strippedChunk = stripAnsi(decodedChunk);
86
- if (stream === 'stdout') {
87
- stdout += strippedChunk;
88
- }
89
- else {
90
- stderr += strippedChunk;
91
- }
92
- if (isStreamingRawContent) {
93
- onOutputEvent({ type: 'data', stream, chunk: strippedChunk });
94
- }
95
- else {
96
- const totalBytes = outputChunks.reduce((sum, chunk) => sum + chunk.length, 0);
97
- onOutputEvent({ type: 'binary_progress', bytesReceived: totalBytes });
98
- }
99
- };
100
- child.stdout.on('data', (data) => handleOutput(data, 'stdout'));
101
- child.stderr.on('data', (data) => handleOutput(data, 'stderr'));
102
- child.on('error', (err) => {
103
- const { stdout, stderr, finalBuffer } = cleanup();
104
- error = err;
105
- resolve({
188
+ });
189
+ return { pid: child.pid, result };
190
+ }
191
+ catch (e) {
192
+ const error = e;
193
+ return {
194
+ pid: undefined,
195
+ result: Promise.resolve({
106
196
  error,
107
- stdout,
108
- stderr,
109
- rawOutput: finalBuffer,
110
- output: stdout + (stderr ? `\n${stderr}` : ''),
197
+ rawOutput: Buffer.from(''),
198
+ output: '',
111
199
  exitCode: 1,
112
200
  signal: null,
113
201
  aborted: false,
114
- pid: child.pid,
115
- });
202
+ pid: undefined,
203
+ executionMethod: 'none',
204
+ }),
205
+ };
206
+ }
207
+ }
208
+ static executeWithPty(commandToExecute, cwd, onOutputEvent, abortSignal, terminalColumns, terminalRows, ptyInfo) {
209
+ try {
210
+ const cols = terminalColumns ?? 80;
211
+ const rows = terminalRows ?? 30;
212
+ const isWindows = os.platform() === 'win32';
213
+ const shell = isWindows ? 'cmd.exe' : 'bash';
214
+ const args = isWindows
215
+ ? `/c ${commandToExecute}`
216
+ : ['-c', commandToExecute];
217
+ const ptyProcess = ptyInfo?.module.spawn(shell, args, {
218
+ cwd,
219
+ name: 'xterm-color',
220
+ cols,
221
+ rows,
222
+ env: {
223
+ ...process.env,
224
+ GEMINI_CLI: '1',
225
+ TERM: 'xterm-256color',
226
+ PAGER: 'cat',
227
+ },
228
+ handleFlowControl: true,
116
229
  });
117
- const abortHandler = async () => {
118
- if (child.pid && !exited) {
119
- if (isWindows) {
120
- spawn('taskkill', ['/pid', child.pid.toString(), '/f', '/t']);
121
- }
122
- else {
123
- try {
124
- // Kill the entire process group (negative PID).
125
- // SIGTERM first, then SIGKILL if it doesn't die.
126
- process.kill(-child.pid, 'SIGTERM');
127
- await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
128
- if (!exited) {
129
- process.kill(-child.pid, 'SIGKILL');
230
+ const result = new Promise((resolve) => {
231
+ const headlessTerminal = new Terminal({
232
+ allowProposedApi: true,
233
+ cols,
234
+ rows,
235
+ });
236
+ let processingChain = Promise.resolve();
237
+ let decoder = null;
238
+ const outputChunks = [];
239
+ const error = null;
240
+ let exited = false;
241
+ let isStreamingRawContent = true;
242
+ const MAX_SNIFF_SIZE = 4096;
243
+ let sniffedBytes = 0;
244
+ const handleOutput = (data) => {
245
+ processingChain = processingChain.then(() => new Promise((resolve) => {
246
+ if (!decoder) {
247
+ const encoding = getCachedEncodingForBuffer(data);
248
+ try {
249
+ decoder = new TextDecoder(encoding);
250
+ }
251
+ catch {
252
+ decoder = new TextDecoder('utf-8');
130
253
  }
131
254
  }
132
- catch (_e) {
133
- // Fall back to killing just the main process if group kill fails.
134
- if (!exited)
135
- child.kill('SIGKILL');
255
+ outputChunks.push(data);
256
+ if (isStreamingRawContent && sniffedBytes < MAX_SNIFF_SIZE) {
257
+ const sniffBuffer = Buffer.concat(outputChunks.slice(0, 20));
258
+ sniffedBytes = sniffBuffer.length;
259
+ if (isBinary(sniffBuffer)) {
260
+ isStreamingRawContent = false;
261
+ onOutputEvent({ type: 'binary_detected' });
262
+ }
136
263
  }
137
- }
138
- }
139
- };
140
- abortSignal.addEventListener('abort', abortHandler, { once: true });
141
- child.on('exit', (code, signal) => {
142
- const { stdout, stderr, finalBuffer } = cleanup();
143
- resolve({
144
- rawOutput: finalBuffer,
145
- output: stdout + (stderr ? `\n${stderr}` : ''),
146
- stdout,
147
- stderr,
148
- exitCode: code,
149
- signal,
150
- error,
151
- aborted: abortSignal.aborted,
152
- pid: child.pid,
264
+ if (isStreamingRawContent) {
265
+ const decodedChunk = decoder.decode(data, { stream: true });
266
+ headlessTerminal.write(decodedChunk, () => {
267
+ onOutputEvent({
268
+ type: 'data',
269
+ chunk: stripAnsi(decodedChunk),
270
+ });
271
+ resolve();
272
+ });
273
+ }
274
+ else {
275
+ const totalBytes = outputChunks.reduce((sum, chunk) => sum + chunk.length, 0);
276
+ onOutputEvent({
277
+ type: 'binary_progress',
278
+ bytesReceived: totalBytes,
279
+ });
280
+ resolve();
281
+ }
282
+ }));
283
+ };
284
+ ptyProcess.onData((data) => {
285
+ const bufferData = Buffer.from(data, 'utf-8');
286
+ handleOutput(bufferData);
287
+ });
288
+ ptyProcess.onExit(({ exitCode, signal }) => {
289
+ exited = true;
290
+ abortSignal.removeEventListener('abort', abortHandler);
291
+ processingChain.then(() => {
292
+ const finalBuffer = Buffer.concat(outputChunks);
293
+ resolve({
294
+ rawOutput: finalBuffer,
295
+ output: getFullText(headlessTerminal),
296
+ exitCode,
297
+ signal: signal ?? null,
298
+ error,
299
+ aborted: abortSignal.aborted,
300
+ pid: ptyProcess.pid,
301
+ executionMethod: ptyInfo?.name ?? 'node-pty',
302
+ });
303
+ });
153
304
  });
305
+ const abortHandler = async () => {
306
+ if (ptyProcess.pid && !exited) {
307
+ ptyProcess.kill('SIGHUP');
308
+ }
309
+ };
310
+ abortSignal.addEventListener('abort', abortHandler, { once: true });
154
311
  });
155
- /**
156
- * Cleans up a process (and it's accompanying state) that is exiting or
157
- * erroring and returns output formatted output buffers and strings
158
- */
159
- function cleanup() {
160
- exited = true;
161
- abortSignal.removeEventListener('abort', abortHandler);
162
- if (stdoutDecoder) {
163
- stdout += stripAnsi(stdoutDecoder.decode());
164
- }
165
- if (stderrDecoder) {
166
- stderr += stripAnsi(stderrDecoder.decode());
167
- }
168
- const finalBuffer = Buffer.concat(outputChunks);
169
- return { stdout, stderr, finalBuffer };
170
- }
171
- });
172
- return { pid: child.pid, result };
312
+ return { pid: ptyProcess.pid, result };
313
+ }
314
+ catch (e) {
315
+ const error = e;
316
+ return {
317
+ pid: undefined,
318
+ result: Promise.resolve({
319
+ error,
320
+ rawOutput: Buffer.from(''),
321
+ output: '',
322
+ exitCode: 1,
323
+ signal: null,
324
+ aborted: false,
325
+ pid: undefined,
326
+ executionMethod: 'none',
327
+ }),
328
+ };
329
+ }
173
330
  }
174
331
  }
175
332
  //# sourceMappingURL=shellExecutionService.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"shellExecutionService.js","sourceRoot":"","sources":["../../../src/services/shellExecutionService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shellExecutionService.js","sourceRoot":"","sources":["../../../src/services/shellExecutionService.ts"],"names":[],"mappings":"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"}