@nextclaw/server 0.5.0 → 0.5.2

package/dist/index.d.ts

@@ -215,17 +215,13 @@ type ConfigActionExecuteResult = {
     nextActions?: string[];
 };
 type MarketplaceItemType = "plugin" | "skill";
-type MarketplaceSort = "relevance" | "updated" | "downloads";
-type MarketplaceInstallKind = "npm" | "clawhub" | "git";
+type MarketplaceSort = "relevance" | "updated";
+type MarketplaceInstallKind = "npm" | "clawhub" | "git" | "builtin";
 type MarketplaceInstallSpec = {
     kind: MarketplaceInstallKind;
     spec: string;
     command: string;
 };
-type MarketplaceItemMetrics = {
-    downloads30d?: number;
-    stars?: number;
-};
 type MarketplaceItemSummary = {
     id: string;
     slug: string;
@@ -235,7 +231,6 @@ type MarketplaceItemSummary = {
     tags: string[];
     author: string;
     install: MarketplaceInstallSpec;
-    metrics?: MarketplaceItemMetrics;
     updatedAt: string;
 };
 type MarketplaceItemView = MarketplaceItemSummary & {
@@ -262,10 +257,15 @@ type MarketplaceRecommendationView = {
 };
 type MarketplaceInstalledRecord = {
     type: MarketplaceItemType;
+    id?: string;
     spec: string;
     label?: string;
     source?: string;
     installedAt?: string;
+    enabled?: boolean;
+    runtimeStatus?: string;
+    origin?: string;
+    installPath?: string;
 };
 type MarketplaceInstalledView = {
     total: number;
@@ -276,6 +276,7 @@ type MarketplaceInstalledView = {
 type MarketplaceInstallRequest = {
     type: MarketplaceItemType;
     spec: string;
+    kind?: MarketplaceInstallKind;
     version?: string;
     registry?: string;
     force?: boolean;
@@ -288,10 +289,25 @@ type MarketplaceInstallResult = {
 };
 type MarketplaceInstallSkillParams = {
     slug: string;
+    kind?: MarketplaceInstallKind;
     version?: string;
     registry?: string;
     force?: boolean;
 };
+type MarketplaceManageAction = "enable" | "disable" | "uninstall";
+type MarketplaceManageRequest = {
+    type: MarketplaceItemType;
+    action: MarketplaceManageAction;
+    id?: string;
+    spec?: string;
+};
+type MarketplaceManageResult = {
+    type: MarketplaceItemType;
+    action: MarketplaceManageAction;
+    id: string;
+    message: string;
+    output?: string;
+};
 type MarketplaceInstaller = {
     installPlugin?: (spec: string) => Promise<{
         message: string;
@@ -301,6 +317,22 @@ type MarketplaceInstaller = {
         message: string;
         output?: string;
     }>;
+    enablePlugin?: (id: string) => Promise<{
+        message: string;
+        output?: string;
+    }>;
+    disablePlugin?: (id: string) => Promise<{
+        message: string;
+        output?: string;
+    }>;
+    uninstallPlugin?: (id: string) => Promise<{
+        message: string;
+        output?: string;
+    }>;
+    uninstallSkill?: (slug: string) => Promise<{
+        message: string;
+        output?: string;
+    }>;
 };
 type MarketplaceApiConfig = {
     apiBaseUrl?: string;
@@ -378,4 +410,4 @@ declare function patchSession(configPath: string, key: string, patch: SessionPat
 declare function deleteSession(configPath: string, key: string): boolean;
 declare function updateRuntime(configPath: string, patch: RuntimeConfigUpdate): Pick<ConfigView, "agents" | "bindings" | "session">;
 
-export { type AgentBindingView, type AgentProfileView, type ApiError, type ApiResponse, type BindingPeerView, type ChannelSpecView, type ConfigActionExecuteRequest, type ConfigActionExecuteResult, type ConfigActionManifest, type ConfigActionType, type ConfigMetaView, type ConfigSchemaResponse, type ConfigUiHint, type ConfigUiHints, type ConfigView, type MarketplaceApiConfig, type MarketplaceInstallKind, type MarketplaceInstallRequest, type MarketplaceInstallResult, type MarketplaceInstallSkillParams, type MarketplaceInstallSpec, type MarketplaceInstalledRecord, type MarketplaceInstalledView, type MarketplaceInstaller, type MarketplaceItemMetrics, type MarketplaceItemSummary, type MarketplaceItemType, type MarketplaceItemView, type MarketplaceListView, type MarketplaceRecommendationView, type MarketplaceSort, type ProviderConfigUpdate, type ProviderConfigView, type ProviderSpecView, type RuntimeConfigUpdate, type SessionConfigView, type SessionEntryView, type SessionHistoryView, type SessionMessageView, type SessionPatchUpdate, type SessionsListView, type UiServerEvent, type UiServerHandle, type UiServerOptions, buildConfigMeta, buildConfigSchemaView, buildConfigView, createUiRouter, deleteSession, executeConfigAction, getSessionHistory, listSessions, loadConfigOrDefault, patchSession, startUiServer, updateChannel, updateModel, updateProvider, updateRuntime };
+export { type AgentBindingView, type AgentProfileView, type ApiError, type ApiResponse, type BindingPeerView, type ChannelSpecView, type ConfigActionExecuteRequest, type ConfigActionExecuteResult, type ConfigActionManifest, type ConfigActionType, type ConfigMetaView, type ConfigSchemaResponse, type ConfigUiHint, type ConfigUiHints, type ConfigView, type MarketplaceApiConfig, type MarketplaceInstallKind, type MarketplaceInstallRequest, type MarketplaceInstallResult, type MarketplaceInstallSkillParams, type MarketplaceInstallSpec, type MarketplaceInstalledRecord, type MarketplaceInstalledView, type MarketplaceInstaller, type MarketplaceItemSummary, type MarketplaceItemType, type MarketplaceItemView, type MarketplaceListView, type MarketplaceManageAction, type MarketplaceManageRequest, type MarketplaceManageResult, type MarketplaceRecommendationView, type MarketplaceSort, type ProviderConfigUpdate, type ProviderConfigView, type ProviderSpecView, type RuntimeConfigUpdate, type SessionConfigView, type SessionEntryView, type SessionHistoryView, type SessionMessageView, type SessionPatchUpdate, type SessionsListView, type UiServerEvent, type UiServerHandle, type UiServerOptions, buildConfigMeta, buildConfigSchemaView, buildConfigView, createUiRouter, deleteSession, executeConfigAction, getSessionHistory, listSessions, loadConfigOrDefault, patchSession, startUiServer, updateChannel, updateModel, updateProvider, updateRuntime };

package/dist/index.js

@@ -3,13 +3,14 @@ import { Hono as Hono2 } from "hono";
 import { cors } from "hono/cors";
 import { serve } from "@hono/node-server";
 import { WebSocketServer, WebSocket } from "ws";
-import { existsSync as existsSync2, readFileSync } from "fs";
+import { existsSync, readFileSync } from "fs";
 import { readFile, stat } from "fs/promises";
-import { join as join2 } from "path";
+import { join } from "path";
 
 // src/ui/router.ts
 import { Hono } from "hono";
-import { expandHome } from "@nextclaw/core";
+import * as NextclawCore from "@nextclaw/core";
+import { buildPluginStatusReport } from "@nextclaw/openclaw-compat";
 
 // src/ui/config.ts
 import {
@@ -569,9 +570,121 @@ function updateRuntime(configPath, patch) {
 }
 
 // src/ui/router.ts
-import { existsSync, readdirSync } from "fs";
-import { join, resolve } from "path";
-var DEFAULT_MARKETPLACE_API_BASE = "https://nextclaw-marketplace-api.15353764479037.workers.dev";
+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;
+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("@")) {
+    return spec;
+  }
+  const versionDelimiterIndex = spec.lastIndexOf("@");
+  if (versionDelimiterIndex <= 0) {
+    return spec;
+  }
+  const packageName = spec.slice(0, versionDelimiterIndex).trim();
+  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 normalizePluginNpmSpec(rawInstallSpec);
+  }
+  if (params.pluginId.startsWith(BUILTIN_CHANNEL_PLUGIN_ID_PREFIX)) {
+    const channelSlug = params.pluginId.slice(BUILTIN_CHANNEL_PLUGIN_ID_PREFIX.length).trim();
+    if (channelSlug.length > 0) {
+      return `${NEXTCLAW_PLUGIN_NPM_PREFIX}${channelSlug}`;
+    }
+  }
+  return params.pluginId;
+}
+function readPluginRuntimeStatusPriority(status) {
+  if (status === "loaded") {
+    return 400;
+  }
+  if (status === "disabled") {
+    return 300;
+  }
+  if (status === "unresolved") {
+    return 200;
+  }
+  return 100;
+}
+function readPluginOriginPriority(origin) {
+  if (origin === "bundled") {
+    return 80;
+  }
+  if (origin === "workspace") {
+    return 70;
+  }
+  if (origin === "global") {
+    return 60;
+  }
+  if (origin === "config") {
+    return 50;
+  }
+  return 10;
+}
+function readInstalledPluginRecordPriority(record) {
+  const installScore = record.installPath ? 20 : 0;
+  const timestampScore = record.installedAt ? 10 : 0;
+  return readPluginRuntimeStatusPriority(record.runtimeStatus) + readPluginOriginPriority(record.origin) + installScore + timestampScore;
+}
+function mergeInstalledPluginRecords(primary, secondary) {
+  return {
+    ...primary,
+    id: primary.id ?? secondary.id,
+    label: primary.label ?? secondary.label,
+    source: primary.source ?? secondary.source,
+    installedAt: primary.installedAt ?? secondary.installedAt,
+    enabled: primary.enabled ?? secondary.enabled,
+    runtimeStatus: primary.runtimeStatus ?? secondary.runtimeStatus,
+    origin: primary.origin ?? secondary.origin,
+    installPath: primary.installPath ?? secondary.installPath
+  };
+}
+function dedupeInstalledPluginRecordsByCanonicalSpec(records) {
+  const deduped = /* @__PURE__ */ new Map();
+  for (const record of records) {
+    const canonicalSpec = normalizePluginNpmSpec(record.spec).trim();
+    if (!canonicalSpec) {
+      continue;
+    }
+    const key = canonicalSpec.toLowerCase();
+    const normalizedRecord = { ...record, spec: canonicalSpec };
+    const existing = deduped.get(key);
+    if (!existing) {
+      deduped.set(key, normalizedRecord);
+      continue;
+    }
+    const normalizedScore = readInstalledPluginRecordPriority(normalizedRecord);
+    const existingScore = readInstalledPluginRecordPriority(existing);
+    if (normalizedScore > existingScore) {
+      deduped.set(key, mergeInstalledPluginRecords(normalizedRecord, existing));
+      continue;
+    }
+    deduped.set(key, mergeInstalledPluginRecords(existing, normalizedRecord));
+  }
+  return Array.from(deduped.values());
+}
 function ok(data) {
   return { ok: true, data };
 }
@@ -658,56 +771,122 @@ async function fetchMarketplaceData(params) {
 function collectMarketplaceInstalledView(options) {
   const config = loadConfigOrDefault(options.configPath);
   const pluginRecordsMap = config.plugins.installs ?? {};
+  const pluginEntries = config.plugins.entries ?? {};
   const pluginRecords = [];
-  const pluginSpecSet = /* @__PURE__ */ new Set();
+  const seenPluginIds = /* @__PURE__ */ new Set();
+  let discoveredPlugins = [];
+  try {
+    const pluginReport = buildPluginStatusReport({
+      config,
+      workspaceDir: getWorkspacePathFromConfig3(config)
+    });
+    discoveredPlugins = pluginReport.plugins;
+  } catch {
+    discoveredPlugins = [];
+  }
+  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;
+    }
+    return statusScore + originScore;
+  };
+  const discoveredById = /* @__PURE__ */ new Map();
+  for (const plugin of discoveredPlugins) {
+    const existing = discoveredById.get(plugin.id);
+    if (!existing) {
+      discoveredById.set(plugin.id, plugin);
+      continue;
+    }
+    if (readPluginPriority(plugin) > readPluginPriority(existing)) {
+      discoveredById.set(plugin.id, plugin);
+    }
+  }
+  for (const plugin of discoveredById.values()) {
+    const installRecord = pluginRecordsMap[plugin.id];
+    const entry = 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({
+      type: "plugin",
+      id: plugin.id,
+      spec: normalizedSpec,
+      label: plugin.name && plugin.name.trim().length > 0 ? plugin.name : plugin.id,
+      source: plugin.source,
+      installedAt: installRecord?.installedAt,
+      enabled,
+      runtimeStatus,
+      origin: plugin.origin,
+      installPath: installRecord?.installPath
+    });
+    seenPluginIds.add(plugin.id);
+  }
   for (const [pluginId, installRecord] of Object.entries(pluginRecordsMap)) {
-    const normalizedSpec = typeof installRecord.spec === "string" && installRecord.spec.trim().length > 0 ? installRecord.spec.trim() : pluginId;
+    if (seenPluginIds.has(pluginId)) {
+      continue;
+    }
+    const normalizedSpec = resolvePluginCanonicalSpec({
+      pluginId,
+      installSpec: installRecord.spec
+    });
+    const entry = pluginEntries[pluginId];
     pluginRecords.push({
       type: "plugin",
+      id: pluginId,
       spec: normalizedSpec,
       label: pluginId,
       source: installRecord.source,
-      installedAt: installRecord.installedAt
+      installedAt: installRecord.installedAt,
+      enabled: entry?.enabled !== false,
+      runtimeStatus: entry?.enabled === false ? "disabled" : "unresolved",
+      installPath: installRecord.installPath
     });
-    pluginSpecSet.add(normalizedSpec);
+    seenPluginIds.add(pluginId);
   }
-  const pluginEntries = config.plugins.entries ?? {};
-  for (const pluginId of Object.keys(pluginEntries)) {
-    if (!pluginSpecSet.has(pluginId)) {
+  for (const [pluginId, entry] of Object.entries(pluginEntries)) {
+    if (!seenPluginIds.has(pluginId)) {
+      const normalizedSpec = resolvePluginCanonicalSpec({ pluginId });
       pluginRecords.push({
         type: "plugin",
-        spec: pluginId,
+        id: pluginId,
+        spec: normalizedSpec,
         label: pluginId,
-        source: "config"
+        source: "config",
+        enabled: entry?.enabled !== false,
+        runtimeStatus: entry?.enabled === false ? "disabled" : "unresolved"
       });
-      pluginSpecSet.add(pluginId);
+      seenPluginIds.add(pluginId);
     }
   }
-  const workspacePath = resolve(expandHome(config.agents.defaults.workspace));
-  const skillsPath = join(workspacePath, "skills");
+  const dedupedPluginRecords = dedupeInstalledPluginRecordsByCanonicalSpec(pluginRecords);
+  const pluginSpecSet = new Set(dedupedPluginRecords.map((record) => record.spec));
+  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 = [];
-  if (existsSync(skillsPath)) {
-    const entries = readdirSync(skillsPath, { withFileTypes: true });
-    for (const entry of entries) {
-      if (!entry.isDirectory()) {
-        continue;
-      }
-      const skillSlug = entry.name;
-      const skillFile = join(skillsPath, skillSlug, "SKILL.md");
-      if (!existsSync(skillFile)) {
-        continue;
-      }
-      skillRecords.push({
-        type: "skill",
-        spec: skillSlug,
-        label: skillSlug,
-        source: "workspace"
-      });
-      skillSpecSet.add(skillSlug);
-    }
-  }
-  const records = [...pluginRecords, ...skillRecords].sort((left, right) => {
+  const skillRecords = listedSkills.map((skill) => {
+    const enabled = availableSkillSet.has(skill.name);
+    skillSpecSet.add(skill.name);
+    return {
+      type: "skill",
+      id: skill.name,
+      spec: skill.name,
+      label: skill.name,
+      source: skill.source,
+      enabled,
+      runtimeStatus: enabled ? "enabled" : "disabled"
+    };
+  });
+  const records = [...dedupedPluginRecords, ...skillRecords].sort((left, right) => {
     if (left.type !== right.type) {
       return left.type.localeCompare(right.type);
     }
@@ -720,6 +899,66 @@ function collectMarketplaceInstalledView(options) {
     records
   };
 }
+function sanitizeMarketplaceItem(item) {
+  const next = { ...item };
+  delete next.metrics;
+  return next;
+}
+function toPositiveInt(raw, fallback) {
+  if (!raw) {
+    return fallback;
+  }
+  const parsed = Number.parseInt(raw, 10);
+  if (!Number.isFinite(parsed) || parsed <= 0) {
+    return fallback;
+  }
+  return parsed;
+}
+function collectKnownSkillNames(options) {
+  const config = loadConfigOrDefault(options.configPath);
+  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" && isSupportedMarketplacePluginSpec(item.install.spec);
+  }
+  return item.install.kind === "builtin" && knownSkillNames.has(item.install.spec);
+}
+async function fetchAllMarketplaceItems(params) {
+  const allItems = [];
+  let remotePage = 1;
+  let remoteTotalPages = 1;
+  let sort = "relevance";
+  let query;
+  while (remotePage <= remoteTotalPages && remotePage <= MARKETPLACE_REMOTE_MAX_PAGES) {
+    const result = await fetchMarketplaceData({
+      baseUrl: params.baseUrl,
+      path: "/api/v1/items",
+      query: {
+        ...params.query,
+        page: String(remotePage),
+        pageSize: String(MARKETPLACE_REMOTE_PAGE_SIZE)
+      }
+    });
+    if (!result.ok) {
+      return result;
+    }
+    allItems.push(...result.data.items);
+    remoteTotalPages = result.data.totalPages;
+    sort = result.data.sort;
+    query = result.data.query;
+    remotePage += 1;
+  }
+  return {
+    ok: true,
+    data: {
+      sort,
+      query,
+      items: allItems
+    }
+  };
+}
 async function installMarketplaceItem(params) {
   const type = params.body.type;
   const spec = typeof params.body.spec === "string" ? params.body.spec.trim() : "";
@@ -742,6 +981,7 @@ async function installMarketplaceItem(params) {
     }
     result = await installer.installSkill({
       slug: spec,
+      kind: params.body.kind,
       version: params.body.version,
       registry: params.body.registry,
       force: params.body.force
@@ -755,15 +995,61 @@ async function installMarketplaceItem(params) {
     output: result.output
   };
 }
+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() : "";
+  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");
+  }
+  const installer = params.options.marketplace?.installer;
+  if (!installer) {
+    throw new Error("NOT_AVAILABLE:marketplace installer is not configured");
+  }
+  let result;
+  if (type === "plugin") {
+    if (action === "enable") {
+      if (!installer.enablePlugin) {
+        throw new Error("NOT_AVAILABLE:plugin enable is not configured");
+      }
+      result = await installer.enablePlugin(targetId);
+    } else if (action === "disable") {
+      if (!installer.disablePlugin) {
+        throw new Error("NOT_AVAILABLE:plugin disable is not configured");
+      }
+      result = await installer.disablePlugin(targetId);
+    } else {
+      if (!installer.uninstallPlugin) {
+        throw new Error("NOT_AVAILABLE:plugin uninstall is not configured");
+      }
+      result = await installer.uninstallPlugin(targetId);
+    }
+  } else {
+    if (action !== "uninstall") {
+      throw new Error("NOT_AVAILABLE:skill only supports uninstall action");
+    }
+    if (!installer.uninstallSkill) {
+      throw new Error("NOT_AVAILABLE:skill uninstall is not configured");
+    }
+    result = await installer.uninstallSkill(targetId);
+  }
+  params.options.publish({ type: "config.updated", payload: { path: type === "plugin" ? "plugins" : "skills" } });
+  return {
+    type,
+    action,
+    id: targetId,
+    message: result.message,
+    output: result.output
+  };
+}
 function registerMarketplaceRoutes(app, options, marketplaceBaseUrl) {
   app.get("/api/marketplace/installed", (c) => {
     return c.json(ok(collectMarketplaceInstalledView(options)));
   });
   app.get("/api/marketplace/items", async (c) => {
     const query = c.req.query();
-    const result = await fetchMarketplaceData({
+    const result = await fetchAllMarketplaceItems({
       baseUrl: marketplaceBaseUrl,
-      path: "/api/v1/items",
       query: {
         q: query.q,
         type: query.type,
@@ -776,7 +1062,21 @@ function registerMarketplaceRoutes(app, options, marketplaceBaseUrl) {
     if (!result.ok) {
       return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
     }
-    return c.json(ok(result.data));
+    const knownSkillNames = collectKnownSkillNames(options);
+    const filteredItems = result.data.items.map((item) => sanitizeMarketplaceItem(item)).filter((item) => isSupportedMarketplaceItem(item, knownSkillNames));
+    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);
+    return c.json(ok({
+      total: filteredItems.length,
+      page: currentPage,
+      pageSize,
+      totalPages,
+      sort: result.data.sort,
+      query: result.data.query,
+      items: filteredItems.slice((currentPage - 1) * pageSize, currentPage * pageSize)
+    }));
   });
   app.get("/api/marketplace/items/:slug", async (c) => {
     const slug = encodeURIComponent(c.req.param("slug"));
@@ -791,7 +1091,12 @@ function registerMarketplaceRoutes(app, options, marketplaceBaseUrl) {
     if (!result.ok) {
       return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
     }
-    return c.json(ok(result.data));
+    const knownSkillNames = collectKnownSkillNames(options);
+    const sanitized = sanitizeMarketplaceItem(result.data);
+    if (!isSupportedMarketplaceItem(sanitized, knownSkillNames)) {
+      return c.json(err("NOT_FOUND", "marketplace item not supported by nextclaw"), 404);
+    }
+    return c.json(ok(sanitized));
   });
   app.get("/api/marketplace/recommendations", async (c) => {
     const query = c.req.query();
@@ -806,7 +1111,13 @@ function registerMarketplaceRoutes(app, options, marketplaceBaseUrl) {
     if (!result.ok) {
       return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
     }
-    return c.json(ok(result.data));
+    const knownSkillNames = collectKnownSkillNames(options);
+    const filteredItems = result.data.items.map((item) => sanitizeMarketplaceItem(item)).filter((item) => isSupportedMarketplaceItem(item, knownSkillNames));
+    return c.json(ok({
+      ...result.data,
+      total: filteredItems.length,
+      items: filteredItems
+    }));
   });
   app.post("/api/marketplace/install", async (c) => {
     const body = await readJson(c.req.raw);
@@ -827,6 +1138,25 @@ function registerMarketplaceRoutes(app, options, marketplaceBaseUrl) {
       return c.json(err("INSTALL_FAILED", message), 400);
     }
   });
+  app.post("/api/marketplace/manage", async (c) => {
+    const body = await readJson(c.req.raw);
+    if (!body.ok || !body.data || typeof body.data !== "object") {
+      return c.json(err("INVALID_BODY", "invalid json body"), 400);
+    }
+    try {
+      const payload = await manageMarketplaceItem({ options, body: body.data });
+      return c.json(ok(payload));
+    } catch (error) {
+      const message = String(error);
+      if (message.startsWith("INVALID_BODY:")) {
+        return c.json(err("INVALID_BODY", message.slice("INVALID_BODY:".length)), 400);
+      }
+      if (message.startsWith("NOT_AVAILABLE:")) {
+        return c.json(err("NOT_AVAILABLE", message.slice("NOT_AVAILABLE:".length)), 503);
+      }
+      return c.json(err("MANAGE_FAILED", message), 400);
+    }
+  });
 }
 function createUiRouter(options) {
   const app = new Hono();
@@ -1003,13 +1333,13 @@ function startUiServer(options) {
     })
   );
   const staticDir = options.staticDir;
-  if (staticDir && existsSync2(join2(staticDir, "index.html"))) {
-    const indexHtml = readFileSync(join2(staticDir, "index.html"), "utf-8");
+  if (staticDir && existsSync(join(staticDir, "index.html"))) {
+    const indexHtml = readFileSync(join(staticDir, "index.html"), "utf-8");
     app.use(
       "/*",
       serveStatic({
         root: staticDir,
-        join: join2,
+        join,
         getContent: async (path) => {
           try {
             return await readFile(path);
@@ -1051,9 +1381,9 @@ function startUiServer(options) {
     host: options.host,
     port: options.port,
     publish,
-    close: () => new Promise((resolve2) => {
+    close: () => new Promise((resolve) => {
       wss.close(() => {
-        server.close(() => resolve2());
+        server.close(() => resolve());
       });
     })
   };

package/package.json

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