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

Merge branch 'claudedo/75514ee68371402b814638290af47cca'

Browse Source
This commit is contained in:
mika kuns
2026-08-06 12:11:38 +02:00
parent 0358bcf8b2 5d1d2d89d0
commit 20bce9b424
15 changed files with 379 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ClaudeDo.Worker/External/ExternalMcpService.cs
Vendored
+4 -1
View File
@@ -529,7 +529,10 @@ public sealed class ExternalMcpService
// pre-merge worktree/commit range at this point, so "did it contribute anything"
// reflects the review range the reviewer is about to approve.
emptyChildren = await GetEmptyDoneChildrenAsync(taskId, cancellationToken);
await _planningMerge.StartAsync(taskId, targetBranch ?? "", cancellationToken);
// externallyDriven: true — this call came from an MCP session, not the UI's
// Approve button. A unit-merge conflict must not auto-open the in-app resolver;
// the driving session resolves it via continue_merge/abort_merge instead.
await _planningMerge.StartAsync(taskId, targetBranch ?? "", cancellationToken, externallyDriven: true);
var parentDone = (await _tasks.GetByIdAsync(taskId, cancellationToken))!.Status == TaskStatus.Done;
mergeStatus = parentDone ? TaskMergeService.StatusMerged : TaskMergeService.StatusConflict;
if (!parentDone)