Fixes to successfully create binary

Author: kkashilk

build-config/buildspec-macos_aarch64.yml

@@ -12,10 +12,11 @@ phases:
     commands:
       - export AWS_MAX_ATTEMPTS=10
       - echo "path - $PATH"
+      - echo "user - $(whoami)"
       - AWS_ACCOUNT=`aws sts get-caller-identity | jq -r '.Account'`
       # For now assume there is a suitable EC2 instance running. Obviously, we could add a StepFunction here to
       # get a new one, but this is a start
-      - INSTANCE_ID=`aws ec2 describe-instances --filters "Name=tag:Name,Values=FigIoDesktop MacOS aarch64 Build Server 1" "Name=instance-state-name,Values=running" | jq -r '.Reservations[0].Instances[0].InstanceId'`
+      - INSTANCE_ID=`aws ec2 describe-instances --filters "Name=tag:Name,Values=FigIoDesktop MacOS aarch64 Build Server V2" "Name=instance-state-name,Values=running" | jq -r '.Reservations[0].Instances[0].InstanceId'`
       - echo "ec2 instance id - $INSTANCE_ID"
       # The name of the SSM document has to change every time its deployed, so go look for it
       # We can make this an environment variable passed into CodeBuild.
@@ -36,6 +37,7 @@ phases:
       # TODO(grant): change bucket name to env var
       - aws s3 cp --recursive s3://fig-io-desktop-build-output-$AWS_ACCOUNT-$AWS_REGION/staging .
       - aws s3 rm --recursive s3://fig-io-desktop-build-output-$AWS_ACCOUNT-$AWS_REGION/staging
+      - ls -la
 
 artifacts:
   files:

build-config/signing/app/manifest.yaml

@@ -1,9 +1,9 @@
 type: :app # no need to change this for .pkg, .dmg and executables
 os: :osx
-name: Amazon Q.app
+name: Kiro-Cli.app
 outputs:
   - label: macos
-    path: Amazon Q.app
+    path: Kiro-Cli.app
 app:
   :identifier: com.amazon.codewhisperer # this has to be same as Bundle identifier value in info.plist
   signing_requirements:
@@ -12,9 +12,9 @@ app:
     signing_args:
       entitlements_path: SIGNING_METADATA/entitlements.plist
   embedded_requirements:
-    Contents/MacOS/q:
-      :identifier: com.amazon.q
+    Contents/MacOS/kiro-cli:
+      :identifier: com.amazon.kiro-cli
       signing_args:
-    Contents/MacOS/qterm:
-      :identifier: com.amazon.qterm
+    Contents/MacOS/kiro-cli-term:
+      :identifier: com.amazon.kiro-cli-term
       signing_args:

build-scripts/build-macos.sh

@@ -50,9 +50,8 @@ done
 export CARGO_HOME="$PWD/../.cargo"
 RUSTUP_HOME="$PWD/../.rustup"
 
-# TODO: reenable once mise fixes http issues
-# mise install --verbose
-# eval "$(mise activate bash --shims)"
+mise install --verbose
+eval "$(mise activate bash --shims)"
 
 # clean up old install
 rm -rf "$CARGO_HOME"

build-scripts/build.py

@@ -53,6 +53,7 @@
     PTY_BINARY_NAME,
     PTY_PACKAGE_NAME,
     URL_SCHEMA,
+    CHAT_BINARY_BRANCH,
 )
 
 BUILD_DIR_RELATIVE = pathlib.Path(os.environ.get("BUILD_DIR") or "build")
@@ -208,7 +209,7 @@ def fetch_chat_bin(chat_build_bucket_name: str | None, chat_download_role_arn: s
     # The path to the download should be:
     # BUILD_BUCKET/prod/latest/{target}/kiro-cli-chat.zip
     target = get_target_triple()
-    chat_bucket_path = f"prod/latest/{target}/{CHAT_BINARY_NAME}.zip"
+    chat_bucket_path = f"{CHAT_BINARY_BRANCH}/latest/{target}/{CHAT_BINARY_NAME}.zip"
     chat_dl_dir = BUILD_DIR / "chat_download"
     chat_dl_dir.mkdir(exist_ok=True)
     chat_dl_path = chat_dl_dir / f"{CHAT_BINARY_NAME}.zip"

build-scripts/const.py

@@ -9,6 +9,7 @@
 URL_SCHEMA = "kiro-cli"
 TAURI_PRODUCT_NAME = "kiro_cli_desktop"
 LINUX_PACKAGE_NAME = "kiro-cli"
+CHAT_BINARY_BRANCH = "qv2"
 
 # macos specific
 MACOS_BUNDLE_ID = "com.amazon.codewhisperer"

bundle/deb/control

@@ -1,8 +1,8 @@
-Package: amazon-q
+Package: kiro-cli
 Description: Amazon Q CLI for Linux
 Maintainer: Amazon Q CLI Team <[email protected]>
 Homepage: https://github.com/aws/q-cli
 Version: $VERSION
 Architecture: $APT_ARCH
-Conflicts: amazon-q-minimal
+Conflicts: kiro-cli-minimal
 Depends: libayatana-appindicator3-1, libwebkit2gtk-4.1-0, libgtk-3-0, util-linux

bundle/deb/control_minimal

@@ -1,7 +1,7 @@
-Package: amazon-q-minimal
+Package: kiro-cli-minimal
 Description: Amazon Q CLI for Linux
 Maintainer: Amazon Q CLI Team <[email protected]>
 Homepage: https://github.com/aws/q-cli
 Version: $VERSION
 Architecture: $APT_ARCH
-Conflicts: amazon-q
+Conflicts: kiro-cli

bundle/deb/postrm

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-killall q-desktop || true
+killall kiro-cli-desktop || true

bundle/linux/install.sh

@@ -143,7 +143,7 @@ if [ -n "${Q_INSTALL_GLOBAL:-}" ]; then
     install -m 755 "$SCRIPT_DIR/bin/$CHAT_BINARY_NAME" /usr/local/bin/
     install -m 755 "$SCRIPT_DIR/bin/$PTY_BINARY_NAME" /usr/local/bin/
 
-    if [ -z "${Q_SKIP_SETUP:-}" ]; then
+    if [ -z "${KIRO_CLI_SKIP_SETUP:-}" ]; then
         /usr/local/bin/q integrations install dotfiles
         /usr/local/bin/q setup --global "$@"
     fi
@@ -154,7 +154,7 @@ else
     install -m 755 "$SCRIPT_DIR/bin/$CHAT_BINARY_NAME" "$HOME/.local/bin/"
     install -m 755 "$SCRIPT_DIR/bin/$PTY_BINARY_NAME" "$HOME/.local/bin/"
 
-    if [ -z "${Q_SKIP_SETUP:-}" ]; then
+    if [ -z "${KIRO_CLI_SKIP_SETUP:-}" ]; then
         "$HOME/.local/bin/q" setup "$@"
     fi
 fi

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

@@ -251,6 +251,7 @@ impl ContextManager {
     ///
     /// # Returns
     /// A Result containing a vector of profile names, with "default" always first
+    #[cfg_attr(target_os = "windows", allow(dead_code))]
     pub fn list_profiles_blocking(&self, os: &Os) -> Result<Vec<String>> {
         let _ = self;