Use flow-state for runtime files when config dir is not a directory

Author: nikivdev

src/config.rs

@@ -798,6 +798,26 @@ pub fn ensure_global_config_dir() -> Result<PathBuf> {
     Ok(dir)
 }
 
+/// Global state directory for runtime data.
+pub fn global_state_dir() -> PathBuf {
+    let config_dir = global_config_dir();
+    if is_dir_path(&config_dir) {
+        return config_dir;
+    }
+
+    config_dir.with_file_name("flow-state")
+}
+
+/// Ensure the global state directory exists.
+pub fn ensure_global_state_dir() -> Result<PathBuf> {
+    let dir = global_state_dir();
+    if let Some(parent) = dir.parent() {
+        ensure_dir(parent)?;
+    }
+    ensure_dir(&dir)?;
+    Ok(dir)
+}
+
 fn ensure_dir(path: &Path) -> Result<()> {
     if let Ok(meta) = fs::symlink_metadata(path) {
         let is_dir = meta.is_dir();
@@ -833,6 +853,20 @@ fn ensure_dir(path: &Path) -> Result<()> {
     Ok(())
 }
 
+fn is_dir_path(path: &Path) -> bool {
+    if let Ok(meta) = fs::symlink_metadata(path) {
+        if meta.is_dir() {
+            return true;
+        }
+        if meta.file_type().is_symlink() {
+            if let Ok(target_meta) = fs::metadata(path) {
+                return target_meta.is_dir();
+            }
+        }
+    }
+    false
+}
+
 fn backup_path(path: &Path) -> PathBuf {
     let name = path
         .file_name()

src/history.rs

@@ -59,7 +59,7 @@ impl InvocationRecord {
 
 pub fn record(invocation: InvocationRecord) -> Result<()> {
     let path = history_path();
-    let _ = config::ensure_global_config_dir()
+    let _ = config::ensure_global_state_dir()
         .with_context(|| format!("failed to create history dir {}", path.display()))?;
 
     let mut file = OpenOptions::new()
@@ -194,12 +194,7 @@ pub fn load_last_record_for_project(project_root: &Path) -> Result<Option<Invoca
 }
 
 fn history_path() -> PathBuf {
-    std::env::var_os("HOME")
-        .map(PathBuf::from)
-        .unwrap_or_else(|| PathBuf::from("."))
-        .join(".config")
-        .join("flow")
-        .join("history.jsonl")
+    config::global_state_dir().join("history.jsonl")
 }
 
 fn now_ms() -> u128 {

src/running.rs

@@ -42,10 +42,7 @@ pub struct RunningProcesses {
 
 /// Returns ~/.config/flow/running.json
 pub fn running_processes_path() -> PathBuf {
-    std::env::var_os("HOME")
-        .map(PathBuf::from)
-        .unwrap_or_else(|| PathBuf::from("."))
-        .join(".config/flow/running.json")
+    crate::config::global_state_dir().join("running.json")
 }
 
 /// Load running processes, validating that PIDs are still alive
@@ -81,7 +78,7 @@ pub fn load_running_processes() -> Result<RunningProcesses> {
 /// Atomically save running processes (write to temp, then rename)
 pub fn save_running_processes(processes: &RunningProcesses) -> Result<()> {
     let path = running_processes_path();
-    let _ = crate::config::ensure_global_config_dir()
+    let _ = crate::config::ensure_global_state_dir()
         .with_context(|| format!("failed to create {}", path.display()))?;
 
     let temp_path = path.with_extension("json.tmp");