feat(FN-4485): complete Step 2 — tighten branch conflict classifier

Fusion-Task-Id: FN-4485 Fusion-Task-Lineage: 034088dc-ebc4-4e12-8314-39419d41b23f
2026-05-14 10:45:19 -07:00
parent f35edfbfb6
commit e01d2ef04f
5 changed files with 224 additions and 11 deletions
--- a/packages/engine/src/worktree-pool.ts
+++ b/packages/engine/src/worktree-pool.ts
@@ -264,6 +264,7 @@ export class WorktreePool {
        branchName,
        conflictingWorktreePath: conflictingPath,
        requestingTaskId: options?.requestingTaskId ?? taskId,
+        ownerTaskId: taskId,
        startPoint: base,
      });
      if (inspection.kind === "stale" || inspection.kind === "stale-resolved") {