@zgsm/costrict-cli 0.0.1

package/dist/src/ui/commands/mcpCommand.js

@@ -0,0 +1,285 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { CommandKind } from './types.js';
+import { DiscoveredMCPTool, getMCPDiscoveryState, getMCPServerStatus, MCPDiscoveryState, MCPServerStatus, getErrorMessage, MCPOAuthTokenStorage, mcpServerRequiresOAuth, } from '@google/gemini-cli-core';
+import { appEvents, AppEvent } from '../../utils/events.js';
+import { MessageType } from '../types.js';
+const authCommand = {
+    name: 'auth',
+    description: 'Authenticate with an OAuth-enabled MCP server',
+    kind: CommandKind.BUILT_IN,
+    autoExecute: true,
+    action: async (context, args) => {
+        const serverName = args.trim();
+        const { config } = context.services;
+        if (!config) {
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: 'Config not loaded.',
+            };
+        }
+        const mcpServers = config.getMcpClientManager()?.getMcpServers() ?? {};
+        if (!serverName) {
+            // List servers that support OAuth from two sources:
+            // 1. Servers with oauth.enabled in config
+            // 2. Servers detected as requiring OAuth (returned 401)
+            const configuredOAuthServers = Object.entries(mcpServers)
+                .filter(([_, server]) => server.oauth?.enabled)
+                .map(([name, _]) => name);
+            const detectedOAuthServers = Array.from(mcpServerRequiresOAuth.keys()).filter((name) => mcpServers[name]); // Only include configured servers
+            // Combine and deduplicate
+            const allOAuthServers = [
+                ...new Set([...configuredOAuthServers, ...detectedOAuthServers]),
+            ];
+            if (allOAuthServers.length === 0) {
+                return {
+                    type: 'message',
+                    messageType: 'info',
+                    content: 'No MCP servers configured with OAuth authentication.',
+                };
+            }
+            return {
+                type: 'message',
+                messageType: 'info',
+                content: `MCP servers with OAuth authentication:\n${allOAuthServers.map((s) => `  - ${s}`).join('\n')}\n\nUse /mcp auth <server-name> to authenticate.`,
+            };
+        }
+        const server = mcpServers[serverName];
+        if (!server) {
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: `MCP server '${serverName}' not found.`,
+            };
+        }
+        // Always attempt OAuth authentication, even if not explicitly configured
+        // The authentication process will discover OAuth requirements automatically
+        const displayListener = (message) => {
+            context.ui.addItem({ type: 'info', text: message }, Date.now());
+        };
+        appEvents.on(AppEvent.OauthDisplayMessage, displayListener);
+        try {
+            context.ui.addItem({
+                type: 'info',
+                text: `Starting OAuth authentication for MCP server '${serverName}'...`,
+            }, Date.now());
+            // Import dynamically to avoid circular dependencies
+            const { MCPOAuthProvider } = await import('@google/gemini-cli-core');
+            let oauthConfig = server.oauth;
+            if (!oauthConfig) {
+                oauthConfig = { enabled: false };
+            }
+            const mcpServerUrl = server.httpUrl || server.url;
+            const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
+            await authProvider.authenticate(serverName, oauthConfig, mcpServerUrl, appEvents);
+            context.ui.addItem({
+                type: 'info',
+                text: `✅ Successfully authenticated with MCP server '${serverName}'!`,
+            }, Date.now());
+            // Trigger tool re-discovery to pick up authenticated server
+            const mcpClientManager = config.getMcpClientManager();
+            if (mcpClientManager) {
+                context.ui.addItem({
+                    type: 'info',
+                    text: `Restarting MCP server '${serverName}'...`,
+                }, Date.now());
+                await mcpClientManager.restartServer(serverName);
+            }
+            // Update the client with the new tools
+            const geminiClient = config.getGeminiClient();
+            if (geminiClient?.isInitialized()) {
+                await geminiClient.setTools();
+            }
+            // Reload the slash commands to reflect the changes.
+            context.ui.reloadCommands();
+            return {
+                type: 'message',
+                messageType: 'info',
+                content: `Successfully authenticated and refreshed tools for '${serverName}'.`,
+            };
+        }
+        catch (error) {
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: `Failed to authenticate with MCP server '${serverName}': ${getErrorMessage(error)}`,
+            };
+        }
+        finally {
+            appEvents.removeListener(AppEvent.OauthDisplayMessage, displayListener);
+        }
+    },
+    completion: async (context, partialArg) => {
+        const { config } = context.services;
+        if (!config)
+            return [];
+        const mcpServers = config.getMcpClientManager()?.getMcpServers() || {};
+        return Object.keys(mcpServers).filter((name) => name.startsWith(partialArg));
+    },
+};
+const listAction = async (context, showDescriptions = false, showSchema = false) => {
+    const { config } = context.services;
+    if (!config) {
+        return {
+            type: 'message',
+            messageType: 'error',
+            content: 'Config not loaded.',
+        };
+    }
+    const toolRegistry = config.getToolRegistry();
+    if (!toolRegistry) {
+        return {
+            type: 'message',
+            messageType: 'error',
+            content: 'Could not retrieve tool registry.',
+        };
+    }
+    const mcpServers = config.getMcpClientManager()?.getMcpServers() || {};
+    const serverNames = Object.keys(mcpServers);
+    const blockedMcpServers = config.getMcpClientManager()?.getBlockedMcpServers() || [];
+    const connectingServers = serverNames.filter((name) => getMCPServerStatus(name) === MCPServerStatus.CONNECTING);
+    const discoveryState = getMCPDiscoveryState();
+    const discoveryInProgress = discoveryState === MCPDiscoveryState.IN_PROGRESS ||
+        connectingServers.length > 0;
+    const allTools = toolRegistry.getAllTools();
+    const mcpTools = allTools.filter((tool) => tool instanceof DiscoveredMCPTool);
+    const promptRegistry = await config.getPromptRegistry();
+    const mcpPrompts = promptRegistry
+        .getAllPrompts()
+        .filter((prompt) => 'serverName' in prompt && serverNames.includes(prompt.serverName));
+    const resourceRegistry = config.getResourceRegistry();
+    const mcpResources = resourceRegistry
+        .getAllResources()
+        .filter((entry) => serverNames.includes(entry.serverName));
+    const authStatus = {};
+    const tokenStorage = new MCPOAuthTokenStorage();
+    for (const serverName of serverNames) {
+        const server = mcpServers[serverName];
+        // Check auth status for servers with oauth.enabled OR detected as requiring OAuth
+        if (server.oauth?.enabled || mcpServerRequiresOAuth.has(serverName)) {
+            const creds = await tokenStorage.getCredentials(serverName);
+            if (creds) {
+                if (creds.token.expiresAt && creds.token.expiresAt < Date.now()) {
+                    authStatus[serverName] = 'expired';
+                }
+                else {
+                    authStatus[serverName] = 'authenticated';
+                }
+            }
+            else {
+                authStatus[serverName] = 'unauthenticated';
+            }
+        }
+        else {
+            authStatus[serverName] = 'not-configured';
+        }
+    }
+    const mcpStatusItem = {
+        type: MessageType.MCP_STATUS,
+        servers: mcpServers,
+        tools: mcpTools.map((tool) => ({
+            serverName: tool.serverName,
+            name: tool.name,
+            description: tool.description,
+            schema: tool.schema,
+        })),
+        prompts: mcpPrompts.map((prompt) => ({
+            serverName: prompt.serverName,
+            name: prompt.name,
+            description: prompt.description,
+        })),
+        resources: mcpResources.map((resource) => ({
+            serverName: resource.serverName,
+            name: resource.name,
+            uri: resource.uri,
+            mimeType: resource.mimeType,
+            description: resource.description,
+        })),
+        authStatus,
+        blockedServers: blockedMcpServers,
+        discoveryInProgress,
+        connectingServers,
+        showDescriptions,
+        showSchema,
+    };
+    context.ui.addItem(mcpStatusItem, Date.now());
+};
+const listCommand = {
+    name: 'list',
+    altNames: ['ls', 'nodesc', 'nodescription'],
+    description: 'List configured MCP servers and tools',
+    kind: CommandKind.BUILT_IN,
+    autoExecute: true,
+    action: (context) => listAction(context),
+};
+const descCommand = {
+    name: 'desc',
+    altNames: ['description'],
+    description: 'List configured MCP servers and tools with descriptions',
+    kind: CommandKind.BUILT_IN,
+    autoExecute: true,
+    action: (context) => listAction(context, true),
+};
+const schemaCommand = {
+    name: 'schema',
+    description: 'List configured MCP servers and tools with descriptions and schemas',
+    kind: CommandKind.BUILT_IN,
+    autoExecute: true,
+    action: (context) => listAction(context, true, true),
+};
+const refreshCommand = {
+    name: 'refresh',
+    description: 'Restarts MCP servers',
+    kind: CommandKind.BUILT_IN,
+    autoExecute: true,
+    action: async (context) => {
+        const { config } = context.services;
+        if (!config) {
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: 'Config not loaded.',
+            };
+        }
+        const mcpClientManager = config.getMcpClientManager();
+        if (!mcpClientManager) {
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: 'Could not retrieve mcp client manager.',
+            };
+        }
+        context.ui.addItem({
+            type: 'info',
+            text: 'Restarting MCP servers...',
+        }, Date.now());
+        await mcpClientManager.restart();
+        // Update the client with the new tools
+        const geminiClient = config.getGeminiClient();
+        if (geminiClient?.isInitialized()) {
+            await geminiClient.setTools();
+        }
+        // Reload the slash commands to reflect the changes.
+        context.ui.reloadCommands();
+        return listCommand.action(context, '');
+    },
+};
+export const mcpCommand = {
+    name: 'mcp',
+    description: 'Manage configured Model Context Protocol (MCP) servers',
+    kind: CommandKind.BUILT_IN,
+    autoExecute: false,
+    subCommands: [
+        listCommand,
+        descCommand,
+        schemaCommand,
+        authCommand,
+        refreshCommand,
+    ],
+    action: async (context) => listAction(context),
+};
+//# sourceMappingURL=mcpCommand.js.map

package/dist/src/ui/commands/mcpCommand.js.map

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

package/dist/src/ui/commands/mcpCommand.test.d.ts

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

package/dist/src/ui/commands/mcpCommand.test.js

@@ -0,0 +1,181 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { mcpCommand } from './mcpCommand.js';
+import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { MCPServerStatus, MCPDiscoveryState, getMCPServerStatus, getMCPDiscoveryState, DiscoveredMCPTool, } from '@google/gemini-cli-core';
+import { Type } from '@google/genai';
+import { MessageType } from '../types.js';
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    const mockAuthenticate = vi.fn();
+    return {
+        ...actual,
+        getMCPServerStatus: vi.fn(),
+        getMCPDiscoveryState: vi.fn(),
+        MCPOAuthProvider: vi.fn(() => ({
+            authenticate: mockAuthenticate,
+        })),
+        MCPOAuthTokenStorage: vi.fn(() => ({
+            getToken: vi.fn(),
+            isTokenExpired: vi.fn(),
+        })),
+    };
+});
+// Helper function to create a mock DiscoveredMCPTool
+const createMockMCPTool = (name, serverName, description) => new DiscoveredMCPTool({
+    callTool: vi.fn(),
+    tool: vi.fn(),
+}, serverName, name, description || `Description for ${name}`, { type: Type.OBJECT, properties: {} });
+describe('mcpCommand', () => {
+    let mockContext;
+    let mockConfig;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        // Set up default mock environment
+        vi.unstubAllEnvs();
+        // Default mock implementations
+        vi.mocked(getMCPServerStatus).mockReturnValue(MCPServerStatus.CONNECTED);
+        vi.mocked(getMCPDiscoveryState).mockReturnValue(MCPDiscoveryState.COMPLETED);
+        // Create mock config with all necessary methods
+        mockConfig = {
+            getToolRegistry: vi.fn().mockReturnValue({
+                getAllTools: vi.fn().mockReturnValue([]),
+            }),
+            getMcpServers: vi.fn().mockReturnValue({}),
+            getBlockedMcpServers: vi.fn().mockReturnValue([]),
+            getPromptRegistry: vi.fn().mockResolvedValue({
+                getAllPrompts: vi.fn().mockReturnValue([]),
+                getPromptsByServer: vi.fn().mockReturnValue([]),
+            }),
+            getGeminiClient: vi.fn(),
+            getMcpClientManager: vi.fn().mockImplementation(() => ({
+                getBlockedMcpServers: vi.fn(),
+                getMcpServers: vi.fn(),
+            })),
+            getResourceRegistry: vi.fn().mockReturnValue({
+                getAllResources: vi.fn().mockReturnValue([]),
+            }),
+        };
+        mockContext = createMockCommandContext({
+            services: {
+                config: mockConfig,
+            },
+        });
+    });
+    describe('basic functionality', () => {
+        it('should show an error if config is not available', async () => {
+            const contextWithoutConfig = createMockCommandContext({
+                services: {
+                    config: null,
+                },
+            });
+            const result = await mcpCommand.action(contextWithoutConfig, '');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Config not loaded.',
+            });
+        });
+        it('should show an error if tool registry is not available', async () => {
+            mockConfig.getToolRegistry = vi.fn().mockReturnValue(undefined);
+            const result = await mcpCommand.action(mockContext, '');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Could not retrieve tool registry.',
+            });
+        });
+    });
+    describe('with configured MCP servers', () => {
+        beforeEach(() => {
+            const mockMcpServers = {
+                server1: { command: 'cmd1' },
+                server2: { command: 'cmd2' },
+                server3: { command: 'cmd3' },
+            };
+            mockConfig.getMcpServers = vi.fn().mockReturnValue(mockMcpServers);
+            mockConfig.getMcpClientManager = vi.fn().mockReturnValue({
+                getMcpServers: vi.fn().mockReturnValue(mockMcpServers),
+                getBlockedMcpServers: vi.fn().mockReturnValue([]),
+            });
+        });
+        it('should display configured MCP servers with status indicators and their tools', async () => {
+            // Setup getMCPServerStatus mock implementation
+            vi.mocked(getMCPServerStatus).mockImplementation((serverName) => {
+                if (serverName === 'server1')
+                    return MCPServerStatus.CONNECTED;
+                if (serverName === 'server2')
+                    return MCPServerStatus.CONNECTED;
+                return MCPServerStatus.DISCONNECTED; // server3
+            });
+            // Mock tools from each server using actual DiscoveredMCPTool instances
+            const mockServer1Tools = [
+                createMockMCPTool('server1_tool1', 'server1'),
+                createMockMCPTool('server1_tool2', 'server1'),
+            ];
+            const mockServer2Tools = [createMockMCPTool('server2_tool1', 'server2')];
+            const mockServer3Tools = [createMockMCPTool('server3_tool1', 'server3')];
+            const allTools = [
+                ...mockServer1Tools,
+                ...mockServer2Tools,
+                ...mockServer3Tools,
+            ];
+            mockConfig.getToolRegistry = vi.fn().mockReturnValue({
+                getAllTools: vi.fn().mockReturnValue(allTools),
+            });
+            const resourcesByServer = {
+                server1: [
+                    {
+                        name: 'Server1 Resource',
+                        uri: 'file:///server1/resource1.txt',
+                    },
+                ],
+                server2: [],
+                server3: [],
+            };
+            mockConfig.getResourceRegistry = vi.fn().mockReturnValue({
+                getAllResources: vi.fn().mockReturnValue(Object.entries(resourcesByServer).flatMap(([serverName, resources]) => resources.map((entry) => ({
+                    serverName,
+                    ...entry,
+                })))),
+            });
+            await mcpCommand.action(mockContext, '');
+            expect(mockContext.ui.addItem).toHaveBeenCalledWith(expect.objectContaining({
+                type: MessageType.MCP_STATUS,
+                tools: allTools.map((tool) => ({
+                    serverName: tool.serverName,
+                    name: tool.name,
+                    description: tool.description,
+                    schema: tool.schema,
+                })),
+                resources: expect.arrayContaining([
+                    expect.objectContaining({
+                        serverName: 'server1',
+                        uri: 'file:///server1/resource1.txt',
+                    }),
+                ]),
+            }), expect.any(Number));
+        });
+        it('should display tool descriptions when desc argument is used', async () => {
+            const descSubCommand = mcpCommand.subCommands.find((c) => c.name === 'desc');
+            await descSubCommand.action(mockContext, '');
+            expect(mockContext.ui.addItem).toHaveBeenCalledWith(expect.objectContaining({
+                type: MessageType.MCP_STATUS,
+                showDescriptions: true,
+            }), expect.any(Number));
+        });
+        it('should not display descriptions when nodesc argument is used', async () => {
+            const listSubCommand = mcpCommand.subCommands.find((c) => c.name === 'list');
+            await listSubCommand.action(mockContext, '');
+            expect(mockContext.ui.addItem).toHaveBeenCalledWith(expect.objectContaining({
+                type: MessageType.MCP_STATUS,
+                showDescriptions: false,
+            }), expect.any(Number));
+        });
+    });
+});
+//# sourceMappingURL=mcpCommand.test.js.map

package/dist/src/ui/commands/mcpCommand.test.js.map

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

package/dist/src/ui/commands/memoryCommand.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { SlashCommand } from './types.js';
+export declare const memoryCommand: SlashCommand;

package/dist/src/ui/commands/memoryCommand.js

@@ -0,0 +1,108 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { getErrorMessage, refreshServerHierarchicalMemory, } from '@google/gemini-cli-core';
+import { MessageType } from '../types.js';
+import { CommandKind } from './types.js';
+export const memoryCommand = {
+    name: 'memory',
+    description: 'Commands for interacting with memory',
+    kind: CommandKind.BUILT_IN,
+    autoExecute: false,
+    subCommands: [
+        {
+            name: 'show',
+            description: 'Show the current memory contents',
+            kind: CommandKind.BUILT_IN,
+            autoExecute: true,
+            action: async (context) => {
+                const memoryContent = context.services.config?.getUserMemory() || '';
+                const fileCount = context.services.config?.getGeminiMdFileCount() || 0;
+                const messageContent = memoryContent.length > 0
+                    ? `Current memory content from ${fileCount} file(s):\n\n---\n${memoryContent}\n---`
+                    : 'Memory is currently empty.';
+                context.ui.addItem({
+                    type: MessageType.INFO,
+                    text: messageContent,
+                }, Date.now());
+            },
+        },
+        {
+            name: 'add',
+            description: 'Add content to the memory',
+            kind: CommandKind.BUILT_IN,
+            autoExecute: false,
+            action: (context, args) => {
+                if (!args || args.trim() === '') {
+                    return {
+                        type: 'message',
+                        messageType: 'error',
+                        content: 'Usage: /memory add <text to remember>',
+                    };
+                }
+                context.ui.addItem({
+                    type: MessageType.INFO,
+                    text: `Attempting to save to memory: "${args.trim()}"`,
+                }, Date.now());
+                return {
+                    type: 'tool',
+                    toolName: 'save_memory',
+                    toolArgs: { fact: args.trim() },
+                };
+            },
+        },
+        {
+            name: 'refresh',
+            description: 'Refresh the memory from the source',
+            kind: CommandKind.BUILT_IN,
+            autoExecute: true,
+            action: async (context) => {
+                context.ui.addItem({
+                    type: MessageType.INFO,
+                    text: 'Refreshing memory from source files...',
+                }, Date.now());
+                try {
+                    const config = await context.services.config;
+                    if (config) {
+                        const { memoryContent, fileCount } = await refreshServerHierarchicalMemory(config);
+                        await config.updateSystemInstructionIfInitialized();
+                        const successMessage = memoryContent.length > 0
+                            ? `Memory refreshed successfully. Loaded ${memoryContent.length} characters from ${fileCount} file(s).`
+                            : 'Memory refreshed successfully. No memory content found.';
+                        context.ui.addItem({
+                            type: MessageType.INFO,
+                            text: successMessage,
+                        }, Date.now());
+                    }
+                }
+                catch (error) {
+                    const errorMessage = getErrorMessage(error);
+                    context.ui.addItem({
+                        type: MessageType.ERROR,
+                        text: `Error refreshing memory: ${errorMessage}`,
+                    }, Date.now());
+                }
+            },
+        },
+        {
+            name: 'list',
+            description: 'Lists the paths of the COSTRICT.md files in use',
+            kind: CommandKind.BUILT_IN,
+            autoExecute: true,
+            action: async (context) => {
+                const filePaths = context.services.config?.getGeminiMdFilePaths() || [];
+                const fileCount = filePaths.length;
+                const messageContent = fileCount > 0
+                    ? `There are ${fileCount} COSTRICT.md file(s) in use:\n\n${filePaths.join('\n')}`
+                    : 'No COSTRICT.md files in use.';
+                context.ui.addItem({
+                    type: MessageType.INFO,
+                    text: messageContent,
+                }, Date.now());
+            },
+        },
+    ],
+};
+//# sourceMappingURL=memoryCommand.js.map

package/dist/src/ui/commands/memoryCommand.js.map

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

package/dist/src/ui/commands/memoryCommand.test.d.ts

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