Add a flag and write a wrapper script to redirect all old q calls to kirocli with a warning both install and update

Author: abhraina-aws

crates/fig_install/src/common.rs

@@ -72,7 +72,7 @@ pub async fn uninstall(components: InstallComponents, ctx: Arc<Context>) -> Resu
         // let folders = [directories::home_local_bin()?, Path::new("/usr/local/bin").into()];
         let folders = [directories::home_local_bin()?];
 
-        let mut all_binary_names = vec![CLI_BINARY_NAME, CHAT_BINARY_NAME, PTY_BINARY_NAME];
+        let mut all_binary_names = vec![CLI_BINARY_NAME, CHAT_BINARY_NAME, PTY_BINARY_NAME, "q"];
         all_binary_names.extend(OLD_CLI_BINARY_NAMES);
         all_binary_names.extend(OLD_PTY_BINARY_NAMES);
 

crates/fig_install/src/linux.rs

@@ -110,6 +110,12 @@ async fn replace_bins(bin_dir: &Path) -> Result<(), Error> {
             }
         }
     }
+
+    // Create legacy q wrapper script after updating binaries
+    if let Err(err) = fig_util::wrapper::create_q_wrapper(&local_bin).await {
+        tracing::warn!("Failed to create q wrapper: {}", err);
+    }
+
     res
 }
 

crates/fig_util/src/lib.rs

@@ -5,6 +5,7 @@ pub mod process_info;
 mod shell;
 pub mod system_info;
 pub mod terminal;
+pub mod wrapper;
 
 pub mod consts;
 #[cfg(target_os = "macos")]

crates/fig_util/src/wrapper.rs

@@ -0,0 +1,54 @@
+use std::path::Path;
+
+use crate::Error;
+
+/// Create legacy q wrapper script for backward compatibility
+pub async fn create_q_wrapper(install_dir: &Path) -> Result<(), Error> {
+    let wrapper_path = install_dir.join("q");
+
+    // Check what exists and handle appropriately
+    if wrapper_path.exists() {
+        let metadata = tokio::fs::symlink_metadata(&wrapper_path).await?;
+
+        if metadata.is_symlink() {
+            // It's a symlink (likely from old installation) - safe to replace
+            tokio::fs::remove_file(&wrapper_path).await?;
+        } else if is_our_wrapper(&wrapper_path).await? {
+            // It's our wrapper from previous install - safe to replace
+            tokio::fs::remove_file(&wrapper_path).await?;
+        } else {
+            // It's something else (assume old Q CLI) - safe to replace per our assumption
+            tokio::fs::remove_file(&wrapper_path).await?;
+        }
+    }
+
+    // Create wrapper script content
+    let wrapper_content = format!(
+        "#!/bin/sh\n\"{}/kiro-cli\" --show-legacy-warning \"$@\"\n",
+        install_dir.display()
+    );
+
+    // Write wrapper script
+    tokio::fs::write(&wrapper_path, wrapper_content).await?;
+
+    // Make executable
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+        let mut perms = tokio::fs::metadata(&wrapper_path).await?.permissions();
+        perms.set_mode(0o755);
+        tokio::fs::set_permissions(&wrapper_path, perms).await?;
+    }
+
+    Ok(())
+}
+
+/// Check if the existing q command is our wrapper script
+async fn is_our_wrapper(path: &Path) -> Result<bool, Error> {
+    if let Ok(content) = tokio::fs::read_to_string(path).await {
+        // Check if it contains our signature
+        Ok(content.contains("--show-legacy-warning") && content.contains("kiro-cli"))
+    } else {
+        Ok(false)
+    }
+}

crates/q_cli/src/cli/internal/mod.rs

@@ -777,6 +777,11 @@ impl InternalSubcommand {
                     tokio::time::sleep(Duration::from_millis(200)).await;
                 }
 
+                // Create legacy q wrapper script for backward compatibility
+                if let Err(err) = fig_util::wrapper::create_q_wrapper(&fig_util::directories::home_local_bin()?).await {
+                    tracing::warn!("Failed to create q wrapper: {}", err);
+                }
+
                 launch_fig_desktop(LaunchArgs {
                     wait_for_socket: false,
                     open_dashboard: relaunch_dashboard,

crates/q_cli/src/cli/mod.rs

@@ -89,6 +89,8 @@ use crate::util::{
     is_logged_in_check,
 };
 
+const LEGACY_WARNING: &str = "Warn: Q CLI is now Kiro CLI and should be invoked as kiro-cli rather than q";
+
 #[derive(Debug, Clone, Copy, Default, PartialEq, Eq, ValueEnum)]
 pub enum OutputFormat {
     /// Outputs the results as markdown
@@ -292,10 +294,18 @@ pub struct Cli {
     /// Print help for all subcommands
     #[arg(long)]
     help_all: bool,
+    /// Show legacy warning for q command
+    #[arg(long, hide = true, default_value = "false")]
+    show_legacy_warning: bool,
 }
 
 impl Cli {
     pub async fn execute(self) -> Result<ExitCode> {
+        // Show legacy warning if flag is set
+        if self.show_legacy_warning {
+            eprintln!("{}", LEGACY_WARNING);
+        }
+
         // Initialize our logger and keep around the guard so logging can perform as expected.
         let _log_guard = initialize_logging(LogArgs {
             log_level: match self.verbose > 0 {
@@ -698,21 +708,18 @@ mod test {
     #[test]
     fn test_flags() {
         assert_eq!(Cli::parse_from([CLI_BINARY_NAME, "-v"]), Cli {
-            subcommand: None,
             verbose: 1,
-            help_all: false,
+            ..Default::default()
         });
 
         assert_eq!(Cli::parse_from([CLI_BINARY_NAME, "-vvv"]), Cli {
-            subcommand: None,
             verbose: 3,
-            help_all: false,
+            ..Default::default()
         });
 
         assert_eq!(Cli::parse_from([CLI_BINARY_NAME, "--help-all"]), Cli {
-            subcommand: None,
-            verbose: 0,
             help_all: true,
+            ..Default::default()
         });
     }
 

scripts/install.sh

@@ -318,6 +318,23 @@ create_symlink() {
     ln -s "$src" "$dst"
 }
 
+# Create legacy q wrapper script
+create_q_wrapper() {
+    local install_dir="$1"
+    local wrapper_path="$install_dir/q"
+    
+    # Remove existing q command if it exists
+    rm -f "$wrapper_path"
+    
+    # Create wrapper script
+    cat > "$wrapper_path" << EOF
+#!/bin/sh
+"$install_dir/kiro-cli" --show-legacy-warning "\$@"
+EOF
+    
+    chmod +x "$wrapper_path"
+}
+
 # Install on macOS
 install_macos() {
     local dmg_path="$1"
@@ -461,6 +478,14 @@ main() {
         install_linux "$downloaded_file"
     fi
 
+    # Create legacy q wrapper script
+    log "Creating legacy q wrapper..."
+    if [[ "$os" == "macos" ]]; then
+        create_q_wrapper "$HOME/.local/bin"
+    else
+        create_q_wrapper "$LINUX_INSTALL_DIR"
+    fi
+    
     SUCCESS=true
 
     echo