Merge branch 'worktree-agent-a8539afe05ba22c1b' into codex/tracedecay-total-redesign-plan

Author: ScriptedAlchemy

crates/tracedecay-runtime-core/src/config.rs

@@ -212,11 +212,17 @@ pub fn is_generated_dir_segment(segment: &str) -> bool {
     GENERATED_DIR_SEGMENTS.contains(&segment)
 }
 
-#[cfg(any(test, feature = "test-helpers"))]
+// Deliberately unconditional (not gated behind `cfg(test)` /
+// `feature = "test-helpers"`): some non-test call sites — e.g. the root
+// crate's `src/sessions/session_temporal_benchmark.rs`, which backs
+// `cargo bench` and is always compiled as part of the lib — need this lock
+// outside a test build. The mutex and accessor are trivial and side-effect
+// free, so keeping them unconditional costs nothing while guaranteeing every
+// consumer, test or not, serializes on the same lock.
 static USER_DATA_DIR_TEST_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
 
-/// Serializes tests that mutate process-wide profile discovery variables.
-#[cfg(any(test, feature = "test-helpers"))]
+/// Serializes tests (and benchmark harnesses) that mutate process-wide
+/// profile discovery variables.
 pub fn lock_user_data_dir_test_env() -> std::sync::MutexGuard<'static, ()> {
     USER_DATA_DIR_TEST_LOCK
         .lock()

src/config.rs

@@ -2207,81 +2207,22 @@ fn any_pattern_matches(patterns: &[String], candidates: &[&str]) -> bool {
 
 /// Serializes test and benchmark code that mutates process-wide storage env
 /// vars (`TRACEDECAY_DATA_DIR` and related HOME/profile pins).
-static USER_DATA_DIR_TEST_LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
-
-/// Acquires [`USER_DATA_DIR_TEST_LOCK`], recovering even when poisoned.
-pub(crate) fn lock_user_data_dir_test_env() -> std::sync::MutexGuard<'static, ()> {
-    USER_DATA_DIR_TEST_LOCK
-        .lock()
-        .unwrap_or_else(std::sync::PoisonError::into_inner)
-}
+///
+/// Single source of truth: [`tracedecay_runtime_core::config`] owns the lock,
+/// [`lock_user_data_dir_test_env`], and `PinnedUserDataDir`; this module only
+/// re-exports them so every historical `crate::config::…` call site keeps
+/// resolving. The lock and its accessor are unconditional there (not gated
+/// behind `cfg(test)` / `feature = "test-helpers"`) because non-test code —
+/// `src/sessions/session_temporal_benchmark.rs`, which is always compiled and
+/// backs `cargo bench` — takes this lock outside a test build.
+pub(crate) use tracedecay_runtime_core::config::lock_user_data_dir_test_env;
 
 /// Pins [`USER_DATA_DIR_ENV`] and agent home discovery to an isolated temp
-/// profile while holding [`USER_DATA_DIR_TEST_LOCK`], so parallel lib tests
-/// cannot race profile resolution or scan live host transcripts during
+/// profile while holding the shared user-data-dir test lock, so parallel lib
+/// tests cannot race profile resolution or scan live host transcripts during
 /// `TraceDecay::init` / indexing.
 #[cfg(test)]
-pub struct PinnedUserDataDir {
-    _lock: std::sync::MutexGuard<'static, ()>,
-    _root: tempfile::TempDir,
-    previous: Option<OsString>,
-    previous_home: Option<OsString>,
-    previous_userprofile: Option<OsString>,
-}
-
-#[cfg(test)]
-impl PinnedUserDataDir {
-    pub fn new() -> Self {
-        let lock = lock_user_data_dir_test_env();
-        let root = tempfile::TempDir::new()
-            .unwrap_or_else(|err| panic!("failed to create temp profile dir: {err}"));
-        let profile = root.path().join(TRACEDECAY_DIR);
-        crate::storage::PrivateStoreIo::create_dir_all(&profile)
-            .unwrap_or_else(|err| panic!("failed to create isolated profile root: {err}"));
-        let previous = std::env::var_os(USER_DATA_DIR_ENV);
-        let previous_home = std::env::var_os("HOME");
-        let previous_userprofile = std::env::var_os("USERPROFILE");
-        unsafe {
-            std::env::set_var(USER_DATA_DIR_ENV, &profile);
-            std::env::set_var("HOME", root.path());
-            std::env::set_var("USERPROFILE", root.path());
-        }
-        Self {
-            _lock: lock,
-            _root: root,
-            previous,
-            previous_home,
-            previous_userprofile,
-        }
-    }
-}
-
-#[cfg(test)]
-impl Default for PinnedUserDataDir {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-#[cfg(test)]
-impl Drop for PinnedUserDataDir {
-    fn drop(&mut self) {
-        unsafe {
-            match self.previous.take() {
-                Some(previous) => std::env::set_var(USER_DATA_DIR_ENV, previous),
-                None => std::env::remove_var(USER_DATA_DIR_ENV),
-            }
-            match self.previous_home.take() {
-                Some(previous) => std::env::set_var("HOME", previous),
-                None => std::env::remove_var("HOME"),
-            }
-            match self.previous_userprofile.take() {
-                Some(previous) => std::env::set_var("USERPROFILE", previous),
-                None => std::env::remove_var("USERPROFILE"),
-            }
-        }
-    }
-}
+pub(crate) use tracedecay_runtime_core::config::PinnedUserDataDir;
 
 #[cfg(test)]
 #[allow(clippy::unwrap_used, clippy::expect_used)]