mirror of
https://github.com/openai/codex.git
synced 2026-11-20 23:08:21 +00:00
Add an explicit app-server daemon update command (#43562)
## What changed Add `codex app-server daemon update` to check the latest stable release once, even when automatic updates are disabled. The command requires an installer-owned latest-channel standalone installation and reports `updated`, `noUpdate`, or `unsupported` as JSON, including installed and running versions. Route manual requests through the updater so scheduled and manual installs share one owner and accepted updates continue if the CLI exits. Restart a running managed daemon when its binary or version differs from the selected installation; this may interrupt active or queued work. Return installer failures as command errors and retry requests across updater replacement. ## Testing Add coverage for manual updates with automatic updates disabled, queued requests, same-version binary replacement, updater handoff retries, and unsupported installations or unmanaged servers. GitOrigin-RevId: 240b63c79bae3a64a80768131a30da70900a4d62
This commit is contained in:
1 parent
333c41eef6
commit
daca1fab84
8 files changed
+1005
-185
No files matched your search
@@ -105,6 +105,24 @@ pub struct BootstrapOutput {
|
||||
pub app_server_version: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, serde::Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub enum UpdateStatus {
|
||||
Updated,
|
||||
NoUpdate,
|
||||
Unsupported,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, serde::Deserialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct UpdateOutput {
|
||||
pub status: UpdateStatus,
|
||||
pub managed_codex_path: PathBuf,
|
||||
pub installed_version: Option<String>,
|
||||
pub running_version: Option<String>,
|
||||
pub message: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
||||
#[serde(untagged)]
|
||||
pub enum RemoteControlStartOutput {
|
||||
@@ -174,16 +192,10 @@ pub(crate) enum RestartIfRunningOutcome {
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub(crate) enum RestartMode {
|
||||
IfVersionChanged,
|
||||
IfBinaryOrVersionChanged,
|
||||
Always,
|
||||
}
|
||||
|
||||
#[cfg(any(unix, windows))]
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub(crate) enum UpdaterRefreshMode {
|
||||
None,
|
||||
ReexecIfManagedBinaryChanged,
|
||||
}
|
||||
|
||||
#[cfg(any(unix, windows))]
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
enum RestartDecision {
|
||||
@@ -254,6 +266,13 @@ pub async fn run_pid_update_loop(
|
||||
update_loop::run(http_client_factory).await
|
||||
}
|
||||
|
||||
pub async fn update() -> Result<UpdateOutput> {
|
||||
ensure_supported_platform()?;
|
||||
#[cfg(windows)]
|
||||
backend::windows::ensure_not_elevated()?;
|
||||
update_loop::request_manual_update(&Daemon::from_environment()?).await
|
||||
}
|
||||
|
||||
#[cfg(any(unix, windows))]
|
||||
fn ensure_supported_platform() -> Result<()> {
|
||||
Ok(())
|
||||
@@ -388,7 +407,6 @@ impl Daemon {
|
||||
pub(crate) async fn try_restart_if_running(
|
||||
&self,
|
||||
mode: RestartMode,
|
||||
updater_refresh_mode: UpdaterRefreshMode,
|
||||
managed_codex_bin: &Path,
|
||||
) -> Result<RestartIfRunningOutcome> {
|
||||
let operation_lock = self.open_operation_lock_file().await?;
|
||||
@@ -407,7 +425,7 @@ impl Daemon {
|
||||
// this lock or probes the running server. Never restart from a
|
||||
// release that is no longer the selected latest-channel binary.
|
||||
if !self.is_stable_standalone_release()?
|
||||
|| managed_install::resolved_managed_codex_bin(&self.managed_codex_bin)
|
||||
|| managed_install::resolved_managed_codex_bin(&self.current_managed_codex_bin()?)
|
||||
.await
|
||||
.ok()
|
||||
.as_deref()
|
||||
@@ -415,6 +433,18 @@ impl Daemon {
|
||||
{
|
||||
return Ok(RestartIfRunningOutcome::AlreadyCurrent);
|
||||
}
|
||||
let mode = if mode == RestartMode::IfBinaryOrVersionChanged {
|
||||
let managed_identity =
|
||||
managed_install::executable_identity(managed_codex_bin).await?;
|
||||
if backend.running_executable_identity().await?.as_ref() == Some(&managed_identity)
|
||||
{
|
||||
RestartMode::IfVersionChanged
|
||||
} else {
|
||||
RestartMode::Always
|
||||
}
|
||||
} else {
|
||||
mode
|
||||
};
|
||||
match restart_decision(mode, info.as_ref(), managed_version.as_deref()) {
|
||||
RestartDecision::NotReady => return Ok(RestartIfRunningOutcome::NotReady),
|
||||
RestartDecision::AlreadyCurrent => RestartIfRunningOutcome::AlreadyCurrent,
|
||||
@@ -422,7 +452,9 @@ impl Daemon {
|
||||
#[cfg(windows)]
|
||||
backend::windows::ensure_detached_launch(managed_codex_bin)?;
|
||||
backend.stop().await?;
|
||||
let _ = self.start_managed_backend(&settings).await?;
|
||||
let _ = self
|
||||
.start_managed_backend_with_bin(&settings, managed_codex_bin)
|
||||
.await?;
|
||||
self.wait_until_ready().await?;
|
||||
RestartIfRunningOutcome::Restarted
|
||||
}
|
||||
@@ -436,7 +468,7 @@ impl Daemon {
|
||||
};
|
||||
|
||||
if !self.is_stable_standalone_release()?
|
||||
|| managed_install::resolved_managed_codex_bin(&self.managed_codex_bin)
|
||||
|| managed_install::resolved_managed_codex_bin(&self.current_managed_codex_bin()?)
|
||||
.await
|
||||
.ok()
|
||||
.as_deref()
|
||||
@@ -444,19 +476,6 @@ impl Daemon {
|
||||
{
|
||||
return Ok(RestartIfRunningOutcome::AlreadyCurrent);
|
||||
}
|
||||
#[cfg(unix)]
|
||||
if should_reexec_updater(updater_refresh_mode, outcome) {
|
||||
crate::update_loop::reexec_managed_updater(managed_codex_bin)?;
|
||||
}
|
||||
#[cfg(windows)]
|
||||
if should_reexec_updater(updater_refresh_mode, outcome) {
|
||||
backend::pid_update_loop_backend(
|
||||
self.backend_paths_with_bin(&settings, managed_codex_bin),
|
||||
)
|
||||
.replace_current_updater()
|
||||
.await?;
|
||||
}
|
||||
|
||||
Ok(outcome)
|
||||
}
|
||||
|
||||
@@ -767,10 +786,20 @@ impl Daemon {
|
||||
.context("daemon settings path has no Codex home")?;
|
||||
Ok(managed_install::is_stable_standalone_release(
|
||||
codex_home,
|
||||
&self.managed_codex_bin,
|
||||
&self.current_managed_codex_bin()?,
|
||||
))
|
||||
}
|
||||
|
||||
fn current_managed_codex_bin(&self) -> Result<PathBuf> {
|
||||
// An installer can move a legacy binary into bin/ while this updater runs.
|
||||
let home = self
|
||||
.settings_file
|
||||
.parent()
|
||||
.and_then(Path::parent)
|
||||
.context("daemon settings path has no Codex home")?;
|
||||
Ok(managed_install::managed_codex_bin(home))
|
||||
}
|
||||
|
||||
fn has_latest_selection_marker(&self) -> bool {
|
||||
self.settings_file
|
||||
.parent()
|
||||
@@ -841,6 +870,11 @@ impl Daemon {
|
||||
}
|
||||
}
|
||||
|
||||
fn manual_update_socket_path(&self) -> PathBuf {
|
||||
self.update_pid_file
|
||||
.with_file_name("app-server-updater.sock")
|
||||
}
|
||||
|
||||
async fn load_settings(&self) -> Result<DaemonSettings> {
|
||||
DaemonSettings::load(&self.settings_file).await
|
||||
}
|
||||
@@ -948,6 +982,9 @@ fn restart_decision(
|
||||
managed_version: Option<&str>,
|
||||
) -> RestartDecision {
|
||||
match (mode, info, managed_version) {
|
||||
(RestartMode::IfBinaryOrVersionChanged, _, _) => {
|
||||
unreachable!("binary comparison is resolved before restart decision")
|
||||
}
|
||||
(RestartMode::IfVersionChanged, None, _) => RestartDecision::NotReady,
|
||||
(RestartMode::IfVersionChanged, Some(info), Some(managed_version))
|
||||
if info.app_server_version == managed_version =>
|
||||
@@ -958,15 +995,6 @@ fn restart_decision(
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(any(unix, windows))]
|
||||
fn should_reexec_updater(
|
||||
updater_refresh_mode: UpdaterRefreshMode,
|
||||
outcome: RestartIfRunningOutcome,
|
||||
) -> bool {
|
||||
updater_refresh_mode == UpdaterRefreshMode::ReexecIfManagedBinaryChanged
|
||||
&& outcome == RestartIfRunningOutcome::Restarted
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
fn try_lock_file(file: &tokio::fs::File) -> Result<bool> {
|
||||
use std::os::fd::AsRawFd;
|
||||
@@ -1002,11 +1030,8 @@ mod tests {
|
||||
use super::RemoteControlStartOutput;
|
||||
use super::RemoteControlStatus;
|
||||
use super::RestartDecision;
|
||||
use super::RestartIfRunningOutcome;
|
||||
use super::RestartMode;
|
||||
use super::UpdaterRefreshMode;
|
||||
use super::restart_decision;
|
||||
use super::should_reexec_updater;
|
||||
use crate::client::ProbeInfo;
|
||||
#[cfg(unix)]
|
||||
use crate::settings::DaemonSettings;
|
||||
@@ -1019,38 +1044,6 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn updater_reexec_waits_for_validated_restart() {
|
||||
assert_eq!(
|
||||
[
|
||||
RestartIfRunningOutcome::Busy,
|
||||
RestartIfRunningOutcome::NotReady,
|
||||
RestartIfRunningOutcome::AlreadyCurrent,
|
||||
RestartIfRunningOutcome::NotRunning,
|
||||
RestartIfRunningOutcome::Restarted,
|
||||
]
|
||||
.map(|outcome| {
|
||||
should_reexec_updater(UpdaterRefreshMode::ReexecIfManagedBinaryChanged, outcome)
|
||||
}),
|
||||
[false, false, false, false, true]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unchanged_updater_never_reexecs() {
|
||||
assert_eq!(
|
||||
[
|
||||
RestartIfRunningOutcome::Busy,
|
||||
RestartIfRunningOutcome::NotReady,
|
||||
RestartIfRunningOutcome::AlreadyCurrent,
|
||||
RestartIfRunningOutcome::NotRunning,
|
||||
RestartIfRunningOutcome::Restarted,
|
||||
]
|
||||
.map(|outcome| should_reexec_updater(UpdaterRefreshMode::None, outcome)),
|
||||
[false, false, false, false, false]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn restart_decision_preserves_forced_refreshes() {
|
||||
let current_info = ProbeInfo {
|
||||
|
||||
Reference in new issue
Block a user