From 45553048501386c480b1355ccbdb1f2c2fc409f4 Mon Sep 17 00:00:00 2001 From: Molecule AI Core-QA Date: Tue, 21 Apr 2026 03:10:09 +0000 Subject: [PATCH] fix(merge): resolve conflict markers in workspace_provision.go line 585 CPProvisioner env mutator error branch was left with unresolved conflict markers after a prior rebase. Resolved to the HEAD-side generic message "plugin env mutator chain failed" which is consistent with the same message used in the Provisioner path (line 107/111). No functional change. Co-Authored-By: Claude Sonnet 4.6 --- workspace-server/internal/handlers/workspace_provision.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/workspace-server/internal/handlers/workspace_provision.go b/workspace-server/internal/handlers/workspace_provision.go index e95b03fb..d364de54 100644 --- a/workspace-server/internal/handlers/workspace_provision.go +++ b/workspace-server/internal/handlers/workspace_provision.go @@ -582,11 +582,7 @@ func (h *WorkspaceHandler) provisionWorkspaceCP(workspaceID, templatePath string if err := h.envMutators.Run(ctx, workspaceID, envVars); err != nil { log.Printf("CPProvisioner: env mutator failed for %s: %v", workspaceID, err) db.DB.ExecContext(ctx, `UPDATE workspaces SET status = 'failed', last_sample_error = $2, updated_at = now() WHERE id = $1`, -<<<<<<< HEAD - workspaceID, "plugin env mutator chain failed") -======= - workspaceID, "provisioning failed") ->>>>>>> f9fff93 (fix(security): replace err.Error() leaks with prod-safe messages (#1206)) + workspaceID, "plugin env mutator chain failed") return }