add interactive mode nav changes

Author: ozankasikci

src/commands/interactive/command.rs

@@ -520,6 +520,7 @@ where
                 }
                 if matches!(self.selected, Some(0)) && !super::GLOBAL_ACTIONS.is_empty() {
                     self.focus = Focus::GlobalActions;
+                    self.global_action_selected = super::GLOBAL_ACTIONS.len().saturating_sub(1);
                     return;
                 }
                 let next = match self.selected {
@@ -531,15 +532,7 @@ where
             }
             Focus::Actions => self.move_action(-1),
             Focus::GlobalActions => {
-                if self.global_action_selected == 0 {
-                    if !self.worktrees.is_empty() {
-                        self.focus = Focus::Worktrees;
-                        if self.selected.is_none() {
-                            self.selected = Some(0);
-                        }
-                        self.sync_selection(state);
-                    }
-                } else {
+                if self.global_action_selected > 0 {
                     self.move_global_action(-1);
                 }
             }

src/commands/interactive/tests.rs

@@ -302,11 +302,36 @@ fn cd_to_root_global_action_exits() -> Result<()> {
 
 #[test]
 fn up_from_top_moves_to_global_actions() -> Result<()> {
+    let backend = TestBackend::new(40, 12);
+    let terminal = Terminal::new(backend)?;
+    let events = StubEvents::new(vec![key(KeyCode::Up), key(KeyCode::Enter)]);
+
+    let worktrees = entries(&["alpha"]);
+    let command = InteractiveCommand::new(
+        terminal,
+        events,
+        PathBuf::from("/tmp/worktrees"),
+        worktrees,
+        vec![String::from("main")],
+        Some(String::from("main")),
+    );
+
+    let result = command.run(|_| Ok(()), |_, _| Ok(()))?;
+
+    assert_eq!(result, Some(String::from(super::REPO_ROOT_SELECTION)));
+
+    Ok(())
+}
+
+#[test]
+fn up_from_top_after_tabbing_picks_last_global_action() -> Result<()> {
     let backend = TestBackend::new(40, 12);
     let terminal = Terminal::new(backend)?;
     let events = StubEvents::new(vec![
+        key(KeyCode::Tab),
+        key(KeyCode::Tab),
+        key(KeyCode::Tab),
         key(KeyCode::Up),
-        key(KeyCode::Right),
         key(KeyCode::Enter),
     ]);