thedoublejay
diff --git a/‎Cargo.lock‎
Lines changed: 22 additions & 22 deletions b/‎Cargo.lock‎
Lines changed: 22 additions & 22 deletions
diff --git a/‎Cargo.toml‎
Lines changed: 10 additions & 10 deletions b/‎Cargo.toml‎
Lines changed: 10 additions & 10 deletions
diff --git a/‎crates/gather-step-cli/src/commands/setup_mcp.rs‎
Lines changed: 41 additions & 11 deletions b/‎crates/gather-step-cli/src/commands/setup_mcp.rs‎
Lines changed: 41 additions & 11 deletions
@@ -14,7 +14,7 @@ members = [
 ]
 
 [workspace.package]
-version = "4.0.3"
+version = "4.0.4"
 authors = ["JJ Adonis"]
 edition = "2024"
 rust-version = "1.94.1"
@@ -24,15 +24,15 @@ homepage = "https://github.com/thedoublejay/gather-step"
 description = "High-performance multi-repo codebase intelligence engine"
 
 [workspace.dependencies]
-gather-step = { path = "crates/gather-step-cli", version = "4.0.3" }
-gather-step-analysis = { path = "crates/gather-step-analysis", version = "4.0.3" }
-gather-step-core = { path = "crates/gather-step-core", version = "4.0.3" }
-gather-step-deploy = { path = "crates/gather-step-deploy", version = "4.0.3" }
-gather-step-git = { path = "crates/gather-step-git", version = "4.0.3" }
-gather-step-mcp = { path = "crates/gather-step-mcp", version = "4.0.3" }
-gather-step-output = { path = "crates/gather-step-output", version = "4.0.3" }
-gather-step-parser = { path = "crates/gather-step-parser", version = "4.0.3" }
-gather-step-storage = { path = "crates/gather-step-storage", version = "4.0.3" }
+gather-step = { path = "crates/gather-step-cli", version = "4.0.4" }
+gather-step-analysis = { path = "crates/gather-step-analysis", version = "4.0.4" }
+gather-step-core = { path = "crates/gather-step-core", version = "4.0.4" }
+gather-step-deploy = { path = "crates/gather-step-deploy", version = "4.0.4" }
+gather-step-git = { path = "crates/gather-step-git", version = "4.0.4" }
+gather-step-mcp = { path = "crates/gather-step-mcp", version = "4.0.4" }
+gather-step-output = { path = "crates/gather-step-output", version = "4.0.4" }
+gather-step-parser = { path = "crates/gather-step-parser", version = "4.0.4" }
+gather-step-storage = { path = "crates/gather-step-storage", version = "4.0.4" }
 
 tree-sitter = "=0.26.8"
 tree-sitter-typescript = "0.23.2"
 
@@ -1,4 +1,7 @@
-use std::path::{Path, PathBuf};
+use std::{
+    env,
+    path::{Path, PathBuf},
+};
 
 use anyhow::{Context, Result};
 use clap::{Args, ValueEnum};
@@ -25,6 +28,16 @@ struct SetupMcpOutput {
     event: &'static str,
     scope: McpScope,
     settings_path: String,
+    path_resolution: PathResolution,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    command_path: Option<String>,
+}
+
+#[derive(Debug, Clone, Copy, Serialize)]
+#[serde(rename_all = "snake_case")]
+enum PathResolution {
+    Ok,
+    NotFound,
 }
 
 pub fn run(app: &AppContext, args: SetupMcpArgs) -> Result<()> {
@@ -34,22 +47,33 @@ pub fn run(app: &AppContext, args: SetupMcpArgs) -> Result<()> {
             .context("cannot resolve HOME")?
             .join(".claude/settings.json"),
     };
-    let exe = std::env::current_exe().unwrap_or_else(|_| PathBuf::from("gather-step"));
-
-    write_settings(&settings_path, &app.workspace_path, &exe)?;
+    let command_path = find_command_on_path("gather-step");
+    let path_resolution = if command_path.is_some() {
+        PathResolution::Ok
+    } else {
+        PathResolution::NotFound
+    };
+    write_settings(&settings_path, &app.workspace_path)?;
 
     let payload = SetupMcpOutput {
         event: "setup_mcp_completed",
         scope: args.scope,
         settings_path: settings_path.display().to_string(),
+        path_resolution,
+        command_path: command_path.as_ref().map(|path| path.display().to_string()),
     };
     let output = app.output();
     output.emit(&payload)?;
+    if matches!(path_resolution, PathResolution::NotFound) {
+        output.line(
+            "Warning: `gather-step` was not found on PATH. MCP clients may fail to start the server until their PATH includes the installed binary.",
+        );
+    }
     output.line(format!("Updated {}", payload.settings_path));
     Ok(())
 }
 
-pub fn write_settings(path: &Path, workspace: &Path, exe: &Path) -> Result<()> {
+pub fn write_settings(path: &Path, workspace: &Path) -> Result<()> {
     if let Some(parent) = path.parent() {
         std::fs::create_dir_all(parent)
             .with_context(|| format!("creating {}", parent.display()))?;
@@ -58,19 +82,18 @@ pub fn write_settings(path: &Path, workspace: &Path, exe: &Path) -> Result<()> {
     let mut root = if path.exists() {
         let body =
             std::fs::read_to_string(path).with_context(|| format!("reading {}", path.display()))?;
-        serde_json::from_str::<Value>(&body).unwrap_or_else(|_| Value::Object(Map::default()))
+        serde_json::from_str::<Value>(&body)
+            .with_context(|| format!("parsing {}", path.display()))?
     } else {
         Value::Object(Map::default())
     };
 
     let workspace_str = workspace
         .to_str()
         .context("workspace path is not valid UTF-8")?;
-    let exe_str = exe.to_str().context("executable path is not valid UTF-8")?;
-
     let entry = json!({
-        "command": exe_str,
-        "args": ["--workspace", workspace_str, "mcp", "serve"],
+        "command": "gather-step",
+        "args": ["--workspace", workspace_str, "serve"],
     });
 
     let servers = root
@@ -90,5 +113,12 @@ pub fn write_settings(path: &Path, workspace: &Path, exe: &Path) -> Result<()> {
 }
 
 fn home_dir() -> Option<PathBuf> {
-    std::env::var_os("HOME").map(PathBuf::from)
+    env::var_os("HOME").map(PathBuf::from)
+}
+
+fn find_command_on_path(command: &str) -> Option<PathBuf> {
+    let path = env::var_os("PATH")?;
+    env::split_paths(&path)
+        .map(|dir| dir.join(command))
+        .find(|candidate| candidate.is_file())
 }