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

package/dist/engine-wasm/wasm/lix_engine.wasm.d.ts

@@ -2,20 +2,26 @@
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
 export const __wbg_lix_free: (a: number, b: number) => void;
-export const lix_activeVersionId: (a: number) => any;
+export const __wbg_lixtransaction_free: (a: number, b: number) => void;
+export const lix_activeBranchId: (a: number) => any;
+export const lix_beginTransaction: (a: number) => any;
 export const lix_close: (a: number) => any;
-export const lix_createVersion: (a: number, b: any) => any;
+export const lix_createBranch: (a: number, b: any) => any;
 export const lix_execute: (a: number, b: any, c: any) => any;
-export const lix_mergeVersion: (a: number, b: any) => any;
-export const lix_mergeVersionPreview: (a: number, b: any) => any;
-export const lix_switchVersion: (a: number, b: any) => any;
+export const lix_mergeBranch: (a: number, b: any) => any;
+export const lix_mergeBranchPreview: (a: number, b: any) => any;
+export const lix_switchBranch: (a: number, b: any) => any;
+export const lixtransaction_commit: (a: number) => any;
+export const lixtransaction_execute: (a: number, b: any, c: any) => any;
+export const lixtransaction_rollback: (a: number) => any;
 export const openLix: (a: number) => any;
-export const wasm_bindgen__closure__destroy__h259bf120b5b35fc5: (a: number, b: number) => void;
-export const wasm_bindgen__convert__closures_____invoke__h14bc79029e3672a5: (a: number, b: number, c: any, d: any) => void;
-export const wasm_bindgen__convert__closures_____invoke__ha15a27e9815e3c81: (a: number, b: number, c: any) => void;
+export const wasm_bindgen_5d738226e03a83c7___convert__closures_____invoke___wasm_bindgen_5d738226e03a83c7___JsValue__core_df90f001dd94624b___result__Result_____wasm_bindgen_5d738226e03a83c7___JsError___true_: (a: number, b: number, c: any) => [number, number];
+export const wasm_bindgen_5d738226e03a83c7___convert__closures_____invoke___js_sys_8745323a09a78a57___Function_fn_wasm_bindgen_5d738226e03a83c7___JsValue_____wasm_bindgen_5d738226e03a83c7___sys__Undefined___js_sys_8745323a09a78a57___Function_fn_wasm_bindgen_5d738226e03a83c7___JsValue_____wasm_bindgen_5d738226e03a83c7___sys__Undefined_______true_: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_exn_store: (a: number) => void;
 export const __externref_table_alloc: () => number;
 export const __wbindgen_externrefs: WebAssembly.Table;
+export const __wbindgen_destroy_closure: (a: number, b: number) => void;
+export const __externref_table_dealloc: (a: number) => void;
 export const __wbindgen_start: () => void;

package/dist/generated/builtin-schemas.d.ts

@@ -35,13 +35,13 @@ export declare const LixActiveAccountSchema: {
 };
 export declare const LixBinaryBlobRefSchema: {
     readonly "x-lix-key": "lix_binary_blob_ref";
-    readonly description: "Metadata pointer from a file version to its binary payload in internal CAS storage.";
+    readonly description: "Metadata pointer from a file row to its binary payload in internal CAS storage.";
     readonly "x-lix-primary-key": readonly ["/id"];
     readonly type: "object";
     readonly properties: {
         readonly id: {
             readonly type: "string";
-            readonly description: "File/entity identifier (matches lix_file.id) for this binary reference row.";
+            readonly description: "File primary-key value (matches lix_file.id) for this binary reference row.";
         };
         readonly blob_hash: {
             readonly type: "string";
@@ -56,6 +56,63 @@ export declare const LixBinaryBlobRefSchema: {
     readonly required: readonly ["id", "blob_hash", "size_bytes"];
     readonly additionalProperties: false;
 };
+export declare const LixBranchDescriptorSchema: {
+    readonly "x-lix-key": "lix_branch_descriptor";
+    readonly description: "User-facing branch metadata (name and visibility). The stable identity of a branch; the matching `lix_branch_ref` carries the moving head pointer. The catalog's `lix_branch` surface joins this descriptor with its ref to present a single user-visible branch row.";
+    readonly "x-lix-primary-key": readonly ["/id"];
+    readonly "x-lix-unique": readonly [readonly ["/name"]];
+    readonly type: "object";
+    readonly properties: {
+        readonly id: {
+            readonly type: "string";
+            readonly "x-lix-default": "lix_uuid_v7()";
+            readonly description: "Stable branch identifier (UUIDv7). Referenced by `lix_branch_ref.id`.";
+        };
+        readonly name: {
+            readonly type: "string";
+            readonly description: "Human-readable branch name (e.g. `main`, `feature-x`) shown in branch listings and CLI output.";
+        };
+        readonly hidden: {
+            readonly type: "boolean";
+            readonly default: false;
+            readonly description: "When true, the branch is filtered from default listings (CLI, catalog views); operations by explicit id still succeed.";
+        };
+    };
+    readonly required: readonly ["id", "name"];
+    readonly additionalProperties: false;
+};
+export declare const LixBranchRefSchema: {
+    readonly "x-lix-key": "lix_branch_ref";
+    readonly description: "Branch head pointer. Records which commit a branch should currently resolve to in the local runtime. Intentionally not part of canonical commit membership: refs may be reset client-side after sync without introducing content conflicts. Each `lix_branch_descriptor.id` has exactly one `lix_branch_ref` row.";
+    readonly "x-lix-primary-key": readonly ["/id"];
+    readonly "x-lix-foreign-keys": readonly [{
+        readonly properties: readonly ["/id"];
+        readonly references: {
+            readonly schemaKey: "lix_branch_descriptor";
+            readonly properties: readonly ["/id"];
+        };
+    }, {
+        readonly properties: readonly ["/commit_id"];
+        readonly references: {
+            readonly schemaKey: "lix_commit";
+            readonly properties: readonly ["/id"];
+        };
+    }];
+    readonly type: "object";
+    readonly properties: {
+        readonly id: {
+            readonly type: "string";
+            readonly "x-lix-default": "lix_uuid_v7()";
+            readonly description: "Branch identifier whose head pointer is being stored; matches `lix_branch_descriptor.id`.";
+        };
+        readonly commit_id: {
+            readonly type: "string";
+            readonly description: "Commit the branch should currently resolve to in the local runtime (references `lix_commit.id`).";
+        };
+    };
+    readonly required: readonly ["id", "commit_id"];
+    readonly additionalProperties: false;
+};
 export declare const LixChangeSchema: {
     readonly "x-lix-key": "lix_change";
     readonly description: "A change records one edit to a Lix entity, including what changed, when it changed, and which entity was affected.";
@@ -67,7 +124,7 @@ export declare const LixChangeSchema: {
             readonly "x-lix-default": "lix_uuid_v7()";
             readonly description: "Stable identifier for this change.";
         };
-        readonly entity_id: {
+        readonly entity_pk: {
             readonly type: "array";
             readonly description: "Canonical JSON primary-key tuple for the entity this change applies to, scoped by (`schema_key`, `file_id`). Values are ordered according to the target schema's `x-lix-primary-key`.";
             readonly items: {
@@ -81,7 +138,7 @@ export declare const LixChangeSchema: {
         };
         readonly file_id: {
             readonly type: readonly ["string", "null"];
-            readonly description: "Filesystem-scoped file identifier when the change belongs to a file; NULL for engine-internal entities (commits, versions, settings).";
+            readonly description: "Filesystem-scoped file identifier when the change belongs to a file; NULL for engine-internal entities (commits, branches, settings).";
         };
         readonly metadata: {
             readonly type: readonly ["object", "null"];
@@ -97,7 +154,7 @@ export declare const LixChangeSchema: {
             readonly description: "Entity JSON body at this change; NULL represents a tombstone (deletion).";
         };
     };
-    readonly required: readonly ["id", "entity_id", "schema_key", "file_id", "created_at"];
+    readonly required: readonly ["id", "entity_pk", "schema_key", "file_id", "created_at"];
     readonly additionalProperties: false;
 };
 export declare const LixChangeAuthorSchema: {
@@ -130,7 +187,7 @@ export declare const LixChangeAuthorSchema: {
 };
 export declare const LixCommitSchema: {
     readonly "x-lix-key": "lix_commit";
-    readonly description: "A commit is a stable point in project history. Versions point to commits. Use lix_commit_edge to inspect parent commits.";
+    readonly description: "A commit is a stable point in project history. Branches point to commits. Use lix_commit_edge to inspect parent commits.";
     readonly examples: readonly [{
         readonly id: "commit_01jexample";
     }];
@@ -307,10 +364,10 @@ export declare const LixLabelSchema: {
 };
 export declare const LixLabelAssignmentSchema: {
     readonly "x-lix-key": "lix_label_assignment";
-    readonly description: "Mapping table that assigns a label to any live Lix row addressed by (target_entity_id, target_schema_key, target_file_id). The state foreign-key tuple is ordered as [0] target_entity_id, [1] target_schema_key, [2] target_file_id.";
+    readonly description: "Mapping table that assigns a label to any live Lix row addressed by (target_entity_pk, target_schema_key, target_file_id). The state foreign-key tuple is ordered as [0] target_entity_pk, [1] target_schema_key, [2] target_file_id.";
     readonly "x-lix-primary-key": readonly ["/id"];
-    readonly "x-lix-unique": readonly [readonly ["/target_entity_id", "/target_schema_key", "/target_file_id", "/label_id"]];
-    readonly "x-lix-state-foreign-keys": readonly [readonly ["/target_entity_id", "/target_schema_key", "/target_file_id"]];
+    readonly "x-lix-unique": readonly [readonly ["/target_entity_pk", "/target_schema_key", "/target_file_id", "/label_id"]];
+    readonly "x-lix-state-foreign-keys": readonly [readonly ["/target_entity_pk", "/target_schema_key", "/target_file_id"]];
     readonly "x-lix-foreign-keys": readonly [{
         readonly properties: readonly ["/label_id"];
         readonly references: {
@@ -325,9 +382,9 @@ export declare const LixLabelAssignmentSchema: {
             readonly "x-lix-default": "lix_uuid_v7()";
             readonly description: "Stable identifier for this label assignment row.";
         };
-        readonly target_entity_id: {
+        readonly target_entity_pk: {
             readonly type: "array";
-            readonly description: "Target row entity_id. This is slot [0] in x-lix-state-foreign-keys and must be the canonical JSON array of string primary-key parts.";
+            readonly description: "Target row entity_pk. This is slot [0] in x-lix-state-foreign-keys and must be the canonical JSON array of string primary-key parts.";
             readonly items: {
                 readonly type: "string";
             };
@@ -346,7 +403,7 @@ export declare const LixLabelAssignmentSchema: {
             readonly description: "Label assigned to the target row. References lix_label.id.";
         };
     };
-    readonly required: readonly ["id", "target_entity_id", "target_schema_key", "target_file_id", "label_id"];
+    readonly required: readonly ["id", "target_entity_pk", "target_schema_key", "target_file_id", "label_id"];
     readonly additionalProperties: false;
 };
 export declare const LixRegisteredSchemaSchema: {
@@ -368,60 +425,3 @@ export declare const LixRegisteredSchemaSchema: {
     readonly required: readonly ["value"];
     readonly additionalProperties: false;
 };
-export declare const LixVersionDescriptorSchema: {
-    readonly "x-lix-key": "lix_version_descriptor";
-    readonly description: "User-facing version metadata (name and visibility) for a branch-like version. The stable identity of a version; the matching `lix_version_ref` carries the moving head pointer. The catalog's `lix_version` surface joins this descriptor with its ref to present a single user-visible version row.";
-    readonly "x-lix-primary-key": readonly ["/id"];
-    readonly "x-lix-unique": readonly [readonly ["/name"]];
-    readonly type: "object";
-    readonly properties: {
-        readonly id: {
-            readonly type: "string";
-            readonly "x-lix-default": "lix_uuid_v7()";
-            readonly description: "Stable version identifier (UUIDv7). Referenced by `lix_version_ref.id`.";
-        };
-        readonly name: {
-            readonly type: "string";
-            readonly description: "Human-readable version name (e.g. `main`, `feature-x`) shown in version listings and CLI output.";
-        };
-        readonly hidden: {
-            readonly type: "boolean";
-            readonly default: false;
-            readonly description: "When true, the version is filtered from default listings (CLI, catalog views); operations by explicit id still succeed.";
-        };
-    };
-    readonly required: readonly ["id", "name"];
-    readonly additionalProperties: false;
-};
-export declare const LixVersionRefSchema: {
-    readonly "x-lix-key": "lix_version_ref";
-    readonly description: "Version head pointer. Records which commit a version should currently resolve to in the local runtime. Intentionally not part of canonical commit membership: refs may be reset client-side after sync without introducing content conflicts. Each `lix_version_descriptor.id` has exactly one `lix_version_ref` row.";
-    readonly "x-lix-primary-key": readonly ["/id"];
-    readonly "x-lix-foreign-keys": readonly [{
-        readonly properties: readonly ["/id"];
-        readonly references: {
-            readonly schemaKey: "lix_version_descriptor";
-            readonly properties: readonly ["/id"];
-        };
-    }, {
-        readonly properties: readonly ["/commit_id"];
-        readonly references: {
-            readonly schemaKey: "lix_commit";
-            readonly properties: readonly ["/id"];
-        };
-    }];
-    readonly type: "object";
-    readonly properties: {
-        readonly id: {
-            readonly type: "string";
-            readonly "x-lix-default": "lix_uuid_v7()";
-            readonly description: "Version identifier whose head pointer is being stored; matches `lix_version_descriptor.id`.";
-        };
-        readonly commit_id: {
-            readonly type: "string";
-            readonly description: "Commit the version should currently resolve to in the local runtime (references `lix_commit.id`).";
-        };
-    };
-    readonly required: readonly ["id", "commit_id"];
-    readonly additionalProperties: false;
-};

package/dist/generated/builtin-schemas.js

@@ -52,7 +52,7 @@ export const LixActiveAccountSchema = {
 };
 export const LixBinaryBlobRefSchema = {
     "x-lix-key": "lix_binary_blob_ref",
-    "description": "Metadata pointer from a file version to its binary payload in internal CAS storage.",
+    "description": "Metadata pointer from a file row to its binary payload in internal CAS storage.",
     "x-lix-primary-key": [
         "/id"
     ],
@@ -60,7 +60,7 @@ export const LixBinaryBlobRefSchema = {
     "properties": {
         "id": {
             "type": "string",
-            "description": "File/entity identifier (matches lix_file.id) for this binary reference row."
+            "description": "File primary-key value (matches lix_file.id) for this binary reference row."
         },
         "blob_hash": {
             "type": "string",
@@ -79,6 +79,88 @@ export const LixBinaryBlobRefSchema = {
     ],
     "additionalProperties": false
 };
+export const LixBranchDescriptorSchema = {
+    "x-lix-key": "lix_branch_descriptor",
+    "description": "User-facing branch metadata (name and visibility). The stable identity of a branch; the matching `lix_branch_ref` carries the moving head pointer. The catalog's `lix_branch` surface joins this descriptor with its ref to present a single user-visible branch row.",
+    "x-lix-primary-key": [
+        "/id"
+    ],
+    "x-lix-unique": [
+        [
+            "/name"
+        ]
+    ],
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string",
+            "x-lix-default": "lix_uuid_v7()",
+            "description": "Stable branch identifier (UUIDv7). Referenced by `lix_branch_ref.id`."
+        },
+        "name": {
+            "type": "string",
+            "description": "Human-readable branch name (e.g. `main`, `feature-x`) shown in branch listings and CLI output."
+        },
+        "hidden": {
+            "type": "boolean",
+            "default": false,
+            "description": "When true, the branch is filtered from default listings (CLI, catalog views); operations by explicit id still succeed."
+        }
+    },
+    "required": [
+        "id",
+        "name"
+    ],
+    "additionalProperties": false
+};
+export const LixBranchRefSchema = {
+    "x-lix-key": "lix_branch_ref",
+    "description": "Branch head pointer. Records which commit a branch should currently resolve to in the local runtime. Intentionally not part of canonical commit membership: refs may be reset client-side after sync without introducing content conflicts. Each `lix_branch_descriptor.id` has exactly one `lix_branch_ref` row.",
+    "x-lix-primary-key": [
+        "/id"
+    ],
+    "x-lix-foreign-keys": [
+        {
+            "properties": [
+                "/id"
+            ],
+            "references": {
+                "schemaKey": "lix_branch_descriptor",
+                "properties": [
+                    "/id"
+                ]
+            }
+        },
+        {
+            "properties": [
+                "/commit_id"
+            ],
+            "references": {
+                "schemaKey": "lix_commit",
+                "properties": [
+                    "/id"
+                ]
+            }
+        }
+    ],
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string",
+            "x-lix-default": "lix_uuid_v7()",
+            "description": "Branch identifier whose head pointer is being stored; matches `lix_branch_descriptor.id`."
+        },
+        "commit_id": {
+            "type": "string",
+            "description": "Commit the branch should currently resolve to in the local runtime (references `lix_commit.id`)."
+        }
+    },
+    "required": [
+        "id",
+        "commit_id"
+    ],
+    "additionalProperties": false
+};
 export const LixChangeSchema = {
     "x-lix-key": "lix_change",
     "description": "A change records one edit to a Lix entity, including what changed, when it changed, and which entity was affected.",
@@ -92,7 +174,7 @@ export const LixChangeSchema = {
             "x-lix-default": "lix_uuid_v7()",
             "description": "Stable identifier for this change."
         },
-        "entity_id": {
+        "entity_pk": {
             "type": "array",
             "description": "Canonical JSON primary-key tuple for the entity this change applies to, scoped by (`schema_key`, `file_id`). Values are ordered according to the target schema's `x-lix-primary-key`.",
             "items": {
@@ -109,7 +191,7 @@ export const LixChangeSchema = {
                 "string",
                 "null"
             ],
-            "description": "Filesystem-scoped file identifier when the change belongs to a file; NULL for engine-internal entities (commits, versions, settings)."
+            "description": "Filesystem-scoped file identifier when the change belongs to a file; NULL for engine-internal entities (commits, branches, settings)."
         },
         "metadata": {
             "type": [
@@ -135,7 +217,7 @@ export const LixChangeSchema = {
     },
     "required": [
         "id",
-        "entity_id",
+        "entity_pk",
         "schema_key",
         "file_id",
         "created_at"
@@ -189,7 +271,7 @@ export const LixChangeAuthorSchema = {
 };
 export const LixCommitSchema = {
     "x-lix-key": "lix_commit",
-    "description": "A commit is a stable point in project history. Versions point to commits. Use lix_commit_edge to inspect parent commits.",
+    "description": "A commit is a stable point in project history. Branches point to commits. Use lix_commit_edge to inspect parent commits.",
     "examples": [
         {
             "id": "commit_01jexample"
@@ -462,13 +544,13 @@ export const LixLabelSchema = {
 };
 export const LixLabelAssignmentSchema = {
     "x-lix-key": "lix_label_assignment",
-    "description": "Mapping table that assigns a label to any live Lix row addressed by (target_entity_id, target_schema_key, target_file_id). The state foreign-key tuple is ordered as [0] target_entity_id, [1] target_schema_key, [2] target_file_id.",
+    "description": "Mapping table that assigns a label to any live Lix row addressed by (target_entity_pk, target_schema_key, target_file_id). The state foreign-key tuple is ordered as [0] target_entity_pk, [1] target_schema_key, [2] target_file_id.",
     "x-lix-primary-key": [
         "/id"
     ],
     "x-lix-unique": [
         [
-            "/target_entity_id",
+            "/target_entity_pk",
             "/target_schema_key",
             "/target_file_id",
             "/label_id"
@@ -476,7 +558,7 @@ export const LixLabelAssignmentSchema = {
     ],
     "x-lix-state-foreign-keys": [
         [
-            "/target_entity_id",
+            "/target_entity_pk",
             "/target_schema_key",
             "/target_file_id"
         ]
@@ -501,9 +583,9 @@ export const LixLabelAssignmentSchema = {
             "x-lix-default": "lix_uuid_v7()",
             "description": "Stable identifier for this label assignment row."
         },
-        "target_entity_id": {
+        "target_entity_pk": {
             "type": "array",
-            "description": "Target row entity_id. This is slot [0] in x-lix-state-foreign-keys and must be the canonical JSON array of string primary-key parts.",
+            "description": "Target row entity_pk. This is slot [0] in x-lix-state-foreign-keys and must be the canonical JSON array of string primary-key parts.",
             "items": {
                 "type": "string"
             },
@@ -527,7 +609,7 @@ export const LixLabelAssignmentSchema = {
     },
     "required": [
         "id",
-        "target_entity_id",
+        "target_entity_pk",
         "target_schema_key",
         "target_file_id",
         "label_id"
@@ -559,85 +641,3 @@ export const LixRegisteredSchemaSchema = {
     ],
     "additionalProperties": false
 };
-export const LixVersionDescriptorSchema = {
-    "x-lix-key": "lix_version_descriptor",
-    "description": "User-facing version metadata (name and visibility) for a branch-like version. The stable identity of a version; the matching `lix_version_ref` carries the moving head pointer. The catalog's `lix_version` surface joins this descriptor with its ref to present a single user-visible version row.",
-    "x-lix-primary-key": [
-        "/id"
-    ],
-    "x-lix-unique": [
-        [
-            "/name"
-        ]
-    ],
-    "type": "object",
-    "properties": {
-        "id": {
-            "type": "string",
-            "x-lix-default": "lix_uuid_v7()",
-            "description": "Stable version identifier (UUIDv7). Referenced by `lix_version_ref.id`."
-        },
-        "name": {
-            "type": "string",
-            "description": "Human-readable version name (e.g. `main`, `feature-x`) shown in version listings and CLI output."
-        },
-        "hidden": {
-            "type": "boolean",
-            "default": false,
-            "description": "When true, the version is filtered from default listings (CLI, catalog views); operations by explicit id still succeed."
-        }
-    },
-    "required": [
-        "id",
-        "name"
-    ],
-    "additionalProperties": false
-};
-export const LixVersionRefSchema = {
-    "x-lix-key": "lix_version_ref",
-    "description": "Version head pointer. Records which commit a version should currently resolve to in the local runtime. Intentionally not part of canonical commit membership: refs may be reset client-side after sync without introducing content conflicts. Each `lix_version_descriptor.id` has exactly one `lix_version_ref` row.",
-    "x-lix-primary-key": [
-        "/id"
-    ],
-    "x-lix-foreign-keys": [
-        {
-            "properties": [
-                "/id"
-            ],
-            "references": {
-                "schemaKey": "lix_version_descriptor",
-                "properties": [
-                    "/id"
-                ]
-            }
-        },
-        {
-            "properties": [
-                "/commit_id"
-            ],
-            "references": {
-                "schemaKey": "lix_commit",
-                "properties": [
-                    "/id"
-                ]
-            }
-        }
-    ],
-    "type": "object",
-    "properties": {
-        "id": {
-            "type": "string",
-            "x-lix-default": "lix_uuid_v7()",
-            "description": "Version identifier whose head pointer is being stored; matches `lix_version_descriptor.id`."
-        },
-        "commit_id": {
-            "type": "string",
-            "description": "Commit the version should currently resolve to in the local runtime (references `lix_commit.id`)."
-        }
-    },
-    "required": [
-        "id",
-        "commit_id"
-    ],
-    "additionalProperties": false
-};

package/dist/open-lix.d.ts

@@ -78,21 +78,28 @@ export type BackendKvEntryPage = {
     values: Uint8Array[];
     resumeAfter?: Uint8Array | null;
 };
-export type BackendKvPut = {
+export type BackendKvWriteOp = {
+    kind: "put";
     key: Uint8Array;
     value: Uint8Array;
+} | {
+    kind: "delete";
+    key: Uint8Array;
+} | {
+    kind: "deleteRange";
+    range: BackendKvScanRange;
 };
 export type BackendKvWriteBatch = {
     groups: BackendKvWriteGroup[];
 };
 export type BackendKvWriteGroup = {
     namespace: string;
-    puts: BackendKvPut[];
-    deletes: Uint8Array[];
+    ops: BackendKvWriteOp[];
 };
 export type BackendKvWriteStats = {
     puts: number;
     deletes: number;
+    deleteRanges: number;
     bytesWritten: number;
 };
 export type LixBackendReadTransaction = {
@@ -115,35 +122,35 @@ export type LixBackend = {
 export type OpenLixOptions = {
     backend?: LixBackend;
 };
-export type CreateVersionOptions = {
+export type CreateBranchOptions = {
     id?: string;
     name: string;
     fromCommitId?: string;
 };
-export type CreateVersionResult = {
+export type CreateBranchResult = {
     id: string;
     name: string;
     hidden: boolean;
     commitId: string;
 };
-export type SwitchVersionOptions = {
-    versionId: string;
+export type SwitchBranchOptions = {
+    branchId: string;
 };
-export type SwitchVersionResult = {
-    versionId: string;
+export type SwitchBranchResult = {
+    branchId: string;
 };
-export type MergeVersionOptions = {
-    sourceVersionId: string;
+export type MergeBranchOptions = {
+    sourceBranchId: string;
 };
-export type MergeVersionOutcome = "alreadyUpToDate" | "fastForward" | "mergeCommitted";
-export type MergeVersionResult = {
+export type MergeBranchOutcome = "alreadyUpToDate" | "fastForward" | "mergeCommitted";
+export type MergeBranchResult = {
     /**
      * How the merge was applied. `fastForward` advances the target ref without
      * creating a merge commit, but can still make source changes visible.
      */
-    outcome: MergeVersionOutcome;
-    targetVersionId: string;
-    sourceVersionId: string;
+    outcome: MergeBranchOutcome;
+    targetBranchId: string;
+    sourceBranchId: string;
     baseCommitId: string;
     targetHeadBeforeCommitId: string;
     sourceHeadBeforeCommitId: string;
@@ -151,10 +158,10 @@ export type MergeVersionResult = {
     createdMergeCommitId: string | null;
     changeStats: MergeChangeStats;
 };
-export type MergeVersionPreviewResult = {
-    outcome: MergeVersionOutcome;
-    targetVersionId: string;
-    sourceVersionId: string;
+export type MergeBranchPreviewResult = {
+    outcome: MergeBranchOutcome;
+    targetBranchId: string;
+    sourceBranchId: string;
     baseCommitId: string;
     targetHeadCommitId: string;
     sourceHeadCommitId: string;
@@ -170,7 +177,7 @@ export type MergeChangeStats = {
 export type MergeConflict = {
     kind: "sameEntityChanged";
     schemaKey: string;
-    entityId: string[];
+    entityPk: string[];
     fileId: string | null;
     target: MergeConflictSide;
     source: MergeConflictSide;
@@ -185,16 +192,23 @@ export type Lix = {
      * Executes one DataFusion SQL statement against this Lix session.
      *
      * This is not SQLite SQL. Use the DataFusion SQL dialect; positional
-     * placeholders are `$1`, `$2`, and so on. SQLite-specific catalog tables and
+     * placeholders are `?` or `$1`, `$2`, and so on. SQLite-specific catalog tables and
      * transaction statements such as `sqlite_master`, `BEGIN`, and `COMMIT` are
-     * not available. Use `information_schema` for catalog inspection.
+     * not available. Use `information_schema` for catalog inspection. While a
+     * transaction is active, call `execute()` on the transaction handle instead.
      */
     execute(sql: string, params?: ReadonlyArray<LixRuntimeValue>): Promise<ExecuteResult>;
-    activeVersionId(): Promise<string>;
-    createVersion(options: CreateVersionOptions): Promise<CreateVersionResult>;
-    switchVersion(options: SwitchVersionOptions): Promise<SwitchVersionResult>;
-    mergeVersionPreview(options: MergeVersionOptions): Promise<MergeVersionPreviewResult>;
-    mergeVersion(options: MergeVersionOptions): Promise<MergeVersionResult>;
+    beginTransaction(): Promise<LixTransaction>;
+    activeBranchId(): Promise<string>;
+    createBranch(options: CreateBranchOptions): Promise<CreateBranchResult>;
+    switchBranch(options: SwitchBranchOptions): Promise<SwitchBranchResult>;
+    mergeBranchPreview(options: MergeBranchOptions): Promise<MergeBranchPreviewResult>;
+    mergeBranch(options: MergeBranchOptions): Promise<MergeBranchResult>;
     close(): Promise<void>;
 };
+export type LixTransaction = {
+    execute(sql: string, params?: ReadonlyArray<LixRuntimeValue>): Promise<ExecuteResult>;
+    commit(): Promise<void>;
+    rollback(): Promise<void>;
+};
 export declare function openLix(options?: OpenLixOptions): Promise<Lix>;