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
@@ -44,6 +44,10 @@ impl TestDaemon {
|
||||
PathBuf::from("releases").join(release_name),
|
||||
standalone.join("current"),
|
||||
)?;
|
||||
// Model a daemon that was previously launched and is currently stopped.
|
||||
let state = home.path().join("app-server-daemon");
|
||||
std::fs::create_dir(&state)?;
|
||||
std::fs::write(state.join("app-server.stderr.log"), b"")?;
|
||||
Ok(Self {
|
||||
home,
|
||||
codex,
|
||||
@@ -118,6 +122,29 @@ fn wait_for_exit(pid: u32) -> Result<()> {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn package_ownership_check_does_not_start_an_updater() -> Result<()> {
|
||||
let daemon = TestDaemon::new()?;
|
||||
let output = daemon
|
||||
.command()
|
||||
.args([
|
||||
"app-server",
|
||||
"daemon",
|
||||
"pid-update-loop",
|
||||
"--check-package-ownership",
|
||||
])
|
||||
.output()?;
|
||||
ensure!(
|
||||
output.status.success(),
|
||||
"ownership check failed: {}",
|
||||
String::from_utf8_lossy(&output.stderr)
|
||||
);
|
||||
let state = daemon.home.path().join("app-server-daemon");
|
||||
assert!(!state.join("app-server-updater.pid").exists());
|
||||
assert!(!state.join("daemon-updater.pid").exists());
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn managed_starts_ensure_one_updater_and_recover_a_missing_one() -> Result<()> {
|
||||
let daemon = TestDaemon::new()?;
|
||||
@@ -139,6 +166,22 @@ fn managed_starts_ensure_one_updater_and_recover_a_missing_one() -> Result<()> {
|
||||
assert_eq!(daemon.lifecycle("restart")?["status"], "restarted");
|
||||
assert_ne!(daemon.pid("app-server.pid")?, backend_pid);
|
||||
assert_eq!(daemon.pid("app-server-updater.pid")?, replacement_pid);
|
||||
daemon.lifecycle("stop")?;
|
||||
assert!(
|
||||
!daemon
|
||||
.home
|
||||
.path()
|
||||
.join("app-server-daemon/app-server.pid")
|
||||
.exists()
|
||||
);
|
||||
assert_eq!(daemon.lifecycle("start")?["status"], "started");
|
||||
assert!(
|
||||
!daemon
|
||||
.home
|
||||
.path()
|
||||
.join("packages/app-server-daemon")
|
||||
.exists()
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user