@nextclaw/kernel 0.5.0 → 0.5.1-beta.0

package/dist/index.js

@@ -1,6 +1,6 @@
 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 { 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, normalizeModelThinkingCapability, 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 { LocalAssetStore, buildAssetContentPath, buildNcpUserContent, buildOpenAiFunctionTool, ncpMessageToOpenAiMessages, validateToolArgs } from "@nextclaw/ncp-agent-runtime";
 import { createHash, createHmac, randomBytes, randomUUID, scryptSync, timingSafeEqual } from "node:crypto";
@@ -703,13 +703,16 @@ var AgentRunRequestManager = class {
 		const contextBlocks = await this.contextProviderManager.buildContext(providerRequest);
 		const tools = await this.toolProviderManager.buildTools(providerRequest);
 		let messageCompletedSeen = false;
+		let runtimeFailed = false;
 		lastValueFrom(from(runtime.run(spec, {
 			contextBlocks,
+			session,
 			sessionRun,
 			signal: activeRun.signal,
 			tools
 		})).pipe(tap((event) => {
 			const eventsToPublish = [];
+			if (event.type === NcpEventType.RunError) runtimeFailed = true;
 			if (event.type === NcpEventType.MessageCompleted) messageCompletedSeen = true;
 			if (event.type === NcpEventType.RunFinished && !messageCompletedSeen) {
 				const message = findCompletedAssistantMessage(sessionRun.getSnapshot().messages, event.payload.messageId);
@@ -730,6 +733,7 @@ var AgentRunRequestManager = class {
 				source: "agent-run-request"
 			});
 		}), catchError(async (error) => {
+			runtimeFailed = true;
 			const event = {
 				type: NcpEventType.RunError,
 				payload: {
@@ -744,7 +748,14 @@ var AgentRunRequestManager = class {
 				emittedAt: (/* @__PURE__ */ new Date()).toISOString(),
 				source: "agent-run-request"
 			});
-		})), { defaultValue: void 0 });
+		})), { defaultValue: void 0 }).finally(() => {
+			if (!runtimeFailed) return;
+			this.agentRuntimeManager.disposeRuntime({
+				agentRuntimeId: session.agentRuntimeId,
+				session,
+				sessionRun
+			}).catch(() => void 0);
+		});
 		return {
 			sessionId: session.sessionId,
 			userMessageId: message.id,
@@ -855,6 +866,7 @@ async function describeAgentRuntimeSessionTypes(params) {
 				reasonMessage: `Runtime provider unavailable for type "${entry.type}".`,
 				recommendedModel: null,
 				modelSelectionMode: "nextclaw",
+				runtimeDefaultThinking: null,
 				cta: {
 					kind: "settings",
 					label: "Configure Runtime"
@@ -873,6 +885,7 @@ async function describeAgentRuntimeSessionTypes(params) {
 				reasonMessage: descriptor?.reasonMessage ?? null,
 				recommendedModel: descriptor?.recommendedModel ?? null,
 				modelSelectionMode: descriptor?.modelSelectionMode ?? "nextclaw",
+				runtimeDefaultThinking: descriptor?.runtimeDefaultThinking ?? null,
 				cta: descriptor?.cta ?? null,
 				...descriptor?.supportedModels ? { supportedModels: descriptor.supportedModels } : {}
 			};
@@ -909,12 +922,8 @@ var AgentRuntimeManager = class {
 		});
 	};
 	getOrCreate = (params) => {
-		const { agentRuntimeId, session, sessionRun } = params;
-		const entry = this.getEntry(agentRuntimeId);
-		const provider = this.getProvider(entry.type);
-		const reuseScope = this.resolveReuseScope(entry, provider);
-		const cacheKey = reuseScope === "global" ? entry.id : `${entry.id}:${session.sessionId}`;
-		const cache = reuseScope === "global" ? this.globalRuntimes : this.sessionRuntimes;
+		const { session, sessionRun } = params;
+		const { cache, cacheKey, entry, provider } = this.resolveRuntimeCache(params);
 		const existing = cache.get(cacheKey);
 		if (existing) return existing;
 		const agentRuntime = provider.createRuntime({
@@ -925,6 +934,14 @@ var AgentRuntimeManager = class {
 		cache.set(cacheKey, agentRuntime);
 		return agentRuntime;
 	};
+	disposeRuntime = async (params) => {
+		const { cache, cacheKey } = this.resolveRuntimeCache(params);
+		const runtime = cache.get(cacheKey);
+		if (!runtime) return false;
+		cache.delete(cacheKey);
+		await runtime.dispose?.();
+		return true;
+	};
 	listSessionTypes = async (params) => describeAgentRuntimeSessionTypes({
 		entries: [...this.entries.values()],
 		providers: this.providers,
@@ -954,6 +971,19 @@ var AgentRuntimeManager = class {
 	resolveReuseScope = (entry, provider) => {
 		return entry.config?.reuseScope === "session" || entry.config?.reuseScope === "global" ? entry.config.reuseScope : provider.defaultReuseScope;
 	};
+	resolveRuntimeCache = (params) => {
+		const { agentRuntimeId, session } = params;
+		const entry = this.getEntry(agentRuntimeId);
+		const provider = this.getProvider(entry.type);
+		const reuseScope = this.resolveReuseScope(entry, provider);
+		const cacheKey = reuseScope === "global" ? entry.id : `${entry.id}:${session.sessionId}`;
+		return {
+			cache: reuseScope === "global" ? this.globalRuntimes : this.sessionRuntimes,
+			cacheKey,
+			entry,
+			provider
+		};
+	};
 	disposeAllRuntimes = async () => {
 		for (const runtime of [...this.globalRuntimes.values(), ...this.sessionRuntimes.values()]) await runtime.dispose?.();
 		this.globalRuntimes.clear();
@@ -3443,6 +3473,262 @@ function readEventSessionId$1(event) {
 	return "payload" in event && "sessionId" in event.payload ? readOptionalMetadataString(event.payload.sessionId) : void 0;
 }
 //#endregion
+//#region src/contributions/session-activity-preview/utils/session-activity-preview-ncp-event.utils.ts
+const PREVIEW_TEXT_MAX_LENGTH = 160;
+function readSessionId(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+function compactPreviewText(value) {
+	return value.replace(/\s+/g, " ").trim();
+}
+function truncatePreviewText(value) {
+	const compacted = compactPreviewText(value);
+	if (compacted.length <= PREVIEW_TEXT_MAX_LENGTH) return compacted;
+	return compacted.slice(0, PREVIEW_TEXT_MAX_LENGTH - 1).trimEnd();
+}
+function readSessionActivityPreviewText(message) {
+	const chunks = [];
+	for (const part of message.parts) if ((part.type === "text" || part.type === "rich-text") && part.text.trim()) chunks.push(part.text);
+	const previewText = truncatePreviewText(chunks.join(" "));
+	return previewText.length > 0 ? previewText : null;
+}
+function createProjection(sessionId, preview) {
+	if (!sessionId) return null;
+	return {
+		sessionId,
+		preview
+	};
+}
+function formatErrorStatus(error) {
+	if (typeof error === "string" && error.trim()) return `运行出错：${truncatePreviewText(error)}`;
+	if (error && typeof error === "object" && "message" in error) {
+		const message = error.message;
+		if (typeof message === "string" && message.trim()) return `运行出错：${truncatePreviewText(message)}`;
+	}
+	return "运行出错";
+}
+function readToolCallId(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+function formatToolDoneStatus(toolName) {
+	return toolName ? `工具调用完成：${toolName}` : "工具调用完成";
+}
+function createSessionActivityPreviewFromNcpEvent(event, timestamp, options = {}) {
+	switch (event.type) {
+		case NcpEventType.RunStarted: return createProjection(readSessionId(event.payload.sessionId), {
+			state: "running",
+			statusText: "正在思考",
+			timestamp
+		});
+		case NcpEventType.RunFinished: return createProjection(readSessionId(event.payload.sessionId), {
+			state: "completed",
+			timestamp
+		});
+		case NcpEventType.RunError: return createProjection(readSessionId(event.payload.sessionId), {
+			state: "failed",
+			statusText: formatErrorStatus(event.payload.error),
+			timestamp
+		});
+		case NcpEventType.MessageSent: {
+			const text = readSessionActivityPreviewText(event.payload.message);
+			if (!text || event.payload.message.role !== "user") return null;
+			return createProjection(readSessionId(event.payload.sessionId), {
+				state: "running",
+				statusText: text,
+				timestamp: event.payload.message.timestamp || timestamp
+			});
+		}
+		case NcpEventType.MessageCompleted: {
+			const text = readSessionActivityPreviewText(event.payload.message);
+			if (!text || event.payload.message.role !== "assistant") return null;
+			return createProjection(readSessionId(event.payload.sessionId), {
+				state: "completed",
+				replyText: text,
+				timestamp: event.payload.message.timestamp || timestamp
+			});
+		}
+		case NcpEventType.MessageFailed: return createProjection(readSessionId(event.payload.sessionId), {
+			state: "failed",
+			statusText: formatErrorStatus(event.payload.error),
+			timestamp
+		});
+		case NcpEventType.MessageToolCallStart: return createProjection(readSessionId(event.payload.sessionId), {
+			state: "running",
+			statusText: `正在调用工具：${event.payload.toolName}`,
+			timestamp
+		});
+		case NcpEventType.MessageToolCallEnd:
+		case NcpEventType.MessageToolCallResult: {
+			const sessionId = readSessionId(event.payload.sessionId);
+			const toolCallId = readToolCallId(event.payload.toolCallId);
+			return createProjection(sessionId, {
+				state: "running",
+				statusText: formatToolDoneStatus(sessionId && toolCallId ? options.readToolName?.(sessionId, toolCallId) ?? null : null),
+				timestamp
+			});
+		}
+		default: return null;
+	}
+}
+//#endregion
+//#region src/contributions/session-activity-preview/utils/session-activity-preview-metadata.utils.ts
+const SESSION_ACTIVITY_PREVIEW_METADATA_KEY = "last_activity_preview";
+const SESSION_ACTIVITY_PREVIEW_STATES = new Set([
+	"running",
+	"completed",
+	"failed",
+	"idle"
+]);
+function isRecord$10(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function readOptionalString$7(value) {
+	if (typeof value !== "string") return;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : void 0;
+}
+function readSessionActivityPreviewMetadata(value) {
+	if (!isRecord$10(value)) return null;
+	const state = value.state;
+	const timestamp = readOptionalString$7(value.timestamp);
+	if (!SESSION_ACTIVITY_PREVIEW_STATES.has(state) || !timestamp) return null;
+	return {
+		state,
+		timestamp,
+		...readOptionalString$7(value.statusText) ? { statusText: readOptionalString$7(value.statusText) } : {},
+		...readOptionalString$7(value.replyText) ? { replyText: readOptionalString$7(value.replyText) } : {}
+	};
+}
+function compareIsoTimestamp(left, right) {
+	const leftTime = Date.parse(left);
+	const rightTime = Date.parse(right);
+	if (!Number.isFinite(leftTime) || !Number.isFinite(rightTime)) return left.localeCompare(right);
+	return leftTime - rightTime;
+}
+function mergeSessionActivityPreview(current, incoming) {
+	if (current && compareIsoTimestamp(incoming.timestamp, current.timestamp) < 0) return incoming.replyText && !current.replyText ? {
+		...current,
+		replyText: incoming.replyText
+	} : current;
+	return {
+		state: incoming.state,
+		timestamp: incoming.timestamp,
+		...incoming.statusText ?? (incoming.state === "completed" ? current?.statusText : void 0) ? { statusText: incoming.statusText ?? current?.statusText } : {},
+		...incoming.replyText ?? (incoming.state === "completed" ? current?.replyText : void 0) ? { replyText: incoming.replyText ?? current?.replyText } : {}
+	};
+}
+function areSessionActivityPreviewsEqual(left, right) {
+	return Boolean(left) && left?.state === right.state && left.timestamp === right.timestamp && left.statusText === right.statusText && left.replyText === right.replyText;
+}
+function writeSessionActivityPreviewMetadata(metadata, projection) {
+	const current = readSessionActivityPreviewMetadata(metadata?.[SESSION_ACTIVITY_PREVIEW_METADATA_KEY]);
+	const next = mergeSessionActivityPreview(current, projection.preview);
+	if (areSessionActivityPreviewsEqual(current, next)) return null;
+	return {
+		...metadata ?? {},
+		[SESSION_ACTIVITY_PREVIEW_METADATA_KEY]: next
+	};
+}
+//#endregion
+//#region src/contributions/session-activity-preview/services/session-activity-preview-event.service.ts
+var SessionActivityPreviewEventService = class {
+	toolNames = /* @__PURE__ */ new Map();
+	constructor(options) {
+		this.options = options;
+	}
+	projectEvent = (event, timestamp) => {
+		this.rememberToolName(event);
+		const projection = createSessionActivityPreviewFromNcpEvent(event, timestamp, { readToolName: this.readToolName });
+		this.clearFinishedRunToolNames(event);
+		return projection;
+	};
+	updatePreview = async (projection) => {
+		const session = await this.options.getSessionRecord(projection.sessionId);
+		const replyText = projection.preview.replyText ?? (projection.preview.state === "completed" ? this.readLatestAssistantPreviewText(session?.messages) : void 0);
+		const nextMetadata = writeSessionActivityPreviewMetadata(session?.metadata, {
+			...projection,
+			preview: {
+				...projection.preview,
+				replyText
+			}
+		});
+		if (nextMetadata) await this.options.updateSessionMetadata(projection.sessionId, nextMetadata);
+	};
+	clear = () => {
+		this.toolNames.clear();
+	};
+	rememberToolName = (event) => {
+		if (event.type !== NcpEventType.MessageToolCallStart) return;
+		const { sessionId, toolCallId, toolName } = event.payload;
+		if (sessionId && toolCallId && toolName) this.toolNames.set(this.createToolNameKey(sessionId, toolCallId), toolName);
+	};
+	readToolName = (sessionId, toolCallId) => this.toolNames.get(this.createToolNameKey(sessionId, toolCallId)) ?? null;
+	clearFinishedRunToolNames = (event) => {
+		if (event.type !== NcpEventType.RunFinished && event.type !== NcpEventType.RunError) return;
+		const sessionId = event.payload.sessionId;
+		for (const key of this.toolNames.keys()) if (key.startsWith(`${sessionId}:`)) this.toolNames.delete(key);
+	};
+	createToolNameKey = (sessionId, toolCallId) => `${sessionId}:${toolCallId}`;
+	readLatestAssistantPreviewText = (messages) => {
+		for (let index = (messages?.length ?? 0) - 1; index >= 0; index -= 1) {
+			const message = messages?.[index];
+			if (message?.role === "assistant") return readSessionActivityPreviewText(message) ?? void 0;
+		}
+	};
+};
+//#endregion
+//#region src/services/session-event-ingestion.service.ts
+const SESSION_METADATA_PATCH_RUN_METADATA_KIND = "session_metadata_patch";
+function isDurableSessionEvent(event) {
+	return event.type !== NcpEventType.ContextWindowUpdated;
+}
+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 SessionEventIngestionService = class {
+	activityPreview;
+	chains = /* @__PURE__ */ new Map();
+	constructor(options) {
+		this.options = options;
+		this.activityPreview = new SessionActivityPreviewEventService({
+			getSessionRecord: options.getSessionRecord,
+			updateSessionMetadata: options.updateSessionMetadata
+		});
+	}
+	handleEvent = (event) => {
+		const sessionId = readEventSessionId$1(event);
+		if (!sessionId || !isDurableSessionEvent(event)) return;
+		const next = (this.chains.get(sessionId) ?? Promise.resolve()).then(() => this.handleDurableEvent(sessionId, event));
+		this.chains.set(sessionId, next.catch(() => void 0));
+		next.catch((error) => this.options.onError(sessionId, error));
+	};
+	clear = () => {
+		this.chains.clear();
+		this.activityPreview.clear();
+	};
+	handleDurableEvent = async (sessionId, event) => {
+		const preview = this.activityPreview.projectEvent(event, (/* @__PURE__ */ new Date()).toISOString());
+		const metadataPatch = readRuntimeSessionMetadataPatch(event);
+		if (metadataPatch) {
+			await this.options.updateSessionMetadata(sessionId, metadataPatch);
+			return;
+		}
+		await this.options.appendSessionEvent({
+			event,
+			sessionId
+		});
+		if (preview) await this.activityPreview.updatePreview(preview);
+	};
+};
+//#endregion
 //#region src/services/session-working-dir-resolver.service.ts
 var SessionWorkingDirResolver = class {
 	constructor(agentManager) {
@@ -3471,10 +3757,6 @@ 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;
-}
 function readThinkingEffort(metadata) {
 	return readOptionalMetadataString(metadata?.thinkingEffort) ?? null;
 }
@@ -3542,42 +3824,34 @@ 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;
+	eventIngestion;
 	workingDirResolver;
 	started = false;
 	constructor(options) {
 		this.options = options;
+		this.eventIngestion = new SessionEventIngestionService({
+			appendSessionEvent: (params) => this.appendSessionEvent(params),
+			getSessionRecord: (sessionId) => this.getSessionRecord(sessionId),
+			onError: (sessionId, error) => {
+				const message = error instanceof Error ? error.stack ?? error.message : String(error);
+				console.error(`[session-manager] failed to handle ncp event for ${sessionId}: ${message}`);
+			},
+			updateSessionMetadata: (sessionId, metadata) => this.updateSessionMetadata(sessionId, metadata)
+		});
 		this.contextWindowPreview = new ContextWindowPreviewManager(options.agentManager);
 		this.workingDirResolver = new SessionWorkingDirResolver(options.agentManager);
 	}
 	start = () => {
 		if (this.started) return;
 		this.started = true;
-		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
-			});
-		}));
+		this.cleanups.push(this.options.eventBus.on(eventKeys.ncpEvent, this.eventIngestion.handleEvent));
 	};
 	dispose = () => {
 		while (this.cleanups.length > 0) this.cleanups.pop()?.();
+		this.eventIngestion.clear();
 		this.started = false;
 	};
 	createSession = async (params) => {
@@ -3706,6 +3980,10 @@ var SessionManager = class {
 			metadata: structuredClone(record.metadata ?? {}),
 			model,
 			projectRoot: readProjectRoot(record.metadata),
+			workingDir: this.workingDirResolver.resolve({
+				agentId: record.agentId,
+				metadata: record.metadata
+			}),
 			thinkingEffort: readThinkingEffort(record.metadata)
 		};
 	};
@@ -3742,6 +4020,10 @@ var SessionManager = class {
 			metadata: structuredClone(created.metadata ?? {}),
 			model,
 			projectRoot,
+			workingDir: this.workingDirResolver.resolve({
+				agentId,
+				metadata: created.metadata
+			}),
 			thinkingEffort: thinkingEffort ?? null
 		};
 	};
@@ -4009,12 +4291,12 @@ var PanelAppCapabilityGrantStore = class {
 	};
 };
 function normalizeStoreData$2(value) {
-	if (!isRecord$10(value) || value.version !== 1 || !isRecord$10(value.grants)) return structuredClone(EMPTY_GRANTS$2);
+	if (!isRecord$9(value) || value.version !== 1 || !isRecord$9(value.grants)) return structuredClone(EMPTY_GRANTS$2);
 	const grants = {};
 	for (const [callerKey, callerValue] of Object.entries(value.grants)) {
-		if (!isRecord$10(callerValue) || !isRecord$10(callerValue.capabilities)) continue;
+		if (!isRecord$9(callerValue) || !isRecord$9(callerValue.capabilities)) continue;
 		const capabilities = {};
-		for (const [capability, grantValue] of Object.entries(callerValue.capabilities)) if (isRecord$10(grantValue) && typeof grantValue.grantedAt === "string") capabilities[capability] = { grantedAt: grantValue.grantedAt };
+		for (const [capability, grantValue] of Object.entries(callerValue.capabilities)) if (isRecord$9(grantValue) && typeof grantValue.grantedAt === "string") capabilities[capability] = { grantedAt: grantValue.grantedAt };
 		grants[callerKey] = { capabilities };
 	}
 	return {
@@ -4025,7 +4307,7 @@ function normalizeStoreData$2(value) {
 function getCallerKey(caller) {
 	return `${caller.surface}:${caller.appId}`;
 }
-function isRecord$10(value) {
+function isRecord$9(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isMissingFileError$3(error) {
@@ -4071,19 +4353,19 @@ var PanelAppClientGrantStore = class {
 	};
 };
 function normalizeStoreData$1(value) {
-	if (!isRecord$9(value) || value.version !== 1 || !isRecord$9(value.grants)) return structuredClone(EMPTY_GRANTS$1);
+	if (!isRecord$8(value) || value.version !== 1 || !isRecord$8(value.grants)) return structuredClone(EMPTY_GRANTS$1);
 	const grants = {};
-	for (const [appId, grant] of Object.entries(value.grants)) if (isRecord$9(grant) && typeof grant.grantedAt === "string") grants[appId] = { grantedAt: grant.grantedAt };
+	for (const [appId, grant] of Object.entries(value.grants)) if (isRecord$8(grant) && typeof grant.grantedAt === "string") grants[appId] = { grantedAt: grant.grantedAt };
 	return {
 		grants,
 		version: 1
 	};
 }
-function isRecord$9(value) {
+function isRecord$8(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isMissingFileError$2(error) {
-	return isRecord$9(error) && error.code === "ENOENT";
+	return isRecord$8(error) && error.code === "ENOENT";
 }
 //#endregion
 //#region src/services/agent-run-client.service.ts
@@ -4302,7 +4584,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$8(input.schema)) throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "invalid generateObject request");
+	if (!peerId || !prompt || !isRecord$7(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 {
@@ -4443,7 +4725,7 @@ function readStructuredResultEvent(event, resultToolCallId) {
 	};
 }
 function assertToolResultContent(content) {
-	if (!isRecord$8(content) || content.ok !== false || !isRecord$8(content.error)) return;
+	if (!isRecord$7(content) || content.ok !== false || !isRecord$7(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");
 }
@@ -4459,7 +4741,7 @@ function stringifyJsonValue(value) {
 		throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "value is not JSON serializable");
 	}
 }
-function isRecord$8(value) {
+function isRecord$7(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
@@ -4733,14 +5015,14 @@ function parsePanelAppFolderManifest(raw) {
 	} catch (error) {
 		throw new Error(`panel-app.json is not valid JSON: ${error instanceof Error ? error.message : String(error)}`);
 	}
-	if (!isRecord$7(parsed)) throw new Error("panel-app.json must contain an object.");
-	const id = readOptionalString$7(parsed, "id");
+	if (!isRecord$6(parsed)) throw new Error("panel-app.json must contain an object.");
+	const id = readOptionalString$6(parsed, "id");
 	if (id && !PANEL_APP_ID_PATTERN.test(id)) throw new Error("panel app id must be kebab-case.");
 	return {
 		id,
 		title: readRequiredString$4(parsed, "title"),
-		description: readOptionalString$7(parsed, "description"),
-		icon: readOptionalString$7(parsed, "icon"),
+		description: readOptionalString$6(parsed, "description"),
+		icon: readOptionalString$6(parsed, "icon"),
 		entry: readRequiredString$4(parsed, "entry"),
 		capabilities: readStringArray$1(parsed.capabilities, "capabilities"),
 		client: readOptionalBoolean$2(parsed, "client"),
@@ -4802,11 +5084,11 @@ function parseTokenList(content) {
 	return [...new Set(content.split(/[,\s]+/).map((entry) => entry.trim()).filter(Boolean))];
 }
 function readRequiredString$4(record, key) {
-	const value = readOptionalString$7(record, key);
+	const value = readOptionalString$6(record, key);
 	if (!value) throw new Error(`panel app ${key} is required.`);
 	return value;
 }
-function readOptionalString$7(record, key) {
+function readOptionalString$6(record, key) {
 	return typeof record[key] === "string" && record[key].trim() ? record[key].trim() : void 0;
 }
 function readOptionalBoolean$2(record, key) {
@@ -4820,7 +5102,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$7(value) {
+function isRecord$6(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function normalizeTextValue(value) {
@@ -5538,12 +5820,12 @@ var ServiceActionGrantStore = class {
 	};
 };
 function normalizeStoreData(value) {
-	if (!isRecord$6(value) || value.version !== 1 || !isRecord$6(value.grants)) return structuredClone(EMPTY_GRANTS);
+	if (!isRecord$5(value) || value.version !== 1 || !isRecord$5(value.grants)) return structuredClone(EMPTY_GRANTS);
 	const grants = {};
 	for (const [callerKey, callerValue] of Object.entries(value.grants)) {
-		if (!isRecord$6(callerValue) || !isRecord$6(callerValue.actions)) continue;
+		if (!isRecord$5(callerValue) || !isRecord$5(callerValue.actions)) continue;
 		const actions = {};
-		for (const [actionId, actionValue] of Object.entries(callerValue.actions)) if (isRecord$6(actionValue) && typeof actionValue.grantedAt === "string" && isServiceActionRisk(actionValue.risk)) actions[actionId] = {
+		for (const [actionId, actionValue] of Object.entries(callerValue.actions)) if (isRecord$5(actionValue) && typeof actionValue.grantedAt === "string" && isServiceActionRisk(actionValue.risk)) actions[actionId] = {
 			grantedAt: actionValue.grantedAt,
 			risk: actionValue.risk
 		};
@@ -5557,11 +5839,11 @@ function normalizeStoreData(value) {
 function isServiceActionRisk(value) {
 	return value === "read" || value === "write" || value === "external" || value === "dangerous";
 }
-function isRecord$6(value) {
+function isRecord$5(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isMissingFileError(error) {
-	return isRecord$6(error) && error.code === "ENOENT";
+	return isRecord$5(error) && error.code === "ENOENT";
 }
 //#endregion
 //#region src/utils/service-app-manifest.utils.ts
@@ -5586,15 +5868,15 @@ function parseServiceAppManifest(raw) {
 	} catch (error) {
 		throw new Error(`service-app.json is not valid JSON: ${error instanceof Error ? error.message : String(error)}`);
 	}
-	if (!isRecord$5(parsed)) throw new Error("service-app.json must contain an object.");
+	if (!isRecord$4(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$6(parsed, "protocol") ?? "mcp";
+	const protocol = readOptionalString$5(parsed, "protocol") ?? "mcp";
 	if (protocol !== "mcp") throw new Error("service app protocol must be mcp.");
 	return {
 		id,
 		title: readRequiredString$3(parsed, "title"),
-		description: readOptionalString$6(parsed, "description"),
+		description: readOptionalString$5(parsed, "description"),
 		enabled: readOptionalBoolean$1(parsed, "enabled") ?? true,
 		protocol,
 		command: readRequiredString$3(parsed, "command"),
@@ -5604,31 +5886,31 @@ function parseServiceAppManifest(raw) {
 }
 function readManifestActions(value) {
 	if (value === void 0) throw new Error("service app actions are required.");
-	if (!isRecord$5(value)) throw new Error("service app actions must be an object.");
+	if (!isRecord$4(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$5(action)) throw new Error(`service app action ${name} must be an object.`);
-		const risk = readOptionalString$6(action, "risk");
+		if (!isRecord$4(action)) throw new Error(`service app action ${name} must be an object.`);
+		const risk = readOptionalString$5(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$5(inputSchema)) throw new Error(`service app action ${name} inputSchema must be an object.`);
+		if (inputSchema !== void 0 && !isRecord$4(inputSchema)) throw new Error(`service app action ${name} inputSchema must be an object.`);
 		actions[name] = {
 			risk,
-			title: readOptionalString$6(action, "title"),
-			description: readOptionalString$6(action, "description"),
+			title: readOptionalString$5(action, "title"),
+			description: readOptionalString$5(action, "description"),
 			inputSchema
 		};
 	}
 	return actions;
 }
 function readRequiredString$3(record, key) {
-	const value = readOptionalString$6(record, key);
+	const value = readOptionalString$5(record, key);
 	if (!value) throw new Error(`service app ${key} is required.`);
 	return value;
 }
-function readOptionalString$6(record, key) {
+function readOptionalString$5(record, key) {
 	return typeof record[key] === "string" && record[key].trim() ? record[key].trim() : void 0;
 }
 function readOptionalBoolean$1(record, key) {
@@ -5641,7 +5923,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$5(value) {
+function isRecord$4(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
@@ -6064,7 +6346,7 @@ function parseFrontmatterBlock(raw) {
 function parseYamlFrontmatter(raw) {
 	try {
 		const parsed = parse(raw);
-		return isRecord$4(parsed) ? parsed : {};
+		return isRecord$3(parsed) ? parsed : {};
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
 		throw new Error(`Invalid SKILL.md frontmatter: ${message}`);
@@ -6076,7 +6358,7 @@ function readString$3(record, ...names) {
 }
 function readLocalizedTextMap(record, ...names) {
 	const value = readValue(record, names);
-	if (!isRecord$4(value)) return;
+	if (!isRecord$3(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;
 }
@@ -6100,7 +6382,7 @@ function normalizeFrontmatterKey(raw) {
 function normalizeLocaleTag(raw) {
 	return raw.trim().toLowerCase();
 }
-function isRecord$4(value) {
+function isRecord$3(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -6925,9 +7207,6 @@ function readString$2(value) {
 	if (typeof value !== "string") return;
 	return value.trim() || void 0;
 }
-function resolveEntryIcon(entry) {
-	return entry.icon ?? null;
-}
 function resolveRequestedModel(params) {
 	const { configuredModel, defaultModel, input, modelSelectionMode, sessionMetadata } = params;
 	if (modelSelectionMode === "runtime-default") return;
@@ -6981,25 +7260,28 @@ var BuiltinHttpRuntimeSessionTypeService = class {
 	describeInternal = async () => {
 		const config = new HttpRuntimeConfigResolver(this.entry.config ?? {}).resolve({ defaultModel: this.defaultModel });
 		const modelSelectionMode = normalizeRuntimeModelSelectionMode(this.entry.config?.modelSelectionMode);
+		const baseDescriptor = {
+			icon: this.entry.icon ?? null,
+			modelSelectionMode,
+			runtimeDefaultThinking: normalizeModelThinkingCapability(this.entry.config?.runtimeDefaultThinking)
+		};
 		if (!config.baseUrl) return {
-			icon: resolveEntryIcon(this.entry),
+			...baseDescriptor,
 			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"
 			}
 		};
 		if (!((config.capabilityProbe ?? true) && Boolean(config.healthcheckUrl))) return {
-			icon: resolveEntryIcon(this.entry),
+			...baseDescriptor,
 			ready: true,
 			reason: null,
 			reasonMessage: null,
 			recommendedModel: config.recommendedModel ?? null,
-			modelSelectionMode,
 			...config.supportedModels ? { supportedModels: config.supportedModels } : {},
 			cta: null
 		};
@@ -7013,28 +7295,26 @@ var BuiltinHttpRuntimeSessionTypeService = class {
 				signal: controller.signal
 			});
 			if (!response.ok) return {
-				icon: resolveEntryIcon(this.entry),
+				...baseDescriptor,
 				ready: false,
 				reason: "healthcheck_failed",
 				reasonMessage: `HTTP runtime healthcheck returned HTTP ${response.status}.`,
 				recommendedModel: config.recommendedModel ?? null,
-				modelSelectionMode,
 				...config.supportedModels ? { supportedModels: config.supportedModels } : {},
 				cta: null
 			};
 			return {
-				icon: resolveEntryIcon(this.entry),
+				...baseDescriptor,
 				ready: true,
 				reason: null,
 				reasonMessage: null,
 				recommendedModel: config.recommendedModel ?? null,
-				modelSelectionMode,
 				...config.supportedModels ? { supportedModels: config.supportedModels } : {},
 				cta: null
 			};
 		} catch (error) {
 			return {
-				icon: resolveEntryIcon(this.entry),
+				...baseDescriptor,
 				ready: false,
 				reason: "healthcheck_unreachable",
 				reasonMessage: error instanceof Error ? error.message : "Failed to reach the configured HTTP runtime healthcheck.",
@@ -7067,53 +7347,54 @@ var BuiltinStdioRuntimeSessionTypeService = class {
 	describeInternal = async (describeMode) => {
 		const resolver = new StdioRuntimeConfigResolver(this.entry.config ?? {});
 		const modelSelectionMode = normalizeRuntimeModelSelectionMode(this.entry.config?.modelSelectionMode);
+		const baseDescriptor = {
+			icon: this.entry.icon ?? null,
+			modelSelectionMode,
+			runtimeDefaultThinking: normalizeModelThinkingCapability(this.entry.config?.runtimeDefaultThinking)
+		};
 		try {
 			const config = resolver.resolve();
 			if (!await resolveExecutablePath(config.command)) return {
-				icon: resolveEntryIcon(this.entry),
+				...baseDescriptor,
 				ready: false,
 				reason: "command_missing",
 				reasonMessage: `Configured stdio command "${config.command}" is not available. Update the runtime entry command or install the required launcher first.`,
 				cta: {
 					kind: "settings",
 					label: "Configure Stdio Runtime"
-				},
-				modelSelectionMode
+				}
 			};
 			if (describeMode === "probe") try {
 				await probeStdioRuntime(config);
 			} catch (error) {
 				return {
-					icon: resolveEntryIcon(this.entry),
+					...baseDescriptor,
 					ready: false,
 					reason: "probe_failed",
 					reasonMessage: error instanceof Error ? error.message : "Configured stdio runtime could not complete the ACP probe.",
 					cta: {
 						kind: "settings",
 						label: "Repair Stdio Runtime"
-					},
-					modelSelectionMode
+					}
 				};
 			}
 			return {
-				icon: resolveEntryIcon(this.entry),
+				...baseDescriptor,
 				ready: true,
 				reason: null,
 				reasonMessage: null,
-				modelSelectionMode,
 				cta: null
 			};
 		} catch (error) {
 			return {
-				icon: resolveEntryIcon(this.entry),
+				...baseDescriptor,
 				ready: false,
 				reason: "command_missing",
 				reasonMessage: error instanceof Error ? error.message : "Configure a stdio command before starting this runtime.",
 				cta: {
 					kind: "settings",
 					label: "Configure Stdio Runtime"
-				},
-				modelSelectionMode
+				}
 			};
 		}
 	};
@@ -7184,7 +7465,6 @@ var BuiltinNarpRuntimeProviderService = class {
 		const config = readRecord(entry.config) ?? {};
 		return new StdioRuntimeNcpAgentRuntime({
 			...new StdioRuntimeConfigResolver(config).resolve(),
-			sessionId: runtimeParams.sessionId,
 			resolveTools: runtimeParams.resolveTools,
 			stateManager: runtimeParams.stateManager,
 			resolveProviderRoute: (input) => buildProviderRoute({
@@ -7280,13 +7560,13 @@ var ProviderManagerNcpLLMApi = class {
 };
 //#endregion
 //#region src/features/native-runtime/tools/ncp-asset.tools.ts
-function readOptionalString$5(value) {
+function readOptionalString$4(value) {
 	if (typeof value !== "string") return null;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
 }
 function readOptionalBase64Bytes(value) {
-	const base64 = readOptionalString$5(value);
+	const base64 = readOptionalString$4(value);
 	if (!base64) return null;
 	try {
 		return Buffer.from(base64, "base64");
@@ -7337,18 +7617,18 @@ var AssetPutTool = class {
 		this.contentBasePath = contentBasePath;
 	}
 	validateArgs = (args) => {
-		const path = readOptionalString$5(args.path);
-		const bytesBase64 = readOptionalString$5(args.bytesBase64);
-		const fileName = readOptionalString$5(args.fileName);
+		const path = readOptionalString$4(args.path);
+		const bytesBase64 = readOptionalString$4(args.bytesBase64);
+		const fileName = readOptionalString$4(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$5(args?.path);
-		const fileName = readOptionalString$5(args?.fileName);
-		const mimeType = readOptionalString$5(args?.mimeType);
+		const path = readOptionalString$4(args?.path);
+		const fileName = readOptionalString$4(args?.fileName);
+		const mimeType = readOptionalString$4(args?.mimeType);
 		const bytes = readOptionalBase64Bytes(args?.bytesBase64);
 		if (path) return {
 			ok: true,
@@ -7391,8 +7671,8 @@ var AssetExportTool = class {
 		this.assetStore = assetStore;
 	}
 	execute = async (args) => {
-		const assetUri = readOptionalString$5(args?.assetUri);
-		const targetPath = readOptionalString$5(args?.targetPath);
+		const assetUri = readOptionalString$4(args?.assetUri);
+		const targetPath = readOptionalString$4(args?.targetPath);
 		if (!assetUri || !targetPath) throw new Error("asset_export requires assetUri and targetPath.");
 		return {
 			ok: true,
@@ -7418,7 +7698,7 @@ var AssetStatTool = class {
 		this.contentBasePath = contentBasePath;
 	}
 	execute = async (args) => {
-		const assetUri = readOptionalString$5(args?.assetUri);
+		const assetUri = readOptionalString$4(args?.assetUri);
 		if (!assetUri) throw new Error("asset_stat requires assetUri.");
 		const record = await this.assetStore.statRecord(assetUri);
 		if (!record) return {
@@ -7695,7 +7975,8 @@ var NcpAgentRuntimeWrapper = class {
 			runId: spec.runId,
 			messages,
 			correlationId: spec.correlationId,
-			metadata: this.buildMetadata(spec)
+			metadata: this.buildMetadata(options.session, spec),
+			executionContext: { cwd: options.session.workingDir }
 		};
 		for await (const event of this.getRuntime().run(input, { signal: options.signal })) yield await this.applyEvent(sessionRun, event);
 		this.currentTools = [];
@@ -7720,10 +8001,10 @@ var NcpAgentRuntimeWrapper = class {
 			correlationId: spec.correlationId
 		}
 	}));
-	buildMetadata = (spec) => ({
-		...this.params.session.metadata,
+	buildMetadata = (session, spec) => ({
+		...session.metadata,
 		agentId: spec.agentId,
-		agentRuntimeId: this.params.session.agentRuntimeId,
+		agentRuntimeId: session.agentRuntimeId,
 		maxTokens: spec.maxTokens,
 		model: spec.model,
 		preferred_model: spec.model,
@@ -7787,20 +8068,16 @@ var AgentRunRuntimeContribution = class {
 		describeSessionTypeForEntry: provider.describeSessionTypeForEntry,
 		createRuntime: ({ entry, session }) => {
 			if (!provider.createRuntimeForEntry) throw new Error(`Agent runtime provider does not support entries: ${provider.kind}`);
-			return new NcpAgentRuntimeWrapper({
-				session,
-				createRuntime: ({ resolveTools, stateManager }) => provider.createRuntimeForEntry({
-					entry,
-					runtimeParams: {
-						sessionId: session.sessionId,
-						...session.agentId ? { agentId: session.agentId } : {},
-						resolveAssetContentPath: (assetUri) => this.kernel.assetStore.resolveContentPath(assetUri),
-						resolveTools,
-						sessionMetadata: session.metadata,
-						stateManager
-					}
-				})
-			});
+			return new NcpAgentRuntimeWrapper({ createRuntime: ({ resolveTools, stateManager }) => provider.createRuntimeForEntry({
+				entry,
+				runtimeParams: {
+					...session.agentId ? { agentId: session.agentId } : {},
+					resolveAssetContentPath: (assetUri) => this.kernel.assetStore.resolveContentPath(assetUri),
+					resolveTools,
+					sessionMetadata: session.metadata,
+					stateManager
+				}
+			}) });
 		}
 	});
 };
@@ -7966,6 +8243,13 @@ const createToolCallStyleContextProvider = () => staticBlock([
 	"Keep narration brief and value-dense; avoid repeating obvious steps.",
 	"Use plain human language for narration unless in a technical context."
 ]);
+const createInlineInteractiveSurfaceContextProvider = () => staticBlock([
+	"## Inline Interactive Surfaces",
+	"Do not make every UI an inline card. Choose inline only when the intended result is a compact, immediately usable card or short interaction; use the side panel for normal Panel Apps, long reading, rich editing, file browsing, large tables, multi-page workflows, or sustained workspaces.",
+	"When you choose an inline card, call `show_content` with `type=\"panel_app\"` and `placement=\"inline\"` so the user can try it directly in the chat. Do not wait for the user to say \"inline\" or \"placement\" after you have already chosen the card form.",
+	"A Panel Card must be designed card-first: prefer a landscape composition where width carries the main information and the card is wider than it is tall; collapse to one column only in narrow containers. Core value must be visible in the first 220-420px, with no horizontal scrolling, no reliance on document-level internal scrolling, compact controls, at most one primary action, clear loading/empty/error states, and an obvious expand path for details.",
+	"Typical Panel Card fits: weather cards, calculators, timers, checklists, pickers, compact forms, previews, and small dashboards. If the UI needs more space than a card, choose `placement=\"side_panel\"` instead. Inline hosts may pass `nextclawDisplayMode=card` and `nextclawPlacement=inline`; use those hints to render a compact card layout instead of a full page."
+]);
 const createChatComposerTokensContextProvider = () => staticBlock([
 	"## Chat Composer Tokens",
 	"When a user message contains tokens like `$weather` or `$web-search`, treat each `$<skill-spec>` token as a user-visible marker that the corresponding skill was explicitly selected in the chat composer.",
@@ -8372,6 +8656,7 @@ var ContextProviderContribution = class {
 			createAssistantIdentityContextProvider(),
 			new ToolingContextProvider(context),
 			createToolCallStyleContextProvider(),
+			createInlineInteractiveSurfaceContextProvider(),
 			createChatComposerTokensContextProvider(),
 			createSafetyContextProvider(),
 			createCliQuickReferenceContextProvider(),
@@ -8639,227 +8924,6 @@ var LearningLoopContribution = class {
 	};
 };
 //#endregion
-//#region src/contributions/session-activity-preview/utils/session-activity-preview-ncp-event.utils.ts
-const PREVIEW_TEXT_MAX_LENGTH = 160;
-function readSessionId(value) {
-	if (typeof value !== "string") return null;
-	const trimmed = value.trim();
-	return trimmed.length > 0 ? trimmed : null;
-}
-function compactPreviewText(value) {
-	return value.replace(/\s+/g, " ").trim();
-}
-function truncatePreviewText(value) {
-	const compacted = compactPreviewText(value);
-	if (compacted.length <= PREVIEW_TEXT_MAX_LENGTH) return compacted;
-	return compacted.slice(0, PREVIEW_TEXT_MAX_LENGTH - 1).trimEnd();
-}
-function readMessagePreviewText(message) {
-	const chunks = [];
-	for (const part of message.parts) if ((part.type === "text" || part.type === "rich-text") && part.text.trim()) chunks.push(part.text);
-	const previewText = truncatePreviewText(chunks.join(" "));
-	return previewText.length > 0 ? previewText : null;
-}
-function createProjection(sessionId, preview) {
-	if (!sessionId) return null;
-	return {
-		sessionId,
-		preview
-	};
-}
-function formatErrorStatus(error) {
-	if (typeof error === "string" && error.trim()) return `运行出错：${truncatePreviewText(error)}`;
-	if (error && typeof error === "object" && "message" in error) {
-		const message = error.message;
-		if (typeof message === "string" && message.trim()) return `运行出错：${truncatePreviewText(message)}`;
-	}
-	return "运行出错";
-}
-function readToolCallId(value) {
-	if (typeof value !== "string") return null;
-	const trimmed = value.trim();
-	return trimmed.length > 0 ? trimmed : null;
-}
-function formatToolDoneStatus(toolName) {
-	return toolName ? `工具调用完成：${toolName}` : "工具调用完成";
-}
-function createSessionActivityPreviewFromNcpEvent(event, timestamp, options = {}) {
-	switch (event.type) {
-		case NcpEventType.RunStarted: return createProjection(readSessionId(event.payload.sessionId), {
-			state: "running",
-			statusText: "正在思考",
-			timestamp
-		});
-		case NcpEventType.RunFinished: return createProjection(readSessionId(event.payload.sessionId), {
-			state: "completed",
-			timestamp
-		});
-		case NcpEventType.RunError: return createProjection(readSessionId(event.payload.sessionId), {
-			state: "failed",
-			statusText: formatErrorStatus(event.payload.error),
-			timestamp
-		});
-		case NcpEventType.MessageSent: {
-			const text = readMessagePreviewText(event.payload.message);
-			if (!text || event.payload.message.role !== "user") return null;
-			return createProjection(readSessionId(event.payload.sessionId), {
-				state: "running",
-				statusText: text,
-				timestamp: event.payload.message.timestamp || timestamp
-			});
-		}
-		case NcpEventType.MessageCompleted: {
-			const text = readMessagePreviewText(event.payload.message);
-			if (!text || event.payload.message.role !== "assistant") return null;
-			return createProjection(readSessionId(event.payload.sessionId), {
-				state: "completed",
-				replyText: text,
-				timestamp: event.payload.message.timestamp || timestamp
-			});
-		}
-		case NcpEventType.MessageFailed: return createProjection(readSessionId(event.payload.sessionId), {
-			state: "failed",
-			statusText: formatErrorStatus(event.payload.error),
-			timestamp
-		});
-		case NcpEventType.MessageToolCallStart: return createProjection(readSessionId(event.payload.sessionId), {
-			state: "running",
-			statusText: `正在调用工具：${event.payload.toolName}`,
-			timestamp
-		});
-		case NcpEventType.MessageToolCallEnd:
-		case NcpEventType.MessageToolCallResult: {
-			const sessionId = readSessionId(event.payload.sessionId);
-			const toolCallId = readToolCallId(event.payload.toolCallId);
-			return createProjection(sessionId, {
-				state: "running",
-				statusText: formatToolDoneStatus(sessionId && toolCallId ? options.readToolName?.(sessionId, toolCallId) ?? null : null),
-				timestamp
-			});
-		}
-		default: return null;
-	}
-}
-//#endregion
-//#region src/contributions/session-activity-preview/utils/session-activity-preview-metadata.utils.ts
-const SESSION_ACTIVITY_PREVIEW_METADATA_KEY = "last_activity_preview";
-const SESSION_ACTIVITY_PREVIEW_STATES = new Set([
-	"running",
-	"completed",
-	"failed",
-	"idle"
-]);
-function isRecord$3(value) {
-	return Boolean(value) && typeof value === "object" && !Array.isArray(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$3(value)) return null;
-	const state = value.state;
-	const timestamp = readOptionalString$4(value.timestamp);
-	if (!SESSION_ACTIVITY_PREVIEW_STATES.has(state) || !timestamp) return null;
-	return {
-		state,
-		timestamp,
-		...readOptionalString$4(value.statusText) ? { statusText: readOptionalString$4(value.statusText) } : {},
-		...readOptionalString$4(value.replyText) ? { replyText: readOptionalString$4(value.replyText) } : {}
-	};
-}
-function compareIsoTimestamp(left, right) {
-	const leftTime = Date.parse(left);
-	const rightTime = Date.parse(right);
-	if (!Number.isFinite(leftTime) || !Number.isFinite(rightTime)) return left.localeCompare(right);
-	return leftTime - rightTime;
-}
-function mergeSessionActivityPreview(current, incoming) {
-	if (current && compareIsoTimestamp(incoming.timestamp, current.timestamp) < 0) return incoming.replyText && !current.replyText ? {
-		...current,
-		replyText: incoming.replyText
-	} : current;
-	return {
-		state: incoming.state,
-		timestamp: incoming.timestamp,
-		...incoming.statusText ?? (incoming.state === "completed" ? current?.statusText : void 0) ? { statusText: incoming.statusText ?? current?.statusText } : {},
-		...incoming.replyText ?? current?.replyText ? { replyText: incoming.replyText ?? current?.replyText } : {}
-	};
-}
-function areSessionActivityPreviewsEqual(left, right) {
-	return Boolean(left) && left?.state === right.state && left.timestamp === right.timestamp && left.statusText === right.statusText && left.replyText === right.replyText;
-}
-function writeSessionActivityPreviewMetadata(metadata, projection) {
-	const current = readSessionActivityPreviewMetadata(metadata?.[SESSION_ACTIVITY_PREVIEW_METADATA_KEY]);
-	const next = mergeSessionActivityPreview(current, projection.preview);
-	if (areSessionActivityPreviewsEqual(current, next)) return null;
-	return {
-		...metadata ?? {},
-		[SESSION_ACTIVITY_PREVIEW_METADATA_KEY]: next
-	};
-}
-//#endregion
-//#region src/contributions/session-activity-preview/index.ts
-var SessionActivityPreviewContribution = class {
-	unsubscribeNcpEvent = null;
-	metadataWriteChains = /* @__PURE__ */ new Map();
-	toolNames = /* @__PURE__ */ new Map();
-	constructor(kernel) {
-		this.kernel = kernel;
-	}
-	start = () => {
-		if (this.unsubscribeNcpEvent) return;
-		this.unsubscribeNcpEvent = this.kernel.eventBus.on(eventKeys.ncpEvent, (event) => {
-			this.rememberToolName(event);
-			const projection = createSessionActivityPreviewFromNcpEvent(event, (/* @__PURE__ */ new Date()).toISOString(), { readToolName: this.readToolName });
-			this.clearFinishedRunToolNames(event);
-			if (!projection) return;
-			this.updatePreview(projection);
-		});
-	};
-	dispose = () => {
-		this.unsubscribeNcpEvent?.();
-		this.unsubscribeNcpEvent = null;
-		this.metadataWriteChains.clear();
-		this.toolNames.clear();
-	};
-	rememberToolName = (event) => {
-		if (event.type !== NcpEventType.MessageToolCallStart) return;
-		const sessionId = event.payload.sessionId.trim();
-		const toolCallId = event.payload.toolCallId.trim();
-		const toolName = event.payload.toolName.trim();
-		if (!sessionId || !toolCallId || !toolName) return;
-		this.toolNames.set(this.createToolNameKey(sessionId, toolCallId), toolName);
-	};
-	readToolName = (sessionId, toolCallId) => this.toolNames.get(this.createToolNameKey(sessionId, toolCallId)) ?? null;
-	clearFinishedRunToolNames = (event) => {
-		if (event.type !== NcpEventType.RunFinished && event.type !== NcpEventType.RunError) return;
-		const sessionId = this.readNonEmptyString(event.payload.sessionId);
-		if (!sessionId) return;
-		for (const key of this.toolNames.keys()) if (key.startsWith(`${sessionId}:`)) this.toolNames.delete(key);
-	};
-	readNonEmptyString = (value) => {
-		if (typeof value !== "string") return null;
-		const trimmed = value.trim();
-		return trimmed.length > 0 ? trimmed : null;
-	};
-	createToolNameKey = (sessionId, toolCallId) => `${sessionId}:${toolCallId}`;
-	updatePreview = (projection) => {
-		const next = (this.metadataWriteChains.get(projection.sessionId) ?? Promise.resolve()).then(() => this.updatePreviewMetadata(projection));
-		this.metadataWriteChains.set(projection.sessionId, next.catch(() => void 0));
-		next.catch((error) => {
-			const message = error instanceof Error ? error.stack ?? error.message : String(error);
-			console.error(`[session-activity-preview] failed to update ${projection.sessionId}: ${message}`);
-		});
-	};
-	updatePreviewMetadata = async (projection) => {
-		const nextMetadata = writeSessionActivityPreviewMetadata((await this.kernel.sessionManager.getSessionRecord(projection.sessionId))?.metadata, projection);
-		if (!nextMetadata) return;
-		await this.kernel.sessionManager.updateSessionMetadata(projection.sessionId, nextMetadata);
-	};
-};
-//#endregion
 //#region src/contributions/tool-provider/providers/asset-tool.provider.ts
 var AssetToolProvider = class {
 	constructor(assetStore) {
@@ -9402,6 +9466,12 @@ function readPurpose(value) {
 	if (normalized === "read" || normalized === "preview" || normalized === "edit" || normalized === "interact") return normalized;
 	throw new Error("purpose must be \"read\", \"preview\", \"edit\", or \"interact\".");
 }
+function readPlacement(value) {
+	const normalized = readOptionalString$1(value);
+	if (!normalized) return;
+	if (normalized === "inline" || normalized === "side_panel") return normalized;
+	throw new Error("placement must be \"inline\" or \"side_panel\".");
+}
 function readPayload(params) {
 	if (!isRecord$1(params.payload)) throw new Error("payload must be an object.");
 	return params.payload;
@@ -9423,6 +9493,7 @@ function normalizeShowContentArgs(args) {
 	const payload = readPayload(params);
 	const title = readOptionalString$1(params.title);
 	const purpose = readPurpose(params.purpose);
+	const placement = readPlacement(params.placement);
 	if (type === "file") return {
 		target: {
 			type,
@@ -9433,7 +9504,8 @@ function normalizeShowContentArgs(args) {
 			}
 		},
 		title,
-		purpose
+		purpose,
+		placement
 	};
 	if (type === "url") return {
 		target: {
@@ -9441,7 +9513,8 @@ function normalizeShowContentArgs(args) {
 			payload: { url: readUrl(payload.url) }
 		},
 		title,
-		purpose
+		purpose,
+		placement
 	};
 	if (type === "panel_app") return {
 		target: {
@@ -9449,7 +9522,8 @@ function normalizeShowContentArgs(args) {
 			payload: { appId: readRequiredString(payload.appId, "payload.appId") }
 		},
 		title,
-		purpose
+		purpose,
+		placement
 	};
 	throw new Error("type must be \"file\", \"url\", or \"panel_app\".");
 }
@@ -9465,12 +9539,19 @@ function createShowContentEventPayload(request, context) {
 		toolCallId,
 		target: request.target,
 		title: request.title,
-		purpose: request.purpose
+		purpose: request.purpose,
+		placement: request.placement
 	};
 }
 var ShowContentTool = class {
 	name = SHOW_CONTENT_TOOL_NAME;
-	description = "Show file, URL, or panel app content in the current chat UI.";
+	description = [
+		"Show file, URL, or panel app content in the current chat UI.",
+		"placement=\"inline\" embeds a lightweight panel_app as an interactive chat card so the user can try it directly in the conversation.",
+		"placement=\"side_panel\" opens content in the right side panel for larger reading, editing, or sustained workflows.",
+		"Choose the placement yourself: after creating a lightweight Panel App such as a weather card, calculator, timer, checklist, picker, form, preview, or small dashboard, call this tool with placement=\"inline\" without waiting for the user to ask to see it.",
+		"Omit placement only when preserving the existing default side panel behavior is intentional."
+	].join(" ");
 	parameters = {
 		type: "object",
 		properties: {
@@ -9497,6 +9578,11 @@ var ShowContentTool = class {
 				],
 				description: "Optional user intent for the content."
 			},
+			placement: {
+				type: "string",
+				enum: ["inline", "side_panel"],
+				description: "Optional display placement. \"inline\" embeds a lightweight panel app as an interactive chat card; \"side_panel\" opens it in the right panel for larger workflows. Choose the appropriate placement yourself; defaults to the existing side panel behavior when omitted."
+			},
 			payload: {
 				type: "object",
 				description: "Type-specific fields: file={path,line,column}; url={url}; panel_app={appId}.",
@@ -9722,7 +9808,6 @@ var NextclawKernel = class {
 		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),
 			new LearningLoopContribution(this),
 			new ContextProviderContribution(this),
 			new AgentRunRuntimeContribution(this),