@nextclaw/kernel 0.5.4 → 0.6.1

package/dist/index.js

@@ -1,7 +1,7 @@
 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, normalizeModelThinkingCapability, normalizeProviderModelConfig, normalizeToolParams, parseAgentScopedSessionKey, parseThinkingLevel, readCompressedContextCompactionCheckpoint, readOptionalString, readParentSessionId, readSessionProjectRoot, redactConfigObject, removeAgentProfile, resolveConfigSecrets, resolveDefaultAgentProfileId, resolveEffectiveAgentProfiles, resolveNextclawSelfManageGuidePaths, resolveProviderRuntime, resolveSessionProjectContext, 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, 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, ViewImageTool, 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, resolveSessionProjectContext, resolveSessionWorkspacePath, resolveThinkingLevel, sanitizeOutboundAssistantContent, saveConfig, summarizeSessionRequestTask, toExtensionConfigView, updateAgentProfile } from "@nextclaw/core";
+import { NcpEventType, normalizeAssistantText, 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";
 import { CHAT_SESSION_MATERIALIZATION_METADATA_KEY, EventBus, Ingress, eventKeys, ingressKeys, isRuntimeDefaultModelValue, normalizeRuntimeModelSelectionMode } from "@nextclaw/shared";
@@ -71,6 +71,40 @@ function readRequestedAgentId(metadata) {
 	return normalizeAgentProfileId(metadata.agent_id) || normalizeAgentProfileId(metadata.agentId) || null;
 }
 //#endregion
+//#region src/utils/agent-run-metadata.utils.ts
+const AGENT_RUN_MESSAGE_RUN_SPEC_METADATA_KEY = "run_spec";
+const LEGACY_RUN_METADATA_KEYS = [
+	"account_id",
+	"agent_id",
+	"chat_id",
+	"preferred_model",
+	"project_root",
+	"runtime",
+	"sender_id",
+	"session_key",
+	"session_type"
+];
+function stripLegacyRunMetadata(metadata) {
+	const nextMetadata = structuredClone(metadata);
+	for (const key of LEGACY_RUN_METADATA_KEYS) delete nextMetadata[key];
+	return nextMetadata;
+}
+function buildRunMetadata(params) {
+	const { message, metadata, route } = params;
+	return {
+		...stripLegacyRunMetadata({
+			...message.metadata ?? {},
+			...metadata ?? {}
+		}),
+		channel: message.channel,
+		chatId: message.chatId,
+		accountId: route.accountId,
+		agentId: route.agentId,
+		sessionKey: route.sessionKey,
+		senderId: message.senderId
+	};
+}
+//#endregion
 //#region src/utils/ncp-message-bridge.utils.ts
 function normalizeString$1(value) {
 	if (typeof value !== "string") return null;
@@ -169,8 +203,18 @@ function toLegacyMessages(messages, options = {}) {
 //#region src/features/context-compaction/utils/context-compaction.utils.ts
 const NEXTCLAW_TIMELINE_KIND_METADATA_KEY = "nextclaw_timeline_kind";
 const CONTEXT_COMPACTION_TIMELINE_KIND = "context_compaction";
+const CONTEXT_COMPACTION_PROJECTION_METADATA_KEY = "nextclaw_context_projection";
+const CONTEXT_COMPACTION_PROJECTION_KIND = "compressed_context";
 function readCheckpointTimelineText(checkpoint) {
-	return checkpoint.status === "compressing" ? "正在压缩较早上下文" : "较早上下文已自动压缩";
+	return checkpoint.status === "compressing" ? "Compressing earlier context" : "Earlier context was auto-compacted";
+}
+function buildCompressedContextSystemText(checkpoint) {
+	return [
+		"Authoritative compressed prior conversation context for this session.",
+		"Continue from this context and the latest user message. Do not restart onboarding or treat missing profile fields as a new-session trigger unless the compressed context says onboarding is the active user task.",
+		"",
+		checkpoint.summary
+	].join("\n");
 }
 function readContextCompactionCheckpoint(message) {
 	const metadata = message.metadata;
@@ -187,15 +231,19 @@ function buildContextCompactionSummaryMessage(params) {
 	return {
 		id: `${sessionId}:context-compaction-summary:${checkpoint.id}:${checkpoint.updatedAt}`,
 		sessionId,
-		role: "user",
+		role: "service",
 		status: "final",
 		timestamp: checkpoint.updatedAt,
 		parts: [{
 			type: "text",
-			text: checkpoint.summary
-		}]
+			text: buildCompressedContextSystemText(checkpoint)
+		}],
+		metadata: { [CONTEXT_COMPACTION_PROJECTION_METADATA_KEY]: CONTEXT_COMPACTION_PROJECTION_KIND }
 	};
 }
+function readCheckpointCoveredUntil(checkpoint) {
+	return checkpoint.coveredUntil ?? checkpoint.updatedAt;
+}
 function createContextCompactionMessageId() {
 	return `context-compaction-message-${randomUUID()}`;
 }
@@ -221,6 +269,9 @@ function buildContextCompactionTimelineNcpMessage(params) {
 function isContextCompactionTimelineMessage(message) {
 	return message?.metadata?.[NEXTCLAW_TIMELINE_KIND_METADATA_KEY] === CONTEXT_COMPACTION_TIMELINE_KIND;
 }
+function isContextCompactionProjectionMessage(message) {
+	return message?.metadata?.[CONTEXT_COMPACTION_PROJECTION_METADATA_KEY] === CONTEXT_COMPACTION_PROJECTION_KIND;
+}
 function readLatestContextCompactionCheckpoint(sessionMessages) {
 	return readLatestContextCompactionMarker(sessionMessages)?.checkpoint ?? null;
 }
@@ -230,10 +281,11 @@ function buildContextCompactionModelInput(params) {
 	const regularMessages = sessionMessages.filter((message) => !readContextCompactionCheckpoint(message));
 	if (!marker) return regularMessages.map((message) => structuredClone(message));
 	const { checkpoint } = marker;
+	const coveredUntil = readCheckpointCoveredUntil(checkpoint);
 	return [buildContextCompactionSummaryMessage({
 		checkpoint,
 		sessionId
-	}), ...regularMessages.filter((message) => Date.parse(message.timestamp) > Date.parse(checkpoint.updatedAt)).sort((left, right) => Date.parse(left.timestamp) - Date.parse(right.timestamp))].map((message) => structuredClone(message));
+	}), ...regularMessages.filter((message) => Date.parse(message.timestamp) > Date.parse(coveredUntil)).sort((left, right) => Date.parse(left.timestamp) - Date.parse(right.timestamp))].map((message) => structuredClone(message));
 }
 function readContextWindowEventSessionId(event) {
 	const payload = "payload" in event ? event.payload : null;
@@ -277,6 +329,17 @@ 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;
+const SUMMARY_SOURCE_HEAD_MESSAGES = 2;
+const SUMMARY_SOURCE_TAIL_MESSAGES = 8;
+const SUMMARY_SOURCE_STRING_HEAD_CHARS = 6e3;
+const SUMMARY_SOURCE_STRING_TAIL_CHARS = 6e3;
+function buildContextBlockMessage(contextBlocks = []) {
+	const contextContent = contextBlocks.map((block) => block.trim()).filter(Boolean).join("\n\n");
+	return contextContent ? [{
+		role: "system",
+		content: contextContent
+	}] : [];
+}
 function mergeInputMessages(params) {
 	const messages = params.sessionMessages.map((message) => structuredClone(message));
 	const seen = new Set(messages.map((message) => message.id));
@@ -286,10 +349,47 @@ function mergeInputMessages(params) {
 	}
 	return messages;
 }
+function toCompactionSourceMessage(message) {
+	return {
+		role: message.role,
+		content: message.content,
+		timestamp: message.timestamp,
+		ncp_message_id: message.ncp_message_id
+	};
+}
 function stringifyCompactionSource(messages) {
-	const json = JSON.stringify(messages, null, 2);
+	const sourceMessages = messages.map(toCompactionSourceMessage);
+	const json = JSON.stringify(sourceMessages, null, 2);
 	if (json.length <= SUMMARY_SOURCE_MAX_CHARS) return json;
-	return `${json.slice(0, SUMMARY_SOURCE_MAX_CHARS).trimEnd()}\n[truncated_source]`;
+	const tailStart = Math.max(SUMMARY_SOURCE_HEAD_MESSAGES, sourceMessages.length - SUMMARY_SOURCE_TAIL_MESSAGES);
+	const compactedMessages = [
+		...sourceMessages.slice(0, SUMMARY_SOURCE_HEAD_MESSAGES),
+		...tailStart > SUMMARY_SOURCE_HEAD_MESSAGES ? [{
+			role: "system",
+			content: `[${tailStart - SUMMARY_SOURCE_HEAD_MESSAGES} middle messages omitted from compaction source]`
+		}] : [],
+		...sourceMessages.slice(tailStart)
+	];
+	const compactedJson = JSON.stringify(compactedMessages, (_key, value) => truncateSummarySourceString(value), 2);
+	if (compactedJson.length <= SUMMARY_SOURCE_MAX_CHARS) return compactedJson;
+	const marker = "\n[truncated_compaction_source_middle]\n";
+	const headChars = Math.floor((SUMMARY_SOURCE_MAX_CHARS - 38) / 2);
+	const tailChars = SUMMARY_SOURCE_MAX_CHARS - 38 - headChars;
+	return `${compactedJson.slice(0, headChars).trimEnd()}${marker}${compactedJson.slice(-tailChars).trimStart()}`;
+}
+function truncateSummarySourceString(value) {
+	if (typeof value === "string") {
+		if (value.length <= SUMMARY_SOURCE_STRING_HEAD_CHARS + SUMMARY_SOURCE_STRING_TAIL_CHARS) return value;
+		return [
+			value.slice(0, SUMMARY_SOURCE_STRING_HEAD_CHARS).trimEnd(),
+			`[${value.length - SUMMARY_SOURCE_STRING_HEAD_CHARS - SUMMARY_SOURCE_STRING_TAIL_CHARS} chars omitted]`,
+			value.slice(-SUMMARY_SOURCE_STRING_TAIL_CHARS).trimStart()
+		].join("\n");
+	}
+	return value;
+}
+function normalizeCompactionSummary(content) {
+	return normalizeAssistantText(content, "think-tags").text.trim();
 }
 function buildContextWindowSnapshotFromBudget(params) {
 	const { budget, checkpoint, totalContextTokens } = params;
@@ -313,7 +413,7 @@ var ContextCompactionPreflightService = class {
 		this.providerManager = providerManager;
 	}
 	preview = (params) => {
-		const { requestMetadata, sessionId, sessionMessages, storedAgentId, storedMetadata } = params;
+		const { contextBlocks = [], requestMetadata, sessionId, sessionMessages, storedAgentId, storedMetadata } = params;
 		const profile = this.resolveCompactionProfile({
 			requestMetadata,
 			storedAgentId
@@ -323,9 +423,10 @@ var ContextCompactionPreflightService = class {
 			sessionId,
 			sessionMessages
 		}) : sessionMessages.filter((message) => !isContextCompactionTimelineMessage(message));
+		const messages = [...buildContextBlockMessage(contextBlocks), ...toLegacyMessages(projectedMessages)];
 		return buildContextWindowSnapshotFromBudget({
 			budget: this.contextWindowBudgetService.evaluate({
-				messages: toLegacyMessages(projectedMessages),
+				messages,
 				contextTokens: profile.contextTokens,
 				reservedContextTokens: profile.reservedContextTokens
 			}),
@@ -334,7 +435,7 @@ var ContextCompactionPreflightService = class {
 		});
 	};
 	begin = (params) => {
-		const { inputMessages, requestMetadata, sessionId, sessionMessages, storedAgentId, storedMetadata } = params;
+		const { contextBlocks = [], inputMessages, requestMetadata, sessionId, sessionMessages, storedAgentId, storedMetadata } = params;
 		const profile = this.resolveCompactionProfile({
 			requestMetadata,
 			storedAgentId
@@ -345,10 +446,11 @@ var ContextCompactionPreflightService = class {
 			sessionMessages
 		});
 		const existingCheckpoint = readCompressedContextCompactionCheckpoint(storedMetadata[CONTEXT_COMPACTION_METADATA_KEY]) ?? readLatestContextCompactionCheckpoint(ncpMessages);
-		const messages = toLegacyMessages(existingCheckpoint ? buildContextCompactionModelInput({
+		const projectedMessages = existingCheckpoint ? buildContextCompactionModelInput({
 			sessionId,
 			sessionMessages: ncpMessages
-		}) : ncpMessages.filter((message) => !isContextCompactionTimelineMessage(message)));
+		}) : ncpMessages.filter((message) => !isContextCompactionTimelineMessage(message));
+		const messages = [...buildContextBlockMessage(contextBlocks), ...toLegacyMessages(projectedMessages)];
 		const budget = this.contextWindowBudgetService.evaluate({
 			messages,
 			contextTokens,
@@ -434,7 +536,7 @@ var ContextCompactionPreflightService = class {
 	generateSummary = async (params) => {
 		if (!this.providerManager) throw new Error("context compaction summary generation requires a provider manager");
 		const { messages, model } = params;
-		const summary = (await this.providerManager.chat({
+		const response = await this.providerManager.chat({
 			model,
 			maxTokens: SUMMARY_MAX_TOKENS,
 			messages: [{
@@ -442,7 +544,10 @@ var ContextCompactionPreflightService = class {
 				content: [
 					"You are NextClaw's context compactor for a coding agent session.",
 					"Create a complete compressed working context that will replace all prior conversation messages in a future model request.",
-					"The model will not receive a raw recent-message tail, so preserve the latest user intent and recent turns with high fidelity inside the summary.",
+					"Only the latest current input may remain raw, so preserve the active task, latest user intent, latest assistant response, and recent turns with high fidelity inside the summary.",
+					"Always include a 'Continuation Contract' section that states what the next assistant response should remember and how it should continue the session.",
+					"Do not turn missing user profile, assistant nickname, or onboarding fields into blockers unless onboarding is the active user task in the latest turns.",
+					"If the latest user message is a short greeting, preserve the prior active task and last assistant stance so the next response does not restart as a fresh session.",
 					"Preserve user goals, explicit instructions, decisions, files touched or inspected, code changes, commands run, test results, failures, blockers, current task state, and exact next steps.",
 					"Do not invent facts. If something is uncertain, mark it as uncertain.",
 					"Return Markdown only. Start with '# Compressed Working Context'."
@@ -452,12 +557,14 @@ var ContextCompactionPreflightService = class {
 				content: [
 					"Compress these runtime messages into a reusable working context.",
 					"Include a 'Recent High-Fidelity Context' section for the latest important user/assistant turns.",
+					"Include a 'Continuation Contract' section after the recent context.",
 					"",
 					"Messages JSON:",
 					stringifyCompactionSource(messages)
 				].join("\n")
 			}]
-		})).content?.trim();
+		});
+		const summary = response.content ? normalizeCompactionSummary(response.content) : "";
 		if (!summary) throw new Error("context compaction summary is empty");
 		return summary;
 	};
@@ -501,6 +608,7 @@ var AgentRunContextCompactionManager = class {
 	}
 	runPreflight = async (input) => {
 		const beginResult = this.preflightService.begin({
+			contextBlocks: input.contextBlocks,
 			inputMessages: [],
 			requestMetadata: input.metadata,
 			sessionId: input.sessionId,
@@ -517,6 +625,7 @@ var AgentRunContextCompactionManager = class {
 		if (Object.keys(result.metadataPatch).length > 0) await this.sessionManager.patchSessionMetadata(sessionId, result.metadataPatch);
 		if (!result.timelineMessage) return [];
 		return [{
+			occurredAt: (/* @__PURE__ */ new Date()).toISOString(),
 			type: NcpEventType.MessageSent,
 			payload: {
 				sessionId,
@@ -584,6 +693,37 @@ function readOptionalString$10(value) {
 	if (typeof value !== "string") return;
 	return value.trim() || void 0;
 }
+function readRunStartedAt(event, fallback) {
+	if (event.type !== NcpEventType.RunStarted) return fallback;
+	return event.payload.startedAt ?? event.occurredAt ?? fallback;
+}
+function createCompletedAssistantMessageEvent(params) {
+	return {
+		occurredAt: (/* @__PURE__ */ new Date()).toISOString(),
+		type: NcpEventType.MessageCompleted,
+		payload: {
+			sessionId: params.sessionId,
+			message: params.message,
+			correlationId: params.correlationId
+		}
+	};
+}
+function createSyntheticRunErrorEvent(params) {
+	const { correlationId, error, runId, sessionId, startedAt } = params;
+	const endedAt = (/* @__PURE__ */ new Date()).toISOString();
+	return {
+		occurredAt: endedAt,
+		type: NcpEventType.RunError,
+		payload: {
+			error: error instanceof Error ? error.message : String(error),
+			runId,
+			sessionId,
+			correlationId,
+			startedAt,
+			endedAt
+		}
+	};
+}
 function readSessionMaterialization(metadata) {
 	const value = metadata[CHAT_SESSION_MATERIALIZATION_METADATA_KEY];
 	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
@@ -613,6 +753,46 @@ function findCompletedAssistantMessage(messages, messageId) {
 function readMessageTask(message) {
 	return message.parts.flatMap((part) => (part.type === "text" || part.type === "rich-text" || part.type === "reasoning") && part.text.trim() ? [part.text.trim()] : [])[0] ?? "Session";
 }
+function resolveRunSpec(params) {
+	const { agentManager, configManager, request, runId, session } = params;
+	const modelSource = request.model !== void 0 ? "request" : session.model !== void 0 ? "session" : "default";
+	const model = request.model ?? session.model ?? configManager.getDefaultModel();
+	return {
+		modelSource,
+		spec: {
+			runId,
+			agentId: request.agentId ?? session.agentId ?? agentManager.getDefaultAgentId(),
+			model,
+			maxTokens: request.maxTokens ?? configManager.getModelMaxTokens(model),
+			thinkingEffort: request.thinkingEffort ?? session.thinkingEffort ?? null,
+			correlationId: request.correlationId
+		}
+	};
+}
+function attachRunSpecMetadata(params) {
+	const { message, modelSource, request, session, spec, startedAt } = params;
+	const metadata = structuredClone(message.metadata ?? {});
+	metadata[AGENT_RUN_MESSAGE_RUN_SPEC_METADATA_KEY] = {
+		version: 1,
+		runId: spec.runId,
+		startedAt,
+		sessionId: session.sessionId,
+		agentRuntimeId: session.agentRuntimeId,
+		agentId: spec.agentId,
+		model: spec.model,
+		modelSource,
+		requestedModel: request.model ?? null,
+		maxTokens: spec.maxTokens,
+		thinkingEffort: spec.thinkingEffort,
+		projectRoot: request.projectRoot ?? session.projectRoot ?? null,
+		workingDir: session.workingDir ?? null,
+		correlationId: spec.correlationId ?? null
+	};
+	return {
+		...message,
+		metadata
+	};
+}
 var AgentRunRequestManager = class {
 	cleanups = [];
 	started = false;
@@ -642,7 +822,12 @@ var AgentRunRequestManager = class {
 	};
 	handleAbortRequest = async (envelope) => {
 		if (!envelope.payload?.sessionId) throw new Error("Invalid agent run abort request.");
-		await this.abort({ sessionId: envelope.payload.sessionId });
+		await this.abort({
+			sessionId: envelope.payload.sessionId,
+			runId: envelope.payload.runId,
+			correlationId: envelope.payload.correlationId,
+			reason: envelope.payload.reason
+		});
 	};
 	handleSessionMessageRequest = async (envelope) => {
 		if (!envelope.payload) throw new Error("Invalid agent run session message request.");
@@ -658,16 +843,10 @@ var AgentRunRequestManager = class {
 	send = async (request) => {
 		const session = await this.getOrCreateSessionForRequest(request);
 		const sessionRun = this.sessionRunManager.getSessionRun(session.sessionId) ?? await this.sessionRunManager.createSessionRun(session.sessionId);
-		const message = {
+		const baseMessage = {
 			...request.message,
 			sessionId: session.sessionId
 		};
-		const providerRequest = {
-			...request,
-			sessionId: session.sessionId,
-			message
-		};
-		sessionRun.inbox.enqueue(message);
 		let stopPublishingRunStatus = () => void 0;
 		stopPublishingRunStatus = sessionRun.onStatusChange((status) => {
 			this.eventBus.emit(eventKeys.sessionRunStatus, {
@@ -680,6 +859,7 @@ var AgentRunRequestManager = class {
 			if (status === "idle") stopPublishingRunStatus();
 		});
 		this.cleanups.push(stopPublishingRunStatus);
+		const requestRunStartedAt = (/* @__PURE__ */ new Date()).toISOString();
 		const activeRun = (() => {
 			try {
 				return sessionRun.beginRun();
@@ -688,16 +868,27 @@ var AgentRunRequestManager = class {
 				throw error;
 			}
 		})();
-		const model = request.model ?? session.model ?? this.configManager.getDefaultModel();
-		const agentId = request.agentId ?? session.agentId ?? this.agentManager.getDefaultAgentId();
-		const spec = {
+		const { modelSource, spec } = resolveRunSpec({
+			agentManager: this.agentManager,
+			configManager: this.configManager,
+			request,
 			runId: activeRun.runId,
-			agentId,
-			model,
-			maxTokens: request.maxTokens ?? this.configManager.getModelMaxTokens(model),
-			thinkingEffort: request.thinkingEffort ?? session.thinkingEffort ?? null,
-			correlationId: request.correlationId
+			session
+		});
+		const message = attachRunSpecMetadata({
+			message: baseMessage,
+			modelSource,
+			request,
+			session,
+			spec,
+			startedAt: requestRunStartedAt
+		});
+		const providerRequest = {
+			...request,
+			sessionId: session.sessionId,
+			message
 		};
+		sessionRun.inbox.enqueue(message);
 		const runtime = this.agentRuntimeManager.getOrCreate({
 			agentRuntimeId: session.agentRuntimeId,
 			session,
@@ -707,6 +898,7 @@ var AgentRunRequestManager = class {
 		const tools = await this.toolProviderManager.buildTools(providerRequest);
 		let messageCompletedSeen = false;
 		let runtimeFailed = false;
+		let runStartedAt = requestRunStartedAt;
 		lastValueFrom(from(runtime.run(spec, {
 			contextBlocks,
 			session,
@@ -716,18 +908,16 @@ var AgentRunRequestManager = class {
 		})).pipe(tap((event) => {
 			const eventsToPublish = [];
 			if (event.type === NcpEventType.RunError) runtimeFailed = true;
+			runStartedAt = readRunStartedAt(event, runStartedAt);
 			if (event.type === NcpEventType.MessageCompleted) messageCompletedSeen = true;
 			if (event.type === NcpEventType.RunFinished && !messageCompletedSeen) {
 				const message = findCompletedAssistantMessage(sessionRun.getSnapshot().messages, event.payload.messageId);
 				if (!message) throw new Error(`Run finished without a final assistant message for session "${session.sessionId}".`);
-				eventsToPublish.push({
-					type: NcpEventType.MessageCompleted,
-					payload: {
-						sessionId: event.payload.sessionId ?? session.sessionId,
-						message,
-						correlationId: event.payload.correlationId
-					}
-				});
+				eventsToPublish.push(createCompletedAssistantMessageEvent({
+					sessionId: event.payload.sessionId ?? session.sessionId,
+					message,
+					correlationId: event.payload.correlationId
+				}));
 				messageCompletedSeen = true;
 			}
 			eventsToPublish.push(event);
@@ -737,15 +927,13 @@ var AgentRunRequestManager = class {
 			});
 		}), catchError(async (error) => {
 			runtimeFailed = true;
-			const event = {
-				type: NcpEventType.RunError,
-				payload: {
-					error: error instanceof Error ? error.message : String(error),
-					runId: spec.runId,
-					sessionId: session.sessionId,
-					correlationId: spec.correlationId
-				}
-			};
+			const event = createSyntheticRunErrorEvent({
+				error,
+				runId: spec.runId,
+				sessionId: session.sessionId,
+				correlationId: spec.correlationId,
+				startedAt: runStartedAt
+			});
 			await sessionRun.applyEvents([event]);
 			this.eventBus.emit(eventKeys.ncpEvent, event, {
 				emittedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -786,7 +974,7 @@ var AgentRunRequestManager = class {
 		});
 	};
 	abort = async (request) => {
-		this.sessionRunManager.getSessionRun(request.sessionId)?.abortRun(request.runId);
+		this.sessionRunManager.getSessionRun(request.sessionId)?.abortRun(request.runId, request.reason);
 	};
 };
 //#endregion
@@ -2816,11 +3004,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$12(value) {
+function isRecord$11(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isImageContentPart(value) {
-	if (!isRecord$12(value)) return false;
+	if (!isRecord$11(value)) return false;
 	const type = value.type;
 	return type === "image_url" || type === "input_image";
 }
@@ -2836,7 +3024,7 @@ function normalizeContentWithoutVision(content) {
 		};
 	});
 	if (!sawImage) return content;
-	const textParts = parts.filter((part) => isRecord$12(part) && part.type === "text" && typeof part.text === "string").map((part) => part.text.trim()).filter(Boolean);
+	const textParts = parts.filter((part) => isRecord$11(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;
 }
@@ -3399,7 +3587,7 @@ function safeNcpSessionFilename(value) {
 function normalizeNcpAgentId(agentId) {
 	return agentId?.trim().toLowerCase() || void 0;
 }
-function isRecord$11(value) {
+function isRecord$10(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function toIsoString(value, fallback) {
@@ -3470,6 +3658,7 @@ async function replayNcpAgentSessionEvents(events) {
 }
 function createReplayEvent(event, toolResultsByCallId) {
 	const replayEvent = structuredClone(event);
+	const occurredAt = readReplayEventOccurredAt(replayEvent);
 	const replayMessage = readMessageFromSummaryEvent(replayEvent);
 	const legacyCompactionMessageId = readLegacyContextCompactionMessageId(replayMessage);
 	if (replayMessage && legacyCompactionMessageId) replayMessage.id = legacyCompactionMessageId;
@@ -3477,12 +3666,17 @@ function createReplayEvent(event, toolResultsByCallId) {
 	if (replayEvent.type === "session.snapshot.message" || replayEvent.type === NcpEventType.MessageCompleted) {
 		replayEvent.payload.message = mergeReplayCompletedToolResults(replayEvent.payload.message, toolResultsByCallId);
 		return {
+			occurredAt,
 			type: NcpEventType.MessageSent,
 			payload: replayEvent.payload
 		};
 	}
 	return replayEvent;
 }
+function readReplayEventOccurredAt(event) {
+	if (!("occurredAt" in event) || typeof event.occurredAt !== "string") return;
+	return event.occurredAt;
+}
 function mergeReplayCompletedToolResults(message, toolResultsByCallId) {
 	let changed = false;
 	const parts = message.parts.map((part) => {
@@ -3503,7 +3697,7 @@ function mergeReplayCompletedToolResults(message, toolResultsByCallId) {
 	} : message;
 }
 function readLegacyContextCompactionMessageId(message) {
-	const checkpoint = isRecord$11(message?.metadata?.checkpoint) ? message.metadata.checkpoint : null;
+	const checkpoint = isRecord$10(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}`;
@@ -3514,6 +3708,7 @@ function createReplayStreamingBootstrapEvent(event, knownMessageIds) {
 	if (!messageId || knownMessageIds.has(messageId)) return null;
 	knownMessageIds.add(messageId);
 	return {
+		occurredAt: event.occurredAt,
 		type: NcpEventType.MessageSent,
 		payload: {
 			sessionId: readEventSessionId$2(event),
@@ -3533,11 +3728,11 @@ function rememberReplayMessageId(event, knownMessageIds) {
 	if (message?.id) knownMessageIds.add(message.id);
 }
 function readEventSessionId$2(event) {
-	const sessionId = ("payload" in event && isRecord$11(event.payload) ? event.payload : null)?.sessionId;
+	const sessionId = ("payload" in event && isRecord$10(event.payload) ? event.payload : null)?.sessionId;
 	return typeof sessionId === "string" ? sessionId : "";
 }
 function readReplayPayloadTimestamp(event) {
-	const payload = "payload" in event && isRecord$11(event.payload) ? event.payload : null;
+	const payload = "payload" in event && isRecord$10(event.payload) ? event.payload : null;
 	const timestamp = typeof payload?.timestamp === "string" ? payload.timestamp : "";
 	return Number.isFinite(Date.parse(timestamp)) ? new Date(timestamp).toISOString() : null;
 }
@@ -3771,12 +3966,12 @@ function createProjection(sessionId, preview) {
 	};
 }
 function formatErrorStatus(error) {
-	if (typeof error === "string" && error.trim()) return `运行出错：${truncatePreviewText(error)}`;
+	if (typeof error === "string" && error.trim()) return `Run failed: ${truncatePreviewText(error)}`;
 	if (error && typeof error === "object" && "message" in error) {
 		const message = error.message;
-		if (typeof message === "string" && message.trim()) return `运行出错：${truncatePreviewText(message)}`;
+		if (typeof message === "string" && message.trim()) return `Run failed: ${truncatePreviewText(message)}`;
 	}
-	return "运行出错";
+	return "Run failed";
 }
 function readToolCallId(value) {
 	if (typeof value !== "string") return null;
@@ -3784,13 +3979,13 @@ function readToolCallId(value) {
 	return trimmed.length > 0 ? trimmed : null;
 }
 function formatToolDoneStatus(toolName) {
-	return toolName ? `工具调用完成：${toolName}` : "工具调用完成";
+	return toolName ? `Tool call completed: ${toolName}` : "Tool call completed";
 }
 function createSessionActivityPreviewFromNcpEvent(event, timestamp, options = {}) {
 	switch (event.type) {
 		case NcpEventType.RunStarted: return createProjection(readSessionId(event.payload.sessionId), {
 			state: "running",
-			statusText: "正在思考",
+			statusText: "Thinking",
 			timestamp
 		});
 		case NcpEventType.RunFinished: return createProjection(readSessionId(event.payload.sessionId), {
@@ -3817,7 +4012,7 @@ function createSessionActivityPreviewFromNcpEvent(event, timestamp, options = {}
 			return createProjection(readSessionId(event.payload.sessionId), {
 				state: "completed",
 				replyText: text,
-				timestamp: event.payload.message.timestamp || timestamp
+				timestamp
 			});
 		}
 		case NcpEventType.MessageFailed: return createProjection(readSessionId(event.payload.sessionId), {
@@ -3825,9 +4020,13 @@ function createSessionActivityPreviewFromNcpEvent(event, timestamp, options = {}
 			statusText: formatErrorStatus(event.payload.error),
 			timestamp
 		});
+		case NcpEventType.MessageAbort: return createProjection(readSessionId(event.payload.sessionId), {
+			state: "cancelled",
+			timestamp
+		});
 		case NcpEventType.MessageToolCallStart: return createProjection(readSessionId(event.payload.sessionId), {
 			state: "running",
-			statusText: `正在调用工具：${event.payload.toolName}`,
+			statusText: `Calling tool: ${event.payload.toolName}`,
 			timestamp
 		});
 		case NcpEventType.MessageToolCallEnd:
@@ -3850,9 +4049,10 @@ const SESSION_ACTIVITY_PREVIEW_STATES = new Set([
 	"running",
 	"completed",
 	"failed",
+	"cancelled",
 	"idle"
 ]);
-function isRecord$10(value) {
+function isRecord$9(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function readOptionalString$7(value) {
@@ -3861,7 +4061,7 @@ function readOptionalString$7(value) {
 	return trimmed.length > 0 ? trimmed : void 0;
 }
 function readSessionActivityPreviewMetadata(value) {
-	if (!isRecord$10(value)) return null;
+	if (!isRecord$9(value)) return null;
 	const state = value.state;
 	const timestamp = readOptionalString$7(value.timestamp);
 	if (!SESSION_ACTIVITY_PREVIEW_STATES.has(state) || !timestamp) return null;
@@ -3937,7 +4137,7 @@ var SessionActivityPreviewEventService = class {
 	};
 	readToolName = (sessionId, toolCallId) => this.toolNames.get(this.createToolNameKey(sessionId, toolCallId)) ?? null;
 	clearFinishedRunToolNames = (event) => {
-		if (event.type !== NcpEventType.RunFinished && event.type !== NcpEventType.RunError) return;
+		if (event.type !== NcpEventType.RunFinished && event.type !== NcpEventType.RunError && event.type !== NcpEventType.MessageAbort) return;
 		const sessionId = event.payload.sessionId;
 		for (const key of this.toolNames.keys()) if (key.startsWith(`${sessionId}:`)) this.toolNames.delete(key);
 	};
@@ -4526,12 +4726,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$8(value) || value.version !== 1 || !isRecord$8(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$8(callerValue) || !isRecord$8(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$8(grantValue) && typeof grantValue.grantedAt === "string") capabilities[capability] = { grantedAt: grantValue.grantedAt };
 		grants[callerKey] = { capabilities };
 	}
 	return {
@@ -4542,7 +4742,7 @@ function normalizeStoreData$2(value) {
 function getCallerKey(caller) {
 	return `${caller.surface}:${caller.appId}`;
 }
-function isRecord$9(value) {
+function isRecord$8(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isMissingFileError$3(error) {
@@ -4588,19 +4788,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$7(value) || value.version !== 1 || !isRecord$7(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$7(grant) && typeof grant.grantedAt === "string") grants[appId] = { grantedAt: grant.grantedAt };
 	return {
 		grants,
 		version: 1
 	};
 }
-function isRecord$8(value) {
+function isRecord$7(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isMissingFileError$2(error) {
-	return isRecord$8(error) && error.code === "ENOENT";
+	return isRecord$7(error) && error.code === "ENOENT";
 }
 //#endregion
 //#region src/services/agent-run-client.service.ts
@@ -4819,7 +5019,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$6(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 {
@@ -4960,7 +5160,7 @@ function readStructuredResultEvent(event, resultToolCallId) {
 	};
 }
 function assertToolResultContent(content) {
-	if (!isRecord$7(content) || content.ok !== false || !isRecord$7(content.error)) return;
+	if (!isRecord$6(content) || content.ok !== false || !isRecord$6(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");
 }
@@ -4976,7 +5176,7 @@ function stringifyJsonValue(value) {
 		throw new PanelAppError("PANEL_APP_AGENT_REQUEST_INVALID", "value is not JSON serializable");
 	}
 }
-function isRecord$7(value) {
+function isRecord$6(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
@@ -5250,7 +5450,7 @@ 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.");
+	if (!isRecord$5(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 {
@@ -5337,7 +5537,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$5(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function normalizeTextValue(value) {
@@ -6174,12 +6374,12 @@ var ServiceActionGrantStore = class {
 	};
 };
 function normalizeStoreData(value) {
-	if (!isRecord$5(value) || value.version !== 1 || !isRecord$5(value.grants)) return structuredClone(EMPTY_GRANTS);
+	if (!isRecord$4(value) || value.version !== 1 || !isRecord$4(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$4(callerValue) || !isRecord$4(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$4(actionValue) && typeof actionValue.grantedAt === "string" && isServiceActionRisk(actionValue.risk)) actions[actionId] = {
 			grantedAt: actionValue.grantedAt,
 			risk: actionValue.risk
 		};
@@ -6193,11 +6393,11 @@ function normalizeStoreData(value) {
 function isServiceActionRisk(value) {
 	return value === "read" || value === "write" || value === "external" || value === "dangerous";
 }
-function isRecord$5(value) {
+function isRecord$4(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function isMissingFileError(error) {
-	return isRecord$5(error) && error.code === "ENOENT";
+	return isRecord$4(error) && error.code === "ENOENT";
 }
 //#endregion
 //#region src/utils/service-app-manifest.utils.ts
@@ -6222,7 +6422,7 @@ 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.");
+	if (!isRecord$3(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";
@@ -6240,16 +6440,16 @@ function parseServiceAppManifest(raw) {
 }
 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$3(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.`);
+		if (!isRecord$3(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$4(inputSchema)) throw new Error(`service app action ${name} inputSchema must be an object.`);
+		if (inputSchema !== void 0 && !isRecord$3(inputSchema)) throw new Error(`service app action ${name} inputSchema must be an object.`);
 		actions[name] = {
 			risk,
 			title: readOptionalString$5(action, "title"),
@@ -6277,7 +6477,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$3(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 //#endregion
@@ -6602,11 +6802,11 @@ var SessionRun = class {
 			signal: controller.signal
 		};
 	};
-	abortRun = (runId) => {
+	abortRun = (runId, reason) => {
 		if (!this.activeRunId || !this.activeRunController) return false;
 		if (runId && this.activeRunId !== runId) return false;
 		const wasRunning = this.isRunning();
-		this.activeRunController.abort();
+		this.activeRunController.abort(reason);
 		this.activeRunController = null;
 		this.activeRunId = null;
 		this.emitStatusChangeIfNeeded(wasRunning);
@@ -6615,7 +6815,11 @@ var SessionRun = class {
 	isRunning = () => this.activeRunId !== null;
 	dispose = () => {
 		const wasRunning = this.isRunning();
-		this.activeRunController?.abort();
+		this.activeRunController?.abort({
+			code: "abort-error",
+			message: "Session run owner was disposed; the current run was cancelled.",
+			details: { source: "session-run-manager" }
+		});
 		this.activeRunController = null;
 		this.activeRunId = null;
 		this.emitStatusChangeIfNeeded(wasRunning);
@@ -6700,7 +6904,7 @@ function parseFrontmatterBlock(raw) {
 function parseYamlFrontmatter(raw) {
 	try {
 		const parsed = parse(raw);
-		return isRecord$3(parsed) ? parsed : {};
+		return isRecord$2(parsed) ? parsed : {};
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);
 		throw new Error(`Invalid SKILL.md frontmatter: ${message}`);
@@ -6712,7 +6916,7 @@ function readString$3(record, ...names) {
 }
 function readLocalizedTextMap(record, ...names) {
 	const value = readValue(record, names);
-	if (!isRecord$3(value)) return;
+	if (!isRecord$2(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;
 }
@@ -6736,7 +6940,7 @@ function normalizeFrontmatterKey(raw) {
 function normalizeLocaleTag(raw) {
 	return raw.trim().toLowerCase();
 }
-function isRecord$3(value) {
+function isRecord$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 //#endregion
@@ -6902,7 +7106,7 @@ var NcpAgentSessionMetadataStore = class {
 	read = async (sessionId, activitySnapshot) => {
 		try {
 			const parsed = JSON.parse(await readFile(this.metadataPath(sessionId), "utf-8"));
-			if (!isRecord$11(parsed) || parsed._type !== "metadata" || !isRecord$11(parsed.metadata)) throw new Error(`invalid ncp agent session metadata sidecar: ${sessionId}`);
+			if (!isRecord$10(parsed) || parsed._type !== "metadata" || !isRecord$10(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 {
@@ -7003,11 +7207,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$11(JSON.parse(serialized))) throw new Error("ncp agent session journal entry serialization produced a non-object entry");
+	if (!isRecord$10(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$11(event.payload)) return event;
+	if (!("payload" in event) || !isRecord$10(event.payload)) return event;
 	return {
 		...event,
 		payload: {
@@ -7231,15 +7435,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$11(parsed)) continue;
+			if (!isRecord$10(parsed)) continue;
 			if (parsed._type === "metadata") {
-				metadata = isRecord$11(parsed.metadata) ? structuredClone(parsed.metadata) : {};
+				metadata = isRecord$10(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$11(parsed.event)) {
+			if (parsed._type === "event" && isRecord$10(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);
@@ -8276,7 +8480,61 @@ var AgentRunModelInputBudgeter = class {
 	};
 };
 //#endregion
+//#region src/utils/agent-onboarding-context.utils.ts
+const ALWAYS_SKIPPED_COMPACTED_BOOTSTRAP_FILES = new Set(["BOOT.MD", "BOOTSTRAP.MD"]);
+function normalizeBootstrapFilename(filename) {
+	return filename.trim().toUpperCase();
+}
+function shouldSkipCompactedSessionBootstrapFile(filename, content) {
+	const normalized = normalizeBootstrapFilename(filename);
+	if (ALWAYS_SKIPPED_COMPACTED_BOOTSTRAP_FILES.has(normalized)) return true;
+	if (normalized === "IDENTITY.MD") return /Fill this in during your first conversation/i.test(content);
+	if (normalized === "USER.MD") return /Learn about the person you are helping/i.test(content);
+	return false;
+}
+function stripCompactedSessionOnboardingSections(block) {
+	const lines = block.split("\n");
+	const output = [];
+	let index = 0;
+	while (index < lines.length) {
+		const line = lines[index] ?? "";
+		const heading = line.match(/^##\s+(.+?)\s*$/);
+		if (!heading) {
+			output.push(line);
+			index += 1;
+			continue;
+		}
+		const sectionLines = [line];
+		index += 1;
+		while (index < lines.length && !/^##\s+/.test(lines[index] ?? "")) {
+			sectionLines.push(lines[index] ?? "");
+			index += 1;
+		}
+		if (shouldSkipCompactedSessionBootstrapFile(heading[1] ?? "", sectionLines.join("\n"))) continue;
+		output.push(...sectionLines);
+	}
+	return output.join("\n").trim();
+}
+//#endregion
 //#region src/services/agent-run-model-input-builder.service.ts
+function readSystemContent(messages) {
+	return messages.filter((message) => message.role === "system").map((message) => message.content.trim()).filter(Boolean);
+}
+function partitionProjectedMessages(messages) {
+	const compressedContextBlocks = [];
+	const conversationMessages = [];
+	for (const message of messages) {
+		if (!isContextCompactionProjectionMessage(message)) {
+			conversationMessages.push(message);
+			continue;
+		}
+		compressedContextBlocks.push(...readSystemContent(ncpMessageToOpenAiMessages(message)));
+	}
+	return {
+		compressedContextBlocks,
+		conversationMessages
+	};
+}
 var AgentRunModelInputBuilder = class {
 	constructor(messageProjector, modelInputBudgeter, assetStore = null) {
 		this.messageProjector = messageProjector;
@@ -8284,15 +8542,17 @@ var AgentRunModelInputBuilder = class {
 		this.assetStore = assetStore;
 	}
 	build = async (request) => {
-		const contextContent = request.contextBlocks.map((block) => block.trim()).filter(Boolean).join("\n\n");
+		const { compressedContextBlocks, conversationMessages: projectedConversationMessages } = partitionProjectedMessages(this.messageProjector.project({
+			sessionId: request.sessionId,
+			messages: request.messages
+		}));
+		const contextBlocks = compressedContextBlocks.length > 0 ? request.contextBlocks.map(stripCompactedSessionOnboardingSections) : request.contextBlocks;
+		const contextContent = [...compressedContextBlocks, ...contextBlocks].map((block) => block.trim()).filter(Boolean).join("\n\n");
 		const contextMessages = contextContent ? [{
 			role: "system",
 			content: contextContent
 		}] : [];
-		const conversationMessages = this.messageProjector.project({
-			sessionId: request.sessionId,
-			messages: request.messages
-		}).flatMap((message) => ncpMessageToOpenAiMessages(message, { assetStore: this.assetStore }));
+		const conversationMessages = projectedConversationMessages.flatMap((message) => ncpMessageToOpenAiMessages(message, { assetStore: this.assetStore }));
 		const pruned = await this.modelInputBudgeter.prune({
 			spec: request.spec,
 			messages: [...contextMessages, ...conversationMessages]
@@ -8349,6 +8609,7 @@ var NcpAgentRuntimeWrapper = class {
 		return this.runtime;
 	};
 	toMessageSentEvents = (messages, spec, sessionId) => messages.map((message) => ({
+		occurredAt: (/* @__PURE__ */ new Date()).toISOString(),
 		type: NcpEventType.MessageSent,
 		payload: {
 			sessionId,
@@ -8405,10 +8666,11 @@ var AgentRunRuntimeContribution = class {
 		createRuntime: () => new DefaultNcpAgentRuntime({
 			llmApi: new ProviderManagerNcpLLMApi(this.kernel.llmProviders),
 			modelInputBuilder: this.modelInputBuilder,
-			runPreflight: async ({ spec, sessionRun }) => {
+			runPreflight: async ({ contextBlocks, spec, sessionRun }) => {
 				const session = await this.kernel.sessionManager.getAgentRunSession(sessionRun.sessionId);
 				return await this.kernel.contextCompactionManager.runPreflight({
 					agentId: spec.agentId,
+					contextBlocks,
 					messages: sessionRun.getSnapshot().messages,
 					metadata: session.metadata,
 					sessionId: sessionRun.sessionId
@@ -8453,11 +8715,13 @@ var AgentBootstrapContextProvider = class {
 	provide = async (request) => {
 		const { contextConfig, projectContext, runContext } = await this.context.resolve(request);
 		const budget = this.createReadBudget(contextConfig.bootstrap);
+		const compactedSession = this.hasCompressedContext(runContext.sessionMetadata);
 		const agentBootstrapRoot = projectContext.projectBootstrapRoot ?? projectContext.effectiveWorkspace;
 		const projectBootstrap = this.loadBootstrapFiles({
 			root: agentBootstrapRoot,
 			config: contextConfig.bootstrap,
 			sessionKey: runContext.sessionKey,
+			compactedSession,
 			budget
 		});
 		const hasDistinctHostWorkspace = projectContext.hostWorkspace !== agentBootstrapRoot;
@@ -8465,6 +8729,7 @@ var AgentBootstrapContextProvider = class {
 			root: projectContext.hostWorkspace,
 			config: contextConfig.bootstrap,
 			sessionKey: runContext.sessionKey,
+			compactedSession,
 			budget
 		}) : "";
 		const hasSoulFile = /##\s+SOUL\.md\b/i.test(`${projectBootstrap}\n${workspaceBootstrap}`);
@@ -8498,14 +8763,15 @@ var AgentBootstrapContextProvider = class {
 		return lines.join("\n");
 	};
 	loadBootstrapFiles = (params) => {
-		const { budget, config, root, sessionKey } = params;
+		const { budget, compactedSession, config, root, sessionKey } = params;
 		const parts = [];
-		const fileList = this.selectBootstrapFiles(config, sessionKey);
+		const fileList = this.selectBootstrapFiles(config, sessionKey, compactedSession);
 		for (const filename of fileList) {
 			const filePath = join(root, filename);
 			if (!existsSync(filePath)) continue;
 			const raw = readFileSync(filePath, "utf-8").trim();
 			if (!raw) continue;
+			if (compactedSession && shouldSkipCompactedSessionBootstrapFile(filename, raw)) continue;
 			const perFileLimit = config.perFileChars > 0 ? config.perFileChars : raw.length;
 			const allowed = Math.min(perFileLimit, budget.remaining);
 			if (allowed <= 0) break;
@@ -8517,11 +8783,13 @@ var AgentBootstrapContextProvider = class {
 		return parts.join("\n\n");
 	};
 	createReadBudget = (config) => ({ remaining: config.totalChars > 0 ? config.totalChars : Number.POSITIVE_INFINITY });
-	selectBootstrapFiles = (config, sessionKey) => {
-		if (!sessionKey) return config.files;
+	selectBootstrapFiles = (config, sessionKey, compactedSession = false) => {
+		if (!sessionKey) return this.filterCompactedSessionFiles(config.files, compactedSession);
 		if (sessionKey.startsWith("cron:") || sessionKey.startsWith("subagent:")) return config.minimalFiles;
-		return config.files;
+		return this.filterCompactedSessionFiles(config.files, compactedSession);
 	};
+	filterCompactedSessionFiles = (files, compactedSession) => compactedSession ? files.filter((filename) => !shouldSkipCompactedSessionBootstrapFile(filename, "")) : [...files];
+	hasCompressedContext = (metadata) => Boolean(readCompressedContextCompactionCheckpoint(metadata?.[CONTEXT_COMPACTION_METADATA_KEY]));
 };
 //#endregion
 //#region src/contributions/context-provider/providers/current-session-context.provider.ts
@@ -8601,9 +8869,11 @@ const createToolCallStyleContextProvider = () => staticBlock([
 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.",
+	"Inline Panel App display is Markdown-only: in the final reply, output a `nextclaw-inline` fenced JSON block so the display remains message content.",
+	"`show_panel_app` is side-panel only. Never call `show_panel_app` for inline display, including when the user asks which Panel Apps are suitable for inline display or says \"show/display them inline\".",
+	"For ordinary local HTML files or page prototypes, call `show_file` with `path` and `viewer=\"rendered\"`; use `viewer=\"source\"` when the user needs to inspect source text. Markdown file links open source by default; append `?viewer=rendered` only when the link itself should open the rendered HTML view. Do not convert a plain HTML file into a Panel App just to preview it.",
 	"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."
+	"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, use the 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",
@@ -8758,7 +9028,7 @@ var ProjectContextProvider = class {
 //#endregion
 //#region src/contributions/context-provider/providers/reply-format-context.provider.ts
 var ReplyFormatContextProvider = class {
-	provide = (_request) => ["## Reply Formatting Contract\nGoal: local openable files mentioned in user-visible replies must be clickable.\nAllowed form: use Markdown links only, with a plain text label and an openable href: [MEMORY.md](MEMORY.md), [file](packages/example/file.ts), [notes.md](/Users/example/Documents/notes.md).\nPath choice: use project-relative hrefs for files under the active/session project root, and absolute hrefs for local files outside it.\nForbidden forms: bare file names or paths, inline-code file names, bold-only file names, code-styled link labels, code blocks for file references, and unlinked comma-separated file lists.\nExamples: bad `MEMORY.md` -> good [MEMORY.md](MEMORY.md); bad `memory/` -> good [memory/](memory/); bad `2026-03-07.md` / `feishu-notes.md` -> good [2026-03-07.md](memory/2026-03-07.md) / [feishu-notes.md](memory/feishu-notes.md).\nSelf-check before sending: scan the final visible reply for local file names or paths. If every concrete file cannot be linked, remove the exact names and summarize instead."];
+	provide = (_request) => ["## Reply Formatting Contract\nGoal: openable files in user-visible replies must be clickable, and inert inline display declarations are only for content that should appear as part of the reply.\nFile links: use Markdown links only, with a plain text label and an openable href: [MEMORY.md](MEMORY.md), [file](packages/example/file.ts), [notes.md](/Users/example/Documents/notes.md). Use project-relative hrefs for files under the active/session project root, and absolute hrefs for local files outside it. File links open source by default; use a viewer query such as [preview.html](preview.html?viewer=rendered) only when the link should open the rendered HTML view.\nInline display: when the final reply should include a non-clickable inline display placeholder, output a fenced `nextclaw-inline` JSON block:\n```nextclaw-inline\n{\"target\":{\"type\":\"panel_app\",\"payload\":{\"appId\":\"timer\"}},\"title\":\"Timer\"}\n```\nSupported targets are `panel_app`, `json`, `file`, and `url`. Prefer `panel_app` for inline Panel App display; use `file` and `url` only as non-clickable placeholders when a clickable link is not intended; use `json` for inert JSON snapshots.\nIt is display-only: no opening, executing, or tool action. Never call `show_panel_app` for inline display; `show_panel_app` is only for immediately opening a Panel App outside the final reply in the side panel. Use Markdown links for clickable resources and show_file/show_url/show_panel_app tools only when you want the UI to immediately show or run content outside the final reply.\nForbidden forms: bare file names or paths, inline-code file names, bold-only file names, code-styled link labels, code blocks for file references, action semantics inside `nextclaw-inline`, tool calls for inline display, and unlinked comma-separated file lists.\nExamples: bad `MEMORY.md` -> good [MEMORY.md](MEMORY.md); bad `memory/` -> good [memory/](memory/); bad `2026-03-07.md` / `feishu-notes.md` -> good [2026-03-07.md](memory/2026-03-07.md) / [feishu-notes.md](memory/feishu-notes.md).\nSelf-check before sending: scan the final visible reply for local file names or paths. If every concrete file cannot be linked or intentionally represented by `nextclaw-inline`, remove the exact names and summarize instead."];
 };
 //#endregion
 //#region src/contributions/context-provider/providers/skills-context.provider.ts
@@ -9115,6 +9385,7 @@ var ContextWindowContribution = class {
 		if (this.lastPublishedSignatureBySession.get(sessionId) === signature) return;
 		this.lastPublishedSignatureBySession.set(sessionId, signature);
 		this.kernel.eventBus.emit(eventKeys.ncpEvent, {
+			occurredAt: (/* @__PURE__ */ new Date()).toISOString(),
 			type: NcpEventType.ContextWindowUpdated,
 			payload: {
 				contextWindow,
@@ -9314,6 +9585,10 @@ var CoreToolProvider = class {
 			new WriteFileTool(allowedDir),
 			new EditFileTool(allowedDir),
 			new ListDirTool(allowedDir),
+			new ViewImageTool({
+				allowedDir,
+				workingDir: workspace
+			}),
 			execTool,
 			new WebSearchTool(searchConfig),
 			new WebFetchTool(),
@@ -9577,7 +9852,7 @@ var SessionRequestTool = class {
 };
 //#endregion
 //#region src/tools/session-search.tools.ts
-function isRecord$2(value) {
+function isRecord$1(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function readOptionalInteger(value) {
@@ -9627,7 +9902,7 @@ var SessionSearchTool = class {
 		return issues;
 	};
 	execute = async (args) => {
-		if (!isRecord$2(args)) throw new Error("session_search requires an object argument.");
+		if (!isRecord$1(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({
@@ -9811,90 +10086,89 @@ var SessionToolProvider = class {
 };
 //#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);
-}
+const FILE_PURPOSES = [
+	"read",
+	"preview",
+	"edit"
+];
+const URL_PURPOSES = ["read", "preview"];
+const PANEL_APP_PURPOSES = ["preview", "interact"];
+const FILE_VIEWERS = [
+	"auto",
+	"source",
+	"rendered"
+];
 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;
+	return value.trim() || 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 readPlacement(value) {
+function readOptionalEnum(value, key, allowed) {
 	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;
+	if (allowed.includes(normalized)) return normalized;
+	const expected = allowed.map((item) => `"${item}"`).join(", ");
+	throw new Error(`${key} must be ${expected}.`);
 }
 function readUrl(value) {
-	const url = readRequiredString(value, "payload.url");
+	const url = readRequiredString(value, "url");
 	let parsed;
 	try {
 		parsed = new URL(url);
 	} catch {
-		throw new Error("payload.url must be a valid URL.");
+		throw new Error("url must be a valid URL.");
 	}
-	if (parsed.protocol !== "http:" && parsed.protocol !== "https:") throw new Error("payload.url must use http or https.");
+	if (parsed.protocol !== "http:" && parsed.protocol !== "https:") throw new Error("url must use http or https.");
 	return parsed.toString();
 }
-function normalizeShowContentArgs(args) {
+function readCommonRequestFields(params, allowedPurposes) {
+	return {
+		title: readOptionalString$1(params.title),
+		purpose: readOptionalEnum(params.purpose, "purpose", allowedPurposes)
+	};
+}
+function normalizeShowFileArgs(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);
-	const placement = readPlacement(params.placement);
-	if (type === "file") return {
+	return {
 		target: {
-			type,
+			type: "file",
 			payload: {
-				path: readRequiredString(payload.path, "payload.path"),
-				line: readOptionalPositiveInteger(payload.line, "payload.line"),
-				column: readOptionalPositiveInteger(payload.column, "payload.column")
+				path: readRequiredString(params.path, "path"),
+				line: readOptionalPositiveInteger(params.line, "line"),
+				column: readOptionalPositiveInteger(params.column, "column"),
+				viewer: readOptionalEnum(params.viewer, "viewer", FILE_VIEWERS) ?? "source"
 			}
 		},
-		title,
-		purpose,
-		placement
+		...readCommonRequestFields(params, FILE_PURPOSES)
 	};
-	if (type === "url") return {
+}
+function normalizeShowUrlArgs(args) {
+	const params = normalizeToolParams(args);
+	return {
 		target: {
-			type,
-			payload: { url: readUrl(payload.url) }
+			type: "url",
+			payload: { url: readUrl(params.url) }
 		},
-		title,
-		purpose,
-		placement
+		...readCommonRequestFields(params, URL_PURPOSES)
 	};
-	if (type === "panel_app") return {
+}
+function normalizeShowPanelAppArgs(args) {
+	const params = normalizeToolParams(args);
+	return {
 		target: {
-			type,
-			payload: { appId: readRequiredString(payload.appId, "payload.appId") }
+			type: "panel_app",
+			payload: { appId: readRequiredString(params.appId, "appId") }
 		},
-		title,
-		purpose,
-		placement
+		...readCommonRequestFields(params, PANEL_APP_PURPOSES)
 	};
-	throw new Error("type must be \"file\", \"url\", or \"panel_app\".");
 }
 function summarizeTarget(target) {
 	if (target.type === "file") return target.payload.path;
@@ -9909,63 +10183,25 @@ function createShowContentEventPayload(request, context) {
 		target: request.target,
 		title: request.title,
 		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.",
-		"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: {
-			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."
-			},
-			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}.",
-				additionalProperties: true
-			}
-		},
-		required: ["type", "payload"],
-		additionalProperties: false
+		placement: "side_panel"
 	};
-	constructor(eventBus) {
+}
+var ShowContentDisplayTool = class {
+	constructor(eventBus, spec) {
 		this.eventBus = eventBus;
+		this.spec = spec;
+	}
+	get name() {
+		return this.spec.name;
+	}
+	get description() {
+		return this.spec.description;
+	}
+	get parameters() {
+		return this.spec.parameters;
 	}
 	execute = async (args, context) => {
-		const request = normalizeShowContentArgs(args);
+		const request = this.spec.normalize(args);
 		this.eventBus.emit(eventKeys.uiShowContent, createShowContentEventPayload(request, context), { source: "kernel" });
 		return {
 			ok: true,
@@ -9974,13 +10210,108 @@ var ShowContentTool = class {
 		};
 	};
 };
+const SHOW_CONTENT_TOOL_SPECS = [
+	{
+		name: "show_file",
+		description: "Show a local file in the current chat UI. Defaults to source text. Use viewer=\"rendered\" for rendered HTML/page previews and viewer=\"source\" for source text.",
+		parameters: {
+			type: "object",
+			properties: {
+				path: {
+					type: "string",
+					description: "Local file path to show."
+				},
+				title: {
+					type: "string",
+					description: "Optional title for the shown content."
+				},
+				purpose: {
+					type: "string",
+					enum: FILE_PURPOSES,
+					description: "Optional user intent."
+				},
+				line: {
+					type: "integer",
+					minimum: 1,
+					description: "Optional 1-based line number."
+				},
+				column: {
+					type: "integer",
+					minimum: 1,
+					description: "Optional 1-based column number."
+				},
+				viewer: {
+					type: "string",
+					enum: FILE_VIEWERS,
+					description: "Optional file viewer mode."
+				}
+			},
+			required: ["path"],
+			additionalProperties: false
+		},
+		normalize: normalizeShowFileArgs
+	},
+	{
+		name: "show_url",
+		description: "Show an http or https URL in the current chat UI browser. Use this for local development servers such as Vite, Next.js, Storybook, or any running web app URL.",
+		parameters: {
+			type: "object",
+			properties: {
+				url: {
+					type: "string",
+					description: "HTTP or HTTPS URL to show."
+				},
+				title: {
+					type: "string",
+					description: "Optional title for the shown content."
+				},
+				purpose: {
+					type: "string",
+					enum: URL_PURPOSES,
+					description: "Optional user intent."
+				}
+			},
+			required: ["url"],
+			additionalProperties: false
+		},
+		normalize: normalizeShowUrlArgs
+	},
+	{
+		name: "show_panel_app",
+		description: "Open a Panel App in the current chat UI as an immediate tool-driven preview. This tool is side-panel only. For inline Panel App display in a final reply, do not call this tool; output a Markdown nextclaw-inline fenced JSON block instead.",
+		parameters: {
+			type: "object",
+			properties: {
+				appId: {
+					type: "string",
+					description: "Installed Panel App id to show."
+				},
+				title: {
+					type: "string",
+					description: "Optional title for the shown content."
+				},
+				purpose: {
+					type: "string",
+					enum: PANEL_APP_PURPOSES,
+					description: "Optional user intent."
+				}
+			},
+			required: ["appId"],
+			additionalProperties: false
+		},
+		normalize: normalizeShowPanelAppArgs
+	}
+];
+function createShowContentTools(eventBus) {
+	return SHOW_CONTENT_TOOL_SPECS.map((spec) => new ShowContentDisplayTool(eventBus, spec));
+}
 //#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)];
+	provide = () => createShowContentTools(this.eventBus);
 };
 //#endregion
 //#region src/contributions/tool-provider/providers/structured-result-tool.provider.ts
@@ -10349,39 +10680,6 @@ async function dispatchChannelReplyRoute(params) {
 	await route.channel.consumeNcpReply(input);
 }
 //#endregion
-//#region src/utils/agent-run-metadata.utils.ts
-const LEGACY_RUN_METADATA_KEYS = [
-	"account_id",
-	"agent_id",
-	"chat_id",
-	"preferred_model",
-	"project_root",
-	"runtime",
-	"sender_id",
-	"session_key",
-	"session_type"
-];
-function stripLegacyRunMetadata(metadata) {
-	const nextMetadata = structuredClone(metadata);
-	for (const key of LEGACY_RUN_METADATA_KEYS) delete nextMetadata[key];
-	return nextMetadata;
-}
-function buildRunMetadata(params) {
-	const { message, metadata, route } = params;
-	return {
-		...stripLegacyRunMetadata({
-			...message.metadata ?? {},
-			...metadata ?? {}
-		}),
-		channel: message.channel,
-		chatId: message.chatId,
-		accountId: route.accountId,
-		agentId: route.agentId,
-		sessionKey: route.sessionKey,
-		senderId: message.senderId
-	};
-}
-//#endregion
 //#region src/features/ncp-dispatch/services/gateway-inbound-processor.service.ts
 function formatUserFacingError(error, maxChars = 320) {
 	const normalized = (error instanceof Error ? error.message || error.name : String(error ?? "Unknown error")).replace(/\s+/g, " ").trim();
@@ -10820,6 +11118,6 @@ function resolveLegacyEventType(message) {
 	return `message.${role || "other"}`;
 }
 //#endregion
-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, PreferenceError, PreferenceManager, 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, isPreferenceError, 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 };
+export { AccessManager, AgentManager, AgentRunClient, AutomationManager, BuiltinNarpRuntimeProviderService, CONTEXT_COMPACTION_PROJECTION_KIND, CONTEXT_COMPACTION_PROJECTION_METADATA_KEY, 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, PreferenceError, PreferenceManager, 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, isContextCompactionProjectionMessage, isContextCompactionTimelineMessage, isContextWindowSnapshot, isPanelAppAgentCapability, isPanelAppError, isPreferenceError, 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