fix: prevent global workspace refresh loop

Author: arch3rPro

src-tauri/src/core/file_watcher.rs

@@ -16,8 +16,11 @@ fn collect_watch_paths(store: &SkillStore) -> Vec<PathBuf> {
     let mut paths = vec![central_repo::skills_dir(), central_repo::scenarios_dir()];
 
     for adapter in tool_adapters::all_tool_adapters(store) {
-        paths.push(adapter.skills_dir());
-        paths.extend(adapter.all_scan_dirs());
+        let skills_dir = adapter.skills_dir();
+        if skills_dir.exists() {
+            paths.push(skills_dir);
+        }
+        paths.extend(adapter.additional_existing_scan_dirs());
     }
 
     if let Ok(projects) = store.get_all_projects() {
@@ -71,15 +74,19 @@ fn watch_target(path: &Path) -> Option<PathBuf> {
         .map(|parent| parent.to_path_buf())
 }
 
+fn collect_watch_targets(store: &SkillStore) -> HashSet<PathBuf> {
+    collect_watch_paths(store)
+        .into_iter()
+        .filter_map(|path| watch_target(&path))
+        .collect()
+}
+
 fn sync_watch_set(
     watcher: &mut RecommendedWatcher,
     watched: &mut HashSet<PathBuf>,
     store: &SkillStore,
 ) {
-    let desired: HashSet<PathBuf> = collect_watch_paths(store)
-        .into_iter()
-        .filter_map(|path| watch_target(&path))
-        .collect();
+    let desired = collect_watch_targets(store);
 
     for stale in watched.difference(&desired).cloned().collect::<Vec<_>>() {
         if let Err(err) = watcher.unwatch(&stale) {
@@ -156,8 +163,11 @@ pub fn start_file_watcher<R: tauri::Runtime>(app: tauri::AppHandle<R>, store: Ar
 
 #[cfg(test)]
 mod tests {
-    use super::collect_watch_paths;
-    use crate::core::skill_store::{ProjectRecord, SkillStore};
+    use super::{collect_watch_paths, collect_watch_targets};
+    use crate::core::{
+        skill_store::{ProjectRecord, SkillStore},
+        tool_adapters::CustomToolDef,
+    };
     use std::fs;
     use tempfile::tempdir;
 
@@ -192,4 +202,32 @@ mod tests {
         assert!(!paths.contains(&skills_root.parent().unwrap().to_path_buf()));
         assert!(!paths.contains(&disabled_root.parent().unwrap().to_path_buf()));
     }
+
+    #[test]
+    fn missing_global_agent_paths_do_not_watch_parent_directories() {
+        let tmp = tempdir().unwrap();
+        let db_path = tmp.path().join("watcher.db");
+        let custom_parent = tmp.path().join("custom-agent");
+        let missing_skills_root = custom_parent.join("skills");
+        fs::create_dir_all(&custom_parent).unwrap();
+
+        let store = SkillStore::new(&db_path).unwrap();
+        store
+            .set_setting(
+                "custom_tools",
+                &serde_json::to_string(&vec![CustomToolDef {
+                    key: "missing_custom".to_string(),
+                    display_name: "Missing Custom".to_string(),
+                    skills_dir: missing_skills_root.to_string_lossy().to_string(),
+                    project_relative_skills_dir: None,
+                }])
+                .unwrap(),
+            )
+            .unwrap();
+
+        let targets = collect_watch_targets(&store);
+
+        assert!(!targets.contains(&custom_parent));
+        assert!(!targets.contains(&missing_skills_root));
+    }
 }