fix: align standalone storage dir fallbacks with plugin + resolve ORT_DYLIB_PATH in warmup

Three functions defaulted to ~/.cache/aft instead of the plugin's
~/.local/share/cortexkit/aft, causing standalone `aft warmup` to
write to a different path than the plugin. Fallback now mirrors
resolveCortexKitStorageRoot() from the TS plugin (XDG_DATA_HOME,
Windows LOCALAPPDATA/APPDATA, ~/.local/share/cortexkit/aft).

warmup.rs also never set ORT_DYLIB_PATH, so semantic index warmup
failed with dlopen('libonnxruntime.so'). Now resolves the cached
library from <storage_dir>/onnxruntime/1.24.4/ (and lib/ subdir)
if ORT_DYLIB_PATH is not already set.

Author: tobwen

crates/aft/src/bash_background/mod.rs

@@ -159,19 +159,37 @@ pub fn storage_dir(configured: Option<&std::path::Path>) -> PathBuf {
     if let Some(dir) = std::env::var_os("AFT_CACHE_DIR") {
         return PathBuf::from(dir).join("aft");
     }
-    // Fallback to the user's home directory. On Unix this is `$HOME`; on
-    // Windows `HOME` is typically unset, so fall back to `USERPROFILE`
-    // (which is always set in interactive sessions and in the env that
-    // OpenCode/Pi pass through to plugin processes). If both are missing
-    // (rare — embedded contexts, broken shells), fall back to a temp
+    // Fallback mirrors resolveCortexKitStorageRoot() from the TS plugin
+    // (packages/opencode-plugin/src/shared/storage-paths.ts).
+    if let Some(dir) = std::env::var_os("XDG_DATA_HOME") {
+        return PathBuf::from(dir).join("cortexkit").join("aft");
+    }
+    if cfg!(target_os = "windows") {
+        if let Some(dir) = std::env::var_os("LOCALAPPDATA")
+            .or_else(|| std::env::var_os("APPDATA"))
+        {
+            return PathBuf::from(dir).join("cortexkit").join("aft");
+        }
+    }
+    // On Unix `$HOME`; on Windows `HOME` is typically unset, so fall back to
+    // `USERPROFILE` (which is always set in interactive sessions and in the
+    // env that OpenCode/Pi pass through to plugin processes). If both are
+    // missing (rare — embedded contexts, broken shells), fall back to a temp
     // directory rather than `"."` — a relative path makes bg-bash wrapper
-    // commands like `move /Y .\.cache\aft\... ...` fail with "system
-    // cannot find the path specified" once the working directory shifts.
-    let home = std::env::var_os("HOME")
-        .or_else(|| std::env::var_os("USERPROFILE"))
-        .map(PathBuf::from)
-        .unwrap_or_else(std::env::temp_dir);
-    home.join(".cache").join("aft")
+    // commands like `move /Y .\.cache\aft\... ...` fail with "system cannot
+    // find the path specified" once the working directory shifts.
+    let home = if cfg!(target_os = "windows") {
+        std::env::var_os("USERPROFILE").or_else(|| std::env::var_os("HOME"))
+    } else {
+        std::env::var_os("HOME")
+    }
+    .map(PathBuf::from)
+    .unwrap_or_else(std::env::temp_dir);
+    if cfg!(target_os = "windows") {
+        home.join("AppData").join("Local").join("cortexkit").join("aft")
+    } else {
+        home.join(".local").join("share").join("cortexkit").join("aft")
+    }
 }
 
 pub fn repair_legacy_root_tasks(storage_root: &std::path::Path, harness: crate::harness::Harness) {

crates/aft/src/cli/warmup.rs

@@ -49,6 +49,12 @@ pub fn run(args: Vec<OsString>) -> Result<(), WarmupError> {
         );
     }
 
+    // Resolve ONNX Runtime from the plugin-managed cache so `aft warmup`
+    // can build the semantic index without the plugin setting ORT_DYLIB_PATH.
+    if args.areas.semantic {
+        try_set_ort_dylib_path(&storage_dir);
+    }
+
     let ctx = AppContext::new(Box::new(TreeSitterProvider::new()), Config::default());
     configure(&ctx, &root, &storage_dir, args.areas, args.force)?;
 
@@ -248,11 +254,50 @@ fn warmup_storage_dir() -> PathBuf {
     if let Some(value) = std::env::var_os("AFT_STORAGE_DIR") {
         return PathBuf::from(value);
     }
-    let home = std::env::var_os("HOME")
-        .or_else(|| std::env::var_os("USERPROFILE"))
-        .map(PathBuf::from)
-        .unwrap_or_else(std::env::temp_dir);
-    home.join(".cache").join("aft")
+    // Fallback mirrors resolveCortexKitStorageRoot() from the TS plugin.
+    if let Some(dir) = std::env::var_os("XDG_DATA_HOME") {
+        return PathBuf::from(dir).join("cortexkit").join("aft");
+    }
+    if cfg!(target_os = "windows") {
+        if let Some(dir) = std::env::var_os("LOCALAPPDATA")
+            .or_else(|| std::env::var_os("APPDATA"))
+        {
+            return PathBuf::from(dir).join("cortexkit").join("aft");
+        }
+    }
+    let home = if cfg!(target_os = "windows") {
+        std::env::var_os("USERPROFILE").or_else(|| std::env::var_os("HOME"))
+    } else {
+        std::env::var_os("HOME")
+    }
+    .map(PathBuf::from)
+    .unwrap_or_else(std::env::temp_dir);
+    if cfg!(target_os = "windows") {
+        home.join("AppData").join("Local").join("cortexkit").join("aft")
+    } else {
+        home.join(".local").join("share").join("cortexkit").join("aft")
+    }
+}
+
+/// Set `ORT_DYLIB_PATH` from a cached ONNX Runtime library if not already set.
+fn try_set_ort_dylib_path(storage_dir: &std::path::Path) {
+    if std::env::var_os("ORT_DYLIB_PATH").is_some() {
+        return;
+    }
+    let lib_name = if cfg!(target_os = "macos") {
+        "libonnxruntime.dylib"
+    } else if cfg!(target_os = "windows") {
+        "onnxruntime.dll"
+    } else {
+        "libonnxruntime.so"
+    };
+    let ort_dir = storage_dir.join("onnxruntime").join("1.24.4");
+    for candidate in [ort_dir.join(lib_name), ort_dir.join("lib").join(lib_name)] {
+        if candidate.is_file() {
+            std::env::set_var("ORT_DYLIB_PATH", &candidate);
+            break;
+        }
+    }
 }
 
 /// Build the `configure` params for a warmup run.
@@ -894,4 +939,33 @@ mod tests {
         assert_eq!(err.exit_code(), 2);
         assert!(err.to_string().contains("--only requires a value"));
     }
+
+    #[test]
+    fn try_set_ort_dylib_path_finds_cached_library() {
+        use std::sync::Mutex;
+        static LOCK: Mutex<()> = Mutex::new(());
+        let _guard = LOCK.lock().unwrap();
+        std::env::remove_var("ORT_DYLIB_PATH");
+
+        let temp = tempfile::tempdir().unwrap();
+        let lib_name = if cfg!(target_os = "macos") {
+            "libonnxruntime.dylib"
+        } else if cfg!(target_os = "windows") {
+            "onnxruntime.dll"
+        } else {
+            "libonnxruntime.so"
+        };
+        let ort_dir = temp.path().join("onnxruntime").join("1.24.4");
+        std::fs::create_dir_all(&ort_dir).unwrap();
+        let lib_path = ort_dir.join(lib_name);
+        std::fs::write(&lib_path, b"fake").unwrap();
+
+        try_set_ort_dylib_path(temp.path());
+
+        assert_eq!(
+            std::env::var_os("ORT_DYLIB_PATH"),
+            Some(lib_path.as_os_str().to_owned())
+        );
+        std::env::remove_var("ORT_DYLIB_PATH");
+    }
 }

crates/aft/src/search_index.rs

@@ -2811,15 +2811,42 @@ pub fn resolve_cache_dir(project_root: &Path, storage_dir: Option<&Path>) -> Pat
     if let Some(dir) = storage_dir {
         return dir.join("index").join(artifact_cache_key(project_root));
     }
-    // Fallback to ~/.cache/aft/ (legacy, for standalone binary usage).
-    // On Windows `HOME` is typically unset, so try `USERPROFILE` next.
+    // Fallback mirrors resolveCortexKitStorageRoot() from the TS plugin
+    // (packages/opencode-plugin/src/shared/storage-paths.ts).
+    if let Some(dir) = std::env::var_os("XDG_DATA_HOME") {
+        return PathBuf::from(dir)
+            .join("cortexkit")
+            .join("aft")
+            .join("index")
+            .join(artifact_cache_key(project_root));
+    }
+    if cfg!(target_os = "windows") {
+        if let Some(dir) = std::env::var_os("LOCALAPPDATA")
+            .or_else(|| std::env::var_os("APPDATA"))
+        {
+            return PathBuf::from(dir)
+                .join("cortexkit")
+                .join("aft")
+                .join("index")
+                .join(artifact_cache_key(project_root));
+        }
+    }
+    // On Windows prefer `USERPROFILE`; fall back to `HOME`.
     // If neither is set, fall back to a temp directory rather than `"."`
     // because the search-index code reads/writes absolute paths.
-    let home = std::env::var_os("HOME")
-        .or_else(|| std::env::var_os("USERPROFILE"))
-        .map(PathBuf::from)
-        .unwrap_or_else(std::env::temp_dir);
-    home.join(".cache")
+    let home = if cfg!(target_os = "windows") {
+        std::env::var_os("USERPROFILE").or_else(|| std::env::var_os("HOME"))
+    } else {
+        std::env::var_os("HOME")
+    }
+    .map(PathBuf::from)
+    .unwrap_or_else(std::env::temp_dir);
+    let root = if cfg!(target_os = "windows") {
+        home.join("AppData").join("Local")
+    } else {
+        home.join(".local").join("share")
+    };
+    root.join("cortexkit")
         .join("aft")
         .join("index")
         .join(artifact_cache_key(project_root))