9j kUdZddlmZddlZddlZddlZddlZddlmZddl m Z m Z m Z ddl m Z ddlmZdZd ed <e e d Zej&d ej(ZdZej&ddj/deDzdzZej&dZd dZd!dZd"dZeGddZeGddZeGddZd#dZ GddZ!y)$uanu_v2.worktree_cleanup — 6대 안전조건 기반 worktree cleanup helper (task-2550+1 clean replacement). 회장 §명시 (2026-05-11 C방안 승인 + 2026-05-12 task-2550+1 replacement): - 81개 누적 .worktrees 정리 — dry-run 우선, --apply는 별도 승인 - 6대 안전조건 AND 게이트 — 어느 하나라도 FAIL 시 skip + log - main worktree 절대 보호 (workspace_root path 차단) - one-way isolation: anu_v2 외부 import 금지 6대 안전조건: 1. task .done.acked 마커 존재 2. PR state = MERGED (gh API) 3. task .merge-done 마커 존재 4. branch가 main에 ancestor (git merge-base --is-ancestor) 5. worktree 사용 중 X (git worktree list lock + pgrep -f + lsof +D CWD) 6. dry-run default; --apply 명시 시에만 실제 삭제 dirty worktree skip + log (memory/events/worktree-cleanup-skipped--.json) task-2550+1 fix: - HIGH: `task_id in headRefName` 부분 일치 제거 → strict regex 경계 일치 (task-25 vs task-2550 / task-250 vs task-2500 boundary test 강제) - medium #1: `abs(hash(path)) % 10**8` 비결정론 → `hashlib.sha256` 결정론 hash - medium #2: `pgrep -f` CWD-only 한계 → `lsof +D` 보완 (AND 게이트, 둘 다 안전해야 PASS) - medium #3: `r.all_safe`가 dry-run 에서 항상 False → cleanup_candidates 별도 산정 (post_merge_smoke_runner 측 fix; 본 모듈은 helper 제공) ) annotationsN) dataclass)datetime timedeltatimezone)Path)CallablelL5:intDEFAULT_CHAT_ID )hoursz((?:ghp_|ghs_|github_pat_)[A-Za-z0-9_\-]+) github_tokenbot_github_tokengh_token owner_patz x-api-key authorizationsecretpasswordz(?i)(|c#FK|]}tj|ywN)reescape).0hs ./home/jay/workspace/anu_v2/worktree_cleanup.py r5s> ! >s!z)([=:\s]+[^\s,;\"']{1,200})ztask-(\d+(?:\+\d+)?(?:\.\d+)?)ct|tr|n t|}tjd|}tjd|}|S)uraw token / API key 마스킹. ***MASKED***cT|jd|jddzdzS)Nrr)group)ms rz _sanitize_text..Cs$AGGAJA$>$O) isinstancestr_TOKEN_PREFIX_REsub _KEY_VALUE_RE)textss r_sanitize_textr.?sA4%3t9A^Q/AOQRSA Hr&c|r|sytjd|}|sy|jd}dtj|d}tj||syt |}||k(S)utask_id 가 head_ref_name 에 strict 경계로 포함되는지 검사. task-2550+1 HIGH fix: - 기존 ``task_id in headRefName`` 는 task-25 vs task-2550 substring 오탐 발생. - 신규 두 단 게이트: (1) regex 경계 일치 ``(^|sep)task-{num}(sep|$)`` — substring 오탐 1차 차단. (2) head_ref_name 에서 추출한 task_id == query task_id — replacement-chain (task-2550 vs task-2550+1) 분리 (단순 ``in`` 비교로는 분리 불가). 두 게이트 AND PASS 인 경우만 strict 일치로 판정. Args: head_ref_name: GitHub PR headRefName (예: "task/task-2550-dev5") task_id: "task-2550" 또는 "task-2550+1" Returns: strict match True 시 (task_id 가 head_ref_name 의 task identifier 와 정확히 일치). boundary test (test_worktree_cleanup_2550plus1): - task-25 ↔ "task/task-2550-dev5": False (regex 경계 차단 — "task-25" 뒤가 숫자 "5") - task-2500 ↔ "task/task-25-dev5": False - task-250 ↔ "task/task-2500-dev5": False - task-2550 ↔ "task/task-2550-dev5": True - task-2550 ↔ "task/task-2550+1-dev5": False (extracted "task-2550+1" != "task-2550") - task-2550+1 ↔ "task/task-2550+1-dev5": True Fz ^task-(\d+(?:\+\d+)?(?:\.\d+)?)$r!z(?:^|[^A-Za-z0-9+])task-z(?:$|[^A-Za-z0-9+]))rmatchr#rsearch_extract_task_id_str) head_ref_nametask_idr$num_partpattern extracteds r_matches_task_id_strictr8Gsq4  4g>A wwqzH*"))H*=)>>QRG 99Wm ,$]3I  r&c\tj|}|rd|jdSdS)umodule-level helper — branch / path / headRefName 에서 task_id 추출. `WorktreeCleanup._extract_task_id` 와 동일 로직 (free function form). ztask-r!N)_TASK_ID_NUM_REr1r#)r-r$s rr2r2rs0 q!A#$U1771:, .$.r&c:eZdZUdZded<ded<ded<ded<y) WorktreeCandidateuworktree 후보 1개.r(pathbranch str | Noner4head_shaN__name__ __module__ __qualname____doc____annotations__r&rr<r<{s I K Mr&r<c:eZdZUdZded<ded<ded<ded<y ) SafetyConditionResultu6대 안전조건 결과.r conditionr(nameboolpasseddetailNrArGr&rrIrIs#N I L Kr&rIcveZdZUdZded<ded<ded<ded <ded <ded <ded <ded <ded<ded<y) CleanupResultuworktree 1개 cleanup 결과.r( worktree_pathr?r4zlist[SafetyConditionResult]safety_resultsrLall_safedirtyis_mainappliedskipped skip_reasontsNrArGr&rrPrPs;' //N K M M M Gr&rPc|js |jry|jsy|jDcgc]}|jdk7s|}}t |dk7ryt d|DScc}w)utask-2550+1 medium fix: dry-run 에서도 cleanup_candidates 산정 가능하도록 safety_results 의 condition 1~5 만 PASS 인지 확인하는 helper. safety_6 (apply_explicit) 은 dry-run 에서 항상 FAIL → all_safe 항상 False → candidate 0. → cleanup_candidates 의 본질 (가시성) 회복을 위해 1~5 만 검사. main / dirty 도 candidate 에서 제외. Fc34K|]}|jywrrM)rsrs rrz)is_safe_ignoring_apply..s1Rryy1)rUrTrRrJlenall)resultr_ safety_1_to_5s ris_safe_ignoring_applyresk~~  "("7"7MB2<<1;LRMMM =Q 1=1 11Ns A1 A1ceZdZdZdddd ddZddZdddZddZddZdd Z dd Z dd Z dd Z dd Z eddZdddZdddZddZy) WorktreeCleanupuq6대 안전조건 기반 worktree cleanup helper. 외부 부수효과는 모두 Callable 주입 가능. N)subprocess_runnerclockworkspace_rootc||ntj|_||nd|_|||_yt d|_y)Nc6tjtS)N)tz)rnow_KSTrGr&rr%z*WorktreeCleanup.__init__..sx||t?Tr&z/home/jay/workspace) subprocessrun_subprocess_runner_clockr_workspace_root)selfrhrirjs r__init__zWorktreeCleanup.__init__sF8I7T"3ZdZhZh$0e7T 1?1K~QUVkQlr&c|jdz dz |dz }|j}tdd||rdSd|S) u:안전조건 1: memory/events/.done.acked 존재.memoryeventsz .done.ackedr! done_ackedok missing: rJrKrMrNrtexistsrIrur4markerrMs rcheck_safety_1_done_ackedz)WorktreeCleanup.check_safety_1_done_acked[%%08; >UU$l6"D  *3F8(<  r&c  d}|r!|jdr|tddn|} gd}|r|jd|gn|jd|g|j|dddt |j d }|j d k7r(td d dd t|jddStj|jxsd}|std d ddS|Dcgc])}tt |jdd|r|+}}|std d dd|dS|D]:}|jddk(std d dd|jddcStd d dd|D cgc]} | jdc} Scc}wcc} w#tj tj"t$f$r1} td d ddtt | ddcYd} ~ Sd} ~ wwxYw)u안전조건 2: gh API로 task의 PR state == MERGED 확인. gh API 호출 전략: 1. branch가 주어지면 `--head ` 정확 매칭 시도 2. branch가 None이거나 1번 실패 시 head 없이 전체 검색 후 headRefName에서 task_id strict 경계 일치 (task-2550+1 HIGH fix — substring 오탐 차단) gh API 실패 시 FAIL (보수적). 어느 dev 팀(dev1~dev7)이든 매칭 가능. Nz refs/heads/)ghprlistz--staterbz--jsonznumber,state,headRefNamez--headz--searchTFcapture_outputr,checkcwdtimeoutrr" pr_mergedzgh api failed: r}z[]z no PR found headRefNamezno PR with strict task_id=z- match in headRefName (unrelated PR rejected)stateMERGEDzPR #numberz MERGEDz PR state: error: d) startswithraextendrrr(rt returncoderIr.stderrjsonloadsstdoutr8getrpTimeoutExpiredJSONDecodeErrorOSError) rur4r>head_refcmdprocprsr candidatespes rcheck_safety_2_pr_mergedz(WorktreeCleanup.check_safety_2_pr_mergeds $ 6<6G6G 6Vvc-012\bH GiC Hh/0 J01**3t$V[adeieyeyazEG*HD!#,k%,^DKK-H#-N,OP**T[[0D1C,q{SXanoo !*3rvvmR/H+I7SJ,k%7y@mn! F66'?h.01;W[fjkmkqkqrzk{j|}DeEFF F)1;u_iDNkO~klkpkpqxkykOjP^QR RkO))4+?+?I G(1;u_fguvyz{v|g}C@ChDgE^FG G GsZB F*53F*)F*-.F F*2F* #F*0F*>F% F* F**(H&G>8H>Hc|jdz dz |dz }|j}tdd||rdSd|S) u:안전조건 3: memory/events/.merge-done 존재.rxryz .merge-done merge_doner{r|r}r~rs rcheck_safety_3_merge_donez)WorktreeCleanup.check_safety_3_merge_donerr&c X ddd|dg}|j|dddt|jd}|jd k(}t d d ||rd Sd |jdS#t j tf$r(}t d d ddt|ddcYd}~Sd}~wwxYw)u안전조건 4: git merge-base --is-ancestor origin/main → 0 (PASS). branch가 main에 머지되었으면 ancestor. gitz merge-basez --is-ancestorz origin/mainTFrrbranch_in_mainzancestor of mainzNOT ancestor (rc=)r}rNr)rrr(rtrrIrprr)rur>rrrMrs rcheck_safety_4_branch_in_mainz-WorktreeCleanup.check_safety_4_branch_in_mains |,OC**3t$V[adeieyeyazEG*HDoo*F("26.4* : argv 에 path 포함된 process 미감지 (c) lsof +D : CWD/file-handle 로 path 사용 중인 process 미감지 (task-2550+1 medium fix — `pgrep -f` 의 CWD-only 누락 보완) rworktreer --porcelainTFrrrr\ not_in_usezgit worktree list failed: rc=r} worktree N)lockedprunable)zlocked z prunable z4worktree is locked or prunable per git worktree listzgit worktree list error: rpgrepz-frr,rrz$ process(es) using path (pgrep argv)r!z pgrep rc=z pgrep error: lsofz+Dz- file-handle(s) open under path (lsof +D CWD)zlsof rc=z lsof error: z-git list OK + pgrep no match + lsof no CWD/fh)rrr(rtrrIr splitlinesrrastriprprrmax)rurQcmd_aproc_alocked_or_prunablein_target_blocklinercmd_bproc_b pid_countcmd_cproc_clinesfh_counts rcheck_safety_5_not_in_usez)WorktreeCleanup.check_safety_5_not_in_uses J>E,,dU,,-r-F  A%,l5:6;L;L:MN "' #O 002 ??;/&*3{+;+<&=&C&C&E&VO$9O)O)-&$9Q)R)-& ",l5Q" ~dM2E,,U4dZ_ik,lF  A% 3 3 5 @ @ BC ,q|TYendopTcUVV""a',q|TYdmntnnnAcBCC(  }T=1E,,U4dZ_ik,lF  A% ++-88:s5zA~q1,l5&Z'TU""a',l5%f&7&7%89(%l4B  Q))73 J(1r4r@)rrr(rtrrrsplitrrra_extract_task_idappendr<rprr) rurrrblocksblkrr=headr>rr4s renumerate_worktreesz#WorktreeCleanup.enumerate_worktreess  1#CLM288:3!%c)no!6! ?"33FNdCG%%&7T&Zalp&qr! s" ))73 I s$>E#C E# E#,6E##FFct|S)usbranch / path에서 task_id 추출 (예: task/task-2474-dev2 → task-2474, task/task-2550+1-dev5 → task-2550+1).)r2)r-s rrz WorktreeCleanup._extract_task_ids$A&&r&c |jj}|j|jr<|j |d|t |j|j gdddddd| S|j|j}|r<|j |d|t |j|j gdddddd| S|j st |jdgdddddd | S|j|j |j|j |j |j|j |j|j|j|j|j|g}td |D}d}d}d} |sid}|D cgc]} | j r| j"} } t%| } | d hk(rd } nd| } | d hz } | r|j |dt'| |nj ddd|jg}|j)|dddt+|j,d}|j.dk(rd}nd}dt1|j2dd} t |j|j ||dd||| | Scc} w#t4j6t8f$r&}d}dt1t+|dd} Yd}~hd}~wwxYw)uH단일 worktree cleanup 시도. 6대 안전조건 AND 검증 후 실행.main_worktree_protectedFTu0main worktree (workspace_root) — never deleted) rQr4rRrSrTrUrVrWrXrYrTz$dirty worktree (uncommitted changes)Nztask_id cannot be extracted)r>c34K|]}|jywrr^)rrs rrz3WorktreeCleanup.cleanup_worktree..s1Aqxx1r`rzdry-run mode (apply=False)zsafety failed: zsafety_failed:rrremoverrrzgit worktree remove failed: rrr)rs isoformatrr= _log_skippedrPr4rrrr>rrrrrbrMrKsetsortedrrr(rtrr.rrprr)ru candidateapplyrYrTresultsrSrVrWrXrfailed failed_setnon_apply_failuresrrrs rcleanup_worktreez WorktreeCleanup.cleanup_worktrees [[] $ $ &   0   i)BB G 'nni6G6G!Et9k  &&y~~6    i" 5 'nni6G6G!Eut9_     'nnd!Et9V    * *9+<+< =  ) ))*;*;IDTDT ) U  * *9+<+< =  . .y/?/? @  * *9>> :  . .u 5  111"& G&->QXXaff>F>VJ.//: /x8 !+/?.@!@ !!!)~fEW>X=Y-Z\^_ Gj(INNC..s4dZ_ehimi}i}e~IK.L??a'"G"G$@PTP[P[A\]a^aAb@c"dK #..)2C2C"XUEW+   3?*--w7 G 's1v(>t(D'EF  Gs%:J0 J0A)J55K4K//K4cxg}|jD]$}|j|j||&|S)u/모든 worktree 후보 검사. dry-run default.)r)rrr)rurrcands rcleanup_all_dry_runz#WorktreeCleanup.cleanup_all_dry_runsB'),,. ED NN400U0C D Er&cx |jddjdd}tj|jj dj dd}|j dz dz d |d|d z }|jjd d ||jrt|jndt|jt|j|td }t|dd5}tj||dddddy#1swYyxYw#t $rYywxYw)u(skip log 박제 → memory/events/worktree-cleanup-skipped--.json. task-2550+1 medium fix: - 기존 `abs(hash(path)) % 10**8` 는 Python `hash()` 의 PYTHONHASHSEED 의존 (비결정론) → audit log 파일명 충돌 / 재현 어려움. - 신규: `hashlib.sha256(path).hexdigest()[:8]` 결정론 hash. ts + path hash 로 파일명 유일성 확보 (동시 실행 시 덮어쓰기 방지). branch / worktree_path 필드는 _sanitize_text 로 token-like 노출 방어. :-.zutf-8Nrxryzworktree-cleanup-skipped-z.jsonT)parentsexist_ok)rYr4rQr>reasonchat_idw)encodingFr") ensure_asciiindent)replacehashlibsha256r=encode hexdigestrtparentmkdirr4r.r>r openrdumpr) rurrrY ts_compact path_hashlog_pathpayloadfs rrzWorktreeCleanup._log_skippeds) C-55c3?Jy~~'<'@I@Q@Q>)*;*;D!D-!D*&D-*D-- D98D9)rhz1Callable[..., subprocess.CompletedProcess] | NonerizCallable[[], datetime] | Nonerjz Path | NonereturnNone)r4r(rrIr)r4r(r>r?rrI)r>r(rrI)rQr(rrI)rrLrrI)rQr(rrL)rzlist[WorktreeCandidate]r-r(rr?)F)rr<rrLrrP)rrLrzlist[CleanupResult])rr<rr(rYr(rr)rBrCrDrErvrrrrrrrrr staticmethodrrrrrGr&rrgrgsPT/3&* mM m- m $ m  m -G^ | Q f  B'' Q fr&rg)r,objectrr()r3r(r4r(rrLr)rcrPrrL)"rE __future__rrrrrp dataclassesrrrrpathlibrtypingr r rFrocompile IGNORECASEr)TOKEN_KEY_HINTSjoinr+r:r.r8r2r<rIrPrergrGr&rr s6# !22"! "#2::/MM  sxx>o>>>B"" "**>? ( V/           2(zzr&