feat(FN-5353): wire fresh-worktree-acquire to ActivityLogModal

2026-05-20 10:53:31 -07:00
parent 7df11bc2cf
commit 1b7f492227
3 changed files with 10 additions and 0 deletions
--- a/packages/engine/src/merger.ts
+++ b/packages/engine/src/merger.ts
@@ -6471,6 +6471,13 @@ export async function aiMergeTask(
      },
      acquisition.worktreePath,
    );
+    await store.recordActivity({
+      type: "task:merge-worktree-reacquired",
+      taskId,
+      taskTitle: task.title,
+      details: `Merge worktree reacquired: ${reason}`,
+      metadata: { reason, branch: acquisition.branch, worktreePath: acquisition.worktreePath, source: acquisition.source },
+    });
  };
  if (
    settings.worktrunk?.enabled === true