Merge branch 'main' into feature/internal_command

Author: jsamuel1

build-scripts/manifest.py

@@ -64,6 +64,10 @@ def app_manifest():
                 path="Contents/MacOS/qterm",
                 identifier="com.amazon.qterm",
             ),
+            EmbeddedRequirement(
+                path="Contents/MacOS/qchat",
+                identifier="com.amazon.qchat",
+            ),
         ],
     )
 

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

@@ -114,6 +114,7 @@ mod tests {
         // assert!(!telemetry_is_disabled_inner(true, &env, &settings));
     }
 
+    #[ignore]
     #[test]
     fn test_get_client_id() {
         // max by default in tests

crates/fig_ipc/src/unix_socket.rs

@@ -157,6 +157,9 @@ mod tests {
                 .unwrap();
         }
 
+        // Wait some time for the socket to start listening.
+        tokio::time::sleep(std::time::Duration::from_millis(5)).await;
+
         let _stream = socket_connect(&socket_path).await.expect("Failed to validate socket");
 
         socket_thread.abort();