lix 0.17.1

Embeddable version control for apps and AI agents.
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
use super::*;
use crate::sync::partial_merge_protocol::{PartialMergeReceipt, PartialMergeRequest};
use crate::sync::partial_merge_state::{
    load_partial_merge_state, stage_capture_partial_merge, stage_record_partial_merge_receipt,
};
async fn captured_request(
    authority: &Lix<Memory>,
    engine: &Engine<Memory>,
    old: &PartialReplicaState,
) -> PartialMergeRequest {
    let storage = engine.storage();
    let read = storage.begin_read(Default::default()).await.unwrap();
    let branch = &old.descriptor().selected_branch.branch_id;
    let (push, _, _) = crate::sync::partial_push_state::load_partial_push_state(&read, old, branch)
        .await
        .unwrap();
    let controls = admitted_controls(&storage, old).await.unwrap();
    let remote = authority.partial_replica_descriptor(None).await.unwrap();
    PartialMergeRequest {
        attempt_id: uuid::Uuid::now_v7().to_string(),
        branch_id: branch.clone(),
        base_commit_id: push.confirmed.head,
        expected_authority_head_commit_id: remote.selected_branch.head.commit_id,
        captured_local_head_commit_id: controls[0].head_commit_id.to_string(),
        expected_authority_checkpoint_commit_id: push.confirmed.checkpoint.clone(),
        captured_local_checkpoint_commit_id: push.confirmed.checkpoint.clone(),
        checkpoint_commit_id: push.confirmed.checkpoint,
        global_head_commit_id: remote.global_branch.head.commit_id,
        global_checkpoint_commit_id: remote.global_branch.checkpoint.commit_id,
    }
}
#[tokio::test]
async fn recorded_merge_receipt_preserves_newer_local_tip_and_original_confirmation() {
    let (authority, engine, session, old) = fixture().await;
    let storage = engine.storage();
    execute_hydrating(
        &session,
        &storage,
        &old,
        &authority,
        "UPDATE lix_key_value SET value='captured-L' WHERE key='resident'",
        &[],
        &mut Fetches::default(),
    )
    .await
    .unwrap();
    authority
        .execute(
            "INSERT INTO lix_key_value (key,value) VALUES('remote-only','R')",
            &[],
        )
        .await
        .unwrap();
    let request = captured_request(&authority, &engine, &old).await;
    let read = storage.begin_read(Default::default()).await.unwrap();
    let mut writes = storage.new_write_set();
    let guards = stage_capture_partial_merge(&read, &mut writes, &old, &request)
        .await
        .unwrap();
    drop(read);
    storage
        .commit_partial_replica_write_set(
            crate::sync::partial_replica_write_capability(),
            writes,
            StorageWriteOptions {
                preconditions: guards,
                await_durable: true,
                ..Default::default()
            },
        )
        .await
        .unwrap();
    execute_hydrating(
        &session,
        &storage,
        &old,
        &authority,
        "UPDATE lix_key_value SET value='newer-L2' WHERE key='resident'",
        &[],
        &mut Fetches::default(),
    )
    .await
    .unwrap();
    let controls = admitted_controls(&storage, &old).await.unwrap();
    // Bookkeeping fixture only: native M verification belongs to adoption,
    // and this test deliberately never publishes M as a serving control.
    let receipt = PartialMergeReceipt {
        request: request.clone(),
        merge_commit_id: uuid::Uuid::now_v7().to_string(),
    };
    let read = storage.begin_read(Default::default()).await.unwrap();
    let mut writes = storage.new_write_set();
    let guards = stage_record_partial_merge_receipt(&read, &mut writes, &old, &receipt)
        .await
        .unwrap();
    drop(read);
    storage
        .commit_partial_replica_write_set(
            crate::sync::partial_replica_write_capability(),
            writes,
            StorageWriteOptions {
                preconditions: guards,
                await_durable: true,
                ..Default::default()
            },
        )
        .await
        .unwrap();
    assert_eq!(admitted_controls(&storage, &old).await.unwrap(), controls);
    let read = storage.begin_read(Default::default()).await.unwrap();
    let (push, _, _) =
        crate::sync::partial_push_state::load_partial_push_state(&read, &old, &request.branch_id)
            .await
            .unwrap();
    assert_eq!(push.confirmed.head, request.base_commit_id);
    let (record, _, _) = load_partial_merge_state(&read, &old, &request.branch_id)
        .await
        .unwrap();
    assert_eq!(record.unwrap().authority_receipt, Some(receipt.clone()));
    let mut changed = receipt.clone();
    changed.merge_commit_id = uuid::Uuid::now_v7().to_string();
    assert!(
        stage_record_partial_merge_receipt(&read, &mut storage.new_write_set(), &old, &changed)
            .await
            .is_err()
    );
    drop(read);
    // Simulate a released v4 journal with an accepted receipt while L2 remains
    // pending. Owned migration must change only the record version.
    let read = storage.begin_read(Default::default()).await.unwrap();
    let (before, raw, _) = load_partial_merge_state(&read, &old, &request.branch_id)
        .await
        .unwrap();
    let before = before.unwrap();
    let mut legacy: serde_json::Value = serde_json::from_slice(&raw.unwrap()).unwrap();
    legacy["version"] = serde_json::json!(4);
    let legacy_bytes = serde_json::to_vec(&legacy).unwrap();
    let record_key = crate::storage_adapter::StorageKey(bytes::Bytes::copy_from_slice(
        uuid::Uuid::parse_str(&request.branch_id)
            .unwrap()
            .as_bytes(),
    ));
    drop(read);
    let mut writes = storage.new_write_set();
    writes.put(
        crate::sync::partial_merge_state::PARTIAL_BRANCH_MERGE_SPACE,
        record_key,
        legacy_bytes,
    );
    storage
        .commit_partial_replica_write_set(
            crate::sync::partial_replica_write_capability(),
            writes,
            StorageWriteOptions {
                await_durable: true,
                ..Default::default()
            },
        )
        .await
        .unwrap();
    let read = storage.begin_read(Default::default()).await.unwrap();
    assert!(
        load_partial_merge_state(&read, &old, &request.branch_id)
            .await
            .is_err()
    );
    drop(read);
    // Memory exercises the guarded migration owner directly; it does not
    // advertise the durable-read capability required by the public opener.
    let read = storage.begin_read(Default::default()).await.unwrap();
    let mut writes = storage.new_write_set();
    let guards = crate::sync::partial_merge_state::prepare_owned_partial_merge_upload_upgrade(
        &read,
        &mut writes,
        &old,
    )
    .await
    .unwrap();
    drop(read);
    storage
        .commit_partial_replica_write_set(
            crate::sync::partial_replica_write_capability(),
            writes,
            StorageWriteOptions {
                preconditions: guards,
                await_durable: true,
                ..Default::default()
            },
        )
        .await
        .unwrap();
    let read = storage.begin_read(Default::default()).await.unwrap();
    let (after, _, _) = load_partial_merge_state(&read, &old, &request.branch_id)
        .await
        .unwrap();
    let after = after.unwrap();
    assert_eq!(after, before);
    assert_eq!(after.authority_receipt, Some(receipt));
    assert_eq!(
        blake3::hash(&serde_json::to_vec(&after.request).unwrap()),
        blake3::hash(&serde_json::to_vec(&request).unwrap())
    );
    drop(read);
    assert_eq!(admitted_controls(&storage, &old).await.unwrap(), controls);
    assert!(
        value(
            session
                .execute("SELECT value FROM lix_key_value WHERE key='resident'", &[])
                .await
                .unwrap()
        )
        .contains("newer-L2")
    );
}
#[tokio::test]
async fn merge_capture_racing_a_local_write_fails_without_creating_an_attempt() {
    let (authority, engine, session, old) = fixture().await;
    let storage = engine.storage();
    execute_hydrating(
        &session,
        &storage,
        &old,
        &authority,
        "UPDATE lix_key_value SET value='L' WHERE key='resident'",
        &[],
        &mut Fetches::default(),
    )
    .await
    .unwrap();
    authority
        .execute(
            "INSERT INTO lix_key_value (key,value) VALUES('remote-only','R')",
            &[],
        )
        .await
        .unwrap();
    let request = captured_request(&authority, &engine, &old).await;
    let read = storage.begin_read(Default::default()).await.unwrap();
    let mut writes = storage.new_write_set();
    let guards = stage_capture_partial_merge(&read, &mut writes, &old, &request)
        .await
        .unwrap();
    drop(read);
    execute_hydrating(
        &session,
        &storage,
        &old,
        &authority,
        "UPDATE lix_key_value SET value='L2' WHERE key='resident'",
        &[],
        &mut Fetches::default(),
    )
    .await
    .unwrap();
    assert!(
        storage
            .commit_partial_replica_write_set(
                crate::sync::partial_replica_write_capability(),
                writes,
                StorageWriteOptions {
                    preconditions: guards,
                    await_durable: true,
                    ..Default::default()
                }
            )
            .await
            .is_err()
    );
    let read = storage.begin_read(Default::default()).await.unwrap();
    assert!(
        load_partial_merge_state(&read, &old, &request.branch_id)
            .await
            .unwrap()
            .0
            .is_none()
    );
}

#[tokio::test]
async fn merge_capture_invalidates_staged_ack_and_keeps_global_lane_available() {
    use crate::sync::partial_push_state::{
        PartialPushCoordinate, PreparedPartialUpload, load_partial_push_state,
        stage_acknowledge_partial_upload, stage_prepare_partial_upload,
    };
    let (authority, engine, session, old) = fixture().await;
    let storage = engine.storage();
    execute_hydrating(
        &session,
        &storage,
        &old,
        &authority,
        "UPDATE lix_key_value SET value='captured-L' WHERE key='resident'",
        &[],
        &mut Fetches::default(),
    )
    .await
    .unwrap();
    authority
        .execute(
            "INSERT INTO lix_key_value (key,value) VALUES('remote-only','R')",
            &[],
        )
        .await
        .unwrap();
    let request = captured_request(&authority, &engine, &old).await;
    let read = storage.begin_read(Default::default()).await.unwrap();
    let (selected, _, _) = load_partial_push_state(&read, &old, &request.branch_id)
        .await
        .unwrap();
    let upload = PreparedPartialUpload {
        created_refs: Vec::new(),
        attempt_id: uuid::Uuid::now_v7().to_string(),
        expected: selected.confirmed.clone(),
        target: PartialPushCoordinate {
            head: request.captured_local_head_commit_id.clone(),
            checkpoint: request.checkpoint_commit_id.clone(),
        },
    };
    let mut writes = storage.new_write_set();
    let preconditions =
        stage_prepare_partial_upload(&read, &mut writes, &old, &request.branch_id, &upload)
            .await
            .unwrap();
    drop(read);
    storage
        .commit_partial_replica_write_set(
            crate::sync::partial_replica_write_capability(),
            writes,
            StorageWriteOptions {
                preconditions,
                await_durable: true,
                ..Default::default()
            },
        )
        .await
        .unwrap();

    // ACK was fully staged before merge capture, against exactly the same
    // unchanged push record. Its merge-absence guard must reject publication.
    let read = storage.begin_read(Default::default()).await.unwrap();
    let mut ack_writes = storage.new_write_set();
    let ack_guards = stage_acknowledge_partial_upload(
        &read,
        &mut ack_writes,
        &old,
        &request.branch_id,
        &upload,
        true,
    )
    .await
    .unwrap();
    let mut capture = storage.new_write_set();
    let preconditions = stage_capture_partial_merge(&read, &mut capture, &old, &request)
        .await
        .unwrap();
    drop(read);
    storage
        .commit_partial_replica_write_set(
            crate::sync::partial_replica_write_capability(),
            capture,
            StorageWriteOptions {
                preconditions,
                await_durable: true,
                ..Default::default()
            },
        )
        .await
        .unwrap();
    assert!(
        storage
            .commit_partial_replica_write_set(
                crate::sync::partial_replica_write_capability(),
                ack_writes,
                StorageWriteOptions {
                    preconditions: ack_guards,
                    await_durable: true,
                    ..Default::default()
                }
            )
            .await
            .is_err()
    );

    let read = storage.begin_read(Default::default()).await.unwrap();
    let (unchanged, _, _) = load_partial_push_state(&read, &old, &request.branch_id)
        .await
        .unwrap();
    assert_eq!(unchanged.confirmed, upload.expected);
    assert_eq!(unchanged.prepared.as_ref(), Some(&upload));
    let (merge, _, _) = load_partial_merge_state(&read, &old, &request.branch_id)
        .await
        .unwrap();
    assert_eq!(merge.unwrap().original_upload, Some(upload.clone()));
    for branch in [request.branch_id.as_str(), crate::GLOBAL_BRANCH_ID] {
        let (push, _, _) = load_partial_push_state(&read, &old, branch).await.unwrap();
        let attempt = if branch == request.branch_id {
            upload.clone()
        } else {
            PreparedPartialUpload {
                created_refs: Vec::new(),
                attempt_id: uuid::Uuid::now_v7().to_string(),
                expected: push.confirmed.clone(),
                target: push.confirmed,
            }
        };
        let prepared = stage_prepare_partial_upload(
            &read,
            &mut storage.new_write_set(),
            &old,
            branch,
            &attempt,
        )
        .await;
        if branch == crate::GLOBAL_BRANCH_ID {
            assert!(
                prepared.is_ok(),
                "independent GLOBAL publication must remain available"
            );
            continue;
        }
        let error = prepared.unwrap_err();
        assert_eq!(error.code, "LIX_PARTIAL_REPLICA_MERGE_PENDING");
        for ref_accepted in [false, true] {
            let error = stage_acknowledge_partial_upload(
                &read,
                &mut storage.new_write_set(),
                &old,
                branch,
                &attempt,
                ref_accepted,
            )
            .await
            .unwrap_err();
            assert_eq!(error.code, "LIX_PARTIAL_REPLICA_MERGE_PENDING");
        }
    }
}