agents 0.0.0-e4a2352 → 0.0.0-e777fdd

package/dist/ai-react.d.ts

@@ -1,15 +1,14 @@
-import * as ai from "ai";
-import { Message } from "ai";
-import { useChat } from "@ai-sdk/react";
+import { UseChatOptions, useChat } from "@ai-sdk/react";
+import { UIMessage, ChatInit } from "ai";
 import { useAgent } from "./react.js";
 import "partysocket";
 import "partysocket/react";
-import "./index-BCJclX6q.js";
+import "./index.js";
 import "cloudflare:workers";
 import "@modelcontextprotocol/sdk/client/index.js";
 import "@modelcontextprotocol/sdk/types.js";
 import "partyserver";
-import "./client-DgyzBU_8.js";
+import "./client-BohGLma8.js";
 import "zod";
 import "@modelcontextprotocol/sdk/shared/protocol.js";
 import "@modelcontextprotocol/sdk/client/sse.js";
@@ -17,87 +16,83 @@ import "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import "./mcp/do-oauth-client-provider.js";
 import "@modelcontextprotocol/sdk/client/auth.js";
 import "@modelcontextprotocol/sdk/shared/auth.js";
+import "./observability/index.js";
+import "./ai-types.js";
 import "./client.js";
 import "./serializable.js";
 
+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>
-): {
-  /**
-   * 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;
-  /**
-   * Set the chat messages and synchronize with the Agent
-   * @param messages New messages to set
-   */
-  setMessages: (messages: Message[]) => 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 };
+export { type AITool, detectToolsRequiringConfirmation, useAgentChat };

package/dist/ai-react.js

@@ -1,16 +1,39 @@
+import "./chunk-BER7KXUJ.js";
+import "./chunk-PR4QN5HX.js";
+
 // src/ai-react.tsx
 import { useChat } from "@ai-sdk/react";
+import { getToolName, isToolUIPart } from "ai";
+import { DefaultChatTransport } from "ai";
 import { nanoid } from "nanoid";
-import { use, useEffect } from "react";
+import { use, useCallback, useEffect, useMemo, useRef } from "react";
 var requestCache = /* @__PURE__ */ new Map();
+function detectToolsRequiringConfirmation(tools) {
+  if (!tools) return [];
+  return Object.entries(tools).filter(([_name, tool]) => !tool.execute).map(([name]) => name);
+}
 function useAgentChat(options) {
-  const { agent, getInitialMessages, ...rest } = options;
+  const {
+    agent,
+    getInitialMessages,
+    messages: optionsInitialMessages,
+    experimental_automaticToolResolution,
+    tools,
+    toolsRequiringConfirmation: manualToolsRequiringConfirmation,
+    autoSendAfterAllConfirmationsResolved = true,
+    ...rest
+  } = options;
+  const toolsRequiringConfirmation = manualToolsRequiringConfirmation ?? detectToolsRequiringConfirmation(tools);
   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();
+  const agentRef = useRef(agent);
+  useEffect(() => {
+    agentRef.current = agent;
+  }, [agent]);
   async function defaultGetInitialMessagesFetch({
     url
   }) {
@@ -20,7 +43,22 @@ function useAgentChat(options) {
       credentials: options.credentials,
       headers: options.headers
     });
-    return response.json();
+    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) {
@@ -36,7 +74,7 @@ function useAgentChat(options) {
     name: agent.name,
     url: agentUrlString
   });
-  const initialMessages = initialMessagesPromise ? use(initialMessagesPromise) : rest.initialMessages ?? [];
+  const initialMessages = initialMessagesPromise ? use(initialMessagesPromise) : optionsInitialMessages ?? [];
   useEffect(() => {
     if (!initialMessagesPromise) {
       return;
@@ -48,117 +86,217 @@ function useAgentChat(options) {
       }
     };
   }, [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({
-          id,
-          type: "cf_agent_chat_request_cancel"
-        })
-      );
-      abortController.abort();
-      controller.close();
-    });
-    agent.addEventListener(
-      "message",
-      (event) => {
-        let data;
-        try {
-          data = JSON.parse(event.data);
-        } catch (_error) {
-          return;
+  const aiFetch = useCallback(
+    async (request, options2 = {}) => {
+      const {
+        method,
+        keepalive,
+        headers,
+        body,
+        redirect,
+        integrity,
+        signal,
+        credentials,
+        mode,
+        referrer,
+        referrerPolicy,
+        window
+      } = options2;
+      const id = nanoid(8);
+      const abortController = new AbortController();
+      let controller;
+      let isToolCallInProgress = false;
+      const currentAgent = agentRef.current;
+      signal?.addEventListener("abort", () => {
+        currentAgent.send(
+          JSON.stringify({
+            id,
+            type: "cf_agent_chat_request_cancel" /* CF_AGENT_CHAT_REQUEST_CANCEL */
+          })
+        );
+        abortController.abort();
+        if (!isToolCallInProgress) {
+          controller.close();
         }
-        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();
+      });
+      currentAgent.addEventListener(
+        "message",
+        (event) => {
+          let data;
+          try {
+            data = JSON.parse(event.data);
+          } catch (_error) {
+            return;
+          }
+          if (data.type === "cf_agent_use_chat_response" /* 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()) {
+                  if (data.body.includes('"tool_calls"')) {
+                    isToolCallInProgress = true;
+                  }
+                  controller.enqueue(
+                    new TextEncoder().encode(`data: ${data.body}
+
+`)
+                  );
+                }
+                if (data.done && !isToolCallInProgress) {
+                  controller.close();
+                  abortController.abort();
+                }
+              }
             }
           }
+        },
+        { signal: abortController.signal }
+      );
+      const stream = new ReadableStream({
+        start(c) {
+          controller = c;
         }
+      });
+      currentAgent.send(
+        JSON.stringify({
+          id,
+          init: {
+            body,
+            credentials,
+            headers,
+            integrity,
+            keepalive,
+            method,
+            mode,
+            redirect,
+            referrer,
+            referrerPolicy,
+            window
+          },
+          type: "cf_agent_use_chat_request" /* CF_AGENT_USE_CHAT_REQUEST */,
+          url: request.toString()
+        })
+      );
+      return new Response(stream);
+    },
+    []
+  );
+  const customTransport = useMemo(
+    () => ({
+      sendMessages: async (options2) => {
+        const transport = new DefaultChatTransport({
+          api: agentUrlString,
+          fetch: aiFetch
+        });
+        return transport.sendMessages(options2);
       },
-      { signal: abortController.signal }
-    );
-    let controller;
-    const stream = new ReadableStream({
-      start(c) {
-        controller = c;
+      reconnectToStream: async (options2) => {
+        const transport = new DefaultChatTransport({
+          api: agentUrlString,
+          fetch: aiFetch
+        });
+        return transport.reconnectToStream(options2);
       }
-    });
-    agent.send(
-      JSON.stringify({
-        id,
-        init: {
-          body,
-          credentials,
-          headers,
-          integrity,
-          keepalive,
-          method,
-          mode,
-          redirect,
-          referrer,
-          referrerPolicy,
-          window
-          // dispatcher,
-          // duplex
-        },
-        type: "cf_agent_use_chat_request",
-        url: request.toString()
-      })
-    );
-    return new Response(stream);
-  }
+    }),
+    [agentUrlString, aiFetch]
+  );
   const useChatHelpers = useChat({
-    fetch: aiFetch,
-    initialMessages,
-    sendExtraMessageFields: true,
-    ...rest
+    ...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 lastMessage2 = useChatHelpers.messages[useChatHelpers.messages.length - 1];
+    if (!lastMessage2 || lastMessage2.role !== "assistant") {
+      return;
+    }
+    const toolCalls = lastMessage2.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
+          // Only execute if client has execute function
+        );
+        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 = tools?.[toolName];
+              if (tool?.execute && part.input) {
+                try {
+                  toolOutput = await tool.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;
-      }
+      if (typeof event.data !== "string") return;
       let data;
       try {
         data = JSON.parse(event.data);
       } catch (_error) {
         return;
       }
-      if (data.type === "cf_agent_chat_clear") {
+      if (data.type === "cf_agent_chat_clear" /* CF_AGENT_CHAT_CLEAR */) {
         useChatHelpers.setMessages([]);
       }
     }
     function onMessages(event) {
-      if (typeof event.data !== "string") {
-        return;
-      }
+      if (typeof event.data !== "string") return;
       let data;
       try {
         data = JSON.parse(event.data);
       } catch (_error) {
         return;
       }
-      if (data.type === "cf_agent_chat_messages") {
+      if (data.type === "cf_agent_chat_messages" /* CF_AGENT_CHAT_MESSAGES */) {
         useChatHelpers.setMessages(data.messages);
       }
     }
@@ -169,35 +307,50 @@ function useAgentChat(options) {
       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,
-    /**
-     * Clear chat history on both client and Agent
-     */
+    addToolResult: addToolResultAndSendMessage,
     clearHistory: () => {
       useChatHelpers.setMessages([]);
       agent.send(
         JSON.stringify({
-          type: "cf_agent_chat_clear"
+          type: "cf_agent_chat_clear" /* CF_AGENT_CHAT_CLEAR */
         })
       );
     },
-    /**
-     * Set the chat messages and synchronize with the Agent
-     * @param messages New messages to set
-     */
     setMessages: (messages) => {
       useChatHelpers.setMessages(messages);
       agent.send(
         JSON.stringify({
-          messages,
-          type: "cf_agent_chat_messages"
+          messages: Array.isArray(messages) ? messages : [],
+          type: "cf_agent_chat_messages" /* CF_AGENT_CHAT_MESSAGES */
         })
       );
     }
   };
 }
 export {
+  detectToolsRequiringConfirmation,
   useAgentChat
 };
 //# sourceMappingURL=ai-react.js.map