fix(codex): match namespaced plugin ids

kevinslin · kevinslin · commit 430ae31d76e0 · 2026-05-07T17:06:48.000-07:00
diff --git a/extensions/codex/src/app-server/plugin-inventory.test.ts b/extensions/codex/src/app-server/plugin-inventory.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest";
 import { CodexAppInventoryCache } from "./app-inventory-cache.js";
 import { CODEX_PLUGINS_MARKETPLACE_NAME } from "./config.js";
-import { readCodexPluginInventory } from "./plugin-inventory.js";
+import { findOpenAiCuratedPluginSummary, readCodexPluginInventory } from "./plugin-inventory.js";
 import type { v2 } from "./protocol.js";
 
 describe("Codex plugin inventory", () => {
@@ -66,6 +66,70 @@ describe("Codex plugin inventory", () => {
     expect(calls).toEqual(["plugin/list", "plugin/read"]);
   });
 
+  it("matches namespaced curated plugin ids by normalized path segment", async () => {
+    const appCache = new CodexAppInventoryCache();
+    await appCache.refreshNow({
+      key: "runtime",
+      nowMs: 0,
+      request: async () => ({
+        data: [appInfo("github-app", true)],
+        nextCursor: null,
+      }),
+    });
+
+    const listed = pluginList([
+      pluginSummary("openai-curated/github", {
+        name: "GitHub",
+        installed: true,
+        enabled: true,
+      }),
+    ]);
+    expect(findOpenAiCuratedPluginSummary(listed, "github")?.summary.id).toBe(
+      "openai-curated/github",
+    );
+
+    const inventory = await readCodexPluginInventory({
+      pluginConfig: {
+        codexPlugins: {
+          enabled: true,
+          plugins: {
+            github: {
+              marketplaceName: CODEX_PLUGINS_MARKETPLACE_NAME,
+              pluginName: "github",
+            },
+          },
+        },
+      },
+      appCache,
+      appCacheKey: "runtime",
+      nowMs: 1,
+      request: async (method, params) => {
+        if (method === "plugin/list") {
+          return listed;
+        }
+        if (method === "plugin/read") {
+          expect(params).toMatchObject({
+            marketplacePath: "/marketplaces/openai-curated",
+            pluginName: "github",
+          });
+          return pluginDetail("github", [appSummary("github-app")]);
+        }
+        throw new Error(`unexpected request ${method}`);
+      },
+    });
+
+    expect(inventory.records).toHaveLength(1);
+    expect(inventory.records[0]).toMatchObject({
+      policy: { pluginName: "github" },
+      summary: { id: "openai-curated/github", installed: true, enabled: true },
+      appOwnership: "proven",
+      ownedAppIds: ["github-app"],
+    });
+    expect(inventory.diagnostics).not.toContainEqual(
+      expect.objectContaining({ code: "plugin_missing" }),
+    );
+  });
+
   it("fails closed when plugin detail apps are absent from app inventory", async () => {
     const appCache = new CodexAppInventoryCache();
     await appCache.refreshNow({
diff --git a/extensions/codex/src/app-server/plugin-inventory.ts b/extensions/codex/src/app-server/plugin-inventory.ts
@@ -320,10 +320,23 @@ function findPluginSummary(
     (plugin) =>
       plugin.name === pluginName ||
       plugin.id === pluginName ||
-      plugin.id === `${pluginName}@${marketplace.name}`,
+      plugin.id === `${pluginName}@${marketplace.name}` ||
+      pluginNameFromPluginId(plugin.id, marketplace.name) === pluginName,
   );
 }
 
+function pluginNameFromPluginId(pluginId: string, marketplaceName: string): string | undefined {
+  const trimmed = pluginId.trim();
+  if (!trimmed) {
+    return undefined;
+  }
+  const marketplaceSuffix = `@${marketplaceName}`;
+  const withoutMarketplaceSuffix = trimmed.endsWith(marketplaceSuffix)
+    ? trimmed.slice(0, -marketplaceSuffix.length)
+    : trimmed;
+  return withoutMarketplaceSuffix.split("/").at(-1)?.trim() || undefined;
+}
+
 function marketplaceRef(marketplace: v2.PluginMarketplaceEntry): CodexPluginMarketplaceRef {
   return {
     name: CODEX_PLUGINS_MARKETPLACE_NAME,
