@google/gemini-cli 0.21.2 → 0.22.0-preview.0

package/dist/src/config/settings-validation.js

@@ -0,0 +1,249 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { z } from 'zod';
+import { getSettingsSchema, SETTINGS_SCHEMA_DEFINITIONS, } from './settingsSchema.js';
+// Helper to build Zod schema from the JSON-schema-like definitions
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function buildZodSchemaFromJsonSchema(def) {
+    if (def.anyOf) {
+        return z.union(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        def.anyOf.map((d) => buildZodSchemaFromJsonSchema(d)));
+    }
+    if (def.type === 'string') {
+        if (def.enum)
+            return z.enum(def.enum);
+        return z.string();
+    }
+    if (def.type === 'number')
+        return z.number();
+    if (def.type === 'boolean')
+        return z.boolean();
+    if (def.type === 'array') {
+        if (def.items) {
+            return z.array(buildZodSchemaFromJsonSchema(def.items));
+        }
+        return z.array(z.unknown());
+    }
+    if (def.type === 'object') {
+        let schema;
+        if (def.properties) {
+            const shape = {};
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            for (const [key, propDef] of Object.entries(def.properties)) {
+                let propSchema = buildZodSchemaFromJsonSchema(propDef);
+                if (def.required &&
+                    Array.isArray(def.required) &&
+                    def.required.includes(key)) {
+                    // keep it required
+                }
+                else {
+                    propSchema = propSchema.optional();
+                }
+                shape[key] = propSchema;
+            }
+            schema = z.object(shape).passthrough();
+        }
+        else {
+            schema = z.object({}).passthrough();
+        }
+        if (def.additionalProperties === false) {
+            schema = schema.strict();
+        }
+        else if (typeof def.additionalProperties === 'object') {
+            schema = schema.catchall(buildZodSchemaFromJsonSchema(def.additionalProperties));
+        }
+        return schema;
+    }
+    return z.unknown();
+}
+/**
+ * Builds a Zod enum schema from options array
+ */
+function buildEnumSchema(options) {
+    if (!options || options.length === 0) {
+        throw new Error(`Enum type must have options defined. Check your settings schema definition.`);
+    }
+    const values = options.map((opt) => opt.value);
+    if (values.every((v) => typeof v === 'string')) {
+        return z.enum(values);
+    }
+    else if (values.every((v) => typeof v === 'number')) {
+        return z.union(values.map((v) => z.literal(v)));
+    }
+    else {
+        return z.union(values.map((v) => z.literal(v)));
+    }
+}
+/**
+ * Builds a Zod object shape from properties record
+ */
+function buildObjectShapeFromProperties(properties) {
+    const shape = {};
+    for (const [key, childDef] of Object.entries(properties)) {
+        shape[key] = buildZodSchemaFromDefinition(childDef);
+    }
+    return shape;
+}
+/**
+ * Builds a Zod schema for primitive types (string, number, boolean)
+ */
+function buildPrimitiveSchema(type) {
+    switch (type) {
+        case 'string':
+            return z.string();
+        case 'number':
+            return z.number();
+        case 'boolean':
+            return z.boolean();
+        default:
+            return z.unknown();
+    }
+}
+const REF_SCHEMAS = {};
+// Initialize REF_SCHEMAS
+for (const [name, def] of Object.entries(SETTINGS_SCHEMA_DEFINITIONS)) {
+    REF_SCHEMAS[name] = buildZodSchemaFromJsonSchema(def);
+}
+/**
+ * Recursively builds a Zod schema from a SettingDefinition
+ */
+function buildZodSchemaFromDefinition(definition) {
+    let baseSchema;
+    // Special handling for TelemetrySettings which can be boolean or object
+    if (definition.ref === 'TelemetrySettings') {
+        const objectSchema = REF_SCHEMAS['TelemetrySettings'];
+        if (objectSchema) {
+            return z.union([z.boolean(), objectSchema]).optional();
+        }
+    }
+    // Handle refs using registry
+    if (definition.ref && definition.ref in REF_SCHEMAS) {
+        return REF_SCHEMAS[definition.ref].optional();
+    }
+    switch (definition.type) {
+        case 'string':
+        case 'number':
+        case 'boolean':
+            baseSchema = buildPrimitiveSchema(definition.type);
+            break;
+        case 'enum': {
+            baseSchema = buildEnumSchema(definition.options);
+            break;
+        }
+        case 'array':
+            if (definition.items) {
+                const itemSchema = buildZodSchemaFromCollection(definition.items);
+                baseSchema = z.array(itemSchema);
+            }
+            else {
+                baseSchema = z.array(z.unknown());
+            }
+            break;
+        case 'object':
+            if (definition.properties) {
+                const shape = buildObjectShapeFromProperties(definition.properties);
+                baseSchema = z.object(shape).passthrough();
+                if (definition.additionalProperties) {
+                    const additionalSchema = buildZodSchemaFromCollection(definition.additionalProperties);
+                    baseSchema = z.object(shape).catchall(additionalSchema);
+                }
+            }
+            else if (definition.additionalProperties) {
+                const valueSchema = buildZodSchemaFromCollection(definition.additionalProperties);
+                baseSchema = z.record(z.string(), valueSchema);
+            }
+            else {
+                baseSchema = z.record(z.string(), z.unknown());
+            }
+            break;
+        default:
+            baseSchema = z.unknown();
+    }
+    // Make all fields optional since settings are partial
+    return baseSchema.optional();
+}
+/**
+ * Builds a Zod schema from a SettingCollectionDefinition
+ */
+function buildZodSchemaFromCollection(collection) {
+    if (collection.ref && collection.ref in REF_SCHEMAS) {
+        return REF_SCHEMAS[collection.ref];
+    }
+    switch (collection.type) {
+        case 'string':
+        case 'number':
+        case 'boolean':
+            return buildPrimitiveSchema(collection.type);
+        case 'enum': {
+            return buildEnumSchema(collection.options);
+        }
+        case 'array':
+            if (collection.properties) {
+                const shape = buildObjectShapeFromProperties(collection.properties);
+                return z.array(z.object(shape));
+            }
+            return z.array(z.unknown());
+        case 'object':
+            if (collection.properties) {
+                const shape = buildObjectShapeFromProperties(collection.properties);
+                return z.object(shape).passthrough();
+            }
+            return z.record(z.string(), z.unknown());
+        default:
+            return z.unknown();
+    }
+}
+/**
+ * Builds the complete Zod schema for Settings from SETTINGS_SCHEMA
+ */
+function buildSettingsZodSchema() {
+    const schema = getSettingsSchema();
+    const shape = {};
+    for (const [key, definition] of Object.entries(schema)) {
+        shape[key] = buildZodSchemaFromDefinition(definition);
+    }
+    return z.object(shape).passthrough();
+}
+export const settingsZodSchema = buildSettingsZodSchema();
+/**
+ * Validates settings data against the Zod schema
+ */
+export function validateSettings(data) {
+    const result = settingsZodSchema.safeParse(data);
+    return result;
+}
+/**
+ * Format a Zod error into a helpful error message
+ */
+export function formatValidationError(error, filePath) {
+    const lines = [];
+    lines.push(`Invalid configuration in ${filePath}:`);
+    lines.push('');
+    const MAX_ERRORS_TO_DISPLAY = 5;
+    const displayedIssues = error.issues.slice(0, MAX_ERRORS_TO_DISPLAY);
+    for (const issue of displayedIssues) {
+        const path = issue.path.reduce((acc, curr) => typeof curr === 'number'
+            ? `${acc}[${curr}]`
+            : `${acc ? acc + '.' : ''}${curr}`, '');
+        lines.push(`Error in: ${path || '(root)'}`);
+        lines.push(`    ${issue.message}`);
+        if (issue.code === 'invalid_type') {
+            const expected = issue.expected;
+            const received = issue.received;
+            lines.push(`Expected: ${expected}, but received: ${received}`);
+        }
+        lines.push('');
+    }
+    if (error.issues.length > MAX_ERRORS_TO_DISPLAY) {
+        lines.push(`...and ${error.issues.length - MAX_ERRORS_TO_DISPLAY} more errors.`);
+        lines.push('');
+    }
+    lines.push('Please fix the configuration and try again.');
+    lines.push('See: https://github.com/google-gemini/gemini-cli/blob/main/docs/get-started/configuration.md');
+    return lines.join('\n');
+}
+//# sourceMappingURL=settings-validation.js.map

package/dist/src/config/settings-validation.js.map

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

package/dist/src/config/settings-validation.test.js

@@ -0,0 +1,322 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/// <reference types="vitest/globals" />
+import { describe, it, expect } from 'vitest';
+import { validateSettings, formatValidationError, settingsZodSchema, } from './settings-validation.js';
+import { z } from 'zod';
+describe('settings-validation', () => {
+    describe('validateSettings', () => {
+        it('should accept valid settings with correct model.name as string', () => {
+            const validSettings = {
+                model: {
+                    name: 'gemini-2.0-flash-exp',
+                    maxSessionTurns: 10,
+                },
+                ui: {
+                    theme: 'dark',
+                },
+            };
+            const result = validateSettings(validSettings);
+            expect(result.success).toBe(true);
+        });
+        it('should reject model.name as object instead of string', () => {
+            const invalidSettings = {
+                model: {
+                    name: {
+                        skipNextSpeakerCheck: true,
+                    },
+                },
+            };
+            const result = validateSettings(invalidSettings);
+            expect(result.success).toBe(false);
+            expect(result.error).toBeDefined();
+            if (result.error) {
+                const issues = result.error.issues;
+                expect(issues.length).toBeGreaterThan(0);
+                expect(issues[0]?.path).toEqual(['model', 'name']);
+                expect(issues[0]?.code).toBe('invalid_type');
+            }
+        });
+        it('should accept valid model.summarizeToolOutput structure', () => {
+            const validSettings = {
+                model: {
+                    summarizeToolOutput: {
+                        run_shell_command: {
+                            tokenBudget: 500,
+                        },
+                    },
+                },
+            };
+            const result = validateSettings(validSettings);
+            expect(result.success).toBe(true);
+        });
+        it('should reject invalid model.summarizeToolOutput structure', () => {
+            const invalidSettings = {
+                model: {
+                    summarizeToolOutput: {
+                        run_shell_command: {
+                            tokenBudget: 500,
+                        },
+                    },
+                },
+            };
+            // First test with valid structure
+            let result = validateSettings(invalidSettings);
+            expect(result.success).toBe(true);
+            // Now test with wrong type (string instead of object)
+            const actuallyInvalidSettings = {
+                model: {
+                    summarizeToolOutput: 'invalid',
+                },
+            };
+            result = validateSettings(actuallyInvalidSettings);
+            expect(result.success).toBe(false);
+            if (result.error) {
+                expect(result.error.issues.length).toBeGreaterThan(0);
+            }
+        });
+        it('should accept empty settings object', () => {
+            const emptySettings = {};
+            const result = validateSettings(emptySettings);
+            expect(result.success).toBe(true);
+        });
+        it('should accept unknown top-level keys (for migration compatibility)', () => {
+            const settingsWithUnknownKey = {
+                unknownKey: 'some value',
+            };
+            const result = validateSettings(settingsWithUnknownKey);
+            expect(result.success).toBe(true);
+            // Unknown keys are allowed via .passthrough() for migration scenarios
+        });
+        it('should accept nested valid settings', () => {
+            const validSettings = {
+                ui: {
+                    theme: 'dark',
+                    hideWindowTitle: true,
+                    footer: {
+                        hideCWD: false,
+                        hideModelInfo: true,
+                    },
+                },
+                tools: {
+                    sandbox: 'inherit',
+                    autoAccept: false,
+                },
+            };
+            const result = validateSettings(validSettings);
+            expect(result.success).toBe(true);
+        });
+        it('should validate array types correctly', () => {
+            const validSettings = {
+                tools: {
+                    allowed: ['git', 'npm'],
+                    exclude: ['dangerous-tool'],
+                },
+                context: {
+                    includeDirectories: ['/path/1', '/path/2'],
+                },
+            };
+            const result = validateSettings(validSettings);
+            expect(result.success).toBe(true);
+        });
+        it('should reject invalid types in arrays', () => {
+            const invalidSettings = {
+                tools: {
+                    allowed: ['git', 123],
+                },
+            };
+            const result = validateSettings(invalidSettings);
+            expect(result.success).toBe(false);
+        });
+        it('should validate boolean fields correctly', () => {
+            const validSettings = {
+                general: {
+                    vimMode: true,
+                    disableAutoUpdate: false,
+                },
+            };
+            const result = validateSettings(validSettings);
+            expect(result.success).toBe(true);
+        });
+        it('should reject non-boolean values for boolean fields', () => {
+            const invalidSettings = {
+                general: {
+                    vimMode: 'yes',
+                },
+            };
+            const result = validateSettings(invalidSettings);
+            expect(result.success).toBe(false);
+        });
+        it('should validate number fields correctly', () => {
+            const validSettings = {
+                model: {
+                    maxSessionTurns: 50,
+                    compressionThreshold: 0.2,
+                },
+            };
+            const result = validateSettings(validSettings);
+            expect(result.success).toBe(true);
+        });
+        it('should validate complex nested mcpServers configuration', () => {
+            const invalidSettings = {
+                mcpServers: {
+                    'my-server': {
+                        command: 123, // Should be string
+                        args: ['arg1'],
+                        env: {
+                            VAR: 'value',
+                        },
+                    },
+                },
+            };
+            const result = validateSettings(invalidSettings);
+            expect(result.success).toBe(false);
+            if (result.error) {
+                expect(result.error.issues.length).toBeGreaterThan(0);
+                // Path should be mcpServers.my-server.command
+                const issue = result.error.issues.find((i) => i.path.includes('command'));
+                expect(issue).toBeDefined();
+                expect(issue?.code).toBe('invalid_type');
+            }
+        });
+        it('should validate complex nested customThemes configuration', () => {
+            const invalidSettings = {
+                ui: {
+                    customThemes: {
+                        'my-theme': {
+                            type: 'custom',
+                            // Missing 'name' property which is required
+                            text: {
+                                primary: '#ffffff',
+                            },
+                        },
+                    },
+                },
+            };
+            const result = validateSettings(invalidSettings);
+            expect(result.success).toBe(false);
+            if (result.error) {
+                expect(result.error.issues.length).toBeGreaterThan(0);
+                // Should complain about missing 'name'
+                const issue = result.error.issues.find((i) => i.code === 'invalid_type' && i.message.includes('Required'));
+                expect(issue).toBeDefined();
+            }
+        });
+    });
+    describe('formatValidationError', () => {
+        it('should format error with file path and helpful message for model.name', () => {
+            const invalidSettings = {
+                model: {
+                    name: {
+                        skipNextSpeakerCheck: true,
+                    },
+                },
+            };
+            const result = validateSettings(invalidSettings);
+            expect(result.success).toBe(false);
+            if (result.error) {
+                const formatted = formatValidationError(result.error, '/path/to/settings.json');
+                expect(formatted).toContain('/path/to/settings.json');
+                expect(formatted).toContain('model.name');
+                expect(formatted).toContain('Expected: string, but received: object');
+                expect(formatted).toContain('Please fix the configuration and try again.');
+                expect(formatted).toContain('https://github.com/google-gemini/gemini-cli');
+            }
+        });
+        it('should format error for model.summarizeToolOutput', () => {
+            const invalidSettings = {
+                model: {
+                    summarizeToolOutput: 'wrong type',
+                },
+            };
+            const result = validateSettings(invalidSettings);
+            expect(result.success).toBe(false);
+            if (result.error) {
+                const formatted = formatValidationError(result.error, '~/.gemini/settings.json');
+                expect(formatted).toContain('~/.gemini/settings.json');
+                expect(formatted).toContain('model.summarizeToolOutput');
+            }
+        });
+        it('should include link to documentation', () => {
+            const invalidSettings = {
+                model: {
+                    name: { invalid: 'object' }, // model.name should be a string
+                },
+            };
+            const result = validateSettings(invalidSettings);
+            expect(result.success).toBe(false);
+            if (result.error) {
+                const formatted = formatValidationError(result.error, 'test.json');
+                expect(formatted).toContain('https://github.com/google-gemini/gemini-cli');
+                expect(formatted).toContain('configuration.md');
+            }
+        });
+        it('should list all validation errors', () => {
+            const invalidSettings = {
+                model: {
+                    name: { invalid: 'object' },
+                    maxSessionTurns: 'not a number',
+                },
+            };
+            const result = validateSettings(invalidSettings);
+            expect(result.success).toBe(false);
+            if (result.error) {
+                const formatted = formatValidationError(result.error, 'test.json');
+                // Should have multiple errors listed
+                expect(formatted.match(/Error in:/g)?.length).toBeGreaterThan(1);
+            }
+        });
+        it('should format array paths correctly (e.g. tools.allowed[0])', () => {
+            const invalidSettings = {
+                tools: {
+                    allowed: ['git', 123], // 123 is invalid, expected string
+                },
+            };
+            const result = validateSettings(invalidSettings);
+            expect(result.success).toBe(false);
+            if (result.error) {
+                const formatted = formatValidationError(result.error, 'test.json');
+                expect(formatted).toContain('tools.allowed[1]');
+            }
+        });
+        it('should limit the number of displayed errors', () => {
+            const invalidSettings = {
+                tools: {
+                    // Create 6 invalid items to trigger the limit
+                    allowed: [1, 2, 3, 4, 5, 6],
+                },
+            };
+            const result = validateSettings(invalidSettings);
+            expect(result.success).toBe(false);
+            if (result.error) {
+                const formatted = formatValidationError(result.error, 'test.json');
+                // Should see the first 5
+                expect(formatted).toContain('tools.allowed[0]');
+                expect(formatted).toContain('tools.allowed[4]');
+                // Should NOT see the 6th
+                expect(formatted).not.toContain('tools.allowed[5]');
+                // Should see the summary
+                expect(formatted).toContain('...and 1 more errors.');
+            }
+        });
+    });
+    describe('settingsZodSchema', () => {
+        it('should be a valid Zod object schema', () => {
+            expect(settingsZodSchema).toBeInstanceOf(z.ZodObject);
+        });
+        it('should have optional fields', () => {
+            // All top-level fields should be optional
+            const shape = settingsZodSchema.shape;
+            expect(shape['model']).toBeDefined();
+            expect(shape['ui']).toBeDefined();
+            expect(shape['tools']).toBeDefined();
+            // Test that empty object is valid (all fields optional)
+            const result = settingsZodSchema.safeParse({});
+            expect(result.success).toBe(true);
+        });
+    });
+});
+//# sourceMappingURL=settings-validation.test.js.map

package/dist/src/config/settings-validation.test.js.map

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

package/dist/src/config/settings.js

@@ -17,6 +17,7 @@ import { getSettingsSchema, } from './settingsSchema.js';
 import { resolveEnvVarsInObject } from '../utils/envVarResolver.js';
 import { customDeepMerge } from '../utils/deepMerge.js';
 import { updateSettingsFilePreservingFormat } from '../utils/commentJson.js';
+import { validateSettings, formatValidationError, } from './settings-validation.js';
 import { SettingPaths } from './settingPaths.js';
 function getMergeStrategyForPath(path) {
     let current = undefined;
@@ -184,7 +185,7 @@ export function needsMigration(settings) {
         if (v1Key === v2Path || !(v1Key in settings)) {
             return false;
         }
-        // If a key exists that is both a V1 key and a V2 container (like 'model'),
+        // If a key exists that is a V1 key and a V2 container (like 'model'),
         // we need to check the type. If it's an object, it's a V2 container and not
         // a V1 key that needs migration.
         if (KNOWN_V2_CONTAINERS.has(v1Key) &&
@@ -204,6 +205,16 @@ function migrateSettingsToV2(flatSettings) {
     const flatKeys = new Set(Object.keys(flatSettings));
     for (const [oldKey, newPath] of Object.entries(MIGRATION_MAP)) {
         if (flatKeys.has(oldKey)) {
+            // If the key exists and is a V2 container (like 'model'), and the value is an object,
+            // it is likely already migrated or partially migrated. We should not move it
+            // to the mapped V2 path (e.g. 'model' -> 'model.name').
+            // Instead, let it fall through to the "Carry over" section to be merged.
+            if (KNOWN_V2_CONTAINERS.has(oldKey) &&
+                typeof flatSettings[oldKey] === 'object' &&
+                flatSettings[oldKey] !== null &&
+                !Array.isArray(flatSettings[oldKey])) {
+                continue;
+            }
             setNestedProperty(v2Settings, newPath, flatSettings[oldKey]);
             flatKeys.delete(oldKey);
         }
@@ -224,7 +235,7 @@ function migrateSettingsToV2(flatSettings) {
             newValue !== null &&
             !Array.isArray(newValue)) {
             const pathAwareGetStrategy = (path) => getMergeStrategyForPath([remainingKey, ...path]);
-            v2Settings[remainingKey] = customDeepMerge(pathAwareGetStrategy, {}, newValue, existingValue);
+            v2Settings[remainingKey] = customDeepMerge(pathAwareGetStrategy, {}, existingValue, newValue);
         }
         else {
             v2Settings[remainingKey] = newValue;
@@ -481,10 +492,20 @@ export function loadSettings(workspaceDir = process.cwd()) {
                         settingsObject = migratedSettings;
                     }
                 }
+                // Validate settings structure with Zod after migration
+                const validationResult = validateSettings(settingsObject);
+                if (!validationResult.success && validationResult.error) {
+                    const errorMessage = formatValidationError(validationResult.error, filePath);
+                    throw new FatalConfigError(errorMessage);
+                }
                 return { settings: settingsObject, rawJson: content };
             }
         }
         catch (error) {
+            // Preserve FatalConfigError with formatted validation messages
+            if (error instanceof FatalConfigError) {
+                throw error;
+            }
             settingsErrors.push({
                 message: getErrorMessage(error),
                 path: filePath,