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

feat(worker): add pre-flight checks and idempotent restart to PlanningMergeOrchestrator

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
mika kuns
2026-04-24 18:24:41 +02:00
parent b9896399fa
commit e58cac24e1
2 changed files with 120 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
tests/ClaudeDo.Worker.Tests/Planning/PlanningMergeOrchestratorTests.cs
View File

@@ -259,8 +259,96 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
factory, git,
NullLogger<PlanningAggregator>.Instance);
var orch = new PlanningMergeOrchestrator(
factory, merge, aggregator, broadcaster,
factory, merge, aggregator, broadcaster, git,
NullLogger<PlanningMergeOrchestrator>.Instance);
return (orch, spy.Calls);
}
[Fact]
public async Task StartAsync_SubtaskStillRunning_ThrowsWithoutSideEffects()
{
var db = NewDb();
var repo = NewRepo();
GitRepoFixture.RunGit(repo.RepoDir, "branch", "-m", "main");
var (parentId, runningSub) = await SeedPlanningWithOneRunningChildAsync(db, repo);
var (orch, spy) = BuildOrchestrator(db);
var ex = await Assert.ThrowsAsync<InvalidOperationException>(
() => orch.StartAsync(parentId, "main", CancellationToken.None));
Assert.Contains(runningSub, ex.Message);
using var ctx = db.CreateContext();
Assert.Equal(TaskStatus.Planned, ctx.Tasks.Single(t => t.Id == parentId).Status);
Assert.Empty(spy);
}
[Fact]
public async Task StartAsync_DirtyRepo_ThrowsWithoutSideEffects()
{
var db = NewDb();
var repo = NewRepo();
GitRepoFixture.RunGit(repo.RepoDir, "branch", "-m", "main");
var (parentId, _, _) = await SeedPlanningWithTwoNonConflictingChildrenAsync(db, repo);
File.WriteAllText(Path.Combine(repo.RepoDir, "dirty.txt"), "unstaged\n");
var (orch, _) = BuildOrchestrator(db);
var ex = await Assert.ThrowsAsync<InvalidOperationException>(
() => orch.StartAsync(parentId, "main", CancellationToken.None));
Assert.Contains("uncommitted", ex.Message);
}
[Fact]
public async Task StartAsync_IdempotentRestart_SkipsAlreadyMergedWorktrees()
{
var db = NewDb();
var repo = NewRepo();
GitRepoFixture.RunGit(repo.RepoDir, "branch", "-m", "main");
var (parentId, subA, subB) = await SeedPlanningWithTwoNonConflictingChildrenAsync(db, repo);
using (var setup = db.CreateContext())
{
var wt = setup.Worktrees.Single(w => w.TaskId == subA);
wt.State = WorktreeState.Merged;
await setup.SaveChangesAsync();
}
var (orch, spy) = BuildOrchestrator(db);
await orch.StartAsync(parentId, "main", CancellationToken.None);
Assert.DoesNotContain(spy, c => c.Method == "PlanningSubtaskMerged" && (string)c.Args[1]! == subA);
Assert.Contains(spy, c => c.Method == "PlanningSubtaskMerged" && (string)c.Args[1]! == subB);
Assert.Contains(spy, c => c.Method == "PlanningCompleted");
}
private async Task<(string parentId, string runningChild)> SeedPlanningWithOneRunningChildAsync(
DbFixture db, GitRepoFixture repo)
{
using var ctx = db.CreateContext();
var listId = Guid.NewGuid().ToString();
ctx.Lists.Add(new ListEntity
{
Id = listId, Name = "test", CreatedAt = DateTime.UtcNow, WorkingDir = repo.RepoDir,
});
var parentId = Guid.NewGuid().ToString();
ctx.Tasks.Add(new TaskEntity
{
Id = parentId, ListId = listId, Title = "plan", CreatedAt = DateTime.UtcNow,
Status = TaskStatus.Planned, SortOrder = 0,
});
var running = Guid.NewGuid().ToString();
ctx.Tasks.Add(new TaskEntity
{
Id = running, ListId = listId, Title = "still running",
CreatedAt = DateTime.UtcNow, ParentTaskId = parentId,
Status = TaskStatus.Running, SortOrder = 1,
});
await ctx.SaveChangesAsync();
SeedWorktreeWithFile(ctx, repo, running, "fileR.txt", "R\n");
await ctx.SaveChangesAsync();
return (parentId, running);
}
}