Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/agent/codex/argv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,17 @@ const HOOKS_OFF: [&str; 2] = ["--disable", "hooks"];
/// codex's own reach writes nothing — `apply_patch` is rejected before it
/// runs (see the notes on [`crate::agent::codex`]) — and nothing waits on
/// a person.
pub const MODEL_ONLY_OVERRIDES: [&str; 14] = [
/// - `include_permissions_instructions=false`: codex does not describe that
/// sandbox to the model. It told the model, in a `<permissions
/// instructions>` block, that `sandbox_mode` is `read-only`, and the model
/// then refused writes outright: measured on 0.167.0 with gpt-5.6-terra,
/// it tried codex's own `apply_patch`, got "patch rejected: writing is
/// blocked by read-only sandbox" and answered that the filesystem was
/// read-only, never trying incode's `Write` (the session file in
/// `~/.codex/sessions` shows both). The sandbox stays read-only; only the
/// misleading description goes.
/// - [`WRITE_THROUGH_INCODE`]: says, in its place, where changes are made.
pub const MODEL_ONLY_OVERRIDES: [&str; 16] = [
"features.shell_tool=false",
"features.view_image=false",
"web_search=\"disabled\"",
Expand All @@ -62,8 +72,21 @@ pub const MODEL_ONLY_OVERRIDES: [&str; 14] = [
"features.image_generation=false",
"sandbox_mode=\"read-only\"",
"approval_policy=\"never\"",
"include_permissions_instructions=false",
WRITE_THROUGH_INCODE,
];

/// The developer instructions on the bridged route: changes and commands go
/// through incode's tools, and codex's own `apply_patch`, which the read-only
/// sandbox always rejects, is not the way. One TOML basic string (no `"` or
/// `\` inside), so `-c` parses it as written.
pub const WRITE_THROUGH_INCODE: &str = "developer_instructions=\"Every file change and \
command in this session goes through the incode tools (Write, Edit, MultiEdit, ApplyPatch, \
Bash, Read and the others served by the incode MCP server), which incode runs with its own \
permissions. Codex's own apply_patch is switched off here and is always rejected: never use \
it, and never decline a change because of codex's sandbox. Make every change with the \
incode tools; if incode refuses one, say what it said.\"";

/// Codex's user config (`$CODEX_HOME/config.toml`) is not read on the
/// bridged route — the counterpart of the Claude route's
/// `--setting-sources ""`: an MCP server the operator registered there would
Expand Down
6 changes: 5 additions & 1 deletion src/agent/codex/pinned_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,8 @@ fn bridged_overrides(exe: &str) -> Vec<String> {
"features.image_generation=false".to_string(),
"sandbox_mode=\"read-only\"".to_string(),
"approval_policy=\"never\"".to_string(),
"include_permissions_instructions=false".to_string(),
super::argv::WRITE_THROUGH_INCODE.to_string(),
format!("mcp_servers.incode.command=\"{exe}\""),
"mcp_servers.incode.args=[\"--tool-server\"]".to_string(),
"mcp_servers.incode.env_vars=[\"INCODE_TOOL_BRIDGE\",\"INCODE_TOOL_TOKEN\"]".to_string(),
Expand Down Expand Up @@ -888,7 +890,7 @@ fn the_bridged_command_escapes_a_windows_server_path() {
}

#[test]
fn the_model_only_overrides_are_the_fourteen() {
fn the_model_only_overrides_are_the_sixteen() {
assert_eq!(
MODEL_ONLY_OVERRIDES,
[
Expand All @@ -906,6 +908,8 @@ fn the_model_only_overrides_are_the_fourteen() {
"features.image_generation=false",
"sandbox_mode=\"read-only\"",
"approval_policy=\"never\"",
"include_permissions_instructions=false",
super::argv::WRITE_THROUGH_INCODE,
]
);
}
Expand Down
Loading