From ed1203c4ab0ceba09966a7d86d3fff2500f9434b Mon Sep 17 00:00:00 2001
From: sixsmith <earthseawizard@proton.me>
Date: Fri, 9 Oct 2026 21:26:57 -0400
Subject: [PATCH 1/2] build: separate Go unit and integration test targets

Pass ARGS through make run and add integration test discovery.
---
 Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b46181de..9a1a424c 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ export GOPRIVATE=coopcloud.tech
 all: format check build
 
 run:
-	@go run -gcflags=$(GCFLAGS) -ldflags=$(LDFLAGS) $(ABRA)
+	@go run -gcflags=$(GCFLAGS) -ldflags=$(LDFLAGS) $(ABRA) $(ARGS)
 
 install:
 	@go install -gcflags=$(GCFLAGS) -ldflags=$(LDFLAGS) $(ABRA)
@@ -40,11 +40,17 @@ check:
 	(echo "gofmt: formatting issue - run 'make format' to resolve" && exit 1)
 
 test:
-	@go test ./... -cover -v -p 1
+	@go test ./... -short -cover -v -p 1
+
+integration-test:
+	@go test ./... -short=false -failfast -cover -v -p 1 -count=1
 
 find-tests:
 	@find . -name "*_test.go"
 
+find-integration-test:
+	@find . -iname "*_e2e_test.go"
+
 loc:
 	@find . -name "*.go" | xargs wc -l
 
-- 
2.54.0


From 1bb1aea43534e5a94a0a26519794932811cdbe34 Mon Sep 17 00:00:00 2001
From: sixsmith <earthseawizard@proton.me>
Date: Fri, 9 Oct 2026 21:26:57 -0400
Subject: [PATCH 2/2] nix: include Bats and integration test libraries

---
 flake.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/flake.nix b/flake.nix
index fdc35b22..a187ec81 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,11 @@
           packages = with pkgs; [
             go_1_26
             gnumake
+            (bats.withLibraries (libraries: [
+              libraries.bats-support
+              libraries.bats-assert
+              libraries.bats-file
+            ]))
           ];
         };
       }
-- 
2.54.0