Hold a task's merge while another task in the project is merging

2026-10-15 12:11:35 -07:00
parent ff22f33025
commit 606cf4b5c0
16 changed files with 546 additions and 190 deletions
@@ -387,12 +387,12 @@ func (s *Server) MergeTask(w http.ResponseWriter, r *http.Request, taskID string
 		return
 	}

-	sess, err := s.agents.Merge(r.Context(), t, p, u)
+	t, err = s.agents.Merge(r.Context(), t, p, u)
 	if err != nil {
 		writeAgentError(w, err)
 		return
 	}
-	writeJSON(w, http.StatusAccepted, sess)
+	writeJSON(w, http.StatusAccepted, t)
 }

 func (s *Server) MergeIn(w http.ResponseWriter, r *http.Request, taskID string) {