agents 0.0.0-2801d35 → 0.0.0-2a6e66e

package/dist/{chunk-J6T74FUS.js → chunk-CV3L6FQZ.js}

@@ -1,22 +1,23 @@
+import {
+  MCPClientManager
+} from "./chunk-HY7ZLHJB.js";
 import {
   DurableObjectOAuthClientProvider
-} from "./chunk-BZXOAZUX.js";
+} from "./chunk-PVQZBKN7.js";
 import {
   camelCaseToKebabCase
-} from "./chunk-QSGN3REV.js";
-import {
-  MCPClientManager
-} from "./chunk-Y67CHZBI.js";
+} from "./chunk-KUH345EY.js";
 
 // src/index.ts
+import { AsyncLocalStorage } from "async_hooks";
+import { parseCronExpression } from "cron-schedule";
+import { nanoid } from "nanoid";
+import { EmailMessage } from "cloudflare:email";
 import {
   Server,
-  routePartykitRequest,
-  getServerByName
+  getServerByName,
+  routePartykitRequest
 } from "partyserver";
-import { parseCronExpression } from "cron-schedule";
-import { nanoid } from "nanoid";
-import { AsyncLocalStorage } from "node:async_hooks";
 function isRPCRequest(msg) {
   return typeof msg === "object" && msg !== null && "type" in msg && msg.type === "rpc" && "id" in msg && typeof msg.id === "string" && "method" in msg && typeof msg.method === "string" && "args" in msg && Array.isArray(msg.args);
 }
@@ -46,12 +47,21 @@ function getCurrentAgent() {
     return {
       agent: void 0,
       connection: void 0,
-      request: void 0
+      request: void 0,
+      email: void 0
     };
   }
   return store;
 }
-var Agent = class extends Server {
+function withAgentContext(method) {
+  return function(...args) {
+    const { connection, request, email } = getCurrentAgent();
+    return agentContext.run({ agent: this, connection, request, email }, () => {
+      return method.apply(this, args);
+    });
+  };
+}
+var _Agent = class _Agent extends Server {
   constructor(ctx, env) {
     super(ctx, env);
     this._state = DEFAULT_STATE;
@@ -62,6 +72,11 @@ var Agent = class extends Server {
      * Override to provide default state values
      */
     this.initialState = DEFAULT_STATE;
+    /**
+     * The observability implementation to use for the Agent
+     */
+    this.observability = genericObservability;
+    this._flushingQueue = false;
     /**
      * Method called when an alarm fires.
      * Executes any scheduled tasks that are due.
@@ -75,42 +90,71 @@ var Agent = class extends Server {
       const result = this.sql`
       SELECT * FROM cf_agents_schedules WHERE time <= ${now}
     `;
-      for (const row of result || []) {
-        const callback = this[row.callback];
-        if (!callback) {
-          console.error(`callback ${row.callback} not found`);
-          continue;
-        }
-        await agentContext.run(
-          { agent: this, connection: void 0, request: void 0 },
-          async () => {
-            try {
-              await callback.bind(this)(JSON.parse(row.payload), row);
-            } catch (e) {
-              console.error(`error executing callback "${row.callback}"`, e);
-            }
+      if (result && Array.isArray(result)) {
+        for (const row of result) {
+          const callback = this[row.callback];
+          if (!callback) {
+            console.error(`callback ${row.callback} not found`);
+            continue;
           }
-        );
-        if (row.type === "cron") {
-          const nextExecutionTime = getNextCronTime(row.cron);
-          const nextTimestamp = Math.floor(nextExecutionTime.getTime() / 1e3);
-          this.sql`
+          await agentContext.run(
+            {
+              agent: this,
+              connection: void 0,
+              request: void 0,
+              email: void 0
+            },
+            async () => {
+              try {
+                this.observability?.emit(
+                  {
+                    displayMessage: `Schedule ${row.id} executed`,
+                    id: nanoid(),
+                    payload: {
+                      callback: row.callback,
+                      id: row.id
+                    },
+                    timestamp: Date.now(),
+                    type: "schedule:execute"
+                  },
+                  this.ctx
+                );
+                await callback.bind(this)(JSON.parse(row.payload), row);
+              } catch (e) {
+                console.error(`error executing callback "${row.callback}"`, e);
+              }
+            }
+          );
+          if (row.type === "cron") {
+            const nextExecutionTime = getNextCronTime(row.cron);
+            const nextTimestamp = Math.floor(nextExecutionTime.getTime() / 1e3);
+            this.sql`
           UPDATE cf_agents_schedules SET time = ${nextTimestamp} WHERE id = ${row.id}
         `;
-        } else {
-          this.sql`
+          } else {
+            this.sql`
           DELETE FROM cf_agents_schedules WHERE id = ${row.id}
         `;
+          }
         }
       }
       await this._scheduleNextAlarm();
     };
+    this._autoWrapCustomMethods();
     this.sql`
       CREATE TABLE IF NOT EXISTS cf_agents_state (
         id TEXT PRIMARY KEY NOT NULL,
         state TEXT
       )
     `;
+    this.sql`
+      CREATE TABLE IF NOT EXISTS cf_agents_queues (
+        id TEXT PRIMARY KEY NOT NULL,
+        payload TEXT,
+        callback TEXT,
+        created_at INTEGER DEFAULT (unixepoch())
+      )
+    `;
     void this.ctx.blockConcurrencyWhile(async () => {
       return this._tryCatch(async () => {
         this.sql`
@@ -142,19 +186,19 @@ var Agent = class extends Server {
     const _onRequest = this.onRequest.bind(this);
     this.onRequest = (request) => {
       return agentContext.run(
-        { agent: this, connection: void 0, request },
+        { agent: this, connection: void 0, request, email: void 0 },
         async () => {
           if (this.mcp.isCallbackRequest(request)) {
             await this.mcp.handleCallbackRequest(request);
             this.broadcast(
               JSON.stringify({
-                type: "cf_agent_mcp_servers",
-                mcp: this.getMcpServers()
+                mcp: this.getMcpServers(),
+                type: "cf_agent_mcp_servers"
               })
             );
             return new Response("<script>window.close();</script>", {
-              status: 200,
-              headers: { "content-type": "text/html" }
+              headers: { "content-type": "text/html" },
+              status: 200
             });
           }
           return this._tryCatch(() => _onRequest(request));
@@ -164,7 +208,7 @@ var Agent = class extends Server {
     const _onMessage = this.onMessage.bind(this);
     this.onMessage = async (connection, message) => {
       return agentContext.run(
-        { agent: this, connection, request: void 0 },
+        { agent: this, connection, request: void 0, email: void 0 },
         async () => {
           if (typeof message !== "string") {
             return this._tryCatch(() => _onMessage(connection, message));
@@ -172,7 +216,7 @@ var Agent = class extends Server {
           let parsed;
           try {
             parsed = JSON.parse(message);
-          } catch (e) {
+          } catch (_e) {
             return this._tryCatch(() => _onMessage(connection, message));
           }
           if (isStateUpdateMessage(parsed)) {
@@ -196,20 +240,33 @@ var Agent = class extends Server {
                 return;
               }
               const result = await methodFn.apply(this, args);
+              this.observability?.emit(
+                {
+                  displayMessage: `RPC call to ${method}`,
+                  id: nanoid(),
+                  payload: {
+                    method,
+                    streaming: metadata?.streaming
+                  },
+                  timestamp: Date.now(),
+                  type: "rpc"
+                },
+                this.ctx
+              );
               const response = {
-                type: "rpc",
+                done: true,
                 id,
-                success: true,
                 result,
-                done: true
+                success: true,
+                type: "rpc"
               };
               connection.send(JSON.stringify(response));
             } catch (e) {
               const response = {
-                type: "rpc",
+                error: e instanceof Error ? e.message : "Unknown error occurred",
                 id: parsed.id,
                 success: false,
-                error: e instanceof Error ? e.message : "Unknown error occurred"
+                type: "rpc"
               };
               connection.send(JSON.stringify(response));
               console.error("RPC error:", e);
@@ -223,23 +280,35 @@ var Agent = class extends Server {
     const _onConnect = this.onConnect.bind(this);
     this.onConnect = (connection, ctx2) => {
       return agentContext.run(
-        { agent: this, connection, request: ctx2.request },
+        { agent: this, connection, request: ctx2.request, email: void 0 },
         async () => {
           setTimeout(() => {
             if (this.state) {
               connection.send(
                 JSON.stringify({
-                  type: "cf_agent_state",
-                  state: this.state
+                  state: this.state,
+                  type: "cf_agent_state"
                 })
               );
             }
             connection.send(
               JSON.stringify({
-                type: "cf_agent_mcp_servers",
-                mcp: this.getMcpServers()
+                mcp: this.getMcpServers(),
+                type: "cf_agent_mcp_servers"
               })
             );
+            this.observability?.emit(
+              {
+                displayMessage: "Connection established",
+                id: nanoid(),
+                payload: {
+                  connectionId: connection.id
+                },
+                timestamp: Date.now(),
+                type: "connect"
+              },
+              this.ctx
+            );
             return this._tryCatch(() => _onConnect(connection, ctx2));
           }, 20);
         }
@@ -248,32 +317,57 @@ var Agent = class extends Server {
     const _onStart = this.onStart.bind(this);
     this.onStart = async () => {
       return agentContext.run(
-        { agent: this, connection: void 0, request: void 0 },
+        {
+          agent: this,
+          connection: void 0,
+          request: void 0,
+          email: void 0
+        },
         async () => {
-          const servers = this.sql`
+          await this._tryCatch(() => {
+            const servers = this.sql`
             SELECT id, name, server_url, client_id, auth_url, callback_url, server_options FROM cf_agents_mcp_servers;
           `;
-          await Promise.allSettled(
-            servers.map((server) => {
-              return this._connectToMcpServerInternal(
-                server.name,
-                server.server_url,
-                server.callback_url,
-                server.server_options ? JSON.parse(server.server_options) : void 0,
-                {
-                  id: server.id,
-                  oauthClientId: server.client_id ?? void 0
-                }
-              );
-            })
-          );
-          this.broadcast(
-            JSON.stringify({
-              type: "cf_agent_mcp_servers",
-              mcp: this.getMcpServers()
-            })
-          );
-          await this._tryCatch(() => _onStart());
+            this.broadcast(
+              JSON.stringify({
+                mcp: this.getMcpServers(),
+                type: "cf_agent_mcp_servers"
+              })
+            );
+            if (servers && Array.isArray(servers) && servers.length > 0) {
+              servers.forEach((server) => {
+                this._connectToMcpServerInternal(
+                  server.name,
+                  server.server_url,
+                  server.callback_url,
+                  server.server_options ? JSON.parse(server.server_options) : void 0,
+                  {
+                    id: server.id,
+                    oauthClientId: server.client_id ?? void 0
+                  }
+                ).then(() => {
+                  this.broadcast(
+                    JSON.stringify({
+                      mcp: this.getMcpServers(),
+                      type: "cf_agent_mcp_servers"
+                    })
+                  );
+                }).catch((error) => {
+                  console.error(
+                    `Error connecting to MCP server: ${server.name} (${server.server_url})`,
+                    error
+                  );
+                  this.broadcast(
+                    JSON.stringify({
+                      mcp: this.getMcpServers(),
+                      type: "cf_agent_mcp_servers"
+                    })
+                  );
+                });
+              });
+            }
+            return _onStart();
+          });
         }
       );
     };
@@ -335,16 +429,26 @@ var Agent = class extends Server {
   `;
     this.broadcast(
       JSON.stringify({
-        type: "cf_agent_state",
-        state
+        state,
+        type: "cf_agent_state"
       }),
       source !== "server" ? [source.id] : []
     );
     return this._tryCatch(() => {
-      const { connection, request } = agentContext.getStore() || {};
+      const { connection, request, email } = agentContext.getStore() || {};
       return agentContext.run(
-        { agent: this, connection, request },
+        { agent: this, connection, request, email },
         async () => {
+          this.observability?.emit(
+            {
+              displayMessage: "State updated",
+              id: nanoid(),
+              payload: {},
+              timestamp: Date.now(),
+              type: "state:update"
+            },
+            this.ctx
+          );
           return this.onStateUpdate(state, source);
         }
       );
@@ -362,20 +466,71 @@ var Agent = class extends Server {
    * @param state Updated state
    * @param source Source of the state update ("server" or a client connection)
    */
+  // biome-ignore lint/correctness/noUnusedFunctionParameters: overridden later
   onStateUpdate(state, source) {
   }
   /**
-   * Called when the Agent receives an email
+   * Called when the Agent receives an email via routeAgentEmail()
+   * Override this method to handle incoming emails
    * @param email Email message to process
    */
-  onEmail(email) {
+  async _onEmail(email) {
     return agentContext.run(
-      { agent: this, connection: void 0, request: void 0 },
+      { agent: this, connection: void 0, request: void 0, email },
       async () => {
-        console.error("onEmail not implemented");
+        if ("onEmail" in this && typeof this.onEmail === "function") {
+          return this._tryCatch(
+            () => this.onEmail(email)
+          );
+        } else {
+          console.log("Received email from:", email.from, "to:", email.to);
+          console.log("Subject:", email.headers.get("subject"));
+          console.log(
+            "Implement onEmail(email: AgentEmail): Promise<void> in your agent to process emails"
+          );
+        }
       }
     );
   }
+  /**
+   * Reply to an email
+   * @param email The email to reply to
+   * @param options Options for the reply
+   * @returns void
+   */
+  async replyToEmail(email, options) {
+    return this._tryCatch(async () => {
+      const agentName = camelCaseToKebabCase(this._ParentClass.name);
+      const agentId = this.name;
+      const { createMimeMessage } = await import("mimetext");
+      const msg = createMimeMessage();
+      msg.setSender({ addr: email.to, name: options.fromName });
+      msg.setRecipient(email.from);
+      msg.setSubject(
+        options.subject || `Re: ${email.headers.get("subject")}` || "No subject"
+      );
+      msg.addMessage({
+        contentType: options.contentType || "text/plain",
+        data: options.body
+      });
+      const domain = email.from.split("@")[1];
+      const messageId = `<${agentId}@${domain}>`;
+      msg.setHeader("In-Reply-To", email.headers.get("Message-ID"));
+      msg.setHeader("Message-ID", messageId);
+      msg.setHeader("X-Agent-Name", agentName);
+      msg.setHeader("X-Agent-ID", agentId);
+      if (options.headers) {
+        for (const [key, value] of Object.entries(options.headers)) {
+          msg.setHeader(key, value);
+        }
+      }
+      await email.reply({
+        from: email.to,
+        raw: msg.asRaw(),
+        to: email.from
+      });
+    });
+  }
   async _tryCatch(fn) {
     try {
       return await fn();
@@ -383,6 +538,55 @@ var Agent = class extends Server {
       throw this.onError(e);
     }
   }
+  /**
+   * Automatically wrap custom methods with agent context
+   * This ensures getCurrentAgent() works in all custom methods without decorators
+   */
+  _autoWrapCustomMethods() {
+    const basePrototypes = [_Agent.prototype, Server.prototype];
+    const baseMethods = /* @__PURE__ */ new Set();
+    for (const baseProto of basePrototypes) {
+      let proto2 = baseProto;
+      while (proto2 && proto2 !== Object.prototype) {
+        const methodNames = Object.getOwnPropertyNames(proto2);
+        for (const methodName of methodNames) {
+          baseMethods.add(methodName);
+        }
+        proto2 = Object.getPrototypeOf(proto2);
+      }
+    }
+    let proto = Object.getPrototypeOf(this);
+    let depth = 0;
+    while (proto && proto !== Object.prototype && depth < 10) {
+      const methodNames = Object.getOwnPropertyNames(proto);
+      for (const methodName of methodNames) {
+        if (baseMethods.has(methodName) || methodName.startsWith("_") || typeof this[methodName] !== "function") {
+          continue;
+        }
+        if (!baseMethods.has(methodName)) {
+          const descriptor = Object.getOwnPropertyDescriptor(proto, methodName);
+          if (descriptor && typeof descriptor.value === "function") {
+            const wrappedFunction = withAgentContext(
+              // biome-ignore lint/suspicious/noExplicitAny: I can't typescript
+              this[methodName]
+              // biome-ignore lint/suspicious/noExplicitAny: I can't typescript
+            );
+            if (this._isCallable(methodName)) {
+              callableMetadata.set(
+                wrappedFunction,
+                callableMetadata.get(
+                  this[methodName]
+                )
+              );
+            }
+            this.constructor.prototype[methodName] = wrappedFunction;
+          }
+        }
+      }
+      proto = Object.getPrototypeOf(proto);
+      depth++;
+    }
+  }
   onError(connectionOrError, error) {
     let theError;
     if (connectionOrError && error) {
@@ -408,6 +612,108 @@ var Agent = class extends Server {
   render() {
     throw new Error("Not implemented");
   }
+  /**
+   * Queue a task to be executed in the future
+   * @param payload Payload to pass to the callback
+   * @param callback Name of the method to call
+   * @returns The ID of the queued task
+   */
+  async queue(callback, payload) {
+    const id = nanoid(9);
+    if (typeof callback !== "string") {
+      throw new Error("Callback must be a string");
+    }
+    if (typeof this[callback] !== "function") {
+      throw new Error(`this.${callback} is not a function`);
+    }
+    this.sql`
+      INSERT OR REPLACE INTO cf_agents_queues (id, payload, callback)
+      VALUES (${id}, ${JSON.stringify(payload)}, ${callback})
+    `;
+    void this._flushQueue().catch((e) => {
+      console.error("Error flushing queue:", e);
+    });
+    return id;
+  }
+  async _flushQueue() {
+    if (this._flushingQueue) {
+      return;
+    }
+    this._flushingQueue = true;
+    while (true) {
+      const result = this.sql`
+      SELECT * FROM cf_agents_queues
+      ORDER BY created_at ASC
+    `;
+      if (!result || result.length === 0) {
+        break;
+      }
+      for (const row of result || []) {
+        const callback = this[row.callback];
+        if (!callback) {
+          console.error(`callback ${row.callback} not found`);
+          continue;
+        }
+        const { connection, request, email } = agentContext.getStore() || {};
+        await agentContext.run(
+          {
+            agent: this,
+            connection,
+            request,
+            email
+          },
+          async () => {
+            await callback.bind(this)(JSON.parse(row.payload), row);
+            await this.dequeue(row.id);
+          }
+        );
+      }
+    }
+    this._flushingQueue = false;
+  }
+  /**
+   * Dequeue a task by ID
+   * @param id ID of the task to dequeue
+   */
+  async dequeue(id) {
+    this.sql`DELETE FROM cf_agents_queues WHERE id = ${id}`;
+  }
+  /**
+   * Dequeue all tasks
+   */
+  async dequeueAll() {
+    this.sql`DELETE FROM cf_agents_queues`;
+  }
+  /**
+   * Dequeue all tasks by callback
+   * @param callback Name of the callback to dequeue
+   */
+  async dequeueAllByCallback(callback) {
+    this.sql`DELETE FROM cf_agents_queues WHERE callback = ${callback}`;
+  }
+  /**
+   * Get a queued task by ID
+   * @param id ID of the task to get
+   * @returns The task or undefined if not found
+   */
+  async getQueue(id) {
+    const result = this.sql`
+      SELECT * FROM cf_agents_queues WHERE id = ${id}
+    `;
+    return result ? { ...result[0], payload: JSON.parse(result[0].payload) } : void 0;
+  }
+  /**
+   * Get all queues by key and value
+   * @param key Key to filter by
+   * @param value Value to filter by
+   * @returns Array of matching QueueItem objects
+   */
+  async getQueues(key, value) {
+    const result = this.sql`
+      SELECT * FROM cf_agents_queues
+    `;
+    return result.filter((row) => JSON.parse(row.payload)[key] === value);
+  }
   /**
    * Schedule a task to be executed in the future
    * @template T Type of the payload data
@@ -418,6 +724,19 @@ var Agent = class extends Server {
    */
   async schedule(when, callback, payload) {
     const id = nanoid(9);
+    const emitScheduleCreate = (schedule) => this.observability?.emit(
+      {
+        displayMessage: `Schedule ${schedule.id} created`,
+        id: nanoid(),
+        payload: {
+          callback,
+          id
+        },
+        timestamp: Date.now(),
+        type: "schedule:create"
+      },
+      this.ctx
+    );
     if (typeof callback !== "string") {
       throw new Error("Callback must be a string");
     }
@@ -433,13 +752,15 @@ var Agent = class extends Server {
       )}, 'scheduled', ${timestamp})
       `;
       await this._scheduleNextAlarm();
-      return {
-        id,
+      const schedule = {
         callback,
+        id,
         payload,
         time: timestamp,
         type: "scheduled"
       };
+      emitScheduleCreate(schedule);
+      return schedule;
     }
     if (typeof when === "number") {
       const time = new Date(Date.now() + when * 1e3);
@@ -451,14 +772,16 @@ var Agent = class extends Server {
       )}, 'delayed', ${when}, ${timestamp})
       `;
       await this._scheduleNextAlarm();
-      return {
-        id,
+      const schedule = {
         callback,
-        payload,
         delayInSeconds: when,
+        id,
+        payload,
         time: timestamp,
         type: "delayed"
       };
+      emitScheduleCreate(schedule);
+      return schedule;
     }
     if (typeof when === "string") {
       const nextExecutionTime = getNextCronTime(when);
@@ -470,14 +793,16 @@ var Agent = class extends Server {
       )}, 'cron', ${when}, ${timestamp})
       `;
       await this._scheduleNextAlarm();
-      return {
-        id,
+      const schedule = {
         callback,
-        payload,
         cron: when,
+        id,
+        payload,
         time: timestamp,
         type: "cron"
       };
+      emitScheduleCreate(schedule);
+      return schedule;
     }
     throw new Error("Invalid schedule type");
   }
@@ -535,15 +860,31 @@ var Agent = class extends Server {
    * @returns true if the task was cancelled, false otherwise
    */
   async cancelSchedule(id) {
+    const schedule = await this.getSchedule(id);
+    if (schedule) {
+      this.observability?.emit(
+        {
+          displayMessage: `Schedule ${id} cancelled`,
+          id: nanoid(),
+          payload: {
+            callback: schedule.callback,
+            id: schedule.id
+          },
+          timestamp: Date.now(),
+          type: "schedule:cancel"
+        },
+        this.ctx
+      );
+    }
     this.sql`DELETE FROM cf_agents_schedules WHERE id = ${id}`;
     await this._scheduleNextAlarm();
     return true;
   }
   async _scheduleNextAlarm() {
     const result = this.sql`
-      SELECT time FROM cf_agents_schedules 
+      SELECT time FROM cf_agents_schedules
       WHERE time > ${Math.floor(Date.now() / 1e3)}
-      ORDER BY time ASC 
+      ORDER BY time ASC
       LIMIT 1
     `;
     if (!result) return;
@@ -559,8 +900,20 @@ var Agent = class extends Server {
     this.sql`DROP TABLE IF EXISTS cf_agents_state`;
     this.sql`DROP TABLE IF EXISTS cf_agents_schedules`;
     this.sql`DROP TABLE IF EXISTS cf_agents_mcp_servers`;
+    this.sql`DROP TABLE IF EXISTS cf_agents_queues`;
     await this.ctx.storage.deleteAlarm();
     await this.ctx.storage.deleteAll();
+    this.ctx.abort("destroyed");
+    this.observability?.emit(
+      {
+        displayMessage: "Agent destroyed",
+        id: nanoid(),
+        payload: {},
+        timestamp: Date.now(),
+        type: "destroy"
+      },
+      this.ctx
+    );
   }
   /**
    * Get all methods marked as callable on this Agent
@@ -586,15 +939,28 @@ var Agent = class extends Server {
       callbackUrl,
       options
     );
+    this.sql`
+        INSERT
+        OR REPLACE INTO cf_agents_mcp_servers (id, name, server_url, client_id, auth_url, callback_url, server_options)
+      VALUES (
+        ${result.id},
+        ${serverName},
+        ${url},
+        ${result.clientId ?? null},
+        ${result.authUrl ?? null},
+        ${callbackUrl},
+        ${options ? JSON.stringify(options) : null}
+        );
+    `;
     this.broadcast(
       JSON.stringify({
-        type: "cf_agent_mcp_servers",
-        mcp: this.getMcpServers()
+        mcp: this.getMcpServers(),
+        type: "cf_agent_mcp_servers"
       })
     );
     return result;
   }
-  async _connectToMcpServerInternal(serverName, url, callbackUrl, options, reconnect) {
+  async _connectToMcpServerInternal(_serverName, url, callbackUrl, options, reconnect) {
     const authProvider = new DurableObjectOAuthClientProvider(
       this.ctx.storage,
       this.name,
@@ -621,28 +987,17 @@ var Agent = class extends Server {
       };
     }
     const { id, authUrl, clientId } = await this.mcp.connect(url, {
+      client: options?.client,
       reconnect,
       transport: {
         ...headerTransportOpts,
         authProvider
-      },
-      client: options?.client
+      }
     });
-    this.sql`
-      INSERT OR REPLACE INTO cf_agents_mcp_servers (id, name, server_url, client_id, auth_url, callback_url, server_options)
-      VALUES (
-        ${id},
-        ${serverName},
-        ${url},
-        ${clientId ?? null},
-        ${authUrl ?? null},
-        ${callbackUrl},
-        ${options ? JSON.stringify(options) : null}
-      );
-    `;
     return {
-      id,
-      authUrl
+      authUrl,
+      clientId,
+      id
     };
   }
   async removeMcpServer(id) {
@@ -652,30 +1007,34 @@ var Agent = class extends Server {
     `;
     this.broadcast(
       JSON.stringify({
-        type: "cf_agent_mcp_servers",
-        mcp: this.getMcpServers()
+        mcp: this.getMcpServers(),
+        type: "cf_agent_mcp_servers"
       })
     );
   }
   getMcpServers() {
     const mcpState = {
-      servers: {},
-      tools: this.mcp.listTools(),
       prompts: this.mcp.listPrompts(),
-      resources: this.mcp.listResources()
+      resources: this.mcp.listResources(),
+      servers: {},
+      tools: this.mcp.listTools()
     };
     const servers = this.sql`
       SELECT id, name, server_url, client_id, auth_url, callback_url, server_options FROM cf_agents_mcp_servers;
     `;
-    for (const server of servers) {
-      mcpState.servers[server.id] = {
-        name: server.name,
-        server_url: server.server_url,
-        auth_url: server.auth_url,
-        state: this.mcp.mcpConnections[server.id].connectionState,
-        instructions: this.mcp.mcpConnections[server.id].instructions ?? null,
-        capabilities: this.mcp.mcpConnections[server.id].serverCapabilities ?? null
-      };
+    if (servers && Array.isArray(servers) && servers.length > 0) {
+      for (const server of servers) {
+        const serverConn = this.mcp.mcpConnections[server.id];
+        mcpState.servers[server.id] = {
+          auth_url: server.auth_url,
+          capabilities: serverConn?.serverCapabilities ?? null,
+          instructions: serverConn?.instructions ?? null,
+          name: server.name,
+          server_url: server.server_url,
+          // mark as "authenticating" because the server isn't automatically connected, so it's pending authenticating
+          state: serverConn?.connectionState ?? "authenticating"
+        };
+      }
     }
     return mcpState;
   }
@@ -683,16 +1042,17 @@ var Agent = class extends Server {
 /**
  * Agent configuration options
  */
-Agent.options = {
+_Agent.options = {
   /** Whether the Agent should hibernate when inactive */
   hibernate: true
   // default to hibernate
 };
+var Agent = _Agent;
 async function routeAgentRequest(request, env, options) {
   const corsHeaders = options?.cors === true ? {
-    "Access-Control-Allow-Origin": "*",
-    "Access-Control-Allow-Methods": "GET, POST, HEAD, OPTIONS",
     "Access-Control-Allow-Credentials": "true",
+    "Access-Control-Allow-Methods": "GET, POST, HEAD, OPTIONS",
+    "Access-Control-Allow-Origin": "*",
     "Access-Control-Max-Age": "86400"
   } : options?.cors;
   if (request.method === "OPTIONS") {
@@ -723,7 +1083,126 @@ async function routeAgentRequest(request, env, options) {
   }
   return response;
 }
+function createHeaderBasedEmailResolver() {
+  return async (email, _env) => {
+    const messageId = email.headers.get("message-id");
+    if (messageId) {
+      const messageIdMatch = messageId.match(/<([^@]+)@([^>]+)>/);
+      if (messageIdMatch) {
+        const [, agentId2, domain] = messageIdMatch;
+        const agentName2 = domain.split(".")[0];
+        return { agentName: agentName2, agentId: agentId2 };
+      }
+    }
+    const references = email.headers.get("references");
+    if (references) {
+      const referencesMatch = references.match(
+        /<([A-Za-z0-9+/]{43}=)@([^>]+)>/
+      );
+      if (referencesMatch) {
+        const [, base64Id, domain] = referencesMatch;
+        const agentId2 = Buffer.from(base64Id, "base64").toString("hex");
+        const agentName2 = domain.split(".")[0];
+        return { agentName: agentName2, agentId: agentId2 };
+      }
+    }
+    const agentName = email.headers.get("x-agent-name");
+    const agentId = email.headers.get("x-agent-id");
+    if (agentName && agentId) {
+      return { agentName, agentId };
+    }
+    return null;
+  };
+}
+function createAddressBasedEmailResolver(defaultAgentName) {
+  return async (email, _env) => {
+    const emailMatch = email.to.match(/^([^+@]+)(?:\+([^@]+))?@(.+)$/);
+    if (!emailMatch) {
+      return null;
+    }
+    const [, localPart, subAddress] = emailMatch;
+    if (subAddress) {
+      return {
+        agentName: localPart,
+        agentId: subAddress
+      };
+    }
+    return {
+      agentName: defaultAgentName,
+      agentId: localPart
+    };
+  };
+}
+function createCatchAllEmailResolver(agentName, agentId) {
+  return async () => ({ agentName, agentId });
+}
+var agentMapCache = /* @__PURE__ */ new WeakMap();
 async function routeAgentEmail(email, env, options) {
+  const routingInfo = await options.resolver(email, env);
+  if (!routingInfo) {
+    console.warn("No routing information found for email, dropping message");
+    return;
+  }
+  if (!agentMapCache.has(env)) {
+    const map = {};
+    for (const [key, value] of Object.entries(env)) {
+      if (value && typeof value === "object" && "idFromName" in value && typeof value.idFromName === "function") {
+        map[key] = value;
+        map[camelCaseToKebabCase(key)] = value;
+      }
+    }
+    agentMapCache.set(env, map);
+  }
+  const agentMap = agentMapCache.get(env);
+  const namespace = agentMap[routingInfo.agentName];
+  if (!namespace) {
+    const availableAgents = Object.keys(agentMap).filter((key) => !key.includes("-")).join(", ");
+    throw new Error(
+      `Agent namespace '${routingInfo.agentName}' not found in environment. Available agents: ${availableAgents}`
+    );
+  }
+  const agent = await getAgentByName(
+    namespace,
+    routingInfo.agentId
+  );
+  const serialisableEmail = {
+    getRaw: async () => {
+      const reader = email.raw.getReader();
+      const chunks = [];
+      let done = false;
+      while (!done) {
+        const { value, done: readerDone } = await reader.read();
+        done = readerDone;
+        if (value) {
+          chunks.push(value);
+        }
+      }
+      const totalLength = chunks.reduce((sum, chunk) => sum + chunk.length, 0);
+      const combined = new Uint8Array(totalLength);
+      let offset = 0;
+      for (const chunk of chunks) {
+        combined.set(chunk, offset);
+        offset += chunk.length;
+      }
+      return combined;
+    },
+    headers: email.headers,
+    rawSize: email.rawSize,
+    setReject: (reason) => {
+      email.setReject(reason);
+    },
+    forward: (rcptTo, headers) => {
+      return email.forward(rcptTo, headers);
+    },
+    reply: (options2) => {
+      return email.reply(
+        new EmailMessage(options2.from, options2.to, options2.raw)
+      );
+    },
+    from: email.from,
+    to: email.to
+  };
+  await agent._onEmail(serialisableEmail);
 }
 async function getAgentByName(namespace, name, options) {
   return getServerByName(namespace, name, options);
@@ -743,11 +1222,11 @@ var StreamingResponse = class {
       throw new Error("StreamingResponse is already closed");
     }
     const response = {
-      type: "rpc",
+      done: false,
       id: this._id,
-      success: true,
       result: chunk,
-      done: false
+      success: true,
+      type: "rpc"
     };
     this._connection.send(JSON.stringify(response));
   }
@@ -761,23 +1240,51 @@ var StreamingResponse = class {
     }
     this._closed = true;
     const response = {
-      type: "rpc",
+      done: true,
       id: this._id,
-      success: true,
       result: finalChunk,
-      done: true
+      success: true,
+      type: "rpc"
     };
     this._connection.send(JSON.stringify(response));
   }
 };
 
+// src/observability/index.ts
+var genericObservability = {
+  emit(event) {
+    if (isLocalMode()) {
+      console.log(event.displayMessage);
+      return;
+    }
+    console.log(event);
+  }
+};
+var localMode = false;
+function isLocalMode() {
+  if (localMode) {
+    return true;
+  }
+  const { request } = getCurrentAgent();
+  if (!request) {
+    return false;
+  }
+  const url = new URL(request.url);
+  localMode = url.hostname === "localhost";
+  return localMode;
+}
+
 export {
+  genericObservability,
   unstable_callable,
   getCurrentAgent,
   Agent,
   routeAgentRequest,
+  createHeaderBasedEmailResolver,
+  createAddressBasedEmailResolver,
+  createCatchAllEmailResolver,
   routeAgentEmail,
   getAgentByName,
   StreamingResponse
 };
-//# sourceMappingURL=chunk-J6T74FUS.js.map
+//# sourceMappingURL=chunk-CV3L6FQZ.js.map