openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-05 20:10:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

codex: address PR review feedback (#16041)

Browse Source
This commit is contained in:
Eric Traut
2026-03-27 16:03:55 -06:00
parent f549049385
commit 916a160ec4
2 changed files with 75 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/tui_app_server/src/chatwidget.rs
+10
View File
@@ -2798,6 +2798,7 @@ impl ChatWidget {
if complete_when_settled
&& let Some(current) = &self.mcp_startup_status
&& !current.is_empty()
&& current.len() >= self.enabled_mcp_server_count()
&& current
.values()
.all(|state| !matches!(state, McpStartupStatus::Starting))
@@ -2855,6 +2856,15 @@ impl ChatWidget {
self.request_redraw();
}
fn enabled_mcp_server_count(&self) -> usize {
self.config
.mcp_servers
.get()
.values()
.filter(|cfg| cfg.enabled)
.count()
}
#[cfg(test)]
fn on_mcp_startup_update(&mut self, ev: McpStartupUpdateEvent) {
self.update_mcp_startup_status(ev.server, ev.status, /*complete_when_settled*/ false);
codex-rs/tui_app_server/src/chatwidget/tests.rs
+65 -14
View File
@@ -79,6 +79,8 @@ use codex_core::config::Config;
use codex_core::config::ConfigBuilder;
use codex_core::config::Constrained;
use codex_core::config::ConstraintError;
use codex_core::config::types::McpServerConfig;
use codex_core::config::types::McpServerTransportConfig;
use codex_core::config::types::Notifications;
#[cfg(target_os = "windows")]
use codex_core::config::types::WindowsSandboxModeToml;
@@ -11524,24 +11526,61 @@ async fn mcp_startup_complete_does_not_clear_running_task() {
async fn app_server_mcp_startup_failure_renders_warning_history() {
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(None).await;
chat.show_welcome_banner = false;
chat.config.mcp_servers = Constrained::allow_any(HashMap::from([
(
"alpha".to_string(),
McpServerConfig {
transport: McpServerTransportConfig::Stdio {
command: "alpha".to_string(),
args: Vec::new(),
env: None,
env_vars: Vec::new(),
cwd: None,
},
enabled: true,
required: false,
disabled_reason: None,
startup_timeout_sec: None,
tool_timeout_sec: None,
enabled_tools: None,
disabled_tools: None,
scopes: None,
oauth_resource: None,
tools: HashMap::new(),
},
),
(
"beta".to_string(),
McpServerConfig {
transport: McpServerTransportConfig::Stdio {
command: "beta".to_string(),
args: Vec::new(),
env: None,
env_vars: Vec::new(),
cwd: None,
},
enabled: true,
required: false,
disabled_reason: None,
startup_timeout_sec: None,
tool_timeout_sec: None,
enabled_tools: None,
disabled_tools: None,
scopes: None,
oauth_resource: None,
tools: HashMap::new(),
},
),
]));
for notification in [
McpServerStatusUpdatedNotification {
chat.handle_server_notification(
ServerNotification::McpServerStatusUpdated(McpServerStatusUpdatedNotification {
name: "alpha".to_string(),
status: McpServerStartupState::Starting,
error: None,
},
McpServerStatusUpdatedNotification {
name: "beta".to_string(),
status: McpServerStartupState::Starting,
error: None,
},
] {
chat.handle_server_notification(
ServerNotification::McpServerStatusUpdated(notification),
None,
);
}
}),
None,
);
assert!(drain_insert_history(&mut rx).is_empty());
assert!(chat.bottom_pane.is_task_running());
@@ -11564,6 +11603,18 @@ async fn app_server_mcp_startup_failure_renders_warning_history() {
assert!(!failure_text.contains("MCP startup incomplete"));
assert!(chat.bottom_pane.is_task_running());
chat.handle_server_notification(
ServerNotification::McpServerStatusUpdated(McpServerStatusUpdatedNotification {
name: "beta".to_string(),
status: McpServerStartupState::Starting,
error: None,
}),
None,
);
assert!(drain_insert_history(&mut rx).is_empty());
assert!(chat.bottom_pane.is_task_running());
chat.handle_server_notification(
ServerNotification::McpServerStatusUpdated(McpServerStatusUpdatedNotification {
name: "beta".to_string(),