@quantum-ai/gemini-cli 0.45.3

package/packages/cli/dist/src/utils/dialogScopeUtils.js

@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { isLoadableSettingScope, SettingScope, } from '../config/settings.js';
+import { isInSettingsScope } from './settingsUtils.js';
+/**
+ * Shared scope labels for dialog components that need to display setting scopes
+ */
+export const SCOPE_LABELS = {
+    [SettingScope.User]: 'User Settings',
+    [SettingScope.Workspace]: 'Workspace Settings',
+    [SettingScope.System]: 'System Settings',
+};
+/**
+ * Helper function to get scope items for radio button selects
+ */
+export function getScopeItems() {
+    return [
+        { label: SCOPE_LABELS[SettingScope.User], value: SettingScope.User },
+        {
+            label: SCOPE_LABELS[SettingScope.Workspace],
+            value: SettingScope.Workspace,
+        },
+        { label: SCOPE_LABELS[SettingScope.System], value: SettingScope.System },
+    ];
+}
+/**
+ * Generate scope message for a specific setting
+ */
+export function getScopeMessageForSetting(settingKey, selectedScope, settings) {
+    const otherScopes = Object.values(SettingScope)
+        .filter(isLoadableSettingScope)
+        .filter((scope) => scope !== selectedScope);
+    const modifiedInOtherScopes = otherScopes.filter((scope) => {
+        const scopeSettings = settings.forScope(scope).settings;
+        return isInSettingsScope(settingKey, scopeSettings);
+    });
+    if (modifiedInOtherScopes.length === 0) {
+        return '';
+    }
+    const modifiedScopesStr = modifiedInOtherScopes.join(', ');
+    const currentScopeSettings = settings.forScope(selectedScope).settings;
+    const existsInCurrentScope = isInSettingsScope(settingKey, currentScopeSettings);
+    return existsInCurrentScope
+        ? `(Also modified in ${modifiedScopesStr})`
+        : `(Modified in ${modifiedScopesStr})`;
+}
+//# sourceMappingURL=dialogScopeUtils.js.map

package/packages/cli/dist/src/utils/dialogScopeUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dialogScopeUtils.js","sourceRoot":"","sources":["../../../src/utils/dialogScopeUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,sBAAsB,EACtB,YAAY,GAGb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,eAAe;IACpC,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,oBAAoB;IAC9C,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,iBAAiB;CAChC,CAAC;AAEX;;GAEG;AACH,MAAM,UAAU,aAAa;IAI3B,OAAO;QACL,EAAE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE;QACpE;YACE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC;YAC3C,KAAK,EAAE,YAAY,CAAC,SAAS;SAC9B;QACD,EAAE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE;KACzE,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CACvC,UAAkB,EAClB,aAAmC,EACnC,QAEC;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;SAC5C,MAAM,CAAC,sBAAsB,CAAC;SAC9B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,aAAa,CAAC,CAAC;IAE9C,MAAM,qBAAqB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACzD,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;QACxD,OAAO,iBAAiB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3D,MAAM,oBAAoB,GAAG,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC;IACvE,MAAM,oBAAoB,GAAG,iBAAiB,CAC5C,UAAU,EACV,oBAAoB,CACrB,CAAC;IAEF,OAAO,oBAAoB;QACzB,CAAC,CAAC,qBAAqB,iBAAiB,GAAG;QAC3C,CAAC,CAAC,gBAAgB,iBAAiB,GAAG,CAAC;AAC3C,CAAC"}

package/packages/cli/dist/src/utils/dialogScopeUtils.test.d.ts

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

package/packages/cli/dist/src/utils/dialogScopeUtils.test.js

@@ -0,0 +1,81 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { SettingScope } from '../config/settings.js';
+import { getScopeItems, getScopeMessageForSetting, } from './dialogScopeUtils.js';
+import { isInSettingsScope } from './settingsUtils.js';
+vi.mock('../config/settings', () => ({
+    SettingScope: {
+        User: 'user',
+        Workspace: 'workspace',
+        System: 'system',
+    },
+    isLoadableSettingScope: (scope) => ['user', 'workspace', 'system'].includes(scope),
+}));
+vi.mock('./settingsUtils', () => ({
+    isInSettingsScope: vi.fn(),
+}));
+describe('dialogScopeUtils', () => {
+    beforeEach(() => {
+        vi.resetAllMocks();
+    });
+    describe('getScopeItems', () => {
+        it('should return scope items with correct labels and values', () => {
+            const items = getScopeItems();
+            expect(items).toEqual([
+                { label: 'User Settings', value: SettingScope.User },
+                { label: 'Workspace Settings', value: SettingScope.Workspace },
+                { label: 'System Settings', value: SettingScope.System },
+            ]);
+        });
+    });
+    describe('getScopeMessageForSetting', () => {
+        let mockSettings;
+        beforeEach(() => {
+            mockSettings = {
+                forScope: vi.fn().mockReturnValue({ settings: {} }),
+            };
+        });
+        it('should return empty string if not modified in other scopes', () => {
+            vi.mocked(isInSettingsScope).mockReturnValue(false);
+            const message = getScopeMessageForSetting('key', SettingScope.User, mockSettings);
+            expect(message).toBe('');
+        });
+        it('should return message indicating modification in other scopes', () => {
+            vi.mocked(isInSettingsScope).mockReturnValue(true);
+            const message = getScopeMessageForSetting('key', SettingScope.User, mockSettings);
+            expect(message).toMatch(/Also modified in/);
+            expect(message).toMatch(/workspace/);
+            expect(message).toMatch(/system/);
+        });
+        it('should return message indicating modification in other scopes but not current', () => {
+            const workspaceSettings = { scope: 'workspace' };
+            const systemSettings = { scope: 'system' };
+            const userSettings = { scope: 'user' };
+            mockSettings.forScope.mockImplementation((scope) => {
+                if (scope === SettingScope.Workspace)
+                    return { settings: workspaceSettings };
+                if (scope === SettingScope.System)
+                    return { settings: systemSettings };
+                if (scope === SettingScope.User)
+                    return { settings: userSettings };
+                return { settings: {} };
+            });
+            vi.mocked(isInSettingsScope).mockImplementation((_key, settings) => {
+                if (settings === workspaceSettings)
+                    return true;
+                if (settings === systemSettings)
+                    return false;
+                if (settings === userSettings)
+                    return false;
+                return false;
+            });
+            const message = getScopeMessageForSetting('key', SettingScope.User, mockSettings);
+            expect(message).toBe('(Modified in workspace)');
+        });
+    });
+});
+//# sourceMappingURL=dialogScopeUtils.test.js.map

package/packages/cli/dist/src/utils/dialogScopeUtils.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dialogScopeUtils.test.js","sourceRoot":"","sources":["../../../src/utils/dialogScopeUtils.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAuB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EACL,aAAa,EACb,yBAAyB,GAC1B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC;IACnC,YAAY,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,SAAS,EAAE,WAAW;QACtB,MAAM,EAAE,QAAQ;KACjB;IACD,sBAAsB,EAAE,CAAC,KAAa,EAAE,EAAE,CACxC,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;CAClD,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC;IAChC,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE;CAC3B,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YAClE,MAAM,KAAK,GAAG,aAAa,EAAE,CAAC;YAC9B,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;gBACpB,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE;gBACpD,EAAE,KAAK,EAAE,oBAAoB,EAAE,KAAK,EAAE,YAAY,CAAC,SAAS,EAAE;gBAC9D,EAAE,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE;aACzD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,IAAI,YAAoD,CAAC;QAEzD,UAAU,CAAC,GAAG,EAAE;YACd,YAAY,GAAG;gBACb,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;aACpD,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;YACpE,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACpD,MAAM,OAAO,GAAG,yBAAyB,CACvC,KAAK,EACL,YAAY,CAAC,IAAI,EACjB,YAAyC,CAC1C,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;YACvE,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAEnD,MAAM,OAAO,GAAG,yBAAyB,CACvC,KAAK,EACL,YAAY,CAAC,IAAI,EACjB,YAAyC,CAC1C,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;YAC5C,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YACrC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;YACvF,MAAM,iBAAiB,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;YACjD,MAAM,cAAc,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;YAC3C,MAAM,YAAY,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;YAEvC,YAAY,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,KAAa,EAAE,EAAE;gBACzD,IAAI,KAAK,KAAK,YAAY,CAAC,SAAS;oBAClC,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC;gBACzC,IAAI,KAAK,KAAK,YAAY,CAAC,MAAM;oBAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;gBACvE,IAAI,KAAK,KAAK,YAAY,CAAC,IAAI;oBAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;gBACnE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;YAC1B,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,kBAAkB,CAC7C,CAAC,IAAI,EAAE,QAAiB,EAAE,EAAE;gBAC1B,IAAI,QAAQ,KAAK,iBAAiB;oBAAE,OAAO,IAAI,CAAC;gBAChD,IAAI,QAAQ,KAAK,cAAc;oBAAE,OAAO,KAAK,CAAC;gBAC9C,IAAI,QAAQ,KAAK,YAAY;oBAAE,OAAO,KAAK,CAAC;gBAC5C,OAAO,KAAK,CAAC;YACf,CAAC,CACF,CAAC;YAEF,MAAM,OAAO,GAAG,yBAAyB,CACvC,KAAK,EACL,YAAY,CAAC,IAAI,EACjB,YAAyC,CAC1C,CAAC;YACF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Resolves environment variables in a string.
+ * Replaces $VAR_NAME, ${VAR_NAME}, and ${VAR_NAME:-DEFAULT_VALUE} with their corresponding
+ * environment variable values. If the environment variable is not defined and no default
+ * value is provided, the original placeholder is preserved.
+ *
+ * @param value - The string that may contain environment variable placeholders
+ * @param customEnv - Optional record of environment variables to use before process.env
+ * @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("URL: ${MISSING_VAR:-https://default.com}") // Returns "URL: https://default.com"
+ * resolveEnvVarsInString("Missing: $UNDEFINED_VAR") // Returns "Missing: $UNDEFINED_VAR"
+ */
+export declare function resolveEnvVarsInString(value: string, customEnv?: Record<string, 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, customEnv?: Record<string, string>): T;

package/packages/cli/dist/src/utils/envVarResolver.js

@@ -0,0 +1,121 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Resolves environment variables in a string.
+ * Replaces $VAR_NAME, ${VAR_NAME}, and ${VAR_NAME:-DEFAULT_VALUE} with their corresponding
+ * environment variable values. If the environment variable is not defined and no default
+ * value is provided, the original placeholder is preserved.
+ *
+ * @param value - The string that may contain environment variable placeholders
+ * @param customEnv - Optional record of environment variables to use before process.env
+ * @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("URL: ${MISSING_VAR:-https://default.com}") // Returns "URL: https://default.com"
+ * resolveEnvVarsInString("Missing: $UNDEFINED_VAR") // Returns "Missing: $UNDEFINED_VAR"
+ */
+export function resolveEnvVarsInString(value, customEnv) {
+    // Regex matches $VAR_NAME, ${VAR_NAME}, and ${VAR_NAME:-DEFAULT_VALUE}
+    const envVarRegex = /\$(?:(\w+)|{([^}]+?)(?::-([^}]*))?})/g;
+    return value.replace(envVarRegex, (match, varName1, varName2, defaultValue) => {
+        const varName = varName1 || varName2 || '';
+        if (!varName) {
+            return match;
+        }
+        if (customEnv && typeof customEnv[varName] === 'string') {
+            return customEnv[varName];
+        }
+        if (process && process.env) {
+            const val = process.env[varName];
+            if (typeof val === 'string') {
+                return val;
+            }
+        }
+        if (defaultValue !== undefined) {
+            return defaultValue;
+        }
+        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, customEnv) {
+    return resolveEnvVarsInObjectInternal(obj, new WeakSet(), customEnv);
+}
+/**
+ * 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, customEnv) {
+    if (obj === null ||
+        obj === undefined ||
+        typeof obj === 'boolean' ||
+        typeof obj === 'number') {
+        return obj;
+    }
+    if (typeof obj === 'string') {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        return resolveEnvVarsInString(obj, customEnv);
+    }
+    if (Array.isArray(obj)) {
+        // Check for circular reference
+        if (visited.has(obj)) {
+            // Return a shallow copy to break the cycle
+            const copy = [...obj];
+            const isTArray = (val) => Array.isArray(val);
+            if (isTArray(copy))
+                return copy;
+            throw new Error('Unreachable');
+        }
+        visited.add(obj);
+        const mapped = obj.map((item) => resolveEnvVarsInObjectInternal(item, visited, customEnv));
+        visited.delete(obj);
+        const isTArray = (val) => Array.isArray(val);
+        if (isTArray(mapped))
+            return mapped;
+        throw new Error('Unreachable');
+    }
+    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, customEnv);
+            }
+        }
+        visited.delete(obj);
+        return newObj;
+    }
+    return obj;
+}
+//# sourceMappingURL=envVarResolver.js.map

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

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

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

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

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

@@ -0,0 +1,238 @@
+/**
+ * @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', () => {
+    beforeEach(() => {
+        vi.stubEnv('TEST_VAR', '');
+    });
+    afterEach(() => {
+        vi.unstubAllEnvs();
+    });
+    it('should resolve $VAR_NAME format', () => {
+        vi.stubEnv('TEST_VAR', 'test-value');
+        const result = resolveEnvVarsInString('Value is $TEST_VAR');
+        expect(result).toBe('Value is test-value');
+    });
+    it('should resolve ${VAR_NAME} format', () => {
+        vi.stubEnv('TEST_VAR', 'test-value');
+        const result = resolveEnvVarsInString('Value is ${TEST_VAR}');
+        expect(result).toBe('Value is test-value');
+    });
+    it('should resolve multiple variables', () => {
+        vi.stubEnv('HOST', 'localhost');
+        vi.stubEnv('PORT', '8080');
+        const result = resolveEnvVarsInString('URL: http://$HOST:${PORT}/api');
+        expect(result).toBe('URL: http://localhost:8080/api');
+    });
+    it('should support environment variables with dots', () => {
+        vi.stubEnv('FOO.BAR', 'baz');
+        const result = resolveEnvVarsInString('Value: ${FOO.BAR}');
+        expect(result).toBe('Value: baz');
+    });
+    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', () => {
+        vi.stubEnv('DEFINED', 'value');
+        const result = resolveEnvVarsInString('$DEFINED and $UNDEFINED mixed');
+        expect(result).toBe('value and $UNDEFINED mixed');
+    });
+    it('should use default value when environment variable is missing', () => {
+        const result = resolveEnvVarsInString('URL: ${MISSING_VAR:-https://default.example.com}/api');
+        expect(result).toBe('URL: https://default.example.com/api');
+    });
+    it('should ignore default value when environment variable is present', () => {
+        vi.stubEnv('PRESENT_VAR', 'https://actual.example.com');
+        const result = resolveEnvVarsInString('URL: ${PRESENT_VAR:-https://default.example.com}/api');
+        expect(result).toBe('URL: https://actual.example.com/api');
+    });
+    it('should support empty default value', () => {
+        const result = resolveEnvVarsInString('Value: ${MISSING_VAR:-}');
+        expect(result).toBe('Value: ');
+    });
+    it('should correctly handle default values that contain colons or dashes', () => {
+        const result = resolveEnvVarsInString('Value: ${MISSING_VAR:-val:-123-abc}');
+        expect(result).toBe('Value: val:-123-abc');
+    });
+});
+describe('resolveEnvVarsInObject', () => {
+    afterEach(() => {
+        vi.unstubAllEnvs();
+    });
+    it('should resolve variables in nested objects', () => {
+        vi.stubEnv('API_KEY', 'secret-123');
+        vi.stubEnv('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', () => {
+        vi.stubEnv('ENV', 'production');
+        vi.stubEnv('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', () => {
+        vi.stubEnv('API_TOKEN', 'token-123');
+        vi.stubEnv('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', () => {
+        vi.stubEnv('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', () => {
+        vi.stubEnv('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', () => {
+        vi.stubEnv('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/packages/cli/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/packages/cli/dist/src/utils/errors.d.ts

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Config } from '@quantum-ai/gemini-cli-core';
+/**
+ * Handles errors consistently for both JSON and text output formats.
+ * In JSON mode, outputs formatted JSON error and exits.
+ * In streaming JSON mode, emits a result event with error status.
+ * 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.
+ *
+ * Fatal errors (e.g., NO_SPACE_LEFT) cause the CLI to exit immediately,
+ * as they indicate unrecoverable system state.
+ *
+ * Non-fatal errors (e.g., INVALID_TOOL_PARAMS, FILE_NOT_FOUND, PATH_NOT_IN_WORKSPACE)
+ * are logged to stderr and the error response is sent back to the model,
+ * allowing it to self-correct.
+ */
+export declare function handleToolError(toolName: string, toolError: Error, config: Config, errorType?: string, 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;