Infer usage client family from User-Agent

apps/aether-gateway/src/handlers/public/support/user_me_usage.rs

@@ -334,6 +334,29 @@ fn users_me_usage_metadata_string<'a>(
         .filter(|value| !value.is_empty())
 }
 
+fn infer_client_family_from_user_agent(user_agent: &str) -> Option<&'static str> {
+    let normalized = user_agent.trim().to_ascii_lowercase();
+    if normalized.is_empty() {
+        return None;
+    }
+    if normalized.starts_with("codex_vscode") {
+        return Some("codex_vscode");
+    }
+    if normalized.starts_with("codex") {
+        return Some("codex");
+    }
+    if normalized.contains("claude-code") || normalized.contains("claude_code") {
+        return Some("claude_code");
+    }
+    if normalized.contains("opencode") {
+        return Some("opencode");
+    }
+    if normalized.contains("geminicli") || normalized.contains("gemini-cli") {
+        return Some("gemini_cli");
+    }
+    None
+}
+
 fn users_me_usage_client_family(item: &StoredRequestUsageAudit) -> Option<&str> {
     item.request_metadata
         .as_ref()
@@ -352,6 +375,10 @@ fn users_me_usage_client_family(item: &StoredRequestUsageAudit) -> Option<&str>
         })
         .map(str::trim)
         .filter(|value| !value.is_empty())
+        .or_else(|| {
+            users_me_usage_metadata_string(item, "user_agent")
+                .and_then(infer_client_family_from_user_agent)
+        })
 }
 
 fn build_users_me_usage_record_payload(
@@ -449,6 +476,9 @@ fn build_users_me_usage_active_payload(item: &StoredRequestUsageAudit) -> serde_
         "client_requested_stream": client_is_stream,
         "client_is_stream": client_is_stream,
         "has_format_conversion": item.has_format_conversion,
+        "client_family": users_me_usage_client_family(item),
+        "client_ip": users_me_usage_metadata_string(item, "client_ip"),
+        "user_agent": users_me_usage_metadata_string(item, "user_agent"),
         "target_model": item.target_model,
         "has_fallback": item.has_fallback(),
     });
@@ -1406,6 +1436,26 @@ mod tests {
         assert_eq!(active_payload["client_is_stream"], false);
     }
 
+    #[test]
+    fn user_usage_payload_infers_client_family_from_user_agent() {
+        let item = StoredRequestUsageAudit {
+            request_metadata: Some(json!({
+                "client_ip": "192.168.0.28",
+                "user_agent": "codex_vscode/0.131.0-alpha.9 (Windows 10.0.26200; x86_64)"
+            })),
+            ..sample_usage("completed")
+        };
+
+        let record_payload =
+            build_users_me_usage_record_payload(&item, false, &BTreeMap::new(), false);
+        let active_payload = build_users_me_usage_active_payload(&item);
+
+        assert_eq!(record_payload["client_family"], "codex_vscode");
+        assert_eq!(record_payload["client_ip"], "192.168.0.28");
+        assert_eq!(active_payload["client_family"], "codex_vscode");
+        assert_eq!(active_payload["client_ip"], "192.168.0.28");
+    }
+
     #[test]
     fn user_usage_stream_inference_falls_back_to_request_body_stream_flag() {
         let item = StoredRequestUsageAudit {

crates/aether-admin/src/observability/usage.rs

@@ -1011,6 +1011,29 @@ fn admin_usage_metadata_string<'a>(
         .filter(|value| !value.is_empty())
 }
 
+fn infer_client_family_from_user_agent(user_agent: &str) -> Option<&'static str> {
+    let normalized = user_agent.trim().to_ascii_lowercase();
+    if normalized.is_empty() {
+        return None;
+    }
+    if normalized.starts_with("codex_vscode") {
+        return Some("codex_vscode");
+    }
+    if normalized.starts_with("codex") {
+        return Some("codex");
+    }
+    if normalized.contains("claude-code") || normalized.contains("claude_code") {
+        return Some("claude_code");
+    }
+    if normalized.contains("opencode") {
+        return Some("opencode");
+    }
+    if normalized.contains("geminicli") || normalized.contains("gemini-cli") {
+        return Some("gemini_cli");
+    }
+    None
+}
+
 pub fn admin_usage_client_family(item: &StoredRequestUsageAudit) -> Option<&str> {
     item.request_metadata
         .as_ref()
@@ -1025,6 +1048,10 @@ pub fn admin_usage_client_family(item: &StoredRequestUsageAudit) -> Option<&str>
         })
         .map(str::trim)
         .filter(|value| !value.is_empty())
+        .or_else(|| {
+            admin_usage_metadata_string(item, "user_agent")
+                .and_then(infer_client_family_from_user_agent)
+        })
 }
 
 fn admin_usage_active_request_json(
@@ -2435,6 +2462,31 @@ mod tests {
         assert_eq!(record["client_is_stream"], false);
     }
 
+    #[test]
+    fn admin_usage_record_infers_client_family_from_user_agent() {
+        let item = StoredRequestUsageAudit {
+            request_metadata: Some(json!({
+                "client_ip": "192.168.0.28",
+                "user_agent": "codex_vscode/0.131.0-alpha.9 (Windows 10.0.26200; x86_64)"
+            })),
+            ..sample_usage("completed", Some(200), None)
+        };
+
+        let record = admin_usage_record_json(
+            &item,
+            &BTreeMap::new(),
+            &BTreeMap::new(),
+            false,
+            false,
+            None,
+        );
+        let active = admin_usage_active_request_json(&item, None, None, None);
+
+        assert_eq!(record["client_family"], "codex_vscode");
+        assert_eq!(record["client_ip"], "192.168.0.28");
+        assert_eq!(active["client_family"], "codex_vscode");
+    }
+
     #[test]
     fn client_requested_stream_uses_stream_generate_content_path_over_stale_metadata_flag() {
         let item = StoredRequestUsageAudit {