Add Merge & continue and Other… to ready cards

2026-10-20 11:01:59 -07:00
parent 25f275e012
commit ef98b1179d
13 changed files with 363 additions and 88 deletions
@@ -504,6 +504,23 @@ func (s *Server) MergeTask(w http.ResponseWriter, r *http.Request, taskID string
 		writeError(w, http.StatusBadRequest, fmt.Errorf("unknown target %q", *req.Target))
 		return
 	}
+	if req.KeepOpen != nil && *req.KeepOpen {
+		if (req.Target != nil && *req.Target != api.MergeTargetMain) || (req.AfterReview != nil && *req.AfterReview) {
+			writeError(w, http.StatusBadRequest, errors.New("keep_open is only for target main, without after_review"))
+			return
+		}
+		if req.MergeTitle == nil {
+			writeError(w, http.StatusBadRequest, errors.New("merge_title is required to merge into the default branch"))
+			return
+		}
+		t, err = s.agents.MergeToMain(r.Context(), t, p, u, *req.MergeTitle)
+		if err != nil {
+			writeAgentError(w, err)
+			return
+		}
+		writeJSON(w, http.StatusAccepted, t)
+		return
+	}
 	if req.AfterReview != nil && *req.AfterReview {
 		target := api.MergeTargetMain
 		if req.Target != nil {