@google/gemini-cli 0.10.0-nightly.20250926.1487841d → 0.10.0-nightly.20251009.cd354aeb

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

@@ -29,13 +29,13 @@ const getSavedChatTags = async (context, mtSortDesc) => {
                 const tagName = file.slice(file_head.length, -file_tail.length);
                 chatDetails.push({
                     name: decodeTagName(tagName),
-                    mtime: stats.mtime,
+                    mtime: stats.mtime.toISOString(),
                 });
             }
         }
         chatDetails.sort((a, b) => mtSortDesc
-            ? b.mtime.getTime() - a.mtime.getTime()
-            : a.mtime.getTime() - b.mtime.getTime());
+            ? b.mtime.localeCompare(a.mtime)
+            : a.mtime.localeCompare(b.mtime));
         return chatDetails;
     }
     catch (_err) {
@@ -48,28 +48,11 @@ const listCommand = {
     kind: CommandKind.BUILT_IN,
     action: async (context) => {
         const chatDetails = await getSavedChatTags(context, false);
-        if (chatDetails.length === 0) {
-            return {
-                type: 'message',
-                messageType: 'info',
-                content: 'No saved conversation checkpoints found.',
-            };
-        }
-        const maxNameLength = Math.max(...chatDetails.map((chat) => chat.name.length));
-        let message = 'List of saved conversations:\n\n';
-        for (const chat of chatDetails) {
-            const paddedName = chat.name.padEnd(maxNameLength, ' ');
-            const isoString = chat.mtime.toISOString();
-            const match = isoString.match(/(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2}:\d{2})/);
-            const formattedDate = match ? `${match[1]} ${match[2]}` : 'Invalid Date';
-            message += `  - \u001b[36m${paddedName}\u001b[0m  \u001b[90m(saved on ${formattedDate})\u001b[0m\n`;
-        }
-        message += `\n\u001b[90mNote: Newest last, oldest first\u001b[0m`;
-        return {
-            type: 'message',
-            messageType: 'info',
-            content: message,
+        const item = {
+            type: MessageType.CHAT_LIST,
+            chats: chatDetails,
         };
+        context.ui.addItem(item, Date.now());
     },
 };
 const saveCommand = {

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

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

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

@@ -3,10 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { requestConsentInteractive } from '../../config/extension.js';
-import { updateAllUpdatableExtensions, updateExtension, } from '../../config/extensions/update.js';
 import { getErrorMessage } from '../../utils/errors.js';
-import { ExtensionUpdateState } from '../state/extensions.js';
 import { MessageType } from '../types.js';
 import { CommandKind, } from './types.js';
 async function listAction(context) {
@@ -14,29 +11,46 @@ async function listAction(context) {
         type: MessageType.EXTENSIONS_LIST,
     }, Date.now());
 }
-async function updateAction(context, args) {
+function updateAction(context, args) {
     const updateArgs = args.split(' ').filter((value) => value.length > 0);
     const all = updateArgs.length === 1 && updateArgs[0] === '--all';
-    const names = all ? undefined : updateArgs;
-    let updateInfos = [];
+    const names = all ? null : updateArgs;
     if (!all && names?.length === 0) {
         context.ui.addItem({
             type: MessageType.ERROR,
             text: 'Usage: /extensions update <extension-names>|--all',
         }, Date.now());
-        return;
+        return Promise.resolve();
     }
+    let resolveUpdateComplete;
+    const updateComplete = new Promise((resolve) => (resolveUpdateComplete = resolve));
+    updateComplete.then((updateInfos) => {
+        if (updateInfos.length === 0) {
+            context.ui.addItem({
+                type: MessageType.INFO,
+                text: 'No extensions to update.',
+            }, Date.now());
+        }
+        context.ui.addItem({
+            type: MessageType.EXTENSIONS_LIST,
+        }, Date.now());
+        context.ui.setPendingItem(null);
+    });
     try {
         context.ui.setPendingItem({
             type: MessageType.EXTENSIONS_LIST,
         });
-        if (all) {
-            updateInfos = await updateAllUpdatableExtensions(context.services.config.getWorkingDir(), 
-            // We don't have the ability to prompt for consent yet in this flow.
-            (description) => requestConsentInteractive(description, context.ui.addItem), context.services.config.getExtensions(), context.ui.extensionsUpdateState, context.ui.setExtensionsUpdateState);
-        }
-        else if (names?.length) {
-            const workingDir = context.services.config.getWorkingDir();
+        context.ui.dispatchExtensionStateUpdate({
+            type: 'SCHEDULE_UPDATE',
+            payload: {
+                all,
+                names,
+                onComplete: (updateInfos) => {
+                    resolveUpdateComplete(updateInfos);
+                },
+            },
+        });
+        if (names?.length) {
             const extensions = context.services.config.getExtensions();
             for (const name of names) {
                 const extension = extensions.find((extension) => extension.name === name);
@@ -47,38 +61,17 @@ async function updateAction(context, args) {
                     }, Date.now());
                     continue;
                 }
-                const updateInfo = await updateExtension(extension, workingDir, (description) => requestConsentInteractive(description, context.ui.addItem), context.ui.extensionsUpdateState.get(extension.name) ??
-                    ExtensionUpdateState.UNKNOWN, (updateState) => {
-                    context.ui.setExtensionsUpdateState((prev) => {
-                        const newState = new Map(prev);
-                        newState.set(name, updateState);
-                        return newState;
-                    });
-                });
-                if (updateInfo)
-                    updateInfos.push(updateInfo);
             }
         }
-        if (updateInfos.length === 0) {
-            context.ui.addItem({
-                type: MessageType.INFO,
-                text: 'No extensions to update.',
-            }, Date.now());
-            return;
-        }
     }
     catch (error) {
+        resolveUpdateComplete([]);
         context.ui.addItem({
             type: MessageType.ERROR,
             text: getErrorMessage(error),
         }, Date.now());
     }
-    finally {
-        context.ui.addItem({
-            type: MessageType.EXTENSIONS_LIST,
-        }, Date.now());
-        context.ui.setPendingItem(null);
-    }
+    return updateComplete.then((_) => { });
 }
 const listExtensionsCommand = {
     name: 'list',
@@ -91,6 +84,15 @@ const updateExtensionsCommand = {
     description: 'Update extensions. Usage: update <extension-names>|--all',
     kind: CommandKind.BUILT_IN,
     action: updateAction,
+    completion: async (context, partialArg) => {
+        const extensions = context.services.config?.getExtensions() ?? [];
+        const extensionNames = extensions.map((ext) => ext.name);
+        const suggestions = extensionNames.filter((name) => name.startsWith(partialArg));
+        if ('--all'.startsWith(partialArg) || 'all'.startsWith(partialArg)) {
+            suggestions.unshift('--all');
+        }
+        return suggestions;
+    },
 };
 export const extensionsCommand = {
     name: 'extensions',

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

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

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

@@ -4,262 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { CommandKind } from './types.js';
-import { DiscoveredMCPTool, getMCPDiscoveryState, getMCPServerStatus, MCPDiscoveryState, MCPServerStatus, mcpServerRequiresOAuth, getErrorMessage, MCPOAuthTokenStorage, } from '@google/gemini-cli-core';
+import { DiscoveredMCPTool, getMCPDiscoveryState, getMCPServerStatus, MCPDiscoveryState, MCPServerStatus, getErrorMessage, MCPOAuthTokenStorage, } from '@google/gemini-cli-core';
 import { appEvents, AppEvent } from '../../utils/events.js';
-const COLOR_GREEN = '\u001b[32m';
-const COLOR_YELLOW = '\u001b[33m';
-const COLOR_RED = '\u001b[31m';
-const COLOR_CYAN = '\u001b[36m';
-const COLOR_GREY = '\u001b[90m';
-const RESET_COLOR = '\u001b[0m';
-const getMcpStatus = async (context, showDescriptions, showSchema, showTips = 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.getMcpServers() || {};
-    const serverNames = Object.keys(mcpServers);
-    const blockedMcpServers = config.getBlockedMcpServers() || [];
-    if (serverNames.length === 0 && blockedMcpServers.length === 0) {
-        const docsUrl = 'https://goo.gle/gemini-cli-docs-mcp';
-        return {
-            type: 'message',
-            messageType: 'info',
-            content: `No MCP servers configured. Please view MCP documentation in your browser: ${docsUrl} or use the cli /docs command`,
-        };
-    }
-    // Check if any servers are still connecting
-    const connectingServers = serverNames.filter((name) => getMCPServerStatus(name) === MCPServerStatus.CONNECTING);
-    const discoveryState = getMCPDiscoveryState();
-    let message = '';
-    // Add overall discovery status message if needed
-    if (discoveryState === MCPDiscoveryState.IN_PROGRESS ||
-        connectingServers.length > 0) {
-        message += `${COLOR_YELLOW}⏳ MCP servers are starting up (${connectingServers.length} initializing)...${RESET_COLOR}\n`;
-        message += `${COLOR_CYAN}Note: First startup may take longer. Tool availability will update automatically.${RESET_COLOR}\n\n`;
-    }
-    message += 'Configured MCP servers:\n\n';
-    const allTools = toolRegistry.getAllTools();
-    for (const serverName of serverNames) {
-        const serverTools = allTools.filter((tool) => tool instanceof DiscoveredMCPTool && tool.serverName === serverName);
-        const promptRegistry = await config.getPromptRegistry();
-        const serverPrompts = promptRegistry.getPromptsByServer(serverName) || [];
-        const originalStatus = getMCPServerStatus(serverName);
-        const hasCachedItems = serverTools.length > 0 || serverPrompts.length > 0;
-        // If the server is "disconnected" but has prompts or cached tools, display it as Ready
-        // by using CONNECTED as the display status.
-        const status = originalStatus === MCPServerStatus.DISCONNECTED && hasCachedItems
-            ? MCPServerStatus.CONNECTED
-            : originalStatus;
-        // Add status indicator with descriptive text
-        let statusIndicator = '';
-        let statusText = '';
-        switch (status) {
-            case MCPServerStatus.CONNECTED:
-                statusIndicator = '🟢';
-                statusText = 'Ready';
-                break;
-            case MCPServerStatus.CONNECTING:
-                statusIndicator = '🔄';
-                statusText = 'Starting... (first startup may take longer)';
-                break;
-            case MCPServerStatus.DISCONNECTED:
-            default:
-                statusIndicator = '🔴';
-                statusText = 'Disconnected';
-                break;
-        }
-        // Get server description if available
-        const server = mcpServers[serverName];
-        let serverDisplayName = serverName;
-        if (server.extensionName) {
-            serverDisplayName += ` (from ${server.extensionName})`;
-        }
-        // Format server header with bold formatting and status
-        message += `${statusIndicator} \u001b[1m${serverDisplayName}\u001b[0m - ${statusText}`;
-        let needsAuthHint = mcpServerRequiresOAuth.get(serverName) || false;
-        // Add OAuth status if applicable
-        if (server?.oauth?.enabled) {
-            needsAuthHint = true;
-            try {
-                const { MCPOAuthTokenStorage } = await import('@google/gemini-cli-core');
-                const tokenStorage = new MCPOAuthTokenStorage();
-                const hasToken = await tokenStorage.getCredentials(serverName);
-                if (hasToken) {
-                    const isExpired = tokenStorage.isTokenExpired(hasToken.token);
-                    if (isExpired) {
-                        message += ` ${COLOR_YELLOW}(OAuth token expired)${RESET_COLOR}`;
-                    }
-                    else {
-                        message += ` ${COLOR_GREEN}(OAuth authenticated)${RESET_COLOR}`;
-                        needsAuthHint = false;
-                    }
-                }
-                else {
-                    message += ` ${COLOR_RED}(OAuth not authenticated)${RESET_COLOR}`;
-                }
-            }
-            catch (_err) {
-                // If we can't check OAuth status, just continue
-            }
-        }
-        // Add tool count with conditional messaging
-        if (status === MCPServerStatus.CONNECTED) {
-            const parts = [];
-            if (serverTools.length > 0) {
-                parts.push(`${serverTools.length} ${serverTools.length === 1 ? 'tool' : 'tools'}`);
-            }
-            if (serverPrompts.length > 0) {
-                parts.push(`${serverPrompts.length} ${serverPrompts.length === 1 ? 'prompt' : 'prompts'}`);
-            }
-            if (parts.length > 0) {
-                message += ` (${parts.join(', ')})`;
-            }
-            else {
-                message += ` (0 tools)`;
-            }
-        }
-        else if (status === MCPServerStatus.CONNECTING) {
-            message += ` (tools and prompts will appear when ready)`;
-        }
-        else {
-            message += ` (${serverTools.length} tools cached)`;
-        }
-        // Add server description with proper handling of multi-line descriptions
-        if (showDescriptions && server?.description) {
-            const descLines = server.description.trim().split('\n');
-            if (descLines) {
-                message += ':\n';
-                for (const descLine of descLines) {
-                    message += `    ${COLOR_GREEN}${descLine}${RESET_COLOR}\n`;
-                }
-            }
-            else {
-                message += '\n';
-            }
-        }
-        else {
-            message += '\n';
-        }
-        // Reset formatting after server entry
-        message += RESET_COLOR;
-        if (serverTools.length > 0) {
-            message += `  ${COLOR_CYAN}Tools:${RESET_COLOR}\n`;
-            serverTools.forEach((tool) => {
-                if (showDescriptions && tool.description) {
-                    // Format tool name in cyan using simple ANSI cyan color
-                    message += `  - ${COLOR_CYAN}${tool.name}${RESET_COLOR}`;
-                    // Handle multi-line descriptions by properly indenting and preserving formatting
-                    const descLines = tool.description.trim().split('\n');
-                    if (descLines) {
-                        message += ':\n';
-                        for (const descLine of descLines) {
-                            message += `      ${COLOR_GREEN}${descLine}${RESET_COLOR}\n`;
-                        }
-                    }
-                    else {
-                        message += '\n';
-                    }
-                    // Reset is handled inline with each line now
-                }
-                else {
-                    // Use cyan color for the tool name even when not showing descriptions
-                    message += `  - ${COLOR_CYAN}${tool.name}${RESET_COLOR}\n`;
-                }
-                const parameters = tool.schema.parametersJsonSchema ?? tool.schema.parameters;
-                if (showSchema && parameters) {
-                    // Prefix the parameters in cyan
-                    message += `    ${COLOR_CYAN}Parameters:${RESET_COLOR}\n`;
-                    const paramsLines = JSON.stringify(parameters, null, 2)
-                        .trim()
-                        .split('\n');
-                    if (paramsLines) {
-                        for (const paramsLine of paramsLines) {
-                            message += `      ${COLOR_GREEN}${paramsLine}${RESET_COLOR}\n`;
-                        }
-                    }
-                }
-            });
-        }
-        if (serverPrompts.length > 0) {
-            if (serverTools.length > 0) {
-                message += '\n';
-            }
-            message += `  ${COLOR_CYAN}Prompts:${RESET_COLOR}\n`;
-            serverPrompts.forEach((prompt) => {
-                if (showDescriptions && prompt.description) {
-                    message += `  - ${COLOR_CYAN}${prompt.name}${RESET_COLOR}`;
-                    const descLines = prompt.description.trim().split('\n');
-                    if (descLines) {
-                        message += ':\n';
-                        for (const descLine of descLines) {
-                            message += `      ${COLOR_GREEN}${descLine}${RESET_COLOR}\n`;
-                        }
-                    }
-                    else {
-                        message += '\n';
-                    }
-                }
-                else {
-                    message += `  - ${COLOR_CYAN}${prompt.name}${RESET_COLOR}\n`;
-                }
-            });
-        }
-        if (serverTools.length === 0 && serverPrompts.length === 0) {
-            message += '  No tools or prompts available\n';
-        }
-        else if (serverTools.length === 0) {
-            message += '  No tools available';
-            if (originalStatus === MCPServerStatus.DISCONNECTED && needsAuthHint) {
-                message += ` ${COLOR_GREY}(type: "/mcp auth ${serverName}" to authenticate this server)${RESET_COLOR}`;
-            }
-            message += '\n';
-        }
-        else if (originalStatus === MCPServerStatus.DISCONNECTED &&
-            needsAuthHint) {
-            // This case is for when serverTools.length > 0
-            message += `  ${COLOR_GREY}(type: "/mcp auth ${serverName}" to authenticate this server)${RESET_COLOR}\n`;
-        }
-        message += '\n';
-    }
-    for (const server of blockedMcpServers) {
-        let serverDisplayName = server.name;
-        if (server.extensionName) {
-            serverDisplayName += ` (from ${server.extensionName})`;
-        }
-        message += `🔴 \u001b[1m${serverDisplayName}\u001b[0m - Blocked\n\n`;
-    }
-    // Add helpful tips when no arguments are provided
-    if (showTips) {
-        message += '\n';
-        message += `${COLOR_CYAN}💡 Tips:${RESET_COLOR}\n`;
-        message += `  • Use ${COLOR_CYAN}/mcp desc${RESET_COLOR} to show server and tool descriptions\n`;
-        message += `  • Use ${COLOR_CYAN}/mcp schema${RESET_COLOR} to show tool parameter schemas\n`;
-        message += `  • Use ${COLOR_CYAN}/mcp nodesc${RESET_COLOR} to hide descriptions\n`;
-        message += `  • Use ${COLOR_CYAN}/mcp auth <server-name>${RESET_COLOR} to authenticate with OAuth-enabled servers\n`;
-        message += `  • Press ${COLOR_CYAN}Ctrl+T${RESET_COLOR} to toggle tool descriptions on/off\n`;
-        message += '\n';
-    }
-    // Make sure to reset any ANSI formatting at the end to prevent it from affecting the terminal
-    message += RESET_COLOR;
-    return {
-        type: 'message',
-        messageType: 'info',
-        content: message,
-    };
-};
+import { MessageType } from '../types.js';
 const authCommand = {
     name: 'auth',
     description: 'Authenticate with an OAuth-enabled MCP server',
@@ -371,17 +118,88 @@ const listCommand = {
     description: 'List configured MCP servers and tools',
     kind: CommandKind.BUILT_IN,
     action: async (context, args) => {
+        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 lowerCaseArgs = args.toLowerCase().split(/\s+/).filter(Boolean);
         const hasDesc = lowerCaseArgs.includes('desc') || lowerCaseArgs.includes('descriptions');
         const hasNodesc = lowerCaseArgs.includes('nodesc') ||
             lowerCaseArgs.includes('nodescriptions');
         const showSchema = lowerCaseArgs.includes('schema');
-        // Show descriptions if `desc` or `schema` is present,
-        // but `nodesc` takes precedence and disables them.
         const showDescriptions = !hasNodesc && (hasDesc || showSchema);
-        // Show tips only when no arguments are provided
         const showTips = lowerCaseArgs.length === 0;
-        return getMcpStatus(context, showDescriptions, showSchema, showTips);
+        const mcpServers = config.getMcpServers() || {};
+        const serverNames = Object.keys(mcpServers);
+        const blockedMcpServers = config.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 authStatus = {};
+        const tokenStorage = new MCPOAuthTokenStorage();
+        for (const serverName of serverNames) {
+            const server = mcpServers[serverName];
+            if (server.oauth?.enabled) {
+                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,
+            })),
+            authStatus,
+            blockedServers: blockedMcpServers,
+            discoveryInProgress,
+            connectingServers,
+            showDescriptions,
+            showSchema,
+            showTips,
+        };
+        context.ui.addItem(mcpStatusItem, Date.now());
     },
 };
 const refreshCommand = {
@@ -417,7 +235,7 @@ const refreshCommand = {
         }
         // Reload the slash commands to reflect the changes.
         context.ui.reloadCommands();
-        return getMcpStatus(context, false, false, false);
+        return listCommand.action(context, '');
     },
 };
 export const mcpCommand = {