agents 0.0.0-fe9e8d3 → 0.0.0-feef082

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 "./mcp/client.js";
-import "zod";
-import "@modelcontextprotocol/sdk/types.js";
+import "cloudflare:workers";
 import "@modelcontextprotocol/sdk/client/index.js";
+import "@modelcontextprotocol/sdk/types.js";
+import "./client-B9tFv5gX.js";
+import "zod";
+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
@@ -19,12 +23,18 @@ declare class AIChatAgent<Env = unknown, State = unknown> extends Agent<
   Env,
   State
 > {
-  #private;
+  /**
+   * Map of message `id`s to `AbortController`s
+   * useful to propagate request cancellation signals for any external calls made by the 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>;
   onRequest(request: Request): Promise<Response>;
+  private _tryCatchChat;
   /**
    * Handle incoming chat messages and generate a response
    * @param onFinish Callback to be called when the response is finished
@@ -38,14 +48,34 @@ 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;
+  /**
+   * For the given message id, look up its associated AbortController
+   * If the AbortController does not exist, create and store one in memory
+   *
+   * returns the AbortSignal associated with the AbortController
+   */
+  private _getAbortSignal;
+  /**
+   * Remove an abort controller from the cache of pending message responses
+   */
+  private _removeAbortController;
+  /**
+   * Propagate an abort signal for any requests associated with the given message id
+   */
+  private _cancelChatRequest;
+  /**
+   * Abort all pending requests and clear the cache of AbortControllers
+   */
+  private _destroyAbortControllers;
   /**
    * When the DO is destroyed, cancel all pending requests
    */