From 2ad83421c5c3473b2dcf746f3deada897daca6d3 Mon Sep 17 00:00:00 2001 From: nux Date: Fri, 2 Jan 2026 16:44:32 -0800 Subject: [PATCH] feat(done): Add conflict resolution tracking fields to MR beads (gt-si8rq.7) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add retry_count, last_conflict_sha, and conflict_task_id fields to MR bead descriptions when created via `gt done`. These are initialized at creation time and will be updated by the Refinery when handling merge conflicts. - retry_count: 0 (number of conflict-resolution cycles) - last_conflict_sha: null (SHA of main when conflict occurred) - conflict_task_id: null (link to conflict-resolution task if any) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- internal/cmd/done.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/cmd/done.go b/internal/cmd/done.go index d40c2ba6..45f55f77 100644 --- a/internal/cmd/done.go +++ b/internal/cmd/done.go @@ -225,6 +225,11 @@ func runDone(cmd *cobra.Command, args []string) error { description += fmt.Sprintf("\nagent_bead: %s", agentBeadID) } + // Add conflict resolution tracking fields (initialized, updated by Refinery) + description += "\nretry_count: 0" + description += "\nlast_conflict_sha: null" + description += "\nconflict_task_id: null" + // Create MR bead (ephemeral wisp - will be cleaned up after merge) mrIssue, err := bd.Create(beads.CreateOptions{ Title: title,