diff options
| author | Peter Stone <thepeterstone@gmail.com> | 2026-03-24 21:54:31 +0000 |
|---|---|---|
| committer | Peter Stone <thepeterstone@gmail.com> | 2026-03-24 21:54:31 +0000 |
| commit | 407fbc8d346b986bf864452c865282aa726272e2 (patch) | |
| tree | 274aa7861a6e4316c1919e93d944023d60846b44 /internal/cli/serve.go | |
| parent | e3954992af63440986bd39cce889e9c62e1a6b92 (diff) | |
| parent | b2e77009c55ba0f07bb9ff904d9f2f6cc9ff0ee2 (diff) | |
fix: resolve merge conflict — integrate agent's story-aware ContainerRunner
Agent added: Store on ContainerRunner (direct story/project lookup), --reference
clone for speed, explicit story branch push, checkStoryCompletion → SHIPPABLE.
My additions: BranchName on Task as fallback when Store is nil, tests updated
to match checkout-after-clone approach.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Diffstat (limited to 'internal/cli/serve.go')
| -rw-r--r-- | internal/cli/serve.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/internal/cli/serve.go b/internal/cli/serve.go index 3850ca9..644392e 100644 --- a/internal/cli/serve.go +++ b/internal/cli/serve.go @@ -91,6 +91,7 @@ func serve(addr string) error { SSHAuthSock: cfg.SSHAuthSock, ClaudeConfigDir: claudeConfigDir, CredentialSyncCmd: filepath.Join(repoDir, "scripts", "sync-credentials"), + Store: store, }, "gemini": &executor.ContainerRunner{ Image: cfg.GeminiImage, @@ -101,6 +102,7 @@ func serve(addr string) error { SSHAuthSock: cfg.SSHAuthSock, ClaudeConfigDir: claudeConfigDir, CredentialSyncCmd: filepath.Join(repoDir, "scripts", "sync-credentials"), + Store: store, }, "container": &executor.ContainerRunner{ Image: "claudomator-agent:latest", @@ -111,6 +113,7 @@ func serve(addr string) error { SSHAuthSock: cfg.SSHAuthSock, ClaudeConfigDir: claudeConfigDir, CredentialSyncCmd: filepath.Join(repoDir, "scripts", "sync-credentials"), + Store: store, }, } |