Fix env vars in alacritty terminal & fig_api_client

Author: dk19y

Cargo.lock

@@ -18,6 +18,7 @@ workspace = true
 [dependencies]
 bitflags.workspace = true
 camino.workspace = true
+fig_os_shim.workspace = true
 serde.workspace = true
 serde_yaml = "0.9"
 shell-color.workspace = true

crates/alacritty_terminal/Cargo.toml

@@ -833,8 +833,7 @@ impl<T> Term<T> {
         trace!("New command cursor: {:?}", self.shell_state.cmd_cursor);
 
         // Add work around for emojis
-        if let Ok(cursor_offset) = std::env::var("Q_PROMPT_OFFSET_WORKAROUND") {
-            // ALLOWED: alacritty_terminal doesn't have fig_os_shim dependency
+        if let Ok(cursor_offset) = fig_os_shim::Env::new().q_prompt_offset_workaround() {
             if let Ok(offset) = cursor_offset.parse::<i32>() {
                 self.shell_state.cmd_cursor = self.shell_state.cmd_cursor.map(|cursor| Point {
                     column: Column((cursor.column.0 as i32 - offset).max(0) as usize),

crates/alacritty_terminal/src/term/mod.rs

@@ -27,6 +27,7 @@ aws-types.workspace = true
 bytes.workspace = true
 fig_auth.workspace = true
 fig_aws_common.workspace = true
+fig_os_shim.workspace = true
 fig_request.workspace = true
 fig_settings.workspace = true
 fig_util.workspace = true

crates/fig_api_client/Cargo.toml

@@ -58,10 +58,7 @@ pub struct StreamingClient {
 
 impl StreamingClient {
     pub async fn new() -> Result<Self, Error> {
-        let client = if fig_util::system_info::in_cloudshell()
-            || std::env::var("Q_USE_SENDMESSAGE").is_ok_and(|v| !v.is_empty())
-        {
-            // ALLOWED: fig_api_client doesn't have fig_os_shim dependency
+        let client = if fig_util::system_info::in_cloudshell() || fig_os_shim::Env::new().q_use_sendmessage() {
             Self::new_qdeveloper_client(&Endpoint::load_q()).await?
         } else {
             Self::new_codewhisperer_client(&Endpoint::load_codewhisperer()).await

crates/fig_api_client/src/clients/streaming_client.rs

@@ -282,12 +282,12 @@ pub fn in_cloudshell() -> bool {
 
 pub fn in_codespaces() -> bool {
     static IN_CODESPACES: OnceLock<bool> = OnceLock::new();
-    *IN_CODESPACES.get_or_init(|| std::env::var_os("CODESPACES").is_some() || fig_os_shim::Env::new().in_codespaces())
+    *IN_CODESPACES.get_or_init(|| fig_os_shim::Env::new().in_codespaces())
 }
 
 pub fn in_ci() -> bool {
     static IN_CI: OnceLock<bool> = OnceLock::new();
-    *IN_CI.get_or_init(|| std::env::var_os("CI").is_some() || fig_os_shim::Env::new().in_ci())
+    *IN_CI.get_or_init(|| fig_os_shim::Env::new().in_ci())
 }
 
 #[cfg(target_os = "macos")]