@nextclaw/kernel 0.4.3 → 0.5.0

package/dist/index.js

@@ -1,10 +1,10 @@
 import { n as getUnsignedUpdateManifest, r as serializeUnsignedUpdateManifest, t as UpdateManifestReader } from "./update-manifest.types-C0qPrjGQ.js";
 import { createRequire } from "node:module";
+import { APP_NAME, AgentRouteResolver, BUILTIN_MAIN_AGENT_ID, CLEAR_THINKING_TOKENS, CONTEXT_COMPACTION_METADATA_KEY, ConfigSchema, ContextCompactionService, ContextWindowBudgetService, CronService, CronTool, DEFAULT_PANELS_DIR, DEFAULT_SERVICE_APPS_DIR, DEFAULT_SESSION_SEARCH_LIMIT, DEFAULT_WORKSPACE_REPOSITORY_IDENTITY_RESOLVER, EditFileTool, ExecTool, ExtensionChannelAdapter, GatewayTool, InputBudgetPruner, LLMProvider, ListDirTool, LiteLLMProvider, MAX_SESSION_SEARCH_LIMIT, MemoryGetTool, MemorySearchTool, MemoryStore, MessageBus, MessageTool, ProviderRegistry, ReadFileTool, RequestedSkillsMetadataReader, SILENT_REPLY_TOKEN, SessionProjectContextResolver, SessionSearchService, SkillsLoader, THINKING_LEVELS, WebFetchTool, WebSearchTool, WriteFileTool, buildCompressingCompactionCheckpoint, buildConfigSchema, buildContextWindowSnapshot, buildReloadPlan, buildSessionRequestToolResult, buildToolCatalogEntries, createAgentProfile, createAssistantStreamDeltaControlMessage, createAssistantStreamResetControlMessage, createCompletedSessionRequest, createFailedSessionRequest, createRunningSessionRequest, createRuntimeChildEnv, createTypingStopControlMessage, diffConfigPaths, ensureDir, evaluateSilentReply, expandHome, findEffectiveAgentProfile, getConfigPath, getDataDir, getDataPath, getSessionsPath, getWorkspacePath, getWorkspacePathFromConfig, isNextclawControlMessage, loadConfig, mergeExtensionConfigView, modelSupportsVision, normalizeAgentProfileId, normalizeInlineSecretRefs, normalizeProviderModelConfig, normalizeToolParams, parseAgentScopedSessionKey, parseThinkingLevel, readCompressedContextCompactionCheckpoint, readOptionalString, readParentSessionId, readSessionProjectRoot, redactConfigObject, removeAgentProfile, resolveConfigSecrets, resolveDefaultAgentProfileId, resolveEffectiveAgentProfiles, resolveNextclawSelfManageGuidePaths, resolveProviderRuntime, resolveSessionWorkspacePath, resolveThinkingLevel, sanitizeOutboundAssistantContent, saveConfig, summarizeSessionRequestTask, toExtensionConfigView, updateAgentProfile } from "@nextclaw/core";
 import { NcpEventType, sanitizeAssistantReplyTags } from "@nextclaw/ncp";
-import { APP_NAME, AgentRouteResolver, BUILTIN_MAIN_AGENT_ID, CLEAR_THINKING_TOKENS, CONTEXT_COMPACTION_METADATA_KEY, ChannelManager, ChannelManager as ChannelManager$1, ConfigSchema, ContextCompactionService, ContextWindowBudgetService, CronService, CronTool, DEFAULT_PANELS_DIR, DEFAULT_SERVICE_APPS_DIR, DEFAULT_SESSION_SEARCH_LIMIT, DEFAULT_WORKSPACE_REPOSITORY_IDENTITY_RESOLVER, EditFileTool, ExecTool, GatewayTool, InputBudgetPruner, LLMProvider, ListDirTool, LiteLLMProvider, MAX_SESSION_SEARCH_LIMIT, MemoryGetTool, MemorySearchTool, MemoryStore, MessageBus, MessageTool, ProviderRegistry, ReadFileTool, RequestedSkillsMetadataReader, SILENT_REPLY_TOKEN, SessionProjectContextResolver, SessionSearchManager, SkillsLoader, THINKING_LEVELS, WebFetchTool, WebSearchTool, WriteFileTool, buildCompressingCompactionCheckpoint, buildConfigSchema, buildContextWindowSnapshot, buildReloadPlan, buildSessionRequestToolResult, buildToolCatalogEntries, createAssistantStreamDeltaControlMessage, createAssistantStreamResetControlMessage, createCompletedSessionRequest, createFailedSessionRequest, createRunningSessionRequest, createRuntimeChildEnv, createTypingStopControlMessage, diffConfigPaths, ensureDir, expandHome, findEffectiveAgentProfile, getConfigPath, getDataDir, getDataPath, getSessionsPath, getWorkspacePath, getWorkspacePathFromConfig, loadConfig, mergeExtensionConfigView, modelSupportsVision, normalizeInlineSecretRefs, normalizeProviderModelConfig, normalizeToolParams, parseAgentScopedSessionKey, parseThinkingLevel, readCompressedContextCompactionCheckpoint, readOptionalString, readParentSessionId, readSessionProjectRoot, redactConfigObject, resolveConfigSecrets, resolveDefaultAgentProfileId, resolveNextclawSelfManageGuidePaths, resolveProviderRuntime, resolveSessionWorkspacePath, resolveThinkingLevel, saveConfig, summarizeSessionRequestTask, toDisposable, toExtensionConfigView } from "@nextclaw/core";
 import { LocalAssetStore, buildAssetContentPath, buildNcpUserContent, buildOpenAiFunctionTool, ncpMessageToOpenAiMessages, validateToolArgs } from "@nextclaw/ncp-agent-runtime";
 import { createHash, createHmac, randomBytes, randomUUID, scryptSync, timingSafeEqual } from "node:crypto";
-import { EventBus, Ingress, eventKeys, ingressKeys } from "@nextclaw/shared";
+import { EventBus, Ingress, eventKeys, ingressKeys, isRuntimeDefaultModelValue, normalizeRuntimeModelSelectionMode } from "@nextclaw/shared";
 import { catchError, from, lastValueFrom, tap } from "rxjs";
 import { appendFileSync, chmodSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { basename, delimiter, dirname, extname, isAbsolute, join, normalize, relative, resolve } from "node:path";
@@ -21,34 +21,55 @@ import { StdioRuntimeConfigResolver, StdioRuntimeNcpAgentRuntime, probeStdioRunt
 import { DefaultNcpAgentRuntime } from "@nextclaw/ncp-agent-runtime-next";
 //#region src/managers/agent.manager.ts
 var AgentManager = class {
-	listAgents = () => {
-		throw new Error("AgentManager.listAgents is not implemented.");
-	};
-	getAgent = (agentId) => {
-		throw new Error("AgentManager.getAgent is not implemented.");
-	};
-	requireAgent = (agentId) => {
-		throw new Error("AgentManager.requireAgent is not implemented.");
-	};
-	saveAgent = (agent) => {
-		throw new Error("AgentManager.saveAgent is not implemented.");
-	};
-	removeAgent = (agentId) => {
-		throw new Error("AgentManager.removeAgent is not implemented.");
-	};
-	attachSkill = (agentId, skillId) => {
-		throw new Error("AgentManager.attachSkill is not implemented.");
-	};
-	detachSkill = (agentId, skillId) => {
-		throw new Error("AgentManager.detachSkill is not implemented.");
-	};
-	attachTool = (agentId, toolId) => {
-		throw new Error("AgentManager.attachTool is not implemented.");
-	};
-	detachTool = (agentId, toolId) => {
-		throw new Error("AgentManager.detachTool is not implemented.");
+	constructor(configManager, options = {}) {
+		this.configManager = configManager;
+		this.options = options;
+	}
+	listAgents = () => resolveEffectiveAgentProfiles(this.loadConfig());
+	getAgent = (agentId) => findEffectiveAgentProfile(this.loadConfig(), agentId);
+	getDefaultAgentId = () => resolveDefaultAgentProfileId(this.loadConfig());
+	resolveAgentProfile = (agentId) => this.resolveAgentProfileFromConfig(this.loadConfig(), agentId);
+	resolveAgentProfileForRun = (params = {}) => this.resolveAgentProfile(params.agentId ?? params.storedAgentId ?? readRequestedAgentId(params.requestMetadata ?? {}) ?? null);
+	createAgent = async (input) => {
+		const agent = createAgentProfile(input, {
+			configPath: this.options.configPath,
+			initializeHomeDirectory: this.options.initializeAgentHomeDirectory
+		});
+		await this.reloadLiveConfig();
+		return agent;
+	};
+	updateAgent = async (input) => {
+		const agent = updateAgentProfile(input, { configPath: this.options.configPath });
+		await this.reloadLiveConfig();
+		return agent;
+	};
+	removeAgent = async (agentId) => {
+		const removed = removeAgentProfile(agentId, { configPath: this.options.configPath });
+		if (removed) await this.reloadLiveConfig();
+		return removed;
+	};
+	loadConfig = () => this.configManager?.loadConfig() ?? loadConfig(this.options.configPath);
+	reloadLiveConfig = async () => {
+		await this.configManager?.applyLiveConfigReload();
+	};
+	resolveAgentProfileFromConfig = (config, agentId) => {
+		const profile = findEffectiveAgentProfile(config, normalizeAgentProfileId(agentId) || resolveDefaultAgentProfileId(config)) ?? findEffectiveAgentProfile(config, resolveDefaultAgentProfileId(config));
+		if (!profile) throw new Error(`default agent profile not found: ${BUILTIN_MAIN_AGENT_ID}`);
+		const contextTokens = profile.contextTokens ?? config.agents.defaults.contextTokens;
+		return {
+			...profile,
+			contextTokens,
+			model: profile.model ?? config.agents.defaults.model,
+			reservedContextTokens: ContextWindowBudgetService.resolveReservedContextTokens({
+				contextTokens,
+				configuredReservedContextTokens: profile.reservedContextTokens ?? config.agents.defaults.reservedContextTokens
+			})
+		};
 	};
 };
+function readRequestedAgentId(metadata) {
+	return normalizeAgentProfileId(metadata.agent_id) || normalizeAgentProfileId(metadata.agentId) || null;
+}
 //#endregion
 //#region src/utils/ncp-message-bridge.utils.ts
 function normalizeString$1(value) {
@@ -256,23 +277,6 @@ function shouldRefreshContextWindowImmediately(event) {
 //#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$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$1(storedAgentId)?.toLowerCase() ?? readRequestedAgentId$1(requestMetadata) ?? defaultAgentId) ?? findEffectiveAgentProfile(config, defaultAgentId);
-	return {
-		contextTokens: profile?.contextTokens ?? defaults.contextTokens,
-		model: profile?.model ?? defaults.model,
-		reservedContextTokens: ContextWindowBudgetService.resolveReservedContextTokens({
-			contextTokens: profile?.contextTokens ?? defaults.contextTokens,
-			configuredReservedContextTokens: profile?.reservedContextTokens ?? defaults.reservedContextTokens
-		})
-	};
-}
 function mergeInputMessages(params) {
 	const messages = params.sessionMessages.map((message) => structuredClone(message));
 	const seen = new Set(messages.map((message) => message.id));
@@ -304,13 +308,13 @@ function buildContextWindowSnapshotFromBudget(params) {
 var ContextCompactionPreflightService = class {
 	compactionService = new ContextCompactionService();
 	contextWindowBudgetService = new ContextWindowBudgetService();
-	constructor(options) {
-		this.options = options;
+	constructor(agentManager, providerManager) {
+		this.agentManager = agentManager;
+		this.providerManager = providerManager;
 	}
 	preview = (params) => {
 		const { requestMetadata, sessionId, sessionMessages, storedAgentId, storedMetadata } = params;
-		const profile = resolveCompactionProfile({
-			config: this.options.configManager.loadConfig(),
+		const profile = this.resolveCompactionProfile({
 			requestMetadata,
 			storedAgentId
 		});
@@ -331,8 +335,7 @@ var ContextCompactionPreflightService = class {
 	};
 	begin = (params) => {
 		const { inputMessages, requestMetadata, sessionId, sessionMessages, storedAgentId, storedMetadata } = params;
-		const profile = resolveCompactionProfile({
-			config: this.options.configManager.loadConfig(),
+		const profile = this.resolveCompactionProfile({
 			requestMetadata,
 			storedAgentId
 		});
@@ -429,9 +432,9 @@ var ContextCompactionPreflightService = class {
 		};
 	};
 	generateSummary = async (params) => {
-		if (!this.options.providerManager) throw new Error("context compaction summary generation requires a provider manager");
+		if (!this.providerManager) throw new Error("context compaction summary generation requires a provider manager");
 		const { messages, model } = params;
-		const summary = (await this.options.providerManager.chat({
+		const summary = (await this.providerManager.chat({
 			model,
 			maxTokens: SUMMARY_MAX_TOKENS,
 			messages: [{
@@ -458,14 +461,24 @@ var ContextCompactionPreflightService = class {
 		if (!summary) throw new Error("context compaction summary is empty");
 		return summary;
 	};
+	resolveCompactionProfile = (params) => {
+		const profile = this.agentManager.resolveAgentProfileForRun({
+			requestMetadata: params.requestMetadata,
+			storedAgentId: params.storedAgentId
+		});
+		return {
+			contextTokens: profile.contextTokens,
+			model: profile.model,
+			reservedContextTokens: profile.reservedContextTokens
+		};
+	};
 };
 //#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 });
+	constructor(agentManager) {
+		this.preflightService = new ContextCompactionPreflightService(agentManager);
 	}
 	preview = (params) => {
 		const { requestMetadata, sessionId, sessionMessages, storedAgentId, storedMetadata } = params;
@@ -482,12 +495,9 @@ var ContextWindowPreviewManager = class {
 //#region src/managers/agent-run-context-compaction.manager.ts
 var AgentRunContextCompactionManager = class {
 	preflightService;
-	constructor(configManager, providerManager, sessionManager) {
+	constructor(agentManager, providerManager, sessionManager) {
 		this.sessionManager = sessionManager;
-		this.preflightService = new ContextCompactionPreflightService({
-			configManager,
-			providerManager
-		});
+		this.preflightService = new ContextCompactionPreflightService(agentManager, providerManager);
 	}
 	runPreflight = async (input) => {
 		const beginResult = this.preflightService.begin({
@@ -519,7 +529,7 @@ var AgentRunContextCompactionManager = class {
 //#region src/managers/agent-run-request.manager.ts
 function toAgentRunRequest(envelope) {
 	const metadata = envelope.metadata ?? {};
-	const peerId = readOptionalString$9(envelope.peerId);
+	const peerId = readOptionalString$10(envelope.peerId);
 	const requestMetadata = {
 		agentRuntimeId: metadata.agentRuntimeId,
 		agentId: metadata.agentId,
@@ -532,7 +542,7 @@ function toAgentRunRequest(envelope) {
 		thinkingEffort: metadata.thinkingEffort
 	};
 	if (Array.isArray(envelope.content)) {
-		const sessionId = readOptionalString$9(envelope.sessionId);
+		const sessionId = readOptionalString$10(envelope.sessionId);
 		if (sessionId && peerId) throw new Error("agent-run.send cannot accept both sessionId and peerId.");
 		return {
 			...requestMetadata,
@@ -550,8 +560,8 @@ function toAgentRunRequest(envelope) {
 	}
 	const sourceMessage = envelope.message;
 	if (!sourceMessage) throw new Error("Invalid agent run send request.");
-	const envelopeSessionId = readOptionalString$9(envelope.sessionId);
-	const messageSessionId = readOptionalString$9(sourceMessage.sessionId);
+	const envelopeSessionId = readOptionalString$10(envelope.sessionId);
+	const messageSessionId = readOptionalString$10(sourceMessage.sessionId);
 	const sessionId = envelopeSessionId ?? messageSessionId;
 	if (sessionId && peerId) throw new Error("agent-run.send cannot accept both sessionId and peerId.");
 	const message = {
@@ -570,7 +580,7 @@ function toAgentRunRequest(envelope) {
 		message
 	};
 }
-function readOptionalString$9(value) {
+function readOptionalString$10(value) {
 	if (typeof value !== "string") return;
 	return value.trim() || void 0;
 }
@@ -592,8 +602,9 @@ function readMessageTask(message) {
 var AgentRunRequestManager = class {
 	cleanups = [];
 	started = false;
-	constructor(agentRuntimeManager, configManager, contextProviderManager, eventBus, ingress, sessionManager, sessionRunManager, toolProviderManager) {
+	constructor(agentRuntimeManager, agentManager, configManager, contextProviderManager, eventBus, ingress, sessionManager, sessionRunManager, toolProviderManager) {
 		this.agentRuntimeManager = agentRuntimeManager;
+		this.agentManager = agentManager;
 		this.configManager = configManager;
 		this.contextProviderManager = contextProviderManager;
 		this.eventBus = eventBus;
@@ -675,7 +686,7 @@ var AgentRunRequestManager = class {
 			}
 		})();
 		const model = request.model ?? session.model ?? this.configManager.getDefaultModel();
-		const agentId = request.agentId ?? session.agentId ?? resolveDefaultAgentProfileId(this.configManager.loadConfig());
+		const agentId = request.agentId ?? session.agentId ?? this.agentManager.getDefaultAgentId();
 		const spec = {
 			runId: activeRun.runId,
 			agentId,
@@ -749,6 +760,126 @@ var AgentRunRequestManager = class {
 //#region src/configs/agent-runtime.config.ts
 const DEFAULT_AGENT_RUNTIME_ENTRY_ID = "native";
 //#endregion
+//#region src/features/runtime-registry/utils/agent-runtime-registry.utils.ts
+function normalizeIdentifier(value) {
+	if (typeof value !== "string") return null;
+	const normalized = value.trim().toLowerCase();
+	return normalized.length > 0 ? normalized : null;
+}
+function normalizeAgentRuntimeSessionTypeIcon(value) {
+	if (typeof value === "string") {
+		const src = value.trim();
+		return src ? {
+			kind: "image",
+			src
+		} : null;
+	}
+	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	const iconRecord = value;
+	const src = typeof iconRecord.src === "string" ? iconRecord.src.trim() : "";
+	if (!src) return null;
+	const alt = typeof iconRecord.alt === "string" && iconRecord.alt.trim().length > 0 ? iconRecord.alt.trim() : null;
+	return {
+		kind: "image",
+		src,
+		...alt ? { alt } : {}
+	};
+}
+const BUILTIN_RUNTIME_PRESENTATION = { hermes: {
+	label: "Hermes",
+	icon: {
+		kind: "image",
+		src: "app://runtime-icons/hermes-agent.png",
+		alt: "Hermes"
+	}
+} };
+function readString$6(value) {
+	if (typeof value !== "string") return;
+	return value.trim() || void 0;
+}
+function readRecord$3(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	return value;
+}
+function resolveBuiltinRuntimePresentation(value) {
+	const normalized = readString$6(value)?.toLowerCase();
+	if (!normalized) return null;
+	if (!(normalized in BUILTIN_RUNTIME_PRESENTATION)) return null;
+	return BUILTIN_RUNTIME_PRESENTATION[normalized] ?? null;
+}
+function buildNativeRuntimeEntry(config) {
+	const nativeRuntimeConfig = readRecord$3(config.ui?.ncp?.runtimes?.native) ?? {};
+	return {
+		id: DEFAULT_AGENT_RUNTIME_ENTRY_ID,
+		label: "Native",
+		type: DEFAULT_AGENT_RUNTIME_ENTRY_ID,
+		enabled: nativeRuntimeConfig.enabled !== false,
+		config: nativeRuntimeConfig
+	};
+}
+function resolveAgentRuntimeEntries(params) {
+	const entries = /* @__PURE__ */ new Map();
+	entries.set(DEFAULT_AGENT_RUNTIME_ENTRY_ID, buildNativeRuntimeEntry(params.config));
+	for (const [rawId, rawEntry] of Object.entries(params.config.agents.runtimes.entries ?? {})) {
+		const id = rawId.trim().toLowerCase();
+		const type = readString$6(rawEntry.type)?.toLowerCase();
+		if (!id || !type) continue;
+		const explicitIcon = normalizeAgentRuntimeSessionTypeIcon(rawEntry.icon);
+		const builtinPresentation = resolveBuiltinRuntimePresentation(id) ?? resolveBuiltinRuntimePresentation(type);
+		entries.set(id, {
+			id,
+			label: readString$6(rawEntry.label) ?? builtinPresentation?.label ?? id,
+			...explicitIcon ?? builtinPresentation?.icon ? { icon: explicitIcon ?? builtinPresentation?.icon } : {},
+			type,
+			enabled: rawEntry.enabled !== false,
+			config: rawEntry.config ? { ...rawEntry.config } : {}
+		});
+	}
+	return {
+		defaultEntryId: entries.has("native") ? DEFAULT_AGENT_RUNTIME_ENTRY_ID : [...entries.keys()][0] ?? "native",
+		entries: [...entries.values()]
+	};
+}
+async function describeAgentRuntimeSessionTypes(params) {
+	const entries = params.entries.filter((entry) => entry.enabled !== false);
+	return {
+		defaultType: normalizeIdentifier(params.defaultEntryId) ?? (entries.some((entry) => entry.id === "native") ? "native" : entries[0]?.id ?? "native"),
+		options: await Promise.all(entries.map(async (entry) => {
+			const provider = params.providers.get(entry.type);
+			if (!provider) return {
+				value: entry.id,
+				label: entry.label,
+				icon: entry.icon ?? null,
+				ready: false,
+				reason: "runtime_provider_unavailable",
+				reasonMessage: `Runtime provider unavailable for type "${entry.type}".`,
+				recommendedModel: null,
+				modelSelectionMode: "nextclaw",
+				cta: {
+					kind: "settings",
+					label: "Configure Runtime"
+				}
+			};
+			const descriptor = provider.describeSessionTypeForEntry ? await provider.describeSessionTypeForEntry({
+				entry,
+				describeParams: params.describeParams
+			}) : await provider.describeSessionType?.(params.describeParams);
+			return {
+				value: entry.id,
+				label: entry.label,
+				icon: descriptor?.icon ?? entry.icon ?? null,
+				ready: descriptor?.ready ?? true,
+				reason: descriptor?.reason ?? null,
+				reasonMessage: descriptor?.reasonMessage ?? null,
+				recommendedModel: descriptor?.recommendedModel ?? null,
+				modelSelectionMode: descriptor?.modelSelectionMode ?? "nextclaw",
+				cta: descriptor?.cta ?? null,
+				...descriptor?.supportedModels ? { supportedModels: descriptor.supportedModels } : {}
+			};
+		}))
+	};
+}
+//#endregion
 //#region src/managers/agent-runtime.manager.ts
 var AgentRuntimeManager = class {
 	providers = /* @__PURE__ */ new Map();
@@ -794,31 +925,11 @@ var AgentRuntimeManager = class {
 		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
-		};
-	};
+	listSessionTypes = async (params) => describeAgentRuntimeSessionTypes({
+		entries: [...this.entries.values()],
+		providers: this.providers,
+		describeParams: params
+	});
 	dispose = async () => {
 		await this.disposeAllRuntimes();
 		this.providers.clear();
@@ -1159,6 +1270,117 @@ var AutomationManager = class extends CronService {
 	}
 };
 //#endregion
+//#region src/managers/channel.manager.ts
+var ChannelManager = class {
+	channels = {};
+	channelConfig = null;
+	dispatching = false;
+	dispatchTask = null;
+	extensionChannels = [];
+	constructor(deps) {
+		this.deps = deps;
+	}
+	load = (params) => {
+		this.channelConfig = params.channelConfig;
+		this.extensionChannels = params.extensionChannels ?? [];
+		this.channels = {};
+		this.initChannels();
+	};
+	reload = async (params) => {
+		await this.stop();
+		this.load(params);
+		if (params.start === true) await this.start();
+	};
+	start = async () => {
+		if (!Object.keys(this.channels).length || this.dispatching) return;
+		this.dispatching = true;
+		this.dispatchTask = this.dispatchOutbound();
+		await Promise.allSettled(Object.entries(this.channels).map(([name, channel]) => this.startChannel(name, channel)));
+	};
+	stop = async () => {
+		this.dispatching = false;
+		if (this.dispatchTask) {
+			await this.deps.bus.publishOutbound({
+				channel: "__control__",
+				chatId: "",
+				content: "",
+				media: [],
+				metadata: { reason: "shutdown" }
+			});
+			await this.dispatchTask;
+		}
+		await Promise.allSettled(Object.entries(this.channels).map(async ([name, channel]) => {
+			try {
+				await channel.stop();
+			} catch (error) {
+				console.error(`Error stopping ${name}: ${String(error)}`);
+			}
+		}));
+		this.dispatchTask = null;
+	};
+	status = () => Object.fromEntries(Object.entries(this.channels).map(([name, channel]) => [name, {
+		enabled: true,
+		running: channel.isRunning
+	}]));
+	get enabledChannels() {
+		return Object.keys(this.channels);
+	}
+	getChannel = (name) => this.channels[name] ?? null;
+	deliver = async (message) => {
+		const channel = this.channels[message.channel];
+		if (!channel) return false;
+		if (isNextclawControlMessage(message)) {
+			await channel.handleControlMessage(message);
+			return true;
+		}
+		const outbound = this.normalizeOutbound(message);
+		if (!outbound) return true;
+		await channel.send(outbound);
+		return true;
+	};
+	initChannels = () => {
+		if (!this.channelConfig) return;
+		for (const registration of this.extensionChannels) {
+			const id = registration.channel.id;
+			if (!id) continue;
+			if (this.channels[id]) {
+				console.warn(`Extension channel ignored because id already exists: ${id}`);
+				continue;
+			}
+			this.channels[id] = new ExtensionChannelAdapter(this.channelConfig, this.deps.bus, registration);
+		}
+	};
+	startChannel = async (name, channel) => {
+		try {
+			await channel.start();
+		} catch (error) {
+			console.error(`Failed to start channel ${name}: ${String(error)}`);
+		}
+	};
+	normalizeOutbound = (message) => {
+		const silentReplyDecision = evaluateSilentReply({
+			content: sanitizeOutboundAssistantContent(message.content ?? ""),
+			media: message.media
+		});
+		if (silentReplyDecision.shouldDrop) return null;
+		if (silentReplyDecision.content === message.content) return message;
+		return {
+			...message,
+			content: silentReplyDecision.content
+		};
+	};
+	dispatchOutbound = async () => {
+		while (this.dispatching) {
+			const message = await this.deps.bus.consumeOutbound();
+			try {
+				await this.deliver(message);
+			} catch (error) {
+				console.error(`Error sending to ${message.channel}: ${String(error)}`);
+			}
+		}
+	};
+};
+//#endregion
 //#region src/managers/config.manager.ts
 const hashRaw = (raw) => createHash("sha256").update(raw).digest("hex");
 const mergeDeep = (base, patch) => {
@@ -1769,21 +1991,6 @@ var CommandRegistry = class {
 };
 //#endregion
 //#region src/features/extension-runtime/services/extension-lifecycle.service.ts
-function sanitizeExtensionNodeOptions(value) {
-	if (!value?.trim()) return;
-	const tokens = value.split(/\s+/).filter(Boolean);
-	const sanitized = [];
-	for (let index = 0; index < tokens.length; index += 1) {
-		const token = tokens[index];
-		if (token === "--conditions=development" || token === "-C=development") continue;
-		if ((token === "--conditions" || token === "-C") && tokens[index + 1] === "development") {
-			index += 1;
-			continue;
-		}
-		sanitized.push(token);
-	}
-	return sanitized.length > 0 ? sanitized.join(" ") : void 0;
-}
 var ExtensionLifecycleService = class {
 	processes = /* @__PURE__ */ new Map();
 	startAll = (manifests, params) => {
@@ -1813,14 +2020,12 @@ var ExtensionLifecycleService = class {
 		if (existing) return existing;
 		const child = spawn(manifest.server.command === "node" || manifest.server.command === "node.exe" ? process.execPath : manifest.server.command, manifest.server.args ?? [], {
 			cwd: manifest.rootDir,
-			env: {
-				...process.env,
-				NODE_OPTIONS: sanitizeExtensionNodeOptions(process.env.NODE_OPTIONS),
+			env: createRuntimeChildEnv(process.env, {
 				...manifest.server.env,
 				NEXTCLAW_EXTENSION_ID: manifest.id,
 				NEXTCLAW_EXTENSION_ENDPOINT: params.endpoint,
 				NEXTCLAW_EXTENSION_TOKEN: params.tokenForExtension(manifest.id)
-			},
+			}, { inheritBaseEnv: true }),
 			stdio: [
 				"ignore",
 				"ignore",
@@ -1860,7 +2065,7 @@ const BUILTIN_EXTENSION_PACKAGES = [
 	"@nextclaw/channel-extension-weixin"
 ];
 const runtimeRequire = createRequire(import.meta.url);
-function readString$6(value) {
+function readString$5(value) {
 	return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
 function readStringArray$2(value) {
@@ -1871,7 +2076,7 @@ function readStringRecord(value) {
 	const entries = Object.entries(value);
 	return entries.every(([, item]) => typeof item === "string") ? Object.fromEntries(entries) : void 0;
 }
-function readRecord$3(value) {
+function readRecord$2(value) {
 	return value && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
 function uniquePaths(paths) {
@@ -1908,17 +2113,17 @@ function resolveDevFirstPartyExtensionDir(explicitDir = process.env.NEXTCLAW_DEV
 function toManifest(value, rootDir) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("extension manifest must be an object");
 	const record = value;
-	const server = readRecord$3(record.server);
-	const id = readString$6(record.id);
-	const command = readString$6(server.command);
+	const server = readRecord$2(record.server);
+	const id = readString$5(record.id);
+	const command = readString$5(server.command);
 	if (!id) throw new Error("extension manifest id is required");
 	if (server.type !== "stdio") throw new Error("extension server.type must be stdio");
 	if (!command) throw new Error("extension server.command is required");
 	return {
 		id,
 		rootDir,
-		...readString$6(record.name) ? { name: readString$6(record.name) } : {},
-		...readString$6(record.version) ? { version: readString$6(record.version) } : {},
+		...readString$5(record.name) ? { name: readString$5(record.name) } : {},
+		...readString$5(record.version) ? { version: readString$5(record.version) } : {},
 		server: {
 			type: "stdio",
 			command,
@@ -2022,19 +2227,19 @@ function listExtensionChannelIds(params) {
 //#region src/services/extension-runtime.service.ts
 const EXTENSION_REQUEST_EVENT_TYPE = "extension.request";
 const EXTENSION_REQUEST_TIMEOUT_MS = 6e4;
-function readString$5(value) {
+function readString$4(value) {
 	return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
-function readRecord$2(value) {
+function readRecord$1(value) {
 	return value && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
-function readRequiredString$4(value, name) {
-	const trimmed = readString$5(value);
+function readRequiredString$5(value, name) {
+	const trimmed = readString$4(value);
 	if (!trimmed) throw new Error(`${name} is required`);
 	return trimmed;
 }
 function readTextContent(value) {
-	const content = readRecord$2(value);
+	const content = readRecord$1(value);
 	if (content.type !== "text" || typeof content.text !== "string") throw new Error("only text channel messages are supported by the first ingress bridge");
 	return content.text;
 }
@@ -2044,35 +2249,35 @@ function readOptionalNumber(value) {
 function readInboundAttachments(value) {
 	if (!Array.isArray(value)) return [];
 	return value.filter((entry) => Boolean(entry && typeof entry === "object" && !Array.isArray(entry))).map((entry) => ({
-		...readString$5(entry.id) ? { id: readString$5(entry.id) } : {},
-		...readString$5(entry.name) ? { name: readString$5(entry.name) } : {},
-		...readString$5(entry.path) ? { path: readString$5(entry.path) } : {},
-		...readString$5(entry.url) ? { url: readString$5(entry.url) } : {},
-		...readString$5(entry.assetUri) ? { assetUri: readString$5(entry.assetUri) } : {},
-		...readString$5(entry.mimeType) ? { mimeType: readString$5(entry.mimeType) } : {},
+		...readString$4(entry.id) ? { id: readString$4(entry.id) } : {},
+		...readString$4(entry.name) ? { name: readString$4(entry.name) } : {},
+		...readString$4(entry.path) ? { path: readString$4(entry.path) } : {},
+		...readString$4(entry.url) ? { url: readString$4(entry.url) } : {},
+		...readString$4(entry.assetUri) ? { assetUri: readString$4(entry.assetUri) } : {},
+		...readString$4(entry.mimeType) ? { mimeType: readString$4(entry.mimeType) } : {},
 		...readOptionalNumber(entry.size) !== void 0 ? { size: readOptionalNumber(entry.size) } : {},
-		...readString$5(entry.source) ? { source: readString$5(entry.source) } : {},
+		...readString$4(entry.source) ? { source: readString$4(entry.source) } : {},
 		...entry.status === "ready" || entry.status === "remote-only" ? { status: entry.status } : {},
-		...readString$5(entry.errorCode) ? { errorCode: readString$5(entry.errorCode) } : {}
+		...readString$4(entry.errorCode) ? { errorCode: readString$4(entry.errorCode) } : {}
 	}));
 }
 function toInboundMessage(value) {
-	const payload = readRecord$2(value);
+	const payload = readRecord$1(value);
 	return {
-		channel: readRequiredString$4(payload.channelId, "channelId"),
-		chatId: readRequiredString$4(payload.conversationId, "conversationId"),
-		senderId: readRequiredString$4(payload.senderId, "senderId"),
+		channel: readRequiredString$5(payload.channelId, "channelId"),
+		chatId: readRequiredString$5(payload.conversationId, "conversationId"),
+		senderId: readRequiredString$5(payload.senderId, "senderId"),
 		content: readTextContent(payload.content),
 		timestamp: /* @__PURE__ */ new Date(),
 		attachments: readInboundAttachments(payload.attachments),
-		metadata: readRecord$2(payload.metadata)
+		metadata: readRecord$1(payload.metadata)
 	};
 }
 function normalizeChannelConfigResult(value) {
-	return readRecord$2(readRecord$2(value).channelConfig);
+	return readRecord$1(readRecord$1(value).channelConfig);
 }
 function normalizeAuthLoginResult(value) {
-	const record = readRecord$2(value);
+	const record = readRecord$1(value);
 	return {
 		channelConfig: normalizeChannelConfigResult(record),
 		accountId: typeof record.accountId === "string" ? record.accountId : null,
@@ -2081,11 +2286,11 @@ function normalizeAuthLoginResult(value) {
 }
 function normalizeAuthPollResult(value) {
 	if (!value) return null;
-	const record = readRecord$2(value);
+	const record = readRecord$1(value);
 	return {
-		channel: readRequiredString$4(record.channel, "channel"),
+		channel: readRequiredString$5(record.channel, "channel"),
 		status: record.status,
-		message: readString$5(record.message),
+		message: readString$4(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") : [],
@@ -2181,7 +2386,7 @@ var ExtensionRuntimeService = class {
 		if (running.length > 0) console.log(`✓ Extensions started: ${running.map((entry) => entry.manifest.id).join(", ")}`);
 	};
 	getExtensionProcessToken = (extensionId) => {
-		const id = readRequiredString$4(extensionId, "extensionId");
+		const id = readRequiredString$5(extensionId, "extensionId");
 		const current = this.extensionTokens.get(id);
 		if (current) return current;
 		const token = randomUUID();
@@ -2189,8 +2394,8 @@ var ExtensionRuntimeService = class {
 		return token;
 	};
 	authenticateEventStreamCredential = (input) => {
-		const extensionId = readString$5(input.extensionId);
-		const token = readString$5(input.token);
+		const extensionId = readString$4(input.extensionId);
+		const token = readString$4(input.token);
 		if (!extensionId || !token || token !== this.extensionTokens.get(extensionId)) return null;
 		return { extensionId };
 	};
@@ -2209,7 +2414,7 @@ var ExtensionRuntimeService = class {
 		const channelBindings = [];
 		const uiMetadata = [];
 		for (const manifest of manifests) for (const channel of manifest.contributes?.channels ?? []) {
-			const channelId = readString$5(channel.id);
+			const channelId = readString$4(channel.id);
 			if (!channelId) continue;
 			const configUiHints = this.readConfigUiHints(channel.configUiHints);
 			channelBindings.push({
@@ -2244,7 +2449,7 @@ var ExtensionRuntimeService = class {
 	};
 	handleChannelConfigGet = (envelope, context) => {
 		this.assertAuthorized(envelope, context);
-		const channelId = readRequiredString$4(readRecord$2(envelope.payload).channelId, "channelId");
+		const channelId = readRequiredString$5(readRecord$1(envelope.payload).channelId, "channelId");
 		return { config: this.options.getConfig().channels[channelId] ?? {} };
 	};
 	handleChannelMessageSubmit = async (envelope, context) => {
@@ -2258,11 +2463,11 @@ var ExtensionRuntimeService = class {
 	};
 	handleChannelCommandExecute = async (envelope, context) => {
 		this.assertAuthorized(envelope, context);
-		const payload = readRecord$2(envelope.payload);
-		const channel = readRequiredString$4(payload.channelId, "channelId");
-		const chatId = readRequiredString$4(payload.conversationId, "conversationId");
-		const senderId = readRequiredString$4(payload.senderId, "senderId");
-		const metadata = readRecord$2(payload.metadata);
+		const payload = readRecord$1(envelope.payload);
+		const channel = readRequiredString$5(payload.channelId, "channelId");
+		const chatId = readRequiredString$5(payload.conversationId, "conversationId");
+		const senderId = readRequiredString$5(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({
@@ -2270,15 +2475,15 @@ var ExtensionRuntimeService = class {
 				channel,
 				chatId,
 				senderId,
-				content: readString$5(payload.rawText) ?? readString$5(payload.commandName) ?? "",
+				content: readString$4(payload.rawText) ?? readString$4(payload.commandName) ?? "",
 				timestamp: /* @__PURE__ */ new Date(),
 				attachments: [],
 				metadata
 			},
-			forcedAgentId: readString$5(metadata.target_agent_id),
-			sessionKeyOverride: readString$5(metadata.session_key_override)
+			forcedAgentId: readString$4(metadata.target_agent_id),
+			sessionKeyOverride: readString$4(metadata.session_key_override)
 		});
-		const rawText = readString$5(payload.rawText);
+		const rawText = readString$4(payload.rawText);
 		if (rawText) return await registry.executeText(rawText, {
 			channel,
 			chatId,
@@ -2288,7 +2493,7 @@ var ExtensionRuntimeService = class {
 			content: "",
 			ephemeral: true
 		};
-		return await registry.execute(readRequiredString$4(payload.commandName, "commandName"), readRecord$2(payload.args), {
+		return await registry.execute(readRequiredString$5(payload.commandName, "commandName"), readRecord$1(payload.args), {
 			channel,
 			chatId,
 			senderId,
@@ -2297,14 +2502,14 @@ var ExtensionRuntimeService = class {
 	};
 	handleExtensionResponse = (envelope, context) => {
 		this.assertAuthorized(envelope, context);
-		const payload = readRecord$2(envelope.payload);
-		const requestId = readRequiredString$4(payload.requestId, "requestId");
+		const payload = readRecord$1(envelope.payload);
+		const requestId = readRequiredString$5(payload.requestId, "requestId");
 		const pending = this.pendingRequests.get(requestId);
 		if (!pending) return { accepted: false };
 		this.pendingRequests.delete(requestId);
 		clearTimeout(pending.timeout);
 		if (payload.ok === false) {
-			const message = readString$5(readRecord$2(payload.error).message) ?? "Extension request failed";
+			const message = readString$4(readRecord$1(payload.error).message) ?? "Extension request failed";
 			pending.reject(new Error(message));
 			return { accepted: true };
 		}
@@ -2351,7 +2556,7 @@ var ExtensionRuntimeService = class {
 		return await result;
 	};
 	assertAuthorized = (envelope, context) => {
-		const extensionId = readString$5(envelope.extensionId);
+		const extensionId = readString$4(envelope.extensionId);
 		if (!extensionId || context.token !== this.extensionTokens.get(extensionId)) throw new Error("Unauthorized ingress token");
 	};
 };
@@ -2474,11 +2679,11 @@ var ExtensionManager = class {
 //#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$11(value) {
+function isRecord$12(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isImageContentPart(value) {
-	if (!isRecord$11(value)) return false;
+	if (!isRecord$12(value)) return false;
 	const type = value.type;
 	return type === "image_url" || type === "input_image";
 }
@@ -2494,7 +2699,7 @@ function normalizeContentWithoutVision(content) {
 		};
 	});
 	if (!sawImage) return content;
-	const textParts = parts.filter((part) => isRecord$11(part) && part.type === "text" && typeof part.text === "string").map((part) => part.text.trim()).filter(Boolean);
+	const textParts = parts.filter((part) => isRecord$12(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;
 }
@@ -3034,11 +3239,11 @@ function createAgentPeerSessionIdentity(params) {
 }
 function resolveAgentPeerScope(params) {
 	const metadata = params.metadata ?? {};
-	const explicitScope = readOptionalString$8(metadata["agent_peer_scope"]) ?? readOptionalString$8(metadata.agentPeerScope);
+	const explicitScope = readOptionalString$9(metadata["agent_peer_scope"]) ?? readOptionalString$9(metadata.agentPeerScope);
 	if (explicitScope) return explicitScope;
-	return `agent:${readOptionalString$8(params.agentId) ?? BUILTIN_MAIN_AGENT_ID}:${readOptionalString$8(params.channel) ?? readOptionalString$8(metadata.channel) ?? "agent-run"}:${readOptionalString$8(metadata.accountId) ?? readOptionalString$8(metadata.account_id) ?? "default"}`;
+	return `agent:${readOptionalString$9(params.agentId) ?? BUILTIN_MAIN_AGENT_ID}:${readOptionalString$9(params.channel) ?? readOptionalString$9(metadata.channel) ?? "agent-run"}:${readOptionalString$9(metadata.accountId) ?? readOptionalString$9(metadata.account_id) ?? "default"}`;
 }
-function readOptionalString$8(value) {
+function readOptionalString$9(value) {
 	if (typeof value !== "string") return;
 	return value.trim() || void 0;
 }
@@ -3057,7 +3262,7 @@ function safeNcpSessionFilename(value) {
 function normalizeNcpAgentId(agentId) {
 	return agentId?.trim().toLowerCase() || void 0;
 }
-function isRecord$10(value) {
+function isRecord$11(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function toIsoString(value, fallback) {
@@ -3137,7 +3342,7 @@ function createReplayEvent(event) {
 	return replayEvent;
 }
 function readLegacyContextCompactionMessageId(message) {
-	const checkpoint = isRecord$10(message?.metadata?.checkpoint) ? message.metadata.checkpoint : null;
+	const checkpoint = isRecord$11(message?.metadata?.checkpoint) ? message.metadata.checkpoint : null;
 	const checkpointId = typeof checkpoint?.id === "string" ? checkpoint.id : "";
 	const coveredCount = checkpoint?.coveredSessionMessageCount;
 	const legacyId = `${message?.sessionId}:service:context-compaction:${checkpointId}`;
@@ -3167,11 +3372,11 @@ function rememberReplayMessageId(event, knownMessageIds) {
 	if (message?.id) knownMessageIds.add(message.id);
 }
 function readEventSessionId$2(event) {
-	const sessionId = ("payload" in event && isRecord$10(event.payload) ? event.payload : null)?.sessionId;
+	const sessionId = ("payload" in event && isRecord$11(event.payload) ? event.payload : null)?.sessionId;
 	return typeof sessionId === "string" ? sessionId : "";
 }
 function readReplayPayloadTimestamp(event) {
-	const payload = "payload" in event && isRecord$10(event.payload) ? event.payload : null;
+	const payload = "payload" in event && isRecord$11(event.payload) ? event.payload : null;
 	const timestamp = typeof payload?.timestamp === "string" ? payload.timestamp : "";
 	return Number.isFinite(Date.parse(timestamp)) ? new Date(timestamp).toISOString() : null;
 }
@@ -3226,7 +3431,7 @@ function applyLimit(items, limit) {
 	if (!Number.isFinite(limit) || typeof limit !== "number" || limit <= 0) return items;
 	return items.slice(0, Math.trunc(limit));
 }
-function readOptionalString$7(value) {
+function readOptionalString$8(value) {
 	if (typeof value !== "string") return null;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
@@ -3240,8 +3445,8 @@ function readEventSessionId$1(event) {
 //#endregion
 //#region src/services/session-working-dir-resolver.service.ts
 var SessionWorkingDirResolver = class {
-	constructor(configManager) {
-		this.configManager = configManager;
+	constructor(agentManager) {
+		this.agentManager = agentManager;
 	}
 	withWorkingDir = (summary) => ({
 		...summary,
@@ -3251,12 +3456,10 @@ var SessionWorkingDirResolver = class {
 		})
 	});
 	resolve = (params) => {
-		const config = this.configManager.loadConfig();
-		const defaultAgentId = resolveDefaultAgentProfileId(config);
-		const profile = findEffectiveAgentProfile(config, readOptionalString$7(params.agentId) ?? defaultAgentId) ?? findEffectiveAgentProfile(config, defaultAgentId);
+		const profile = this.agentManager.resolveAgentProfile(readOptionalString$8(params.agentId));
 		return resolveSessionWorkspacePath({
 			sessionMetadata: params.metadata,
-			workspace: profile?.workspace ?? config.agents.defaults.workspace
+			workspace: profile.workspace
 		});
 	};
 };
@@ -3268,6 +3471,7 @@ const SESSION_METADATA_LABEL_KEY = "label";
 const CHILD_SESSION_PARENT_METADATA_KEY = "parent_session_id";
 const CHILD_SESSION_REQUEST_METADATA_KEY = "spawned_by_request_id";
 const CHILD_SESSION_LIFECYCLE_METADATA_KEY = "session_lifecycle";
+const SESSION_METADATA_PATCH_RUN_METADATA_KIND = "session_metadata_patch";
 function isDurableSessionEvent(event) {
 	return event.type !== NcpEventType.ContextWindowUpdated;
 }
@@ -3308,7 +3512,7 @@ function mergeMetadataOverrides(metadata, overrides) {
 }
 function resolveSessionType(params) {
 	const { metadata, runtime, sessionType } = params;
-	return readOptionalString$7(runtime) ?? readOptionalString$7(metadata.runtime) ?? readOptionalString$7(sessionType) ?? readOptionalString$7(metadata.session_type) ?? DEFAULT_SESSION_TYPE;
+	return readOptionalString$8(runtime) ?? readOptionalString$8(metadata.runtime) ?? readOptionalString$8(sessionType) ?? readOptionalString$8(metadata.session_type) ?? DEFAULT_SESSION_TYPE;
 }
 function applySessionOverrides(params) {
 	const { lifecycle, metadata, model, parentSessionId, projectRoot, requestId, sessionType, thinkingLevel, title } = params;
@@ -3318,15 +3522,15 @@ function applySessionOverrides(params) {
 	metadata[CHILD_SESSION_LIFECYCLE_METADATA_KEY] = lifecycle;
 	if (parentSessionId) metadata[CHILD_SESSION_PARENT_METADATA_KEY] = parentSessionId;
 	if (requestId) metadata[CHILD_SESSION_REQUEST_METADATA_KEY] = requestId;
-	if (readOptionalString$7(model)) {
+	if (readOptionalString$8(model)) {
 		metadata.model = model?.trim();
 		metadata.preferred_model = model?.trim();
 	}
-	if (readOptionalString$7(thinkingLevel)) {
+	if (readOptionalString$8(thinkingLevel)) {
 		metadata.thinking = thinkingLevel?.trim();
 		metadata.preferred_thinking = thinkingLevel?.trim();
 	}
-	if (readOptionalString$7(projectRoot)) metadata.project_root = projectRoot?.trim();
+	if (readOptionalString$8(projectRoot)) metadata.project_root = projectRoot?.trim();
 }
 function isSessionSummaryRefreshEvent(event) {
 	switch (event.type) {
@@ -3338,6 +3542,13 @@ function isSessionSummaryRefreshEvent(event) {
 		default: return false;
 	}
 }
+function readRuntimeSessionMetadataPatch(event) {
+	if (event.type !== NcpEventType.RunMetadata) return null;
+	const metadata = event.payload.metadata;
+	if (metadata.kind !== SESSION_METADATA_PATCH_RUN_METADATA_KIND || !metadata.sessionMetadataPatch || typeof metadata.sessionMetadataPatch !== "object" || Array.isArray(metadata.sessionMetadataPatch)) return null;
+	const patch = metadata.sessionMetadataPatch;
+	return Object.keys(patch).length > 0 ? structuredClone(patch) : null;
+}
 var SessionManager = class {
 	cleanups = [];
 	contextWindowPreview;
@@ -3345,8 +3556,8 @@ var SessionManager = class {
 	started = false;
 	constructor(options) {
 		this.options = options;
-		this.contextWindowPreview = new ContextWindowPreviewManager({ configManager: options.configManager });
-		this.workingDirResolver = new SessionWorkingDirResolver(options.configManager);
+		this.contextWindowPreview = new ContextWindowPreviewManager(options.agentManager);
+		this.workingDirResolver = new SessionWorkingDirResolver(options.agentManager);
 	}
 	start = () => {
 		if (this.started) return;
@@ -3354,6 +3565,11 @@ var SessionManager = class {
 		this.cleanups.push(this.options.eventBus.on(eventKeys.ncpEvent, async (event) => {
 			const sessionId = readEventSessionId$1(event);
 			if (!sessionId || !isDurableSessionEvent(event)) return;
+			const metadataPatch = readRuntimeSessionMetadataPatch(event);
+			if (metadataPatch) {
+				await this.updateSessionMetadata(sessionId, metadataPatch);
+				return;
+			}
 			await this.appendSessionEvent({
 				event,
 				sessionId
@@ -3368,9 +3584,9 @@ var SessionManager = class {
 		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$7(requestedTitle) ?? summarizeTask(task);
-		const parentSessionId = readOptionalString$7(rawParentSessionId);
-		const requestId = readOptionalString$7(rawRequestId);
+		const title = readOptionalString$8(requestedTitle) ?? summarizeTask(task);
+		const parentSessionId = readOptionalString$8(rawParentSessionId);
+		const requestId = readOptionalString$8(rawRequestId);
 		const sessionType = resolveSessionType({
 			runtime,
 			sessionType: requestedSessionType,
@@ -3389,8 +3605,8 @@ var SessionManager = class {
 		});
 		const now = (/* @__PURE__ */ new Date()).toISOString();
 		const nextMetadata = mergeMetadataOverrides(metadata, metadataOverrides);
-		const agentId = readOptionalString$7(requestedAgentId) ?? readOptionalString$7(sourceRecord?.agentId) ?? BUILTIN_MAIN_AGENT_ID;
-		const sessionId = readOptionalString$7(requestedSessionId) ?? buildSessionId();
+		const agentId = readOptionalString$8(requestedAgentId) ?? readOptionalString$8(sourceRecord?.agentId) ?? BUILTIN_MAIN_AGENT_ID;
+		const sessionId = readOptionalString$8(requestedSessionId) ?? buildSessionId();
 		const record = {
 			sessionId,
 			...agentId ? { agentId } : {},
@@ -3463,7 +3679,7 @@ var SessionManager = class {
 		return await this.options.journalStore.getSession(normalizedSessionId);
 	};
 	listSessions = async (options) => {
-		const peerId = readOptionalString$7(options?.peerId);
+		const peerId = readOptionalString$8(options?.peerId);
 		return applyLimit((await this.options.journalStore.listSessionSummaries()).filter((summary) => !peerId || summary.peerId === peerId).map(this.workingDirResolver.withWorkingDir), options?.limit);
 	};
 	listSessionMessages = async (sessionId, options) => {
@@ -3496,14 +3712,14 @@ var SessionManager = class {
 	createAgentRunSession = async (params) => {
 		const { agentId, agentRuntimeId: requestedAgentRuntimeId, channel, metadata, model, peerId: rawPeerId, projectRoot, sessionId, task, thinkingEffort } = params;
 		const agentRuntimeId = requestedAgentRuntimeId ?? "native";
-		const peerId = readOptionalString$7(rawPeerId);
+		const peerId = readOptionalString$8(rawPeerId);
 		const peerIdentity = peerId ? createAgentPeerSessionIdentity({
 			agentId,
 			channel,
 			metadata,
 			peerId
 		}) : void 0;
-		const requestedSessionId = readOptionalString$7(sessionId);
+		const requestedSessionId = readOptionalString$8(sessionId);
 		const created = await this.createSession({
 			sourceSessionMetadata: {},
 			sessionId: requestedSessionId ?? peerIdentity?.sessionId,
@@ -3793,12 +4009,12 @@ var PanelAppCapabilityGrantStore = class {
 	};
 };
 function normalizeStoreData$2(value) {
-	if (!isRecord$9(value) || value.version !== 1 || !isRecord$9(value.grants)) return structuredClone(EMPTY_GRANTS$2);
+	if (!isRecord$10(value) || value.version !== 1 || !isRecord$10(value.grants)) return structuredClone(EMPTY_GRANTS$2);
 	const grants = {};
 	for (const [callerKey, callerValue] of Object.entries(value.grants)) {
-		if (!isRecord$9(callerValue) || !isRecord$9(callerValue.capabilities)) continue;
+		if (!isRecord$10(callerValue) || !isRecord$10(callerValue.capabilities)) continue;
 		const capabilities = {};
-		for (const [capability, grantValue] of Object.entries(callerValue.capabilities)) if (isRecord$9(grantValue) && typeof grantValue.grantedAt === "string") capabilities[capability] = { grantedAt: grantValue.grantedAt };
+		for (const [capability, grantValue] of Object.entries(callerValue.capabilities)) if (isRecord$10(grantValue) && typeof grantValue.grantedAt === "string") capabilities[capability] = { grantedAt: grantValue.grantedAt };
 		grants[callerKey] = { capabilities };
 	}
 	return {
@@ -3809,7 +4025,7 @@ function normalizeStoreData$2(value) {
 function getCallerKey(caller) {
 	return `${caller.surface}:${caller.appId}`;
 }
-function isRecord$9(value) {
+function isRecord$10(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isMissingFileError$3(error) {
@@ -3855,19 +4071,19 @@ var PanelAppClientGrantStore = class {
 	};
 };
 function normalizeStoreData$1(value) {
-	if (!isRecord$8(value) || value.version !== 1 || !isRecord$8(value.grants)) return structuredClone(EMPTY_GRANTS$1);
+	if (!isRecord$9(value) || value.version !== 1 || !isRecord$9(value.grants)) return structuredClone(EMPTY_GRANTS$1);
 	const grants = {};
-	for (const [appId, grant] of Object.entries(value.grants)) if (isRecord$8(grant) && typeof grant.grantedAt === "string") grants[appId] = { grantedAt: grant.grantedAt };
+	for (const [appId, grant] of Object.entries(value.grants)) if (isRecord$9(grant) && typeof grant.grantedAt === "string") grants[appId] = { grantedAt: grant.grantedAt };
 	return {
 		grants,
 		version: 1
 	};
 }
-function isRecord$8(value) {
+function isRecord$9(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isMissingFileError$2(error) {
-	return isRecord$8(error) && error.code === "ENOENT";
+	return isRecord$9(error) && error.code === "ENOENT";
 }
 //#endregion
 //#region src/services/agent-run-client.service.ts
@@ -4086,7 +4302,7 @@ const PANEL_APP_AGENT_MAX_CONTEXT_CHARS = 8e4;
 function normalizePanelAppGenerateObjectInput(input) {
 	const peerId = input.peerId.trim();
 	const prompt = input.prompt.trim();
-	if (!peerId || !prompt || !isRecord$7(input.schema)) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "invalid generateObject request");
+	if (!peerId || !prompt || !isRecord$8(input.schema)) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "invalid generateObject request");
 	if (prompt.length > PANEL_APP_AGENT_MAX_PROMPT_CHARS) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "generateObject prompt is too large");
 	if (stringifyJsonValue(input.context ?? null).length > PANEL_APP_AGENT_MAX_CONTEXT_CHARS) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "generateObject context is too large");
 	return {
@@ -4227,7 +4443,7 @@ function readStructuredResultEvent(event, resultToolCallId) {
 	};
 }
 function assertToolResultContent(content) {
-	if (!isRecord$7(content) || content.ok !== false || !isRecord$7(content.error)) return;
+	if (!isRecord$8(content) || content.ok !== false || !isRecord$8(content.error)) return;
 	if (content.error.code === "invalid_tool_arguments") throw new PanelAppError("AGENT_OBJECT_RESULT_SCHEMA_INVALID", "agent object result did not match the schema");
 	throw new PanelAppError("AGENT_OBJECT_REQUEST_FAILED", typeof content.error.message === "string" ? content.error.message : "agent object request failed");
 }
@@ -4243,7 +4459,7 @@ function stringifyJsonValue(value) {
 		throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "value is not JSON serializable");
 	}
 }
-function isRecord$7(value) {
+function isRecord$8(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
@@ -4517,15 +4733,15 @@ function parsePanelAppFolderManifest(raw) {
 	} catch (error) {
 		throw new Error(`panel-app.json is not valid JSON: ${error instanceof Error ? error.message : String(error)}`);
 	}
-	if (!isRecord$6(parsed)) throw new Error("panel-app.json must contain an object.");
-	const id = readOptionalString$6(parsed, "id");
+	if (!isRecord$7(parsed)) throw new Error("panel-app.json must contain an object.");
+	const id = readOptionalString$7(parsed, "id");
 	if (id && !PANEL_APP_ID_PATTERN.test(id)) throw new Error("panel app id must be kebab-case.");
 	return {
 		id,
-		title: readRequiredString$3(parsed, "title"),
-		description: readOptionalString$6(parsed, "description"),
-		icon: readOptionalString$6(parsed, "icon"),
-		entry: readRequiredString$3(parsed, "entry"),
+		title: readRequiredString$4(parsed, "title"),
+		description: readOptionalString$7(parsed, "description"),
+		icon: readOptionalString$7(parsed, "icon"),
+		entry: readRequiredString$4(parsed, "entry"),
 		capabilities: readStringArray$1(parsed.capabilities, "capabilities"),
 		client: readOptionalBoolean$2(parsed, "client"),
 		serviceActions: readStringArray$1(parsed.actions, "actions")
@@ -4585,12 +4801,12 @@ function parseTokenList(content) {
 	if (!content) return [];
 	return [...new Set(content.split(/[,\s]+/).map((entry) => entry.trim()).filter(Boolean))];
 }
-function readRequiredString$3(record, key) {
-	const value = readOptionalString$6(record, key);
+function readRequiredString$4(record, key) {
+	const value = readOptionalString$7(record, key);
 	if (!value) throw new Error(`panel app ${key} is required.`);
 	return value;
 }
-function readOptionalString$6(record, key) {
+function readOptionalString$7(record, key) {
 	return typeof record[key] === "string" && record[key].trim() ? record[key].trim() : void 0;
 }
 function readOptionalBoolean$2(record, key) {
@@ -4604,7 +4820,7 @@ function readStringArray$1(value, key) {
 	if (!Array.isArray(value) || value.some((entry) => typeof entry !== "string")) throw new Error(`panel app ${key} must be a string array.`);
 	return [...new Set(value.map((entry) => entry.trim()).filter(Boolean))];
 }
-function isRecord$6(value) {
+function isRecord$7(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function normalizeTextValue(value) {
@@ -5322,12 +5538,12 @@ var ServiceActionGrantStore = class {
 	};
 };
 function normalizeStoreData(value) {
-	if (!isRecord$5(value) || value.version !== 1 || !isRecord$5(value.grants)) return structuredClone(EMPTY_GRANTS);
+	if (!isRecord$6(value) || value.version !== 1 || !isRecord$6(value.grants)) return structuredClone(EMPTY_GRANTS);
 	const grants = {};
 	for (const [callerKey, callerValue] of Object.entries(value.grants)) {
-		if (!isRecord$5(callerValue) || !isRecord$5(callerValue.actions)) continue;
+		if (!isRecord$6(callerValue) || !isRecord$6(callerValue.actions)) continue;
 		const actions = {};
-		for (const [actionId, actionValue] of Object.entries(callerValue.actions)) if (isRecord$5(actionValue) && typeof actionValue.grantedAt === "string" && isServiceActionRisk(actionValue.risk)) actions[actionId] = {
+		for (const [actionId, actionValue] of Object.entries(callerValue.actions)) if (isRecord$6(actionValue) && typeof actionValue.grantedAt === "string" && isServiceActionRisk(actionValue.risk)) actions[actionId] = {
 			grantedAt: actionValue.grantedAt,
 			risk: actionValue.risk
 		};
@@ -5341,11 +5557,11 @@ function normalizeStoreData(value) {
 function isServiceActionRisk(value) {
 	return value === "read" || value === "write" || value === "external" || value === "dangerous";
 }
-function isRecord$5(value) {
+function isRecord$6(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isMissingFileError(error) {
-	return isRecord$5(error) && error.code === "ENOENT";
+	return isRecord$6(error) && error.code === "ENOENT";
 }
 //#endregion
 //#region src/utils/service-app-manifest.utils.ts
@@ -5370,49 +5586,49 @@ function parseServiceAppManifest(raw) {
 	} catch (error) {
 		throw new Error(`service-app.json is not valid JSON: ${error instanceof Error ? error.message : String(error)}`);
 	}
-	if (!isRecord$4(parsed)) throw new Error("service-app.json must contain an object.");
-	const id = readRequiredString$2(parsed, "id");
+	if (!isRecord$5(parsed)) throw new Error("service-app.json must contain an object.");
+	const id = readRequiredString$3(parsed, "id");
 	if (!SERVICE_APP_ID_PATTERN.test(id)) throw new Error("service app id must be kebab-case.");
-	const protocol = readOptionalString$5(parsed, "protocol") ?? "mcp";
+	const protocol = readOptionalString$6(parsed, "protocol") ?? "mcp";
 	if (protocol !== "mcp") throw new Error("service app protocol must be mcp.");
 	return {
 		id,
-		title: readRequiredString$2(parsed, "title"),
-		description: readOptionalString$5(parsed, "description"),
+		title: readRequiredString$3(parsed, "title"),
+		description: readOptionalString$6(parsed, "description"),
 		enabled: readOptionalBoolean$1(parsed, "enabled") ?? true,
 		protocol,
-		command: readRequiredString$2(parsed, "command"),
+		command: readRequiredString$3(parsed, "command"),
 		args: readStringArray(parsed.args, "args"),
 		actions: readManifestActions(parsed.actions)
 	};
 }
 function readManifestActions(value) {
 	if (value === void 0) throw new Error("service app actions are required.");
-	if (!isRecord$4(value)) throw new Error("service app actions must be an object.");
+	if (!isRecord$5(value)) throw new Error("service app actions must be an object.");
 	if (Object.keys(value).length === 0) throw new Error("service app actions cannot be empty.");
 	const actions = {};
 	for (const [name, action] of Object.entries(value)) {
 		if (!name.trim()) throw new Error("service app action name cannot be empty.");
-		if (!isRecord$4(action)) throw new Error(`service app action ${name} must be an object.`);
-		const risk = readOptionalString$5(action, "risk");
+		if (!isRecord$5(action)) throw new Error(`service app action ${name} must be an object.`);
+		const risk = readOptionalString$6(action, "risk");
 		if (risk !== void 0 && !SERVICE_ACTION_RISKS.has(risk)) throw new Error(`service app action ${name} has invalid risk.`);
 		const inputSchema = action.inputSchema;
-		if (inputSchema !== void 0 && !isRecord$4(inputSchema)) throw new Error(`service app action ${name} inputSchema must be an object.`);
+		if (inputSchema !== void 0 && !isRecord$5(inputSchema)) throw new Error(`service app action ${name} inputSchema must be an object.`);
 		actions[name] = {
 			risk,
-			title: readOptionalString$5(action, "title"),
-			description: readOptionalString$5(action, "description"),
+			title: readOptionalString$6(action, "title"),
+			description: readOptionalString$6(action, "description"),
 			inputSchema
 		};
 	}
 	return actions;
 }
-function readRequiredString$2(record, key) {
-	const value = readOptionalString$5(record, key);
+function readRequiredString$3(record, key) {
+	const value = readOptionalString$6(record, key);
 	if (!value) throw new Error(`service app ${key} is required.`);
 	return value;
 }
-function readOptionalString$5(record, key) {
+function readOptionalString$6(record, key) {
 	return typeof record[key] === "string" && record[key].trim() ? record[key].trim() : void 0;
 }
 function readOptionalBoolean$1(record, key) {
@@ -5425,7 +5641,7 @@ function readStringArray(value, key) {
 	if (!Array.isArray(value) || value.some((entry) => typeof entry !== "string")) throw new Error(`service app ${key} must be a string array.`);
 	return value;
 }
-function isRecord$4(value) {
+function isRecord$5(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
@@ -5822,12 +6038,12 @@ function parseSkillFrontmatter(raw) {
 	const summaryI18n = readLocalizedTextMap(parsed, "summaryi18n", "summary_i18n");
 	const descriptionI18n = readLocalizedTextMap(parsed, "descriptioni18n", "description_i18n");
 	return {
-		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"),
+		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"),
 		tags: readTags(parsed)
 	};
 }
@@ -5848,19 +6064,19 @@ function parseFrontmatterBlock(raw) {
 function parseYamlFrontmatter(raw) {
 	try {
 		const parsed = parse(raw);
-		return isRecord$3(parsed) ? parsed : {};
+		return isRecord$4(parsed) ? parsed : {};
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
 		throw new Error(`Invalid SKILL.md frontmatter: ${message}`);
 	}
 }
-function readString$4(record, ...names) {
+function readString$3(record, ...names) {
 	const value = readValue(record, names);
 	return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
 function readLocalizedTextMap(record, ...names) {
 	const value = readValue(record, names);
-	if (!isRecord$3(value)) return;
+	if (!isRecord$4(value)) return;
 	const localized = Object.fromEntries(Object.entries(value).filter((entry) => typeof entry[1] === "string" && entry[1].trim().length > 0).map(([locale, text]) => [normalizeLocaleTag(locale), text.trim()]));
 	return Object.keys(localized).length > 0 ? localized : void 0;
 }
@@ -5884,7 +6100,7 @@ function normalizeFrontmatterKey(raw) {
 function normalizeLocaleTag(raw) {
 	return raw.trim().toLowerCase();
 }
-function isRecord$3(value) {
+function isRecord$4(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -6050,7 +6266,7 @@ var NcpAgentSessionMetadataStore = class {
 	read = async (sessionId, activitySnapshot) => {
 		try {
 			const parsed = JSON.parse(await readFile(this.metadataPath(sessionId), "utf-8"));
-			if (!isRecord$10(parsed) || parsed._type !== "metadata" || !isRecord$10(parsed.metadata)) throw new Error(`invalid ncp agent session metadata sidecar: ${sessionId}`);
+			if (!isRecord$11(parsed) || parsed._type !== "metadata" || !isRecord$11(parsed.metadata)) throw new Error(`invalid ncp agent session metadata sidecar: ${sessionId}`);
 			const createdAt = toIsoString(parsed.created_at, activitySnapshot.createdAt);
 			const agentId = normalizeNcpAgentId(typeof parsed.agent_id === "string" ? parsed.agent_id : void 0);
 			return {
@@ -6151,11 +6367,11 @@ var NcpAgentSessionSummaryIndexStore = class {
 function serializeJournalEntry(entry) {
 	const serialized = JSON.stringify(entry);
 	if (!serialized) throw new Error("ncp agent session journal entry serialization produced empty output");
-	if (!isRecord$10(JSON.parse(serialized))) throw new Error("ncp agent session journal entry serialization produced a non-object entry");
+	if (!isRecord$11(JSON.parse(serialized))) throw new Error("ncp agent session journal entry serialization produced a non-object entry");
 	return serialized;
 }
 function attachJournalTimestamp(event, timestamp) {
-	if (!("payload" in event) || !isRecord$10(event.payload)) return event;
+	if (!("payload" in event) || !isRecord$11(event.payload)) return event;
 	return {
 		...event,
 		payload: {
@@ -6379,15 +6595,15 @@ var NcpAgentSessionJournalStore = class {
 				console.warn(`[ncp-agent-session-journal] skipped corrupted journal line ${index + 1}: ${error instanceof Error ? error.message : String(error)}`);
 				continue;
 			}
-			if (!isRecord$10(parsed)) continue;
+			if (!isRecord$11(parsed)) continue;
 			if (parsed._type === "metadata") {
-				metadata = isRecord$10(parsed.metadata) ? structuredClone(parsed.metadata) : {};
+				metadata = isRecord$11(parsed.metadata) ? structuredClone(parsed.metadata) : {};
 				agentId = normalizeNcpAgentId(typeof parsed.agent_id === "string" ? parsed.agent_id : void 0);
 				createdAt = toIsoString(parsed.created_at, createdAt);
 				updatedAt = toIsoString(parsed.updated_at, updatedAt);
 				continue;
 			}
-			if (parsed._type === "event" && isRecord$10(parsed.event)) {
+			if (parsed._type === "event" && isRecord$11(parsed.event)) {
 				const seq = Number(parsed.seq);
 				nextSeq = Math.max(nextSeq, Number.isFinite(seq) ? Math.trunc(seq) + 1 : nextSeq);
 				const eventTimestamp = toIsoString(parsed.timestamp, updatedAt);
@@ -6701,11 +6917,11 @@ 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$1(value) {
+function readRecord(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
 }
-function readString$3(value) {
+function readString$2(value) {
 	if (typeof value !== "string") return;
 	return value.trim() || void 0;
 }
@@ -6713,9 +6929,11 @@ function resolveEntryIcon(entry) {
 	return entry.icon ?? null;
 }
 function resolveRequestedModel(params) {
-	const { configuredModel, defaultModel, input, sessionMetadata } = params;
-	const runMetadata = readRecord$1(input.metadata);
-	return readString$3(runMetadata?.preferred_model) ?? readString$3(runMetadata?.preferredModel) ?? readString$3(runMetadata?.model) ?? readString$3(sessionMetadata.preferred_model) ?? readString$3(sessionMetadata.preferredModel) ?? readString$3(sessionMetadata.model) ?? configuredModel ?? defaultModel;
+	const { configuredModel, defaultModel, input, modelSelectionMode, sessionMetadata } = params;
+	if (modelSelectionMode === "runtime-default") return;
+	const requestedModel = readString$2(readRecord(input.metadata)?.preferred_model) ?? readString$2(readRecord(input.metadata)?.preferredModel) ?? readString$2(readRecord(input.metadata)?.model) ?? readString$2(sessionMetadata.preferred_model) ?? readString$2(sessionMetadata.preferredModel) ?? readString$2(sessionMetadata.model);
+	if (isRuntimeDefaultModelValue(requestedModel)) return;
+	return requestedModel ?? configuredModel ?? (modelSelectionMode === "optional" ? void 0 : defaultModel);
 }
 function resolveProviderApiMode(resolution) {
 	const wireApi = resolution.provider?.wireApi?.trim().toLowerCase();
@@ -6762,12 +6980,14 @@ var BuiltinHttpRuntimeSessionTypeService = class {
 	};
 	describeInternal = async () => {
 		const config = new HttpRuntimeConfigResolver(this.entry.config ?? {}).resolve({ defaultModel: this.defaultModel });
+		const modelSelectionMode = normalizeRuntimeModelSelectionMode(this.entry.config?.modelSelectionMode);
 		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,
+			modelSelectionMode,
 			cta: {
 				kind: "settings",
 				label: "Configure HTTP Runtime"
@@ -6779,6 +6999,7 @@ var BuiltinHttpRuntimeSessionTypeService = class {
 			reason: null,
 			reasonMessage: null,
 			recommendedModel: config.recommendedModel ?? null,
+			modelSelectionMode,
 			...config.supportedModels ? { supportedModels: config.supportedModels } : {},
 			cta: null
 		};
@@ -6797,6 +7018,7 @@ var BuiltinHttpRuntimeSessionTypeService = class {
 				reason: "healthcheck_failed",
 				reasonMessage: `HTTP runtime healthcheck returned HTTP ${response.status}.`,
 				recommendedModel: config.recommendedModel ?? null,
+				modelSelectionMode,
 				...config.supportedModels ? { supportedModels: config.supportedModels } : {},
 				cta: null
 			};
@@ -6806,6 +7028,7 @@ var BuiltinHttpRuntimeSessionTypeService = class {
 				reason: null,
 				reasonMessage: null,
 				recommendedModel: config.recommendedModel ?? null,
+				modelSelectionMode,
 				...config.supportedModels ? { supportedModels: config.supportedModels } : {},
 				cta: null
 			};
@@ -6843,6 +7066,7 @@ var BuiltinStdioRuntimeSessionTypeService = class {
 	};
 	describeInternal = async (describeMode) => {
 		const resolver = new StdioRuntimeConfigResolver(this.entry.config ?? {});
+		const modelSelectionMode = normalizeRuntimeModelSelectionMode(this.entry.config?.modelSelectionMode);
 		try {
 			const config = resolver.resolve();
 			if (!await resolveExecutablePath(config.command)) return {
@@ -6853,7 +7077,8 @@ var BuiltinStdioRuntimeSessionTypeService = class {
 				cta: {
 					kind: "settings",
 					label: "Configure Stdio Runtime"
-				}
+				},
+				modelSelectionMode
 			};
 			if (describeMode === "probe") try {
 				await probeStdioRuntime(config);
@@ -6866,7 +7091,8 @@ var BuiltinStdioRuntimeSessionTypeService = class {
 					cta: {
 						kind: "settings",
 						label: "Repair Stdio Runtime"
-					}
+					},
+					modelSelectionMode
 				};
 			}
 			return {
@@ -6874,6 +7100,7 @@ var BuiltinStdioRuntimeSessionTypeService = class {
 				ready: true,
 				reason: null,
 				reasonMessage: null,
+				modelSelectionMode,
 				cta: null
 			};
 		} catch (error) {
@@ -6885,7 +7112,8 @@ var BuiltinStdioRuntimeSessionTypeService = class {
 				cta: {
 					kind: "settings",
 					label: "Configure Stdio Runtime"
-				}
+				},
+				modelSelectionMode
 			};
 		}
 	};
@@ -6932,7 +7160,7 @@ var BuiltinNarpRuntimeProviderService = class {
 		throw new Error("[narp] runtime entry is required before creating this runtime");
 	};
 	createHttpRuntime = (entry, runtimeParams) => {
-		const config = readRecord$1(entry.config) ?? {};
+		const config = readRecord(entry.config) ?? {};
 		const resolver = new HttpRuntimeConfigResolver(config);
 		const resolvedConfig = resolver.resolve({ defaultModel: this.configManager.loadConfig().agents.defaults.model });
 		return new HttpRuntimeNcpAgentRuntime({
@@ -6947,12 +7175,13 @@ var BuiltinNarpRuntimeProviderService = class {
 				input,
 				sessionMetadata: runtimeParams.sessionMetadata,
 				defaultModel: this.configManager.loadConfig().agents.defaults.model,
-				configuredModel: readString$3(config.model)
+				configuredModel: readString$2(config.model),
+				modelSelectionMode: normalizeRuntimeModelSelectionMode(config.modelSelectionMode)
 			})
 		});
 	};
 	createStdioRuntime = (entry, runtimeParams) => {
-		const config = readRecord$1(entry.config) ?? {};
+		const config = readRecord(entry.config) ?? {};
 		return new StdioRuntimeNcpAgentRuntime({
 			...new StdioRuntimeConfigResolver(config).resolve(),
 			sessionId: runtimeParams.sessionId,
@@ -6963,7 +7192,8 @@ var BuiltinNarpRuntimeProviderService = class {
 				input,
 				sessionMetadata: runtimeParams.sessionMetadata,
 				defaultModel: this.configManager.loadConfig().agents.defaults.model,
-				configuredModel: readString$3(config.model)
+				configuredModel: readString$2(config.model),
+				modelSelectionMode: normalizeRuntimeModelSelectionMode(config.modelSelectionMode)
 			})
 		});
 	};
@@ -7050,13 +7280,13 @@ var ProviderManagerNcpLLMApi = class {
 };
 //#endregion
 //#region src/features/native-runtime/tools/ncp-asset.tools.ts
-function readOptionalString$4(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$4(value);
+	const base64 = readOptionalString$5(value);
 	if (!base64) return null;
 	try {
 		return Buffer.from(base64, "base64");
@@ -7107,18 +7337,18 @@ var AssetPutTool = class {
 		this.contentBasePath = contentBasePath;
 	}
 	validateArgs = (args) => {
-		const path = readOptionalString$4(args.path);
-		const bytesBase64 = readOptionalString$4(args.bytesBase64);
-		const fileName = readOptionalString$4(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$4(args?.path);
-		const fileName = readOptionalString$4(args?.fileName);
-		const mimeType = readOptionalString$4(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,
@@ -7161,8 +7391,8 @@ var AssetExportTool = class {
 		this.assetStore = assetStore;
 	}
 	execute = async (args) => {
-		const assetUri = readOptionalString$4(args?.assetUri);
-		const targetPath = readOptionalString$4(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,
@@ -7188,7 +7418,7 @@ var AssetStatTool = class {
 		this.contentBasePath = contentBasePath;
 	}
 	execute = async (args) => {
-		const assetUri = readOptionalString$4(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 {
@@ -7256,10 +7486,16 @@ function resolveEffectiveModel(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;
+	if (inboundModel && isRuntimeDefaultModelValue(inboundModel)) {
+		delete metadata.preferred_model;
+		delete metadata.model;
+	} else if (inboundModel) {
+		metadata.preferred_model = inboundModel;
+		metadata.model = inboundModel;
+	}
 	return {
 		metadata,
-		model: normalizeOptionalString(metadata.preferred_model) ?? fallbackModel
+		model: (isRuntimeDefaultModelValue(metadata.preferred_model) ? void 0 : normalizeOptionalString(metadata.preferred_model)) ?? fallbackModel
 	};
 }
 function syncSessionThinkingPreference(params) {
@@ -7290,30 +7526,6 @@ function resolveSessionChannelContext(params) {
 //#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,
-		reservedContextTokens: ContextWindowBudgetService.resolveReservedContextTokens({
-			contextTokens,
-			configuredReservedContextTokens: profile.reservedContextTokens ?? defaults.reservedContextTokens
-		}),
-		restrictToWorkspace,
-		searchConfig,
-		execTimeoutSeconds
-	};
-}
 function resolveRequestedToolNames(metadata) {
 	const rawValue = metadata.requested_tools ?? metadata.requestedTools;
 	if (!Array.isArray(rawValue)) return [];
@@ -7326,17 +7538,15 @@ function mergeRunMetadata(params) {
 		...requestMetadata ? structuredClone(requestMetadata) : {}
 	};
 }
-function resolveNextclawNcpRunContext(params) {
-	const { configManager, requestMetadata: inputRequestMetadata, sessionId, sessionMetadata: inputSessionMetadata, storedAgentId } = params;
-	const config = configManager.loadConfig();
+function buildNextclawNcpRunContext(params) {
+	const { agentProfile, config, requestMetadata: inputRequestMetadata, sessionId, sessionMetadata: inputSessionMetadata } = params;
 	const requestMetadata = mergeRunMetadata({
 		sessionMetadata: inputSessionMetadata,
 		requestMetadata: inputRequestMetadata
 	});
-	const profile = resolveAgentProfile({
+	const profile = buildResolvedAgentProfile({
 		config,
-		storedAgentId,
-		requestMetadata
+		profile: agentProfile
 	});
 	const { metadata: modelMetadata, model: effectiveModel } = resolveEffectiveModel({
 		sessionMetadata: requestMetadata,
@@ -7387,213 +7597,20 @@ function resolveNextclawNcpRunContext(params) {
 		}
 	};
 }
-//#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();
-	return normalized.length > 0 ? normalized : null;
-}
-function cloneRuntimeEntry(entry) {
+function buildResolvedAgentProfile(params) {
+	const { config, profile } = params;
+	const { search: searchConfig, tools: { restrictToWorkspace, exec: { timeout: execTimeoutSeconds } } } = config;
 	return {
-		id: entry.id,
-		label: entry.label,
-		...entry.icon ? { icon: { ...entry.icon } } : {},
-		type: entry.type,
-		enabled: entry.enabled !== false,
-		config: entry.config ? { ...entry.config } : {}
-	};
-}
-function normalizeAgentRuntimeSessionTypeIcon(value) {
-	if (typeof value === "string") {
-		const src = value.trim();
-		return src ? {
-			kind: "image",
-			src
-		} : null;
-	}
-	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
-	const iconRecord = value;
-	const src = typeof iconRecord.src === "string" ? iconRecord.src.trim() : "";
-	if (!src) return null;
-	const alt = typeof iconRecord.alt === "string" && iconRecord.alt.trim().length > 0 ? iconRecord.alt.trim() : null;
-	return {
-		kind: "image",
-		src,
-		...alt ? { alt } : {}
-	};
-}
-const BUILTIN_RUNTIME_PRESENTATION = { hermes: {
-	label: "Hermes",
-	icon: {
-		kind: "image",
-		src: "app://runtime-icons/hermes-agent.png",
-		alt: "Hermes"
-	}
-} };
-function readString$2(value) {
-	if (typeof value !== "string") return;
-	return value.trim() || void 0;
-}
-function readRecord(value) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return;
-	return value;
-}
-function resolveBuiltinRuntimePresentation(value) {
-	const normalized = readString$2(value)?.toLowerCase();
-	if (!normalized) return null;
-	if (!(normalized in BUILTIN_RUNTIME_PRESENTATION)) return null;
-	return BUILTIN_RUNTIME_PRESENTATION[normalized] ?? null;
-}
-function buildNativeRuntimeEntry(config) {
-	const nativeRuntimeConfig = readRecord(config.ui?.ncp?.runtimes?.native) ?? {};
-	return {
-		id: DEFAULT_AGENT_RUNTIME_ENTRY_ID,
-		label: "Native",
-		type: DEFAULT_AGENT_RUNTIME_ENTRY_ID,
-		enabled: nativeRuntimeConfig.enabled !== false,
-		config: nativeRuntimeConfig
-	};
-}
-function resolveAgentRuntimeEntries(params) {
-	const entries = /* @__PURE__ */ new Map();
-	entries.set(DEFAULT_AGENT_RUNTIME_ENTRY_ID, buildNativeRuntimeEntry(params.config));
-	for (const [rawId, rawEntry] of Object.entries(params.config.agents.runtimes.entries ?? {})) {
-		const id = rawId.trim().toLowerCase();
-		const type = readString$2(rawEntry.type)?.toLowerCase();
-		if (!id || !type) continue;
-		const explicitIcon = normalizeAgentRuntimeSessionTypeIcon(rawEntry.icon);
-		const builtinPresentation = resolveBuiltinRuntimePresentation(id) ?? resolveBuiltinRuntimePresentation(type);
-		entries.set(id, {
-			id,
-			label: readString$2(rawEntry.label) ?? builtinPresentation?.label ?? id,
-			...explicitIcon ?? builtinPresentation?.icon ? { icon: explicitIcon ?? builtinPresentation?.icon } : {},
-			type,
-			enabled: rawEntry.enabled !== false,
-			config: rawEntry.config ? { ...rawEntry.config } : {}
-		});
-	}
-	return {
-		defaultEntryId: entries.has("native") ? DEFAULT_AGENT_RUNTIME_ENTRY_ID : [...entries.keys()][0] ?? "native",
-		entries: [...entries.values()]
+		agentId: profile.id,
+		workspace: getWorkspacePath(profile.workspace),
+		model: profile.model,
+		contextTokens: profile.contextTokens,
+		reservedContextTokens: profile.reservedContextTokens,
+		restrictToWorkspace,
+		searchConfig,
+		execTimeoutSeconds
 	};
 }
-function readRequestedRuntimeEntryId(sessionMetadata) {
-	return normalizeIdentifier(sessionMetadata.runtime) ?? normalizeIdentifier(sessionMetadata.session_type) ?? normalizeIdentifier(sessionMetadata.sessionType) ?? null;
-}
-var AgentRuntimeRegistry = class {
-	providers = /* @__PURE__ */ new Map();
-	entries = /* @__PURE__ */ new Map();
-	defaultEntryId = DEFAULT_AGENT_RUNTIME_ENTRY_ID;
-	register = (registration) => {
-		const normalizedKind = normalizeIdentifier(registration.kind);
-		if (!normalizedKind) throw new Error("agent runtime kind must be a non-empty string");
-		const token = Symbol(normalizedKind);
-		this.providers.set(normalizedKind, {
-			...registration,
-			kind: normalizedKind,
-			token
-		});
-		return toDisposable(() => {
-			const current = this.providers.get(normalizedKind);
-			if (!current || current.token !== token) return;
-			this.providers.delete(normalizedKind);
-		});
-	};
-	applyEntries = (params) => {
-		const nextEntries = /* @__PURE__ */ new Map();
-		for (const rawEntry of params.entries) {
-			const id = normalizeIdentifier(rawEntry.id);
-			const type = normalizeIdentifier(rawEntry.type);
-			const label = rawEntry.label?.trim() ?? "";
-			if (!id || !type || !label) continue;
-			nextEntries.set(id, cloneRuntimeEntry({
-				...rawEntry,
-				id,
-				type,
-				label
-			}));
-		}
-		this.entries = nextEntries;
-		this.defaultEntryId = normalizeIdentifier(params.defaultEntryId) ?? (nextEntries.has("native") ? "native" : [...nextEntries.keys()][0] ?? "native");
-	};
-	resolveSessionMetadata = (sessionMetadata) => {
-		const { entry } = this.resolveRuntimeEntry(sessionMetadata);
-		return {
-			...sessionMetadata,
-			runtime: entry.id,
-			session_type: entry.id,
-			runtime_type: entry.type
-		};
-	};
-	createRuntime = (params) => {
-		const nextSessionMetadata = this.resolveSessionMetadata(params.sessionMetadata);
-		const { entry, provider } = this.resolveRuntimeEntry(nextSessionMetadata);
-		if (provider.createRuntimeForEntry) return provider.createRuntimeForEntry({
-			entry: cloneRuntimeEntry(entry),
-			runtimeParams: {
-				...params,
-				sessionMetadata: nextSessionMetadata
-			}
-		});
-		return provider.createRuntime({
-			...params,
-			sessionMetadata: nextSessionMetadata
-		});
-	};
-	resolveRuntimeEntry = (sessionMetadata) => {
-		const requestedEntryId = readRequestedRuntimeEntryId(sessionMetadata) ?? this.defaultEntryId;
-		const entry = this.entries.get(requestedEntryId);
-		if (!entry || entry.enabled === false) throw new Error(`ncp runtime unavailable: ${requestedEntryId}`);
-		const provider = this.providers.get(entry.type);
-		if (!provider) throw new Error(`ncp runtime provider unavailable: ${entry.type}`);
-		return {
-			entry,
-			provider
-		};
-	};
-	listSessionTypes = async (params) => {
-		const options = await Promise.all([...this.entries.values()].filter((entry) => entry.enabled !== false).map(async (entry) => {
-			const provider = this.providers.get(entry.type);
-			if (!provider) return {
-				value: entry.id,
-				label: entry.label,
-				icon: entry.icon ?? null,
-				ready: false,
-				reason: "runtime_provider_unavailable",
-				reasonMessage: `Runtime provider unavailable for type "${entry.type}".`,
-				recommendedModel: null,
-				cta: {
-					kind: "settings",
-					label: "Configure Runtime"
-				}
-			};
-			const descriptor = provider.describeSessionTypeForEntry ? await provider.describeSessionTypeForEntry({
-				entry: cloneRuntimeEntry(entry),
-				describeParams: params
-			}) : await provider.describeSessionType?.(params);
-			return {
-				value: entry.id,
-				label: entry.label,
-				icon: descriptor?.icon ?? entry.icon ?? null,
-				ready: descriptor?.ready ?? true,
-				reason: descriptor?.reason ?? null,
-				reasonMessage: descriptor?.reasonMessage ?? null,
-				recommendedModel: descriptor?.recommendedModel ?? null,
-				cta: descriptor?.cta ?? null,
-				...descriptor?.supportedModels ? { supportedModels: descriptor.supportedModels } : {}
-			};
-		}));
-		return {
-			defaultType: this.defaultEntryId,
-			options: options.sort((left, right) => {
-				if (left.value === this.defaultEntryId) return -1;
-				if (right.value === this.defaultEntryId) return 1;
-				return left.value.localeCompare(right.value);
-			})
-		};
-	};
-};
 //#endregion
 //#region src/services/agent-run-message-projector.service.ts
 var AgentRunMessageProjector = class {
@@ -7606,22 +7623,15 @@ var AgentRunMessageProjector = class {
 //#region src/services/agent-run-model-input-budgeter.service.ts
 var AgentRunModelInputBudgeter = class {
 	inputBudgetPruner = new InputBudgetPruner();
-	constructor(configManager) {
-		this.configManager = configManager;
+	constructor(agentManager) {
+		this.agentManager = agentManager;
 	}
 	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 profile = this.agentManager.resolveAgentProfile(params.spec.agentId);
 		const pruned = this.inputBudgetPruner.prune({
 			messages: params.messages.map((message) => ({ ...message })),
-			contextTokens,
-			reserveTokensFloor: reservedContextTokens,
+			contextTokens: profile.contextTokens,
+			reserveTokensFloor: profile.reservedContextTokens,
 			softThresholdTokens: 0
 		});
 		return {
@@ -7736,18 +7746,22 @@ var AgentRunRuntimeContribution = class {
 	modelInputBuilder;
 	constructor(kernel) {
 		this.kernel = kernel;
-		this.modelInputBuilder = new AgentRunModelInputBuilder(new AgentRunMessageProjector(), new AgentRunModelInputBudgeter(kernel.configManager), kernel.assetStore);
+		this.modelInputBuilder = new AgentRunModelInputBuilder(new AgentRunMessageProjector(), new AgentRunModelInputBudgeter(kernel.agents), kernel.assetStore);
 	}
 	start = () => {
 		if (this.cleanups.length > 0) return;
-		const { entries } = resolveAgentRuntimeEntries({ config: this.kernel.configManager.loadConfig() });
-		this.kernel.agentRuntimeManager.applyEntries(entries);
+		this.applyRuntimeConfig(this.kernel.configManager.loadConfig());
+		this.kernel.configManager.installRuntimeHooks({ applyAgentRuntimeConfig: this.applyRuntimeConfig });
 		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()?.();
 	};
+	applyRuntimeConfig = (config) => {
+		const { entries } = resolveAgentRuntimeEntries({ config });
+		this.kernel.agentRuntimeManager.applyEntries(entries);
+	};
 	registerNativeRuntime = () => this.kernel.agentRuntimeManager.register({
 		kind: DEFAULT_AGENT_RUNTIME_ENTRY_ID,
 		label: "Native",
@@ -8316,12 +8330,15 @@ var ContextProviderRunContextService = class {
 			request,
 			session
 		});
-		const runContext = resolveNextclawNcpRunContext({
-			configManager: this.kernel.configManager,
+		const runContext = buildNextclawNcpRunContext({
+			agentProfile: this.kernel.agents.resolveAgentProfileForRun({
+				requestMetadata,
+				storedAgentId: request.agentId ?? session?.agentId
+			}),
+			config: this.kernel.configManager.loadConfig(),
 			sessionId,
 			requestMetadata,
-			sessionMetadata: session?.metadata ?? requestMetadata,
-			storedAgentId: request.agentId ?? session?.agentId
+			sessionMetadata: session?.metadata ?? requestMetadata
 		});
 		const tools = await this.kernel.toolProviderManager.buildTools(request);
 		const sessionProjectRoot = readSessionProjectRoot(runContext.sessionMetadata);
@@ -8395,7 +8412,7 @@ var ContextWindowContribution = class {
 	unsubscribeNcpEvent = null;
 	constructor(kernel) {
 		this.kernel = kernel;
-		this.contextWindowPreview = new ContextCompactionPreflightService({ configManager: kernel.configManager });
+		this.contextWindowPreview = new ContextCompactionPreflightService(kernel.agents);
 	}
 	start = () => {
 		if (this.unsubscribeNcpEvent) return;
@@ -8732,24 +8749,24 @@ const SESSION_ACTIVITY_PREVIEW_STATES = new Set([
 	"failed",
 	"idle"
 ]);
-function isRecord$2(value) {
+function isRecord$3(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
-function readOptionalString$3(value) {
+function readOptionalString$4(value) {
 	if (typeof value !== "string") return;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : void 0;
 }
 function readSessionActivityPreviewMetadata(value) {
-	if (!isRecord$2(value)) return null;
+	if (!isRecord$3(value)) return null;
 	const state = value.state;
-	const timestamp = readOptionalString$3(value.timestamp);
+	const timestamp = readOptionalString$4(value.timestamp);
 	if (!SESSION_ACTIVITY_PREVIEW_STATES.has(state) || !timestamp) return null;
 	return {
 		state,
 		timestamp,
-		...readOptionalString$3(value.statusText) ? { statusText: readOptionalString$3(value.statusText) } : {},
-		...readOptionalString$3(value.replyText) ? { replyText: readOptionalString$3(value.replyText) } : {}
+		...readOptionalString$4(value.statusText) ? { statusText: readOptionalString$4(value.statusText) } : {},
+		...readOptionalString$4(value.replyText) ? { replyText: readOptionalString$4(value.replyText) } : {}
 	};
 }
 function compareIsoTimestamp(left, right) {
@@ -8845,47 +8862,20 @@ var SessionActivityPreviewContribution = class {
 //#endregion
 //#region src/contributions/tool-provider/providers/asset-tool.provider.ts
 var AssetToolProvider = class {
-	constructor(kernel) {
-		this.kernel = kernel;
+	constructor(assetStore) {
+		this.assetStore = assetStore;
 	}
-	provide = async (_request) => createAssetTools({ assetStore: this.kernel.assetStore });
+	provide = async (_request) => createAssetTools({ assetStore: this.assetStore });
 };
 //#endregion
-//#region src/contributions/tool-provider/utils/tool-provider-run-context.utils.ts
-async function resolveToolProviderRunContext(params) {
-	const { kernel, request } = params;
-	const session = request.sessionId ? await kernel.sessionManager.getAgentRunSession(request.sessionId) : null;
-	const sessionId = session?.sessionId ?? request.sessionId ?? request.message.sessionId ?? "";
-	const requestMetadata = buildAgentRunRequestMetadata({
-		request,
-		session
-	});
-	const runContext = resolveNextclawNcpRunContext({
-		configManager: kernel.configManager,
-		sessionId,
-		requestMetadata,
-		sessionMetadata: session?.metadata ?? requestMetadata,
-		storedAgentId: request.agentId ?? session?.agentId
-	});
-	return {
-		requestMetadata,
-		runContext,
-		session,
-		sessionId,
-		toolRunContext: runContext.toolRunContext
-	};
-}
-//#endregion
 //#region src/contributions/tool-provider/providers/core-tool.provider.ts
 var CoreToolProvider = class {
-	constructor(kernel) {
-		this.kernel = kernel;
+	constructor(runContextService, getGatewayController) {
+		this.runContextService = runContextService;
+		this.getGatewayController = getGatewayController;
 	}
 	provide = async (request) => {
-		const { toolRunContext } = await resolveToolProviderRunContext({
-			kernel: this.kernel,
-			request
-		});
+		const { toolRunContext } = await this.runContextService.resolve(request);
 		const { channel, chatId, execTimeoutSeconds, restrictToWorkspace, searchConfig, sessionId, workspace } = toolRunContext;
 		const allowedDir = restrictToWorkspace ? workspace : void 0;
 		const execTool = new ExecTool({
@@ -8898,7 +8888,7 @@ var CoreToolProvider = class {
 			chatId,
 			sessionKey: sessionId
 		});
-		const gatewayTool = new GatewayTool(this.kernel.getGatewayController());
+		const gatewayTool = new GatewayTool(this.getGatewayController());
 		gatewayTool.setContext({ sessionKey: sessionId });
 		return [
 			new ReadFileTool(allowedDir),
@@ -8917,15 +8907,13 @@ var CoreToolProvider = class {
 //#endregion
 //#region src/contributions/tool-provider/providers/mcp-tool.provider.ts
 var McpToolProvider = class {
-	constructor(kernel) {
-		this.kernel = kernel;
+	constructor(runContextService, mcpManager) {
+		this.runContextService = runContextService;
+		this.mcpManager = mcpManager;
 	}
 	provide = async (request) => {
-		const { toolRunContext } = await resolveToolProviderRunContext({
-			kernel: this.kernel,
-			request
-		});
-		return this.kernel.mcpManager.listToolsForRun({ agentId: toolRunContext.agentId });
+		const { toolRunContext } = await this.runContextService.resolve(request);
+		return this.mcpManager.listToolsForRun({ agentId: toolRunContext.agentId });
 	};
 };
 //#endregion
@@ -8938,24 +8926,24 @@ function readMetadataAccountId(metadata) {
 	}
 }
 var MessagingToolProvider = class {
-	constructor(kernel) {
-		this.kernel = kernel;
+	constructor(runContextService, channels, automation, extensions) {
+		this.runContextService = runContextService;
+		this.channels = channels;
+		this.automation = automation;
+		this.extensions = extensions;
 	}
 	provide = async (request) => {
-		const { toolRunContext } = await resolveToolProviderRunContext({
-			kernel: this.kernel,
-			request
-		});
+		const { toolRunContext } = await this.runContextService.resolve(request);
 		const { channel, chatId, metadata } = toolRunContext;
 		const accountId = readMetadataAccountId(metadata);
 		const messageTool = new MessageTool(async (message) => {
-			if (!await this.kernel.channels.deliver(message)) throw new Error(`channel "${message.channel}" is not available`);
+			if (!await this.channels.deliver(message)) throw new Error(`channel "${message.channel}" is not available`);
 		}, { resolveChannels: this.resolveMessageChannels });
 		messageTool.setContext(channel, chatId, accountId ?? null);
-		return [messageTool, new CronTool(this.kernel.automation)];
+		return [messageTool, new CronTool(this.automation)];
 	};
 	resolveMessageChannels = () => {
-		const channels = this.kernel.extensions.getExtensionRegistry()?.channels ?? [];
+		const channels = this.extensions.getExtensionRegistry()?.channels ?? [];
 		return [...new Set(channels.map((registration) => registration.channel.id.trim()).filter(Boolean))].sort();
 	};
 };
@@ -9094,12 +9082,12 @@ var SessionsHistoryTool = class {
 };
 //#endregion
 //#region src/tools/session-request.tools.ts
-function readRequiredString$1(params, key) {
+function readRequiredString$2(params, key) {
 	const value = params[key];
 	if (typeof value !== "string" || value.trim().length === 0) throw new Error(`${key} must be a non-empty string.`);
 	return value.trim();
 }
-function readOptionalString$2(params, key) {
+function readOptionalString$3(params, key) {
 	const value = params[key];
 	if (typeof value !== "string") return;
 	const trimmed = value.trim();
@@ -9153,16 +9141,16 @@ var SessionRequestTool = class {
 		const params = normalizeToolParams(args);
 		const target = params.target;
 		if (!target || typeof target !== "object" || Array.isArray(target)) throw new Error("target must be an object.");
-		const task = readRequiredString$1(params, "task");
-		const notifyMode = readOptionalString$2(params, "notify")?.toLowerCase();
+		const task = readRequiredString$2(params, "task");
+		const notifyMode = readOptionalString$3(params, "notify")?.toLowerCase();
 		if (notifyMode !== "none" && notifyMode !== "final_reply") throw new Error("notify must be \"none\" or \"final_reply\".");
 		return this.manager.requestSession({
 			sourceSessionId: this.sourceSessionId,
 			sourceToolCallId: context?.toolCallId,
 			updateToolCallResult: context?.updateToolCallResult,
-			targetSessionId: readRequiredString$1(target, "session_id"),
+			targetSessionId: readRequiredString$2(target, "session_id"),
 			task,
-			title: readOptionalString$2(params, "title"),
+			title: readOptionalString$3(params, "title"),
 			notify: notifyMode,
 			handoffDepth: this.handoffDepth
 		});
@@ -9170,7 +9158,7 @@ var SessionRequestTool = class {
 };
 //#endregion
 //#region src/tools/session-search.tools.ts
-function isRecord$1(value) {
+function isRecord$2(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function readOptionalInteger(value) {
@@ -9220,7 +9208,7 @@ var SessionSearchTool = class {
 		return issues;
 	};
 	execute = async (args) => {
-		if (!isRecord$1(args)) throw new Error("session_search requires an object argument.");
+		if (!isRecord$2(args)) throw new Error("session_search requires an object argument.");
 		const issues = this.validateArgs(args);
 		if (issues.length > 0) throw new Error(issues.join(" "));
 		return this.queryService.search({
@@ -9233,23 +9221,23 @@ var SessionSearchTool = class {
 };
 //#endregion
 //#region src/tools/session-spawn.tools.ts
-function readRequiredString(value, key) {
+function readRequiredString$1(value, key) {
 	if (typeof value !== "string" || value.trim().length === 0) throw new Error(`${key} must be a non-empty string.`);
 	return value.trim();
 }
-function readOptionalString$1(value) {
+function readOptionalString$2(value) {
 	if (typeof value !== "string") return;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : void 0;
 }
 function readSpawnScope(value) {
-	const normalized = readOptionalString$1(value)?.toLowerCase();
+	const normalized = readOptionalString$2(value)?.toLowerCase();
 	if (!normalized || normalized === "standalone") return "standalone";
 	if (normalized === "child") return "child";
 	throw new Error("scope must be \"standalone\" or \"child\".");
 }
 function readSpawnNotify(value) {
-	const notifyMode = readOptionalString$1(value)?.toLowerCase();
+	const notifyMode = readOptionalString$2(value)?.toLowerCase();
 	if (!notifyMode && typeof value === "undefined") return;
 	if (notifyMode === "none" || notifyMode === "final_reply") return notifyMode;
 	throw new Error("notify must be \"none\" or \"final_reply\".");
@@ -9308,7 +9296,7 @@ var SessionSpawnTool = class {
 	};
 	execute = async (args, context) => {
 		const { agentId: rawAgentId, model: rawModel, notify: rawNotify, runtime: rawRuntime, scope: rawScope, task: rawTask, title: rawTitle } = normalizeToolParams(args);
-		const task = readRequiredString(rawTask, "task");
+		const task = readRequiredString$1(rawTask, "task");
 		const scope = readSpawnScope(rawScope);
 		const notify = readSpawnNotify(rawNotify);
 		const parentSessionId = scope === "child" ? this.readParentSessionIdOrThrow() : void 0;
@@ -9318,10 +9306,10 @@ var SessionSpawnTool = class {
 			updateToolCallResult: context?.updateToolCallResult,
 			sourceSessionMetadata: this.sourceSessionMetadata,
 			task,
-			title: readOptionalString$1(rawTitle),
-			agentId: readOptionalString$1(rawAgentId),
-			model: readOptionalString$1(rawModel),
-			runtime: readOptionalString$1(rawRuntime),
+			title: readOptionalString$2(rawTitle),
+			agentId: readOptionalString$2(rawAgentId),
+			model: readOptionalString$2(rawModel),
+			runtime: readOptionalString$2(rawRuntime),
 			handoffDepth: this.handoffDepth,
 			parentSessionId,
 			notify
@@ -9329,11 +9317,11 @@ var SessionSpawnTool = class {
 		const session = await this.sessionManager.createSession({
 			sourceSessionId: this.sourceSessionId,
 			task,
-			title: readOptionalString$1(rawTitle),
+			title: readOptionalString$2(rawTitle),
 			sourceSessionMetadata: this.sourceSessionMetadata,
-			agentId: readOptionalString$1(rawAgentId),
-			model: readOptionalString$1(rawModel),
-			runtime: readOptionalString$1(rawRuntime),
+			agentId: readOptionalString$2(rawAgentId),
+			model: readOptionalString$2(rawModel),
+			runtime: readOptionalString$2(rawRuntime),
 			parentSessionId
 		});
 		return {
@@ -9357,22 +9345,22 @@ var SessionSpawnTool = class {
 //#endregion
 //#region src/contributions/tool-provider/providers/session-tool.provider.ts
 var SessionToolProvider = class {
-	constructor(kernel) {
-		this.kernel = kernel;
+	constructor(runContextService, sessionManager, sessionRequests, sessionSearch) {
+		this.runContextService = runContextService;
+		this.sessionManager = sessionManager;
+		this.sessionRequests = sessionRequests;
+		this.sessionSearch = sessionSearch;
 	}
 	provide = async (request) => {
-		const { toolRunContext } = await resolveToolProviderRunContext({
-			kernel: this.kernel,
-			request
-		});
+		const { toolRunContext } = await this.runContextService.resolve(request);
 		const { handoffDepth, metadata, sessionId } = toolRunContext;
-		const sessionsSpawnTool = new SessionSpawnTool(this.kernel.sessionManager, this.kernel.sessionRequests);
+		const sessionsSpawnTool = new SessionSpawnTool(this.sessionManager, this.sessionRequests);
 		sessionsSpawnTool.setContext({
 			sourceSessionId: sessionId,
 			sourceSessionMetadata: metadata,
 			handoffDepth
 		});
-		const sessionsRequestTool = new SessionRequestTool(this.kernel.sessionRequests);
+		const sessionsRequestTool = new SessionRequestTool(this.sessionRequests);
 		sessionsRequestTool.setContext({
 			sourceSessionId: sessionId,
 			handoffDepth
@@ -9380,15 +9368,166 @@ var SessionToolProvider = class {
 		const tools = [
 			sessionsSpawnTool,
 			sessionsRequestTool,
-			new SessionsListTool(this.kernel.sessionManager),
-			new SessionsHistoryTool(this.kernel.sessionManager)
+			new SessionsListTool(this.sessionManager),
+			new SessionsHistoryTool(this.sessionManager)
 		];
-		if (!this.kernel.sessionSearch.isReady()) return tools;
-		tools.push(new SessionSearchTool({ search: this.kernel.sessionSearch.search }, { currentSessionId: sessionId }));
+		if (!this.sessionSearch.isReady()) return tools;
+		tools.push(new SessionSearchTool({ search: this.sessionSearch.search }, { currentSessionId: sessionId }));
 		return tools;
 	};
 };
 //#endregion
+//#region src/tools/show-content.tools.ts
+const SHOW_CONTENT_TOOL_NAME = "show_content";
+function isRecord$1(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function readRequiredString(value, key) {
+	if (typeof value !== "string" || value.trim().length === 0) throw new Error(`${key} must be a non-empty string.`);
+	return value.trim();
+}
+function readOptionalString$1(value) {
+	if (typeof value !== "string") return;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : void 0;
+}
+function readOptionalPositiveInteger(value, key) {
+	if (typeof value === "undefined") return;
+	if (typeof value !== "number" || !Number.isInteger(value) || value < 1) throw new Error(`${key} must be a positive integer.`);
+	return value;
+}
+function readPurpose(value) {
+	const normalized = readOptionalString$1(value);
+	if (!normalized) return;
+	if (normalized === "read" || normalized === "preview" || normalized === "edit" || normalized === "interact") return normalized;
+	throw new Error("purpose must be \"read\", \"preview\", \"edit\", or \"interact\".");
+}
+function readPayload(params) {
+	if (!isRecord$1(params.payload)) throw new Error("payload must be an object.");
+	return params.payload;
+}
+function readUrl(value) {
+	const url = readRequiredString(value, "payload.url");
+	let parsed;
+	try {
+		parsed = new URL(url);
+	} catch {
+		throw new Error("payload.url must be a valid URL.");
+	}
+	if (parsed.protocol !== "http:" && parsed.protocol !== "https:") throw new Error("payload.url must use http or https.");
+	return parsed.toString();
+}
+function normalizeShowContentArgs(args) {
+	const params = normalizeToolParams(args);
+	const type = readRequiredString(params.type, "type");
+	const payload = readPayload(params);
+	const title = readOptionalString$1(params.title);
+	const purpose = readPurpose(params.purpose);
+	if (type === "file") return {
+		target: {
+			type,
+			payload: {
+				path: readRequiredString(payload.path, "payload.path"),
+				line: readOptionalPositiveInteger(payload.line, "payload.line"),
+				column: readOptionalPositiveInteger(payload.column, "payload.column")
+			}
+		},
+		title,
+		purpose
+	};
+	if (type === "url") return {
+		target: {
+			type,
+			payload: { url: readUrl(payload.url) }
+		},
+		title,
+		purpose
+	};
+	if (type === "panel_app") return {
+		target: {
+			type,
+			payload: { appId: readRequiredString(payload.appId, "payload.appId") }
+		},
+		title,
+		purpose
+	};
+	throw new Error("type must be \"file\", \"url\", or \"panel_app\".");
+}
+function summarizeTarget(target) {
+	if (target.type === "file") return target.payload.path;
+	if (target.type === "url") return target.payload.url;
+	return target.payload.appId;
+}
+function createShowContentEventPayload(request, context) {
+	const toolCallId = readOptionalString$1(context?.toolCallId);
+	return {
+		id: toolCallId ? `tool:${toolCallId}:show-content` : `show-content:${request.target.type}:${summarizeTarget(request.target)}`,
+		toolCallId,
+		target: request.target,
+		title: request.title,
+		purpose: request.purpose
+	};
+}
+var ShowContentTool = class {
+	name = SHOW_CONTENT_TOOL_NAME;
+	description = "Show file, URL, or panel app content in the current chat UI.";
+	parameters = {
+		type: "object",
+		properties: {
+			type: {
+				type: "string",
+				enum: [
+					"file",
+					"url",
+					"panel_app"
+				],
+				description: "Content target type."
+			},
+			title: {
+				type: "string",
+				description: "Optional title for the shown content."
+			},
+			purpose: {
+				type: "string",
+				enum: [
+					"read",
+					"preview",
+					"edit",
+					"interact"
+				],
+				description: "Optional user intent for the content."
+			},
+			payload: {
+				type: "object",
+				description: "Type-specific fields: file={path,line,column}; url={url}; panel_app={appId}.",
+				additionalProperties: true
+			}
+		},
+		required: ["type", "payload"],
+		additionalProperties: false
+	};
+	constructor(eventBus) {
+		this.eventBus = eventBus;
+	}
+	execute = async (args, context) => {
+		const request = normalizeShowContentArgs(args);
+		this.eventBus.emit(eventKeys.uiShowContent, createShowContentEventPayload(request, context), { source: "kernel" });
+		return {
+			ok: true,
+			action: "showContent",
+			request
+		};
+	};
+};
+//#endregion
+//#region src/contributions/tool-provider/providers/show-content-tool.provider.ts
+var ShowContentToolProvider = class {
+	constructor(eventBus) {
+		this.eventBus = eventBus;
+	}
+	provide = () => [new ShowContentTool(this.eventBus)];
+};
+//#endregion
 //#region src/contributions/tool-provider/providers/structured-result-tool.provider.ts
 var StructuredResultToolProvider = class {
 	provide = (request) => {
@@ -9411,6 +9550,40 @@ function isRecord(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
+//#region src/contributions/tool-provider/services/tool-provider-run-context.service.ts
+var ToolProviderRunContextService = class {
+	constructor(sessionManager, agentManager, configManager) {
+		this.sessionManager = sessionManager;
+		this.agentManager = agentManager;
+		this.configManager = configManager;
+	}
+	resolve = async (request) => {
+		const session = request.sessionId ? await this.sessionManager.getAgentRunSession(request.sessionId) : null;
+		const sessionId = session?.sessionId ?? request.sessionId ?? request.message.sessionId ?? "";
+		const requestMetadata = buildAgentRunRequestMetadata({
+			request,
+			session
+		});
+		const runContext = buildNextclawNcpRunContext({
+			agentProfile: this.agentManager.resolveAgentProfileForRun({
+				requestMetadata,
+				storedAgentId: request.agentId ?? session?.agentId
+			}),
+			config: this.configManager.loadConfig(),
+			sessionId,
+			requestMetadata,
+			sessionMetadata: session?.metadata ?? requestMetadata
+		});
+		return {
+			requestMetadata,
+			runContext,
+			session,
+			sessionId,
+			toolRunContext: runContext.toolRunContext
+		};
+	};
+};
+//#endregion
 //#region src/contributions/tool-provider/index.ts
 var ToolProviderContribution = class {
 	cleanups = [];
@@ -9424,14 +9597,18 @@ var ToolProviderContribution = class {
 	dispose = () => {
 		while (this.cleanups.length > 0) this.cleanups.pop()?.();
 	};
-	createToolProviders = () => [
-		new StructuredResultToolProvider(),
-		new CoreToolProvider(this.kernel),
-		new MessagingToolProvider(this.kernel),
-		new SessionToolProvider(this.kernel),
-		new AssetToolProvider(this.kernel),
-		new McpToolProvider(this.kernel)
-	];
+	createToolProviders = () => {
+		const runContextService = new ToolProviderRunContextService(this.kernel.sessionManager, this.kernel.agents, this.kernel.configManager);
+		return [
+			new StructuredResultToolProvider(),
+			new ShowContentToolProvider(this.kernel.eventBus),
+			new CoreToolProvider(runContextService, this.kernel.getGatewayController),
+			new MessagingToolProvider(runContextService, this.kernel.channels, this.kernel.automation, this.kernel.extensions),
+			new SessionToolProvider(runContextService, this.kernel.sessionManager, this.kernel.sessionRequests, this.kernel.sessionSearch),
+			new AssetToolProvider(this.kernel.assetStore),
+			new McpToolProvider(runContextService, this.kernel.mcpManager)
+		];
+	};
 };
 //#endregion
 //#region src/app/nextclaw-kernel.ts
@@ -9487,26 +9664,27 @@ var NextclawKernel = class {
 	gatewayController;
 	constructor(options = {}) {
 		const sessionsDir = resolveKernelSessionsDir(options);
-		this.sessionSearch = new SessionSearchManager({
+		this.sessionSearch = new SessionSearchService({
 			databasePath: resolve(getDataDir(), "session-search.db"),
 			sessionsDir
 		});
 		this.ncpAgentSessionJournalStore = new NcpAgentSessionJournalStore(resolve(sessionsDir, ".ncp-agent-journal"));
 		this.automation = new AutomationManager({ storePath: resolveKernelAutomationStorePath(options) });
 		this.assetStore = new LocalAssetStore({ rootDir: resolve(getDataDir(), "assets") });
-		this.agents = new AgentManager();
 		this.control = new NextclawKernelControlManager();
-		this.channels = new ChannelManager$1({ bus: this.messageBus });
+		this.channels = new ChannelManager({ bus: this.messageBus });
 		this.configManager = new ConfigManager({
 			configPath: options.configPath,
 			channels: this.channels,
 			providerManager: this.llmProviders
 		});
+		this.agents = new AgentManager(this.configManager);
 		this.accessManager = new AccessManager({
 			configManager: this.configManager,
 			homeDir: options.homeDir
 		});
 		this.sessionManager = new SessionManager({
+			agentManager: this.agents,
 			configManager: this.configManager,
 			eventBus: this.eventBus,
 			journalStore: this.ncpAgentSessionJournalStore,
@@ -9539,9 +9717,9 @@ var NextclawKernel = class {
 				ingress: this.ingress
 			})
 		});
-		this.contextCompactionManager = new AgentRunContextCompactionManager(this.configManager, this.llmProviders, this.sessionManager);
+		this.contextCompactionManager = new AgentRunContextCompactionManager(this.agents, this.llmProviders, this.sessionManager);
 		this.sessionRunManager = new SessionRunManager(this.sessionManager);
-		this.agentRunRequestManager = new AgentRunRequestManager(this.agentRuntimeManager, this.configManager, this.contextProviderManager, this.eventBus, this.ingress, this.sessionManager, this.sessionRunManager, this.toolProviderManager);
+		this.agentRunRequestManager = new AgentRunRequestManager(this.agentRuntimeManager, this.agents, this.configManager, this.contextProviderManager, this.eventBus, this.ingress, this.sessionManager, this.sessionRunManager, this.toolProviderManager);
 		this.contributions = [
 			new ToolProviderContribution(this),
 			new SessionActivityPreviewContribution(this),
@@ -10181,6 +10359,6 @@ function resolveLegacyEventType(message) {
 	return `message.${role || "other"}`;
 }
 //#endregion
-export { AccessManager, AgentManager, AgentRunClient, AgentRuntimeRegistry, AutomationManager, BuiltinNarpRuntimeProviderService, CONTEXT_COMPACTION_TIMELINE_KIND, ChannelManager, CommandRegistry, ConfigManager, ContextCompactionPreflightService, ContextWindowPreviewManager, DEFAULT_AGENT_RUNTIME_ENTRY_ID, DEFAULT_SERVICE_ACTION_RISK, ExtensionManager, GatewayInboundProcessor, LlmProviderManager, LlmUsageManager, LlmUsageStore, McpManager, McpServiceAppRuntimeService, NARP_HTTP_RUNTIME_KIND, NARP_STDIO_RUNTIME_KIND, NEXTCLAW_TIMELINE_KIND_METADATA_KEY, NcpAgentSessionJournalStore, NextclawKernel, PANEL_APP_AGENT_CAPABILITIES, PanelAppAssetTokenService, PanelAppError, PanelAppManager, ProviderManagerNcpLLMApi, SERVICE_APP_MANIFEST_FILE_NAME, ServiceAppError, ServiceAppManager, SessionManager, SessionRequestManager, SkillManager, UpdateManifestReader, buildAgentRunSendPayload, buildContextCompactionModelInput, buildContextCompactionTimelineNcpMessage, buildLlmUsageSummary, buildLocalizedTextMap, buildServiceActionId, createAgentRuntimeSessionRequestDispatcher, createAssetTools, createContextCompactionMessageId, createContextWindowSignature, createLlmUsageRecord, dispatchAgentRuntimeSessionRequest, dispatchChannelReplyRoute, dispatchPromptOverNcp, getServiceActionName, getServiceAppManifestPath, getUnsignedUpdateManifest, hasLlmUsageTelemetry, isContextCompactionTimelineMessage, isContextWindowSnapshot, isPanelAppAgentCapability, isPanelAppError, isReplyCapableChannel, isServiceAppError, listExtensionChannelIds, listServiceAppManifestActions, mergeServiceAppRuntimeActions, normalizeAgentRuntimeSessionTypeIcon, normalizeLlmUsageModel, normalizeOptionalString, parseServiceAppManifest, parseSkillFrontmatter, readContextWindowEventSessionId, readLatestContextCompactionCheckpoint, readLearningLoopRuntimeConfig, readMetadataModel, readMetadataThinking, readServiceAppManifest, resolveAgentRuntimeEntries, resolveChannelReplyRoute, resolveEffectiveModel, resolveLegacyEventType, resolveNextclawNcpRunContext, resolveSessionChannelContext, runGatewayInboundLoop, sanitizeLlmUsage, serializeUnsignedUpdateManifest, shouldRefreshContextWindowDuringStream, shouldRefreshContextWindowImmediately, stripSkillFrontmatter, syncSessionThinkingPreference, toNcpMessages, waitForAgentRuntimeSessionReply };
+export { AccessManager, AgentManager, AgentRunClient, AutomationManager, BuiltinNarpRuntimeProviderService, CONTEXT_COMPACTION_TIMELINE_KIND, ChannelManager, CommandRegistry, ConfigManager, ContextCompactionPreflightService, ContextWindowPreviewManager, DEFAULT_AGENT_RUNTIME_ENTRY_ID, DEFAULT_SERVICE_ACTION_RISK, ExtensionManager, GatewayInboundProcessor, LlmProviderManager, LlmUsageManager, LlmUsageStore, McpManager, McpServiceAppRuntimeService, NARP_HTTP_RUNTIME_KIND, NARP_STDIO_RUNTIME_KIND, NEXTCLAW_TIMELINE_KIND_METADATA_KEY, NcpAgentSessionJournalStore, NextclawKernel, PANEL_APP_AGENT_CAPABILITIES, PanelAppAssetTokenService, PanelAppError, PanelAppManager, ProviderManagerNcpLLMApi, SERVICE_APP_MANIFEST_FILE_NAME, ServiceAppError, ServiceAppManager, SessionManager, SessionRequestManager, SkillManager, UpdateManifestReader, buildAgentRunSendPayload, buildContextCompactionModelInput, buildContextCompactionTimelineNcpMessage, buildLlmUsageSummary, buildLocalizedTextMap, buildNextclawNcpRunContext, buildServiceActionId, createAgentRuntimeSessionRequestDispatcher, createAssetTools, createContextCompactionMessageId, createContextWindowSignature, createLlmUsageRecord, describeAgentRuntimeSessionTypes, dispatchAgentRuntimeSessionRequest, dispatchChannelReplyRoute, dispatchPromptOverNcp, getServiceActionName, getServiceAppManifestPath, getUnsignedUpdateManifest, hasLlmUsageTelemetry, isContextCompactionTimelineMessage, isContextWindowSnapshot, isPanelAppAgentCapability, isPanelAppError, isReplyCapableChannel, isServiceAppError, listExtensionChannelIds, listServiceAppManifestActions, mergeServiceAppRuntimeActions, normalizeAgentRuntimeSessionTypeIcon, normalizeLlmUsageModel, normalizeOptionalString, parseServiceAppManifest, parseSkillFrontmatter, readContextWindowEventSessionId, readLatestContextCompactionCheckpoint, readLearningLoopRuntimeConfig, readMetadataModel, readMetadataThinking, readServiceAppManifest, resolveAgentRuntimeEntries, resolveChannelReplyRoute, resolveEffectiveModel, resolveLegacyEventType, resolveSessionChannelContext, runGatewayInboundLoop, sanitizeLlmUsage, serializeUnsignedUpdateManifest, shouldRefreshContextWindowDuringStream, shouldRefreshContextWindowImmediately, stripSkillFrontmatter, syncSessionThinkingPreference, toNcpMessages, waitForAgentRuntimeSessionReply };
 
 //# sourceMappingURL=index.js.map