Skip to content

Clean up TUI /plugins row allignment #15669

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
canvrno-oai merged 3 commits into from
Mar 24, 2026
Merged

Clean up TUI /plugins row allignment #15669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d48adbd
Clean up TUI /plugins row allignment
canvrno-oai Mar 24, 2026
dc26e7b
snapshots
canvrno-oai Mar 24, 2026
63a75df
Remove bullet before enter
canvrno-oai Mar 24, 2026
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
22 changes: 17 additions & 5 deletions codex-rs/tui/src/chatwidget/plugins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,14 +673,21 @@ impl ChatWidget {
.then_with(|| left.1.name.cmp(&right.1.name))
.then_with(|| left.1.id.cmp(&right.1.id))
});
let status_label_width = plugin_entries
.iter()
.map(|(_, plugin, _)| plugin_status_label(plugin).chars().count())
.max()
.unwrap_or(0);

let mut items: Vec<SelectionItem> = Vec::new();
for (marketplace, plugin, display_name) in plugin_entries {
let marketplace_label = marketplace_display_name(marketplace);
let status_label = plugin_status_label(plugin);
let description = plugin_brief_description(plugin, &marketplace_label);
let description =
plugin_brief_description(plugin, &marketplace_label, status_label_width);
let selected_status_label = format!("{status_label:<status_label_width$}");
let selected_description =
format!("{status_label}. Press Enter to view plugin details.");
format!("{selected_status_label} Press Enter to view plugin details.");
let search_value = format!(
"{display_name} {} {} {}",
plugin.id, plugin.name, marketplace_label
Expand All @@ -691,7 +698,7 @@ impl ChatWidget {
let plugin_name = plugin.name.clone();

items.push(SelectionItem {
name: format!("{display_name} · {marketplace_label}"),
name: display_name,
description: Some(description),
selected_description: Some(selected_description),
search_value: Some(search_value),
Expand Down Expand Up @@ -876,8 +883,13 @@ fn plugin_display_name(plugin: &PluginSummary) -> String {
.unwrap_or_else(|| plugin.name.clone())
}

fn plugin_brief_description(plugin: &PluginSummary, marketplace_label: &str) -> String {
fn plugin_brief_description(
plugin: &PluginSummary,
marketplace_label: &str,
status_label_width: usize,
) -> String {
let status_label = plugin_status_label(plugin);
let status_label = format!("{status_label:<status_label_width$}");
match plugin_description(plugin) {
Some(description) => format!("{status_label} · {marketplace_label} · {description}"),
None => format!("{status_label} · {marketplace_label}"),
Expand All @@ -894,7 +906,7 @@ fn plugin_status_label(plugin: &PluginSummary) -> &'static str {
} else {
match plugin.install_policy {
PluginInstallPolicy::NotAvailable => "Not installable",
PluginInstallPolicy::Available => "Can be installed",
PluginInstallPolicy::Available => "Available",
PluginInstallPolicy::InstalledByDefault => "Available by default",
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...c/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installable.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ expression: popup
---
Plugins
Figma · ChatGPT Marketplace
Can be installed
Available
Turn Figma files into implementation context.

› 1. Back to plugins Return to the plugin list.
Expand Down
11 changes: 4 additions & 7 deletions ...chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_curated_marketplace.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ expression: popup
Using cached marketplace data: remote sync timed out

Type to search plugins
› Alpha Sync · ChatGPT Marketplace Installed · Disabled. Press Enter to view plugin details.
Bravo Search · ChatGPT Marketplace Can be installed · ChatGPT Marketplace · Search docs and
tickets.
Hidden Repo Plugin · Repo Marketplace Can be installed · Repo Marketplace · Should not be shown
in /plugins.
Starter · ChatGPT Marketplace Available by default · ChatGPT Marketplace · Included by
default.
› Alpha Sync Installed · Disabled Press Enter to view plugin details.
Bravo Search Available · ChatGPT Marketplace · Search docs and tickets.
Hidden Repo Plugin Available · Repo Marketplace · Should not be shown in /plugins.
Starter Available by default · ChatGPT Marketplace · Included by default.

Press esc to close.
2 changes: 1 addition & 1 deletion ...src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_search_filtered.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ expression: popup
Installed 0 of 3 available plugins.

sla
› Slack · ChatGPT Marketplace Can be installed. Press Enter to view plugin details.
› Slack Available Press Enter to view plugin details.

Press esc to close.
12 changes: 5 additions & 7 deletions codex-rs/tui/src/chatwidget/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7411,7 +7411,7 @@ async fn plugins_popup_refresh_replaces_selection_with_first_row() {
"expected refresh to rebuild the popup from the new first row, got:\n{after}"
);
assert!(
after.contains("Slack · ChatGPT Marketplace"),
after.contains("Slack"),
"expected refreshed popup to include the updated plugin list, got:\n{after}"
);
}
Expand Down Expand Up @@ -7447,7 +7447,7 @@ async fn plugins_popup_refreshes_installed_counts_after_install() {
"expected initial installed count before refresh, got:\n{before}"
);
assert!(
before.contains("Can be installed"),
before.contains("Available"),
"expected pre-install popup copy before refresh, got:\n{before}"
);

Expand Down Expand Up @@ -7480,7 +7480,7 @@ async fn plugins_popup_refreshes_installed_counts_after_install() {
"expected /plugins to refresh installed counts after install, got:\n{after}"
);
assert!(
after.contains("Installed. Press Enter to view plugin details."),
after.contains("Installed Press Enter to view plugin details."),
"expected refreshed selected row copy to reflect the installed plugin state, got:\n{after}"
);
}
Expand Down Expand Up @@ -7528,8 +7528,7 @@ async fn plugins_popup_search_filters_visible_rows_snapshot() {
let popup = render_bottom_popup(&chat, 100);
assert_snapshot!("plugins_popup_search_filtered", popup);
assert!(
!popup.contains("Calendar · ChatGPT Marketplace")
&& !popup.contains("Drive · ChatGPT Marketplace"),
!popup.contains("Calendar") && !popup.contains("Drive"),
"expected search to leave only matching rows visible, got:\n{popup}"
);
}
Expand Down Expand Up @@ -7581,8 +7580,7 @@ async fn plugins_popup_search_no_matches_and_backspace_restores_results() {

let restored = render_bottom_popup(&chat, 100);
assert!(
restored.contains("Calendar · ChatGPT Marketplace")
&& restored.contains("Slack · ChatGPT Marketplace"),
restored.contains("Calendar") && restored.contains("Slack"),
"expected clearing the query to restore the plugin rows, got:\n{restored}"
);
assert!(
Expand Down
22 changes: 17 additions & 5 deletions codex-rs/tui_app_server/src/chatwidget/plugins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,14 +673,21 @@ impl ChatWidget {
.then_with(|| left.1.name.cmp(&right.1.name))
.then_with(|| left.1.id.cmp(&right.1.id))
});
let status_label_width = plugin_entries
.iter()
.map(|(_, plugin, _)| plugin_status_label(plugin).chars().count())
.max()
.unwrap_or(0);

let mut items: Vec<SelectionItem> = Vec::new();
for (marketplace, plugin, display_name) in plugin_entries {
let marketplace_label = marketplace_display_name(marketplace);
let status_label = plugin_status_label(plugin);
let description = plugin_brief_description(plugin, &marketplace_label);
let description =
plugin_brief_description(plugin, &marketplace_label, status_label_width);
let selected_status_label = format!("{status_label:<status_label_width$}");
let selected_description =
format!("{status_label}. Press Enter to view plugin details.");
format!("{selected_status_label} Press Enter to view plugin details.");
let search_value = format!(
"{display_name} {} {} {}",
plugin.id, plugin.name, marketplace_label
Expand All @@ -691,7 +698,7 @@ impl ChatWidget {
let plugin_name = plugin.name.clone();

items.push(SelectionItem {
name: format!("{display_name} · {marketplace_label}"),
name: display_name,
description: Some(description),
selected_description: Some(selected_description),
search_value: Some(search_value),
Expand Down Expand Up @@ -876,8 +883,13 @@ fn plugin_display_name(plugin: &PluginSummary) -> String {
.unwrap_or_else(|| plugin.name.clone())
}

fn plugin_brief_description(plugin: &PluginSummary, marketplace_label: &str) -> String {
fn plugin_brief_description(
plugin: &PluginSummary,
marketplace_label: &str,
status_label_width: usize,
) -> String {
let status_label = plugin_status_label(plugin);
let status_label = format!("{status_label:<status_label_width$}");
match plugin_description(plugin) {
Some(description) => format!("{status_label} · {marketplace_label} · {description}"),
None => format!("{status_label} · {marketplace_label}"),
Expand All @@ -894,7 +906,7 @@ fn plugin_status_label(plugin: &PluginSummary) -> &'static str {
} else {
match plugin.install_policy {
PluginInstallPolicy::NotAvailable => "Not installable",
PluginInstallPolicy::Available => "Can be installed",
PluginInstallPolicy::Available => "Available",
PluginInstallPolicy::InstalledByDefault => "Available by default",
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...t/snapshots/codex_tui_app_server__chatwidget__tests__plugin_detail_popup_installable.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ expression: popup
---
Plugins
Figma · ChatGPT Marketplace
Can be installed
Available
Turn Figma files into implementation context.

› 1. Back to plugins Return to the plugin list.
Expand Down
11 changes: 4 additions & 7 deletions ...snapshots/codex_tui_app_server__chatwidget__tests__plugins_popup_curated_marketplace.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@ expression: popup
Using cached marketplace data: remote sync timed out

Type to search plugins
› Alpha Sync · ChatGPT Marketplace Installed · Disabled. Press Enter to view plugin details.
Bravo Search · ChatGPT Marketplace Can be installed · ChatGPT Marketplace · Search docs and
tickets.
Hidden Repo Plugin · Repo Marketplace Can be installed · Repo Marketplace · Should not be shown
in /plugins.
Starter · ChatGPT Marketplace Available by default · ChatGPT Marketplace · Included by
default.
› Alpha Sync Installed · Disabled Press Enter to view plugin details.
Bravo Search Available · ChatGPT Marketplace · Search docs and tickets.
Hidden Repo Plugin Available · Repo Marketplace · Should not be shown in /plugins.
Starter Available by default · ChatGPT Marketplace · Included by default.

Press esc to close.
2 changes: 1 addition & 1 deletion ...get/snapshots/codex_tui_app_server__chatwidget__tests__plugins_popup_search_filtered.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ expression: popup
Installed 0 of 3 available plugins.

sla
› Slack · ChatGPT Marketplace Can be installed. Press Enter to view plugin details.
› Slack Available Press Enter to view plugin details.

Press esc to close.
12 changes: 5 additions & 7 deletions codex-rs/tui_app_server/src/chatwidget/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8008,7 +8008,7 @@ async fn plugins_popup_refresh_replaces_selection_with_first_row() {
"expected refresh to rebuild the popup from the new first row, got:\n{after}"
);
assert!(
after.contains("Slack · ChatGPT Marketplace"),
after.contains("Slack"),
"expected refreshed popup to include the updated plugin list, got:\n{after}"
);
}
Expand Down Expand Up @@ -8044,7 +8044,7 @@ async fn plugins_popup_refreshes_installed_counts_after_install() {
"expected initial installed count before refresh, got:\n{before}"
);
assert!(
before.contains("Can be installed"),
before.contains("Available"),
"expected pre-install popup copy before refresh, got:\n{before}"
);

Expand Down Expand Up @@ -8077,7 +8077,7 @@ async fn plugins_popup_refreshes_installed_counts_after_install() {
"expected /plugins to refresh installed counts after install, got:\n{after}"
);
assert!(
after.contains("Installed. Press Enter to view plugin details."),
after.contains("Installed Press Enter to view plugin details."),
"expected refreshed selected row copy to reflect the installed plugin state, got:\n{after}"
);
}
Expand Down Expand Up @@ -8125,8 +8125,7 @@ async fn plugins_popup_search_filters_visible_rows_snapshot() {
let popup = render_bottom_popup(&chat, 100);
assert_snapshot!("plugins_popup_search_filtered", popup);
assert!(
!popup.contains("Calendar · ChatGPT Marketplace")
&& !popup.contains("Drive · ChatGPT Marketplace"),
!popup.contains("Calendar") && !popup.contains("Drive"),
"expected search to leave only matching rows visible, got:\n{popup}"
);
}
Expand Down Expand Up @@ -8178,8 +8177,7 @@ async fn plugins_popup_search_no_matches_and_backspace_restores_results() {

let restored = render_bottom_popup(&chat, 100);
assert!(
restored.contains("Calendar · ChatGPT Marketplace")
&& restored.contains("Slack · ChatGPT Marketplace"),
restored.contains("Calendar") && restored.contains("Slack"),
"expected clearing the query to restore the plugin rows, got:\n{restored}"
);
assert!(
Expand Down
Loading