mirror of
https://github.com/openai/codex.git
synced 2026-04-24 14:45:27 +00:00
This changes how instantiating `Config` works and also adds `approval_policy` and `sandbox_policy` as fields. The idea is: * All fields of `Config` have appropriate default values. * `Config` is initially loaded from `~/.codex/config.toml`, so values in `config.toml` will override those defaults. * Clients must instantiate `Config` via `Config::load_with_overrides(ConfigOverrides)` where `ConfigOverrides` has optional overrides that are expected to be settable based on CLI flags. The `Config` should be defined early in the program and then passed down. Now functions like `init_codex()` take fewer individual parameters because they can just take a `Config`. Also, `Config::load()` used to fail silently if `~/.codex/config.toml` had a parse error and fell back to the default config. This seemed really bad because it wasn't clear why the values in my `config.toml` weren't getting picked up. I changed things so that `load_with_overrides()` returns `Result<Config>` and verified that the various CLIs print a reasonable error if `config.toml` is malformed. Finally, I also updated the TUI to show which **sandbox** value is being used, as we do for other key values like **model** and **approval**. This was also a reminder that the various values of `--sandbox` are honored on Linux but not macOS today, so I added some TODOs about fixing that.
307 lines
9.2 KiB
Rust
307 lines
9.2 KiB
Rust
//! Defines the protocol for a Codex session between a client and an agent.
|
||
//!
|
||
//! Uses a SQ (Submission Queue) / EQ (Event Queue) pattern to asynchronously communicate
|
||
//! between user and agent.
|
||
|
||
use std::collections::HashMap;
|
||
use std::path::PathBuf;
|
||
|
||
use serde::Deserialize;
|
||
use serde::Serialize;
|
||
|
||
/// Submission Queue Entry - requests from user
|
||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||
pub struct Submission {
|
||
/// Unique id for this Submission to correlate with Events
|
||
pub id: String,
|
||
/// Payload
|
||
pub op: Op,
|
||
}
|
||
|
||
/// Submission operation
|
||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||
#[serde(tag = "type", rename_all = "snake_case")]
|
||
#[non_exhaustive]
|
||
pub enum Op {
|
||
/// Configure the model session.
|
||
ConfigureSession {
|
||
/// If not specified, server will use its default model.
|
||
model: String,
|
||
/// Model instructions
|
||
instructions: Option<String>,
|
||
/// When to escalate for approval for execution
|
||
approval_policy: AskForApproval,
|
||
/// How to sandbox commands executed in the system
|
||
sandbox_policy: SandboxPolicy,
|
||
/// Disable server-side response storage (send full context each request)
|
||
#[serde(default)]
|
||
disable_response_storage: bool,
|
||
},
|
||
|
||
/// Abort current task.
|
||
/// This server sends no corresponding Event
|
||
Interrupt,
|
||
|
||
/// Input from the user
|
||
UserInput {
|
||
/// User input items, see `InputItem`
|
||
items: Vec<InputItem>,
|
||
},
|
||
|
||
/// Approve a command execution
|
||
ExecApproval {
|
||
/// The id of the submission we are approving
|
||
id: String,
|
||
/// The user's decision in response to the request.
|
||
decision: ReviewDecision,
|
||
},
|
||
|
||
/// Approve a code patch
|
||
PatchApproval {
|
||
/// The id of the submission we are approving
|
||
id: String,
|
||
/// The user's decision in response to the request.
|
||
decision: ReviewDecision,
|
||
},
|
||
}
|
||
|
||
/// Determines how liberally commands are auto‑approved by the system.
|
||
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||
#[serde(rename_all = "kebab-case")]
|
||
pub enum AskForApproval {
|
||
/// Under this policy, only “known safe” commands—as determined by
|
||
/// `is_safe_command()`—that **only read files** are auto‑approved.
|
||
/// Everything else will ask the user to approve.
|
||
#[default]
|
||
UnlessAllowListed,
|
||
|
||
/// In addition to everything allowed by **`Suggest`**, commands that
|
||
/// *write* to files **within the user’s approved list of writable paths**
|
||
/// are also auto‑approved.
|
||
/// TODO(ragona): fix
|
||
AutoEdit,
|
||
|
||
/// *All* commands are auto‑approved, but they are expected to run inside a
|
||
/// sandbox where network access is disabled and writes are confined to a
|
||
/// specific set of paths. If the command fails, it will be escalated to
|
||
/// the user to approve execution without a sandbox.
|
||
OnFailure,
|
||
|
||
/// Never ask the user to approve commands. Failures are immediately returned
|
||
/// to the model, and never escalated to the user for approval.
|
||
Never,
|
||
}
|
||
|
||
/// Determines execution restrictions for model shell commands
|
||
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||
#[serde(rename_all = "kebab-case")]
|
||
pub enum SandboxPolicy {
|
||
/// Network syscalls will be blocked
|
||
NetworkRestricted,
|
||
/// Filesystem writes will be restricted
|
||
FileWriteRestricted,
|
||
/// Network and filesystem writes will be restricted
|
||
#[default]
|
||
NetworkAndFileWriteRestricted,
|
||
/// No restrictions; full "unsandboxed" mode
|
||
DangerousNoRestrictions,
|
||
}
|
||
|
||
impl SandboxPolicy {
|
||
pub fn is_dangerous(&self) -> bool {
|
||
match self {
|
||
SandboxPolicy::NetworkRestricted => false,
|
||
SandboxPolicy::FileWriteRestricted => false,
|
||
SandboxPolicy::NetworkAndFileWriteRestricted => false,
|
||
SandboxPolicy::DangerousNoRestrictions => true,
|
||
}
|
||
}
|
||
|
||
pub fn is_network_restricted(&self) -> bool {
|
||
matches!(
|
||
self,
|
||
SandboxPolicy::NetworkRestricted | SandboxPolicy::NetworkAndFileWriteRestricted
|
||
)
|
||
}
|
||
|
||
pub fn is_file_write_restricted(&self) -> bool {
|
||
matches!(
|
||
self,
|
||
SandboxPolicy::FileWriteRestricted | SandboxPolicy::NetworkAndFileWriteRestricted
|
||
)
|
||
}
|
||
}
|
||
/// User input
|
||
#[non_exhaustive]
|
||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||
#[serde(tag = "type", rename_all = "snake_case")]
|
||
pub enum InputItem {
|
||
Text {
|
||
text: String,
|
||
},
|
||
/// Pre‑encoded data: URI image.
|
||
Image {
|
||
image_url: String,
|
||
},
|
||
|
||
/// Local image path provided by the user. This will be converted to an
|
||
/// `Image` variant (base64 data URL) during request serialization.
|
||
LocalImage {
|
||
path: std::path::PathBuf,
|
||
},
|
||
}
|
||
|
||
/// Event Queue Entry - events from agent
|
||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||
pub struct Event {
|
||
/// Submission `id` that this event is correlated with.
|
||
pub id: String,
|
||
/// Payload
|
||
pub msg: EventMsg,
|
||
}
|
||
|
||
/// Response event from the agent
|
||
#[non_exhaustive]
|
||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||
#[serde(tag = "type", rename_all = "snake_case")]
|
||
pub enum EventMsg {
|
||
/// Error while executing a submission
|
||
Error {
|
||
message: String,
|
||
},
|
||
|
||
/// Agent has started a task
|
||
TaskStarted,
|
||
|
||
/// Agent has completed all actions
|
||
TaskComplete,
|
||
|
||
/// Agent text output message
|
||
AgentMessage {
|
||
message: String,
|
||
},
|
||
|
||
/// Ack the client's configure message.
|
||
SessionConfigured {
|
||
/// Tell the client what model is being queried.
|
||
model: String,
|
||
},
|
||
|
||
/// Notification that the server is about to execute a command.
|
||
ExecCommandBegin {
|
||
/// Identifier so this can be paired with the ExecCommandEnd event.
|
||
call_id: String,
|
||
/// The command to be executed.
|
||
command: Vec<String>,
|
||
/// The command's working directory if not the default cwd for the
|
||
/// agent.
|
||
cwd: String,
|
||
},
|
||
|
||
ExecCommandEnd {
|
||
/// Identifier for the ExecCommandBegin that finished.
|
||
call_id: String,
|
||
/// Captured stdout
|
||
stdout: String,
|
||
/// Captured stderr
|
||
stderr: String,
|
||
/// The command's exit code.
|
||
exit_code: i32,
|
||
},
|
||
|
||
ExecApprovalRequest {
|
||
/// The command to be executed.
|
||
command: Vec<String>,
|
||
/// The command's working directory.
|
||
cwd: PathBuf,
|
||
/// Optional human‑readable reason for the approval (e.g. retry without
|
||
/// sandbox).
|
||
#[serde(skip_serializing_if = "Option::is_none")]
|
||
reason: Option<String>,
|
||
},
|
||
|
||
ApplyPatchApprovalRequest {
|
||
changes: HashMap<PathBuf, FileChange>,
|
||
/// Optional explanatory reason (e.g. request for extra write access).
|
||
#[serde(skip_serializing_if = "Option::is_none")]
|
||
reason: Option<String>,
|
||
|
||
/// When set, the agent is asking the user to allow writes under this
|
||
/// root for the remainder of the session.
|
||
#[serde(skip_serializing_if = "Option::is_none")]
|
||
grant_root: Option<PathBuf>,
|
||
},
|
||
|
||
BackgroundEvent {
|
||
message: String,
|
||
},
|
||
|
||
/// Notification that the agent is about to apply a code patch. Mirrors
|
||
/// `ExecCommandBegin` so front‑ends can show progress indicators.
|
||
PatchApplyBegin {
|
||
/// Identifier so this can be paired with the PatchApplyEnd event.
|
||
call_id: String,
|
||
|
||
/// If true, there was no ApplyPatchApprovalRequest for this patch.
|
||
auto_approved: bool,
|
||
|
||
/// The changes to be applied.
|
||
changes: HashMap<PathBuf, FileChange>,
|
||
},
|
||
|
||
/// Notification that a patch application has finished.
|
||
PatchApplyEnd {
|
||
/// Identifier for the PatchApplyBegin that finished.
|
||
call_id: String,
|
||
/// Captured stdout (summary printed by apply_patch).
|
||
stdout: String,
|
||
/// Captured stderr (parser errors, IO failures, etc.).
|
||
stderr: String,
|
||
/// Whether the patch was applied successfully.
|
||
success: bool,
|
||
},
|
||
}
|
||
|
||
/// User's decision in response to an ExecApprovalRequest.
|
||
#[derive(Debug, Default, Clone, Copy, Deserialize, Serialize)]
|
||
#[serde(rename_all = "snake_case")]
|
||
pub enum ReviewDecision {
|
||
/// User has approved this command and the agent should execute it.
|
||
Approved,
|
||
|
||
/// User has approved this command and wants to automatically approve any
|
||
/// future identical instances (`command` and `cwd` match exactly) for the
|
||
/// remainder of the session.
|
||
ApprovedForSession,
|
||
|
||
/// User has denied this command and the agent should not execute it, but
|
||
/// it should continue the session and try something else.
|
||
#[default]
|
||
Denied,
|
||
|
||
/// User has denied this command and the agent should not do anything until
|
||
/// the user's next command.
|
||
Abort,
|
||
}
|
||
|
||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||
#[serde(rename_all = "snake_case")]
|
||
pub enum FileChange {
|
||
Add {
|
||
content: String,
|
||
},
|
||
Delete,
|
||
Update {
|
||
unified_diff: String,
|
||
move_path: Option<PathBuf>,
|
||
},
|
||
}
|
||
|
||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||
pub struct Chunk {
|
||
/// 1-based line index of the first line in the original file
|
||
pub orig_index: u32,
|
||
pub deleted_lines: Vec<String>,
|
||
pub inserted_lines: Vec<String>,
|
||
}
|