Merge branch 'qv2' into qv2-merge

Author: kkashilk

crates/fig_desktop/src/install.rs

@@ -13,6 +13,7 @@ use semver::Version;
 use tracing::{
     error,
     info,
+    warn,
 };
 
 #[allow(unused_imports)]
@@ -327,7 +328,18 @@ pub async fn initialize_fig_dir(env: &fig_os_shim::Env) -> anyhow::Result<()> {
 
             for old_cli_binary_name in OLD_CLI_BINARY_NAMES {
                 let old_cli_binary_path = local_bin.join(old_cli_binary_name);
-                if old_cli_binary_path.is_symlink() {
+                if old_cli_binary_name == &"q" {
+                    // Create wrapper script for q instead of symlink
+                    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 {
                         warn!(%err, "Failed to symlink legacy CLI: {old_cli_binary_path:?}");
                     }
@@ -660,6 +672,16 @@ 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 {
+        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_install/src/linux.rs

@@ -111,11 +111,6 @@ 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/consts.rs

@@ -36,7 +36,7 @@ pub const BACKUP_DIR_NAME: &str = ".amazon-q.dotfiles.bak";
 
 // 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"];
+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/internal/mod.rs

@@ -777,11 +777,6 @@ 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

@@ -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.

scripts/install.sh

@@ -318,23 +318,6 @@ 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"
@@ -475,14 +458,6 @@ 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