@machina.ai/cell-cli-core 1.10.0-rc1 → 1.11.0-rc1

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 (259) hide show
  1. package/dist/package.json +5 -3
  2. package/dist/src/agents/codebase-investigator.js +2 -5
  3. package/dist/src/agents/codebase-investigator.js.map +1 -1
  4. package/dist/src/agents/executor.js +8 -14
  5. package/dist/src/agents/executor.js.map +1 -1
  6. package/dist/src/agents/executor.test.js +36 -31
  7. package/dist/src/agents/executor.test.js.map +1 -1
  8. package/dist/src/agents/registry.js +4 -3
  9. package/dist/src/agents/registry.js.map +1 -1
  10. package/dist/src/code_assist/converter.d.ts +1 -0
  11. package/dist/src/code_assist/converter.js +1 -0
  12. package/dist/src/code_assist/converter.js.map +1 -1
  13. package/dist/src/code_assist/converter.test.js +19 -0
  14. package/dist/src/code_assist/converter.test.js.map +1 -1
  15. package/dist/src/code_assist/oauth2.js +13 -12
  16. package/dist/src/code_assist/oauth2.js.map +1 -1
  17. package/dist/src/config/config.d.ts +10 -9
  18. package/dist/src/config/config.js +36 -22
  19. package/dist/src/config/config.js.map +1 -1
  20. package/dist/src/config/config.test.js +58 -15
  21. package/dist/src/config/config.test.js.map +1 -1
  22. package/dist/src/confirmation-bus/message-bus.d.ts +2 -1
  23. package/dist/src/confirmation-bus/message-bus.js +7 -1
  24. package/dist/src/confirmation-bus/message-bus.js.map +1 -1
  25. package/dist/src/confirmation-bus/types.d.ts +12 -2
  26. package/dist/src/confirmation-bus/types.js +1 -0
  27. package/dist/src/confirmation-bus/types.js.map +1 -1
  28. package/dist/src/core/client.js +3 -2
  29. package/dist/src/core/client.js.map +1 -1
  30. package/dist/src/core/client.test.js +0 -20
  31. package/dist/src/core/client.test.js.map +1 -1
  32. package/dist/src/core/coreToolScheduler.d.ts +7 -0
  33. package/dist/src/core/coreToolScheduler.js +46 -10
  34. package/dist/src/core/coreToolScheduler.js.map +1 -1
  35. package/dist/src/core/coreToolScheduler.test.js +124 -3
  36. package/dist/src/core/coreToolScheduler.test.js.map +1 -1
  37. package/dist/src/core/geminiChat.js +1 -0
  38. package/dist/src/core/geminiChat.js.map +1 -1
  39. package/dist/src/core/logger.js +11 -10
  40. package/dist/src/core/logger.js.map +1 -1
  41. package/dist/src/core/nonInteractiveToolExecutor.test.js +3 -0
  42. package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
  43. package/dist/src/core/prompts.js +15 -21
  44. package/dist/src/core/prompts.js.map +1 -1
  45. package/dist/src/core/turn.d.ts +2 -0
  46. package/dist/src/core/turn.js +3 -1
  47. package/dist/src/core/turn.js.map +1 -1
  48. package/dist/src/core/turn.test.js +48 -0
  49. package/dist/src/core/turn.test.js.map +1 -1
  50. package/dist/src/generated/git-commit.d.ts +2 -2
  51. package/dist/src/generated/git-commit.js +2 -2
  52. package/dist/src/ide/ide-client.js +2 -1
  53. package/dist/src/ide/ide-client.js.map +1 -1
  54. package/dist/src/index.d.ts +4 -0
  55. package/dist/src/index.js +4 -0
  56. package/dist/src/index.js.map +1 -1
  57. package/dist/src/mcp/oauth-provider.js +21 -20
  58. package/dist/src/mcp/oauth-provider.js.map +1 -1
  59. package/dist/src/mcp/oauth-utils.js +9 -8
  60. package/dist/src/mcp/oauth-utils.js.map +1 -1
  61. package/dist/src/mcp/oauth-utils.test.js +13 -2
  62. package/dist/src/mcp/oauth-utils.test.js.map +1 -1
  63. package/dist/src/output/stream-json-formatter.d.ts +32 -0
  64. package/dist/src/output/stream-json-formatter.js +52 -0
  65. package/dist/src/output/stream-json-formatter.js.map +1 -0
  66. package/dist/src/output/stream-json-formatter.test.js +479 -0
  67. package/dist/src/output/stream-json-formatter.test.js.map +1 -0
  68. package/dist/src/output/types.d.ts +63 -1
  69. package/dist/src/output/types.js +11 -0
  70. package/dist/src/output/types.js.map +1 -1
  71. package/dist/src/prompts/prompt-registry.js +2 -1
  72. package/dist/src/prompts/prompt-registry.js.map +1 -1
  73. package/dist/src/routing/strategies/classifierStrategy.js +3 -2
  74. package/dist/src/routing/strategies/classifierStrategy.js.map +1 -1
  75. package/dist/src/services/loopDetectionService.js +3 -2
  76. package/dist/src/services/loopDetectionService.js.map +1 -1
  77. package/dist/src/services/shellExecutionService.js +33 -22
  78. package/dist/src/services/shellExecutionService.js.map +1 -1
  79. package/dist/src/services/shellExecutionService.test.js +52 -11
  80. package/dist/src/services/shellExecutionService.test.js.map +1 -1
  81. package/dist/src/telemetry/activity-monitor.d.ts +116 -0
  82. package/dist/src/telemetry/activity-monitor.js +209 -0
  83. package/dist/src/telemetry/activity-monitor.js.map +1 -0
  84. package/dist/src/telemetry/activity-monitor.test.d.ts +6 -0
  85. package/dist/src/telemetry/activity-monitor.test.js +248 -0
  86. package/dist/src/telemetry/activity-monitor.test.js.map +1 -0
  87. package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +1 -0
  88. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +51 -24
  89. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
  90. package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +3 -14
  91. package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
  92. package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +3 -0
  93. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +7 -1
  94. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
  95. package/dist/src/telemetry/index.d.ts +2 -1
  96. package/dist/src/telemetry/index.js +2 -1
  97. package/dist/src/telemetry/index.js.map +1 -1
  98. package/dist/src/telemetry/loggers.test.js +21 -17
  99. package/dist/src/telemetry/loggers.test.js.map +1 -1
  100. package/dist/src/telemetry/sdk.js +3 -2
  101. package/dist/src/telemetry/sdk.js.map +1 -1
  102. package/dist/src/telemetry/types.d.ts +15 -6
  103. package/dist/src/telemetry/types.js +28 -6
  104. package/dist/src/telemetry/types.js.map +1 -1
  105. package/dist/src/tools/edit.js +8 -7
  106. package/dist/src/tools/edit.js.map +1 -1
  107. package/dist/src/tools/edit.test.js +0 -1
  108. package/dist/src/tools/edit.test.js.map +1 -1
  109. package/dist/src/tools/glob.d.ts +3 -2
  110. package/dist/src/tools/glob.js +6 -6
  111. package/dist/src/tools/glob.js.map +1 -1
  112. package/dist/src/tools/grep.d.ts +3 -2
  113. package/dist/src/tools/grep.js +20 -14
  114. package/dist/src/tools/grep.js.map +1 -1
  115. package/dist/src/tools/ls.d.ts +3 -2
  116. package/dist/src/tools/ls.js +8 -7
  117. package/dist/src/tools/ls.js.map +1 -1
  118. package/dist/src/tools/mcp-client-manager.d.ts +2 -9
  119. package/dist/src/tools/mcp-client-manager.js +6 -14
  120. package/dist/src/tools/mcp-client-manager.js.map +1 -1
  121. package/dist/src/tools/mcp-client-manager.test.js +16 -6
  122. package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
  123. package/dist/src/tools/mcp-client.js +20 -19
  124. package/dist/src/tools/mcp-client.js.map +1 -1
  125. package/dist/src/tools/mcp-tool.d.ts +2 -1
  126. package/dist/src/tools/mcp-tool.js +7 -3
  127. package/dist/src/tools/mcp-tool.js.map +1 -1
  128. package/dist/src/tools/memoryTool.d.ts +1 -1
  129. package/dist/src/tools/memoryTool.js +3 -2
  130. package/dist/src/tools/memoryTool.js.map +1 -1
  131. package/dist/src/tools/message-bus-integration.test.js +14 -1
  132. package/dist/src/tools/message-bus-integration.test.js.map +1 -1
  133. package/dist/src/tools/read-file.d.ts +4 -3
  134. package/dist/src/tools/read-file.js +9 -8
  135. package/dist/src/tools/read-file.js.map +1 -1
  136. package/dist/src/tools/read-many-files.d.ts +4 -3
  137. package/dist/src/tools/read-many-files.js +11 -8
  138. package/dist/src/tools/read-many-files.js.map +1 -1
  139. package/dist/src/tools/read-many-files.test.js +0 -1
  140. package/dist/src/tools/read-many-files.test.js.map +1 -1
  141. package/dist/src/tools/ripGrep.d.ts +3 -2
  142. package/dist/src/tools/ripGrep.js +47 -17
  143. package/dist/src/tools/ripGrep.js.map +1 -1
  144. package/dist/src/tools/ripGrep.test.js +106 -60
  145. package/dist/src/tools/ripGrep.test.js.map +1 -1
  146. package/dist/src/tools/shell.d.ts +1 -1
  147. package/dist/src/tools/shell.js +21 -57
  148. package/dist/src/tools/shell.js.map +1 -1
  149. package/dist/src/tools/shell.test.js +61 -8
  150. package/dist/src/tools/shell.test.js.map +1 -1
  151. package/dist/src/tools/smart-edit.js +7 -6
  152. package/dist/src/tools/smart-edit.js.map +1 -1
  153. package/dist/src/tools/smart-edit.test.js +0 -1
  154. package/dist/src/tools/smart-edit.test.js.map +1 -1
  155. package/dist/src/tools/tool-names.d.ts +8 -0
  156. package/dist/src/tools/tool-names.js +8 -5
  157. package/dist/src/tools/tool-names.js.map +1 -1
  158. package/dist/src/tools/tool-registry.js +4 -3
  159. package/dist/src/tools/tool-registry.js.map +1 -1
  160. package/dist/src/tools/tools.d.ts +17 -10
  161. package/dist/src/tools/tools.js +54 -39
  162. package/dist/src/tools/tools.js.map +1 -1
  163. package/dist/src/tools/web-fetch.d.ts +4 -3
  164. package/dist/src/tools/web-fetch.js +48 -22
  165. package/dist/src/tools/web-fetch.js.map +1 -1
  166. package/dist/src/tools/web-fetch.test.js +261 -0
  167. package/dist/src/tools/web-fetch.test.js.map +1 -1
  168. package/dist/src/tools/web-search.d.ts +4 -3
  169. package/dist/src/tools/web-search.js +8 -6
  170. package/dist/src/tools/web-search.js.map +1 -1
  171. package/dist/src/tools/write-file.d.ts +1 -1
  172. package/dist/src/tools/write-file.js +1 -1
  173. package/dist/src/tools/write-file.js.map +1 -1
  174. package/dist/src/tools/write-file.test.js +0 -1
  175. package/dist/src/tools/write-file.test.js.map +1 -1
  176. package/dist/src/tools/write-todos.d.ts +2 -7
  177. package/dist/src/tools/write-todos.js +10 -4
  178. package/dist/src/tools/write-todos.js.map +1 -1
  179. package/dist/src/tools/write-todos.test.js +2 -2
  180. package/dist/src/tools/write-todos.test.js.map +1 -1
  181. package/dist/src/utils/bfsFileSearch.js +3 -2
  182. package/dist/src/utils/bfsFileSearch.js.map +1 -1
  183. package/dist/src/utils/debugLogger.d.ts +25 -0
  184. package/dist/src/utils/debugLogger.js +33 -0
  185. package/dist/src/utils/debugLogger.js.map +1 -0
  186. package/dist/src/utils/debugLogger.test.d.ts +6 -0
  187. package/dist/src/utils/debugLogger.test.js +67 -0
  188. package/dist/src/utils/debugLogger.test.js.map +1 -0
  189. package/dist/src/utils/delay.d.ts +16 -0
  190. package/dist/src/utils/delay.js +43 -0
  191. package/dist/src/utils/delay.js.map +1 -0
  192. package/dist/src/utils/delay.test.d.ts +6 -0
  193. package/dist/src/utils/delay.test.js +88 -0
  194. package/dist/src/utils/delay.test.js.map +1 -0
  195. package/dist/src/utils/editCorrector.js +5 -9
  196. package/dist/src/utils/editCorrector.js.map +1 -1
  197. package/dist/src/utils/editCorrector.test.js +3 -5
  198. package/dist/src/utils/editCorrector.test.js.map +1 -1
  199. package/dist/src/utils/editor.js +33 -38
  200. package/dist/src/utils/editor.js.map +1 -1
  201. package/dist/src/utils/environmentContext.js +0 -33
  202. package/dist/src/utils/environmentContext.js.map +1 -1
  203. package/dist/src/utils/environmentContext.test.js +0 -34
  204. package/dist/src/utils/environmentContext.test.js.map +1 -1
  205. package/dist/src/utils/fetch.d.ts +1 -0
  206. package/dist/src/utils/fetch.js +9 -0
  207. package/dist/src/utils/fetch.js.map +1 -1
  208. package/dist/src/utils/fileUtils.d.ts +4 -0
  209. package/dist/src/utils/fileUtils.js +34 -2
  210. package/dist/src/utils/fileUtils.js.map +1 -1
  211. package/dist/src/utils/fileUtils.test.js +12 -1
  212. package/dist/src/utils/fileUtils.test.js.map +1 -1
  213. package/dist/src/utils/getFolderStructure.js +2 -1
  214. package/dist/src/utils/getFolderStructure.js.map +1 -1
  215. package/dist/src/utils/gitIgnoreParser.js +7 -6
  216. package/dist/src/utils/gitIgnoreParser.js.map +1 -1
  217. package/dist/src/utils/gitIgnoreParser.test.js +30 -0
  218. package/dist/src/utils/gitIgnoreParser.test.js.map +1 -1
  219. package/dist/src/utils/llm-edit-fixer.js +2 -1
  220. package/dist/src/utils/llm-edit-fixer.js.map +1 -1
  221. package/dist/src/utils/memoryDiscovery.d.ts +2 -1
  222. package/dist/src/utils/memoryDiscovery.js +12 -11
  223. package/dist/src/utils/memoryDiscovery.js.map +1 -1
  224. package/dist/src/utils/memoryDiscovery.test.js +39 -17
  225. package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
  226. package/dist/src/utils/memoryImportProcessor.js +3 -2
  227. package/dist/src/utils/memoryImportProcessor.js.map +1 -1
  228. package/dist/src/utils/nextSpeakerChecker.js +2 -1
  229. package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
  230. package/dist/src/utils/retry.d.ts +1 -0
  231. package/dist/src/utils/retry.js +23 -20
  232. package/dist/src/utils/retry.js.map +1 -1
  233. package/dist/src/utils/retry.test.js +19 -1
  234. package/dist/src/utils/retry.test.js.map +1 -1
  235. package/dist/src/utils/safeJsonStringify.d.ts +4 -4
  236. package/dist/src/utils/safeJsonStringify.js +31 -7
  237. package/dist/src/utils/safeJsonStringify.js.map +1 -1
  238. package/dist/src/utils/shell-utils.d.ts +14 -2
  239. package/dist/src/utils/shell-utils.js +353 -136
  240. package/dist/src/utils/shell-utils.js.map +1 -1
  241. package/dist/src/utils/shell-utils.test.js +154 -60
  242. package/dist/src/utils/shell-utils.test.js.map +1 -1
  243. package/dist/src/utils/systemEncoding.js +5 -4
  244. package/dist/src/utils/systemEncoding.js.map +1 -1
  245. package/dist/src/utils/tool-utils.d.ts +2 -2
  246. package/dist/src/utils/tool-utils.js +14 -5
  247. package/dist/src/utils/tool-utils.js.map +1 -1
  248. package/dist/src/utils/userAccountManager.js +5 -4
  249. package/dist/src/utils/userAccountManager.js.map +1 -1
  250. package/dist/src/utils/workspaceContext.js +2 -1
  251. package/dist/src/utils/workspaceContext.js.map +1 -1
  252. package/dist/tsconfig.tsbuildinfo +1 -1
  253. package/package.json +5 -3
  254. package/dist/src/core/subagent.d.ts +0 -236
  255. package/dist/src/core/subagent.js +0 -482
  256. package/dist/src/core/subagent.js.map +0 -1
  257. package/dist/src/core/subagent.test.js +0 -556
  258. package/dist/src/core/subagent.test.js.map +0 -1
  259. /package/dist/src/{core/subagent.test.d.ts → output/stream-json-formatter.test.d.ts} +0 -0
@@ -1 +1 @@
1
- {"version":3,"file":"oauth-utils.js","sourceRoot":"","sources":["../../../src/mcp/oauth-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth-utils.js","sourceRoot":"","sources":["../../../src/mcp/oauth-utils.ts"],"names":[],"mappings":"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"}
@@ -188,11 +188,22 @@ describe('OAuthUtils', () => {
188
188
  describe('buildResourceParameter', () => {
189
189
  it('should build resource parameter from endpoint URL', () => {
190
190
  const result = OAuthUtils.buildResourceParameter('https://example.com/oauth/token');
191
- expect(result).toBe('https://example.com');
191
+ expect(result).toBe('https://example.com/oauth/token');
192
192
  });
193
193
  it('should handle URLs with ports', () => {
194
194
  const result = OAuthUtils.buildResourceParameter('https://example.com:8080/oauth/token');
195
- expect(result).toBe('https://example.com:8080');
195
+ expect(result).toBe('https://example.com:8080/oauth/token');
196
+ });
197
+ it('should strip query parameters from the URL', () => {
198
+ const result = OAuthUtils.buildResourceParameter('https://example.com/api/v1/data?user=123&scope=read');
199
+ expect(result).toBe('https://example.com/api/v1/data');
200
+ });
201
+ it('should strip URL fragments from the URL', () => {
202
+ const result = OAuthUtils.buildResourceParameter('https://example.com/api/v1/data#section-one');
203
+ expect(result).toBe('https://example.com/api/v1/data');
204
+ });
205
+ it('should throw an error for invalid URLs', () => {
206
+ expect(() => OAuthUtils.buildResourceParameter('not-a-url')).toThrow();
196
207
  });
197
208
  });
198
209
  });
@@ -1 +1 @@
1
- {"version":3,"file":"oauth-utils.test.js","sourceRoot":"","sources":["../../../src/mcp/oauth-utils.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth-utils.test.js","sourceRoot":"","sources":["../../../src/mcp/oauth-utils.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,32 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import type { JsonStreamEvent, StreamStats } from './types.js';
7
+ import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
8
+ /**
9
+ * Formatter for streaming JSON output.
10
+ * Emits newline-delimited JSON (JSONL) events to stdout in real-time.
11
+ */
12
+ export declare class StreamJsonFormatter {
13
+ /**
14
+ * Formats a single event as a JSON string with newline (JSONL format).
15
+ * @param event - The stream event to format
16
+ * @returns JSON string with trailing newline
17
+ */
18
+ formatEvent(event: JsonStreamEvent): string;
19
+ /**
20
+ * Emits an event directly to stdout in JSONL format.
21
+ * @param event - The stream event to emit
22
+ */
23
+ emitEvent(event: JsonStreamEvent): void;
24
+ /**
25
+ * Converts SessionMetrics to simplified StreamStats format.
26
+ * Aggregates token counts across all models.
27
+ * @param metrics - The session metrics from telemetry
28
+ * @param durationMs - The session duration in milliseconds
29
+ * @returns Simplified stats for streaming output
30
+ */
31
+ convertToStreamStats(metrics: SessionMetrics, durationMs: number): StreamStats;
32
+ }
@@ -0,0 +1,52 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ /**
7
+ * Formatter for streaming JSON output.
8
+ * Emits newline-delimited JSON (JSONL) events to stdout in real-time.
9
+ */
10
+ export class StreamJsonFormatter {
11
+ /**
12
+ * Formats a single event as a JSON string with newline (JSONL format).
13
+ * @param event - The stream event to format
14
+ * @returns JSON string with trailing newline
15
+ */
16
+ formatEvent(event) {
17
+ return JSON.stringify(event) + '\n';
18
+ }
19
+ /**
20
+ * Emits an event directly to stdout in JSONL format.
21
+ * @param event - The stream event to emit
22
+ */
23
+ emitEvent(event) {
24
+ process.stdout.write(this.formatEvent(event));
25
+ }
26
+ /**
27
+ * Converts SessionMetrics to simplified StreamStats format.
28
+ * Aggregates token counts across all models.
29
+ * @param metrics - The session metrics from telemetry
30
+ * @param durationMs - The session duration in milliseconds
31
+ * @returns Simplified stats for streaming output
32
+ */
33
+ convertToStreamStats(metrics, durationMs) {
34
+ let totalTokens = 0;
35
+ let inputTokens = 0;
36
+ let outputTokens = 0;
37
+ // Aggregate token counts across all models
38
+ for (const modelMetrics of Object.values(metrics.models)) {
39
+ totalTokens += modelMetrics.tokens.total;
40
+ inputTokens += modelMetrics.tokens.prompt;
41
+ outputTokens += modelMetrics.tokens.candidates;
42
+ }
43
+ return {
44
+ total_tokens: totalTokens,
45
+ input_tokens: inputTokens,
46
+ output_tokens: outputTokens,
47
+ duration_ms: durationMs,
48
+ tool_calls: metrics.tools.totalCalls,
49
+ };
50
+ }
51
+ }
52
+ //# sourceMappingURL=stream-json-formatter.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"stream-json-formatter.js","sourceRoot":"","sources":["../../../src/output/stream-json-formatter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH;;;GAGG;AACH,MAAM,OAAO,mBAAmB;IAC9B;;;;OAIG;IACH,WAAW,CAAC,KAAsB;QAChC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IACtC,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,KAAsB;QAC9B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAChD,CAAC;IAED;;;;;;OAMG;IACH,oBAAoB,CAClB,OAAuB,EACvB,UAAkB;QAElB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,YAAY,GAAG,CAAC,CAAC;QAErB,2CAA2C;QAC3C,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACzD,WAAW,IAAI,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC;YACzC,WAAW,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC;YAC1C,YAAY,IAAI,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC;QACjD,CAAC;QAED,OAAO;YACL,YAAY,EAAE,WAAW;YACzB,YAAY,EAAE,WAAW;YACzB,aAAa,EAAE,YAAY;YAC3B,WAAW,EAAE,UAAU;YACvB,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU;SACrC,CAAC;IACJ,CAAC;CACF"}
@@ -0,0 +1,479 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
7
+ import { StreamJsonFormatter } from './stream-json-formatter.js';
8
+ import { JsonStreamEventType } from './types.js';
9
+ import { ToolCallDecision } from '../telemetry/tool-call-decision.js';
10
+ describe('StreamJsonFormatter', () => {
11
+ let formatter;
12
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
13
+ let stdoutWriteSpy;
14
+ beforeEach(() => {
15
+ formatter = new StreamJsonFormatter();
16
+ stdoutWriteSpy = vi
17
+ .spyOn(process.stdout, 'write')
18
+ .mockImplementation(() => true);
19
+ });
20
+ afterEach(() => {
21
+ stdoutWriteSpy.mockRestore();
22
+ });
23
+ describe('formatEvent', () => {
24
+ it('should format init event as JSONL', () => {
25
+ const event = {
26
+ type: JsonStreamEventType.INIT,
27
+ timestamp: '2025-10-10T12:00:00.000Z',
28
+ session_id: 'test-session-123',
29
+ model: 'gemini-2.0-flash-exp',
30
+ };
31
+ const result = formatter.formatEvent(event);
32
+ expect(result).toBe(JSON.stringify(event) + '\n');
33
+ expect(JSON.parse(result.trim())).toEqual(event);
34
+ });
35
+ it('should format user message event', () => {
36
+ const event = {
37
+ type: JsonStreamEventType.MESSAGE,
38
+ timestamp: '2025-10-10T12:00:00.000Z',
39
+ role: 'user',
40
+ content: 'What is 2+2?',
41
+ };
42
+ const result = formatter.formatEvent(event);
43
+ expect(result).toBe(JSON.stringify(event) + '\n');
44
+ expect(JSON.parse(result.trim())).toEqual(event);
45
+ });
46
+ it('should format assistant message event with delta', () => {
47
+ const event = {
48
+ type: JsonStreamEventType.MESSAGE,
49
+ timestamp: '2025-10-10T12:00:00.000Z',
50
+ role: 'assistant',
51
+ content: '4',
52
+ delta: true,
53
+ };
54
+ const result = formatter.formatEvent(event);
55
+ expect(result).toBe(JSON.stringify(event) + '\n');
56
+ const parsed = JSON.parse(result.trim());
57
+ expect(parsed.delta).toBe(true);
58
+ });
59
+ it('should format tool_use event', () => {
60
+ const event = {
61
+ type: JsonStreamEventType.TOOL_USE,
62
+ timestamp: '2025-10-10T12:00:00.000Z',
63
+ tool_name: 'Read',
64
+ tool_id: 'read-123',
65
+ parameters: { file_path: '/path/to/file.txt' },
66
+ };
67
+ const result = formatter.formatEvent(event);
68
+ expect(result).toBe(JSON.stringify(event) + '\n');
69
+ expect(JSON.parse(result.trim())).toEqual(event);
70
+ });
71
+ it('should format tool_result event (success)', () => {
72
+ const event = {
73
+ type: JsonStreamEventType.TOOL_RESULT,
74
+ timestamp: '2025-10-10T12:00:00.000Z',
75
+ tool_id: 'read-123',
76
+ status: 'success',
77
+ output: 'File contents here',
78
+ };
79
+ const result = formatter.formatEvent(event);
80
+ expect(result).toBe(JSON.stringify(event) + '\n');
81
+ expect(JSON.parse(result.trim())).toEqual(event);
82
+ });
83
+ it('should format tool_result event (error)', () => {
84
+ const event = {
85
+ type: JsonStreamEventType.TOOL_RESULT,
86
+ timestamp: '2025-10-10T12:00:00.000Z',
87
+ tool_id: 'read-123',
88
+ status: 'error',
89
+ error: {
90
+ type: 'FILE_NOT_FOUND',
91
+ message: 'File not found',
92
+ },
93
+ };
94
+ const result = formatter.formatEvent(event);
95
+ expect(result).toBe(JSON.stringify(event) + '\n');
96
+ expect(JSON.parse(result.trim())).toEqual(event);
97
+ });
98
+ it('should format error event', () => {
99
+ const event = {
100
+ type: JsonStreamEventType.ERROR,
101
+ timestamp: '2025-10-10T12:00:00.000Z',
102
+ severity: 'warning',
103
+ message: 'Loop detected, stopping execution',
104
+ };
105
+ const result = formatter.formatEvent(event);
106
+ expect(result).toBe(JSON.stringify(event) + '\n');
107
+ expect(JSON.parse(result.trim())).toEqual(event);
108
+ });
109
+ it('should format result event with success status', () => {
110
+ const event = {
111
+ type: JsonStreamEventType.RESULT,
112
+ timestamp: '2025-10-10T12:00:00.000Z',
113
+ status: 'success',
114
+ stats: {
115
+ total_tokens: 100,
116
+ input_tokens: 50,
117
+ output_tokens: 50,
118
+ duration_ms: 1200,
119
+ tool_calls: 2,
120
+ },
121
+ };
122
+ const result = formatter.formatEvent(event);
123
+ expect(result).toBe(JSON.stringify(event) + '\n');
124
+ expect(JSON.parse(result.trim())).toEqual(event);
125
+ });
126
+ it('should format result event with error status', () => {
127
+ const event = {
128
+ type: JsonStreamEventType.RESULT,
129
+ timestamp: '2025-10-10T12:00:00.000Z',
130
+ status: 'error',
131
+ error: {
132
+ type: 'MaxSessionTurnsError',
133
+ message: 'Maximum session turns exceeded',
134
+ },
135
+ stats: {
136
+ total_tokens: 100,
137
+ input_tokens: 50,
138
+ output_tokens: 50,
139
+ duration_ms: 1200,
140
+ tool_calls: 0,
141
+ },
142
+ };
143
+ const result = formatter.formatEvent(event);
144
+ expect(result).toBe(JSON.stringify(event) + '\n');
145
+ expect(JSON.parse(result.trim())).toEqual(event);
146
+ });
147
+ it('should produce minified JSON without pretty-printing', () => {
148
+ const event = {
149
+ type: JsonStreamEventType.MESSAGE,
150
+ timestamp: '2025-10-10T12:00:00.000Z',
151
+ role: 'user',
152
+ content: 'Test',
153
+ };
154
+ const result = formatter.formatEvent(event);
155
+ // Should not contain multiple spaces or newlines (except trailing)
156
+ expect(result).not.toContain(' ');
157
+ expect(result.split('\n').length).toBe(2); // JSON + trailing newline
158
+ });
159
+ });
160
+ describe('emitEvent', () => {
161
+ it('should write formatted event to stdout', () => {
162
+ const event = {
163
+ type: JsonStreamEventType.INIT,
164
+ timestamp: '2025-10-10T12:00:00.000Z',
165
+ session_id: 'test-session',
166
+ model: 'gemini-2.0-flash-exp',
167
+ };
168
+ formatter.emitEvent(event);
169
+ expect(stdoutWriteSpy).toHaveBeenCalledTimes(1);
170
+ expect(stdoutWriteSpy).toHaveBeenCalledWith(JSON.stringify(event) + '\n');
171
+ });
172
+ it('should emit multiple events sequentially', () => {
173
+ const event1 = {
174
+ type: JsonStreamEventType.INIT,
175
+ timestamp: '2025-10-10T12:00:00.000Z',
176
+ session_id: 'test-session',
177
+ model: 'gemini-2.0-flash-exp',
178
+ };
179
+ const event2 = {
180
+ type: JsonStreamEventType.MESSAGE,
181
+ timestamp: '2025-10-10T12:00:01.000Z',
182
+ role: 'user',
183
+ content: 'Hello',
184
+ };
185
+ formatter.emitEvent(event1);
186
+ formatter.emitEvent(event2);
187
+ expect(stdoutWriteSpy).toHaveBeenCalledTimes(2);
188
+ expect(stdoutWriteSpy).toHaveBeenNthCalledWith(1, JSON.stringify(event1) + '\n');
189
+ expect(stdoutWriteSpy).toHaveBeenNthCalledWith(2, JSON.stringify(event2) + '\n');
190
+ });
191
+ });
192
+ describe('convertToStreamStats', () => {
193
+ it('should aggregate token counts from single model', () => {
194
+ const metrics = {
195
+ models: {
196
+ 'gemini-2.0-flash': {
197
+ api: {
198
+ totalRequests: 1,
199
+ totalErrors: 0,
200
+ totalLatencyMs: 1000,
201
+ },
202
+ tokens: {
203
+ prompt: 50,
204
+ candidates: 30,
205
+ total: 80,
206
+ cached: 0,
207
+ thoughts: 0,
208
+ tool: 0,
209
+ },
210
+ },
211
+ },
212
+ tools: {
213
+ totalCalls: 2,
214
+ totalSuccess: 2,
215
+ totalFail: 0,
216
+ totalDurationMs: 500,
217
+ totalDecisions: {
218
+ [ToolCallDecision.ACCEPT]: 0,
219
+ [ToolCallDecision.REJECT]: 0,
220
+ [ToolCallDecision.MODIFY]: 0,
221
+ [ToolCallDecision.AUTO_ACCEPT]: 2,
222
+ },
223
+ byName: {},
224
+ },
225
+ files: {
226
+ totalLinesAdded: 0,
227
+ totalLinesRemoved: 0,
228
+ },
229
+ };
230
+ const result = formatter.convertToStreamStats(metrics, 1200);
231
+ expect(result).toEqual({
232
+ total_tokens: 80,
233
+ input_tokens: 50,
234
+ output_tokens: 30,
235
+ duration_ms: 1200,
236
+ tool_calls: 2,
237
+ });
238
+ });
239
+ it('should aggregate token counts from multiple models', () => {
240
+ const metrics = {
241
+ models: {
242
+ 'gemini-2.0-flash': {
243
+ api: {
244
+ totalRequests: 1,
245
+ totalErrors: 0,
246
+ totalLatencyMs: 1000,
247
+ },
248
+ tokens: {
249
+ prompt: 50,
250
+ candidates: 30,
251
+ total: 80,
252
+ cached: 0,
253
+ thoughts: 0,
254
+ tool: 0,
255
+ },
256
+ },
257
+ 'gemini-1.5-pro': {
258
+ api: {
259
+ totalRequests: 1,
260
+ totalErrors: 0,
261
+ totalLatencyMs: 2000,
262
+ },
263
+ tokens: {
264
+ prompt: 100,
265
+ candidates: 70,
266
+ total: 170,
267
+ cached: 0,
268
+ thoughts: 0,
269
+ tool: 0,
270
+ },
271
+ },
272
+ },
273
+ tools: {
274
+ totalCalls: 5,
275
+ totalSuccess: 5,
276
+ totalFail: 0,
277
+ totalDurationMs: 1000,
278
+ totalDecisions: {
279
+ [ToolCallDecision.ACCEPT]: 0,
280
+ [ToolCallDecision.REJECT]: 0,
281
+ [ToolCallDecision.MODIFY]: 0,
282
+ [ToolCallDecision.AUTO_ACCEPT]: 5,
283
+ },
284
+ byName: {},
285
+ },
286
+ files: {
287
+ totalLinesAdded: 0,
288
+ totalLinesRemoved: 0,
289
+ },
290
+ };
291
+ const result = formatter.convertToStreamStats(metrics, 3000);
292
+ expect(result).toEqual({
293
+ total_tokens: 250, // 80 + 170
294
+ input_tokens: 150, // 50 + 100
295
+ output_tokens: 100, // 30 + 70
296
+ duration_ms: 3000,
297
+ tool_calls: 5,
298
+ });
299
+ });
300
+ it('should handle empty metrics', () => {
301
+ const metrics = {
302
+ models: {},
303
+ tools: {
304
+ totalCalls: 0,
305
+ totalSuccess: 0,
306
+ totalFail: 0,
307
+ totalDurationMs: 0,
308
+ totalDecisions: {
309
+ [ToolCallDecision.ACCEPT]: 0,
310
+ [ToolCallDecision.REJECT]: 0,
311
+ [ToolCallDecision.MODIFY]: 0,
312
+ [ToolCallDecision.AUTO_ACCEPT]: 0,
313
+ },
314
+ byName: {},
315
+ },
316
+ files: {
317
+ totalLinesAdded: 0,
318
+ totalLinesRemoved: 0,
319
+ },
320
+ };
321
+ const result = formatter.convertToStreamStats(metrics, 100);
322
+ expect(result).toEqual({
323
+ total_tokens: 0,
324
+ input_tokens: 0,
325
+ output_tokens: 0,
326
+ duration_ms: 100,
327
+ tool_calls: 0,
328
+ });
329
+ });
330
+ it('should use session-level tool calls count', () => {
331
+ const metrics = {
332
+ models: {},
333
+ tools: {
334
+ totalCalls: 3,
335
+ totalSuccess: 2,
336
+ totalFail: 1,
337
+ totalDurationMs: 500,
338
+ totalDecisions: {
339
+ [ToolCallDecision.ACCEPT]: 0,
340
+ [ToolCallDecision.REJECT]: 0,
341
+ [ToolCallDecision.MODIFY]: 0,
342
+ [ToolCallDecision.AUTO_ACCEPT]: 3,
343
+ },
344
+ byName: {
345
+ Read: {
346
+ count: 2,
347
+ success: 2,
348
+ fail: 0,
349
+ durationMs: 300,
350
+ decisions: {
351
+ [ToolCallDecision.ACCEPT]: 0,
352
+ [ToolCallDecision.REJECT]: 0,
353
+ [ToolCallDecision.MODIFY]: 0,
354
+ [ToolCallDecision.AUTO_ACCEPT]: 2,
355
+ },
356
+ },
357
+ Glob: {
358
+ count: 1,
359
+ success: 0,
360
+ fail: 1,
361
+ durationMs: 200,
362
+ decisions: {
363
+ [ToolCallDecision.ACCEPT]: 0,
364
+ [ToolCallDecision.REJECT]: 0,
365
+ [ToolCallDecision.MODIFY]: 0,
366
+ [ToolCallDecision.AUTO_ACCEPT]: 1,
367
+ },
368
+ },
369
+ },
370
+ },
371
+ files: {
372
+ totalLinesAdded: 0,
373
+ totalLinesRemoved: 0,
374
+ },
375
+ };
376
+ const result = formatter.convertToStreamStats(metrics, 1000);
377
+ expect(result.tool_calls).toBe(3);
378
+ });
379
+ it('should pass through duration unchanged', () => {
380
+ const metrics = {
381
+ models: {},
382
+ tools: {
383
+ totalCalls: 0,
384
+ totalSuccess: 0,
385
+ totalFail: 0,
386
+ totalDurationMs: 0,
387
+ totalDecisions: {
388
+ [ToolCallDecision.ACCEPT]: 0,
389
+ [ToolCallDecision.REJECT]: 0,
390
+ [ToolCallDecision.MODIFY]: 0,
391
+ [ToolCallDecision.AUTO_ACCEPT]: 0,
392
+ },
393
+ byName: {},
394
+ },
395
+ files: {
396
+ totalLinesAdded: 0,
397
+ totalLinesRemoved: 0,
398
+ },
399
+ };
400
+ const result = formatter.convertToStreamStats(metrics, 5000);
401
+ expect(result.duration_ms).toBe(5000);
402
+ });
403
+ });
404
+ describe('JSON validity', () => {
405
+ it('should produce valid JSON for all event types', () => {
406
+ const events = [
407
+ {
408
+ type: JsonStreamEventType.INIT,
409
+ timestamp: '2025-10-10T12:00:00.000Z',
410
+ session_id: 'test',
411
+ model: 'gemini-2.0-flash',
412
+ },
413
+ {
414
+ type: JsonStreamEventType.MESSAGE,
415
+ timestamp: '2025-10-10T12:00:00.000Z',
416
+ role: 'user',
417
+ content: 'Test',
418
+ },
419
+ {
420
+ type: JsonStreamEventType.TOOL_USE,
421
+ timestamp: '2025-10-10T12:00:00.000Z',
422
+ tool_name: 'Read',
423
+ tool_id: 'read-1',
424
+ parameters: {},
425
+ },
426
+ {
427
+ type: JsonStreamEventType.TOOL_RESULT,
428
+ timestamp: '2025-10-10T12:00:00.000Z',
429
+ tool_id: 'read-1',
430
+ status: 'success',
431
+ },
432
+ {
433
+ type: JsonStreamEventType.ERROR,
434
+ timestamp: '2025-10-10T12:00:00.000Z',
435
+ severity: 'error',
436
+ message: 'Test error',
437
+ },
438
+ {
439
+ type: JsonStreamEventType.RESULT,
440
+ timestamp: '2025-10-10T12:00:00.000Z',
441
+ status: 'success',
442
+ stats: {
443
+ total_tokens: 0,
444
+ input_tokens: 0,
445
+ output_tokens: 0,
446
+ duration_ms: 0,
447
+ tool_calls: 0,
448
+ },
449
+ },
450
+ ];
451
+ events.forEach((event) => {
452
+ const formatted = formatter.formatEvent(event);
453
+ expect(() => JSON.parse(formatted)).not.toThrow();
454
+ });
455
+ });
456
+ it('should preserve field types', () => {
457
+ const event = {
458
+ type: JsonStreamEventType.RESULT,
459
+ timestamp: '2025-10-10T12:00:00.000Z',
460
+ status: 'success',
461
+ stats: {
462
+ total_tokens: 100,
463
+ input_tokens: 50,
464
+ output_tokens: 50,
465
+ duration_ms: 1200,
466
+ tool_calls: 2,
467
+ },
468
+ };
469
+ const formatted = formatter.formatEvent(event);
470
+ const parsed = JSON.parse(formatted.trim());
471
+ expect(typeof parsed.stats.total_tokens).toBe('number');
472
+ expect(typeof parsed.stats.input_tokens).toBe('number');
473
+ expect(typeof parsed.stats.output_tokens).toBe('number');
474
+ expect(typeof parsed.stats.duration_ms).toBe('number');
475
+ expect(typeof parsed.stats.tool_calls).toBe('number');
476
+ });
477
+ });
478
+ });
479
+ //# sourceMappingURL=stream-json-formatter.test.js.map