Fix review screen showing worktree branch instead of stored branch (#492)

## Summary

- The TUI review screen resolved the branch name dynamically via `git
name-rev`, which can return a worktree branch when the same SHA is
reachable from multiple refs. The queue view already handled this
correctly by preferring the stored `job.Branch`.
- `fetchReview()` now checks `review.Job.Branch` first and only falls
back to `git.GetBranchName()` when the stored value is empty (for older
jobs that predate the Branch column).
- Added a regression test for the stored-branch priority.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: wesm

cmd/roborev/tui/fetch.go

@@ -501,16 +501,33 @@ func (m model) fetchReview(jobID int64) tea.Cmd {
 
 		responses := m.loadResponses(jobID, review)
 
-		// Compute branch name for single commits (not ranges)
-		var branchName string
-		if review.Job != nil && review.Job.RepoPath != "" && !strings.Contains(review.Job.GitRef, "..") {
-			branchName = git.GetBranchName(review.Job.RepoPath, review.Job.GitRef)
-		}
+		branchName := reviewBranchName(review.Job)
 
 		return reviewMsg{review: review, responses: responses, jobID: jobID, branchName: branchName}
 	}
 }
 
+// reviewBranchName returns the branch to display on the review screen.
+// It prefers the stored job.Branch (set at enqueue time) over a dynamic
+// git name-rev lookup, which can be misled by worktree branches
+// reachable from the same SHA. Falls back to git lookup only for
+// single-commit reviews when the stored branch is empty.
+func reviewBranchName(job *storage.ReviewJob) string {
+	if job == nil {
+		return ""
+	}
+	if job.Branch == branchNone {
+		return ""
+	}
+	if job.Branch != "" {
+		return job.Branch
+	}
+	if job.RepoPath != "" && !strings.Contains(job.GitRef, "..") {
+		return git.GetBranchName(job.RepoPath, job.GitRef)
+	}
+	return ""
+}
+
 func (m model) fetchReviewForPrompt(jobID int64) tea.Cmd {
 	return func() tea.Msg {
 		review, err := m.loadReview(jobID)

cmd/roborev/tui/review_branch_test.go

@@ -30,6 +30,56 @@ func TestTUIReviewMsgSetsBranchName(t *testing.T) {
 	assert.Equal(t, "main", m2.currentBranch)
 }
 
+func TestReviewBranchName(t *testing.T) {
+	tests := []struct {
+		name string
+		job  *storage.ReviewJob
+		want string
+	}{
+		{
+			name: "nil job",
+			job:  nil,
+			want: "",
+		},
+		{
+			name: "stored branch preferred over git lookup",
+			job:  &storage.ReviewJob{Branch: "main", GitRef: "abc123", RepoPath: "/tmp/repo"},
+			want: "main",
+		},
+		{
+			name: "stored branch for range review",
+			job:  &storage.ReviewJob{Branch: "main", GitRef: "abc123..def456"},
+			want: "main",
+		},
+		{
+			name: "branchNone sentinel treated as empty",
+			job:  &storage.ReviewJob{Branch: "(none)", GitRef: "abc123"},
+			want: "",
+		},
+		{
+			name: "branchNone with repo path skips git lookup",
+			job:  &storage.ReviewJob{Branch: "(none)", GitRef: "abc123", RepoPath: "/tmp/repo"},
+			want: "",
+		},
+		{
+			name: "no stored branch and range skips git lookup",
+			job:  &storage.ReviewJob{GitRef: "abc123..def456", RepoPath: "/tmp/repo"},
+			want: "",
+		},
+		{
+			name: "no stored branch and no repo path",
+			job:  &storage.ReviewJob{GitRef: "abc123"},
+			want: "",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := reviewBranchName(tt.job)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
+
 func TestTUIReviewMsgEmptyBranchForRange(t *testing.T) {
 	m := newModel("http://localhost", withExternalIODisabled())
 	m.jobs = []storage.ReviewJob{

internal/storage/reviews.go

@@ -21,9 +21,10 @@ func (db *DB) GetReviewByJobID(jobID int64) (*Review, error) {
 	var commitSubject sql.NullString
 
 	var verdictBool sql.NullInt64
+	var branch sql.NullString
 	err := db.QueryRow(`
 		SELECT rv.id, rv.job_id, rv.agent, rv.prompt, rv.output, rv.created_at, rv.closed, rv.uuid, rv.verdict_bool,
-		       j.id, j.repo_id, j.commit_id, j.git_ref, j.session_id, j.agent, j.reasoning, j.status, j.enqueued_at,
+		       j.id, j.repo_id, j.commit_id, j.git_ref, j.branch, j.session_id, j.agent, j.reasoning, j.status, j.enqueued_at,
 		       j.started_at, j.finished_at, j.worker_id, j.error, j.model, j.job_type, j.review_type, j.patch_id,
 		       rp.root_path, rp.name, c.subject
 		FROM reviews rv
@@ -32,7 +33,7 @@ func (db *DB) GetReviewByJobID(jobID int64) (*Review, error) {
 		LEFT JOIN commits c ON c.id = j.commit_id
 		WHERE rv.job_id = ?
 	`, jobID).Scan(&r.ID, &r.JobID, &r.Agent, &r.Prompt, &r.Output, &createdAt, &closed, &reviewUUID, &verdictBool,
-		&job.ID, &job.RepoID, &commitID, &job.GitRef, &sessionID, &job.Agent, &job.Reasoning, &job.Status, &enqueuedAt,
+		&job.ID, &job.RepoID, &commitID, &job.GitRef, &branch, &sessionID, &job.Agent, &job.Reasoning, &job.Status, &enqueuedAt,
 		&startedAt, &finishedAt, &workerID, &errMsg, &model, &jobTypeStr, &reviewTypeStr, &patchIDStr,
 		&job.RepoPath, &job.RepoName, &commitSubject)
 	if err != nil {
@@ -50,6 +51,9 @@ func (db *DB) GetReviewByJobID(jobID int64) (*Review, error) {
 	if commitSubject.Valid {
 		job.CommitSubject = commitSubject.String
 	}
+	if branch.Valid {
+		job.Branch = branch.String
+	}
 	if model.Valid {
 		job.Model = model.String
 	}
@@ -109,9 +113,10 @@ func (db *DB) GetReviewByCommitSHA(sha string) (*Review, error) {
 
 	// Search by git_ref which contains the SHA for single commits
 	var verdictBool sql.NullInt64
+	var branch sql.NullString
 	err := db.QueryRow(`
 		SELECT rv.id, rv.job_id, rv.agent, rv.prompt, rv.output, rv.created_at, rv.closed, rv.uuid, rv.verdict_bool,
-		       j.id, j.repo_id, j.commit_id, j.git_ref, j.session_id, j.agent, j.reasoning, j.status, j.enqueued_at,
+		       j.id, j.repo_id, j.commit_id, j.git_ref, j.branch, j.session_id, j.agent, j.reasoning, j.status, j.enqueued_at,
 		       j.started_at, j.finished_at, j.worker_id, j.error, j.model, j.job_type, j.review_type, j.patch_id,
 		       rp.root_path, rp.name, c.subject
 		FROM reviews rv
@@ -122,7 +127,7 @@ func (db *DB) GetReviewByCommitSHA(sha string) (*Review, error) {
 		ORDER BY rv.created_at DESC
 		LIMIT 1
 	`, sha).Scan(&r.ID, &r.JobID, &r.Agent, &r.Prompt, &r.Output, &createdAt, &closed, &reviewUUID, &verdictBool,
-		&job.ID, &job.RepoID, &commitID, &job.GitRef, &sessionID, &job.Agent, &job.Reasoning, &job.Status, &enqueuedAt,
+		&job.ID, &job.RepoID, &commitID, &job.GitRef, &branch, &sessionID, &job.Agent, &job.Reasoning, &job.Status, &enqueuedAt,
 		&startedAt, &finishedAt, &workerID, &errMsg, &model, &jobTypeStr, &reviewTypeStr, &patchIDStr,
 		&job.RepoPath, &job.RepoName, &commitSubject)
 	if err != nil {
@@ -139,6 +144,9 @@ func (db *DB) GetReviewByCommitSHA(sha string) (*Review, error) {
 	if commitSubject.Valid {
 		job.CommitSubject = commitSubject.String
 	}
+	if branch.Valid {
+		job.Branch = branch.String
+	}
 	if model.Valid {
 		job.Model = model.String
 	}

internal/storage/reviews_test.go

@@ -370,6 +370,55 @@ func createCompletedJobWithOptions(t *testing.T, db *DB, opts EnqueueOpts, outpu
 	return updatedJob
 }
 
+func TestGetReviewByJobIDIncludesBranch(t *testing.T) {
+	db := openTestDB(t)
+	defer db.Close()
+
+	repo := createRepo(t, db, "/tmp/test-repo")
+
+	tests := []struct {
+		name   string
+		branch string
+		want   string
+	}{
+		{"branch populated when set", "main", "main"},
+		{"branch empty when not set", "", ""},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			job := createCompletedJobWithOptions(t, db, EnqueueOpts{
+				RepoID: repo.ID,
+				GitRef: "sha-" + tt.name,
+				Branch: tt.branch,
+			}, "output")
+
+			review, err := db.GetReviewByJobID(job.ID)
+			require.NoError(t, err)
+			require.NotNil(t, review.Job)
+			assert.Equal(t, tt.want, review.Job.Branch)
+		})
+	}
+}
+
+func TestGetReviewByCommitSHAIncludesBranch(t *testing.T) {
+	db := openTestDB(t)
+	defer db.Close()
+
+	repo := createRepo(t, db, "/tmp/test-repo")
+
+	job := createCompletedJobWithOptions(t, db, EnqueueOpts{
+		RepoID: repo.ID,
+		GitRef: "branch-sha-test",
+		Branch: "feature/x",
+	}, "output")
+
+	review, err := db.GetReviewByCommitSHA(job.GitRef)
+	require.NoError(t, err)
+	require.NotNil(t, review.Job)
+	assert.Equal(t, "feature/x", review.Job.Branch)
+}
+
 // verifyComment helper checks if a comment matches expected values.
 func verifyComment(t *testing.T, actual Response, expectedUser, expectedMsg string) {
 	t.Helper()