@google/gemini-cli 0.0.1

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

@@ -0,0 +1,221 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { resolveEnvVarsInString, resolveEnvVarsInObject, } from './envVarResolver.js';
+describe('resolveEnvVarsInString', () => {
+    let originalEnv;
+    beforeEach(() => {
+        originalEnv = { ...process.env };
+    });
+    afterEach(() => {
+        process.env = originalEnv;
+    });
+    it('should resolve $VAR_NAME format', () => {
+        process.env['TEST_VAR'] = 'test-value';
+        const result = resolveEnvVarsInString('Value is $TEST_VAR');
+        expect(result).toBe('Value is test-value');
+    });
+    it('should resolve ${VAR_NAME} format', () => {
+        process.env['TEST_VAR'] = 'test-value';
+        const result = resolveEnvVarsInString('Value is ${TEST_VAR}');
+        expect(result).toBe('Value is test-value');
+    });
+    it('should resolve multiple variables in the same string', () => {
+        process.env['HOST'] = 'localhost';
+        process.env['PORT'] = '3000';
+        const result = resolveEnvVarsInString('URL: http://$HOST:${PORT}/api');
+        expect(result).toBe('URL: http://localhost:3000/api');
+    });
+    it('should leave undefined variables unchanged', () => {
+        const result = resolveEnvVarsInString('Value is $UNDEFINED_VAR');
+        expect(result).toBe('Value is $UNDEFINED_VAR');
+    });
+    it('should leave undefined variables with braces unchanged', () => {
+        const result = resolveEnvVarsInString('Value is ${UNDEFINED_VAR}');
+        expect(result).toBe('Value is ${UNDEFINED_VAR}');
+    });
+    it('should handle empty string', () => {
+        const result = resolveEnvVarsInString('');
+        expect(result).toBe('');
+    });
+    it('should handle string without variables', () => {
+        const result = resolveEnvVarsInString('No variables here');
+        expect(result).toBe('No variables here');
+    });
+    it('should handle mixed defined and undefined variables', () => {
+        process.env['DEFINED'] = 'value';
+        const result = resolveEnvVarsInString('$DEFINED and $UNDEFINED mixed');
+        expect(result).toBe('value and $UNDEFINED mixed');
+    });
+});
+describe('resolveEnvVarsInObject', () => {
+    let originalEnv;
+    beforeEach(() => {
+        originalEnv = { ...process.env };
+    });
+    afterEach(() => {
+        process.env = originalEnv;
+    });
+    it('should resolve variables in nested objects', () => {
+        process.env['API_KEY'] = 'secret-123';
+        process.env['DB_URL'] = 'postgresql://localhost/test';
+        const config = {
+            server: {
+                auth: {
+                    key: '$API_KEY',
+                },
+                database: '${DB_URL}',
+            },
+            port: 3000,
+        };
+        const result = resolveEnvVarsInObject(config);
+        expect(result).toEqual({
+            server: {
+                auth: {
+                    key: 'secret-123',
+                },
+                database: 'postgresql://localhost/test',
+            },
+            port: 3000,
+        });
+    });
+    it('should resolve variables in arrays', () => {
+        process.env['ENV'] = 'production';
+        process.env['VERSION'] = '1.0.0';
+        const config = {
+            tags: ['$ENV', 'app', '${VERSION}'],
+            metadata: {
+                env: '$ENV',
+            },
+        };
+        const result = resolveEnvVarsInObject(config);
+        expect(result).toEqual({
+            tags: ['production', 'app', '1.0.0'],
+            metadata: {
+                env: 'production',
+            },
+        });
+    });
+    it('should preserve non-string types', () => {
+        const config = {
+            enabled: true,
+            count: 42,
+            value: null,
+            data: undefined,
+            tags: ['item1', 'item2'],
+        };
+        const result = resolveEnvVarsInObject(config);
+        expect(result).toEqual(config);
+    });
+    it('should handle MCP server config structure', () => {
+        process.env['API_TOKEN'] = 'token-123';
+        process.env['SERVER_PORT'] = '8080';
+        const extensionConfig = {
+            name: 'test-extension',
+            version: '1.0.0',
+            mcpServers: {
+                'test-server': {
+                    command: 'node',
+                    args: ['server.js', '--port', '${SERVER_PORT}'],
+                    env: {
+                        API_KEY: '$API_TOKEN',
+                        STATIC_VALUE: 'unchanged',
+                    },
+                    timeout: 5000,
+                },
+            },
+        };
+        const result = resolveEnvVarsInObject(extensionConfig);
+        expect(result).toEqual({
+            name: 'test-extension',
+            version: '1.0.0',
+            mcpServers: {
+                'test-server': {
+                    command: 'node',
+                    args: ['server.js', '--port', '8080'],
+                    env: {
+                        API_KEY: 'token-123',
+                        STATIC_VALUE: 'unchanged',
+                    },
+                    timeout: 5000,
+                },
+            },
+        });
+    });
+    it('should handle empty and null values', () => {
+        const config = {
+            empty: '',
+            nullValue: null,
+            undefinedValue: undefined,
+            zero: 0,
+            false: false,
+        };
+        const result = resolveEnvVarsInObject(config);
+        expect(result).toEqual(config);
+    });
+    it('should handle circular references in objects without infinite recursion', () => {
+        process.env['TEST_VAR'] = 'resolved-value';
+        const config = {
+            name: '$TEST_VAR',
+            value: 42,
+        };
+        // Create circular reference
+        config.self = config;
+        const result = resolveEnvVarsInObject(config);
+        expect(result.name).toBe('resolved-value');
+        expect(result.value).toBe(42);
+        expect(result.self).toBeDefined();
+        expect(result.self?.name).toBe('$TEST_VAR'); // Circular reference should be shallow copied
+        expect(result.self?.value).toBe(42);
+        // Verify it doesn't create infinite recursion by checking it's not the same object
+        expect(result.self).not.toBe(result);
+    });
+    it('should handle circular references in arrays without infinite recursion', () => {
+        process.env['ARRAY_VAR'] = 'array-value';
+        const arr = ['$ARRAY_VAR', 123];
+        // Create circular reference
+        arr.push(arr);
+        const result = resolveEnvVarsInObject(arr);
+        expect(result[0]).toBe('array-value');
+        expect(result[1]).toBe(123);
+        expect(Array.isArray(result[2])).toBe(true);
+        const subArray = result[2];
+        expect(subArray[0]).toBe('$ARRAY_VAR'); // Circular reference should be shallow copied
+        expect(subArray[1]).toBe(123);
+        // Verify it doesn't create infinite recursion
+        expect(result[2]).not.toBe(result);
+    });
+    it('should handle complex nested circular references', () => {
+        process.env['NESTED_VAR'] = 'nested-resolved';
+        const obj1 = { name: '$NESTED_VAR', id: 1 };
+        const obj2 = { name: 'static', id: 2 };
+        // Create cross-references
+        obj1.ref = obj2;
+        obj2.ref = obj1;
+        const config = {
+            primary: obj1,
+            secondary: obj2,
+            value: '$NESTED_VAR',
+        };
+        const result = resolveEnvVarsInObject(config);
+        expect(result.value).toBe('nested-resolved');
+        expect(result.primary.name).toBe('nested-resolved');
+        expect(result.primary.id).toBe(1);
+        expect(result.secondary.name).toBe('static');
+        expect(result.secondary.id).toBe(2);
+        // Check that circular references are handled (shallow copied)
+        expect(result.primary.ref).toBeDefined();
+        expect(result.secondary.ref).toBeDefined();
+        expect(result.primary.ref?.name).toBe('static'); // Should be shallow copy
+        expect(result.secondary.ref?.name).toBe('nested-resolved'); // The shallow copy still gets processed
+        // Most importantly: verify no infinite recursion by checking objects are different
+        expect(result.primary.ref).not.toBe(result.secondary);
+        expect(result.secondary.ref).not.toBe(result.primary);
+        expect(result.primary).not.toBe(obj1); // New object created
+        expect(result.secondary).not.toBe(obj2); // New object created
+    });
+});
+//# sourceMappingURL=envVarResolver.test.js.map

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

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

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

@@ -0,0 +1,27 @@
+/**
+ * @license
+ * 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

@@ -0,0 +1,105 @@
+/**
+ * @license
+ * 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

@@ -0,0 +1 @@
+{"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 {};