Revert "feat: enhance input history navigation and improve session input handling"

vinhnx · vinhnx · commit 36f217c61a2c · 2025-12-25T22:52:49.000+07:00
This reverts commit 635e5d6. # Conflicts: # .vtcode/tool-policy.json # docs/project/TODO.md
diff --git a/vtcode-core/src/ui/tui/runner.rs b/vtcode-core/src/ui/tui/runner.rs
@@ -83,13 +83,12 @@ impl ScrollAccumulator {
     }
 }
 
-/// Check if session has any modal, palette, or input active that uses arrow key navigation
+/// Check if session has any modal or palette active that uses arrow key navigation
 fn has_active_navigation_ui(session: &Session) -> bool {
     session.modal.is_some()
         || session.file_palette_active
         || session.prompt_palette_active
         || session.config_palette_active
-        || session.is_input_enabled()
 }
 
 const INLINE_FALLBACK_ROWS: u16 = ui::DEFAULT_INLINE_VIEWPORT_ROWS;
diff --git a/vtcode-core/src/ui/tui/session.rs b/vtcode-core/src/ui/tui/session.rs
@@ -339,11 +339,6 @@ impl Session {
         self.mark_dirty();
     }
 
-    /// Check if input is currently enabled
-    pub(crate) fn is_input_enabled(&self) -> bool {
-        self.input_enabled
-    }
-
     pub fn set_log_receiver(&mut self, receiver: UnboundedReceiver<LogEntry>) {
         self.log_receiver = Some(receiver);
     }
diff --git a/vtcode-core/src/ui/tui/session/editing.rs b/vtcode-core/src/ui/tui/session/editing.rs
@@ -342,25 +342,17 @@ impl Session {
         self.input_manager.add_to_history(submitted.to_owned());
     }
 
-    /// Navigate to previous history entry
+    /// Navigate to previous history entry (disabled to prevent cursor flickering)
+    #[allow(dead_code)]
     pub(super) fn navigate_history_previous(&mut self) -> bool {
-        if let Some(entry) = self.input_manager.go_to_previous_history() {
-            self.input_manager.set_content_preserve_history(entry);
-            slash::update_slash_suggestions(self);
-            true
-        } else {
-            false
-        }
+        // History navigation disabled to prevent cursor flickering
+        false
     }
 
-    /// Navigate to next history entry
+    /// Navigate to next history entry (disabled to prevent cursor flickering)
+    #[allow(dead_code)]
     pub(super) fn navigate_history_next(&mut self) -> bool {
-        if let Some(entry) = self.input_manager.go_to_next_history() {
-            self.input_manager.set_content_preserve_history(entry);
-            slash::update_slash_suggestions(self);
-            true
-        } else {
-            false
-        }
+        // History navigation disabled to prevent cursor flickering
+        false
     }
 }
diff --git a/vtcode-core/src/ui/tui/session/events.rs b/vtcode-core/src/ui/tui/session/events.rs
@@ -158,20 +158,14 @@ pub(super) fn process_key(session: &mut Session, key: KeyEvent) -> Option<Inline
             Some(InlineEvent::ScrollPageDown)
         }
         KeyCode::Up => {
-            // Navigate to previous history entry when input is enabled
-            if session.input_enabled {
-                session.navigate_history_previous();
-                session.mark_dirty();
-            }
-            None
+            session.scroll_line_up();
+            session.mark_dirty();
+            Some(InlineEvent::ScrollLineUp)
         }
         KeyCode::Down => {
-            // Navigate to next history entry when input is enabled
-            if session.input_enabled {
-                session.navigate_history_next();
-                session.mark_dirty();
-            }
-            None
+            session.scroll_line_down();
+            session.mark_dirty();
+            Some(InlineEvent::ScrollLineDown)
         }
         KeyCode::Enter => {
             if !session.input_enabled {
diff --git a/vtcode-core/src/ui/tui/session/input_manager.rs b/vtcode-core/src/ui/tui/session/input_manager.rs
@@ -47,14 +47,6 @@ impl InputManager {
         self.reset_history_navigation();
     }
 
-    /// Sets the input content without resetting history navigation
-    ///
-    /// Used during history navigation to preserve the history index
-    pub fn set_content_preserve_history(&mut self, content: String) {
-        self.content = content.clone();
-        self.cursor = content.len();
-    }
-
     /// Returns the current cursor position
     pub fn cursor(&self) -> usize {
         self.cursor

Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,12 @@ impl ScrollAccumulator {`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`-/// Check if session has any modal, palette, or input active that uses arrow key navigation`
	`86`	`+/// Check if session has any modal or palette active that uses arrow key navigation`
`87`	`87`	`fn has_active_navigation_ui(session: &Session) -> bool {`
`88`	`88`	`session.modal.is_some()`
`89`	`89`	`\|\| session.file_palette_active`
`90`	`90`	`\|\| session.prompt_palette_active`
`91`	`91`	`\|\| session.config_palette_active`
`92`		`- \|\| session.is_input_enabled()`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`const INLINE_FALLBACK_ROWS: u16 = ui::DEFAULT_INLINE_VIEWPORT_ROWS;`
Original file line number	Diff line number	Diff line change
`@@ -339,11 +339,6 @@ impl Session {`
`339`	`339`	`self.mark_dirty();`
`340`	`340`	`}`
`341`	`341`
`342`		`- /// Check if input is currently enabled`
`343`		`- pub(crate) fn is_input_enabled(&self) -> bool {`
`344`		`- self.input_enabled`
`345`		`- }`
`346`		`-`
`347`	`342`	`pub fn set_log_receiver(&mut self, receiver: UnboundedReceiver<LogEntry>) {`
`348`	`343`	`self.log_receiver = Some(receiver);`
`349`	`344`	`}`