@nextclaw/kernel 0.6.0 → 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, 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, sanitizeAssistantReplyTags } from "@nextclaw/ncp";
+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";
@@ -203,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;
@@ -221,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()}`;
 }
@@ -255,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;
 }
@@ -264,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;
@@ -311,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));
@@ -320,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;
@@ -347,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
@@ -357,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
 			}),
@@ -368,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
@@ -379,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,
@@ -468,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: [{
@@ -476,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'."
@@ -486,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;
 	};
@@ -535,6 +608,7 @@ var AgentRunContextCompactionManager = class {
 	}
 	runPreflight = async (input) => {
 		const beginResult = this.preflightService.begin({
+			contextBlocks: input.contextBlocks,
 			inputMessages: [],
 			requestMetadata: input.metadata,
 			sessionId: input.sessionId,
@@ -748,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.");
@@ -895,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
@@ -3887,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;
@@ -3900,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), {
@@ -3941,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:
@@ -3966,6 +4049,7 @@ const SESSION_ACTIVITY_PREVIEW_STATES = new Set([
 	"running",
 	"completed",
 	"failed",
+	"cancelled",
 	"idle"
 ]);
 function isRecord$9(value) {
@@ -4053,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);
 	};
@@ -6718,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);
@@ -6731,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);
@@ -8392,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;
@@ -8400,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]
@@ -8522,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
@@ -8570,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;
@@ -8582,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}`);
@@ -8615,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;
@@ -8634,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
@@ -8720,7 +8871,7 @@ const createInlineInteractiveSurfaceContextProvider = () => staticBlock([
 	"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.",
 	"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. Do not convert a plain HTML file into a Panel App just to preview it.",
+	"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, 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."
 ]);
@@ -8877,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: 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.\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."];
+	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
@@ -9993,7 +10144,7 @@ function normalizeShowFileArgs(args) {
 				path: readRequiredString(params.path, "path"),
 				line: readOptionalPositiveInteger(params.line, "line"),
 				column: readOptionalPositiveInteger(params.column, "column"),
-				viewer: readOptionalEnum(params.viewer, "viewer", FILE_VIEWERS)
+				viewer: readOptionalEnum(params.viewer, "viewer", FILE_VIEWERS) ?? "source"
 			}
 		},
 		...readCommonRequestFields(params, FILE_PURPOSES)
@@ -10062,7 +10213,7 @@ var ShowContentDisplayTool = class {
 const SHOW_CONTENT_TOOL_SPECS = [
 	{
 		name: "show_file",
-		description: "Show a local file in the current chat UI. Use viewer=\"rendered\" for rendered HTML/page previews and viewer=\"source\" for source text.",
+		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: {
@@ -10967,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