fix: honor approval timeout config in CLI prompt#17933
Open
hanzckernel wants to merge 3 commits into
Open
Conversation
Collaborator
|
Likely duplicate of #13088 — both fix approvals.timeout being ignored in CLI (hardcoded 60s). Check which has broader scope. |
Contributor
Author
|
Checked against #13088. There is overlap on the classic CLI hardcoded 60s approval timeout, but this PR is the cleaner narrow fix: current/mergeable, less stale #13088 also covers ACP, which this PR does not. If maintainers want that in scope, I can add a small ACP follow-up/commit instead of pulling in the stale #13088 diff. |
…528200641 # Conflicts: # cli.py
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.
Classic CLI dangerous-command approvals now use the existing
approvals.timeoutconfig instead of a hardcoded 60-second deadline.Changes
approvals.timeoutwhen building the prompt_toolkit approval deadline.approvalsblocks and unsafe timeout values.Verification
Passed:
Results:
py_compilepassed forcli.pyandtools/approval.py.git diff --checkpassed.Known:
scripts/run_tests.sh tests -qrun did not complete on my macOS checkout because pytest hitOSError: [Errno 24] Too many open files; targeted approval/CLI coverage above is green.