@trukhinyuri/gemini-pp 0.27.0-nightly.20260121.97aac696f

package/dist/src/commands/mcp/add.test.js

@@ -0,0 +1,274 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, } from 'vitest';
+import yargs, {} from 'yargs';
+import { addCommand } from './add.js';
+import { loadSettings, SettingScope } from '../../config/settings.js';
+import { debugLogger } from '@google/gemini-cli-core';
+vi.mock('../utils.js', () => ({
+    exitCli: vi.fn(),
+}));
+vi.mock('fs/promises', () => ({
+    readFile: vi.fn(),
+    writeFile: vi.fn(),
+}));
+vi.mock('os', () => {
+    const homedir = vi.fn(() => '/home/user');
+    return {
+        default: {
+            homedir,
+        },
+        homedir,
+    };
+});
+vi.mock('../../config/settings.js', async () => {
+    const actual = await vi.importActual('../../config/settings.js');
+    return {
+        ...actual,
+        loadSettings: vi.fn(),
+    };
+});
+const mockedLoadSettings = loadSettings;
+describe('mcp add command', () => {
+    let parser;
+    let mockSetValue;
+    let mockConsoleError;
+    let debugLoggerErrorSpy;
+    beforeEach(() => {
+        vi.resetAllMocks();
+        const yargsInstance = yargs([]).command(addCommand);
+        parser = yargsInstance;
+        mockSetValue = vi.fn();
+        mockConsoleError = vi.fn();
+        debugLoggerErrorSpy = vi
+            .spyOn(debugLogger, 'error')
+            .mockImplementation(() => { });
+        vi.spyOn(console, 'error').mockImplementation(mockConsoleError);
+        mockedLoadSettings.mockReturnValue({
+            forScope: () => ({ settings: {} }),
+            setValue: mockSetValue,
+            workspace: { path: '/path/to/project' },
+            user: { path: '/home/user' },
+        });
+    });
+    it('should add a stdio server to project settings', async () => {
+        await parser.parseAsync('add -e FOO=bar my-server /path/to/server arg1 arg2');
+        expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', {
+            'my-server': {
+                command: '/path/to/server',
+                args: ['arg1', 'arg2'],
+                env: { FOO: 'bar' },
+            },
+        });
+    });
+    it('should handle multiple env vars before positional args', async () => {
+        await parser.parseAsync('add -e FOO=bar -e BAZ=qux my-server /path/to/server');
+        expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', {
+            'my-server': {
+                command: '/path/to/server',
+                args: [],
+                env: { FOO: 'bar', BAZ: 'qux' },
+            },
+        });
+    });
+    it('should add an sse server to user settings', async () => {
+        await parser.parseAsync('add --transport sse --scope user -H "X-API-Key: your-key" sse-server https://example.com/sse-endpoint');
+        expect(mockSetValue).toHaveBeenCalledWith(SettingScope.User, 'mcpServers', {
+            'sse-server': {
+                url: 'https://example.com/sse-endpoint',
+                type: 'sse',
+                headers: { 'X-API-Key': 'your-key' },
+            },
+        });
+    });
+    it('should add an http server to project settings', async () => {
+        await parser.parseAsync('add --transport http -H "Authorization: Bearer your-token" http-server https://example.com/mcp');
+        expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', {
+            'http-server': {
+                url: 'https://example.com/mcp',
+                type: 'http',
+                headers: { Authorization: 'Bearer your-token' },
+            },
+        });
+    });
+    it('should add an sse server using --type alias', async () => {
+        await parser.parseAsync('add --type sse --scope user -H "X-API-Key: your-key" sse-server https://example.com/sse');
+        expect(mockSetValue).toHaveBeenCalledWith(SettingScope.User, 'mcpServers', {
+            'sse-server': {
+                url: 'https://example.com/sse',
+                type: 'sse',
+                headers: { 'X-API-Key': 'your-key' },
+            },
+        });
+    });
+    it('should add an http server using --type alias', async () => {
+        await parser.parseAsync('add --type http -H "Authorization: Bearer your-token" http-server https://example.com/mcp');
+        expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', {
+            'http-server': {
+                url: 'https://example.com/mcp',
+                type: 'http',
+                headers: { Authorization: 'Bearer your-token' },
+            },
+        });
+    });
+    it('should handle MCP server args with -- separator', async () => {
+        await parser.parseAsync('add my-server npx -- -y http://example.com/some-package');
+        expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', {
+            'my-server': {
+                command: 'npx',
+                args: ['-y', 'http://example.com/some-package'],
+            },
+        });
+    });
+    it('should handle unknown options as MCP server args', async () => {
+        await parser.parseAsync('add test-server npx -y http://example.com/some-package');
+        expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', {
+            'test-server': {
+                command: 'npx',
+                args: ['-y', 'http://example.com/some-package'],
+            },
+        });
+    });
+    describe('when handling scope and directory', () => {
+        const serverName = 'test-server';
+        const command = 'echo';
+        const setupMocks = (cwd, workspacePath) => {
+            vi.spyOn(process, 'cwd').mockReturnValue(cwd);
+            mockedLoadSettings.mockReturnValue({
+                forScope: () => ({ settings: {} }),
+                setValue: mockSetValue,
+                workspace: { path: workspacePath },
+                user: { path: '/home/user' },
+            });
+        };
+        describe('when in a project directory', () => {
+            beforeEach(() => {
+                setupMocks('/path/to/project', '/path/to/project');
+            });
+            it('should use project scope by default', async () => {
+                await parser.parseAsync(`add ${serverName} ${command}`);
+                expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', expect.any(Object));
+            });
+            it('should use project scope when --scope=project is used', async () => {
+                await parser.parseAsync(`add --scope project ${serverName} ${command}`);
+                expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', expect.any(Object));
+            });
+            it('should use user scope when --scope=user is used', async () => {
+                await parser.parseAsync(`add --scope user ${serverName} ${command}`);
+                expect(mockSetValue).toHaveBeenCalledWith(SettingScope.User, 'mcpServers', expect.any(Object));
+            });
+        });
+        describe('when in a subdirectory of a project', () => {
+            beforeEach(() => {
+                setupMocks('/path/to/project/subdir', '/path/to/project');
+            });
+            it('should use project scope by default', async () => {
+                await parser.parseAsync(`add ${serverName} ${command}`);
+                expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', expect.any(Object));
+            });
+        });
+        describe('when in the home directory', () => {
+            beforeEach(() => {
+                setupMocks('/home/user', '/home/user');
+            });
+            it('should show an error by default', async () => {
+                const mockProcessExit = vi
+                    .spyOn(process, 'exit')
+                    .mockImplementation((() => {
+                    throw new Error('process.exit called');
+                }));
+                await expect(parser.parseAsync(`add ${serverName} ${command}`)).rejects.toThrow('process.exit called');
+                expect(debugLoggerErrorSpy).toHaveBeenCalledWith('Error: Please use --scope user to edit settings in the home directory.');
+                expect(mockProcessExit).toHaveBeenCalledWith(1);
+                expect(mockSetValue).not.toHaveBeenCalled();
+            });
+            it('should show an error when --scope=project is used explicitly', async () => {
+                const mockProcessExit = vi
+                    .spyOn(process, 'exit')
+                    .mockImplementation((() => {
+                    throw new Error('process.exit called');
+                }));
+                await expect(parser.parseAsync(`add --scope project ${serverName} ${command}`)).rejects.toThrow('process.exit called');
+                expect(debugLoggerErrorSpy).toHaveBeenCalledWith('Error: Please use --scope user to edit settings in the home directory.');
+                expect(mockProcessExit).toHaveBeenCalledWith(1);
+                expect(mockSetValue).not.toHaveBeenCalled();
+            });
+            it('should use user scope when --scope=user is used', async () => {
+                await parser.parseAsync(`add --scope user ${serverName} ${command}`);
+                expect(mockSetValue).toHaveBeenCalledWith(SettingScope.User, 'mcpServers', expect.any(Object));
+                expect(debugLoggerErrorSpy).not.toHaveBeenCalled();
+            });
+        });
+        describe('when in a subdirectory of home (not a project)', () => {
+            beforeEach(() => {
+                setupMocks('/home/user/some/dir', '/home/user/some/dir');
+            });
+            it('should use project scope by default', async () => {
+                await parser.parseAsync(`add ${serverName} ${command}`);
+                expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', expect.any(Object));
+            });
+            it('should write to the WORKSPACE scope, not the USER scope', async () => {
+                await parser.parseAsync(`add my-new-server echo`);
+                // We expect setValue to be called once.
+                expect(mockSetValue).toHaveBeenCalledTimes(1);
+                // We get the scope that setValue was called with.
+                const calledScope = mockSetValue.mock.calls[0][0];
+                // We assert that the scope was Workspace, not User.
+                expect(calledScope).toBe(SettingScope.Workspace);
+            });
+        });
+        describe('when outside of home (not a project)', () => {
+            beforeEach(() => {
+                setupMocks('/tmp/foo', '/tmp/foo');
+            });
+            it('should use project scope by default', async () => {
+                await parser.parseAsync(`add ${serverName} ${command}`);
+                expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', expect.any(Object));
+            });
+        });
+    });
+    describe('when updating an existing server', () => {
+        const serverName = 'existing-server';
+        const initialCommand = 'echo old';
+        const updatedCommand = 'echo';
+        const updatedArgs = ['new'];
+        beforeEach(() => {
+            mockedLoadSettings.mockReturnValue({
+                forScope: () => ({
+                    settings: {
+                        mcpServers: {
+                            [serverName]: {
+                                command: initialCommand,
+                            },
+                        },
+                    },
+                }),
+                setValue: mockSetValue,
+                workspace: { path: '/path/to/project' },
+                user: { path: '/home/user' },
+            });
+        });
+        it('should update the existing server in the project scope', async () => {
+            await parser.parseAsync(`add ${serverName} ${updatedCommand} ${updatedArgs.join(' ')}`);
+            expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', expect.objectContaining({
+                [serverName]: expect.objectContaining({
+                    command: updatedCommand,
+                    args: updatedArgs,
+                }),
+            }));
+        });
+        it('should update the existing server in the user scope', async () => {
+            await parser.parseAsync(`add --scope user ${serverName} ${updatedCommand} ${updatedArgs.join(' ')}`);
+            expect(mockSetValue).toHaveBeenCalledWith(SettingScope.User, 'mcpServers', expect.objectContaining({
+                [serverName]: expect.objectContaining({
+                    command: updatedCommand,
+                    args: updatedArgs,
+                }),
+            }));
+        });
+    });
+});
+//# sourceMappingURL=add.test.js.map

package/dist/src/commands/mcp/add.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add.test.js","sourceRoot":"","sources":["../../../../src/commands/mcp/add.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EACR,EAAE,EACF,MAAM,EACN,EAAE,EACF,UAAU,GAGX,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,EAAa,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5B,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;CACjB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5B,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;IACjB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;CACnB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;IACjB,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC;IAC1C,OAAO;QACL,OAAO,EAAE;YACP,OAAO;SACR;QACD,OAAO;KACR,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;IAC7C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAAC;IACjE,OAAO;QACL,GAAG,MAAM;QACT,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE;KACtB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,kBAAkB,GAAG,YAAoB,CAAC;AAEhD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,MAAY,CAAC;IACjB,IAAI,YAAkB,CAAC;IACvB,IAAI,gBAAsB,CAAC;IAC3B,IAAI,mBAAiC,CAAC;IAEtC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,aAAa,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,GAAG,aAAa,CAAC;QACvB,YAAY,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACvB,gBAAgB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,mBAAmB,GAAG,EAAE;aACrB,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC;aAC3B,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAChC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAChE,kBAAkB,CAAC,eAAe,CAAC;YACjC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;YAClC,QAAQ,EAAE,YAAY;YACtB,SAAS,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE;YACvC,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;SAC7B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,MAAM,CAAC,UAAU,CACrB,oDAAoD,CACrD,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ;YACE,WAAW,EAAE;gBACX,OAAO,EAAE,iBAAiB;gBAC1B,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;gBACtB,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE;aACpB;SACF,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,MAAM,CAAC,UAAU,CACrB,qDAAqD,CACtD,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ;YACE,WAAW,EAAE;gBACX,OAAO,EAAE,iBAAiB;gBAC1B,IAAI,EAAE,EAAE;gBACR,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE;aAChC;SACF,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,MAAM,CAAC,UAAU,CACrB,uGAAuG,CACxG,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE;YACzE,YAAY,EAAE;gBACZ,GAAG,EAAE,kCAAkC;gBACvC,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE;aACrC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,MAAM,CAAC,UAAU,CACrB,gGAAgG,CACjG,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ;YACE,aAAa,EAAE;gBACb,GAAG,EAAE,yBAAyB;gBAC9B,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,EAAE,aAAa,EAAE,mBAAmB,EAAE;aAChD;SACF,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,MAAM,CAAC,UAAU,CACrB,yFAAyF,CAC1F,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE;YACzE,YAAY,EAAE;gBACZ,GAAG,EAAE,yBAAyB;gBAC9B,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE;aACrC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,MAAM,CAAC,UAAU,CACrB,2FAA2F,CAC5F,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ;YACE,aAAa,EAAE;gBACb,GAAG,EAAE,yBAAyB;gBAC9B,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,EAAE,aAAa,EAAE,mBAAmB,EAAE;aAChD;SACF,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,MAAM,CAAC,UAAU,CACrB,yDAAyD,CAC1D,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ;YACE,WAAW,EAAE;gBACX,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,CAAC,IAAI,EAAE,iCAAiC,CAAC;aAChD;SACF,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,MAAM,CAAC,UAAU,CACrB,wDAAwD,CACzD,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ;YACE,aAAa,EAAE;gBACb,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,CAAC,IAAI,EAAE,iCAAiC,CAAC;aAChD;SACF,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;QACjD,MAAM,UAAU,GAAG,aAAa,CAAC;QACjC,MAAM,OAAO,GAAG,MAAM,CAAC;QAEvB,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,aAAqB,EAAE,EAAE;YACxD,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAC9C,kBAAkB,CAAC,eAAe,CAAC;gBACjC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;gBAClC,QAAQ,EAAE,YAAY;gBACtB,SAAS,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;gBAClC,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;aAC7B,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;YAC3C,UAAU,CAAC,GAAG,EAAE;gBACd,UAAU,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;gBACnD,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,UAAU,IAAI,OAAO,EAAE,CAAC,CAAC;gBACxD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;gBACrE,MAAM,MAAM,CAAC,UAAU,CAAC,uBAAuB,UAAU,IAAI,OAAO,EAAE,CAAC,CAAC;gBACxE,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;gBAC/D,MAAM,MAAM,CAAC,UAAU,CAAC,oBAAoB,UAAU,IAAI,OAAO,EAAE,CAAC,CAAC;gBACrE,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,IAAI,EACjB,YAAY,EACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;YACnD,UAAU,CAAC,GAAG,EAAE;gBACd,UAAU,CAAC,yBAAyB,EAAE,kBAAkB,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;gBACnD,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,UAAU,IAAI,OAAO,EAAE,CAAC,CAAC;gBACxD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;YAC1C,UAAU,CAAC,GAAG,EAAE;gBACd,UAAU,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;gBAC/C,MAAM,eAAe,GAAG,EAAE;qBACvB,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC;qBACtB,kBAAkB,CAAC,CAAC,GAAG,EAAE;oBACxB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBACzC,CAAC,CAA6C,CAAC,CAAC;gBAElD,MAAM,MAAM,CACV,MAAM,CAAC,UAAU,CAAC,OAAO,UAAU,IAAI,OAAO,EAAE,CAAC,CAClD,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;gBAEzC,MAAM,CAAC,mBAAmB,CAAC,CAAC,oBAAoB,CAC9C,wEAAwE,CACzE,CAAC;gBACF,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;gBAChD,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;gBAC5E,MAAM,eAAe,GAAG,EAAE;qBACvB,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC;qBACtB,kBAAkB,CAAC,CAAC,GAAG,EAAE;oBACxB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBACzC,CAAC,CAA6C,CAAC,CAAC;gBAElD,MAAM,MAAM,CACV,MAAM,CAAC,UAAU,CAAC,uBAAuB,UAAU,IAAI,OAAO,EAAE,CAAC,CAClE,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;gBAEzC,MAAM,CAAC,mBAAmB,CAAC,CAAC,oBAAoB,CAC9C,wEAAwE,CACzE,CAAC;gBACF,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;gBAChD,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;gBAC/D,MAAM,MAAM,CAAC,UAAU,CAAC,oBAAoB,UAAU,IAAI,OAAO,EAAE,CAAC,CAAC;gBACrE,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,IAAI,EACjB,YAAY,EACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;gBACF,MAAM,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YACrD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,gDAAgD,EAAE,GAAG,EAAE;YAC9D,UAAU,CAAC,GAAG,EAAE;gBACd,UAAU,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;gBACnD,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,UAAU,IAAI,OAAO,EAAE,CAAC,CAAC;gBACxD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;gBACvE,MAAM,MAAM,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;gBAElD,wCAAwC;gBACxC,MAAM,CAAC,YAAY,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;gBAE9C,kDAAkD;gBAClD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAElD,oDAAoD;gBACpD,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,sCAAsC,EAAE,GAAG,EAAE;YACpD,UAAU,CAAC,GAAG,EAAE;gBACd,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;gBACnD,MAAM,MAAM,CAAC,UAAU,CAAC,OAAO,UAAU,IAAI,OAAO,EAAE,CAAC,CAAC;gBACxD,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAChD,MAAM,UAAU,GAAG,iBAAiB,CAAC;QACrC,MAAM,cAAc,GAAG,UAAU,CAAC;QAClC,MAAM,cAAc,GAAG,MAAM,CAAC;QAC9B,MAAM,WAAW,GAAG,CAAC,KAAK,CAAC,CAAC;QAE5B,UAAU,CAAC,GAAG,EAAE;YACd,kBAAkB,CAAC,eAAe,CAAC;gBACjC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;oBACf,QAAQ,EAAE;wBACR,UAAU,EAAE;4BACV,CAAC,UAAU,CAAC,EAAE;gCACZ,OAAO,EAAE,cAAc;6BACxB;yBACF;qBACF;iBACF,CAAC;gBACF,QAAQ,EAAE,YAAY;gBACtB,SAAS,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE;gBACvC,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;aAC7B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,MAAM,MAAM,CAAC,UAAU,CACrB,OAAO,UAAU,IAAI,cAAc,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC/D,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,SAAS,EACtB,YAAY,EACZ,MAAM,CAAC,gBAAgB,CAAC;gBACtB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBACpC,OAAO,EAAE,cAAc;oBACvB,IAAI,EAAE,WAAW;iBAClB,CAAC;aACH,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;YACnE,MAAM,MAAM,CAAC,UAAU,CACrB,oBAAoB,UAAU,IAAI,cAAc,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC5E,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,CAAC,oBAAoB,CACvC,YAAY,CAAC,IAAI,EACjB,YAAY,EACZ,MAAM,CAAC,gBAAgB,CAAC;gBACtB,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBACpC,OAAO,EAAE,cAAc;oBACvB,IAAI,EAAE,WAAW;iBAClB,CAAC;aACH,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/commands/mcp/enableDisable.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { CommandModule } from 'yargs';
+interface Args {
+    name: string;
+    session?: boolean;
+}
+export declare const enableCommand: CommandModule<object, Args>;
+export declare const disableCommand: CommandModule<object, Args>;
+export {};

package/dist/src/commands/mcp/enableDisable.js

@@ -0,0 +1,122 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { debugLogger } from '@google/gemini-cli-core';
+import { McpServerEnablementManager, canLoadServer, normalizeServerId, } from '../../config/mcp/mcpServerEnablement.js';
+import { loadSettings } from '../../config/settings.js';
+import { exitCli } from '../utils.js';
+import { getMcpServersFromConfig } from './list.js';
+const GREEN = '\x1b[32m';
+const YELLOW = '\x1b[33m';
+const RED = '\x1b[31m';
+const RESET = '\x1b[0m';
+async function handleEnable(args) {
+    const manager = McpServerEnablementManager.getInstance();
+    const name = normalizeServerId(args.name);
+    // Check settings blocks
+    const settings = loadSettings();
+    // Get all servers including extensions
+    const servers = await getMcpServersFromConfig();
+    const normalizedServerNames = Object.keys(servers).map(normalizeServerId);
+    if (!normalizedServerNames.includes(name)) {
+        debugLogger.log(`${RED}Error:${RESET} Server '${args.name}' not found. Use 'gemini mcp' to see available servers.`);
+        return;
+    }
+    // Check if server is from an extension
+    const serverKey = Object.keys(servers).find((key) => normalizeServerId(key) === name);
+    const server = serverKey ? servers[serverKey] : undefined;
+    if (server?.extension) {
+        debugLogger.log(`${RED}Error:${RESET} Server '${args.name}' is provided by extension '${server.extension.name}'.`);
+        debugLogger.log(`Use 'gemini extensions enable ${server.extension.name}' to manage this extension.`);
+        return;
+    }
+    const result = await canLoadServer(name, {
+        adminMcpEnabled: settings.merged.admin?.mcp?.enabled ?? true,
+        allowedList: settings.merged.mcp?.allowed,
+        excludedList: settings.merged.mcp?.excluded,
+    });
+    if (!result.allowed &&
+        (result.blockType === 'allowlist' || result.blockType === 'excludelist')) {
+        debugLogger.log(`${RED}Error:${RESET} ${result.reason}`);
+        return;
+    }
+    if (args.session) {
+        manager.clearSessionDisable(name);
+        debugLogger.log(`${GREEN}✓${RESET} Session disable cleared for '${name}'.`);
+    }
+    else {
+        await manager.enable(name);
+        debugLogger.log(`${GREEN}✓${RESET} MCP server '${name}' enabled.`);
+    }
+    if (result.blockType === 'admin') {
+        debugLogger.log(`${YELLOW}Warning:${RESET} MCP servers are disabled by administrator.`);
+    }
+}
+async function handleDisable(args) {
+    const manager = McpServerEnablementManager.getInstance();
+    const name = normalizeServerId(args.name);
+    // Get all servers including extensions
+    const servers = await getMcpServersFromConfig();
+    const normalizedServerNames = Object.keys(servers).map(normalizeServerId);
+    if (!normalizedServerNames.includes(name)) {
+        debugLogger.log(`${RED}Error:${RESET} Server '${args.name}' not found. Use 'gemini mcp' to see available servers.`);
+        return;
+    }
+    // Check if server is from an extension
+    const serverKey = Object.keys(servers).find((key) => normalizeServerId(key) === name);
+    const server = serverKey ? servers[serverKey] : undefined;
+    if (server?.extension) {
+        debugLogger.log(`${RED}Error:${RESET} Server '${args.name}' is provided by extension '${server.extension.name}'.`);
+        debugLogger.log(`Use 'gemini extensions disable ${server.extension.name}' to manage this extension.`);
+        return;
+    }
+    if (args.session) {
+        manager.disableForSession(name);
+        debugLogger.log(`${GREEN}✓${RESET} MCP server '${name}' disabled for this session.`);
+    }
+    else {
+        await manager.disable(name);
+        debugLogger.log(`${GREEN}✓${RESET} MCP server '${name}' disabled.`);
+    }
+}
+export const enableCommand = {
+    command: 'enable <name>',
+    describe: 'Enable an MCP server',
+    builder: (yargs) => yargs
+        .positional('name', {
+        describe: 'MCP server name to enable',
+        type: 'string',
+        demandOption: true,
+    })
+        .option('session', {
+        describe: 'Clear session-only disable',
+        type: 'boolean',
+        default: false,
+    }),
+    handler: async (argv) => {
+        await handleEnable(argv);
+        await exitCli();
+    },
+};
+export const disableCommand = {
+    command: 'disable <name>',
+    describe: 'Disable an MCP server',
+    builder: (yargs) => yargs
+        .positional('name', {
+        describe: 'MCP server name to disable',
+        type: 'string',
+        demandOption: true,
+    })
+        .option('session', {
+        describe: 'Disable for current session only',
+        type: 'boolean',
+        default: false,
+    }),
+    handler: async (argv) => {
+        await handleDisable(argv);
+        await exitCli();
+    },
+};
+//# sourceMappingURL=enableDisable.js.map

package/dist/src/commands/mcp/enableDisable.js.map

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

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

@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { CommandModule } from 'yargs';
+import type { MCPServerConfig } from '@google/gemini-cli-core';
+export declare function getMcpServersFromConfig(): Promise<Record<string, MCPServerConfig>>;
+export declare function listMcpServers(): Promise<void>;
+export declare const listCommand: CommandModule;

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

@@ -0,0 +1,129 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { loadSettings } from '../../config/settings.js';
+import { MCPServerStatus, createTransport, debugLogger, } from '@google/gemini-cli-core';
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { ExtensionManager } from '../../config/extension-manager.js';
+import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
+import { promptForSetting } from '../../config/extensions/extensionSettings.js';
+import { exitCli } from '../utils.js';
+const COLOR_GREEN = '\u001b[32m';
+const COLOR_YELLOW = '\u001b[33m';
+const COLOR_RED = '\u001b[31m';
+const RESET_COLOR = '\u001b[0m';
+export async function getMcpServersFromConfig() {
+    const settings = loadSettings();
+    const extensionManager = new ExtensionManager({
+        settings: settings.merged,
+        workspaceDir: process.cwd(),
+        requestConsent: requestConsentNonInteractive,
+        requestSetting: promptForSetting,
+    });
+    const extensions = await extensionManager.loadExtensions();
+    const mcpServers = { ...settings.merged.mcpServers };
+    for (const extension of extensions) {
+        Object.entries(extension.mcpServers || {}).forEach(([key, server]) => {
+            if (mcpServers[key]) {
+                return;
+            }
+            mcpServers[key] = {
+                ...server,
+                extension,
+            };
+        });
+    }
+    return mcpServers;
+}
+async function testMCPConnection(serverName, config) {
+    const client = new Client({
+        name: 'mcp-test-client',
+        version: '0.0.1',
+    });
+    const settings = loadSettings();
+    const sanitizationConfig = {
+        enableEnvironmentVariableRedaction: true,
+        allowedEnvironmentVariables: [],
+        blockedEnvironmentVariables: settings.merged.advanced.excludedEnvVars,
+    };
+    let transport;
+    try {
+        // Use the same transport creation logic as core
+        transport = await createTransport(serverName, config, false, sanitizationConfig);
+    }
+    catch (_error) {
+        await client.close();
+        return MCPServerStatus.DISCONNECTED;
+    }
+    try {
+        // Attempt actual MCP connection with short timeout
+        await client.connect(transport, { timeout: 5000 }); // 5s timeout
+        // Test basic MCP protocol by pinging the server
+        await client.ping();
+        await client.close();
+        return MCPServerStatus.CONNECTED;
+    }
+    catch (_error) {
+        await transport.close();
+        return MCPServerStatus.DISCONNECTED;
+    }
+}
+async function getServerStatus(serverName, server) {
+    // Test all server types by attempting actual connection
+    return testMCPConnection(serverName, server);
+}
+export async function listMcpServers() {
+    const mcpServers = await getMcpServersFromConfig();
+    const serverNames = Object.keys(mcpServers);
+    if (serverNames.length === 0) {
+        debugLogger.log('No MCP servers configured.');
+        return;
+    }
+    debugLogger.log('Configured MCP servers:\n');
+    for (const serverName of serverNames) {
+        const server = mcpServers[serverName];
+        const status = await getServerStatus(serverName, server);
+        let statusIndicator = '';
+        let statusText = '';
+        switch (status) {
+            case MCPServerStatus.CONNECTED:
+                statusIndicator = COLOR_GREEN + '✓' + RESET_COLOR;
+                statusText = 'Connected';
+                break;
+            case MCPServerStatus.CONNECTING:
+                statusIndicator = COLOR_YELLOW + '…' + RESET_COLOR;
+                statusText = 'Connecting';
+                break;
+            case MCPServerStatus.DISCONNECTED:
+            default:
+                statusIndicator = COLOR_RED + '✗' + RESET_COLOR;
+                statusText = 'Disconnected';
+                break;
+        }
+        let serverInfo = serverName +
+            (server.extension?.name ? ` (from ${server.extension.name})` : '') +
+            ': ';
+        if (server.httpUrl) {
+            serverInfo += `${server.httpUrl} (http)`;
+        }
+        else if (server.url) {
+            const type = server.type || 'http';
+            serverInfo += `${server.url} (${type})`;
+        }
+        else if (server.command) {
+            serverInfo += `${server.command} ${server.args?.join(' ') || ''} (stdio)`;
+        }
+        debugLogger.log(`${statusIndicator} ${serverInfo} - ${statusText}`);
+    }
+}
+export const listCommand = {
+    command: 'list',
+    describe: 'List all configured MCP servers',
+    handler: async () => {
+        await listMcpServers();
+        await exitCli();
+    },
+};
+//# sourceMappingURL=list.js.map

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

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

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

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