Merge commit '4fd857d8567b3aa55940c022abe611ce1edec332' into dev/friel/collab-stack

2026-04-29 10:53:24 +03:00 · 2026-04-01 00:03:27 +00:00
parent 6c0005ea9a 4fd857d856
commit 6f9721ada1
151 changed files with 7739 additions and 2841 deletions
--- a/codex-rs/app-server/tests/common/models_cache.rs
+++ b/codex-rs/app-server/tests/common/models_cache.rs
@@ -28,7 +28,7 @@ fn preset_to_info(preset: &ModelPreset, priority: i32) -> ModelInfo {
        },
        supported_in_api: preset.supported_in_api,
        priority,
-        upgrade: preset.upgrade.as_ref().map(|u| u.into()),
+        upgrade: preset.upgrade.as_ref().map(Into::into),
        base_instructions: "base instructions".to_string(),
        model_messages: None,
        supports_reasoning_summaries: false,