@lix-js/sdk 0.6.0-preview.4 → 0.6.0-preview.5

package/dist-engine-src/src/session/context.rs

@@ -1,70 +1,76 @@
 use std::future::Future;
 use std::pin::Pin;
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 
 use serde_json::Value as JsonValue;
 
 use crate::binary_cas::{BinaryCasContext, BlobDataReader};
+use crate::branch::{
+    BranchContext, BranchLifecycle, BranchOperation, BranchRefReader, BranchReferenceRole,
+};
 use crate::catalog::CatalogContext;
 use crate::commit_graph::{CommitGraphContext, CommitGraphReader};
-use crate::commit_store::CommitStoreContext;
-use crate::entity_identity::EntityIdentity;
+use crate::entity_pk::EntityPk;
 use crate::functions::FunctionProviderHandle;
 use crate::json_store::JsonStoreContext;
 use crate::live_state::{LiveStateContext, LiveStateReader, LiveStateRowRequest};
-use crate::sql2::{CommitStoreQuerySource, SqlCommitStoreQuerySource, SqlExecutionContext};
+use crate::sql2::{
+    ChangelogQuerySource, HistoryQuerySource, SqlChangelogQuerySource, SqlExecutionContext,
+    SqlHistoryQuerySource,
+};
 use crate::storage::{
-    ScopedStorageReader, StorageContext, StorageReadScope, StorageReadTransaction, StorageReader,
+    DurableWriteGuard, DurableWriteLock, InMemoryStorageBackend, StorageBackend, StorageReadOptions,
 };
+use crate::storage::{StorageContext, StorageRead, StorageReadScope};
 use crate::tracked_state::TrackedStateContext;
 use crate::transaction::{open_transaction, Transaction};
-use crate::version::{
-    VersionContext, VersionLifecycle, VersionOperation, VersionRefReader, VersionReferenceRole,
-};
-use crate::GLOBAL_VERSION_ID;
+use crate::GLOBAL_BRANCH_ID;
 use crate::{LixError, NullableKeyFilter};
 
-use super::transaction::transaction_state_error;
+use super::transaction::{SessionOperationGuard, SessionTransactionManager, SessionWriteLease};
 
-pub(crate) const WORKSPACE_VERSION_KEY: &str = "lix_workspace_version_id";
+pub(crate) const WORKSPACE_BRANCH_KEY: &str = "lix_workspace_branch_id";
 
 #[derive(Clone)]
 pub(crate) enum SessionMode {
-    Pinned { version_id: String },
+    Pinned { branch_id: String },
     Workspace,
 }
 
 /// Session-context state for engine execution.
 ///
-/// A session context pins the active version selector and shared execution
+/// A session context pins the active branch selector and shared execution
 /// services. Parent-handle `execute(...)` runs as an implicit single-statement
 /// transaction. Explicit transactions hold the session execution lease until
 /// commit or rollback, so all SQL during that window must run through the
 /// transaction handle.
 #[derive(Clone)]
-pub struct SessionContext {
+pub struct SessionContext<B: StorageBackend = InMemoryStorageBackend> {
     pub(super) mode: SessionMode,
-    pub(super) storage: StorageContext,
+    pub(super) storage: StorageContext<B>,
     pub(super) live_state: Arc<LiveStateContext>,
     pub(super) tracked_state: Arc<TrackedStateContext>,
     pub(super) binary_cas: Arc<BinaryCasContext>,
-    pub(super) commit_store: Arc<CommitStoreContext>,
-    pub(super) version_ctx: Arc<VersionContext>,
+    pub(super) branch_ctx: Arc<BranchContext>,
     pub(super) catalog_context: Arc<CatalogContext>,
-    closed: Arc<AtomicBool>,
-    active_transaction: Arc<AtomicBool>,
+    pub(super) write_lock: DurableWriteLock,
+    transaction_manager: SessionTransactionManager,
 }
 
-impl SessionContext {
+impl<B> SessionContext<B>
+where
+    B: StorageBackend + Clone + Send + Sync + 'static,
+    for<'backend> B::Read<'backend>: Clone + Send + Sync + 'static,
+    for<'backend> B::Write<'backend>: Send,
+{
     pub(crate) async fn open_workspace(
-        storage: StorageContext,
+        storage: StorageContext<B>,
         live_state: Arc<LiveStateContext>,
         tracked_state: Arc<TrackedStateContext>,
         binary_cas: Arc<BinaryCasContext>,
-        commit_store: Arc<CommitStoreContext>,
-        version_ctx: Arc<VersionContext>,
+        branch_ctx: Arc<BranchContext>,
         catalog_context: Arc<CatalogContext>,
+        write_lock: DurableWriteLock,
     ) -> Result<Self, LixError> {
         let session = Self::new(
             SessionMode::Workspace,
@@ -72,73 +78,71 @@ impl SessionContext {
             live_state,
             tracked_state,
             binary_cas,
-            commit_store,
-            version_ctx,
+            branch_ctx,
             catalog_context,
+            write_lock,
         );
-        session.active_version_id().await?;
+        session.active_branch_id().await?;
         Ok(session)
     }
 
     pub(crate) async fn open(
-        active_version_id: String,
-        storage: StorageContext,
+        active_branch_id: String,
+        storage: StorageContext<B>,
         live_state: Arc<LiveStateContext>,
         tracked_state: Arc<TrackedStateContext>,
         binary_cas: Arc<BinaryCasContext>,
-        commit_store: Arc<CommitStoreContext>,
-        version_ctx: Arc<VersionContext>,
+        branch_ctx: Arc<BranchContext>,
         catalog_context: Arc<CatalogContext>,
+        write_lock: DurableWriteLock,
     ) -> Result<Self, LixError> {
         Ok(Self::new(
             SessionMode::Pinned {
-                version_id: active_version_id,
+                branch_id: active_branch_id,
             },
             storage,
             live_state,
             tracked_state,
             binary_cas,
-            commit_store,
-            version_ctx,
+            branch_ctx,
             catalog_context,
+            write_lock,
         ))
     }
 
     pub(super) fn new(
         mode: SessionMode,
-        storage: StorageContext,
+        storage: StorageContext<B>,
         live_state: Arc<LiveStateContext>,
         tracked_state: Arc<TrackedStateContext>,
         binary_cas: Arc<BinaryCasContext>,
-        commit_store: Arc<CommitStoreContext>,
-        version_ctx: Arc<VersionContext>,
+        branch_ctx: Arc<BranchContext>,
         catalog_context: Arc<CatalogContext>,
+        write_lock: DurableWriteLock,
     ) -> Self {
-        Self::new_with_closed(
+        Self::new_with_transaction_manager(
             mode,
             storage,
             live_state,
             tracked_state,
             binary_cas,
-            commit_store,
-            version_ctx,
+            branch_ctx,
             catalog_context,
-            Arc::new(AtomicBool::new(false)),
-            Arc::new(AtomicBool::new(false)),
+            write_lock,
+            SessionTransactionManager::new(),
         )
     }
 
-    pub(super) fn new_with_closed(
+    pub(super) fn new_with_transaction_manager(
         mode: SessionMode,
-        storage: StorageContext,
+        storage: StorageContext<B>,
         live_state: Arc<LiveStateContext>,
         tracked_state: Arc<TrackedStateContext>,
         binary_cas: Arc<BinaryCasContext>,
-        commit_store: Arc<CommitStoreContext>,
-        version_ctx: Arc<VersionContext>,
+        branch_ctx: Arc<BranchContext>,
         catalog_context: Arc<CatalogContext>,
-        closed: Arc<AtomicBool>,
-        active_transaction: Arc<AtomicBool>,
+        write_lock: DurableWriteLock,
+        transaction_manager: SessionTransactionManager,
     ) -> Self {
         Self {
             mode,
@@ -146,152 +150,194 @@ impl SessionContext {
             live_state,
             tracked_state,
             binary_cas,
-            commit_store,
-            version_ctx,
+            branch_ctx,
             catalog_context,
-            closed,
-            active_transaction,
+            write_lock,
+            transaction_manager,
         }
     }
 
     /// Releases this logical session handle. This is a lifecycle boundary only:
     /// successful writes are committed before their operation returns.
     pub async fn close(&self) -> Result<(), LixError> {
-        self.closed.store(true, Ordering::SeqCst);
-        Ok(())
+        self.transaction_manager.close().await
     }
 
     pub fn is_closed(&self) -> bool {
-        self.closed.load(Ordering::SeqCst)
+        self.transaction_manager.is_closed()
+    }
+
+    #[cfg(test)]
+    pub(crate) fn operation_in_progress_count_for_test(&self) -> usize {
+        self.transaction_manager.operation_count_for_test()
+    }
+
+    #[cfg(test)]
+    pub(crate) fn commit_in_progress_for_test(&self) -> bool {
+        self.transaction_manager.commit_in_progress_for_test()
     }
 
-    pub(crate) fn closed_flag(&self) -> Arc<AtomicBool> {
-        Arc::clone(&self.closed)
+    #[cfg(test)]
+    pub(crate) fn active_transaction_for_test(&self) -> bool {
+        self.transaction_manager.active_transaction_for_test()
     }
 
-    pub(crate) fn active_transaction_flag(&self) -> Arc<AtomicBool> {
-        Arc::clone(&self.active_transaction)
+    pub(super) fn transaction_manager(&self) -> SessionTransactionManager {
+        self.transaction_manager.clone()
     }
 
     pub(crate) fn ensure_open(&self) -> Result<(), LixError> {
-        if self.is_closed() {
-            return Err(closed_error());
-        }
-        Ok(())
+        self.transaction_manager.ensure_open()
+    }
+
+    pub(super) fn begin_session_operation(&self) -> Result<SessionOperationGuard, LixError> {
+        self.transaction_manager.begin_session_operation()
+    }
+
+    pub(super) fn begin_session_write_lease(&self) -> Result<SessionWriteLease, LixError> {
+        self.transaction_manager.begin_write_lease()
+    }
+
+    pub(super) fn begin_explicit_session_write_lease(&self) -> Result<SessionWriteLease, LixError> {
+        self.transaction_manager.begin_explicit_write_lease()
+    }
+
+    pub(super) async fn begin_session_write_access(&self) -> Result<SessionWriteAccess, LixError> {
+        let write_lease = self.begin_session_write_lease()?;
+        self.begin_session_write_access_with_lease(write_lease)
+            .await
+    }
+
+    pub(super) async fn begin_explicit_session_write_access(
+        &self,
+    ) -> Result<SessionWriteAccess, LixError> {
+        let write_lease = self.begin_explicit_session_write_lease()?;
+        self.begin_session_write_access_with_lease(write_lease)
+            .await
+    }
+
+    async fn begin_session_write_access_with_lease(
+        &self,
+        write_lease: SessionWriteLease,
+    ) -> Result<SessionWriteAccess, LixError> {
+        let write_guard = self.write_lock.lock_owned().await;
+        let write_access = SessionWriteAccess {
+            _write_lease: write_lease,
+            _write_guard: write_guard,
+        };
+        self.ensure_open()?;
+        Ok(write_access)
     }
 
-    /// Resolves the version this session should operate on right now.
+    /// Resolves the branch this session should operate on right now.
     ///
-    /// This is a read-path helper. Write flows must resolve the active version
+    /// This is a read-path helper. Write flows must resolve the active branch
     /// through the transaction capability so the read is scoped to the
     /// same backend transaction as the writes it influences.
     ///
-    /// Pinned sessions are pure in-memory views over one version. Workspace
+    /// Pinned sessions are pure in-memory views over one branch. Workspace
     /// sessions read the shared workspace selector from untracked global
     /// `lix_key_value` state so multiple open app sessions can observe the same
-    /// active workspace version.
-    pub async fn active_version_id(&self) -> Result<String, LixError> {
-        let mut transaction = self.storage.begin_read_transaction().await?;
-        let result = self
-            .active_version_id_from_reader(transaction.as_mut())
-            .await;
+    /// active workspace branch.
+    pub async fn active_branch_id(&self) -> Result<String, LixError> {
+        let _operation_guard = self.begin_session_operation()?;
+        let transaction = self.storage.begin_read(StorageReadOptions::default())?;
+        let result = self.active_branch_id_from_reader(&transaction).await;
         match result {
-            Ok(version_id) => {
-                transaction.rollback().await?;
-                Ok(version_id)
-            }
-            Err(error) => {
-                let _ = transaction.rollback().await;
-                Err(error)
-            }
+            Ok(branch_id) => Ok(branch_id),
+            Err(error) => Err(error),
         }
     }
 
-    pub(super) async fn active_version_id_from_reader<S>(
+    pub(super) async fn active_branch_id_from_reader<S>(
         &self,
-        reader: &mut S,
+        reader: &S,
     ) -> Result<String, LixError>
     where
-        S: StorageReader + ?Sized,
+        S: StorageRead + Send + Sync + ?Sized,
     {
         self.ensure_open()?;
         match &self.mode {
-            SessionMode::Pinned { version_id } => Ok(version_id.clone()),
-            SessionMode::Workspace => self.load_workspace_version_id(reader).await,
+            SessionMode::Pinned { branch_id } => Ok(branch_id.clone()),
+            SessionMode::Workspace => self.load_workspace_branch_id(reader).await,
         }
     }
 
-    async fn load_workspace_version_id<S>(&self, reader: &mut S) -> Result<String, LixError>
+    async fn load_workspace_branch_id<S>(&self, reader: &S) -> Result<String, LixError>
     where
-        S: StorageReader + ?Sized,
+        S: StorageRead + Send + Sync + ?Sized,
     {
         let row = self
             .live_state
-            .reader(&mut *reader)
+            .reader(reader)
             .load_row(&LiveStateRowRequest {
                 schema_key: "lix_key_value".to_string(),
-                version_id: GLOBAL_VERSION_ID.to_string(),
-                entity_id: EntityIdentity::single(WORKSPACE_VERSION_KEY),
+                branch_id: GLOBAL_BRANCH_ID.to_string(),
+                entity_pk: EntityPk::single(WORKSPACE_BRANCH_KEY),
                 file_id: NullableKeyFilter::Null,
             })
             .await?
             .ok_or_else(|| {
                 LixError::new(
                     "LIX_ERROR_UNKNOWN",
-                    "workspace version selector is missing lix_key_value:lix_workspace_version_id",
+                    "workspace branch selector is missing lix_key_value:lix_workspace_branch_id",
                 )
             })?;
         let snapshot_content = row.snapshot_content.as_deref().ok_or_else(|| {
             LixError::new(
                 "LIX_ERROR_UNKNOWN",
-                "workspace version selector is missing snapshot_content",
+                "workspace branch selector is missing snapshot_content",
             )
         })?;
         let snapshot = serde_json::from_str::<JsonValue>(snapshot_content).map_err(|error| {
             LixError::new(
                 "LIX_ERROR_UNKNOWN",
-                format!("workspace version selector snapshot is invalid JSON: {error}"),
+                format!("workspace branch selector snapshot is invalid JSON: {error}"),
             )
         })?;
-        let version_id = snapshot
+        let branch_id = snapshot
             .get("value")
             .and_then(JsonValue::as_str)
             .filter(|value| !value.is_empty())
             .ok_or_else(|| {
                 LixError::new(
                     "LIX_ERROR_UNKNOWN",
-                    "workspace version selector value must be a non-empty string",
+                    "workspace branch selector value must be a non-empty string",
                 )
             })?
             .to_string();
 
-        let version_ref = self.version_ctx.ref_reader(&mut *reader);
-        VersionLifecycle::new(&version_ref)
+        let branch_ref = self.branch_ctx.ref_reader(reader);
+        BranchLifecycle::new(&branch_ref)
             .require_existing_ref(
-                &version_id,
-                VersionOperation::LoadWorkspaceSelector,
-                VersionReferenceRole::WorkspaceSelector,
+                &branch_id,
+                BranchOperation::LoadWorkspaceSelector,
+                BranchReferenceRole::WorkspaceSelector,
             )
             .await?;
 
-        Ok(version_id)
+        Ok(branch_id)
     }
 
     pub(crate) async fn with_write_transaction<T, F>(&self, f: F) -> Result<T, LixError>
     where
         F: for<'tx> FnOnce(
-            &'tx mut Transaction,
+            &'tx mut Transaction<B>,
         ) -> Pin<Box<dyn Future<Output = Result<T, LixError>> + 'tx>>,
     {
         self.ensure_open()?;
-        let _transaction_guard = self.reserve_session_transaction()?;
-        self.with_write_transaction_reserved(f).await
+        let write_access = self.begin_session_write_access().await?;
+        self.with_write_transaction_reserved(write_access, f).await
     }
 
-    pub(crate) async fn with_write_transaction_reserved<T, F>(&self, f: F) -> Result<T, LixError>
+    pub(super) async fn with_write_transaction_reserved<T, F>(
+        &self,
+        _write_access: SessionWriteAccess,
+        f: F,
+    ) -> Result<T, LixError>
     where
         F: for<'tx> FnOnce(
-            &'tx mut Transaction,
+            &'tx mut Transaction<B>,
         ) -> Pin<Box<dyn Future<Output = Result<T, LixError>> + 'tx>>,
     {
         let opened = open_transaction(
@@ -300,85 +346,85 @@ impl SessionContext {
             Arc::clone(&self.live_state),
             Arc::clone(&self.tracked_state),
             Arc::clone(&self.binary_cas),
-            Arc::clone(&self.commit_store),
-            Arc::clone(&self.version_ctx),
+            Arc::clone(&self.branch_ctx),
             Arc::clone(&self.catalog_context),
         )
         .await?;
+        self.ensure_open()?;
         let mut transaction = opened.transaction;
+        transaction.attach_commit_boundary(self.transaction_commit_boundary());
         let runtime_functions = opened.runtime_functions;
 
         match f(&mut transaction).await {
             Ok(value) => {
+                self.ensure_open()?;
                 transaction.commit(&runtime_functions).await?;
                 Ok(value)
             }
-            Err(error) => {
-                let _ = transaction.rollback().await;
-                Err(error)
-            }
+            Err(error) => Err(error),
         }
     }
 
-    pub(super) fn reserve_session_transaction(&self) -> Result<SessionTransactionGuard, LixError> {
-        let active_transaction = self.active_transaction_flag();
-        if active_transaction
-            .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst)
-            .is_err()
-        {
-            return Err(transaction_state_error(
-                "Lix handle has an active transaction; use the transaction handle for reads and writes until it is committed or rolled back",
-            ));
-        }
-        Ok(SessionTransactionGuard { active_transaction })
+    #[cfg(test)]
+    pub(super) fn begin_commit(&self) -> crate::transaction::CommitBoundaryGuard {
+        self.transaction_manager.begin_commit()
     }
-}
 
-fn closed_error() -> LixError {
-    LixError::new(LixError::CODE_CLOSED, "Lix handle is closed")
-        .with_hint("Open a new Lix handle before calling this method.")
+    pub(super) fn transaction_commit_boundary(
+        &self,
+    ) -> crate::transaction::TransactionCommitBoundary {
+        self.transaction_manager.transaction_commit_boundary()
+    }
 }
 
-pub(super) struct SessionTransactionGuard {
-    active_transaction: Arc<AtomicBool>,
+pub(super) struct SessionWriteAccess {
+    _write_guard: DurableWriteGuard,
+    _write_lease: SessionWriteLease,
 }
 
-impl Drop for SessionTransactionGuard {
-    fn drop(&mut self) {
-        self.active_transaction.store(false, Ordering::SeqCst);
-    }
+pub(super) fn closed_error() -> LixError {
+    LixError::new(LixError::CODE_CLOSED, "Lix handle is closed")
+        .with_hint("Open a new Lix handle before calling this method.")
 }
 
 /// Read-only SQL execution context derived from a session.
 ///
 /// Write statements re-plan against `Transaction`; this context intentionally
 /// has no write stager.
-pub(super) struct SessionSqlExecutionContext<'a> {
-    pub(super) active_version_id: &'a str,
-    pub(super) read_store:
-        ScopedStorageReader<Box<dyn StorageReadTransaction + Send + Sync + 'static>>,
+pub(super) struct SessionSqlExecutionContext<'a, R> {
+    pub(super) active_branch_id: &'a str,
+    pub(super) read_store: StorageReadScope<R>,
     pub(super) live_state: Arc<LiveStateContext>,
     pub(super) binary_cas: Arc<BinaryCasContext>,
-    pub(super) commit_store: Arc<CommitStoreContext>,
-    pub(super) version_ctx: Arc<VersionContext>,
+    pub(super) branch_ctx: Arc<BranchContext>,
     pub(super) visible_schemas: Vec<JsonValue>,
     pub(super) functions: FunctionProviderHandle,
 }
 
-impl SqlExecutionContext for SessionSqlExecutionContext<'_> {
-    fn active_version_id(&self) -> &str {
-        self.active_version_id
+impl<R> SqlExecutionContext for SessionSqlExecutionContext<'_, R>
+where
+    R: crate::storage::StorageBackendRead + Clone + Send + Sync + 'static,
+{
+    type ReadStore = StorageReadScope<R>;
+
+    fn active_branch_id(&self) -> &str {
+        self.active_branch_id
     }
 
     fn live_state(&self) -> Arc<dyn LiveStateReader> {
         Arc::new(self.live_state.reader(self.read_store.clone())) as Arc<dyn LiveStateReader>
     }
 
-    fn commit_store_query_source(&self) -> SqlCommitStoreQuerySource {
-        let read_scope = StorageReadScope::new(self.read_store.clone());
-        CommitStoreQuerySource {
-            commit_store_reader: Arc::new(self.commit_store.reader(read_scope.store())),
-            json_reader: JsonStoreContext::new().reader(read_scope.store()),
+    fn history_query_source(&self) -> SqlHistoryQuerySource<Self::ReadStore> {
+        HistoryQuerySource {
+            json_reader: JsonStoreContext::new().reader(self.read_store.store()),
+        }
+    }
+
+    fn changelog_query_source(&self) -> SqlChangelogQuerySource<Self::ReadStore> {
+        ChangelogQuerySource {
+            store: self.read_store.clone(),
+            json_reader: JsonStoreContext::new().reader(self.read_store.store()),
         }
     }
 
@@ -386,8 +432,8 @@ impl SqlExecutionContext for SessionSqlExecutionContext<'_> {
         Box::new(CommitGraphContext::new().reader(self.read_store.clone()))
     }
 
-    fn version_ref(&self) -> Arc<dyn VersionRefReader> {
-        Arc::new(self.version_ctx.ref_reader(self.read_store.clone()))
+    fn branch_ref(&self) -> Arc<dyn BranchRefReader> {
+        Arc::new(self.branch_ctx.ref_reader(self.read_store.clone()))
     }
 
     fn functions(&self) -> FunctionProviderHandle {
@@ -402,3 +448,612 @@ impl SqlExecutionContext for SessionSqlExecutionContext<'_> {
         Ok(self.visible_schemas.clone())
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::future::Future;
+    use std::pin::Pin;
+    use std::sync::Condvar;
+    use std::sync::Mutex;
+    use std::task::{Context, Poll};
+    use std::thread;
+    use std::time::{Duration, Instant};
+
+    use crate::backend::{
+        Backend, BackendCapabilities, BackendError, DurableWriteLock, InMemoryBackend,
+        InMemoryRead, InMemoryWrite, ReadOptions, WriteOptions,
+    };
+    use crate::Engine;
+    use futures_util::task::noop_waker_ref;
+
+    const TEST_WAIT_TIMEOUT: Duration = Duration::from_secs(2);
+
+    fn wait_until(description: &str, mut condition: impl FnMut() -> bool) {
+        let deadline = Instant::now() + TEST_WAIT_TIMEOUT;
+        while !condition() {
+            assert!(
+                Instant::now() < deadline,
+                "timed out waiting for {description}"
+            );
+            thread::yield_now();
+        }
+    }
+
+    fn assert_close_pending<F>(mut future: Pin<&mut F>)
+    where
+        F: Future<Output = Result<(), crate::LixError>>,
+    {
+        let mut cx = Context::from_waker(noop_waker_ref());
+        assert!(
+            matches!(future.as_mut().poll(&mut cx), Poll::Pending),
+            "close should remain pending while guarded work is in progress"
+        );
+    }
+
+    async fn assert_close_finishes<F>(future: Pin<&mut F>, description: &str)
+    where
+        F: Future<Output = Result<(), crate::LixError>>,
+    {
+        tokio::time::timeout(TEST_WAIT_TIMEOUT, future)
+            .await
+            .unwrap_or_else(|_| panic!("timed out waiting for {description}"))
+            .unwrap_or_else(|error| panic!("{description} failed: {error:?}"));
+    }
+
+    fn join_thread<T>(handle: thread::JoinHandle<T>, description: &str) -> T {
+        wait_until(description, || handle.is_finished());
+        match handle.join() {
+            Ok(result) => result,
+            Err(_) => panic!("{description} panicked"),
+        }
+    }
+
+    async fn open_session() -> std::sync::Arc<super::SessionContext<InMemoryBackend>> {
+        let backend = InMemoryBackend::default();
+        let _receipt = Engine::initialize(backend.clone())
+            .await
+            .expect("backend should initialize");
+        let engine = Engine::new(backend)
+            .await
+            .expect("initialized backend should create engine");
+        std::sync::Arc::new(
+            engine
+                .open_workspace_session()
+                .await
+                .expect("workspace session should open"),
+        )
+    }
+
+    async fn open_blocking_read_session() -> (
+        std::sync::Arc<super::SessionContext<BlockingBeginReadBackend>>,
+        BlockingGate,
+    ) {
+        let backend = BlockingBeginReadBackend::new();
+        let gate = backend.gate();
+        let _receipt = Engine::initialize(backend.clone())
+            .await
+            .expect("backend should initialize");
+        let engine = Engine::new(backend)
+            .await
+            .expect("initialized backend should create engine");
+        (
+            std::sync::Arc::new(
+                engine
+                    .open_workspace_session()
+                    .await
+                    .expect("workspace session should open"),
+            ),
+            gate,
+        )
+    }
+
+    async fn open_blocking_write_session() -> (
+        std::sync::Arc<super::SessionContext<BlockingBeginWriteBackend>>,
+        BlockingGate,
+    ) {
+        let backend = BlockingBeginWriteBackend::new();
+        let gate = backend.gate();
+        let _receipt = Engine::initialize(backend.clone())
+            .await
+            .expect("backend should initialize");
+        let engine = Engine::new(backend)
+            .await
+            .expect("initialized backend should create engine");
+        (
+            std::sync::Arc::new(
+                engine
+                    .open_workspace_session()
+                    .await
+                    .expect("workspace session should open"),
+            ),
+            gate,
+        )
+    }
+
+    #[tokio::test]
+    async fn close_waits_for_session_operation_guard_to_drop() {
+        let session = open_session().await;
+        let guard = session
+            .begin_session_operation()
+            .expect("session operation should begin");
+        let mut close = Box::pin(session.close());
+        assert_close_pending(close.as_mut());
+
+        drop(guard);
+        assert_close_finishes(close.as_mut(), "close after operation guard drops").await;
+    }
+
+    #[tokio::test]
+    async fn close_waits_for_commit_guard_to_drop() {
+        let session = open_session().await;
+        let guard = session.begin_commit();
+        let mut close = Box::pin(session.close());
+        assert_close_pending(close.as_mut());
+
+        drop(guard);
+        assert_close_finishes(close.as_mut(), "close after commit guard drops").await;
+    }
+
+    #[tokio::test]
+    async fn session_read_execute_holds_operation_guard() {
+        let session = open_session().await;
+        let result = session
+            .execute("SELECT 1", &[])
+            .await
+            .expect("read should succeed");
+        assert_eq!(result.len(), 1);
+        assert_eq!(session.operation_in_progress_count_for_test(), 0);
+    }
+
+    #[tokio::test]
+    async fn active_transaction_read_execute_holds_operation_guard() {
+        let session = open_session().await;
+        let mut transaction = session
+            .begin_transaction()
+            .await
+            .expect("transaction should begin");
+        assert!(session.active_transaction_for_test());
+        let result = transaction
+            .execute("SELECT 1", &[])
+            .await
+            .expect("transaction read should succeed");
+        assert_eq!(result.len(), 1);
+        assert_eq!(session.operation_in_progress_count_for_test(), 1);
+        assert!(session.active_transaction_for_test());
+        transaction
+            .rollback()
+            .await
+            .expect("transaction rollback should succeed");
+        assert_eq!(session.operation_in_progress_count_for_test(), 0);
+        assert!(!session.active_transaction_for_test());
+    }
+
+    #[tokio::test]
+    async fn close_rejects_idle_explicit_transaction_without_waiting() {
+        let session = open_session().await;
+        let transaction = session
+            .begin_transaction()
+            .await
+            .expect("transaction should begin");
+
+        let error = session
+            .close()
+            .await
+            .expect_err("close should reject an idle explicit transaction");
+        assert_eq!(error.code, "LIX_INVALID_TRANSACTION_STATE");
+
+        transaction
+            .rollback()
+            .await
+            .expect("rollback should remain available after rejected close");
+    }
+
+    #[tokio::test]
+    async fn transaction_open_waits_for_write_lock() {
+        let session = open_session().await;
+        let write_guard = session.write_lock.lock_owned().await;
+
+        let opener_session = std::sync::Arc::clone(&session);
+        let opener = thread::spawn(move || {
+            let runtime = tokio::runtime::Builder::new_current_thread()
+                .build()
+                .expect("test runtime should build");
+            runtime.block_on(async move { opener_session.begin_transaction().await })
+        });
+        wait_until("explicit transaction open to reserve the session", || {
+            session.operation_in_progress_count_for_test() > 0
+                && session.active_transaction_for_test()
+                && !opener.is_finished()
+        });
+
+        assert!(
+            !opener.is_finished(),
+            "transaction open should wait for the write lock"
+        );
+        assert!(session.active_transaction_for_test());
+
+        drop(write_guard);
+        let transaction = join_thread(opener, "queued transaction opener")
+            .expect("transaction should begin after write lock is released");
+        transaction
+            .rollback()
+            .await
+            .expect("transaction rollback should succeed");
+    }
+
+    #[tokio::test]
+    async fn close_waits_for_session_write_queued_on_write_lock() {
+        let session = open_session().await;
+        let write_guard = session.write_lock.lock_owned().await;
+
+        let writer_session = std::sync::Arc::clone(&session);
+        let writer = thread::spawn(move || {
+            let runtime = tokio::runtime::Builder::new_current_thread()
+                .build()
+                .expect("test runtime should build");
+            runtime.block_on(async move {
+                writer_session
+                    .execute(
+                        "INSERT INTO lix_key_value (key, value) VALUES ('queued-write-close', 'value')",
+                        &[],
+                    )
+                    .await
+            })
+        });
+        wait_until("queued session write to reserve the session", || {
+            session.operation_in_progress_count_for_test() > 0
+                && session.active_transaction_for_test()
+        });
+
+        let mut close = Box::pin(session.close());
+        assert_close_pending(close.as_mut());
+
+        drop(write_guard);
+        let write_error =
+            join_thread(writer, "queued writer").expect_err("queued write should observe close");
+        assert_eq!(write_error.code, crate::LixError::CODE_CLOSED);
+        assert_close_finishes(close.as_mut(), "close after queued write exits").await;
+    }
+
+    #[tokio::test]
+    async fn session_read_does_not_wait_for_write_lock() {
+        let session = open_session().await;
+        let write_guard = session.write_lock.lock_owned().await;
+
+        let result = tokio::time::timeout(TEST_WAIT_TIMEOUT, session.execute("SELECT 1", &[]))
+            .await
+            .expect("read should not wait for the write lock")
+            .expect("read should succeed");
+
+        assert_eq!(result.len(), 1);
+        drop(write_guard);
+    }
+
+    #[tokio::test]
+    async fn explicit_transaction_commit_sets_commit_guard() {
+        let session = open_session().await;
+        let mut transaction = session
+            .begin_transaction()
+            .await
+            .expect("transaction should begin");
+        transaction
+            .execute(
+                "INSERT INTO lix_key_value (key, value) VALUES ('commit-guard-test', 'value')",
+                &[],
+            )
+            .await
+            .expect("transaction write should stage");
+        transaction
+            .commit()
+            .await
+            .expect("transaction commit should succeed");
+        assert!(!session.commit_in_progress_for_test());
+    }
+
+    #[tokio::test]
+    async fn close_waits_for_explicit_transaction_open_queued_on_write_lock() {
+        let session = open_session().await;
+        let write_guard = session.write_lock.lock_owned().await;
+
+        let opener_session = std::sync::Arc::clone(&session);
+        let opener = thread::spawn(move || {
+            let runtime = tokio::runtime::Builder::new_current_thread()
+                .build()
+                .expect("test runtime should build");
+            runtime.block_on(async move { opener_session.begin_transaction().await })
+        });
+        wait_until("explicit transaction open to queue on write lock", || {
+            session.operation_in_progress_count_for_test() > 0
+                && session.active_transaction_for_test()
+                && !opener.is_finished()
+        });
+        assert!(
+            !opener.is_finished(),
+            "transaction open should still be queued on write lock"
+        );
+
+        let mut close = Box::pin(session.close());
+        assert_close_pending(close.as_mut());
+
+        drop(write_guard);
+        let open_error = match join_thread(opener, "queued explicit transaction opener") {
+            Ok(_) => panic!("queued explicit transaction open should observe close"),
+            Err(error) => error,
+        };
+        assert_eq!(open_error.code, crate::LixError::CODE_CLOSED);
+        assert_close_finishes(close.as_mut(), "close after queued explicit open exits").await;
+    }
+
+    #[tokio::test]
+    async fn close_waits_for_session_read_blocked_in_backend_read() {
+        let (session, gate) = open_blocking_read_session().await;
+
+        gate.block_next();
+        let reader_session = std::sync::Arc::clone(&session);
+        let reader = std::thread::spawn(move || {
+            let runtime = tokio::runtime::Builder::new_current_thread()
+                .build()
+                .expect("test runtime should build");
+            runtime.block_on(async move { reader_session.execute("SELECT 1", &[]).await })
+        });
+        gate.wait_until_blocked();
+
+        let mut close = Box::pin(session.close());
+        assert_close_pending(close.as_mut());
+
+        gate.release();
+        let error = join_thread(reader, "blocked reader")
+            .expect_err("read should observe close after backend read resumes");
+        assert_eq!(error.code, crate::LixError::CODE_CLOSED);
+        assert_close_finishes(close.as_mut(), "close after blocked read exits").await;
+    }
+
+    #[tokio::test]
+    async fn close_rejects_active_transaction_read_blocked_in_backend_read() {
+        let (session, gate) = open_blocking_read_session().await;
+        let mut transaction = session
+            .begin_transaction()
+            .await
+            .expect("transaction should begin");
+
+        gate.block_next();
+        let reader = std::thread::spawn(move || {
+            let runtime = tokio::runtime::Builder::new_current_thread()
+                .build()
+                .expect("test runtime should build");
+            runtime.block_on(async move { transaction.execute("SELECT 1", &[]).await })
+        });
+        gate.wait_until_blocked();
+
+        let close_error = session
+            .close()
+            .await
+            .expect_err("close should reject an active explicit transaction read");
+        assert_eq!(close_error.code, "LIX_INVALID_TRANSACTION_STATE");
+
+        gate.release();
+        let result = join_thread(reader, "blocked transaction reader")
+            .expect("in-flight transaction read should finish after rejected close");
+        assert_eq!(result.len(), 1);
+    }
+
+    #[tokio::test]
+    async fn close_waits_for_explicit_transaction_blocked_in_backend_commit() {
+        let (session, gate) = open_blocking_write_session().await;
+        let mut transaction = session
+            .begin_transaction()
+            .await
+            .expect("transaction should begin");
+        transaction
+            .execute(
+                "INSERT INTO lix_key_value (key, value) VALUES ('blocked-commit', 'value')",
+                &[],
+            )
+            .await
+            .expect("transaction write should stage");
+
+        gate.block_next();
+        let committer = std::thread::spawn(move || {
+            let runtime = tokio::runtime::Builder::new_current_thread()
+                .build()
+                .expect("test runtime should build");
+            runtime.block_on(async move { transaction.commit().await })
+        });
+        gate.wait_until_blocked();
+        assert!(
+            session.commit_in_progress_for_test(),
+            "blocked explicit transaction commit should set the commit guard"
+        );
+
+        let mut close = Box::pin(session.close());
+        assert_close_pending(close.as_mut());
+
+        gate.release();
+        join_thread(committer, "blocked committer")
+            .expect("commit already at durable boundary should finish");
+        assert_close_finishes(close.as_mut(), "close after commit exits").await;
+        assert!(
+            !session.commit_in_progress_for_test(),
+            "commit guard should clear after the blocked commit exits"
+        );
+    }
+
+    #[derive(Clone)]
+    struct BlockingBeginReadBackend {
+        inner: InMemoryBackend,
+        gate: BlockingGate,
+    }
+
+    impl BlockingBeginReadBackend {
+        fn new() -> Self {
+            Self {
+                inner: InMemoryBackend::default(),
+                gate: BlockingGate::new(),
+            }
+        }
+
+        fn gate(&self) -> BlockingGate {
+            self.gate.clone()
+        }
+    }
+
+    impl Backend for BlockingBeginReadBackend {
+        type Read<'a>
+            = InMemoryRead
+        where
+            Self: 'a;
+
+        type Write<'a>
+            = InMemoryWrite
+        where
+            Self: 'a;
+
+        fn capabilities(&self) -> BackendCapabilities {
+            self.inner.capabilities()
+        }
+
+        fn begin_read(&self, opts: ReadOptions) -> Result<Self::Read<'_>, BackendError> {
+            self.gate.maybe_block();
+            self.inner.begin_read(opts)
+        }
+
+        fn begin_write(&self, opts: WriteOptions) -> Result<Self::Write<'_>, BackendError> {
+            self.inner.begin_write(opts)
+        }
+
+        fn durable_write_lock(&self) -> DurableWriteLock {
+            self.inner.durable_write_lock()
+        }
+    }
+
+    #[derive(Clone)]
+    struct BlockingBeginWriteBackend {
+        inner: InMemoryBackend,
+        gate: BlockingGate,
+    }
+
+    impl BlockingBeginWriteBackend {
+        fn new() -> Self {
+            Self {
+                inner: InMemoryBackend::default(),
+                gate: BlockingGate::new(),
+            }
+        }
+
+        fn gate(&self) -> BlockingGate {
+            self.gate.clone()
+        }
+    }
+
+    impl Backend for BlockingBeginWriteBackend {
+        type Read<'a>
+            = InMemoryRead
+        where
+            Self: 'a;
+
+        type Write<'a>
+            = InMemoryWrite
+        where
+            Self: 'a;
+
+        fn capabilities(&self) -> BackendCapabilities {
+            self.inner.capabilities()
+        }
+
+        fn begin_read(&self, opts: ReadOptions) -> Result<Self::Read<'_>, BackendError> {
+            self.inner.begin_read(opts)
+        }
+
+        fn begin_write(&self, opts: WriteOptions) -> Result<Self::Write<'_>, BackendError> {
+            self.gate.maybe_block();
+            self.inner.begin_write(opts)
+        }
+
+        fn durable_write_lock(&self) -> DurableWriteLock {
+            self.inner.durable_write_lock()
+        }
+    }
+
+    #[derive(Clone)]
+    struct BlockingGate {
+        state: std::sync::Arc<(Mutex<BlockingGateState>, Condvar)>,
+    }
+
+    impl BlockingGate {
+        fn new() -> Self {
+            Self {
+                state: std::sync::Arc::new((
+                    Mutex::new(BlockingGateState::default()),
+                    Condvar::new(),
+                )),
+            }
+        }
+
+        fn block_next(&self) {
+            let (lock, _) = &*self.state;
+            let mut state = lock.lock().expect("blocking gate lock should not poison");
+            state.block_next = true;
+            state.blocked = false;
+            state.released = false;
+        }
+
+        fn maybe_block(&self) {
+            let (lock, condvar) = &*self.state;
+            let mut state = lock.lock().expect("blocking gate lock should not poison");
+            if !state.block_next {
+                return;
+            }
+            state.block_next = false;
+            state.blocked = true;
+            condvar.notify_all();
+            let deadline = Instant::now() + TEST_WAIT_TIMEOUT;
+            while !state.released {
+                let remaining = deadline.saturating_duration_since(Instant::now());
+                assert!(
+                    !remaining.is_zero(),
+                    "timed out waiting for blocking gate release"
+                );
+                let (next_state, wait_result) = condvar
+                    .wait_timeout(state, remaining)
+                    .expect("blocking gate lock should not poison after wait");
+                state = next_state;
+                assert!(
+                    !wait_result.timed_out() || state.released,
+                    "timed out waiting for blocking gate release"
+                );
+            }
+        }
+
+        fn wait_until_blocked(&self) {
+            let (lock, condvar) = &*self.state;
+            let mut state = lock.lock().expect("blocking gate lock should not poison");
+            let deadline = Instant::now() + TEST_WAIT_TIMEOUT;
+            while !state.blocked {
+                let remaining = deadline.saturating_duration_since(Instant::now());
+                assert!(!remaining.is_zero(), "timed out waiting for blocking gate");
+                let (next_state, wait_result) = condvar
+                    .wait_timeout(state, remaining)
+                    .expect("blocking gate lock should not poison after wait");
+                state = next_state;
+                assert!(
+                    !wait_result.timed_out() || state.blocked,
+                    "timed out waiting for blocking gate"
+                );
+            }
+        }
+
+        fn release(&self) {
+            let (lock, condvar) = &*self.state;
+            let mut state = lock.lock().expect("blocking gate lock should not poison");
+            state.released = true;
+            condvar.notify_all();
+        }
+    }
+
+    #[derive(Default)]
+    struct BlockingGateState {
+        block_next: bool,
+        blocked: bool,
+        released: bool,
+    }
+}