fix: harden mcp connectivity and install safety

Author: AdityaVG13

daemon-rs/src/hook_boot.rs

@@ -25,7 +25,6 @@ use serde_json::json;
 use std::path::PathBuf;
 
 const DEFAULT_BUDGET: u32 = 600;
-const DEFAULT_PORT: u16 = 7437;
 
 // ---- Internal types ---------------------------------------------------------
 
@@ -45,24 +44,27 @@ struct HealthResult {
 
 /// Read the auth token from ~/.cortex/cortex.token for authenticated requests.
 fn read_auth_token() -> Option<String> {
-    let home = std::env::var("USERPROFILE")
-        .or_else(|_| std::env::var("HOME"))
-        .ok()?;
-    let path = PathBuf::from(home).join(".cortex").join("cortex.token");
-    std::fs::read_to_string(path)
-        .ok()
-        .map(|s| s.trim().to_string())
+    let path = crate::auth::CortexPaths::resolve().token;
+    match std::fs::read_to_string(path) {
+        Ok(token) => {
+            let trimmed = token.trim();
+            if trimmed.is_empty() {
+                None
+            } else {
+                Some(trimmed.to_string())
+            }
+        }
+        Err(_) => None,
+    }
 }
 
 fn daemon_port() -> u16 {
-    std::env::var("CORTEX_PORT")
-        .ok()
-        .and_then(|v| v.parse::<u16>().ok())
-        .unwrap_or(DEFAULT_PORT)
+    crate::auth::CortexPaths::resolve().port
 }
 
 async fn fetch_boot(agent: &str, budget: u32, port: u16) -> Option<BootResult> {
     let client = reqwest::Client::builder()
+        .connect_timeout(std::time::Duration::from_secs(3))
         .timeout(std::time::Duration::from_secs(7))
         .build()
         .ok()?;
@@ -90,6 +92,7 @@ async fn fetch_boot(agent: &str, budget: u32, port: u16) -> Option<BootResult> {
 
 async fn fetch_health(port: u16) -> Option<HealthResult> {
     let client = reqwest::Client::builder()
+        .connect_timeout(std::time::Duration::from_secs(3))
         .timeout(std::time::Duration::from_secs(2))
         .build()
         .ok()?;

daemon-rs/src/main.rs

@@ -29,6 +29,7 @@ mod hook_boot;
 mod indexer;
 mod logging;
 mod mcp_proxy;
+#[allow(dead_code)]
 mod mcp_stdio;
 mod prompt_inject;
 mod rate_limit;
@@ -80,24 +81,7 @@ async fn main() {
             let base_url = format!("http://127.0.0.1:{}", paths.port);
             if let Err(e) = mcp_proxy::run(&base_url, None).await {
                 eprintln!("[cortex-mcp] {e}");
-
-                // Legacy fallback: standalone MCP (stdio only, no daemon pretending).
-                eprintln!("[cortex-mcp] Running standalone -- start the daemon for shared state");
-                let db_path = paths.db.clone();
-                eprintln!("[cortex-mcp] DB: {}", db_path.display());
-
-                let (mcp_state, _shutdown_rx) =
-                    state::initialize(&db_path, false).expect("Failed to initialize state");
-
-                mcp_stdio::run(mcp_state.clone()).await;
-                eprintln!("[cortex-mcp] MCP session ended.");
-
-                let conn = mcp_state.db.lock().await;
-                if let Err(e) =
-                    conn.execute_batch("PRAGMA wal_checkpoint(TRUNCATE); PRAGMA optimize;")
-                {
-                    eprintln!("[cortex-mcp] Warning: WAL checkpoint failed: {e}");
-                }
+                std::process::exit(1);
             }
         }
 
@@ -674,7 +658,7 @@ fn print_usage_and_exit(code: i32) -> ! {
     eprintln!();
     eprintln!("Daemon:");
     eprintln!("  serve              HTTP daemon on :7437");
-    eprintln!("  mcp                MCP stdio (proxy to daemon, standalone fallback)");
+    eprintln!("  mcp                MCP stdio (proxy to daemon)");
     eprintln!("  paths --json       Print resolved Cortex paths + port as JSON");
     eprintln!("  plugin ensure-daemon [--agent <name>]");
     eprintln!("  plugin mcp [--url <base>] [--api-key <key>]");