openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-05 15:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tui): omit redundant status workspace roots

Browse Source
This commit is contained in:
Felipe Coury
2026-05-30 18:26:09 -03:00
parent 0543eb759e
commit a5fab8a886
2 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
codex-rs/tui/src/status/card.rs
View File

@@ -701,16 +701,15 @@ impl HistoryCell for StatusHistoryCell {
}
});
let mut labels: Vec<String> = vec![
"Model",
"Directory",
"Workspace roots",
"Permissions",
"Agents.md",
]
.into_iter()
.map(str::to_string)
.collect();
let additional_workspace_roots = self
.workspace_roots
.iter()
.filter(|root| root.as_path() != self.directory)
.collect::<Vec<_>>();
let mut labels: Vec<String> = vec!["Model", "Directory", "Permissions", "Agents.md"]
.into_iter()
.map(str::to_string)
.collect();
let mut seen: BTreeSet<String> = labels.iter().cloned().collect();
let thread_name = self.thread_name.as_deref().filter(|name| !name.is_empty());
#[expect(clippy::expect_used)]
@@ -743,6 +742,9 @@ impl HistoryCell for StatusHistoryCell {
if self.collaboration_mode.is_some() {
push_label(&mut labels, &mut seen, "Collaboration mode");
}
if !additional_workspace_roots.is_empty() {
push_label(&mut labels, &mut seen, "Workspace roots");
}
if self.workspace_state_stale {
push_label(&mut labels, &mut seen, "Warning");
}
@@ -807,18 +809,22 @@ impl HistoryCell for StatusHistoryCell {
lines.push(formatter.line("Model provider", vec![Span::from(model_provider.clone())]));
}
lines.push(formatter.line("Directory", vec![Span::from(directory_value)]));
let mut workspace_roots = self.workspace_roots.iter();
let first_root = workspace_roots
.next()
.map(|root| format_directory_display(root.as_path(), Some(value_width)))
.unwrap_or_else(|| "(none)".to_string());
lines.push(formatter.line("Workspace roots", vec![Span::from(first_root)]));
lines.extend(workspace_roots.map(|root| {
formatter.continuation(vec![Span::from(format_directory_display(
root.as_path(),
Some(value_width),
))])
}));
let mut additional_workspace_roots = additional_workspace_roots.into_iter();
if let Some(first_root) = additional_workspace_roots.next() {
lines.push(formatter.line(
"Workspace roots",
vec![Span::from(format_directory_display(
first_root.as_path(),
Some(value_width),
))],
));
lines.extend(additional_workspace_roots.map(|root| {
formatter.continuation(vec![Span::from(format_directory_display(
root.as_path(),
Some(value_width),
))])
}));
}
lines.push(formatter.line("Permissions", vec![Span::from(self.permissions.clone())]));
lines.push(formatter.line("Agents.md", vec![Span::from(agents_summary)]));
if self.workspace_state_stale {

25
codex-rs/tui/src/status/tests.rs
View File

@@ -537,7 +537,7 @@ async fn status_permissions_workspace_roots_do_not_repeat_additional_directories
}
#[tokio::test]
async fn status_workspace_roots_list_all_runtime_directories() {
async fn status_workspace_roots_list_additional_runtime_directories() {
let temp_home = TempDir::new().expect("temp home");
let mut config = test_config(&temp_home).await;
set_workspace_cwd(&mut config, test_path_buf("/workspace/tests").abs());
@@ -551,24 +551,33 @@ async fn status_workspace_roots_list_all_runtime_directories() {
assert!(
rendered
.lines()
.any(|line| line.contains("Workspace roots:") && line.contains("/workspace/extra"))
);
assert!(
!rendered
.lines()
.any(|line| line.contains("Workspace roots:") && line.contains("/workspace/tests"))
);
assert!(rendered.contains("/workspace/extra"));
}
#[tokio::test]
async fn status_workspace_roots_show_none_when_runtime_list_is_empty() {
async fn status_workspace_roots_omit_row_when_runtime_list_is_empty() {
let temp_home = TempDir::new().expect("temp home");
let mut config = test_config(&temp_home).await;
config.workspace_roots.clear();
config.permissions.set_workspace_roots(Vec::new());
assert!(
rendered_status_for(&config)
.lines()
.any(|line| line.contains("Workspace roots:") && line.contains("(none)"))
);
assert!(!rendered_status_for(&config).contains("Workspace roots:"));
}
#[tokio::test]
async fn status_workspace_roots_omit_row_when_cwd_is_only_root() {
let temp_home = TempDir::new().expect("temp home");
let mut config = test_config(&temp_home).await;
set_workspace_cwd(&mut config, test_path_buf("/workspace/tests").abs());
assert!(!rendered_status_for(&config).contains("Workspace roots:"));
}
#[tokio::test]