Merge 6bda0d3096 into sapling-pr-archive-bolinfest

codex-rs/core/src/codex_wrapper.rs

@@ -15,10 +15,7 @@ use tokio::sync::Notify;
 /// Returns the wrapped [`Codex`] **and** the `SessionInitialized` event that
 /// is received as a response to the initial `ConfigureSession` submission so
 /// that callers can surface the information to the UI.
-pub async fn init_codex(
-    config: Config,
-    disable_response_storage: bool,
-) -> anyhow::Result<(CodexWrapper, Event, Arc<Notify>)> {
+pub async fn init_codex(config: Config) -> anyhow::Result<(CodexWrapper, Event, Arc<Notify>)> {
     let ctrl_c = notify_on_sigint();
     let codex = CodexWrapper::new(Codex::spawn(ctrl_c.clone())?);
     let init_id = codex
@@ -27,7 +24,7 @@ pub async fn init_codex(
             instructions: config.instructions.clone(),
             approval_policy: config.approval_policy,
             sandbox_policy: config.sandbox_policy,
-            disable_response_storage,
+            disable_response_storage: config.disable_response_storage,
         })
         .await?;
 

codex-rs/core/src/config.rs

@@ -21,6 +21,12 @@ pub struct Config {
     pub approval_policy: AskForApproval,
     #[serde(default)]
     pub sandbox_policy: SandboxPolicy,
+
+    /// Disable server-side response storage (sends the full conversation
+    /// context with every request). Currently necessary for OpenAI customers
+    /// who have opted into Zero Data Retention (ZDR).
+    pub disable_response_storage: bool,
+
     /// System instructions.
     pub instructions: Option<String>,
 }
@@ -31,6 +37,7 @@ pub struct ConfigOverrides {
     pub model: Option<String>,
     pub approval_policy: Option<AskForApproval>,
     pub sandbox_policy: Option<SandboxPolicy>,
+    pub disable_response_storage: Option<bool>,
 }
 
 impl Config {
@@ -50,6 +57,7 @@ impl Config {
             model,
             approval_policy,
             sandbox_policy,
+            disable_response_storage,
         } = overrides;
 
         if let Some(model) = model {
@@ -61,6 +69,9 @@ impl Config {
         if let Some(sandbox_policy) = sandbox_policy {
             cfg.sandbox_policy = sandbox_policy;
         }
+        if let Some(disable_response_storage) = disable_response_storage {
+            cfg.disable_response_storage = disable_response_storage;
+        }
         Ok(cfg)
     }