@nextclaw/server 0.10.35 → 0.10.37

package/dist/index.js

@@ -4019,13 +4019,6 @@ async function fetchAllMarketplaceItems(params) {
     }
   };
 }
-async function fetchAllPluginMarketplaceItems(params) {
-  return fetchAllMarketplaceItems({
-    baseUrl: params.baseUrl,
-    path: "/api/v1/plugins/items",
-    query: params.query
-  });
-}
 async function fetchAllSkillMarketplaceItems(params) {
   return fetchAllMarketplaceItems({
     baseUrl: params.baseUrl,
@@ -4259,7 +4252,7 @@ var McpMarketplaceController = class {
 
 // src/ui/router/marketplace/installed.ts
 import * as NextclawCore3 from "@nextclaw/core";
-import { buildPluginStatusReport } from "@nextclaw/openclaw-compat";
+import { discoverPluginStatusReport } from "@nextclaw/openclaw-compat";
 
 // src/ui/router/marketplace/spec.ts
 function normalizePluginNpmSpec(rawSpec) {
@@ -4373,54 +4366,67 @@ function createSkillsLoader(workspace) {
   }
   return new ctor(workspace);
 }
-function collectInstalledPluginRecords(options) {
-  const config = loadConfigOrDefault(options.configPath);
-  const pluginRecordsMap = config.plugins.installs ?? {};
-  const pluginEntries = config.plugins.entries ?? {};
-  const pluginRecords = [];
-  const seenPluginIds = /* @__PURE__ */ new Set();
-  let discoveredPlugins = [];
-  try {
-    const pluginReport = buildPluginStatusReport({
-      config,
-      workspaceDir: getWorkspacePathFromConfig3(config)
-    });
-    discoveredPlugins = pluginReport.plugins;
-  } catch {
-    discoveredPlugins = [];
+function readPluginStatusScore(plugin) {
+  if (plugin.status === "loaded") {
+    return 300;
   }
-  const readPluginPriority = (plugin) => {
-    const hasInstallRecord = Boolean(pluginRecordsMap[plugin.id]);
-    const statusScore = plugin.status === "loaded" ? 300 : plugin.status === "disabled" ? 200 : 100;
-    let originScore = 0;
-    if (hasInstallRecord) {
-      originScore = plugin.origin === "workspace" ? 40 : plugin.origin === "global" ? 30 : plugin.origin === "config" ? 20 : 10;
-    } else {
-      originScore = plugin.origin === "bundled" ? 40 : plugin.origin === "workspace" ? 30 : plugin.origin === "global" ? 20 : 10;
+  if (plugin.status === "disabled") {
+    return 200;
+  }
+  return 100;
+}
+function readPluginOriginScore(plugin, hasInstallRecord) {
+  if (hasInstallRecord) {
+    if (plugin.origin === "workspace") {
+      return 40;
     }
-    return statusScore + originScore;
-  };
+    if (plugin.origin === "global") {
+      return 30;
+    }
+    if (plugin.origin === "config") {
+      return 20;
+    }
+    return 10;
+  }
+  if (plugin.origin === "bundled") {
+    return 40;
+  }
+  if (plugin.origin === "workspace") {
+    return 30;
+  }
+  if (plugin.origin === "global") {
+    return 20;
+  }
+  return 10;
+}
+function readPluginPriority(plugin, installedPluginIds) {
+  return readPluginStatusScore(plugin) + readPluginOriginScore(plugin, installedPluginIds.has(plugin.id));
+}
+function buildDiscoveredPluginMap(params) {
   const discoveredById = /* @__PURE__ */ new Map();
-  for (const plugin of discoveredPlugins) {
+  for (const plugin of params.discoveredPlugins) {
     const existing = discoveredById.get(plugin.id);
     if (!existing) {
       discoveredById.set(plugin.id, plugin);
       continue;
     }
-    if (readPluginPriority(plugin) > readPluginPriority(existing)) {
+    if (readPluginPriority(plugin, params.installedPluginIds) > readPluginPriority(existing, params.installedPluginIds)) {
       discoveredById.set(plugin.id, plugin);
     }
   }
-  for (const plugin of discoveredById.values()) {
-    const installRecord = pluginRecordsMap[plugin.id];
-    const entry = pluginEntries[plugin.id];
+  return discoveredById;
+}
+function appendDiscoveredPluginRecords(params) {
+  for (const plugin of params.discoveredById.values()) {
+    const installRecord = params.pluginRecordsMap[plugin.id];
+    const entry = params.pluginEntries[plugin.id];
     const normalizedSpec = resolvePluginCanonicalSpec({
       pluginId: plugin.id,
       installSpec: installRecord?.spec
     });
     const enabled = entry?.enabled === false ? false : plugin.enabled;
     const runtimeStatus = entry?.enabled === false ? "disabled" : plugin.status;
-    pluginRecords.push({
+    params.pluginRecords.push({
       type: "plugin",
       id: plugin.id,
       spec: normalizedSpec,
@@ -4432,21 +4438,22 @@ function collectInstalledPluginRecords(options) {
       origin: plugin.origin,
       installPath: installRecord?.installPath
     });
-    seenPluginIds.add(plugin.id);
+    params.seenPluginIds.add(plugin.id);
   }
-  for (const [pluginId, installRecord] of Object.entries(pluginRecordsMap)) {
-    if (seenPluginIds.has(pluginId)) {
+}
+function appendInstalledOnlyPluginRecords(params) {
+  for (const [pluginId, installRecord] of Object.entries(params.pluginRecordsMap)) {
+    if (params.seenPluginIds.has(pluginId)) {
       continue;
     }
-    const normalizedSpec = resolvePluginCanonicalSpec({
-      pluginId,
-      installSpec: installRecord.spec
-    });
-    const entry = pluginEntries[pluginId];
-    pluginRecords.push({
+    const entry = params.pluginEntries[pluginId];
+    params.pluginRecords.push({
       type: "plugin",
       id: pluginId,
-      spec: normalizedSpec,
+      spec: resolvePluginCanonicalSpec({
+        pluginId,
+        installSpec: installRecord.spec
+      }),
       label: pluginId,
       source: installRecord.source,
       installedAt: installRecord.installedAt,
@@ -4454,23 +4461,87 @@ function collectInstalledPluginRecords(options) {
       runtimeStatus: entry?.enabled === false ? "disabled" : "unresolved",
       installPath: installRecord.installPath
     });
-    seenPluginIds.add(pluginId);
+    params.seenPluginIds.add(pluginId);
   }
-  for (const [pluginId, entry] of Object.entries(pluginEntries)) {
-    if (!seenPluginIds.has(pluginId)) {
-      const normalizedSpec = resolvePluginCanonicalSpec({ pluginId });
-      pluginRecords.push({
-        type: "plugin",
-        id: pluginId,
-        spec: normalizedSpec,
-        label: pluginId,
-        source: "config",
-        enabled: entry?.enabled !== false,
-        runtimeStatus: entry?.enabled === false ? "disabled" : "unresolved"
-      });
-      seenPluginIds.add(pluginId);
+}
+function appendConfigOnlyPluginRecords(params) {
+  for (const [pluginId, entry] of Object.entries(params.pluginEntries)) {
+    if (params.seenPluginIds.has(pluginId)) {
+      continue;
+    }
+    params.pluginRecords.push({
+      type: "plugin",
+      id: pluginId,
+      spec: resolvePluginCanonicalSpec({ pluginId }),
+      label: pluginId,
+      source: "config",
+      enabled: entry?.enabled !== false,
+      runtimeStatus: entry?.enabled === false ? "disabled" : "unresolved"
+    });
+    params.seenPluginIds.add(pluginId);
+  }
+}
+function findPluginIdByExactId(pluginRecords, lowerTargetId) {
+  for (const record of pluginRecords) {
+    const recordId = record.id?.trim();
+    if (recordId && recordId.toLowerCase() === lowerTargetId) {
+      return recordId;
+    }
+  }
+  return void 0;
+}
+function findPluginIdByNormalizedSpec(pluginRecords, normalizedSpec) {
+  if (!normalizedSpec) {
+    return void 0;
+  }
+  for (const record of pluginRecords) {
+    const recordId = record.id?.trim();
+    if (!recordId) {
+      continue;
     }
+    const normalizedRecordSpec = normalizePluginNpmSpec(record.spec).toLowerCase();
+    if (normalizedRecordSpec === normalizedSpec) {
+      return recordId;
+    }
+  }
+  return void 0;
+}
+function collectInstalledPluginRecords(options) {
+  const config = loadConfigOrDefault(options.configPath);
+  const pluginRecordsMap = config.plugins.installs ?? {};
+  const pluginEntries = config.plugins.entries ?? {};
+  const pluginRecords = [];
+  const seenPluginIds = /* @__PURE__ */ new Set();
+  const installedPluginIds = new Set(Object.keys(pluginRecordsMap));
+  let discoveredPlugins = [];
+  try {
+    const pluginReport = discoverPluginStatusReport({
+      config,
+      workspaceDir: getWorkspacePathFromConfig3(config)
+    });
+    discoveredPlugins = pluginReport.plugins;
+  } catch {
+    discoveredPlugins = [];
   }
+  const discoveredById = buildDiscoveredPluginMap({ discoveredPlugins, installedPluginIds });
+  appendDiscoveredPluginRecords({
+    discoveredById,
+    pluginRecordsMap,
+    pluginEntries,
+    pluginRecords,
+    seenPluginIds
+  });
+  appendInstalledOnlyPluginRecords({
+    pluginRecordsMap,
+    pluginEntries,
+    pluginRecords,
+    seenPluginIds
+  });
+  appendConfigOnlyPluginRecords({
+    pluginEntries,
+    pluginRecords,
+    seenPluginIds
+  });
   const dedupedPluginRecords = dedupeInstalledPluginRecordsByCanonicalSpec(pluginRecords);
   dedupedPluginRecords.sort((left, right) => {
     return left.spec.localeCompare(right.spec);
@@ -4535,27 +4606,17 @@ function resolvePluginManageTargetId(options, rawTargetId, rawSpec) {
   const normalizedSpec = rawSpec ? normalizePluginNpmSpec(rawSpec).toLowerCase() : "";
   const pluginRecords = collectInstalledPluginRecords(options).records;
   const lowerTargetId = targetId.toLowerCase();
-  for (const record of pluginRecords) {
-    const recordId = record.id?.trim();
-    if (recordId && recordId.toLowerCase() === lowerTargetId) {
-      return recordId;
-    }
+  const matchedRecordId = findPluginIdByExactId(pluginRecords, lowerTargetId);
+  if (matchedRecordId) {
+    return matchedRecordId;
   }
-  if (normalizedTarget) {
-    for (const record of pluginRecords) {
-      const normalizedRecordSpec = normalizePluginNpmSpec(record.spec).toLowerCase();
-      if (normalizedRecordSpec === normalizedTarget && record.id && record.id.trim().length > 0) {
-        return record.id;
-      }
-    }
+  const matchedByTargetSpec = findPluginIdByNormalizedSpec(pluginRecords, normalizedTarget);
+  if (matchedByTargetSpec) {
+    return matchedByTargetSpec;
   }
-  if (normalizedSpec && normalizedSpec !== normalizedTarget) {
-    for (const record of pluginRecords) {
-      const normalizedRecordSpec = normalizePluginNpmSpec(record.spec).toLowerCase();
-      if (normalizedRecordSpec === normalizedSpec && record.id && record.id.trim().length > 0) {
-        return record.id;
-      }
-    }
+  const matchedByRawSpec = normalizedSpec && normalizedSpec !== normalizedTarget ? findPluginIdByNormalizedSpec(pluginRecords, normalizedSpec) : void 0;
+  if (matchedByRawSpec) {
+    return matchedByRawSpec;
   }
   return targetId || rawSpec || rawTargetId;
 }
@@ -4724,8 +4785,9 @@ var PluginMarketplaceController = class {
   };
   listItems = async (c) => {
     const query = c.req.query();
-    const result = await fetchAllPluginMarketplaceItems({
+    const result = await fetchMarketplaceData({
       baseUrl: this.marketplaceBaseUrl,
+      path: "/api/v1/plugins/items",
       query: {
         q: query.q,
         tag: query.tag,
@@ -4737,19 +4799,15 @@ var PluginMarketplaceController = class {
     if (!result.ok) {
       return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
     }
-    const filteredItems = sanitizeMarketplaceListItems(result.data.items).map((item) => normalizeMarketplaceItemForUi(item)).filter((item) => isSupportedMarketplacePluginItem(item));
-    const pageSize = Math.min(100, toPositiveInt(query.pageSize, 20));
-    const requestedPage = toPositiveInt(query.page, 1);
-    const totalPages = filteredItems.length === 0 ? 0 : Math.ceil(filteredItems.length / pageSize);
-    const currentPage = totalPages === 0 ? 1 : Math.min(requestedPage, totalPages);
+    const items = sanitizeMarketplaceListItems(result.data.items).map((item) => normalizeMarketplaceItemForUi(item)).filter((item) => isSupportedMarketplacePluginItem(item));
     return c.json(ok({
-      total: filteredItems.length,
-      page: currentPage,
-      pageSize,
-      totalPages,
+      total: result.data.total,
+      page: result.data.page,
+      pageSize: result.data.pageSize,
+      totalPages: result.data.totalPages,
       sort: result.data.sort,
       query: result.data.query,
-      items: filteredItems.slice((currentPage - 1) * pageSize, currentPage * pageSize)
+      items
     }));
   };
   getItem = async (c) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/server",
-  "version": "0.10.35",
+  "version": "0.10.37",
   "private": false,
   "description": "Nextclaw UI/API server.",
   "type": "module",
@@ -18,12 +18,12 @@
     "@hono/node-server": "^1.13.3",
     "hono": "^4.6.2",
     "ws": "^8.18.0",
-    "@nextclaw/mcp": "0.1.31",
-    "@nextclaw/ncp": "0.3.2",
+    "@nextclaw/mcp": "0.1.33",
     "@nextclaw/ncp-http-agent-server": "0.3.2",
-    "@nextclaw/runtime": "0.2.12",
-    "@nextclaw/openclaw-compat": "0.3.18",
-    "@nextclaw/core": "0.9.12"
+    "@nextclaw/ncp": "0.3.2",
+    "@nextclaw/core": "0.10.0",
+    "@nextclaw/openclaw-compat": "0.3.19",
+    "@nextclaw/runtime": "0.2.13"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",