From 3a6dda289d24d6aea96e25c5848711f03910fc2d Mon Sep 17 00:00:00 2001
From: pakrym-oai <pakrym@openai.com>
Date: Wed, 6 May 2026 23:12:09 -0700
Subject: [PATCH] feedback: add account id to uploads

---
 .../src/request_processors/feedback_processor.rs           | 7 +++++++
 codex-rs/feedback/src/lib.rs                               | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/codex-rs/app-server/src/request_processors/feedback_processor.rs b/codex-rs/app-server/src/request_processors/feedback_processor.rs
index 5e945d7b1036..5b9039b57d06 100644
--- a/codex-rs/app-server/src/request_processors/feedback_processor.rs
+++ b/codex-rs/app-server/src/request_processors/feedback_processor.rs
@@ -72,6 +72,13 @@ impl FeedbackRequestProcessor {
         {
             tracing::info!(target: "feedback_tags", chatgpt_user_id);
         }
+        if let Some(account_id) = self
+            .auth_manager
+            .auth_cached()
+            .and_then(|auth| auth.get_account_id())
+        {
+            tracing::info!(target: "feedback_tags", account_id);
+        }
         let snapshot = self.feedback.snapshot(conversation_id);
         let thread_id = snapshot.thread_id.clone();
         let (feedback_thread_ids, sqlite_feedback_logs, state_db_ctx) = if include_logs {
diff --git a/codex-rs/feedback/src/lib.rs b/codex-rs/feedback/src/lib.rs
index 884bed588c3e..0adf864d6466 100644
--- a/codex-rs/feedback/src/lib.rs
+++ b/codex-rs/feedback/src/lib.rs
@@ -757,6 +757,7 @@ mod tests {
         tags.insert("cli_version".to_string(), "wrong-version".to_string());
         tags.insert("session_source".to_string(), "wrong-source".to_string());
         tags.insert("reason".to_string(), "wrong-reason".to_string());
+        tags.insert("account_id".to_string(), "actual-account".to_string());
         tags.insert("model".to_string(), "gpt-5".to_string());
         let snapshot = FeedbackSnapshot {
             bytes: Vec::new(),
@@ -809,6 +810,10 @@ mod tests {
             upload_tags.get("reason").map(String::as_str),
             Some("actual reason")
         );
+        assert_eq!(
+            upload_tags.get("account_id").map(String::as_str),
+            Some("actual-account")
+        );
         assert_eq!(
             upload_tags.get("client_tag").map(String::as_str),
             Some("from-client")