@nextclaw/server 0.12.3 → 0.12.4

package/dist/index.js

@@ -2,9 +2,9 @@ import { Hono } from "hono";
 import { compress } from "hono/compress";
 import { serve } from "@hono/node-server";
 import { WebSocket, WebSocketServer } from "ws";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import fs, { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { readFile, readdir, realpath, stat } from "node:fs/promises";
-import { dirname, isAbsolute, join, parse, resolve } from "node:path";
+import path, { dirname, isAbsolute, join, parse, resolve } from "node:path";
 import * as NextclawCore from "@nextclaw/core";
 import { ConfigSchema, DEFAULT_WORKSPACE_PATH, LiteLLMProvider, SessionManager, buildConfigSchema, createAgentProfile, expandHome, findEffectiveAgentProfile, getDataDir, getPackageVersion, getProviderName, getWorkspacePathFromConfig, hasSecretRef, isSensitiveConfigPath, loadConfig, normalizeThinkingLevels, parseThinkingLevel, probeFeishu, readAgentAvatarContent, removeAgentProfile, resolveEffectiveAgentProfiles, saveConfig, updateAgentProfile } from "@nextclaw/core";
 import { createHash, randomBytes, randomUUID, scryptSync, timingSafeEqual } from "node:crypto";
@@ -1077,6 +1077,7 @@ const PREFERRED_PROVIDER_ORDER_INDEX = new Map([
 	"deepseek",
 	"minimax",
 	"moonshot",
+	"kimi-coding",
 	"zhipu"
 ].map((name, index) => [name, index]));
 const BUILTIN_PROVIDERS = listServerBuiltinProviders();
@@ -3491,6 +3492,21 @@ var McpMarketplaceController = class {
 };
 //#endregion
 //#region src/ui/ui-routes/marketplace/spec.ts
+function readPluginPackageNameFromSource(source) {
+	const trimmed = source?.trim();
+	if (!trimmed) return;
+	let cursor = path.dirname(path.resolve(trimmed));
+	for (let index = 0; index < 8; index += 1) {
+		try {
+			const manifestPath = path.join(cursor, "package.json");
+			const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf8"));
+			if (typeof manifest.name === "string" && manifest.name.trim().length > 0) return manifest.name.trim();
+		} catch {}
+		const parent = path.dirname(cursor);
+		if (parent === cursor) break;
+		cursor = parent;
+	}
+}
 function normalizePluginNpmSpec(rawSpec) {
 	const spec = rawSpec.trim();
 	if (!spec.startsWith("@")) return spec;
@@ -3512,6 +3528,12 @@ function resolvePluginCanonicalSpec(params) {
 	}
 	return params.pluginId;
 }
+function resolveDiscoveredPluginCanonicalSpec(params) {
+	return resolvePluginCanonicalSpec({
+		pluginId: params.pluginId,
+		installSpec: params.installSpec ?? readPluginPackageNameFromSource(params.source)
+	});
+}
 function readPluginRuntimeStatusPriority(status) {
 	if (status === "loaded") return 400;
 	if (status === "disabled") return 300;
@@ -3606,36 +3628,32 @@ function buildDiscoveredPluginMap(params) {
 	}
 	return discoveredById;
 }
-function appendDiscoveredPluginRecords(params) {
-	for (const plugin of params.discoveredById.values()) {
+function collectDiscoveredPluginRecords(params) {
+	return Array.from(params.discoveredById.values()).map((plugin) => {
 		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;
-		params.pluginRecords.push({
+		return {
 			type: "plugin",
 			id: plugin.id,
-			spec: normalizedSpec,
+			spec: resolveDiscoveredPluginCanonicalSpec({
+				pluginId: plugin.id,
+				installSpec: installRecord?.spec,
+				source: plugin.source
+			}),
 			label: plugin.name && plugin.name.trim().length > 0 ? plugin.name : plugin.id,
 			source: plugin.source,
 			installedAt: installRecord?.installedAt,
-			enabled,
-			runtimeStatus,
+			enabled: entry?.enabled === false ? false : plugin.enabled,
+			runtimeStatus: entry?.enabled === false ? "disabled" : plugin.status,
 			origin: plugin.origin,
 			installPath: installRecord?.installPath
-		});
-		params.seenPluginIds.add(plugin.id);
-	}
+		};
+	});
 }
-function appendInstalledOnlyPluginRecords(params) {
-	for (const [pluginId, installRecord] of Object.entries(params.pluginRecordsMap)) {
-		if (params.seenPluginIds.has(pluginId)) continue;
+function collectInstalledOnlyPluginRecords(params) {
+	return Object.entries(params.pluginRecordsMap).filter(([pluginId]) => !params.seenPluginIds.has(pluginId)).map(([pluginId, installRecord]) => {
 		const entry = params.pluginEntries[pluginId];
-		params.pluginRecords.push({
+		return {
 			type: "plugin",
 			id: pluginId,
 			spec: resolvePluginCanonicalSpec({
@@ -3648,14 +3666,12 @@ function appendInstalledOnlyPluginRecords(params) {
 			enabled: entry?.enabled !== false,
 			runtimeStatus: entry?.enabled === false ? "disabled" : "unresolved",
 			installPath: installRecord.installPath
-		});
-		params.seenPluginIds.add(pluginId);
-	}
+		};
+	});
 }
-function appendConfigOnlyPluginRecords(params) {
-	for (const [pluginId, entry] of Object.entries(params.pluginEntries)) {
-		if (params.seenPluginIds.has(pluginId)) continue;
-		params.pluginRecords.push({
+function collectConfigOnlyPluginRecords(params) {
+	return Object.entries(params.pluginEntries).filter(([pluginId]) => !params.seenPluginIds.has(pluginId)).map(([pluginId, entry]) => {
+		return {
 			type: "plugin",
 			id: pluginId,
 			spec: resolvePluginCanonicalSpec({ pluginId }),
@@ -3663,9 +3679,8 @@ function appendConfigOnlyPluginRecords(params) {
 			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) {
@@ -3681,12 +3696,13 @@ function findPluginIdByNormalizedSpec(pluginRecords, normalizedSpec) {
 		if (normalizePluginNpmSpec(record.spec).toLowerCase() === normalizedSpec) return recordId;
 	}
 }
+function collectDefinedRecordIds(records) {
+	return new Set(records.map((record) => readNonEmptyString(record.id)).filter((recordId) => Boolean(recordId)));
+}
 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 {
@@ -3697,28 +3713,29 @@ function collectInstalledPluginRecords(options) {
 	} catch {
 		discoveredPlugins = [];
 	}
-	appendDiscoveredPluginRecords({
+	const discoveredRecords = collectDiscoveredPluginRecords({
 		discoveredById: buildDiscoveredPluginMap({
 			discoveredPlugins,
 			installedPluginIds
 		}),
 		pluginRecordsMap,
-		pluginEntries,
-		pluginRecords,
-		seenPluginIds
+		pluginEntries
 	});
-	appendInstalledOnlyPluginRecords({
+	const seenDiscoveredPluginIds = collectDefinedRecordIds(discoveredRecords);
+	const installedOnlyRecords = collectInstalledOnlyPluginRecords({
 		pluginRecordsMap,
 		pluginEntries,
-		pluginRecords,
-		seenPluginIds
+		seenPluginIds: seenDiscoveredPluginIds
 	});
-	appendConfigOnlyPluginRecords({
+	const configOnlyRecords = collectConfigOnlyPluginRecords({
 		pluginEntries,
-		pluginRecords,
-		seenPluginIds
+		seenPluginIds: new Set([...seenDiscoveredPluginIds, ...collectDefinedRecordIds(installedOnlyRecords)])
 	});
-	const dedupedPluginRecords = dedupeInstalledPluginRecordsByCanonicalSpec(pluginRecords);
+	const dedupedPluginRecords = dedupeInstalledPluginRecordsByCanonicalSpec([
+		...discoveredRecords,
+		...installedOnlyRecords,
+		...configOnlyRecords
+	]);
 	dedupedPluginRecords.sort((left, right) => {
 		return left.spec.localeCompare(right.spec);
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/server",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "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/core": "0.12.3",
-    "@nextclaw/mcp": "0.1.68",
-    "@nextclaw/ncp-http-agent-server": "0.3.12",
-    "@nextclaw/openclaw-compat": "1.0.3",
+    "@nextclaw/core": "0.12.4",
+    "@nextclaw/mcp": "0.1.69",
     "@nextclaw/ncp": "0.5.0",
-    "@nextclaw/runtime": "0.2.35"
+    "@nextclaw/ncp-http-agent-server": "0.3.12",
+    "@nextclaw/openclaw-compat": "1.0.4",
+    "@nextclaw/runtime": "0.2.36"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",