fix(cli): add timeout to git stash during update - #909
Open
hashbender wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Add a 120-second timeout to
git stash push --include-untrackedin the update flow. On Windows, this command can hang indefinitely when files are locked by other processes (antivirus, gateway, etc.), causinghermes updateto appear stuck for hours.When the timeout is reached, the update proceeds without stashing and prints guidance for manual stash/reset.
Related Issue
Fixes NousResearch#57081
Type of Change
Changes Made
hermes_cli/main.py: Addedtimeout=120to thegit stash push --include-untrackedsubprocess call in_stash_local_changes_if_needed(). Catchessubprocess.TimeoutExpiredand returnsNone(skip stashing) with actionable guidance.tests/hermes_cli/test_update_autostash.py: Addedtest_stash_local_changes_if_needed_returns_none_on_timeoutverifying the timeout behavior.How to Test
pytest tests/hermes_cli/test_update_autostash.py -q— all 34 tests should pass.hermes updateshould no longer hang indefinitely. After 120s, it prints a warning and proceeds.Checklist
Code
fix(scope):,feat(scope):, etc.)pytest tests/ -qand all tests passDocumentation & Housekeeping
docs/, docstrings) — or N/Acli-config.yaml.exampleif I added/changed config keys — or N/ACONTRIBUTING.mdorAGENTS.mdif I changed architecture or workflows — or N/AMirror-of: NousResearch#57134
NousResearch#57134