refactor(tags): remove tag entity and all references

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>

src/ClaudeDo.Ui/Views/Islands/AgentStripView.axaml

@@ -42,13 +42,22 @@
           <PathIcon Data="{StaticResource Icon.X}" Width="12" Height="12"
                     Foreground="{DynamicResource BloodBrush}"/>
         </Button>
-        <!-- Hand off button — only when idle -->
+        <!-- Send to queue — only when idle -->
         <Button Grid.Column="3"
                 Classes="btn accent"
-                Content="Hand off"
-                Command="{Binding RunNowCommand}"
-                IsVisible="{Binding !IsRunning}"
-                ToolTip.Tip="Hand task off to Claude"
+                Content="Send to queue"
+                Command="{Binding EnqueueCommand}"
+                IsVisible="{Binding IsIdle}"
+                ToolTip.Tip="Queue this task for the worker to pick up"
+                VerticalAlignment="Center"
+                Padding="10,4"/>
+        <!-- Remove from queue — only when queued -->
+        <Button Grid.Column="3"
+                Classes="btn"
+                Content="Remove from queue"
+                Command="{Binding DequeueCommand}"
+                IsVisible="{Binding IsQueued}"
+                ToolTip.Tip="Take this task back out of the queue"
                 VerticalAlignment="Center"
                 Padding="10,4"/>
       </Grid>
@@ -144,14 +153,14 @@
         <Button Classes="btn accent"
                 Content="Continue"
                 Command="{Binding ContinueCommand}"
-                IsVisible="{Binding ShowFailedActions}"
-                ToolTip.Tip="Resume the task from where it failed"
+                IsVisible="{Binding ShowContinue}"
+                ToolTip.Tip="Resume the last session and keep going"
                 Padding="10,4"/>
         <Button Classes="btn"
-                Content="Reset"
-                Command="{Binding ResetCommand}"
-                IsVisible="{Binding ShowFailedActions}"
-                ToolTip.Tip="Discard the worktree and move the task back to Manual"
+                Content="Reset &amp; retry"
+                Command="{Binding ResetAndRetryCommand}"
+                IsVisible="{Binding ShowResetAndRetry}"
+                ToolTip.Tip="Discard the worktree and re-queue the task to run from scratch"
                 Padding="10,4"/>
       </StackPanel>
 

src/ClaudeDo.Ui/Views/Islands/DetailsIslandView.axaml

@@ -35,36 +35,39 @@
       </Grid>
     </Border>
 
-    <!-- ── Header (sticky top): eyebrow · title · gear (agent-settings flyout) ── -->
+    <!-- ── Header (sticky top): check · eyebrow · title · status · star · gear ── -->
     <Border DockPanel.Dock="Top" Classes="island-header">
-      <Grid ColumnDefinitions="*,Auto,Auto">
-        <StackPanel Grid.Column="0" Spacing="0">
-          <StackPanel Orientation="Horizontal" Spacing="6" Margin="0,0,0,4">
-            <Ellipse Width="5" Height="5" Fill="{DynamicResource AccentBrush}"
-                     VerticalAlignment="Center"/>
-            <TextBlock Classes="eyebrow" Text="LOGBOOK" VerticalAlignment="Center"/>
-            <TextBlock Text="{Binding TaskIdBadge}"
-                       FontFamily="{DynamicResource MonoFont}" FontSize="10"
-                       Foreground="{DynamicResource TextFaintBrush}"
-                       VerticalAlignment="Center"
-                       Margin="8,0,0,0"/>
-          </StackPanel>
+      <Grid ColumnDefinitions="Auto,*,Auto,Auto">
+        <Ellipse Grid.Column="0"
+                 Classes="task-check"
+                 Classes.done="{Binding Task.Done}"
+                 Width="18" Height="18"
+                 VerticalAlignment="Top"
+                 Margin="0,2,10,0"
+                 Cursor="Hand"/>
+        <StackPanel Grid.Column="1" Spacing="0">
+          <TextBlock Text="{Binding TaskIdBadge}"
+                     FontFamily="{DynamicResource MonoFont}" FontSize="10"
+                     Foreground="{DynamicResource TextFaintBrush}"
+                     Margin="0,0,0,4"/>
           <TextBox Text="{Binding EditableTitle, Mode=TwoWay}"
                    FontSize="14" FontWeight="Medium"
                    BorderThickness="0" Background="Transparent"
                    Foreground="{DynamicResource TextBrush}"
+                   TextWrapping="Wrap"
+                   AcceptsReturn="False"
                    Padding="0"/>
         </StackPanel>
 
-        <ComboBox Grid.Column="1"
-                  ItemsSource="{Binding StatusOptions}"
-                  SelectedItem="{Binding SelectedStatus, Mode=TwoWay}"
-                  ToolTip.Tip="Set status (no transition guards)"
-                  VerticalAlignment="Top"
-                  MinWidth="110"
-                  Margin="6,0,0,0"/>
+        <Button Grid.Column="2"
+                Classes="icon-btn star-btn"
+                Classes.on="{Binding Task.IsStarred}"
+                VerticalAlignment="Top"
+                Margin="6,0,0,0">
+          <PathIcon Data="{StaticResource Icon.Star}" Width="14" Height="14"/>
+        </Button>
 
-        <Button Grid.Column="2" Classes="icon-btn"
+        <Button Grid.Column="3" Classes="icon-btn"
                 ToolTip.Tip="Agent settings"
                 IsEnabled="{Binding IsAgentSectionEnabled}"
                 VerticalAlignment="Top"
@@ -112,34 +115,6 @@
       </Grid>
     </Border>
 
-    <!-- ── Task strip row (sticky top): check + title + star ── -->
-    <Border DockPanel.Dock="Top"
-            Padding="18,10,18,10"
-            BorderBrush="{DynamicResource LineBrush}"
-            BorderThickness="0,0,0,1">
-      <Grid ColumnDefinitions="Auto,*,Auto">
-        <Ellipse Grid.Column="0"
-                 Classes="task-check"
-                 Classes.done="{Binding Task.Done}"
-                 Width="18" Height="18"
-                 VerticalAlignment="Center"
-                 Cursor="Hand"/>
-        <TextBlock Grid.Column="1"
-                   Text="{Binding EditableTitle}"
-                   FontSize="14" FontWeight="Medium"
-                   Foreground="{DynamicResource TextBrush}"
-                   TextTrimming="CharacterEllipsis"
-                   VerticalAlignment="Center"
-                   Margin="10,0"/>
-        <Button Grid.Column="2"
-                Classes="icon-btn star-btn"
-                Classes.on="{Binding Task.IsStarred}"
-                VerticalAlignment="Center">
-          <PathIcon Data="{StaticResource Icon.Star}" Width="14" Height="14"/>
-        </Button>
-      </Grid>
-    </Border>
-
     <!-- ── Agent status strip (sticky, above metadata footer) ── -->
     <islands:AgentStripView DockPanel.Dock="Bottom"/>
 
@@ -147,46 +122,6 @@
     <ScrollViewer VerticalScrollBarVisibility="Auto">
       <StackPanel Spacing="0">
 
-        <!-- Tags section -->
-        <Border Padding="18,12,18,12"
-                BorderBrush="{DynamicResource LineBrush}"
-                BorderThickness="0,0,0,1">
-          <StackPanel Spacing="6">
-            <TextBlock Classes="section-label" Text="TAGS" Margin="0,0,0,2"/>
-            <ItemsControl ItemsSource="{Binding Tags}">
-              <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                  <WrapPanel Orientation="Horizontal"/>
-                </ItemsPanelTemplate>
-              </ItemsControl.ItemsPanel>
-              <ItemsControl.ItemTemplate>
-                <DataTemplate x:DataType="x:String">
-                  <Border Classes="chip chip-tag" Margin="0,0,6,4">
-                    <StackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center">
-                      <TextBlock Text="{Binding}" VerticalAlignment="Center"/>
-                      <Button Classes="icon-btn"
-                              Padding="2,0"
-                              VerticalAlignment="Center"
-                              ToolTip.Tip="Remove tag"
-                              Command="{Binding $parent[ItemsControl].((vm:DetailsIslandViewModel)DataContext).RemoveTagCommand}"
-                              CommandParameter="{Binding}">
-                        <TextBlock Text="×" FontSize="12"/>
-                      </Button>
-                    </StackPanel>
-                  </Border>
-                </DataTemplate>
-              </ItemsControl.ItemTemplate>
-            </ItemsControl>
-            <AutoCompleteBox ItemsSource="{Binding AvailableTags}"
-                             Text="{Binding NewTagInput, Mode=TwoWay}"
-                             Watermark="Add tag (Enter to add)">
-              <AutoCompleteBox.KeyBindings>
-                <KeyBinding Gesture="Enter" Command="{Binding AddTagCommand}"/>
-              </AutoCompleteBox.KeyBindings>
-            </AutoCompleteBox>
-          </StackPanel>
-        </Border>
-
         <!-- Planning merge section — visible only for planning parent tasks -->
         <Border Padding="18,12,18,12"
                 BorderBrush="{DynamicResource LineBrush}"

src/ClaudeDo.Ui/Views/Islands/TaskRowView.axaml

@@ -31,23 +31,21 @@
               Classes.selected="{Binding IsSelected}"
               Classes.done="{Binding Done}">
         <Border.ContextMenu>
-          <ContextMenu Opening="OnContextMenuOpening">
+          <ContextMenu>
             <MenuItem Header="Send to queue"
-                      IsVisible="{Binding !IsQueued}"
+                      IsVisible="{Binding CanSendToQueue}"
                       Click="OnSendToQueueClick"/>
             <MenuItem Header="Remove from queue"
                       IsVisible="{Binding CanRemoveFromQueue}"
                       Click="OnRemoveFromQueueClick"/>
+            <MenuItem Header="Cancel execution"
+                      IsVisible="{Binding IsRunning}"
+                      Click="OnCancelExecutionClick"/>
             <Separator/>
-            <MenuItem Header="Set status">
-              <MenuItem Header="Idle"      Tag="Idle"      Click="OnSetStatusClick"/>
-              <MenuItem Header="Queued"    Tag="Queued"    Click="OnSetStatusClick"/>
-              <MenuItem Header="Running"   Tag="Running"   Click="OnSetStatusClick"/>
+            <MenuItem Header="Mark as">
               <MenuItem Header="Done"      Tag="Done"      Click="OnSetStatusClick"/>
-              <MenuItem Header="Failed"    Tag="Failed"    Click="OnSetStatusClick"/>
               <MenuItem Header="Cancelled" Tag="Cancelled" Click="OnSetStatusClick"/>
             </MenuItem>
-            <MenuItem Header="Tags" x:Name="TagsMenu"/>
             <Separator/>
             <MenuItem Header="Run interactively"
                       Click="OnRunInteractivelyClick"/>
@@ -99,16 +97,19 @@
 
         <!-- Title + chip row + live tail -->
         <StackPanel Grid.Column="3" Spacing="6" VerticalAlignment="Center">
-          <StackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center">
-            <TextBlock Classes="task-title"
+          <Grid ColumnDefinitions="*,Auto" VerticalAlignment="Center">
+            <TextBlock Grid.Column="0"
+                       Classes="task-title"
                        Text="{Binding Title}" FontSize="14"
                        Foreground="{DynamicResource TextBrush}"
+                       TextWrapping="Wrap"
                        FontStyle="{Binding IsDraft, Converter={StaticResource BoolToItalic}}"
                        Opacity="{Binding IsDraft, Converter={StaticResource BoolToDraftOpacity}}"
                        TextDecorations="{Binding Done, Converter={StaticResource StrikeIfTrue}}"/>
 
             <!-- Badges: DRAFT and planning session -->
-            <StackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center">
+            <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="4"
+                        VerticalAlignment="Center" Margin="4,0,0,0">
               <Border Classes="badge draft" IsVisible="{Binding IsDraft}">
                 <TextBlock Text="DRAFT"/>
               </Border>
@@ -116,7 +117,7 @@
                 <TextBlock Text="{Binding PlanningBadge}"/>
               </Border>
             </StackPanel>
-          </StackPanel>
+          </Grid>
 
           <!-- Chip row -->
           <StackPanel Orientation="Horizontal" Spacing="6">
@@ -167,21 +168,6 @@
               </StackPanel>
             </Border>
 
-            <!-- Tag chips -->
-            <ItemsControl ItemsSource="{Binding Tags}" IsVisible="{Binding HasTags}">
-              <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                  <StackPanel Orientation="Horizontal" Spacing="6"/>
-                </ItemsPanelTemplate>
-              </ItemsControl.ItemsPanel>
-              <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                  <Border Classes="chip chip-tag">
-                    <TextBlock Text="{Binding}"/>
-                  </Border>
-                </DataTemplate>
-              </ItemsControl.ItemTemplate>
-            </ItemsControl>
           </StackPanel>
 
           <!-- Live-tail row (visible when running + has tail) -->

src/ClaudeDo.Ui/Views/Islands/TaskRowView.axaml.cs

@@ -36,6 +36,12 @@ public partial class TaskRowView : UserControl
             await vm.RemoveFromQueueCommand.ExecuteAsync(row);
     }
 
+    private async void OnCancelExecutionClick(object? sender, RoutedEventArgs e)
+    {
+        if (DataContext is TaskRowViewModel row && FindTasksVm() is { } vm)
+            await vm.CancelRunningTaskCommand.ExecuteAsync(row);
+    }
+
     private async void OnClearScheduleClick(object? sender, RoutedEventArgs e)
     {
         if (DataContext is TaskRowViewModel row && FindTasksVm() is { } vm)
@@ -82,37 +88,6 @@ public partial class TaskRowView : UserControl
         await vm.SetStatusOnRowAsync(row, status);
     }
 
-    private void OnContextMenuOpening(object? sender, System.ComponentModel.CancelEventArgs e)
-    {
-        if (DataContext is not TaskRowViewModel row || FindTasksVm() is not { } vm) return;
-
-        // Build the union of all known tags + tags currently on this row, so a row's
-        // own tags stay reachable from the menu even if the global list is stale.
-        var rowTags = row.Tags.ToHashSet();
-        var union = vm.AllTags.Concat(rowTags).Distinct().OrderBy(t => t).ToList();
-
-        TagsMenu.Items.Clear();
-        if (union.Count == 0)
-        {
-            TagsMenu.Items.Add(new MenuItem { Header = "(no tags yet)", IsEnabled = false });
-            return;
-        }
-        foreach (var name in union)
-        {
-            var prefix = rowTags.Contains(name) ? "✓ " : "    ";
-            var item = new MenuItem { Header = prefix + name, Tag = name };
-            item.Click += OnToggleTagClick;
-            TagsMenu.Items.Add(item);
-        }
-    }
-
-    private async void OnToggleTagClick(object? sender, RoutedEventArgs e)
-    {
-        if (sender is not MenuItem mi || mi.Tag is not string name) return;
-        if (DataContext is not TaskRowViewModel row || FindTasksVm() is not { } vm) return;
-        await vm.ToggleTagOnRowAsync(row, name);
-    }
-
     private void OnScheduleForClick(object? sender, RoutedEventArgs e)
     {
         if (DataContext is not TaskRowViewModel row) return;

src/ClaudeDo.Ui/Views/MainWindow.axaml

@@ -151,10 +151,10 @@
         <ColumnDefinition Width="Auto"/>
         <ColumnDefinition Width="*" MinWidth="320"/>
         <ColumnDefinition Width="Auto"/>
-        <ColumnDefinition Width="320" MinWidth="280"/>
+        <ColumnDefinition Width="460" MinWidth="280"/>
       </Grid.ColumnDefinitions>
 
-      <Border Grid.Column="0" Classes="island" Margin="7">
+      <Border Grid.Column="0" Classes="island" Margin="3">
         <islands:ListsIslandView DataContext="{Binding Lists}"/>
       </Border>
 
@@ -166,7 +166,7 @@
                     ResizeDirection="Columns"
                     ResizeBehavior="PreviousAndNext"/>
 
-      <Border Grid.Column="2" Classes="island" Margin="7">
+      <Border Grid.Column="2" Classes="island" Margin="3">
         <islands:TasksIslandView DataContext="{Binding Tasks}"/>
       </Border>
 
@@ -179,7 +179,7 @@
                     ResizeBehavior="PreviousAndNext"
                     IsVisible="{Binding ShowDetails}"/>
 
-      <Border Grid.Column="4" Classes="island" Margin="7"
+      <Border Grid.Column="4" Classes="island" Margin="3"
               IsVisible="{Binding ShowDetails}">
         <islands:DetailsIslandView DataContext="{Binding Details}"/>
       </Border>