@nextclaw/server 0.6.4 → 0.6.5

package/dist/index.d.ts

@@ -296,6 +296,21 @@ type ChatCapabilitiesView = {
     stopSupported: boolean;
     stopReason?: string;
 };
+type ChatCommandOptionView = {
+    name: string;
+    description: string;
+    type: "string" | "boolean" | "number";
+    required?: boolean;
+};
+type ChatCommandView = {
+    name: string;
+    description: string;
+    options?: ChatCommandOptionView[];
+};
+type ChatCommandsView = {
+    commands: ChatCommandView[];
+    total: number;
+};
 type ChatTurnStopRequest = {
     runId: string;
     sessionKey?: string;
@@ -491,7 +506,9 @@ type ConfigActionExecuteResult = {
 };
 type MarketplaceItemType = "plugin" | "skill";
 type MarketplaceSort = "relevance" | "updated";
-type MarketplaceInstallKind = "npm" | "clawhub" | "git" | "builtin";
+type MarketplacePluginInstallKind = "npm";
+type MarketplaceSkillInstallKind = "builtin" | "marketplace";
+type MarketplaceInstallKind = MarketplacePluginInstallKind | MarketplaceSkillInstallKind;
 type MarketplaceInstallSpec = {
     kind: MarketplaceInstallKind;
     spec: string;
@@ -522,7 +539,7 @@ type MarketplaceSkillContentView = {
     slug: string;
     name: string;
     install: MarketplaceInstallSpec;
-    source: "workspace" | "builtin" | "git" | "remote";
+    source: "builtin" | "marketplace" | "remote";
     raw: string;
     metadataRaw?: string;
     bodyRaw: string;
@@ -578,11 +595,9 @@ type MarketplaceInstalledView = {
 };
 type MarketplaceInstallSkillParams = {
     slug: string;
-    kind?: MarketplaceInstallKind;
+    kind?: MarketplaceSkillInstallKind;
     skill?: string;
     installPath?: string;
-    version?: string;
-    registry?: string;
     force?: boolean;
 };
 type MarketplacePluginInstallRequest = {
@@ -592,11 +607,9 @@ type MarketplacePluginInstallRequest = {
 type MarketplaceSkillInstallRequest = {
     type?: "skill";
     spec: string;
-    kind?: MarketplaceInstallKind;
+    kind?: MarketplaceSkillInstallKind;
     skill?: string;
     installPath?: string;
-    version?: string;
-    registry?: string;
     force?: boolean;
 };
 type MarketplacePluginInstallResult = {
@@ -758,4 +771,4 @@ declare function deleteSession(configPath: string, key: string): boolean;
 declare function updateRuntime(configPath: string, patch: RuntimeConfigUpdate): Pick<ConfigView, "agents" | "bindings" | "session">;
 declare function updateSecrets(configPath: string, patch: SecretsConfigUpdate): SecretsView;
 
-export { type AgentBindingView, type AgentProfileView, type ApiError, type ApiResponse, type AppMetaView, type BindingPeerView, type ChannelSpecView, type ChatCapabilitiesView, type ChatRunListView, type ChatRunState, type ChatRunView, type ChatTurnRequest, type ChatTurnResult, type ChatTurnStopRequest, type ChatTurnStopResult, type ChatTurnStreamEvent, type ChatTurnView, type ConfigActionExecuteRequest, type ConfigActionExecuteResult, type ConfigActionManifest, type ConfigActionType, type ConfigMetaView, type ConfigSchemaResponse, type ConfigUiHint, type ConfigUiHints, type ConfigView, type CronActionResult, type CronEnableRequest, type CronJobStateView, type CronJobView, type CronListView, type CronPayloadView, type CronRunRequest, type CronScheduleView, type MarketplaceApiConfig, type MarketplaceInstallKind, type MarketplaceInstallSkillParams, type MarketplaceInstallSpec, type MarketplaceInstalledRecord, type MarketplaceInstalledView, type MarketplaceInstaller, type MarketplaceItemSummary, type MarketplaceItemType, type MarketplaceItemView, type MarketplaceListView, type MarketplaceLocalizedTextMap, type MarketplacePluginContentView, type MarketplacePluginInstallRequest, type MarketplacePluginInstallResult, type MarketplacePluginManageAction, type MarketplacePluginManageRequest, type MarketplacePluginManageResult, type MarketplaceRecommendationView, type MarketplaceSkillContentView, type MarketplaceSkillInstallRequest, type MarketplaceSkillInstallResult, type MarketplaceSkillManageAction, type MarketplaceSkillManageRequest, type MarketplaceSkillManageResult, type MarketplaceSort, type ProviderAuthImportResult, type ProviderAuthPollRequest, type ProviderAuthPollResult, type ProviderAuthStartResult, type ProviderConfigUpdate, type ProviderConfigView, type ProviderConnectionTestRequest, type ProviderConnectionTestResult, type ProviderCreateRequest, type ProviderCreateResult, type ProviderDeleteResult, type ProviderSpecView, type RuntimeConfigUpdate, type SecretProviderEnvView, type SecretProviderExecView, type SecretProviderFileView, type SecretProviderView, type SecretRefView, type SecretSourceView, type SecretsConfigUpdate, type SecretsView, type SessionConfigView, type SessionEntryView, type SessionEventView, type SessionHistoryView, type SessionMessageView, type SessionPatchUpdate, type SessionsListView, type UiChatRuntime, type UiServerEvent, type UiServerHandle, type UiServerOptions, buildConfigMeta, buildConfigSchemaView, buildConfigView, createCustomProvider, createUiRouter, deleteCustomProvider, deleteSession, executeConfigAction, getSessionHistory, listSessions, loadConfigOrDefault, patchSession, startUiServer, testProviderConnection, updateChannel, updateModel, updateProvider, updateRuntime, updateSecrets };
+export { type AgentBindingView, type AgentProfileView, type ApiError, type ApiResponse, type AppMetaView, type BindingPeerView, type ChannelSpecView, type ChatCapabilitiesView, type ChatCommandOptionView, type ChatCommandView, type ChatCommandsView, type ChatRunListView, type ChatRunState, type ChatRunView, type ChatTurnRequest, type ChatTurnResult, type ChatTurnStopRequest, type ChatTurnStopResult, type ChatTurnStreamEvent, type ChatTurnView, type ConfigActionExecuteRequest, type ConfigActionExecuteResult, type ConfigActionManifest, type ConfigActionType, type ConfigMetaView, type ConfigSchemaResponse, type ConfigUiHint, type ConfigUiHints, type ConfigView, type CronActionResult, type CronEnableRequest, type CronJobStateView, type CronJobView, type CronListView, type CronPayloadView, type CronRunRequest, type CronScheduleView, type MarketplaceApiConfig, type MarketplaceInstallKind, type MarketplaceInstallSkillParams, type MarketplaceInstallSpec, type MarketplaceInstalledRecord, type MarketplaceInstalledView, type MarketplaceInstaller, type MarketplaceItemSummary, type MarketplaceItemType, type MarketplaceItemView, type MarketplaceListView, type MarketplaceLocalizedTextMap, type MarketplacePluginContentView, type MarketplacePluginInstallKind, type MarketplacePluginInstallRequest, type MarketplacePluginInstallResult, type MarketplacePluginManageAction, type MarketplacePluginManageRequest, type MarketplacePluginManageResult, type MarketplaceRecommendationView, type MarketplaceSkillContentView, type MarketplaceSkillInstallKind, type MarketplaceSkillInstallRequest, type MarketplaceSkillInstallResult, type MarketplaceSkillManageAction, type MarketplaceSkillManageRequest, type MarketplaceSkillManageResult, type MarketplaceSort, type ProviderAuthImportResult, type ProviderAuthPollRequest, type ProviderAuthPollResult, type ProviderAuthStartResult, type ProviderConfigUpdate, type ProviderConfigView, type ProviderConnectionTestRequest, type ProviderConnectionTestResult, type ProviderCreateRequest, type ProviderCreateResult, type ProviderDeleteResult, type ProviderSpecView, type RuntimeConfigUpdate, type SecretProviderEnvView, type SecretProviderExecView, type SecretProviderFileView, type SecretProviderView, type SecretRefView, type SecretSourceView, type SecretsConfigUpdate, type SecretsView, type SessionConfigView, type SessionEntryView, type SessionEventView, type SessionHistoryView, type SessionMessageView, type SessionPatchUpdate, type SessionsListView, type UiChatRuntime, type UiServerEvent, type UiServerHandle, type UiServerOptions, buildConfigMeta, buildConfigSchemaView, buildConfigView, createCustomProvider, createUiRouter, deleteCustomProvider, deleteSession, executeConfigAction, getSessionHistory, listSessions, loadConfigOrDefault, patchSession, startUiServer, testProviderConnection, updateChannel, updateModel, updateProvider, updateRuntime, updateSecrets };

package/dist/index.js

@@ -5,12 +5,11 @@ import { cors } from "hono/cors";
 import { serve } from "@hono/node-server";
 import { WebSocketServer, WebSocket } from "ws";
 import { existsSync, readFileSync } from "fs";
-import { readFile as readFile3, stat } from "fs/promises";
+import { readFile as readFile2, stat } from "fs/promises";
 import { join } from "path";
 
 // src/ui/router.ts
 import { Hono } from "hono";
-import { readFile as readFile2 } from "fs/promises";
 import * as NextclawCore from "@nextclaw/core";
 import { buildPluginStatusReport } from "@nextclaw/openclaw-compat";
 
@@ -1999,98 +1998,23 @@ function isSupportedMarketplaceSkillItem(item, knownSkillNames) {
   if (item.type !== "skill") {
     return false;
   }
-  if (item.install.kind === "git") {
+  if (item.install.kind === "marketplace") {
     return true;
   }
   return item.install.kind === "builtin" && knownSkillNames.has(item.install.spec);
 }
-function splitMarkdownFrontmatter(raw) {
-  const normalized = raw.replace(/\r\n/g, "\n");
-  const match = normalized.match(/^---\n([\s\S]*?)\n---\n?([\s\S]*)$/);
-  if (!match) {
-    return { bodyRaw: normalized };
-  }
-  return {
-    metadataRaw: match[1]?.trim() || void 0,
-    bodyRaw: match[2] ?? ""
-  };
-}
-async function loadLocalSkillMarkdown(options, skillName) {
-  const config = loadConfigOrDefault(options.configPath);
-  const loader = createSkillsLoader(getWorkspacePathFromConfig3(config));
-  if (!loader) {
-    return null;
-  }
-  const skillInfo = loader.listSkills(false).find((skill) => skill.name === skillName);
-  if (!skillInfo) {
-    return null;
-  }
-  try {
-    const raw = await readFile2(skillInfo.path, "utf-8");
-    return {
-      raw,
-      source: skillInfo.source
-    };
-  } catch {
-    return null;
-  }
-}
-function parseGitSkillSpec(rawSpec) {
-  const spec = rawSpec.trim();
-  if (!spec) {
-    return null;
-  }
-  const segments = spec.split("/").filter(Boolean);
-  if (segments.length < 3) {
-    return null;
-  }
-  return {
-    owner: segments[0] ?? "",
-    repo: segments[1] ?? "",
-    skillPath: segments.slice(2).join("/")
-  };
-}
-async function fetchTextWithFallback(urls) {
-  for (const url of urls) {
-    try {
-      const response = await fetch(url, {
-        method: "GET",
-        headers: {
-          Accept: "text/plain, text/markdown, application/json"
-        }
-      });
-      if (!response.ok) {
-        continue;
-      }
-      const text = await response.text();
-      if (text.trim().length === 0) {
-        continue;
-      }
-      return { text, url };
-    } catch {
+function findUnsupportedSkillInstallKind(items) {
+  for (const item of items) {
+    if (item.type !== "skill") {
       continue;
     }
+    const kind = item.install.kind;
+    if (kind !== "builtin" && kind !== "marketplace") {
+      return kind;
+    }
   }
   return null;
 }
-async function loadGitSkillMarkdownFromSpec(rawSpec) {
-  const parsed = parseGitSkillSpec(rawSpec);
-  if (!parsed) {
-    return null;
-  }
-  const candidates = [
-    `https://raw.githubusercontent.com/${parsed.owner}/${parsed.repo}/main/${parsed.skillPath}/SKILL.md`,
-    `https://raw.githubusercontent.com/${parsed.owner}/${parsed.repo}/master/${parsed.skillPath}/SKILL.md`
-  ];
-  const result = await fetchTextWithFallback(candidates);
-  if (!result) {
-    return null;
-  }
-  return {
-    raw: result.text,
-    sourceUrl: result.url
-  };
-}
 async function loadPluginReadmeFromNpm(spec) {
   const encodedSpec = encodeURIComponent(spec);
   const registryUrl = `https://registry.npmjs.org/${encodedSpec}`;
@@ -2124,40 +2048,6 @@ async function loadPluginReadmeFromNpm(spec) {
     return null;
   }
 }
-async function buildSkillContentView(options, item) {
-  const local = await loadLocalSkillMarkdown(options, item.install.spec);
-  if (local) {
-    const split = splitMarkdownFrontmatter(local.raw);
-    return {
-      type: "skill",
-      slug: item.slug,
-      name: item.name,
-      install: item.install,
-      source: local.source,
-      raw: local.raw,
-      metadataRaw: split.metadataRaw,
-      bodyRaw: split.bodyRaw
-    };
-  }
-  if (item.install.kind === "git") {
-    const remote = await loadGitSkillMarkdownFromSpec(item.install.spec);
-    if (remote) {
-      const split = splitMarkdownFrontmatter(remote.raw);
-      return {
-        type: "skill",
-        slug: item.slug,
-        name: item.name,
-        install: item.install,
-        source: "git",
-        raw: remote.raw,
-        metadataRaw: split.metadataRaw,
-        bodyRaw: split.bodyRaw,
-        sourceUrl: remote.sourceUrl
-      };
-    }
-  }
-  return null;
-}
 async function buildPluginContentView(item) {
   if (item.install.kind === "npm") {
     const npm = await loadPluginReadmeFromNpm(item.install.spec);
@@ -2276,8 +2166,6 @@ async function installMarketplaceSkill(params) {
     kind: params.body.kind,
     skill: params.body.skill,
     installPath: params.body.installPath,
-    version: params.body.version,
-    registry: params.body.registry,
     force: params.body.force
   });
   params.options.publish({ type: "config.updated", payload: { path: "skills" } });
@@ -2504,8 +2392,16 @@ function registerSkillMarketplaceRoutes(app, options, marketplaceBaseUrl) {
     if (!result.ok) {
       return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
     }
+    const normalizedItems = result.data.items.map((item) => normalizeMarketplaceItemForUi(sanitizeMarketplaceItem(item)));
+    const unsupportedKind = findUnsupportedSkillInstallKind(normalizedItems);
+    if (unsupportedKind) {
+      return c.json(
+        err("MARKETPLACE_CONTRACT_MISMATCH", `unsupported skill install kind from marketplace api: ${unsupportedKind}`),
+        502
+      );
+    }
     const knownSkillNames = collectKnownSkillNames(options);
-    const filteredItems = result.data.items.map((item) => normalizeMarketplaceItemForUi(sanitizeMarketplaceItem(item))).filter((item) => isSupportedMarketplaceSkillItem(item, knownSkillNames));
+    const filteredItems = normalizedItems.filter((item) => isSupportedMarketplaceSkillItem(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);
@@ -2531,6 +2427,13 @@ function registerSkillMarketplaceRoutes(app, options, marketplaceBaseUrl) {
     }
     const knownSkillNames = collectKnownSkillNames(options);
     const sanitized = normalizeMarketplaceItemForUi(sanitizeMarketplaceItem(result.data));
+    const unsupportedKind = findUnsupportedSkillInstallKind([sanitized]);
+    if (unsupportedKind) {
+      return c.json(
+        err("MARKETPLACE_CONTRACT_MISMATCH", `unsupported skill install kind from marketplace api: ${unsupportedKind}`),
+        502
+      );
+    }
     if (!isSupportedMarketplaceSkillItem(sanitized, knownSkillNames)) {
       return c.json(err("NOT_FOUND", "marketplace item not supported by nextclaw"), 404);
     }
@@ -2547,14 +2450,24 @@ function registerSkillMarketplaceRoutes(app, options, marketplaceBaseUrl) {
     }
     const knownSkillNames = collectKnownSkillNames(options);
     const sanitized = normalizeMarketplaceItemForUi(sanitizeMarketplaceItem(result.data));
+    const unsupportedKind = findUnsupportedSkillInstallKind([sanitized]);
+    if (unsupportedKind) {
+      return c.json(
+        err("MARKETPLACE_CONTRACT_MISMATCH", `unsupported skill install kind from marketplace api: ${unsupportedKind}`),
+        502
+      );
+    }
     if (!isSupportedMarketplaceSkillItem(sanitized, knownSkillNames)) {
       return c.json(err("NOT_FOUND", "marketplace item not supported by nextclaw"), 404);
     }
-    const content = await buildSkillContentView(options, sanitized);
-    if (!content) {
-      return c.json(err("NOT_FOUND", "skill markdown content not found"), 404);
+    const contentResult = await fetchMarketplaceData({
+      baseUrl: marketplaceBaseUrl,
+      path: `/api/v1/skills/items/${slug}/content`
+    });
+    if (!contentResult.ok) {
+      return c.json(err("MARKETPLACE_UNAVAILABLE", contentResult.message), contentResult.status);
     }
-    return c.json(ok(content));
+    return c.json(ok(contentResult.data));
   });
   app.post("/api/marketplace/skills/install", async (c) => {
     const body = await readJson(c.req.raw);
@@ -2814,6 +2727,31 @@ function createUiRouter(options) {
       return c.json(err("CHAT_RUNTIME_FAILED", String(error)), 500);
     }
   });
+  app.get("/api/chat/commands", async (c) => {
+    try {
+      const config = loadConfigOrDefault(options.configPath);
+      const registry = new NextclawCore.CommandRegistry(config);
+      const commands = registry.listSlashCommands().map((command) => ({
+        name: command.name,
+        description: command.description,
+        ...Array.isArray(command.options) && command.options.length > 0 ? {
+          options: command.options.map((option) => ({
+            name: option.name,
+            description: option.description,
+            type: option.type,
+            ...option.required === true ? { required: true } : {}
+          }))
+        } : {}
+      }));
+      const payload = {
+        commands,
+        total: commands.length
+      };
+      return c.json(ok(payload));
+    } catch (error) {
+      return c.json(err("CHAT_COMMANDS_FAILED", String(error)), 500);
+    }
+  });
   app.post("/api/chat/turn", async (c) => {
     if (!options.chatRuntime) {
       return c.json(err("NOT_AVAILABLE", "chat runtime unavailable"), 503);
@@ -3419,7 +3357,7 @@ function startUiServer(options) {
         join,
         getContent: async (path) => {
           try {
-            return await readFile3(path);
+            return await readFile2(path);
           } catch {
             return null;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/server",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "private": false,
   "description": "Nextclaw UI/API server.",
   "type": "module",
@@ -19,7 +19,7 @@
     "@nextclaw/runtime": "^0.1.1",
     "hono": "^4.6.2",
     "ws": "^8.18.0",
-    "@nextclaw/core": "^0.7.1"
+    "@nextclaw/core": "^0.7.2"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",