summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Hutchison <[email protected]>2025-05-21 13:31:18 -0700
committerGitHub <[email protected]>2025-05-21 13:31:18 -0700
commita0761f0c41942d5981306f99e78aca40588d28fa (patch)
treef6d954c416cb1e60976d7a231ab843d9bed8abbf
parent00ab1905e0b252a70e2171b3f83d36adb7fec250 (diff)
Fix: Resolve CLI version reporting in /bug command (#455)
-rw-r--r--packages/cli/src/ui/App.tsx5
-rw-r--r--packages/cli/src/ui/hooks/slashCommandProcessor.test.ts3
-rw-r--r--packages/cli/src/ui/hooks/slashCommandProcessor.ts7
3 files changed, 9 insertions, 6 deletions
diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx
index 88b95481..42613530 100644
--- a/packages/cli/src/ui/App.tsx
+++ b/packages/cli/src/ui/App.tsx
@@ -28,10 +28,10 @@ import { Tips } from './components/Tips.js';
import { ConsoleOutput } from './components/ConsolePatcher.js';
import { HistoryItemDisplay } from './components/HistoryItemDisplay.js';
import { useHistory } from './hooks/useHistoryManager.js';
-import { useLogger } from './hooks/useLogger.js';
import process from 'node:process';
import { MessageType } from './types.js';
import { getErrorMessage, type Config } from '@gemini-code/server';
+import { useLogger } from './hooks/useLogger.js';
interface AppProps {
config: Config;
@@ -53,7 +53,7 @@ export const App = ({
setStaticKey((prev) => prev + 1);
}, [setStaticKey]);
- const [geminiMdFileCount, setGeminiMdFileCount] = useState<number>(0); // Added for memory file count
+ const [geminiMdFileCount, setGeminiMdFileCount] = useState<number>(0);
const [debugMessage, setDebugMessage] = useState<string>('');
const [showHelp, setShowHelp] = useState<boolean>(false);
const [themeError, setThemeError] = useState<string | null>(null);
@@ -131,6 +131,7 @@ export const App = ({
openThemeDialog,
performMemoryRefresh,
toggleCorgiMode,
+ cliVersion,
);
const { streamingState, submitQuery, initError, pendingHistoryItem } =
diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts
index a17fcd1e..beee1418 100644
--- a/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts
+++ b/packages/cli/src/ui/hooks/slashCommandProcessor.test.ts
@@ -102,6 +102,7 @@ describe('useSlashCommandProcessor', () => {
mockOpenThemeDialog,
mockPerformMemoryRefresh,
mockCorgiMode,
+ 'test-version',
),
);
return result.current;
@@ -248,7 +249,7 @@ describe('useSlashCommandProcessor', () => {
sandboxEnvVar?: string,
seatbeltProfileVar?: string,
) => {
- const cliVersion = process.env.npm_package_version || 'Unknown';
+ const cliVersion = 'test-version';
const osVersion = `${process.platform} ${process.version}`;
let sandboxEnvStr = 'no sandbox';
if (sandboxEnvVar && sandboxEnvVar !== 'sandbox-exec') {
diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
index 9f6a6d5e..858897f0 100644
--- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts
+++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
@@ -24,15 +24,16 @@ export interface SlashCommand {
* Hook to define and process slash commands (e.g., /help, /clear).
*/
export const useSlashCommandProcessor = (
- config: Config | null, // Add config here
+ config: Config | null,
addItem: UseHistoryManagerReturn['addItem'],
clearItems: UseHistoryManagerReturn['clearItems'],
refreshStatic: () => void,
setShowHelp: React.Dispatch<React.SetStateAction<boolean>>,
onDebugMessage: (message: string) => void,
openThemeDialog: () => void,
- performMemoryRefresh: () => Promise<void>, // Add performMemoryRefresh prop
+ performMemoryRefresh: () => Promise<void>,
toggleCorgiMode: () => void,
+ cliVersion: string,
) => {
const addMessage = useCallback(
(message: Message) => {
@@ -149,7 +150,6 @@ export const useSlashCommandProcessor = (
}
bugDescription = bugDescription.trim();
- const cliVersion = process.env.npm_package_version || 'Unknown';
const osVersion = `${process.platform} ${process.version}`;
let sandboxEnv = 'no sandbox';
if (process.env.SANDBOX && process.env.SANDBOX !== 'sandbox-exec') {
@@ -226,6 +226,7 @@ Add any other context about the problem here.
addMessage,
toggleCorgiMode,
config, // Added config to dependency array
+ cliVersion,
],
);