From 5814e7d6bdec659bb8ca10cc18447a821c59ad4c Mon Sep 17 00:00:00 2001
From: Peter Stone <thepeterstone@gmail.com>
Date: Wed, 18 Mar 2026 00:52:49 +0000
Subject: fix: comprehensive addressing of container execution review feedback

- Fix Critical Bug 1: Only remove workspace on success, preserve on failure/BLOCKED.
- Fix Critical Bug 2: Use correct Claude flag (--resume) and pass instructions via file.
- Fix Critical Bug 3: Actually mount and use the instructions file in the container.
- Address Design Issue 4: Implement Resume/BLOCKED detection and host-side workspace re-use.
- Address Design Issue 5: Consolidate RepositoryURL to Task level and fix API fallback.
- Address Design Issue 6: Make agent images configurable per runner type via CLI flags.
- Address Design Issue 7: Secure API keys via .claudomator-env file and --env-file flag.
- Address Code Quality 8: Add unit tests for ContainerRunner arg construction.
- Address Code Quality 9: Fix indentation regression in app.js.
- Address Code Quality 10: Clean up orphaned Claude/Gemini runner files and move helpers.
- Fix tests: Update server_test.go and executor_test.go to work with new model.
---
 internal/cli/run.go   | 20 ++++++++++++--------
 internal/cli/serve.go |  6 ++++--
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'internal/cli')

diff --git a/internal/cli/run.go b/internal/cli/run.go
index 49aa28e..9663bc5 100644
--- a/internal/cli/run.go
+++ b/internal/cli/run.go
@@ -73,15 +73,19 @@ func runTasks(file string, parallel int, dryRun bool) error {
 	logger := newLogger(verbose)
 
 	runners := map[string]executor.Runner{
-		"claude": &executor.ClaudeRunner{
-			BinaryPath: cfg.ClaudeBinaryPath,
-			Logger:     logger,
-			LogDir:     cfg.LogDir,
+		"claude": &executor.ContainerRunner{
+			Image:    cfg.ClaudeImage,
+			Logger:   logger,
+			LogDir:   cfg.LogDir,
+			APIURL:   "http://" + cfg.ServerAddr,
+			DropsDir: cfg.DropsDir,
 		},
-		"gemini": &executor.GeminiRunner{
-			BinaryPath: cfg.GeminiBinaryPath,
-			Logger:     logger,
-			LogDir:     cfg.LogDir,
+		"gemini": &executor.ContainerRunner{
+			Image:    cfg.GeminiImage,
+			Logger:   logger,
+			LogDir:   cfg.LogDir,
+			APIURL:   "http://" + cfg.ServerAddr,
+			DropsDir: cfg.DropsDir,
 		},
 	}
 	pool := executor.NewPool(parallel, runners, store, logger)
diff --git a/internal/cli/serve.go b/internal/cli/serve.go
index 56947bf..33715ee 100644
--- a/internal/cli/serve.go
+++ b/internal/cli/serve.go
@@ -35,6 +35,8 @@ func newServeCmd() *cobra.Command {
 
 	cmd.Flags().StringVar(&addr, "addr", ":8484", "listen address")
 	cmd.Flags().StringVar(&workspaceRoot, "workspace-root", "/workspace", "root directory for listing workspaces")
+	cmd.Flags().StringVar(&cfg.ClaudeImage, "claude-image", cfg.ClaudeImage, "docker image for claude agents")
+	cmd.Flags().StringVar(&cfg.GeminiImage, "gemini-image", cfg.GeminiImage, "docker image for gemini agents")
 
 	return cmd
 }
@@ -75,14 +77,14 @@ func serve(addr string) error {
 
 	runners := map[string]executor.Runner{
 		"claude": &executor.ContainerRunner{
-			Image:    "claudomator-agent:latest",
+			Image:    cfg.ClaudeImage,
 			Logger:   logger,
 			LogDir:   cfg.LogDir,
 			APIURL:   apiURL,
 			DropsDir: cfg.DropsDir,
 		},
 		"gemini": &executor.ContainerRunner{
-			Image:    "claudomator-agent:latest",
+			Image:    cfg.GeminiImage,
 			Logger:   logger,
 			LogDir:   cfg.LogDir,
 			APIURL:   apiURL,
-- 
cgit v1.2.3