Skip to content

Commit f8f33ee

Browse files
committed
Address review comments
1 parent 7f3c0dd commit f8f33ee

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

codex-rs/app-server-protocol/src/protocol/v2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ pub struct ConfigReadResponse {
456456
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
457457
#[serde(rename_all = "camelCase")]
458458
#[ts(export_to = "v2/")]
459-
pub struct Requirements {
459+
pub struct ConfigRequirements {
460460
pub allowed_approval_policies: Option<Vec<AskForApproval>>,
461461
pub allowed_sandbox_modes: Option<Vec<SandboxMode>>,
462462
}
@@ -466,7 +466,7 @@ pub struct Requirements {
466466
#[ts(export_to = "v2/")]
467467
pub struct ConfigRequirementsReadResponse {
468468
/// Null if no requirements are configured (e.g. no requirements.toml/MDM entries).
469-
pub requirements: Option<Requirements>,
469+
pub requirements: Option<ConfigRequirements>,
470470
}
471471

472472
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]

codex-rs/app-server/src/config_api.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ use crate::error_code::INVALID_REQUEST_ERROR_CODE;
33
use codex_app_server_protocol::ConfigBatchWriteParams;
44
use codex_app_server_protocol::ConfigReadParams;
55
use codex_app_server_protocol::ConfigReadResponse;
6+
use codex_app_server_protocol::ConfigRequirements;
67
use codex_app_server_protocol::ConfigRequirementsReadResponse;
78
use codex_app_server_protocol::ConfigValueWriteParams;
89
use codex_app_server_protocol::ConfigWriteErrorCode;
910
use codex_app_server_protocol::ConfigWriteResponse;
1011
use codex_app_server_protocol::JSONRPCErrorError;
11-
use codex_app_server_protocol::Requirements;
1212
use codex_app_server_protocol::SandboxMode;
1313
use codex_core::config::ConfigService;
1414
use codex_core::config::ConfigServiceError;
@@ -70,8 +70,8 @@ impl ConfigApi {
7070
}
7171
}
7272

73-
fn map_requirements_toml_to_api(requirements: ConfigRequirementsToml) -> Requirements {
74-
Requirements {
73+
fn map_requirements_toml_to_api(requirements: ConfigRequirementsToml) -> ConfigRequirements {
74+
ConfigRequirements {
7575
allowed_approval_policies: requirements.allowed_approval_policies.map(|policies| {
7676
policies
7777
.into_iter()

codex-rs/core/src/config/service.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,7 @@ impl ConfigService {
167167
.map_err(|err| ConfigServiceError::io("failed to read configuration layers", err))?;
168168

169169
let requirements = layers.requirements_toml().clone();
170-
if requirements.allowed_approval_policies.is_none()
171-
&& requirements.allowed_sandbox_modes.is_none()
172-
{
170+
if requirements.is_empty() {
173171
Ok(None)
174172
} else {
175173
Ok(Some(requirements))

codex-rs/core/src/config_loader/config_requirements.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ impl From<SandboxMode> for SandboxModeRequirement {
5858
}
5959

6060
impl ConfigRequirementsToml {
61+
pub fn is_empty(&self) -> bool {
62+
self.allowed_approval_policies.is_none() && self.allowed_sandbox_modes.is_none()
63+
}
64+
6165
/// For every field in `other` that is `Some`, if the corresponding field in
6266
/// `self` is `None`, copy the value from `other` into `self`.
6367
pub fn merge_unset_fields(&mut self, mut other: ConfigRequirementsToml) {

0 commit comments

Comments
 (0)