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>

1 files changed, 40 insertions, 10 deletions

diff --git a/internal/executor/container.go b/internal/executor/container.go
index d270e20..8b244c6 100644
--- a/internal/executor/container.go
+++ b/internal/executor/container.go
@@ -28,6 +28,7 @@ type ContainerRunner struct {
 	GeminiBinary       string // optional path to gemini binary in container
 	ClaudeConfigDir    string // host path to ~/.claude; mounted into container for auth credentials
 	CredentialSyncCmd  string // optional path to sync-credentials script for auth-error auto-recovery
+	Store              Store  // optional; used to look up stories and projects for story-aware cloning
 	// Command allows mocking exec.CommandContext for tests.
 	Command func(ctx context.Context, name string, arg ...string) *exec.Cmd
 }
@@ -95,21 +96,46 @@ func (r *ContainerRunner) Run(ctx context.Context, t *task.Task, e *storage.Exec
 		}
 	}()
 
+	// Resolve story branch and project local path if this is a story task.
+	var storyBranch string
+	var storyLocalPath string
+	if t.StoryID != "" && r.Store != nil {
+		if story, err := r.Store.GetStory(t.StoryID); err == nil && story != nil {
+			storyBranch = story.BranchName
+			if story.ProjectID != "" {
+				if proj, err := r.Store.GetProject(story.ProjectID); err == nil && proj != nil {
+					storyLocalPath = proj.LocalPath
+				}
+			}
+		}
+	}
+	// Fall back to task-level BranchName (e.g. set explicitly by executor or tests).
+	if storyBranch == "" {
+		storyBranch = t.BranchName
+	}
+
 	// 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, "branch", t.BranchName)
-		cloneArgs := []string{"clone"}
-		if t.BranchName != "" {
-			cloneArgs = append(cloneArgs, "--branch", t.BranchName)
+		r.Logger.Info("cloning repository", "url", repoURL, "workspace", workspace)
+		var cloneArgs []string
+		if storyLocalPath != "" {
+			cloneArgs = []string{"clone", "--reference", storyLocalPath, repoURL, workspace}
+		} else {
+			cloneArgs = []string{"clone", repoURL, workspace}
 		}
-		cloneArgs = append(cloneArgs, repoURL, workspace)
 		if out, err := r.command(ctx, "git", cloneArgs...).CombinedOutput(); err != nil {
 			return fmt.Errorf("git clone failed: %w\n%s", err, string(out))
 		}
+		if storyBranch != "" {
+			r.Logger.Info("checking out story branch", "branch", storyBranch)
+			if out, err := r.command(ctx, "git", "-C", workspace, "checkout", storyBranch).CombinedOutput(); err != nil {
+				return fmt.Errorf("git checkout story branch %q failed: %w\n%s", storyBranch, err, string(out))
+			}
+		}
 		if err = os.Chmod(workspace, 0755); err != nil {
 			return fmt.Errorf("chmod cloned workspace: %w", err)
 		}
@@ -150,7 +176,7 @@ func (r *ContainerRunner) Run(ctx context.Context, t *task.Task, e *storage.Exec
 	}
 
 	// Run container (with auth retry on failure).
-	runErr := r.runContainer(ctx, t, e, workspace, agentHome, isResume)
+	runErr := r.runContainer(ctx, t, e, workspace, agentHome, isResume, storyBranch)
 	if runErr != nil && isAuthError(runErr) && r.CredentialSyncCmd != "" {
 		r.Logger.Warn("auth failure detected, syncing credentials and retrying once", "taskID", t.ID)
 		syncOut, syncErr := r.command(ctx, r.CredentialSyncCmd).CombinedOutput()
@@ -164,7 +190,7 @@ func (r *ContainerRunner) Run(ctx context.Context, t *task.Task, e *storage.Exec
 		if srcData, readErr := os.ReadFile(filepath.Join(r.ClaudeConfigDir, ".claude.json")); readErr == nil {
 			_ = os.WriteFile(filepath.Join(agentHome, ".claude.json"), srcData, 0644)
 		}
-		runErr = r.runContainer(ctx, t, e, workspace, agentHome, isResume)
+		runErr = r.runContainer(ctx, t, e, workspace, agentHome, isResume, storyBranch)
 	}
 
 	if runErr == nil {
@@ -180,7 +206,7 @@ func (r *ContainerRunner) Run(ctx context.Context, t *task.Task, e *storage.Exec
 
 // runContainer runs the docker container for the given task and handles log setup,
 // environment files, instructions, and post-execution git operations.
-func (r *ContainerRunner) runContainer(ctx context.Context, t *task.Task, e *storage.Execution, workspace, agentHome string, isResume bool) error {
+func (r *ContainerRunner) runContainer(ctx context.Context, t *task.Task, e *storage.Execution, workspace, agentHome string, isResume bool, storyBranch string) error {
 	repoURL := t.RepositoryURL
 
 	image := t.Agent.ContainerImage
@@ -327,8 +353,12 @@ func (r *ContainerRunner) runContainer(ctx context.Context, t *task.Task, e *sto
 		}
 
 		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 {
+			pushRef := "HEAD"
+			if storyBranch != "" {
+				pushRef = storyBranch
+			}
+			r.Logger.Info("pushing changes back to remote", "url", repoURL, "ref", pushRef)
+			if out, err := r.command(ctx, "git", "-C", workspace, "push", "origin", pushRef).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))
 			}