nextclaw 0.18.2 → 0.18.4

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, 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 { 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 { 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, loadOpenClawPluginsProgressively, loadPluginManifest, mergePluginConfigView, recordPluginInstall, resolvePluginChannelMessageToolHints, resolveUninstallDirectoryTargets, setPluginRuntimeBridge, startPluginChannelGateways, stopPluginChannelGateways, toPluginConfigView, toPluginConfigView as toPluginConfigView$1, uninstallPlugin } from "@nextclaw/openclaw-compat";
+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 { fileURLToPath } from "node:url";
-import { spawn, spawnSync } from "node:child_process";
+import { fork, 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";
@@ -5220,11 +5220,31 @@ async function waitForExit(pid, timeoutMs) {
 	}
 	return !isProcessRunning(pid);
 }
-function resolveUiStaticDir() {
+function findNearestPackageManifest(startDir, expectedName) {
+	let current = resolve(startDir);
+	while (current.length > 0) {
+		const pkgPath = join(current, "package.json");
+		if (existsSync(pkgPath)) try {
+			const raw = readFileSync(pkgPath, "utf-8");
+			const parsed = JSON.parse(raw);
+			if (!expectedName || parsed.name === expectedName) return {
+				rootDir: current,
+				version: typeof parsed.version === "string" ? parsed.version : void 0
+			};
+		} catch {}
+		const parent = resolve(current, "..");
+		if (parent === current) break;
+		current = parent;
+	}
+	return null;
+}
+function resolveUiStaticDir(importMetaUrl = import.meta.url) {
 	if (process.env.NEXTCLAW_DISABLE_STATIC_UI === "1") return null;
 	const envDir = process.env.NEXTCLAW_UI_STATIC_DIR;
 	if (envDir) return existsSync(join(envDir, "index.html")) ? envDir : null;
-	const bundledDir = join(resolve(resolve(fileURLToPath(new URL(".", import.meta.url))), "..", "..", "..", ".."), "ui-dist");
+	const pkgRoot = findNearestPackageManifest(resolve(fileURLToPath(new URL(".", importMetaUrl))), "nextclaw")?.rootDir;
+	if (!pkgRoot) return null;
+	const bundledDir = join(pkgRoot, "ui-dist");
 	return existsSync(join(bundledDir, "index.html")) ? bundledDir : null;
 }
 function openBrowser(url) {
@@ -5246,7 +5266,7 @@ function openBrowser(url) {
 		command = "xdg-open";
 		args = [url];
 	}
-	if (!which(command)) return false;
+	if (!findExecutableOnPath(command)) return false;
 	try {
 		spawn(command, args, {
 			stdio: "ignore",
@@ -5260,7 +5280,7 @@ function openBrowser(url) {
 }
 function normalizePathEntries(rawPath, platform) {
 	const delimiter = platform === "win32" ? ";" : ":";
-	return rawPath.split(delimiter).map((entry) => entry.trim().replace(/^"+|"+$/g, "")).filter((entry) => entry.length > 0);
+	return rawPath.split(delimiter).map((entry) => entry.trim().replace(/^"+|"+$/g, "")).filter(Boolean);
 }
 function normalizeWindowsPathExt(rawPathExt) {
 	const source = rawPathExt && rawPathExt.trim().length > 0 ? rawPathExt : ".COM;.EXE;.BAT;.CMD";
@@ -5274,8 +5294,7 @@ function normalizeWindowsPathExt(rawPathExt) {
 	return [...unique];
 }
 function hasFileExtension(binary) {
-	const lastSlash = Math.max(binary.lastIndexOf("/"), binary.lastIndexOf("\\"));
-	return binary.lastIndexOf(".") > lastSlash;
+	return binary.lastIndexOf(".") > Math.max(binary.lastIndexOf("/"), binary.lastIndexOf("\\"));
 }
 function findExecutableOnPath(binary, env = process.env, platform = process.platform) {
 	const target = binary.trim();
@@ -5285,41 +5304,20 @@ function findExecutableOnPath(binary, env = process.env, platform = process.plat
 	if (!rawPath.trim()) return null;
 	const entries = normalizePathEntries(rawPath, platform);
 	if (entries.length === 0) return null;
-	const checkCandidates = (candidate) => existsSync(candidate) ? candidate : null;
 	for (const dir of entries) {
-		const direct = checkCandidates(join(dir, target));
-		if (direct) return direct;
+		const direct = join(dir, target);
+		if (existsSync(direct)) return direct;
 		if (platform !== "win32" || hasFileExtension(target)) continue;
 		for (const ext of normalizeWindowsPathExt(env.PATHEXT)) {
-			const withExt = checkCandidates(join(dir, `${target}${ext}`));
-			if (withExt) return withExt;
+			const withExt = join(dir, `${target}${ext}`);
+			if (existsSync(withExt)) return withExt;
 		}
 	}
 	return null;
 }
-function which(binary) {
-	return findExecutableOnPath(binary) !== null;
-}
-function resolveVersionFromPackageTree(startDir, expectedName) {
-	let current = resolve(startDir);
-	while (current.length > 0) {
-		const pkgPath = join(current, "package.json");
-		if (existsSync(pkgPath)) try {
-			const raw = readFileSync(pkgPath, "utf-8");
-			const parsed = JSON.parse(raw);
-			const version = typeof parsed.version === "string" ? parsed.version : null;
-			const matchesExpectedName = !expectedName || parsed.name === expectedName;
-			if (version && matchesExpectedName) return version;
-		} catch {}
-		const parent = resolve(current, "..");
-		if (parent === current) break;
-		current = parent;
-	}
-	return null;
-}
 function getPackageVersion$1() {
 	const cliDir = resolve(fileURLToPath(new URL(".", import.meta.url)));
-	return resolveVersionFromPackageTree(cliDir, "nextclaw") ?? resolveVersionFromPackageTree(cliDir) ?? getPackageVersion();
+	return findNearestPackageManifest(cliDir, "nextclaw")?.version ?? findNearestPackageManifest(cliDir)?.version ?? getPackageVersion();
 }
 function printAgentResponse(response) {
 	console.log("\n" + response + "\n");
@@ -6026,23 +6024,9 @@ 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({
@@ -8554,6 +8538,7 @@ function buildLegacyAssistantMessages(message, timestamp) {
 			name: toolInvocation.toolName,
 			tool_call_id: toolInvocation.toolCallId,
 			content: typeof toolInvocation.result === "string" ? toolInvocation.result : JSON.stringify(toolInvocation.result ?? null),
+			...toolInvocation.resultContentItems ? { ncp_tool_result_content_items: structuredClone(toolInvocation.resultContentItems) } : {},
 			timestamp,
 			ncp_message_id: message.id
 		});
@@ -9432,8 +9417,9 @@ function buildGenericMessage(params) {
 		parts: contentToParts(params.message.content)
 	};
 }
-function attachToolResult(target, toolCallId, result, toolName) {
+function attachToolResult(target, toolCallId, result, toolName, resultContentItems) {
 	const normalizedResult = normalizeToolResultPayload(result);
+	const normalizedContentItems = Array.isArray(resultContentItems) ? structuredClone(resultContentItems) : void 0;
 	target.parts = target.parts.map((part) => {
 		if (part.type !== "tool-invocation" || part.toolCallId !== toolCallId) return part;
 		if (part.state === "result" && Object.prototype.hasOwnProperty.call(part, "result")) return {
@@ -9444,7 +9430,8 @@ function attachToolResult(target, toolCallId, result, toolName) {
 			...part,
 			toolName: toolName ?? part.toolName,
 			state: "result",
-			result: normalizedResult
+			result: normalizedResult,
+			...normalizedContentItems ? { resultContentItems: normalizedContentItems } : {}
 		};
 	});
 }
@@ -9458,7 +9445,7 @@ function toNcpMessages(sessionId, messages) {
 			if (toolCallId) {
 				const assistantIndex = assistantIndexByToolCallId.get(toolCallId);
 				if (assistantIndex !== void 0) {
-					attachToolResult(ncpMessages[assistantIndex], toolCallId, structuredClone(message.content), normalizeString(message.name) ?? void 0);
+					attachToolResult(ncpMessages[assistantIndex], toolCallId, structuredClone(message.content), normalizeString(message.name) ?? void 0, message.ncp_tool_result_content_items);
 					return;
 				}
 			}
@@ -13973,19 +13960,6 @@ 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");
@@ -15396,14 +15370,10 @@ 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));
@@ -15905,58 +15875,57 @@ function countEnabledPlugins(config, workspaceDir) {
 	return discoverPluginRegistryStatus(config, workspaceDir).plugins.filter((plugin) => plugin.enabled).length;
 }
 async function hydrateServiceCapabilities(params) {
-	await waitForUiShellGraceWindow(params.uiStartup);
-	const nextConfig = resolveConfigSecrets(loadConfig(), { configPath: params.gateway.runtimeConfigPath });
+	const { bootstrapStatus, extensionHost, gateway, getLiveUiNcpAgent, state, uiStartup } = params;
+	await waitForUiShellGraceWindow(uiStartup);
+	const nextConfig = resolveConfigSecrets(loadConfig(), { configPath: gateway.runtimeConfigPath });
 	const nextWorkspace = getWorkspacePath(nextConfig.agents.defaults.workspace);
 	const totalPluginCount = countEnabledPlugins(nextConfig, nextWorkspace);
 	let loadedPluginCount = 0;
-	params.bootstrapStatus.markPluginHydrationRunning({ totalPluginCount });
-	params.bootstrapStatus.markChannelsPending();
+	bootstrapStatus.markPluginHydrationRunning({ totalPluginCount });
+	bootstrapStatus.markChannelsPending();
 	try {
-		const nextPluginRegistry = await loadPluginRegistryProgressively(nextConfig, nextWorkspace, { onPluginProcessed: ({ loadedPluginCount: nextCount }) => {
-			loadedPluginCount = nextCount;
-			params.bootstrapStatus.markPluginHydrationProgress({
-				loadedPluginCount: nextCount,
-				totalPluginCount
-			});
-		} });
+		const nextPluginRegistry = extensionHost.createProxyPluginRegistry(await extensionHost.load({
+			config: nextConfig,
+			workspaceDir: nextWorkspace
+		}));
+		loadedPluginCount = loadedPluginCount || nextPluginRegistry.plugins.filter((plugin) => plugin.status === "loaded").length;
 		logPluginDiagnostics(nextPluginRegistry);
 		const nextExtensionRegistry = toExtensionRegistry(nextPluginRegistry);
 		const nextPluginChannelBindings = getPluginChannelBindings(nextPluginRegistry);
 		const nextPluginUiMetadata = getPluginUiMetadataFromRegistry(nextPluginRegistry);
 		const shouldRebuildChannels = shouldRestartChannelsForPluginReload({
 			changedPaths: [],
-			currentPluginChannelBindings: params.state.pluginChannelBindings,
+			currentPluginChannelBindings: state.pluginChannelBindings,
 			nextPluginChannelBindings,
-			currentExtensionChannels: params.state.extensionRegistry.channels,
+			currentExtensionChannels: state.extensionRegistry.channels,
 			nextExtensionChannels: nextExtensionRegistry.channels
 		});
-		applyGatewayCapabilityState(params.gateway, {
+		applyGatewayCapabilityState(gateway, {
 			pluginRegistry: nextPluginRegistry,
 			extensionRegistry: nextExtensionRegistry,
 			pluginChannelBindings: nextPluginChannelBindings
 		});
-		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({
+		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({
 			type: "config.updated",
 			payload: { path: "channels" }
 		});
-		params.uiStartup?.publish({
+		uiStartup?.publish({
 			type: "config.updated",
 			payload: { path: "plugins" }
 		});
-		params.bootstrapStatus.markPluginHydrationReady({
+		bootstrapStatus.markPluginHydrationReady({
 			loadedPluginCount: loadedPluginCount || totalPluginCount,
 			totalPluginCount
 		});
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
-		params.bootstrapStatus.markPluginHydrationError(message);
+		bootstrapStatus.markPluginHydrationError(message);
 		throw error;
 	}
 }
@@ -16051,7 +16020,10 @@ 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 = loadPluginRegistry(params.nextConfig, nextWorkspace);
+	const nextPluginRegistry = params.extensionHost.createProxyPluginRegistry(await params.extensionHost.load({
+		config: params.nextConfig,
+		workspaceDir: nextWorkspace
+	}));
 	const nextExtensionRegistry = toExtensionRegistry(nextPluginRegistry);
 	const nextPluginChannelBindings = getPluginChannelBindings(nextPluginRegistry);
 	const shouldRestartChannels = shouldRestartChannelsForPluginReload({
@@ -16062,22 +16034,14 @@ async function reloadServicePlugins(params) {
 		nextExtensionChannels: nextExtensionRegistry.channels
 	});
 	logPluginDiagnostics(nextPluginRegistry);
-	let pluginGatewayHandles = params.pluginGatewayHandles;
 	if (shouldRestartChannels) {
-		await stopPluginChannelGateways(pluginGatewayHandles);
-		const startedPluginGateways = await startPluginChannelGateways({
-			registry: nextPluginRegistry,
-			config: params.nextConfig,
-			logger: params.pluginGatewayLogger
-		});
-		pluginGatewayHandles = startedPluginGateways.handles;
-		params.logPluginGatewayDiagnostics(startedPluginGateways.diagnostics);
+		await params.extensionHost.stopPluginGateways();
+		await params.extensionHost.startPluginGateways(params.nextConfig);
 	}
 	return {
 		pluginRegistry: nextPluginRegistry,
 		extensionRegistry: nextExtensionRegistry,
 		pluginChannelBindings: nextPluginChannelBindings,
-		pluginGatewayHandles,
 		restartChannels: shouldRestartChannels
 	};
 }
@@ -16102,22 +16066,20 @@ function createGatewayRuntimeState(gateway) {
 	};
 }
 function applyGatewayRuntimeCapabilityState(params) {
-	applyGatewayCapabilityState(params.gateway, params.next);
-	params.state.pluginRegistry = params.next.pluginRegistry;
-	params.state.extensionRegistry = params.next.extensionRegistry;
-	params.state.pluginChannelBindings = params.next.pluginChannelBindings;
+	const { gateway, next, state } = params;
+	applyGatewayCapabilityState(gateway, next);
+	state.pluginRegistry = next.pluginRegistry;
+	state.extensionRegistry = next.extensionRegistry;
+	state.pluginChannelBindings = 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,
-			pluginGatewayHandles: params.state.pluginGatewayHandles,
-			pluginGatewayLogger,
-			logPluginGatewayDiagnostics
+			extensionHost: params.extensionHost
 		});
 		applyGatewayRuntimeCapabilityState({
 			gateway: params.gateway,
@@ -16129,7 +16091,6 @@ 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 };
@@ -16156,17 +16117,12 @@ function createDeferredGatewayStartupHooks(params) {
 				gateway: params.gateway,
 				state: params.state,
 				bootstrapStatus: params.bootstrapStatus,
-				getLiveUiNcpAgent: params.getLiveUiNcpAgent
+				getLiveUiNcpAgent: params.getLiveUiNcpAgent,
+				extensionHost: params.extensionHost
 			});
 		},
 		startPluginGateways: async () => {
-			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);
+			await params.extensionHost.startPluginGateways(resolveConfigSecrets$2(loadConfig$2(), { configPath: params.gateway.runtimeConfigPath }));
 		},
 		startChannels: async () => {
 			await params.gateway.reloader.getChannels().startAll();
@@ -16201,6 +16157,326 @@ 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) {
@@ -16237,6 +16513,12 @@ 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,
@@ -16303,7 +16585,8 @@ var RuntimeCommandService = class {
 		configureGatewayPluginRuntime({
 			gateway,
 			state: gatewayRuntimeState,
-			getLiveUiNcpAgent: () => this.liveUiNcpAgent
+			getLiveUiNcpAgent: () => this.liveUiNcpAgent,
+			extensionHost
 		});
 		console.log("✓ Capability hydration: scheduled in background");
 		await measureStartupAsync("service.start_gateway_support_services", async () => await startGatewayRuntimeSupport({
@@ -16329,6 +16612,7 @@ var RuntimeCommandService = class {
 			setLiveUiNcpAgent: (ncpAgent) => {
 				this.liveUiNcpAgent = ncpAgent;
 			},
+			extensionHost,
 			wakeFromRestartSentinel: async () => await this.wakeFromRestartSentinel({
 				bus: gateway.bus,
 				sessionManager: gateway.sessionManager
@@ -16365,6 +16649,8 @@ var RuntimeCommandService = class {
 				uiStartup,
 				remoteModule: gateway.remoteModule,
 				runtimeState
+			}).finally(async () => {
+				await extensionHost.dispose();
 			})
 		});
 		logStartupTrace("service.start_gateway.end");
@@ -18216,7 +18502,7 @@ var WorkspaceManager = class {
 		return this.exitWithError(`Bridge source not found. Try reinstalling ${APP_NAME}.`);
 	};
 	assertCommandAvailable = (command) => {
-		if (which(command)) return;
+		if (findExecutableOnPath(command)) return;
 		this.exitWithError(`${command} not found. Please install Node.js >= 18.`);
 	};
 	runBridgeCommand = (cwd, args, step) => {