Skip to content

feat(tui): rescue MCP and plugin session boot #5677

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 6 commits into from
Aug 28, 2026
Merged

feat(tui): rescue MCP and plugin session boot #5677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2598115
feat(tui): surface MCP and plugin boot as a session set
Hmbown Aug 27, 2026
51a9968
feat(tui): name every MCP server on the first session frame
Hmbown Aug 27, 2026
9ff6940
fix(tui): unstick MCP session-boot clippy and dead code
Hmbown Aug 27, 2026
be4b9a6
fix(tui): keep MCP boot off empty and dynamic servers
Hmbown Aug 27, 2026
62c6f10
fix(tui): keep MCP boot state generation-safe
Aug 28, 2026
ef5c524
Merge origin/main into codex/pr5658-rescue-20260827
Aug 28, 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
14 changes: 12 additions & 2 deletions crates/tui/src/commands/groups/utility/mcp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const CONTAINER_USE_SOURCE: &str = "https://github.com/dagger/container-use";
pub(in crate::commands) const COMMAND_INFO: CommandInfo = CommandInfo {
name: "mcp",
aliases: &[],
usage: "/mcp [init|import|import approve <name>|import decline <name>|recommendations|add recommended <id>|add stdio <name> <command> [args...]|add http <name> <url>|enable <name>|disable <name>|remove <name>|doctor|validate|restart|reload]",
usage: "/mcp [init|import|import approve <name>|import decline <name>|recommendations|add recommended <id>|add stdio <name> <command> [args...]|add http <name> <url>|enable <name>|disable <name>|remove <name>|retry <name>|doctor|validate|restart|reload]",
description_key: "cmd_mcp_description",
};

Expand Down Expand Up @@ -81,6 +81,10 @@ fn mcp(presentation: &mut dyn CommandPresentationContext, args: Option<&str>) ->
Ok(name) => CommandResult::action(AppAction::Mcp(McpUiAction::Logout { name })),
Err(msg) => CommandResult::error(msg),
},
"retry" => match parse_name(parts.next(), "Usage: /mcp retry <name>") {
Ok(name) => CommandResult::action(AppAction::Mcp(McpUiAction::Retry { name })),
Err(msg) => CommandResult::error(msg),
},
"import" | "marketplace" | "sources" => {
let sub = parts.next().unwrap_or("").to_ascii_lowercase();
match sub.as_str() {
Expand Down Expand Up @@ -117,7 +121,7 @@ fn mcp(presentation: &mut dyn CommandPresentationContext, args: Option<&str>) ->
CommandResult::action(AppAction::Mcp(McpUiAction::Reload))
}
_ => CommandResult::error(
"Usage: /mcp [init|import|recommendations|add recommended <id>|add stdio <name> <command> [args...]|add http <name> <url>|enable <name>|disable <name>|remove <name>|login <name>|logout <name>|doctor|validate|restart|reload]",
"Usage: /mcp [init|import|recommendations|add recommended <id>|add stdio <name> <command> [args...]|add http <name> <url>|enable <name>|disable <name>|remove <name>|login <name>|logout <name>|retry <name>|doctor|validate|restart|reload]",
),
}
}
Expand Down Expand Up @@ -561,6 +565,12 @@ mod tests {
if name == "remote"
&& scopes == vec!["tools/read".to_string(), "tools/write".to_string()]
));

let retry = mcp(&mut FakePresentation, Some("retry remote"));
assert!(matches!(
retry.action,
Some(AppAction::Mcp(McpUiAction::Retry { name })) if name == "remote"
));
}

#[test]
Expand Down
Loading
Loading