@google/gemini-cli 0.5.0-preview.1 → 0.7.0-nightly.20250912.68035591

package/dist/src/ui/utils/textUtils.d.ts

@@ -30,3 +30,12 @@ export declare function cpSlice(str: string, start: number, end?: number): strin
  * - CR/LF (0x0D/0x0A) - needed for line breaks
  */
 export declare function stripUnsafeCharacters(str: string): string;
+/**
+ * Cached version of stringWidth function for better performance
+ * Follows Ink's approach with unlimited cache (no eviction)
+ */
+export declare const getCachedStringWidth: (str: string) => number;
+/**
+ * Clear the string width cache
+ */
+export declare const clearStringWidthCache: () => void;

package/dist/src/ui/utils/textUtils.js

@@ -5,6 +5,7 @@
  */
 import stripAnsi from 'strip-ansi';
 import { stripVTControlCharacters } from 'node:util';
+import stringWidth from 'string-width';
 /**
  * Calculates the maximum width of a multi-line ASCII art string.
  * @param asciiArt The ASCII art string.
@@ -22,10 +23,34 @@ export const getAsciiArtWidth = (asciiArt) => {
  *  Unicode‑aware helpers (work at the code‑point level rather than UTF‑16
  *  code units so that surrogate‑pair emoji count as one "column".)
  * ---------------------------------------------------------------------- */
+// Cache for code points to reduce GC pressure
+const codePointsCache = new Map();
+const MAX_STRING_LENGTH_TO_CACHE = 1000;
 export function toCodePoints(str) {
-    // [...str] or Array.from both iterate by UTF‑32 code point, handling
-    // surrogate pairs correctly.
-    return Array.from(str);
+    // ASCII fast path - check if all chars are ASCII (0-127)
+    let isAscii = true;
+    for (let i = 0; i < str.length; i++) {
+        if (str.charCodeAt(i) > 127) {
+            isAscii = false;
+            break;
+        }
+    }
+    if (isAscii) {
+        return str.split('');
+    }
+    // Cache short strings
+    if (str.length <= MAX_STRING_LENGTH_TO_CACHE) {
+        const cached = codePointsCache.get(str);
+        if (cached) {
+            return cached;
+        }
+    }
+    const result = Array.from(str);
+    // Cache result (unlimited like Ink)
+    if (str.length <= MAX_STRING_LENGTH_TO_CACHE) {
+        codePointsCache.set(str, result);
+    }
+    return result;
 }
 export function cpLen(str) {
     return toCodePoints(str).length;
@@ -77,4 +102,28 @@ export function stripUnsafeCharacters(str) {
     })
         .join('');
 }
+// String width caching for performance optimization
+const stringWidthCache = new Map();
+/**
+ * Cached version of stringWidth function for better performance
+ * Follows Ink's approach with unlimited cache (no eviction)
+ */
+export const getCachedStringWidth = (str) => {
+    // ASCII printable chars have width 1
+    if (/^[\x20-\x7E]*$/.test(str)) {
+        return str.length;
+    }
+    if (stringWidthCache.has(str)) {
+        return stringWidthCache.get(str);
+    }
+    const width = stringWidth(str);
+    stringWidthCache.set(str, width);
+    return width;
+};
+/**
+ * Clear the string width cache
+ */
+export const clearStringWidthCache = () => {
+    stringWidthCache.clear();
+};
 //# sourceMappingURL=textUtils.js.map

package/dist/src/ui/utils/textUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"textUtils.js","sourceRoot":"","sources":["../../../../src/ui/utils/textUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAErD;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAAU,EAAE;IAC3D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,CAAC,CAAC;IACX,CAAC;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AACvD,CAAC,CAAC;AAEF;;;;4EAI4E;AAE5E,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,qEAAqE;IACrE,6BAA6B;IAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,KAAK,CAAC,GAAW;IAC/B,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,GAAW,EAAE,KAAa,EAAE,GAAY;IAC9D,2CAA2C;IAC3C,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAChD,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAW;IAC/C,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,UAAU,GAAG,wBAAwB,CAAC,YAAY,CAAC,CAAC;IAE1D,OAAO,YAAY,CAAC,UAAU,CAAC;SAC5B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACf,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAErC,mCAAmC;QACnC,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAEhD,gEAAgE;QAChE,8EAA8E;QAC9E,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI;YAAE,OAAO,KAAK,CAAC;QAE/C,mEAAmE;QACnE,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI;YAAE,OAAO,KAAK,CAAC;QAE/C,kFAAkF;QAClF,oDAAoD;QAEpD,yDAAyD;QACzD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC"}
+{"version":3,"file":"textUtils.js","sourceRoot":"","sources":["../../../../src/ui/utils/textUtils.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/errors.d.ts

@@ -3,4 +3,25 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import type { Config } from '@google/gemini-cli-core';
 export declare function getErrorMessage(error: unknown): string;
+/**
+ * Handles errors consistently for both JSON and text output formats.
+ * In JSON mode, outputs formatted JSON error and exits.
+ * In text mode, outputs error message and re-throws.
+ */
+export declare function handleError(error: unknown, config: Config, customErrorCode?: string | number): never;
+/**
+ * Handles tool execution errors specifically.
+ * In JSON mode, outputs formatted JSON error and exits.
+ * In text mode, outputs error message to stderr only.
+ */
+export declare function handleToolError(toolName: string, toolError: Error, config: Config, errorCode?: string | number, resultDisplay?: string): void;
+/**
+ * Handles cancellation/abort signals consistently.
+ */
+export declare function handleCancellationError(config: Config): never;
+/**
+ * Handles max session turns exceeded consistently.
+ */
+export declare function handleMaxTurnsExceededError(config: Config): never;

package/dist/src/utils/errors.js

@@ -3,10 +3,103 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { OutputFormat, JsonFormatter, parseAndFormatApiError, FatalTurnLimitedError, FatalToolExecutionError, FatalCancellationError, } from '@google/gemini-cli-core';
 export function getErrorMessage(error) {
     if (error instanceof Error) {
         return error.message;
     }
     return String(error);
 }
+/**
+ * Extracts the appropriate error code from an error object.
+ */
+function extractErrorCode(error) {
+    const errorWithCode = error;
+    // Prioritize exitCode for FatalError types, fall back to other codes
+    if (typeof errorWithCode.exitCode === 'number') {
+        return errorWithCode.exitCode;
+    }
+    if (errorWithCode.code !== undefined) {
+        return errorWithCode.code;
+    }
+    if (errorWithCode.status !== undefined) {
+        return errorWithCode.status;
+    }
+    return 1; // Default exit code
+}
+/**
+ * Converts an error code to a numeric exit code.
+ */
+function getNumericExitCode(errorCode) {
+    return typeof errorCode === 'number' ? errorCode : 1;
+}
+/**
+ * Handles errors consistently for both JSON and text output formats.
+ * In JSON mode, outputs formatted JSON error and exits.
+ * In text mode, outputs error message and re-throws.
+ */
+export function handleError(error, config, customErrorCode) {
+    const errorMessage = parseAndFormatApiError(error, config.getContentGeneratorConfig()?.authType);
+    if (config.getOutputFormat() === OutputFormat.JSON) {
+        const formatter = new JsonFormatter();
+        const errorCode = customErrorCode ?? extractErrorCode(error);
+        const formattedError = formatter.formatError(error instanceof Error ? error : new Error(getErrorMessage(error)), errorCode);
+        console.error(formattedError);
+        process.exit(getNumericExitCode(errorCode));
+    }
+    else {
+        console.error(errorMessage);
+        throw error;
+    }
+}
+/**
+ * Handles tool execution errors specifically.
+ * In JSON mode, outputs formatted JSON error and exits.
+ * In text mode, outputs error message to stderr only.
+ */
+export function handleToolError(toolName, toolError, config, errorCode, resultDisplay) {
+    const errorMessage = `Error executing tool ${toolName}: ${resultDisplay || toolError.message}`;
+    const toolExecutionError = new FatalToolExecutionError(errorMessage);
+    if (config.getOutputFormat() === OutputFormat.JSON) {
+        const formatter = new JsonFormatter();
+        const formattedError = formatter.formatError(toolExecutionError, errorCode ?? toolExecutionError.exitCode);
+        console.error(formattedError);
+        process.exit(typeof errorCode === 'number' ? errorCode : toolExecutionError.exitCode);
+    }
+    else {
+        console.error(errorMessage);
+    }
+}
+/**
+ * Handles cancellation/abort signals consistently.
+ */
+export function handleCancellationError(config) {
+    const cancellationError = new FatalCancellationError('Operation cancelled.');
+    if (config.getOutputFormat() === OutputFormat.JSON) {
+        const formatter = new JsonFormatter();
+        const formattedError = formatter.formatError(cancellationError, cancellationError.exitCode);
+        console.error(formattedError);
+        process.exit(cancellationError.exitCode);
+    }
+    else {
+        console.error(cancellationError.message);
+        process.exit(cancellationError.exitCode);
+    }
+}
+/**
+ * Handles max session turns exceeded consistently.
+ */
+export function handleMaxTurnsExceededError(config) {
+    const maxTurnsError = new FatalTurnLimitedError('Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.');
+    if (config.getOutputFormat() === OutputFormat.JSON) {
+        const formatter = new JsonFormatter();
+        const formattedError = formatter.formatError(maxTurnsError, maxTurnsError.exitCode);
+        console.error(formattedError);
+        process.exit(maxTurnsError.exitCode);
+    }
+    else {
+        console.error(maxTurnsError.message);
+        process.exit(maxTurnsError.exitCode);
+    }
+}
 //# sourceMappingURL=errors.js.map

package/dist/src/utils/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/utils/errors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,UAAU,eAAe,CAAC,KAAc;IAC5C,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/utils/errors.ts"],"names":[],"mappings":"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"}

package/dist/src/utils/errors.test.d.ts

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

package/dist/src/utils/errors.test.js

@@ -0,0 +1,303 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi } from 'vitest';
+import { OutputFormat, FatalInputError } from '@google/gemini-cli-core';
+import { getErrorMessage, handleError, handleToolError, handleCancellationError, handleMaxTurnsExceededError, } from './errors.js';
+// Mock the core modules
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const original = await importOriginal();
+    return {
+        ...original,
+        parseAndFormatApiError: vi.fn((error) => {
+            if (error instanceof Error) {
+                return `API Error: ${error.message}`;
+            }
+            return `API Error: ${String(error)}`;
+        }),
+        JsonFormatter: vi.fn().mockImplementation(() => ({
+            formatError: vi.fn((error, code) => JSON.stringify({
+                error: {
+                    type: error.constructor.name,
+                    message: error.message,
+                    ...(code && { code }),
+                },
+            }, null, 2)),
+        })),
+        FatalToolExecutionError: class extends Error {
+            constructor(message) {
+                super(message);
+                this.name = 'FatalToolExecutionError';
+                this.exitCode = 54;
+            }
+            exitCode;
+        },
+        FatalCancellationError: class extends Error {
+            constructor(message) {
+                super(message);
+                this.name = 'FatalCancellationError';
+                this.exitCode = 130;
+            }
+            exitCode;
+        },
+    };
+});
+describe('errors', () => {
+    let mockConfig;
+    let processExitSpy;
+    let consoleErrorSpy;
+    beforeEach(() => {
+        // Reset mocks
+        vi.clearAllMocks();
+        // Mock console.error
+        consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
+        // Mock process.exit to throw instead of actually exiting
+        processExitSpy = vi.spyOn(process, 'exit').mockImplementation((code) => {
+            throw new Error(`process.exit called with code: ${code}`);
+        });
+        // Create mock config
+        mockConfig = {
+            getOutputFormat: vi.fn().mockReturnValue(OutputFormat.TEXT),
+            getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: 'test' }),
+        };
+    });
+    afterEach(() => {
+        consoleErrorSpy.mockRestore();
+        processExitSpy.mockRestore();
+    });
+    describe('getErrorMessage', () => {
+        it('should return error message for Error instances', () => {
+            const error = new Error('Test error message');
+            expect(getErrorMessage(error)).toBe('Test error message');
+        });
+        it('should convert non-Error values to strings', () => {
+            expect(getErrorMessage('string error')).toBe('string error');
+            expect(getErrorMessage(123)).toBe('123');
+            expect(getErrorMessage(null)).toBe('null');
+            expect(getErrorMessage(undefined)).toBe('undefined');
+        });
+        it('should handle objects', () => {
+            const obj = { message: 'test' };
+            expect(getErrorMessage(obj)).toBe('[object Object]');
+        });
+    });
+    describe('handleError', () => {
+        describe('in text mode', () => {
+            beforeEach(() => {
+                mockConfig.getOutputFormat.mockReturnValue(OutputFormat.TEXT);
+            });
+            it('should log error message and re-throw', () => {
+                const testError = new Error('Test error');
+                expect(() => {
+                    handleError(testError, mockConfig);
+                }).toThrow(testError);
+                expect(consoleErrorSpy).toHaveBeenCalledWith('API Error: Test error');
+            });
+            it('should handle non-Error objects', () => {
+                const testError = 'String error';
+                expect(() => {
+                    handleError(testError, mockConfig);
+                }).toThrow(testError);
+                expect(consoleErrorSpy).toHaveBeenCalledWith('API Error: String error');
+            });
+        });
+        describe('in JSON mode', () => {
+            beforeEach(() => {
+                mockConfig.getOutputFormat.mockReturnValue(OutputFormat.JSON);
+            });
+            it('should format error as JSON and exit with default code', () => {
+                const testError = new Error('Test error');
+                expect(() => {
+                    handleError(testError, mockConfig);
+                }).toThrow('process.exit called with code: 1');
+                expect(consoleErrorSpy).toHaveBeenCalledWith(JSON.stringify({
+                    error: {
+                        type: 'Error',
+                        message: 'Test error',
+                        code: 1,
+                    },
+                }, null, 2));
+            });
+            it('should use custom error code when provided', () => {
+                const testError = new Error('Test error');
+                expect(() => {
+                    handleError(testError, mockConfig, 42);
+                }).toThrow('process.exit called with code: 42');
+                expect(consoleErrorSpy).toHaveBeenCalledWith(JSON.stringify({
+                    error: {
+                        type: 'Error',
+                        message: 'Test error',
+                        code: 42,
+                    },
+                }, null, 2));
+            });
+            it('should extract exitCode from FatalError instances', () => {
+                const fatalError = new FatalInputError('Fatal error');
+                expect(() => {
+                    handleError(fatalError, mockConfig);
+                }).toThrow('process.exit called with code: 42');
+                expect(consoleErrorSpy).toHaveBeenCalledWith(JSON.stringify({
+                    error: {
+                        type: 'FatalInputError',
+                        message: 'Fatal error',
+                        code: 42,
+                    },
+                }, null, 2));
+            });
+            it('should handle error with code property', () => {
+                const errorWithCode = new Error('Error with code');
+                errorWithCode.code = 404;
+                expect(() => {
+                    handleError(errorWithCode, mockConfig);
+                }).toThrow('process.exit called with code: 404');
+            });
+            it('should handle error with status property', () => {
+                const errorWithStatus = new Error('Error with status');
+                errorWithStatus.status = 'TIMEOUT';
+                expect(() => {
+                    handleError(errorWithStatus, mockConfig);
+                }).toThrow('process.exit called with code: 1'); // string codes become 1
+                expect(consoleErrorSpy).toHaveBeenCalledWith(JSON.stringify({
+                    error: {
+                        type: 'Error',
+                        message: 'Error with status',
+                        code: 'TIMEOUT',
+                    },
+                }, null, 2));
+            });
+        });
+    });
+    describe('handleToolError', () => {
+        const toolName = 'test-tool';
+        const toolError = new Error('Tool failed');
+        describe('in text mode', () => {
+            beforeEach(() => {
+                mockConfig.getOutputFormat.mockReturnValue(OutputFormat.TEXT);
+            });
+            it('should log error message to stderr', () => {
+                handleToolError(toolName, toolError, mockConfig);
+                expect(consoleErrorSpy).toHaveBeenCalledWith('Error executing tool test-tool: Tool failed');
+            });
+            it('should use resultDisplay when provided', () => {
+                handleToolError(toolName, toolError, mockConfig, 'CUSTOM_ERROR', 'Custom display message');
+                expect(consoleErrorSpy).toHaveBeenCalledWith('Error executing tool test-tool: Custom display message');
+            });
+        });
+        describe('in JSON mode', () => {
+            beforeEach(() => {
+                mockConfig.getOutputFormat.mockReturnValue(OutputFormat.JSON);
+            });
+            it('should format error as JSON and exit with default code', () => {
+                expect(() => {
+                    handleToolError(toolName, toolError, mockConfig);
+                }).toThrow('process.exit called with code: 54');
+                expect(consoleErrorSpy).toHaveBeenCalledWith(JSON.stringify({
+                    error: {
+                        type: 'FatalToolExecutionError',
+                        message: 'Error executing tool test-tool: Tool failed',
+                        code: 54,
+                    },
+                }, null, 2));
+            });
+            it('should use custom error code', () => {
+                expect(() => {
+                    handleToolError(toolName, toolError, mockConfig, 'CUSTOM_TOOL_ERROR');
+                }).toThrow('process.exit called with code: 54');
+                expect(consoleErrorSpy).toHaveBeenCalledWith(JSON.stringify({
+                    error: {
+                        type: 'FatalToolExecutionError',
+                        message: 'Error executing tool test-tool: Tool failed',
+                        code: 'CUSTOM_TOOL_ERROR',
+                    },
+                }, null, 2));
+            });
+            it('should use numeric error code and exit with that code', () => {
+                expect(() => {
+                    handleToolError(toolName, toolError, mockConfig, 500);
+                }).toThrow('process.exit called with code: 500');
+                expect(consoleErrorSpy).toHaveBeenCalledWith(JSON.stringify({
+                    error: {
+                        type: 'FatalToolExecutionError',
+                        message: 'Error executing tool test-tool: Tool failed',
+                        code: 500,
+                    },
+                }, null, 2));
+            });
+            it('should prefer resultDisplay over error message', () => {
+                expect(() => {
+                    handleToolError(toolName, toolError, mockConfig, 'DISPLAY_ERROR', 'Display message');
+                }).toThrow('process.exit called with code: 54');
+                expect(consoleErrorSpy).toHaveBeenCalledWith(JSON.stringify({
+                    error: {
+                        type: 'FatalToolExecutionError',
+                        message: 'Error executing tool test-tool: Display message',
+                        code: 'DISPLAY_ERROR',
+                    },
+                }, null, 2));
+            });
+        });
+    });
+    describe('handleCancellationError', () => {
+        describe('in text mode', () => {
+            beforeEach(() => {
+                mockConfig.getOutputFormat.mockReturnValue(OutputFormat.TEXT);
+            });
+            it('should log cancellation message and exit with 130', () => {
+                expect(() => {
+                    handleCancellationError(mockConfig);
+                }).toThrow('process.exit called with code: 130');
+                expect(consoleErrorSpy).toHaveBeenCalledWith('Operation cancelled.');
+            });
+        });
+        describe('in JSON mode', () => {
+            beforeEach(() => {
+                mockConfig.getOutputFormat.mockReturnValue(OutputFormat.JSON);
+            });
+            it('should format cancellation as JSON and exit with 130', () => {
+                expect(() => {
+                    handleCancellationError(mockConfig);
+                }).toThrow('process.exit called with code: 130');
+                expect(consoleErrorSpy).toHaveBeenCalledWith(JSON.stringify({
+                    error: {
+                        type: 'FatalCancellationError',
+                        message: 'Operation cancelled.',
+                        code: 130,
+                    },
+                }, null, 2));
+            });
+        });
+    });
+    describe('handleMaxTurnsExceededError', () => {
+        describe('in text mode', () => {
+            beforeEach(() => {
+                mockConfig.getOutputFormat.mockReturnValue(OutputFormat.TEXT);
+            });
+            it('should log max turns message and exit with 53', () => {
+                expect(() => {
+                    handleMaxTurnsExceededError(mockConfig);
+                }).toThrow('process.exit called with code: 53');
+                expect(consoleErrorSpy).toHaveBeenCalledWith('Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.');
+            });
+        });
+        describe('in JSON mode', () => {
+            beforeEach(() => {
+                mockConfig.getOutputFormat.mockReturnValue(OutputFormat.JSON);
+            });
+            it('should format max turns error as JSON and exit with 53', () => {
+                expect(() => {
+                    handleMaxTurnsExceededError(mockConfig);
+                }).toThrow('process.exit called with code: 53');
+                expect(consoleErrorSpy).toHaveBeenCalledWith(JSON.stringify({
+                    error: {
+                        type: 'FatalTurnLimitedError',
+                        message: 'Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.',
+                        code: 53,
+                    },
+                }, null, 2));
+            });
+        });
+    });
+});
+//# sourceMappingURL=errors.test.js.map

package/dist/src/utils/errors.test.js.map

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

package/dist/src/utils/sandbox.js

@@ -324,6 +324,8 @@ export async function start_sandbox(config, nodeArgs = [], cliConfig, cliArgs =
         if (process.stdin.isTTY) {
             args.push('-t');
         }
+        // allow access to host.docker.internal
+        args.push('--add-host', 'host.docker.internal:host-gateway');
         // mount current directory as working directory in sandbox (set via --workdir)
         args.push('--volume', `${workdir}:${containerWorkdir}`);
         // mount user settings directory inside container, after creating if missing