mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
feat: separate protocol vs internal versions of AskForApproval
This commit is contained in:
@@ -830,7 +830,6 @@ mod tests {
|
||||
use codex_protocol::ThreadId;
|
||||
use codex_protocol::account::PlanType;
|
||||
use codex_protocol::parse_command::ParsedCommand;
|
||||
use codex_protocol::protocol::AskForApproval;
|
||||
use pretty_assertions::assert_eq;
|
||||
use serde_json::json;
|
||||
use std::path::PathBuf;
|
||||
@@ -844,7 +843,7 @@ mod tests {
|
||||
model_provider: None,
|
||||
profile: None,
|
||||
cwd: None,
|
||||
approval_policy: Some(AskForApproval::OnRequest),
|
||||
approval_policy: Some(v1::AskForApprovalProtocolV1::OnRequest),
|
||||
sandbox: None,
|
||||
config: None,
|
||||
base_instructions: None,
|
||||
|
||||
@@ -9,7 +9,7 @@ use codex_protocol::config_types::Verbosity;
|
||||
use codex_protocol::models::ResponseItem;
|
||||
use codex_protocol::openai_models::ReasoningEffort;
|
||||
use codex_protocol::parse_command::ParsedCommand;
|
||||
use codex_protocol::protocol::AskForApproval;
|
||||
use codex_protocol::protocol::AskForApproval as CoreAskForApproval;
|
||||
use codex_protocol::protocol::EventMsg;
|
||||
use codex_protocol::protocol::FileChange;
|
||||
use codex_protocol::protocol::ReviewDecision;
|
||||
@@ -71,7 +71,7 @@ pub struct NewConversationParams {
|
||||
pub model_provider: Option<String>,
|
||||
pub profile: Option<String>,
|
||||
pub cwd: Option<String>,
|
||||
pub approval_policy: Option<AskForApproval>,
|
||||
pub approval_policy: Option<AskForApprovalProtocolV1>,
|
||||
pub sandbox: Option<SandboxMode>,
|
||||
pub config: Option<HashMap<String, serde_json::Value>>,
|
||||
pub base_instructions: Option<String>,
|
||||
@@ -358,7 +358,7 @@ pub struct SetDefaultModelResponse {}
|
||||
#[derive(Deserialize, Debug, Clone, PartialEq, Serialize, JsonSchema, TS)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct UserSavedConfig {
|
||||
pub approval_policy: Option<AskForApproval>,
|
||||
pub approval_policy: Option<AskForApprovalProtocolV1>,
|
||||
pub sandbox_mode: Option<SandboxMode>,
|
||||
pub sandbox_settings: Option<SandboxSettings>,
|
||||
pub forced_chatgpt_workspace_id: Option<String>,
|
||||
@@ -377,7 +377,7 @@ pub struct UserSavedConfig {
|
||||
pub struct Profile {
|
||||
pub model: Option<String>,
|
||||
pub model_provider: Option<String>,
|
||||
pub approval_policy: Option<AskForApproval>,
|
||||
pub approval_policy: Option<AskForApprovalProtocolV1>,
|
||||
pub model_reasoning_effort: Option<ReasoningEffort>,
|
||||
pub model_reasoning_summary: Option<ReasoningSummary>,
|
||||
pub model_verbosity: Option<Verbosity>,
|
||||
@@ -414,7 +414,7 @@ pub struct SendUserTurnParams {
|
||||
pub conversation_id: ThreadId,
|
||||
pub items: Vec<InputItem>,
|
||||
pub cwd: PathBuf,
|
||||
pub approval_policy: AskForApproval,
|
||||
pub approval_policy: AskForApprovalProtocolV1,
|
||||
pub sandbox_policy: SandboxPolicy,
|
||||
pub model: String,
|
||||
pub effort: Option<ReasoningEffort>,
|
||||
@@ -529,6 +529,53 @@ impl From<V1TextElement> for CoreTextElement {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, JsonSchema, TS)]
|
||||
#[serde(rename_all = "kebab-case")]
|
||||
pub enum AskForApprovalProtocolV1 {
|
||||
/// Under this policy, only "known safe" commands—those matching
|
||||
/// `is_safe_command()` and performing read-only file operations—are
|
||||
/// auto-approved. Everything else will ask the user to approve.
|
||||
#[serde(rename = "untrusted")]
|
||||
UnlessTrusted,
|
||||
|
||||
/// DEPRECATED: *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.
|
||||
/// Prefer `on-request` for interactive runs or `never` for non-interactive
|
||||
/// runs.
|
||||
OnFailure,
|
||||
|
||||
/// The model decides when to ask the user for approval.
|
||||
OnRequest,
|
||||
|
||||
/// Never ask the user to approve commands. Failures are immediately returned
|
||||
/// to the model, and never escalated to the user for approval.
|
||||
Never,
|
||||
}
|
||||
|
||||
impl AskForApprovalProtocolV1 {
|
||||
pub fn to_core(self) -> CoreAskForApproval {
|
||||
match self {
|
||||
AskForApprovalProtocolV1::UnlessTrusted => CoreAskForApproval::UnlessTrusted,
|
||||
AskForApprovalProtocolV1::OnFailure => CoreAskForApproval::OnFailure,
|
||||
AskForApprovalProtocolV1::OnRequest => CoreAskForApproval::OnRequest,
|
||||
AskForApprovalProtocolV1::Never => CoreAskForApproval::Never,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<CoreAskForApproval> for AskForApprovalProtocolV1 {
|
||||
fn from(value: CoreAskForApproval) -> Self {
|
||||
match value {
|
||||
CoreAskForApproval::UnlessTrusted => AskForApprovalProtocolV1::UnlessTrusted,
|
||||
CoreAskForApproval::OnFailure => AskForApprovalProtocolV1::OnFailure,
|
||||
CoreAskForApproval::OnRequest => AskForApprovalProtocolV1::OnRequest,
|
||||
CoreAskForApproval::Never => AskForApprovalProtocolV1::Never,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
/// Deprecated in favor of AccountLoginCompletedNotification.
|
||||
|
||||
Reference in New Issue
Block a user