@nextclaw/kernel 0.16.0 → 0.16.1

package/dist/index.js

@@ -3,7 +3,7 @@ import { n as getUnsignedUpdateManifest, r as serializeUnsignedUpdateManifest, t
 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_PROJECT_SKILLS_DIR_NAME, DEFAULT_SERVICE_APPS_DIR, DEFAULT_SESSION_SEARCH_LIMIT, DEFAULT_WORKSPACE_REPOSITORY_IDENTITY_RESOLVER, DIAGNOSTIC_CORRELATION_METADATA_KEY, DiagnosticRuntime, EditFileTool, ExecTool, ExtensionChannelAdapter, GatewayTool, InputBudgetPruner, LLMProvider, ListDirTool, LiteLLMProvider, LocalExecutionClaimService, MAX_SESSION_SEARCH_LIMIT, MemoryGetTool, MemorySearchTool, MemoryStore, MessageBus, MessageTool, ProviderModelDiscoveryService, ProviderRegistry, ReadFileTool, 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, estimateInputTokens, 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, resolveRuntimeCommandLaunch, resolveSecretRef, resolveSessionProjectContext, resolveSessionWorkspacePath, resolveThinkingLevel, safeFilename, sanitizeOutboundAssistantContent, saveConfig, summarizeSessionRequestTask, toExtensionConfigView, updateAgentProfile } from "@nextclaw/core";
 import { NCP_AI_EXECUTION_METADATA_KEY, NCP_INTERNAL_VISIBILITY_METADATA_KEY, NCP_RUN_TRIGGER_METADATA_KEY, NcpEventType, OBSERVATION_EVENT_EXTENSION_TYPE, createUnavailableNcpAiExecutionMetadata, isHiddenNcpMessage, normalizeAssistantText, parseNcpRunTriggerInput, readNcpAiExecutionMetadata, sanitizeAssistantReplyTags } from "@nextclaw/ncp";
-import { LocalAssetStore, buildAssetContentPath, buildOpenAiFunctionTool, isTextLikeAsset, ncpMessageToOpenAiMessages, validateToolArgs } from "@nextclaw/ncp-agent-runtime";
+import { LocalAssetStore, MODEL_ROUND_PART_OFFSETS, buildAssetContentPath, buildOpenAiFunctionTool, isTextLikeAsset, ncpMessageToOpenAiMessageGroups, ncpMessageToOpenAiMessages, validateToolArgs } from "@nextclaw/ncp-agent-runtime";
 import { CHAT_CONTINUATION_TARGET_MESSAGE_METADATA_KEY, CHAT_CONVERSATION_EXCERPT_TOKEN_KIND, CHAT_INLINE_TOKENS_METADATA_KEY, CHAT_INLINE_TOKENS_SCHEMA_VERSION, CHAT_PROJECT_TOKEN_KIND, CHAT_SESSION_MATERIALIZATION_METADATA_KEY, CHAT_SYSTEM_OBJECT_TOKEN_KIND, CHAT_UI_RESOURCE_TOKEN_KIND, CHAT_WORKSPACE_DIRECTORY_TOKEN_KIND, CHAT_WORKSPACE_EXCERPT_TOKEN_KIND, CHAT_WORKSPACE_FILE_TOKEN_KIND, Contribution as Contribution$1, EventBus, EventBus as EventBus$1, Ingress, Ingress as Ingress$1, PANEL_APP_INLINE_HOST_CONTRACT, PANEL_APP_SCROLL_RESTORATION_CONTRACT, SYSTEM_OBJECT_REFERENCE_DEFAULT_LIMIT, SYSTEM_OBJECT_REFERENCE_MAX_LIMIT, SYSTEM_OBJECT_TYPE_CRON_JOB, SYSTEM_OBJECT_TYPE_INBOX_DELIVERY, UI_CONTENT_PARAMS_HOST_CONTRACT, classifyDiagnosticError, createSystemObjectReferenceUri, createTypedKey, eventKeys, eventKeys as eventKeys$1, ingressKeys, ingressKeys as ingressKeys$1, isRuntimeDefaultModelValue, isSilentReplyNcpMessage, normalizeRuntimeModelSelectionMode, parseSystemObjectReferenceUri, readChatUiResourceReference, readInlineContentHeight, readSystemObjectResolvedReference, readUiContentParams } from "@nextclaw/shared";
 import { createHash, createHmac, randomBytes, randomUUID, scryptSync, timingSafeEqual } from "node:crypto";
 import { catchError, filter, from, lastValueFrom, tap } from "rxjs";
@@ -187,6 +187,68 @@ var ContextCompactionJournalRecoveryService = class {
 	};
 };
 //#endregion
+//#region src/tools/structured-result.tools.ts
+const STRUCTURED_RESULT_TOOL_NAME = "nextclaw_submit_result";
+var StructuredResultSubmitTool = class {
+	name = STRUCTURED_RESULT_TOOL_NAME;
+	description = "Submit the structured object result for this request.";
+	constructor(contract) {
+		this.contract = contract;
+	}
+	get parameters() {
+		return this.contract.schema;
+	}
+	validateArgs = (args) => validateToolArgs(args, this.contract.schema);
+	execute = async (args) => args;
+};
+//#endregion
+//#region src/tools/tool-schema.tools.ts
+const TOOL_SCHEMA_NAME = "tool_schema";
+const EAGER_TOOL_NAMES = new Set([
+	TOOL_SCHEMA_NAME,
+	STRUCTURED_RESULT_TOOL_NAME,
+	"node_repl",
+	"read_file",
+	"write_file",
+	"edit_file",
+	"list_dir",
+	"exec",
+	"web_search",
+	"web_fetch",
+	"view_image"
+]);
+/** Model-facing disclosure only; execution continues to validate the original schema. */
+function selectToolModelParameters(tool) {
+	return EAGER_TOOL_NAMES.has(tool.name) || !tool.parameters || JSON.stringify(tool.parameters).length <= 160 ? tool.parameters : { type: "object" };
+}
+var ToolSchemaTool = class {
+	name = TOOL_SCHEMA_NAME;
+	description = "Read full parameters for an available tool. Before first using a tool whose object schema has no properties field, query its exact name here, then call the original tool with the returned parameter shape.";
+	parameters = {
+		type: "object",
+		properties: { name: {
+			type: "string",
+			minLength: 1
+		} },
+		required: ["name"],
+		additionalProperties: false
+	};
+	constructor(readTools) {
+		this.readTools = readTools;
+	}
+	execute = async (args) => {
+		const name = args && typeof args === "object" && "name" in args ? args.name : null;
+		if (typeof name !== "string" || !name.trim()) throw new Error("Tool name is required.");
+		const tool = this.readTools().find((candidate) => candidate.name === name.trim());
+		if (!tool) throw new Error(`Tool is not in the current allowed catalog: ${name}`);
+		return structuredClone({
+			name: tool.name,
+			description: tool.description,
+			parameters: tool.parameters
+		});
+	};
+};
+//#endregion
 //#region src/utils/agent-model-input-budget.utils.ts
 function buildContextBlockInputMessages(contextBlocks = []) {
 	const contextContent = contextBlocks.map((block) => block.trim()).filter(Boolean).join("\n\n");
@@ -196,10 +258,11 @@ function buildContextBlockInputMessages(contextBlocks = []) {
 	}] : [];
 }
 function buildProviderTools(tools) {
+	const hasSchemaLookup = tools.some((tool) => tool.name === TOOL_SCHEMA_NAME);
 	return tools.map((tool) => buildOpenAiFunctionTool({
 		name: tool.name,
 		description: tool.description,
-		parameters: tool.parameters
+		parameters: hasSchemaLookup ? selectToolModelParameters(tool) : tool.parameters
 	}));
 }
 function estimateToolInputTokens(tools) {
@@ -626,6 +689,7 @@ 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";
+const CONTEXT_COMPACTION_PART_START = "nextclaw_compaction_part_start";
 const CONTEXT_COMPACTION_CONTINUATION_TEXT = "Continue the active run from the compressed working context. Do not repeat completed tool calls; proceed with the next required action.";
 const CONTEXT_COMPACTION_SYSTEM_PREAMBLE = ["Authoritative compressed prior conversation context for this session.", "Continue from this context and any following messages. 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."].join("\n");
 function readCheckpointTimelineText(checkpoint) {
@@ -678,15 +742,24 @@ function buildMidRunContinuationMessage(params) {
 		}]
 	};
 }
+function sliceMessageParts(message, start) {
+	if (!Number.isInteger(start) || start < 0 || start > message.parts.length) throw new Error("Invalid compacted message part boundary");
+	const projected = structuredClone(message);
+	projected.parts = projected.parts.slice(start);
+	projected.metadata = {
+		...projected.metadata,
+		[CONTEXT_COMPACTION_PART_START]: start
+	};
+	const offsets = projected.metadata?.[MODEL_ROUND_PART_OFFSETS];
+	if (Array.isArray(offsets)) projected.metadata = {
+		...projected.metadata,
+		[MODEL_ROUND_PART_OFFSETS]: offsets.filter((offset) => offset > start).map((offset) => offset - start)
+	};
+	return projected;
+}
 function projectMessageAfterCheckpoint(message, checkpoint) {
 	const coveredPartCount = checkpoint.continuationMessageCoveredPartCount;
-	if (message.id === checkpoint.continuationMessageId && typeof coveredPartCount === "number" && Number.isInteger(coveredPartCount) && coveredPartCount >= 0) {
-		const parts = message.parts.slice(coveredPartCount);
-		return parts.length > 0 ? {
-			...structuredClone(message),
-			parts: structuredClone(parts)
-		} : null;
-	}
+	if (message.id === checkpoint.continuationMessageId && typeof coveredPartCount === "number" && Number.isInteger(coveredPartCount) && coveredPartCount >= 0) return message.parts.slice(coveredPartCount).length > 0 ? sliceMessageParts(message, coveredPartCount) : null;
 	return Date.parse(message.timestamp) > Date.parse(readCheckpointCoveredUntil(checkpoint)) ? structuredClone(message) : null;
 }
 function readCheckpointMessageIds(value) {
@@ -749,7 +822,7 @@ function buildContextCompactionModelProjection(params) {
 	const preservedUserMessageIds = readCheckpointMessageIds(checkpoint.preservedUserMessageIds);
 	const retainedMessageIds = readCheckpointMessageIds(checkpoint.retainedMessageIds);
 	const preservedUserMessages = regularMessages.filter((message) => message.role === "user" && preservedUserMessageIds.has(message.id)).map((message) => projectPreservedUserMessage(message, checkpoint)).sort((left, right) => Date.parse(left.timestamp) - Date.parse(right.timestamp));
-	const retainedMessages = regularMessages.filter((message) => retainedMessageIds.has(message.id)).map((message) => structuredClone(message)).sort((left, right) => Date.parse(left.timestamp) - Date.parse(right.timestamp));
+	const retainedMessages = regularMessages.filter((message) => retainedMessageIds.has(message.id)).map((message) => sliceMessageParts(message, checkpoint.retainedMessagePartStarts?.[message.id] ?? 0)).sort((left, right) => Date.parse(left.timestamp) - Date.parse(right.timestamp));
 	const projectedRegularMessages = regularMessages.filter((message) => !preservedUserMessageIds.has(message.id) && !retainedMessageIds.has(message.id)).map((message) => projectMessageAfterCheckpoint(message, checkpoint)).filter((message) => Boolean(message)).sort((left, right) => Date.parse(left.timestamp) - Date.parse(right.timestamp));
 	const stablePrefixMessages = [
 		buildContextCompactionSummaryMessage({
@@ -809,11 +882,12 @@ function shouldRefreshContextWindowImmediately(event) {
 //#endregion
 //#region src/features/context-compaction/services/context-compaction-preflight.service.ts
 function toCompactionModelMessages(messages, assetStore) {
-	return messages.flatMap((message) => ncpMessageToOpenAiMessages(message, { assetStore }).map((providerMessage) => ({
+	return messages.flatMap((message) => ncpMessageToOpenAiMessageGroups(message, { assetStore }).flatMap((group) => group.messages.map((providerMessage) => ({
 		...providerMessage,
 		ncp_message_id: message.id,
+		ncp_part_start: group.partStart + Number(message.metadata?.["nextclaw_compaction_part_start"] ?? 0),
 		timestamp: message.timestamp
-	})));
+	}))));
 }
 function estimateCompactionProjectionOverhead(phase) {
 	const summaryPlanOverhead = estimateInputTokens({
@@ -11097,21 +11171,6 @@ var PanelAppStateStore = class {
 	isMissingFileError = (error) => typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
 };
 //#endregion
-//#region src/tools/structured-result.tools.ts
-const STRUCTURED_RESULT_TOOL_NAME = "nextclaw_submit_result";
-var StructuredResultSubmitTool = class {
-	name = STRUCTURED_RESULT_TOOL_NAME;
-	description = "Submit the structured object result for this request.";
-	constructor(contract) {
-		this.contract = contract;
-	}
-	get parameters() {
-		return this.contract.schema;
-	}
-	validateArgs = (args) => validateToolArgs(args, this.contract.schema);
-	execute = async (args) => args;
-};
-//#endregion
 //#region src/utils/panel-app-agent.utils.ts
 const PANEL_APP_AGENT_DEFAULT_TIMEOUT_MS = 6e4;
 const PANEL_APP_AGENT_MAX_TIMEOUT_MS = 12e4;
@@ -12894,7 +12953,8 @@ var ToolProviderManager = class {
 	};
 	buildTools = async (request) => {
 		const tools = [];
-		const seen = /* @__PURE__ */ new Set();
+		tools.push(this.wrapTool(new ToolSchemaTool(() => tools), request));
+		const seen = new Set([TOOL_SCHEMA_NAME]);
 		for (const provider of [...this.providers]) for (const tool of await provider.provide(request)) {
 			if (seen.has(tool.name)) continue;
 			seen.add(tool.name);
@@ -13069,7 +13129,7 @@ function createReplayEvent(event, toolResultsByCallId) {
 	const replayMessage = readMessageFromSummaryEvent$1(replayEvent);
 	const legacyCompactionMessageId = readLegacyContextCompactionMessageId(replayMessage);
 	if (replayMessage && legacyCompactionMessageId) replayMessage.id = legacyCompactionMessageId;
-	if (replayMessage?.role === "assistant" && (replayMessage.status === "pending" || replayMessage.status === "streaming")) replayMessage.status = "final";
+	if (replayMessage && replayEvent.type === NcpEventType.MessageCompleted) replayMessage.status = "final";
 	if (replayEvent.type === "session.snapshot.message" || replayEvent.type === NcpEventType.MessageCompleted) {
 		replayEvent.payload.message = mergeReplayCompletedToolResults(replayEvent.payload.message, toolResultsByCallId);
 		return {
@@ -13169,7 +13229,53 @@ function readMessageFromSummaryEvent$1(event) {
 	if (event.type === NcpEventType.MessageSent || event.type === NcpEventType.MessageCompleted || event.type === "session.snapshot.message") return event.payload.message;
 }
 //#endregion
+//#region src/utils/ncp-agent-session-replay-tool-ownership.utils.ts
+function seedReplayToolOwners(messages) {
+	const owners = /* @__PURE__ */ new Map();
+	for (const message of messages) for (const part of message.parts) if (part.type === "tool-invocation" && part.toolCallId) owners.set(part.toolCallId, message.id);
+	return owners;
+}
+function readReplayToolOwners(event) {
+	const message = readMessageFromSummaryEvent$1(event);
+	const owners = seedReplayToolOwners(message ? [message] : []);
+	if (event.type === NcpEventType.MessageToolCallStart && event.payload.messageId) owners.set(event.payload.toolCallId, event.payload.messageId);
+	return owners;
+}
+function needsReplayToolHistory(events, seeds) {
+	const owners = seedReplayToolOwners(seeds);
+	for (const event of events) {
+		const toolCallId = readEventToolCallId(event);
+		if (toolCallId && !readEventMessageId(event) && !owners.has(toolCallId)) return true;
+		for (const [callId, messageId] of readReplayToolOwners(event)) owners.set(callId, messageId);
+	}
+	return false;
+}
+//#endregion
 //#region src/utils/ncp-agent-session-replay.utils.ts
+var ReplayContext = class {
+	knownMessageIds;
+	terminalMessageIds;
+	toolResultsByCallId = /* @__PURE__ */ new Map();
+	compactionRecovery = new ContextCompactionJournalRecoveryService();
+	activeTailRunIds = /* @__PURE__ */ new Set();
+	toolOwners;
+	constructor(stateManager, seeds) {
+		this.stateManager = stateManager;
+		this.knownMessageIds = new Set(seeds.map((message) => message.id));
+		this.terminalMessageIds = new Set(seeds.filter((message) => message.role === "assistant" && (message.status === "final" || message.status === "error")).map((message) => message.id));
+		this.toolOwners = seedReplayToolOwners(seeds);
+		this.compactionRecovery.seed(seeds);
+	}
+	recordEvent = (event, activeMessageId) => {
+		for (const [callId, messageId] of readReplayToolOwners(event)) this.toolOwners.set(callId, messageId);
+		const message = readMessageFromSummaryEvent$1(event);
+		if (message?.role === "assistant" && (message.status === "final" || message.status === "error")) this.terminalMessageIds.add(message.id);
+		if (event.type === NcpEventType.RunError || event.type === NcpEventType.RunFinished || event.type === NcpEventType.MessageAbort) {
+			const messageId = readEventMessageId(event) ?? activeMessageId;
+			if (messageId) this.terminalMessageIds.add(messageId);
+		}
+	};
+};
 async function replayNcpAgentSessionEvents(events, seedMessages = [], activeMessageId, allowUnknownStreamingBootstrap = true) {
 	const context = await createReplayContext(seedMessages, activeMessageId);
 	await replayJournalEvents(context, events, allowUnknownStreamingBootstrap);
@@ -13185,25 +13291,13 @@ async function createReplayContext(seedMessages, activeMessageId) {
 	const activeMessage = activeMessageId ? seedMessages.find((message) => message.id === activeMessageId) : void 0;
 	if (activeMessage) await stateManager.dispatch({
 		occurredAt: activeMessage.timestamp,
-		type: NcpEventType.MessageReasoningStart,
+		type: NcpEventType.MessageSent,
 		payload: {
 			sessionId: activeMessage.sessionId,
-			messageId: activeMessage.id
+			message: activeMessage
 		}
 	});
-	const knownMessageIds = new Set(seedMessages.map((message) => message.id));
-	const terminalMessageIds = new Set(seedMessages.filter((message) => message.role === "assistant" && (message.status === "final" || message.status === "error")).map((message) => message.id));
-	const toolResultsByCallId = /* @__PURE__ */ new Map();
-	const compactionRecovery = new ContextCompactionJournalRecoveryService();
-	compactionRecovery.seed(seedMessages);
-	return {
-		stateManager,
-		knownMessageIds,
-		terminalMessageIds,
-		toolResultsByCallId,
-		compactionRecovery,
-		activeTailRunIds: /* @__PURE__ */ new Set()
-	};
+	return new ReplayContext(stateManager, seedMessages);
 }
 async function replayJournalEvents(context, events, allowUnknownStreamingBootstrap) {
 	const supersededSyntheticRecoveryIndexes = readSupersededSyntheticRecoveryIndexes(events);
@@ -13225,14 +13319,39 @@ function updateActiveTailRunIds(activeTailRunIds, event, eventIndex) {
 	if (runId) activeTailRunIds.delete(runId);
 	else activeTailRunIds.clear();
 }
-async function replayJournalEvent(context, replayEvent, allowUnknownStreamingBootstrap) {
-	const { activeTailRunIds, compactionRecovery, knownMessageIds, terminalMessageIds } = context;
+async function replayJournalEvent(context, sourceEvent, allowUnknownStreamingBootstrap) {
+	let replayEvent = sourceEvent;
+	const { activeTailRunIds, compactionRecovery, knownMessageIds, terminalMessageIds, stateManager, toolOwners, recordEvent } = context;
+	const summary = readMessageFromSummaryEvent$1(replayEvent);
+	if (summary && (summary.status === "pending" || summary.status === "streaming") && terminalMessageIds.has(summary.id)) return;
+	if (replayEvent.type === NcpEventType.MessageToolCallStart && !replayEvent.payload.messageId) {
+		const activeId = stateManager.getSnapshot().streamingMessage?.id;
+		if (!activeId) {
+			console.warn(`[ncp-agent-session-journal] ignored tool start without a message: ${replayEvent.payload.toolCallId}`);
+			return;
+		}
+		replayEvent = {
+			...replayEvent,
+			payload: {
+				...replayEvent.payload,
+				messageId: activeId
+			}
+		};
+	}
+	const toolCallId = readEventToolCallId(replayEvent);
+	const toolOwner = toolCallId ? toolOwners.get(toolCallId) : void 0;
+	if (toolCallId && replayEvent.type !== NcpEventType.MessageToolCallStart && !toolOwner) {
+		console.warn(`[ncp-agent-session-journal] ignored unowned ${replayEvent.type}: ${toolCallId}`);
+		return;
+	}
+	if (toolOwner && terminalMessageIds.has(toolOwner) && replayEvent.type !== NcpEventType.MessageToolCallResult) return;
 	const streamingMessageId = readStreamingMessageId(replayEvent);
 	if (streamingMessageId && terminalMessageIds.has(streamingMessageId)) return;
 	if (streamingMessageId && !allowUnknownStreamingBootstrap && !knownMessageIds.has(streamingMessageId) && !isStreamingMessageCreationEvent(replayEvent) && activeTailRunIds.size === 0) return;
 	compactionRecovery.track(replayEvent);
+	const activeMessageId = stateManager.getSnapshot().streamingMessage?.id;
 	await dispatchReplayEvent(context, replayEvent, streamingMessageId, allowUnknownStreamingBootstrap);
-	recordReplayTerminal(context, replayEvent);
+	recordEvent(replayEvent, activeMessageId);
 }
 async function dispatchReplayEvent(context, replayEvent, streamingMessageId, allowUnknownStreamingBootstrap) {
 	const { knownMessageIds, stateManager, toolResultsByCallId } = context;
@@ -13247,14 +13366,6 @@ async function dispatchReplayEvent(context, replayEvent, streamingMessageId, all
 	await stateManager.dispatch(replayEvent);
 	if (replayEvent.type === NcpEventType.MessageToolCallResult && replayEvent.payload.final !== false) toolResultsByCallId.set(replayEvent.payload.toolCallId, replayEvent.payload);
 }
-function recordReplayTerminal(context, replayEvent) {
-	const replayMessage = readMessageFromSummaryEvent$1(replayEvent);
-	if (replayMessage?.role === "assistant" && (replayMessage.status === "final" || replayMessage.status === "error")) context.terminalMessageIds.add(replayMessage.id);
-	if (replayEvent.type === NcpEventType.RunError || replayEvent.type === NcpEventType.MessageAbort) {
-		const messageId = readEventMessageId(replayEvent);
-		if (messageId) context.terminalMessageIds.add(messageId);
-	}
-}
 const NCP_AGENT_SESSION_JOURNAL_INDEX_FILE = ".ncp-agent-session-index.json";
 const NCP_AGENT_SESSION_SNAPSHOT_MESSAGE_EVENT_TYPE = "session.snapshot.message";
 const NCP_SESSION_REQUEST_ACCEPTED_EVENT_TYPE = "session.request.accepted";
@@ -15207,10 +15318,11 @@ var ServiceAppResidentEventInboxService = class {
 			const existing = store.events.find((candidate) => candidate.eventId === input.eventId);
 			if (existing) {
 				event = existing;
-				return;
+				return false;
 			}
 			const now = (/* @__PURE__ */ new Date()).toISOString();
 			const streamKey = input.streamKey?.trim() || "default";
+			if (store.events.some((candidate) => candidate.streamKey === streamKey && candidate.status === "dead-letter")) throw new ServiceAppError("SERVICE_APP_RESIDENT_EVENT_CONFLICT", `Resident stream ${streamKey} is blocked by a dead-letter event.`);
 			const sequence = store.events.filter((candidate) => candidate.streamKey === streamKey).reduce((maximum, candidate) => Math.max(maximum, candidate.sequence), 0) + 1;
 			event = {
 				id: randomUUID(),
@@ -15251,24 +15363,35 @@ var ServiceAppResidentEventInboxService = class {
 		const now = params.now ?? /* @__PURE__ */ new Date();
 		const leaseMs = this.clampLease(params.leaseMs ?? DEFAULT_LEASE_MS);
 		await this.mutate(scope, (store) => {
-			if (store.frozen) return;
+			if (store.frozen) return false;
 			const nowMs = now.getTime();
+			let changed = false;
 			for (const event of store.events) {
 				if (event.status === "leased" && this.readTime(event.leaseExpiresAt) <= nowMs) {
 					this.transition(event, "pending");
 					event.leaseExpiresAt = void 0;
+					changed = true;
 				}
 				if (event.status === "retry-wait" && this.readTime(event.nextAttemptAt) <= nowMs) {
 					this.transition(event, "pending");
 					event.nextAttemptAt = void 0;
+					changed = true;
 				}
 			}
-			const candidate = store.events.filter((event) => event.status === "pending").filter((event) => !store.events.some((earlier) => earlier.streamKey === event.streamKey && earlier.sequence < event.sequence && earlier.status !== "acked")).sort((left, right) => left.receivedAt.localeCompare(right.receivedAt))[0];
-			if (!candidate) return;
+			const streamHeads = /* @__PURE__ */ new Map();
+			for (const event of store.events) {
+				if (event.status === "acked") continue;
+				const current = streamHeads.get(event.streamKey);
+				if (!current || event.sequence < current.sequence) streamHeads.set(event.streamKey, event);
+			}
+			let candidate;
+			for (const event of streamHeads.values()) if (event.status === "pending" && (!candidate || event.receivedAt < candidate.receivedAt)) candidate = event;
+			if (!candidate) return changed;
 			candidate.attempt += 1;
 			this.transition(candidate, "leased");
 			candidate.leaseExpiresAt = new Date(nowMs + leaseMs).toISOString();
 			leased = candidate;
+			return true;
 		});
 		return leased ? this.toLeased(leased) : void 0;
 	};
@@ -15397,8 +15520,7 @@ var ServiceAppResidentEventInboxService = class {
 		await this.ensureLoaded(scope);
 		const key = scope.stateDirectory;
 		const next = (this.mutationQueues.get(key) ?? Promise.resolve()).catch(() => void 0).then(async () => {
-			operation(this.requireStore(scope));
-			await this.save(scope);
+			if (operation(this.requireStore(scope)) !== false) await this.save(scope);
 		});
 		this.mutationQueues.set(key, next);
 		await next;
@@ -22332,7 +22454,7 @@ function deduplicateNcpAgentSessionTailMessages(messages) {
 function isNcpAgentSessionMessageProjectionMeta(value, sessionId) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return false;
 	const meta = value;
-	return meta.version === 7 && meta.sessionId === sessionId && Number.isSafeInteger(meta.total) && Number.isSafeInteger(meta.projectedJournalOffset) && Number.isSafeInteger(meta.dataBytes) && (meta.activeMessageId === null || typeof meta.activeMessageId === "string") && Array.isArray(meta.pendingCompactionMessageIds) && meta.pendingCompactionMessageIds.every((id) => typeof id === "string") && (meta.contextWindow === null || isRecord$6(meta.contextWindow));
+	return meta.version === 8 && meta.sessionId === sessionId && Number.isSafeInteger(meta.total) && Number.isSafeInteger(meta.projectedJournalOffset) && Number.isSafeInteger(meta.dataBytes) && (meta.activeMessageId === null || typeof meta.activeMessageId === "string") && Array.isArray(meta.pendingCompactionMessageIds) && meta.pendingCompactionMessageIds.every((id) => typeof id === "string") && (meta.contextWindow === null || isRecord$6(meta.contextWindow));
 }
 function readActiveAssistantMessageId(messages) {
 	for (let index = messages.length - 1; index >= 0; index -= 1) {
@@ -22364,6 +22486,34 @@ function readCompactionStatus(message) {
 	return typeof checkpoint.status === "string" ? checkpoint.status : null;
 }
 //#endregion
+//#region src/stores/ncp-agent-session-message-projection-tail.store.ts
+async function readNcpAgentSessionProjectionTail(journalPath, meta, readMessage) {
+	const file = await open(journalPath, "r");
+	try {
+		const { size } = await file.stat();
+		const offset = meta.projectedJournalOffset;
+		if (offset < 0 || offset >= size) return [];
+		const buffer = Buffer.alloc(size - offset);
+		const result = await file.read(buffer, 0, buffer.length, offset);
+		const journal = parseNcpAgentSessionJournal(buffer.subarray(0, result.bytesRead).toString("utf-8"));
+		const seedIds = new Set(meta.pendingCompactionMessageIds);
+		if (meta.activeMessageId) seedIds.add(meta.activeMessageId);
+		for (const event of journal.events) if (event.type === NcpEventType.RunFinished || event.type === NcpEventType.RunError || event.type === NcpEventType.RunMetadata || event.type === NcpEventType.MessageAbort) {
+			const messageId = readEventMessageId(event);
+			if (messageId) seedIds.add(messageId);
+		}
+		const seeds = (await Promise.all([...seedIds].map(readMessage))).filter((message) => Boolean(message));
+		if (needsReplayToolHistory(journal.events, seeds)) {
+			const prefix = Buffer.alloc(size);
+			const full = await file.read(prefix, 0, size, 0);
+			return await replayNcpAgentSessionEvents(parseNcpAgentSessionJournal(prefix.subarray(0, full.bytesRead).toString("utf-8")).events);
+		}
+		return await replayNcpAgentSessionEvents(journal.events, seeds, meta.activeMessageId, false);
+	} finally {
+		await file.close();
+	}
+}
+//#endregion
 //#region src/stores/ncp-agent-session-message-projection-persistence.store.ts
 const PROJECTION_ROOT_DIRECTORY = ".message-projections";
 const RETRYABLE_META_RENAME_CODES = new Set([
@@ -22424,7 +22574,7 @@ var NcpAgentSessionMessageProjectionPersistenceStore = class {
 				await dataFile.close();
 			}
 			const meta = {
-				version: 7,
+				version: 8,
 				sessionId,
 				total: messages.length,
 				projectedJournalOffset,
@@ -22546,23 +22696,7 @@ var NcpAgentSessionMessageProjectionPersistenceStore = class {
 			contextWindow: meta.contextWindow ? structuredClone(meta.contextWindow) : null
 		};
 	};
-	readJournalTailMessages = async (sessionId, meta) => {
-		const file = await open(this.journalPath(sessionId), "r");
-		try {
-			const fileStat = await file.stat();
-			const offset = meta.projectedJournalOffset;
-			if (offset < 0 || offset > fileStat.size || offset === fileStat.size) return [];
-			const buffer = Buffer.alloc(fileStat.size - offset);
-			const result = await file.read(buffer, 0, buffer.length, offset);
-			const journal = parseNcpAgentSessionJournal(buffer.subarray(0, result.bytesRead).toString("utf-8"));
-			const seedMessageIds = new Set(meta.pendingCompactionMessageIds);
-			if (meta.activeMessageId) seedMessageIds.add(meta.activeMessageId);
-			const seedMessages = (await Promise.all([...seedMessageIds].map((messageId) => this.readMessageById(sessionId, meta, messageId)))).filter((message) => Boolean(message));
-			return await replayNcpAgentSessionEvents(journal.events, seedMessages, meta.activeMessageId, false);
-		} finally {
-			await file.close();
-		}
-	};
+	readJournalTailMessages = async (sessionId, meta) => readNcpAgentSessionProjectionTail(this.journalPath(sessionId), meta, (messageId) => this.readMessageById(sessionId, meta, messageId));
 	delete = async (sessionId) => {
 		this.messageOrdinals.delete(sessionId);
 		await rm(this.projectionPath(sessionId), {
@@ -22992,6 +23126,7 @@ function summaryToRow(summary, deletedAt = null) {
 	};
 }
 function rowToSummary(row) {
+	const metadata = JSON.parse(row.metadata_json);
 	return {
 		sessionId: row.session_id,
 		...row.peer_id ? { peerId: row.peer_id } : {},
@@ -23000,7 +23135,8 @@ function rowToSummary(row) {
 		...row.created_at ? { createdAt: row.created_at } : {},
 		updatedAt: row.updated_at,
 		...row.last_message_at ? { lastMessageAt: row.last_message_at } : {},
-		status: row.status
+		status: row.status,
+		...Object.keys(metadata).length > 0 ? { metadata } : {}
 	};
 }
 var NcpAgentSessionSummaryIndexStore = class {
@@ -23218,19 +23354,6 @@ var NcpAgentSessionSummaryIndexStore = class {
 };
 //#endregion
 //#region src/stores/ncp-agent-session-summary-read.store.ts
-const METADATA_READ_CONCURRENCY = 2;
-async function mapWithConcurrency(values, project) {
-	const results = new Array(values.length);
-	let nextIndex = 0;
-	const workers = Array.from({ length: Math.min(METADATA_READ_CONCURRENCY, values.length) }, async () => {
-		while (nextIndex < values.length) {
-			const index = nextIndex++;
-			results[index] = await project(values[index]);
-		}
-	});
-	await Promise.all(workers);
-	return results;
-}
 var NcpAgentSessionSummaryReadStore = class {
 	constructor(options) {
 		this.options = options;
@@ -23238,7 +23361,7 @@ var NcpAgentSessionSummaryReadStore = class {
 	list = async (limit) => {
 		const normalizedLimit = limit === void 0 || limit === Number.POSITIVE_INFINITY ? void 0 : Math.max(0, Math.trunc(limit));
 		const summaries = await this.options.summaryIndex.list(normalizedLimit);
-		return await mapWithConcurrency(normalizedLimit === void 0 ? summaries : summaries.slice(0, normalizedLimit), this.withMetadata);
+		return normalizedLimit === void 0 ? summaries : summaries.slice(0, normalizedLimit);
 	};
 	listPage = async (options) => {
 		const page = Math.max(1, Math.trunc(options.page));
@@ -23249,13 +23372,13 @@ var NcpAgentSessionSummaryReadStore = class {
 			...options.query?.trim() ? { query: options.query.trim() } : {}
 		}), this.options.summaryIndex.count(options.query)]);
 		return {
-			sessions: await mapWithConcurrency(summaries, this.withMetadata),
+			sessions: summaries,
 			total
 		};
 	};
 	get = async (sessionId) => {
 		const indexed = await this.options.summaryIndex.get(sessionId);
-		if (indexed) return await this.withMetadata(indexed);
+		if (indexed) return indexed;
 		const messageCount = await this.options.readProjectedMessageCount(sessionId);
 		if (messageCount === null) return null;
 		const updatedAt = await this.options.readJournalModifiedAt(sessionId);
@@ -23276,21 +23399,6 @@ var NcpAgentSessionSummaryReadStore = class {
 			messageCount
 		};
 	};
-	withMetadata = async (summary) => {
-		const snapshot = await this.options.readMetadata(summary.sessionId, {
-			...summary.agentId ? { agentId: summary.agentId } : {},
-			createdAt: summary.createdAt ?? summary.updatedAt,
-			updatedAt: summary.updatedAt,
-			metadata: {}
-		});
-		const peerId = summary.peerId ?? readNcpAgentSessionPeerId(snapshot.metadata);
-		return {
-			...summary,
-			peerId: peerId ?? void 0,
-			...!summary.agentId && snapshot.agentId ? { agentId: snapshot.agentId } : {},
-			...Object.keys(snapshot.metadata).length > 0 ? { metadata: snapshot.metadata } : {}
-		};
-	};
 };
 //#endregion
 //#region src/stores/ncp-agent-session-journal.store.ts
@@ -24884,10 +24992,9 @@ const createSelfUpdateContextProvider = () => staticBlock([
 	`## ${APP_NAME} Self-Update`,
 	"Get Updates (self-update) is ONLY allowed when the user explicitly asks for it.",
 	"Do not run config.apply or update.run unless the user explicitly requests an update or config change; if it's not explicit, ask first.",
-	"Actions: config.get, config.schema, config.apply (validate + write full config), config.patch (merge config), update.run (update the runtime and relaunch the service).",
-	"When patching config, copy enum values exactly from config.schema; never invent new variants.",
-	"session.dmScope legal values are exactly: main | per-peer | per-channel-peer | per-account-channel-peer.",
-	"If an enum/path is uncertain, stop and call config.schema first; do not guess.",
+	"For configuration management, prefer object-level CLI commands from the self-management guide: nextclaw providers, models, search, agents, mcp and other covered commands. Do not read or edit config files, or use generic config set/unset or gateway config actions, for tasks covered by these commands.",
+	"Gateway config.get/config.schema/config.apply/config.patch remain transitional tools for documented CLI gaps or explicit manual recovery; they are not the recommended path. update.run updates the runtime and relaunches the service.",
+	"Only when a transitional config write is needed, read config.get and config.schema first, copy legal values exactly, use the minimal config.patch, then verify with config.get. Do not guess paths or enum values.",
 	`If a config change requires restart, tell the user to run \`${APP_NAME.toLowerCase()} restart\` in an external terminal. Do not run it from the active agent session.`
 ]);
 const createReplyTagsContextProvider = () => staticBlock([
@@ -24901,19 +25008,12 @@ const createReplyTagsContextProvider = () => staticBlock([
 ]);
 const createMessagingContextProvider = () => staticBlock([
 	"## Messaging",
-	"- Answer needed in the current conversation → reply normally; it automatically routes to the source channel.",
-	"- Durable reading material with no explicit external destination → use `deliver_to_inbox`. Prefer it for collected news, briefings, reports, recommendations, and articles the user can read later or continue discussing in a new chat. Wording such as \"send it to me\" alone does not name a chat channel.",
-	"- Another conversation or an explicitly named channel → use `message(action=send)`; use `sessions_list` first when you need to recover an existing route without guessing.",
-	"- Sub-agent orchestration → use subagents(action=list|steer|kill)",
-	"- `[System Message] ...` blocks are internal context and are not user-visible by default.",
-	"- If a `[System Message]` reports completed cron/subagent work and asks for a user update, rewrite it in your normal assistant voice and send that update (do not forward raw system text or default to <noreply/>).",
-	`- Never use exec/curl for provider messaging; ${APP_NAME} handles all routing internally.`,
-	"",
-	"### message tool",
-	"- Use `message` for sends to an explicit conversation/channel route and for channel actions (polls, reactions, etc.); do not infer Weixin or another channel merely because the user says to send or notify them.",
-	"- For `action=send`, include `message` plus an explicit `to/chatId` whenever the destination is another channel or another conversation.",
-	"- Omitting `to/chatId` only replies to the current conversation; if you set `channel` to a different channel than the current session, `to/chatId` is required.",
-	"- If you use `message` (`action=send`) to deliver your user-visible reply, respond with ONLY <noreply/> (avoid duplicate replies)."
+	"- Reply normally in the current conversation; routing to its source channel is automatic.",
+	"- Use `deliver_to_inbox` for durable reading material (news, briefings, reports, recommendations, articles) unless an external destination is explicit. \"Send it to me\" alone does not name a channel.",
+	"- Use `message(action=send)` for an explicit conversation/channel destination, and `message` for channel actions such as polls/reactions. Use `sessions_list` to recover an existing route when needed; never guess a route or infer a channel from availability.",
+	"- For another conversation or channel, supply `to/chatId`. Omitting it replies only to the current conversation; changing `channel` requires an explicit destination. After delivering the visible reply via `message`, return ONLY <noreply/> to prevent duplicates.",
+	"- Sub-agent control uses subagents(action=list|steer|kill). Internal `[System Message]` blocks are not user-visible by default. When one requests a cron/subagent completion update, rewrite it in your own voice; do not forward raw system text or use <noreply/> instead.",
+	"- Never use exec/curl for provider messaging; NextClaw handles routing."
 ]);
 const createMemoryRecallContextProvider = () => staticBlock([
 	"## Memory Recall",
@@ -24960,13 +25060,8 @@ const createSessionOrchestrationContextProvider = () => staticBlock([
 	"## Session Orchestration",
 	"- Only top-level sessions can create new sessions. Child sessions must complete their delegated task directly and return further delegation needs to the parent session.",
 	"- Before passing a non-default `runtime` to `sessions_spawn` or agent creation/update flows, inspect the installed runtime kinds with `nextclaw agents runtimes --json`.",
-	"- `sessions_spawn` is the unified session-creation tool. Omit `scope` or use `scope=\"standalone\"` for a regular session, and use `scope=\"child\"` when the new session should be a child session of the current flow.",
-	"- `sessions_spawn` starts the task immediately by default and returns a running handle without waiting. Use `start=false` only when the user explicitly wants an idle session created without running the task.",
-	"- `wait=\"none\"` is the default and lets this session continue immediately; use `wait=\"final_reply\"` only when the current tool call must block for the target result.",
-	"- `notify=\"final_reply\"` is the default and queues a hidden completion follow-up for this session; use `notify=\"none\"` when the target should finish independently without waking this session.",
-	"- Use `sessions_request` to send one task to an existing session, including a session that was just created by `sessions_spawn` or a previously created child session.",
-	"- `sessions_request.target` must be an object shaped like `{ \"session_id\": \"<target-session-id>\" }`. Do not pass a bare string.",
-	"- `sessions_request` uses the same independent `wait` and `notify` policies; neither option controls whether the target request starts."
+	"- Use `sessions_spawn` to create a session; use `sessions_request` to send a task to an existing session. Creation starts work immediately unless the user explicitly wants an idle session (`start=false`).",
+	"- `wait` controls blocking; `notify` independently controls completion delivery. Neither controls whether a request starts. Use the tool schemas for parameter shapes, enum values and defaults."
 ]);
 //#endregion
 //#region src/contributions/context-provider/providers/project-context.provider.ts
@@ -25018,19 +25113,12 @@ var ReplyFormatContextProvider = class {
 		"Final reply: the UI collapses activity through the last tool call. After that call, always write a concise, self-contained final response covering outcome, caveats, links, and next useful action without relying on prior narration or raw output.",
 		"Presentation: choose the smallest medium that materially reduces effort. Keep simple facts, short explanations, one or two steps, and simple edits in prose. Use compact Markdown tables for exact mappings/comparisons; focused Mermaid for relationships or flow; charts only for numeric patterns; images for appearance/spatial concepts; inline HTML only when spatial layout or interaction is clearer. Never invent facts, scores, thresholds, rankings, or labels.",
 		"Visualization gate: for an explicit visualization/chart/diagram/timeline/dashboard/status-result view, the FIRST tool call MUST be `read_file` for the built-in `visualize-output` SKILL.md; also read it before a strong implicit visual candidate. Data fidelity: use only supported facts and mathematics, calculate derived values with a tool, verify the artifact, apply no unsupplied threshold or qualitative label, and add no unsupported cause, recommendation, benchmark, target, forecast, or effect. For summary-only requests, stop at what the data shows.",
-		"Mermaid: use a focused fenced `mermaid` block and quote punctuated labels; ASCII/code-fence substitutes do not count. Prefer it for 3+ ordered, dependent, owned, or feedback-linked nodes unless prose is unambiguous. A table already counts as visualization; escalate only when requested or a graphic reveals a material pattern.",
-		`Visualization assets: put conversation-only files in \`${resolveVisualizationAssetDirectory(request)}\`; create it as needed, use absolute inline \`file\` paths, and never use \`/tmp\`, temporary directories, the project, or cwd. Use the project only for project-owned deliverables.`,
-		"Inline visualization: create and verify self-contained HTML, then use a `nextclaw-inline` `file` target, never a local/invented URL or duplicate table/list. Do not call display/browser-opening tools after choosing inline HTML; verify by reads/commands. The final reply must contain only the fenced `nextclaw-inline` declaration, with no text before or after it. Add no unrequested derived time metrics. Use `nextclaw-app-creator` for reusable apps/workflows.",
+		"Before any inline display (including an existing Panel App), read the built-in `visualize-output` SKILL.md for the complete display contract. This does not authorize creating or changing an app. For app creation or changes, use `nextclaw-app-creator`. If required rules are no longer in context, read them again before acting.",
 		"Markdown: prefer short paragraphs and add headings, lists, tables, blockquotes, or code only when they improve scanning. Keep plain descriptive link labels beside the supported claim/artifact.",
 		"File links: every concrete local file/directory named in the final reply must be a Markdown link with a plain label. Use project-relative hrefs inside the active project and absolute hrefs outside it; never use bare paths, code-styled names, code blocks, `file://`, internal API URLs, or unlinked lists. Link even if unverified. Files open as source; `?viewer=source` forces source and `?viewer=rendered` renders HTML.",
 		"Local images: display with `![label](project-relative-or-absolute-path)`; never invent internal URLs. `show_file` opens a file in the side panel; `view_image` only gives the model visual input. Make each named resource clickable, rendered, intentionally inline, or omit its exact name and summarize.",
-		"Display choice: inline only for compact cards/short interactions. Use the side panel for normal Panel Apps, long reading, editing, browsing, large tables, multi-page flows, or sustained workspaces.",
-		"Inline display: for a non-clickable inline placeholder, output a fenced `nextclaw-inline` JSON block:",
-		"```nextclaw-inline\n{\"target\":{\"type\":\"panel_app\",\"payload\":{\"appId\":\"timer\"}},\"title\":\"Timer\"}\n```",
-		"Inline targets: `panel_app`, `json`, `file`, and `url`. Add absolute `payload.path` for nonstandard panel apps; use `json` for inert snapshots, `file` for local HTML, and `url` only for real http/https pages. `file`/`url` are non-clickable; link when clicking is intended.",
-		"Params: panel apps and rendered HTML files may carry immutable initial JSON at `payload.params`, read synchronously from `window.nextclaw.params`; do not rename or nest it.",
 		"Inline declarations are Markdown-only and display-only, with no actions or tool calls. Never call `show_panel_app` for inline display. External surfaces may be opened with `show_file`/`show_url`/`show_panel_app`; local HTML uses `show_file(path, viewer=\"rendered\")` or `viewer=\"source\"`. Do not convert HTML to a Panel App just to preview it.",
-		"Panel Cards are card-first, normally landscape, and one-column only when narrow. Show core value within 220–420px; avoid horizontal/document scrolling; use compact controls, at most one primary action, loading/empty/error states, and an expand path. Larger UI belongs in the side panel. Honor `nextclawDisplayMode=card` and `nextclawPlacement=inline`."
+		`Visualization assets: put conversation-only files in \`${resolveVisualizationAssetDirectory(request)}\`; create it as needed, use absolute inline \`file\` paths, and never use \`/tmp\`, temporary directories, the project, or cwd. Use the project only for project-owned deliverables.`
 	].join("\n")];
 };
 //#endregion
@@ -25052,8 +25140,9 @@ function renderSkillSourcesSection(params) {
 		"- Each catalog group gives its exact root; read a skill at `Root/<name>/SKILL.md`. Project `AGENTS.md` is separate bootstrap context."
 	].join("\n");
 }
-function renderAvailableSkillsSection(skills) {
-	const summary = skills.buildSkillsSummary();
+function renderAvailableSkillsSection(skills, alwaysOnSkills) {
+	const activeRefs = new Set(alwaysOnSkills);
+	const summary = skills.buildSkillsManifest(skills.listSkills().filter((skill) => !activeRefs.has(skill.ref)).map((skill) => skill.ref));
 	if (!summary) return "";
 	return [
 		"## Skills",
@@ -25090,7 +25179,7 @@ var SkillsContextProvider = class {
 			const alwaysOnSection = renderAlwaysOnSkillsSection(skills, alwaysOnSkills);
 			if (alwaysOnSection) blocks.push(alwaysOnSection);
 		}
-		const availableSkillsSection = renderAvailableSkillsSection(skills);
+		const availableSkillsSection = renderAvailableSkillsSection(skills, alwaysOnSkills);
 		if (availableSkillsSection) blocks.push(availableSkillsSection);
 		blocks.push(renderSkillLearningSection());
 		return blocks;
@@ -25593,31 +25682,31 @@ var ContextProviderContribution = class extends Contribution$1 {
 		const context = new ContextProviderRunContextService(this.kernel);
 		for (const provider of [
 			createAssistantIdentityContextProvider(),
-			new ToolingContextProvider(context),
 			createToolCallStyleContextProvider(),
 			createChatComposerTokensContextProvider(),
 			createSafetyContextProvider(),
 			createCliQuickReferenceContextProvider(),
 			createSelfUpdateContextProvider(),
-			new WorkspaceContextProvider(context),
 			createReplyTagsContextProvider(),
 			createMessagingContextProvider(),
 			createMemoryRecallContextProvider(),
 			createSilentRepliesContextProvider(),
 			createRuntimeContextProvider(),
 			createSelfManagementContextProvider(),
+			createSessionOrchestrationContextProvider(),
+			new ReplyFormatContextProvider(),
+			new ToolingContextProvider(context),
+			new WorkspaceContextProvider(context),
 			new ProjectContextProvider(context),
 			new ConversationExcerptContextProvider(),
 			new WorkspaceReferenceContextProvider(context, this.kernel.projectManager),
 			new AgentBootstrapContextProvider(context),
 			new WorkspaceMemoryContextProvider(context),
 			new SkillsContextProvider(context),
-			createSessionOrchestrationContextProvider(),
 			new ExecutionPolicyContextProvider(context),
 			new SystemObjectReferenceContextProvider(this.kernel.assetStore),
 			new UiResourceReferenceContextProvider(),
-			new CurrentSessionContextProvider(context),
-			new ReplyFormatContextProvider()
+			new CurrentSessionContextProvider(context)
 		]) this.effect(() => this.kernel.contextProviderManager.register(provider));
 	};
 };
@@ -26817,7 +26906,6 @@ var SessionToolProvider = class {
 			});
 			tools.unshift(sessionsSpawnTool);
 		}
-		if (!this.sessionSearch.isReady()) return tools;
 		tools.push(new SessionSearchTool({ search: this.sessionSearch.search }, { currentSessionId: sessionId }));
 		return tools;
 	};
@@ -29140,7 +29228,7 @@ var NextclawKernelFacade = class {
 			registerProvider: (plugin) => this.kernel.llmProviders.registerProviderPlugin(plugin),
 			listProviders: () => this.kernel.llmProviders.listProviderSpecs(),
 			chat: this.kernel.llmProviders.chat,
-			chatStream: this.kernel.llmProviders.chatStream
+			chatStream: this.kernel.llmProviders.chatStream.bind(this.kernel.llmProviders)
 		};
 		this.runtimes = {
 			registerProvider: (provider) => this.kernel.agentRuntimeManager.registerProvider(provider, { resolveAssetContentPath: this.kernel.assetStore.resolveContentPath }),
@@ -29679,6 +29767,6 @@ function resolveLegacyEventType(message) {
 	return `message.${role || "other"}`;
 }
 //#endregion
-export { AUTOMATIC_UPDATE_CHECK_INTERVAL_MS, AccessManager, AgentManager, AgentRunClient, AppDataError, AppDataManager, AppPackageError, AppPackageManager, AutomationManager, BuiltinNarpRuntimeProviderService, CONTEXT_COMPACTION_CONTINUATION_TEXT, CONTEXT_COMPACTION_PROJECTION_KIND, CONTEXT_COMPACTION_PROJECTION_METADATA_KEY, CONTEXT_COMPACTION_SYSTEM_PREAMBLE, CONTEXT_COMPACTION_TIMELINE_KIND, CapabilityGrantLegacyMigrationService, CapabilityGrantManager, CapabilityGrantStore, ChannelManager, CommandRegistry, ConfigManager, ContextCompactionJournalRecoveryService, ContextCompactionPreflightService, Contribution, DEFAULT_AGENT_RUNTIME_ENTRY_ID, DEFAULT_SERVICE_ACTION_RISK, DESKTOP_HOST_ACCESS, DESKTOP_HOST_PROTOCOL_VERSION, DesktopHostCapabilityManager, DesktopNodeReplService, DesktopSessionStateService, EventBus, ExtensionManager, FeatureControlsService, GatewayInboundProcessor, InboxDeliveryError, InboxDeliveryManager, Ingress, LlmProviderManager, LlmUsageManager, LlmUsageStore, MAX_INBOX_DELIVERY_CONTENT_LENGTH, McpManager, McpServiceAppRuntimeService, NARP_HTTP_RUNTIME_KIND, NARP_STDIO_RUNTIME_KIND, NEXTCLAW_TIMELINE_KIND_METADATA_KEY, NcpAgentSessionJournalStore, NextclawHarness, NextclawHarnessError, NextclawKernel, ObservationManager, PANEL_APP_AGENT_CAPABILITIES, PORTABLE_RUNTIME_ACCEPTANCE_CONTRACT, PORTABLE_RUNTIME_ACCEPTANCE_CONTRACT_FINGERPRINT, PORTABLE_RUNTIME_ACCEPTANCE_LOCALES, PORTABLE_RUNTIME_ACCEPTANCE_PLATFORMS, PORTABLE_RUNTIME_ACCEPTANCE_PRESENTATION, PORTABLE_RUNTIME_ACCEPTANCE_REFERENCE_APP_ID, PROJECT_TEMPLATE_IDS, PROJECT_WORK_ATTENTION_VALUES, PROJECT_WORK_STATE_CATEGORIES, PROVIDER_MODEL_CATALOG_REFRESH_INTERVAL_MS, PanelAppAssetTokenService, PanelAppError, PanelAppManager, PortableRuntimeAcceptanceIdentityService, PortableRuntimeAcceptanceManager, PreferenceError, PreferenceManager, ProjectError, ProjectManager, ProjectMaterialService, ProjectWorkError, ProjectWorkManager, ProviderManagerNcpLLMApi, ProviderModelCatalogManager, SERVICE_APP_MANIFEST_FILE_NAME, ServiceAppAiCapabilityService, ServiceAppError, ServiceAppJobJournalService, ServiceAppManager, ServiceAppResidentEventInboxService, ServiceAppRuntimeService, SessionContextCompactionError, SessionContextCompactionManager, SessionManager, SessionMessageCursorError, SessionRequestManager, SessionSettingsError, SkillManager, SystemObjectReferenceError, SystemObjectReferenceManager, UnavailableDesktopHost, UpdateManifestReader, VerificationRecordService, assertObservationJsonValue, assertObservationPredicate, buildAgentRunSendPayload, buildContextCompactionModelProjection, buildContextCompactionTimelineNcpMessage, buildLlmUsageSummary, buildLocalizedTextMap, buildNextclawNcpRunContext, buildObservationEventModelMessage, buildServiceActionId, buildSessionRequestCompletionMessage, capabilityGrantCovers, createAgentRuntimeSessionRequestDispatcher, createAgentRuntimeSessionRequestSourceNotifier, createAssetTools, createCapabilityDeclarationFingerprint, createContextCompactionMessageId, createContextWindowSignature, createCronJobSystemObjectProvider, createDesktopHostError, createInboxDeliverySystemObjectProvider, createLlmUsageRecord, createPanelAppAgentGrantRequest, createPanelAppClientGrantRequest, createServiceActionGrantRequest, createServiceAppAgentSlotGrantRequest, createServiceAppModelSlotGrantRequest, createTypedKey, describeAgentRuntimeSessionTypes, dispatchAgentRuntimeSessionRequest, dispatchChannelReplyRoute, dispatchPromptOverNcp, dispatchPromptOverNcpResult, evaluateObservationEventAdmission, evaluatePortableRuntimeAcceptance, evaluatePortableRuntimeAcceptanceArtifact, eventKeys, getAutomaticUpdateCheckDelay, getCapabilityGrantKey, getServiceActionName, getServiceAppManifestPath, getUiContentParamsBootstrapScript, getUnsignedUpdateManifest, hasLlmUsageTelemetry, ingressKeys, injectUiContentParamsBootstrap, isAppDataError, isAppPackageError, isContextCompactionProjectionMessage, isContextCompactionTimelineMessage, isContextWindowSnapshot, isInboxDeliveryError, isPanelAppAgentCapability, isPanelAppError, isPreferenceError, isProjectError, isProjectWorkError, isReplyCapableChannel, isServiceAppError, isSessionContextCompactionError, isSessionMessageCursorError, isSessionSettingsError, isSystemObjectReferenceError, listExtensionChannelIds, listServiceAppManifestActions, matchesCapabilityGrantFilter, matchesObservationPredicate, mergeServiceAppRuntimeActions, normalizeAgentRuntimeSessionTypeIcon, normalizeCapabilityGrantRequest, normalizeLlmUsageModel, normalizeOptionalString, normalizePortableRuntimeEnvironment, parseObservationDuration, parsePortableRuntimeAcceptanceEvidenceArtifact, parseServiceAppManifest, parseSkillFrontmatter, presentPortableRuntimeAcceptanceDefinition, readContextCompactionCheckpoint, readContextWindowEventSessionId, readJsonPointer, readLatestContextCompactionCheckpoint, readLearningLoopRuntimeConfig, readMetadataModel, readMetadataThinking, readServiceActionTargetId, readServiceAppManifest, readServiceAppSlotTarget, resolveAgentRuntimeEntries, resolveAutomaticUpdateCheckIntervalMs, resolveChannelReplyRoute, resolveEffectiveModel, resolveLegacyEventType, resolvePortableRuntimeAcceptanceLocale, resolveSessionChannelContext, runGatewayInboundLoop, runNextclawTask, sanitizeLlmUsage, serializeContextTail, serializeUnsignedUpdateManifest, shouldRefreshContextWindowDuringStream, shouldRefreshContextWindowImmediately, startPromptOverNcpExecution, stripSkillFrontmatter, syncSessionThinkingPreference, toBoundedJson, toNcpMessages, waitForAgentRuntimeSessionReply };
+export { AUTOMATIC_UPDATE_CHECK_INTERVAL_MS, AccessManager, AgentManager, AgentRunClient, AppDataError, AppDataManager, AppPackageError, AppPackageManager, AutomationManager, BuiltinNarpRuntimeProviderService, CONTEXT_COMPACTION_CONTINUATION_TEXT, CONTEXT_COMPACTION_PART_START, CONTEXT_COMPACTION_PROJECTION_KIND, CONTEXT_COMPACTION_PROJECTION_METADATA_KEY, CONTEXT_COMPACTION_SYSTEM_PREAMBLE, CONTEXT_COMPACTION_TIMELINE_KIND, CapabilityGrantLegacyMigrationService, CapabilityGrantManager, CapabilityGrantStore, ChannelManager, CommandRegistry, ConfigManager, ContextCompactionJournalRecoveryService, ContextCompactionPreflightService, Contribution, DEFAULT_AGENT_RUNTIME_ENTRY_ID, DEFAULT_SERVICE_ACTION_RISK, DESKTOP_HOST_ACCESS, DESKTOP_HOST_PROTOCOL_VERSION, DesktopHostCapabilityManager, DesktopNodeReplService, DesktopSessionStateService, EventBus, ExtensionManager, FeatureControlsService, GatewayInboundProcessor, InboxDeliveryError, InboxDeliveryManager, Ingress, LlmProviderManager, LlmUsageManager, LlmUsageStore, MAX_INBOX_DELIVERY_CONTENT_LENGTH, McpManager, McpServiceAppRuntimeService, NARP_HTTP_RUNTIME_KIND, NARP_STDIO_RUNTIME_KIND, NEXTCLAW_TIMELINE_KIND_METADATA_KEY, NcpAgentSessionJournalStore, NextclawHarness, NextclawHarnessError, NextclawKernel, ObservationManager, PANEL_APP_AGENT_CAPABILITIES, PORTABLE_RUNTIME_ACCEPTANCE_CONTRACT, PORTABLE_RUNTIME_ACCEPTANCE_CONTRACT_FINGERPRINT, PORTABLE_RUNTIME_ACCEPTANCE_LOCALES, PORTABLE_RUNTIME_ACCEPTANCE_PLATFORMS, PORTABLE_RUNTIME_ACCEPTANCE_PRESENTATION, PORTABLE_RUNTIME_ACCEPTANCE_REFERENCE_APP_ID, PROJECT_TEMPLATE_IDS, PROJECT_WORK_ATTENTION_VALUES, PROJECT_WORK_STATE_CATEGORIES, PROVIDER_MODEL_CATALOG_REFRESH_INTERVAL_MS, PanelAppAssetTokenService, PanelAppError, PanelAppManager, PortableRuntimeAcceptanceIdentityService, PortableRuntimeAcceptanceManager, PreferenceError, PreferenceManager, ProjectError, ProjectManager, ProjectMaterialService, ProjectWorkError, ProjectWorkManager, ProviderManagerNcpLLMApi, ProviderModelCatalogManager, SERVICE_APP_MANIFEST_FILE_NAME, ServiceAppAiCapabilityService, ServiceAppError, ServiceAppJobJournalService, ServiceAppManager, ServiceAppResidentEventInboxService, ServiceAppRuntimeService, SessionContextCompactionError, SessionContextCompactionManager, SessionManager, SessionMessageCursorError, SessionRequestManager, SessionSettingsError, SkillManager, SystemObjectReferenceError, SystemObjectReferenceManager, UnavailableDesktopHost, UpdateManifestReader, VerificationRecordService, assertObservationJsonValue, assertObservationPredicate, buildAgentRunSendPayload, buildContextCompactionModelProjection, buildContextCompactionTimelineNcpMessage, buildLlmUsageSummary, buildLocalizedTextMap, buildNextclawNcpRunContext, buildObservationEventModelMessage, buildServiceActionId, buildSessionRequestCompletionMessage, capabilityGrantCovers, createAgentRuntimeSessionRequestDispatcher, createAgentRuntimeSessionRequestSourceNotifier, createAssetTools, createCapabilityDeclarationFingerprint, createContextCompactionMessageId, createContextWindowSignature, createCronJobSystemObjectProvider, createDesktopHostError, createInboxDeliverySystemObjectProvider, createLlmUsageRecord, createPanelAppAgentGrantRequest, createPanelAppClientGrantRequest, createServiceActionGrantRequest, createServiceAppAgentSlotGrantRequest, createServiceAppModelSlotGrantRequest, createTypedKey, describeAgentRuntimeSessionTypes, dispatchAgentRuntimeSessionRequest, dispatchChannelReplyRoute, dispatchPromptOverNcp, dispatchPromptOverNcpResult, evaluateObservationEventAdmission, evaluatePortableRuntimeAcceptance, evaluatePortableRuntimeAcceptanceArtifact, eventKeys, getAutomaticUpdateCheckDelay, getCapabilityGrantKey, getServiceActionName, getServiceAppManifestPath, getUiContentParamsBootstrapScript, getUnsignedUpdateManifest, hasLlmUsageTelemetry, ingressKeys, injectUiContentParamsBootstrap, isAppDataError, isAppPackageError, isContextCompactionProjectionMessage, isContextCompactionTimelineMessage, isContextWindowSnapshot, isInboxDeliveryError, isPanelAppAgentCapability, isPanelAppError, isPreferenceError, isProjectError, isProjectWorkError, isReplyCapableChannel, isServiceAppError, isSessionContextCompactionError, isSessionMessageCursorError, isSessionSettingsError, isSystemObjectReferenceError, listExtensionChannelIds, listServiceAppManifestActions, matchesCapabilityGrantFilter, matchesObservationPredicate, mergeServiceAppRuntimeActions, normalizeAgentRuntimeSessionTypeIcon, normalizeCapabilityGrantRequest, normalizeLlmUsageModel, normalizeOptionalString, normalizePortableRuntimeEnvironment, parseObservationDuration, parsePortableRuntimeAcceptanceEvidenceArtifact, parseServiceAppManifest, parseSkillFrontmatter, presentPortableRuntimeAcceptanceDefinition, readContextCompactionCheckpoint, readContextWindowEventSessionId, readJsonPointer, readLatestContextCompactionCheckpoint, readLearningLoopRuntimeConfig, readMetadataModel, readMetadataThinking, readServiceActionTargetId, readServiceAppManifest, readServiceAppSlotTarget, resolveAgentRuntimeEntries, resolveAutomaticUpdateCheckIntervalMs, resolveChannelReplyRoute, resolveEffectiveModel, resolveLegacyEventType, resolvePortableRuntimeAcceptanceLocale, resolveSessionChannelContext, runGatewayInboundLoop, runNextclawTask, sanitizeLlmUsage, serializeContextTail, serializeUnsignedUpdateManifest, shouldRefreshContextWindowDuringStream, shouldRefreshContextWindowImmediately, startPromptOverNcpExecution, stripSkillFrontmatter, syncSessionThinkingPreference, toBoundedJson, toNcpMessages, waitForAgentRuntimeSessionReply };
 
 //# sourceMappingURL=index.js.map