Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions crates/tui/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ impl Settings {
("calm_mode", "Calmer UI defaults: on/off"),
(
"tool_collapse",
"Dense tool-run collapse mode: compact, expanded, calm",
"Dense tool-run collapse mode: collapsed (alias compact), expanded, calm",
),
(
"low_motion",
Expand Down Expand Up @@ -1362,7 +1362,7 @@ fn normalize_transcript_spacing(value: &str) -> &str {

fn normalize_tool_collapse_mode(value: &str) -> &str {
match value.trim().to_ascii_lowercase().as_str() {
"compact" | "default" | "on" | "true" => "compact",
"compact" | "collapsed" | "collapse" | "default" | "on" | "true" => "compact",
"expanded" | "expand" | "off" | "none" | "false" => "expanded",
"calm" | "calm_mode" | "calm-mode" | "calm_only" | "calm-only" => "calm",
_ => value,
Expand Down Expand Up @@ -1830,6 +1830,18 @@ mod tests {
settings.set("collapse", "off").expect("off alias");
assert_eq!(settings.tool_collapse_mode, "expanded");

// Issue #3256 proposes `collapsed` as the default verbosity name;
// accept it (and the bare verb) as an alias of the canonical `compact`.
settings
.set("tool_collapse", "collapsed")
.expect("collapsed alias");
assert_eq!(settings.tool_collapse_mode, "compact");
settings.set("tool_collapse", "expanded").expect("reset");
settings
.set("tool_collapse", "collapse")
.expect("collapse alias");
assert_eq!(settings.tool_collapse_mode, "compact");

let err = settings
.set("tool_collapse", "mystery")
.expect_err("invalid collapse mode");
Expand Down
2 changes: 2 additions & 0 deletions crates/tui/src/tui/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,8 @@ impl ToolCollapseMode {
match value.trim().to_ascii_lowercase().as_str() {
"expanded" | "off" | "none" => Self::Expanded,
"calm" | "calm-mode" | "calm_only" | "calm-only" => Self::Calm,
// `collapsed`/`collapse` are issue #3256's preferred names for the
// default; treat them like the canonical `compact`.
_ => Self::Compact,
}
}
Expand Down
Loading