fix: redact MCP invalid JSON errors when tool logging is disabled#3088
Merged
seratch merged 4 commits intoopenai:mainfrom May 4, 2026
Merged
fix: redact MCP invalid JSON errors when tool logging is disabled#3088seratch merged 4 commits intoopenai:mainfrom
seratch merged 4 commits intoopenai:mainfrom
Conversation
Member
|
@codex review |
1 similar comment
Member
|
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 07c2d8ef82
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
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".
Contributor
Author
|
@codex review |
seratch
approved these changes
May 4, 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
Redacts malformed MCP tool input from
ModelBehaviorErrorinsrc/agents/mcp/util.pywhenDONT_LOG_TOOL_DATAis enabled.Previously,
invoke_mcp_tool()suppressed debug logging in no-tool-data mode but still embedded the rawinput_jsonin the raised exception, which could leak secrets through logs, traces, or error reporting pipelines. This change makes the exception path follow the same redaction policy as logging, while preserving the existing full-payload behavior when tool-data logging is explicitly enabled.Also adds regression coverage in
tests/mcp/test_mcp_util.pyfor both redacted and non-redacted modes.Test plan
bash .agents/skills/code-change-verification/scripts/run.shtests/mcp/test_mcp_util.pyIssue number
Closes #3087
Checks
make lintandmake format