Merge remote-tracking branch 'upstream/main' into dev/codex/add-custom-models-support-in-config.toml-r2

# Conflicts:
#	codex-rs/core/src/config/schema.rs
This commit is contained in:
Friel
2026-04-02 09:44:04 +00:00
72 changed files with 2839 additions and 5233 deletions
+1 -1
View File
@@ -181,8 +181,8 @@ pub async fn run_main(
#[cfg(test)]
mod tests {
use super::*;
use codex_config::types::OtelExporterKind;
use codex_core::config::ConfigBuilder;
use codex_core::config::types::OtelExporterKind;
use pretty_assertions::assert_eq;
use std::collections::HashMap;
use tempfile::TempDir;