fix(cli): use active sessionId in useLogger and improve resume robustness (#22606)

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

@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { renderHook } from '../../test-utils/render.js';
+import { waitFor } from '../../test-utils/async.js';
+import { useLogger } from './useLogger.js';
+import {
+  sessionId as globalSessionId,
+  Logger,
+  type Storage,
+  type Config,
+} from '@google/gemini-cli-core';
+import { ConfigContext } from '../contexts/ConfigContext.js';
+import type React from 'react';
+
+// Mock Logger
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@google/gemini-cli-core')>();
+  return {
+    ...actual,
+    Logger: vi.fn().mockImplementation((id: string) => ({
+      initialize: vi.fn().mockResolvedValue(undefined),
+      sessionId: id,
+    })),
+  };
+});
+
+describe('useLogger', () => {
+  const mockStorage = {} as Storage;
+  const mockConfig = {
+    getSessionId: vi.fn().mockReturnValue('active-session-id'),
+  } as unknown as Config;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should initialize with the global sessionId by default', async () => {
+    const { result } = renderHook(() => useLogger(mockStorage));
+
+    await waitFor(() => expect(result.current).not.toBeNull());
+    expect(Logger).toHaveBeenCalledWith(globalSessionId, mockStorage);
+  });
+
+  it('should initialize with the active sessionId from ConfigContext when available', async () => {
+    const wrapper = ({ children }: { children: React.ReactNode }) => (
+      <ConfigContext.Provider value={mockConfig}>
+        {children}
+      </ConfigContext.Provider>
+    );
+
+    const { result } = renderHook(() => useLogger(mockStorage), { wrapper });
+
+    await waitFor(() => expect(result.current).not.toBeNull());
+    expect(Logger).toHaveBeenCalledWith('active-session-id', mockStorage);
+  });
+});

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

@@ -4,17 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect } from 'react';
-import { sessionId, Logger, type Storage } from '@google/gemini-cli-core';
+import { useState, useEffect, useContext } from 'react';
+import {
+  sessionId as globalSessionId,
+  Logger,
+  type Storage,
+} from '@google/gemini-cli-core';
+import { ConfigContext } from '../contexts/ConfigContext.js';
 
 /**
  * Hook to manage the logger instance.
  */
-export const useLogger = (storage: Storage) => {
+export const useLogger = (storage: Storage): Logger | null => {
   const [logger, setLogger] = useState<Logger | null>(null);
+  const config = useContext(ConfigContext);
 
   useEffect(() => {
-    const newLogger = new Logger(sessionId, storage);
+    const activeSessionId = config?.getSessionId() ?? globalSessionId;
+    const newLogger = new Logger(activeSessionId, storage);
+
     /**
      * Start async initialization, no need to await. Using await slows down the
      * time from launch to see the gemini-cli prompt and it's better to not save
@@ -26,7 +34,7 @@ export const useLogger = (storage: Storage) => {
         setLogger(newLogger);
       })
       .catch(() => {});
-  }, [storage]);
+  }, [storage, config]);
 
   return logger;
 };