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
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
//! Explicit migration reconciliation; original full source is read-only.
use super::*;
use crate::migration::PendingConversionJournal;
use crate::storage_adapter::{Storage, StorageAdapter};
pub(crate) trait ConversionJournalOwner {
    fn current(&self) -> &PendingConversionJournal;
    fn publish(&mut self, next: PendingConversionJournal) -> SyncTransportFuture<'_, ()>;
    fn publish_global_successor(
        &mut self,
        _next: PendingConversionJournal,
        _proof: MigrationGlobalSuccessor,
    ) -> SyncTransportFuture<'_, ()> {
        Box::pin(async {
            Err(unresolved(
                "migration journal owner does not admit a changed global successor",
            ))
        })
    }
}
/// Created only after exact terminal restart plus authenticated native ancestry.
/// Authority native merge admission still validates the full candidate catalog,
/// original selections, uniqueness, foreign keys and plugins under new G.
pub(crate) struct MigrationGlobalSuccessor {
    old: PartialMergeRequest,
    next: PartialMergeRequest,
    receipt: PartialAttemptRestartReceipt,
}
impl MigrationGlobalSuccessor {
    pub(crate) fn validate_transition(
        &self,
        previous: &PendingConversionJournal,
        next: &PendingConversionJournal,
        repository: &str,
        account: &str,
    ) -> Result<(), LixError> {
        let intent = previous
            .restart
            .as_ref()
            .ok_or_else(|| unresolved("successor lacks durable restart intent"))?;
        self.receipt.validate_for(repository, account, intent)?;
        if previous.request != self.old
            || next.request != self.next
            || previous.restart_receipt.as_ref() != Some(&self.receipt)
            || previous.native_source_pin.is_none()
            || previous.native_source_pin != next.native_source_pin
            || next.request.attempt_id != intent.next_attempt_id
        {
            return Err(unresolved(
                "global successor proof differs from exact journal transition",
            ));
        }
        let mut frozen = self.next.clone();
        frozen.attempt_id = self.old.attempt_id.clone();
        frozen.expected_authority_head_commit_id =
            self.old.expected_authority_head_commit_id.clone();
        frozen.global_head_commit_id = self.old.global_head_commit_id.clone();
        if frozen != self.old {
            return Err(unresolved(
                "global successor changed original source coordinates",
            ));
        }
        Ok(())
    }
}
pub(crate) struct ReconciledPendingConversion {
    manifest_digest: [u8; 32],
    source_branch: String,
    source_head: String,
    state: PartialReplicaState,
    deadline: http::CandidateBaselineDeadline,
}
impl ReconciledPendingConversion {
    pub(crate) fn source_coordinate(&self) -> (&str, &str) {
        (&self.source_branch, &self.source_head)
    }
    pub(crate) fn manifest_digest(&self) -> [u8; 32] {
        self.manifest_digest
    }
    pub(crate) fn state(&self) -> &PartialReplicaState {
        &self.state
    }
    pub(crate) fn check_deadline(&self) -> Result<(), LixError> {
        self.deadline.check(&self.state.baseline_lease().lease_id)
    }
}
fn unresolved(message: &str) -> LixError {
    LixError::new("LIX_PARTIAL_CONVERSION_UNRESOLVED", message)
        .with_details(serde_json::json!({"sourcePreserved":true,"retrySameConversion":true}))
}
fn id(value: &str) -> Result<crate::changelog::CommitId, LixError> {
    crate::changelog::CommitId::parse_lix(value, "conversion native coordinate")
}
pub(super) async fn graph<C: http::RawHttpClient + Clone + 'static>(
    transport: &http::HttpSyncTransport<C>,
    commit: &str,
) -> Result<crate::changelog::CommitRecord, LixError> {
    let response = transport
        .native_metadata(&NativeMetadataRequest {
            epoch_id: uuid::Uuid::now_v7().to_string(),
            objects: vec![crate::tracked_state::NativeMetadataRef::CommitGraphRecord(
                commit.into(),
            )],
        })
        .await?;
    let object = response
        .objects
        .first()
        .ok_or_else(|| unresolved("conversion native graph response is empty"))?;
    crate::commit_graph::validate_native_commit_graph_record(id(commit)?, &object.bytes)?;
    crate::storage_codec::decode("conversion native graph", &object.bytes)
}
pub(super) async fn includes<C: http::RawHttpClient + Clone + 'static>(
    transport: &http::HttpSyncTransport<C>,
    ancestor: &str,
    head: &str,
) -> Result<bool, LixError> {
    let ancestor_record = graph(transport, ancestor).await?;
    let mut pending = vec![head.to_owned()];
    let mut seen = std::collections::BTreeSet::new();
    while let Some(commit) = pending.pop() {
        if commit == ancestor {
            return Ok(true);
        }
        if !seen.insert(commit.clone()) {
            continue;
        }
        if seen.len() > 4096 {
            return Err(unresolved(
                "conversion ancestry exceeds bounded proof budget",
            ));
        }
        let record = graph(transport, &commit).await?;
        if record.generation <= ancestor_record.generation {
            continue;
        }
        if record.parent_commit_ids.len() == 1
            && record.first_parent_jump_span > 0
            && record
                .generation
                .checked_sub(record.first_parent_jump_span)
                .is_some_and(|generation| generation >= ancestor_record.generation)
        {
            // Native Myers jumps cover only a certified linear corridor; merge
            // nodes reset the lane, so no causal side parent is skipped.
            let jump = graph(transport, &record.first_parent_jump_commit_id.to_string()).await?;
            if record.generation.checked_sub(record.first_parent_jump_span) != Some(jump.generation)
            {
                return Err(unresolved(
                    "conversion native jump generation is inconsistent",
                ));
            }
            pending.push(jump.commit_id.to_string());
        } else {
            pending.extend(
                record
                    .parent_commit_ids
                    .into_iter()
                    .map(|id| id.to_string()),
            );
        }
    }
    Ok(false)
}
fn validate_descriptor(
    request: &PartialMergeRequest,
    descriptor: &PartialReplicaDescriptor,
) -> Result<(), LixError> {
    if descriptor.selected_branch.branch_id != request.branch_id
        || descriptor.selected_branch.checkpoint.commit_id != request.checkpoint_commit_id
        || descriptor.global_branch.head.commit_id != request.global_head_commit_id
        || descriptor.global_branch.checkpoint.commit_id != request.global_checkpoint_commit_id
    {
        return Err(unresolved(
            "catalog or checkpoint changed; original source and exact native outcomes remain retained",
        ));
    }
    Ok(())
}
async fn restart<C: http::RawHttpClient + Clone + 'static>(
    journal: &mut impl ConversionJournalOwner,
    transport: &http::HttpSyncTransport<C>,
) -> Result<(), LixError> {
    let current = journal.current().clone();
    let intent = current
        .restart
        .clone()
        .unwrap_or_else(|| PartialAttemptRestartRequest {
            old: current.request.clone(),
            next_attempt_id: uuid::Uuid::now_v7().to_string(),
            abandon: false,
        });
    if current.restart.is_none() {
        let mut next = current.clone();
        next.restart = Some(intent.clone());
        journal.publish(next).await?;
    }
    if journal.current().restart_receipt.is_none() {
        let outcome = transport.restart_partial_attempt(&intent).await?;
        let mut next = journal.current().clone();
        match outcome {
            PartialAttemptRestartOutcome::Committed { receipt, .. } => {
                next.receipt = Some(receipt);
                next.accepted_tip = next.request.captured_local_head_commit_id.clone();
                next.prepared_tip = None;
                next.restart = None;
                next.restart_receipt = None;
                journal.publish(next).await?;
                return Ok(());
            }
            PartialAttemptRestartOutcome::Restarted { receipt } => {
                next.restart_receipt = Some(receipt);
                journal.publish(next).await?;
            }
        }
    }
    let descriptor = transport
        .partial_replica_descriptor(Some(&intent.old.branch_id))
        .await?;
    let changed_global =
        descriptor.wire.descriptor.global_branch.head.commit_id != intent.old.global_head_commit_id;
    if changed_global {
        let view = &descriptor.wire.descriptor;
        if journal.current().native_source_pin.is_none()
            || view.selected_branch.branch_id != intent.old.branch_id
            || view.selected_branch.checkpoint.commit_id != intent.old.checkpoint_commit_id
            || view.global_branch.checkpoint.commit_id != intent.old.global_checkpoint_commit_id
        {
            return Err(unresolved(
                "global successor requires native source pin and unchanged branch/checkpoints",
            ));
        }
        descriptor.deadline.check(&descriptor.wire.lease.lease_id)?;
        let leased = transport.fork_native_baseline_lease(&descriptor.wire.lease)?;
        if !includes(
            &leased,
            &intent.old.global_head_commit_id,
            &view.global_branch.head.commit_id,
        )
        .await?
        {
            return Err(unresolved(
                "new global basis is not a descendant of the terminally fenced attempt",
            ));
        }
        descriptor.deadline.check(&descriptor.wire.lease.lease_id)?;
    } else {
        validate_descriptor(&intent.old, &descriptor.wire.descriptor)?;
    }
    let previous = journal.current().clone();
    let mut next = journal.current().clone();
    next.request.attempt_id = intent.next_attempt_id.clone();
    if changed_global {
        next.request.global_head_commit_id = descriptor
            .wire
            .descriptor
            .global_branch
            .head
            .commit_id
            .clone();
    }
    next.request.expected_authority_head_commit_id =
        descriptor.wire.descriptor.selected_branch.head.commit_id;
    if next.native_source_pin.is_none() {
        next.accepted_tip = next.request.base_commit_id.clone();
    }
    next.prepared_tip = None;
    next.restart = None;
    next.restart_receipt = None;
    if changed_global {
        let proof = MigrationGlobalSuccessor {
            old: intent.old,
            next: next.request.clone(),
            receipt: previous
                .restart_receipt
                .ok_or_else(|| unresolved("global successor lacks durable terminal receipt"))?,
        };
        journal.publish_global_successor(next, proof).await
    } else {
        journal.publish(next).await
    }
}
/// All waves are immutable source exports; every prepared target and accepted
/// outcome becomes durable before proceeding. Cancellation leaves resumable
/// source-bank keyed state, including exact restart UUIDs.
pub(crate) async fn reconcile_pending_conversion<S, C>(
    source: &StorageAdapter<S>,
    journal: &mut impl ConversionJournalOwner,
    transport: &http::HttpSyncTransport<C>,
    remote: &str,
    epoch: &str,
) -> Result<ReconciledPendingConversion, LixError>
where
    S: Storage + Clone + Send + Sync + 'static,
    C: http::RawHttpClient + Clone + 'static,
{
    loop {
        let current = journal.current().clone();
        if current.restart.is_some() {
            restart(journal, transport).await?;
            continue;
        }
        // An ordinary ACK may have been lost before conversion began. An exact
        // authenticated native L head is already a valid inclusion proof, not M=[L,L].
        if current.receipt.is_some()
            || current.request.expected_authority_head_commit_id
                == current.request.captured_local_head_commit_id
        {
            break;
        }
        if current.accepted_tip == current.request.captured_local_head_commit_id {
            let result = if let Some(pin) = &current.native_source_pin {
                transport
                    .merge_native_migration(&NativeMigrationMergeRequest {
                        request: current.request.clone(),
                        source_branch_id: pin.clone(),
                    })
                    .await
            } else {
                transport.merge_partial_replica(&current.request).await
            };
            match result {
                Ok(receipt) => {
                    let mut next = current;
                    next.receipt = Some(receipt);
                    journal.publish(next).await?;
                    break;
                }
                Err(error)
                    if matches!(
                        error.code.as_str(),
                        "LIX_NATIVE_UPLOAD_ATTEMPT_EXPIRED"
                            | "LIX_PARTIAL_ATTEMPT_RESTARTED"
                            | "LIX_PARTIAL_MERGE_AUTHORITY_CHANGED"
                    ) =>
                {
                    restart(journal, transport).await?;
                    continue;
                }
                Err(error) => return Err(error),
            }
        }
        if let Some(pin) = &current.native_source_pin {
            let read = crate::migration::MigrationPlanningRead::new(source).await?;
            let wave = native_migration_pin_upload::native_migration_pin_wave(
                &read,
                &current.request,
                pin,
                &current.accepted_tip,
                current.prepared_tip.as_deref(),
                current.accepted_tip != current.request.base_commit_id,
            )
            .await?;
            drop(read);
            let target = wave.ref_updates[0]
                .head_commit_id
                .clone()
                .ok_or_else(|| unresolved("migration wave omitted source pin target"))?;
            let mut next = current.clone();
            next.prepared_tip = Some(target.clone());
            journal.publish(next).await?;
            native_migration_pin_upload::push_native_migration_with_blobs(
                source,
                transport.active_account_id(),
                transport,
                &wave,
            )
            .await?;
            let mut next = journal.current().clone();
            next.accepted_tip = target;
            next.prepared_tip = None;
            journal.publish(next).await?;
            continue;
        }
        let prepared = current.prepared_tip.as_ref().map(|target| {
            partial_merge_state::PreparedMergeBodyWave {
                previous: current.accepted_tip.clone(),
                target: target.clone(),
            }
        });
        let read = crate::migration::MigrationPlanningRead::new(source).await?;
        let wave = partial_merge_runtime::captured_wave(
            &read,
            &current.request,
            &current.accepted_tip,
            prepared.as_ref(),
        )
        .await?;
        drop(read);
        let target = wave
            .bodies
            .commits
            .last()
            .ok_or_else(|| unresolved("empty conversion native wave"))?
            .commit_id
            .clone();
        let mut next = current.clone();
        next.prepared_tip = Some(target.clone());
        journal.publish(next).await?;
        match transport.retained_body_wave(&wave).await {
            Ok(response) => {
                if response.accepted_tip != target {
                    return Err(unresolved(
                        "authority changed conversion wave acknowledgment",
                    ));
                }
            }
            Err(error)
                if matches!(
                    error.code.as_str(),
                    "LIX_NATIVE_UPLOAD_ATTEMPT_EXPIRED" | "LIX_PARTIAL_ATTEMPT_RESTARTED"
                ) =>
            {
                restart(journal, transport).await?;
                continue;
            }
            Err(error) => return Err(error),
        }
        let mut next = journal.current().clone();
        next.accepted_tip = target;
        next.prepared_tip = None;
        journal.publish(next).await?;
    }
    let current = journal.current();
    let wrapper = transport
        .partial_replica_descriptor(Some(&current.request.branch_id))
        .await?;
    // A durable exact M is validated below against its original global base.
    // Later authority catalog advances do not invalidate that native outcome;
    // they require a separate authenticated ancestry proof, never a new request.
    if current.receipt.is_some() {
        let descriptor = &wrapper.wire.descriptor;
        if descriptor.selected_branch.branch_id != current.request.branch_id
            || descriptor.selected_branch.checkpoint.commit_id
                != current.request.checkpoint_commit_id
            || descriptor.global_branch.checkpoint.commit_id
                != current.request.global_checkpoint_commit_id
        {
            return Err(unresolved("recovered outcome checkpoint or branch changed"));
        }
    } else {
        validate_descriptor(&current.request, &wrapper.wire.descriptor)?;
    }
    wrapper.deadline.check(&wrapper.wire.lease.lease_id)?;
    let leased = transport.fork_native_baseline_lease(&wrapper.wire.lease)?;
    if current.receipt.is_some()
        && current.request.global_head_commit_id
            != wrapper.wire.descriptor.global_branch.head.commit_id
    {
        if !includes(
            &leased,
            &current.request.global_head_commit_id,
            &wrapper.wire.descriptor.global_branch.head.commit_id,
        )
        .await?
        {
            return Err(unresolved(
                "current global state no longer retains the recovered merge basis",
            ));
        }
    }
    let included = if let Some(receipt) = &current.receipt {
        receipt.validate_for(&current.request)?;
        let native = graph(&leased, &receipt.merge_commit_id).await?;
        if native.is_checkpoint
            || native.parent_commit_ids
                != vec![
                    id(&current.request.expected_authority_head_commit_id)?,
                    id(&current.request.captured_local_head_commit_id)?,
                ]
            || native.account_id != transport.active_account_id()
            || native.base_commit_id != Some(id(&current.request.global_head_commit_id)?)
        {
            return Err(unresolved(
                "authority native M does not include original source L",
            ));
        }
        receipt.merge_commit_id.as_str()
    } else {
        current.request.captured_local_head_commit_id.as_str()
    };
    if !includes(
        &leased,
        included,
        &wrapper.wire.descriptor.selected_branch.head.commit_id,
    )
    .await?
    {
        return Err(unresolved(
            "authority no longer descends from the exact recovered native outcome",
        ));
    }
    wrapper.deadline.check(&wrapper.wire.lease.lease_id)?;
    let state = PartialReplicaState::from_leased(
        remote.into(),
        transport.active_account_id().into(),
        epoch.into(),
        wrapper.wire,
    )?;
    Ok(ReconciledPendingConversion {
        manifest_digest: current.manifest_digest,
        source_branch: current.request.branch_id.clone(),
        source_head: current.request.captured_local_head_commit_id.clone(),
        state,
        deadline: wrapper.deadline,
    })
}

pub(crate) async fn reconcile_pending_conversion_authenticated<
    S: Storage + Clone + Send + Sync + 'static,
>(
    source: &StorageAdapter<S>,
    journal: &mut impl ConversionJournalOwner,
    authenticated: &AuthenticatedPartialConversion,
) -> Result<ReconciledPendingConversion, LixError> {
    use futures_util::FutureExt as _;
    let server = authenticated.server();
    let transport = http::HttpSyncTransport::connect(&server.url, &server.headers).await?;
    let result = async {
        if transport.lix_id() != authenticated.state().repository_id()
            || transport.active_account_id() != authenticated.state().active_account_id()
        {
            return Err(unresolved(
                "migration connection changed authenticated repository/account",
            ));
        }
        reconcile_pending_conversion(
            source,
            journal,
            &transport,
            &server.url,
            authenticated.state().epoch_id(),
        )
        .await
    }
    .await;
    let close = transport.close_session().fuse();
    let timeout = sleep(Duration::from_secs(1)).fuse();
    futures_util::pin_mut!(close, timeout);
    futures_util::select_biased! {_=close=>{},_=timeout=>{}};
    result
}

/// Cleanup is best effort after durable epoch publication; cancellation keeps
/// the original journal coordinates available for an exact retry.
pub(crate) async fn cleanup_pending_conversion_authenticated(
    authenticated: &AuthenticatedPartialConversion,
    journal: &PendingConversionJournal,
) -> Result<(), LixError> {
    let pin = journal
        .native_source_pin
        .as_ref()
        .ok_or_else(|| unresolved("cleanup journal has no native source pin"))?;
    if journal.receipt.is_none() {
        return Err(unresolved("cleanup lacks a durable native merge outcome"));
    }
    let server = authenticated.server();
    let transport = http::HttpSyncTransport::connect(&server.url, &server.headers).await?;
    let result = async {
        if transport.lix_id() != authenticated.state().repository_id()
            || transport.active_account_id() != authenticated.state().active_account_id()
        {
            return Err(unresolved("cleanup authority identity changed"));
        }
        transport
            .cleanup_native_migration(&NativeMigrationCleanupRequest {
                migration: NativeMigrationMergeRequest {
                    request: journal.request.clone(),
                    source_branch_id: pin.clone(),
                },
            })
            .await?;
        Ok(())
    }
    .await;
    let _ = transport.close_session().await;
    result
}
pub(crate) async fn finish_conversion_cleanup_bounded<F: Future<Output = Result<(), LixError>>>(
    cleanup: F,
) {
    use futures_util::FutureExt as _;
    let cleanup = cleanup.fuse();
    let timeout = sleep(Duration::from_secs(1)).fuse();
    futures_util::pin_mut!(cleanup, timeout);
    futures_util::select_biased! {_=cleanup=>{},_=timeout=>{}};
}