@nextclaw/ncp-toolkit 0.5.2 → 0.5.4

package/dist/index.d.ts

@@ -77,6 +77,7 @@ type RuntimeFactoryParams = {
   stateManager: NcpAgentConversationStateManager;
   sessionMetadata: Record<string, unknown>;
   setSessionMetadata: (nextMetadata: Record<string, unknown>) => void;
+  resolveAssetContentPath?: (assetUri: string) => string | null;
 };
 type CreateRuntimeFn = (params: RuntimeFactoryParams) => NcpAgentRuntime;
 type AgentSessionRecord = {

package/dist/index.js

@@ -998,6 +998,53 @@ function withAutoSessionLabel(params) {
 		label: nextLabel
 	};
 }
+function findFinalAssistantMessageById(session, messageId) {
+	const normalizedMessageId = messageId.trim();
+	if (!normalizedMessageId) return null;
+	const snapshot = session.stateManager.getSnapshot();
+	for (let index = snapshot.messages.length - 1; index >= 0; index -= 1) {
+		const message = snapshot.messages[index];
+		if (message?.id === normalizedMessageId && message.role === "assistant" && message.status === "final") return message;
+	}
+	return null;
+}
+function buildCompletedEventForFinishedRun(session, event) {
+	const messageId = event.payload.messageId?.trim();
+	if (!messageId) throw new Error(`Run finished without messageId for session "${session.sessionId}".`);
+	const completedMessage = findFinalAssistantMessageById(session, messageId);
+	if (!completedMessage) throw new Error(`Run finished without a final assistant message for session "${session.sessionId}" and message "${messageId}".`);
+	return {
+		type: NcpEventType.MessageCompleted,
+		payload: {
+			sessionId: session.sessionId,
+			message: structuredClone(completedMessage)
+		}
+	};
+}
+function normalizeSendRunEvent(params) {
+	const { session, event } = params;
+	if (event.type === NcpEventType.MessageCompleted) {
+		if (params.completedMessageSeen) throw new Error(`Multiple final assistant messages were emitted for session "${session.sessionId}".`);
+		return {
+			eventsToPublish: [event],
+			completedMessageSeen: true
+		};
+	}
+	if (event.type === NcpEventType.RunFinished) {
+		if (params.completedMessageSeen) return {
+			eventsToPublish: [event],
+			completedMessageSeen: true
+		};
+		return {
+			eventsToPublish: [buildCompletedEventForFinishedRun(session, event), event],
+			completedMessageSeen: true
+		};
+	}
+	return {
+		eventsToPublish: [event],
+		completedMessageSeen: params.completedMessageSeen
+	};
+}
 //#endregion
 //#region src/agent/agent-backend/agent-backend-session-persistence.ts
 function readOptionalAgentId(value) {
@@ -1131,18 +1178,25 @@ var DefaultNcpAgentBackend = class {
 			default: this.publisher.publish(event);
 		}
 	};
-	subscribe = (listener) => {
-		return this.publisher.subscribe(listener);
-	};
+	subscribe = (listener) => this.publisher.subscribe(listener);
 	send = (envelope, options) => {
 		return (async function* (self) {
 			await self.ensureStarted();
 			const session = await self.sessionRegistry.ensureSession(envelope.sessionId, envelope.metadata);
 			const execution = self.startSessionExecution(session, envelope, options?.signal);
+			let completedMessageSeen = false;
 			try {
 				for await (const event of self.executor.executeRun(session, envelope, execution.controller)) {
-					await self.sessionRealtime.publishSessionEvent(session, event);
-					yield event;
+					const normalized = normalizeSendRunEvent({
+						session,
+						event,
+						completedMessageSeen
+					});
+					completedMessageSeen = normalized.completedMessageSeen;
+					for (const normalizedEvent of normalized.eventsToPublish) {
+						await self.sessionRealtime.publishSessionEvent(session, normalizedEvent);
+						yield normalizedEvent;
+					}
 				}
 				if (execution.controller.signal.aborted && !execution.abortHandled) {
 					const abortEvent = {
@@ -1159,9 +1213,7 @@ var DefaultNcpAgentBackend = class {
 			}
 		})(this);
 	};
-	abort = async (payload) => {
-		await this.handleAbort(payload);
-	};
+	abort = async (payload) => this.handleAbort(payload);
 	stream = (payloadOrParams, opts) => this.sessionRealtime.streamSessionEvents(payloadOrParams, opts);
 	listSessions = async () => {
 		const summaries = (await this.sessionStore.listSessions()).map((session) => toSessionSummary(session, this.sessionRegistry.getSession(session.sessionId)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/ncp-toolkit",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "private": false,
   "description": "Toolkit implementations built on top of the NextClaw Communication Protocol.",
   "type": "module",
@@ -22,7 +22,7 @@
     "prettier": "^3.3.3",
     "typescript": "^5.6.3",
     "vitest": "^4.1.2",
-    "@nextclaw/ncp-agent-runtime": "0.3.7"
+    "@nextclaw/ncp-agent-runtime": "0.3.9"
   },
   "scripts": {
     "build": "tsdown src/index.ts --dts --clean --target es2022 --no-fixedExtension",