Merge pull request #2 from iohub/fix-hybridsearch

fix: resolve empty MCP semantic search results

Author: iohub

rust-core/Cargo.lock

@@ -236,4 +236,6 @@ impl Config {
     pub fn compute_project_hash(project_root: &PathBuf) -> String {
         format!("{:x}", md5::compute(project_root.to_string_lossy().as_bytes()))
     }
+
+
 }

rust-core/src/config.rs

@@ -121,11 +121,17 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                     pb.set_phase("Building vector embeddings...");
                     pb.set_stats(stats.total_files, stats.total_functions);
 
-                    let db_path = index_dir.to_string_lossy().to_string();
+                    let db_path = Config::lancedb_dir(&project_hash).to_string_lossy().to_string();
                     let collection = format!("codeseek_{}", &project_hash[..8]);
 
+                    // 创建BM25索引用于稀疏检索通道
+                    let bm25_dir = Config::bm25_dir(&project_hash);
+                    let bm25_index = TantivyBm25Index::open_or_create(&bm25_dir)
+                        .ok()
+                        .map(|idx| Arc::new(idx) as Arc<dyn codeseek::storage::traits_bm25::TextSearchProvider>);
+
                     embedding_done = true; // mark attempted; actual success tracked below
-                    match EmbeddingService::new(&db_path, collection, Some(cfg), None).await {
+                    match EmbeddingService::new(&db_path, collection, Some(cfg), bm25_index).await {
                         Ok(es) => {
                             if let Err(e) = es.ensure_collection().await {
                                 warn!("Embedding table setup failed: {}", e);

rust-core/src/main.rs

@@ -143,7 +143,7 @@ fn run_cli(args: &[&str]) -> Result<String, String> {
     let output = std::process::Command::new(&bin)
         .args(args)
         .stdout(std::process::Stdio::piped())
-        .stderr(std::process::Stdio::null())
+        .stderr(std::process::Stdio::piped())
         .output()
         .map_err(|e| format!("Failed to run codeseek: {}", e))?;
 
@@ -152,6 +152,13 @@ fn run_cli(args: &[&str]) -> Result<String, String> {
             .map_err(|e| format!("Invalid UTF-8 output: {}", e))
     } else {
         let stderr = String::from_utf8_lossy(&output.stderr);
-        Err(format!("codeseek exited with {}: {}", output.status, stderr.trim()))
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        if stderr.is_empty() && stdout.is_empty() {
+            Err(format!("codeseek exited with {}", output.status))
+        } else if stderr.is_empty() {
+            Err(format!("codeseek exited with {}: {}", output.status, stdout.trim()))
+        } else {
+            Err(format!("codeseek exited with {}: {}", output.status, stderr.trim()))
+        }
     }
 }