@nextclaw/ncp-react 0.4.28 → 0.4.29

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { DefaultNcpAgentConversationStateManager } from "@nextclaw/ncp-toolkit";
-import { NcpAgentClientEndpoint, NcpAgentConversationSnapshot, NcpMessage, NcpMessagePart, NcpRequestEnvelope } from "@nextclaw/ncp";
+import { NcpAgentClientEndpoint, NcpAgentConversationSnapshot, NcpAgentSendEnvelope, NcpMessage, NcpMessagePart } from "@nextclaw/ncp";
 
 //#region src/hooks/use-ncp-agent-runtime.d.ts
-type NcpAgentSendInput = string | NcpRequestEnvelope;
+type NcpAgentSendInput = string | NcpAgentSendEnvelope;
 type UseNcpAgentResult = {
   snapshot: NcpAgentConversationSnapshot;
   visibleMessages: readonly NcpMessage[];
@@ -21,7 +21,7 @@ type NcpConversationSeed = {
 };
 type NcpConversationSeedLoader = (sessionId: string, signal: AbortSignal) => Promise<NcpConversationSeed>;
 type UseHydratedNcpAgentOptions = {
-  sessionId: string;
+  sessionId?: string;
   client: NcpAgentClientEndpoint;
   loadSeed: NcpConversationSeedLoader;
 };
@@ -72,14 +72,14 @@ type ReadNcpDraftAttachmentsResult = {
 };
 declare function buildNcpImageAttachmentDataUrl(attachment: NcpDraftAttachment): string;
 declare function buildNcpRequestEnvelope(params: {
-  sessionId: string;
+  sessionId?: string;
   text?: string;
   attachments?: readonly NcpDraftAttachment[];
   parts?: readonly NcpMessagePart[];
   metadata?: Record<string, unknown>;
   messageId?: string;
   timestamp?: string;
-}): NcpRequestEnvelope | null;
+}): NcpAgentSendEnvelope | null;
 declare function readFilesAsNcpDraftAttachments(files: Iterable<File>, options?: ReadNcpDraftAttachmentsOptions): Promise<ReadNcpDraftAttachmentsResult>;
 declare function uploadFilesAsNcpDraftAttachments(files: Iterable<File>, options: UploadNcpDraftAttachmentsOptions): Promise<ReadNcpDraftAttachmentsResult>;
 //#endregion

package/dist/index.js

@@ -51,6 +51,7 @@ function dispatchEventsToManager(manager, events) {
 	return events.reduce((chain, event) => chain.then(() => manager.dispatch(event)), Promise.resolve());
 }
 function shouldDispatchEventToSession(event, sessionId) {
+	if (!sessionId) return true;
 	const payload = "payload" in event ? event.payload : null;
 	if (!payload || typeof payload !== "object") return true;
 	if (!("sessionId" in payload) || typeof payload.sessionId !== "string") return true;
@@ -67,10 +68,10 @@ function normalizeSendEnvelope(input, sessionId) {
 		const content = input.trim();
 		if (!content) return null;
 		return {
-			sessionId,
+			...sessionId ? { sessionId } : {},
 			message: {
 				id: `user-${Date.now().toString(36)}`,
-				sessionId,
+				...sessionId ? { sessionId } : {},
 				role: "user",
 				status: "final",
 				parts: [{
@@ -82,33 +83,43 @@ function normalizeSendEnvelope(input, sessionId) {
 		};
 	}
 	if (!hasMessageContent(input.message)) return null;
+	const targetSessionId = input.sessionId || input.message.sessionId || sessionId;
 	return {
 		...input,
-		sessionId: input.sessionId,
+		...targetSessionId ? { sessionId: targetSessionId } : {},
 		message: {
 			...input.message,
-			sessionId: input.message.sessionId || input.sessionId
+			...targetSessionId ? { sessionId: targetSessionId } : {}
 		}
 	};
 }
 function useScopedAgentManager(sessionId) {
 	const managerRef = useRef();
-	if (!managerRef.current || managerRef.current.sessionId !== sessionId) managerRef.current = {
-		sessionId,
+	if (!managerRef.current) managerRef.current = {
+		sessionId: sessionId ?? null,
+		manager: new DefaultNcpAgentConversationStateManager()
+	};
+	else if (sessionId && managerRef.current.sessionId === null) managerRef.current.sessionId = sessionId;
+	else if (managerRef.current.sessionId !== (sessionId ?? null)) managerRef.current = {
+		sessionId: sessionId ?? null,
 		manager: new DefaultNcpAgentConversationStateManager()
 	};
 	return managerRef.current.manager;
 }
 function useNcpAgentRuntime({ sessionId, client, manager }) {
+	const sessionIdRef = useRef(sessionId);
 	const snapshot = useSyncExternalStore((onStoreChange) => manager.subscribe(() => onStoreChange()), () => manager.getSnapshot(), () => manager.getSnapshot());
 	const [isSending, setIsSending] = useState(false);
+	useEffect(() => {
+		sessionIdRef.current = sessionId;
+	}, [sessionId]);
 	useEffect(() => {
 		setIsSending(false);
 	}, [sessionId]);
 	useEffect(() => {
 		const eventBatcher = new NcpEventDispatchBatcher((events) => dispatchEventsToManager(manager, events));
 		const unsubscribeClient = client.subscribe((event) => {
-			if (!shouldDispatchEventToSession(event, sessionId)) return;
+			if (!shouldDispatchEventToSession(event, sessionIdRef.current)) return;
 			eventBatcher.enqueue(event);
 		});
 		return () => {
@@ -116,11 +127,7 @@ function useNcpAgentRuntime({ sessionId, client, manager }) {
 			eventBatcher.dispose();
 			client.stop();
 		};
-	}, [
-		client,
-		manager,
-		sessionId
-	]);
+	}, [client, manager]);
 	const visibleMessages = snapshot.streamingMessage ? [...snapshot.messages, snapshot.streamingMessage] : snapshot.messages;
 	const activeRunId = snapshot.activeRun?.runId ?? null;
 	const isRunning = !!snapshot.activeRun;
@@ -129,11 +136,14 @@ function useNcpAgentRuntime({ sessionId, client, manager }) {
 		const envelope = normalizeSendEnvelope(input, sessionId);
 		if (!envelope) return;
 		setIsSending(true);
-		await manager.dispatch({
+		if (sessionId) await manager.dispatch({
 			type: NcpEventType.MessageSent,
 			payload: {
 				sessionId,
-				message: envelope.message,
+				message: {
+					...envelope.message,
+					sessionId
+				},
 				metadata: envelope.metadata
 			}
 		});
@@ -144,10 +154,11 @@ function useNcpAgentRuntime({ sessionId, client, manager }) {
 		}
 	};
 	const abort = async () => {
-		if (!snapshot.activeRun) return;
+		if (!snapshot.activeRun || !sessionId) return;
 		await client.abort({ sessionId });
 	};
 	const streamRun = async () => {
+		if (!sessionId) return;
 		await client.stop();
 		await client.stream({ sessionId });
 	};
@@ -168,7 +179,23 @@ function toError(error) {
 	return error instanceof Error ? error : new Error(String(error));
 }
 function resolveSessionHydratingState(params) {
-	return params.isHydrating || params.hydratedSessionId !== params.sessionId;
+	const { hydratedSessionId, isHydrating, sessionId } = params;
+	if (!sessionId) return false;
+	return isHydrating || hydratedSessionId !== sessionId;
+}
+function managerAlreadyHasSessionState(manager, sessionId) {
+	const snapshot = manager.getSnapshot();
+	return snapshot.activeRun?.sessionId === sessionId || snapshot.streamingMessage?.sessionId === sessionId || snapshot.messages.some((message) => message.sessionId === sessionId);
+}
+function createHydratedActiveRun(seed, sessionId) {
+	return seed.status === "running" ? {
+		runId: null,
+		sessionId,
+		abortDisabledReason: null
+	} : null;
+}
+function isStaleHydrationRequest(loadState, requestId, controller) {
+	return controller.signal.aborted || loadState.requestId !== requestId;
 }
 function useHydratedNcpAgent({ sessionId, client, loadSeed }) {
 	const manager = useScopedAgentManager(sessionId);
@@ -184,39 +211,58 @@ function useHydratedNcpAgent({ sessionId, client, loadSeed }) {
 		requestId: 0,
 		controller: null
 	});
+	const resetEmptySession = useCallback(async () => {
+		await client.stop();
+		manager.reset();
+		setHydrateError(null);
+		setHydratedSessionId(null);
+		setIsHydrating(false);
+		loadStateRef.current = {
+			requestId: loadStateRef.current.requestId + 1,
+			controller: null
+		};
+	}, [client, manager]);
+	const markHydratedFromLiveState = useCallback((targetSessionId) => {
+		setHydrateError(null);
+		setHydratedSessionId(targetSessionId);
+		setIsHydrating(false);
+	}, []);
 	const hydrateSeed = useCallback(async () => {
 		loadStateRef.current.controller?.abort();
+		if (!sessionId) {
+			await resetEmptySession();
+			return;
+		}
 		const controller = new AbortController();
 		const requestId = loadStateRef.current.requestId + 1;
 		loadStateRef.current = {
 			requestId,
 			controller
 		};
+		if (managerAlreadyHasSessionState(manager, sessionId)) {
+			markHydratedFromLiveState(sessionId);
+			if (loadStateRef.current.controller === controller) loadStateRef.current.controller = null;
+			return;
+		}
 		await client.stop();
 		manager.reset();
 		setHydrateError(null);
 		setIsHydrating(true);
 		try {
 			const seed = await loadSeed(sessionId, controller.signal);
-			if (controller.signal.aborted || loadStateRef.current.requestId !== requestId) return;
+			if (isStaleHydrationRequest(loadStateRef.current, requestId, controller)) return;
 			manager.hydrate({
 				sessionId,
 				messages: seed.messages,
-				activeRun: seed.status === "running" ? {
-					runId: null,
-					sessionId,
-					abortDisabledReason: null
-				} : null
+				activeRun: createHydratedActiveRun(seed, sessionId)
 			});
-			setHydrateError(null);
-			setHydratedSessionId(sessionId);
-			setIsHydrating(false);
+			markHydratedFromLiveState(sessionId);
 			client.stream({ sessionId }).catch((error) => {
 				if (loadStateRef.current.requestId !== requestId) return;
 				setHydrateError(toError(error));
 			});
 		} catch (error) {
-			if (controller.signal.aborted || loadStateRef.current.requestId !== requestId) return;
+			if (isStaleHydrationRequest(loadStateRef.current, requestId, controller)) return;
 			setHydrateError(toError(error));
 			setHydratedSessionId(sessionId);
 			setIsHydrating(false);
@@ -227,6 +273,8 @@ function useHydratedNcpAgent({ sessionId, client, loadSeed }) {
 		client,
 		loadSeed,
 		manager,
+		markHydratedFromLiveState,
+		resetEmptySession,
 		sessionId
 	]);
 	useEffect(() => {
@@ -341,10 +389,10 @@ function buildNcpRequestEnvelope(params) {
 	const timestamp = params.timestamp ?? (/* @__PURE__ */ new Date()).toISOString();
 	const messageId = params.messageId ?? `user-${Date.now().toString(36)}`;
 	return {
-		sessionId: params.sessionId,
+		...params.sessionId ? { sessionId: params.sessionId } : {},
 		message: {
 			id: messageId,
-			sessionId: params.sessionId,
+			...params.sessionId ? { sessionId: params.sessionId } : {},
 			role: "user",
 			status: "final",
 			parts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/ncp-react",
-  "version": "0.4.28",
+  "version": "0.4.29",
   "private": false,
   "description": "React bindings for building NCP-based agent applications.",
   "type": "module",
@@ -15,8 +15,8 @@
     "dist"
   ],
   "dependencies": {
-    "@nextclaw/ncp": "0.5.8",
-    "@nextclaw/ncp-toolkit": "0.5.13"
+    "@nextclaw/ncp": "0.5.9",
+    "@nextclaw/ncp-toolkit": "0.5.14"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0"