@nextclaw/ncp-toolkit 0.5.15 → 0.5.17

package/dist/index.d.ts

@@ -125,8 +125,12 @@ interface AgentSessionStore {
     event: NcpEndpointEvent;
     updatedAt: string;
   }): Promise<void>;
+  updateSessionMetadata(params: {
+    sessionId: string;
+    metadata: Record<string, unknown>;
+    updatedAt: string;
+  }): Promise<boolean>;
   saveSession(session: AgentSessionRecord): Promise<void>;
-  replaceSession(session: AgentSessionRecord): Promise<void>;
   deleteSession(sessionId: string): Promise<AgentSessionRecord | null>;
 }
 //#endregion
@@ -201,7 +205,11 @@ declare class InMemoryAgentSessionStore implements AgentSessionStore {
   getSession: (sessionId: string) => Promise<AgentSessionRecord | null>;
   listSessions: () => Promise<AgentSessionRecord[]>;
   saveSession: (session: AgentSessionRecord) => Promise<void>;
-  replaceSession: (session: AgentSessionRecord) => Promise<void>;
+  updateSessionMetadata: (params: {
+    sessionId: string;
+    metadata: Record<string, unknown>;
+    updatedAt: string;
+  }) => Promise<boolean>;
   deleteSession: (sessionId: string) => Promise<AgentSessionRecord | null>;
 }
 //#endregion

package/dist/index.js

@@ -1,4 +1,4 @@
-import { NcpEventType, isHiddenNcpMessage, sanitizeAssistantReplyTags } from "@nextclaw/ncp";
+import { NcpEventType, consumeNcpRunHandle, createNcpRunHandle, isHiddenNcpMessage, sanitizeAssistantReplyTags } from "@nextclaw/ncp";
 //#region src/agent/agent-conversation-message-normalizer.ts
 function cloneConversationMessage(message) {
 	return {
@@ -522,6 +522,7 @@ var DefaultNcpAgentConversationStateManager = class {
 	};
 	upsertMessage = (message) => {
 		const normalizedMessage = normalizeConversationMessage(message);
+		if (this.streamingMessage?.id === normalizedMessage.id) this.streamingMessage = null;
 		const messageIndex = this.messages.findIndex((item) => item.id === normalizedMessage.id);
 		if (messageIndex < 0) {
 			this.messages = [...this.messages, normalizedMessage];
@@ -596,7 +597,7 @@ function createAgentClientFromServer(server) {
 			switch (event.type) {
 				case NcpEventType.MessageRequest:
 					assertMaterializedEnvelope(event.payload);
-					await consume(server.send(event.payload));
+					await consumeNcpRunHandle(server.send(event.payload), createNcpRunHandle(event.payload));
 					return;
 				case NcpEventType.MessageStreamRequest:
 					await consume(server.stream(event.payload));
@@ -612,7 +613,7 @@ function createAgentClientFromServer(server) {
 		},
 		async send(envelope) {
 			assertMaterializedEnvelope(envelope);
-			await consume(server.send(envelope));
+			return await consumeNcpRunHandle(server.send(envelope), createNcpRunHandle(envelope));
 		},
 		async stream(payload) {
 			await consume(server.stream(payload));
@@ -900,9 +901,9 @@ var AgentBackendSessionRealtime = class {
 	}
 	publishSessionEvent = async (session, event, options = {}) => {
 		if (options.dispatchToStateManager) await session.stateManager.dispatch(event);
+		if (options.persistSession !== false) await this.params.persistSessionEvent(session, event);
 		this.params.publishEndpointEvent(event);
 		session.publisher.publish(event);
-		if (options.persistSession !== false) await this.params.persistSessionEvent(session, event);
 	};
 	streamSessionEvents = (payloadOrParams, opts) => {
 		return (async function* (self) {
@@ -981,7 +982,7 @@ function readOptionalAgentId$1(value) {
 }
 function readMessages(snapshot) {
 	const messages = snapshot.messages.map((message) => structuredClone(message));
-	if (snapshot.streamingMessage) messages.push(structuredClone(snapshot.streamingMessage));
+	if (snapshot.streamingMessage && !messages.some((message) => message.id === snapshot.streamingMessage?.id)) messages.push(structuredClone(snapshot.streamingMessage));
 	return messages;
 }
 function readSessionActivityAt(summary) {
@@ -1159,27 +1160,6 @@ function readOptionalAgentId(value) {
 function readAgentIdFromMetadata(metadata) {
 	return readOptionalAgentId(metadata?.agent_id) ?? readOptionalAgentId(metadata?.agentId);
 }
-function resolvePersistedAgentId(params) {
-	const { liveSession, storedSession } = params;
-	return readOptionalAgentId(liveSession?.agentId) ?? readOptionalAgentId(storedSession?.agentId) ?? readAgentIdFromMetadata(liveSession?.metadata) ?? readAgentIdFromMetadata(storedSession?.metadata);
-}
-function buildUpdatedSessionRecord(params) {
-	const { liveSession, patch, sessionId, storedSession, updatedAt } = params;
-	const nextMetadata = patch.metadata === null ? {} : patch.metadata ? structuredClone(patch.metadata) : structuredClone(liveSession?.metadata ?? storedSession?.metadata ?? {});
-	if (liveSession) liveSession.metadata = structuredClone(nextMetadata);
-	const agentId = resolvePersistedAgentId({
-		liveSession,
-		storedSession
-	});
-	return {
-		sessionId,
-		...agentId ? { agentId } : {},
-		messages: liveSession ? readMessages(liveSession.stateManager.getSnapshot()) : storedSession?.messages.map((message) => structuredClone(message)) ?? [],
-		createdAt: storedSession?.createdAt ?? liveSession?.createdAt ?? updatedAt,
-		updatedAt,
-		metadata: nextMetadata
-	};
-}
 function buildPersistedLiveSessionRecord(params) {
 	const { session, sessionId, updatedAt } = params;
 	const messages = readMessages(session.stateManager.getSnapshot());
@@ -1263,6 +1243,12 @@ const DEFAULT_SUPPORTED_PART_TYPES = [
 const disposeRuntime = async (runtime) => {
 	await runtime.dispose?.();
 };
+function buildUpdatedMetadata(params) {
+	const { liveSession, patch, storedSession } = params;
+	if (patch.metadata === null) return {};
+	if (patch.metadata) return structuredClone(patch.metadata);
+	return structuredClone(liveSession?.metadata ?? storedSession?.metadata ?? {});
+}
 var DefaultNcpAgentBackend = class {
 	manifest;
 	sessionStore;
@@ -1434,13 +1420,18 @@ var DefaultNcpAgentBackend = class {
 		const liveSession = this.sessionRegistry.getSession(sessionId);
 		const storedSession = await this.sessionStore.getSession(sessionId);
 		if (!liveSession && !storedSession) return null;
-		await this.sessionStore.replaceSession(buildUpdatedSessionRecord({
-			sessionId,
-			patch,
+		const metadata = buildUpdatedMetadata({
 			liveSession,
-			storedSession,
-			updatedAt: now()
-		}));
+			patch,
+			storedSession
+		});
+		const updatedAt = now();
+		if (liveSession) liveSession.metadata = structuredClone(metadata);
+		await this.sessionStore.updateSessionMetadata({
+			sessionId,
+			metadata,
+			updatedAt
+		});
 		return this.getSession(sessionId);
 	};
 	deleteSession = async (sessionId) => {
@@ -1500,8 +1491,16 @@ var InMemoryAgentSessionStore = class {
 	saveSession = async (session) => {
 		this.sessions.set(session.sessionId, structuredClone(session));
 	};
-	replaceSession = async (session) => {
-		this.sessions.set(session.sessionId, structuredClone(session));
+	updateSessionMetadata = async (params) => {
+		const { metadata, sessionId, updatedAt } = params;
+		const session = this.sessions.get(sessionId);
+		if (!session) return false;
+		this.sessions.set(sessionId, {
+			...session,
+			metadata: structuredClone(metadata),
+			updatedAt
+		});
+		return true;
 	};
 	deleteSession = async (sessionId) => {
 		const session = this.sessions.get(sessionId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/ncp-toolkit",
-  "version": "0.5.15",
+  "version": "0.5.17",
   "private": false,
   "description": "Toolkit implementations built on top of the NextClaw Communication Protocol.",
   "type": "module",
@@ -15,14 +15,14 @@
     "dist"
   ],
   "dependencies": {
-    "@nextclaw/ncp": "0.5.10"
+    "@nextclaw/ncp": "0.5.12"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",
     "prettier": "^3.3.3",
     "typescript": "^5.6.3",
     "vitest": "^4.1.2",
-    "@nextclaw/ncp-agent-runtime": "0.3.20"
+    "@nextclaw/ncp-agent-runtime": "0.3.22"
   },
   "scripts": {
     "build": "tsdown src/index.ts --dts --clean --target es2022 --no-fixedExtension",