hanzoai/dev
2
0
Fork 0
mirror of https://github.com/hanzoai/dev.git synced 2026-10-25 03:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tui): harden esc undo priming and word motion

Browse Source 
fixes #487
fixes #495
This commit is contained in:
James Peter
2026-01-05 08:12:26 +10:00
parent 97672cc77c
commit d90b0f99d0
4 changed files with 145 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code-rs/tui/src/app/events.rs
+2 -67
View File
@@ -18,7 +18,7 @@ use portable_pty::PtySize;
use crate::app_event::AppEvent;
use crate::bottom_pane::SettingsSection;
use crate::chatwidget::{ChatWidget, EscIntent};
use crate::chatwidget::ChatWidget;
use crate::cloud_tasks_service;
use crate::exec_command::strip_bash_lc_and_escape;
use crate::get_git_diff::get_git_diff;
@@ -386,72 +386,7 @@ impl App<'_> {
match key_event {
KeyEvent { code: KeyCode::Esc, kind: KeyEventKind::Press | KeyEventKind::Repeat, .. } => {
if let AppState::Chat { widget } = &mut self.app_state {
let now = Instant::now();
const THRESHOLD: Duration = Duration::from_millis(600);
let double_ready = self
.last_esc_time
.is_some_and(|prev| now.duration_since(prev) <= THRESHOLD);
let mut handled = false;
let mut attempts = 0;
let esc_event = key_event;
while attempts < 8 {
attempts += 1;
let route = widget.describe_esc_context();
let mut intent = route.intent;
if intent == EscIntent::None {
break;
}
if intent == EscIntent::ShowUndoHint
&& route.allows_double_esc
&& double_ready
{
intent = EscIntent::OpenUndoTimeline;
}
let performed = widget.execute_esc_intent(intent, esc_event);
match intent {
EscIntent::CloseFilePopup if !route.consume => {
if !performed {
break;
}
continue;
}
EscIntent::CloseFilePopup => {
handled = true;
break;
}
EscIntent::ShowUndoHint => {
if route.allows_double_esc && !double_ready {
self.last_esc_time = Some(now);
} else {
self.last_esc_time = None;
}
handled = true;
break;
}
EscIntent::OpenUndoTimeline => {
self.last_esc_time = None;
handled = true;
break;
}
EscIntent::CancelTask | EscIntent::ClearComposer => {
self.last_esc_time = Some(now);
handled = true;
break;
}
_ => {
handled = true;
break;
}
}
}
if handled {
if widget.handle_app_esc(key_event, &mut self.last_esc_time) {
continue;
}
}
code-rs/tui/src/bottom_pane/textarea.rs
+20 -1
View File
@@ -825,7 +825,7 @@ impl TextArea {
{
self.text[..first_non_ws]
.rfind(|c: char| c.is_whitespace())
.map(|i| i + 1)
.map(|i| i + self.text[i..].chars().next().unwrap().len_utf8())
.unwrap_or(0)
} else {
0
@@ -991,6 +991,25 @@ mod tests {
"Ctrl+Alt symbol should not insert printable characters on non-Windows"
);
}
#[test]
fn alt_left_keeps_cursor_on_char_boundary_with_multibyte_space() {
let mut textarea = TextArea::new();
let text = "alpha\u{202f}beta".to_string();
textarea.set_text(&text);
textarea.set_cursor(text.len());
textarea.input(KeyEvent::new(KeyCode::Left, KeyModifiers::ALT));
let cursor = textarea.cursor();
assert!(
textarea.text().is_char_boundary(cursor),
"cursor should stay on a character boundary"
);
let ws_index = textarea.text().find('\u{202f}').expect("whitespace");
let expected = ws_index + '\u{202f}'.len_utf8();
assert_eq!(cursor, expected, "expected cursor to land after whitespace");
}
}
impl WidgetRef for &TextArea {
code-rs/tui/src/chatwidget.rs
+1
View File
@@ -92,6 +92,7 @@ mod running_tools;
#[cfg(any(test, feature = "test-helpers"))]
pub mod smoke_helpers;
#[cfg(test)]
pub(crate) use self::esc::EscIntent;
use self::agent_summary::agent_summary_counts;
use self::esc::AutoGoalEscState;
code-rs/tui/src/chatwidget/esc.rs
+122
View File
@@ -1,4 +1,5 @@
use crossterm::event::KeyEvent;
use std::time::{Duration, Instant};
use super::{ChatWidget, AUTO_ESC_EXIT_HINT, DOUBLE_ESC_HINT};
@@ -258,6 +259,78 @@ impl ChatWidget<'_> {
}
}
pub(crate) fn handle_app_esc(
&mut self,
esc_event: KeyEvent,
last_esc_time: &mut Option<Instant>,
) -> bool {
let now = Instant::now();
const THRESHOLD: Duration = Duration::from_millis(600);
let double_ready = last_esc_time.is_some_and(|prev| now.duration_since(prev) <= THRESHOLD);
let mut handled = false;
let mut attempts = 0;
while attempts < 8 {
attempts += 1;
let route = self.describe_esc_context();
let mut intent = route.intent;
if intent == EscIntent::None {
break;
}
if intent == EscIntent::ShowUndoHint && route.allows_double_esc && double_ready {
intent = EscIntent::OpenUndoTimeline;
}
let performed = self.execute_esc_intent(intent, esc_event);
match intent {
EscIntent::CloseFilePopup if !route.consume => {
if !performed {
break;
}
continue;
}
EscIntent::CloseFilePopup => {
handled = true;
break;
}
EscIntent::ShowUndoHint => {
if route.allows_double_esc && !double_ready {
*last_esc_time = Some(now);
} else {
*last_esc_time = None;
}
handled = true;
break;
}
EscIntent::OpenUndoTimeline => {
*last_esc_time = None;
handled = true;
break;
}
EscIntent::CancelTask | EscIntent::ClearComposer => {
let route_after = self.describe_esc_context();
if route_after.intent == EscIntent::ShowUndoHint && route_after.allows_double_esc {
*last_esc_time = Some(now);
} else {
*last_esc_time = None;
}
handled = true;
break;
}
_ => {
handled = true;
break;
}
}
}
handled
}
pub(super) fn auto_sync_goal_escape_state_from_composer(&mut self) {
if !self.auto_state.should_show_goal_entry() {
return;
@@ -278,3 +351,52 @@ impl ChatWidget<'_> {
}
}
}
#[cfg(test)]
mod tests {
use crate::chatwidget::message::UserMessage;
use crate::chatwidget::smoke_helpers::ChatWidgetHarness;
use crate::chatwidget::{ExecCallId, RunningCommand};
use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
fn make_running_command() -> RunningCommand {
RunningCommand {
command: vec!["sleep".to_string(), "1".to_string()],
parsed: Vec::new(),
history_index: None,
history_id: None,
explore_entry: None,
stdout_offset: 0,
stderr_offset: 0,
wait_total: None,
wait_active: false,
wait_notes: Vec::new(),
}
}
#[test]
fn esc_cancel_does_not_prime_undo_when_queue_restores_composer() {
let mut harness = ChatWidgetHarness::new();
let chat = harness.chat();
chat.exec
.running_commands
.insert(ExecCallId("exec-1".to_string()), make_running_command());
chat.bottom_pane.set_task_running(true);
chat.queued_user_messages
.push_back(UserMessage::from("next prompt".to_string()));
let esc_event = KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE);
let mut last_esc_time = None;
assert!(chat.handle_app_esc(esc_event, &mut last_esc_time));
assert!(
!chat.composer_is_empty(),
"queued message should restore into composer after cancel"
);
assert!(
last_esc_time.is_none(),
"double-esc should not prime while composer refilled after cancel"
);
}
}