From c313c3dee1872a0edc943ad096eab68a03a3dda5 Mon Sep 17 00:00:00 2001 From: haroldmciver-go Date: Mon, 14 Jul 2025 12:22:37 -0400 Subject: [PATCH] updated '/auth' to use new slash command arch (#3797) Co-authored-by: Abhi <43648792+abhipatel12@users.noreply.github.com> --- .../cli/src/services/CommandService.test.ts | 14 +++++--- packages/cli/src/services/CommandService.ts | 2 ++ .../cli/src/ui/commands/authCommand.test.ts | 36 +++++++++++++++++++ packages/cli/src/ui/commands/authCommand.ts | 16 +++++++++ packages/cli/src/ui/commands/types.ts | 3 +- .../ui/hooks/slashCommandProcessor.test.ts | 27 ++++++++++++++ .../cli/src/ui/hooks/slashCommandProcessor.ts | 10 +++--- 7 files changed, 96 insertions(+), 12 deletions(-) create mode 100644 packages/cli/src/ui/commands/authCommand.test.ts create mode 100644 packages/cli/src/ui/commands/authCommand.ts diff --git a/packages/cli/src/services/CommandService.test.ts b/packages/cli/src/services/CommandService.test.ts index e479a2ac..a7528b58 100644 --- a/packages/cli/src/services/CommandService.test.ts +++ b/packages/cli/src/services/CommandService.test.ts @@ -10,6 +10,7 @@ import { type SlashCommand } from '../ui/commands/types.js'; import { memoryCommand } from '../ui/commands/memoryCommand.js'; import { helpCommand } from '../ui/commands/helpCommand.js'; import { clearCommand } from '../ui/commands/clearCommand.js'; +import { authCommand } from '../ui/commands/authCommand.js'; import { themeCommand } from '../ui/commands/themeCommand.js'; // Mock the command modules to isolate the service from the command implementations. @@ -22,6 +23,9 @@ vi.mock('../ui/commands/helpCommand.js', () => ({ vi.mock('../ui/commands/clearCommand.js', () => ({ clearCommand: { name: 'clear', description: 'Mock Clear' }, })); +vi.mock('../ui/commands/authCommand.js', () => ({ + authCommand: { name: 'auth', description: 'Mock Auth' }, +})); vi.mock('../ui/commands/themeCommand.js', () => ({ themeCommand: { name: 'theme', description: 'Mock Theme' }, })); @@ -50,9 +54,10 @@ describe('CommandService', () => { const tree = commandService.getCommands(); // Post-condition assertions - expect(tree.length).toBe(4); + expect(tree.length).toBe(5); const commandNames = tree.map((cmd) => cmd.name); + expect(commandNames).toContain('auth'); expect(commandNames).toContain('memory'); expect(commandNames).toContain('help'); expect(commandNames).toContain('clear'); @@ -62,14 +67,14 @@ describe('CommandService', () => { it('should overwrite any existing commands when called again', async () => { // Load once await commandService.loadCommands(); - expect(commandService.getCommands().length).toBe(4); + expect(commandService.getCommands().length).toBe(5); // Load again await commandService.loadCommands(); const tree = commandService.getCommands(); // Should not append, but overwrite - expect(tree.length).toBe(4); + expect(tree.length).toBe(5); }); }); @@ -81,8 +86,9 @@ describe('CommandService', () => { await commandService.loadCommands(); const loadedTree = commandService.getCommands(); - expect(loadedTree.length).toBe(4); + expect(loadedTree.length).toBe(5); expect(loadedTree).toEqual([ + authCommand, clearCommand, helpCommand, memoryCommand, diff --git a/packages/cli/src/services/CommandService.ts b/packages/cli/src/services/CommandService.ts index 45b10618..97784e18 100644 --- a/packages/cli/src/services/CommandService.ts +++ b/packages/cli/src/services/CommandService.ts @@ -8,9 +8,11 @@ import { SlashCommand } from '../ui/commands/types.js'; import { memoryCommand } from '../ui/commands/memoryCommand.js'; import { helpCommand } from '../ui/commands/helpCommand.js'; import { clearCommand } from '../ui/commands/clearCommand.js'; +import { authCommand } from '../ui/commands/authCommand.js'; import { themeCommand } from '../ui/commands/themeCommand.js'; const loadBuiltInCommands = async (): Promise => [ + authCommand, clearCommand, helpCommand, memoryCommand, diff --git a/packages/cli/src/ui/commands/authCommand.test.ts b/packages/cli/src/ui/commands/authCommand.test.ts new file mode 100644 index 00000000..d6d925db --- /dev/null +++ b/packages/cli/src/ui/commands/authCommand.test.ts @@ -0,0 +1,36 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { describe, it, expect, beforeEach } from 'vitest'; +import { authCommand } from './authCommand.js'; +import { type CommandContext } from './types.js'; +import { createMockCommandContext } from '../../test-utils/mockCommandContext.js'; + +describe('authCommand', () => { + let mockContext: CommandContext; + + beforeEach(() => { + mockContext = createMockCommandContext(); + }); + + it('should return a dialog action to open the auth dialog', () => { + if (!authCommand.action) { + throw new Error('The auth command must have an action.'); + } + + const result = authCommand.action(mockContext, ''); + + expect(result).toEqual({ + type: 'dialog', + dialog: 'auth', + }); + }); + + it('should have the correct name and description', () => { + expect(authCommand.name).toBe('auth'); + expect(authCommand.description).toBe('change the auth method'); + }); +}); diff --git a/packages/cli/src/ui/commands/authCommand.ts b/packages/cli/src/ui/commands/authCommand.ts new file mode 100644 index 00000000..29bd2c9d --- /dev/null +++ b/packages/cli/src/ui/commands/authCommand.ts @@ -0,0 +1,16 @@ +/** + * @license + * Copyright 2025 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +import { OpenDialogActionReturn, SlashCommand } from './types.js'; + +export const authCommand: SlashCommand = { + name: 'auth', + description: 'change the auth method', + action: (_context, _args): OpenDialogActionReturn => ({ + type: 'dialog', + dialog: 'auth', + }), +}; diff --git a/packages/cli/src/ui/commands/types.ts b/packages/cli/src/ui/commands/types.ts index 9aad3399..b35374a8 100644 --- a/packages/cli/src/ui/commands/types.ts +++ b/packages/cli/src/ui/commands/types.ts @@ -66,14 +66,13 @@ export interface MessageActionReturn { export interface OpenDialogActionReturn { type: 'dialog'; // TODO: Add 'theme' | 'auth' | 'editor' | 'privacy' as migration happens. - dialog: 'help' | 'theme'; + dialog: 'help' | 'auth' | 'theme'; } export type SlashCommandActionReturn = | ToolActionReturn | MessageActionReturn | OpenDialogActionReturn; - // The standardized contract for any command in the system. export interface SlashCommand { name: string; diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts index 563092a2..d920117d 100644 --- a/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts +++ b/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts @@ -507,6 +507,33 @@ describe('useSlashCommandProcessor', () => { expect(commandResult).toEqual({ type: 'handled' }); }); + it('should open the auth dialog when a new command returns an auth dialog action', async () => { + const mockAction = vi.fn().mockResolvedValue({ + type: 'dialog', + dialog: 'auth', + }); + const newAuthCommand: SlashCommand = { name: 'auth', action: mockAction }; + + const mockLoader = async () => [newAuthCommand]; + const commandServiceInstance = new ActualCommandService(mockLoader); + vi.mocked(CommandService).mockImplementation( + () => commandServiceInstance, + ); + + const { result } = getProcessorHook(); + await vi.waitFor(() => { + expect( + result.current.slashCommands.some((c) => c.name === 'auth'), + ).toBe(true); + }); + + const commandResult = await result.current.handleSlashCommand('/auth'); + + expect(mockAction).toHaveBeenCalledTimes(1); + expect(mockOpenAuthDialog).toHaveBeenCalledWith(); + expect(commandResult).toEqual({ type: 'handled' }); + }); + it('should open the theme dialog when a new command returns a theme dialog action', async () => { const mockAction = vi.fn().mockResolvedValue({ type: 'dialog', diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.ts index 59f748bf..3a071fab 100644 --- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts +++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts @@ -242,11 +242,6 @@ export const useSlashCommandProcessor = ( } }, }, - { - name: 'auth', - description: 'change the auth method', - action: (_mainCommand, _subCommand, _args) => openAuthDialog(), - }, { name: 'editor', description: 'set external editor preference', @@ -1027,7 +1022,6 @@ export const useSlashCommandProcessor = ( return commands; }, [ addMessage, - openAuthDialog, openEditorDialog, openPrivacyNotice, toggleCorgiMode, @@ -1125,6 +1119,9 @@ export const useSlashCommandProcessor = ( case 'help': setShowHelp(true); return { type: 'handled' }; + case 'auth': + openAuthDialog(); + return { type: 'handled' }; case 'theme': openThemeDialog(); return { type: 'handled' }; @@ -1205,6 +1202,7 @@ export const useSlashCommandProcessor = ( [ addItem, setShowHelp, + openAuthDialog, commands, legacyCommands, commandContext,