diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 0c28b15..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "tree-sitter-java"]
- path = tree-sitter-java
- url = https://github.com/tree-sitter/tree-sitter-java
-[submodule "tree-sitter-groovy"]
- path = tree-sitter-groovy
- url = https://github.com/murtaza64/tree-sitter-groovy.git
diff --git a/Cargo.lock b/Cargo.lock
index 5fa659e..938c437 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,18 @@
# It is not intended for manual editing.
version = 4
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
[[package]]
name = "aho-corasick"
version = "1.1.4"
@@ -11,6 +23,12 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
[[package]]
name = "android_system_properties"
version = "0.1.5"
@@ -70,6 +88,12 @@ dependencies = [
"windows-sys 0.61.2",
]
+[[package]]
+name = "anyhow"
+version = "1.0.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+
[[package]]
name = "async-trait"
version = "0.1.89"
@@ -104,38 +128,16 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-[[package]]
-name = "aws-lc-rs"
-version = "1.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e84ce723ab67259cfeb9877c6a639ee9eb7a27b28123abd71db7f0d5d0cc9d86"
-dependencies = [
- "aws-lc-sys",
- "zeroize",
-]
-
-[[package]]
-name = "aws-lc-sys"
-version = "0.36.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a442ece363113bd4bd4c8b18977a7798dd4d3c3383f34fb61936960e8f4ad8"
-dependencies = [
- "cc",
- "cmake",
- "dunce",
- "fs_extra",
-]
-
[[package]]
name = "axum"
-version = "0.8.8"
+version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
dependencies = [
+ "async-trait",
"axum-core",
"base64",
"bytes",
- "form_urlencoded",
"futures-util",
"http",
"http-body",
@@ -148,14 +150,15 @@ dependencies = [
"mime",
"percent-encoding",
"pin-project-lite",
- "serde_core",
+ "rustversion",
+ "serde",
"serde_json",
"serde_path_to_error",
"serde_urlencoded",
"sha1",
"sync_wrapper",
"tokio",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.24.0",
"tower 0.5.3",
"tower-layer",
"tower-service",
@@ -164,17 +167,19 @@ dependencies = [
[[package]]
name = "axum-core"
-version = "0.5.6"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
dependencies = [
+ "async-trait",
"bytes",
- "futures-core",
+ "futures-util",
"http",
"http-body",
"http-body-util",
"mime",
"pin-project-lite",
+ "rustversion",
"sync_wrapper",
"tower-layer",
"tower-service",
@@ -233,6 +238,12 @@ version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
[[package]]
name = "bytes"
version = "1.11.0"
@@ -251,24 +262,12 @@ dependencies = [
"shlex",
]
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
[[package]]
name = "cfg-if"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
[[package]]
name = "chrono"
version = "0.4.43"
@@ -323,31 +322,12 @@ version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
-[[package]]
-name = "cmake"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "colorchoice"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
-[[package]]
-name = "combine"
-version = "4.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
-dependencies = [
- "bytes",
- "memchr",
-]
-
[[package]]
name = "convert_case"
version = "0.10.0"
@@ -357,26 +337,6 @@ dependencies = [
"unicode-segmentation",
]
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
[[package]]
name = "core-foundation-sys"
version = "0.8.7"
@@ -613,12 +573,6 @@ dependencies = [
"litrs",
]
-[[package]]
-name = "dunce"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
-
[[package]]
name = "dyn-clone"
version = "1.0.20"
@@ -631,15 +585,6 @@ version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-[[package]]
-name = "encoding_rs"
-version = "0.8.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
-dependencies = [
- "cfg-if",
-]
-
[[package]]
name = "equivalent"
version = "1.0.2"
@@ -700,12 +645,6 @@ dependencies = [
"percent-encoding",
]
-[[package]]
-name = "fs_extra"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-
[[package]]
name = "fsevent-sys"
version = "4.1.0"
@@ -821,10 +760,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
dependencies = [
"cfg-if",
- "js-sys",
"libc",
"wasi",
- "wasm-bindgen",
]
[[package]]
@@ -834,11 +771,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
- "js-sys",
"libc",
"r-efi",
"wasip2",
- "wasm-bindgen",
]
[[package]]
@@ -854,30 +789,16 @@ dependencies = [
"regex-syntax",
]
-[[package]]
-name = "h2"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
[[package]]
name = "hashbrown"
version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+ "serde",
+]
[[package]]
name = "hashbrown"
@@ -955,7 +876,6 @@ dependencies = [
"bytes",
"futures-channel",
"futures-core",
- "h2",
"http",
"http-body",
"httparse",
@@ -965,23 +885,6 @@ dependencies = [
"pin-utils",
"smallvec",
"tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
-dependencies = [
- "http",
- "hyper",
- "hyper-util",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
]
[[package]]
@@ -990,24 +893,14 @@ version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f"
dependencies = [
- "base64",
"bytes",
- "futures-channel",
"futures-core",
- "futures-util",
"http",
"http-body",
"hyper",
- "ipnet",
- "libc",
- "percent-encoding",
"pin-project-lite",
- "socket2",
- "system-configuration",
"tokio",
"tower-service",
- "tracing",
- "windows-registry",
]
[[package]]
@@ -1166,6 +1059,8 @@ checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
dependencies = [
"equivalent",
"hashbrown 0.16.1",
+ "serde",
+ "serde_core",
]
[[package]]
@@ -1188,22 +1083,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "ipnet"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
-
-[[package]]
-name = "iri-string"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
-dependencies = [
- "memchr",
- "serde",
-]
-
[[package]]
name = "is_terminal_polyfill"
version = "1.70.2"
@@ -1225,28 +1104,6 @@ version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
-[[package]]
-name = "jni"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
-dependencies = [
- "cesu8",
- "cfg-if",
- "combine",
- "jni-sys",
- "log",
- "thiserror 1.0.69",
- "walkdir",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
[[package]]
name = "jobserver"
version = "0.1.34"
@@ -1287,6 +1144,17 @@ dependencies = [
"libc",
]
+[[package]]
+name = "lasso"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e14eda50a3494b3bf7b9ce51c52434a761e383d7238ce1dd5dcec2fbc13e9fb"
+dependencies = [
+ "dashmap 6.1.0",
+ "hashbrown 0.14.5",
+ "serde",
+]
+
[[package]]
name = "lazy_static"
version = "1.5.0"
@@ -1342,12 +1210,6 @@ version = "0.4.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
-[[package]]
-name = "lru-slab"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
-
[[package]]
name = "lsp-types"
version = "0.94.1"
@@ -1372,9 +1234,9 @@ dependencies = [
[[package]]
name = "matchit"
-version = "0.8.4"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
[[package]]
name = "memchr"
@@ -1401,42 +1263,153 @@ dependencies = [
]
[[package]]
-name = "naviscope"
-version = "0.2.1"
+name = "naviscope-api"
+version = "0.5.0"
+dependencies = [
+ "async-trait",
+ "lasso",
+ "schemars",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.17",
+]
+
+[[package]]
+name = "naviscope-cli"
+version = "0.5.0"
dependencies = [
- "axum",
- "cc",
"clap",
- "dashmap 6.1.0",
"dirs",
- "futures",
+ "indexmap",
+ "naviscope-api",
+ "naviscope-lsp",
+ "naviscope-mcp",
+ "naviscope-runtime",
+ "nu-ansi-term",
+ "petgraph",
+ "reedline",
+ "serde",
+ "serde_json",
+ "shlex",
+ "tabled",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "naviscope-core"
+version = "0.5.0"
+dependencies = [
+ "async-trait",
"ignore",
+ "lasso",
"log",
+ "lsp-types",
+ "naviscope-api",
"notify",
- "nu-ansi-term",
+ "once_cell",
"petgraph",
"rayon",
- "reedline",
"regex",
- "reqwest",
- "rmcp",
"rmp-serde",
"schemars",
"serde",
"serde_json",
- "shlex",
- "tabled",
"thiserror 2.0.17",
"tokio",
- "tokio-tungstenite",
"tokio-util",
- "tower-lsp",
"tracing",
"tracing-appender",
"tracing-subscriber",
"tree-sitter",
+ "tree-sitter-java",
+ "url",
"walkdir",
"xxhash-rust",
+ "zstd",
+]
+
+[[package]]
+name = "naviscope-gradle"
+version = "0.5.0"
+dependencies = [
+ "lasso",
+ "naviscope-api",
+ "naviscope-core",
+ "once_cell",
+ "petgraph",
+ "rmp-serde",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.17",
+ "tree-sitter",
+ "tree-sitter-groovy",
+]
+
+[[package]]
+name = "naviscope-java"
+version = "0.5.0"
+dependencies = [
+ "lasso",
+ "lsp-types",
+ "naviscope-api",
+ "naviscope-core",
+ "petgraph",
+ "rmp-serde",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.17",
+ "tree-sitter",
+ "tree-sitter-java",
+]
+
+[[package]]
+name = "naviscope-lsp"
+version = "0.5.0"
+dependencies = [
+ "dashmap 6.1.0",
+ "naviscope-api",
+ "naviscope-mcp",
+ "petgraph",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-util",
+ "tower-lsp",
+ "tracing",
+ "tree-sitter",
+]
+
+[[package]]
+name = "naviscope-mcp"
+version = "0.5.0"
+dependencies = [
+ "anyhow",
+ "axum",
+ "futures",
+ "naviscope-api",
+ "rmcp",
+ "schemars",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-tungstenite 0.28.0",
+ "tokio-util",
+ "tower-lsp",
+ "tracing",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "naviscope-runtime"
+version = "0.5.0"
+dependencies = [
+ "naviscope-api",
+ "naviscope-core",
+ "naviscope-gradle",
+ "naviscope-java",
+ "tracing",
]
[[package]]
@@ -1499,12 +1472,6 @@ version = "1.70.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
-[[package]]
-name = "openssl-probe"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
-
[[package]]
name = "option-ext"
version = "0.2.0"
@@ -1602,6 +1569,12 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
[[package]]
name = "potential_utf"
version = "0.1.4"
@@ -1658,84 +1631,49 @@ dependencies = [
]
[[package]]
-name = "quinn"
-version = "0.11.9"
+name = "quote"
+version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
dependencies = [
- "bytes",
- "cfg_aliases",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash",
- "rustls",
- "socket2",
- "thiserror 2.0.17",
- "tokio",
- "tracing",
- "web-time",
+ "proc-macro2",
]
[[package]]
-name = "quinn-proto"
-version = "0.11.13"
+name = "r-efi"
+version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
-dependencies = [
- "aws-lc-rs",
- "bytes",
- "getrandom 0.3.4",
- "lru-slab",
- "rand",
- "ring",
- "rustc-hash",
- "rustls",
- "rustls-pki-types",
- "slab",
- "thiserror 2.0.17",
- "tinyvec",
- "tracing",
- "web-time",
-]
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
[[package]]
-name = "quinn-udp"
-version = "0.5.14"
+name = "rand"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
- "cfg_aliases",
"libc",
- "once_cell",
- "socket2",
- "tracing",
- "windows-sys 0.60.2",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
]
[[package]]
-name = "quote"
-version = "1.0.43"
+name = "rand"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
dependencies = [
- "proc-macro2",
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.5",
]
[[package]]
-name = "r-efi"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
-[[package]]
-name = "rand"
-version = "0.9.2"
+name = "rand_chacha"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
- "rand_chacha",
- "rand_core",
+ "ppv-lite86",
+ "rand_core 0.6.4",
]
[[package]]
@@ -1745,7 +1683,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
- "rand_core",
+ "rand_core 0.9.5",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
]
[[package]]
@@ -1864,63 +1811,8 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
-
-[[package]]
-name = "reqwest"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e9018c9d814e5f30cc16a0f03271aeab3571e609612d9fe78c1aa8d11c2f62"
-dependencies = [
- "base64",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-util",
- "js-sys",
- "log",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "quinn",
- "rustls",
- "rustls-pki-types",
- "rustls-platform-verifier",
- "sync_wrapper",
- "tokio",
- "tokio-rustls",
- "tokio-util",
- "tower 0.5.3",
- "tower-http",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom 0.2.17",
- "libc",
- "untrusted",
- "windows-sys 0.52.0",
-]
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
[[package]]
name = "rmcp"
@@ -1976,12 +1868,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "rustc-hash"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
-
[[package]]
name = "rustc_version"
version = "0.4.1"
@@ -2004,81 +1890,6 @@ dependencies = [
"windows-sys 0.61.2",
]
-[[package]]
-name = "rustls"
-version = "0.23.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
-dependencies = [
- "aws-lc-rs",
- "once_cell",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
-dependencies = [
- "openssl-probe",
- "rustls-pki-types",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
-dependencies = [
- "web-time",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-platform-verifier"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784"
-dependencies = [
- "core-foundation 0.10.1",
- "core-foundation-sys",
- "jni",
- "log",
- "once_cell",
- "rustls",
- "rustls-native-certs",
- "rustls-platform-verifier-android",
- "rustls-webpki",
- "security-framework",
- "security-framework-sys",
- "webpki-root-certs",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "rustls-platform-verifier-android"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.103.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
-dependencies = [
- "aws-lc-rs",
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
[[package]]
name = "rustversion"
version = "1.0.22"
@@ -2100,15 +1911,6 @@ dependencies = [
"winapi-util",
]
-[[package]]
-name = "schannel"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
-dependencies = [
- "windows-sys 0.61.2",
-]
-
[[package]]
name = "schemars"
version = "1.2.0"
@@ -2141,29 +1943,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-[[package]]
-name = "security-framework"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
-dependencies = [
- "bitflags 2.10.0",
- "core-foundation 0.10.1",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
[[package]]
name = "semver"
version = "1.0.27"
@@ -2384,12 +2163,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
[[package]]
name = "syn"
version = "2.0.114"
@@ -2406,9 +2179,6 @@ name = "sync_wrapper"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
-dependencies = [
- "futures-core",
-]
[[package]]
name = "synstructure"
@@ -2421,27 +2191,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "system-configuration"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
-dependencies = [
- "bitflags 2.10.0",
- "core-foundation 0.9.4",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
[[package]]
name = "tabled"
version = "0.20.0"
@@ -2565,21 +2314,6 @@ dependencies = [
"zerovec",
]
-[[package]]
-name = "tinyvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
[[package]]
name = "tokio"
version = "1.49.0"
@@ -2590,6 +2324,7 @@ dependencies = [
"libc",
"mio",
"pin-project-lite",
+ "signal-hook-registry",
"socket2",
"tokio-macros",
"windows-sys 0.61.2",
@@ -2607,13 +2342,15 @@ dependencies = [
]
[[package]]
-name = "tokio-rustls"
-version = "0.26.4"
+name = "tokio-tungstenite"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
dependencies = [
- "rustls",
+ "futures-util",
+ "log",
"tokio",
+ "tungstenite 0.24.0",
]
[[package]]
@@ -2625,7 +2362,7 @@ dependencies = [
"futures-util",
"log",
"tokio",
- "tungstenite",
+ "tungstenite 0.28.0",
]
[[package]]
@@ -2671,24 +2408,6 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "tower-http"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
-dependencies = [
- "bitflags 2.10.0",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "iri-string",
- "pin-project-lite",
- "tower 0.5.3",
- "tower-layer",
- "tower-service",
-]
-
[[package]]
name = "tower-layer"
version = "0.3.3"
@@ -2823,6 +2542,26 @@ dependencies = [
"tree-sitter-language",
]
+[[package]]
+name = "tree-sitter-groovy"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a20016017f0865ba902ca50354f92429de5de8df994e64ab7fae087a13c40ed"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
+[[package]]
+name = "tree-sitter-java"
+version = "0.23.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aa6cbcdc8c679b214e616fd3300da67da0e492e066df01bcf5a5921a71e90d6"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
[[package]]
name = "tree-sitter-language"
version = "0.1.6"
@@ -2830,10 +2569,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ae62f7eae5eb549c71b76658648b72cc6111f2d87d24a1e31fa907f4943e3ce"
[[package]]
-name = "try-lock"
-version = "0.2.5"
+name = "tungstenite"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "sha1",
+ "thiserror 1.0.69",
+ "utf-8",
+]
[[package]]
name = "tungstenite"
@@ -2846,7 +2597,7 @@ dependencies = [
"http",
"httparse",
"log",
- "rand",
+ "rand 0.9.2",
"sha1",
"thiserror 2.0.17",
"utf-8",
@@ -2882,12 +2633,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
[[package]]
name = "url"
version = "2.5.8"
@@ -2950,15 +2695,6 @@ dependencies = [
"winapi-util",
]
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
[[package]]
name = "wasi"
version = "0.11.1+wasi-snapshot-preview1"
@@ -2987,20 +2723,6 @@ dependencies = [
"wasm-bindgen-shared",
]
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
-dependencies = [
- "cfg-if",
- "futures-util",
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "web-sys",
-]
-
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.108"
@@ -3033,48 +2755,6 @@ dependencies = [
"unicode-ident",
]
-[[package]]
-name = "wasm-streams"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
-dependencies = [
- "futures-util",
- "js-sys",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "web-time"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki-root-certs"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a29fc0408b113f68cf32637857ab740edfafdf460c326cd2afaa2d84cc05dc"
-dependencies = [
- "rustls-pki-types",
-]
-
[[package]]
name = "winapi"
version = "0.3.9"
@@ -3147,17 +2827,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
-[[package]]
-name = "windows-registry"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
-dependencies = [
- "windows-link",
- "windows-result",
- "windows-strings",
-]
-
[[package]]
name = "windows-result"
version = "0.4.1"
@@ -3176,15 +2845,6 @@ dependencies = [
"windows-link",
]
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
[[package]]
name = "windows-sys"
version = "0.52.0"
@@ -3212,21 +2872,6 @@ dependencies = [
"windows-link",
]
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
[[package]]
name = "windows-targets"
version = "0.52.6"
@@ -3260,12 +2905,6 @@ dependencies = [
"windows_x86_64_msvc 0.53.1",
]
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.6"
@@ -3278,12 +2917,6 @@ version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
[[package]]
name = "windows_aarch64_msvc"
version = "0.52.6"
@@ -3296,12 +2929,6 @@ version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
[[package]]
name = "windows_i686_gnu"
version = "0.52.6"
@@ -3326,12 +2953,6 @@ version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
[[package]]
name = "windows_i686_msvc"
version = "0.52.6"
@@ -3344,12 +2965,6 @@ version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
[[package]]
name = "windows_x86_64_gnu"
version = "0.52.6"
@@ -3362,12 +2977,6 @@ version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.52.6"
@@ -3380,12 +2989,6 @@ version = "0.53.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
[[package]]
name = "windows_x86_64_msvc"
version = "0.52.6"
@@ -3480,12 +3083,6 @@ dependencies = [
"synstructure",
]
-[[package]]
-name = "zeroize"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
-
[[package]]
name = "zerotrie"
version = "0.2.3"
@@ -3524,3 +3121,31 @@ name = "zmij"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94f63c051f4fe3c1509da62131a678643c5b6fbdc9273b2b79d4378ebda003d2"
+
+[[package]]
+name = "zstd"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.16+zstd.1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/Cargo.toml b/Cargo.toml
index eb500db..ca4c637 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,25 @@
-[package]
-name = "naviscope"
-version = "0.2.1"
-edition = "2024"
+[workspace]
+resolver = "2"
+members = [
+ "crates/core",
+ "crates/lang-java",
+ "crates/lang-gradle",
+ "crates/cli",
+ "crates/lsp",
+ "crates/mcp",
+ "crates/api",
+ "crates/runtime",
+]
+
+[workspace.dependencies]
+naviscope-core = { path = "crates/core" }
+naviscope-java = { path = "crates/lang-java" }
+naviscope-gradle = { path = "crates/lang-gradle" }
+naviscope-lsp = { path = "crates/lsp" }
+naviscope-mcp = { path = "crates/mcp" }
+naviscope-api = { path = "crates/api" }
+naviscope-runtime = { path = "crates/runtime" }
-[dependencies]
petgraph = { version = "0.8", features = ["serde-1"] }
tree-sitter = "0.26"
serde = { version = "1.0", features = ["derive"] }
@@ -11,31 +27,39 @@ serde_json = "1.0"
thiserror = "2.0"
walkdir = "2.5"
log = "0.4"
-clap = { version = "4.5", features = ["derive"] }
ignore = "0.4.25"
rayon = "1.11.0"
notify = "8.2.0"
xxhash-rust = { version = "0.8.15", features = ["xxh3"] }
regex = "1.11.1"
-tokio = { version = "1.49.0", features = ["rt-multi-thread", "macros", "sync", "time"] }
+tokio = { version = "1.49.0", features = ["rt-multi-thread", "macros", "sync", "time", "fs", "net", "signal"] }
schemars = "1.2.0"
-rmcp = { version = "0.13.0", features = ["macros", "server", "transport-io"] }
-tower-lsp = "0.20"
-futures = "0.3"
-dashmap = "6.1.0"
-axum = { version = "0.8.8", features = ["ws"] }
-reqwest = { version = "0.13.1", features = ["stream"] }
-tokio-util = { version = "0.7.18", features = ["io"] }
tracing = "0.1.44"
tracing-subscriber = { version = "0.3.22", features = ["env-filter"] }
tracing-appender = "0.2.4"
-tokio-tungstenite = "0.28.0"
+rmp-serde = "1.3.1"
+once_cell = "1.20"
+tower-lsp = "0.20"
+lsp-types = "0.94"
+cc = "1.2"
+dashmap = "6.1.0"
+tokio-util = "0.7.18"
+anyhow = "1.0"
+clap = { version = "4.5", features = ["derive"] }
reedline = "0.45.0"
dirs = "6.0.0"
nu-ansi-term = "0.50.3"
shlex = "1.3.0"
tabled = "0.20.0"
-rmp-serde = "1.3.1"
+indexmap = { version = "2.1.0", features = ["serde"] }
+axum = { version = "0.7.5", features = ["ws"] }
+futures = "0.3.31"
+tokio-tungstenite = "0.28.0"
+rmcp = { version = "0.13.0", features = ["macros", "server", "transport-io"] }
+lasso = { version = "0.7", features = ["serialize", "multi-threaded"] }
+zstd = "0.13"
+async-trait = "0.1"
+url = "2.5.8"
+tree-sitter-java = "0.23.5"
+tree-sitter-groovy = "0.1.2"
-[build-dependencies]
-cc = "1.2"
diff --git a/README.md b/README.md
index ef2b55b..a120b88 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
**Unified Code Knowledge Graph Engine for AI Agents & Developers**
-Naviscope bridges the gap between AI and IDEs. It builds a comprehensive, graph-based representation of your codebase (connecting micro-level semantics like calls and inheritance with macro-level structures) that powers both **LLM agents** (via MCP) and **code editors** (via LSP).
+Naviscope bridges the gap between AI and IDEs. It builds a comprehensive, graph-based representation of your codebase (connecting micro-level semantics like type relationships and inheritance with macro-level structures) that powers both **LLM agents** (via MCP) and **code editors** (via LSP).
Unlike traditional tools that maintain separate indexes for different purposes, Naviscope provides a **single, unified knowledge graph**, ensuring that what AI agents see is exactly what developers navigate.
@@ -20,10 +20,11 @@ Unlike traditional tools that maintain separate indexes for different purposes,
### 🤖 For AI Agents (MCP Support)
Naviscope implements the [Model Context Protocol](https://modelcontextprotocol.io/), giving LLMs "X-ray vision" into your code structure.
+- **`get_guide`**: Call this first! Get a comprehensive guide on how to use Naviscope tools.
- **`ls`**: Hierarchical exploration of packages, modules, and fields.
-- **`grep`**: Precise symbol search (find "Class definitions", not just string matches).
-- **`inspect`**: Retrieve definition, source code, and metadata for any symbol.
-- **`deps`**: Analyze incoming/outgoing dependencies and call graphs.
+- **`find`**: Precise symbol search (find "Class definitions", not just string matches).
+- **`cat`**: Retrieve definition, source code, and metadata for any symbol.
+- **`deps`**: Analyze incoming/outgoing dependencies and relationships (inheritance, type usage, etc.).
### 👨💻 For Developers (LSP Support)
A lightweight, lightning-fast alternative to standard language servers (like JDTLS).
@@ -38,61 +39,79 @@ A lightweight, lightning-fast alternative to standard language servers (like JDT
```mermaid
graph TD
%% Styles
- classDef layer fill:#e3f2fd,stroke:#1565c0,stroke-width:2px,rx:5,ry:5
- classDef component fill:#fff,stroke:#333,stroke-width:1px
- classDef storage fill:#fff3e0,stroke:#ef6c00,stroke-width:2px,rx:5,ry:5
-
- subgraph Access [Interfaces Layer]
- direction LR
- CLI[CLI Shell]:::component
- MCP["MCP Server
(AI Agents)"]:::component
- LSP["LSP Server
(Editors)"]:::component
+ classDef interface fill:#e3f2fd,stroke:#1565c0,stroke-width:2px,rx:5,ry:5
+ classDef runtime fill:#f3e5f5,stroke:#7b1fa2,stroke-width:2px,rx:5,ry:5
+ classDef language fill:#e8f5e9,stroke:#2e7d32,stroke-width:2px,rx:5,ry:5
+ classDef core fill:#fff3e0,stroke:#ef6c00,stroke-width:2px,rx:5,ry:5
+ classDef api fill:#fafafa,stroke:#616161,stroke-width:2px,rx:5,ry:5
+
+ subgraph Interfaces [Interface Layer]
+ CLI["naviscope-cli
(Shell & Main)"]:::interface
+ LSP["naviscope-lsp
(LSP Server)"]:::interface
+ MCP["naviscope-mcp
(MCP Server)"]:::interface
end
- subgraph Service [Query & Analysis Layer]
- direction LR
- Query[Query Engine]:::component
- Search[Semantic Search]:::component
- Deps[Dependency Analysis]:::component
+ subgraph Orchestration [Runtime Layer]
+ Runtime["naviscope-runtime
(Engine Orchestrator)"]:::runtime
end
- subgraph Core [Core Knowledge Graph]
- direction LR
- Graph["Unified Graph
(petgraph)"]:::component
- Index["Symbol Index"]:::component
+ subgraph Strategies [Language Layer]
+ Java["naviscope-java
(Java Analysis)"]:::language
+ Gradle["naviscope-gradle
(Gradle Analysis)"]:::language
end
- subgraph Ingestion [Ingestion Layer]
- direction LR
- Scanner[File Scanner]:::component
- Parser["Parsers
(Tree-sitter)"]:::component
- Resolver["Symbol Resolver
(Java/Gradle)"]:::component
+ subgraph Engine [Core Layer]
+ Core["naviscope-core
(Graph, Index & IO)"]:::core
end
- subgraph Infra [Infrastructure]
- direction LR
- Store[("Persistence")]:::storage
- Watch[File Watcher]:::component
+ subgraph Foundation [API Layer]
+ API["naviscope-api
(Common Traits & Models)"]:::api
end
- %% Connections
- CLI --> Query
- MCP --> Query
- LSP --> Query
+ %% Crate Dependencies
+ CLI --> LSP
+ CLI --> MCP
+ CLI --> Runtime
+ CLI --> API
- Query --> Graph
- Search --> Graph
- Deps --> Graph
+ LSP --> MCP
+ LSP --> API
- Scanner --> Parser
- Parser --> Resolver
- Resolver --> Graph
+ MCP --> API
- Graph -.-> Store
- Watch -.-> Scanner
+ Runtime --> Java
+ Runtime --> Gradle
+ Runtime --> Core
+ Runtime --> API
+
+ Java --> Core
+ Java --> API
+
+ Gradle --> Core
+ Gradle --> API
+
+ Core --> API
```
-Naviscope is built on a **layered architecture** that separates ingestion, core graph logic, and external interfaces. The core is a language-agnostic graph structure populated by language-specific strategies (currently Java/Gradle via Tree-sitter), exposing a unified query engine to both AI agents and developer tools.
+Naviscope is built on a **layered crate architecture** that separates concerns across multiple Rust crates:
+
+- **Interface Layer** (`naviscope-cli`, `naviscope-lsp`, `naviscope-mcp`): Entry points for different use cases (CLI shell, LSP for editors, MCP for AI agents).
+- **Runtime Layer** (`naviscope-runtime`): Orchestrates the engine assembly, registering language plugins and providing a unified factory.
+- **Language Layer** (`naviscope-java`, `naviscope-gradle`): Language-specific analysis plugins that parse and resolve symbols.
+- **Core Layer** (`naviscope-core`): The heart of the system - graph storage, indexing, file scanning, and persistence.
+- **API Layer** (`naviscope-api`): Common traits and models shared across all crates, ensuring a consistent interface.
+
+The core is a language-agnostic graph structure populated by language-specific strategies (currently Java/Gradle via Tree-sitter), exposing a unified query engine to both AI agents and developer tools.
+
+### 🔍 Reference Discovery Strategy
+
+Naviscope uses a **two-phase reference discovery** approach for optimal performance:
+
+1. **Meso-level (Coarse Filtering)**: Uses an inverted `reference_index` (token → files) to quickly identify candidate files that likely contain references to a symbol. This index is built during parsing by extracting all identifier tokens from source files.
+
+2. **Micro-level (Precise Analysis)**: For each candidate file, uses Tree-sitter to parse and verify actual symbol occurrences, ensuring accurate reference locations.
+
+This hybrid approach combines the speed of inverted indexing with the precision of syntax-aware parsing, enabling fast reference discovery even in large codebases.
## 🚀 Quick Start
@@ -109,7 +128,7 @@ cd naviscope
git submodule update --init --recursive
# 2. Install the Naviscope CLI
-cargo install --path .
+cargo install --path crates/cli
# 3. (Optional) Build the VS Code Extension
cd editors/vscode
@@ -124,6 +143,10 @@ npm run package
- `naviscope index `: Build a persistent index for a project.
- `naviscope shell [PATH]`: Start an interactive shell to query the graph.
- `naviscope watch `: Start a background service to keep the index updated.
+- `naviscope clear [PATH]`: Clear built indices (or all indices if path omitted).
+- `naviscope mcp`: Start the MCP server.
+- `naviscope lsp`: Start the LSP server.
+
#### Configure in Cursor (for AI Agents)
1. Open **Cursor Settings** (Cmd + Shift + J) -> **Features** -> **MCP**.
2. Click **+ Add New MCP Server**.
@@ -136,30 +159,55 @@ npm run package
- **VS Code**: Install the extension built in step 3.
- **Other Clients**: Point your LSP client to run `naviscope lsp`.
-## 🛠️ Query DSL Examples
+## 🛠️ Query DSL (Interactive Shell)
-Whether using the CLI shell or MCP tools, the query logic is consistent:
+The `naviscope shell` provides a Unix-like experience for exploring the Code Knowledge Graph:
```bash
-# Find all classes named 'UserService'
-grep "UserService" --kind class
+# Change current context to a package or class
+cd "com.example.service"
+
+# List members in current context
+ls
-# List contents of a package
-ls "com.example.service"
+# List with detailed information
+ls -l
+
+# Find all classes named 'UserService'
+find "UserService" --kind class
# Inspect full details of a symbol (source code, metadata)
-cat "com.example.service.UserService"
+cat "UserService"
+
+# Find who references current symbol?
+deps --rev
-# Who calls 'login'? (Incoming dependencies / Reverse lookups)
-deps --rev "com.example.auth.AuthService.login"
+# Print current FQN context
+pwd
+
+# Clear screen
+clear
```
+## 🔗 Graph Relationships
+
+Naviscope tracks the following relationship types in the knowledge graph:
+
+- **Structural**: `Contains` (package → class, class → method, etc.)
+- **Inheritance**: `InheritsFrom`, `Implements`
+- **Type Usage**: `TypedAs` (field/variable → type)
+- **Annotations**: `DecoratedBy` (class/method → annotation)
+- **Build System**: `UsesDependency` (project → dependency)
+
+Reference discovery (method calls, instantiations) is handled efficiently through the `reference_index` + Tree-sitter two-phase approach, avoiding the need to store explicit call edges for every reference.
+
## 📈 Roadmap
- [x] **Core**: Graph Storage (`petgraph`), Parallel Indexing, Real-time Updates (`notify`).
- [x] **Languages**: Java & Gradle (Tree-sitter driven).
- [x] **Interfaces**: CLI Shell, MCP Server, LSP Server.
- [x] **Editors**: VS Code Extension.
+- [x] **Reference Discovery**: Two-phase approach (reference_index + Tree-sitter).
- [ ] **Upcoming**: Maven Support, Python/Rust Language Strategies.
## 📄 License
diff --git a/build.rs b/build.rs
deleted file mode 100644
index 3c76002..0000000
--- a/build.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use std::path::Path;
-
-fn main() {
- let grammars = vec![
- ("java", "tree-sitter-java"),
- ("groovy", "tree-sitter-groovy"),
- ];
-
- for (language, dir) in grammars {
- let lang_dir = Path::new(dir);
- let parser_path = lang_dir.join("src").join("parser.c");
- let scanner_path = lang_dir.join("src").join("scanner.c");
-
- println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
- println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
-
- let mut build = cc::Build::new();
- build.file(&parser_path).include(lang_dir.join("src"));
-
- if scanner_path.exists() {
- build.file(&scanner_path);
- }
-
- build.compile(format!("tree-sitter-{}", language).as_str());
- }
-}
diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
new file mode 100644
index 0000000..097d610
--- /dev/null
+++ b/crates/api/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "naviscope-api"
+version = "0.5.0"
+edition = "2024"
+
+[dependencies]
+async-trait = { workspace = true }
+serde = { workspace = true }
+schemars = { workspace = true }
+lasso = { workspace = true }
+thiserror = { workspace = true }
+serde_json = { workspace = true }
diff --git a/crates/api/src/graph.rs b/crates/api/src/graph.rs
new file mode 100644
index 0000000..424bbf2
--- /dev/null
+++ b/crates/api/src/graph.rs
@@ -0,0 +1,25 @@
+pub use crate::models::graph::{GraphQuery, QueryResult};
+use async_trait::async_trait;
+
+#[derive(Debug, thiserror::Error)]
+pub enum GraphError {
+ #[error("Internal error: {0}")]
+ Internal(String),
+}
+
+pub type Result = std::result::Result;
+
+#[derive(Debug, Clone, Default, serde::Serialize, serde::Deserialize)]
+pub struct GraphStats {
+ pub node_count: usize,
+ pub edge_count: usize,
+}
+
+#[async_trait]
+pub trait GraphService: Send + Sync {
+ async fn query(&self, query: &GraphQuery) -> Result;
+ async fn get_stats(&self) -> Result;
+
+ /// Get a fully hydrated display node by its FQN.
+ async fn get_node_display(&self, fqn: &str) -> Result>;
+}
diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs
new file mode 100644
index 0000000..eb36c62
--- /dev/null
+++ b/crates/api/src/lib.rs
@@ -0,0 +1,25 @@
+pub mod graph;
+pub mod lifecycle;
+pub mod models;
+pub mod navigation;
+pub mod semantic;
+
+// Re-export commonly used types
+pub use graph::GraphService;
+pub use lifecycle::EngineLifecycle;
+pub use models::*;
+pub use navigation::NavigationService;
+pub use semantic::{CallHierarchyAnalyzer, ReferenceAnalyzer, SymbolInfoProvider, SymbolNavigator};
+
+/// Composite trait representing the full Naviscope Engine API.
+/// This allows clients to depend on a single trait instead of multiple individual ones.
+pub trait NaviscopeEngine:
+ GraphService
+ + NavigationService
+ + SymbolNavigator
+ + ReferenceAnalyzer
+ + CallHierarchyAnalyzer
+ + SymbolInfoProvider
+ + EngineLifecycle
+{
+}
diff --git a/crates/api/src/lifecycle.rs b/crates/api/src/lifecycle.rs
new file mode 100644
index 0000000..344798e
--- /dev/null
+++ b/crates/api/src/lifecycle.rs
@@ -0,0 +1,30 @@
+use async_trait::async_trait;
+
+#[derive(Debug, thiserror::Error)]
+pub enum EngineError {
+ #[error("Internal error: {0}")]
+ Internal(String),
+}
+
+pub type EngineResult = std::result::Result;
+
+#[async_trait]
+pub trait EngineLifecycle: Send + Sync {
+ /// Rebuild the index from scratch
+ async fn rebuild(&self) -> EngineResult<()>;
+
+ /// Load the index from disk
+ async fn load(&self) -> EngineResult;
+
+ /// Save the index to disk
+ async fn save(&self) -> EngineResult<()>;
+
+ /// Refresh the index (find new files, etc.)
+ async fn refresh(&self) -> EngineResult<()>;
+
+ /// Watch for filesystem changes
+ async fn watch(&self) -> EngineResult<()>;
+
+ /// Clear the index for the current project
+ async fn clear_index(&self) -> EngineResult<()>;
+}
diff --git a/crates/api/src/models/graph.rs b/crates/api/src/models/graph.rs
new file mode 100644
index 0000000..bf926fa
--- /dev/null
+++ b/crates/api/src/models/graph.rs
@@ -0,0 +1,289 @@
+use super::language::Language;
+use super::symbol::Range;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::sync::Arc;
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Hash, JsonSchema)]
+#[serde(rename_all = "lowercase")]
+pub enum NodeKind {
+ Package,
+ Module,
+ Class,
+ Interface,
+ Enum,
+ Annotation,
+ Method,
+ Constructor,
+ Field,
+ Variable,
+ // Build Specific
+ Project,
+ Dependency,
+ Task,
+ Plugin,
+ // Extension
+ Custom(#[schemars(with = "String")] String),
+}
+
+impl From<&str> for NodeKind {
+ fn from(s: &str) -> Self {
+ match s.to_lowercase().as_str() {
+ "package" => NodeKind::Package,
+ "module" => NodeKind::Module,
+ "class" => NodeKind::Class,
+ "interface" => NodeKind::Interface,
+ "enum" => NodeKind::Enum,
+ "annotation" => NodeKind::Annotation,
+ "method" => NodeKind::Method,
+ "constructor" => NodeKind::Constructor,
+ "field" => NodeKind::Field,
+ "variable" => NodeKind::Variable,
+ "project" => NodeKind::Project,
+ "dependency" => NodeKind::Dependency,
+ "task" => NodeKind::Task,
+ "plugin" => NodeKind::Plugin,
+ _ => NodeKind::Custom(s.to_string()),
+ }
+ }
+}
+
+impl ToString for NodeKind {
+ fn to_string(&self) -> String {
+ match self {
+ NodeKind::Package => "package".to_string(),
+ NodeKind::Module => "module".to_string(),
+ NodeKind::Class => "class".to_string(),
+ NodeKind::Interface => "interface".to_string(),
+ NodeKind::Enum => "enum".to_string(),
+ NodeKind::Annotation => "annotation".to_string(),
+ NodeKind::Method => "method".to_string(),
+ NodeKind::Constructor => "constructor".to_string(),
+ NodeKind::Field => "field".to_string(),
+ NodeKind::Variable => "variable".to_string(),
+ NodeKind::Project => "project".to_string(),
+ NodeKind::Dependency => "dependency".to_string(),
+ NodeKind::Task => "task".to_string(),
+ NodeKind::Plugin => "plugin".to_string(),
+ NodeKind::Custom(s) => s.to_string(),
+ }
+ }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Hash, JsonSchema)]
+pub enum EdgeType {
+ // Structural relationships
+ Contains,
+ // Inheritance/Implementation
+ InheritsFrom,
+ Implements,
+ // Usage/Reference
+ TypedAs,
+ DecoratedBy,
+ // Build system relationships
+ UsesDependency,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Hash, JsonSchema)]
+pub struct GraphEdge {
+ pub edge_type: EdgeType,
+}
+
+impl GraphEdge {
+ pub fn new(edge_type: EdgeType) -> Self {
+ Self { edge_type }
+ }
+}
+
+use super::symbol::Symbol;
+use lasso::Reader;
+use std::any::Any;
+use std::fmt::Debug;
+
+/// Trait for language-specific metadata.
+pub trait NodeMetadata: Send + Sync + Debug {
+ /// Cast to Any for downcasting to concrete types.
+ fn as_any(&self) -> &dyn Any;
+}
+
+/// Default empty metadata implementation.
+#[derive(Debug, Clone)]
+pub struct EmptyMetadata;
+
+impl NodeMetadata for EmptyMetadata {
+ fn as_any(&self) -> &dyn Any {
+ self
+ }
+}
+
+#[derive(Debug, Clone)]
+pub struct GraphNode {
+ /// Unique Identifier (Symbol)
+ pub id: Symbol,
+ /// Short display name (Symbol)
+ pub name: Symbol,
+ /// Abstract categorization
+ pub kind: NodeKind,
+ /// Language identifier (Symbol)
+ pub lang: Symbol,
+ /// Physical Location
+ pub location: Option,
+ /// Extension metadata
+ pub metadata: Arc,
+}
+
+impl Default for GraphNode {
+ fn default() -> Self {
+ Self {
+ id: Symbol(lasso::Spur::default()),
+ name: Symbol(lasso::Spur::default()),
+ kind: NodeKind::Custom("unknown".to_string()),
+ lang: Symbol(lasso::Spur::default()),
+ location: None,
+ metadata: Arc::new(EmptyMetadata),
+ }
+ }
+}
+
+impl GraphNode {
+ pub fn language<'a>(&self, rodeo: &'a dyn Reader) -> Language {
+ Language::new(rodeo.resolve(&self.lang.0).to_string())
+ }
+
+ pub fn fqn<'a>(&self, rodeo: &'a dyn Reader) -> &'a str {
+ rodeo.resolve(&self.id.0)
+ }
+
+ pub fn name<'a>(&self, rodeo: &'a dyn Reader) -> &'a str {
+ rodeo.resolve(&self.name.0)
+ }
+
+ pub fn kind(&self) -> NodeKind {
+ self.kind.clone()
+ }
+
+ pub fn path<'a>(&self, rodeo: &'a impl Reader) -> Option<&'a str> {
+ self.location.as_ref().map(|l| rodeo.resolve(&l.path.0))
+ }
+
+ pub fn range(&self) -> Option<&Range> {
+ self.location.as_ref().map(|l| &l.range)
+ }
+
+ pub fn name_range(&self) -> Option<&Range> {
+ self.location
+ .as_ref()
+ .and_then(|l| l.selection_range.as_ref())
+ }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+pub struct DisplaySymbolLocation {
+ pub path: String,
+ pub range: Range,
+ #[serde(default)]
+ pub selection_range: Option,
+}
+
+impl DisplaySymbolLocation {
+ pub fn to_internal(&self, rodeo: &mut lasso::Rodeo) -> super::symbol::InternedLocation {
+ super::symbol::InternedLocation {
+ path: Symbol(rodeo.get_or_intern(&self.path)),
+ range: self.range,
+ selection_range: self.selection_range,
+ }
+ }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+pub struct DisplayGraphNode {
+ pub id: String,
+ pub name: String,
+ pub kind: NodeKind,
+ pub lang: String,
+ pub location: Option,
+
+ // Rendering fields
+ pub detail: Option,
+ pub signature: Option,
+ #[serde(default)]
+ pub modifiers: Vec,
+
+ // Hierarchy support
+ pub children: Option>,
+}
+
+impl DisplayGraphNode {
+ pub fn to_internal(&self, rodeo: &mut lasso::Rodeo) -> GraphNode {
+ GraphNode {
+ id: Symbol(rodeo.get_or_intern(&self.id)),
+ name: Symbol(rodeo.get_or_intern(&self.name)),
+ kind: self.kind.clone(),
+ lang: Symbol(rodeo.get_or_intern(&self.lang)),
+ location: self.location.as_ref().map(|l| l.to_internal(rodeo)),
+ metadata: Arc::new(EmptyMetadata),
+ }
+ }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+#[serde(tag = "command", rename_all = "snake_case")]
+pub enum GraphQuery {
+ /// List members or structure (Rich Listing)
+ Ls {
+ /// Target node FQN, defaults to project modules if null
+ fqn: Option,
+ #[serde(default)]
+ kind: Vec,
+ #[serde(default)]
+ modifiers: Vec,
+ },
+
+ /// Search for symbols
+ Find {
+ pattern: String,
+ #[serde(default)]
+ kind: Vec,
+ #[serde(default = "default_limit")]
+ limit: usize,
+ },
+
+ /// Inspect node details (Source & Metadata)
+ Cat { fqn: String },
+
+ /// Find dependencies (outgoing) or dependents (incoming)
+ Deps {
+ fqn: String,
+ /// If true, find incoming dependencies (who depends on me).
+ /// If false (default), find outgoing dependencies (who do I depend on).
+ #[serde(default)]
+ rev: bool,
+ #[serde(default)]
+ edge_types: Vec,
+ },
+}
+
+fn default_limit() -> usize {
+ 20
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct QueryResultEdge {
+ #[serde(with = "super::util::serde_arc_str")]
+ pub from: Arc,
+ #[serde(with = "super::util::serde_arc_str")]
+ pub to: Arc,
+ pub data: GraphEdge,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+pub struct QueryResult {
+ pub nodes: Vec,
+ pub edges: Vec,
+}
+
+impl QueryResult {
+ pub fn new(nodes: Vec, edges: Vec) -> Self {
+ Self { nodes, edges }
+ }
+}
diff --git a/crates/api/src/models/language.rs b/crates/api/src/models/language.rs
new file mode 100644
index 0000000..0055e18
--- /dev/null
+++ b/crates/api/src/models/language.rs
@@ -0,0 +1,109 @@
+use serde::{Deserialize, Serialize};
+use std::borrow::Cow;
+use std::fmt;
+
+/// Programming language types
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct Language(Cow<'static, str>);
+
+impl Language {
+ pub const JAVA: Language = Language(Cow::Borrowed("java"));
+ pub const KOTLIN: Language = Language(Cow::Borrowed("kotlin"));
+ pub const RUST: Language = Language(Cow::Borrowed("rust"));
+ pub const JAVASCRIPT: Language = Language(Cow::Borrowed("javascript"));
+ pub const TYPESCRIPT: Language = Language(Cow::Borrowed("typescript"));
+ pub const PYTHON: Language = Language(Cow::Borrowed("python"));
+ pub const GO: Language = Language(Cow::Borrowed("go"));
+ pub const BUILDFILE: Language = Language(Cow::Borrowed("buildfile"));
+ pub const UNKNOWN: Language = Language(Cow::Borrowed("unknown"));
+
+ pub fn new(name: impl Into>) -> Self {
+ Self(name.into())
+ }
+
+ /// Map a file extension to a Language.
+ /// This is the central logic for language detection from extensions.
+ pub fn from_extension(ext: &str) -> Option {
+ match ext.to_lowercase().as_str() {
+ "java" => Some(Self::JAVA),
+ "kt" | "kts" => Some(Self::KOTLIN),
+ "rs" => Some(Self::RUST),
+ "js" => Some(Self::JAVASCRIPT),
+ "ts" => Some(Self::TYPESCRIPT),
+ "py" => Some(Self::PYTHON),
+ "go" => Some(Self::GO),
+ "gradle" | "gradle.kts" => Some(Self::new("gradle")),
+ "pom.xml" => Some(Self::new("maven")),
+ ext => Some(Self::new(ext.to_string())),
+ }
+ }
+
+ pub fn as_str(&self) -> &str {
+ &self.0
+ }
+}
+
+impl fmt::Display for Language {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ write!(f, "{}", self.0)
+ }
+}
+
+impl From<&str> for Language {
+ fn from(s: &str) -> Self {
+ Self::new(s.to_string())
+ }
+}
+
+impl From for Language {
+ fn from(s: String) -> Self {
+ Self::new(s)
+ }
+}
+
+impl AsRef for Language {
+ fn as_ref(&self) -> &str {
+ self.as_str()
+ }
+}
+
+/// Build tool types
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct BuildTool(Cow<'static, str>);
+
+impl BuildTool {
+ pub const GRADLE: BuildTool = BuildTool(Cow::Borrowed("gradle"));
+ pub const MAVEN: BuildTool = BuildTool(Cow::Borrowed("maven"));
+ pub const CARGO: BuildTool = BuildTool(Cow::Borrowed("cargo"));
+ pub const NPM: BuildTool = BuildTool(Cow::Borrowed("npm"));
+ pub const POETRY: BuildTool = BuildTool(Cow::Borrowed("poetry"));
+ pub const BAZEL: BuildTool = BuildTool(Cow::Borrowed("bazel"));
+
+ pub fn new(name: impl Into>) -> Self {
+ Self(name.into())
+ }
+
+ pub fn as_str(&self) -> &str {
+ &self.0
+ }
+}
+
+impl fmt::Display for BuildTool {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ write!(f, "{}", self.0)
+ }
+}
+
+impl From<&str> for BuildTool {
+ fn from(s: &str) -> Self {
+ Self::new(s.to_string())
+ }
+}
+
+impl AsRef for BuildTool {
+ fn as_ref(&self) -> &str {
+ self.as_str()
+ }
+}
diff --git a/crates/api/src/models/mod.rs b/crates/api/src/models/mod.rs
new file mode 100644
index 0000000..e37c9e1
--- /dev/null
+++ b/crates/api/src/models/mod.rs
@@ -0,0 +1,8 @@
+pub mod graph;
+pub mod language;
+pub mod symbol;
+pub mod util;
+
+pub use graph::*;
+pub use language::*;
+pub use symbol::*;
diff --git a/crates/api/src/models/symbol.rs b/crates/api/src/models/symbol.rs
new file mode 100644
index 0000000..fb834bd
--- /dev/null
+++ b/crates/api/src/models/symbol.rs
@@ -0,0 +1,183 @@
+use super::graph::{DisplayGraphNode, NodeKind};
+use super::language::Language;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::path::Path;
+use std::sync::Arc;
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct Symbol(pub lasso::Spur);
+
+impl JsonSchema for Symbol {
+ fn schema_name() -> std::borrow::Cow<'static, str> {
+ std::borrow::Cow::Borrowed("Symbol")
+ }
+
+ fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
+ u32::json_schema(generator)
+ }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, Hash, JsonSchema)]
+pub struct Range {
+ pub start_line: usize,
+ pub start_col: usize,
+ pub end_line: usize,
+ pub end_col: usize,
+}
+
+impl Range {
+ pub fn contains(&self, line: usize, col: usize) -> bool {
+ if line < self.start_line || line > self.end_line {
+ return false;
+ }
+ if line == self.start_line && col < self.start_col {
+ return false;
+ }
+ if line == self.end_line && col > self.end_col {
+ return false;
+ }
+ true
+ }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum SymbolIntent {
+ Type,
+ Method,
+ Field,
+ Variable,
+ Unknown,
+}
+
+pub fn matches_intent(node_kind: &NodeKind, intent: SymbolIntent) -> bool {
+ match intent {
+ SymbolIntent::Type => matches!(
+ node_kind,
+ NodeKind::Class | NodeKind::Interface | NodeKind::Enum | NodeKind::Annotation
+ ),
+ SymbolIntent::Method => matches!(node_kind, NodeKind::Method | NodeKind::Constructor),
+ SymbolIntent::Field => matches!(node_kind, NodeKind::Field),
+ SymbolIntent::Variable => false,
+ SymbolIntent::Unknown => true,
+ }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum SymbolResolution {
+ Local(Range, Option), // Range of declaration, and optional type name
+ Precise(String, SymbolIntent),
+ Global(String),
+}
+
+// --- New Core API Types ---
+
+#[derive(Debug, Clone)]
+pub struct PositionContext {
+ pub uri: String,
+ pub line: u32,
+ pub char: u32,
+ pub content: Option,
+}
+
+#[derive(Debug, Clone)]
+pub struct SymbolQuery {
+ pub resolution: SymbolResolution,
+ pub language: Language,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
+pub struct SymbolLocation {
+ #[serde(with = "super::util::serde_arc_path")]
+ #[schemars(with = "String")]
+ pub path: Arc,
+ pub range: Range,
+ /// Range of the identifier/name (for precise navigation)
+ #[serde(default)]
+ pub selection_range: Option,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
+pub struct InternedLocation {
+ pub path: Symbol,
+ pub range: Range,
+ #[serde(default)]
+ pub selection_range: Option,
+}
+
+impl InternedLocation {
+ pub fn to_display(&self, rodeo: &dyn lasso::Reader) -> super::graph::DisplaySymbolLocation {
+ super::graph::DisplaySymbolLocation {
+ path: rodeo.resolve(&self.path.0).to_string(),
+ range: self.range,
+ selection_range: self.selection_range,
+ }
+ }
+}
+
+#[derive(Debug, Clone)]
+pub struct ReferenceQuery {
+ pub resolution: SymbolResolution,
+ pub language: Language,
+ pub include_declaration: bool,
+}
+
+#[derive(Debug, Clone)]
+pub struct CallHierarchyIncomingCall {
+ pub from: DisplayGraphNode,
+ pub from_ranges: Vec,
+}
+
+#[derive(Debug, Clone)]
+pub struct CallHierarchyOutgoingCall {
+ pub to: DisplayGraphNode,
+ pub from_ranges: Vec,
+}
+
+// --- Type System ---
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Hash, JsonSchema)]
+pub enum TypeRef {
+ /// Unresolved or primitive type name (e.g., "int", "void", "List")
+ Raw(String),
+
+ /// Resolved reference to a Type definition node (FQN)
+ Id(String),
+
+ /// Generic instantiation (e.g., List)
+ Generic {
+ base: Box,
+ args: Vec,
+ },
+
+ /// Array type (e.g., String[])
+ Array {
+ element: Box,
+ dimensions: usize,
+ },
+
+ /// Wildcard type (e.g., ? extends Number)
+ Wildcard {
+ bound: Option>,
+ is_upper_bound: bool, // true: extends, false: super
+ },
+
+ Unknown,
+}
+
+impl TypeRef {
+ /// Helper to create a Raw type
+ pub fn raw(s: impl Into) -> Self {
+ TypeRef::Raw(s.into())
+ }
+
+ /// Helper to create an Id type
+ pub fn id(s: impl Into) -> Self {
+ TypeRef::Id(s.into())
+ }
+}
+
+impl Default for TypeRef {
+ fn default() -> Self {
+ TypeRef::Unknown
+ }
+}
diff --git a/crates/api/src/models/util.rs b/crates/api/src/models/util.rs
new file mode 100644
index 0000000..e8f8862
--- /dev/null
+++ b/crates/api/src/models/util.rs
@@ -0,0 +1,41 @@
+use serde::{Deserialize, Deserializer, Serializer};
+use std::path::Path;
+use std::sync::Arc;
+
+pub mod serde_arc_str {
+ use super::*;
+
+ pub fn serialize(arc: &Arc, serializer: S) -> Result
+ where
+ S: Serializer,
+ {
+ serializer.serialize_str(arc)
+ }
+
+ pub fn deserialize<'de, D>(deserializer: D) -> Result, D::Error>
+ where
+ D: Deserializer<'de>,
+ {
+ let s = String::deserialize(deserializer)?;
+ Ok(Arc::from(s.as_str()))
+ }
+}
+
+pub mod serde_arc_path {
+ use super::*;
+
+ pub fn serialize(arc: &Arc, serializer: S) -> Result
+ where
+ S: Serializer,
+ {
+ serializer.serialize_str(&arc.to_string_lossy())
+ }
+
+ pub fn deserialize<'de, D>(deserializer: D) -> Result, D::Error>
+ where
+ D: Deserializer<'de>,
+ {
+ let s = String::deserialize(deserializer)?;
+ Ok(Arc::from(Path::new(&s)))
+ }
+}
diff --git a/crates/api/src/navigation.rs b/crates/api/src/navigation.rs
new file mode 100644
index 0000000..2781720
--- /dev/null
+++ b/crates/api/src/navigation.rs
@@ -0,0 +1,60 @@
+use async_trait::async_trait;
+
+/// Result of resolving a user-provided path to a node FQN.
+/// This is specific to CLI-style navigation with fuzzy matching and relative paths.
+#[derive(Debug, Clone)]
+pub enum ResolveResult {
+ /// Exactly one node found
+ Found(String),
+ /// Multiple nodes match the query (ambiguous)
+ Ambiguous(Vec),
+ /// No node found
+ NotFound,
+}
+
+/// Navigation service for CLI-style path resolution.
+///
+/// This trait provides fuzzy matching and relative path resolution for interactive shells.
+/// For structured graph queries (get children, get parent, etc.), use `GraphService` instead.
+///
+/// # Design Rationale
+/// - `resolve_path()` supports CLI-specific features like:
+/// - Fuzzy matching: "MyClass" finds "com.example.MyClass"
+/// - Relative paths: "../sibling" from current context
+/// - Special paths: "/", "root"
+/// - These features don't fit well into structured `GraphQuery` patterns
+/// - Other graph traversal operations should use `GraphService::query()`
+#[async_trait]
+pub trait NavigationService: Send + Sync {
+ /// Resolve a user-provided path to a concrete FQN.
+ ///
+ /// Supports multiple resolution strategies:
+ /// - **Absolute FQN**: "com.example.MyClass" → exact match
+ /// - **Relative path**: "../sibling" from current context
+ /// - **Fuzzy name**: "MyClass" → searches for matching nodes
+ /// - **Special paths**: "/" or "root" → project root
+ ///
+ /// # Arguments
+ /// * `target` - The path to resolve (e.g., "MyClass", "../sibling", "/root/package")
+ /// * `current_context` - Optional current FQN for relative path resolution
+ ///
+ /// # Returns
+ /// * `ResolveResult::Found(fqn)` - Exactly one match found
+ /// * `ResolveResult::Ambiguous(fqns)` - Multiple matches found (user needs to disambiguate)
+ /// * `ResolveResult::NotFound` - No matches found
+ ///
+ /// # Example
+ /// ```ignore
+ /// // Fuzzy match
+ /// service.resolve_path("MyClass", None).await
+ /// // => Found("com.example.MyClass")
+ ///
+ /// // Relative path
+ /// service.resolve_path("../OtherClass", Some("com.example.MyClass")).await
+ /// // => Found("com.example.OtherClass")
+ /// ```
+ async fn resolve_path(&self, target: &str, current_context: Option<&str>) -> ResolveResult;
+
+ /// Get completion candidates for a prefix.
+ async fn get_completion_candidates(&self, prefix: &str) -> Vec;
+}
diff --git a/crates/api/src/semantic.rs b/crates/api/src/semantic.rs
new file mode 100644
index 0000000..560fc70
--- /dev/null
+++ b/crates/api/src/semantic.rs
@@ -0,0 +1,93 @@
+use crate::models::{
+ CallHierarchyIncomingCall, CallHierarchyOutgoingCall, DisplayGraphNode, PositionContext,
+ ReferenceQuery, SymbolLocation, SymbolQuery, SymbolResolution,
+};
+use async_trait::async_trait;
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum SemanticError {
+ #[error("Symbol not found: {0}")]
+ SymbolNotFound(String),
+ #[error("Internal error: {0}")]
+ Internal(String),
+ #[error("Language not supported: {0}")]
+ UnsupportedLanguage(String),
+}
+
+pub type SemanticResult = std::result::Result;
+
+// ============================================================================
+// Core Semantic Traits - Balanced Granularity
+// ============================================================================
+
+/// Symbol navigation: resolve, go-to-definition, go-to-type, go-to-implementation.
+/// This is the most fundamental semantic capability for code navigation.
+#[async_trait]
+pub trait SymbolNavigator: Send + Sync {
+ /// Resolve the symbol at a specific position in the source code.
+ async fn resolve_symbol_at(
+ &self,
+ ctx: &PositionContext,
+ ) -> SemanticResult>;
+
+ /// Find all definition locations for a given symbol query.
+ async fn find_definitions(&self, query: &SymbolQuery) -> SemanticResult>;
+
+ /// Find type definition locations (e.g., the class definition of a variable's type).
+ async fn find_type_definitions(
+ &self,
+ query: &SymbolQuery,
+ ) -> SemanticResult>;
+
+ /// Find all implementation locations (e.g., classes implementing an interface).
+ async fn find_implementations(
+ &self,
+ query: &SymbolQuery,
+ ) -> SemanticResult>;
+
+ /// Find occurrences of a symbol for document highlighting.
+ async fn find_highlights(
+ &self,
+ ctx: &PositionContext,
+ ) -> SemanticResult>;
+}
+
+/// Reference analysis: find all usages of a symbol.
+#[async_trait]
+pub trait ReferenceAnalyzer: Send + Sync {
+ /// Find all reference locations for a given reference query.
+ async fn find_references(&self, query: &ReferenceQuery) -> SemanticResult>;
+}
+
+/// Call hierarchy analysis: incoming and outgoing calls.
+#[async_trait]
+pub trait CallHierarchyAnalyzer: Send + Sync {
+ /// Find all incoming calls (callers) to the specified function/method.
+ async fn find_incoming_calls(
+ &self,
+ fqn: &str,
+ ) -> SemanticResult>;
+
+ /// Find all outgoing calls (callees) from the specified function/method.
+ async fn find_outgoing_calls(
+ &self,
+ fqn: &str,
+ ) -> SemanticResult>;
+}
+
+/// Symbol metadata provider: detailed information about symbols.
+#[async_trait]
+pub trait SymbolInfoProvider: Send + Sync {
+ /// Get detailed information about a symbol by its FQN.
+ async fn get_symbol_info(&self, fqn: &str) -> SemanticResult>;
+
+ /// Get all symbols defined in a specific document.
+ async fn get_document_symbols(&self, uri: &str) -> SemanticResult>;
+
+ /// Get the language of a specific document.
+ async fn get_language_for_document(
+ &self,
+ uri: &str,
+ ) -> SemanticResult>;
+}
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
new file mode 100644
index 0000000..b110111
--- /dev/null
+++ b/crates/cli/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "naviscope-cli"
+version = "0.5.0"
+edition = "2024"
+
+[[bin]]
+name = "naviscope"
+path = "src/main.rs"
+
+[dependencies]
+naviscope-lsp = { workspace = true }
+naviscope-mcp = { workspace = true }
+naviscope-runtime = { workspace = true }
+clap = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+reedline = { workspace = true }
+dirs = { workspace = true }
+nu-ansi-term = { workspace = true }
+shlex = { workspace = true }
+tabled = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+indexmap = { workspace = true }
+petgraph = { workspace = true }
+naviscope-api = { workspace = true }
diff --git a/crates/cli/src/clear.rs b/crates/cli/src/clear.rs
new file mode 100644
index 0000000..56dab2b
--- /dev/null
+++ b/crates/cli/src/clear.rs
@@ -0,0 +1,17 @@
+use std::path::PathBuf;
+use tracing::info;
+
+pub async fn run(path: Option) -> Result<(), Box> {
+ if let Some(path) = path {
+ let engine = naviscope_runtime::build_default_engine(path.clone());
+ info!("Clearing index for project at: {}...", path.display());
+ engine.clear_index().await?;
+ info!("Project index cleared.");
+ } else {
+ // For clearing ALL indices, we use the runtime utility.
+ info!("Clearing all indices...");
+ naviscope_runtime::clear_all_indices()?;
+ info!("All indices cleared.");
+ }
+ Ok(())
+}
diff --git a/crates/cli/src/index.rs b/crates/cli/src/index.rs
new file mode 100644
index 0000000..c3081d1
--- /dev/null
+++ b/crates/cli/src/index.rs
@@ -0,0 +1,31 @@
+use std::path::PathBuf;
+use tracing::info;
+
+pub async fn run(path: PathBuf) -> Result<(), Box> {
+ let engine = naviscope_runtime::build_default_engine(path.clone());
+
+ info!("Indexing project at: {}...", path.display());
+
+ // Run async build
+ engine.rebuild().await?;
+
+ let stats = engine.get_stats().await?;
+
+ info!("Indexing complete!");
+ info!("Nodes: {}", stats.node_count);
+ info!("Edges: {}", stats.edge_count);
+
+ info!("Sample nodes:");
+ let query = naviscope_api::models::GraphQuery::Ls {
+ fqn: None,
+ kind: vec![],
+ modifiers: vec![],
+ };
+ if let Ok(res) = engine.query(&query).await {
+ for node in res.nodes.iter().take(10) {
+ info!(" - {}", node.id);
+ }
+ }
+
+ Ok(())
+}
diff --git a/src/cli/mod.rs b/crates/cli/src/lib.rs
similarity index 63%
rename from src/cli/mod.rs
rename to crates/cli/src/lib.rs
index ef12626..78aec5e 100644
--- a/src/cli/mod.rs
+++ b/crates/cli/src/lib.rs
@@ -1,7 +1,7 @@
+mod clear;
mod index;
mod shell;
mod watch;
-mod clear;
use clap::{Parser, Subcommand};
use std::path::PathBuf;
@@ -23,40 +23,40 @@ pub struct Cli {
#[derive(Subcommand)]
pub enum Commands {
/// Index a project directory into a Code Knowledge Graph
- #[command(long_about = "Analyzes the project structure and source code to build a persistent index. \
- By default, the index is stored in ~/.naviscope/indices/.")]
+ #[command(
+ long_about = "Analyzes the project structure and source code to build a persistent index. \
+ By default, the index is stored in ~/.naviscope/indices/."
+ )]
Index {
/// Path to the project root directory to index
#[arg(value_name = "PROJECT_PATH")]
path: PathBuf,
-
- /// Save a human-readable JSON version for debugging purposes
- #[arg(long)]
- debug: bool,
},
/// Start an interactive shell to query the code knowledge graph
- #[command(long_about = "Starts an interactive shell where you can execute structured queries \
- against the index using both JSON DSL and shorthand commands.")]
+ #[command(
+ long_about = "Starts an interactive shell where you can execute structured queries \
+ against the index using both JSON DSL and shorthand commands."
+ )]
Shell {
/// Path to the project root (used to locate the default index). Defaults to current directory.
#[arg(value_name = "PROJECT_PATH")]
path: Option,
},
/// Watch for file changes and update the index automatically
- #[command(long_about = "Starts a file watcher that monitors the project directory for changes. \
- When a change is detected, the index is automatically updated.")]
+ #[command(
+ long_about = "Starts a file watcher that monitors the project directory for changes. \
+ When a change is detected, the index is automatically updated."
+ )]
Watch {
/// Path to the project root directory to watch
#[arg(value_name = "PROJECT_PATH")]
path: PathBuf,
-
- /// Save a human-readable JSON version for debugging purposes
- #[arg(long)]
- debug: bool,
},
/// Clear built indices
- #[command(long_about = "Removes built index files. If a path is provided, only that project's index \
- is removed. Otherwise, all indices are cleared.")]
+ #[command(
+ long_about = "Removes built index files. If a path is provided, only that project's index \
+ is removed. Otherwise, all indices are cleared."
+ )]
Clear {
/// Path to the project root directory to clear (optional)
#[arg(value_name = "PROJECT_PATH")]
@@ -81,30 +81,27 @@ pub fn run() -> Result<(), Box> {
Commands::Mcp { .. } => "mcp",
_ => "cli",
};
- let _guard = naviscope::logging::init_logging(component);
+ let _guard = naviscope_runtime::init_logging(component);
+
+ let rt = tokio::runtime::Runtime::new()?;
match cli.command {
- Commands::Index {
- path,
- debug,
- } => index::run(path, debug),
- Commands::Shell { path } => shell::run(path),
- Commands::Watch { path, debug } => watch::run(path, debug),
- Commands::Clear { path } => clear::run(path),
+ Commands::Index { path } => rt.block_on(index::run(path)),
+ Commands::Shell { path } => rt.block_on(shell::run(path)),
+ Commands::Watch { path } => rt.block_on(watch::run(path)),
+ Commands::Clear { path } => rt.block_on(clear::run(path)),
Commands::Mcp { path } => {
- let rt = tokio::runtime::Runtime::new()?;
- let project_path = path.clone().unwrap_or_else(|| std::env::current_dir().unwrap_or_else(|_| PathBuf::from(".")));
-
+ let project_path = path
+ .clone()
+ .unwrap_or_else(|| std::env::current_dir().unwrap_or_else(|_| PathBuf::from(".")));
+
// Connect to LSP via proxy mode (waits for LSP if not started)
- rt.block_on(async {
- naviscope::mcp::proxy::run_mcp_proxy(&project_path).await
- })?;
+ rt.block_on(async { naviscope_mcp::proxy::run_mcp_proxy(&project_path).await })?;
Ok(())
}
Commands::Lsp => {
- let rt = tokio::runtime::Runtime::new()?;
rt.block_on(async {
- naviscope::lsp::run_server().await
+ naviscope_lsp::run_server(naviscope_runtime::build_default_engine).await
})?;
Ok(())
}
diff --git a/src/main.rs b/crates/cli/src/main.rs
similarity index 69%
rename from src/main.rs
rename to crates/cli/src/main.rs
index 32ad922..0dacad7 100644
--- a/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -1,5 +1,3 @@
-mod cli;
-
fn main() -> Result<(), Box> {
- cli::run()
+ naviscope_cli::run()
}
diff --git a/crates/cli/src/shell/command.rs b/crates/cli/src/shell/command.rs
new file mode 100644
index 0000000..f0f9e8c
--- /dev/null
+++ b/crates/cli/src/shell/command.rs
@@ -0,0 +1,305 @@
+use super::view::{ShellNodeView, ShellNodeViewShort, get_kind_weight};
+use clap::{Parser, ValueEnum};
+use naviscope_api::models::{EdgeType, GraphQuery, NodeKind, QueryResult};
+use shlex;
+use tabled::{Table, settings::Style};
+
+/// Default limit for search results
+const DEFAULT_SEARCH_LIMIT: usize = 20;
+
+#[derive(Clone, Debug, ValueEnum)]
+#[clap(rename_all = "lowercase")]
+pub enum CliNodeKind {
+ Class,
+ Interface,
+ Enum,
+ Annotation,
+ Method,
+ Constructor,
+ Field,
+ Package,
+ Project,
+ Module,
+ Dependency,
+ Task,
+ Plugin,
+ Other,
+}
+
+impl From for NodeKind {
+ fn from(kind: CliNodeKind) -> Self {
+ match kind {
+ CliNodeKind::Class => NodeKind::Class,
+ CliNodeKind::Interface => NodeKind::Interface,
+ CliNodeKind::Enum => NodeKind::Enum,
+ CliNodeKind::Annotation => NodeKind::Annotation,
+ CliNodeKind::Method => NodeKind::Method,
+ CliNodeKind::Constructor => NodeKind::Constructor,
+ CliNodeKind::Field => NodeKind::Field,
+ CliNodeKind::Package => NodeKind::Package,
+ CliNodeKind::Project => NodeKind::Project,
+ CliNodeKind::Module => NodeKind::Module,
+ CliNodeKind::Dependency => NodeKind::Dependency,
+ CliNodeKind::Task => NodeKind::Task,
+ CliNodeKind::Plugin => NodeKind::Plugin,
+ CliNodeKind::Other => NodeKind::Custom("other".to_string()),
+ }
+ }
+}
+
+#[derive(Clone, Debug, ValueEnum)]
+pub enum CliEdgeType {
+ Contains,
+ InheritsFrom,
+ Implements,
+ TypedAs,
+ DecoratedBy,
+ UsesDependency,
+}
+
+impl From for EdgeType {
+ fn from(kind: CliEdgeType) -> Self {
+ match kind {
+ CliEdgeType::Contains => EdgeType::Contains,
+ CliEdgeType::InheritsFrom => EdgeType::InheritsFrom,
+ CliEdgeType::Implements => EdgeType::Implements,
+ CliEdgeType::TypedAs => EdgeType::TypedAs,
+ CliEdgeType::DecoratedBy => EdgeType::DecoratedBy,
+ CliEdgeType::UsesDependency => EdgeType::UsesDependency,
+ }
+ }
+}
+
+/// Helper struct for Clap parsing within the shell
+#[derive(Parser, Clone)]
+#[command(no_binary_name = true)]
+pub enum ShellCommand {
+ /// List members or structure
+ Ls {
+ /// Target node FQN (optional, defaults to current node)
+ fqn: Option,
+ /// Filter by node kind (e.g. class, interface, method)
+ #[arg(long, value_delimiter = ',')]
+ kind: Vec,
+ /// Filter by modifiers (e.g. public, static)
+ #[arg(long, value_delimiter = ',')]
+ modifiers: Vec,
+ /// Use long listing format
+ #[arg(short, long)]
+ long: bool,
+ },
+ /// Change current node context (internal shell command)
+ Cd {
+ /// Target path
+ path: String,
+ },
+ /// Print current node context
+ Pwd,
+ /// Clear the screen
+ Clear,
+ /// Search for symbols
+ Find {
+ /// Pattern to search for
+ pattern: String,
+ /// Filter by node kind
+ #[arg(long, value_delimiter = ',')]
+ kind: Vec,
+ /// Limit number of results
+ #[arg(long, default_value_t = DEFAULT_SEARCH_LIMIT)]
+ limit: usize,
+ },
+ /// Inspect node details
+ Cat {
+ /// Target node FQN (optional, defaults to current node) or member name
+ target: String,
+ },
+ /// Find dependencies
+ Deps {
+ /// Target node FQN (optional, defaults to current node)
+ fqn: Option,
+ /// If set, find incoming dependencies (who depends on me)
+ #[arg(long)]
+ rev: bool,
+ /// Filter by edge types (e.g. TypedAs, InheritsFrom)
+ #[arg(long, value_delimiter = ',')]
+ edge_types: Vec,
+ },
+}
+
+use clap::error::ErrorKind;
+
+impl ShellCommand {
+ /// Automatically generates the list of available command names from the enum.
+ /// This eliminates the need to manually maintain a hardcoded command list.
+ pub fn command_names() -> Vec {
+ use clap::CommandFactory;
+ let cmd = Self::command();
+ let mut names = vec!["help".to_string(), "exit".to_string(), "quit".to_string()];
+ names.extend(cmd.get_subcommands().map(|s| s.get_name().to_string()));
+ names
+ }
+}
+
+pub fn parse_shell_command(
+ input: &str,
+) -> Result, Box> {
+ // Use shlex to split arguments while respecting quotes
+ let args = shlex::split(input).ok_or("Invalid quoting")?;
+
+ // Parse using Clap
+ match ShellCommand::try_parse_from(args) {
+ Ok(c) => Ok(Some(c)),
+ Err(e) => {
+ // Handle help/version display without returning an error
+ if e.kind() == ErrorKind::DisplayHelp || e.kind() == ErrorKind::DisplayVersion {
+ println!("{}", e);
+ return Ok(None);
+ }
+ Err(Box::new(e))
+ }
+ }
+}
+
+impl ShellCommand {
+ pub fn to_graph_query(
+ &self,
+ current_node: &Option,
+ ) -> Result> {
+ match self {
+ ShellCommand::Ls {
+ fqn,
+ kind,
+ modifiers,
+ ..
+ } => {
+ let target_fqn = fqn.clone().or_else(|| current_node.clone());
+ Ok(GraphQuery::Ls {
+ fqn: target_fqn,
+ kind: kind.iter().map(|k| k.clone().into()).collect(),
+ modifiers: modifiers.clone(),
+ })
+ }
+ ShellCommand::Find {
+ pattern,
+ kind,
+ limit,
+ } => Ok(GraphQuery::Find {
+ pattern: pattern.clone(),
+ kind: kind.iter().map(|k| k.clone().into()).collect(),
+ limit: *limit,
+ }),
+ ShellCommand::Cat { target } => Ok(GraphQuery::Cat {
+ fqn: target.clone(),
+ }),
+ ShellCommand::Deps {
+ fqn,
+ rev,
+ edge_types,
+ } => {
+ let target_fqn = fqn
+ .clone()
+ .or_else(|| current_node.clone())
+ .ok_or("No FQN provided and no current context")?;
+ Ok(GraphQuery::Deps {
+ fqn: target_fqn,
+ rev: *rev,
+ edge_types: edge_types.iter().map(|e| e.clone().into()).collect(),
+ })
+ }
+ ShellCommand::Cd { .. } | ShellCommand::Pwd | ShellCommand::Clear => {
+ Err("Internal shell command should be handled by ReplServer".into())
+ }
+ }
+ }
+
+ pub fn render(
+ &self,
+ result: QueryResult,
+ _context: &super::context::ShellContext,
+ ) -> Result> {
+ if result.nodes.is_empty() {
+ return Ok("NO RECORDS FOUND".to_string());
+ }
+
+ match self {
+ ShellCommand::Ls { long: false, .. } => {
+ let mut views: Vec = result
+ .nodes
+ .iter()
+ .map(|node| ShellNodeViewShort {
+ kind: node.kind.to_string(),
+ name: if is_container(node.kind.clone()) {
+ format!("{}/", node.name)
+ } else {
+ node.name.to_string()
+ },
+ })
+ .collect();
+
+ views.sort_by(|a, b| {
+ let wa = get_kind_weight(&a.kind);
+ let wb = get_kind_weight(&b.kind);
+ if wa != wb {
+ wa.cmp(&wb)
+ } else {
+ a.name.cmp(&b.name)
+ }
+ });
+
+ Ok(Table::new(&views).with(Style::psql()).to_string())
+ }
+ ShellCommand::Cat { .. } if result.nodes.len() == 1 => {
+ Ok(serde_json::to_string_pretty(&result.nodes[0])?)
+ }
+ _ => {
+ // Default detailed table view for Find, Deps, and Ls -l
+ let mut views: Vec = result
+ .nodes
+ .iter()
+ .map(|node| {
+ let relation = result
+ .edges
+ .iter()
+ .filter(|e| e.to.as_ref() == node.id || e.from.as_ref() == node.id)
+ .map(|e| format!("{:?}", e.data.edge_type))
+ .collect::>()
+ .join(", ");
+
+ ShellNodeView::from_node(
+ node,
+ if relation.is_empty() {
+ None
+ } else {
+ Some(relation)
+ },
+ )
+ })
+ .collect();
+
+ views.sort_by(|a, b| {
+ let wa = get_kind_weight(&a.kind);
+ let wb = get_kind_weight(&b.kind);
+ if wa != wb {
+ wa.cmp(&wb)
+ } else {
+ a.name.cmp(&b.name)
+ }
+ });
+
+ Ok(Table::new(&views).with(Style::psql()).to_string())
+ }
+ }
+ }
+}
+
+fn is_container(kind: NodeKind) -> bool {
+ matches!(
+ kind,
+ NodeKind::Class
+ | NodeKind::Interface
+ | NodeKind::Enum
+ | NodeKind::Annotation
+ | NodeKind::Module
+ | NodeKind::Package
+ )
+}
diff --git a/crates/cli/src/shell/completer.rs b/crates/cli/src/shell/completer.rs
new file mode 100644
index 0000000..fe520c6
--- /dev/null
+++ b/crates/cli/src/shell/completer.rs
@@ -0,0 +1,152 @@
+use super::context::ShellContext;
+use naviscope_api::models::GraphQuery;
+use reedline::{Completer, Suggestion};
+
+pub struct NaviscopeCompleter<'a> {
+ pub commands: Vec,
+ pub context: ShellContext,
+ pub _marker: std::marker::PhantomData<&'a ()>,
+}
+
+impl<'a> NaviscopeCompleter<'a> {
+ pub fn new(commands: Vec, context: ShellContext) -> Self {
+ Self {
+ commands,
+ context,
+ _marker: std::marker::PhantomData,
+ }
+ }
+}
+
+impl<'a> Completer for NaviscopeCompleter<'a> {
+ fn complete(&mut self, line: &str, pos: usize) -> Vec {
+ let trimmed = line.trim_start();
+
+ // 1. Command completion (at start of line)
+ if !trimmed.contains(' ') {
+ return self
+ .commands
+ .iter()
+ .filter(|cmd| cmd.starts_with(trimmed))
+ .map(|cmd| Suggestion {
+ value: cmd.clone(),
+ description: None,
+ style: None,
+ extra: None,
+ span: reedline::Span {
+ start: pos - trimmed.len(),
+ end: pos,
+ },
+ append_whitespace: true,
+ match_indices: None,
+ })
+ .collect();
+ }
+
+ // 2. Argument completion (for cd, ls, cat, deps)
+ let parts: Vec<&str> = trimmed.split_whitespace().collect();
+ if parts.len() >= 1 {
+ let cmd = parts[0];
+ if matches!(cmd, "cd" | "ls" | "cat" | "deps") {
+ // Determine the partial FQN being typed
+ let last_word = if line.ends_with(' ') {
+ ""
+ } else {
+ parts.last().unwrap_or(&"")
+ };
+ let span_start = pos - last_word.len();
+
+ // Get current context
+ let parent_fqn = self.context.current_fqn();
+ let mut suggestions = Vec::new();
+
+ if last_word.contains('.')
+ || last_word.contains("::")
+ || (parent_fqn.is_none() && !last_word.is_empty())
+ {
+ // Find potential FQNs starting with last_word from the API NavigationService
+ use naviscope_api::navigation::NavigationService;
+ let nav_service: &dyn NavigationService = self.context.engine.as_ref();
+
+ let matches = if tokio::runtime::Handle::try_current().is_ok() {
+ tokio::task::block_in_place(|| {
+ self.context
+ .rt_handle
+ .block_on(nav_service.get_completion_candidates(last_word))
+ })
+ } else {
+ self.context
+ .rt_handle
+ .block_on(nav_service.get_completion_candidates(last_word))
+ };
+
+ for fqn in matches {
+ suggestions.push(Suggestion {
+ value: fqn,
+ description: None,
+ style: None,
+ extra: None,
+ span: reedline::Span {
+ start: span_start,
+ end: pos,
+ },
+ append_whitespace: true,
+ match_indices: None,
+ });
+ }
+ }
+
+ // Case B: Relative completion from current context (or root)
+ let query = GraphQuery::Ls {
+ fqn: parent_fqn.clone(),
+ kind: vec![],
+ modifiers: vec![],
+ };
+
+ if let Ok(result) = self.context.execute_query(&query) {
+ for node in result.nodes {
+ let name = &node.name;
+ if name.starts_with(last_word) {
+ // De-duplicate if already added by Case A
+ if suggestions.iter().any(|s| s.value == *name) {
+ continue;
+ }
+
+ suggestions.push(Suggestion {
+ value: name.to_string(),
+ description: Some(node.kind.to_string()),
+ style: None,
+ extra: None,
+ span: reedline::Span {
+ start: span_start,
+ end: pos,
+ },
+ append_whitespace: true,
+ match_indices: None,
+ });
+ }
+ }
+ }
+
+ // Sort suggestions: Relative first (shorter names that aren't FQNs usually)
+ // Then by length
+ suggestions.sort_by(|a, b| {
+ let a_is_fqn = a.value.contains('.') || a.value.contains("::");
+ let b_is_fqn = b.value.contains('.') || b.value.contains("::");
+ if a_is_fqn != b_is_fqn {
+ a_is_fqn.cmp(&b_is_fqn) // Non-FQN first
+ } else {
+ a.value.len().cmp(&b.value.len())
+ }
+ });
+
+ // Final limit to total suggestions to keep UI clean
+ suggestions.truncate(50);
+
+ return suggestions;
+ }
+ }
+
+ vec![]
+ }
+}
diff --git a/crates/cli/src/shell/context.rs b/crates/cli/src/shell/context.rs
new file mode 100644
index 0000000..1e9d52a
--- /dev/null
+++ b/crates/cli/src/shell/context.rs
@@ -0,0 +1,67 @@
+use naviscope_api::NaviscopeEngine;
+use naviscope_api::graph::GraphService;
+use naviscope_api::models::{GraphQuery, QueryResult};
+use naviscope_api::navigation::NavigationService;
+use std::sync::{Arc, RwLock};
+
+#[derive(Clone)]
+pub struct ShellContext {
+ pub engine: Arc,
+ pub rt_handle: tokio::runtime::Handle,
+ pub current_node: Arc>>,
+}
+
+// Re-export ResolveResult from API
+pub use naviscope_api::navigation::ResolveResult;
+
+impl ShellContext {
+ pub fn new(
+ engine: Arc,
+ rt_handle: tokio::runtime::Handle,
+ current_node: Arc>>,
+ ) -> Self {
+ Self {
+ engine,
+ rt_handle,
+ current_node,
+ }
+ }
+
+ pub fn current_fqn(&self) -> Option {
+ self.current_node.read().unwrap().clone()
+ }
+
+ pub fn set_current_fqn(&self, fqn: Option) {
+ *self.current_node.write().unwrap() = fqn;
+ }
+
+ /// Helper to execute query synchronously using the API GraphService
+ pub fn execute_query(
+ &self,
+ query: &GraphQuery,
+ ) -> Result> {
+ let service: &dyn GraphService = self.engine.as_ref();
+ let result = if tokio::runtime::Handle::try_current().is_ok() {
+ tokio::task::block_in_place(|| self.rt_handle.block_on(service.query(query)))
+ } else {
+ self.rt_handle.block_on(service.query(query))
+ };
+ Ok(result?)
+ }
+
+ /// Resolves a user input path using the NavigationService API.
+ pub fn resolve_node(&self, target: &str) -> ResolveResult {
+ let nav_service: &dyn NavigationService = self.engine.as_ref();
+ let current_context = self.current_fqn();
+
+ if tokio::runtime::Handle::try_current().is_ok() {
+ tokio::task::block_in_place(|| {
+ self.rt_handle
+ .block_on(nav_service.resolve_path(target, current_context.as_deref()))
+ })
+ } else {
+ self.rt_handle
+ .block_on(nav_service.resolve_path(target, current_context.as_deref()))
+ }
+ }
+}
diff --git a/crates/cli/src/shell/handlers.rs b/crates/cli/src/shell/handlers.rs
new file mode 100644
index 0000000..edb3ec4
--- /dev/null
+++ b/crates/cli/src/shell/handlers.rs
@@ -0,0 +1,188 @@
+use super::command::ShellCommand;
+use super::context::{ResolveResult, ShellContext};
+use naviscope_api::models::GraphQuery;
+
+pub trait CommandHandler {
+ fn handle(
+ &self,
+ cmd: &ShellCommand,
+ context: &mut ShellContext,
+ ) -> Result>;
+}
+
+pub struct CdHandler;
+impl CommandHandler for CdHandler {
+ fn handle(
+ &self,
+ cmd: &ShellCommand,
+ context: &mut ShellContext,
+ ) -> Result> {
+ if let ShellCommand::Cd { path } = cmd {
+ match context.resolve_node(path) {
+ ResolveResult::Found(fqn) => {
+ let new_curr = if fqn.is_empty() { None } else { Some(fqn) };
+ context.set_current_fqn(new_curr);
+ Ok(String::new())
+ }
+ ResolveResult::Ambiguous(candidates) => {
+ let mut msg = format!("Ambiguous path '{}'. Candidates:\n", path);
+ for c in candidates.iter().take(10) {
+ msg.push_str(&format!(" - {}\n", c));
+ }
+ Err(msg.into())
+ }
+ ResolveResult::NotFound => Err(format!("Node '{}' not found.", path).into()),
+ }
+ } else {
+ Ok(String::new())
+ }
+ }
+}
+
+pub struct CatHandler;
+impl CommandHandler for CatHandler {
+ fn handle(
+ &self,
+ cmd: &ShellCommand,
+ context: &mut ShellContext,
+ ) -> Result> {
+ if let ShellCommand::Cat { target } = cmd {
+ // First resolve the target to a concrete FQN
+ let fqn = match context.resolve_node(target) {
+ ResolveResult::Found(f) => f,
+ ResolveResult::Ambiguous(candidates) => {
+ let mut msg =
+ format!("Ambiguous match for '{}'. Available options:\n\n", target);
+ for c in candidates {
+ msg.push_str(&format!(" - {}\n", c));
+ }
+ msg.push_str("\nPlease specify the full name.");
+ return Ok(msg);
+ }
+ ResolveResult::NotFound => {
+ return Ok(format!(
+ "Error: Target '{}' not found in current context.",
+ target
+ ));
+ }
+ };
+
+ if fqn.is_empty() {
+ return Err("Cannot cat root.".into());
+ }
+
+ let query = GraphQuery::Cat { fqn };
+ let result = context.execute_query(&query)?;
+
+ cmd.render(result, context)
+ } else {
+ Ok(String::new())
+ }
+ }
+}
+
+pub struct GenericQueryHandler;
+impl CommandHandler for GenericQueryHandler {
+ fn handle(
+ &self,
+ cmd: &ShellCommand,
+ context: &mut ShellContext,
+ ) -> Result> {
+ let current_node = context.current_fqn();
+
+ // Resolve argument FQN if present
+ let mut resolved_target_fqn = None;
+ let resolved_cmd = match cmd {
+ ShellCommand::Ls {
+ fqn: Some(target),
+ kind,
+ modifiers,
+ long,
+ } => {
+ resolved_target_fqn = match context.resolve_node(target) {
+ ResolveResult::Found(f) => Some(f),
+ _ => Some(target.clone()),
+ };
+ ShellCommand::Ls {
+ fqn: resolved_target_fqn.clone(),
+ kind: kind.clone(),
+ modifiers: modifiers.clone(),
+ long: *long,
+ }
+ }
+ ShellCommand::Deps {
+ fqn: Some(target),
+ rev,
+ edge_types,
+ } => {
+ resolved_target_fqn = match context.resolve_node(target) {
+ ResolveResult::Found(f) => Some(f),
+ _ => Some(target.clone()),
+ };
+ ShellCommand::Deps {
+ fqn: resolved_target_fqn.clone(),
+ rev: *rev,
+ edge_types: edge_types.clone(),
+ }
+ }
+ _ => cmd.clone(),
+ };
+
+ let query = resolved_cmd.to_graph_query(¤t_node)?;
+ let result = context.execute_query(&query)?;
+
+ if result.nodes.is_empty() {
+ if let Some(target) = resolved_target_fqn {
+ // Check if node itself exists in the graph
+ let check_query = naviscope_api::models::GraphQuery::Cat {
+ fqn: target.clone(),
+ };
+ if let Ok(res) = context.execute_query(&check_query) {
+ if !res.nodes.is_empty() {
+ return Ok(format!(
+ "Node '{}' exists but has no children/relationships matching your criteria.",
+ target
+ ));
+ }
+ }
+ }
+ return Ok("NO RECORDS FOUND".to_string());
+ }
+
+ resolved_cmd.render(result, context)
+ }
+}
+
+pub struct PwdHandler;
+impl CommandHandler for PwdHandler {
+ fn handle(
+ &self,
+ _cmd: &ShellCommand,
+ context: &mut ShellContext,
+ ) -> Result> {
+ Ok(context.current_fqn().unwrap_or("/".to_string()))
+ }
+}
+
+pub struct ClearHandler;
+impl CommandHandler for ClearHandler {
+ fn handle(
+ &self,
+ _cmd: &ShellCommand,
+ _context: &mut ShellContext,
+ ) -> Result> {
+ // Clear is handled by the Reedline loop mostly, but we can return a marker if needed.
+ // For now, simple print or empty string. The loop handles `line_editor.clear_screen()`.
+ Ok(String::new())
+ }
+}
+
+pub fn get_handler(cmd: &ShellCommand) -> Box {
+ match cmd {
+ ShellCommand::Cd { .. } => Box::new(CdHandler),
+ ShellCommand::Cat { .. } => Box::new(CatHandler),
+ ShellCommand::Pwd => Box::new(PwdHandler),
+ ShellCommand::Clear => Box::new(ClearHandler),
+ _ => Box::new(GenericQueryHandler),
+ }
+}
diff --git a/crates/cli/src/shell/highlighter.rs b/crates/cli/src/shell/highlighter.rs
new file mode 100644
index 0000000..496d663
--- /dev/null
+++ b/crates/cli/src/shell/highlighter.rs
@@ -0,0 +1,60 @@
+use nu_ansi_term::{Color, Style};
+use reedline::{Highlighter, StyledText};
+
+pub struct NaviscopeHighlighter {
+ commands: Vec,
+}
+
+impl NaviscopeHighlighter {
+ pub fn new(commands: Vec) -> Self {
+ Self { commands }
+ }
+}
+
+impl Highlighter for NaviscopeHighlighter {
+ fn highlight(&self, line: &str, _cursor: usize) -> StyledText {
+ let mut styled_text = StyledText::new();
+ // If the line ends with whitespace, we need to handle that to keep the highlighting accurate
+ // But for simple word-based highlighting, we can just iterate over splits and gaps.
+
+ let mut current_pos = 0;
+ let words = line.split_inclusive(char::is_whitespace);
+
+ for word in words {
+ let trimmed = word.trim();
+ if trimmed.is_empty() {
+ styled_text.push((Style::new(), word.to_string()));
+ current_pos += word.len();
+ continue;
+ }
+
+ let style = if current_pos == 0 || self.is_at_start_of_command(line, current_pos) {
+ if self.commands.contains(&trimmed.to_string()) {
+ Style::new().fg(Color::LightGreen).bold()
+ } else {
+ Style::new()
+ }
+ } else if trimmed.starts_with('-') {
+ Style::new().fg(Color::Cyan)
+ } else if trimmed.contains('.') || trimmed.contains("::") || trimmed.contains('/') {
+ Style::new().fg(Color::Yellow)
+ } else {
+ Style::new()
+ };
+
+ // Calculate trailing whitespace
+ let word_to_push = word.to_string();
+ styled_text.push((style, word_to_push));
+ current_pos += word.len();
+ }
+
+ styled_text
+ }
+}
+
+impl NaviscopeHighlighter {
+ fn is_at_start_of_command(&self, line: &str, pos: usize) -> bool {
+ let prefix = &line[..pos];
+ prefix.trim().is_empty()
+ }
+}
diff --git a/src/cli/shell/mod.rs b/crates/cli/src/shell/mod.rs
similarity index 50%
rename from src/cli/shell/mod.rs
rename to crates/cli/src/shell/mod.rs
index 18f453e..1ae18d0 100644
--- a/src/cli/shell/mod.rs
+++ b/crates/cli/src/shell/mod.rs
@@ -2,26 +2,27 @@ mod command;
mod completer;
mod context;
mod handlers;
+mod highlighter;
mod prompt;
mod view;
-use naviscope::index::Naviscope;
-use naviscope::project::watcher::Watcher;
use reedline::{
- default_emacs_keybindings, ColumnarMenu, DefaultHinter, Emacs, FileBackedHistory, KeyCode,
- KeyModifiers, MenuBuilder, Reedline, ReedlineEvent, ReedlineMenu, Signal,
+ ColumnarMenu, DefaultHinter, Emacs, FileBackedHistory, KeyCode, KeyModifiers, MenuBuilder,
+ Reedline, ReedlineEvent, ReedlineMenu, Signal, default_emacs_keybindings,
};
use std::path::PathBuf;
use std::sync::{Arc, RwLock};
-use std::thread;
-use std::time::Duration;
use tracing::{error, info};
+use self::command::{ShellCommand, parse_shell_command};
use self::completer::NaviscopeCompleter;
use self::context::ShellContext;
-use self::command::{ShellCommand, parse_shell_command};
+use self::highlighter::NaviscopeHighlighter;
use self::prompt::DefaultPrompt;
+// Shell configuration constants
+const SHELL_HISTORY_SIZE: usize = 500;
+
pub struct ReplServer {
context: ShellContext,
project_path: PathBuf,
@@ -29,120 +30,103 @@ pub struct ReplServer {
impl ReplServer {
pub fn new(project_path: PathBuf) -> Self {
- let engine = Naviscope::new(project_path.clone());
- let naviscope = Arc::new(RwLock::new(engine));
+ let engine = naviscope_runtime::build_default_engine(project_path.clone());
let current_node = Arc::new(RwLock::new(None));
- let context = ShellContext::new(naviscope, current_node);
-
+
+ // ShellContext will get resolver from engine
+ let context = ShellContext::new(engine, tokio::runtime::Handle::current(), current_node);
+
Self {
context,
project_path,
}
}
- pub fn run(&self) -> Result<(), Box> {
+ pub async fn run(&self) -> Result<(), Box> {
println!("Project: {:?}", self.project_path);
-
- self.initialize_index()?;
- self.start_watcher();
-
+
+ self.initialize_index().await?;
+
+ // Start watcher (spawns background task on the runtime)
+ if let Err(e) = self.context.engine.watch().await {
+ error!("Failed to start file watcher: {}", e);
+ } else {
+ info!("File watcher started.");
+ }
+
println!("Type 'help' for commands.");
-
+
let line_editor = self.setup_line_editor()?;
self.run_loop(line_editor)
}
- fn initialize_index(&self) -> Result<(), Box> {
- let mut engine = self.context.naviscope.write().unwrap();
+ async fn initialize_index(&self) -> Result<(), Box> {
+ let engine = &self.context.engine;
let start = std::time::Instant::now();
-
- // Try to load existing index
- match engine.load() {
+
+ // Load index (blocking on async)
+ match engine.load().await {
Ok(true) => {
- let index = engine.graph();
+ let stats = engine.get_stats().await.unwrap_or_default();
println!(
"Index loaded from disk in {:?}. Nodes: {}, Edges: {}",
start.elapsed(),
- index.topology.node_count(),
- index.topology.edge_count()
+ stats.node_count,
+ stats.edge_count
);
}
Ok(false) => {
- println!("No existing index found. Building fresh index...");
+ println!("No existing index found or it was stale. Rebuilding...");
+ // If load returns false, we should verify/rebuild.
+ // But refresh() below will handle it anyway.
}
Err(e) => {
error!("Failed to load index: {}", e);
- println!("Failed to load index: {}. Starting fresh scan...", e);
+ // Continue to rebuild
}
}
- // Sync with filesystem (refresh) synchronously before starting the shell
+ // Sync with filesystem (rebuild/refresh)
let sync_start = std::time::Instant::now();
- if let Err(e) = engine.refresh() {
+ if let Err(e) = engine.refresh().await {
error!("Synchronization failed: {}", e);
println!("Warning: Index synchronization failed: {}", e);
} else {
- let index = engine.graph();
- println!("Index synchronized in {:?}. Total nodes: {}", sync_start.elapsed(), index.topology.node_count());
- }
- Ok(())
- }
-
- fn start_watcher(&self) {
- let naviscope_clone = self.context.naviscope.clone();
- let path_clone = self.project_path.clone();
-
- thread::spawn(move || {
- let mut watcher = match Watcher::new(&path_clone) {
- Ok(w) => w,
- Err(e) => {
- error!("Failed to start watcher: {}", e);
- return;
- }
+ let stats = engine.get_stats().await.unwrap_or_default();
+ println!(
+ "Index synchronized in {:?}. Total nodes: {}",
+ sync_start.elapsed(),
+ stats.node_count
+ );
+
+ // Auto-set context to Project node if it exists
+
+ let query = naviscope_api::models::GraphQuery::Ls {
+ fqn: None,
+ kind: vec![naviscope_api::models::NodeKind::Project],
+ modifiers: vec![],
};
- loop {
- if let Some(event) = watcher.next_event() {
- if !event.paths.iter().any(|p| naviscope::project::is_relevant_path(p)) {
- continue;
- }
-
- thread::sleep(Duration::from_millis(500));
- while watcher.try_next_event().is_some() {}
-
- info!("Change detected. Re-indexing...");
-
- match naviscope_clone.write() {
- Ok(mut engine) => {
- if let Err(e) = engine.refresh() {
- error!("Error during re-indexing: {}", e);
- } else {
- let index = engine.graph();
- info!(
- "Indexing complete! Nodes: {}, Edges: {}",
- index.topology.node_count(),
- index.topology.edge_count()
- );
- }
- }
- Err(e) => error!("Failed to acquire lock for re-indexing: {}", e),
- }
+ if let Ok(res) = engine.query(&query).await {
+ if res.nodes.len() == 1 {
+ let fqn = res.nodes[0].id.to_string();
+ self.context.set_current_fqn(Some(fqn));
}
}
- });
+ }
+ Ok(())
}
+ // Manual start_watcher removed - handled by EngineHandle::watch()
+
fn setup_line_editor(&self) -> Result> {
- let commands = vec![
- "help".into(), "exit".into(), "quit".into(), "ls".into(), "cd".into(),
- "pwd".into(), "clear".into(), "grep".into(), "cat".into(), "deps".into(),
- ];
-
+ let commands = ShellCommand::command_names();
+
let completer = Box::new(NaviscopeCompleter::new(
- commands,
+ commands.clone(),
self.context.clone(),
));
-
+
let completion_menu = Box::new(ColumnarMenu::default().with_name("completion_menu"));
let mut keybindings = default_emacs_keybindings();
@@ -166,15 +150,25 @@ impl ReplServer {
.unwrap();
let history = Box::new(
- FileBackedHistory::with_file(500, history_file.clone())
- .unwrap_or_else(|_| FileBackedHistory::new(500).expect("Failed to create history")),
+ FileBackedHistory::with_file(SHELL_HISTORY_SIZE, history_file.clone()).unwrap_or_else(
+ |_| FileBackedHistory::new(SHELL_HISTORY_SIZE).expect("Failed to create history"),
+ ),
);
+ let highlighter = Box::new(NaviscopeHighlighter::new(commands));
+
Ok(Reedline::create()
.with_history(history)
.with_completer(completer)
+ .with_highlighter(highlighter)
.with_menu(ReedlineMenu::EngineCompleter(completion_menu))
- .with_hinter(Box::new(DefaultHinter::default().with_style(nu_ansi_term::Style::new().italic().fg(nu_ansi_term::Color::LightGray))))
+ .with_hinter(Box::new(
+ DefaultHinter::default().with_style(
+ nu_ansi_term::Style::new()
+ .italic()
+ .fg(nu_ansi_term::Color::LightGray),
+ ),
+ ))
.with_edit_mode(Box::new(Emacs::new(keybindings))))
}
@@ -185,12 +179,16 @@ impl ReplServer {
let curr = context.current_fqn();
let prompt = DefaultPrompt::new(curr.clone());
let sig = line_editor.read_line(&prompt);
-
+
match sig {
Ok(Signal::Success(buffer)) => {
let trimmed = buffer.trim();
- if trimmed.is_empty() { continue; }
- if trimmed == "exit" || trimmed == "quit" { break; }
+ if trimmed.is_empty() {
+ continue;
+ }
+ if trimmed == "exit" || trimmed == "quit" {
+ break;
+ }
match parse_shell_command(trimmed) {
Ok(Some(cmd)) => {
@@ -198,15 +196,17 @@ impl ReplServer {
match handler.handle(&cmd, &mut context) {
Ok(output) => {
- if !output.is_empty() { println!("{}", output); }
+ if !output.is_empty() {
+ println!("{}", output);
+ }
if matches!(cmd, ShellCommand::Clear) {
let _ = line_editor.clear_screen();
}
- },
+ }
Err(e) => eprintln!("Error: {}", e),
}
- },
- Ok(None) => {}, // Help or handled by Clap
+ }
+ Ok(None) => {} // Help or handled by Clap
Err(e) => eprintln!("Error: {}", e),
}
}
@@ -221,8 +221,9 @@ impl ReplServer {
}
}
-pub fn run(path: Option) -> Result<(), Box> {
- let project_path = path.unwrap_or_else(|| std::env::current_dir().unwrap_or_else(|_| PathBuf::from(".")));
+pub async fn run(path: Option) -> Result<(), Box> {
+ let project_path =
+ path.unwrap_or_else(|| std::env::current_dir().unwrap_or_else(|_| PathBuf::from(".")));
let server = ReplServer::new(project_path);
- server.run()
+ server.run().await
}
diff --git a/src/cli/shell/prompt.rs b/crates/cli/src/shell/prompt.rs
similarity index 63%
rename from src/cli/shell/prompt.rs
rename to crates/cli/src/shell/prompt.rs
index d544627..f37ca04 100644
--- a/src/cli/shell/prompt.rs
+++ b/crates/cli/src/shell/prompt.rs
@@ -1,3 +1,4 @@
+use nu_ansi_term::Color;
use reedline::{Prompt, PromptEditMode, PromptHistorySearch};
use std::borrow::Cow;
@@ -13,16 +14,21 @@ impl DefaultPrompt {
impl Prompt for DefaultPrompt {
fn render_prompt_left(&self) -> Cow<'_, str> {
+ let prefix = Color::LightBlue.bold().paint("naviscope");
match &self.current_node {
Some(node) => {
- let display_node = if node.len() > 40 {
+ let display_node = if node.len() > 30 {
shorten_fqn(node)
} else {
node.clone()
};
- Cow::Owned(format!("naviscope {} > ", display_node))
- },
- None => Cow::Borrowed("naviscope / > "),
+ let path = Color::Yellow.paint(display_node);
+ Cow::Owned(format!("{} {} > ", prefix, path))
+ }
+ None => {
+ let path = Color::Yellow.paint("/");
+ Cow::Owned(format!("{} {} > ", prefix, path))
+ }
}
}
@@ -38,13 +44,17 @@ impl Prompt for DefaultPrompt {
Cow::Borrowed(".. ")
}
- fn render_prompt_history_search_indicator(&self, _history_search: PromptHistorySearch) -> Cow<'_, str> {
+ fn render_prompt_history_search_indicator(
+ &self,
+ _history_search: PromptHistorySearch,
+ ) -> Cow<'_, str> {
Cow::Borrowed("(search) ")
}
}
fn shorten_fqn(fqn: &str) -> String {
- let parts: Vec<&str> = fqn.split('.').collect();
+ let separator = if fqn.contains("::") { "::" } else { "." };
+ let parts: Vec<&str> = fqn.split(separator).collect();
if parts.len() <= 2 {
return fqn.to_string();
}
@@ -55,12 +65,12 @@ fn shorten_fqn(fqn: &str) -> String {
if i < parts.len() - 2 {
if let Some(c) = part.chars().next() {
result.push(c);
- result.push('.');
+ result.push_str(separator);
}
} else {
result.push_str(part);
if i < parts.len() - 1 {
- result.push('.');
+ result.push_str(separator);
}
}
}
diff --git a/crates/cli/src/shell/view.rs b/crates/cli/src/shell/view.rs
new file mode 100644
index 0000000..3380ccd
--- /dev/null
+++ b/crates/cli/src/shell/view.rs
@@ -0,0 +1,110 @@
+use naviscope_api::models::{DisplayGraphNode, NodeKind};
+use tabled::Tabled;
+
+/// A terminal-optimized view of a GraphNode (Detailed)
+#[derive(Tabled)]
+pub struct ShellNodeView {
+ pub kind: String,
+ pub name: String,
+ pub relation: String,
+ pub signature: String,
+ pub location: String,
+ pub fqn: String,
+}
+
+/// A short view of a GraphNode
+#[derive(Tabled)]
+pub struct ShellNodeViewShort {
+ pub kind: String,
+ pub name: String,
+}
+
+impl ShellNodeView {
+ pub fn from_node(
+ node: &DisplayGraphNode,
+ relation: Option,
+ ) -> Self {
+ let location = node
+ .location
+ .as_ref()
+ .map(|loc| {
+ // DisplaySymbolLocation has String path
+ let path = std::path::Path::new(&loc.path);
+ let filename = path.file_name().and_then(|n| n.to_str()).unwrap_or("-");
+ format!("{}:{}", filename, loc.range.start_line + 1)
+ })
+ .unwrap_or_else(|| "-".to_string());
+
+ let is_container = matches!(
+ node.kind,
+ NodeKind::Project
+ | NodeKind::Module
+ | NodeKind::Package
+ | NodeKind::Class
+ | NodeKind::Interface
+ | NodeKind::Enum
+ | NodeKind::Annotation
+ );
+
+ let name = if is_container {
+ format!("{}/", node.name)
+ } else {
+ node.name.clone()
+ };
+
+ // Use pre-filled signature in DisplayGraphNode
+ let signature = node.signature.clone().unwrap_or_else(|| {
+ // Fallback for nodes without specific signature
+ match node.kind {
+ NodeKind::Project => "Project".to_string(),
+ _ => "-".to_string(),
+ }
+ });
+
+ Self {
+ fqn: shorten_fqn(&node.id),
+ name,
+ kind: node.kind.to_string(),
+ relation: relation.unwrap_or_else(|| "-".to_string()),
+ signature,
+ location,
+ }
+ }
+}
+
+pub fn shorten_fqn(fqn: &str) -> String {
+ let separator = if fqn.contains("::") { "::" } else { "." };
+ let parts: Vec<&str> = fqn.split(separator).collect();
+ if parts.len() <= 2 {
+ return fqn.to_string();
+ }
+ let mut result = String::new();
+ for (i, part) in parts.iter().enumerate() {
+ if i < parts.len() - 2 {
+ if let Some(c) = part.chars().next() {
+ result.push(c);
+ result.push_str(separator);
+ }
+ } else {
+ result.push_str(part);
+ if i < parts.len() - 1 {
+ result.push_str(separator);
+ }
+ }
+ }
+ result
+}
+
+pub fn get_kind_weight(kind: &str) -> i32 {
+ match kind.to_lowercase().as_str() {
+ "package" => 1,
+ "class" => 2,
+ "interface" => 3,
+ "enum" => 4,
+ "annotation" => 5,
+ "constructor" => 6,
+ "method" => 7,
+ "field" => 8,
+ _ => 99,
+ }
+}
diff --git a/crates/cli/src/watch.rs b/crates/cli/src/watch.rs
new file mode 100644
index 0000000..cec0a3c
--- /dev/null
+++ b/crates/cli/src/watch.rs
@@ -0,0 +1,21 @@
+use std::path::PathBuf;
+use tracing::info;
+
+pub async fn run(path: PathBuf) -> Result<(), Box> {
+ let engine = naviscope_runtime::build_default_engine(path.clone());
+
+ info!("Initializing: Indexing project at: {}...", path.display());
+ engine.rebuild().await?;
+ info!("Initial indexing complete.");
+
+ // Start background watcher via trait
+ engine.watch().await?;
+ info!("File watcher started. Ready for changes.");
+ info!("Press Ctrl+C to stop.");
+
+ // Keep the main thread alive
+ tokio::signal::ctrl_c().await?;
+ info!("Watcher stopped.");
+
+ Ok(())
+}
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
new file mode 100644
index 0000000..b274de7
--- /dev/null
+++ b/crates/core/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "naviscope-core"
+version = "0.5.0"
+edition = "2024"
+
+[dependencies]
+petgraph = { workspace = true }
+tree-sitter = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+thiserror = { workspace = true }
+walkdir = { workspace = true }
+log = { workspace = true }
+ignore = { workspace = true }
+rayon = { workspace = true }
+notify = { workspace = true }
+xxhash-rust = { workspace = true }
+regex = { workspace = true }
+tokio = { workspace = true }
+tokio-util = { workspace = true }
+schemars = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+tracing-appender = { workspace = true }
+rmp-serde = { workspace = true }
+once_cell = { workspace = true }
+lsp-types = { workspace = true }
+lasso = { workspace = true }
+zstd = { workspace = true }
+naviscope-api = { workspace = true }
+async-trait = { workspace = true }
+url = { workspace = true }
+
+[dev-dependencies]
+tree-sitter-java = { workspace = true }
diff --git a/src/error.rs b/crates/core/src/error.rs
similarity index 87%
rename from src/error.rs
rename to crates/core/src/error.rs
index a288bcc..3372391 100644
--- a/src/error.rs
+++ b/crates/core/src/error.rs
@@ -8,6 +8,8 @@ pub enum NaviscopeError {
Json(#[from] serde_json::Error),
#[error("Parsing error: {0}")]
Parsing(String),
+ #[error("Internal error: {0}")]
+ Internal(String),
#[error("Unknown error")]
Unknown,
}
diff --git a/crates/core/src/facade/graph.rs b/crates/core/src/facade/graph.rs
new file mode 100644
index 0000000..214f0f7
--- /dev/null
+++ b/crates/core/src/facade/graph.rs
@@ -0,0 +1,45 @@
+use super::EngineHandle;
+use crate::error::NaviscopeError;
+use crate::features::query::QueryEngine;
+use async_trait::async_trait;
+use naviscope_api::{graph, models};
+
+#[async_trait]
+impl graph::GraphService for EngineHandle {
+ async fn query(&self, query: &models::GraphQuery) -> graph::Result {
+ let graph = self.graph().await;
+ let query_clone = query.clone();
+ let handle = self.clone();
+
+ let result = tokio::task::spawn_blocking(
+ move || -> Result {
+ let engine = QueryEngine::new(&graph, |lang| handle.get_node_renderer(lang));
+ engine.execute(&query_clone)
+ },
+ )
+ .await
+ .map_err(|e| graph::GraphError::Internal(e.to_string()))?
+ .map_err(|e| graph::GraphError::Internal(e.to_string()))?;
+
+ Ok(models::QueryResult {
+ nodes: result.nodes,
+ edges: result.edges,
+ })
+ }
+
+ async fn get_stats(&self) -> graph::Result {
+ let graph = self.graph().await;
+ Ok(graph::GraphStats {
+ node_count: graph.topology().node_count(),
+ edge_count: graph.topology().edge_count(),
+ })
+ }
+
+ async fn get_node_display(&self, fqn: &str) -> graph::Result> {
+ let query = models::GraphQuery::Cat {
+ fqn: fqn.to_string(),
+ };
+ let result = self.query(&query).await?;
+ Ok(result.nodes.into_iter().next())
+ }
+}
diff --git a/crates/core/src/facade/lifecycle.rs b/crates/core/src/facade/lifecycle.rs
new file mode 100644
index 0000000..0246e5d
--- /dev/null
+++ b/crates/core/src/facade/lifecycle.rs
@@ -0,0 +1,50 @@
+use super::EngineHandle;
+use crate::error::NaviscopeError;
+use async_trait::async_trait;
+use naviscope_api::lifecycle::{EngineError, EngineLifecycle};
+
+#[async_trait]
+impl EngineLifecycle for EngineHandle {
+ async fn rebuild(&self) -> naviscope_api::lifecycle::EngineResult<()> {
+ self.engine
+ .rebuild()
+ .await
+ .map_err(|e| EngineError::Internal(e.to_string()))
+ }
+
+ async fn load(&self) -> naviscope_api::lifecycle::EngineResult {
+ self.engine
+ .load()
+ .await
+ .map_err(|e| EngineError::Internal(e.to_string()))
+ }
+
+ async fn save(&self) -> naviscope_api::lifecycle::EngineResult<()> {
+ self.engine
+ .save()
+ .await
+ .map_err(|e| EngineError::Internal(e.to_string()))
+ }
+
+ async fn refresh(&self) -> naviscope_api::lifecycle::EngineResult<()> {
+ self.engine
+ .refresh()
+ .await
+ .map_err(|e| EngineError::Internal(e.to_string()))
+ }
+
+ async fn watch(&self) -> naviscope_api::lifecycle::EngineResult<()> {
+ self.engine
+ .clone()
+ .watch()
+ .await
+ .map_err(|e: NaviscopeError| EngineError::Internal(e.to_string()))
+ }
+
+ async fn clear_index(&self) -> naviscope_api::lifecycle::EngineResult<()> {
+ self.engine
+ .clear_project_index()
+ .await
+ .map_err(|e: NaviscopeError| EngineError::Internal(e.to_string()))
+ }
+}
diff --git a/crates/core/src/facade/mod.rs b/crates/core/src/facade/mod.rs
new file mode 100644
index 0000000..c726470
--- /dev/null
+++ b/crates/core/src/facade/mod.rs
@@ -0,0 +1,200 @@
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use crate::error::Result;
+use crate::model::CodeGraph;
+use crate::runtime::orchestrator::NaviscopeEngine as InternalEngine;
+use naviscope_api::NaviscopeEngine;
+
+mod graph;
+mod lifecycle;
+mod navigation;
+mod semantic;
+
+/// Engine handle - unified interface for all clients
+///
+/// This provides both async and sync APIs:
+/// - Async API: for LSP and MCP servers
+/// - Sync API: for Shell REPL
+#[derive(Clone)]
+pub struct EngineHandle {
+ pub(crate) engine: Arc,
+}
+
+impl EngineHandle {
+ /// Create a new engine handle
+ pub fn new(project_root: PathBuf) -> Self {
+ Self {
+ engine: Arc::new(InternalEngine::new(project_root)),
+ }
+ }
+
+ /// Create a handle from an existing engine (useful for testing)
+ pub fn from_engine(engine: Arc) -> Self {
+ Self { engine }
+ }
+
+ // ---- Async API (for LSP/MCP) ----
+
+ /// Get a snapshot of the current graph (async)
+ pub async fn graph(&self) -> CodeGraph {
+ self.engine.snapshot().await
+ }
+
+ // ---- Language specific services (internal) ----
+
+ pub fn get_lsp_parser(
+ &self,
+ language: crate::model::source::Language,
+ ) -> Option> {
+ self.engine.get_resolver().get_lsp_parser(language)
+ }
+
+ pub fn get_semantic_resolver(
+ &self,
+ language: crate::model::source::Language,
+ ) -> Option> {
+ self.engine.get_resolver().get_semantic_resolver(language)
+ }
+
+ pub fn get_metadata_plugin(
+ &self,
+ language: crate::model::source::Language,
+ ) -> Option> {
+ self.engine.get_resolver().get_metadata_plugin(language)
+ }
+
+ pub fn get_node_renderer(
+ &self,
+ language: crate::model::source::Language,
+ ) -> Option> {
+ self.engine.get_resolver().get_node_renderer(language)
+ }
+
+ pub fn get_language_by_extension(&self, ext: &str) -> Option {
+ self.engine.get_resolver().get_language_by_extension(ext)
+ }
+
+ pub fn get_parser_and_lang_for_path(
+ &self,
+ path: &std::path::Path,
+ ) -> Option<(
+ Arc,
+ crate::model::source::Language,
+ )> {
+ let ext = path.extension()?.to_str()?;
+ let lang = self.get_language_by_extension(ext)?;
+ let parser = self.get_lsp_parser(lang.clone())?;
+ Some((parser, lang))
+ }
+
+ // ---- File watching ----
+
+ /// Watch for filesystem changes
+ pub async fn watch(&self) -> Result<()> {
+ self.engine.clone().watch().await
+ }
+}
+
+impl NaviscopeEngine for EngineHandle {}
+
+#[cfg(test)]
+mod tests {
+ use naviscope_api::GraphService;
+
+ use super::*;
+
+ #[tokio::test]
+ async fn test_async_graph_access() {
+ let engine = Arc::new(InternalEngine::new(PathBuf::from(".")));
+ let handle = EngineHandle::from_engine(engine);
+
+ let graph = handle.graph().await;
+ assert_eq!(graph.node_count(), 0); // Empty initially
+ }
+
+ #[test]
+ fn test_blocking_graph_access() {
+ // Create runtime in a separate thread without any existing runtime context
+ std::thread::spawn(|| {
+ let engine = Arc::new(InternalEngine::new(PathBuf::from(".")));
+ let handle = EngineHandle::from_engine(engine);
+
+ // Test that blocking API works via async runtime
+ let rt = tokio::runtime::Runtime::new().unwrap();
+ let _guard = rt.enter();
+
+ let _graph = rt.block_on(handle.graph());
+ })
+ .join()
+ .unwrap();
+ }
+
+ #[tokio::test]
+ async fn test_concurrent_queries() {
+ use tokio::task::JoinSet;
+
+ let engine = Arc::new(InternalEngine::new(PathBuf::from(".")));
+ let handle = Arc::new(EngineHandle::from_engine(engine));
+
+ let mut set = JoinSet::new();
+
+ for _ in 0..10 {
+ let h = Arc::clone(&handle);
+ set.spawn(async move {
+ for _ in 0..5 {
+ let graph = h.graph().await;
+ let _ = graph.node_count();
+ }
+ });
+ }
+
+ while let Some(result) = set.join_next().await {
+ result.unwrap();
+ }
+ }
+
+ #[tokio::test]
+ async fn test_query_functionality() {
+ use naviscope_api::models::GraphQuery;
+
+ let engine = Arc::new(InternalEngine::new(PathBuf::from(".")));
+ let handle = EngineHandle::from_engine(engine);
+
+ // Test async query
+ let query = GraphQuery::Find {
+ pattern: "test".to_string(),
+ kind: vec![],
+ limit: 10,
+ };
+
+ let result = handle.query(&query).await;
+ assert!(result.is_ok(), "Query should execute successfully");
+ }
+
+ #[test]
+ fn test_query_blocking() {
+ use naviscope_api::GraphService;
+ use naviscope_api::models::GraphQuery;
+
+ std::thread::spawn(|| {
+ let engine = Arc::new(InternalEngine::new(PathBuf::from(".")));
+ let handle = EngineHandle::from_engine(engine);
+
+ let rt = tokio::runtime::Runtime::new().unwrap();
+ let _guard = rt.enter();
+
+ let query = GraphQuery::Find {
+ pattern: "test".to_string(),
+ kind: vec![],
+ limit: 10,
+ };
+
+ // Use trait method via async runtime
+ let result = rt.block_on(handle.query(&query));
+ assert!(result.is_ok(), "Blocking query should execute successfully");
+ })
+ .join()
+ .unwrap();
+ }
+}
diff --git a/crates/core/src/facade/navigation.rs b/crates/core/src/facade/navigation.rs
new file mode 100644
index 0000000..1dc298c
--- /dev/null
+++ b/crates/core/src/facade/navigation.rs
@@ -0,0 +1,19 @@
+use crate::facade::EngineHandle;
+use crate::features::navigation::NavigationEngine;
+use async_trait::async_trait;
+use naviscope_api::navigation::{NavigationService, ResolveResult};
+
+#[async_trait]
+impl NavigationService for EngineHandle {
+ async fn resolve_path(&self, target: &str, current_context: Option<&str>) -> ResolveResult {
+ let graph = self.graph().await;
+ let engine = NavigationEngine::new(&graph);
+ engine.resolve_path(target, current_context)
+ }
+
+ async fn get_completion_candidates(&self, prefix: &str) -> Vec {
+ let graph = self.graph().await;
+ let engine = NavigationEngine::new(&graph);
+ engine.get_completion_candidates(prefix)
+ }
+}
diff --git a/crates/core/src/facade/semantic.rs b/crates/core/src/facade/semantic.rs
new file mode 100644
index 0000000..65a577b
--- /dev/null
+++ b/crates/core/src/facade/semantic.rs
@@ -0,0 +1,537 @@
+use crate::facade::EngineHandle;
+use crate::features::discovery::DiscoveryEngine;
+use crate::util::utf16_col_to_byte_col;
+use async_trait::async_trait;
+use naviscope_api::graph::GraphService;
+use naviscope_api::models::{
+ CallHierarchyIncomingCall, CallHierarchyOutgoingCall, DisplayGraphNode, Language, NodeKind,
+ PositionContext, Range, ReferenceQuery, SymbolLocation, SymbolQuery, SymbolResolution,
+};
+use naviscope_api::semantic::{
+ CallHierarchyAnalyzer, ReferenceAnalyzer, SemanticError, SemanticResult, SymbolInfoProvider,
+ SymbolNavigator,
+};
+use std::collections::HashMap;
+use std::fs;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+#[async_trait]
+impl SymbolNavigator for EngineHandle {
+ async fn resolve_symbol_at(
+ &self,
+ ctx: &PositionContext,
+ ) -> SemanticResult> {
+ let uri_str = &ctx.uri;
+ let path = if uri_str.starts_with("file://") {
+ PathBuf::from(uri_str.strip_prefix("file://").unwrap())
+ } else {
+ PathBuf::from(uri_str)
+ };
+
+ let (parser, lang) = match self.get_parser_and_lang_for_path(&path) {
+ Some(x) => x,
+ None => return Ok(None),
+ };
+
+ let resolver = match self.get_semantic_resolver(lang.clone()) {
+ Some(r) => r,
+ None => return Ok(None),
+ };
+
+ let content = if let Some(c) = &ctx.content {
+ c.clone()
+ } else {
+ fs::read_to_string(&path).map_err(|e| SemanticError::Internal(e.to_string()))?
+ };
+
+ let tree = parser
+ .parse(&content, None)
+ .ok_or_else(|| SemanticError::Internal("Failed to parse".into()))?;
+
+ let byte_col = utf16_col_to_byte_col(&content, ctx.line as usize, ctx.char as usize);
+
+ let graph = self.graph().await;
+
+ Ok(resolver.resolve_at(&tree, &content, ctx.line as usize, byte_col, &graph))
+ }
+
+ async fn find_highlights(&self, ctx: &PositionContext) -> SemanticResult> {
+ let uri_str = &ctx.uri;
+ let path = if uri_str.starts_with("file://") {
+ PathBuf::from(uri_str.strip_prefix("file://").unwrap())
+ } else {
+ PathBuf::from(uri_str)
+ };
+
+ let (parser, _) = match self.get_parser_and_lang_for_path(&path) {
+ Some(x) => x,
+ None => return Ok(vec![]),
+ };
+
+ let content = if let Some(c) = &ctx.content {
+ c.clone()
+ } else {
+ fs::read_to_string(&path).map_err(|e| SemanticError::Internal(e.to_string()))?
+ };
+
+ let tree = parser
+ .parse(&content, None)
+ .ok_or_else(|| SemanticError::Internal("Failed to parse".into()))?;
+
+ let res = match self.resolve_symbol_at(ctx).await? {
+ Some(r) => r,
+ None => return Ok(vec![]),
+ };
+
+ Ok(parser.find_occurrences(&content, &tree, &res))
+ }
+
+ async fn find_definitions(&self, query: &SymbolQuery) -> SemanticResult> {
+ let resolver = match self.get_semantic_resolver(query.language.clone()) {
+ Some(r) => r,
+ None => return Ok(vec![]),
+ };
+
+ let graph = self.graph().await;
+ let matches = resolver.find_matches(&graph, &query.resolution);
+
+ let topology = graph.topology();
+ let mut locations = Vec::new();
+
+ for idx in matches {
+ let node = &topology[idx];
+ if let Some(loc) = &node.location {
+ let path_str = graph.symbols().resolve(&loc.path.0);
+ locations.push(SymbolLocation {
+ path: Arc::from(PathBuf::from(path_str)),
+ range: loc.range,
+ selection_range: loc.selection_range,
+ });
+ }
+ }
+ Ok(locations)
+ }
+
+ async fn find_type_definitions(
+ &self,
+ query: &SymbolQuery,
+ ) -> SemanticResult> {
+ let resolver = match self.get_semantic_resolver(query.language.clone()) {
+ Some(r) => r,
+ None => return Ok(vec![]),
+ };
+ let graph = self.graph().await;
+
+ let type_resolutions = resolver.resolve_type_of(&graph, &query.resolution);
+ let topology = graph.topology();
+ let mut locations = Vec::new();
+
+ for res in type_resolutions {
+ let matches = resolver.find_matches(&graph, &res);
+ for idx in matches {
+ let node = &topology[idx];
+ if let Some(loc) = &node.location {
+ let path_str = graph.symbols().resolve(&loc.path.0);
+ locations.push(SymbolLocation {
+ path: Arc::from(PathBuf::from(path_str)),
+ range: loc.range,
+ selection_range: loc.selection_range,
+ });
+ }
+ }
+ }
+ Ok(locations)
+ }
+
+ async fn find_implementations(
+ &self,
+ query: &SymbolQuery,
+ ) -> SemanticResult> {
+ let resolver = match self.get_semantic_resolver(query.language.clone()) {
+ Some(r) => r,
+ None => return Ok(vec![]),
+ };
+ let graph = self.graph().await;
+ let matches = resolver.find_implementations(&graph, &query.resolution);
+
+ let topology = graph.topology();
+ let mut locations = Vec::new();
+
+ for idx in matches {
+ let node = &topology[idx];
+ if let Some(loc) = &node.location {
+ let path_str = graph.symbols().resolve(&loc.path.0);
+ locations.push(SymbolLocation {
+ path: Arc::from(PathBuf::from(path_str)),
+ range: loc.range,
+ selection_range: loc.selection_range,
+ });
+ }
+ }
+ Ok(locations)
+ }
+}
+
+#[async_trait]
+impl ReferenceAnalyzer for EngineHandle {
+ async fn find_references(&self, query: &ReferenceQuery) -> SemanticResult> {
+ let resolver = match self.get_semantic_resolver(query.language.clone()) {
+ Some(r) => r,
+ None => return Ok(vec![]),
+ };
+ let graph = self.graph().await;
+
+ let matches = resolver.find_matches(&graph, &query.resolution);
+ let discovery = DiscoveryEngine::new(&graph);
+ let candidate_paths = discovery.scout_references(&matches);
+
+ let mut tasks = tokio::task::JoinSet::new();
+ let shared_graph = Arc::new(graph);
+
+ for path in candidate_paths {
+ let handle = self.clone();
+ let resolution = query.resolution.clone();
+ let graph_snap = Arc::clone(&shared_graph);
+
+ tasks.spawn(async move {
+ let (parser, file_lang) = match handle.get_parser_and_lang_for_path(&path) {
+ Some(x) => x,
+ None => return Vec::new(),
+ };
+
+ let file_resolver = match handle.get_semantic_resolver(file_lang) {
+ Some(r) => r,
+ None => return Vec::new(),
+ };
+
+ let content = match fs::read_to_string(&path) {
+ Ok(c) => c,
+ Err(_) => return Vec::new(),
+ };
+
+ let discovery = DiscoveryEngine::new(graph_snap.as_ref());
+
+ let uri_str = format!("file://{}", path.display());
+ let uri = match url::Url::parse(&uri_str) {
+ Ok(u) => u,
+ Err(_) => return Vec::new(),
+ };
+
+ let locations = discovery.scan_file(
+ parser.as_ref(),
+ file_resolver.as_ref(),
+ &content,
+ &resolution,
+ &uri,
+ );
+
+ locations
+ .into_iter()
+ .map(|loc| {
+ let path_buf = loc.uri.to_file_path().unwrap();
+ SymbolLocation {
+ path: Arc::from(path_buf),
+ range: Range {
+ start_line: loc.range.start.line as usize,
+ start_col: loc.range.start.character as usize,
+ end_line: loc.range.end.line as usize,
+ end_col: loc.range.end.character as usize,
+ },
+ selection_range: None,
+ }
+ })
+ .collect::>()
+ });
+ }
+
+ let mut all_locations = Vec::new();
+ while let Some(res) = tasks.join_next().await {
+ if let Ok(locs) = res {
+ all_locations.extend(locs);
+ }
+ }
+
+ all_locations.sort_by(|a, b| {
+ a.path
+ .cmp(&b.path)
+ .then(a.range.start_line.cmp(&b.range.start_line))
+ .then(a.range.start_col.cmp(&b.range.start_col))
+ });
+ all_locations.dedup_by(|a, b| {
+ a.path == b.path
+ && a.range.start_line == b.range.start_line
+ && a.range.start_col == b.range.start_col
+ });
+
+ Ok(all_locations)
+ }
+}
+
+#[async_trait]
+impl CallHierarchyAnalyzer for EngineHandle {
+ async fn find_incoming_calls(
+ &self,
+ fqn: &str,
+ ) -> SemanticResult> {
+ let graph = self.graph().await;
+ let target_indices = graph.find_matches_by_fqn(fqn);
+ if target_indices.is_empty() {
+ return Ok(vec![]);
+ }
+
+ // 1. Meso-level scouting for candidate files
+ let discovery = DiscoveryEngine::new(&graph);
+ let candidate_paths = discovery.scout_references(&target_indices);
+
+ // 2. Micro-level scanning
+ let mut tasks = tokio::task::JoinSet::new();
+ let shared_graph = Arc::new(graph.clone());
+ let resolution = SymbolResolution::Global(fqn.to_string());
+
+ for path in candidate_paths {
+ let handle = self.clone();
+ let res = resolution.clone();
+ let graph_snap = Arc::clone(&shared_graph);
+
+ tasks.spawn(async move {
+ let (parser, file_lang) = match handle.get_parser_and_lang_for_path(&path) {
+ Some(x) => x,
+ None => return vec![],
+ };
+
+ let file_resolver = match handle.get_semantic_resolver(file_lang) {
+ Some(r) => r,
+ None => return vec![],
+ };
+
+ let content = match fs::read_to_string(&path) {
+ Ok(c) => c,
+ Err(_) => return vec![],
+ };
+
+ let discovery = DiscoveryEngine::new(graph_snap.as_ref());
+ let uri_str = format!("file://{}", path.display());
+ let uri = match url::Url::parse(&uri_str) {
+ Ok(u) => u,
+ Err(_) => return vec![],
+ };
+
+ // Verification
+ discovery.scan_file(
+ parser.as_ref(),
+ file_resolver.as_ref(),
+ &content,
+ &res,
+ &uri,
+ )
+ });
+ }
+
+ let mut all_call_sites = Vec::new();
+ while let Some(res) = tasks.join_next().await {
+ if let Ok(locs) = res {
+ all_call_sites.extend(locs);
+ }
+ }
+
+ // 3. Meso-level: group call sites by caller method
+ let mut caller_map: HashMap> = HashMap::new();
+
+ for loc in all_call_sites {
+ if let Ok(path) = loc.uri.to_file_path() {
+ if let Some(caller_idx) = graph.find_container_node_at(
+ &path,
+ loc.range.start.line as usize,
+ loc.range.start.character as usize,
+ ) {
+ let node = &graph.topology()[caller_idx];
+ // Only include methods or constructors as callers
+ if matches!(node.kind(), NodeKind::Method | NodeKind::Constructor) {
+ caller_map.entry(caller_idx).or_default().push(Range {
+ start_line: loc.range.start.line as usize,
+ start_col: loc.range.start.character as usize,
+ end_line: loc.range.end.line as usize,
+ end_col: loc.range.end.character as usize,
+ });
+ }
+ }
+ }
+ }
+
+ let mut results = Vec::new();
+ let symbols = graph.symbols();
+ for (idx, ranges) in caller_map {
+ let node = &graph.topology()[idx];
+ let fqn = node.fqn(symbols);
+ if let Some(display_node) = self
+ .get_node_display(fqn)
+ .await
+ .map_err(|e| SemanticError::Internal(e.to_string()))?
+ {
+ results.push(CallHierarchyIncomingCall {
+ from: display_node,
+ from_ranges: ranges,
+ });
+ }
+ }
+
+ Ok(results)
+ }
+
+ async fn find_outgoing_calls(
+ &self,
+ fqn: &str,
+ ) -> SemanticResult> {
+ let graph = self.graph().await;
+ let node_idx = match graph.find_node(fqn) {
+ Some(idx) => idx,
+ None => return Ok(vec![]),
+ };
+
+ let node = graph.get_node(node_idx).unwrap();
+ let symbols = graph.symbols();
+ let path_str = node
+ .path(symbols)
+ .ok_or_else(|| SemanticError::Internal("Node has no path".into()))?;
+ let path = PathBuf::from(path_str);
+
+ let range = node
+ .range()
+ .ok_or_else(|| SemanticError::Internal("Node has no range".into()))?;
+
+ let (parser, lang) = self
+ .get_parser_and_lang_for_path(&path)
+ .ok_or_else(|| SemanticError::Internal("No parser for file".into()))?;
+ let resolver = self
+ .get_semantic_resolver(lang)
+ .ok_or_else(|| SemanticError::Internal("No resolver for file".into()))?;
+
+ let content =
+ fs::read_to_string(&path).map_err(|e| SemanticError::Internal(e.to_string()))?;
+
+ // Micro-level scanning: extract method body and find all calls
+ let tree = parser
+ .parse(&content, None)
+ .ok_or_else(|| SemanticError::Internal("Failed to parse".into()))?;
+
+ let mut outgoing_calls: HashMap> =
+ HashMap::new();
+
+ // Simple AST walk to find identifiers in range
+ let mut stack = vec![tree.root_node()];
+
+ while let Some(n) = stack.pop() {
+ let n_range = n.range();
+ if n_range.start_point.row > range.end_line {
+ continue;
+ }
+ if n_range.end_point.row < range.start_line {
+ // Not in range, but children might be
+ for i in 0..n.child_count() {
+ stack.push(n.child(i as u32).unwrap());
+ }
+ continue;
+ }
+
+ // Check if it's an identifier-like node
+ if matches!(
+ n.kind(),
+ "identifier" | "method_invocation" | "call_expression"
+ ) {
+ let pos_ctx = PositionContext {
+ uri: format!("file://{}", path.display()),
+ line: n_range.start_point.row as u32,
+ char: n_range.start_point.column as u32,
+ content: Some(content.clone()),
+ };
+
+ if let Ok(Some(res)) = self.resolve_symbol_at(&pos_ctx).await {
+ let matches = resolver.find_matches(&graph, &res);
+ for &m_idx in &matches {
+ let m_node = &graph.topology()[m_idx];
+ if matches!(m_node.kind(), NodeKind::Method | NodeKind::Constructor) {
+ outgoing_calls.entry(m_idx).or_default().push(Range {
+ start_line: n_range.start_point.row,
+ start_col: n_range.start_point.column,
+ end_line: n_range.end_point.row,
+ end_col: n_range.end_point.column,
+ });
+ }
+ }
+ }
+ }
+
+ // Recurse children
+ for i in 0..n.child_count() {
+ stack.push(n.child(i as u32).unwrap());
+ }
+ }
+
+ let mut results = Vec::new();
+ for (idx, ranges) in outgoing_calls {
+ let m_node = &graph.topology()[idx];
+ let fqn = m_node.fqn(symbols);
+ if let Some(display_node) = self
+ .get_node_display(fqn)
+ .await
+ .map_err(|e| SemanticError::Internal(e.to_string()))?
+ {
+ results.push(CallHierarchyOutgoingCall {
+ to: display_node,
+ from_ranges: ranges,
+ });
+ }
+ }
+
+ Ok(results)
+ }
+}
+
+#[async_trait]
+impl SymbolInfoProvider for EngineHandle {
+ async fn get_symbol_info(&self, fqn: &str) -> SemanticResult> {
+ self.get_node_display(fqn)
+ .await
+ .map_err(|e| SemanticError::Internal(e.to_string()))
+ }
+
+ async fn get_document_symbols(&self, uri: &str) -> SemanticResult> {
+ let path = if uri.starts_with("file://") {
+ PathBuf::from(uri.strip_prefix("file://").unwrap())
+ } else {
+ PathBuf::from(uri)
+ };
+
+ let (parser, _lang) = match self.get_parser_and_lang_for_path(&path) {
+ Some(x) => x,
+ None => return Ok(vec![]),
+ };
+
+ let content =
+ fs::read_to_string(&path).map_err(|e| SemanticError::Internal(e.to_string()))?;
+
+ let tree = parser
+ .parse(&content, None)
+ .ok_or_else(|| SemanticError::Internal("Failed to parse".into()))?;
+
+ let symbols = parser.extract_symbols(&tree, &content);
+
+ Ok(symbols)
+ }
+
+ async fn get_language_for_document(&self, uri: &str) -> SemanticResult> {
+ let path = if uri.starts_with("file://") {
+ PathBuf::from(uri.strip_prefix("file://").unwrap())
+ } else {
+ PathBuf::from(uri)
+ };
+
+ let ext = match path.extension().and_then(|e| e.to_str()) {
+ Some(e) => e,
+ None => return Ok(None),
+ };
+
+ Ok(self.get_language_by_extension(ext))
+ }
+}
diff --git a/crates/core/src/features/discovery.rs b/crates/core/src/features/discovery.rs
new file mode 100644
index 0000000..92d4650
--- /dev/null
+++ b/crates/core/src/features/discovery.rs
@@ -0,0 +1,178 @@
+use super::CodeGraphLike;
+use crate::ingest::parser::{LspParser, SymbolResolution};
+use lsp_types::{Location, Url};
+use std::collections::HashSet;
+
+/// DiscoveryEngine bridges Meso-level graph knowledge with Micro-level file scanning.
+pub struct DiscoveryEngine<'a> {
+ index: &'a dyn CodeGraphLike,
+}
+
+impl<'a> DiscoveryEngine<'a> {
+ pub fn new(index: &'a dyn CodeGraphLike) -> Self {
+ Self { index }
+ }
+
+ /// Meso-level: Scout for candidate files that likely contain references to the given nodes.
+ /// Returns a set of unique file paths.
+ ///
+ /// Strategy:
+ /// 1. Extract all possible identifier tokens from node's FQN and name
+ /// 2. Use reference_index (inverted index) to quickly find candidate files containing these tokens
+ ///
+ /// Note: This relies on reference_index which contains all identifier tokens found during parsing.
+ /// The actual reference verification is done at micro-level using tree-sitter parsing.
+ /// Meso-level: Scout for candidate files that likely contain references to the given nodes.
+ /// Returns a set of unique file paths.
+ ///
+ /// Strategy:
+ /// 1. Extract "primary" (name) and "context" (parent) tokens.
+ /// 2. If context exists, use INTERSECTION of file sets to reduce candidates.
+ /// 3. Fallback to primary token union if context is missing or not found.
+ /// Meso-level: Scout for candidate files that likely contain references to the given nodes.
+ /// Returns a set of unique file paths.
+ ///
+ /// Strategy:
+ /// 1. Extract "primary" (name) and "context" (parent) tokens.
+ /// 2. If context exists, use INTERSECTION of file sets to reduce candidates.
+ /// 3. Fallback to primary token union if context is missing or not found.
+ pub fn scout_references(
+ &self,
+ matches: &[petgraph::prelude::NodeIndex],
+ ) -> HashSet {
+ let mut unique_paths = HashSet::new();
+ let topology = self.index.topology();
+ let ref_index = self.index.reference_index();
+ let symbols = self.index.symbols();
+
+ for &node_idx in matches {
+ let node = &topology[node_idx];
+
+ let (primary, context) = Self::extract_smart_tokens(node, self.index);
+
+ // Helper to get paths for a token string
+ let get_paths = |token: &str| -> Option> {
+ let sym = symbols.get(token)?;
+ ref_index
+ .get(&naviscope_api::models::symbol::Symbol(sym))
+ .map(|paths| {
+ paths
+ .iter()
+ .map(|p_sym| std::path::PathBuf::from(symbols.resolve(&p_sym.0)))
+ .collect()
+ })
+ };
+
+ if let Some(primary_paths) = get_paths(&primary) {
+ if let Some(ctx_str) = context {
+ // Optimization: INTERSECTION
+ // Only candidate files that contain BOTH the context (e.g. Class) and name (e.g. Method).
+ if let Some(ctx_paths) = get_paths(&ctx_str) {
+ // SPARSITY CHECK: If context is too generic (e.g. "com", "org", "java"),
+ // intersection is expensive and useless. Skip if it hits > 1000 files.
+ if ctx_paths.len() < 1000 {
+ let ctx_set: HashSet<_> = ctx_paths.iter().collect();
+ for p in primary_paths {
+ if ctx_set.contains(&p) {
+ unique_paths.insert(p.clone());
+ }
+ }
+ continue; // Optimization applied, skip fallback
+ }
+ }
+ }
+
+ // Fallback: Add all files containing the primary token
+ for p in primary_paths {
+ unique_paths.insert(p);
+ }
+ }
+ }
+ unique_paths
+ }
+
+ /// Smartly extract tokens for "bag of words" intersection.
+ /// Returns (Primary Token, Optional Context Token)
+ fn extract_smart_tokens(
+ node: &crate::model::GraphNode,
+ index: &dyn CodeGraphLike,
+ ) -> (String, Option) {
+ let symbols = index.symbols();
+ let name = node.name(symbols).to_string();
+ let fqn = node.fqn(symbols);
+
+ // Split by ANY non-alphanumeric character (except underscore)
+ // This is much more language-agnostic than hardcoding '.', ':', etc.
+ let parts: Vec<&str> = fqn
+ .split(|c: char| !c.is_alphanumeric() && c != '_')
+ .filter(|s: &&str| !s.is_empty())
+ .collect();
+
+ // Context is usually the immediate parent of the name in the FQN.
+ // e.g. "com.example.UserService.login" -> context is "UserService"
+ // Also check if last part matches name to ensure alignment
+ let context = if parts.len() >= 2 {
+ // Check if last part is indeed the name
+ if parts.last() == Some(&name.as_str()) {
+ Some(parts[parts.len() - 2].to_string())
+ } else {
+ // Should not happen for valid FQNs usually, but fallback
+ None
+ }
+ } else {
+ None
+ };
+
+ (name, context)
+ }
+
+ /// Micro-level: Scan a specific file for precise symbol occurrences.
+ /// Now performs SEMANTIC VERIFICATION using the Resolver.
+ pub fn scan_file(
+ &self,
+ parser: &dyn LspParser,
+ resolver: &dyn crate::ingest::resolver::SemanticResolver,
+ source: &str,
+ target_resolution: &SymbolResolution,
+ uri: &Url,
+ ) -> Vec {
+ if let Some(tree) = parser.parse(source, None) {
+ // 1. Syntactic Scan (Fast)
+ let candidates = parser.find_occurrences(source, &tree, target_resolution);
+
+ // 2. Semantic Verification (Precise)
+ let mut valid_locations = Vec::new();
+
+ for range in candidates {
+ // Resolve what is truly at this location
+ if let Some(resolved_at_loc) = resolver.resolve_at(
+ &tree,
+ source,
+ range.start_line,
+ range.start_col,
+ self.index,
+ ) {
+ // 3. Identity Check
+ if &resolved_at_loc == target_resolution {
+ valid_locations.push(Location {
+ uri: uri.clone(),
+ range: lsp_types::Range {
+ start: lsp_types::Position::new(
+ range.start_line as u32,
+ range.start_col as u32,
+ ),
+ end: lsp_types::Position::new(
+ range.end_line as u32,
+ range.end_col as u32,
+ ),
+ },
+ });
+ }
+ }
+ }
+ valid_locations
+ } else {
+ Vec::new()
+ }
+ }
+}
diff --git a/crates/core/src/features/mod.rs b/crates/core/src/features/mod.rs
new file mode 100644
index 0000000..753730a
--- /dev/null
+++ b/crates/core/src/features/mod.rs
@@ -0,0 +1,112 @@
+use naviscope_api::models::symbol::Symbol;
+use std::path::Path;
+
+pub mod discovery;
+pub mod navigation;
+pub mod query;
+
+/// Trait to abstract over different CodeGraph implementations for features.
+/// This allows features to operate on both the full indexed graph and partial/mocked graphs for tests.
+pub trait CodeGraphLike: Send + Sync {
+ fn topology(
+ &self,
+ ) -> &petgraph::stable_graph::StableDiGraph;
+ fn fqn_map(&self) -> &std::collections::HashMap;
+ fn path_to_nodes(&self, path: &Path) -> Option<&[petgraph::stable_graph::NodeIndex]>;
+ fn reference_index(&self) -> &std::collections::HashMap>;
+ fn find_container_node_at(
+ &self,
+ path: &std::path::Path,
+ line: usize,
+ col: usize,
+ ) -> Option;
+ fn symbols(&self) -> &lasso::Rodeo;
+
+ /// Helper to find node by string FQN
+ fn find_node(&self, fqn: &str) -> Option {
+ let key = self.symbols().get(fqn)?;
+ self.fqn_map().get(&Symbol(key)).copied()
+ }
+
+ /// Find all nodes matching an FQN string (handle duplicates if any)
+ fn find_matches_by_fqn(&self, fqn: &str) -> Vec {
+ if let Some(idx) = self.find_node(fqn) {
+ vec![idx]
+ } else {
+ vec![]
+ }
+ }
+}
+
+// Blanket implementation for references
+impl CodeGraphLike for &T {
+ fn topology(
+ &self,
+ ) -> &petgraph::stable_graph::StableDiGraph
+ {
+ (*self).topology()
+ }
+
+ fn fqn_map(&self) -> &std::collections::HashMap {
+ (*self).fqn_map()
+ }
+
+ fn path_to_nodes(&self, path: &Path) -> Option<&[petgraph::stable_graph::NodeIndex]> {
+ (*self).path_to_nodes(path)
+ }
+
+ fn reference_index(&self) -> &std::collections::HashMap> {
+ (*self).reference_index()
+ }
+
+ fn find_container_node_at(
+ &self,
+ path: &std::path::Path,
+ line: usize,
+ col: usize,
+ ) -> Option {
+ (*self).find_container_node_at(path, line, col)
+ }
+
+ fn symbols(&self) -> &lasso::Rodeo {
+ (*self).symbols()
+ }
+}
+
+// Implement for the core CodeGraph model
+impl CodeGraphLike for crate::model::CodeGraph {
+ fn topology(
+ &self,
+ ) -> &petgraph::stable_graph::StableDiGraph
+ {
+ self.topology()
+ }
+
+ fn fqn_map(&self) -> &std::collections::HashMap {
+ self.fqn_map()
+ }
+
+ fn path_to_nodes(&self, path: &Path) -> Option<&[petgraph::stable_graph::NodeIndex]> {
+ let key = self.symbols().get(path.to_string_lossy())?;
+ self.file_index()
+ .get(&Symbol(key))
+ .map(|e| e.nodes.as_slice())
+ }
+
+ fn reference_index(&self) -> &std::collections::HashMap> {
+ self.reference_index()
+ }
+
+ fn find_container_node_at(
+ &self,
+ path: &std::path::Path,
+ line: usize,
+ col: usize,
+ ) -> Option {
+ self.find_container_node_at(path, line, col)
+ }
+
+ fn symbols(&self) -> &lasso::Rodeo {
+ self.symbols()
+ }
+}
diff --git a/crates/core/src/features/navigation.rs b/crates/core/src/features/navigation.rs
new file mode 100644
index 0000000..cd5cda7
--- /dev/null
+++ b/crates/core/src/features/navigation.rs
@@ -0,0 +1,163 @@
+use super::CodeGraphLike;
+use crate::model::{EdgeType, NodeKind};
+use naviscope_api::navigation::ResolveResult;
+
+/// NavigationEngine provides logic for resolving fuzzy/relative paths within a graph.
+pub struct NavigationEngine<'a> {
+ graph: &'a dyn CodeGraphLike,
+}
+
+impl<'a> NavigationEngine<'a> {
+ pub fn new(graph: &'a dyn CodeGraphLike) -> Self {
+ Self { graph }
+ }
+
+ pub fn resolve_path(&self, target: &str, current_context: Option<&str>) -> ResolveResult {
+ // 1. Handle special paths ("/" or "root")
+ if target == "/" || target == "root" {
+ let project_nodes: Vec<_> = self
+ .graph
+ .topology()
+ .node_indices()
+ .filter_map(|idx| {
+ let node = &self.graph.topology()[idx];
+ if matches!(node.kind(), NodeKind::Project) {
+ Some(node.fqn(self.graph.symbols()).to_string())
+ } else {
+ None
+ }
+ })
+ .collect();
+
+ return match project_nodes.len() {
+ 1 => ResolveResult::Found(project_nodes[0].clone()),
+ 0 => ResolveResult::Found("".to_string()),
+ _ => ResolveResult::Ambiguous(project_nodes),
+ };
+ }
+
+ // 2. Handle parent navigation ("..")
+ if target == ".." {
+ if let Some(current_fqn) = current_context {
+ if let Some(idx) = self.graph.find_node(current_fqn) {
+ let mut incoming = self
+ .graph
+ .topology()
+ .neighbors_directed(idx, petgraph::Direction::Incoming)
+ .detach();
+
+ while let Some(edge_idx) = incoming.next_edge(self.graph.topology()) {
+ let edge = &self.graph.topology()[edge_idx];
+ if edge.edge_type == EdgeType::Contains {
+ let (parent_idx, _) =
+ self.graph.topology().edge_endpoints(edge_idx).unwrap();
+ if let Some(parent_node) = self.graph.topology().node_weight(parent_idx)
+ {
+ return ResolveResult::Found(
+ parent_node.fqn(self.graph.symbols()).to_string(),
+ );
+ }
+ }
+ }
+ }
+ }
+ return ResolveResult::NotFound;
+ }
+
+ // 3. Try exact match (absolute FQN)
+ if self.graph.find_node(target).is_some() {
+ return ResolveResult::Found(target.to_string());
+ }
+
+ // 4. Try relative path from current context
+ if let Some(current_fqn) = current_context {
+ let separator = if current_fqn.contains("::") {
+ "::"
+ } else {
+ "."
+ };
+ let joined = format!("{}{}{}", current_fqn, separator, target);
+ if self.graph.find_node(&joined).is_some() {
+ return ResolveResult::Found(joined);
+ }
+ }
+
+ // 5. Try fuzzy matching (child lookup)
+ let current_idx = current_context.and_then(|fqn| self.graph.find_node(fqn));
+
+ let candidates: Vec = if let Some(parent_idx) = current_idx {
+ // Search in children of current node
+ self.graph
+ .topology()
+ .neighbors_directed(parent_idx, petgraph::Direction::Outgoing)
+ .filter_map(|child_idx| {
+ if let Some(edge_idx) = self.graph.topology().find_edge(parent_idx, child_idx) {
+ let edge = &self.graph.topology()[edge_idx];
+ if edge.edge_type == EdgeType::Contains {
+ let node = &self.graph.topology()[child_idx];
+ let fqn = node.fqn(self.graph.symbols());
+
+ // Match by simple name (last component) or display name
+ let simple_name = fqn.split(&['.', ':']).last().unwrap_or(fqn);
+ let display_name = node.name(self.graph.symbols());
+ if simple_name == target || display_name == target {
+ Some(fqn.to_string())
+ } else {
+ None
+ }
+ } else {
+ None
+ }
+ } else {
+ None
+ }
+ })
+ .collect()
+ } else {
+ // Global fuzzy search
+ self.graph
+ .fqn_map()
+ .keys()
+ .filter_map(|sym| {
+ let fqn = self.graph.symbols().resolve(&sym.0);
+ let simple_name = fqn.split(&['.', ':']).last().unwrap_or(fqn);
+ if simple_name == target {
+ return Some(fqn.to_string());
+ }
+
+ // Also check display name
+ if let Some(idx) = self.graph.fqn_map().get(sym) {
+ let node = &self.graph.topology()[*idx];
+ if node.name(self.graph.symbols()) == target {
+ return Some(fqn.to_string());
+ }
+ }
+
+ None
+ })
+ .collect()
+ };
+
+ match candidates.len() {
+ 0 => ResolveResult::NotFound,
+ 1 => ResolveResult::Found(candidates[0].clone()),
+ _ => ResolveResult::Ambiguous(candidates),
+ }
+ }
+
+ pub fn get_completion_candidates(&self, prefix: &str) -> Vec {
+ self.graph
+ .fqn_map()
+ .keys()
+ .filter_map(|sym| {
+ let fqn = self.graph.symbols().resolve(&sym.0);
+ if fqn.starts_with(prefix) {
+ Some(fqn.to_string())
+ } else {
+ None
+ }
+ })
+ .take(50) // Reasonable limit for candidates
+ .collect()
+ }
+}
diff --git a/crates/core/src/features/query.rs b/crates/core/src/features/query.rs
new file mode 100644
index 0000000..5e9df7f
--- /dev/null
+++ b/crates/core/src/features/query.rs
@@ -0,0 +1,193 @@
+use crate::error::{NaviscopeError, Result};
+use crate::model::source::Language;
+use crate::model::{DisplayGraphNode, EdgeType, NodeKind};
+use crate::runtime::plugin::NodeRenderer;
+pub use naviscope_api::models::{GraphQuery, QueryResult, QueryResultEdge};
+use petgraph::Direction as PetDirection;
+use regex::RegexBuilder;
+use std::sync::Arc;
+
+use super::CodeGraphLike;
+
+pub struct QueryEngine {
+ graph: G,
+ lookup: L,
+}
+
+impl QueryEngine
+where
+ G: CodeGraphLike,
+ L: Fn(Language) -> Option>,
+{
+ pub fn new(graph: G, lookup: L) -> Self {
+ Self { graph, lookup }
+ }
+
+ fn render_node(&self, node: &crate::model::GraphNode) -> DisplayGraphNode {
+ let symbols = self.graph.symbols();
+ let lang = node.language(symbols);
+ if let Some(renderer) = (self.lookup)(lang.clone()) {
+ renderer.render_display_node(node, symbols)
+ } else {
+ panic!(
+ "CRITICAL: No renderer found for language '{}'. This indicates a missing plugin for indexed data.",
+ lang.as_str()
+ );
+ }
+ }
+
+ pub fn execute(&self, query: &GraphQuery) -> Result {
+ let symbols = self.graph.symbols();
+ match query {
+ GraphQuery::Find {
+ pattern,
+ kind,
+ limit,
+ } => {
+ let regex = RegexBuilder::new(pattern)
+ .case_insensitive(true)
+ .build()
+ .map_err(|e| NaviscopeError::Parsing(format!("Invalid regex: {}", e)))?;
+
+ let mut nodes = Vec::new();
+
+ for node in self.graph.topology().node_weights() {
+ if regex.is_match(node.fqn(symbols)) || regex.is_match(node.name(symbols)) {
+ if kind.is_empty() || kind.contains(&node.kind) {
+ nodes.push(self.render_node(node));
+ }
+ }
+
+ if nodes.len() >= *limit {
+ break;
+ }
+ }
+ Ok(QueryResult::new(nodes, vec![]))
+ }
+ GraphQuery::Ls {
+ fqn,
+ kind,
+ modifiers: _,
+ } => {
+ if let Some(target_fqn) = fqn {
+ self.traverse_neighbors(
+ target_fqn,
+ &[EdgeType::Contains],
+ PetDirection::Outgoing,
+ kind,
+ )
+ } else {
+ let mut nodes = Vec::new();
+
+ for idx in self.graph.topology().node_indices() {
+ let node = &self.graph.topology()[idx];
+ if node.kind == NodeKind::Module {
+ let has_parent = self
+ .graph
+ .topology()
+ .edges_directed(idx, PetDirection::Incoming)
+ .any(|e| e.weight().edge_type == EdgeType::Contains);
+
+ if !has_parent {
+ nodes.push(self.render_node(node));
+ }
+ }
+ }
+
+ if nodes.is_empty() {
+ for idx in self.graph.topology().node_indices() {
+ let node = &self.graph.topology()[idx];
+ let has_parent = self
+ .graph
+ .topology()
+ .edges_directed(idx, PetDirection::Incoming)
+ .any(|e| e.weight().edge_type == EdgeType::Contains);
+
+ if !has_parent {
+ if kind.is_empty() || kind.contains(&node.kind) {
+ nodes.push(self.render_node(node));
+ }
+ }
+ if nodes.len() >= 50 {
+ break;
+ }
+ }
+ }
+
+ Ok(QueryResult::new(nodes, vec![]))
+ }
+ }
+ GraphQuery::Cat { fqn } => {
+ if let Some(idx) = self.graph.find_node(fqn) {
+ let node = &self.graph.topology()[idx];
+ Ok(QueryResult::new(vec![self.render_node(node)], vec![]))
+ } else {
+ Ok(QueryResult::default())
+ }
+ }
+ GraphQuery::Deps {
+ fqn,
+ rev,
+ edge_types,
+ } => {
+ let direction = if *rev {
+ PetDirection::Incoming
+ } else {
+ PetDirection::Outgoing
+ };
+ self.traverse_neighbors(fqn.as_str(), edge_types, direction, &[])
+ }
+ }
+ }
+
+ fn traverse_neighbors(
+ &self,
+ fqn: &str,
+ edge_filter: &[EdgeType],
+ dir: PetDirection,
+ kind_filter: &[NodeKind],
+ ) -> Result {
+ let start_idx = self
+ .graph
+ .find_node(fqn)
+ .ok_or_else(|| NaviscopeError::Parsing(format!("Node not found: {}", fqn)))?;
+
+ let mut nodes = Vec::new();
+ let mut edges_result = Vec::new();
+ let topology = self.graph.topology();
+ let mut edges = topology.neighbors_directed(start_idx, dir).detach();
+ let symbols = self.graph.symbols();
+
+ while let Some((edge_idx, neighbor_idx)) = edges.next(topology) {
+ let edge_data = &topology[edge_idx];
+ if edge_filter.is_empty() || edge_filter.contains(&edge_data.edge_type) {
+ let neighbor_node = &topology[neighbor_idx];
+ let start_node = &topology[start_idx];
+
+ if kind_filter.is_empty() || kind_filter.contains(&neighbor_node.kind) {
+ nodes.push(self.render_node(neighbor_node));
+
+ let (from, to) = if dir == PetDirection::Outgoing {
+ (
+ Arc::from(start_node.fqn(symbols)),
+ Arc::from(neighbor_node.fqn(symbols)),
+ )
+ } else {
+ (
+ Arc::from(neighbor_node.fqn(symbols)),
+ Arc::from(start_node.fqn(symbols)),
+ )
+ };
+
+ edges_result.push(QueryResultEdge {
+ from,
+ to,
+ data: edge_data.clone(),
+ });
+ }
+ }
+ }
+
+ Ok(QueryResult::new(nodes, edges_result))
+ }
+}
diff --git a/crates/core/src/ingest/builder.rs b/crates/core/src/ingest/builder.rs
new file mode 100644
index 0000000..733d720
--- /dev/null
+++ b/crates/core/src/ingest/builder.rs
@@ -0,0 +1,290 @@
+//! Graph builder for creating and modifying code graphs
+//!
+//! The `CodeGraphBuilder` allows mutable operations on the graph structure.
+//! It's designed to be used during index construction/updates, then converted
+//! to an immutable `CodeGraph` via the `build()` method.
+
+use crate::model::CodeGraph;
+use crate::model::graph::CodeGraphInner;
+use crate::model::source::SourceFile;
+// StorageContext unused
+use crate::model::{GraphEdge, GraphOp};
+use naviscope_api::models::symbol::Symbol;
+use petgraph::stable_graph::{NodeIndex, StableDiGraph};
+use std::collections::HashMap;
+use std::path::Path;
+
+/// Mutable graph builder
+pub struct CodeGraphBuilder {
+ inner: CodeGraphInner,
+}
+
+impl CodeGraphBuilder {
+ /// Create a new empty builder
+ pub fn new() -> Self {
+ Self {
+ inner: CodeGraphInner {
+ instance_id: 0, // Will be updated when built
+ version: crate::model::graph::CURRENT_VERSION,
+ topology: StableDiGraph::new(),
+ symbols: lasso::Rodeo::default(),
+ fqn_index: HashMap::new(),
+ name_index: HashMap::new(),
+ file_index: HashMap::new(),
+ reference_index: HashMap::new(),
+ },
+ }
+ }
+
+ /// Create builder from existing graph (deep copy)
+ pub fn from_graph(graph: &CodeGraph) -> Self {
+ graph.to_builder()
+ }
+
+ /// Create builder from internal data
+ pub(crate) fn from_inner(inner: CodeGraphInner) -> Self {
+ Self { inner }
+ }
+
+ // ---- Mutation methods ----
+
+ /// Add or update a node
+ pub fn add_node(&mut self, node_data: crate::ingest::parser::IndexNode) -> NodeIndex {
+ let fqn_sym = Symbol(self.inner.symbols.get_or_intern(&node_data.id));
+
+ if let Some(&idx) = self.inner.fqn_index.get(&fqn_sym) {
+ // Node already exists
+ idx
+ } else {
+ let name_sym = Symbol(self.inner.symbols.get_or_intern(&node_data.name));
+ let lang_sym = Symbol(self.inner.symbols.get_or_intern(&node_data.lang));
+ let location = node_data
+ .location
+ .as_ref()
+ .map(|l| l.to_internal(&mut self.inner.symbols));
+
+ let mut ctx = crate::model::storage::model::GenericStorageContext {
+ rodeo: &mut self.inner.symbols,
+ };
+
+ let node = crate::model::GraphNode {
+ id: fqn_sym,
+ name: name_sym,
+ kind: node_data.kind.clone(),
+ lang: lang_sym,
+ location: location.clone(),
+ metadata: node_data.metadata.intern(&mut ctx),
+ };
+
+ let idx = self.inner.topology.add_node(node);
+ self.inner.fqn_index.insert(fqn_sym, idx);
+ self.inner.name_index.entry(name_sym).or_default().push(idx);
+
+ if let Some(loc) = location {
+ self.inner
+ .file_index
+ .entry(loc.path)
+ .and_modify(|e: &mut crate::model::graph::FileEntry| e.nodes.push(idx))
+ .or_insert_with(|| {
+ let resolved_path = self.inner.symbols.resolve(&loc.path.0);
+ crate::model::graph::FileEntry {
+ metadata: SourceFile::new(
+ std::path::PathBuf::from(resolved_path),
+ 0,
+ 0,
+ ),
+ nodes: vec![idx],
+ }
+ });
+ }
+
+ idx
+ }
+ }
+
+ /// Add an edge between two nodes
+ pub fn add_edge(&mut self, from: NodeIndex, to: NodeIndex, edge: GraphEdge) {
+ // Check for duplicate edges
+ let already_exists = self.inner.topology.edges_connecting(from, to).any(
+ |e: petgraph::stable_graph::EdgeReference| {
+ e.weight().edge_type == edge.edge_type
+ },
+ );
+
+ if !already_exists {
+ self.inner.topology.add_edge(from, to, edge);
+ }
+ }
+
+ /// Remove a node
+ pub fn remove_node(&mut self, idx: NodeIndex) {
+ if let Some(node) = self.inner.topology.node_weight(idx) {
+ let fqn = node.id; // Symbol implements Copy
+ let name = node.name;
+
+ // Remove from indices
+ self.inner.fqn_index.remove(&fqn);
+
+ if let Some(nodes) = self.inner.name_index.get_mut(&name) {
+ nodes.retain(|&i| i != idx);
+ if nodes.is_empty() {
+ self.inner.name_index.remove(&name);
+ }
+ }
+
+ // Remove from topology
+ self.inner.topology.remove_node(idx);
+ }
+ }
+
+ /// Remove all nodes associated with a file path
+ pub fn remove_path(&mut self, path: &Path) {
+ let interned_path = Symbol(
+ self.inner
+ .symbols
+ .get_or_intern(path.to_string_lossy().as_ref()),
+ );
+ if let Some(entry) = self.inner.file_index.remove(&interned_path) {
+ for idx in entry.nodes {
+ self.remove_node(idx);
+ }
+ }
+
+ // Also remove from reference_index
+ for files in self.inner.reference_index.values_mut() {
+ files.retain(|p| *p != interned_path);
+ }
+ }
+
+ /// Update file metadata (creates or updates FileEntry)
+ pub fn update_file(&mut self, path: &Path, source: SourceFile) {
+ let interned_path = Symbol(
+ self.inner
+ .symbols
+ .get_or_intern(path.to_string_lossy().as_ref()),
+ );
+ self.inner
+ .file_index
+ .entry(interned_path)
+ .and_modify(|e| e.metadata = source.clone())
+ .or_insert(crate::model::graph::FileEntry {
+ metadata: source,
+ nodes: Vec::new(),
+ });
+ }
+
+ /// Apply a graph operation
+ pub fn apply_op(&mut self, op: GraphOp) -> crate::error::Result<()> {
+ match op {
+ GraphOp::AddNode { data } => {
+ if let Some(index_node) = data {
+ self.add_node(index_node);
+ }
+ }
+ GraphOp::AddEdge {
+ from_id,
+ to_id,
+ edge,
+ } => {
+ let from_sym = Symbol(self.inner.symbols.get_or_intern(from_id.as_ref()));
+ let to_sym = Symbol(self.inner.symbols.get_or_intern(to_id.as_ref()));
+
+ if let (Some(&from), Some(&to)) = (
+ self.inner.fqn_index.get(&from_sym),
+ self.inner.fqn_index.get(&to_sym),
+ ) {
+ self.add_edge(from, to, edge);
+ }
+ }
+ GraphOp::RemovePath { path } => {
+ self.remove_path(&path);
+ }
+ GraphOp::UpdateIdentifiers { path, identifiers } => {
+ let path_sym = Symbol(
+ self.inner
+ .symbols
+ .get_or_intern(path.to_string_lossy().as_ref()),
+ );
+ for token in identifiers {
+ let token_sym = Symbol(self.inner.symbols.get_or_intern(token.as_str()));
+ let files = self.inner.reference_index.entry(token_sym).or_default();
+ if !files.contains(&path_sym) {
+ files.push(path_sym);
+ }
+ }
+ }
+ GraphOp::UpdateFile { metadata } => {
+ let path = metadata.path.clone();
+ self.update_file(&path, metadata);
+ }
+ }
+ Ok(())
+ }
+
+ /// Apply multiple graph operations
+ pub fn apply_ops(&mut self, ops: Vec) -> crate::error::Result<()> {
+ for op in ops {
+ self.apply_op(op)?;
+ }
+ Ok(())
+ }
+
+ /// Build the immutable graph
+ pub fn build(self) -> CodeGraph {
+ CodeGraph::from_inner(self.inner)
+ }
+}
+
+impl Default for CodeGraphBuilder {
+ fn default() -> Self {
+ Self::new()
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use crate::model::NodeKind;
+
+ #[test]
+ fn test_build_from_scratch() {
+ let mut builder = CodeGraphBuilder::new();
+
+ let node = crate::ingest::parser::IndexNode {
+ id: "test_project".to_string(),
+ name: "test_project".to_string(),
+ kind: NodeKind::Project,
+ lang: "buildfile".to_string(),
+ location: None,
+ metadata: std::sync::Arc::new(crate::model::EmptyMetadata),
+ };
+
+ let _idx = builder.add_node(node);
+ let graph = builder.build();
+
+ assert_eq!(graph.node_count(), 1);
+ assert!(graph.find_node("test_project").is_some());
+ }
+
+ #[test]
+ fn test_incremental_update() {
+ let graph = CodeGraph::empty();
+ assert_eq!(graph.node_count(), 0);
+
+ let mut builder = CodeGraphBuilder::from_graph(&graph);
+
+ let node = crate::ingest::parser::IndexNode {
+ id: "new_project".to_string(),
+ name: "new_project".to_string(),
+ kind: NodeKind::Project,
+ lang: "buildfile".to_string(),
+ location: None,
+ metadata: std::sync::Arc::new(crate::model::EmptyMetadata),
+ };
+
+ builder.add_node(node);
+ let updated = builder.build();
+
+ assert_eq!(updated.node_count(), 1);
+ }
+}
diff --git a/crates/core/src/ingest/mod.rs b/crates/core/src/ingest/mod.rs
new file mode 100644
index 0000000..f278b9c
--- /dev/null
+++ b/crates/core/src/ingest/mod.rs
@@ -0,0 +1,18 @@
+pub mod builder;
+pub mod parser;
+pub mod resolver;
+pub mod scanner;
+
+use std::path::Path;
+
+pub fn is_relevant_path(path: &Path) -> bool {
+ if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
+ if name.starts_with('.') {
+ return false;
+ }
+ if name == "target" || name == "build" || name == "node_modules" {
+ return false;
+ }
+ }
+ true
+}
diff --git a/crates/core/src/ingest/parser/mod.rs b/crates/core/src/ingest/parser/mod.rs
new file mode 100644
index 0000000..235659a
--- /dev/null
+++ b/crates/core/src/ingest/parser/mod.rs
@@ -0,0 +1,40 @@
+use crate::error::Result;
+use crate::model::{DisplayGraphNode, NodeKind, Range};
+use std::path::Path;
+use tree_sitter::Tree;
+
+pub mod output;
+pub mod utils;
+
+pub use naviscope_api::SymbolResolution;
+pub use output::{IndexNode, IndexRelation, ParseOutput};
+
+pub trait LspParser: Send + Sync {
+ fn parse(
+ &self,
+ source: &str,
+ old_tree: Option<&tree_sitter::Tree>,
+ ) -> Option;
+ fn extract_symbols(&self, tree: &Tree, source: &str) -> Vec;
+ /// Maps a language-specific symbol kind string to an LSP SymbolKind
+ fn symbol_kind(&self, kind: &NodeKind) -> lsp_types::SymbolKind;
+
+ /// Find occurrences of a symbol within a single file's AST.
+ /// This is the "Micro" part of the Discovery Engine.
+ fn find_occurrences(&self, source: &str, tree: &Tree, target: &SymbolResolution) -> Vec;
+}
+
+/// Result of a global file parsing for indexing.
+#[derive(Clone)]
+pub struct GlobalParseResult {
+ pub package_name: Option,
+ pub imports: Vec,
+ pub output: ParseOutput,
+ pub source: Option,
+ pub tree: Option,
+}
+
+/// Trait for parsers that provide data for the global code knowledge graph.
+pub trait IndexParser: Send + Sync {
+ fn parse_file(&self, source_code: &str, file_path: Option<&Path>) -> Result;
+}
diff --git a/crates/core/src/ingest/parser/output.rs b/crates/core/src/ingest/parser/output.rs
new file mode 100644
index 0000000..9d7921a
--- /dev/null
+++ b/crates/core/src/ingest/parser/output.rs
@@ -0,0 +1,34 @@
+use crate::model::IndexMetadata;
+use crate::model::{EdgeType, NodeKind, Range};
+use naviscope_api::models::DisplaySymbolLocation;
+use std::sync::Arc;
+
+/// Node model during the parsing phase, before interning
+/// It holds raw Strings and strongly-typed Metadata
+#[derive(Debug, Clone)]
+pub struct IndexNode {
+ pub id: String,
+ pub name: String,
+ pub kind: NodeKind,
+ pub lang: String,
+ pub location: Option,
+ pub metadata: Arc,
+}
+
+/// Relation model during the parsing phase
+#[derive(Debug, Clone)]
+pub struct IndexRelation {
+ pub source_id: String,
+ pub target_id: String,
+ pub edge_type: EdgeType,
+ pub range: Option,
+}
+
+/// Core model produced by the parser
+#[derive(Debug, Clone, Default)]
+pub struct ParseOutput {
+ pub nodes: Vec,
+ pub relations: Vec,
+ /// All identifiers appearing in the file (used for global search and reference indexing)
+ pub identifiers: Vec,
+}
diff --git a/src/parser/utils.rs b/crates/core/src/ingest/parser/utils.rs
similarity index 64%
rename from src/parser/utils.rs
rename to crates/core/src/ingest/parser/utils.rs
index 3e3be9c..35305ea 100644
--- a/src/parser/utils.rs
+++ b/crates/core/src/ingest/parser/utils.rs
@@ -1,6 +1,6 @@
use crate::error::{NaviscopeError, Result};
+use crate::model::{NodeKind, Range};
use tree_sitter::{Language, Query};
-use crate::model::graph::{Range, NodeKind};
/// Converts a tree-sitter range to our internal Range model.
pub fn range_from_ts(range: tree_sitter::Range) -> Range {
@@ -29,26 +29,34 @@ pub fn get_capture_index(query: &Query, name: &str) -> Result {
pub struct RawSymbol<'a> {
pub name: String,
pub kind: NodeKind,
- pub range: crate::model::graph::Range,
- pub selection_range: crate::model::graph::Range,
+ pub range: crate::model::Range,
+ pub selection_range: crate::model::Range,
pub node: tree_sitter::Node<'a>,
}
-/// Builds a hierarchical DocumentSymbol tree from flat raw symbols using AST parent-child relationships.
-pub fn build_symbol_hierarchy(raw_symbols: Vec) -> Vec {
+/// Builds a hierarchical DisplayGraphNode tree from flat raw symbols using AST parent-child relationships.
+pub fn build_symbol_hierarchy(raw_symbols: Vec) -> Vec {
use std::collections::HashMap;
let mut symbols_map: HashMap = HashMap::new(); // node_id -> flat_index
- let mut flat_symbols: Vec = Vec::new();
+ let mut flat_symbols: Vec = Vec::new();
let mut parent_child_rels: Vec<(usize, usize)> = Vec::new();
// 1. Create flat list and map nodes to indices
for (i, raw) in raw_symbols.iter().enumerate() {
- flat_symbols.push(crate::parser::DocumentSymbol {
+ flat_symbols.push(crate::model::DisplayGraphNode {
+ id: raw.name.clone(), // For document symbols, FQN might not be available, use name as fallback id
name: raw.name.clone(),
kind: raw.kind.clone(),
- range: raw.range,
- selection_range: raw.selection_range,
- children: Vec::new(),
+ lang: String::new(), // To be filled by caller if needed
+ location: Some(crate::model::DisplaySymbolLocation {
+ path: String::new(), // To be filled by caller
+ range: raw.range,
+ selection_range: Some(raw.selection_range),
+ }),
+ detail: None,
+ signature: None,
+ modifiers: vec![],
+ children: Some(Vec::new()),
});
symbols_map.insert(raw.node.id(), i);
}
@@ -82,18 +90,31 @@ pub fn build_symbol_hierarchy(raw_symbols: Vec) -> Vec,
+ flat: &mut Vec,
rels: &[(usize, usize)],
- ) -> crate::parser::DocumentSymbol {
+ ) -> crate::model::DisplayGraphNode {
let mut sym = flat[idx].clone();
- let children: Vec = rels.iter().filter(|(p, _)| *p == idx).map(|(_, c)| *c).collect();
+ let children: Vec = rels
+ .iter()
+ .filter(|(p, _)| *p == idx)
+ .map(|(_, c)| *c)
+ .collect();
+ let mut child_nodes = Vec::new();
for c_idx in children {
- sym.children.push(build_node(c_idx, flat, rels));
+ child_nodes.push(build_node(c_idx, flat, rels));
}
+ sym.children = if child_nodes.is_empty() {
+ None
+ } else {
+ Some(child_nodes)
+ };
sym
}
- roots.into_iter().map(|root_idx| build_node(root_idx, &mut flat_symbols, &parent_child_rels)).collect()
+ roots
+ .into_iter()
+ .map(|root_idx| build_node(root_idx, &mut flat_symbols, &parent_child_rels))
+ .collect()
}
/// Macro to define a struct for capture indices and a `new` method to initialize it from a query.
@@ -108,7 +129,7 @@ macro_rules! decl_indices {
impl $name {
pub fn new(query: &tree_sitter::Query) -> $crate::error::Result {
Ok(Self {
- $($field: $crate::parser::utils::get_capture_index(query, $capture)?,)+
+ $($field: $crate::ingest::parser::utils::get_capture_index(query, $capture)?,)+
})
}
}
diff --git a/crates/core/src/ingest/resolver/engine.rs b/crates/core/src/ingest/resolver/engine.rs
new file mode 100644
index 0000000..45c6406
--- /dev/null
+++ b/crates/core/src/ingest/resolver/engine.rs
@@ -0,0 +1,172 @@
+use crate::error::Result;
+use crate::ingest::resolver::{ProjectContext, SemanticResolver};
+use crate::ingest::scanner::ParsedFile;
+use crate::model::source::Language;
+use crate::model::{GraphOp, ResolvedUnit};
+use rayon::prelude::*;
+use std::sync::Arc;
+
+use crate::runtime::plugin::{BuildToolPlugin, LanguagePlugin};
+
+/// Main resolver that dispatches to specific strategies based on file type for indexing
+pub struct IndexResolver {
+ build_plugins: Vec>,
+ lang_plugins: Vec>,
+}
+
+impl IndexResolver {
+ pub fn new() -> Self {
+ Self {
+ build_plugins: Vec::new(),
+ lang_plugins: Vec::new(),
+ }
+ }
+
+ pub fn with_plugins(
+ build_plugins: Vec>,
+ lang_plugins: Vec>,
+ ) -> Self {
+ Self {
+ build_plugins,
+ lang_plugins,
+ }
+ }
+
+ pub fn register_language(&mut self, plugin: Arc) {
+ self.lang_plugins.push(plugin);
+ }
+
+ pub fn register_build_tool(&mut self, plugin: Arc) {
+ self.build_plugins.push(plugin);
+ }
+
+ pub fn get_semantic_resolver(&self, language: Language) -> Option> {
+ self.lang_plugins
+ .iter()
+ .find(|p| p.name() == language)
+ .map(|p| p.resolver())
+ }
+
+ pub fn get_lsp_parser(
+ &self,
+ language: Language,
+ ) -> Option> {
+ self.lang_plugins
+ .iter()
+ .find(|p| p.name() == language)
+ .map(|p| p.lsp_parser())
+ }
+
+ pub fn get_metadata_plugin(
+ &self,
+ language: Language,
+ ) -> Option> {
+ self.lang_plugins
+ .iter()
+ .find(|p| p.name() == language)
+ .map(|p| p.clone() as Arc)
+ .or_else(|| {
+ self.build_plugins
+ .iter()
+ .find(|p| p.name().as_str() == language.as_str())
+ .map(|p| p.clone() as Arc)
+ })
+ }
+
+ pub fn get_node_renderer(
+ &self,
+ language: Language,
+ ) -> Option> {
+ self.lang_plugins
+ .iter()
+ .find(|p| p.name() == language)
+ .map(|p| p.clone() as Arc)
+ .or_else(|| {
+ self.build_plugins
+ .iter()
+ .find(|p| p.name().as_str() == language.as_str())
+ .map(|p| p.clone() as Arc)
+ })
+ }
+
+ pub fn get_language_by_extension(&self, ext: &str) -> Option {
+ for plugin in &self.lang_plugins {
+ if plugin.supported_extensions().contains(&ext) {
+ return Some(plugin.name());
+ }
+ }
+ Language::from_extension(ext)
+ }
+
+ /// Resolve all parsed files into graph operations using a two-phase process
+ pub fn resolve(&self, files: Vec) -> Result> {
+ let mut all_ops = Vec::new();
+
+ // Add RemovePath operations and UpdateFile operations for each file being processed
+ for file in &files {
+ all_ops.push(GraphOp::RemovePath {
+ path: Arc::from(file.file.path.as_path()),
+ });
+ all_ops.push(GraphOp::UpdateFile {
+ metadata: file.file.clone(),
+ });
+ }
+
+ // Separate files into build and source files
+ let (build_files, source_files): (Vec<_>, Vec<_>) =
+ files.into_iter().partition(|f| f.is_build());
+
+ // Phase 1: Resolve Build Tools (Structure)
+ let mut project_context = ProjectContext::new();
+
+ for plugin in &self.build_plugins {
+ // Find files relevant to this plugin
+ let tool_files: Vec = build_files
+ .iter()
+ .filter(|f| {
+ if let Some(file_name) = f.path().file_name().and_then(|n| n.to_str()) {
+ plugin.recognize(file_name)
+ } else {
+ false
+ }
+ })
+ .cloned()
+ .collect();
+
+ let tool_files_refs: Vec<&ParsedFile> = tool_files.iter().collect();
+
+ if !tool_files.is_empty() {
+ let resolver = plugin.build_resolver();
+ let (unit, context) = resolver.resolve(&tool_files_refs)?;
+ all_ops.extend(unit.ops);
+ project_context
+ .path_to_module
+ .extend(context.path_to_module);
+ }
+ }
+
+ // Phase 2: Resolve Source Files (Entities) in parallel
+ let source_results: Vec> = source_files
+ .par_iter()
+ .map(|file| {
+ let language = file.language().unwrap_or(Language::BUILDFILE);
+ let plugin = self.lang_plugins.iter().find(|p| p.name() == language);
+
+ if let Some(p) = plugin {
+ let resolver = p.lang_resolver();
+ resolver.resolve(file, &project_context)
+ } else {
+ Ok(ResolvedUnit::new())
+ }
+ })
+ .collect();
+
+ // Collect and merge source operations
+ for result in source_results {
+ let unit = result?;
+ all_ops.extend(unit.ops);
+ }
+
+ Ok(all_ops)
+ }
+}
diff --git a/src/resolver/mod.rs b/crates/core/src/ingest/resolver/mod.rs
similarity index 74%
rename from src/resolver/mod.rs
rename to crates/core/src/ingest/resolver/mod.rs
index dba3901..1973440 100644
--- a/src/resolver/mod.rs
+++ b/crates/core/src/ingest/resolver/mod.rs
@@ -1,30 +1,45 @@
use crate::error::Result;
-use crate::index::CodeGraph;
-use crate::model::graph::{ResolvedUnit};
-use crate::parser::SymbolResolution;
-use crate::project::scanner::ParsedFile;
+use crate::ingest::scanner::ParsedFile;
+use crate::model::ResolvedUnit;
+use naviscope_api::models::SymbolResolution;
use petgraph::stable_graph::NodeIndex;
use std::collections::HashMap;
use std::path::{Path, PathBuf};
use tree_sitter::Tree;
pub mod engine;
-pub mod lang;
pub mod scope;
+use crate::features::CodeGraphLike;
+
/// Core interface for resolving a symbol at a specific position in a document.
pub trait SemanticResolver: Send + Sync {
/// Resolve a symbol at a specific position in a document (local view)
- fn resolve_at(&self, tree: &Tree, source: &str, line: usize, byte_col: usize, index: &CodeGraph) -> Option;
+ fn resolve_at(
+ &self,
+ tree: &Tree,
+ source: &str,
+ line: usize,
+ byte_col: usize,
+ index: &dyn CodeGraphLike,
+ ) -> Option;
/// Find nodes in the global graph matching a resolution result (global view)
- fn find_matches(&self, index: &CodeGraph, res: &SymbolResolution) -> Vec;
+ fn find_matches(&self, index: &dyn CodeGraphLike, res: &SymbolResolution) -> Vec;
/// Resolve the type(s) of a symbol (e.g., return type of a method, type of a field)
- fn resolve_type_of(&self, index: &CodeGraph, res: &SymbolResolution) -> Vec;
+ fn resolve_type_of(
+ &self,
+ index: &dyn CodeGraphLike,
+ res: &SymbolResolution,
+ ) -> Vec;
/// Find implementations or overrides of a symbol (global view)
- fn find_implementations(&self, index: &CodeGraph, res: &SymbolResolution) -> Vec;
+ fn find_implementations(
+ &self,
+ index: &dyn CodeGraphLike,
+ res: &SymbolResolution,
+ ) -> Vec;
}
/// Project context generated by BuildResolver during the first phase
diff --git a/src/resolver/scope.rs b/crates/core/src/ingest/resolver/scope.rs
similarity index 93%
rename from src/resolver/scope.rs
rename to crates/core/src/ingest/resolver/scope.rs
index 7f74c9e..c25eba3 100644
--- a/src/resolver/scope.rs
+++ b/crates/core/src/ingest/resolver/scope.rs
@@ -1,4 +1,4 @@
-use crate::parser::SymbolResolution;
+use naviscope_api::models::SymbolResolution;
/// A generic trait for semantic scopes in any programming language.
/// `C` represents the language-specific resolution context.
@@ -9,7 +9,7 @@ pub trait SemanticScope: Send + Sync {
/// - `Some(Err(()))` if the symbol is NOT found and searching should stop (shadowing/short-circuit).
/// - `None` if the symbol is NOT found and searching should continue in the next scope.
fn resolve(&self, name: &str, context: &C) -> Option>;
-
+
/// Returns the name of the scope for debugging purposes.
fn name(&self) -> &'static str;
}
diff --git a/src/project/scanner.rs b/crates/core/src/ingest/scanner.rs
similarity index 57%
rename from src/project/scanner.rs
rename to crates/core/src/ingest/scanner.rs
index 186b494..c692cc0 100644
--- a/src/project/scanner.rs
+++ b/crates/core/src/ingest/scanner.rs
@@ -1,9 +1,6 @@
use super::is_relevant_path;
-use super::source::{BuildTool, Language, SourceFile};
-use crate::model::lang::gradle::{GradleParseResult, GradleSettings};
-use crate::parser::gradle;
-use crate::parser::java::JavaParser;
-use crate::parser::{IndexParser, GlobalParseResult};
+use crate::ingest::parser::GlobalParseResult;
+use crate::model::source::{BuildTool, Language, SourceFile};
use ignore::WalkBuilder;
use rayon::prelude::*;
use std::collections::HashMap;
@@ -13,12 +10,14 @@ use std::path::{Path, PathBuf};
use std::time::SystemTime;
use xxhash_rust::xxh3::Xxh3;
+#[derive(Clone)]
pub enum ParsedContent {
- Java(GlobalParseResult),
- Gradle(GradleParseResult),
- GradleSettings(GradleSettings),
+ Language(GlobalParseResult),
+ MetaData(serde_json::Value),
+ Unparsed(String),
}
+#[derive(Clone)]
pub struct ParsedFile {
pub file: SourceFile,
pub content: ParsedContent,
@@ -26,20 +25,58 @@ pub struct ParsedFile {
impl ParsedFile {
pub fn is_build(&self) -> bool {
- matches!(self.content, ParsedContent::Gradle(..) | ParsedContent::GradleSettings(..))
+ match self.content {
+ ParsedContent::Unparsed(..) => {
+ let name = self
+ .path()
+ .file_name()
+ .and_then(|n| n.to_str())
+ .unwrap_or("");
+ name == "build.gradle"
+ || name == "build.gradle.kts"
+ || name == "settings.gradle"
+ || name == "settings.gradle.kts"
+ }
+ _ => false,
+ }
}
pub fn build_tool(&self) -> Option {
match self.content {
- ParsedContent::Gradle(..) | ParsedContent::GradleSettings(..) => Some(BuildTool::Gradle),
+ ParsedContent::Unparsed(..) => {
+ if self.is_build() {
+ Some(BuildTool::GRADLE)
+ } else {
+ None
+ }
+ }
_ => None,
}
}
pub fn language(&self) -> Option {
match self.content {
- ParsedContent::Java(..) => Some(Language::Java),
- ParsedContent::Gradle(..) | ParsedContent::GradleSettings(..) => Some(Language::BuildFile),
+ ParsedContent::Language(ref res) => {
+ // Try to infer from package
+ if let Some(ref pkg) = res.package_name {
+ if pkg.starts_with("java.") || pkg.starts_with("javax.") {
+ return Some(Language::JAVA);
+ }
+ }
+ Some(Language::UNKNOWN)
+ }
+ ParsedContent::MetaData(..) => None,
+ ParsedContent::Unparsed(..) => {
+ if self.is_build() {
+ self.build_tool()
+ .map(|t| Language::new(t.as_str().to_string()))
+ } else {
+ self.path()
+ .extension()
+ .and_then(|e| e.to_str())
+ .and_then(Language::from_extension)
+ }
+ }
}
}
@@ -55,7 +92,15 @@ impl Scanner {
root: &Path,
existing_files: &HashMap,
) -> Vec {
- Self::collect_paths(root)
+ let paths = Self::collect_paths(root);
+ Self::scan_files(paths, existing_files)
+ }
+
+ pub fn scan_files(
+ paths: Vec,
+ existing_files: &HashMap,
+ ) -> Vec {
+ paths
.par_iter()
.filter_map(|path| {
// 1. Check metadata (mtime) first
@@ -87,33 +132,16 @@ impl Scanner {
// Determine build tool or language from file extension/name
let file_name = path.file_name()?.to_str()?;
- let extension = path.extension()?.to_str()?;
- if file_name == "build.gradle" || file_name == "build.gradle.kts" {
- let deps = gradle::parse_dependencies(&content_str).unwrap_or_else(|_| Vec::new());
- Some(ParsedFile {
- file: source_file,
- content: ParsedContent::Gradle(GradleParseResult { dependencies: deps }),
- })
- } else if file_name == "settings.gradle" || file_name == "settings.gradle.kts" {
- let settings = gradle::parse_settings(&content_str).unwrap_or_else(|_| {
- crate::model::lang::gradle::GradleSettings {
- root_project_name: None,
- included_projects: Vec::new(),
- }
- });
- Some(ParsedFile {
- file: source_file,
- content: ParsedContent::GradleSettings(settings),
- })
- } else if extension == "java" {
- let parser = JavaParser::new().ok()?;
- let res = parser
- .parse_file(&content_str, Some(&source_file.path))
- .ok()?;
+ if file_name == "build.gradle"
+ || file_name == "build.gradle.kts"
+ || file_name == "settings.gradle"
+ || file_name == "settings.gradle.kts"
+ || path.extension().is_some()
+ {
Some(ParsedFile {
file: source_file,
- content: ParsedContent::Java(res),
+ content: ParsedContent::Unparsed(content_str),
})
} else {
None
diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
new file mode 100644
index 0000000..be9d5b7
--- /dev/null
+++ b/crates/core/src/lib.rs
@@ -0,0 +1,11 @@
+pub mod error;
+pub mod logging;
+pub mod util;
+
+pub mod facade;
+pub mod features;
+pub mod ingest;
+pub mod model;
+pub mod runtime;
+
+pub use error::Result;
diff --git a/src/logging.rs b/crates/core/src/logging.rs
similarity index 90%
rename from src/logging.rs
rename to crates/core/src/logging.rs
index 923ec85..427adc3 100644
--- a/src/logging.rs
+++ b/crates/core/src/logging.rs
@@ -1,6 +1,6 @@
use std::path::Path;
use tracing_appender::non_blocking::WorkerGuard;
-use tracing_subscriber::{fmt, prelude::*, EnvFilter};
+use tracing_subscriber::{EnvFilter, fmt, prelude::*};
pub fn init_logging(component: &str) -> WorkerGuard {
let home = std::env::var("HOME").unwrap_or_else(|_| ".".to_string());
@@ -12,8 +12,7 @@ pub fn init_logging(component: &str) -> WorkerGuard {
let file_appender = tracing_appender::rolling::daily(&log_dir, component);
let (non_blocking, guard) = tracing_appender::non_blocking(file_appender);
- let filter = EnvFilter::try_from_default_env()
- .unwrap_or_else(|_| EnvFilter::new("info"));
+ let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
// File layer: no ANSI colors, output to file
let file_layer = fmt::layer()
diff --git a/crates/core/src/model/graph.rs b/crates/core/src/model/graph.rs
new file mode 100644
index 0000000..0021750
--- /dev/null
+++ b/crates/core/src/model/graph.rs
@@ -0,0 +1,334 @@
+//! Arc-wrapped immutable code graph
+//!
+//! The `CodeGraph` provides a cheap-to-clone, immutable view of the indexed codebase.
+//! All data is wrapped in `Arc`, so cloning only increments a reference counter.
+use crate::error::{NaviscopeError, Result};
+use crate::ingest::builder::CodeGraphBuilder;
+
+use crate::model::source::SourceFile;
+use crate::model::{GraphEdge, GraphNode};
+use crate::runtime::plugin::MetadataPlugin;
+use lasso::Rodeo;
+use naviscope_api::models::symbol::Symbol;
+use petgraph::stable_graph::{NodeIndex, StableDiGraph};
+use std::collections::HashMap;
+use std::path::Path;
+use std::sync::Arc;
+use std::sync::atomic::{AtomicU64, Ordering};
+
+static NEXT_INSTANCE_ID: AtomicU64 = AtomicU64::new(1);
+
+pub const CURRENT_VERSION: u32 = 1;
+
+fn next_instance_id() -> u64 {
+ NEXT_INSTANCE_ID.fetch_add(1, Ordering::Relaxed)
+}
+
+/// Immutable code graph (cheap to clone via Arc)
+#[derive(Clone)]
+pub struct CodeGraph {
+ inner: std::sync::Arc,
+}
+
+/// Internal data structure (shared via Arc)
+#[derive(Clone)]
+pub struct CodeGraphInner {
+ /// Unique instance ID for concurrency control (not serialized)
+ pub instance_id: u64,
+
+ pub version: u32,
+ pub topology: StableDiGraph,
+
+ /// Core symbol table: created and destroyed with the graph instance
+ pub symbols: Rodeo,
+
+ /// FQN -> NodeIndex mapping for fast lookup
+ pub fqn_index: HashMap,
+
+ /// Simple name -> NodeIndices for symbol search
+ pub name_index: HashMap>,
+
+ /// File-level information: metadata and nodes contained in each file
+ pub file_index: HashMap,
+
+ /// Reference Index: Token (e.g. Method Name) -> Files that contain this token.
+ /// Used for fast "scouting" during reference discovery.
+ pub reference_index: HashMap>,
+}
+
+/// Metadata and nodes associated with a single source file
+#[derive(Clone, Debug)]
+pub struct FileEntry {
+ pub metadata: SourceFile,
+ pub nodes: Vec