Fix render failing on fresh bare clones (#19)

* fix render failing on fresh bare clones by fetching remote tracking refs

* allow same branch in multiple worktrees with --force

Author: milldr

internal/git/git.go

@@ -109,9 +109,11 @@ func (r *RealRunner) Fetch(ctx context.Context, repoPath string) error {
 }
 
 // AddWorktree creates a worktree from a bare repo at the given path and branch.
+// Uses --force to allow the same branch to be checked out in multiple worktrees
+// across different workspaces.
 func (r *RealRunner) AddWorktree(ctx context.Context, bareRepo, worktreePath, branch string) error {
 	r.log().Debug("adding worktree", "bare_repo", bareRepo, "worktree", worktreePath, "branch", branch)
-	return r.run(ctx, "-C", bareRepo, "worktree", "add", worktreePath, branch)
+	return r.run(ctx, "-C", bareRepo, "worktree", "add", "--force", worktreePath, branch)
 }
 
 // AddWorktreeNewBranch creates a worktree with a new branch starting from startPoint.

internal/workspace/workspace.go

@@ -209,6 +209,11 @@ func (s *Service) Render(ctx context.Context, id string, progress func(msg strin
 			if err := s.Git.BareClone(ctx, repo.URL, barePath); err != nil {
 				return fmt.Errorf("cloning %s: %w", repo.URL, err)
 			}
+			// Fetch after bare clone to create remote tracking refs
+			// (bare clones don't create refs/remotes/origin/* by default).
+			if err := s.Git.Fetch(ctx, barePath); err != nil {
+				return fmt.Errorf("fetching %s: %w", repo.URL, err)
+			}
 		} else {
 			s.log().Debug("bare clone exists, fetching", "url", repo.URL, "path", barePath)
 			if err := s.Git.Fetch(ctx, barePath); err != nil {
@@ -239,6 +244,12 @@ func (s *Service) Render(ctx context.Context, id string, progress func(msg strin
 						return fmt.Errorf("getting default branch for %s: %w", repo.URL, err)
 					}
 				}
+				// Ensure the remote tracking ref exists for the base branch so
+				// origin/{baseBranch} resolves (especially when baseBranch differs
+				// from the default branch, which Fetch only creates refs for).
+				if err := s.Git.EnsureRemoteRef(ctx, barePath, baseBranch); err != nil {
+					return fmt.Errorf("ensuring remote ref for %s: %w", repo.URL, err)
+				}
 				// Use the remote ref to ensure we branch from the latest fetched state,
 				// not a potentially stale local branch ref in the bare repo.
 				startPoint := "origin/" + baseBranch

internal/workspace/workspace_test.go

@@ -465,6 +465,10 @@ func TestRenderNewBranchUsesRemoteRef(t *testing.T) {
 	if mock.startPoints[0] != "origin/main" {
 		t.Errorf("startPoint = %q, want origin/main", mock.startPoints[0])
 	}
+	// EnsureRemoteRef should be called for the base branch during render
+	if len(mock.remoteRefs) != 1 || mock.remoteRefs[0] != "main" {
+		t.Errorf("remoteRefs = %v, want [main]", mock.remoteRefs)
+	}
 }
 
 func TestRenderNewBranchUsesBaseField(t *testing.T) {
@@ -836,6 +840,7 @@ func TestSyncCleanRebase(t *testing.T) {
 	}
 
 	mock.fetches = nil
+	mock.remoteRefs = nil
 	mock.isClean = true
 	if err := svc.Sync(ctx, "sync-clean", noop); err != nil {
 		t.Fatalf("Sync: %v", err)
@@ -892,6 +897,7 @@ func TestSyncUsesBaseField(t *testing.T) {
 	}
 
 	mock.fetches = nil
+	mock.remoteRefs = nil
 	mock.isClean = true
 	if err := svc.Sync(ctx, "sync-base", noop); err != nil {
 		t.Fatalf("Sync: %v", err)