Struct ConflictResolver 

pub struct ConflictResolver { /* private fields */ }

Handles conflict resolution using Diamond-Types CRDT.

The conflict resolver intercepts updates marked with merge-type: "diamond", applies them to the appropriate resource’s CRDT, and returns the merged result. This ensures deterministic convergence across all peers.

Request/Response Formats

Plain Text Updates:

• Inserts text at position 0
• Body can be plain text or JSON

Structured JSON Updates:

• "inserts": Array of {pos, text} objects
• "deletes": Array of {start, end} objects
• All operations are applied and merged into the CRDT

Implementations

impl ConflictResolver

pub fn new(resource_manager: ResourceStateManager) -> Self

Create a new conflict resolver with the given resource manager.

Arguments

• resource_manager - The centralized resource state registry

Examples

use crate::core::server::{ConflictResolver, ResourceStateManager};

let manager = ResourceStateManager::new();
let resolver = ConflictResolver::new(manager);

pub async fn resolve_update( &self, resource_id: &str, update: &Update, agent_id: &str, ) -> Result<Update, String>

Resolve an update by applying CRDT semantics if needed.

If the update has merge-type: "diamond", it’s applied to the resource’s CRDT. Otherwise, the update is returned unchanged (no merge strategy applied).

Arguments

• resource_id - The resource being updated
• update - The incoming Braid update
• agent_id - Origin agent identifier

Returns

The resolved update with merged content and current version.

Examples

let resolver = ConflictResolver::new(manager);
let update = Update::snapshot(Version::new("v1"), "hello")
    .with_merge_type("diamond");
let result = resolver.resolve_update("doc1", &update, "alice").await?;

pub async fn get_history( &self, resource_id: &str, since_versions: &[&str], ) -> Result<Vec<Update>, String>

Retrieve history for a resource since specific versions.

pub fn get_resource_content(&self, resource_id: &str) -> Option<String>

Get the current content of a resource.

Arguments

• resource_id - Resource to query

Returns

Current document text, or None if the resource doesn’t exist.

pub fn get_resource_version(&self, resource_id: &str) -> Option<Version>

Get the current version of a resource.

Arguments

• resource_id - Resource to query

Returns

Current version identifier, or None if the resource doesn’t exist.

Trait Implementations

impl Clone for ConflictResolver

fn clone(&self) -> ConflictResolver

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.