@qduc/term2 0.6.0 → 0.7.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 (546) hide show
  1. package/dist/agent.d.ts +9 -0
  2. package/dist/agent.d.ts.map +1 -1
  3. package/dist/agent.js +139 -68
  4. package/dist/agent.js.map +1 -1
  5. package/dist/agent.test.js +179 -16
  6. package/dist/agent.test.js.map +1 -1
  7. package/dist/app.d.ts +16 -3
  8. package/dist/app.d.ts.map +1 -1
  9. package/dist/app.js +186 -23
  10. package/dist/app.js.map +1 -1
  11. package/dist/app.large-uncached-warning.test.d.ts +2 -0
  12. package/dist/app.large-uncached-warning.test.d.ts.map +1 -0
  13. package/dist/app.large-uncached-warning.test.js +15 -0
  14. package/dist/app.large-uncached-warning.test.js.map +1 -0
  15. package/dist/app.startup-banner.test.js +3 -19
  16. package/dist/app.startup-banner.test.js.map +1 -1
  17. package/dist/cli.js +170 -71
  18. package/dist/cli.js.map +1 -1
  19. package/dist/components/Banner.d.ts.map +1 -1
  20. package/dist/components/Banner.js +35 -17
  21. package/dist/components/Banner.js.map +1 -1
  22. package/dist/components/BottomArea.d.ts +7 -1
  23. package/dist/components/BottomArea.d.ts.map +1 -1
  24. package/dist/components/BottomArea.js +8 -6
  25. package/dist/components/BottomArea.js.map +1 -1
  26. package/dist/components/BottomArea.test.js +14 -1
  27. package/dist/components/BottomArea.test.js.map +1 -1
  28. package/dist/components/CommandMessage.d.ts.map +1 -1
  29. package/dist/components/CommandMessage.js +31 -1
  30. package/dist/components/CommandMessage.js.map +1 -1
  31. package/dist/components/CommandMessage.test.js +150 -31
  32. package/dist/components/CommandMessage.test.js.map +1 -1
  33. package/dist/components/Common/MenuContainer.d.ts +20 -0
  34. package/dist/components/Common/MenuContainer.d.ts.map +1 -0
  35. package/dist/components/Common/MenuContainer.js +52 -0
  36. package/dist/components/Common/MenuContainer.js.map +1 -0
  37. package/dist/components/Common/ScrollableTabBar.d.ts +26 -0
  38. package/dist/components/Common/ScrollableTabBar.d.ts.map +1 -0
  39. package/dist/components/Common/ScrollableTabBar.js +26 -0
  40. package/dist/components/Common/ScrollableTabBar.js.map +1 -0
  41. package/dist/components/Common/compute-visible-tabs.d.ts +16 -0
  42. package/dist/components/Common/compute-visible-tabs.d.ts.map +1 -0
  43. package/dist/components/Common/compute-visible-tabs.js +53 -0
  44. package/dist/components/Common/compute-visible-tabs.js.map +1 -0
  45. package/dist/components/Common/compute-visible-tabs.test.d.ts +2 -0
  46. package/dist/components/Common/compute-visible-tabs.test.d.ts.map +1 -0
  47. package/dist/components/Common/compute-visible-tabs.test.js +97 -0
  48. package/dist/components/Common/compute-visible-tabs.test.js.map +1 -0
  49. package/dist/components/HandoffConfirmationPrompt.d.ts +9 -0
  50. package/dist/components/HandoffConfirmationPrompt.d.ts.map +1 -0
  51. package/dist/components/HandoffConfirmationPrompt.js +38 -0
  52. package/dist/components/HandoffConfirmationPrompt.js.map +1 -0
  53. package/dist/components/HandoffConfirmationPrompt.test.d.ts +2 -0
  54. package/dist/components/HandoffConfirmationPrompt.test.d.ts.map +1 -0
  55. package/dist/components/HandoffConfirmationPrompt.test.js +12 -0
  56. package/dist/components/HandoffConfirmationPrompt.test.js.map +1 -0
  57. package/dist/components/Input/PopupManager.d.ts +5 -1
  58. package/dist/components/Input/PopupManager.d.ts.map +1 -1
  59. package/dist/components/Input/PopupManager.js +2 -2
  60. package/dist/components/Input/PopupManager.js.map +1 -1
  61. package/dist/components/Input/popup-key-navigation.js +2 -2
  62. package/dist/components/Input/popup-key-navigation.js.map +1 -1
  63. package/dist/components/Input/popup-key-navigation.test.js +5 -3
  64. package/dist/components/Input/popup-key-navigation.test.js.map +1 -1
  65. package/dist/components/Input/popup-props.d.ts.map +1 -1
  66. package/dist/components/Input/popup-props.js +4 -0
  67. package/dist/components/Input/popup-props.js.map +1 -1
  68. package/dist/components/Input/popup-props.test.d.ts +2 -0
  69. package/dist/components/Input/popup-props.test.d.ts.map +1 -0
  70. package/dist/components/Input/popup-props.test.js +70 -0
  71. package/dist/components/Input/popup-props.test.js.map +1 -0
  72. package/dist/components/InputBox.d.ts +0 -1
  73. package/dist/components/InputBox.d.ts.map +1 -1
  74. package/dist/components/InputBox.js +66 -14
  75. package/dist/components/InputBox.js.map +1 -1
  76. package/dist/components/InputBox.test.js +192 -12
  77. package/dist/components/InputBox.test.js.map +1 -1
  78. package/dist/components/MessageList.d.ts +1 -0
  79. package/dist/components/MessageList.d.ts.map +1 -1
  80. package/dist/components/MessageList.js.map +1 -1
  81. package/dist/components/ModelSelectionMenu.d.ts.map +1 -1
  82. package/dist/components/ModelSelectionMenu.debug.test.d.ts +2 -0
  83. package/dist/components/ModelSelectionMenu.debug.test.d.ts.map +1 -0
  84. package/dist/components/ModelSelectionMenu.debug.test.js.map +1 -0
  85. package/dist/components/ModelSelectionMenu.js +29 -125
  86. package/dist/components/ModelSelectionMenu.js.map +1 -1
  87. package/dist/components/ModelSelectionMenu.test.js +9 -5
  88. package/dist/components/ModelSelectionMenu.test.js.map +1 -1
  89. package/dist/components/PathSelectionMenu.d.ts.map +1 -1
  90. package/dist/components/PathSelectionMenu.js +15 -55
  91. package/dist/components/PathSelectionMenu.js.map +1 -1
  92. package/dist/components/SettingsSelectionMenu.d.ts +4 -1
  93. package/dist/components/SettingsSelectionMenu.d.ts.map +1 -1
  94. package/dist/components/SettingsSelectionMenu.js +48 -104
  95. package/dist/components/SettingsSelectionMenu.js.map +1 -1
  96. package/dist/components/SettingsSelectionMenu.scroll.test.js +140 -0
  97. package/dist/components/SettingsSelectionMenu.scroll.test.js.map +1 -1
  98. package/dist/components/SettingsSelectionMenu.test.js +38 -5
  99. package/dist/components/SettingsSelectionMenu.test.js.map +1 -1
  100. package/dist/components/SettingsValueSelectionMenu.d.ts.map +1 -1
  101. package/dist/components/SettingsValueSelectionMenu.js +24 -51
  102. package/dist/components/SettingsValueSelectionMenu.js.map +1 -1
  103. package/dist/components/SlashCommandMenu.d.ts +1 -0
  104. package/dist/components/SlashCommandMenu.d.ts.map +1 -1
  105. package/dist/components/SlashCommandMenu.js +11 -14
  106. package/dist/components/SlashCommandMenu.js.map +1 -1
  107. package/dist/components/StatusBar.d.ts +2 -0
  108. package/dist/components/StatusBar.d.ts.map +1 -1
  109. package/dist/components/StatusBar.js +35 -2
  110. package/dist/components/StatusBar.js.map +1 -1
  111. package/dist/components/StatusBar.test.js +32 -0
  112. package/dist/components/StatusBar.test.js.map +1 -1
  113. package/dist/components/UndoSelectionMenu.d.ts.map +1 -1
  114. package/dist/components/UndoSelectionMenu.js +6 -33
  115. package/dist/components/UndoSelectionMenu.js.map +1 -1
  116. package/dist/context/InputContext.stability.test.js +9 -7
  117. package/dist/context/InputContext.stability.test.js.map +1 -1
  118. package/dist/env-setup.js +1 -0
  119. package/dist/env-setup.js.map +1 -1
  120. package/dist/hooks/use-app-commands.d.ts +22 -2
  121. package/dist/hooks/use-app-commands.d.ts.map +1 -1
  122. package/dist/hooks/use-app-commands.js +43 -3
  123. package/dist/hooks/use-app-commands.js.map +1 -1
  124. package/dist/hooks/use-app-commands.test.js +135 -1
  125. package/dist/hooks/use-app-commands.test.js.map +1 -1
  126. package/dist/hooks/use-conversation.clear.test.d.ts +2 -0
  127. package/dist/hooks/use-conversation.clear.test.d.ts.map +1 -0
  128. package/dist/hooks/use-conversation.clear.test.js +54 -0
  129. package/dist/hooks/use-conversation.clear.test.js.map +1 -0
  130. package/dist/hooks/use-conversation.d.ts +25 -2
  131. package/dist/hooks/use-conversation.d.ts.map +1 -1
  132. package/dist/hooks/use-conversation.js +90 -12
  133. package/dist/hooks/use-conversation.js.map +1 -1
  134. package/dist/hooks/use-escape-key.d.ts +8 -1
  135. package/dist/hooks/use-escape-key.d.ts.map +1 -1
  136. package/dist/hooks/use-escape-key.js +15 -4
  137. package/dist/hooks/use-escape-key.js.map +1 -1
  138. package/dist/hooks/use-escape-key.test.js +135 -28
  139. package/dist/hooks/use-escape-key.test.js.map +1 -1
  140. package/dist/hooks/use-input-history.test.js +14 -8
  141. package/dist/hooks/use-input-history.test.js.map +1 -1
  142. package/dist/hooks/use-mode-handlers.d.ts +12 -1
  143. package/dist/hooks/use-mode-handlers.d.ts.map +1 -1
  144. package/dist/hooks/use-mode-handlers.js +31 -1
  145. package/dist/hooks/use-mode-handlers.js.map +1 -1
  146. package/dist/hooks/use-model-selection.d.ts +6 -1
  147. package/dist/hooks/use-model-selection.d.ts.map +1 -1
  148. package/dist/hooks/use-model-selection.js +50 -8
  149. package/dist/hooks/use-model-selection.js.map +1 -1
  150. package/dist/hooks/use-model-selection.test.js +306 -50
  151. package/dist/hooks/use-model-selection.test.js.map +1 -1
  152. package/dist/hooks/use-path-completion.d.ts +4 -0
  153. package/dist/hooks/use-path-completion.d.ts.map +1 -1
  154. package/dist/hooks/use-path-completion.js +23 -17
  155. package/dist/hooks/use-path-completion.js.map +1 -1
  156. package/dist/hooks/use-runtime-settings.d.ts.map +1 -1
  157. package/dist/hooks/use-runtime-settings.js +7 -2
  158. package/dist/hooks/use-runtime-settings.js.map +1 -1
  159. package/dist/hooks/use-runtime-settings.test.d.ts +2 -0
  160. package/dist/hooks/use-runtime-settings.test.d.ts.map +1 -0
  161. package/dist/hooks/use-runtime-settings.test.js +45 -0
  162. package/dist/hooks/use-runtime-settings.test.js.map +1 -0
  163. package/dist/hooks/use-selection.d.ts +6 -2
  164. package/dist/hooks/use-selection.d.ts.map +1 -1
  165. package/dist/hooks/use-selection.js +53 -16
  166. package/dist/hooks/use-selection.js.map +1 -1
  167. package/dist/hooks/use-selection.test.d.ts +2 -0
  168. package/dist/hooks/use-selection.test.d.ts.map +1 -0
  169. package/dist/hooks/use-selection.test.js +132 -0
  170. package/dist/hooks/use-selection.test.js.map +1 -0
  171. package/dist/hooks/use-settings-completion.d.ts +19 -0
  172. package/dist/hooks/use-settings-completion.d.ts.map +1 -1
  173. package/dist/hooks/use-settings-completion.js +106 -18
  174. package/dist/hooks/use-settings-completion.js.map +1 -1
  175. package/dist/hooks/use-settings-completion.scroll.test.js +68 -29
  176. package/dist/hooks/use-settings-completion.scroll.test.js.map +1 -1
  177. package/dist/hooks/use-settings-completion.test.js +36 -1
  178. package/dist/hooks/use-settings-completion.test.js.map +1 -1
  179. package/dist/hooks/use-settings-value-completion.d.ts +7 -1
  180. package/dist/hooks/use-settings-value-completion.d.ts.map +1 -1
  181. package/dist/hooks/use-settings-value-completion.js +18 -7
  182. package/dist/hooks/use-settings-value-completion.js.map +1 -1
  183. package/dist/hooks/use-slash-commands.d.ts +5 -0
  184. package/dist/hooks/use-slash-commands.d.ts.map +1 -1
  185. package/dist/hooks/use-slash-commands.js +22 -2
  186. package/dist/hooks/use-slash-commands.js.map +1 -1
  187. package/dist/hooks/use-trigger-detection.test.js +9 -6
  188. package/dist/hooks/use-trigger-detection.test.js.map +1 -1
  189. package/dist/hooks/use-undo-selection.d.ts +4 -0
  190. package/dist/hooks/use-undo-selection.d.ts.map +1 -1
  191. package/dist/hooks/use-undo-selection.js +18 -1
  192. package/dist/hooks/use-undo-selection.js.map +1 -1
  193. package/dist/inspect_zod.d.ts +2 -0
  194. package/dist/inspect_zod.d.ts.map +1 -0
  195. package/dist/inspect_zod.js +16 -0
  196. package/dist/inspect_zod.js.map +1 -0
  197. package/dist/lib/openai-agent-client.chat.test.js +40 -0
  198. package/dist/lib/openai-agent-client.chat.test.js.map +1 -1
  199. package/dist/lib/openai-agent-client.d.ts +18 -4
  200. package/dist/lib/openai-agent-client.d.ts.map +1 -1
  201. package/dist/lib/openai-agent-client.js +228 -32
  202. package/dist/lib/openai-agent-client.js.map +1 -1
  203. package/dist/lib/openai-agent-client.public-methods.test.js +193 -0
  204. package/dist/lib/openai-agent-client.public-methods.test.js.map +1 -1
  205. package/dist/lib/openai-agent-client.test.js +71 -1
  206. package/dist/lib/openai-agent-client.test.js.map +1 -1
  207. package/dist/lib/retry-executor.js +45 -7
  208. package/dist/lib/retry-executor.js.map +1 -1
  209. package/dist/lib/retry-executor.test.js +63 -0
  210. package/dist/lib/retry-executor.test.js.map +1 -1
  211. package/dist/lib/tool-invoke.d.ts +3 -2
  212. package/dist/lib/tool-invoke.d.ts.map +1 -1
  213. package/dist/lib/tool-invoke.js +213 -10
  214. package/dist/lib/tool-invoke.js.map +1 -1
  215. package/dist/lib/tool-invoke.test.js +103 -0
  216. package/dist/lib/tool-invoke.test.js.map +1 -1
  217. package/dist/non-interactive.d.ts +1 -0
  218. package/dist/non-interactive.d.ts.map +1 -1
  219. package/dist/non-interactive.js +3 -1
  220. package/dist/non-interactive.js.map +1 -1
  221. package/dist/non-interactive.test.js +8 -1
  222. package/dist/non-interactive.test.js.map +1 -1
  223. package/dist/prompts/codex.md +105 -97
  224. package/dist/prompts/fragments/gpt-5.3-codex.md +7 -0
  225. package/dist/prompts/fragments/gpt-5.4-small.md +6 -0
  226. package/dist/prompts/fragments/gpt-5.4.md +7 -0
  227. package/dist/prompts/fragments/gpt-5.5.md +7 -0
  228. package/dist/prompts/gpt-5-modern.md +96 -54
  229. package/dist/prompts/plan-mode-info.md +14 -3
  230. package/dist/prompts/prompt-constructor.d.ts +19 -0
  231. package/dist/prompts/prompt-constructor.d.ts.map +1 -0
  232. package/dist/prompts/prompt-constructor.js +53 -0
  233. package/dist/prompts/prompt-constructor.js.map +1 -0
  234. package/dist/prompts/prompt-constructor.test.d.ts +2 -0
  235. package/dist/prompts/prompt-constructor.test.d.ts.map +1 -0
  236. package/dist/prompts/prompt-constructor.test.js +99 -0
  237. package/dist/prompts/prompt-constructor.test.js.map +1 -0
  238. package/dist/prompts/prompt-constructor.test.ts +112 -0
  239. package/dist/prompts/prompt-constructor.ts +91 -0
  240. package/dist/prompts/prompt-profiles.d.ts +17 -0
  241. package/dist/prompts/prompt-profiles.d.ts.map +1 -0
  242. package/dist/prompts/prompt-profiles.js +61 -0
  243. package/dist/prompts/prompt-profiles.js.map +1 -0
  244. package/dist/prompts/prompt-profiles.ts +77 -0
  245. package/dist/prompts/prompt-selector.d.ts.map +1 -1
  246. package/dist/prompts/prompt-selector.js +3 -21
  247. package/dist/prompts/prompt-selector.js.map +1 -1
  248. package/dist/prompts/prompt-selector.ts +3 -25
  249. package/dist/prompts/reasoning-efficiency.d.ts.map +1 -1
  250. package/dist/prompts/reasoning-efficiency.js +2 -0
  251. package/dist/prompts/reasoning-efficiency.js.map +1 -1
  252. package/dist/prompts/reasoning-efficiency.test.d.ts +2 -0
  253. package/dist/prompts/reasoning-efficiency.test.d.ts.map +1 -0
  254. package/dist/prompts/reasoning-efficiency.test.js +11 -0
  255. package/dist/prompts/reasoning-efficiency.test.js.map +1 -0
  256. package/dist/prompts/reasoning-efficiency.test.ts +12 -0
  257. package/dist/prompts/reasoning-efficiency.ts +2 -0
  258. package/dist/prompts/search-via-shell.test.js +19 -16
  259. package/dist/prompts/search-via-shell.test.js.map +1 -1
  260. package/dist/prompts/search-via-shell.test.ts +20 -16
  261. package/dist/prompts/subagent-delegation.test.js +12 -10
  262. package/dist/prompts/subagent-delegation.test.js.map +1 -1
  263. package/dist/prompts/subagent-delegation.test.ts +13 -10
  264. package/dist/prompts/worktree-hygiene.md +9 -0
  265. package/dist/providers/ai-sdk-logging-fetch.d.ts +1 -1
  266. package/dist/providers/ai-sdk-logging-fetch.d.ts.map +1 -1
  267. package/dist/providers/ai-sdk-logging-fetch.js +145 -47
  268. package/dist/providers/ai-sdk-logging-fetch.js.map +1 -1
  269. package/dist/providers/ai-sdk-logging-fetch.test.js +202 -5
  270. package/dist/providers/ai-sdk-logging-fetch.test.js.map +1 -1
  271. package/dist/providers/codex-responses-model.d.ts +20 -0
  272. package/dist/providers/codex-responses-model.d.ts.map +1 -0
  273. package/dist/providers/codex-responses-model.js +170 -0
  274. package/dist/providers/codex-responses-model.js.map +1 -0
  275. package/dist/providers/codex-responses-model.test.d.ts +2 -0
  276. package/dist/providers/codex-responses-model.test.d.ts.map +1 -0
  277. package/dist/providers/codex-responses-model.test.js +240 -0
  278. package/dist/providers/codex-responses-model.test.js.map +1 -0
  279. package/dist/providers/codex.provider.d.ts +29 -0
  280. package/dist/providers/codex.provider.d.ts.map +1 -0
  281. package/dist/providers/codex.provider.js +486 -0
  282. package/dist/providers/codex.provider.js.map +1 -0
  283. package/dist/providers/codex.provider.test.d.ts +2 -0
  284. package/dist/providers/codex.provider.test.d.ts.map +1 -0
  285. package/dist/providers/codex.provider.test.js +634 -0
  286. package/dist/providers/codex.provider.test.js.map +1 -0
  287. package/dist/providers/custom-provider-adapter.test.js +56 -0
  288. package/dist/providers/custom-provider-adapter.test.js.map +1 -1
  289. package/dist/providers/fallback-responses-model.d.ts +20 -0
  290. package/dist/providers/fallback-responses-model.d.ts.map +1 -0
  291. package/dist/providers/fallback-responses-model.js +277 -0
  292. package/dist/providers/fallback-responses-model.js.map +1 -0
  293. package/dist/providers/fallback-responses-model.test.d.ts +2 -0
  294. package/dist/providers/fallback-responses-model.test.d.ts.map +1 -0
  295. package/dist/providers/fallback-responses-model.test.js +279 -0
  296. package/dist/providers/fallback-responses-model.test.js.map +1 -0
  297. package/dist/providers/fetch/compose.d.ts +7 -0
  298. package/dist/providers/fetch/compose.d.ts.map +1 -0
  299. package/dist/providers/fetch/compose.js +20 -0
  300. package/dist/providers/fetch/compose.js.map +1 -0
  301. package/dist/providers/fetch/composer.d.ts +13 -0
  302. package/dist/providers/fetch/composer.d.ts.map +1 -0
  303. package/dist/providers/fetch/composer.js +15 -0
  304. package/dist/providers/fetch/composer.js.map +1 -0
  305. package/dist/providers/fetch/composer.test.d.ts +2 -0
  306. package/dist/providers/fetch/composer.test.d.ts.map +1 -0
  307. package/dist/providers/fetch/composer.test.js +448 -0
  308. package/dist/providers/fetch/composer.test.js.map +1 -0
  309. package/dist/providers/fetch/logging-middleware.d.ts +16 -0
  310. package/dist/providers/fetch/logging-middleware.d.ts.map +1 -0
  311. package/dist/providers/fetch/logging-middleware.js +214 -0
  312. package/dist/providers/fetch/logging-middleware.js.map +1 -0
  313. package/dist/providers/index.d.ts +1 -0
  314. package/dist/providers/index.d.ts.map +1 -1
  315. package/dist/providers/index.js +1 -0
  316. package/dist/providers/index.js.map +1 -1
  317. package/dist/providers/llama-cpp.provider.d.ts +3 -0
  318. package/dist/providers/llama-cpp.provider.d.ts.map +1 -0
  319. package/dist/providers/llama-cpp.provider.js +34 -0
  320. package/dist/providers/llama-cpp.provider.js.map +1 -0
  321. package/dist/providers/openai-compatible-middleware.d.ts +7 -0
  322. package/dist/providers/openai-compatible-middleware.d.ts.map +1 -0
  323. package/dist/providers/openai-compatible-middleware.js +133 -0
  324. package/dist/providers/openai-compatible-middleware.js.map +1 -0
  325. package/dist/providers/openai-compatible-models.d.ts +6 -0
  326. package/dist/providers/openai-compatible-models.d.ts.map +1 -0
  327. package/dist/providers/openai-compatible-models.js +17 -0
  328. package/dist/providers/openai-compatible-models.js.map +1 -0
  329. package/dist/providers/openai-compatible-response-normalizer.d.ts +7 -0
  330. package/dist/providers/openai-compatible-response-normalizer.d.ts.map +1 -0
  331. package/dist/providers/openai-compatible-response-normalizer.js +58 -0
  332. package/dist/providers/openai-compatible-response-normalizer.js.map +1 -0
  333. package/dist/providers/openai-compatible.provider.d.ts +4 -1
  334. package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
  335. package/dist/providers/openai-compatible.provider.js +68 -324
  336. package/dist/providers/openai-compatible.provider.js.map +1 -1
  337. package/dist/providers/openai-compatible.provider.test.js +106 -1
  338. package/dist/providers/openai-compatible.provider.test.js.map +1 -1
  339. package/dist/providers/openai.provider.js +53 -1
  340. package/dist/providers/openai.provider.js.map +1 -1
  341. package/dist/providers/opencode.provider.d.ts +19 -0
  342. package/dist/providers/opencode.provider.d.ts.map +1 -0
  343. package/dist/providers/opencode.provider.js +45 -0
  344. package/dist/providers/opencode.provider.js.map +1 -0
  345. package/dist/providers/openrouter.provider.d.ts +2 -1
  346. package/dist/providers/openrouter.provider.d.ts.map +1 -1
  347. package/dist/providers/openrouter.provider.js +39 -22
  348. package/dist/providers/openrouter.provider.js.map +1 -1
  349. package/dist/providers/openrouter.provider.request-preprocessing.test.d.ts +2 -0
  350. package/dist/providers/openrouter.provider.request-preprocessing.test.d.ts.map +1 -0
  351. package/dist/providers/openrouter.provider.request-preprocessing.test.js +51 -0
  352. package/dist/providers/openrouter.provider.request-preprocessing.test.js.map +1 -0
  353. package/dist/providers/registry.d.ts +1 -0
  354. package/dist/providers/registry.d.ts.map +1 -1
  355. package/dist/providers/registry.js.map +1 -1
  356. package/dist/providers/registry.test.js +11 -2
  357. package/dist/providers/registry.test.js.map +1 -1
  358. package/dist/scripts/eval-auto-approval/dataset.d.ts +3 -3
  359. package/dist/services/approval-flow-coordinator.d.ts.map +1 -1
  360. package/dist/services/approval-flow-coordinator.js +17 -1
  361. package/dist/services/approval-flow-coordinator.js.map +1 -1
  362. package/dist/services/approval-flow-coordinator.test.js +22 -0
  363. package/dist/services/approval-flow-coordinator.test.js.map +1 -1
  364. package/dist/services/command-message-streaming.d.ts.map +1 -1
  365. package/dist/services/command-message-streaming.js +0 -3
  366. package/dist/services/command-message-streaming.js.map +1 -1
  367. package/dist/services/command-message-streaming.test.js +4 -2
  368. package/dist/services/command-message-streaming.test.js.map +1 -1
  369. package/dist/services/conversation-clear-save.test.d.ts +2 -0
  370. package/dist/services/conversation-clear-save.test.d.ts.map +1 -0
  371. package/dist/services/conversation-clear-save.test.js +57 -0
  372. package/dist/services/conversation-clear-save.test.js.map +1 -0
  373. package/dist/services/conversation-events.d.ts +44 -1
  374. package/dist/services/conversation-events.d.ts.map +1 -1
  375. package/dist/services/conversation-history-repair.d.ts +25 -0
  376. package/dist/services/conversation-history-repair.d.ts.map +1 -0
  377. package/dist/services/conversation-history-repair.js +227 -0
  378. package/dist/services/conversation-history-repair.js.map +1 -0
  379. package/dist/services/conversation-history-repair.test.d.ts +2 -0
  380. package/dist/services/conversation-history-repair.test.d.ts.map +1 -0
  381. package/dist/services/conversation-history-repair.test.js +76 -0
  382. package/dist/services/conversation-history-repair.test.js.map +1 -0
  383. package/dist/services/conversation-integration.test.js +3 -1
  384. package/dist/services/conversation-integration.test.js.map +1 -1
  385. package/dist/services/conversation-log-events.d.ts +107 -0
  386. package/dist/services/conversation-log-events.d.ts.map +1 -0
  387. package/dist/services/conversation-log-events.js +12 -0
  388. package/dist/services/conversation-log-events.js.map +1 -0
  389. package/dist/services/conversation-log-writer.d.ts +40 -0
  390. package/dist/services/conversation-log-writer.d.ts.map +1 -0
  391. package/dist/services/conversation-log-writer.js +264 -0
  392. package/dist/services/conversation-log-writer.js.map +1 -0
  393. package/dist/services/conversation-persistence-types.d.ts +14 -0
  394. package/dist/services/conversation-persistence-types.d.ts.map +1 -0
  395. package/dist/services/conversation-persistence-types.js +2 -0
  396. package/dist/services/conversation-persistence-types.js.map +1 -0
  397. package/dist/services/conversation-persistence.d.ts +40 -38
  398. package/dist/services/conversation-persistence.d.ts.map +1 -1
  399. package/dist/services/conversation-persistence.js +312 -71
  400. package/dist/services/conversation-persistence.js.map +1 -1
  401. package/dist/services/conversation-persistence.test.js +485 -355
  402. package/dist/services/conversation-persistence.test.js.map +1 -1
  403. package/dist/services/conversation-replay.d.ts +26 -0
  404. package/dist/services/conversation-replay.d.ts.map +1 -0
  405. package/dist/services/conversation-replay.js +252 -0
  406. package/dist/services/conversation-replay.js.map +1 -0
  407. package/dist/services/conversation-replay.test.d.ts +2 -0
  408. package/dist/services/conversation-replay.test.d.ts.map +1 -0
  409. package/dist/services/conversation-replay.test.js +153 -0
  410. package/dist/services/conversation-replay.test.js.map +1 -0
  411. package/dist/services/conversation-result-builder.d.ts.map +1 -1
  412. package/dist/services/conversation-result-builder.js +8 -2
  413. package/dist/services/conversation-result-builder.js.map +1 -1
  414. package/dist/services/conversation-result-builder.test.js +53 -0
  415. package/dist/services/conversation-result-builder.test.js.map +1 -1
  416. package/dist/services/conversation-retry-policy.d.ts +24 -0
  417. package/dist/services/conversation-retry-policy.d.ts.map +1 -1
  418. package/dist/services/conversation-retry-policy.js +68 -4
  419. package/dist/services/conversation-retry-policy.js.map +1 -1
  420. package/dist/services/conversation-retry-policy.test.js +99 -2
  421. package/dist/services/conversation-retry-policy.test.js.map +1 -1
  422. package/dist/services/conversation-service.d.ts +12 -2
  423. package/dist/services/conversation-service.d.ts.map +1 -1
  424. package/dist/services/conversation-service.js +29 -3
  425. package/dist/services/conversation-service.js.map +1 -1
  426. package/dist/services/conversation-session.auto-approval.test.js +2 -1
  427. package/dist/services/conversation-session.auto-approval.test.js.map +1 -1
  428. package/dist/services/conversation-session.d.ts +17 -1
  429. package/dist/services/conversation-session.d.ts.map +1 -1
  430. package/dist/services/conversation-session.js +580 -134
  431. package/dist/services/conversation-session.js.map +1 -1
  432. package/dist/services/conversation-store.d.ts.map +1 -1
  433. package/dist/services/conversation-store.js +6 -5
  434. package/dist/services/conversation-store.js.map +1 -1
  435. package/dist/services/conversation-store.test.js +34 -0
  436. package/dist/services/conversation-store.test.js.map +1 -1
  437. package/dist/services/input-surge-guard.d.ts +4 -0
  438. package/dist/services/input-surge-guard.d.ts.map +1 -1
  439. package/dist/services/input-surge-guard.js +2 -2
  440. package/dist/services/input-surge-guard.js.map +1 -1
  441. package/dist/services/input-surge-guard.test.js +15 -1
  442. package/dist/services/input-surge-guard.test.js.map +1 -1
  443. package/dist/services/large-uncached-input-guard.d.ts +35 -0
  444. package/dist/services/large-uncached-input-guard.d.ts.map +1 -0
  445. package/dist/services/large-uncached-input-guard.js +127 -0
  446. package/dist/services/large-uncached-input-guard.js.map +1 -0
  447. package/dist/services/large-uncached-input-guard.test.d.ts +2 -0
  448. package/dist/services/large-uncached-input-guard.test.d.ts.map +1 -0
  449. package/dist/services/large-uncached-input-guard.test.js +160 -0
  450. package/dist/services/large-uncached-input-guard.test.js.map +1 -0
  451. package/dist/services/logging-contract.d.ts +1 -1
  452. package/dist/services/logging-service.d.ts +4 -0
  453. package/dist/services/logging-service.d.ts.map +1 -1
  454. package/dist/services/logging-service.js +91 -33
  455. package/dist/services/logging-service.js.map +1 -1
  456. package/dist/services/model-service.d.ts +2 -0
  457. package/dist/services/model-service.d.ts.map +1 -1
  458. package/dist/services/model-service.js +7 -1
  459. package/dist/services/model-service.js.map +1 -1
  460. package/dist/services/provider-traffic.d.ts +87 -0
  461. package/dist/services/provider-traffic.d.ts.map +1 -0
  462. package/dist/services/provider-traffic.js +603 -0
  463. package/dist/services/provider-traffic.js.map +1 -0
  464. package/dist/services/provider-traffic.test.d.ts +2 -0
  465. package/dist/services/provider-traffic.test.d.ts.map +1 -0
  466. package/dist/services/provider-traffic.test.js +475 -0
  467. package/dist/services/provider-traffic.test.js.map +1 -0
  468. package/dist/services/rtk-service.d.ts.map +1 -1
  469. package/dist/services/rtk-service.js +1 -2
  470. package/dist/services/rtk-service.js.map +1 -1
  471. package/dist/services/service-interfaces.d.ts +16 -0
  472. package/dist/services/service-interfaces.d.ts.map +1 -1
  473. package/dist/services/settings-schema.d.ts +36 -28
  474. package/dist/services/settings-schema.d.ts.map +1 -1
  475. package/dist/services/settings-schema.js +7 -2
  476. package/dist/services/settings-schema.js.map +1 -1
  477. package/dist/services/settings-service.js +6 -6
  478. package/dist/services/settings-service.js.map +1 -1
  479. package/dist/services/settings-sources.d.ts.map +1 -1
  480. package/dist/services/settings-sources.js +1 -0
  481. package/dist/services/settings-sources.js.map +1 -1
  482. package/dist/services/shell-auto-approval-evaluator.d.ts +1 -1
  483. package/dist/services/shell-auto-approval-evaluator.d.ts.map +1 -1
  484. package/dist/services/shell-auto-approval-evaluator.js +284 -81
  485. package/dist/services/shell-auto-approval-evaluator.js.map +1 -1
  486. package/dist/services/shell-auto-approval-evaluator.test.js +215 -15
  487. package/dist/services/shell-auto-approval-evaluator.test.js.map +1 -1
  488. package/dist/services/stream-event-processor.d.ts +4 -0
  489. package/dist/services/stream-event-processor.d.ts.map +1 -1
  490. package/dist/services/stream-event-processor.js +78 -39
  491. package/dist/services/stream-event-processor.js.map +1 -1
  492. package/dist/services/stream-event-processor.test.js +71 -0
  493. package/dist/services/stream-event-processor.test.js.map +1 -1
  494. package/dist/services/subagents/subagent-manager.d.ts +2 -0
  495. package/dist/services/subagents/subagent-manager.d.ts.map +1 -1
  496. package/dist/services/subagents/subagent-manager.js +124 -21
  497. package/dist/services/subagents/subagent-manager.js.map +1 -1
  498. package/dist/services/subagents/subagent-manager.test.js +453 -0
  499. package/dist/services/subagents/subagent-manager.test.js.map +1 -1
  500. package/dist/services/terminal-result-collector.d.ts.map +1 -1
  501. package/dist/services/terminal-result-collector.js +6 -1
  502. package/dist/services/terminal-result-collector.js.map +1 -1
  503. package/dist/services/tool-call-arguments.d.ts +20 -0
  504. package/dist/services/tool-call-arguments.d.ts.map +1 -0
  505. package/dist/services/tool-call-arguments.js +49 -0
  506. package/dist/services/tool-call-arguments.js.map +1 -0
  507. package/dist/services/tool-execution-ledger.d.ts +35 -0
  508. package/dist/services/tool-execution-ledger.d.ts.map +1 -0
  509. package/dist/services/tool-execution-ledger.js +204 -0
  510. package/dist/services/tool-execution-ledger.js.map +1 -0
  511. package/dist/services/tool-execution-ledger.test.d.ts +2 -0
  512. package/dist/services/tool-execution-ledger.test.d.ts.map +1 -0
  513. package/dist/services/tool-execution-ledger.test.js +96 -0
  514. package/dist/services/tool-execution-ledger.test.js.map +1 -0
  515. package/dist/tools/apply-patch.d.ts +8 -0
  516. package/dist/tools/apply-patch.d.ts.map +1 -1
  517. package/dist/tools/apply-patch.js +157 -2
  518. package/dist/tools/apply-patch.js.map +1 -1
  519. package/dist/tools/apply-patch.test.js +81 -0
  520. package/dist/tools/apply-patch.test.js.map +1 -1
  521. package/dist/tools/search-replace.d.ts.map +1 -1
  522. package/dist/tools/search-replace.js +92 -140
  523. package/dist/tools/search-replace.js.map +1 -1
  524. package/dist/utils/command-safety/path-analysis.d.ts.map +1 -1
  525. package/dist/utils/command-safety/path-analysis.js +143 -35
  526. package/dist/utils/command-safety/path-analysis.js.map +1 -1
  527. package/dist/utils/conversation-event-handler.d.ts.map +1 -1
  528. package/dist/utils/conversation-event-handler.js +52 -4
  529. package/dist/utils/conversation-event-handler.js.map +1 -1
  530. package/dist/utils/conversation-event-handler.test.js +175 -0
  531. package/dist/utils/conversation-event-handler.test.js.map +1 -1
  532. package/dist/utils/error-helpers.d.ts +1 -0
  533. package/dist/utils/error-helpers.d.ts.map +1 -1
  534. package/dist/utils/error-helpers.js +61 -0
  535. package/dist/utils/error-helpers.js.map +1 -1
  536. package/dist/utils/error-helpers.test.js +13 -1
  537. package/dist/utils/error-helpers.test.js.map +1 -1
  538. package/dist/utils/ink-render-options.d.ts +1 -1
  539. package/dist/utils/ink-render-options.d.ts.map +1 -1
  540. package/dist/utils/ink-render-options.js +1 -1
  541. package/dist/utils/ink-render-options.js.map +1 -1
  542. package/dist/utils/streaming-session-factory.d.ts +2 -0
  543. package/dist/utils/streaming-session-factory.d.ts.map +1 -1
  544. package/dist/utils/streaming-session-factory.js +4 -0
  545. package/dist/utils/streaming-session-factory.js.map +1 -1
  546. package/package.json +2 -2
@@ -10,12 +10,12 @@ const createMockLogger = () => ({
10
10
  getCorrelationId: () => 'trace-shell-auto-evaluator-test',
11
11
  clearCorrelationId: () => { },
12
12
  });
13
- const createMockSettings = (mode = 'advisory') => ({
13
+ const createMockSettings = (mode = 'advisory', provider = 'test-auto-provider', model = 'test-auto-model') => ({
14
14
  get: (key) => {
15
15
  const map = {
16
16
  'shell.autoApproveMode': mode,
17
- 'agent.autoApproveModel': 'test-auto-model',
18
- 'agent.autoApproveProvider': 'test-auto-provider',
17
+ 'agent.autoApproveModel': model,
18
+ 'agent.autoApproveProvider': provider,
19
19
  };
20
20
  return map[key];
21
21
  },
@@ -91,6 +91,189 @@ test('evaluates non-RED commands via chat and parses valid JSON results', async
91
91
  t.is(chatCalls[0].options.provider, 'test-auto-provider');
92
92
  t.is(chatCalls[0].options.reasoningEffort, 'none');
93
93
  });
94
+ test('uses structured chatJson when structured support is unknown', async (t) => {
95
+ const chatJsonCalls = [];
96
+ let chatCalls = 0;
97
+ const advisories = await evaluateShellAutoApprovalAdvisories({
98
+ commands: [{ id: 'call-safe', command: 'pwd' }],
99
+ history: [{ role: 'user', type: 'message', content: 'inspect location' }],
100
+ settingsService: createMockSettings('advisory', 'structured-unknown-provider'),
101
+ agentClient: {
102
+ chatJson: async (prompt, options) => {
103
+ chatJsonCalls.push({ prompt, options });
104
+ return { results: [{ reasoning: 'Read-only current directory inspection is safe.', approved: true }] };
105
+ },
106
+ chat: async () => {
107
+ chatCalls++;
108
+ return '{}';
109
+ },
110
+ },
111
+ logger: createMockLogger(),
112
+ });
113
+ t.deepEqual(advisories.get('call-safe'), {
114
+ model: 'test-auto-model',
115
+ reasoning: 'Read-only current directory inspection is safe.',
116
+ approved: true,
117
+ source: 'llm',
118
+ });
119
+ t.is(chatJsonCalls.length, 1);
120
+ t.is(chatCalls, 0);
121
+ t.is(chatJsonCalls[0].options.provider, 'structured-unknown-provider');
122
+ });
123
+ test.serial('caches structured support after a successful structured request', async (t) => {
124
+ const provider = 'structured-supported-provider';
125
+ let chatJsonCalls = 0;
126
+ for (const id of ['call-1', 'call-2']) {
127
+ const advisories = await evaluateShellAutoApprovalAdvisories({
128
+ commands: [{ id, command: 'pwd' }],
129
+ history: [{ role: 'user', type: 'message', content: 'inspect location' }],
130
+ settingsService: createMockSettings('advisory', provider),
131
+ agentClient: {
132
+ chatJson: async () => {
133
+ chatJsonCalls++;
134
+ return { results: [{ reasoning: 'Read-only current directory inspection is safe.', approved: true }] };
135
+ },
136
+ chat: async () => {
137
+ throw new Error('chat fallback should not run');
138
+ },
139
+ },
140
+ logger: createMockLogger(),
141
+ });
142
+ t.is(advisories.get(id)?.approved, true);
143
+ }
144
+ t.is(chatJsonCalls, 2);
145
+ });
146
+ test.serial('falls back to chat and caches unsupported after structured output unsupported error', async (t) => {
147
+ const provider = 'structured-unsupported-provider';
148
+ let chatJsonCalls = 0;
149
+ let chatCalls = 0;
150
+ const first = await evaluateShellAutoApprovalAdvisories({
151
+ commands: [{ id: 'call-1', command: 'pwd' }],
152
+ history: [{ role: 'user', type: 'message', content: 'inspect location' }],
153
+ settingsService: createMockSettings('advisory', provider),
154
+ agentClient: {
155
+ chatJson: async () => {
156
+ chatJsonCalls++;
157
+ throw new Error('response_format json_schema is not supported by this model');
158
+ },
159
+ chat: async () => {
160
+ chatCalls++;
161
+ return JSON.stringify({
162
+ results: [{ reasoning: 'Read-only current directory inspection is safe.', approved: true }],
163
+ });
164
+ },
165
+ },
166
+ logger: createMockLogger(),
167
+ });
168
+ const second = await evaluateShellAutoApprovalAdvisories({
169
+ commands: [{ id: 'call-2', command: 'pwd' }],
170
+ history: [{ role: 'user', type: 'message', content: 'inspect location' }],
171
+ settingsService: createMockSettings('advisory', provider),
172
+ agentClient: {
173
+ chatJson: async () => {
174
+ chatJsonCalls++;
175
+ throw new Error('chatJson should be skipped while unsupported is cached');
176
+ },
177
+ chat: async () => {
178
+ chatCalls++;
179
+ return JSON.stringify({
180
+ results: [{ reasoning: 'Read-only current directory inspection is safe.', approved: true }],
181
+ });
182
+ },
183
+ },
184
+ logger: createMockLogger(),
185
+ });
186
+ t.is(first.get('call-1')?.approved, true);
187
+ t.is(second.get('call-2')?.approved, true);
188
+ t.is(chatJsonCalls, 1);
189
+ t.is(chatCalls, 2);
190
+ });
191
+ test.serial('does not cache unsupported for malformed structured output', async (t) => {
192
+ const provider = 'structured-malformed-provider';
193
+ let chatJsonCalls = 0;
194
+ const first = await evaluateShellAutoApprovalAdvisories({
195
+ commands: [{ id: 'call-1', command: 'pwd' }],
196
+ history: [{ role: 'user', type: 'message', content: 'inspect location' }],
197
+ settingsService: createMockSettings('advisory', provider),
198
+ agentClient: {
199
+ chatJson: async () => {
200
+ chatJsonCalls++;
201
+ return { results: [{ reasoning: 'Missing approved field.' }] };
202
+ },
203
+ chat: async () => {
204
+ throw new Error('prompt fallback should not run for accepted structured malformed output');
205
+ },
206
+ },
207
+ logger: createMockLogger(),
208
+ });
209
+ const second = await evaluateShellAutoApprovalAdvisories({
210
+ commands: [{ id: 'call-2', command: 'pwd' }],
211
+ history: [{ role: 'user', type: 'message', content: 'inspect location' }],
212
+ settingsService: createMockSettings('advisory', provider),
213
+ agentClient: {
214
+ chatJson: async () => {
215
+ chatJsonCalls++;
216
+ return { results: [{ reasoning: 'Read-only current directory inspection is safe.', approved: true }] };
217
+ },
218
+ chat: async () => {
219
+ throw new Error('prompt fallback should not run');
220
+ },
221
+ },
222
+ logger: createMockLogger(),
223
+ });
224
+ t.is(first.get('call-1')?.approved, false);
225
+ t.is(second.get('call-2')?.approved, true);
226
+ t.is(chatJsonCalls, 3);
227
+ });
228
+ test('retries once when structured output is missing approved', async (t) => {
229
+ let chatJsonCalls = 0;
230
+ const advisories = await evaluateShellAutoApprovalAdvisories({
231
+ commands: [{ id: 'call-safe', command: 'pwd' }],
232
+ history: [{ role: 'user', type: 'message', content: 'inspect location' }],
233
+ settingsService: createMockSettings('advisory', 'structured-repair-provider'),
234
+ agentClient: {
235
+ chatJson: async (prompt) => {
236
+ chatJsonCalls++;
237
+ if (chatJsonCalls === 1) {
238
+ return { results: [{ reasoning: 'Missing approved field.' }] };
239
+ }
240
+ t.true(prompt.includes('The previous shell auto-approval response was invalid.'));
241
+ return { results: [{ reasoning: 'Read-only current directory inspection is safe.', approved: true }] };
242
+ },
243
+ chat: async () => {
244
+ throw new Error('prompt fallback should not run');
245
+ },
246
+ },
247
+ logger: createMockLogger(),
248
+ });
249
+ t.is(advisories.get('call-safe')?.approved, true);
250
+ t.is(chatJsonCalls, 2);
251
+ });
252
+ test('denies all non-RED commands when original plus repair are invalid', async (t) => {
253
+ const advisories = await evaluateShellAutoApprovalAdvisories({
254
+ commands: [
255
+ { id: 'call-safe-1', command: 'ls source' },
256
+ { id: 'call-safe-2', command: 'pwd' },
257
+ ],
258
+ history: [{ role: 'user', type: 'message', content: 'inspect repository' }],
259
+ settingsService: createMockSettings('advisory', 'invalid-repair-provider'),
260
+ agentClient: {
261
+ chatJson: async () => ({ results: [{ reasoning: 'Only one result.', approved: true }] }),
262
+ chat: async () => {
263
+ throw new Error('prompt fallback should not run');
264
+ },
265
+ },
266
+ logger: createMockLogger(),
267
+ });
268
+ for (const id of ['call-safe-1', 'call-safe-2']) {
269
+ t.deepEqual(advisories.get(id), {
270
+ model: 'test-auto-model',
271
+ reasoning: 'LLM did not provide a valid ordered evaluation for this command.',
272
+ approved: false,
273
+ source: 'llm',
274
+ });
275
+ }
276
+ });
94
277
  test('instructions distinguish auto-approval from user-requested destructive intent', async (t) => {
95
278
  const chatCalls = [];
96
279
  await evaluateShellAutoApprovalAdvisories({
@@ -159,7 +342,7 @@ test('prompt contains only user and assistant text from bounded history context'
159
342
  t.false(chatCalls[0].prompt.includes('reasoning_details'));
160
343
  t.true(chatCalls[0].prompt.length < 6_000);
161
344
  });
162
- test('falls back to deny advisory for commands missing from malformed chat response', async (t) => {
345
+ test('falls back to deny advisory for all commands when chat response shape is malformed', async (t) => {
163
346
  const advisories = await evaluateShellAutoApprovalAdvisories({
164
347
  commands: [
165
348
  { id: 'call-safe-1', command: 'ls source' },
@@ -172,18 +355,35 @@ test('falls back to deny advisory for commands missing from malformed chat respo
172
355
  },
173
356
  logger: createMockLogger(),
174
357
  });
175
- t.deepEqual(advisories.get('call-safe-1'), {
176
- model: 'test-auto-model',
177
- reasoning: 'Looks safe',
178
- approved: true,
179
- source: 'llm',
180
- });
181
- t.deepEqual(advisories.get('call-safe-2'), {
182
- model: 'test-auto-model',
183
- reasoning: 'LLM did not provide a valid ordered evaluation for this command.',
184
- approved: false,
185
- source: 'llm',
358
+ for (const id of ['call-safe-1', 'call-safe-2']) {
359
+ t.deepEqual(advisories.get(id), {
360
+ model: 'test-auto-model',
361
+ reasoning: 'LLM did not provide a valid ordered evaluation for this command.',
362
+ approved: false,
363
+ source: 'llm',
364
+ });
365
+ }
366
+ });
367
+ test('keeps RED commands system-rejected even if the LLM approves them', async (t) => {
368
+ const advisories = await evaluateShellAutoApprovalAdvisories({
369
+ commands: [{ id: 'call-red', command: 'rm -rf /' }],
370
+ history: [{ role: 'user', type: 'message', content: 'clean the machine' }],
371
+ settingsService: createMockSettings('advisory', 'red-structured-provider'),
372
+ agentClient: {
373
+ chatJson: async () => ({
374
+ results: [{ reasoning: 'The model incorrectly approved this destructive command.', approved: true }],
375
+ }),
376
+ chat: async () => {
377
+ throw new Error('prompt fallback should not run');
378
+ },
379
+ },
380
+ logger: createMockLogger(),
186
381
  });
382
+ const redAdvisory = advisories.get('call-red');
383
+ t.is(redAdvisory?.approved, false);
384
+ t.is(redAdvisory?.source, 'system');
385
+ t.regex(redAdvisory?.reasoning ?? '', /Blocked by safety heuristics \(RED\):/);
386
+ t.regex(redAdvisory?.reasoning ?? '', /Model advisory: The model incorrectly approved/);
187
387
  });
188
388
  test('rethrows upstream errors when throwOnError is enabled', async (t) => {
189
389
  const upstreamError = Object.assign(new Error('Rate limit exceeded'), {
@@ -1 +1 @@
1
- {"version":3,"file":"shell-auto-approval-evaluator.test.js","sourceRoot":"","sources":["../../source/services/shell-auto-approval-evaluator.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shell-auto-approval-evaluator.test.js","sourceRoot":"","sources":["../../source/services/shell-auto-approval-evaluator.test.ts"],"names":[],"mappings":"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"}
@@ -18,6 +18,10 @@ export interface StreamProcessorOptions {
18
18
  emittedInvalidToolCallPackets: Set<string>;
19
19
  /** When false, args map is cleared at start (initial run); when true, preserved (continue/abort). */
20
20
  preserveExistingToolArgs: boolean;
21
+ /** Optional durable recovery hook for provider function_call items. */
22
+ onFunctionCallItem?: (item: unknown) => void;
23
+ /** Optional durable recovery hook for provider function_call_result/output items. */
24
+ onFunctionResultItem?: (item: unknown) => void;
21
25
  }
22
26
  export interface StreamProcessorDeps {
23
27
  logger: ILoggingService;
@@ -1 +1 @@
1
- {"version":3,"file":"stream-event-processor.d.ts","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAoD,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAKjH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,uBAAuB,QAAO,iBAOzC,CAAC;AAEH,MAAM,WAAW,sBAAsB;IACrC,wFAAwF;IACxF,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,+EAA+E;IAC/E,6BAA6B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,qGAAqG;IACrG,wBAAwB,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAuB,mBAAmB,CACxC,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,sBAAsB,EAC5B,IAAI,EAAE,mBAAmB,GACxB,cAAc,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAoO/C"}
1
+ {"version":3,"file":"stream-event-processor.d.ts","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAA4C,MAAM,0BAA0B,CAAC;AAC5G,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAoD,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAMjH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA4BrD,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,uBAAuB,QAAO,iBAOzC,CAAC;AAEH,MAAM,WAAW,sBAAsB;IACrC,wFAAwF;IACxF,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,+EAA+E;IAC/E,6BAA6B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,qGAAqG;IACrG,wBAAwB,EAAE,OAAO,CAAC;IAClC,uEAAuE;IACvE,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,qFAAqF;IACrF,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAuB,mBAAmB,CACxC,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,sBAAsB,EAC5B,IAAI,EAAE,mBAAmB,GACxB,cAAc,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CA4P/C"}
@@ -3,6 +3,29 @@ import { extractReasoningDelta, extractTextDelta } from './stream-event-parsing.
3
3
  import { captureToolCallArguments, emitCommandMessagesFromItems } from './command-message-streaming.js';
4
4
  import { createInvalidToolCallDiagnostic } from './logging-contract.js';
5
5
  import { asRecord, getString } from './interruption-info.js';
6
+ import { parseToolCallArguments } from './tool-call-arguments.js';
7
+ function normalizeCodexRateLimitWindow(obj) {
8
+ if (!obj || typeof obj !== 'object') {
9
+ return undefined;
10
+ }
11
+ const rec = obj;
12
+ const used_percent = typeof rec.used_percent === 'number' ? rec.used_percent : undefined;
13
+ const window_minutes = typeof rec.window_minutes === 'number' ? rec.window_minutes : undefined;
14
+ const reset_after_seconds = typeof rec.reset_after_seconds === 'number' ? rec.reset_after_seconds : undefined;
15
+ const reset_at = typeof rec.reset_at === 'number' ? rec.reset_at : undefined;
16
+ if (used_percent !== undefined &&
17
+ window_minutes !== undefined &&
18
+ reset_after_seconds !== undefined &&
19
+ reset_at !== undefined) {
20
+ return {
21
+ used_percent,
22
+ window_minutes,
23
+ reset_after_seconds,
24
+ reset_at,
25
+ };
26
+ }
27
+ return undefined;
28
+ }
6
29
  export const createStreamAccumulator = () => ({
7
30
  finalOutput: '',
8
31
  reasoningOutput: '',
@@ -27,7 +50,7 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
27
50
  return { type: 'text_delta', delta, fullText: acc.finalOutput };
28
51
  };
29
52
  const emitReasoning = (delta) => {
30
- if (!delta || delta.replaceAll('\n', '') === '')
53
+ if (!delta)
31
54
  return null;
32
55
  acc.reasoningOutput += delta;
33
56
  acc.reasoningDeltaCount++;
@@ -52,6 +75,35 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
52
75
  });
53
76
  yield { type: 'usage_update', usage: mergedUsage };
54
77
  }
78
+ // Intercept Codex rate-limits frames (e.g. codex.rate_limits) from the
79
+ // upstream provider stream so the UI can display them in the status bar.
80
+ const rawRateLimit = getString(event, 'type') === 'codex.rate_limits'
81
+ ? event
82
+ : getString(eventData, 'type') === 'codex.rate_limits'
83
+ ? eventData
84
+ : getString(modelEvent, 'type') === 'codex.rate_limits'
85
+ ? modelEvent
86
+ : undefined;
87
+ if (rawRateLimit) {
88
+ const rl = asRecord(rawRateLimit);
89
+ const rlData = asRecord(rl?.rate_limits) ?? rl;
90
+ const primary = normalizeCodexRateLimitWindow(rlData?.primary);
91
+ const secondary = normalizeCodexRateLimitWindow(rlData?.secondary);
92
+ if (primary !== undefined || secondary !== undefined) {
93
+ const rateLimits = {
94
+ allowed: Boolean(rlData?.allowed),
95
+ limit_reached: Boolean(rlData?.limit_reached),
96
+ ...(primary !== undefined ? { primary } : {}),
97
+ ...(secondary !== undefined ? { secondary } : {}),
98
+ };
99
+ logger.debug('Codex rate limits extracted from stream event', {
100
+ sessionId,
101
+ source: 'codex_rate_limits',
102
+ rateLimits,
103
+ });
104
+ yield { type: 'codex_rate_limits', rateLimits };
105
+ }
106
+ }
55
107
  const delta1 = extractTextDelta(rawEvent);
56
108
  if (delta1) {
57
109
  const e = emitText(delta1);
@@ -82,6 +134,7 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
82
134
  captureToolCallArguments(eventItem, toolCallArgumentsById);
83
135
  const rawItem = asRecord(eventItemRecord?.rawItem) ?? eventItemRecord;
84
136
  if (getString(rawItem, 'type') === 'function_call') {
137
+ opts.onFunctionCallItem?.(eventItem);
85
138
  const callId = getString(rawItem, 'callId') ??
86
139
  getString(rawItem, 'call_id') ??
87
140
  getString(rawItem, 'tool_call_id') ??
@@ -90,48 +143,26 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
90
143
  if (callId) {
91
144
  const toolName = getString(rawItem, 'name') ?? getString(eventItemRecord, 'name');
92
145
  const args = rawItem?.arguments ?? rawItem?.args ?? eventItemRecord?.arguments ?? eventItemRecord?.args;
93
- // Providers sometimes surface arguments as a JSON string.
94
- // Normalize so downstream UI can reliably render parameters.
95
- const normalizedArgs = (() => {
96
- if (typeof args !== 'string')
97
- return args;
98
- const trimmed = args.trim();
99
- if (!trimmed)
100
- return args;
101
- try {
102
- return JSON.parse(trimmed);
103
- }
104
- catch {
105
- if ((trimmed.startsWith('{') || trimmed.startsWith('[')) &&
106
- !emittedInvalidToolCallPackets.has(String(callId))) {
107
- emittedInvalidToolCallPackets.add(String(callId));
108
- const diagnostic = createInvalidToolCallDiagnostic({
109
- toolName: toolName ?? 'unknown',
110
- toolCallId: String(callId),
111
- rawPayload: trimmed,
112
- normalizedToolCall: {
113
- toolName: toolName ?? 'unknown',
114
- toolCallId: String(callId),
115
- arguments: args,
116
- },
117
- validationErrors: ['arguments must be valid JSON'],
118
- traceId: logger.getCorrelationId() ?? 'trace-unknown',
119
- retryContext: { sessionId },
120
- });
121
- logger.error('Invalid tool call argument payload', {
122
- ...diagnostic,
123
- sessionId,
124
- messageId: String(callId),
125
- });
126
- }
127
- return args;
128
- }
129
- })();
146
+ const parseResult = parseToolCallArguments(args, {
147
+ callId: String(callId),
148
+ toolName: toolName ?? 'unknown',
149
+ sessionId,
150
+ traceId: logger.getCorrelationId() ?? 'trace-unknown',
151
+ });
152
+ if (parseResult.invalidJsonDiagnostic && !emittedInvalidToolCallPackets.has(String(callId))) {
153
+ emittedInvalidToolCallPackets.add(String(callId));
154
+ const diagnostic = createInvalidToolCallDiagnostic(parseResult.invalidJsonDiagnostic);
155
+ logger.error('Invalid tool call argument payload', {
156
+ ...diagnostic,
157
+ sessionId,
158
+ messageId: String(callId),
159
+ });
160
+ }
130
161
  yield {
131
162
  type: 'tool_started',
132
163
  toolCallId: callId,
133
164
  toolName: toolName ?? 'unknown',
134
- arguments: normalizedArgs,
165
+ arguments: parseResult.arguments,
135
166
  };
136
167
  logger.debug('Tool execution started', {
137
168
  eventType: 'tool_call.execution_started',
@@ -145,6 +176,13 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
145
176
  });
146
177
  }
147
178
  }
179
+ const rawItemType = getString(rawItem, 'type');
180
+ if (rawItemType === 'function_call_result' ||
181
+ rawItemType === 'function_call_output' ||
182
+ rawItemType === 'function_call_output_result' ||
183
+ rawItemType === 'tool_call_output_item') {
184
+ opts.onFunctionResultItem?.(eventItem);
185
+ }
148
186
  for (const e of maybeEmitCommandMessagesFromItems([eventItem])) {
149
187
  yield e;
150
188
  }
@@ -152,6 +190,7 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
152
190
  else if (eventType === 'tool_call_output_item' ||
153
191
  getString(asRecord(event?.rawItem), 'type') === 'function_call_output') {
154
192
  captureToolCallArguments(rawEvent, toolCallArgumentsById);
193
+ opts.onFunctionResultItem?.(rawEvent);
155
194
  for (const e of maybeEmitCommandMessagesFromItems([rawEvent])) {
156
195
  yield e;
157
196
  }
@@ -1 +1 @@
1
- {"version":3,"file":"stream-event-processor.js","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stream-event-processor.js","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,sBAAsB,EAAwB,MAAM,yBAAyB,CAAC;AACjH,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,EAAE,wBAAwB,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AACxG,OAAO,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,SAAS,6BAA6B,CAAC,GAAY;IACjD,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,GAAG,GAAG,GAA8B,CAAC;IAC3C,MAAM,YAAY,GAAG,OAAO,GAAG,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;IACzF,MAAM,cAAc,GAAG,OAAO,GAAG,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/F,MAAM,mBAAmB,GAAG,OAAO,GAAG,CAAC,mBAAmB,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9G,MAAM,QAAQ,GAAG,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAE7E,IACE,YAAY,KAAK,SAAS;QAC1B,cAAc,KAAK,SAAS;QAC5B,mBAAmB,KAAK,SAAS;QACjC,QAAQ,KAAK,SAAS,EACtB,CAAC;QACD,OAAO;YACL,YAAY;YACZ,cAAc;YACd,mBAAmB;YACnB,QAAQ;SACT,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAWD,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAsB,EAAE,CAAC,CAAC;IAC/D,WAAW,EAAE,EAAE;IACf,eAAe,EAAE,EAAE;IACnB,iBAAiB,EAAE,IAAI,GAAG,EAAU;IACpC,WAAW,EAAE,SAAS;IACtB,cAAc,EAAE,CAAC;IACjB,mBAAmB,EAAE,CAAC;CACvB,CAAC,CAAC;AAoBH,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,mBAAmB,CACxC,MAAmB,EACnB,GAAsB,EACtB,IAA4B,EAC5B,IAAyB;IAEzB,MAAM,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,wBAAwB,EAAE,GAAG,IAAI,CAAC;IAChG,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAEnC,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC9B,qBAAqB,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,GAAG,CAAC,cAAc,GAAG,CAAC,CAAC;IACvB,GAAG,CAAC,mBAAmB,GAAG,CAAC,CAAC;IAE5B,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,EAAE;QACjC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,GAAG,CAAC,WAAW,IAAI,KAAK,CAAC;QACzB,GAAG,CAAC,cAAc,EAAE,CAAC;QACrB,OAAO,EAAE,IAAI,EAAE,YAAqB,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC;IAC3E,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE;QACtC,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,GAAG,CAAC,eAAe,IAAI,KAAK,CAAC;QAC7B,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAC1B,OAAO,EAAE,IAAI,EAAE,iBAA0B,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,eAAe,EAAE,CAAC;IACpF,CAAC,CAAC;IAEF,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,MAAM,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACjC,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE3C,2DAA2D;QAC3D,gFAAgF;QAChF,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,SAAS,CAAC,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;QAC5F,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,WAAW,GAAG,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC;YAChE,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;YAC9B,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;gBAChD,SAAS;gBACT,MAAM,EAAE,cAAc;gBACtB,SAAS,EAAE,SAAS,IAAI,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,SAAS;gBACjE,KAAK,EAAE,WAAW;aACnB,CAAC,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;QACrD,CAAC;QAED,uEAAuE;QACvE,yEAAyE;QACzE,MAAM,YAAY,GAChB,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,mBAAmB;YAC9C,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,mBAAmB;gBACtD,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,mBAAmB;oBACvD,CAAC,CAAC,UAAU;oBACZ,CAAC,CAAC,SAAS,CAAC;QAEhB,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,EAAE,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;YAClC,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;YAC/C,MAAM,OAAO,GAAG,6BAA6B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC/D,MAAM,SAAS,GAAG,6BAA6B,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAEnE,IAAI,OAAO,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBACrD,MAAM,UAAU,GAAuB;oBACrC,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;oBACjC,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC;oBAC7C,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC7C,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAClD,CAAC;gBACF,MAAM,CAAC,KAAK,CAAC,+CAA+C,EAAE;oBAC5D,SAAS;oBACT,MAAM,EAAE,mBAAmB;oBAC3B,UAAU;iBACX,CAAC,CAAC;gBACH,MAAM,EAAE,IAAI,EAAE,mBAA4B,EAAE,UAAU,EAAE,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC3B,IAAI,CAAC;gBAAE,MAAM,CAAC,CAAC;QACjB,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,MAAM,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAC3C,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC3B,IAAI,CAAC;oBAAE,MAAM,CAAC,CAAC;YACjB,CAAC;QACH,CAAC;QAED,MAAM,cAAc,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,CAAC,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC;YACxC,IAAI,CAAC;gBAAE,MAAM,CAAC,CAAC;QACjB,CAAC;QAED,MAAM,iCAAiC,GAAG,CAAC,KAAgB,EAAE,EAAE,CAC7D,4BAA4B,CAAC,KAAK,EAAE;YAClC,qBAAqB;YACrB,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;QAEL,IAAI,SAAS,KAAK,uBAAuB,EAAE,CAAC;YAC1C,MAAM,SAAS,GAAG,KAAK,EAAE,IAAI,CAAC;YAC9B,MAAM,eAAe,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC5C,wBAAwB,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;YAE3D,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,eAAe,CAAC;YACtE,IAAI,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,eAAe,EAAE,CAAC;gBACnD,IAAI,CAAC,kBAAkB,EAAE,CAAC,SAAS,CAAC,CAAC;gBACrC,MAAM,MAAM,GACV,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC;oBAC5B,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC;oBAC7B,SAAS,CAAC,OAAO,EAAE,cAAc,CAAC;oBAClC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;oBAChC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC3B,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;oBAClF,MAAM,IAAI,GAAG,OAAO,EAAE,SAAS,IAAI,OAAO,EAAE,IAAI,IAAI,eAAe,EAAE,SAAS,IAAI,eAAe,EAAE,IAAI,CAAC;oBAExG,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,EAAE;wBAC/C,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;wBACtB,QAAQ,EAAE,QAAQ,IAAI,SAAS;wBAC/B,SAAS;wBACT,OAAO,EAAE,MAAM,CAAC,gBAAgB,EAAE,IAAI,eAAe;qBACtD,CAAC,CAAC;oBAEH,IAAI,WAAW,CAAC,qBAAqB,IAAI,CAAC,6BAA6B,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;wBAC5F,6BAA6B,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;wBAClD,MAAM,UAAU,GAAG,+BAA+B,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;wBACtF,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE;4BACjD,GAAG,UAAU;4BACb,SAAS;4BACT,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC;yBAC1B,CAAC,CAAC;oBACL,CAAC;oBAED,MAAM;wBACJ,IAAI,EAAE,cAAuB;wBAC7B,UAAU,EAAE,MAAM;wBAClB,QAAQ,EAAE,QAAQ,IAAI,SAAS;wBAC/B,SAAS,EAAE,WAAW,CAAC,SAAS;qBACjC,CAAC;oBAEF,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE;wBACrC,SAAS,EAAE,6BAA6B;wBACxC,QAAQ,EAAE,MAAM;wBAChB,KAAK,EAAE,WAAW;wBAClB,SAAS;wBACT,OAAO,EAAE,MAAM,CAAC,gBAAgB,EAAE;wBAClC,QAAQ,EAAE,QAAQ,IAAI,SAAS;wBAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC;wBAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC;qBAC1B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC/C,IACE,WAAW,KAAK,sBAAsB;gBACtC,WAAW,KAAK,sBAAsB;gBACtC,WAAW,KAAK,6BAA6B;gBAC7C,WAAW,KAAK,uBAAuB,EACvC,CAAC;gBACD,IAAI,CAAC,oBAAoB,EAAE,CAAC,SAAS,CAAC,CAAC;YACzC,CAAC;YAED,KAAK,MAAM,CAAC,IAAI,iCAAiC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;gBAC/D,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;aAAM,IACL,SAAS,KAAK,uBAAuB;YACrC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,KAAK,sBAAsB,EACtE,CAAC;YACD,wBAAwB,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;YAC1D,IAAI,CAAC,oBAAoB,EAAE,CAAC,QAAQ,CAAC,CAAC;YACtC,KAAK,MAAM,CAAC,IAAI,iCAAiC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;gBAC9D,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC;IAC/C,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC5D,UAAU,CAAC,IAAI,GAAG,YAAY,CAAC;QAC/B,MAAM,UAAU,CAAC;IACnB,CAAC;IACD,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IACpF,IAAI,qBAAkD,CAAC;IACvD,KAAK,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAClD,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAChD,IAAI,SAAS,EAAE,CAAC;YACd,qBAAqB,GAAG,SAAS,CAAC;YAClC,MAAM;QACR,CAAC;IACH,CAAC;IAED,iFAAiF;IACjF,2EAA2E;IAC3E,gFAAgF;IAChF,0EAA0E;IAC1E,gFAAgF;IAChF,2EAA2E;IAC3E,MAAM,aAAa,GAAG,sBAAsB,CAAE,MAA0C,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAExG,MAAM,UAAU,GAAG,aAAa,IAAI,YAAY,CAAC,eAAe,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,IAAI,qBAAqB,CAAC;IACnH,IAAI,UAAU,EAAE,CAAC;QACf,4EAA4E;QAC5E,yEAAyE;QACzE,GAAG,CAAC,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI,UAAU,CAAC;QACrG,MAAM,WAAW,GAAG,aAAa;YAC/B,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC;gBAC/B,CAAC,CAAC,kBAAkB;gBACpB,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC;oBACtB,CAAC,CAAC,eAAe;oBACjB,CAAC,CAAC,sBAAsB,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE;YACrD,SAAS;YACT,MAAM,EAAE,kBAAkB;YAC1B,WAAW;YACX,KAAK,EAAE,GAAG,CAAC,WAAW;SACvB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,qBAAqB,GACzB,eAAe,IAAI,OAAO,eAAe,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC;YACvF,CAAC,CAAE,eAA2C;YAC9C,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,YAAY,GAChB,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAC5D,CAAC,CAAE,MAA6C;YAChD,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE;YAClD,SAAS;YACT,MAAM,EAAE,kBAAkB;YAC1B,mBAAmB,EACjB,eAAe,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,eAAe;YACvG,mBAAmB,EAAE,qBAAqB,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,EAAE;YACpF,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;YACzD,2BAA2B,EAAE;gBAC3B,KAAK,EAAE,OAAO,CAAC,qBAAqB,EAAE,KAAK,CAAC;gBAC5C,aAAa,EAAE,OAAO,CAAC,qBAAqB,EAAE,aAAa,CAAC;gBAC5D,cAAc,EAAE,OAAO,CAAC,qBAAqB,EAAE,cAAc,CAAC;gBAC9D,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,qBAAqB,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC;aACzE;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
@@ -92,6 +92,52 @@ test('emits tool_started for function_call run_item_stream_event', async (t) =>
92
92
  t.is(toolStarted.toolName, 'shell');
93
93
  t.deepEqual(toolStarted.arguments, { command: 'ls' });
94
94
  });
95
+ test('emits one tool_started for duplicate function_call events with the same callId', async (t) => {
96
+ const functionCall = {
97
+ type: 'run_item_stream_event',
98
+ item: {
99
+ rawItem: {
100
+ type: 'function_call',
101
+ callId: 'call-dup',
102
+ name: 'shell',
103
+ arguments: JSON.stringify({ command: 'npm test' }),
104
+ },
105
+ },
106
+ };
107
+ const stream = makeStream([functionCall, functionCall]);
108
+ const acc = createStreamAccumulator();
109
+ const opts = baseOpts();
110
+ const events = [];
111
+ for await (const ev of processStreamEvents(stream, acc, opts, baseDeps())) {
112
+ events.push(ev);
113
+ }
114
+ const starts = events.filter((e) => e.type === 'tool_started');
115
+ t.is(starts.length, 2);
116
+ t.deepEqual(starts[0].arguments, { command: 'npm test' });
117
+ t.deepEqual(starts[1].arguments, { command: 'npm test' });
118
+ });
119
+ test('emits tool_started even when the callId was already emitted by approval handling', async (t) => {
120
+ const stream = makeStream([
121
+ {
122
+ type: 'run_item_stream_event',
123
+ item: {
124
+ rawItem: {
125
+ type: 'function_call',
126
+ callId: 'call-approved',
127
+ name: 'shell',
128
+ arguments: JSON.stringify({ command: 'git status' }),
129
+ },
130
+ },
131
+ },
132
+ ]);
133
+ const acc = createStreamAccumulator();
134
+ const opts = baseOpts();
135
+ const events = [];
136
+ for await (const ev of processStreamEvents(stream, acc, opts, baseDeps())) {
137
+ events.push(ev);
138
+ }
139
+ t.true(events.some((e) => e.type === 'tool_started'));
140
+ });
95
141
  test('invalid JSON arguments are deduped via emittedInvalidToolCallPackets', async (t) => {
96
142
  const events1 = [
97
143
  {
@@ -226,4 +272,29 @@ test('throws AbortError if stream is cancelled', async (t) => {
226
272
  }
227
273
  }, { name: 'AbortError', message: 'The user aborted a request.' });
228
274
  });
275
+ test('extracts codex rate limits from nested or flat structures in raw events', async (t) => {
276
+ const nestedEvent = {
277
+ type: 'codex.rate_limits',
278
+ plan_type: 'plus',
279
+ rate_limits: {
280
+ allowed: true,
281
+ limit_reached: false,
282
+ primary: { used_percent: 11, window_minutes: 300, reset_after_seconds: 9697, reset_at: 1779703037 },
283
+ secondary: { used_percent: 14, window_minutes: 10080, reset_after_seconds: 503937, reset_at: 1780197277 },
284
+ },
285
+ };
286
+ const stream = makeStream([nestedEvent]);
287
+ const acc = createStreamAccumulator();
288
+ const events = [];
289
+ for await (const ev of processStreamEvents(stream, acc, baseOpts(), baseDeps())) {
290
+ events.push(ev);
291
+ }
292
+ const rateLimitEvents = events.filter((e) => e.type === 'codex_rate_limits');
293
+ t.is(rateLimitEvents.length, 1);
294
+ const info = rateLimitEvents[0].rateLimits;
295
+ t.is(info.allowed, true);
296
+ t.is(info.limit_reached, false);
297
+ t.is(info.primary.used_percent, 11);
298
+ t.is(info.secondary.used_percent, 14);
299
+ });
229
300
  //# sourceMappingURL=stream-event-processor.test.js.map