fix: #3359 preserve local approval rejection reasons#3360
Merged
Conversation
seratch
approved these changes
May 11, 2026
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.
Summary
Preserve non-empty rejection reasons returned by local tool
on_approvalcallbacks when recording an automatic rejection.The public local approval callback result can include a
reason, and hosted MCP approval handling already propagates rejection reasons through its own path. This change keeps shell, apply_patch, and custom local tool rejection outputs consistent with the callback decision while preserving the existing default rejection text when the reason is missing, empty, or not a string.Test plan
uv run pytest tests/test_shell_tool.py tests/test_apply_patch_tool.py tests/test_custom_tool.py -qbash .agents/skills/code-change-verification/scripts/run.shThe focused local approval tests pass on this branch directly. The full shell verification script was run in a local validation checkout where this branch was temporarily combined with the pending tracing shutdown fix, so the tracing atexit cleanup test would not time out.
Issue number
Closes #3359
Checks
make lintandmake format