+ WjZ"Rt^RIt^RIt^RIt^RIHtHt^RIt^RIt^RI H t H t H t H t ^RI Ht^RIHt^RIHtHtHt^RIHt]P.!R4t^ t^t]!R R R R ]!4R 7tRktR tRRltRlRRRR/Rllt RRlt!]]3RRllt"RRlt#RmRRllt$RmRRllt%RRlt&R R!R"R#/t'R$R%lt(R&R'lt)0Rnmt*R(t+R)t,R*R+lt-R,R-lt.R.R/lt/R0R1lt0R2R3lt1R4R5lt2R6t3R7R8lt4R9R:lt5!R;R<]64t7R=RR>RR?R/R@RAllt8RBRClt9RDRElt:RFRGlt;RHRIltRXRRYR/RZR[llt?R\R]lt@R^R_ltAR`RaltBRbRcltCRdReltDRfRgltERhtFR?R/RiltGR?R/RjltHR#)oaGit plumbing for ``hermes update``: fork/upstream sync, trampoline-git detection, lockfile/EOL churn cleanup, orphan rescue refs, parked-branch assessment, fetch-failure classification. Split out of ``update_cmd.py``, which re-imports every name so ``hermes_cli.update_cmd.`` still resolves/monkeypatches. Origin helpers are imported lazily per function (no cycle; test patches on ``update_cmd`` stay effective). N) nullcontextsuppress)datetime timedeltatimezoneUTC)Path)Optional)NO_LAZY_FETCH_ENVnoninteractive_git_envwindows_hide_flags) _record_stopzhermes_cli.update_cmdTutf-8replace)capture_outputtextencodingerrors creationflagszHgit remote add upstream https://github.com/NousResearch/hermes-agent.gitc$V^8dQhR\/#returnbool)formats"MC:\Users\johnn\AppData\Local\hermes\hermes-agent\hermes_cli\update_cmd_git.py __annotate__r#s===c  \WV3/VBRJ#)z@True when ``_git_run`` exits 0; any exception counts as failure.N _git_stdout)git_cmdargscwdkws&&&,r_git_okr&#s wc 0R 0 <&> &>rc ^RIHp\\4;_uu_4\ 4pREFQpRV RV R2pV!VRRRV R2.V4p V P ^8wdK1V P P4U u.uF*qP4'gKV P4NK, p p T\ V^8dV RV)MT 4,pV^8gK\P!\4\VR 7, p V Fyp \\4;_uu_4\P!V \V4RR ,R 4pVP!\R 7V 8dVP#V 4RRR4K{ EKT \%V4Fp V!VR RV .V4K RRR4R#uup i +'giK;i +'giR#;i)uExpire old rescue refs (``refs/hermes-update-backups/---``). ```` is ``orphan`` (no common ancestor), ``diverged`` (local commits on the target branch) or ``detached`` (commits made on a detached HEAD the update moved off). All are written before the update moves HEAD and all pin objects, so they expire on the same terms; each kind keeps its own ``keep`` newest. Each ref pins a possibly multi-GB snapshot against ``git gc``, so a repeatedly corrupted install would grow ``.git`` unbounded. Keep the ``keep`` newest AND drop any older than ``max_age_days`` by the ``YYYYMMDD-HHMMSS`` stamp (unparseable names left alone); names sort chronologically so ``for-each-ref`` order is creation order. Best-effort, never blocks. A rescue ref pins every object reachable from that commit against ``git gc`` — and in the incident shape those objects include a full working-tree snapshot (the autostash orphan commit), which can be multi-GB when the tree holds large stray files. See #87694. r2zrefs/hermes-update-backups/- for-each-ref--format=%(refname)z--sort=refname*N)daysNN %Y%m%d-%H%M%S)tzinfo update-refz-d)orphandivergeddetached)hermes_cli.update_cmd_gitr.rOSErrorsetr5r6 splitlinesr7rnowrr ValueErrorstrptimelenraddsorted)r"r$branchkeep max_age_daysr.stalekindprefix list_resultlinerefscutoffrefstamps&&&&& r_prune_orphan_rescue_refsr`Gs&3 '  %6D24&&CF".*?AQV\U]]^S_`begK%%*-8-?-?-J-J-L]-LTPZPZP\LDJJL-LD] Sfut< --`` (the divergence rescue refs' scheme and expiry) and name it. When that write fails, refuse (``sys.exit(1)``) rather than orphan the work. Attached HEADs and already-reachable commits are left alone. r2Nr>z --containsr?z refs/stashrDz$refs/hermes-update-backups/detached-r=:N NrFu✗ HEAD is detached at z8, which no branch or tag contains, and backing it up to z failed.zK Update stopped so those commits are not orphaned. Keep them with: git -C z branch detached_headrev-list--countz--notz --branchesz--tagsz --remotesu ⚠ SomeuG commit(s) made on the detached HEAD are on no branch — backed up to z/ before moving HEAD. This backup expires after z days.z List them with: git log z" --not --branches --tags --remotes)z symbolic-ref-qHEAD) rev-parse--verify--quietz HEAD^{commit})r3r.r5r6r7splitrrNrstrftimeprintr sysexit_ORPHAN_RESCUE_REF_MAX_AGE_DAYSr`) r"r$rTr.headshacontainsrholdersr_ rescue_refcounts &&& r_park_detached_headr{ps/7=HHAM GRTW XD ;;  " # # %C !3.,EZ![]`aH#??00b779O9Q,=Nqq9GOaG LL  & & 7E7xqqS SJ, 8#>IIQN (S 3 @ "`` for the checkout (``detached`` when not on a branch), or None. Never raises. Appended to summary lines so a checkout parked on a stale branch is visible.)_mr*gitNc*<S!SR.VO3RS/\B#)rkr$) _GIT_TEXT_KW)r#cmdrootr+s*r _rev_parse&_branch_head_label.._rev_parses"3 4t 4O$O,O Orz --abbrev-refrjz--shortrIz @ ) r3rr,r+r- PROJECT_ROOTr6r7r5r4) r"r$rrrTru branch_namesha_textrrr+s && @@@r_branch_head_labelrs)1 &d7mUGos24+<+< P!8*YPV:W & 3 3 5szz7G7G7IX    !S^^q%8P[ +v 5*;Gs8*UU s#CBC4C>C CCc$V^8dQhR\/#rr})rs"rrrs**3*rc8\W4pV'dRV R2#R#)zC`` [ @ ]`` suffix for summary lines ("" when unknown).z []rc)r)r"r$labels&& r_branch_head_suffixrs! w ,E!Rwa=)r)rc V^8dQhR\\,R\R\R\R\\\3,/#)rr"r$current_branch target_branchr)r-r0rtupler)rs"rrrsI4A4A$s)4A$4APS4Adg4Alqrvx{r{l|4Arc^RIHp^RIHpV!4;'g/P R/4p\ V\ 4'd$\VP RR44'gR#T!TR R .T4pTP^8wdR#TPP4'dR#T!TR R R T R2.T4p T P^8wg/T PP4P4'gR#\T PP44p T ^8XdR#T!T.ROT4p \ ;QJd4RT PP#44F 'gK RM) RM%!RT PP#444'dRRT 23#T!TRR T 2.T/\%4C\&CR7p T P^8wdRRT 23#T PP#4U u.uFqP)R4'gKT NK pp RT'dR\+T4 23#R3# \d"p\PRT4Rp?ELRp?ii;iuup i)uDecide whether a parked feature branch may be auto-switched back to the update target. - (True, "") — tree clean and every parked commit is in ``origin/`` (no ``git cherry +``). - (True, "unmerged:") — tree clean but commits not in target; switching is safe (checkout keeps committed work) but caller must print a LOUD notice. Non-interactive callers (desktop, gateway /update, cron) can't resolve a skip, so a clean checkout must reach target. - (False, "disabled"|"dirty"|"unverifiable") — caller must NOT touch the branch. Dirty is the genuinely unsafe case: uncommitted work riding an autostash across branches. A config read failure must not disable the safety checks: fall through with the default.r2) load_configupdatesauto_switch_parked_branchTFz4Could not read updates.auto_switch_parked_branch: %sNstatusz --porcelainrfrgzorigin/z..HEADrcc3p"TF,qP4R,P4R8gxK. R#5i)falseN)rnlower.0r[s& r /_assess_parked_branch_switch..s) X;W4::<  ! ! #w .;Ws46z unmerged:cherry)r(+)Fdisabled)F unverifiable)Fdirty)Trc)configz --get-regexpz1^(remote\..*\.promisor|extensions\.partialclone)$)rJr.hermes_cli.configrget isinstancedictrr4loggerdebugr5r6r7isdigitintanyrMr r startswithrQ)r"r$rrr.r _update_cfgexcrahead ahead_countpromisorrr[unmergeds&&&& r_assess_parked_branch_switchrs93R1"}**// 2> k4 ( (kooFacg6h1i1i$ $g-8# >F A$$ }} Wz9 f6UVX[ \E 1ELL$6$6$8$@$@$B$B$$ell((*+Ka!qsvwH s X8??;U;U;W Xsss X8??;U;U;W XXXy ... gGM?*CDcK35K9JKMF Ay ...!'!9!9!;T!;s?S!;HT 9S]O, @@b @@I R KSQQRFUs)H9A H99I(I(9 I%I  I%rz(the working tree has uncommitted changesrz@updates.auto_switch_parked_branch is set to false in config.yamlc nV^8dQhR\\,R\R\R\R\RR/#)rr"r$rrreasonrNr-r0r)rs"rrrsBtCytUXilvyCrc Rp\\4;_uu_4\VRRV 2R.V4pV'd \V4pRRR4\P VRV 24p\ R\ RV R24\ R V R V R 24VeV^8d\ R V R V R24\ RV RV RV R\ 24R# +'giL;i)zVLOUD block: why the update was skipped on a parked branch, behind-count, fix commands.Nrfz HEAD..origin/rgz6the branch state could not be verified against origin/ u4 ⚠ CODE UPDATE SKIPPED — checkout is parked on ''z Not auto-switching to z: .z This checkout is z commit(s) BEHIND origin/u' — the code you are running is stale.zG To resolve, inspect the branch and switch back yourself: git -C z status git -C z checkout z[ && hermes update (commit or stash your work on the branch first if you want to keep it) )rr4r!r_PARKED_SKIP_WHYrrp_BAR)r"r$rrrbehind behind_textwhys&&&&& r!_print_parked_branch_skip_warningrs F )  !'J- 8WYb+cehi %F    v)_`m_n'o pC BtfI.IYYZ [\ $]O2cU! <= fqj #F8+D]OSz{|  UU*]O4UUYTZ \  s 'C C c@V^8dQhR\R\R\RR/#)rrrunmerged_countrNr})rs"rrrs*  S  ^a fj rc\\R\ RV RV RV RV RV RV R\ 24R#) uLOUD notice when a clean parked branch with unmerged commits is auto-switched. Non-interactive callers can't resolve a skip, so we proceed — but the unmerged work (still safe on its branch) must be impossible to miss.ru ⚠ Checkout was parked on 'z' with z" commit(s) not merged into origin/z. Switching to u; so the update can proceed — your commit(s) are safe on 'z7'. To pick the work back up later: git checkout N)rpr)rrrs&&&r _print_parked_branch_kept_noticers\  TF''5&6g  <]OL')""0!12??M>NbQUPV  Xr0https://github.com/NousResearch/hermes-agent.gitz.skip_upstream_promptchV^8dQhR\\,R\R\\,/#rr"r$r)r-r0rr )rs"rrrs.FFT#YFTFhsmFrc \V.ROV4#)z5Get the URL of the origin remote, or None if not set.)remoteget-urloriginr r"r$s&&r_get_origin_urlrs w ? EErcFV^8dQhR\\,R\/#)r origin_urlr)r r0r)rs"rrr!s" Y Y# Y4 YrctV'gR#RRlpV!V4\Uu0uF q!!V4kK up9#uupi)zDCheck if the origin remote points to a fork (not the official repo).Fc0V^8dQhR\R\/#)rurlrr})rs"rr_is_fork..__annotate__&s((3(3(rcFVPR4pVPR4#)/.git)rstrip removesuffix)rs&r_norm_is_fork.._norm&s jjo''r)OFFICIAL_REPO_URLS)rrofficials& r_is_forkr!s8 (  EW$XEWU8_EW$X XX$Xs5cRV^8dQhR\\,R\R\/#rr-r0rr)rs"rrr-s*DD$s)D$D4Drc \V.ROV4#)z-Check if an 'upstream' remote already exists.)rrupstreamr&rs&&r_has_upstream_remoter-s 7=s CCrcRV^8dQhR\\,R\R\/#rr)rs"rrr2s*SS$s)S$S4Src,\VRRR\.V4#)zHAdd the official repo as the 'upstream' remote. Returns True on success.rrRr)r&OFFICIAL_REPO_URLrs&&r_add_upstream_remoter2s 7Xuj:KLc RRrc jV^8dQhR\\,R\R\R\R\/#)rr"r$basertr)r-r0rr)rs"rrr7s4DID3SVrc \\4;_uu_4\VRRV RV 2.V4pVe\V4uuRRR4#RRR4R# +'giR#;i)zDCount commits on `head` that are not on `base`. Returns -1 on error.rfrgz..Nr)rr4r!r)r"r$rrtrzs&&&& r_count_commits_betweenr7sb )  Gj)vRv=N%OQTU  u:     I   Is $A A# c$V^8dQhR\/#rr)rs"rrr@sDDdDrcN^RIHpV!4\, P4#)z2Check if user previously declined to add upstream.get_hermes_home)hermes_constantsrSKIP_UPSTREAM_PROMPT_FILEexistsrs r_should_skip_upstream_promptr@s0   9 9 A A CCrc\\4;_uu_4^RIHpV!4\, P 4RRR4R# +'giR#;i)z3Create marker file to skip future upstream prompts.rN)rr4rrrtouchrs r_mark_skip_upstream_promptrFs4 )  4  6 6==?    s 'A  A cRV^8dQhR\\,R\R\/#rr)rs"rrrMs*aad3iadatarc$\V.ROVRR7#)z9Push updated main to origin (sync fork); True on success.T)network)pushrmainz--force-with-leaserrs&&r_sync_fork_with_upstreamrMs 7Lc[_ ``rc^V^8dQhR\\,R\R\R\/#rr"r$ assume_yesrr)rs"rrrRs-DID\`rc^RIHpHp\R4V'gMVf]\P P 4'd%\PP 4'g\R\ 24R#Ve'V!RR4P4P4pM(\R4P4P4pVR9d\R\ R 24V!4R#\R 4V!W4'g\R 4R#\R 4R # \\\3d\4RpLzi;i)zPrompt to add ``upstream`` and add it; False when the user declined, the run is non-interactive, or add failed. ``--yes`` means "don't block", not "mutate my remotes", so a non-interactive skip is NOT persisted.)rru ℹ Your fork is not tracking the official Hermes repository. This means you may miss updates from NousResearch/hermes-agent. zF Skipping upstream setup (non-interactive run). Add it later with: Fz-Add official repo as 'upstream' remote? [y/N]nz/Add official repo as 'upstream' remote? [Y/n]: z Skipped. Run 'z' to add later.u→ Adding upstream remote...u< ✗ Failed to add upstream remote. Skipping upstream sync.uF ✓ Added upstream: https://github.com/NousResearch/hermes-agent.gitT>rcyyes)r3rrrprqstdinisattyr6_UPSTREAM_ADD_CMDr7rinputEOFErrorKeyboardInterruptUnicodeDecodeError)r"r$rinput_fnrrresponses&&$$ r_offer_upstream_remoterRsW  Nh& 0@0@0B0BszzGXGXGZGZ WXiWjklKSQWWY__a NOUUW]]_H''  !2 3?CD"$ )*  - - LM RS +-?@  GH s''D$$"E E cBaa]tRtRtoRtV3RlV3RlltRtVtV;t#)UpstreamTargetBrokenirzXThe fork sync's upstream target fails the startup syntax check: refused before its move.c0<V^8dQhRS[RS[RS[RR/#)rrupatherrorrNr})r __classdict__s"rr!UpstreamTargetBroken.__annotate__us);;C;s;3;4;rcj<\SV`RVR, RV 24WVuVnVnVnR#)zupstream/main (N Nz) has a syntax error in N)super__init__rurr)selfrurr __class__s&&&&rrUpstreamTargetBroken.__init__us6 ?3s8*4LTFST*-U'$)TZr)rrru) __name__ __module__ __qualname____firstlineno____doc__r__static_attributes____classdictcell__ __classcell__)r rs@@rrrrsb;;;rrrr checkout_movec^V^8dQhR\\,R\R\R\/#rr)rs"rrrzs4\\49\4\PT\9=\rc ^RIHpHpHpHp^RIHp ^RIHp V!W4'g#V!4'g\WW#R7'gR#\R4V !VRRV !RR 4R .3R VR R RR /V!4B\T.R.OT4p T 'd T!YT R4MR/p T 'd T!YRT 4MR/p T ^8gT ^8d\R4R#T ^8d\RT R24R #T ^8Xd\R4R #\RT R24^RIHp^RIHpHp\TRR.T4pT!T4'g\R4R#T p^RIHpTP)YTT4;p'd\+T.TO5!hTP-YTP/TT4TTRR7pT'd\P!^RTR 7hT;'g\0!T 4;_uu_4T !TRR!T .3R TRR /T!4BRRR4T!T4PCR R'7\T.R0OT4;pT 8wd=TP94\R(T;'gR)R*, R+T R*, R,24R#\R-4R # \Pd\R4R#i;i +'giL;i \2\P43dpT'gTP7T4'dTP94MTP;TT4\R"4\=TR#R4;'g.\?T\P4'dR$M \AT4;p'd\R%T R&24Rp?R#Rp?ii;i)1aOffer to add ``upstream``, compare origin/main vs upstream/main, ff-pull when strictly behind, then push origin. Returns True only when origin/main was actually verified against upstream/main; False when the check never happened, so the caller never reports "up to date" on an origin-only compare. Fetches only upstream/main: a bare fetch drags in thousands of auto-generated branches. ``UpstreamTargetBroken`` when the upstream commit fails the startup syntax check: nothing moved, the caller rolls the update back. ``checkout_move(target)`` is the caller's context for the one tree write (the merge): the paused gateways' tree gate is bound to *target* before git writes a file. See #97052. )rr_no_prompt_git_kwargsr)tracking_refspecr*)rrFu → Fetching upstream...fetchrrrmr$rTr'u7 ✗ Failed to fetch upstream. Skipping upstream sync.rkzrefs/remotes/origin/mainu9 ✗ Could not compare branches. Skipping upstream sync.u ℹ Your fork has z commit(s) not on upstream. Skipping upstream sync to preserve your changes. If you want to merge upstream changes, run: git pull upstream mainu& ✓ Fork is up to date with upstreamu → Fork is u7 commit(s) behind upstream → Pulling from upstream...)update_cmd_commit)interrupted_pull_marker is_object_idrju5 ✗ Could not resolve HEAD. Skipping upstream sync.)_UPDATE_CRITICAL_FILESN)pretargetstashmergestderrz --ff-onlyuO ✗ Failed to pull from upstream. You may need to resolve conflicts manually.r9rcz ()) missing_oku ✗ HEAD is on ?rz after the upstream merge, not ru ✓ Updated from upstreamrkrirlz#refs/remotes/upstream/main^{commit}r)rkrirlrj)"r3rrr-rhermes_cli.update_cmd_checkr.r,r+rrp subprocessCalledProcessErrorr! hermes_clir0hermes_cli._early_recoveryr1r2r3target_syntax_errorrarm_commit_pointdebt_sha_for_move_no_moverKSubprocessErrorsettle_failed_tree_movedisarm_commit_obligationsowe_restore_ofgetattrrr0unlink)r"r$rrr*rrr-rr.r+r origin_aheadupstream_ahead_commitr1r2r4r5r3brokenrefusedrdetaillandeds&&$$$ r_sync_with_upstream_if_neededrTzs~HH<1  - -$&&.DW^h.|.| &'':/? F/SU^_ feh fy} fFJ fNcNe f 7$jlopHai)'B\]oqLck+G:TV^_qsNa>A- IJa "<.1X X  67 N>**b cd8P g V4c :C    EF F=,,W6CYZZvZ"63F33&&wW5N5NsTZ5[ad.4D'BG //77K K''x' 2 2 Gg{H= n3 nd nVkVm n3C ''4'8g'NPSTTYaa ))+ !6==S#"6!77VW_`cWdVeefgh '( I  ( ( GHZ3 2 Z// 0  g55c::  - - /  " "3 , _`c8T2zzZZMjMj=k=krqtuxqy {6 { E&# $ sa I&)J ;J J 'J & J  J  J J J M,;M'AM'5M'M''M,cJV^8dQhR\\,R\RR/#)rr"r$rNr)rs"rrrs%  tCy t  rc4\VRR.V4p\V.R OV4p\V.R OV4pV'd W#8wgW$8XdR#V'd\VRRWB.V4'gR#\R4\W4'd\R4R#\R4R#) zPublish an upstream sync to the fork's main once the update is validated. Pushes only when local HEAD is upstream/main and strictly ahead of origin/main, i.e. this run (or an earlier one whose push failed) fast-forwarded main from upstream. rkrjNz merge-basez --is-ancestoru→ Syncing fork...u ✓ Fork synced with upstreamu ℹ Got updates from upstream but couldn't push to fork (no write access?) Your local repo is updated, but your fork on GitHub may be behind.r=)rkrirlz!refs/remotes/origin/main^{commit})r!r&rpr)r"r$rtrrs&& r_push_synced_forkrWs wf 5s ;D7$jlopH "fhk lF 4#t~ gg ov'TVYZZ  -- /0  U rc<V^8dQhR\R\R\/#)rr9codesr)r0r)rs"rrrs&bb3bbbrcxa\;QJdV3RlV4F 'gK R# R#!V3RlV44#)c3T<"TFpRV 2S9;'g RV 2S9xK R#5i)zHTTP zreturned error: Nr;)rcoder9s& rr!_has_http_code..s7a[`SWtf~'NN-=dV+D+NN[`s((TF)r)r9rYsf*r_has_http_coder^s. 3a[`a33a3a3a[`a aarc0V^8dQhR\R\/#)rrr)rr0)rs"rrrs 6 6D 6S 6rc\PR8Xd0R\V4PRR4,R,pRV 2pM"R\P !\V44 2pRVR, RV 2#) zThe repair for a checkout git rejects: the installer pointed at THIS checkout (a bare one-liner would rebuild the default directory and leave a ``--dir`` install broken).win32rz''z_& ([scriptblock]::Create((irm https://hermes-agent.nousresearch.com/install.ps1))) -InstallDir zOcurl -fsSL https://hermes-agent.nousresearch.com/install.sh | bash -s -- --dir uI✗ This Hermes checkout's git data is damaged (git no longer recognizes rz), so it cannot be updated in place. Run the installer again to repair it; it moves the damaged checkout aside and keeps your config and chats: )rqplatformr0rshlexquote)rquotedrepairs& r_damaged_checkout_messagergs ||ws4y((d33c9""(+cchcncnorswoxcybz{WX\_eXeWfg,-38 56rc<V^8dQhR\R\R\/#)rr9rr)r0rr)rs"rrrs!   c  $  4  rc"\;QJd*RVP44F 'gK RM RM!RVP444'gR#\VRR.VR7pVP^8g;'g\P P \P PVPP444\P P \P PV448g#)aThe fetch failed because git cannot open *root* itself, not because of its remote. git prints the same ``fatal: not a git repository`` for a remote whose ``.git`` is broken, so the stderr line alone is not proof: the checkout must also fail to resolve as its own top level. c3B"TFqPR4xK R#5i)zfatal: not a git repositoryN)rrs& rr,_checkout_rejected_by_git.. s^J]$<==J]sTFrkz--show-toplevelr$) rrMr.r5osrnormcaserealpathr6r7)r9r"rtops&&& r_checkout_rejected_by_gitrqs 3^&J[J[J]^333^&J[J[J]^ ^ ^ 7[*;<$ GC >>Q   "''"2"22773C3CCJJDTDTDV3W"X\^\c\c\l\l ] #  rcP\VR4;'gRVP49#)429z rate limit)r^rss&rrvs!~a'DD<1779+DDru_✗ GitHub is rate limiting requests or having an outage (HTTP 429) — try again in 5 minutes.c \VRRRR4#)500502503504)r^rts&rrvrvs~aue./sY1E-WQW1Es$ $u(✗ Failed to fetch updates from origin.)next_FETCH_FAILURE_RULESr8sfr_classify_fetch_failurer-s" Y1EY\F GGrr"rcJV^8dQhR\R\\,RR/#)rr9rrN)r0r r)rs"rrr2s+ C C CXd^ CW[ CrcT;'gRP4pVRJ;'d\W\V44p\V'd\ \V44M \ V44V'dbVP 4pVR,Fp\RV 24K \V4^8d"\R\V4^, R24R#R#R#)zPrint the classified diagnosis plus bounded raw stderr for diagnosis. With *root*, a checkout git rejects (no fetch can ever work; the ZIP fallback cannot tell user edits apart) gets the installer repair instead.rcNrBz z ... (z more lines omitted))r7rqrrprgrrMrQ)r9r"rdamagedlinesr[s&$$ r_print_fetch_failurer2sll ! ! #F$YY# --version``; True/False = guard message seen/absent, None = probe itself failed.r*z --versiontimeoutNz fork bombrc)r,r+rr4r6r9r)rr+r8s& r_probe_fork_bombrAsi5 }IbILI FMM//RFMM4G4GRHOOQ QQ sA A*)A*c0V^8dQhR\R\/#rr"r)r-r)rs"rrrLs - - - -rc\V4RJ#)aWhether *git_cmd* is a broken Git-for-Windows trampoline shim. The ~46KB ``bin\git.exe``/``cmd\git.exe`` shims re-exec git-core; when they can't find it every call dies with the launcher's guard message (a PATH problem, not network). Never raises; unknown states report False so a probe failure can't block an update. Git for Windows ships two ~46KB shims (``bin\git.exe``, ``cmd\git.exe``) that re-exec the real ``mingw64\libexec\git-core\git.exe``. See #87876. T)r)r"s&r_git_is_trampolinerLs G $ ,,rc$V^8dQhR\/#rr-)rs"rrrYs  $ rc*^RIHpHp.p\\4;_uu_4Y !4\ V!443Uu.uF'q3R, R, R, R, R, NK) up, pRRR4V#uupi +'giT#;i)aPortableGit candidates: shared root first (where the managed tree actually lives, not the profile-scoped HERMES_HOME), then profile home as a fallback for custom layouts. The Hermes-managed PortableGit tree lives under the SHARED root (``/git/...``), not the profile-scoped HERMES_HOME (``/profiles/``), so a profile-scoped ``hermes update`` must look there (monerostar review, #87876). )get_default_hermes_rootrrmingw64libexecgit-coregit.exeN)rrrrr4r)rr candidatesrs r_portable_git_candidatesrYsJJ )  byb{~BCRCT~UbVWbVY]e|i/);jH9TTbVW W   W   sB-A< ) B<B B c:V^8dQhR\\,/#r)r r)rs"rrrhsee(4.ercRUUu.uF:pRF1p\V4R, V, R, R, R, NK3 K< upp\4,p\RV4R4#uuppi) uFind a real Git-for-Windows ``git-core/git.exe`` (standard locations + managed PortableGit) that runs without the trampoline guard. None when nothing suits — callers keep the broken command and let the fetch-failure ZIP fallback handle it. A failed probe (None) disqualifies a candidate like a guard hit. The trampoline symptom is PATH-level: ``bin\git.exe`` / ``cmd\git.exe`` (both ~46KB shims) fail to re-exec git-core, while the real binary at ``mingw64\libexec\git-core\git.exe`` (≈4.4MB) works when invoked directly (#87876). Gitrrrc3"TF9qP4'gK\\V4.4RJgK5VxK; R#5i)FN)rrr0)rcs& rr#_locate_real_git..vs.]Jq((*9I3q6(9SW\9\JsAA AN)zC:\Program FileszC:\Program Files (x86)) clangarm64rmingw32)rrr)rarchrs r_locate_real_gitrhsxEDD8D T UT!I- :YFF8 GD !" #J ]J]_c dd sAA,c0V^8dQhR\R\/#rr)rs"rrrys / / / /rc^RIHp\PR8wg\ V4'gV#V!4pVf\ R4V#\ RV 24\ V4.\VR,4,#)zSwap a broken Git-for-Windows trampoline for a real git binary so fetch/pull/checkout keep working; if none is found leave the command untouched (fetch-failure handler falls back to ZIP). No-op off Windows and when git is healthy.)rrauz⚠ Detected a broken git trampoline and could not locate a real git binary — the update will fall back to the ZIP path.u?⚠ Detected a broken git trampoline; switching to real git at :rNN)r3rrqrbrrpr0r-)r"rreal_gits& r_ensure_non_trampoline_gitryso7 ||w&8&A&A!H K L KH: VW M?T'"+. ..rcFV^8dQhR\R\\,/#)r repo_rootr)rrL)rs"rrrsDSYrc \R40p^RIpVPVR, PRR74pVP R.4p\ V\ 4'dVP R.4p\ V\4'gV#VFp\\4;_uu_4VP\V44FBpVR, P4'gK"VPVPV44KD RRR4K V# +'giK;i \\ \"3dT#i;i)a*Manifest directories whose specs the single root ``package-lock.json`` records: the root plus every workspace from the root ``workspaces`` globs (same model as ``update_cmd_deps._npm_manifest_paths``). A manifest outside that graph (``website/``, ``scripts/whatsapp-bridge/``) has its own lockfile.rN package.jsonz utf-8-sig)r workspacespackages)rjsonloads read_textrrrr-rr4globr0is_filerR relative_torKrO TypeError)rownersrpackagerpattern directorys& r_npm_lockfile_ownersrs 3i[F **i.8CC[CYZ[[r2 j$ ' '# B7J*d++M!G)$$!*G !=I!N2;;== 9#8#8#CD">%$" M %$$ Z +  M s6A=D+ D+(8D%$D D+ D( " D++EEc\/4#)zNThe ``checkout_move`` of a run with no paused gateways: the step runs unbound.)r)_targets_bounds*,rrFrFs r?rc  ^RIHp\\4;_uu_4V!VRR.V4pVP^8wd RRR4R#VP P 4Uu.uFqUP4NK ppVUu0uF0qwPR4'gK\V4PkK2 pp\\V44p .p VFp V PR4'gK\V 4Pp V \R48H;'d\W,4;'gV \R48g;'dW9p V 'dKV PV 4K V 'g RRR4R#T;'g\!V R7;_uu_4V!VR R .V OV4RRR4\R \!V 4 R 24RRR4R#uupiuupi +'giL<;i +'giR#;i) aRestore ``package-lock.json`` files npm rewrote non-deterministically, so the update sees a clean tree instead of autostashing every run. A lockfile is kept when a manifest it records is dirty: for the root lock that is the root or ANY workspace ``package.json`` (reverting it under a dirty ``apps/desktop`` manifest desyncs spec and lock and every later ``npm ci`` fails, #112378); a nested lock is kept only with its sibling manifest. Best-effort.r2diff --name-onlyNrzpackage-lock.jsonrpathscheckout--u"→ Discarded npm lockfile churn ( file(s)))rJr.rr4r5r6rMr7endswithrparentrrappendrFrprQ)r"rr*r.rr[changedpdirty_manifests root_ownersrrlock_dir protecteds&&$ r_discard_lockfile_churnrs 3 )  &-!8)D ??a    -1KK,B,B,DE,DD::<,DE3:Y7ajj>X>47>>7Y*4 ?; D==!455Dz((H!T#Y.VV48U3VDI%EE(*E 9 T" %  &''x'u 5 5 Wz48%8) D6 23u:,iHI+  FY6 5'   sxG2G2#G;G2GG7AG2G20G2 G2G22G2=G2G2G + G2 G2 G/ *G22 H caaaa^RIHp^RIHoVRR.,oVVV3RloV3Rlp\ \ 4;_uu_4V!V.ROS4P P4P4R8wd RRR4R#V!4pVf RRR4R#V'dT;'g\!\V4R 7;_uu_4S!R R R R RP\V44RR7RRR4V!4'd RRR4R#\R\V4 R24S!V.ROSRR\4R7RRR4R# +'giLb;i +'giR#;i)uTake a managed checkout off ``core.autocrlf=true`` without leaving it dirty. Git for Windows sets ``autocrlf=true`` system-wide, turning LF files CRLF and breaking ``git checkout`` on update; install.ps1 pins ``false`` but older checkouts never got it and only ``hermes update`` can fix them. Pin and cleanup are one operation: under ``autocrlf=true`` a CRLF tree reads clean, so pinning alone would expose every file as modified (whole-tree autostash). Pin only after the tree verifies clean under it; a checkout we can't fully normalize is left as-is. Only ``true`` rewrites LF->CRLF (unset/false/input leave the tree alone). Best-effort. Checkouts created before that landed never got the pin and cannot receive it — the bootstrap installer reuses its build-pinned ``install.ps1`` forever — so ``hermes update``, which ships with the checkout itself, is the only path left that can fix them. See #67730. r2r*-czcore.autocrlf=falsec:<S!S\V43RS/\BVB#rl)r-r)r#r%proberr+s*,r _probe_run*_normalize_managed_eol.._probe_runs#ud4jNiN<N2NNrc<S!RRR4pS!RRRRR4pVP^8wgVP^8wdR#VPPR 4Uu0uFq"'gK VkK upR VPP44Uu0uF/p\ V4^8XgKV^,'gK&V^,kK1 up, #uupiuupi) zDDirty paths whose ONLY change is CRLF; None when either probe fails.rz-zrrzcore.quotepath=falsez --numstatz--ignore-cr-at-eolNc3t"TF.qP4'gKVPR^4xK0 R#5i) N)r7rnrs& rr<_normalize_managed_eol.._eol_only..s,i:X$\f\f\h-$**T1--:Xs88)r5r6rnrMrQ) all_dirty real_dirtyrpartsrs r _eol_only)_normalize_managed_eol.._eol_onlysvt];  &(git@github.com:NousResearch/hermes-agent,git@github.com:NousResearch/hermes-agent.git,https://github.com/NousResearch/hermes-agentr)Ir&loggingrmrc contextlibrrr?rqrrrrpathlibrtypingr hermes_cli._subprocess_compatr r r hermes_cli.update_cmd_commonr getLoggerr_ORPHAN_RESCUE_REFS_TO_KEEPrsrrrr r&r.r!r`r{rrrrrrrrrrrrrrrrrrr4rrTrWr^rgrqrrrrrrrrrrFrrr;rrrs , 77gg5   2 3 "$ 4dWY!3!57 ^= u$* ;Ih&>R#4L,* 4Ap 7R (  G3F YD S D @a @;9;\W\\gk\04\~ 0b 6  $Efh<oqG@BQ12,KM[ij%0G C Cd CR - e" /2 JJ>4444r