i/UdZddlZddlZddlmZmZddlmZmZm Z m Z ddl m Z Gdde Z eGdd ZeGd d ZeGd d Zdede eeeeffdZdededefdZdeede deefdZdeede ddfdZdede de eeffdZdede de eeffdZdede de eeffdZdede de eeffdZdS)a V4A Patch Format Parser Parses the V4A patch format used by codex, cline, and other coding agents. V4A Format: *** Begin Patch *** Update File: path/to/file.py @@ optional context hint @@ context line (space prefix) -removed line (minus prefix) +added line (plus prefix) *** Add File: path/to/new.py +new file content +line 2 *** Delete File: path/to/old.py *** Move File: old/path.py -> new/path.py *** End Patch Usage: from tools.patch_parser import parse_v4a_patch, apply_v4a_operations operations, error = parse_v4a_patch(patch_content) if error: print(f"Parse error: {error}") else: result = apply_v4a_operations(operations, file_ops) N) dataclassfield)ListOptionalTupleAny)EnumceZdZdZdZdZdZdS) OperationTypeaddupdatedeletemoveN)__name__ __module__ __qualname__ADDUPDATEDELETEMOVE7/home/ubuntu/.hermes/hermes-agent/tools/patch_parser.pyr r &s" C F F DDDrr c(eZdZUdZeed<eed<dS)HunkLinezA single line in a patch hunk.prefixcontentN)rrr__doc__str__annotations__rrrrr-s((( KKK LLLLLrrc\eZdZUdZdZeeed<ee Z e e ed<dS)Hunkz!A group of changes within a file.N context_hintdefault_factorylines) rrrrr#rrr rlistr&rrrrrr"r"4sM++"&L(3-&&&!E$777E4>77777rr"ceZdZUdZeed<eed<dZeeed<e e Z e e ed<dZeeed<dS) PatchOperationz"A single operation in a V4A patch. operation file_pathNnew_pathr$hunksr)rrrrr r rr,rrr'r-rr"rrrrr)r);sv,,NNN"Hhsm"""d333E4:333!GXc]!!!!!rr) patch_contentreturnc |d}g}d}d}t|D]\}}d|vsd|vr|}d|vsd|vr|}n|d}|t|}|dz}d}d}||krh||}tjd |} tjd |} tjd |} tjd |} | r~|r8|r!|jr|j|||ttj | d }d}n| r|r8|r!|jr|j|||ttj | d }t}n| r|r8|r!|jr|j|||ttj| d }||d}d}n]| r|r8|r!|jr|j|||ttj| d | d }||d}d}n|dre|ra|r!|jr|j|tjd|} | r| dnd}t|}n&|r#|r |t}|dr1|jt%d|ddn|dr1|jt%d|ddn|dr1|jt%d|ddn>|drn(|jt%d||dz }||kh|r8|r!|jr|j||||s|dfSg}|D]}|js|d|jtj kr%|js|d|jd|jtjkr%|js|d|jd|rgdd|zfS|dfS)a Parse a V4A format patch. Args: patch_content: The patch text in V4A format Returns: Tuple of (operations, error_message) - If successful: (list_of_operations, None) - If failed: ([], error_description)  Nz*** Begin Patchz***Begin Patchz *** End Patchz ***End Patchz\*\*\*\s*Update\s+File:\s*(.+)z\*\*\*\s*Add\s+File:\s*(.+)z\*\*\*\s*Delete\s+File:\s*(.+)z)\*\*\*\s*Move\s+File:\s*(.+?)\s*->\s*(.+))r*r+)r*r+r,z@@z@@\s*(.+?)\s*@@)r#+- \zOperation with empty file pathzUPDATE z: no hunks foundzMOVE z2: missing destination path (expected 'src -> dst')z Parse error: z; )split enumeratelenrematchr&r-appendr)r rgroupstriprr"rr startswithrr+r*r,join)r.r& operations start_idxend_idxiline current_op current_hunk update_match add_match delete_match move_match hint_matchhint parse_errorsops rparse_v4a_patchrREs    % %E')JIGU##4  $ $(8D(@(@II  $ $$(>(>G E)? e** A A+/J#'L g++Qxx A4HH H;TBB x A4HH XJDQQ Q ? .:L$6:$++L999!!*---''.&,,Q//5577J LL D ? .:L$6:$++L999!!*---''+#//!,,2244J 66LL 8 ? .:L$6:$++L999!!*---''.&,,Q//5577J   j ) ) )JLL * ? .:L$6:$++L999!!*---'',$**1--3355#))!,,2244J   j ) ) )JLL __T " " ? 7:L$6:$++L999 X&8$?? .8Bz''***d#666  ?D ?##vv s## ?"))(3QRR*A*ABBBB%% ?"))(3QRR*A*ABBBB%% ?"))(3QRR*A*ABBBB&& ?"))(3*=*=>>> Qy g++~&  2L. 2   # #L 1 1 1*%%%  4 Lll| B    @ A A A <=/ / / /    J", J J J K K K <=- - -bk -    j j j j k k k=?TYY|%<%<<<< t rtextpatternc`d}d} |||}|dkrn |dz }|dz}(|S)z9Count non-overlapping occurrences of *pattern* in *text*.rTr2r3)find)rSrTcountstartposs r_count_occurrencesrZsN E Eii'' "99   a  LrrCfile_opsc ddlm}g}|D]}|jtjkr||j}|jr%||jd|j_|j }|j D]O}d|j D}|sw|j rot||j } | dkr&||jd|j dn.| dkr(||jd|j d| d d |} d |j D} d | } ||| | d \} }}}|dkrk|j r d|j dnd}|jd|d|rd|ndz} ddlm}||||| |z }n#t $rYnwxYw||M| }Q|jtjkr@||j}|jr||jd|jtjkr|js||jdP||j}|jr||jd||j}|js||jd|S)aJValidate all operations without writing any files. Returns a list of error strings; an empty list means all operations are valid and the apply phase can proceed safely. For UPDATE operations, hunks are simulated in order so that later hunks validate against post-earlier-hunk content (matching apply order). rfuzzy_find_and_replace: c.g|]}|jdv |jS))r7r6rr.0ls r z(_validate_operations.. s&XXXaZAWAW AWAWAWrz#: addition-only hunk context hint 'z ' not foundr3' is ambiguous (z occurrences)r1c.g|]}|jdv |jS))r7r5rarbs rrez(_validate_operations..s& Y Y Yq!(jBXBXBXBXBXrF replace_all'z (no hint)z: hunk z not foundu — format_no_match_hintz: file not found for deletionz): MOVE operation missing destination pathz : source file not found for moveu5: destination already exists — move would overwrite)tools.fuzzy_matchr^r*r r read_file_rawr+errorr>rr-r&r#rZrBrm Exceptionrrr,)rCr[r^errorsrQ read_result simulatedhunk search_lines occurrencessearch_pattern replace_lines replacement new_simulatedrW _strategy match_errorlabelmsgrm src_result dst_results r_validate_operationsrs988888FCC <=/ / /"00>>K   DD1BDDEEE#+I) .) .XX4:XXX #( &8DDU&V&V &!++"MM#%<!C!C$($5!C!C!C)1__"MM#%<!?!?$($5!?!?$/!?!?!? !%>K  N LLLMMM \]/ / /;  XXXYYY!// ==J Q OOOPPP!// <} t'|dr,|| }|| | <?d|}|r6|d||||| r| ndddd|DzS|d||||| r| ndS)aApply V4A patch operations using a file operations interface. Uses a two-phase validate-then-apply approach: - Phase 1: validate all operations against current file contents without writing anything. If any validation error is found, return immediately with no filesystem changes. - Phase 2: apply all operations. A failure here (e.g. a race between validation and apply) is reported with a note to run ``git diff``. Args: operations: List of PatchOperation from parse_v4a_patch file_ops: Object with read_file_raw, write_file methods Returns: PatchResult with results of all operations r)rFz2Patch validation failed (no files were modified): r1c3 K|] }d|V dSu • Nrrces r z'apply_v4a_operations..fs(FFqlqllFFFFFFr)successrpr3zFailed to add r_zFailed to delete  -> zFailed to move zFailed to update zError processing N _check_lintuMApply phase failed (state may be inconsistent — run `git diff` to assess): c3 K|] }d|V dSrrrs rrz'apply_v4a_operations..s(;;qlqll;;;;;;r)rdifffiles_modified files_created files_deletedlintrpT)rrrrrr)tools.file_operationsrrrBr*r r _apply_addr>r+r _apply_deleter _apply_mover,r _apply_updaterqrhasattrrto_dict)rCr[rvalidation_errorsrrr all_diffsrrrQresultr lint_resultsf lint_result combined_diffs rapply_v4a_operationsrKs4&211111-ZBB {GIIFF4EFFFFFG    NMMI F#H#H" H|}000#B11!9P!((666$$VAY////MM"N2<"N"N6!9"N"NOOOO!555&r844!9S!((666$$VAY////MM"Qbl"Q"QfQi"Q"QRRRR!333$R22!9Q"))R\*L*Lr{*L*LMMM$$VAY////MM"OBL"O"OF1I"O"OPPPP!555&r844!9S"))",777$$VAY////MM"Qbl"Q"QfQi"Q"QRRR H H H MMFblFFc!ffFF G G G G G G G G HL m +44 8] + + 4"..q11K)1133LOIIi((M  {)''!-74bII;;F;;;;;<     ; %##) 3\\t    sH5J  K-K  KrQcZg}|jD]1}|jD]'}|jdkr||j(2d|}||j|}|jr d|jfSd|jd}|dd|Dz }d|fS)zApply an add file operation.r5r1Fz--- /dev/null +++ b/c3 K|] }d|V dS)r5Nr)rcrGs rrz_apply_add..s(;;Tj$jj;;;;;;rT) r-r&rr>rrB write_filer+rp)rQr[ content_linesrurGrrrs rrrsM33J 3 3D{c!!$$T\222 3ii &&G  w 7 7F |#fl"" 32< 3 3 3DDII;;];;; ; ;;D :rcj||j}|jr dd|jdfS||j}|jr d|jfS|jd}dtj|gd|jd }d|p d |jfS) zApply a delete file operation.FzCannot delete z: file not foundTkeependsrka/z /dev/nullfromfiletofilez # Deleted: ) ror+rp delete_filer splitlinesrBdifflib unified_diff)rQr[rsr removed_linesrs rrrs((66KFEr|EEEEE  ! !", / /F |#fl""'22D2AAM 777'r$bl$$  D 55r|55 55rc||j|j}|jr d|jfSd|jd|j}d|fS)zApply a move file operation.Fz # Moved: rT) move_filer+r,rp)rQr[rrs rrrsU    bk : :F |#fl"" 6r| 6 6 6 6D :rcddlm}||j}|jr dd|jfS|j}|}|jD]}g}g}|jD]} | jdkr5| | j| | jB| jdkr| | jh| jdkr| | j|rd |} d |} ||| | d \}} } }|r| dkr|j r| |j }|d krqtd|d z }tt||d z}|||}||| | d \}} } }| dkr|d ||z||d z}d }|r4d|} ddlm}|||d| |z }n#t"$rYnwxYwd|fcSd |}|j rt%||j }|dkr |ddz|zdz} |dkrdd|j d|dfcS| |j }| d|}|d kr#|d |dz|zdz||dzd z}}|dz|z}|ddz|zdz}||j|}|jr d|jfSt+j|d|dd|jd|j}d |}d|fS)zApply an update file operation.rr]FzCannot read file: r7r6r5r1rhr2iiNzCould not apply hunk: rlr3z"Addition-only hunk: context hint 'rfu, occurrences) — provide a more unique hintTrrzb/rrk)rnr^ror+rprr-r&rr>rBr#rVmaxminr;rmrqrZrstriprrrr)rQr[r^rscurrent_content new_contentrurvryrGrxrzrWr|rphint_pos window_start window_endwindow window_newerr_msgrm insert_textrweol write_result diff_linesrs rrrs988888((66K?>;+<>>>>!)O"KHSHS  J 3 3D{c!!##DL111$$T\2222####DL1111##$$T\222 : S!YY|44N))M22K3I3I^[e444 0K 5 *!$)*//0ABBH2~~'*1hn'='= %([)9)98d?%K%K !,\*-D!E>T>T"NKU???; E9e!199*5m|m*Dz*QT_`j`k`kTl*lK$(E*>u>>GJJJJJJ#7#7q.R]#^#^^$ '>)))))M22K  S0d>OPP !##"-"4"4T":":T"AK"ORV"VKK 1__ VT=NVV'VVV +//0ABBH%**4::Cbyy&1(37(&;k&ID&PS^_bef_f_g_gSh&h &1D&8;&F )0066= KdR &&r|[AAL)l(((%""D"11--$bl$$"BL"" J 77:  D :s G!! G.-G.)rrr< dataclassesrrtypingrrrrenumr r rr"r)rrRintrZrrboolrrrrrrrrs: ((((((((------------D    8888888 8  """"""" "[3[5n1ExPS}1T+U[[[[| S 3 3    X^$XX #YXXXXvfT.%9f$'f,9ffffR>SU495E*6n66dCi8H6666*NceD#I6FhnhhdCi8Hhhhhhhr