@economic/agents-react 1.3.1 → 1.3.4

package/README.md

@@ -196,3 +196,5 @@ The package also exports the handler types `AssistantActions`, `GetChatsHandler`
 ## Authentication
 
 Pass a JWT as `authToken`. It is sent both as an `Authorization: Bearer …` header and as a WebSocket subprotocol (`["bearer", token]`), matching the server-side [`getJwtAuthConfig`](../agents/README.md#authentication). When verification fails, the connection status becomes `"unauthorized"`.
+
+.

package/dist/index.d.mts

@@ -205,11 +205,6 @@ declare class PartySocket extends ReconnectingWebSocket {
 //#region src/types.d.ts
 type AgentConnectionStatus = "connecting" | "connected" | "disconnected" | "unauthorized";
 type AgentConnectionType = "agent" | "chat" | "assistant";
-type AgentConnectionState = {
-  status: AgentConnectionStatus;
-  type: AgentConnectionType;
-  subAgentName?: string;
-};
 type ChatSummary = {
   name: string;
   title?: string;
@@ -231,6 +226,7 @@ type CreateChatHandler = () => Promise<string>;
 type OpenChatHandler = (chatId: string) => void;
 type DeleteChatHandler = (chatId: string) => Promise<void>;
 interface AssistantActions {
+  state: unknown;
   getChats: GetChatsHandler;
   createChat: CreateChatHandler;
   openChat: OpenChatHandler;
@@ -252,21 +248,26 @@ interface UseAgentOptions {
   onOpen?: (event: Event) => void;
   onClose?: (event: CloseEvent) => void;
   onError?: (event: ErrorEvent) => void;
+  onMessage?: (event: MessageEvent) => void;
 }
-declare function useAgent(options: UseAgentOptions): Omit<PartySocket, "path"> & {
-  agent: string;
-  name: string;
-  path: ReadonlyArray<{
+declare function useAgent(options: UseAgentOptions): {
+  agent: Omit<PartySocket, "path"> & {
     agent: string;
     name: string;
-  }>;
-  identified: boolean;
-  ready: Promise<void>;
-  state: AgentConnectionState | undefined;
-  setState: (state: AgentConnectionState) => void;
-  call: <T = unknown>(method: string, args?: unknown[], options?: import("agents/client").CallOptions | import("agents/client").StreamOptions) => Promise<T>;
-  stub: import("agents/client").UntypedAgentStub;
-  getHttpUrl: () => string;
+    path: ReadonlyArray<{
+      agent: string;
+      name: string;
+    }>;
+    identified: boolean;
+    ready: Promise<void>;
+    state: unknown;
+    setState: (state: unknown) => void;
+    call: <T = unknown>(method: string, args?: unknown[], options?: import("agents/client").CallOptions | import("agents/client").StreamOptions) => Promise<T>;
+    stub: import("agents/client").UntypedAgentStub;
+    getHttpUrl: () => string;
+  };
+  status: AgentConnectionStatus;
+  type: AgentConnectionType | undefined;
 };
 //#endregion
 //#region src/useChat.d.ts
@@ -286,8 +287,8 @@ declare function useChat<ToolContext extends Record<string, unknown>>(options: U
     }>;
     identified: boolean;
     ready: Promise<void>;
-    state: AgentConnectionState | undefined;
-    setState: (state: AgentConnectionState) => void;
+    state: unknown;
+    setState: (state: unknown) => void;
     call: <T = unknown>(method: string, args?: unknown[], options?: import("agents/client").CallOptions | import("agents/client").StreamOptions) => Promise<T>;
     stub: import("agents/client").UntypedAgentStub;
     getHttpUrl: () => string;
@@ -311,12 +312,15 @@ declare function useChat<ToolContext extends Record<string, unknown>>(options: U
 };
 //#endregion
 //#region src/useAssistant.d.ts
-interface UseAssistantOptions<ToolContext extends Record<string, unknown> = Record<string, unknown>> extends Omit<UseChatOptions<ToolContext>, "actorId" | "getInitialMessages"> {}
+interface UseAssistantOptions<ToolContext extends Record<string, unknown> = Record<string, unknown>> extends Omit<UseChatOptions<ToolContext>, "actorId" | "getInitialMessages"> {
+  initialChatId?: string;
+}
 declare function useAssistant<ToolContext extends Record<string, unknown>>(options: UseAssistantOptions<ToolContext>): {
   currentChatName: string | undefined;
   chats: ChatSummary[];
   status: AgentConnectionStatus;
   assistant: {
+    state: unknown;
     getChats: () => Promise<ChatSummary[]>;
     createChat: () => Promise<string>;
     openChat: (chatId: string) => void;
@@ -333,8 +337,8 @@ declare function useAssistant<ToolContext extends Record<string, unknown>>(optio
       }>;
       identified: boolean;
       ready: Promise<void>;
-      state: AgentConnectionState | undefined;
-      setState: (state: AgentConnectionState) => void;
+      state: unknown;
+      setState: (state: unknown) => void;
       call: <T = unknown>(method: string, args?: unknown[], options?: import("agents/client").CallOptions | import("agents/client").StreamOptions) => Promise<T>;
       stub: import("agents/client").UntypedAgentStub;
       getHttpUrl: () => string;
@@ -358,4 +362,4 @@ declare function useAssistant<ToolContext extends Record<string, unknown>>(optio
   };
 };
 //#endregion
-export { type AgentConnectionState, type AgentConnectionStatus, type AgentConnectionType, type AssistantActions, type ChatSummary, type CreateChatHandler, type DeleteChatHandler, type GetChatsHandler, type GetMessageFeedbackHandler, type MessageFeedback, type MessageFeedbackHandler, type OpenChatHandler, useAgent, useAssistant, useChat };
+export { type AgentConnectionStatus, type AgentConnectionType, type AssistantActions, type ChatSummary, type CreateChatHandler, type DeleteChatHandler, type GetChatsHandler, type GetMessageFeedbackHandler, type MessageFeedback, type MessageFeedbackHandler, type OpenChatHandler, useAgent, useAssistant, useChat };

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { useAgent as useAgent$1 } from "agents/react";
 import { useCallback, useEffect, useRef, useState } from "react";
+import { useAgent as useAgent$1 } from "agents/react";
 import { useAgentChat } from "@cloudflare/ai-chat/react";
 //#region src/util.ts
 function getTokenArgs(authToken) {
@@ -12,28 +12,51 @@ function getTokenArgs(authToken) {
 //#endregion
 //#region src/useAgent.ts
 function useAgent(options) {
-	const { enabled, host, agentName, actorId, name, sub, authToken, onError, onOpen, onClose } = options;
-	return useAgent$1({
+	const { enabled, host, agentName, actorId, name, sub, authToken, onError, onOpen, onClose, onMessage } = options;
+	const [type, setType] = useState(void 0);
+	const [status, setStatus] = useState("connecting");
+	const agent = useAgent$1({
 		enabled,
 		host,
 		agent: agentName,
 		name: actorId ? `${actorId}:${name}` : name,
 		sub,
-		onOpen,
-		onClose,
-		onError,
+		onOpen: (event) => {
+			onOpen?.(event);
+		},
+		onClose: (event) => {
+			if (event.code >= 3e3) setStatus("unauthorized");
+			else setStatus("disconnected");
+			onClose?.(event);
+		},
+		onMessage: (event) => {
+			const msg = JSON.parse(event.data);
+			if (msg.type === "connection_status") {
+				if (msg.status === "unauthorized") agent.close(3e3);
+				setStatus(msg.status);
+			} else if (msg.type === "agent_type") setType(msg.agentType);
+			onMessage?.(event);
+		},
+		onError: (event) => {
+			setStatus("disconnected");
+			onError?.(event);
+		},
 		...getTokenArgs(authToken)
 	});
+	return {
+		agent,
+		status,
+		type
+	};
 }
 //#endregion
 //#region src/useChat.ts
 function useChat(options) {
 	const { toolContext, welcomeMessage, ...agentOptions } = options;
-	const agent = useAgent({
+	const { agent, status } = useAgent({
 		...agentOptions,
 		enabled: agentOptions.enabled ?? !!agentOptions.name
 	});
-	const status = agent.state?.status ?? "connecting";
 	const chat = useAgentChat({
 		agent,
 		body: toolContext ?? {},
@@ -78,10 +101,17 @@ function useChat(options) {
 //#endregion
 //#region src/useAssistant.ts
 function useAssistant(options) {
-	const { toolContext, welcomeMessage, ...agentOptions } = options;
-	const [chatId, setChatId] = useState();
+	const { toolContext, welcomeMessage, initialChatId, ...agentOptions } = options;
+	const [chatId, setChatId] = useState(initialChatId);
 	const [chats, setChats] = useState([]);
-	const assistant = useAgent(agentOptions);
+	const [subAgentName, setSubAgentName] = useState(void 0);
+	const { agent: assistant, status: assistantStatus } = useAgent({
+		...agentOptions,
+		onMessage: (event) => {
+			const msg = JSON.parse(event.data);
+			if (msg.type === "sub_agent_name") setSubAgentName(msg.subAgentName);
+		}
+	});
 	const refreshChats = useCallback(async () => {
 		setChats((await assistant.call("getChats")).map((chat) => {
 			const c = {
@@ -92,7 +122,6 @@ function useAssistant(options) {
 			return c;
 		}));
 	}, [assistant]);
-	const assistantStatus = assistant.state?.status;
 	useEffect(() => {
 		if (assistantStatus === "connected") refreshChats().catch(console.error);
 	}, [assistantStatus, refreshChats]);
@@ -114,12 +143,13 @@ function useAssistant(options) {
 		setChatId(void 0);
 		await refreshChats();
 	};
-	const isChatReady = !!chatId && assistant.state?.status === "connected";
+	const isChatEnabled = !!chatId && !!subAgentName;
+	const isChatReady = isChatEnabled && assistantStatus === "connected";
 	const chat = useChat({
 		...agentOptions,
-		enabled: !!chatId,
-		sub: chatId ? [{
-			agent: assistant.state?.subAgentName ?? "",
+		enabled: isChatEnabled,
+		sub: isChatEnabled ? [{
+			agent: subAgentName,
 			name: chatId
 		}] : void 0,
 		getInitialMessages: isChatReady ? void 0 : null,
@@ -129,8 +159,9 @@ function useAssistant(options) {
 	return {
 		currentChatName: chatId,
 		chats,
-		status: (chatId ? chat.agent.state?.status : assistant.state?.status) ?? "connecting",
+		status: isChatEnabled && chat.status !== "connecting" ? chat.status : assistantStatus,
 		assistant: {
+			state: assistant.state,
 			getChats,
 			createChat,
 			openChat,

package/dist/v1.mjs

@@ -1,5 +1,5 @@
-import { useAgent } from "agents/react";
 import React from "react";
+import { useAgent } from "agents/react";
 import { useAgentChat } from "@cloudflare/ai-chat/react";
 //#region src/v1/index.ts
 function agentNameToKebab(name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@economic/agents-react",
-  "version": "1.3.1",
+  "version": "1.3.4",
   "license": "MIT",
   "files": [
     "dist"