@qduc/term2 0.4.0 → 0.6.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 (529) hide show
  1. package/dist/agent.d.ts +5 -0
  2. package/dist/agent.d.ts.map +1 -1
  3. package/dist/agent.js +61 -8
  4. package/dist/agent.js.map +1 -1
  5. package/dist/agent.test.js +122 -10
  6. package/dist/agent.test.js.map +1 -1
  7. package/dist/app.d.ts +13 -0
  8. package/dist/app.d.ts.map +1 -1
  9. package/dist/app.js +71 -18
  10. package/dist/app.js.map +1 -1
  11. package/dist/app.startup-banner.test.js +48 -1
  12. package/dist/app.startup-banner.test.js.map +1 -1
  13. package/dist/cli.js +197 -28
  14. package/dist/cli.js.map +1 -1
  15. package/dist/components/ApprovalPrompt.d.ts.map +1 -1
  16. package/dist/components/ApprovalPrompt.js +11 -34
  17. package/dist/components/ApprovalPrompt.js.map +1 -1
  18. package/dist/components/Banner.d.ts.map +1 -1
  19. package/dist/components/Banner.js +2 -7
  20. package/dist/components/Banner.js.map +1 -1
  21. package/dist/components/BottomArea.d.ts +7 -1
  22. package/dist/components/BottomArea.d.ts.map +1 -1
  23. package/dist/components/BottomArea.js +2 -2
  24. package/dist/components/BottomArea.js.map +1 -1
  25. package/dist/components/ChatMessage.d.ts.map +1 -1
  26. package/dist/components/ChatMessage.js +2 -1
  27. package/dist/components/ChatMessage.js.map +1 -1
  28. package/dist/components/CommandMessage.d.ts.map +1 -1
  29. package/dist/components/CommandMessage.js +45 -48
  30. package/dist/components/CommandMessage.js.map +1 -1
  31. package/dist/components/CommandMessage.test.js +69 -0
  32. package/dist/components/CommandMessage.test.js.map +1 -1
  33. package/dist/components/DiffView.d.ts +7 -0
  34. package/dist/components/DiffView.d.ts.map +1 -0
  35. package/dist/components/DiffView.js +80 -0
  36. package/dist/components/DiffView.js.map +1 -0
  37. package/dist/components/DiffView.test.d.ts +2 -0
  38. package/dist/components/DiffView.test.d.ts.map +1 -0
  39. package/dist/components/DiffView.test.js +45 -0
  40. package/dist/components/DiffView.test.js.map +1 -0
  41. package/dist/components/Input/PopupManager.d.ts +7 -0
  42. package/dist/components/Input/PopupManager.d.ts.map +1 -1
  43. package/dist/components/Input/PopupManager.js +4 -2
  44. package/dist/components/Input/PopupManager.js.map +1 -1
  45. package/dist/components/Input/determine-active-menu.d.ts.map +1 -1
  46. package/dist/components/Input/determine-active-menu.js +4 -1
  47. package/dist/components/Input/determine-active-menu.js.map +1 -1
  48. package/dist/components/Input/popup-props.d.ts +3 -1
  49. package/dist/components/Input/popup-props.d.ts.map +1 -1
  50. package/dist/components/Input/popup-props.js +7 -1
  51. package/dist/components/Input/popup-props.js.map +1 -1
  52. package/dist/components/InputBox.d.ts +6 -0
  53. package/dist/components/InputBox.d.ts.map +1 -1
  54. package/dist/components/InputBox.js +74 -11
  55. package/dist/components/InputBox.js.map +1 -1
  56. package/dist/components/InputBox.menu-logic.test.js +16 -1
  57. package/dist/components/InputBox.menu-logic.test.js.map +1 -1
  58. package/dist/components/InputBox.test.js +1 -0
  59. package/dist/components/InputBox.test.js.map +1 -1
  60. package/dist/components/MarkdownRenderer.d.ts.map +1 -1
  61. package/dist/components/MarkdownRenderer.js +65 -7
  62. package/dist/components/MarkdownRenderer.js.map +1 -1
  63. package/dist/components/MessageList.d.ts.map +1 -1
  64. package/dist/components/MessageList.js +62 -9
  65. package/dist/components/MessageList.js.map +1 -1
  66. package/dist/components/MessageList.test.js +128 -0
  67. package/dist/components/MessageList.test.js.map +1 -1
  68. package/dist/components/SettingsValueSelectionMenu.d.ts.map +1 -1
  69. package/dist/components/SettingsValueSelectionMenu.js +4 -1
  70. package/dist/components/SettingsValueSelectionMenu.js.map +1 -1
  71. package/dist/components/StatusBar.d.ts.map +1 -1
  72. package/dist/components/StatusBar.js +8 -6
  73. package/dist/components/StatusBar.js.map +1 -1
  74. package/dist/components/StatusBar.test.js +24 -0
  75. package/dist/components/StatusBar.test.js.map +1 -1
  76. package/dist/components/SubagentActivityMessage.d.ts +12 -0
  77. package/dist/components/SubagentActivityMessage.d.ts.map +1 -0
  78. package/dist/components/SubagentActivityMessage.js +30 -0
  79. package/dist/components/SubagentActivityMessage.js.map +1 -0
  80. package/dist/components/UndoSelectionMenu.d.ts +12 -0
  81. package/dist/components/UndoSelectionMenu.d.ts.map +1 -0
  82. package/dist/components/UndoSelectionMenu.js +46 -0
  83. package/dist/components/UndoSelectionMenu.js.map +1 -0
  84. package/dist/components/UndoSelectionMenu.test.d.ts +2 -0
  85. package/dist/components/UndoSelectionMenu.test.d.ts.map +1 -0
  86. package/dist/components/UndoSelectionMenu.test.js +40 -0
  87. package/dist/components/UndoSelectionMenu.test.js.map +1 -0
  88. package/dist/components/theme.d.ts +8 -0
  89. package/dist/components/theme.d.ts.map +1 -0
  90. package/dist/components/theme.js +20 -0
  91. package/dist/components/theme.js.map +1 -0
  92. package/dist/context/InputContext.d.ts +1 -1
  93. package/dist/context/InputContext.d.ts.map +1 -1
  94. package/dist/context/InputContext.js.map +1 -1
  95. package/dist/hooks/use-app-commands.d.ts +20 -2
  96. package/dist/hooks/use-app-commands.d.ts.map +1 -1
  97. package/dist/hooks/use-app-commands.js +138 -52
  98. package/dist/hooks/use-app-commands.js.map +1 -1
  99. package/dist/hooks/use-app-commands.test.js +264 -1
  100. package/dist/hooks/use-app-commands.test.js.map +1 -1
  101. package/dist/hooks/use-conversation.d.ts +20 -2
  102. package/dist/hooks/use-conversation.d.ts.map +1 -1
  103. package/dist/hooks/use-conversation.js +114 -14
  104. package/dist/hooks/use-conversation.js.map +1 -1
  105. package/dist/hooks/use-conversation.resume.test.d.ts +2 -0
  106. package/dist/hooks/use-conversation.resume.test.d.ts.map +1 -0
  107. package/dist/hooks/use-conversation.resume.test.js +26 -0
  108. package/dist/hooks/use-conversation.resume.test.js.map +1 -0
  109. package/dist/hooks/use-escape-key.d.ts.map +1 -1
  110. package/dist/hooks/use-escape-key.js +14 -7
  111. package/dist/hooks/use-escape-key.js.map +1 -1
  112. package/dist/hooks/use-escape-key.test.js +168 -4
  113. package/dist/hooks/use-escape-key.test.js.map +1 -1
  114. package/dist/hooks/use-input-history.d.ts +4 -3
  115. package/dist/hooks/use-input-history.d.ts.map +1 -1
  116. package/dist/hooks/use-input-history.js +10 -8
  117. package/dist/hooks/use-input-history.js.map +1 -1
  118. package/dist/hooks/use-input-history.test.d.ts +2 -0
  119. package/dist/hooks/use-input-history.test.d.ts.map +1 -0
  120. package/dist/hooks/use-input-history.test.js +43 -0
  121. package/dist/hooks/use-input-history.test.js.map +1 -0
  122. package/dist/hooks/use-mode-handlers.d.ts +10 -2
  123. package/dist/hooks/use-mode-handlers.d.ts.map +1 -1
  124. package/dist/hooks/use-mode-handlers.js +21 -2
  125. package/dist/hooks/use-mode-handlers.js.map +1 -1
  126. package/dist/hooks/use-model-selection.d.ts +3 -0
  127. package/dist/hooks/use-model-selection.d.ts.map +1 -1
  128. package/dist/hooks/use-model-selection.js +3 -0
  129. package/dist/hooks/use-model-selection.js.map +1 -1
  130. package/dist/hooks/use-path-completion.test.d.ts +2 -0
  131. package/dist/hooks/use-path-completion.test.d.ts.map +1 -0
  132. package/dist/hooks/use-path-completion.test.js +54 -0
  133. package/dist/hooks/use-path-completion.test.js.map +1 -0
  134. package/dist/hooks/use-runtime-settings.d.ts.map +1 -1
  135. package/dist/hooks/use-runtime-settings.js +15 -6
  136. package/dist/hooks/use-runtime-settings.js.map +1 -1
  137. package/dist/hooks/use-settings-completion.d.ts.map +1 -1
  138. package/dist/hooks/use-settings-completion.js +0 -1
  139. package/dist/hooks/use-settings-completion.js.map +1 -1
  140. package/dist/hooks/use-settings-value-completion.d.ts +1 -0
  141. package/dist/hooks/use-settings-value-completion.d.ts.map +1 -1
  142. package/dist/hooks/use-settings-value-completion.js +25 -19
  143. package/dist/hooks/use-settings-value-completion.js.map +1 -1
  144. package/dist/hooks/use-shell-mode.d.ts.map +1 -1
  145. package/dist/hooks/use-shell-mode.js +2 -1
  146. package/dist/hooks/use-shell-mode.js.map +1 -1
  147. package/dist/hooks/use-slash-commands.d.ts +1 -0
  148. package/dist/hooks/use-slash-commands.d.ts.map +1 -1
  149. package/dist/hooks/use-slash-commands.js +10 -1
  150. package/dist/hooks/use-slash-commands.js.map +1 -1
  151. package/dist/hooks/use-undo-selection.d.ts +19 -0
  152. package/dist/hooks/use-undo-selection.d.ts.map +1 -0
  153. package/dist/hooks/use-undo-selection.js +76 -0
  154. package/dist/hooks/use-undo-selection.js.map +1 -0
  155. package/dist/lib/editor-impl.test.js +63 -50
  156. package/dist/lib/editor-impl.test.js.map +1 -1
  157. package/dist/lib/openai-agent-client.d.ts +9 -0
  158. package/dist/lib/openai-agent-client.d.ts.map +1 -1
  159. package/dist/lib/openai-agent-client.js +104 -134
  160. package/dist/lib/openai-agent-client.js.map +1 -1
  161. package/dist/lib/openai-agent-client.test.js +30 -0
  162. package/dist/lib/openai-agent-client.test.js.map +1 -1
  163. package/dist/non-interactive.d.ts +6 -1
  164. package/dist/non-interactive.d.ts.map +1 -1
  165. package/dist/non-interactive.js +70 -4
  166. package/dist/non-interactive.js.map +1 -1
  167. package/dist/non-interactive.test.js +176 -1
  168. package/dist/non-interactive.test.js.map +1 -1
  169. package/dist/prompts/orchestrator.md +46 -0
  170. package/dist/prompts/plan-mode-info.md +17 -0
  171. package/dist/prompts/prompt-selector.d.ts +2 -1
  172. package/dist/prompts/prompt-selector.d.ts.map +1 -1
  173. package/dist/prompts/prompt-selector.js +5 -1
  174. package/dist/prompts/prompt-selector.js.map +1 -1
  175. package/dist/prompts/prompt-selector.test.js +7 -0
  176. package/dist/prompts/prompt-selector.test.js.map +1 -1
  177. package/dist/prompts/prompt-selector.test.ts +18 -0
  178. package/dist/prompts/prompt-selector.ts +7 -1
  179. package/dist/prompts/reasoning-efficiency.d.ts +7 -0
  180. package/dist/prompts/reasoning-efficiency.d.ts.map +1 -0
  181. package/dist/prompts/reasoning-efficiency.js +19 -0
  182. package/dist/prompts/reasoning-efficiency.js.map +1 -0
  183. package/dist/prompts/reasoning-efficiency.ts +18 -0
  184. package/dist/prompts/search-via-shell.test.js +17 -17
  185. package/dist/prompts/search-via-shell.test.js.map +1 -1
  186. package/dist/prompts/search-via-shell.test.ts +17 -17
  187. package/dist/prompts/shell-auto-approval.d.ts +3 -0
  188. package/dist/prompts/shell-auto-approval.d.ts.map +1 -0
  189. package/dist/prompts/shell-auto-approval.js +23 -0
  190. package/dist/prompts/shell-auto-approval.js.map +1 -0
  191. package/dist/prompts/shell-auto-approval.ts +23 -0
  192. package/dist/prompts/subagent-delegation.d.ts +10 -0
  193. package/dist/prompts/subagent-delegation.d.ts.map +1 -0
  194. package/dist/prompts/subagent-delegation.js +33 -0
  195. package/dist/prompts/subagent-delegation.js.map +1 -0
  196. package/dist/prompts/subagent-delegation.test.d.ts +2 -0
  197. package/dist/prompts/subagent-delegation.test.d.ts.map +1 -0
  198. package/dist/prompts/subagent-delegation.test.js +17 -0
  199. package/dist/prompts/subagent-delegation.test.js.map +1 -0
  200. package/dist/prompts/subagent-delegation.test.ts +21 -0
  201. package/dist/prompts/subagent-delegation.ts +40 -0
  202. package/dist/prompts/subagents/explorer.md +41 -0
  203. package/dist/prompts/subagents/mentor.md +15 -0
  204. package/dist/prompts/subagents/researcher.md +39 -0
  205. package/dist/prompts/subagents/worker.md +40 -0
  206. package/dist/providers/ai-sdk-anthropic.provider.d.ts +1 -0
  207. package/dist/providers/ai-sdk-anthropic.provider.d.ts.map +1 -1
  208. package/dist/providers/ai-sdk-anthropic.provider.js +67 -1
  209. package/dist/providers/ai-sdk-anthropic.provider.js.map +1 -1
  210. package/dist/providers/ai-sdk-anthropic.provider.test.d.ts +2 -0
  211. package/dist/providers/ai-sdk-anthropic.provider.test.d.ts.map +1 -0
  212. package/dist/providers/ai-sdk-anthropic.provider.test.js +87 -0
  213. package/dist/providers/ai-sdk-anthropic.provider.test.js.map +1 -0
  214. package/dist/providers/common/openai-compatible-messages.d.ts +1 -1
  215. package/dist/providers/common/openai-compatible-messages.d.ts.map +1 -1
  216. package/dist/providers/common/openai-compatible-messages.js +47 -16
  217. package/dist/providers/common/openai-compatible-messages.js.map +1 -1
  218. package/dist/providers/common/openai-compatible-messages.test.js +77 -14
  219. package/dist/providers/common/openai-compatible-messages.test.js.map +1 -1
  220. package/dist/providers/custom-provider-adapter.test.js +39 -1
  221. package/dist/providers/custom-provider-adapter.test.js.map +1 -1
  222. package/dist/providers/openai-compatible.provider.d.ts +11 -1
  223. package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
  224. package/dist/providers/openai-compatible.provider.js +124 -10
  225. package/dist/providers/openai-compatible.provider.js.map +1 -1
  226. package/dist/providers/openai-compatible.provider.test.js +62 -1
  227. package/dist/providers/openai-compatible.provider.test.js.map +1 -1
  228. package/dist/providers/openrouter.provider.js +1 -1
  229. package/dist/providers/openrouter.provider.js.map +1 -1
  230. package/dist/scripts/eval-auto-approval/dataset.d.ts +1 -1
  231. package/dist/services/agent-stream.d.ts +1 -0
  232. package/dist/services/agent-stream.d.ts.map +1 -1
  233. package/dist/services/approval-flow-coordinator.d.ts +2 -0
  234. package/dist/services/approval-flow-coordinator.d.ts.map +1 -1
  235. package/dist/services/approval-flow-coordinator.js +45 -18
  236. package/dist/services/approval-flow-coordinator.js.map +1 -1
  237. package/dist/services/approval-flow-coordinator.test.js +87 -0
  238. package/dist/services/approval-flow-coordinator.test.js.map +1 -1
  239. package/dist/services/approval-rejection-interceptor.test.js +5 -0
  240. package/dist/services/approval-rejection-interceptor.test.js.map +1 -1
  241. package/dist/services/approval-state.d.ts +4 -0
  242. package/dist/services/approval-state.d.ts.map +1 -1
  243. package/dist/services/approval-state.js +2 -0
  244. package/dist/services/approval-state.js.map +1 -1
  245. package/dist/services/approval-state.test.js +21 -0
  246. package/dist/services/approval-state.test.js.map +1 -1
  247. package/dist/services/conversation-events.d.ts +25 -1
  248. package/dist/services/conversation-events.d.ts.map +1 -1
  249. package/dist/services/conversation-persistence.d.ts +52 -0
  250. package/dist/services/conversation-persistence.d.ts.map +1 -0
  251. package/dist/services/conversation-persistence.js +163 -0
  252. package/dist/services/conversation-persistence.js.map +1 -0
  253. package/dist/services/conversation-persistence.test.d.ts +2 -0
  254. package/dist/services/conversation-persistence.test.d.ts.map +1 -0
  255. package/dist/services/conversation-persistence.test.js +418 -0
  256. package/dist/services/conversation-persistence.test.js.map +1 -0
  257. package/dist/services/conversation-result-builder.d.ts.map +1 -1
  258. package/dist/services/conversation-result-builder.js +13 -0
  259. package/dist/services/conversation-result-builder.js.map +1 -1
  260. package/dist/services/conversation-service.d.ts +22 -0
  261. package/dist/services/conversation-service.d.ts.map +1 -1
  262. package/dist/services/conversation-service.js +18 -0
  263. package/dist/services/conversation-service.js.map +1 -1
  264. package/dist/services/conversation-session.auto-approval.test.js +57 -9
  265. package/dist/services/conversation-session.auto-approval.test.js.map +1 -1
  266. package/dist/services/conversation-session.d.ts +25 -0
  267. package/dist/services/conversation-session.d.ts.map +1 -1
  268. package/dist/services/conversation-session.js +208 -40
  269. package/dist/services/conversation-session.js.map +1 -1
  270. package/dist/services/conversation-store.d.ts +42 -0
  271. package/dist/services/conversation-store.d.ts.map +1 -1
  272. package/dist/services/conversation-store.js +182 -1
  273. package/dist/services/conversation-store.js.map +1 -1
  274. package/dist/services/conversation-store.test.js +310 -1
  275. package/dist/services/conversation-store.test.js.map +1 -1
  276. package/dist/services/history-service.d.ts +6 -1
  277. package/dist/services/history-service.d.ts.map +1 -1
  278. package/dist/services/history-service.js +46 -6
  279. package/dist/services/history-service.js.map +1 -1
  280. package/dist/services/history-service.test.d.ts +2 -0
  281. package/dist/services/history-service.test.d.ts.map +1 -0
  282. package/dist/services/history-service.test.js +77 -0
  283. package/dist/services/history-service.test.js.map +1 -0
  284. package/dist/services/input-surge-guard.d.ts +37 -0
  285. package/dist/services/input-surge-guard.d.ts.map +1 -0
  286. package/dist/services/input-surge-guard.js +190 -0
  287. package/dist/services/input-surge-guard.js.map +1 -0
  288. package/dist/services/input-surge-guard.test.d.ts +2 -0
  289. package/dist/services/input-surge-guard.test.d.ts.map +1 -0
  290. package/dist/services/input-surge-guard.test.js +126 -0
  291. package/dist/services/input-surge-guard.test.js.map +1 -0
  292. package/dist/services/interruption-info.js +1 -1
  293. package/dist/services/interruption-info.js.map +1 -1
  294. package/dist/services/interruption-info.test.js +12 -0
  295. package/dist/services/interruption-info.test.js.map +1 -1
  296. package/dist/services/mode-notices.d.ts +11 -0
  297. package/dist/services/mode-notices.d.ts.map +1 -0
  298. package/dist/services/mode-notices.js +16 -0
  299. package/dist/services/mode-notices.js.map +1 -0
  300. package/dist/services/plan-mode-interceptor.d.ts +10 -0
  301. package/dist/services/plan-mode-interceptor.d.ts.map +1 -0
  302. package/dist/services/plan-mode-interceptor.js +38 -0
  303. package/dist/services/plan-mode-interceptor.js.map +1 -0
  304. package/dist/services/plan-mode-interceptor.test.d.ts +2 -0
  305. package/dist/services/plan-mode-interceptor.test.d.ts.map +1 -0
  306. package/dist/services/plan-mode-interceptor.test.js +55 -0
  307. package/dist/services/plan-mode-interceptor.test.js.map +1 -0
  308. package/dist/services/rtk-service.d.ts.map +1 -1
  309. package/dist/services/rtk-service.js +104 -9
  310. package/dist/services/rtk-service.js.map +1 -1
  311. package/dist/services/rtk-service.test.js +55 -20
  312. package/dist/services/rtk-service.test.js.map +1 -1
  313. package/dist/services/service-interfaces.d.ts +4 -1
  314. package/dist/services/service-interfaces.d.ts.map +1 -1
  315. package/dist/services/settings-persistence.js +1 -1
  316. package/dist/services/settings-schema.d.ts +107 -4
  317. package/dist/services/settings-schema.d.ts.map +1 -1
  318. package/dist/services/settings-schema.js +103 -5
  319. package/dist/services/settings-schema.js.map +1 -1
  320. package/dist/services/settings-schema.test.js +35 -1
  321. package/dist/services/settings-schema.test.js.map +1 -1
  322. package/dist/services/settings-service.d.ts +3 -1
  323. package/dist/services/settings-service.d.ts.map +1 -1
  324. package/dist/services/settings-service.js +40 -4
  325. package/dist/services/settings-service.js.map +1 -1
  326. package/dist/services/settings-sources.d.ts.map +1 -1
  327. package/dist/services/settings-sources.js +2 -1
  328. package/dist/services/settings-sources.js.map +1 -1
  329. package/dist/services/settings-sources.test.js +4 -0
  330. package/dist/services/settings-sources.test.js.map +1 -1
  331. package/dist/services/shell-auto-approval-evaluator.d.ts +2 -1
  332. package/dist/services/shell-auto-approval-evaluator.d.ts.map +1 -1
  333. package/dist/services/shell-auto-approval-evaluator.js +12 -29
  334. package/dist/services/shell-auto-approval-evaluator.js.map +1 -1
  335. package/dist/services/shell-auto-approval-evaluator.test.js +2 -4
  336. package/dist/services/shell-auto-approval-evaluator.test.js.map +1 -1
  337. package/dist/services/shell-auto-approval-resolver.test.js +1 -1
  338. package/dist/services/shell-auto-approval-resolver.test.js.map +1 -1
  339. package/dist/services/stream-event-processor.d.ts.map +1 -1
  340. package/dist/services/stream-event-processor.js +24 -8
  341. package/dist/services/stream-event-processor.js.map +1 -1
  342. package/dist/services/stream-event-processor.test.js +27 -0
  343. package/dist/services/stream-event-processor.test.js.map +1 -1
  344. package/dist/services/subagents/subagent-manager.d.ts +16 -0
  345. package/dist/services/subagents/subagent-manager.d.ts.map +1 -0
  346. package/dist/services/subagents/subagent-manager.js +670 -0
  347. package/dist/services/subagents/subagent-manager.js.map +1 -0
  348. package/dist/services/subagents/subagent-manager.test.d.ts +2 -0
  349. package/dist/services/subagents/subagent-manager.test.d.ts.map +1 -0
  350. package/dist/services/subagents/subagent-manager.test.js +880 -0
  351. package/dist/services/subagents/subagent-manager.test.js.map +1 -0
  352. package/dist/services/subagents/subagent-session.d.ts +26 -0
  353. package/dist/services/subagents/subagent-session.d.ts.map +1 -0
  354. package/dist/services/subagents/subagent-session.js +86 -0
  355. package/dist/services/subagents/subagent-session.js.map +1 -0
  356. package/dist/services/subagents/subagent-session.test.d.ts +2 -0
  357. package/dist/services/subagents/subagent-session.test.d.ts.map +1 -0
  358. package/dist/services/subagents/subagent-session.test.js +118 -0
  359. package/dist/services/subagents/subagent-session.test.js.map +1 -0
  360. package/dist/services/subagents/types.d.ts +41 -0
  361. package/dist/services/subagents/types.d.ts.map +1 -0
  362. package/dist/services/subagents/types.js +2 -0
  363. package/dist/services/subagents/types.js.map +1 -0
  364. package/dist/services/terminal-result-collector.d.ts.map +1 -1
  365. package/dist/services/terminal-result-collector.js +31 -5
  366. package/dist/services/terminal-result-collector.js.map +1 -1
  367. package/dist/services/terminal-result-collector.test.js +81 -0
  368. package/dist/services/terminal-result-collector.test.js.map +1 -1
  369. package/dist/slash-commands.d.ts +1 -0
  370. package/dist/slash-commands.d.ts.map +1 -1
  371. package/dist/slash-commands.js +8 -1
  372. package/dist/slash-commands.js.map +1 -1
  373. package/dist/slash-commands.test.d.ts +2 -0
  374. package/dist/slash-commands.test.d.ts.map +1 -0
  375. package/dist/slash-commands.test.js +22 -0
  376. package/dist/slash-commands.test.js.map +1 -0
  377. package/dist/tools/apply-patch.d.ts +2 -2
  378. package/dist/tools/apply-patch.d.ts.map +1 -1
  379. package/dist/tools/apply-patch.js +2 -6
  380. package/dist/tools/apply-patch.js.map +1 -1
  381. package/dist/tools/apply-patch.test.js +2 -13
  382. package/dist/tools/apply-patch.test.js.map +1 -1
  383. package/dist/tools/ask-mentor.d.ts +2 -2
  384. package/dist/tools/ask-mentor.d.ts.map +1 -1
  385. package/dist/tools/ask-mentor.js.map +1 -1
  386. package/dist/tools/code-context.d.ts +3 -3
  387. package/dist/tools/code-context.d.ts.map +1 -1
  388. package/dist/tools/code-context.js.map +1 -1
  389. package/dist/tools/code-context.test.js +2 -2
  390. package/dist/tools/code-context.test.js.map +1 -1
  391. package/dist/tools/command-message-formatters.d.ts +5 -0
  392. package/dist/tools/command-message-formatters.d.ts.map +1 -0
  393. package/dist/tools/command-message-formatters.js +13 -0
  394. package/dist/tools/command-message-formatters.js.map +1 -0
  395. package/dist/tools/command-message-formatters.test.d.ts +2 -0
  396. package/dist/tools/command-message-formatters.test.d.ts.map +1 -0
  397. package/dist/tools/command-message-formatters.test.js +23 -0
  398. package/dist/tools/command-message-formatters.test.js.map +1 -0
  399. package/dist/tools/create-file.d.ts +2 -2
  400. package/dist/tools/create-file.d.ts.map +1 -1
  401. package/dist/tools/create-file.js +14 -9
  402. package/dist/tools/create-file.js.map +1 -1
  403. package/dist/tools/create-file.test.js +13 -13
  404. package/dist/tools/create-file.test.js.map +1 -1
  405. package/dist/tools/edit-healing.d.ts +3 -3
  406. package/dist/tools/edit-healing.d.ts.map +1 -1
  407. package/dist/tools/edit-healing.js.map +1 -1
  408. package/dist/tools/edit-healing.test.js +0 -1
  409. package/dist/tools/edit-healing.test.js.map +1 -1
  410. package/dist/tools/file-locks.d.ts +1 -0
  411. package/dist/tools/file-locks.d.ts.map +1 -1
  412. package/dist/tools/file-locks.js +16 -0
  413. package/dist/tools/file-locks.js.map +1 -1
  414. package/dist/tools/find-files.d.ts +2 -2
  415. package/dist/tools/find-files.d.ts.map +1 -1
  416. package/dist/tools/find-files.js.map +1 -1
  417. package/dist/tools/find-files.test.js +1 -1
  418. package/dist/tools/find-files.test.js.map +1 -1
  419. package/dist/tools/grep.d.ts +3 -2
  420. package/dist/tools/grep.d.ts.map +1 -1
  421. package/dist/tools/grep.js +65 -4
  422. package/dist/tools/grep.js.map +1 -1
  423. package/dist/tools/grep.test.d.ts +2 -0
  424. package/dist/tools/grep.test.d.ts.map +1 -0
  425. package/dist/tools/grep.test.js +39 -0
  426. package/dist/tools/grep.test.js.map +1 -0
  427. package/dist/tools/read-file.d.ts +3 -2
  428. package/dist/tools/read-file.d.ts.map +1 -1
  429. package/dist/tools/read-file.js +7 -5
  430. package/dist/tools/read-file.js.map +1 -1
  431. package/dist/tools/read-file.test.js +2 -2
  432. package/dist/tools/read-file.test.js.map +1 -1
  433. package/dist/tools/run-subagent.d.ts +14 -0
  434. package/dist/tools/run-subagent.d.ts.map +1 -0
  435. package/dist/tools/run-subagent.js +200 -0
  436. package/dist/tools/run-subagent.js.map +1 -0
  437. package/dist/tools/run-subagent.test.d.ts +2 -0
  438. package/dist/tools/run-subagent.test.d.ts.map +1 -0
  439. package/dist/tools/run-subagent.test.js +206 -0
  440. package/dist/tools/run-subagent.test.js.map +1 -0
  441. package/dist/tools/search-replace.d.ts +15 -7
  442. package/dist/tools/search-replace.d.ts.map +1 -1
  443. package/dist/tools/search-replace.js +93 -119
  444. package/dist/tools/search-replace.js.map +1 -1
  445. package/dist/tools/search-replace.test.js +330 -217
  446. package/dist/tools/search-replace.test.js.map +1 -1
  447. package/dist/tools/search.d.ts.map +1 -1
  448. package/dist/tools/search.js.map +1 -1
  449. package/dist/tools/shell.d.ts +3 -2
  450. package/dist/tools/shell.d.ts.map +1 -1
  451. package/dist/tools/shell.js +14 -6
  452. package/dist/tools/shell.js.map +1 -1
  453. package/dist/tools/shell.test.js +189 -11
  454. package/dist/tools/shell.test.js.map +1 -1
  455. package/dist/tools/tool-parameter-schema.test.js +13 -4
  456. package/dist/tools/tool-parameter-schema.test.js.map +1 -1
  457. package/dist/tools/types.d.ts +3 -2
  458. package/dist/tools/types.d.ts.map +1 -1
  459. package/dist/tools/utils.d.ts.map +1 -1
  460. package/dist/tools/utils.js +11 -1
  461. package/dist/tools/utils.js.map +1 -1
  462. package/dist/tools/utils.test.js +13 -0
  463. package/dist/tools/utils.test.js.map +1 -1
  464. package/dist/tools/web-fetch.d.ts +2 -2
  465. package/dist/tools/web-fetch.d.ts.map +1 -1
  466. package/dist/tools/web-fetch.js +29 -4
  467. package/dist/tools/web-fetch.js.map +1 -1
  468. package/dist/tools/web-fetch.test.js +64 -0
  469. package/dist/tools/web-fetch.test.js.map +1 -1
  470. package/dist/tools/web-search.d.ts +2 -2
  471. package/dist/tools/web-search.d.ts.map +1 -1
  472. package/dist/tools/web-search.js.map +1 -1
  473. package/dist/utils/clipboard.d.ts +2 -2
  474. package/dist/utils/clipboard.d.ts.map +1 -1
  475. package/dist/utils/clipboard.js +58 -22
  476. package/dist/utils/clipboard.js.map +1 -1
  477. package/dist/utils/clipboard.test.js +25 -6
  478. package/dist/utils/clipboard.test.js.map +1 -1
  479. package/dist/utils/command-safety/handlers/sed-handler.d.ts.map +1 -1
  480. package/dist/utils/command-safety/handlers/sed-handler.js +10 -7
  481. package/dist/utils/command-safety/handlers/sed-handler.js.map +1 -1
  482. package/dist/utils/command-safety/index.d.ts.map +1 -1
  483. package/dist/utils/command-safety/index.js +153 -117
  484. package/dist/utils/command-safety/index.js.map +1 -1
  485. package/dist/utils/command-safety/path-analysis.d.ts.map +1 -1
  486. package/dist/utils/command-safety/path-analysis.js +6 -2
  487. package/dist/utils/command-safety/path-analysis.js.map +1 -1
  488. package/dist/utils/command-safety/utils.js +2 -2
  489. package/dist/utils/command-safety/utils.js.map +1 -1
  490. package/dist/utils/command-safety.path.test.js +15 -1
  491. package/dist/utils/command-safety.path.test.js.map +1 -1
  492. package/dist/utils/conversation-event-handler.d.ts +15 -0
  493. package/dist/utils/conversation-event-handler.d.ts.map +1 -1
  494. package/dist/utils/conversation-event-handler.js +108 -8
  495. package/dist/utils/conversation-event-handler.js.map +1 -1
  496. package/dist/utils/conversation-event-handler.test.js +207 -2
  497. package/dist/utils/conversation-event-handler.test.js.map +1 -1
  498. package/dist/utils/conversation-utils.d.ts +1 -0
  499. package/dist/utils/conversation-utils.d.ts.map +1 -1
  500. package/dist/utils/conversation-utils.js +1 -0
  501. package/dist/utils/conversation-utils.js.map +1 -1
  502. package/dist/utils/execute-shell.d.ts +2 -0
  503. package/dist/utils/execute-shell.d.ts.map +1 -1
  504. package/dist/utils/execute-shell.js +25 -1
  505. package/dist/utils/execute-shell.js.map +1 -1
  506. package/dist/utils/execute-shell.test.js +22 -0
  507. package/dist/utils/execute-shell.test.js.map +1 -1
  508. package/dist/utils/extract-command-messages.d.ts.map +1 -1
  509. package/dist/utils/extract-command-messages.js +2 -21
  510. package/dist/utils/extract-command-messages.js.map +1 -1
  511. package/dist/utils/model-settings.d.ts.map +1 -1
  512. package/dist/utils/model-settings.js +18 -0
  513. package/dist/utils/model-settings.js.map +1 -1
  514. package/dist/utils/output-trim.d.ts.map +1 -1
  515. package/dist/utils/output-trim.js +14 -6
  516. package/dist/utils/output-trim.js.map +1 -1
  517. package/dist/utils/streaming-session-factory.d.ts.map +1 -1
  518. package/dist/utils/streaming-session-factory.js +16 -1
  519. package/dist/utils/streaming-session-factory.js.map +1 -1
  520. package/dist/utils/streaming-session-factory.test.js +42 -0
  521. package/dist/utils/streaming-session-factory.test.js.map +1 -1
  522. package/dist/utils/token-usage.d.ts +13 -0
  523. package/dist/utils/token-usage.d.ts.map +1 -1
  524. package/dist/utils/token-usage.js +92 -1
  525. package/dist/utils/token-usage.js.map +1 -1
  526. package/dist/utils/token-usage.test.js +93 -1
  527. package/dist/utils/token-usage.test.js.map +1 -1
  528. package/package.json +4 -4
  529. package/readme.md +271 -44
@@ -9,6 +9,7 @@ import { ShellAutoApprovalResolver } from './shell-auto-approval-resolver.js';
9
9
  import { ApprovalFlowCoordinator } from './approval-flow-coordinator.js';
10
10
  import { buildConversationResult, toTerminalEvent } from './conversation-result-builder.js';
11
11
  import { normalizeUserTurn } from '../types/user-turn.js';
12
+ import { InputSurgeGuard } from './input-surge-guard.js';
12
13
  const supportsConversationChaining = (providerId) => {
13
14
  const providerDef = getProvider(providerId);
14
15
  return providerDef?.capabilities?.supportsConversationChaining ?? false;
@@ -24,7 +25,10 @@ export class ConversationSession {
24
25
  emittedInvalidToolCallPackets = new Set();
25
26
  shellAutoApproval;
26
27
  approvalFlow;
28
+ inputSurgeGuard = new InputSurgeGuard();
29
+ generation = 0;
27
30
  settingsService;
31
+ pendingModeNotice = null;
28
32
  constructor(id, { agentClient, deps, }) {
29
33
  this.id = id;
30
34
  this.agentClient = agentClient;
@@ -44,16 +48,50 @@ export class ConversationSession {
44
48
  sessionId: this.id,
45
49
  });
46
50
  }
51
+ #isCurrentGeneration(gen) {
52
+ return gen === this.generation;
53
+ }
47
54
  reset() {
55
+ this.generation++;
48
56
  this.previousResponseId = null;
49
57
  this.conversationStore.clear();
50
58
  this.approvalState.clearPending();
51
59
  this.approvalState.consumeAborted();
52
60
  this.toolCallArgumentsById.clear();
53
61
  this.shellAutoApproval.clearCache();
62
+ this.inputSurgeGuard.reset();
54
63
  const clearConversations = getMethod(this.agentClient, 'clearConversations');
55
64
  clearConversations?.call(this.agentClient);
56
65
  }
66
+ undoLastUserTurn() {
67
+ const removed = this.conversationStore.removeLastUserTurn();
68
+ if (removed === null)
69
+ return null;
70
+ this.generation++;
71
+ this.previousResponseId = null;
72
+ this.approvalState.clearPending();
73
+ this.approvalState.consumeAborted();
74
+ this.toolCallArgumentsById.clear();
75
+ this.shellAutoApproval.clearCache();
76
+ this.inputSurgeGuard.reset();
77
+ return removed;
78
+ }
79
+ listUserTurns() {
80
+ return this.conversationStore.listUserTurns();
81
+ }
82
+ undoNUserTurns(n) {
83
+ const removed = this.conversationStore.removeNLastUserTurns(n);
84
+ if (removed === null)
85
+ return null;
86
+ this.generation++;
87
+ this.previousResponseId = null;
88
+ this.approvalState.clearPending();
89
+ this.approvalState.consumeAborted();
90
+ this.toolCallArgumentsById.clear();
91
+ this.shellAutoApproval.clearCache();
92
+ this.inputSurgeGuard.reset();
93
+ return removed;
94
+ }
57
95
  setModel(model) {
58
96
  this.agentClient.setModel(model);
59
97
  }
@@ -74,9 +112,27 @@ export class ConversationSession {
74
112
  this.agentClient.setRetryCallback(callback);
75
113
  }
76
114
  }
115
+ exportState() {
116
+ return {
117
+ history: this.conversationStore.getHistory(),
118
+ previousResponseId: this.previousResponseId,
119
+ };
120
+ }
121
+ importState(state) {
122
+ this.conversationStore.clear();
123
+ for (const item of state.history) {
124
+ this.conversationStore.addImportedItem(item);
125
+ }
126
+ this.previousResponseId = state.previousResponseId;
127
+ this.inputSurgeGuard.reset();
128
+ this.generation++;
129
+ }
77
130
  addShellContext(historyText) {
78
131
  this.conversationStore.addShellContext(historyText);
79
132
  }
133
+ queueModeNotice(text) {
134
+ this.pendingModeNotice = text;
135
+ }
80
136
  /**
81
137
  * Abort the current running operation
82
138
  */
@@ -89,9 +145,11 @@ export class ConversationSession {
89
145
  * This is the transport-friendly primitive that can later be bridged to SSE/WebSockets.
90
146
  */
91
147
  async *run(input, { hallucinationRetryCount = 0, flexServiceTierFallbackCount = 0, skipUserMessage = false, } = {}) {
148
+ const gen = this.generation;
92
149
  let stream = null;
93
150
  const turn = normalizeUserTurn(input);
94
151
  const text = turn.text;
152
+ let addedUserMessage = false;
95
153
  try {
96
154
  this.logger.debug('Conversation stream start', {
97
155
  eventType: 'stream.started',
@@ -105,6 +163,7 @@ export class ConversationSession {
105
163
  // Maintain canonical local history regardless of provider.
106
164
  if (shouldAddUserMessage) {
107
165
  this.conversationStore.addUserTurn(turn);
166
+ addedUserMessage = true;
108
167
  }
109
168
  // If there's an aborted approval, we need to resolve it first.
110
169
  // The user's message is a new input, but the agent is stuck waiting for tool output.
@@ -131,8 +190,10 @@ export class ConversationSession {
131
190
  emittedInvalidToolCallPackets: this.emittedInvalidToolCallPackets,
132
191
  preserveExistingToolArgs: true,
133
192
  }, { logger: this.logger, sessionId: this.id });
134
- this.previousResponseId = continuedStream.lastResponseId ?? null;
135
- this.conversationStore.updateFromResult(continuedStream);
193
+ if (this.#isCurrentGeneration(gen)) {
194
+ this.previousResponseId = continuedStream.lastResponseId ?? null;
195
+ this.conversationStore.updateFromResult(continuedStream);
196
+ }
136
197
  // Check if another interruption occurred
137
198
  if (continuedStream.interruptions && continuedStream.interruptions.length > 0) {
138
199
  this.logger.warn('Another interruption occurred after fake execution - handling as approval');
@@ -163,9 +224,64 @@ export class ConversationSession {
163
224
  const provider = getProvider ? getProvider.call(this.agentClient) : 'openai';
164
225
  const supportsChaining = supportsConversationChaining(provider);
165
226
  const history = this.conversationStore.getHistory();
166
- const latestInput = history[history.length - 1] ?? text;
167
- const chainedInput = turn.images?.length ? latestInput : text;
168
- stream = (await this.agentClient.startStream(supportsChaining ? chainedInput : history, {
227
+ // Use chaining mode only when the provider supports it AND either a valid
228
+ // chain exists (previousResponseId is set) or there is no prior history to
229
+ // resync (fresh start with just the current message). After undo the chain
230
+ // is severed (previousResponseId = null) while prior turns remain in the
231
+ // local store, so we fall back to full-history mode to re-establish context.
232
+ const useChaining = supportsChaining && (!!this.previousResponseId || history.length <= 1);
233
+ let streamInput;
234
+ if (this.pendingModeNotice) {
235
+ const notice = this.pendingModeNotice;
236
+ this.pendingModeNotice = null;
237
+ if (useChaining) {
238
+ const latestInput = history[history.length - 1] ?? text;
239
+ const chainedInput = turn.images?.length ? latestInput : text;
240
+ const userItem = typeof chainedInput === 'string' ? { role: 'user', type: 'message', content: chainedInput } : chainedInput;
241
+ const noticeItem = { role: 'system', type: 'message', content: notice };
242
+ streamInput = [noticeItem, userItem];
243
+ }
244
+ else {
245
+ // Persist the notice at the tail (append-only) rather than splicing
246
+ // it before the last user turn or sending it as a one-shot item.
247
+ // Mid-history insertion adds a stray ephemeral cache breakpoint (see
248
+ // addCacheControlToLastTwoMessages) and a transient item makes
249
+ // consecutive requests diverge at the tail — both break the
250
+ // Claude/Qwen prompt cache. Appending keeps the cached prefix
251
+ // byte-identical and only growing.
252
+ this.conversationStore.addModeNotice(notice);
253
+ streamInput = this.conversationStore.getHistory();
254
+ }
255
+ }
256
+ else {
257
+ const latestInput = history[history.length - 1] ?? text;
258
+ const chainedInput = turn.images?.length ? latestInput : text;
259
+ streamInput = useChaining ? (typeof chainedInput === 'string' ? chainedInput : [chainedInput]) : history;
260
+ }
261
+ const inputSurgeKind = useChaining ? 'delta' : 'full_history';
262
+ const surgeDecision = this.inputSurgeGuard.inspect(streamInput, { kind: inputSurgeKind });
263
+ if (surgeDecision.action === 'block') {
264
+ if (addedUserMessage && this.#isCurrentGeneration(gen)) {
265
+ this.conversationStore.removeLastUserMessage();
266
+ }
267
+ this.logger.warn('Input surge guard blocked provider request', {
268
+ eventType: 'input_surge.blocked',
269
+ category: 'provider',
270
+ phase: 'request_start',
271
+ sessionId: this.id,
272
+ traceId: this.logger.getCorrelationId(),
273
+ reason: surgeDecision.reason,
274
+ stats: surgeDecision.stats,
275
+ previousStats: surgeDecision.previousStats,
276
+ });
277
+ yield {
278
+ type: 'error',
279
+ kind: 'input_surge_guard',
280
+ message: `${surgeDecision.reason} Request blocked to prevent runaway context growth. Try /undo or /clear, or compact the conversation history.`,
281
+ };
282
+ return;
283
+ }
284
+ stream = (await this.agentClient.startStream(streamInput, {
169
285
  previousResponseId: this.previousResponseId,
170
286
  }));
171
287
  const acc = createStreamAccumulator();
@@ -174,9 +290,20 @@ export class ConversationSession {
174
290
  emittedInvalidToolCallPackets: this.emittedInvalidToolCallPackets,
175
291
  preserveExistingToolArgs: false,
176
292
  }, { logger: this.logger, sessionId: this.id });
177
- this.previousResponseId = stream.lastResponseId ?? null;
178
- this.conversationStore.updateFromResult(stream);
293
+ if (this.#isCurrentGeneration(gen)) {
294
+ this.previousResponseId = stream.lastResponseId ?? null;
295
+ this.conversationStore.updateFromResult(stream);
296
+ }
179
297
  const resolvedResult = yield* this.#buildAndResolve(stream, acc.finalOutput || undefined, acc.reasoningOutput || undefined, acc.emittedCommandIds, acc.latestUsage);
298
+ if (useChaining) {
299
+ this.inputSurgeGuard.recordSuccessfulInput(streamInput, { kind: inputSurgeKind });
300
+ }
301
+ else {
302
+ this.inputSurgeGuard.recordSuccessfulInput(this.conversationStore.getHistory(), {
303
+ kind: inputSurgeKind,
304
+ previousInput: streamInput,
305
+ });
306
+ }
180
307
  if (resolvedResult.type === 'approval_required') {
181
308
  this.logger.debug('Tool approval required', {
182
309
  eventType: 'approval.required',
@@ -238,8 +365,9 @@ export class ConversationSession {
238
365
  errorMessage: decision.message,
239
366
  });
240
367
  yield decision.retryEvent;
368
+ if (!this.#isCurrentGeneration(gen))
369
+ return;
241
370
  if (decision.hadStream && stream) {
242
- this.conversationStore.updateFromResult(stream);
243
371
  if (decision.shouldInjectErrorContext) {
244
372
  this.conversationStore.addErrorContext(decision.errorContextMessage);
245
373
  }
@@ -254,6 +382,9 @@ export class ConversationSession {
254
382
  type: 'error',
255
383
  message: error instanceof Error ? error.message : String(error),
256
384
  };
385
+ if (addedUserMessage && !stream && this.#isCurrentGeneration(gen)) {
386
+ this.conversationStore.removeLastUserMessage();
387
+ }
257
388
  this.logger.error('Conversation stream error', {
258
389
  eventType: 'stream.failed',
259
390
  category: 'stream',
@@ -271,6 +402,7 @@ export class ConversationSession {
271
402
  * Named as a string-literal because `continue` is a keyword.
272
403
  */
273
404
  async *['continue']({ answer, rejectionReason, }) {
405
+ const gen = this.generation;
274
406
  const plan = this.approvalFlow.prepareContinuation(answer, rejectionReason);
275
407
  if (!plan) {
276
408
  return;
@@ -296,8 +428,10 @@ export class ConversationSession {
296
428
  emittedInvalidToolCallPackets: this.emittedInvalidToolCallPackets,
297
429
  preserveExistingToolArgs: true,
298
430
  }, { logger: this.logger, sessionId: this.id });
299
- this.previousResponseId = stream.lastResponseId ?? null;
300
- this.conversationStore.updateFromResult(stream);
431
+ if (this.#isCurrentGeneration(gen)) {
432
+ this.previousResponseId = stream.lastResponseId ?? null;
433
+ this.conversationStore.updateFromResult(stream);
434
+ }
301
435
  // Merge previously emitted command IDs with newly emitted ones
302
436
  // This prevents duplicates when result.history contains commands from the initial stream
303
437
  const allEmittedIds = new Set([...previouslyEmittedIds, ...acc.emittedCommandIds]);
@@ -329,20 +463,27 @@ export class ConversationSession {
329
463
  }
330
464
  }
331
465
  async sendMessage(input, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, hallucinationRetryCount = 0, } = {}) {
332
- const result = await collectTerminalResult(this.run(input, { hallucinationRetryCount }), {
333
- onTextChunk,
334
- onReasoningChunk,
335
- onCommandMessage,
336
- onEvent,
337
- getRawInterruption: () => this.approvalFlow.getPendingInterruption(),
338
- onFinalEvent: (event) => {
339
- this.logger.debug('sendMessage received final event', {
340
- sessionId: this.id,
341
- hasUsage: Boolean(event.usage),
342
- usage: event.usage,
343
- });
344
- },
345
- });
466
+ getMethod(this.agentClient, 'setSubagentEventSink')?.call(this.agentClient, onEvent ?? null);
467
+ let result;
468
+ try {
469
+ result = await collectTerminalResult(this.run(input, { hallucinationRetryCount }), {
470
+ onTextChunk,
471
+ onReasoningChunk,
472
+ onCommandMessage,
473
+ onEvent,
474
+ getRawInterruption: () => this.approvalFlow.getPendingInterruption(),
475
+ onFinalEvent: (event) => {
476
+ this.logger.debug('sendMessage received final event', {
477
+ sessionId: this.id,
478
+ hasUsage: Boolean(event.usage),
479
+ usage: event.usage,
480
+ });
481
+ },
482
+ });
483
+ }
484
+ finally {
485
+ getMethod(this.agentClient, 'setSubagentEventSink')?.call(this.agentClient, null);
486
+ }
346
487
  if (result.type === 'response') {
347
488
  this.logger.debug('sendMessage returning response', {
348
489
  sessionId: this.id,
@@ -356,20 +497,27 @@ export class ConversationSession {
356
497
  if (!this.approvalFlow.getPending()) {
357
498
  return null;
358
499
  }
359
- const result = await collectTerminalResult(this['continue']({ answer, rejectionReason }), {
360
- onTextChunk,
361
- onReasoningChunk,
362
- onCommandMessage,
363
- onEvent,
364
- getRawInterruption: () => this.approvalFlow.getPendingInterruption(),
365
- onFinalEvent: (event) => {
366
- this.logger.debug('handleApprovalDecision received final event', {
367
- sessionId: this.id,
368
- hasUsage: Boolean(event.usage),
369
- usage: event.usage,
370
- });
371
- },
372
- });
500
+ getMethod(this.agentClient, 'setSubagentEventSink')?.call(this.agentClient, onEvent ?? null);
501
+ let result;
502
+ try {
503
+ result = await collectTerminalResult(this['continue']({ answer, rejectionReason }), {
504
+ onTextChunk,
505
+ onReasoningChunk,
506
+ onCommandMessage,
507
+ onEvent,
508
+ getRawInterruption: () => this.approvalFlow.getPendingInterruption(),
509
+ onFinalEvent: (event) => {
510
+ this.logger.debug('handleApprovalDecision received final event', {
511
+ sessionId: this.id,
512
+ hasUsage: Boolean(event.usage),
513
+ usage: event.usage,
514
+ });
515
+ },
516
+ });
517
+ }
518
+ finally {
519
+ getMethod(this.agentClient, 'setSubagentEventSink')?.call(this.agentClient, null);
520
+ }
373
521
  if (result.type === 'response') {
374
522
  this.logger.debug('handleApprovalDecision returning response', {
375
523
  sessionId: this.id,
@@ -399,17 +547,28 @@ export class ConversationSession {
399
547
  let finalText = '';
400
548
  let reasoningText = '';
401
549
  let finalUsage;
550
+ let continuationApprovalUsage;
402
551
  const commandMessages = [];
403
552
  let approvalRequiredResult;
404
553
  for await (const event of this['continue']({ answer: 'y' })) {
405
- yield event;
406
554
  if (event.type === 'approval_required') {
555
+ continuationApprovalUsage = event.usage;
556
+ // The continuation resumes the same live RunState, so its usage
557
+ // accumulator is already cumulative for the whole run (it includes the
558
+ // first, auto-approved turn). Prefer it directly; only fall back to the
559
+ // first turn's usage if the continuation didn't report any.
560
+ const mergedUsage = continuationApprovalUsage ?? usage;
561
+ const usagePatch = mergedUsage && Object.keys(mergedUsage).length > 0 ? { usage: mergedUsage } : {};
562
+ // collectTerminalResult returns on the first approval_required event, so
563
+ // attach the run-cumulative usage onto the event itself.
564
+ yield { ...event, ...usagePatch };
407
565
  approvalRequiredResult = {
408
566
  type: 'approval_required',
409
567
  approval: {
410
568
  ...event.approval,
411
569
  rawInterruption: this.approvalFlow.getPendingInterruption(),
412
570
  },
571
+ ...usagePatch,
413
572
  };
414
573
  }
415
574
  else if (event.type === 'final') {
@@ -419,17 +578,26 @@ export class ConversationSession {
419
578
  if (event.commandMessages) {
420
579
  commandMessages.push(...event.commandMessages);
421
580
  }
581
+ yield event;
582
+ }
583
+ else {
584
+ yield event;
422
585
  }
423
586
  }
424
587
  if (approvalRequiredResult) {
425
588
  return approvalRequiredResult;
426
589
  }
590
+ // finalUsage comes from the continuation, which reused the same live
591
+ // RunState and therefore already accumulated the first (auto-approved)
592
+ // turn. Prefer it; fall back to the first turn's usage only when the
593
+ // continuation produced none.
594
+ const combinedUsage = finalUsage ?? usage;
427
595
  return {
428
596
  type: 'response',
429
597
  commandMessages,
430
598
  finalText: finalText || 'Done.',
431
599
  ...(reasoningText ? { reasoningText } : {}),
432
- ...(finalUsage ? { usage: finalUsage } : {}),
600
+ ...(combinedUsage && Object.keys(combinedUsage).length > 0 ? { usage: combinedUsage } : {}),
433
601
  };
434
602
  }
435
603
  }
@@ -1 +1 @@
1
- {"version":3,"file":"conversation-session.js","sourceRoot":"","sources":["../../source/services/conversation-session.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"conversation-session.js","sourceRoot":"","sources":["../../source/services/conversation-session.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import type { AgentInputItem } from '@openai/agents';
2
2
  import { type UserTurn } from '../types/user-turn.js';
3
+ export declare const SHELL_CONTEXT_PREFIX = "[Previous Shell Session]";
3
4
  /**
4
5
  * ConversationStore maintains the canonical conversation history for the app.
5
6
  *
@@ -12,7 +13,20 @@ export declare class ConversationStore {
12
13
  #private;
13
14
  addUserTurn(input: string | UserTurn): void;
14
15
  addUserMessage(text: string): void;
16
+ /**
17
+ * Add an item that was deserialized from a saved conversation.
18
+ * Unlike addUserMessage, this preserves the original item structure
19
+ * (role, type, content, callId, etc.) so that tool calls, function results,
20
+ * and other non-user items are restored faithfully.
21
+ */
22
+ addImportedItem(item: AgentInputItem): void;
15
23
  addShellContext(historyText: string): void;
24
+ /**
25
+ * Append a mode-change notice as a persisted system message at the tail of
26
+ * the history. Append-only (never spliced mid-history) so the previously
27
+ * cached prefix stays byte-identical and only grows.
28
+ */
29
+ addModeNotice(text: string): void;
16
30
  updateFromResult(result: any): void;
17
31
  getHistory(): AgentInputItem[];
18
32
  getLastUserMessage(): string;
@@ -22,6 +36,34 @@ export declare class ConversationStore {
22
36
  * Used when retrying after a tool hallucination error.
23
37
  */
24
38
  removeLastUserMessage(): void;
39
+ /**
40
+ * Returns a list of genuine user turns (excluding shell context items),
41
+ * each with their index in the history array, text, and image count.
42
+ */
43
+ listUserTurns(): {
44
+ index: number;
45
+ text: string;
46
+ imageCount: number;
47
+ }[];
48
+ /**
49
+ * Remove the last genuine user turn and everything after it.
50
+ * Skips shell-context items (identified by SHELL_CONTEXT_PREFIX).
51
+ * Used by /undo to rewind to before the last user turn.
52
+ * Returns { text, imageCount } of the removed item, or null if none found.
53
+ */
54
+ removeLastUserTurn(): {
55
+ text: string;
56
+ imageCount: number;
57
+ } | null;
58
+ /**
59
+ * Removes the last n genuine user turns (and everything after the earliest
60
+ * one's anchor). Returns info from the earliest removed turn, or null if
61
+ * no genuine turns found.
62
+ */
63
+ removeNLastUserTurns(n: number): {
64
+ text: string;
65
+ imageCount: number;
66
+ } | null;
25
67
  /**
26
68
  * Inject an error-context message into the history so the model receives
27
69
  * explicit feedback about what went wrong (e.g. a JSON parsing failure).
@@ -1 +1 @@
1
- {"version":3,"file":"conversation-store.d.ts","sourceRoot":"","sources":["../../source/services/conversation-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAqB,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEzE;;;;;;;GAOG;AACH,qBAAa,iBAAiB;;IAG5B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IA8B3C,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAUlC,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAa1C,gBAAgB,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI;IAyCnC,UAAU,IAAI,cAAc,EAAE;IAI9B,kBAAkB,IAAI,MAAM;IAyB5B,KAAK,IAAI,IAAI;IAIb;;;OAGG;IACH,qBAAqB,IAAI,IAAI;IAW7B;;;;OAIG;IACH,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;CAiI5C"}
1
+ {"version":3,"file":"conversation-store.d.ts","sourceRoot":"","sources":["../../source/services/conversation-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAqB,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEzE,eAAO,MAAM,oBAAoB,6BAA6B,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,iBAAiB;;IAG5B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IA8B3C,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAUlC;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAI3C,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAa1C;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAajC,gBAAgB,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI;IAyCnC,UAAU,IAAI,cAAc,EAAE;IAI9B,kBAAkB,IAAI,MAAM;IAyB5B,KAAK,IAAI,IAAI;IAIb;;;OAGG;IACH,qBAAqB,IAAI,IAAI;IA4B7B;;;OAGG;IACH,aAAa,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE;IActE;;;;;OAKG;IACH,kBAAkB,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAuBjE;;;;OAIG;IACH,oBAAoB,CAAC,CAAC,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IA0C5E;;;;OAIG;IACH,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;CAsL5C"}