@nextclaw/kernel 0.10.1 → 0.10.3

package/dist/index.js

@@ -1,10 +1,10 @@
 import { AUTOMATIC_UPDATE_CHECK_INTERVAL_MS, getAutomaticUpdateCheckDelay, resolveAutomaticUpdateCheckIntervalMs } from "./utils/automatic-update-check.utils.js";
 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, DIAGNOSTIC_CORRELATION_METADATA_KEY, DiagnosticRuntime, EditFileTool, ExecTool, ExtensionChannelAdapter, GatewayTool, InputBudgetPruner, LLMProvider, ListDirTool, LiteLLMProvider, MAX_SESSION_SEARCH_LIMIT, MemoryGetTool, MemorySearchTool, MemoryStore, MessageBus, MessageTool, ProviderModelDiscoveryService, 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, 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, resolveSessionProjectContext, resolveSessionWorkspacePath, resolveThinkingLevel, safeFilename, sanitizeOutboundAssistantContent, saveConfig, summarizeSessionRequestTask, toExtensionConfigView, updateAgentProfile } from "@nextclaw/core";
+import { APP_NAME, AgentRouteResolver, BUILTIN_MAIN_AGENT_ID, CLEAR_THINKING_TOKENS, CONTEXT_COMPACTION_METADATA_KEY, ConfigSchema, ContextCompactionService, ContextWindowBudgetService, CronService, CronTool, DEFAULT_PANELS_DIR, DEFAULT_SERVICE_APPS_DIR, DEFAULT_SESSION_SEARCH_LIMIT, DEFAULT_WORKSPACE_REPOSITORY_IDENTITY_RESOLVER, 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, 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, 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, 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 { 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 { LocalAssetStore, buildAssetContentPath, buildNcpUserContent, buildOpenAiFunctionTool, isTextLikeAsset, ncpMessageToOpenAiMessages, validateToolArgs } from "@nextclaw/ncp-agent-runtime";
 import { createHash, createHmac, randomBytes, randomUUID, scryptSync, timingSafeEqual } from "node:crypto";
 import { catchError, filter, from, lastValueFrom, tap } from "rxjs";
 import { DefaultNcpAgentConversationStateManager, insertMessageByTimeline, mergeToolExecutionTiming } from "@nextclaw/ncp-toolkit";
@@ -64,6 +64,7 @@ var AgentManager = class {
 		return {
 			...profile,
 			contextTokens,
+			maxToolIterations: profile.maxToolIterations ?? config.agents.defaults.maxToolIterations,
 			model: profile.model ?? config.agents.defaults.model,
 			reservedContextTokens: ContextWindowBudgetService.resolveReservedContextTokens({
 				contextTokens,
@@ -188,135 +189,6 @@ var ContextCompactionJournalRecoveryService = class {
 	};
 };
 //#endregion
-//#region src/utils/agent-run-metadata.utils.ts
-const AGENT_RUN_MESSAGE_RUN_SPEC_METADATA_KEY = "run_spec";
-const LEGACY_RUN_METADATA_KEYS = [
-	"account_id",
-	"agent_id",
-	"chat_id",
-	"preferred_model",
-	"project_root",
-	"runtime",
-	"sender_id",
-	"session_key",
-	"session_type"
-];
-function stripLegacyRunMetadata(metadata) {
-	const nextMetadata = structuredClone(metadata);
-	for (const key of LEGACY_RUN_METADATA_KEYS) delete nextMetadata[key];
-	return nextMetadata;
-}
-function buildRunMetadata(params) {
-	const { message, metadata, route } = params;
-	return {
-		...stripLegacyRunMetadata({
-			...message.metadata ?? {},
-			...metadata ?? {}
-		}),
-		channel: message.channel,
-		chatId: message.chatId,
-		accountId: route.accountId,
-		agentId: route.agentId,
-		sessionKey: route.sessionKey,
-		senderId: message.senderId
-	};
-}
-//#endregion
-//#region src/utils/ncp-message-bridge.utils.ts
-function normalizeString$1(value) {
-	if (typeof value !== "string") return null;
-	const trimmed = value.trim();
-	return trimmed.length > 0 ? trimmed : null;
-}
-function ensureIsoTimestamp(value, fallback) {
-	if (typeof value !== "string") return fallback;
-	const timestamp = Date.parse(value);
-	if (!Number.isFinite(timestamp)) return fallback;
-	return new Date(timestamp).toISOString();
-}
-function serializeToolArgs(args) {
-	if (typeof args === "string") return args;
-	return JSON.stringify(args ?? {});
-}
-function serializeLegacyContent(parts) {
-	const text = parts.filter(isTextLikePart).map((part) => part.text).join("");
-	if (text.length > 0) return text;
-	if (parts.length === 0) return "";
-	return structuredClone(parts);
-}
-function extractTextFromNcpMessage(message) {
-	if (!message) return "";
-	return (message.role === "assistant" ? sanitizeAssistantReplyTags(message) : message).parts.filter(isTextLikePart).map((part) => part.text).join("");
-}
-function isTextLikePart(part) {
-	return part.type === "text" || part.type === "rich-text";
-}
-function buildLegacyUserContent(parts, options = {}) {
-	const content = buildNcpUserContent(parts, { assetStore: options.assetStore });
-	if (content === "") return serializeLegacyContent(parts);
-	return content;
-}
-function buildLegacyAssistantMessages(message, timestamp) {
-	const textContent = extractTextFromNcpMessage(message);
-	const reasoningParts = message.parts.filter((part) => part.type === "reasoning");
-	const reasoningContent = reasoningParts.map((part) => part.text).join("");
-	const toolInvocations = message.parts.filter((part) => part.type === "tool-invocation");
-	const assistantMessage = {
-		role: "assistant",
-		content: textContent,
-		timestamp,
-		ncp_message_id: message.id,
-		ncp_parts: structuredClone(message.parts)
-	};
-	if (typeof message.metadata?.reply_to === "string" && message.metadata.reply_to.trim().length > 0) assistantMessage.reply_to = message.metadata.reply_to.trim();
-	if (reasoningParts.length > 0) assistantMessage.reasoning_content = reasoningContent;
-	if (toolInvocations.length > 0) assistantMessage.tool_calls = toolInvocations.map((toolInvocation, index) => ({
-		id: toolInvocation.toolCallId ?? `${message.id}:tool:${index}`,
-		type: "function",
-		function: {
-			name: toolInvocation.toolName,
-			arguments: serializeToolArgs(toolInvocation.args)
-		}
-	}));
-	const messages = [assistantMessage];
-	for (const toolInvocation of toolInvocations) {
-		if (toolInvocation.state !== "result") continue;
-		messages.push({
-			role: "tool",
-			name: toolInvocation.toolName,
-			tool_call_id: toolInvocation.toolCallId,
-			content: typeof toolInvocation.result === "string" ? toolInvocation.result : JSON.stringify(toolInvocation.result ?? null),
-			...toolInvocation.resultContentItems ? { ncp_tool_result_content_items: structuredClone(toolInvocation.resultContentItems) } : {},
-			timestamp,
-			ncp_message_id: message.id
-		});
-	}
-	return messages;
-}
-function buildLegacyNonAssistantMessage(message, timestamp, options) {
-	return {
-		role: message.role === "service" && options.serviceRole === "system" ? "system" : message.role,
-		content: buildLegacyUserContent(message.parts, options),
-		timestamp,
-		ncp_message_id: message.id,
-		ncp_parts: structuredClone(message.parts),
-		...message.metadata ? { ncp_metadata: structuredClone(message.metadata) } : {}
-	};
-}
-function toLegacyMessages(messages, options = {}) {
-	const legacyMessages = [];
-	for (const rawMessage of messages) {
-		const message = rawMessage.role === "assistant" ? sanitizeAssistantReplyTags(rawMessage) : rawMessage;
-		const timestamp = ensureIsoTimestamp(message.timestamp, (/* @__PURE__ */ new Date()).toISOString());
-		if (message.role === "assistant") {
-			legacyMessages.push(...buildLegacyAssistantMessages(message, timestamp));
-			continue;
-		}
-		legacyMessages.push(buildLegacyNonAssistantMessage(message, timestamp, options));
-	}
-	return legacyMessages;
-}
-//#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");
@@ -938,6 +810,13 @@ 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) => ({
+		...providerMessage,
+		ncp_message_id: message.id,
+		timestamp: message.timestamp
+	})));
+}
 function estimateCompactionProjectionOverhead(phase) {
 	const summaryPlanOverhead = estimateInputTokens({
 		role: "user",
@@ -1006,8 +885,9 @@ var ContextCompactionPreflightService = class {
 	compactionService = new ContextCompactionService();
 	contextWindowBudgetService = new ContextWindowBudgetService();
 	summaryGenerationService;
-	constructor(agentManager, providerManager) {
+	constructor(agentManager, providerManager, assetStore = null) {
 		this.agentManager = agentManager;
+		this.assetStore = assetStore;
 		this.summaryGenerationService = new ContextCompactionSummaryGenerationService(providerManager);
 	}
 	preview = (params) => {
@@ -1025,7 +905,7 @@ var ContextCompactionPreflightService = class {
 		const contextBlockInputTokens = estimateInputTokens(contextBlockMessages);
 		const toolInputTokens = estimateToolInputTokens(tools);
 		const snapshotFixedInputTokens = fixedInputTokens ?? contextBlockInputTokens + toolInputTokens;
-		const messages = [...fixedInputTokens === void 0 ? contextBlockMessages : [], ...toLegacyMessages(projectedMessages)];
+		const messages = [...fixedInputTokens === void 0 ? contextBlockMessages : [], ...toCompactionModelMessages(projectedMessages, this.assetStore)];
 		return buildContextWindowSnapshotFromBudget({
 			budget: this.contextWindowBudgetService.evaluate({
 				messages,
@@ -1057,7 +937,7 @@ var ContextCompactionPreflightService = class {
 			sessionMessages: ncpMessages
 		}).messages : ncpMessages.filter((message) => !isContextCompactionTimelineMessage(message));
 		const contextBlockMessages = buildContextBlockInputMessages(contextBlocks);
-		const messages = [...contextBlockMessages, ...toLegacyMessages(projectedMessages)];
+		const messages = [...contextBlockMessages, ...toCompactionModelMessages(projectedMessages, this.assetStore)];
 		const preservableUserMessageIds = ncpMessages.flatMap((message) => message.role === "user" ? [message.id] : []);
 		const fixedInputTokens = estimateToolInputTokens(tools);
 		const snapshotFixedInputTokens = estimateInputTokens(contextBlockMessages) + fixedInputTokens;
@@ -1069,6 +949,7 @@ var ContextCompactionPreflightService = class {
 		});
 		const plan = trigger === "automatic" && !budget.shouldCompact ? null : this.compactionService.prepareForModelInput({
 			messages,
+			coverLeadingSystemMessage: contextBlockMessages.length === 0 && isContextCompactionProjectionMessage(projectedMessages[0]),
 			contextTokens,
 			compactionThresholdTokens: trigger === "manual" ? 0 : budget.triggerTokens,
 			fixedInputTokens,
@@ -1156,7 +1037,7 @@ var ContextCompactionPreflightService = class {
 			sessionMessages: [...pending.sessionMessages, timelineMessage]
 		}).messages;
 		const budget = this.contextWindowBudgetService.evaluate({
-			messages: [...pending.contextBlockMessages, ...toLegacyMessages(projectedMessages, { serviceRole: "system" })],
+			messages: [...pending.contextBlockMessages, ...toCompactionModelMessages(projectedMessages, this.assetStore)],
 			contextTokens: pending.contextTokens,
 			fixedInputTokens: pending.plan.fixedInputTokens,
 			reservedContextTokens: pending.reservedContextTokens
@@ -1193,11 +1074,11 @@ const MINIMUM_CONFIGURABLE_CONTEXT_TOKENS = 1e3;
 var AgentContextWindowManager = class {
 	runInputBudgetBySession = /* @__PURE__ */ new Map();
 	preflightService;
-	constructor(agentManager, contextProviderManager, toolProviderManager) {
+	constructor(agentManager, contextProviderManager, toolProviderManager, assetStore = null) {
 		this.agentManager = agentManager;
 		this.contextProviderManager = contextProviderManager;
 		this.toolProviderManager = toolProviderManager;
-		this.preflightService = new ContextCompactionPreflightService(agentManager);
+		this.preflightService = new ContextCompactionPreflightService(agentManager, void 0, assetStore);
 	}
 	resolveRunSurface = async (request) => {
 		const surface = await this.buildRunSurface(request);
@@ -1332,8 +1213,8 @@ var AgentContextWindowManager = class {
 //#region src/managers/agent-run-context-compaction.manager.ts
 var AgentRunContextCompactionManager = class {
 	preflightService;
-	constructor(agentManager, providerManager) {
-		this.preflightService = new ContextCompactionPreflightService(agentManager, providerManager);
+	constructor(agentManager, providerManager, assetStore = null) {
+		this.preflightService = new ContextCompactionPreflightService(agentManager, providerManager, assetStore);
 	}
 	runPreflight = (input) => {
 		return this.run(input, "automatic", input.phase ?? "pre-run");
@@ -1787,13 +1668,14 @@ var AgentRunInputDeliveryService = class {
 			input: this.toPendingInput(moved)
 		};
 	};
-	enqueuePreferredSteeringInput = (sessionRun, request, session) => {
+	promotePreferredSteeringInput = (sessionRun, queuedInputId, session) => {
 		try {
-			return this.agentRuntimeManager.getOrCreate({
+			if (this.agentRuntimeManager.getOrCreate({
 				agentRuntimeId: session.agentRuntimeId,
 				session,
 				sessionRun
-			}).capabilities?.nextStepInput === true ? sessionRun.enqueueNextStepRequest(request, session) : null;
+			}).capabilities?.nextStepInput !== true) return null;
+			return sessionRun.moveQueuedRequestToNextStep(queuedInputId);
 		} catch {
 			return null;
 		}
@@ -1964,6 +1846,40 @@ function createUnavailableAiExecutionMetadataEvent(params) {
 	};
 }
 //#endregion
+//#region src/utils/agent-run-metadata.utils.ts
+const AGENT_RUN_MESSAGE_RUN_SPEC_METADATA_KEY = "run_spec";
+const LEGACY_RUN_METADATA_KEYS = [
+	"account_id",
+	"agent_id",
+	"chat_id",
+	"preferred_model",
+	"project_root",
+	"runtime",
+	"sender_id",
+	"session_key",
+	"session_type"
+];
+function stripLegacyRunMetadata(metadata) {
+	const nextMetadata = structuredClone(metadata);
+	for (const key of LEGACY_RUN_METADATA_KEYS) delete nextMetadata[key];
+	return nextMetadata;
+}
+function buildRunMetadata(params) {
+	const { message, metadata, route } = params;
+	return {
+		...stripLegacyRunMetadata({
+			...message.metadata ?? {},
+			...metadata ?? {}
+		}),
+		channel: message.channel,
+		chatId: message.chatId,
+		accountId: route.accountId,
+		agentId: route.agentId,
+		sessionKey: route.sessionKey,
+		senderId: message.senderId
+	};
+}
+//#endregion
 //#region src/utils/agent-run-request.utils.ts
 function readOptionalString$12(value) {
 	if (typeof value !== "string") return;
@@ -2101,6 +2017,7 @@ function resolveRunSpec(params) {
 			agentId: session.agentId ?? request.agentId ?? defaultAgentId,
 			model,
 			requestedModel: request.model ?? null,
+			maxToolIterations: params.maxToolIterations,
 			maxTokens: request.maxTokens ?? modelMaxTokens,
 			thinkingEffort: request.thinkingEffort ?? session.thinkingEffort ?? null,
 			correlationId: request.correlationId
@@ -2120,6 +2037,7 @@ function attachRunSpecMetadata(params) {
 		model: spec.model,
 		modelSource,
 		requestedModel: request.model ?? null,
+		maxToolIterations: spec.maxToolIterations,
 		maxTokens: spec.maxTokens,
 		thinkingEffort: spec.thinkingEffort,
 		projectRoot: request.projectRoot ?? session.projectRoot ?? null,
@@ -2341,16 +2259,31 @@ function createIngressRunTriggerInput(params) {
 }
 function resolveRunTriggerMetadata(params) {
 	const { request, spec, startedAt } = params;
+	return resolveTargetRunTriggerMetadata({
+		request,
+		targetRunId: spec.runId,
+		fallbackTriggeredAt: startedAt
+	});
+}
+function resolveSteeringRunTriggerMetadata(params) {
+	return resolveTargetRunTriggerMetadata({
+		request: params.request,
+		targetRunId: params.targetRunId,
+		fallbackTriggeredAt: params.acceptedAt
+	});
+}
+function resolveTargetRunTriggerMetadata(params) {
+	const { request } = params;
 	const input = request.trigger ?? createIngressRunTriggerInput({
 		request,
 		source: "internal"
 	});
-	const triggeredAt = Number.isFinite(Date.parse(input.triggeredAt)) ? new Date(input.triggeredAt).toISOString() : startedAt;
+	const triggeredAt = Number.isFinite(Date.parse(input.triggeredAt)) ? new Date(input.triggeredAt).toISOString() : params.fallbackTriggeredAt;
 	return {
 		version: 1,
 		...structuredClone(input),
 		triggeredAt,
-		targetRunId: spec.runId
+		targetRunId: params.targetRunId
 	};
 }
 function createRunTriggerMetadataEvent(params) {
@@ -2383,7 +2316,7 @@ var AgentRunRequestManager = class {
 	runtimeRuns;
 	pendingInputs;
 	started = false;
-	constructor(agentRuntimeManager, agentManager, configManager, agentContextWindowManager, eventBus, ingress, sessionManager, sessionRunManager, diagnostics) {
+	constructor(agentRuntimeManager, agentManager, configManager, agentContextWindowManager, eventBus, ingress, sessionManager, sessionRunManager, diagnostics, executionClaims) {
 		this.agentRuntimeManager = agentRuntimeManager;
 		this.agentManager = agentManager;
 		this.configManager = configManager;
@@ -2393,6 +2326,7 @@ var AgentRunRequestManager = class {
 		this.sessionManager = sessionManager;
 		this.sessionRunManager = sessionRunManager;
 		this.diagnostics = diagnostics;
+		this.executionClaims = executionClaims;
 		this.pendingInputs = new AgentRunInputDeliveryService(agentRuntimeManager, sessionManager, sessionRunManager, this.publishRunQueueUpdated);
 		this.idempotency = new AgentRunRequestIdempotencyService(sessionManager, sessionRunManager);
 		this.runtimeRuns = new AgentRuntimeRunObserverService({
@@ -2466,7 +2400,8 @@ var AgentRunRequestManager = class {
 			sessionId: session.sessionId,
 			message: baseMessage
 		};
-		const steeringRequest = request.delivery === "prefer-steer" && sessionRun.isRunning() ? this.pendingInputs.enqueuePreferredSteeringInput(sessionRun, normalizedRequest, session) : null;
+		const queuedRequest = sessionRun.enqueueRequest(normalizedRequest, session);
+		const steeringRequest = request.delivery === "prefer-steer" && sessionRun.isRunning() ? this.pendingInputs.promotePreferredSteeringInput(sessionRun, queuedRequest.id, session) : null;
 		if (steeringRequest) {
 			this.publishRunQueueUpdated(session.sessionId);
 			return {
@@ -2477,7 +2412,6 @@ var AgentRunRequestManager = class {
 				delivery: "steered"
 			};
 		}
-		const queuedRequest = sessionRun.enqueueRequest(normalizedRequest, session);
 		const activeRequest = sessionRun.beginNextRun();
 		this.publishRunQueueUpdated(session.sessionId);
 		if (activeRequest?.id === queuedRequest.id) await this.startQueuedRun(sessionRun, activeRequest);
@@ -2493,20 +2427,17 @@ var AgentRunRequestManager = class {
 	startQueuedRun = async (sessionRun, activeRequest) => {
 		const { request, session } = activeRequest;
 		const requestRunStartedAt = (/* @__PURE__ */ new Date()).toISOString();
-		const model = request.model ?? session.model ?? this.configManager.getDefaultModel();
-		const { modelSource, spec } = resolveRunSpec({
-			defaultAgentId: this.agentManager.getDefaultAgentId(),
-			model,
-			modelMaxTokens: this.configManager.getModelMaxTokens(model),
-			request,
-			runId: activeRequest.runId,
-			session
-		});
+		const { modelSource, spec } = this.resolveQueuedRunSpec(activeRequest);
 		const trigger = resolveRunTriggerMetadata({
 			request,
 			spec,
 			startedAt: requestRunStartedAt
 		});
+		const executionClaim = await this.claimSessionExecutionOrFail({
+			requestRunStartedAt,
+			sessionRun,
+			spec
+		});
 		const message = attachRunSpecMetadata({
 			message: {
 				...request.message,
@@ -2550,10 +2481,10 @@ var AgentRunRequestManager = class {
 			spec,
 			trigger
 		});
-		await sessionRun.applyEvents([messageSentEvent, triggerEvent]);
-		this.publishNcpEvent(messageSentEvent);
-		this.publishNcpEvent(triggerEvent);
 		try {
+			await sessionRun.applyEvents([messageSentEvent, triggerEvent]);
+			this.publishNcpEvent(messageSentEvent);
+			this.publishNcpEvent(triggerEvent);
 			const runtime = this.agentRuntimeManager.getOrCreate({
 				agentRuntimeId: session.agentRuntimeId,
 				session,
@@ -2572,9 +2503,11 @@ var AgentRunRequestManager = class {
 				requestRunStartedAt,
 				runtime,
 				spec,
-				parentCorrelationId
+				parentCorrelationId,
+				executionClaim
 			});
 		} catch (error) {
+			this.releaseExecutionClaim(executionClaim);
 			const classification = classifyDiagnosticError(error, activeRequest.signal);
 			this.diagnostics?.record({
 				domain: "agent.run",
@@ -2598,10 +2531,54 @@ var AgentRunRequestManager = class {
 			throw error;
 		}
 	};
-	startRuntimeRun = (params) => this.runtimeRuns.start({
-		...params,
-		onSettled: this.startNextQueuedRun
-	});
+	resolveQueuedRunSpec = (activeRequest) => {
+		const { request, session } = activeRequest;
+		const model = request.model ?? session.model ?? this.configManager.getDefaultModel();
+		const defaultAgentId = this.agentManager.getDefaultAgentId();
+		const agentId = session.agentId ?? request.agentId ?? defaultAgentId;
+		const maxToolIterations = this.agentManager.resolveAgentProfileForRun({
+			agentId,
+			requestMetadata: request.metadata,
+			storedAgentId: session.agentId
+		}).maxToolIterations;
+		return resolveRunSpec({
+			defaultAgentId,
+			model,
+			modelMaxTokens: this.configManager.getModelMaxTokens(model),
+			maxToolIterations,
+			request,
+			runId: activeRequest.runId,
+			session
+		});
+	};
+	claimSessionExecutionOrFail = async (params) => {
+		const { requestRunStartedAt, sessionRun, spec } = params;
+		const acquired = this.executionClaims?.tryAcquire(`session:${sessionRun.sessionId}`);
+		if (!acquired || acquired.acquired) return acquired?.claim;
+		const error = /* @__PURE__ */ new Error(`Session already has an active run owned by another NextClaw process: ${sessionRun.sessionId}`);
+		await this.publishRunStartupFailure({
+			error,
+			requestRunStartedAt,
+			sessionRun,
+			spec
+		});
+		this.startNextQueuedRun(sessionRun);
+		throw error;
+	};
+	startRuntimeRun = (params) => {
+		const { executionClaim, ...runtimeParams } = params;
+		this.runtimeRuns.start({
+			...runtimeParams,
+			onSettled: (sessionRun) => {
+				this.releaseExecutionClaim(executionClaim);
+				this.startNextQueuedRun(sessionRun);
+			}
+		});
+	};
+	releaseExecutionClaim = (claim) => {
+		if (!claim) return;
+		claim.release();
+	};
 	publishRunStartupFailure = async (params) => {
 		const { error, requestRunStartedAt, sessionRun, spec } = params;
 		const metadataEvent = createUnavailableAiExecutionMetadataEvent({
@@ -3793,25 +3770,40 @@ var AppPackageManager = class {
 			throw error;
 		}
 	};
-	listActiveComponentSources = async () => {
+	listActiveComponentSources = async () => (await this.listActiveComponentSourcesWithDiagnostics()).sources;
+	listActiveComponentSourcesWithDiagnostics = async () => {
 		const records = await this.registryService.listApps();
-		return (await Promise.all(records.filter((record) => record.enabled).map(async (record) => {
-			await this.installationService.assertVersionIntegrity(record.appId, record.activeVersion);
-			const version = record.installedVersions[record.activeVersion];
-			if (!version || version.manifestSchemaVersion !== 2) return [];
-			return (version.components ?? []).map((component) => ({
-				kind: component.kind,
-				id: component.id,
-				packageId: record.appId,
-				packageVersion: record.activeVersion,
-				sourcePath: component.componentDirectory,
-				manifestPath: component.manifestPath,
-				dataDirectory: record.dataDirectory,
-				instanceId: record.defaultInstance.id,
-				storage: record.defaultInstance.storage,
-				...this.resolveSecurity(version, record.appId)
-			}));
-		}))).flat();
+		const results = await Promise.all(records.filter((record) => record.enabled).map(async (record) => {
+			try {
+				await this.installationService.assertVersionIntegrity(record.appId, record.activeVersion);
+				const version = record.installedVersions[record.activeVersion];
+				if (!version || version.manifestSchemaVersion !== 2) return { sources: [] };
+				return { sources: (version.components ?? []).map((component) => ({
+					kind: component.kind,
+					id: component.id,
+					packageId: record.appId,
+					packageVersion: record.activeVersion,
+					sourcePath: component.componentDirectory,
+					manifestPath: component.manifestPath,
+					dataDirectory: record.dataDirectory,
+					instanceId: record.defaultInstance.id,
+					storage: record.defaultInstance.storage,
+					...this.resolveSecurity(version, record.appId)
+				})) };
+			} catch (error) {
+				return {
+					sources: [],
+					unavailablePackage: {
+						appId: record.appId,
+						message: error instanceof Error ? error.message : String(error)
+					}
+				};
+			}
+		}));
+		return {
+			sources: results.flatMap((result) => result.sources),
+			unavailablePackages: results.flatMap((result) => result.unavailablePackage ?? [])
+		};
 	};
 	listOperations = async () => await this.operationManager.list();
 	startOperation = async (input) => {
@@ -8034,6 +8026,26 @@ function isMissingFileError$2(error) {
 	return isRecord$13(error) && error.code === "ENOENT";
 }
 //#endregion
+//#region src/utils/ncp-message-bridge.utils.ts
+function normalizeString$1(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+function ensureIsoTimestamp(value, fallback) {
+	if (typeof value !== "string") return fallback;
+	const timestamp = Date.parse(value);
+	if (!Number.isFinite(timestamp)) return fallback;
+	return new Date(timestamp).toISOString();
+}
+function extractTextFromNcpMessage(message) {
+	if (!message) return "";
+	return (message.role === "assistant" ? sanitizeAssistantReplyTags(message) : message).parts.filter(isTextLikePart).map((part) => part.text).join("");
+}
+function isTextLikePart(part) {
+	return part.type === "text" || part.type === "rich-text";
+}
+//#endregion
 //#region src/services/agent-run-client.service.ts
 function readEventCorrelationId(event) {
 	if (!("payload" in event)) return;
@@ -9158,7 +9170,8 @@ var PanelAppManager = class {
 		return {
 			workspacePath,
 			panelsPath,
-			entries: (await Promise.all(sources.map(({ source, packageSource }) => this.entryPresenter.build(source, appState.apps[encodePanelAppId(source.sourceName)] ?? {}, packageSource, appState.mainSidebarAppIds)))).sort(this.entryPresenter.compare)
+			entries: (await Promise.all(sources.map(({ source, packageSource }) => this.entryPresenter.build(source, appState.apps[encodePanelAppId(source.sourceName)] ?? {}, packageSource, appState.mainSidebarAppIds)))).sort(this.entryPresenter.compare),
+			unavailablePackages: await this.params.listPackageComponentDiagnostics?.() ?? []
 		};
 	};
 	getPanelAppContent = async (id, sourcePath) => {
@@ -9489,13 +9502,31 @@ var SessionPendingInputs = class {
 			intendedRunId
 		});
 	};
-	moveNextRunToNextStep = (requestId, intendedRunId) => {
+	moveNextRunToNextStep = (requestId, intendedRunId, activeRunSpec) => {
 		const index = this.nextRun.findIndex(({ id }) => id === requestId);
 		if (index < 0) return null;
 		const [request] = this.nextRun.splice(index, 1);
 		if (!request) return null;
-		this.enqueueNextStep(request, intendedRunId);
-		return this.toPendingRequest(request, "steering", intendedRunId);
+		const steeringRequest = {
+			...request,
+			request: {
+				...request.request,
+				message: {
+					...request.request.message,
+					metadata: {
+						...request.request.message.metadata ?? {},
+						...activeRunSpec ? { [AGENT_RUN_MESSAGE_RUN_SPEC_METADATA_KEY]: structuredClone(activeRunSpec) } : {},
+						[NCP_RUN_TRIGGER_METADATA_KEY]: resolveSteeringRunTriggerMetadata({
+							request: request.request,
+							targetRunId: intendedRunId,
+							acceptedAt: (/* @__PURE__ */ new Date()).toISOString()
+						})
+					}
+				}
+			}
+		};
+		this.enqueueNextStep(steeringRequest, intendedRunId);
+		return this.toPendingRequest(steeringRequest, "steering", intendedRunId);
 	};
 	list = () => [...this.nextStep.map((request) => this.toPendingRequest(request, "steering", request.intendedRunId)), ...this.nextRun.map((request) => this.toPendingRequest(request, "queued", null))];
 	listNextRun = () => structuredClone(this.nextRun);
@@ -9547,6 +9578,13 @@ var SessionPendingInputs = class {
 function isConversationStateEvent(event) {
 	return event.type !== NcpEventType.ContextWindowUpdated;
 }
+function findRunSpec(messages, runId) {
+	for (let index = messages.length - 1; index >= 0; index -= 1) {
+		const runSpec = messages[index]?.metadata?.[AGENT_RUN_MESSAGE_RUN_SPEC_METADATA_KEY];
+		if (runSpec && typeof runSpec === "object" && !Array.isArray(runSpec) && runSpec.runId === runId) return runSpec;
+	}
+	return null;
+}
 var SessionRun = class {
 	sessionId;
 	statusListeners = /* @__PURE__ */ new Set();
@@ -9608,23 +9646,7 @@ var SessionRun = class {
 	};
 	moveQueuedRequestToNextStep = (queuedRequestId) => {
 		if (!this.activeRunId) return null;
-		return this.pendingInputs.moveNextRunToNextStep(queuedRequestId, this.activeRunId);
-	};
-	enqueueNextStepRequest = (request, session) => {
-		if (!this.activeRunId) return null;
-		const pendingRequest = {
-			id: `pending-input-${randomUUID()}`,
-			runId: `agent-run-${randomUUID()}`,
-			enqueuedAt: (/* @__PURE__ */ new Date()).toISOString(),
-			request: structuredClone(request),
-			session: structuredClone(session)
-		};
-		this.pendingInputs.enqueueNextStep(pendingRequest, this.activeRunId);
-		return structuredClone({
-			...pendingRequest,
-			placement: "steering",
-			intendedRunId: this.activeRunId
-		});
+		return this.pendingInputs.moveNextRunToNextStep(queuedRequestId, this.activeRunId, findRunSpec(this.getSnapshot().messages, this.activeRunId));
 	};
 	claimNextStepRequests = (runId) => this.pendingInputs.claimNextStep(runId).map((request) => ({
 		...request,
@@ -17647,6 +17669,13 @@ var SessionManager = class {
 		const summaryReadOptions = !peerId && limit !== void 0 ? { limit } : void 0;
 		return applyLimit((await journalStore.listSessionSummaries(summaryReadOptions)).filter((summary) => !peerId || summary.peerId === peerId).map(this.workingDirResolver.withWorkingDir), limit);
 	};
+	listSessionPage = async (options) => {
+		const result = await this.options.journalStore.listSessionSummaryPage(options);
+		return {
+			...result,
+			sessions: result.sessions.map(this.workingDirResolver.withWorkingDir)
+		};
+	};
 	listSessionMessages = async (sessionId, options) => {
 		const { cursor, limit } = options ?? {};
 		const normalizedSessionId = normalizeSessionId(sessionId);
@@ -18890,6 +18919,28 @@ const SQLITE_DATABASE_FILE = ".ncp-agent-session-catalog.sqlite";
 const CATALOG_SCHEMA_VERSION = 1;
 const MIGRATION_STATUS_KEY = "migration_status";
 const MIGRATION_COMPLETE = "complete";
+function buildCatalogFilter(query) {
+	const normalized = query?.trim().toLocaleLowerCase();
+	if (!normalized) return {
+		sql: "deleted_at IS NULL",
+		params: []
+	};
+	const pattern = `%${normalized.replace(/[\\%_]/g, "\\$&")}%`;
+	return {
+		sql: `deleted_at IS NULL AND (
+      LOWER(session_id) LIKE ? ESCAPE '\\' OR
+      LOWER(COALESCE(peer_id, '')) LIKE ? ESCAPE '\\' OR
+      LOWER(COALESCE(agent_id, '')) LIKE ? ESCAPE '\\' OR
+      LOWER(metadata_json) LIKE ? ESCAPE '\\'
+    )`,
+		params: [
+			pattern,
+			pattern,
+			pattern,
+			pattern
+		]
+	};
+}
 function readEventMessage(event) {
 	if (event.type === NcpEventType.MessageSent || event.type === NcpEventType.MessageCompleted || event.type === "session.snapshot.message") return event.payload.message;
 }
@@ -18938,11 +18989,25 @@ var NcpAgentSessionSummaryIndexStore = class {
 		const row = this.db().prepare("SELECT * FROM sessions WHERE session_id = ? AND deleted_at IS NULL LIMIT 1").get(normalizeNcpSessionId(sessionId));
 		return row ? structuredClone(rowToSummary(row)) : null;
 	};
-	list = async () => {
+	list = async (limit) => {
 		await this.ensureReady();
+		const query = `SELECT * FROM sessions
+      WHERE deleted_at IS NULL
+      ORDER BY COALESCE(last_message_at, created_at, updated_at) DESC, session_id DESC`;
+		return (limit === void 0 ? this.db().prepare(query).all() : this.db().prepare(`${query} LIMIT ?`).all(limit)).map((row) => structuredClone(rowToSummary(row)));
+	};
+	listPage = async (options) => {
+		await this.ensureReady();
+		const filter = buildCatalogFilter(options.query);
 		return this.db().prepare(`SELECT * FROM sessions
-       WHERE deleted_at IS NULL
-       ORDER BY COALESCE(last_message_at, created_at, updated_at) DESC, session_id DESC`).all().map((row) => structuredClone(rowToSummary(row)));
+       WHERE ${filter.sql}
+       ORDER BY COALESCE(last_message_at, created_at, updated_at) DESC, session_id DESC
+       LIMIT ? OFFSET ?`).all(...filter.params, options.limit, options.offset).map((row) => structuredClone(rowToSummary(row)));
+	};
+	count = async (query) => {
+		await this.ensureReady();
+		const filter = buildCatalogFilter(query);
+		return this.db().prepare(`SELECT COUNT(*) AS total FROM sessions WHERE ${filter.sql}`).get(...filter.params).total;
 	};
 	upsert = async (summary) => {
 		await this.ensureReady();
@@ -19119,11 +19184,25 @@ var NcpAgentSessionSummaryReadStore = class {
 		this.options = options;
 	}
 	list = async (limit) => {
-		const summaries = await this.options.listIndexedSummaries();
-		return await mapWithConcurrency(limit === void 0 ? summaries : summaries.slice(0, Math.max(0, limit)), this.withMetadata);
+		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);
+	};
+	listPage = async (options) => {
+		const page = Math.max(1, Math.trunc(options.page));
+		const pageSize = Math.max(1, Math.trunc(options.pageSize));
+		const [summaries, total] = await Promise.all([this.options.summaryIndex.listPage({
+			offset: (page - 1) * pageSize,
+			limit: pageSize,
+			...options.query?.trim() ? { query: options.query.trim() } : {}
+		}), this.options.summaryIndex.count(options.query)]);
+		return {
+			sessions: await mapWithConcurrency(summaries, this.withMetadata),
+			total
+		};
 	};
 	get = async (sessionId) => {
-		const indexed = await this.options.getIndexedSummary(sessionId);
+		const indexed = await this.options.summaryIndex.get(sessionId);
 		if (indexed) return await this.withMetadata(indexed);
 		const messageCount = await this.options.readProjectedMessageCount(sessionId);
 		if (messageCount === null) return null;
@@ -19196,8 +19275,7 @@ var NcpAgentSessionJournalStore = class {
 			}
 		});
 		this.summaryReadStore = new NcpAgentSessionSummaryReadStore({
-			getIndexedSummary: (sessionId) => this.summaryIndexStore.get(sessionId),
-			listIndexedSummaries: () => this.summaryIndexStore.list(),
+			summaryIndex: this.summaryIndexStore,
 			readJournalModifiedAt: async (sessionId) => (await stat(this.sessionPath(sessionId))).mtime.toISOString(),
 			readMetadata: (sessionId, fallback) => this.metadataStore.read(sessionId, fallback),
 			readProjectedMessageCount: async (sessionId) => (await this.messageProjectionStore.readMeta(sessionId))?.total ?? null
@@ -19228,6 +19306,7 @@ var NcpAgentSessionJournalStore = class {
 	listSessionSummaries = async (options) => {
 		return await this.summaryReadStore.list(options?.limit);
 	};
+	listSessionSummaryPage = (options) => this.summaryReadStore.listPage(options);
 	getSessionSummary = async (sessionId) => {
 		const normalizedSessionId = normalizeNcpSessionId(sessionId);
 		if (!normalizedSessionId) return null;
@@ -19579,7 +19658,7 @@ var NextclawKernel = class {
 		this.assetStore = new LocalAssetStore({ rootDir: resolve(getDataDir(), "assets") });
 		this.control = new NextclawKernelControlManager();
 		this.agents = new AgentManager(this.configManager);
-		this.agentContextWindowManager = new AgentContextWindowManager(this.agents, this.contextProviderManager, this.toolProviderManager);
+		this.agentContextWindowManager = new AgentContextWindowManager(this.agents, this.contextProviderManager, this.toolProviderManager, this.assetStore);
 		this.accessManager = new AccessManager({
 			configManager: this.configManager,
 			homeDir: options.homeDir
@@ -19608,7 +19687,8 @@ var NextclawKernel = class {
 			configManager: this.configManager,
 			eventBus: this.eventBus,
 			ingress: this.ingress,
-			listPackageComponentSources: this.appPackageManager.listActiveComponentSources
+			listPackageComponentSources: this.appPackageManager.listActiveComponentSources,
+			listPackageComponentDiagnostics: async () => (await this.appPackageManager.listActiveComponentSourcesWithDiagnostics()).unavailablePackages
 		});
 		this.preferenceManager = new PreferenceManager({ storePath: resolveKernelPreferenceStorePath(options) });
 		({appDataManager: this.appDataManager, serviceAppManager: this.serviceAppManager} = createKernelServiceAppManagers({
@@ -19646,10 +19726,10 @@ var NextclawKernel = class {
 				ingress: this.ingress
 			})
 		});
-		this.contextCompactionManager = new AgentRunContextCompactionManager(this.agents, this.llmProviders);
+		this.contextCompactionManager = new AgentRunContextCompactionManager(this.agents, this.llmProviders, this.assetStore);
 		this.sessionRunManager = new SessionRunManager(this.sessionManager, options.productActivitySink);
 		this.sessionContextCompactionManager = new SessionContextCompactionManager(this.agentRuntimeManager, this.eventBus, this.sessionManager, this.sessionRunManager);
-		this.agentRunRequestManager = new AgentRunRequestManager(this.agentRuntimeManager, this.agents, this.configManager, this.agentContextWindowManager, this.eventBus, this.ingress, this.sessionManager, this.sessionRunManager, this.diagnostics);
+		this.agentRunRequestManager = new AgentRunRequestManager(this.agentRuntimeManager, this.agents, this.configManager, this.agentContextWindowManager, this.eventBus, this.ingress, this.sessionManager, this.sessionRunManager, this.diagnostics, new LocalExecutionClaimService(resolve(sessionsDir, ".execution-claims", "session-runs")));
 		this.contributions = this.createContributions();
 	}
 	createContributions = () => [