Skip to content
Merged

MCP #15

Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ memmap2 = "0.9"
bincode = { version = "2", features = ["serde"] }
serde = { version = "1", features = ["derive"] }
rusqlite = { version = "0.31", features = ["bundled"] }
serde_json = "1"

ratatui = "0.27"
crossterm = { version = "0.27", features = ["event-stream"] }
Expand Down
42 changes: 41 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use rayon::prelude::*;

mod bloom;
mod index;
mod mcp;
#[allow(dead_code)]
mod memory;
mod output;
Expand All @@ -29,6 +30,7 @@ pub mod walker;

use bloom::BloomFilter;
use index::{index_path_for_root, load_index, save_index, IndexEntry, IndexManifest};
use mcp::{run as run_mcp, McpConfig};
use memory::{memory_db_path, FileRow, MemoryDb, SymbolKind, SymbolRow};
use output::{print_lookup_results, print_match, print_summary, resolve_color_mode, ColorMode};
use parser::{detect_language, get_all_languages, parse_file_with_metadata};
Expand Down Expand Up @@ -91,6 +93,9 @@ struct App {
#[command(flatten)]
cli: Cli,

#[arg(long = "mcp", default_value_t = false, help = "Run the MCP server over stdio")]
mcp: bool,

#[command(subcommand)]
command: Option<Commands>,
}
Expand Down Expand Up @@ -250,11 +255,19 @@ struct SearchOutcome {

impl Cli {
fn validate(&self) -> std::result::Result<(), String> {
self.validate_internal(false)
}

fn validate_allowing_empty_query(&self) -> std::result::Result<(), String> {
self.validate_internal(true)
}

fn validate_internal(&self, allow_empty_query: bool) -> std::result::Result<(), String> {
if self.generate_completions.is_some() {
return Ok(());
}

if self.query.iter().all(|q| q.trim().is_empty()) {
if !allow_empty_query && self.query.iter().all(|q| q.trim().is_empty()) {
return Err("at least one query string must not be empty".to_string());
}

Expand Down Expand Up @@ -486,6 +499,13 @@ fn run_lookup_mode(args: &LookupArgs) {
print_lookup_results(&results, &color, &mut stdout);
}

fn resolve_root_path(path: &Path) -> PathBuf {
match fs::canonicalize(path) {
Ok(resolved) => resolved,
Err(_) => path.to_path_buf(),
}
}

fn resolve_lang(lang_str: &str) -> Language {
match lang_str {
"rust" => Language::Rust,
Expand Down Expand Up @@ -850,6 +870,26 @@ fn main() {
return;
}

if app.mcp {
if let Err(message) = cli.validate_allowing_empty_query() {
eprintln!("error: {message}");
process::exit(1);
}

let root_path = resolve_root_path(&cli.path);
let mcp_config = McpConfig {
root_path: root_path.clone(),
db_path: memory_db_path(&root_path),
lang_mode: resolve_lang_mode(&cli.lang),
};

if let Err(error) = run_mcp(mcp_config) {
eprintln!("error: {error}");
process::exit(1);
}
return;
}

if let Some(shell) = cli.generate_completions {
let mut cmd = App::command();
generate(shell, &mut cmd, "dora", &mut std::io::stdout());
Expand Down
Loading
Loading