weave-cli 0.7.0

Entity-level semantic merge CLI. Resolves conflicts at the function/class level instead of lines.
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

use std::fs;
use weave_core::parse_weave_conflicts;

pub(crate) fn run(file_path: &str, json: bool) -> Result<(), Box<dyn std::error::Error>> {
    let content = fs::read_to_string(file_path)
        .map_err(|e| format!("Failed to read {}: {}", file_path, e))?;

    let conflicts = parse_weave_conflicts(&content);

    if json {
        let json_conflicts: Vec<serde_json::Value> = conflicts
            .iter()
            .map(|c| {
                serde_json::json!({
                    "entity": c.entity_name,
                    "kind": c.entity_kind,
                    "complexity": format!("{}", c.complexity),
                    "confidence": c.confidence,
                    "refused_by": c.refusal,
                })
            })
            .collect();

        let output = serde_json::json!({
            "file": file_path,
            "conflict_count": conflicts.len(),
            "conflicts": json_conflicts,
        });

        println!("{}", serde_json::to_string_pretty(&output)?);
    } else {
        if conflicts.is_empty() {
            println!("No weave conflicts found in {}", file_path);
            return Ok(());
        }

        println!("{} conflict(s) in {}\n", conflicts.len(), file_path);

        for (i, c) in conflicts.iter().enumerate() {
            println!(
                "  {}. {} `{}` ({}, confidence: {})",
                i + 1,
                c.entity_kind,
                c.entity_name,
                c.complexity,
                c.confidence
            );
            println!("     refused_by: {}\n", c.refusal);
        }
    }

    Ok(())
}