Preserve encrypted content in MCP tool outputs - #33509
Merged
copyberry[bot] merged 1 commit intoJul 16, 2026
Merged
Conversation
## What changed - Convert MCP text content marked with `_meta["codex/encryptedContent"] = true` into `encrypted_content` function call output items. - Prefer the content-item payload whenever encrypted content is present so that `structured_content` does not replace the encrypted output. ## Testing - Add a stdio MCP integration test that round-trips mixed plaintext and encrypted tool output. GitOrigin-RevId: c3997a16b06ad38ff22b21016ede35b97974d9ec
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/c3997a16b06ad38ff22b21016ede35b97974d9ec
branch
from
July 16, 2026 05:39
9fc1ddb to
cbc83d9
Compare
copyberry
Bot
deleted the
copyberry/codex-internal-to-codex-oss/c3997a16b06ad38ff22b21016ede35b97974d9ec
branch
July 16, 2026 05:40
onePengYuYan
temporarily deployed
to
issue-triage
July 16, 2026 05:41 — with 
GitHub Actions
Inactive
onePengYuYan
temporarily deployed
to
issue-triage
July 16, 2026 05:41 — with
GitHub Actions
Inactive
onePengYuYan
temporarily deployed
to
issue-triage
July 16, 2026 05:41 — with
GitHub Actions
Inactive
onePengYuYan
temporarily deployed
to
issue-triage
July 16, 2026 05:42 — with
GitHub Actions
Inactive
wuyuqing767-ai
temporarily deployed
to
issue-triage
July 16, 2026 05:44 — with
GitHub Actions
Inactive
wuyuqing767-ai
temporarily deployed
to
issue-triage
July 16, 2026 05:44 — with
GitHub Actions
Inactive
wuyuqing767-ai
temporarily deployed
to
issue-triage
July 16, 2026 05:44 — with
GitHub Actions
Inactive
tianjiaoju90-sys
temporarily deployed
to
issue-triage
July 16, 2026 06:36 — with
GitHub Actions
Inactive
tianjiaoju90-sys
temporarily deployed
to
issue-triage
July 16, 2026 06:36 — with
GitHub Actions
Inactive
Yan18476936925
temporarily deployed
to
issue-triage
July 16, 2026 06:39 — with
GitHub Actions
Inactive
Yan18476936925
temporarily deployed
to
issue-triage
July 16, 2026 06:39 — with
GitHub Actions
Inactive
Yan18476936925
temporarily deployed
to
issue-triage
July 16, 2026 06:39 — with
GitHub Actions
Inactive
dominik-lenhart
temporarily deployed
to
issue-triage
July 16, 2026 06:58 — with
GitHub Actions
Inactive
dominik-lenhart
temporarily deployed
to
issue-triage
July 16, 2026 06:58 — with
GitHub Actions
Inactive
dominik-lenhart
temporarily deployed
to
issue-triage
July 16, 2026 06:58 — with
GitHub Actions
Inactive
dominik-lenhart
temporarily deployed
to
issue-triage
July 16, 2026 07:00 — with
GitHub Actions
Inactive
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
20 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.
Preserve encrypted content in MCP tool outputs
What changed
_meta["codex/encryptedContent"] = trueinto
encrypted_contentfunction call output items.structured_contentdoes not replace the encrypted output.Testing
encrypted tool output.