From abab6533e4d1ff26c1a4f706b8f54235683bd997 Mon Sep 17 00:00:00 2001
From: Keith Hall <keith-hall@users.noreply.github.com>
Date: Tue, 31 Mar 2026 22:22:31 +0300
Subject: [PATCH 1/3] Update --diagnostic output with BAT_THEME_LIGHT/DARK env
 vars

---
 src/bin/bat/main.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs
index 7ca08b9d..5a771cd6 100644
--- a/src/bin/bat/main.rs
+++ b/src/bin/bat/main.rs
@@ -307,6 +307,8 @@ fn invoke_bugreport(app: &App, cache_dir: &Path) {
             "BAT_STYLE",
             "BAT_TABS",
             "BAT_THEME",
+            bat::theme::env::BAT_THEME_DARK,
+            bat::theme::env::BAT_THEME_LIGHT,
             "COLORTERM",
             "LANG",
             "LC_ALL",

From ba223289ce7325ddb0c95d22b4bf74e2fb7ee3e5 Mon Sep 17 00:00:00 2001
From: Keith Hall <keith-hall@users.noreply.github.com>
Date: Tue, 31 Mar 2026 22:23:10 +0300
Subject: [PATCH 2/3] Update --diagnostic output with detected terminal color
 scheme type

---
 src/bin/bat/main.rs | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs
index 5a771cd6..3cdf0531 100644
--- a/src/bin/bat/main.rs
+++ b/src/bin/bat/main.rs
@@ -285,7 +285,29 @@ fn run_controller(inputs: Vec<Input>, config: &Config, cache_dir: &Path) -> Resu
 
 #[cfg(feature = "bugreport")]
 fn invoke_bugreport(app: &App, cache_dir: &Path) {
-    use bugreport::{bugreport, collector::*, format::Markdown};
+    use bugreport::{bugreport, collector::*, format::Markdown, report::ReportEntry};
+
+    struct ColorSchemeCollector;
+
+    impl Collector for ColorSchemeCollector {
+        fn description(&self) -> &str {
+            "Detected terminal color scheme"
+        }
+
+        fn collect(
+            &mut self,
+            _: &bugreport::CrateInfo,
+        ) -> std::result::Result<ReportEntry, CollectionError> {
+            let color_scheme =
+                bat::theme::color_scheme(bat::theme::DetectColorScheme::Always);
+            let text = match color_scheme {
+                Some(bat::theme::ColorScheme::Dark) => "dark",
+                Some(bat::theme::ColorScheme::Light) => "light",
+                None => "not detected",
+            };
+            Ok(ReportEntry::Text(text.to_string()))
+        }
+    }
     let pager = bat::config::get_pager_executable(
         app.matches.get_one::<String>("pager").map(|s| s.as_str()),
     )
@@ -328,6 +350,7 @@ fn invoke_bugreport(app: &App, cache_dir: &Path) {
             custom_assets_metadata,
         ))
         .info(DirectoryEntries::new("Custom assets", cache_dir))
+        .info(ColorSchemeCollector)
         .info(CompileTimeInformation::default());
 
     #[cfg(feature = "paging")]

From 3e4169b8c3cc3b5d5824ff821279c5ce6872467a Mon Sep 17 00:00:00 2001
From: Keith Hall <keith-hall@users.noreply.github.com>
Date: Tue, 31 Mar 2026 22:35:21 +0300
Subject: [PATCH 3/3] cargo fmt

---
 src/bin/bat/main.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs
index 3cdf0531..a4a2c176 100644
--- a/src/bin/bat/main.rs
+++ b/src/bin/bat/main.rs
@@ -298,8 +298,7 @@ fn invoke_bugreport(app: &App, cache_dir: &Path) {
             &mut self,
             _: &bugreport::CrateInfo,
         ) -> std::result::Result<ReportEntry, CollectionError> {
-            let color_scheme =
-                bat::theme::color_scheme(bat::theme::DetectColorScheme::Always);
+            let color_scheme = bat::theme::color_scheme(bat::theme::DetectColorScheme::Always);
             let text = match color_scheme {
                 Some(bat::theme::ColorScheme::Dark) => "dark",
                 Some(bat::theme::ColorScheme::Light) => "light",