From a4795d68fc5381f1ff48d043fe7554355e5899fb Mon Sep 17 00:00:00 2001
From: Peter Stone <thepeterstone@gmail.com>
Date: Wed, 18 Mar 2026 07:54:27 +0000
Subject: fix: address final container execution issues and cleanup review docs

---
 internal/cli/run.go   | 32 ++++++++++++++++++++++----------
 internal/cli/serve.go | 39 ++++++++++++++++++++++++---------------
 2 files changed, 46 insertions(+), 25 deletions(-)

(limited to 'internal/cli')

diff --git a/internal/cli/run.go b/internal/cli/run.go
index 9663bc5..cfac893 100644
--- a/internal/cli/run.go
+++ b/internal/cli/run.go
@@ -72,22 +72,34 @@ func runTasks(file string, parallel int, dryRun bool) error {
 
 	logger := newLogger(verbose)
 
+	apiURL := "http://localhost" + cfg.ServerAddr
+	if len(cfg.ServerAddr) > 0 && cfg.ServerAddr[0] != ':' {
+		apiURL = "http://" + cfg.ServerAddr
+	}
+
 	runners := map[string]executor.Runner{
 		"claude": &executor.ContainerRunner{
-			Image:    cfg.ClaudeImage,
-			Logger:   logger,
-			LogDir:   cfg.LogDir,
-			APIURL:   "http://" + cfg.ServerAddr,
-			DropsDir: cfg.DropsDir,
+			Image:        cfg.ClaudeImage,
+			Logger:       logger,
+			LogDir:       cfg.LogDir,
+			APIURL:       apiURL,
+			DropsDir:     cfg.DropsDir,
+			SSHAuthSock:  cfg.SSHAuthSock,
+			ClaudeBinary: cfg.ClaudeBinaryPath,
+			GeminiBinary: cfg.GeminiBinaryPath,
 		},
 		"gemini": &executor.ContainerRunner{
-			Image:    cfg.GeminiImage,
-			Logger:   logger,
-			LogDir:   cfg.LogDir,
-			APIURL:   "http://" + cfg.ServerAddr,
-			DropsDir: cfg.DropsDir,
+			Image:        cfg.GeminiImage,
+			Logger:       logger,
+			LogDir:       cfg.LogDir,
+			APIURL:       apiURL,
+			DropsDir:     cfg.DropsDir,
+			SSHAuthSock:  cfg.SSHAuthSock,
+			ClaudeBinary: cfg.ClaudeBinaryPath,
+			GeminiBinary: cfg.GeminiBinaryPath,
 		},
 	}
+
 	pool := executor.NewPool(parallel, runners, store, logger)
 	if cfg.GeminiBinaryPath != "" {
 		pool.Classifier = &executor.Classifier{GeminiBinaryPath: cfg.GeminiBinaryPath}
diff --git a/internal/cli/serve.go b/internal/cli/serve.go
index 33715ee..2ee020d 100644
--- a/internal/cli/serve.go
+++ b/internal/cli/serve.go
@@ -77,25 +77,34 @@ func serve(addr string) error {
 
 	runners := map[string]executor.Runner{
 		"claude": &executor.ContainerRunner{
-			Image:    cfg.ClaudeImage,
-			Logger:   logger,
-			LogDir:   cfg.LogDir,
-			APIURL:   apiURL,
-			DropsDir: cfg.DropsDir,
+			Image:        cfg.ClaudeImage,
+			Logger:       logger,
+			LogDir:       cfg.LogDir,
+			APIURL:       apiURL,
+			DropsDir:     cfg.DropsDir,
+			SSHAuthSock:  cfg.SSHAuthSock,
+			ClaudeBinary: cfg.ClaudeBinaryPath,
+			GeminiBinary: cfg.GeminiBinaryPath,
 		},
 		"gemini": &executor.ContainerRunner{
-			Image:    cfg.GeminiImage,
-			Logger:   logger,
-			LogDir:   cfg.LogDir,
-			APIURL:   apiURL,
-			DropsDir: cfg.DropsDir,
+			Image:        cfg.GeminiImage,
+			Logger:       logger,
+			LogDir:       cfg.LogDir,
+			APIURL:       apiURL,
+			DropsDir:     cfg.DropsDir,
+			SSHAuthSock:  cfg.SSHAuthSock,
+			ClaudeBinary: cfg.ClaudeBinaryPath,
+			GeminiBinary: cfg.GeminiBinaryPath,
 		},
 		"container": &executor.ContainerRunner{
-			Image:    "claudomator-agent:latest",
-			Logger:   logger,
-			LogDir:   cfg.LogDir,
-			APIURL:   apiURL,
-			DropsDir: cfg.DropsDir,
+			Image:        "claudomator-agent:latest",
+			Logger:       logger,
+			LogDir:       cfg.LogDir,
+			APIURL:       apiURL,
+			DropsDir:     cfg.DropsDir,
+			SSHAuthSock:  cfg.SSHAuthSock,
+			ClaudeBinary: cfg.ClaudeBinaryPath,
+			GeminiBinary: cfg.GeminiBinaryPath,
 		},
 	}
 
-- 
cgit v1.2.3