@google/gemini-cli 0.21.0-nightly.20251203.533a3fb31 → 0.21.0-nightly.20251205.f4f2bcbd9

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

@@ -0,0 +1,396 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { hooksCommand } from './hooksCommand.js';
+import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { MessageType } from '../types.js';
+import { HookType, HookEventName, ConfigSource } from '@google/gemini-cli-core';
+describe('hooksCommand', () => {
+    let mockContext;
+    let mockHookSystem;
+    let mockConfig;
+    let mockSettings;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        // Create mock hook system
+        mockHookSystem = {
+            getAllHooks: vi.fn().mockReturnValue([]),
+            setHookEnabled: vi.fn(),
+            getRegistry: vi.fn().mockReturnValue({
+                initialize: vi.fn().mockResolvedValue(undefined),
+            }),
+        };
+        // Create mock config
+        mockConfig = {
+            getHookSystem: vi.fn().mockReturnValue(mockHookSystem),
+        };
+        // Create mock settings
+        mockSettings = {
+            merged: {
+                hooks: {
+                    disabled: [],
+                },
+            },
+            setValue: vi.fn(),
+        };
+        // Create mock context with config and settings
+        mockContext = createMockCommandContext({
+            services: {
+                config: mockConfig,
+                settings: mockSettings,
+            },
+        });
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    describe('root command', () => {
+        it('should have the correct name and description', () => {
+            expect(hooksCommand.name).toBe('hooks');
+            expect(hooksCommand.description).toBe('Manage hooks');
+        });
+        it('should have all expected subcommands', () => {
+            expect(hooksCommand.subCommands).toBeDefined();
+            expect(hooksCommand.subCommands).toHaveLength(3);
+            const subCommandNames = hooksCommand.subCommands.map((cmd) => cmd.name);
+            expect(subCommandNames).toContain('panel');
+            expect(subCommandNames).toContain('enable');
+            expect(subCommandNames).toContain('disable');
+        });
+        it('should delegate to panel action when invoked without subcommand', async () => {
+            if (!hooksCommand.action) {
+                throw new Error('hooks command must have an action');
+            }
+            mockHookSystem.getAllHooks.mockReturnValue([
+                createMockHook('test-hook', HookEventName.BeforeTool, true),
+            ]);
+            await hooksCommand.action(mockContext, '');
+            expect(mockContext.ui.addItem).toHaveBeenCalledWith(expect.objectContaining({
+                type: MessageType.HOOKS_LIST,
+            }), expect.any(Number));
+        });
+    });
+    describe('panel subcommand', () => {
+        it('should return error when config is not loaded', async () => {
+            const contextWithoutConfig = createMockCommandContext({
+                services: {
+                    config: null,
+                },
+            });
+            const panelCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'panel');
+            if (!panelCmd?.action) {
+                throw new Error('panel command must have an action');
+            }
+            const result = await panelCmd.action(contextWithoutConfig, '');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Config not loaded.',
+            });
+        });
+        it('should return info message when hook system is not enabled', async () => {
+            mockConfig.getHookSystem.mockReturnValue(null);
+            const panelCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'panel');
+            if (!panelCmd?.action) {
+                throw new Error('panel command must have an action');
+            }
+            const result = await panelCmd.action(mockContext, '');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'info',
+                content: 'Hook system is not enabled. Enable it in settings with tools.enableHooks',
+            });
+        });
+        it('should return info message when no hooks are configured', async () => {
+            mockHookSystem.getAllHooks.mockReturnValue([]);
+            const panelCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'panel');
+            if (!panelCmd?.action) {
+                throw new Error('panel command must have an action');
+            }
+            const result = await panelCmd.action(mockContext, '');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'info',
+                content: 'No hooks configured. Add hooks to your settings to get started.',
+            });
+        });
+        it('should display hooks list when hooks are configured', async () => {
+            const mockHooks = [
+                createMockHook('echo-test', HookEventName.BeforeTool, true),
+                createMockHook('notify', HookEventName.AfterAgent, false),
+            ];
+            mockHookSystem.getAllHooks.mockReturnValue(mockHooks);
+            const panelCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'panel');
+            if (!panelCmd?.action) {
+                throw new Error('panel command must have an action');
+            }
+            await panelCmd.action(mockContext, '');
+            expect(mockContext.ui.addItem).toHaveBeenCalledWith(expect.objectContaining({
+                type: MessageType.HOOKS_LIST,
+                hooks: mockHooks,
+            }), expect.any(Number));
+        });
+    });
+    describe('enable subcommand', () => {
+        it('should return error when config is not loaded', async () => {
+            const contextWithoutConfig = createMockCommandContext({
+                services: {
+                    config: null,
+                },
+            });
+            const enableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'enable');
+            if (!enableCmd?.action) {
+                throw new Error('enable command must have an action');
+            }
+            const result = await enableCmd.action(contextWithoutConfig, 'test-hook');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Config not loaded.',
+            });
+        });
+        it('should return error when hook system is not enabled', async () => {
+            mockConfig.getHookSystem.mockReturnValue(null);
+            const enableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'enable');
+            if (!enableCmd?.action) {
+                throw new Error('enable command must have an action');
+            }
+            const result = await enableCmd.action(mockContext, 'test-hook');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Hook system is not enabled.',
+            });
+        });
+        it('should return error when hook name is not provided', async () => {
+            const enableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'enable');
+            if (!enableCmd?.action) {
+                throw new Error('enable command must have an action');
+            }
+            const result = await enableCmd.action(mockContext, '');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Usage: /hooks enable <hook-name>',
+            });
+        });
+        it('should enable a hook and update settings', async () => {
+            // Update the context's settings with disabled hooks
+            mockContext.services.settings.merged.hooks = {
+                disabled: ['test-hook', 'other-hook'],
+            };
+            const enableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'enable');
+            if (!enableCmd?.action) {
+                throw new Error('enable command must have an action');
+            }
+            const result = await enableCmd.action(mockContext, 'test-hook');
+            expect(mockContext.services.settings.setValue).toHaveBeenCalledWith(expect.any(String), 'hooks.disabled', ['other-hook']);
+            expect(mockHookSystem.setHookEnabled).toHaveBeenCalledWith('test-hook', true);
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'info',
+                content: 'Hook "test-hook" enabled successfully.',
+            });
+        });
+        it('should handle error when enabling hook fails', async () => {
+            mockSettings.setValue.mockImplementationOnce(() => {
+                throw new Error('Failed to save settings');
+            });
+            const enableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'enable');
+            if (!enableCmd?.action) {
+                throw new Error('enable command must have an action');
+            }
+            const result = await enableCmd.action(mockContext, 'test-hook');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Failed to enable hook: Failed to save settings',
+            });
+        });
+    });
+    describe('disable subcommand', () => {
+        it('should return error when config is not loaded', async () => {
+            const contextWithoutConfig = createMockCommandContext({
+                services: {
+                    config: null,
+                },
+            });
+            const disableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'disable');
+            if (!disableCmd?.action) {
+                throw new Error('disable command must have an action');
+            }
+            const result = await disableCmd.action(contextWithoutConfig, 'test-hook');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Config not loaded.',
+            });
+        });
+        it('should return error when hook system is not enabled', async () => {
+            mockConfig.getHookSystem.mockReturnValue(null);
+            const disableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'disable');
+            if (!disableCmd?.action) {
+                throw new Error('disable command must have an action');
+            }
+            const result = await disableCmd.action(mockContext, 'test-hook');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Hook system is not enabled.',
+            });
+        });
+        it('should return error when hook name is not provided', async () => {
+            const disableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'disable');
+            if (!disableCmd?.action) {
+                throw new Error('disable command must have an action');
+            }
+            const result = await disableCmd.action(mockContext, '');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Usage: /hooks disable <hook-name>',
+            });
+        });
+        it('should disable a hook and update settings', async () => {
+            mockContext.services.settings.merged.hooks = {
+                disabled: [],
+            };
+            const disableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'disable');
+            if (!disableCmd?.action) {
+                throw new Error('disable command must have an action');
+            }
+            const result = await disableCmd.action(mockContext, 'test-hook');
+            expect(mockContext.services.settings.setValue).toHaveBeenCalledWith(expect.any(String), 'hooks.disabled', ['test-hook']);
+            expect(mockHookSystem.setHookEnabled).toHaveBeenCalledWith('test-hook', false);
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'info',
+                content: 'Hook "test-hook" disabled successfully.',
+            });
+        });
+        it('should return info when hook is already disabled', async () => {
+            // Update the context's settings with the hook already disabled
+            mockContext.services.settings.merged.hooks = {
+                disabled: ['test-hook'],
+            };
+            const disableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'disable');
+            if (!disableCmd?.action) {
+                throw new Error('disable command must have an action');
+            }
+            const result = await disableCmd.action(mockContext, 'test-hook');
+            expect(mockContext.services.settings.setValue).not.toHaveBeenCalled();
+            expect(mockHookSystem.setHookEnabled).not.toHaveBeenCalled();
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'info',
+                content: 'Hook "test-hook" is already disabled.',
+            });
+        });
+        it('should handle error when disabling hook fails', async () => {
+            mockContext.services.settings.merged.hooks = {
+                disabled: [],
+            };
+            mockSettings.setValue.mockImplementationOnce(() => {
+                throw new Error('Failed to save settings');
+            });
+            const disableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'disable');
+            if (!disableCmd?.action) {
+                throw new Error('disable command must have an action');
+            }
+            const result = await disableCmd.action(mockContext, 'test-hook');
+            expect(result).toEqual({
+                type: 'message',
+                messageType: 'error',
+                content: 'Failed to disable hook: Failed to save settings',
+            });
+        });
+    });
+    describe('completion', () => {
+        it('should return empty array when config is not available', () => {
+            const contextWithoutConfig = createMockCommandContext({
+                services: {
+                    config: null,
+                },
+            });
+            const enableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'enable');
+            if (!enableCmd?.completion) {
+                throw new Error('enable command must have completion');
+            }
+            const result = enableCmd.completion(contextWithoutConfig, 'test');
+            expect(result).toEqual([]);
+        });
+        it('should return empty array when hook system is not enabled', () => {
+            mockConfig.getHookSystem.mockReturnValue(null);
+            const enableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'enable');
+            if (!enableCmd?.completion) {
+                throw new Error('enable command must have completion');
+            }
+            const result = enableCmd.completion(mockContext, 'test');
+            expect(result).toEqual([]);
+        });
+        it('should return matching hook names', () => {
+            const mockHooks = [
+                createMockHook('test-hook-1', HookEventName.BeforeTool, true),
+                createMockHook('test-hook-2', HookEventName.AfterTool, true),
+                createMockHook('other-hook', HookEventName.AfterAgent, false),
+            ];
+            mockHookSystem.getAllHooks.mockReturnValue(mockHooks);
+            const enableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'enable');
+            if (!enableCmd?.completion) {
+                throw new Error('enable command must have completion');
+            }
+            const result = enableCmd.completion(mockContext, 'test');
+            expect(result).toEqual(['test-hook-1', 'test-hook-2']);
+        });
+        it('should return all hook names when partial is empty', () => {
+            const mockHooks = [
+                createMockHook('hook-1', HookEventName.BeforeTool, true),
+                createMockHook('hook-2', HookEventName.AfterTool, true),
+            ];
+            mockHookSystem.getAllHooks.mockReturnValue(mockHooks);
+            const enableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'enable');
+            if (!enableCmd?.completion) {
+                throw new Error('enable command must have completion');
+            }
+            const result = enableCmd.completion(mockContext, '');
+            expect(result).toEqual(['hook-1', 'hook-2']);
+        });
+        it('should handle hooks without command name gracefully', () => {
+            const mockHooks = [
+                createMockHook('test-hook', HookEventName.BeforeTool, true),
+                {
+                    ...createMockHook('', HookEventName.AfterTool, true),
+                    config: { command: '', type: HookType.Command, timeout: 30 },
+                },
+            ];
+            mockHookSystem.getAllHooks.mockReturnValue(mockHooks);
+            const enableCmd = hooksCommand.subCommands.find((cmd) => cmd.name === 'enable');
+            if (!enableCmd?.completion) {
+                throw new Error('enable command must have completion');
+            }
+            const result = enableCmd.completion(mockContext, 'test');
+            expect(result).toEqual(['test-hook']);
+        });
+    });
+});
+/**
+ * Helper function to create a mock HookRegistryEntry
+ */
+function createMockHook(command, eventName, enabled) {
+    return {
+        config: {
+            command,
+            type: HookType.Command,
+            timeout: 30,
+        },
+        source: ConfigSource.Project,
+        eventName,
+        matcher: undefined,
+        sequential: false,
+        enabled,
+    };
+}
+//# sourceMappingURL=hooksCommand.test.js.map

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

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

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

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

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { CommandKind } from './types.js';
-import { DiscoveredMCPTool, getMCPDiscoveryState, getMCPServerStatus, MCPDiscoveryState, MCPServerStatus, getErrorMessage, MCPOAuthTokenStorage, } from '@google/gemini-cli-core';
+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 = {
@@ -24,11 +24,18 @@ const authCommand = {
         }
         const mcpServers = config.getMcpClientManager()?.getMcpServers() ?? {};
         if (!serverName) {
-            // List servers that support OAuth
-            const oauthServers = Object.entries(mcpServers)
+            // 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);
-            if (oauthServers.length === 0) {
+            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',
@@ -38,7 +45,7 @@ const authCommand = {
             return {
                 type: 'message',
                 messageType: 'info',
-                content: `MCP servers with OAuth authentication:\n${oauthServers.map((s) => `  - ${s}`).join('\n')}\n\nUse /mcp auth <server-name> to authenticate.`,
+                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];
@@ -149,7 +156,8 @@ const listAction = async (context, showDescriptions = false, showSchema = false)
     const tokenStorage = new MCPOAuthTokenStorage();
     for (const serverName of serverNames) {
         const server = mcpServers[serverName];
-        if (server.oauth?.enabled) {
+        // 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()) {

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

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

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

@@ -3,6 +3,6 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { type Config } from '@google/gemini-cli-core';
 import { type SlashCommand } from './types.js';
-import type { Config } from '@google/gemini-cli-core';
 export declare const restoreCommand: (config: Config | null) => SlashCommand | null;

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

@@ -5,7 +5,31 @@
  */
 import * as fs from 'node:fs/promises';
 import path from 'node:path';
+import { z } from 'zod';
+import { performRestore, } from '@google/gemini-cli-core';
 import { CommandKind, } from './types.js';
+const HistoryItemSchema = z
+    .object({
+    type: z.string(),
+    id: z.number(),
+})
+    .passthrough();
+const ContentSchema = z
+    .object({
+    role: z.string().optional(),
+    parts: z.array(z.record(z.unknown())),
+})
+    .passthrough();
+const ToolCallDataSchema = z.object({
+    history: z.array(HistoryItemSchema).optional(),
+    clientHistory: z.array(ContentSchema).optional(),
+    commitHash: z.string().optional(),
+    toolCall: z.object({
+        name: z.string(),
+        args: z.record(z.unknown()),
+    }),
+    messageId: z.string().optional(),
+});
 async function restoreAction(context, args) {
     const { services, ui } = context;
     const { config, git: gitService } = services;
@@ -56,27 +80,34 @@ async function restoreAction(context, args) {
         }
         const filePath = path.join(checkpointDir, selectedFile);
         const data = await fs.readFile(filePath, 'utf-8');
-        const toolCallData = JSON.parse(data);
-        if (toolCallData.history) {
-            if (!loadHistory) {
-                // This should not happen
-                return {
-                    type: 'message',
-                    messageType: 'error',
-                    content: 'loadHistory function is not available.',
-                };
-            }
-            loadHistory(toolCallData.history);
-        }
-        if (toolCallData.clientHistory) {
-            await config?.getGeminiClient()?.setHistory(toolCallData.clientHistory);
+        const parseResult = ToolCallDataSchema.safeParse(JSON.parse(data));
+        if (!parseResult.success) {
+            return {
+                type: 'message',
+                messageType: 'error',
+                content: `Checkpoint file is invalid: ${parseResult.error.message}`,
+            };
         }
-        if (toolCallData.commitHash) {
-            await gitService?.restoreProjectFromSnapshot(toolCallData.commitHash);
-            addItem({
-                type: 'info',
-                text: 'Restored project to the state before the tool call.',
-            }, Date.now());
+        // We safely cast here because:
+        // 1. ToolCallDataSchema strictly validates the existence of 'history' as an array and 'id'/'type' on each item.
+        // 2. We trust that files valid according to this schema (written by useGeminiStream) contain the full HistoryItem structure.
+        const toolCallData = parseResult.data;
+        const actionStream = performRestore(toolCallData, gitService);
+        for await (const action of actionStream) {
+            if (action.type === 'message') {
+                addItem({
+                    type: action.messageType,
+                    text: action.content,
+                }, Date.now());
+            }
+            else if (action.type === 'load_history' && loadHistory) {
+                loadHistory(action.history);
+                if (action.clientHistory) {
+                    await config
+                        ?.getGeminiClient()
+                        ?.setHistory(action.clientHistory);
+                }
+            }
         }
         return {
             type: 'tool',