Pass turn id with feedback uploads (openai#17314)

## Summary
- Add an optional `tags` dictionary to feedback upload params.
- Capture the active app-server turn id in the TUI and submit it as
`tags.turn_id` with `/feedback` uploads.
- Merge client-provided feedback tags into Sentry feedback tags while
preserving reserved system fields like `thread_id`, `classification`,
`cli_version`, `session_source`, and `reason`.

## Behavior / impact
Existing feedback upload callers remain compatible because `tags` is
optional and nullable. The wire shape is still a normal JSON object /
TypeScript dictionary, so adding future feedback metadata will not
require a new top-level protocol field each time. This change only adds
feedback metadata for Codex CLI/TUI uploads; it does not affect existing
pipelines, DAGs, exports, or downstream consumers unless they choose to
read the new `turn_id` feedback tag.

## Tests
- `cargo fmt -- --config imports_granularity=Item` passed; stable
rustfmt warned that `imports_granularity` is nightly-only.
- `cargo run -p codex-app-server-protocol --bin write_schema_fixtures`
- `cargo test -p codex-feedback
upload_tags_include_client_tags_and_preserve_reserved_fields`
- `cargo test -p codex-app-server-protocol
schema_fixtures_match_generated`
- `cargo test -p codex-tui build_feedback_upload_params`
- `cargo test -p codex-tui
live_app_server_turn_started_sets_feedback_turn_id`
- `cargo check -p codex-app-server --tests`
- `git diff --check`

---------

Co-authored-by: Codex <noreply@openai.com>

Author: ningyi-oai

codex-rs/app-server-protocol/schema/json/ClientRequest.json

@@ -647,6 +647,15 @@
             "null"
           ]
         },
+        "tags": {
+          "additionalProperties": {
+            "type": "string"
+          },
+          "type": [
+            "object",
+            "null"
+          ]
+        },
         "threadId": {
           "type": [
             "string",

codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json

@@ -7479,6 +7479,15 @@
               "null"
             ]
           },
+          "tags": {
+            "additionalProperties": {
+              "type": "string"
+            },
+            "type": [
+              "object",
+              "null"
+            ]
+          },
           "threadId": {
             "type": [
               "string",

codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json

@@ -4120,6 +4120,15 @@
             "null"
           ]
         },
+        "tags": {
+          "additionalProperties": {
+            "type": "string"
+          },
+          "type": [
+            "object",
+            "null"
+          ]
+        },
         "threadId": {
           "type": [
             "string",

codex-rs/app-server-protocol/schema/json/v2/FeedbackUploadParams.json

@@ -22,6 +22,15 @@
         "null"
       ]
     },
+    "tags": {
+      "additionalProperties": {
+        "type": "string"
+      },
+      "type": [
+        "object",
+        "null"
+      ]
+    },
     "threadId": {
       "type": [
         "string",

codex-rs/app-server-protocol/schema/typescript/v2/FeedbackUploadParams.ts

@@ -2,4 +2,4 @@
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type FeedbackUploadParams = { classification: string, reason?: string | null, threadId?: string | null, includeLogs: boolean, extraLogFiles?: Array<string> | null, };
+export type FeedbackUploadParams = { classification: string, reason?: string | null, threadId?: string | null, includeLogs: boolean, extraLogFiles?: Array<string> | null, tags?: { [key in string]?: string } | null, };

codex-rs/app-server-protocol/src/protocol/v2.rs

@@ -2242,6 +2242,8 @@ pub struct FeedbackUploadParams {
     pub include_logs: bool,
     #[ts(optional = nullable)]
     pub extra_log_files: Option<Vec<PathBuf>>,
+    #[ts(optional = nullable)]
+    pub tags: Option<BTreeMap<String, String>>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]

codex-rs/app-server/src/codex_message_processor.rs

@@ -243,6 +243,7 @@ use codex_features::FEATURES;
 use codex_features::Feature;
 use codex_features::Stage;
 use codex_feedback::CodexFeedback;
+use codex_feedback::FeedbackUploadOptions;
 use codex_git_utils::git_diff_to_remote;
 use codex_git_utils::resolve_root_git_project_for_trust;
 use codex_login::AuthManager;
@@ -7726,6 +7727,7 @@ impl CodexMessageProcessor {
             thread_id,
             include_logs,
             extra_log_files,
+            tags,
         } = params;
 
         let conversation_id = match thread_id.as_deref() {
@@ -7853,14 +7855,15 @@ impl CodexMessageProcessor {
         let session_source = self.thread_manager.session_source();
 
         let upload_result = tokio::task::spawn_blocking(move || {
-            snapshot.upload_feedback(
-                &classification,
-                reason.as_deref(),
+            snapshot.upload_feedback(FeedbackUploadOptions {
+                classification: &classification,
+                reason: reason.as_deref(),
+                tags: tags.as_ref(),
                 include_logs,
-                &attachment_paths,
-                Some(session_source),
-                sqlite_feedback_logs,
-            )
+                extra_attachment_paths: &attachment_paths,
+                session_source: Some(session_source),
+                logs_override: sqlite_feedback_logs,
+            })
         })
         .await;
 

codex-rs/feedback/src/lib.rs

@@ -338,6 +338,16 @@ pub struct FeedbackSnapshot {
     pub thread_id: String,
 }
 
+pub struct FeedbackUploadOptions<'a> {
+    pub classification: &'a str,
+    pub reason: Option<&'a str>,
+    pub tags: Option<&'a BTreeMap<String, String>>,
+    pub include_logs: bool,
+    pub extra_attachment_paths: &'a [PathBuf],
+    pub session_source: Option<SessionSource>,
+    pub logs_override: Option<Vec<u8>>,
+}
+
 impl FeedbackSnapshot {
     pub(crate) fn as_bytes(&self) -> &[u8] {
         &self.bytes
@@ -369,16 +379,7 @@ impl FeedbackSnapshot {
     }
 
     /// Upload feedback to Sentry with optional attachments.
-    pub fn upload_feedback(
-        &self,
-        classification: &str,
-        reason: Option<&str>,
-        include_logs: bool,
-        extra_attachment_paths: &[PathBuf],
-        session_source: Option<SessionSource>,
-        logs_override: Option<Vec<u8>>,
-    ) -> Result<()> {
-        use std::collections::BTreeMap;
+    pub fn upload_feedback(&self, options: FeedbackUploadOptions<'_>) -> Result<()> {
         use std::str::FromStr;
         use std::sync::Arc;
 
@@ -398,44 +399,22 @@ impl FeedbackSnapshot {
             ..Default::default()
         });
 
-        let cli_version = env!("CARGO_PKG_VERSION");
-        let mut tags = BTreeMap::from([
-            (String::from("thread_id"), self.thread_id.to_string()),
-            (String::from("classification"), classification.to_string()),
-            (String::from("cli_version"), cli_version.to_string()),
-        ]);
-        if let Some(source) = session_source.as_ref() {
-            tags.insert(String::from("session_source"), source.to_string());
-        }
-        if let Some(r) = reason {
-            tags.insert(String::from("reason"), r.to_string());
-        }
-
-        let reserved = [
-            "thread_id",
-            "classification",
-            "cli_version",
-            "session_source",
-            "reason",
-        ];
-        for (key, value) in &self.tags {
-            if reserved.contains(&key.as_str()) {
-                continue;
-            }
-            if let Entry::Vacant(entry) = tags.entry(key.clone()) {
-                entry.insert(value.clone());
-            }
-        }
+        let tags = self.upload_tags(
+            options.classification,
+            options.reason,
+            options.tags,
+            options.session_source.as_ref(),
+        );
 
-        let level = match classification {
+        let level = match options.classification {
             "bug" | "bad_result" | "safety_check" => Level::Error,
             _ => Level::Info,
         };
 
         let mut envelope = Envelope::new();
         let title = format!(
             "[{}]: Codex session {}",
-            display_classification(classification),
+            display_classification(options.classification),
             self.thread_id
         );
 
@@ -445,7 +424,7 @@ impl FeedbackSnapshot {
             tags,
             ..Default::default()
         };
-        if let Some(r) = reason {
+        if let Some(r) = options.reason {
             use sentry::protocol::Exception;
             use sentry::protocol::Values;
 
@@ -457,9 +436,11 @@ impl FeedbackSnapshot {
         }
         envelope.add_item(EnvelopeItem::Event(event));
 
-        for attachment in
-            self.feedback_attachments(include_logs, extra_attachment_paths, logs_override)
-        {
+        for attachment in self.feedback_attachments(
+            options.include_logs,
+            options.extra_attachment_paths,
+            options.logs_override,
+        ) {
             envelope.add_item(EnvelopeItem::Attachment(attachment));
         }
 
@@ -468,6 +449,55 @@ impl FeedbackSnapshot {
         Ok(())
     }
 
+    fn upload_tags(
+        &self,
+        classification: &str,
+        reason: Option<&str>,
+        client_tags: Option<&BTreeMap<String, String>>,
+        session_source: Option<&SessionSource>,
+    ) -> BTreeMap<String, String> {
+        let cli_version = env!("CARGO_PKG_VERSION");
+        let mut tags = BTreeMap::from([
+            (String::from("thread_id"), self.thread_id.to_string()),
+            (String::from("classification"), classification.to_string()),
+            (String::from("cli_version"), cli_version.to_string()),
+        ]);
+        if let Some(source) = session_source {
+            tags.insert(String::from("session_source"), source.to_string());
+        }
+        if let Some(r) = reason {
+            tags.insert(String::from("reason"), r.to_string());
+        }
+
+        let reserved = [
+            "thread_id",
+            "classification",
+            "cli_version",
+            "session_source",
+            "reason",
+        ];
+        if let Some(client_tags) = client_tags {
+            for (key, value) in client_tags {
+                if reserved.contains(&key.as_str()) {
+                    continue;
+                }
+                if let Entry::Vacant(entry) = tags.entry(key.clone()) {
+                    entry.insert(value.clone());
+                }
+            }
+        }
+        for (key, value) in &self.tags {
+            if reserved.contains(&key.as_str()) {
+                continue;
+            }
+            if let Entry::Vacant(entry) = tags.entry(key.clone()) {
+                entry.insert(value.clone());
+            }
+        }
+
+        tags
+    }
+
     fn feedback_attachments(
         &self,
         include_logs: bool,
@@ -697,4 +727,75 @@ mod tests {
         assert_eq!(attachments_without_diagnostics[0].buffer, vec![1]);
         fs::remove_file(extra_path).expect("extra attachment should be removed");
     }
+
+    #[test]
+    fn upload_tags_include_client_tags_and_preserve_reserved_fields() {
+        let mut tags = BTreeMap::new();
+        tags.insert("thread_id".to_string(), "wrong-thread".to_string());
+        tags.insert("turn_id".to_string(), "wrong-turn".to_string());
+        tags.insert(
+            "classification".to_string(),
+            "wrong-classification".to_string(),
+        );
+        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("model".to_string(), "gpt-5".to_string());
+        let snapshot = FeedbackSnapshot {
+            bytes: Vec::new(),
+            tags,
+            feedback_diagnostics: FeedbackDiagnostics::default(),
+            thread_id: "thread-123".to_string(),
+        };
+        let mut client_tags = BTreeMap::new();
+        client_tags.insert("thread_id".to_string(), "wrong-client-thread".to_string());
+        client_tags.insert("turn_id".to_string(), "turn-456".to_string());
+        client_tags.insert(
+            "classification".to_string(),
+            "wrong-client-classification".to_string(),
+        );
+        client_tags.insert(
+            "cli_version".to_string(),
+            "wrong-client-version".to_string(),
+        );
+        client_tags.insert(
+            "session_source".to_string(),
+            "wrong-client-source".to_string(),
+        );
+        client_tags.insert("reason".to_string(), "wrong-client-reason".to_string());
+        client_tags.insert("client_tag".to_string(), "from-client".to_string());
+
+        let upload_tags = snapshot.upload_tags(
+            "bug",
+            Some("actual reason"),
+            Some(&client_tags),
+            Some(&SessionSource::Cli),
+        );
+
+        assert_eq!(
+            upload_tags.get("thread_id").map(String::as_str),
+            Some("thread-123")
+        );
+        assert_eq!(
+            upload_tags.get("turn_id").map(String::as_str),
+            Some("turn-456")
+        );
+        assert_eq!(
+            upload_tags.get("classification").map(String::as_str),
+            Some("bug")
+        );
+        assert_eq!(
+            upload_tags.get("session_source").map(String::as_str),
+            Some("cli")
+        );
+        assert_eq!(
+            upload_tags.get("reason").map(String::as_str),
+            Some("actual reason")
+        );
+        assert_eq!(
+            upload_tags.get("client_tag").map(String::as_str),
+            Some("from-client")
+        );
+        assert_eq!(upload_tags.get("model").map(String::as_str), Some("gpt-5"));
+    }
 }