Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

fix(cli): filter non-Press key events to prevent double-registration (#2737)

Xiaobin Huang44b3895e8bb3
diff --git a/crates/ov_cli/src/commands/skills.rs b/crates/ov_cli/src/commands/skills.rs
index 6367bce9a..98880db80 100644
--- a/crates/ov_cli/src/commands/skills.rs
+++ b/crates/ov_cli/src/commands/skills.rs
@@ -1386,7 +1386,7 @@ fn prompt_multi_select_skills(
) -> Result<Option<Vec<String>>> {
use crossterm::{
cursor,
- event::{self, Event, KeyCode, KeyModifiers},
+ event::{self, Event, KeyCode, KeyEventKind, KeyModifiers},
execute, terminal,
};
@@ -1422,48 +1422,60 @@ fn prompt_multi_select_skills(
let _raw_guard = RawGuard::enter()?;
let mut current = 0usize;
let mut checked = vec![false; skills.len()];
- let mut rendered_region = RenderedSkillSelectRegion::default();
- loop {
- clear_rendered_region(&rendered_region)?;
- let lines = skill_multi_select_lines(prompt, skills, current, &checked);
- rendered_region =
- RenderedSkillSelectRegion::from_lines(&lines, live_skill_select_columns());
- print!("{}", live_select_block(&lines));
- io::stdout().flush()?;
+ // Initial render
+ let lines = skill_multi_select_lines(prompt, skills, current, &checked);
+ let mut rendered_region =
+ RenderedSkillSelectRegion::from_lines(&lines, live_skill_select_columns());
+ print!("{}", live_select_block(&lines));
+ io::stdout().flush()?;
+ loop {
match event::read()? {
- Event::Key(key) => match key.code {
- KeyCode::Up => {
- current = if current == 0 {
- skills.len().saturating_sub(1)
- } else {
- current - 1
- };
- }
- KeyCode::Down => current = (current + 1) % skills.len(),
- KeyCode::Char(' ') => checked[current] = !checked[current],
- KeyCode::Char('a') | KeyCode::Char('A') => {
- let select_all = checked.iter().any(|value| !*value);
- checked.fill(select_all);
- }
- KeyCode::Enter | KeyCode::Char('\n') | KeyCode::Char('\r') => {
- clear_rendered_region(&rendered_region)?;
- let selected = selected_skill_names(skills, current, &checked);
- return Ok(Some(selected));
+ Event::Key(key) if key.kind == KeyEventKind::Press => {
+ match key.code {
+ KeyCode::Up => {
+ current = if current == 0 {
+ skills.len().saturating_sub(1)
+ } else {
+ current - 1
+ };
+ }
+ KeyCode::Down => current = (current + 1) % skills.len(),
+ KeyCode::Char(' ') => checked[current] = !checked[current],
+ KeyCode::Char('a') | KeyCode::Char('A') => {
+ let select_all = checked.iter().any(|value| !*value);
+ checked.fill(select_all);
+ }
+ KeyCode::Enter | KeyCode::Char('\n') | KeyCode::Char('\r') => {
+ clear_rendered_region(&rendered_region)?;
+ let selected = selected_skill_names(skills, current, &checked);
+ return Ok(Some(selected));
+ }
+ KeyCode::Esc => {
+ clear_rendered_region(&rendered_region)?;
+ return Ok(None);
+ }
+ KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+ clear_rendered_region(&rendered_region)?;
+ return Err(Error::Client("Aborted.".to_string()));
+ }
+ _ => continue,
}
- KeyCode::Esc => {
- clear_rendered_region(&rendered_region)?;
- return Ok(None);
- }
- KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => {
- clear_rendered_region(&rendered_region)?;
- return Err(Error::Client("Aborted.".to_string()));
- }
- _ => {}
- },
+ clear_rendered_region(&rendered_region)?;
+ let lines = skill_multi_select_lines(prompt, skills, current, &checked);
+ rendered_region =
+ RenderedSkillSelectRegion::from_lines(&lines, live_skill_select_columns());
+ print!("{}", live_select_block(&lines));
+ io::stdout().flush()?;
+ }
Event::Resize(_, _) => {
- // Redraw on the next loop using the new terminal width.
+ clear_rendered_region(&rendered_region)?;
+ let lines = skill_multi_select_lines(prompt, skills, current, &checked);
+ rendered_region =
+ RenderedSkillSelectRegion::from_lines(&lines, live_skill_select_columns());
+ print!("{}", live_select_block(&lines));
+ io::stdout().flush()?;
}
_ => {}
}
diff --git a/crates/ov_cli/src/config_wizard/wizard.rs b/crates/ov_cli/src/config_wizard/wizard.rs
index 9bd2d3369..9a6aba88a 100644
--- a/crates/ov_cli/src/config_wizard/wizard.rs
+++ b/crates/ov_cli/src/config_wizard/wizard.rs
@@ -8,7 +8,7 @@ use colored::Colorize;
use crossterm::{
ExecutableCommand,
cursor::{Hide, MoveToColumn, MoveUp, Show},
- event::{self, Event, KeyCode, KeyModifiers},
+ event::{self, Event, KeyCode, KeyEventKind, KeyModifiers},
terminal::{self, Clear, ClearType, disable_raw_mode, enable_raw_mode},
};
use unicode_width::UnicodeWidthChar;
@@ -5638,44 +5638,59 @@ fn prompt_select<T: ToString>(
let mut selected = default.min(items.len().saturating_sub(1));
let raw = RawPrompt::enter(true)?;
- loop {
- ui.render(&select_live_lines(
- section,
- prompt,
- &items,
- selected,
- helper_lines,
- ))?;
+ ui.render(&select_live_lines(
+ section,
+ prompt,
+ &items,
+ selected,
+ helper_lines,
+ ))?;
+ loop {
match event::read()? {
- Event::Key(key) => match key.code {
- KeyCode::Up => {
- selected = if selected == 0 {
- items.len().saturating_sub(1)
- } else {
- selected - 1
- };
- }
- KeyCode::Down => selected = (selected + 1) % items.len().max(1),
- KeyCode::Enter => {
- drop(raw);
- ui.clear()?;
- return Ok(PromptResult::Value(selected));
- }
- KeyCode::Esc => {
- drop(raw);
- ui.clear()?;
- return Ok(PromptResult::Back);
- }
- KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => {
- drop(raw);
- ui.clear()?;
- return Ok(PromptResult::Quit);
+ Event::Key(key) if key.kind == KeyEventKind::Press => {
+ match key.code {
+ KeyCode::Up => {
+ selected = if selected == 0 {
+ items.len().saturating_sub(1)
+ } else {
+ selected - 1
+ };
+ }
+ KeyCode::Down => selected = (selected + 1) % items.len().max(1),
+ KeyCode::Enter => {
+ drop(raw);
+ ui.clear()?;
+ return Ok(PromptResult::Value(selected));
+ }
+ KeyCode::Esc => {
+ drop(raw);
+ ui.clear()?;
+ return Ok(PromptResult::Back);
+ }
+ KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+ drop(raw);
+ ui.clear()?;
+ return Ok(PromptResult::Quit);
+ }
+ _ => continue,
}
- _ => {}
- },
+ ui.render(&select_live_lines(
+ section,
+ prompt,
+ &items,
+ selected,
+ helper_lines,
+ ))?;
+ }
Event::Resize(_, _) => {
- // Redraw on the next loop using the new terminal width.
+ ui.render(&select_live_lines(
+ section,
+ prompt,
+ &items,
+ selected,
+ helper_lines,
+ ))?;
}
_ => {}
}
@@ -5713,7 +5728,7 @@ fn prompt_text(
let raw = RawPrompt::enter(false)?;
loop {
match event::read()? {
- Event::Key(key) => match key.code {
+ Event::Key(key) if key.kind == KeyEventKind::Press => match key.code {
KeyCode::Enter => {
let chosen = if value.trim().is_empty() {
default_copy.trim().to_string()
@@ -5767,6 +5782,7 @@ fn prompt_text(
}
_ => {}
},
+ Event::Key(_) => {}
Event::Resize(_, _) => {
render_text_prompt(
ui,
diff --git a/crates/ov_cli/src/handlers.rs b/crates/ov_cli/src/handlers.rs
index d6b97482c..ceb73ac86 100644
--- a/crates/ov_cli/src/handlers.rs
+++ b/crates/ov_cli/src/handlers.rs
@@ -970,7 +970,7 @@ fn prompt_select(prompt: &str, items: &[String], default: usize) -> Result<Selec
use crossterm::{
cursor,
- event::{self, Event, KeyCode, KeyModifiers},
+ event::{self, Event, KeyCode, KeyEventKind, KeyModifiers},
execute, terminal,
};
@@ -1002,42 +1002,52 @@ fn prompt_select(prompt: &str, items: &[String], default: usize) -> Result<Selec
}
let mut selected = default.min(items.len().saturating_sub(1));
- let mut rendered_region = RenderedSelectRegion::default();
let _raw_guard = RawGuard::enter()?;
- loop {
- clear_rendered_region(&rendered_region)?;
- let lines = select_lines(prompt, items, selected);
- rendered_region = RenderedSelectRegion::from_lines(&lines, live_select_columns());
- print!("{}", live_select_block(&lines));
- io::stdout().flush()?;
+ // Initial render
+ let lines = select_lines(prompt, items, selected);
+ let mut rendered_region = RenderedSelectRegion::from_lines(&lines, live_select_columns());
+ print!("{}", live_select_block(&lines));
+ io::stdout().flush()?;
+ loop {
match event::read()? {
- Event::Key(key) => match key.code {
- KeyCode::Up => {
- selected = if selected == 0 {
- items.len().saturating_sub(1)
- } else {
- selected - 1
- };
- }
- KeyCode::Down => selected = (selected + 1) % items.len(),
- KeyCode::Enter | KeyCode::Char('\n') | KeyCode::Char('\r') => {
- clear_rendered_region(&rendered_region)?;
- return Ok(SelectOutcome::Selected(selected));
- }
- KeyCode::Esc => {
- clear_rendered_region(&rendered_region)?;
- return Ok(SelectOutcome::Back);
- }
- KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => {
- clear_rendered_region(&rendered_region)?;
- return Ok(SelectOutcome::Quit);
+ Event::Key(key) if key.kind == KeyEventKind::Press => {
+ match key.code {
+ KeyCode::Up => {
+ selected = if selected == 0 {
+ items.len().saturating_sub(1)
+ } else {
+ selected - 1
+ };
+ }
+ KeyCode::Down => selected = (selected + 1) % items.len(),
+ KeyCode::Enter | KeyCode::Char('\n') | KeyCode::Char('\r') => {
+ clear_rendered_region(&rendered_region)?;
+ return Ok(SelectOutcome::Selected(selected));
+ }
+ KeyCode::Esc => {
+ clear_rendered_region(&rendered_region)?;
+ return Ok(SelectOutcome::Back);
+ }
+ KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+ clear_rendered_region(&rendered_region)?;
+ return Ok(SelectOutcome::Quit);
+ }
+ _ => continue,
}
- _ => {}
- },
+ clear_rendered_region(&rendered_region)?;
+ let lines = select_lines(prompt, items, selected);
+ rendered_region = RenderedSelectRegion::from_lines(&lines, live_select_columns());
+ print!("{}", live_select_block(&lines));
+ io::stdout().flush()?;
+ }
Event::Resize(_, _) => {
- // Redraw on the next loop using the new terminal width.
+ clear_rendered_region(&rendered_region)?;
+ let lines = select_lines(prompt, items, selected);
+ rendered_region = RenderedSelectRegion::from_lines(&lines, live_select_columns());
+ print!("{}", live_select_block(&lines));
+ io::stdout().flush()?;
}
_ => {}
}