@nextclaw/kernel 0.5.1-beta.1 → 0.5.1

package/dist/index.js

@@ -3433,29 +3433,53 @@ function upsertNcpAgentSessionSummaryEvent(params) {
 async function replayNcpAgentSessionEvents(events) {
 	const stateManager = new DefaultNcpAgentConversationStateManager();
 	const knownMessageIds = /* @__PURE__ */ new Set();
+	const toolResultsByCallId = /* @__PURE__ */ new Map();
 	for (const event of events) {
 		if (isJournalOnlyEvent(event)) continue;
-		const replayEvent = createReplayEvent(event);
+		const replayEvent = createReplayEvent(event, toolResultsByCallId);
 		const bootstrapEvent = createReplayStreamingBootstrapEvent(replayEvent, knownMessageIds);
 		if (bootstrapEvent) await stateManager.dispatch(bootstrapEvent);
 		rememberReplayMessageId(replayEvent, knownMessageIds);
 		await stateManager.dispatch(replayEvent);
+		if (replayEvent.type === NcpEventType.MessageToolCallResult) toolResultsByCallId.set(replayEvent.payload.toolCallId, replayEvent.payload);
 	}
 	const snapshot = stateManager.getSnapshot();
 	return [...snapshot.messages.map((message) => structuredClone(message)), ...snapshot.streamingMessage ? [structuredClone(snapshot.streamingMessage)] : []];
 }
-function createReplayEvent(event) {
+function createReplayEvent(event, toolResultsByCallId) {
 	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,
-		payload: replayEvent.payload
-	};
+	if (replayEvent.type === "session.snapshot.message" || replayEvent.type === NcpEventType.MessageCompleted) {
+		replayEvent.payload.message = mergeReplayCompletedToolResults(replayEvent.payload.message, toolResultsByCallId);
+		return {
+			type: NcpEventType.MessageSent,
+			payload: replayEvent.payload
+		};
+	}
 	return replayEvent;
 }
+function mergeReplayCompletedToolResults(message, toolResultsByCallId) {
+	let changed = false;
+	const parts = message.parts.map((part) => {
+		if (part.type !== "tool-invocation" || part.state === "result" || !part.toolCallId) return part;
+		const result = toolResultsByCallId.get(part.toolCallId);
+		if (!result) return part;
+		changed = true;
+		return {
+			...part,
+			state: "result",
+			result: result.content,
+			resultContentItems: result.contentItems
+		};
+	});
+	return changed ? {
+		...message,
+		parts
+	} : message;
+}
 function readLegacyContextCompactionMessageId(message) {
 	const checkpoint = isRecord$11(message?.metadata?.checkpoint) ? message.metadata.checkpoint : null;
 	const checkpointId = typeof checkpoint?.id === "string" ? checkpoint.id : "";