+ Wjz2aRBt20tRt^RIt^RIt^RIt^RIHtHtHtHt^RI H t ^RI H t ^RI Ht]P!R4tRt^tRtRs]^kR R ltR R ltR RltRRltRCRRlltRRltRR/RRlltRRltRRltRRltRRltR R!lt RCR"R#/R$R%lllt!RDR&R'llt"R(R)lt#R*R+lt$R,R-lt%R.R/lt&R0R1lt'](!0REm4t)R2R3lt*RR/R4R5llt+R6R7lt,RDR8R9llt-R:R;lt.R<R=lt/RFRR/R>R?lllt0R@RAlt1R#)Ga\Autostash handling for ``hermes update``: stash before the pull, restore/park/discard afterwards, warn about orphans. Split out of ``update_cmd.py``; names are re-imported there so ``hermes_cli.update_cmd.`` still resolves/monkeypatches. Origin helpers are imported lazily per function (no cycle; test patches on the origin stay effective). N)datetime timedeltatimezoneUTC)Path)Optional) _record_stopzhermes_cli.update_cmdzhermes-update-autostash-zT The stash was left in place. You can remove it manually after checking the result.chV^8dQhR\\,R\\,R\/#git_cmdargscwdliststrr)formats"OC:\Users\johnn\AppData\Local\hermes\hermes-agent\hermes_cli\update_cmd_stash.py __annotate__r&s)S cc n^RIHpV!W3RVRR/VB# \\P3dR#i;i)zS``subprocess.run`` of a git command with captured output; None when git cannot run.run_gitrcapture_outputTN)hermes_cli.update_custodyrOSError subprocessSubprocessError)r r rkwargsrs&&&, r _git_quietr&sA1wM#MdMfMM Z// 0s 44cJV^8dQhR\R\\R3,/#)r porcelain_zreturn.)rtuple)rs"rrr0s"  c eCHo rc\;QJd#.RVPR44FNK 5#!RVPR444#)agPaths recorded with ``git add -N`` (intent-to-add), read from NUL-separated porcelain output. Such an entry carries the empty blob with zeroed stat data, so it is never "uptodate" and ``git stash push`` rejects the whole stash with ``Entry 'X' not uptodate. Cannot merge.`` - a dead end for the user, because that is the state an editor leaves behind when it shows a new file in diffs. Porcelain marks it ``" A"`` (in the worktree, absent from the index); a real staged add is ``"A "`` and an untracked file ``"??"``. Rename records carry a second, prefix-less field, which the leading ``" A"`` test cannot match. c3"TF@p\V4^8gKV^,R8XgK%V^,R8XgK5VR,xKB R#5i) A:r&NNN)len).0records& r '_intent_to_add_paths..:sL!8v v;? %ayC/ 4:1I4D r !8sA  A  A A )r#split)r!s&r_intent_to_add_pathsr00sL 5!,!2!24!855!,!2!24!8 rchV^8dQhR\\,R\\,R\/#r r)rs"rrr@s.@@$s)@49@4@rc \WVRRRR7pVeVP^8wdR#VPPR4Uu0uFqD'gK VkK up#uupi)zcNUL-separated path listing as a set, or None when git failed (surrogateescape keeps odd filenames).Tzutf-8surrogateescape)textencodingerrorsNr.)r returncodestdoutr/)r r rresultpaths&&& r _git_paths_zr;@sW sPa bF ~**a/#]]006 ?6T$DD6 ?? ?s  AAcJV^8dQhR\\,R\RR/#r r rr"Nr)rs"rrrHs*PPcPP$Prc.^RIHpV!V.ROVRR7R#)rT)rrNresetz--hardHEAD)rr)r rrs&& r _reset_hardrCHs1 G0c$Orc4V^8dQhR\R\RR/#)r r4prefixr"Nr)rs"rrrNs!))#)s)D)rcpVP4'd \V VP4 24R#R#N)stripprint)r4rEs&&r_print_nonemptyrKNs) zz|| '(rc(V^8dQhR\RR/#)r r4r"NrF)rs"rrrSs33C3D3rcVP4'd4\RVP4P4^, 24R#R#)z N)rIrJ splitlines)r4s&r_print_first_linerOSs6 zz|| 4::<**,Q/012r checkout_movechV^8dQhR\\,R\R\\,/#r r rr"rrrr)rs"rrrXs,!!DI!D!\deh\i!rc^RIHpHpRsV!V.ROVRR7pVPP 4'gR#V!VRR.V4PP 4'd\ R4\VR.V4\VP4pV'dM\ R \V4 R 24V!VR R .VOV4pVP^8wd\VP4\P!\4P!\" R 24p\ R4V!V.ROV4PP 4p T;'gT!RR7;_uu_4\%WW4p RRR4X \VPP'R4U u.uFq'gK V NK up 43sV # +'giLQ;iuup i)zStash local changes before the update moves the checkout; the stash commit, or None when clean. ``checkout_move`` binds the push (and its cleanup reset) to the paused gateways' tree gate.)_git_run_no_moveNTcheckls-filesz --unmergedu?→ Clearing unmerged index entries from a previous conflict...rAu → Making z# intent-to-add file(s) stashable...add-- %Y%m%d-%H%M%Su8→ Local changes detected — stashing before update...revertr.)statusz --porcelain-z rev-parse--verifyz refs/stash)hermes_cli.update_cmd_gitrUrV_pending_autostashr8rIrJrr0r)r7rKstderrrnowrstrftime_AUTOSTASH_NAME_PREFIX _push_stashr/) r rrPrUrVr_ intent_to_addrZ stash_name prev_stash stash_refentrys &&$ r_stash_local_changes_if_neededrpXs= g>4 PF ==   *l3S9@@FFHH OP7WIs+ )7M C .//RSTw =} =sC >>Q  CJJ 'c"++/E.Fm,TUJ DE'#JCPWW]]_J  # #8 #D 1 1jE  2 36==+>+>t+DN+D%+DNOQ  2 1Os! F7 G 'G 7 G c jV^8dQhR\\,R\R\R\R\/#)r r rrlrmr"r)rs"rrr|s4c3CTWrc^RIHpV!VRRRRV.V4p\VP4V!V.R OV4pVPP 4pVP ^8H;'d\ V4;'dWs8gpVP ^8wdV'g\R4\VP4\R4\R4\R 4\P!VP VPVPVPR 7h\VP4\R 4\R 4\W4V#)z``git stash push``; the stash commit. Raises when nothing was saved; resets tracked leftovers when a push saved everything but could not clean up.rUstashpushz--include-untrackedz-mu5✗ Could not stash local changes — update aborted.zV Commit, stash, or clean up your local changes manually, then re-run `hermes update`.zS (An index entry from `git add -N` is the usual cause of this error; `git add` thezE paths it names, or `git reset` them, and the update will proceed.))outputrfuZ ⚠ Some untracked files could not be removed from the working tree (permission denied).u[ They were still saved to the stash and were left in place — the update will continue.ra)rdrUrKr8rIr7boolrJrOrfrCalledProcessErrorr rC) r rrlrmrUru stash_probern stash_createds &&&& rrjrj|s3 Ggv/DdJWY\ ]DDKK 7$KSQK""((*I**a/__DO__ H_M ! I J dkk * j k g h Y Z//SWS^S^gkgrgrs s  $ jk kl G! rc tV^8dQhR\\,R\R\R\\,/#r r rrnr"rS)rs"rrrs1  T#Y T c hWZm rcf^RIHpV!V.ROVRR7pVPP4F~pVP R4wrgpVP 4V8XgK.\ P!RVP 44p V 'dV P^4u#VP 4u# R#)a2Selector for the stash entry whose commit is *stash_ref*, as the bare index ``N`` (git accepts it wherever ``stash@{N}`` is valid). Never ``stash@{N}`` itself: on native Windows the MSYS runtime strips the braces from git.exe's argv, so ``stash@{0}`` reaches git as ``stash@0`` and the drop fails (#87542).rsTrWr'zstash@\{(\d+)\}N)rtrz--format=%gd %H) rdrUr8rN partitionrIre fullmatchgroup) r rrnrU stash_listlineselector_commitmatchs &&& r_resolve_stash_selectorrs 3'#GTXYJ!!,,."nnS1V <<>Y &LL!3X^^5EFE%*5;;q> @0@ @ / rcV^8dQhRR/#)r r"N)rs"rrrs$rc RsR#)zNForget this run's unsettled autostash after it was already reported (#122557).Nrerrr_clear_pending_autostashrs rc:V^8dQhR\\,/#r r")rr)rs"rrrs R Rhsm Rrc D\fR#\wrRV RV RV RV R2 #)aWhat to tell the user while this run's autostash is unsettled (#122557), else ``None``. Used as the completion line (it is not a success line, so the update ends partial and exits non-zero) and printed by failure verdicts, which otherwise never name the stash. Nu⚠ hermes update stashed z> local modification(s) and did NOT restore them. Stash ref: z& Review with: git stash show --stat z$ Re-apply with: git stash show -p z | git apply --3wayr)rn file_counts r_unrestored_autostash_noticersI !.I( 5%;'44=;?22;zN Restore with: git stash apply Discard with: git stash drop zAutostash age check failed: %s)rtrz--format=%gd %s)rdrUr7rrgrr_AUTOSTASH_WARN_AGE_DAYSr8rNrIr~findrir)strptimereplace ValueErrorappendrJ Exceptionloggerdebug)r rrUrcutoffstalerrrsubjectposstamp stash_timeexcs&& r!_warn_orphaned_update_autostashesrs3"g'KSQ  A %c"Y4L%MM')%%002D#'::<#9#9##> H,,56CQw#&<"==>?DE %..uoFNNVYNZ " h./3  3u:,=Uqvi8 '(  4 %OH D #&<%=eWAF G % OP BC ^_5z#  $  5s;sNGB-G+F5GG(B G5 GGGG G4G//G4chosenFc LV^8dQhR\R\R\R\RR/#)r outcomerndetailrr"Nrrw)rs"rrrs1  s s C Y] jn rcVR8wg V'dRs^RIHpT!RVR8gV RV 2V'dRV R2MR,4R#) aJNote the autostash disposition in the update receipt so a parked stash is visible to automation reading receipts instead of stdout (#115363: an update that ended with local changes parked in the stash reported a bare success with no trace of them). A park the user did not ask for (``chosen``) keeps the stash unsettled (#122557).parkedN) record_steplocal_changes_stashz: z (r)rehermes_cli.update_receiptr)rrnrrrs&&&$ r_record_stash_dispositionrsI (f!58 )2i[!vr&^2FrcJV^8dQhR\R\\,RR/#)r rnstash_selectorr"N)rr)rs"rrrs+``S`(3-`[_`rc\R4\R4V'd\RV 24R#\RV R24R#)zS Check `git status` first so you don't accidentally reapply the same change twice.z@ Find the saved entry with: git stash list --format='%gd %H %s'z! Remove it with: git stash drop z Look for commit z0, then drop it by index with: git stash drop N)rJ)rnrs&&r_print_stash_cleanup_guidancers; _` LM 1.1ABC "9+-]^_rc0V^8dQhR\R\/#)r rfr"r)rs"rrrs  3 4 rcRpRT;'gRP44F/pRV9gRV9dRpKVPR4'dK.R# V#)aTrue when a ``git stash apply`` failure is ONLY about untracked files that already exist in the tree. Tail of the permission-denied class: push swept undeletable files into the stash but couldn't remove them; apply restores tracked changes, then refuses to overwrite those files and exits non-zero though nothing was lost. Any other error line (e.g. ``would be overwritten by merge``) means the tracked apply failed -> False. Fc3p"TF,qP4'gKVP4xK. R#5irH)rI)r*lns& rr,A_stash_apply_failed_only_on_existing_untracked..s"N$?b88:zrxxzz$?s66rzalready exists, no checkoutz,could not restore untracked files from stashT)zwarning:zhint:)rN startswith)rfsaw_untracked_errorrs& r._stash_apply_failed_only_on_existing_untrackedrs[ NV\\r$=$=$?N (B .2`df2f"& 455 O rc V^8dQhR\\,R\R\R\R\\,/#)r r rrnrfr"r)rs"rrrs<cRU_bgklogprc ^RIHp.pRpT;'gRP4FpVP4pVP V4'gK,VR\ V4)pV!VRRRV 2.VRR R 7p V P ^8wdKaV!VR V R V 2.VRR R 7p \V4V, P4p V P ^8wgWP8wgKVPV4K V# \dRp LIi;i) alPaths ``git stash apply`` refused (" already exists, no checkout") because the update now tracks its own file there (``HEAD:``) and the tree does not hold the stash's untracked copy (``^3``). An untracked occupant HEAD does not track is the #70127 file that could not be deleted at stash time, whatever its content now; it is never the update's.rz already exists, no checkoutrNzcat-filez-ezHEAD:TF)rrrXshowz^3:) rrrNrIendswithr)r7r read_bytesrr8r) r rrnrfrreplacedsuffixrreltrackedstashedcurrents &&&& r#_untracked_files_replaced_by_updaters  2H +F||'') XXZ{{6"" CK< 'JcUm#D#^bjop    " 'FykSE,B#C]aino Cy3224G    "g&? OOC * O  G s C55 DDc(V^8dQhR\RR/#)r rnr"NrF)rs"rrr2sPPSPTPrc\4\R4\RV 24\RV 24\RVRRR7R#) zLeave a pre-update autostash parked (``--keep-stash``, the desktop updater's mode): local source edits must never be silently re-applied onto updated code; the entry stays in ``git stash``.uZℹ️ Local changes were stashed before updating and were NOT re-applied (--keep-stash). Stash ref: ) Restore manually with: git stash apply rz --keep-stashTrN)rJr)rns&r_park_stashed_changesr2s? G fg M) %& 5i[ ABh >$OrcvV^8dQhR\\,R\R\\,R,/#r=rrrset)rs"rrr<s-$s)$3s8d?rcB\V.ROV4pVf \R4V#)zCReturn untracked paths, or ``None`` when Git cannot enumerate them.uN ⚠ Could not enumerate untracked files while validating the restored stash.)rYz--othersz--exclude-standardr`)r;rJ)r rpathss&& r_git_untracked_pathsr<s% "VX[ \E } ^_ LrczV^8dQhR\\,R\R\\R3,R,/#)r r rr".N)rrrr#)rs"rrrDs2   DI  D  U38_t=S  rc^RIHp\V.ROV4pVf\R4R#V!W4pVfR#VP RV44\ \ V44#)zuRestored ``.py`` paths changed from ``HEAD``; deliberately Python-only (entry scripts stay outside the health check).rNuG ⚠ Could not enumerate tracked Python files restored from the stash.c3V"TFqPR4'gKVxK! R#5i)z.pyN)r)r*r:s& rr,)_restored_python_paths..NsD)$}}U/C)s) ))diff --name-onlyr`rBr[z*.py)hermes_cli.update_cmdrr;rJupdater#sorted)r rrr untrackeds&& r_restored_python_pathsrDsZ: "UWZ [E } WX$W2I LLD)DD  rc^V^8dQhR\\,R\R\R\/#r|rrrrw)rs"rrr[s,##T#Y#T#c#d#rc f\4pW" R23F)p\VRRRRV R2VR.V4pVfR#W5,pK+ \VR R R V R 2.V4pVfR#VP^8Xd$\VR RRRV R 2.V4pVfR#W7,pV'gR#\V.ROV4pVfR#VFp \ V 4P P 4p \ V 4PP4\9g.W, P4'gV R8wgKwW9gKR# R#)a%True only when every path the stash restores is demonstrably unable to change an import. The set is read from the stash commit itself (worktree and index changes against its base, renames split into delete + add, plus its untracked tree), never from the working tree, which also holds what the clean import probe wrote. Each path must have an allowlisted suffix, must not be a symlink, and may only sit in a directory ``HEAD`` already tracks, so the restore cannot create a namespace-package directory. Any Git failure counts as runtime-affecting. z^2rrz --no-renamesr`z^1r[Frbz-qrcz^3ls-tree-rT.)rrz-drr`rB) rr;rr7rparentas_posixrlower_NON_RUNTIME_SUFFIXES is_symlink) r rrnrestoredsidechanged has_untrackedr head_dirsr:rs &&& r_restore_is_non_runtimer[sJHk,- fm^Ti[PRCSUY[_`beg ? . wdJ9+UWHX(Y[^_M1$ 9dM4T]S^^`Qa*bdgh   W&Z\_`Id""++- J   # # %-B BszF]F]F_F_cMf&=  rcV^8dQhR\\,R\R\R\\,R\R\R,RR/#) r r rrnpreexisting_untrackedfailing_targetrNr"r)rs"rrrsR$$ #Y$!$.1$JMc($dg$ $J$ $rc ^RIHp^RIHp\ 4\ R4\ RV 24V'd6\ V4P 4R,Fp \ RV 24K RRlp V!W4p V e W, M \4p T;'gT!R R 7;_uu_4\V.ROV4p V 'd\V.RO\V 4OV4MR pR R R 4V R J;'d(V !X 4;'dV '*;'g V !X4pV'dV !\V.ROV44pV'd \ R 4M\ R 4\ R4\ R4\ RV 24\ RV 24\ RV 24\4\R4\^4h +'giL;i)zIRestore the clean updated tree, preserve the stash, and abort the update.rrVu>✗ Restored local changes made the Hermes agent unexecutable.z Health check failed: :NNrc$V^8dQhR\/#r)rw)rs"rr2_reject_unsafe_stash_restore..__annotate__s==t=rc8VRJ;'dVP^8H#rH)r7)r9s&r_ok)_reject_unsafe_stash_restore.._oks T!<yyes)rJinputrIrEOFErrorUnicodeDecodeError)rninput_fn remote_prompt prompt_suffixresponses&& r_confirm_restorersD(M,G'M G ;< XY IJ '  789-I3O w}},,.H< (b. ,- :; 3I; ?@ ,- H s &CCCc V^8dQhR\\,R\R\R\\,R,/#r r rrnr"Nr)rs"rrrs9""$s)"$"3"W[\_W`cgWg"rc@^RIHp\R4T;'gT!V4;_uu_4p\WV4wrgV'*;'d-VP^8H;'g\ VP 4VR&RRR4XR,'dXP^8Xd.#VR,'d-\WVXP 4pV'g \R4V#\R4\XP4\VP 4X'd1\R4VP4Fp \RV 24K \R 4\R V 24\R 4\R V 24\R VR4R# +'giEL;i)a``git stash apply``; the untracked paths the update replaced (empty on a full restore), or None (tree reset, stash kept) on conflicts or any failure other than the already-exists class. ``checkout_move`` binds the apply (and a conflict's reset) to the paused gateways' tree gate.ru→ Restoring local changes...wholeNuY ⚠ Some stashed untracked files already exist in the working tree and were kept as-is.uF✗ Update pulled new code, but restoring local changes hit conflicts.z Conflicted files:u • u8 Your stashed changes are preserved — nothing is lost.rz"Working tree reset to clean state.z1Restore your changes later with: git stash apply rzrestore hit conflicts) rdrVrJ_apply_stash_stepr7rrfrrKr8rNr) r rrnrPrVsteprestoreconflicted_filesrfs &&&& r _apply_stashr!se3 *+  # #8 #Y / /4$5gI$N!-,gg   ! # e e'UV]VdVd'e W 0  G}}++q0  G}}7wYPWP^P^_ m n RSGNN#GNN# #$!,,.A F1#, / EF M) %& ./ =i[ IJh 3JK 9 0 / /s3F  F  F cRV^8dQhR\\,R\R\/#)r r rrnr)rs"rrrs% % %tCy %t % %rc^RIHpV!VRRV.V4pV!V.ROV4pVPP4pV'g-VP^8wd'\ VP 4'g \W4WF3#)z``git stash apply`` and its conflicted paths. Any failure but the already-exists class is reset to the clean tree here, inside the bound step: conflict markers make hermes unrunnable, and the changes stay in the stash.rsrtapply)rrz--diff-filter=U)rdrUr8rIr7rrfrC)r rrnrUrunmergedrs&&& rrrsq3w'9 =sCG!KSQH,,.G..!3$RSZSaSa$b$bG!  $$rcVV^8dQhR\\,R\R\RR/#rr)rs"rrrs2AA$s)A$A3A4Arc^^RIHp\WV4pVf(\R4\\4\ V4R#V!VRRV.V4pVP ^8wdR\R4\VP4\VP4\\4\ W$4R#R#)r?rsNuR⚠ Local changes were restored, but Hermes couldn't find the stash entry to drop.rtdropuP⚠ Local changes were restored, but Hermes couldn't drop the saved stash entry.) rdrUrrJ_STASH_LEFT_IN_PLACErr7rKr8rfr rrnrUrr(s&&& r_drop_restored_stashr+s2,W9EN bc "#%i0 Ggv~> DD ! `a $ $ "#%i@ rc jV^8dQhR\\,R\R\R\R\/#)r r rrn prompt_userr"r)rs"rrrs:55 #Y5!5.15@D5 5rc aaaaa^RIHpHpHpHp V'd$\ SV4'g\ RSRRR7R#V!SS4oSf)\R4\RS 24\ RSR 4R#V!SRR 7p \SSSS4p V fR#R VVVVV3R llp V!SS4p V f V !R R4V !SV 4wrpV'gT !T;'gRV4\SSS4pV'dRMV!SRR 7P4F;wppV PV4V8wgKT !RT;'gR 2V^,4M V 'd\R\V 4 R24V R,Fp\RV 24K \R4\RS 24\RS R24\ RSRRPV R,4 24R#\SSS4\ RS4\R4\R4R#) r?) _critical_module_import_failuresrr_validate_python_files_syntaxrzrestore declinedTrFzE The stash was not restored because its cleanup baseline is unknown.rzuntracked baseline unknown)report_runtime_errorsc(V^8dQhR\RR/#)r rr"NrF)rs"rr._restore_stashed_changes..__annotate__sqqsqtqrc *<\SSSSWSR7R#))rPN)r )rrrPrr rrns&&rreject(_restore_stashed_changes..rejects$ S)%:Nbo qrz restored Python source discoveryzBcould not determine which restored Python files require validationzrestored Python sourcez agent import unknownu⚠ The update added z8 file(s) where you had untracked files of the same name::N Nrz] The updated files are in place; your versions are kept in the stash, which was NOT dropped.rz Recover a file with: git show z^3: > .minez(untracked files replaced by the update: z, ru?⚠ Local changes were restored on top of the updated codebase.zB Review `git diff` / `git status` if Hermes behaves unexpectedly.r)rr/rrr0rrrJr!ritemsgetr)joinr+)r rrnr-rrPr/rrr0clean_import_failuresrr5restored_python syntax_ok failing_path syntax_error non_runtimemoduleerrorr:rsfff&&d @r_restore_stashed_changesrDsTT+Ix@@!(I7IRVW0#>$ UV 9)EF!(I7ST DD ! hi$++&%i@!(I7RS _`k95 rcxV^8dQh/^\9d&\\\\3,,;R&#)r re)__conditional_annotations__rr#rr)rs"rrrs-D54HU38_-4Er)rrH> .md.gif.ico.jpg.mdx.png.rst.svg.txt.adoc.jpeg.webp)FN)3rJ__doc__loggingrrrrrrpathlibrtypingrhermes_cli.update_cmd_commonr getLoggerrrirr)rerr0r;rCrKrOrprjrrrrrrrrrrr frozensetrrr rr!rr+rDrHr)rJs@rr^s(  775   2 34 m 154  @P ) 3 !SW!H:  R.b `e   `  6P  ""# #L$)-$N0"J %A"555pr