Merge remote-tracking branch 'origin/main'

apps/api/internal/httpapi/handlers.go

@@ -1598,6 +1598,10 @@ func boolValue(body map[string]any, key string) bool {
 func (s *Server) getTask(w http.ResponseWriter, r *http.Request) {
 	task, err := s.store.GetTask(r.Context(), r.PathValue("taskID"))
 	if err == nil {
+		cancelState := runner.DescribeTaskCancellation(task)
+		task.Cancellable = &cancelState.Cancellable
+		task.Submitted = &cancelState.Submitted
+		task.Message = cancelState.Message
 		writeJSON(w, http.StatusOK, task)
 		return
 	}