chore(release): v0.21.0-preview.2

Co-authored-by: Jack Wotherspoon <jackwoth@google.com>

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+  "version": "0.21.0-preview.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@google/gemini-cli",
-      "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+      "version": "0.21.0-preview.2",
       "workspaces": [
         "packages/*"
       ],
@@ -17692,7 +17692,7 @@
     },
     "packages/a2a-server": {
       "name": "@google/gemini-cli-a2a-server",
-      "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+      "version": "0.21.0-preview.2",
       "dependencies": {
         "@a2a-js/sdk": "^0.3.2",
         "@google-cloud/storage": "^7.16.0",
@@ -18003,7 +18003,7 @@
     },
     "packages/cli": {
       "name": "@google/gemini-cli",
-      "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+      "version": "0.21.0-preview.2",
       "dependencies": {
         "@google/gemini-cli-core": "file:../core",
         "@google/genai": "1.30.0",
@@ -18104,7 +18104,7 @@
     },
     "packages/core": {
       "name": "@google/gemini-cli-core",
-      "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+      "version": "0.21.0-preview.2",
       "dependencies": {
         "@google-cloud/logging": "^11.2.1",
         "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.21.0",
@@ -18248,7 +18248,7 @@
     },
     "packages/test-utils": {
       "name": "@google/gemini-cli-test-utils",
-      "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+      "version": "0.21.0-preview.2",
       "license": "Apache-2.0",
       "devDependencies": {
         "typescript": "^5.3.3"
@@ -18259,7 +18259,7 @@
     },
     "packages/vscode-ide-companion": {
       "name": "gemini-cli-vscode-ide-companion",
-      "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+      "version": "0.21.0-preview.2",
       "license": "LICENSE",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.23.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+  "version": "0.21.0-preview.2",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -14,7 +14,7 @@
     "url": "git+https://github.com/google-gemini/gemini-cli.git"
   },
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.21.0-nightly.20251209.ec9a8c7a7"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.21.0-preview.2"
   },
   "scripts": {
     "start": "cross-env NODE_ENV=development node scripts/start.js",

packages/a2a-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli-a2a-server",
-  "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+  "version": "0.21.0-preview.2",
   "description": "Gemini CLI A2A Server",
   "repository": {
     "type": "git",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+  "version": "0.21.0-preview.2",
   "description": "Gemini CLI",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.21.0-nightly.20251209.ec9a8c7a7"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.21.0-preview.2"
   },
   "dependencies": {
     "@google/gemini-cli-core": "file:../core",

packages/cli/src/gemini.tsx

@@ -498,6 +498,20 @@ export async function main() {
 
     // Handle --list-sessions flag
     if (config.getListSessions()) {
+      // Attempt auth for summary generation (gracefully skips if not configured)
+      const authType = settings.merged.security?.auth?.selectedType;
+      if (authType) {
+        try {
+          await config.refreshAuth(authType);
+        } catch (e) {
+          // Auth failed - continue without summary generation capability
+          debugLogger.debug(
+            'Auth failed for --list-sessions, summaries may not be generated:',
+            e,
+          );
+        }
+      }
+
       await listSessions(config);
       await runExitCleanup();
       process.exit(ExitCodes.SUCCESS);

packages/cli/src/ui/AppContainer.tsx

@@ -63,7 +63,7 @@ import {
   SessionEndReason,
   fireSessionStartHook,
   fireSessionEndHook,
-  generateAndSaveSummary,
+  generateSummary,
 } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import process from 'node:process';
@@ -312,9 +312,13 @@ export const AppContainer = (props: AppContainerProps) => {
           : SessionStartSource.Startup;
         await fireSessionStartHook(hookMessageBus, sessionStartSource);
       }
+
+      // Fire-and-forget: generate summary for previous session in background
+      generateSummary(config).catch((e) => {
+        debugLogger.warn('Background summary generation failed:', e);
+      });
     })();
     registerCleanup(async () => {
-      await generateAndSaveSummary(config);
       // Turn off mouse scroll.
       disableMouseEvents();
       const ideClient = await IdeClient.getInstance();

packages/cli/src/utils/sessions.test.ts

@@ -21,6 +21,7 @@ vi.mock('@google/gemini-cli-core', async () => {
   return {
     ...actual,
     ChatRecordingService: vi.fn(),
+    generateSummary: vi.fn().mockResolvedValue(undefined),
   };
 });
 

packages/cli/src/utils/sessions.ts

@@ -4,7 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ChatRecordingService, type Config } from '@google/gemini-cli-core';
+import {
+  ChatRecordingService,
+  generateSummary,
+  type Config,
+} from '@google/gemini-cli-core';
 import {
   formatRelativeTime,
   SessionSelector,
@@ -12,6 +16,9 @@ import {
 } from './sessionUtils.js';
 
 export async function listSessions(config: Config): Promise<void> {
+  // Generate summary for most recent session if needed
+  await generateSummary(config);
+
   const sessionSelector = new SessionSelector(config);
   const sessions = await sessionSelector.listSessions();
 

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli-core",
-  "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+  "version": "0.21.0-preview.2",
   "description": "Gemini CLI Core",
   "repository": {
     "type": "git",

packages/core/src/ide/ide-client.test.ts

@@ -59,6 +59,7 @@ describe('IdeClient', () => {
     delete process.env['GEMINI_CLI_IDE_SERVER_PORT'];
     delete process.env['GEMINI_CLI_IDE_SERVER_STDIO_COMMAND'];
     delete process.env['GEMINI_CLI_IDE_SERVER_STDIO_ARGS'];
+    delete process.env['GEMINI_CLI_IDE_AUTH_TOKEN'];
 
     // Mock dependencies
     vi.spyOn(process, 'cwd').mockReturnValue('/test/workspace/sub-dir');
@@ -923,5 +924,35 @@ describe('IdeClient', () => {
         IDEConnectionStatus.Connected,
       );
     });
+
+    it('should connect with an auth token from environment variable if config file is missing', async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValue(
+        new Error('File not found'),
+      );
+      (
+        vi.mocked(fs.promises.readdir) as Mock<
+          (path: fs.PathLike) => Promise<string[]>
+        >
+      ).mockResolvedValue([]);
+      process.env['GEMINI_CLI_IDE_SERVER_PORT'] = '9090';
+      process.env['GEMINI_CLI_IDE_AUTH_TOKEN'] = 'env-auth-token';
+
+      const ideClient = await IdeClient.getInstance();
+      await ideClient.connect();
+
+      expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
+        new URL('http://127.0.0.1:9090/mcp'),
+        expect.objectContaining({
+          requestInit: {
+            headers: {
+              Authorization: 'Bearer env-auth-token',
+            },
+          },
+        }),
+      );
+      expect(ideClient.getConnectionStatus().status).toBe(
+        IDEConnectionStatus.Connected,
+      );
+    });
   });
 });

packages/core/src/ide/ide-client.ts

@@ -151,9 +151,10 @@ export class IdeClient {
     this.setState(IDEConnectionStatus.Connecting);
 
     this.connectionConfig = await this.getConnectionConfigFromFile();
-    if (this.connectionConfig?.authToken) {
-      this.authToken = this.connectionConfig.authToken;
-    }
+    this.authToken =
+      this.connectionConfig?.authToken ??
+      process.env['GEMINI_CLI_IDE_AUTH_TOKEN'];
+
     const workspacePath =
       this.connectionConfig?.workspacePath ??
       process.env['GEMINI_CLI_IDE_WORKSPACE_PATH'];

packages/core/src/services/sessionSummaryUtils.test.ts

@@ -5,11 +5,15 @@
  */
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { generateAndSaveSummary } from './sessionSummaryUtils.js';
+import { generateSummary, getPreviousSession } from './sessionSummaryUtils.js';
 import type { Config } from '../config/config.js';
-import type { ChatRecordingService } from './chatRecordingService.js';
 import type { ContentGenerator } from '../core/contentGenerator.js';
-import type { GeminiClient } from '../core/client.js';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+
+// Mock fs/promises
+vi.mock('node:fs/promises');
+const mockReaddir = fs.readdir as unknown as ReturnType<typeof vi.fn>;
 
 // Mock the SessionSummaryService module
 vi.mock('./sessionSummaryService.js', () => ({
@@ -23,10 +27,24 @@ vi.mock('../core/baseLlmClient.js', () => ({
   BaseLlmClient: vi.fn(),
 }));
 
+// Helper to create a session with N user messages
+function createSessionWithUserMessages(
+  count: number,
+  options: { summary?: string; sessionId?: string } = {},
+) {
+  return JSON.stringify({
+    sessionId: options.sessionId ?? 'session-id',
+    summary: options.summary,
+    messages: Array.from({ length: count }, (_, i) => ({
+      id: String(i + 1),
+      type: 'user',
+      content: [{ text: `Message ${i + 1}` }],
+    })),
+  });
+}
+
 describe('sessionSummaryUtils', () => {
   let mockConfig: Config;
-  let mockChatRecordingService: ChatRecordingService;
-  let mockGeminiClient: GeminiClient;
   let mockContentGenerator: ContentGenerator;
   let mockGenerateSummary: ReturnType<typeof vi.fn>;
 
@@ -36,23 +54,12 @@ describe('sessionSummaryUtils', () => {
     // Setup mock content generator
     mockContentGenerator = {} as ContentGenerator;
 
-    // Setup mock chat recording service
-    mockChatRecordingService = {
-      getConversation: vi.fn(),
-      saveSummary: vi.fn(),
-    } as unknown as ChatRecordingService;
-
-    // Setup mock gemini client
-    mockGeminiClient = {
-      getChatRecordingService: vi
-        .fn()
-        .mockReturnValue(mockChatRecordingService),
-    } as unknown as GeminiClient;
-
     // Setup mock config
     mockConfig = {
       getContentGenerator: vi.fn().mockReturnValue(mockContentGenerator),
-      getGeminiClient: vi.fn().mockReturnValue(mockGeminiClient),
+      storage: {
+        getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
+      },
     } as unknown as Config;
 
     // Setup mock generateSummary function
@@ -73,320 +80,138 @@ describe('sessionSummaryUtils', () => {
     vi.restoreAllMocks();
   });
 
-  describe('Integration Tests', () => {
-    it('should generate and save summary successfully', async () => {
-      const mockConversation = {
-        sessionId: 'test-session',
-        projectHash: 'test-hash',
-        startTime: '2025-12-03T00:00:00Z',
-        lastUpdated: '2025-12-03T00:10:00Z',
-        messages: [
-          {
-            id: '1',
-            timestamp: '2025-12-03T00:00:00Z',
-            type: 'user' as const,
-            content: [{ text: 'How do I add dark mode?' }],
-          },
-          {
-            id: '2',
-            timestamp: '2025-12-03T00:01:00Z',
-            type: 'gemini' as const,
-            content: [{ text: 'To add dark mode...' }],
-          },
-        ],
-      };
+  describe('getPreviousSession', () => {
+    it('should return null if chats directory does not exist', async () => {
+      vi.mocked(fs.access).mockRejectedValue(new Error('ENOENT'));
 
-      (
-        mockChatRecordingService.getConversation as ReturnType<typeof vi.fn>
-      ).mockReturnValue(mockConversation);
+      const result = await getPreviousSession(mockConfig);
 
-      await generateAndSaveSummary(mockConfig);
+      expect(result).toBeNull();
+    });
 
-      expect(mockChatRecordingService.getConversation).toHaveBeenCalledTimes(1);
-      expect(mockGenerateSummary).toHaveBeenCalledTimes(1);
-      expect(mockGenerateSummary).toHaveBeenCalledWith({
-        messages: mockConversation.messages,
-      });
-      expect(mockChatRecordingService.saveSummary).toHaveBeenCalledTimes(1);
-      expect(mockChatRecordingService.saveSummary).toHaveBeenCalledWith(
-        'Add dark mode to the app',
+    it('should return null if no session files exist', async () => {
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      mockReaddir.mockResolvedValue([]);
+
+      const result = await getPreviousSession(mockConfig);
+
+      expect(result).toBeNull();
+    });
+
+    it('should return null if most recent session already has summary', async () => {
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
+      vi.mocked(fs.readFile).mockResolvedValue(
+        createSessionWithUserMessages(5, { summary: 'Existing summary' }),
+      );
+
+      const result = await getPreviousSession(mockConfig);
+
+      expect(result).toBeNull();
+    });
+
+    it('should return null if most recent session has 1 or fewer user messages', async () => {
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
+      vi.mocked(fs.readFile).mockResolvedValue(
+        createSessionWithUserMessages(1),
+      );
+
+      const result = await getPreviousSession(mockConfig);
+
+      expect(result).toBeNull();
+    });
+
+    it('should return path if most recent session has more than 1 user message and no summary', async () => {
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
+      vi.mocked(fs.readFile).mockResolvedValue(
+        createSessionWithUserMessages(2),
+      );
+
+      const result = await getPreviousSession(mockConfig);
+
+      expect(result).toBe(
+        path.join(
+          '/tmp/project',
+          'chats',
+          'session-2024-01-01T10-00-abc12345.json',
+        ),
       );
     });
 
-    it('should skip if no chat recording service is available', async () => {
-      (
-        mockGeminiClient.getChatRecordingService as ReturnType<typeof vi.fn>
-      ).mockReturnValue(undefined);
+    it('should select most recently created session by filename', async () => {
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      mockReaddir.mockResolvedValue([
+        'session-2024-01-01T10-00-older000.json',
+        'session-2024-01-02T10-00-newer000.json',
+      ]);
+      vi.mocked(fs.readFile).mockResolvedValue(
+        createSessionWithUserMessages(2),
+      );
 
-      await generateAndSaveSummary(mockConfig);
+      const result = await getPreviousSession(mockConfig);
 
-      expect(mockGeminiClient.getChatRecordingService).toHaveBeenCalledTimes(1);
-      expect(mockGenerateSummary).not.toHaveBeenCalled();
-      expect(mockChatRecordingService.saveSummary).not.toHaveBeenCalled();
+      expect(result).toBe(
+        path.join(
+          '/tmp/project',
+          'chats',
+          'session-2024-01-02T10-00-newer000.json',
+        ),
+      );
     });
 
-    it('should skip if no conversation exists', async () => {
-      (
-        mockChatRecordingService.getConversation as ReturnType<typeof vi.fn>
-      ).mockReturnValue(null);
+    it('should return null if most recent session file is corrupted', async () => {
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
+      vi.mocked(fs.readFile).mockResolvedValue('invalid json');
 
-      await generateAndSaveSummary(mockConfig);
+      const result = await getPreviousSession(mockConfig);
 
-      expect(mockChatRecordingService.getConversation).toHaveBeenCalledTimes(1);
-      expect(mockGenerateSummary).not.toHaveBeenCalled();
-      expect(mockChatRecordingService.saveSummary).not.toHaveBeenCalled();
-    });
-
-    it('should skip if summary already exists', async () => {
-      const mockConversation = {
-        sessionId: 'test-session',
-        projectHash: 'test-hash',
-        startTime: '2025-12-03T00:00:00Z',
-        lastUpdated: '2025-12-03T00:10:00Z',
-        summary: 'Existing summary',
-        messages: [
-          {
-            id: '1',
-            timestamp: '2025-12-03T00:00:00Z',
-            type: 'user' as const,
-            content: [{ text: 'Hello' }],
-          },
-        ],
-      };
-
-      (
-        mockChatRecordingService.getConversation as ReturnType<typeof vi.fn>
-      ).mockReturnValue(mockConversation);
-
-      await generateAndSaveSummary(mockConfig);
-
-      expect(mockChatRecordingService.getConversation).toHaveBeenCalledTimes(1);
-      expect(mockGenerateSummary).not.toHaveBeenCalled();
-      expect(mockChatRecordingService.saveSummary).not.toHaveBeenCalled();
-    });
-
-    it('should skip if no messages present', async () => {
-      const mockConversation = {
-        sessionId: 'test-session',
-        projectHash: 'test-hash',
-        startTime: '2025-12-03T00:00:00Z',
-        lastUpdated: '2025-12-03T00:10:00Z',
-        messages: [],
-      };
-
-      (
-        mockChatRecordingService.getConversation as ReturnType<typeof vi.fn>
-      ).mockReturnValue(mockConversation);
-
-      await generateAndSaveSummary(mockConfig);
-
-      expect(mockChatRecordingService.getConversation).toHaveBeenCalledTimes(1);
-      expect(mockGenerateSummary).not.toHaveBeenCalled();
-      expect(mockChatRecordingService.saveSummary).not.toHaveBeenCalled();
-    });
-
-    it('should handle generateSummary failure gracefully', async () => {
-      const mockConversation = {
-        sessionId: 'test-session',
-        projectHash: 'test-hash',
-        startTime: '2025-12-03T00:00:00Z',
-        lastUpdated: '2025-12-03T00:10:00Z',
-        messages: [
-          {
-            id: '1',
-            timestamp: '2025-12-03T00:00:00Z',
-            type: 'user' as const,
-            content: [{ text: 'Hello' }],
-          },
-        ],
-      };
-
-      (
-        mockChatRecordingService.getConversation as ReturnType<typeof vi.fn>
-      ).mockReturnValue(mockConversation);
-      mockGenerateSummary.mockResolvedValue(null);
-
-      await generateAndSaveSummary(mockConfig);
-
-      expect(mockChatRecordingService.getConversation).toHaveBeenCalledTimes(1);
-      expect(mockGenerateSummary).toHaveBeenCalledTimes(1);
-      expect(mockChatRecordingService.saveSummary).not.toHaveBeenCalled();
-    });
-
-    it('should catch and log errors without throwing', async () => {
-      const mockConversation = {
-        sessionId: 'test-session',
-        projectHash: 'test-hash',
-        startTime: '2025-12-03T00:00:00Z',
-        lastUpdated: '2025-12-03T00:10:00Z',
-        messages: [
-          {
-            id: '1',
-            timestamp: '2025-12-03T00:00:00Z',
-            type: 'user' as const,
-            content: [{ text: 'Hello' }],
-          },
-        ],
-      };
-
-      (
-        mockChatRecordingService.getConversation as ReturnType<typeof vi.fn>
-      ).mockReturnValue(mockConversation);
-      mockGenerateSummary.mockRejectedValue(new Error('API Error'));
-
-      // Should not throw
-      await expect(generateAndSaveSummary(mockConfig)).resolves.not.toThrow();
-
-      expect(mockChatRecordingService.getConversation).toHaveBeenCalledTimes(1);
-      expect(mockGenerateSummary).toHaveBeenCalledTimes(1);
-      expect(mockChatRecordingService.saveSummary).not.toHaveBeenCalled();
+      expect(result).toBeNull();
     });
   });
 
-  describe('Mock Verification Tests', () => {
-    it('should call getConversation() once', async () => {
-      const mockConversation = {
-        sessionId: 'test-session',
-        projectHash: 'test-hash',
-        startTime: '2025-12-03T00:00:00Z',
-        lastUpdated: '2025-12-03T00:10:00Z',
-        messages: [
-          {
-            id: '1',
-            timestamp: '2025-12-03T00:00:00Z',
-            type: 'user' as const,
-            content: [{ text: 'Hello' }],
-          },
-        ],
-      };
+  describe('generateSummary', () => {
+    it('should not throw if getPreviousSession returns null', async () => {
+      vi.mocked(fs.access).mockRejectedValue(new Error('ENOENT'));
 
-      (
-        mockChatRecordingService.getConversation as ReturnType<typeof vi.fn>
-      ).mockReturnValue(mockConversation);
-
-      await generateAndSaveSummary(mockConfig);
-
-      expect(mockChatRecordingService.getConversation).toHaveBeenCalledTimes(1);
-      expect(mockChatRecordingService.getConversation).toHaveBeenCalledWith();
+      await expect(generateSummary(mockConfig)).resolves.not.toThrow();
     });
 
-    it('should call generateSummary() with correct messages', async () => {
-      const mockMessages = [
-        {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user' as const,
-          content: [{ text: 'How do I add dark mode?' }],
-        },
-        {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'gemini' as const,
-          content: [{ text: 'To add dark mode...' }],
-        },
-      ];
+    it('should generate and save summary for session needing one', async () => {
+      const sessionPath = path.join(
+        '/tmp/project',
+        'chats',
+        'session-2024-01-01T10-00-abc12345.json',
+      );
 
-      const mockConversation = {
-        sessionId: 'test-session',
-        projectHash: 'test-hash',
-        startTime: '2025-12-03T00:00:00Z',
-        lastUpdated: '2025-12-03T00:10:00Z',
-        messages: mockMessages,
-      };
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
+      vi.mocked(fs.readFile).mockResolvedValue(
+        createSessionWithUserMessages(2),
+      );
+      vi.mocked(fs.writeFile).mockResolvedValue(undefined);
 
-      (
-        mockChatRecordingService.getConversation as ReturnType<typeof vi.fn>
-      ).mockReturnValue(mockConversation);
-
-      await generateAndSaveSummary(mockConfig);
+      await generateSummary(mockConfig);
 
       expect(mockGenerateSummary).toHaveBeenCalledTimes(1);
-      expect(mockGenerateSummary).toHaveBeenCalledWith({
-        messages: mockMessages,
-      });
-    });
-
-    it('should call saveSummary() with generated summary', async () => {
-      const mockConversation = {
-        sessionId: 'test-session',
-        projectHash: 'test-hash',
-        startTime: '2025-12-03T00:00:00Z',
-        lastUpdated: '2025-12-03T00:10:00Z',
-        messages: [
-          {
-            id: '1',
-            timestamp: '2025-12-03T00:00:00Z',
-            type: 'user' as const,
-            content: [{ text: 'Hello' }],
-          },
-        ],
-      };
-
-      (
-        mockChatRecordingService.getConversation as ReturnType<typeof vi.fn>
-      ).mockReturnValue(mockConversation);
-      mockGenerateSummary.mockResolvedValue('Test summary');
-
-      await generateAndSaveSummary(mockConfig);
-
-      expect(mockChatRecordingService.saveSummary).toHaveBeenCalledTimes(1);
-      expect(mockChatRecordingService.saveSummary).toHaveBeenCalledWith(
-        'Test summary',
+      expect(fs.writeFile).toHaveBeenCalledTimes(1);
+      expect(fs.writeFile).toHaveBeenCalledWith(
+        sessionPath,
+        expect.stringContaining('Add dark mode to the app'),
       );
     });
 
-    it('should not call saveSummary() if generation fails', async () => {
-      const mockConversation = {
-        sessionId: 'test-session',
-        projectHash: 'test-hash',
-        startTime: '2025-12-03T00:00:00Z',
-        lastUpdated: '2025-12-03T00:10:00Z',
-        messages: [
-          {
-            id: '1',
-            timestamp: '2025-12-03T00:00:00Z',
-            type: 'user' as const,
-            content: [{ text: 'Hello' }],
-          },
-        ],
-      };
+    it('should handle errors gracefully without throwing', async () => {
+      vi.mocked(fs.access).mockResolvedValue(undefined);
+      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
+      vi.mocked(fs.readFile).mockResolvedValue(
+        createSessionWithUserMessages(2),
+      );
+      mockGenerateSummary.mockRejectedValue(new Error('API Error'));
 
-      (
-        mockChatRecordingService.getConversation as ReturnType<typeof vi.fn>
-      ).mockReturnValue(mockConversation);
-      mockGenerateSummary.mockResolvedValue(null);
-
-      await generateAndSaveSummary(mockConfig);
-
-      expect(mockGenerateSummary).toHaveBeenCalledTimes(1);
-      expect(mockChatRecordingService.saveSummary).not.toHaveBeenCalled();
-    });
-
-    it('should not call saveSummary() if generateSummary throws', async () => {
-      const mockConversation = {
-        sessionId: 'test-session',
-        projectHash: 'test-hash',
-        startTime: '2025-12-03T00:00:00Z',
-        lastUpdated: '2025-12-03T00:10:00Z',
-        messages: [
-          {
-            id: '1',
-            timestamp: '2025-12-03T00:00:00Z',
-            type: 'user' as const,
-            content: [{ text: 'Hello' }],
-          },
-        ],
-      };
-
-      (
-        mockChatRecordingService.getConversation as ReturnType<typeof vi.fn>
-      ).mockReturnValue(mockConversation);
-      mockGenerateSummary.mockRejectedValue(new Error('Generation failed'));
-
-      await generateAndSaveSummary(mockConfig);
-
-      expect(mockGenerateSummary).toHaveBeenCalledTimes(1);
-      expect(mockChatRecordingService.saveSummary).not.toHaveBeenCalled();
+      await expect(generateSummary(mockConfig)).resolves.not.toThrow();
     });
   });
 });

packages/core/src/services/sessionSummaryUtils.ts

@@ -8,62 +8,172 @@ import type { Config } from '../config/config.js';
 import { SessionSummaryService } from './sessionSummaryService.js';
 import { BaseLlmClient } from '../core/baseLlmClient.js';
 import { debugLogger } from '../utils/debugLogger.js';
+import {
+  SESSION_FILE_PREFIX,
+  type ConversationRecord,
+} from './chatRecordingService.js';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+const MIN_MESSAGES_FOR_SUMMARY = 1;
 
 /**
- * Generates and saves a summary for the current session.
- * This is called during session cleanup and is non-blocking - errors are logged but don't prevent exit.
+ * Generates and saves a summary for a session file.
  */
-export async function generateAndSaveSummary(config: Config): Promise<void> {
+async function generateAndSaveSummary(
+  config: Config,
+  sessionPath: string,
+): Promise<void> {
+  // Read session file
+  const content = await fs.readFile(sessionPath, 'utf-8');
+  const conversation: ConversationRecord = JSON.parse(content);
+
+  // Skip if summary already exists
+  if (conversation.summary) {
+    debugLogger.debug(
+      `[SessionSummary] Summary already exists for ${sessionPath}, skipping`,
+    );
+    return;
+  }
+
+  // Skip if no messages
+  if (conversation.messages.length === 0) {
+    debugLogger.debug(
+      `[SessionSummary] No messages to summarize in ${sessionPath}`,
+    );
+    return;
+  }
+
+  // Create summary service
+  const contentGenerator = config.getContentGenerator();
+  if (!contentGenerator) {
+    debugLogger.debug(
+      '[SessionSummary] Content generator not available, skipping summary generation',
+    );
+    return;
+  }
+  const baseLlmClient = new BaseLlmClient(contentGenerator, config);
+  const summaryService = new SessionSummaryService(baseLlmClient);
+
+  // Generate summary
+  const summary = await summaryService.generateSummary({
+    messages: conversation.messages,
+  });
+
+  if (!summary) {
+    debugLogger.warn(
+      `[SessionSummary] Failed to generate summary for ${sessionPath}`,
+    );
+    return;
+  }
+
+  // Re-read the file before writing to handle race conditions
+  const freshContent = await fs.readFile(sessionPath, 'utf-8');
+  const freshConversation: ConversationRecord = JSON.parse(freshContent);
+
+  // Check if summary was added by another process
+  if (freshConversation.summary) {
+    debugLogger.debug(
+      `[SessionSummary] Summary was added by another process for ${sessionPath}`,
+    );
+    return;
+  }
+
+  // Add summary and write back
+  freshConversation.summary = summary;
+  freshConversation.lastUpdated = new Date().toISOString();
+  await fs.writeFile(sessionPath, JSON.stringify(freshConversation, null, 2));
+  debugLogger.debug(
+    `[SessionSummary] Saved summary for ${sessionPath}: "${summary}"`,
+  );
+}
+
+/**
+ * Finds the most recently created session that needs a summary.
+ * Returns the path if it needs a summary, null otherwise.
+ */
+export async function getPreviousSession(
+  config: Config,
+): Promise<string | null> {
   try {
-    // Get the chat recording service from config
-    const chatRecordingService = config
-      .getGeminiClient()
-      ?.getChatRecordingService();
-    if (!chatRecordingService) {
-      debugLogger.debug('[SessionSummary] No chat recording service available');
-      return;
+    const chatsDir = path.join(config.storage.getProjectTempDir(), 'chats');
+
+    // Check if chats directory exists
+    try {
+      await fs.access(chatsDir);
+    } catch {
+      debugLogger.debug('[SessionSummary] No chats directory found');
+      return null;
     }
 
-    // Get the current conversation
-    const conversation = chatRecordingService.getConversation();
-    if (!conversation) {
-      debugLogger.debug('[SessionSummary] No conversation to summarize');
-      return;
+    // List session files
+    const allFiles = await fs.readdir(chatsDir);
+    const sessionFiles = allFiles.filter(
+      (f) => f.startsWith(SESSION_FILE_PREFIX) && f.endsWith('.json'),
+    );
+
+    if (sessionFiles.length === 0) {
+      debugLogger.debug('[SessionSummary] No session files found');
+      return null;
     }
 
-    // Skip if summary already exists (e.g., resumed session)
-    if (conversation.summary) {
-      debugLogger.debug('[SessionSummary] Summary already exists, skipping');
-      return;
+    // Sort by filename descending (most recently created first)
+    // Filename format: session-YYYY-MM-DDTHH-MM-XXXXXXXX.json
+    sessionFiles.sort((a, b) => b.localeCompare(a));
+
+    // Check the most recently created session
+    const mostRecentFile = sessionFiles[0];
+    const filePath = path.join(chatsDir, mostRecentFile);
+
+    try {
+      const content = await fs.readFile(filePath, 'utf-8');
+      const conversation: ConversationRecord = JSON.parse(content);
+
+      if (conversation.summary) {
+        debugLogger.debug(
+          '[SessionSummary] Most recent session already has summary',
+        );
+        return null;
+      }
+
+      // Only generate summaries for sessions with more than 1 user message
+      const userMessageCount = conversation.messages.filter(
+        (m) => m.type === 'user',
+      ).length;
+      if (userMessageCount <= MIN_MESSAGES_FOR_SUMMARY) {
+        debugLogger.debug(
+          `[SessionSummary] Most recent session has ${userMessageCount} user message(s), skipping (need more than ${MIN_MESSAGES_FOR_SUMMARY})`,
+        );
+        return null;
+      }
+
+      return filePath;
+    } catch {
+      debugLogger.debug('[SessionSummary] Could not read most recent session');
+      return null;
     }
+  } catch (error) {
+    debugLogger.debug(
+      `[SessionSummary] Error finding previous session: ${error instanceof Error ? error.message : String(error)}`,
+    );
+    return null;
+  }
+}
 
-    // Skip if no messages
-    if (conversation.messages.length === 0) {
-      debugLogger.debug('[SessionSummary] No messages to summarize');
-      return;
-    }
-
-    // Create summary service
-    const contentGenerator = config.getContentGenerator();
-    const baseLlmClient = new BaseLlmClient(contentGenerator, config);
-    const summaryService = new SessionSummaryService(baseLlmClient);
-
-    // Generate summary
-    const summary = await summaryService.generateSummary({
-      messages: conversation.messages,
-    });
-
-    // Save summary if generated successfully
-    if (summary) {
-      chatRecordingService.saveSummary(summary);
-      debugLogger.debug(`[SessionSummary] Saved summary: "${summary}"`);
-    } else {
-      debugLogger.warn('[SessionSummary] Failed to generate summary');
+/**
+ * Generates summary for the previous session if it lacks one.
+ * This is designed to be called fire-and-forget on startup.
+ */
+export async function generateSummary(config: Config): Promise<void> {
+  try {
+    const sessionPath = await getPreviousSession(config);
+    if (sessionPath) {
+      await generateAndSaveSummary(config, sessionPath);
     }
   } catch (error) {
     // Log but don't throw - we want graceful degradation
     debugLogger.warn(
-      `[SessionSummary] Error in generateAndSaveSummary: ${error instanceof Error ? error.message : String(error)}`,
+      `[SessionSummary] Error generating summary: ${error instanceof Error ? error.message : String(error)}`,
     );
   }
 }

packages/test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli-test-utils",
-  "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+  "version": "0.21.0-preview.2",
   "private": true,
   "main": "src/index.ts",
   "license": "Apache-2.0",

packages/vscode-ide-companion/package.json

@@ -2,7 +2,7 @@
   "name": "gemini-cli-vscode-ide-companion",
   "displayName": "Gemini CLI Companion",
   "description": "Enable Gemini CLI with direct access to your IDE workspace.",
-  "version": "0.21.0-nightly.20251209.ec9a8c7a7",
+  "version": "0.21.0-preview.2",
   "publisher": "google",
   "icon": "assets/icon.png",
   "repository": {