lock ordering

Author: breardon2011

backend/controllers/github_comment.go

@@ -6,6 +6,7 @@ import (
 	"log/slog"
 	"os"
 	"runtime/debug"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -415,6 +416,12 @@ func handleIssueCommentEvent(gh utils.GithubClientProvider, payload *github.Issu
 			"command", *diggerCommand,
 		)
 
+		// Sort projects by name to ensure consistent lock ordering across PRs
+		// This prevents deadlocks when multiple PRs affect the same projects
+		slices.SortFunc(impactedProjectsForComment, func(a, b digger_config.Project) int {
+			return strings.Compare(a.Name, b.Name)
+		})
+
 		for _, project := range impactedProjectsForComment {
 			prLock := locking.PullRequestLock{
 				InternalLock: locking2.BackendDBLock{

backend/controllers/github_pull_request.go

@@ -9,6 +9,7 @@ import (
 	"runtime/debug"
 	"slices"
 	"strconv"
+	"strings"
 
 	"github.com/diggerhq/digger/backend/ci_backends"
 	config2 "github.com/diggerhq/digger/backend/config"
@@ -321,6 +322,12 @@ func handlePullRequestEvent(gh utils.GithubClientProvider, payload *github.PullR
 			"command", *diggerCommand,
 		)
 
+		// Sort projects by name to ensure consistent lock ordering across PRs
+		// This prevents deadlocks when multiple PRs affect the same projects
+		slices.SortFunc(impactedProjects, func(a, b digger_config.Project) int {
+			return strings.Compare(a.Name, b.Name)
+		})
+
 		for _, project := range impactedProjects {
 			prLock := locking.PullRequestLock{
 				InternalLock: locking2.BackendDBLock{

sandbox-sidecar/templates/build-all.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import "dotenv/config";
 import { Template, defaultBuildLogger } from "e2b";
 import { terraformTemplate } from "./terraform-template.ts";

sandbox-sidecar/templates/build-barebones.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import "dotenv/config";
 import { Template, defaultBuildLogger } from "e2b";
 

sandbox-sidecar/templates/build.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 // build.ts
 import { Template, defaultBuildLogger } from "e2b";
 import { template } from "./test-template.ts";