first pass of merging in warp (doesn't build)

crates/ai/src/aws_credentials.rs

@@ -6,7 +6,7 @@ use warp_multi_agent_api as api;
 
 /// Temporary AWS credentials loaded from the AWS SDK.
 /// These are not persisted and are only used at runtime.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq)]
 pub struct AwsCredentials {
     access_key: String,
     secret_key: String,
@@ -14,6 +14,20 @@ pub struct AwsCredentials {
     expires_at: Option<SystemTime>,
 }
 
+impl std::fmt::Debug for AwsCredentials {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("AwsCredentials")
+            .field("access_key", &"<redacted>")
+            .field("secret_key", &"<redacted>")
+            .field(
+                "session_token",
+                &self.session_token.as_ref().map(|_| "<redacted>"),
+            )
+            .field("expires_at", &self.expires_at)
+            .finish()
+    }
+}
+
 impl AwsCredentials {
     pub fn new(
         access_key: String,