@qduc/term2 0.4.0 → 0.5.0

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 (533) hide show
  1. package/dist/agent.d.ts +5 -0
  2. package/dist/agent.d.ts.map +1 -1
  3. package/dist/agent.js +8 -1
  4. package/dist/agent.js.map +1 -1
  5. package/dist/agent.lite-mode.test.d.ts +2 -0
  6. package/dist/agent.lite-mode.test.d.ts.map +1 -0
  7. package/dist/agent.lite-mode.test.js +39 -0
  8. package/dist/agent.lite-mode.test.js.map +1 -0
  9. package/dist/app.d.ts.map +1 -1
  10. package/dist/app.js +9 -3
  11. package/dist/app.js.map +1 -1
  12. package/dist/components/ApprovalPrompt.d.ts.map +1 -1
  13. package/dist/components/ApprovalPrompt.js +3 -2
  14. package/dist/components/ApprovalPrompt.js.map +1 -1
  15. package/dist/components/ApprovalPrompt.test.d.ts +2 -0
  16. package/dist/components/ApprovalPrompt.test.d.ts.map +1 -0
  17. package/dist/components/ApprovalPrompt.test.js +23 -0
  18. package/dist/components/ApprovalPrompt.test.js.map +1 -0
  19. package/dist/components/ChatMessage.d.ts.map +1 -1
  20. package/dist/components/ChatMessage.js +2 -1
  21. package/dist/components/ChatMessage.js.map +1 -1
  22. package/dist/components/CommandMessage.d.ts.map +1 -1
  23. package/dist/components/CommandMessage.js +9 -8
  24. package/dist/components/CommandMessage.js.map +1 -1
  25. package/dist/components/LiveResponse.test.d.ts +2 -0
  26. package/dist/components/LiveResponse.test.d.ts.map +1 -0
  27. package/dist/components/LiveResponse.test.js +13 -0
  28. package/dist/components/LiveResponse.test.js.map +1 -0
  29. package/dist/components/MarkdownRenderer.d.ts.map +1 -1
  30. package/dist/components/MarkdownRenderer.js +13 -6
  31. package/dist/components/MarkdownRenderer.js.map +1 -1
  32. package/dist/components/MessageList.d.ts.map +1 -1
  33. package/dist/components/MessageList.js +59 -7
  34. package/dist/components/MessageList.js.map +1 -1
  35. package/dist/components/MessageList.test.js +112 -0
  36. package/dist/components/MessageList.test.js.map +1 -1
  37. package/dist/components/ModelSelectionMenu.error-tabs.test.d.ts +2 -0
  38. package/dist/components/ModelSelectionMenu.error-tabs.test.d.ts.map +1 -0
  39. package/dist/components/ModelSelectionMenu.error-tabs.test.js +18 -0
  40. package/dist/components/ModelSelectionMenu.error-tabs.test.js.map +1 -0
  41. package/dist/components/StatusBar.d.ts.map +1 -1
  42. package/dist/components/StatusBar.js +3 -3
  43. package/dist/components/StatusBar.js.map +1 -1
  44. package/dist/components/SubagentActivityMessage.d.ts +12 -0
  45. package/dist/components/SubagentActivityMessage.d.ts.map +1 -0
  46. package/dist/components/SubagentActivityMessage.js +15 -0
  47. package/dist/components/SubagentActivityMessage.js.map +1 -0
  48. package/dist/components/TextInput.d.ts +42 -0
  49. package/dist/components/TextInput.d.ts.map +1 -0
  50. package/dist/components/TextInput.js +398 -0
  51. package/dist/components/TextInput.js.map +1 -0
  52. package/dist/components/TextInput.test.d.ts +2 -0
  53. package/dist/components/TextInput.test.d.ts.map +1 -0
  54. package/dist/components/TextInput.test.js +75 -0
  55. package/dist/components/TextInput.test.js.map +1 -0
  56. package/dist/components/theme.d.ts +8 -0
  57. package/dist/components/theme.d.ts.map +1 -0
  58. package/dist/components/theme.js +22 -0
  59. package/dist/components/theme.js.map +1 -0
  60. package/dist/debug_ask_mentor.d.ts +2 -0
  61. package/dist/debug_ask_mentor.d.ts.map +1 -0
  62. package/dist/debug_ask_mentor.js +73 -0
  63. package/dist/debug_ask_mentor.js.map +1 -0
  64. package/dist/hooks/use-app-commands.d.ts +6 -0
  65. package/dist/hooks/use-app-commands.d.ts.map +1 -1
  66. package/dist/hooks/use-app-commands.js +23 -20
  67. package/dist/hooks/use-app-commands.js.map +1 -1
  68. package/dist/hooks/use-app-commands.test.js +34 -1
  69. package/dist/hooks/use-app-commands.test.js.map +1 -1
  70. package/dist/hooks/use-conversation.d.ts +13 -2
  71. package/dist/hooks/use-conversation.d.ts.map +1 -1
  72. package/dist/hooks/use-conversation.js +36 -13
  73. package/dist/hooks/use-conversation.js.map +1 -1
  74. package/dist/lib/editor-impl.test.js +63 -50
  75. package/dist/lib/editor-impl.test.js.map +1 -1
  76. package/dist/lib/openai-agent-client.d.ts +7 -0
  77. package/dist/lib/openai-agent-client.d.ts.map +1 -1
  78. package/dist/lib/openai-agent-client.js +35 -131
  79. package/dist/lib/openai-agent-client.js.map +1 -1
  80. package/dist/lib/openai-agent-client.test.js +7 -0
  81. package/dist/lib/openai-agent-client.test.js.map +1 -1
  82. package/dist/lib/shell.d.ts +7 -0
  83. package/dist/lib/shell.d.ts.map +1 -0
  84. package/dist/lib/shell.js +56 -0
  85. package/dist/lib/shell.js.map +1 -0
  86. package/dist/modes/companion/command-index.d.ts +26 -0
  87. package/dist/modes/companion/command-index.d.ts.map +1 -0
  88. package/dist/modes/companion/command-index.js +50 -0
  89. package/dist/modes/companion/command-index.js.map +1 -0
  90. package/dist/modes/companion/command-index.test.d.ts +2 -0
  91. package/dist/modes/companion/command-index.test.d.ts.map +1 -0
  92. package/dist/modes/companion/command-index.test.js +86 -0
  93. package/dist/modes/companion/command-index.test.js.map +1 -0
  94. package/dist/modes/companion/companion-app.d.ts +12 -0
  95. package/dist/modes/companion/companion-app.d.ts.map +1 -0
  96. package/dist/modes/companion/companion-app.js +297 -0
  97. package/dist/modes/companion/companion-app.js.map +1 -0
  98. package/dist/modes/companion/companion-session.d.ts +63 -0
  99. package/dist/modes/companion/companion-session.d.ts.map +1 -0
  100. package/dist/modes/companion/companion-session.js +146 -0
  101. package/dist/modes/companion/companion-session.js.map +1 -0
  102. package/dist/modes/companion/companion-session.test.d.ts +2 -0
  103. package/dist/modes/companion/companion-session.test.d.ts.map +1 -0
  104. package/dist/modes/companion/companion-session.test.js +28 -0
  105. package/dist/modes/companion/companion-session.test.js.map +1 -0
  106. package/dist/modes/companion/components/status-bar.d.ts +13 -0
  107. package/dist/modes/companion/components/status-bar.d.ts.map +1 -0
  108. package/dist/modes/companion/components/status-bar.js +26 -0
  109. package/dist/modes/companion/components/status-bar.js.map +1 -0
  110. package/dist/modes/companion/context-buffer.d.ts +65 -0
  111. package/dist/modes/companion/context-buffer.d.ts.map +1 -0
  112. package/dist/modes/companion/context-buffer.js +156 -0
  113. package/dist/modes/companion/context-buffer.js.map +1 -0
  114. package/dist/modes/companion/context-buffer.test.d.ts +2 -0
  115. package/dist/modes/companion/context-buffer.test.d.ts.map +1 -0
  116. package/dist/modes/companion/context-buffer.test.js +154 -0
  117. package/dist/modes/companion/context-buffer.test.js.map +1 -0
  118. package/dist/modes/companion/event-detector.d.ts +46 -0
  119. package/dist/modes/companion/event-detector.d.ts.map +1 -0
  120. package/dist/modes/companion/event-detector.js +169 -0
  121. package/dist/modes/companion/event-detector.js.map +1 -0
  122. package/dist/modes/companion/event-detector.test.d.ts +2 -0
  123. package/dist/modes/companion/event-detector.test.d.ts.map +1 -0
  124. package/dist/modes/companion/event-detector.test.js +121 -0
  125. package/dist/modes/companion/event-detector.test.js.map +1 -0
  126. package/dist/modes/companion/index.d.ts +33 -0
  127. package/dist/modes/companion/index.d.ts.map +1 -0
  128. package/dist/modes/companion/index.js +21 -0
  129. package/dist/modes/companion/index.js.map +1 -0
  130. package/dist/modes/companion/input-key-mapper.d.ts +3 -0
  131. package/dist/modes/companion/input-key-mapper.d.ts.map +1 -0
  132. package/dist/modes/companion/input-key-mapper.js +31 -0
  133. package/dist/modes/companion/input-key-mapper.js.map +1 -0
  134. package/dist/modes/companion/input-key-mapper.test.d.ts +2 -0
  135. package/dist/modes/companion/input-key-mapper.test.d.ts.map +1 -0
  136. package/dist/modes/companion/input-key-mapper.test.js +26 -0
  137. package/dist/modes/companion/input-key-mapper.test.js.map +1 -0
  138. package/dist/modes/companion/input-parser.d.ts +53 -0
  139. package/dist/modes/companion/input-parser.d.ts.map +1 -0
  140. package/dist/modes/companion/input-parser.js +114 -0
  141. package/dist/modes/companion/input-parser.js.map +1 -0
  142. package/dist/modes/companion/input-parser.test.d.ts +2 -0
  143. package/dist/modes/companion/input-parser.test.d.ts.map +1 -0
  144. package/dist/modes/companion/input-parser.test.js +123 -0
  145. package/dist/modes/companion/input-parser.test.js.map +1 -0
  146. package/dist/modes/companion/mode-manager.d.ts +41 -0
  147. package/dist/modes/companion/mode-manager.d.ts.map +1 -0
  148. package/dist/modes/companion/mode-manager.js +56 -0
  149. package/dist/modes/companion/mode-manager.js.map +1 -0
  150. package/dist/modes/companion/mode-manager.test.d.ts +2 -0
  151. package/dist/modes/companion/mode-manager.test.d.ts.map +1 -0
  152. package/dist/modes/companion/mode-manager.test.js +65 -0
  153. package/dist/modes/companion/mode-manager.test.js.map +1 -0
  154. package/dist/modes/companion/output-classifier.d.ts +15 -0
  155. package/dist/modes/companion/output-classifier.d.ts.map +1 -0
  156. package/dist/modes/companion/output-classifier.js +77 -0
  157. package/dist/modes/companion/output-classifier.js.map +1 -0
  158. package/dist/modes/companion/output-classifier.test.d.ts +2 -0
  159. package/dist/modes/companion/output-classifier.test.d.ts.map +1 -0
  160. package/dist/modes/companion/output-classifier.test.js +133 -0
  161. package/dist/modes/companion/output-classifier.test.js.map +1 -0
  162. package/dist/modes/companion/pty-wrapper.d.ts +46 -0
  163. package/dist/modes/companion/pty-wrapper.d.ts.map +1 -0
  164. package/dist/modes/companion/pty-wrapper.js +143 -0
  165. package/dist/modes/companion/pty-wrapper.js.map +1 -0
  166. package/dist/modes/companion/safety-classifier.d.ts +31 -0
  167. package/dist/modes/companion/safety-classifier.d.ts.map +1 -0
  168. package/dist/modes/companion/safety-classifier.js +140 -0
  169. package/dist/modes/companion/safety-classifier.js.map +1 -0
  170. package/dist/modes/companion/safety-classifier.test.d.ts +2 -0
  171. package/dist/modes/companion/safety-classifier.test.d.ts.map +1 -0
  172. package/dist/modes/companion/safety-classifier.test.js +151 -0
  173. package/dist/modes/companion/safety-classifier.test.js.map +1 -0
  174. package/dist/modes/companion/summarizer.d.ts +24 -0
  175. package/dist/modes/companion/summarizer.d.ts.map +1 -0
  176. package/dist/modes/companion/summarizer.js +132 -0
  177. package/dist/modes/companion/summarizer.js.map +1 -0
  178. package/dist/modes/companion/terminal-history.d.ts +27 -0
  179. package/dist/modes/companion/terminal-history.d.ts.map +1 -0
  180. package/dist/modes/companion/terminal-history.js +142 -0
  181. package/dist/modes/companion/terminal-history.js.map +1 -0
  182. package/dist/prompts/gpt-5.md +4 -7
  183. package/dist/prompts/simple-mentor.md +215 -0
  184. package/dist/prompts/subagents/explorer.md +42 -0
  185. package/dist/prompts/subagents/mentor.md +16 -0
  186. package/dist/prompts/subagents/researcher.md +40 -0
  187. package/dist/prompts/subagents/worker.md +41 -0
  188. package/dist/providers/ai-sdk-openai-compatible.provider.d.ts +2 -0
  189. package/dist/providers/ai-sdk-openai-compatible.provider.d.ts.map +1 -1
  190. package/dist/providers/ai-sdk-openai-compatible.provider.js +8 -4
  191. package/dist/providers/ai-sdk-openai-compatible.provider.js.map +1 -1
  192. package/dist/providers/ai-sdk-openai-compatible.provider.test.js +119 -1
  193. package/dist/providers/ai-sdk-openai-compatible.provider.test.js.map +1 -1
  194. package/dist/providers/ai-sdk-openai.provider.d.ts +14 -0
  195. package/dist/providers/ai-sdk-openai.provider.d.ts.map +1 -0
  196. package/dist/providers/ai-sdk-openai.provider.js +18 -0
  197. package/dist/providers/ai-sdk-openai.provider.js.map +1 -0
  198. package/dist/providers/common/openai-compatible-messages.d.ts +1 -1
  199. package/dist/providers/common/openai-compatible-messages.d.ts.map +1 -1
  200. package/dist/providers/common/openai-compatible-messages.js +41 -16
  201. package/dist/providers/common/openai-compatible-messages.js.map +1 -1
  202. package/dist/providers/common/openai-compatible-messages.test.js +55 -14
  203. package/dist/providers/common/openai-compatible-messages.test.js.map +1 -1
  204. package/dist/providers/github-copilot/converters.d.ts +45 -0
  205. package/dist/providers/github-copilot/converters.d.ts.map +1 -0
  206. package/dist/providers/github-copilot/converters.js +118 -0
  207. package/dist/providers/github-copilot/converters.js.map +1 -0
  208. package/dist/providers/github-copilot/converters.test.d.ts +2 -0
  209. package/dist/providers/github-copilot/converters.test.d.ts.map +1 -0
  210. package/dist/providers/github-copilot/converters.test.js +162 -0
  211. package/dist/providers/github-copilot/converters.test.js.map +1 -0
  212. package/dist/providers/github-copilot/github-copilot.provider.d.ts +2 -0
  213. package/dist/providers/github-copilot/github-copilot.provider.d.ts.map +1 -0
  214. package/dist/providers/github-copilot/github-copilot.provider.js +75 -0
  215. package/dist/providers/github-copilot/github-copilot.provider.js.map +1 -0
  216. package/dist/providers/github-copilot/github-copilot.provider.test.d.ts +2 -0
  217. package/dist/providers/github-copilot/github-copilot.provider.test.d.ts.map +1 -0
  218. package/dist/providers/github-copilot/github-copilot.provider.test.js +26 -0
  219. package/dist/providers/github-copilot/github-copilot.provider.test.js.map +1 -0
  220. package/dist/providers/github-copilot/index.d.ts +4 -0
  221. package/dist/providers/github-copilot/index.d.ts.map +1 -0
  222. package/dist/providers/github-copilot/index.js +4 -0
  223. package/dist/providers/github-copilot/index.js.map +1 -0
  224. package/dist/providers/github-copilot/model.d.ts +24 -0
  225. package/dist/providers/github-copilot/model.d.ts.map +1 -0
  226. package/dist/providers/github-copilot/model.delta.test.d.ts +2 -0
  227. package/dist/providers/github-copilot/model.delta.test.d.ts.map +1 -0
  228. package/dist/providers/github-copilot/model.delta.test.js +15 -0
  229. package/dist/providers/github-copilot/model.delta.test.js.map +1 -0
  230. package/dist/providers/github-copilot/model.js +498 -0
  231. package/dist/providers/github-copilot/model.js.map +1 -0
  232. package/dist/providers/github-copilot/model.test.d.ts +2 -0
  233. package/dist/providers/github-copilot/model.test.d.ts.map +1 -0
  234. package/dist/providers/github-copilot/model.test.js +63 -0
  235. package/dist/providers/github-copilot/model.test.js.map +1 -0
  236. package/dist/providers/github-copilot/provider.d.ts +15 -0
  237. package/dist/providers/github-copilot/provider.d.ts.map +1 -0
  238. package/dist/providers/github-copilot/provider.js +25 -0
  239. package/dist/providers/github-copilot/provider.js.map +1 -0
  240. package/dist/providers/github-copilot/provider.test.d.ts +2 -0
  241. package/dist/providers/github-copilot/provider.test.d.ts.map +1 -0
  242. package/dist/providers/github-copilot/provider.test.js +52 -0
  243. package/dist/providers/github-copilot/provider.test.js.map +1 -0
  244. package/dist/providers/github-copilot/utils.d.ts +20 -0
  245. package/dist/providers/github-copilot/utils.d.ts.map +1 -0
  246. package/dist/providers/github-copilot/utils.js +142 -0
  247. package/dist/providers/github-copilot/utils.js.map +1 -0
  248. package/dist/providers/github-copilot/utils.test.d.ts +2 -0
  249. package/dist/providers/github-copilot/utils.test.d.ts.map +1 -0
  250. package/dist/providers/github-copilot/utils.test.js +21 -0
  251. package/dist/providers/github-copilot/utils.test.js.map +1 -0
  252. package/dist/providers/openai-compatible/api.d.ts +17 -0
  253. package/dist/providers/openai-compatible/api.d.ts.map +1 -0
  254. package/dist/providers/openai-compatible/api.js +58 -0
  255. package/dist/providers/openai-compatible/api.js.map +1 -0
  256. package/dist/providers/openai-compatible/model.d.ts +17 -0
  257. package/dist/providers/openai-compatible/model.d.ts.map +1 -0
  258. package/dist/providers/openai-compatible/model.js +473 -0
  259. package/dist/providers/openai-compatible/model.js.map +1 -0
  260. package/dist/providers/openai-compatible/provider.d.ts +22 -0
  261. package/dist/providers/openai-compatible/provider.d.ts.map +1 -0
  262. package/dist/providers/openai-compatible/provider.js +43 -0
  263. package/dist/providers/openai-compatible/provider.js.map +1 -0
  264. package/dist/providers/openai-compatible/reasoning-content.test.d.ts +2 -0
  265. package/dist/providers/openai-compatible/reasoning-content.test.d.ts.map +1 -0
  266. package/dist/providers/openai-compatible/reasoning-content.test.js +258 -0
  267. package/dist/providers/openai-compatible/reasoning-content.test.js.map +1 -0
  268. package/dist/providers/openai-compatible/utils.d.ts +3 -0
  269. package/dist/providers/openai-compatible/utils.d.ts.map +1 -0
  270. package/dist/providers/openai-compatible/utils.js +11 -0
  271. package/dist/providers/openai-compatible/utils.js.map +1 -0
  272. package/dist/providers/openai-compatible-behavior-gate.test.js +42 -1
  273. package/dist/providers/openai-compatible-behavior-gate.test.js.map +1 -1
  274. package/dist/providers/openai-compatible.provider.js +2 -2
  275. package/dist/providers/openai-compatible.provider.js.map +1 -1
  276. package/dist/providers/openai-compatible.provider.test.js +1 -1
  277. package/dist/providers/openai-compatible.provider.test.js.map +1 -1
  278. package/dist/providers/openrouter/api.d.ts +39 -0
  279. package/dist/providers/openrouter/api.d.ts.map +1 -0
  280. package/dist/providers/openrouter/api.js +164 -0
  281. package/dist/providers/openrouter/api.js.map +1 -0
  282. package/dist/providers/openrouter/converters.d.ts +8 -0
  283. package/dist/providers/openrouter/converters.d.ts.map +1 -0
  284. package/dist/providers/openrouter/converters.js +391 -0
  285. package/dist/providers/openrouter/converters.js.map +1 -0
  286. package/dist/providers/openrouter/converters.test.d.ts +2 -0
  287. package/dist/providers/openrouter/converters.test.d.ts.map +1 -0
  288. package/dist/providers/openrouter/converters.test.js +179 -0
  289. package/dist/providers/openrouter/converters.test.js.map +1 -0
  290. package/dist/providers/openrouter/index.d.ts +4 -0
  291. package/dist/providers/openrouter/index.d.ts.map +1 -0
  292. package/dist/providers/openrouter/index.js +4 -0
  293. package/dist/providers/openrouter/index.js.map +1 -0
  294. package/dist/providers/openrouter/model.d.ts +14 -0
  295. package/dist/providers/openrouter/model.d.ts.map +1 -0
  296. package/dist/providers/openrouter/model.js +457 -0
  297. package/dist/providers/openrouter/model.js.map +1 -0
  298. package/dist/providers/openrouter/provider.d.ts +15 -0
  299. package/dist/providers/openrouter/provider.d.ts.map +1 -0
  300. package/dist/providers/openrouter/provider.js +21 -0
  301. package/dist/providers/openrouter/provider.js.map +1 -0
  302. package/dist/providers/openrouter/reasoning-content.test.d.ts +2 -0
  303. package/dist/providers/openrouter/reasoning-content.test.d.ts.map +1 -0
  304. package/dist/providers/openrouter/reasoning-content.test.js +122 -0
  305. package/dist/providers/openrouter/reasoning-content.test.js.map +1 -0
  306. package/dist/providers/openrouter/utils.d.ts +11 -0
  307. package/dist/providers/openrouter/utils.d.ts.map +1 -0
  308. package/dist/providers/openrouter/utils.js +29 -0
  309. package/dist/providers/openrouter/utils.js.map +1 -0
  310. package/dist/providers/openrouter.api.retry.test.d.ts +2 -0
  311. package/dist/providers/openrouter.api.retry.test.d.ts.map +1 -0
  312. package/dist/providers/openrouter.api.retry.test.js +148 -0
  313. package/dist/providers/openrouter.api.retry.test.js.map +1 -0
  314. package/dist/providers/openrouter.provider.js +1 -1
  315. package/dist/providers/openrouter.provider.js.map +1 -1
  316. package/dist/providers/openrouter.test.d.ts +2 -0
  317. package/dist/providers/openrouter.test.d.ts.map +1 -0
  318. package/dist/providers/openrouter.test.js +1449 -0
  319. package/dist/providers/openrouter.test.js.map +1 -0
  320. package/dist/safety-checker.js +57 -0
  321. package/dist/services/approval-rejection-interceptor.test.js +5 -0
  322. package/dist/services/approval-rejection-interceptor.test.js.map +1 -1
  323. package/dist/services/check_mock.d.ts +2 -0
  324. package/dist/services/check_mock.d.ts.map +1 -0
  325. package/dist/services/check_mock.js +22 -0
  326. package/dist/services/check_mock.js.map +1 -0
  327. package/dist/services/conversation-events.d.ts +25 -1
  328. package/dist/services/conversation-events.d.ts.map +1 -1
  329. package/dist/services/conversation-service.test.d.ts +2 -0
  330. package/dist/services/conversation-service.test.d.ts.map +1 -0
  331. package/dist/services/conversation-service.test.js +156 -0
  332. package/dist/services/conversation-service.test.js.map +1 -0
  333. package/dist/services/conversation-session.auto-approval.test.js +52 -0
  334. package/dist/services/conversation-session.auto-approval.test.js.map +1 -1
  335. package/dist/services/conversation-session.d.ts.map +1 -1
  336. package/dist/services/conversation-session.js +64 -30
  337. package/dist/services/conversation-session.js.map +1 -1
  338. package/dist/services/interruption-info.js +1 -1
  339. package/dist/services/interruption-info.js.map +1 -1
  340. package/dist/services/interruption-info.test.js +12 -0
  341. package/dist/services/interruption-info.test.js.map +1 -1
  342. package/dist/services/rtk-service.d.ts.map +1 -1
  343. package/dist/services/rtk-service.js +104 -9
  344. package/dist/services/rtk-service.js.map +1 -1
  345. package/dist/services/rtk-service.test.js +55 -20
  346. package/dist/services/rtk-service.test.js.map +1 -1
  347. package/dist/services/stream-event-processor.d.ts.map +1 -1
  348. package/dist/services/stream-event-processor.js +19 -8
  349. package/dist/services/stream-event-processor.js.map +1 -1
  350. package/dist/services/subagents/subagent-manager.d.ts +16 -0
  351. package/dist/services/subagents/subagent-manager.d.ts.map +1 -0
  352. package/dist/services/subagents/subagent-manager.js +530 -0
  353. package/dist/services/subagents/subagent-manager.js.map +1 -0
  354. package/dist/services/subagents/subagent-manager.test.d.ts +2 -0
  355. package/dist/services/subagents/subagent-manager.test.d.ts.map +1 -0
  356. package/dist/services/subagents/subagent-manager.test.js +690 -0
  357. package/dist/services/subagents/subagent-manager.test.js.map +1 -0
  358. package/dist/services/subagents/subagent-session.d.ts +26 -0
  359. package/dist/services/subagents/subagent-session.d.ts.map +1 -0
  360. package/dist/services/subagents/subagent-session.js +86 -0
  361. package/dist/services/subagents/subagent-session.js.map +1 -0
  362. package/dist/services/subagents/subagent-session.test.d.ts +2 -0
  363. package/dist/services/subagents/subagent-session.test.d.ts.map +1 -0
  364. package/dist/services/subagents/subagent-session.test.js +118 -0
  365. package/dist/services/subagents/subagent-session.test.js.map +1 -0
  366. package/dist/services/subagents/types.d.ts +35 -0
  367. package/dist/services/subagents/types.d.ts.map +1 -0
  368. package/dist/services/subagents/types.js +2 -0
  369. package/dist/services/subagents/types.js.map +1 -0
  370. package/dist/services/terminal-result-collector.d.ts.map +1 -1
  371. package/dist/services/terminal-result-collector.js +30 -3
  372. package/dist/services/terminal-result-collector.js.map +1 -1
  373. package/dist/services/terminal-result-collector.test.js +81 -0
  374. package/dist/services/terminal-result-collector.test.js.map +1 -1
  375. package/dist/tools/apply-patch.d.ts +2 -2
  376. package/dist/tools/apply-patch.d.ts.map +1 -1
  377. package/dist/tools/apply-patch.js.map +1 -1
  378. package/dist/tools/ask-mentor.d.ts +2 -2
  379. package/dist/tools/ask-mentor.d.ts.map +1 -1
  380. package/dist/tools/ask-mentor.js.map +1 -1
  381. package/dist/tools/bash.d.ts +10 -0
  382. package/dist/tools/bash.d.ts.map +1 -0
  383. package/dist/tools/bash.js +55 -0
  384. package/dist/tools/bash.js.map +1 -0
  385. package/dist/tools/code-context.d.ts +3 -3
  386. package/dist/tools/code-context.d.ts.map +1 -1
  387. package/dist/tools/code-context.js.map +1 -1
  388. package/dist/tools/code-context.test.js +1 -2
  389. package/dist/tools/code-context.test.js.map +1 -1
  390. package/dist/tools/command-message-formatters.d.ts +5 -0
  391. package/dist/tools/command-message-formatters.d.ts.map +1 -0
  392. package/dist/tools/command-message-formatters.js +13 -0
  393. package/dist/tools/command-message-formatters.js.map +1 -0
  394. package/dist/tools/command-message-formatters.test.d.ts +2 -0
  395. package/dist/tools/command-message-formatters.test.d.ts.map +1 -0
  396. package/dist/tools/command-message-formatters.test.js +23 -0
  397. package/dist/tools/command-message-formatters.test.js.map +1 -0
  398. package/dist/tools/create-file.d.ts +2 -2
  399. package/dist/tools/create-file.d.ts.map +1 -1
  400. package/dist/tools/create-file.js +15 -9
  401. package/dist/tools/create-file.js.map +1 -1
  402. package/dist/tools/create-file.test.js +11 -0
  403. package/dist/tools/create-file.test.js.map +1 -1
  404. package/dist/tools/file-locks.d.ts +1 -0
  405. package/dist/tools/file-locks.d.ts.map +1 -1
  406. package/dist/tools/file-locks.js +16 -0
  407. package/dist/tools/file-locks.js.map +1 -1
  408. package/dist/tools/find-files.d.ts +2 -2
  409. package/dist/tools/find-files.d.ts.map +1 -1
  410. package/dist/tools/find-files.js.map +1 -1
  411. package/dist/tools/find-files.test.js +1 -2
  412. package/dist/tools/find-files.test.js.map +1 -1
  413. package/dist/tools/grep.d.ts +2 -2
  414. package/dist/tools/grep.d.ts.map +1 -1
  415. package/dist/tools/grep.js.map +1 -1
  416. package/dist/tools/grep.test.d.ts +2 -0
  417. package/dist/tools/grep.test.d.ts.map +1 -0
  418. package/dist/tools/read-file.d.ts +2 -2
  419. package/dist/tools/read-file.d.ts.map +1 -1
  420. package/dist/tools/read-file.js.map +1 -1
  421. package/dist/tools/read-file.test.js +2 -3
  422. package/dist/tools/read-file.test.js.map +1 -1
  423. package/dist/tools/run-subagent.d.ts +14 -0
  424. package/dist/tools/run-subagent.d.ts.map +1 -0
  425. package/dist/tools/run-subagent.js +196 -0
  426. package/dist/tools/run-subagent.js.map +1 -0
  427. package/dist/tools/run-subagent.test.d.ts +2 -0
  428. package/dist/tools/run-subagent.test.d.ts.map +1 -0
  429. package/dist/tools/run-subagent.test.js +159 -0
  430. package/dist/tools/run-subagent.test.js.map +1 -0
  431. package/dist/tools/search-replace.d.ts +2 -2
  432. package/dist/tools/search-replace.d.ts.map +1 -1
  433. package/dist/tools/search-replace.js +49 -6
  434. package/dist/tools/search-replace.js.map +1 -1
  435. package/dist/tools/search-replace.test.js +78 -0
  436. package/dist/tools/search-replace.test.js.map +1 -1
  437. package/dist/tools/search.d.ts.map +1 -1
  438. package/dist/tools/search.js.map +1 -1
  439. package/dist/tools/shell.d.ts +2 -2
  440. package/dist/tools/shell.d.ts.map +1 -1
  441. package/dist/tools/shell.js.map +1 -1
  442. package/dist/tools/shell.test.js +137 -11
  443. package/dist/tools/shell.test.js.map +1 -1
  444. package/dist/tools/types.d.ts +2 -1
  445. package/dist/tools/types.d.ts.map +1 -1
  446. package/dist/tools/utils.d.ts.map +1 -1
  447. package/dist/tools/utils.js +11 -1
  448. package/dist/tools/utils.js.map +1 -1
  449. package/dist/tools/utils.test.js +13 -0
  450. package/dist/tools/utils.test.js.map +1 -1
  451. package/dist/tools/web-fetch.d.ts +2 -2
  452. package/dist/tools/web-fetch.d.ts.map +1 -1
  453. package/dist/tools/web-fetch.js.map +1 -1
  454. package/dist/tools/web-search.d.ts +2 -2
  455. package/dist/tools/web-search.d.ts.map +1 -1
  456. package/dist/tools/web-search.js.map +1 -1
  457. package/dist/utils/clipboard.d.ts +2 -2
  458. package/dist/utils/clipboard.d.ts.map +1 -1
  459. package/dist/utils/clipboard.js +58 -22
  460. package/dist/utils/clipboard.js.map +1 -1
  461. package/dist/utils/clipboard.test.js +25 -6
  462. package/dist/utils/clipboard.test.js.map +1 -1
  463. package/dist/utils/command-safety/handlers/sed-handler.d.ts.map +1 -1
  464. package/dist/utils/command-safety/handlers/sed-handler.js +10 -7
  465. package/dist/utils/command-safety/handlers/sed-handler.js.map +1 -1
  466. package/dist/utils/command-safety/index.d.ts.map +1 -1
  467. package/dist/utils/command-safety/index.js +153 -117
  468. package/dist/utils/command-safety/index.js.map +1 -1
  469. package/dist/utils/command-safety/path-analysis.d.ts.map +1 -1
  470. package/dist/utils/command-safety/path-analysis.js +6 -2
  471. package/dist/utils/command-safety/path-analysis.js.map +1 -1
  472. package/dist/utils/command-safety/utils.js +2 -2
  473. package/dist/utils/command-safety/utils.js.map +1 -1
  474. package/dist/utils/command-safety.d.ts +21 -0
  475. package/dist/utils/command-safety.d.ts.map +1 -0
  476. package/dist/utils/command-safety.devnull.test.d.ts +2 -0
  477. package/dist/utils/command-safety.devnull.test.d.ts.map +1 -0
  478. package/dist/utils/command-safety.devnull.test.js +13 -0
  479. package/dist/utils/command-safety.devnull.test.js.map +1 -0
  480. package/dist/utils/command-safety.js +348 -0
  481. package/dist/utils/command-safety.js.map +1 -0
  482. package/dist/utils/command-safety.path.test.js +15 -1
  483. package/dist/utils/command-safety.path.test.js.map +1 -1
  484. package/dist/utils/conversation-event-handler.d.ts +15 -0
  485. package/dist/utils/conversation-event-handler.d.ts.map +1 -1
  486. package/dist/utils/conversation-event-handler.js +104 -8
  487. package/dist/utils/conversation-event-handler.js.map +1 -1
  488. package/dist/utils/conversation-event-handler.test.js +185 -2
  489. package/dist/utils/conversation-event-handler.test.js.map +1 -1
  490. package/dist/utils/conversation-utils.d.ts +1 -0
  491. package/dist/utils/conversation-utils.d.ts.map +1 -1
  492. package/dist/utils/conversation-utils.js +1 -0
  493. package/dist/utils/conversation-utils.js.map +1 -1
  494. package/dist/utils/extract-command-messages.d.ts.map +1 -1
  495. package/dist/utils/extract-command-messages.js +2 -21
  496. package/dist/utils/extract-command-messages.js.map +1 -1
  497. package/dist/utils/extract-command-messages.test.d.ts +2 -0
  498. package/dist/utils/extract-command-messages.test.d.ts.map +1 -0
  499. package/dist/utils/provider-traffic-extractor.repro.test.d.ts +2 -0
  500. package/dist/utils/provider-traffic-extractor.repro.test.d.ts.map +1 -0
  501. package/dist/utils/provider-traffic-extractor.repro.test.js.map +1 -0
  502. package/dist/utils/streaming-session-factory.d.ts.map +1 -1
  503. package/dist/utils/streaming-session-factory.js +16 -1
  504. package/dist/utils/streaming-session-factory.js.map +1 -1
  505. package/dist/utils/streaming-session-factory.test.js +42 -0
  506. package/dist/utils/streaming-session-factory.test.js.map +1 -1
  507. package/dist/utils/token-usage.d.ts +13 -0
  508. package/dist/utils/token-usage.d.ts.map +1 -1
  509. package/dist/utils/token-usage.js +92 -1
  510. package/dist/utils/token-usage.js.map +1 -1
  511. package/dist/utils/token-usage.test.js +62 -1
  512. package/dist/utils/token-usage.test.js.map +1 -1
  513. package/package.json +2 -2
  514. package/dist/providers/openai.provider.test.d.ts +0 -2
  515. package/dist/providers/openai.provider.test.d.ts.map +0 -1
  516. package/dist/providers/openai.provider.test.js +0 -22
  517. package/dist/providers/openai.provider.test.js.map +0 -1
  518. package/dist/utils/project-tree.d.ts +0 -14
  519. package/dist/utils/project-tree.d.ts.map +0 -1
  520. package/dist/utils/project-tree.js +0 -111
  521. package/dist/utils/project-tree.js.map +0 -1
  522. package/dist/utils/project-tree.test.d.ts +0 -2
  523. package/dist/utils/project-tree.test.d.ts.map +0 -1
  524. package/dist/utils/project-tree.test.js +0 -149
  525. package/dist/utils/project-tree.test.js.map +0 -1
  526. package/dist/utils/terminal-clear.d.ts +0 -7
  527. package/dist/utils/terminal-clear.d.ts.map +0 -1
  528. package/dist/utils/terminal-clear.js +0 -5
  529. package/dist/utils/terminal-clear.js.map +0 -1
  530. package/dist/utils/terminal-clear.test.d.ts +0 -2
  531. package/dist/utils/terminal-clear.test.d.ts.map +0 -1
  532. package/dist/utils/terminal-clear.test.js +0 -13
  533. package/dist/utils/terminal-clear.test.js.map +0 -1
@@ -0,0 +1 @@
1
+ {"version":3,"file":"subagent-manager.test.js","sourceRoot":"","sources":["../../../source/services/subagents/subagent-manager.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,26 @@
1
+ import type { Agent, Runner } from '@openai/agents';
2
+ /**
3
+ * General-purpose subagent session. Replaces the private MentorSession shape.
4
+ *
5
+ * For persistent sessions (e.g. mentor): reuse across calls, track store and previousResponseId.
6
+ * For one-shot runs (e.g. run_subagent): create a new session per call, discard after.
7
+ */
8
+ export declare class SubagentSession {
9
+ #private;
10
+ readonly id: string;
11
+ readonly role: string;
12
+ constructor(id: string, role: string);
13
+ get provider(): string | null;
14
+ get runner(): Runner | null;
15
+ get agent(): Agent | null;
16
+ get previousResponseId(): string | null;
17
+ reset(): void;
18
+ switchProvider(provider: string): void;
19
+ ensureRunner(provider: string, createRunner: (providerId: string) => Runner | null): Runner | null;
20
+ ensureAgent(createAgent: () => Agent): Agent;
21
+ addUserMessage(message: string): void;
22
+ getInput(task: string, supportsConversationChaining: boolean): any;
23
+ getRunOptions(supportsConversationChaining: boolean, maxTurns: number): Record<string, any>;
24
+ updateFromResult(result: any): void;
25
+ }
26
+ //# sourceMappingURL=subagent-session.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"subagent-session.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAGpD;;;;;GAKG;AACH,qBAAa,eAAe;;IAC1B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAOV,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAKpC,IAAI,QAAQ,IAAI,MAAM,GAAG,IAAI,CAE5B;IAED,IAAI,MAAM,IAAI,MAAM,GAAG,IAAI,CAE1B;IAED,IAAI,KAAK,IAAI,KAAK,GAAG,IAAI,CAExB;IAED,IAAI,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAEtC;IAED,KAAK,IAAI,IAAI;IAWb,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAUtC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI;IAOlG,WAAW,CAAC,WAAW,EAAE,MAAM,KAAK,GAAG,KAAK;IAQ5C,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIrC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,4BAA4B,EAAE,OAAO,GAAG,GAAG;IAIlE,aAAa,CAAC,4BAA4B,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAU3F,gBAAgB,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI;CAMpC"}
@@ -0,0 +1,86 @@
1
+ import { ConversationStore } from '../conversation-store.js';
2
+ /**
3
+ * General-purpose subagent session. Replaces the private MentorSession shape.
4
+ *
5
+ * For persistent sessions (e.g. mentor): reuse across calls, track store and previousResponseId.
6
+ * For one-shot runs (e.g. run_subagent): create a new session per call, discard after.
7
+ */
8
+ export class SubagentSession {
9
+ id;
10
+ role;
11
+ #provider = null;
12
+ #runner = null;
13
+ #agent = null;
14
+ #store = null;
15
+ #previousResponseId = null;
16
+ constructor(id, role) {
17
+ this.id = id;
18
+ this.role = role;
19
+ }
20
+ get provider() {
21
+ return this.#provider;
22
+ }
23
+ get runner() {
24
+ return this.#runner;
25
+ }
26
+ get agent() {
27
+ return this.#agent;
28
+ }
29
+ get previousResponseId() {
30
+ return this.#previousResponseId;
31
+ }
32
+ reset() {
33
+ if (this.#store) {
34
+ this.#store.clear();
35
+ }
36
+ this.#previousResponseId = null;
37
+ this.#store = null;
38
+ this.#runner = null;
39
+ this.#provider = null;
40
+ this.#agent = null;
41
+ }
42
+ switchProvider(provider) {
43
+ if (this.#provider !== provider) {
44
+ this.#agent = null;
45
+ this.#store = null;
46
+ this.#previousResponseId = null;
47
+ this.#runner = null;
48
+ this.#provider = provider;
49
+ }
50
+ }
51
+ ensureRunner(provider, createRunner) {
52
+ if (!this.#runner && provider !== 'openai') {
53
+ this.#runner = createRunner(provider);
54
+ }
55
+ return this.#runner;
56
+ }
57
+ ensureAgent(createAgent) {
58
+ if (!this.#agent) {
59
+ this.#agent = createAgent();
60
+ this.#store = new ConversationStore();
61
+ }
62
+ return this.#agent;
63
+ }
64
+ addUserMessage(message) {
65
+ this.#store.addUserMessage(message);
66
+ }
67
+ getInput(task, supportsConversationChaining) {
68
+ return supportsConversationChaining ? task : this.#store.getHistory();
69
+ }
70
+ getRunOptions(supportsConversationChaining, maxTurns) {
71
+ return {
72
+ stream: false,
73
+ maxTurns,
74
+ ...(supportsConversationChaining && this.#previousResponseId
75
+ ? { previousResponseId: this.#previousResponseId }
76
+ : {}),
77
+ };
78
+ }
79
+ updateFromResult(result) {
80
+ this.#store.updateFromResult(result);
81
+ if (result.responseId) {
82
+ this.#previousResponseId = result.responseId;
83
+ }
84
+ }
85
+ }
86
+ //# sourceMappingURL=subagent-session.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"subagent-session.js","sourceRoot":"","sources":["../../../source/services/subagents/subagent-session.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=subagent-session.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"subagent-session.test.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-session.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,118 @@
1
+ import test from 'ava';
2
+ import { SubagentSession } from './subagent-session.js';
3
+ test('SubagentSession initializes with id and role', (t) => {
4
+ const session = new SubagentSession('test-id', 'mentor');
5
+ t.is(session.id, 'test-id');
6
+ t.is(session.role, 'mentor');
7
+ });
8
+ test('SubagentSession provider starts null', (t) => {
9
+ const session = new SubagentSession('id', 'explorer');
10
+ t.is(session.provider, null);
11
+ t.is(session.runner, null);
12
+ t.is(session.agent, null);
13
+ t.is(session.previousResponseId, null);
14
+ });
15
+ test('SubagentSession switchProvider resets state on provider change', (t) => {
16
+ const session = new SubagentSession('id', 'mentor');
17
+ const fakeAgent = { name: 'Mentor' };
18
+ let agentCreated = false;
19
+ session.switchProvider('openai');
20
+ session.ensureAgent(() => {
21
+ agentCreated = true;
22
+ return fakeAgent;
23
+ });
24
+ t.true(agentCreated);
25
+ t.is(session.agent, fakeAgent);
26
+ // Switching to the same provider does NOT reset
27
+ session.switchProvider('openai');
28
+ t.is(session.agent, fakeAgent);
29
+ // Switching to a different provider resets
30
+ session.switchProvider('openrouter');
31
+ t.is(session.agent, null);
32
+ });
33
+ test('SubagentSession ensureAgent is idempotent', (t) => {
34
+ const session = new SubagentSession('id', 'mentor');
35
+ const fakeAgent = { name: 'Mentor' };
36
+ let callCount = 0;
37
+ session.switchProvider('openai');
38
+ session.ensureAgent(() => {
39
+ callCount++;
40
+ return fakeAgent;
41
+ });
42
+ session.ensureAgent(() => {
43
+ callCount++;
44
+ return { name: 'Second' };
45
+ });
46
+ t.is(callCount, 1);
47
+ t.is(session.agent, fakeAgent);
48
+ });
49
+ test('SubagentSession ensureRunner skips runner for openai', (t) => {
50
+ const session = new SubagentSession('id', 'mentor');
51
+ let factoryCalled = false;
52
+ const runner = session.ensureRunner('openai', () => {
53
+ factoryCalled = true;
54
+ return {};
55
+ });
56
+ t.false(factoryCalled);
57
+ t.is(runner, null);
58
+ });
59
+ test('SubagentSession ensureRunner creates runner for non-openai provider', (t) => {
60
+ const session = new SubagentSession('id', 'mentor');
61
+ const fakeRunner = { run: () => { } };
62
+ const runner = session.ensureRunner('openrouter', () => fakeRunner);
63
+ t.is(runner, fakeRunner);
64
+ });
65
+ test('SubagentSession reset clears all state', (t) => {
66
+ const session = new SubagentSession('id', 'mentor');
67
+ const fakeAgent = { name: 'Mentor' };
68
+ session.switchProvider('openai');
69
+ session.ensureAgent(() => fakeAgent);
70
+ t.is(session.agent, fakeAgent);
71
+ session.reset();
72
+ t.is(session.provider, null);
73
+ t.is(session.agent, null);
74
+ t.is(session.runner, null);
75
+ t.is(session.previousResponseId, null);
76
+ });
77
+ test('SubagentSession getRunOptions includes maxTurns', (t) => {
78
+ const session = new SubagentSession('id', 'mentor');
79
+ const opts = session.getRunOptions(false, 5);
80
+ t.is(opts.maxTurns, 5);
81
+ t.is(opts.stream, false);
82
+ t.is('previousResponseId' in opts, false);
83
+ });
84
+ test('SubagentSession getRunOptions omits previousResponseId when chaining is unsupported', (t) => {
85
+ const session = new SubagentSession('id', 'mentor');
86
+ session.switchProvider('openai');
87
+ session.ensureAgent(() => ({ name: 'Mentor' }));
88
+ session.addUserMessage('hello');
89
+ session.updateFromResult({ responseId: 'resp-1', history: [] });
90
+ const opts = session.getRunOptions(false, 1);
91
+ t.false('previousResponseId' in opts);
92
+ });
93
+ test('SubagentSession updateFromResult tracks previousResponseId', (t) => {
94
+ const session = new SubagentSession('id', 'mentor');
95
+ session.switchProvider('openai');
96
+ session.ensureAgent(() => ({ name: 'Mentor' }));
97
+ session.addUserMessage('hello');
98
+ session.updateFromResult({ responseId: 'resp-abc', history: [] });
99
+ t.is(session.previousResponseId, 'resp-abc');
100
+ });
101
+ test('SubagentSession getInput returns task string when chaining is supported', (t) => {
102
+ const session = new SubagentSession('id', 'mentor');
103
+ session.switchProvider('openai');
104
+ session.ensureAgent(() => ({ name: 'Mentor' }));
105
+ session.addUserMessage('test question');
106
+ const input = session.getInput('test question', true);
107
+ t.is(input, 'test question');
108
+ });
109
+ test('SubagentSession getInput returns history array when chaining is unsupported', (t) => {
110
+ const session = new SubagentSession('id', 'mentor');
111
+ session.switchProvider('openrouter');
112
+ session.ensureAgent(() => ({ name: 'Mentor' }));
113
+ session.addUserMessage('test question');
114
+ const input = session.getInput('test question', false);
115
+ t.true(Array.isArray(input));
116
+ t.is(input.length, 1);
117
+ });
118
+ //# sourceMappingURL=subagent-session.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"subagent-session.test.js","sourceRoot":"","sources":["../../../source/services/subagents/subagent-session.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,35 @@
1
+ import type { NormalizedUsage } from '../../utils/token-usage.js';
2
+ export type SubagentRole = 'explorer' | 'worker' | 'researcher' | 'mentor' | string;
3
+ export interface SubagentRequest {
4
+ role: SubagentRole;
5
+ task: string;
6
+ writeBoundary?: string[];
7
+ }
8
+ export interface SubagentDefinition {
9
+ role: SubagentRole;
10
+ name: string;
11
+ instructions: string;
12
+ canRead: boolean;
13
+ canWrite: boolean;
14
+ canSearchWeb: boolean;
15
+ canRunShell: boolean;
16
+ maxTurns: number;
17
+ model: string;
18
+ provider: string;
19
+ reasoningEffort: string;
20
+ description?: string;
21
+ }
22
+ export interface SubagentResult {
23
+ agentId: string;
24
+ role: string;
25
+ status: 'completed' | 'failed' | 'cancelled';
26
+ finalText: string;
27
+ filesChanged: string[];
28
+ toolsUsed: Array<{
29
+ toolName: string;
30
+ count: number;
31
+ }>;
32
+ usage?: NormalizedUsage;
33
+ error?: string;
34
+ }
35
+ //# sourceMappingURL=types.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG,QAAQ,GAAG,YAAY,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEpF,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,WAAW,CAAC;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,KAAK,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;IACH,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../source/services/subagents/types.ts"],"names":[],"mappings":""}
@@ -1 +1 @@
1
- {"version":3,"file":"terminal-result-collector.d.ts","sourceRoot":"","sources":["../../source/services/terminal-result-collector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGxD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,CAAC,iBAAiB,CAAC,EACxC,EACE,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,EACP,kBAAkB,EAClB,YAAY,GACb,GAAE;IACD,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IACrD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CAC/C,GACL,OAAO,CAAC,kBAAkB,CAAC,CAkE7B"}
1
+ {"version":3,"file":"terminal-result-collector.d.ts","sourceRoot":"","sources":["../../source/services/terminal-result-collector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACtF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKxD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,CAAC,iBAAiB,CAAC,EACxC,EACE,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,EACP,kBAAkB,EAClB,YAAY,GACb,GAAE;IACD,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxD,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;IACrD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CAC/C,GACL,OAAO,CAAC,kBAAkB,CAAC,CA8F7B"}
@@ -1,8 +1,23 @@
1
+ const isEmptyUsage = (usage) => !usage || Object.keys(usage).length === 0;
1
2
  export async function collectTerminalResult(events, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, getRawInterruption, onFinalEvent, } = {}) {
2
3
  let finalText = '';
3
4
  let reasoningText = '';
4
5
  const commandMessages = [];
5
- let usage;
6
+ // Token usage is sourced from a single authoritative value: the Agents SDK
7
+ // run-state accumulator, which is already cumulative for the entire run
8
+ // (every model turn, including turns resumed after an approval - the
9
+ // continuation reuses the same live RunState so its accumulator already
10
+ // includes the pre-approval turns). It arrives on `final` /
11
+ // `approval_required` events. We therefore do NOT re-sum per-turn
12
+ // `usage_update` snapshots here; doing so double-counted on long,
13
+ // multi-turn tasks. `usage_update` is tracked only as a live/fallback
14
+ // value for display when a terminal usage figure is unavailable.
15
+ let runUsage;
16
+ let latestStreamedUsage;
17
+ const resolvedUsage = () => {
18
+ const usage = !isEmptyUsage(runUsage) ? runUsage : latestStreamedUsage;
19
+ return isEmptyUsage(usage) ? undefined : usage;
20
+ };
6
21
  for await (const event of events) {
7
22
  onEvent?.(event);
8
23
  switch (event.type) {
@@ -21,6 +36,7 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
21
36
  break;
22
37
  }
23
38
  case 'approval_required': {
39
+ const usage = event.usage ?? resolvedUsage();
24
40
  return {
25
41
  type: 'approval_required',
26
42
  approval: {
@@ -31,14 +47,24 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
31
47
  callId: event.approval.callId,
32
48
  llmAdvisory: event.approval.llmAdvisory,
33
49
  },
34
- ...(event.usage ? { usage: event.usage } : usage ? { usage } : {}),
50
+ ...(usage ? { usage } : {}),
35
51
  };
36
52
  }
53
+ case 'usage_update': {
54
+ latestStreamedUsage = event.usage;
55
+ break;
56
+ }
37
57
  case 'final': {
38
58
  onFinalEvent?.(event);
39
59
  finalText = event.finalText;
40
60
  reasoningText = event.reasoningText ?? '';
41
- usage = event.usage;
61
+ if (event.usage) {
62
+ // Each `final` carries the run-cumulative usage as of that point.
63
+ // A later `final` (e.g. after an auto-approved continuation)
64
+ // supersedes an earlier one because the SDK accumulator keeps
65
+ // growing on the same run state.
66
+ runUsage = event.usage;
67
+ }
42
68
  if (event.commandMessages?.length) {
43
69
  for (const msg of event.commandMessages) {
44
70
  commandMessages.push(msg);
@@ -54,6 +80,7 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
54
80
  break;
55
81
  }
56
82
  }
83
+ const usage = resolvedUsage();
57
84
  return {
58
85
  type: 'response',
59
86
  commandMessages,
@@ -1 +1 @@
1
- {"version":3,"file":"terminal-result-collector.js","sourceRoot":"","sources":["../../source/services/terminal-result-collector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"terminal-result-collector.js","sourceRoot":"","sources":["../../source/services/terminal-result-collector.ts"],"names":[],"mappings":"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"}
@@ -54,6 +54,87 @@ test('collectTerminalResult preserves usage on approval_required', async (t) =>
54
54
  t.deepEqual(result.usage, { prompt_tokens: 120, completion_tokens: 12, total_tokens: 132 });
55
55
  }
56
56
  });
57
+ test('collectTerminalResult carries usage_update usage into approval_required result', async (t) => {
58
+ const result = await collectTerminalResult(asAsyncIterable([
59
+ {
60
+ type: 'usage_update',
61
+ usage: { prompt_tokens: 100, completion_tokens: 10, total_tokens: 110 },
62
+ },
63
+ {
64
+ type: 'approval_required',
65
+ approval: {
66
+ agentName: 'CLI Agent',
67
+ toolName: 'shell',
68
+ argumentsText: 'ls source',
69
+ },
70
+ },
71
+ ]));
72
+ t.is(result.type, 'approval_required');
73
+ if (result.type === 'approval_required') {
74
+ t.deepEqual(result.usage, { prompt_tokens: 100, completion_tokens: 10, total_tokens: 110 });
75
+ }
76
+ });
77
+ test('collectTerminalResult trusts the final run-cumulative usage and does not re-sum per-turn snapshots', async (t) => {
78
+ // Long-horizon regression: a multi-turn run streams a per-turn `usage_update`
79
+ // before each tool call. The terminal `final` event carries the authoritative
80
+ // run-cumulative usage from the SDK. The collector must report that cumulative
81
+ // verbatim - NOT the cumulative plus its own re-summed per-turn snapshots
82
+ // (the old behavior, which doubled the count and got worse with each turn).
83
+ const result = await collectTerminalResult(asAsyncIterable([
84
+ { type: 'usage_update', usage: { prompt_tokens: 1000, completion_tokens: 50, total_tokens: 1050 } },
85
+ { type: 'tool_started', toolCallId: 'call-1', toolName: 'shell', arguments: { command: 'ls' } },
86
+ { type: 'usage_update', usage: { prompt_tokens: 2000, completion_tokens: 90, total_tokens: 2090 } },
87
+ { type: 'tool_started', toolCallId: 'call-2', toolName: 'shell', arguments: { command: 'cat a' } },
88
+ { type: 'usage_update', usage: { prompt_tokens: 3000, completion_tokens: 120, total_tokens: 3120 } },
89
+ { type: 'tool_started', toolCallId: 'call-3', toolName: 'shell', arguments: { command: 'cat b' } },
90
+ {
91
+ type: 'final',
92
+ finalText: 'Done.',
93
+ // SDK run-state accumulator: cumulative across all turns, including
94
+ // cache details streamed snapshots didn't carry.
95
+ usage: {
96
+ prompt_tokens: 6000,
97
+ completion_tokens: 280,
98
+ total_tokens: 6280,
99
+ cache_read_tokens: 1500,
100
+ },
101
+ },
102
+ ]));
103
+ t.is(result.type, 'response');
104
+ if (result.type === 'response') {
105
+ t.deepEqual(result.usage, {
106
+ prompt_tokens: 6000,
107
+ completion_tokens: 280,
108
+ total_tokens: 6280,
109
+ cache_read_tokens: 1500,
110
+ });
111
+ }
112
+ });
113
+ test('collectTerminalResult lets a later final supersede an earlier one (auto-approved continuation)', async (t) => {
114
+ // The auto-approve path emits a `final` for the first turn, then another
115
+ // `final` after the continuation. Because the SDK accumulator keeps growing
116
+ // on the same run state, the later `final` is the whole-run cumulative and
117
+ // must replace - not add to - the earlier one.
118
+ const result = await collectTerminalResult(asAsyncIterable([
119
+ { type: 'final', finalText: 'partial', usage: { prompt_tokens: 200, completion_tokens: 20, total_tokens: 220 } },
120
+ { type: 'final', finalText: 'Done.', usage: { prompt_tokens: 500, completion_tokens: 60, total_tokens: 560 } },
121
+ ]));
122
+ t.is(result.type, 'response');
123
+ if (result.type === 'response') {
124
+ t.deepEqual(result.usage, { prompt_tokens: 500, completion_tokens: 60, total_tokens: 560 });
125
+ }
126
+ });
127
+ test('collectTerminalResult falls back to the latest streamed usage when no final usage is present', async (t) => {
128
+ const result = await collectTerminalResult(asAsyncIterable([
129
+ { type: 'usage_update', usage: { prompt_tokens: 100, completion_tokens: 10, total_tokens: 110 } },
130
+ { type: 'usage_update', usage: { prompt_tokens: 175, completion_tokens: 18, total_tokens: 193 } },
131
+ { type: 'final', finalText: 'Done.' },
132
+ ]));
133
+ t.is(result.type, 'response');
134
+ if (result.type === 'response') {
135
+ t.deepEqual(result.usage, { prompt_tokens: 175, completion_tokens: 18, total_tokens: 193 });
136
+ }
137
+ });
57
138
  test('collectTerminalResult accumulates streamed callbacks and returns final response payload', async (t) => {
58
139
  const seenText = [];
59
140
  const seenReasoning = [];
@@ -1 +1 @@
1
- {"version":3,"file":"terminal-result-collector.test.js","sourceRoot":"","sources":["../../source/services/terminal-result-collector.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"terminal-result-collector.test.js","sourceRoot":"","sources":["../../source/services/terminal-result-collector.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,MAAM,eAAe,GAAG,KAAK,SAAS,CAAC,EAAE,MAAa;IACpD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,IAAI,CAAC,qFAAqF,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACtG,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,eAAe,CAAC;QACd,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE;QACzD;YACE,IAAI,EAAE,mBAAmB;YACzB,QAAQ,EAAE;gBACR,SAAS,EAAE,WAAW;gBACtB,QAAQ,EAAE,OAAO;gBACjB,aAAa,EAAE,WAAW;gBAC1B,MAAM,EAAE,eAAe;aACxB;SACF;KACF,CAAC,EACF;QACE,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC/C,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;QACjE,kBAAkB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,kBAAkB,EAAE,CAAC;KACvD,CACF,CAAC;IAEF,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACxC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAC9C,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4DAA4D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC7E,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,eAAe,CAAC;QACd;YACE,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,EAAE;YACb,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE;SACxE;QACD;YACE,IAAI,EAAE,mBAAmB;YACzB,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE;YACvE,QAAQ,EAAE;gBACR,SAAS,EAAE,WAAW;gBACtB,QAAQ,EAAE,OAAO;gBACjB,aAAa,EAAE,WAAW;aAC3B;SACF;KACF,CAAC,CACH,CAAC;IAEF,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACxC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9F,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gFAAgF,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACjG,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,eAAe,CAAC;QACd;YACE,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE;SACxE;QACD;YACE,IAAI,EAAE,mBAAmB;YACzB,QAAQ,EAAE;gBACR,SAAS,EAAE,WAAW;gBACtB,QAAQ,EAAE,OAAO;gBACjB,aAAa,EAAE,WAAW;aAC3B;SACF;KACF,CAAC,CACH,CAAC;IAEF,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IACvC,IAAI,MAAM,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACxC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9F,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oGAAoG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACrH,8EAA8E;IAC9E,8EAA8E;IAC9E,+EAA+E;IAC/E,0EAA0E;IAC1E,4EAA4E;IAC5E,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,eAAe,CAAC;QACd,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE;QACnG,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC/F,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE;QACnG,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAClG,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE;QACpG,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAClG;YACE,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,OAAO;YAClB,oEAAoE;YACpE,iDAAiD;YACjD,KAAK,EAAE;gBACL,aAAa,EAAE,IAAI;gBACnB,iBAAiB,EAAE,GAAG;gBACtB,YAAY,EAAE,IAAI;gBAClB,iBAAiB,EAAE,IAAI;aACxB;SACF;KACF,CAAC,CACH,CAAC;IAEF,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC9B,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE;YACxB,aAAa,EAAE,IAAI;YACnB,iBAAiB,EAAE,GAAG;YACtB,YAAY,EAAE,IAAI;YAClB,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gGAAgG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACjH,yEAAyE;IACzE,4EAA4E;IAC5E,2EAA2E;IAC3E,+CAA+C;IAC/C,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,eAAe,CAAC;QACd,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,EAAE;QAChH,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,EAAE;KAC/G,CAAC,CACH,CAAC;IAEF,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC9B,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9F,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8FAA8F,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC/G,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,eAAe,CAAC;QACd,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,EAAE;QACjG,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,EAAE;QACjG,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE;KACtC,CAAC,CACH,CAAC;IAEF,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC9B,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9F,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yFAAyF,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC1G,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,MAAM,MAAM,GAAG,MAAM,qBAAqB,CACxC,eAAe,CAAC;QACd,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE;QACzD,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE;QAC9D;YACE,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE;gBACP,EAAE,EAAE,OAAO;gBACX,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,WAAW;gBACnB,OAAO,EAAE,WAAW;gBACpB,MAAM,EAAE,QAAQ;gBAChB,OAAO,EAAE,IAAI;aACd;SACF;QACD;YACE,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,OAAO;YAClB,aAAa,EAAE,oBAAoB;YACnC,KAAK,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE;YAClE,eAAe,EAAE;gBACf;oBACE,EAAE,EAAE,OAAO;oBACX,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,WAAW;oBACnB,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,IAAI;iBACd;aACF;SACF;KACF,CAAC,EACF;QACE,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;QAC/D,gBAAgB,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;QACzE,gBAAgB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5D,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC/C,YAAY,EAAE,GAAG,EAAE;YACjB,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;KACF,CACF,CAAC;IAEF,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjB,CAAC,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;IAEvF,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC9B,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAChC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,oBAAoB,CAAC,CAAC;QACjD,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC;QACvF,CAAC,CAAC,SAAS,CACT,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACvC,CAAC,OAAO,CAAC,CACV,CAAC;IACJ,CAAC;AACH,CAAC,CAAC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { z } from 'zod';
2
- import type { ToolDefinition, CommandMessage } from './types.js';
2
+ import type { ToolDefinition, FormatCommandMessage } from './types.js';
3
3
  import type { ILoggingService, ISettingsService } from '../services/service-interfaces.js';
4
4
  import { ExecutionContext } from '../services/execution-context.js';
5
5
  /**
@@ -26,7 +26,7 @@ declare const applyPatchParametersSchema: z.ZodObject<{
26
26
  }, z.core.$strip>>>;
27
27
  }, z.core.$strip>;
28
28
  export type ApplyPatchToolParams = z.infer<typeof applyPatchParametersSchema>;
29
- export declare const formatApplyPatchCommandMessage: (item: any, index: number, _toolCallArgumentsById: Map<string, unknown>) => CommandMessage[];
29
+ export declare const formatApplyPatchCommandMessage: FormatCommandMessage;
30
30
  export declare function createApplyPatchToolDefinition(deps: {
31
31
  loggingService: ILoggingService;
32
32
  settingsService: ISettingsService;
@@ -1 +1 @@
1
- {"version":3,"file":"apply-patch.d.ts","sourceRoot":"","sources":["../../source/tools/apply-patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAE3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAIpE;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;IACT,QAAQ,EAAE,MAAM;gBAAxC,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,MAAM;CAIrD;AAQD,QAAA,MAAM,0BAA0B;;;;;;;;;;;;;;;iBAyB5B,CAAC;AAEL,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAuB9E,eAAO,MAAM,8BAA8B,GACzC,MAAM,GAAG,EACT,OAAO,MAAM,EACb,wBAAwB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KAC3C,cAAc,EAiDhB,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACnD,cAAc,EAAE,eAAe,CAAC;IAChC,eAAe,EAAE,gBAAgB,CAAC;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,cAAc,CAAC,oBAAoB,CAAC,CAkUvC"}
1
+ {"version":3,"file":"apply-patch.d.ts","sourceRoot":"","sources":["../../source/tools/apply-patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,KAAK,EAAE,cAAc,EAAkB,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAE3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAIpE;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;IACT,QAAQ,EAAE,MAAM;gBAAxC,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,MAAM;CAIrD;AAQD,QAAA,MAAM,0BAA0B;;;;;;;;;;;;;;;iBAyB5B,CAAC;AAEL,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAuB9E,eAAO,MAAM,8BAA8B,EAAE,oBAiD5C,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACnD,cAAc,EAAE,eAAe,CAAC;IAChC,eAAe,EAAE,gBAAgB,CAAC;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,cAAc,CAAC,oBAAoB,CAAC,CAkUvC"}