@nextclaw/service 0.1.11 → 0.1.13

package/dist/cli/commands/agent/agent-runtime.utils.d.ts

@@ -3,8 +3,7 @@ import { AgentRuntimeSessionTypeDescribeParams, AgentRuntimeSessionTypeOption }
 //#region src/cli/commands/agent/agent-runtime.utils.d.ts
 type AgentRuntimeListEntry = AgentRuntimeSessionTypeOption & {
   default: boolean;
-  source: "builtin" | "plugin";
-  pluginId?: string;
+  source: "builtin";
 };
 type AgentRuntimeListResult = {
   defaultRuntime: string;

package/dist/cli/commands/agent/agent-runtime.utils.js

@@ -1,37 +1,11 @@
-import { buildReservedPluginLoadOptions } from "../../../commands/plugin/plugin-command-utils.js";
-import { resolveDevFirstPartyPluginDir } from "../../../commands/plugin/development-source/first-party-plugin-load-paths.utils.js";
-import { resolveDevPluginLoadingContext } from "../../../commands/plugin/development-source/dev-plugin-overrides.utils.js";
-import { toExtensionRegistry } from "../../../commands/plugin/plugin-extension-registry.js";
-import { logPluginDiagnostics } from "../../../commands/plugin/index.js";
-import { getWorkspacePath, loadConfig } from "@nextclaw/core";
-import { AgentRuntimeRegistry, BuiltinNarpRuntimeRegistrationService, DEFAULT_AGENT_RUNTIME_ENTRY_ID, NARP_HTTP_RUNTIME_KIND, NARP_STDIO_RUNTIME_KIND, resolveAgentRuntimeEntries } from "@nextclaw/kernel";
-import { loadOpenClawPlugins } from "@nextclaw/openclaw-compat";
+import { loadConfig } from "@nextclaw/core";
+import { AgentRuntimeRegistry, BuiltinNarpRuntimeProviderService, DEFAULT_AGENT_RUNTIME_ENTRY_ID, resolveAgentRuntimeEntries } from "@nextclaw/kernel";
 //#region src/cli/commands/agent/agent-runtime.utils.ts
 function createUnusedRuntime(_params) {
 	throw new Error("runtime creation is not available during runtime listing");
 }
-function loadRuntimeOnlyPluginRegistry(config, workspaceDir) {
-	const { configWithDevPluginOverrides, excludedRoots } = resolveDevPluginLoadingContext(config, resolveDevFirstPartyPluginDir(process.env.NEXTCLAW_DEV_FIRST_PARTY_PLUGIN_DIR));
-	return loadOpenClawPlugins({
-		config: configWithDevPluginOverrides,
-		workspaceDir,
-		includeBundled: false,
-		kinds: ["agent-runtime"],
-		excludeRoots: excludedRoots,
-		...buildReservedPluginLoadOptions(),
-		logger: {
-			info: (message) => console.log(message),
-			warn: (message) => console.warn(message),
-			error: (message) => console.error(message),
-			debug: (message) => console.debug(message)
-		}
-	});
-}
 async function listAvailableAgentRuntimes(params) {
 	const config = loadConfig();
-	const pluginRegistry = loadRuntimeOnlyPluginRegistry(config, getWorkspacePath(config.agents.defaults.workspace));
-	logPluginDiagnostics(pluginRegistry);
-	const extensionRegistry = toExtensionRegistry(pluginRegistry);
 	const runtimeRegistry = new AgentRuntimeRegistry();
 	const runtimeSourceByKind = /* @__PURE__ */ new Map();
 	const runtimeSourceByEntryId = /* @__PURE__ */ new Map();
@@ -41,31 +15,14 @@ async function listAvailableAgentRuntimes(params) {
 		createRuntime: createUnusedRuntime
 	});
 	runtimeSourceByKind.set(DEFAULT_AGENT_RUNTIME_ENTRY_ID, { source: "builtin" });
-	new BuiltinNarpRuntimeRegistrationService(() => config).registerInto(runtimeRegistry);
+	for (const provider of new BuiltinNarpRuntimeProviderService(() => config).createProviders()) runtimeRegistry.register(provider);
 	runtimeSourceByKind.set("narp-http", { source: "builtin" });
 	runtimeSourceByKind.set("narp-stdio", { source: "builtin" });
-	for (const registration of extensionRegistry.ncpAgentRuntimes) {
-		const normalizedKind = registration.kind.trim().toLowerCase();
-		if (normalizedKind === NARP_HTTP_RUNTIME_KIND || normalizedKind === NARP_STDIO_RUNTIME_KIND) continue;
-		runtimeRegistry.register({
-			kind: registration.kind,
-			label: registration.label,
-			createRuntime: registration.createRuntime,
-			describeSessionType: registration.describeSessionType
-		});
-		runtimeSourceByKind.set(registration.kind, {
-			source: "plugin",
-			pluginId: registration.pluginId
-		});
-	}
-	const resolvedEntries = resolveAgentRuntimeEntries({
-		config,
-		providerKinds: runtimeRegistry.listProviderKinds()
-	});
+	const resolvedEntries = resolveAgentRuntimeEntries({ config });
 	runtimeRegistry.applyEntries(resolvedEntries);
 	for (const entry of resolvedEntries.entries) {
 		const source = runtimeSourceByKind.get(entry.type);
-		runtimeSourceByEntryId.set(entry.id, source ?? { source: entry.id === DEFAULT_AGENT_RUNTIME_ENTRY_ID ? "builtin" : "plugin" });
+		runtimeSourceByEntryId.set(entry.id, source ?? { source: "builtin" });
 	}
 	const listed = await runtimeRegistry.listSessionTypes(params);
 	return {
@@ -75,8 +32,7 @@ async function listAvailableAgentRuntimes(params) {
 			return {
 				...runtime,
 				default: runtime.value === listed.defaultType,
-				source: source?.source ?? "plugin",
-				...source?.pluginId ? { pluginId: source.pluginId } : {}
+				source: source?.source ?? "builtin"
 			};
 		})
 	};

package/dist/cli/commands/agent/cli-agent-runner.utils.d.ts

@@ -1,5 +1,4 @@
 import { AgentCommandOptions } from "../../../shared/types/cli.types.js";
-import { NextclawExtensionRegistry } from "../../../commands/plugin/plugin-extension-registry.js";
 import { Config } from "@nextclaw/core";
 import { LlmProviderRuntime, NextclawKernel } from "@nextclaw/kernel";
 
@@ -10,7 +9,6 @@ declare function runCliAgentCommand(params: {
   config: Config;
   kernel: NextclawKernel;
   providerManager: LlmProviderRuntime;
-  extensionRegistry: NextclawExtensionRegistry;
 }): Promise<void>;
 //#endregion
 export { runCliAgentCommand };

package/dist/cli/commands/agent/cli-agent-runner.utils.js

@@ -30,7 +30,7 @@ function createCliHistoryInterface() {
 	return rl;
 }
 async function runCliInteractiveLoop(params) {
-	const { config, logo, metadata, ncpAgent, sessionKey, sessionManager } = params;
+	const { agentRunRequests, config, logo, metadata, sessionKey, sessionManager } = params;
 	console.log(`${logo} Interactive mode (type exit or Ctrl+C to quit)\n`);
 	const rl = createCliHistoryInterface();
 	let running = true;
@@ -45,7 +45,7 @@ async function runCliInteractiveLoop(params) {
 		printAgentResponse(await dispatchPromptOverNcp({
 			config,
 			sessionManager,
-			resolveNcpAgent: () => ncpAgent,
+			agentRunRequests,
 			sessionKey,
 			content: trimmed,
 			metadata
@@ -53,12 +53,10 @@ async function runCliInteractiveLoop(params) {
 	}
 }
 async function runCliAgentCommand(params) {
-	const { config, extensionRegistry, kernel, logo, opts } = params;
+	const { config, kernel, logo, opts } = params;
 	const sessionManager = kernel.sessions;
-	kernel.extensions.loadExtensionRegistry(extensionRegistry);
+	await kernel.extensions.load({ config });
 	await kernel.start();
-	const ncpAgent = kernel.agentRuntimeManager.currentHandle;
-	if (!ncpAgent) throw new Error("Kernel start completed without an agent runtime handle.");
 	try {
 		const sessionKey = opts.session ?? "cli:default";
 		const sharedMetadata = buildCliSharedMetadata(opts);
@@ -66,7 +64,7 @@ async function runCliAgentCommand(params) {
 			printAgentResponse(await dispatchPromptOverNcp({
 				config,
 				sessionManager,
-				resolveNcpAgent: () => ncpAgent,
+				agentRunRequests: kernel.agentRunRequestManager,
 				sessionKey,
 				content: opts.message,
 				metadata: sharedMetadata
@@ -77,12 +75,12 @@ async function runCliAgentCommand(params) {
 			logo,
 			config,
 			sessionManager,
-			ncpAgent,
+			agentRunRequests: kernel.agentRunRequestManager,
 			sessionKey,
 			metadata: sharedMetadata
 		});
 	} finally {
-		await ncpAgent.dispose?.();
+		await kernel.dispose();
 	}
 }
 //#endregion

package/dist/cli/commands/agent/services/agent-commands.service.js

@@ -37,7 +37,6 @@ var AgentCommands = class {
 			console.log(head);
 			console.log(`  label: ${runtime.label}`);
 			console.log(`  source: ${runtime.source}`);
-			if (runtime.pluginId) console.log(`  pluginId: ${runtime.pluginId}`);
 			console.log(`  ready: ${runtime.ready === false ? "no" : "yes"}`);
 			console.log(`  reason: ${runtime.reason ?? "-"}`);
 			console.log(`  reasonMessage: ${runtime.reasonMessage ?? "-"}`);

package/dist/cli/commands/cron/services/cron-local.service.d.ts

@@ -1,6 +1,5 @@
 import { CronAddOptions } from "../../../../shared/types/cli.types.js";
 import { CronJobView } from "../utils/cron-job.utils.js";
-import { AutomationManager } from "@nextclaw/kernel";
 import { CronCreateRequest } from "@nextclaw/server";
 
 //#region src/cli/commands/cron/services/cron-local.service.d.ts
@@ -10,7 +9,7 @@ declare function createCronCreateRequest(opts: CronAddOptions): {
 };
 declare class CronLocalService {
   private readonly automation;
-  constructor(automation?: AutomationManager);
+  constructor(automation?: any);
   readonly list: (all: boolean) => CronJobView[];
   readonly addRequest: (request: CronCreateRequest) => CronJobView;
   readonly add: (opts: CronAddOptions) => {

package/dist/cli/commands/skills/index.js

@@ -1,6 +1,6 @@
 import { resolveSkillsInstallWorkdir } from "../../../shared/utils/runtime-helpers.js";
 import { buildMarketplacePublishOptions, buildMarketplaceUpdateOptions } from "./marketplace-command-options.utils.js";
-import { installMarketplaceSkill, publishMarketplaceSkill } from "./marketplace.service.js";
+import { installMarketplaceSkill, publishMarketplaceSkill } from "./marketplace.utils.js";
 import { SkillsQueryService } from "./skills-query.service.js";
 import { loadConfig } from "@nextclaw/core";
 //#region src/cli/commands/skills/index.ts

package/dist/cli/commands/skills/marketplace-client.d.ts

@@ -26,6 +26,16 @@ declare function fetchMarketplaceSkillFiles(apiBase: string, slug: string): Prom
   files: MarketplaceSkillFileManifestEntry[];
 }>;
 declare function fetchMarketplaceSkillFileBlob(apiBase: string, slug: string, file: MarketplaceSkillFileManifestEntry): Promise<Buffer>;
+declare function collectMarketplaceSkillFiles(rootDir: string): Array<{
+  path: string;
+  contentBase64: string;
+}>;
+declare function writeMarketplaceSkillFiles(params: {
+  destinationDir: string;
+  files: MarketplaceSkillFileManifestEntry[];
+  apiBase: string;
+  slug: string;
+}): Promise<void>;
 declare function readMarketplaceEnvelope<T>(response: Response): Promise<MarketplaceEnvelope<T>>;
 //#endregion
-export { MarketplaceSkillFileManifestEntry, fetchMarketplaceSkillFileBlob, fetchMarketplaceSkillFiles, fetchMarketplaceSkillItem, readMarketplaceEnvelope, resolveMarketplaceAdminToken, resolveMarketplaceApiBase };
+export { MarketplaceSkillFileManifestEntry, collectMarketplaceSkillFiles, fetchMarketplaceSkillFileBlob, fetchMarketplaceSkillFiles, fetchMarketplaceSkillItem, readMarketplaceEnvelope, resolveMarketplaceAdminToken, resolveMarketplaceApiBase, writeMarketplaceSkillFiles };

package/dist/cli/commands/skills/marketplace-client.js

@@ -1,4 +1,6 @@
 import { runWithMarketplaceNetworkRetry } from "./marketplace-network-retry.js";
+import { mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
+import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 //#region src/cli/commands/skills/marketplace-client.ts
 const DEFAULT_MARKETPLACE_API_BASE = "https://marketplace-api.nextclaw.io";
 function resolveMarketplaceApiBase(explicitBase) {
@@ -54,6 +56,37 @@ async function fetchMarketplaceSkillFileBlob(apiBase, slug, file) {
 		return Buffer.from(await response.arrayBuffer());
 	});
 }
+function collectMarketplaceSkillFiles(rootDir) {
+	const output = [];
+	const walk = (dir, prefix) => {
+		const entries = readdirSync(dir, { withFileTypes: true });
+		for (const entry of entries) {
+			const absolute = join(dir, entry.name);
+			const relativePath = prefix ? `${prefix}/${entry.name}` : entry.name;
+			if (entry.isDirectory()) {
+				walk(absolute, relativePath);
+				continue;
+			}
+			if (!entry.isFile()) continue;
+			output.push({
+				path: relativePath,
+				contentBase64: readFileSync(absolute).toString("base64")
+			});
+		}
+	};
+	walk(rootDir, "");
+	return output;
+}
+async function writeMarketplaceSkillFiles(params) {
+	const { destinationDir, files, apiBase, slug } = params;
+	for (const file of files) {
+		const targetPath = resolve(destinationDir, ...file.path.split("/"));
+		const rel = relative(destinationDir, targetPath);
+		if (rel.startsWith("..") || isAbsolute(rel)) throw new Error(`Invalid marketplace file path: ${file.path}`);
+		mkdirSync(dirname(targetPath), { recursive: true });
+		writeFileSync(targetPath, file.contentBase64 ? decodeMarketplaceFileContent(file.path, file.contentBase64) : await fetchMarketplaceSkillFileBlob(apiBase, slug, file));
+	}
+}
 async function readMarketplaceEnvelope(response) {
 	const raw = await response.text();
 	let payload;
@@ -77,8 +110,13 @@ function extractMarketplaceErrorMessage(raw, fallbackStatus) {
 		return raw || `Request failed (${fallbackStatus})`;
 	}
 }
+function decodeMarketplaceFileContent(path, contentBase64) {
+	const normalized = contentBase64.replace(/\s+/g, "");
+	if (!normalized || normalized.length % 4 !== 0 || !/^[A-Za-z0-9+/]+={0,2}$/.test(normalized)) throw new Error(`Invalid marketplace file contentBase64 for path: ${path}`);
+	return Buffer.from(normalized, "base64");
+}
 function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
-export { fetchMarketplaceSkillFileBlob, fetchMarketplaceSkillFiles, fetchMarketplaceSkillItem, readMarketplaceEnvelope, resolveMarketplaceAdminToken, resolveMarketplaceApiBase };
+export { collectMarketplaceSkillFiles, fetchMarketplaceSkillFileBlob, fetchMarketplaceSkillFiles, fetchMarketplaceSkillItem, readMarketplaceEnvelope, resolveMarketplaceAdminToken, resolveMarketplaceApiBase, writeMarketplaceSkillFiles };

package/dist/cli/commands/skills/marketplace-command-options.utils.d.ts

@@ -1,4 +1,4 @@
-import { MarketplaceSkillPublishOptions } from "./marketplace.service.js";
+import { MarketplaceSkillPublishOptions } from "./marketplace.utils.js";
 
 //#region src/cli/commands/skills/marketplace-command-options.utils.d.ts
 type MarketplacePublishCommandOptions = {

package/dist/cli/commands/skills/marketplace.metadata.d.ts

@@ -1,5 +1,6 @@
+import { LocalizedTextMap, buildLocalizedTextMap, parseSkillFrontmatter } from "@nextclaw/kernel";
+
 //#region src/cli/commands/skills/marketplace.metadata.d.ts
-type LocalizedTextMap = Record<string, string>;
 type MarketplaceSkillPublishMetadata = {
   slug?: string;
   name?: string;
@@ -14,16 +15,6 @@ type MarketplaceSkillPublishMetadata = {
   publishedAt?: string;
   updatedAt?: string;
 };
-declare function parseSkillFrontmatter(raw: string): {
-  name?: string;
-  summary?: string;
-  summaryI18n?: LocalizedTextMap;
-  description?: string;
-  descriptionI18n?: LocalizedTextMap;
-  author?: string;
-  tags?: string[];
-};
-declare function buildLocalizedTextMap(englishText: string, ...maps: Array<LocalizedTextMap | Partial<LocalizedTextMap> | undefined>): LocalizedTextMap;
 declare function readMarketplaceMetadataFile(skillDir: string, explicitMetaFile?: string): MarketplaceSkillPublishMetadata;
 //#endregion
-export { LocalizedTextMap, MarketplaceSkillPublishMetadata, buildLocalizedTextMap, parseSkillFrontmatter, readMarketplaceMetadataFile };
+export { type LocalizedTextMap, MarketplaceSkillPublishMetadata, buildLocalizedTextMap, parseSkillFrontmatter, readMarketplaceMetadataFile };

package/dist/cli/commands/skills/marketplace.metadata.js

@@ -1,39 +1,8 @@
+import { buildLocalizedTextMap, parseSkillFrontmatter } from "@nextclaw/kernel";
 import { existsSync, readFileSync } from "node:fs";
 import { resolve } from "node:path";
-import { parse } from "yaml";
 //#region src/cli/commands/skills/marketplace.metadata.ts
 const DEFAULT_MARKETPLACE_META_FILENAME = "marketplace.json";
-function parseSkillFrontmatter(raw) {
-	const match = raw.replace(/\r\n/g, "\n").match(/^---\n([\s\S]*?)\n---/);
-	if (!match || !match[1]) return {};
-	let parsed;
-	try {
-		parsed = parse(match[1]);
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		throw new Error(`Invalid SKILL.md frontmatter: ${message}`);
-	}
-	if (!isRecord(parsed)) return {};
-	const summaryI18n = readLocalizedTextMapField(parsed, [["summaryi18n"], ["summary_i18n"]]);
-	const descriptionI18n = readLocalizedTextMapField(parsed, [["descriptioni18n"], ["description_i18n"]]);
-	const summaryZh = readFrontmatterStringField(parsed, [["summaryzh"], ["summary_zh"]]);
-	const descriptionZh = readFrontmatterStringField(parsed, [["descriptionzh"], ["description_zh"]]);
-	return {
-		name: readFrontmatterStringField(parsed, [["name"]]),
-		summary: readFrontmatterStringField(parsed, [["summary"]]),
-		summaryI18n: mergeLocalizedTextMap(summaryI18n, { zh: summaryZh }),
-		description: readFrontmatterStringField(parsed, [["description"]]),
-		descriptionI18n: mergeLocalizedTextMap(descriptionI18n, { zh: descriptionZh }),
-		author: readFrontmatterStringField(parsed, [["author"]]),
-		tags: readFrontmatterTags(parsed)
-	};
-}
-function buildLocalizedTextMap(englishText, ...maps) {
-	return {
-		...mergeLocalizedTextMap(...maps) ?? {},
-		en: englishText
-	};
-}
 function readMarketplaceMetadataFile(skillDir, explicitMetaFile) {
 	const metadataPath = resolveMarketplaceMetadataPath(skillDir, explicitMetaFile);
 	if (!metadataPath) return {};
@@ -64,15 +33,6 @@ function resolveMarketplaceMetadataPath(skillDir, explicitMetaFile) {
 	const resolved = explicitMetaFile?.trim() ? resolve(explicitMetaFile) : resolve(skillDir, DEFAULT_MARKETPLACE_META_FILENAME);
 	return existsSync(resolved) ? resolved : void 0;
 }
-function mergeLocalizedTextMap(...maps) {
-	const localized = {};
-	for (const map of maps) for (const [locale, text] of Object.entries(map ?? {})) {
-		const normalizedText = typeof text === "string" ? text.trim() : "";
-		if (!normalizedText) continue;
-		localized[normalizeLocaleTag(locale)] = normalizedText;
-	}
-	return Object.keys(localized).length > 0 ? localized : void 0;
-}
 function readMetadataString(record, fieldName) {
 	const value = record[fieldName];
 	if (value == null) return;
@@ -102,52 +62,6 @@ function readMetadataLocalizedTextMap(record, fieldName) {
 	}
 	return Object.keys(localized).length > 0 ? localized : void 0;
 }
-function readFrontmatterStringField(record, keyPaths) {
-	for (const keyPath of keyPaths) {
-		const value = readNestedFrontmatterValue(record, keyPath);
-		if (typeof value !== "string") continue;
-		const normalized = value.trim();
-		if (normalized) return normalized;
-	}
-}
-function readLocalizedTextMapField(record, keyPaths) {
-	for (const keyPath of keyPaths) {
-		const value = readNestedFrontmatterValue(record, keyPath);
-		if (!isRecord(value)) continue;
-		const normalized = {};
-		for (const [locale, text] of Object.entries(value)) {
-			if (typeof text !== "string") continue;
-			const trimmed = text.trim();
-			if (!trimmed) continue;
-			normalized[normalizeLocaleTag(locale)] = trimmed;
-		}
-		if (Object.keys(normalized).length > 0) return normalized;
-	}
-}
-function readFrontmatterTags(record) {
-	const rawTags = readNestedFrontmatterValue(record, ["tags"]);
-	if (Array.isArray(rawTags)) {
-		const tags = rawTags.filter((entry) => typeof entry === "string").map((entry) => entry.trim()).filter(Boolean);
-		return tags.length > 0 ? tags : void 0;
-	}
-	if (typeof rawTags !== "string") return;
-	const tags = rawTags.split(",").map((entry) => entry.trim()).filter(Boolean);
-	return tags.length > 0 ? tags : void 0;
-}
-function readNestedFrontmatterValue(record, keyPath) {
-	let current = record;
-	for (const rawKey of keyPath) {
-		if (!isRecord(current)) return;
-		const normalizedKey = normalizeFrontmatterKey(rawKey);
-		const matchingKey = Object.keys(current).find((candidate) => normalizeFrontmatterKey(candidate) === normalizedKey);
-		if (!matchingKey) return;
-		current = current[matchingKey];
-	}
-	return current;
-}
-function normalizeFrontmatterKey(raw) {
-	return raw.replace(/[-_]/g, "").toLowerCase();
-}
 function normalizeLocaleTag(raw) {
 	return raw.trim().toLowerCase();
 }

package/dist/cli/commands/skills/{marketplace.service.d.ts → marketplace.utils.d.ts}

@@ -1,6 +1,6 @@
 import { LocalizedTextMap } from "./marketplace.metadata.js";
 
-//#region src/cli/commands/skills/marketplace.service.d.ts
+//#region src/cli/commands/skills/marketplace.utils.d.ts
 type MarketplaceSkillInstallKind = "builtin" | "marketplace";
 type MarketplaceSkillInstallOptions = {
   slug: string;

package/dist/cli/commands/skills/{marketplace.service.js → marketplace.utils.js}

@@ -2,12 +2,13 @@ import { PlatformAuthCommands } from "../../../commands/platform-auth/services/p
 import "../../../commands/platform-auth/index.js";
 import { buildLocalizedTextMap, parseSkillFrontmatter, readMarketplaceMetadataFile } from "./marketplace.metadata.js";
 import { runWithMarketplaceNetworkRetry } from "./marketplace-network-retry.js";
-import { fetchMarketplaceSkillFileBlob, fetchMarketplaceSkillFiles, fetchMarketplaceSkillItem, readMarketplaceEnvelope, resolveMarketplaceAdminToken, resolveMarketplaceApiBase } from "./marketplace-client.js";
+import { collectMarketplaceSkillFiles, fetchMarketplaceSkillFiles, fetchMarketplaceSkillItem, readMarketplaceEnvelope, resolveMarketplaceAdminToken, resolveMarketplaceApiBase, writeMarketplaceSkillFiles } from "./marketplace-client.js";
 import { normalizeTags, resolvePublishPackageName, validateSkillSelector, validateSkillSlug } from "./marketplace-identity.utils.js";
-import { SkillsLoader } from "@nextclaw/core";
-import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
-import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
-//#region src/cli/commands/skills/marketplace.service.ts
+import { DEFAULT_SKILLS_DIR } from "@nextclaw/core";
+import { SkillManager } from "@nextclaw/kernel";
+import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync } from "node:fs";
+import { basename, isAbsolute, join, relative, resolve } from "node:path";
+//#region src/cli/commands/skills/marketplace.utils.ts
 async function installMarketplaceSkill(options) {
 	const { slug, workdir: rawWorkdir, dir, force, apiBaseUrl } = options;
 	const selector = validateSkillSelector(slug.trim(), "slug");
@@ -52,7 +53,7 @@ async function installMarketplaceSkill(options) {
 }
 function resolveMarketplaceSkillDestinationDir(params) {
 	const { workdir, slug, dir } = params;
-	const dirName = dir?.trim() || "skills";
+	const dirName = dir?.trim() || DEFAULT_SKILLS_DIR;
 	return isAbsolute(dirName) ? resolve(dirName, slug) : resolve(workdir, dirName, slug);
 }
 function resolveBuiltinMarketplaceInstallResult(params) {
@@ -86,16 +87,6 @@ function prepareMarketplaceSkillDestinationDir(params) {
 	mkdirSync(destinationDir, { recursive: true });
 	return null;
 }
-async function writeMarketplaceSkillFiles(params) {
-	const { destinationDir, files, apiBase, slug } = params;
-	for (const file of files) {
-		const targetPath = resolve(destinationDir, ...file.path.split("/"));
-		const rel = relative(destinationDir, targetPath);
-		if (rel.startsWith("..") || isAbsolute(rel)) throw new Error(`Invalid marketplace file path: ${file.path}`);
-		mkdirSync(dirname(targetPath), { recursive: true });
-		writeFileSync(targetPath, file.contentBase64 ? decodeMarketplaceFileContent(file.path, file.contentBase64) : await fetchMarketplaceSkillFileBlob(apiBase, slug, file));
-	}
-}
 function ensureInstalledMarketplaceSkill(destinationDir, slug) {
 	if (!existsSync(join(destinationDir, "SKILL.md"))) throw new Error(`Marketplace skill ${slug} does not include SKILL.md`);
 }
@@ -143,7 +134,7 @@ async function publishMarketplaceSkill(options) {
 	const { skillDir: rawSkillDir, slug: explicitSlug, metaFile, packageName: explicitPackageName, scope: explicitScope, name: explicitName, summary: explicitSummary, summaryI18n: explicitSummaryI18n, description: explicitDescription, descriptionI18n: explicitDescriptionI18n, tags: explicitTags, sourceRepo: explicitSourceRepo, homepage: explicitHomepage, publishedAt: explicitPublishedAt, updatedAt: explicitUpdatedAt, apiBaseUrl, token: explicitToken, requireExisting } = options;
 	const skillDir = resolve(rawSkillDir);
 	if (!existsSync(skillDir)) throw new Error(`Skill directory not found: ${skillDir}`);
-	const files = collectFiles(skillDir);
+	const files = collectMarketplaceSkillFiles(skillDir);
 	if (!files.some((file) => file.path === "SKILL.md")) throw new Error(`Skill directory must include SKILL.md: ${skillDir}`);
 	const parsedFrontmatter = parseSkillFrontmatter(readFileSync(join(skillDir, "SKILL.md"), "utf8"));
 	const metadata = readMarketplaceMetadataFile(skillDir, metaFile);
@@ -202,37 +193,10 @@ async function publishMarketplaceSkill(options) {
 		fileCount: payload.data.fileCount
 	};
 }
-function collectFiles(rootDir) {
-	const output = [];
-	const walk = (dir, prefix) => {
-		const entries = readdirSync(dir, { withFileTypes: true });
-		for (const entry of entries) {
-			const absolute = join(dir, entry.name);
-			const relativePath = prefix ? `${prefix}/${entry.name}` : entry.name;
-			if (entry.isDirectory()) {
-				walk(absolute, relativePath);
-				continue;
-			}
-			if (!entry.isFile()) continue;
-			const content = readFileSync(absolute);
-			output.push({
-				path: relativePath,
-				contentBase64: content.toString("base64")
-			});
-		}
-	};
-	walk(rootDir, "");
-	return output;
-}
 function resolveBuiltinSkillDir(workdir, skillName) {
-	const builtinSkill = new SkillsLoader(workdir).listSkills(false).find((skill) => skill.name === skillName && skill.source === "builtin");
-	if (!builtinSkill) throw new Error(`Built-in skill not found in local installation: ${skillName}`);
-	return dirname(builtinSkill.path);
-}
-function decodeMarketplaceFileContent(path, contentBase64) {
-	const normalized = contentBase64.replace(/\s+/g, "");
-	if (!normalized || normalized.length % 4 !== 0 || !/^[A-Za-z0-9+/]+={0,2}$/.test(normalized)) throw new Error(`Invalid marketplace file contentBase64 for path: ${path}`);
-	return Buffer.from(normalized, "base64");
+	const skillDir = new SkillManager({ workspace: workdir }).resolveBuiltinSkillDir(skillName);
+	if (!skillDir) throw new Error(`Built-in skill not found in local installation: ${skillName}`);
+	return skillDir;
 }
 //#endregion
 export { installMarketplaceSkill, publishMarketplaceSkill };

package/dist/cli/commands/skills/skills-query.service.d.ts

@@ -1,5 +1,4 @@
-import { LocalizedTextMap } from "./marketplace.metadata.js";
-import { SkillScope } from "@nextclaw/core";
+import { LocalizedTextMap } from "@nextclaw/kernel";
 
 //#region src/cli/commands/skills/skills-query.service.d.ts
 type MarketplaceSkillSort = "relevance" | "updated";
@@ -56,31 +55,6 @@ type MarketplaceSkillRecommendationView = {
   total: number;
   items: MarketplaceSkillItemSummary[];
 };
-type InstalledSkillSummaryView = {
-  ref: string;
-  name: string;
-  path: string;
-  relativePath: string | null;
-  scope: SkillScope;
-  source: SkillScope;
-  summary: string | null;
-  summaryI18n: LocalizedTextMap | null;
-  description: string | null;
-  descriptionI18n: LocalizedTextMap | null;
-  author: string | null;
-  tags: string[];
-  always: boolean;
-};
-type InstalledSkillDetailView = InstalledSkillSummaryView & {
-  metadata: Record<string, string> | null;
-  raw: string;
-  bodyRaw: string;
-};
-type InstalledSkillsListView = {
-  workspace: string;
-  total: number;
-  skills: InstalledSkillSummaryView[];
-};
 type MarketplaceSkillsSearchView = MarketplaceSkillListView & {
   apiBaseUrl: string;
 };
@@ -98,11 +72,11 @@ declare class SkillsQueryService {
     workdir: string;
     query?: string;
     scope?: string;
-  }) => InstalledSkillsListView;
+  }) => any;
   getInstalledInfo: (params: {
     workdir: string;
     selector: string;
-  }) => InstalledSkillDetailView;
+  }) => any;
   searchMarketplaceSkills: (params: {
     apiBaseUrl?: string;
     query?: string;
@@ -120,17 +94,10 @@ declare class SkillsQueryService {
     scene?: string;
     limit?: string | number;
   }) => Promise<MarketplaceSkillsRecommendationResultView>;
-  private buildInstalledSkillSummary;
-  private buildInstalledSkillDetail;
-  private matchesInstalledSkillQuery;
-  private stripFrontmatter;
-  private readAlwaysFlag;
-  private buildRelativePath;
   private normalizeMarketplaceSummary;
   private normalizeMarketplaceItem;
   private normalizeMarketplaceContent;
   private normalizeMarketplaceInstallSpec;
-  private normalizeInstalledScope;
   private normalizeMarketplaceSort;
   private normalizePositiveInteger;
   private normalizeRequiredString;
@@ -138,4 +105,4 @@ declare class SkillsQueryService {
   private fetchMarketplaceView;
 }
 //#endregion
-export { InstalledSkillDetailView, InstalledSkillSummaryView, InstalledSkillsListView, MarketplaceSkillInfoView, MarketplaceSkillsRecommendationResultView, MarketplaceSkillsSearchView, SkillsQueryService };
+export { MarketplaceSkillInfoView, MarketplaceSkillsRecommendationResultView, MarketplaceSkillsSearchView, SkillsQueryService };