refactor!(kwsearch): remove --search-tool-prompt CLI option

Signed-off-by: Xin Liu <sam@secondstate.io>

Author: apepkuss

cardea-kwsearch/cardea-kwsearch-mcp-server/src/main.rs

@@ -6,7 +6,7 @@ use rmcp::transport::{
     sse_server::SseServer,
     streamable_http_server::{StreamableHttpService, session::local::LocalSessionManager},
 };
-use search::{ConnectionConfig, KeywordSearchServer, set_search_tool_prompt};
+use search::{ConnectionConfig, KeywordSearchServer};
 use tokio::sync::RwLock as TokioRwLock;
 use tracing_subscriber::{self, layer::SubscriberExt, util::SubscriberInitExt};
 
@@ -32,12 +32,6 @@ struct Args {
     /// Maximum number of query results to return
     #[arg(long, default_value = "10")]
     limit: usize,
-    /// The prompt for the `search` mcp tool
-    #[arg(
-        long,
-        default_value = "Please extract 3 to 5 keywords from my question, separated by spaces. Then, try to return a tool call that invokes the keyword search tool.\n\nMy question is: {query}"
-    )]
-    search_tool_prompt: String,
 }
 
 #[derive(Debug, Clone, ValueEnum)]
@@ -58,9 +52,6 @@ async fn main() -> anyhow::Result<()> {
 
     let args = Args::parse();
 
-    // Set the search tool prompt from CLI
-    set_search_tool_prompt(args.search_tool_prompt);
-
     let connection_config = ConnectionConfig {
         base_url: args.base_url,
         api_key: None,

cardea-kwsearch/cardea-kwsearch-mcp-server/src/search.rs

@@ -10,7 +10,6 @@ use rmcp::{
     service::RequestContext,
     tool, tool_handler, tool_router,
 };
-use std::sync::OnceLock;
 use tracing::{error, info};
 
 const PROMPT_SEARCH_TOOL: &str = r#"
@@ -49,12 +48,6 @@ Examples:
     </tool_call>
 "#;
 
-static SEARCH_TOOL_PROMPT: OnceLock<String> = OnceLock::new();
-
-pub fn set_search_tool_prompt(prompt: String) {
-    SEARCH_TOOL_PROMPT.set(prompt).unwrap_or_default();
-}
-
 #[derive(Debug, Clone)]
 pub struct KeywordSearchServer {
     tool_router: ToolRouter<Self>,
@@ -238,8 +231,6 @@ impl ServerHandler for KeywordSearchServer {
                         McpError::invalid_params("No query provided to `search` tool", None)
                     })?;
 
-                // let prompt = SEARCH_TOOL_PROMPT.get().unwrap();
-                // let prompt = prompt.replace("{query}", &query);
                 let prompt = format!("{PROMPT_SEARCH_TOOL}\n\n### Input Query\n{query:#?}");
 
                 Ok(GetPromptResult {