@nextclaw/server 0.5.1 → 0.5.3

package/dist/index.js

@@ -9,7 +9,7 @@ import { join } from "path";
 
 // src/ui/router.ts
 import { Hono } from "hono";
-import { SkillsLoader, getWorkspacePathFromConfig as getWorkspacePathFromConfig2 } from "@nextclaw/core";
+import * as NextclawCore from "@nextclaw/core";
 import { buildPluginStatusReport } from "@nextclaw/openclaw-compat";
 
 // src/ui/config.ts
@@ -572,12 +572,21 @@ function updateRuntime(configPath, patch) {
 // src/ui/router.ts
 var DEFAULT_MARKETPLACE_API_BASE = "https://marketplace-api.nextclaw.io";
 var NEXTCLAW_PLUGIN_NPM_PREFIX = "@nextclaw/channel-plugin-";
+var CLAWBAY_CHANNEL_PLUGIN_NPM_SPEC = "@clawbay/clawbay-channel";
 var BUILTIN_CHANNEL_PLUGIN_ID_PREFIX = "builtin-channel-";
 var MARKETPLACE_REMOTE_PAGE_SIZE = 100;
 var MARKETPLACE_REMOTE_MAX_PAGES = 20;
-function normalizeChannelPluginNpmSpec(rawSpec) {
+var getWorkspacePathFromConfig3 = NextclawCore.getWorkspacePathFromConfig;
+function createSkillsLoader(workspace) {
+  const ctor = NextclawCore.SkillsLoader;
+  if (!ctor) {
+    return null;
+  }
+  return new ctor(workspace);
+}
+function normalizePluginNpmSpec(rawSpec) {
   const spec = rawSpec.trim();
-  if (!spec.startsWith(NEXTCLAW_PLUGIN_NPM_PREFIX)) {
+  if (!spec.startsWith("@")) {
     return spec;
   }
   const versionDelimiterIndex = spec.lastIndexOf("@");
@@ -585,12 +594,19 @@ function normalizeChannelPluginNpmSpec(rawSpec) {
     return spec;
   }
   const packageName = spec.slice(0, versionDelimiterIndex).trim();
-  return packageName.startsWith(NEXTCLAW_PLUGIN_NPM_PREFIX) ? packageName : spec;
+  if (!packageName.includes("/")) {
+    return spec;
+  }
+  return packageName;
+}
+function isSupportedMarketplacePluginSpec(rawSpec) {
+  const spec = normalizePluginNpmSpec(rawSpec);
+  return spec.startsWith(NEXTCLAW_PLUGIN_NPM_PREFIX) || spec === CLAWBAY_CHANNEL_PLUGIN_NPM_SPEC;
 }
 function resolvePluginCanonicalSpec(params) {
   const rawInstallSpec = typeof params.installSpec === "string" ? params.installSpec.trim() : "";
   if (rawInstallSpec.length > 0) {
-    return normalizeChannelPluginNpmSpec(rawInstallSpec);
+    return normalizePluginNpmSpec(rawInstallSpec);
   }
   if (params.pluginId.startsWith(BUILTIN_CHANNEL_PLUGIN_ID_PREFIX)) {
     const channelSlug = params.pluginId.slice(BUILTIN_CHANNEL_PLUGIN_ID_PREFIX.length).trim();
@@ -648,7 +664,7 @@ function mergeInstalledPluginRecords(primary, secondary) {
 function dedupeInstalledPluginRecordsByCanonicalSpec(records) {
   const deduped = /* @__PURE__ */ new Map();
   for (const record of records) {
-    const canonicalSpec = normalizeChannelPluginNpmSpec(record.spec).trim();
+    const canonicalSpec = normalizePluginNpmSpec(record.spec).trim();
     if (!canonicalSpec) {
       continue;
     }
@@ -762,7 +778,7 @@ function collectMarketplaceInstalledView(options) {
   try {
     const pluginReport = buildPluginStatusReport({
       config,
-      workspaceDir: getWorkspacePathFromConfig2(config)
+      workspaceDir: getWorkspacePathFromConfig3(config)
     });
     discoveredPlugins = pluginReport.plugins;
   } catch {
@@ -852,10 +868,10 @@ function collectMarketplaceInstalledView(options) {
   }
   const dedupedPluginRecords = dedupeInstalledPluginRecordsByCanonicalSpec(pluginRecords);
   const pluginSpecSet = new Set(dedupedPluginRecords.map((record) => record.spec));
-  const workspacePath = getWorkspacePathFromConfig2(config);
-  const skillsLoader = new SkillsLoader(workspacePath);
-  const availableSkillSet = new Set(skillsLoader.listSkills(true).map((skill) => skill.name));
-  const listedSkills = skillsLoader.listSkills(false);
+  const workspacePath = getWorkspacePathFromConfig3(config);
+  const skillsLoader = createSkillsLoader(workspacePath);
+  const availableSkillSet = new Set((skillsLoader?.listSkills(true) ?? []).map((skill) => skill.name));
+  const listedSkills = skillsLoader?.listSkills(false) ?? [];
   const skillSpecSet = /* @__PURE__ */ new Set();
   const skillRecords = listedSkills.map((skill) => {
     const enabled = availableSkillSet.has(skill.name);
@@ -883,6 +899,29 @@ function collectMarketplaceInstalledView(options) {
     records
   };
 }
+function resolvePluginManageTargetId(options, rawTargetId) {
+  const targetId = rawTargetId.trim();
+  if (!targetId) {
+    return rawTargetId;
+  }
+  const normalizedTarget = normalizePluginNpmSpec(targetId).toLowerCase();
+  const installed = collectMarketplaceInstalledView(options);
+  const pluginRecords = installed.records.filter((record) => record.type === "plugin");
+  const lowerTargetId = targetId.toLowerCase();
+  for (const record of pluginRecords) {
+    const recordId = record.id?.trim();
+    if (recordId && recordId.toLowerCase() === lowerTargetId) {
+      return recordId;
+    }
+  }
+  for (const record of pluginRecords) {
+    const normalizedSpec = normalizePluginNpmSpec(record.spec).toLowerCase();
+    if (normalizedSpec === normalizedTarget && record.id && record.id.trim().length > 0) {
+      return record.id;
+    }
+  }
+  return targetId;
+}
 function sanitizeMarketplaceItem(item) {
   const next = { ...item };
   delete next.metrics;
@@ -900,12 +939,12 @@ function toPositiveInt(raw, fallback) {
 }
 function collectKnownSkillNames(options) {
   const config = loadConfigOrDefault(options.configPath);
-  const loader = new SkillsLoader(getWorkspacePathFromConfig2(config));
-  return new Set(loader.listSkills(false).map((skill) => skill.name));
+  const loader = createSkillsLoader(getWorkspacePathFromConfig3(config));
+  return new Set((loader?.listSkills(false) ?? []).map((skill) => skill.name));
 }
 function isSupportedMarketplaceItem(item, knownSkillNames) {
   if (item.type === "plugin") {
-    return item.install.kind === "npm" && item.install.spec.startsWith(NEXTCLAW_PLUGIN_NPM_PREFIX);
+    return item.install.kind === "npm" && isSupportedMarketplacePluginSpec(item.install.spec);
   }
   return item.install.kind === "builtin" && knownSkillNames.has(item.install.spec);
 }
@@ -982,7 +1021,8 @@ async function installMarketplaceItem(params) {
 async function manageMarketplaceItem(params) {
   const type = params.body.type;
   const action = params.body.action;
-  const targetId = typeof params.body.id === "string" && params.body.id.trim().length > 0 ? params.body.id.trim() : typeof params.body.spec === "string" && params.body.spec.trim().length > 0 ? params.body.spec.trim() : "";
+  const requestedTargetId = typeof params.body.id === "string" && params.body.id.trim().length > 0 ? params.body.id.trim() : typeof params.body.spec === "string" && params.body.spec.trim().length > 0 ? params.body.spec.trim() : "";
+  const targetId = type === "plugin" ? resolvePluginManageTargetId(params.options, requestedTargetId) : requestedTargetId;
   if (type !== "plugin" && type !== "skill" || action !== "enable" && action !== "disable" && action !== "uninstall" || !targetId) {
     throw new Error("INVALID_BODY:type, action and non-empty id/spec are required");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/server",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "private": false,
   "description": "Nextclaw UI/API server.",
   "type": "module",
@@ -15,10 +15,10 @@
   ],
   "dependencies": {
     "@hono/node-server": "^1.13.3",
-    "@nextclaw/openclaw-compat": "^0.1.20",
+    "@nextclaw/openclaw-compat": "^0.1.21",
     "hono": "^4.6.2",
     "ws": "^8.18.0",
-    "@nextclaw/core": "^0.6.27"
+    "@nextclaw/core": "^0.6.28"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",