refactor: use existing Env abstraction for Q-specific environment variables

- Add missing environment variable constants (Q_LOG_STDOUT, Q_DISABLE_TELEMETRY, AMAZON_Q_CHAT_SHELL)
- Update Env methods to use constants instead of hardcoded strings
- Add q_disable_telemetry() method to Env
- Update telemetry module to use new Env method instead of direct access
- Use existing Env abstraction instead of creating wrapper functions around std::env.

Author: dk19y

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

@@ -15,6 +15,7 @@ use std::sync::{
 };
 
 use crate::os::ACTIVE_USER_HOME;
+use crate::util::consts::env_var;
 
 #[derive(Debug, Clone)]
 pub struct Env(inner::Inner);
@@ -165,35 +166,40 @@ impl Env {
     }
 
     pub fn q_log_level(&self) -> Result<String, VarError> {
-        self.get("Q_LOG_LEVEL")
+        self.get(env_var::Q_LOG_LEVEL)
     }
 
     pub fn q_log_stdout(&self) -> bool {
-        self.get_os("Q_LOG_STDOUT").is_some()
+        self.get_os(env_var::Q_LOG_STDOUT).is_some()
+    }
+
+    pub fn q_disable_telemetry(&self) -> bool {
+        self.get_os(env_var::Q_DISABLE_TELEMETRY).is_some()
     }
 
     pub fn amazon_q_sigv4(&self) -> bool {
         self.get("AMAZON_Q_SIGV4").is_ok_and(|v| !v.is_empty())
     }
 
     pub fn amazon_q_chat_shell(&self) -> String {
-        self.get("AMAZON_Q_CHAT_SHELL").unwrap_or_else(|_| "bash".to_string())
+        self.get(env_var::AMAZON_Q_CHAT_SHELL)
+            .unwrap_or_else(|_| "bash".to_string())
     }
 
     pub fn q_cli_client_application(&self) -> Result<String, VarError> {
-        self.get("Q_CLI_CLIENT_APPLICATION")
+        self.get(env_var::Q_CLI_CLIENT_APPLICATION)
     }
 
     pub fn q_parent(&self) -> Result<String, VarError> {
-        self.get("Q_PARENT")
+        self.get(env_var::Q_PARENT)
     }
 
     pub fn q_term(&self) -> Result<String, VarError> {
-        self.get("Q_TERM")
+        self.get(env_var::Q_TERM)
     }
 
     pub fn q_using_zsh_autosuggestions(&self) -> bool {
-        self.get_os("Q_USING_ZSH_AUTOSUGGESTIONS").is_some()
+        self.get_os(env_var::Q_USING_ZSH_AUTOSUGGESTIONS).is_some()
     }
 
     pub fn q_init_snapshot_test(&self) -> bool {

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

@@ -396,7 +396,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("Q_DISABLE_TELEMETRY").is_none()
+            && !env.q_disable_telemetry()
             && 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

@@ -67,7 +67,16 @@ pub mod env_var {
         Q_BUNDLE_METADATA_PATH = "Q_BUNDLE_METADATA_PATH",
 
         /// Identifier for the client application or service using the chat-cli
-        Q_CLI_CLIENT_APPLICATION = "Q_CLI_CLIENT_APPLICATION"
+        Q_CLI_CLIENT_APPLICATION = "Q_CLI_CLIENT_APPLICATION",
+
+        /// Enables logging to stdout
+        Q_LOG_STDOUT = "Q_LOG_STDOUT",
+
+        /// Disables telemetry collection
+        Q_DISABLE_TELEMETRY = "Q_DISABLE_TELEMETRY",
+
+        /// The shell to use for Amazon Q chat
+        AMAZON_Q_CHAT_SHELL = "AMAZON_Q_CHAT_SHELL"
     }
 }