Expose Daybreak availability in model discovery (#62499)

## Why

Clients need to distinguish a caller who must enroll in Daybreak from a
model that does not support it. The list of accepted access programs
alone cannot express that distinction.

## What changed

Carry the server-resolved status for each caller and model from the
model catalog into `model/list` as `availableAccessPrograms.daybreakAvailability`.
Update the JSON schemas, TypeScript bindings, and Python SDK to expose
the field.

Rust decoders use `default` for missing or unrecognized statuses. The
Python SDK also defaults missing statuses and preserves new strings
from newer hosts.

## Testing

Cover catalog decoding, app-server response serialization, and Python
SDK round trips with known, missing, and future status values.

GitOrigin-RevId: c1e5ddef68fd19b25e583bb6996a93fd78ab9d18
This commit is contained in:
igorrybalka-oai
2026-11-19 12:28:34 +00:00
committed by copyberry
parent b0ecad9cf9
commit 1826d80eca
31 changed files with 393 additions and 39 deletions
@@ -11531,6 +11531,16 @@
],
"type": "string"
},
"DaybreakAvailability": {
"description": "Server-resolved Daybreak availability for this caller and model.",
"enum": [
"available",
"enrollmentRequired",
"unavailableForModel",
"default"
],
"type": "string"
},
"DeprecationNoticeNotification": {
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
@@ -16783,7 +16793,7 @@
"type": "object"
},
"ModelAccessPrograms": {
"description": "Caller-specific explicit access programs advertised by model discovery.",
"description": "Caller-specific access programs and Daybreak availability from model discovery.",
"properties": {
"cyber": {
"description": "Accepted explicit selections.",
@@ -16791,6 +16801,15 @@
"$ref": "#/definitions/v2/CyberAccessProgram"
},
"type": "array"
},
"daybreakAvailability": {
"allOf": [
{
"$ref": "#/definitions/v2/DaybreakAvailability"
}
],
"default": "default",
"description": "Server-resolved Daybreak availability for this caller and model."
}
},
"required": [
@@ -7285,6 +7285,16 @@
],
"type": "string"
},
"DaybreakAvailability": {
"description": "Server-resolved Daybreak availability for this caller and model.",
"enum": [
"available",
"enrollmentRequired",
"unavailableForModel",
"default"
],
"type": "string"
},
"DeprecationNoticeNotification": {
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
@@ -12717,7 +12727,7 @@
"type": "object"
},
"ModelAccessPrograms": {
"description": "Caller-specific explicit access programs advertised by model discovery.",
"description": "Caller-specific access programs and Daybreak availability from model discovery.",
"properties": {
"cyber": {
"description": "Accepted explicit selections.",
@@ -12725,6 +12735,15 @@
"$ref": "#/definitions/CyberAccessProgram"
},
"type": "array"
},
"daybreakAvailability": {
"allOf": [
{
"$ref": "#/definitions/DaybreakAvailability"
}
],
"default": "default",
"description": "Server-resolved Daybreak availability for this caller and model."
}
},
"required": [
@@ -10,6 +10,16 @@
],
"type": "string"
},
"DaybreakAvailability": {
"description": "Server-resolved Daybreak availability for this caller and model.",
"enum": [
"available",
"enrollmentRequired",
"unavailableForModel",
"default"
],
"type": "string"
},
"InputModality": {
"description": "Canonical user-input modality tags advertised by a model.",
"oneOf": [
@@ -173,7 +183,7 @@
"type": "object"
},
"ModelAccessPrograms": {
"description": "Caller-specific explicit access programs advertised by model discovery.",
"description": "Caller-specific access programs and Daybreak availability from model discovery.",
"properties": {
"cyber": {
"description": "Accepted explicit selections.",
@@ -181,6 +191,15 @@
"$ref": "#/definitions/CyberAccessProgram"
},
"type": "array"
},
"daybreakAvailability": {
"allOf": [
{
"$ref": "#/definitions/DaybreakAvailability"
}
],
"default": "default",
"description": "Server-resolved Daybreak availability for this caller and model."
}
},
"required": [
@@ -0,0 +1,8 @@
// GENERATED CODE! DO NOT MODIFY BY HAND!
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
/**
* Server-resolved Daybreak availability for this caller and model.
*/
export type DaybreakAvailability = "available" | "enrollmentRequired" | "unavailableForModel" | "default";
@@ -2,12 +2,17 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { CyberAccessProgram } from "./CyberAccessProgram";
import type { DaybreakAvailability } from "./DaybreakAvailability";
/**
* Caller-specific explicit access programs advertised by model discovery.
* Caller-specific access programs and Daybreak availability from model discovery.
*/
export type ModelAccessPrograms = {
/**
* Accepted explicit selections.
*/
cyber: Array<CyberAccessProgram>, };
cyber: Array<CyberAccessProgram>,
/**
* Server-resolved Daybreak availability for this caller and model.
*/
daybreakAvailability: DaybreakAvailability, };
@@ -136,6 +136,7 @@ export type { ContextCompactedNotification } from "./ContextCompactedNotificatio
export type { CreditsSnapshot } from "./CreditsSnapshot";
export type { CustomGatewaySettingsParams } from "./CustomGatewaySettingsParams";
export type { CyberAccessProgram } from "./CyberAccessProgram";
export type { DaybreakAvailability } from "./DaybreakAvailability";
export type { DeprecationNoticeNotification } from "./DeprecationNoticeNotification";
export type { DesktopOnboardingEntrypoint } from "./DesktopOnboardingEntrypoint";
export type { DynamicToolCallOutputContentItem } from "./DynamicToolCallOutputContentItem";
@@ -2,6 +2,7 @@ use super::shared::v2_enum_from_core;
use super::turn::CyberAccessProgram;
use crate::JsonSchema;
use crate::TS;
use codex_protocol::openai_models::DaybreakAvailability as CoreDaybreakAvailability;
use codex_protocol::openai_models::InputModality;
use codex_protocol::openai_models::ModelAccessPrograms as CoreModelAccessPrograms;
use codex_protocol::openai_models::ModelAvailabilityNux as CoreModelAvailabilityNux;
@@ -90,19 +91,37 @@ pub struct ModelServiceTier {
pub description: String,
}
/// Caller-specific explicit access programs advertised by model discovery.
v2_enum_from_core!(
/// Server-resolved Daybreak availability for this caller and model.
#[derive(Default)]
#[ts(rename_all = "camelCase")]
pub enum DaybreakAvailability from CoreDaybreakAvailability {
Available,
EnrollmentRequired,
UnavailableForModel,
#[default]
#[serde(other)]
Default
}
);
/// Caller-specific access programs and Daybreak availability from model discovery.
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
#[serde(rename_all = "camelCase")]
#[ts(export_to = "v2/")]
pub struct ModelAccessPrograms {
/// Accepted explicit selections.
pub cyber: Vec<CyberAccessProgram>,
/// Server-resolved Daybreak availability for this caller and model.
#[serde(default)]
pub daybreak_availability: DaybreakAvailability,
}
impl From<CoreModelAccessPrograms> for ModelAccessPrograms {
fn from(value: CoreModelAccessPrograms) -> Self {
Self {
cyber: value.cyber.into_iter().map(Into::into).collect(),
daybreak_availability: value.daybreak_availability.into(),
}
}
}
@@ -111,6 +130,7 @@ impl From<ModelAccessPrograms> for CoreModelAccessPrograms {
fn from(value: ModelAccessPrograms) -> Self {
Self {
cyber: value.cyber.into_iter().map(Into::into).collect(),
daybreak_availability: value.daybreak_availability.to_core(),
}
}
}
@@ -5362,6 +5362,76 @@ fn turn_start_params_preserve_explicit_null_service_tier() {
assert_eq!(serialized_without_override.get("serviceTier"), None);
}
#[test]
fn model_access_programs_preserve_availability_across_wire_formats() {
use codex_protocol::openai_models::ModelAccessPrograms as CoreModelAccessPrograms;
for (core_availability, app_server_availability, normalized_availability) in [
(json!("available"), json!("available"), json!("available")),
(
json!("enrollment_required"),
json!("enrollmentRequired"),
json!("enrollmentRequired"),
),
(
json!("unavailable_for_model"),
json!("unavailableForModel"),
json!("unavailableForModel"),
),
(json!("default"), json!("default"), json!("default")),
(
json!("future_status"),
json!("futureStatus"),
json!("default"),
),
] {
let core: CoreModelAccessPrograms = serde_json::from_value(json!({
"cyber": ["standard", "daybreak_blue", "daybreak_red"],
"daybreak_availability": core_availability,
}))
.expect("catalog availability should deserialize");
let app_server: ModelAccessPrograms = serde_json::from_value(json!({
"cyber": ["standard", "daybreakBlue", "daybreakRed"],
"daybreakAvailability": app_server_availability,
}))
.expect("app-server availability should deserialize");
assert_eq!(ModelAccessPrograms::from(core.clone()), app_server);
assert_eq!(CoreModelAccessPrograms::from(app_server.clone()), core);
assert_eq!(
serde_json::to_value(app_server).expect("model access programs should serialize"),
json!({
"cyber": ["standard", "daybreakBlue", "daybreakRed"],
"daybreakAvailability": normalized_availability,
}),
);
}
let legacy_core: CoreModelAccessPrograms = serde_json::from_value(json!({
"cyber": ["standard", "daybreak_blue"],
}))
.expect("old catalog metadata should deserialize");
let legacy_app_server: ModelAccessPrograms = serde_json::from_value(json!({
"cyber": ["standard", "daybreakBlue"],
}))
.expect("old app-server metadata should deserialize");
assert_eq!(
ModelAccessPrograms::from(legacy_core.clone()),
legacy_app_server,
);
assert_eq!(
CoreModelAccessPrograms::from(legacy_app_server.clone()),
legacy_core
);
assert_eq!(
serde_json::to_value(legacy_app_server).expect("legacy programs should serialize"),
json!({
"cyber": ["standard", "daybreakBlue"],
"daybreakAvailability": "default",
}),
);
}
#[test]
fn turn_start_cyber_access_program_uses_separate_wire_formats() {
for (app_server_value, core_value) in [
@@ -329,9 +329,30 @@ async fn list_models_uses_remote_catalog_as_source_of_truth(
let remote_models = [
(
json!("2030-01-01T00:00:00Z"),
json!({ "cyber": ["standard", "daybreak_blue"] }),
json!({
"cyber": ["standard", "daybreak_blue"],
"daybreak_availability": "available",
}),
),
(
json!(null),
json!({
"cyber": ["daybreak_red"],
"daybreak_availability": "available",
}),
),
(
json!(null),
json!({ "cyber": [], "daybreak_availability": "unavailable_for_model" }),
),
(
json!(null),
json!({ "cyber": ["standard"], "daybreak_availability": "future_status" }),
),
(
json!(null),
json!({ "cyber": ["standard"], "daybreak_availability": "enrollment_required" }),
),
(json!(null), json!({ "cyber": ["daybreak_red"] })),
(json!(null), json!({ "cyber": [] })),
(json!(null), json!(null)),
]
@@ -454,9 +475,18 @@ model_catalog_url = "{server_uri}/v1/models"
.map(|model| model["availableAccessPrograms"].clone())
.collect::<Vec<_>>(),
vec![
json!({ "cyber": ["standard", "daybreakBlue"] }),
json!({ "cyber": ["daybreakRed"] }),
json!({ "cyber": [] }),
json!({
"cyber": ["standard", "daybreakBlue"],
"daybreakAvailability": "available",
}),
json!({
"cyber": ["daybreakRed"],
"daybreakAvailability": "available",
}),
json!({ "cyber": [], "daybreakAvailability": "unavailableForModel" }),
json!({ "cyber": ["standard"], "daybreakAvailability": "default" }),
json!({ "cyber": ["standard"], "daybreakAvailability": "enrollmentRequired" }),
json!({ "cyber": [], "daybreakAvailability": "default" }),
json!(null),
]
);
@@ -151,7 +151,10 @@ mod tests {
model.available_access_programs = None;
assert_eq!(select_program(&model, SavedDaybreakChoice::Off), Ok(None));
for cyber in [vec![], vec![CyberAccessProgram::DaybreakRed]] {
model.available_access_programs = Some(ModelAccessPrograms { cyber });
model.available_access_programs = Some(ModelAccessPrograms {
cyber,
daybreak_availability: Default::default(),
});
assert_eq!(select_program(&model, SavedDaybreakChoice::Unset), Ok(None));
assert!(
select_program(&model, SavedDaybreakChoice::Off)
@@ -154,6 +154,7 @@ async fn paused_helpers(
model.available_access_programs =
Some(codex_protocol::openai_models::ModelAccessPrograms {
cyber: programs.clone(),
daybreak_availability: Default::default(),
});
}
}
@@ -682,6 +682,7 @@ async fn saved_daybreak_rejection_records_child_input(
},
|program| vec![program],
),
daybreak_availability: Default::default(),
});
model.use_responses_lite = false;
})
@@ -858,6 +859,7 @@ async fn saved_daybreak_uses_existing_websocket_requests() -> Result<()> {
CyberAccessProgram::DaybreakBlue,
CyberAccessProgram::Standard,
],
daybreak_availability: Default::default(),
});
model.use_responses_lite = false;
})
@@ -1048,6 +1050,7 @@ async fn saved_daybreak_follows_the_child_model_and_automatic_compaction(
.with_model_info_override(parent_model, move |model| {
model.available_access_programs = Some(ModelAccessPrograms {
cyber: vec![parent_daybreak, CyberAccessProgram::Standard],
daybreak_availability: Default::default(),
});
model.comp_hash = Some("parent-window".to_owned());
model.multi_agent_version = Some(version);
@@ -1063,6 +1066,7 @@ async fn saved_daybreak_follows_the_child_model_and_automatic_compaction(
} else {
vec![child_program]
},
daybreak_availability: Default::default(),
});
model.comp_hash = Some("child-window".to_owned());
model.multi_agent_version = Some(version);
+8 -5
View File
@@ -17,6 +17,7 @@ use codex_login::ExternalAuthRefreshContext;
use codex_login::TokenData;
use codex_protocol::auth::AuthMode;
use codex_protocol::error::CodexErr;
use codex_protocol::openai_models::DaybreakAvailability;
use codex_protocol::openai_models::ModelAccessPrograms;
use codex_protocol::openai_models::ModelOrigin;
use codex_protocol::openai_models::ModelsResponse;
@@ -373,10 +374,8 @@ async fn file_cache_implements_models_cache_contract() {
client_version: Some(client_version.clone()),
models: vec![ModelInfo {
available_access_programs: Some(ModelAccessPrograms {
cyber: vec![
CyberAccessProgram::Standard,
CyberAccessProgram::DaybreakBlue,
],
daybreak_availability: DaybreakAvailability::EnrollmentRequired,
cyber: vec![CyberAccessProgram::Standard],
}),
..remote_model("file-cached", "File Cached", /*priority*/ 0)
}],
@@ -1417,6 +1416,7 @@ async fn online_refresh_updates_access_programs_with_unchanged_etag() {
let codex_home = tempdir().expect("temp dir");
let granted_model = ModelInfo {
available_access_programs: Some(ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![
CyberAccessProgram::Standard,
CyberAccessProgram::DaybreakBlue,
@@ -1425,7 +1425,10 @@ async fn online_refresh_updates_access_programs_with_unchanged_etag() {
..remote_model("access-programs", "Access Programs", /*priority*/ 0)
};
let revoked_model = ModelInfo {
available_access_programs: Some(ModelAccessPrograms { cyber: Vec::new() }),
available_access_programs: Some(ModelAccessPrograms {
cyber: Vec::new(),
daybreak_availability: Default::default(),
}),
..granted_model.clone()
};
let responses = vec![vec![granted_model.clone()], vec![revoked_model.clone()]];
+46 -2
View File
@@ -58,6 +58,7 @@ mod guardian_v2;
#[path = "openai_models/reasoning_effort.rs"]
mod reasoning_effort;
pub use access_programs::DaybreakAvailability;
pub use access_programs::ModelAccessPrograms;
pub use access_programs::SavedDaybreakChoice;
pub use guardian_v2::AsyncClassifierMode;
@@ -2229,13 +2230,17 @@ mod tests {
(Some(serde_json::Value::Null), None),
(
Some(serde_json::json!({ "cyber": [] })),
Some(ModelAccessPrograms { cyber: vec![] }),
Some(ModelAccessPrograms {
cyber: vec![],
daybreak_availability: Default::default(),
}),
),
(
Some(serde_json::json!({
"cyber": ["standard", "daybreak_blue", "future_program", "daybreak_red"]
})),
Some(ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![
CyberAccessProgram::Standard,
CyberAccessProgram::DaybreakBlue,
@@ -2243,7 +2248,46 @@ mod tests {
],
}),
),
] {
]
.into_iter()
.chain(
[
(
serde_json::json!("available"),
DaybreakAvailability::Available,
),
(
serde_json::json!("enrollment_required"),
DaybreakAvailability::EnrollmentRequired,
),
(
serde_json::json!("unavailable_for_model"),
DaybreakAvailability::UnavailableForModel,
),
(serde_json::json!("default"), DaybreakAvailability::Default),
(
serde_json::json!("future_status"),
DaybreakAvailability::Default,
),
]
.into_iter()
.map(|(availability, expected_availability)| {
(
Some(serde_json::json!({
"cyber": ["standard", "daybreak_blue", "future_program", "daybreak_red"],
"daybreak_availability": availability,
})),
Some(ModelAccessPrograms {
cyber: vec![
CyberAccessProgram::Standard,
CyberAccessProgram::DaybreakBlue,
CyberAccessProgram::DaybreakRed,
],
daybreak_availability: expected_availability,
}),
)
}),
) {
let mut value = serde_json::to_value(test_model(/*spec*/ None)).unwrap();
if let Some(metadata) = metadata {
value["available_access_programs"] = metadata;
@@ -1,4 +1,4 @@
//! Caller-specific explicit access programs advertised by the model catalog.
//! Caller-specific access programs and Daybreak availability from the model catalog.
//!
//! Discovery metadata does not grant access; inference still enforces authorization.
@@ -15,6 +15,21 @@ pub struct ModelAccessPrograms {
/// Accepted explicit selections. An empty list is distinct from missing metadata.
#[serde(deserialize_with = "deserialize_known_cyber_access_programs")]
pub cyber: Vec<CyberAccessProgram>,
/// Server-resolved Daybreak availability for this caller and model.
#[serde(default)]
pub daybreak_availability: DaybreakAvailability,
}
/// Server-resolved Daybreak availability for this caller and model.
#[derive(Debug, Default, Serialize, Deserialize, Clone, Copy, PartialEq, Eq, TS, JsonSchema)]
#[serde(rename_all = "snake_case")]
pub enum DaybreakAvailability {
Available,
EnrollmentRequired,
UnavailableForModel,
#[default]
#[serde(other)]
Default,
}
/// Saved preference to resolve against the selected model's advertised programs.
@@ -1,5 +1,6 @@
#![cfg(test)]
use super::DaybreakAvailability;
use super::ModelAccessPrograms;
use super::SavedDaybreakChoice;
use crate::turn_input::CyberAccessProgram;
@@ -18,22 +19,32 @@ fn selects_only_advertised_programs_with_blue_preferred() {
(vec![Standard], None, Some(Standard)),
(vec![], None, None),
] {
let programs = ModelAccessPrograms { cyber };
assert_eq!(
(
programs.daybreak(),
programs.standard(),
programs.select_saved(SavedDaybreakChoice::from(Some(true))),
programs.select_saved(SavedDaybreakChoice::from(Some(false))),
programs.select_saved(SavedDaybreakChoice::from(/* enabled */ None)),
),
(
expected_daybreak,
expected_standard,
expected_daybreak,
expected_standard,
None,
)
);
for availability in [
DaybreakAvailability::Available,
DaybreakAvailability::EnrollmentRequired,
DaybreakAvailability::UnavailableForModel,
DaybreakAvailability::Default,
] {
let programs = ModelAccessPrograms {
cyber: cyber.clone(),
daybreak_availability: availability,
};
assert_eq!(
(
programs.daybreak(),
programs.standard(),
programs.select_saved(SavedDaybreakChoice::from(Some(true))),
programs.select_saved(SavedDaybreakChoice::from(Some(false))),
programs.select_saved(SavedDaybreakChoice::from(/* enabled */ None)),
),
(
expected_daybreak,
expected_standard,
expected_daybreak,
expected_standard,
None,
)
);
}
}
}
+1
View File
@@ -7566,6 +7566,7 @@ async fn inactive_thread_started_notification_initializes_replay_session() -> Re
let mut model = crate::test_support::TEST_MODEL_PRESETS[0].clone();
model.model = "gpt-agent".into();
model.available_access_programs = Some(codex_protocol::openai_models::ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![codex_protocol::turn_input::CyberAccessProgram::DaybreakBlue],
});
crate::chatwidget::tests::helpers::set_test_model_catalog(&mut app.chat_widget, vec![model]);
@@ -107,6 +107,7 @@ async fn misalignment_continuation_requires_current_review_and_submits_once() ->
let mut model = crate::test_support::TEST_MODEL_PRESETS[0].clone();
model.model = app.chat_widget.current_model().to_string();
model.available_access_programs = Some(ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![
CyberAccessProgram::Standard,
CyberAccessProgram::DaybreakBlue,
@@ -135,6 +135,7 @@ async fn model_picker_refresh_updates_app_catalog_from_app_server() -> Result<()
.then(|| ServiceTier::Fast.request_value().to_string());
model.available_access_programs =
Some(codex_protocol::openai_models::ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![codex_protocol::turn_input::CyberAccessProgram::Standard],
});
}
@@ -804,6 +804,7 @@ async fn run_safety_retry(
model.tool_mode = Some(ToolMode::Direct);
if scenario == SafetyRetryScenario::UnsupportedPermissions && model.slug == FASTER_MODEL {
model.available_access_programs = Some(ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![CyberAccessProgram::Standard],
});
}
@@ -1142,6 +1142,7 @@ async fn daybreak_command_persists_and_confirms_each_selection() -> Result<()> {
let mut model = crate::test_support::TEST_MODEL_PRESETS[0].clone();
model.model = app.chat_widget.current_model().to_string();
model.available_access_programs = Some(ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![
CyberAccessProgram::Standard,
CyberAccessProgram::DaybreakBlue,
@@ -1150,6 +1151,7 @@ async fn daybreak_command_persists_and_confirms_each_selection() -> Result<()> {
let mut unsupported_model = model.clone();
unsupported_model.model = "standard-only".into();
unsupported_model.available_access_programs = Some(ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![CyberAccessProgram::Standard],
});
app.chat_widget
@@ -1245,7 +1247,10 @@ async fn daybreak_command_persists_and_confirms_each_selection() -> Result<()> {
] {
models.push(ModelPreset {
model: name.into(),
available_access_programs: Some(ModelAccessPrograms { cyber }),
available_access_programs: Some(ModelAccessPrograms {
cyber,
daybreak_availability: Default::default(),
}),
..models[0].clone()
});
}
@@ -3522,6 +3527,7 @@ async fn check_dynamic_tool_requests(
for model in &mut catalog.models {
model.available_access_programs =
Some(codex_protocol::openai_models::ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![codex_protocol::turn_input::CyberAccessProgram::DaybreakBlue],
});
}
+1
View File
@@ -3470,6 +3470,7 @@ mod tests {
let mut catalog = codex_models_manager::bundled_models_response()?;
for model in &mut catalog.models {
model.available_access_programs = Some(ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![
CyberAccessProgram::Standard,
CyberAccessProgram::DaybreakBlue,
@@ -50,6 +50,7 @@ async fn resumed_initial_messages_render_history() {
chat.status_account_display = Some(StatusAccountDisplay::ApiKey);
let mut model = crate::test_support::TEST_MODEL_PRESETS[0].clone();
model.available_access_programs = Some(codex_protocol::openai_models::ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![codex_protocol::turn_input::CyberAccessProgram::Standard],
});
chat.model_catalog = Arc::new(ModelCatalog::new(vec![model]));
@@ -2276,6 +2276,7 @@ async fn assert_daybreak_catalog_and_account_gates(provider_id: &str) {
chat.config.model_provider_id = provider_id.into();
let mut model = crate::test_support::TEST_MODEL_PRESETS[0].clone();
model.available_access_programs = Some(codex_protocol::openai_models::ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![codex_protocol::turn_input::CyberAccessProgram::Standard],
});
chat.model_catalog = std::sync::Arc::new(ModelCatalog::new(vec![model.clone()]));
@@ -154,6 +154,7 @@ async fn daybreak_refusal_offers_enable_for_the_next_turn() {
let mut model = crate::test_support::TEST_MODEL_PRESETS[0].clone();
model.model = "gpt-5.6-sol".into();
model.available_access_programs = Some(codex_protocol::openai_models::ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![codex_protocol::turn_input::CyberAccessProgram::DaybreakBlue],
});
chat.model_catalog = std::sync::Arc::new(ModelCatalog::new(vec![model]));
@@ -258,6 +259,7 @@ async fn daybreak_refusal_offers_enable_for_the_next_turn() {
let mut daybreak = crate::test_support::TEST_MODEL_PRESETS[0].clone();
daybreak.model = "gpt-5.6-sol".into();
daybreak.available_access_programs = Some(codex_protocol::openai_models::ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![codex_protocol::turn_input::CyberAccessProgram::DaybreakBlue],
});
chat.model_catalog = std::sync::Arc::new(ModelCatalog::new(vec![daybreak.clone()]));
@@ -305,6 +307,7 @@ async fn daybreak_refusal_offers_enable_for_the_next_turn() {
let mut astra = crate::test_support::TEST_MODEL_PRESETS[0].clone();
astra.model = "gpt-6-astra".into();
astra.available_access_programs = Some(codex_protocol::openai_models::ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![codex_protocol::turn_input::CyberAccessProgram::Standard],
});
chat.model_catalog = std::sync::Arc::new(ModelCatalog::new(vec![astra]));
+6 -1
View File
@@ -6,6 +6,7 @@ use pretty_assertions::assert_eq;
fn turn_program_uses_catalog_and_preserves_legacy_models() {
let mut model = crate::test_support::TEST_MODEL_PRESETS[0].clone();
model.available_access_programs = Some(ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![
CyberAccessProgram::Standard,
CyberAccessProgram::DaybreakBlue,
@@ -45,7 +46,10 @@ fn turn_program_uses_catalog_and_preserves_legacy_models() {
(Some(vec![]), false),
(Some(vec![CyberAccessProgram::Standard]), true),
] {
model.available_access_programs = programs.map(|cyber| ModelAccessPrograms { cyber });
model.available_access_programs = programs.map(|cyber| ModelAccessPrograms {
cyber,
daybreak_availability: Default::default(),
});
let result = program_for_turn(
std::slice::from_ref(&model),
&model.model,
@@ -64,6 +68,7 @@ fn turn_program_uses_catalog_and_preserves_legacy_models() {
fn refusal_guidance_uses_the_model_catalog() {
let mut model = crate::test_support::TEST_MODEL_PRESETS[0].clone();
model.available_access_programs = Some(ModelAccessPrograms {
daybreak_availability: Default::default(),
cyber: vec![CyberAccessProgram::Standard],
});
for (name, expected) in [
@@ -608,6 +608,7 @@ def generate_v2_all(schema_dir: Path, *, format_output: bool = True) -> None:
_preserve_inline_media_class_names(out_path)
_add_legacy_image_generation_thread_item_alias(out_path)
_preserve_open_enum(out_path, "CodexErrorInfoValue", allow_empty=True)
_preserve_open_enum(out_path, "DaybreakAvailability")
_preserve_reasoning_effort_enum(out_path)
_preserve_thread_source_enum(out_path)
_preserve_open_enum(out_path, "PlanType")
@@ -1214,6 +1214,22 @@ class CyberAccessProgram(Enum):
daybreak_red = "daybreakRed"
class DaybreakAvailability(str, Enum):
available = "available"
enrollment_required = "enrollmentRequired"
unavailable_for_model = "unavailableForModel"
default = "default"
@classmethod
def _missing_(cls, value: object) -> DaybreakAvailability | None:
if not isinstance(value, str) or not value:
return None
member = str.__new__(cls, value)
member._name_ = value
member._value_ = value
return member
class DeprecationNoticeNotification(BaseModel):
model_config = ConfigDict(
populate_by_name=True,
@@ -2936,6 +2952,13 @@ class ModelAccessPrograms(BaseModel):
populate_by_name=True,
)
cyber: Annotated[list[CyberAccessProgram], Field(description="Accepted explicit selections.")]
daybreak_availability: Annotated[
DaybreakAvailability | None,
Field(
alias="daybreakAvailability",
description="Server-resolved Daybreak availability for this caller and model.",
),
] = "default"
class ModelAvailabilityNux(BaseModel):
@@ -328,6 +328,43 @@ def test_generated_v2_bundle_has_single_shared_plan_type_definition() -> None:
assert source.count("class PlanType(") == 1
@pytest.mark.parametrize(
"availability",
[None, "available", "enrollmentRequired", "unavailableForModel", "default", "futureStatus"],
)
def test_model_list_preserves_daybreak_availability_from_older_and_newer_hosts(
monkeypatch: pytest.MonkeyPatch, availability: str | None
) -> None:
access_programs: JsonObject = {"cyber": ["standard", "daybreakBlue", "daybreakRed"]}
if availability is not None:
access_programs["daybreakAvailability"] = availability
wire = {
"data": [
{
"id": "model-id",
"model": "model-id",
"displayName": "Model",
"description": "A caller-visible model",
"hidden": False,
"isDefault": False,
"defaultReasoningEffort": "medium",
"supportedReasoningEfforts": [],
"availableAccessPrograms": access_programs,
}
],
"nextCursor": None,
}
client = CodexClient()
monkeypatch.setattr(client, "_request_raw", lambda _method, _params: wire)
response = client.model_list()
assert response.model_dump(mode="json", by_alias=True, exclude_unset=True) == wire
programs = response.data[0].available_access_programs
assert programs is not None
assert programs.daybreak_availability == (availability or "default")
def test_plan_type_accepts_business_prolite_from_newer_runtime() -> None:
"""New runtime plan values should remain typed when using a codex_bin override."""
plan_type = "self_serve_business_prolite"