libnoa 0.1.1

AI-native distributed version control system with per-agent workspace isolation, JSONL append-only logs, snapshot-based history, and full git protocol compatibility
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

use anyhow::Result;

use crate::{log::AgentLog, merge::ConflictResolution, repo::Repository};

pub async fn run_resolve(
    repo: &Repository,
    strategy: &str,
    path_filter: Option<&str>,
) -> Result<()> {
    let _resolution = match strategy {
        "ours" => ConflictResolution::Ours,
        "theirs" => ConflictResolution::Theirs,
        _ => anyhow::bail!(
            "unknown strategy '{}', expected 'ours' or 'theirs'",
            strategy
        ),
    };

    let current = repo.read_head()?;
    let log = repo.agent_log(&current)?;

    let entries = log.read_all().await?;
    let merge_entries: Vec<_> = entries
        .iter()
        .filter(|e| e.op == crate::log::OpType::Merge)
        .collect();

    if merge_entries.is_empty() {
        println!("No pending conflicts found.");
        return Ok(());
    }

    let latest_merge = merge_entries.last().unwrap();
    let ours_id = latest_merge
        .resolved_conflict_ours_id
        .as_deref()
        .unwrap_or("?");
    let theirs_id = latest_merge
        .resolved_conflict_theirs_id
        .as_deref()
        .unwrap_or("?");

    let now = chrono::Utc::now().timestamp_micros() as u64;
    let resolved_path = path_filter
        .map(|p| p.to_string())
        .or_else(|| latest_merge.path.clone())
        .unwrap_or_default();

    log.append(&crate::log::LogEntry {
        seq: 0,
        op: crate::log::OpType::Resolve,
        path: Some(resolved_path.clone()),
        blob_id: None,
        from_path: None,
        resolved_conflict_ours_id: Some(ours_id.to_string()),
        resolved_conflict_theirs_id: Some(theirs_id.to_string()),
        snapshot_id: None,
        ts: now,
        message: Some(format!("resolve {} with {}", resolved_path, strategy)),
    })
    .await?;

    println!(
        "Resolved conflict on '{}' with strategy '{}' (ours={}, theirs={})",
        resolved_path, strategy, ours_id, theirs_id
    );
    println!("Run 'noa snapshot create' to commit the resolution.");
    Ok(())
}