@google/gemini-cli 0.24.0-nightly.20251231.05049b5ab → 0.24.0-preview.0

package/dist/src/commands/skills/enable.test.js

@@ -0,0 +1,80 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { format } from 'node:util';
+import { handleEnable, enableCommand } from './enable.js';
+import { loadSettings, SettingScope, } from '../../config/settings.js';
+const emitConsoleLog = vi.hoisted(() => vi.fn());
+const debugLogger = vi.hoisted(() => ({
+    log: vi.fn((message, ...args) => {
+        emitConsoleLog('log', format(message, ...args));
+    }),
+}));
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        debugLogger,
+    };
+});
+vi.mock('../../config/settings.js', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        loadSettings: vi.fn(),
+    };
+});
+vi.mock('../utils.js', () => ({
+    exitCli: vi.fn(),
+}));
+describe('skills enable command', () => {
+    const mockLoadSettings = vi.mocked(loadSettings);
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    describe('handleEnable', () => {
+        it('should enable a disabled skill in user scope', async () => {
+            const mockSettings = {
+                forScope: vi.fn().mockReturnValue({
+                    settings: { skills: { disabled: ['skill1'] } },
+                }),
+                setValue: vi.fn(),
+            };
+            mockLoadSettings.mockReturnValue(mockSettings);
+            await handleEnable({
+                name: 'skill1',
+                scope: SettingScope.User,
+            });
+            expect(mockSettings.setValue).toHaveBeenCalledWith(SettingScope.User, 'skills.disabled', []);
+            expect(emitConsoleLog).toHaveBeenCalledWith('log', 'Skill "skill1" successfully enabled in scope "User".');
+        });
+        it('should log a message if the skill is already enabled', async () => {
+            const mockSettings = {
+                forScope: vi.fn().mockReturnValue({
+                    settings: { skills: { disabled: [] } },
+                }),
+                setValue: vi.fn(),
+            };
+            mockLoadSettings.mockReturnValue(mockSettings);
+            await handleEnable({
+                name: 'skill1',
+                scope: SettingScope.User,
+            });
+            expect(mockSettings.setValue).not.toHaveBeenCalled();
+            expect(emitConsoleLog).toHaveBeenCalledWith('log', 'Skill "skill1" is already enabled in scope "User".');
+        });
+    });
+    describe('enableCommand', () => {
+        it('should have correct command and describe', () => {
+            expect(enableCommand.command).toBe('enable <name>');
+            expect(enableCommand.describe).toBe('Enables an agent skill.');
+        });
+    });
+});
+//# sourceMappingURL=enable.test.js.map

package/dist/src/commands/skills/enable.test.js.map

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

package/dist/src/commands/skills/list.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { CommandModule } from 'yargs';
+export declare function handleList(): Promise<void>;
+export declare const listCommand: CommandModule;

package/dist/src/commands/skills/list.js

@@ -0,0 +1,46 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { debugLogger } from '@google/gemini-cli-core';
+import { loadSettings } from '../../config/settings.js';
+import { loadCliConfig } from '../../config/config.js';
+import { exitCli } from '../utils.js';
+import chalk from 'chalk';
+export async function handleList() {
+    const workspaceDir = process.cwd();
+    const settings = loadSettings(workspaceDir);
+    const config = await loadCliConfig(settings.merged, 'skills-list-session', {
+        debug: false,
+    }, { cwd: workspaceDir });
+    // Initialize to trigger extension loading and skill discovery
+    await config.initialize();
+    const skillManager = config.getSkillManager();
+    const skills = skillManager.getAllSkills();
+    if (skills.length === 0) {
+        debugLogger.log('No skills discovered.');
+        return;
+    }
+    debugLogger.log(chalk.bold('Discovered Agent Skills:'));
+    debugLogger.log('');
+    for (const skill of skills) {
+        const status = skill.disabled
+            ? chalk.red('[Disabled]')
+            : chalk.green('[Enabled]');
+        debugLogger.log(`${chalk.bold(skill.name)} ${status}`);
+        debugLogger.log(`  Description: ${skill.description}`);
+        debugLogger.log(`  Location:    ${skill.location}`);
+        debugLogger.log('');
+    }
+}
+export const listCommand = {
+    command: 'list',
+    describe: 'Lists discovered agent skills.',
+    builder: (yargs) => yargs,
+    handler: async () => {
+        await handleList();
+        await exitCli();
+    },
+};
+//# sourceMappingURL=list.js.map

package/dist/src/commands/skills/list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/skills/list.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAgB,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,KAAK,UAAU,UAAU;IAC9B,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAE5C,MAAM,MAAM,GAAG,MAAM,aAAa,CAChC,QAAQ,CAAC,MAAM,EACf,qBAAqB,EACrB;QACE,KAAK,EAAE,KAAK;KACkB,EAChC,EAAE,GAAG,EAAE,YAAY,EAAE,CACtB,CAAC;IAEF,8DAA8D;IAC9D,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;IAE1B,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;IAC9C,MAAM,MAAM,GAAG,YAAY,CAAC,YAAY,EAAE,CAAC;IAE3C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,WAAW,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACzC,OAAO;IACT,CAAC;IAED,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC;IACxD,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEpB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ;YAC3B,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC;YACzB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAE7B,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC;QACvD,WAAW,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;QACvD,WAAW,CAAC,GAAG,CAAC,kBAAkB,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpD,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAkB;IACxC,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,gCAAgC;IAC1C,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;IACzB,OAAO,EAAE,KAAK,IAAI,EAAE;QAClB,MAAM,UAAU,EAAE,CAAC;QACnB,MAAM,OAAO,EAAE,CAAC;IAClB,CAAC;CACF,CAAC"}

package/dist/src/commands/skills/list.test.d.ts

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

package/dist/src/commands/skills/list.test.js

@@ -0,0 +1,102 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { format } from 'node:util';
+import { handleList, listCommand } from './list.js';
+import { loadSettings } from '../../config/settings.js';
+import { loadCliConfig } from '../../config/config.js';
+import chalk from 'chalk';
+const emitConsoleLog = vi.hoisted(() => vi.fn());
+const debugLogger = vi.hoisted(() => ({
+    log: vi.fn((message, ...args) => {
+        emitConsoleLog('log', format(message, ...args));
+    }),
+    error: vi.fn((message, ...args) => {
+        emitConsoleLog('error', format(message, ...args));
+    }),
+}));
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        coreEvents: {
+            emitConsoleLog,
+        },
+        debugLogger,
+    };
+});
+vi.mock('../../config/settings.js');
+vi.mock('../../config/config.js');
+vi.mock('../utils.js', () => ({
+    exitCli: vi.fn(),
+}));
+describe('skills list command', () => {
+    const mockLoadSettings = vi.mocked(loadSettings);
+    const mockLoadCliConfig = vi.mocked(loadCliConfig);
+    beforeEach(async () => {
+        vi.clearAllMocks();
+        mockLoadSettings.mockReturnValue({
+            merged: {},
+        });
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    describe('handleList', () => {
+        it('should log a message if no skills are discovered', async () => {
+            const mockConfig = {
+                initialize: vi.fn().mockResolvedValue(undefined),
+                getSkillManager: vi.fn().mockReturnValue({
+                    getAllSkills: vi.fn().mockReturnValue([]),
+                }),
+            };
+            mockLoadCliConfig.mockResolvedValue(mockConfig);
+            await handleList();
+            expect(emitConsoleLog).toHaveBeenCalledWith('log', 'No skills discovered.');
+        });
+        it('should list all discovered skills', async () => {
+            const skills = [
+                {
+                    name: 'skill1',
+                    description: 'desc1',
+                    disabled: false,
+                    location: '/path/to/skill1',
+                },
+                {
+                    name: 'skill2',
+                    description: 'desc2',
+                    disabled: true,
+                    location: '/path/to/skill2',
+                },
+            ];
+            const mockConfig = {
+                initialize: vi.fn().mockResolvedValue(undefined),
+                getSkillManager: vi.fn().mockReturnValue({
+                    getAllSkills: vi.fn().mockReturnValue(skills),
+                }),
+            };
+            mockLoadCliConfig.mockResolvedValue(mockConfig);
+            await handleList();
+            expect(emitConsoleLog).toHaveBeenCalledWith('log', chalk.bold('Discovered Agent Skills:'));
+            expect(emitConsoleLog).toHaveBeenCalledWith('log', expect.stringContaining('skill1'));
+            expect(emitConsoleLog).toHaveBeenCalledWith('log', expect.stringContaining(chalk.green('[Enabled]')));
+            expect(emitConsoleLog).toHaveBeenCalledWith('log', expect.stringContaining('skill2'));
+            expect(emitConsoleLog).toHaveBeenCalledWith('log', expect.stringContaining(chalk.red('[Disabled]')));
+        });
+        it('should throw an error when listing fails', async () => {
+            mockLoadCliConfig.mockRejectedValue(new Error('List failed'));
+            await expect(handleList()).rejects.toThrow('List failed');
+        });
+    });
+    describe('listCommand', () => {
+        const command = listCommand;
+        it('should have correct command and describe', () => {
+            expect(command.command).toBe('list');
+            expect(command.describe).toBe('Lists discovered agent skills.');
+        });
+    });
+});
+//# sourceMappingURL=list.test.js.map

package/dist/src/commands/skills/list.test.js.map

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

package/dist/src/commands/skills.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { CommandModule } from 'yargs';
+export declare const skillsCommand: CommandModule;

package/dist/src/commands/skills.js

@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { listCommand } from './skills/list.js';
+import { enableCommand } from './skills/enable.js';
+import { disableCommand } from './skills/disable.js';
+import { initializeOutputListenersAndFlush } from '../gemini.js';
+export const skillsCommand = {
+    command: 'skills <command>',
+    aliases: ['skill'],
+    describe: 'Manage agent skills.',
+    builder: (yargs) => yargs
+        .middleware(() => initializeOutputListenersAndFlush())
+        .command(listCommand)
+        .command(enableCommand)
+        .command(disableCommand)
+        .demandCommand(1, 'You need at least one command before continuing.')
+        .version(false),
+    handler: () => {
+        // This handler is not called when a subcommand is provided.
+        // Yargs will show the help menu.
+    },
+};
+//# sourceMappingURL=skills.js.map

package/dist/src/commands/skills.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skills.js","sourceRoot":"","sources":["../../../src/commands/skills.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,iCAAiC,EAAE,MAAM,cAAc,CAAC;AAEjE,MAAM,CAAC,MAAM,aAAa,GAAkB;IAC1C,OAAO,EAAE,kBAAkB;IAC3B,OAAO,EAAE,CAAC,OAAO,CAAC;IAClB,QAAQ,EAAE,sBAAsB;IAChC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,GAAG,EAAE,CAAC,iCAAiC,EAAE,CAAC;SACrD,OAAO,CAAC,WAAW,CAAC;SACpB,OAAO,CAAC,aAAa,CAAC;SACtB,OAAO,CAAC,cAAc,CAAC;SACvB,aAAa,CAAC,CAAC,EAAE,kDAAkD,CAAC;SACpE,OAAO,CAAC,KAAK,CAAC;IACnB,OAAO,EAAE,GAAG,EAAE;QACZ,4DAA4D;QAC5D,iCAAiC;IACnC,CAAC;CACF,CAAC"}

package/dist/src/commands/skills.test.d.ts

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

package/dist/src/commands/skills.test.js

@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi } from 'vitest';
+import { skillsCommand } from './skills.js';
+vi.mock('./skills/list.js', () => ({ listCommand: { command: 'list' } }));
+vi.mock('./skills/enable.js', () => ({
+    enableCommand: { command: 'enable <name>' },
+}));
+vi.mock('./skills/disable.js', () => ({
+    disableCommand: { command: 'disable <name>' },
+}));
+vi.mock('../gemini.js', () => ({
+    initializeOutputListenersAndFlush: vi.fn(),
+}));
+describe('skillsCommand', () => {
+    it('should have correct command and aliases', () => {
+        expect(skillsCommand.command).toBe('skills <command>');
+        expect(skillsCommand.aliases).toEqual(['skill']);
+        expect(skillsCommand.describe).toBe('Manage agent skills.');
+    });
+    it('should register all subcommands in builder', () => {
+        const mockYargs = {
+            middleware: vi.fn().mockReturnThis(),
+            command: vi.fn().mockReturnThis(),
+            demandCommand: vi.fn().mockReturnThis(),
+            version: vi.fn().mockReturnThis(),
+        };
+        // @ts-expect-error - Mocking yargs
+        skillsCommand.builder(mockYargs);
+        expect(mockYargs.middleware).toHaveBeenCalled();
+        expect(mockYargs.command).toHaveBeenCalledWith({ command: 'list' });
+        expect(mockYargs.command).toHaveBeenCalledWith({
+            command: 'enable <name>',
+        });
+        expect(mockYargs.command).toHaveBeenCalledWith({
+            command: 'disable <name>',
+        });
+        expect(mockYargs.demandCommand).toHaveBeenCalledWith(1, expect.any(String));
+        expect(mockYargs.version).toHaveBeenCalledWith(false);
+    });
+    it('should have a handler that does nothing', () => {
+        // @ts-expect-error - Handler doesn't take arguments in this case
+        expect(skillsCommand.handler()).toBeUndefined();
+    });
+});
+//# sourceMappingURL=skills.test.js.map

package/dist/src/commands/skills.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skills.test.js","sourceRoot":"","sources":["../../../src/commands/skills.test.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;AAC1E,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE,CAAC,CAAC;IACnC,aAAa,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE;CAC5C,CAAC,CAAC,CAAC;AACJ,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,cAAc,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE;CAC9C,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7B,iCAAiC,EAAE,EAAE,CAAC,EAAE,EAAE;CAC3C,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACvD,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACjD,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,SAAS,GAAG;YAChB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,EAAE;YACpC,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,EAAE;YACjC,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,EAAE;YACvC,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,EAAE;SAClC,CAAC;QAEF,mCAAmC;QACnC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAEjC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAChD,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACpE,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC;YAC7C,OAAO,EAAE,eAAe;SACzB,CAAC,CAAC;QACH,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC;YAC7C,OAAO,EAAE,gBAAgB;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5E,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,iEAAiE;QACjE,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/config/config.d.ts

@@ -25,7 +25,6 @@ export interface CliArgs {
     deleteSession: string | undefined;
     includeDirectories: string[] | undefined;
     screenReader: boolean | undefined;
-    useSmartEdit: boolean | undefined;
     useWriteTodos: boolean | undefined;
     outputFormat: string | undefined;
     fakeResponses: string | undefined;

package/dist/src/config/config.js

@@ -8,6 +8,7 @@ import { hideBin } from 'yargs/helpers';
 import process from 'node:process';
 import { mcpCommand } from '../commands/mcp.js';
 import { extensionsCommand } from '../commands/extensions.js';
+import { skillsCommand } from '../commands/skills.js';
 import { hooksCommand } from '../commands/hooks.js';
 import { Config, setGeminiMdFilename as setServerGeminiMdFilename, getCurrentGeminiMdFilename, ApprovalMode, DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, WRITE_FILE_TOOL_NAME, SHELL_TOOL_NAMES, SHELL_TOOL_NAME, resolveTelemetrySettings, FatalConfigError, getPty, EDIT_TOOL_NAME, debugLogger, loadServerHierarchicalMemory, WEB_FETCH_TOOL_NAME, getVersion, PREVIEW_GEMINI_MODEL_AUTO, } from '@google/gemini-cli-core';
 import { saveModelChange, loadSettings } from './settings.js';
@@ -21,6 +22,7 @@ import { ExtensionManager } from './extension-manager.js';
 import { requestConsentNonInteractive } from './extensions/consent.js';
 import { promptForSetting } from './extensions/extensionSettings.js';
 import { runExitCleanup } from '../utils/cleanup.js';
+import { getEnableHooks } from './settingsSchema.js';
 export async function parseArguments(settings) {
     const rawArgv = hideBin(process.argv);
     const yargsInstance = yargs(rawArgv)
@@ -199,8 +201,11 @@ export async function parseArguments(settings) {
     if (settings?.experimental?.extensionManagement ?? true) {
         yargsInstance.command(extensionsCommand);
     }
+    if (settings?.experimental?.skills ?? false) {
+        yargsInstance.command(skillsCommand);
+    }
     // Register hooks command if hooks are enabled
-    if (settings?.tools?.enableHooks) {
+    if (getEnableHooks(settings)) {
         yargsInstance.command(hooksCommand);
     }
     yargsInstance
@@ -287,7 +292,7 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
     const memoryImportFormat = settings.context?.importFormat || 'tree';
     const ideMode = settings.ide?.enabled ?? false;
     const folderTrust = settings.security?.folderTrust?.enabled ?? false;
-    const trustedFolder = isWorkspaceTrusted(settings)?.isTrusted ?? true;
+    const trustedFolder = isWorkspaceTrusted(settings)?.isTrusted ?? false;
     // Set the context filename in the server's memoryTool module BEFORE loading memory
     // TODO(b/343434939): This is a bit of a hack. The contextFileName should ideally be passed
     // directly to the Config constructor in core, and have core handle setGeminiMdFilename.
@@ -356,10 +361,15 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
             argv.yolo || false ? ApprovalMode.YOLO : ApprovalMode.DEFAULT;
     }
     // Override approval mode if disableYoloMode is set.
-    if (settings.security?.disableYoloMode) {
+    if (settings.security?.disableYoloMode || settings.admin?.secureModeEnabled) {
         if (approvalMode === ApprovalMode.YOLO) {
-            debugLogger.error('YOLO mode is disabled by the "disableYolo" setting.');
-            throw new FatalConfigError('Cannot start in YOLO mode when it is disabled by settings');
+            if (settings.admin?.secureModeEnabled) {
+                debugLogger.error('YOLO mode is disabled by "secureModeEnabled" setting.');
+            }
+            else {
+                debugLogger.error('YOLO mode is disabled by the "disableYolo" setting.');
+            }
+            throw new FatalConfigError('Cannot start in YOLO mode since it is disabled by your admin');
         }
         approvalMode = ApprovalMode.DEFAULT;
     }
@@ -384,14 +394,13 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         }
         throw err;
     }
-    const policyEngineConfig = await createPolicyEngineConfig(settings, approvalMode);
-    const allowedTools = argv.allowedTools || settings.tools?.allowed || [];
-    const allowedToolsSet = new Set(allowedTools);
     // Interactive mode: explicit -i flag or (TTY + no args + no -p flag)
     const hasQuery = !!argv.query;
     const interactive = !!argv.promptInteractive ||
         !!argv.experimentalAcp ||
         (process.stdin.isTTY && !hasQuery && !argv.prompt);
+    const allowedTools = argv.allowedTools || settings.tools?.allowed || [];
+    const allowedToolsSet = new Set(allowedTools);
     // In non-interactive mode, exclude tools that require a prompt.
     const extraExcludes = [];
     if (!interactive) {
@@ -421,6 +430,21 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         }
     }
     const excludeTools = mergeExcludeTools(settings, extraExcludes.length > 0 ? extraExcludes : undefined);
+    // Create a settings object that includes CLI overrides for policy generation
+    const effectiveSettings = {
+        ...settings,
+        tools: {
+            ...settings.tools,
+            allowed: allowedTools,
+            exclude: excludeTools,
+        },
+        mcp: {
+            ...settings.mcp,
+            allowed: argv.allowedMcpServerNames ?? settings.mcp?.allowed,
+        },
+    };
+    const policyEngineConfig = await createPolicyEngineConfig(effectiveSettings, approvalMode);
+    policyEngineConfig.nonInteractive = !interactive;
     const defaultModel = settings.general?.previewFeatures
         ? PREVIEW_GEMINI_MODEL_AUTO
         : DEFAULT_GEMINI_MODEL_AUTO;
@@ -433,6 +457,7 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         ? argv.screenReader
         : (settings.ui?.accessibility?.screenReader ?? false);
     const ptyInfo = await getPty();
+    const mcpEnabled = settings.admin?.mcp?.enabled ?? true;
     return new Config({
         sessionId,
         embeddingModel: DEFAULT_GEMINI_EMBEDDING_MODEL,
@@ -449,26 +474,31 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         excludeTools,
         toolDiscoveryCommand: settings.tools?.discoveryCommand,
         toolCallCommand: settings.tools?.callCommand,
-        mcpServerCommand: settings.mcp?.serverCommand,
-        mcpServers: settings.mcpServers,
-        allowedMcpServers: argv.allowedMcpServerNames ?? settings.mcp?.allowed,
-        blockedMcpServers: argv.allowedMcpServerNames
-            ? undefined
-            : settings.mcp?.excluded,
+        mcpServerCommand: mcpEnabled ? settings.mcp?.serverCommand : undefined,
+        mcpServers: mcpEnabled ? settings.mcpServers : {},
+        mcpEnabled,
+        allowedMcpServers: mcpEnabled
+            ? (argv.allowedMcpServerNames ?? settings.mcp?.allowed)
+            : undefined,
+        blockedMcpServers: mcpEnabled
+            ? argv.allowedMcpServerNames
+                ? undefined
+                : settings.mcp?.excluded
+            : undefined,
         blockedEnvironmentVariables: settings.security?.environmentVariableRedaction?.blocked,
         enableEnvironmentVariableRedaction: settings.security?.environmentVariableRedaction?.enabled,
         userMemory: memoryContent,
         geminiMdFileCount: fileCount,
         geminiMdFilePaths: filePaths,
         approvalMode,
-        disableYoloMode: settings.security?.disableYoloMode,
+        disableYoloMode: settings.security?.disableYoloMode || settings.admin?.secureModeEnabled,
         showMemoryUsage: settings.ui?.showMemoryUsage || false,
         accessibility: {
             ...settings.ui?.accessibility,
             screenReader,
         },
         telemetry: telemetrySettings,
-        usageStatisticsEnabled: settings.privacy?.usageStatisticsEnabled ?? true,
+        usageStatisticsEnabled: settings.privacy?.usageStatisticsEnabled,
         fileFiltering,
         checkpointing: settings.general?.checkpointing?.enabled,
         proxy: process.env['HTTPS_PROXY'] ||
@@ -479,7 +509,7 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         fileDiscoveryService: fileService,
         bugCommand: settings.advanced?.bugCommand,
         model: resolvedModel,
-        maxSessionTurns: settings.model?.maxSessionTurns ?? -1,
+        maxSessionTurns: settings.model?.maxSessionTurns,
         experimentalZedIntegration: argv.experimentalAcp || false,
         listExtensions: argv.listExtensions || false,
         listSessions: argv.listSessions || false,
@@ -499,16 +529,15 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         interactive,
         trustedFolder,
         useRipgrep: settings.tools?.useRipgrep,
-        enableInteractiveShell: settings.tools?.shell?.enableInteractiveShell ?? true,
+        enableInteractiveShell: settings.tools?.shell?.enableInteractiveShell,
         shellToolInactivityTimeout: settings.tools?.shell?.inactivityTimeout,
         enableShellOutputEfficiency: settings.tools?.shell?.enableShellOutputEfficiency ?? true,
         skipNextSpeakerCheck: settings.model?.skipNextSpeakerCheck,
-        enablePromptCompletion: settings.general?.enablePromptCompletion ?? false,
+        enablePromptCompletion: settings.general?.enablePromptCompletion,
         truncateToolOutputThreshold: settings.tools?.truncateToolOutputThreshold,
         truncateToolOutputLines: settings.tools?.truncateToolOutputLines,
         enableToolOutputTruncation: settings.tools?.enableToolOutputTruncation,
         eventEmitter: appEvents,
-        useSmartEdit: argv.useSmartEdit ?? settings.useSmartEdit,
         useWriteTodos: argv.useWriteTodos ?? settings.useWriteTodos,
         output: {
             format: (argv.outputFormat ?? settings.output?.format),
@@ -517,14 +546,20 @@ export async function loadCliConfig(settings, sessionId, argv, options = {}) {
         introspectionAgentSettings: settings.experimental?.introspectionAgentSettings,
         fakeResponses: argv.fakeResponses,
         recordResponses: argv.recordResponses,
-        retryFetchErrors: settings.general?.retryFetchErrors ?? false,
+        retryFetchErrors: settings.general?.retryFetchErrors,
         ptyInfo: ptyInfo?.name,
         modelConfigServiceConfig: settings.modelConfigs,
         // TODO: loading of hooks based on workspace trust
-        enableHooks: settings.tools?.enableHooks ?? false,
+        enableHooks: getEnableHooks(settings),
         hooks: settings.hooks || {},
         projectHooks: projectHooks || {},
         onModelChange: (model) => saveModelChange(loadedSettings, model),
+        onReload: async () => {
+            const refreshedSettings = loadSettings(cwd);
+            return {
+                disabledSkills: refreshedSettings.merged.skills?.disabled,
+            };
+        },
     });
 }
 function mergeExcludeTools(settings, extraExcludes) {