Skip to content

Implement MCP sampling protocol for dynamic tool discovery #2525

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Implement MCP sampling protocol for dynamic tool discovery #2525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ebcd71c
feat: Implement MCP sampling protocol for dynamic tool discovery
codeman9 Aug 5, 2025
4db3f7c
feat: Add comprehensive MCP sampling integration test
codeman9 Aug 6, 2025
abe9a3b
feat(mcp): Add configuration-based sampling permission control
codeman9 Aug 6, 2025
4e91ae5
refactor: Remove excessive logging from MCP sampling implementation
codeman9 Aug 6, 2025
1aba937
refactor: Clean up MCP sampling implementation for PR readiness
codeman9 Aug 7, 2025
de54276
refactor: Remove empty debug blocks and dead code annotations
codeman9 Aug 7, 2025
7185880
fix: Use correct variable name sampling_enabled instead of sampling
codeman9 Aug 8, 2025
385145d
fix: Address all clippy warnings and clean up API client handling
codeman9 Aug 8, 2025
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
8 changes: 6 additions & 2 deletions crates/chat-cli/src/cli/chat/tools/custom_tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ use crate::mcp_client::{
Client as McpClient,
ClientConfig as McpClientConfig,
JsonRpcResponse,
JsonRpcStdioTransport,
MessageContent,
Messenger,
PromptGet,
Expand All @@ -55,6 +54,9 @@ pub struct CustomToolConfig {
/// A boolean flag to denote whether or not to load this mcp server
#[serde(default)]
pub disabled: bool,
/// Enable MCP sampling support for this server
#[serde(default)]
pub sampling_enabled: bool,
/// A flag to denote whether this is a server from the legacy mcp.json
#[serde(skip)]
pub is_from_legacy_mcp_json: bool,
Expand Down Expand Up @@ -103,6 +105,7 @@ impl CustomToolClient {
env,
timeout,
disabled: _,
sampling_enabled,
..
} = config;

Expand All @@ -122,8 +125,9 @@ impl CustomToolClient {
"version": "1.0.0"
}),
env: processed_env,
sampling_enabled,
};
let client = McpClient::<JsonRpcStdioTransport>::from_config(mcp_client_config)?;
let client = McpClient::<StdioTransport>::from_config(mcp_client_config, Some(std::sync::Arc::new(os.client.clone())))?;
Ok(CustomToolClient::Stdio {
server_name,
client,
Expand Down
Loading