openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-13 21:30:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

share trusted Desktop distribution discovery

Browse Source
This commit is contained in:
Abhinav Vedmala
2026-06-15 04:04:43 +00:00
parent dfd03ea01b
commit 4633e26cff
12 changed files with 403 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/cli/Cargo.toml
+1
View File
@@ -31,6 +31,7 @@ codex-chatgpt = { workspace = true }
codex-cloud-tasks = { path = "../cloud-tasks" }
codex-utils-cli = { workspace = true }
codex-config = { workspace = true }
codex-desktop-distribution = { workspace = true }
codex-core = { workspace = true }
codex-core-plugins = { workspace = true }
codex-home = { workspace = true }
codex-rs/cli/src/desktop_app/mac.rs
+7 -13
View File
@@ -1,4 +1,5 @@
use anyhow::Context as _;
use codex_desktop_distribution::discover_installed_distribution;
use std::ffi::CString;
use std::path::Path;
use std::path::PathBuf;
@@ -13,7 +14,7 @@ pub async fn run_mac_app_open_or_install(
workspace: PathBuf,
download_url_override: Option<String>,
) -> anyhow::Result<()> {
if let Some(app_path) = find_existing_codex_app_path() {
if let Some(app_path) = find_existing_codex_app_path().await? {
eprintln!(
"Opening Codex Desktop at {app_path}...",
app_path = app_path.display()
@@ -63,18 +64,11 @@ fn is_apple_silicon_mac() -> bool {
|| macos_sysctl_flag("hw.optional.arm64").unwrap_or(false)
}
fn find_existing_codex_app_path() -> Option<PathBuf> {
candidate_codex_app_paths()
.into_iter()
.find(|candidate| candidate.is_dir())
}
fn candidate_codex_app_paths() -> Vec<PathBuf> {
let mut paths = vec![PathBuf::from("/Applications/Codex.app")];
if let Some(home) = std::env::var_os("HOME") {
paths.push(PathBuf::from(home).join("Applications").join("Codex.app"));
}
paths
async fn find_existing_codex_app_path() -> anyhow::Result<Option<PathBuf>> {
let distribution = tokio::task::spawn_blocking(discover_installed_distribution)
.await
.context("Desktop discovery task failed")??;
Ok(distribution.map(|distribution| distribution.app_root().to_path_buf()))
}
async fn open_codex_app(app_path: &Path, workspace: &Path) -> anyhow::Result<()> {
codex-rs/cli/src/desktop_app/windows.rs
+4 -12
View File
@@ -1,4 +1,5 @@
use anyhow::Context as _;
use codex_desktop_distribution::discover_installed_distribution;
use std::path::Path;
use std::path::PathBuf;
use tokio::process::Command;
@@ -31,19 +32,10 @@ pub async fn run_windows_app_open_or_install(
}
async fn codex_app_is_installed() -> anyhow::Result<bool> {
let output = Command::new("powershell.exe")
.arg("-NoProfile")
.arg("-Command")
.arg("Get-StartApps -Name 'Codex' | Select-Object -First 1 -ExpandProperty AppID")
.output()
Ok(tokio::task::spawn_blocking(discover_installed_distribution)
.await
.context("failed to invoke `powershell.exe`")?;
if !output.status.success() {
return Ok(false);
}
Ok(!String::from_utf8_lossy(&output.stdout).trim().is_empty())
.context("Desktop discovery task failed")??
.is_some())
}
async fn open_url(url: &str) -> anyhow::Result<()> {