fix: Pkce variant serialization (#1788)

* remove mcp_client crate, install.rs, and fix small bug

* fix tests

Author: chaynabors

Cargo.lock

@@ -87,7 +87,6 @@ indicatif = "0.17.11"
 indoc = "2.0.6"
 insta = "1.43.1"
 libc = "0.2.172"
-mcp_client = { path = "crates/mcp_client" }
 mimalloc = "0.1.46"
 nix = { version = "0.29.0", features = [
     "feature",

Cargo.toml

@@ -62,19 +62,10 @@ use crate::database::secret_store::{
 pub enum OAuthFlow {
     DeviceCode,
     // This must remain backwards compatible
-    #[serde(rename = "PKCE")]
+    #[serde(alias = "PKCE")]
     Pkce,
 }
 
-impl std::fmt::Display for OAuthFlow {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match *self {
-            OAuthFlow::DeviceCode => write!(f, "DeviceCode"),
-            OAuthFlow::Pkce => write!(f, "PKCE"),
-        }
-    }
-}
-
 /// Indicates if an expiration time has passed, there is a small 1 min window that is removed
 /// so the token will not expire in transit
 fn is_expired(expiration_time: &OffsetDateTime) -> bool {
@@ -565,20 +556,10 @@ mod tests {
     const US_EAST_1: Region = Region::from_static("us-east-1");
     const US_WEST_2: Region = Region::from_static("us-west-2");
 
-    macro_rules! test_ser_deser {
-        ($ty:ident, $variant:expr, $text:expr) => {
-            let quoted = format!("\"{}\"", $text);
-            assert_eq!(quoted, serde_json::to_string(&$variant).unwrap());
-            assert_eq!($variant, serde_json::from_str(&quoted).unwrap());
-
-            assert_eq!($text, format!("{}", $variant));
-        };
-    }
-
     #[test]
-    fn test_oauth_flow_ser_deser() {
-        test_ser_deser!(OAuthFlow, OAuthFlow::DeviceCode, "DeviceCode");
-        test_ser_deser!(OAuthFlow, OAuthFlow::Pkce, "PKCE");
+    fn test_oauth_flow_deser() {
+        assert_eq!(OAuthFlow::Pkce, serde_json::from_str("\"PKCE\"").unwrap());
+        assert_eq!(OAuthFlow::Pkce, serde_json::from_str("\"Pkce\"").unwrap());
     }
 
     #[tokio::test]

crates/chat-cli/src/auth/builder_id.rs

@@ -3,7 +3,6 @@ mod auth;
 mod aws_common;
 mod cli;
 mod database;
-mod install;
 mod logging;
 mod mcp_client;
 mod platform;