Moved the wrapper creation logic to the installation function of kiro-cli

Author: abhraina-aws

crates/fig_desktop/src/install.rs

@@ -327,7 +327,13 @@ 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_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 +666,11 @@ 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");
+    }
+
     Ok(())
 }
 

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

@@ -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"];
+pub const OLD_CLI_BINARY_NAMES: &[&str] = &["cw", "q"];
 pub const OLD_PTY_BINARY_NAMES: &[&str] = &["cwterm"];
 
 pub const GITHUB_REPO_NAME: &str = "aws/amazon-q-developer-cli";

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,

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"
@@ -478,14 +461,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