Add /rename slash command

packages/cli/src/nonInteractiveCli.test.ts

@@ -1540,7 +1540,6 @@ describe('runNonInteractive', () => {
         ] as any, // eslint-disable-line @typescript-eslint/no-explicit-any
         startTime: new Date().toISOString(),
         lastUpdated: new Date().toISOString(),
-        firstUserMessage: 'Previous message',
         projectHash: 'test-hash',
       },
       filePath: '/path/to/session.json',

packages/cli/src/nonInteractiveCliCommands.ts

@@ -66,6 +66,7 @@ export const handleSlashCommand = async (
           settings,
           git: undefined,
           logger,
+          chatRecordingService: undefined,
         },
         ui: createNonInteractiveUI(),
         session: {

packages/cli/src/services/BuiltinCommandLoader.ts

@@ -40,6 +40,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 { renameCommand } from '../ui/commands/renameCommand.js';
 import { resumeCommand } from '../ui/commands/resumeCommand.js';
 import { statsCommand } from '../ui/commands/statsCommand.js';
 import { themeCommand } from '../ui/commands/themeCommand.js';
@@ -136,6 +137,7 @@ export class BuiltinCommandLoader implements ICommandLoader {
       policiesCommand,
       ...(isDevelopment ? [profileCommand] : []),
       quitCommand,
+      renameCommand,
       restoreCommand(this.config),
       resumeCommand,
       statsCommand,

packages/cli/src/test-utils/mockCommandContext.ts

@@ -51,6 +51,7 @@ export const createMockCommandContext = (
         loadCheckpoint: vi.fn().mockResolvedValue([]),
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any, // Cast because Logger is a class.
+      chatRecordingService: undefined,
     },
     ui: {
       addItem: vi.fn(),

packages/cli/src/ui/commands/renameCommand.test.ts

@@ -0,0 +1,72 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { renameCommand } from './renameCommand.js';
+import type { ChatRecordingService } from '@google/gemini-cli-core';
+import type { CommandContext } from './types.js';
+
+describe('renameCommand', () => {
+  let mockContext: CommandContext;
+  let mockChatRecordingService: {
+    setDisplayName: ReturnType<typeof vi.fn>;
+  };
+
+  beforeEach(() => {
+    mockChatRecordingService = {
+      setDisplayName: vi.fn(),
+    };
+
+    mockContext = {
+      services: {
+        chatRecordingService:
+          mockChatRecordingService as unknown as ChatRecordingService,
+      },
+    } as unknown as CommandContext;
+  });
+
+  it('should require a name argument', async () => {
+    const result = await renameCommand.action!(mockContext, '');
+    expect(result).toEqual({
+      type: 'message',
+      messageType: 'error',
+      content: 'Please provide a new name for the session.',
+    });
+  });
+
+  it('should handle empty name string', async () => {
+    const result = await renameCommand.action!(mockContext, '   ');
+    expect(result).toEqual({
+      type: 'message',
+      messageType: 'error',
+      content: 'Please provide a new name for the session.',
+    });
+  });
+
+  it('should return undefined if chatRecordingService is not available', async () => {
+    mockContext = {
+      services: {
+        chatRecordingService: undefined,
+      },
+    } as unknown as CommandContext;
+
+    const result = await renameCommand.action!(mockContext, 'New Name');
+    expect(result).toEqual(undefined);
+  });
+
+  it('should rename the current session', async () => {
+    const result = await renameCommand.action!(mockContext, 'New Name');
+
+    expect(mockChatRecordingService.setDisplayName).toHaveBeenCalledWith(
+      'New Name',
+    );
+    expect(result).toEqual({
+      type: 'message',
+      messageType: 'info',
+      content: 'Session renamed to "New Name"',
+    });
+  });
+});

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

@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  CommandKind,
+  type SlashCommand,
+  type SlashCommandActionReturn,
+} from './types.js';
+
+export const renameCommand: SlashCommand = {
+  name: 'rename',
+  description: 'Set the display name for the current session',
+  kind: CommandKind.BUILT_IN,
+  action: async (context, input): Promise<SlashCommandActionReturn | void> => {
+    const newName = input.trim();
+    if (!newName) {
+      return {
+        type: 'message',
+        messageType: 'error',
+        content: 'Please provide a new name for the session.',
+      };
+    }
+
+    if (!context.services.chatRecordingService) {
+      return;
+    }
+
+    context.services.chatRecordingService.setDisplayName(newName);
+
+    return {
+      type: 'message',
+      messageType: 'info',
+      content: `Session renamed to "${newName}"`,
+    };
+  },
+};

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

@@ -11,6 +11,7 @@ import type {
   ConfirmationRequest,
 } from '../types.js';
 import type {
+  ChatRecordingService,
   Config,
   GitService,
   Logger,
@@ -43,6 +44,7 @@ export interface CommandContext {
     settings: LoadedSettings;
     git: GitService | undefined;
     logger: Logger;
+    chatRecordingService: ChatRecordingService | undefined;
   };
   // UI state and history management
   ui: {

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

@@ -130,7 +130,6 @@ const createSession = (overrides: Partial<SessionInfo>): SessionInfo => ({
   lastUpdated: new Date().toISOString(),
   messageCount: 1,
   displayName: 'Test Session',
-  firstUserMessage: 'Test Session',
   isCurrentSession: false,
   index: 0,
   ...overrides,
@@ -205,12 +204,39 @@ describe('SessionBrowser component', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
+  it('displays fallback displayName', () => {
+    const session = createSession({
+      id: 'no-display-name',
+      file: 'no-display-name',
+      displayName: 'Fallback Message',
+      lastUpdated: '2025-01-01T10:05:00Z',
+      messageCount: 2,
+      index: 0,
+    });
+
+    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={[session]}
+      />,
+    );
+
+    expect(lastFrame()).toContain('Fallback Message');
+  });
+
   it('enters search mode, filters sessions, and renders match snippets', async () => {
     const searchSession = createSession({
       id: 'search1',
       file: 'search1',
       displayName: 'Query is here and another query.',
-      firstUserMessage: 'Query is here and another query.',
       fullContent: 'Query is here and another query.',
       messages: [
         {
@@ -226,7 +252,6 @@ describe('SessionBrowser component', () => {
       id: 'other',
       file: 'other',
       displayName: 'Nothing interesting here.',
-      firstUserMessage: 'Nothing interesting here.',
       fullContent: 'Nothing interesting here.',
       messages: [
         {

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

@@ -249,8 +249,7 @@ const filterSessions = (
   return sessions.filter((session) => {
     const titleMatch =
       session.displayName.toLowerCase().includes(lowerQuery) ||
-      session.id.toLowerCase().includes(lowerQuery) ||
-      session.firstUserMessage.toLowerCase().includes(lowerQuery);
+      session.id.toLowerCase().includes(lowerQuery);
 
     const contentMatch = session.fullContent
       ?.toLowerCase()

packages/cli/src/ui/hooks/slashCommandProcessor.test.tsx

@@ -596,6 +596,7 @@ describe('useSlashCommandProcessor', () => {
       const mockClient = {
         setHistory: vi.fn(),
         stripThoughtsFromHistory: vi.fn(),
+        getChatRecordingService: vi.fn(),
       } as unknown as GeminiClient;
       vi.spyOn(mockConfig, 'getGeminiClient').mockReturnValue(mockClient);
 

packages/cli/src/ui/hooks/slashCommandProcessor.ts

@@ -209,6 +209,9 @@ export const useSlashCommandProcessor = (
         settings,
         git: gitService,
         logger,
+        chatRecordingService: config
+          ?.getGeminiClient()
+          ?.getChatRecordingService(),
       },
       ui: {
         addItem,