From c10f564265cdd09a6d77fff1ad51c4b3c7efe563 Mon Sep 17 00:00:00 2001 From: mika kuns Date: Thu, 4 Jun 2026 15:46:38 +0200 Subject: [PATCH] feat(runner): route standalone success with children to WaitingForChildren + enqueue them --- src/ClaudeDo.Worker/Runner/TaskRunner.cs | 24 +++++- .../Runner/StandaloneChildrenRoutingTests.cs | 83 +++++++++++++++++++ 2 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 tests/ClaudeDo.Worker.Tests/Runner/StandaloneChildrenRoutingTests.cs diff --git a/src/ClaudeDo.Worker/Runner/TaskRunner.cs b/src/ClaudeDo.Worker/Runner/TaskRunner.cs index 51e95b4..657bdec 100644 --- a/src/ClaudeDo.Worker/Runner/TaskRunner.cs +++ b/src/ClaudeDo.Worker/Runner/TaskRunner.cs @@ -340,7 +340,29 @@ public sealed class TaskRunner await new TaskRepository(ctx).SetRoadblockCountAsync(task.Id, result.Blocks.Count, CancellationToken.None); } var reviewResult = ComposeReviewResult(result.ResultMarkdown, result.Blocks); - if (task.ParentTaskId is null && task.PlanningPhase == PlanningPhase.None) + bool isStandalone = task.ParentTaskId is null && task.PlanningPhase == PlanningPhase.None; + + List pendingChildren = new(); + if (isStandalone) + { + using var ctx = _dbFactory.CreateDbContext(); + var children = await new TaskRepository(ctx).GetChildrenAsync(task.Id, CancellationToken.None); + pendingChildren = children + .Where(c => c.Status is TaskStatus.Idle or TaskStatus.Queued) + .ToList(); + } + + if (isStandalone && pendingChildren.Count > 0) + { + await _state.SubmitForChildrenAsync(task.Id, finishedAt, reviewResult, CancellationToken.None); + foreach (var child in pendingChildren) + await _state.EnqueueAsync(child.Id, CancellationToken.None); + await _broadcaster.WorkerLog( + $"Finished \"{task.Title}\" (waiting on {pendingChildren.Count} improvement(s))", + WorkerLogLevel.Success, DateTime.UtcNow); + await _broadcaster.TaskFinished(slot, task.Id, "waiting_for_children", finishedAt); + } + else if (isStandalone) { await _state.SubmitForReviewAsync(task.Id, finishedAt, reviewResult, CancellationToken.None); await _broadcaster.WorkerLog($"Finished \"{task.Title}\" (waiting for review)", WorkerLogLevel.Success, DateTime.UtcNow); diff --git a/tests/ClaudeDo.Worker.Tests/Runner/StandaloneChildrenRoutingTests.cs b/tests/ClaudeDo.Worker.Tests/Runner/StandaloneChildrenRoutingTests.cs new file mode 100644 index 0000000..918a515 --- /dev/null +++ b/tests/ClaudeDo.Worker.Tests/Runner/StandaloneChildrenRoutingTests.cs @@ -0,0 +1,83 @@ +using ClaudeDo.Data.Git; +using ClaudeDo.Data.Models; +using ClaudeDo.Data.Repositories; +using ClaudeDo.Worker.Config; +using ClaudeDo.Worker.Hub; +using ClaudeDo.Worker.Runner; +using ClaudeDo.Worker.Tests.Infrastructure; +using ClaudeDo.Worker.Tests.Services; +using Microsoft.Extensions.Logging.Abstractions; +using TaskStatus = ClaudeDo.Data.Models.TaskStatus; +using Xunit; + +namespace ClaudeDo.Worker.Tests.Runner; + +public sealed class StandaloneChildrenRoutingTests : IDisposable +{ + private readonly DbFixture _db = new(); + private readonly WorkerConfig _cfg; + private readonly string _tempDir; + + public StandaloneChildrenRoutingTests() + { + _tempDir = Path.Combine(Path.GetTempPath(), $"cd_routing_{Guid.NewGuid():N}"); + Directory.CreateDirectory(_tempDir); + _cfg = new WorkerConfig { SandboxRoot = _tempDir, LogRoot = _tempDir }; + } + public void Dispose() { _db.Dispose(); try { Directory.Delete(_tempDir, true); } catch { } } + + [Fact] + public async Task StandaloneSuccess_withChild_goesWaitingForChildren_andEnqueuesChild() + { + var dbFactory = _db.CreateFactory(); + using (var ctx = _db.CreateContext()) + { + ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", WorkingDir = null, CreatedAt = DateTime.UtcNow }); + ctx.Tasks.Add(new TaskEntity { Id = "p1", ListId = "l1", Title = "Parent", + Status = TaskStatus.Running, CreatedAt = DateTime.UtcNow }); + ctx.Tasks.Add(new TaskEntity { Id = "kid", ListId = "l1", Title = "Improve", + Status = TaskStatus.Idle, ParentTaskId = "p1", CreatedBy = "p1", CreatedAt = DateTime.UtcNow }); + await ctx.SaveChangesAsync(); + } + var fake = new FakeClaudeProcess((_, _, _, _, _) => + Task.FromResult(new RunResult { ExitCode = 0, ResultMarkdown = "done" })); + var broadcaster = new HubBroadcaster(new FakeHubContext()); + var state = TaskStateServiceBuilder.Build(dbFactory).State; + var wt = new WorktreeManager(new GitService(), dbFactory, _cfg, NullLogger.Instance); + var runner = new TaskRunner(fake, dbFactory, broadcaster, wt, new ClaudeArgsBuilder(), _cfg, + NullLogger.Instance, state); + + using (var ctx = _db.CreateContext()) + await runner.RunAsync((await new TaskRepository(ctx).GetByIdAsync("p1"))!, "slot-1", default); + + using var verify = _db.CreateContext(); + var repo = new TaskRepository(verify); + Assert.Equal(TaskStatus.WaitingForChildren, (await repo.GetByIdAsync("p1"))!.Status); + Assert.Equal(TaskStatus.Queued, (await repo.GetByIdAsync("kid"))!.Status); + } + + [Fact] + public async Task StandaloneSuccess_noChildren_goesWaitingForReview() + { + var dbFactory = _db.CreateFactory(); + using (var ctx = _db.CreateContext()) + { + ctx.Lists.Add(new ListEntity { Id = "l1", Name = "L", WorkingDir = null, CreatedAt = DateTime.UtcNow }); + ctx.Tasks.Add(new TaskEntity { Id = "solo", ListId = "l1", Title = "Solo", + Status = TaskStatus.Running, CreatedAt = DateTime.UtcNow }); + await ctx.SaveChangesAsync(); + } + var fake = new FakeClaudeProcess((_, _, _, _, _) => + Task.FromResult(new RunResult { ExitCode = 0, ResultMarkdown = "done" })); + var state = TaskStateServiceBuilder.Build(dbFactory).State; + var wt = new WorktreeManager(new GitService(), dbFactory, _cfg, NullLogger.Instance); + var runner = new TaskRunner(fake, dbFactory, new HubBroadcaster(new FakeHubContext()), wt, + new ClaudeArgsBuilder(), _cfg, NullLogger.Instance, state); + + using (var ctx = _db.CreateContext()) + await runner.RunAsync((await new TaskRepository(ctx).GetByIdAsync("solo"))!, "slot-1", default); + + using var verify = _db.CreateContext(); + Assert.Equal(TaskStatus.WaitingForReview, (await new TaskRepository(verify).GetByIdAsync("solo"))!.Status); + } +}