Merge Commit '94c3eec': feat(sessions): add /resume slash command to open the session browser (google-gemini#13621)

Author: thacio

packages/cli/src/services/BuiltinCommandLoader.test.ts

@@ -75,6 +75,7 @@ vi.mock('../ui/commands/modelCommand.js', () => ({
 }));
 vi.mock('../ui/commands/privacyCommand.js', () => ({ privacyCommand: {} }));
 vi.mock('../ui/commands/quitCommand.js', () => ({ quitCommand: {} }));
+vi.mock('../ui/commands/resumeCommand.js', () => ({ resumeCommand: {} }));
 vi.mock('../ui/commands/statsCommand.js', () => ({ statsCommand: {} }));
 vi.mock('../ui/commands/themeCommand.js', () => ({ themeCommand: {} }));
 vi.mock('../ui/commands/toolsCommand.js', () => ({ toolsCommand: {} }));

packages/cli/src/services/BuiltinCommandLoader.ts

@@ -32,6 +32,7 @@ import { policiesCommand } from '../ui/commands/policiesCommand.js';
 import { profileCommand } from '../ui/commands/profileCommand.js';
 import { quitCommand } from '../ui/commands/quitCommand.js';
 import { restoreCommand } from '../ui/commands/restoreCommand.js';
+import { resumeCommand } from '../ui/commands/resumeCommand.js';
 import { statsCommand } from '../ui/commands/statsCommand.js';
 import { themeCommand } from '../ui/commands/themeCommand.js';
 import { toolsCommand } from '../ui/commands/toolsCommand.js';
@@ -90,6 +91,7 @@ export class BuiltinCommandLoader implements ICommandLoader {
       ...(isDevelopment ? [profileCommand] : []),
       quitCommand,
       restoreCommand(this.config),
+      resumeCommand,
       statsCommand,
       themeCommand,
       toolsCommand,

packages/cli/src/test-utils/render.tsx

@@ -148,6 +148,10 @@ const mockUIActions: UIActions = {
   closeSettingsDialog: vi.fn(),
   closeModelDialog: vi.fn(),
   openPermissionsDialog: vi.fn(),
+  openSessionBrowser: vi.fn(),
+  closeSessionBrowser: vi.fn(),
+  handleResumeSession: vi.fn(),
+  handleDeleteSession: vi.fn(),
   closePermissionsDialog: vi.fn(),
   setShellModeActive: vi.fn(),
   vimHandleInput: vi.fn(),

packages/cli/src/ui/AppContainer.tsx

@@ -102,6 +102,7 @@ import { type UpdateObject } from './utils/updateCheck.js';
 import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
 import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
 import { RELAUNCH_EXIT_CODE } from '../utils/processUtils.js';
+import type { SessionInfo } from '../utils/sessionUtils.js';
 import { useMessageQueue } from './hooks/useMessageQueue.js';
 import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
 import { useSessionStats } from './contexts/SessionContext.js';
@@ -121,9 +122,10 @@ import {
   useExtensionUpdates,
 } from './hooks/useExtensionUpdates.js';
 import { ShellFocusContext } from './contexts/ShellFocusContext.js';
-import { useSessionResume } from './hooks/useSessionResume.js';
 import { type ExtensionManager } from '../config/extension-manager.js';
 import { requestConsentInteractive } from '../config/extensions/consent.js';
+import { useSessionBrowser } from './hooks/useSessionBrowser.js';
+import { useSessionResume } from './hooks/useSessionResume.js';
 import { useIncludeDirsTrust } from './hooks/useIncludeDirsTrust.js';
 import { isWorkspaceTrusted } from '../config/trustedFolders.js';
 import { useAlternateBuffer } from './hooks/useAlternateBuffer.js';
@@ -449,7 +451,7 @@ export const AppContainer = (props: AppContainerProps) => {
   // Session browser and resume functionality
   const isGeminiClientInitialized = config.getGeminiClient()?.isInitialized();
 
-  useSessionResume({
+  const { loadHistoryForResume } = useSessionResume({
     config,
     historyManager,
     refreshStatic,
@@ -458,6 +460,20 @@ export const AppContainer = (props: AppContainerProps) => {
     resumedSessionData,
     isAuthenticating,
   });
+  const {
+    isSessionBrowserOpen,
+    openSessionBrowser,
+    closeSessionBrowser,
+    handleResumeSession,
+    handleDeleteSession: handleDeleteSessionSync,
+  } = useSessionBrowser(config, loadHistoryForResume);
+  // Wrap handleDeleteSession to return a Promise for UIActions interface
+  const handleDeleteSession = useCallback(
+    async (session: SessionInfo): Promise<void> => {
+      handleDeleteSessionSync(session);
+    },
+    [handleDeleteSessionSync],
+  );
 
   // Create handleAuthSelect wrapper for backward compatibility
   const handleAuthSelect = useCallback(
@@ -593,6 +609,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       openLanguageDialog,
       openPrivacyNotice: () => setShowPrivacyNotice(true),
       openSettingsDialog,
+      openSessionBrowser,
       openModelDialog,
       openPermissionsDialog,
       quit: (messages: HistoryItem[]) => {
@@ -614,6 +631,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       openEditorDialog,
       openLanguageDialog,
       openSettingsDialog,
+      openSessionBrowser,
       openModelDialog,
       setQuittingMessages,
       setDebugMessage,
@@ -1356,6 +1374,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     showPrivacyNotice ||
     showIdeRestartPrompt ||
     !!proQuotaRequest ||
+    isSessionBrowserOpen ||
     isAuthDialogOpen ||
     authState === AuthState.AwaitingApiKeyInput;
 
@@ -1586,7 +1605,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
       let reason = 'general';
 
       if (shouldShowIdePrompt) {
-        message = 'IDE integration prompt is displayed. Please respond to connect your editor to Auditaria CLI in the terminal.';
+        message =
+          'IDE integration prompt is displayed. Please respond to connect your editor to Auditaria CLI in the terminal.';
         reason = 'ide_integration';
       } else if (isAuthenticating || isAuthDialogOpen) {
         const authMessage = isAuthenticating
@@ -1595,37 +1615,47 @@ Logging in with Google... Restarting Gemini CLI to continue.
         message = authMessage;
         reason = 'authentication';
       } else if (isThemeDialogOpen) {
-        message = 'Theme selection is open. Please choose a theme in the CLI terminal.';
+        message =
+          'Theme selection is open. Please choose a theme in the CLI terminal.';
         reason = 'theme_selection';
       } else if (isEditorDialogOpen) {
-        message = 'Editor settings are open. Please configure your editor in the CLI terminal.';
+        message =
+          'Editor settings are open. Please configure your editor in the CLI terminal.';
         reason = 'editor_settings';
       } else if (isLanguageDialogOpen) {
-        message = 'Language selection is open. Please choose a language in the CLI terminal.';
+        message =
+          'Language selection is open. Please choose a language in the CLI terminal.';
         reason = 'language_selection';
       } else if (isSettingsDialogOpen) {
-        message = 'Settings dialog is open. Please configure settings in the CLI terminal.';
+        message =
+          'Settings dialog is open. Please configure settings in the CLI terminal.';
         reason = 'settings';
       } else if (isModelDialogOpen) {
-        message = 'Model selection is open. Please choose a model in the CLI terminal.';
+        message =
+          'Model selection is open. Please choose a model in the CLI terminal.';
         reason = 'model_selection';
       } else if (isFolderTrustDialogOpen) {
-        message = 'Folder trust dialog is open. Please respond in the CLI terminal.';
+        message =
+          'Folder trust dialog is open. Please respond in the CLI terminal.';
         reason = 'folder_trust';
       } else if (showPrivacyNotice) {
-        message = 'Privacy notice is displayed. Please review in the CLI terminal.';
+        message =
+          'Privacy notice is displayed. Please review in the CLI terminal.';
         reason = 'privacy_notice';
       } else if (proQuotaRequest) {
-        message = 'Quota exceeded dialog is open. Please choose an option in the CLI terminal.';
+        message =
+          'Quota exceeded dialog is open. Please choose an option in the CLI terminal.';
         reason = 'quota_exceeded';
       } else if (shellConfirmationRequest) {
-        message = 'Shell command confirmation required. Please respond in the CLI terminal.';
+        message =
+          'Shell command confirmation required. Please respond in the CLI terminal.';
         reason = 'shell_confirmation';
       } else if (confirmationRequest) {
         message = 'Confirmation required. Please respond in the CLI terminal.';
         reason = 'confirmation';
       } else if (loopDetectionConfirmationRequest) {
-        message = 'Loop detection confirmation required. Please choose whether to keep or disable loop detection in the CLI terminal.';
+        message =
+          'Loop detection confirmation required. Please choose whether to keep or disable loop detection in the CLI terminal.';
         reason = 'loop_detection';
       }
 
@@ -1825,6 +1855,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       debugMessage,
       quittingMessages,
       isSettingsDialogOpen,
+      isSessionBrowserOpen,
       isModelDialogOpen,
       isPermissionsDialogOpen,
       permissionsDialogProps,
@@ -1917,6 +1948,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       debugMessage,
       quittingMessages,
       isSettingsDialogOpen,
+      isSessionBrowserOpen,
       isModelDialogOpen,
       isPermissionsDialogOpen,
       permissionsDialogProps,
@@ -2027,6 +2059,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
       handleFinalSubmit,
       handleClearScreen,
       handleProQuotaChoice,
+      openSessionBrowser,
+      closeSessionBrowser,
+      handleResumeSession,
+      handleDeleteSession,
       setQueueErrorMessage,
       popAllMessages,
       handleApiKeySubmit,
@@ -2059,6 +2095,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
       handleFinalSubmit,
       handleClearScreen,
       handleProQuotaChoice,
+      openSessionBrowser,
+      closeSessionBrowser,
+      handleResumeSession,
+      handleDeleteSession,
       setQueueErrorMessage,
       popAllMessages,
       handleApiKeySubmit,

packages/cli/src/ui/commands/resumeCommand.ts

@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type {
+  OpenDialogActionReturn,
+  CommandContext,
+  SlashCommand,
+} from './types.js';
+import { CommandKind } from './types.js';
+
+export const resumeCommand: SlashCommand = {
+  name: 'resume',
+  description: 'Browse and resume auto-saved conversations',
+  kind: CommandKind.BUILT_IN,
+  action: async (
+    _context: CommandContext,
+    _args: string,
+  ): Promise<OpenDialogActionReturn> => ({
+    type: 'dialog',
+    dialog: 'sessionBrowser',
+  }),
+};

packages/cli/src/ui/commands/types.ts

@@ -145,6 +145,7 @@ export interface OpenDialogActionReturn {
     | 'privacy'
     | 'language'
     | 'settings'
+    | 'sessionBrowser'
     | 'model'
     | 'permissions';
 }

packages/cli/src/ui/components/DialogManager.tsx

@@ -21,6 +21,7 @@ import { PrivacyNotice } from '../privacy/PrivacyNotice.js';
 import { ProQuotaDialog } from './ProQuotaDialog.js';
 import { runExitCleanup } from '../../utils/cleanup.js';
 import { RELAUNCH_EXIT_CODE } from '../../utils/processUtils.js';
+import { SessionBrowser } from './SessionBrowser.js';
 import { PermissionsModifyTrustDialog } from './PermissionsModifyTrustDialog.js';
 import { ModelDialog } from './ModelDialog.js';
 import { theme } from '../semantic-colors.js';
@@ -226,6 +227,16 @@ export const DialogManager = ({
       />
     );
   }
+  if (uiState.isSessionBrowserOpen) {
+    return (
+      <SessionBrowser
+        config={config}
+        onResumeSession={uiActions.handleResumeSession}
+        onDeleteSession={uiActions.handleDeleteSession}
+        onExit={uiActions.closeSessionBrowser}
+      />
+    );
+  }
 
   if (uiState.isPermissionsDialogOpen) {
     return (

packages/cli/src/ui/components/InputPrompt.test.tsx

@@ -86,6 +86,12 @@ const mockSlashCommands: SlashCommand[] = [
       },
     ],
   },
+  {
+    name: 'resume',
+    description: 'Browse and resume sessions',
+    kind: CommandKind.BUILT_IN,
+    action: vi.fn(),
+  },
 ];
 
 describe('InputPrompt', () => {

packages/cli/src/ui/components/SessionBrowser.test.tsx

@@ -57,7 +57,10 @@ vi.mock('./SessionBrowser.js', async (importOriginal) => {
       moveSelection,
       cycleSortOrder,
       props.onResumeSession,
-      props.onDeleteSession,
+      props.onDeleteSession ??
+        (async () => {
+          // no-op delete handler for tests that don't care about deletion
+        }),
       props.onExit,
     );
 
@@ -146,12 +149,14 @@ describe('SessionBrowser component', () => {
   it('shows empty state when no sessions exist', () => {
     const config = createMockConfig();
     const onResumeSession = vi.fn();
+    const onDeleteSession = vi.fn().mockResolvedValue(undefined);
     const onExit = vi.fn();
 
     const { lastFrame } = render(
       <TestSessionBrowser
         config={config}
         onResumeSession={onResumeSession}
+        onDeleteSession={onDeleteSession}
         onExit={onExit}
         testSessions={[]}
       />,
@@ -181,12 +186,14 @@ describe('SessionBrowser component', () => {
 
     const config = createMockConfig();
     const onResumeSession = vi.fn();
+    const onDeleteSession = vi.fn().mockResolvedValue(undefined);
     const onExit = vi.fn();
 
     const { lastFrame } = render(
       <TestSessionBrowser
         config={config}
         onResumeSession={onResumeSession}
+        onDeleteSession={onDeleteSession}
         onExit={onExit}
         testSessions={[session1, session2]}
       />,
@@ -230,12 +237,14 @@ describe('SessionBrowser component', () => {
 
     const config = createMockConfig();
     const onResumeSession = vi.fn();
+    const onDeleteSession = vi.fn().mockResolvedValue(undefined);
     const onExit = vi.fn();
 
     const { lastFrame } = render(
       <TestSessionBrowser
         config={config}
         onResumeSession={onResumeSession}
+        onDeleteSession={onDeleteSession}
         onExit={onExit}
         testSessions={[searchSession, otherSession]}
       />,
@@ -279,12 +288,14 @@ describe('SessionBrowser component', () => {
 
     const config = createMockConfig();
     const onResumeSession = vi.fn();
+    const onDeleteSession = vi.fn().mockResolvedValue(undefined);
     const onExit = vi.fn();
 
     const { lastFrame } = render(
       <TestSessionBrowser
         config={config}
         onResumeSession={onResumeSession}
+        onDeleteSession={onDeleteSession}
         onExit={onExit}
         testSessions={[session1, session2]}
       />,
@@ -323,7 +334,7 @@ describe('SessionBrowser component', () => {
 
     const config = createMockConfig();
     const onResumeSession = vi.fn();
-    const onDeleteSession = vi.fn();
+    const onDeleteSession = vi.fn().mockResolvedValue(undefined);
     const onExit = vi.fn();
 
     render(
@@ -348,12 +359,14 @@ describe('SessionBrowser component', () => {
   it('shows an error state when loading sessions fails', () => {
     const config = createMockConfig();
     const onResumeSession = vi.fn();
+    const onDeleteSession = vi.fn().mockResolvedValue(undefined);
     const onExit = vi.fn();
 
     const { lastFrame } = render(
       <TestSessionBrowser
         config={config}
         onResumeSession={onResumeSession}
+        onDeleteSession={onDeleteSession}
         onExit={onExit}
         testError="storage failure"
       />,