Handle unknown repo tracking state

Author: nicosuave

macos/Sources/Features/Terminal/TerminalRepoPrompt.swift

@@ -118,7 +118,7 @@ enum TerminalRepoPromptResolution: Equatable {
 enum TerminalRepoPrompt {
     static func classify(snapshot: TerminalRepoPromptSnapshot) -> TerminalRepoPromptReadyState {
         let actionStates = actionStates(for: snapshot)
-        let primaryAction = actionStates.first(where: \.isAvailable)?.action ?? .commit
+        let primaryAction = primaryAction(for: snapshot)
         let shortcutAction = shortcutAction(for: snapshot, primaryAction: primaryAction)
 
         return .init(
@@ -129,14 +129,32 @@ enum TerminalRepoPrompt {
         )
     }
 
+    private static func primaryAction(for snapshot: TerminalRepoPromptSnapshot) -> TerminalRepoPromptAction {
+        if snapshot.hasDirtyChanges {
+            return .commit
+        }
+
+        let trackingKnown = snapshot.gitTracking != nil
+        let hasUpstream = snapshot.gitTracking?.hasUpstream ?? false
+        let aheadCount = snapshot.gitTracking?.ahead ?? 0
+        let needsPush = trackingKnown && (!hasUpstream || aheadCount > 0)
+
+        if snapshot.openPR != nil {
+            return needsPush ? .push : .updatePR
+        }
+
+        return needsPush ? .push : .openPR
+    }
+
     private static func shortcutAction(
         for snapshot: TerminalRepoPromptSnapshot,
         primaryAction: TerminalRepoPromptAction
     ) -> TerminalRepoPromptShortcutState? {
         let hasOpenPR = snapshot.openPR != nil
+        let trackingKnown = snapshot.gitTracking != nil
         let hasUpstream = snapshot.gitTracking?.hasUpstream ?? false
         let aheadCount = snapshot.gitTracking?.ahead ?? 0
-        let needsPush = !hasUpstream || aheadCount > 0
+        let needsPush = trackingKnown && (!hasUpstream || aheadCount > 0)
 
         switch primaryAction {
         case .commit:
@@ -167,9 +185,10 @@ enum TerminalRepoPrompt {
     ) -> [TerminalRepoPromptActionState] {
         let hasDirtyChanges = snapshot.hasDirtyChanges
         let hasOpenPR = snapshot.openPR != nil
+        let trackingKnown = snapshot.gitTracking != nil
         let hasUpstream = snapshot.gitTracking?.hasUpstream ?? false
         let aheadCount = snapshot.gitTracking?.ahead ?? 0
-        let needsPush = !hasUpstream || aheadCount > 0
+        let needsPush = trackingKnown && (!hasUpstream || aheadCount > 0)
 
         return TerminalRepoPromptAction.menuActions.map { action in
             switch action {
@@ -197,6 +216,20 @@ enum TerminalRepoPrompt {
                     )
                 }
 
+                if !trackingKnown {
+                    let description = if hasOpenPR {
+                        "Push the current branch to the existing PR branch if needed."
+                    } else {
+                        "Push the current branch and set upstream if needed."
+                    }
+
+                    return .init(
+                        action: action,
+                        isAvailable: true,
+                        description: description
+                    )
+                }
+
                 if needsPush {
                     let description = if hasOpenPR {
                         "Push the current branch to the existing PR branch."

macos/Tests/TerminalRepoPromptTests.swift

@@ -118,6 +118,23 @@ struct TerminalRepoPromptTests {
         #expect(ready.state(for: .push)?.description == "Nothing to push.")
     }
 
+    @Test func cleanSnapshotWithoutTrackingResolvesToOpenPR() {
+        let snapshot = TerminalRepoPromptSnapshot(
+            repoRoot: "/tmp/repo",
+            branch: "feature/repo-prompts",
+            sessions: [session()],
+            hasDirtyChanges: false,
+            openPR: nil,
+            gitTracking: nil
+        )
+
+        let ready = TerminalRepoPrompt.classify(snapshot: snapshot)
+        #expect(ready.primaryAction == .openPR)
+        #expect(ready.shortcutAction == nil)
+        #expect(ready.state(for: .openPR)?.isAvailable == true)
+        #expect(ready.state(for: .push)?.isAvailable == true)
+    }
+
     @Test func cleanSnapshotWithOpenPRAndAheadResolvesToPush() {
         let snapshot = TerminalRepoPromptSnapshot(
             repoRoot: "/tmp/repo",
@@ -171,6 +188,23 @@ struct TerminalRepoPromptTests {
         #expect(ready.state(for: .push)?.description == "Nothing to push.")
     }
 
+    @Test func cleanSnapshotWithOpenPRAndUnknownTrackingResolvesToUpdatePR() {
+        let snapshot = TerminalRepoPromptSnapshot(
+            repoRoot: "/tmp/repo",
+            branch: "feature/repo-prompts",
+            sessions: [session()],
+            hasDirtyChanges: false,
+            openPR: openPR(),
+            gitTracking: nil
+        )
+
+        let ready = TerminalRepoPrompt.classify(snapshot: snapshot)
+        #expect(ready.primaryAction == .updatePR)
+        #expect(ready.shortcutAction == nil)
+        #expect(ready.state(for: .updatePR)?.isAvailable == true)
+        #expect(ready.state(for: .push)?.isAvailable == true)
+    }
+
     @Test func openPRPromptIsCompactAndIncludesHeaderRule() {
         let snapshot = TerminalRepoPromptSnapshot(
             repoRoot: "/tmp/repo",