fix(approvals): skip needs_approval_checker when status resolved in _collect_runs_by_approval#3259
Draft
adityasingh2400 wants to merge 2 commits intoopenai:mainfrom
Draft
fix(approvals): skip needs_approval_checker when status resolved in _collect_runs_by_approval#3259adityasingh2400 wants to merge 2 commits intoopenai:mainfrom
adityasingh2400 wants to merge 2 commits intoopenai:mainfrom
Conversation
…collect_runs_by_approval Mirrors openai#3229 for non-function tools. When approval_status is already True or False, _collect_runs_by_approval still invokes the user-supplied needs_approval_checker before deciding. The checker may have side effects (telemetry, network) and a non-UserError exception is swallowed; a UserError would short-circuit even an already-approved call. Move the approval_status is True check above the checker invocation so explicit approve/reject decisions short-circuit cleanly.
Member
|
@codex review |
|
Codex Review: Didn't find any major issues. Keep them coming! ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
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
2 participants
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
Mirrors #3229 for non-function tools (shell, apply_patch, custom).
_collect_runs_by_approvalinvokes the user-suppliedneeds_approval_checkereven whenapproval_statusis alreadyTrueorFalse. The checker may have side effects (telemetry, network) and a non-UserErrorexception is silently swallowed; aUserErrorwould short-circuit an already-approved call.The parallel function
_select_function_tool_runs_for_resumewas fixed in #3229 with the same reasoning.Fix
Move the
approval_status is Trueearly-return above the checker invocation so explicit approve/reject decisions short-circuit cleanly. Rejected (is False) was already short-circuited.Test plan
test_collect_runs_by_approval_skips_checker_when_status_resolvedconfirms the checker is not invoked for approved/rejected shell calls.tests/test_hitl_error_scenarios.py(51 tests) and related HITL/approval suites pass.