Extract shared mutation-scope locking

cli/src/services/hooks/codex_mutation_scope/lifecycle.rs

@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 
 use crate::services::hooks;
 use crate::services::hooks::codex::bash_policy::{
@@ -12,7 +12,6 @@ use crate::services::hooks::{
 use crate::services::mutation_trace::runtime::resolve_git_dir;
 use crate::services::observability::traits::Logger;
 
-use super::boundary_lock::{AdapterBoundaryLock, DEFAULT_BOUNDARY_LOCK_TIMEOUT};
 use super::events::CODEX_TRACKED_TOOL_BASH;
 use super::state;
 use super::{
@@ -250,8 +249,7 @@ pub(super) fn with_boundary_lock<T>(
     git_dir: &Path,
     operation: impl FnOnce() -> Result<T>,
 ) -> Result<T> {
-    let _boundary = AdapterBoundaryLock::acquire(git_dir, DEFAULT_BOUNDARY_LOCK_TIMEOUT)
-        .map_err(|error| anyhow!("Failed to acquire adapter boundary lock: {error}"))?;
+    let _boundary = state::BOUNDARY_LOCK.acquire(&state::adapter_state_dir(git_dir))?;
     operation()
 }
 

cli/src/services/hooks/codex_mutation_scope/mod.rs

@@ -1,10 +1,8 @@
 #![allow(dead_code)]
 
-mod boundary_lock;
 mod events;
 pub(crate) mod health;
 mod lifecycle;
-mod os_lock;
 mod payload;
 pub(crate) mod state;