From 4877802bcd9c509c8f1c6bc0cffeff28afec9d74 Mon Sep 17 00:00:00 2001 From: Mika Kuns Date: Mon, 27 Jul 2026 13:00:58 +0200 Subject: [PATCH] refactor(worker): make the list-handler launch spec single-list and single-repo --- .../Services/Interfaces/IWorkerClient.cs | 4 +- src/ClaudeDo.Ui/Services/WorkerClient.cs | 2 +- .../Islands/ListsIslandViewModel.cs | 4 +- .../ViewModels/MissionControlViewModel.cs | 17 ++-- src/ClaudeDo.Worker/Hub/WorkerHub.cs | 4 +- .../Runner/InteractiveLaunchSpecService.cs | 59 ++++-------- .../IInteractiveLaunchSpecService.cs | 8 +- tests/ClaudeDo.Ui.Tests/StubWorkerClient.cs | 2 +- .../MissionControlViewModelTests.cs | 12 +-- .../InteractiveLaunchSpecServiceTests.cs | 91 +++++++++---------- .../UiVm/TasksIslandViewModelPlanningTests.cs | 2 +- 11 files changed, 85 insertions(+), 120 deletions(-) diff --git a/src/ClaudeDo.Ui/Services/Interfaces/IWorkerClient.cs b/src/ClaudeDo.Ui/Services/Interfaces/IWorkerClient.cs index 9b78e4bc..84f75d30 100644 --- a/src/ClaudeDo.Ui/Services/Interfaces/IWorkerClient.cs +++ b/src/ClaudeDo.Ui/Services/Interfaces/IWorkerClient.cs @@ -86,8 +86,8 @@ public interface IWorkerClient : INotifyPropertyChanged /// no task, no worktree. Task GetAdHocLaunchSpecAsync(string directory, CancellationToken ct = default); /// Launch spec for an embedded ConPTY "merge helper" session that drives the given - /// tasks to a merged/Done state. listId scopes the session to that list; null = all lists. - Task GetMergeHelperLaunchSpecAsync(IReadOnlyList taskIds, string? listId, CancellationToken ct = default); + /// tasks to a merged/Done state. listId scopes the session (and cwd) to that list. + Task GetMergeHelperLaunchSpecAsync(IReadOnlyList taskIds, string listId, CancellationToken ct = default); /// Starts a planning session and returns the launch spec for an embedded ConPTY /// planning terminal (replaces StartPlanningSessionAsync's external wt window). Task GetPlanningStartLaunchSpecAsync(string taskId, CancellationToken ct = default); diff --git a/src/ClaudeDo.Ui/Services/WorkerClient.cs b/src/ClaudeDo.Ui/Services/WorkerClient.cs index 16a1c971..7d565eda 100644 --- a/src/ClaudeDo.Ui/Services/WorkerClient.cs +++ b/src/ClaudeDo.Ui/Services/WorkerClient.cs @@ -522,7 +522,7 @@ public partial class WorkerClient : ObservableObject, IAsyncDisposable, IWorkerC public async Task GetAdHocLaunchSpecAsync(string directory, CancellationToken ct = default) => await _hub.InvokeAsync("GetAdHocLaunchSpec", directory, ct); - public async Task GetMergeHelperLaunchSpecAsync(IReadOnlyList taskIds, string? listId, CancellationToken ct = default) + public async Task GetMergeHelperLaunchSpecAsync(IReadOnlyList taskIds, string listId, CancellationToken ct = default) => await _hub.InvokeAsync("GetMergeHelperLaunchSpec", taskIds, listId, ct); public async Task GetPlanningStartLaunchSpecAsync(string taskId, CancellationToken ct = default) diff --git a/src/ClaudeDo.Ui/ViewModels/Islands/ListsIslandViewModel.cs b/src/ClaudeDo.Ui/ViewModels/Islands/ListsIslandViewModel.cs index 3a10af6d..3e78a973 100644 --- a/src/ClaudeDo.Ui/ViewModels/Islands/ListsIslandViewModel.cs +++ b/src/ClaudeDo.Ui/ViewModels/Islands/ListsIslandViewModel.cs @@ -16,8 +16,8 @@ namespace ClaudeDo.Ui.ViewModels.Islands; public enum ListKind { Smart, Virtual, User } -/// Confirmed merge-helper run: the scope list (null = all lists) and the ordered selected task ids. -public sealed record MergeHelperRequest(string? ListId, IReadOnlyList TaskIds); +/// Confirmed handler run: the scope list and the ordered selected task ids. +public sealed record MergeHelperRequest(string ListId, IReadOnlyList TaskIds); public sealed partial class ListsIslandViewModel : ViewModelBase, IDisposable { diff --git a/src/ClaudeDo.Ui/ViewModels/MissionControlViewModel.cs b/src/ClaudeDo.Ui/ViewModels/MissionControlViewModel.cs index ce73af7e..5792365b 100644 --- a/src/ClaudeDo.Ui/ViewModels/MissionControlViewModel.cs +++ b/src/ClaudeDo.Ui/ViewModels/MissionControlViewModel.cs @@ -322,23 +322,20 @@ public sealed partial class MissionControlViewModel : ViewModelBase, IDisposable } } - // Merge-helper session over a hand-picked set of tasks ("Let Claude handle it"). + // List-handler session over a hand-picked set of tasks ("Let Claude handle it"). // Ad-hoc style: no owning task, never deduped — every run opens a fresh pane. - public async System.Threading.Tasks.Task OpenMergeHelperConPtySessionAsync(string? listId, IReadOnlyList taskIds) + public async System.Threading.Tasks.Task OpenMergeHelperConPtySessionAsync(string listId, IReadOnlyList taskIds) { if (taskIds is not { Count: > 0 }) return; var title = Loc.T("missionControl.mergeHelperTitle"); - if (listId is not null) + try { - try - { - await using var ctx = await _dbFactory.CreateDbContextAsync(); - var list = await ctx.Lists.AsNoTracking().FirstOrDefaultAsync(l => l.Id == listId); - if (list?.Name is { Length: > 0 } name) title = $"{title} — {name}"; - } - catch { /* best-effort title lookup */ } + await using var ctx = await _dbFactory.CreateDbContextAsync(); + var list = await ctx.Lists.AsNoTracking().FirstOrDefaultAsync(l => l.Id == listId); + if (list?.Name is { Length: > 0 } name) title = $"{title} — {name}"; } + catch { /* best-effort title lookup */ } try { diff --git a/src/ClaudeDo.Worker/Hub/WorkerHub.cs b/src/ClaudeDo.Worker/Hub/WorkerHub.cs index 93cfc43c..8cc72c10 100644 --- a/src/ClaudeDo.Worker/Hub/WorkerHub.cs +++ b/src/ClaudeDo.Worker/Hub/WorkerHub.cs @@ -678,8 +678,8 @@ public sealed class WorkerHub : Microsoft.AspNetCore.SignalR.Hub // Builds the launch spec for an embedded ConPTY "merge helper" session that drives the given // tasks to a merged/Done state via the mcp__claudedo__* tools. listId scopes the brief label - // and cwd to that list; null means all lists. - public Task GetMergeHelperLaunchSpec(string[] taskIds, string? listId) => HubGuard(() => + // and cwd to that list. + public Task GetMergeHelperLaunchSpec(string[] taskIds, string listId) => HubGuard(() => { if (_interactiveLaunchSpec is null) throw new InvalidOperationException("Interactive launch spec service is not configured."); diff --git a/src/ClaudeDo.Worker/Runner/InteractiveLaunchSpecService.cs b/src/ClaudeDo.Worker/Runner/InteractiveLaunchSpecService.cs index fdd51cdb..fb654f15 100644 --- a/src/ClaudeDo.Worker/Runner/InteractiveLaunchSpecService.cs +++ b/src/ClaudeDo.Worker/Runner/InteractiveLaunchSpecService.cs @@ -163,51 +163,28 @@ public sealed class InteractiveLaunchSpecService : IInteractiveLaunchSpecService private const string MergeHelperAllowedTools = "mcp__claudedo__*,Read,Grep,Glob,Edit,Bash,WebFetch,WebSearch,Skill"; - public async Task BuildForMergeHelperAsync(IReadOnlyList taskIds, string? listId, CancellationToken ct) + public async Task BuildForMergeHelperAsync(IReadOnlyList taskIds, string listId, CancellationToken ct) { if (taskIds.Count == 0) - throw new InvalidOperationException("No tasks selected for the merge helper."); + throw new InvalidOperationException("No tasks selected for the list handler."); await using var ctx = await _dbFactory.CreateDbContextAsync(ct); var taskRepo = new TaskRepository(ctx); var listRepo = new ListRepository(ctx); - var listsById = new Dictionary(); - var briefLines = new List(); - var repoDirs = new List(); // distinct, existing, in first-seen order + var list = await listRepo.GetByIdAsync(listId, ct) + ?? throw new KeyNotFoundException($"List not found: {listId}"); + var repoDir = list.WorkingDir; + if (string.IsNullOrEmpty(repoDir) || !Directory.Exists(repoDir)) + throw new InvalidOperationException($"list '{list.Name}' has no existing working directory"); + + var briefLines = new List(); foreach (var id in taskIds) { var task = await taskRepo.GetByIdAsync(id, ct) ?? throw new KeyNotFoundException($"Task not found: {id}"); - if (!listsById.TryGetValue(task.ListId, out var list)) - listsById[task.ListId] = list = await listRepo.GetByIdAsync(task.ListId, ct); - - var workingDir = list?.WorkingDir; - if (!string.IsNullOrEmpty(workingDir) && Directory.Exists(workingDir) && !repoDirs.Contains(workingDir)) - repoDirs.Add(workingDir); - - briefLines.Add( - $"- [{task.Status}] {task.Title} (id: {task.Id}, list: {list?.Name ?? "—"}, " + - $"repo: {(string.IsNullOrEmpty(workingDir) ? "—" : workingDir)})"); - } - - if (repoDirs.Count == 0) - throw new InvalidOperationException("none of the selected tasks are in a working directory"); - - string scopeLabel; - string cwd; - if (listId is not null) - { - var scopeList = await listRepo.GetByIdAsync(listId, ct) - ?? throw new KeyNotFoundException($"List not found: {listId}"); - scopeLabel = $"List: {scopeList.Name}"; - cwd = scopeList.WorkingDir is { Length: > 0 } wd && Directory.Exists(wd) ? wd : repoDirs[0]; - } - else - { - scopeLabel = "All lists"; - cwd = repoDirs[0]; + briefLines.Add($"- [{task.Status}] {task.Title} (id: {task.Id})"); } var sessionDir = Path.Combine(Paths.AppDataRoot(), "merge-helper-sessions", Guid.NewGuid().ToString()); @@ -220,7 +197,8 @@ public sealed class InteractiveLaunchSpecService : IInteractiveLaunchSpecService await File.WriteAllTextAsync(briefPath, PromptFiles.Render(PromptKind.MergeHelperInitial, new Dictionary { - ["scope"] = scopeLabel, + ["scope"] = $"List: {list.Name}", + ["repo"] = repoDir, ["tasks"] = string.Join("\n", briefLines), }), ct); @@ -235,21 +213,18 @@ public sealed class InteractiveLaunchSpecService : IInteractiveLaunchSpecService { "--permission-mode", "default", "--allowedTools", MergeHelperAllowedTools, - "--add-dir", sessionDir, + "--add-dir", sessionDir, repoDir, + "--append-system-prompt-file", systemPromptPath, + $"Read the file {briefPath} first. It lists the tasks you must handle and their status. " + + "After reading it, begin the session as your instructions describe.", }; - args.AddRange(repoDirs); - args.Add("--append-system-prompt-file"); - args.Add(systemPromptPath); - args.Add( - $"Read the file {briefPath} first. It lists the tasks you must merge and their status. " + - "After reading it, begin the merge-helper session as your instructions describe."); var env = new Dictionary { ["MCP_TOOL_TIMEOUT"] = "200000", }; - return new LaunchSpec(cwd, resolvedClaude, args, env); + return new LaunchSpec(repoDir, resolvedClaude, args, env); } // The positional prompt claude opens the interactive session on. Empty (no positional arg) diff --git a/src/ClaudeDo.Worker/Runner/Interfaces/IInteractiveLaunchSpecService.cs b/src/ClaudeDo.Worker/Runner/Interfaces/IInteractiveLaunchSpecService.cs index 47ce185b..23852b9e 100644 --- a/src/ClaudeDo.Worker/Runner/Interfaces/IInteractiveLaunchSpecService.cs +++ b/src/ClaudeDo.Worker/Runner/Interfaces/IInteractiveLaunchSpecService.cs @@ -30,8 +30,8 @@ public interface IInteractiveLaunchSpecService /// Builds a LaunchSpec for an embedded ConPTY "merge helper" session that drives the /// given tasks to a merged/Done state via the mcp__claudedo__* tools. Writes a per-session /// system prompt + task brief under ~/.todo-app/merge-helper-sessions/<guid> and exposes - /// that dir plus every distinct existing repo dir via --add-dir. listId scopes the brief label - /// and the cwd to that list; null means all lists (cwd = first existing repo dir). Throws - /// InvalidOperationException if taskIds is empty or no task has an existing working directory. - Task BuildForMergeHelperAsync(IReadOnlyList taskIds, string? listId, CancellationToken ct); + /// that dir plus the list's repo dir via --add-dir. cwd is the list's working directory. + /// Throws KeyNotFoundException if the list doesn't exist; InvalidOperationException if + /// taskIds is empty or the list has no existing working directory. + Task BuildForMergeHelperAsync(IReadOnlyList taskIds, string listId, CancellationToken ct); } diff --git a/tests/ClaudeDo.Ui.Tests/StubWorkerClient.cs b/tests/ClaudeDo.Ui.Tests/StubWorkerClient.cs index 7faea86c..682fa1ae 100644 --- a/tests/ClaudeDo.Ui.Tests/StubWorkerClient.cs +++ b/tests/ClaudeDo.Ui.Tests/StubWorkerClient.cs @@ -100,7 +100,7 @@ public abstract class StubWorkerClient : IWorkerClient => Task.FromResult(new LaunchSpec(".", "claude", Array.Empty(), new Dictionary())); public virtual Task GetAdHocLaunchSpecAsync(string directory, CancellationToken ct = default) => Task.FromResult(new LaunchSpec(directory, "claude", Array.Empty(), new Dictionary())); - public virtual Task GetMergeHelperLaunchSpecAsync(IReadOnlyList taskIds, string? listId, CancellationToken ct = default) + public virtual Task GetMergeHelperLaunchSpecAsync(IReadOnlyList taskIds, string listId, CancellationToken ct = default) => Task.FromResult(new LaunchSpec(".", "claude", Array.Empty(), new Dictionary())); public virtual Task GetPlanningStartLaunchSpecAsync(string taskId, CancellationToken ct = default) => Task.FromResult(new LaunchSpec(".", "claude", Array.Empty(), new Dictionary())); diff --git a/tests/ClaudeDo.Ui.Tests/ViewModels/MissionControlViewModelTests.cs b/tests/ClaudeDo.Ui.Tests/ViewModels/MissionControlViewModelTests.cs index acd9e881..26cedbd5 100644 --- a/tests/ClaudeDo.Ui.Tests/ViewModels/MissionControlViewModelTests.cs +++ b/tests/ClaudeDo.Ui.Tests/ViewModels/MissionControlViewModelTests.cs @@ -408,7 +408,7 @@ public class MissionControlViewModelTests : IDisposable private sealed class ThrowingMergeHelperLaunchSpecWorker : StubWorkerClient { - public override Task GetMergeHelperLaunchSpecAsync(IReadOnlyList taskIds, string? listId, CancellationToken ct = default) + public override Task GetMergeHelperLaunchSpecAsync(IReadOnlyList taskIds, string listId, CancellationToken ct = default) => throw new InvalidOperationException("spec failed"); } @@ -418,7 +418,7 @@ public class MissionControlViewModelTests : IDisposable var worker = new FakeWorker(); using var vm = BuildVm(worker); - await vm.OpenMergeHelperConPtySessionAsync(null, new[] { "t1", "t2" }); + await vm.OpenMergeHelperConPtySessionAsync("L1", new[] { "t1", "t2" }); Assert.Single(vm.ConPtySessions); Assert.Null(vm.ConPtySessions[0].TaskId); @@ -432,8 +432,8 @@ public class MissionControlViewModelTests : IDisposable var worker = new FakeWorker(); using var vm = BuildVm(worker); - await vm.OpenMergeHelperConPtySessionAsync(null, new[] { "t1" }); - await vm.OpenMergeHelperConPtySessionAsync(null, new[] { "t1" }); + await vm.OpenMergeHelperConPtySessionAsync("L1", new[] { "t1" }); + await vm.OpenMergeHelperConPtySessionAsync("L1", new[] { "t1" }); Assert.Equal(2, vm.ConPtySessions.Count); } @@ -444,7 +444,7 @@ public class MissionControlViewModelTests : IDisposable var worker = new FakeWorker(); using var vm = BuildVm(worker); - await vm.OpenMergeHelperConPtySessionAsync(null, Array.Empty()); + await vm.OpenMergeHelperConPtySessionAsync("L1", Array.Empty()); Assert.Empty(vm.ConPtySessions); Assert.Empty(vm.Panes); @@ -458,7 +458,7 @@ public class MissionControlViewModelTests : IDisposable string? error = null; vm.ErrorReported += msg => error = msg; - await vm.OpenMergeHelperConPtySessionAsync(null, new[] { "t1" }); + await vm.OpenMergeHelperConPtySessionAsync("L1", new[] { "t1" }); Assert.Empty(vm.ConPtySessions); Assert.Empty(vm.Panes); diff --git a/tests/ClaudeDo.Worker.Tests/Runner/InteractiveLaunchSpecServiceTests.cs b/tests/ClaudeDo.Worker.Tests/Runner/InteractiveLaunchSpecServiceTests.cs index 140c97ec..aed5d6f6 100644 --- a/tests/ClaudeDo.Worker.Tests/Runner/InteractiveLaunchSpecServiceTests.cs +++ b/tests/ClaudeDo.Worker.Tests/Runner/InteractiveLaunchSpecServiceTests.cs @@ -363,13 +363,14 @@ public sealed class InteractiveLaunchSpecServiceTests : IDisposable [Fact] public async Task BuildForMergeHelperAsync_EmptyTaskIds_ThrowsInvalidOperation() { + var listId = await SeedListAsync(workingDir: _tempDir); var svc = BuildService(); await Assert.ThrowsAsync( - () => svc.BuildForMergeHelperAsync(Array.Empty(), null, CancellationToken.None)); + () => svc.BuildForMergeHelperAsync(Array.Empty(), listId, CancellationToken.None)); } [Fact] - public async Task BuildForMergeHelperAsync_NoExistingWorkingDirs_ThrowsInvalidOperation() + public async Task BuildForMergeHelperAsync_ListWithoutExistingWorkingDir_ThrowsInvalidOperation() { var listId = await SeedListAsync(workingDir: Path.Combine(_tempDir, "gone")); var taskId = Guid.NewGuid().ToString(); @@ -377,53 +378,56 @@ public sealed class InteractiveLaunchSpecServiceTests : IDisposable var svc = BuildService(); var ex = await Assert.ThrowsAsync( - () => svc.BuildForMergeHelperAsync(new[] { taskId }, null, CancellationToken.None)); + () => svc.BuildForMergeHelperAsync(new[] { taskId }, listId, CancellationToken.None)); Assert.Contains("working directory", ex.Message); } [Fact] - public async Task BuildForMergeHelperAsync_TasksAcrossTwoRepos_BuildsGlobalScopeSpec() + public async Task BuildForMergeHelperAsync_UnknownList_Throws() { - var repoA = Path.Combine(_tempDir, "repoA"); - var repoB = Path.Combine(_tempDir, "repoB"); - Directory.CreateDirectory(repoA); - Directory.CreateDirectory(repoB); - - var listA = await SeedListAsync(workingDir: repoA, name: "Alpha"); - var listB = await SeedListAsync(workingDir: repoB, name: "Beta"); - var t1 = Guid.NewGuid().ToString(); - var t2 = Guid.NewGuid().ToString(); - var t3 = Guid.NewGuid().ToString(); - await SeedTaskAsync(t1, listA, TaskStatus.WaitingForReview, title: "First task"); - await SeedTaskAsync(t2, listB, TaskStatus.Idle, title: "Second task"); - await SeedTaskAsync(t3, listA, TaskStatus.Failed, title: "Third task"); // same repo as t1 -> distinct + var listId = await SeedListAsync(workingDir: _tempDir); + var taskId = Guid.NewGuid().ToString(); + await SeedTaskAsync(taskId, listId, TaskStatus.Idle); var svc = BuildService(); - var spec = await svc.BuildForMergeHelperAsync(new[] { t1, t2, t3 }, null, CancellationToken.None); + await Assert.ThrowsAsync( + () => svc.BuildForMergeHelperAsync(new[] { taskId }, "no-such-list", CancellationToken.None)); + } + + [Fact] + public async Task BuildForMergeHelperAsync_BuildsListScopedSpecWithSingleRepo() + { + var repo = Path.Combine(_tempDir, "repoOnly"); + Directory.CreateDirectory(repo); + + var listId = await SeedListAsync(workingDir: repo, name: "Alpha"); + var t1 = Guid.NewGuid().ToString(); + var t2 = Guid.NewGuid().ToString(); + await SeedTaskAsync(t1, listId, TaskStatus.WaitingForReview, title: "First task"); + await SeedTaskAsync(t2, listId, TaskStatus.Idle, title: "Second task"); + + var svc = BuildService(); + var spec = await svc.BuildForMergeHelperAsync(new[] { t1, t2 }, listId, CancellationToken.None); var sessionDir = TrackSessionDir(spec); - // cwd: no listId -> first existing repo dir. - Assert.Equal(repoA, spec.Cwd); + Assert.Equal(repo, spec.Cwd); Assert.Equal(_claudeStubPath, spec.Exe); var args = spec.Args.ToList(); - // --permission-mode default var pmIdx = args.IndexOf("--permission-mode"); Assert.True(pmIdx >= 0); Assert.Equal("default", args[pmIdx + 1]); - // allowedTools string for the merge helper var atIdx = args.IndexOf("--allowedTools"); Assert.Equal("mcp__claudedo__*,Read,Grep,Glob,Edit,Bash,WebFetch,WebSearch,Skill", args[atIdx + 1]); - // --add-dir: session dir + BOTH distinct repo dirs (repoA only once) + // --add-dir: session dir + the list's single repo dir var addIdx = args.IndexOf("--add-dir"); var appendIdx = args.IndexOf("--append-system-prompt-file"); var addDirs = args.GetRange(addIdx + 1, appendIdx - addIdx - 1); - Assert.Equal(new[] { sessionDir, repoA, repoB }, addDirs); + Assert.Equal(new[] { sessionDir, repo }, addDirs); - // system prompt file follows --append-system-prompt-file var systemPromptPath = args[appendIdx + 1]; Assert.Equal(Path.Combine(sessionDir, "system-prompt.md"), systemPromptPath); Assert.True(File.Exists(systemPromptPath)); @@ -434,43 +438,32 @@ public sealed class InteractiveLaunchSpecServiceTests : IDisposable Assert.Contains(briefPath, kickoff); Assert.DoesNotContain('\n', kickoff); - // brief exists, carries the scope label and every task's title - Assert.True(File.Exists(briefPath)); - var brief = File.ReadAllText(briefPath); - Assert.Contains("Scope: All lists", brief); - Assert.Contains("First task", brief); - Assert.Contains("Second task", brief); - Assert.Contains("Third task", brief); - Assert.Equal("200000", spec.Env["MCP_TOOL_TIMEOUT"]); } [Fact] - public async Task BuildForMergeHelperAsync_WithListId_UsesListWorkingDirAsCwdAndListScope() + public async Task BuildForMergeHelperAsync_BriefNamesListRepoAndEveryTask() { - var repoA = Path.Combine(_tempDir, "repoA2"); - var repoB = Path.Combine(_tempDir, "repoB2"); - Directory.CreateDirectory(repoA); - Directory.CreateDirectory(repoB); + var repo = Path.Combine(_tempDir, "repoBrief"); + Directory.CreateDirectory(repo); - var listA = await SeedListAsync(workingDir: repoA, name: "Alpha"); - var listB = await SeedListAsync(workingDir: repoB, name: "Beta"); + var listId = await SeedListAsync(workingDir: repo, name: "Alpha"); var t1 = Guid.NewGuid().ToString(); var t2 = Guid.NewGuid().ToString(); - await SeedTaskAsync(t1, listA, TaskStatus.WaitingForReview, title: "Task in Alpha"); - await SeedTaskAsync(t2, listB, TaskStatus.WaitingForReview, title: "Task in Beta"); + await SeedTaskAsync(t1, listId, TaskStatus.WaitingForReview, title: "First task"); + await SeedTaskAsync(t2, listId, TaskStatus.Idle, title: "Second task"); var svc = BuildService(); - // Scope on listB even though listA's task comes first: cwd must be listB's repo. - var spec = await svc.BuildForMergeHelperAsync(new[] { t1, t2 }, listB, CancellationToken.None); + var spec = await svc.BuildForMergeHelperAsync(new[] { t1, t2 }, listId, CancellationToken.None); var sessionDir = TrackSessionDir(spec); - Assert.Equal(repoB, spec.Cwd); - var brief = File.ReadAllText(Path.Combine(sessionDir, "brief.md")); - Assert.Contains("Scope: List: Beta", brief); - Assert.Contains("Task in Alpha", brief); - Assert.Contains("Task in Beta", brief); + Assert.Contains("Scope: List: Alpha", brief); + Assert.Contains($"Repo: {repo}", brief); + Assert.Contains("First task", brief); + Assert.Contains("Second task", brief); + Assert.Contains(t1, brief); + Assert.Contains(t2, brief); } [Fact] diff --git a/tests/ClaudeDo.Worker.Tests/UiVm/TasksIslandViewModelPlanningTests.cs b/tests/ClaudeDo.Worker.Tests/UiVm/TasksIslandViewModelPlanningTests.cs index 1bc6598c..e227c5fe 100644 --- a/tests/ClaudeDo.Worker.Tests/UiVm/TasksIslandViewModelPlanningTests.cs +++ b/tests/ClaudeDo.Worker.Tests/UiVm/TasksIslandViewModelPlanningTests.cs @@ -75,7 +75,7 @@ sealed class FakeWorkerClient : IWorkerClient public Task SubmitTaskForReviewAsync(string taskId, CancellationToken ct = default) => Task.CompletedTask; public Task GetInteractiveLaunchSpecAsync(string taskId, CancellationToken ct = default) => Task.FromResult(new LaunchSpec(".", "claude", Array.Empty(), new Dictionary())); - public Task GetMergeHelperLaunchSpecAsync(IReadOnlyList taskIds, string? listId, CancellationToken ct = default) + public Task GetMergeHelperLaunchSpecAsync(IReadOnlyList taskIds, string listId, CancellationToken ct = default) => Task.FromResult(new LaunchSpec(".", "claude", Array.Empty(), new Dictionary())); public Task GetAdHocLaunchSpecAsync(string directory, CancellationToken ct = default) => Task.FromResult(new LaunchSpec(directory, "claude", Array.Empty(), new Dictionary()));