fix: chat --help

Author: chaynabors

crates/q_cli/src/cli/mod.rs

@@ -344,16 +344,18 @@ impl Cli {
                 CliRootCommands::Telemetry(subcommand) => subcommand.execute().await,
                 CliRootCommands::Version { changelog } => Self::print_version(changelog),
                 CliRootCommands::Dashboard => launch_dashboard(false).await,
-                CliRootCommands::Chat { args } => Self::execute_chat(Some(args)).await,
+                CliRootCommands::Chat { args } => Self::execute_chat(Some(args), true).await,
                 CliRootCommands::Inline(subcommand) => subcommand.execute(&cli_context).await,
             },
             // Root command
-            None => Self::execute_chat(None).await,
+            None => Self::execute_chat(None, true).await,
         }
     }
 
-    async fn execute_chat(args: Option<Vec<String>>) -> Result<ExitCode> {
-        assert_logged_in().await?;
+    pub async fn execute_chat(args: Option<Vec<String>>, enforce_login: bool) -> Result<ExitCode> {
+        if enforce_login {
+            assert_logged_in().await?;
+        }
 
         let secret_store = SecretStore::new().await.ok();
         if let Some(secret_store) = secret_store {

crates/q_cli/src/main.rs

@@ -26,11 +26,26 @@ fn main() -> Result<ExitCode> {
     fig_telemetry::set_dispatch_mode(fig_telemetry::DispatchMode::On);
     fig_telemetry::init_global_telemetry_emitter();
 
+    let mut args = std::env::args();
+    let subcommand = args.nth(1);
     let multithread = matches!(
-        std::env::args().nth(1).as_deref(),
+        subcommand.as_deref(),
         Some("init" | "_" | "internal" | "completion" | "hook" | "chat")
     );
 
+    let runtime = if multithread {
+        tokio::runtime::Builder::new_multi_thread()
+    } else {
+        tokio::runtime::Builder::new_current_thread()
+    }
+    .enable_all()
+    .build()?;
+
+    // Hack as clap doesn't expose a custom command help.
+    if subcommand.as_deref() == Some("chat") && args.next().as_deref() == Some("--help") {
+        runtime.block_on(cli::Cli::execute_chat(Some(vec!["--help".to_owned()]), true))?;
+    }
+
     let parsed = match cli::Cli::try_parse() {
         Ok(cli) => cli,
         Err(err) => {
@@ -58,14 +73,6 @@ fn main() -> Result<ExitCode> {
 
     let verbose = parsed.verbose > 0;
 
-    let runtime = if multithread {
-        tokio::runtime::Builder::new_multi_thread()
-    } else {
-        tokio::runtime::Builder::new_current_thread()
-    }
-    .enable_all()
-    .build()?;
-
     let result = runtime.block_on(async {
         let result = parsed.execute().await;
         fig_telemetry::finish_telemetry().await;