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

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

@@ -0,0 +1,143 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { customDeepMerge } from './deepMerge.js';
+import { MergeStrategy } from '../config/settingsSchema.js';
+describe('customDeepMerge', () => {
+    it('should merge simple objects', () => {
+        const target = { a: 1, b: 2 };
+        const source = { b: 3, c: 4 };
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({ a: 1, b: 3, c: 4 });
+    });
+    it('should merge nested objects', () => {
+        const target = { a: { x: 1 }, b: 2 };
+        const source = { a: { y: 2 }, c: 3 };
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({ a: { x: 1, y: 2 }, b: 2, c: 3 });
+    });
+    it('should replace arrays by default', () => {
+        const target = { a: [1, 2] };
+        const source = { a: [3, 4] };
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({ a: [3, 4] });
+    });
+    it('should concatenate arrays with CONCAT strategy', () => {
+        const target = { a: [1, 2] };
+        const source = { a: [3, 4] };
+        const getMergeStrategy = (path) => path.join('.') === 'a' ? MergeStrategy.CONCAT : undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({ a: [1, 2, 3, 4] });
+    });
+    it('should union arrays with UNION strategy', () => {
+        const target = { a: [1, 2, 3] };
+        const source = { a: [3, 4, 5] };
+        const getMergeStrategy = (path) => path.join('.') === 'a' ? MergeStrategy.UNION : undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({ a: [1, 2, 3, 4, 5] });
+    });
+    it('should shallow merge objects with SHALLOW_MERGE strategy', () => {
+        const target = { a: { x: 1, y: 1 } };
+        const source = { a: { y: 2, z: 2 } };
+        const getMergeStrategy = (path) => path.join('.') === 'a' ? MergeStrategy.SHALLOW_MERGE : undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        // This is still a deep merge, but the properties of the object are merged.
+        expect(result).toEqual({ a: { x: 1, y: 2, z: 2 } });
+    });
+    it('should handle multiple source objects', () => {
+        const target = { a: 1 };
+        const source1 = { b: 2 };
+        const source2 = { c: 3 };
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, target, source1, source2);
+        expect(result).toEqual({ a: 1, b: 2, c: 3 });
+    });
+    it('should return an empty object if no sources are provided', () => {
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy);
+        expect(result).toEqual({});
+    });
+    it('should return a deep copy of the first source if only one is provided', () => {
+        const target = { a: { b: 1 } };
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, target);
+        expect(result).toEqual(target);
+        expect(result).not.toBe(target);
+    });
+    it('should not mutate the original source objects', () => {
+        const target = { a: { x: 1 }, b: [1, 2] };
+        const source = { a: { y: 2 }, b: [3, 4] };
+        const originalTarget = JSON.parse(JSON.stringify(target));
+        const originalSource = JSON.parse(JSON.stringify(source));
+        const getMergeStrategy = () => undefined;
+        customDeepMerge(getMergeStrategy, target, source);
+        expect(target).toEqual(originalTarget);
+        expect(source).toEqual(originalSource);
+    });
+    it('should not mutate sources when merging multiple levels deep', () => {
+        const s1 = { data: { common: { val: 'from s1' }, s1_only: true } };
+        const s2 = { data: { common: { val: 'from s2' }, s2_only: true } };
+        const s1_original = JSON.parse(JSON.stringify(s1));
+        const s2_original = JSON.parse(JSON.stringify(s2));
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, s1, s2);
+        expect(s1).toEqual(s1_original);
+        expect(s2).toEqual(s2_original);
+        expect(result).toEqual({
+            data: {
+                common: { val: 'from s2' },
+                s1_only: true,
+                s2_only: true,
+            },
+        });
+    });
+    it('should handle complex nested strategies', () => {
+        const target = {
+            level1: {
+                arr1: [1, 2],
+                arr2: [1, 2],
+                obj1: { a: 1 },
+            },
+        };
+        const source = {
+            level1: {
+                arr1: [3, 4],
+                arr2: [2, 3],
+                obj1: { b: 2 },
+            },
+        };
+        const getMergeStrategy = (path) => {
+            const p = path.join('.');
+            if (p === 'level1.arr1')
+                return MergeStrategy.CONCAT;
+            if (p === 'level1.arr2')
+                return MergeStrategy.UNION;
+            if (p === 'level1.obj1')
+                return MergeStrategy.SHALLOW_MERGE;
+            return undefined;
+        };
+        const result = customDeepMerge(getMergeStrategy, target, source);
+        expect(result).toEqual({
+            level1: {
+                arr1: [1, 2, 3, 4],
+                arr2: [1, 2, 3],
+                obj1: { a: 1, b: 2 },
+            },
+        });
+    });
+    it('should not pollute the prototype', () => {
+        const maliciousSource = JSON.parse('{"__proto__": {"polluted": "true"}}');
+        const getMergeStrategy = () => undefined;
+        const result = customDeepMerge(getMergeStrategy, {}, maliciousSource);
+        expect(result).toEqual({});
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        expect({}.polluted).toBeUndefined();
+    });
+});
+//# sourceMappingURL=deepMerge.test.js.map

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

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

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

@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Resolves environment variables in a string.
+ * Replaces $VAR_NAME and ${VAR_NAME} with their corresponding environment variable values.
+ * If the environment variable is not defined, the original placeholder is preserved.
+ *
+ * @param value - The string that may contain environment variable placeholders
+ * @returns The string with environment variables resolved
+ *
+ * @example
+ * resolveEnvVarsInString("Token: $API_KEY") // Returns "Token: secret-123"
+ * resolveEnvVarsInString("URL: ${BASE_URL}/api") // Returns "URL: https://api.example.com/api"
+ * resolveEnvVarsInString("Missing: $UNDEFINED_VAR") // Returns "Missing: $UNDEFINED_VAR"
+ */
+export declare function resolveEnvVarsInString(value: string): string;
+/**
+ * Recursively resolves environment variables in an object of any type.
+ * Handles strings, arrays, nested objects, and preserves other primitive types.
+ * Protected against circular references using a WeakSet to track visited objects.
+ *
+ * @param obj - The object to process for environment variable resolution
+ * @returns A new object with environment variables resolved
+ *
+ * @example
+ * const config = {
+ *   server: {
+ *     host: "$HOST",
+ *     port: "${PORT}",
+ *     enabled: true,
+ *     tags: ["$ENV", "api"]
+ *   }
+ * };
+ * const resolved = resolveEnvVarsInObject(config);
+ */
+export declare function resolveEnvVarsInObject<T>(obj: T): T;

package/dist/src/utils/envVarResolver.js

@@ -0,0 +1,97 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Resolves environment variables in a string.
+ * Replaces $VAR_NAME and ${VAR_NAME} with their corresponding environment variable values.
+ * If the environment variable is not defined, the original placeholder is preserved.
+ *
+ * @param value - The string that may contain environment variable placeholders
+ * @returns The string with environment variables resolved
+ *
+ * @example
+ * resolveEnvVarsInString("Token: $API_KEY") // Returns "Token: secret-123"
+ * resolveEnvVarsInString("URL: ${BASE_URL}/api") // Returns "URL: https://api.example.com/api"
+ * resolveEnvVarsInString("Missing: $UNDEFINED_VAR") // Returns "Missing: $UNDEFINED_VAR"
+ */
+export function resolveEnvVarsInString(value) {
+    const envVarRegex = /\$(?:(\w+)|{([^}]+)})/g; // Find $VAR_NAME or ${VAR_NAME}
+    return value.replace(envVarRegex, (match, varName1, varName2) => {
+        const varName = varName1 || varName2;
+        if (process && process.env && typeof process.env[varName] === 'string') {
+            return process.env[varName];
+        }
+        return match;
+    });
+}
+/**
+ * Recursively resolves environment variables in an object of any type.
+ * Handles strings, arrays, nested objects, and preserves other primitive types.
+ * Protected against circular references using a WeakSet to track visited objects.
+ *
+ * @param obj - The object to process for environment variable resolution
+ * @returns A new object with environment variables resolved
+ *
+ * @example
+ * const config = {
+ *   server: {
+ *     host: "$HOST",
+ *     port: "${PORT}",
+ *     enabled: true,
+ *     tags: ["$ENV", "api"]
+ *   }
+ * };
+ * const resolved = resolveEnvVarsInObject(config);
+ */
+export function resolveEnvVarsInObject(obj) {
+    return resolveEnvVarsInObjectInternal(obj, new WeakSet());
+}
+/**
+ * Internal implementation of resolveEnvVarsInObject with circular reference protection.
+ *
+ * @param obj - The object to process
+ * @param visited - WeakSet to track visited objects and prevent circular references
+ * @returns A new object with environment variables resolved
+ */
+function resolveEnvVarsInObjectInternal(obj, visited) {
+    if (obj === null ||
+        obj === undefined ||
+        typeof obj === 'boolean' ||
+        typeof obj === 'number') {
+        return obj;
+    }
+    if (typeof obj === 'string') {
+        return resolveEnvVarsInString(obj);
+    }
+    if (Array.isArray(obj)) {
+        // Check for circular reference
+        if (visited.has(obj)) {
+            // Return a shallow copy to break the cycle
+            return [...obj];
+        }
+        visited.add(obj);
+        const result = obj.map((item) => resolveEnvVarsInObjectInternal(item, visited));
+        visited.delete(obj);
+        return result;
+    }
+    if (typeof obj === 'object') {
+        // Check for circular reference
+        if (visited.has(obj)) {
+            // Return a shallow copy to break the cycle
+            return { ...obj };
+        }
+        visited.add(obj);
+        const newObj = { ...obj };
+        for (const key in newObj) {
+            if (Object.prototype.hasOwnProperty.call(newObj, key)) {
+                newObj[key] = resolveEnvVarsInObjectInternal(newObj[key], visited);
+            }
+        }
+        visited.delete(obj);
+        return newObj;
+    }
+    return obj;
+}
+//# sourceMappingURL=envVarResolver.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"envVarResolver.js","sourceRoot":"","sources":["../../../src/utils/envVarResolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAAa;IAClD,MAAM,WAAW,GAAG,wBAAwB,CAAC,CAAC,gCAAgC;IAC9E,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;QAC9D,MAAM,OAAO,GAAG,QAAQ,IAAI,QAAQ,CAAC;QACrC,IAAI,OAAO,IAAI,OAAO,CAAC,GAAG,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;YACvE,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;QAC/B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,sBAAsB,CAAI,GAAM;IAC9C,OAAO,8BAA8B,CAAC,GAAG,EAAE,IAAI,OAAO,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED;;;;;;GAMG;AACH,SAAS,8BAA8B,CACrC,GAAM,EACN,OAAwB;IAExB,IACE,GAAG,KAAK,IAAI;QACZ,GAAG,KAAK,SAAS;QACjB,OAAO,GAAG,KAAK,SAAS;QACxB,OAAO,GAAG,KAAK,QAAQ,EACvB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,sBAAsB,CAAC,GAAG,CAAiB,CAAC;IACrD,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,+BAA+B;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,2CAA2C;YAC3C,OAAO,CAAC,GAAG,GAAG,CAAiB,CAAC;QAClC,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9B,8BAA8B,CAAC,IAAI,EAAE,OAAO,CAAC,CAC9B,CAAC;QAClB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,+BAA+B;QAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,GAAa,CAAC,EAAE,CAAC;YAC/B,2CAA2C;YAC3C,OAAO,EAAE,GAAG,GAAG,EAAO,CAAC;QACzB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,GAAa,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,EAAE,GAAG,GAAG,EAAO,CAAC;QAC/B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;gBACtD,MAAM,CAAC,GAAG,CAAC,GAAG,8BAA8B,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,GAAa,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

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

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

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

@@ -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;