File size: 19,298 Bytes
854994d | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 | //! Installs complete CLI packages after confirmation. Initial starts preserve
//! existing selections; explicit replacements migrate to dedicated packages and stay pinned.
use std::path::Path;
use std::path::PathBuf;
use anyhow::Context;
use anyhow::Result;
use anyhow::anyhow;
use codex_install_context::CodexPackageManifest;
use codex_install_context::InstallContext;
use crate::Daemon;
use crate::install_lock::acquire_install_lock;
use crate::managed_install;
use crate::settings::DaemonSettings;
/// The complete CLI package offered for a daemon installation.
pub struct InstallRequest {
pub source: PathBuf,
pub version: String,
pub destination: PathBuf,
pub installed_version: Option<String>,
pub restart_required: bool,
}
/// Prepare a missing package while the caller holds the daemon operation lock.
pub(super) async fn prepare(daemon: &Daemon, settings: &DaemonSettings) -> Result<()> {
let source = InstallContext::current().package_layout.as_ref();
// Keep package replacement state out of the CLI dispatcher's async stack frame.
Box::pin(prepare_from_package(
daemon,
settings,
InstallMode::Missing,
source.map(|layout| layout.package_dir.as_path()),
&std::env::current_exe()?,
|_| Ok(true),
))
.await
.map(|_| ())
}
/// Select this CLI's complete package and pin it, restarting only a running daemon.
/// Returns None when the user cancels without changing the installation.
pub async fn update_from_cli(
confirm: impl FnOnce(&InstallRequest) -> Result<bool>,
) -> Result<Option<crate::UpdateOutput>> {
crate::ensure_supported_platform()?;
#[cfg(windows)]
crate::backend::windows::ensure_not_elevated()?;
let daemon = Daemon::from_environment()?;
let settings = daemon.load_settings().await?;
let source = InstallContext::current().package_layout.as_ref();
if !Box::pin(prepare_from_package(
&daemon,
&settings,
InstallMode::Replace,
source.map(|layout| layout.package_dir.as_path()),
&std::env::current_exe()?,
confirm,
))
.await?
{
return Ok(None);
}
let managed_codex_path = daemon.current_managed_codex_bin()?;
Ok(Some(crate::UpdateOutput {
status: crate::UpdateStatus::Updated,
installed_version: Some(managed_install::managed_codex_version(&managed_codex_path).await?),
running_version: crate::client::probe(&daemon.socket_path)
.await
.ok()
.map(|info| info.app_server_version),
managed_codex_path,
message: "The CLI package is selected and pinned. Run `codex app-server daemon update` to return to production updates.".to_string(),
}))
}
#[derive(Clone, Copy, PartialEq, Eq)]
enum InstallMode {
Missing,
Replace,
}
async fn prepare_from_package(
daemon: &Daemon,
settings: &DaemonSettings,
mode: InstallMode,
source: Option<&Path>,
running_exe: &Path,
confirm: impl FnOnce(&InstallRequest) -> Result<bool>,
) -> Result<bool> {
let home = daemon
.settings_file
.parent()
.and_then(Path::parent)
.context("daemon settings path has no Codex home")?;
let previous_root = managed_install::package_root(home);
let root = home.join("packages/app-server-daemon");
anyhow::ensure!(
daemon.managed_codex_bin.starts_with(&previous_root),
"daemon package location changed; retry the command"
);
if mode == InstallMode::Missing {
if previous_root != root
|| daemon.running_backend_instance(settings).await?.is_some()
|| crate::client::probe(&daemon.socket_path).await.is_ok()
{
return Ok(true);
}
if !matches!(root.join("current").symlink_metadata(), Err(error) if error.kind() == std::io::ErrorKind::NotFound)
|| ["daemon.pid", "daemon.stderr.log", "daemon-updater.pid", "daemon-updater.stderr.log"]
.iter().any(|name| !matches!(home.join("app-server-daemon").join(name).symlink_metadata(), Err(error) if error.kind() == std::io::ErrorKind::NotFound))
{
daemon.ensure_managed_codex_bin()?;
return Ok(true);
}
} else {
anyhow::ensure!(
previous_root.join("current").symlink_metadata().is_ok(),
"no daemon package is selected; run `codex app-server daemon start` first"
);
}
std::fs::create_dir_all(&root)?;
anyhow::ensure!(
managed_install::package_root(home) == previous_root,
"daemon package location changed; retry the command"
);
let backend = daemon.running_backend_instance(settings).await?;
anyhow::ensure!(
backend.is_some() || crate::client::probe(&daemon.socket_path).await.is_err(),
"app server is running but is not managed by codex app-server daemon"
);
let selected = managed_install::managed_codex_bin(home);
let previous_release = previous_root.join("current").canonicalize().ok();
if mode == InstallMode::Missing {
if selected.is_file() {
return Ok(true);
}
anyhow::ensure!(
backend.is_none()
&& matches!(root.join("current").symlink_metadata(), Err(error) if error.kind() == std::io::ErrorKind::NotFound),
"the selected daemon package is incomplete; repair its installation before starting"
);
}
let source = source.context(
"this CLI has no complete local package; install a packaged Codex CLI or use the standalone installer",
)?;
anyhow::ensure!(
!root.canonicalize()?.starts_with(source.canonicalize()?),
"CODEX_HOME must be outside the source CLI package"
);
let manifest_bytes = std::fs::read(source.join("codex-package.json"))?;
let manifest: CodexPackageManifest = serde_json::from_slice(&manifest_bytes)?;
let version = manifest.version.to_string();
let target = platform_target()?;
let metadata: serde_json::Value = serde_json::from_slice(&manifest_bytes)?;
let entrypoint = if cfg!(windows) {
"bin/codex.exe"
} else {
"bin/codex"
};
anyhow::ensure!(
metadata["target"] == target && metadata["entrypoint"] == entrypoint,
"the CLI package does not match this platform or executable"
);
validate_package(source)?;
// A local build may replace the executable while confirmation is pending.
let running_identity = managed_install::executable_identity(running_exe).await?;
if mode == InstallMode::Replace {
if !confirm(&InstallRequest {
source: source.to_path_buf(),
version: version.clone(),
destination: root.clone(),
installed_version: tokio::time::timeout(
std::time::Duration::from_secs(5),
managed_install::managed_codex_version(&selected),
)
.await
.ok()
.and_then(Result::ok),
restart_required: backend.is_some(),
})? {
return Ok(false);
}
} else {
eprintln!(
"Installing daemon from CLI version {version} into {}...",
root.display()
);
}
// Confirmation must not block lifecycle commands. Recheck the approved
// selection and running state once this operation owns both locks.
let _operation_lock = if mode == InstallMode::Replace {
Some(daemon.acquire_operation_lock().await?)
} else {
None // Initial startup already holds the operation lock.
};
let current_settings = if mode == InstallMode::Replace {
Some(daemon.load_settings().await?)
} else {
None
};
let settings = current_settings.as_ref().unwrap_or(settings);
let _install_lock = acquire_install_lock(&root).await?;
anyhow::ensure!(
managed_install::package_root(home) == previous_root,
"daemon package location changed; retry the command"
);
if mode == InstallMode::Missing && managed_install::managed_codex_bin(home).is_file() {
return Ok(true);
}
anyhow::ensure!(
previous_root.join("current").canonicalize().ok() == previous_release,
"daemon selection changed while awaiting confirmation; retry the command"
);
let current_backend = daemon.running_backend_instance(settings).await?;
anyhow::ensure!(
current_backend.is_some() == backend.is_some(),
"daemon running state changed while awaiting confirmation; retry the command"
);
let backend = current_backend;
let stable = stable_version(&version).is_some();
let releases = root.join("releases");
std::fs::create_dir_all(&releases)?;
let stage = tempfile::Builder::new()
.prefix(".staging.")
.tempdir_in(&releases)?;
let digest = package_tree(source, Some(stage.path()))?;
validate_package(stage.path())?;
let staged_exe = if cfg!(target_os = "macos") && stage.path().join("CodexCLI.app").is_dir() {
stage.path().join("CodexCLI.app/Contents/MacOS/codex")
} else {
stage.path().join(entrypoint)
};
anyhow::ensure!(
package_tree(source, /*destination*/ None)? == digest
&& std::fs::read(stage.path().join("codex-package.json"))? == manifest_bytes
&& managed_install::executable_identity(&staged_exe).await? == running_identity,
"the CLI package changed while preparing the daemon or differs from the running executable"
);
let binary_version =
managed_install::managed_codex_version(&stage.path().join(entrypoint)).await?;
anyhow::ensure!(
!stable || version == binary_version,
"the CLI package version does not match its executable"
);
let name = if stable && mode == InstallMode::Missing {
format!("{version}-{target}")
} else {
format!("local-{digest}-{target}")
};
let release = releases.join(&name);
if release.try_exists()? {
anyhow::ensure!(
!release.symlink_metadata()?.file_type().is_symlink()
&& package_tree(&release, /*destination*/ None)? == digest,
"an existing daemon release has different contents; refusing to overwrite it"
);
} else {
#[cfg(unix)]
if !stage.path().join("codex").exists() {
std::os::unix::fs::symlink("bin/codex", stage.path().join("codex"))?;
}
std::fs::rename(stage.path(), &release)?;
}
let standalone = home.join("packages/standalone");
let canonical_source = source.canonicalize()?;
let follows_latest = mode == InstallMode::Missing
&& stable
&& (standalone.join("current").canonicalize().ok().as_deref()
!= Some(canonical_source.as_path())
|| std::fs::read_to_string(standalone.join("auto-update-version"))
.ok()
.as_deref()
== canonical_source.file_name().and_then(|name| name.to_str()));
anyhow::ensure!(
managed_install::package_root(home) == previous_root
&& (backend.is_some() || crate::client::probe(&daemon.socket_path).await.is_err()),
"daemon package location or socket ownership changed while preparing its package; retry the command"
);
#[cfg(windows)]
if backend.is_some() {
crate::backend::windows::ensure_detached_launch(&release.join(entrypoint))?;
}
#[cfg(windows)]
windows::validate_selection(&root)?;
if mode == InstallMode::Replace {
let stopped = async {
crate::backend::pid_update_loop_backend(daemon.backend_paths(settings))
.stop()
.await?;
anyhow::ensure!(
managed_install::package_root(home) == previous_root
&& previous_root.join("current").canonicalize().ok() == previous_release,
"daemon selection changed while preparing its package; retry the command"
);
if let Some(backend) = &backend {
if let Err(error) = crate::thread_recovery::discard_pending(daemon) {
eprintln!(
"warning: failed to clear stale daemon recovery before replacement: {error}"
);
}
backend
.stop_with_grace(settings.shutdown_grace_seconds)
.await?;
}
Ok::<(), anyhow::Error>(())
}
.await;
if let Err(error) = stopped {
if let Err(restore_error) = async {
daemon
.current_installation()?
.ensure_managed_updater(settings)
.await
}
.await
{
eprintln!(
"warning: failed to restore the daemon updater after replacement failed: {restore_error:#}"
);
}
return Err(error);
}
}
let marker = root.join("auto-update-version");
if follows_latest {
let temporary = tempfile::NamedTempFile::new_in(&root)?;
std::fs::write(temporary.path(), &name)?;
temporary.persist(marker)?;
} else if marker.exists() {
std::fs::remove_file(marker)?;
}
#[cfg(unix)]
{
let temporary = tempfile::TempDir::new_in(&root)?;
let link = temporary.path().join("current");
std::os::unix::fs::symlink(&release, &link)?;
std::fs::rename(link, root.join("current"))?;
}
#[cfg(windows)]
windows::select_release(&root, &release)?;
if backend.is_some() {
let selected = Daemon {
pid_file: daemon.pid_file.with_file_name(crate::DAEMON_PID_FILE_NAME),
update_pid_file: daemon
.update_pid_file
.with_file_name(crate::DAEMON_UPDATE_PID_FILE_NAME),
managed_codex_bin: root.join("current").join(entrypoint),
..daemon.clone()
};
selected.start_managed_backend(settings).await.context(
"daemon package selected but could not start; retry with `codex app-server daemon start`",
)?;
selected.wait_until_ready().await?;
}
Ok(true)
}
/// Hash the complete tree and optionally copy those same bytes. Relative file
/// links are materialized; escaping links and directory links are rejected.
fn package_tree(root: &Path, destination: Option<&Path>) -> Result<String> {
let canonical_root = root.canonicalize()?;
let mut hasher = blake3::Hasher::new();
let mut paths = vec![root.to_path_buf()];
while let Some(path) = paths.pop() {
let relative = path.strip_prefix(root)?;
// The Unix installer adds this alias outside the package layout.
if cfg!(unix)
&& relative == Path::new("codex")
&& std::fs::read_link(&path).ok().as_deref() == Some(Path::new("bin/codex"))
{
continue;
}
anyhow::ensure!(
path.canonicalize()?.starts_with(&canonical_root),
"package link escapes its root"
);
let metadata = path.metadata()?;
hasher.update(relative.as_os_str().as_encoded_bytes());
hasher.update(&[0]);
if metadata.is_dir() {
anyhow::ensure!(
!path.symlink_metadata()?.file_type().is_symlink(),
"package contains a directory link"
);
hasher.update(b"directory");
if let Some(destination) = destination
&& !relative.as_os_str().is_empty()
{
std::fs::create_dir(destination.join(relative))?;
}
let mut entries = std::fs::read_dir(&path)?
.map(|entry| entry.map(|entry| entry.path()))
.collect::<std::io::Result<Vec<_>>>()?;
entries.sort();
paths.extend(entries);
} else {
anyhow::ensure!(metadata.is_file(), "package contains an unsupported file");
let bytes = std::fs::read(&path)?;
hasher.update(b"file");
hasher.update(blake3::hash(&bytes).as_bytes());
#[cfg(unix)]
{
use std::os::unix::fs::PermissionsExt;
hasher.update(&(metadata.permissions().mode() & 0o777).to_le_bytes());
}
if let Some(destination) = destination {
let target = destination.join(relative);
std::fs::write(&target, bytes)?;
std::fs::set_permissions(target, metadata.permissions())?;
}
}
}
Ok(hasher.finalize().to_hex().to_string())
}
fn stable_version(value: &str) -> Option<semver::Version> {
let version = semver::Version::parse(value).ok()?;
(version.pre.is_empty()
&& version.build.is_empty()
&& (version.major, version.minor, version.patch) != (0, 0, 0))
.then_some(version)
}
fn validate_package(root: &Path) -> Result<()> {
let mut names = vec![
"codex-package.json",
if cfg!(windows) {
"bin/codex.exe"
} else {
"bin/codex"
},
if cfg!(windows) {
"bin/codex-code-mode-host.exe"
} else {
"bin/codex-code-mode-host"
},
if cfg!(windows) {
"codex-path/rg.exe"
} else {
"codex-path/rg"
},
];
if cfg!(windows) {
names.extend([
"codex-resources/codex-command-runner.exe",
"codex-resources/codex-windows-sandbox-setup.exe",
]);
} else if cfg!(target_os = "linux") {
names.push("codex-resources/bwrap");
}
for name in names {
if !root.join(name).is_file() {
return Err(anyhow!(
"local Codex package is missing {name}; reinstall the CLI or use the standalone installer"
));
}
#[cfg(unix)]
if name != "codex-package.json" {
use std::os::unix::fs::PermissionsExt;
if std::fs::metadata(root.join(name))?.permissions().mode() & 0o111 == 0 {
return Err(anyhow!(
"local Codex package file {name} is not executable; reinstall the CLI or use the standalone installer"
));
}
}
}
Ok(())
}
fn platform_target() -> Result<&'static str> {
match (std::env::consts::OS, std::env::consts::ARCH) {
("macos", "aarch64") => Ok("aarch64-apple-darwin"),
("macos", "x86_64") => Ok("x86_64-apple-darwin"),
("linux", "aarch64") if cfg!(target_env = "gnu") => Ok("aarch64-unknown-linux-gnu"),
("linux", "aarch64") => Ok("aarch64-unknown-linux-musl"),
("linux", "x86_64") if cfg!(target_env = "gnu") => Ok("x86_64-unknown-linux-gnu"),
("linux", "x86_64") => Ok("x86_64-unknown-linux-musl"),
("windows", "aarch64") => Ok("aarch64-pc-windows-msvc"),
("windows", "x86_64") => Ok("x86_64-pc-windows-msvc"),
(os, arch) => Err(anyhow!("unsupported packaged daemon platform {os}/{arch}")),
}
}
#[cfg(windows)]
#[path = "prepare_install_windows.rs"]
mod windows;
#[cfg(test)]
#[path = "prepare_install_tests.rs"]
mod tests;
|