Skip to content

[codex] Fix marketplace paths on non-Windows platforms #1448

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

Draft
bc19sam-afk wants to merge 1 commit into
base: main
Choose a base branch
from
+90 −33
Draft

[codex] Fix marketplace paths on non-Windows platforms #1448

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
123 changes: 90 additions & 33 deletions crates/codex-plus-core/src/plugin_marketplace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ fn merge_marketplace_configs_and_plugins_into_text(
}
marketplaces[marketplace_name]["source_type"] = toml_edit::value("local");
marketplaces[marketplace_name]["source"] =
toml_edit::value(windows_extended_path(marketplace_root));
toml_edit::value(local_marketplace_path(marketplace_root));
}
if !plugin_ids.is_empty() {
let plugins = table_mut_or_insert(&mut doc, "plugins")?;
Expand Down Expand Up @@ -706,19 +706,33 @@ fn marketplace_config_points_to_root(home: &Path, marketplace_name: &str, root:
.get("source")
.and_then(Item::as_str)
.unwrap_or_default();
source_type == "local" && normalize_windows_extended_path(source) == root.to_string_lossy()
source_type == "local" && normalize_local_marketplace_path(source) == root.to_string_lossy()
}

fn normalize_windows_extended_path(value: &str) -> String {
value.strip_prefix(r"\\?\").unwrap_or(value).to_string()
fn normalize_local_marketplace_path(value: &str) -> String {
#[cfg(windows)]
{
value.strip_prefix(r"\\?\").unwrap_or(value).to_string()
}
#[cfg(not(windows))]
{
value.to_string()
}
}

fn windows_extended_path(path: &Path) -> String {
let value = path.to_string_lossy();
if value.starts_with(r"\\?\") {
value.into_owned()
} else {
format!(r"\\?\{value}")
fn local_marketplace_path(path: &Path) -> String {
#[cfg(windows)]
{
let value = path.to_string_lossy();
if value.starts_with(r"\\?\") {
value.into_owned()
} else {
format!(r"\\?\{value}")
}
}
#[cfg(not(windows))]
{
path.to_string_lossy().into_owned()
}
}

Expand Down Expand Up @@ -756,6 +770,14 @@ fn ensure_trailing_newline(mut contents: String) -> String {
mod tests {
use super::*;

fn expected_local_marketplace_path(path: &Path) -> String {
if cfg!(windows) {
format!(r"\\?\{}", path.display())
} else {
path.to_string_lossy().into_owned()
}
}

fn write_marketplace(home: &Path) {
let root = home.join(".tmp").join("plugins");
std::fs::create_dir_all(root.join(".agents").join("plugins")).unwrap();
Expand Down Expand Up @@ -822,31 +844,75 @@ mod tests {
parsed["marketplaces"]["openai-curated"]["source_type"].as_str(),
Some("local")
);
let local_marketplace_source =
expected_local_marketplace_path(&home.join(".tmp").join("plugins"));
assert_eq!(
parsed["marketplaces"]["openai-curated"]["source"].as_str(),
Some(format!(r"\\?\{}", home.join(".tmp").join("plugins").display()).as_str())
Some(local_marketplace_source.as_str())
);
assert_eq!(
parsed["marketplaces"]["openai-api-curated"]["source_type"].as_str(),
Some("local")
);
assert_eq!(
parsed["marketplaces"]["openai-api-curated"]["source"].as_str(),
Some(format!(r"\\?\{}", home.join(".tmp").join("plugins").display()).as_str())
Some(local_marketplace_source.as_str())
);
assert_eq!(
parsed["marketplaces"]["openai-curated-remote"]["source_type"].as_str(),
Some("local")
);
let remote_marketplace_source =
expected_local_marketplace_path(&home.join(".tmp").join("plugins-remote"));
assert_eq!(
parsed["marketplaces"]["openai-curated-remote"]["source"].as_str(),
Some(
format!(
r"\\?\{}",
home.join(".tmp").join("plugins-remote").display()
)
.as_str()
)
Some(remote_marketplace_source.as_str())
);
}

#[cfg(not(windows))]
#[test]
fn ensure_openai_curated_marketplace_config_repairs_windows_prefix_on_unix() {
let temp = tempfile::tempdir().unwrap();
let home = temp.path();
write_marketplace(home);
write_remote_marketplace(home);
let local_root = home.join(".tmp").join("plugins");
let remote_root = home.join(".tmp").join("plugins-remote");
std::fs::write(
home.join("config.toml"),
format!(
r#"[marketplaces.openai-curated]
source_type = "local"
source = '\\?\{}'

[marketplaces.openai-api-curated]
source_type = "local"
source = '\\?\{}'

[marketplaces.openai-curated-remote]
source_type = "local"
source = '\\?\{}'
"#,
local_root.display(),
local_root.display(),
remote_root.display()
),
)
.unwrap();

let changed = ensure_openai_curated_marketplace_config(home).unwrap();

assert!(changed);
let config = std::fs::read_to_string(home.join("config.toml")).unwrap();
let parsed = config.parse::<DocumentMut>().unwrap();
assert_eq!(
parsed["marketplaces"]["openai-curated"]["source"].as_str(),
Some(local_root.to_string_lossy().as_ref())
);
assert_eq!(
parsed["marketplaces"]["openai-curated-remote"]["source"].as_str(),
Some(remote_root.to_string_lossy().as_ref())
);
}

Expand Down Expand Up @@ -883,12 +949,11 @@ mod tests {
assert_eq!(
parsed["marketplaces"]["role-specific-plugins"]["source"].as_str(),
Some(
format!(
r"\\?\{}",
home.join(".tmp")
expected_local_marketplace_path(
&home
.join(".tmp")
.join("marketplaces")
.join("role-specific-plugins")
.display()
)
.as_str()
)
Expand Down Expand Up @@ -1003,11 +1068,7 @@ mod tests {
assert_eq!(
parsed["marketplaces"]["openai-curated-remote"]["source"].as_str(),
Some(
format!(
r"\\?\{}",
home.join(".tmp").join("plugins-remote").display()
)
.as_str()
expected_local_marketplace_path(&home.join(".tmp").join("plugins-remote")).as_str()
)
);
}
Expand Down Expand Up @@ -1044,11 +1105,7 @@ mod tests {
assert_eq!(
parsed["marketplaces"]["openai-curated-remote"]["source"].as_str(),
Some(
format!(
r"\\?\{}",
home.join(".tmp").join("plugins-remote").display()
)
.as_str()
expected_local_marketplace_path(&home.join(".tmp").join("plugins-remote")).as_str()
)
);
}
Expand Down