@nextclaw/kernel 0.3.4-beta.0 → 0.4.1-beta.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { n as getUnsignedUpdateManifest, r as serializeUnsignedUpdateManifest, t as UpdateManifestReader } from "./update-manifest.types-C0qPrjGQ.js";
 import { createRequire } from "node:module";
 import { NcpEventType, sanitizeAssistantReplyTags } from "@nextclaw/ncp";
-import { AgentRouteResolver, BUILTIN_MAIN_AGENT_ID, CLEAR_THINKING_TOKENS, CONTEXT_COMPACTION_METADATA_KEY, ChannelManager, ChannelManager as ChannelManager$1, ConfigSchema, ContextBuilder, ContextCompactionService, ContextWindowBudgetService, CronService, CronTool, DEFAULT_PANELS_DIR, DEFAULT_SERVICE_APPS_DIR, DEFAULT_SESSION_SEARCH_LIMIT, EditFileTool, ExecTool, GatewayTool, InputBudgetPruner, LLMProvider, ListDirTool, LiteLLMProvider, MAX_SESSION_SEARCH_LIMIT, MemoryGetTool, MemorySearchTool, MessageBus, MessageTool, ProviderRegistry, ReadFileTool, RequestedSkillsMetadataReader, SessionSearchManager, SkillsLoader, THINKING_LEVELS, WebFetchTool, WebSearchTool, WriteFileTool, buildCompressingCompactionCheckpoint, buildConfigSchema, buildContextWindowSnapshot, buildMinimalSystemExecutionPrompt, buildReloadPlan, buildSessionRequestToolResult, buildToolCatalogEntries, createAssistantStreamDeltaControlMessage, createAssistantStreamResetControlMessage, createCompletedSessionRequest, createFailedSessionRequest, createRunningSessionRequest, createTypingStopControlMessage, diffConfigPaths, ensureDir, expandHome, findEffectiveAgentProfile, getConfigPath, getDataDir, getDataPath, getSessionsPath, getWorkspacePath, getWorkspacePathFromConfig, loadConfig, mergeExtensionConfigView, modelSupportsVision, normalizeInlineSecretRefs, normalizeProviderModelConfig, normalizeToolParams, parseAgentScopedSessionKey, parseThinkingLevel, readCompressedContextCompactionCheckpoint, readOptionalString, readParentSessionId, readSessionProjectRoot, redactConfigObject, resolveConfigSecrets, resolveDefaultAgentProfileId, resolveProviderRuntime, resolveSessionWorkspacePath, resolveThinkingLevel, saveConfig, summarizeSessionRequestTask, toDisposable, toExtensionConfigView } from "@nextclaw/core";
+import { AgentRouteResolver, BUILTIN_MAIN_AGENT_ID, CLEAR_THINKING_TOKENS, CONTEXT_COMPACTION_METADATA_KEY, ChannelManager, ChannelManager as ChannelManager$1, ConfigSchema, ContextBuilder, ContextCompactionService, ContextWindowBudgetService, CronService, CronTool, DEFAULT_PANELS_DIR, DEFAULT_SERVICE_APPS_DIR, DEFAULT_SESSION_SEARCH_LIMIT, EditFileTool, ExecTool, GatewayTool, InputBudgetPruner, LLMProvider, ListDirTool, LiteLLMProvider, MAX_SESSION_SEARCH_LIMIT, MemoryGetTool, MemorySearchTool, MessageBus, MessageTool, ProviderRegistry, ReadFileTool, RequestedSkillsMetadataReader, SessionSearchManager, SkillsLoader, THINKING_LEVELS, WebFetchTool, WebSearchTool, WriteFileTool, buildCompressingCompactionCheckpoint, buildConfigSchema, buildContextWindowSnapshot, buildMinimalSystemExecutionPrompt, buildReloadPlan, buildSessionRequestToolResult, buildToolCatalogEntries, createAssistantStreamDeltaControlMessage, createAssistantStreamResetControlMessage, createCompletedSessionRequest, createFailedSessionRequest, createRunningSessionRequest, createRuntimeChildEnv, createTypingStopControlMessage, diffConfigPaths, ensureDir, expandHome, findEffectiveAgentProfile, getConfigPath, getDataDir, getDataPath, getSessionsPath, getWorkspacePath, getWorkspacePathFromConfig, loadConfig, mergeExtensionConfigView, modelSupportsVision, normalizeInlineSecretRefs, normalizeProviderModelConfig, normalizeToolParams, parseAgentScopedSessionKey, parseThinkingLevel, readCompressedContextCompactionCheckpoint, readOptionalString, readParentSessionId, readSessionProjectRoot, redactConfigObject, resolveConfigSecrets, resolveDefaultAgentProfileId, resolveProviderRuntime, resolveSessionWorkspacePath, resolveThinkingLevel, saveConfig, summarizeSessionRequestTask, toDisposable, toExtensionConfigView } from "@nextclaw/core";
 import { LocalAssetStore, buildAssetContentPath, buildNcpUserContent, buildOpenAiFunctionTool, ncpMessageToOpenAiMessages, validateToolArgs } from "@nextclaw/ncp-agent-runtime";
 import { createHash, createHmac, randomBytes, randomUUID, scryptSync, timingSafeEqual } from "node:crypto";
 import { EventBus, Ingress, eventKeys, ingressKeys } from "@nextclaw/shared";
@@ -148,6 +148,12 @@ function toLegacyMessages(messages, options = {}) {
 //#region src/features/context-compaction/utils/context-compaction-timeline-message.utils.ts
 const NEXTCLAW_TIMELINE_KIND_METADATA_KEY = "nextclaw_timeline_kind";
 const CONTEXT_COMPACTION_TIMELINE_KIND = "context_compaction";
+function readCheckpointTimelineText(checkpoint) {
+	return checkpoint.status === "compressing" ? "正在压缩较早上下文" : "较早上下文已自动压缩";
+}
+function createContextCompactionMessageId() {
+	return `context-compaction-message-${randomUUID()}`;
+}
 function readTimelineMetadata(message) {
 	const rawMetadata = message?.ncp_metadata;
 	if (!rawMetadata || typeof rawMetadata !== "object" || Array.isArray(rawMetadata)) return null;
@@ -161,13 +167,14 @@ function readTimelineMetadata(message) {
 	};
 }
 function buildTimelineMessage(checkpoint) {
+	const text = readCheckpointTimelineText(checkpoint);
 	return {
 		role: "service",
-		content: checkpoint.status === "compressing" ? "正在压缩较早上下文" : "较早上下文已自动压缩",
+		content: text,
 		timestamp: checkpoint.updatedAt,
 		ncp_parts: [{
 			type: "text",
-			text: checkpoint.status === "compressing" ? "正在压缩较早上下文" : "较早上下文已自动压缩"
+			text
 		}],
 		ncp_metadata: {
 			[NEXTCLAW_TIMELINE_KIND_METADATA_KEY]: CONTEXT_COMPACTION_TIMELINE_KIND,
@@ -176,10 +183,10 @@ function buildTimelineMessage(checkpoint) {
 	};
 }
 function buildContextCompactionTimelineNcpMessage(params) {
-	const { checkpoint, sessionId } = params;
-	const text = checkpoint.status === "compressing" ? "正在压缩较早上下文" : "较早上下文已自动压缩";
+	const { checkpoint, messageId, sessionId } = params;
+	const text = readCheckpointTimelineText(checkpoint);
 	return {
-		id: `${sessionId}:service:context-compaction:${checkpoint.id}`,
+		id: messageId,
 		sessionId,
 		role: "service",
 		status: "final",
@@ -233,34 +240,31 @@ function isContextCompactionTimelineMessage(message) {
 }
 //#endregion
 //#region src/features/context-compaction/utils/context-compaction-projection.utils.ts
-function readCompactionSummary(message) {
+function readCompactionCheckpoint(message) {
 	const metadata = message.metadata;
-	if (metadata?.["nextclaw_timeline_kind"] !== "context_compaction") return null;
-	return readCompressedContextCompactionCheckpoint(metadata.checkpoint)?.summary ?? null;
+	return metadata?.["nextclaw_timeline_kind"] === "context_compaction" ? readCompressedContextCompactionCheckpoint(metadata.checkpoint) : null;
+}
+function readLatestContextCompactionCheckpoint(sessionMessages) {
+	return sessionMessages.reduce((checkpoint, message) => {
+		const candidateCheckpoint = readCompactionCheckpoint(message);
+		return candidateCheckpoint && (!checkpoint || Date.parse(candidateCheckpoint.updatedAt) >= Date.parse(checkpoint.updatedAt)) ? candidateCheckpoint : checkpoint;
+	}, null);
 }
 function projectNcpMessagesWithContextCompaction(params) {
 	const { sessionId, sessionMessages } = params;
-	let checkpointIndex = -1;
-	let summary = "";
-	for (let index = sessionMessages.length - 1; index >= 0; index -= 1) {
-		const candidateSummary = readCompactionSummary(sessionMessages[index]);
-		if (!candidateSummary) continue;
-		checkpointIndex = index;
-		summary = candidateSummary;
-		break;
-	}
-	if (checkpointIndex < 0) return sessionMessages.filter((message) => !readCompactionSummary(message)).map((message) => structuredClone(message));
+	const checkpoint = readLatestContextCompactionCheckpoint(sessionMessages);
+	if (!checkpoint) return sessionMessages.filter((message) => !readCompactionCheckpoint(message)).map((message) => structuredClone(message));
 	return [{
-		id: `${sessionId}:context-compaction-summary:${sessionMessages[checkpointIndex]?.id ?? "latest"}`,
+		id: `${sessionId}:context-compaction-summary:${checkpoint.id}:${checkpoint.updatedAt}`,
 		sessionId,
 		role: "user",
 		status: "final",
-		timestamp: sessionMessages[checkpointIndex]?.timestamp ?? (/* @__PURE__ */ new Date()).toISOString(),
+		timestamp: checkpoint.updatedAt,
 		parts: [{
 			type: "text",
-			text: summary
+			text: checkpoint.summary
 		}]
-	}, ...sessionMessages.slice(checkpointIndex + 1).filter((message) => !readCompactionSummary(message)).map((message) => structuredClone(message))];
+	}, ...sessionMessages.filter((message) => !readCompactionCheckpoint(message) && Date.parse(message.timestamp) > Date.parse(checkpoint.updatedAt)).sort((left, right) => Date.parse(left.timestamp) - Date.parse(right.timestamp)).map((message) => structuredClone(message))];
 }
 //#endregion
 //#region src/features/context-compaction/services/context-compaction-preflight.service.ts
@@ -311,23 +315,6 @@ function buildContextWindowSnapshotFromBudget(params) {
 		compactedUsedContextTokens: checkpoint ? budget.estimatedTokens : void 0
 	});
 }
-function buildContextWindowSnapshotForMessages(contextWindowBudgetService, params) {
-	const { checkpoint, contextTokens, reservedContextTokens, sessionId, sessionMessages } = params;
-	const modelCandidateMessages = sessionMessages.filter((message) => !isContextCompactionTimelineMessage(message));
-	const messages = toLegacyMessages(checkpoint ? projectNcpMessagesWithContextCompaction({
-		sessionId,
-		sessionMessages
-	}) : modelCandidateMessages);
-	return buildContextWindowSnapshotFromBudget({
-		budget: contextWindowBudgetService.evaluate({
-			messages,
-			contextTokens,
-			reservedContextTokens
-		}),
-		checkpoint,
-		totalContextTokens: contextTokens
-	});
-}
 var ContextCompactionPreflightService = class {
 	compactionService = new ContextCompactionService();
 	contextWindowBudgetService = new ContextWindowBudgetService();
@@ -341,13 +328,19 @@ var ContextCompactionPreflightService = class {
 			requestMetadata,
 			storedAgentId
 		});
-		const existingCheckpoint = readCompressedContextCompactionCheckpoint(storedMetadata[CONTEXT_COMPACTION_METADATA_KEY]);
-		return buildContextWindowSnapshotForMessages(this.contextWindowBudgetService, {
-			checkpoint: existingCheckpoint,
-			contextTokens: profile.contextTokens,
-			reservedContextTokens: profile.reservedContextTokens,
+		const existingCheckpoint = readCompressedContextCompactionCheckpoint(storedMetadata[CONTEXT_COMPACTION_METADATA_KEY]) ?? readLatestContextCompactionCheckpoint(sessionMessages);
+		const projectedMessages = existingCheckpoint ? projectNcpMessagesWithContextCompaction({
 			sessionId,
 			sessionMessages
+		}) : sessionMessages.filter((message) => !isContextCompactionTimelineMessage(message));
+		return buildContextWindowSnapshotFromBudget({
+			budget: this.contextWindowBudgetService.evaluate({
+				messages: toLegacyMessages(projectedMessages),
+				contextTokens: profile.contextTokens,
+				reservedContextTokens: profile.reservedContextTokens
+			}),
+			checkpoint: existingCheckpoint,
+			totalContextTokens: profile.contextTokens
 		});
 	};
 	begin = (params) => {
@@ -362,26 +355,27 @@ var ContextCompactionPreflightService = class {
 			inputMessages,
 			sessionMessages
 		});
-		const modelCandidateMessages = ncpMessages.filter((message) => !isContextCompactionTimelineMessage(message));
-		const existingCheckpoint = readCompressedContextCompactionCheckpoint(storedMetadata[CONTEXT_COMPACTION_METADATA_KEY]);
+		const existingCheckpoint = readCompressedContextCompactionCheckpoint(storedMetadata[CONTEXT_COMPACTION_METADATA_KEY]) ?? readLatestContextCompactionCheckpoint(ncpMessages);
 		const messages = toLegacyMessages(existingCheckpoint ? projectNcpMessagesWithContextCompaction({
 			sessionId,
 			sessionMessages: ncpMessages
-		}) : modelCandidateMessages);
+		}) : ncpMessages.filter((message) => !isContextCompactionTimelineMessage(message)));
 		const budget = this.contextWindowBudgetService.evaluate({
 			messages,
 			contextTokens,
 			reservedContextTokens
 		});
-		const plan = existingCheckpoint || !budget.shouldCompact ? null : this.compactionService.prepareForModelInput({
+		const plan = !budget.shouldCompact ? null : this.compactionService.prepareForModelInput({
 			messages: budget.messages,
 			contextTokens,
 			compactionThresholdTokens: budget.triggerTokens
 		});
+		const coveredSessionMessageCount = plan ? (existingCheckpoint?.coveredSessionMessageCount ?? 0) + plan.coveredMessages.length - (existingCheckpoint ? 1 : 0) : 0;
+		const serviceMessageId = createContextCompactionMessageId();
 		const checkpoint = plan ? {
 			...buildCompressingCompactionCheckpoint(storedMetadata[CONTEXT_COMPACTION_METADATA_KEY]),
-			coveredMessageCount: plan.coveredMessages.length,
-			coveredSessionMessageCount: plan.coveredMessages.length,
+			coveredMessageCount: coveredSessionMessageCount,
+			coveredSessionMessageCount,
 			originalEstimatedTokens: plan.originalEstimatedTokens,
 			projectedEstimatedTokens: budget.estimatedTokens
 		} : existingCheckpoint;
@@ -394,12 +388,14 @@ var ContextCompactionPreflightService = class {
 			metadataPatch: plan && checkpoint ? { [CONTEXT_COMPACTION_METADATA_KEY]: checkpoint } : {},
 			sessionMessages: ncpMessages,
 			timelineMessage: plan && checkpoint ? buildContextCompactionTimelineNcpMessage({
+				messageId: serviceMessageId,
 				sessionId,
 				checkpoint
 			}) : null,
 			pendingCompaction: plan && checkpoint ? {
 				checkpoint,
 				contextTokens,
+				serviceMessageId,
 				model: profile.model,
 				plan,
 				reservedContextTokens,
@@ -423,6 +419,8 @@ var ContextCompactionPreflightService = class {
 			...generatedCheckpoint,
 			id: pending.checkpoint.id,
 			createdAt: pending.checkpoint.createdAt,
+			coveredMessageCount: pending.checkpoint.coveredMessageCount,
+			coveredSessionMessageCount: pending.checkpoint.coveredSessionMessageCount,
 			status: "compressed"
 		};
 		return {
@@ -438,6 +436,7 @@ var ContextCompactionPreflightService = class {
 			metadataPatch: { [CONTEXT_COMPACTION_METADATA_KEY]: checkpoint },
 			sessionMessages: pending.sessionMessages,
 			timelineMessage: buildContextCompactionTimelineNcpMessage({
+				messageId: pending.serviceMessageId,
 				sessionId: pending.sessionId,
 				checkpoint
 			})
@@ -3071,6 +3070,30 @@ var McpManager = class {
 		for (const result of results) if (!result.ok) console.warn(`[mcp] Failed to warm ${result.name}: ${result.error}`);
 	};
 };
+//#endregion
+//#region src/utils/agent-peer-session.utils.ts
+const AGENT_RUN_PEER_ID_METADATA_KEY = "agent_peer_id";
+const AGENT_RUN_PEER_SCOPE_METADATA_KEY = "agent_peer_scope";
+function createAgentPeerSessionIdentity(params) {
+	const scope = resolveAgentPeerScope(params);
+	return {
+		metadata: {
+			[AGENT_RUN_PEER_ID_METADATA_KEY]: params.peerId,
+			[AGENT_RUN_PEER_SCOPE_METADATA_KEY]: scope
+		},
+		sessionId: `agent-peer-${createHash("sha256").update(`${scope}\0${params.peerId}`).digest("hex").slice(0, 32)}`
+	};
+}
+function resolveAgentPeerScope(params) {
+	const metadata = params.metadata ?? {};
+	const explicitScope = readOptionalString$8(metadata["agent_peer_scope"]) ?? readOptionalString$8(metadata.agentPeerScope);
+	if (explicitScope) return explicitScope;
+	return `agent:${readOptionalString$8(params.agentId) ?? BUILTIN_MAIN_AGENT_ID}:${readOptionalString$8(params.channel) ?? readOptionalString$8(metadata.channel) ?? "agent-run"}:${readOptionalString$8(metadata.accountId) ?? readOptionalString$8(metadata.account_id) ?? "default"}`;
+}
+function readOptionalString$8(value) {
+	if (typeof value !== "string") return;
+	return value.trim() || void 0;
+}
 const NCP_AGENT_SESSION_JOURNAL_INDEX_FILE = ".ncp-agent-session-index.json";
 const AUTO_SESSION_LABEL_MAX_LENGTH = 64;
 const NCP_AGENT_SESSION_SNAPSHOT_MESSAGE_EVENT_TYPE = "session.snapshot.message";
@@ -3096,10 +3119,12 @@ function toIsoString(value, fallback) {
 function createNcpAgentSessionSummary(record) {
 	const metadata = structuredClone(record.metadata ?? {});
 	const label = readOptionalText(metadata.label) ?? resolveAutoSessionLabel(record.messages);
+	const peerId = readNcpAgentSessionPeerId(metadata);
 	if (label) metadata.label = label;
 	const lastMessageAt = record.messages.reduceRight((timestamp, message) => timestamp ?? readMessageTimestamp(message), void 0);
 	return {
 		sessionId: record.sessionId,
+		peerId: peerId ?? void 0,
 		...normalizeNcpAgentId(record.agentId) ? { agentId: normalizeNcpAgentId(record.agentId) } : {},
 		messageCount: record.messages.length,
 		...record.createdAt ? { createdAt: record.createdAt } : {},
@@ -3109,6 +3134,9 @@ function createNcpAgentSessionSummary(record) {
 		...Object.keys(metadata).length > 0 ? { metadata } : {}
 	};
 }
+function readNcpAgentSessionPeerId(metadata) {
+	return readOptionalText(metadata[AGENT_RUN_PEER_ID_METADATA_KEY]);
+}
 function createNcpAgentSessionJournalMetadataEntry(record) {
 	return {
 		_type: "metadata",
@@ -3125,6 +3153,7 @@ function upsertNcpAgentSessionSummaryEvent(params) {
 	const lastMessageAt = readMessageTimestamp(eventMessage) ?? current?.lastMessageAt;
 	return {
 		sessionId,
+		peerId: current?.peerId,
 		...normalizeNcpAgentId(current?.agentId) ? { agentId: normalizeNcpAgentId(current?.agentId) } : {},
 		messageCount,
 		createdAt: current?.createdAt ?? updatedAt,
@@ -3135,9 +3164,14 @@ function upsertNcpAgentSessionSummaryEvent(params) {
 }
 async function replayNcpAgentSessionEvents(events) {
 	const stateManager = new DefaultNcpAgentConversationStateManager();
+	const knownMessageIds = /* @__PURE__ */ new Set();
 	for (const event of events) {
 		if (isJournalOnlyEvent(event)) continue;
-		await stateManager.dispatch(createReplayEvent(event));
+		const replayEvent = createReplayEvent(event);
+		const bootstrapEvent = createReplayStreamingBootstrapEvent(replayEvent, knownMessageIds);
+		if (bootstrapEvent) await stateManager.dispatch(bootstrapEvent);
+		rememberReplayMessageId(replayEvent, knownMessageIds);
+		await stateManager.dispatch(replayEvent);
 	}
 	const snapshot = stateManager.getSnapshot();
 	return [...snapshot.messages.map((message) => structuredClone(message)), ...snapshot.streamingMessage ? [structuredClone(snapshot.streamingMessage)] : []];
@@ -3145,6 +3179,8 @@ async function replayNcpAgentSessionEvents(events) {
 function createReplayEvent(event) {
 	const replayEvent = structuredClone(event);
 	const replayMessage = readMessageFromSummaryEvent(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 (replayEvent.type === "session.snapshot.message" || replayEvent.type === NcpEventType.MessageCompleted) return {
 		type: NcpEventType.MessageSent,
@@ -3152,6 +3188,58 @@ function createReplayEvent(event) {
 	};
 	return replayEvent;
 }
+function readLegacyContextCompactionMessageId(message) {
+	const checkpoint = isRecord$10(message?.metadata?.checkpoint) ? message.metadata.checkpoint : null;
+	const checkpointId = typeof checkpoint?.id === "string" ? checkpoint.id : "";
+	const coveredCount = checkpoint?.coveredSessionMessageCount;
+	const legacyId = `${message?.sessionId}:service:context-compaction:${checkpointId}`;
+	return typeof coveredCount === "number" && message?.id === legacyId ? `${legacyId}:${coveredCount}` : null;
+}
+function createReplayStreamingBootstrapEvent(event, knownMessageIds) {
+	const messageId = readStreamingMessageId(event);
+	if (!messageId || knownMessageIds.has(messageId)) return null;
+	knownMessageIds.add(messageId);
+	return {
+		type: NcpEventType.MessageSent,
+		payload: {
+			sessionId: readEventSessionId$2(event),
+			message: {
+				id: messageId,
+				sessionId: readEventSessionId$2(event),
+				role: "assistant",
+				status: "streaming",
+				parts: [],
+				timestamp: readReplayPayloadTimestamp(event) ?? (/* @__PURE__ */ new Date()).toISOString()
+			}
+		}
+	};
+}
+function rememberReplayMessageId(event, knownMessageIds) {
+	const message = readMessageFromSummaryEvent(event);
+	if (message?.id) knownMessageIds.add(message.id);
+}
+function readEventSessionId$2(event) {
+	const sessionId = ("payload" in event && isRecord$10(event.payload) ? event.payload : null)?.sessionId;
+	return typeof sessionId === "string" ? sessionId : "";
+}
+function readReplayPayloadTimestamp(event) {
+	const payload = "payload" in event && isRecord$10(event.payload) ? event.payload : null;
+	const timestamp = typeof payload?.timestamp === "string" ? payload.timestamp : "";
+	return Number.isFinite(Date.parse(timestamp)) ? new Date(timestamp).toISOString() : null;
+}
+function readStreamingMessageId(event) {
+	switch (event.type) {
+		case NcpEventType.MessageTextStart:
+		case NcpEventType.MessageTextDelta:
+		case NcpEventType.MessageTextEnd:
+		case NcpEventType.MessageReasoningStart:
+		case NcpEventType.MessageReasoningDelta:
+		case NcpEventType.MessageReasoningEnd:
+		case NcpEventType.MessageToolCallStart:
+		case NcpEventType.MessageToolCallArgsDelta: return event.payload.messageId?.trim() || null;
+		default: return null;
+	}
+}
 function isJournalOnlyEvent(event) {
 	return event.type === "session.request.accepted" || event.type === "session.request.completed" || event.type === "session.request.failed";
 }
@@ -3182,30 +3270,6 @@ function readMessageFromSummaryEvent(event) {
 	if (event.type === NcpEventType.MessageSent || event.type === NcpEventType.MessageCompleted || event.type === "session.snapshot.message") return event.payload.message;
 }
 //#endregion
-//#region src/utils/agent-peer-session.utils.ts
-const AGENT_RUN_PEER_ID_METADATA_KEY = "agent_peer_id";
-const AGENT_RUN_PEER_SCOPE_METADATA_KEY = "agent_peer_scope";
-function createAgentPeerSessionIdentity(params) {
-	const scope = resolveAgentPeerScope(params);
-	return {
-		metadata: {
-			[AGENT_RUN_PEER_ID_METADATA_KEY]: params.peerId,
-			[AGENT_RUN_PEER_SCOPE_METADATA_KEY]: scope
-		},
-		sessionId: `agent-peer-${createHash("sha256").update(`${scope}\0${params.peerId}`).digest("hex").slice(0, 32)}`
-	};
-}
-function resolveAgentPeerScope(params) {
-	const metadata = params.metadata ?? {};
-	const explicitScope = readOptionalString$8(metadata["agent_peer_scope"]) ?? readOptionalString$8(metadata.agentPeerScope);
-	if (explicitScope) return explicitScope;
-	return `agent:${readOptionalString$8(params.agentId) ?? BUILTIN_MAIN_AGENT_ID}:${readOptionalString$8(params.channel) ?? readOptionalString$8(metadata.channel) ?? "agent-run"}:${readOptionalString$8(metadata.accountId) ?? readOptionalString$8(metadata.account_id) ?? "default"}`;
-}
-function readOptionalString$8(value) {
-	if (typeof value !== "string") return;
-	return value.trim() || void 0;
-}
-//#endregion
 //#region src/managers/session.manager.ts
 const DEFAULT_SESSION_TYPE = "native";
 const DEFAULT_LIFECYCLE = "persistent";
@@ -3424,7 +3488,8 @@ var SessionManager = class {
 		return await this.options.journalStore.getSession(normalizedSessionId);
 	};
 	listSessions = async (options) => {
-		return applyLimit(await this.options.journalStore.listSessionSummaries(), options?.limit);
+		const peerId = readOptionalString$7(options?.peerId);
+		return applyLimit((await this.options.journalStore.listSessionSummaries()).filter((summary) => !peerId || summary.peerId === peerId), options?.limit);
 	};
 	listSessionMessages = async (sessionId, options) => {
 		const normalizedSessionId = normalizeSessionId(sessionId);
@@ -4308,6 +4373,35 @@ function getPanelAppBridgeScript(params = {
     });
   }
 
+  function resolveApiFetchUrl(input) {
+    const raw = typeof input === "string" || input instanceof URL ? input.toString() : input?.url;
+    if (typeof raw !== "string") {
+      return null;
+    }
+    try {
+      const url = new URL(raw, window.location.href);
+      return url.origin === window.location.origin && url.pathname.startsWith("/api/") ? url : null;
+    } catch {
+      return null;
+    }
+  }
+
+  function createFetchInitWithRuntimeToken(input, init) {
+    if (!resolveApiFetchUrl(input)) {
+      return init;
+    }
+    const headers = new Headers(init?.headers || (typeof input === "object" && input ? input.headers : undefined));
+    if (!headers.has("x-nextclaw-panel-bridge-session")) {
+      headers.set("x-nextclaw-panel-bridge-session", runtimeToken);
+    }
+    return { ...init, headers };
+  }
+
+  const nativeFetch = window.fetch?.bind(window);
+  if (nativeFetch) {
+    window.fetch = (input, init) => nativeFetch(input, createFetchInitWithRuntimeToken(input, init));
+  }
+
   function unwrapServiceActionResult(result) {
     if (!result || typeof result !== "object") {
       return result;
@@ -4385,7 +4479,7 @@ const PANEL_APP_CLIENT_MARKER = "nextclaw:panel-app-client:init";
 const PANEL_APP_CLIENT_SDK_PATH = "/api/panel-app-client-sdk.js";
 function injectPanelAppClientScript(html, params) {
 	if (html.includes(PANEL_APP_CLIENT_MARKER)) return html;
-	const script = [`<script src="${PANEL_APP_CLIENT_SDK_PATH}"><\/script>`, `<script>${getPanelAppClientInitScript(params)}<\/script>`].join("");
+	const script = [`<script src="${PANEL_APP_CLIENT_SDK_PATH}" crossorigin="anonymous"><\/script>`, `<script>${getPanelAppClientInitScript(params)}<\/script>`].join("");
 	const headMatch = /<head(?:\s[^>]*)?>/i.exec(html);
 	if (headMatch?.index !== void 0) {
 		const insertAt = headMatch.index + headMatch[0].length;
@@ -4401,13 +4495,18 @@ function getPanelAppClientInitScript(params) {
     console.error("[NextClaw] Panel App client SDK failed to load.");
     return;
   }
+  if (typeof window.createNextClawAppClient !== "function") {
+    console.error("[NextClaw] Panel App client projection failed to load.");
+    return;
+  }
   const existing = window.nextclaw && typeof window.nextclaw === "object" ? window.nextclaw : {};
-  const client = new window.NextClawClient({
+  const hostClient = new window.NextClawClient({
     baseUrl: window.location.origin,
     headers: {
       "x-nextclaw-panel-bridge-session": ${JSON.stringify(params.runtimeToken)}
     }
   });
+  const client = window.createNextClawAppClient(hostClient);
   Object.defineProperty(window, "nextclaw", {
     configurable: true,
     value: {
@@ -4612,9 +4711,27 @@ function resolvePanelAppIconUrl(id, icon) {
 }
 function injectPanelAppAssetBase(html, baseHref) {
 	const base = `<base href="${baseHref}">`;
-	if (/<base\b/i.test(html)) return html;
-	if (/<head[^>]*>/i.test(html)) return html.replace(/<head[^>]*>/i, (head) => `${head}${base}`);
-	return `${base}${html}`;
+	return injectLocalScriptCrossOrigin((() => {
+		if (/<base\b/i.test(html)) return html;
+		if (/<head[^>]*>/i.test(html)) return html.replace(/<head[^>]*>/i, (head) => `${head}${base}`);
+		return `${base}${html}`;
+	})());
+}
+function injectLocalScriptCrossOrigin(html) {
+	return html.replace(/<script\b(?=[^>]*\bsrc\s*=)(?![^>]*\bcrossorigin\b)[^>]*>/gi, (tag) => {
+		const src = extractScriptSrc(tag);
+		if (!src || !isLocalScriptSrc(src)) return tag;
+		return `${tag.slice(0, -1)} crossorigin="anonymous">`;
+	});
+}
+function extractScriptSrc(tag) {
+	const match = /\bsrc\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/i.exec(tag);
+	return match?.[1] ?? match?.[2] ?? match?.[3];
+}
+function isLocalScriptSrc(src) {
+	const value = src.trim();
+	if (!value || value.startsWith("//")) return false;
+	return !/^(?:https?|data|blob|javascript):/i.test(value);
 }
 function encodePanelAppAssetPath(path) {
 	return path.split("/").filter(Boolean).map((segment) => encodeURIComponent(segment)).join("/");
@@ -5123,7 +5240,7 @@ var McpServiceAppRuntimeService = class {
 				command: manifest.command,
 				args: manifest.args,
 				cwd: app.dirPath,
-				env: {},
+				env: createRuntimeChildEnv(process.env),
 				stderr: "pipe"
 			},
 			scope: {
@@ -5402,7 +5519,7 @@ var ServiceAppManager = class {
 		return record;
 	};
 	listServiceActions = async (params = {}) => {
-		const actions = (params.appId ? [await this.requireServiceApp(params.appId)] : await this.listValidServiceApps()).flatMap(({ manifest, record }) => this.listManifestActions(record, manifest));
+		const actions = (params.appId ? [await this.requireServiceApp(params.appId)] : await this.listValidServiceApps()).flatMap(({ manifest, record }) => listServiceAppManifestActions(record, manifest));
 		return await Promise.all(actions.map(async (action) => await this.withGrantState(action, params)));
 	};
 	discoverServiceAppActions = async (appId) => {
@@ -5497,7 +5614,7 @@ var ServiceAppManager = class {
 	};
 	requireServiceAction = async (actionId) => {
 		const { manifest, record } = await this.requireServiceAppForAction(actionId);
-		const action = this.listManifestActions(record, manifest).find((entry) => entry.id === actionId);
+		const action = listServiceAppManifestActions(record, manifest).find((entry) => entry.id === actionId);
 		if (!action) throw new ServiceAppError("SERVICE_APP_ACTION_NOT_FOUND", "service action not found");
 		return action;
 	};
@@ -5506,7 +5623,6 @@ var ServiceAppManager = class {
 		if (!appId) throw new ServiceAppError("SERVICE_APP_INVALID_ACTION", "service action id is invalid");
 		return await this.requireServiceApp(appId);
 	};
-	listManifestActions = (record, manifest) => listServiceAppManifestActions(record, manifest);
 	requireServiceApp = async (appId) => {
 		const dirPath = join(this.getServiceAppsPath(this.getWorkspacePath()), appId);
 		try {
@@ -5562,9 +5678,10 @@ var ServiceAppManager = class {
 	};
 	toServiceAppRecord = (dirPath, manifest) => {
 		const runtimeStatus = this.runtimeService.getStatus(manifest.id);
-		const record = {
+		return {
 			id: manifest.id,
 			title: manifest.title,
+			description: manifest.description,
 			dirPath,
 			manifestPath: getServiceAppManifestPath(dirPath),
 			command: manifest.command,
@@ -5572,14 +5689,12 @@ var ServiceAppManager = class {
 			cwd: dirPath,
 			enabled: manifest.enabled,
 			protocol: manifest.protocol,
-			status: manifest.enabled ? runtimeStatus.status : "stopped"
+			status: manifest.enabled ? runtimeStatus.status : "stopped",
+			lastError: runtimeStatus.lastError,
+			lastStartedAt: runtimeStatus.lastStartedAt,
+			lastReadyAt: runtimeStatus.lastReadyAt,
+			lastFailedAt: runtimeStatus.lastFailedAt
 		};
-		if (manifest.description) record.description = manifest.description;
-		if (runtimeStatus.lastError) record.lastError = runtimeStatus.lastError;
-		if (runtimeStatus.lastStartedAt) record.lastStartedAt = runtimeStatus.lastStartedAt;
-		if (runtimeStatus.lastReadyAt) record.lastReadyAt = runtimeStatus.lastReadyAt;
-		if (runtimeStatus.lastFailedAt) record.lastFailedAt = runtimeStatus.lastFailedAt;
-		return record;
 	};
 	assertCaller = (caller) => {
 		if (caller.surface !== "panel-app" || !caller.appId.trim()) throw new ServiceAppError("SERVICE_APP_INVALID_CALLER", "service action caller is invalid");
@@ -5599,7 +5714,7 @@ var ServiceAppManager = class {
 			throw new ServiceAppError("SERVICE_APP_READ_FAILED", error instanceof Error ? error.message : String(error));
 		}
 	};
-	isMissingFileError = (error) => Boolean(error) && typeof error === "object" && error.code === "ENOENT";
+	isMissingFileError = (error) => typeof error === "object" && error !== null && error.code === "ENOENT";
 };
 function toTitle(value) {
 	return basename(value).replace(/[-_]+/g, " ").trim() || value;
@@ -6064,6 +6179,16 @@ function serializeJournalEntry(entry) {
 	if (!isRecord$10(JSON.parse(serialized))) throw new Error("ncp agent session journal entry serialization produced a non-object entry");
 	return serialized;
 }
+function attachJournalTimestamp(event, timestamp) {
+	if (!("payload" in event) || !isRecord$10(event.payload)) return event;
+	return {
+		...event,
+		payload: {
+			...event.payload,
+			timestamp
+		}
+	};
+}
 var NcpAgentSessionJournalStore = class {
 	sessions = /* @__PURE__ */ new Map();
 	nextSeqBySession = /* @__PURE__ */ new Map();
@@ -6230,8 +6355,10 @@ var NcpAgentSessionJournalStore = class {
 			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 } : {}
 		};
@@ -6288,9 +6415,10 @@ var NcpAgentSessionJournalStore = class {
 			if (parsed._type === "event" && isRecord$10(parsed.event)) {
 				const seq = Number(parsed.seq);
 				nextSeq = Math.max(nextSeq, Number.isFinite(seq) ? Math.trunc(seq) + 1 : nextSeq);
-				updatedAt = toIsoString(parsed.timestamp, updatedAt);
+				const eventTimestamp = toIsoString(parsed.timestamp, updatedAt);
+				updatedAt = eventTimestamp;
 				const event = structuredClone(parsed.event);
-				events.push(event);
+				events.push(attachJournalTimestamp(event, eventTimestamp));
 			}
 		}
 		return {
@@ -9584,6 +9712,6 @@ function resolveLegacyEventType(message) {
 	return `message.${role || "other"}`;
 }
 //#endregion
-export { AccessManager, AgentManager, AgentRunClient, AgentRuntimeRegistry, AutomationManager, BuiltinNarpRuntimeProviderService, CONTEXT_COMPACTION_TIMELINE_KIND, ChannelManager, CommandRegistry, ConfigManager, ContextCompactionPreflightService, ContextWindowPreviewManager, DEFAULT_AGENT_RUNTIME_ENTRY_ID, DEFAULT_SERVICE_ACTION_RISK, ExtensionManager, GatewayInboundProcessor, LlmProviderManager, LlmUsageManager, LlmUsageStore, McpManager, McpServiceAppRuntimeService, NARP_HTTP_RUNTIME_KIND, NARP_STDIO_RUNTIME_KIND, NEXTCLAW_TIMELINE_KIND_METADATA_KEY, NcpAgentSessionJournalStore, NextclawKernel, PANEL_APP_AGENT_CAPABILITIES, PanelAppAssetTokenService, PanelAppError, PanelAppManager, ProviderManagerNcpLLMApi, SERVICE_APP_MANIFEST_FILE_NAME, ServiceAppError, ServiceAppManager, SessionManager, SessionRequestManager, SkillManager, UpdateManifestReader, buildAgentRunSendPayload, buildContextCompactionTimelineNcpMessage, buildLlmUsageSummary, buildLocalizedTextMap, buildServiceActionId, buildSessionOrchestrationSection, createAgentRuntimeSessionRequestDispatcher, createAssetTools, createContextWindowSignature, createLlmUsageRecord, dispatchAgentRuntimeSessionRequest, dispatchChannelReplyRoute, dispatchPromptOverNcp, getServiceActionName, getServiceAppManifestPath, getUnsignedUpdateManifest, hasLlmUsageTelemetry, isContextCompactionTimelineMessage, isContextWindowSnapshot, isPanelAppAgentCapability, isPanelAppError, isReplyCapableChannel, isServiceAppError, listExtensionChannelIds, listServiceAppManifestActions, mergeServiceAppRuntimeActions, normalizeAgentRuntimeSessionTypeIcon, normalizeLlmUsageModel, normalizeOptionalString, parseServiceAppManifest, parseSkillFrontmatter, projectNcpMessagesWithContextCompaction, readContextWindowEventSessionId, readLearningLoopRuntimeConfig, readMetadataModel, readMetadataThinking, readServiceAppManifest, resolveAgentRuntimeEntries, resolveChannelReplyRoute, resolveEffectiveModel, resolveLegacyEventType, resolveNextclawNcpRunContext, resolveSessionChannelContext, runGatewayInboundLoop, sanitizeLlmUsage, serializeUnsignedUpdateManifest, shouldRefreshContextWindowDuringStream, shouldRefreshContextWindowImmediately, stripSkillFrontmatter, syncSessionThinkingPreference, toNcpMessages, upsertContextCompactionTimelineMessage, waitForAgentRuntimeSessionReply };
+export { AccessManager, AgentManager, AgentRunClient, AgentRuntimeRegistry, AutomationManager, BuiltinNarpRuntimeProviderService, CONTEXT_COMPACTION_TIMELINE_KIND, ChannelManager, CommandRegistry, ConfigManager, ContextCompactionPreflightService, ContextWindowPreviewManager, DEFAULT_AGENT_RUNTIME_ENTRY_ID, DEFAULT_SERVICE_ACTION_RISK, ExtensionManager, GatewayInboundProcessor, LlmProviderManager, LlmUsageManager, LlmUsageStore, McpManager, McpServiceAppRuntimeService, NARP_HTTP_RUNTIME_KIND, NARP_STDIO_RUNTIME_KIND, NEXTCLAW_TIMELINE_KIND_METADATA_KEY, NcpAgentSessionJournalStore, NextclawKernel, PANEL_APP_AGENT_CAPABILITIES, PanelAppAssetTokenService, PanelAppError, PanelAppManager, ProviderManagerNcpLLMApi, SERVICE_APP_MANIFEST_FILE_NAME, ServiceAppError, ServiceAppManager, SessionManager, SessionRequestManager, SkillManager, UpdateManifestReader, buildAgentRunSendPayload, buildContextCompactionTimelineNcpMessage, buildLlmUsageSummary, buildLocalizedTextMap, buildServiceActionId, buildSessionOrchestrationSection, createAgentRuntimeSessionRequestDispatcher, createAssetTools, createContextCompactionMessageId, createContextWindowSignature, createLlmUsageRecord, dispatchAgentRuntimeSessionRequest, dispatchChannelReplyRoute, dispatchPromptOverNcp, getServiceActionName, getServiceAppManifestPath, getUnsignedUpdateManifest, hasLlmUsageTelemetry, isContextCompactionTimelineMessage, isContextWindowSnapshot, isPanelAppAgentCapability, isPanelAppError, isReplyCapableChannel, isServiceAppError, listExtensionChannelIds, listServiceAppManifestActions, mergeServiceAppRuntimeActions, normalizeAgentRuntimeSessionTypeIcon, normalizeLlmUsageModel, normalizeOptionalString, parseServiceAppManifest, parseSkillFrontmatter, projectNcpMessagesWithContextCompaction, readContextWindowEventSessionId, readLatestContextCompactionCheckpoint, readLearningLoopRuntimeConfig, readMetadataModel, readMetadataThinking, readServiceAppManifest, resolveAgentRuntimeEntries, resolveChannelReplyRoute, resolveEffectiveModel, resolveLegacyEventType, resolveNextclawNcpRunContext, resolveSessionChannelContext, runGatewayInboundLoop, sanitizeLlmUsage, serializeUnsignedUpdateManifest, shouldRefreshContextWindowDuringStream, shouldRefreshContextWindowImmediately, stripSkillFrontmatter, syncSessionThinkingPreference, toNcpMessages, upsertContextCompactionTimelineMessage, waitForAgentRuntimeSessionReply };
 
 //# sourceMappingURL=index.js.map