refactor: Centralize session ID generation and propagation

2 files changed, 4 insertions, 3 deletions

diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
index 4d677f1e..69fb6d06 100644
--- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts
+++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
@@ -493,7 +493,7 @@ Add any other context about the problem here.
         description: 'save conversation checkpoint. Usage: /save [tag]',
         action: async (_mainCommand, subCommand, _args) => {
           const tag = (subCommand || '').trim();
-          const logger = new Logger();
+          const logger = new Logger(config?.getSessionId() || '');
           await logger.initialize();
           const chat = await config?.getGeminiClient()?.getChat();
           const history = chat?.getHistory() || [];
@@ -519,7 +519,7 @@ Add any other context about the problem here.
           'resume from conversation checkpoint. Usage: /resume [tag]',
         action: async (_mainCommand, subCommand, _args) => {
           const tag = (subCommand || '').trim();
-          const logger = new Logger();
+          const logger = new Logger(config?.getSessionId() || '');
           await logger.initialize();
           const conversation = await logger.loadCheckpoint(tag);
           if (conversation.length === 0) {
diff --git a/packages/cli/src/ui/hooks/useLogger.ts b/packages/cli/src/ui/hooks/useLogger.ts
index ea6227ce..ea6d6057 100644
--- a/packages/cli/src/ui/hooks/useLogger.ts
+++ b/packages/cli/src/ui/hooks/useLogger.ts
@@ -5,6 +5,7 @@
  */
 
 import { useState, useEffect } from 'react';
+import { sessionId } from '@gemini-cli/core';
 import { Logger } from '@gemini-cli/core';
 
 /**
@@ -14,7 +15,7 @@ export const useLogger = () => {
   const [logger, setLogger] = useState<Logger | null>(null);
 
   useEffect(() => {
-    const newLogger = new Logger();
+    const newLogger = new Logger(sessionId);
     /**
      * 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