feat(daily-prep): add live prep-output mode to the Details island
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -138,7 +138,8 @@
|
|||||||
"toggleEditPreviewTip": "Bearbeiten/Vorschau umschalten",
|
"toggleEditPreviewTip": "Bearbeiten/Vorschau umschalten",
|
||||||
"previewBtn": "Vorschau",
|
"previewBtn": "Vorschau",
|
||||||
"editBtn": "Bearbeiten",
|
"editBtn": "Bearbeiten",
|
||||||
"descriptionPlaceholder": "Aufgabendetails hinzufügen (Markdown unterstützt)..."
|
"descriptionPlaceholder": "Aufgabendetails hinzufügen (Markdown unterstützt)...",
|
||||||
|
"prepTitle": "Tagesvorbereitung"
|
||||||
},
|
},
|
||||||
"agent": {
|
"agent": {
|
||||||
"stopTip": "Agent stoppen",
|
"stopTip": "Agent stoppen",
|
||||||
|
|||||||
@@ -138,7 +138,8 @@
|
|||||||
"toggleEditPreviewTip": "Toggle edit/preview",
|
"toggleEditPreviewTip": "Toggle edit/preview",
|
||||||
"previewBtn": "Preview",
|
"previewBtn": "Preview",
|
||||||
"editBtn": "Edit",
|
"editBtn": "Edit",
|
||||||
"descriptionPlaceholder": "Add task details (markdown supported)..."
|
"descriptionPlaceholder": "Add task details (markdown supported)...",
|
||||||
|
"prepTitle": "Daily prep"
|
||||||
},
|
},
|
||||||
"agent": {
|
"agent": {
|
||||||
"stopTip": "Stop agent",
|
"stopTip": "Stop agent",
|
||||||
|
|||||||
@@ -54,6 +54,14 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
|
|||||||
private readonly INotesApi _notesApi;
|
private readonly INotesApi _notesApi;
|
||||||
|
|
||||||
[ObservableProperty] private bool _isNotesMode;
|
[ObservableProperty] private bool _isNotesMode;
|
||||||
|
[ObservableProperty] private bool _isPrepMode;
|
||||||
|
[ObservableProperty] private bool _isPrepRunning;
|
||||||
|
public ObservableCollection<LogLineViewModel> PrepLog { get; } = new();
|
||||||
|
public bool IsTaskDetailVisible => !IsNotesMode && !IsPrepMode;
|
||||||
|
|
||||||
|
partial void OnIsNotesModeChanged(bool value) => OnPropertyChanged(nameof(IsTaskDetailVisible));
|
||||||
|
partial void OnIsPrepModeChanged(bool value) => OnPropertyChanged(nameof(IsTaskDetailVisible));
|
||||||
|
|
||||||
public NotesEditorViewModel Notes { get; private set; } = null!;
|
public NotesEditorViewModel Notes { get; private set; } = null!;
|
||||||
|
|
||||||
// Current task row (set by IslandsShellViewModel via Bind)
|
// Current task row (set by IslandsShellViewModel via Bind)
|
||||||
@@ -207,6 +215,7 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
|
|||||||
// Claude CLI stream-json parser + buffer for partial text deltas
|
// Claude CLI stream-json parser + buffer for partial text deltas
|
||||||
private readonly StreamLineFormatter _formatter = new();
|
private readonly StreamLineFormatter _formatter = new();
|
||||||
private readonly StringBuilder _claudeBuf = new();
|
private readonly StringBuilder _claudeBuf = new();
|
||||||
|
private readonly StringBuilder _prepClaudeBuf = new();
|
||||||
|
|
||||||
// The task ID we are currently subscribed to for live log messages
|
// The task ID we are currently subscribed to for live log messages
|
||||||
private string? _subscribedTaskId;
|
private string? _subscribedTaskId;
|
||||||
@@ -285,6 +294,9 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
|
|||||||
|
|
||||||
// Subscribe once; filter by current task id inside the handler
|
// Subscribe once; filter by current task id inside the handler
|
||||||
_worker.TaskMessageEvent += OnTaskMessage;
|
_worker.TaskMessageEvent += OnTaskMessage;
|
||||||
|
_worker.PrepStartedEvent += OnPrepStarted;
|
||||||
|
_worker.PrepLineEvent += OnPrepLine;
|
||||||
|
_worker.PrepFinishedEvent += OnPrepFinished;
|
||||||
|
|
||||||
// Re-evaluate CanExecute when worker connection flips.
|
// Re-evaluate CanExecute when worker connection flips.
|
||||||
_worker.PropertyChanged += (_, e) =>
|
_worker.PropertyChanged += (_, e) =>
|
||||||
@@ -345,9 +357,7 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
|
|||||||
if (line.StartsWith("[stdout]", StringComparison.OrdinalIgnoreCase))
|
if (line.StartsWith("[stdout]", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
var body = line["[stdout]".Length..].TrimStart();
|
var body = line["[stdout]".Length..].TrimStart();
|
||||||
var formatted = _formatter.FormatLine(body);
|
AppendStdoutLine(Log, body);
|
||||||
if (formatted is null) return; // filter noise (message_start, etc.)
|
|
||||||
AppendClaudeText(formatted);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -363,20 +373,40 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
|
|||||||
Log.Add(new LogLineViewModel { Kind = kind, Text = line });
|
Log.Add(new LogLineViewModel { Kind = kind, Text = line });
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AppendClaudeText(string chunk)
|
private void AppendStdoutLine(ObservableCollection<LogLineViewModel> target, string line)
|
||||||
{
|
{
|
||||||
_claudeBuf.Append(chunk);
|
var formatted = _formatter.FormatLine(line);
|
||||||
|
if (formatted is null) return;
|
||||||
|
var buf = ReferenceEquals(target, Log) ? _claudeBuf : _prepClaudeBuf;
|
||||||
|
AppendClaudeText(formatted, target, buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnPrepStarted()
|
||||||
|
{
|
||||||
|
PrepLog.Clear();
|
||||||
|
IsPrepRunning = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnPrepLine(string line) => AppendStdoutLine(PrepLog, line);
|
||||||
|
|
||||||
|
private void OnPrepFinished(bool success) => IsPrepRunning = false;
|
||||||
|
|
||||||
|
private void AppendClaudeText(string chunk) => AppendClaudeText(chunk, Log, _claudeBuf);
|
||||||
|
|
||||||
|
private static void AppendClaudeText(string chunk, ObservableCollection<LogLineViewModel> target, StringBuilder buf)
|
||||||
|
{
|
||||||
|
buf.Append(chunk);
|
||||||
// Emit a log entry for every completed line; keep the trailing remainder buffered.
|
// Emit a log entry for every completed line; keep the trailing remainder buffered.
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
var text = _claudeBuf.ToString();
|
var text = buf.ToString();
|
||||||
var nl = text.IndexOf('\n');
|
var nl = text.IndexOf('\n');
|
||||||
if (nl < 0) break;
|
if (nl < 0) break;
|
||||||
var piece = text[..nl].TrimEnd('\r');
|
var piece = text[..nl].TrimEnd('\r');
|
||||||
if (!string.IsNullOrWhiteSpace(piece))
|
if (!string.IsNullOrWhiteSpace(piece))
|
||||||
Log.Add(new LogLineViewModel { Kind = LogKind.Claude, Text = piece });
|
target.Add(new LogLineViewModel { Kind = LogKind.Claude, Text = piece });
|
||||||
_claudeBuf.Clear();
|
buf.Clear();
|
||||||
_claudeBuf.Append(text[(nl + 1)..]);
|
buf.Append(text[(nl + 1)..]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -478,13 +508,22 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
|
|||||||
public void ShowNotes()
|
public void ShowNotes()
|
||||||
{
|
{
|
||||||
Bind(null);
|
Bind(null);
|
||||||
|
IsPrepMode = false;
|
||||||
IsNotesMode = true;
|
IsNotesMode = true;
|
||||||
_ = Notes.LoadDayAsync(DateOnly.FromDateTime(DateTime.Today));
|
_ = Notes.LoadDayAsync(DateOnly.FromDateTime(DateTime.Today));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ShowPrep()
|
||||||
|
{
|
||||||
|
Bind(null);
|
||||||
|
IsNotesMode = false;
|
||||||
|
IsPrepMode = true;
|
||||||
|
}
|
||||||
|
|
||||||
public void Bind(TaskRowViewModel? row)
|
public void Bind(TaskRowViewModel? row)
|
||||||
{
|
{
|
||||||
IsNotesMode = false;
|
IsNotesMode = false;
|
||||||
|
IsPrepMode = false;
|
||||||
_loadCts?.Cancel();
|
_loadCts?.Cancel();
|
||||||
_loadCts?.Dispose();
|
_loadCts?.Dispose();
|
||||||
_loadCts = new CancellationTokenSource();
|
_loadCts = new CancellationTokenSource();
|
||||||
|
|||||||
@@ -127,10 +127,10 @@
|
|||||||
<!-- ── Agent status strip (sticky, above metadata footer) ── -->
|
<!-- ── Agent status strip (sticky, above metadata footer) ── -->
|
||||||
<islands:AgentStripView DockPanel.Dock="Bottom"/>
|
<islands:AgentStripView DockPanel.Dock="Bottom"/>
|
||||||
|
|
||||||
<!-- ── Body: task details (normal) or notes editor (notes mode) ── -->
|
<!-- ── Body: task details (normal), notes editor (notes mode), or prep log (prep mode) ── -->
|
||||||
<Grid>
|
<Grid>
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Auto"
|
<ScrollViewer VerticalScrollBarVisibility="Auto"
|
||||||
IsVisible="{Binding !IsNotesMode}">
|
IsVisible="{Binding IsTaskDetailVisible}">
|
||||||
<StackPanel Spacing="0">
|
<StackPanel Spacing="0">
|
||||||
|
|
||||||
<!-- Planning merge section — visible only for planning parent tasks -->
|
<!-- Planning merge section — visible only for planning parent tasks -->
|
||||||
@@ -299,6 +299,29 @@
|
|||||||
<Panel IsVisible="{Binding IsNotesMode}">
|
<Panel IsVisible="{Binding IsNotesMode}">
|
||||||
<islands:NotesEditorView DataContext="{Binding Notes}"/>
|
<islands:NotesEditorView DataContext="{Binding Notes}"/>
|
||||||
</Panel>
|
</Panel>
|
||||||
|
<Panel IsVisible="{Binding IsPrepMode}">
|
||||||
|
<DockPanel>
|
||||||
|
<TextBlock DockPanel.Dock="Top" Margin="16,12"
|
||||||
|
Text="{loc:Tr details.prepTitle}" Classes="h2"/>
|
||||||
|
<ScrollViewer>
|
||||||
|
<ItemsControl ItemsSource="{Binding PrepLog}">
|
||||||
|
<ItemsControl.ItemTemplate>
|
||||||
|
<DataTemplate DataType="vm:LogLineViewModel">
|
||||||
|
<Grid ColumnDefinitions="60,*" Margin="0,1">
|
||||||
|
<TextBlock Grid.Column="0"
|
||||||
|
Classes="log-ts"
|
||||||
|
Text="{Binding TimestampFormatted}"/>
|
||||||
|
<SelectableTextBlock Grid.Column="1"
|
||||||
|
Text="{Binding Text}" Tag="{Binding ClassName}"
|
||||||
|
Foreground="{DynamicResource TextDimBrush}"
|
||||||
|
TextWrapping="Wrap"/>
|
||||||
|
</Grid>
|
||||||
|
</DataTemplate>
|
||||||
|
</ItemsControl.ItemTemplate>
|
||||||
|
</ItemsControl>
|
||||||
|
</ScrollViewer>
|
||||||
|
</DockPanel>
|
||||||
|
</Panel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
using ClaudeDo.Data;
|
||||||
|
using ClaudeDo.Ui.Services;
|
||||||
|
using ClaudeDo.Ui.ViewModels.Islands;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
|
||||||
|
namespace ClaudeDo.Ui.Tests.ViewModels;
|
||||||
|
|
||||||
|
public class DetailsIslandPrepModeTests : IDisposable
|
||||||
|
{
|
||||||
|
private readonly string _dbPath;
|
||||||
|
|
||||||
|
public DetailsIslandPrepModeTests()
|
||||||
|
{
|
||||||
|
_dbPath = Path.Combine(Path.GetTempPath(), $"claudedo_prep_test_{Guid.NewGuid():N}.db");
|
||||||
|
using var ctx = NewContext();
|
||||||
|
ctx.Database.EnsureCreated();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
try { File.Delete(_dbPath); } catch { }
|
||||||
|
try { File.Delete(_dbPath + "-wal"); } catch { }
|
||||||
|
try { File.Delete(_dbPath + "-shm"); } catch { }
|
||||||
|
}
|
||||||
|
|
||||||
|
private ClaudeDoDbContext NewContext()
|
||||||
|
{
|
||||||
|
var opts = new DbContextOptionsBuilder<ClaudeDoDbContext>()
|
||||||
|
.UseSqlite($"Data Source={_dbPath}")
|
||||||
|
.Options;
|
||||||
|
return new ClaudeDoDbContext(opts);
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class TestDbFactory : IDbContextFactory<ClaudeDoDbContext>
|
||||||
|
{
|
||||||
|
private readonly Func<ClaudeDoDbContext> _create;
|
||||||
|
public TestDbFactory(Func<ClaudeDoDbContext> create) => _create = create;
|
||||||
|
public ClaudeDoDbContext CreateDbContext() => _create();
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class DefaultStub : StubWorkerClient { }
|
||||||
|
|
||||||
|
private sealed class StubNotesApi : ClaudeDo.Ui.Services.Interfaces.INotesApi
|
||||||
|
{
|
||||||
|
public Task<List<DailyNoteDto>> ListAsync(DateOnly day) => Task.FromResult(new List<DailyNoteDto>());
|
||||||
|
public Task<DailyNoteDto?> AddAsync(DateOnly day, string text) => Task.FromResult<DailyNoteDto?>(null);
|
||||||
|
public Task UpdateAsync(string id, string text) => Task.CompletedTask;
|
||||||
|
public Task DeleteAsync(string id) => Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
private DetailsIslandViewModel NewDetailsVm(StubWorkerClient stub)
|
||||||
|
{
|
||||||
|
var factory = new TestDbFactory(NewContext);
|
||||||
|
return new DetailsIslandViewModel(factory, stub, new NullServiceProvider(), new StubNotesApi());
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class NullServiceProvider : IServiceProvider
|
||||||
|
{
|
||||||
|
public object? GetService(Type serviceType) => null;
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void PrepLine_event_appends_to_PrepLog()
|
||||||
|
{
|
||||||
|
var stub = new DefaultStub();
|
||||||
|
var vm = NewDetailsVm(stub);
|
||||||
|
|
||||||
|
stub.RaisePrepLine("{\"type\":\"assistant\",\"message\":{\"content\":[{\"type\":\"text\",\"text\":\"hi\"}]}}");
|
||||||
|
|
||||||
|
Assert.NotEmpty(vm.PrepLog);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void ShowPrep_sets_prep_mode_and_clears_notes_mode()
|
||||||
|
{
|
||||||
|
var vm = NewDetailsVm(new DefaultStub());
|
||||||
|
vm.ShowPrep();
|
||||||
|
|
||||||
|
Assert.True(vm.IsPrepMode);
|
||||||
|
Assert.False(vm.IsNotesMode);
|
||||||
|
Assert.False(vm.IsTaskDetailVisible);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user