@nextclaw/server 0.12.19 → 0.12.21

package/dist/index.d.ts

@@ -2,10 +2,9 @@ import * as _$hono from "hono";
 import { Context, Hono } from "hono";
 import * as NextclawCore from "@nextclaw/core";
 import { Config, ConfigActionExecuteRequest as ConfigActionExecuteRequest$1, ConfigActionExecuteResult as ConfigActionExecuteResult$1, ThinkingLevel } from "@nextclaw/core";
-import { NcpHttpAgentStreamProvider } from "@nextclaw/ncp-http-agent-server";
 import { PluginChannelBinding, PluginUiMetadata } from "@nextclaw/openclaw-compat";
-import { LlmProviderManager } from "@nextclaw/kernel";
-import { NcpAgentClientEndpoint, NcpMessage, NcpSessionApi, NcpSessionStatus, NcpSessionSummary } from "@nextclaw/ncp";
+import { LlmProviderManager, NextclawKernel } from "@nextclaw/kernel";
+import { NcpMessage, NcpSessionApi, NcpSessionStatus, NcpSessionSummary } from "@nextclaw/ncp";
 import * as _$hono_utils_http_status0 from "hono/utils/http-status";
 import * as _$hono_utils_types0 from "hono/utils/types";
 import { IncomingMessage } from "node:http";
@@ -67,23 +66,6 @@ declare class EventBus {
   private safeInvokeGlobalListener;
 }
 //#endregion
-//#region ../nextclaw-shared/src/services/ingress.service.d.ts
-type IngressEnvelope<TPayload = unknown> = {
-  type: Key<TPayload>;
-  payload?: TPayload;
-  source?: string;
-};
-type IngressContext = {
-  source: string;
-  token?: string | null;
-};
-type IngressHandler<TPayload = unknown, TResult = unknown> = (envelope: IngressEnvelope<TPayload>, context: IngressContext) => Promise<TResult> | TResult;
-declare class Ingress {
-  private readonly handlers;
-  readonly addHandler: <TPayload = unknown, TResult = unknown>(type: Key<TPayload>, handler: IngressHandler<TPayload, TResult>) => (() => void);
-  readonly handle: <TPayload = unknown, TResult = unknown>(envelope: IngressEnvelope<TPayload>, context: IngressContext) => Promise<TResult>;
-}
-//#endregion
 //#region ../nextclaw-shared/src/types/update.types.d.ts
 type UpdateStatus = "idle" | "checking" | "update-available" | "downloading" | "downloaded" | "applying" | "restart-required" | "up-to-date" | "blocked" | "failed";
 type InstallationKind = "desktop-bundle" | "npm-runtime-bundle" | "npm-global" | "unknown";
@@ -122,6 +104,7 @@ type UpdateSnapshot = {
 declare class NcpAssetRoutesController {
   private readonly options;
   constructor(options: UiRouterOptions);
+  private readonly getAssetApi;
   readonly putAssets: (c: Context) => Promise<(Response & _$hono.TypedResponse<{
     ok: boolean;
     error: {
@@ -1114,21 +1097,15 @@ type SessionTypeDescribeParams = {
   describeMode?: "observation" | "probe";
 };
 type UiNcpSessionService = NcpSessionApi;
-type UiNcpAgent = {
-  agentClientEndpoint: NcpAgentClientEndpoint;
-  streamProvider?: NcpHttpAgentStreamProvider;
-  listSessionTypes?: (params?: SessionTypeDescribeParams) => Promise<ChatSessionTypesView> | ChatSessionTypesView;
-  assetApi?: {
-    put: (input: {
-      fileName: string;
-      mimeType?: string | null;
-      bytes: Uint8Array;
-      createdAt?: Date;
-    }) => Promise<UiNcpStoredAssetRecord>;
-    stat: (uri: string) => Promise<UiNcpStoredAssetRecord | null> | UiNcpStoredAssetRecord | null;
-    resolveContentPath: (uri: string) => string | null;
-  };
-  basePath?: string;
+type UiNcpAssetService = {
+  put: (input: {
+    fileName: string;
+    mimeType?: string | null;
+    bytes: Uint8Array;
+    createdAt?: Date;
+  }) => Promise<UiNcpStoredAssetRecord>;
+  stat: (uri: string) => Promise<UiNcpStoredAssetRecord | null> | UiNcpStoredAssetRecord | null;
+  resolveContentPath: (uri: string) => string | null;
 };
 type ConfigView = {
   companion?: {
@@ -1497,7 +1474,6 @@ type RuntimeControlActionResult = {
 //#endregion
 //#region src/app/types/router-options.types.d.ts
 type UiAppEventBus = Pick<EventBus, "emit" | "subscribeAll">;
-type UiIngress = Pick<Ingress, "handle">;
 type UiBootstrapStatusHost = {
   getStatus: () => BootstrapStatusView;
 };
@@ -1505,7 +1481,7 @@ type UiPluginHost = {
   getChannelBindings: () => PluginChannelBinding[];
   getUiMetadata: () => PluginUiMetadata[];
 };
-type UiNcpSessionHost = UiNcpSessionService;
+type UiKernelHost = Pick<NextclawKernel, "agentRuntimeManager" | "assetStore" | "ingress" | "llmProviders" | "ncpSessionApi" | "sessionRunManager">;
 type UiCronHost = {
   listJobs: (includeDisabled?: boolean) => CronJobEntry[];
   addJob: (params: {
@@ -1525,9 +1501,9 @@ type UiCronHost = {
   runJob: (jobId: string, force?: boolean) => Promise<boolean>;
 };
 type UiRouterOptions = {
+  kernel: UiKernelHost;
   configPath: string;
   appEventBus: UiAppEventBus;
-  ingress?: UiIngress;
   uiConfig?: Pick<NextclawCore.Config["ui"], "enabled" | "host" | "open" | "port">;
   uiStaticDir?: string | null;
   corsOrigins?: string[] | "*";
@@ -1536,15 +1512,12 @@ type UiRouterOptions = {
   initializeAgentHomeDirectory?: (homeDirectory: string) => void;
   marketplace?: MarketplaceApiConfig;
   cron?: UiCronHost;
-  ncpAgent?: UiNcpAgent;
-  sessions?: UiNcpSessionHost;
   authService?: UiAuthService;
   remoteAccess?: UiRemoteAccessHost;
   runtimeControl?: UiRuntimeControlHost;
   runtimeUpdate?: UiRuntimeUpdateHost;
   bootstrapStatus?: UiBootstrapStatusHost;
   plugins?: UiPluginHost;
-  providers?: LlmProviderManager;
 };
 type UiRemoteAccessHost = {
   getStatus: () => Promise<RemoteAccessView> | RemoteAccessView;
@@ -2497,4 +2470,4 @@ declare function updateChannel(configPath: string, channelName: string, patch: R
 declare function updateRuntime(configPath: string, patch: RuntimeConfigUpdate): Pick<ConfigView, "companion" | "agents" | "bindings" | "session">;
 declare function updateSecrets(configPath: string, patch: SecretsConfigUpdate): SecretsView;
 //#endregion
-export { AgentBindingView, AgentCreateRequest, AgentDeleteResult, AgentProfileView, AgentUpdateRequest, ApiError, ApiResponse, AppMetaView, AuthEnabledUpdateRequest, AuthLoginRequest, AuthPasswordUpdateRequest, AuthSetupRequest, AuthStatusView, BindingPeerView, BochaFreshnessValue, BootstrapPhase, BootstrapRemoteState, BootstrapStageState, BootstrapStatusView, ChannelAuthPollRequest, ChannelAuthPollResult, ChannelAuthStartRequest, ChannelAuthStartResult, ChannelSpecView, type ChatSessionTypeCtaView, type ChatSessionTypeOptionView, type ChatSessionTypesView, ConfigActionExecuteRequest, ConfigActionExecuteResult, ConfigActionManifest, ConfigActionType, ConfigMetaView, ConfigRoutesController, ConfigSchemaResponse, ConfigUiHint, ConfigUiHints, ConfigView, CronActionResult, CronCreateRequest, CronCreateResult, CronEnableRequest, CronJobStateView, CronJobView, CronListView, CronPayloadView, CronRunRequest, CronScheduleView, MarketplaceApiConfig, MarketplaceInstallKind, MarketplaceInstallRequest, MarketplaceInstallResult, MarketplaceInstallSkillParams, MarketplaceInstallSpec, MarketplaceInstalledRecord, MarketplaceInstalledView, MarketplaceInstaller, MarketplaceItemSummary, MarketplaceItemType, MarketplaceItemView, MarketplaceListView, MarketplaceLocalizedTextMap, MarketplaceManageAction, MarketplaceManageRequest, MarketplaceManageResult, MarketplaceMcpContentView, MarketplaceMcpDoctorResult, MarketplaceMcpInstallKind, MarketplaceMcpInstallRequest, MarketplaceMcpInstallResult, MarketplaceMcpInstallSpec, MarketplaceMcpManageAction, MarketplaceMcpManageRequest, MarketplaceMcpManageResult, MarketplaceMcpTemplateInput, MarketplacePluginContentView, MarketplacePluginInstallKind, MarketplacePluginInstallRequest, MarketplacePluginInstallResult, MarketplacePluginManageAction, MarketplacePluginManageRequest, MarketplacePluginManageResult, MarketplaceRecommendationView, MarketplaceSceneView, MarketplaceScenesView, MarketplaceSkillContentView, MarketplaceSkillInstallKind, MarketplaceSkillInstallRequest, MarketplaceSkillInstallResult, MarketplaceSkillManageAction, MarketplaceSkillManageRequest, MarketplaceSkillManageResult, MarketplaceSort, NcpAssetRoutesController, NcpSessionSkillsView, ProviderAuthImportResult, ProviderAuthPollRequest, ProviderAuthPollResult, ProviderAuthStartRequest, ProviderAuthStartResult, ProviderConfigUpdate, ProviderConfigView, ProviderConnectionTestRequest, ProviderConnectionTestResult, ProviderCreateRequest, ProviderCreateResult, ProviderDeleteResult, ProviderSpecView, RemoteAccessView, RemoteAccountProfileUpdateRequest, RemoteAccountView, RemoteBrowserAuthPollRequest, RemoteBrowserAuthPollResult, RemoteBrowserAuthStartRequest, RemoteBrowserAuthStartResult, RemoteDoctorCheckView, RemoteDoctorView, RemoteLoginRequest, RemoteRuntimeView, RemoteServiceAction, RemoteServiceActionResult, RemoteServiceView, RemoteSettingsUpdateRequest, RemoteSettingsView, RuntimeActionCapability, RuntimeActionImpact, RuntimeConfigUpdate, RuntimeControlAction, RuntimeControlActionResult, RuntimeControlEnvironment, RuntimeControlRoutesController, RuntimeControlView, RuntimeEntryView, RuntimeLifecycleState, RuntimePendingRestart, RuntimeServiceState, SearchConfigUpdate, SearchConfigView, SearchProviderConfigView, SearchProviderName, SearchProviderSpecView, SecretProviderEnvView, SecretProviderExecView, SecretProviderFileView, SecretProviderView, SecretRefView, SecretSourceView, SecretsConfigUpdate, SecretsView, ServerPathBreadcrumbView, ServerPathBrowseView, ServerPathEntryView, ServerPathReadView, SessionConfigView, SessionEntryView, SessionEventView, SessionHistoryView, SessionMessageView, SessionPatchUpdate, SessionSkillEntryView, SessionTypeDescribeParams, SessionsListView, TavilySearchDepthValue, UiNcpAgent, UiNcpAssetPutView, UiNcpAssetView, UiNcpSessionListView, UiNcpSessionMessagesView, UiNcpSessionService, UiNcpStoredAssetRecord, type UiRemoteAccessHost, type UiRouterOptions, type UiRuntimeControlHost, type UiRuntimeUpdateHost, UiServerEvent, UiServerHandle, buildConfigMeta, buildConfigSchemaView, buildConfigView, createCustomProvider, createUiRouter, deleteCustomProvider, ensureUiBridgeSecret, executeConfigAction, getUiBridgeSecretPath, loadConfigOrDefault, readUiBridgeSecret, startUiServer, testProviderConnection, updateChannel, updateModel, updateProvider, updateRuntime, updateSearch, updateSecrets };
+export { AgentBindingView, AgentCreateRequest, AgentDeleteResult, AgentProfileView, AgentUpdateRequest, ApiError, ApiResponse, AppMetaView, AuthEnabledUpdateRequest, AuthLoginRequest, AuthPasswordUpdateRequest, AuthSetupRequest, AuthStatusView, BindingPeerView, BochaFreshnessValue, BootstrapPhase, BootstrapRemoteState, BootstrapStageState, BootstrapStatusView, ChannelAuthPollRequest, ChannelAuthPollResult, ChannelAuthStartRequest, ChannelAuthStartResult, ChannelSpecView, type ChatSessionTypeCtaView, type ChatSessionTypeOptionView, type ChatSessionTypesView, ConfigActionExecuteRequest, ConfigActionExecuteResult, ConfigActionManifest, ConfigActionType, ConfigMetaView, ConfigRoutesController, ConfigSchemaResponse, ConfigUiHint, ConfigUiHints, ConfigView, CronActionResult, CronCreateRequest, CronCreateResult, CronEnableRequest, CronJobStateView, CronJobView, CronListView, CronPayloadView, CronRunRequest, CronScheduleView, MarketplaceApiConfig, MarketplaceInstallKind, MarketplaceInstallRequest, MarketplaceInstallResult, MarketplaceInstallSkillParams, MarketplaceInstallSpec, MarketplaceInstalledRecord, MarketplaceInstalledView, MarketplaceInstaller, MarketplaceItemSummary, MarketplaceItemType, MarketplaceItemView, MarketplaceListView, MarketplaceLocalizedTextMap, MarketplaceManageAction, MarketplaceManageRequest, MarketplaceManageResult, MarketplaceMcpContentView, MarketplaceMcpDoctorResult, MarketplaceMcpInstallKind, MarketplaceMcpInstallRequest, MarketplaceMcpInstallResult, MarketplaceMcpInstallSpec, MarketplaceMcpManageAction, MarketplaceMcpManageRequest, MarketplaceMcpManageResult, MarketplaceMcpTemplateInput, MarketplacePluginContentView, MarketplacePluginInstallKind, MarketplacePluginInstallRequest, MarketplacePluginInstallResult, MarketplacePluginManageAction, MarketplacePluginManageRequest, MarketplacePluginManageResult, MarketplaceRecommendationView, MarketplaceSceneView, MarketplaceScenesView, MarketplaceSkillContentView, MarketplaceSkillInstallKind, MarketplaceSkillInstallRequest, MarketplaceSkillInstallResult, MarketplaceSkillManageAction, MarketplaceSkillManageRequest, MarketplaceSkillManageResult, MarketplaceSort, NcpAssetRoutesController, NcpSessionSkillsView, ProviderAuthImportResult, ProviderAuthPollRequest, ProviderAuthPollResult, ProviderAuthStartRequest, ProviderAuthStartResult, ProviderConfigUpdate, ProviderConfigView, ProviderConnectionTestRequest, ProviderConnectionTestResult, ProviderCreateRequest, ProviderCreateResult, ProviderDeleteResult, ProviderSpecView, RemoteAccessView, RemoteAccountProfileUpdateRequest, RemoteAccountView, RemoteBrowserAuthPollRequest, RemoteBrowserAuthPollResult, RemoteBrowserAuthStartRequest, RemoteBrowserAuthStartResult, RemoteDoctorCheckView, RemoteDoctorView, RemoteLoginRequest, RemoteRuntimeView, RemoteServiceAction, RemoteServiceActionResult, RemoteServiceView, RemoteSettingsUpdateRequest, RemoteSettingsView, RuntimeActionCapability, RuntimeActionImpact, RuntimeConfigUpdate, RuntimeControlAction, RuntimeControlActionResult, RuntimeControlEnvironment, RuntimeControlRoutesController, RuntimeControlView, RuntimeEntryView, RuntimeLifecycleState, RuntimePendingRestart, RuntimeServiceState, SearchConfigUpdate, SearchConfigView, SearchProviderConfigView, SearchProviderName, SearchProviderSpecView, SecretProviderEnvView, SecretProviderExecView, SecretProviderFileView, SecretProviderView, SecretRefView, SecretSourceView, SecretsConfigUpdate, SecretsView, ServerPathBreadcrumbView, ServerPathBrowseView, ServerPathEntryView, ServerPathReadView, SessionConfigView, SessionEntryView, SessionEventView, SessionHistoryView, SessionMessageView, SessionPatchUpdate, SessionSkillEntryView, SessionTypeDescribeParams, SessionsListView, TavilySearchDepthValue, UiNcpAssetPutView, UiNcpAssetService, UiNcpAssetView, UiNcpSessionListView, UiNcpSessionMessagesView, UiNcpSessionService, UiNcpStoredAssetRecord, type UiRemoteAccessHost, type UiRouterOptions, type UiRuntimeControlHost, type UiRuntimeUpdateHost, UiServerEvent, UiServerHandle, buildConfigMeta, buildConfigSchemaView, buildConfigView, createCustomProvider, createUiRouter, deleteCustomProvider, ensureUiBridgeSecret, executeConfigAction, getUiBridgeSecretPath, loadConfigOrDefault, readUiBridgeSecret, startUiServer, testProviderConnection, updateChannel, updateModel, updateProvider, updateRuntime, updateSearch, updateSecrets };

package/dist/index.js

@@ -8,7 +8,6 @@ import path, { dirname, extname, isAbsolute, join, parse, resolve } from "node:p
 import { createHash, randomBytes, randomUUID, scryptSync, timingSafeEqual } from "node:crypto";
 import * as NextclawCore from "@nextclaw/core";
 import { ConfigSchema, DEFAULT_WORKSPACE_PATH, buildConfigSchema, createAgentProfile, expandHome, findEffectiveAgentProfile, getDataDir, getPackageVersion, getProviderName, hasSecretRef, isSensitiveConfigPath, loadConfig, normalizeThinkingLevels, parseThinkingLevel, probeFeishu, readAgentAvatarContent, removeAgentProfile, resolveEffectiveAgentProfiles, saveConfig, updateAgentProfile } from "@nextclaw/core";
-import { mountNcpHttpAgentRoutes } from "@nextclaw/ncp-http-agent-server";
 import { discoverPluginStatusReport, enablePluginInConfig, mergePluginConfigView, toPluginConfigView } from "@nextclaw/openclaw-compat";
 import { homedir } from "node:os";
 import { findBuiltinProviderByName, listBuiltinProviders } from "@nextclaw/runtime";
@@ -65,13 +64,13 @@ async function readJson(req) {
 		return { ok: false };
 	}
 }
-function isRecord(value) {
+function isRecord$1(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function readErrorMessage(value, fallback) {
-	if (!isRecord(value)) return fallback;
+	if (!isRecord$1(value)) return fallback;
 	const maybeError = value.error;
-	if (!isRecord(maybeError)) return fallback;
+	if (!isRecord$1(maybeError)) return fallback;
 	return typeof maybeError.message === "string" && maybeError.message.trim().length > 0 ? maybeError.message : fallback;
 }
 function readNonEmptyString(value) {
@@ -441,6 +440,48 @@ var UiAuthService = class {
 	};
 };
 //#endregion
+//#region ../nextclaw-shared/src/types/typed-key.types.ts
+function createTypedKey(id) {
+	const normalizedId = id.trim();
+	if (!normalizedId) throw new Error("typed key id is required");
+	return { id: normalizedId };
+}
+//#endregion
+//#region ../nextclaw-shared/src/configs/event-keys.config.ts
+function createAppEventKey(id) {
+	return createTypedKey(id);
+}
+const eventKeys = {
+	configUpdated: createAppEventKey("config.updated"),
+	channelConfigApplyStatus: createAppEventKey("channel.config.apply-status"),
+	sessionUpdated: createAppEventKey("session.updated"),
+	sessionRunStatus: createAppEventKey("session.run-status"),
+	ncpEvent: createAppEventKey("ncp.event"),
+	sessionSummaryUpsert: createAppEventKey("session.summary.upsert"),
+	sessionSummaryDelete: createAppEventKey("session.summary.delete"),
+	configReloadStarted: createAppEventKey("config.reload.started"),
+	configReloadFinished: createAppEventKey("config.reload.finished"),
+	error: createAppEventKey("error"),
+	connectionOpen: createAppEventKey("connection.open"),
+	connectionClose: createAppEventKey("connection.close"),
+	connectionError: createAppEventKey("connection.error"),
+	runtimeUpdateSnapshot: createAppEventKey("runtime.update.snapshot")
+};
+//#endregion
+//#region ../nextclaw-shared/src/configs/ingress-keys.config.ts
+const ingressKeys = {
+	extension: {
+		channelConfigGet: createTypedKey("extension.channel.config.get"),
+		channelMessageSubmit: createTypedKey("extension.channel.message.submit"),
+		response: createTypedKey("extension.response")
+	},
+	agentRun: {
+		send: createTypedKey("agent-run.send"),
+		abort: createTypedKey("agent-run.abort"),
+		sessionMessageRequest: createTypedKey("agent-run.session-message.request")
+	}
+};
+//#endregion
 //#region src/features/agents/stores/agents.store.ts
 function listAgents(configPath) {
 	const config = loadConfig(configPath);
@@ -515,34 +556,6 @@ function buildAgentAvatarUrl(agentId, avatar) {
 	if (normalized.startsWith("home://")) return `/api/agents/${encodeURIComponent(agentId)}/avatar`;
 }
 //#endregion
-//#region ../nextclaw-shared/src/types/typed-key.types.ts
-function createTypedKey(id) {
-	const normalizedId = id.trim();
-	if (!normalizedId) throw new Error("typed key id is required");
-	return { id: normalizedId };
-}
-//#endregion
-//#region ../nextclaw-shared/src/configs/event-keys.config.ts
-function createAppEventKey(id) {
-	return createTypedKey(id);
-}
-const eventKeys = {
-	configUpdated: createAppEventKey("config.updated"),
-	channelConfigApplyStatus: createAppEventKey("channel.config.apply-status"),
-	sessionUpdated: createAppEventKey("session.updated"),
-	sessionRunStatus: createAppEventKey("session.run-status"),
-	ncpEvent: createAppEventKey("ncp.event"),
-	sessionSummaryUpsert: createAppEventKey("session.summary.upsert"),
-	sessionSummaryDelete: createAppEventKey("session.summary.delete"),
-	configReloadStarted: createAppEventKey("config.reload.started"),
-	configReloadFinished: createAppEventKey("config.reload.finished"),
-	error: createAppEventKey("error"),
-	connectionOpen: createAppEventKey("connection.open"),
-	connectionClose: createAppEventKey("connection.close"),
-	connectionError: createAppEventKey("connection.error"),
-	runtimeUpdateSnapshot: createAppEventKey("runtime.update.snapshot")
-};
-//#endregion
 //#region src/shared/utils/app-events.utils.ts
 function appEventOptions() {
 	return {
@@ -654,7 +667,7 @@ var AppRoutesController = class {
 	health = (c) => c.json(ok({
 		status: "ok",
 		services: {
-			ncpAgent: this.options.ncpAgent ? "ready" : "unavailable",
+			ncpAgent: "ready",
 			cronService: this.options.cron ? "ready" : "unavailable"
 		}
 	}));
@@ -1453,7 +1466,7 @@ var ConfigRoutesController = class {
 		const provider = c.req.param("provider");
 		const body = await readJson(c.req.raw);
 		if (!body.ok) return c.json(err("INVALID_BODY", "invalid json body"), 400);
-		const result = await testProviderConnection(this.options.configPath, provider, body.data, this.options.providers);
+		const result = await testProviderConnection(this.options.configPath, provider, body.data, this.options.kernel.llmProviders);
 		if (!result) return c.json(err("NOT_FOUND", `unknown provider: ${provider}`), 404);
 		return c.json(ok(result));
 	};
@@ -2761,8 +2774,17 @@ var NcpAssetRoutesController = class {
 	constructor(options) {
 		this.options = options;
 	}
+	getAssetApi = () => {
+		const kernel = this.options.kernel;
+		if (!kernel) return;
+		return {
+			put: (input) => kernel.assetStore.putBytes(input),
+			stat: kernel.assetStore.statRecord,
+			resolveContentPath: kernel.assetStore.resolveContentPath
+		};
+	};
 	putAssets = async (c) => {
-		const assetApi = this.options.ncpAgent?.assetApi;
+		const assetApi = this.getAssetApi();
 		if (!assetApi) return c.json(err("NOT_AVAILABLE", "ncp asset api unavailable"), 503);
 		let formData;
 		try {
@@ -2788,7 +2810,7 @@ var NcpAssetRoutesController = class {
 		return c.json(ok(payload));
 	};
 	getAssetContent = async (c) => {
-		const assetApi = this.options.ncpAgent?.assetApi;
+		const assetApi = this.getAssetApi();
 		if (!assetApi) return c.json(err("NOT_AVAILABLE", "ncp asset api unavailable"), 503);
 		const uri = c.req.query("uri")?.trim();
 		if (!uri) return c.json(err("INVALID_URI", "asset uri is required"), 400);
@@ -3638,7 +3660,7 @@ async function loadPluginReadmeFromNpm(spec) {
 		if (!response.ok) return null;
 		const payload = await response.json();
 		const readme = typeof payload.readme === "string" ? payload.readme : "";
-		const latest = isRecord(payload["dist-tags"]) && typeof payload["dist-tags"].latest === "string" ? payload["dist-tags"].latest : void 0;
+		const latest = isRecord$1(payload["dist-tags"]) && typeof payload["dist-tags"].latest === "string" ? payload["dist-tags"].latest : void 0;
 		const metadata = {
 			name: typeof payload.name === "string" ? payload.name : spec,
 			version: latest,
@@ -4168,19 +4190,13 @@ var NcpSessionRoutesController = class {
 		this.options = options;
 		this.sessionSkillsViewBuilder = new SessionSkillsViewBuilder(options);
 	}
+	getSessionApi = () => this.options.kernel.ncpSessionApi;
 	getSessionTypes = async (c) => {
-		const listSessionTypes = this.options.ncpAgent?.listSessionTypes;
-		const payload = listSessionTypes ? await listSessionTypes({ describeMode: "observation" }) : {
-			defaultType: "native",
-			options: [{
-				value: "native",
-				label: "Native"
-			}]
-		};
+		const payload = await this.options.kernel.agentRuntimeManager.listSessionTypes({ describeMode: "observation" });
 		return c.json(ok(payload));
 	};
 	listSessions = async (c) => {
-		const sessionApi = this.options.sessions;
+		const sessionApi = this.getSessionApi();
 		if (!sessionApi) return c.json(err("NOT_AVAILABLE", "ncp session api unavailable"), 503);
 		const sessions = await sessionApi.listSessions({ limit: readPositiveInt(c.req.query("limit")) });
 		const payload = {
@@ -4190,7 +4206,7 @@ var NcpSessionRoutesController = class {
 		return c.json(ok(payload));
 	};
 	getSession = async (c) => {
-		const sessionApi = this.options.sessions;
+		const sessionApi = this.getSessionApi();
 		if (!sessionApi) return c.json(err("NOT_AVAILABLE", "ncp session api unavailable"), 503);
 		const sessionId = decodeURIComponent(c.req.param("sessionId"));
 		const session = await sessionApi.getSession(sessionId);
@@ -4198,7 +4214,7 @@ var NcpSessionRoutesController = class {
 		return c.json(ok(session));
 	};
 	listSessionMessages = async (c) => {
-		const sessionApi = this.options.sessions;
+		const sessionApi = this.getSessionApi();
 		if (!sessionApi) return c.json(err("NOT_AVAILABLE", "ncp session api unavailable"), 503);
 		const sessionId = decodeURIComponent(c.req.param("sessionId"));
 		const session = await sessionApi.getSession(sessionId);
@@ -4214,7 +4230,7 @@ var NcpSessionRoutesController = class {
 		return c.json(ok(payload));
 	};
 	getSessionSkills = async (c) => {
-		const sessionApi = this.options.sessions;
+		const sessionApi = this.getSessionApi();
 		if (!sessionApi) return c.json(err("NOT_AVAILABLE", "ncp session api unavailable"), 503);
 		const sessionId = decodeURIComponent(c.req.param("sessionId"));
 		const query = c.req.query();
@@ -4237,7 +4253,7 @@ var NcpSessionRoutesController = class {
 		})));
 	};
 	patchSession = async (c) => {
-		const sessionApi = this.options.sessions;
+		const sessionApi = this.getSessionApi();
 		if (!sessionApi) return c.json(err("NOT_AVAILABLE", "ncp session api unavailable"), 503);
 		const sessionId = decodeURIComponent(c.req.param("sessionId"));
 		const body = await readJson(c.req.raw);
@@ -4261,7 +4277,7 @@ var NcpSessionRoutesController = class {
 		return c.json(ok(updated));
 	};
 	deleteSession = async (c) => {
-		const sessionApi = this.options.sessions;
+		const sessionApi = this.getSessionApi();
 		if (!sessionApi) return c.json(err("NOT_AVAILABLE", "ncp session api unavailable"), 503);
 		const sessionId = decodeURIComponent(c.req.param("sessionId"));
 		if (!await sessionApi.getSession(sessionId)) return c.json(err("NOT_FOUND", `ncp session not found: ${sessionId}`), 404);
@@ -4726,13 +4742,7 @@ var ServerPathRoutesController = class {
 };
 //#endregion
 //#region src/app/router.ts
-function readBearerToken(request) {
-	const authorization = request.headers.get("authorization")?.trim() ?? "";
-	return /^Bearer\s+(.+)$/i.exec(authorization)?.[1]?.trim() || null;
-}
-function isValidIngressEnvelope(value) {
-	return typeof value.type === "string" && value.type.trim().length > 0;
-}
+const NCP_AGENT_BASE_PATH = "/api/ncp/agent";
 function createUiRouteControllers(options, authService, marketplaceBaseUrl) {
 	const { remoteAccess, runtimeControl, runtimeUpdate } = options;
 	return {
@@ -4752,6 +4762,62 @@ function createUiRouteControllers(options, authService, marketplaceBaseUrl) {
 		mcpMarketplace: new McpMarketplaceController(options, marketplaceBaseUrl)
 	};
 }
+function isRecord(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function hasOwn(value, key) {
+	return Object.prototype.hasOwnProperty.call(value, key);
+}
+function isValidSendEnvelope(value) {
+	if (!isRecord(value)) return false;
+	if (hasOwn(value, "sessionId") && (typeof value.sessionId !== "string" || value.sessionId.trim().length === 0)) return false;
+	const hasMessage = hasOwn(value, "message");
+	if (hasMessage === hasOwn(value, "content")) return false;
+	return hasMessage ? isRecord(value.message) : Array.isArray(value.content);
+}
+function readStreamPayload(url) {
+	const sessionId = new URL(url).searchParams.get("sessionId")?.trim();
+	return sessionId ? { sessionId } : null;
+}
+function isAbortPayload(value) {
+	return isRecord(value) && typeof value.sessionId === "string" && value.sessionId.trim().length > 0;
+}
+function toSseFrame(eventName, data) {
+	return `event: ${eventName}\ndata: ${JSON.stringify(data)}\n\n`;
+}
+function createNcpEventStreamResponse(events, signal) {
+	const encoder = new TextEncoder();
+	const stream = new ReadableStream({ start: async (controller) => {
+		let closed = false;
+		const close = () => {
+			if (!closed) {
+				closed = true;
+				controller.close();
+			}
+		};
+		signal.addEventListener("abort", close, { once: true });
+		try {
+			for await (const event of events) {
+				if (closed || signal.aborted) break;
+				controller.enqueue(encoder.encode(toSseFrame("ncp-event", event)));
+			}
+		} catch (error) {
+			if (!closed && !signal.aborted) controller.enqueue(encoder.encode(toSseFrame("error", {
+				code: "STREAM_SOURCE_FAILED",
+				message: error instanceof Error ? error.message : String(error)
+			})));
+		} finally {
+			signal.removeEventListener("abort", close);
+			close();
+		}
+	} });
+	return new Response(stream, { headers: {
+		"Content-Type": "text/event-stream; charset=utf-8",
+		"Cache-Control": "no-cache, no-transform",
+		Connection: "keep-alive",
+		"X-Accel-Buffering": "no"
+	} });
+}
 var UiRouteRegistry = class {
 	constructor(app, options, controllers) {
 		this.app = app;
@@ -4761,6 +4827,40 @@ var UiRouteRegistry = class {
 	mountRoutes = (routes) => {
 		for (const [method, path, handler] of routes) this.app[method](path, handler);
 	};
+	mountNcpAgentRoutes = (kernel, ncpAsset) => {
+		this.app.post(`${NCP_AGENT_BASE_PATH}/send`, async (c) => {
+			const body = await readJson(c.req.raw);
+			if (!body.ok || !isValidSendEnvelope(body.data)) return c.json(err("INVALID_BODY", "Invalid NCP request envelope."), 400);
+			const handle = await kernel.ingress.handle({
+				type: ingressKeys.agentRun.send,
+				payload: body.data
+			}, { source: "ui-http" });
+			return c.json(ok(handle));
+		});
+		this.app.get(`${NCP_AGENT_BASE_PATH}/stream`, (c) => {
+			const payload = readStreamPayload(c.req.raw.url);
+			if (!payload) return c.json(err("INVALID_QUERY", "sessionId is required."), 400);
+			return createNcpEventStreamResponse(kernel.sessionRunManager.streamSessionEvents(payload, { signal: c.req.raw.signal }), c.req.raw.signal);
+		});
+		this.app.post(`${NCP_AGENT_BASE_PATH}/abort`, async (c) => {
+			const body = await readJson(c.req.raw);
+			if (!body.ok || !isAbortPayload(body.data)) return c.json(err("INVALID_BODY", "sessionId is required."), 400);
+			await kernel.ingress.handle({
+				type: ingressKeys.agentRun.abort,
+				payload: body.data
+			}, { source: "ui-http" });
+			return c.json(ok({ accepted: true }));
+		});
+		this.mountRoutes([[
+			"post",
+			"/api/ncp/assets",
+			ncpAsset.putAssets
+		], [
+			"get",
+			"/api/ncp/assets/content",
+			ncpAsset.getAssetContent
+		]]);
+	};
 	register = () => {
 		const { agents, app, auth, config, cron, ncpAsset, ncpSession, remote, runtimeControl, runtimeUpdate, serverPath } = this.controllers;
 		this.mountRoutes([
@@ -4979,23 +5079,7 @@ var UiRouteRegistry = class {
 				serverPath.read
 			]
 		]);
-		const { ingress, ncpAgent } = this.options;
-		if (ncpAgent) {
-			mountNcpHttpAgentRoutes(this.app, {
-				basePath: ncpAgent.basePath ?? "/api/ncp/agent",
-				agentClientEndpoint: ncpAgent.agentClientEndpoint,
-				streamProvider: ncpAgent.streamProvider
-			});
-			this.mountRoutes([[
-				"post",
-				"/api/ncp/assets",
-				ncpAsset.putAssets
-			], [
-				"get",
-				"/api/ncp/assets/content",
-				ncpAsset.getAssetContent
-			]]);
-		}
+		this.mountNcpAgentRoutes(this.options.kernel, ncpAsset);
 		this.mountRoutes([
 			[
 				"get",
@@ -5125,13 +5209,13 @@ var UiRouteRegistry = class {
 			]
 		]);
 		this.app.post("/webhook", async (c) => {
-			if (!ingress) return c.json(err("INGRESS_UNAVAILABLE", "ingress is not configured"), 503);
+			const ingress = this.options.kernel.ingress;
 			const body = await readJson(c.req.raw);
-			if (!body.ok || !isValidIngressEnvelope(body.data)) return c.json(err("INVALID_BODY", "invalid ingress body"), 400);
+			if (!body.ok) return c.json(err("INVALID_BODY", "invalid ingress body"), 400);
 			try {
 				const result = await ingress.handle(body.data, {
 					source: "webhook",
-					token: readBearerToken(c.req.raw)
+					token: /^Bearer\s+(.+)$/i.exec(c.req.raw.headers.get("authorization")?.trim() ?? "")?.[1]?.trim() || null
 				});
 				return c.json(ok(result ?? { accepted: true }));
 			} catch (error) {
@@ -5309,9 +5393,7 @@ async function startUiServer(gateway) {
 		close: () => new Promise((resolve) => {
 			unsubscribeEventBus();
 			wss.close(() => {
-				server.close(() => {
-					Promise.resolve(gateway.ncpAgent?.agentClientEndpoint.stop()).catch(() => void 0).finally(() => resolve());
-				});
+				server.close(() => resolve());
 			});
 		})
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/server",
-  "version": "0.12.19",
+  "version": "0.12.21",
   "private": false,
   "description": "Nextclaw UI/API server.",
   "type": "module",
@@ -18,13 +18,12 @@
     "@hono/node-server": "^1.13.3",
     "hono": "^4.6.2",
     "ws": "^8.18.0",
-    "@nextclaw/core": "0.12.19",
-    "@nextclaw/kernel": "0.1.8",
-    "@nextclaw/ncp": "0.5.12",
-    "@nextclaw/ncp-http-agent-server": "0.3.24",
-    "@nextclaw/mcp": "0.1.84",
-    "@nextclaw/openclaw-compat": "1.0.19",
-    "@nextclaw/runtime": "0.2.51"
+    "@nextclaw/core": "0.12.20",
+    "@nextclaw/kernel": "0.1.10",
+    "@nextclaw/mcp": "0.1.85",
+    "@nextclaw/ncp": "0.5.13",
+    "@nextclaw/openclaw-compat": "1.0.20",
+    "@nextclaw/runtime": "0.2.52"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",