feat: Handle alternate plugin manifest paths by xl-openai · Pull Request #18182 · openai/codex

xl-openai · 2026-04-16T19:26:26Z

Load plugin manifests through a shared discoverable-path helper so manifest reads, installs, and skill names all see the same alternate manifest location.

alexsong-oai · 2026-04-16T19:28:34Z

+    let repo_root = TempDir::new()?;
+    let valid_plugin_root = repo_root.path().join("plugins/valid-plugin");
+    std::fs::create_dir_all(repo_root.path().join(".git"))?;
+    std::fs::create_dir_all(repo_root.path().join(".claude-plugin"))?;


Let's use such const for all places: ALTERNATE_PLUGIN_MANIFEST_RELATIVE_PATH?

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9c3c64a8ca

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-04-16T19:49:34Z

+        let Some(manifest) = load_plugin_manifest(source_path.as_path()) else {
+            warn!(
+                path = %path.display(),
+                plugin = name,
+                source_path = %source_path.display(),
+                "skipping marketplace plugin that failed to load"
+            );
+            continue;
+        };


Preserve invalid-manifest errors for explicit plugin reads

Skipping manifest-unloadable entries in load_marketplace removes them before read_plugin_for_config does name lookup. For a requested plugin with missing/invalid manifest, plugin/read now degrades to PluginNotFound instead of surfacing an invalid-manifest error, hiding the real failure mode for a direct read request.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-16T19:49:34Z

+        let Some(manifest) = load_plugin_manifest(source_path.as_path()) else {
+            warn!(
+                path = %path.display(),
+                plugin = name,
+                source_path = %source_path.display(),
+                "skipping marketplace plugin that failed to load"
+            );
+            continue;
+        };


Return invalid-manifest error for explicit plugin reads

Filtering out unloadable plugins inside load_marketplace causes read_plugin_for_config to miss requested entries and return PluginNotFound instead of the real invalid-manifest failure. That hides actionable diagnostics for plugin/read callers asking for a known plugin with a bad/missing manifest.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-16T19:49:34Z

+        let Some(manifest) = load_plugin_manifest(source_path.as_path()) else {
+            warn!(
+                path = %path.display(),
+                plugin = name,
+                source_path = %source_path.display(),
+                "skipping marketplace plugin that failed to load"
+            );
+            continue;
+        };


Keep remote sync state updates for dropped marketplace entries

sync_remote_plugins iterates curated_marketplace.plugins; after this change, manifest-broken entries are removed upstream by load_marketplace. Those plugins then never reach sync reconciliation, so remote disable/uninstall state can be ignored and stale local enable/install config can persist.

Useful? React with 👍 / 👎.

This is Ok.

xl-openai · 2026-04-17T01:36:56Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0d80dfc031

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-04-17T01:59:51Z

+    let Some(source_path) = resolve_supported_plugin_source_path(marketplace_path, &name, source)
+    else {
+        return Ok(None);
+    };


Enforce availability policy before skipping bad sources

find_installable_marketplace_plugin relies on find_marketplace_plugin, but matching entries are discarded when source resolution fails (Ok(None)). Policy checks (NOT_AVAILABLE/product restrictions) happen only after a surviving entry is returned, so a restricted first entry can be bypassed by a later duplicate with the same name. This can incorrectly allow installation instead of returning PluginNotAvailable.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-17T01:59:51Z

+    let Some(source_path) = resolve_supported_plugin_source_path(marketplace_path, &name, source)
+    else {
+        return Ok(None);
+    };


Check plugin policy before discarding unresolved sources

find_installable_marketplace_plugin enforces availability only after find_marketplace_plugin returns a resolved source. In resolve_marketplace_plugin_entry, invalid/unsupported sources return Ok(None) first, so a disallowed first duplicate entry can be skipped and a later installable duplicate accepted. This can bypass marketplace install/product restrictions for the same plugin name.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-17T01:59:51Z

@@ -214,6 +185,31 @@ pub fn resolve_marketplace_plugin(
    })


Preserve not-available errors for unresolved plugin entries

Matching entries with invalid/unsupported sources are silently skipped, and the function falls through to PluginNotFound. For install flows this misclassifies plugins that are present-but-not-installable as “not found,” changing behavior and confusing clients that rely on PluginNotAvailable to distinguish policy from typo/missing-plugin cases.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-17T01:59:51Z

 pub use codex_utils_plugins::mention_syntax;
 pub use codex_utils_plugins::plugin_namespace_for_skill_path;


Keep PLUGIN_MANIFEST_PATH in codex-plugin public API

This change removes the codex_plugin::PLUGIN_MANIFEST_PATH re-export, which is unrelated to alternate manifest discovery and introduces a breaking API change for downstream users. Crates importing that symbol will fail to compile after this commit even if they do not use the new alternate-path behavior.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-17T01:59:51Z

+    let Some(source_path) = resolve_supported_plugin_source_path(marketplace_path, &name, source)
+    else {
+        return Ok(None);
+    };


Check plugin policy before discarding unresolved sources

find_installable_marketplace_plugin enforces availability only after find_marketplace_plugin returns a resolved source. In resolve_marketplace_plugin_entry, invalid/unsupported sources return Ok(None), so a restricted first duplicate entry can be skipped and a later installable duplicate accepted. This can bypass marketplace install/product restrictions for the same plugin name.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-17T01:59:51Z

@@ -214,6 +185,31 @@ pub fn resolve_marketplace_plugin(
    })


Return not-available when matched entry is restricted

When a matched plugin entry is present but skipped due source resolution, find_marketplace_plugin falls through to PluginNotFound. For install paths this changes behavior from policy denial to “not found,” even when the plugin exists and is intentionally unavailable. Clients lose the ability to distinguish bad plugin names from policy-restricted plugins.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-17T01:59:51Z

 pub use codex_utils_plugins::mention_syntax;
 pub use codex_utils_plugins::plugin_namespace_for_skill_path;


Preserve PLUGIN_MANIFEST_PATH re-export for compatibility

This commit removes codex_plugin::PLUGIN_MANIFEST_PATH from the public API, which is a breaking change unrelated to alternate-manifest discovery. Downstream crates importing that symbol will fail to compile after this commit even if they do not use new functionality.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-17T01:59:51Z

+            Err(MarketplaceError::InvalidPlugin(message)) => {
+                warn!(
+                    path = %path.display(),
+                    marketplace = %marketplace.name,
+                    error = %message,
+                    "skipping invalid marketplace plugin"
+                );
+                continue;
+            }


Surface invalid plugin entries as marketplace load errors

load_marketplace now catches InvalidPlugin and silently skips that entry. A malformed marketplace can become empty without any marketplaceLoadErrors, making configuration bugs hard to detect and causing plugins to disappear without actionable errors.

Useful? React with 👍 / 👎.

xl-openai requested review from alexsong-oai and xli-oai April 16, 2026 19:26

xli-oai approved these changes Apr 16, 2026

View reviewed changes

alexsong-oai approved these changes Apr 16, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Apr 16, 2026

View reviewed changes

xl-openai force-pushed the xl/plugins branch 3 times, most recently from 201598a to f52a20c Compare April 17, 2026 00:57

xl-openai added 3 commits April 16, 2026 18:25

feat: Handle alternate plugin manifest paths

19b965a

Some improvement.

d025da0

plugin/list do not error on plugin.json

0d80dfc

xl-openai force-pushed the xl/plugins branch from f52a20c to 0d80dfc Compare April 17, 2026 01:25

chatgpt-codex-connector bot reviewed Apr 17, 2026

View reviewed changes

xl-openai merged commit 37161bc into main Apr 17, 2026
25 checks passed

xl-openai deleted the xl/plugins branch April 17, 2026 02:43

github-actions bot locked and limited conversation to collaborators Apr 17, 2026

		pub use codex_utils_plugins::mention_syntax;
		pub use codex_utils_plugins::plugin_namespace_for_skill_path;

Conversation

xl-openai commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alexsong-oai Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

xl-openai Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

xl-openai commented Apr 17, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

xl-openai Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

xl-openai Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

xl-openai Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

xl-openai Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

xl-openai commented Apr 16, 2026 •

edited

Loading

alexsong-oai Apr 16, 2026 •

edited

Loading