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

package/dist-engine-src/src/commit_graph/mod.rs

@@ -6,7 +6,6 @@ mod walker;
 pub(crate) use context::{CommitGraphContext, CommitGraphStoreReader};
 #[allow(unused_imports)]
 pub(crate) use types::{
-    CommitGraphChangeHistoryEntry, CommitGraphChangeHistoryRequest, CommitGraphChangeSet,
-    CommitGraphChangeSetElement, CommitGraphCommit, CommitGraphEdge, CommitGraphEntity,
-    CommitGraphReader, ReachableCommitGraphCommit,
+    CommitGraphChangeHistoryEntry, CommitGraphChangeHistoryRequest, CommitGraphCommit,
+    CommitGraphEdge, CommitGraphReader, ReachableCommitGraphCommit,
 };

package/dist-engine-src/src/commit_graph/types.rs

@@ -1,8 +1,6 @@
+use crate::commit_store::{Change, LocatedChange};
+use crate::entity_identity::EntityIdentity;
 use crate::LixError;
-use crate::{
-    changelog::{CanonicalChange, MaterializedCanonicalChange},
-    entity_identity::EntityIdentity,
-};
 
 /// Parsed `lix_commit` entity from the changelog.
 ///
@@ -13,9 +11,9 @@ use crate::{
 /// newly minted copies.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub(crate) struct CommitGraphCommit {
-    pub(crate) change: MaterializedCanonicalChange,
+    pub(crate) canonical_change: Change,
+    pub(crate) change: Change,
     pub(crate) commit_id: String,
-    pub(crate) change_set_id: String,
     pub(crate) change_ids: Vec<String>,
     pub(crate) author_account_ids: Vec<String>,
     pub(crate) parent_commit_ids: Vec<String>,
@@ -33,20 +31,7 @@ pub(crate) struct ReachableCommitGraphCommit {
 pub(crate) struct CommitGraphEdge {
     pub(crate) parent_commit_id: String,
     pub(crate) child_commit_id: String,
-}
-
-/// Derived change-set row for a commit.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub(crate) struct CommitGraphChangeSet {
-    pub(crate) id: String,
-    pub(crate) commit_id: String,
-}
-
-/// Derived membership row for a commit's introduced/adopted change set.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub(crate) struct CommitGraphChangeSetElement {
-    pub(crate) change_set_id: String,
-    pub(crate) change: MaterializedCanonicalChange,
+    pub(crate) parent_order: u32,
 }
 
 /// Filter for canonical change history from a chosen traversal start commit.
@@ -66,7 +51,7 @@ pub(crate) struct CommitGraphChangeHistoryRequest {
 /// necessarily a graph root or a version head.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub(crate) struct CommitGraphChangeHistoryEntry {
-    pub(crate) change: CanonicalChange,
+    pub(crate) located_change: LocatedChange,
     pub(crate) observed_commit_id: String,
     pub(crate) start_commit_id: String,
     pub(crate) depth: u32,
@@ -76,6 +61,7 @@ pub(crate) struct CommitGraphChangeHistoryEntry {
 ///
 /// SQL surfaces consume this trait so they depend on graph semantics, not on
 /// changelog storage or traversal details.
+#[allow(dead_code)]
 #[async_trait::async_trait]
 pub(crate) trait CommitGraphReader: Send + Sync {
     #[allow(dead_code)]
@@ -115,31 +101,9 @@ pub(crate) trait CommitGraphReader: Send + Sync {
 
     fn commit_edges(&self, commits: &[CommitGraphCommit]) -> Vec<CommitGraphEdge>;
 
-    fn change_sets(&self, commits: &[CommitGraphCommit]) -> Vec<CommitGraphChangeSet>;
-
-    async fn change_set_elements(
-        &mut self,
-        commits: &[CommitGraphCommit],
-    ) -> Result<Vec<CommitGraphChangeSetElement>, LixError>;
-
     async fn change_history_from_commit(
         &mut self,
         start_commit_id: &str,
         request: &CommitGraphChangeHistoryRequest,
     ) -> Result<Vec<CommitGraphChangeHistoryEntry>, LixError>;
 }
-
-/// Canonical entity selected by resolving the commit graph at a commit head.
-///
-/// The changelog fact remains unchanged. The graph reader adds the commit that
-/// made the fact visible at this head plus its distance from the requested
-/// head, so tracked_state can materialize serving rows without knowing graph
-/// traversal rules.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub(crate) struct CommitGraphEntity {
-    pub(crate) change: MaterializedCanonicalChange,
-    pub(crate) source_commit_id: String,
-    pub(crate) depth: u32,
-    pub(crate) created_at: String,
-    pub(crate) updated_at: String,
-}

package/dist-engine-src/src/commit_graph/walker.rs

@@ -223,11 +223,8 @@ mod tests {
     use serde_json::json;
 
     use crate::backend::testing::UnitTestBackend;
-    use crate::changelog::{
-        canonicalize_materialized_change, ChangelogContext, MaterializedCanonicalChange,
-    };
     use crate::commit_graph::CommitGraphContext;
-    use crate::json_store::JsonStoreContext;
+    use crate::commit_store::{Change, CommitDraftRef, CommitStoreContext};
     use crate::storage::{StorageContext, StorageWriteSet};
     use crate::LixError;
 
@@ -235,10 +232,8 @@ mod tests {
     async fn reachable_commits_returns_commits_nearest_first() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-root-change", "commit-root", &[], &[]),
                 commit_change(
@@ -252,7 +247,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let commits = reader
             .reachable_commits("commit-head")
@@ -272,10 +267,8 @@ mod tests {
     async fn reachable_commits_errors_on_missing_parent_commit() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[commit_change(
                 "commit-head-change",
                 "commit-head",
@@ -285,7 +278,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let error = reader
             .reachable_commits("commit-head")
@@ -299,10 +292,8 @@ mod tests {
     async fn reachable_commits_errors_on_cycle() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-a-change", "commit-a", &[], &["commit-b"]),
                 commit_change("commit-b-change", "commit-b", &[], &["commit-a"]),
@@ -310,7 +301,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let error = reader
             .reachable_commits("commit-a")
@@ -324,10 +315,8 @@ mod tests {
     async fn reachable_commits_dedupes_shared_ancestors_in_diamond() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-root-change", "commit-root", &[], &[]),
                 commit_change("commit-left-change", "commit-left", &[], &["commit-root"]),
@@ -342,7 +331,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let commits = reader
             .reachable_commits("commit-head")
@@ -367,10 +356,8 @@ mod tests {
     async fn reachable_commits_keeps_nearest_depth_for_multiple_paths() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-root-change", "commit-root", &[], &[]),
                 commit_change(
@@ -389,7 +376,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let commits = reader
             .reachable_commits("commit-head")
@@ -409,10 +396,8 @@ mod tests {
     async fn reachable_commits_orders_same_depth_commits_by_id() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-z-change", "commit-z", &[], &[]),
                 commit_change("commit-a-change", "commit-a", &[], &[]),
@@ -426,7 +411,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let commits = reader
             .reachable_commits("commit-head")
@@ -446,7 +431,7 @@ mod tests {
     async fn reachable_commits_errors_on_missing_head_commit() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let graph = CommitGraphContext::new(ChangelogContext::new());
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
 
         let error = reader
@@ -461,10 +446,8 @@ mod tests {
     async fn best_common_ancestors_returns_nearest_common_commit_in_simple_graph() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-a-change", "commit-a", &[], &[]),
                 commit_change("commit-b-change", "commit-b", &[], &["commit-a"]),
@@ -474,7 +457,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let ancestors = reader
             .best_common_ancestors("commit-c", "commit-d")
@@ -494,10 +477,8 @@ mod tests {
     async fn best_common_ancestors_returns_shared_fork_in_diamond_graph() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-root-change", "commit-root", &[], &[]),
                 commit_change("commit-left-change", "commit-left", &[], &["commit-root"]),
@@ -518,7 +499,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let ancestors = reader
             .best_common_ancestors("commit-left-head", "commit-right-head")
@@ -538,10 +519,8 @@ mod tests {
     async fn best_common_ancestors_returns_parent_when_one_side_is_ancestor() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-a-change", "commit-a", &[], &[]),
                 commit_change("commit-b-change", "commit-b", &[], &["commit-a"]),
@@ -550,7 +529,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let ancestors = reader
             .best_common_ancestors("commit-b", "commit-c")
@@ -570,10 +549,8 @@ mod tests {
     async fn best_common_ancestors_returns_multiple_bases_for_criss_cross_graph() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-root-change", "commit-root", &[], &[]),
                 commit_change("commit-left-change", "commit-left", &[], &["commit-root"]),
@@ -594,7 +571,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let ancestors = reader
             .best_common_ancestors("commit-head-left", "commit-head-right")
@@ -614,10 +591,8 @@ mod tests {
     async fn merge_base_returns_single_best_common_ancestor() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-a-change", "commit-a", &[], &[]),
                 commit_change("commit-b-change", "commit-b", &[], &["commit-a"]),
@@ -627,7 +602,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let base = reader
             .merge_base("commit-c", "commit-d")
@@ -641,10 +616,8 @@ mod tests {
     async fn merge_base_errors_when_histories_have_no_common_commit() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-left-change", "commit-left", &[], &[]),
                 commit_change("commit-right-change", "commit-right", &[], &[]),
@@ -652,7 +625,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let error = reader
             .merge_base("commit-left", "commit-right")
@@ -666,10 +639,8 @@ mod tests {
     async fn merge_base_errors_when_best_common_ancestor_is_ambiguous() {
         let backend = Arc::new(UnitTestBackend::new());
         let storage = StorageContext::new(backend.clone());
-        let changelog = ChangelogContext::new();
         append_changes(
             storage.clone(),
-            &changelog,
             &[
                 commit_change("commit-root-change", "commit-root", &[], &[]),
                 commit_change("commit-left-change", "commit-left", &[], &["commit-root"]),
@@ -690,7 +661,7 @@ mod tests {
         )
         .await;
 
-        let graph = CommitGraphContext::new(changelog);
+        let graph = CommitGraphContext::new();
         let mut reader = graph.reader(storage);
         let error = reader
             .merge_base("commit-head-left", "commit-head-right")
@@ -721,30 +692,40 @@ mod tests {
         );
     }
 
-    async fn append_changes(
-        storage: StorageContext,
-        changelog: &ChangelogContext,
-        changes: &[MaterializedCanonicalChange],
-    ) {
+    #[derive(Clone)]
+    struct TestCommitChange {
+        change: Change,
+        parent_commit_ids: Vec<String>,
+    }
+
+    async fn append_changes(storage: StorageContext, changes: &[TestCommitChange]) {
         let mut tx = storage
             .begin_write_transaction()
             .await
             .expect("transaction should open");
         let mut writes = StorageWriteSet::new();
-        let canonical_changes = {
-            let mut json_writer = JsonStoreContext::new().writer();
-            changes
-                .iter()
-                .map(|change| {
-                    canonicalize_materialized_change(&mut writes, &mut json_writer, change)
-                })
-                .collect::<Result<Vec<_>, _>>()
-                .expect("changes should canonicalize")
-        };
-        changelog
-            .writer(&mut writes)
-            .stage_changes(&canonical_changes)
-            .expect("append should succeed");
+        let commit_store = CommitStoreContext::new();
+        for change in changes {
+            let commit_id = change
+                .change
+                .entity_id
+                .as_single_string()
+                .expect("commit fixture should have single id")
+                .to_string();
+            let author_account_ids = Vec::new();
+            let commit = CommitDraftRef {
+                id: &commit_id,
+                change_id: &change.change.id,
+                parent_ids: &change.parent_commit_ids,
+                author_account_ids: &author_account_ids,
+                created_at: &change.change.created_at,
+            };
+            commit_store
+                .writer(tx.as_mut(), &mut writes)
+                .stage_commit_draft(commit, Vec::new(), Vec::new())
+                .await
+                .expect("commit-store fixture should append");
+        }
         writes
             .apply(&mut tx.as_mut())
             .await
@@ -757,24 +738,19 @@ mod tests {
         commit_id: &str,
         change_ids: &[&str],
         parent_commit_ids: &[&str],
-    ) -> MaterializedCanonicalChange {
-        MaterializedCanonicalChange {
-            id: change_id.to_string(),
-            entity_id: crate::entity_identity::EntityIdentity::single(commit_id),
-            schema_key: "lix_commit".to_string(),
-            schema_version: "1".to_string(),
-            file_id: None,
-            snapshot_content: Some(
-                serde_json::to_string(&json!({
-                    "id": commit_id,
-                    "change_set_id": "change-set-1",
-                    "change_ids": change_ids,
-                    "parent_commit_ids": parent_commit_ids,
-                }))
-                .expect("snapshot should serialize"),
-            ),
-            metadata: None,
-            created_at: "2026-01-01T00:00:00Z".to_string(),
+    ) -> TestCommitChange {
+        let _ = change_ids;
+        TestCommitChange {
+            change: Change {
+                id: change_id.to_string(),
+                entity_id: crate::entity_identity::EntityIdentity::single(commit_id),
+                schema_key: "lix_commit".to_string(),
+                file_id: None,
+                snapshot_ref: None,
+                metadata_ref: None,
+                created_at: "2026-01-01T00:00:00Z".to_string(),
+            },
+            parent_commit_ids: parent_commit_ids.iter().map(|id| id.to_string()).collect(),
         }
     }
 }