@nextclaw/kernel 0.9.0 → 0.9.2

package/dist/index.js

@@ -1,7 +1,7 @@
 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, 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, 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, NcpEventType, createUnavailableNcpAiExecutionMetadata, isHiddenNcpMessage, normalizeAssistantText, readNcpAiExecutionMetadata, sanitizeAssistantReplyTags } from "@nextclaw/ncp";
 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, EventBus, Ingress, 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, eventKeys, ingressKeys, isRuntimeDefaultModelValue, isSilentReplyNcpMessage, normalizeRuntimeModelSelectionMode, parseSystemObjectReferenceUri, readChatUiResourceReference, readInlineContentHeight, readSystemObjectResolvedReference, readUiContentParams } from "@nextclaw/shared";
 import { LocalAssetStore, buildAssetContentPath, buildNcpUserContent, buildOpenAiFunctionTool, isTextLikeAsset, ncpMessageToOpenAiMessages, validateToolArgs } from "@nextclaw/ncp-agent-runtime";
@@ -10,7 +10,7 @@ import { catchError, filter, from, lastValueFrom, tap } from "rxjs";
 import { appendFileSync, chmodSync, constants, createReadStream, existsSync, mkdirSync, readFileSync, readdirSync, readlinkSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import path, { basename, delimiter, dirname, extname, isAbsolute, join, normalize, relative, resolve, sep } from "node:path";
 import { access, appendFile, mkdir, mkdtemp, open, readFile, readdir, realpath, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
-import { AppHomeService, AppInstallationService, AppInstanceInventoryService, AppInstanceStorageService, AppManifestService, AppRegistryService, AppServiceLaunchService, FileLockService, isAppComponentManifestBundle } from "@nextclaw/app-runtime";
+import { AppHomeService, AppInstallationService, AppInstanceInventoryService, AppInstanceStorageService, AppManifestService, AppPlatformTargetService, AppRegistryService, AppServiceLaunchService, FileLockService, isAppComponentManifestBundle } from "@nextclaw/app-runtime";
 import { execFileSync, spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { BUILTIN_PROVIDER_PLUGINS } from "@nextclaw/runtime";
@@ -1441,6 +1441,93 @@ var AgentRunSessionCommandManager = class {
 	};
 };
 //#endregion
+//#region src/services/agent-run-input-delivery.service.ts
+/** Resolves public pending-input actions while SessionRun remains the state owner. */
+var AgentRunInputDeliveryService = class {
+	constructor(agentRuntimeManager, sessionManager, sessionRunManager, publishQueueUpdated) {
+		this.agentRuntimeManager = agentRuntimeManager;
+		this.sessionManager = sessionManager;
+		this.sessionRunManager = sessionRunManager;
+		this.publishQueueUpdated = publishQueueUpdated;
+	}
+	listQueuedInputs = (sessionId) => {
+		return this.sessionRunManager.getSessionRun(sessionId)?.listQueuedRequests().map(this.toQueuedInput) ?? [];
+	};
+	removeQueuedInput = (sessionId, queuedInputId) => {
+		const removed = this.sessionRunManager.getSessionRun(sessionId)?.removeQueuedRequest(queuedInputId) ?? null;
+		if (!removed) return null;
+		this.publishQueueUpdated(sessionId);
+		return this.toQueuedInput(removed);
+	};
+	listPendingInputs = (sessionId) => {
+		return this.sessionRunManager.getSessionRun(sessionId)?.listPendingRequests().map((request) => ({
+			...this.toQueuedInput(request),
+			placement: request.placement,
+			intendedRunId: request.intendedRunId
+		})) ?? [];
+	};
+	steerQueuedInput = async (sessionId, queuedInputId) => {
+		const sessionRun = this.sessionRunManager.getSessionRun(sessionId);
+		if (!sessionRun?.getActiveRunId()) return {
+			ok: false,
+			reason: "unavailable"
+		};
+		if (!sessionRun.listQueuedRequests().some(({ id }) => id === queuedInputId)) return {
+			ok: false,
+			reason: "not-found"
+		};
+		if (!await this.supportsNextStepInput(sessionRun)) return {
+			ok: false,
+			reason: "unavailable"
+		};
+		const moved = sessionRun.moveQueuedRequestToNextStep(queuedInputId);
+		if (!moved) return {
+			ok: false,
+			reason: "unavailable"
+		};
+		this.publishQueueUpdated(sessionId);
+		return {
+			ok: true,
+			input: this.toPendingInput(moved)
+		};
+	};
+	enqueuePreferredSteeringInput = (sessionRun, request, session) => {
+		try {
+			return this.agentRuntimeManager.getOrCreate({
+				agentRuntimeId: session.agentRuntimeId,
+				session,
+				sessionRun
+			}).capabilities?.nextStepInput === true ? sessionRun.enqueueNextStepRequest(request, session) : null;
+		} catch {
+			return null;
+		}
+	};
+	supportsNextStepInput = async (sessionRun) => {
+		try {
+			const session = await this.sessionManager.getAgentRunSession(sessionRun.sessionId);
+			return this.agentRuntimeManager.getOrCreate({
+				agentRuntimeId: session.agentRuntimeId,
+				session,
+				sessionRun
+			}).capabilities?.nextStepInput === true;
+		} catch {
+			return false;
+		}
+	};
+	toPendingInput = (request) => ({
+		...this.toQueuedInput(request),
+		placement: "steering",
+		intendedRunId: request.intendedRunId
+	});
+	toQueuedInput = (queuedRequest) => ({
+		id: queuedRequest.id,
+		sessionId: queuedRequest.request.message.sessionId,
+		enqueuedAt: queuedRequest.enqueuedAt,
+		message: structuredClone(queuedRequest.request.message),
+		metadata: structuredClone(queuedRequest.request.metadata ?? {})
+	});
+};
+//#endregion
 //#region src/utils/agent-run-execution-metadata.utils.ts
 const AGENT_RUN_EXECUTION_METADATA = {
 	contractVersion: 1,
@@ -1515,7 +1602,8 @@ function toAgentRunRequest(envelope) {
 		metadata: structuredClone(metadata),
 		model: metadata.model,
 		maxTokens: metadata.maxTokens,
-		thinkingEffort: metadata.thinkingEffort
+		thinkingEffort: metadata.thinkingEffort,
+		delivery: envelope.delivery
 	};
 	if (Array.isArray(envelope.content)) {
 		const sessionId = readOptionalString$11(envelope.sessionId);
@@ -1613,7 +1701,8 @@ function toRunHandle(accepted) {
 		userMessageId: accepted.userMessageId,
 		assistantMessageId: null,
 		runId: accepted.runId,
-		correlationId: accepted.correlationId
+		correlationId: accepted.correlationId,
+		delivery: accepted.delivery
 	};
 }
 function findCompletedAssistantMessage(messages, messageId) {
@@ -1669,6 +1758,7 @@ var AgentRunRequestManager = class {
 	cleanups = [];
 	observedSessionRuns = /* @__PURE__ */ new Set();
 	sessionCommandManager;
+	pendingInputs;
 	started = false;
 	constructor(agentRuntimeManager, agentManager, configManager, agentContextWindowManager, eventBus, ingress, sessionManager, sessionRunManager, diagnostics) {
 		this.agentRuntimeManager = agentRuntimeManager;
@@ -1680,6 +1770,7 @@ var AgentRunRequestManager = class {
 		this.sessionManager = sessionManager;
 		this.sessionRunManager = sessionRunManager;
 		this.diagnostics = diagnostics;
+		this.pendingInputs = new AgentRunInputDeliveryService(agentRuntimeManager, sessionManager, sessionRunManager, this.publishRunQueueUpdated);
 		this.sessionCommandManager = new AgentRunSessionCommandManager(sessionManager, sessionRunManager, this.send);
 	}
 	start = () => {
@@ -1693,15 +1784,6 @@ var AgentRunRequestManager = class {
 		this.sessionCommandManager.dispose();
 		this.started = false;
 	};
-	listQueuedInputs = (sessionId) => {
-		return this.sessionRunManager.getSessionRun(sessionId)?.listQueuedRequests().map(this.toQueuedInput) ?? [];
-	};
-	removeQueuedInput = (sessionId, queuedInputId) => {
-		const removed = this.sessionRunManager.getSessionRun(sessionId)?.removeQueuedRequest(queuedInputId) ?? null;
-		if (!removed) return null;
-		this.publishRunQueueUpdated(sessionId);
-		return this.toQueuedInput(removed);
-	};
 	handleSendRequest = async (envelope) => {
 		if (!envelope.payload) throw new Error("Invalid agent run send request.");
 		return toRunHandle(await this.send(toAgentRunRequest(envelope.payload)));
@@ -1742,11 +1824,23 @@ var AgentRunRequestManager = class {
 			...request.message,
 			sessionId: session.sessionId
 		};
-		const queuedRequest = sessionRun.enqueueRequest({
+		const normalizedRequest = {
 			...request,
 			sessionId: session.sessionId,
 			message: baseMessage
-		}, session);
+		};
+		const steeringRequest = request.delivery === "prefer-steer" && sessionRun.isRunning() ? this.pendingInputs.enqueuePreferredSteeringInput(sessionRun, normalizedRequest, session) : null;
+		if (steeringRequest) {
+			this.publishRunQueueUpdated(session.sessionId);
+			return {
+				sessionId: session.sessionId,
+				userMessageId: steeringRequest.request.message.id,
+				runId: steeringRequest.intendedRunId,
+				correlationId: request.correlationId,
+				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);
@@ -1755,7 +1849,8 @@ var AgentRunRequestManager = class {
 			sessionId: session.sessionId,
 			userMessageId: queuedRequest.request.message.id,
 			runId: activeRequest?.id === queuedRequest.id ? activeRequest.runId : null,
-			correlationId: request.correlationId
+			correlationId: request.correlationId,
+			delivery: activeRequest?.id === queuedRequest.id ? "started" : "queued"
 		};
 	};
 	startQueuedRun = async (sessionRun, activeRequest) => {
@@ -1816,10 +1911,10 @@ var AgentRunRequestManager = class {
 				sessionRun
 			});
 			const { contextBlocks, tools } = await this.agentContextWindowManager.resolveRunSurface(providerRequest);
-			sessionRun.inbox.enqueue(message);
 			this.startRuntimeRun({
 				options: {
 					contextBlocks,
+					initialMessages: [message],
 					session,
 					sessionRun,
 					signal: activeRequest.signal,
@@ -1858,6 +1953,7 @@ var AgentRunRequestManager = class {
 		const { options, parentCorrelationId, requestRunStartedAt, runtime, spec } = params;
 		const { session, sessionRun } = options;
 		let messageCompletedSeen = false;
+		const initialMessageIds = new Set(options.initialMessages.map(({ id }) => id));
 		let executionMetadataSeen = false;
 		let runtimeFailed = false;
 		let runtimeCancelled = false;
@@ -1866,8 +1962,9 @@ var AgentRunRequestManager = class {
 		let failureProviderCode;
 		let failureFacts;
 		let runStartedAt = requestRunStartedAt;
-		lastValueFrom(from(runtime.run(spec, options)).pipe(filter((event) => event.type !== NcpEventType.MessageSent || event.payload.message.role !== "user"), tap((event) => {
+		lastValueFrom(from(runtime.run(spec, options)).pipe(filter((event) => event.type !== NcpEventType.MessageSent || !initialMessageIds.has(event.payload.message.id)), tap((event) => {
 			const eventsToPublish = [];
+			const consumedSteeringInput = event.type === NcpEventType.MessageSent && event.payload.message.role === "user";
 			if (event.type === NcpEventType.RunError) {
 				const classification = classifyDiagnosticError(event.payload.error, options.signal);
 				runtimeFailed = true;
@@ -1895,6 +1992,7 @@ var AgentRunRequestManager = class {
 			}
 			eventsToPublish.push(event);
 			eventsToPublish.forEach(this.publishNcpEvent);
+			if (consumedSteeringInput) this.publishRunQueueUpdated(session.sessionId);
 		}), catchError(async (error) => {
 			const classification = classifyDiagnosticError(error, options.signal);
 			runtimeFailed = true;
@@ -1995,13 +2093,6 @@ var AgentRunRequestManager = class {
 			source: "agent-run-request"
 		});
 	};
-	toQueuedInput = (queuedRequest) => ({
-		id: queuedRequest.id,
-		sessionId: queuedRequest.request.message.sessionId,
-		enqueuedAt: queuedRequest.enqueuedAt,
-		message: structuredClone(queuedRequest.request.message),
-		metadata: structuredClone(queuedRequest.request.metadata ?? {})
-	});
 	getOrCreateSessionForRequest = async (request) => {
 		const sessionMaterialization = readSessionMaterialization(request.metadata ?? {});
 		if (sessionMaterialization && (request.sessionId || request.peerId)) throw new Error("session_materialization requires a new session request.");
@@ -2925,6 +3016,7 @@ var AppPackageManager = class {
 	installationService;
 	manifestService = new AppManifestService();
 	operationManager;
+	platformTargetService = new AppPlatformTargetService();
 	presentationService = new AppPackagePresentationService();
 	registryService;
 	runtimeHooks = EMPTY_RUNTIME_HOOKS;
@@ -2946,7 +3038,23 @@ var AppPackageManager = class {
 	start = async () => await this.ensureBuiltInPackages();
 	listPackages = async (options = {}) => {
 		const records = await this.registryService.listApps();
-		return { entries: await Promise.all(records.map(async (record) => await this.toPackageView(await this.installationService.info(record.appId, { measureStorageUsage: options.includeStorageUsage !== false })))) };
+		return {
+			hostTarget: this.readHostTarget(),
+			entries: await Promise.all(records.map(async (record) => await this.toPackageView(await this.installationService.info(record.appId, { measureStorageUsage: options.includeStorageUsage !== false }))))
+		};
+	};
+	readHostTarget = () => {
+		try {
+			const target = this.platformTargetService.readHostTarget();
+			return {
+				key: this.platformTargetService.toTargetKey(target),
+				operatingSystem: target.os,
+				architecture: target.arch,
+				...target.os === "darwin" ? {} : { abi: target.abi }
+			};
+		} catch {
+			return;
+		}
 	};
 	listInstalledDataOwners = async () => (await this.registryService.listApps()).map((record) => ({
 		id: record.appId,
@@ -3745,10 +3853,12 @@ var ExtensionLifecycleService = class {
 		if (record.state === "running") return;
 		const { generation, manifest, ready, token } = this.prepareStart(record);
 		this.recordLifecycle(record, "process.spawn.started", "started");
-		const child = spawn(manifest.server.command === "node" || manifest.server.command === "node.exe" ? process.execPath : manifest.server.command, manifest.server.args ?? [], {
+		const launch = resolveRuntimeCommandLaunch(manifest.server.command);
+		const child = spawn(launch.command, manifest.server.args ?? [], {
 			cwd: manifest.rootDir,
 			env: createRuntimeChildEnv(process.env, {
 				...manifest.server.env,
+				...launch.envPatch,
 				NEXTCLAW_EXTENSION_ID: manifest.id,
 				NEXTCLAW_EXTENSION_ENDPOINT: record.endpoint,
 				NEXTCLAW_EXTENSION_GENERATION: generation,
@@ -9561,28 +9671,103 @@ var ProjectManager = class {
 	isMissingFileError = (error) => typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
 };
 //#endregion
+//#region src/utils/product-activity.utils.ts
+function resolveHumanProductActivitySource(request) {
+	const metadata = request.metadata ?? {};
+	if (metadata.session_origin === "cron") return null;
+	if (metadata[CHAT_SESSION_MATERIALIZATION_METADATA_KEY]?.kind === "child") return null;
+	return request.channel ? "channel" : "direct";
+}
+function recordProductActivityBestEffort(sink, signal) {
+	if (!sink) return;
+	try {
+		Promise.resolve(sink.record(signal)).catch(() => void 0);
+	} catch {}
+}
+//#endregion
 //#region src/managers/session-run.manager.ts
-var MessageInbox = class {
-	messages = [];
-	enqueue = (message) => {
-		this.messages.push(message);
+/** Single owner for inputs waiting for either the next run or the next safe step. */
+var SessionPendingInputs = class {
+	nextRun = [];
+	nextStep = [];
+	claimedNextStep = /* @__PURE__ */ new Map();
+	enqueueNextRun = (request) => {
+		this.nextRun.push(request);
+	};
+	enqueueNextStep = (request, intendedRunId) => {
+		this.nextStep.push({
+			...request,
+			intendedRunId
+		});
 	};
-	drain = () => {
-		return this.messages.splice(0, this.messages.length);
+	moveNextRunToNextStep = (requestId, intendedRunId) => {
+		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);
+	};
+	list = () => [...this.nextStep.map((request) => this.toPendingRequest(request, "steering", request.intendedRunId)), ...this.nextRun.map((request) => this.toPendingRequest(request, "queued", null))];
+	listNextRun = () => structuredClone(this.nextRun);
+	removeNextRun = (requestId) => {
+		const index = this.nextRun.findIndex(({ id }) => id === requestId);
+		if (index < 0) return null;
+		const [removed] = this.nextRun.splice(index, 1);
+		return removed ? structuredClone(removed) : null;
 	};
+	shiftNextRun = () => {
+		const request = this.nextRun.shift();
+		return request ? structuredClone(request) : null;
+	};
+	claimNextStep = (runId) => {
+		const claimed = [];
+		for (let index = this.nextStep.length - 1; index >= 0; index -= 1) {
+			const request = this.nextStep[index];
+			if (request?.intendedRunId !== runId) continue;
+			this.nextStep.splice(index, 1);
+			claimed.unshift(request);
+		}
+		for (const request of claimed) this.claimedNextStep.set(request.id, request);
+		return structuredClone(claimed);
+	};
+	acknowledgeNextStep = (requestIds) => {
+		for (const requestId of requestIds) this.claimedNextStep.delete(requestId);
+	};
+	restoreNextStep = (runId) => {
+		const restored = [...this.nextStep.filter(({ intendedRunId }) => intendedRunId === runId), ...[...this.claimedNextStep.values()].filter(({ intendedRunId }) => intendedRunId === runId)].sort((left, right) => left.enqueuedAt.localeCompare(right.enqueuedAt));
+		if (restored.length === 0) return;
+		for (let index = this.nextStep.length - 1; index >= 0; index -= 1) if (this.nextStep[index]?.intendedRunId === runId) this.nextStep.splice(index, 1);
+		for (const request of restored) this.claimedNextStep.delete(request.id);
+		this.nextRun.unshift(...restored.map(({ intendedRunId: _intendedRunId, ...request }) => request));
+	};
+	get hasNextRun() {
+		return this.nextRun.length > 0;
+	}
+	clear = () => {
+		this.nextRun.length = 0;
+		this.nextStep.length = 0;
+		this.claimedNextStep.clear();
+	};
+	toPendingRequest = (request, placement, intendedRunId) => structuredClone({
+		...request,
+		placement,
+		intendedRunId
+	});
 };
 function isConversationStateEvent(event) {
 	return event.type !== NcpEventType.ContextWindowUpdated;
 }
 var SessionRun = class {
-	inbox = new MessageInbox();
 	sessionId;
 	statusListeners = /* @__PURE__ */ new Set();
-	queuedRequests = [];
+	pendingInputs = new SessionPendingInputs();
 	activeRunId = null;
 	activeRunController = null;
-	constructor(seed, stateManager = new DefaultNcpAgentConversationStateManager()) {
+	activeProductActivitySource = null;
+	constructor(seed, stateManager = new DefaultNcpAgentConversationStateManager(), productActivitySink) {
 		this.stateManager = stateManager;
+		this.productActivitySink = productActivitySink;
 		this.sessionId = seed.sessionId;
 		this.stateManager.hydrate({
 			sessionId: seed.sessionId,
@@ -9620,27 +9805,61 @@ var SessionRun = class {
 			request: structuredClone(request),
 			session: structuredClone(session)
 		};
-		this.queuedRequests.push(queuedRequest);
+		this.pendingInputs.enqueueNextRun(queuedRequest);
 		this.emitStatusChangeIfNeeded(wasBusy);
 		return structuredClone(queuedRequest);
 	};
-	listQueuedRequests = () => structuredClone(this.queuedRequests);
+	listQueuedRequests = () => this.pendingInputs.listNextRun();
+	listPendingRequests = () => this.pendingInputs.list();
 	removeQueuedRequest = (queuedRequestId) => {
-		const index = this.queuedRequests.findIndex(({ id }) => id === queuedRequestId);
-		if (index < 0) return null;
 		const wasBusy = this.isBusy();
-		const [removed] = this.queuedRequests.splice(index, 1);
+		const removed = this.pendingInputs.removeNextRun(queuedRequestId);
 		this.emitStatusChangeIfNeeded(wasBusy);
-		return removed ? structuredClone(removed) : null;
+		return removed;
+	};
+	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
+		});
 	};
+	claimNextStepRequests = (runId) => this.pendingInputs.claimNextStep(runId).map((request) => ({
+		...request,
+		placement: "steering",
+		intendedRunId: runId
+	}));
+	acknowledgeNextStepRequests = (requestIds) => {
+		this.pendingInputs.acknowledgeNextStep(requestIds);
+	};
+	getActiveRunId = () => this.activeRunId;
 	beginNextRun = () => {
 		if (this.activeRunId) return null;
 		const wasBusy = this.isBusy();
-		const queuedRequest = this.queuedRequests.shift();
+		const queuedRequest = this.pendingInputs.shiftNextRun();
 		if (!queuedRequest) return null;
 		const controller = new AbortController();
 		this.activeRunId = queuedRequest.runId;
 		this.activeRunController = controller;
+		this.activeProductActivitySource = resolveHumanProductActivitySource(queuedRequest.request);
+		if (this.activeProductActivitySource) recordProductActivityBestEffort(this.productActivitySink, {
+			kind: "intent_accepted",
+			occurredAt: (/* @__PURE__ */ new Date()).toISOString(),
+			source: this.activeProductActivitySource
+		});
 		this.emitStatusChangeIfNeeded(wasBusy);
 		return {
 			...structuredClone(queuedRequest),
@@ -9654,7 +9873,7 @@ var SessionRun = class {
 		return true;
 	};
 	isRunning = () => this.activeRunId !== null;
-	isBusy = () => this.isRunning() || this.queuedRequests.length > 0;
+	isBusy = () => this.isRunning() || this.pendingInputs.hasNextRun;
 	dispose = () => {
 		const wasBusy = this.isBusy();
 		this.activeRunController?.abort({
@@ -9664,7 +9883,8 @@ var SessionRun = class {
 		});
 		this.activeRunController = null;
 		this.activeRunId = null;
-		this.queuedRequests.length = 0;
+		this.activeProductActivitySource = null;
+		this.pendingInputs.clear();
 		this.emitStatusChangeIfNeeded(wasBusy);
 		this.statusListeners.clear();
 	};
@@ -9673,8 +9893,15 @@ var SessionRun = class {
 		for (const event of events) {
 			if (event.type === NcpEventType.RunStarted && event.payload.runId) this.activeRunId = event.payload.runId;
 			if ((event.type === NcpEventType.MessageAbort || event.type === NcpEventType.RunFinished || event.type === NcpEventType.RunError) && (!event.payload.runId || event.payload.runId === this.activeRunId)) {
+				if (event.type === NcpEventType.RunFinished && this.activeProductActivitySource) recordProductActivityBestEffort(this.productActivitySink, {
+					kind: "run_succeeded",
+					occurredAt: (/* @__PURE__ */ new Date()).toISOString(),
+					source: this.activeProductActivitySource
+				});
+				if (this.activeRunId) this.pendingInputs.restoreNextStep(this.activeRunId);
 				this.activeRunId = null;
 				this.activeRunController = null;
+				this.activeProductActivitySource = null;
 			}
 		}
 		this.emitStatusChangeIfNeeded(wasBusy);
@@ -9688,8 +9915,9 @@ var SessionRun = class {
 var SessionRunManager = class {
 	runs = /* @__PURE__ */ new Map();
 	pendingCreations = /* @__PURE__ */ new Map();
-	constructor(sessionManager) {
+	constructor(sessionManager, productActivitySink) {
 		this.sessionManager = sessionManager;
+		this.productActivitySink = productActivitySink;
 	}
 	getSessionRun = (sessionId) => this.runs.get(sessionId) ?? null;
 	isSessionRunning = (sessionId) => this.runs.get(sessionId.trim())?.isBusy() ?? false;
@@ -9709,7 +9937,7 @@ var SessionRunManager = class {
 		const run = new SessionRun({
 			messages: await this.sessionManager.listSessionMessages(sessionId),
 			sessionId
-		});
+		}, void 0, this.productActivitySink);
 		this.runs.set(sessionId, run);
 		return run;
 	};
@@ -12039,15 +12267,14 @@ var NcpAgentRuntimeWrapper = class {
 		this.params = params;
 	}
 	run = async function* (spec, options) {
-		const { contextBlocks, session, sessionRun, signal, tools } = options;
+		const { contextBlocks, initialMessages, session, sessionRun, signal, tools } = options;
 		this.currentTools = tools.map(this.toOpenAiTool);
-		const messages = sessionRun.inbox.drain();
 		let executionMetadataSeen = false;
 		try {
 			const input = {
 				sessionId: sessionRun.sessionId,
 				runId: spec.runId,
-				messages,
+				messages: initialMessages,
 				contextBlocks: this.params.injectNextclawContext ? contextBlocks : void 0,
 				correlationId: spec.correlationId,
 				metadata: this.buildMetadata(session, spec),
@@ -12170,6 +12397,7 @@ var AgentRunRuntimeContribution = class {
 				runPreflight: this.runNativePreflight
 			});
 			return {
+				capabilities: { nextStepInput: true },
 				run: (spec, options) => runtime.run(spec, {
 					...options,
 					contextBlocks: entry.injectNextclawContext === false ? [] : options.contextBlocks
@@ -15520,28 +15748,34 @@ var McpServiceAppRuntimeService = class {
 		await this.lifecycleManager.closeAll();
 		this.states.clear();
 	};
-	toMcpServerRecord = (app, manifest) => ({
-		name: app.id,
-		definition: {
-			enabled: app.enabled,
-			transport: {
-				type: "stdio",
-				command: manifest.command,
-				args: manifest.args,
-				cwd: app.dirPath,
-				env: createRuntimeChildEnv(process.env, this.createAppRuntimeEnv(app)),
-				stderr: "pipe"
-			},
-			scope: {
-				allAgents: false,
-				agents: []
-			},
-			policy: {
-				trust: "explicit",
-				start: "eager"
+	toMcpServerRecord = (app, manifest) => {
+		const launch = resolveRuntimeCommandLaunch(manifest.command);
+		return {
+			name: app.id,
+			definition: {
+				enabled: app.enabled,
+				transport: {
+					type: "stdio",
+					command: launch.command,
+					args: manifest.args,
+					cwd: app.dirPath,
+					env: createRuntimeChildEnv(process.env, {
+						...this.createAppRuntimeEnv(app),
+						...launch.envPatch
+					}),
+					stderr: "pipe"
+				},
+				scope: {
+					allAgents: false,
+					agents: []
+				},
+				policy: {
+					trust: "explicit",
+					start: "eager"
+				}
 			}
-		}
-	});
+		};
+	};
 	createAppRuntimeEnv = (app) => {
 		const env = {};
 		if (app.storage) {
@@ -16044,9 +16278,19 @@ function mergeServiceAppRuntimeActions({ record, manifest, runtimeActions }) {
 	return [...declared, ...undeclared].sort((left, right) => left.id.localeCompare(right.id));
 }
 //#endregion
-//#region src/managers/service-app.manager.ts
-const SERVICE_ACTION_GRANTS_FILE_NAME = ".service-action-grants.json";
-const SERVICE_APP_ID_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+//#region src/utils/service-app-error.utils.ts
+const SERVICE_APP_ERROR_CODES = new Set([
+	"AUTHORIZATION_REQUIRED",
+	"SERVICE_APP_ACTION_NOT_DECLARED",
+	"SERVICE_APP_ACTION_NOT_FOUND",
+	"SERVICE_APP_INVALID_ACTION",
+	"SERVICE_APP_INVALID_CALLER",
+	"SERVICE_APP_INVALID_MANIFEST",
+	"SERVICE_APP_MANAGED_SOURCE",
+	"SERVICE_APP_NOT_FOUND",
+	"SERVICE_APP_READ_FAILED",
+	"SERVICE_APP_RUNTIME_FAILED"
+]);
 var ServiceAppError = class extends Error {
 	constructor(code, message) {
 		super(message);
@@ -16054,7 +16298,11 @@ var ServiceAppError = class extends Error {
 		this.name = "ServiceAppError";
 	}
 };
-const isServiceAppError = (error) => error instanceof ServiceAppError;
+const isServiceAppError = (error) => error instanceof ServiceAppError || typeof error === "object" && error !== null && error.name === "ServiceAppError" && typeof error.message === "string" && SERVICE_APP_ERROR_CODES.has(error.code);
+//#endregion
+//#region src/managers/service-app.manager.ts
+const SERVICE_ACTION_GRANTS_FILE_NAME = ".service-action-grants.json";
+const SERVICE_APP_ID_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 var ServiceAppManager = class {
 	removalService = new ServiceAppRemovalService();
 	runtimeService;
@@ -16116,15 +16364,19 @@ var ServiceAppManager = class {
 		if (!Object.hasOwn(manifest.actions, actionName)) throw new ServiceAppError("SERVICE_APP_ACTION_NOT_FOUND", "service action not found");
 		const declaredRisk = manifest.actions[actionName]?.risk ?? "dangerous";
 		if (!await this.createGrantStore().isGranted(request.caller, actionId, declaredRisk)) throw new ServiceAppError("AUTHORIZATION_REQUIRED", `This panel app needs permission to call ${actionId}.`);
-		return {
-			actionId,
-			result: await this.runtimeService.invokeAction({
-				app: record,
-				manifest,
-				actionName,
-				input: request.input ?? {}
-			})
-		};
+		try {
+			return {
+				actionId,
+				result: await this.runtimeService.invokeAction({
+					app: record,
+					manifest,
+					actionName,
+					input: request.input ?? {}
+				})
+			};
+		} catch (error) {
+			throw new ServiceAppError("SERVICE_APP_RUNTIME_FAILED", `Service App ${record.id} action ${actionName} failed: ${error instanceof Error ? error.message : String(error)}`);
+		}
 	};
 	grantServiceAction = async (actionId, request) => {
 		const [grant] = await this.grantServiceActions([actionId], request);
@@ -16519,7 +16771,7 @@ var NextclawKernel = class {
 			})
 		});
 		this.contextCompactionManager = new AgentRunContextCompactionManager(this.agents, this.llmProviders);
-		this.sessionRunManager = new SessionRunManager(this.sessionManager);
+		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.contributions = [