diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts
index e3cf9326..b30685c3 100644
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -56,7 +56,7 @@ interface CliArgs {
 }
 
 async function parseArguments(): Promise<CliArgs> {
-  const argv = await yargs(hideBin(process.argv))
+  const yargsInstance = yargs(hideBin(process.argv))
     .scriptName('gemini')
     .usage(
       '$0 [options]',
@@ -171,9 +171,11 @@ async function parseArguments(): Promise<CliArgs> {
     .alias('v', 'version')
     .help()
     .alias('h', 'help')
-    .strict().argv;
+    .strict();
 
-  return argv;
+  yargsInstance.wrap(yargsInstance.terminalWidth());
+
+  return yargsInstance.argv;
 }
 
 // This function is now a thin wrapper around the server's implementation.