Skip to content

Clear the current line on ctrl-c in line with other tools #3764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DOsinga merged 2 commits into from
Aug 5, 2025
Merged

Clear the current line on ctrl-c in line with other tools #3764

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3804bb4
Clear the current line on ctrl-c in line with other tools
Jul 31, 2025
2d66c21
Lint
Aug 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion crates/goose-cli/src/session/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,25 @@ pub struct PlanCommandOptions {
pub message_text: String,
}

struct CtrlCHandler;

impl rustyline::ConditionalEventHandler for CtrlCHandler {
/// Handle Ctrl+C to clear the line if text is entered, otherwise exit the session.
fn handle(
&self,
_event: &rustyline::Event,
_n: usize,
_positive: bool,
ctx: &rustyline::EventContext,
) -> Option<rustyline::Cmd> {
if !ctx.line().is_empty() {
Some(rustyline::Cmd::Kill(rustyline::Movement::WholeBuffer))
} else {
Some(rustyline::Cmd::Interrupt)
}
}
}

pub fn get_input(
editor: &mut Editor<GooseCompleter, rustyline::history::DefaultHistory>,
) -> Result<InputResult> {
Expand All @@ -44,7 +63,13 @@ pub fn get_input(
rustyline::EventHandler::Simple(rustyline::Cmd::Newline),
);

editor.bind_sequence(
rustyline::KeyEvent(rustyline::KeyCode::Char('c'), rustyline::Modifiers::CTRL),
rustyline::EventHandler::Conditional(Box::new(CtrlCHandler)),
);

let prompt = format!("{} ", console::style("( O)>").cyan().bold());

let input = match editor.readline(&prompt) {
Ok(text) => text,
Err(e) => match e {
Expand Down Expand Up @@ -270,7 +295,7 @@ fn print_help() {
/clear - Clears the current chat history

Navigation:
Ctrl+C - Interrupt goose (resets the interaction to before the interrupted user request)
Copy link
Collaborator

@michaelneale michaelneale Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does it still interrupt when running with this change?

Copy link
Collaborator Author

@DOsinga DOsinga Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well, like it says, it only interrupt it if the text buffer is empty. the sequence should be:

  • if goose is running, ctl-c stops it
  • if you have something in the buffer, ctrl-c clears it
  • if nothing, exit goose

Ctrl+C - Clear current line if text is entered, otherwise exit the session
Ctrl+J - Add a newline
Up/Down arrows - Navigate through command history"
);
Expand Down
Loading