Skip to content

feat(mcp): sort tools and prompts #1809

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
hayemaxi merged 1 commit into from
May 19, 2025
Merged

feat(mcp): sort tools and prompts #1809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
98 changes: 63 additions & 35 deletions crates/chat-cli/src/cli/chat/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ use tools::{
OutputKind,
QueuedTool,
Tool,
ToolOrigin,
ToolPermissions,
ToolSpec,
};
Expand Down Expand Up @@ -2385,24 +2386,43 @@ impl ChatContext {
style::Print("▔".repeat(terminal_width)),
)?;

self.conversation_state.tools.iter().for_each(|(origin, tools)| {
let to_display = tools
let mut origin_tools: Vec<_> = self.conversation_state.tools.iter().collect();

// Built in tools always appear first.
origin_tools.sort_by(|(origin_a, _), (origin_b, _)| match (origin_a, origin_b) {
(ToolOrigin::Native, _) => std::cmp::Ordering::Less,
(_, ToolOrigin::Native) => std::cmp::Ordering::Greater,
(ToolOrigin::McpServer(name_a), ToolOrigin::McpServer(name_b)) => name_a.cmp(name_b),
});

for (origin, tools) in origin_tools.iter() {
let mut sorted_tools: Vec<_> = tools
.iter()
.filter(|FigTool::ToolSpecification(spec)| spec.name != DUMMY_TOOL_NAME)
.fold(String::new(), |mut acc, FigTool::ToolSpecification(spec)| {
let width = longest - spec.name.len() + 4;
acc.push_str(
format!(
"- {}{:>width$}{}\n",
spec.name,
"",
self.tool_permissions.display_label(&spec.name),
width = width
)
.as_str(),
);
acc
});
.collect();

sorted_tools.sort_by_key(|t| match t {
FigTool::ToolSpecification(spec) => &spec.name,
});

let to_display =
sorted_tools
.iter()
.fold(String::new(), |mut acc, FigTool::ToolSpecification(spec)| {
let width = longest - spec.name.len() + 4;
acc.push_str(
format!(
"- {}{:>width$}{}\n",
spec.name,
"",
self.tool_permissions.display_label(&spec.name),
width = width
)
.as_str(),
);
acc
});

let _ = queue!(
self.output,
style::SetAttribute(Attribute::Bold),
Expand All @@ -2411,7 +2431,7 @@ impl ChatContext {
style::Print(to_display),
style::Print("\n")
);
});
}

let loading = self.conversation_state.tool_manager.pending_clients().await;
if !loading.is_empty() {
Expand All @@ -2430,15 +2450,15 @@ impl ChatContext {

queue!(
self.output,
style::Print("\nTrusted tools can be run without confirmation\n"),
style::Print("\nTrusted tools will run without confirmation."),
style::SetForegroundColor(Color::DarkGrey),
style::Print(format!("\n{}\n", "* Default settings")),
style::Print("\n💡 Use "),
style::SetForegroundColor(Color::Green),
style::Print("/tools help"),
style::SetForegroundColor(Color::Reset),
style::SetForegroundColor(Color::DarkGrey),
style::Print(" to edit permissions."),
style::Print(" to edit permissions.\n\n"),
style::SetForegroundColor(Color::Reset),
)?;
},
Expand Down Expand Up @@ -2580,23 +2600,31 @@ impl ChatContext {
style::Print("\n"),
style::Print(format!("{}\n", "▔".repeat(terminal_width))),
)?;
let prompts_by_server = prompts_wl.iter().fold(
HashMap::<&String, Vec<&PromptBundle>>::new(),
|mut acc, (prompt_name, bundles)| {
if prompt_name.contains(search_word.as_deref().unwrap_or("")) {
if prompt_name.len() > longest_name.len() {
longest_name = prompt_name.as_str();
}
for bundle in bundles {
acc.entry(&bundle.server_name)
.and_modify(|b| b.push(bundle))
.or_insert(vec![bundle]);
let mut prompts_by_server: Vec<_> = prompts_wl
.iter()
.fold(
HashMap::<&String, Vec<&PromptBundle>>::new(),
|mut acc, (prompt_name, bundles)| {
if prompt_name.contains(search_word.as_deref().unwrap_or("")) {
if prompt_name.len() > longest_name.len() {
longest_name = prompt_name.as_str();
}
for bundle in bundles {
acc.entry(&bundle.server_name)
.and_modify(|b| b.push(bundle))
.or_insert(vec![bundle]);
}
}
}
acc
},
);
for (i, (server_name, bundles)) in prompts_by_server.iter().enumerate() {
acc
},
)
.into_iter()
.collect();
prompts_by_server.sort_by_key(|(server_name, _)| server_name.as_str());

for (i, (server_name, bundles)) in prompts_by_server.iter_mut().enumerate() {
bundles.sort_by_key(|bundle| &bundle.prompt_get.name);

if i > 0 {
queue!(self.output, style::Print("\n"))?;
}
Expand Down
1 change: 0 additions & 1 deletion crates/chat-cli/src/cli/chat/tools/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ impl ToolPermissions {
}

/// Provide default permission labels for the built-in set of tools.
/// Unknown tools are assumed to be "Per-request"
// This "static" way avoids needing to construct a tool instance.
fn default_permission_label(&self, tool_name: &str) -> String {
let label = match tool_name {
Expand Down
Loading