agent/codex
1
0
Fork 0
mirror of https://github.com/pchuan98/codex.git synced 2026-07-01 00:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up TUI /plugins row allignment (#15669)

Browse Source 
- Remove marketplace from left column.
- Change `Can be installed` to `Available`
- Align right-column marketplace + selected-row hint text across states.
- Changes applied to both `tui` and `tui_app_server`.
- Update related snapshots/tests.


<img width="2142" height="590" alt="image"
src="https://github.com/user-attachments/assets/6e60b783-2bea-46d4-b353-f2fd328ac4d0"
/>
This commit is contained in:
canvrno-oai
2026-03-24 13:27:10 -07:00
committed by GitHub
Unverified
parent 0f957a93cd
commit 3ba0e85edd
10 changed files with 56 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/tui/src/chatwidget/plugins.rs
+17 -5
View File
@@ -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
@@ -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),
@@ -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}"),
@@ -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",
}
}
codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installable.snap
+1 -1
View File
@@ -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.
codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_curated_marketplace.snap
+4 -7
View File
@@ -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.
codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_search_filtered.snap
+1 -1
View File
@@ -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.
codex-rs/tui/src/chatwidget/tests.rs
+5 -7
View File
@@ -7413,7 +7413,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}"
);
}
@@ -7449,7 +7449,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}"
);
@@ -7482,7 +7482,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}"
);
}
@@ -7530,8 +7530,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}"
);
}
@@ -7583,8 +7582,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!(
codex-rs/tui_app_server/src/chatwidget/plugins.rs
+17 -5
View File
@@ -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
@@ -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),
@@ -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}"),
@@ -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",
}
}
codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui_app_server__chatwidget__tests__plugin_detail_popup_installable.snap
+1 -1
View File
@@ -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.
codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui_app_server__chatwidget__tests__plugins_popup_curated_marketplace.snap
+4 -7
View File
@@ -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.
codex-rs/tui_app_server/src/chatwidget/snapshots/codex_tui_app_server__chatwidget__tests__plugins_popup_search_filtered.snap
+1 -1
View File
@@ -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.
codex-rs/tui_app_server/src/chatwidget/tests.rs
+5 -7
View File
@@ -8010,7 +8010,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}"
);
}
@@ -8046,7 +8046,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}"
);
@@ -8079,7 +8079,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}"
);
}
@@ -8127,8 +8127,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}"
);
}
@@ -8180,8 +8179,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!(