Support forced workspace ids in requirements

Allow requirements.toml and cloud requirements to specify forced_chatgpt_workspace_id using the same single string or array shape as config.toml.

Prefer the requirements value during config resolution, expose it through configRequirements/read, and regenerate app-server schema fixtures.

Document requirements precedence and add targeted coverage for requirements parsing, config resolution, API mapping, and cloud requirements fixtures.
This commit is contained in:
rreichel3-oai
2026-04-15 16:54:04 -04:00
parent cad30d2689
commit 0f54c3a97b
14 changed files with 198 additions and 7 deletions
+18
View File
@@ -398,6 +398,7 @@ fn map_requirements_toml_to_api(requirements: ConfigRequirementsToml) -> ConfigR
.enforce_residency
.map(map_residency_requirement_to_api),
network: requirements.network.map(map_network_requirements_to_api),
forced_chatgpt_workspace_id: requirements.forced_chatgpt_workspace_id,
}
}
@@ -567,6 +568,12 @@ mod tests {
codex_core::config_loader::WebSearchModeRequirement::Cached,
]),
guardian_policy_config: None,
forced_chatgpt_workspace_id: Some(
codex_protocol::config_types::ForcedChatgptWorkspaceIds::Multiple(vec![
"workspace-a".to_string(),
"workspace-b".to_string(),
]),
),
feature_requirements: Some(codex_core::config_loader::FeatureRequirementsToml {
entries: std::collections::BTreeMap::from([
("apps".to_string(), false),
@@ -642,6 +649,15 @@ mod tests {
mapped.enforce_residency,
Some(codex_app_server_protocol::ResidencyRequirement::Us),
);
assert_eq!(
mapped.forced_chatgpt_workspace_id,
Some(
codex_protocol::config_types::ForcedChatgptWorkspaceIds::Multiple(vec![
"workspace-a".to_string(),
"workspace-b".to_string(),
])
),
);
assert_eq!(
mapped.network,
Some(NetworkRequirements {
@@ -676,6 +692,7 @@ mod tests {
allowed_sandbox_modes: None,
allowed_web_search_modes: None,
guardian_policy_config: None,
forced_chatgpt_workspace_id: None,
feature_requirements: None,
mcp_servers: None,
apps: None,
@@ -733,6 +750,7 @@ mod tests {
allowed_sandbox_modes: None,
allowed_web_search_modes: Some(Vec::new()),
guardian_policy_config: None,
forced_chatgpt_workspace_id: None,
feature_requirements: None,
mcp_servers: None,
apps: None,