@qduc/term2 0.3.1 → 0.4.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 (552) hide show
  1. package/dist/agent.d.ts.map +1 -1
  2. package/dist/agent.js +46 -6
  3. package/dist/agent.js.map +1 -1
  4. package/dist/agent.test.d.ts +2 -0
  5. package/dist/agent.test.d.ts.map +1 -0
  6. package/dist/agent.test.js +198 -0
  7. package/dist/agent.test.js.map +1 -0
  8. package/dist/app.d.ts +5 -0
  9. package/dist/app.d.ts.map +1 -1
  10. package/dist/app.js +30 -14
  11. package/dist/app.js.map +1 -1
  12. package/dist/app.startup-banner.test.d.ts +2 -0
  13. package/dist/app.startup-banner.test.d.ts.map +1 -0
  14. package/dist/app.startup-banner.test.js +11 -0
  15. package/dist/app.startup-banner.test.js.map +1 -0
  16. package/dist/cli.d.ts +1 -1
  17. package/dist/cli.d.ts.map +1 -1
  18. package/dist/cli.js +18 -3
  19. package/dist/cli.js.map +1 -1
  20. package/dist/components/ApprovalPrompt.d.ts.map +1 -1
  21. package/dist/components/ApprovalPrompt.js +10 -10
  22. package/dist/components/ApprovalPrompt.js.map +1 -1
  23. package/dist/components/Banner.js +1 -1
  24. package/dist/components/Banner.js.map +1 -1
  25. package/dist/components/BottomArea.d.ts.map +1 -1
  26. package/dist/components/BottomArea.js +3 -4
  27. package/dist/components/BottomArea.js.map +1 -1
  28. package/dist/components/ChatMessage.d.ts +1 -0
  29. package/dist/components/ChatMessage.d.ts.map +1 -1
  30. package/dist/components/ChatMessage.js +2 -2
  31. package/dist/components/ChatMessage.js.map +1 -1
  32. package/dist/components/CommandMessage.d.ts.map +1 -1
  33. package/dist/components/CommandMessage.js +48 -3
  34. package/dist/components/CommandMessage.js.map +1 -1
  35. package/dist/components/CommandMessage.test.js +90 -0
  36. package/dist/components/CommandMessage.test.js.map +1 -1
  37. package/dist/components/Input/PopupManager.d.ts +3 -0
  38. package/dist/components/Input/PopupManager.d.ts.map +1 -1
  39. package/dist/components/Input/PopupManager.js +2 -2
  40. package/dist/components/Input/PopupManager.js.map +1 -1
  41. package/dist/components/Input/insertions.d.ts.map +1 -1
  42. package/dist/components/Input/insertions.js +2 -2
  43. package/dist/components/Input/insertions.js.map +1 -1
  44. package/dist/components/Input/popup-key-navigation.d.ts +18 -0
  45. package/dist/components/Input/popup-key-navigation.d.ts.map +1 -0
  46. package/dist/components/Input/popup-key-navigation.js +16 -0
  47. package/dist/components/Input/popup-key-navigation.js.map +1 -0
  48. package/dist/components/Input/popup-key-navigation.test.d.ts +2 -0
  49. package/dist/components/Input/popup-key-navigation.test.d.ts.map +1 -0
  50. package/dist/components/Input/popup-key-navigation.test.js +73 -0
  51. package/dist/components/Input/popup-key-navigation.test.js.map +1 -0
  52. package/dist/components/Input/popup-props.d.ts.map +1 -1
  53. package/dist/components/Input/popup-props.js +2 -0
  54. package/dist/components/Input/popup-props.js.map +1 -1
  55. package/dist/components/Input/triggers.d.ts +1 -0
  56. package/dist/components/Input/triggers.d.ts.map +1 -1
  57. package/dist/components/Input/triggers.js +1 -0
  58. package/dist/components/Input/triggers.js.map +1 -1
  59. package/dist/components/InputBox.d.ts.map +1 -1
  60. package/dist/components/InputBox.js +130 -6
  61. package/dist/components/InputBox.js.map +1 -1
  62. package/dist/components/InputBox.test.js +42 -1
  63. package/dist/components/InputBox.test.js.map +1 -1
  64. package/dist/components/LiveResponse.d.ts +1 -3
  65. package/dist/components/LiveResponse.d.ts.map +1 -1
  66. package/dist/components/LiveResponse.js +5 -6
  67. package/dist/components/LiveResponse.js.map +1 -1
  68. package/dist/components/MarkdownRenderer.d.ts +5 -2
  69. package/dist/components/MarkdownRenderer.d.ts.map +1 -1
  70. package/dist/components/MarkdownRenderer.js +66 -45
  71. package/dist/components/MarkdownRenderer.js.map +1 -1
  72. package/dist/components/MessageList.d.ts +7 -1
  73. package/dist/components/MessageList.d.ts.map +1 -1
  74. package/dist/components/MessageList.js +98 -23
  75. package/dist/components/MessageList.js.map +1 -1
  76. package/dist/components/MessageList.test.js +177 -4
  77. package/dist/components/MessageList.test.js.map +1 -1
  78. package/dist/components/ModelSelectionMenu.d.ts.map +1 -1
  79. package/dist/components/ModelSelectionMenu.js +54 -14
  80. package/dist/components/ModelSelectionMenu.js.map +1 -1
  81. package/dist/components/PathSelectionMenu.d.ts +2 -0
  82. package/dist/components/PathSelectionMenu.d.ts.map +1 -1
  83. package/dist/components/PathSelectionMenu.js +31 -12
  84. package/dist/components/PathSelectionMenu.js.map +1 -1
  85. package/dist/components/SettingsSelectionMenu.d.ts +1 -0
  86. package/dist/components/SettingsSelectionMenu.d.ts.map +1 -1
  87. package/dist/components/SettingsSelectionMenu.js +32 -23
  88. package/dist/components/SettingsSelectionMenu.js.map +1 -1
  89. package/dist/components/SettingsSelectionMenu.scroll.test.d.ts +2 -0
  90. package/dist/components/SettingsSelectionMenu.scroll.test.d.ts.map +1 -0
  91. package/dist/components/SettingsSelectionMenu.scroll.test.js +23 -0
  92. package/dist/components/SettingsSelectionMenu.scroll.test.js.map +1 -0
  93. package/dist/components/StatusBar.d.ts.map +1 -1
  94. package/dist/components/StatusBar.js +14 -14
  95. package/dist/components/StatusBar.js.map +1 -1
  96. package/dist/components/StatusBar.test.d.ts +2 -0
  97. package/dist/components/StatusBar.test.d.ts.map +1 -0
  98. package/dist/components/StatusBar.test.js +30 -0
  99. package/dist/components/StatusBar.test.js.map +1 -0
  100. package/dist/contracts/conversation.d.ts +1 -0
  101. package/dist/contracts/conversation.d.ts.map +1 -1
  102. package/dist/env-setup.d.ts +2 -0
  103. package/dist/env-setup.d.ts.map +1 -0
  104. package/dist/env-setup.js +7 -0
  105. package/dist/env-setup.js.map +1 -0
  106. package/dist/env-setup.test.d.ts +2 -0
  107. package/dist/env-setup.test.d.ts.map +1 -0
  108. package/dist/env-setup.test.js +6 -0
  109. package/dist/env-setup.test.js.map +1 -0
  110. package/dist/hooks/path-completion-filter.d.ts +4 -0
  111. package/dist/hooks/path-completion-filter.d.ts.map +1 -0
  112. package/dist/hooks/path-completion-filter.js +27 -0
  113. package/dist/hooks/path-completion-filter.js.map +1 -0
  114. package/dist/hooks/path-completion-filter.test.d.ts +2 -0
  115. package/dist/hooks/path-completion-filter.test.d.ts.map +1 -0
  116. package/dist/hooks/path-completion-filter.test.js +100 -0
  117. package/dist/hooks/path-completion-filter.test.js.map +1 -0
  118. package/dist/hooks/use-app-commands.d.ts +3 -1
  119. package/dist/hooks/use-app-commands.d.ts.map +1 -1
  120. package/dist/hooks/use-app-commands.js +74 -6
  121. package/dist/hooks/use-app-commands.js.map +1 -1
  122. package/dist/hooks/use-app-commands.test.js +20 -3
  123. package/dist/hooks/use-app-commands.test.js.map +1 -1
  124. package/dist/hooks/use-conversation.d.ts +4 -9
  125. package/dist/hooks/use-conversation.d.ts.map +1 -1
  126. package/dist/hooks/use-conversation.js +32 -57
  127. package/dist/hooks/use-conversation.js.map +1 -1
  128. package/dist/hooks/use-mode-handlers.d.ts +3 -1
  129. package/dist/hooks/use-mode-handlers.d.ts.map +1 -1
  130. package/dist/hooks/use-mode-handlers.js +8 -0
  131. package/dist/hooks/use-mode-handlers.js.map +1 -1
  132. package/dist/hooks/use-model-selection.d.ts +1 -1
  133. package/dist/hooks/use-model-selection.d.ts.map +1 -1
  134. package/dist/hooks/use-model-selection.js +31 -16
  135. package/dist/hooks/use-model-selection.js.map +1 -1
  136. package/dist/hooks/use-model-selection.test.js +66 -1
  137. package/dist/hooks/use-model-selection.test.js.map +1 -1
  138. package/dist/hooks/use-path-completion.d.ts +1 -0
  139. package/dist/hooks/use-path-completion.d.ts.map +1 -1
  140. package/dist/hooks/use-path-completion.js +22 -17
  141. package/dist/hooks/use-path-completion.js.map +1 -1
  142. package/dist/hooks/use-settings-completion.d.ts +2 -2
  143. package/dist/hooks/use-settings-completion.d.ts.map +1 -1
  144. package/dist/hooks/use-settings-completion.js +53 -18
  145. package/dist/hooks/use-settings-completion.js.map +1 -1
  146. package/dist/hooks/use-settings-completion.scroll.test.d.ts +2 -0
  147. package/dist/hooks/use-settings-completion.scroll.test.d.ts.map +1 -0
  148. package/dist/hooks/use-settings-completion.scroll.test.js +55 -0
  149. package/dist/hooks/use-settings-completion.scroll.test.js.map +1 -0
  150. package/dist/hooks/use-settings-completion.test.js +69 -79
  151. package/dist/hooks/use-settings-completion.test.js.map +1 -1
  152. package/dist/hooks/use-settings-value-completion.d.ts +1 -2
  153. package/dist/hooks/use-settings-value-completion.d.ts.map +1 -1
  154. package/dist/hooks/use-settings-value-completion.js +47 -19
  155. package/dist/hooks/use-settings-value-completion.js.map +1 -1
  156. package/dist/hooks/use-settings-value-completion.test.js +5 -18
  157. package/dist/hooks/use-settings-value-completion.test.js.map +1 -1
  158. package/dist/hooks/use-slash-commands.d.ts +7 -0
  159. package/dist/hooks/use-slash-commands.d.ts.map +1 -1
  160. package/dist/hooks/use-slash-commands.js +20 -13
  161. package/dist/hooks/use-slash-commands.js.map +1 -1
  162. package/dist/hooks/use-slash-commands.test.js +52 -1
  163. package/dist/hooks/use-slash-commands.test.js.map +1 -1
  164. package/dist/hooks/use-trigger-detection.d.ts.map +1 -1
  165. package/dist/hooks/use-trigger-detection.js +7 -3
  166. package/dist/hooks/use-trigger-detection.js.map +1 -1
  167. package/dist/hooks/use-trigger-detection.test.d.ts +2 -0
  168. package/dist/hooks/use-trigger-detection.test.d.ts.map +1 -0
  169. package/dist/hooks/use-trigger-detection.test.js +59 -0
  170. package/dist/hooks/use-trigger-detection.test.js.map +1 -0
  171. package/dist/lib/openai-agent-client.d.ts +21 -0
  172. package/dist/lib/openai-agent-client.d.ts.map +1 -1
  173. package/dist/lib/openai-agent-client.js +52 -17
  174. package/dist/lib/openai-agent-client.js.map +1 -1
  175. package/dist/lib/openai-agent-client.test.js +63 -0
  176. package/dist/lib/openai-agent-client.test.js.map +1 -1
  177. package/dist/lib/tool-invoke.d.ts +3 -2
  178. package/dist/lib/tool-invoke.d.ts.map +1 -1
  179. package/dist/lib/tool-invoke.js +69 -4
  180. package/dist/lib/tool-invoke.js.map +1 -1
  181. package/dist/lib/tool-invoke.test.js +25 -0
  182. package/dist/lib/tool-invoke.test.js.map +1 -1
  183. package/dist/non-interactive.d.ts.map +1 -1
  184. package/dist/non-interactive.js +3 -0
  185. package/dist/non-interactive.js.map +1 -1
  186. package/dist/prompts/gpt-5-modern.md +66 -0
  187. package/dist/prompts/gpt-5.md +10 -0
  188. package/dist/prompts/lite.md +10 -27
  189. package/dist/prompts/prompt-selector.js +2 -2
  190. package/dist/prompts/prompt-selector.js.map +1 -1
  191. package/dist/prompts/prompt-selector.test.js +7 -2
  192. package/dist/prompts/prompt-selector.test.js.map +1 -1
  193. package/dist/prompts/prompt-selector.test.ts +22 -2
  194. package/dist/prompts/prompt-selector.ts +2 -2
  195. package/dist/prompts/search-via-shell.d.ts +7 -0
  196. package/dist/prompts/search-via-shell.d.ts.map +1 -0
  197. package/dist/prompts/search-via-shell.js +59 -0
  198. package/dist/prompts/search-via-shell.js.map +1 -0
  199. package/dist/prompts/search-via-shell.test.d.ts +2 -0
  200. package/dist/prompts/search-via-shell.test.d.ts.map +1 -0
  201. package/dist/prompts/search-via-shell.test.js +40 -0
  202. package/dist/prompts/search-via-shell.test.js.map +1 -0
  203. package/dist/prompts/search-via-shell.test.ts +47 -0
  204. package/dist/prompts/search-via-shell.ts +71 -0
  205. package/dist/prompts/simple.md +40 -186
  206. package/dist/providers/ai-sdk-agents-adapter.d.ts +7 -0
  207. package/dist/providers/ai-sdk-agents-adapter.d.ts.map +1 -0
  208. package/dist/providers/ai-sdk-agents-adapter.js +80 -0
  209. package/dist/providers/ai-sdk-agents-adapter.js.map +1 -0
  210. package/dist/providers/ai-sdk-agents-adapter.test.d.ts +2 -0
  211. package/dist/providers/ai-sdk-agents-adapter.test.d.ts.map +1 -0
  212. package/dist/providers/ai-sdk-agents-adapter.test.js +158 -0
  213. package/dist/providers/ai-sdk-agents-adapter.test.js.map +1 -0
  214. package/dist/providers/ai-sdk-anthropic.provider.d.ts +14 -0
  215. package/dist/providers/ai-sdk-anthropic.provider.d.ts.map +1 -0
  216. package/dist/providers/ai-sdk-anthropic.provider.js +18 -0
  217. package/dist/providers/ai-sdk-anthropic.provider.js.map +1 -0
  218. package/dist/providers/ai-sdk-google.provider.d.ts +14 -0
  219. package/dist/providers/ai-sdk-google.provider.d.ts.map +1 -0
  220. package/dist/providers/ai-sdk-google.provider.js +18 -0
  221. package/dist/providers/ai-sdk-google.provider.js.map +1 -0
  222. package/dist/providers/ai-sdk-logging-fetch.d.ts +11 -0
  223. package/dist/providers/ai-sdk-logging-fetch.d.ts.map +1 -0
  224. package/dist/providers/ai-sdk-logging-fetch.js +127 -0
  225. package/dist/providers/ai-sdk-logging-fetch.js.map +1 -0
  226. package/dist/providers/ai-sdk-logging-fetch.test.d.ts +2 -0
  227. package/dist/providers/ai-sdk-logging-fetch.test.d.ts.map +1 -0
  228. package/dist/providers/ai-sdk-logging-fetch.test.js +107 -0
  229. package/dist/providers/ai-sdk-logging-fetch.test.js.map +1 -0
  230. package/dist/providers/ai-sdk-message-normalizer.d.ts +2 -2
  231. package/dist/providers/ai-sdk-message-normalizer.d.ts.map +1 -1
  232. package/dist/providers/ai-sdk-message-normalizer.js +92 -47
  233. package/dist/providers/ai-sdk-message-normalizer.js.map +1 -1
  234. package/dist/providers/ai-sdk-message-normalizer.test.js +256 -16
  235. package/dist/providers/ai-sdk-message-normalizer.test.js.map +1 -1
  236. package/dist/providers/ai-sdk-openai-compatible.provider.d.ts +2 -0
  237. package/dist/providers/ai-sdk-openai-compatible.provider.d.ts.map +1 -1
  238. package/dist/providers/ai-sdk-openai-compatible.provider.js +3 -3
  239. package/dist/providers/ai-sdk-openai-compatible.provider.js.map +1 -1
  240. package/dist/providers/ai-sdk-openai-compatible.provider.test.js +25 -0
  241. package/dist/providers/ai-sdk-openai-compatible.provider.test.js.map +1 -1
  242. package/dist/providers/ai-sdk-openrouter.provider.d.ts +1 -1
  243. package/dist/providers/ai-sdk-openrouter.provider.d.ts.map +1 -1
  244. package/dist/providers/ai-sdk-openrouter.provider.js +2 -3
  245. package/dist/providers/ai-sdk-openrouter.provider.js.map +1 -1
  246. package/dist/providers/ai-sdk-openrouter.provider.test.js +23 -0
  247. package/dist/providers/ai-sdk-openrouter.provider.test.js.map +1 -1
  248. package/dist/providers/common/openai-compatible-messages.d.ts +1 -2
  249. package/dist/providers/common/openai-compatible-messages.d.ts.map +1 -1
  250. package/dist/providers/common/openai-compatible-messages.js +22 -48
  251. package/dist/providers/common/openai-compatible-messages.js.map +1 -1
  252. package/dist/providers/common/openai-compatible-messages.test.js +93 -1
  253. package/dist/providers/common/openai-compatible-messages.test.js.map +1 -1
  254. package/dist/providers/custom-provider-adapter.test.d.ts +2 -0
  255. package/dist/providers/custom-provider-adapter.test.d.ts.map +1 -0
  256. package/dist/providers/custom-provider-adapter.test.js +52 -0
  257. package/dist/providers/custom-provider-adapter.test.js.map +1 -0
  258. package/dist/providers/openai-compatible-behavior-gate.test.d.ts +2 -0
  259. package/dist/providers/openai-compatible-behavior-gate.test.d.ts.map +1 -0
  260. package/dist/providers/openai-compatible-behavior-gate.test.js +216 -0
  261. package/dist/providers/openai-compatible-behavior-gate.test.js.map +1 -0
  262. package/dist/providers/openai-compatible.provider.d.ts +10 -1
  263. package/dist/providers/openai-compatible.provider.d.ts.map +1 -1
  264. package/dist/providers/openai-compatible.provider.js +341 -31
  265. package/dist/providers/openai-compatible.provider.js.map +1 -1
  266. package/dist/providers/openai-compatible.provider.test.d.ts +2 -0
  267. package/dist/providers/openai-compatible.provider.test.d.ts.map +1 -0
  268. package/dist/providers/openai-compatible.provider.test.js +462 -0
  269. package/dist/providers/openai-compatible.provider.test.js.map +1 -0
  270. package/dist/providers/openai.provider.js +2 -1
  271. package/dist/providers/openai.provider.js.map +1 -1
  272. package/dist/providers/openai.provider.test.d.ts +2 -0
  273. package/dist/providers/openai.provider.test.d.ts.map +1 -0
  274. package/dist/providers/openai.provider.test.js +22 -0
  275. package/dist/providers/openai.provider.test.js.map +1 -0
  276. package/dist/providers/openrouter.provider.js +28 -2
  277. package/dist/providers/openrouter.provider.js.map +1 -1
  278. package/dist/scripts/eval-auto-approval/dataset.d.ts +1 -1
  279. package/dist/services/conversation-events.d.ts +3 -0
  280. package/dist/services/conversation-events.d.ts.map +1 -1
  281. package/dist/services/conversation-result-builder.d.ts.map +1 -1
  282. package/dist/services/conversation-result-builder.js +11 -1
  283. package/dist/services/conversation-result-builder.js.map +1 -1
  284. package/dist/services/conversation-result-builder.test.js +72 -0
  285. package/dist/services/conversation-result-builder.test.js.map +1 -1
  286. package/dist/services/conversation-session.d.ts +2 -1
  287. package/dist/services/conversation-session.d.ts.map +1 -1
  288. package/dist/services/conversation-session.js +30 -1
  289. package/dist/services/conversation-session.js.map +1 -1
  290. package/dist/services/file-service.js +1 -1
  291. package/dist/services/file-service.js.map +1 -1
  292. package/dist/services/logging-contract.d.ts +3 -3
  293. package/dist/services/logging-service.d.ts.map +1 -1
  294. package/dist/services/logging-service.js +18 -1
  295. package/dist/services/logging-service.js.map +1 -1
  296. package/dist/services/model-service.d.ts.map +1 -1
  297. package/dist/services/model-service.js +16 -8
  298. package/dist/services/model-service.js.map +1 -1
  299. package/dist/services/model-service.test.js +67 -1
  300. package/dist/services/model-service.test.js.map +1 -1
  301. package/dist/services/rtk-service.d.ts +23 -0
  302. package/dist/services/rtk-service.d.ts.map +1 -0
  303. package/dist/services/rtk-service.js +165 -0
  304. package/dist/services/rtk-service.js.map +1 -0
  305. package/dist/services/rtk-service.test.d.ts +2 -0
  306. package/dist/services/rtk-service.test.d.ts.map +1 -0
  307. package/dist/services/rtk-service.test.js +239 -0
  308. package/dist/services/rtk-service.test.js.map +1 -0
  309. package/dist/services/settings-persistence.d.ts +1 -0
  310. package/dist/services/settings-persistence.d.ts.map +1 -1
  311. package/dist/services/settings-persistence.js +28 -5
  312. package/dist/services/settings-persistence.js.map +1 -1
  313. package/dist/services/settings-persistence.test.js +55 -3
  314. package/dist/services/settings-persistence.test.js.map +1 -1
  315. package/dist/services/settings-schema.d.ts +55 -16
  316. package/dist/services/settings-schema.d.ts.map +1 -1
  317. package/dist/services/settings-schema.js +35 -4
  318. package/dist/services/settings-schema.js.map +1 -1
  319. package/dist/services/settings-schema.test.d.ts +2 -0
  320. package/dist/services/settings-schema.test.d.ts.map +1 -0
  321. package/dist/services/settings-schema.test.js +77 -0
  322. package/dist/services/settings-schema.test.js.map +1 -0
  323. package/dist/services/settings-service.d.ts.map +1 -1
  324. package/dist/services/settings-service.js +7 -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 +1 -0
  328. package/dist/services/settings-sources.js.map +1 -1
  329. package/dist/services/shell-auto-approval-evaluator.d.ts +1 -1
  330. package/dist/services/shell-auto-approval-evaluator.d.ts.map +1 -1
  331. package/dist/services/shell-auto-approval-evaluator.js +8 -2
  332. package/dist/services/shell-auto-approval-evaluator.js.map +1 -1
  333. package/dist/services/stream-event-processor.d.ts.map +1 -1
  334. package/dist/services/stream-event-processor.js +10 -8
  335. package/dist/services/stream-event-processor.js.map +1 -1
  336. package/dist/services/stream-event-processor.test.js +32 -0
  337. package/dist/services/stream-event-processor.test.js.map +1 -1
  338. package/dist/services/terminal-result-collector.d.ts.map +1 -1
  339. package/dist/services/terminal-result-collector.js +1 -0
  340. package/dist/services/terminal-result-collector.js.map +1 -1
  341. package/dist/services/terminal-result-collector.test.js +22 -0
  342. package/dist/services/terminal-result-collector.test.js.map +1 -1
  343. package/dist/tools/apply-patch.d.ts +12 -4
  344. package/dist/tools/apply-patch.d.ts.map +1 -1
  345. package/dist/tools/apply-patch.js +204 -208
  346. package/dist/tools/apply-patch.js.map +1 -1
  347. package/dist/tools/apply-patch.test.js +44 -0
  348. package/dist/tools/apply-patch.test.js.map +1 -1
  349. package/dist/tools/code-context.d.ts +27 -0
  350. package/dist/tools/code-context.d.ts.map +1 -0
  351. package/dist/tools/code-context.js +512 -0
  352. package/dist/tools/code-context.js.map +1 -0
  353. package/dist/tools/code-context.test.d.ts +2 -0
  354. package/dist/tools/code-context.test.d.ts.map +1 -0
  355. package/dist/tools/code-context.test.js +368 -0
  356. package/dist/tools/code-context.test.js.map +1 -0
  357. package/dist/tools/create-file.d.ts.map +1 -1
  358. package/dist/tools/create-file.js +3 -2
  359. package/dist/tools/create-file.js.map +1 -1
  360. package/dist/tools/edit-healing.d.ts +4 -3
  361. package/dist/tools/edit-healing.d.ts.map +1 -1
  362. package/dist/tools/edit-healing.js +50 -20
  363. package/dist/tools/edit-healing.js.map +1 -1
  364. package/dist/tools/edit-healing.test.js +62 -0
  365. package/dist/tools/edit-healing.test.js.map +1 -1
  366. package/dist/tools/file-locks.d.ts +2 -0
  367. package/dist/tools/file-locks.d.ts.map +1 -0
  368. package/dist/tools/file-locks.js +21 -0
  369. package/dist/tools/file-locks.js.map +1 -0
  370. package/dist/tools/find-files.d.ts +1 -0
  371. package/dist/tools/find-files.d.ts.map +1 -1
  372. package/dist/tools/find-files.js +59 -139
  373. package/dist/tools/find-files.js.map +1 -1
  374. package/dist/tools/find-files.test.js +5 -10
  375. package/dist/tools/find-files.test.js.map +1 -1
  376. package/dist/tools/grep.d.ts +1 -0
  377. package/dist/tools/grep.d.ts.map +1 -1
  378. package/dist/tools/grep.js +10 -46
  379. package/dist/tools/grep.js.map +1 -1
  380. package/dist/tools/language-providers.d.ts +48 -0
  381. package/dist/tools/language-providers.d.ts.map +1 -0
  382. package/dist/tools/language-providers.js +244 -0
  383. package/dist/tools/language-providers.js.map +1 -0
  384. package/dist/tools/search-replace.d.ts +5 -2
  385. package/dist/tools/search-replace.d.ts.map +1 -1
  386. package/dist/tools/search-replace.js +201 -106
  387. package/dist/tools/search-replace.js.map +1 -1
  388. package/dist/tools/search-replace.test.js +111 -1
  389. package/dist/tools/search-replace.test.js.map +1 -1
  390. package/dist/tools/search.d.ts.map +1 -1
  391. package/dist/tools/search.js +5 -15
  392. package/dist/tools/search.js.map +1 -1
  393. package/dist/tools/shell.d.ts +2 -0
  394. package/dist/tools/shell.d.ts.map +1 -1
  395. package/dist/tools/shell.js +15 -7
  396. package/dist/tools/shell.js.map +1 -1
  397. package/dist/tools/shell.test.js +28 -0
  398. package/dist/tools/shell.test.js.map +1 -1
  399. package/dist/tools/tool-names.d.ts +3 -0
  400. package/dist/tools/tool-names.d.ts.map +1 -1
  401. package/dist/tools/tool-names.js +3 -0
  402. package/dist/tools/tool-names.js.map +1 -1
  403. package/dist/tools/tool-names.test.js +4 -1
  404. package/dist/tools/tool-names.test.js.map +1 -1
  405. package/dist/tools/tool-parameter-schema.test.js +18 -0
  406. package/dist/tools/tool-parameter-schema.test.js.map +1 -1
  407. package/dist/utils/command-safety/constants.d.ts.map +1 -1
  408. package/dist/utils/command-safety/constants.js +30 -5
  409. package/dist/utils/command-safety/constants.js.map +1 -1
  410. package/dist/utils/command-safety/index.d.ts.map +1 -1
  411. package/dist/utils/command-safety/index.js +3 -0
  412. package/dist/utils/command-safety/index.js.map +1 -1
  413. package/dist/utils/command-safety/path-analysis.d.ts.map +1 -1
  414. package/dist/utils/command-safety/path-analysis.js +8 -0
  415. package/dist/utils/command-safety/path-analysis.js.map +1 -1
  416. package/dist/utils/command-safety.find.test.js +1 -1
  417. package/dist/utils/command-safety.find.test.js.map +1 -1
  418. package/dist/utils/command-safety.path.test.js +14 -0
  419. package/dist/utils/command-safety.path.test.js.map +1 -1
  420. package/dist/utils/command-safety.specialized-handlers.test.d.ts +2 -0
  421. package/dist/utils/command-safety.specialized-handlers.test.d.ts.map +1 -0
  422. package/dist/utils/command-safety.specialized-handlers.test.js +20 -0
  423. package/dist/utils/command-safety.specialized-handlers.test.js.map +1 -0
  424. package/dist/utils/conversation-event-handler.d.ts +8 -6
  425. package/dist/utils/conversation-event-handler.d.ts.map +1 -1
  426. package/dist/utils/conversation-event-handler.js +166 -46
  427. package/dist/utils/conversation-event-handler.js.map +1 -1
  428. package/dist/utils/conversation-event-handler.test.js +391 -12
  429. package/dist/utils/conversation-event-handler.test.js.map +1 -1
  430. package/dist/utils/conversation-utils.d.ts +2 -0
  431. package/dist/utils/conversation-utils.d.ts.map +1 -1
  432. package/dist/utils/conversation-utils.js +2 -0
  433. package/dist/utils/conversation-utils.js.map +1 -1
  434. package/dist/utils/execute-shell.d.ts +5 -6
  435. package/dist/utils/execute-shell.d.ts.map +1 -1
  436. package/dist/utils/execute-shell.js +21 -11
  437. package/dist/utils/execute-shell.js.map +1 -1
  438. package/dist/utils/execute-shell.test.js +37 -6
  439. package/dist/utils/execute-shell.test.js.map +1 -1
  440. package/dist/utils/extract-command-messages.d.ts.map +1 -1
  441. package/dist/utils/extract-command-messages.js +4 -1
  442. package/dist/utils/extract-command-messages.js.map +1 -1
  443. package/dist/utils/flex-service-tier.d.ts +2 -0
  444. package/dist/utils/flex-service-tier.d.ts.map +1 -0
  445. package/dist/utils/flex-service-tier.js +20 -0
  446. package/dist/utils/flex-service-tier.js.map +1 -0
  447. package/dist/utils/flex-service-tier.test.d.ts +2 -0
  448. package/dist/utils/flex-service-tier.test.d.ts.map +1 -0
  449. package/dist/utils/flex-service-tier.test.js +25 -0
  450. package/dist/utils/flex-service-tier.test.js.map +1 -0
  451. package/dist/utils/log-truncation.d.ts +4 -2
  452. package/dist/utils/log-truncation.d.ts.map +1 -1
  453. package/dist/utils/log-truncation.js +143 -41
  454. package/dist/utils/log-truncation.js.map +1 -1
  455. package/dist/utils/log-truncation.test.js +131 -1
  456. package/dist/utils/log-truncation.test.js.map +1 -1
  457. package/dist/utils/project-tree.d.ts +14 -0
  458. package/dist/utils/project-tree.d.ts.map +1 -0
  459. package/dist/utils/project-tree.js +111 -0
  460. package/dist/utils/project-tree.js.map +1 -0
  461. package/dist/utils/project-tree.test.d.ts +2 -0
  462. package/dist/utils/project-tree.test.d.ts.map +1 -0
  463. package/dist/utils/project-tree.test.js +149 -0
  464. package/dist/utils/project-tree.test.js.map +1 -0
  465. package/dist/utils/provider-traffic-extractor.d.ts.map +1 -1
  466. package/dist/utils/provider-traffic-extractor.js +0 -1
  467. package/dist/utils/provider-traffic-extractor.js.map +1 -1
  468. package/dist/utils/streaming-session-factory.d.ts +1 -3
  469. package/dist/utils/streaming-session-factory.d.ts.map +1 -1
  470. package/dist/utils/streaming-session-factory.js +29 -10
  471. package/dist/utils/streaming-session-factory.js.map +1 -1
  472. package/dist/utils/streaming-session-factory.test.js +47 -15
  473. package/dist/utils/streaming-session-factory.test.js.map +1 -1
  474. package/dist/utils/subsequence-filter.d.ts +8 -0
  475. package/dist/utils/subsequence-filter.d.ts.map +1 -0
  476. package/dist/utils/subsequence-filter.js +47 -0
  477. package/dist/utils/subsequence-filter.js.map +1 -0
  478. package/dist/utils/terminal-clear.d.ts +7 -0
  479. package/dist/utils/terminal-clear.d.ts.map +1 -0
  480. package/dist/utils/terminal-clear.js +5 -0
  481. package/dist/utils/terminal-clear.js.map +1 -0
  482. package/dist/utils/terminal-clear.test.d.ts +2 -0
  483. package/dist/utils/terminal-clear.test.d.ts.map +1 -0
  484. package/dist/utils/terminal-clear.test.js +13 -0
  485. package/dist/utils/terminal-clear.test.js.map +1 -0
  486. package/dist/utils/token-usage.d.ts +13 -1
  487. package/dist/utils/token-usage.d.ts.map +1 -1
  488. package/dist/utils/token-usage.js +119 -28
  489. package/dist/utils/token-usage.js.map +1 -1
  490. package/dist/utils/token-usage.test.js +135 -3
  491. package/dist/utils/token-usage.test.js.map +1 -1
  492. package/package.json +4 -4
  493. package/dist/providers/openai-compatible/api.d.ts +0 -17
  494. package/dist/providers/openai-compatible/api.d.ts.map +0 -1
  495. package/dist/providers/openai-compatible/api.js +0 -58
  496. package/dist/providers/openai-compatible/api.js.map +0 -1
  497. package/dist/providers/openai-compatible/model.d.ts +0 -17
  498. package/dist/providers/openai-compatible/model.d.ts.map +0 -1
  499. package/dist/providers/openai-compatible/model.js +0 -473
  500. package/dist/providers/openai-compatible/model.js.map +0 -1
  501. package/dist/providers/openai-compatible/provider.d.ts +0 -22
  502. package/dist/providers/openai-compatible/provider.d.ts.map +0 -1
  503. package/dist/providers/openai-compatible/provider.js +0 -43
  504. package/dist/providers/openai-compatible/provider.js.map +0 -1
  505. package/dist/providers/openai-compatible/reasoning-content.test.d.ts +0 -2
  506. package/dist/providers/openai-compatible/reasoning-content.test.d.ts.map +0 -1
  507. package/dist/providers/openai-compatible/reasoning-content.test.js +0 -258
  508. package/dist/providers/openai-compatible/reasoning-content.test.js.map +0 -1
  509. package/dist/providers/openai-compatible/utils.d.ts +0 -3
  510. package/dist/providers/openai-compatible/utils.d.ts.map +0 -1
  511. package/dist/providers/openai-compatible/utils.js +0 -11
  512. package/dist/providers/openai-compatible/utils.js.map +0 -1
  513. package/dist/providers/openrouter/api.d.ts +0 -39
  514. package/dist/providers/openrouter/api.d.ts.map +0 -1
  515. package/dist/providers/openrouter/api.js +0 -164
  516. package/dist/providers/openrouter/api.js.map +0 -1
  517. package/dist/providers/openrouter/converters.d.ts +0 -8
  518. package/dist/providers/openrouter/converters.d.ts.map +0 -1
  519. package/dist/providers/openrouter/converters.js +0 -391
  520. package/dist/providers/openrouter/converters.js.map +0 -1
  521. package/dist/providers/openrouter/converters.test.d.ts +0 -2
  522. package/dist/providers/openrouter/converters.test.d.ts.map +0 -1
  523. package/dist/providers/openrouter/converters.test.js +0 -179
  524. package/dist/providers/openrouter/converters.test.js.map +0 -1
  525. package/dist/providers/openrouter/index.d.ts +0 -4
  526. package/dist/providers/openrouter/index.d.ts.map +0 -1
  527. package/dist/providers/openrouter/index.js +0 -4
  528. package/dist/providers/openrouter/index.js.map +0 -1
  529. package/dist/providers/openrouter/model.d.ts +0 -14
  530. package/dist/providers/openrouter/model.d.ts.map +0 -1
  531. package/dist/providers/openrouter/model.js +0 -457
  532. package/dist/providers/openrouter/model.js.map +0 -1
  533. package/dist/providers/openrouter/provider.d.ts +0 -15
  534. package/dist/providers/openrouter/provider.d.ts.map +0 -1
  535. package/dist/providers/openrouter/provider.js +0 -21
  536. package/dist/providers/openrouter/provider.js.map +0 -1
  537. package/dist/providers/openrouter/reasoning-content.test.d.ts +0 -2
  538. package/dist/providers/openrouter/reasoning-content.test.d.ts.map +0 -1
  539. package/dist/providers/openrouter/reasoning-content.test.js +0 -122
  540. package/dist/providers/openrouter/reasoning-content.test.js.map +0 -1
  541. package/dist/providers/openrouter/utils.d.ts +0 -11
  542. package/dist/providers/openrouter/utils.d.ts.map +0 -1
  543. package/dist/providers/openrouter/utils.js +0 -29
  544. package/dist/providers/openrouter/utils.js.map +0 -1
  545. package/dist/providers/openrouter.api.retry.test.d.ts +0 -2
  546. package/dist/providers/openrouter.api.retry.test.d.ts.map +0 -1
  547. package/dist/providers/openrouter.api.retry.test.js +0 -148
  548. package/dist/providers/openrouter.api.retry.test.js.map +0 -1
  549. package/dist/providers/openrouter.test.d.ts +0 -2
  550. package/dist/providers/openrouter.test.d.ts.map +0 -1
  551. package/dist/providers/openrouter.test.js +0 -1449
  552. package/dist/providers/openrouter.test.js.map +0 -1
@@ -1,70 +1,115 @@
1
- function isAssistantReasoningOnlyMessage(message) {
2
- const content = message?.content;
3
- if (message?.role === 'assistant' &&
4
- Array.isArray(content) &&
5
- content.length > 0 &&
6
- content.every((part) => part?.type === 'reasoning') &&
7
- !Array.isArray(message.tool_calls)) {
1
+ import { wrapLanguageModel } from 'ai';
2
+ function hasContent(content) {
3
+ return content !== null && content !== undefined && content !== '';
4
+ }
5
+ function hasAssistantPayload(message) {
6
+ if (message?.role !== 'assistant') {
8
7
  return true;
9
8
  }
10
- return (message?.role === 'assistant' &&
11
- typeof message.reasoning_content === 'string' &&
12
- (message.content === '' || message.content === null || message.content === undefined) &&
13
- !Array.isArray(message.tool_calls));
14
- }
15
- function isAssistantToolCallMessage(message) {
16
- const content = message?.content;
17
- if (message?.role === 'assistant' &&
18
- Array.isArray(content) &&
19
- content.some((part) => part?.type === 'tool-call') &&
20
- message.reasoning_content === undefined) {
9
+ if (Array.isArray(message.tool_calls) && message.tool_calls.length > 0) {
21
10
  return true;
22
11
  }
23
- return message?.role === 'assistant' && Array.isArray(message.tool_calls) && message.reasoning_content === undefined;
12
+ if (!Array.isArray(message.content)) {
13
+ return hasContent(message.content);
14
+ }
15
+ return message.content.some((part) => part?.type !== 'reasoning');
16
+ }
17
+ function contentToParts(content) {
18
+ if (!hasContent(content)) {
19
+ return [];
20
+ }
21
+ if (Array.isArray(content)) {
22
+ return content;
23
+ }
24
+ return [{ type: 'text', text: String(content) }];
25
+ }
26
+ function mergeAssistantContent(existing, incoming) {
27
+ if (!hasContent(existing)) {
28
+ return incoming;
29
+ }
30
+ if (!hasContent(incoming)) {
31
+ return existing;
32
+ }
33
+ if (typeof existing === 'string' && typeof incoming === 'string') {
34
+ return `${existing}\n${incoming}`;
35
+ }
36
+ return [...contentToParts(existing), ...contentToParts(incoming)];
37
+ }
38
+ function appendStringField(message, field, value) {
39
+ if (typeof value !== 'string') {
40
+ return;
41
+ }
42
+ message[field] = typeof message[field] === 'string' ? `${message[field]}${value}` : value;
43
+ }
44
+ function appendArrayLikeField(message, field, value) {
45
+ if (value == null) {
46
+ return;
47
+ }
48
+ const values = Array.isArray(value) ? value : [value];
49
+ if (values.length === 0) {
50
+ return;
51
+ }
52
+ message[field] = [...(Array.isArray(message[field]) ? message[field] : []), ...values];
24
53
  }
25
- export function mergeAssistantReasoningIntoToolCalls(messages) {
54
+ function mergeAssistantMessagePair(existing, incoming) {
55
+ const merged = {
56
+ ...existing,
57
+ ...incoming,
58
+ role: 'assistant',
59
+ content: mergeAssistantContent(existing.content, incoming.content),
60
+ tool_calls: undefined,
61
+ reasoning: undefined,
62
+ reasoning_content: undefined,
63
+ reasoning_details: undefined,
64
+ };
65
+ appendArrayLikeField(merged, 'tool_calls', existing.tool_calls);
66
+ appendArrayLikeField(merged, 'tool_calls', incoming.tool_calls);
67
+ appendStringField(merged, 'reasoning', existing.reasoning);
68
+ appendStringField(merged, 'reasoning', incoming.reasoning);
69
+ appendStringField(merged, 'reasoning_content', existing.reasoning_content);
70
+ appendStringField(merged, 'reasoning_content', incoming.reasoning_content);
71
+ appendArrayLikeField(merged, 'reasoning_details', existing.reasoning_details);
72
+ appendArrayLikeField(merged, 'reasoning_details', incoming.reasoning_details);
73
+ for (const field of ['tool_calls', 'reasoning', 'reasoning_content', 'reasoning_details']) {
74
+ if (merged[field] === undefined) {
75
+ delete merged[field];
76
+ }
77
+ }
78
+ if (merged.content === undefined) {
79
+ delete merged.content;
80
+ }
81
+ return merged;
82
+ }
83
+ export function mergeAssistantMessages(messages) {
26
84
  const merged = [];
27
85
  for (const message of messages) {
28
86
  const previous = merged[merged.length - 1];
29
- if (isAssistantReasoningOnlyMessage(previous) && isAssistantToolCallMessage(message)) {
30
- if (Array.isArray(previous.content) && Array.isArray(message.content)) {
31
- merged[merged.length - 1] = {
32
- ...message,
33
- content: [...previous.content, ...message.content],
34
- };
35
- continue;
36
- }
37
- merged[merged.length - 1] = {
38
- ...message,
39
- reasoning_content: previous.reasoning_content,
40
- };
87
+ if (previous?.role === 'assistant' && message?.role === 'assistant') {
88
+ merged[merged.length - 1] = mergeAssistantMessagePair(previous, message);
41
89
  continue;
42
90
  }
43
91
  merged.push(message);
44
92
  }
45
- return merged;
93
+ return merged.filter(hasAssistantPayload);
46
94
  }
47
- function normalizeOptions(options) {
95
+ function normalizeMessageOptions(options) {
48
96
  if (!Array.isArray(options?.prompt) && !Array.isArray(options?.messages)) {
49
97
  return options;
50
98
  }
51
99
  return {
52
100
  ...options,
53
- ...(Array.isArray(options.prompt) ? { prompt: mergeAssistantReasoningIntoToolCalls(options.prompt) } : {}),
54
- ...(Array.isArray(options.messages) ? { messages: mergeAssistantReasoningIntoToolCalls(options.messages) } : {}),
101
+ ...(Array.isArray(options.prompt) ? { prompt: mergeAssistantMessages(options.prompt) } : {}),
102
+ ...(Array.isArray(options.messages) ? { messages: mergeAssistantMessages(options.messages) } : {}),
55
103
  };
56
104
  }
57
- export function withMergedAssistantReasoning(model) {
58
- return new Proxy(model, {
59
- get(target, property) {
60
- if (property === 'doGenerate') {
61
- return (options) => target.doGenerate(normalizeOptions(options));
62
- }
63
- if (property === 'doStream') {
64
- return (options) => target.doStream(normalizeOptions(options));
65
- }
66
- return Reflect.get(target, property, target);
67
- },
105
+ const mergeAssistantMessagesMiddleware = {
106
+ specificationVersion: 'v3',
107
+ transformParams: ({ params }) => normalizeMessageOptions(params),
108
+ };
109
+ export function withMergedAssistantMessages(model) {
110
+ return wrapLanguageModel({
111
+ model: model,
112
+ middleware: mergeAssistantMessagesMiddleware,
68
113
  });
69
114
  }
70
115
  //# sourceMappingURL=ai-sdk-message-normalizer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ai-sdk-message-normalizer.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-message-normalizer.ts"],"names":[],"mappings":"AAKA,SAAS,+BAA+B,CAAC,OAAY;IACnD,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;IAEjC,IACE,OAAO,EAAE,IAAI,KAAK,WAAW;QAC7B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QACtB,OAAO,CAAC,MAAM,GAAG,CAAC;QAClB,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,WAAW,CAAC;QACnD,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAClC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,OAAO,EAAE,IAAI,KAAK,WAAW;QAC7B,OAAO,OAAO,CAAC,iBAAiB,KAAK,QAAQ;QAC7C,CAAC,OAAO,CAAC,OAAO,KAAK,EAAE,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC;QACrF,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CACnC,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CAAC,OAAY;IAC9C,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;IAEjC,IACE,OAAO,EAAE,IAAI,KAAK,WAAW;QAC7B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,WAAW,CAAC;QAClD,OAAO,CAAC,iBAAiB,KAAK,SAAS,EACvC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,OAAO,EAAE,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,iBAAiB,KAAK,SAAS,CAAC;AACvH,CAAC;AAED,MAAM,UAAU,oCAAoC,CAAC,QAAe;IAClE,MAAM,MAAM,GAAU,EAAE,CAAC;IAEzB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAE3C,IAAI,+BAA+B,CAAC,QAAQ,CAAC,IAAI,0BAA0B,CAAC,OAAO,CAAC,EAAE,CAAC;YACrF,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtE,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG;oBAC1B,GAAG,OAAO;oBACV,OAAO,EAAE,CAAC,GAAG,QAAQ,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;iBACnD,CAAC;gBACF,SAAS;YACX,CAAC;YAED,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG;gBAC1B,GAAG,OAAO;gBACV,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;aAC9C,CAAC;YACF,SAAS;QACX,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAY;IACpC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;QACzE,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO;QACL,GAAG,OAAO;QACV,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,oCAAoC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1G,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,oCAAoC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B,CAA2B,KAAQ;IAC7E,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE;QACtB,GAAG,CAAC,MAAM,EAAE,QAAQ;YAClB,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;gBAC9B,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;YACxE,CAAC;YAED,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;gBAC5B,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;YACtE,CAAC;YAED,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"ai-sdk-message-normalizer.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-message-normalizer.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import test from 'ava';
2
- import { mergeAssistantReasoningIntoToolCalls, withMergedAssistantReasoning } from './ai-sdk-message-normalizer.js';
3
- test('mergeAssistantReasoningIntoToolCalls folds assistant reasoning into following assistant tool call', (t) => {
2
+ import { mergeAssistantMessages, withMergedAssistantMessages } from './ai-sdk-message-normalizer.js';
3
+ test('mergeAssistantMessages folds assistant reasoning into following assistant tool call', (t) => {
4
4
  const messages = [
5
5
  { role: 'user', content: 'what time is it?' },
6
6
  {
@@ -23,7 +23,7 @@ test('mergeAssistantReasoningIntoToolCalls folds assistant reasoning into follow
23
23
  ],
24
24
  },
25
25
  ];
26
- t.deepEqual(mergeAssistantReasoningIntoToolCalls(messages), [
26
+ t.deepEqual(mergeAssistantMessages(messages), [
27
27
  { role: 'user', content: 'what time is it?' },
28
28
  {
29
29
  role: 'assistant',
@@ -42,7 +42,23 @@ test('mergeAssistantReasoningIntoToolCalls folds assistant reasoning into follow
42
42
  },
43
43
  ]);
44
44
  });
45
- test('mergeAssistantReasoningIntoToolCalls folds AI SDK reasoning content part into following assistant tool call', (t) => {
45
+ test('mergeAssistantMessages drops reasoning-only assistant messages with no content or tool calls', (t) => {
46
+ const messages = [
47
+ { role: 'user', content: 'show package json' },
48
+ {
49
+ role: 'assistant',
50
+ content: '',
51
+ reasoning_content: 'I should inspect the file.',
52
+ reasoning_details: [{ type: 'reasoning.text', text: 'I should inspect the file.' }],
53
+ },
54
+ { role: 'user', content: 'retry after failed hallucinated tool call' },
55
+ ];
56
+ t.deepEqual(mergeAssistantMessages(messages), [
57
+ { role: 'user', content: 'show package json' },
58
+ { role: 'user', content: 'retry after failed hallucinated tool call' },
59
+ ]);
60
+ });
61
+ test('mergeAssistantMessages folds AI SDK reasoning content part into following assistant tool call', (t) => {
46
62
  const messages = [
47
63
  {
48
64
  role: 'assistant',
@@ -71,7 +87,7 @@ test('mergeAssistantReasoningIntoToolCalls folds AI SDK reasoning content part i
71
87
  providerOptions: {},
72
88
  },
73
89
  ];
74
- t.deepEqual(mergeAssistantReasoningIntoToolCalls(messages), [
90
+ t.deepEqual(mergeAssistantMessages(messages), [
75
91
  {
76
92
  role: 'assistant',
77
93
  content: [
@@ -94,30 +110,231 @@ test('mergeAssistantReasoningIntoToolCalls folds AI SDK reasoning content part i
94
110
  },
95
111
  ]);
96
112
  });
97
- test('mergeAssistantReasoningIntoToolCalls preserves messages that are not split reasoning and tool calls', (t) => {
113
+ test('mergeAssistantMessages preserves assistant messages separated by non-assistant messages', (t) => {
98
114
  const messages = [
99
115
  {
100
116
  role: 'assistant',
101
117
  content: 'visible text',
102
118
  reasoning_content: 'internal reasoning',
103
119
  },
120
+ {
121
+ role: 'tool',
122
+ tool_call_id: 'call:0',
123
+ content: 'result',
124
+ },
104
125
  {
105
126
  role: 'assistant',
106
- content: null,
127
+ content: 'after tool',
128
+ },
129
+ ];
130
+ t.deepEqual(mergeAssistantMessages(messages), messages);
131
+ });
132
+ test('mergeAssistantMessages merges contiguous assistant messages', (t) => {
133
+ const messages = [
134
+ { role: 'user', content: 'start' },
135
+ { role: 'assistant', content: 'first' },
136
+ { role: 'assistant', content: 'second', reasoning_content: 'reasoning-a' },
137
+ { role: 'assistant', content: null, tool_calls: [{ id: 'call:0' }] },
138
+ { role: 'tool', tool_call_id: 'call:0', content: 'result' },
139
+ { role: 'assistant', content: 'after tool' },
140
+ ];
141
+ t.deepEqual(mergeAssistantMessages(messages), [
142
+ { role: 'user', content: 'start' },
143
+ {
144
+ role: 'assistant',
145
+ content: 'first\nsecond',
146
+ reasoning_content: 'reasoning-a',
107
147
  tool_calls: [{ id: 'call:0' }],
108
148
  },
149
+ { role: 'tool', tool_call_id: 'call:0', content: 'result' },
150
+ { role: 'assistant', content: 'after tool' },
151
+ ]);
152
+ });
153
+ test('mergeAssistantMessages merges contiguous AI SDK assistant content parts', (t) => {
154
+ const messages = [
155
+ {
156
+ role: 'assistant',
157
+ content: [{ type: 'text', text: 'first' }],
158
+ },
159
+ {
160
+ role: 'assistant',
161
+ content: [{ type: 'tool-call', toolCallId: 'call:0', toolName: 'shell', input: {} }],
162
+ },
163
+ {
164
+ role: 'assistant',
165
+ content: [{ type: 'text', text: 'second' }],
166
+ },
167
+ ];
168
+ t.deepEqual(mergeAssistantMessages(messages), [
169
+ {
170
+ role: 'assistant',
171
+ content: [
172
+ { type: 'text', text: 'first' },
173
+ { type: 'tool-call', toolCallId: 'call:0', toolName: 'shell', input: {} },
174
+ { type: 'text', text: 'second' },
175
+ ],
176
+ },
177
+ ]);
178
+ });
179
+ test('mergeAssistantMessages merges real-world split assistant turns before tool results', (t) => {
180
+ const messages = [
181
+ {
182
+ role: 'system',
183
+ content: [{ type: 'text', text: 'You are a lightweight terminal assistant fo...' }],
184
+ },
185
+ {
186
+ role: 'user',
187
+ content: 'Help me test if the grep tool in this enviro...',
188
+ },
189
+ {
190
+ role: 'assistant',
191
+ content: '',
192
+ reasoning: 'The user wants me to test if the grep tool...',
193
+ reasoning_details: [
194
+ {
195
+ type: 'reasoning.text',
196
+ text: 'The user wants me to test if the grep tool...',
197
+ format: 'unknown',
198
+ index: 0,
199
+ },
200
+ ],
201
+ },
202
+ {
203
+ role: 'assistant',
204
+ content: "I'll test the `grep` tool by running the sa...",
205
+ },
206
+ {
207
+ role: 'assistant',
208
+ content: '',
209
+ tool_calls: [
210
+ {
211
+ id: 'chatcmpl-tool-b7beee18ac56f10c',
212
+ type: 'function',
213
+ function: {
214
+ name: 'shell',
215
+ arguments: '{"command":"ls -la"}',
216
+ },
217
+ },
218
+ ],
219
+ reasoning_details: [],
220
+ },
221
+ {
222
+ role: 'tool',
223
+ tool_call_id: 'chatcmpl-tool-b7beee18ac56f10c',
224
+ content: 'exit 0\ntotal 1504\ndrwxr-xr-x@ 34 qduc...',
225
+ name: 'shell',
226
+ },
109
227
  {
110
228
  role: 'assistant',
111
229
  content: '',
112
- reasoning_content: 'already has a tool call',
113
- tool_calls: [{ id: 'call:1' }],
230
+ reasoning: 'Let me look for some content to search for...',
231
+ reasoning_details: [
232
+ {
233
+ type: 'reasoning.text',
234
+ text: 'Let me look for some content to search for...',
235
+ format: 'unknown',
236
+ index: 0,
237
+ },
238
+ ],
239
+ },
240
+ {
241
+ role: 'assistant',
242
+ content: 'Now let me pick a search term and run it wi...',
243
+ },
244
+ {
245
+ role: 'assistant',
246
+ content: '',
247
+ tool_calls: [
248
+ {
249
+ id: 'chatcmpl-tool-81bf68f7f26e9d9c',
250
+ type: 'function',
251
+ function: {
252
+ name: 'shell',
253
+ arguments: '{"command":"grep -r \\"grep\\" --include=\\"*.ts\\"...}',
254
+ },
255
+ },
256
+ ],
257
+ reasoning_details: [],
258
+ },
259
+ {
260
+ role: 'tool',
261
+ tool_call_id: 'chatcmpl-tool-81bf68f7f26e9d9c',
262
+ content: "exit 0\n./dist/tools/grep.js: name: 'g...",
263
+ name: 'shell',
114
264
  },
115
265
  ];
116
- t.deepEqual(mergeAssistantReasoningIntoToolCalls(messages), messages);
266
+ t.deepEqual(mergeAssistantMessages(messages), [
267
+ {
268
+ role: 'system',
269
+ content: [{ type: 'text', text: 'You are a lightweight terminal assistant fo...' }],
270
+ },
271
+ {
272
+ role: 'user',
273
+ content: 'Help me test if the grep tool in this enviro...',
274
+ },
275
+ {
276
+ role: 'assistant',
277
+ content: "I'll test the `grep` tool by running the sa...",
278
+ reasoning: 'The user wants me to test if the grep tool...',
279
+ reasoning_details: [
280
+ {
281
+ type: 'reasoning.text',
282
+ text: 'The user wants me to test if the grep tool...',
283
+ format: 'unknown',
284
+ index: 0,
285
+ },
286
+ ],
287
+ tool_calls: [
288
+ {
289
+ id: 'chatcmpl-tool-b7beee18ac56f10c',
290
+ type: 'function',
291
+ function: {
292
+ name: 'shell',
293
+ arguments: '{"command":"ls -la"}',
294
+ },
295
+ },
296
+ ],
297
+ },
298
+ {
299
+ role: 'tool',
300
+ tool_call_id: 'chatcmpl-tool-b7beee18ac56f10c',
301
+ content: 'exit 0\ntotal 1504\ndrwxr-xr-x@ 34 qduc...',
302
+ name: 'shell',
303
+ },
304
+ {
305
+ role: 'assistant',
306
+ content: 'Now let me pick a search term and run it wi...',
307
+ reasoning: 'Let me look for some content to search for...',
308
+ reasoning_details: [
309
+ {
310
+ type: 'reasoning.text',
311
+ text: 'Let me look for some content to search for...',
312
+ format: 'unknown',
313
+ index: 0,
314
+ },
315
+ ],
316
+ tool_calls: [
317
+ {
318
+ id: 'chatcmpl-tool-81bf68f7f26e9d9c',
319
+ type: 'function',
320
+ function: {
321
+ name: 'shell',
322
+ arguments: '{"command":"grep -r \\"grep\\" --include=\\"*.ts\\"...}',
323
+ },
324
+ },
325
+ ],
326
+ },
327
+ {
328
+ role: 'tool',
329
+ tool_call_id: 'chatcmpl-tool-81bf68f7f26e9d9c',
330
+ content: "exit 0\n./dist/tools/grep.js: name: 'g...",
331
+ name: 'shell',
332
+ },
333
+ ]);
117
334
  });
118
- test('withMergedAssistantReasoning normalizes doGenerate messages before delegating', async (t) => {
335
+ test('withMergedAssistantMessages normalizes doGenerate messages before delegating', async (t) => {
119
336
  let delegatedOptions;
120
- const model = withMergedAssistantReasoning({
337
+ const model = withMergedAssistantMessages({
121
338
  provider: 'example',
122
339
  modelId: 'model',
123
340
  specificationVersion: 'v3',
@@ -140,9 +357,32 @@ test('withMergedAssistantReasoning normalizes doGenerate messages before delegat
140
357
  messages: [{ role: 'assistant', content: null, reasoning_content: 'reasoning', tool_calls: [{ id: 'call:0' }] }],
141
358
  });
142
359
  });
143
- test('withMergedAssistantReasoning normalizes doStream messages before delegating', async (t) => {
360
+ test('withMergedAssistantMessages normalizes doGenerate prompt before delegating', async (t) => {
361
+ let delegatedOptions;
362
+ const model = withMergedAssistantMessages({
363
+ provider: 'example',
364
+ modelId: 'model',
365
+ specificationVersion: 'v3',
366
+ supportedUrls: {},
367
+ doGenerate: async (options) => {
368
+ delegatedOptions = options;
369
+ return { text: 'ok' };
370
+ },
371
+ doStream: async () => ({ stream: [] }),
372
+ });
373
+ await model.doGenerate({
374
+ prompt: [
375
+ { role: 'assistant', content: '', reasoning_content: 'reasoning' },
376
+ { role: 'assistant', content: null, tool_calls: [{ id: 'call:0' }] },
377
+ ],
378
+ });
379
+ t.deepEqual(delegatedOptions.prompt, [
380
+ { role: 'assistant', content: null, reasoning_content: 'reasoning', tool_calls: [{ id: 'call:0' }] },
381
+ ]);
382
+ });
383
+ test('withMergedAssistantMessages normalizes doStream messages before delegating', async (t) => {
144
384
  let delegatedOptions;
145
- const model = withMergedAssistantReasoning({
385
+ const model = withMergedAssistantMessages({
146
386
  provider: 'example',
147
387
  modelId: 'model',
148
388
  specificationVersion: 'v3',
@@ -163,7 +403,7 @@ test('withMergedAssistantReasoning normalizes doStream messages before delegatin
163
403
  { role: 'assistant', content: null, reasoning_content: 'reasoning', tool_calls: [{ id: 'call:0' }] },
164
404
  ]);
165
405
  });
166
- test('withMergedAssistantReasoning preserves model properties exposed by getters', (t) => {
406
+ test('withMergedAssistantMessages preserves model properties exposed by getters', (t) => {
167
407
  class GetterBackedModel {
168
408
  #provider = 'example.chat';
169
409
  #modelId = 'selected-model';
@@ -186,7 +426,7 @@ test('withMergedAssistantReasoning preserves model properties exposed by getters
186
426
  return { stream: [] };
187
427
  }
188
428
  }
189
- const model = withMergedAssistantReasoning(new GetterBackedModel());
429
+ const model = withMergedAssistantMessages(new GetterBackedModel());
190
430
  t.is(model.provider, 'example.chat');
191
431
  t.is(model.modelId, 'selected-model');
192
432
  t.is(model.specificationVersion, 'v3');
@@ -1 +1 @@
1
- {"version":3,"file":"ai-sdk-message-normalizer.test.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-message-normalizer.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ai-sdk-message-normalizer.test.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-message-normalizer.test.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ export type AiSdkOpenAICompatibleConfig = {
3
3
  baseURL: string;
4
4
  apiKey?: string;
5
5
  headers?: Record<string, string>;
6
+ fetch?: typeof fetch;
6
7
  };
7
8
  export type AiSdkOpenAICompatibleProviderFactory = (options: {
8
9
  name: string;
@@ -10,6 +11,7 @@ export type AiSdkOpenAICompatibleProviderFactory = (options: {
10
11
  apiKey?: string;
11
12
  headers?: Record<string, string>;
12
13
  includeUsage?: boolean;
14
+ fetch?: typeof fetch;
13
15
  }) => (modelId: string) => any;
14
16
  export declare class AiSdkOpenAICompatibleProvider implements ModelProvider {
15
17
  #private;
@@ -1 +1 @@
1
- {"version":3,"file":"ai-sdk-openai-compatible.provider.d.ts","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai-compatible.provider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGrE,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG,CAAC,OAAO,EAAE;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,KAAK,CAAC,OAAO,EAAE,MAAM,KAAK,GAAG,CAAC;AAE/B,qBAAa,6BAA8B,YAAW,aAAa;;gBAMrD,IAAI,EAAE;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,2BAA2B,CAAC;QACjD,cAAc,CAAC,EAAE,oCAAoC,CAAC;KACvD;IAOD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK;CAYrD"}
1
+ {"version":3,"file":"ai-sdk-openai-compatible.provider.d.ts","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai-compatible.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGrE,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG,CAAC,OAAO,EAAE;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACtB,KAAK,CAAC,OAAO,EAAE,MAAM,KAAK,GAAG,CAAC;AAE/B,qBAAa,6BAA8B,YAAW,aAAa;;gBAMrD,IAAI,EAAE;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,EAAE,MAAM,CAAC;QACrB,aAAa,EAAE,MAAM,2BAA2B,CAAC;QACjD,cAAc,CAAC,EAAE,oCAAoC,CAAC;KACvD;IAOD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK;CAarD"}
@@ -1,6 +1,5 @@
1
- import { aisdk } from '@openai/agents-extensions/ai-sdk';
2
1
  import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
3
- import { withMergedAssistantReasoning } from './ai-sdk-message-normalizer.js';
2
+ import { adaptAiSdkModelForAgents } from './ai-sdk-agents-adapter.js';
4
3
  export class AiSdkOpenAICompatibleProvider {
5
4
  #label;
6
5
  #defaultModel;
@@ -20,8 +19,9 @@ export class AiSdkOpenAICompatibleProvider {
20
19
  apiKey: config.apiKey,
21
20
  headers: config.headers,
22
21
  includeUsage: true,
22
+ fetch: config.fetch,
23
23
  });
24
- return aisdk(withMergedAssistantReasoning(provider(modelName || this.#defaultModel)));
24
+ return adaptAiSdkModelForAgents(provider(modelName || this.#defaultModel));
25
25
  }
26
26
  }
27
27
  //# sourceMappingURL=ai-sdk-openai-compatible.provider.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ai-sdk-openai-compatible.provider.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai-compatible.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAgB9E,MAAM,OAAO,6BAA6B;IACxC,MAAM,CAAS;IACf,aAAa,CAAS;IACtB,cAAc,CAAoC;IAClD,eAAe,CAAuC;IAEtD,YAAY,IAKX;QACC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,IAAK,sBAA+D,CAAC;IACjH,CAAC;IAED,QAAQ,CAAC,SAAkB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;YACpC,IAAI,EAAE,IAAI,CAAC,MAAM;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,4BAA4B,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAqB,CAAC;IAC5G,CAAC;CACF"}
1
+ {"version":3,"file":"ai-sdk-openai-compatible.provider.js","sourceRoot":"","sources":["../../source/providers/ai-sdk-openai-compatible.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAkBtE,MAAM,OAAO,6BAA6B;IACxC,MAAM,CAAS;IACf,aAAa,CAAS;IACtB,cAAc,CAAoC;IAClD,eAAe,CAAuC;IAEtD,YAAY,IAKX;QACC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,IAAK,sBAA+D,CAAC;IACjH,CAAC;IAED,QAAQ,CAAC,SAAkB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;YACpC,IAAI,EAAE,IAAI,CAAC,MAAM;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,YAAY,EAAE,IAAI;YAClB,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC,CAAC;QAEH,OAAO,wBAAwB,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF"}
@@ -65,4 +65,29 @@ test('AiSdkOpenAICompatibleProvider uses the default model when none is requeste
65
65
  provider.getModel();
66
66
  t.is(requestedModel, 'fallback-model');
67
67
  });
68
+ test('AiSdkOpenAICompatibleProvider passes configured fetch to OpenAI-compatible provider', (t) => {
69
+ const fetchImpl = async () => new Response('{}');
70
+ const calls = [];
71
+ const provider = new AiSdkOpenAICompatibleProvider({
72
+ label: 'Example',
73
+ defaultModel: 'fallback-model',
74
+ resolveConfig: () => ({
75
+ baseURL: 'https://example.test/v1',
76
+ fetch: fetchImpl,
77
+ }),
78
+ createProvider: (options) => {
79
+ calls.push(options);
80
+ return (modelId) => ({
81
+ specificationVersion: 'v3',
82
+ provider: 'example.chat',
83
+ modelId,
84
+ supportedUrls: {},
85
+ doGenerate: async () => ({}),
86
+ doStream: async () => ({ stream: [] }),
87
+ });
88
+ },
89
+ });
90
+ provider.getModel('selected-model');
91
+ t.is(calls[0].fetch, fetchImpl);
92
+ });
68
93
  //# sourceMappingURL=ai-sdk-openai-compatible.provider.test.js.map