Claim a held merge as soon as the merge ahead of it finishes

2026-10-21 09:02:45 -07:00
parent a130b9556d
commit cdfc148ba9
6 changed files with 205 additions and 36 deletions
@@ -71,6 +71,7 @@ func (m *Manager) continueFromHandoff(sessionID, handoff string) {
 	err := m.handoff(ctx, sessionID, handoff)
 	if err != nil {
 		slog.Error("continue from handoff", "session", sessionID, "err", err)
+		m.advanceSessionMergeClaim(ctx, sessionID)
 	}
 }