.i$dZddlmZddlZddlmZmZddlmZeje Z eGddZ Gdd Z y) u` core/merge/conflict_detector.py ConflictDetector — analyzes multiple StateDelta patches for logical contradictions. Used by SemanticMergeInterceptor to decide if Opus arbitration is needed. Conflict types detected: 1. path_collision — two deltas write the same JSON path with different values 2. op_contradiction — one delta adds at path X, another removes at path X 3. semantic_contradiction — two deltas replace the same field with different values # VERIFICATION_STAMP # Story: 7.01 # Verified By: parallel-builder # Verified At: 2026-02-25 # Tests: 10/10 # Coverage: 100% ) annotationsN) dataclassfield)AnycpeZdZUdZded<eeZded<eeZded<eeZ ded <y ) ConflictReportzBResult of conflict detection across multiple StateDelta proposals.bool has_conflicts)default_factory list[str]conflicting_pathsconflict_typeslistnon_conflicting_deltasN) __name__ __module__ __qualname____doc____annotations__rrr rr5/mnt/e/genesis-system/core/merge/conflict_detector.pyrr"s:L#(#>y> %d ;NI;#(#>D>rrc\eZdZdZddZddZed dZe d dZy) ConflictDetectorag Analyzes multiple StateDelta patches for logical contradictions. A StateDelta is expected to have a ``patch`` attribute that is either a tuple or list of RFC 6902 operation dicts. Plain dicts with a ``patch`` key are also accepted (for testing convenience). Algorithm --------- 1. Build a path-ops map: for every delta, collect every (path, op, value) triple and record which delta index it came from. 2. For each path that appears in more than one delta, run three checks: - Type 1 (path_collision): same path, op is add/replace, values differ. - Type 2 (op_contradiction): mix of add and remove ops at same path. - Type 3 (semantic_contradiction): same path, op is replace, values differ. 3. Deltas whose indices never appear in the conflict set are returned as ``non_conflicting_deltas``. c|s tdgSt|dk(rtdt|Si}t|D]w\}}|j |}|D]\}|j dd}|j dd}|j dd} |j |gj||| f^yg} g} t} |jD])\}} t| d kr|j|| | | | +t|Dcgc] \}}|| vs |}}}t| }t|| | | }tjd t||| | |Scc}}w) a0 Analyze *deltas* for logical conflicts. Args: deltas: List of StateDelta objects (or dicts with a ``patch`` key). Returns: ConflictReport describing all detected conflicts and which deltas are safe to merge without Opus arbitration. F)r rpathopvalueN)r r rruKConflictDetector.detect: %d deltas → has_conflicts=%s, paths=%s, types=%s)rlenr enumerate_extract_patchget setdefaultappendsetitems _check_pathr loggerdebug)selfdeltaspath_opsidxdeltapatchop_dictrop_typer r rconflicting_indicesopsidnon_conflictingr reports rdetectzConflictDetector.detectJs!bQ Q v;! !#'+F| ;=#F+ LJC''.E  L#KK3&{{44$[[$7##D"-44c7E5JK  L L(*$&(+!) ID#3x!|   !#   $F+ !Qq8K/KA  ./ '/)#2    Y K      % s  E% E%c\g}|D]$}|j|}|j|&|S)u Merge non-conflicting patches into a single combined operation list. No Opus arbitration call needed — patches are simply concatenated in submission order. Args: non_conflicting_deltas: List of StateDelta / dict objects whose patches are known not to conflict. Returns: Flat list of RFC 6902 operation dicts from all supplied deltas. )r$extend)r-rmergedr1r2s r fast_mergezConflictDetector.fast_merges; + !E''.E MM%  ! rct|dr |j}n%t|tr|j dg}ng}t|t r t |St|t r|SgS)z Return the patch as a plain list regardless of whether *delta* is a StateDelta (with a ``patch`` tuple attribute) or a plain dict. r2)hasattrr2 isinstancedictr%tupler)r1r2s rr$zConflictDetector._extract_patchs` 5' "KKE t $IIgr*EE eU #;  eT "L rcd}|Dcgc]\}}}|dvr|||f} }}}t| dk\rr| D chc]\} } }t|} } }t| dkDrF|s|j|d}d|vr|jd| D]\}} } |j||D chc]\} }} | } } }d| vrOd| vrK|s|j|d}d |vr|jd |D]\}}} |d vs |j||Dcgc]\}}}|d k(s ||f} }}}t| dk\rp| D chc]\} }t|}} }t|dkDrD|s|j|d |vr|jd | D]\}} |j|y y y cc}}}wcc}} wcc}} wcc}}}wcc}} w)z Run all three conflict checks for a single *path* that appears in more than one delta. Mutates the supplied output collections in place. F)addreplacer!rTpath_collisionrFremoveop_contradiction)rFrIrGsemantic_contradictionN)r"reprr'rF)rr6r rr5path_already_recordedr0r4val write_ops_ unique_reprsop_types_present replace_opsunique_replace_reprss rr*zConflictDetector._check_paths.!& &)  !Wc,,'3   y>Q 7@A)!QDIALA< 1$,%,,T2,0)#>9"))*:;!*1ICA'++C01:== 7AG== $ $5E)E(!((.(,%!7%%&89#& 1Wa//'++C0 1 14  ,3w)7KS#J   { q A"))*BC)1FC'++C01 - !A B> $Is"F'F.& F4F:F:;GN)r.rreturnr)rrrU list[dict])r1rrUrV) rstrr6zlist[tuple[int, str, Any]]r r rr r5zset[int]rUNone) rrrrr;r? staticmethodr$r*rrrrr2ss.EN0&7171 '71%71" 71 & 71  7171rr)r __future__rlogging dataclassesrrtypingr getLoggerrr+rrrrrr_sO&#(   8 $ ?? ?C1C1r