From c6950367fb8070c05e10d0f6f5f9b96fd54025f3 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 16 Mar 2026 02:18:55 +0000
Subject: [PATCH] fix: allow plugin package id hints

---
 src/plugins/manifest-registry.test.ts | 17 +++++++++++++++++
 src/plugins/manifest-registry.ts      |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/plugins/manifest-registry.test.ts b/src/plugins/manifest-registry.test.ts
index 6f4c0353330..84e5f13fd98 100644
--- a/src/plugins/manifest-registry.test.ts
+++ b/src/plugins/manifest-registry.test.ts
@@ -331,6 +331,23 @@ describe("loadPluginManifestRegistry", () => {
     );
   });
 
+  it("accepts plugin-style id hints without warning", () => {
+    const dir = makeTempDir();
+    writeManifest(dir, { id: "brave", configSchema: { type: "object" } });
+
+    const registry = loadRegistry([
+      createPluginCandidate({
+        idHint: "brave-plugin",
+        rootDir: dir,
+        origin: "bundled",
+      }),
+    ]);
+
+    expect(registry.diagnostics.some((diag) => diag.message.includes("plugin id mismatch"))).toBe(
+      false,
+    );
+  });
+
   it("still warns for unrelated id hint mismatches", () => {
     const dir = makeTempDir();
     writeManifest(dir, { id: "openai", configSchema: { type: "object" } });
diff --git a/src/plugins/manifest-registry.ts b/src/plugins/manifest-registry.ts
index 2c24b87f541..4f43cff8e2b 100644
--- a/src/plugins/manifest-registry.ts
+++ b/src/plugins/manifest-registry.ts
@@ -131,7 +131,7 @@ function isCompatiblePluginIdHint(idHint: string | undefined, manifestId: string
   if (normalizedHint === manifestId) {
     return true;
   }
-  return normalizedHint === `${manifestId}-provider`;
+  return normalizedHint === `${manifestId}-provider` || normalizedHint === `${manifestId}-plugin`;
 }
 
 function buildRecord(params: {