Refuse turns, discard and subtasks while a merge is finalizing

2026-10-16 12:46:28 -07:00
parent 0e52253d07
commit ecfae97d97
11 changed files with 287 additions and 233 deletions
@@ -531,11 +531,7 @@ func (m *Manager) paneFinished(ctx context.Context, f api.Focus) (string, error)
 	if task.Status != api.TaskStatusActive {
 		return "is " + string(task.Status), nil
 	}
-	mergingBy, err := m.store.MergingBy(ctx, task.Id)
-	if err != nil {
-		return "", err
-	}
-	if mergingBy != "" {
+	if task.Merging {
 		return "is merging", nil
 	}
 	if f.Tab != api.TabInbox {