Revert "feat: rebrand environment variables from Q_/AMAZON_Q_ to KIRO_"

This reverts commit 49cbe8e.

Author: dk19y

crates/chat-cli/src/api_client/mod.rs

@@ -139,7 +139,7 @@ impl ApiClient {
                 model_cache: Arc::new(RwLock::new(None)),
             };
 
-            if let Ok(json) = env.get("KIRO_MOCK_CHAT_RESPONSE") {
+            if let Ok(json) = env.get("Q_MOCK_CHAT_RESPONSE") {
                 this.set_mock_output(serde_json::from_str(fs.read_to_string(json).await.unwrap().as_str()).unwrap());
             }
 

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

@@ -3026,7 +3026,7 @@ impl ChatSession {
                 }
 
                 // Display continuation ID if available and debug mode is enabled
-                if std::env::var_os("KIRO_SHOW_CONTINUATION_IDS").is_some() {
+                if std::env::var_os("Q_SHOW_CONTINUATION_IDS").is_some() {
                     queue!(
                         self.stdout,
                         style::Print(format!("({})\n", self.conversation.current_continuation_id())),

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

@@ -1981,7 +1981,7 @@ fn queue_failure_message(
         style::Print(fail_load_msg),
         style::Print("\n"),
         style::Print(format!(
-            " - run with KIRO_LOG_LEVEL=trace and see $TMPDIR/qlog/{CHAT_BINARY_NAME}.log for detail\n"
+            " - run with Q_LOG_LEVEL=trace and see $TMPDIR/qlog/{CHAT_BINARY_NAME}.log for detail\n"
         )),
         StyledText::reset(),
     )?)

crates/chat-cli/src/cli/chat/tools/execute/unix.rs

@@ -30,7 +30,7 @@ pub async fn run_command<W: Write>(
     max_result_size: usize,
     mut updates: Option<W>,
 ) -> Result<CommandResult> {
-    let shell = std::env::var("KIRO_CHAT_SHELL").unwrap_or("bash".to_string());
+    let shell = std::env::var("AMAZON_Q_CHAT_SHELL").unwrap_or("bash".to_string());
 
     // Set up environment variables with user agent metadata for CloudTrail tracking
     let env_vars = env_vars_with_user_agent(os);

crates/chat-cli/src/cli/chat/tools/mod.rs

@@ -459,7 +459,7 @@ fn format_path(cwd: impl AsRef<Path>, path: impl AsRef<Path>) -> String {
 
 fn supports_truecolor(os: &Os) -> bool {
     // Simple override to disable truecolor since shell_color doesn't use Context.
-    !os.env.get("KIRO_DISABLE_TRUECOLOR").is_ok_and(|s| !s.is_empty())
+    !os.env.get("Q_DISABLE_TRUECOLOR").is_ok_and(|s| !s.is_empty())
         && shell_color::get_color_support().contains(shell_color::ColorSupport::TERM24BIT)
 }
 

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

@@ -238,7 +238,7 @@ impl Cli {
                 ),
                 false => None,
             },
-            log_to_stdout: std::env::var_os("KIRO_LOG_STDOUT").is_some() || self.verbose > 0,
+            log_to_stdout: std::env::var_os("Q_LOG_STDOUT").is_some() || self.verbose > 0,
             log_file_path: match subcommand {
                 RootSubcommand::Chat { .. } => Some(logs_dir().expect("home dir must be set").join("qchat.log")),
                 _ => None,

crates/chat-cli/src/logging.rs

@@ -14,7 +14,7 @@ use tracing_subscriber::{
     fmt,
 };
 
-use crate::util::env_var::KIRO_LOG_LEVEL;
+use crate::util::env_var::Q_LOG_LEVEL;
 
 const MAX_FILE_SIZE: u64 = 10 * 1024 * 1024;
 const DEFAULT_FILTER: LevelFilter = LevelFilter::ERROR;
@@ -196,7 +196,7 @@ pub fn get_log_level() -> String {
         .lock()
         .unwrap()
         .clone()
-        .unwrap_or_else(|| std::env::var(KIRO_LOG_LEVEL).unwrap_or_else(|_| DEFAULT_FILTER.to_string()))
+        .unwrap_or_else(|| std::env::var(Q_LOG_LEVEL).unwrap_or_else(|_| DEFAULT_FILTER.to_string()))
 }
 
 /// Set the log level to the given level.
@@ -247,7 +247,7 @@ fn create_filter_layer() -> EnvFilter {
         .lock()
         .unwrap()
         .clone()
-        .or_else(|| std::env::var(KIRO_LOG_LEVEL).ok());
+        .or_else(|| std::env::var(Q_LOG_LEVEL).ok());
 
     match log_level {
         Some(level) => EnvFilter::builder()

crates/chat-cli/src/os/env.rs

@@ -152,11 +152,11 @@ impl Env {
     }
 
     pub fn in_codespaces(&self) -> bool {
-        self.get_os("CODESPACES").is_some() || self.get_os("KIRO_CODESPACES").is_some()
+        self.get_os("CODESPACES").is_some() || self.get_os("Q_CODESPACES").is_some()
     }
 
     pub fn in_ci(&self) -> bool {
-        self.get_os("CI").is_some() || self.get_os("KIRO_CI").is_some()
+        self.get_os("CI").is_some() || self.get_os("Q_CI").is_some()
     }
 
     /// Whether or not the current executable is run from an AppImage.

crates/chat-cli/src/telemetry/mod.rs

@@ -74,7 +74,7 @@ pub use crate::telemetry::core::{
     QProfileSwitchIntent,
     TelemetryResult,
 };
-use crate::util::env_var::KIRO_CLI_CLIENT_APPLICATION;
+use crate::util::env_var::Q_CLI_CLIENT_APPLICATION;
 use crate::util::system_info::os_version;
 
 #[derive(thiserror::Error, Debug)]
@@ -113,7 +113,7 @@ impl From<ApiClientError> for TelemetryError {
 
 const PRODUCT: &str = "CodeWhisperer";
 const PRODUCT_VERSION: &str = env!("CARGO_PKG_VERSION");
-const CLIENT_ID_ENV_VAR: &str = "KIRO_TELEMETRY_CLIENT_ID";
+const CLIENT_ID_ENV_VAR: &str = "Q_TELEMETRY_CLIENT_ID";
 
 /// A IDE toolkit telemetry stage
 #[derive(Debug, Clone)]
@@ -484,7 +484,7 @@ async fn set_event_metadata(database: &Database, event: &mut Event) {
     }
 
     // Set the client application from environment variable
-    if let Ok(client_app) = std::env::var(KIRO_CLI_CLIENT_APPLICATION) {
+    if let Ok(client_app) = std::env::var(Q_CLI_CLIENT_APPLICATION) {
         event.set_client_application(client_app);
     }
 }
@@ -500,7 +500,7 @@ struct TelemetryClient {
 impl TelemetryClient {
     async fn new(env: &Env, fs: &Fs, database: &mut Database) -> Result<Self, TelemetryError> {
         let telemetry_enabled = !cfg!(test)
-            && env.get_os("KIRO_DISABLE_TELEMETRY").is_none()
+            && env.get_os("Q_DISABLE_TELEMETRY").is_none()
             && database.settings.get_bool(Setting::TelemetryEnabled).unwrap_or(true);
 
         // If telemetry is disabled we do not emit using toolkit_telemetry

crates/chat-cli/src/util/consts.rs

@@ -34,43 +34,43 @@ pub mod env_var {
         QTERM_SESSION_ID = "QTERM_SESSION_ID",
 
         /// The current parent socket to connect to
-        KIRO_PARENT = "KIRO_PARENT",
+        Q_PARENT = "Q_PARENT",
 
-        /// Set the [`KIRO_PARENT`] parent socket to connect to
-        KIRO_SET_PARENT = "KIRO_SET_PARENT",
+        /// Set the [`Q_PARENT`] parent socket to connect to
+        Q_SET_PARENT = "Q_SET_PARENT",
 
-        /// Guard for the [`KIRO_SET_PARENT`] check
-        KIRO_SET_PARENT_CHECK = "KIRO_SET_PARENT_CHECK",
+        /// Guard for the [`Q_SET_PARENT`] check
+        Q_SET_PARENT_CHECK = "Q_SET_PARENT_CHECK",
 
         /// Set if qterm is running, contains the version
-        KIRO_TERM = "KIRO_TERM",
+        Q_TERM = "Q_TERM",
 
         /// Sets the current log level
-        KIRO_LOG_LEVEL = "KIRO_LOG_LEVEL",
+        Q_LOG_LEVEL = "Q_LOG_LEVEL",
 
         /// Overrides the ZDOTDIR environment variable
-        KIRO_ZDOTDIR = "KIRO_ZDOTDIR",
+        Q_ZDOTDIR = "Q_ZDOTDIR",
 
         /// Indicates a process was launched by Kiro
-        PROCESS_LAUNCHED_BY_KIRO = "PROCESS_LAUNCHED_BY_KIRO",
+        PROCESS_LAUNCHED_BY_Q = "PROCESS_LAUNCHED_BY_Q",
 
         /// The shell to use in qterm
-        KIRO_SHELL = "KIRO_SHELL",
+        Q_SHELL = "Q_SHELL",
 
         /// Indicates the user is debugging the shell
-        KIRO_DEBUG_SHELL = "KIRO_DEBUG_SHELL",
+        Q_DEBUG_SHELL = "Q_DEBUG_SHELL",
 
         /// Indicates the user is using zsh autosuggestions which disables Inline
-        KIRO_USING_ZSH_AUTOSUGGESTIONS = "KIRO_USING_ZSH_AUTOSUGGESTIONS",
+        Q_USING_ZSH_AUTOSUGGESTIONS = "Q_USING_ZSH_AUTOSUGGESTIONS",
 
         /// Overrides the path to the bundle metadata released with certain desktop builds.
-        KIRO_BUNDLE_METADATA_PATH = "KIRO_BUNDLE_METADATA_PATH",
+        Q_BUNDLE_METADATA_PATH = "Q_BUNDLE_METADATA_PATH",
 
         /// Identifier for the client application or service using the chat-cli
-        KIRO_CLI_CLIENT_APPLICATION = "KIRO_CLI_CLIENT_APPLICATION",
+        Q_CLI_CLIENT_APPLICATION = "Q_CLI_CLIENT_APPLICATION",
 
         /// Shows continuation IDs in chat output for debugging/development
-        KIRO_SHOW_CONTINUATION_IDS = "KIRO_SHOW_CONTINUATION_IDS"
+        Q_SHOW_CONTINUATION_IDS = "Q_SHOW_CONTINUATION_IDS"
     }
 }