Improve text search result output, remove use of Serilog.Sinks.Console theming to improve consistency

src/SeqCli/Csv/CsvWriter.cs

@@ -1,20 +1,22 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using Seq.Api.Model.Data;
 using SeqCli.Mcp.Data;
-using Serilog.Sinks.SystemConsole.Themes;
+using SeqCli.Output;
+using Serilog.Templates.Themes;
 
 namespace SeqCli.Csv;
 
 static class CsvWriter
 {
-    public static void WriteQueryResult(QueryResultPart result, Func<object?, string> stringify, ConsoleTheme theme, TextWriter output)
+    public static void WriteQueryResult(QueryResultPart result, Func<object?, string> stringify, TemplateTheme? theme, TextWriter output)
     {
         if (!string.IsNullOrWhiteSpace(result.Error))
         {
-            theme.Set(output, ConsoleThemeStyle.Text);
+            theme?.Set(output, TemplateThemeStyle.Text);
             QueryResultHelper.WriteErrorResult(output, result);
-            theme.Reset(output);
+            theme?.Reset(output);
         }
 
         var first = true;
@@ -30,47 +32,47 @@ public static void WriteQueryResult(QueryResultPart result, Func<object?, string
         });
     }
 
-    static void WriteCell(TextWriter output, ConsoleTheme theme, object? value, Func<object?, string> stringify, ref bool firstCol, bool isHeadingRow = false)
+    static void WriteCell(TextWriter output, TemplateTheme? theme, object? value, Func<object?, string> stringify, ref bool firstCol, bool isHeadingRow = false)
     {
         if (firstCol)
         {
             firstCol = false;
         }
         else
         {
-            theme.Set(output, ConsoleThemeStyle.TertiaryText);
+            theme?.Set(output, TemplateThemeStyle.TertiaryText);
             output.Write(',');
-            theme.Reset(output);
+            theme?.Reset(output);
         }
 
-        theme.Set(output, ConsoleThemeStyle.TertiaryText);
+        theme?.Set(output, TemplateThemeStyle.TertiaryText);
         output.Write('"');
-        theme.Reset(output);
+        theme?.Reset(output);
 
         var valueAsString = stringify(value);
 
-        var dataStyle = isHeadingRow ? ConsoleThemeStyle.Name : ConsoleThemeStyle.Text;
+        var dataStyle = isHeadingRow ? TemplateThemeStyle.Name : TemplateThemeStyle.Text;
         var doubleQuote = valueAsString.IndexOf('"');
         while (doubleQuote != -1)
         {
-            theme.Set(output, dataStyle);
+            theme?.Set(output, dataStyle);
             output.Write(valueAsString[..doubleQuote]);
-            theme.Reset(output);
+            theme?.Reset(output);
 
-            theme.Set(output, ConsoleThemeStyle.Scalar);
+            theme?.Set(output, TemplateThemeStyle.Scalar);
             output.Write("\"\"");
-            theme.Reset(output);
+            theme?.Reset(output);
 
             valueAsString = valueAsString[(doubleQuote + 1)..];
             doubleQuote = valueAsString.IndexOf('"');
         }
 
-        theme.Set(output, dataStyle);
+        theme?.Set(output, dataStyle);
         output.Write(valueAsString);
-        theme.Reset(output);
+        theme?.Reset(output);
 
-        theme.Set(output, ConsoleThemeStyle.TertiaryText);
+        theme?.Set(output, TemplateThemeStyle.TertiaryText);
         output.Write('"');
-        theme.Reset(output);
+        theme?.Reset(output);
     }
 }

src/SeqCli/Forwarder/ForwarderModule.cs

@@ -68,13 +68,13 @@ protected override void Load(ContainerBuilder builder)
             Log.ForContext<ForwarderModule>().Warning("Configured to expose ingestion log via HTTP API");
             builder.RegisterType<IngestionLogEndpoints>().As<IMapEndpoints>();
 
-            var ingestionLogTemplate = "[{@t:o} {@l:u3}] {@m}\n";
+            var ingestionLogTemplate = $"[{{@t:o}} {{@l:u3}}] {{@m}}{Environment.NewLine}";
             if (_config.Forwarder.Diagnostics.IngestionLogShowDetail)
             {
                 Log.ForContext<ForwarderModule>().Warning("Including full client, payload, and error detail in the ingestion log");
                 ingestionLogTemplate +=
-                    "{#if ClientHostIP is not null}Client IP address: {ClientHostIP}\n{#end}" +
-                    "{#if DocumentStart is not null}First {StartToLog} characters of payload: {DocumentStart:l}\n{#end}" +
+                    $"{{#if ClientHostIP is not null}}Client IP address: {{ClientHostIP}}{Environment.NewLine}{{#end}}" +
+                    $"{{#if DocumentStart is not null}}First {{StartToLog}} characters of payload: {{DocumentStart:l}}{Environment.NewLine}{{#end}}" +
                     "{@x}";
             }
 

src/SeqCli/Ingestion/LogShipper.cs

@@ -33,7 +33,7 @@ namespace SeqCli.Ingestion;
 
 static class LogShipper
 {
-    static readonly ITextFormatter JsonFormatter = OutputFormatter.Json(null);
+    static readonly ITextFormatter JsonFormatter = TextFormatters.Json(null);
 
     public static async Task ShipBufferAsync(
         SeqConnection connection,

src/SeqCli/Mcp/McpServerInstaller.cs

@@ -87,13 +87,13 @@ static class McpServerInstaller
                 "mcpServers"),
 
             ["codex"] = Unsupported(
-                "Codex reads MCP servers from ~/.codex/config.toml (TOML), which seqcli can't edit automatically. Add this block:\n\n[mcp_servers.seq]\ncommand = \"seqcli\"\nargs = [\"mcp\", \"run\"]"),
+                $"Codex reads MCP servers from ~/.codex/config.toml (TOML), which seqcli can't edit automatically. Add this block:{Environment.NewLine}{Environment.NewLine}[mcp_servers.seq]{Environment.NewLine}command = \"seqcli\"{Environment.NewLine}args = [\"mcp\", \"run\"]"),
 
             ["goose"] = Unsupported(
-                "Goose reads MCP servers from ~/.config/goose/config.yaml (YAML) under `extensions`, which seqcli can't edit automatically. Add:\n\nextensions:\n  seq:\n    type: stdio\n    cmd: seqcli\n    args: [mcp, run]\n    enabled: true"),
+                $"Goose reads MCP servers from ~/.config/goose/config.yaml (YAML) under `extensions`, which seqcli can't edit automatically. Add:{Environment.NewLine}{Environment.NewLine}extensions:{Environment.NewLine}  seq:{Environment.NewLine}    type: stdio{Environment.NewLine}    cmd: seqcli{Environment.NewLine}    args: [mcp, run]{Environment.NewLine}    enabled: true"),
 
             ["continue"] = Unsupported(
-                "Continue reads MCP servers from YAML, which seqcli can't edit automatically. Create .continue/mcpServers/seq.yaml with:\n\nname: Seq\nversion: 0.0.1\nschema: v1\nmcpServers:\n  - name: seq\n    command: seqcli\n    args:\n      - mcp\n      - run"),
+                $"Continue reads MCP servers from YAML, which seqcli can't edit automatically. Create .continue/mcpServers/seq.yaml with:{Environment.NewLine}{Environment.NewLine}name: Seq{Environment.NewLine}version: 0.0.1{Environment.NewLine}schema: v1{Environment.NewLine}mcpServers:{Environment.NewLine}  - name: seq{Environment.NewLine}    command: seqcli{Environment.NewLine}    args:{Environment.NewLine}      - mcp{Environment.NewLine}      - run"),
         };
 
     static readonly IReadOnlyDictionary<string, string> AgentAliases =

src/SeqCli/Mcp/Tools/Search/SearchTools.cs

@@ -43,7 +43,7 @@ class SearchTools(McpSession session, SeqConnection connection)
 {
     const string ResultIdPropertyName = "__seqcli_ResultId";
     static readonly ExpressionTemplate SearchResultFormatter = new (
-        $"{{{ResultIdPropertyName}}} [{{UtcDateTime(@t)}} {{{LevelMapping.SurrogateLevelProperty}}}] {{@m}}\n{{#if @x is not null}}{{Substring(ToString(@x), 0, 512)}}...\n{{#end}}"
+        $"{{{ResultIdPropertyName}}} [{{UtcDateTime(@t)}} {{{LevelMapping.SurrogateLevelProperty}}}] {{@m}}{Environment.NewLine}{{#if @x is not null}}{{Substring(ToString(@x), 0, 512)}}...{Environment.NewLine}{{#end}}"
     );
 
     [McpServerTool(Name = "seq_new_session", ReadOnly = true, Title = "Begin a new Search/Query Session")]

src/SeqCli/Output/FlareTheme.cs

@@ -0,0 +1,70 @@
+// Copyright © Datalust Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+using System.Collections.Generic;
+using System.IO;
+using Serilog.Templates.Themes;
+
+namespace SeqCli.Output;
+
+/// <summary>
+/// <c>Flare</c> is Seq's embedded stream/columnar database. This theme is derived from one build originally
+/// for the <c>flaretl</c> command-line tooling used there.
+/// </summary>
+static class FlareTheme
+{
+    static readonly Dictionary<TemplateThemeStyle, string> FlareThemeStyles = new()
+    {
+        [TemplateThemeStyle.Name] = "\e[38;5;0215m",
+        [TemplateThemeStyle.Number] = "\e[38;5;0200m",
+        [TemplateThemeStyle.Boolean] = "\e[38;5;0039m",
+        [TemplateThemeStyle.Null] = "\e[38;5;0039m",
+        [TemplateThemeStyle.String] = "\e[38;5;0217m",
+        [TemplateThemeStyle.Scalar] = "\e[38;5;0217m",
+        [TemplateThemeStyle.LevelError] = "\e[38;5;0197m",
+        [TemplateThemeStyle.TertiaryText] = "\e[38;5;0244m",
+        // Based on `TemplateTheme.Code`
+        [TemplateThemeStyle.Text] = "\e[38;5;0253m",
+        [TemplateThemeStyle.SecondaryText] = "\e[38;5;0246m",
+        [TemplateThemeStyle.Invalid] = "\e[33;1m",
+        [TemplateThemeStyle.LevelVerbose] = "\e[37m",
+        [TemplateThemeStyle.LevelDebug] = "\e[37m",
+        [TemplateThemeStyle.LevelInformation] = "\e[37;1m",
+        [TemplateThemeStyle.LevelWarning] = "\e[38;5;0229m",
+        [TemplateThemeStyle.LevelFatal] = "\e[38;5;0197m\e[48;5;0238m"
+    };
+
+    public static readonly TemplateTheme SeqCli = new(FlareThemeStyles);
+
+    // `CsvWriter` implements its own theming behavior because the required APIs are not public in Serilog.Expressions.
+    // The best way forward for this is likely to be porting theming to Seq.Syntax, and exposing the required APIs there.
+
+    const string AnsiStyleResetSequence = "\e[0m";
+
+    // The passed-in theme is ignored because SerilogExpressions themes are opaque. All formatting uses the SeqCli theme.
+    // ReSharper disable once UnusedParameter.Global
+    extension(TemplateTheme theme)
+    {
+        public void Set(TextWriter output, TemplateThemeStyle style)
+        {
+            if (FlareThemeStyles.TryGetValue(style, out var styleSequence))
+                output.Write(styleSequence);
+        }
+
+        public void Reset(TextWriter output)
+        {
+            output.Write(AnsiStyleResetSequence);
+        }
+    }
+}

src/SeqCli/Output/OutputFormat.cs

@@ -32,7 +32,6 @@
 using Serilog.Core;
 using Serilog.Events;
 using Serilog.Parsing;
-using Serilog.Sinks.SystemConsole.Themes;
 using Serilog.Templates.Themes;
 
 namespace SeqCli.Output;
@@ -41,21 +40,9 @@ sealed class OutputFormat
 {
     // See https://no-color.org for semantics.
     const string NoColorEnvironmentVariable = "NO_COLOR";
-
-    internal const string DefaultOutputTemplate =
-        "[{Timestamp:o} {Level:u3}] {Message:lj} {Properties:j}{NewLine}{Exception}";
-
-    static bool AnsiIsDefault => !OperatingSystem.IsWindows();
-
-    internal static readonly ConsoleTheme DefaultAnsiTheme = AnsiConsoleTheme.Code;
-
-    internal static readonly ConsoleTheme DefaultTheme =
-        AnsiIsDefault ? DefaultAnsiTheme : SystemConsoleTheme.Literate;
-
-    static readonly TemplateTheme DefaultTemplateTheme = TemplateTheme.Code;
-
+
     readonly OutputSyntax _syntax;
-    readonly string _outputTemplate;
+    readonly string? _outputTemplate;
     readonly Logger _formatter;
 
     readonly JsonSerializer _serializer = JsonSerializer.CreateDefault(new JsonSerializerSettings
@@ -80,7 +67,8 @@ public OutputFormat(
             outputConfig,
             outputTemplate,
             noColorSetInEnvironment: NoColorSetInEnvironment(),
-            outputIsRedirected: Console.IsOutputRedirected)
+            outputIsRedirected: Console.IsOutputRedirected,
+            allowAnsiEscapes: TerminalFeatures.TryEnableAnsiEscapes())
     {
     }
 
@@ -91,51 +79,45 @@ public OutputFormat(
     /// <param name="outputTemplate">The template controlling plain-text formatting, or <c>null</c> for the default.</param>
     /// <param name="noColorSetInEnvironment">Whether <c>NO_COLOR</c> is set; see <see cref="NoColorSetInEnvironment"/>.</param>
     /// <param name="outputIsRedirected">Whether <c>STDOUT</c> is redirected, i.e. not attached to a terminal.</param>
+    /// <param name="allowAnsiEscapes">Whether ANSI escape sequences are allowed; generally <c>false</c> for interactive
+    /// legacy Windows terminals and <c>true</c> otherwise.</param>
     internal OutputFormat(
         OutputSyntax syntax,
         bool? noColor,
         bool? forceColor,
         SeqCliOutputConfig outputConfig,
         string? outputTemplate,
         bool noColorSetInEnvironment,
-        bool outputIsRedirected)
+        bool outputIsRedirected,
+        bool allowAnsiEscapes)
     {
         _syntax = syntax;
-        _outputTemplate = outputTemplate ?? DefaultOutputTemplate;
-
-        NoColor = ResolveNoColor(noColor, forceColor, outputConfig, noColorSetInEnvironment);
-        ApplyThemeToRedirectedOutput = !NoColor && (forceColor ?? outputConfig.ForceColor);
-
-        // Serilog's console sink applies the `NO_COLOR` convention itself, unconditionally, overriding whatever
-        // theme it's passed. When `--force-color` has opted back out of `NO_COLOR`, the variable is cleared (for
-        // this process only) so that the sink can't undo the decision made here.
-        if (!NoColor && noColorSetInEnvironment)
-            Environment.SetEnvironmentVariable(NoColorEnvironmentVariable, null);
+        _outputTemplate = outputTemplate;
 
-        var colorize = !NoColor && (ApplyThemeToRedirectedOutput || !outputIsRedirected);
+        var resolvedNoColor = ResolveNoColor(noColor, forceColor, outputConfig, noColorSetInEnvironment, allowAnsiEscapes);
+        var applyThemeToRedirectedOutput = !resolvedNoColor && (forceColor ?? outputConfig.ForceColor);
+        var colorize = !resolvedNoColor && (applyThemeToRedirectedOutput || !outputIsRedirected);
 
-        Theme = !colorize                       ? ConsoleTheme.None
-            :   ApplyThemeToRedirectedOutput    ? DefaultAnsiTheme
-            :                                     DefaultTheme;
-
-        // Rather than emit escapes that a downlevel Windows terminal would show literally,
-        // JSON output stays plain there unless ANSI has been opted into with `--force-color`.
-        TemplateTheme = colorize && (ApplyThemeToRedirectedOutput || AnsiIsDefault)
-            ? DefaultTemplateTheme
+        TemplateTheme = colorize
+            ? FlareTheme.SeqCli
             : null;
 
         _formatter = CreateOutputLogger();
     }
 
     static bool NoColorSetInEnvironment()
         => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(NoColorEnvironmentVariable));
-
-    static bool ResolveNoColor(
+    
+    internal static bool ResolveNoColor(
         bool? noColorFlag,
         bool? forceColorFlag,
         SeqCliOutputConfig config,
-        bool noColorSetInEnvironment)
+        bool noColorSetInEnvironment,
+        bool supportsAnsiEscapes)
     {
+        if (!supportsAnsiEscapes)
+            return true;
+
         if (noColorFlag != null)
             return noColorFlag.Value;
 
@@ -149,12 +131,6 @@ static bool ResolveNoColor(
     public bool Text => _syntax == OutputSyntax.Text;
     public bool Native => _syntax == OutputSyntax.Native;
 
-    internal bool NoColor { get; }
-
-    bool ApplyThemeToRedirectedOutput { get; }
-
-    internal ConsoleTheme Theme { get; }
-
     internal TemplateTheme? TemplateTheme { get; }
 
     public bool RequiresRender => Native;
@@ -167,14 +143,11 @@ Logger CreateOutputLogger()
 
         if (Json)
         {
-            outputConfiguration.WriteTo.Console(OutputFormatter.Json(TemplateTheme));
+            outputConfiguration.WriteTo.Console(TextFormatters.Json(TemplateTheme));
         }
         else if (Text)
         {
-            outputConfiguration.WriteTo.Console(
-                outputTemplate: _outputTemplate,
-                theme: Theme,
-                applyThemeToRedirectedOutput: ApplyThemeToRedirectedOutput);
+            outputConfiguration.WriteTo.Console(TextFormatters.Plain(TemplateTheme, _outputTemplate));
         }
 
         // The logger is not configured for Native output, which avoids it. Ideally we'll shift away from using
@@ -198,10 +171,7 @@ public void WriteEntity(Entity entity)
             var writer = new LoggerConfiguration()
                 .Destructure.With<JsonNetDestructuringPolicy>()
                 .Enrich.With<StripStructureTypeEnricher>()
-                .WriteTo.Console(
-                    outputTemplate: "{@Message:j}{NewLine}",
-                    theme: Theme,
-                    applyThemeToRedirectedOutput: ApplyThemeToRedirectedOutput)
+                .WriteTo.Console(TextFormatters.Plain(TemplateTheme, "{@m}" + Environment.NewLine))
                 .CreateLogger();
             writer.Information("{@Entity}", jo);
         }
@@ -231,10 +201,7 @@ public void WriteObject(object value)
             var writer = new LoggerConfiguration()
                 .Destructure.With<JsonNetDestructuringPolicy>()
                 .Enrich.With<StripStructureTypeEnricher>()
-                .WriteTo.Console(
-                    outputTemplate: "{@Message:j}{NewLine}",
-                    theme: Theme,
-                    applyThemeToRedirectedOutput: ApplyThemeToRedirectedOutput)
+                .WriteTo.Console(TextFormatters.Plain(TemplateTheme, "{@m}" + Environment.NewLine))
                 .CreateLogger();
             writer.Information("{@Entity}", jo);
         }
@@ -277,7 +244,7 @@ public void WriteQueryResult(QueryResultPart result)
         }
         else
         {
-            CsvWriter.WriteQueryResult(result, Stringify, Theme, Console.Out);
+            CsvWriter.WriteQueryResult(result, Stringify, TemplateTheme, Console.Out);
         }
     }