@nextclaw/service 0.1.11 → 0.1.13

package/dist/cli/commands/skills/skills-query.service.js

@@ -1,41 +1,32 @@
-import { parseSkillFrontmatter } from "./marketplace.metadata.js";
 import { runWithMarketplaceNetworkRetry } from "./marketplace-network-retry.js";
 import { readMarketplaceEnvelope, resolveMarketplaceApiBase } from "./marketplace-client.js";
-import { SkillsLoader } from "@nextclaw/core";
-import { readFileSync } from "node:fs";
-import { relative, resolve } from "node:path";
+import { SkillManager } from "@nextclaw/kernel";
+import { resolve } from "node:path";
 //#region src/cli/commands/skills/skills-query.service.ts
 var SkillsQueryService = class {
 	listInstalled = (params) => {
-		const workspace = resolve(params.workdir);
-		const loader = new SkillsLoader(workspace);
-		const scope = this.normalizeInstalledScope(params.scope);
-		const normalizedQuery = this.normalizeOptionalString(params.query)?.toLowerCase() ?? null;
-		const skills = loader.listSkills(false).map((skill) => this.buildInstalledSkillSummary(skill, loader, workspace)).filter((skill) => scope === "all" || skill.scope === scope).filter((skill) => this.matchesInstalledSkillQuery(skill, normalizedQuery));
-		return {
-			workspace,
-			total: skills.length,
-			skills
-		};
+		return new SkillManager({ workspace: resolve(params.workdir) }).listInstalledSkills({
+			scope: params.scope,
+			query: params.query
+		});
 	};
 	getInstalledInfo = (params) => {
-		const workspace = resolve(params.workdir);
-		const loader = new SkillsLoader(workspace);
-		const skill = loader.getSkillInfo(params.selector);
-		if (!skill) throw new Error(`Installed skill not found: ${params.selector}`);
-		return this.buildInstalledSkillDetail(skill, loader, workspace);
+		const detail = new SkillManager({ workspace: resolve(params.workdir) }).getInstalledSkillDetail(params.selector);
+		if (!detail) throw new Error(`Installed skill not found: ${params.selector}`);
+		return detail;
 	};
 	searchMarketplaceSkills = async (params) => {
-		const apiBaseUrl = resolveMarketplaceApiBase(params.apiBaseUrl);
+		const { apiBaseUrl: rawApiBaseUrl, page, pageSize, query, sort, tag } = params;
+		const apiBaseUrl = resolveMarketplaceApiBase(rawApiBaseUrl);
 		const result = await this.fetchMarketplaceView({
 			apiBaseUrl,
 			path: "/api/v1/skills/items",
 			query: {
-				q: this.normalizeOptionalString(params.query) ?? void 0,
-				tag: this.normalizeOptionalString(params.tag) ?? void 0,
-				sort: this.normalizeMarketplaceSort(params.sort),
-				page: this.normalizePositiveInteger(params.page),
-				pageSize: this.normalizePositiveInteger(params.pageSize)
+				q: this.normalizeOptionalString(query) ?? void 0,
+				tag: this.normalizeOptionalString(tag) ?? void 0,
+				sort: this.normalizeMarketplaceSort(sort),
+				page: this.normalizePositiveInteger(page),
+				pageSize: this.normalizePositiveInteger(pageSize)
 			}
 		});
 		return {
@@ -85,73 +76,6 @@ var SkillsQueryService = class {
 			items: result.items.map((item) => this.normalizeMarketplaceSummary(item))
 		};
 	};
-	buildInstalledSkillSummary = (skill, loader, workspace) => {
-		const raw = readFileSync(skill.path, "utf8");
-		const metadata = loader.getSkillMetadata(skill);
-		const frontmatter = parseSkillFrontmatter(raw);
-		return {
-			ref: skill.ref,
-			name: skill.name,
-			path: skill.path,
-			relativePath: this.buildRelativePath(workspace, skill.path),
-			scope: skill.scope,
-			source: skill.source,
-			summary: frontmatter.summary ?? null,
-			summaryI18n: frontmatter.summaryI18n ?? null,
-			description: frontmatter.description ?? metadata?.description ?? null,
-			descriptionI18n: frontmatter.descriptionI18n ?? null,
-			author: frontmatter.author ?? null,
-			tags: frontmatter.tags ?? [],
-			always: this.readAlwaysFlag(metadata)
-		};
-	};
-	buildInstalledSkillDetail = (skill, loader, workspace) => {
-		const summary = this.buildInstalledSkillSummary(skill, loader, workspace);
-		const raw = readFileSync(skill.path, "utf8");
-		return {
-			...summary,
-			metadata: loader.getSkillMetadata(skill),
-			raw,
-			bodyRaw: this.stripFrontmatter(raw)
-		};
-	};
-	matchesInstalledSkillQuery = (skill, query) => {
-		if (!query) return true;
-		return [
-			skill.ref,
-			skill.name,
-			skill.path,
-			skill.relativePath ?? "",
-			skill.scope,
-			skill.source,
-			skill.summary ?? "",
-			skill.description ?? "",
-			skill.author ?? "",
-			...skill.tags,
-			...Object.values(skill.summaryI18n ?? {}),
-			...Object.values(skill.descriptionI18n ?? {})
-		].some((value) => value.toLowerCase().includes(query));
-	};
-	stripFrontmatter = (raw) => {
-		const normalized = raw.replace(/\r\n/g, "\n");
-		const match = normalized.match(/^---\n[\s\S]*?\n---\n?/);
-		if (!match) return normalized.trim();
-		return normalized.slice(match[0].length).trim();
-	};
-	readAlwaysFlag = (metadata) => {
-		if (metadata?.always === "true") return true;
-		const raw = metadata?.metadata;
-		if (!raw) return false;
-		try {
-			return JSON.parse(raw).nextclaw?.always === true;
-		} catch {
-			return false;
-		}
-	};
-	buildRelativePath = (workspace, absolutePath) => {
-		const relativePath = relative(workspace, absolutePath).replace(/\\/g, "/");
-		return relativePath.startsWith("..") ? null : relativePath;
-	};
 	normalizeMarketplaceSummary = (item) => ({
 		...item,
 		install: this.normalizeMarketplaceInstallSpec(item.install, item.slug)
@@ -168,12 +92,6 @@ var SkillsQueryService = class {
 		...install,
 		command: `nextclaw marketplace skills install ${slug}`
 	});
-	normalizeInstalledScope = (value) => {
-		const normalized = this.normalizeOptionalString(value);
-		if (!normalized || normalized === "all") return "all";
-		if (normalized === "builtin" || normalized === "project" || normalized === "workspace") return normalized;
-		throw new Error(`Invalid skill scope: ${value}. Expected all, builtin, project, or workspace.`);
-	};
 	normalizeMarketplaceSort = (value) => {
 		const normalized = this.normalizeOptionalString(value);
 		if (!normalized) return;

package/dist/cli/commands/usage/services/llm-usage-command.service.d.ts

@@ -1,21 +1,19 @@
 import { UsageCommandOptions } from "../../../../shared/types/cli.types.js";
-import { LlmUsageQueryService } from "./llm-usage-query.service.js";
+import { LlmUsageManager } from "@nextclaw/kernel";
 
 //#region src/cli/commands/usage/services/llm-usage-command.service.d.ts
 declare class LlmUsageCommandService {
-  private readonly deps;
+  private readonly usageManager;
   constructor(deps?: {
-    queryService?: LlmUsageQueryService;
+    usageManager?: LlmUsageManager;
   });
   readonly show: (opts?: UsageCommandOptions) => Promise<void>;
-  private get queryService();
   private readonly showSnapshot;
   private readonly showHistory;
   private readonly showStats;
   private readonly renderSnapshot;
   private readonly renderHistory;
   private readonly renderStats;
-  private readonly resolveLimit;
   private readonly toPercent;
 }
 //#endregion

package/dist/cli/commands/usage/services/llm-usage-command.service.js

@@ -1,8 +1,9 @@
-import { llmUsageQueryService } from "./llm-usage-query.service.js";
+import { LlmUsageManager } from "@nextclaw/kernel";
 //#region src/cli/commands/usage/services/llm-usage-command.service.ts
 var LlmUsageCommandService = class {
+	usageManager;
 	constructor(deps = {}) {
-		this.deps = deps;
+		this.usageManager = deps.usageManager ?? new LlmUsageManager();
 	}
 	show = async (opts = {}) => {
 		if (opts.history && opts.stats) {
@@ -20,16 +21,13 @@ var LlmUsageCommandService = class {
 		}
 		this.showSnapshot(opts);
 	};
-	get queryService() {
-		return this.deps.queryService ?? llmUsageQueryService;
-	}
 	showSnapshot = (opts) => {
-		const snapshot = this.queryService.getSnapshot();
+		const snapshot = this.usageManager.getSnapshot();
 		if (opts.json) {
 			console.log(JSON.stringify({
 				ok: Boolean(snapshot),
 				mode: "snapshot",
-				path: this.queryService.snapshotPath,
+				path: this.usageManager.snapshotPath,
 				snapshot
 			}, null, 2));
 			process.exitCode = 0;
@@ -38,7 +36,7 @@ var LlmUsageCommandService = class {
 		if (!snapshot) {
 			console.log([
 				"No LLM usage snapshot recorded yet.",
-				`Snapshot path: ${this.queryService.snapshotPath}`,
+				`Snapshot path: ${this.usageManager.snapshotPath}`,
 				"Run `nextclaw agent -m \"ping\"` or use the local UI once, then retry `nextclaw usage`."
 			].join("\n"));
 			process.exitCode = 0;
@@ -48,13 +46,13 @@ var LlmUsageCommandService = class {
 		process.exitCode = 0;
 	};
 	showHistory = (opts) => {
-		const records = this.queryService.getHistory(opts.limit);
+		const records = this.usageManager.getHistory(opts.limit);
 		if (opts.json) {
 			console.log(JSON.stringify({
 				ok: records.length > 0,
 				mode: "history",
-				path: this.queryService.historyPath,
-				limit: this.resolveLimit(opts.limit),
+				path: this.usageManager.historyPath,
+				limit: this.usageManager.resolveHistoryLimit(opts.limit),
 				records
 			}, null, 2));
 			process.exitCode = 0;
@@ -63,7 +61,7 @@ var LlmUsageCommandService = class {
 		if (records.length === 0) {
 			console.log([
 				"No LLM usage history recorded yet.",
-				`History path: ${this.queryService.historyPath}`,
+				`History path: ${this.usageManager.historyPath}`,
 				"Run `nextclaw agent -m \"ping\"` or use the local UI once, then retry `nextclaw usage --history`."
 			].join("\n"));
 			process.exitCode = 0;
@@ -73,12 +71,12 @@ var LlmUsageCommandService = class {
 		process.exitCode = 0;
 	};
 	showStats = (opts) => {
-		const stats = this.queryService.getStats();
+		const stats = this.usageManager.getStats();
 		if (opts.json) {
 			console.log(JSON.stringify({
 				ok: stats.totalRecords > 0,
 				mode: "stats",
-				path: this.queryService.historyPath,
+				path: this.usageManager.historyPath,
 				stats
 			}, null, 2));
 			process.exitCode = 0;
@@ -87,7 +85,7 @@ var LlmUsageCommandService = class {
 		if (stats.totalRecords === 0) {
 			console.log([
 				"No LLM usage history recorded yet.",
-				`History path: ${this.queryService.historyPath}`,
+				`History path: ${this.usageManager.historyPath}`,
 				"Run `nextclaw agent -m \"ping\"` or use the local UI once, then retry `nextclaw usage --stats`."
 			].join("\n"));
 			process.exitCode = 0;
@@ -107,7 +105,7 @@ var LlmUsageCommandService = class {
 			`Total tokens: ${snapshot.summary.totalTokens}`,
 			`Cached tokens: ${snapshot.summary.cachedTokens}`,
 			`Cache hit: ${snapshot.summary.cacheHit ? "yes" : "no"}`,
-			`Snapshot path: ${this.queryService.snapshotPath}`
+			`Snapshot path: ${this.usageManager.snapshotPath}`
 		];
 		if (snapshot.summary.cacheMetricKeys.length > 0) lines.push(`Cache metric keys: ${snapshot.summary.cacheMetricKeys.join(", ")}`);
 		if (Object.keys(snapshot.usage).length > 0) lines.push("", "Raw usage:", JSON.stringify(snapshot.usage, null, 2));
@@ -116,7 +114,7 @@ var LlmUsageCommandService = class {
 	renderHistory = (records) => {
 		const lines = [
 			"Recent LLM usage history",
-			`History path: ${this.queryService.historyPath}`,
+			`History path: ${this.usageManager.historyPath}`,
 			`Showing: ${records.length} record(s)`,
 			""
 		];
@@ -126,7 +124,7 @@ var LlmUsageCommandService = class {
 	renderStats = (stats) => {
 		const lines = [
 			"LLM usage history stats",
-			`History path: ${this.queryService.historyPath}`,
+			`History path: ${this.usageManager.historyPath}`,
 			`Records: ${stats.totalRecords}`,
 			`Usage records: ${stats.usageRecordCount}`,
 			`Empty usage records: ${stats.emptyUsageRecordCount}`,
@@ -144,14 +142,6 @@ var LlmUsageCommandService = class {
 		if (stats.models.length > 0) lines.push(`Models: ${stats.models.map((item) => `${item.value}=${item.count}`).join(", ")}`);
 		return lines.join("\n");
 	};
-	resolveLimit = (value) => {
-		if (typeof value === "number" && Number.isFinite(value) && value > 0) return Math.floor(value);
-		if (typeof value === "string" && value.trim().length > 0) {
-			const parsed = Number(value);
-			if (Number.isFinite(parsed) && parsed > 0) return Math.floor(parsed);
-		}
-		return 10;
-	};
 	toPercent = (value) => {
 		return `${(value * 100).toFixed(1)}%`;
 	};

package/dist/commands/channel/channel-list-view.service.d.ts

@@ -26,7 +26,6 @@ declare class ChannelListViewService {
   private toChannelListEntry;
   private resolveAccounts;
   private mergeChannelSources;
-  private discoverExtensionManifests;
   private resolveDefaultAccountId;
 }
 //#endregion

package/dist/commands/channel/channel-list-view.service.js

@@ -1,6 +1,5 @@
 import { resolveChannelConfigView } from "./channel-config-view.js";
-import { ExtensionManifestDiscoveryService } from "../../shared/services/extensions/extension-lifecycle.service.js";
-import { resolveExtensionManifestRoots } from "../../shared/services/extensions/service-extension-runtime.service.js";
+import { listExtensionChannelIds } from "@nextclaw/kernel";
 //#region src/commands/channel/channel-list-view.service.ts
 function readRecord(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
@@ -12,22 +11,14 @@ function readString(value) {
 var ChannelListViewService = class {
 	build = (params) => {
 		const { config, pluginBindings, workspaceDir } = params;
-		const sources = this.mergeChannelSources(pluginBindings.map(this.toPluginChannelSource), this.toManifestChannelSources(this.discoverExtensionManifests(config, workspaceDir)));
+		const sources = this.mergeChannelSources(pluginBindings.map(this.toPluginChannelSource), this.toManifestChannelSources(listExtensionChannelIds({
+			config,
+			workspace: workspaceDir
+		})));
 		const channelConfigs = readRecord(resolveChannelConfigView(config, pluginBindings).channels) ?? {};
 		return { channels: sources.map((source) => this.toChannelListEntry(source, channelConfigs[source.id])).sort((left, right) => left.id.localeCompare(right.id)) };
 	};
-	toManifestChannelSources = (manifests) => {
-		const sources = [];
-		for (const manifest of manifests) {
-			const channels = manifest.contributes?.channels ?? [];
-			for (const channel of channels) {
-				const channelId = readString(channel.id);
-				if (!channelId) continue;
-				sources.push({ id: channelId });
-			}
-		}
-		return sources;
-	};
+	toManifestChannelSources = (channelIds) => channelIds.map((id) => ({ id }));
 	toPluginChannelSource = (binding) => ({
 		id: binding.channelId,
 		resolveDefaultAccountId: (channelConfig) => this.resolveDefaultAccountId(binding, channelConfig)
@@ -59,14 +50,6 @@ var ChannelListViewService = class {
 		for (const source of [...pluginSources, ...extensionSources]) sourcesByChannelId.set(source.id, source);
 		return [...sourcesByChannelId.values()];
 	};
-	discoverExtensionManifests = (config, workspaceDir) => {
-		const discovery = new ExtensionManifestDiscoveryService();
-		const roots = resolveExtensionManifestRoots({
-			config,
-			workspace: workspaceDir
-		});
-		return discovery.discoverSync(roots);
-	};
 	resolveDefaultAccountId = (binding, channelConfig) => {
 		const configAdapter = binding.channel.config?.defaultAccountId;
 		if (!configAdapter) return;

package/dist/commands/channel/index.js

@@ -11,7 +11,6 @@ const CHANNEL_LABELS = {
 	whatsapp: "WhatsApp",
 	discord: "Discord",
 	feishu: "Feishu",
-	mochat: "Mochat",
 	dingtalk: "DingTalk",
 	wecom: "WeCom",
 	email: "Email",

package/dist/commands/plugin/index.d.ts

@@ -1,12 +1,10 @@
 import { PluginsInfoOptions, PluginsInstallOptions, PluginsListOptions, PluginsUninstallOptions } from "../../shared/types/cli.types.js";
-import { NextclawExtensionRegistry, toExtensionRegistry } from "./plugin-extension-registry.js";
-import { createEmptyPluginRegistry } from "./plugin-registry-loader.utils.js";
 import { Config } from "@nextclaw/core";
 import { PluginRegistry, mergePluginConfigView, toPluginConfigView } from "@nextclaw/openclaw-compat";
 
 //#region src/commands/plugin/index.d.ts
 declare function loadPluginRegistry(config: Config, workspaceDir: string): PluginRegistry;
-declare function logPluginDiagnostics(registry: PluginRegistry): void;
+declare function logPluginDiagnostics(registry: Pick<PluginRegistry, "diagnostics">): void;
 declare class PluginCommands {
   list: (opts?: PluginsListOptions) => void;
   info: (id: string, opts?: PluginsInfoOptions) => void;
@@ -27,4 +25,4 @@ declare class PluginCommands {
   private buildUninstallConfigPreview;
 }
 //#endregion
-export { type NextclawExtensionRegistry, PluginCommands, createEmptyPluginRegistry, loadPluginRegistry, logPluginDiagnostics, mergePluginConfigView, toExtensionRegistry, toPluginConfigView };
+export { PluginCommands, loadPluginRegistry, logPluginDiagnostics, mergePluginConfigView, toPluginConfigView };

package/dist/commands/plugin/index.js

@@ -1,27 +1,15 @@
-import { appendPluginCapabilityLines, buildReservedPluginLoadOptions } from "./plugin-command-utils.js";
-import { resolveDevFirstPartyPluginDir } from "./development-source/first-party-plugin-load-paths.utils.js";
-import { resolveDevPluginLoadingContext } from "./development-source/dev-plugin-overrides.utils.js";
-import { disablePluginMutation, enablePluginMutation, installPluginMutation, uninstallPluginMutation } from "./plugin-mutation-actions.js";
-import { toExtensionRegistry } from "./plugin-extension-registry.js";
-import { createEmptyPluginRegistry } from "./plugin-registry-loader.utils.js";
+import { appendPluginCapabilityLines, buildReservedPluginLoadOptions } from "./plugin-command.utils.js";
+import { disablePluginMutation, enablePluginMutation, installPluginMutation, uninstallPluginMutation } from "./plugin-mutation-actions.utils.js";
 import { getWorkspacePath, loadConfig } from "@nextclaw/core";
-import { buildPluginStatusReport, loadOpenClawPlugins, mergePluginConfigView, resolveUninstallDirectoryTargets, toPluginConfigView } from "@nextclaw/openclaw-compat";
+import { ExtensionPluginRegistryService } from "@nextclaw/kernel";
+import { buildPluginStatusReport, mergePluginConfigView, resolveUninstallDirectoryTargets, toPluginConfigView } from "@nextclaw/openclaw-compat";
 import { resolve } from "node:path";
 import { createInterface } from "node:readline";
 //#region src/commands/plugin/index.ts
 function loadPluginRegistry(config, workspaceDir) {
-	const { configWithDevPluginOverrides, excludedRoots } = resolveDevPluginLoadingContext(config, resolveDevFirstPartyPluginDir(process.env.NEXTCLAW_DEV_FIRST_PARTY_PLUGIN_DIR));
-	return loadOpenClawPlugins({
-		config: configWithDevPluginOverrides,
-		workspaceDir,
-		excludeRoots: excludedRoots,
-		...buildReservedPluginLoadOptions(),
-		logger: {
-			info: (message) => console.log(message),
-			warn: (message) => console.warn(message),
-			error: (message) => console.error(message),
-			debug: (message) => console.debug(message)
-		}
+	return new ExtensionPluginRegistryService().load({
+		config,
+		workspace: workspaceDir
 	});
 }
 function logPluginDiagnostics(registry) {
@@ -263,4 +251,4 @@ var PluginCommands = class {
 	};
 };
 //#endregion
-export { PluginCommands, createEmptyPluginRegistry, loadPluginRegistry, logPluginDiagnostics, mergePluginConfigView, toExtensionRegistry, toPluginConfigView };
+export { PluginCommands, loadPluginRegistry, logPluginDiagnostics, mergePluginConfigView, toPluginConfigView };

package/dist/commands/plugin/{plugin-command-utils.d.ts → plugin-command.utils.d.ts}

@@ -1,12 +1,11 @@
 import { PluginRegistry } from "@nextclaw/openclaw-compat";
 
-//#region src/commands/plugin/plugin-command-utils.d.ts
+//#region src/commands/plugin/plugin-command.utils.d.ts
 declare const RESERVED_PROVIDER_IDS: string[];
 declare function buildReservedPluginLoadOptions(): {
   reservedToolNames: ("read_file" | "write_file" | "edit_file" | "list_dir" | "exec" | "web_search" | "web_fetch" | "message" | "spawn" | "sessions_list" | "sessions_history" | "memory_search" | "memory_get" | "subagents" | "gateway" | "cron")[];
   reservedChannelIds: string[];
   reservedProviderIds: string[];
-  reservedNcpAgentRuntimeKinds: string[];
 };
 declare function appendPluginCapabilityLines(lines: string[], plugin: PluginRegistry["plugins"][number]): void;
 //#endregion

package/dist/commands/plugin/{plugin-command-utils.js → plugin-command.utils.js}

@@ -1,5 +1,5 @@
 import { builtinProviderIds } from "@nextclaw/runtime";
-//#region src/commands/plugin/plugin-command-utils.ts
+//#region src/commands/plugin/plugin-command.utils.ts
 const RESERVED_PROVIDER_IDS = builtinProviderIds();
 const RESERVED_TOOL_NAMES = [
 	"read_file",
@@ -23,15 +23,13 @@ function buildReservedPluginLoadOptions() {
 	return {
 		reservedToolNames: [...RESERVED_TOOL_NAMES],
 		reservedChannelIds: [],
-		reservedProviderIds: RESERVED_PROVIDER_IDS,
-		reservedNcpAgentRuntimeKinds: ["native"]
+		reservedProviderIds: RESERVED_PROVIDER_IDS
 	};
 }
 function appendPluginCapabilityLines(lines, plugin) {
 	if (plugin.toolNames.length > 0) lines.push(`Tools: ${plugin.toolNames.join(", ")}`);
 	if (plugin.channelIds.length > 0) lines.push(`Channels: ${plugin.channelIds.join(", ")}`);
 	if (plugin.providerIds.length > 0) lines.push(`Providers: ${plugin.providerIds.join(", ")}`);
-	if (plugin.ncpAgentRuntimeKinds.length > 0) lines.push(`NCP runtimes: ${plugin.ncpAgentRuntimeKinds.join(", ")}`);
 }
 //#endregion
 export { RESERVED_PROVIDER_IDS, appendPluginCapabilityLines, buildReservedPluginLoadOptions };

package/dist/commands/plugin/{plugin-mutation-actions.d.ts → plugin-mutation-actions.utils.d.ts}

@@ -1,6 +1,6 @@
 import { PluginsInstallOptions, PluginsUninstallOptions } from "../../shared/types/cli.types.js";
 
-//#region src/commands/plugin/plugin-mutation-actions.d.ts
+//#region src/commands/plugin/plugin-mutation-actions.utils.d.ts
 type PluginMutationResult = {
   message: string;
 };

package/dist/commands/plugin/{plugin-mutation-actions.js → plugin-mutation-actions.utils.js}

@@ -1,9 +1,9 @@
-import { buildReservedPluginLoadOptions } from "./plugin-command-utils.js";
+import { buildReservedPluginLoadOptions } from "./plugin-command.utils.js";
 import { expandHome, getWorkspacePath, loadConfig, saveConfig } from "@nextclaw/core";
 import { addPluginLoadPath, buildPluginStatusReport, disablePluginInConfig, enablePluginInConfig, installPluginFromNpmSpec, installPluginFromPath, recordPluginInstall, uninstallPlugin } from "@nextclaw/openclaw-compat";
 import { existsSync } from "node:fs";
 import { resolve } from "node:path";
-//#region src/commands/plugin/plugin-mutation-actions.ts
+//#region src/commands/plugin/plugin-mutation-actions.utils.ts
 const pluginInstallLogger = {
 	info: (message) => console.log(message),
 	warn: (message) => console.warn(message)

package/dist/commands/service/services/autostart/linux-systemd-autostart.service.js

@@ -1,7 +1,7 @@
 import { HostAutostartRuntimeService } from "./host-autostart-runtime.service.js";
 import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
 import { spawn } from "node:child_process";
+import { dirname, join, resolve } from "node:path";
 import { homedir } from "node:os";
 //#region src/commands/service/services/autostart/linux-systemd-autostart.service.ts
 const DEFAULT_SYSTEMD_SERVICE_NAME = "nextclaw.service";

package/dist/commands/service/services/autostart/macos-launch-agent-autostart.service.js

@@ -1,7 +1,7 @@
 import { HostAutostartRuntimeService } from "./host-autostart-runtime.service.js";
 import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { dirname, resolve } from "node:path";
 import { spawn } from "node:child_process";
+import { dirname, resolve } from "node:path";
 import { homedir } from "node:os";
 //#region src/commands/service/services/autostart/macos-launch-agent-autostart.service.ts
 const DEFAULT_LAUNCH_AGENT_LABEL = "io.nextclaw.host-agent";

package/dist/commands/service/services/autostart/windows-task-autostart.service.js

@@ -1,7 +1,7 @@
 import { HostAutostartRuntimeService } from "./host-autostart-runtime.service.js";
 import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { win32 } from "node:path";
 import { spawn } from "node:child_process";
+import { win32 } from "node:path";
 //#region src/commands/service/services/autostart/windows-task-autostart.service.ts
 const DEFAULT_TASK_NAME = "NextClaw Host Autostart";
 const SUPPORTED_PLATFORM = "win32";

package/dist/launcher/npm-runtime-launcher.service.js

@@ -5,8 +5,8 @@ import { NpmRuntimeBundleService, shouldPreferPackagedNpmRuntime } from "./npm-r
 import { inferDefaultNpmRuntimeReleaseChannel } from "./npm-runtime-update-source.service.js";
 import { NpmRuntimeUpdateStateStore } from "./npm-runtime-update-state.store.js";
 import { createExternalCommandEnv } from "@nextclaw/core";
-import { dirname, resolve } from "node:path";
 import { spawnSync } from "node:child_process";
+import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 //#region src/launcher/npm-runtime-launcher.service.ts
 var NpmRuntimeLauncher = class {

package/dist/service-runtime.service.d.ts

@@ -1,5 +1,4 @@
 import { AgentCommandOptions, LoginCommandOptions, UpdateCommandOptions } from "./shared/types/cli.types.js";
-import { PluginCommands } from "./commands/plugin/index.js";
 import { AgentCommands } from "./cli/commands/agent/services/agent-commands.service.js";
 import { ConfigCommands } from "./cli/commands/config/services/config-commands.service.js";
 import { CronCommands } from "./cli/commands/cron/services/cron-commands.service.js";
@@ -16,6 +15,7 @@ import { StopCommands } from "./cli/commands/stop/index.js";
 import { UiCommands } from "./cli/commands/ui/index.js";
 import { LlmUsageCommandService } from "./cli/commands/usage/services/llm-usage-command.service.js";
 import { ChannelCommands } from "./commands/channel/index.js";
+import { PluginCommands } from "./commands/plugin/index.js";
 import { ServiceCommands } from "./commands/service/index.js";
 import { RemoteRuntimeActions } from "@nextclaw/remote";
 

package/dist/service-runtime.service.js

@@ -9,8 +9,7 @@ import { NextclawDistributionService } from "./shared/services/runtime/nextclaw-
 import { NpmRuntimeUpdateCommandService } from "./launcher/npm-runtime-update-command.service.js";
 import { NpmRuntimeLauncher } from "./launcher/npm-runtime-launcher.service.js";
 import { managedServiceStateStore } from "./shared/stores/managed-service-state.store.js";
-import { toExtensionRegistry } from "./commands/plugin/plugin-extension-registry.js";
-import { PluginCommands, loadPluginRegistry, logPluginDiagnostics, mergePluginConfigView, toPluginConfigView as toPluginConfigView$1 } from "./commands/plugin/index.js";
+import { PluginCommands, mergePluginConfigView, toPluginConfigView as toPluginConfigView$1 } from "./commands/plugin/index.js";
 import { ChannelCommands } from "./commands/channel/index.js";
 import { ConfigCommands } from "./cli/commands/config/services/config-commands.service.js";
 import "./cli/commands/config/index.js";
@@ -41,12 +40,11 @@ import { ServeCommands } from "./cli/commands/serve/index.js";
 import { StopCommands } from "./cli/commands/stop/index.js";
 import { LlmUsageCommandService } from "./cli/commands/usage/services/llm-usage-command.service.js";
 import "./cli/commands/usage/index.js";
-import { APP_NAME, DEFAULT_WORKSPACE_DIR, DEFAULT_WORKSPACE_PATH, expandHome, getConfigPath, getDataDir, getWorkspacePath, loadConfig, resolveConfigSecrets, saveConfig } from "@nextclaw/core";
+import { APP_NAME, getConfigPath, getDataDir, loadConfig, resolveConfigSecrets, resolveWorkspacePath, saveConfig } from "@nextclaw/core";
 import { NextclawKernel } from "@nextclaw/kernel";
 import { RemoteRuntimeActions } from "@nextclaw/remote";
-import { getPluginChannelBindings, setPluginRuntimeBridge } from "@nextclaw/openclaw-compat";
+import { setPluginRuntimeBridge } from "@nextclaw/openclaw-compat";
 import { existsSync, mkdirSync } from "node:fs";
-import { join } from "node:path";
 import { spawn } from "node:child_process";
 //#region src/service-runtime.service.ts
 const FORCED_PUBLIC_UI_HOST = "0.0.0.0";
@@ -313,8 +311,7 @@ var NextclawServiceRuntime = class {
 		const force = Boolean(options.force);
 		const configPath = getConfigPath();
 		const createdConfig = initializeConfigIfMissing(configPath);
-		const workspaceSetting = loadConfig().agents.defaults.workspace;
-		const workspacePath = !workspaceSetting || workspaceSetting === DEFAULT_WORKSPACE_PATH ? join(getDataDir(), DEFAULT_WORKSPACE_DIR) : expandHome(workspaceSetting);
+		const workspacePath = resolveWorkspacePath(loadConfig().agents.defaults.workspace);
 		const workspaceExisted = existsSync(workspacePath);
 		mkdirSync(workspacePath, { recursive: true });
 		const templateResult = this.workspaceManager.createWorkspaceTemplates(workspacePath, { force });
@@ -343,15 +340,11 @@ var NextclawServiceRuntime = class {
 			configPath
 		});
 		const config = kernel.configManager.config;
-		const pluginRegistry = loadPluginRegistry(config, getWorkspacePath(config.agents.defaults.workspace));
-		const extensionRegistry = toExtensionRegistry(pluginRegistry);
-		logPluginDiagnostics(pluginRegistry);
-		const pluginChannelBindings = getPluginChannelBindings(pluginRegistry);
 		setPluginRuntimeBridge({
-			loadConfig: () => toPluginConfigView$1(resolveConfigSecrets(loadConfig(), { configPath }), pluginChannelBindings),
+			loadConfig: () => toPluginConfigView$1(resolveConfigSecrets(loadConfig(), { configPath }), kernel.extensions.getChannelBindings()),
 			writeConfigFile: async (nextConfigView) => {
 				if (!nextConfigView || typeof nextConfigView !== "object" || Array.isArray(nextConfigView)) throw new Error("plugin runtime writeConfigFile expects an object config");
-				saveConfig(mergePluginConfigView(loadConfig(), nextConfigView, pluginChannelBindings));
+				saveConfig(mergePluginConfigView(loadConfig(), nextConfigView, kernel.extensions.getChannelBindings()));
 			}
 		});
 		try {
@@ -361,8 +354,7 @@ var NextclawServiceRuntime = class {
 				opts,
 				config,
 				kernel,
-				providerManager,
-				extensionRegistry
+				providerManager
 			});
 		} finally {
 			setPluginRuntimeBridge(null);

package/dist/shared/controllers/gateway.controller.d.ts

@@ -1,18 +1,12 @@
-import { Config, CronService, GatewayController, SessionManager } from "@nextclaw/core";
-import { ChannelManager } from "@nextclaw/kernel";
+import { CronService, GatewayController, SessionManager } from "@nextclaw/core";
+import { ChannelManager, ConfigManager } from "@nextclaw/kernel";
 
 //#region src/shared/controllers/gateway.controller.d.ts
-type ConfigManagerLike = {
-  applyReloadPlan: (nextConfig: Config) => Promise<void>;
-  reloadConfig: (reason?: string) => Promise<string>;
-};
 type ControllerDeps = {
-  configManager: ConfigManagerLike;
+  configManager: ConfigManager;
   channels: ChannelManager;
   cron: CronService;
   sessionManager?: SessionManager;
-  getConfigPath: () => string;
-  saveConfig: (config: Config) => void;
   requestRestart?: (options?: {
     delayMs?: number;
     reason?: string;
@@ -25,8 +19,6 @@ declare class GatewayControllerImpl implements GatewayController {
   private resolveDeliveryContext;
   private writeRestartSentinelPayload;
   private requestRestart;
-  private createConfigMutationResult;
-  private applyConfigChange;
   status: () => Record<string, unknown>;
   reloadConfig: (reason?: string) => Promise<string>;
   restart: (options?: {