From 6f933656e524a7ef466f09b89f654ff629ea460e Mon Sep 17 00:00:00 2001
From: Julyan <114902398+JulyanXu@users.noreply.github.com>
Date: Fri, 22 May 2026 16:58:56 +0800
Subject: [PATCH] fix: strip -plugin suffix in deriveIdHint to match manifest
 ids (#85170)

The deriveIdHint function already strips -provider from unscoped
package names (@openclaw/anthropic-provider -> anthropic) but does
not strip -plugin (@openclaw/xai-plugin -> xai-plugin instead of
xai). This causes ~30 spurious 'plugin id mismatch' warnings on
gateway startup for built-in plugins whose package names end in
-plugin.

Closes #85048
---
 src/plugins/discovery.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/discovery.ts b/src/plugins/discovery.ts
index 2eaa86daa86..5829fb0cd74 100644
--- a/src/plugins/discovery.ts
+++ b/src/plugins/discovery.ts
@@ -550,7 +550,9 @@ function deriveIdHint(params: {
   const normalizedPackageId =
     unscoped.endsWith("-provider") && unscoped.length > "-provider".length
       ? unscoped.slice(0, -"-provider".length)
-      : unscoped;
+      : unscoped.endsWith("-plugin") && unscoped.length > "-plugin".length
+        ? unscoped.slice(0, -"-plugin".length)
+        : unscoped;
 
   if (!params.hasMultipleExtensions) {
     return normalizedPackageId;