@nextclaw/kernel 0.1.14 → 0.1.15-beta.1

package/dist/index.js

@@ -3,21 +3,22 @@ import { createRequire } from "node:module";
 import { createHash, randomUUID } from "node:crypto";
 import { EventBus, Ingress, eventKeys, ingressKeys } from "@nextclaw/shared";
 import { NcpEventType, isHiddenNcpMessage, readAssistantReasoningNormalizationMode, readAssistantReasoningNormalizationModeFromMetadata, sanitizeAssistantReplyTags } from "@nextclaw/ncp";
-import { DefaultNcpAgentRuntime, LocalAssetStore, buildAssetContentPath, buildNcpUserContent, buildOpenAiFunctionTool } from "@nextclaw/ncp-agent-runtime";
-import fs, { appendFileSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
-import path, { basename, delimiter, dirname, join, relative, resolve } from "node:path";
-import { AgentRouteResolver, BUILTIN_MAIN_AGENT_ID, CONTEXT_COMPACTION_METADATA_KEY, ChannelManager, ChannelManager as ChannelManager$1, CommandRegistry, ConfigSchema, ContextBuilder, ContextCompactionService, ContextWindowBudgetService, CronService, CronTool, DEFAULT_SESSION_SEARCH_LIMIT, EditFileTool, ExecTool, ExtensionToolAdapter, GatewayTool, InputBudgetPruner, LLMProvider, ListDirTool, LiteLLMProvider, MAX_SESSION_SEARCH_LIMIT, MemoryGetTool, MemorySearchTool, MessageBus, MessageTool, ProviderRegistry, ReadFileTool, RequestedSkillsMetadataReader, SessionManager, SessionSearchManager, SkillsLoader, Tool, ToolRegistry, WebFetchTool, WebSearchTool, WriteFileTool, buildCompressingCompactionCheckpoint, buildConfigSchema, buildContextWindowSnapshot, buildMinimalSystemExecutionPrompt, buildReloadPlan, buildSessionRequestToolResult, buildToolCatalogEntries, createAssistantStreamDeltaControlMessage, createAssistantStreamResetControlMessage, createCompletedSessionRequest, createFailedSessionRequest, createRunningSessionRequest, createToolExecutionContext, createTypingStopControlMessage, diffConfigPaths, ensureDir, expandHome, findEffectiveAgentProfile, getAppLogger, getConfigPath, getDataDir, getDataPath, getSessionsPath, getWorkspacePath, loadConfig, normalizeInlineSecretRefs, parseAgentScopedSessionKey, parseThinkingLevel, readCompressedContextCompactionCheckpoint, readOptionalString, readParentSessionId, readSessionProjectRoot, redactConfigObject, resolveConfigSecrets, resolveDefaultAgentProfileId, resolveProviderRuntime, resolveSessionWorkspacePath, resolveThinkingLevel, saveConfig, summarizeSessionRequestTask, toDisposable } from "@nextclaw/core";
-import { discoverPluginStatusReport, getPackageManifestExtensions, getPluginChannelBindings, getPluginUiMetadataFromRegistry, loadOpenClawPlugins, loadOpenClawPluginsProgressively, loadPluginManifest, mergePluginConfigView, toPluginConfigView } from "@nextclaw/openclaw-compat";
+import { DefaultNcpAgentRuntime, LocalAssetStore, buildAssetContentPath, buildNcpUserContent, buildOpenAiFunctionTool, ncpMessageToOpenAiMessages } from "@nextclaw/ncp-agent-runtime";
+import { appendFileSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import { basename, delimiter, dirname, join, relative, resolve } from "node:path";
+import { AgentRouteResolver, BUILTIN_MAIN_AGENT_ID, CONTEXT_COMPACTION_METADATA_KEY, ChannelManager, ChannelManager as ChannelManager$1, CommandRegistry, ConfigSchema, ContextBuilder, ContextCompactionService, ContextWindowBudgetService, CronService, CronTool, DEFAULT_SESSION_SEARCH_LIMIT, EditFileTool, ExecTool, ExtensionToolAdapter, GatewayTool, InputBudgetPruner, LLMProvider, ListDirTool, LiteLLMProvider, MAX_SESSION_SEARCH_LIMIT, MemoryGetTool, MemorySearchTool, MessageBus, MessageTool, ProviderRegistry, ReadFileTool, RequestedSkillsMetadataReader, SessionManager, SessionSearchManager, SkillsLoader, Tool, ToolRegistry, WebFetchTool, WebSearchTool, WriteFileTool, buildCompressingCompactionCheckpoint, buildConfigSchema, buildContextWindowSnapshot, buildMinimalSystemExecutionPrompt, buildReloadPlan, buildSessionRequestToolResult, buildToolCatalogEntries, createAssistantStreamDeltaControlMessage, createAssistantStreamResetControlMessage, createCompletedSessionRequest, createFailedSessionRequest, createRunningSessionRequest, createToolExecutionContext, createTypingStopControlMessage, diffConfigPaths, ensureDir, expandHome, findEffectiveAgentProfile, getConfigPath, getDataDir, getDataPath, getSessionsPath, getWorkspacePath, loadConfig, mergeExtensionConfigView, modelSupportsVision, normalizeInlineSecretRefs, parseAgentScopedSessionKey, parseThinkingLevel, readCompressedContextCompactionCheckpoint, readOptionalString, readParentSessionId, readSessionProjectRoot, redactConfigObject, resolveConfigSecrets, resolveDefaultAgentProfileId, resolveProviderRuntime, resolveSessionWorkspacePath, resolveThinkingLevel, saveConfig, summarizeSessionRequestTask, toDisposable, toExtensionConfigView } from "@nextclaw/core";
 import { spawn } from "node:child_process";
 import { access, appendFile, mkdir, readFile, readdir, rename, rm, unlink, writeFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
-import { BUILTIN_PROVIDER_PLUGINS, builtinProviderIds } from "@nextclaw/runtime";
+import { BUILTIN_PROVIDER_PLUGINS } from "@nextclaw/runtime";
 import { McpRegistryService, McpServerLifecycleManager } from "@nextclaw/mcp";
 import { McpNcpToolRegistryAdapter } from "@nextclaw/ncp-mcp";
 import { DefaultNcpAgentConversationStateManager } from "@nextclaw/ncp-toolkit";
 import { parse } from "yaml";
+import { catchError, from, lastValueFrom, tap } from "rxjs";
 import { HttpRuntimeConfigResolver, HttpRuntimeNcpAgentRuntime } from "@nextclaw/nextclaw-ncp-runtime-http-client";
 import { StdioRuntimeConfigResolver, StdioRuntimeNcpAgentRuntime, probeStdioRuntime } from "@nextclaw/nextclaw-ncp-runtime-stdio-client";
+import { DefaultNcpAgentRuntime as DefaultNcpAgentRuntime$1 } from "@nextclaw/ncp-agent-runtime-next";
 //#region src/managers/agent.manager.ts
 var AgentManager = class {
 	listAgents = () => {
@@ -50,54 +51,6 @@ var AgentManager = class {
 };
 //#endregion
 //#region src/utils/session-run.utils.ts
-var AsyncEventQueue = class {
-	items = [];
-	waiters = [];
-	closed = false;
-	push = (item) => {
-		const waiter = this.waiters.shift();
-		if (waiter) {
-			waiter({
-				value: item,
-				done: false
-			});
-			return;
-		}
-		this.items.push(item);
-	};
-	close = () => {
-		if (this.closed) return;
-		this.closed = true;
-		while (this.waiters.length > 0) this.waiters.shift()?.({
-			value: void 0,
-			done: true
-		});
-	};
-	iterate = () => {
-		const nextItem = this.next;
-		return (async function* iterateQueuedEvents() {
-			while (true) {
-				const next = await nextItem();
-				if (next.done) return;
-				yield next.value;
-			}
-		})();
-	};
-	next = async () => {
-		const item = this.items.shift();
-		if (item) return {
-			value: item,
-			done: false
-		};
-		if (this.closed) return {
-			value: void 0,
-			done: true
-		};
-		return new Promise((resolve) => {
-			this.waiters.push(resolve);
-		});
-	};
-};
 function readString$8(value) {
 	return (typeof value === "string" ? value.trim() : "") || void 0;
 }
@@ -470,7 +423,7 @@ var LlmUsageManager = class {
 };
 //#endregion
 //#region src/utils/ncp-message-bridge.utils.ts
-function normalizeString(value) {
+function normalizeString$1(value) {
 	if (typeof value !== "string") return null;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
@@ -567,80 +520,6 @@ function toLegacyMessages(messages, options = {}) {
 	return legacyMessages;
 }
 //#endregion
-//#region src/features/native-runtime/utils/nextclaw-ncp-session-preferences.utils.ts
-function normalizeOptionalString(value) {
-	if (typeof value !== "string") return;
-	const trimmed = value.trim();
-	return trimmed.length > 0 ? trimmed : void 0;
-}
-function readMetadataModel(metadata) {
-	const candidates = [
-		metadata.model,
-		metadata.llm_model,
-		metadata.agent_model,
-		metadata.session_model
-	];
-	for (const candidate of candidates) {
-		const normalized = normalizeOptionalString(candidate);
-		if (normalized) return normalized;
-	}
-	return null;
-}
-function readMetadataThinking(metadata) {
-	const candidates = [
-		metadata.thinking,
-		metadata.thinking_level,
-		metadata.thinkingLevel,
-		metadata.thinking_effort,
-		metadata.thinkingEffort
-	];
-	for (const candidate of candidates) {
-		if (typeof candidate !== "string") continue;
-		const normalized = candidate.trim().toLowerCase();
-		if (!normalized) continue;
-		if (normalized === "clear" || normalized === "reset" || normalized === "off!") return "__clear__";
-		const level = parseThinkingLevel(normalized);
-		if (level) return level;
-	}
-	return null;
-}
-function resolveEffectiveModel(params) {
-	const { fallbackModel, requestMetadata } = params;
-	const metadata = structuredClone(params.sessionMetadata);
-	if (requestMetadata.clear_model === true || requestMetadata.reset_model === true) delete metadata.preferred_model;
-	const inboundModel = readMetadataModel(requestMetadata);
-	if (inboundModel) metadata.preferred_model = inboundModel;
-	return {
-		metadata,
-		model: normalizeOptionalString(metadata.preferred_model) ?? fallbackModel
-	};
-}
-function syncSessionThinkingPreference(params) {
-	const { requestMetadata } = params;
-	const metadata = structuredClone(params.sessionMetadata);
-	if (requestMetadata.clear_thinking === true || requestMetadata.reset_thinking === true) delete metadata.preferred_thinking;
-	const inboundThinking = readMetadataThinking(requestMetadata);
-	if (inboundThinking === "__clear__") {
-		delete metadata.preferred_thinking;
-		return metadata;
-	}
-	if (inboundThinking) metadata.preferred_thinking = inboundThinking;
-	return metadata;
-}
-function resolveSessionChannelContext(params) {
-	const { requestMetadata } = params;
-	const metadata = structuredClone(params.sessionMetadata);
-	const channel = normalizeOptionalString(requestMetadata.channel) ?? normalizeOptionalString(metadata.last_channel) ?? "ui";
-	const chatId = normalizeOptionalString(requestMetadata.chatId) ?? normalizeOptionalString(requestMetadata.chat_id) ?? normalizeOptionalString(metadata.last_to) ?? "web-ui";
-	metadata.last_channel = channel;
-	metadata.last_to = chatId;
-	return {
-		channel,
-		chatId,
-		metadata
-	};
-}
-//#endregion
 //#region src/features/native-runtime/utils/nextclaw-ncp-current-turn.utils.ts
 function isTextLikePart(part) {
 	return part.type === "text" || part.type === "rich-text";
@@ -833,17 +712,17 @@ function projectNcpMessagesWithContextCompaction(params) {
 	}, ...sessionMessages.slice(checkpointIndex + 1).filter((message) => !readCompactionSummary(message)).map((message) => structuredClone(message))];
 }
 //#endregion
-//#region src/features/context-compaction/managers/context-compaction.manager.ts
+//#region src/features/context-compaction/services/context-compaction-preflight.service.ts
 const SUMMARY_MAX_TOKENS = 4e3;
 const SUMMARY_SOURCE_MAX_CHARS = 12e4;
 function readRequestedAgentId$1(metadata) {
-	return normalizeString(metadata.agent_id)?.toLowerCase() ?? normalizeString(metadata.agentId)?.toLowerCase() ?? null;
+	return normalizeString$1(metadata.agent_id)?.toLowerCase() ?? normalizeString$1(metadata.agentId)?.toLowerCase() ?? null;
 }
 function resolveCompactionProfile(params) {
 	const { config, requestMetadata, storedAgentId } = params;
 	const { defaults } = config.agents;
 	const defaultAgentId = resolveDefaultAgentProfileId(config);
-	const profile = findEffectiveAgentProfile(config, normalizeString(storedAgentId)?.toLowerCase() ?? readRequestedAgentId$1(requestMetadata) ?? defaultAgentId) ?? findEffectiveAgentProfile(config, defaultAgentId);
+	const profile = findEffectiveAgentProfile(config, normalizeString$1(storedAgentId)?.toLowerCase() ?? readRequestedAgentId$1(requestMetadata) ?? defaultAgentId) ?? findEffectiveAgentProfile(config, defaultAgentId);
 	return {
 		contextTokens: profile?.contextTokens ?? defaults.contextTokens,
 		model: profile?.model ?? defaults.model,
@@ -898,20 +777,20 @@ function buildContextWindowSnapshotForMessages(contextWindowBudgetService, param
 		totalContextTokens: contextTokens
 	});
 }
-var ContextWindowPreviewManager = class {
+var ContextCompactionPreflightService = class {
+	compactionService = new ContextCompactionService();
 	contextWindowBudgetService = new ContextWindowBudgetService();
 	constructor(options) {
 		this.options = options;
 	}
 	preview = (params) => {
 		const { requestMetadata, sessionId, sessionMessages, storedAgentId, storedMetadata } = params;
-		const metadata = storedMetadata;
 		const profile = resolveCompactionProfile({
 			config: this.options.configManager.loadConfig(),
 			requestMetadata,
 			storedAgentId
 		});
-		const existingCheckpoint = readCompressedContextCompactionCheckpoint(metadata[CONTEXT_COMPACTION_METADATA_KEY]);
+		const existingCheckpoint = readCompressedContextCompactionCheckpoint(storedMetadata[CONTEXT_COMPACTION_METADATA_KEY]);
 		return buildContextWindowSnapshotForMessages(this.contextWindowBudgetService, {
 			checkpoint: existingCheckpoint,
 			contextTokens: profile.contextTokens,
@@ -920,39 +799,6 @@ var ContextWindowPreviewManager = class {
 			sessionMessages
 		});
 	};
-};
-var ContextCompactionManager = class {
-	compactionService = new ContextCompactionService();
-	contextWindowBudgetService = new ContextWindowBudgetService();
-	constructor(options) {
-		this.options = options;
-	}
-	runLivePreflight = async function* (params) {
-		const sessionRunManager = this.options.sessionRunManager;
-		const { input, session } = params;
-		const beginResult = this.begin({
-			inputMessages: input.messages,
-			requestMetadata: input.metadata ?? {},
-			sessionId: input.sessionId,
-			sessionMessages: session.stateManager.getSnapshot().messages,
-			...session.agentId ? { storedAgentId: session.agentId } : {},
-			storedMetadata: input.metadata ?? {}
-		});
-		yield* this.applyLivePreflightResult({
-			input,
-			result: beginResult,
-			session,
-			sessionRunManager
-		});
-		if (!beginResult.pendingCompaction) return;
-		const finishResult = await this.finish(beginResult.pendingCompaction);
-		yield* this.applyLivePreflightResult({
-			input,
-			result: finishResult,
-			session,
-			sessionRunManager
-		});
-	};
 	begin = (params) => {
 		const { inputMessages, requestMetadata, sessionId, sessionMessages, storedAgentId, storedMetadata } = params;
 		const profile = resolveCompactionProfile({
@@ -1003,7 +849,6 @@ var ContextCompactionManager = class {
 			pendingCompaction: plan && checkpoint ? {
 				checkpoint,
 				contextTokens,
-				inputMessageIds: inputMessages.map((message) => message.id),
 				model: profile.model,
 				plan,
 				reservedContextTokens,
@@ -1075,6 +920,61 @@ var ContextCompactionManager = class {
 		if (!summary) throw new Error("context compaction summary is empty");
 		return summary;
 	};
+};
+//#endregion
+//#region src/features/context-compaction/managers/context-compaction.manager.ts
+var ContextWindowPreviewManager = class {
+	preflightService;
+	constructor(options) {
+		this.options = options;
+		this.preflightService = new ContextCompactionPreflightService({ configManager: options.configManager });
+	}
+	preview = (params) => {
+		const { requestMetadata, sessionId, sessionMessages, storedAgentId, storedMetadata } = params;
+		return this.preflightService.preview({
+			requestMetadata,
+			sessionId,
+			sessionMessages,
+			storedAgentId,
+			storedMetadata
+		});
+	};
+};
+var ContextCompactionManager = class {
+	preflightService;
+	constructor(options) {
+		this.options = options;
+		this.preflightService = new ContextCompactionPreflightService({
+			configManager: options.configManager,
+			providerManager: options.providerManager
+		});
+	}
+	runLivePreflight = async function* (params) {
+		const sessionRunManager = this.options.sessionRunManager;
+		const { input, session } = params;
+		const beginResult = this.preflightService.begin({
+			inputMessages: input.messages,
+			requestMetadata: input.metadata ?? {},
+			sessionId: input.sessionId,
+			sessionMessages: session.stateManager.getSnapshot().messages,
+			...session.agentId ? { storedAgentId: session.agentId } : {},
+			storedMetadata: input.metadata ?? {}
+		});
+		yield* this.applyLivePreflightResult({
+			input,
+			result: beginResult,
+			session,
+			sessionRunManager
+		});
+		if (!beginResult.pendingCompaction) return;
+		const finishResult = await this.preflightService.finish(beginResult.pendingCompaction);
+		yield* this.applyLivePreflightResult({
+			input,
+			result: finishResult,
+			session,
+			sessionRunManager
+		});
+	};
 	applyLivePreflightResult = async function* (params) {
 		const { input, result, session, sessionRunManager } = params;
 		if (Object.keys(result.metadataPatch).length > 0) await sessionRunManager.updateSessionMetadata(session.sessionId, result.metadataPatch);
@@ -1107,6 +1007,46 @@ var ContextCompactionManager = class {
 	};
 };
 //#endregion
+//#region src/features/context-compaction/utils/context-window-event.utils.ts
+function readContextWindowEventSessionId(event) {
+	const payload = "payload" in event ? event.payload : null;
+	if (!payload || typeof payload !== "object") return null;
+	return "sessionId" in payload && typeof payload.sessionId === "string" ? payload.sessionId.trim() || null : null;
+}
+function isContextWindowSnapshot(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function createContextWindowSignature(value) {
+	return JSON.stringify(value);
+}
+function shouldRefreshContextWindowDuringStream(event) {
+	switch (event.type) {
+		case NcpEventType.MessageTextStart:
+		case NcpEventType.MessageTextDelta:
+		case NcpEventType.MessageTextEnd:
+		case NcpEventType.MessageReasoningStart:
+		case NcpEventType.MessageReasoningDelta:
+		case NcpEventType.MessageReasoningEnd:
+		case NcpEventType.MessageToolCallStart:
+		case NcpEventType.MessageToolCallArgs:
+		case NcpEventType.MessageToolCallArgsDelta:
+		case NcpEventType.MessageToolCallEnd:
+		case NcpEventType.MessageToolCallResult: return true;
+		default: return false;
+	}
+}
+function shouldRefreshContextWindowImmediately(event) {
+	switch (event.type) {
+		case NcpEventType.MessageSent:
+		case NcpEventType.MessageCompleted:
+		case NcpEventType.MessageFailed:
+		case NcpEventType.MessageAbort:
+		case NcpEventType.RunFinished:
+		case NcpEventType.RunError: return true;
+		default: return false;
+	}
+}
+//#endregion
 //#region src/managers/tool.manager.ts
 function toToolParams(args) {
 	if (isRecord$7(args)) return args;
@@ -1229,36 +1169,94 @@ function resolveAgentHandoffDepth(metadata) {
 	return Math.trunc(rawDepth);
 }
 //#endregion
-//#region src/features/native-runtime/services/nextclaw-ncp-context-builder.service.ts
-const TIME_HINT_TRIGGER_PATTERNS = [/\b(now|right now|current time|what time|today|tonight|tomorrow|yesterday|this morning|this afternoon|this evening|date)\b/i, /(现在|此刻|当前时间|现在几点|几点了|今天|今晚|今早|今晨|明天|昨天|日期)/];
-function isRecord$6(value) {
-	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-function mergeInputMetadata(input) {
-	const messageMetadata = input.messages.slice().reverse().find((message) => isRecord$6(message.metadata))?.metadata;
-	return {
-		...isRecord$6(messageMetadata) ? structuredClone(messageMetadata) : {},
-		...isRecord$6(input.metadata) ? structuredClone(input.metadata) : {}
-	};
-}
-const REQUESTED_SKILLS_METADATA_READER = new RequestedSkillsMetadataReader();
-function resolveRequestedToolNames(metadata) {
-	const rawValue = metadata.requested_tools ?? metadata.requestedTools;
-	if (!Array.isArray(rawValue)) return [];
-	return Array.from(new Set(rawValue.map((item) => normalizeString(item)).filter((item) => Boolean(item))));
+//#region src/features/native-runtime/utils/nextclaw-ncp-session-preferences.utils.ts
+function normalizeOptionalString(value) {
+	if (typeof value !== "string") return;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : void 0;
 }
-function readRequestedAgentId(metadata) {
-	return normalizeString(metadata.agent_id)?.toLowerCase() ?? normalizeString(metadata.agentId)?.toLowerCase() ?? null;
+function readMetadataModel(metadata) {
+	const candidates = [
+		metadata.model,
+		metadata.llm_model,
+		metadata.agent_model,
+		metadata.session_model
+	];
+	for (const candidate of candidates) {
+		const normalized = normalizeOptionalString(candidate);
+		if (normalized) return normalized;
+	}
+	return null;
 }
-function resolveAgentProfile(params) {
-	const { config, requestMetadata, storedAgentId } = params;
-	const { agents: { defaults }, search: searchConfig, tools: { restrictToWorkspace, exec: { timeout: execTimeoutSeconds } } } = config;
-	const defaultAgentId = resolveDefaultAgentProfileId(config);
-	const profile = findEffectiveAgentProfile(config, normalizeString(storedAgentId)?.toLowerCase() ?? readRequestedAgentId(requestMetadata) ?? defaultAgentId) ?? findEffectiveAgentProfile(config, defaultAgentId);
-	if (!profile) throw new Error(`default agent profile not found: ${defaultAgentId}`);
-	const contextTokens = profile.contextTokens ?? defaults.contextTokens;
-	return {
-		agentId: profile.id,
+function readMetadataThinking(metadata) {
+	const candidates = [
+		metadata.thinking,
+		metadata.thinking_level,
+		metadata.thinkingLevel,
+		metadata.thinking_effort,
+		metadata.thinkingEffort
+	];
+	for (const candidate of candidates) {
+		if (typeof candidate !== "string") continue;
+		const normalized = candidate.trim().toLowerCase();
+		if (!normalized) continue;
+		if (normalized === "clear" || normalized === "reset" || normalized === "off!") return "__clear__";
+		const level = parseThinkingLevel(normalized);
+		if (level) return level;
+	}
+	return null;
+}
+function resolveEffectiveModel(params) {
+	const { fallbackModel, requestMetadata } = params;
+	const metadata = structuredClone(params.sessionMetadata);
+	if (requestMetadata.clear_model === true || requestMetadata.reset_model === true) delete metadata.preferred_model;
+	const inboundModel = readMetadataModel(requestMetadata);
+	if (inboundModel) metadata.preferred_model = inboundModel;
+	return {
+		metadata,
+		model: normalizeOptionalString(metadata.preferred_model) ?? fallbackModel
+	};
+}
+function syncSessionThinkingPreference(params) {
+	const { requestMetadata } = params;
+	const metadata = structuredClone(params.sessionMetadata);
+	if (requestMetadata.clear_thinking === true || requestMetadata.reset_thinking === true) delete metadata.preferred_thinking;
+	const inboundThinking = readMetadataThinking(requestMetadata);
+	if (inboundThinking === "__clear__") {
+		delete metadata.preferred_thinking;
+		return metadata;
+	}
+	if (inboundThinking) metadata.preferred_thinking = inboundThinking;
+	return metadata;
+}
+function resolveSessionChannelContext(params) {
+	const { requestMetadata } = params;
+	const metadata = structuredClone(params.sessionMetadata);
+	const channel = normalizeOptionalString(requestMetadata.channel) ?? normalizeOptionalString(metadata.last_channel) ?? "ui";
+	const chatId = normalizeOptionalString(requestMetadata.chatId) ?? normalizeOptionalString(requestMetadata.chat_id) ?? normalizeOptionalString(metadata.last_to) ?? "web-ui";
+	metadata.last_channel = channel;
+	metadata.last_to = chatId;
+	return {
+		channel,
+		chatId,
+		metadata
+	};
+}
+//#endregion
+//#region src/features/native-runtime/utils/nextclaw-ncp-run-context.utils.ts
+const REQUESTED_SKILLS_METADATA_READER = new RequestedSkillsMetadataReader();
+function readRequestedAgentId(metadata) {
+	return normalizeOptionalString(metadata.agent_id)?.toLowerCase() ?? normalizeOptionalString(metadata.agentId)?.toLowerCase() ?? null;
+}
+function resolveAgentProfile(params) {
+	const { config, requestMetadata, storedAgentId } = params;
+	const { agents: { defaults }, search: searchConfig, tools: { restrictToWorkspace, exec: { timeout: execTimeoutSeconds } } } = config;
+	const defaultAgentId = resolveDefaultAgentProfileId(config);
+	const profile = findEffectiveAgentProfile(config, normalizeOptionalString(storedAgentId)?.toLowerCase() ?? readRequestedAgentId(requestMetadata) ?? defaultAgentId) ?? findEffectiveAgentProfile(config, defaultAgentId);
+	if (!profile) throw new Error(`default agent profile not found: ${defaultAgentId}`);
+	const contextTokens = profile.contextTokens ?? defaults.contextTokens;
+	return {
+		agentId: profile.id,
 		workspace: getWorkspacePath(profile.workspace ?? defaults.workspace),
 		model: profile.model ?? defaults.model,
 		contextTokens,
@@ -1271,6 +1269,105 @@ function resolveAgentProfile(params) {
 		execTimeoutSeconds
 	};
 }
+function resolveRequestedToolNames(metadata) {
+	const rawValue = metadata.requested_tools ?? metadata.requestedTools;
+	if (!Array.isArray(rawValue)) return [];
+	return Array.from(new Set(rawValue.map((item) => normalizeOptionalString(item)).filter((item) => Boolean(item))));
+}
+function mergeRunMetadata(params) {
+	const { requestMetadata, sessionMetadata } = params;
+	return {
+		...sessionMetadata ? structuredClone(sessionMetadata) : {},
+		...requestMetadata ? structuredClone(requestMetadata) : {}
+	};
+}
+function buildSessionOrchestrationSection() {
+	return [
+		"## Session Orchestration",
+		"- Before passing a non-default `runtime` to `sessions_spawn` or agent creation/update flows, inspect the installed runtime kinds with `nextclaw agents runtimes --json`.",
+		"- `sessions_spawn` is the unified session-creation tool. Omit `scope` or use `scope=\"standalone\"` for a regular session, and use `scope=\"child\"` when the new session should be a child session of the current flow.",
+		"- `sessions_spawn` only creates the session by default. Add top-level `notify: \"none\" | \"final_reply\"` when the new session should start working immediately.",
+		"- When `sessions_spawn.scope=\"child\"` and `sessions_spawn.notify=\"final_reply\"`, the new child session starts right away and this session automatically continues after that child reaches its final reply.",
+		"- Use `sessions_spawn` without `notify` when the user wants a separate thread created now but does not need it to start working yet.",
+		"- Use `sessions_request` to send one task to an existing session, including a session that was just created by `sessions_spawn` or a previously created child session.",
+		"- `sessions_request.target` must be an object shaped like `{ \"session_id\": \"<target-session-id>\" }`. Do not pass a bare string.",
+		"- Prefer `notify=\"final_reply\"` when the current session should continue after the target session produces its final reply. Use `notify=\"none\"` when you only want the target session to run independently."
+	].join("\n");
+}
+function resolveNextclawNcpRunContext(params) {
+	const { configManager, requestMetadata: inputRequestMetadata, sessionId, sessionMetadata: inputSessionMetadata, storedAgentId } = params;
+	const config = configManager.loadConfig();
+	const requestMetadata = mergeRunMetadata({
+		sessionMetadata: inputSessionMetadata,
+		requestMetadata: inputRequestMetadata
+	});
+	const profile = resolveAgentProfile({
+		config,
+		storedAgentId,
+		requestMetadata
+	});
+	const { metadata: modelMetadata, model: effectiveModel } = resolveEffectiveModel({
+		sessionMetadata: requestMetadata,
+		requestMetadata,
+		fallbackModel: profile.model
+	});
+	const effectiveWorkspace = resolveSessionWorkspacePath({
+		sessionMetadata: modelMetadata,
+		workspace: profile.workspace
+	});
+	const channelContext = resolveSessionChannelContext({
+		sessionMetadata: modelMetadata,
+		requestMetadata
+	});
+	const sessionMetadata = channelContext.metadata;
+	const requestedSkills = REQUESTED_SKILLS_METADATA_READER.readSelection(requestMetadata);
+	const runtimeThinking = resolveThinkingLevel({
+		config,
+		agentId: profile.agentId,
+		model: effectiveModel,
+		sessionThinkingLevel: parseThinkingLevel(sessionMetadata.preferred_thinking) ?? null
+	});
+	return {
+		channel: channelContext.channel,
+		chatId: channelContext.chatId,
+		config,
+		effectiveModel,
+		effectiveWorkspace,
+		profile,
+		requestMetadata,
+		requestedSkills,
+		requestedToolNames: resolveRequestedToolNames(requestMetadata),
+		runtimeThinking,
+		sessionKey: sessionId,
+		sessionMetadata,
+		toolRunContext: {
+			sessionId,
+			channel: channelContext.channel,
+			chatId: channelContext.chatId,
+			agentId: profile.agentId,
+			config,
+			execTimeoutSeconds: profile.execTimeoutSeconds,
+			handoffDepth: resolveAgentHandoffDepth(requestMetadata),
+			metadata: requestMetadata,
+			restrictToWorkspace: profile.restrictToWorkspace,
+			searchConfig: profile.searchConfig,
+			workspace: effectiveWorkspace
+		}
+	};
+}
+//#endregion
+//#region src/features/native-runtime/services/nextclaw-ncp-context-builder.service.ts
+const TIME_HINT_TRIGGER_PATTERNS = [/\b(now|right now|current time|what time|today|tonight|tomorrow|yesterday|this morning|this afternoon|this evening|date)\b/i, /(现在|此刻|当前时间|现在几点|几点了|今天|今晚|今早|今晨|明天|昨天|日期)/];
+function isRecord$6(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function mergeInputMetadata(input) {
+	const messageMetadata = input.messages.slice().reverse().find((message) => isRecord$6(message.metadata))?.metadata;
+	return {
+		...isRecord$6(messageMetadata) ? structuredClone(messageMetadata) : {},
+		...isRecord$6(input.metadata) ? structuredClone(input.metadata) : {}
+	};
+}
 function shouldAppendTimeHint(content) {
 	const normalized = content.trim();
 	if (!normalized) return false;
@@ -1295,19 +1392,6 @@ function prependRequestedSkills(content, requestedSkillSelectors) {
 	if (requestedSkillSelectors.length === 0) return content;
 	return `[Requested skills for this turn: ${requestedSkillSelectors.join(", ")}]\n\n${content}`;
 }
-function buildSessionOrchestrationSection() {
-	return [
-		"## Session Orchestration",
-		"- Before passing a non-default `runtime` to `sessions_spawn` or agent creation/update flows, inspect the installed runtime kinds with `nextclaw agents runtimes --json`.",
-		"- `sessions_spawn` is the unified session-creation tool. Omit `scope` or use `scope=\"standalone\"` for a regular session, and use `scope=\"child\"` when the new session should be a child session of the current flow.",
-		"- `sessions_spawn` only creates the session by default. Add top-level `notify: \"none\" | \"final_reply\"` when the new session should start working immediately.",
-		"- When `sessions_spawn.scope=\"child\"` and `sessions_spawn.notify=\"final_reply\"`, the new child session starts right away and this session automatically continues after that child reaches its final reply.",
-		"- Use `sessions_spawn` without `notify` when the user wants a separate thread created now but does not need it to start working yet.",
-		"- Use `sessions_request` to send one task to an existing session, including a session that was just created by `sessions_spawn` or a previously created child session.",
-		"- `sessions_request.target` must be an object shaped like `{ \"session_id\": \"<target-session-id>\" }`. Do not pass a bare string.",
-		"- Prefer `notify=\"final_reply\"` when the current session should continue after the target session produces its final reply. Use `notify=\"none\"` when you only want the target session to run independently."
-	].join("\n");
-}
 function buildRequestedOpenAiTools(toolDefinitions, requestedToolNames) {
 	const tools = toolDefinitions.map(buildOpenAiFunctionTool);
 	if (tools.length === 0) return;
@@ -1332,68 +1416,25 @@ var NextclawNcpContextBuilder = class {
 		};
 	};
 	prepareRunContext = (input) => {
-		const config = this.options.configManager.loadConfig();
 		const requestMetadata = mergeInputMetadata(input);
-		const sessionMetadata = structuredClone(requestMetadata);
-		const profile = resolveAgentProfile({
-			config,
-			storedAgentId: this.options.agentId,
-			requestMetadata
-		});
-		let { model: effectiveModel } = resolveEffectiveModel({
-			sessionMetadata,
+		const resolved = resolveNextclawNcpRunContext({
+			configManager: this.options.configManager,
+			sessionId: input.sessionId,
 			requestMetadata,
-			fallbackModel: profile.model
-		});
-		const effectiveWorkspace = resolveSessionWorkspacePath({
-			sessionMetadata,
-			workspace: profile.workspace
-		});
-		const { channel, chatId } = resolveSessionChannelContext({
-			sessionMetadata,
-			requestMetadata
+			sessionMetadata: requestMetadata,
+			storedAgentId: this.options.agentId
 		});
-		const requestedSkills = REQUESTED_SKILLS_METADATA_READER.readSelection(requestMetadata);
 		const currentTurn = buildCurrentTurnState({
 			input,
-			currentModel: effectiveModel,
-			formatPrompt: ({ text, timestamp }) => appendTimeHintForPrompt(prependRequestedSkills(text, requestedSkills.selectors), timestamp),
+			currentModel: resolved.effectiveModel,
+			formatPrompt: ({ text, timestamp }) => appendTimeHintForPrompt(prependRequestedSkills(text, resolved.requestedSkills.selectors), timestamp),
 			assetStore: this.options.assetStore
 		});
-		effectiveModel = currentTurn.effectiveModel;
-		const runtimeThinking = resolveThinkingLevel({
-			config,
-			agentId: profile.agentId,
-			model: effectiveModel,
-			sessionThinkingLevel: parseThinkingLevel(sessionMetadata.preferred_thinking) ?? null
-		});
-		this.options.toolRegistry.prepareForRun({
-			sessionId: input.sessionId,
-			channel,
-			chatId,
-			agentId: profile.agentId,
-			config,
-			execTimeoutSeconds: profile.execTimeoutSeconds,
-			handoffDepth: resolveAgentHandoffDepth(requestMetadata),
-			metadata: requestMetadata,
-			restrictToWorkspace: profile.restrictToWorkspace,
-			searchConfig: profile.searchConfig,
-			workspace: effectiveWorkspace
-		});
+		this.options.toolRegistry.prepareForRun(resolved.toolRunContext);
 		return {
-			channel,
-			chatId,
-			config,
+			...resolved,
 			currentTurn,
-			effectiveModel,
-			effectiveWorkspace,
-			profile,
-			requestMetadata,
-			requestedSkills,
-			requestedToolNames: resolveRequestedToolNames(requestMetadata),
-			runtimeThinking,
-			sessionMetadata,
-			sessionKey: input.sessionId
+			effectiveModel: currentTurn.effectiveModel
 		};
 	};
 	buildModelMessages = (input, _options, runContext) => {
@@ -1564,13 +1605,13 @@ var NativeAgentRuntimeFactory = class {
 };
 //#endregion
 //#region src/features/native-runtime/tools/ncp-asset.tools.ts
-function readOptionalString$6(value) {
+function readOptionalString$5(value) {
 	if (typeof value !== "string") return null;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
 }
 function readOptionalBase64Bytes(value) {
-	const base64 = readOptionalString$6(value);
+	const base64 = readOptionalString$5(value);
 	if (!base64) return null;
 	try {
 		return Buffer.from(base64, "base64");
@@ -1621,18 +1662,18 @@ var AssetPutTool = class {
 		this.contentBasePath = contentBasePath;
 	}
 	validateArgs = (args) => {
-		const path = readOptionalString$6(args.path);
-		const bytesBase64 = readOptionalString$6(args.bytesBase64);
-		const fileName = readOptionalString$6(args.fileName);
+		const path = readOptionalString$5(args.path);
+		const bytesBase64 = readOptionalString$5(args.bytesBase64);
+		const fileName = readOptionalString$5(args.fileName);
 		if (path && bytesBase64) return ["Provide either path, or bytesBase64 + fileName, not both."];
 		if (path) return [];
 		if (bytesBase64) return fileName ? [] : ["fileName is required when using bytesBase64."];
 		return ["Provide either path, or bytesBase64 + fileName."];
 	};
 	execute = async (args) => {
-		const path = readOptionalString$6(args?.path);
-		const fileName = readOptionalString$6(args?.fileName);
-		const mimeType = readOptionalString$6(args?.mimeType);
+		const path = readOptionalString$5(args?.path);
+		const fileName = readOptionalString$5(args?.fileName);
+		const mimeType = readOptionalString$5(args?.mimeType);
 		const bytes = readOptionalBase64Bytes(args?.bytesBase64);
 		if (path) return {
 			ok: true,
@@ -1675,8 +1716,8 @@ var AssetExportTool = class {
 		this.assetStore = assetStore;
 	}
 	execute = async (args) => {
-		const assetUri = readOptionalString$6(args?.assetUri);
-		const targetPath = readOptionalString$6(args?.targetPath);
+		const assetUri = readOptionalString$5(args?.assetUri);
+		const targetPath = readOptionalString$5(args?.targetPath);
 		if (!assetUri || !targetPath) throw new Error("asset_export requires assetUri and targetPath.");
 		return {
 			ok: true,
@@ -1702,7 +1743,7 @@ var AssetStatTool = class {
 		this.contentBasePath = contentBasePath;
 	}
 	execute = async (args) => {
-		const assetUri = readOptionalString$6(args?.assetUri);
+		const assetUri = readOptionalString$5(args?.assetUri);
 		if (!assetUri) throw new Error("asset_stat requires assetUri.");
 		const record = await this.assetStore.statRecord(assetUri);
 		if (!record) return {
@@ -1938,8 +1979,10 @@ var AgentRunRequestManager = class {
 	};
 };
 //#endregion
-//#region src/features/runtime-registry/services/agent-runtime-registry.service.ts
+//#region src/configs/agent-runtime.config.ts
 const DEFAULT_AGENT_RUNTIME_ENTRY_ID = "native";
+//#endregion
+//#region src/features/runtime-registry/services/agent-runtime-registry.service.ts
 function normalizeIdentifier(value) {
 	if (typeof value !== "string") return null;
 	const normalized = value.trim().toLowerCase();
@@ -2232,6 +2275,11 @@ var ConfigManager = class {
 		return this.currentConfig;
 	}
 	loadConfig = () => resolveConfigSecrets(loadConfig(this.configPath), { configPath: this.configPath });
+	getDefaultModel = () => this.loadConfig().agents.defaults.model;
+	getModelMaxTokens = (model) => {
+		const value = this.loadConfig().agents.defaults.models[model]?.params?.max_tokens;
+		return typeof value === "number" ? Math.trunc(value) : void 0;
+	};
 	installRuntimeHooks = (hooks) => {
 		this.hooks = {
 			...this.hooks,
@@ -2246,14 +2294,6 @@ var ConfigManager = class {
 		if (!changedPaths.length) return;
 		this.currentConfig = nextConfig;
 		const plan = buildReloadPlan(changedPaths);
-		let reloadPluginsResult = void 0;
-		if (plan.reloadPlugins) {
-			reloadPluginsResult = await this.reloadPlugins({
-				config: nextConfig,
-				changedPaths
-			});
-			console.log("Config reload: plugins reloaded.");
-		}
 		if (plan.reloadMcp) {
 			await this.reloadMcp({
 				config: nextConfig,
@@ -2268,7 +2308,7 @@ var ConfigManager = class {
 			});
 			console.log("Config reload: companion setting applied.");
 		}
-		if (plan.restartChannels || reloadPluginsResult?.restartChannels) {
+		if (plan.restartChannels) {
 			await this.rebuildChannels(nextConfig, { start: true });
 			console.log("Config reload: channels restarted.");
 		}
@@ -2363,9 +2403,6 @@ var ConfigManager = class {
 			this.providerReloadTask = null;
 		}
 	};
-	reloadPlugins = async (params) => {
-		return await this.hooks.reloadPlugins?.(params);
-	};
 	reloadMcp = async (params) => {
 		await this.hooks.reloadMcp?.(params);
 	};
@@ -2572,8 +2609,15 @@ var ExtensionLifecycleService = class {
 //#region src/features/extension-runtime/services/extension-manifest-discovery.service.ts
 const EXTENSION_MANIFEST_FILE = "nextclaw.extension.json";
 const BUILTIN_EXTENSION_PACKAGES = [
+	"@nextclaw/channel-extension-dingtalk",
+	"@nextclaw/channel-extension-discord",
+	"@nextclaw/channel-extension-email",
 	"@nextclaw/channel-extension-feishu",
 	"@nextclaw/channel-extension-qq",
+	"@nextclaw/channel-extension-slack",
+	"@nextclaw/channel-extension-telegram",
+	"@nextclaw/channel-extension-wecom",
+	"@nextclaw/channel-extension-whatsapp",
 	"@nextclaw/channel-extension-weixin"
 ];
 const runtimeRequire = createRequire(import.meta.url);
@@ -2612,7 +2656,7 @@ function findExtensionManifestRoot(startPath) {
 		current = parent;
 	}
 }
-function resolveDevFirstPartyExtensionDir(explicitDir = process.env.NEXTCLAW_DEV_FIRST_PARTY_PLUGIN_DIR, moduleDir = dirname(fileURLToPath(import.meta.url))) {
+function resolveDevFirstPartyExtensionDir(explicitDir = process.env.NEXTCLAW_DEV_FIRST_PARTY_EXTENSION_DIR, moduleDir = dirname(fileURLToPath(import.meta.url))) {
 	const configured = explicitDir?.trim();
 	if (configured) return configured;
 	return [
@@ -2660,8 +2704,7 @@ function resolveExtensionManifestRoots(params) {
 		join(getDataPath(), "extensions"),
 		join(params.workspace, ".nextclaw", "extensions"),
 		...devExtensionsDir ? [devExtensionsDir] : [],
-		...resolveBuiltinExtensionManifestRoots(),
-		...params.config.plugins.load?.paths ?? []
+		...resolveBuiltinExtensionManifestRoots()
 	]);
 }
 var ExtensionManifestDiscoveryService = class {
@@ -2781,11 +2824,35 @@ function toInboundMessage(value) {
 		metadata: readRecord$1(payload.metadata)
 	};
 }
+function normalizeChannelConfigResult(value) {
+	return readRecord$1(readRecord$1(value).channelConfig);
+}
+function normalizeAuthLoginResult(value) {
+	const record = readRecord$1(value);
+	return {
+		channelConfig: normalizeChannelConfigResult(record),
+		accountId: typeof record.accountId === "string" ? record.accountId : null,
+		notes: Array.isArray(record.notes) ? record.notes.filter((note) => typeof note === "string") : []
+	};
+}
+function normalizeAuthPollResult(value) {
+	if (!value) return null;
+	const record = readRecord$1(value);
+	return {
+		channel: readRequiredString$2(record.channel, "channel"),
+		status: record.status,
+		message: readString$5(record.message),
+		nextPollMs: readOptionalNumber(record.nextPollMs),
+		accountId: typeof record.accountId === "string" ? record.accountId : null,
+		notes: Array.isArray(record.notes) ? record.notes.filter((note) => typeof note === "string") : [],
+		channelConfig: normalizeChannelConfigResult(record)
+	};
+}
 var ExtensionChannelClient = class {
 	constructor(params) {
 		this.params = params;
 	}
-	login = async ({ accountId, baseUrl, verbose }) => await this.params.request({
+	login = async ({ accountId, baseUrl, verbose }) => normalizeAuthLoginResult(await this.params.request({
 		extensionId: this.params.extensionId,
 		kind: "channel.auth.login",
 		payload: {
@@ -2794,7 +2861,7 @@ var ExtensionChannelClient = class {
 			baseUrl,
 			verbose
 		}
-	});
+	}));
 	start = async (params) => await this.params.request({
 		extensionId: this.params.extensionId,
 		kind: "channel.auth.start",
@@ -2805,14 +2872,24 @@ var ExtensionChannelClient = class {
 			domain: params.domain
 		}
 	});
-	poll = async ({ sessionId }) => await this.params.request({
+	connect = async (params) => normalizeAuthPollResult(await this.params.request({
+		extensionId: this.params.extensionId,
+		kind: "channel.auth.connect",
+		payload: {
+			channelId: this.params.channelId,
+			accountId: params.accountId,
+			domain: params.domain,
+			fields: params.fields
+		}
+	}));
+	poll = async ({ sessionId }) => normalizeAuthPollResult(await this.params.request({
 		extensionId: this.params.extensionId,
 		kind: "channel.auth.poll",
 		payload: {
 			channelId: this.params.channelId,
 			sessionId
 		}
-	});
+	}));
 	sendText = async ({ to, text, accountId, replyTo, media, metadata }) => await this.params.request({
 		extensionId: this.params.extensionId,
 		kind: "channel.outbound.sendText",
@@ -2838,6 +2915,8 @@ var ExtensionRuntimeService = class {
 	registerIngressHandlers = () => {
 		this.options.ingress.addHandler(ingressKeys.extension.channelConfigGet, this.handleChannelConfigGet);
 		this.options.ingress.addHandler(ingressKeys.extension.channelMessageSubmit, this.handleChannelMessageSubmit);
+		this.options.ingress.addHandler(ingressKeys.extension.channelCommandList, this.handleChannelCommandList);
+		this.options.ingress.addHandler(ingressKeys.extension.channelCommandExecute, this.handleChannelCommandExecute);
 		this.options.ingress.addHandler(ingressKeys.extension.response, this.handleExtensionResponse);
 	};
 	loadChannelContributions = async (params) => {
@@ -2876,7 +2955,7 @@ var ExtensionRuntimeService = class {
 			if (!channelId) continue;
 			const configUiHints = this.readConfigUiHints(channel.configUiHints);
 			channelBindings.push({
-				pluginId: manifest.id,
+				extensionId: manifest.id,
 				channelId,
 				channel: {
 					id: channelId,
@@ -2915,6 +2994,49 @@ var ExtensionRuntimeService = class {
 		await this.options.messageBus.publishInbound(toInboundMessage(envelope.payload));
 		return { accepted: true };
 	};
+	handleChannelCommandList = (_envelope, context) => {
+		this.assertAuthorized(context);
+		return { commands: new CommandRegistry(this.options.getConfig(), this.options.sessionManager).listSlashCommands() };
+	};
+	handleChannelCommandExecute = async (envelope, context) => {
+		this.assertAuthorized(context);
+		const payload = readRecord$1(envelope.payload);
+		const channel = readRequiredString$2(payload.channelId, "channelId");
+		const chatId = readRequiredString$2(payload.conversationId, "conversationId");
+		const senderId = readRequiredString$2(payload.senderId, "senderId");
+		const metadata = readRecord$1(payload.metadata);
+		const config = this.options.getConfig();
+		const registry = new CommandRegistry(config, this.options.sessionManager);
+		const route = new AgentRouteResolver(config).resolveInbound({
+			message: {
+				channel,
+				chatId,
+				senderId,
+				content: readString$5(payload.rawText) ?? readString$5(payload.commandName) ?? "",
+				timestamp: /* @__PURE__ */ new Date(),
+				attachments: [],
+				metadata
+			},
+			forcedAgentId: readString$5(metadata.target_agent_id),
+			sessionKeyOverride: readString$5(metadata.session_key_override)
+		});
+		const rawText = readString$5(payload.rawText);
+		if (rawText) return await registry.executeText(rawText, {
+			channel,
+			chatId,
+			senderId,
+			sessionKey: route.sessionKey
+		}) ?? {
+			content: "",
+			ephemeral: true
+		};
+		return await registry.execute(readRequiredString$2(payload.commandName, "commandName"), readRecord$1(payload.args), {
+			channel,
+			chatId,
+			senderId,
+			sessionKey: route.sessionKey
+		});
+	};
 	handleExtensionResponse = (envelope, context) => {
 		this.assertAuthorized(context);
 		const payload = readRecord$1(envelope.payload);
@@ -2975,451 +3097,64 @@ var ExtensionRuntimeService = class {
 	};
 };
 //#endregion
-//#region src/features/extension-development-source/utils/first-party-plugin-load-paths.utils.ts
-const readJsonFile = (filePath) => {
-	try {
-		const raw = fs.readFileSync(filePath, "utf-8");
-		const parsed = JSON.parse(raw);
-		return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
-	} catch {
-		return null;
-	}
-};
-const readString$4 = (value) => {
-	if (typeof value !== "string") return;
-	return value.trim() || void 0;
-};
-const toPluginIdFromPackageName = (packageName) => {
-	const trimmed = packageName.trim();
-	if (!trimmed) return "";
-	return trimmed.includes("/") ? trimmed.split("/").pop() ?? trimmed : trimmed;
-};
-const normalizeInstallRecordPath = (value) => {
-	const filePath = readString$4(value);
-	return filePath ? path.resolve(filePath) : void 0;
-};
-const resolveDevFirstPartyPluginDir = (explicitDir, moduleDir = path.dirname(fileURLToPath(import.meta.url))) => {
-	const configured = explicitDir?.trim();
-	if (configured) return configured;
-	return [
-		path.resolve(moduleDir, "../../../extensions"),
-		path.resolve(moduleDir, "../../../../extensions"),
-		path.resolve(moduleDir, "../../../../../extensions")
-	].find((candidate) => fs.existsSync(candidate));
-};
-const hasOpenClawExtensions = (pkg) => {
-	const openclaw = pkg.openclaw;
-	if (!openclaw || typeof openclaw !== "object" || Array.isArray(openclaw)) return false;
-	const extensions = openclaw.extensions;
-	return Array.isArray(extensions) && extensions.some((entry) => typeof entry === "string" && entry.trim().length > 0);
-};
-const hasOpenClawDevelopmentExtensions = (pkg) => {
-	const openclaw = pkg.openclaw;
-	if (!openclaw || typeof openclaw !== "object" || Array.isArray(openclaw)) return false;
-	const development = openclaw.development;
-	if (!development || typeof development !== "object" || Array.isArray(development)) return false;
-	const extensions = development.extensions;
-	return Array.isArray(extensions) && extensions.some((entry) => typeof entry === "string" && entry.trim().length > 0);
-};
-const normalizePackageSpec = (spec) => {
-	const trimmed = spec.trim();
-	if (!trimmed) return;
-	if (trimmed.startsWith("@")) {
-		const slashIndex = trimmed.indexOf("/");
-		if (slashIndex < 0) return;
-		const secondAtIndex = trimmed.indexOf("@", slashIndex + 1);
-		return secondAtIndex < 0 ? trimmed : trimmed.slice(0, secondAtIndex);
-	}
-	const versionIndex = trimmed.indexOf("@");
-	return versionIndex < 0 ? trimmed : trimmed.slice(0, versionIndex);
-};
-const readWorkspacePluginPackages = (workspaceExtensionsDir) => {
-	if (!workspaceExtensionsDir.trim() || !fs.existsSync(workspaceExtensionsDir)) return [];
-	const entries = fs.readdirSync(workspaceExtensionsDir, { withFileTypes: true });
-	const packages = [];
-	for (const entry of entries) {
-		if (!entry.isDirectory()) continue;
-		const packageDir = path.join(workspaceExtensionsDir, entry.name);
-		const pkg = readJsonFile(path.join(packageDir, "package.json"));
-		if (!pkg || !hasOpenClawExtensions(pkg)) continue;
-		const packageName = readString$4(pkg.name);
-		if (!packageName?.startsWith("@nextclaw/")) continue;
-		packages.push({
-			pluginId: toPluginIdFromPackageName(packageName),
-			packageName,
-			dir: packageDir,
-			supportsDevelopmentSource: hasOpenClawDevelopmentExtensions(pkg)
-		});
-	}
-	return packages;
-};
-const readInstalledFirstPartyPluginMatches = (workspaceExtensionsDir) => {
-	const workspacePackages = readWorkspacePluginPackages(workspaceExtensionsDir);
-	if (workspacePackages.length === 0) return [];
-	const globalExtensionsDir = path.join(getDataPath(), "extensions");
-	if (!fs.existsSync(globalExtensionsDir)) return [];
-	const workspacePackageByName = new Map(workspacePackages.map((entry) => [entry.packageName, entry]));
-	const entries = fs.readdirSync(globalExtensionsDir, { withFileTypes: true });
-	const matches = [];
-	for (const entry of entries) {
-		if (!entry.isDirectory()) continue;
-		const packageDir = path.join(globalExtensionsDir, entry.name);
-		const packageName = readString$4(readJsonFile(path.join(packageDir, "package.json"))?.name);
-		if (!packageName) continue;
-		const workspacePackage = workspacePackageByName.get(packageName);
-		if (!workspacePackage) continue;
-		matches.push({
-			packageName,
-			workspaceDir: workspacePackage.dir,
-			installPath: packageDir
-		});
-	}
-	return matches;
-};
-const mergeLoadPaths$1 = (existingLoadPaths, devLoadPaths) => {
-	const mergedLoadPaths = [...devLoadPaths];
-	for (const entry of existingLoadPaths) if (!mergedLoadPaths.includes(entry)) mergedLoadPaths.push(entry);
-	return mergedLoadPaths;
-};
-const findWorkspacePackageForInstallRecord = (installRecord, workspacePackages, packageByName) => {
-	const packageName = normalizePackageSpec(readString$4(installRecord.spec) ?? "");
-	if (packageName) {
-		const matchedByPackageName = packageByName.get(packageName);
-		if (matchedByPackageName) return matchedByPackageName;
-	}
-	const installPathCandidates = new Set([installRecord.sourcePath, installRecord.installPath].map(normalizeInstallRecordPath).filter((entry) => Boolean(entry)));
-	if (installPathCandidates.size === 0) return;
-	return workspacePackages.find((workspacePackage) => installPathCandidates.has(path.resolve(workspacePackage.dir)));
-};
-const resolveDevFirstPartyPluginLoadPaths = (config, workspaceExtensionsDir) => {
-	const rootDir = resolveDevFirstPartyPluginDir(workspaceExtensionsDir);
-	if (!rootDir) return [];
-	const workspacePackages = readWorkspacePluginPackages(rootDir);
-	if (workspacePackages.length === 0) return [];
-	const installedPluginMatches = readInstalledFirstPartyPluginMatches(rootDir);
-	const packageDirByName = new Map(workspacePackages.map((entry) => [entry.packageName, entry.dir]));
-	const packageByName = new Map(workspacePackages.map((entry) => [entry.packageName, entry]));
-	const loadPaths = [];
-	const installs = config.plugins.installs ?? {};
-	for (const installRecord of Object.values(installs)) {
-		const matchedWorkspacePackage = findWorkspacePackageForInstallRecord(installRecord, workspacePackages, packageByName);
-		const packageDir = matchedWorkspacePackage ? matchedWorkspacePackage.dir : packageDirByName.get(normalizePackageSpec(readString$4(installRecord.spec) ?? "") ?? "");
-		if (!packageDir || loadPaths.includes(packageDir)) continue;
-		loadPaths.push(packageDir);
-	}
-	for (const installedPlugin of installedPluginMatches) {
-		if (loadPaths.includes(installedPlugin.workspaceDir)) continue;
-		loadPaths.push(installedPlugin.workspaceDir);
-	}
-	return loadPaths;
-};
-const resolveDevFirstPartyPluginInstallRoots = (config, workspaceExtensionsDir) => {
-	const rootDir = resolveDevFirstPartyPluginDir(workspaceExtensionsDir);
-	if (!rootDir) return [];
-	const workspacePackages = readWorkspacePluginPackages(rootDir);
-	if (workspacePackages.length === 0) return [];
-	const packageNames = new Set(workspacePackages.map((entry) => entry.packageName));
-	const packageByName = new Map(workspacePackages.map((entry) => [entry.packageName, entry]));
-	const installRoots = [];
-	const installedPluginMatches = readInstalledFirstPartyPluginMatches(rootDir);
-	for (const installedPlugin of installedPluginMatches) {
-		if (installRoots.includes(installedPlugin.installPath)) continue;
-		installRoots.push(installedPlugin.installPath);
-	}
-	for (const installRecord of Object.values(config.plugins.installs ?? {})) {
-		const workspacePackage = findWorkspacePackageForInstallRecord(installRecord, workspacePackages, packageByName);
-		const packageName = normalizePackageSpec(readString$4(installRecord.spec) ?? "");
-		if (!workspacePackage && (!packageName || !packageNames.has(packageName))) continue;
-		const installPath = readString$4(installRecord.installPath);
-		if (!installPath || installRoots.includes(installPath)) continue;
-		if (workspacePackage && path.resolve(installPath) === path.resolve(workspacePackage.dir)) continue;
-		installRoots.push(installPath);
-	}
-	return installRoots;
-};
-const applyDevFirstPartyPluginLoadPaths = (config, workspaceExtensionsDir) => {
-	const rootDir = resolveDevFirstPartyPluginDir(workspaceExtensionsDir);
-	if (!rootDir) return config;
-	if (readWorkspacePluginPackages(rootDir).length === 0) return config;
-	const devLoadPaths = resolveDevFirstPartyPluginLoadPaths(config, rootDir);
-	if (devLoadPaths.length === 0) return config;
-	const mergedLoadPaths = mergeLoadPaths$1(Array.isArray(config.plugins.load?.paths) ? config.plugins.load.paths.filter((entry) => typeof entry === "string" && entry.trim().length > 0) : [], devLoadPaths);
+//#region src/managers/extension.manager.ts
+function createEmptyExtensionRegistry() {
 	return {
-		...config,
-		plugins: {
-			...config.plugins,
-			load: {
-				...config.plugins.load,
-				paths: mergedLoadPaths
-			}
-		}
+		tools: [],
+		channels: [],
+		diagnostics: []
 	};
-};
-//#endregion
-//#region src/features/extension-development-source/utils/dev-plugin-overrides.utils.ts
-const DEV_PLUGIN_OVERRIDES_ENV = "NEXTCLAW_DEV_PLUGIN_OVERRIDES";
-function isRecord$4(value) {
-	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-function readOptionalString$5(value) {
-	if (typeof value !== "string") return;
-	return value.trim() || void 0;
 }
-function readPackageManifest(pluginPath) {
-	const packageJsonPath = path.join(pluginPath, "package.json");
-	if (!fs.existsSync(packageJsonPath)) return null;
-	try {
-		return JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
-	} catch {
-		return null;
-	}
+function buildSortedBindingSignatures(bindings) {
+	return bindings.map((binding) => `${binding.extensionId}:${binding.channelId}`).sort();
 }
-function assertOverridePluginReadable(override) {
-	if (!fs.existsSync(override.pluginPath)) throw new Error(`[dev-plugin-override] plugin path does not exist for "${override.pluginId}": ${override.pluginPath}`);
-	const packageManifest = readPackageManifest(override.pluginPath);
-	if (!packageManifest) throw new Error(`[dev-plugin-override] package.json is missing or invalid for "${override.pluginId}": ${override.pluginPath}`);
-	const pluginManifest = loadPluginManifest(override.pluginPath);
-	if (!pluginManifest.ok) throw new Error(`[dev-plugin-override] ${pluginManifest.error} for "${override.pluginId}": ${override.pluginPath}`);
-	if (pluginManifest.manifest.id !== override.pluginId) throw new Error(`[dev-plugin-override] plugin id mismatch: expected "${override.pluginId}" but found "${pluginManifest.manifest.id}" at ${override.pluginPath}`);
-	if (getPackageManifestExtensions(packageManifest, override.source).length === 0) {
-		const missingEntry = override.source === "development" ? "openclaw.development.extensions" : "openclaw.extensions";
-		throw new Error(`[dev-plugin-override] ${missingEntry} is missing for "${override.pluginId}" at ${override.pluginPath}`);
-	}
-}
-function readOverrideRecord(value, index) {
-	if (!isRecord$4(value)) throw new Error(`[dev-plugin-override] override[${index}] must be an object`);
-	const pluginId = readOptionalString$5(value.pluginId);
-	const pluginPath = readOptionalString$5(value.pluginPath);
-	const source = value.source === "development" ? "development" : "production";
-	if (!pluginId || !pluginPath) throw new Error(`[dev-plugin-override] override[${index}] requires pluginId and pluginPath`);
-	const normalized = {
-		pluginId,
-		pluginPath: path.resolve(pluginPath),
-		source
-	};
-	assertOverridePluginReadable(normalized);
-	return normalized;
-}
-function resolveDevPluginOverrides(rawEnv = process.env[DEV_PLUGIN_OVERRIDES_ENV]) {
-	if (typeof rawEnv !== "string" || rawEnv.trim().length === 0) return [];
-	let parsed;
-	try {
-		parsed = JSON.parse(rawEnv);
-	} catch (error) {
-		throw new Error(`[dev-plugin-override] failed to parse ${DEV_PLUGIN_OVERRIDES_ENV}: ${error instanceof Error ? error.message : String(error)}`);
-	}
-	if (!Array.isArray(parsed)) throw new Error(`[dev-plugin-override] ${DEV_PLUGIN_OVERRIDES_ENV} must be a JSON array`);
-	const seenPluginIds = /* @__PURE__ */ new Set();
-	const overrides = parsed.map((entry, index) => readOverrideRecord(entry, index));
-	for (const entry of overrides) {
-		if (seenPluginIds.has(entry.pluginId)) throw new Error(`[dev-plugin-override] duplicate plugin override for "${entry.pluginId}"`);
-		seenPluginIds.add(entry.pluginId);
-	}
-	return overrides;
-}
-function mergeLoadPaths(existingLoadPaths, overrideLoadPaths) {
-	const merged = [...overrideLoadPaths];
-	for (const entry of existingLoadPaths) if (!merged.includes(entry)) merged.push(entry);
-	return merged;
-}
-function applyExplicitDevPluginOverrides(config, overrides) {
-	if (overrides.length === 0) return config;
-	const nextEntries = { ...config.plugins.entries ?? {} };
-	for (const override of overrides) nextEntries[override.pluginId] = {
-		...nextEntries[override.pluginId] ?? {},
-		source: override.source
-	};
-	const existingLoadPaths = Array.isArray(config.plugins.load?.paths) ? config.plugins.load.paths.filter((entry) => typeof entry === "string" && entry.trim().length > 0) : [];
-	return {
-		...config,
-		plugins: {
-			...config.plugins,
-			entries: nextEntries,
-			load: {
-				...config.plugins.load,
-				paths: mergeLoadPaths(existingLoadPaths, overrides.map((entry) => entry.pluginPath))
-			}
-		}
-	};
+function buildSortedExtensionChannelIds(channels) {
+	return channels.map((registration) => registration.channel.id).filter((id) => typeof id === "string" && id.trim().length > 0).sort();
 }
-function resolveDevPluginOverrideInstallRoots(config, overrides) {
-	const installRoots = [];
-	for (const override of overrides) {
-		const installRecord = config.plugins.installs?.[override.pluginId];
-		const installPath = readOptionalString$5(installRecord?.installPath);
-		if (!installPath || installRoots.includes(installPath)) continue;
-		installRoots.push(installPath);
-	}
-	return installRoots;
-}
-function resolveDevPluginLoadingContext(config, workspaceExtensionsDir, rawOverridesEnv = process.env[DEV_PLUGIN_OVERRIDES_ENV]) {
-	const configWithFirstPartyOverrides = applyDevFirstPartyPluginLoadPaths(config, workspaceExtensionsDir);
-	const overrides = resolveDevPluginOverrides(rawOverridesEnv);
-	return {
-		configWithDevPluginOverrides: applyExplicitDevPluginOverrides(configWithFirstPartyOverrides, overrides),
-		excludedRoots: [...resolveDevFirstPartyPluginInstallRoots(config, workspaceExtensionsDir), ...resolveDevPluginOverrideInstallRoots(config, overrides)].filter((entry, index, list) => list.indexOf(entry) === index),
-		overrides
-	};
-}
-//#endregion
-//#region src/services/extension-plugin-registry.service.ts
-const RESERVED_TOOL_NAMES = [
-	"read_file",
-	"write_file",
-	"edit_file",
-	"list_dir",
-	"exec",
-	"web_search",
-	"web_fetch",
-	"message",
-	"spawn",
-	"sessions_list",
-	"sessions_history",
-	"memory_search",
-	"memory_get",
-	"subagents",
-	"gateway",
-	"cron"
-];
-function buildReservedPluginLoadOptions() {
-	return {
-		reservedToolNames: [...RESERVED_TOOL_NAMES],
-		reservedChannelIds: [],
-		reservedProviderIds: builtinProviderIds()
-	};
-}
-function createPluginLogger() {
-	return getAppLogger("extension.manager.plugin_registry");
-}
-var ExtensionPluginRegistryService = class {
-	discoverEnabledPluginCount = (params) => {
-		const { configWithDevPluginOverrides } = this.resolveLoadingContext(params.config);
-		return discoverPluginStatusReport({
-			config: configWithDevPluginOverrides,
-			workspaceDir: params.workspace
-		}).plugins.filter((plugin) => plugin.enabled).length;
-	};
-	load = (params) => {
-		const { configWithDevPluginOverrides, excludedRoots } = this.resolveLoadingContext(params.config);
-		return loadOpenClawPlugins({
-			config: configWithDevPluginOverrides,
-			workspaceDir: params.workspace,
-			excludeRoots: excludedRoots,
-			...buildReservedPluginLoadOptions(),
-			logger: createPluginLogger()
-		});
-	};
-	loadProgressively = async (params) => {
-		const { configWithDevPluginOverrides, excludedRoots } = this.resolveLoadingContext(params.config);
-		return await loadOpenClawPluginsProgressively({
-			config: configWithDevPluginOverrides,
-			workspaceDir: params.workspace,
-			excludeRoots: excludedRoots,
-			...buildReservedPluginLoadOptions(),
-			onPluginProcessed: params.onPluginProcessed,
-			logger: createPluginLogger()
-		});
-	};
-	resolveLoadingContext = (config) => {
-		return resolveDevPluginLoadingContext(config, resolveDevFirstPartyPluginDir(process.env.NEXTCLAW_DEV_FIRST_PARTY_PLUGIN_DIR));
-	};
-};
-//#endregion
-//#region src/managers/extension.manager.ts
-function createEmptyPluginRegistry() {
-	return {
-		plugins: [],
-		tools: [],
-		channels: [],
-		providers: [],
-		diagnostics: [],
-		resolvedTools: []
-	};
-}
-function buildSortedBindingSignatures(bindings) {
-	return bindings.map((binding) => `${binding.pluginId}:${binding.channelId}`).sort();
-}
-function buildSortedExtensionChannelIds(channels) {
-	return channels.map((registration) => registration.channel.id).filter((id) => typeof id === "string" && id.trim().length > 0).sort();
-}
-function areSortedStringListsEqual(left, right) {
-	return left.length === right.length && left.every((value, index) => value === right[index]);
+function areSortedStringListsEqual(left, right) {
+	return left.length === right.length && left.every((value, index) => value === right[index]);
 }
 function readConfigPathSegment(path, prefix) {
 	if (!path.startsWith(prefix)) return null;
 	const [segment] = path.slice(prefix.length).split(".");
 	return segment?.trim() ? segment.trim() : null;
 }
+function buildSnapshot(params) {
+	return {
+		extensionRegistry: {
+			...createEmptyExtensionRegistry(),
+			channels: params.channelBindings.map((binding) => ({
+				extensionId: binding.extensionId,
+				channel: binding.channel,
+				source: "extension-manifest"
+			}))
+		},
+		channelBindings: params.channelBindings,
+		uiMetadata: params.uiMetadata
+	};
+}
 function shouldRestartChannelsForExtensionReload(params) {
 	const { changedPaths, currentSnapshot, nextSnapshot } = params;
 	if (!areSortedStringListsEqual(buildSortedBindingSignatures(currentSnapshot.channelBindings), buildSortedBindingSignatures(nextSnapshot.channelBindings))) return true;
 	if (!areSortedStringListsEqual(buildSortedExtensionChannelIds(currentSnapshot.extensionRegistry.channels), buildSortedExtensionChannelIds(nextSnapshot.extensionRegistry.channels))) return true;
-	const channelPluginIds = /* @__PURE__ */ new Set();
 	const channelIds = /* @__PURE__ */ new Set();
-	for (const binding of [...currentSnapshot.channelBindings, ...nextSnapshot.channelBindings]) {
-		channelPluginIds.add(binding.pluginId);
-		channelIds.add(binding.channelId);
-	}
+	for (const binding of [...currentSnapshot.channelBindings, ...nextSnapshot.channelBindings]) channelIds.add(binding.channelId);
 	for (const path of changedPaths) {
-		const pluginId = readConfigPathSegment(path, "plugins.entries.");
-		if (pluginId && channelPluginIds.has(pluginId)) return true;
 		const channelId = readConfigPathSegment(path, "channels.");
 		if (channelId && channelIds.has(channelId)) return true;
+		if (path.startsWith("extensions.")) return true;
 	}
 	return false;
 }
-function toExtensionRegistry(pluginRegistry) {
-	return {
-		tools: pluginRegistry.tools.map((tool) => ({
-			extensionId: tool.pluginId,
-			factory: tool.factory,
-			names: tool.names,
-			optional: tool.optional,
-			source: tool.source
-		})),
-		channels: pluginRegistry.channels.map((channel) => ({
-			extensionId: channel.pluginId,
-			channel: channel.channel,
-			source: channel.source
-		})),
-		diagnostics: pluginRegistry.diagnostics.map((diag) => ({
-			level: diag.level,
-			message: diag.message,
-			extensionId: diag.pluginId,
-			source: diag.source
-		}))
-	};
-}
-function toManifestChannelRegistrations(channelBindings) {
-	return channelBindings.map((binding) => ({
-		extensionId: binding.pluginId,
-		channel: binding.channel,
-		source: "extension-manifest"
-	}));
-}
-function buildExtensionSnapshot(registry, contributions) {
-	const extensionChannelIds = new Set(contributions.channelBindings.map((binding) => binding.channelId));
-	const extensionPluginIds = new Set(contributions.uiMetadata.map((metadata) => metadata.id));
-	const registryExtensionRegistry = toExtensionRegistry(registry);
-	return {
-		extensionRegistry: {
-			...registryExtensionRegistry,
-			channels: [...registryExtensionRegistry.channels.filter((registration) => {
-				const channelId = registration.channel.id?.trim();
-				return !channelId || !extensionChannelIds.has(channelId);
-			}), ...toManifestChannelRegistrations(contributions.channelBindings)]
-		},
-		channelBindings: [...getPluginChannelBindings(registry).filter((binding) => !extensionChannelIds.has(binding.channelId)), ...contributions.channelBindings],
-		uiMetadata: [...getPluginUiMetadataFromRegistry(registry).filter((metadata) => !extensionPluginIds.has(metadata.id)), ...contributions.uiMetadata]
-	};
+function countExtensionIds(bindings, metadata) {
+	return new Set([...bindings.map((binding) => binding.extensionId), ...metadata.map((item) => item.id)]).size;
 }
 var ExtensionManager = class {
-	snapshot = buildExtensionSnapshot(createEmptyPluginRegistry(), {
+	snapshot = buildSnapshot({
 		channelBindings: [],
 		uiMetadata: []
 	});
 	runtime;
-	pluginRegistry = new ExtensionPluginRegistryService();
 	constructor(options) {
 		this.options = options;
 		this.runtime = new ExtensionRuntimeService({
@@ -3427,38 +3162,32 @@ var ExtensionManager = class {
 			getConfig: options.configManager.loadConfig,
 			getWorkspace: this.getWorkspace,
 			ingress: options.ingress,
-			messageBus: options.messageBus
+			messageBus: options.messageBus,
+			sessionManager: options.sessionManager
 		});
 	}
-	load = async (params) => {
-		const { changedPaths = [], onLoadStart, onPluginProcessed } = params;
+	load = async (params = {}) => {
+		const { changedPaths = [], onLoadStart, onExtensionProcessed } = params;
 		const config = params.config ?? this.options.configManager.loadConfig();
 		const workspace = getWorkspacePath(config.agents.defaults.workspace);
-		const totalPluginCount = this.pluginRegistry.discoverEnabledPluginCount({
-			config,
-			workspace
-		});
-		onLoadStart?.({ totalPluginCount });
-		let loadedPluginCount = 0;
-		const registry = await this.pluginRegistry.loadProgressively({
-			config,
-			workspace,
-			onPluginProcessed: (progress) => {
-				loadedPluginCount = progress.loadedPluginCount;
-				onPluginProcessed?.(progress);
-			}
-		});
 		const contributions = await this.runtime.loadChannelContributions({
 			config,
 			workspace
 		});
+		const totalExtensionCount = countExtensionIds(contributions.channelBindings, contributions.uiMetadata);
+		onLoadStart?.({ totalExtensionCount });
+		for (const [index, binding] of contributions.channelBindings.entries()) onExtensionProcessed?.({
+			extensionId: binding.extensionId,
+			loadedExtensionCount: index + 1,
+			totalExtensionCount
+		});
 		const currentSnapshot = this.snapshot;
-		const nextSnapshot = buildExtensionSnapshot(registry, contributions);
+		const nextSnapshot = buildSnapshot(contributions);
 		this.snapshot = nextSnapshot;
 		return {
-			diagnostics: registry.diagnostics,
-			totalPluginCount,
-			loadedPluginCount: loadedPluginCount || totalPluginCount,
+			diagnostics: [],
+			totalExtensionCount,
+			loadedExtensionCount: totalExtensionCount,
 			shouldRestartChannels: shouldRestartChannelsForExtensionReload({
 				changedPaths,
 				currentSnapshot,
@@ -3479,11 +3208,49 @@ var ExtensionManager = class {
 	getExtensionRegistry = () => this.snapshot.extensionRegistry;
 	getChannelBindings = () => this.snapshot.channelBindings;
 	getUiMetadata = () => this.snapshot.uiMetadata;
-	toConfigView = (config) => toPluginConfigView(config, this.snapshot.channelBindings);
-	mergeConfigView = (current, nextConfigView) => mergePluginConfigView(current, nextConfigView, this.snapshot.channelBindings);
+	toConfigView = (config) => toExtensionConfigView(config);
+	mergeConfigView = (current, nextConfigView) => mergeExtensionConfigView(current, nextConfigView);
 	getWorkspace = () => getWorkspacePath(this.options.configManager.loadConfig().agents.defaults.workspace);
 };
 //#endregion
+//#region src/utils/model-message-vision.utils.ts
+const IMAGE_OMITTED_TEXT = "[Image omitted: the selected model is not configured for vision input.]";
+function isRecord$4(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function isImageContentPart(value) {
+	if (!isRecord$4(value)) return false;
+	const type = value.type;
+	return type === "image_url" || type === "input_image";
+}
+function normalizeContentWithoutVision(content) {
+	if (!Array.isArray(content)) return content;
+	let sawImage = false;
+	const parts = content.map((part) => {
+		if (!isImageContentPart(part)) return part;
+		sawImage = true;
+		return {
+			type: "text",
+			text: IMAGE_OMITTED_TEXT
+		};
+	});
+	if (!sawImage) return content;
+	const textParts = parts.filter((part) => isRecord$4(part) && part.type === "text" && typeof part.text === "string").map((part) => part.text.trim()).filter(Boolean);
+	if (textParts.length === parts.length) return textParts.join("\n\n");
+	return parts;
+}
+function normalizeModelMessagesForVisionSupport(params) {
+	if (params.supportsVision) return params.messages;
+	return params.messages.map((message) => {
+		if (!Object.prototype.hasOwnProperty.call(message, "content")) return message;
+		const content = normalizeContentWithoutVision(message.content);
+		return content === message.content ? message : {
+			...message,
+			content
+		};
+	});
+}
+//#endregion
 //#region src/managers/llm-provider.manager.ts
 const normalizedModel = (value) => {
 	if (typeof value !== "string") return null;
@@ -3529,10 +3296,19 @@ var LlmProviderManager = class {
 		return this.getOrCreateProvider(route);
 	};
 	chat = async (params) => {
-		return this.get(params.model ?? null).chat(params);
+		const route = this.resolveRoute(params.model ?? null);
+		return (route ? this.getOrCreateProvider(route) : this.missingProvider).chat({
+			...params,
+			messages: this.prepareMessagesForProvider(route, params.messages)
+		});
 	};
 	chatStream = async function* (params) {
-		for await (const event of this.get(params.model ?? null).chatStream(params)) yield event;
+		const route = this.resolveRoute(params.model ?? null);
+		const provider = route ? this.getOrCreateProvider(route) : this.missingProvider;
+		for await (const event of provider.chatStream({
+			...params,
+			messages: this.prepareMessagesForProvider(route, params.messages)
+		})) yield event;
 	};
 	testConnection = async (input) => {
 		await this.createProvider({
@@ -3545,7 +3321,7 @@ var LlmProviderManager = class {
 				extraHeaders: input.extraHeaders ?? null,
 				wireApi: input.wireApi ?? "auto",
 				models: [],
-				modelThinking: {}
+				modelConfig: {}
 			},
 			apiBase: input.apiBase ?? null,
 			model: input.defaultModel
@@ -3663,6 +3439,16 @@ var LlmProviderManager = class {
 			wireApi: route.provider?.wireApi ?? null
 		});
 	};
+	prepareMessagesForProvider = (route, messages) => {
+		return normalizeModelMessagesForVisionSupport({
+			messages,
+			supportsVision: modelSupportsVision({
+				model: route?.model,
+				providerName: route?.providerName,
+				modelConfig: route?.provider?.modelConfig
+			})
+		});
+	};
 	buildCacheKey = (route) => {
 		const routeProvider = route.provider;
 		return [
@@ -3923,7 +3709,7 @@ var NcpSessionManager = class {
 		this.runningSessionIds.clear();
 	};
 	createSession = async (params) => {
-		const { agentId: requestedAgentId, metadataOverrides, model, parentSessionId: rawParentSessionId, projectRoot, requestId: rawRequestId, runtime, sessionType: requestedSessionType, sourceSessionId, sourceSessionMetadata, task, thinkingLevel, title: requestedTitle } = params;
+		const { agentId: requestedAgentId, metadataOverrides, model, parentSessionId: rawParentSessionId, projectRoot, requestId: rawRequestId, runtime, sessionId: requestedSessionId, sessionType: requestedSessionType, sourceSessionId, sourceSessionMetadata, task, thinkingLevel, title: requestedTitle } = params;
 		const sourceRecord = sourceSessionId ? await this.getSessionRecord(sourceSessionId) : null;
 		const metadata = cloneInheritedMetadata(sourceSessionMetadata);
 		const title = readOptionalString$4(requestedTitle) ?? summarizeTask(task);
@@ -3948,7 +3734,7 @@ var NcpSessionManager = class {
 		const now = (/* @__PURE__ */ new Date()).toISOString();
 		const nextMetadata = mergeMetadataOverrides(metadata, metadataOverrides);
 		const agentId = readOptionalString$4(requestedAgentId) ?? readOptionalString$4(sourceRecord?.agentId) ?? BUILTIN_MAIN_AGENT_ID;
-		const sessionId = buildSessionId();
+		const sessionId = readOptionalString$4(requestedSessionId) ?? buildSessionId();
 		const record = {
 			sessionId,
 			...agentId ? { agentId } : {},
@@ -4094,12 +3880,12 @@ function parseSkillFrontmatter(raw) {
 	const summaryI18n = readLocalizedTextMap(parsed, "summaryi18n", "summary_i18n");
 	const descriptionI18n = readLocalizedTextMap(parsed, "descriptioni18n", "description_i18n");
 	return {
-		name: readString$3(parsed, "name"),
-		summary: readString$3(parsed, "summary"),
-		summaryI18n: mergeLocalizedTextMap(summaryI18n, { zh: readString$3(parsed, "summaryzh", "summary_zh") }),
-		description: readString$3(parsed, "description"),
-		descriptionI18n: mergeLocalizedTextMap(descriptionI18n, { zh: readString$3(parsed, "descriptionzh", "description_zh") }),
-		author: readString$3(parsed, "author"),
+		name: readString$4(parsed, "name"),
+		summary: readString$4(parsed, "summary"),
+		summaryI18n: mergeLocalizedTextMap(summaryI18n, { zh: readString$4(parsed, "summaryzh", "summary_zh") }),
+		description: readString$4(parsed, "description"),
+		descriptionI18n: mergeLocalizedTextMap(descriptionI18n, { zh: readString$4(parsed, "descriptionzh", "description_zh") }),
+		author: readString$4(parsed, "author"),
 		tags: readTags(parsed)
 	};
 }
@@ -4126,7 +3912,7 @@ function parseYamlFrontmatter(raw) {
 		throw new Error(`Invalid SKILL.md frontmatter: ${message}`);
 	}
 }
-function readString$3(record, ...names) {
+function readString$4(record, ...names) {
 	const value = readValue(record, names);
 	return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
@@ -4279,14 +4065,9 @@ const RUNTIME_METADATA_KEYS = [
 	"session_type",
 	"runtime_type"
 ];
-function isDurableSessionEvent(event) {
+function isDurableSessionEvent$1(event) {
 	return event.type !== NcpEventType.ContextWindowUpdated;
 }
-function readEventSessionId$1(event) {
-	const payload = "payload" in event ? event.payload : null;
-	if (!payload || typeof payload !== "object") return null;
-	return "sessionId" in payload && typeof payload.sessionId === "string" ? payload.sessionId : null;
-}
 function pickRuntimeMetadataPatch(current, next) {
 	const patch = {};
 	for (const key of RUNTIME_METADATA_KEYS) {
@@ -4341,29 +4122,6 @@ var SessionRunManager = class {
 			status: "idle"
 		});
 	};
-	streamSessionEvents = (payload, options) => {
-		this.assertNotDisposed();
-		const signal = options?.signal ?? new AbortController().signal;
-		const queue = new AsyncEventQueue();
-		const stop = () => queue.close();
-		const unsubscribe = this.eventBus.on(eventKeys.ncpEvent, (event) => {
-			if (readEventSessionId$1(event) === payload.sessionId) queue.push(event);
-		});
-		signal.addEventListener("abort", stop, { once: true });
-		if (signal.aborted) stop();
-		return (async function* () {
-			try {
-				for await (const event of queue.iterate()) {
-					if (signal.aborted) break;
-					yield event;
-				}
-			} finally {
-				unsubscribe();
-				signal.removeEventListener("abort", stop);
-				queue.close();
-			}
-		})();
-	};
 	updateToolCallResult = async ({ result, sessionId, toolCallId }) => {
 		this.assertNotDisposed();
 		const normalizedSessionId = sessionId.trim();
@@ -4442,7 +4200,7 @@ var SessionRunManager = class {
 		});
 	};
 	persistLiveSessionEvent = async (session, event) => {
-		if (!isDurableSessionEvent(event)) return;
+		if (!isDurableSessionEvent$1(event)) return;
 		await this.ncpSessionManager.appendSessionEvent({
 			sessionId: session.sessionId,
 			event
@@ -5018,14 +4776,15 @@ function waitForAgentRuntimeSessionReply(input) {
 	let acceptedMessageId = null;
 	const completedMessagesById = /* @__PURE__ */ new Map();
 	let unsubscribe = () => void 0;
+	const acceptMessageId = (messageId) => {
+		acceptedMessageId = messageId;
+		input.onAccepted(messageId);
+	};
 	const promise = new Promise((resolve, reject) => {
 		unsubscribe = input.eventBus.on(eventKeys.ncpEvent, (event) => {
 			switch (event.type) {
 				case NcpEventType.MessageAccepted:
-					if (event.payload.correlationId === input.requestId) {
-						acceptedMessageId = event.payload.messageId;
-						input.onAccepted(event.payload.messageId);
-					}
+					if (event.payload.correlationId === input.requestId) acceptMessageId(event.payload.messageId);
 					return;
 				case NcpEventType.MessageCompleted:
 					if (event.payload.correlationId === input.requestId || event.payload.message.id === acceptedMessageId) {
@@ -5037,8 +4796,7 @@ function waitForAgentRuntimeSessionReply(input) {
 					return;
 				case NcpEventType.RunFinished:
 					if ((event.payload.correlationId === input.requestId || event.payload.messageId === acceptedMessageId) && event.payload.messageId) {
-						acceptedMessageId = event.payload.messageId;
-						input.onAccepted(event.payload.messageId);
+						acceptMessageId(event.payload.messageId);
 						const completedMessage = completedMessagesById.get(event.payload.messageId);
 						if (completedMessage) {
 							unsubscribe();
@@ -5112,132 +4870,854 @@ function createAgentRuntimeSessionRequestDispatcher(options) {
 	} };
 }
 //#endregion
-//#region src/features/narp-runtime/services/builtin-narp-runtime-provider.service.ts
-const NARP_API_MODE_HEADER = "x-nextclaw-narp-api-mode";
-const NARP_HTTP_RUNTIME_KIND = "narp-http";
-const NARP_STDIO_RUNTIME_KIND = "narp-stdio";
-const BUILTIN_PROVIDER_REGISTRY = new ProviderRegistry(BUILTIN_PROVIDER_PLUGINS);
-function readRecord(value) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return;
-	return value;
-}
-function readString$2(value) {
-	if (typeof value !== "string") return;
-	return value.trim() || void 0;
-}
-function resolveEntryIcon(entry) {
-	return entry.icon ?? null;
-}
-function resolveRequestedModel(params) {
-	const { configuredModel, defaultModel, input, sessionMetadata } = params;
-	const runMetadata = readRecord(input.metadata);
-	return readString$2(runMetadata?.preferred_model) ?? readString$2(runMetadata?.preferredModel) ?? readString$2(runMetadata?.model) ?? readString$2(sessionMetadata.preferred_model) ?? readString$2(sessionMetadata.preferredModel) ?? readString$2(sessionMetadata.model) ?? configuredModel ?? defaultModel;
+//#region src/features/agent-run/managers/agent-run-context-compaction.manager.ts
+var AgentRunContextCompactionManager = class {
+	preflightService;
+	constructor(configManager, providerManager, sessionRepository) {
+		this.sessionRepository = sessionRepository;
+		this.preflightService = new ContextCompactionPreflightService({
+			configManager,
+			providerManager
+		});
+	}
+	runPreflight = async (input) => {
+		const beginResult = this.preflightService.begin({
+			inputMessages: [],
+			requestMetadata: input.metadata,
+			sessionId: input.sessionId,
+			sessionMessages: input.messages,
+			storedAgentId: input.agentId,
+			storedMetadata: input.metadata
+		});
+		const events = await this.toEvents(input.sessionId, beginResult);
+		if (!beginResult.pendingCompaction) return events;
+		const finishResult = await this.preflightService.finish(beginResult.pendingCompaction);
+		return [...events, ...await this.toEvents(input.sessionId, finishResult)];
+	};
+	toEvents = async (sessionId, result) => {
+		if (Object.keys(result.metadataPatch).length > 0) await this.sessionRepository.patchSessionMetadata(sessionId, result.metadataPatch);
+		if (!result.timelineMessage) return [];
+		return [{
+			type: NcpEventType.MessageSent,
+			payload: {
+				sessionId,
+				message: result.timelineMessage
+			}
+		}];
+	};
+};
+//#endregion
+//#region src/features/agent-run/managers/agent-run-request.manager.ts
+function toAgentRunRequest(envelope) {
+	const metadata = envelope.metadata ?? {};
+	const requestMetadata = {
+		agentRuntimeId: metadata.agentRuntimeId,
+		agentId: metadata.agentId,
+		projectRoot: metadata.projectRoot,
+		channel: metadata.channel,
+		correlationId: envelope.correlationId,
+		metadata: structuredClone(metadata),
+		model: metadata.model,
+		maxTokens: metadata.maxTokens,
+		thinkingEffort: metadata.thinkingEffort
+	};
+	if (Array.isArray(envelope.content)) return {
+		...requestMetadata,
+		sessionId: envelope.sessionId,
+		message: {
+			sessionId: envelope.sessionId ?? "",
+			id: `user-message-${randomUUID()}`,
+			role: "user",
+			status: "final",
+			timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+			parts: structuredClone(envelope.content)
+		}
+	};
+	const sourceMessage = envelope.message;
+	if (!sourceMessage) throw new Error("Invalid agent run send request.");
+	const messageSessionId = sourceMessage.sessionId;
+	const message = {
+		...sourceMessage,
+		sessionId: messageSessionId ?? envelope.sessionId ?? "",
+		id: sourceMessage.id ?? `user-message-${randomUUID()}`,
+		role: sourceMessage.role ?? "user",
+		status: sourceMessage.status ?? "final",
+		timestamp: sourceMessage.timestamp ?? (/* @__PURE__ */ new Date()).toISOString(),
+		parts: structuredClone(sourceMessage.parts)
+	};
+	return {
+		...requestMetadata,
+		sessionId: envelope.sessionId ?? messageSessionId,
+		message
+	};
 }
-function resolveProviderApiMode(resolution) {
-	const wireApi = resolution.provider?.wireApi?.trim().toLowerCase();
-	if (wireApi === "responses") return "codex_responses";
-	if (wireApi === "chat") return "chat_completions";
-	const providerName = resolution.providerName?.trim().toLowerCase();
-	const apiBase = resolution.apiBase?.trim().toLowerCase() ?? "";
-	if (providerName === "anthropic" || apiBase.includes("anthropic.com")) return "anthropic_messages";
-	return "chat_completions";
+function toSessionMessageRequest(payload) {
+	return {
+		sessionId: payload.sessionId,
+		message: {
+			...payload.message,
+			sessionId: payload.sessionId
+		},
+		correlationId: payload.requestId
+	};
 }
-function buildProviderRoute(params) {
-	const model = resolveRequestedModel(params);
-	if (!model) return;
-	const resolution = resolveProviderRuntime(params.config, model);
-	if (!resolution.provider) return;
-	const apiBase = resolution.apiBase ?? (resolution.providerName ? BUILTIN_PROVIDER_REGISTRY.findProviderByName(resolution.providerName)?.defaultApiBase ?? null : null);
+function toRunHandle(accepted) {
 	return {
-		model: resolution.providerLocalModel,
-		apiKey: resolution.apiKey,
-		apiBase,
-		headers: {
-			...resolution.provider.extraHeaders ?? {},
-			[NARP_API_MODE_HEADER]: resolveProviderApiMode(resolution)
-		}
+		sessionId: accepted.sessionId,
+		userMessageId: accepted.userMessageId,
+		assistantMessageId: null,
+		runId: accepted.runId,
+		correlationId: accepted.correlationId
 	};
 }
-var BuiltinHttpRuntimeSessionTypeService = class {
-	pendingDescribeByMode = /* @__PURE__ */ new Map();
-	constructor(entry, defaultModel) {
-		this.entry = entry;
-		this.defaultModel = defaultModel;
+function findCompletedAssistantMessage(messages, messageId) {
+	return [...messages].reverse().find((message) => message.role === "assistant" && message.status === "final" && (!messageId || message.id === messageId)) ?? null;
+}
+var AgentRunRequestManager$1 = class {
+	cleanups = [];
+	started = false;
+	constructor(agentRuntimeManager, configManager, contextProviderManager, eventBus, ingress, sessionRepository, sessionRunManager, toolProviderManager) {
+		this.agentRuntimeManager = agentRuntimeManager;
+		this.configManager = configManager;
+		this.contextProviderManager = contextProviderManager;
+		this.eventBus = eventBus;
+		this.ingress = ingress;
+		this.sessionRepository = sessionRepository;
+		this.sessionRunManager = sessionRunManager;
+		this.toolProviderManager = toolProviderManager;
 	}
-	describe = async (describeParams) => {
-		const describeMode = describeParams?.describeMode === "probe" ? "probe" : "observation";
-		const pending = this.pendingDescribeByMode.get(describeMode);
-		if (pending) return await pending;
-		const nextDescribe = this.describeInternal();
-		this.pendingDescribeByMode.set(describeMode, nextDescribe);
-		try {
-			return await nextDescribe;
-		} finally {
-			this.pendingDescribeByMode.delete(describeMode);
-		}
+	start = () => {
+		if (this.started) return;
+		this.started = true;
+		this.cleanups.push(this.ingress.addHandler(ingressKeys.agentRun.send, this.handleSendRequest), this.ingress.addHandler(ingressKeys.agentRun.abort, this.handleAbortRequest), this.ingress.addHandler(ingressKeys.agentRun.sessionMessageRequest, this.handleSessionMessageRequest));
 	};
-	describeInternal = async () => {
-		const config = new HttpRuntimeConfigResolver(this.entry.config ?? {}).resolve({ defaultModel: this.defaultModel });
-		if (!config.baseUrl) return {
-			icon: resolveEntryIcon(this.entry),
-			ready: false,
-			reason: "base_url_missing",
-			reasonMessage: "Configure the runtime entry baseUrl before starting an HTTP runtime session.",
-			recommendedModel: config.recommendedModel ?? null,
-			cta: {
-				kind: "settings",
-				label: "Configure HTTP Runtime"
-			}
+	dispose = () => {
+		while (this.cleanups.length > 0) this.cleanups.pop()?.();
+		this.started = false;
+	};
+	handleSendRequest = async (envelope) => {
+		if (!envelope.payload) throw new Error("Invalid agent run send request.");
+		return toRunHandle(await this.send(toAgentRunRequest(envelope.payload)));
+	};
+	handleAbortRequest = async (envelope) => {
+		if (!envelope.payload?.sessionId) throw new Error("Invalid agent run abort request.");
+		await this.abort({ sessionId: envelope.payload.sessionId });
+	};
+	handleSessionMessageRequest = async (envelope) => {
+		if (!envelope.payload) throw new Error("Invalid agent run session message request.");
+		return toRunHandle(await this.send(toSessionMessageRequest(envelope.payload)));
+	};
+	send = async (request) => {
+		const session = await this.sessionRepository.getOrCreateSession({
+			sessionId: request.sessionId,
+			agentId: request.agentId,
+			agentRuntimeId: request.agentRuntimeId,
+			channel: request.channel,
+			metadata: request.metadata,
+			model: request.model,
+			projectRoot: request.projectRoot,
+			task: readMessageTask(request.message),
+			thinkingEffort: request.thinkingEffort
+		});
+		const sessionRun = this.sessionRunManager.getSessionRun(session.sessionId) ?? await this.sessionRunManager.createSessionRun(session.sessionId);
+		const message = {
+			...request.message,
+			sessionId: session.sessionId
 		};
-		if (!((config.capabilityProbe ?? true) && Boolean(config.healthcheckUrl))) return {
-			icon: resolveEntryIcon(this.entry),
-			ready: true,
-			reason: null,
-			reasonMessage: null,
-			recommendedModel: config.recommendedModel ?? null,
-			...config.supportedModels ? { supportedModels: config.supportedModels } : {},
-			cta: null
+		const providerRequest = {
+			...request,
+			sessionId: session.sessionId,
+			message
 		};
-		const controller = new AbortController();
-		const timeoutMs = config.healthcheckTimeoutMs ?? 3e3;
-		const timeout = setTimeout(() => controller.abort(), timeoutMs);
-		try {
-			const response = await fetch(config.healthcheckUrl ?? "", {
-				method: "GET",
-				headers: config.headers,
-				signal: controller.signal
+		sessionRun.inbox.enqueue(message);
+		const activeRun = sessionRun.beginRun();
+		const model = request.model ?? session.model ?? this.configManager.getDefaultModel();
+		const agentId = request.agentId ?? session.agentId ?? resolveDefaultAgentProfileId(this.configManager.loadConfig());
+		const spec = {
+			runId: activeRun.runId,
+			agentId,
+			model,
+			maxTokens: request.maxTokens ?? this.configManager.getModelMaxTokens(model),
+			thinkingEffort: request.thinkingEffort ?? session.thinkingEffort ?? null,
+			correlationId: request.correlationId
+		};
+		const runtime = this.agentRuntimeManager.getOrCreate({
+			agentRuntimeId: session.agentRuntimeId,
+			session,
+			sessionRun
+		});
+		const contextBlocks = await this.contextProviderManager.buildContext(providerRequest);
+		const tools = await this.toolProviderManager.buildTools(providerRequest);
+		let messageCompletedSeen = false;
+		lastValueFrom(from(runtime.run(spec, {
+			contextBlocks,
+			sessionRun,
+			signal: activeRun.signal,
+			tools
+		})).pipe(tap((event) => {
+			const eventsToPublish = [];
+			if (event.type === NcpEventType.MessageCompleted) messageCompletedSeen = true;
+			if (event.type === NcpEventType.RunFinished && !messageCompletedSeen) {
+				const message = findCompletedAssistantMessage(sessionRun.getSnapshot().messages, event.payload.messageId);
+				if (!message) throw new Error(`Run finished without a final assistant message for session "${session.sessionId}".`);
+				eventsToPublish.push({
+					type: NcpEventType.MessageCompleted,
+					payload: {
+						sessionId: event.payload.sessionId ?? session.sessionId,
+						message,
+						correlationId: event.payload.correlationId
+					}
+				});
+				messageCompletedSeen = true;
+			}
+			eventsToPublish.push(event);
+			for (const eventToPublish of eventsToPublish) this.eventBus.emit(eventKeys.ncpEvent, eventToPublish, {
+				emittedAt: (/* @__PURE__ */ new Date()).toISOString(),
+				source: "agent-run-request"
 			});
-			if (!response.ok) return {
-				icon: resolveEntryIcon(this.entry),
-				ready: false,
-				reason: "healthcheck_failed",
-				reasonMessage: `HTTP runtime healthcheck returned HTTP ${response.status}.`,
-				recommendedModel: config.recommendedModel ?? null,
-				...config.supportedModels ? { supportedModels: config.supportedModels } : {},
-				cta: null
-			};
-			return {
-				icon: resolveEntryIcon(this.entry),
-				ready: true,
-				reason: null,
-				reasonMessage: null,
-				recommendedModel: config.recommendedModel ?? null,
-				...config.supportedModels ? { supportedModels: config.supportedModels } : {},
-				cta: null
-			};
-		} catch (error) {
-			return {
-				icon: resolveEntryIcon(this.entry),
-				ready: false,
-				reason: "healthcheck_unreachable",
-				reasonMessage: error instanceof Error ? error.message : "Failed to reach the configured HTTP runtime healthcheck.",
-				recommendedModel: config.recommendedModel ?? null,
-				...config.supportedModels ? { supportedModels: config.supportedModels } : {},
-				cta: null
+		}), catchError(async (error) => {
+			const event = {
+				type: NcpEventType.RunError,
+				payload: {
+					error: error instanceof Error ? error.message : String(error),
+					runId: spec.runId,
+					sessionId: session.sessionId,
+					correlationId: spec.correlationId
+				}
 			};
-		} finally {
-			clearTimeout(timeout);
-		}
+			await sessionRun.applyEvents([event]);
+			this.eventBus.emit(eventKeys.ncpEvent, event, {
+				emittedAt: (/* @__PURE__ */ new Date()).toISOString(),
+				source: "agent-run-request"
+			});
+		})), { defaultValue: void 0 });
+		return {
+			sessionId: session.sessionId,
+			userMessageId: message.id,
+			runId: spec.runId,
+			correlationId: request.correlationId
+		};
+	};
+	abort = async (request) => {
+		this.sessionRunManager.getSessionRun(request.sessionId)?.abortRun(request.runId);
+	};
+};
+//#endregion
+//#region src/features/agent-run/managers/agent-runtime.manager.ts
+var AgentRuntimeManager$1 = class {
+	providers = /* @__PURE__ */ new Map();
+	entries = /* @__PURE__ */ new Map();
+	globalRuntimes = /* @__PURE__ */ new Map();
+	sessionRuntimes = /* @__PURE__ */ new Map();
+	register = (registration) => {
+		const kind = this.normalizeId(registration.kind);
+		if (this.providers.has(kind)) throw new Error(`Agent runtime provider is already registered: ${kind}`);
+		const normalizedRegistration = {
+			...registration,
+			kind
+		};
+		this.providers.set(kind, normalizedRegistration);
+		return async () => {
+			if (this.providers.get(kind) !== normalizedRegistration) return;
+			this.providers.delete(kind);
+			await this.disposeAllRuntimes();
+		};
+	};
+	applyEntries = (entries) => {
+		this.entries.clear();
+		for (const entry of entries) this.entries.set(this.normalizeId(entry.id), {
+			...entry,
+			id: this.normalizeId(entry.id),
+			type: this.normalizeId(entry.type)
+		});
+	};
+	getOrCreate = (params) => {
+		const { agentRuntimeId, session, sessionRun } = params;
+		const entry = this.getEntry(agentRuntimeId);
+		const provider = this.getProvider(entry.type);
+		const reuseScope = this.resolveReuseScope(entry, provider);
+		const cacheKey = reuseScope === "global" ? entry.id : `${entry.id}:${session.sessionId}`;
+		const cache = reuseScope === "global" ? this.globalRuntimes : this.sessionRuntimes;
+		const existing = cache.get(cacheKey);
+		if (existing) return existing;
+		const agentRuntime = provider.createRuntime({
+			entry,
+			session,
+			sessionRun
+		});
+		cache.set(cacheKey, agentRuntime);
+		return agentRuntime;
+	};
+	listSessionTypes = async (_params) => {
+		const entries = [...this.entries.values()].filter((entry) => entry.enabled !== false);
+		const options = await Promise.all(entries.map(async (entry) => {
+			const provider = this.providers.get(entry.type);
+			const descriptor = provider?.describeSessionTypeForEntry ? await provider.describeSessionTypeForEntry({
+				entry,
+				describeParams: _params
+			}) : null;
+			return {
+				value: entry.id,
+				label: entry.label,
+				icon: descriptor?.icon ?? entry.icon ?? null,
+				ready: provider ? descriptor?.ready ?? true : false,
+				reason: provider ? descriptor?.reason ?? null : "runtime_provider_unavailable",
+				reasonMessage: provider ? descriptor?.reasonMessage ?? null : `Runtime provider unavailable for type "${entry.type}".`,
+				recommendedModel: descriptor?.recommendedModel ?? null,
+				cta: descriptor?.cta ?? null,
+				...descriptor?.supportedModels ? { supportedModels: descriptor.supportedModels } : {}
+			};
+		}));
+		return {
+			defaultType: this.entries.has("native") ? DEFAULT_AGENT_RUNTIME_ENTRY_ID : entries[0]?.id ?? "native",
+			options
+		};
+	};
+	dispose = async () => {
+		await this.disposeAllRuntimes();
+		this.providers.clear();
+		this.entries.clear();
+	};
+	normalizeId = (agentRuntimeId) => {
+		const normalizedId = agentRuntimeId.trim();
+		if (!normalizedId) throw new Error("Agent runtime id is required.");
+		return normalizedId;
+	};
+	getEntry = (agentRuntimeId) => {
+		const normalizedId = this.normalizeId(agentRuntimeId);
+		const entry = this.entries.get(normalizedId);
+		if (!entry || entry.enabled === false) throw new Error(`Agent runtime entry is not registered: ${normalizedId}`);
+		return entry;
+	};
+	getProvider = (kind) => {
+		const provider = this.providers.get(this.normalizeId(kind));
+		if (!provider) throw new Error(`Agent runtime provider is not registered: ${kind}`);
+		return provider;
+	};
+	resolveReuseScope = (entry, provider) => {
+		return entry.config?.reuseScope === "session" || entry.config?.reuseScope === "global" ? entry.config.reuseScope : provider.defaultReuseScope;
+	};
+	disposeAllRuntimes = async () => {
+		for (const runtime of [...this.globalRuntimes.values(), ...this.sessionRuntimes.values()]) await runtime.dispose?.();
+		this.globalRuntimes.clear();
+		this.sessionRuntimes.clear();
+	};
+};
+//#endregion
+//#region src/features/agent-run/managers/context-provider.manager.ts
+var ContextProviderManager = class {
+	providers = /* @__PURE__ */ new Set();
+	register = (provider) => {
+		this.providers.add(provider);
+		return () => {
+			this.providers.delete(provider);
+		};
+	};
+	buildContext = async (request) => {
+		const blocks = [];
+		for (const provider of [...this.providers]) blocks.push(...await provider.provide(request));
+		return blocks;
+	};
+	dispose = () => {
+		this.providers.clear();
+	};
+};
+//#endregion
+//#region src/features/agent-run/managers/session-run.manager.ts
+var MessageInbox = class {
+	messages = [];
+	enqueue = (message) => {
+		this.messages.push(message);
+	};
+	drain = () => {
+		return this.messages.splice(0, this.messages.length);
+	};
+	isEmpty = () => this.messages.length === 0;
+};
+function isConversationStateEvent(event) {
+	return event.type !== NcpEventType.ContextWindowUpdated;
+}
+var SessionRun = class {
+	inbox = new MessageInbox();
+	sessionId;
+	activeRunId = null;
+	activeRunController = null;
+	constructor(seed, stateManager = new DefaultNcpAgentConversationStateManager()) {
+		this.stateManager = stateManager;
+		this.sessionId = seed.sessionId;
+		this.stateManager.hydrate({
+			sessionId: seed.sessionId,
+			messages: seed.messages
+		});
+	}
+	getSnapshot = () => {
+		const snapshot = this.stateManager.getSnapshot();
+		return { messages: snapshot.streamingMessage ? [...snapshot.messages, snapshot.streamingMessage] : snapshot.messages };
+	};
+	applyEvents = async (events) => {
+		this.applyRunEvents(events);
+		const conversationEvents = events.filter(isConversationStateEvent);
+		if (conversationEvents.length > 0) await this.stateManager.dispatchBatch(conversationEvents);
+	};
+	beginRun = () => {
+		if (this.activeRunId) throw new Error(`Session ${this.sessionId} already has an active run.`);
+		const runId = `agent-run-${randomUUID()}`;
+		const controller = new AbortController();
+		this.activeRunId = runId;
+		this.activeRunController = controller;
+		return {
+			runId,
+			signal: controller.signal
+		};
+	};
+	abortRun = (runId) => {
+		if (!this.activeRunId || !this.activeRunController) return false;
+		if (runId && this.activeRunId !== runId) return false;
+		this.activeRunController.abort();
+		return true;
+	};
+	dispose = () => {
+		this.activeRunController?.abort();
+		this.activeRunController = null;
+		this.activeRunId = null;
+	};
+	applyRunEvents = (events) => {
+		for (const event of events) {
+			if (event.type === NcpEventType.RunStarted && event.payload.runId) this.activeRunId = event.payload.runId;
+			if (event.type === NcpEventType.MessageAbort || (event.type === NcpEventType.RunFinished || event.type === NcpEventType.RunError) && (!event.payload.runId || event.payload.runId === this.activeRunId)) {
+				this.activeRunId = null;
+				this.activeRunController = null;
+			}
+		}
+	};
+};
+var SessionRunManager$1 = class {
+	runs = /* @__PURE__ */ new Map();
+	constructor(sessionRepository) {
+		this.sessionRepository = sessionRepository;
+	}
+	getSessionRun = (sessionId) => this.runs.get(sessionId) ?? null;
+	createSessionRun = async (sessionId) => {
+		if (this.runs.has(sessionId)) throw new Error(`Session run already exists: ${sessionId}`);
+		const run = new SessionRun({
+			messages: await this.sessionRepository.listSessionMessages(sessionId),
+			sessionId
+		});
+		this.runs.set(sessionId, run);
+		return run;
+	};
+	deleteSessionRun = (sessionId) => {
+		const run = this.runs.get(sessionId);
+		if (!run) return false;
+		run.dispose();
+		return this.runs.delete(sessionId);
+	};
+	dispose = () => {
+		for (const run of this.runs.values()) run.dispose();
+		this.runs.clear();
+	};
+};
+//#endregion
+//#region src/features/agent-run/managers/tool-provider.manager.ts
+var ToolProviderManager = class {
+	providers = /* @__PURE__ */ new Set();
+	register = (provider) => {
+		this.providers.add(provider);
+		return () => {
+			this.providers.delete(provider);
+		};
+	};
+	buildTools = async (request) => {
+		const tools = [];
+		for (const provider of [...this.providers]) tools.push(...await provider.provide(request));
+		return tools;
+	};
+	dispose = () => {
+		this.providers.clear();
+	};
+};
+//#endregion
+//#region src/features/agent-run/repositories/session.repository.ts
+function readString$3(value) {
+	return (typeof value === "string" ? value.trim() : "") || void 0;
+}
+function readEventSessionId$1(event) {
+	return "payload" in event && "sessionId" in event.payload ? readString$3(event.payload.sessionId) : void 0;
+}
+function isDurableSessionEvent(event) {
+	return event.type !== NcpEventType.ContextWindowUpdated;
+}
+function readThinkingEffort(metadata) {
+	return readString$3(metadata?.thinkingEffort) ?? null;
+}
+function readProjectRoot(metadata) {
+	return readString$3(metadata?.project_root) ?? readString$3(metadata?.projectRoot);
+}
+var SessionRepository = class {
+	cleanups = [];
+	started = false;
+	constructor(eventBus, ncpSessionManager) {
+		this.eventBus = eventBus;
+		this.ncpSessionManager = ncpSessionManager;
+	}
+	start = () => {
+		if (this.started) return;
+		this.started = true;
+		this.cleanups.push(this.eventBus.on(eventKeys.ncpEvent, async (event) => {
+			const sessionId = readEventSessionId$1(event);
+			if (!sessionId || !isDurableSessionEvent(event)) return;
+			await this.appendSessionEvent(sessionId, event);
+		}));
+	};
+	dispose = () => {
+		while (this.cleanups.length > 0) this.cleanups.pop()?.();
+		this.started = false;
+	};
+	getSession = async (sessionId) => {
+		const record = await this.ncpSessionManager.getSessionRecord(sessionId);
+		if (!record) throw new Error(`Session not found: ${sessionId}`);
+		const agentRuntimeId = readString$3(record.metadata?.agentRuntimeId) ?? "native";
+		const model = readString$3(record.metadata?.model);
+		return {
+			sessionId: record.sessionId,
+			agentId: record.agentId,
+			agentRuntimeId,
+			metadata: structuredClone(record.metadata ?? {}),
+			model,
+			projectRoot: readProjectRoot(record.metadata),
+			thinkingEffort: readThinkingEffort(record.metadata)
+		};
+	};
+	createSession = async (params) => {
+		const { agentId, agentRuntimeId: requestedAgentRuntimeId, channel, metadata, model, projectRoot, sessionId, task, thinkingEffort } = params;
+		const agentRuntimeId = requestedAgentRuntimeId ?? "native";
+		const created = await this.ncpSessionManager.createSession({
+			sourceSessionMetadata: {},
+			sessionId,
+			task: task ?? "Session",
+			agentId,
+			metadataOverrides: {
+				...structuredClone(metadata ?? {}),
+				agentRuntimeId,
+				channel
+			},
+			model,
+			projectRoot,
+			runtime: agentRuntimeId,
+			sessionType: agentRuntimeId,
+			thinkingLevel: thinkingEffort ?? void 0
+		});
+		return {
+			sessionId: created.sessionId,
+			agentId,
+			agentRuntimeId,
+			metadata: structuredClone(created.metadata ?? {}),
+			model,
+			projectRoot,
+			thinkingEffort: thinkingEffort ?? null
+		};
+	};
+	getOrCreateSession = async (params) => {
+		if (!params.sessionId) return await this.createSession(params);
+		if (await this.ncpSessionManager.getSessionRecord(params.sessionId)) return await this.getSession(params.sessionId);
+		return await this.createSession(params);
+	};
+	listSessionMessages = async (sessionId) => {
+		return await this.ncpSessionManager.listSessionMessages(sessionId);
+	};
+	patchSessionMetadata = async (sessionId, patch) => {
+		if (!await this.ncpSessionManager.updateSessionMetadata(sessionId, patch)) throw new Error(`Session metadata was not updated: ${sessionId}`);
+	};
+	appendSessionEvent = async (sessionId, event) => {
+		await this.ncpSessionManager.appendSessionEvent({
+			event,
+			sessionId
+		});
+	};
+};
+//#endregion
+//#region src/features/agent-run/services/agent-run-message-projector.service.ts
+var AgentRunMessageProjector = class {
+	project = (params) => projectNcpMessagesWithContextCompaction({
+		sessionId: params.sessionId,
+		sessionMessages: params.messages
+	});
+};
+//#endregion
+//#region src/features/agent-run/services/agent-run-model-input-budgeter.service.ts
+var AgentRunModelInputBudgeter = class {
+	inputBudgetPruner = new InputBudgetPruner();
+	constructor(configManager) {
+		this.configManager = configManager;
+	}
+	prune = async (params) => {
+		const config = this.configManager.loadConfig();
+		const defaultAgentId = resolveDefaultAgentProfileId(config);
+		const profile = findEffectiveAgentProfile(config, params.spec.agentId) ?? findEffectiveAgentProfile(config, defaultAgentId);
+		const contextTokens = profile?.contextTokens ?? config.agents.defaults.contextTokens;
+		const reservedContextTokens = ContextWindowBudgetService.resolveReservedContextTokens({
+			contextTokens,
+			configuredReservedContextTokens: profile?.reservedContextTokens ?? config.agents.defaults.reservedContextTokens
+		});
+		const pruned = this.inputBudgetPruner.prune({
+			messages: params.messages.map((message) => ({ ...message })),
+			contextTokens,
+			reserveTokensFloor: reservedContextTokens,
+			softThresholdTokens: 0
+		});
+		return {
+			...pruned,
+			messages: pruned.messages
+		};
+	};
+};
+//#endregion
+//#region src/features/agent-run/services/agent-run-model-input-builder.service.ts
+var AgentRunModelInputBuilder = class {
+	constructor(messageProjector, modelInputBudgeter, assetStore = null) {
+		this.messageProjector = messageProjector;
+		this.modelInputBudgeter = modelInputBudgeter;
+		this.assetStore = assetStore;
+	}
+	build = async (request) => {
+		const contextContent = request.contextBlocks.map((block) => block.trim()).filter(Boolean).join("\n\n");
+		const contextMessages = contextContent ? [{
+			role: "system",
+			content: contextContent
+		}] : [];
+		const conversationMessages = this.messageProjector.project({
+			sessionId: request.sessionId,
+			messages: request.messages
+		}).flatMap((message) => ncpMessageToOpenAiMessages(message, { assetStore: this.assetStore }));
+		const pruned = await this.modelInputBudgeter.prune({
+			spec: request.spec,
+			messages: [...contextMessages, ...conversationMessages]
+		});
+		const tools = request.tools.map((tool) => buildOpenAiFunctionTool({
+			name: tool.name,
+			description: tool.description,
+			parameters: tool.parameters
+		}));
+		return {
+			messages: pruned.messages,
+			tools: tools.length > 0 ? tools : void 0,
+			model: request.spec.model,
+			thinkingLevel: request.spec.thinkingEffort ?? null,
+			max_tokens: request.spec.maxTokens
+		};
+	};
+};
+//#endregion
+//#region src/features/agent-run/services/ncp-agent-runtime-wrapper.service.ts
+var NcpAgentRuntimeWrapper = class {
+	stateManager = new DefaultNcpAgentConversationStateManager();
+	runtime = null;
+	currentTools = [];
+	constructor(params) {
+		this.params = params;
+	}
+	run = async function* (spec, options) {
+		const { sessionRun, tools } = options;
+		this.currentTools = tools.map(this.toOpenAiTool);
+		const messages = sessionRun.inbox.drain();
+		for (const event of this.toMessageSentEvents(messages, spec, sessionRun.sessionId)) yield await this.applyEvent(sessionRun, event);
+		const input = {
+			sessionId: sessionRun.sessionId,
+			runId: spec.runId,
+			messages,
+			correlationId: spec.correlationId,
+			metadata: this.buildMetadata(spec)
+		};
+		for await (const event of this.getRuntime().run(input, { signal: options.signal })) yield await this.applyEvent(sessionRun, event);
+		this.currentTools = [];
+	};
+	dispose = async () => {
+		if (this.runtime && "dispose" in this.runtime && typeof this.runtime.dispose === "function") await this.runtime.dispose();
+		this.runtime = null;
+		this.currentTools = [];
+	};
+	getRuntime = () => {
+		if (!this.runtime) this.runtime = this.params.createRuntime({
+			resolveTools: () => this.currentTools,
+			stateManager: this.stateManager
+		});
+		return this.runtime;
+	};
+	toMessageSentEvents = (messages, spec, sessionId) => messages.map((message) => ({
+		type: NcpEventType.MessageSent,
+		payload: {
+			sessionId,
+			message,
+			correlationId: spec.correlationId
+		}
+	}));
+	buildMetadata = (spec) => ({
+		...this.params.session.metadata,
+		agentId: spec.agentId,
+		agentRuntimeId: this.params.session.agentRuntimeId,
+		maxTokens: spec.maxTokens,
+		model: spec.model,
+		preferred_model: spec.model,
+		thinkingEffort: spec.thinkingEffort
+	});
+	toOpenAiTool = (tool) => buildOpenAiFunctionTool({
+		name: tool.name,
+		description: tool.description,
+		parameters: tool.parameters
+	});
+	applyEvent = async (sessionRun, event) => {
+		await sessionRun.applyEvents([event]);
+		return event;
+	};
+};
+//#endregion
+//#region src/features/agent-run/utils/agent-run-request-metadata.utils.ts
+function normalizeString(value) {
+	return value?.trim() || void 0;
+}
+function buildAgentRunRequestMetadata(params) {
+	const { request, session } = params;
+	const agentId = normalizeString(request.agentId ?? session?.agentId);
+	const projectRoot = normalizeString(request.projectRoot ?? session?.projectRoot);
+	const channel = normalizeString(request.channel);
+	const model = normalizeString(request.model ?? session?.model);
+	return {
+		...structuredClone(session?.metadata ?? {}),
+		agentId,
+		projectRoot,
+		project_root: projectRoot,
+		channel,
+		model,
+		thinkingEffort: request.thinkingEffort ?? session?.thinkingEffort
+	};
+}
+//#endregion
+//#region src/features/narp-runtime/services/builtin-narp-runtime-provider.service.ts
+const NARP_API_MODE_HEADER = "x-nextclaw-narp-api-mode";
+const NARP_HTTP_RUNTIME_KIND = "narp-http";
+const NARP_STDIO_RUNTIME_KIND = "narp-stdio";
+const BUILTIN_PROVIDER_REGISTRY = new ProviderRegistry(BUILTIN_PROVIDER_PLUGINS);
+function readRecord(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	return value;
+}
+function readString$2(value) {
+	if (typeof value !== "string") return;
+	return value.trim() || void 0;
+}
+function resolveEntryIcon(entry) {
+	return entry.icon ?? null;
+}
+function resolveRequestedModel(params) {
+	const { configuredModel, defaultModel, input, sessionMetadata } = params;
+	const runMetadata = readRecord(input.metadata);
+	return readString$2(runMetadata?.preferred_model) ?? readString$2(runMetadata?.preferredModel) ?? readString$2(runMetadata?.model) ?? readString$2(sessionMetadata.preferred_model) ?? readString$2(sessionMetadata.preferredModel) ?? readString$2(sessionMetadata.model) ?? configuredModel ?? defaultModel;
+}
+function resolveProviderApiMode(resolution) {
+	const wireApi = resolution.provider?.wireApi?.trim().toLowerCase();
+	if (wireApi === "responses") return "codex_responses";
+	if (wireApi === "chat") return "chat_completions";
+	const providerName = resolution.providerName?.trim().toLowerCase();
+	const apiBase = resolution.apiBase?.trim().toLowerCase() ?? "";
+	if (providerName === "anthropic" || apiBase.includes("anthropic.com")) return "anthropic_messages";
+	return "chat_completions";
+}
+function buildProviderRoute(params) {
+	const model = resolveRequestedModel(params);
+	if (!model) return;
+	const resolution = resolveProviderRuntime(params.config, model);
+	if (!resolution.provider) return;
+	const apiBase = resolution.apiBase ?? (resolution.providerName ? BUILTIN_PROVIDER_REGISTRY.findProviderByName(resolution.providerName)?.defaultApiBase ?? null : null);
+	return {
+		model: resolution.providerLocalModel,
+		apiKey: resolution.apiKey,
+		apiBase,
+		headers: {
+			...resolution.provider.extraHeaders ?? {},
+			[NARP_API_MODE_HEADER]: resolveProviderApiMode(resolution)
+		}
+	};
+}
+var BuiltinHttpRuntimeSessionTypeService = class {
+	pendingDescribeByMode = /* @__PURE__ */ new Map();
+	constructor(entry, defaultModel) {
+		this.entry = entry;
+		this.defaultModel = defaultModel;
+	}
+	describe = async (describeParams) => {
+		const describeMode = describeParams?.describeMode === "probe" ? "probe" : "observation";
+		const pending = this.pendingDescribeByMode.get(describeMode);
+		if (pending) return await pending;
+		const nextDescribe = this.describeInternal();
+		this.pendingDescribeByMode.set(describeMode, nextDescribe);
+		try {
+			return await nextDescribe;
+		} finally {
+			this.pendingDescribeByMode.delete(describeMode);
+		}
+	};
+	describeInternal = async () => {
+		const config = new HttpRuntimeConfigResolver(this.entry.config ?? {}).resolve({ defaultModel: this.defaultModel });
+		if (!config.baseUrl) return {
+			icon: resolveEntryIcon(this.entry),
+			ready: false,
+			reason: "base_url_missing",
+			reasonMessage: "Configure the runtime entry baseUrl before starting an HTTP runtime session.",
+			recommendedModel: config.recommendedModel ?? null,
+			cta: {
+				kind: "settings",
+				label: "Configure HTTP Runtime"
+			}
+		};
+		if (!((config.capabilityProbe ?? true) && Boolean(config.healthcheckUrl))) return {
+			icon: resolveEntryIcon(this.entry),
+			ready: true,
+			reason: null,
+			reasonMessage: null,
+			recommendedModel: config.recommendedModel ?? null,
+			...config.supportedModels ? { supportedModels: config.supportedModels } : {},
+			cta: null
+		};
+		const controller = new AbortController();
+		const timeoutMs = config.healthcheckTimeoutMs ?? 3e3;
+		const timeout = setTimeout(() => controller.abort(), timeoutMs);
+		try {
+			const response = await fetch(config.healthcheckUrl ?? "", {
+				method: "GET",
+				headers: config.headers,
+				signal: controller.signal
+			});
+			if (!response.ok) return {
+				icon: resolveEntryIcon(this.entry),
+				ready: false,
+				reason: "healthcheck_failed",
+				reasonMessage: `HTTP runtime healthcheck returned HTTP ${response.status}.`,
+				recommendedModel: config.recommendedModel ?? null,
+				...config.supportedModels ? { supportedModels: config.supportedModels } : {},
+				cta: null
+			};
+			return {
+				icon: resolveEntryIcon(this.entry),
+				ready: true,
+				reason: null,
+				reasonMessage: null,
+				recommendedModel: config.recommendedModel ?? null,
+				...config.supportedModels ? { supportedModels: config.supportedModels } : {},
+				cta: null
+			};
+		} catch (error) {
+			return {
+				icon: resolveEntryIcon(this.entry),
+				ready: false,
+				reason: "healthcheck_unreachable",
+				reasonMessage: error instanceof Error ? error.message : "Failed to reach the configured HTTP runtime healthcheck.",
+				recommendedModel: config.recommendedModel ?? null,
+				...config.supportedModels ? { supportedModels: config.supportedModels } : {},
+				cta: null
+			};
+		} finally {
+			clearTimeout(timeout);
+		}
 	};
 };
 var BuiltinStdioRuntimeSessionTypeService = class {
@@ -5356,6 +5836,7 @@ var BuiltinNarpRuntimeProviderService = class {
 			...resolvedConfig.basePath ? { basePath: resolvedConfig.basePath } : {},
 			...resolvedConfig.endpointId ? { endpointId: resolvedConfig.endpointId } : {},
 			...resolvedConfig.headers ? { headers: resolvedConfig.headers } : {},
+			resolveTools: runtimeParams.resolveTools,
 			stateManager: runtimeParams.stateManager,
 			resolveProviderRoute: (input) => buildProviderRoute({
 				config: this.configManager.loadConfig(),
@@ -5371,6 +5852,7 @@ var BuiltinNarpRuntimeProviderService = class {
 		return new StdioRuntimeNcpAgentRuntime({
 			...new StdioRuntimeConfigResolver(config).resolve(),
 			sessionId: runtimeParams.sessionId,
+			resolveTools: runtimeParams.resolveTools,
 			stateManager: runtimeParams.stateManager,
 			resolveProviderRoute: (input) => buildProviderRoute({
 				config: this.configManager.loadConfig(),
@@ -5383,36 +5865,457 @@ var BuiltinNarpRuntimeProviderService = class {
 	};
 };
 //#endregion
-//#region src/contributions/agent-runtime/index.ts
-var AgentRuntimeContribution = class {
-	cleanups = [];
+//#region src/contributions/kernel-branch/contributions/agent-run-runtime/index.ts
+var AgentRunRuntimeContribution = class {
+	cleanups = [];
+	modelInputBuilder;
+	constructor(kernel, branch) {
+		this.kernel = kernel;
+		this.branch = branch;
+		this.modelInputBuilder = new AgentRunModelInputBuilder(new AgentRunMessageProjector(), new AgentRunModelInputBudgeter(kernel.configManager), kernel.assetStore);
+	}
+	start = () => {
+		if (this.cleanups.length > 0) return;
+		const { entries } = resolveAgentRuntimeEntries({ config: this.kernel.configManager.loadConfig() });
+		this.branch.agentRuntimeManager.applyEntries(entries);
+		this.cleanups.push(this.registerNativeRuntime());
+		for (const provider of new BuiltinNarpRuntimeProviderService(this.kernel.configManager).createProviders()) this.cleanups.push(this.registerNarpRuntime(provider));
+	};
+	dispose = async () => {
+		while (this.cleanups.length > 0) await this.cleanups.pop()?.();
+	};
+	registerNativeRuntime = () => this.branch.agentRuntimeManager.register({
+		kind: DEFAULT_AGENT_RUNTIME_ENTRY_ID,
+		label: "Native",
+		defaultReuseScope: "global",
+		createRuntime: () => new DefaultNcpAgentRuntime$1({
+			llmApi: new ProviderManagerNcpLLMApi(this.kernel.llmProviders),
+			modelInputBuilder: this.modelInputBuilder,
+			runPreflight: async ({ spec, sessionRun }) => {
+				const session = await this.branch.sessionRepository.getSession(sessionRun.sessionId);
+				return await this.branch.contextCompactionManager.runPreflight({
+					agentId: spec.agentId,
+					messages: sessionRun.getSnapshot().messages,
+					metadata: session.metadata,
+					sessionId: sessionRun.sessionId
+				});
+			}
+		})
+	});
+	registerNarpRuntime = (provider) => this.branch.agentRuntimeManager.register({
+		kind: provider.kind,
+		label: provider.label,
+		defaultReuseScope: provider.kind === "narp-stdio" ? "session" : "session",
+		describeSessionTypeForEntry: provider.describeSessionTypeForEntry,
+		createRuntime: ({ entry, session }) => {
+			if (!provider.createRuntimeForEntry) throw new Error(`Agent runtime provider does not support entries: ${provider.kind}`);
+			return new NcpAgentRuntimeWrapper({
+				session,
+				createRuntime: ({ resolveTools, stateManager }) => provider.createRuntimeForEntry({
+					entry,
+					runtimeParams: {
+						sessionId: session.sessionId,
+						...session.agentId ? { agentId: session.agentId } : {},
+						resolveAssetContentPath: (assetUri) => this.kernel.assetStore.resolveContentPath(assetUri),
+						resolveTools,
+						sessionMetadata: session.metadata,
+						stateManager
+					}
+				})
+			});
+		}
+	});
+};
+//#endregion
+//#region src/contributions/kernel-branch/contributions/context-window/index.ts
+const STREAM_REFRESH_DELAY_MS$1 = 1500;
+function formatBackgroundError$1(error) {
+	if (error instanceof Error) return error.stack ?? error.message;
+	return String(error);
+}
+var ContextWindowContribution = class {
+	contextWindowPreview;
+	lastPublishedSignatureBySession = /* @__PURE__ */ new Map();
+	pendingTimers = /* @__PURE__ */ new Map();
+	stopped = true;
+	unsubscribeNcpEvent = null;
+	constructor(kernel, branch) {
+		this.kernel = kernel;
+		this.branch = branch;
+		this.contextWindowPreview = new ContextCompactionPreflightService({ configManager: kernel.configManager });
+	}
+	start = () => {
+		if (this.unsubscribeNcpEvent) return;
+		this.stopped = false;
+		this.unsubscribeNcpEvent = this.kernel.eventBus.on(eventKeys.ncpEvent, this.handleNcpEvent);
+	};
+	dispose = () => {
+		this.unsubscribeNcpEvent?.();
+		this.unsubscribeNcpEvent = null;
+		this.stopped = true;
+		for (const timer of this.pendingTimers.values()) clearTimeout(timer);
+		this.pendingTimers.clear();
+		this.lastPublishedSignatureBySession.clear();
+	};
+	handleNcpEvent = (event) => {
+		const sessionId = readContextWindowEventSessionId(event);
+		if (!sessionId || !this.branch.sessionRunManager.getSessionRun(sessionId)) return;
+		if (event.type === NcpEventType.ContextWindowUpdated) {
+			this.rememberPublishedContextWindow(sessionId, event.payload.contextWindow);
+			return;
+		}
+		if (shouldRefreshContextWindowImmediately(event)) {
+			this.refreshNow(sessionId);
+			return;
+		}
+		if (shouldRefreshContextWindowDuringStream(event)) this.refreshSoon(sessionId);
+	};
+	refreshSoon = (sessionId) => {
+		if (this.pendingTimers.has(sessionId)) return;
+		const timer = setTimeout(() => {
+			this.pendingTimers.delete(sessionId);
+			this.refreshNow(sessionId);
+		}, STREAM_REFRESH_DELAY_MS$1);
+		this.pendingTimers.set(sessionId, timer);
+	};
+	refreshNow = (sessionId) => {
+		const timer = this.pendingTimers.get(sessionId);
+		if (timer) {
+			clearTimeout(timer);
+			this.pendingTimers.delete(sessionId);
+		}
+		this.publishContextWindow(sessionId).catch((error) => {
+			console.error(`[kernel-branch-context-window] failed to refresh ${sessionId}: ${formatBackgroundError$1(error)}`);
+		});
+	};
+	publishContextWindow = async (sessionId) => {
+		if (this.stopped) return;
+		const sessionRun = this.branch.sessionRunManager.getSessionRun(sessionId);
+		if (!sessionRun) return;
+		const session = await this.branch.sessionRepository.getSession(sessionId);
+		const contextWindow = this.contextWindowPreview.preview({
+			requestMetadata: session.metadata,
+			sessionId,
+			sessionMessages: sessionRun.getSnapshot().messages,
+			storedAgentId: session.agentId,
+			storedMetadata: session.metadata
+		});
+		if (!isContextWindowSnapshot(contextWindow) || this.stopped) return;
+		const signature = createContextWindowSignature(contextWindow);
+		if (this.lastPublishedSignatureBySession.get(sessionId) === signature) return;
+		this.lastPublishedSignatureBySession.set(sessionId, signature);
+		this.kernel.eventBus.emit(eventKeys.ncpEvent, {
+			type: NcpEventType.ContextWindowUpdated,
+			payload: {
+				contextWindow,
+				sessionId
+			}
+		}, {
+			emittedAt: (/* @__PURE__ */ new Date()).toISOString(),
+			source: "kernel-branch-context-window"
+		});
+	};
+	rememberPublishedContextWindow = (sessionId, contextWindow) => {
+		this.lastPublishedSignatureBySession.set(sessionId, createContextWindowSignature(contextWindow));
+	};
+};
+//#endregion
+//#region src/contributions/kernel-branch/contributions/context-provider/providers/kernel-context.provider.ts
+var KernelContextProvider = class {
+	constructor(kernel, branch) {
+		this.kernel = kernel;
+		this.branch = branch;
+	}
+	provide = async (request) => {
+		const session = request.sessionId ? await this.branch.sessionRepository.getSession(request.sessionId) : null;
+		const sessionId = session?.sessionId ?? request.sessionId ?? request.message.sessionId ?? "";
+		const requestMetadata = buildAgentRunRequestMetadata({
+			request,
+			session
+		});
+		const runContext = resolveNextclawNcpRunContext({
+			configManager: this.kernel.configManager,
+			sessionId,
+			requestMetadata,
+			sessionMetadata: session?.metadata ?? requestMetadata,
+			storedAgentId: request.agentId ?? session?.agentId
+		});
+		const toolRegistry = this.kernel.toolManager.createRuntimeRegistry({ updateToolCallResult: async () => void 0 });
+		toolRegistry.prepareForRun(runContext.toolRunContext);
+		return [this.buildSystemContextBlock({
+			availableTools: buildToolCatalogEntries(toolRegistry.getToolDefinitions()),
+			runContext
+		})];
+	};
+	buildSystemContextBlock = (params) => {
+		const { availableTools, runContext } = params;
+		const lines = [
+			new ContextBuilder(runContext.effectiveWorkspace, runContext.config.agents.context, {
+				hostWorkspace: runContext.profile.workspace,
+				sessionProjectRoot: readSessionProjectRoot(runContext.sessionMetadata)
+			}).buildSystemPrompt(void 0, runContext.sessionKey, availableTools, [buildSessionOrchestrationSection(), buildMinimalSystemExecutionPrompt(runContext.effectiveModel)]),
+			"## Current Session",
+			`Channel: ${runContext.channel}`,
+			`Chat ID: ${runContext.chatId}`,
+			`Session: ${runContext.sessionKey}`
+		];
+		if (runContext.runtimeThinking) lines.push(`Thinking policy: ${runContext.runtimeThinking}`);
+		return lines.join("\n");
+	};
+};
+//#endregion
+//#region src/contributions/kernel-branch/contributions/context-provider/index.ts
+var ContextProviderContribution = class {
+	unregister = null;
+	constructor(kernel, branch) {
+		this.kernel = kernel;
+		this.branch = branch;
+	}
+	start = () => {
+		if (this.unregister) return;
+		this.unregister = this.branch.contextProviderManager.register(new KernelContextProvider(this.kernel, this.branch));
+	};
+	dispose = () => {
+		this.unregister?.();
+		this.unregister = null;
+	};
+};
+//#endregion
+//#region src/contributions/kernel-branch/contributions/tool-provider/providers/kernel-tool.provider.ts
+var KernelToolProvider = class {
+	constructor(kernel, branch) {
+		this.kernel = kernel;
+		this.branch = branch;
+	}
+	provide = async (request) => {
+		const session = request.sessionId ? await this.branch.sessionRepository.getSession(request.sessionId) : null;
+		const sessionId = session?.sessionId ?? request.sessionId ?? request.message.sessionId ?? "";
+		const requestMetadata = buildAgentRunRequestMetadata({
+			request,
+			session
+		});
+		const runContext = resolveNextclawNcpRunContext({
+			configManager: this.kernel.configManager,
+			sessionId,
+			requestMetadata,
+			sessionMetadata: session?.metadata ?? requestMetadata,
+			storedAgentId: request.agentId ?? session?.agentId
+		});
+		const toolRegistry = this.kernel.toolManager.createRuntimeRegistry({ updateToolCallResult: async ({ result, sessionId: targetSessionId, toolCallId }) => {
+			this.kernel.eventBus.emit(eventKeys.ncpEvent, {
+				type: NcpEventType.MessageToolCallResult,
+				payload: {
+					sessionId: targetSessionId,
+					toolCallId,
+					content: result
+				}
+			}, {
+				emittedAt: (/* @__PURE__ */ new Date()).toISOString(),
+				source: "agent-run-tool-provider"
+			});
+		} });
+		toolRegistry.prepareForRun(runContext.toolRunContext);
+		return toolRegistry.listTools();
+	};
+};
+//#endregion
+//#region src/contributions/kernel-branch/contributions/tool-provider/index.ts
+var ToolProviderContribution = class {
+	unregister = null;
+	constructor(kernel, branch) {
+		this.kernel = kernel;
+		this.branch = branch;
+	}
+	start = () => {
+		if (this.unregister) return;
+		this.unregister = this.branch.toolProviderManager.register(new KernelToolProvider(this.kernel, this.branch));
+	};
+	dispose = () => {
+		this.unregister?.();
+		this.unregister = null;
+	};
+};
+//#endregion
+//#region src/contributions/kernel-branch/index.ts
+var KernelBranch = class {
+	agentRuntimeManager = new AgentRuntimeManager$1();
+	contextCompactionManager;
+	contextProviderManager = new ContextProviderManager();
+	sessionRepository;
+	sessionRunManager;
+	toolProviderManager = new ToolProviderManager();
+	agentRunRequestManager;
+	contributions;
+	started = false;
+	constructor(kernel) {
+		this.kernel = kernel;
+		this.sessionRepository = new SessionRepository(kernel.eventBus, kernel.ncpSessionManager);
+		this.contextCompactionManager = new AgentRunContextCompactionManager(kernel.configManager, kernel.llmProviders, this.sessionRepository);
+		this.sessionRunManager = new SessionRunManager$1(this.sessionRepository);
+		this.agentRunRequestManager = new AgentRunRequestManager$1(this.agentRuntimeManager, kernel.configManager, this.contextProviderManager, kernel.eventBus, kernel.ingress, this.sessionRepository, this.sessionRunManager, this.toolProviderManager);
+		this.contributions = [
+			new ToolProviderContribution(kernel, this),
+			new ContextProviderContribution(kernel, this),
+			new ContextWindowContribution(kernel, this),
+			new AgentRunRuntimeContribution(kernel, this)
+		];
+	}
+	start = () => {
+		if (this.started) return;
+		this.started = true;
+		this.sessionRepository.start();
+		for (const contribution of this.contributions) contribution.start();
+		this.agentRunRequestManager.start();
+	};
+	listSessionTypes = (params) => this.agentRuntimeManager.listSessionTypes(params);
+	dispose = async () => {
+		if (!this.started) return;
+		for (const contribution of [...this.contributions].reverse()) await contribution.dispose?.();
+		this.agentRunRequestManager.dispose();
+		this.toolProviderManager.dispose();
+		this.contextProviderManager.dispose();
+		await this.agentRuntimeManager.dispose();
+		this.sessionRunManager.dispose();
+		this.sessionRepository.dispose();
+		this.started = false;
+	};
+};
+//#endregion
+//#region src/contributions/agent-runtime/index.ts
+var AgentRuntimeContribution = class {
+	cleanups = [];
+	constructor(kernel) {
+		this.kernel = kernel;
+	}
+	start = () => {
+		if (this.cleanups.length > 0) return;
+		const nativeRuntimeFactory = new NativeAgentRuntimeFactory({
+			providerManager: this.kernel.llmProviders,
+			configManager: this.kernel.configManager,
+			llmUsage: this.kernel.llmUsage,
+			assetStore: this.kernel.assetStore,
+			updateToolCallResult: this.kernel.sessionRunManager.updateToolCallResult,
+			toolManager: this.kernel.toolManager
+		});
+		const builtinNarpRuntimeProviders = new BuiltinNarpRuntimeProviderService(this.kernel.configManager).createProviders();
+		const nativeRegistration = this.kernel.agentRuntimeManager.registerRuntimeProvider({
+			kind: "native",
+			label: "Native",
+			createRuntime: nativeRuntimeFactory.create
+		});
+		this.cleanups = [() => nativeRegistration.dispose(), ...builtinNarpRuntimeProviders.map((provider) => {
+			const registration = this.kernel.agentRuntimeManager.registerRuntimeProvider(provider);
+			return () => registration.dispose();
+		})];
+	};
+	dispose = () => {
+		for (const cleanup of this.cleanups) cleanup();
+		this.cleanups = [];
+	};
+};
+//#endregion
+//#region src/contributions/session-context-window/index.ts
+const STREAM_REFRESH_DELAY_MS = 1500;
+function formatBackgroundError(error) {
+	if (error instanceof Error) return error.stack ?? error.message;
+	return String(error);
+}
+var SessionContextWindowContribution = class {
+	unsubscribeNcpEvent = null;
+	stopped = true;
+	pendingTimers = /* @__PURE__ */ new Map();
+	lastPublishedSignatureBySession = /* @__PURE__ */ new Map();
+	constructor(kernel) {
+		this.kernel = kernel;
+	}
+	start = () => {
+		if (this.unsubscribeNcpEvent) return;
+		this.stopped = false;
+		this.unsubscribeNcpEvent = this.kernel.eventBus.on(eventKeys.ncpEvent, this.handleNcpEvent);
+	};
+	dispose = () => {
+		this.unsubscribeNcpEvent?.();
+		this.unsubscribeNcpEvent = null;
+		this.stopped = true;
+		for (const timer of this.pendingTimers.values()) clearTimeout(timer);
+		this.pendingTimers.clear();
+		this.lastPublishedSignatureBySession.clear();
+	};
+	handleNcpEvent = (event) => {
+		const sessionId = readContextWindowEventSessionId(event);
+		if (!sessionId) return;
+		if (event.type === NcpEventType.ContextWindowUpdated) {
+			this.rememberPublishedContextWindow(sessionId, event.payload.contextWindow);
+			return;
+		}
+		if (shouldRefreshContextWindowImmediately(event)) {
+			this.refreshNow(sessionId);
+			return;
+		}
+		if (shouldRefreshContextWindowDuringStream(event)) this.refreshSoon(sessionId);
+	};
+	refreshSoon = (sessionId) => {
+		if (this.pendingTimers.has(sessionId)) return;
+		const timer = setTimeout(() => {
+			this.pendingTimers.delete(sessionId);
+			this.refreshNow(sessionId);
+		}, STREAM_REFRESH_DELAY_MS);
+		this.pendingTimers.set(sessionId, timer);
+	};
+	refreshNow = (sessionId) => {
+		const timer = this.pendingTimers.get(sessionId);
+		if (timer) {
+			clearTimeout(timer);
+			this.pendingTimers.delete(sessionId);
+		}
+		this.publishContextWindow(sessionId).catch((error) => {
+			console.error(`[session-context-window] failed to refresh ${sessionId}: ${formatBackgroundError(error)}`);
+		});
+	};
+	publishContextWindow = async (sessionId) => {
+		if (this.stopped) return;
+		const contextWindow = await this.kernel.ncpSessionManager.getContextWindow(sessionId, this.kernel.sessionRunManager.getLiveSessionRecord(sessionId));
+		if (!isContextWindowSnapshot(contextWindow) || this.stopped) return;
+		const signature = createContextWindowSignature(contextWindow);
+		if (this.lastPublishedSignatureBySession.get(sessionId) === signature) return;
+		this.lastPublishedSignatureBySession.set(sessionId, signature);
+		this.kernel.eventBus.emit(eventKeys.ncpEvent, {
+			type: NcpEventType.ContextWindowUpdated,
+			payload: {
+				sessionId,
+				contextWindow
+			}
+		}, {
+			emittedAt: (/* @__PURE__ */ new Date()).toISOString(),
+			source: "session-context-window"
+		});
+	};
+	rememberPublishedContextWindow = (sessionId, contextWindow) => {
+		this.lastPublishedSignatureBySession.set(sessionId, createContextWindowSignature(contextWindow));
+	};
+};
+//#endregion
+//#region src/contributions/legacy-agent-run/index.ts
+var LegacyAgentRunContribution = class {
+	contributions;
+	started = false;
 	constructor(kernel) {
 		this.kernel = kernel;
+		this.contributions = [new AgentRuntimeContribution(kernel), new SessionContextWindowContribution(kernel)];
 	}
 	start = () => {
-		if (this.cleanups.length > 0) return;
-		const nativeRuntimeFactory = new NativeAgentRuntimeFactory({
-			providerManager: this.kernel.llmProviders,
-			configManager: this.kernel.configManager,
-			llmUsage: this.kernel.llmUsage,
-			assetStore: this.kernel.assetStore,
-			updateToolCallResult: this.kernel.sessionRunManager.updateToolCallResult,
-			toolManager: this.kernel.toolManager
-		});
-		const builtinNarpRuntimeProviders = new BuiltinNarpRuntimeProviderService(this.kernel.configManager).createProviders();
-		const nativeRegistration = this.kernel.agentRuntimeManager.registerRuntimeProvider({
-			kind: "native",
-			label: "Native",
-			createRuntime: nativeRuntimeFactory.create
-		});
-		this.cleanups = [() => nativeRegistration.dispose(), ...builtinNarpRuntimeProviders.map((provider) => {
-			const registration = this.kernel.agentRuntimeManager.registerRuntimeProvider(provider);
-			return () => registration.dispose();
-		})];
+		if (this.started) return;
+		this.started = true;
+		for (const contribution of this.contributions) contribution.start();
+		this.kernel.agentRunRequestManager.start();
 	};
-	dispose = () => {
-		for (const cleanup of this.cleanups) cleanup();
-		this.cleanups = [];
+	listSessionTypes = (params) => this.kernel.agentRuntimeManager.listSessionTypes(params);
+	dispose = async () => {
+		if (!this.started) return;
+		await this.kernel.agentRunRequestManager.dispose();
+		await this.kernel.sessionRunManager.dispose();
+		for (const contribution of [...this.contributions].reverse()) await contribution.dispose();
+		this.started = false;
 	};
 };
 //#endregion
@@ -5566,125 +6469,6 @@ var LearningLoopContribution = class {
 	};
 };
 //#endregion
-//#region src/contributions/session-context-window/index.ts
-const STREAM_REFRESH_DELAY_MS = 1500;
-function formatBackgroundError(error) {
-	if (error instanceof Error) return error.stack ?? error.message;
-	return String(error);
-}
-function readEventSessionId(event) {
-	const payload = "payload" in event ? event.payload : null;
-	if (!payload || typeof payload !== "object") return null;
-	return "sessionId" in payload && typeof payload.sessionId === "string" ? payload.sessionId.trim() || null : null;
-}
-function isContextWindow(value) {
-	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-function createSignature(value) {
-	return JSON.stringify(value);
-}
-function shouldRefreshDuringStream(event) {
-	switch (event.type) {
-		case NcpEventType.MessageTextStart:
-		case NcpEventType.MessageTextDelta:
-		case NcpEventType.MessageTextEnd:
-		case NcpEventType.MessageReasoningStart:
-		case NcpEventType.MessageReasoningDelta:
-		case NcpEventType.MessageReasoningEnd:
-		case NcpEventType.MessageToolCallStart:
-		case NcpEventType.MessageToolCallArgs:
-		case NcpEventType.MessageToolCallArgsDelta:
-		case NcpEventType.MessageToolCallEnd:
-		case NcpEventType.MessageToolCallResult: return true;
-		default: return false;
-	}
-}
-function shouldRefreshImmediately(event) {
-	switch (event.type) {
-		case NcpEventType.MessageSent:
-		case NcpEventType.MessageCompleted:
-		case NcpEventType.MessageFailed:
-		case NcpEventType.MessageAbort:
-		case NcpEventType.RunFinished:
-		case NcpEventType.RunError: return true;
-		default: return false;
-	}
-}
-var SessionContextWindowContribution = class {
-	unsubscribeNcpEvent = null;
-	stopped = true;
-	pendingTimers = /* @__PURE__ */ new Map();
-	lastPublishedSignatureBySession = /* @__PURE__ */ new Map();
-	constructor(kernel) {
-		this.kernel = kernel;
-	}
-	start = () => {
-		if (this.unsubscribeNcpEvent) return;
-		this.stopped = false;
-		this.unsubscribeNcpEvent = this.kernel.eventBus.on(eventKeys.ncpEvent, this.handleNcpEvent);
-	};
-	dispose = () => {
-		this.unsubscribeNcpEvent?.();
-		this.unsubscribeNcpEvent = null;
-		this.stopped = true;
-		for (const timer of this.pendingTimers.values()) clearTimeout(timer);
-		this.pendingTimers.clear();
-		this.lastPublishedSignatureBySession.clear();
-	};
-	handleNcpEvent = (event) => {
-		const sessionId = readEventSessionId(event);
-		if (!sessionId) return;
-		if (event.type === NcpEventType.ContextWindowUpdated) {
-			this.rememberPublishedContextWindow(sessionId, event.payload.contextWindow);
-			return;
-		}
-		if (shouldRefreshImmediately(event)) {
-			this.refreshNow(sessionId);
-			return;
-		}
-		if (shouldRefreshDuringStream(event)) this.refreshSoon(sessionId);
-	};
-	refreshSoon = (sessionId) => {
-		if (this.pendingTimers.has(sessionId)) return;
-		const timer = setTimeout(() => {
-			this.pendingTimers.delete(sessionId);
-			this.refreshNow(sessionId);
-		}, STREAM_REFRESH_DELAY_MS);
-		this.pendingTimers.set(sessionId, timer);
-	};
-	refreshNow = (sessionId) => {
-		const timer = this.pendingTimers.get(sessionId);
-		if (timer) {
-			clearTimeout(timer);
-			this.pendingTimers.delete(sessionId);
-		}
-		this.publishContextWindow(sessionId).catch((error) => {
-			console.error(`[session-context-window] failed to refresh ${sessionId}: ${formatBackgroundError(error)}`);
-		});
-	};
-	publishContextWindow = async (sessionId) => {
-		if (this.stopped) return;
-		const contextWindow = await this.kernel.ncpSessionManager.getContextWindow(sessionId, this.kernel.sessionRunManager.getLiveSessionRecord(sessionId));
-		if (!isContextWindow(contextWindow) || this.stopped) return;
-		const signature = createSignature(contextWindow);
-		if (this.lastPublishedSignatureBySession.get(sessionId) === signature) return;
-		this.lastPublishedSignatureBySession.set(sessionId, signature);
-		this.kernel.eventBus.emit(eventKeys.ncpEvent, {
-			type: NcpEventType.ContextWindowUpdated,
-			payload: {
-				sessionId,
-				contextWindow
-			}
-		}, {
-			emittedAt: (/* @__PURE__ */ new Date()).toISOString(),
-			source: "session-context-window"
-		});
-	};
-	rememberPublishedContextWindow = (sessionId, contextWindow) => {
-		this.lastPublishedSignatureBySession.set(sessionId, createSignature(contextWindow));
-	};
-};
-//#endregion
 //#region src/contributions/session-activity-preview/utils/session-activity-preview-ncp-event.utils.ts
 const PREVIEW_TEXT_MAX_LENGTH = 160;
 function readSessionId(value) {
@@ -6140,7 +6924,7 @@ var SessionSearchTool = class {
 	}
 	validateArgs = (args) => {
 		const issues = [];
-		const query = normalizeString(args.query);
+		const query = normalizeString$1(args.query);
 		const limit = readOptionalInteger(args.limit);
 		const includeCurrentSession = readOptionalBoolean(args.includeCurrentSession);
 		if (!query) issues.push("query must be a non-empty string.");
@@ -6154,7 +6938,7 @@ var SessionSearchTool = class {
 		const issues = this.validateArgs(args);
 		if (issues.length > 0) throw new Error(issues.join(" "));
 		return this.queryService.search({
-			query: normalizeString(args.query) ?? "",
+			query: normalizeString$1(args.query) ?? "",
 			limit: readOptionalInteger(args.limit),
 			includeCurrentSession: readOptionalBoolean(args.includeCurrentSession),
 			currentSessionId: this.context.currentSessionId
@@ -6297,7 +7081,7 @@ var SessionSpawnTool = class extends Tool {
 function readMetadataAccountId(metadata) {
 	const candidates = [metadata.accountId, metadata.account_id];
 	for (const candidate of candidates) {
-		const normalized = normalizeString(candidate);
+		const normalized = normalizeString$1(candidate);
 		if (normalized) return normalized;
 	}
 }
@@ -6408,6 +7192,7 @@ var ToolContribution = class {
 };
 //#endregion
 //#region src/app/nextclaw-kernel.ts
+const AGENT_RUN_CHAIN = "branch";
 function resolveKernelSessionsDir(options) {
 	const homeDir = options.homeDir?.trim();
 	if (homeDir) return ensureDir(resolve(expandHome(homeDir), "sessions"));
@@ -6452,6 +7237,7 @@ var NextclawKernel = class {
 	sessionRunManager;
 	agentRuntimeManager;
 	ncpAgentSessionJournalStore;
+	agentRunContribution;
 	contributions;
 	gatewayController;
 	constructor(options = {}) {
@@ -6480,7 +7266,8 @@ var NextclawKernel = class {
 			configManager: this.configManager,
 			eventBus: this.eventBus,
 			ingress: this.ingress,
-			messageBus: this.messageBus
+			messageBus: this.messageBus,
+			sessionManager: this.sessions
 		});
 		this.skills = new SkillManager({ workspace: getWorkspacePath(this.configManager.config.agents.defaults.workspace) });
 		this.mcpManager = new McpManager(this.configManager.loadConfig);
@@ -6521,14 +7308,15 @@ var NextclawKernel = class {
 			ncpSessionManager: this.ncpSessionManager,
 			sessionRunManager: this.sessionRunManager
 		});
+		this.agentRunContribution = AGENT_RUN_CHAIN === "branch" ? new KernelBranch(this) : new LegacyAgentRunContribution(this);
 		this.contributions = [
-			new AgentRuntimeContribution(this),
 			new ToolContribution(this),
 			new SessionActivityPreviewContribution(this),
-			new SessionContextWindowContribution(this),
-			new LearningLoopContribution(this)
+			new LearningLoopContribution(this),
+			this.agentRunContribution
 		];
 	}
+	listSessionTypes = (params) => this.agentRunContribution.listSessionTypes(params);
 	provideGatewayController = (gatewayController) => {
 		this.gatewayController = gatewayController;
 	};
@@ -6537,13 +7325,10 @@ var NextclawKernel = class {
 		this.sessionSearch.start();
 		this.mcpManager.start();
 		for (const contribution of this.contributions) contribution.start();
-		this.agentRunRequestManager.start();
 	};
 	dispose = async () => {
-		await this.agentRunRequestManager.dispose();
-		await this.sessionRunManager.dispose();
+		for (const contribution of [...this.contributions].reverse()) await contribution.dispose();
 		this.ncpSessionManager.dispose();
-		for (const contribution of this.contributions) contribution.dispose();
 		await this.agentRuntimeManager.dispose();
 		await this.mcpManager.dispose();
 		await this.sessionSearch.dispose();
@@ -6597,7 +7382,7 @@ async function createFilePartFromLocalPath(attachment, localPath, assetApi) {
 	const bytes = await readFile(localPath);
 	return {
 		type: "file",
-		assetUri: (await assetApi.put({
+		assetUri: (await assetApi.putBytes({
 			fileName,
 			mimeType: attachment.mimeType ?? null,
 			bytes
@@ -6626,16 +7411,11 @@ async function buildUserMessageParts(params) {
 	for (const attachment of attachments ?? []) parts.push(await attachmentToPart(attachment, assetApi));
 	return parts;
 }
-async function buildNcpUserMessage(params) {
+async function buildAgentRunSendPayload(params) {
 	const { assetApi, attachments, content, metadata, sessionId } = params;
-	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 	return {
-		id: `${sessionId}:user:${timestamp}`,
 		sessionId,
-		role: "user",
-		status: "final",
-		timestamp,
-		parts: await buildUserMessageParts({
+		content: await buildUserMessageParts({
 			content,
 			attachments,
 			assetApi
@@ -6643,41 +7423,208 @@ async function buildNcpUserMessage(params) {
 		metadata: structuredClone(metadata ?? {})
 	};
 }
-async function* streamPromptOverNcp(params) {
-	const { abortSignal, agent, attachments, content, metadata, onEvent, sessionId } = params;
-	const message = await buildNcpUserMessage({
-		sessionId,
-		content,
-		attachments,
-		metadata,
-		assetApi: agent.assetApi
-	});
-	for await (const event of agent.run({
-		sessionId,
-		message,
-		metadata
-	}, { ...abortSignal ? { signal: abortSignal } : {} })) {
-		onEvent?.(event);
-		yield event;
-	}
+function readEventCorrelationId(event) {
+	if (!("payload" in event)) return;
+	const correlationId = "correlationId" in event.payload ? event.payload.correlationId : void 0;
+	return typeof correlationId === "string" && correlationId.length > 0 ? correlationId : void 0;
 }
-async function runPromptOverNcp(params) {
-	let completedMessage;
-	for await (const event of streamPromptOverNcp(params)) {
-		if (event.type === NcpEventType.MessageTextDelta) {
-			params.onAssistantDelta?.(event.payload.delta);
-			continue;
+function readEventSessionId(event) {
+	if (!("payload" in event)) return;
+	const sessionId = "sessionId" in event.payload ? event.payload.sessionId : void 0;
+	return typeof sessionId === "string" && sessionId.length > 0 ? sessionId : void 0;
+}
+function readEventRunId(event) {
+	if (!("payload" in event)) return;
+	const runId = "runId" in event.payload ? event.payload.runId : void 0;
+	return typeof runId === "string" && runId.length > 0 ? runId : void 0;
+}
+function isTerminalEvent(event) {
+	return event.type === NcpEventType.MessageFailed || event.type === NcpEventType.RunError || event.type === NcpEventType.RunFinished;
+}
+function isRunEventMatch(params) {
+	const eventCorrelationId = readEventCorrelationId(params.event);
+	if (eventCorrelationId) return eventCorrelationId === params.correlationId;
+	if (!params.sessionId || !params.runId) return false;
+	return readEventSessionId(params.event) === params.sessionId && readEventRunId(params.event) === params.runId;
+}
+var AsyncEventQueue = class {
+	values = [];
+	waiters = [];
+	closed = false;
+	failure;
+	hasFailure = false;
+	push = (value) => {
+		if (this.closed || this.hasFailure) return;
+		const waiter = this.waiters.shift();
+		if (waiter) {
+			waiter({
+				done: false,
+				value
+			});
+			return;
+		}
+		this.values.push(value);
+	};
+	close = () => {
+		if (this.closed) return;
+		this.closed = true;
+		while (this.waiters.length > 0) this.waiters.shift()?.({
+			done: true,
+			value: void 0
+		});
+	};
+	fail = (error) => {
+		if (this.closed || this.hasFailure) return;
+		this.hasFailure = true;
+		this.failure = error;
+		while (this.waiters.length > 0) this.waiters.shift()?.({
+			done: true,
+			value: void 0
+		});
+	};
+	next = async () => {
+		if (this.values.length > 0) return {
+			done: false,
+			value: this.values.shift()
+		};
+		if (this.hasFailure) throw this.failure;
+		if (this.closed) return {
+			done: true,
+			value: void 0
+		};
+		return await new Promise((resolve) => {
+			this.waiters.push(resolve);
+		});
+	};
+	[Symbol.asyncIterator] = () => ({ next: this.next });
+};
+var AgentRunObserver = class {
+	queue = new AsyncEventQueue();
+	unsubscribe;
+	abortCleanup;
+	completedMessage;
+	disposed = false;
+	runId;
+	sessionId;
+	constructor(options) {
+		this.options = options;
+		this.unsubscribe = options.eventBus.on(eventKeys.ncpEvent, this.handleEvent);
+	}
+	attachHandle = (handle) => {
+		this.sessionId = handle.sessionId;
+		this.runId = handle.runId ?? void 0;
+		const { abortSignal } = this.options;
+		if (!abortSignal) return;
+		const abort = () => {
+			this.options.ingress.handle({
+				type: ingressKeys.agentRun.abort,
+				payload: {
+					sessionId: handle.sessionId,
+					correlationId: this.options.correlationId
+				}
+			}, { source: "agent-run-client" });
+		};
+		if (abortSignal.aborted) {
+			abort();
+			return;
+		}
+		abortSignal.addEventListener("abort", abort, { once: true });
+		this.abortCleanup = () => abortSignal.removeEventListener("abort", abort);
+	};
+	stream = async function* () {
+		for await (const event of this.queue) yield event;
+	};
+	waitForReply = async (options = {}) => {
+		for await (const event of this.queue) {
+			if (event.type === NcpEventType.MessageTextDelta) {
+				options.onAssistantDelta?.(event.payload.delta);
+				continue;
+			}
+			if (event.type === NcpEventType.MessageCompleted) {
+				this.completedMessage = event.payload.message;
+				continue;
+			}
+			if (event.type === NcpEventType.MessageFailed) throw new Error(event.payload.error.message);
+			if (event.type === NcpEventType.RunError) throw new Error(event.payload.error ?? options.runErrorMessage ?? "NCP run failed.");
+			if (event.type === NcpEventType.RunFinished) {
+				if (!this.completedMessage) throw new Error(options.missingCompletedMessageError ?? "NCP run completed without a final assistant message.");
+				return this.completedMessage;
+			}
 		}
-		if (event.type === NcpEventType.MessageFailed) throw new Error(event.payload.error.message);
-		if (event.type === NcpEventType.RunError) throw new Error(event.payload.error ?? params.runErrorMessage ?? "NCP run failed.");
-		if (event.type === NcpEventType.MessageCompleted) completedMessage = event.payload.message;
+		throw new Error(options.missingCompletedMessageError ?? "NCP run completed without a final assistant message.");
+	};
+	dispose = () => {
+		if (this.disposed) return;
+		this.disposed = true;
+		this.abortCleanup?.();
+		this.unsubscribe();
+		this.queue.close();
+	};
+	handleEvent = (event) => {
+		if (this.disposed || !isRunEventMatch({
+			correlationId: this.options.correlationId,
+			event,
+			runId: this.runId,
+			sessionId: this.sessionId
+		})) return;
+		this.options.onEvent?.(event);
+		this.queue.push(event);
+		if (isTerminalEvent(event)) this.queue.close();
+	};
+};
+var AgentRunClient = class {
+	constructor(options) {
+		this.options = options;
 	}
-	if (!completedMessage) throw new Error(params.missingCompletedMessageError ?? "NCP run completed without a final assistant message.");
-	return {
-		text: extractTextFromNcpMessage(completedMessage),
-		completedMessage
+	send = async (input) => {
+		return await this.sendWithCorrelation(input, randomUUID());
 	};
-}
+	sendAndWaitForReply = async (input, options = {}) => {
+		const correlationId = randomUUID();
+		const observer = this.prepareObserver(correlationId, options);
+		try {
+			const handle = await this.sendWithCorrelation(input, correlationId);
+			observer.attachHandle(handle);
+			const completedMessage = await observer.waitForReply(options);
+			return {
+				handle,
+				completedMessage,
+				text: extractTextFromNcpMessage(completedMessage)
+			};
+		} finally {
+			observer.dispose();
+		}
+	};
+	sendAndStreamEvents = async function* (input, options = {}) {
+		const correlationId = randomUUID();
+		const observer = this.prepareObserver(correlationId, options);
+		try {
+			const handle = await this.sendWithCorrelation(input, correlationId);
+			observer.attachHandle(handle);
+			for await (const event of observer.stream()) yield event;
+		} finally {
+			observer.dispose();
+		}
+	};
+	prepareObserver = (correlationId, options) => {
+		return new AgentRunObserver({
+			abortSignal: options.abortSignal,
+			correlationId,
+			eventBus: this.options.eventBus,
+			ingress: this.options.ingress,
+			onEvent: options.onEvent
+		});
+	};
+	sendWithCorrelation = async (input, correlationId) => {
+		return await this.options.ingress.handle({
+			type: ingressKeys.agentRun.send,
+			payload: {
+				...input,
+				correlationId
+			}
+		}, { source: "agent-run-client" });
+	};
+};
 //#endregion
 //#region src/features/ncp-dispatch/utils/channel-reply.utils.ts
 function readString(value) {
@@ -6702,18 +7649,19 @@ function resolveChannelReplyRoute(params) {
 	};
 }
 async function dispatchChannelReplyRoute(params) {
-	const { abortSignal, agent, attachments, content, metadata, onEvent, route, sessionId } = params;
+	const { abortSignal, agentRunClient, assetApi, attachments, content, metadata, onEvent, route, sessionId } = params;
 	const input = {
 		target: {
 			...route.target,
-			...agent.assetApi?.resolveContentPath ? { resolveAssetContentPath: agent.assetApi.resolveContentPath } : {}
+			...assetApi?.resolveContentPath ? { resolveAssetContentPath: assetApi.resolveContentPath } : {}
 		},
-		eventStream: streamPromptOverNcp({
-			agent,
+		eventStream: agentRunClient.sendAndStreamEvents(await buildAgentRunSendPayload({
 			sessionId,
 			content,
 			attachments,
 			metadata,
+			assetApi
+		}), {
 			abortSignal,
 			onEvent
 		})
@@ -6722,22 +7670,35 @@ async function dispatchChannelReplyRoute(params) {
 }
 //#endregion
 //#region src/features/ncp-dispatch/utils/ncp-run-metadata.utils.ts
+const LEGACY_RUN_METADATA_KEYS = [
+	"account_id",
+	"agent_id",
+	"chat_id",
+	"preferred_model",
+	"project_root",
+	"runtime",
+	"sender_id",
+	"session_key",
+	"session_type"
+];
+function stripLegacyRunMetadata(metadata) {
+	const nextMetadata = structuredClone(metadata);
+	for (const key of LEGACY_RUN_METADATA_KEYS) delete nextMetadata[key];
+	return nextMetadata;
+}
 function buildRunMetadata(params) {
 	const { message, metadata, route } = params;
 	return {
-		...message.metadata ?? {},
-		...metadata ?? {},
+		...stripLegacyRunMetadata({
+			...message.metadata ?? {},
+			...metadata ?? {}
+		}),
 		channel: message.channel,
 		chatId: message.chatId,
-		chat_id: message.chatId,
 		accountId: route.accountId,
-		account_id: route.accountId,
 		agentId: route.agentId,
-		agent_id: route.agentId,
 		sessionKey: route.sessionKey,
-		session_key: route.sessionKey,
-		senderId: message.senderId,
-		sender_id: message.senderId
+		senderId: message.senderId
 	};
 }
 //#endregion
@@ -6758,14 +7719,16 @@ var GatewayInboundProcessor = class {
 				message,
 				route
 			});
+			if (await this.dispatchSlashCommandMaybe(message, route, runMetadata)) return;
 			if (await this.dispatchChannelReplyRouteMaybe(message, route, runMetadata)) return;
 			if (message.channel !== "system") await this.runtime.messageBus.publishOutbound(createAssistantStreamResetControlMessage(message));
-			const result = await runPromptOverNcp({
-				agent: this.runtime.kernel.agentRunRequestManager,
+			const result = await this.runtime.agentRunClient.sendAndWaitForReply(await buildAgentRunSendPayload({
 				sessionId: route.sessionKey,
 				content: message.content,
 				attachments: message.attachments,
 				metadata: runMetadata,
+				assetApi: this.runtime.kernel.assetStore
+			}), {
 				onAssistantDelta: message.channel !== "system" ? (delta) => {
 					if (!delta) return;
 					this.runtime.messageBus.publishOutbound(createAssistantStreamDeltaControlMessage(message, delta));
@@ -6792,6 +7755,26 @@ var GatewayInboundProcessor = class {
 			sessionKeyOverride: normalize(message.metadata.session_key_override)
 		});
 	};
+	dispatchSlashCommandMaybe = async (message, route, runMetadata) => {
+		if (message.channel === "system") return false;
+		const trimmed = message.content.trim();
+		if (!trimmed.startsWith("/")) return false;
+		const result = await new CommandRegistry(this.runtime.configManager.loadConfig(), this.runtime.sessionManager).executeText(trimmed, {
+			channel: message.channel,
+			chatId: message.chatId,
+			senderId: message.senderId,
+			sessionKey: route.sessionKey
+		});
+		if (!result) return false;
+		await this.runtime.messageBus.publishOutbound({
+			channel: message.channel,
+			chatId: message.chatId,
+			content: result.content,
+			media: [],
+			metadata: runMetadata
+		});
+		return true;
+	};
 	dispatchChannelReplyRouteMaybe = async (message, route, runMetadata) => {
 		if (message.channel === "system") return false;
 		const replyRoute = resolveChannelReplyRoute({
@@ -6801,7 +7784,8 @@ var GatewayInboundProcessor = class {
 		});
 		if (!replyRoute) return false;
 		await dispatchChannelReplyRoute({
-			agent: this.runtime.kernel.agentRunRequestManager,
+			agentRunClient: this.runtime.agentRunClient,
+			assetApi: this.runtime.kernel.assetStore,
 			route: replyRoute,
 			sessionId: route.sessionKey,
 			content: message.content,
@@ -6881,7 +7865,7 @@ function resolveDirectRoute(params) {
 	};
 }
 async function dispatchPromptOverNcp(params) {
-	const { abortSignal, agentId, attachments, channel, chatId, config, content, metadata, onAssistantDelta, agentRunRequests, sessionKey } = params;
+	const { abortSignal, agentId, attachments, channel, chatId, config, content, metadata, onAssistantDelta, agentRunClient, sessionKey } = params;
 	const { message, route } = resolveDirectRoute({
 		config,
 		content,
@@ -6900,15 +7884,15 @@ async function dispatchPromptOverNcp(params) {
 		sessionKey: route.sessionKey
 	});
 	if (commandResult) return commandResult;
-	return (await runPromptOverNcp({
-		agent: agentRunRequests,
+	return (await agentRunClient.sendAndWaitForReply(await buildAgentRunSendPayload({
 		sessionId: route.sessionKey,
 		content,
 		attachments,
 		metadata: buildRunMetadata({
 			message,
 			route
-		}),
+		})
+	}), {
 		abortSignal,
 		onAssistantDelta,
 		missingCompletedMessageError: `session "${route.sessionKey}" completed without a final assistant message`,
@@ -6959,11 +7943,11 @@ function parseLegacyToolCalls(value) {
 	return value.map((entry) => {
 		if (!entry || typeof entry !== "object" || Array.isArray(entry)) return null;
 		const toolCall = entry;
-		const id = normalizeString(toolCall.id);
+		const id = normalizeString$1(toolCall.id);
 		const rawFunction = toolCall.function;
 		if (!id || !rawFunction || typeof rawFunction !== "object" || Array.isArray(rawFunction)) return null;
 		const fn = rawFunction;
-		const name = normalizeString(fn.name);
+		const name = normalizeString$1(fn.name);
 		const args = typeof fn.arguments === "string" ? fn.arguments : JSON.stringify(fn.arguments ?? {});
 		if (!name) return null;
 		return {
@@ -6981,7 +7965,7 @@ function createMessageId(sessionId, index, role, timestamp) {
 }
 function resolveMessageId(params) {
 	const { index, message, role, sessionId, timestamp } = params;
-	return normalizeString(message.ncp_message_id) ?? createMessageId(sessionId, index, role, timestamp);
+	return normalizeString$1(message.ncp_message_id) ?? createMessageId(sessionId, index, role, timestamp);
 }
 function isNcpMessagePart(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value) && typeof value.type === "string";
@@ -7108,13 +8092,13 @@ function toNcpMessages(sessionId, messages) {
 	const ncpMessages = [];
 	const assistantIndexByToolCallId = /* @__PURE__ */ new Map();
 	messages.forEach((message, index) => {
-		const role = normalizeString(message.role)?.toLowerCase() ?? "assistant";
+		const role = normalizeString$1(message.role)?.toLowerCase() ?? "assistant";
 		if (role === "tool") {
-			const toolCallId = normalizeString(message.tool_call_id);
+			const toolCallId = normalizeString$1(message.tool_call_id);
 			if (toolCallId) {
 				const assistantIndex = assistantIndexByToolCallId.get(toolCallId);
 				if (assistantIndex !== void 0) {
-					ncpMessages[assistantIndex] = attachToolResult(ncpMessages[assistantIndex], toolCallId, structuredClone(message.content), normalizeString(message.name) ?? void 0, message.ncp_tool_result_content_items);
+					ncpMessages[assistantIndex] = attachToolResult(ncpMessages[assistantIndex], toolCallId, structuredClone(message.content), normalizeString$1(message.name) ?? void 0, message.ncp_tool_result_content_items);
 					return;
 				}
 			}
@@ -7147,7 +8131,7 @@ function toNcpMessages(sessionId, messages) {
 	return ncpMessages;
 }
 function resolveLegacyEventType(message) {
-	const role = normalizeString(message.role)?.toLowerCase() ?? "";
+	const role = normalizeString$1(message.role)?.toLowerCase() ?? "";
 	if (role === "assistant" && Array.isArray(message.tool_calls) && message.tool_calls.length > 0) return "assistant.tool_call";
 	if (role === "tool") return "tool.result";
 	if (role === "assistant") return "message.assistant";
@@ -7156,6 +8140,6 @@ function resolveLegacyEventType(message) {
 	return `message.${role || "other"}`;
 }
 //#endregion
-export { AgentManager, AgentRunRequestManager, AgentRuntimeManager, AgentRuntimeRegistry, AutomationManager, BuiltinNarpRuntimeProviderService, CONTEXT_COMPACTION_TIMELINE_KIND, ChannelManager, ConfigManager, ContextCompactionManager, ContextWindowPreviewManager, DEFAULT_AGENT_RUNTIME_ENTRY_ID, ExtensionManager, ExtensionPluginRegistryService, GatewayInboundProcessor, LlmProviderManager, LlmUsageManager, LlmUsageStore, McpManager, NARP_HTTP_RUNTIME_KIND, NARP_STDIO_RUNTIME_KIND, NEXTCLAW_TIMELINE_KIND_METADATA_KEY, NativeAgentRuntimeFactory, NcpAgentSessionJournalStore, NcpSessionManager, NextclawKernel, NextclawNcpContextBuilder, ProviderManagerNcpLLMApi, SessionRequestManager, SessionRunManager, SkillManager, ToolManager, UpdateManifestReader, buildContextCompactionTimelineNcpMessage, buildLlmUsageSummary, buildLocalizedTextMap, buildNcpUserMessage, buildUserMessageParts, createAgentRuntimeSessionRequestDispatcher, createAssetTools, createLlmUsageRecord, dispatchAgentRuntimeSessionRequest, dispatchChannelReplyRoute, dispatchPromptOverNcp, getUnsignedUpdateManifest, hasLlmUsageTelemetry, isContextCompactionTimelineMessage, isReplyCapableChannel, listExtensionChannelIds, normalizeAgentRuntimeSessionTypeIcon, normalizeLlmUsageModel, normalizeOptionalString, parseSkillFrontmatter, projectNcpMessagesWithContextCompaction, readLearningLoopRuntimeConfig, readMetadataModel, readMetadataThinking, resolveAgentHandoffDepth, resolveAgentRuntimeEntries, resolveChannelReplyRoute, resolveEffectiveModel, resolveLegacyEventType, resolveSessionChannelContext, runGatewayInboundLoop, runPromptOverNcp, sanitizeLlmUsage, serializeUnsignedUpdateManifest, streamPromptOverNcp, stripSkillFrontmatter, syncSessionThinkingPreference, toNcpMessages, upsertContextCompactionTimelineMessage, waitForAgentRuntimeSessionReply };
+export { AgentManager, AgentRunClient, AgentRunRequestManager, AgentRuntimeManager, AgentRuntimeRegistry, AutomationManager, BuiltinNarpRuntimeProviderService, CONTEXT_COMPACTION_TIMELINE_KIND, ChannelManager, ConfigManager, ContextCompactionManager, ContextCompactionPreflightService, ContextWindowPreviewManager, DEFAULT_AGENT_RUNTIME_ENTRY_ID, ExtensionManager, GatewayInboundProcessor, LlmProviderManager, LlmUsageManager, LlmUsageStore, McpManager, NARP_HTTP_RUNTIME_KIND, NARP_STDIO_RUNTIME_KIND, NEXTCLAW_TIMELINE_KIND_METADATA_KEY, NativeAgentRuntimeFactory, NcpAgentSessionJournalStore, NcpSessionManager, NextclawKernel, NextclawNcpContextBuilder, ProviderManagerNcpLLMApi, SessionRequestManager, SessionRunManager, SkillManager, ToolManager, UpdateManifestReader, buildAgentRunSendPayload, buildContextCompactionTimelineNcpMessage, buildLlmUsageSummary, buildLocalizedTextMap, buildSessionOrchestrationSection, buildUserMessageParts, createAgentRuntimeSessionRequestDispatcher, createAssetTools, createContextWindowSignature, createLlmUsageRecord, dispatchAgentRuntimeSessionRequest, dispatchChannelReplyRoute, dispatchPromptOverNcp, getUnsignedUpdateManifest, hasLlmUsageTelemetry, isContextCompactionTimelineMessage, isContextWindowSnapshot, isReplyCapableChannel, listExtensionChannelIds, normalizeAgentRuntimeSessionTypeIcon, normalizeLlmUsageModel, normalizeOptionalString, parseSkillFrontmatter, projectNcpMessagesWithContextCompaction, readContextWindowEventSessionId, readLearningLoopRuntimeConfig, readMetadataModel, readMetadataThinking, resolveAgentHandoffDepth, resolveAgentRuntimeEntries, resolveChannelReplyRoute, resolveEffectiveModel, resolveLegacyEventType, resolveNextclawNcpRunContext, resolveSessionChannelContext, runGatewayInboundLoop, sanitizeLlmUsage, serializeUnsignedUpdateManifest, shouldRefreshContextWindowDuringStream, shouldRefreshContextWindowImmediately, stripSkillFrontmatter, syncSessionThinkingPreference, toNcpMessages, upsertContextCompactionTimelineMessage, waitForAgentRuntimeSessionReply };
 
 //# sourceMappingURL=index.js.map