From be227df76eaa07dd1753ba61a562097425b3a387 Mon Sep 17 00:00:00 2001
From: Eric Traut <etraut@openai.com>
Date: Sun, 12 Apr 2026 10:32:23 -0700
Subject: [PATCH] Restore best-effort archive delivery cleanup

---
 .../app-server/src/codex_message_processor.rs | 36 ++++++-------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/codex-rs/app-server/src/codex_message_processor.rs b/codex-rs/app-server/src/codex_message_processor.rs
index 5aff5de8f7..26e9031e7c 100644
--- a/codex-rs/app-server/src/codex_message_processor.rs
+++ b/codex-rs/app-server/src/codex_message_processor.rs
@@ -5696,46 +5696,32 @@ impl CodexMessageProcessor {
         }
 
         // Move the rollout file to archived.
-        let result: Result<(), JSONRPCErrorError> = async move {
+        let result: std::io::Result<()> = async move {
             let archive_folder = self
                 .config
                 .codex_home
                 .join(codex_core::ARCHIVED_SESSIONS_SUBDIR);
-            tokio::fs::create_dir_all(&archive_folder)
-                .await
-                .map_err(|err| JSONRPCErrorError {
-                    code: INTERNAL_ERROR_CODE,
-                    message: format!("failed to archive thread: {err}"),
-                    data: None,
-                })?;
+            tokio::fs::create_dir_all(&archive_folder).await?;
             let archived_path = archive_folder.join(&file_name);
-            tokio::fs::rename(&canonical_rollout_path, &archived_path)
-                .await
-                .map_err(|err| JSONRPCErrorError {
-                    code: INTERNAL_ERROR_CODE,
-                    message: format!("failed to archive thread: {err}"),
-                    data: None,
-                })?;
+            tokio::fs::rename(&canonical_rollout_path, &archived_path).await?;
             if let Some(ctx) = state_db_ctx {
                 let _ = ctx
                     .mark_archived(thread_id, archived_path.as_path(), Utc::now())
                     .await;
                 let thread_id_str = thread_id.to_string();
-                ctx.delete_thread_delivery_state(&thread_id_str)
-                    .await
-                    .map_err(|err| JSONRPCErrorError {
-                        code: INTERNAL_ERROR_CODE,
-                        message: format!(
-                            "failed to archive thread: failed to delete delivery state for archived thread {thread_id}: {err}"
-                        ),
-                        data: None,
-                    })?;
+                if let Err(err) = ctx.delete_thread_delivery_state(&thread_id_str).await {
+                    warn!("failed to delete delivery state for archived thread {thread_id}: {err}");
+                }
             }
             Ok(())
         }
         .await;
 
-        result
+        result.map_err(|err| JSONRPCErrorError {
+            code: INTERNAL_ERROR_CODE,
+            message: format!("failed to archive thread: {err}"),
+            data: None,
+        })
     }
 
     async fn apps_list(&self, request_id: ConnectionRequestId, params: AppsListParams) {