redirecting qchat binary also. Also added a better warning message

Author: abhraina-aws

crates/fig_desktop/src/install.rs

@@ -332,6 +332,11 @@ pub async fn initialize_fig_dir(env: &fig_os_shim::Env) -> anyhow::Result<()> {
                     if let Err(err) = fig_util::wrapper::create_q_wrapper(&local_bin).await {
                         warn!(%err, "Failed to create q wrapper script");
                     }
+                } else if old_cli_binary_name == &"qchat" {
+                    // Create wrapper script for qchat that calls q chat
+                    if let Err(err) = fig_util::wrapper::create_qchat_wrapper(&local_bin).await {
+                        warn!(%err, "Failed to create qchat wrapper script");
+                    }
                 } else if old_cli_binary_path.is_symlink() {
                     // Handle other legacy binaries (cw) with symlinks
                     if let Err(err) = symlink(&q_cli_path, &old_cli_binary_path).await {
@@ -668,7 +673,12 @@ async fn install_appimage_binaries(ctx: &Context) -> anyhow::Result<()> {
 
     // Create q wrapper for backward compatibility
     if let Err(err) = fig_util::wrapper::create_q_wrapper(&home_local_bin_ctx(ctx)?).await {
-        error!(%err, "Failed to create q wrapper script");
+        warn!(%err, "Failed to create q wrapper script");
+    }
+
+    // Create qchat wrapper for backward compatibility
+    if let Err(err) = fig_util::wrapper::create_qchat_wrapper(&home_local_bin_ctx(ctx)?).await {
+        warn!(%err, "Failed to create qchat wrapper script");
     }
 
     Ok(())

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, "q"];
+        let mut all_binary_names = vec![CLI_BINARY_NAME, CHAT_BINARY_NAME, PTY_BINARY_NAME, "q", "qchat"];
         all_binary_names.extend(OLD_CLI_BINARY_NAMES);
         all_binary_names.extend(OLD_PTY_BINARY_NAMES);
 

crates/fig_util/src/consts.rs

@@ -27,7 +27,7 @@ pub const RUNTIME_DIR_NAME: &str = "cwrun";
 
 // These are the old "CodeWhisperer" branding, used anywhere we will not update to Amazon Q
 pub const OLD_PRODUCT_NAME: &str = "CodeWhisperer";
-pub const OLD_CLI_BINARY_NAMES: &[&str] = &["cw", "q"];
+pub const OLD_CLI_BINARY_NAMES: &[&str] = &["cw", "q", "qchat"];
 pub const OLD_PTY_BINARY_NAMES: &[&str] = &["cwterm"];
 
 pub const GITHUB_REPO_NAME: &str = "aws/amazon-q-developer-cli";

crates/fig_util/src/wrapper.rs

@@ -43,6 +43,33 @@ pub async fn create_q_wrapper(install_dir: &Path) -> Result<(), Error> {
     Ok(())
 }
 
+/// Create legacy qchat wrapper script for backward compatibility
+pub async fn create_qchat_wrapper(install_dir: &Path) -> Result<(), Error> {
+    let wrapper_path = install_dir.join("qchat");
+
+    // Remove existing qchat command if it exists
+    if wrapper_path.exists() {
+        tokio::fs::remove_file(&wrapper_path).await?;
+    }
+
+    // Create wrapper script content that calls q chat
+    let wrapper_content = format!("#!/bin/sh\n\"{}/q\" chat \"$@\"\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 {

crates/q_cli/src/cli/mod.rs

@@ -90,7 +90,7 @@ 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";
+const LEGACY_WARNING: &str = "Warning! 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 {
@@ -304,7 +304,7 @@ impl Cli {
     pub async fn execute(self) -> Result<ExitCode> {
         // Show legacy warning if flag is set
         if self.show_legacy_warning {
-            eprintln!("{}", LEGACY_WARNING);
+            eprintln!("\x1b[33m{}\x1b[0m", LEGACY_WARNING);
         }
 
         // Initialize our logger and keep around the guard so logging can perform as expected.