Skip to content

feat(tui): move 'y' alias from archive to delete in C-x k prompt #445

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
edwin-zvs merged 1 commit into from
Jun 23, 2026
Merged

feat(tui): move 'y' alias from archive to delete in C-x k prompt #445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions crates/cli/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6277,7 +6277,7 @@ impl App {
Selection::Session(id) => {
self.minibuffer = Some(Minibuffer {
prompt: format!(
"Session {}: [d] delete (drop transcript + worktree) / [y/a] archive (terminate, keep, hide) / [N] cancel: ",
"Session {}: [d/y] delete (drop transcript + worktree) / [a] archive (terminate, keep, hide) / [N] cancel: ",
short_id(&id)
),
input: String::new(),
Expand Down Expand Up @@ -12143,9 +12143,9 @@ pub fn parse_group_delete_choice(input: &str) -> GroupDeleteChoice {
/// Outcome of the session kill prompt (`C-x k` / the view `x` button).
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum SessionEndChoice {
/// `d` / `delete` — drop the transcript, worktree, and all on-disk state.
/// `d` / `y` / `delete` — drop the transcript, worktree, and all on-disk state.
Delete,
/// `a` / `y` / `archive` — terminate the adapter but keep the session; it's
/// `a` / `archive` — terminate the adapter but keep the session; it's
/// hidden from the list until the "show archived" toggle is on, and can be
/// restarted later.
Archive,
Expand All @@ -12155,8 +12155,8 @@ pub enum SessionEndChoice {

pub fn parse_session_end_choice(input: &str) -> SessionEndChoice {
match input.trim().to_lowercase().as_str() {
"d" | "delete" => SessionEndChoice::Delete,
"a" | "y" | "archive" => SessionEndChoice::Archive,
"d" | "y" | "delete" => SessionEndChoice::Delete,
"a" | "archive" => SessionEndChoice::Archive,
_ => SessionEndChoice::Cancel,
}
}
Expand Down Expand Up @@ -12227,8 +12227,8 @@ mod session_end_prompt_tests {
use super::{parse_session_end_choice, SessionEndChoice};

#[test]
fn d_or_delete_deletes() {
for s in ["d", "D", " d ", "delete", "DELETE", " Delete "] {
fn d_or_y_or_delete_deletes() {
for s in ["d", "D", " d ", "y", "Y", " y ", "delete", "DELETE", " Delete "] {
assert_eq!(
parse_session_end_choice(s),
SessionEndChoice::Delete,
Expand All @@ -12238,8 +12238,8 @@ mod session_end_prompt_tests {
}

#[test]
fn a_or_y_or_archive_archives() {
for s in ["a", "A", " a ", "y", "Y", " y ", "archive", "ARCHIVE", " Archive "] {
fn a_or_archive_archives() {
for s in ["a", "A", " a ", "archive", "ARCHIVE", " Archive "] {
assert_eq!(
parse_session_end_choice(s),
SessionEndChoice::Archive,
Expand Down
Loading