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

refactor(tags): remove tag entity and all references

Browse Source 
Drops TagEntity, TagRepository, and tag wiring across data layer, worker,
and UI. Adds RemoveTags migration to clean up schema.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
mika kuns
2026-05-19 08:07:24 +02:00
parent 8d34db3f9b
commit 623ebf147b
42 changed files with 333 additions and 1118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
src/ClaudeDo.Ui/ViewModels/Islands/DetailsIslandViewModel.cs
View File

@@ -21,7 +21,9 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
// Current task row (set by IslandsShellViewModel via Bind)
[ObservableProperty]
[NotifyCanExecuteChangedFor(nameof(RunNowCommand))]
[NotifyCanExecuteChangedFor(nameof(EnqueueCommand))]
[NotifyCanExecuteChangedFor(nameof(DequeueCommand))]
[NotifyCanExecuteChangedFor(nameof(ResetAndRetryCommand))]
private TaskRowViewModel? _task;
// Editable fields
@@ -56,74 +58,23 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
// Short task-id badge, e.g. "#T1A"
public string TaskIdBadge => Task != null ? $"#T{Task.Id[..Math.Min(3, Task.Id.Length)].ToUpperInvariant()}" : "";
// Agent strip fields
// Status editor (Details panel) — set freely; broadcast refreshes other panes.
public System.Collections.ObjectModel.ObservableCollection<ClaudeDo.Data.Models.TaskStatus> StatusOptions { get; } = new()
{
ClaudeDo.Data.Models.TaskStatus.Idle,
ClaudeDo.Data.Models.TaskStatus.Queued,
ClaudeDo.Data.Models.TaskStatus.Running,
ClaudeDo.Data.Models.TaskStatus.Done,
ClaudeDo.Data.Models.TaskStatus.Failed,
ClaudeDo.Data.Models.TaskStatus.Cancelled,
};
private bool _suppressStatusSave;
[ObservableProperty] private ClaudeDo.Data.Models.TaskStatus _selectedStatus;
partial void OnSelectedStatusChanged(ClaudeDo.Data.Models.TaskStatus value)
{
if (_suppressStatusSave || Task is null) return;
_ = SaveStatusAsync(value);
}
private async System.Threading.Tasks.Task SaveStatusAsync(ClaudeDo.Data.Models.TaskStatus value)
{
if (Task is null) return;
try { await _worker.SetTaskStatusAsync(Task.Id, value); }
catch { /* offline */ }
}
// Tag editor
public ObservableCollection<string> Tags { get; } = new();
public ObservableCollection<string> AvailableTags { get; } = new();
[ObservableProperty] private string _newTagInput = "";
[RelayCommand]
private async System.Threading.Tasks.Task AddTagAsync()
{
if (Task is null) return;
var name = NewTagInput?.Trim().ToLowerInvariant();
NewTagInput = "";
if (string.IsNullOrEmpty(name)) return;
if (Tags.Contains(name)) return;
var next = Tags.ToList();
next.Add(name);
try { await _worker.SetTaskTagsAsync(Task.Id, next); }
catch { /* offline */ }
}
[RelayCommand]
private async System.Threading.Tasks.Task RemoveTagAsync(string? tagName)
{
if (Task is null || string.IsNullOrWhiteSpace(tagName)) return;
if (!Tags.Contains(tagName)) return;
var next = Tags.Where(t => t != tagName).ToList();
try { await _worker.SetTaskTagsAsync(Task.Id, next); }
catch { /* offline */ }
}
[ObservableProperty]
[NotifyCanExecuteChangedFor(nameof(RunNowCommand))]
private string _agentStatusLabel = "Idle";
public bool IsRunning => AgentStatusLabel == "Running";
public bool IsDone => AgentStatusLabel == "Done";
public bool IsFailed => AgentStatusLabel == "Failed";
[ObservableProperty]
[NotifyCanExecuteChangedFor(nameof(EnqueueCommand))]
[NotifyCanExecuteChangedFor(nameof(DequeueCommand))]
[NotifyCanExecuteChangedFor(nameof(ResetAndRetryCommand))]
[NotifyCanExecuteChangedFor(nameof(ContinueCommand))]
[NotifyCanExecuteChangedFor(nameof(ResetCommand))]
private bool _showFailedActions;
private string _agentStatusLabel = "Idle";
public bool IsIdle => AgentStatusLabel == "Idle";
public bool IsQueued => AgentStatusLabel == "Queued";
public bool IsRunning => AgentStatusLabel == "Running";
public bool IsDone => AgentStatusLabel == "Done";
public bool IsFailed => AgentStatusLabel == "Failed";
public bool IsCancelled => AgentStatusLabel == "Cancelled";
// Recovery actions: Continue (resume session) for Failed/Cancelled.
public bool ShowContinue => IsFailed || IsCancelled;
// Reset & retry available from any terminal state.
public bool ShowResetAndRetry => IsFailed || IsCancelled || IsDone;
[ObservableProperty]
[NotifyCanExecuteChangedFor(nameof(ContinueCommand))]
@@ -131,11 +82,15 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
partial void OnAgentStatusLabelChanged(string value)
{
OnPropertyChanged(nameof(IsIdle));
OnPropertyChanged(nameof(IsQueued));
OnPropertyChanged(nameof(IsRunning));
OnPropertyChanged(nameof(IsDone));
OnPropertyChanged(nameof(IsFailed));
OnPropertyChanged(nameof(IsCancelled));
OnPropertyChanged(nameof(ShowContinue));
OnPropertyChanged(nameof(ShowResetAndRetry));
OnPropertyChanged(nameof(IsAgentSectionEnabled));
ShowFailedActions = value == "Failed";
}
[ObservableProperty] private string? _model;
@@ -237,40 +192,17 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
// Set by the view so DeleteTaskCommand can show an error message
public Func<string, System.Threading.Tasks.Task>? ShowErrorAsync { get; set; }
private void ApplyTagsFromEntity(ClaudeDo.Data.Models.TaskEntity entity)
{
Tags.Clear();
foreach (var t in entity.Tags) Tags.Add(t.Name);
}
private async System.Threading.Tasks.Task RefreshAvailableTagsAsync()
{
try
{
var all = await _worker.GetAllTagsAsync();
AvailableTags.Clear();
foreach (var t in all) AvailableTags.Add(t);
}
catch { }
}
private async System.Threading.Tasks.Task RefreshTagsAndStatusAsync(string taskId)
private async System.Threading.Tasks.Task RefreshStatusAsync(string taskId)
{
try
{
await using var ctx = await _dbFactory.CreateDbContextAsync();
var entity = await ctx.Tasks
.AsNoTracking()
.Include(t => t.Tags)
.FirstOrDefaultAsync(t => t.Id == taskId);
if (entity is null || Task?.Id != taskId) return;
_suppressStatusSave = true;
try { SelectedStatus = entity.Status; }
finally { _suppressStatusSave = false; }
AgentStatusLabel = entity.Status.ToString();
ApplyTagsFromEntity(entity);
await RefreshAvailableTagsAsync();
}
catch { }
}
@@ -289,9 +221,10 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
{
if (e.PropertyName == nameof(WorkerClient.IsConnected))
{
RunNowCommand.NotifyCanExecuteChanged();
EnqueueCommand.NotifyCanExecuteChanged();
DequeueCommand.NotifyCanExecuteChanged();
ResetAndRetryCommand.NotifyCanExecuteChanged();
ContinueCommand.NotifyCanExecuteChanged();
ResetCommand.NotifyCanExecuteChanged();
ApproveMergeCommand.NotifyCanExecuteChanged();
}
};
@@ -323,7 +256,7 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
_worker.TaskUpdatedEvent += taskId =>
{
if (Task?.Id == taskId) _ = RefreshTagsAndStatusAsync(taskId);
if (Task?.Id == taskId) _ = RefreshStatusAsync(taskId);
if (Task?.IsPlanningParent == true) _ = RefreshPlanningChildAsync(taskId);
};
@@ -503,13 +436,6 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
BranchLine = null;
AgentStatusLabel = "Idle";
LatestRunSessionId = null;
ShowFailedActions = false;
Tags.Clear();
AvailableTags.Clear();
NewTagInput = "";
_suppressStatusSave = true;
try { SelectedStatus = ClaudeDo.Data.Models.TaskStatus.Idle; }
finally { _suppressStatusSave = false; }
_suppressAgentSave = true;
try
{
@@ -537,11 +463,10 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
await using var ctx = await _dbFactory.CreateDbContextAsync(ct);
var subtaskRepo = new SubtaskRepository(ctx);
// Own query with Include so WorktreePath/BranchLine/Tags are populated.
// Own query with Include so WorktreePath/BranchLine are populated.
var entity = await ctx.Tasks
.AsNoTracking()
.Include(t => t.Worktree)
.Include(t => t.Tags)
.FirstOrDefaultAsync(t => t.Id == row.Id, ct);
ct.ThrowIfCancellationRequested();
if (entity == null) return;
@@ -557,11 +482,6 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
WorktreeStateLabel = entity.Worktree?.State.ToString();
BranchLine = entity.Worktree is { } w ? $"{w.BranchName} \u2190 main" : null;
AgentStatusLabel = entity.Status.ToString();
_suppressStatusSave = true;
try { SelectedStatus = entity.Status; }
finally { _suppressStatusSave = false; }
ApplyTagsFromEntity(entity);
await RefreshAvailableTagsAsync();
await LoadAgentSettingsAsync(entity, ct);
ct.ThrowIfCancellationRequested();
@@ -926,24 +846,35 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
await _worker.CancelTaskAsync(Task.Id);
}
[RelayCommand(CanExecute = nameof(CanRunNow))]
private async System.Threading.Tasks.Task RunNowAsync()
[RelayCommand(CanExecute = nameof(CanEnqueue))]
private async System.Threading.Tasks.Task EnqueueAsync()
{
if (Task == null) return;
AgentStatusLabel = "Running";
try
{
await _worker.RunNowAsync(Task.Id);
}
catch
{
AgentStatusLabel = "Failed";
throw;
await _worker.SetTaskStatusAsync(Task.Id, ClaudeDo.Data.Models.TaskStatus.Queued);
AgentStatusLabel = "Queued";
}
catch { /* offline */ }
}
private bool CanRunNow() =>
Task != null && _worker.IsConnected && !IsRunning;
private bool CanEnqueue() =>
Task != null && _worker.IsConnected && IsIdle;
[RelayCommand(CanExecute = nameof(CanDequeue))]
private async System.Threading.Tasks.Task DequeueAsync()
{
if (Task == null) return;
try
{
await _worker.SetTaskStatusAsync(Task.Id, ClaudeDo.Data.Models.TaskStatus.Idle);
AgentStatusLabel = "Idle";
}
catch { /* offline */ }
}
private bool CanDequeue() =>
Task != null && _worker.IsConnected && IsQueued;
[RelayCommand(CanExecute = nameof(CanContinue))]
private async System.Threading.Tasks.Task ContinueAsync()
@@ -953,23 +884,32 @@ public sealed partial class DetailsIslandViewModel : ViewModelBase
}
private bool CanContinue() =>
Task != null && _worker.IsConnected && ShowFailedActions && !string.IsNullOrEmpty(LatestRunSessionId);
Task != null && _worker.IsConnected && ShowContinue && !string.IsNullOrEmpty(LatestRunSessionId);
[RelayCommand(CanExecute = nameof(CanReset))]
private async System.Threading.Tasks.Task ResetAsync()
[RelayCommand(CanExecute = nameof(CanResetAndRetry))]
private async System.Threading.Tasks.Task ResetAndRetryAsync()
{
if (Task == null) return;
if (ConfirmAsync == null) return;
var branchName = $"claudedo/{Task.Id.Replace("-", "")}";
var ok = await ConfirmAsync($"Discard worktree and reset task?\nThis deletes branch {branchName} and all uncommitted changes.");
var ok = await ConfirmAsync(
$"Reset and retry?\nThis discards branch {branchName} (and uncommitted changes), then queues the task to run from the beginning.");
if (!ok) return;
await _worker.ResetTaskAsync(Task.Id);
if (WorktreePath != null)
await _worker.ResetTaskAsync(Task.Id);
try
{
await _worker.SetTaskStatusAsync(Task.Id, ClaudeDo.Data.Models.TaskStatus.Queued);
AgentStatusLabel = "Queued";
}
catch { /* offline */ }
}
private bool CanReset() =>
Task != null && _worker.IsConnected && ShowFailedActions;
private bool CanResetAndRetry() =>
Task != null && _worker.IsConnected && ShowResetAndRetry;
}
public sealed partial class SubtaskRowViewModel : ViewModelBase

25
src/ClaudeDo.Ui/ViewModels/Islands/TaskRowViewModel.cs
View File

@@ -1,5 +1,3 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using CommunityToolkit.Mvvm.ComponentModel;
using ClaudeDo.Data.Models;
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
@@ -8,11 +6,6 @@ namespace ClaudeDo.Ui.ViewModels.Islands;
public sealed partial class TaskRowViewModel : ViewModelBase
{
public TaskRowViewModel()
{
Tags.CollectionChanged += (_, _) => OnPropertyChanged(nameof(HasTags));
}
public required string Id { get; init; }
[ObservableProperty] private string _title = "";
[ObservableProperty] private string _listName = "";
@@ -39,7 +32,6 @@ public sealed partial class TaskRowViewModel : ViewModelBase
public DateTime CreatedAt { get; init; }
public string CreatedAtFormatted => CreatedAt == default ? "—" : $"Created {CreatedAt:MMM d}";
public ObservableCollection<string> Tags { get; } = new();
public int StepsCount { get; init; }
public int StepsCompleted { get; init; }
@@ -62,13 +54,13 @@ public sealed partial class TaskRowViewModel : ViewModelBase
public bool HasBranch => !string.IsNullOrWhiteSpace(Branch);
public bool HasDiff => DiffAdditions > 0 || DiffDeletions > 0;
public bool HasTags => Tags.Count > 0;
public bool HasSteps => StepsCount > 0;
public bool IsOverdue => ScheduledFor is { } d && d.Date < DateTime.Today && !Done;
public bool IsRunning => Status == TaskStatus.Running;
public bool IsQueued => Status == TaskStatus.Queued && string.IsNullOrEmpty(BlockedByTaskId);
public bool IsWaiting => Status == TaskStatus.Queued && !string.IsNullOrEmpty(BlockedByTaskId);
public bool CanRemoveFromQueue => IsQueued || HasQueuedSubtasks;
public bool CanSendToQueue => !IsRunning && !IsQueued && !HasQueuedSubtasks;
public bool HasSchedule => ScheduledFor.HasValue;
public bool HasLiveTail => IsRunning && !string.IsNullOrEmpty(LiveTail);
@@ -96,6 +88,7 @@ public sealed partial class TaskRowViewModel : ViewModelBase
OnPropertyChanged(nameof(IsDraft));
OnPropertyChanged(nameof(CanOpenPlanningSession));
OnPropertyChanged(nameof(CanRemoveFromQueue));
OnPropertyChanged(nameof(CanSendToQueue));
}
partial void OnPlanningPhaseChanged(PlanningPhase value)
@@ -107,7 +100,10 @@ public sealed partial class TaskRowViewModel : ViewModelBase
}
partial void OnHasQueuedSubtasksChanged(bool value)
=> OnPropertyChanged(nameof(CanRemoveFromQueue));
{
OnPropertyChanged(nameof(CanRemoveFromQueue));
OnPropertyChanged(nameof(CanSendToQueue));
}
partial void OnBlockedByTaskIdChanged(string? value)
{
@@ -160,15 +156,6 @@ public sealed partial class TaskRowViewModel : ViewModelBase
DiffDeletions = del;
ParentTaskId = t.ParentTaskId;
BlockedByTaskId = t.BlockedByTaskId;
SetTags(t.Tags.Select(tag => tag.Name));
}
public void SetTags(IEnumerable<string> names)
{
var snapshot = names.ToList();
if (Tags.SequenceEqual(snapshot)) return;
Tags.Clear();
foreach (var n in snapshot) Tags.Add(n);
}
// Best-effort parse of diff stat strings like "+12 -3" or "12 additions, 3 deletions".

49
src/ClaudeDo.Ui/ViewModels/Islands/TasksIslandViewModel.cs
View File

@@ -31,7 +31,6 @@ public sealed partial class TasksIslandViewModel : ViewModelBase
public ObservableCollection<TaskRowViewModel> OverdueItems { get; } = new();
public ObservableCollection<TaskRowViewModel> OpenItems { get; } = new();
public ObservableCollection<TaskRowViewModel> CompletedItems { get; } = new();
public ObservableCollection<string> AllTags { get; } = new();
[ObservableProperty] private string _newTaskTitle = "";
[ObservableProperty] private TaskRowViewModel? _selectedTask;
@@ -59,22 +58,9 @@ public sealed partial class TasksIslandViewModel : ViewModelBase
_worker.WorktreeUpdatedEvent += OnWorkerTaskUpdated;
_worker.TaskMessageEvent += OnWorkerTaskMessage;
_worker.ConnectionRestoredEvent += () => LoadForList(_currentList);
_ = RefreshAllTagsAsync();
}
}
private async Task RefreshAllTagsAsync()
{
if (_worker is null) return;
try
{
var tags = await _worker.GetAllTagsAsync();
AllTags.Clear();
foreach (var t in tags) AllTags.Add(t);
}
catch { /* offline */ }
}
private void OnWorkerTaskMessage(string taskId, string line)
{
var row = Items.FirstOrDefault(r => r.Id == taskId);
@@ -101,7 +87,6 @@ public sealed partial class TasksIslandViewModel : ViewModelBase
var entity = await db.Tasks
.Include(t => t.List)
.Include(t => t.Worktree)
.Include(t => t.Tags)
.FirstOrDefaultAsync(t => t.Id == taskId);
var existing = Items.FirstOrDefault(r => r.Id == taskId);
@@ -190,7 +175,6 @@ public sealed partial class TasksIslandViewModel : ViewModelBase
var all = await db.Tasks
.Include(t => t.List)
.Include(t => t.Worktree)
.Include(t => t.Tags)
.OrderBy(t => t.SortOrder).ThenBy(t => t.CreatedAt)
.ToListAsync(ct);
@@ -484,37 +468,14 @@ public sealed partial class TasksIslandViewModel : ViewModelBase
catch { /* offline; broadcast won't fire */ }
}
public async Task ToggleTagOnRowAsync(TaskRowViewModel row, string tagName)
{
if (_worker is null) return;
var name = tagName.Trim().ToLowerInvariant();
if (name.Length == 0) return;
var current = row.Tags.ToList();
var next = current.Contains(name)
? current.Where(t => t != name).ToList()
: current.Append(name).ToList();
try
{
await _worker.SetTaskTagsAsync(row.Id, next);
await RefreshAllTagsAsync();
}
catch { }
}
[RelayCommand]
private async Task SendToQueueAsync(TaskRowViewModel? row)
{
if (row is null || row.IsRunning) return;
await using var db = await _dbFactory.CreateDbContextAsync();
var entity = await db.Tasks.Include(t => t.Tags).FirstOrDefaultAsync(t => t.Id == row.Id);
var entity = await db.Tasks.FirstOrDefaultAsync(t => t.Id == row.Id);
if (entity is null) return;
entity.Status = TaskStatus.Queued;
// Worker queue picker requires the "agent" tag — attach it on explicit enqueue.
if (!entity.Tags.Any(t => t.Name == "agent"))
{
var agentTag = await db.Tags.FirstOrDefaultAsync(t => t.Name == "agent");
if (agentTag is not null) entity.Tags.Add(agentTag);
}
await db.SaveChangesAsync();
row.Status = TaskStatus.Queued;
if (_worker is not null)
@@ -568,6 +529,14 @@ public sealed partial class TasksIslandViewModel : ViewModelBase
TasksChanged?.Invoke(this, EventArgs.Empty);
}
[RelayCommand]
private async Task CancelRunningTaskAsync(TaskRowViewModel? row)
{
if (row is null || !row.IsRunning || _worker is null) return;
try { await _worker.CancelTaskAsync(row.Id); }
catch { /* worker offline; the broadcast will reconcile when it returns */ }
}
public async Task SetScheduledForAsync(TaskRowViewModel row, DateTime? when)
{
if (row is null) return;