1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
|
package executor
import (
"context"
"fmt"
"log/slog"
"os"
"os/exec"
"path/filepath"
"strings"
"sync"
"syscall"
"github.com/thepeterstone/claudomator/internal/storage"
"github.com/thepeterstone/claudomator/internal/task"
)
// ContainerRunner executes an agent inside a container.
type ContainerRunner struct {
Image string // default image if not specified in task
Logger *slog.Logger
LogDir string
APIURL string
DropsDir string
SSHAuthSock string // optional path to host SSH agent
ClaudeBinary string // optional path to claude binary in container
GeminiBinary string // optional path to gemini binary in container
ClaudeConfigDir string // host path to ~/.claude; mounted into container for auth credentials
// Command allows mocking exec.CommandContext for tests.
Command func(ctx context.Context, name string, arg ...string) *exec.Cmd
}
func (r *ContainerRunner) command(ctx context.Context, name string, arg ...string) *exec.Cmd {
if r.Command != nil {
return r.Command(ctx, name, arg...)
}
return exec.CommandContext(ctx, name, arg...)
}
func (r *ContainerRunner) ExecLogDir(execID string) string {
if r.LogDir == "" {
return ""
}
return filepath.Join(r.LogDir, execID)
}
func (r *ContainerRunner) Run(ctx context.Context, t *task.Task, e *storage.Execution) error {
var err error
repoURL := t.RepositoryURL
if repoURL == "" {
return fmt.Errorf("task %s has no repository_url", t.ID)
}
image := t.Agent.ContainerImage
if image == "" {
image = r.Image
}
if image == "" {
image = "claudomator-agent:latest"
}
// 1. Setup workspace on host
var workspace string
isResume := false
if e.SandboxDir != "" {
if _, err = os.Stat(e.SandboxDir); err == nil {
workspace = e.SandboxDir
isResume = true
r.Logger.Info("resuming in preserved workspace", "path", workspace)
}
}
if workspace == "" {
workspace, err = os.MkdirTemp("", "claudomator-workspace-*")
if err != nil {
return fmt.Errorf("creating workspace: %w", err)
}
// chmod applied after clone; see step 2.
}
// Note: workspace is only removed on success. On failure, it's preserved for debugging.
// If the task becomes BLOCKED, it's also preserved for resumption.
success := false
isBlocked := false
defer func() {
if success && !isBlocked {
os.RemoveAll(workspace)
} else {
r.Logger.Warn("preserving workspace", "path", workspace, "success", success, "blocked", isBlocked)
}
}()
// 2. Clone repo into workspace if not resuming.
// git clone requires the target directory to not exist; remove the MkdirTemp-created dir first.
if !isResume {
if err := os.Remove(workspace); err != nil {
return fmt.Errorf("removing workspace before clone: %w", err)
}
r.Logger.Info("cloning repository", "url", repoURL, "workspace", workspace)
if out, err := r.command(ctx, "git", "clone", repoURL, workspace).CombinedOutput(); err != nil {
return fmt.Errorf("git clone failed: %w\n%s", err, string(out))
}
if err = os.Chmod(workspace, 0755); err != nil {
return fmt.Errorf("chmod cloned workspace: %w", err)
}
}
e.SandboxDir = workspace
// 3. Prepare logs
logDir := r.ExecLogDir(e.ID)
if logDir == "" {
logDir = filepath.Join(workspace, ".claudomator-logs")
}
if err := os.MkdirAll(logDir, 0700); err != nil {
return fmt.Errorf("creating log dir: %w", err)
}
e.StdoutPath = filepath.Join(logDir, "stdout.log")
e.StderrPath = filepath.Join(logDir, "stderr.log")
e.ArtifactDir = logDir
stdoutFile, err := os.Create(e.StdoutPath)
if err != nil {
return fmt.Errorf("creating stdout log: %w", err)
}
defer stdoutFile.Close()
stderrFile, err := os.Create(e.StderrPath)
if err != nil {
return fmt.Errorf("creating stderr log: %w", err)
}
defer stderrFile.Close()
// 4. Run container
// Write API keys to a temporary env file to avoid exposure in 'ps' or 'docker inspect'
envFile := filepath.Join(workspace, ".claudomator-env")
envContent := fmt.Sprintf("ANTHROPIC_API_KEY=%s\nGOOGLE_API_KEY=%s\nGEMINI_API_KEY=%s\n", os.Getenv("ANTHROPIC_API_KEY"), os.Getenv("GOOGLE_API_KEY"), os.Getenv("GEMINI_API_KEY"))
if err := os.WriteFile(envFile, []byte(envContent), 0600); err != nil {
return fmt.Errorf("writing env file: %w", err)
}
// Inject custom instructions via file to avoid CLI length limits
instructionsFile := filepath.Join(workspace, ".claudomator-instructions.txt")
if err := os.WriteFile(instructionsFile, []byte(t.Agent.Instructions), 0644); err != nil {
return fmt.Errorf("writing instructions: %w", err)
}
// Set up a writable $HOME staging dir so any agent tool (claude, gemini, etc.)
// can freely create subdirs (session-env, .gemini, .cache, …) without hitting
// a non-existent or read-only home. We copy only the claude credentials into it.
agentHome := filepath.Join(workspace, ".agent-home")
if err := os.MkdirAll(filepath.Join(agentHome, ".claude"), 0755); err != nil {
return fmt.Errorf("creating agent home staging dir: %w", err)
}
if err := os.MkdirAll(filepath.Join(agentHome, ".gemini"), 0755); err != nil {
return fmt.Errorf("creating .gemini dir: %w", err)
}
if r.ClaudeConfigDir != "" {
// credentials
if srcData, readErr := os.ReadFile(filepath.Join(r.ClaudeConfigDir, ".credentials.json")); readErr == nil {
_ = os.WriteFile(filepath.Join(agentHome, ".claude", ".credentials.json"), srcData, 0600)
}
// settings (used by claude CLI; copy so it can write updates without hitting the host)
if srcData, readErr := os.ReadFile(filepath.Join(r.ClaudeConfigDir, ".claude.json")); readErr == nil {
_ = os.WriteFile(filepath.Join(agentHome, ".claude.json"), srcData, 0644)
}
}
args := r.buildDockerArgs(workspace, agentHome, e.TaskID)
innerCmd := r.buildInnerCmd(t, e, isResume)
fullArgs := append(args, image)
fullArgs = append(fullArgs, innerCmd...)
r.Logger.Info("starting container", "image", image, "taskID", t.ID)
cmd := r.command(ctx, "docker", fullArgs...)
cmd.Stderr = stderrFile
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
// Use os.Pipe for stdout so we can parse it in real-time
var stdoutR, stdoutW *os.File
stdoutR, stdoutW, err = os.Pipe()
if err != nil {
return fmt.Errorf("creating stdout pipe: %w", err)
}
cmd.Stdout = stdoutW
if err := cmd.Start(); err != nil {
stdoutW.Close()
stdoutR.Close()
return fmt.Errorf("starting container: %w", err)
}
stdoutW.Close()
// Watch for context cancellation to kill the process group (Issue 1)
done := make(chan struct{})
defer close(done)
go func() {
select {
case <-ctx.Done():
r.Logger.Info("killing container process group due to context cancellation", "taskID", t.ID)
syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
case <-done:
}
}()
// Stream stdout to the log file and parse cost/errors.
var costUSD float64
var sessionID string
var streamErr error
var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()
costUSD, sessionID, streamErr = parseStream(stdoutR, stdoutFile, r.Logger)
stdoutR.Close()
}()
waitErr := cmd.Wait()
wg.Wait()
e.CostUSD = costUSD
if sessionID != "" {
e.SessionID = sessionID
}
// Check whether the agent left a question before exiting.
questionFile := filepath.Join(logDir, "question.json")
if data, readErr := os.ReadFile(questionFile); readErr == nil {
os.Remove(questionFile) // consumed
questionJSON := strings.TrimSpace(string(data))
if isCompletionReport(questionJSON) {
r.Logger.Info("treating question file as completion report", "taskID", e.TaskID)
e.Summary = extractQuestionText(questionJSON)
} else {
isBlocked = true
success = true // We consider BLOCKED as a "success" for workspace preservation
if e.SessionID == "" {
r.Logger.Warn("missing session ID; resume will start fresh", "taskID", e.TaskID)
}
return &BlockedError{
QuestionJSON: questionJSON,
SessionID: e.SessionID,
SandboxDir: workspace,
}
}
}
// Read agent summary if written.
summaryFile := filepath.Join(logDir, "summary.txt")
if summaryData, readErr := os.ReadFile(summaryFile); readErr == nil {
os.Remove(summaryFile) // consumed
e.Summary = strings.TrimSpace(string(summaryData))
}
// 5. Post-execution: push changes if successful
if waitErr == nil && streamErr == nil {
// Check if there are any commits to push (HEAD ahead of origin/HEAD).
// If origin/HEAD doesn't exist (e.g. fresh clone with no commits), we attempt push anyway.
hasCommits := true
if out, err := r.command(ctx, "git", "-C", workspace, "rev-list", "origin/HEAD..HEAD").CombinedOutput(); err == nil {
if len(strings.TrimSpace(string(out))) == 0 {
hasCommits = false
}
}
if hasCommits {
r.Logger.Info("pushing changes back to remote", "url", repoURL)
if out, err := r.command(ctx, "git", "-C", workspace, "push", "origin", "HEAD").CombinedOutput(); err != nil {
r.Logger.Warn("git push failed", "error", err, "output", string(out))
return fmt.Errorf("git push failed: %w\n%s", err, string(out))
}
} else {
// No commits pushed — check whether the agent left uncommitted work behind.
// If so, fail loudly: the work would be silently lost when the sandbox is deleted.
if err := detectUncommittedChanges(workspace); err != nil {
return err
}
r.Logger.Info("no new commits to push", "taskID", t.ID)
}
success = true
}
if waitErr != nil {
// Append the tail of stderr so error classifiers (isQuotaExhausted, isRateLimitError)
// can inspect agent-specific messages (e.g. Gemini TerminalQuotaError).
stderrTail := readFileTail(e.StderrPath, 4096)
if stderrTail != "" {
return fmt.Errorf("container execution failed: %w\n%s", waitErr, stderrTail)
}
return fmt.Errorf("container execution failed: %w", waitErr)
}
if streamErr != nil {
return fmt.Errorf("stream parsing failed: %w", streamErr)
}
return nil
}
func (r *ContainerRunner) buildDockerArgs(workspace, claudeHome, taskID string) []string {
// --env-file takes a HOST path.
hostEnvFile := filepath.Join(workspace, ".claudomator-env")
// Replace localhost with host.docker.internal so the container can reach the host API.
apiURL := strings.ReplaceAll(r.APIURL, "localhost", "host.docker.internal")
args := []string{
"run", "--rm",
// Allow container to reach the host via host.docker.internal.
"--add-host=host.docker.internal:host-gateway",
// Run as the current process UID:GID so the container can read host-owned files.
fmt.Sprintf("--user=%d:%d", os.Getuid(), os.Getgid()),
"-v", workspace + ":/workspace",
"-v", claudeHome + ":/home/agent",
"-w", "/workspace",
"--env-file", hostEnvFile,
"-e", "HOME=/home/agent",
"-e", "CLAUDOMATOR_API_URL=" + apiURL,
"-e", "CLAUDOMATOR_TASK_ID=" + taskID,
"-e", "CLAUDOMATOR_DROP_DIR=" + r.DropsDir,
}
if r.SSHAuthSock != "" {
args = append(args, "-v", r.SSHAuthSock+":/tmp/ssh-auth.sock", "-e", "SSH_AUTH_SOCK=/tmp/ssh-auth.sock")
}
return args
}
func (r *ContainerRunner) buildInnerCmd(t *task.Task, e *storage.Execution, isResume bool) []string {
// Claude CLI uses -p for prompt text. To pass a file, we use a shell to cat it.
// We use a shell variable to capture the expansion to avoid quoting issues with instructions contents.
// The outer single quotes around the sh -c argument prevent host-side expansion.
claudeBin := r.ClaudeBinary
if claudeBin == "" {
claudeBin = "claude"
}
geminiBin := r.GeminiBinary
if geminiBin == "" {
geminiBin = "gemini"
}
if t.Agent.Type == "gemini" {
return []string{"sh", "-c", fmt.Sprintf("INST=$(cat /workspace/.claudomator-instructions.txt); %s -p \"$INST\"", geminiBin)}
}
// Claude
var claudeCmd strings.Builder
claudeCmd.WriteString(fmt.Sprintf("INST=$(cat /workspace/.claudomator-instructions.txt); %s -p \"$INST\"", claudeBin))
if isResume && e.ResumeSessionID != "" {
claudeCmd.WriteString(fmt.Sprintf(" --resume %s", e.ResumeSessionID))
}
claudeCmd.WriteString(" --output-format stream-json --verbose --permission-mode bypassPermissions")
return []string{"sh", "-c", claudeCmd.String()}
}
// scaffoldPrefixes are files/dirs written by the harness into the workspace before the agent
// runs. They are not part of the repo and must not trigger the uncommitted-changes check.
var scaffoldPrefixes = []string{
".claudomator-env",
".claudomator-instructions.txt",
".agent-home",
}
func isScaffold(path string) bool {
for _, p := range scaffoldPrefixes {
if path == p || strings.HasPrefix(path, p+"/") {
return true
}
}
return false
}
// detectUncommittedChanges returns an error if the workspace contains modified or
// untracked source files that the agent forgot to commit. Scaffold files written by
// the harness (.claudomator-env, .claudomator-instructions.txt, .agent-home/) are
// excluded from the check.
func detectUncommittedChanges(workspace string) error {
// Modified or staged tracked files
diffOut, err := exec.Command("git", "-c", "safe.directory=*", "-C", workspace,
"diff", "--name-only", "HEAD").CombinedOutput()
if err == nil {
for _, line := range strings.Split(strings.TrimSpace(string(diffOut)), "\n") {
if line != "" && !isScaffold(line) {
return fmt.Errorf("agent left uncommitted changes (work would be lost on sandbox deletion):\n%s\nInstructions must include: git add -A && git commit && git push origin master", strings.TrimSpace(string(diffOut)))
}
}
}
// Untracked new source files (excludes gitignored files)
lsOut, err := exec.Command("git", "-c", "safe.directory=*", "-C", workspace,
"ls-files", "--others", "--exclude-standard").CombinedOutput()
if err == nil {
var dirty []string
for _, line := range strings.Split(strings.TrimSpace(string(lsOut)), "\n") {
if line != "" && !isScaffold(line) {
dirty = append(dirty, line)
}
}
if len(dirty) > 0 {
return fmt.Errorf("agent left untracked files not committed (work would be lost on sandbox deletion):\n%s\nInstructions must include: git add -A && git commit && git push origin master", strings.Join(dirty, "\n"))
}
}
return nil
}
|