agents 0.0.79 → 0.0.81

package/dist/mcp/client.d.ts

@@ -1,5 +1,5 @@
 import * as zod from 'zod';
-import { ClientCapabilities, Tool, Prompt, Resource, ResourceTemplate, ServerCapabilities, CallToolRequest, CallToolResultSchema, CompatibilityCallToolResultSchema, ReadResourceRequest, GetPromptRequest } from '@modelcontextprotocol/sdk/types.js';
+import { Tool, Prompt, Resource, ResourceTemplate, ServerCapabilities, CallToolRequest, CallToolResultSchema, CompatibilityCallToolResultSchema, ReadResourceRequest, GetPromptRequest } from '@modelcontextprotocol/sdk/types.js';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
 import { AgentsOAuthProvider } from './do-oauth-client-provider.js';
@@ -15,7 +15,6 @@ declare class MCPClientConnection {
             authProvider?: AgentsOAuthProvider;
         };
         client: ConstructorParameters<typeof Client>[1];
-        capabilities: ClientCapabilities;
     };
     client: Client;
     connectionState: "authenticating" | "connecting" | "ready" | "discovering" | "failed";
@@ -30,7 +29,6 @@ declare class MCPClientConnection {
             authProvider?: AgentsOAuthProvider;
         };
         client: ConstructorParameters<typeof Client>[1];
-        capabilities: ClientCapabilities;
     });
     /**
      * Initialize a client connection
@@ -38,7 +36,7 @@ declare class MCPClientConnection {
      * @param code Optional OAuth code to initialize the connection with if auth hasn't been initialized
      * @returns
      */
-    init(code?: string, clientId?: string): Promise<void>;
+    init(code?: string): Promise<void>;
     /**
      * Notification handler registration
      */
@@ -68,10 +66,10 @@ declare class MCPClientConnection {
     }[]>;
     fetchResources(): Promise<{
         [x: string]: unknown;
-        uri: string;
         name: string;
-        mimeType?: string | undefined;
+        uri: string;
         description?: string | undefined;
+        mimeType?: string | undefined;
     }[]>;
     fetchPrompts(): Promise<{
         [x: string]: unknown;
@@ -88,8 +86,8 @@ declare class MCPClientConnection {
         [x: string]: unknown;
         name: string;
         uriTemplate: string;
-        mimeType?: string | undefined;
         description?: string | undefined;
+        mimeType?: string | undefined;
     }[]>;
 }
 
@@ -97,16 +95,16 @@ declare class MCPClientConnection {
  * Utility class that aggregates multiple MCP clients into one
  */
 declare class MCPClientManager {
-    private name;
-    private version;
+    private _name;
+    private _version;
     mcpConnections: Record<string, MCPClientConnection>;
-    private callbackUrls;
+    private _callbackUrls;
     /**
-     * @param name Name of the MCP client
-     * @param version Version of the MCP Client
+     * @param _name Name of the MCP client
+     * @param _version Version of the MCP Client
      * @param auth Auth paramters if being used to create a DurableObjectOAuthClientProvider
      */
-    constructor(name: string, version: string);
+    constructor(_name: string, _version: string);
     /**
      * Connect to and register an MCP server
      *
@@ -124,10 +122,10 @@ declare class MCPClientManager {
             authProvider?: AgentsOAuthProvider;
         };
         client?: ConstructorParameters<typeof Client>[1];
-        capabilities?: ClientCapabilities;
     }): Promise<{
         id: string;
-        authUrl: string | undefined;
+        authUrl?: string;
+        clientId?: string;
     }>;
     isCallbackRequest(req: Request): boolean;
     handleCallbackRequest(req: Request): Promise<{

package/dist/mcp/client.js

@@ -1,8 +1,8 @@
 import {
   MCPClientManager,
   getNamespacedData
-} from "../chunk-7VFQNJFK.js";
-import "../chunk-HMLY7DHA.js";
+} from "../chunk-Y67CHZBI.js";
+import "../chunk-NOUFNU2O.js";
 export {
   MCPClientManager,
   getNamespacedData

package/dist/mcp/do-oauth-client-provider.d.ts

@@ -10,9 +10,9 @@ declare class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {
     storage: DurableObjectStorage;
     clientName: string;
     baseRedirectUrl: string;
-    private authUrl_;
-    private serverId_;
-    private clientId_;
+    private _authUrl_;
+    private _serverId_;
+    private _clientId_;
     constructor(storage: DurableObjectStorage, clientName: string, baseRedirectUrl: string);
     get clientMetadata(): OAuthClientMetadata;
     get redirectUrl(): string;

package/dist/mcp/do-oauth-client-provider.js

@@ -1,106 +1,7 @@
-import "../chunk-HMLY7DHA.js";
-
-// src/mcp/do-oauth-client-provider.ts
-var DurableObjectOAuthClientProvider = class {
-  constructor(storage, clientName, baseRedirectUrl) {
-    this.storage = storage;
-    this.clientName = clientName;
-    this.baseRedirectUrl = baseRedirectUrl;
-  }
-  get clientMetadata() {
-    return {
-      redirect_uris: [this.redirectUrl],
-      token_endpoint_auth_method: "none",
-      grant_types: ["authorization_code", "refresh_token"],
-      response_types: ["code"],
-      client_name: this.clientName,
-      client_uri: "example.com"
-    };
-  }
-  get redirectUrl() {
-    return `${this.baseRedirectUrl}/${this.serverId}`;
-  }
-  get clientId() {
-    if (!this.clientId_) {
-      throw new Error("Trying to access clientId before it was set");
-    }
-    return this.clientId_;
-  }
-  set clientId(clientId_) {
-    this.clientId_ = clientId_;
-  }
-  get serverId() {
-    if (!this.serverId_) {
-      throw new Error("Trying to access serverId before it was set");
-    }
-    return this.serverId_;
-  }
-  set serverId(serverId_) {
-    this.serverId_ = serverId_;
-  }
-  keyPrefix(clientId) {
-    return `/${this.clientName}/${this.serverId}/${clientId}`;
-  }
-  clientInfoKey(clientId) {
-    return `${this.keyPrefix(clientId)}/client_info/`;
-  }
-  async clientInformation() {
-    if (!this.clientId_) {
-      return void 0;
-    }
-    return await this.storage.get(
-      this.clientInfoKey(this.clientId)
-    ) ?? void 0;
-  }
-  async saveClientInformation(clientInformation) {
-    await this.storage.put(
-      this.clientInfoKey(clientInformation.client_id),
-      clientInformation
-    );
-    this.clientId = clientInformation.client_id;
-  }
-  tokenKey(clientId) {
-    return `${this.keyPrefix(clientId)}/token`;
-  }
-  async tokens() {
-    if (!this.clientId_) {
-      return void 0;
-    }
-    return await this.storage.get(this.tokenKey(this.clientId)) ?? void 0;
-  }
-  async saveTokens(tokens) {
-    await this.storage.put(this.tokenKey(this.clientId), tokens);
-  }
-  get authUrl() {
-    return this.authUrl_;
-  }
-  /**
-   * Because this operates on the server side (but we need browser auth), we send this url back to the user
-   * and require user interact to initiate the redirect flow
-   */
-  async redirectToAuthorization(authUrl) {
-    const client_id = authUrl.searchParams.get("client_id");
-    if (client_id) {
-      authUrl.searchParams.append("state", client_id);
-    }
-    this.authUrl_ = authUrl.toString();
-  }
-  codeVerifierKey(clientId) {
-    return `${this.keyPrefix(clientId)}/code_verifier`;
-  }
-  async saveCodeVerifier(verifier) {
-    await this.storage.put(this.codeVerifierKey(this.clientId), verifier);
-  }
-  async codeVerifier() {
-    const codeVerifier = await this.storage.get(
-      this.codeVerifierKey(this.clientId)
-    );
-    if (!codeVerifier) {
-      throw new Error("No code verifier found");
-    }
-    return codeVerifier;
-  }
-};
+import {
+  DurableObjectOAuthClientProvider
+} from "../chunk-BZXOAZUX.js";
+import "../chunk-NOUFNU2O.js";
 export {
   DurableObjectOAuthClientProvider
 };

package/dist/mcp/do-oauth-client-provider.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mcp/do-oauth-client-provider.ts"],"sourcesContent":["import type { OAuthClientProvider } from \"@modelcontextprotocol/sdk/client/auth.js\";\nimport type {\n  OAuthTokens,\n  OAuthClientMetadata,\n  OAuthClientInformation,\n  OAuthClientInformationFull,\n} from \"@modelcontextprotocol/sdk/shared/auth.js\";\n\n// A slight extension to the standard OAuthClientProvider interface because `redirectToAuthorization` doesn't give us the interface we need\n// This allows us to track authentication for a specific server and associated dynamic client registration\nexport interface AgentsOAuthProvider extends OAuthClientProvider {\n  authUrl: string | undefined;\n  clientId: string | undefined;\n  serverId: string | undefined;\n}\n\nexport class DurableObjectOAuthClientProvider implements AgentsOAuthProvider {\n  private authUrl_: string | undefined;\n  private serverId_: string | undefined;\n  private clientId_: string | undefined;\n\n  constructor(\n    public storage: DurableObjectStorage,\n    public clientName: string,\n    public baseRedirectUrl: string\n  ) {}\n\n  get clientMetadata(): OAuthClientMetadata {\n    return {\n      redirect_uris: [this.redirectUrl],\n      token_endpoint_auth_method: \"none\",\n      grant_types: [\"authorization_code\", \"refresh_token\"],\n      response_types: [\"code\"],\n      client_name: this.clientName,\n      client_uri: \"example.com\",\n    };\n  }\n\n  get redirectUrl() {\n    return `${this.baseRedirectUrl}/${this.serverId}`;\n  }\n\n  get clientId() {\n    if (!this.clientId_) {\n      throw new Error(\"Trying to access clientId before it was set\");\n    }\n    return this.clientId_;\n  }\n\n  set clientId(clientId_: string) {\n    this.clientId_ = clientId_;\n  }\n\n  get serverId() {\n    if (!this.serverId_) {\n      throw new Error(\"Trying to access serverId before it was set\");\n    }\n    return this.serverId_;\n  }\n\n  set serverId(serverId_: string) {\n    this.serverId_ = serverId_;\n  }\n\n  keyPrefix(clientId: string) {\n    return `/${this.clientName}/${this.serverId}/${clientId}`;\n  }\n\n  clientInfoKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/client_info/`;\n  }\n\n  async clientInformation(): Promise<OAuthClientInformation | undefined> {\n    if (!this.clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthClientInformation>(\n        this.clientInfoKey(this.clientId)\n      )) ?? undefined\n    );\n  }\n\n  async saveClientInformation(\n    clientInformation: OAuthClientInformationFull\n  ): Promise<void> {\n    await this.storage.put(\n      this.clientInfoKey(clientInformation.client_id),\n      clientInformation\n    );\n    this.clientId = clientInformation.client_id;\n  }\n\n  tokenKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/token`;\n  }\n\n  async tokens(): Promise<OAuthTokens | undefined> {\n    if (!this.clientId_) {\n      return undefined;\n    }\n    return (\n      (await this.storage.get<OAuthTokens>(this.tokenKey(this.clientId))) ??\n      undefined\n    );\n  }\n\n  async saveTokens(tokens: OAuthTokens): Promise<void> {\n    await this.storage.put(this.tokenKey(this.clientId), tokens);\n  }\n\n  get authUrl() {\n    return this.authUrl_;\n  }\n\n  /**\n   * Because this operates on the server side (but we need browser auth), we send this url back to the user\n   * and require user interact to initiate the redirect flow\n   */\n  async redirectToAuthorization(authUrl: URL): Promise<void> {\n    // We want to track the client ID in state here because the typescript SSE client sometimes does\n    // a dynamic client registration AFTER generating this redirect URL.\n    const client_id = authUrl.searchParams.get(\"client_id\");\n    if (client_id) {\n      authUrl.searchParams.append(\"state\", client_id);\n    }\n    this.authUrl_ = authUrl.toString();\n  }\n\n  codeVerifierKey(clientId: string) {\n    return `${this.keyPrefix(clientId)}/code_verifier`;\n  }\n\n  async saveCodeVerifier(verifier: string): Promise<void> {\n    await this.storage.put(this.codeVerifierKey(this.clientId), verifier);\n  }\n\n  async codeVerifier(): Promise<string> {\n    const codeVerifier = await this.storage.get<string>(\n      this.codeVerifierKey(this.clientId)\n    );\n    if (!codeVerifier) {\n      throw new Error(\"No code verifier found\");\n    }\n    return codeVerifier;\n  }\n}\n"],"mappings":";;;AAgBO,IAAM,mCAAN,MAAsE;AAAA,EAK3E,YACS,SACA,YACA,iBACP;AAHO;AACA;AACA;AAAA,EACN;AAAA,EAEH,IAAI,iBAAsC;AACxC,WAAO;AAAA,MACL,eAAe,CAAC,KAAK,WAAW;AAAA,MAChC,4BAA4B;AAAA,MAC5B,aAAa,CAAC,sBAAsB,eAAe;AAAA,MACnD,gBAAgB,CAAC,MAAM;AAAA,MACvB,aAAa,KAAK;AAAA,MAClB,YAAY;AAAA,IACd;AAAA,EACF;AAAA,EAEA,IAAI,cAAc;AAChB,WAAO,GAAG,KAAK,eAAe,IAAI,KAAK,QAAQ;AAAA,EACjD;AAAA,EAEA,IAAI,WAAW;AACb,QAAI,CAAC,KAAK,WAAW;AACnB,YAAM,IAAI,MAAM,6CAA6C;AAAA,IAC/D;AACA,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,IAAI,SAAS,WAAmB;AAC9B,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA,IAAI,WAAW;AACb,QAAI,CAAC,KAAK,WAAW;AACnB,YAAM,IAAI,MAAM,6CAA6C;AAAA,IAC/D;AACA,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,IAAI,SAAS,WAAmB;AAC9B,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA,UAAU,UAAkB;AAC1B,WAAO,IAAI,KAAK,UAAU,IAAI,KAAK,QAAQ,IAAI,QAAQ;AAAA,EACzD;AAAA,EAEA,cAAc,UAAkB;AAC9B,WAAO,GAAG,KAAK,UAAU,QAAQ,CAAC;AAAA,EACpC;AAAA,EAEA,MAAM,oBAAiE;AACrE,QAAI,CAAC,KAAK,WAAW;AACnB,aAAO;AAAA,IACT;AACA,WACG,MAAM,KAAK,QAAQ;AAAA,MAClB,KAAK,cAAc,KAAK,QAAQ;AAAA,IAClC,KAAM;AAAA,EAEV;AAAA,EAEA,MAAM,sBACJ,mBACe;AACf,UAAM,KAAK,QAAQ;AAAA,MACjB,KAAK,cAAc,kBAAkB,SAAS;AAAA,MAC9C;AAAA,IACF;AACA,SAAK,WAAW,kBAAkB;AAAA,EACpC;AAAA,EAEA,SAAS,UAAkB;AACzB,WAAO,GAAG,KAAK,UAAU,QAAQ,CAAC;AAAA,EACpC;AAAA,EAEA,MAAM,SAA2C;AAC/C,QAAI,CAAC,KAAK,WAAW;AACnB,aAAO;AAAA,IACT;AACA,WACG,MAAM,KAAK,QAAQ,IAAiB,KAAK,SAAS,KAAK,QAAQ,CAAC,KACjE;AAAA,EAEJ;AAAA,EAEA,MAAM,WAAW,QAAoC;AACnD,UAAM,KAAK,QAAQ,IAAI,KAAK,SAAS,KAAK,QAAQ,GAAG,MAAM;AAAA,EAC7D;AAAA,EAEA,IAAI,UAAU;AACZ,WAAO,KAAK;AAAA,EACd;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,wBAAwB,SAA6B;AAGzD,UAAM,YAAY,QAAQ,aAAa,IAAI,WAAW;AACtD,QAAI,WAAW;AACb,cAAQ,aAAa,OAAO,SAAS,SAAS;AAAA,IAChD;AACA,SAAK,WAAW,QAAQ,SAAS;AAAA,EACnC;AAAA,EAEA,gBAAgB,UAAkB;AAChC,WAAO,GAAG,KAAK,UAAU,QAAQ,CAAC;AAAA,EACpC;AAAA,EAEA,MAAM,iBAAiB,UAAiC;AACtD,UAAM,KAAK,QAAQ,IAAI,KAAK,gBAAgB,KAAK,QAAQ,GAAG,QAAQ;AAAA,EACtE;AAAA,EAEA,MAAM,eAAgC;AACpC,UAAM,eAAe,MAAM,KAAK,QAAQ;AAAA,MACtC,KAAK,gBAAgB,KAAK,QAAQ;AAAA,IACpC;AACA,QAAI,CAAC,cAAc;AACjB,YAAM,IAAI,MAAM,wBAAwB;AAAA,IAC1C;AACA,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/dist/mcp/index.d.ts

@@ -22,7 +22,15 @@ interface CORSOptions {
 }
 type MaybePromise<T> = T | Promise<T>;
 declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Record<string, unknown> = Record<string, unknown>> extends DurableObject<Env> {
-    #private;
+    private _status;
+    private _transport?;
+    private _transportType;
+    private _requestIdToConnectionId;
+    /**
+     * Since McpAgent's _aren't_ yet real "Agents", let's only expose a couple of the methods
+     * to the outer class: initialState/state/setState/onStateUpdate/sql
+     */
+    private _agent;
     get mcp(): MCPClientManager;
     protected constructor(ctx: DurableObjectState, env: Env);
     /**
@@ -44,6 +52,7 @@ declare abstract class McpAgent<Env = unknown, State = unknown, Props extends Re
     _init(props: Props): Promise<void>;
     setInitialized(): Promise<void>;
     isInitialized(): Promise<boolean>;
+    private _initialize;
     fetch(request: Request): Promise<Response>;
     getWebSocket(): WebSocket | null;
     getWebSocketForResponseID(id: string): WebSocket | null;

package/dist/mcp/index.js

@@ -1,13 +1,10 @@
 import {
   Agent
-} from "../chunk-JR3NW4A7.js";
-import "../chunk-7VFQNJFK.js";
-import {
-  __privateAdd,
-  __privateGet,
-  __privateMethod,
-  __privateSet
-} from "../chunk-HMLY7DHA.js";
+} from "../chunk-NPGUKHFR.js";
+import "../chunk-BZXOAZUX.js";
+import "../chunk-QSGN3REV.js";
+import "../chunk-Y67CHZBI.js";
+import "../chunk-NOUFNU2O.js";
 
 // src/mcp/index.ts
 import { DurableObject } from "cloudflare:workers";
@@ -36,24 +33,22 @@ function handleCORS(request, corsOptions) {
   }
   return null;
 }
-var _getWebSocket, _started;
 var McpSSETransport = class {
   constructor(getWebSocket) {
-    __privateAdd(this, _getWebSocket);
-    __privateAdd(this, _started, false);
-    __privateSet(this, _getWebSocket, getWebSocket);
+    this._started = false;
+    this._getWebSocket = getWebSocket;
   }
   async start() {
-    if (__privateGet(this, _started)) {
+    if (this._started) {
       throw new Error("Transport already started");
     }
-    __privateSet(this, _started, true);
+    this._started = true;
   }
   async send(message) {
-    if (!__privateGet(this, _started)) {
+    if (!this._started) {
       throw new Error("Transport not started");
     }
-    const websocket = __privateGet(this, _getWebSocket).call(this);
+    const websocket = this._getWebSocket();
     if (!websocket) {
       throw new Error("WebSocket not connected");
     }
@@ -68,52 +63,40 @@ var McpSSETransport = class {
     this.onclose?.();
   }
 };
-_getWebSocket = new WeakMap();
-_started = new WeakMap();
-var _getWebSocketForGetRequest, _getWebSocketForMessageID, _notifyResponseIdSent, _started2;
 var McpStreamableHttpTransport = class {
   constructor(getWebSocketForMessageID, notifyResponseIdSent) {
-    // TODO: If there is an open connection to send server-initiated messages
-    // back, we should use that connection
-    __privateAdd(this, _getWebSocketForGetRequest);
-    // Get the appropriate websocket connection for a given message id
-    __privateAdd(this, _getWebSocketForMessageID);
-    // Notify the server that a response has been sent for a given message id
-    // so that it may clean up it's mapping of message ids to connections
-    // once they are no longer needed
-    __privateAdd(this, _notifyResponseIdSent);
-    __privateAdd(this, _started2, false);
-    __privateSet(this, _getWebSocketForMessageID, getWebSocketForMessageID);
-    __privateSet(this, _notifyResponseIdSent, notifyResponseIdSent);
-    __privateSet(this, _getWebSocketForGetRequest, () => null);
+    this._started = false;
+    this._getWebSocketForMessageID = getWebSocketForMessageID;
+    this._notifyResponseIdSent = notifyResponseIdSent;
+    this._getWebSocketForGetRequest = () => null;
   }
   async start() {
-    if (__privateGet(this, _started2)) {
+    if (this._started) {
       throw new Error("Transport already started");
     }
-    __privateSet(this, _started2, true);
+    this._started = true;
   }
   async send(message) {
-    if (!__privateGet(this, _started2)) {
+    if (!this._started) {
       throw new Error("Transport not started");
     }
     let websocket = null;
     if (isJSONRPCResponse(message) || isJSONRPCError(message)) {
-      websocket = __privateGet(this, _getWebSocketForMessageID).call(this, message.id.toString());
+      websocket = this._getWebSocketForMessageID(message.id.toString());
       if (!websocket) {
         throw new Error(
           `Could not find WebSocket for message id: ${message.id}`
         );
       }
     } else if (isJSONRPCRequest(message)) {
-      websocket = __privateGet(this, _getWebSocketForGetRequest).call(this);
+      websocket = this._getWebSocketForGetRequest();
     } else if (isJSONRPCNotification(message)) {
       websocket = null;
     }
     try {
       websocket?.send(JSON.stringify(message));
       if (isJSONRPCResponse(message)) {
-        __privateGet(this, _notifyResponseIdSent).call(this, message.id.toString());
+        this._notifyResponseIdSent(message.id.toString());
       }
     } catch (error) {
       this.onerror?.(error);
@@ -124,28 +107,16 @@ var McpStreamableHttpTransport = class {
     this.onclose?.();
   }
 };
-_getWebSocketForGetRequest = new WeakMap();
-_getWebSocketForMessageID = new WeakMap();
-_notifyResponseIdSent = new WeakMap();
-_started2 = new WeakMap();
-var _status, _transport, _transportType, _requestIdToConnectionId, _agent, _McpAgent_instances, initialize_fn;
-var _McpAgent = class _McpAgent extends DurableObject {
+var McpAgent = class _McpAgent extends DurableObject {
   constructor(ctx, env) {
     var _a;
     super(ctx, env);
-    __privateAdd(this, _McpAgent_instances);
-    __privateAdd(this, _status, "zero");
-    __privateAdd(this, _transport);
-    __privateAdd(this, _transportType, "unset");
-    __privateAdd(this, _requestIdToConnectionId, /* @__PURE__ */ new Map());
-    /**
-     * Since McpAgent's _aren't_ yet real "Agents", let's only expose a couple of the methods
-     * to the outer class: initialState/state/setState/onStateUpdate/sql
-     */
-    __privateAdd(this, _agent);
+    this._status = "zero";
+    this._transportType = "unset";
+    this._requestIdToConnectionId = /* @__PURE__ */ new Map();
     this.initRun = false;
     const self = this;
-    __privateSet(this, _agent, new (_a = class extends Agent {
+    this._agent = new (_a = class extends Agent {
       onStateUpdate(state, source) {
         return self.onStateUpdate(state, source);
       }
@@ -154,26 +125,26 @@ var _McpAgent = class _McpAgent extends DurableObject {
       }
     }, _a.options = {
       hibernate: true
-    }, _a)(ctx, env));
+    }, _a)(ctx, env);
   }
   get mcp() {
-    return __privateGet(this, _agent).mcp;
+    return this._agent.mcp;
   }
   get state() {
-    return __privateGet(this, _agent).state;
+    return this._agent.state;
   }
   sql(strings, ...values) {
-    return __privateGet(this, _agent).sql(strings, ...values);
+    return this._agent.sql(strings, ...values);
   }
   setState(state) {
-    return __privateGet(this, _agent).setState(state);
+    return this._agent.setState(state);
   }
   onStateUpdate(state, source) {
   }
   async onStart() {
     var _a;
     const self = this;
-    __privateSet(this, _agent, new (_a = class extends Agent {
+    this._agent = new (_a = class extends Agent {
       constructor() {
         super(...arguments);
         this.initialState = self.initialState;
@@ -186,22 +157,22 @@ var _McpAgent = class _McpAgent extends DurableObject {
       }
     }, _a.options = {
       hibernate: true
-    }, _a)(this.ctx, this.env));
+    }, _a)(this.ctx, this.env);
     this.props = await this.ctx.storage.get("props");
-    __privateSet(this, _transportType, await this.ctx.storage.get(
+    this._transportType = await this.ctx.storage.get(
       "transportType"
-    ));
+    );
     await this._init(this.props);
     const server = await this.server;
-    if (__privateGet(this, _transportType) === "sse") {
-      __privateSet(this, _transport, new McpSSETransport(() => this.getWebSocket()));
-      await server.connect(__privateGet(this, _transport));
-    } else if (__privateGet(this, _transportType) === "streamable-http") {
-      __privateSet(this, _transport, new McpStreamableHttpTransport(
+    if (this._transportType === "sse") {
+      this._transport = new McpSSETransport(() => this.getWebSocket());
+      await server.connect(this._transport);
+    } else if (this._transportType === "streamable-http") {
+      this._transport = new McpStreamableHttpTransport(
         (id) => this.getWebSocketForResponseID(id),
-        (id) => __privateGet(this, _requestIdToConnectionId).delete(id)
-      ));
-      await server.connect(__privateGet(this, _transport));
+        (id) => this._requestIdToConnectionId.delete(id)
+      );
+      await server.connect(this._transport);
     }
   }
   async _init(props) {
@@ -221,10 +192,17 @@ var _McpAgent = class _McpAgent extends DurableObject {
   async isInitialized() {
     return await this.ctx.storage.get("initialized") === true;
   }
+  async _initialize() {
+    await this.ctx.blockConcurrencyWhile(async () => {
+      this._status = "starting";
+      await this.onStart();
+      this._status = "started";
+    });
+  }
   // Allow the worker to fetch a websocket connection to the agent
   async fetch(request) {
-    if (__privateGet(this, _status) !== "started") {
-      await __privateMethod(this, _McpAgent_instances, initialize_fn).call(this);
+    if (this._status !== "started") {
+      await this._initialize();
     }
     if (request.headers.get("Upgrade") !== "websocket") {
       return new Response("Expected WebSocket Upgrade request", {
@@ -241,24 +219,24 @@ var _McpAgent = class _McpAgent extends DurableObject {
           return new Response("Websocket already connected", { status: 400 });
         }
         await this.ctx.storage.put("transportType", "sse");
-        __privateSet(this, _transportType, "sse");
-        if (!__privateGet(this, _transport)) {
-          __privateSet(this, _transport, new McpSSETransport(() => this.getWebSocket()));
-          await server.connect(__privateGet(this, _transport));
+        this._transportType = "sse";
+        if (!this._transport) {
+          this._transport = new McpSSETransport(() => this.getWebSocket());
+          await server.connect(this._transport);
         }
-        return __privateGet(this, _agent).fetch(request);
+        return this._agent.fetch(request);
       }
       case "/streamable-http": {
-        if (!__privateGet(this, _transport)) {
-          __privateSet(this, _transport, new McpStreamableHttpTransport(
+        if (!this._transport) {
+          this._transport = new McpStreamableHttpTransport(
             (id) => this.getWebSocketForResponseID(id),
-            (id) => __privateGet(this, _requestIdToConnectionId).delete(id)
-          ));
-          await server.connect(__privateGet(this, _transport));
+            (id) => this._requestIdToConnectionId.delete(id)
+          );
+          await server.connect(this._transport);
         }
         await this.ctx.storage.put("transportType", "streamable-http");
-        __privateSet(this, _transportType, "streamable-http");
-        return __privateGet(this, _agent).fetch(request);
+        this._transportType = "streamable-http";
+        return this._agent.fetch(request);
       }
       default:
         return new Response(
@@ -277,19 +255,19 @@ var _McpAgent = class _McpAgent extends DurableObject {
     return websockets[0];
   }
   getWebSocketForResponseID(id) {
-    const connectionId = __privateGet(this, _requestIdToConnectionId).get(id);
+    const connectionId = this._requestIdToConnectionId.get(id);
     if (connectionId === void 0) {
       return null;
     }
-    return __privateGet(this, _agent).getConnection(connectionId) ?? null;
+    return this._agent.getConnection(connectionId) ?? null;
   }
   // All messages received here. This is currently never called
   async onMessage(connection, event) {
-    if (__privateGet(this, _transportType) !== "streamable-http") {
+    if (this._transportType !== "streamable-http") {
       const err = new Error(
         "Internal Server Error: Expected streamable-http protocol"
       );
-      __privateGet(this, _transport)?.onerror?.(err);
+      this._transport?.onerror?.(err);
       return;
     }
     let message;
@@ -297,21 +275,21 @@ var _McpAgent = class _McpAgent extends DurableObject {
       const data = typeof event === "string" ? event : new TextDecoder().decode(event);
       message = JSONRPCMessageSchema.parse(JSON.parse(data));
     } catch (error) {
-      __privateGet(this, _transport)?.onerror?.(error);
+      this._transport?.onerror?.(error);
       return;
     }
     if (isJSONRPCRequest(message)) {
-      __privateGet(this, _requestIdToConnectionId).set(message.id.toString(), connection.id);
+      this._requestIdToConnectionId.set(message.id.toString(), connection.id);
     }
-    __privateGet(this, _transport)?.onmessage?.(message);
+    this._transport?.onmessage?.(message);
   }
   // All messages received over SSE after the initial connection has been established
   // will be passed here
   async onSSEMcpMessage(sessionId, request) {
-    if (__privateGet(this, _status) !== "started") {
-      await __privateMethod(this, _McpAgent_instances, initialize_fn).call(this);
+    if (this._status !== "started") {
+      await this._initialize();
     }
-    if (__privateGet(this, _transportType) !== "sse") {
+    if (this._transportType !== "sse") {
       return new Error("Internal Server Error: Expected SSE protocol");
     }
     try {
@@ -320,36 +298,36 @@ var _McpAgent = class _McpAgent extends DurableObject {
       try {
         parsedMessage = JSONRPCMessageSchema.parse(message);
       } catch (error) {
-        __privateGet(this, _transport)?.onerror?.(error);
+        this._transport?.onerror?.(error);
         throw error;
       }
-      __privateGet(this, _transport)?.onmessage?.(parsedMessage);
+      this._transport?.onmessage?.(parsedMessage);
       return null;
     } catch (error) {
       console.error("Error forwarding message to SSE:", error);
-      __privateGet(this, _transport)?.onerror?.(error);
+      this._transport?.onerror?.(error);
       return error;
     }
   }
   // Delegate all websocket events to the underlying agent
   async webSocketMessage(ws, event) {
-    if (__privateGet(this, _status) !== "started") {
-      await __privateMethod(this, _McpAgent_instances, initialize_fn).call(this);
+    if (this._status !== "started") {
+      await this._initialize();
     }
-    return await __privateGet(this, _agent).webSocketMessage(ws, event);
+    return await this._agent.webSocketMessage(ws, event);
   }
   // WebSocket event handlers for hibernation support
   async webSocketError(ws, error) {
-    if (__privateGet(this, _status) !== "started") {
-      await __privateMethod(this, _McpAgent_instances, initialize_fn).call(this);
+    if (this._status !== "started") {
+      await this._initialize();
     }
-    return await __privateGet(this, _agent).webSocketError(ws, error);
+    return await this._agent.webSocketError(ws, error);
   }
   async webSocketClose(ws, code, reason, wasClean) {
-    if (__privateGet(this, _status) !== "started") {
-      await __privateMethod(this, _McpAgent_instances, initialize_fn).call(this);
+    if (this._status !== "started") {
+      await this._initialize();
     }
-    return await __privateGet(this, _agent).webSocketClose(ws, code, reason, wasClean);
+    return await this._agent.webSocketClose(ws, code, reason, wasClean);
   }
   static mount(path, {
     binding = "MCP_OBJECT",
@@ -796,20 +774,6 @@ data: ${JSON.stringify(result.data)}
     };
   }
 };
-_status = new WeakMap();
-_transport = new WeakMap();
-_transportType = new WeakMap();
-_requestIdToConnectionId = new WeakMap();
-_agent = new WeakMap();
-_McpAgent_instances = new WeakSet();
-initialize_fn = async function() {
-  await this.ctx.blockConcurrencyWhile(async () => {
-    __privateSet(this, _status, "starting");
-    await this.onStart();
-    __privateSet(this, _status, "started");
-  });
-};
-var McpAgent = _McpAgent;
 export {
   McpAgent
 };