@nextclaw/server 0.12.25 → 0.12.26-beta.0

package/dist/index.js

@@ -2,13 +2,12 @@ import { Hono } from "hono";
 import { compress } from "hono/compress";
 import { serve } from "@hono/node-server";
 import { WebSocket, WebSocketServer } from "ws";
-import fs, { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { open, readFile, readdir, realpath, stat } from "node:fs/promises";
-import path, { dirname, extname, isAbsolute, join, parse, resolve } from "node:path";
+import { dirname, extname, isAbsolute, join, parse, resolve } from "node:path";
 import { createHash, randomBytes, randomUUID, scryptSync, timingSafeEqual } from "node:crypto";
 import * as NextclawCore from "@nextclaw/core";
-import { ConfigSchema, DEFAULT_WORKSPACE_PATH, buildConfigSchema, createAgentProfile, expandHome, findEffectiveAgentProfile, getDataDir, getPackageVersion, getProviderName, hasSecretRef, isSensitiveConfigPath, loadConfig, normalizeThinkingLevels, parseThinkingLevel, probeFeishu, readAgentAvatarContent, removeAgentProfile, resolveEffectiveAgentProfiles, saveConfig, updateAgentProfile } from "@nextclaw/core";
-import { discoverPluginStatusReport, enablePluginInConfig, mergePluginConfigView, toPluginConfigView } from "@nextclaw/openclaw-compat";
+import { ConfigSchema, DEFAULT_WORKSPACE_PATH, buildConfigSchema, createAgentProfile, expandHome, findEffectiveAgentProfile, getDataDir, getPackageVersion, getProviderName, hasSecretRef, isSensitiveConfigPath, loadConfig, mergeExtensionConfigView, normalizeProviderModelConfig, parseThinkingLevel, probeFeishu, readAgentAvatarContent, removeAgentProfile, resolveEffectiveAgentProfiles, saveConfig, toExtensionConfigView, updateAgentProfile } from "@nextclaw/core";
 import { homedir } from "node:os";
 import { findBuiltinProviderByName, listBuiltinProviders } from "@nextclaw/runtime";
 import { McpInstalledViewService } from "@nextclaw/mcp";
@@ -474,6 +473,8 @@ const ingressKeys = {
 	extension: {
 		channelConfigGet: createTypedKey("extension.channel.config.get"),
 		channelMessageSubmit: createTypedKey("extension.channel.message.submit"),
+		channelCommandList: createTypedKey("extension.channel.command.list"),
+		channelCommandExecute: createTypedKey("extension.channel.command.execute"),
 		response: createTypedKey("extension.response")
 	},
 	agentRun: {
@@ -649,10 +650,10 @@ function buildFallbackBootstrapStatus() {
 	return {
 		phase: "kernel-starting",
 		ncpAgent: { state: "pending" },
-		pluginHydration: {
+		extensionLoading: {
 			state: "pending",
-			loadedPluginCount: 0,
-			totalPluginCount: 0
+			loadedExtensionCount: 0,
+			totalExtensionCount: 0
 		},
 		channels: {
 			state: "pending",
@@ -676,7 +677,7 @@ var AppRoutesController = class {
 	bootstrapStatus = (c) => c.json(ok(this.options.bootstrapStatus?.getStatus() ?? buildFallbackBootstrapStatus()));
 };
 //#endregion
-//#region src/features/config/utils/plugin-channel-config-projection.utils.ts
+//#region src/features/config/utils/extension-channel-config-projection.utils.ts
 const DOCS_BASE_URL = "https://docs.nextclaw.io";
 const CHANNEL_TUTORIAL_URLS = {
 	feishu: {
@@ -686,14 +687,15 @@ const CHANNEL_TUTORIAL_URLS = {
 	},
 	weixin: { default: "https://npmx.dev/package/@nextclaw/channel-extension-weixin" }
 };
-function normalizePluginProjectionOptions(options) {
+function normalizeExtensionProjectionOptions(options) {
 	return {
-		pluginChannelBindings: options?.pluginChannelBindings ?? [],
-		pluginUiMetadata: options?.pluginUiMetadata ?? []
+		extensionChannelBindings: options?.extensionChannelBindings ?? [],
+		extensionUiMetadata: options?.extensionUiMetadata ?? []
 	};
 }
 function getProjectedConfigView(config, options) {
-	return toPluginConfigView(config, normalizePluginProjectionOptions(options).pluginChannelBindings);
+	normalizeExtensionProjectionOptions(options);
+	return toExtensionConfigView(config);
 }
 function getProjectedChannelMap(config, options) {
 	const channels = getProjectedConfigView(config, options).channels;
@@ -705,12 +707,12 @@ function getProjectedChannelConfig(config, channelName, options) {
 	if (!channel || typeof channel !== "object" || Array.isArray(channel)) return null;
 	return channel;
 }
-function buildPluginChannelUiHints(options) {
-	const normalized = normalizePluginProjectionOptions(options);
-	if (normalized.pluginChannelBindings.length === 0) return {};
+function buildExtensionChannelUiHints(options) {
+	const normalized = normalizeExtensionProjectionOptions(options);
+	if (normalized.extensionChannelBindings.length === 0) return {};
 	const hints = {};
-	const metadataById = new Map(normalized.pluginUiMetadata.map((item) => [item.id, item]));
-	for (const binding of normalized.pluginChannelBindings) {
+	const metadataById = new Map(normalized.extensionUiMetadata.map((item) => [item.id, item]));
+	for (const binding of normalized.extensionChannelBindings) {
 		const channelScope = `channels.${binding.channelId}`;
 		const channelMeta = binding.channel.meta;
 		const channelLabel = typeof channelMeta?.selectionLabel === "string" ? channelMeta.selectionLabel : typeof channelMeta?.label === "string" ? channelMeta.label : binding.channelId;
@@ -719,8 +721,8 @@ function buildPluginChannelUiHints(options) {
 			...channelLabel ? { label: channelLabel } : {},
 			...channelHelp ? { help: channelHelp } : {}
 		};
-		const pluginHints = metadataById.get(binding.pluginId)?.configUiHints ?? {};
-		for (const [key, hint] of Object.entries(pluginHints)) hints[`${channelScope}.${key}`] = {
+		const extensionHints = metadataById.get(binding.extensionId)?.configUiHints ?? {};
+		for (const [key, hint] of Object.entries(extensionHints)) hints[`${channelScope}.${key}`] = {
 			label: hint.label,
 			help: hint.help,
 			advanced: hint.advanced,
@@ -731,9 +733,9 @@ function buildPluginChannelUiHints(options) {
 	return hints;
 }
 function buildProjectedChannelMeta(config, options) {
-	const normalized = normalizePluginProjectionOptions(options);
+	const normalized = normalizeExtensionProjectionOptions(options);
 	const projectedChannelMap = getProjectedChannelMap(config, normalized);
-	const bindingByChannelId = new Map(normalized.pluginChannelBindings.map((binding) => [binding.channelId, binding]));
+	const bindingByChannelId = new Map(normalized.extensionChannelBindings.map((binding) => [binding.channelId, binding]));
 	return [...new Set([
 		...Object.keys(config.channels),
 		...Object.keys(projectedChannelMap),
@@ -751,25 +753,25 @@ function buildProjectedChannelMeta(config, options) {
 		};
 	});
 }
-function mergeProjectedPluginChannelConfig(config, channelName, mergedChannel, options) {
-	const normalized = normalizePluginProjectionOptions(options);
-	if (!normalized.pluginChannelBindings.some((binding) => binding.channelId === channelName)) return null;
+function mergeProjectedExtensionChannelConfig(config, channelName, mergedChannel, options) {
+	const normalized = normalizeExtensionProjectionOptions(options);
+	if (!normalized.extensionChannelBindings.some((binding) => binding.channelId === channelName)) return null;
 	const currentView = getProjectedConfigView(config, normalized);
-	return mergePluginConfigView(config, {
+	return mergeExtensionConfigView(config, {
 		...currentView,
 		channels: {
 			...currentView.channels ?? {},
 			[channelName]: mergedChannel
 		}
-	}, normalized.pluginChannelBindings);
+	});
 }
 //#endregion
 //#region src/features/config/utils/channel-auth.utils.ts
-function clonePluginConfig(value) {
+function cloneChannelConfig(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return JSON.parse(JSON.stringify(value));
 }
-function findPluginChannelBinding(bindings, channelId) {
+function findExtensionChannelBinding(bindings, channelId) {
 	const normalizedChannelId = channelId.trim().toLowerCase();
 	return bindings.find((binding) => binding.channelId.trim().toLowerCase() === normalizedChannelId) ?? null;
 }
@@ -785,27 +787,27 @@ function toPublicChannelAuthPollResult(result) {
 }
 function applyAuthorizedChannelAuthResult(params) {
 	const { configPath, binding, result } = params;
-	if (result.status !== "authorized" || !result.pluginConfig) return;
+	if (result.status !== "authorized" || !result.channelConfig) return;
 	const currentConfig = loadConfigOrDefault(configPath);
-	saveConfig(enablePluginInConfig({
+	saveConfig({
 		...currentConfig,
 		channels: {
 			...currentConfig.channels,
-			[binding.channelId]: result.pluginConfig
+			[binding.channelId]: result.channelConfig
 		}
-	}, binding.pluginId), configPath);
+	}, configPath);
 }
 async function startChannelAuth(params) {
 	const { configPath, channelId, request, bindings } = params;
-	const binding = findPluginChannelBinding(bindings, channelId);
+	const binding = findExtensionChannelBinding(bindings, channelId);
 	const start = binding?.channel.auth?.start;
 	if (!binding || !start) return null;
-	const configView = getProjectedConfigView(loadConfigOrDefault(configPath), { pluginChannelBindings: bindings });
+	const configView = getProjectedConfigView(loadConfigOrDefault(configPath), { extensionChannelBindings: bindings });
 	return await start({
 		cfg: configView,
-		pluginId: binding.pluginId,
+		extensionId: binding.extensionId,
 		channelId: binding.channelId,
-		pluginConfig: clonePluginConfig(configView.channels?.[binding.channelId]),
+		channelConfig: cloneChannelConfig(configView.channels?.[binding.channelId]),
 		accountId: request.accountId?.trim() || null,
 		baseUrl: request.baseUrl?.trim() || null,
 		domain: request.domain?.trim() || null
@@ -813,15 +815,15 @@ async function startChannelAuth(params) {
 }
 async function pollChannelAuth(params) {
 	const { configPath, channelId, sessionId, bindings } = params;
-	const binding = findPluginChannelBinding(bindings, channelId);
+	const binding = findExtensionChannelBinding(bindings, channelId);
 	const poll = binding?.channel.auth?.poll;
 	if (!binding || !poll) return null;
-	const configView = getProjectedConfigView(loadConfigOrDefault(configPath), { pluginChannelBindings: bindings });
+	const configView = getProjectedConfigView(loadConfigOrDefault(configPath), { extensionChannelBindings: bindings });
 	const result = await poll({
 		cfg: configView,
-		pluginId: binding.pluginId,
+		extensionId: binding.extensionId,
 		channelId: binding.channelId,
-		pluginConfig: clonePluginConfig(configView.channels?.[binding.channelId]),
+		channelConfig: cloneChannelConfig(configView.channels?.[binding.channelId]),
 		sessionId
 	});
 	if (!result) return null;
@@ -832,9 +834,31 @@ async function pollChannelAuth(params) {
 	});
 	return toPublicChannelAuthPollResult(result);
 }
+async function connectChannelAuth(params) {
+	const { configPath, channelId, request, bindings } = params;
+	const binding = findExtensionChannelBinding(bindings, channelId);
+	const connect = binding?.channel.auth?.connect;
+	if (!binding || !connect) return null;
+	const configView = getProjectedConfigView(loadConfigOrDefault(configPath), { extensionChannelBindings: bindings });
+	const result = await connect({
+		cfg: configView,
+		extensionId: binding.extensionId,
+		channelId: binding.channelId,
+		channelConfig: cloneChannelConfig(configView.channels?.[binding.channelId]),
+		accountId: request.accountId?.trim() || null,
+		domain: request.domain?.trim() || null,
+		fields: request.fields
+	});
+	applyAuthorizedChannelAuthResult({
+		configPath,
+		binding,
+		result
+	});
+	return toPublicChannelAuthPollResult(result);
+}
 //#endregion
 //#region src/features/config/utils/default-provider-config.utils.ts
-function createDefaultProviderConfig(defaultWireApi = "auto", defaultModels = []) {
+function createDefaultProviderConfig(defaultWireApi = "auto", defaultModels = [], modelConfig = {}) {
 	return {
 		enabled: true,
 		displayName: "",
@@ -843,11 +867,11 @@ function createDefaultProviderConfig(defaultWireApi = "auto", defaultModels = []
 		extraHeaders: null,
 		wireApi: defaultWireApi,
 		models: [...defaultModels],
-		modelThinking: {}
+		modelConfig
 	};
 }
 function createDefaultProviderConfigFromSpec(spec) {
-	return createDefaultProviderConfig(spec?.defaultWireApi ?? "auto", spec?.defaultModels ?? []);
+	return createDefaultProviderConfig(spec?.defaultWireApi ?? "auto", spec?.defaultModels ?? [], normalizeProviderModelConfig(spec?.modelConfig ?? {}));
 }
 //#endregion
 //#region src/features/config/providers/server-builtin-provider.provider.ts
@@ -1353,10 +1377,10 @@ var ConfigRoutesController = class {
 	constructor(options) {
 		this.options = options;
 	}
-	getPluginConfigOptions = () => {
+	getExtensionConfigProjectionOptions = () => {
 		return {
-			pluginChannelBindings: this.options.plugins?.getChannelBindings() ?? [],
-			pluginUiMetadata: this.options.plugins?.getUiMetadata() ?? []
+			extensionChannelBindings: this.options.extensions?.getChannelBindings() ?? [],
+			extensionUiMetadata: this.options.extensions?.getUiMetadata() ?? []
 		};
 	};
 	publishConfigUpdatedPaths = (paths) => {
@@ -1400,15 +1424,15 @@ var ConfigRoutesController = class {
 	};
 	getConfig = (c) => {
 		const config = loadConfigOrDefault(this.options.configPath);
-		return c.json(ok(buildConfigView(config, this.getPluginConfigOptions())));
+		return c.json(ok(buildConfigView(config, this.getExtensionConfigProjectionOptions())));
 	};
 	getConfigMeta = (c) => {
 		const config = loadConfigOrDefault(this.options.configPath);
-		return c.json(ok(buildConfigMeta(config, this.getPluginConfigOptions())));
+		return c.json(ok(buildConfigMeta(config, this.getExtensionConfigProjectionOptions())));
 	};
 	getConfigSchema = (c) => {
 		const config = loadConfigOrDefault(this.options.configPath);
-		return c.json(ok(buildConfigSchemaView(config, this.getPluginConfigOptions())));
+		return c.json(ok(buildConfigSchemaView(config, this.getExtensionConfigProjectionOptions())));
 	};
 	updateConfigModel = async (c) => {
 		const body = await readJson(c.req.raw);
@@ -1521,7 +1545,7 @@ var ConfigRoutesController = class {
 		const channel = c.req.param("channel");
 		const body = await readJson(c.req.raw);
 		if (!body.ok) return c.json(err("INVALID_BODY", "invalid json body"), 400);
-		const result = updateChannel(this.options.configPath, channel, body.data, this.getPluginConfigOptions());
+		const result = updateChannel(this.options.configPath, channel, body.data, this.getExtensionConfigProjectionOptions());
 		if (!result) return c.json(err("NOT_FOUND", `unknown channel: ${channel}`), 404);
 		this.publishConfigUpdatedPaths([`channels.${channel}`]);
 		this.enqueueChannelConfigApply(channel);
@@ -1545,7 +1569,7 @@ var ConfigRoutesController = class {
 					baseUrl: typeof payload.baseUrl === "string" ? payload.baseUrl : void 0,
 					domain: typeof payload.domain === "string" ? payload.domain : void 0
 				},
-				bindings: this.options.plugins?.getChannelBindings() ?? []
+				bindings: this.options.extensions?.getChannelBindings() ?? []
 			});
 			if (!result) return c.json(err("NOT_SUPPORTED", `channel auth is not supported: ${channel}`), 404);
 			return c.json(ok(result));
@@ -1564,12 +1588,36 @@ var ConfigRoutesController = class {
 			configPath: this.options.configPath,
 			channelId: channel,
 			sessionId,
-			bindings: this.options.plugins?.getChannelBindings() ?? []
+			bindings: this.options.extensions?.getChannelBindings() ?? []
 		});
 		if (!result) return c.json(err("NOT_FOUND", "channel auth session not found"), 404);
 		if (result.status === "authorized") await this.publishConfigUpdates([`channels.${channel}`]);
 		return c.json(ok(result));
 	};
+	connectChannelAuth = async (c) => {
+		const channel = c.req.param("channel");
+		const body = await readJson(c.req.raw);
+		if (!body.ok) return c.json(err("INVALID_BODY", "invalid json body"), 400);
+		const fields = body.data.fields && typeof body.data.fields === "object" && !Array.isArray(body.data.fields) ? body.data.fields : {};
+		try {
+			const result = await connectChannelAuth({
+				configPath: this.options.configPath,
+				channelId: channel,
+				request: {
+					accountId: typeof body.data.accountId === "string" ? body.data.accountId : void 0,
+					domain: typeof body.data.domain === "string" ? body.data.domain : void 0,
+					fields
+				},
+				bindings: this.options.extensions?.getChannelBindings() ?? []
+			});
+			if (!result) return c.json(err("NOT_SUPPORTED", `channel auth connect is not supported: ${channel}`), 404);
+			if (result.status === "authorized") await this.publishConfigUpdates([`channels.${channel}`]);
+			return c.json(ok(result));
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			return c.json(err("AUTH_CONNECT_FAILED", message), 400);
+		}
+	};
 	updateSecrets = async (c) => {
 		const body = await readJson(c.req.raw);
 		if (!body.ok) return c.json(err("INVALID_BODY", "invalid json body"), 400);
@@ -2059,23 +2107,6 @@ function normalizeModelList(input) {
 	}
 	return [...deduped];
 }
-function normalizeModelThinkingConfig(input) {
-	if (!input || typeof input !== "object") return {};
-	const normalized = {};
-	for (const [rawModel, rawValue] of Object.entries(input)) {
-		const model = rawModel.trim();
-		if (!model || !rawValue || typeof rawValue !== "object") continue;
-		const supported = normalizeThinkingLevels(rawValue.supported);
-		if (supported.length === 0) continue;
-		const defaultLevel = parseThinkingLevel(rawValue.default);
-		if (defaultLevel && supported.includes(defaultLevel)) normalized[model] = {
-			supported,
-			default: defaultLevel
-		};
-		else normalized[model] = { supported };
-	}
-	return normalized;
-}
 function toProviderView(config, provider, providerName, uiHints, spec) {
 	const apiKeyRefSet = hasSecretRef(config, `providers.${providerName}.apiKey`);
 	const masked = maskApiKey(provider.apiKey);
@@ -2088,7 +2119,7 @@ function toProviderView(config, provider, providerName, uiHints, spec) {
 		apiBase: provider.apiBase ?? null,
 		extraHeaders: extraHeaders && Object.keys(extraHeaders).length > 0 ? extraHeaders : null,
 		models: normalizeModelList(provider.models ?? []),
-		modelThinking: normalizeModelThinkingConfig(provider.modelThinking ?? {})
+		modelConfig: normalizeProviderModelConfig(provider.modelConfig ?? {})
 	};
 	if (Boolean(spec?.supportsWireApi) || isCustomProviderName(providerName)) view.wireApi = provider.wireApi ?? spec?.defaultWireApi ?? "auto";
 	return view;
@@ -2204,6 +2235,7 @@ function buildConfigMeta(config, options) {
 				supportsCliImport: Boolean(spec.auth.cliCredential)
 			} : void 0,
 			defaultModels: normalizeModelList(spec.defaultModels ?? []),
+			modelConfig: normalizeProviderModelConfig(spec.modelConfig ?? {}),
 			supportsWireApi: spec.supportsWireApi,
 			wireApiOptions: spec.wireApiOptions,
 			defaultWireApi: spec.defaultWireApi
@@ -2237,6 +2269,7 @@ function buildConfigMeta(config, options) {
 				apiBaseHelp: void 0,
 				auth: void 0,
 				defaultModels: [],
+				modelConfig: {},
 				supportsWireApi: true,
 				wireApiOptions: CUSTOM_PROVIDER_WIRE_API_OPTIONS,
 				defaultWireApi: "auto"
@@ -2248,13 +2281,13 @@ function buildConfigMeta(config, options) {
 }
 function buildConfigSchemaView(_config, options) {
 	const base = buildConfigSchema({ version: getPackageVersion() });
-	const pluginUiHints = buildPluginChannelUiHints(options);
-	if (Object.keys(pluginUiHints).length === 0) return base;
+	const extensionUiHints = buildExtensionChannelUiHints(options);
+	if (Object.keys(extensionUiHints).length === 0) return base;
 	return {
 		...base,
 		uiHints: {
 			...base.uiHints,
-			...pluginUiHints
+			...extensionUiHints
 		}
 	};
 }
@@ -2323,7 +2356,7 @@ function updateProvider(configPath, providerName, patch) {
 	if (Object.prototype.hasOwnProperty.call(patch, "extraHeaders")) provider.extraHeaders = patch.extraHeaders ?? null;
 	if (Object.prototype.hasOwnProperty.call(patch, "wireApi") && (spec?.supportsWireApi || isCustom)) provider.wireApi = patch.wireApi ?? spec?.defaultWireApi ?? "auto";
 	if (Object.prototype.hasOwnProperty.call(patch, "models")) provider.models = normalizeModelList(patch.models ?? []);
-	if (Object.prototype.hasOwnProperty.call(patch, "modelThinking")) provider.modelThinking = normalizeModelThinkingConfig(patch.modelThinking ?? {});
+	if (Object.prototype.hasOwnProperty.call(patch, "modelConfig")) provider.modelConfig = normalizeProviderModelConfig(patch.modelConfig ?? {});
 	const next = ConfigSchema.parse(config);
 	saveConfig(next, configPath);
 	const uiHints = buildUiHints(next);
@@ -2343,7 +2376,7 @@ function createCustomProvider(configPath, patch = {}) {
 		extraHeaders: normalizeHeaders(patch.extraHeaders ?? null),
 		wireApi: patch.wireApi ?? "auto",
 		models: normalizeModelList(patch.models ?? []),
-		modelThinking: normalizeModelThinkingConfig(patch.modelThinking ?? {})
+		modelConfig: normalizeProviderModelConfig(patch.modelConfig ?? {})
 	};
 	const next = ConfigSchema.parse(config);
 	saveConfig(next, configPath);
@@ -2491,7 +2524,7 @@ async function testProviderConnection(configPath, providerName, patch, providerM
 }
 function updateChannel(configPath, channelName, patch, options) {
 	const config = loadConfigOrDefault(configPath);
-	const normalizedOptions = normalizePluginProjectionOptions(options);
+	const normalizedOptions = normalizeExtensionProjectionOptions(options);
 	const channel = getProjectedChannelConfig(config, channelName, normalizedOptions);
 	if (!channel) return null;
 	for (const key of Object.keys(patch)) {
@@ -2502,9 +2535,9 @@ function updateChannel(configPath, channelName, patch, options) {
 		...channel,
 		...patch
 	};
-	const mergedPluginConfig = mergeProjectedPluginChannelConfig(config, channelName, mergedChannel, normalizedOptions);
-	if (mergedPluginConfig) {
-		const next = ConfigSchema.parse(mergedPluginConfig);
+	const mergedExtensionConfig = mergeProjectedExtensionChannelConfig(config, channelName, mergedChannel, normalizedOptions);
+	if (mergedExtensionConfig) {
+		const next = ConfigSchema.parse(mergedExtensionConfig);
 		saveConfig(next, configPath);
 		return sanitizePublicConfigValue(getProjectedChannelConfig(next, channelName, normalizedOptions) ?? {}, `channels.${channelName}`, buildUiHints(next, normalizedOptions));
 	}
@@ -2884,7 +2917,6 @@ function isSessionProjectRootValidationError(error) {
 //#endregion
 //#region src/features/marketplace/configs/marketplace.constants.config.ts
 const DEFAULT_MARKETPLACE_API_BASE = "https://marketplace-api.nextclaw.io";
-const NEXTCLAW_PLUGIN_NPM_PREFIX = "@nextclaw/channel-plugin-";
 const MARKETPLACE_ZH_COPY_BY_SLUG = {
 	weather: {
 		summary: "NextClaw 内置技能，用于天气查询工作流。",
@@ -2923,40 +2955,16 @@ const MARKETPLACE_ZH_COPY_BY_SLUG = {
 		description: "使用该技能可打开、编辑、清洗并转换 .xlsx 与 .csv 等表格文件。"
 	},
 	bird: {
-		summary: "OpenClaw 社区技能，用于 X/Twitter 读取/搜索/发布工作流。",
+		summary: "社区技能，用于 X/Twitter 读取/搜索/发布工作流。",
 		description: "使用 bird CLI 在代理工作流中读取线程、搜索帖子并起草推文/回复。"
 	},
 	"cloudflare-deploy": {
 		summary: "OpenAI 精选技能，用于在 Cloudflare 上部署应用与基础设施。",
 		description: "使用该技能可选择 Cloudflare 产品并部署 Workers、Pages 及相关服务。"
 	},
-	"channel-plugin-discord": {
-		summary: "NextClaw 官方插件，用于 Discord 渠道集成。",
-		description: "通过 NextClaw 插件运行时提供 Discord 渠道的入站/出站支持。"
-	},
-	"channel-plugin-telegram": {
-		summary: "NextClaw 官方插件，用于 Telegram 渠道集成。",
-		description: "通过 NextClaw 插件运行时提供 Telegram 渠道的入站/出站支持。"
-	},
-	"channel-plugin-slack": {
-		summary: "NextClaw 官方插件，用于 Slack 渠道集成。",
-		description: "通过 NextClaw 插件运行时提供 Slack 渠道的入站/出站支持。"
-	},
-	"channel-plugin-wecom": {
-		summary: "NextClaw 官方插件，用于企业微信渠道集成。",
-		description: "通过 NextClaw 插件运行时提供企业微信渠道的入站/出站支持。"
-	},
-	"channel-plugin-email": {
-		summary: "NextClaw 官方插件，用于 Email 渠道集成。",
-		description: "通过 NextClaw 插件运行时提供 Email 渠道的入站/出站支持。"
-	},
-	"channel-plugin-whatsapp": {
-		summary: "NextClaw 官方插件，用于 WhatsApp 渠道集成。",
-		description: "通过 NextClaw 插件运行时提供 WhatsApp 渠道的入站/出站支持。"
-	},
-	"channel-plugin-clawbay": {
-		summary: "Clawbay 官方渠道插件，用于 NextClaw 集成。",
-		description: "通过插件运行时为 NextClaw 提供 Clawbay 渠道能力。"
+	"channel-extension-clawbay": {
+		summary: "Clawbay 官方渠道扩展，用于 NextClaw 集成。",
+		description: "通过 extension channel 机制为 NextClaw 提供 Clawbay 渠道能力。"
 	}
 };
 //#endregion
@@ -3321,105 +3329,6 @@ var McpMarketplaceController = class {
 	};
 };
 //#endregion
-//#region src/features/marketplace/utils/marketplace-spec.utils.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;
-	const versionDelimiterIndex = spec.lastIndexOf("@");
-	if (versionDelimiterIndex <= 0) return spec;
-	const packageName = spec.slice(0, versionDelimiterIndex).trim();
-	if (!packageName.includes("/")) return spec;
-	return packageName;
-}
-function isSupportedMarketplacePluginSpec(rawSpec) {
-	return normalizePluginNpmSpec(rawSpec).length > 0;
-}
-function resolvePluginCanonicalSpec(params) {
-	const { installSpec, pluginId } = params;
-	const rawInstallSpec = typeof installSpec === "string" ? installSpec.trim() : "";
-	if (rawInstallSpec.length > 0) return normalizePluginNpmSpec(rawInstallSpec);
-	if (pluginId.startsWith("builtin-channel-")) {
-		const channelSlug = pluginId.slice(16).trim();
-		if (channelSlug.length > 0) return `${NEXTCLAW_PLUGIN_NPM_PREFIX}${channelSlug}`;
-	}
-	return 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;
-	if (status === "unresolved") return 200;
-	return 100;
-}
-function readPluginOriginPriority(origin) {
-	if (origin === "bundled") return 80;
-	if (origin === "workspace") return 70;
-	if (origin === "global") return 60;
-	if (origin === "config") return 50;
-	return 10;
-}
-function readInstalledPluginRecordPriority(record) {
-	const installScore = record.installPath ? 20 : 0;
-	const timestampScore = record.installedAt ? 10 : 0;
-	return readPluginRuntimeStatusPriority(record.runtimeStatus) + readPluginOriginPriority(record.origin) + installScore + timestampScore;
-}
-function mergeInstalledPluginRecords(primary, secondary) {
-	return {
-		...primary,
-		id: primary.id ?? secondary.id,
-		label: primary.label ?? secondary.label,
-		source: primary.source ?? secondary.source,
-		installedAt: primary.installedAt ?? secondary.installedAt,
-		enabled: primary.enabled ?? secondary.enabled,
-		runtimeStatus: primary.runtimeStatus ?? secondary.runtimeStatus,
-		origin: primary.origin ?? secondary.origin,
-		installPath: primary.installPath ?? secondary.installPath
-	};
-}
-function dedupeInstalledPluginRecordsByCanonicalSpec(records) {
-	const deduped = /* @__PURE__ */ new Map();
-	for (const record of records) {
-		const canonicalSpec = normalizePluginNpmSpec(record.spec).trim();
-		if (!canonicalSpec) continue;
-		const key = canonicalSpec.toLowerCase();
-		const normalizedRecord = {
-			...record,
-			spec: canonicalSpec
-		};
-		const existing = deduped.get(key);
-		if (!existing) {
-			deduped.set(key, normalizedRecord);
-			continue;
-		}
-		if (readInstalledPluginRecordPriority(normalizedRecord) > readInstalledPluginRecordPriority(existing)) {
-			deduped.set(key, mergeInstalledPluginRecords(normalizedRecord, existing));
-			continue;
-		}
-		deduped.set(key, mergeInstalledPluginRecords(existing, normalizedRecord));
-	}
-	return Array.from(deduped.values());
-}
-//#endregion
 //#region src/features/marketplace/utils/marketplace-installed.utils.ts
 const getWorkspacePathFromConfig = NextclawCore.getWorkspacePathFromConfig;
 function createSkillsLoader(workspace) {
@@ -3427,154 +3336,6 @@ function createSkillsLoader(workspace) {
 	if (!ctor) return null;
 	return new ctor(workspace);
 }
-function readPluginStatusScore(plugin) {
-	if (plugin.status === "loaded") return 300;
-	if (plugin.status === "disabled") return 200;
-	return 100;
-}
-function readPluginOriginScore(plugin, hasInstallRecord) {
-	if (hasInstallRecord) {
-		if (plugin.origin === "workspace") return 40;
-		if (plugin.origin === "global") return 30;
-		if (plugin.origin === "config") return 20;
-		return 10;
-	}
-	if (plugin.origin === "bundled") return 40;
-	if (plugin.origin === "workspace") return 30;
-	if (plugin.origin === "global") return 20;
-	return 10;
-}
-function readPluginPriority(plugin, installedPluginIds) {
-	return readPluginStatusScore(plugin) + readPluginOriginScore(plugin, installedPluginIds.has(plugin.id));
-}
-function buildDiscoveredPluginMap(params) {
-	const discoveredById = /* @__PURE__ */ new Map();
-	for (const plugin of params.discoveredPlugins) {
-		const existing = discoveredById.get(plugin.id);
-		if (!existing) {
-			discoveredById.set(plugin.id, plugin);
-			continue;
-		}
-		if (readPluginPriority(plugin, params.installedPluginIds) > readPluginPriority(existing, params.installedPluginIds)) discoveredById.set(plugin.id, plugin);
-	}
-	return discoveredById;
-}
-function collectDiscoveredPluginRecords(params) {
-	return Array.from(params.discoveredById.values()).map((plugin) => {
-		const installRecord = params.pluginRecordsMap[plugin.id];
-		const entry = params.pluginEntries[plugin.id];
-		return {
-			type: "plugin",
-			id: plugin.id,
-			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: entry?.enabled === false ? false : plugin.enabled,
-			runtimeStatus: entry?.enabled === false ? "disabled" : plugin.status,
-			origin: plugin.origin,
-			installPath: installRecord?.installPath
-		};
-	});
-}
-function collectInstalledOnlyPluginRecords(params) {
-	return Object.entries(params.pluginRecordsMap).filter(([pluginId]) => !params.seenPluginIds.has(pluginId)).map(([pluginId, installRecord]) => {
-		const entry = params.pluginEntries[pluginId];
-		return {
-			type: "plugin",
-			id: pluginId,
-			spec: resolvePluginCanonicalSpec({
-				pluginId,
-				installSpec: installRecord.spec
-			}),
-			label: pluginId,
-			source: installRecord.source,
-			installedAt: installRecord.installedAt,
-			enabled: entry?.enabled !== false,
-			runtimeStatus: entry?.enabled === false ? "disabled" : "unresolved",
-			installPath: installRecord.installPath
-		};
-	});
-}
-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 }),
-			label: pluginId,
-			source: "config",
-			enabled: entry?.enabled !== false,
-			runtimeStatus: entry?.enabled === false ? "disabled" : "unresolved"
-		};
-	});
-}
-function findPluginIdByExactId(pluginRecords, lowerTargetId) {
-	for (const record of pluginRecords) {
-		const recordId = record.id?.trim();
-		if (recordId && recordId.toLowerCase() === lowerTargetId) return recordId;
-	}
-}
-function findPluginIdByNormalizedSpec(pluginRecords, normalizedSpec) {
-	if (!normalizedSpec) return;
-	for (const record of pluginRecords) {
-		const recordId = record.id?.trim();
-		if (!recordId) continue;
-		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 installedPluginIds = new Set(Object.keys(pluginRecordsMap));
-	let discoveredPlugins = [];
-	try {
-		discoveredPlugins = discoverPluginStatusReport({
-			config,
-			workspaceDir: getWorkspacePathFromConfig(config)
-		}).plugins;
-	} catch {
-		discoveredPlugins = [];
-	}
-	const discoveredRecords = collectDiscoveredPluginRecords({
-		discoveredById: buildDiscoveredPluginMap({
-			discoveredPlugins,
-			installedPluginIds
-		}),
-		pluginRecordsMap,
-		pluginEntries
-	});
-	const seenDiscoveredPluginIds = collectDefinedRecordIds(discoveredRecords);
-	const installedOnlyRecords = collectInstalledOnlyPluginRecords({
-		pluginRecordsMap,
-		pluginEntries,
-		seenPluginIds: seenDiscoveredPluginIds
-	});
-	const configOnlyRecords = collectConfigOnlyPluginRecords({
-		pluginEntries,
-		seenPluginIds: new Set([...seenDiscoveredPluginIds, ...collectDefinedRecordIds(installedOnlyRecords)])
-	});
-	const dedupedPluginRecords = dedupeInstalledPluginRecordsByCanonicalSpec([
-		...discoveredRecords,
-		...installedOnlyRecords,
-		...configOnlyRecords
-	]);
-	dedupedPluginRecords.sort((left, right) => {
-		return left.spec.localeCompare(right.spec);
-	});
-	return {
-		specs: dedupedPluginRecords.map((record) => record.spec),
-		records: dedupedPluginRecords
-	};
-}
 function collectInstalledSkillRecords(options) {
 	const skillsLoader = createSkillsLoader(getWorkspacePathFromConfig(loadConfigOrDefault(options.configPath)));
 	const availableSkillSet = new Set((skillsLoader?.listSkills(true) ?? []).map((skill) => skill.name));
@@ -3600,15 +3361,6 @@ function collectInstalledSkillRecords(options) {
 		records
 	};
 }
-function collectPluginMarketplaceInstalledView(options) {
-	const installed = collectInstalledPluginRecords(options);
-	return {
-		type: "plugin",
-		total: installed.records.length,
-		specs: installed.specs,
-		records: installed.records
-	};
-}
 function collectSkillMarketplaceInstalledView(options) {
 	const installed = collectInstalledSkillRecords(options);
 	return {
@@ -3618,27 +3370,10 @@ function collectSkillMarketplaceInstalledView(options) {
 		records: installed.records
 	};
 }
-function resolvePluginManageTargetId(options, rawTargetId, rawSpec) {
-	const targetId = rawTargetId.trim();
-	if (!targetId && !rawSpec) return rawTargetId;
-	const normalizedTarget = targetId ? normalizePluginNpmSpec(targetId).toLowerCase() : "";
-	const normalizedSpec = rawSpec ? normalizePluginNpmSpec(rawSpec).toLowerCase() : "";
-	const pluginRecords = collectInstalledPluginRecords(options).records;
-	const matchedRecordId = findPluginIdByExactId(pluginRecords, targetId.toLowerCase());
-	if (matchedRecordId) return matchedRecordId;
-	const matchedByTargetSpec = findPluginIdByNormalizedSpec(pluginRecords, normalizedTarget);
-	if (matchedByTargetSpec) return matchedByTargetSpec;
-	const matchedByRawSpec = normalizedSpec && normalizedSpec !== normalizedTarget ? findPluginIdByNormalizedSpec(pluginRecords, normalizedSpec) : void 0;
-	if (matchedByRawSpec) return matchedByRawSpec;
-	return targetId || rawSpec || rawTargetId;
-}
 function collectKnownSkillNames(options) {
 	const loader = createSkillsLoader(getWorkspacePathFromConfig(loadConfigOrDefault(options.configPath)));
 	return new Set((loader?.listSkills(false) ?? []).map((skill) => skill.name));
 }
-function isSupportedMarketplacePluginItem(item) {
-	return item.type === "plugin" && item.install.kind === "npm" && isSupportedMarketplacePluginSpec(item.install.spec);
-}
 function isSupportedMarketplaceSkillItem(item, knownSkillNames) {
 	if (item.type !== "skill") return false;
 	if (item.install.kind === "marketplace") return true;
@@ -3653,214 +3388,6 @@ function findUnsupportedSkillInstallKind(items) {
 	return null;
 }
 //#endregion
-//#region src/features/marketplace/controllers/plugin-marketplace.controller.ts
-async function loadPluginReadmeFromNpm(spec) {
-	const registryUrl = `https://registry.npmjs.org/${encodeURIComponent(spec)}`;
-	try {
-		const response = await fetch(registryUrl, { headers: { Accept: "application/json" } });
-		if (!response.ok) return null;
-		const payload = await response.json();
-		const readme = typeof payload.readme === "string" ? payload.readme : "";
-		const latest = isRecord$1(payload["dist-tags"]) && typeof payload["dist-tags"].latest === "string" ? payload["dist-tags"].latest : void 0;
-		const metadata = {
-			name: typeof payload.name === "string" ? payload.name : spec,
-			version: latest,
-			description: typeof payload.description === "string" ? payload.description : void 0,
-			homepage: typeof payload.homepage === "string" ? payload.homepage : void 0
-		};
-		if (readme.trim().length === 0) return null;
-		return {
-			readme,
-			sourceUrl: registryUrl,
-			metadataRaw: JSON.stringify(metadata, null, 2)
-		};
-	} catch {
-		return null;
-	}
-}
-async function buildPluginContentView(item) {
-	if (item.install.kind === "npm") {
-		const npm = await loadPluginReadmeFromNpm(item.install.spec);
-		if (npm) return {
-			type: "plugin",
-			slug: item.slug,
-			name: item.name,
-			install: item.install,
-			source: "npm",
-			raw: npm.readme,
-			bodyRaw: npm.readme,
-			metadataRaw: npm.metadataRaw,
-			sourceUrl: npm.sourceUrl
-		};
-	}
-	return {
-		type: "plugin",
-		slug: item.slug,
-		name: item.name,
-		install: item.install,
-		source: "remote",
-		bodyRaw: item.description || item.summary || "",
-		metadataRaw: JSON.stringify({
-			name: item.name,
-			author: item.author,
-			sourceRepo: item.sourceRepo,
-			homepage: item.homepage
-		}, null, 2)
-	};
-}
-async function installMarketplacePlugin(params) {
-	const { body, options } = params;
-	const spec = typeof body.spec === "string" ? body.spec.trim() : "";
-	if (!spec) throw new Error("INVALID_BODY:non-empty spec is required");
-	const installer = options.marketplace?.installer;
-	if (!installer) throw new Error("NOT_AVAILABLE:marketplace installer is not configured");
-	if (!installer.installPlugin) throw new Error("NOT_AVAILABLE:plugin installer is not configured");
-	const result = await installer.installPlugin(spec);
-	emitConfigUpdated(options, "plugins");
-	return {
-		type: "plugin",
-		spec,
-		message: result.message,
-		output: result.output
-	};
-}
-async function manageMarketplacePlugin(params) {
-	const { body, options } = params;
-	const action = body.action;
-	const targetId = resolvePluginManageTargetId(options, typeof body.id === "string" && body.id.trim().length > 0 ? body.id.trim() : typeof body.spec === "string" && body.spec.trim().length > 0 ? body.spec.trim() : "", typeof body.spec === "string" ? body.spec.trim() : "");
-	if (action !== "enable" && action !== "disable" && action !== "uninstall" || !targetId) throw new Error("INVALID_BODY:action and non-empty id/spec are required");
-	const installer = options.marketplace?.installer;
-	if (!installer) throw new Error("NOT_AVAILABLE:marketplace installer is not configured");
-	let result;
-	if (action === "enable") {
-		if (!installer.enablePlugin) throw new Error("NOT_AVAILABLE:plugin enable is not configured");
-		result = await installer.enablePlugin(targetId);
-	} else if (action === "disable") {
-		if (!installer.disablePlugin) throw new Error("NOT_AVAILABLE:plugin disable is not configured");
-		result = await installer.disablePlugin(targetId);
-	} else {
-		if (!installer.uninstallPlugin) throw new Error("NOT_AVAILABLE:plugin uninstall is not configured");
-		result = await installer.uninstallPlugin(targetId);
-	}
-	emitConfigUpdated(options, "plugins");
-	return {
-		type: "plugin",
-		action,
-		id: targetId,
-		message: result.message,
-		output: result.output
-	};
-}
-var PluginMarketplaceController = class {
-	constructor(options, marketplaceBaseUrl) {
-		this.options = options;
-		this.marketplaceBaseUrl = marketplaceBaseUrl;
-	}
-	getInstalled = (c) => {
-		return c.json(ok(collectPluginMarketplaceInstalledView(this.options)));
-	};
-	listItems = async (c) => {
-		const query = c.req.query();
-		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
-			path: "/api/v1/plugins/items",
-			query: {
-				q: query.q,
-				tag: query.tag,
-				sort: query.sort,
-				page: query.page,
-				pageSize: query.pageSize
-			}
-		});
-		if (!result.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
-		const items = sanitizeMarketplaceListItems(result.data.items).map((item) => normalizeMarketplaceItemForUi(item)).filter((item) => isSupportedMarketplacePluginItem(item));
-		return c.json(ok({
-			total: result.data.total,
-			page: result.data.page,
-			pageSize: result.data.pageSize,
-			totalPages: result.data.totalPages,
-			sort: result.data.sort,
-			query: result.data.query,
-			items
-		}));
-	};
-	getItem = async (c) => {
-		const slug = encodeURIComponent(c.req.param("slug"));
-		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
-			path: `/api/v1/plugins/items/${slug}`
-		});
-		if (!result.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
-		const sanitized = normalizeMarketplaceItemForUi(sanitizeMarketplaceItemView(result.data));
-		if (!isSupportedMarketplacePluginItem(sanitized)) return c.json(err("NOT_FOUND", "marketplace item not supported by nextclaw"), 404);
-		return c.json(ok(sanitized));
-	};
-	getItemContent = async (c) => {
-		const slug = encodeURIComponent(c.req.param("slug"));
-		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
-			path: `/api/v1/plugins/items/${slug}`
-		});
-		if (!result.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
-		const sanitized = normalizeMarketplaceItemForUi(sanitizeMarketplaceItemView(result.data));
-		if (!isSupportedMarketplacePluginItem(sanitized)) return c.json(err("NOT_FOUND", "marketplace item not supported by nextclaw"), 404);
-		const content = await buildPluginContentView(sanitized);
-		return c.json(ok(content));
-	};
-	install = async (c) => {
-		const body = await readJson(c.req.raw);
-		if (!body.ok || !body.data || typeof body.data !== "object") return c.json(err("INVALID_BODY", "invalid json body"), 400);
-		if (body.data.type && body.data.type !== "plugin") return c.json(err("INVALID_BODY", "body.type does not match route type"), 400);
-		try {
-			const payload = await installMarketplacePlugin({
-				options: this.options,
-				body: body.data
-			});
-			return c.json(ok(payload));
-		} catch (error) {
-			const message = String(error);
-			if (message.startsWith("INVALID_BODY:")) return c.json(err("INVALID_BODY", message.slice(13)), 400);
-			if (message.startsWith("NOT_AVAILABLE:")) return c.json(err("NOT_AVAILABLE", message.slice(14)), 503);
-			return c.json(err("INSTALL_FAILED", message), 400);
-		}
-	};
-	manage = async (c) => {
-		const body = await readJson(c.req.raw);
-		if (!body.ok || !body.data || typeof body.data !== "object") return c.json(err("INVALID_BODY", "invalid json body"), 400);
-		if (body.data.type && body.data.type !== "plugin") return c.json(err("INVALID_BODY", "body.type does not match route type"), 400);
-		try {
-			const payload = await manageMarketplacePlugin({
-				options: this.options,
-				body: body.data
-			});
-			return c.json(ok(payload));
-		} catch (error) {
-			const message = String(error);
-			if (message.startsWith("INVALID_BODY:")) return c.json(err("INVALID_BODY", message.slice(13)), 400);
-			if (message.startsWith("NOT_AVAILABLE:")) return c.json(err("NOT_AVAILABLE", message.slice(14)), 503);
-			return c.json(err("MANAGE_FAILED", message), 400);
-		}
-	};
-	getRecommendations = async (c) => {
-		const query = c.req.query();
-		const result = await fetchMarketplaceData({
-			baseUrl: this.marketplaceBaseUrl,
-			path: "/api/v1/plugins/recommendations",
-			query: {
-				scene: query.scene,
-				limit: query.limit
-			}
-		});
-		if (!result.ok) return c.json(err("MARKETPLACE_UNAVAILABLE", result.message), result.status);
-		const filteredItems = sanitizeMarketplaceListItems(result.data.items).map((item) => normalizeMarketplaceItemForUi(item)).filter((item) => isSupportedMarketplacePluginItem(item));
-		return c.json(ok({
-			...result.data,
-			total: filteredItems.length,
-			items: filteredItems
-		}));
-	};
-};
-//#endregion
 //#region src/features/marketplace/controllers/skill-marketplace.controller.ts
 async function installMarketplaceSkill(params) {
 	const { body, options } = params;
@@ -4051,13 +3578,6 @@ var SkillMarketplaceController = class {
 //#endregion
 //#region src/features/marketplace/routes/marketplace.route.ts
 function mountMarketplaceRoutes(app, controllers) {
-	app.get("/api/marketplace/plugins/installed", controllers.plugin.getInstalled);
-	app.get("/api/marketplace/plugins/items", controllers.plugin.listItems);
-	app.get("/api/marketplace/plugins/items/:slug", controllers.plugin.getItem);
-	app.get("/api/marketplace/plugins/items/:slug/content", controllers.plugin.getItemContent);
-	app.post("/api/marketplace/plugins/install", controllers.plugin.install);
-	app.post("/api/marketplace/plugins/manage", controllers.plugin.manage);
-	app.get("/api/marketplace/plugins/recommendations", controllers.plugin.getRecommendations);
 	app.get("/api/marketplace/skills/installed", controllers.skill.getInstalled);
 	app.get("/api/marketplace/skills/scenes", controllers.skill.listScenes);
 	app.get("/api/marketplace/skills/items", controllers.skill.listItems);
@@ -4190,7 +3710,7 @@ var NcpSessionRoutesController = class {
 		this.sessionSkillsViewBuilder = new SessionSkillsViewBuilder(options);
 	}
 	getSessionTypes = async (c) => {
-		const payload = await this.options.kernel.agentRuntimeManager.listSessionTypes({ describeMode: "observation" });
+		const payload = await this.options.kernel.listSessionTypes({ describeMode: "observation" });
 		return c.json(ok(payload));
 	};
 	listSessions = async (c) => {
@@ -4481,6 +4001,56 @@ var RuntimeUpdateRoutesController = class {
 	};
 };
 //#endregion
+//#region src/app/utils/ncp-session-event-stream.utils.ts
+function readEventSessionId(event) {
+	const payload = "payload" in event ? event.payload : null;
+	if (!payload || typeof payload !== "object") return null;
+	return "sessionId" in payload && typeof payload.sessionId === "string" ? payload.sessionId : null;
+}
+function toSseFrame(eventName, data) {
+	return `event: ${eventName}\ndata: ${JSON.stringify(data)}\n\n`;
+}
+function createNcpSessionEventStreamResponse(eventBus, payload, signal) {
+	const encoder = new TextEncoder();
+	let controller = null;
+	let closed = false;
+	let unsubscribe = () => void 0;
+	const cleanup = () => {
+		unsubscribe();
+		signal.removeEventListener("abort", close);
+	};
+	const close = () => {
+		if (closed) return;
+		closed = true;
+		cleanup();
+		controller?.close();
+	};
+	const push = (event) => {
+		if (closed || signal.aborted) return;
+		if (readEventSessionId(event) === payload.sessionId) controller?.enqueue(encoder.encode(toSseFrame("ncp-event", event)));
+	};
+	const stream = new ReadableStream({
+		start: (streamController) => {
+			controller = streamController;
+			unsubscribe = eventBus.on(eventKeys.ncpEvent, push);
+			signal.addEventListener("abort", close, { once: true });
+			if (signal.aborted) close();
+		},
+		cancel: () => {
+			if (!closed) {
+				closed = true;
+				cleanup();
+			}
+		}
+	});
+	return new Response(stream, { headers: {
+		"Content-Type": "text/event-stream; charset=utf-8",
+		"Cache-Control": "no-cache, no-transform",
+		Connection: "keep-alive",
+		"X-Accel-Buffering": "no"
+	} });
+}
+//#endregion
 //#region src/features/server-path/utils/server-path-browse.utils.ts
 var ServerPathBrowseError = class extends Error {
 	constructor(code, message) {
@@ -4748,7 +4318,6 @@ function createUiRouteControllers(options, authService, marketplaceBaseUrl) {
 		remote: remoteAccess ? new RemoteRoutesController(remoteAccess) : null,
 		runtimeControl: runtimeControl ? new RuntimeControlRoutesController(runtimeControl) : null,
 		runtimeUpdate: runtimeUpdate ? new RuntimeUpdateRoutesController(runtimeUpdate) : null,
-		pluginMarketplace: new PluginMarketplaceController(options, marketplaceBaseUrl),
 		skillMarketplace: new SkillMarketplaceController(options, marketplaceBaseUrl),
 		mcpMarketplace: new McpMarketplaceController(options, marketplaceBaseUrl)
 	};
@@ -4773,42 +4342,6 @@ function readStreamPayload(url) {
 function isAbortPayload(value) {
 	return isRecord(value) && typeof value.sessionId === "string" && value.sessionId.trim().length > 0;
 }
-function toSseFrame(eventName, data) {
-	return `event: ${eventName}\ndata: ${JSON.stringify(data)}\n\n`;
-}
-function createNcpEventStreamResponse(events, signal) {
-	const encoder = new TextEncoder();
-	const stream = new ReadableStream({ start: async (controller) => {
-		let closed = false;
-		const close = () => {
-			if (!closed) {
-				closed = true;
-				controller.close();
-			}
-		};
-		signal.addEventListener("abort", close, { once: true });
-		try {
-			for await (const event of events) {
-				if (closed || signal.aborted) break;
-				controller.enqueue(encoder.encode(toSseFrame("ncp-event", event)));
-			}
-		} catch (error) {
-			if (!closed && !signal.aborted) controller.enqueue(encoder.encode(toSseFrame("error", {
-				code: "STREAM_SOURCE_FAILED",
-				message: error instanceof Error ? error.message : String(error)
-			})));
-		} finally {
-			signal.removeEventListener("abort", close);
-			close();
-		}
-	} });
-	return new Response(stream, { headers: {
-		"Content-Type": "text/event-stream; charset=utf-8",
-		"Cache-Control": "no-cache, no-transform",
-		Connection: "keep-alive",
-		"X-Accel-Buffering": "no"
-	} });
-}
 var UiRouteRegistry = class {
 	constructor(app, options, controllers) {
 		this.app = app;
@@ -4831,7 +4364,7 @@ var UiRouteRegistry = class {
 		this.app.get(`${NCP_AGENT_BASE_PATH}/stream`, (c) => {
 			const payload = readStreamPayload(c.req.raw.url);
 			if (!payload) return c.json(err("INVALID_QUERY", "sessionId is required."), 400);
-			return createNcpEventStreamResponse(kernel.sessionRunManager.streamSessionEvents(payload, { signal: c.req.raw.signal }), c.req.raw.signal);
+			return createNcpSessionEventStreamResponse(kernel.eventBus, payload, c.req.raw.signal);
 		});
 		this.app.post(`${NCP_AGENT_BASE_PATH}/abort`, async (c) => {
 			const body = await readJson(c.req.raw);
@@ -5002,6 +4535,11 @@ var UiRouteRegistry = class {
 				"/api/config/channels/:channel/auth/start",
 				config.startChannelAuth
 			],
+			[
+				"post",
+				"/api/config/channels/:channel/auth/connect",
+				config.connectChannelAuth
+			],
 			[
 				"post",
 				"/api/config/channels/:channel/auth/poll",
@@ -5216,7 +4754,6 @@ var UiRouteRegistry = class {
 			}
 		});
 		mountMarketplaceRoutes(this.app, {
-			plugin: this.controllers.pluginMarketplace,
 			skill: this.controllers.skillMarketplace,
 			mcp: this.controllers.mcpMarketplace
 		});