Merge branch 'main' into dev/pbakkum/codex-realtimeapi-port

This commit is contained in:
Peter Bakkum
2026-03-11 04:56:07 -07:00
165 changed files with 15216 additions and 5369 deletions
+39 -1
View File
@@ -645,6 +645,9 @@ pub struct RejectConfig {
pub sandbox_approval: bool,
/// Reject prompts triggered by execpolicy `prompt` rules.
pub rules: bool,
/// Reject approval prompts triggered by skill script execution.
#[serde(default)]
pub skill_approval: bool,
/// Reject approval prompts related to built-in permission requests.
#[serde(default)]
pub request_permissions: bool,
@@ -661,6 +664,10 @@ impl RejectConfig {
self.rules
}
pub const fn rejects_skill_approval(self) -> bool {
self.skill_approval
}
pub const fn rejects_request_permissions(self) -> bool {
self.request_permissions
}
@@ -3237,6 +3244,8 @@ pub struct CollabAgentSpawnBeginEvent {
/// Initial prompt sent to the agent. Can be empty to prevent CoT leaking at the
/// beginning.
pub prompt: String,
pub model: String,
pub reasoning_effort: ReasoningEffortConfig,
}
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, JsonSchema, TS)]
@@ -3569,6 +3578,7 @@ mod tests {
RejectConfig {
sandbox_approval: false,
rules: false,
skill_approval: false,
request_permissions: false,
mcp_elicitations: true,
}
@@ -3578,6 +3588,7 @@ mod tests {
!RejectConfig {
sandbox_approval: false,
rules: false,
skill_approval: false,
request_permissions: false,
mcp_elicitations: false,
}
@@ -3585,12 +3596,37 @@ mod tests {
);
}
#[test]
fn reject_config_skill_approval_flag_is_field_driven() {
assert!(
RejectConfig {
sandbox_approval: false,
rules: false,
skill_approval: true,
request_permissions: false,
mcp_elicitations: false,
}
.rejects_skill_approval()
);
assert!(
!RejectConfig {
sandbox_approval: false,
rules: false,
skill_approval: false,
request_permissions: false,
mcp_elicitations: false,
}
.rejects_skill_approval()
);
}
#[test]
fn reject_config_request_permissions_flag_is_field_driven() {
assert!(
RejectConfig {
sandbox_approval: false,
rules: false,
skill_approval: false,
request_permissions: true,
mcp_elicitations: false,
}
@@ -3600,6 +3636,7 @@ mod tests {
!RejectConfig {
sandbox_approval: false,
rules: false,
skill_approval: false,
request_permissions: false,
mcp_elicitations: false,
}
@@ -3608,7 +3645,7 @@ mod tests {
}
#[test]
fn reject_config_defaults_missing_request_permissions_to_false() {
fn reject_config_defaults_missing_optional_flags_to_false() {
let decoded = serde_json::from_value::<RejectConfig>(serde_json::json!({
"sandbox_approval": true,
"rules": false,
@@ -3621,6 +3658,7 @@ mod tests {
RejectConfig {
sandbox_approval: true,
rules: false,
skill_approval: false,
request_permissions: false,
mcp_elicitations: true,
}