Remove UUID handling and fix unit test

Author: sebastianrath

.github/workflows/graphs/build-test-publish.act

@@ -199,7 +199,11 @@ nodes:
                     else
                         P4_LIB="$(pwd)/p4api/windows-x86_64/lib"
                         P4_CGO_CPPFLAGS="-I$P4_INCLUDE -DOS_NT"
-                        P4_CGO_LDFLAGS="-L$P4_LIB -lp4api -lssl -lcrypto -lcrypt32 -lws2_32 -lole32 -lshell32 -luser32 -ladvapi32"
+                        SSL_LIB="$(pwd)/p4api/ssl-windows-x64/lib"
+                        # Install Perl modules and make required by OpenSSL's Configure script
+                        pacman -S --noconfirm --needed make perl-IPC-Cmd
+                        bash setup-openssl.sh windows x64 "$SSL_LIB"
+                        P4_CGO_LDFLAGS="-L$P4_LIB -lp4api $SSL_LIB/libssl.a $SSL_LIB/libcrypto.a -lcrypt32 -lws2_32 -lole32 -lshell32 -luser32 -ladvapi32"
                     fi
                     ;;
             esac

.github/workflows/workflow.yml

@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         license: [free]  # add pro when ready
-        os: [windows-latest, ubuntu-latest, ubuntu-24.04-arm, macos-latest]
+        os: [windows-latest]
 
     runs-on: ${{ matrix.os }}
 

agent/client.go

@@ -12,7 +12,6 @@ import (
 type Client struct {
 	serverURL  string
 	token      string
-	uuid       string
 	httpClient *http.Client
 }
 
@@ -26,10 +25,6 @@ func NewClient(serverURL, token string) *Client {
 	}
 }
 
-func (c *Client) SetUUID(uuid string) {
-	c.uuid = uuid
-}
-
 func (c *Client) doRequest(method, path string, body interface{}) (*http.Response, error) {
 	var bodyReader io.Reader
 	if body != nil {
@@ -45,9 +40,6 @@ func (c *Client) doRequest(method, path string, body interface{}) (*http.Respons
 		return nil, err
 	}
 	req.Header.Set("Authorization", "Bearer "+c.token)
-	if c.uuid != "" {
-		req.Header.Set("X-Agent-UUID", c.uuid)
-	}
 	if body != nil {
 		req.Header.Set("Content-Type", "application/json")
 	}

agent/flock_unix.go

@@ -74,7 +74,6 @@ type StatusReport struct {
 
 // HeartbeatRequest is sent periodically with agent metrics.
 type HeartbeatRequest struct {
-	UUID          string  `json:"uuid,omitempty"`
 	CPUPercent    float64 `json:"cpu_percent"`
 	MemPercent    float64 `json:"mem_percent"`
 	MemUsedBytes  int64   `json:"mem_used_bytes"`

agent/flock_windows.go

@@ -3,7 +3,6 @@ package agent
 import (
 	"bufio"
 	"context"
-	"crypto/rand"
 	"fmt"
 	"os"
 	"os/exec"
@@ -25,106 +24,27 @@ type Worker struct {
 	docker       DockerConfig
 	vcsOpts      vcs.Options
 	pollInterval time.Duration
-	uuid         string
-	slotCleanup  func()
 	log          *logrus.Entry
 
 	metricsMu    sync.Mutex
 	lastCounters *RawCounters
 }
 
 func NewWorker(client *Client, docker DockerConfig, vcsOpts vcs.Options) *Worker {
-	uuid, cleanup := acquireAgentSlot()
-	client.SetUUID(uuid)
 	return &Worker{
 		client:       client,
 		docker:       docker,
 		vcsOpts:      vcsOpts,
 		pollInterval: 1 * time.Second,
-		uuid:         uuid,
-		slotCleanup:  cleanup,
 		log:          logrus.WithField("component", "agent"),
 	}
 }
 
-// agentSlotDir returns the directory for agent UUID slot files.
-func agentSlotDir() string {
-	dir, err := os.UserConfigDir()
-	if err != nil {
-		dir = os.TempDir()
-	}
-	return filepath.Join(dir, "actionforge")
-}
-
-// acquireAgentSlot finds and locks the lowest available agent slot.
-// Each slot has a persistent UUID file and a lock file. When the process
-// exits, the lock is released so the next process can reuse that slot
-// (and its UUID/metrics history).
-// Returns the UUID and a cleanup function that releases the lock.
-func acquireAgentSlot() (string, func()) {
-	dir := agentSlotDir()
-	_ = os.MkdirAll(dir, 0700)
-
-	const maxSlots = 256
-	for i := 0; i < maxSlots; i++ {
-		lockPath := filepath.Join(dir, fmt.Sprintf("agent-%d.lock", i))
-		uuidPath := filepath.Join(dir, fmt.Sprintf("agent-%d.uuid", i))
-
-		lockFile, err := os.OpenFile(lockPath, os.O_CREATE|os.O_RDWR, 0600)
-		if err != nil {
-			continue
-		}
-
-		if err := lockFileExclusive(lockFile); err != nil {
-			if cerr := lockFile.Close(); cerr != nil {
-				logrus.WithError(cerr).Warn("failed to close lock file")
-			}
-			continue
-		}
-
-		// Slot acquired — read or generate UUID
-		uuid := ""
-		if data, err := os.ReadFile(uuidPath); err == nil {
-			if id := strings.TrimSpace(string(data)); len(id) == 36 {
-				uuid = id
-			}
-		}
-		if uuid == "" {
-			var buf [16]byte
-			_, _ = rand.Read(buf[:])
-			buf[6] = (buf[6] & 0x0f) | 0x40 // version 4
-			buf[8] = (buf[8] & 0x3f) | 0x80 // variant 1
-			uuid = fmt.Sprintf("%08x-%04x-%04x-%04x-%012x",
-				buf[0:4], buf[4:6], buf[6:8], buf[8:10], buf[10:16])
-			_ = os.WriteFile(uuidPath, []byte(uuid+"\n"), 0600)
-		}
-
-		cleanup := func() {
-			unlockFile(lockFile)
-			if cerr := lockFile.Close(); cerr != nil {
-				logrus.WithError(cerr).Warn("failed to close lock file")
-			}
-		}
-		return uuid, cleanup
-	}
-
-	// Fallback: all slots taken, generate ephemeral UUID with no lock
-	var buf [16]byte
-	_, _ = rand.Read(buf[:])
-	buf[6] = (buf[6] & 0x0f) | 0x40
-	buf[8] = (buf[8] & 0x3f) | 0x80
-	return fmt.Sprintf("%08x-%04x-%04x-%04x-%012x",
-		buf[0:4], buf[4:6], buf[6:8], buf[8:10], buf[10:16]), func() {}
-}
-
 // maxConsecutiveErrors is the number of consecutive connection errors before
 // Run returns ErrConnectionLost so the caller can decide to restart.
 const maxConsecutiveErrors = 10
 
 func (w *Worker) Run(ctx context.Context) error {
-	if w.slotCleanup != nil {
-		defer w.slotCleanup()
-	}
 	w.log.Info("starting")
 
 	// Take initial snapshot for delta computation
@@ -632,13 +552,13 @@ func (w *Worker) buildHeartbeatRequest() HeartbeatRequest {
 	snap, err := Snapshot()
 	if err != nil {
 		w.log.WithError(err).Warn("metrics snapshot error")
-		return HeartbeatRequest{UUID: w.uuid}
+		return HeartbeatRequest{}
 	}
 
 	w.metricsMu.Lock()
 	defer w.metricsMu.Unlock()
 
-	req := HeartbeatRequest{UUID: w.uuid}
+	req := HeartbeatRequest{}
 	if w.lastCounters != nil {
 		// CPU percent
 		if snap.CPUInstant {

agent/models.go

@@ -1,3 +1,23 @@
-//depot/pong/background.jpg#1 - add change 3 (binary+F)
-//depot/pong/build-pong-game.act#1 - add change 3 (text)
-//depot/pong/tutorial-readme.md#1 - add change 3 (text)
+build hasn't expired yet
+looking for value: 'env_file'
+  no value (is optional) found for: 'env_file'
+looking for value: 'config_file'
+  no value (is optional) found for: 'config_file'
+looking for value: 'concurrency'
+  no value (is optional) found for: 'concurrency'
+looking for value: 'graph_file'
+  no value (is optional) found for: 'graph_file'
+looking for value: 'session_token'
+  no value (is optional) found for: 'session_token'
+looking for value: 'create_debug_session'
+  found value in flags
+  evaluated to: 'false'
+PushNodeVisit: start, execute: true
+🟢 Execute 'P4 Run (list-files)'
+PushNodeVisit: list-files, execute: true
+🟢 Execute 'Print (print-result)'
+PushNodeVisit: print-result, execute: true
+PushNodeVisit: (cached) list-files, execute: false
+[REDACTED]/background.jpg#1 - add change 3 (binary+F)
+[REDACTED]/build-pong-game.act#2 - edit change 4 (text)
+[REDACTED]/tutorial-readme.md#1 - add change 3 (text)