agents 0.0.0-eeb70e2 → 0.0.0-f0c6dce

package/README.md

@@ -66,13 +66,13 @@ export class AIAgent extends Agent {
   async onRequest(request) {
     // Connect with AI capabilities
     const ai = new OpenAI({
-      apiKey: this.env.OPENAI_API_KEY,
+      apiKey: this.env.OPENAI_API_KEY
     });
 
     // Process and understand
     const response = await ai.chat.completions.create({
       model: "gpt-4",
-      messages: [{ role: "user", content: await request.text() }],
+      messages: [{ role: "user", content: await request.text() }]
     });
 
     return new Response(response.choices[0].message.content);
@@ -96,17 +96,17 @@ Define your agent's domain:
     "bindings": [
       {
         "name": "AIAgent",
-        "class_name": "AIAgent",
-      },
-    ],
+        "class_name": "AIAgent"
+      }
+    ]
   },
   "migrations": [
     {
       "tag": "v1",
       // Mandatory for the Agent to store state
-      "new_sqlite_classes": ["AIAgent"],
-    },
-  ],
+      "new_sqlite_classes": ["AIAgent"]
+    }
+  ]
 }
 ```
 
@@ -123,7 +123,7 @@ const agent = env.AIAgent.get(id);
 await agent.processTask({
   type: "analysis",
   context: "incoming_data",
-  parameters: initialConfig,
+  parameters: initialConfig
 });
 
 // Or reconnect with an existing one
@@ -143,7 +143,7 @@ export class APIAgent extends Agent {
 
     return Response.json({
       insight: await this.process(data),
-      moment: Date.now(),
+      moment: Date.now()
     });
   }
 }
@@ -166,7 +166,7 @@ export class DialogueAgent extends Agent {
 }
 ```
 
-#### Client Communion
+#### Client Communication
 
 For direct connection to your agent:
 
@@ -175,7 +175,7 @@ import { AgentClient } from "agents/client";
 
 const connection = new AgentClient({
   agent: "dialogue-agent",
-  name: "insight-seeker",
+  name: "insight-seeker"
 });
 
 connection.addEventListener("message", (event) => {
@@ -185,7 +185,7 @@ connection.addEventListener("message", (event) => {
 connection.send(
   JSON.stringify({
     type: "inquiry",
-    content: "What patterns do you see?",
+    content: "What patterns do you see?"
   })
 );
 ```
@@ -205,14 +205,14 @@ function AgentInterface() {
       console.log("Understanding received:", message.data);
     },
     onOpen: () => console.log("Connection established"),
-    onClose: () => console.log("Connection closed"),
+    onClose: () => console.log("Connection closed")
   });
 
   const inquire = () => {
     connection.send(
       JSON.stringify({
         type: "inquiry",
-        content: "What insights have you gathered?",
+        content: "What insights have you gathered?"
       })
     );
   };
@@ -235,14 +235,14 @@ export class ThinkingAgent extends Agent {
     this.setState({
       ...this.state,
       insights: [...(this.state.insights || []), newInsight],
-      understanding: this.state.understanding + 1,
+      understanding: this.state.understanding + 1
     });
   }
 
   onStateUpdate(state, source) {
     console.log("Understanding deepened:", {
       newState: state,
-      origin: source,
+      origin: source
     });
   }
 }
@@ -259,7 +259,7 @@ function StateInterface() {
 
   const agent = useAgent({
     agent: "thinking-agent",
-    onStateUpdate: (newState) => setState(newState),
+    onStateUpdate: (newState) => setState(newState)
   });
 
   const increment = () => {
@@ -289,7 +289,7 @@ export class TimeAwareAgent extends Agent {
 
     // Daily synthesis
     this.schedule("0 0 * * *", "dailySynthesis", {
-      depth: "comprehensive",
+      depth: "comprehensive"
     });
 
     // Milestone review
@@ -325,11 +325,11 @@ export class DialogueAgent extends AIChatAgent {
         const stream = streamText({
           model: openai("gpt-4o"),
           messages: this.messages,
-          onFinish, // call onFinish so that messages get saved
+          onFinish // call onFinish so that messages get saved
         });
 
         stream.mergeIntoDataStream(dataStream);
-      },
+      }
     });
   }
 }
@@ -346,14 +346,14 @@ import { useAgentChat } from "agents/ai-react";
 function ChatInterface() {
   // Connect to the agent
   const agent = useAgent({
-    agent: "dialogue-agent",
+    agent: "dialogue-agent"
   });
 
   // Set up the chat interaction
   const { messages, input, handleInputChange, handleSubmit, clearHistory } =
     useAgentChat({
       agent,
-      maxSteps: 5,
+      maxSteps: 5
     });
 
   return (
@@ -393,6 +393,112 @@ This creates:
 - Intuitive input handling
 - Easy conversation reset
 
+### 🔗 MCP (Model Context Protocol) Integration
+
+Agents can seamlessly integrate with the Model Context Protocol, allowing them to act as both MCP servers (providing tools to AI assistants) and MCP clients (using tools from other services).
+
+#### Creating an MCP Server
+
+```typescript
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { McpAgent } from "agents/mcp";
+import { z } from "zod";
+
+type Env = {
+  MyMCP: DurableObjectNamespace<MyMCP>;
+};
+
+type State = { counter: number };
+
+export class MyMCP extends McpAgent<Env, State, {}> {
+  server = new McpServer({
+    name: "Demo",
+    version: "1.0.0"
+  });
+
+  initialState: State = {
+    counter: 1
+  };
+
+  async init() {
+    this.server.resource("counter", "mcp://resource/counter", (uri) => {
+      return {
+        contents: [{ text: String(this.state.counter), uri: uri.href }]
+      };
+    });
+
+    this.server.tool(
+      "add",
+      "Add to the counter, stored in the MCP",
+      { a: z.number() },
+      async ({ a }) => {
+        this.setState({ ...this.state, counter: this.state.counter + a });
+
+        return {
+          content: [
+            {
+              text: String(`Added ${a}, total is now ${this.state.counter}`),
+              type: "text"
+            }
+          ]
+        };
+      }
+    );
+  }
+
+  onStateUpdate(state: State) {
+    console.log({ stateUpdate: state });
+  }
+}
+
+// HTTP Streamable transport (recommended)
+export default MyMCP.serve("/mcp", {
+  binding: "MyMCP"
+});
+
+// Or SSE transport for legacy compatibility
+// export default MyMCP.serveSSE("/mcp", { binding: "MyMCP" });
+```
+
+#### Using MCP Tools
+
+```typescript
+import { MCPClientManager } from "agents/mcp";
+
+const client = new MCPClientManager("my-app", "1.0.0");
+
+// Connect to an MCP server
+await client.connect("https://weather-service.com/mcp", {
+  transport: { type: "streamable-http" }
+});
+
+// Use tools from the server
+const weather = await client.callTool({
+  serverId: "weather-service",
+  name: "getWeather",
+  arguments: { location: "San Francisco" }
+});
+```
+
+#### AI SDK Integration
+
+```typescript
+import { generateText } from "ai";
+
+// Convert MCP tools for AI use
+const result = await generateText({
+  model: openai("gpt-4"),
+  tools: client.getAITools(),
+  prompt: "What's the weather in Tokyo?"
+});
+```
+
+**Transport Options:**
+
+- **Auto**: Automatically determine the correct transport
+- **HTTP Streamable**: Best performance, batch requests, session management
+- **SSE**: Simple setup, legacy compatibility
+
 ### 💬 The Path Forward
 
 We're developing new dimensions of agent capability:
@@ -418,8 +524,8 @@ Welcome to the future of intelligent agents. Create something meaningful. 🌟
 Contributions are welcome, but are especially welcome when:
 
 - You have opened an issue as a Request for Comment (RFC) to discuss your proposal, show your thinking, and iterate together.
-- Is not "AI slop": LLMs are powerful tools, but contributions entirely authored by vibe coding are unlikely to meet the quality bar, and will be rejected.
-- You're willing to accept feedback and make sure the changes fit the goals of the `agents` sdk. Not everything will, and that's OK.
+- Not "AI slop": LLMs are powerful tools, but contributions entirely authored by vibe coding are unlikely to meet the quality bar, and will be rejected.
+- You're willing to accept feedback and make sure the changes fit the goals of the `agents` SDK. Not everything will, and that's OK.
 
 Small fixes, type bugs, and documentation improvements can be raised directly as PRs.
 

package/dist/ai-chat-agent.d.ts

@@ -1,15 +1,19 @@
+import { UIMessage, StreamTextOnFinishCallback, ToolSet } from "ai";
 import { Agent, AgentContext } from "./index.js";
-import { Message, StreamTextOnFinishCallback, ToolSet } from "ai";
 import { Connection, WSMessage } from "partyserver";
+import "cloudflare:workers";
+import "@modelcontextprotocol/sdk/client/index.js";
 import "@modelcontextprotocol/sdk/types.js";
-import "./mcp/client.js";
+import "./client-B9tFv5gX.js";
 import "zod";
-import "@modelcontextprotocol/sdk/client/index.js";
+import "@modelcontextprotocol/sdk/shared/protocol.js";
 import "@modelcontextprotocol/sdk/client/sse.js";
+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 "@modelcontextprotocol/sdk/shared/protocol.js";
+import "./observability/index.js";
+import "./ai-types.js";
 
 /**
  * Extension of Agent with built-in chat capabilities
@@ -25,7 +29,7 @@ declare class AIChatAgent<Env = unknown, State = unknown> extends Agent<
    */
   private _chatMessageAbortControllers;
   /** Array of chat messages for the current conversation */
-  messages: Message[];
+  messages: UIMessage[];
   constructor(ctx: AgentContext, env: Env);
   private _broadcastChatMessage;
   onMessage(connection: Connection, message: WSMessage): Promise<void>;
@@ -44,12 +48,12 @@ declare class AIChatAgent<Env = unknown, State = unknown> extends Agent<
     }
   ): Promise<Response | undefined>;
   /**
-   * Save messages on the server side and trigger AI response
+   * Save messages on the server side
    * @param messages Chat messages to save
    */
-  saveMessages(messages: Message[]): Promise<void>;
+  saveMessages(messages: UIMessage[]): Promise<void>;
   persistMessages(
-    messages: Message[],
+    messages: UIMessage[],
     excludeBroadcastIds?: string[]
   ): Promise<void>;
   private _reply;

package/dist/ai-chat-agent.js

@@ -1,12 +1,15 @@
+import {
+  autoTransformMessages
+} from "./chunk-UJVEAURM.js";
 import {
   Agent
-} from "./chunk-P3RZJ72N.js";
-import "./chunk-OYJXQRRH.js";
-import "./chunk-BZXOAZUX.js";
-import "./chunk-VCSB47AK.js";
+} from "./chunk-MWQSU7GK.js";
+import "./chunk-VYENMKFS.js";
+import "./chunk-PVQZBKN7.js";
+import "./chunk-QEVM4BVL.js";
+import "./chunk-AVYJQSLW.js";
 
 // src/ai-chat-agent.ts
-import { appendResponseMessages } from "ai";
 var decoder = new TextDecoder();
 var AIChatAgent = class extends Agent {
   constructor(ctx, env) {
@@ -16,9 +19,10 @@ var AIChatAgent = class extends Agent {
       message text not null,
       created_at datetime default current_timestamp
     )`;
-    this.messages = (this.sql`select * from cf_ai_chat_agent_messages` || []).map((row) => {
+    const rawMessages = (this.sql`select * from cf_ai_chat_agent_messages` || []).map((row) => {
       return JSON.parse(row.message);
     });
+    this.messages = autoTransformMessages(rawMessages);
     this._chatMessageAbortControllers = /* @__PURE__ */ new Map();
   }
   _broadcastChatMessage(message, exclude) {
@@ -29,67 +33,92 @@ var AIChatAgent = class extends Agent {
       let data;
       try {
         data = JSON.parse(message);
-      } catch (error) {
+      } catch (_error) {
         return;
       }
-      if (data.type === "cf_agent_use_chat_request" && data.init.method === "POST") {
+      if (data.type === "cf_agent_use_chat_request" /* CF_AGENT_USE_CHAT_REQUEST */ && data.init.method === "POST") {
         const {
-          method,
-          keepalive,
-          headers,
-          body,
+          // method,
+          // keepalive,
+          // headers,
+          body
           // we're reading this
-          redirect,
-          integrity,
-          credentials,
-          mode,
-          referrer,
-          referrerPolicy,
-          window
+          //
+          // // these might not exist?
           // dispatcher,
           // duplex
         } = data.init;
         const { messages } = JSON.parse(body);
+        const transformedMessages = autoTransformMessages(messages);
         this._broadcastChatMessage(
           {
-            type: "cf_agent_chat_messages",
-            messages
+            messages: transformedMessages,
+            type: "cf_agent_chat_messages" /* CF_AGENT_CHAT_MESSAGES */
           },
           [connection.id]
         );
-        await this.persistMessages(messages, [connection.id]);
+        await this.persistMessages(transformedMessages, [connection.id]);
+        this.observability?.emit(
+          {
+            displayMessage: "Chat message request",
+            id: data.id,
+            payload: {},
+            timestamp: Date.now(),
+            type: "message:request"
+          },
+          this.ctx
+        );
         const chatMessageId = data.id;
         const abortSignal = this._getAbortSignal(chatMessageId);
         return this._tryCatchChat(async () => {
           const response = await this.onChatMessage(
-            async ({ response: response2 }) => {
-              const finalMessages = appendResponseMessages({
-                messages,
-                responseMessages: response2.messages
-              });
-              await this.persistMessages(finalMessages, [connection.id]);
+            async (_finishResult) => {
               this._removeAbortController(chatMessageId);
+              this.observability?.emit(
+                {
+                  displayMessage: "Chat message response",
+                  id: data.id,
+                  payload: {},
+                  timestamp: Date.now(),
+                  type: "message:response"
+                },
+                this.ctx
+              );
             },
             abortSignal ? { abortSignal } : void 0
           );
           if (response) {
             await this._reply(data.id, response);
+          } else {
+            console.warn(
+              `[AIChatAgent] onChatMessage returned no response for chatMessageId: ${chatMessageId}`
+            );
+            this._broadcastChatMessage(
+              {
+                body: "No response was generated by the agent.",
+                done: true,
+                id: data.id,
+                type: "cf_agent_use_chat_response" /* CF_AGENT_USE_CHAT_RESPONSE */
+              },
+              [connection.id]
+            );
           }
         });
       }
-      if (data.type === "cf_agent_chat_clear") {
+      if (data.type === "cf_agent_chat_clear" /* CF_AGENT_CHAT_CLEAR */) {
         this._destroyAbortControllers();
         this.sql`delete from cf_ai_chat_agent_messages`;
         this.messages = [];
         this._broadcastChatMessage(
           {
-            type: "cf_agent_chat_clear"
+            type: "cf_agent_chat_clear" /* CF_AGENT_CHAT_CLEAR */
           },
           [connection.id]
         );
-      } else if (data.type === "cf_agent_chat_messages") {
-        await this.persistMessages(data.messages, [connection.id]);
-      } else if (data.type === "cf_agent_chat_request_cancel") {
+      } else if (data.type === "cf_agent_chat_messages" /* CF_AGENT_CHAT_MESSAGES */) {
+        const transformedMessages = autoTransformMessages(data.messages);
+        await this.persistMessages(transformedMessages, [connection.id]);
+      } else if (data.type === "cf_agent_chat_request_cancel" /* CF_AGENT_CHAT_REQUEST_CANCEL */) {
         this._cancelChatRequest(data.id);
       }
     }
@@ -125,24 +154,11 @@ var AIChatAgent = class extends Agent {
     );
   }
   /**
-   * Save messages on the server side and trigger AI response
+   * Save messages on the server side
    * @param messages Chat messages to save
    */
   async saveMessages(messages) {
     await this.persistMessages(messages);
-    const response = await this.onChatMessage(async ({ response: response2 }) => {
-      const finalMessages = appendResponseMessages({
-        messages,
-        responseMessages: response2.messages
-      });
-      await this.persistMessages(finalMessages, []);
-    });
-    if (response) {
-      for await (const chunk of response.body) {
-        decoder.decode(chunk);
-      }
-      response.body?.cancel();
-    }
   }
   async persistMessages(messages, excludeBroadcastIds = []) {
     this.sql`delete from cf_ai_chat_agent_messages`;
@@ -152,29 +168,120 @@ var AIChatAgent = class extends Agent {
     this.messages = messages;
     this._broadcastChatMessage(
       {
-        type: "cf_agent_chat_messages",
-        messages
+        messages,
+        type: "cf_agent_chat_messages" /* CF_AGENT_CHAT_MESSAGES */
       },
       excludeBroadcastIds
     );
   }
   async _reply(id, response) {
     return this._tryCatchChat(async () => {
-      for await (const chunk of response.body) {
-        const body = decoder.decode(chunk);
+      if (!response.body) {
         this._broadcastChatMessage({
+          body: "",
+          done: true,
           id,
-          type: "cf_agent_use_chat_response",
-          body,
-          done: false
+          type: "cf_agent_use_chat_response" /* CF_AGENT_USE_CHAT_RESPONSE */
         });
+        return;
+      }
+      const reader = response.body.getReader();
+      let fullResponseText = "";
+      const toolCalls = /* @__PURE__ */ new Map();
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            this._broadcastChatMessage({
+              body: "",
+              done: true,
+              id,
+              type: "cf_agent_use_chat_response" /* CF_AGENT_USE_CHAT_RESPONSE */
+            });
+            break;
+          }
+          const chunk = decoder.decode(value);
+          const lines = chunk.split("\n");
+          for (const line of lines) {
+            if (line.startsWith("data: ") && line !== "data: [DONE]") {
+              try {
+                const data = JSON.parse(line.slice(6));
+                switch (data.type) {
+                  // SSE event signaling the tool input is ready. We track by
+                  // `toolCallId` so we can persist it as a tool part in the message.
+                  case "tool-input-available": {
+                    const { toolCallId, toolName, input } = data;
+                    toolCalls.set(toolCallId, {
+                      toolCallId,
+                      toolName,
+                      input,
+                      type: toolName ? `tool-${toolName}` : "dynamic-tool",
+                      state: "input-available"
+                    });
+                    break;
+                  }
+                  // SSE event signaling the tool output is ready. We should've
+                  // already received the input in a previous event so an entry
+                  // with `toolCallId` should already be present
+                  case "tool-output-available": {
+                    const { toolCallId, output, isError, errorText } = data;
+                    const toolPart = toolCalls.get(toolCallId);
+                    if (toolPart)
+                      toolCalls.set(toolCallId, {
+                        ...toolPart,
+                        output,
+                        isError,
+                        errorText,
+                        state: "output-available"
+                      });
+                    break;
+                  }
+                  case "error": {
+                    this._broadcastChatMessage({
+                      error: true,
+                      body: data.errorText ?? JSON.stringify(data),
+                      done: false,
+                      id,
+                      type: "cf_agent_use_chat_response" /* CF_AGENT_USE_CHAT_RESPONSE */
+                    });
+                    return;
+                  }
+                  case "text-delta": {
+                    if (data.delta) fullResponseText += data.delta;
+                    break;
+                  }
+                }
+                this._broadcastChatMessage({
+                  body: JSON.stringify(data),
+                  done: false,
+                  id,
+                  type: "cf_agent_use_chat_response" /* CF_AGENT_USE_CHAT_RESPONSE */
+                });
+              } catch (_e) {
+              }
+            }
+          }
+        }
+      } finally {
+        reader.releaseLock();
       }
-      this._broadcastChatMessage({
-        id,
-        type: "cf_agent_use_chat_response",
-        body: "",
-        done: true
+      const messageParts = [];
+      Array.from(toolCalls.values()).forEach((t) => {
+        messageParts.push(t);
       });
+      if (fullResponseText.trim()) {
+        messageParts.push({ type: "text", text: fullResponseText });
+      }
+      if (messageParts.length > 0) {
+        await this.persistMessages([
+          ...this.messages,
+          {
+            id: `assistant_${Date.now()}_${Math.random().toString(36).slice(2, 11)}`,
+            role: "assistant",
+            parts: messageParts
+          }
+        ]);
+      }
     });
   }
   /**