fix(sync): changed restore to stay on default branch after sync

- changed `RestoreAfterSync` to checkout the default branch instead of the
  original branch after rebasing the WIP branch
- removed the `else if` block that checked out the original branch for clean
  repos on non-default branches (already on default from the sync step)
- this prevents `prune` from failing with "cannot delete branch used by
  worktree" when the merged branch is currently checked out

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: rios0rios0

internal/repo/sync.go

@@ -172,10 +172,8 @@ func RestoreAfterSync(
 		if err := runner.Run(repoPath, "rebase", defaultBranch); err != nil {
 			_ = runner.Run(repoPath, "rebase", "--abort")
 		}
-		_ = runner.Run(repoPath, "checkout", currentBranch)
+		_ = runner.Run(repoPath, "checkout", defaultBranch)
 		status = fmt.Sprintf("synced (wip: %s)", wipBranch)
-	} else if currentBranch != defaultBranch {
-		_ = runner.Run(repoPath, "checkout", currentBranch)
 	}
 	return SyncResult{Name: name, Status: status}
 }

internal/repo/sync_test.go

@@ -257,7 +257,7 @@ func TestRestoreAfterSync(t *testing.T) {
 		assert.Equal(t, "synced", result.Status)
 	})
 
-	t.Run("should checkout original branch when not on default", func(t *testing.T) {
+	t.Run("should stay on default branch when clean repo was on non-default branch", func(t *testing.T) {
 		t.Parallel()
 		// given
 		var checkedOut string
@@ -274,19 +274,27 @@ func TestRestoreAfterSync(t *testing.T) {
 
 		// then
 		assert.Equal(t, "synced", result.Status)
-		assert.Equal(t, "feat/x", checkedOut)
+		assert.Empty(t, checkedOut)
 	})
 
-	t.Run("should rebase WIP branch and return wip status for dirty repo", func(t *testing.T) {
+	t.Run("should rebase WIP branch and checkout default branch for dirty repo", func(t *testing.T) {
 		t.Parallel()
 		// given
+		var lastCheckedOut string
 		runner := doubles.NewGitRunnerStub()
+		runner.RunFunc = func(_ string, args ...string) error {
+			if len(args) > 0 && args[0] == "checkout" {
+				lastCheckedOut = args[1]
+			}
+			return nil
+		}
 
 		// when
 		result := repo.RestoreAfterSync("/repo", "my-repo", "main", "feat/x", "wip/feat/x", true, runner)
 
 		// then
 		assert.Contains(t, result.Status, "synced (wip: wip/feat/x)")
+		assert.Equal(t, "main", lastCheckedOut)
 	})
 }