@google/gemini-cli-core 0.0.3-preview.4 → 0.0.4

package/dist/src/mcp/token-storage/keychain-token-storage.test.js

@@ -0,0 +1,254 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+// Hoist the mock to be available in the vi.mock factory
+const mockKeytar = vi.hoisted(() => ({
+    getPassword: vi.fn(),
+    setPassword: vi.fn(),
+    deletePassword: vi.fn(),
+    findCredentials: vi.fn(),
+}));
+const mockServiceName = 'service-name';
+const mockCryptoRandomBytesString = 'random-string';
+// Mock the dynamic import of 'keytar'
+vi.mock('keytar', () => ({
+    default: mockKeytar,
+}));
+vi.mock('node:crypto', () => ({
+    randomBytes: vi.fn(() => ({
+        toString: vi.fn(() => mockCryptoRandomBytesString),
+    })),
+}));
+describe('KeychainTokenStorage', () => {
+    let storage;
+    beforeEach(async () => {
+        vi.resetAllMocks();
+        // Reset the internal state of the keychain-token-storage module
+        vi.resetModules();
+        const { KeychainTokenStorage } = await import('./keychain-token-storage.js');
+        storage = new KeychainTokenStorage(mockServiceName);
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+        vi.useRealTimers();
+    });
+    const validCredentials = {
+        serverName: 'test-server',
+        token: {
+            accessToken: 'access-token',
+            tokenType: 'Bearer',
+            expiresAt: Date.now() + 3600000,
+        },
+        updatedAt: Date.now(),
+    };
+    describe('checkKeychainAvailability', () => {
+        it('should return true if keytar is available and functional', async () => {
+            mockKeytar.setPassword.mockResolvedValue(undefined);
+            mockKeytar.getPassword.mockResolvedValue('test');
+            mockKeytar.deletePassword.mockResolvedValue(true);
+            const isAvailable = await storage.checkKeychainAvailability();
+            expect(isAvailable).toBe(true);
+            expect(mockKeytar.setPassword).toHaveBeenCalledWith(mockServiceName, `__keychain_test__${mockCryptoRandomBytesString}`, 'test');
+            expect(mockKeytar.getPassword).toHaveBeenCalledWith(mockServiceName, `__keychain_test__${mockCryptoRandomBytesString}`);
+            expect(mockKeytar.deletePassword).toHaveBeenCalledWith(mockServiceName, `__keychain_test__${mockCryptoRandomBytesString}`);
+        });
+        it('should return false if keytar fails to set password', async () => {
+            mockKeytar.setPassword.mockRejectedValue(new Error('write error'));
+            const isAvailable = await storage.checkKeychainAvailability();
+            expect(isAvailable).toBe(false);
+        });
+        it('should return false if retrieved password does not match', async () => {
+            mockKeytar.setPassword.mockResolvedValue(undefined);
+            mockKeytar.getPassword.mockResolvedValue('wrong-password');
+            mockKeytar.deletePassword.mockResolvedValue(true);
+            const isAvailable = await storage.checkKeychainAvailability();
+            expect(isAvailable).toBe(false);
+        });
+        it('should cache the availability result', async () => {
+            mockKeytar.setPassword.mockResolvedValue(undefined);
+            mockKeytar.getPassword.mockResolvedValue('test');
+            mockKeytar.deletePassword.mockResolvedValue(true);
+            await storage.checkKeychainAvailability();
+            await storage.checkKeychainAvailability();
+            expect(mockKeytar.setPassword).toHaveBeenCalledTimes(1);
+        });
+    });
+    describe('with keychain unavailable', () => {
+        beforeEach(async () => {
+            // Force keychain to be unavailable
+            mockKeytar.setPassword.mockRejectedValue(new Error('keychain error'));
+            await storage.checkKeychainAvailability();
+        });
+        it('getCredentials should throw', async () => {
+            await expect(storage.getCredentials('server')).rejects.toThrow('Keychain is not available');
+        });
+        it('setCredentials should throw', async () => {
+            await expect(storage.setCredentials(validCredentials)).rejects.toThrow('Keychain is not available');
+        });
+        it('deleteCredentials should throw', async () => {
+            await expect(storage.deleteCredentials('server')).rejects.toThrow('Keychain is not available');
+        });
+        it('listServers should throw', async () => {
+            await expect(storage.listServers()).rejects.toThrow('Keychain is not available');
+        });
+        it('getAllCredentials should throw', async () => {
+            await expect(storage.getAllCredentials()).rejects.toThrow('Keychain is not available');
+        });
+    });
+    describe('with keychain available', () => {
+        beforeEach(async () => {
+            mockKeytar.setPassword.mockResolvedValue(undefined);
+            mockKeytar.getPassword.mockResolvedValue('test');
+            mockKeytar.deletePassword.mockResolvedValue(true);
+            await storage.checkKeychainAvailability();
+            // Reset mocks after availability check
+            vi.resetAllMocks();
+        });
+        describe('getCredentials', () => {
+            it('should return null if no credentials are found', async () => {
+                mockKeytar.getPassword.mockResolvedValue(null);
+                const result = await storage.getCredentials('test-server');
+                expect(result).toBeNull();
+                expect(mockKeytar.getPassword).toHaveBeenCalledWith(mockServiceName, 'test-server');
+            });
+            it('should return credentials if found and not expired', async () => {
+                mockKeytar.getPassword.mockResolvedValue(JSON.stringify(validCredentials));
+                const result = await storage.getCredentials('test-server');
+                expect(result).toEqual(validCredentials);
+            });
+            it('should return null if credentials have expired', async () => {
+                const expiredCreds = {
+                    ...validCredentials,
+                    token: { ...validCredentials.token, expiresAt: Date.now() - 1000 },
+                };
+                mockKeytar.getPassword.mockResolvedValue(JSON.stringify(expiredCreds));
+                const result = await storage.getCredentials('test-server');
+                expect(result).toBeNull();
+            });
+            it('should throw if stored data is corrupted JSON', async () => {
+                mockKeytar.getPassword.mockResolvedValue('not-json');
+                await expect(storage.getCredentials('test-server')).rejects.toThrow('Failed to parse stored credentials for test-server');
+            });
+        });
+        describe('setCredentials', () => {
+            it('should save credentials to keychain', async () => {
+                vi.useFakeTimers();
+                mockKeytar.setPassword.mockResolvedValue(undefined);
+                await storage.setCredentials(validCredentials);
+                expect(mockKeytar.setPassword).toHaveBeenCalledWith(mockServiceName, 'test-server', JSON.stringify({ ...validCredentials, updatedAt: Date.now() }));
+            });
+            it('should throw if saving to keychain fails', async () => {
+                mockKeytar.setPassword.mockRejectedValue(new Error('keychain write error'));
+                await expect(storage.setCredentials(validCredentials)).rejects.toThrow('keychain write error');
+            });
+        });
+        describe('deleteCredentials', () => {
+            it('should delete credentials from keychain', async () => {
+                mockKeytar.deletePassword.mockResolvedValue(true);
+                await storage.deleteCredentials('test-server');
+                expect(mockKeytar.deletePassword).toHaveBeenCalledWith(mockServiceName, 'test-server');
+            });
+            it('should throw if no credentials were found to delete', async () => {
+                mockKeytar.deletePassword.mockResolvedValue(false);
+                await expect(storage.deleteCredentials('test-server')).rejects.toThrow('No credentials found for test-server');
+            });
+            it('should throw if deleting from keychain fails', async () => {
+                mockKeytar.deletePassword.mockRejectedValue(new Error('keychain delete error'));
+                await expect(storage.deleteCredentials('test-server')).rejects.toThrow('keychain delete error');
+            });
+        });
+        describe('listServers', () => {
+            it('should return a list of server names', async () => {
+                mockKeytar.findCredentials.mockResolvedValue([
+                    { account: 'server1', password: '' },
+                    { account: 'server2', password: '' },
+                ]);
+                const result = await storage.listServers();
+                expect(result).toEqual(['server1', 'server2']);
+            });
+            it('should not include internal test keys in the server list', async () => {
+                mockKeytar.findCredentials.mockResolvedValue([
+                    { account: 'server1', password: '' },
+                    {
+                        account: `__keychain_test__${mockCryptoRandomBytesString}`,
+                        password: '',
+                    },
+                    { account: 'server2', password: '' },
+                ]);
+                const result = await storage.listServers();
+                expect(result).toEqual(['server1', 'server2']);
+            });
+            it('should return an empty array on error', async () => {
+                mockKeytar.findCredentials.mockRejectedValue(new Error('find error'));
+                const result = await storage.listServers();
+                expect(result).toEqual([]);
+            });
+        });
+        describe('getAllCredentials', () => {
+            it('should return a map of all valid credentials', async () => {
+                const creds2 = {
+                    ...validCredentials,
+                    serverName: 'server2',
+                };
+                const expiredCreds = {
+                    ...validCredentials,
+                    serverName: 'expired-server',
+                    token: { ...validCredentials.token, expiresAt: Date.now() - 1000 },
+                };
+                const structurallyInvalidCreds = {
+                    serverName: 'invalid-server',
+                };
+                mockKeytar.findCredentials.mockResolvedValue([
+                    {
+                        account: 'test-server',
+                        password: JSON.stringify(validCredentials),
+                    },
+                    { account: 'server2', password: JSON.stringify(creds2) },
+                    {
+                        account: 'expired-server',
+                        password: JSON.stringify(expiredCreds),
+                    },
+                    { account: 'bad-server', password: 'not-json' },
+                    {
+                        account: 'invalid-server',
+                        password: JSON.stringify(structurallyInvalidCreds),
+                    },
+                ]);
+                const result = await storage.getAllCredentials();
+                expect(result.size).toBe(2);
+                expect(result.get('test-server')).toEqual(validCredentials);
+                expect(result.get('server2')).toEqual(creds2);
+                expect(result.has('expired-server')).toBe(false);
+                expect(result.has('bad-server')).toBe(false);
+                expect(result.has('invalid-server')).toBe(false);
+            });
+        });
+        describe('clearAll', () => {
+            it('should delete all credentials for the service', async () => {
+                mockKeytar.findCredentials.mockResolvedValue([
+                    { account: 'server1', password: '' },
+                    { account: 'server2', password: '' },
+                ]);
+                mockKeytar.deletePassword.mockResolvedValue(true);
+                await storage.clearAll();
+                expect(mockKeytar.deletePassword).toHaveBeenCalledTimes(2);
+                expect(mockKeytar.deletePassword).toHaveBeenCalledWith(mockServiceName, 'server1');
+                expect(mockKeytar.deletePassword).toHaveBeenCalledWith(mockServiceName, 'server2');
+            });
+            it('should throw an aggregated error if deletions fail', async () => {
+                mockKeytar.findCredentials.mockResolvedValue([
+                    { account: 'server1', password: '' },
+                    { account: 'server2', password: '' },
+                ]);
+                mockKeytar.deletePassword
+                    .mockResolvedValueOnce(true)
+                    .mockRejectedValueOnce(new Error('delete failed'));
+                await expect(storage.clearAll()).rejects.toThrow('Failed to clear some credentials: delete failed');
+            });
+        });
+    });
+});
+//# sourceMappingURL=keychain-token-storage.test.js.map

package/dist/src/mcp/token-storage/keychain-token-storage.test.js.map

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

package/dist/src/mcp/token-storage/types.d.ts

@@ -32,3 +32,7 @@ export interface TokenStorage {
     getAllCredentials(): Promise<Map<string, OAuthCredentials>>;
     clearAll(): Promise<void>;
 }
+export declare enum TokenStorageType {
+    KEYCHAIN = "keychain",
+    ENCRYPTED_FILE = "encrypted_file"
+}

package/dist/src/mcp/token-storage/types.js

@@ -3,5 +3,9 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-export {};
+export var TokenStorageType;
+(function (TokenStorageType) {
+    TokenStorageType["KEYCHAIN"] = "keychain";
+    TokenStorageType["ENCRYPTED_FILE"] = "encrypted_file";
+})(TokenStorageType || (TokenStorageType = {}));
 //# sourceMappingURL=types.js.map

package/dist/src/mcp/token-storage/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/mcp/token-storage/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/mcp/token-storage/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAkCH,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,yCAAqB,CAAA;IACrB,qDAAiC,CAAA;AACnC,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B"}

package/dist/src/output/json-formatter.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
+import type { JsonError } from './types.js';
+export declare class JsonFormatter {
+    format(response?: string, stats?: SessionMetrics, error?: JsonError): string;
+    formatError(error: Error, code?: string | number): string;
+}

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

@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import stripAnsi from 'strip-ansi';
+export class JsonFormatter {
+    format(response, stats, error) {
+        const output = {};
+        if (response !== undefined) {
+            output.response = stripAnsi(response);
+        }
+        if (stats) {
+            output.stats = stats;
+        }
+        if (error) {
+            output.error = error;
+        }
+        return JSON.stringify(output, null, 2);
+    }
+    formatError(error, code) {
+        const jsonError = {
+            type: error.constructor.name,
+            message: stripAnsi(error.message),
+            ...(code && { code }),
+        };
+        return this.format(undefined, undefined, jsonError);
+    }
+}
+//# sourceMappingURL=json-formatter.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"json-formatter.js","sourceRoot":"","sources":["../../../src/output/json-formatter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,SAAS,MAAM,YAAY,CAAC;AAInC,MAAM,OAAO,aAAa;IACxB,MAAM,CAAC,QAAiB,EAAE,KAAsB,EAAE,KAAiB;QACjE,MAAM,MAAM,GAAe,EAAE,CAAC;QAE9B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QACvB,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QACvB,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,WAAW,CAAC,KAAY,EAAE,IAAsB;QAC9C,MAAM,SAAS,GAAc;YAC3B,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,IAAI;YAC5B,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC;YACjC,GAAG,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;SACtB,CAAC;QAEF,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;CACF"}

package/dist/src/output/json-formatter.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

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

@@ -0,0 +1,266 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { expect, describe, it } from 'vitest';
+import { JsonFormatter } from './json-formatter.js';
+describe('JsonFormatter', () => {
+    it('should format the response as JSON', () => {
+        const formatter = new JsonFormatter();
+        const response = 'This is a test response.';
+        const formatted = formatter.format(response);
+        const expected = {
+            response,
+        };
+        expect(JSON.parse(formatted)).toEqual(expected);
+    });
+    it('should strip ANSI escape sequences from response text', () => {
+        const formatter = new JsonFormatter();
+        const responseWithAnsi = '\x1B[31mRed text\x1B[0m and \x1B[32mGreen text\x1B[0m';
+        const formatted = formatter.format(responseWithAnsi);
+        const parsed = JSON.parse(formatted);
+        expect(parsed.response).toBe('Red text and Green text');
+    });
+    it('should strip control characters from response text', () => {
+        const formatter = new JsonFormatter();
+        const responseWithControlChars = 'Text with\x07 bell\x08 and\x0B vertical tab';
+        const formatted = formatter.format(responseWithControlChars);
+        const parsed = JSON.parse(formatted);
+        // Only ANSI codes are stripped, other control chars are preserved
+        expect(parsed.response).toBe('Text with\x07 bell\x08 and\x0B vertical tab');
+    });
+    it('should preserve newlines and tabs in response text', () => {
+        const formatter = new JsonFormatter();
+        const responseWithWhitespace = 'Line 1\nLine 2\r\nLine 3\twith tab';
+        const formatted = formatter.format(responseWithWhitespace);
+        const parsed = JSON.parse(formatted);
+        expect(parsed.response).toBe('Line 1\nLine 2\r\nLine 3\twith tab');
+    });
+    it('should format the response as JSON with stats', () => {
+        const formatter = new JsonFormatter();
+        const response = 'This is a test response.';
+        const stats = {
+            models: {
+                'gemini-2.5-pro': {
+                    api: {
+                        totalRequests: 2,
+                        totalErrors: 0,
+                        totalLatencyMs: 5672,
+                    },
+                    tokens: {
+                        prompt: 24401,
+                        candidates: 215,
+                        total: 24719,
+                        cached: 10656,
+                        thoughts: 103,
+                        tool: 0,
+                    },
+                },
+                'gemini-2.5-flash': {
+                    api: {
+                        totalRequests: 2,
+                        totalErrors: 0,
+                        totalLatencyMs: 5914,
+                    },
+                    tokens: {
+                        prompt: 20803,
+                        candidates: 716,
+                        total: 21657,
+                        cached: 0,
+                        thoughts: 138,
+                        tool: 0,
+                    },
+                },
+            },
+            tools: {
+                totalCalls: 1,
+                totalSuccess: 1,
+                totalFail: 0,
+                totalDurationMs: 4582,
+                totalDecisions: {
+                    accept: 0,
+                    reject: 0,
+                    modify: 0,
+                    auto_accept: 1,
+                },
+                byName: {
+                    google_web_search: {
+                        count: 1,
+                        success: 1,
+                        fail: 0,
+                        durationMs: 4582,
+                        decisions: {
+                            accept: 0,
+                            reject: 0,
+                            modify: 0,
+                            auto_accept: 1,
+                        },
+                    },
+                },
+            },
+            files: {
+                totalLinesAdded: 0,
+                totalLinesRemoved: 0,
+            },
+        };
+        const formatted = formatter.format(response, stats);
+        const expected = {
+            response,
+            stats,
+        };
+        expect(JSON.parse(formatted)).toEqual(expected);
+    });
+    it('should format error as JSON', () => {
+        const formatter = new JsonFormatter();
+        const error = {
+            type: 'ValidationError',
+            message: 'Invalid input provided',
+            code: 400,
+        };
+        const formatted = formatter.format(undefined, undefined, error);
+        const expected = {
+            error,
+        };
+        expect(JSON.parse(formatted)).toEqual(expected);
+    });
+    it('should format response with error as JSON', () => {
+        const formatter = new JsonFormatter();
+        const response = 'Partial response';
+        const error = {
+            type: 'TimeoutError',
+            message: 'Request timed out',
+            code: 'TIMEOUT',
+        };
+        const formatted = formatter.format(response, undefined, error);
+        const expected = {
+            response,
+            error,
+        };
+        expect(JSON.parse(formatted)).toEqual(expected);
+    });
+    it('should format error using formatError method', () => {
+        const formatter = new JsonFormatter();
+        const error = new Error('Something went wrong');
+        const formatted = formatter.formatError(error, 500);
+        const parsed = JSON.parse(formatted);
+        expect(parsed).toEqual({
+            error: {
+                type: 'Error',
+                message: 'Something went wrong',
+                code: 500,
+            },
+        });
+    });
+    it('should format custom error using formatError method', () => {
+        class CustomError extends Error {
+            constructor(message) {
+                super(message);
+                this.name = 'CustomError';
+            }
+        }
+        const formatter = new JsonFormatter();
+        const error = new CustomError('Custom error occurred');
+        const formatted = formatter.formatError(error);
+        const parsed = JSON.parse(formatted);
+        expect(parsed).toEqual({
+            error: {
+                type: 'CustomError',
+                message: 'Custom error occurred',
+            },
+        });
+    });
+    it('should format complete JSON output with response, stats, and error', () => {
+        const formatter = new JsonFormatter();
+        const response = 'Partial response before error';
+        const stats = {
+            models: {},
+            tools: {
+                totalCalls: 0,
+                totalSuccess: 0,
+                totalFail: 1,
+                totalDurationMs: 0,
+                totalDecisions: {
+                    accept: 0,
+                    reject: 0,
+                    modify: 0,
+                    auto_accept: 0,
+                },
+                byName: {},
+            },
+            files: {
+                totalLinesAdded: 0,
+                totalLinesRemoved: 0,
+            },
+        };
+        const error = {
+            type: 'ApiError',
+            message: 'Rate limit exceeded',
+            code: 429,
+        };
+        const formatted = formatter.format(response, stats, error);
+        const expected = {
+            response,
+            stats,
+            error,
+        };
+        expect(JSON.parse(formatted)).toEqual(expected);
+    });
+    it('should handle error messages containing JSON content', () => {
+        const formatter = new JsonFormatter();
+        const errorWithJson = new Error('API returned: {"error": "Invalid request", "code": 400}');
+        const formatted = formatter.formatError(errorWithJson, 'API_ERROR');
+        const parsed = JSON.parse(formatted);
+        expect(parsed).toEqual({
+            error: {
+                type: 'Error',
+                message: 'API returned: {"error": "Invalid request", "code": 400}',
+                code: 'API_ERROR',
+            },
+        });
+        // Verify the entire output is valid JSON
+        expect(() => JSON.parse(formatted)).not.toThrow();
+    });
+    it('should handle error messages with quotes and special characters', () => {
+        const formatter = new JsonFormatter();
+        const errorWithQuotes = new Error('Error: "quoted text" and \\backslash');
+        const formatted = formatter.formatError(errorWithQuotes);
+        const parsed = JSON.parse(formatted);
+        expect(parsed).toEqual({
+            error: {
+                type: 'Error',
+                message: 'Error: "quoted text" and \\backslash',
+            },
+        });
+        // Verify the entire output is valid JSON
+        expect(() => JSON.parse(formatted)).not.toThrow();
+    });
+    it('should handle error messages with control characters', () => {
+        const formatter = new JsonFormatter();
+        const errorWithControlChars = new Error('Error with\n newline and\t tab');
+        const formatted = formatter.formatError(errorWithControlChars);
+        const parsed = JSON.parse(formatted);
+        // Should preserve newlines and tabs as they are common whitespace characters
+        expect(parsed.error.message).toBe('Error with\n newline and\t tab');
+        // Verify the entire output is valid JSON
+        expect(() => JSON.parse(formatted)).not.toThrow();
+    });
+    it('should strip ANSI escape sequences from error messages', () => {
+        const formatter = new JsonFormatter();
+        const errorWithAnsi = new Error('\x1B[31mRed error\x1B[0m message');
+        const formatted = formatter.formatError(errorWithAnsi);
+        const parsed = JSON.parse(formatted);
+        expect(parsed.error.message).toBe('Red error message');
+        expect(() => JSON.parse(formatted)).not.toThrow();
+    });
+    it('should strip unsafe control characters from error messages', () => {
+        const formatter = new JsonFormatter();
+        const errorWithControlChars = new Error('Error\x07 with\x08 control\x0B chars');
+        const formatted = formatter.formatError(errorWithControlChars);
+        const parsed = JSON.parse(formatted);
+        // Only ANSI codes are stripped, other control chars are preserved
+        expect(parsed.error.message).toBe('Error\x07 with\x08 control\x0B chars');
+        expect(() => JSON.parse(formatted)).not.toThrow();
+    });
+});
+//# sourceMappingURL=json-formatter.test.js.map

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

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

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

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
+export declare enum OutputFormat {
+    TEXT = "text",
+    JSON = "json"
+}
+export interface JsonError {
+    type: string;
+    message: string;
+    code?: string | number;
+}
+export interface JsonOutput {
+    response?: string;
+    stats?: SessionMetrics;
+    error?: JsonError;
+}