coder
diff --git a/‎agent/api.go
Lines changed: 1 addition & 1 deletion b/‎agent/api.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎agent/files.go
Lines changed: 26 additions & 15 deletions b/‎agent/files.go
Lines changed: 26 additions & 15 deletions
@@ -62,7 +62,7 @@ func (a *agent) apiHandler() http.Handler {
 	r.Post("/api/v0/list-directory", a.HandleLS)
 	r.Get("/api/v0/read-file", a.HandleReadFile)
 	r.Post("/api/v0/write-file", a.HandleWriteFile)
-	r.Post("/api/v0/edit-file", a.HandleEditFile)
+	r.Post("/api/v0/edit-files", a.HandleEditFiles)
 	r.Get("/debug/logs", a.HandleHTTPDebugLogs)
 	r.Get("/debug/magicsock", a.HandleHTTPDebugMagicsock)
 	r.Get("/debug/magicsock/debug-logging/{state}", a.HandleHTTPMagicsockDebugLoggingState)
 
@@ -170,40 +170,51 @@ func (a *agent) writeFile(ctx context.Context, r *http.Request, path string) (HT
 	return 0, nil
 }
 
-func (a *agent) HandleEditFile(rw http.ResponseWriter, r *http.Request) {
+func (a *agent) HandleEditFiles(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	query := r.URL.Query()
-	parser := httpapi.NewQueryParamParser().RequiredNotEmpty("path")
-	path := parser.String(query, "", "path")
-	parser.ErrorExcessParams(query)
-	if len(parser.Errors) > 0 {
+	var req workspacesdk.FileEditRequest
+	if !httpapi.Read(ctx, rw, r, &req) {
+		return
+	}
+
+	if len(req.Files) == 0 {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
-			Message:     "Query parameters have invalid values.",
-			Validations: parser.Errors,
+			Message: "must specify at least one file",
 		})
 		return
 	}
 
-	var edits workspacesdk.FileEditRequest
-	if !httpapi.Read(ctx, rw, r, &edits) {
-		return
+	var combinedErr error
+	status := http.StatusOK
+	for _, edit := range req.Files {
+		s, err := a.editFile(r.Context(), edit.Path, edit.Edits)
+		// Keep the highest response status, so 500 will be preferred over 400, etc.
+		if s > status {
+			status = s
+		}
+		if err != nil {
+			combinedErr = errors.Join(combinedErr, err)
+		}
 	}
 
-	status, err := a.editFile(r.Context(), path, edits.Edits)
-	if err != nil {
+	if combinedErr != nil {
 		httpapi.Write(ctx, rw, status, codersdk.Response{
-			Message: err.Error(),
+			Message: combinedErr.Error(),
 		})
 		return
 	}
 
 	httpapi.Write(ctx, rw, http.StatusOK, codersdk.Response{
-		Message: fmt.Sprintf("Successfully edited %q", path),
+		Message: "Successfully edited file(s)",
 	})
 }
 
 func (a *agent) editFile(ctx context.Context, path string, edits []workspacesdk.FileEdit) (int, error) {
+	if path == "" {
+		return http.StatusBadRequest, xerrors.New("\"path\" is required")
+	}
+
 	if !filepath.IsAbs(path) {
 		return http.StatusBadRequest, xerrors.Errorf("file path must be absolute: %q", path)
 	}