From e3954992af63440986bd39cce889e9c62e1a6b92 Mon Sep 17 00:00:00 2001
From: Peter Stone <thepeterstone@gmail.com>
Date: Tue, 24 Mar 2026 21:35:12 +0000
Subject: feat: clone story branch in ContainerRunner (ADR-007)

- Add BranchName field to task.Task (populated from story at execution time)
- Add GetStory to executor Store interface; resolve BranchName from story in both
  execute() and executeResume() parallel to RepositoryURL resolution
- Pass --branch <name> to git clone when BranchName is set; default clone otherwise

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 internal/executor/container_test.go | 87 +++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

(limited to 'internal/executor/container_test.go')

diff --git a/internal/executor/container_test.go b/internal/executor/container_test.go
index b6946ef..c56d1b2 100644
--- a/internal/executor/container_test.go
+++ b/internal/executor/container_test.go
@@ -514,3 +514,90 @@ func TestContainerRunner_AuthError_SyncsAndRetries(t *testing.T) {
 		t.Error("expected sync-credentials to be called, but marker file not found")
 	}
 }
+
+func TestContainerRunner_ClonesStoryBranch(t *testing.T) {
+	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
+
+	var cloneArgs []string
+	runner := &ContainerRunner{
+		Logger: logger,
+		Image:  "busybox",
+		Command: func(ctx context.Context, name string, arg ...string) *exec.Cmd {
+			if name == "git" && len(arg) > 0 && arg[0] == "clone" {
+				cloneArgs = append([]string{}, arg...)
+				dir := arg[len(arg)-1]
+				os.MkdirAll(dir, 0755)
+				return exec.Command("true")
+			}
+			// docker run fails so the test exits quickly
+			if name == "docker" {
+				return exec.Command("sh", "-c", "exit 1")
+			}
+			return exec.Command("true")
+		},
+	}
+
+	tk := &task.Task{
+		ID:            "story-branch-test",
+		RepositoryURL: "https://example.com/repo.git",
+		BranchName:    "story/my-feature",
+		Agent:         task.AgentConfig{Type: "claude"},
+	}
+	e := &storage.Execution{ID: "exec-1", TaskID: "story-branch-test"}
+
+	runner.Run(context.Background(), tk, e)
+	os.RemoveAll(e.SandboxDir)
+
+	// Assert git clone was called with --branch <branchName>
+	if len(cloneArgs) < 3 {
+		t.Fatalf("expected clone args, got %v", cloneArgs)
+	}
+	found := false
+	for i, a := range cloneArgs {
+		if a == "--branch" && i+1 < len(cloneArgs) && cloneArgs[i+1] == "story/my-feature" {
+			found = true
+			break
+		}
+	}
+	if !found {
+		t.Errorf("expected git clone --branch story/my-feature, got args: %v", cloneArgs)
+	}
+}
+
+func TestContainerRunner_ClonesDefaultBranchWhenNoBranchName(t *testing.T) {
+	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
+
+	var cloneArgs []string
+	runner := &ContainerRunner{
+		Logger: logger,
+		Image:  "busybox",
+		Command: func(ctx context.Context, name string, arg ...string) *exec.Cmd {
+			if name == "git" && len(arg) > 0 && arg[0] == "clone" {
+				cloneArgs = append([]string{}, arg...)
+				dir := arg[len(arg)-1]
+				os.MkdirAll(dir, 0755)
+				return exec.Command("true")
+			}
+			if name == "docker" {
+				return exec.Command("sh", "-c", "exit 1")
+			}
+			return exec.Command("true")
+		},
+	}
+
+	tk := &task.Task{
+		ID:            "no-branch-test",
+		RepositoryURL: "https://example.com/repo.git",
+		Agent:         task.AgentConfig{Type: "claude"},
+	}
+	e := &storage.Execution{ID: "exec-2", TaskID: "no-branch-test"}
+
+	runner.Run(context.Background(), tk, e)
+	os.RemoveAll(e.SandboxDir)
+
+	for _, a := range cloneArgs {
+		if a == "--branch" {
+			t.Errorf("expected no --branch flag for task without BranchName, got args: %v", cloneArgs)
+		}
+	}
+}
-- 
cgit v1.2.3