@economic/agents-react 1.1.4 → 1.1.5

package/dist/index.d.mts

@@ -217,21 +217,21 @@ type AgentConnectionState = {
 //#endregion
 //#region src/useAgent.d.ts
 interface UseAgentOptions {
+  enabled?: boolean;
   host: string;
   agentName: string;
-  enabled?: boolean;
+  name: string;
+  actorId?: string;
   sub?: {
     agent: string;
     name: string;
   }[];
+  authToken?: string;
   onOpen?: (event: Event) => void;
   onClose?: (event: CloseEvent) => void;
   onError?: (event: ErrorEvent) => void;
-  authToken?: string;
-  userId?: string;
-  id: string;
 }
-declare function useAgent<T extends AgentConnectionState>(options: UseAgentOptions): Omit<PartySocket, "path"> & {
+declare function useAgent(options: UseAgentOptions): Omit<PartySocket, "path"> & {
   agent: string;
   name: string;
   path: ReadonlyArray<{
@@ -240,19 +240,20 @@ declare function useAgent<T extends AgentConnectionState>(options: UseAgentOptio
   }>;
   identified: boolean;
   ready: Promise<void>;
-  state: T | undefined;
-  setState: (state: T) => void;
-  call: <T_1 = unknown>(method: string, args?: unknown[], options?: _$agents_client0.CallOptions | _$agents_client0.StreamOptions) => Promise<T_1>;
+  state: AgentConnectionState | undefined;
+  setState: (state: AgentConnectionState) => void;
+  call: <T = unknown>(method: string, args?: unknown[], options?: _$agents_client0.CallOptions | _$agents_client0.StreamOptions) => Promise<T>;
   stub: _$agents_client0.UntypedAgentStub;
   getHttpUrl: () => string;
 };
 //#endregion
-//#region src/useChatAgent.d.ts
+//#region src/useChat.d.ts
 interface UseChatOptions<ToolContext extends Record<string, unknown>> extends UseAgentOptions {
+  getInitialMessages?: undefined | null;
   toolContext?: ToolContext;
   welcomeMessage?: string;
 }
-declare function useChatAgent<ToolContext extends Record<string, unknown>>(options: UseChatOptions<ToolContext>): {
+declare function useChat<ToolContext extends Record<string, unknown>>(options: UseChatOptions<ToolContext>): {
   status: AgentConnectionStatus;
   agent: Omit<PartySocket, "path"> & {
     agent: string;
@@ -288,52 +289,56 @@ declare function useChatAgent<ToolContext extends Record<string, unknown>>(optio
 //#endregion
 //#region src/useAssistant.d.ts
 /** Chat summary returned by the assistant's `getChats` RPC. */
-type Chat = {
+type ChatSummary = {
   chatId: string;
   title?: string;
   summary?: string;
   created_at: number;
   updated_at: number;
 };
-interface UseAssistantOptions<ToolContext extends Record<string, unknown> = Record<string, unknown>> extends Omit<UseChatOptions<ToolContext>, "id" | "userId"> {
-  userId: string;
-  initialChatId?: string;
-}
+interface UseAssistantOptions<ToolContext extends Record<string, unknown> = Record<string, unknown>> extends Omit<UseChatOptions<ToolContext>, "actorId" | "getInitialMessages"> {}
 declare function useAssistant<ToolContext extends Record<string, unknown>>(options: UseAssistantOptions<ToolContext>): {
-  chatId: string | undefined;
+  currentChatName: string | undefined;
   status: AgentConnectionStatus;
-  getChats: () => Promise<Chat[]>;
-  createChat: () => Promise<string>;
-  openChat: (chatId: string) => void;
-  deleteChat: (chatId: string) => Promise<void>;
-  agent: Omit<PartySocket, "path"> & {
-    agent: string;
-    name: string;
-    path: ReadonlyArray<{
+  assistant: {
+    getChats: () => Promise<ChatSummary[]>;
+    createChat: () => Promise<string>;
+    openChat: (chatId: string) => void;
+    deleteChat: (chatId: string) => Promise<void>;
+  };
+  chat: {
+    status: AgentConnectionStatus;
+    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?: _$agents_client0.CallOptions | _$agents_client0.StreamOptions) => Promise<T>;
-    stub: _$agents_client0.UntypedAgentStub;
-    getHttpUrl: () => string;
+      path: ReadonlyArray<{
+        agent: string;
+        name: string;
+      }>;
+      identified: boolean;
+      ready: Promise<void>;
+      state: AgentConnectionState | undefined;
+      setState: (state: AgentConnectionState) => void;
+      call: <T = unknown>(method: string, args?: unknown[], options?: _$agents_client0.CallOptions | _$agents_client0.StreamOptions) => Promise<T>;
+      stub: _$agents_client0.UntypedAgentStub;
+      getHttpUrl: () => string;
+    };
+    chat: Omit<_$_ai_sdk_react0.UseChatHelpers<_$ai.UIMessage<unknown, _$ai.UIDataTypes, _$ai.UITools>>, "addToolOutput"> & {
+      clearHistory: () => void;
+      addToolOutput: (opts: {
+        toolCallId: string;
+        toolName?: string;
+        output?: unknown;
+        state?: "output-available" | "output-error";
+        errorText?: string;
+      }) => void;
+      isServerStreaming: boolean;
+      isStreaming: boolean;
+      isToolContinuation: boolean;
+    };
+    rateMessage: (messageId: string, rating: number, comment?: string) => Promise<unknown>;
+    getMessageRatings: () => Promise<unknown>;
   };
-  chat: (Omit<_$_ai_sdk_react0.UseChatHelpers<_$ai.UIMessage<unknown, _$ai.UIDataTypes, _$ai.UITools>>, "addToolOutput"> & {
-    clearHistory: () => void;
-    addToolOutput: (opts: {
-      toolCallId: string;
-      toolName?: string;
-      output?: unknown;
-      state?: "output-available" | "output-error";
-      errorText?: string;
-    }) => void;
-    isServerStreaming: boolean;
-    isStreaming: boolean;
-    isToolContinuation: boolean;
-  }) | undefined;
 };
 //#endregion
-export { AgentConnectionState, AgentConnectionStatus, AgentConnectionType, Chat, UseAgentOptions, UseAssistantOptions, UseChatOptions, useAgent, useAssistant, useChatAgent };
+export { type AgentConnectionState, type AgentConnectionStatus, type AgentConnectionType, type ChatSummary, useAgent, useAssistant, useChat };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { useAgent as useAgent$1 } from "agents/react";
-import { useAgentChat } from "@cloudflare/ai-chat/react";
 import { useEffect, useRef, useState } from "react";
+import { useAgentChat } from "@cloudflare/ai-chat/react";
 //#region src/util.ts
 function getTokenArgs(authToken) {
 	if (!authToken) return {};
@@ -12,12 +12,12 @@ function getTokenArgs(authToken) {
 //#endregion
 //#region src/useAgent.ts
 function useAgent(options) {
-	const { host, agentName, userId, id, enabled, sub, authToken, onError, onOpen, onClose } = options;
+	const { enabled, host, agentName, actorId, name, sub, authToken, onError, onOpen, onClose } = options;
 	return useAgent$1({
 		enabled,
 		host,
 		agent: agentName,
-		name: userId ? `${userId}:${id}` : id,
+		name: actorId ? `${actorId}:${name}` : name,
 		sub,
 		onOpen,
 		onClose,
@@ -26,79 +26,19 @@ function useAgent(options) {
 	});
 }
 //#endregion
-//#region src/useAssistant.ts
-function useAssistant(options) {
-	const { host, agentName, userId, authToken, toolContext, ...agentOptions } = options;
-	const [chatId, setChatId] = useState();
-	const assistant = useAgent({
-		host,
-		agentName,
-		id: userId,
-		authToken
-	});
-	const getChats = async () => {
-		return (await assistant.call("getChats")).map((chat) => {
-			const c = {
-				...chat,
-				chatId: chat.durable_object_name
-			};
-			delete c.durable_object_name;
-			return c;
-		});
-	};
-	const createChat = async () => {
-		const chatId = await assistant.call("createChat");
-		setChatId(chatId);
-		await getChats();
-		return chatId;
-	};
-	const openChat = (chatId) => {
-		setChatId(chatId);
-	};
-	const deleteChat = async (chatId) => {
-		await assistant.call("deleteChat", [chatId]);
-		setChatId(void 0);
-		await getChats();
-	};
+//#region src/useChat.ts
+function useChat(options) {
+	const { toolContext, welcomeMessage, ...agentOptions } = options;
 	const agent = useAgent({
-		enabled: !!chatId,
-		host,
-		agentName,
-		id: userId,
-		authToken,
-		sub: chatId ? [{
-			agent: assistant.state?.subAgentName ?? "",
-			name: chatId
-		}] : void 0,
-		...agentOptions
+		...agentOptions,
+		enabled: agentOptions.enabled ?? !!agentOptions.name
 	});
-	const isChatReady = !!chatId && agent.state?.status === "connected";
+	const status = agent.state?.status ?? "connecting";
 	const chat = useAgentChat({
 		agent,
 		body: toolContext ?? {},
-		getInitialMessages: isChatReady ? void 0 : null
-	});
-	return {
-		chatId,
-		status: (chatId ? agent.state?.status : assistant.state?.status) ?? "connecting",
-		getChats,
-		createChat,
-		openChat,
-		deleteChat,
-		agent,
-		chat: isChatReady ? chat : void 0
-	};
-}
-//#endregion
-//#region src/useChatAgent.ts
-function useChatAgent(options) {
-	const { toolContext, welcomeMessage, ...agentOptions } = options;
-	const agent = useAgent(agentOptions);
-	const chat = useAgentChat({
-		agent,
-		body: toolContext ?? {}
+		getInitialMessages: !!agentOptions.name && status === "connected" ? void 0 : null
 	});
-	const status = agent.state?.status ?? "connecting";
 	const hasSentWelcome = useRef(false);
 	useEffect(() => {
 		if (welcomeMessage && status === "connected" && chat.messages.length === 0 && !hasSentWelcome.current) {
@@ -136,4 +76,58 @@ function useChatAgent(options) {
 	};
 }
 //#endregion
-export { useAgent, useAssistant, useChatAgent };
+//#region src/useAssistant.ts
+function useAssistant(options) {
+	const { toolContext, welcomeMessage, ...agentOptions } = options;
+	const [chatId, setChatId] = useState();
+	const assistant = useAgent(agentOptions);
+	const getChats = async () => {
+		return (await assistant.call("getChats")).map((chat) => {
+			const c = {
+				...chat,
+				chatId: chat.durable_object_name
+			};
+			delete c.durable_object_name;
+			return c;
+		});
+	};
+	const createChat = async () => {
+		const chatId = await assistant.call("createChat");
+		setChatId(chatId);
+		await getChats();
+		return chatId;
+	};
+	const openChat = (chatId) => {
+		setChatId(chatId);
+	};
+	const deleteChat = async (chatId) => {
+		await assistant.call("deleteChat", [chatId]);
+		setChatId(void 0);
+		await getChats();
+	};
+	const isChatReady = !!chatId && assistant.state?.status === "connected";
+	const chat = useChat({
+		...agentOptions,
+		enabled: !!chatId,
+		sub: chatId ? [{
+			agent: assistant.state?.subAgentName ?? "",
+			name: chatId
+		}] : void 0,
+		getInitialMessages: isChatReady ? void 0 : null,
+		toolContext,
+		welcomeMessage
+	});
+	return {
+		currentChatName: chatId,
+		status: (chatId ? chat.agent.state?.status : assistant.state?.status) ?? "connecting",
+		assistant: {
+			getChats,
+			createChat,
+			openChat,
+			deleteChat
+		},
+		chat
+	};
+}
+//#endregion
+export { useAgent, useAssistant, useChat };

package/package.json

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