Chore: Rust Shear cleanup

jruokola · jruokola · commit d011e0ef32ef · 2025-11-18T00:38:05.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ members = [
     "crates/core-rag-mcp-server",
     "tests/integration"
 ]
-exclude = ["scripts"]
+exclude = ["scripts", "vendor/rmcp", "vendor/semchunk-rs"]
 default-members = [
     "crates/codegraph-core"
 ]
diff --git a/crates/codegraph-ai/Cargo.toml b/crates/codegraph-ai/Cargo.toml
@@ -18,12 +18,10 @@ anyhow = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 tracing = { workspace = true }
-dashmap = { workspace = true }
 parking_lot = { workspace = true }
 uuid = { workspace = true }
 chrono = { workspace = true }
 futures = { workspace = true }
-similar = { workspace = true }
 arc-swap = { workspace = true }
 num_cpus = { workspace = true }
 prometheus = { workspace = true }
diff --git a/crates/codegraph-api/Cargo.toml b/crates/codegraph-api/Cargo.toml
@@ -20,7 +20,6 @@ tower-http = { workspace = true, features = ["compression-br", "compression-gzip
 hyper = { workspace = true }
 http = { workspace = true }
 tokio = { workspace = true }
-tokio-util = { workspace = true }
 reqwest = { workspace = true }
 url = { workspace = true }
 parking_lot = { workspace = true }
@@ -50,7 +49,6 @@ toml = { workspace = true }
 
 # GraphQL
 async-graphql = { workspace = true, features = ["chrono", "dataloader"] }
-async-graphql-axum = { workspace = true }
 async-stream = "0.3.6"
 # Streaming responses for large datasets
 axum-streams = { version = "0.23.1", features = ["json", "csv", "text"] }
diff --git a/crates/codegraph-cache/Cargo.toml b/crates/codegraph-cache/Cargo.toml
@@ -13,13 +13,10 @@ ndarray = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 bincode = { workspace = true }
-thiserror = { workspace = true }
-anyhow = { workspace = true }
 tracing = { workspace = true }
 async-trait = { workspace = true }
 tokio = { workspace = true }
 parking_lot = { workspace = true }
-uuid = { workspace = true }
 backtrace = { workspace = true }
 memmap2 = { workspace = true, optional = true }
 flate2 = { workspace = true, optional = true }
@@ -38,7 +35,6 @@ tower-http = { workspace = true, features = ["cors", "fs"] }
 http = { workspace = true }
 tower = { workspace = true }
 tokio-tungstenite = { workspace = true }
-url = { workspace = true }
 zstd = { workspace = true }
 lz4_flex = { workspace = true }
 fastrand = { workspace = true }
diff --git a/crates/codegraph-cli/Cargo.toml b/crates/codegraph-cli/Cargo.toml
@@ -24,10 +24,6 @@ clap = { version = "4.5", features = ["derive", "env"] }
 # Colored terminal output
 colored = "2.1"
 
-# Table formatting
-tabled = "0.16"
-
 # Local crates
 codegraph-core = { path = "../codegraph-core" }
 codegraph-api = { path = "../codegraph-api" }
-codegraph-graph = { path = "../codegraph-graph" }
diff --git a/crates/codegraph-concurrent/Cargo.toml b/crates/codegraph-concurrent/Cargo.toml
@@ -4,12 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = { workspace = true }
 thiserror = { workspace = true }
-serde = { workspace = true, features = ["derive"] }
-tracing = { workspace = true }
 uuid = { workspace = true }
-chrono = { workspace = true }
 crossbeam-utils = { workspace = true }
 crossbeam-queue = { workspace = true }
 crossbeam-skiplist = { workspace = true }
@@ -20,7 +16,6 @@ async-trait = { workspace = true }
 
 [dev-dependencies]
 tokio = { workspace = true }
-tokio-test = { workspace = true }
 loom = "0.7"
 
 [features]
diff --git a/crates/codegraph-core/Cargo.toml b/crates/codegraph-core/Cargo.toml
@@ -36,7 +36,6 @@ clap = { workspace = true }
 colored = { workspace = true }
 indicatif = { workspace = true }
 once_cell = { workspace = true }
-tikv-jemalloc-ctl = { workspace = true }
 tikv-jemallocator = { workspace = true }
 hashbrown = { workspace = true }
 rustc-hash = { workspace = true }
@@ -51,9 +50,6 @@ bytes = { workspace = true }
 # Optional arena allocator and zero-copy archiving
 bumpalo = "3.15"
 rkyv = { version = "0.7.45", features = ["validation"] }
-bytecheck = "0.8"
-faiss.workspace = true
-semchunk-rs = "0.1.1"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
diff --git a/crates/codegraph-git/Cargo.toml b/crates/codegraph-git/Cargo.toml
@@ -10,28 +10,11 @@ description = "Git repository integration for CodeGraph using libgit2 and notify
 git2 = { workspace = true }
 notify = { workspace = true }
 serde = { workspace = true }
-serde_json = { workspace = true }
 thiserror = { workspace = true }
-anyhow = { workspace = true }
-tracing = { workspace = true }
-tokio = { workspace = true }
-async-trait = { workspace = true }
-parking_lot = { workspace = true }
-dashmap = { workspace = true }
-uuid = { workspace = true }
-chrono = { workspace = true }
-
-# Optional, useful for history analysis
-rayon = { workspace = true }
-crossbeam-channel = { workspace = true }
-
-# Internal deps
-codegraph-core = { workspace = true }
 
 [features]
 default = ["watch"]
 watch = []
 
 [dev-dependencies]
 tempfile = { workspace = true }
-tokio-test = { workspace = true }
diff --git a/crates/codegraph-graph/Cargo.toml b/crates/codegraph-graph/Cargo.toml
@@ -14,7 +14,6 @@ rocksdb = { workspace = true, features = ["zstd"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 bincode = { workspace = true }
-thiserror = { workspace = true }
 anyhow = { workspace = true }
 tracing = { workspace = true }
 async-trait = { workspace = true }
diff --git a/crates/codegraph-lb/Cargo.toml b/crates/codegraph-lb/Cargo.toml
@@ -9,29 +9,18 @@ description = "Intelligent load balancing for CodeGraph: algorithms, health chec
 [dependencies]
 tokio = { workspace = true }
 async-trait = { workspace = true }
-futures = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-serde_json = { workspace = true }
-thiserror = { workspace = true }
 anyhow = { workspace = true }
 tracing = { workspace = true }
 prometheus = { workspace = true }
 parking_lot = { workspace = true }
-dashmap = { workspace = true }
 uuid = { workspace = true }
 governor = { workspace = true }
-hyper = { workspace = true }
-tower = { workspace = true }
-tower-http = { workspace = true }
 reqwest = { workspace = true }
 http = { workspace = true }
 once_cell = { workspace = true }
 rand = { workspace = true }
 sha2 = { workspace = true }
 
-[dev-dependencies]
-tokio-test = { workspace = true }
-criterion = { workspace = true }
-
 [features]
 default = []
diff --git a/crates/codegraph-mcp/Cargo.toml b/crates/codegraph-mcp/Cargo.toml
@@ -24,7 +24,6 @@ chrono = { workspace = true }
 url = { workspace = true }
 dashmap = { workspace = true }
 parking_lot = { workspace = true }
-tokio-util = { workspace = true }
 fastrand = { workspace = true }
 reqwest = { workspace = true }
 sha2 = { workspace = true }
@@ -41,7 +40,6 @@ colored = { workspace = true }
 indicatif = { workspace = true }
 dirs = "5.0"
 dotenv = "0.15"
-which = "8.0"
 nix = { version = "0.30.1", features = ["process", "signal"] }
 notify = "8.2.0"
 walkdir = "2.5"
@@ -69,7 +67,6 @@ tower = { workspace = true, optional = true }
 http-body-util = { version = "0.1", optional = true }
 
 [dev-dependencies]
-tokio-test = { workspace = true }
 tempfile = { workspace = true }
 anyhow = { workspace = true }
 serial_test = "3.2"
diff --git a/crates/codegraph-mcp/src/autoagents/agent_builder.rs b/crates/codegraph-mcp/src/autoagents/agent_builder.rs
@@ -13,6 +13,7 @@ use autoagents::llm::{FunctionCall, ToolCall};
 use codegraph_ai::llm_provider::{LLMProvider as CodeGraphLLM, Message, MessageRole};
 use serde::Deserialize;
 use std::sync::Arc;
+use std::sync::atomic::{AtomicU64, Ordering};
 
 /// Convert CodeGraph Message to AutoAgents ChatMessage
 pub(crate) fn convert_to_chat_message(msg: &Message) -> ChatMessage {
@@ -180,33 +181,63 @@ struct CodeGraphToolCall {
     parameters: serde_json::Value,
 }
 
+// Static counter for generating unique tool call IDs
+static TOOL_CALL_COUNTER: AtomicU64 = AtomicU64::new(0);
+
 impl ChatResponse for CodeGraphChatResponse {
     fn text(&self) -> Option<String> {
         Some(self.content.clone())
     }
 
     fn tool_calls(&self) -> Option<Vec<ToolCall>> {
         // Try to parse the response as CodeGraph's JSON format
-        if let Ok(parsed) = serde_json::from_str::<CodeGraphLLMResponse>(&self.content) {
-            // If there's a tool_call and is_final is false, convert to AutoAgents format
-            if let Some(tool_call) = parsed.tool_call {
-                if !parsed.is_final {
-                    // Convert parameters to JSON string
-                    let arguments = serde_json::to_string(&tool_call.parameters)
-                        .unwrap_or_else(|_| "{}".to_string());
-
-                    let autoagents_tool_call = ToolCall {
-                        id: format!("call_{}", uuid::Uuid::new_v4()),
-                        call_type: "function".to_string(),
-                        function: FunctionCall {
-                            name: tool_call.tool_name,
-                            arguments,
-                        },
-                    };
-
-                    return Some(vec![autoagents_tool_call]);
+        match serde_json::from_str::<CodeGraphLLMResponse>(&self.content) {
+            Ok(parsed) => {
+                // If there's a tool_call and is_final is false, convert to AutoAgents format
+                if let Some(tool_call) = parsed.tool_call {
+                    if !parsed.is_final {
+                        // Convert parameters to JSON string
+                        let arguments = match serde_json::to_string(&tool_call.parameters) {
+                            Ok(json) => json,
+                            Err(e) => {
+                                tracing::warn!(
+                                    "Failed to serialize tool call parameters: {}",
+                                    e
+                                );
+                                return None;
+                            }
+                        };
+
+                        // Generate unique ID using atomic counter
+                        let call_id = TOOL_CALL_COUNTER.fetch_add(1, Ordering::SeqCst);
+
+                        tracing::debug!(
+                            "Parsed tool call: {} with args: {}",
+                            tool_call.tool_name,
+                            arguments
+                        );
+
+                        let autoagents_tool_call = ToolCall {
+                            id: format!("call_{}", call_id),
+                            call_type: "function".to_string(),
+                            function: FunctionCall {
+                                name: tool_call.tool_name,
+                                arguments,
+                            },
+                        };
+
+                        return Some(vec![autoagents_tool_call]);
+                    } else {
+                        tracing::debug!("is_final is true, not returning tool calls");
+                    }
+                } else {
+                    tracing::debug!("No tool_call in parsed response");
                 }
             }
+            Err(e) => {
+                // Not a JSON response or doesn't match our format - that's fine
+                tracing::trace!("Response is not CodeGraph JSON format: {}", e);
+            }
         }
 
         // No tool calls in response
diff --git a/crates/codegraph-napi/Cargo.toml b/crates/codegraph-napi/Cargo.toml
@@ -9,12 +9,7 @@ license.workspace = true
 crate-type = ["cdylib"]
 
 [features]
-default = ["local"]
-local = ["codegraph-vector/faiss"]
-cloud-jina = ["codegraph-vector/jina"]
-cloud-surrealdb = ["surrealdb", "codegraph-graph/surrealdb"]
-cloud = ["cloud-jina", "cloud-surrealdb"]
-full = ["local", "cloud"]
+default = []
 
 [dependencies]
 # NAPI-RS
@@ -23,9 +18,7 @@ napi-derive = "2.16"
 
 # Workspace dependencies
 tokio = { workspace = true }
-serde = { workspace = true }
 serde_json = { workspace = true }
-anyhow = { workspace = true }
 uuid = { workspace = true }
 chrono = { workspace = true }
 tracing = { workspace = true }
@@ -34,11 +27,6 @@ tracing = { workspace = true }
 codegraph-core = { path = "../codegraph-core" }
 codegraph-api = { path = "../codegraph-api" }
 codegraph-graph = { path = "../codegraph-graph", features = [] }
-codegraph-vector = { path = "../codegraph-vector" }
-codegraph-ai = { path = "../codegraph-ai" }
-
-# Optional cloud dependencies
-surrealdb = { version = "2.0", optional = true }
 
 [build-dependencies]
 napi-build = "2.1"
diff --git a/crates/codegraph-parser/Cargo.toml b/crates/codegraph-parser/Cargo.toml
@@ -26,15 +26,12 @@ tree-sitter-php = { workspace = true }
 
 serde = { workspace = true }
 serde_json = { workspace = true }
-thiserror = { workspace = true }
 anyhow = { workspace = true }
 tracing = { workspace = true }
 async-trait = { workspace = true }
 tokio = { workspace = true }
-rayon = { workspace = true }
 notify = { workspace = true }
 similar = { workspace = true }
-memmap2 = { workspace = true }
 sha2 = { workspace = true }
 chrono = { workspace = true }
 futures = { workspace = true }
@@ -43,7 +40,6 @@ parking_lot = { workspace = true }
 dashmap = { workspace = true }
 uuid = { workspace = true }
 num_cpus = { workspace = true }
-regex = { workspace = true }
 globset = { workspace = true }
 ignore = { workspace = true }
 
@@ -58,5 +54,4 @@ experimental = []
 io-uring = ["tokio-uring"]
 
 [dev-dependencies]
-tokio-test = { workspace = true }
 tempfile = { workspace = true }
diff --git a/crates/codegraph-queue/Cargo.toml b/crates/codegraph-queue/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 [dependencies]
 tokio = { workspace = true }
 tokio-stream = "0.1"
-futures = { workspace = true }
 priority-queue = "2.5.0"
 uuid = { workspace = true }
 chrono = { workspace = true }
@@ -18,8 +17,4 @@ anyhow = { workspace = true }
 tracing = { workspace = true }
 metrics = "0.24.2"
 
-codegraph-core = { path = "../codegraph-core" }
 codegraph-concurrent = { path = "../codegraph-concurrent" }
-
-[dev-dependencies]
-tokio-test = { workspace = true }
diff --git a/crates/codegraph-vector/Cargo.toml b/crates/codegraph-vector/Cargo.toml
@@ -15,7 +15,6 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 bincode = { workspace = true }
 thiserror = { workspace = true }
-anyhow = { workspace = true }
 tracing = { workspace = true }
 async-trait = { workspace = true }
 tokio = { workspace = true }
@@ -30,7 +29,6 @@ chrono = { workspace = true }
 futures = { workspace = true }
 num_cpus = { workspace = true }
 unicode-normalization = "0.1"
-emojis = "0.6"
 
 # Local embeddings (Candle) - optional via feature
 candle-core = { version = "0.9.1", optional = true, default-features = false, features = ["metal"] }
diff --git a/crates/codegraph-zerocopy/Cargo.toml b/crates/codegraph-zerocopy/Cargo.toml
diff --git a/crates/core-rag-mcp-server/Cargo.toml b/crates/core-rag-mcp-server/Cargo.toml
diff --git a/tests/integration/Cargo.toml b/tests/integration/Cargo.toml
diff --git a/vendor/semchunk-rs/Cargo.lock b/vendor/semchunk-rs/Cargo.lock

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ members = [`
`18`	`18`	`"crates/core-rag-mcp-server",`
`19`	`19`	`"tests/integration"`
`20`	`20`	`]`
`21`		`-exclude = ["scripts"]`
	`21`	`+exclude = ["scripts", "vendor/rmcp", "vendor/semchunk-rs"]`
`22`	`22`	`default-members = [`
`23`	`23`	`"crates/codegraph-core"`
`24`	`24`	`]`