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

chore(claude-do): merge [A1] Detail-Pane: Approve, Submit, Reject, Park, Merge-Previ

Browse Source 
ClaudeDo-Task: 120cb6a4-ad0d-426a-bb72-e3c508698b8f
This commit is contained in:
Mika Kuns
2026-08-12 09:46:14 +02:00
parent d3abd4b88b bea85a9ee5
commit 5a74a67660
4 changed files with 277 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ClaudeDo.Ui/ViewModels/Islands/DetailsIslandViewModel.cs
+62 -6
View File
@@ -299,7 +299,12 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase, IDisposable
[NotifyCanExecuteChangedFor(nameof(RejectReviewCommand))]
private string _reviewFeedback = "";
public bool HasReviewFeedback => !string.IsNullOrWhiteSpace(ReviewFeedback);
public bool HasReviewFeedback => !string.IsNullOrWhiteSpace(ReviewFeedback) && !RejectOp.IsRunning;
public OperationStatus ApproveOp { get; } = new();
public OperationStatus SubmitOp { get; } = new();
public OperationStatus RejectOp { get; } = new();
public OperationStatus ParkOp { get; } = new();
public DetailsIslandViewModel(
IDbContextFactory<ClaudeDoDbContext> dbFactory,
@@ -330,6 +335,30 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase, IDisposable
};
Prep = new PrepPanelViewModel(worker);
// OperationStatus.IsRunning is a nested ObservableObject property, so
// [NotifyCanExecuteChangedFor] on the command can't see it -- without this, the
// button stays clickable for the whole duration of the call.
ApproveOp.PropertyChanged += (_, e) =>
{
if (e.PropertyName == nameof(OperationStatus.IsRunning)) ApproveReviewCommand.NotifyCanExecuteChanged();
};
SubmitOp.PropertyChanged += (_, e) =>
{
if (e.PropertyName == nameof(OperationStatus.IsRunning)) SubmitForReviewCommand.NotifyCanExecuteChanged();
};
RejectOp.PropertyChanged += (_, e) =>
{
if (e.PropertyName == nameof(OperationStatus.IsRunning))
{
OnPropertyChanged(nameof(HasReviewFeedback));
RejectReviewCommand.NotifyCanExecuteChanged();
}
};
ParkOp.PropertyChanged += (_, e) =>
{
if (e.PropertyName == nameof(OperationStatus.IsRunning)) ParkReviewCommand.NotifyCanExecuteChanged();
};
Notes = new NotesEditorViewModel(_notesApi);
Notes.ErrorReported += msg => { if (ShowErrorAsync is not null) _ = ShowErrorAsync(msg); };
Subtasks.CollectionChanged += (_, _) => NotifyStepsChanged();
@@ -1218,12 +1247,22 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase, IDisposable
private async System.Threading.Tasks.Task ApproveReviewAsync()
{
if (Task is null || !_worker.IsConnected) return;
var taskId = Task.Id;
using var op = ApproveOp.Begin(Loc.T("ops.merge.merging"));
// Subscribed only for the duration of the call: the worker broadcasts to every
// client, and a VM left on this event would keep reacting to merges for other tasks.
void OnMergeProgress(string progressTaskId, string phase, int elapsedSeconds)
{
if (progressTaskId != taskId || phase != MergePhaseVerifying) return;
ApproveOp.Report(Loc.T("ops.merge.verifying", FormatElapsed(elapsedSeconds)));
}
_worker.MergeProgressEvent += OnMergeProgress;
try
{
var hasChildren = Subtasks.Count > 0 || ChildOutcomes.Count > 0;
var result = await _worker.ApproveReviewAsync(Task.Id, Merge.SelectedMergeTarget ?? "");
var result = await _worker.ApproveReviewAsync(taskId, Merge.SelectedMergeTarget ?? "");
if (!hasChildren && result?.Status == "conflict")
await _merge.ResolveConflictAsync(Task.Id, Merge.SelectedMergeTarget ?? "");
await _merge.ResolveConflictAsync(taskId, Merge.SelectedMergeTarget ?? "");
// The merge itself already landed; the verify command failed, so the task stayed
// out of Done. Surface that instead of silently looking like nothing happened.
else if (!hasChildren && result?.Status == "verify_failed" && ShowErrorAsync != null)
@@ -1238,25 +1277,38 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase, IDisposable
if (ShowErrorAsync != null)
await ShowErrorAsync(ex.Message);
}
finally
{
_worker.MergeProgressEvent -= OnMergeProgress;
}
}
/// Mirrors TaskMergeService.PhaseVerifying — a hub payload token, not a display string.
private const string MergePhaseVerifying = "verifying";
private static string FormatElapsed(int seconds) =>
TimeSpan.FromSeconds(Math.Max(0, seconds)).ToString(@"mm\:ss");
// Force the diff to have been opened before a merge can happen — but only when
// there is actually something to inspect (a childless sandbox run with no worktree
// has no diff, so it approves straight through).
private bool CanApproveReview() =>
Task != null && _worker.IsConnected && IsWaitingForReview
&& (!Merge.HasReviewableDiff || ReviewDiffViewed);
&& (!Merge.HasReviewableDiff || ReviewDiffViewed)
&& !ApproveOp.IsRunning;
// An interactive (ConPTY) session leaves its worktree changed but never flips the task
// status. Offer "Submit for review" for an Idle/Failed task that still has a worktree, so
// its hand-driven work can enter the normal review/merge flow (commits first, server-side).
public bool CanSubmitForReview =>
Task != null && _worker.IsConnected && (IsIdle || IsFailed) && !string.IsNullOrEmpty(WorktreePath);
Task != null && _worker.IsConnected && (IsIdle || IsFailed) && !string.IsNullOrEmpty(WorktreePath)
&& !SubmitOp.IsRunning;
[RelayCommand(CanExecute = nameof(CanSubmitForReview))]
private async System.Threading.Tasks.Task SubmitForReviewAsync()
{
if (Task is null || !_worker.IsConnected) return;
using var op = SubmitOp.Begin(Loc.T("ops.review.submitting"));
try { await _worker.SubmitTaskForReviewAsync(Task.Id); }
catch (Exception ex)
{
@@ -1270,20 +1322,24 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase, IDisposable
if (Task is null || !_worker.IsConnected) return;
var feedback = ReviewFeedback;
if (string.IsNullOrWhiteSpace(feedback)) return;
using var op = RejectOp.Begin(Loc.T("ops.review.rejecting"));
try { await _worker.RejectReviewToQueueAsync(Task.Id, feedback); }
catch { /* stale review action; broadcast reconciles */ return; }
ReviewFeedback = "";
}
// Park: set the task aside (back to Idle), keeping its worktree intact.
[RelayCommand]
[RelayCommand(CanExecute = nameof(CanParkReview))]
private async System.Threading.Tasks.Task ParkReviewAsync()
{
if (Task is null || !_worker.IsConnected) return;
using var op = ParkOp.Begin(Loc.T("ops.review.parking"));
try { await _worker.RejectReviewToIdleAsync(Task.Id); }
catch { /* stale review action; broadcast reconciles */ }
}
private bool CanParkReview() => Task != null && _worker.IsConnected && !ParkOp.IsRunning;
[RelayCommand]
private async System.Threading.Tasks.Task ResetReviewAsync()
{
src/ClaudeDo.Ui/ViewModels/Islands/MergeSectionViewModel.cs
+6
View File
@@ -1,6 +1,7 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using System.Collections.ObjectModel;
using ClaudeDo.Ui.Localization;
using ClaudeDo.Ui.Services;
using ClaudeDo.Ui.ViewModels.Modals;
using Microsoft.Extensions.DependencyInjection;
@@ -27,6 +28,10 @@ public sealed partial class MergeSectionViewModel : ViewModelBase
[ObservableProperty] private ObservableCollection<string> _mergeTargetBranches = new();
[ObservableProperty] private string? _selectedMergeTarget;
// No CanExecute to gate here — RefreshMergePreviewAsync is triggered from the Bind path,
// not a [RelayCommand], so PreviewOp only drives the indicator, never locks a button.
public OperationStatus PreviewOp { get; } = new();
[ObservableProperty]
[NotifyPropertyChangedFor(nameof(ShowMergePreviewMuted))]
private string _mergePreviewText = "";
@@ -118,6 +123,7 @@ public sealed partial class MergeSectionViewModel : ViewModelBase
}
var capturedTaskId = TaskId;
var capturedTarget = SelectedMergeTarget;
using var op = PreviewOp.Begin(Loc.T("ops.review.previewing"));
var dto = await _worker.PreviewMergeAsync(capturedTaskId, capturedTarget ?? "");
if (TaskId != capturedTaskId || SelectedMergeTarget != capturedTarget) return;
var (text, clean, conflict) = MergePreviewPresenter.Describe(dto);
src/ClaudeDo.Ui/Views/Islands/Detail/WorkConsole.axaml
+18 -4
View File
@@ -2,6 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:ClaudeDo.Ui.ViewModels.Islands"
xmlns:loc="using:ClaudeDo.Ui.Localization"
xmlns:controls="using:ClaudeDo.Ui.Views.Controls"
x:DataType="vm:DetailsIslandViewModel"
x:Class="ClaudeDo.Ui.Views.Islands.Detail.WorkConsole">
@@ -263,10 +264,13 @@
ScrollViewer.VerticalScrollBarVisibility="Auto"
FontFamily="{StaticResource MonoFont}"
FontSize="{StaticResource FontSizeMono}" />
<Button Grid.Column="2" Classes="prompt-action accent" Content="[Resume]"
VerticalAlignment="Top" Margin="12,2,0,0"
<StackPanel Grid.Column="2" Spacing="4" Margin="12,2,0,0">
<Button Classes="prompt-action accent" Content="[Resume]"
HorizontalAlignment="Right"
ToolTip.Tip="{loc:Tr session.reviewContinueTip}"
Command="{Binding RejectReviewCommand}" />
<controls:OperationIndicator Status="{Binding RejectOp}" HorizontalAlignment="Right" />
</StackPanel>
</Grid>
<!-- Inset lives on the content, NOT on the ScrollViewer: Avalonia 12 leaves
@@ -331,6 +335,7 @@
<TextBlock Classes="meta" Text="{Binding Merge.MergePreviewText}" TextWrapping="Wrap"
Foreground="{DynamicResource TextMuteBrush}"
IsVisible="{Binding Merge.ShowMergePreviewMuted}" />
<controls:OperationIndicator Status="{Binding Merge.PreviewOp}" />
</StackPanel>
<!-- Inspect: diff / worktree / combined diff -->
@@ -367,11 +372,17 @@
</StackPanel>
<WrapPanel Orientation="Horizontal">
<Button Classes="btn accent" Content="Approve &amp; Merge" Margin="0,0,8,8"
<StackPanel Orientation="Horizontal" Spacing="{StaticResource SpaceSm}" Margin="0,0,8,8">
<Button Classes="btn accent" Content="Approve &amp; Merge"
Command="{Binding ApproveReviewCommand}" />
<Button Classes="btn" Content="Park" Margin="0,0,8,8"
<controls:OperationIndicator Status="{Binding ApproveOp}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Spacing="{StaticResource SpaceSm}" Margin="0,0,8,8">
<Button Classes="btn" Content="Park"
ToolTip.Tip="Set aside — back to Idle, keeps the worktree"
Command="{Binding ParkReviewCommand}" />
<controls:OperationIndicator Status="{Binding ParkOp}" />
</StackPanel>
<Button Classes="btn" Content="Cancel" Margin="0,0,8,8"
Command="{Binding CancelReviewCommand}" />
</WrapPanel>
@@ -388,8 +399,11 @@
<TextBlock Classes="meta" TextWrapping="Wrap"
Foreground="{DynamicResource TextMuteBrush}"
Text="Worked on this by hand? Submit the worktree for review to merge it." />
<StackPanel Orientation="Horizontal" Spacing="{StaticResource SpaceSm}">
<Button Classes="btn accent" Content="Submit for review" HorizontalAlignment="Left"
Command="{Binding SubmitForReviewCommand}" />
<controls:OperationIndicator Status="{Binding SubmitOp}" />
</StackPanel>
</StackPanel>
</StackPanel>
</ScrollViewer>
tests/ClaudeDo.Ui.Tests/ViewModels/DetailsIslandReviewActionsTests.cs
+184 -1
View File
@@ -147,7 +147,7 @@ public class DetailsIslandReviewActionsTests : IDisposable
}
[Fact]
public async Task ApproveReview_WhenWorkerThrows_CallsShowErrorAsync()
public async Task ApproveReview_WhenWorkerThrows_CallsShowErrorAsync_AndResetsIsRunning()
{
var worker = new ThrowingWorkerClient();
var vm = BuildVm(worker);
@@ -160,6 +160,189 @@ public class DetailsIslandReviewActionsTests : IDisposable
await vm.ApproveReviewCommand.ExecuteAsync(null);
Assert.Equal(worker.ExceptionMessage, reportedError);
Assert.False(vm.ApproveOp.IsRunning);
Assert.True(vm.ApproveReviewCommand.CanExecute(null));
}
private sealed class BlockingApproveWorkerClient : StubWorkerClient
{
public override bool IsConnected => true;
public TaskCompletionSource<MergeResultDto?> Gate { get; } = new();
public override Task<MergeResultDto?> ApproveReviewAsync(string taskId, string targetBranch) => Gate.Task;
}
private static int MergeProgressSubscriberCount(StubWorkerClient worker)
{
var field = typeof(StubWorkerClient).GetField("MergeProgressEvent",
System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
var del = (Delegate?)field!.GetValue(worker);
return del?.GetInvocationList().Length ?? 0;
}
[Fact]
public async Task ApproveReview_SetsIsRunning_AndLocksTheButton_WhileThePendingCallIsInFlight()
{
var worker = new BlockingApproveWorkerClient();
var vm = BuildVm(worker);
vm.Bind(new TaskRowViewModel { Id = "task-approve-1", Status = TaskStatus.WaitingForReview });
vm.Monitor.ApplyState(TaskStatus.WaitingForReview);
var approve = vm.ApproveReviewCommand.ExecuteAsync(null);
Assert.True(vm.ApproveOp.IsRunning);
Assert.False(vm.ApproveReviewCommand.CanExecute(null));
worker.Gate.SetResult(new MergeResultDto("merged", new List<string>(), null));
await approve;
Assert.False(vm.ApproveOp.IsRunning);
Assert.True(vm.ApproveReviewCommand.CanExecute(null));
}
[Fact]
public async Task ApproveReview_SharpensLabelForItsOwnTask_ButIgnoresProgressForOtherTasks()
{
var worker = new BlockingApproveWorkerClient();
var vm = BuildVm(worker);
vm.Bind(new TaskRowViewModel { Id = "task-approve-2", Status = TaskStatus.WaitingForReview });
vm.Monitor.ApplyState(TaskStatus.WaitingForReview);
var approve = vm.ApproveReviewCommand.ExecuteAsync(null);
var merging = vm.ApproveOp.Label;
worker.RaiseMergeProgress("some-other-task", "verifying", 30);
Assert.Equal(merging, vm.ApproveOp.Label);
worker.RaiseMergeProgress("task-approve-2", "verifying", 30);
Assert.NotEqual(merging, vm.ApproveOp.Label);
worker.Gate.SetResult(new MergeResultDto("merged", new List<string>(), null));
await approve;
}
[Fact]
public async Task ApproveReview_UnsubscribesFromMergeProgress_AfterTheCallCompletes()
{
var worker = new BlockingApproveWorkerClient();
var vm = BuildVm(worker);
vm.Bind(new TaskRowViewModel { Id = "task-approve-3", Status = TaskStatus.WaitingForReview });
vm.Monitor.ApplyState(TaskStatus.WaitingForReview);
var approve = vm.ApproveReviewCommand.ExecuteAsync(null);
Assert.Equal(1, MergeProgressSubscriberCount(worker));
worker.Gate.SetResult(new MergeResultDto("merged", new List<string>(), null));
await approve;
Assert.Equal(0, MergeProgressSubscriberCount(worker));
}
private sealed class BlockingSubmitWorkerClient : StubWorkerClient
{
public override bool IsConnected => true;
public TaskCompletionSource Gate { get; } = new();
public override Task SubmitTaskForReviewAsync(string taskId, CancellationToken ct = default) => Gate.Task;
}
[Fact]
public async Task SubmitForReview_SetsIsRunning_AndLocksTheButton_WhilePending()
{
var worker = new BlockingSubmitWorkerClient();
var vm = BuildVm(worker);
vm.Bind(new TaskRowViewModel { Id = "task-submit-1", Status = TaskStatus.Idle });
vm.Monitor.ApplyState(TaskStatus.Idle);
vm.WorktreePath = "/tmp/wt";
var submit = vm.SubmitForReviewCommand.ExecuteAsync(null);
Assert.True(vm.SubmitOp.IsRunning);
Assert.False(vm.SubmitForReviewCommand.CanExecute(null));
worker.Gate.SetResult();
await submit;
Assert.False(vm.SubmitOp.IsRunning);
Assert.True(vm.SubmitForReviewCommand.CanExecute(null));
}
private sealed class BlockingRejectWorkerClient : StubWorkerClient
{
public override bool IsConnected => true;
public TaskCompletionSource Gate { get; } = new();
public override Task RejectReviewToQueueAsync(string taskId, string feedback) => Gate.Task;
}
[Fact]
public async Task RejectReview_SetsIsRunning_AndLocksTheButton_WhilePending()
{
var worker = new BlockingRejectWorkerClient();
var vm = BuildVm(worker);
vm.Bind(new TaskRowViewModel { Id = "task-reject-1", Status = TaskStatus.WaitingForReview });
vm.ReviewFeedback = "tighten the error handling";
var reject = vm.RejectReviewCommand.ExecuteAsync(null);
Assert.True(vm.RejectOp.IsRunning);
Assert.False(vm.RejectReviewCommand.CanExecute(null));
worker.Gate.SetResult();
await reject;
Assert.False(vm.RejectOp.IsRunning);
}
private sealed class BlockingParkWorkerClient : StubWorkerClient
{
public override bool IsConnected => true;
public TaskCompletionSource Gate { get; } = new();
public override Task RejectReviewToIdleAsync(string taskId) => Gate.Task;
}
[Fact]
public async Task ParkReview_SetsIsRunning_AndLocksTheButton_WhilePending()
{
var worker = new BlockingParkWorkerClient();
var vm = BuildVm(worker);
vm.Bind(new TaskRowViewModel { Id = "task-park-2", Status = TaskStatus.WaitingForReview });
var park = vm.ParkReviewCommand.ExecuteAsync(null);
Assert.True(vm.ParkOp.IsRunning);
Assert.False(vm.ParkReviewCommand.CanExecute(null));
worker.Gate.SetResult();
await park;
Assert.False(vm.ParkOp.IsRunning);
Assert.True(vm.ParkReviewCommand.CanExecute(null));
}
private sealed class BlockingPreviewWorkerClient : StubWorkerClient
{
public override bool IsConnected => true;
public TaskCompletionSource<MergePreviewDto?> Gate { get; } = new();
public override Task<MergePreviewDto?> PreviewMergeAsync(string taskId, string targetBranch) => Gate.Task;
}
[Fact]
public async Task MergePreview_ShowsBusy_WhileTheWorkerCallIsPending_AndResetsAfter()
{
var worker = new BlockingPreviewWorkerClient();
var vm = BuildVm(worker);
// SyncTaskContext directly rather than Bind(): Bind() loads the task from the DB
// asynchronously and TaskId only lands once that completes, which would race the
// synchronous assertion below.
vm.Merge.SyncTaskContext("task-preview-1", "do the thing", false);
vm.Merge.SyncWorktree("/tmp/wt", null, null, "Active", null);
var preview = vm.Merge.RefreshMergePreviewAsync();
Assert.True(vm.Merge.PreviewOp.IsRunning);
worker.Gate.SetResult(new MergePreviewDto("clean", new List<string>(), 3));
await preview;
Assert.False(vm.Merge.PreviewOp.IsRunning);
}
[Fact]