@xopcai/xopc 0.0.190 → 0.0.192

package/dist/src/agent/skills/installer.js

@@ -1,9 +1,14 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { ManagedRuntimeManager } from "../../runtime-tools/manager.js";
+import { buildRuntimeEnvironment } from "../../runtime-tools/environment.js";
+import { prepareSafeToolEnv } from "../sandbox/sanitize-env-vars.js";
 import { delimiter, join } from "path";
 import { accessSync, constants, existsSync } from "fs";
+import { access, mkdir, writeFile } from "fs/promises";
 import { promisify } from "util";
-import { exec } from "child_process";
+import { createHash } from "node:crypto";
+import { execFile } from "child_process";
 //#region src/agent/skills/installer.ts
 /**
 * Skill Installer
@@ -12,7 +17,7 @@ import { exec } from "child_process";
 *
 */
 init_logger();
-const execAsync = promisify(exec);
+const execFileAsync = promisify(execFile);
 const log = createLogger("SkillInstaller");
 /**
 * Check if a binary exists
@@ -39,64 +44,47 @@ function resolveBrewExecutable() {
 /**
 * Build install command for Node.js packages
 */
-function buildNodeInstallCommand(packageName, manager) {
-	switch (manager) {
-		case "pnpm": return [
-			"pnpm",
-			"add",
-			"-g",
-			"--ignore-scripts",
-			packageName
-		];
-		case "yarn": return [
-			"yarn",
-			"global",
-			"add",
-			"--ignore-scripts",
-			packageName
-		];
-		case "bun": return [
-			"bun",
-			"add",
-			"-g",
-			"--ignore-scripts",
-			packageName
-		];
-		default: return [
-			"npm",
-			"install",
-			"-g",
-			"--ignore-scripts",
-			packageName
-		];
-	}
+function buildNodeInstallCommand(packageName, environmentDir) {
+	return [
+		"npm",
+		"install",
+		"--prefix",
+		environmentDir,
+		"--ignore-scripts",
+		"--",
+		packageName
+	];
+}
+function invalidInstallTarget(value) {
+	return !value || value.startsWith("-") || value.includes("\0");
 }
 /**
 * Build install command from spec
 */
-function buildInstallCommand(spec, prefs) {
+function buildInstallCommand(spec, environmentDir) {
 	switch (spec.kind) {
 		case "brew":
-			if (!spec.formula) return {
+			if (invalidInstallTarget(spec.formula)) return {
 				argv: null,
 				error: "Missing brew formula"
 			};
 			return { argv: [
 				"brew",
 				"install",
+				"--formula",
 				spec.formula
 			] };
 		case "pnpm":
 		case "npm":
 		case "yarn":
 		case "bun":
-			if (!spec.package) return {
+			if (invalidInstallTarget(spec.package)) return {
 				argv: null,
 				error: "Missing package name"
 			};
-			return { argv: buildNodeInstallCommand(spec.package, prefs.nodeManager) };
+			return { argv: buildNodeInstallCommand(spec.package, environmentDir) };
 		case "go":
-			if (!spec.module) return {
+			if (invalidInstallTarget(spec.module)) return {
 				argv: null,
 				error: "Missing go module"
 			};
@@ -106,7 +94,7 @@ function buildInstallCommand(spec, prefs) {
 				spec.module
 			] };
 		case "uv":
-			if (!spec.package) return {
+			if (invalidInstallTarget(spec.package)) return {
 				argv: null,
 				error: "Missing uv package"
 			};
@@ -114,6 +102,11 @@ function buildInstallCommand(spec, prefs) {
 				"uv",
 				"tool",
 				"install",
+				"--tool-dir",
+				join(environmentDir, "tools"),
+				"--bin-dir",
+				join(environmentDir, "bin"),
+				"--",
 				spec.package
 			] };
 		case "download": return {
@@ -133,8 +126,13 @@ function buildInstallCommand(spec, prefs) {
 */
 async function runCommandWithTimeout(argv, timeoutMs, env) {
 	const [cmd, ...args] = argv;
+	if (!cmd) return {
+		code: null,
+		stdout: "",
+		stderr: "Missing executable"
+	};
 	try {
-		const { stdout, stderr } = await execAsync(`${cmd} ${args.join(" ")}`, {
+		const { stdout, stderr } = await execFileAsync(cmd, args, {
 			timeout: timeoutMs,
 			env,
 			maxBuffer: 10 * 1024 * 1024
@@ -161,92 +159,6 @@ async function runCommandWithTimeout(argv, timeoutMs, env) {
 	}
 }
 /**
-* Ensure uv is installed
-*/
-async function ensureUvInstalled(timeoutMs) {
-	if (hasBinary("uv")) return;
-	const brewExe = resolveBrewExecutable();
-	if (!brewExe) return {
-		ok: false,
-		message: "uv not installed — install manually: https://docs.astral.sh/uv/getting-started/installation/",
-		stdout: "",
-		stderr: "",
-		code: null
-	};
-	const result = await runCommandWithTimeout([
-		brewExe,
-		"install",
-		"uv"
-	], timeoutMs);
-	if (result.code === 0) return;
-	return {
-		ok: false,
-		message: "Failed to install uv (brew)",
-		stdout: result.stdout,
-		stderr: result.stderr,
-		code: result.code
-	};
-}
-/**
-* Ensure Go is installed
-*/
-async function ensureGoInstalled(timeoutMs) {
-	if (hasBinary("go")) return;
-	const brewExe = resolveBrewExecutable();
-	if (brewExe) {
-		const result = await runCommandWithTimeout([
-			brewExe,
-			"install",
-			"go"
-		], timeoutMs);
-		if (result.code === 0) return;
-		return {
-			ok: false,
-			message: "Failed to install go (brew)",
-			stdout: result.stdout,
-			stderr: result.stderr,
-			code: result.code
-		};
-	}
-	if (hasBinary("apt-get")) {
-		const isRoot = process.getuid?.() === 0;
-		const aptCmd = isRoot ? [
-			"apt-get",
-			"install",
-			"-y",
-			"golang-go"
-		] : [
-			"sudo",
-			"apt-get",
-			"install",
-			"-y",
-			"golang-go"
-		];
-		if (!isRoot) await runCommandWithTimeout([
-			"sudo",
-			"apt-get",
-			"update",
-			"-qq"
-		], Math.min(timeoutMs, 3e4));
-		const result = await runCommandWithTimeout(aptCmd, timeoutMs);
-		if (result.code === 0) return;
-		return {
-			ok: false,
-			message: "go not installed — automatic install via apt failed. Install manually: https://go.dev/doc/install",
-			stdout: result.stdout,
-			stderr: result.stderr,
-			code: result.code
-		};
-	}
-	return {
-		ok: false,
-		message: "go not installed — install manually: https://go.dev/doc/install",
-		stdout: "",
-		stderr: "",
-		code: null
-	};
-}
-/**
 * Create install failure result
 */
 function createInstallFailure(params) {
@@ -281,41 +193,81 @@ function findInstallSpec(entry, installId) {
 * Install a skill dependency
 */
 async function installSkill(ctx) {
-	const { installSpec, timeoutMs, preferences } = ctx;
+	const { installSpec, timeoutMs } = ctx;
 	log.info({
 		skill: ctx.skillEntry.skill.name,
 		kind: installSpec.kind
 	}, "Installing skill dependency");
 	if (installSpec.kind === "download") return createInstallFailure({ message: "Download installer not yet implemented" });
-	if (installSpec.kind === "uv") {
-		const uvFailure = await ensureUvInstalled(timeoutMs);
-		if (uvFailure) return uvFailure;
-	}
 	if (installSpec.kind === "go") {
-		const goFailure = await ensureGoInstalled(timeoutMs);
-		if (goFailure) return goFailure;
+		if (!hasBinary("go")) return createInstallFailure({ message: "go not installed — install it explicitly from https://go.dev/doc/install" });
 	}
-	const command = buildInstallCommand(installSpec, preferences);
+	const environmentId = createHash("sha256").update(JSON.stringify({
+		skill: ctx.skillEntry.skill.name,
+		path: ctx.skillEntry.skill.filePath,
+		installSpec
+	})).digest("hex").slice(0, 24);
+	const environmentDir = join(ctx.stateDir, "tools", "environments", "skills", environmentId);
+	await mkdir(environmentDir, { recursive: true });
+	if ([
+		"npm",
+		"pnpm",
+		"yarn",
+		"bun"
+	].includes(installSpec.kind)) await writeFile(join(environmentDir, "package.json"), `${JSON.stringify({
+		private: true,
+		name: `xopc-skill-${environmentId}`
+	}, null, 2)}\n`, { flag: "wx" }).catch((error) => {
+		if (error.code !== "EEXIST") throw error;
+	});
+	const command = buildInstallCommand(installSpec, environmentDir);
 	if (command.error) return createInstallFailure({ message: command.error });
 	if (!command.argv) return createInstallFailure({ message: "Invalid install command" });
 	let argv = [...command.argv];
+	const runtimeManager = new ManagedRuntimeManager({
+		stateDir: ctx.stateDir,
+		config: ctx.runtimeConfig
+	});
+	if (installSpec.kind === "uv") argv[0] = (await runtimeManager.resolve({
+		runtime: "uv",
+		allowProvision: true
+	})).executable;
+	else if ([
+		"npm",
+		"pnpm",
+		"yarn",
+		"bun"
+	].includes(installSpec.kind)) {
+		const node = await runtimeManager.resolve({
+			runtime: "node",
+			allowProvision: true
+		});
+		if (node.installDir) {
+			const npmCli = process.platform === "win32" ? join(node.installDir, "node_modules", "npm", "bin", "npm-cli.js") : join(node.installDir, "lib", "node_modules", "npm", "bin", "npm-cli.js");
+			try {
+				await access(npmCli);
+			} catch {
+				return createInstallFailure({ message: "Managed Node.js does not include npm-cli.js" });
+			}
+			argv.splice(0, 1, node.executable, npmCli);
+		} else if (process.platform === "win32") return createInstallFailure({ message: "Isolated package installation on Windows requires managed Node.js" });
+		else argv[0] = node.executables.npm ?? "npm";
+	}
 	if (installSpec.kind === "brew") {
 		const brewExe = resolveBrewExecutable();
 		if (!brewExe) return createInstallFailure({ message: `brew not installed — ${process.platform === "linux" ? "Homebrew is not installed. Install it from https://brew.sh or use your system package manager." : "Homebrew is not installed. Install it from https://brew.sh"}` });
 		argv[0] = brewExe;
 	}
-	let env;
-	if (installSpec.kind === "go") {
-		const brewExe = resolveBrewExecutable();
-		if (brewExe) try {
-			const { stdout } = await execAsync(`${brewExe} --prefix`);
-			const prefix = stdout.trim();
-			if (prefix) env = {
-				...process.env,
-				GOBIN: join(prefix, "bin")
-			};
-		} catch {}
-	}
+	let env = (await buildRuntimeEnvironment({
+		stateDir: ctx.stateDir,
+		config: ctx.runtimeConfig,
+		baseEnv: prepareSafeToolEnv(process.env),
+		extraBinDirs: [join(environmentDir, "bin"), join(environmentDir, "node_modules", ".bin")]
+	})).env;
+	if (installSpec.kind === "go") env = {
+		...env,
+		GOBIN: join(environmentDir, "bin")
+	};
 	const result = await runCommandWithTimeout(argv, timeoutMs, env);
 	if (result.code === 0) {
 		log.info({ skill: ctx.skillEntry.skill.name }, "Skill dependency installed successfully");
@@ -332,14 +284,5 @@ async function installSkill(ctx) {
 		code: result.code
 	});
 }
-/**
-* Get default installer preferences from config
-*/
-function getDefaultInstallerPreferences() {
-	return {
-		preferBrew: true,
-		nodeManager: "pnpm"
-	};
-}
 //#endregion
-export { findInstallSpec, getDefaultInstallerPreferences, hasBinary, installSkill, resolveBrewExecutable };
+export { findInstallSpec, hasBinary, installSkill, resolveBrewExecutable };

package/dist/src/agent/skills/marketplace/adapter.types.d.ts

@@ -7,7 +7,9 @@ export interface SkillsMarketplaceAdapter {
     /** Unique adapter identifier. Built-in: 'store' | 'skillhub' | 'clawhub'. Extensions may add arbitrary ids. */
     readonly id: string;
     /** Filter chips for the current provider (may be empty). */
-    listCategories(config: Config): Promise<MarketplaceCategoryOption[]>;
+    listCategories(config: Config, options?: {
+        locale?: string;
+    }): Promise<MarketplaceCategoryOption[]>;
     listPackages(config: Config, params: SkillsStoreListParams): Promise<UnifiedMarketplaceListResponse>;
     getPackageDetail(config: Config, packageName: string): Promise<UnifiedMarketplacePackageDetail>;
     downloadPackage(config: Config, packageName: string, version?: string): Promise<{

package/dist/src/agent/skills/marketplace/adapters/clawhub/adapter.js

@@ -77,6 +77,12 @@ async function getClawHubSkillFileText(slug, filePath, version) {
 	const text = await res.text();
 	return text.length > MAX_CLAWHUB_FILE_BYTES ? text.slice(0, MAX_CLAWHUB_FILE_BYTES) : text;
 }
+function versionFromDownloadDisposition(value, slug) {
+	const filename = value?.match(/filename="?([^";]+)"?/i)?.[1]?.trim();
+	const prefix = `${slug}-`;
+	if (!filename?.startsWith(prefix) || !filename.toLowerCase().endsWith(".zip")) return void 0;
+	return filename.slice(prefix.length, -4).trim() || void 0;
+}
 async function downloadClawHubSkillZip(reference, version) {
 	const parts = reference.trim().replace(/^@/, "").split("/").filter(Boolean);
 	const ownerHandle = parts.length === 2 ? parts[0] : void 0;
@@ -95,9 +101,10 @@ async function downloadClawHubSkillZip(reference, version) {
 	if (!contentType.includes("zip") && !contentType.includes("octet-stream")) throw new Error(`ClawHub download [${slug}] unexpected content-type: ${contentType}`);
 	const arrayBuf = await res.arrayBuffer();
 	if (arrayBuf.byteLength > MAX_SKILL_ZIP_BYTES) throw new Error(`ClawHub download [${slug}] exceeds size limit (${arrayBuf.byteLength} > ${MAX_SKILL_ZIP_BYTES})`);
+	const resolvedVersion = version?.trim() || versionFromDownloadDisposition(res.headers.get("content-disposition"), slug) || "latest";
 	return {
 		buffer: Buffer.from(arrayBuf),
-		version: version?.trim() || "latest",
+		version: resolvedVersion,
 		slug
 	};
 }
@@ -202,7 +209,7 @@ function convertListItemToPackageItem(item) {
 }
 function convertSearchResultToPackageItem(item, enrichment) {
 	return {
-		id: item.install?.reference ?? item.slug,
+		id: item.slug,
 		name: item.displayName || item.slug,
 		type: "skill",
 		description: item.summary || "",
@@ -215,9 +222,27 @@ function convertSearchResultToPackageItem(item, enrichment) {
 		updatedAt: String(item.metrics?.updatedAt ?? item.updatedAt ?? ""),
 		categories: item.native?.skill?.categories ?? enrichment?.metadata?.os ?? [],
 		stars: item.native?.skill?.stats?.stars ?? item.metrics?.bookmarks ?? enrichment?.stats.stars ?? 0,
-		sourceLabel: item.source === "skills-sh" ? "skills.sh" : "ClawHub"
+		sourceLabel: item.source === "skills-sh" ? "skills.sh" : "ClawHub",
+		searchScore: typeof item.score === "number" && Number.isFinite(item.score) ? item.score : void 0
 	};
 }
+function sortClawHubSearchRows(rows, sort) {
+	return [...rows].sort((a, b) => {
+		const aScore = a.searchScore;
+		const bScore = b.searchScore;
+		if (aScore !== void 0 || bScore !== void 0) {
+			const relevanceDiff = (bScore ?? Number.NEGATIVE_INFINITY) - (aScore ?? Number.NEGATIVE_INFINITY);
+			if (relevanceDiff !== 0) return relevanceDiff;
+		}
+		if (sort === "downloads") return b.downloads - a.downloads;
+		if (sort === "newest") return Number(b.updatedAt) - Number(a.updatedAt);
+		return 0;
+	});
+}
+function publicPackageItem(row) {
+	const { searchScore: _searchScore, ...item } = row;
+	return item;
+}
 function mapSortParam(sort) {
 	if (sort === "downloads") return "downloads";
 	if (sort === "newest") return "newest";
@@ -241,12 +266,11 @@ const clawHubMarketplaceAdapter = {
 			const enrichmentBySlug = /* @__PURE__ */ new Map();
 			if (listSettled.status === "fulfilled") for (const it of listSettled.value.items) enrichmentBySlug.set(it.slug, it);
 			let rows = searchResponse.value.results.filter((r) => !r.source || r.source === "clawhub").map((r) => convertSearchResultToPackageItem(r, enrichmentBySlug.get(r.slug)));
-			if (params.sort === "downloads") rows = [...rows].sort((a, b) => b.downloads - a.downloads);
-			else if (params.sort === "newest") rows = [...rows].sort((a, b) => Number(b.updatedAt) - Number(a.updatedAt));
+			rows = sortClawHubSearchRows(rows, params.sort);
 			const total = rows.length;
 			const start = (page - 1) * pageSize;
 			return {
-				items: rows.slice(start, start + pageSize),
+				items: rows.slice(start, start + pageSize).map(publicPackageItem),
 				meta: {
 					page,
 					pageSize,

package/dist/src/agent/skills/marketplace/adapters/skillhub/adapter.js

@@ -385,9 +385,27 @@ function lightmakeHitToPackageItem(hit) {
 		updatedAt: String(updated),
 		categories: cat ? [cat] : [],
 		stars: typeof hit.stars === "number" ? hit.stars : void 0,
-		sourceLabel: sourceLabelFromSkillSource(hit.source) ?? "Lightmake"
+		sourceLabel: sourceLabelFromSkillSource(hit.source) ?? "Lightmake",
+		searchScore: typeof hit.score === "number" && Number.isFinite(hit.score) ? hit.score : void 0
 	};
 }
+function sortSkillHubSearchRows(rows, sort) {
+	return [...rows].sort((a, b) => {
+		const aScore = a.searchScore;
+		const bScore = b.searchScore;
+		if (aScore !== void 0 || bScore !== void 0) {
+			const relevanceDiff = (bScore ?? Number.NEGATIVE_INFINITY) - (aScore ?? Number.NEGATIVE_INFINITY);
+			if (relevanceDiff !== 0) return relevanceDiff;
+		}
+		if (sort === "downloads") return b.downloads - a.downloads;
+		if (sort === "newest") return Number(b.updatedAt) - Number(a.updatedAt);
+		return 0;
+	});
+}
+function publicPackageItem(row) {
+	const { searchScore: _searchScore, ...item } = row;
+	return item;
+}
 async function searchSkillHubLightmake(urls, query, limit, timeoutMs = 4e3) {
 	const q = query.trim().toLowerCase();
 	if (!q) return [];
@@ -665,12 +683,11 @@ const skillHubMarketplaceAdapter = {
 				}
 			}
 			rows = filterByCategory(rows, params.category);
-			if (params.sort === "downloads") rows = [...rows].sort((a, b) => b.downloads - a.downloads);
-			else if (params.sort === "newest") rows = [...rows].sort((a, b) => Number(b.updatedAt) - Number(a.updatedAt));
+			rows = sortSkillHubSearchRows(rows, params.sort);
 			const total = rows.length;
 			const start = (page - 1) * pageSize;
 			return {
-				items: rows.slice(start, start + pageSize),
+				items: rows.slice(start, start + pageSize).map(publicPackageItem),
 				meta: {
 					page,
 					pageSize,

package/dist/src/agent/skills/marketplace/adapters/store/adapter.js

@@ -1,16 +1,19 @@
 import { registerMarketplaceAdapter } from "../../registry.js";
 import { buildSkillMarkdownPreviewFromRaw } from "../../../skill-markdown-preview-from-raw.js";
-import { downloadSkillZipBuffer, fetchMarketplacePackageDetail, listSkillPackages, resolveSkillZipDownloadUrl, resolveSkillsStoreBaseUrl, skillIdForMarketplaceInstall, verifyStoreArtifactSha256 } from "./store-api-client.js";
+import { downloadSkillZipBuffer, fetchMarketplacePackageDetail, listSkillCategories, listSkillPackages, resolveSkillZipDownloadUrl, resolveSkillsStoreBaseUrl, skillIdForMarketplaceInstall, verifyStoreArtifactSha256 } from "./store-api-client.js";
 //#region src/agent/skills/marketplace/adapters/store/adapter.ts
 const storeMarketplaceAdapter = {
 	id: "store",
-	async listCategories(_config) {
-		return [];
+	async listCategories(config, options) {
+		return listSkillCategories(resolveSkillsStoreBaseUrl(config), options?.locale);
 	},
 	async listPackages(config, params) {
 		const response = await listSkillPackages(resolveSkillsStoreBaseUrl(config), params);
 		return {
-			items: response.items,
+			items: response.items.map((item) => ({
+				...item,
+				categories: item.category ? [item.category] : []
+			})),
 			meta: response.meta,
 			provider: "store"
 		};

package/dist/src/agent/skills/marketplace/adapters/store/store-api-client.d.ts

@@ -38,6 +38,8 @@ export interface SkillsStorePackageListItem {
     };
     latestVersion?: string;
     updatedAt: string;
+    /** Stable primary category id from XOPC Store. */
+    category?: string | null;
     /** Taxonomy / tags from the marketplace (adapter-specific). */
     categories?: string[];
     tags?: string[];
@@ -70,6 +72,7 @@ export declare function getStoreOrigin(baseUrl: string): string;
  */
 export declare function assertDownloadUrlAllowed(downloadUrl: string, storeBaseUrl: string): URL;
 export declare function listSkillPackages(storeBaseUrl: string, params: SkillsStoreListParams): Promise<SkillsStoreListResponse>;
+export declare function listSkillCategories(storeBaseUrl: string, locale?: string): Promise<MarketplaceCategoryOption[]>;
 /** Public connector catalog exposed by xopc-store. */
 export declare function listConnectorPackages(storeBaseUrl: string, params: SkillsStoreListParams): Promise<SkillsStoreListResponse>;
 /** GET /api/v1/packages/:name — published skill package (public). */

package/dist/src/agent/skills/marketplace/adapters/store/store-api-client.js

@@ -94,6 +94,12 @@ async function listSkillPackages(storeBaseUrl, params) {
 	if (params.category?.trim()) sp.set("category", params.category.trim());
 	return fetchJson(`${base}/api/v1/packages?${sp.toString()}`);
 }
+async function listSkillCategories(storeBaseUrl, locale) {
+	const base = normalizeBaseUrl(storeBaseUrl);
+	const sp = new URLSearchParams({ type: "skill" });
+	if (locale?.trim()) sp.set("locale", locale.trim());
+	return (await fetchJson(`${base}/api/v1/packages/categories?${sp.toString()}`)).items;
+}
 /** Public connector catalog exposed by xopc-store. */
 async function listConnectorPackages(storeBaseUrl, params) {
 	const base = normalizeBaseUrl(storeBaseUrl);
@@ -224,4 +230,4 @@ function skillIdForMarketplaceInstall(packageName) {
 	return isValidSkillId(trimmed) ? trimmed : void 0;
 }
 //#endregion
-export { MAX_EXTENSION_STORE_ZIP_BYTES, assertDownloadUrlAllowed, downloadConnectorStoreZipBuffer, downloadExtensionStoreZipBuffer, downloadSkillZipBuffer, fetchMarketplacePackageDetail, fetchStoreConnectorPackageDetail, getStoreOrigin, listConnectorPackages, listSkillPackages, resolveExtensionZipDownloadUrl, resolveExtensionsStoreBaseUrl, resolveSkillZipDownloadUrl, resolveSkillsStoreBaseUrl, skillIdForMarketplaceInstall, verifyStoreArtifactSha256 };
+export { MAX_EXTENSION_STORE_ZIP_BYTES, assertDownloadUrlAllowed, downloadConnectorStoreZipBuffer, downloadExtensionStoreZipBuffer, downloadSkillZipBuffer, fetchMarketplacePackageDetail, fetchStoreConnectorPackageDetail, getStoreOrigin, listConnectorPackages, listSkillCategories, listSkillPackages, resolveExtensionZipDownloadUrl, resolveExtensionsStoreBaseUrl, resolveSkillZipDownloadUrl, resolveSkillsStoreBaseUrl, skillIdForMarketplaceInstall, verifyStoreArtifactSha256 };

package/dist/src/agent/skills/marketplace/search.d.ts

@@ -1,9 +1,9 @@
 import type { Config } from '../../../config/schema.js';
-export declare const SKILL_MARKETPLACE_SEARCH_SOURCES: readonly ["store", "clawhub", "skills-sh"];
+export declare const SKILL_MARKETPLACE_SEARCH_SOURCES: readonly ["store", "skillhub", "clawhub", "skills-sh"];
 export type SkillsMarketplaceSearchSource = (typeof SKILL_MARKETPLACE_SEARCH_SOURCES)[number];
 export interface SkillsMarketplaceSearchResult {
     id: string;
-    provider: 'store' | 'clawhub';
+    provider: 'store' | 'skillhub' | 'clawhub';
     source: SkillsMarketplaceSearchSource;
     name: string;
     description: string;

package/dist/src/agent/skills/marketplace/search.js

@@ -3,6 +3,7 @@ import { listMarketplacePackages } from "../skills-marketplace.js";
 //#region src/agent/skills/marketplace/search.ts
 const SKILL_MARKETPLACE_SEARCH_SOURCES = [
 	"store",
+	"skillhub",
 	"clawhub",
 	"skills-sh"
 ];
@@ -94,6 +95,34 @@ function fromClawHub(item) {
 		valueScore: 0
 	};
 }
+function absoluteSkillHubUrl(slug) {
+	const normalized = slug.trim();
+	return normalized ? `https://skillhub.cn/skills/${encodeURIComponent(normalized)}` : null;
+}
+function fromMarketplacePackage(provider, item) {
+	return {
+		id: item.id,
+		provider,
+		source: provider,
+		name: item.name,
+		description: item.description,
+		author: item.author.username,
+		downloads: boundedNumber(item.downloads),
+		stars: boundedNumber(item.stars),
+		updatedAt: normalizeDate(item.updatedAt),
+		canonicalUrl: provider === "skillhub" ? absoluteSkillHubUrl(item.id) : null,
+		install: {
+			kind: provider,
+			reference: provider === "store" ? item.name : item.id,
+			sourceUrl: null
+		},
+		security: {
+			status: "unknown",
+			scanners: []
+		},
+		valueScore: 0
+	};
+}
 function dedupeAndRank(query, rows) {
 	const unique = /* @__PURE__ */ new Map();
 	for (const row of rows) {
@@ -121,36 +150,38 @@ async function searchSkillMarketplaces(params) {
 				pageSize: fetchLimit,
 				sort: "downloads"
 			}, "store");
-			for (const item of response.items) rows.push({
-				id: item.id,
-				provider: "store",
+			for (const item of response.items) rows.push(fromMarketplacePackage("store", item));
+			statuses.push({
 				source: "store",
-				name: item.name,
-				description: item.description,
-				author: item.author.username,
-				downloads: boundedNumber(item.downloads),
-				stars: boundedNumber(item.stars),
-				updatedAt: normalizeDate(item.updatedAt),
-				canonicalUrl: null,
-				install: {
-					kind: "store",
-					reference: item.name,
-					sourceUrl: null
-				},
-				security: {
-					status: "unknown",
-					scanners: []
-				},
-				valueScore: 0
+				ok: true,
+				count: response.items.length
 			});
+		} catch (error) {
 			statuses.push({
 				source: "store",
+				ok: false,
+				count: 0,
+				error: String(error)
+			});
+		}
+	})());
+	if (requested.has("skillhub")) jobs.push((async () => {
+		try {
+			const response = await listMarketplacePackages(params.config, {
+				q: params.query,
+				page: 1,
+				pageSize: fetchLimit,
+				sort: "downloads"
+			}, "skillhub");
+			for (const item of response.items) rows.push(fromMarketplacePackage("skillhub", item));
+			statuses.push({
+				source: "skillhub",
 				ok: true,
 				count: response.items.length
 			});
 		} catch (error) {
 			statuses.push({
-				source: "store",
+				source: "skillhub",
 				ok: false,
 				count: 0,
 				error: String(error)

package/dist/src/agent/skills/skills-marketplace.d.ts

@@ -10,7 +10,7 @@ export { getMarketplaceAdapter, getMarketplaceProviderDisplayName, resolveSkills
 export { registerMarketplaceAdapter } from './marketplace/registry.js';
 export type { MarketplaceAdapterRegistration } from './marketplace/registry.js';
 export type { MarketplaceCategoryOption, MarketplacePackageDetail, SkillsStoreListParams, SkillsStoreListResponse, UnifiedMarketplaceListResponse, UnifiedMarketplacePackageDetail, } from './marketplace/adapters/store/store-api-client.js';
-export declare function listMarketplaceCategories(config: Config, provider?: string): Promise<{
+export declare function listMarketplaceCategories(config: Config, provider?: string, locale?: string): Promise<{
     items: MarketplaceCategoryOption[];
 }>;
 export declare function listMarketplacePackages(config: Config, params: SkillsStoreListParams, provider?: string): Promise<UnifiedMarketplaceListResponse>;