Skip to content

fix(tui): use the footer's own words in the settings preview #6993

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
Hmbown merged 1 commit into from
Oct 16, 2026
Merged

fix(tui): use the footer's own words in the settings preview #6993

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion crates/tui/src/tui/goldens/config_panel_120x32.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
│ │
│ │
system | terminal | shoreline | shoreline-light | underwater | underwater-retro | dark | light | grayscale |…
Preview: ● ask agent
Preview: ● ask work
type=filter, Up/Down=select, Enter=edit, Esc=close
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

2 changes: 1 addition & 1 deletion crates/tui/src/tui/goldens/config_panel_80x24.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
system | terminal | shoreline | shoreline-light | underwater |…
Enter or click again: Enter opens choices · Theme: current terminal · saved
terminal · applies on save
Preview: ● ask agent
Preview: ● ask work
type=filter, Up/Down=select, Enter=edit, PgUp/PgDn=scroll, Esc=close
──────────────────────────────────────────────────────────────────────────────

6 changes: 3 additions & 3 deletions crates/tui/src/tui/underwater.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,15 +687,15 @@ impl ShellPhase {

/// Exhaustive on purpose: a new [`AppMode`] must be handed a Policy ink
/// deliberately rather than inheriting act's by falling through a wildcard.
fn header_mode_ink(mode: AppMode) -> ChromeInk {
pub(crate) fn header_mode_ink(mode: AppMode) -> ChromeInk {
match mode {
AppMode::Plan => ChromeInk::PolicyPlan,
AppMode::Operate => ChromeInk::PolicyOperate,
AppMode::Agent => ChromeInk::PolicyAct,
}
}

fn header_permission_ink(mode: ApprovalMode) -> ChromeInk {
pub(crate) fn header_permission_ink(mode: ApprovalMode) -> ChromeInk {
match mode {
ApprovalMode::Suggest | ApprovalMode::Never => ChromeInk::PermissionAsk,
ApprovalMode::Auto => ChromeInk::PermissionAutoReview,
Expand Down Expand Up @@ -900,7 +900,7 @@ pub(crate) fn phase_marker_with_activity(
}
}

fn mode_label(locale: Locale, mode: AppMode) -> Cow<'static, str> {
pub(crate) fn mode_label(locale: Locale, mode: AppMode) -> Cow<'static, str> {
match mode {
AppMode::Agent => tr(locale, MessageId::ChipModeAct),
AppMode::Plan => tr(locale, MessageId::ChipModePlan),
Expand Down
31 changes: 16 additions & 15 deletions crates/tui/src/tui/views/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5300,25 +5300,26 @@ impl ConfigView {
let context_percent = self.snapshot.context_budget.as_ref().map_or(0, |budget| {
u8::try_from(budget.percent_basis_points / 100).unwrap_or(100)
});
let mode = value_of("default_mode").unwrap_or_else(|| "agent".to_string());
let mode_ink = match mode.as_str() {
"plan" => palette::ChromeInk::PolicyPlan,
"operate" => palette::ChromeInk::PolicyOperate,
_ => palette::ChromeInk::PolicyAct,
};
let permission = value_of("approval_mode")
let mode = value_of("default_mode").map_or(codewhale_config::AppMode::Agent, |value| {
codewhale_config::AppMode::from_setting(&value)
});
let approval = value_of("approval_mode")
.or_else(|| value_of("permission_posture"))
.unwrap_or_else(|| "ask".to_string());
let permission_ink = match permission.as_str() {
"auto-review" => palette::ChromeInk::PermissionAutoReview,
"full-access" => palette::ChromeInk::PermissionFullAccess,
_ => palette::ChromeInk::PermissionAsk,
};
.and_then(|value| codewhale_execpolicy::ApprovalMode::from_config_value(&value))
.unwrap_or(codewhale_execpolicy::ApprovalMode::Suggest);
let mode_label = crate::tui::underwater::mode_label(self.locale, mode);
let permission = crate::core::authority::permission_label_for(self.locale, mode, approval);
let footer = crate::tui::phase_strip::TidelineFooter::new(
&theme,
(permission.as_str(), permission_ink),
(
permission.as_ref(),
crate::tui::underwater::header_permission_ink(approval),
),
)
.mode_chip(Some((mode.as_str(), mode_ink)))
.mode_chip(Some((
mode_label.as_ref(),
crate::tui::underwater::header_mode_ink(mode),
)))
.context_percent(context_percent);
crate::tui::phase_strip::render_tideline_footer(
Rect {
Expand Down
Loading