Skip to content

feat(macos): dynamically detect install root and fix flaky model catalog test #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huangzhir wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(macos): dynamically detect install root and fix flaky model catalog test #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d63de15
feat(macos): dynamically detect install root and fix flaky model cata…
May 28, 2026
9cd70dc
fix(macos): remove Applications link from DMG package stage
May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion crates/codex-plus-core/src/install/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,18 @@ pub fn default_install_root() -> Option<PathBuf> {

#[cfg(target_os = "macos")]
{
return Some(PathBuf::from("/Applications"));
let sys_apps = PathBuf::from("/Applications");
if sys_apps.join(format!("{SILENT_NAME}.app")).exists()
|| sys_apps.join(format!("{MANAGER_NAME}.app")).exists()
{
return Some(sys_apps);
}
if let Ok(exe) = std::env::current_exe() {
if let Some(dir) = macos_applications_dir_from_exe(&exe) {
return Some(dir);
}
}
return Some(sys_apps);
}

#[cfg(not(any(windows, target_os = "macos")))]
Expand Down
2 changes: 2 additions & 0 deletions crates/codex-plus-core/tests/model_catalog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ async fn model_catalog_uses_active_relay_profile_model_list_for_display() {
base_url: "https://example.test/v1".to_string(),
protocol: RelayProtocol::Responses,
model_list: "deepseek-coder\nqwen3-coder\nclaude-compatible".to_string(),
config_contents: "model = \"qwen3-coder\"\n".to_string(),
relay_mode: codex_plus_core::settings::RelayMode::MixedApi,
..RelayProfile::default()
}],
..BackendSettings::default()
Expand Down
1 change: 0 additions & 1 deletion scripts/installer/macos/package-dmg.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ sign_app() {
prepare_icon
create_app "Codex++" "CodexPlusPlus" "$BINARY_DIR/codex-plus-plus" "com.bigpizzav3.codexplusplus" "true"
create_app "Codex++ 管理工具" "CodexPlusPlusManager" "$BINARY_DIR/codex-plus-plus-manager" "com.bigpizzav3.codexplusplus.manager" "false"
ln -s /Applications "$STAGE/Applications"

sign_app "$STAGE/Codex++.app"
sign_app "$STAGE/Codex++ 管理工具.app"
Expand Down