releases/ClaudeDo
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases 39 Wiki Activity

feat(ui): colour agent output by kind and stop cutting tool calls at 120 chars

Browse Source 
StreamLineFormatter now returns kind-tagged entries (text, tool, edit,
tool result, error, sys, result) instead of a flat string, so the
existing LogKind colours finally apply to stream-json output. Tool
argument/result limit raised from 120 to 500 chars.
This commit is contained in:
mika kuns
2026-10-01 10:49:52 +02:00
parent 0e4de9e4c0
commit 9bb0e67a97
6 changed files with 149 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ClaudeDo.Ui/Converters/LogKindForegroundConverter.cs
+11 -9
View File
@@ -24,15 +24,17 @@ public sealed class LogKindForegroundConverter : IValueConverter
{
var key = value is LogKind kind ? kind switch
{
LogKind.Sys => "TextMuteBrush",
LogKind.Tool => "SageBrush",
LogKind.Claude => "TextBrush",
LogKind.Stdout => "TextDimBrush",
LogKind.Stderr => "BloodBrush",
LogKind.Done => "MossBrightBrush",
LogKind.Msg => "TextDimBrush",
LogKind.User => "AccentBrush",
_ => "TextDimBrush",
LogKind.Sys => "TextMuteBrush",
LogKind.Tool => "SageBrush",
LogKind.Claude => "TextBrush",
LogKind.Stdout => "TextDimBrush",
LogKind.Stderr => "BloodBrush",
LogKind.Done => "MossBrightBrush",
LogKind.Msg => "TextDimBrush",
LogKind.User => "AccentBrush",
LogKind.Edit => "AmberBrush",
LogKind.ToolResult => "TextMuteBrush",
_ => "TextDimBrush",
} : "TextDimBrush";
return Resolve(key) ?? AvaloniaProperty.UnsetValue;
src/ClaudeDo.Ui/Helpers/StreamLineFormatter.cs
+29 -35
View File
@@ -1,14 +1,17 @@
using System.Text;
using System.Text.Json;
using ClaudeDo.Ui.ViewModels.Islands;
namespace ClaudeDo.Ui.Helpers;
/// <summary>Turns Claude CLI stream-json lines into kind-tagged log entries for the terminal views.</summary>
public class StreamLineFormatter
{
private const int MaxLength = 50_000;
private const int MaxArgChars = 120;
private const int MaxArgChars = 500;
public string? FormatLine(string line)
/// <summary>Formats one stdout line; null when the event is filtered. Entry text may span several lines.</summary>
public IReadOnlyList<(LogKind Kind, string Text)>? FormatLine(string line)
{
JsonDocument doc;
try
@@ -17,7 +20,7 @@ public class StreamLineFormatter
}
catch (JsonException)
{
return line;
return [(LogKind.Stdout, line)];
}
using (doc)
@@ -28,7 +31,7 @@ public class StreamLineFormatter
if (!root.TryGetProperty("type", out var typeProp))
return null;
return typeProp.GetString() switch
var entries = typeProp.GetString() switch
{
"system" => FormatSystem(root),
"assistant" => FormatAssistant(root),
@@ -36,10 +39,11 @@ public class StreamLineFormatter
"result" => FormatResult(root),
_ => null,
};
return entries is { Count: > 0 } ? entries : null;
}
}
private static string? FormatSystem(JsonElement root)
private static List<(LogKind, string)>? FormatSystem(JsonElement root)
{
if (!root.TryGetProperty("subtype", out var subtypeProp))
return null;
@@ -48,7 +52,7 @@ public class StreamLineFormatter
switch (subtype)
{
case "api_retry":
return "[Retrying API call...]\n";
return [(LogKind.Sys, "[Retrying API call...]")];
case "init":
{
@@ -61,7 +65,7 @@ public class StreamLineFormatter
? sessionId[..8]
: sessionId ?? "?";
var modelPart = string.IsNullOrEmpty(model) ? "" : $" · {model}";
return $"[session {shortId}{modelPart}]\n";
return [(LogKind.Sys, $"[session {shortId}{modelPart}]")];
}
default:
@@ -69,12 +73,12 @@ public class StreamLineFormatter
}
}
private static string? FormatAssistant(JsonElement root)
private static List<(LogKind, string)>? FormatAssistant(JsonElement root)
{
if (!TryGetContentArray(root, out var content))
return null;
var sb = new StringBuilder();
var entries = new List<(LogKind, string)>();
foreach (var block in content.EnumerateArray())
{
if (block.ValueKind != JsonValueKind.Object) continue;
@@ -87,16 +91,12 @@ public class StreamLineFormatter
{
var text = textProp.GetString();
if (!string.IsNullOrEmpty(text))
{
sb.Append(text);
if (!text.EndsWith('\n')) sb.Append('\n');
}
entries.Add((LogKind.Claude, text));
}
break;
case "tool_use":
sb.Append(FormatToolUse(block));
sb.Append('\n');
entries.Add(FormatToolUse(block));
break;
case "thinking":
@@ -106,7 +106,7 @@ public class StreamLineFormatter
}
}
return sb.Length == 0 ? null : sb.ToString();
return entries;
}
private static bool TryGetContentArray(JsonElement root, out JsonElement content)
@@ -120,35 +120,30 @@ public class StreamLineFormatter
return true;
}
private static string? FormatUser(JsonElement root)
private static List<(LogKind, string)>? FormatUser(JsonElement root)
{
if (!TryGetContentArray(root, out var content))
return null;
var sb = new StringBuilder();
var entries = new List<(LogKind, string)>();
foreach (var block in content.EnumerateArray())
{
if (block.ValueKind != JsonValueKind.Object) continue;
if (!block.TryGetProperty("type", out var blockTypeProp)) continue;
if (blockTypeProp.GetString() != "tool_result") continue;
var summary = BuildToolResultSummary(root, block);
var isError = block.TryGetProperty("is_error", out var errProp)
&& errProp.ValueKind == JsonValueKind.True;
var summary = BuildToolResultSummary(root, block, isError);
if (!string.IsNullOrEmpty(summary))
{
sb.Append("→ ");
sb.Append(summary);
sb.Append('\n');
}
entries.Add((isError ? LogKind.Stderr : LogKind.ToolResult, "→ " + summary));
}
return sb.Length == 0 ? null : sb.ToString();
return entries;
}
private static string BuildToolResultSummary(JsonElement root, JsonElement block)
private static string BuildToolResultSummary(JsonElement root, JsonElement block, bool isError)
{
var isError = block.TryGetProperty("is_error", out var errProp)
&& errProp.ValueKind == JsonValueKind.True;
var contentText = ResolveContentText(block);
if (isError)
@@ -215,14 +210,14 @@ public class StreamLineFormatter
return "";
}
private static string? FormatResult(JsonElement root)
private static List<(LogKind, string)>? FormatResult(JsonElement root)
{
if (root.TryGetProperty("result", out var resultProp))
return $"\n--- Result ---\n{resultProp.GetString()}\n";
return [(LogKind.Done, $"--- Result ---\n{resultProp.GetString()}")];
return null;
}
private static string FormatToolUse(JsonElement block)
private static (LogKind, string) FormatToolUse(JsonElement block)
{
var name = block.TryGetProperty("name", out var nameProp)
? nameProp.GetString() ?? "?"
@@ -241,10 +236,9 @@ public class StreamLineFormatter
}
string? arg = hasInput ? BuildToolArg(name, input) : null;
var kind = name is "Edit" or "Write" or "NotebookEdit" ? LogKind.Edit : LogKind.Tool;
return string.IsNullOrEmpty(arg)
? $"[{label}]"
: $"[{label}] {arg}";
return (kind, string.IsNullOrEmpty(arg) ? $"[{label}]" : $"[{label}] {arg}");
}
private static string? BuildToolArg(string toolName, JsonElement input)
src/ClaudeDo.Ui/ViewModels/Islands/LogLineViewModel.cs
+35 -19
View File
@@ -1,6 +1,6 @@
namespace ClaudeDo.Ui.ViewModels.Islands;
public enum LogKind { Sys, Tool, Claude, Stdout, Stderr, Done, Msg, User }
public enum LogKind { Sys, Tool, Claude, Stdout, Stderr, Done, Msg, User, Edit, ToolResult }
public sealed class LogLineViewModel
{
@@ -9,26 +9,42 @@ public sealed class LogLineViewModel
public string TimestampFormatted { get; } = DateTime.Now.ToString("HH:mm:ss");
public string KindMarker => Kind switch
{
LogKind.Sys => "sys",
LogKind.Tool => "tool",
LogKind.Claude => "claude",
LogKind.Stdout => "out",
LogKind.Stderr => "err",
LogKind.Done => "done",
LogKind.Msg => "claude",
LogKind.User => "you",
_ => "",
LogKind.Sys => "sys",
LogKind.Tool => "tool",
LogKind.Claude => "claude",
LogKind.Stdout => "out",
LogKind.Stderr => "err",
LogKind.Done => "done",
LogKind.Msg => "claude",
LogKind.User => "you",
LogKind.Edit => "edit",
LogKind.ToolResult => "result",
_ => "",
};
public string ClassName => Kind switch
{
LogKind.Sys => "log-sys",
LogKind.Tool => "log-tool",
LogKind.Claude => "log-claude",
LogKind.Stdout => "log-stdout",
LogKind.Stderr => "log-stderr",
LogKind.Done => "log-done",
LogKind.Msg => "log-msg",
LogKind.User => "log-user",
_ => "",
LogKind.Sys => "log-sys",
LogKind.Tool => "log-tool",
LogKind.Claude => "log-claude",
LogKind.Stdout => "log-stdout",
LogKind.Stderr => "log-stderr",
LogKind.Done => "log-done",
LogKind.Msg => "log-msg",
LogKind.User => "log-user",
LogKind.Edit => "log-edit",
LogKind.ToolResult => "log-result",
_ => "",
};
/// <summary>Splits formatter entries into one log line per non-blank text line, keeping each entry's kind.</summary>
public static IEnumerable<LogLineViewModel> FromEntries(IEnumerable<(LogKind Kind, string Text)> entries)
{
foreach (var (kind, text) in entries)
foreach (var raw in text.Split('\n'))
{
var piece = raw.TrimEnd('\r');
if (!string.IsNullOrWhiteSpace(piece))
yield return new LogLineViewModel { Kind = kind, Text = piece };
}
}
}
src/ClaudeDo.Ui/ViewModels/Islands/PrepPanelViewModel.cs
+3 -21
View File
@@ -1,5 +1,4 @@
using System.Collections.ObjectModel;
using System.Text;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using ClaudeDo.Ui.Helpers;
@@ -13,7 +12,6 @@ public sealed partial class PrepPanelViewModel : ViewModelBase, IDisposable
{
private readonly IWorkerClient _worker;
private readonly StreamLineFormatter _formatter = new();
private readonly StringBuilder _prepClaudeBuf = new();
private readonly Action _onPrepStartedHandler;
private readonly Action<string> _onPrepLineHandler;
@@ -128,24 +126,8 @@ public sealed partial class PrepPanelViewModel : ViewModelBase, IDisposable
private void AppendStdoutLine(string line)
{
var formatted = _formatter.FormatLine(line);
if (formatted is null) return;
AppendClaudeText(formatted);
}
private void AppendClaudeText(string chunk)
{
_prepClaudeBuf.Append(chunk);
while (true)
{
var text = _prepClaudeBuf.ToString();
var nl = text.IndexOf('\n');
if (nl < 0) break;
var piece = text[..nl].TrimEnd('\r');
if (!string.IsNullOrWhiteSpace(piece))
PrepLog.Add(new LogLineViewModel { Kind = LogKind.Claude, Text = piece });
_prepClaudeBuf.Clear();
_prepClaudeBuf.Append(text[(nl + 1)..]);
}
if (_formatter.FormatLine(line) is not { } entries) return;
foreach (var entry in LogLineViewModel.FromEntries(entries))
PrepLog.Add(entry);
}
}
src/ClaudeDo.Ui/ViewModels/Islands/TaskMonitorViewModel.cs
+3 -30
View File
@@ -1,5 +1,4 @@
using System.Collections.ObjectModel;
using System.Text;
using System.Text.Json;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
@@ -18,7 +17,6 @@ public sealed partial class TaskMonitorViewModel : ViewModelBase, IDisposable
private readonly IWorkerClient _worker;
private readonly StreamLineFormatter _formatter = new();
private readonly StringBuilder _claudeBuf = new();
private string? _subscribedTaskId;
public string? SubscribedTaskId => _subscribedTaskId;
@@ -105,7 +103,6 @@ public sealed partial class TaskMonitorViewModel : ViewModelBase, IDisposable
_onTaskFinished = (slot, taskId, status, finishedAt) =>
{
if (taskId != _subscribedTaskId) return;
FlushClaudeBuffer();
Log.Add(new LogLineViewModel
{
Kind = LogKind.Done,
@@ -182,7 +179,6 @@ public sealed partial class TaskMonitorViewModel : ViewModelBase, IDisposable
public void Reset()
{
Log.Clear();
_claudeBuf.Clear();
_subscribedTaskId = null;
AgentState = "idle";
SessionOutcome = null;
@@ -272,7 +268,6 @@ public sealed partial class TaskMonitorViewModel : ViewModelBase, IDisposable
var normalized = line.StartsWith("[", StringComparison.Ordinal) ? line : "[stdout] " + line;
OnTaskMessage(_subscribedTaskId, normalized);
}
FlushClaudeBuffer();
}
catch (OperationCanceledException) { throw; }
catch { /* best-effort replay */ }
@@ -289,8 +284,6 @@ public sealed partial class TaskMonitorViewModel : ViewModelBase, IDisposable
return;
}
FlushClaudeBuffer();
var kind = line.StartsWith("[sys]", StringComparison.OrdinalIgnoreCase) ? LogKind.Sys
: line.StartsWith("[tool]", StringComparison.OrdinalIgnoreCase) ? LogKind.Tool
: line.StartsWith("[claude]", StringComparison.OrdinalIgnoreCase) ? LogKind.Claude
@@ -302,29 +295,9 @@ public sealed partial class TaskMonitorViewModel : ViewModelBase, IDisposable
private void AppendStdoutLine(string line)
{
var formatted = _formatter.FormatLine(line);
if (formatted is null) return;
_claudeBuf.Append(formatted);
while (true)
{
var text = _claudeBuf.ToString();
var nl = text.IndexOf('\n');
if (nl < 0) break;
var piece = text[..nl].TrimEnd('\r');
if (!string.IsNullOrWhiteSpace(piece))
Log.Add(new LogLineViewModel { Kind = LogKind.Claude, Text = piece });
_claudeBuf.Clear();
_claudeBuf.Append(text[(nl + 1)..]);
}
}
private void FlushClaudeBuffer()
{
if (_claudeBuf.Length == 0) return;
var piece = _claudeBuf.ToString().TrimEnd();
_claudeBuf.Clear();
if (!string.IsNullOrWhiteSpace(piece))
Log.Add(new LogLineViewModel { Kind = LogKind.Claude, Text = piece });
if (_formatter.FormatLine(line) is not { } entries) return;
foreach (var entry in LogLineViewModel.FromEntries(entries))
Log.Add(entry);
}
private async System.Threading.Tasks.Task RefreshStatusAsync(string taskId)