@nextclaw/server 0.5.10 → 0.5.11

package/dist/index.d.ts

@@ -318,9 +318,9 @@ type MarketplaceInstalledRecord = {
     installPath?: string;
 };
 type MarketplaceInstalledView = {
+    type: MarketplaceItemType;
     total: number;
-    pluginSpecs: string[];
-    skillSpecs: string[];
+    specs: string[];
     records: MarketplaceInstalledRecord[];
 };
 type MarketplaceInstallRequest = {

package/dist/index.js

@@ -801,7 +801,7 @@ async function fetchMarketplaceData(params) {
     };
   }
 }
-function collectMarketplaceInstalledView(options) {
+function collectInstalledPluginRecords(options) {
   const config = loadConfigOrDefault(options.configPath);
   const pluginRecordsMap = config.plugins.installs ?? {};
   const pluginEntries = config.plugins.entries ?? {};
@@ -900,15 +900,22 @@ function collectMarketplaceInstalledView(options) {
     }
   }
   const dedupedPluginRecords = dedupeInstalledPluginRecordsByCanonicalSpec(pluginRecords);
-  const pluginSpecSet = new Set(dedupedPluginRecords.map((record) => record.spec));
+  dedupedPluginRecords.sort((left, right) => {
+    return left.spec.localeCompare(right.spec);
+  });
+  return {
+    specs: dedupedPluginRecords.map((record) => record.spec),
+    records: dedupedPluginRecords
+  };
+}
+function collectInstalledSkillRecords(options) {
+  const config = loadConfigOrDefault(options.configPath);
   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 records = listedSkills.map((skill) => {
     const enabled = availableSkillSet.has(skill.name);
-    skillSpecSet.add(skill.name);
     return {
       type: "skill",
       id: skill.name,
@@ -918,20 +925,21 @@ function collectMarketplaceInstalledView(options) {
       enabled,
       runtimeStatus: enabled ? "enabled" : "disabled"
     };
-  });
-  const records = [...dedupedPluginRecords, ...skillRecords].sort((left, right) => {
-    if (left.type !== right.type) {
-      return left.type.localeCompare(right.type);
-    }
-    return left.spec.localeCompare(right.spec);
-  });
+  }).sort((left, right) => left.spec.localeCompare(right.spec));
   return {
-    total: records.length,
-    pluginSpecs: Array.from(pluginSpecSet).sort((left, right) => left.localeCompare(right)),
-    skillSpecs: Array.from(skillSpecSet).sort((left, right) => left.localeCompare(right)),
+    specs: records.map((record) => record.spec),
     records
   };
 }
+function collectMarketplaceInstalledView(options, type) {
+  const installed = type === "plugin" ? collectInstalledPluginRecords(options) : collectInstalledSkillRecords(options);
+  return {
+    type,
+    total: installed.records.length,
+    specs: installed.specs,
+    records: installed.records
+  };
+}
 function resolvePluginManageTargetId(options, rawTargetId, rawSpec) {
   const targetId = rawTargetId.trim();
   if (!targetId && !rawSpec) {
@@ -939,8 +947,7 @@ function resolvePluginManageTargetId(options, rawTargetId, rawSpec) {
   }
   const normalizedTarget = targetId ? normalizePluginNpmSpec(targetId).toLowerCase() : "";
   const normalizedSpec = rawSpec ? normalizePluginNpmSpec(rawSpec).toLowerCase() : "";
-  const installed = collectMarketplaceInstalledView(options);
-  const pluginRecords = installed.records.filter((record) => record.type === "plugin");
+  const pluginRecords = collectInstalledPluginRecords(options).records;
   const lowerTargetId = targetId.toLowerCase();
   for (const record of pluginRecords) {
     const recordId = record.id?.trim();
@@ -1004,6 +1011,7 @@ async function fetchAllMarketplaceItems(params) {
       path: "/api/v1/items",
       query: {
         ...params.query,
+        type: params.type,
         page: String(remotePage),
         pageSize: String(MARKETPLACE_REMOTE_PAGE_SIZE)
       }
@@ -1112,61 +1120,122 @@ async function manageMarketplaceItem(params) {
   };
 }
 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 fetchAllMarketplaceItems({
-      baseUrl: marketplaceBaseUrl,
-      query: {
-        q: query.q,
-        type: query.type,
-        tag: query.tag,
-        sort: query.sort,
-        page: query.page,
-        pageSize: query.pageSize
+  const typedMarketplaceRoutes = [
+    { segment: "plugins", type: "plugin" },
+    { segment: "skills", type: "skill" }
+  ];
+  for (const route of typedMarketplaceRoutes) {
+    app.get(`/api/marketplace/${route.segment}/installed`, (c) => {
+      return c.json(ok(collectMarketplaceInstalledView(options, route.type)));
+    });
+    app.get(`/api/marketplace/${route.segment}/items`, async (c) => {
+      const query = c.req.query();
+      const result = await fetchAllMarketplaceItems({
+        baseUrl: marketplaceBaseUrl,
+        type: route.type,
+        query: {
+          q: query.q,
+          tag: query.tag,
+          sort: query.sort,
+          page: query.page,
+          pageSize: query.pageSize
+        }
+      });
+      if (!result.ok) {
+        return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
       }
+      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)
+      }));
     });
-    if (!result.ok) {
-      return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
-    }
-    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"));
-    const type = c.req.query("type");
-    const result = await fetchMarketplaceData({
-      baseUrl: marketplaceBaseUrl,
-      path: `/api/v1/items/${slug}`,
-      query: {
-        type
+    app.get(`/api/marketplace/${route.segment}/items/:slug`, async (c) => {
+      const slug = encodeURIComponent(c.req.param("slug"));
+      const result = await fetchMarketplaceData({
+        baseUrl: marketplaceBaseUrl,
+        path: `/api/v1/items/${slug}`,
+        query: {
+          type: route.type
+        }
+      });
+      if (!result.ok) {
+        return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
+      }
+      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));
     });
-    if (!result.ok) {
-      return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
-    }
-    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.post(`/api/marketplace/${route.segment}/install`, 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);
+      }
+      if (body.data.type && body.data.type !== route.type) {
+        return c.json(err("INVALID_BODY", "body.type does not match route type"), 400);
+      }
+      try {
+        const payload = await installMarketplaceItem({
+          options,
+          body: {
+            ...body.data,
+            type: route.type
+          }
+        });
+        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("INSTALL_FAILED", message), 400);
+      }
+    });
+    app.post(`/api/marketplace/${route.segment}/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);
+      }
+      if (body.data.type && body.data.type !== route.type) {
+        return c.json(err("INVALID_BODY", "body.type does not match route type"), 400);
+      }
+      try {
+        const payload = await manageMarketplaceItem({
+          options,
+          body: {
+            ...body.data,
+            type: route.type
+          }
+        });
+        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);
+      }
+    });
+  }
   app.get("/api/marketplace/recommendations", async (c) => {
     const query = c.req.query();
     const result = await fetchMarketplaceData({
@@ -1188,44 +1257,6 @@ function registerMarketplaceRoutes(app, options, marketplaceBaseUrl) {
       items: filteredItems
     }));
   });
-  app.post("/api/marketplace/install", 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 installMarketplaceItem({ 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("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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/server",
-  "version": "0.5.10",
+  "version": "0.5.11",
   "private": false,
   "description": "Nextclaw UI/API server.",
   "type": "module",