@nextclaw/service 0.1.11 → 0.1.13

package/dist/shared/controllers/gateway.controller.js

@@ -2,59 +2,8 @@ import { parseSessionKey, writeRestartSentinel } from "../services/restart/resta
 import { getPackageVersion as getPackageVersion$1 } from "../utils/package/package-manifest.utils.js";
 import "../utils/cli.utils.js";
 import { NpmRuntimeUpdateCommandService } from "../../launcher/npm-runtime-update-command.service.js";
-import { ConfigSchema, buildConfigSchema, buildReloadPlan, diffConfigPaths, normalizeInlineSecretRefs, redactConfigObject } from "@nextclaw/core";
-import { existsSync, readFileSync } from "node:fs";
-import { createHash } from "node:crypto";
+import "@nextclaw/core";
 //#region src/shared/controllers/gateway.controller.ts
-const hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
-const readConfigSnapshot = (getConfigPath) => {
-	const path = getConfigPath();
-	let raw = "";
-	let parsed = {};
-	if (existsSync(path)) {
-		raw = readFileSync(path, "utf-8");
-		try {
-			parsed = JSON.parse(raw);
-		} catch {
-			parsed = {};
-		}
-	}
-	let config;
-	let valid = true;
-	try {
-		config = ConfigSchema.parse(normalizeInlineSecretRefs(parsed));
-	} catch {
-		config = ConfigSchema.parse({});
-		valid = false;
-	}
-	if (!raw) raw = JSON.stringify(config, null, 2);
-	const hash = hashRaw(raw);
-	const schema = buildConfigSchema({ version: getPackageVersion$1() });
-	const redacted = redactConfigObject(config, schema.uiHints);
-	return {
-		raw: valid ? JSON.stringify(redacted, null, 2) : null,
-		hash: valid ? hash : null,
-		config,
-		redacted,
-		valid
-	};
-};
-const redactValue = (value) => {
-	return redactConfigObject(value, buildConfigSchema({ version: getPackageVersion$1() }).uiHints);
-};
-const mergeDeep = (base, patch) => {
-	const next = { ...base };
-	for (const [key, value] of Object.entries(patch)) if (value && typeof value === "object" && !Array.isArray(value)) {
-		const baseVal = base[key];
-		if (baseVal && typeof baseVal === "object" && !Array.isArray(baseVal)) next[key] = mergeDeep(baseVal, value);
-		else next[key] = mergeDeep({}, value);
-	} else next[key] = value;
-	return next;
-};
-const buildPendingRestartMessage = (paths) => {
-	if (paths.length === 0) return "Config saved. Restart manually to apply changes.";
-	return `Config saved. Restart manually to apply: ${paths.join(", ")}.`;
-};
 var GatewayControllerImpl = class {
 	constructor(deps) {
 		this.deps = deps;
@@ -87,19 +36,20 @@ var GatewayControllerImpl = class {
 		};
 	};
 	writeRestartSentinelPayload = async (params) => {
-		const sessionKey = this.normalizeOptionalString(params.sessionKey);
+		const { kind, note, reason, sessionKey: rawSessionKey, status, strategy } = params;
+		const sessionKey = this.normalizeOptionalString(rawSessionKey);
 		const deliveryContext = this.resolveDeliveryContext(sessionKey);
 		try {
 			return await writeRestartSentinel({
-				kind: params.kind,
-				status: params.status,
+				kind,
+				status,
 				ts: Date.now(),
 				sessionKey,
 				deliveryContext,
-				message: params.note ?? null,
+				message: note ?? null,
 				stats: {
-					reason: params.reason ?? null,
-					strategy: params.strategy ?? null
+					reason: reason ?? null,
+					strategy: strategy ?? null
 				}
 			});
 		} catch {
@@ -107,58 +57,22 @@ var GatewayControllerImpl = class {
 		}
 	};
 	requestRestart = async (options) => {
+		const { delayMs, reason } = options ?? {};
 		if (this.deps.requestRestart) {
 			await this.deps.requestRestart(options);
 			return;
 		}
-		const delay = typeof options?.delayMs === "number" && Number.isFinite(options.delayMs) ? Math.max(0, options.delayMs) : 100;
-		console.log(`Gateway restart requested via tool${options?.reason ? ` (${options.reason})` : ""}.`);
+		const delay = typeof delayMs === "number" && Number.isFinite(delayMs) ? Math.max(0, delayMs) : 100;
+		console.log(`Gateway restart requested via tool${reason ? ` (${reason})` : ""}.`);
 		setTimeout(() => {
 			process.exit(0);
 		}, delay);
 	};
-	createConfigMutationResult = (params) => {
-		const pendingRestart = params.plan.restartRequired.length > 0 ? {
-			required: true,
-			automatic: false,
-			changedPaths: [...params.plan.restartRequired],
-			message: buildPendingRestartMessage(params.plan.restartRequired)
-		} : null;
-		const message = params.changedPaths.length === 0 ? "Config already matched the requested state." : pendingRestart ? params.changedPaths.length > params.plan.restartRequired.length ? "Config saved. Supported changes were applied immediately; restart manually to apply the rest." : "Config saved. Restart manually to apply changes." : "Config saved and applied.";
-		return {
-			ok: true,
-			note: params.note ?? null,
-			path: this.deps.getConfigPath(),
-			config: redactValue(params.config),
-			changedPaths: [...params.changedPaths],
-			message,
-			pendingRestart
-		};
-	};
-	applyConfigChange = async (params) => {
-		const { nextConfig, note } = params;
-		const changedPaths = diffConfigPaths(readConfigSnapshot(this.deps.getConfigPath).config, nextConfig);
-		const plan = buildReloadPlan(changedPaths);
-		if (changedPaths.length === 0) return this.createConfigMutationResult({
-			changedPaths,
-			config: nextConfig,
-			note,
-			plan
-		});
-		this.deps.saveConfig(nextConfig);
-		await this.deps.configManager.applyReloadPlan(nextConfig);
-		return this.createConfigMutationResult({
-			changedPaths,
-			config: nextConfig,
-			note,
-			plan
-		});
-	};
 	status = () => {
 		return {
 			channels: this.deps.channels.enabledChannels,
 			cron: this.deps.cron.status(),
-			configPath: this.deps.getConfigPath()
+			configPath: this.deps.configManager.configPath
 		};
 	};
 	reloadConfig = async (reason) => {
@@ -175,95 +89,25 @@ var GatewayControllerImpl = class {
 		return "Restart scheduled";
 	};
 	getConfig = async () => {
-		const snapshot = readConfigSnapshot(this.deps.getConfigPath);
-		return {
-			raw: snapshot.raw,
-			hash: snapshot.hash,
-			path: this.deps.getConfigPath(),
-			config: snapshot.redacted,
-			parsed: snapshot.redacted,
-			resolved: snapshot.redacted,
-			valid: snapshot.valid
-		};
+		return this.deps.configManager.getConfigSnapshot({ version: getPackageVersion$1() });
 	};
 	getConfigSchema = async () => {
-		return buildConfigSchema({ version: getPackageVersion$1() });
+		return this.deps.configManager.getConfigSchema({ version: getPackageVersion$1() });
 	};
 	applyConfig = async (params) => {
-		const snapshot = readConfigSnapshot(this.deps.getConfigPath);
-		if (!params.baseHash) return {
-			ok: false,
-			error: "config base hash required; re-run config.get and retry"
-		};
-		if (!snapshot.valid || !snapshot.hash) return {
-			ok: false,
-			error: "config base hash unavailable; re-run config.get and retry"
-		};
-		if (params.baseHash !== snapshot.hash) return {
-			ok: false,
-			error: "config changed since last load; re-run config.get and retry"
-		};
-		let parsedRaw;
-		try {
-			parsedRaw = JSON.parse(params.raw);
-		} catch {
-			return {
-				ok: false,
-				error: "invalid JSON in raw config"
-			};
-		}
-		let validated;
-		try {
-			validated = ConfigSchema.parse(normalizeInlineSecretRefs(parsedRaw));
-		} catch (err) {
-			return {
-				ok: false,
-				error: `invalid config: ${String(err)}`
-			};
-		}
-		return this.applyConfigChange({
-			kind: "config.apply",
-			nextConfig: validated,
-			note: params.note
+		return this.deps.configManager.applyRawConfig({
+			raw: params.raw,
+			baseHash: params.baseHash,
+			note: params.note,
+			version: getPackageVersion$1()
 		});
 	};
 	patchConfig = async (params) => {
-		const snapshot = readConfigSnapshot(this.deps.getConfigPath);
-		if (!params.baseHash) return {
-			ok: false,
-			error: "config base hash required; re-run config.get and retry"
-		};
-		if (!snapshot.valid || !snapshot.hash) return {
-			ok: false,
-			error: "config base hash unavailable; re-run config.get and retry"
-		};
-		if (params.baseHash !== snapshot.hash) return {
-			ok: false,
-			error: "config changed since last load; re-run config.get and retry"
-		};
-		let patch;
-		try {
-			patch = JSON.parse(params.raw);
-		} catch {
-			return {
-				ok: false,
-				error: "invalid JSON in raw config"
-			};
-		}
-		const merged = mergeDeep(snapshot.config, patch);
-		let validated;
-		try {
-			validated = ConfigSchema.parse(normalizeInlineSecretRefs(merged));
-		} catch (err) {
-			return {
-				ok: false,
-				error: `invalid config: ${String(err)}`
-			};
-		}
-		return this.applyConfigChange({
-			kind: "config.patch",
-			nextConfig: validated,
-			note: params.note
+		return this.deps.configManager.patchRawConfig({
+			raw: params.raw,
+			baseHash: params.baseHash,
+			note: params.note,
+			version: getPackageVersion$1()
 		});
 	};
 	updateRun = async (params) => {

package/dist/shared/services/gateway/managers/gateway-plugin.manager.d.ts

@@ -1,19 +1,14 @@
-import { NextclawExtensionRegistry } from "../../../../commands/plugin/plugin-extension-registry.js";
 import { NextclawGatewayRuntime } from "../nextclaw-gateway-runtime.service.js";
 import { Config } from "@nextclaw/core";
-import { PluginChannelBinding, PluginRegistry, PluginUiMetadata } from "@nextclaw/openclaw-compat";
+import { PluginChannelBinding } from "@nextclaw/openclaw-compat";
 
 //#region src/shared/services/gateway/managers/gateway-plugin.manager.d.ts
 declare class GatewayPluginManager {
   private readonly gateway;
-  private extensionContributions;
-  private snapshot;
   private gatewayHandles;
   constructor(gateway: NextclawGatewayRuntime);
-  getRegistry: () => PluginRegistry;
-  getExtensionRegistry: () => NextclawExtensionRegistry;
   getChannelBindings: () => PluginChannelBinding[];
-  getUiMetadata: () => PluginUiMetadata[];
+  getUiMetadata: () => any;
   load: () => Promise<void>;
   reloadForConfigChange: (params: {
     config: Config;
@@ -30,8 +25,6 @@ declare class GatewayPluginManager {
   private resolveGatewayAccountIds;
   private reportGatewayStartFailure;
   private isChannelEnabled;
-  private replaceSnapshot;
-  private loadKernelExtensionContributions;
 }
 //#endregion
 export { GatewayPluginManager };

package/dist/shared/services/gateway/managers/gateway-plugin.manager.js

@@ -1,76 +1,38 @@
-import { toExtensionRegistry } from "../../../../commands/plugin/plugin-extension-registry.js";
-import { createEmptyPluginRegistry, discoverPluginRegistryStatus, loadPluginRegistryProgressively } from "../../../../commands/plugin/plugin-registry-loader.utils.js";
 import { logPluginDiagnostics } from "../../../../commands/plugin/index.js";
-import { shouldRestartChannelsForPluginReload } from "../../../../commands/plugin/plugin-reload.js";
 import { logPluginGatewayDiagnostics, pluginGatewayLogger } from "../service-startup-support.service.js";
-import { getWorkspacePath } from "@nextclaw/core";
-import { getPluginChannelBindings, getPluginUiMetadataFromRegistry, toPluginConfigView } from "@nextclaw/openclaw-compat";
+import { toPluginConfigView } from "@nextclaw/openclaw-compat";
 import { eventKeys } from "@nextclaw/shared";
 //#region src/shared/services/gateway/managers/gateway-plugin.manager.ts
-function toManifestChannelRegistrations(channelBindings) {
-	return channelBindings.map((binding) => ({
-		extensionId: binding.pluginId,
-		channel: binding.channel,
-		source: "extension-manifest"
-	}));
-}
-function buildSnapshot(registry, extensionContributions) {
-	const extensionChannelIds = new Set(extensionContributions.channelBindings.map((binding) => binding.channelId));
-	const extensionPluginIds = new Set(extensionContributions.uiMetadata.map((metadata) => metadata.id));
-	const registryExtensionRegistry = toExtensionRegistry(registry);
-	return {
-		registry,
-		extensionRegistry: {
-			...registryExtensionRegistry,
-			channels: [...registryExtensionRegistry.channels.filter((registration) => {
-				const channelId = registration.channel.id?.trim();
-				return !channelId || !extensionChannelIds.has(channelId);
-			}), ...toManifestChannelRegistrations(extensionContributions.channelBindings)]
-		},
-		channelBindings: [...getPluginChannelBindings(registry).filter((binding) => !extensionChannelIds.has(binding.channelId)), ...extensionContributions.channelBindings],
-		uiMetadata: [...getPluginUiMetadataFromRegistry(registry).filter((metadata) => !extensionPluginIds.has(metadata.id)), ...extensionContributions.uiMetadata]
-	};
-}
-function countEnabledPlugins(config, workspaceDir) {
-	return discoverPluginRegistryStatus(config, workspaceDir).plugins.filter((plugin) => plugin.enabled).length;
-}
 var GatewayPluginManager = class {
-	extensionContributions = {
-		channelBindings: [],
-		uiMetadata: []
-	};
-	snapshot = buildSnapshot(createEmptyPluginRegistry(), this.extensionContributions);
 	gatewayHandles = [];
 	constructor(gateway) {
 		this.gateway = gateway;
 	}
-	getRegistry = () => this.snapshot.registry;
-	getExtensionRegistry = () => this.snapshot.extensionRegistry;
-	getChannelBindings = () => this.snapshot.channelBindings;
-	getUiMetadata = () => this.snapshot.uiMetadata;
+	getChannelBindings = () => this.gateway.kernel.extensions.getChannelBindings();
+	getUiMetadata = () => this.gateway.kernel.extensions.getUiMetadata();
 	load = async () => {
 		const config = this.gateway.configManager.loadConfig();
-		const workspace = getWorkspacePath(config.agents.defaults.workspace);
-		const totalPluginCount = countEnabledPlugins(config, workspace);
-		let loadedPluginCount = 0;
-		this.gateway.bootstrapStatus.markPluginHydrationRunning({ totalPluginCount });
+		let totalPluginCount = 0;
 		this.gateway.bootstrapStatus.markChannelsPending();
 		try {
-			const registry = await loadPluginRegistryProgressively(config, workspace, { onPluginProcessed: ({ loadedPluginCount: nextCount }) => {
-				loadedPluginCount = nextCount;
-				this.gateway.bootstrapStatus.markPluginHydrationProgress({
-					loadedPluginCount: nextCount,
-					totalPluginCount
-				});
-			} });
-			this.extensionContributions = await this.gateway.extensions.loadContributions();
-			const shouldRebuildChannels = this.replaceSnapshot(registry, []);
-			this.loadKernelExtensionContributions(registry);
-			logPluginDiagnostics(registry);
-			if (shouldRebuildChannels) await this.gateway.configManager.rebuildChannels(config, { start: false });
+			const result = await this.gateway.kernel.extensions.load({
+				config,
+				onLoadStart: ({ totalPluginCount: nextTotalPluginCount }) => {
+					totalPluginCount = nextTotalPluginCount;
+					this.gateway.bootstrapStatus.markPluginHydrationRunning({ totalPluginCount: nextTotalPluginCount });
+				},
+				onPluginProcessed: ({ loadedPluginCount: nextCount }) => {
+					this.gateway.bootstrapStatus.markPluginHydrationProgress({
+						loadedPluginCount: nextCount,
+						totalPluginCount
+					});
+				}
+			});
+			logPluginDiagnostics({ diagnostics: result.diagnostics });
+			if (result.shouldRestartChannels) await this.gateway.configManager.rebuildChannels(config, { start: false });
 			this.publishConfigChanges();
 			this.gateway.bootstrapStatus.markPluginHydrationReady({
-				loadedPluginCount: loadedPluginCount || totalPluginCount,
+				loadedPluginCount: result.loadedPluginCount,
 				totalPluginCount
 			});
 		} catch (error) {
@@ -79,15 +41,14 @@ var GatewayPluginManager = class {
 		}
 	};
 	reloadForConfigChange = async (params) => {
-		const workspace = getWorkspacePath(params.config.agents.defaults.workspace);
-		const registry = await loadPluginRegistryProgressively(params.config, workspace);
-		this.extensionContributions = await this.gateway.extensions.loadContributions();
-		const restartChannels = this.replaceSnapshot(registry, params.changedPaths);
-		this.loadKernelExtensionContributions(registry);
-		logPluginDiagnostics(registry);
-		if (restartChannels) await this.restartGateways();
+		const result = await this.gateway.kernel.extensions.reloadForConfigChange({
+			config: params.config,
+			changedPaths: params.changedPaths
+		});
+		logPluginDiagnostics({ diagnostics: result.diagnostics });
+		if (result.shouldRestartChannels) await this.restartGateways();
 		this.publishConfigChanges();
-		return { restartChannels };
+		return { restartChannels: result.shouldRestartChannels };
 	};
 	reloadForDevHotReload = async (changedPaths) => {
 		const config = this.gateway.configManager.loadConfig();
@@ -100,8 +61,9 @@ var GatewayPluginManager = class {
 		const config = this.gateway.configManager.loadConfig();
 		const diagnostics = [];
 		const handles = [];
-		const configView = toPluginConfigView(config, this.snapshot.channelBindings);
-		for (const binding of this.snapshot.channelBindings) {
+		const channelBindings = this.gateway.kernel.extensions.getChannelBindings();
+		const configView = toPluginConfigView(config, channelBindings);
+		for (const binding of channelBindings) {
 			if (!this.isChannelEnabled(binding.channelId, configView)) continue;
 			await this.startChannelGateways({
 				binding,
@@ -207,26 +169,6 @@ var GatewayPluginManager = class {
 		if (!channelConfig || typeof channelConfig !== "object" || Array.isArray(channelConfig)) return false;
 		return channelConfig.enabled === true;
 	};
-	replaceSnapshot = (registry, changedPaths) => {
-		const nextSnapshot = buildSnapshot(registry, this.extensionContributions);
-		const shouldRestartChannels = shouldRestartChannelsForPluginReload({
-			changedPaths,
-			currentPluginChannelBindings: this.snapshot.channelBindings,
-			nextPluginChannelBindings: nextSnapshot.channelBindings,
-			currentExtensionChannels: this.snapshot.extensionRegistry.channels,
-			nextExtensionChannels: nextSnapshot.extensionRegistry.channels
-		});
-		this.snapshot = nextSnapshot;
-		return shouldRestartChannels;
-	};
-	loadKernelExtensionContributions = (registry) => {
-		this.gateway.kernel.extensions.loadContributions({
-			registry,
-			extensionRegistry: this.snapshot.extensionRegistry,
-			channelBindings: this.snapshot.channelBindings,
-			uiMetadata: this.snapshot.uiMetadata
-		});
-	};
 };
 //#endregion
 export { GatewayPluginManager };

package/dist/shared/services/gateway/nextclaw-app.service.d.ts

@@ -1,21 +1,16 @@
-import { DeferredUiNcpAgentController } from "../session/service-deferred-ncp-agent.service.js";
 import { NextclawGatewayRuntime } from "./nextclaw-gateway-runtime.service.js";
-import { NextclawKernel } from "@nextclaw/kernel";
 
 //#region src/shared/services/gateway/nextclaw-app.service.d.ts
 type UiStartupHandle = {
-  deferredNcpAgent: DeferredUiNcpAgentController;
   endpoint: string;
 };
-type NextclawAppKernel = Pick<NextclawKernel, "agentRuntimeManager" | "start">;
 declare class NextclawApp {
   private readonly gateway;
   private readonly kernel;
-  private kernelReady;
-  constructor(gateway: NextclawGatewayRuntime, kernel?: NextclawAppKernel);
+  constructor(gateway: NextclawGatewayRuntime);
   start: () => Promise<void>;
   bootstrapKernel: () => Promise<void>;
-  warmDerivedCapabilities: () => Promise<void>;
+  startDeferredRuntimeServices: () => Promise<void>;
   private readonly handleKernelStartupError;
 }
 //#endregion

package/dist/shared/services/gateway/nextclaw-app.service.js

@@ -2,10 +2,9 @@ import { logStartupTrace, measureStartupAsync } from "../../utils/startup-trace.
 //#region src/shared/services/gateway/nextclaw-app.service.ts
 var NextclawApp = class {
 	kernel;
-	kernelReady = false;
-	constructor(gateway, kernel) {
+	constructor(gateway) {
 		this.gateway = gateway;
-		this.kernel = kernel ?? gateway.kernel;
+		this.kernel = gateway.kernel;
 	}
 	start = async () => {
 		logStartupTrace("service.deferred_startup.begin");
@@ -14,35 +13,26 @@ var NextclawApp = class {
 		} catch (error) {
 			this.handleKernelStartupError(error);
 		}
-		await this.warmDerivedCapabilities();
+		await this.startDeferredRuntimeServices();
 		console.log("✓ Deferred startup: plugin gateways and channels settled");
 		logStartupTrace("service.deferred_startup.end");
 	};
 	bootstrapKernel = async () => {
 		this.gateway.bootstrapStatus.markNcpAgentRunning();
 		await measureStartupAsync("service.deferred_startup.bootstrap_kernel", async () => await this.kernel.start());
-		const ncpAgent = this.kernel.agentRuntimeManager.currentHandle;
-		if (!ncpAgent) throw new Error("Kernel start completed without an agent runtime handle.");
-		this.gateway.activateAgentRuntime(ncpAgent);
-		this.kernelReady = true;
+		this.gateway.bootstrapStatus.markNcpAgentReady();
 		if (this.gateway.uiConfig.enabled) {
 			console.log("✓ UI NCP agent: ready");
 			return;
 		}
 		console.log("✓ Service NCP agent: ready");
 	};
-	warmDerivedCapabilities = async () => {
+	startDeferredRuntimeServices = async () => {
 		await measureStartupAsync("service.deferred_startup.load_plugins", this.gateway.plugins.load);
 		await measureStartupAsync("service.deferred_startup.start_plugin_gateways", this.gateway.plugins.startGateways);
-		await measureStartupAsync("service.deferred_startup.start_extensions", this.gateway.extensions.start);
+		await measureStartupAsync("service.deferred_startup.start_extensions", async () => await this.kernel.extensions.start({ endpoint: this.gateway.uiStartup.endpoint }));
 		await measureStartupAsync("service.deferred_startup.start_channels", this.gateway.startDeferredChannels);
 		await measureStartupAsync("service.deferred_startup.wake_restart_sentinel", this.gateway.restartWake.wakeFromRestartSentinel);
-		if (!this.kernelReady) return;
-		setTimeout(() => {
-			measureStartupAsync("service.deferred_startup.warm_ncp_capabilities", async () => await this.kernel.agentRuntimeManager.warmDerivedCapabilities()).catch((error) => {
-				console.warn(`UI NCP derived capability warmup failed: ${error instanceof Error ? error.message : String(error)}`);
-			});
-		}, 0).unref?.();
 	};
 	handleKernelStartupError = (error) => {
 		this.gateway.bootstrapStatus.markNcpAgentError(error instanceof Error ? error.message : String(error));

package/dist/shared/services/gateway/nextclaw-gateway-runtime.service.d.ts

@@ -3,14 +3,13 @@ import { NextclawDistribution } from "../../types/distribution.types.js";
 import { GatewayControllerImpl } from "../../controllers/gateway.controller.js";
 import { GatewayPluginManager } from "./managers/gateway-plugin.manager.js";
 import { GatewayRemoteManager } from "./managers/gateway-remote.manager.js";
-import { GatewayRestartWakeService } from "./gateway-restart-wake.service.js";
 import { UiStartupHandle } from "./nextclaw-app.service.js";
 import { ServiceBootstrapStatusStore } from "./service-bootstrap-status.service.js";
 import { ServiceFileWatcherRegistry } from "./service-startup-support.service.js";
-import { ServiceExtensionRuntime } from "../extensions/service-extension-runtime.service.js";
+import { GatewayRestartWakeService } from "./gateway-restart-wake.service.js";
 import * as NextclawCore from "@nextclaw/core";
-import { AgentRuntimeHandle, AutomationManager, ConfigManager, LlmProviderManager, NextclawKernel } from "@nextclaw/kernel";
-import { MarketplaceApiConfig, UiNcpAgent, UiRuntimeControlHost, UiRuntimeUpdateHost } from "@nextclaw/server";
+import { AutomationManager, ConfigManager, LlmProviderManager, NextclawKernel } from "@nextclaw/kernel";
+import { MarketplaceApiConfig, UiRuntimeControlHost, UiRuntimeUpdateHost } from "@nextclaw/server";
 import { EventBus, Ingress } from "@nextclaw/shared";
 
 //#region src/shared/services/gateway/nextclaw-gateway-runtime.service.d.ts
@@ -60,15 +59,11 @@ declare class NextclawGatewayRuntime {
   readonly restartWake: GatewayRestartWakeService;
   bootstrapStatus: ServiceBootstrapStatusStore;
   uiStartup: UiStartupHandle;
-  readonly extensions: ServiceExtensionRuntime;
-  liveAgentRuntime: AgentRuntimeHandle | null;
   readonly fileWatchers: ServiceFileWatcherRegistry;
   private deferredChannelStarter;
   constructor(deps: GatewayRuntimeDeps, options: GatewayRuntimeOptions);
   start: () => Promise<void>;
   private reset;
-  get ncpAgent(): UiNcpAgent;
-  activateAgentRuntime: (ncpAgent: AgentRuntimeHandle) => void;
   private createBootstrapStatus;
   private createDisabledUiStartup;
   private startUiRuntime;
@@ -84,7 +79,7 @@ declare class NextclawGatewayRuntime {
   private createGatewayController;
   private startSupportServices;
   private configurePluginRuntime;
-  private installConfigRuntimeHooks;
+  private installConfigHostHooks;
   private configureIngressHandlers;
 }
 //#endregion