@qduc/term2 0.1.6 → 0.1.7

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 (300) hide show
  1. package/dist/agent.lite-mode.test.d.ts +2 -0
  2. package/dist/agent.lite-mode.test.d.ts.map +1 -0
  3. package/dist/agent.lite-mode.test.js +39 -0
  4. package/dist/agent.lite-mode.test.js.map +1 -0
  5. package/dist/components/TextInput.d.ts.map +1 -1
  6. package/dist/components/TextInput.js +2 -1
  7. package/dist/components/TextInput.js.map +1 -1
  8. package/dist/components/TextInput.test.js.map +1 -1
  9. package/dist/debug_ask_mentor.d.ts +2 -0
  10. package/dist/debug_ask_mentor.d.ts.map +1 -0
  11. package/dist/debug_ask_mentor.js +73 -0
  12. package/dist/debug_ask_mentor.js.map +1 -0
  13. package/dist/lib/openai-agent-client.d.ts.map +1 -1
  14. package/dist/lib/openai-agent-client.js +2 -1
  15. package/dist/lib/openai-agent-client.js.map +1 -1
  16. package/dist/lib/openai-strict-tool-schema.d.ts +10 -0
  17. package/dist/lib/openai-strict-tool-schema.d.ts.map +1 -0
  18. package/dist/lib/openai-strict-tool-schema.js +39 -0
  19. package/dist/lib/openai-strict-tool-schema.js.map +1 -0
  20. package/dist/lib/openai-strict-tool-schema.test.d.ts +2 -0
  21. package/dist/lib/openai-strict-tool-schema.test.d.ts.map +1 -0
  22. package/dist/lib/openai-strict-tool-schema.test.js +26 -0
  23. package/dist/lib/openai-strict-tool-schema.test.js.map +1 -0
  24. package/dist/modes/companion/command-index.d.ts +26 -0
  25. package/dist/modes/companion/command-index.d.ts.map +1 -0
  26. package/dist/modes/companion/command-index.js +50 -0
  27. package/dist/modes/companion/command-index.js.map +1 -0
  28. package/dist/modes/companion/command-index.test.d.ts +2 -0
  29. package/dist/modes/companion/command-index.test.d.ts.map +1 -0
  30. package/dist/modes/companion/command-index.test.js +86 -0
  31. package/dist/modes/companion/command-index.test.js.map +1 -0
  32. package/dist/modes/companion/companion-app.d.ts +12 -0
  33. package/dist/modes/companion/companion-app.d.ts.map +1 -0
  34. package/dist/modes/companion/companion-app.js +297 -0
  35. package/dist/modes/companion/companion-app.js.map +1 -0
  36. package/dist/modes/companion/companion-session.d.ts +63 -0
  37. package/dist/modes/companion/companion-session.d.ts.map +1 -0
  38. package/dist/modes/companion/companion-session.js +146 -0
  39. package/dist/modes/companion/companion-session.js.map +1 -0
  40. package/dist/modes/companion/companion-session.test.d.ts +2 -0
  41. package/dist/modes/companion/companion-session.test.d.ts.map +1 -0
  42. package/dist/modes/companion/companion-session.test.js +28 -0
  43. package/dist/modes/companion/companion-session.test.js.map +1 -0
  44. package/dist/modes/companion/components/status-bar.d.ts +13 -0
  45. package/dist/modes/companion/components/status-bar.d.ts.map +1 -0
  46. package/dist/modes/companion/components/status-bar.js +26 -0
  47. package/dist/modes/companion/components/status-bar.js.map +1 -0
  48. package/dist/modes/companion/context-buffer.d.ts +65 -0
  49. package/dist/modes/companion/context-buffer.d.ts.map +1 -0
  50. package/dist/modes/companion/context-buffer.js +156 -0
  51. package/dist/modes/companion/context-buffer.js.map +1 -0
  52. package/dist/modes/companion/context-buffer.test.d.ts +2 -0
  53. package/dist/modes/companion/context-buffer.test.d.ts.map +1 -0
  54. package/dist/modes/companion/context-buffer.test.js +154 -0
  55. package/dist/modes/companion/context-buffer.test.js.map +1 -0
  56. package/dist/modes/companion/event-detector.d.ts +46 -0
  57. package/dist/modes/companion/event-detector.d.ts.map +1 -0
  58. package/dist/modes/companion/event-detector.js +169 -0
  59. package/dist/modes/companion/event-detector.js.map +1 -0
  60. package/dist/modes/companion/event-detector.test.d.ts +2 -0
  61. package/dist/modes/companion/event-detector.test.d.ts.map +1 -0
  62. package/dist/modes/companion/event-detector.test.js +121 -0
  63. package/dist/modes/companion/event-detector.test.js.map +1 -0
  64. package/dist/modes/companion/index.d.ts +33 -0
  65. package/dist/modes/companion/index.d.ts.map +1 -0
  66. package/dist/modes/companion/index.js +21 -0
  67. package/dist/modes/companion/index.js.map +1 -0
  68. package/dist/modes/companion/input-key-mapper.d.ts +3 -0
  69. package/dist/modes/companion/input-key-mapper.d.ts.map +1 -0
  70. package/dist/modes/companion/input-key-mapper.js +31 -0
  71. package/dist/modes/companion/input-key-mapper.js.map +1 -0
  72. package/dist/modes/companion/input-key-mapper.test.d.ts +2 -0
  73. package/dist/modes/companion/input-key-mapper.test.d.ts.map +1 -0
  74. package/dist/modes/companion/input-key-mapper.test.js +26 -0
  75. package/dist/modes/companion/input-key-mapper.test.js.map +1 -0
  76. package/dist/modes/companion/input-parser.d.ts +53 -0
  77. package/dist/modes/companion/input-parser.d.ts.map +1 -0
  78. package/dist/modes/companion/input-parser.js +114 -0
  79. package/dist/modes/companion/input-parser.js.map +1 -0
  80. package/dist/modes/companion/input-parser.test.d.ts +2 -0
  81. package/dist/modes/companion/input-parser.test.d.ts.map +1 -0
  82. package/dist/modes/companion/input-parser.test.js +123 -0
  83. package/dist/modes/companion/input-parser.test.js.map +1 -0
  84. package/dist/modes/companion/mode-manager.d.ts +41 -0
  85. package/dist/modes/companion/mode-manager.d.ts.map +1 -0
  86. package/dist/modes/companion/mode-manager.js +56 -0
  87. package/dist/modes/companion/mode-manager.js.map +1 -0
  88. package/dist/modes/companion/mode-manager.test.d.ts +2 -0
  89. package/dist/modes/companion/mode-manager.test.d.ts.map +1 -0
  90. package/dist/modes/companion/mode-manager.test.js +65 -0
  91. package/dist/modes/companion/mode-manager.test.js.map +1 -0
  92. package/dist/modes/companion/output-classifier.d.ts +15 -0
  93. package/dist/modes/companion/output-classifier.d.ts.map +1 -0
  94. package/dist/modes/companion/output-classifier.js +77 -0
  95. package/dist/modes/companion/output-classifier.js.map +1 -0
  96. package/dist/modes/companion/output-classifier.test.d.ts +2 -0
  97. package/dist/modes/companion/output-classifier.test.d.ts.map +1 -0
  98. package/dist/modes/companion/output-classifier.test.js +133 -0
  99. package/dist/modes/companion/output-classifier.test.js.map +1 -0
  100. package/dist/modes/companion/pty-wrapper.d.ts +46 -0
  101. package/dist/modes/companion/pty-wrapper.d.ts.map +1 -0
  102. package/dist/modes/companion/pty-wrapper.js +143 -0
  103. package/dist/modes/companion/pty-wrapper.js.map +1 -0
  104. package/dist/modes/companion/safety-classifier.d.ts +31 -0
  105. package/dist/modes/companion/safety-classifier.d.ts.map +1 -0
  106. package/dist/modes/companion/safety-classifier.js +140 -0
  107. package/dist/modes/companion/safety-classifier.js.map +1 -0
  108. package/dist/modes/companion/safety-classifier.test.d.ts +2 -0
  109. package/dist/modes/companion/safety-classifier.test.d.ts.map +1 -0
  110. package/dist/modes/companion/safety-classifier.test.js +151 -0
  111. package/dist/modes/companion/safety-classifier.test.js.map +1 -0
  112. package/dist/modes/companion/summarizer.d.ts +24 -0
  113. package/dist/modes/companion/summarizer.d.ts.map +1 -0
  114. package/dist/modes/companion/summarizer.js +132 -0
  115. package/dist/modes/companion/summarizer.js.map +1 -0
  116. package/dist/modes/companion/terminal-history.d.ts +27 -0
  117. package/dist/modes/companion/terminal-history.d.ts.map +1 -0
  118. package/dist/modes/companion/terminal-history.js +142 -0
  119. package/dist/modes/companion/terminal-history.js.map +1 -0
  120. package/dist/prompts/simple-mentor.md +8 -0
  121. package/dist/providers/github-copilot/model.d.ts.map +1 -1
  122. package/dist/providers/github-copilot/model.js +25 -108
  123. package/dist/providers/github-copilot/model.js.map +1 -1
  124. package/dist/providers/github-copilot/model.test.d.ts +2 -0
  125. package/dist/providers/github-copilot/model.test.d.ts.map +1 -0
  126. package/dist/providers/github-copilot/model.test.js +63 -0
  127. package/dist/providers/github-copilot/model.test.js.map +1 -0
  128. package/dist/providers/github-copilot/provider.d.ts +0 -5
  129. package/dist/providers/github-copilot/provider.d.ts.map +1 -1
  130. package/dist/providers/github-copilot/provider.js +2 -7
  131. package/dist/providers/github-copilot/provider.js.map +1 -1
  132. package/dist/providers/openai-compatible/model.js +3 -3
  133. package/dist/providers/openai-compatible/model.js.map +1 -1
  134. package/dist/providers/openai-compatible/reasoning-content.test.js +70 -0
  135. package/dist/providers/openai-compatible/reasoning-content.test.js.map +1 -1
  136. package/dist/providers/openrouter/model.js +3 -3
  137. package/dist/providers/openrouter/model.js.map +1 -1
  138. package/dist/providers/openrouter/utils.d.ts +1 -0
  139. package/dist/providers/openrouter/utils.d.ts.map +1 -1
  140. package/dist/providers/openrouter/utils.js +3 -0
  141. package/dist/providers/openrouter/utils.js.map +1 -1
  142. package/dist/providers/openrouter.test.js +64 -0
  143. package/dist/providers/openrouter.test.js.map +1 -1
  144. package/dist/services/check_mock.d.ts +2 -0
  145. package/dist/services/check_mock.d.ts.map +1 -0
  146. package/dist/services/check_mock.js +22 -0
  147. package/dist/services/check_mock.js.map +1 -0
  148. package/dist/services/conversation-service.test.d.ts +2 -0
  149. package/dist/services/conversation-service.test.d.ts.map +1 -0
  150. package/dist/services/conversation-service.test.js +149 -183
  151. package/dist/services/conversation-service.test.js.map +1 -0
  152. package/dist/tools/ask-mentor.d.ts +1 -1
  153. package/dist/tools/ask-mentor.js +1 -1
  154. package/dist/tools/ask-mentor.js.map +1 -1
  155. package/dist/tools/ask-mentor.test.js +9 -3
  156. package/dist/tools/ask-mentor.test.js.map +1 -1
  157. package/dist/tools/find-files.d.ts +2 -2
  158. package/dist/tools/find-files.d.ts.map +1 -1
  159. package/dist/tools/find-files.js +2 -4
  160. package/dist/tools/find-files.js.map +1 -1
  161. package/dist/tools/find-files.test.js +7 -19
  162. package/dist/tools/find-files.test.js.map +1 -1
  163. package/dist/tools/grep.d.ts +1 -1
  164. package/dist/tools/grep.d.ts.map +1 -1
  165. package/dist/tools/grep.js +1 -5
  166. package/dist/tools/grep.js.map +1 -1
  167. package/dist/tools/read-file.d.ts +2 -2
  168. package/dist/tools/read-file.d.ts.map +1 -1
  169. package/dist/tools/read-file.js +2 -4
  170. package/dist/tools/read-file.js.map +1 -1
  171. package/dist/tools/read-file.test.js +7 -13
  172. package/dist/tools/read-file.test.js.map +1 -1
  173. package/dist/tools/search-replace.d.ts +1 -1
  174. package/dist/tools/search-replace.d.ts.map +1 -1
  175. package/dist/tools/search-replace.js +1 -0
  176. package/dist/tools/search-replace.js.map +1 -1
  177. package/dist/tools/search.d.ts +4 -4
  178. package/dist/tools/search.d.ts.map +1 -1
  179. package/dist/tools/search.js +5 -14
  180. package/dist/tools/search.js.map +1 -1
  181. package/dist/tools/shell.d.ts +2 -2
  182. package/dist/tools/shell.d.ts.map +1 -1
  183. package/dist/tools/shell.js +2 -4
  184. package/dist/tools/shell.js.map +1 -1
  185. package/dist/tools/tool-parameter-schema.test.d.ts +2 -0
  186. package/dist/tools/tool-parameter-schema.test.d.ts.map +1 -0
  187. package/dist/tools/tool-parameter-schema.test.js +88 -0
  188. package/dist/tools/tool-parameter-schema.test.js.map +1 -0
  189. package/dist/tools/web-fetch.d.ts +3 -3
  190. package/dist/tools/web-fetch.d.ts.map +1 -1
  191. package/dist/tools/web-fetch.js +3 -2
  192. package/dist/tools/web-fetch.js.map +1 -1
  193. package/dist/utils/command-safety.d.ts.map +1 -1
  194. package/dist/utils/command-safety.devnull.test.d.ts +2 -0
  195. package/dist/utils/command-safety.devnull.test.d.ts.map +1 -0
  196. package/dist/utils/command-safety.devnull.test.js +13 -0
  197. package/dist/utils/command-safety.devnull.test.js.map +1 -0
  198. package/dist/utils/command-safety.js +10 -364
  199. package/dist/utils/command-safety.js.map +1 -1
  200. package/dist/utils/extract-command-messages.test.d.ts +2 -0
  201. package/dist/utils/extract-command-messages.test.d.ts.map +1 -0
  202. package/dist/utils/extract-command-messages.test.js +58 -51
  203. package/dist/utils/extract-command-messages.test.js.map +1 -0
  204. package/package.json +1 -1
  205. package/dist/app.model-command-feedback.test.d.ts +0 -2
  206. package/dist/app.model-command-feedback.test.d.ts.map +0 -1
  207. package/dist/app.model-command-feedback.test.js +0 -19
  208. package/dist/app.model-command-feedback.test.js.map +0 -1
  209. package/dist/components/MentorMode.test.d.ts +0 -2
  210. package/dist/components/MentorMode.test.d.ts.map +0 -1
  211. package/dist/components/MentorMode.test.js.map +0 -1
  212. package/dist/components/StatusBar.test.d.ts +0 -2
  213. package/dist/components/StatusBar.test.d.ts.map +0 -1
  214. package/dist/components/StatusBar.test.js +0 -19
  215. package/dist/components/StatusBar.test.js.map +0 -1
  216. package/dist/debug-schema.d.ts +0 -2
  217. package/dist/debug-schema.d.ts.map +0 -1
  218. package/dist/debug-schema.js +0 -22
  219. package/dist/debug-schema.js.map +0 -1
  220. package/dist/hooks/use-model-selection.test.d.ts +0 -2
  221. package/dist/hooks/use-model-selection.test.d.ts.map +0 -1
  222. package/dist/hooks/use-model-selection.test.js +0 -28
  223. package/dist/hooks/use-model-selection.test.js.map +0 -1
  224. package/dist/hooks/use-path-completion.test.d.ts +0 -2
  225. package/dist/hooks/use-path-completion.test.d.ts.map +0 -1
  226. package/dist/hooks/use-path-completion.test.js +0 -29
  227. package/dist/hooks/use-path-completion.test.js.map +0 -1
  228. package/dist/lib/mentor-client.d.ts +0 -41
  229. package/dist/lib/mentor-client.d.ts.map +0 -1
  230. package/dist/lib/mentor-client.js +0 -146
  231. package/dist/lib/mentor-client.js.map +0 -1
  232. package/dist/lib/mentor-client.test.d.ts +0 -2
  233. package/dist/lib/mentor-client.test.d.ts.map +0 -1
  234. package/dist/lib/mentor-client.test.js +0 -440
  235. package/dist/lib/mentor-client.test.js.map +0 -1
  236. package/dist/lib/retry-strategy.d.ts +0 -43
  237. package/dist/lib/retry-strategy.d.ts.map +0 -1
  238. package/dist/lib/retry-strategy.js +0 -93
  239. package/dist/lib/retry-strategy.js.map +0 -1
  240. package/dist/lib/retry-strategy.test.d.ts +0 -2
  241. package/dist/lib/retry-strategy.test.d.ts.map +0 -1
  242. package/dist/lib/retry-strategy.test.js +0 -200
  243. package/dist/lib/retry-strategy.test.js.map +0 -1
  244. package/dist/prompts/default.md.bak +0 -77
  245. package/dist/providers/github-copilot/model-direct.d.ts +0 -34
  246. package/dist/providers/github-copilot/model-direct.d.ts.map +0 -1
  247. package/dist/providers/github-copilot/model-direct.js +0 -443
  248. package/dist/providers/github-copilot/model-direct.js.map +0 -1
  249. package/dist/providers/openrouter/merge-messages.test.d.ts +0 -2
  250. package/dist/providers/openrouter/merge-messages.test.d.ts.map +0 -1
  251. package/dist/providers/openrouter/merge-messages.test.js +0 -83
  252. package/dist/providers/openrouter/merge-messages.test.js.map +0 -1
  253. package/dist/providers/openrouter.history.test.d.ts +0 -2
  254. package/dist/providers/openrouter.history.test.d.ts.map +0 -1
  255. package/dist/providers/openrouter.history.test.js +0 -533
  256. package/dist/providers/openrouter.history.test.js.map +0 -1
  257. package/dist/reproduce_issue.test.d.ts +0 -2
  258. package/dist/reproduce_issue.test.d.ts.map +0 -1
  259. package/dist/reproduce_issue.test.js +0 -31
  260. package/dist/reproduce_issue.test.js.map +0 -1
  261. package/dist/services/conversation-result-builder.d.ts +0 -41
  262. package/dist/services/conversation-result-builder.d.ts.map +0 -1
  263. package/dist/services/conversation-result-builder.js +0 -110
  264. package/dist/services/conversation-result-builder.js.map +0 -1
  265. package/dist/services/conversation-result-builder.test.d.ts +0 -2
  266. package/dist/services/conversation-result-builder.test.d.ts.map +0 -1
  267. package/dist/services/conversation-result-builder.test.js +0 -76
  268. package/dist/services/conversation-result-builder.test.js.map +0 -1
  269. package/dist/services/conversation-session.usage.test.d.ts +0 -2
  270. package/dist/services/conversation-session.usage.test.d.ts.map +0 -1
  271. package/dist/services/conversation-session.usage.test.js +0 -59
  272. package/dist/services/conversation-session.usage.test.js.map +0 -1
  273. package/dist/services/stream-event-processor.d.ts +0 -32
  274. package/dist/services/stream-event-processor.d.ts.map +0 -1
  275. package/dist/services/stream-event-processor.js +0 -344
  276. package/dist/services/stream-event-processor.js.map +0 -1
  277. package/dist/services/stream-event-processor.test.d.ts +0 -2
  278. package/dist/services/stream-event-processor.test.d.ts.map +0 -1
  279. package/dist/services/stream-event-processor.test.js +0 -117
  280. package/dist/services/stream-event-processor.test.js.map +0 -1
  281. package/dist/test-search-tool.d.ts +0 -2
  282. package/dist/test-search-tool.d.ts.map +0 -1
  283. package/dist/test-search-tool.js +0 -36
  284. package/dist/test-search-tool.js.map +0 -1
  285. package/dist/types/messages.d.ts +0 -29
  286. package/dist/types/messages.d.ts.map +0 -1
  287. package/dist/types/messages.js +0 -2
  288. package/dist/types/messages.js.map +0 -1
  289. package/dist/utils/extract-command-messages.repro.test.d.ts +0 -2
  290. package/dist/utils/extract-command-messages.repro.test.d.ts.map +0 -1
  291. package/dist/utils/extract-command-messages.repro.test.js +0 -31
  292. package/dist/utils/extract-command-messages.repro.test.js.map +0 -1
  293. package/dist/utils/message-utils.d.ts +0 -17
  294. package/dist/utils/message-utils.d.ts.map +0 -1
  295. package/dist/utils/message-utils.js +0 -52
  296. package/dist/utils/message-utils.js.map +0 -1
  297. package/dist/utils/message-utils.test.d.ts +0 -2
  298. package/dist/utils/message-utils.test.d.ts.map +0 -1
  299. package/dist/utils/message-utils.test.js +0 -48
  300. package/dist/utils/message-utils.test.js.map +0 -1
@@ -1,110 +0,0 @@
1
- import { extractCommandMessages } from '../utils/extract-command-messages.js';
2
- import { extractUsage } from '../utils/token-usage.js';
3
- export const getCommandFromArgs = (args) => {
4
- if (!args) {
5
- return '';
6
- }
7
- if (typeof args === 'string') {
8
- try {
9
- const parsed = JSON.parse(args);
10
- // Handle shell tool's command parameter
11
- if (parsed?.command) {
12
- return parsed.command;
13
- }
14
- // Fallback for old 'commands' array format
15
- if (Array.isArray(parsed?.commands)) {
16
- return parsed.commands.join('\n');
17
- }
18
- return JSON.stringify(parsed);
19
- }
20
- catch {
21
- return args;
22
- }
23
- }
24
- if (typeof args === 'object') {
25
- // Handle shell tool's command parameter
26
- const cmdFromObject = 'command' in args ? String(args.command) : undefined;
27
- // Fallback for old 'commands' array format
28
- if ('commands' in args && Array.isArray(args.commands)) {
29
- return args.commands.join('\n');
30
- }
31
- let argsFromObject;
32
- if ('arguments' in args) {
33
- const rawArguments = args.arguments;
34
- if (typeof rawArguments === 'string') {
35
- try {
36
- argsFromObject = JSON.stringify(JSON.parse(rawArguments));
37
- }
38
- catch {
39
- argsFromObject = String(rawArguments);
40
- }
41
- }
42
- else if (rawArguments !== undefined) {
43
- argsFromObject = String(rawArguments);
44
- }
45
- }
46
- return cmdFromObject ?? argsFromObject ?? JSON.stringify(args);
47
- }
48
- return String(args);
49
- };
50
- export const buildConversationResult = ({ result, finalOutputOverride, reasoningOutputOverride, emittedCommandIds, usage, getToolCallArgumentsSnapshot, }) => {
51
- if (result.interruptions && result.interruptions.length > 0) {
52
- const interruption = result.interruptions[0];
53
- const pendingApprovalContext = {
54
- state: result.state,
55
- interruption,
56
- emittedCommandIds: emittedCommandIds ?? new Set(),
57
- toolCallArgumentsById: getToolCallArgumentsSnapshot?.() ?? new Map(),
58
- };
59
- let argumentsText = '';
60
- const toolName = interruption.name;
61
- // For shell_call (built-in shell tool), extract commands from action
62
- // For function tools (bash, shell), extract from arguments
63
- if (interruption.type === 'shell_call') {
64
- if (interruption.action?.commands) {
65
- argumentsText = Array.isArray(interruption.action.commands)
66
- ? interruption.action.commands.join('\n')
67
- : String(interruption.action.commands);
68
- }
69
- }
70
- else {
71
- argumentsText = getCommandFromArgs(interruption.arguments);
72
- }
73
- const callId = interruption?.rawItem?.callId ??
74
- interruption?.callId ??
75
- interruption?.call_id ??
76
- interruption?.tool_call_id ??
77
- interruption?.toolCallId ??
78
- interruption?.id;
79
- return {
80
- conversationResult: {
81
- type: 'approval_required',
82
- approval: {
83
- agentName: interruption.agent?.name ?? 'Agent',
84
- toolName: toolName ?? 'Unknown Tool',
85
- argumentsText,
86
- rawInterruption: interruption,
87
- ...(callId ? { callId: String(callId) } : {}),
88
- },
89
- },
90
- pendingApprovalContext,
91
- };
92
- }
93
- const allCommandMessages = extractCommandMessages(result.newItems || result.history || []);
94
- // Filter out commands that were already emitted in real-time
95
- const commandMessages = emittedCommandIds
96
- ? allCommandMessages.filter((msg) => !emittedCommandIds.has(msg.id))
97
- : allCommandMessages;
98
- const visibleCommandMessages = commandMessages.filter((msg) => !msg.isApprovalRejection);
99
- return {
100
- conversationResult: {
101
- type: 'response',
102
- commandMessages: visibleCommandMessages,
103
- finalText: finalOutputOverride ?? result.finalOutput ?? 'Done.',
104
- reasoningText: reasoningOutputOverride,
105
- usage: usage ?? extractUsage(result),
106
- },
107
- pendingApprovalContext: null,
108
- };
109
- };
110
- //# sourceMappingURL=conversation-result-builder.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"conversation-result-builder.js","sourceRoot":"","sources":["../../source/services/conversation-result-builder.ts"],"names":[],"mappings":"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"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=conversation-result-builder.test.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"conversation-result-builder.test.d.ts","sourceRoot":"","sources":["../../source/services/conversation-result-builder.test.ts"],"names":[],"mappings":""}
@@ -1,76 +0,0 @@
1
- import test from 'ava';
2
- import { buildConversationResult, getCommandFromArgs } from './conversation-result-builder.js';
3
- import { clearApprovalRejectionMarkers, markToolCallAsApprovalRejection } from '../utils/extract-command-messages.js';
4
- test('getCommandFromArgs: handles nullish inputs', (t) => {
5
- t.is(getCommandFromArgs(undefined), '');
6
- t.is(getCommandFromArgs(null), '');
7
- });
8
- test('getCommandFromArgs: prefers command from JSON string', (t) => {
9
- t.is(getCommandFromArgs('{"command":"ls -la"}'), 'ls -la');
10
- });
11
- test('getCommandFromArgs: joins commands array from JSON string', (t) => {
12
- t.is(getCommandFromArgs('{"commands":["one","two"]}'), 'one\ntwo');
13
- });
14
- test('getCommandFromArgs: returns invalid JSON string as-is', (t) => {
15
- t.is(getCommandFromArgs('not json'), 'not json');
16
- });
17
- test('getCommandFromArgs: extracts from object arguments', (t) => {
18
- t.is(getCommandFromArgs({ command: 'pwd' }), 'pwd');
19
- t.is(getCommandFromArgs({ commands: ['a', 'b'] }), 'a\nb');
20
- t.is(getCommandFromArgs({ arguments: '{"foo":"bar"}' }), '{"foo":"bar"}');
21
- });
22
- test('buildConversationResult: returns approval_required for interruptions', (t) => {
23
- const toolArgs = new Map([['call-1', { command: 'ls' }]]);
24
- const { conversationResult, pendingApprovalContext } = buildConversationResult({
25
- result: {
26
- interruptions: [
27
- {
28
- type: 'shell_call',
29
- name: 'shell',
30
- action: { commands: ['ls', 'pwd'] },
31
- agent: { name: 'Agent Smith' },
32
- rawItem: { callId: 'call-1' },
33
- },
34
- ],
35
- state: { id: 'state' },
36
- },
37
- emittedCommandIds: new Set(['already-emitted']),
38
- getToolCallArgumentsSnapshot: () => toolArgs,
39
- });
40
- t.is(conversationResult.type, 'approval_required');
41
- const approval = conversationResult.approval;
42
- t.is(approval.argumentsText, 'ls\npwd');
43
- t.is(approval.toolName, 'shell');
44
- t.is(approval.agentName, 'Agent Smith');
45
- t.is(approval.callId, 'call-1');
46
- t.is(pendingApprovalContext?.toolCallArgumentsById.get('call-1'), toolArgs.get('call-1'));
47
- });
48
- test('buildConversationResult: filters emitted and approval rejection messages', (t) => {
49
- clearApprovalRejectionMarkers();
50
- const items = [
51
- { type: 'function_call', name: 'shell', arguments: { command: 'echo one' }, callId: 'call-1' },
52
- { type: 'function_call_result', name: 'shell', output: 'exit 0\none', callId: 'call-1' },
53
- { type: 'function_call', name: 'shell', arguments: { command: 'echo two' }, callId: 'call-2' },
54
- { type: 'function_call_result', name: 'shell', output: 'exit 1\ntwo', callId: 'call-2' },
55
- { type: 'function_call', name: 'shell', arguments: { command: 'echo three' }, callId: 'call-3' },
56
- { type: 'function_call_result', name: 'shell', output: 'exit 0\nthree', callId: 'call-3' },
57
- ];
58
- markToolCallAsApprovalRejection('call-2');
59
- const { conversationResult, pendingApprovalContext } = buildConversationResult({
60
- result: { history: items, finalOutput: 'Done.' },
61
- emittedCommandIds: new Set(['call-1-0']),
62
- reasoningOutputOverride: 'Because.',
63
- usage: { total_tokens: 3 },
64
- });
65
- t.is(pendingApprovalContext, null);
66
- t.is(conversationResult.type, 'response');
67
- const response = conversationResult;
68
- t.is(response.finalText, 'Done.');
69
- t.is(response.reasoningText, 'Because.');
70
- t.deepEqual(response.usage, { total_tokens: 3 });
71
- t.is(response.commandMessages.length, 1);
72
- t.is(response.commandMessages[0].command, 'echo three');
73
- t.is(response.commandMessages[0].callId, 'call-3');
74
- clearApprovalRejectionMarkers();
75
- });
76
- //# sourceMappingURL=conversation-result-builder.test.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"conversation-result-builder.test.js","sourceRoot":"","sources":["../../source/services/conversation-result-builder.test.ts"],"names":[],"mappings":"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"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=conversation-session.usage.test.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"conversation-session.usage.test.d.ts","sourceRoot":"","sources":["../../source/services/conversation-session.usage.test.ts"],"names":[],"mappings":""}
@@ -1,59 +0,0 @@
1
- import test from 'ava';
2
- import { ConversationSession } from './conversation-session.js';
3
- const mockLogger = {
4
- info: () => { },
5
- warn: () => { },
6
- error: () => { },
7
- debug: () => { },
8
- security: () => { },
9
- setCorrelationId: () => { },
10
- getCorrelationId: () => { },
11
- clearCorrelationId: () => { },
12
- };
13
- class MockStream {
14
- events;
15
- completed;
16
- lastResponseId = 'resp_test';
17
- interruptions = [];
18
- state = {};
19
- newItems = [];
20
- history = [];
21
- finalOutput = '';
22
- constructor(events, completedResult = {}) {
23
- this.events = events;
24
- this.completed = Promise.resolve(completedResult);
25
- }
26
- async *[Symbol.asyncIterator]() {
27
- for (const event of this.events) {
28
- yield event;
29
- }
30
- }
31
- }
32
- test('run() captures and yields token usage', async (t) => {
33
- const events = [
34
- { type: 'response.output_text.delta', delta: 'Hello' },
35
- { usage: { prompt_tokens: 10, completion_tokens: 20 } }
36
- ];
37
- const stream = new MockStream(events);
38
- stream.finalOutput = 'Hello';
39
- const mockClient = {
40
- async startStream() {
41
- return stream;
42
- },
43
- };
44
- const session = new ConversationSession('s1', {
45
- agentClient: mockClient,
46
- deps: { logger: mockLogger },
47
- });
48
- const emitted = [];
49
- for await (const ev of session.run('hi')) {
50
- emitted.push(ev);
51
- }
52
- const finalEvent = emitted.find(e => e.type === 'final');
53
- t.truthy(finalEvent);
54
- t.truthy(finalEvent.usage);
55
- t.is(finalEvent.usage.prompt_tokens, 10);
56
- t.is(finalEvent.usage.completion_tokens, 20);
57
- t.is(finalEvent.usage.total_tokens, 30);
58
- });
59
- //# sourceMappingURL=conversation-session.usage.test.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"conversation-session.usage.test.js","sourceRoot":"","sources":["../../source/services/conversation-session.usage.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAC;AAE9D,MAAM,UAAU,GAAG;IACf,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;CACxB,CAAC;AAET,MAAM,UAAU;IACL,MAAM,CAAQ;IACd,SAAS,CAAe;IACxB,cAAc,GAAG,WAAW,CAAC;IAC7B,aAAa,GAAG,EAAE,CAAC;IACnB,KAAK,GAAG,EAAE,CAAC;IACX,QAAQ,GAAG,EAAE,CAAC;IACd,OAAO,GAAG,EAAE,CAAC;IACb,WAAW,GAAG,EAAE,CAAC;IAExB,YAAY,MAAa,EAAE,kBAAuB,EAAE;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QACzB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9B,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;CACJ;AAED,IAAI,CAAC,uCAAuC,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IACpD,MAAM,MAAM,GAAG;QACX,EAAC,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,OAAO,EAAC;QACpD,EAAC,KAAK,EAAE,EAAC,aAAa,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAC,EAAC;KACtD,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,CAAC,WAAW,GAAG,OAAO,CAAC;IAE7B,MAAM,UAAU,GAAG;QACf,KAAK,CAAC,WAAW;YACb,OAAO,MAAM,CAAC;QAClB,CAAC;KACG,CAAC;IAET,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,IAAI,EAAE;QAC1C,WAAW,EAAE,UAAU;QACvB,IAAI,EAAE,EAAC,MAAM,EAAE,UAAU,EAAC;KAC7B,CAAC,CAAC;IAEH,MAAM,OAAO,GAAU,EAAE,CAAC;IAC1B,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrB,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;IACzD,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACrB,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC"}
@@ -1,32 +0,0 @@
1
- import { type NormalizedUsage } from '../utils/token-usage.js';
2
- import type { ConversationEvent } from './conversation-events.js';
3
- import type { ILoggingService } from './service-interfaces.js';
4
- interface StreamEventAccumulator {
5
- finalOutput: string;
6
- reasoningOutput: string;
7
- emittedCommandIds: Set<string>;
8
- latestUsage?: NormalizedUsage;
9
- }
10
- export declare class StreamEventProcessor {
11
- #private;
12
- private logger;
13
- private sessionId;
14
- private toolCallArgumentsById;
15
- private textDeltaCount;
16
- private reasoningDeltaCount;
17
- private lastEventType;
18
- private eventTypeCount;
19
- constructor({ logger, sessionId }: {
20
- logger: ILoggingService;
21
- sessionId: string;
22
- });
23
- reset(): void;
24
- getToolCallArgumentsSnapshot(): Map<string, unknown>;
25
- restoreToolCallArguments(snapshot?: Map<string, unknown> | null): void;
26
- streamEvents(stream: any, acc: StreamEventAccumulator, { preserveExistingToolArgs }: {
27
- preserveExistingToolArgs: boolean;
28
- }): AsyncIterable<ConversationEvent>;
29
- private flushStreamEventLog;
30
- }
31
- export {};
32
- //# sourceMappingURL=stream-event-processor.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"stream-event-processor.d.ts","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,UAAU,sBAAsB;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B;AAED,qBAAa,oBAAoB;;IAC/B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,qBAAqB,CAA8B;IAC3D,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,cAAc,CAAK;gBAEf,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;QAAE,MAAM,EAAE,eAAe,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE;IAKjF,KAAK,IAAI,IAAI;IAQb,4BAA4B,IAAI,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;IAIpD,wBAAwB,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,IAAI;IAW/D,YAAY,CACjB,MAAM,EAAE,GAAG,EACX,GAAG,EAAE,sBAAsB,EAC3B,EAAE,wBAAwB,EAAE,EAAE;QAAE,wBAAwB,EAAE,OAAO,CAAA;KAAE,GAClE,aAAa,CAAC,iBAAiB,CAAC;IA0NnC,OAAO,CAAC,mBAAmB;CAyI5B"}
@@ -1,344 +0,0 @@
1
- import { extractCommandMessages } from '../utils/extract-command-messages.js';
2
- import { extractUsage } from '../utils/token-usage.js';
3
- export class StreamEventProcessor {
4
- logger;
5
- sessionId;
6
- toolCallArgumentsById = new Map();
7
- textDeltaCount = 0;
8
- reasoningDeltaCount = 0;
9
- lastEventType = null;
10
- eventTypeCount = 0;
11
- constructor({ logger, sessionId }) {
12
- this.logger = logger;
13
- this.sessionId = sessionId;
14
- }
15
- reset() {
16
- this.toolCallArgumentsById.clear();
17
- this.textDeltaCount = 0;
18
- this.reasoningDeltaCount = 0;
19
- this.lastEventType = null;
20
- this.eventTypeCount = 0;
21
- }
22
- getToolCallArgumentsSnapshot() {
23
- return new Map(this.toolCallArgumentsById);
24
- }
25
- restoreToolCallArguments(snapshot) {
26
- this.toolCallArgumentsById.clear();
27
- if (!snapshot?.size) {
28
- return;
29
- }
30
- for (const [key, value] of snapshot.entries()) {
31
- this.toolCallArgumentsById.set(key, value);
32
- }
33
- }
34
- async *streamEvents(stream, acc, { preserveExistingToolArgs }) {
35
- const toolCallArgumentsById = this.toolCallArgumentsById;
36
- if (!preserveExistingToolArgs) {
37
- toolCallArgumentsById.clear();
38
- }
39
- this.textDeltaCount = 0;
40
- this.reasoningDeltaCount = 0;
41
- const emitText = (delta) => {
42
- if (!delta) {
43
- return null;
44
- }
45
- acc.finalOutput += delta;
46
- this.textDeltaCount++;
47
- return {
48
- type: 'text_delta',
49
- delta,
50
- fullText: acc.finalOutput,
51
- };
52
- };
53
- const emitReasoning = (delta) => {
54
- if (!delta || delta.replaceAll('\n', '') === '') {
55
- return null;
56
- }
57
- acc.reasoningOutput += delta;
58
- this.reasoningDeltaCount++;
59
- return {
60
- type: 'reasoning_delta',
61
- delta,
62
- fullText: acc.reasoningOutput,
63
- };
64
- };
65
- for await (const event of stream) {
66
- // Extract usage if present in any of the common locations
67
- const usage = extractUsage(event);
68
- if (usage) {
69
- acc.latestUsage = usage;
70
- this.logger.debug('Usage extracted from stream event', {
71
- sessionId: this.sessionId,
72
- source: 'stream_event',
73
- eventType: event?.type ?? event?.data?.type ?? 'unknown',
74
- usage,
75
- });
76
- }
77
- // Log event type with deduplication for ordering understanding
78
- const delta1 = this.#extractTextDelta(event);
79
- if (delta1) {
80
- const e = emitText(delta1);
81
- if (e)
82
- yield e;
83
- }
84
- if (event?.data) {
85
- const delta2 = this.#extractTextDelta(event.data);
86
- if (delta2) {
87
- const e = emitText(delta2);
88
- if (e)
89
- yield e;
90
- }
91
- }
92
- // Handle reasoning items
93
- const reasoningDelta = (() => {
94
- // OpenAI style
95
- const data = event?.data;
96
- if (data && typeof data === 'object' && data.type === 'model') {
97
- const eventDetail = data.event;
98
- if (eventDetail &&
99
- typeof eventDetail === 'object' &&
100
- eventDetail.type === 'response.reasoning_summary_text.delta') {
101
- return eventDetail.delta ?? '';
102
- }
103
- }
104
- // OpenRouter style
105
- const choices = event?.data?.event?.choices;
106
- if (!choices)
107
- return '';
108
- if (Array.isArray(choices)) {
109
- return choices[0]?.delta?.reasoning ?? choices[0]?.delta?.reasoning_content ?? '';
110
- }
111
- if (typeof choices === 'object') {
112
- const byZero = choices['0'];
113
- const first = byZero ?? choices[Object.keys(choices)[0]];
114
- return first?.delta?.reasoning ?? first?.delta?.reasoning_content ?? '';
115
- }
116
- return '';
117
- })();
118
- if (reasoningDelta) {
119
- const e = emitReasoning(reasoningDelta);
120
- if (e)
121
- yield e;
122
- }
123
- const maybeEmitCommandMessagesFromItems = (items) => {
124
- this.#attachCachedArguments(items, toolCallArgumentsById);
125
- const commandMessages = extractCommandMessages(items);
126
- const out = [];
127
- for (const cmdMsg of commandMessages) {
128
- if (acc.emittedCommandIds.has(cmdMsg.id)) {
129
- continue;
130
- }
131
- if (cmdMsg.isApprovalRejection) {
132
- continue;
133
- }
134
- acc.emittedCommandIds.add(cmdMsg.id);
135
- out.push({ type: 'command_message', message: cmdMsg });
136
- }
137
- return out;
138
- };
139
- if (event?.type === 'run_item_stream_event') {
140
- this.#captureToolCallArguments(event.item, toolCallArgumentsById);
141
- // Emit tool_started event when a function_call is detected
142
- const rawItem = event.item?.rawItem ?? event.item;
143
- if (rawItem?.type === 'function_call') {
144
- const callId = rawItem.callId ?? rawItem.call_id ?? rawItem.tool_call_id ?? rawItem.toolCallId ?? rawItem.id;
145
- if (callId) {
146
- const toolName = rawItem.name ?? event.item?.name;
147
- const args = rawItem.arguments ?? rawItem.args ?? event.item?.arguments ?? event.item?.args;
148
- // Providers sometimes surface arguments as a JSON string.
149
- // Normalize here so downstream UI (pending/running display)
150
- // can reliably render parameters.
151
- const normalizedArgs = (() => {
152
- if (typeof args !== 'string') {
153
- return args;
154
- }
155
- const trimmed = args.trim();
156
- if (!trimmed) {
157
- return args;
158
- }
159
- try {
160
- return JSON.parse(trimmed);
161
- }
162
- catch {
163
- return args;
164
- }
165
- })();
166
- yield {
167
- type: 'tool_started',
168
- toolCallId: callId,
169
- toolName: toolName ?? 'unknown',
170
- arguments: normalizedArgs,
171
- };
172
- }
173
- }
174
- for (const e of maybeEmitCommandMessagesFromItems([event.item])) {
175
- yield e;
176
- }
177
- }
178
- else if (event?.type === 'tool_call_output_item' || event?.rawItem?.type === 'function_call_output') {
179
- this.#captureToolCallArguments(event, toolCallArgumentsById);
180
- for (const e of maybeEmitCommandMessagesFromItems([event])) {
181
- yield e;
182
- }
183
- }
184
- }
185
- const completedResult = await stream.completed;
186
- const rawResponses = Array.isArray(stream?.rawResponses) ? stream.rawResponses : [];
187
- let usageFromRawResponses;
188
- for (let i = rawResponses.length - 1; i >= 0; i--) {
189
- const candidate = extractUsage(rawResponses[i]);
190
- if (candidate) {
191
- usageFromRawResponses = candidate;
192
- break;
193
- }
194
- }
195
- const finalUsage = extractUsage(completedResult) || extractUsage(stream) || usageFromRawResponses;
196
- if (finalUsage) {
197
- acc.latestUsage = finalUsage;
198
- const usageSource = extractUsage(completedResult)
199
- ? 'completed_result'
200
- : extractUsage(stream)
201
- ? 'stream_object'
202
- : 'stream_raw_responses';
203
- this.logger.debug('Usage extracted from stream completion', {
204
- sessionId: this.sessionId,
205
- source: 'stream_completed',
206
- usageSource,
207
- usage: finalUsage,
208
- });
209
- }
210
- else {
211
- const completedResultRecord = completedResult && typeof completedResult === 'object' && !Array.isArray(completedResult)
212
- ? completedResult
213
- : undefined;
214
- const streamRecord = stream && typeof stream === 'object' && !Array.isArray(stream)
215
- ? stream
216
- : undefined;
217
- this.logger.debug('No usage found in stream completion', {
218
- sessionId: this.sessionId,
219
- source: 'stream_completed',
220
- completedResultType: completedResult === null ? 'null' : Array.isArray(completedResult) ? 'array' : typeof completedResult,
221
- completedResultKeys: completedResultRecord ? Object.keys(completedResultRecord) : [],
222
- streamKeys: streamRecord ? Object.keys(streamRecord) : [],
223
- completedResultHasUsagePath: {
224
- usage: Boolean(completedResultRecord?.usage),
225
- usageMetadata: Boolean(completedResultRecord?.usageMetadata),
226
- usage_metadata: Boolean(completedResultRecord?.usage_metadata),
227
- responseUsage: Boolean(completedResultRecord?.response?.usage),
228
- },
229
- });
230
- }
231
- this.flushStreamEventLog();
232
- }
233
- flushStreamEventLog() {
234
- if (this.lastEventType !== null && this.eventTypeCount > 1) {
235
- this.logger.debug('Stream event summary', {
236
- eventType: this.lastEventType,
237
- count: this.eventTypeCount,
238
- });
239
- }
240
- this.lastEventType = null;
241
- this.eventTypeCount = 0;
242
- }
243
- #captureToolCallArguments(item, toolCallArgumentsById) {
244
- const rawItem = item?.rawItem ?? item;
245
- if (!rawItem) {
246
- return;
247
- }
248
- if (rawItem?.type !== 'function_call') {
249
- return;
250
- }
251
- const callId = rawItem.callId ?? rawItem.call_id ?? rawItem.tool_call_id ?? rawItem.toolCallId ?? rawItem.id;
252
- if (!callId) {
253
- return;
254
- }
255
- const args = rawItem.arguments ?? rawItem.args ?? item?.arguments ?? item?.args;
256
- if (!args) {
257
- return;
258
- }
259
- toolCallArgumentsById.set(callId, args);
260
- }
261
- #attachCachedArguments(items = [], toolCallArgumentsById) {
262
- if (!items?.length) {
263
- return;
264
- }
265
- for (const item of items) {
266
- if (!item) {
267
- continue;
268
- }
269
- if (item.arguments || item.args || item?.rawItem?.arguments || item?.rawItem?.args) {
270
- continue;
271
- }
272
- const rawItem = item?.rawItem ?? item;
273
- const callId = rawItem?.callId ??
274
- rawItem?.call_id ??
275
- rawItem?.tool_call_id ??
276
- rawItem?.toolCallId ??
277
- rawItem?.id ??
278
- item?.callId ??
279
- item?.call_id ??
280
- item?.tool_call_id ??
281
- item?.toolCallId ??
282
- item?.id;
283
- if (!callId) {
284
- continue;
285
- }
286
- const args = toolCallArgumentsById.get(callId);
287
- if (!args) {
288
- continue;
289
- }
290
- item.arguments = args;
291
- }
292
- }
293
- #extractTextDelta(payload) {
294
- if (payload === null || payload === undefined) {
295
- return null;
296
- }
297
- if (typeof payload === 'string') {
298
- return payload || null;
299
- }
300
- if (typeof payload !== 'object') {
301
- return null;
302
- }
303
- const type = typeof payload.type === 'string' ? payload.type : '';
304
- const looksLikeOutput = typeof type === 'string' && type.includes('output_text');
305
- const hasOutputProperties = Boolean(payload.delta ?? payload.output_text ?? payload.text ?? payload.content);
306
- if (!looksLikeOutput && !hasOutputProperties) {
307
- return null;
308
- }
309
- const deltaCandidate = payload.delta ?? payload.output_text ?? payload.text ?? payload.content;
310
- const text = this.#coerceToText(deltaCandidate);
311
- return text || null;
312
- }
313
- #coerceToText(value) {
314
- if (value === null || value === undefined) {
315
- return '';
316
- }
317
- if (typeof value === 'string') {
318
- return value;
319
- }
320
- if (typeof value === 'number' || typeof value === 'boolean') {
321
- return String(value);
322
- }
323
- if (Array.isArray(value)) {
324
- return value
325
- .map((entry) => this.#coerceToText(entry))
326
- .filter(Boolean)
327
- .join('');
328
- }
329
- if (typeof value === 'object') {
330
- const record = value;
331
- const candidates = ['text', 'value', 'content', 'delta'];
332
- for (const field of candidates) {
333
- if (field in record) {
334
- const text = this.#coerceToText(record[field]);
335
- if (text) {
336
- return text;
337
- }
338
- }
339
- }
340
- }
341
- return '';
342
- }
343
- }
344
- //# sourceMappingURL=stream-event-processor.js.map