Redirect q settings list cmd to qchat (#832)

Author: kkashilk

crates/chat-cli/src/cli/chat/tool_manager.rs

@@ -1000,7 +1000,7 @@ impl ToolManager {
                             Ok(candidates.first().map(|s| s.as_str()).unwrap())
                         } else if candidates.len() > 1 {
                             let mut content = candidates.iter().fold(
-                                "There are multilple tools with given tool name: ".to_string(),
+                                "There are multiple tools with given tool name: ".to_string(),
                                 |mut acc, name| {
                                     acc.push_str(name);
                                     acc.push_str(", ");

crates/fig_integrations/src/file.rs

@@ -134,21 +134,21 @@ mod tests {
             integration.describe()
         );
 
-        // ensure no intgration is marked as not installed
+        // ensure no integration is marked as not installed
         assert!(matches!(
             integration.is_installed().await,
             Err(Error::FileDoesNotExist(_))
         ));
 
-        // ensure the intgration can be installed
+        // ensure the integration can be installed
         integration.install().await.unwrap();
         assert!(integration.is_installed().await.is_ok());
 
-        // ensure the intgration can be installed while already installed
+        // ensure the integration can be installed while already installed
         integration.install().await.unwrap();
         assert!(integration.is_installed().await.is_ok());
 
-        // ensure the intgration can be uninstalled
+        // ensure the integration can be uninstalled
         integration.uninstall().await.unwrap();
         assert!(matches!(
             integration.is_installed().await,

crates/q_cli/src/cli/mod.rs

@@ -25,7 +25,6 @@ use std::io::{
     Write as _,
     stdout,
 };
-use std::path::PathBuf;
 use std::process::ExitCode;
 
 use anstream::{
@@ -61,7 +60,6 @@ use fig_log::{
 };
 use fig_proto::local::UiElement;
 use fig_settings::sqlite::database;
-use fig_util::directories::home_local_bin;
 use fig_util::{
     CLI_BINARY_NAME,
     PRODUCT_NAME,
@@ -88,6 +86,7 @@ use crate::util::desktop::{
 use crate::util::{
     CliContext,
     assert_logged_in,
+    qchat_path,
 };
 
 #[derive(Debug, Clone, Copy, Default, PartialEq, Eq, ValueEnum)]
@@ -599,37 +598,6 @@ async fn launch_dashboard(help_fallback: bool) -> Result<ExitCode> {
     Ok(ExitCode::SUCCESS)
 }
 
-#[cfg(target_os = "linux")]
-fn qchat_path() -> Result<PathBuf> {
-    use fig_os_shim::Context;
-    use fig_util::consts::CHAT_BINARY_NAME;
-
-    let ctx = Context::new();
-    if let Some(path) = ctx.process_info().current_pid().exe() {
-        // This is required for deb installations.
-        if path.starts_with("/usr/bin") {
-            return Ok(PathBuf::from("/usr/bin").join(CHAT_BINARY_NAME));
-        }
-    }
-
-    if let Ok(local_bin_path) = home_local_bin() {
-        let local_bin_path = local_bin_path.join(CHAT_BINARY_NAME);
-        if local_bin_path.exists() {
-            return Ok(local_bin_path);
-        }
-    }
-
-    Ok(PathBuf::from(CHAT_BINARY_NAME))
-}
-
-#[cfg(target_os = "macos")]
-fn qchat_path() -> Result<PathBuf> {
-    use fig_util::consts::CHAT_BINARY_NAME;
-    use macos_utils::bundle::get_bundle_path_for_executable;
-
-    Ok(get_bundle_path_for_executable(CHAT_BINARY_NAME).unwrap_or(home_local_bin()?.join(CHAT_BINARY_NAME)))
-}
-
 #[cfg(test)]
 mod test {
     use super::*;

crates/q_cli/src/cli/settings.rs

@@ -6,6 +6,7 @@ use clap::{
     Args,
     Parser,
     Subcommand,
+    ValueEnum,
 };
 use eyre::{
     Result,
@@ -35,13 +36,24 @@ use crate::util::desktop::{
 use crate::util::{
     CliContext,
     app_not_running_message,
+    qchat_path,
 };
 
 #[derive(Debug, Subcommand, PartialEq, Eq)]
 pub enum SettingsSubcommands {
     /// Open the settings file
     Open,
-    /// List all the settings
+    /// List settings
+    List {
+        /// Show all available settings
+        #[arg(long)]
+        all: bool,
+        /// Format of the output
+        #[arg(long, short, value_enum, default_value_t)]
+        format: OutputFormat,
+    },
+    /// List configured settings
+    #[command(hide = true)]
     All {
         /// Format of the output
         #[arg(long, short, value_enum, default_value_t)]
@@ -52,15 +64,15 @@ pub enum SettingsSubcommands {
 #[derive(Debug, Args, PartialEq, Eq)]
 #[command(subcommand_negates_reqs = true)]
 #[command(args_conflicts_with_subcommands = true)]
-#[command(group(ArgGroup::new("vals").requires("key").args(&["value", "delete", "format"])))]
+#[command(group(ArgGroup::new("vals").requires("key").args(&["value", "format"])))]
 pub struct SettingsArgs {
     #[command(subcommand)]
     cmd: Option<SettingsSubcommands>,
     /// key
     key: Option<String>,
     /// value
     value: Option<String>,
-    /// Delete a value
+    /// Delete a key (No value needed)
     #[arg(long, short)]
     delete: bool,
     /// Format of the output
@@ -89,25 +101,45 @@ impl SettingsArgs {
                     bail!("The EDITOR environment variable is not set")
                 }
             },
+            Some(SettingsSubcommands::List { all, format }) => {
+                let mut args = vec!["settings".to_string(), "list".to_string()];
+                if all {
+                    args.push("--all".to_string());
+                }
+                if format != OutputFormat::default() {
+                    args.push("--format".to_string());
+                    args.push(format.to_possible_value().unwrap().get_name().to_string());
+                }
+
+                let status = tokio::process::Command::new(qchat_path()?).args(&args).status().await?;
+
+                Ok(if status.success() {
+                    ExitCode::SUCCESS
+                } else {
+                    ExitCode::FAILURE
+                })
+            },
             Some(SettingsSubcommands::All { format }) => {
-                let settings = fig_settings::OldSettings::load()?.map().clone();
+                let mut args = vec!["settings".to_string(), "list".to_string()];
 
-                match format {
-                    OutputFormat::Plain => {
-                        for (key, value) in settings {
-                            println!("{key} = {value}");
-                        }
-                    },
-                    OutputFormat::Json => println!("{}", serde_json::to_string(&settings)?),
-                    OutputFormat::JsonPretty => {
-                        println!("{}", serde_json::to_string_pretty(&settings)?);
-                    },
+                if format != OutputFormat::default() {
+                    args.push("--format".to_string());
+                    args.push(format.to_possible_value().unwrap().get_name().to_string());
                 }
 
-                Ok(ExitCode::SUCCESS)
+                let status = tokio::process::Command::new(qchat_path()?).args(&args).status().await?;
+
+                Ok(if status.success() {
+                    ExitCode::SUCCESS
+                } else {
+                    ExitCode::FAILURE
+                })
             },
             None => match &self.key {
                 Some(key) => match (&self.value, self.delete) {
+                    (Some(_), true) => Err(eyre::eyre!(
+                        "the argument '--delete' cannot be used with '[VALUE]'\n Usage: q settings --delete {key}"
+                    )),
                     (None, false) => match fig_settings::settings::get_value(key)? {
                         Some(value) => {
                             match self.format {
@@ -161,9 +193,14 @@ impl SettingsArgs {
 
                         Ok(ExitCode::SUCCESS)
                     },
-                    _ => Ok(ExitCode::SUCCESS),
                 },
                 None => {
+                    if self.delete {
+                        return Err(eyre::eyre!(
+                            "the argument '--delete' requires a <KEY>\n Usage: q settings --delete <KEY>"
+                        ));
+                    }
+
                     if manifest::is_minimal() || system_info::is_remote() {
                         Cli::parse_from([CLI_BINARY_NAME, "settings", "--help"]);
                         return Ok(ExitCode::SUCCESS);

crates/q_cli/src/util/mod.rs

@@ -38,7 +38,9 @@ use eyre::{
 };
 use fig_ipc::local::quit_command;
 use fig_util::consts::APP_BUNDLE_ID;
+use fig_util::directories::home_local_bin;
 use fig_util::{
+    CHAT_BINARY_NAME,
     CLI_BINARY_NAME,
     PRODUCT_NAME,
 };
@@ -124,6 +126,34 @@ pub fn app_path_from_bundle_id(bundle_id: impl AsRef<OsStr>) -> Option<String> {
     }
 }
 
+#[cfg(target_os = "linux")]
+pub fn qchat_path() -> Result<PathBuf> {
+    use fig_os_shim::Context;
+
+    let ctx = Context::new();
+    if let Some(path) = ctx.process_info().current_pid().exe() {
+        // This is required for deb installations.
+        if path.starts_with("/usr/bin") {
+            return Ok(PathBuf::from("/usr/bin").join(CHAT_BINARY_NAME));
+        }
+    }
+
+    if let Ok(local_bin_path) = home_local_bin() {
+        let local_bin_path = local_bin_path.join(CHAT_BINARY_NAME);
+        if local_bin_path.exists() {
+            return Ok(local_bin_path);
+        }
+    }
+
+    Ok(PathBuf::from(CHAT_BINARY_NAME))
+}
+
+#[cfg(target_os = "macos")]
+pub fn qchat_path() -> Result<PathBuf> {
+    use macos_utils::bundle::get_bundle_path_for_executable;
+
+    Ok(get_bundle_path_for_executable(CHAT_BINARY_NAME).unwrap_or(home_local_bin()?.join(CHAT_BINARY_NAME)))
+}
 pub async fn quit_fig(verbose: bool) -> Result<ExitCode> {
     if fig_util::system_info::in_cloudshell() {
         bail!("Restarting {PRODUCT_NAME} is not supported in CloudShell");