Merge branch 'claudedo/a92b87e7748840ababcfc87423a8636c'

tests/ClaudeDo.Worker.Tests/UiVm/TaskRowViewModelPlanningTests.cs

@@ -87,6 +87,21 @@ public class TaskRowViewModelPlanningTests
         Assert.True(vm.CanSendToQueue);
     }
 
+    [Fact]
+    public void OpenInteractiveSession_CannotSendToQueue()
+    {
+        // A hand-driven ConPTY session is still Idle in the DB (sessions never touch status), so
+        // this has to be gated on the UI-only HasInteractiveSession flag, not on Status.
+        var vm = MakeRow(TaskStatus.Idle);
+        Assert.True(vm.CanSendToQueue);
+
+        vm.HasInteractiveSession = true;
+        Assert.False(vm.CanSendToQueue);
+
+        vm.HasInteractiveSession = false;
+        Assert.True(vm.CanSendToQueue);
+    }
+
     [Fact]
     public void FinalizedParentWithChildren_CanQueuePlan()
     {

tests/ClaudeDo.Worker.Tests/UiVm/TasksIslandViewModelPlanningTests.cs

@@ -20,6 +20,7 @@ sealed class FakeWorkerClient : IWorkerClient
     public int DiscardPlanningCalls { get; private set; }
     public int FinalizePlanningCalls { get; private set; }
     public int WakeQueueCalls { get; private set; }
+    public List<(string TaskId, TaskStatus Status)> SetTaskStatusCalls { get; } = new();
 
     public bool IsConnected => false;
     public bool IsReconnecting => false;
@@ -59,7 +60,11 @@ sealed class FakeWorkerClient : IWorkerClient
     public Task<List<string>> InstallSessionSkillAsync(string url) => Task.FromResult(new List<string>());
     public Task UpdateSessionSkillAsync(string sourceUrl) => Task.CompletedTask;
     public Task RemoveSessionSkillAsync(string sourceUrl) => Task.CompletedTask;
-    public Task SetTaskStatusAsync(string taskId, TaskStatus status) => Task.CompletedTask;
+    public Task SetTaskStatusAsync(string taskId, TaskStatus status)
+    {
+        SetTaskStatusCalls.Add((taskId, status));
+        return Task.CompletedTask;
+    }
     public Task<MergeResultDto?> ApproveReviewAsync(string taskId, string targetBranch) => Task.FromResult<MergeResultDto?>(null);
     public Task<MergePreviewDto?> PreviewMergeAsync(string taskId, string targetBranch) => Task.FromResult<MergePreviewDto?>(null);
     public Task<MergeResultDto> MergeTaskAsync(string taskId, string targetBranch, bool removeWorktree, string commitMessage) => Task.FromResult(new MergeResultDto("merged", System.Array.Empty<string>(), null));
@@ -300,6 +305,29 @@ public class TasksIslandViewModelPlanningTests
         Assert.True(child.ParentInView);
         Assert.True(child.ShowAsChild);
     }
+
+    [Fact]
+    public async Task SendToQueueAsync_RoutesThroughWorkerHub_NotRawEf()
+    {
+        var row = MakeRow("t1", TaskStatus.Idle);
+        var (vm, worker) = VmFactory.Create([row]);
+
+        await ((IAsyncRelayCommand<TaskRowViewModel?>)vm.SendToQueueCommand).ExecuteAsync(row);
+
+        Assert.Equal(("t1", TaskStatus.Queued), Assert.Single(worker.SetTaskStatusCalls));
+    }
+
+    [Fact]
+    public async Task SendToQueueAsync_TaskHasOpenInteractiveSession_DoesNotQueue()
+    {
+        var row = MakeRow("t1", TaskStatus.Idle);
+        row.HasInteractiveSession = true;
+        var (vm, worker) = VmFactory.Create([row]);
+
+        await ((IAsyncRelayCommand<TaskRowViewModel?>)vm.SendToQueueCommand).ExecuteAsync(row);
+
+        Assert.Empty(worker.SetTaskStatusCalls);
+    }
 }
 
 // ── My Day add / remove (real DB) ─────────────────────────────────────────────