Fix Windows agentd detection - use correct path C:\\ProgramData\\Agentd\\agentd-service.exe

Author: billyb2

.direnv/flake-profile

@@ -0,0 +1 @@
+flake-profile-2-link

.direnv/flake-profile-2-link

@@ -0,0 +1 @@
+/nix/store/vsdzic8q5wvzc6fby3y4xxg2rd6f8yjf-api-devshell-env

.dockerignore

@@ -0,0 +1,11 @@
+*.log
+dist/
+/cli
+/bin
+/depot
+
+node_modules
+
+/CHANGELOG.md
+go.work
+go.work.sum

.envrc

@@ -0,0 +1,11 @@
+export NIXPKGS_ALLOW_UNFREE=1;
+use_impure_flake() {
+  watch_file flake.nix
+  watch_file flake.lock
+  mkdir -p "$(direnv_layout_dir)"
+  # 1password-cli is closed source
+  eval "$(nix --extra-experimental-features "nix-command flakes" print-dev-env --profile "$(direnv_layout_dir)/flake-profile" --impure "$@")"
+  nix --extra-experimental-features "nix-command flakes" profile wipe-history --profile "$(direnv_layout_dir)/flake-profile"
+}
+
+use impure_flake;

.github/workflows/test-depot-detection.yml

@@ -52,11 +52,15 @@ jobs:
         echo "=== DEPOT WINDOWS RUNNER TEST ==="
         echo "Hostname: $(hostname)"
         
-        # Build CLI
+        # Build CLI and test program
         go build -o depot-test.exe ./cmd/depot
+        go build -o test-detection.exe ./cmd/test-detection
         
         # Run with debug
         export DEPOT_DEBUG_DETECTION=1
+        echo -e "\n--- Running detection test ---"
+        ./test-detection.exe || true
+        
         echo -e "\n--- Running depot version ---"
         ./depot-test.exe version || true
         
@@ -65,9 +69,7 @@ jobs:
       run: |
         Write-Host "`n--- Manual agentd check ---"
         $paths = @(
-          "C:\Program Files\Depot\agentd.exe",
-          "C:\ProgramData\Depot\agentd.exe",
-          "C:\usr\local\bin\agentd.exe"
+          "C:\ProgramData\Agentd\agentd-service.exe"
         )
         foreach ($path in $paths) {
           if (Test-Path $path) {
@@ -158,9 +160,7 @@ jobs:
       run: |
         Write-Host "`n--- Manual agentd check ---"
         $paths = @(
-          "C:\Program Files\Depot\agentd.exe",
-          "C:\ProgramData\Depot\agentd.exe",
-          "C:\usr\local\bin\agentd.exe"
+          "C:\ProgramData\Agentd\agentd-service.exe"
         )
         foreach ($path in $paths) {
           if (Test-Path $path) {

Oops.rej

@@ -0,0 +1,10 @@
+@@ -319,7 +319,7 @@
+ 						PrintBuildURL(build.BuildURL, options.progress)
+ 					}()
+ 
+-					options.builderOptions = []builder.Option{builder.WithDepotOptions(buildPlatform, build)}
++					options.builderOptions = []builder.Option{builder.WithDepotOptions(buildPlatform, build, false)}
+ 
+ 					buildProject := build.BuildProject()
+ 					if buildProject != "" {
+\ No newline at end of line

TESTING_DEPOT_DETECTION.md

@@ -0,0 +1,102 @@
+# Testing Depot GHA Detection
+
+This document outlines how to test the Depot GitHub Actions runner detection feature.
+
+## What We're Testing
+
+The CLI now detects when it's running on a Depot GitHub Actions runner and automatically requests private IP addresses for builder connections. This improves performance by using internal networking instead of public internet.
+
+## Detection Method
+
+The detection checks for the `agentd` binary in OS-specific locations:
+
+- **Linux**: `/usr/local/bin/agentd`
+- **macOS**: `/usr/local/bin/agentd`
+- **Windows**: 
+  - `C:\Program Files\Depot\agentd.exe`
+  - `C:\ProgramData\Depot\agentd.exe`
+  - `C:\usr\local\bin\agentd.exe`
+
+## Test Programs
+
+### 1. Standalone Detection Test
+
+```bash
+# Build the test program
+go build -o test-detection ./cmd/test-detection
+
+# Run with debug output
+DEPOT_DEBUG_DETECTION=1 ./test-detection
+```
+
+### 2. Full CLI Test
+
+```bash
+# Build the CLI
+go build -o depot-test ./cmd/depot
+
+# Run any depot command with debug output
+DEPOT_DEBUG_DETECTION=1 ./depot-test build .
+```
+
+## Expected Output
+
+### On Depot Runners
+```
+[DEPOT DEBUG] Starting Depot GHA runner detection on linux/amd64
+[DEPOT DEBUG] Checking for agentd at: /usr/local/bin/agentd
+[DEPOT DEBUG] Found agentd at /usr/local/bin/agentd - Depot runner DETECTED
+[DEPOT DEBUG] Requesting PRIVATE IP for builder connection
+```
+
+### On Regular GitHub/Local Machines
+```
+[DEPOT DEBUG] Starting Depot GHA runner detection on linux/amd64
+[DEPOT DEBUG] Checking for agentd at: /usr/local/bin/agentd
+[DEPOT DEBUG] agentd not found at /usr/local/bin/agentd: stat /usr/local/bin/agentd: no such file or directory
+[DEPOT DEBUG] No agentd found - NOT a Depot runner
+[DEPOT DEBUG] Using default (PUBLIC) IP for builder connection
+```
+
+## GitHub Actions Workflow
+
+A test workflow is available at `.github/workflows/test-depot-detection.yml` that:
+1. Tests on Depot runners (ubuntu, windows, macos)
+2. Tests on regular GitHub runners for comparison
+3. Shows debug output for verification
+
+## Manual Testing Commands
+
+### Windows (PowerShell)
+```powershell
+$env:DEPOT_DEBUG_DETECTION="1"
+.\depot-test.exe version
+
+# Check for agentd manually
+Test-Path "C:\Program Files\Depot\agentd.exe"
+Test-Path "C:\ProgramData\Depot\agentd.exe"
+Test-Path "C:\usr\local\bin\agentd.exe"
+```
+
+### Linux/macOS
+```bash
+export DEPOT_DEBUG_DETECTION=1
+./depot-test version
+
+# Check for agentd manually
+ls -la /usr/local/bin/agentd
+```
+
+## Verification Steps
+
+1. **Build the CLI** with the changes
+2. **Run on Depot runners** - Should detect and request private IPs
+3. **Run on GitHub runners** - Should NOT detect, use public IPs
+4. **Run locally** - Should NOT detect, use public IPs
+5. **Check debug output** matches expected patterns
+
+## Notes
+
+- The debug output is only shown when `DEPOT_DEBUG_DETECTION=1` is set
+- The detection happens during builder connection, not at CLI startup
+- Private IP requests only affect builder connections, not API calls

build-test-binaries.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+set -e
+
+echo "Building test binaries for all platforms..."
+
+# Clean previous builds
+rm -rf test-binaries
+mkdir -p test-binaries
+
+# Build for each platform
+echo "Building Linux amd64..."
+GOOS=linux GOARCH=amd64 go build -o test-binaries/depot-test-linux-amd64 ./cmd/depot
+
+echo "Building Linux arm64..."
+GOOS=linux GOARCH=arm64 go build -o test-binaries/depot-test-linux-arm64 ./cmd/depot
+
+echo "Building Windows amd64..."
+GOOS=windows GOARCH=amd64 go build -o test-binaries/depot-test-windows-amd64.exe ./cmd/depot
+
+echo "Building macOS amd64..."
+GOOS=darwin GOARCH=amd64 go build -o test-binaries/depot-test-darwin-amd64 ./cmd/depot
+
+echo "Building macOS arm64..."
+GOOS=darwin GOARCH=arm64 go build -o test-binaries/depot-test-darwin-arm64 ./cmd/depot
+
+# Also build the standalone detection test
+echo "Building detection test binaries..."
+GOOS=linux GOARCH=amd64 go build -o test-binaries/test-detection-linux-amd64 ./cmd/test-detection
+GOOS=windows GOARCH=amd64 go build -o test-binaries/test-detection-windows-amd64.exe ./cmd/test-detection
+GOOS=darwin GOARCH=amd64 go build -o test-binaries/test-detection-darwin-amd64 ./cmd/test-detection
+GOOS=darwin GOARCH=arm64 go build -o test-binaries/test-detection-darwin-arm64 ./cmd/test-detection
+
+echo "Done! Binaries are in test-binaries/"
+ls -la test-binaries/

cmd/test-detection/main.go

@@ -39,9 +39,7 @@ func main() {
 	switch runtime.GOOS {
 	case "windows":
 		paths = []string{
-			"C:\\Program Files\\Depot\\agentd.exe",
-			"C:\\ProgramData\\Depot\\agentd.exe",
-			"C:\\usr\\local\\bin\\agentd.exe",
+			"C:\\ProgramData\\Agentd\\agentd-service.exe",
 		}
 	case "darwin":
 		paths = []string{