agents 0.0.0-eeb70e2 → 0.0.0-ef38e84

package/dist/ai-react.d.ts

@@ -1,101 +1,89 @@
-import * as ai from "ai";
-import { Message } from "ai";
-import { useChat } from "@ai-sdk/react";
-import { useAgent } from "./react.js";
-import "partysocket";
-import "partysocket/react";
-import "./index.js";
-import "partyserver";
-import "@modelcontextprotocol/sdk/types.js";
-import "./mcp/client.js";
-import "zod";
-import "@modelcontextprotocol/sdk/client/index.js";
-import "@modelcontextprotocol/sdk/client/sse.js";
-import "./mcp/do-oauth-client-provider.js";
-import "@modelcontextprotocol/sdk/client/auth.js";
-import "@modelcontextprotocol/sdk/shared/auth.js";
-import "@modelcontextprotocol/sdk/shared/protocol.js";
-import "./client.js";
-import "./serializable.js";
+import "./client-Bws9q38u.js";
+import "./mcp-Dw5vDrY8.js";
+import "./do-oauth-client-provider-CcTno-25.js";
+import "./index-DhJCaDWd.js";
+import "./ai-types-D5YoPrBZ.js";
+import "./index-Bdzb2feZ.js";
+import "./serializable-CymX8ovI.js";
+import "./client-CbWe9FBd.js";
+import { n as useAgent } from "./react-DFNXTQzy.js";
+import { UseChatOptions, useChat } from "@ai-sdk/react";
+import { ChatInit, UIMessage } from "ai";
 
+//#region src/ai-react.d.ts
+type AITool<Input = unknown, Output = unknown> = {
+  description?: string;
+  inputSchema?: unknown;
+  execute?: (input: Input) => Output | Promise<Output>;
+};
 type GetInitialMessagesOptions = {
   agent: string;
   name: string;
   url: string;
 };
+type UseChatParams<M extends UIMessage = UIMessage> = ChatInit<M> &
+  UseChatOptions<M>;
 /**
  * Options for the useAgentChat hook
  */
-type UseAgentChatOptions<State> = Omit<
-  Parameters<typeof useChat>[0] & {
-    /** Agent connection from useAgent */
-    agent: ReturnType<typeof useAgent<State>>;
-    getInitialMessages?:
-      | undefined
-      | null
-      | ((options: GetInitialMessagesOptions) => Promise<Message[]>);
-  },
-  "fetch"
->;
+type UseAgentChatOptions<
+  State,
+  ChatMessage extends UIMessage = UIMessage
+> = Omit<UseChatParams<ChatMessage>, "fetch"> & {
+  /** Agent connection from useAgent */
+  agent: ReturnType<typeof useAgent<State>>;
+  getInitialMessages?:
+    | undefined
+    | null
+    | ((options: GetInitialMessagesOptions) => Promise<ChatMessage[]>);
+  /** Request credentials */
+  credentials?: RequestCredentials;
+  /** Request headers */
+  headers?: HeadersInit;
+  /**
+   * @description Whether to automatically resolve tool calls that do not require human interaction.
+   * @experimental
+   */
+  experimental_automaticToolResolution?: boolean;
+  /**
+   * @description Tools object for automatic detection of confirmation requirements.
+   * Tools without execute function will require confirmation.
+   */
+  tools?: Record<string, AITool<unknown, unknown>>;
+  /**
+   * @description Manual override for tools requiring confirmation.
+   * If not provided, will auto-detect from tools object.
+   */
+  toolsRequiringConfirmation?: string[];
+  /**
+   * When true (default), automatically sends the next message only after
+   * all pending confirmation-required tool calls have been resolved.
+   * @default true
+   */
+  autoSendAfterAllConfirmationsResolved?: boolean;
+};
 /**
  * React hook for building AI chat interfaces using an Agent
  * @param options Chat options including the agent connection
  * @returns Chat interface controls and state with added clearHistory method
  */
-declare function useAgentChat<State = unknown>(
-  options: UseAgentChatOptions<State>
-): {
-  /**
-   * Set the chat messages and synchronize with the Agent
-   * @param messages New messages to set
-   */
-  setMessages: (messages: Message[]) => void;
-  /**
-   * Clear chat history on both client and Agent
-   */
+/**
+ * Automatically detects which tools require confirmation based on their configuration.
+ * Tools require confirmation if they have no execute function AND are not server-executed.
+ * @param tools - Record of tool name to tool definition
+ * @returns Array of tool names that require confirmation
+ */
+declare function detectToolsRequiringConfirmation(
+  tools?: Record<string, AITool<unknown, unknown>>
+): string[];
+declare function useAgentChat<
+  State = unknown,
+  ChatMessage extends UIMessage = UIMessage
+>(
+  options: UseAgentChatOptions<State, ChatMessage>
+): ReturnType<typeof useChat<ChatMessage>> & {
   clearHistory: () => void;
-  messages: ai.UIMessage[];
-  error: undefined | Error;
-  append: (
-    message: Message | ai.CreateMessage,
-    chatRequestOptions?: ai.ChatRequestOptions
-  ) => Promise<string | null | undefined>;
-  reload: (
-    chatRequestOptions?: ai.ChatRequestOptions
-  ) => Promise<string | null | undefined>;
-  stop: () => void;
-  experimental_resume: () => void;
-  input: string;
-  setInput: React.Dispatch<React.SetStateAction<string>>;
-  handleInputChange: (
-    e:
-      | React.ChangeEvent<HTMLInputElement>
-      | React.ChangeEvent<HTMLTextAreaElement>
-  ) => void;
-  handleSubmit: (
-    event?: {
-      preventDefault?: () => void;
-    },
-    chatRequestOptions?: ai.ChatRequestOptions
-  ) => void;
-  metadata?: Object;
-  isLoading: boolean;
-  status: "submitted" | "streaming" | "ready" | "error";
-  data?: ai.JSONValue[];
-  setData: (
-    data:
-      | ai.JSONValue[]
-      | undefined
-      | ((data: ai.JSONValue[] | undefined) => ai.JSONValue[] | undefined)
-  ) => void;
-  id: string;
-  addToolResult: ({
-    toolCallId,
-    result,
-  }: {
-    toolCallId: string;
-    result: any;
-  }) => void;
 };
-
-export { useAgentChat };
+//#endregion
+export { AITool, detectToolsRequiringConfirmation, useAgentChat };
+//# sourceMappingURL=ai-react.d.ts.map

package/dist/ai-react.js

@@ -1,203 +1,270 @@
-// src/ai-react.tsx
-import { useChat } from "@ai-sdk/react";
-import { use, useEffect } from "react";
+import { t as MessageType } from "./ai-types-B3aQaFv3.js";
 import { nanoid } from "nanoid";
-var requestCache = /* @__PURE__ */ new Map();
+import { useChat } from "@ai-sdk/react";
+import { DefaultChatTransport, getToolName, isToolUIPart } from "ai";
+import { use, useCallback, useEffect, useMemo, useRef } from "react";
+
+//#region src/ai-react.tsx
+const requestCache = /* @__PURE__ */ new Map();
+/**
+* React hook for building AI chat interfaces using an Agent
+* @param options Chat options including the agent connection
+* @returns Chat interface controls and state with added clearHistory method
+*/
+/**
+* Automatically detects which tools require confirmation based on their configuration.
+* Tools require confirmation if they have no execute function AND are not server-executed.
+* @param tools - Record of tool name to tool definition
+* @returns Array of tool names that require confirmation
+*/
+function detectToolsRequiringConfirmation(tools) {
+	if (!tools) return [];
+	return Object.entries(tools).filter(([_name, tool$1]) => !tool$1.execute).map(([name]) => name);
+}
 function useAgentChat(options) {
-  const { agent, getInitialMessages, ...rest } = options;
-  const agentUrl = new URL(
-    `${// @ts-expect-error we're using a protected _url property that includes query params
-    (agent._url || agent._pkurl)?.replace("ws://", "http://").replace("wss://", "https://")}`
-  );
-  agentUrl.searchParams.delete("_pk");
-  const agentUrlString = agentUrl.toString();
-  async function defaultGetInitialMessagesFetch({
-    url
-  }) {
-    const getMessagesUrl = new URL(url);
-    getMessagesUrl.pathname += "/get-messages";
-    const response = await fetch(getMessagesUrl.toString(), {
-      headers: options.headers,
-      credentials: options.credentials
-    });
-    return response.json();
-  }
-  const getInitialMessagesFetch = getInitialMessages || defaultGetInitialMessagesFetch;
-  function doGetInitialMessages(getInitialMessagesOptions) {
-    if (requestCache.has(agentUrlString)) {
-      return requestCache.get(agentUrlString);
-    }
-    const promise = getInitialMessagesFetch(getInitialMessagesOptions);
-    requestCache.set(agentUrlString, promise);
-    return promise;
-  }
-  const initialMessagesPromise = getInitialMessages === null ? null : doGetInitialMessages({
-    agent: agent.agent,
-    name: agent.name,
-    url: agentUrlString
-  });
-  const initialMessages = initialMessagesPromise ? use(initialMessagesPromise) : rest.initialMessages ?? [];
-  useEffect(() => {
-    if (!initialMessagesPromise) {
-      return;
-    }
-    requestCache.set(agentUrlString, initialMessagesPromise);
-    return () => {
-      if (requestCache.get(agentUrlString) === initialMessagesPromise) {
-        requestCache.delete(agentUrlString);
-      }
-    };
-  }, [agentUrlString, initialMessagesPromise]);
-  async function aiFetch(request, options2 = {}) {
-    const {
-      method,
-      keepalive,
-      headers,
-      body,
-      redirect,
-      integrity,
-      signal,
-      credentials,
-      mode,
-      referrer,
-      referrerPolicy,
-      window
-      //  dispatcher, duplex
-    } = options2;
-    const id = nanoid(8);
-    const abortController = new AbortController();
-    signal?.addEventListener("abort", () => {
-      agent.send(
-        JSON.stringify({
-          type: "cf_agent_chat_request_cancel",
-          id
-        })
-      );
-      abortController.abort();
-      controller.close();
-    });
-    agent.addEventListener(
-      "message",
-      (event) => {
-        let data;
-        try {
-          data = JSON.parse(event.data);
-        } catch (error) {
-          return;
-        }
-        if (data.type === "cf_agent_use_chat_response") {
-          if (data.id === id) {
-            controller.enqueue(new TextEncoder().encode(data.body));
-            if (data.done) {
-              controller.close();
-              abortController.abort();
-            }
-          }
-        }
-      },
-      { signal: abortController.signal }
-    );
-    let controller;
-    const stream = new ReadableStream({
-      start(c) {
-        controller = c;
-      }
-    });
-    agent.send(
-      JSON.stringify({
-        type: "cf_agent_use_chat_request",
-        id,
-        url: request.toString(),
-        init: {
-          method,
-          keepalive,
-          headers,
-          body,
-          redirect,
-          integrity,
-          credentials,
-          mode,
-          referrer,
-          referrerPolicy,
-          window
-          // dispatcher,
-          // duplex
-        }
-      })
-    );
-    return new Response(stream);
-  }
-  const useChatHelpers = useChat({
-    initialMessages,
-    sendExtraMessageFields: true,
-    fetch: aiFetch,
-    ...rest
-  });
-  useEffect(() => {
-    function onClearHistory(event) {
-      if (typeof event.data !== "string") {
-        return;
-      }
-      let data;
-      try {
-        data = JSON.parse(event.data);
-      } catch (error) {
-        return;
-      }
-      if (data.type === "cf_agent_chat_clear") {
-        useChatHelpers.setMessages([]);
-      }
-    }
-    function onMessages(event) {
-      if (typeof event.data !== "string") {
-        return;
-      }
-      let data;
-      try {
-        data = JSON.parse(event.data);
-      } catch (error) {
-        return;
-      }
-      if (data.type === "cf_agent_chat_messages") {
-        useChatHelpers.setMessages(data.messages);
-      }
-    }
-    agent.addEventListener("message", onClearHistory);
-    agent.addEventListener("message", onMessages);
-    return () => {
-      agent.removeEventListener("message", onClearHistory);
-      agent.removeEventListener("message", onMessages);
-    };
-  }, [agent, useChatHelpers.setMessages]);
-  return {
-    ...useChatHelpers,
-    /**
-     * Set the chat messages and synchronize with the Agent
-     * @param messages New messages to set
-     */
-    setMessages: (messages) => {
-      useChatHelpers.setMessages(messages);
-      agent.send(
-        JSON.stringify({
-          type: "cf_agent_chat_messages",
-          messages
-        })
-      );
-    },
-    /**
-     * Clear chat history on both client and Agent
-     */
-    clearHistory: () => {
-      useChatHelpers.setMessages([]);
-      agent.send(
-        JSON.stringify({
-          type: "cf_agent_chat_clear"
-        })
-      );
-    }
-  };
+	const { agent, getInitialMessages, messages: optionsInitialMessages, experimental_automaticToolResolution, tools, toolsRequiringConfirmation: manualToolsRequiringConfirmation, autoSendAfterAllConfirmationsResolved = true,...rest } = options;
+	const toolsRequiringConfirmation = manualToolsRequiringConfirmation ?? detectToolsRequiringConfirmation(tools);
+	const agentUrl = new URL(`${(agent._url || agent._pkurl)?.replace("ws://", "http://").replace("wss://", "https://")}`);
+	agentUrl.searchParams.delete("_pk");
+	const agentUrlString = agentUrl.toString();
+	const initialMessagesCacheKey = `${agentUrlString}|${agent.agent ?? ""}|${agent.name ?? ""}`;
+	const agentRef = useRef(agent);
+	useEffect(() => {
+		agentRef.current = agent;
+	}, [agent]);
+	async function defaultGetInitialMessagesFetch({ url }) {
+		const getMessagesUrl = new URL(url);
+		getMessagesUrl.pathname += "/get-messages";
+		const response = await fetch(getMessagesUrl.toString(), {
+			credentials: options.credentials,
+			headers: options.headers
+		});
+		if (!response.ok) {
+			console.warn(`Failed to fetch initial messages: ${response.status} ${response.statusText}`);
+			return [];
+		}
+		const text = await response.text();
+		if (!text.trim()) return [];
+		try {
+			return JSON.parse(text);
+		} catch (error) {
+			console.warn("Failed to parse initial messages JSON:", error);
+			return [];
+		}
+	}
+	const getInitialMessagesFetch = getInitialMessages || defaultGetInitialMessagesFetch;
+	function doGetInitialMessages(getInitialMessagesOptions, cacheKey) {
+		if (requestCache.has(cacheKey)) return requestCache.get(cacheKey);
+		const promise = getInitialMessagesFetch(getInitialMessagesOptions);
+		requestCache.set(cacheKey, promise);
+		return promise;
+	}
+	const initialMessagesPromise = getInitialMessages === null ? null : doGetInitialMessages({
+		agent: agent.agent,
+		name: agent.name,
+		url: agentUrlString
+	}, initialMessagesCacheKey);
+	const initialMessages = initialMessagesPromise ? use(initialMessagesPromise) : optionsInitialMessages ?? [];
+	useEffect(() => {
+		if (!initialMessagesPromise) return;
+		requestCache.set(initialMessagesCacheKey, initialMessagesPromise);
+		return () => {
+			if (requestCache.get(initialMessagesCacheKey) === initialMessagesPromise) requestCache.delete(initialMessagesCacheKey);
+		};
+	}, [initialMessagesCacheKey, initialMessagesPromise]);
+	const aiFetch = useCallback(async (request, options$1 = {}) => {
+		const { method, keepalive, headers, body, redirect, integrity, signal, credentials, mode, referrer, referrerPolicy, window } = options$1;
+		const id = nanoid(8);
+		const abortController = new AbortController();
+		let controller;
+		const currentAgent = agentRef.current;
+		signal?.addEventListener("abort", () => {
+			currentAgent.send(JSON.stringify({
+				id,
+				type: MessageType.CF_AGENT_CHAT_REQUEST_CANCEL
+			}));
+			abortController.abort();
+			controller.close();
+		});
+		currentAgent.addEventListener("message", (event) => {
+			let data;
+			try {
+				data = JSON.parse(event.data);
+			} catch (_error) {
+				return;
+			}
+			if (data.type === MessageType.CF_AGENT_USE_CHAT_RESPONSE) {
+				if (data.id === id) if (data.error) {
+					controller.error(new Error(data.body));
+					abortController.abort();
+				} else {
+					if (data.body?.trim()) controller.enqueue(new TextEncoder().encode(`data: ${data.body}\n\n`));
+					if (data.done) {
+						controller.close();
+						abortController.abort();
+					}
+				}
+			}
+		}, { signal: abortController.signal });
+		const stream = new ReadableStream({
+			start(c) {
+				controller = c;
+			},
+			cancel(reason) {
+				console.warn("[agents/ai-react] cancelling stream", id, reason || "no reason");
+			}
+		});
+		currentAgent.send(JSON.stringify({
+			id,
+			init: {
+				body,
+				credentials,
+				headers,
+				integrity,
+				keepalive,
+				method,
+				mode,
+				redirect,
+				referrer,
+				referrerPolicy,
+				window
+			},
+			type: MessageType.CF_AGENT_USE_CHAT_REQUEST,
+			url: request.toString()
+		}));
+		return new Response(stream);
+	}, []);
+	const customTransport = useMemo(() => ({
+		sendMessages: async (options$1) => {
+			return new DefaultChatTransport({
+				api: agentUrlString,
+				fetch: aiFetch
+			}).sendMessages(options$1);
+		},
+		reconnectToStream: async (options$1) => {
+			return new DefaultChatTransport({
+				api: agentUrlString,
+				fetch: aiFetch
+			}).reconnectToStream(options$1);
+		}
+	}), [agentUrlString, aiFetch]);
+	const useChatHelpers = useChat({
+		...rest,
+		messages: initialMessages,
+		transport: customTransport,
+		id: agent._pk
+	});
+	const processedToolCalls = useRef(/* @__PURE__ */ new Set());
+	const lastMessage = useChatHelpers.messages[useChatHelpers.messages.length - 1];
+	const pendingConfirmations = (() => {
+		if (!lastMessage || lastMessage.role !== "assistant") return {
+			messageId: void 0,
+			toolCallIds: /* @__PURE__ */ new Set()
+		};
+		const pendingIds = /* @__PURE__ */ new Set();
+		for (const part of lastMessage.parts ?? []) if (isToolUIPart(part) && part.state === "input-available" && toolsRequiringConfirmation.includes(getToolName(part))) pendingIds.add(part.toolCallId);
+		return {
+			messageId: lastMessage.id,
+			toolCallIds: pendingIds
+		};
+	})();
+	const pendingConfirmationsRef = useRef(pendingConfirmations);
+	pendingConfirmationsRef.current = pendingConfirmations;
+	useEffect(() => {
+		if (!experimental_automaticToolResolution) return;
+		const lastMessage$1 = useChatHelpers.messages[useChatHelpers.messages.length - 1];
+		if (!lastMessage$1 || lastMessage$1.role !== "assistant") return;
+		const toolCalls = lastMessage$1.parts.filter((part) => isToolUIPart(part) && part.state === "input-available" && !processedToolCalls.current.has(part.toolCallId));
+		if (toolCalls.length > 0) (async () => {
+			const toolCallsToResolve = toolCalls.filter((part) => isToolUIPart(part) && !toolsRequiringConfirmation.includes(getToolName(part)) && tools?.[getToolName(part)]?.execute);
+			if (toolCallsToResolve.length > 0) {
+				for (const part of toolCallsToResolve) if (isToolUIPart(part)) {
+					processedToolCalls.current.add(part.toolCallId);
+					let toolOutput = null;
+					const toolName = getToolName(part);
+					const tool$1 = tools?.[toolName];
+					if (tool$1?.execute && part.input) try {
+						toolOutput = await tool$1.execute(part.input);
+					} catch (error) {
+						toolOutput = `Error executing tool: ${error instanceof Error ? error.message : String(error)}`;
+					}
+					await useChatHelpers.addToolResult({
+						toolCallId: part.toolCallId,
+						tool: toolName,
+						output: toolOutput
+					});
+				}
+				if (pendingConfirmationsRef.current.toolCallIds.size === 0) useChatHelpers.sendMessage();
+			}
+		})();
+	}, [
+		useChatHelpers.messages,
+		experimental_automaticToolResolution,
+		useChatHelpers.addToolResult,
+		useChatHelpers.sendMessage,
+		toolsRequiringConfirmation
+	]);
+	useEffect(() => {
+		function onClearHistory(event) {
+			if (typeof event.data !== "string") return;
+			let data;
+			try {
+				data = JSON.parse(event.data);
+			} catch (_error) {
+				return;
+			}
+			if (data.type === MessageType.CF_AGENT_CHAT_CLEAR) useChatHelpers.setMessages([]);
+		}
+		function onMessages(event) {
+			if (typeof event.data !== "string") return;
+			let data;
+			try {
+				data = JSON.parse(event.data);
+			} catch (_error) {
+				return;
+			}
+			if (data.type === MessageType.CF_AGENT_CHAT_MESSAGES) useChatHelpers.setMessages(data.messages);
+		}
+		agent.addEventListener("message", onClearHistory);
+		agent.addEventListener("message", onMessages);
+		return () => {
+			agent.removeEventListener("message", onClearHistory);
+			agent.removeEventListener("message", onMessages);
+		};
+	}, [agent, useChatHelpers.setMessages]);
+	const addToolResultAndSendMessage = async (args) => {
+		const { toolCallId } = args;
+		await useChatHelpers.addToolResult(args);
+		if (!autoSendAfterAllConfirmationsResolved) {
+			useChatHelpers.sendMessage();
+			return;
+		}
+		const pending = pendingConfirmationsRef.current?.toolCallIds;
+		if (!pending) {
+			useChatHelpers.sendMessage();
+			return;
+		}
+		const wasLast = pending.size === 1 && pending.has(toolCallId);
+		if (pending.has(toolCallId)) pending.delete(toolCallId);
+		if (wasLast || pending.size === 0) useChatHelpers.sendMessage();
+	};
+	return {
+		...useChatHelpers,
+		addToolResult: addToolResultAndSendMessage,
+		clearHistory: () => {
+			useChatHelpers.setMessages([]);
+			agent.send(JSON.stringify({ type: MessageType.CF_AGENT_CHAT_CLEAR }));
+		},
+		setMessages: (messages) => {
+			useChatHelpers.setMessages(messages);
+			agent.send(JSON.stringify({
+				messages: Array.isArray(messages) ? messages : [],
+				type: MessageType.CF_AGENT_CHAT_MESSAGES
+			}));
+		}
+	};
 }
-export {
-  useAgentChat
-};
+
+//#endregion
+export { detectToolsRequiringConfirmation, useAgentChat };
 //# sourceMappingURL=ai-react.js.map