Lightweight coding agent that runs in your terminal
Rust
Retry Windows daemon release publication on transient file locks (#50782)
Eric Trautd0759639f20a
diff --git a/codex-rs/app-server-daemon/src/prepare_install.rs b/codex-rs/app-server-daemon/src/prepare_install.rsindex 88425718b6..3b09a604db 100644--- a/codex-rs/app-server-daemon/src/prepare_install.rs+++ b/codex-rs/app-server-daemon/src/prepare_install.rs@@ -264,6 +264,9 @@ async fn prepare_from_package(if !stage.path().join("codex").exists() {std::os::unix::fs::symlink("bin/codex", stage.path().join("codex"))?;}+ #[cfg(windows)]+ windows::publish_release(stage.path(), &release).await?;+ #[cfg(not(windows))]std::fs::rename(stage.path(), &release)?;}let standalone = home.join("packages/standalone");diff --git a/codex-rs/app-server-daemon/src/prepare_install_windows.rs b/codex-rs/app-server-daemon/src/prepare_install_windows.rsindex f20fc9e421..0467fa0740 100644--- a/codex-rs/app-server-daemon/src/prepare_install_windows.rs+++ b/codex-rs/app-server-daemon/src/prepare_install_windows.rs@@ -1,12 +1,14 @@-//! Selects a Windows managed release by creating or retargeting the installer junction.+//! Publishes and selects Windows managed releases despite transient filesystem contention.use std::os::windows::ffi::OsStrExt;use std::os::windows::fs::OpenOptionsExt;use std::os::windows::io::AsRawHandle;use std::path::Path;+use std::time::Duration;use anyhow::Context;use anyhow::Result;+use windows_sys::Win32::Foundation::ERROR_SHARING_VIOLATION;use windows_sys::Win32::Storage::FileSystem::FILE_FLAG_BACKUP_SEMANTICS;use windows_sys::Win32::Storage::FileSystem::FILE_FLAG_OPEN_REPARSE_POINT;use windows_sys::Win32::Storage::FileSystem::FILE_SHARE_DELETE;@@ -14,6 +16,36 @@ use windows_sys::Win32::Storage::FileSystem::FILE_SHARE_READ;use windows_sys::Win32::Storage::FileSystem::FILE_SHARE_WRITE;use windows_sys::Win32::System::IO::DeviceIoControl;+const PUBLISH_RELEASE_RETRY_INTERVAL: Duration = Duration::from_millis(50);+const PUBLISH_RELEASE_RETRY_LIMIT: usize = 100;++pub(super) async fn publish_release(stage: &Path, release: &Path) -> Result<()> {+ let mut retries = 0;+ loop {+ match std::fs::rename(stage, release) {+ Ok(()) => return Ok(()),+ // Executable scanners can briefly hold newly staged files without delete sharing.+ Err(error)+ if retries < PUBLISH_RELEASE_RETRY_LIMIT+ && (error.kind() == std::io::ErrorKind::PermissionDenied+ || error.raw_os_error() == Some(ERROR_SHARING_VIOLATION as i32)) =>+ {+ retries += 1;+ tokio::time::sleep(PUBLISH_RELEASE_RETRY_INTERVAL).await;+ }+ Err(error) => {+ return Err(error).with_context(|| {+ format!(+ "failed to publish managed daemon release from {} to {}",+ stage.display(),+ release.display()+ )+ });+ }+ }+ }+}+pub(super) fn select_release(root: &Path, release: &Path) -> Result<()> {let release = release.canonicalize()?;let current = root.join("current");diff --git a/codex-rs/app-server-daemon/src/prepare_install_windows_tests.rs b/codex-rs/app-server-daemon/src/prepare_install_windows_tests.rsindex 9d3b939687..cca156e459 100644--- a/codex-rs/app-server-daemon/src/prepare_install_windows_tests.rs+++ b/codex-rs/app-server-daemon/src/prepare_install_windows_tests.rs@@ -1,5 +1,34 @@-//! Verifies Windows selection without requiring an elevated daemon.+//! Verifies Windows package publication and selection without requiring an elevated daemon.use pretty_assertions::assert_eq;+use std::os::windows::fs::OpenOptionsExt;+use std::time::Duration;+use windows_sys::Win32::Storage::FileSystem::FILE_FLAG_BACKUP_SEMANTICS;+use windows_sys::Win32::Storage::FileSystem::FILE_SHARE_READ;+use windows_sys::Win32::Storage::FileSystem::FILE_SHARE_WRITE;++#[tokio::test]+async fn publishing_release_retries_transient_access_denied() {+ let home = tempfile::TempDir::new().unwrap();+ let stage = home.path().join(".staging");+ let release = home.path().join("release");+ std::fs::create_dir(&stage).unwrap();+ std::fs::write(stage.join("payload"), b"complete").unwrap();++ let directory = std::fs::OpenOptions::new()+ .read(true)+ .share_mode(FILE_SHARE_READ | FILE_SHARE_WRITE)+ .custom_flags(FILE_FLAG_BACKUP_SEMANTICS)+ .open(&stage)+ .unwrap();+ let holder = tokio::spawn(async move {+ tokio::time::sleep(Duration::from_millis(150)).await;+ drop(directory);+ });++ super::publish_release(&stage, &release).await.unwrap();+ holder.await.unwrap();+ assert_eq!(std::fs::read(release.join("payload")).unwrap(), b"complete");+}#[cfg(windows)]#[test]