mirror of
https://github.com/openai/codex.git
synced 2026-11-20 23:08:21 +00:00
Move daemon packages out of the standalone CLI installation (#45546)
## Why The daemon shares the standalone CLI package, coupling daemon updates to the visible CLI installation. A dedicated package lets daemon updates preserve the CLI selection and shell profile. ## What changed - Add dedicated daemon package selection and separate daemon and updater PID files, with diagnostics for the new files. - Make `codex app-server daemon update` migrate eligible legacy stable latest-channel installations to a dedicated package. Prepare and validate the release and its package-ownership support before switching; preserve settings and whether the daemon was running. Scheduled updates keep legacy installations in place. - Add daemon-only and deferred-selection modes to the shell and PowerShell installers, leaving the visible CLI installation unchanged. - Coordinate migration with installer locks, refresh package selection after acquiring lifecycle locks, and reject package changes during update downloads. ## Testing Add coverage for running and stopped migrations, incompatible installers and releases, package-selection races, daemon-only updates, and a capability probe that does not start an updater. Add a shell installer regression test verifying that daemon installation preserves the visible CLI and shell profile. GitOrigin-RevId: 1ec0f358f8f6ebde7daddb74e880cc8d2235d647
This commit is contained in:
1 parent
2f1583b411
commit
923c6028b6
17 files changed
+1057
-106
No files matched your search
@@ -1,6 +1,7 @@
|
||||
//! Windows process identity and file locks. Keep a process handle across shutdown
|
||||
//! so PID reuse can never redirect forced termination to a different process.
|
||||
//! Managed servers must not elevate ordinary clients sharing the account's socket.
|
||||
//! Installer jobs contain extraction processes when an update is cancelled.
|
||||
|
||||
use std::io;
|
||||
use std::os::windows::io::AsRawHandle;
|
||||
@@ -244,6 +245,18 @@ pub(crate) fn try_lock_file(file: &tokio::fs::File) -> Result<bool> {
|
||||
// Keep installer descendants bounded by the updater's lifetime, while allowing
|
||||
// app-server launches and successor updaters to break away from this job.
|
||||
pub(crate) fn updater_job() -> Result<OwnedHandle> {
|
||||
process_job(unsafe { GetCurrentProcess() })
|
||||
}
|
||||
|
||||
/// Called before writing the installer script, while PowerShell is waiting on stdin.
|
||||
pub(crate) fn installer_job(child: &tokio::process::Child) -> Result<OwnedHandle> {
|
||||
let process = child
|
||||
.raw_handle()
|
||||
.context("installer process handle is unavailable")?;
|
||||
process_job(process as isize)
|
||||
}
|
||||
|
||||
fn process_job(process: isize) -> Result<OwnedHandle> {
|
||||
let job = unsafe { CreateJobObjectW(std::ptr::null(), std::ptr::null()) };
|
||||
if job == 0 {
|
||||
return Err(io::Error::last_os_error()).context("failed to create updater job");
|
||||
@@ -260,7 +273,7 @@ pub(crate) fn updater_job() -> Result<OwnedHandle> {
|
||||
std::mem::size_of_val(&limits) as u32,
|
||||
)
|
||||
} == 0
|
||||
|| unsafe { AssignProcessToJobObject(job, GetCurrentProcess()) } == 0
|
||||
|| unsafe { AssignProcessToJobObject(job, process) } == 0
|
||||
{
|
||||
return Err(io::Error::last_os_error())
|
||||
.context("failed to contain updater installer processes");
|
||||
|
||||
Reference in new issue
Block a user