fix(planning): return to the list base branch after integration cleanup, not a guessed task branch

This commit is contained in:
mika kuns
2026-10-01 10:55:12 +02:00
parent 8ac272df50
commit cd5b27c063
3 changed files with 53 additions and 6 deletions
@@ -243,9 +243,6 @@ public sealed class WorktreeManager
_logger.LogInformation("Discarded worktree for task {TaskId} (branch {Branch})", wt.TaskId, wt.BranchName);
}
// Improvement children (parent is a non-planning task with its own worktree) branch
// from the parent's recorded HEAD so they build on the parent's not-yet-merged work.
// Planning children and standalone tasks base off the list's current HEAD.
/// <summary>Ticket-Id des Tasks, sonst die seines Parents (Children erben das Ticket ihrer Unit).</summary>
private async Task<int?> ResolveTicketIdAsync(TaskEntity task, CancellationToken ct)
{
@@ -259,6 +256,9 @@ public sealed class WorktreeManager
return TicketStatusMap.ParseBandelTicketId(parentRef);
}
// Improvement children (parent is a non-planning task with its own worktree) branch
// from the parent's recorded HEAD so they build on the parent's not-yet-merged work.
// Planning children and standalone tasks base off list_config.base_branch, else the current HEAD.
private async Task<string> ResolveBaseCommitAsync(TaskEntity task, string workingDir, CancellationToken ct)
{
if (task.ParentTaskId is not null)