@google/gemini-cli-core 0.10.0-preview.2 → 0.11.0-nightly.20251020.a96f0659

package/dist/src/output/stream-json-formatter.test.js

@@ -0,0 +1,479 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { StreamJsonFormatter } from './stream-json-formatter.js';
+import { JsonStreamEventType } from './types.js';
+import { ToolCallDecision } from '../telemetry/tool-call-decision.js';
+describe('StreamJsonFormatter', () => {
+    let formatter;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let stdoutWriteSpy;
+    beforeEach(() => {
+        formatter = new StreamJsonFormatter();
+        stdoutWriteSpy = vi
+            .spyOn(process.stdout, 'write')
+            .mockImplementation(() => true);
+    });
+    afterEach(() => {
+        stdoutWriteSpy.mockRestore();
+    });
+    describe('formatEvent', () => {
+        it('should format init event as JSONL', () => {
+            const event = {
+                type: JsonStreamEventType.INIT,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                session_id: 'test-session-123',
+                model: 'gemini-2.0-flash-exp',
+            };
+            const result = formatter.formatEvent(event);
+            expect(result).toBe(JSON.stringify(event) + '\n');
+            expect(JSON.parse(result.trim())).toEqual(event);
+        });
+        it('should format user message event', () => {
+            const event = {
+                type: JsonStreamEventType.MESSAGE,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                role: 'user',
+                content: 'What is 2+2?',
+            };
+            const result = formatter.formatEvent(event);
+            expect(result).toBe(JSON.stringify(event) + '\n');
+            expect(JSON.parse(result.trim())).toEqual(event);
+        });
+        it('should format assistant message event with delta', () => {
+            const event = {
+                type: JsonStreamEventType.MESSAGE,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                role: 'assistant',
+                content: '4',
+                delta: true,
+            };
+            const result = formatter.formatEvent(event);
+            expect(result).toBe(JSON.stringify(event) + '\n');
+            const parsed = JSON.parse(result.trim());
+            expect(parsed.delta).toBe(true);
+        });
+        it('should format tool_use event', () => {
+            const event = {
+                type: JsonStreamEventType.TOOL_USE,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                tool_name: 'Read',
+                tool_id: 'read-123',
+                parameters: { file_path: '/path/to/file.txt' },
+            };
+            const result = formatter.formatEvent(event);
+            expect(result).toBe(JSON.stringify(event) + '\n');
+            expect(JSON.parse(result.trim())).toEqual(event);
+        });
+        it('should format tool_result event (success)', () => {
+            const event = {
+                type: JsonStreamEventType.TOOL_RESULT,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                tool_id: 'read-123',
+                status: 'success',
+                output: 'File contents here',
+            };
+            const result = formatter.formatEvent(event);
+            expect(result).toBe(JSON.stringify(event) + '\n');
+            expect(JSON.parse(result.trim())).toEqual(event);
+        });
+        it('should format tool_result event (error)', () => {
+            const event = {
+                type: JsonStreamEventType.TOOL_RESULT,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                tool_id: 'read-123',
+                status: 'error',
+                error: {
+                    type: 'FILE_NOT_FOUND',
+                    message: 'File not found',
+                },
+            };
+            const result = formatter.formatEvent(event);
+            expect(result).toBe(JSON.stringify(event) + '\n');
+            expect(JSON.parse(result.trim())).toEqual(event);
+        });
+        it('should format error event', () => {
+            const event = {
+                type: JsonStreamEventType.ERROR,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                severity: 'warning',
+                message: 'Loop detected, stopping execution',
+            };
+            const result = formatter.formatEvent(event);
+            expect(result).toBe(JSON.stringify(event) + '\n');
+            expect(JSON.parse(result.trim())).toEqual(event);
+        });
+        it('should format result event with success status', () => {
+            const event = {
+                type: JsonStreamEventType.RESULT,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                status: 'success',
+                stats: {
+                    total_tokens: 100,
+                    input_tokens: 50,
+                    output_tokens: 50,
+                    duration_ms: 1200,
+                    tool_calls: 2,
+                },
+            };
+            const result = formatter.formatEvent(event);
+            expect(result).toBe(JSON.stringify(event) + '\n');
+            expect(JSON.parse(result.trim())).toEqual(event);
+        });
+        it('should format result event with error status', () => {
+            const event = {
+                type: JsonStreamEventType.RESULT,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                status: 'error',
+                error: {
+                    type: 'MaxSessionTurnsError',
+                    message: 'Maximum session turns exceeded',
+                },
+                stats: {
+                    total_tokens: 100,
+                    input_tokens: 50,
+                    output_tokens: 50,
+                    duration_ms: 1200,
+                    tool_calls: 0,
+                },
+            };
+            const result = formatter.formatEvent(event);
+            expect(result).toBe(JSON.stringify(event) + '\n');
+            expect(JSON.parse(result.trim())).toEqual(event);
+        });
+        it('should produce minified JSON without pretty-printing', () => {
+            const event = {
+                type: JsonStreamEventType.MESSAGE,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                role: 'user',
+                content: 'Test',
+            };
+            const result = formatter.formatEvent(event);
+            // Should not contain multiple spaces or newlines (except trailing)
+            expect(result).not.toContain('  ');
+            expect(result.split('\n').length).toBe(2); // JSON + trailing newline
+        });
+    });
+    describe('emitEvent', () => {
+        it('should write formatted event to stdout', () => {
+            const event = {
+                type: JsonStreamEventType.INIT,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                session_id: 'test-session',
+                model: 'gemini-2.0-flash-exp',
+            };
+            formatter.emitEvent(event);
+            expect(stdoutWriteSpy).toHaveBeenCalledTimes(1);
+            expect(stdoutWriteSpy).toHaveBeenCalledWith(JSON.stringify(event) + '\n');
+        });
+        it('should emit multiple events sequentially', () => {
+            const event1 = {
+                type: JsonStreamEventType.INIT,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                session_id: 'test-session',
+                model: 'gemini-2.0-flash-exp',
+            };
+            const event2 = {
+                type: JsonStreamEventType.MESSAGE,
+                timestamp: '2025-10-10T12:00:01.000Z',
+                role: 'user',
+                content: 'Hello',
+            };
+            formatter.emitEvent(event1);
+            formatter.emitEvent(event2);
+            expect(stdoutWriteSpy).toHaveBeenCalledTimes(2);
+            expect(stdoutWriteSpy).toHaveBeenNthCalledWith(1, JSON.stringify(event1) + '\n');
+            expect(stdoutWriteSpy).toHaveBeenNthCalledWith(2, JSON.stringify(event2) + '\n');
+        });
+    });
+    describe('convertToStreamStats', () => {
+        it('should aggregate token counts from single model', () => {
+            const metrics = {
+                models: {
+                    'gemini-2.0-flash': {
+                        api: {
+                            totalRequests: 1,
+                            totalErrors: 0,
+                            totalLatencyMs: 1000,
+                        },
+                        tokens: {
+                            prompt: 50,
+                            candidates: 30,
+                            total: 80,
+                            cached: 0,
+                            thoughts: 0,
+                            tool: 0,
+                        },
+                    },
+                },
+                tools: {
+                    totalCalls: 2,
+                    totalSuccess: 2,
+                    totalFail: 0,
+                    totalDurationMs: 500,
+                    totalDecisions: {
+                        [ToolCallDecision.ACCEPT]: 0,
+                        [ToolCallDecision.REJECT]: 0,
+                        [ToolCallDecision.MODIFY]: 0,
+                        [ToolCallDecision.AUTO_ACCEPT]: 2,
+                    },
+                    byName: {},
+                },
+                files: {
+                    totalLinesAdded: 0,
+                    totalLinesRemoved: 0,
+                },
+            };
+            const result = formatter.convertToStreamStats(metrics, 1200);
+            expect(result).toEqual({
+                total_tokens: 80,
+                input_tokens: 50,
+                output_tokens: 30,
+                duration_ms: 1200,
+                tool_calls: 2,
+            });
+        });
+        it('should aggregate token counts from multiple models', () => {
+            const metrics = {
+                models: {
+                    'gemini-2.0-flash': {
+                        api: {
+                            totalRequests: 1,
+                            totalErrors: 0,
+                            totalLatencyMs: 1000,
+                        },
+                        tokens: {
+                            prompt: 50,
+                            candidates: 30,
+                            total: 80,
+                            cached: 0,
+                            thoughts: 0,
+                            tool: 0,
+                        },
+                    },
+                    'gemini-1.5-pro': {
+                        api: {
+                            totalRequests: 1,
+                            totalErrors: 0,
+                            totalLatencyMs: 2000,
+                        },
+                        tokens: {
+                            prompt: 100,
+                            candidates: 70,
+                            total: 170,
+                            cached: 0,
+                            thoughts: 0,
+                            tool: 0,
+                        },
+                    },
+                },
+                tools: {
+                    totalCalls: 5,
+                    totalSuccess: 5,
+                    totalFail: 0,
+                    totalDurationMs: 1000,
+                    totalDecisions: {
+                        [ToolCallDecision.ACCEPT]: 0,
+                        [ToolCallDecision.REJECT]: 0,
+                        [ToolCallDecision.MODIFY]: 0,
+                        [ToolCallDecision.AUTO_ACCEPT]: 5,
+                    },
+                    byName: {},
+                },
+                files: {
+                    totalLinesAdded: 0,
+                    totalLinesRemoved: 0,
+                },
+            };
+            const result = formatter.convertToStreamStats(metrics, 3000);
+            expect(result).toEqual({
+                total_tokens: 250, // 80 + 170
+                input_tokens: 150, // 50 + 100
+                output_tokens: 100, // 30 + 70
+                duration_ms: 3000,
+                tool_calls: 5,
+            });
+        });
+        it('should handle empty metrics', () => {
+            const metrics = {
+                models: {},
+                tools: {
+                    totalCalls: 0,
+                    totalSuccess: 0,
+                    totalFail: 0,
+                    totalDurationMs: 0,
+                    totalDecisions: {
+                        [ToolCallDecision.ACCEPT]: 0,
+                        [ToolCallDecision.REJECT]: 0,
+                        [ToolCallDecision.MODIFY]: 0,
+                        [ToolCallDecision.AUTO_ACCEPT]: 0,
+                    },
+                    byName: {},
+                },
+                files: {
+                    totalLinesAdded: 0,
+                    totalLinesRemoved: 0,
+                },
+            };
+            const result = formatter.convertToStreamStats(metrics, 100);
+            expect(result).toEqual({
+                total_tokens: 0,
+                input_tokens: 0,
+                output_tokens: 0,
+                duration_ms: 100,
+                tool_calls: 0,
+            });
+        });
+        it('should use session-level tool calls count', () => {
+            const metrics = {
+                models: {},
+                tools: {
+                    totalCalls: 3,
+                    totalSuccess: 2,
+                    totalFail: 1,
+                    totalDurationMs: 500,
+                    totalDecisions: {
+                        [ToolCallDecision.ACCEPT]: 0,
+                        [ToolCallDecision.REJECT]: 0,
+                        [ToolCallDecision.MODIFY]: 0,
+                        [ToolCallDecision.AUTO_ACCEPT]: 3,
+                    },
+                    byName: {
+                        Read: {
+                            count: 2,
+                            success: 2,
+                            fail: 0,
+                            durationMs: 300,
+                            decisions: {
+                                [ToolCallDecision.ACCEPT]: 0,
+                                [ToolCallDecision.REJECT]: 0,
+                                [ToolCallDecision.MODIFY]: 0,
+                                [ToolCallDecision.AUTO_ACCEPT]: 2,
+                            },
+                        },
+                        Glob: {
+                            count: 1,
+                            success: 0,
+                            fail: 1,
+                            durationMs: 200,
+                            decisions: {
+                                [ToolCallDecision.ACCEPT]: 0,
+                                [ToolCallDecision.REJECT]: 0,
+                                [ToolCallDecision.MODIFY]: 0,
+                                [ToolCallDecision.AUTO_ACCEPT]: 1,
+                            },
+                        },
+                    },
+                },
+                files: {
+                    totalLinesAdded: 0,
+                    totalLinesRemoved: 0,
+                },
+            };
+            const result = formatter.convertToStreamStats(metrics, 1000);
+            expect(result.tool_calls).toBe(3);
+        });
+        it('should pass through duration unchanged', () => {
+            const metrics = {
+                models: {},
+                tools: {
+                    totalCalls: 0,
+                    totalSuccess: 0,
+                    totalFail: 0,
+                    totalDurationMs: 0,
+                    totalDecisions: {
+                        [ToolCallDecision.ACCEPT]: 0,
+                        [ToolCallDecision.REJECT]: 0,
+                        [ToolCallDecision.MODIFY]: 0,
+                        [ToolCallDecision.AUTO_ACCEPT]: 0,
+                    },
+                    byName: {},
+                },
+                files: {
+                    totalLinesAdded: 0,
+                    totalLinesRemoved: 0,
+                },
+            };
+            const result = formatter.convertToStreamStats(metrics, 5000);
+            expect(result.duration_ms).toBe(5000);
+        });
+    });
+    describe('JSON validity', () => {
+        it('should produce valid JSON for all event types', () => {
+            const events = [
+                {
+                    type: JsonStreamEventType.INIT,
+                    timestamp: '2025-10-10T12:00:00.000Z',
+                    session_id: 'test',
+                    model: 'gemini-2.0-flash',
+                },
+                {
+                    type: JsonStreamEventType.MESSAGE,
+                    timestamp: '2025-10-10T12:00:00.000Z',
+                    role: 'user',
+                    content: 'Test',
+                },
+                {
+                    type: JsonStreamEventType.TOOL_USE,
+                    timestamp: '2025-10-10T12:00:00.000Z',
+                    tool_name: 'Read',
+                    tool_id: 'read-1',
+                    parameters: {},
+                },
+                {
+                    type: JsonStreamEventType.TOOL_RESULT,
+                    timestamp: '2025-10-10T12:00:00.000Z',
+                    tool_id: 'read-1',
+                    status: 'success',
+                },
+                {
+                    type: JsonStreamEventType.ERROR,
+                    timestamp: '2025-10-10T12:00:00.000Z',
+                    severity: 'error',
+                    message: 'Test error',
+                },
+                {
+                    type: JsonStreamEventType.RESULT,
+                    timestamp: '2025-10-10T12:00:00.000Z',
+                    status: 'success',
+                    stats: {
+                        total_tokens: 0,
+                        input_tokens: 0,
+                        output_tokens: 0,
+                        duration_ms: 0,
+                        tool_calls: 0,
+                    },
+                },
+            ];
+            events.forEach((event) => {
+                const formatted = formatter.formatEvent(event);
+                expect(() => JSON.parse(formatted)).not.toThrow();
+            });
+        });
+        it('should preserve field types', () => {
+            const event = {
+                type: JsonStreamEventType.RESULT,
+                timestamp: '2025-10-10T12:00:00.000Z',
+                status: 'success',
+                stats: {
+                    total_tokens: 100,
+                    input_tokens: 50,
+                    output_tokens: 50,
+                    duration_ms: 1200,
+                    tool_calls: 2,
+                },
+            };
+            const formatted = formatter.formatEvent(event);
+            const parsed = JSON.parse(formatted.trim());
+            expect(typeof parsed.stats.total_tokens).toBe('number');
+            expect(typeof parsed.stats.input_tokens).toBe('number');
+            expect(typeof parsed.stats.output_tokens).toBe('number');
+            expect(typeof parsed.stats.duration_ms).toBe('number');
+            expect(typeof parsed.stats.tool_calls).toBe('number');
+        });
+    });
+});
+//# sourceMappingURL=stream-json-formatter.test.js.map

package/dist/src/output/stream-json-formatter.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-json-formatter.test.js","sourceRoot":"","sources":["../../../src/output/stream-json-formatter.test.ts"],"names":[],"mappings":"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"}

package/dist/src/output/types.d.ts

@@ -6,7 +6,8 @@
 import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
 export declare enum OutputFormat {
     TEXT = "text",
-    JSON = "json"
+    JSON = "json",
+    STREAM_JSON = "stream-json"
 }
 export interface JsonError {
     type: string;
@@ -18,3 +19,64 @@ export interface JsonOutput {
     stats?: SessionMetrics;
     error?: JsonError;
 }
+export declare enum JsonStreamEventType {
+    INIT = "init",
+    MESSAGE = "message",
+    TOOL_USE = "tool_use",
+    TOOL_RESULT = "tool_result",
+    ERROR = "error",
+    RESULT = "result"
+}
+export interface BaseJsonStreamEvent {
+    type: JsonStreamEventType;
+    timestamp: string;
+}
+export interface InitEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.INIT;
+    session_id: string;
+    model: string;
+}
+export interface MessageEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.MESSAGE;
+    role: 'user' | 'assistant';
+    content: string;
+    delta?: boolean;
+}
+export interface ToolUseEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.TOOL_USE;
+    tool_name: string;
+    tool_id: string;
+    parameters: Record<string, unknown>;
+}
+export interface ToolResultEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.TOOL_RESULT;
+    tool_id: string;
+    status: 'success' | 'error';
+    output?: string;
+    error?: {
+        type: string;
+        message: string;
+    };
+}
+export interface ErrorEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.ERROR;
+    severity: 'warning' | 'error';
+    message: string;
+}
+export interface StreamStats {
+    total_tokens: number;
+    input_tokens: number;
+    output_tokens: number;
+    duration_ms: number;
+    tool_calls: number;
+}
+export interface ResultEvent extends BaseJsonStreamEvent {
+    type: JsonStreamEventType.RESULT;
+    status: 'success' | 'error';
+    error?: {
+        type: string;
+        message: string;
+    };
+    stats?: StreamStats;
+}
+export type JsonStreamEvent = InitEvent | MessageEvent | ToolUseEvent | ToolResultEvent | ErrorEvent | ResultEvent;

package/dist/src/output/types.js

@@ -7,5 +7,16 @@ export var OutputFormat;
 (function (OutputFormat) {
     OutputFormat["TEXT"] = "text";
     OutputFormat["JSON"] = "json";
+    OutputFormat["STREAM_JSON"] = "stream-json";
 })(OutputFormat || (OutputFormat = {}));
+// Streaming JSON event types
+export var JsonStreamEventType;
+(function (JsonStreamEventType) {
+    JsonStreamEventType["INIT"] = "init";
+    JsonStreamEventType["MESSAGE"] = "message";
+    JsonStreamEventType["TOOL_USE"] = "tool_use";
+    JsonStreamEventType["TOOL_RESULT"] = "tool_result";
+    JsonStreamEventType["ERROR"] = "error";
+    JsonStreamEventType["RESULT"] = "result";
+})(JsonStreamEventType || (JsonStreamEventType = {}));
 //# sourceMappingURL=types.js.map

package/dist/src/output/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/output/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,CAAN,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,6BAAa,CAAA;AACf,CAAC,EAHW,YAAY,KAAZ,YAAY,QAGvB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/output/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,CAAN,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,2CAA2B,CAAA;AAC7B,CAAC,EAJW,YAAY,KAAZ,YAAY,QAIvB;AAcD,6BAA6B;AAC7B,MAAM,CAAN,IAAY,mBAOX;AAPD,WAAY,mBAAmB;IAC7B,oCAAa,CAAA;IACb,0CAAmB,CAAA;IACnB,4CAAqB,CAAA;IACrB,kDAA2B,CAAA;IAC3B,sCAAe,CAAA;IACf,wCAAiB,CAAA;AACnB,CAAC,EAPW,mBAAmB,KAAnB,mBAAmB,QAO9B"}

package/dist/src/services/shellExecutionService.js

@@ -9,6 +9,7 @@ import { spawn as cpSpawn } from 'node:child_process';
 import { TextDecoder } from 'node:util';
 import os from 'node:os';
 import { getCachedEncodingForBuffer } from '../utils/systemEncoding.js';
+import { getShellConfiguration } from '../utils/shell-utils.js';
 import { isBinary } from '../utils/textUtils.js';
 import pkg from '@xterm/headless';
 import { serializeTerminalToObject, } from '../utils/terminalSerializer.js';
@@ -81,11 +82,13 @@ export class ShellExecutionService {
     static childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal) {
         try {
             const isWindows = os.platform() === 'win32';
-            const child = cpSpawn(commandToExecute, [], {
+            const { executable, argsPrefix } = getShellConfiguration();
+            const spawnArgs = [...argsPrefix, commandToExecute];
+            const child = cpSpawn(executable, spawnArgs, {
                 cwd,
                 stdio: ['ignore', 'pipe', 'pipe'],
-                windowsVerbatimArguments: true,
-                shell: isWindows ? true : 'bash',
+                windowsVerbatimArguments: isWindows ? false : undefined,
+                shell: false,
                 detached: !isWindows,
                 env: {
                     ...process.env,
@@ -254,12 +257,9 @@ export class ShellExecutionService {
         try {
             const cols = shellExecutionConfig.terminalWidth ?? 80;
             const rows = shellExecutionConfig.terminalHeight ?? 30;
-            const isWindows = os.platform() === 'win32';
-            const shell = isWindows ? 'cmd.exe' : 'bash';
-            const args = isWindows
-                ? `/c ${commandToExecute}`
-                : ['-c', commandToExecute];
-            const ptyProcess = ptyInfo.module.spawn(shell, args, {
+            const { executable, argsPrefix } = getShellConfiguration();
+            const args = [...argsPrefix, commandToExecute];
+            const ptyProcess = ptyInfo.module.spawn(executable, args, {
                 cwd,
                 name: 'xterm',
                 cols,