openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-25 18:28:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rhan/approval-source' into rhan/escalations-approvals-sandbox

Browse Source 
# Conflicts:
#	codex-rs/core/src/codex.rs
#	codex-rs/core/src/codex_tests.rs
#	codex-rs/core/src/state/turn.rs
This commit is contained in:
Roy Han
2026-03-22 23:32:08 -07:00
parent 7a2c92bf89 d5d70d39f7
commit 2ad79b06f0
17 changed files with 441 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/protocol/src/models.rs
+17
View File
@@ -291,6 +291,16 @@ pub enum SandboxPolicyMetadata {
FullAccess,
}
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, JsonSchema, TS)]
#[serde(rename_all = "snake_case")]
#[ts(rename_all = "snake_case")]
pub enum ApprovalSourceMetadata {
Guardian,
User,
Policy,
Unknown,
}
#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq, JsonSchema, TS)]
pub struct ResponseItemMetadata {
#[serde(default, skip_serializing_if = "Option::is_none")]
@@ -309,6 +319,9 @@ pub struct ResponseItemMetadata {
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional)]
pub review_decision: Option<ReviewDecisionMetadata>,
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional)]
pub approval_source: Option<ApprovalSourceMetadata>,
}
impl ResponseItemMetadata {
@@ -316,6 +329,7 @@ impl ResponseItemMetadata {
self.sandbox_policy.is_none()
&& self.is_tool_call_escalated.is_none()
&& self.review_decision.is_none()
&& self.approval_source.is_none()
}
pub fn merge_from(&mut self, other: Self) {
@@ -328,6 +342,9 @@ impl ResponseItemMetadata {
if other.review_decision.is_some() {
self.review_decision = other.review_decision;
}
if other.approval_source.is_some() {
self.approval_source = other.approval_source;
}
}
}