nextclaw 0.18.4 → 0.18.6

package/dist/cli/app/index.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
 import * as NextclawCore from "@nextclaw/core";
-import { APP_NAME, APP_TAGLINE, AgentRouteResolver, BUILTIN_MAIN_AGENT_ID, ChannelManager, CommandRegistry, ConfigSchema, ContextBuilder, CronService, CronTool, DEFAULT_WORKSPACE_DIR, DEFAULT_WORKSPACE_PATH, DisposableStore, EditFileTool, ExecTool, ExtensionToolAdapter, FileLogSink, GatewayTool, InputBudgetPruner, LLMProvider, ListDirTool, MemoryGetTool, MemorySearchTool, MessageBus, MessageTool, ProviderManager, ReadFileTool, RequestedSkillsMetadataReader, SessionManager, SessionsHistoryTool, SessionsListTool, SkillsLoader, Tool, ToolRegistry, WebFetchTool, WebSearchTool, WriteFileTool, buildConfigSchema, buildMinimalSystemExecutionPrompt, buildReloadPlan, buildToolCatalogEntries, createAgentProfile, createAssistantStreamDeltaControlMessage, createAssistantStreamResetControlMessage, createExternalCommandEnv, createGlobalTypedEventBus, createTypedEventKey, createTypingStopControlMessage, diffConfigPaths, expandHome, findEffectiveAgentProfile, getConfigPath, getDataDir, getDataPath, getLoggingRuntime, getLogsPath, getPackageVersion, getWorkspacePath, hasSecretRef, loadConfig, normalizeInlineSecretRefs, parseAgentScopedSessionKey, parseThinkingLevel, readSessionProjectRoot, redactConfigObject, removeAgentProfile, resolveAppLogPath, resolveConfigSecrets, resolveDefaultAgentProfileId, resolveEffectiveAgentProfiles, resolveLocalUiBaseUrl, resolveProviderRuntime, resolveSessionWorkspacePath, resolveThinkingLevel, saveConfig, toDisposable, updateAgentProfile } from "@nextclaw/core";
+import { APP_NAME, APP_TAGLINE, AgentRouteResolver, BUILTIN_MAIN_AGENT_ID, ChannelManager, CommandRegistry, ConfigSchema, ContextBuilder, CronService, CronTool, DEFAULT_WORKSPACE_DIR, DEFAULT_WORKSPACE_PATH, DisposableStore, EditFileTool, ExecTool, ExtensionToolAdapter, FileLogSink, GatewayTool, InputBudgetPruner, LLMProvider, ListDirTool, MemoryGetTool, MemorySearchTool, MessageBus, MessageTool, ProviderManager, ReadFileTool, RequestedSkillsMetadataReader, SessionManager, SessionsHistoryTool, SessionsListTool, SkillsLoader, Tool, ToolRegistry, WebFetchTool, WebSearchTool, WriteFileTool, buildConfigSchema, buildMinimalSystemExecutionPrompt, buildReloadPlan, buildToolCatalogEntries, createAgentProfile, createAssistantStreamDeltaControlMessage, createAssistantStreamResetControlMessage, createExternalCommandEnv, createGlobalTypedEventBus, createTypedEventKey, createTypingStopControlMessage, diffConfigPaths, expandHome, findEffectiveAgentProfile, getAppLogger, getConfigPath, getDataDir, getDataPath, getLoggingRuntime, getLogsPath, getPackageVersion, getWorkspacePath, hasSecretRef, loadConfig, normalizeInlineSecretRefs, parseAgentScopedSessionKey, parseThinkingLevel, readSessionProjectRoot, redactConfigObject, removeAgentProfile, resolveAppLogPath, resolveConfigSecrets, resolveDefaultAgentProfileId, resolveEffectiveAgentProfiles, resolveLocalUiBaseUrl, resolveProviderRuntime, resolveSessionWorkspacePath, resolveThinkingLevel, saveConfig, toDisposable, updateAgentProfile } from "@nextclaw/core";
 import { Command } from "commander";
 import fs, { appendFileSync, closeSync, constants, cpSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import path, { basename, delimiter, dirname, extname, isAbsolute, join, relative, resolve, win32 } from "node:path";
 import { homedir, hostname, platform } from "node:os";
 import { ensureUiBridgeSecret, startUiServer } from "@nextclaw/server";
-import { addPluginLoadPath, buildPluginStatusReport, disablePluginInConfig, discoverPluginStatusReport, enablePluginInConfig, getPackageManifestExtensions, getPluginChannelBindings, getPluginUiMetadataFromRegistry, installPluginFromNpmSpec, installPluginFromPath, loadOpenClawPlugins, loadPluginManifest, mergePluginConfigView, recordPluginInstall, resolvePluginChannelMessageToolHints, resolveUninstallDirectoryTargets, setPluginRuntimeBridge, stopPluginChannelGateways, toPluginConfigView, toPluginConfigView as toPluginConfigView$1, uninstallPlugin } from "@nextclaw/openclaw-compat";
+import { addPluginLoadPath, buildPluginStatusReport, disablePluginInConfig, discoverPluginStatusReport, enablePluginInConfig, getPackageManifestExtensions, getPluginChannelBindings, getPluginUiMetadataFromRegistry, installPluginFromNpmSpec, installPluginFromPath, loadOpenClawPlugins, loadOpenClawPluginsProgressively, loadPluginManifest, mergePluginConfigView, recordPluginInstall, resolvePluginChannelMessageToolHints, resolveUninstallDirectoryTargets, setPluginRuntimeBridge, startPluginChannelGateways, stopPluginChannelGateways, toPluginConfigView, toPluginConfigView as toPluginConfigView$1, uninstallPlugin } from "@nextclaw/openclaw-compat";
 import { fileURLToPath } from "node:url";
-import { fork, spawn, spawnSync } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import { createServer, isIP } from "node:net";
 import { BUILTIN_CHANNEL_PLUGIN_IDS, builtinProviderIds, listBuiltinProviders } from "@nextclaw/runtime";
 import { createInterface } from "node:readline";
@@ -6024,9 +6024,23 @@ function toExtensionRegistry(pluginRegistry) {
 }
 //#endregion
 //#region src/cli/commands/plugin/plugin-registry-loader.ts
+function createPluginLogger() {
+	return getAppLogger("plugin.registry_loader");
+}
 function withDevFirstPartyPluginPaths(config) {
 	return resolveDevPluginLoadingContext(config, resolveDevFirstPartyPluginDir(process.env.NEXTCLAW_DEV_FIRST_PARTY_PLUGIN_DIR));
 }
+async function loadPluginRegistryProgressively(config, workspaceDir, options = {}) {
+	const { configWithDevPluginOverrides, excludedRoots } = withDevFirstPartyPluginPaths(config);
+	return await loadOpenClawPluginsProgressively({
+		config: configWithDevPluginOverrides,
+		workspaceDir,
+		excludeRoots: excludedRoots,
+		...buildReservedPluginLoadOptions(),
+		onPluginProcessed: options.onPluginProcessed,
+		logger: createPluginLogger()
+	});
+}
 function discoverPluginRegistryStatus(config, workspaceDir) {
 	const { configWithDevPluginOverrides } = withDevFirstPartyPluginPaths(config);
 	return discoverPluginStatusReport({
@@ -13960,6 +13974,19 @@ var ManagedServiceCommandService = class {
 };
 //#endregion
 //#region src/cli/shared/services/gateway/service-startup-support.ts
+const pluginGatewayLogger = {
+	info: (message) => console.log(`[plugins] ${message}`),
+	warn: (message) => console.warn(`[plugins] ${message}`),
+	error: (message) => console.error(`[plugins] ${message}`),
+	debug: (message) => console.debug(`[plugins] ${message}`)
+};
+function logPluginGatewayDiagnostics(diagnostics) {
+	for (const diag of diagnostics) {
+		const text = `${diag.pluginId ? `${diag.pluginId}: ` : ""}${diag.message}`;
+		if (diag.level === "error") console.error(`[plugins] ${text}`);
+		else console.warn(`[plugins] ${text}`);
+	}
+}
 async function startGatewaySupportServices(params) {
 	if (params.cronJobs > 0) console.log(`✓ Cron: ${params.cronJobs} scheduled jobs`);
 	console.log("✓ Heartbeat: every 30m");
@@ -15370,10 +15397,14 @@ var NextclawApp = class {
 		await measureStartupAsync("service.deferred_startup.recover_durable_state", async () => await this.ncpAgentRuntime.recoverDurableState());
 	};
 	warmDerivedCapabilities = async () => {
+		const runtimeWarmupTask = this.kernelReady ? measureStartupAsync("service.deferred_startup.warm_ncp_capabilities", async () => await this.ncpAgentRuntime.warmDerivedCapabilities()).catch((error) => {
+			console.warn(`UI NCP derived capability warmup failed: ${error instanceof Error ? error.message : String(error)}`);
+		}) : Promise.resolve();
 		if (this.params.hydrateCapabilities) await measureStartupAsync("service.deferred_startup.hydrate_capabilities", this.params.hydrateCapabilities);
 		await measureStartupAsync("service.deferred_startup.start_plugin_gateways", this.params.startPluginGateways);
 		await measureStartupAsync("service.deferred_startup.start_channels", this.params.startChannels);
 		await measureStartupAsync("service.deferred_startup.wake_restart_sentinel", this.params.wakeFromRestartSentinel);
+		await runtimeWarmupTask;
 	};
 	handleKernelStartupError(error) {
 		this.params.bootstrapStatus.markNcpAgentError(error instanceof Error ? error.message : String(error));
@@ -15875,57 +15906,58 @@ function countEnabledPlugins(config, workspaceDir) {
 	return discoverPluginRegistryStatus(config, workspaceDir).plugins.filter((plugin) => plugin.enabled).length;
 }
 async function hydrateServiceCapabilities(params) {
-	const { bootstrapStatus, extensionHost, gateway, getLiveUiNcpAgent, state, uiStartup } = params;
-	await waitForUiShellGraceWindow(uiStartup);
-	const nextConfig = resolveConfigSecrets(loadConfig(), { configPath: gateway.runtimeConfigPath });
+	await waitForUiShellGraceWindow(params.uiStartup);
+	const nextConfig = resolveConfigSecrets(loadConfig(), { configPath: params.gateway.runtimeConfigPath });
 	const nextWorkspace = getWorkspacePath(nextConfig.agents.defaults.workspace);
 	const totalPluginCount = countEnabledPlugins(nextConfig, nextWorkspace);
 	let loadedPluginCount = 0;
-	bootstrapStatus.markPluginHydrationRunning({ totalPluginCount });
-	bootstrapStatus.markChannelsPending();
+	params.bootstrapStatus.markPluginHydrationRunning({ totalPluginCount });
+	params.bootstrapStatus.markChannelsPending();
 	try {
-		const nextPluginRegistry = extensionHost.createProxyPluginRegistry(await extensionHost.load({
-			config: nextConfig,
-			workspaceDir: nextWorkspace
-		}));
-		loadedPluginCount = loadedPluginCount || nextPluginRegistry.plugins.filter((plugin) => plugin.status === "loaded").length;
+		const nextPluginRegistry = await loadPluginRegistryProgressively(nextConfig, nextWorkspace, { onPluginProcessed: ({ loadedPluginCount: nextCount }) => {
+			loadedPluginCount = nextCount;
+			params.bootstrapStatus.markPluginHydrationProgress({
+				loadedPluginCount: nextCount,
+				totalPluginCount
+			});
+		} });
 		logPluginDiagnostics(nextPluginRegistry);
 		const nextExtensionRegistry = toExtensionRegistry(nextPluginRegistry);
 		const nextPluginChannelBindings = getPluginChannelBindings(nextPluginRegistry);
 		const nextPluginUiMetadata = getPluginUiMetadataFromRegistry(nextPluginRegistry);
 		const shouldRebuildChannels = shouldRestartChannelsForPluginReload({
 			changedPaths: [],
-			currentPluginChannelBindings: state.pluginChannelBindings,
+			currentPluginChannelBindings: params.state.pluginChannelBindings,
 			nextPluginChannelBindings,
-			currentExtensionChannels: state.extensionRegistry.channels,
+			currentExtensionChannels: params.state.extensionRegistry.channels,
 			nextExtensionChannels: nextExtensionRegistry.channels
 		});
-		applyGatewayCapabilityState(gateway, {
+		applyGatewayCapabilityState(params.gateway, {
 			pluginRegistry: nextPluginRegistry,
 			extensionRegistry: nextExtensionRegistry,
 			pluginChannelBindings: nextPluginChannelBindings
 		});
-		state.pluginRegistry = nextPluginRegistry;
-		state.extensionRegistry = nextExtensionRegistry;
-		state.pluginChannelBindings = nextPluginChannelBindings;
-		state.pluginUiMetadata = nextPluginUiMetadata;
-		getLiveUiNcpAgent()?.applyExtensionRegistry?.(nextExtensionRegistry);
-		if (shouldRebuildChannels) await gateway.reloader.rebuildChannels(nextConfig, { start: false });
-		uiStartup?.publish({
+		params.state.pluginRegistry = nextPluginRegistry;
+		params.state.extensionRegistry = nextExtensionRegistry;
+		params.state.pluginChannelBindings = nextPluginChannelBindings;
+		params.state.pluginUiMetadata = nextPluginUiMetadata;
+		params.getLiveUiNcpAgent()?.applyExtensionRegistry?.(nextExtensionRegistry);
+		if (shouldRebuildChannels) await params.gateway.reloader.rebuildChannels(nextConfig, { start: false });
+		params.uiStartup?.publish({
 			type: "config.updated",
 			payload: { path: "channels" }
 		});
-		uiStartup?.publish({
+		params.uiStartup?.publish({
 			type: "config.updated",
 			payload: { path: "plugins" }
 		});
-		bootstrapStatus.markPluginHydrationReady({
+		params.bootstrapStatus.markPluginHydrationReady({
 			loadedPluginCount: loadedPluginCount || totalPluginCount,
 			totalPluginCount
 		});
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
-		bootstrapStatus.markPluginHydrationError(message);
+		params.bootstrapStatus.markPluginHydrationError(message);
 		throw error;
 	}
 }
@@ -16020,10 +16052,7 @@ function resolvePluginRuntimeAttachments(ctx) {
 //#region src/cli/shared/services/plugin/service-plugin-reload.service.ts
 async function reloadServicePlugins(params) {
 	const nextWorkspace = getWorkspacePath(params.nextConfig.agents.defaults.workspace);
-	const nextPluginRegistry = params.extensionHost.createProxyPluginRegistry(await params.extensionHost.load({
-		config: params.nextConfig,
-		workspaceDir: nextWorkspace
-	}));
+	const nextPluginRegistry = loadPluginRegistry(params.nextConfig, nextWorkspace);
 	const nextExtensionRegistry = toExtensionRegistry(nextPluginRegistry);
 	const nextPluginChannelBindings = getPluginChannelBindings(nextPluginRegistry);
 	const shouldRestartChannels = shouldRestartChannelsForPluginReload({
@@ -16034,14 +16063,22 @@ async function reloadServicePlugins(params) {
 		nextExtensionChannels: nextExtensionRegistry.channels
 	});
 	logPluginDiagnostics(nextPluginRegistry);
+	let pluginGatewayHandles = params.pluginGatewayHandles;
 	if (shouldRestartChannels) {
-		await params.extensionHost.stopPluginGateways();
-		await params.extensionHost.startPluginGateways(params.nextConfig);
+		await stopPluginChannelGateways(pluginGatewayHandles);
+		const startedPluginGateways = await startPluginChannelGateways({
+			registry: nextPluginRegistry,
+			config: params.nextConfig,
+			logger: params.pluginGatewayLogger
+		});
+		pluginGatewayHandles = startedPluginGateways.handles;
+		params.logPluginGatewayDiagnostics(startedPluginGateways.diagnostics);
 	}
 	return {
 		pluginRegistry: nextPluginRegistry,
 		extensionRegistry: nextExtensionRegistry,
 		pluginChannelBindings: nextPluginChannelBindings,
+		pluginGatewayHandles,
 		restartChannels: shouldRestartChannels
 	};
 }
@@ -16066,20 +16103,22 @@ function createGatewayRuntimeState(gateway) {
 	};
 }
 function applyGatewayRuntimeCapabilityState(params) {
-	const { gateway, next, state } = params;
-	applyGatewayCapabilityState(gateway, next);
-	state.pluginRegistry = next.pluginRegistry;
-	state.extensionRegistry = next.extensionRegistry;
-	state.pluginChannelBindings = next.pluginChannelBindings;
+	applyGatewayCapabilityState(params.gateway, params.next);
+	params.state.pluginRegistry = params.next.pluginRegistry;
+	params.state.extensionRegistry = params.next.extensionRegistry;
+	params.state.pluginChannelBindings = params.next.pluginChannelBindings;
 }
 function configureGatewayPluginRuntime(params) {
 	params.gateway.reloader.setReloadPlugins(async ({ config: nextConfig, changedPaths }) => {
 		const result = await reloadServicePlugins({
 			nextConfig,
 			changedPaths,
+			pluginRegistry: params.state.pluginRegistry,
 			extensionRegistry: params.state.extensionRegistry,
 			pluginChannelBindings: params.state.pluginChannelBindings,
-			extensionHost: params.extensionHost
+			pluginGatewayHandles: params.state.pluginGatewayHandles,
+			pluginGatewayLogger,
+			logPluginGatewayDiagnostics
 		});
 		applyGatewayRuntimeCapabilityState({
 			gateway: params.gateway,
@@ -16091,6 +16130,7 @@ function configureGatewayPluginRuntime(params) {
 			}
 		});
 		params.state.pluginUiMetadata = getPluginUiMetadataFromRegistry(result.pluginRegistry);
+		params.state.pluginGatewayHandles = result.pluginGatewayHandles;
 		params.getLiveUiNcpAgent()?.applyExtensionRegistry?.(result.extensionRegistry);
 		if (result.restartChannels) console.log("Config reload: plugin channel gateways restarted.");
 		return { restartChannels: result.restartChannels };
@@ -16117,12 +16157,17 @@ function createDeferredGatewayStartupHooks(params) {
 				gateway: params.gateway,
 				state: params.state,
 				bootstrapStatus: params.bootstrapStatus,
-				getLiveUiNcpAgent: params.getLiveUiNcpAgent,
-				extensionHost: params.extensionHost
+				getLiveUiNcpAgent: params.getLiveUiNcpAgent
 			});
 		},
 		startPluginGateways: async () => {
-			await params.extensionHost.startPluginGateways(resolveConfigSecrets$2(loadConfig$2(), { configPath: params.gateway.runtimeConfigPath }));
+			const startedPluginGateways = await startPluginChannelGateways({
+				registry: params.state.pluginRegistry,
+				config: resolveConfigSecrets$2(loadConfig$2(), { configPath: params.gateway.runtimeConfigPath }),
+				logger: pluginGatewayLogger
+			});
+			params.state.pluginGatewayHandles = startedPluginGateways.handles;
+			logPluginGatewayDiagnostics(startedPluginGateways.diagnostics);
 		},
 		startChannels: async () => {
 			await params.gateway.reloader.getChannels().startAll();
@@ -16157,326 +16202,6 @@ async function cleanupGatewayRuntime(params) {
 	setPluginRuntimeBridge(null);
 }
 //#endregion
-//#region src/cli/shared/services/extension-host-proxy-registry.service.ts
-function normalizeSchema(schema) {
-	if (!schema || typeof schema !== "object" || Array.isArray(schema)) return {
-		type: "object",
-		properties: {},
-		additionalProperties: true
-	};
-	return schema;
-}
-function stringifyToolResult(value) {
-	if (typeof value === "string") return value;
-	if (value === void 0 || value === null) return "";
-	try {
-		return JSON.stringify(value, null, 2);
-	} catch {
-		return String(value);
-	}
-}
-function pickPreview(params) {
-	const { alias, descriptor } = params;
-	const byName = descriptor.previews.find((preview) => preview.name === alias);
-	if (byName) return byName;
-	if (descriptor.previews.length === 1) return descriptor.previews[0] ?? null;
-	if (descriptor.previews.length === descriptor.names.length) {
-		const index = descriptor.names.indexOf(alias);
-		if (index >= 0 && index < descriptor.previews.length) return descriptor.previews[index] ?? null;
-	}
-	return null;
-}
-var ExtensionHostProxyRuntime = class {
-	constructor(params) {
-		this.params = params;
-	}
-	run = (input, options) => this.params.client.runRuntimeStream({
-		kind: this.params.kind,
-		entry: this.params.entry,
-		runtimeParams: this.params.runtimeParams,
-		input,
-		signal: options?.signal
-	});
-};
-var ExtensionHostProxyRegistryService = class {
-	constructor(client) {
-		this.client = client;
-	}
-	createPluginRegistry = (snapshot) => ({
-		plugins: snapshot.plugins,
-		diagnostics: snapshot.diagnostics,
-		tools: snapshot.tools.map((descriptor) => ({
-			pluginId: descriptor.pluginId,
-			source: descriptor.source,
-			names: descriptor.names,
-			optional: descriptor.optional,
-			factory: (context) => this.createProxyTools(descriptor, context)
-		})),
-		channels: snapshot.channels.map((descriptor) => ({
-			pluginId: descriptor.pluginId,
-			source: descriptor.source,
-			channel: {
-				id: descriptor.channel.id,
-				...descriptor.channel.meta ? { meta: descriptor.channel.meta } : {},
-				...descriptor.channel.capabilities ? { capabilities: descriptor.channel.capabilities } : {},
-				...descriptor.channel.configSchema ? { configSchema: descriptor.channel.configSchema } : {},
-				outbound: this.createChannelOutbound(descriptor)
-			}
-		})),
-		providers: snapshot.providers.map((descriptor) => ({
-			pluginId: descriptor.pluginId,
-			source: descriptor.source,
-			provider: descriptor.provider
-		})),
-		ncpAgentRuntimes: snapshot.ncpAgentRuntimes.map((descriptor) => ({
-			pluginId: descriptor.pluginId,
-			source: descriptor.source,
-			kind: descriptor.kind,
-			label: descriptor.label,
-			createRuntime: (runtimeParams) => new ExtensionHostProxyRuntime({
-				client: this.client,
-				kind: descriptor.kind,
-				runtimeParams
-			}),
-			createRuntimeForEntry: descriptor.supportsEntryRuntime ? ({ entry, runtimeParams }) => new ExtensionHostProxyRuntime({
-				client: this.client,
-				kind: descriptor.kind,
-				entry,
-				runtimeParams
-			}) : void 0,
-			describeSessionType: async (describeParams) => await this.client.describeRuntime({
-				kind: descriptor.kind,
-				describeParams
-			}),
-			describeSessionTypeForEntry: descriptor.supportsEntryDescription ? async ({ entry, describeParams }) => await this.client.describeRuntime({
-				kind: descriptor.kind,
-				entry,
-				describeParams
-			}) : void 0
-		})),
-		resolvedTools: snapshot.tools.flatMap((descriptor) => descriptor.previews.map((preview) => this.createProxyTool(descriptor, preview.name, {}, preview)))
-	});
-	createChannelOutbound = (descriptor) => ({
-		...descriptor.channel.hasOutboundText ? { sendText: async (ctx) => await this.client.sendChannelOutbound({
-			pluginId: descriptor.pluginId,
-			channelId: descriptor.channel.id,
-			kind: "text",
-			cfg: ctx.cfg,
-			to: ctx.to,
-			text: ctx.text,
-			accountId: ctx.accountId
-		}) } : {},
-		...descriptor.channel.hasOutboundPayload ? { sendPayload: async (ctx) => await this.client.sendChannelOutbound({
-			pluginId: descriptor.pluginId,
-			channelId: descriptor.channel.id,
-			kind: "payload",
-			cfg: ctx.cfg,
-			to: ctx.to,
-			text: ctx.text,
-			payload: ctx.payload,
-			accountId: ctx.accountId
-		}) } : {}
-	});
-	createProxyTools = (descriptor, context) => descriptor.names.map((alias) => {
-		const preview = pickPreview({
-			descriptor,
-			alias
-		});
-		return this.createProxyTool(descriptor, alias, context, preview ?? void 0);
-	});
-	createProxyTool = (descriptor, alias, context, preview) => ({
-		name: preview?.name ?? alias,
-		...preview?.label ? { label: preview.label } : {},
-		description: preview?.description ?? `Extension tool '${alias}' from ${descriptor.pluginId}`,
-		parameters: normalizeSchema(preview?.parameters),
-		execute: async (toolCallIdOrParams, maybeParams) => {
-			const hasToolCallId = typeof toolCallIdOrParams === "string";
-			const params = hasToolCallId ? maybeParams ?? {} : toolCallIdOrParams;
-			const toolCallId = hasToolCallId ? toolCallIdOrParams : void 0;
-			return stringifyToolResult(await this.client.executeTool({
-				registrationId: descriptor.registrationId,
-				alias,
-				context,
-				params,
-				toolCallId
-			}));
-		}
-	});
-};
-//#endregion
-//#region src/cli/shared/services/extension-host-client.service.ts
-function resolveChildEntryPath() {
-	const sourcePath = fileURLToPath(new URL("./extension-host-child.service.ts", import.meta.url));
-	if (existsSync(sourcePath)) return sourcePath;
-	return fileURLToPath(new URL("./extension-host-child.service.js", import.meta.url));
-}
-var ExtensionHostClient = class {
-	child = null;
-	nextRequestId = 1;
-	nextStreamId = 1;
-	pending = /* @__PURE__ */ new Map();
-	runtimeStreams = /* @__PURE__ */ new Map();
-	proxyRegistry = new ExtensionHostProxyRegistryService(this);
-	constructor(params = {}) {
-		this.params = params;
-	}
-	load = async (request) => await this.request("load", request);
-	startPluginGateways = async (config) => {
-		await this.request("channel.startGateways", { config });
-	};
-	stopPluginGateways = async () => {
-		await this.request("channel.stopGateways", void 0);
-	};
-	executeTool = async (request) => await this.request("tool.execute", request);
-	sendChannelOutbound = async (request) => await this.request("channel.outbound", request);
-	describeRuntime = async (request) => await this.request("runtime.describe", request);
-	createProxyPluginRegistry = (snapshot) => this.proxyRegistry.createPluginRegistry(snapshot);
-	runRuntimeStream = async function* (params) {
-		const { entry, input, kind, runtimeParams, signal } = params;
-		const streamId = `runtime-${this.nextStreamId++}`;
-		const state = {
-			queue: [],
-			wake: null,
-			onMetadata: runtimeParams.setSessionMetadata,
-			applyStateBatch: async (events) => {
-				await runtimeParams.stateManager.dispatchBatch(events);
-			}
-		};
-		this.runtimeStreams.set(streamId, state);
-		const abortListener = () => {
-			this.request("runtime.abort", {
-				streamId,
-				reason: typeof signal?.reason === "string" ? signal.reason : void 0
-			}).catch(() => void 0);
-		};
-		signal?.addEventListener("abort", abortListener, { once: true });
-		await this.request("runtime.run", {
-			streamId,
-			kind,
-			entry,
-			runtimeParams: {
-				sessionId: runtimeParams.sessionId,
-				agentId: runtimeParams.agentId,
-				sessionMetadata: runtimeParams.sessionMetadata,
-				...runtimeParams.resolveTools ? { resolvedTools: Array.from(runtimeParams.resolveTools(input) ?? []) } : {}
-			},
-			input
-		});
-		try {
-			while (true) {
-				const next = await this.nextRuntimeStreamItem(state);
-				if (next === null) return;
-				if (next instanceof Error) throw next;
-				yield next;
-			}
-		} finally {
-			signal?.removeEventListener("abort", abortListener);
-			this.runtimeStreams.delete(streamId);
-		}
-	};
-	dispose = async () => {
-		await this.stopPluginGateways().catch(() => void 0);
-		this.child?.kill();
-		this.child = null;
-		this.rejectAll(/* @__PURE__ */ new Error("Extension host disposed"));
-	};
-	request = async (method, payload) => {
-		const child = this.ensureChild();
-		const id = this.nextRequestId++;
-		const promise = new Promise((resolve, reject) => {
-			this.pending.set(id, {
-				resolve: (value) => resolve(value),
-				reject
-			});
-		});
-		child.send?.({
-			type: "request",
-			id,
-			method,
-			payload
-		});
-		return await promise;
-	};
-	ensureChild = () => {
-		if (this.child) return this.child;
-		const child = fork(resolveChildEntryPath(), [], {
-			env: process.env,
-			execArgv: process.execArgv,
-			stdio: [
-				"ignore",
-				"inherit",
-				"inherit",
-				"ipc"
-			]
-		});
-		child.on("message", (message) => this.handleMessage(message));
-		child.on("exit", (code, signal) => {
-			this.child = null;
-			this.rejectAll(/* @__PURE__ */ new Error(`Extension host exited: code=${code ?? "null"} signal=${signal ?? "null"}`));
-		});
-		child.on("error", (error) => {
-			this.rejectAll(error);
-		});
-		this.child = child;
-		return child;
-	};
-	handleMessage = (message) => {
-		if (message.type === "response") {
-			const pending = this.pending.get(message.id);
-			if (!pending) return;
-			this.pending.delete(message.id);
-			if (message.ok) {
-				pending.resolve(message.payload);
-				return;
-			}
-			pending.reject(new Error(message.error));
-			return;
-		}
-		if (message.type !== "event") return;
-		if (message.event === "load.progress") {
-			this.params.onProgress?.(message.payload);
-			return;
-		}
-		if (message.event === "runtime.state.dispatchBatch") {
-			this.runtimeStreams.get(message.payload.streamId)?.applyStateBatch(message.payload.events);
-			return;
-		}
-		const state = this.runtimeStreams.get(message.payload.streamId);
-		if (!state) return;
-		if (message.event === "runtime.event") {
-			this.pushRuntimeStreamItem(state, message.payload.event);
-			return;
-		}
-		if (message.event === "runtime.metadata") {
-			state.onMetadata(message.payload.metadata);
-			return;
-		}
-		if (message.event === "runtime.error") {
-			this.pushRuntimeStreamItem(state, new Error(message.payload.error));
-			return;
-		}
-		if (message.event === "runtime.done") this.pushRuntimeStreamItem(state, null);
-	};
-	pushRuntimeStreamItem = (state, item) => {
-		state.queue.push(item);
-		state.wake?.();
-		state.wake = null;
-	};
-	nextRuntimeStreamItem = async (state) => {
-		const queued = state.queue.shift();
-		if (queued !== void 0) return queued;
-		await new Promise((resolve) => {
-			state.wake = resolve;
-		});
-		return state.queue.shift() ?? null;
-	};
-	rejectAll = (error) => {
-		for (const pending of this.pending.values()) pending.reject(error);
-		this.pending.clear();
-		for (const state of this.runtimeStreams.values()) this.pushRuntimeStreamItem(state, error);
-	};
-};
-//#endregion
 //#region src/cli/shared/services/runtime/runtime-command.service.ts
 const { getApiBase, getConfigPath: getConfigPath$1, getProvider, getProviderName, getWorkspacePath: getWorkspacePath$1, loadConfig: loadConfig$1, LiteLLMProvider, MessageBus: MessageBus$1, resolveConfigSecrets: resolveConfigSecrets$1, SessionManager: SessionManager$1, parseAgentScopedSessionKey: parseAgentScopedSessionKey$1 } = NextclawCore;
 function createSkillsLoader(workspace) {
@@ -16513,12 +16238,6 @@ var RuntimeCommandService = class {
 		};
 		let runtimeState = null;
 		const bootstrapStatus = createBootstrapStatus(shellContext.config.remote.enabled);
-		const extensionHost = new ExtensionHostClient({ onProgress: ({ loadedPluginCount, totalPluginCount }) => {
-			bootstrapStatus.markPluginHydrationProgress({
-				loadedPluginCount,
-				totalPluginCount
-			});
-		} });
 		const ncpSessionRealtimeBridge = createServiceNcpSessionRealtimeBridge({ sessionManager: shellContext.sessionManager });
 		const marketplaceInstaller = new ServiceMarketplaceInstaller({
 			applyLiveConfigReload,
@@ -16585,8 +16304,7 @@ var RuntimeCommandService = class {
 		configureGatewayPluginRuntime({
 			gateway,
 			state: gatewayRuntimeState,
-			getLiveUiNcpAgent: () => this.liveUiNcpAgent,
-			extensionHost
+			getLiveUiNcpAgent: () => this.liveUiNcpAgent
 		});
 		console.log("✓ Capability hydration: scheduled in background");
 		await measureStartupAsync("service.start_gateway_support_services", async () => await startGatewayRuntimeSupport({
@@ -16612,7 +16330,6 @@ var RuntimeCommandService = class {
 			setLiveUiNcpAgent: (ncpAgent) => {
 				this.liveUiNcpAgent = ncpAgent;
 			},
-			extensionHost,
 			wakeFromRestartSentinel: async () => await this.wakeFromRestartSentinel({
 				bus: gateway.bus,
 				sessionManager: gateway.sessionManager
@@ -16649,8 +16366,6 @@ var RuntimeCommandService = class {
 				uiStartup,
 				remoteModule: gateway.remoteModule,
 				runtimeState
-			}).finally(async () => {
-				await extensionHost.dispose();
 			})
 		});
 		logStartupTrace("service.start_gateway.end");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.18.4",
+  "version": "0.18.6",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -40,19 +40,19 @@
     "chokidar": "^3.6.0",
     "commander": "^12.1.0",
     "yaml": "^2.8.1",
-    "@nextclaw/ncp": "0.5.5",
-    "@nextclaw/ncp-agent-runtime": "0.3.15",
     "@nextclaw/mcp": "0.1.76",
     "@nextclaw/core": "0.12.11",
+    "@nextclaw/ncp": "0.5.5",
     "@nextclaw/ncp-mcp": "0.1.78",
     "@nextclaw/ncp-toolkit": "0.5.10",
+    "@nextclaw/nextclaw-ncp-runtime-http-client": "0.1.4",
     "@nextclaw/nextclaw-hermes-acp-bridge": "0.1.4",
+    "@nextclaw/nextclaw-ncp-runtime-stdio-client": "0.1.5",
     "@nextclaw/openclaw-compat": "1.0.11",
     "@nextclaw/remote": "0.1.88",
     "@nextclaw/runtime": "0.2.43",
-    "@nextclaw/nextclaw-ncp-runtime-http-client": "0.1.4",
     "@nextclaw/server": "0.12.11",
-    "@nextclaw/nextclaw-ncp-runtime-stdio-client": "0.1.5"
+    "@nextclaw/ncp-agent-runtime": "0.3.15"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",
@@ -60,7 +60,7 @@
     "tsx": "^4.19.2",
     "typescript": "^5.6.3",
     "vitest": "^4.1.2",
-    "@nextclaw/ui": "0.12.12"
+    "@nextclaw/ui": "0.12.14"
   },
   "scripts": {
     "dev": "tsx watch --tsconfig tsconfig.json src/cli/app/index.ts",