Support multi-environment apply_patch selection#21617

Merged

starr-openai merged 13 commits into

mainfrom

starr/apply-patch-consolidated-20260507

May 11, 2026

starr-openai commented May 7, 2026

Contributor

Summary

add multi-environment apply_patch routing for both freeform and function-call tool flows
parse and reconcile the optional environment selector in the main apply_patch parser, then verify against the selected environment in the handler
carry environment_id through runtime and approval surfaces so remote-targeted patches stay explicit end to end

Testing

just fmt
remote exec-server e2e: cargo test -p codex-core --test all apply_patch_multi_environment_uses_remote_executor -- --nocapture on dev via scripts/test-remote-env.sh

starr-openai requested a review from a team as a code owner

May 7, 2026 23:43

starr-openai force-pushed the starr/apply-patch-consolidated-20260507 branch 7 times, most recently from 7def473 to 9698ddc Compare

May 8, 2026 00:29

github-actions Bot mentioned this pull request

📊 AI CLI 工具社区动态日报 2026-05-08 zx0828/big_model_radar#43

Open

starr-openai added the code-reviewed label

pakrym-oai reviewed

View reviewed changes

codex-rs/app-server-protocol/src/protocol/thread_history.rs Outdated

pakrym-oai reviewed

View reviewed changes

codex-rs/apply-patch/src/parser.rs

pakrym-oai reviewed

View reviewed changes

codex-rs/apply-patch/src/streaming_parser.rs Outdated

pakrym-oai reviewed

View reviewed changes

codex-rs/core/src/tools/handlers/apply_patch_spec.rs Outdated

pakrym-oai reviewed

View reviewed changes

codex-rs/core/src/tools/handlers/apply_patch.rs Outdated

pakrym-oai reviewed

View reviewed changes

codex-rs/core/src/tools/handlers/apply_patch.rs Outdated

pakrym-oai reviewed

View reviewed changes

codex-rs/core/src/tools/handlers/apply_patch.rs Outdated

pakrym-oai reviewed

View reviewed changes

codex-rs/core/src/tools/handlers/apply_patch.rs Outdated

pakrym-oai reviewed

View reviewed changes

codex-rs/core/src/tools/handlers/apply_patch.rs

github-actions Bot mentioned this pull request

📊 AI CLI 工具社区动态日报 2026-05-08 gsscsd/big_model_radar#310

Open

pakrym-oai reviewed

View reviewed changes

codex-rs/core/src/tools/handlers/apply_patch.rs Outdated

github-actions Bot mentioned this pull request

📊 AI CLI 工具社区动态日报 2026-05-08 ivanweng2077/big_model_radar#10

Open

starr-openai force-pushed the starr/apply-patch-consolidated-20260507 branch 8 times, most recently from a885774 to 0267198 Compare

May 8, 2026 21:12

pakrym-oai reviewed

View reviewed changes

codex-rs/apply-patch/src/invocation.rs Outdated

pakrym-oai reviewed

View reviewed changes

codex-rs/mcp-server/tests/suite/codex_tool.rs

pakrym-oai reviewed

View reviewed changes

codex-rs/core/src/tools/handlers/apply_patch_tests.rs Outdated

pakrym-oai approved these changes

View reviewed changes

pakrym-oai left a comment

Collaborator

Nice!

starr-openai added a commit that referenced this pull request


          codex: address final apply_patch review nits (#21617)

684807b

Co-authored-by: Codex <noreply@openai.com>

starr-openai added a commit that referenced this pull request


          codex: fix PR #21617 clippy failure

bf8e0bb

Co-authored-by: Codex <noreply@openai.com>

starr-openai added a commit that referenced this pull request


          codex: fix PR #21617 sandbox integration test

03039f5

Co-authored-by: Codex <noreply@openai.com>

starr-openai force-pushed the starr/apply-patch-consolidated-20260507 branch from 19c6dd1 to b8f059a Compare

May 11, 2026 22:11

starr-openai and others added 12 commits

May 11, 2026 15:12


          Tighten apply_patch environment handling

2cf36f8

Co-authored-by: Codex <noreply@openai.com>


          Parse apply_patch environment preamble in parser

77b3116

Move environment id extraction into the apply-patch parser and verify parsed freeform tool input without reparsing. Always pass the selected-cwd filesystem sandbox context into apply_patch verification so local preflight reads follow the same sandbox path as remote reads.

Co-authored-by: Codex <noreply@openai.com>


          Allow default apply_patch environment

7eb107f

Let multi-environment apply_patch calls without an explicit environment_id fall through to the primary turn environment, matching the optional parser contract and existing resolve_tool_environment(None) behavior.

Co-authored-by: Codex <noreply@openai.com>


          Address apply_patch review feedback

aea8304

Co-authored-by: Codex <noreply@openai.com>


          Carry selected apply_patch environment

9f79fe2

Co-authored-by: Codex <noreply@openai.com>


          Fix apply_patch CI regressions

5df7574

Co-authored-by: Codex <noreply@openai.com>


          Run apply_patch runtime tests with Tokio

751f9eb

Co-authored-by: Codex <noreply@openai.com>


          Keep MCP patch approval test unsandboxed

a138bc4

Co-authored-by: Codex <noreply@openai.com>


          codex: address final apply_patch review nits (#21617)

dc3629b

Co-authored-by: Codex <noreply@openai.com>


          codex: fix PR #21617 clippy failure

12f5e50

Co-authored-by: Codex <noreply@openai.com>


          codex: fix PR #21617 sandbox integration test

902ac51

Co-authored-by: Codex <noreply@openai.com>


          codex: scope PR #21617 sandbox integration test

fd9c1f6

Co-authored-by: Codex <noreply@openai.com>

starr-openai force-pushed the starr/apply-patch-consolidated-20260507 branch from b8f059a to fd9c1f6 Compare

May 11, 2026 22:13


          codex: fix PR #21617 windows clippy

ed59c0c

Co-authored-by: Codex <noreply@openai.com>

starr-openai merged commit 22e84c4 into main

27 checks passed

starr-openai deleted the starr/apply-patch-consolidated-20260507 branch

May 11, 2026 23:33

github-actions Bot locked and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels