avoid usage of syscalls like pidfd_open which dont work well on iSH

Author: Snehal-Reddy

src/sync.rs

@@ -29,33 +29,38 @@ async fn pull_loop(workspace: PathBuf, db: Arc<BrainDb>, interval_secs: u64) {
         tokio::time::sleep(interval).await;
 
         let ws = workspace.clone();
-        match tokio::process::Command::new("git")
-            .args(["pull", "--rebase", "origin", "main"])
-            .current_dir(&ws)
-            .output()
-            .await
-        {
-            Ok(out) if out.status.success() => {
+        let output_res = tokio::task::spawn_blocking(move || {
+            std::process::Command::new("git")
+                .args(["pull", "--rebase", "origin", "main"])
+                .current_dir(&ws)
+                .output()
+        })
+        .await;
+
+        match output_res {
+            Ok(Ok(out)) if out.status.success() => {
                 let stdout = String::from_utf8_lossy(&out.stdout);
                 eprintln!("git pull: ok — {}", stdout.trim());
 
+                let ws_reindex = workspace.clone();
                 // Re-index vault so FTS5 reflects any new notes from PC.
                 let idx = indexer.clone();
-                match tokio::task::spawn_blocking(move || idx.scan(&ws)).await {
+                match tokio::task::spawn_blocking(move || idx.scan(&ws_reindex)).await {
                     Ok(Ok(stats)) => eprintln!("vault re-index: {stats}"),
                     Ok(Err(e)) => eprintln!("vault re-index warning: {e}"),
                     Err(e) => eprintln!("vault re-index task error: {e}"),
                 }
             }
-            Ok(out) => {
+            Ok(Ok(out)) => {
                 let stderr = String::from_utf8_lossy(&out.stderr);
                 eprintln!(
                     "git pull: non-zero exit ({}): {}",
                     out.status,
                     stderr.trim()
                 );
             }
-            Err(e) => eprintln!("git pull: failed to spawn: {e}"),
+            Ok(Err(e)) => eprintln!("git pull: failed to spawn: {e}"),
+            Err(e) => eprintln!("git pull: task panicked: {e}"),
         }
     }
 }

src/tools/git.rs

@@ -12,7 +12,6 @@
 use std::process::Output;
 
 use serde_json::Value;
-use tokio::process::Command;
 
 use crate::tools::context::ToolCtx;
 use crate::tools::registry::{BoxFuture, Tool};
@@ -89,12 +88,18 @@ impl Tool for GitSyncTool {
 }
 
 async fn run_git(workspace: &std::path::Path, args: &[&str]) -> Result<Output, String> {
-    Command::new("git")
-        .args(args)
-        .current_dir(workspace)
-        .output()
-        .await
-        .map_err(|e| e.to_string())
+    let workspace = workspace.to_path_buf();
+    let args: Vec<String> = args.iter().map(|s| s.to_string()).collect();
+
+    tokio::task::spawn_blocking(move || {
+        std::process::Command::new("git")
+            .args(&args)
+            .current_dir(&workspace)
+            .output()
+    })
+    .await
+    .map_err(|e| e.to_string())?
+    .map_err(|e| e.to_string())
 }
 
 fn append_output(log: &mut String, label: &str, out: &Output) {