Merge branch 'main' into followup-feedback

codex-rs/feedback/src/lib.rs

@@ -191,6 +191,7 @@ impl CodexLogSnapshot {
         use sentry::transports::DefaultTransportFactory;
         use sentry::types::Dsn;
 
+        // Build Sentry client
         let client = Client::from_config(ClientOptions {
             dsn: Some(Dsn::from_str(SENTRY_DSN).map_err(|e| anyhow!("invalid DSN: {e}"))?),
             transport: Some(Arc::new(DefaultTransportFactory {})),
@@ -248,10 +249,95 @@ impl CodexLogSnapshot {
             }));
         }
 
+        // Attachment 2: rollout file (if provided and readable)
+        if let Some((path, data)) = rollout_path.and_then(|p| fs::read(p).ok().map(|d| (p, d))) {
+            // Name the file by suffix so users can spot it.
+            let fname = path
+                .file_name()
+                .map(|s| s.to_string_lossy().to_string())
+                .unwrap_or_else(|| "rollout.jsonl".to_string());
+            envelope.add_item(EnvelopeItem::Attachment(Attachment {
+                buffer: data,
+                filename: fname,
+                content_type: Some("application/jsonl".to_string()),
+                ty: None,
+            }));
+        }
+
         client.send_envelope(envelope);
         client.flush(Some(Duration::from_secs(UPLOAD_TIMEOUT_SECS)));
         Ok(())
     }
+
+    /// Upload a metadata-only feedback event (no attachments). Includes classification,
+    /// optional reason, CLI version and thread ID as tags.
+    pub fn upload_feedback_metadata_only(
+        &self,
+        classification: &str,
+        reason: Option<&str>,
+        cli_version: &str,
+    ) -> Result<()> {
+        use std::collections::BTreeMap;
+        use std::str::FromStr;
+        use std::sync::Arc;
+
+        use sentry::Client;
+        use sentry::ClientOptions;
+        use sentry::protocol::Envelope;
+        use sentry::protocol::EnvelopeItem;
+        use sentry::protocol::Event;
+        use sentry::protocol::Level;
+        use sentry::transports::DefaultTransportFactory;
+        use sentry::types::Dsn;
+
+        let client = Client::from_config(ClientOptions {
+            dsn: Some(Dsn::from_str(SENTRY_DSN).map_err(|e| anyhow!("invalid DSN: {}", e))?),
+            transport: Some(Arc::new(DefaultTransportFactory {})),
+            ..Default::default()
+        });
+
+        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(r) = reason {
+            tags.insert(String::from("reason"), r.to_string());
+        }
+
+        let level = match classification {
+            "bug" | "bad_result" => Level::Error,
+            _ => Level::Info,
+        };
+
+        let mut envelope = Envelope::new();
+        // Title is the message in Sentry: "[Classification]: Codex session <thread_id>"
+        let title = format!(
+            "[{}]: Codex session {}",
+            display_classification(classification),
+            self.thread_id
+        );
+        let event = Event {
+            level,
+            message: Some(title),
+            tags,
+            ..Default::default()
+        };
+        envelope.add_item(EnvelopeItem::Event(event));
+
+        client.send_envelope(envelope);
+        client.flush(Some(Duration::from_secs(UPLOAD_TIMEOUT_SECS)));
+        Ok(())
+    }
+}
+
+fn display_classification(classification: &str) -> String {
+    match classification {
+        "bug" => "Bug".to_string(),
+        "bad_result" => "Bad result".to_string(),
+        "good_result" => "Good result".to_string(),
+        _ => "Other".to_string(),
+    }
 }
 
 fn display_classification(classification: &str) -> String {

codex-rs/tui/src/bottom_pane/feedback_view.rs

@@ -415,7 +415,7 @@ pub(crate) fn feedback_upload_consent_params(
         if let Some(name) = path.file_name().map(|s| s.to_string_lossy().to_string()) {
             header_lines.push(Line::from(vec!["  • ".into(), name.into()]).into());
         }
-    }
+    });
 
     super::SelectionViewParams {
         footer_hint: Some(standard_popup_hint_line()),