1 files changed, 99 insertions, 4 deletions

diff --git a/src/zencore/logging/ansicolorsink.cpp b/src/zencore/logging/ansicolorsink.cpp
index 9b9959862..540d22359 100644
--- a/src/zencore/logging/ansicolorsink.cpp
+++ b/src/zencore/logging/ansicolorsink.cpp
@@ -5,8 +5,19 @@
 #include <zencore/logging/messageonlyformatter.h>
 
 #include <cstdio>
+#include <cstdlib>
 #include <mutex>
 
+#if defined(_WIN32)
+#	include <io.h>
+#	define ZEN_ISATTY _isatty
+#	define ZEN_FILENO _fileno
+#else
+#	include <unistd.h>
+#	define ZEN_ISATTY isatty
+#	define ZEN_FILENO fileno
+#endif
+
 namespace zen::logging {
 
 // Default formatter replicating spdlog's %+ pattern:
@@ -98,7 +109,90 @@ GetColorForLevel(LogLevel InLevel)
 
 struct AnsiColorStdoutSink::Impl
 {
-	Impl() : m_Formatter(std::make_unique<DefaultConsoleFormatter>()) {}
+	explicit Impl(ColorMode Mode) : m_Formatter(std::make_unique<DefaultConsoleFormatter>()), m_UseColor(ResolveColorMode(Mode)) {}
+
+	static bool IsColorTerminal()
+	{
+		// If stdout is not a TTY, no color
+		if (ZEN_ISATTY(ZEN_FILENO(stdout)) == 0)
+		{
+			return false;
+		}
+
+		// NO_COLOR convention (https://no-color.org/)
+		if (std::getenv("NO_COLOR") != nullptr)
+		{
+			return false;
+		}
+
+		// COLORTERM is set by terminals that support color (e.g. "truecolor", "24bit")
+		if (std::getenv("COLORTERM") != nullptr)
+		{
+			return true;
+		}
+
+		// Check TERM for known color-capable values
+		const char* Term = std::getenv("TERM");
+		if (Term != nullptr)
+		{
+			std::string_view TermView(Term);
+			// "dumb" terminals do not support color
+			if (TermView == "dumb")
+			{
+				return false;
+			}
+			// Match against known color-capable terminal types.
+			// TERM often includes suffixes like "-256color", so we use substring matching.
+			constexpr std::string_view ColorTerms[] = {
+				"alacritty",
+				"ansi",
+				"color",
+				"console",
+				"cygwin",
+				"gnome",
+				"konsole",
+				"kterm",
+				"linux",
+				"msys",
+				"putty",
+				"rxvt",
+				"screen",
+				"tmux",
+				"vt100",
+				"vt102",
+				"xterm",
+			};
+			for (std::string_view Candidate : ColorTerms)
+			{
+				if (TermView.find(Candidate) != std::string_view::npos)
+				{
+					return true;
+				}
+			}
+		}
+
+#if defined(_WIN32)
+		// Windows console supports ANSI color by default in modern versions
+		return true;
+#else
+		// Unknown terminal — be conservative
+		return false;
+#endif
+	}
+
+	static bool ResolveColorMode(ColorMode Mode)
+	{
+		switch (Mode)
+		{
+			case ColorMode::On:
+				return true;
+			case ColorMode::Off:
+				return false;
+			case ColorMode::Auto:
+			default:
+				return IsColorTerminal();
+		}
+	}
 
 	void Log(const LogMessage& Msg)
 	{
@@ -107,7 +201,7 @@ struct AnsiColorStdoutSink::Impl
 		MemoryBuffer Formatted;
 		m_Formatter->Format(Msg, Formatted);
 
-		if (Msg.ColorRangeEnd > Msg.ColorRangeStart)
+		if (m_UseColor && Msg.ColorRangeEnd > Msg.ColorRangeStart)
 		{
 			// Print pre-color range
 			fwrite(Formatted.data(), 1, Msg.ColorRangeStart, m_File);
@@ -148,10 +242,11 @@ struct AnsiColorStdoutSink::Impl
 private:
 	std::mutex				   m_Mutex;
 	std::unique_ptr<Formatter> m_Formatter;
-	FILE*					   m_File = stdout;
+	FILE*					   m_File	  = stdout;
+	bool					   m_UseColor = true;
 };
 
-AnsiColorStdoutSink::AnsiColorStdoutSink() : m_Impl(std::make_unique<Impl>())
+AnsiColorStdoutSink::AnsiColorStdoutSink(ColorMode Mode) : m_Impl(std::make_unique<Impl>(Mode))
 {
 }