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

feat(worker): add PlanningMergeOrchestrator.AbortAsync

Browse Source
This commit is contained in:
mika kuns
2026-04-24 18:18:49 +02:00
parent 7d87c03cfa
commit b9896399fa
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ClaudeDo.Worker/Planning/PlanningMergeOrchestrator.cs
View File

@@ -82,6 +82,16 @@ public sealed class PlanningMergeOrchestrator
await DrainAsync(planningTaskId, ct);
}
public async Task AbortAsync(string planningTaskId, CancellationToken ct)
{
if (!_states.TryGetValue(planningTaskId, out var state) || state.CurrentSubtaskId is null)
throw new InvalidOperationException("no in-progress merge to abort");
await _merge.AbortMergeAsync(state.CurrentSubtaskId, ct);
_states.TryRemove(planningTaskId, out _);
await _broadcaster.PlanningMergeAborted(planningTaskId);
}
private async Task DrainAsync(string planningTaskId, CancellationToken ct)
{
if (!_states.TryGetValue(planningTaskId, out var state)) return;

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

@@ -216,6 +216,35 @@ public sealed class PlanningMergeOrchestratorTests : IDisposable
});
}
[Fact]
public async Task AbortAsync_AfterConflict_RestoresCleanRepoAndClearsState()
{
var db = NewDb();
var repo = NewRepo();
GitRepoFixture.RunGit(repo.RepoDir, "branch", "-m", "main");
var (parentId, subA, subB, _) = await SeedPlanningThreeChildrenMiddleConflictsAsync(db, repo);
var (orch, spy) = BuildOrchestrator(db);
await orch.StartAsync(parentId, "main", CancellationToken.None);
await orch.AbortAsync(parentId, CancellationToken.None);
using var ctx = db.CreateContext();
// Planning stays in Planned — NOT flipped to Done.
Assert.Equal(TaskStatus.Planned, ctx.Tasks.Single(t => t.Id == parentId).Status);
// Earlier successful merge stays merged.
Assert.Equal(WorktreeState.Merged, ctx.Worktrees.Single(w => w.TaskId == subA).State);
// Conflicted subtask's worktree stays Active (abort doesn't flip it).
Assert.Equal(WorktreeState.Active, ctx.Worktrees.Single(w => w.TaskId == subB).State);
Assert.Contains(spy, c => c.Method == "PlanningMergeAborted" && (string)c.Args[0]! == parentId);
// Repo no longer mid-merge.
var git = new GitService();
Assert.False(await git.IsMidMergeAsync(repo.RepoDir, CancellationToken.None));
}
private (PlanningMergeOrchestrator orch, List<(string Method, object?[] Args)> calls) BuildOrchestrator(DbFixture db)
{
var fakeHub = new OrchestratorFakeHubContext();