feat(worker): add PlanningMergeOrchestrator happy path with merge event broadcasts
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
mika kuns
@@ -0,0 +1,170 @@
|
||||
using ClaudeDo.Data;
|
||||
using ClaudeDo.Data.Git;
|
||||
using ClaudeDo.Data.Models;
|
||||
using ClaudeDo.Worker.Hub;
|
||||
using ClaudeDo.Worker.Planning;
|
||||
using ClaudeDo.Worker.Services;
|
||||
using ClaudeDo.Worker.Tests.Infrastructure;
|
||||
using Microsoft.AspNetCore.SignalR;
|
||||
using Microsoft.Extensions.Logging.Abstractions;
|
||||
using TaskStatus = ClaudeDo.Data.Models.TaskStatus;
|
||||
|
||||
namespace ClaudeDo.Worker.Tests.Planning;
|
||||
|
||||
file sealed class OrchestratorRecordingHubClients : IHubClients
|
||||
{
|
||||
public OrchestratorRecordingClientProxy Proxy { get; } = new();
|
||||
public IClientProxy All => Proxy;
|
||||
public IClientProxy AllExcept(IReadOnlyList<string> excludedConnectionIds) => Proxy;
|
||||
public IClientProxy Client(string connectionId) => Proxy;
|
||||
public IClientProxy Clients(IReadOnlyList<string> connectionIds) => Proxy;
|
||||
public IClientProxy Group(string groupName) => Proxy;
|
||||
public IClientProxy GroupExcept(string groupName, IReadOnlyList<string> excludedConnectionIds) => Proxy;
|
||||
public IClientProxy Groups(IReadOnlyList<string> groupNames) => Proxy;
|
||||
public IClientProxy User(string userId) => Proxy;
|
||||
public IClientProxy Users(IReadOnlyList<string> userIds) => Proxy;
|
||||
}
|
||||
|
||||
file sealed class OrchestratorRecordingClientProxy : IClientProxy
|
||||
{
|
||||
public List<(string Method, object?[] Args)> Calls { get; } = new();
|
||||
public Task SendCoreAsync(string method, object?[] args, CancellationToken cancellationToken = default)
|
||||
{
|
||||
Calls.Add((method, args));
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
}
|
||||
|
||||
file sealed class OrchestratorFakeHubContext : IHubContext<WorkerHub>
|
||||
{
|
||||
public OrchestratorRecordingHubClients RecordingClients { get; } = new();
|
||||
public IHubClients Clients => RecordingClients;
|
||||
public IGroupManager Groups => throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public sealed class PlanningMergeOrchestratorTests : IDisposable
|
||||
{
|
||||
private readonly List<DbFixture> _dbs = new();
|
||||
private readonly List<GitRepoFixture> _repos = new();
|
||||
private readonly List<(string repoDir, string wtPath)> _wtCleanups = new();
|
||||
|
||||
private DbFixture NewDb() { var d = new DbFixture(); _dbs.Add(d); return d; }
|
||||
private GitRepoFixture NewRepo() { var r = new GitRepoFixture(); _repos.Add(r); return r; }
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
foreach (var (repo, wt) in _wtCleanups)
|
||||
try { GitRepoFixture.RunGit(repo, "worktree", "remove", "--force", wt); } catch { }
|
||||
foreach (var d in _dbs) try { d.Dispose(); } catch { }
|
||||
foreach (var r in _repos) try { r.Dispose(); } catch { }
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task StartAsync_AllChildrenMergeCleanly_MarksPlanningDoneAndEmitsCompleted()
|
||||
{
|
||||
var db = NewDb();
|
||||
var repo = NewRepo();
|
||||
GitRepoFixture.RunGit(repo.RepoDir, "branch", "-m", "main");
|
||||
|
||||
var (parentId, subA, subB) = await SeedPlanningWithTwoNonConflictingChildrenAsync(db, repo);
|
||||
|
||||
var (orch, calls) = BuildOrchestrator(db);
|
||||
|
||||
await orch.StartAsync(parentId, "main", CancellationToken.None);
|
||||
|
||||
using var ctx = db.CreateContext();
|
||||
var planning = ctx.Tasks.Single(t => t.Id == parentId);
|
||||
Assert.Equal(TaskStatus.Done, planning.Status);
|
||||
Assert.NotNull(planning.FinishedAt);
|
||||
|
||||
Assert.Equal(WorktreeState.Merged, ctx.Worktrees.Single(w => w.TaskId == subA).State);
|
||||
Assert.Equal(WorktreeState.Merged, ctx.Worktrees.Single(w => w.TaskId == subB).State);
|
||||
|
||||
Assert.Contains(calls, c => c.Method == "PlanningMergeStarted");
|
||||
Assert.Equal(2, calls.Count(c => c.Method == "PlanningSubtaskMerged"));
|
||||
Assert.Contains(calls, c => c.Method == "PlanningCompleted" && (string)c.Args[0]! == parentId);
|
||||
}
|
||||
|
||||
private async Task<(string parentId, string subA, string subB)> SeedPlanningWithTwoNonConflictingChildrenAsync(
|
||||
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 subA = Guid.NewGuid().ToString();
|
||||
var subB = Guid.NewGuid().ToString();
|
||||
ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = subA, ListId = listId, Title = "child A", CreatedAt = DateTime.UtcNow,
|
||||
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 1,
|
||||
});
|
||||
ctx.Tasks.Add(new TaskEntity
|
||||
{
|
||||
Id = subB, ListId = listId, Title = "child B", CreatedAt = DateTime.UtcNow,
|
||||
ParentTaskId = parentId, Status = TaskStatus.Done, SortOrder = 2,
|
||||
});
|
||||
await ctx.SaveChangesAsync();
|
||||
|
||||
SeedWorktree(ctx, repo, subA, "fileA.txt", "content A");
|
||||
SeedWorktree(ctx, repo, subB, "fileB.txt", "content B");
|
||||
await ctx.SaveChangesAsync();
|
||||
|
||||
return (parentId, subA, subB);
|
||||
}
|
||||
|
||||
private void SeedWorktree(ClaudeDoDbContext ctx, GitRepoFixture repo, string taskId, string filename, string content)
|
||||
{
|
||||
var wtPath = Path.Combine(Path.GetTempPath(), $"wt_{Guid.NewGuid():N}");
|
||||
_wtCleanups.Add((repo.RepoDir, wtPath));
|
||||
var branch = $"claudedo/{taskId[..8]}";
|
||||
GitRepoFixture.RunGit(repo.RepoDir, "worktree", "add", "-b", branch, wtPath, repo.BaseCommit);
|
||||
File.WriteAllText(Path.Combine(wtPath, filename), content);
|
||||
GitRepoFixture.RunGit(wtPath, "add", filename);
|
||||
GitRepoFixture.RunGit(wtPath, "commit", "-m", $"add {filename}");
|
||||
var head = GitRepoFixture.RunGit(wtPath, "rev-parse", "HEAD").Trim();
|
||||
|
||||
ctx.Worktrees.Add(new WorktreeEntity
|
||||
{
|
||||
TaskId = taskId,
|
||||
Path = wtPath,
|
||||
BranchName = branch,
|
||||
BaseCommit = repo.BaseCommit,
|
||||
HeadCommit = head,
|
||||
DiffStat = null,
|
||||
State = WorktreeState.Active,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
});
|
||||
}
|
||||
|
||||
private (PlanningMergeOrchestrator orch, List<(string Method, object?[] Args)> calls) BuildOrchestrator(DbFixture db)
|
||||
{
|
||||
var fakeHub = new OrchestratorFakeHubContext();
|
||||
var spy = fakeHub.RecordingClients.Proxy;
|
||||
var broadcaster = new HubBroadcaster(fakeHub);
|
||||
var git = new GitService();
|
||||
var factory = db.CreateFactory();
|
||||
var merge = new TaskMergeService(
|
||||
factory, git, broadcaster,
|
||||
NullLogger<TaskMergeService>.Instance);
|
||||
var aggregator = new PlanningAggregator(
|
||||
factory, git,
|
||||
NullLogger<PlanningAggregator>.Instance);
|
||||
var orch = new PlanningMergeOrchestrator(
|
||||
factory, merge, aggregator, broadcaster,
|
||||
NullLogger<PlanningMergeOrchestrator>.Instance);
|
||||
return (orch, spy.Calls);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user