fix(cli): move help/version exit logic to main and fix E2E failures

Author: rmedranollamas

packages/cli/src/config/config.ts

@@ -58,7 +58,6 @@ import {
 
 import { loadSandboxConfig } from './sandboxConfig.js';
 import { resolvePath } from '../utils/resolvePath.js';
-import { runExitCleanup } from '../utils/cleanup.js';
 import { isRecord } from '../utils/settingsUtils.js';
 import { RESUME_LATEST } from '../utils/sessionUtils.js';
 
@@ -83,6 +82,9 @@ export interface CliArgs {
   promptInteractive: string | undefined;
   worktree?: string;
 
+  help?: boolean;
+  version?: boolean;
+
   yolo: boolean | undefined;
   approvalMode: string | undefined;
   policy: string[] | undefined;
@@ -522,17 +524,6 @@ export async function parseArguments(
     throw new FatalConfigError(msg);
   }
 
-  // Handle help and version flags manually since we disabled exitProcess
-  if (result['help'] || result['version']) {
-    if (
-      process.env['VITEST'] !== 'true' &&
-      process.env['GEMINI_CLI_INTEGRATION_TEST'] !== 'true'
-    ) {
-      await runExitCleanup();
-      process.exit(0);
-    }
-  }
-
   // Normalize query args: handle both quoted "@path file" and unquoted @path file
   const queryArg = result['query'];
   let q: string | undefined;

packages/cli/src/gemini.tsx

@@ -423,6 +423,17 @@ export async function main() {
 
   const argv = await argvPromise;
 
+  if (argv.help || argv.version) {
+    if (
+      process.env['VITEST'] === 'true' ||
+      process.env['GEMINI_CLI_INTEGRATION_TEST'] === 'true'
+    ) {
+      return;
+    }
+    await runExitCleanup();
+    process.exit(0);
+  }
+
   const { sessionId, resumedSessionData } = await resolveSessionId(
     argv.resume,
     argv.sessionId,