From ddbe65e8c32cef67f7562b7f02aaf6e9fefb6968 Mon Sep 17 00:00:00 2001
From: owenofbrien <86964623+owenofbrien@users.noreply.github.com>
Date: Fri, 15 Aug 2025 10:15:54 -0500
Subject: Add session id to session summary and /bug template (#6313)

Co-authored-by: Bryan Morgan <bryanmorgan@google.com>
---
 packages/cli/src/ui/commands/bugCommand.test.ts | 6 ++++++
 packages/cli/src/ui/commands/bugCommand.ts      | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'packages/cli/src/ui/commands')

diff --git a/packages/cli/src/ui/commands/bugCommand.test.ts b/packages/cli/src/ui/commands/bugCommand.test.ts
index 1a618fd1..89e3b561 100644
--- a/packages/cli/src/ui/commands/bugCommand.test.ts
+++ b/packages/cli/src/ui/commands/bugCommand.test.ts
@@ -16,6 +16,7 @@ import { formatMemoryUsage } from '../utils/formatters.js';
 vi.mock('open');
 vi.mock('../../utils/version.js');
 vi.mock('../utils/formatters.js');
+vi.mock('@google/gemini-cli-core');
 vi.mock('node:process', () => ({
   default: {
     platform: 'test-platform',
@@ -30,6 +31,9 @@ describe('bugCommand', () => {
   beforeEach(() => {
     vi.mocked(getCliVersion).mockResolvedValue('0.1.0');
     vi.mocked(formatMemoryUsage).mockReturnValue('100 MB');
+    vi.mock('@google/gemini-cli-core', () => ({
+      sessionId: 'test-session-id',
+    }));
     vi.stubEnv('SANDBOX', 'gemini-test');
   });
 
@@ -54,6 +58,7 @@ describe('bugCommand', () => {
     const expectedInfo = `
 * **CLI Version:** 0.1.0
 * **Git Commit:** ${GIT_COMMIT_INFO}
+* **Session ID:** test-session-id
 * **Operating System:** test-platform v20.0.0
 * **Sandbox Environment:** test
 * **Model Version:** gemini-pro
@@ -84,6 +89,7 @@ describe('bugCommand', () => {
     const expectedInfo = `
 * **CLI Version:** 0.1.0
 * **Git Commit:** ${GIT_COMMIT_INFO}
+* **Session ID:** test-session-id
 * **Operating System:** test-platform v20.0.0
 * **Sandbox Environment:** test
 * **Model Version:** gemini-pro
diff --git a/packages/cli/src/ui/commands/bugCommand.ts b/packages/cli/src/ui/commands/bugCommand.ts
index 667276ab..528b2b4c 100644
--- a/packages/cli/src/ui/commands/bugCommand.ts
+++ b/packages/cli/src/ui/commands/bugCommand.ts
@@ -15,6 +15,7 @@ import { MessageType } from '../types.js';
 import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
 import { formatMemoryUsage } from '../utils/formatters.js';
 import { getCliVersion } from '../../utils/version.js';
+import { sessionId } from '@google/gemini-cli-core';
 
 export const bugCommand: SlashCommand = {
   name: 'bug',
@@ -40,6 +41,7 @@ export const bugCommand: SlashCommand = {
     const info = `
 * **CLI Version:** ${cliVersion}
 * **Git Commit:** ${GIT_COMMIT_INFO}
+* **Session ID:** ${sessionId}
 * **Operating System:** ${osVersion}
 * **Sandbox Environment:** ${sandboxEnv}
 * **Model Version:** ${modelVersion}
-- 
cgit v1.2.3