agents 0.0.0-62d4e85 → 0.0.0-63d8af8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/client.js CHANGED
@@ -1,40 +1,39 @@
1
+ import {
2
+ __privateAdd,
3
+ __privateGet,
4
+ __privateSet
5
+ } from "./chunk-HMLY7DHA.js";
6
+
1
7
  // src/client.ts
2
8
  import {
3
9
  PartySocket
4
10
  } from "partysocket";
5
- var AgentClient = class extends PartySocket {
6
- /**
7
- * @deprecated Use agentFetch instead
8
- */
9
- static fetch(_opts) {
10
- throw new Error(
11
- "AgentClient.fetch is not implemented, use agentFetch instead"
12
- );
11
+ function camelCaseToKebabCase(str) {
12
+ if (str === str.toUpperCase() && str !== str.toLowerCase()) {
13
+ return str.toLowerCase().replace(/_/g, "-");
13
14
  }
14
- agent;
15
- name;
16
- #options;
17
- #pendingCalls = /* @__PURE__ */ new Map();
15
+ let kebabified = str.replace(
16
+ /[A-Z]/g,
17
+ (letter) => `-${letter.toLowerCase()}`
18
+ );
19
+ kebabified = kebabified.startsWith("-") ? kebabified.slice(1) : kebabified;
20
+ return kebabified.replace(/_/g, "-").replace(/-$/, "");
21
+ }
22
+ var _options, _pendingCalls;
23
+ var AgentClient = class extends PartySocket {
18
24
  constructor(options) {
25
+ const agentNamespace = camelCaseToKebabCase(options.agent);
19
26
  super({
20
27
  prefix: "agents",
21
- party: options.agent,
28
+ party: agentNamespace,
22
29
  room: options.name || "default",
23
30
  ...options
24
31
  });
25
- this.agent = options.agent;
32
+ __privateAdd(this, _options);
33
+ __privateAdd(this, _pendingCalls, /* @__PURE__ */ new Map());
34
+ this.agent = agentNamespace;
26
35
  this.name = options.name || "default";
27
- this.#options = options;
28
- if (this.agent !== this.agent.toLowerCase()) {
29
- console.warn(
30
- `Agent name: ${this.agent} should probably be in lowercase. Received: ${this.agent}`
31
- );
32
- }
33
- if (this.name !== this.name.toLowerCase()) {
34
- console.warn(
35
- `Agent instance name: ${this.name} should probably be in lowercase. Received: ${this.name}`
36
- );
37
- }
36
+ __privateSet(this, _options, options);
38
37
  this.addEventListener("message", (event) => {
39
38
  if (typeof event.data === "string") {
40
39
  let parsedMessage;
@@ -44,38 +43,46 @@ var AgentClient = class extends PartySocket {
44
43
  return;
45
44
  }
46
45
  if (parsedMessage.type === "cf_agent_state") {
47
- this.#options.onStateUpdate?.(parsedMessage.state, "server");
46
+ __privateGet(this, _options).onStateUpdate?.(parsedMessage.state, "server");
48
47
  return;
49
48
  }
50
49
  if (parsedMessage.type === "rpc") {
51
50
  const response = parsedMessage;
52
- const pending = this.#pendingCalls.get(response.id);
51
+ const pending = __privateGet(this, _pendingCalls).get(response.id);
53
52
  if (!pending) return;
54
53
  if (!response.success) {
55
54
  pending.reject(new Error(response.error));
56
- this.#pendingCalls.delete(response.id);
55
+ __privateGet(this, _pendingCalls).delete(response.id);
57
56
  pending.stream?.onError?.(response.error);
58
57
  return;
59
58
  }
60
59
  if ("done" in response) {
61
60
  if (response.done) {
62
61
  pending.resolve(response.result);
63
- this.#pendingCalls.delete(response.id);
62
+ __privateGet(this, _pendingCalls).delete(response.id);
64
63
  pending.stream?.onDone?.(response.result);
65
64
  } else {
66
65
  pending.stream?.onChunk?.(response.result);
67
66
  }
68
67
  } else {
69
68
  pending.resolve(response.result);
70
- this.#pendingCalls.delete(response.id);
69
+ __privateGet(this, _pendingCalls).delete(response.id);
71
70
  }
72
71
  }
73
72
  }
74
73
  });
75
74
  }
75
+ /**
76
+ * @deprecated Use agentFetch instead
77
+ */
78
+ static fetch(_opts) {
79
+ throw new Error(
80
+ "AgentClient.fetch is not implemented, use agentFetch instead"
81
+ );
82
+ }
76
83
  setState(state) {
77
84
  this.send(JSON.stringify({ type: "cf_agent_state", state }));
78
- this.#options.onStateUpdate?.(state, "client");
85
+ __privateGet(this, _options).onStateUpdate?.(state, "client");
79
86
  }
80
87
  /**
81
88
  * Call a method on the Agent
@@ -87,7 +94,7 @@ var AgentClient = class extends PartySocket {
87
94
  async call(method, args = [], streamOptions) {
88
95
  return new Promise((resolve, reject) => {
89
96
  const id = Math.random().toString(36).slice(2);
90
- this.#pendingCalls.set(id, {
97
+ __privateGet(this, _pendingCalls).set(id, {
91
98
  resolve: (value) => resolve(value),
92
99
  reject,
93
100
  stream: streamOptions,
@@ -103,21 +110,14 @@ var AgentClient = class extends PartySocket {
103
110
  });
104
111
  }
105
112
  };
113
+ _options = new WeakMap();
114
+ _pendingCalls = new WeakMap();
106
115
  function agentFetch(opts, init) {
107
- if (opts.agent !== opts.agent.toLowerCase()) {
108
- console.warn(
109
- `Agent name: ${opts.agent} should probably be in lowercase. Received: ${opts.agent}`
110
- );
111
- }
112
- if (opts.name && opts.name !== opts.name.toLowerCase()) {
113
- console.warn(
114
- `Agent instance name: ${opts.name} should probably be in lowercase. Received: ${opts.name}`
115
- );
116
- }
116
+ const agentNamespace = camelCaseToKebabCase(opts.agent);
117
117
  return PartySocket.fetch(
118
118
  {
119
119
  prefix: "agents",
120
- party: opts.agent,
120
+ party: agentNamespace,
121
121
  room: opts.name || "default",
122
122
  ...opts
123
123
  },
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/client.ts"],"sourcesContent":["import {\n PartySocket,\n type PartySocketOptions,\n type PartyFetchOptions,\n} from \"partysocket\";\nimport type { RPCRequest, RPCResponse } from \"./\";\n\n/**\n * Options for creating an AgentClient\n */\nexport type AgentClientOptions<State = unknown> = Omit<\n PartySocketOptions,\n \"party\" | \"room\"\n> & {\n /** Name of the agent to connect to */\n agent: string;\n /** Name of the specific Agent instance */\n name?: string;\n /** Called when the Agent's state is updated */\n onStateUpdate?: (state: State, source: \"server\" | \"client\") => void;\n};\n\n/**\n * Options for streaming RPC calls\n */\nexport type StreamOptions = {\n /** Called when a chunk of data is received */\n onChunk?: (chunk: unknown) => void;\n /** Called when the stream ends */\n onDone?: (finalChunk: unknown) => void;\n /** Called when an error occurs */\n onError?: (error: string) => void;\n};\n\n/**\n * Options for the agentFetch function\n */\nexport type AgentClientFetchOptions = Omit<\n PartyFetchOptions,\n \"party\" | \"room\"\n> & {\n /** Name of the agent to connect to */\n agent: string;\n /** Name of the specific Agent instance */\n name?: string;\n};\n\n/**\n * WebSocket client for connecting to an Agent\n */\nexport class AgentClient<State = unknown> extends PartySocket {\n /**\n * @deprecated Use agentFetch instead\n */\n static fetch(_opts: PartyFetchOptions): Promise<Response> {\n throw new Error(\n \"AgentClient.fetch is not implemented, use agentFetch instead\"\n );\n }\n agent: string;\n name: string;\n #options: AgentClientOptions<State>;\n #pendingCalls = new Map<\n string,\n {\n resolve: (value: unknown) => void;\n reject: (error: Error) => void;\n stream?: StreamOptions;\n type?: unknown;\n }\n >();\n\n constructor(options: AgentClientOptions<State>) {\n super({\n prefix: \"agents\",\n party: options.agent,\n room: options.name || \"default\",\n ...options,\n });\n this.agent = options.agent;\n this.name = options.name || \"default\";\n this.#options = options;\n\n // warn if agent or name isn't in lowercase\n if (this.agent !== this.agent.toLowerCase()) {\n console.warn(\n `Agent name: ${this.agent} should probably be in lowercase. Received: ${this.agent}`\n );\n }\n if (this.name !== this.name.toLowerCase()) {\n console.warn(\n `Agent instance name: ${this.name} should probably be in lowercase. Received: ${this.name}`\n );\n }\n\n this.addEventListener(\"message\", (event) => {\n if (typeof event.data === \"string\") {\n let parsedMessage: Record<string, unknown>;\n try {\n parsedMessage = JSON.parse(event.data);\n } catch (error) {\n // silently ignore invalid messages for now\n // TODO: log errors with log levels\n return;\n }\n if (parsedMessage.type === \"cf_agent_state\") {\n this.#options.onStateUpdate?.(parsedMessage.state as State, \"server\");\n return;\n }\n if (parsedMessage.type === \"rpc\") {\n const response = parsedMessage as RPCResponse;\n const pending = this.#pendingCalls.get(response.id);\n if (!pending) return;\n\n if (!response.success) {\n pending.reject(new Error(response.error));\n this.#pendingCalls.delete(response.id);\n pending.stream?.onError?.(response.error);\n return;\n }\n\n // Handle streaming responses\n if (\"done\" in response) {\n if (response.done) {\n pending.resolve(response.result);\n this.#pendingCalls.delete(response.id);\n pending.stream?.onDone?.(response.result);\n } else {\n pending.stream?.onChunk?.(response.result);\n }\n } else {\n // Non-streaming response\n pending.resolve(response.result);\n this.#pendingCalls.delete(response.id);\n }\n }\n }\n });\n }\n\n setState(state: State) {\n this.send(JSON.stringify({ type: \"cf_agent_state\", state }));\n this.#options.onStateUpdate?.(state, \"client\");\n }\n\n /**\n * Call a method on the Agent\n * @param method Name of the method to call\n * @param args Arguments to pass to the method\n * @param streamOptions Options for handling streaming responses\n * @returns Promise that resolves with the method's return value\n */\n async call<T = unknown>(\n method: string,\n args: unknown[] = [],\n streamOptions?: StreamOptions\n ): Promise<T> {\n return new Promise<T>((resolve, reject) => {\n const id = Math.random().toString(36).slice(2);\n this.#pendingCalls.set(id, {\n resolve: (value: unknown) => resolve(value as T),\n reject,\n stream: streamOptions,\n type: null as T,\n });\n\n const request: RPCRequest = {\n type: \"rpc\",\n id,\n method,\n args,\n };\n\n this.send(JSON.stringify(request));\n });\n }\n}\n\n/**\n * Make an HTTP request to an Agent\n * @param opts Connection options\n * @param init Request initialization options\n * @returns Promise resolving to a Response\n */\nexport function agentFetch(opts: AgentClientFetchOptions, init?: RequestInit) {\n // warn if agent or name isn't in lowercase\n if (opts.agent !== opts.agent.toLowerCase()) {\n console.warn(\n `Agent name: ${opts.agent} should probably be in lowercase. Received: ${opts.agent}`\n );\n }\n if (opts.name && opts.name !== opts.name.toLowerCase()) {\n console.warn(\n `Agent instance name: ${opts.name} should probably be in lowercase. Received: ${opts.name}`\n );\n }\n\n return PartySocket.fetch(\n {\n prefix: \"agents\",\n party: opts.agent,\n room: opts.name || \"default\",\n ...opts,\n },\n init\n );\n}\n"],"mappings":"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","names":[]}
1
+ {"version":3,"sources":["../src/client.ts"],"sourcesContent":["import {\n PartySocket,\n type PartySocketOptions,\n type PartyFetchOptions,\n} from \"partysocket\";\nimport type { RPCRequest, RPCResponse } from \"./\";\n\n/**\n * Options for creating an AgentClient\n */\nexport type AgentClientOptions<State = unknown> = Omit<\n PartySocketOptions,\n \"party\" | \"room\"\n> & {\n /** Name of the agent to connect to */\n agent: string;\n /** Name of the specific Agent instance */\n name?: string;\n /** Called when the Agent's state is updated */\n onStateUpdate?: (state: State, source: \"server\" | \"client\") => void;\n};\n\n/**\n * Options for streaming RPC calls\n */\nexport type StreamOptions = {\n /** Called when a chunk of data is received */\n onChunk?: (chunk: unknown) => void;\n /** Called when the stream ends */\n onDone?: (finalChunk: unknown) => void;\n /** Called when an error occurs */\n onError?: (error: string) => void;\n};\n\n/**\n * Options for the agentFetch function\n */\nexport type AgentClientFetchOptions = Omit<\n PartyFetchOptions,\n \"party\" | \"room\"\n> & {\n /** Name of the agent to connect to */\n agent: string;\n /** Name of the specific Agent instance */\n name?: string;\n};\n\n/**\n * Convert a camelCase string to a kebab-case string\n * @param str The string to convert\n * @returns The kebab-case string\n */\nfunction camelCaseToKebabCase(str: string): string {\n // If string is all uppercase, convert to lowercase\n if (str === str.toUpperCase() && str !== str.toLowerCase()) {\n return str.toLowerCase().replace(/_/g, \"-\");\n }\n\n // Otherwise handle camelCase to kebab-case\n let kebabified = str.replace(\n /[A-Z]/g,\n (letter) => `-${letter.toLowerCase()}`\n );\n kebabified = kebabified.startsWith(\"-\") ? kebabified.slice(1) : kebabified;\n // Convert any remaining underscores to hyphens and remove trailing -'s\n return kebabified.replace(/_/g, \"-\").replace(/-$/, \"\");\n}\n\n/**\n * WebSocket client for connecting to an Agent\n */\nexport class AgentClient<State = unknown> extends PartySocket {\n /**\n * @deprecated Use agentFetch instead\n */\n static fetch(_opts: PartyFetchOptions): Promise<Response> {\n throw new Error(\n \"AgentClient.fetch is not implemented, use agentFetch instead\"\n );\n }\n agent: string;\n name: string;\n #options: AgentClientOptions<State>;\n #pendingCalls = new Map<\n string,\n {\n resolve: (value: unknown) => void;\n reject: (error: Error) => void;\n stream?: StreamOptions;\n type?: unknown;\n }\n >();\n\n constructor(options: AgentClientOptions<State>) {\n const agentNamespace = camelCaseToKebabCase(options.agent);\n super({\n prefix: \"agents\",\n party: agentNamespace,\n room: options.name || \"default\",\n ...options,\n });\n this.agent = agentNamespace;\n this.name = options.name || \"default\";\n this.#options = options;\n\n this.addEventListener(\"message\", (event) => {\n if (typeof event.data === \"string\") {\n let parsedMessage: Record<string, unknown>;\n try {\n parsedMessage = JSON.parse(event.data);\n } catch (error) {\n // silently ignore invalid messages for now\n // TODO: log errors with log levels\n return;\n }\n if (parsedMessage.type === \"cf_agent_state\") {\n this.#options.onStateUpdate?.(parsedMessage.state as State, \"server\");\n return;\n }\n if (parsedMessage.type === \"rpc\") {\n const response = parsedMessage as RPCResponse;\n const pending = this.#pendingCalls.get(response.id);\n if (!pending) return;\n\n if (!response.success) {\n pending.reject(new Error(response.error));\n this.#pendingCalls.delete(response.id);\n pending.stream?.onError?.(response.error);\n return;\n }\n\n // Handle streaming responses\n if (\"done\" in response) {\n if (response.done) {\n pending.resolve(response.result);\n this.#pendingCalls.delete(response.id);\n pending.stream?.onDone?.(response.result);\n } else {\n pending.stream?.onChunk?.(response.result);\n }\n } else {\n // Non-streaming response\n pending.resolve(response.result);\n this.#pendingCalls.delete(response.id);\n }\n }\n }\n });\n }\n\n setState(state: State) {\n this.send(JSON.stringify({ type: \"cf_agent_state\", state }));\n this.#options.onStateUpdate?.(state, \"client\");\n }\n\n /**\n * Call a method on the Agent\n * @param method Name of the method to call\n * @param args Arguments to pass to the method\n * @param streamOptions Options for handling streaming responses\n * @returns Promise that resolves with the method's return value\n */\n async call<T = unknown>(\n method: string,\n args: unknown[] = [],\n streamOptions?: StreamOptions\n ): Promise<T> {\n return new Promise<T>((resolve, reject) => {\n const id = Math.random().toString(36).slice(2);\n this.#pendingCalls.set(id, {\n resolve: (value: unknown) => resolve(value as T),\n reject,\n stream: streamOptions,\n type: null as T,\n });\n\n const request: RPCRequest = {\n type: \"rpc\",\n id,\n method,\n args,\n };\n\n this.send(JSON.stringify(request));\n });\n }\n}\n\n/**\n * Make an HTTP request to an Agent\n * @param opts Connection options\n * @param init Request initialization options\n * @returns Promise resolving to a Response\n */\nexport function agentFetch(opts: AgentClientFetchOptions, init?: RequestInit) {\n const agentNamespace = camelCaseToKebabCase(opts.agent);\n\n return PartySocket.fetch(\n {\n prefix: \"agents\",\n party: agentNamespace,\n room: opts.name || \"default\",\n ...opts,\n },\n init\n );\n}\n"],"mappings":"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","names":[]}
package/dist/index.js CHANGED
@@ -7,7 +7,8 @@ import {
7
7
  routeAgentRequest,
8
8
  unstable_callable,
9
9
  unstable_context
10
- } from "./chunk-SZEXGW6W.js";
10
+ } from "./chunk-YMUU7QHV.js";
11
+ import "./chunk-HMLY7DHA.js";
11
12
  export {
12
13
  Agent,
13
14
  StreamingResponse,
@@ -1,32 +1,40 @@
1
1
  import * as zod from 'zod';
2
- import { Tool, Prompt as Prompt$1, Resource, ResourceTemplate, ServerCapabilities, ClientCapabilities, CallToolRequest, CallToolResultSchema, CompatibilityCallToolResultSchema, ReadResourceRequest, GetPromptRequest } from '@modelcontextprotocol/sdk/types.js';
2
+ import { Tool, Prompt, Resource, ResourceTemplate, ServerCapabilities, ClientCapabilities, CallToolRequest, CallToolResultSchema, CompatibilityCallToolResultSchema, ReadResourceRequest, GetPromptRequest } from '@modelcontextprotocol/sdk/types.js';
3
3
  import { Client } from '@modelcontextprotocol/sdk/client/index.js';
4
- import { SSEClientTransport, SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
4
+ import { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
5
5
  import { RequestOptions } from '@modelcontextprotocol/sdk/shared/protocol.js';
6
+ import { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
6
7
 
7
8
  declare class MCPClientConnection {
9
+ url: URL;
8
10
  private info;
11
+ private options;
9
12
  client: Client;
10
- transport: SSEClientTransport;
11
- connected: boolean;
13
+ connectionState: "authenticating" | "connecting" | "ready" | "discovering" | "failed";
12
14
  instructions?: string;
13
15
  tools: Tool[];
14
- prompts: Prompt$1[];
16
+ prompts: Prompt[];
15
17
  resources: Resource[];
16
18
  resourceTemplates: ResourceTemplate[];
17
19
  serverCapabilities: ServerCapabilities | undefined;
18
- constructor(url: URL, info: ConstructorParameters<typeof Client>[0], opts?: {
20
+ constructor(url: URL, info: ConstructorParameters<typeof Client>[0], options?: {
19
21
  transport: SSEClientTransportOptions;
20
22
  client: ConstructorParameters<typeof Client>[1];
21
23
  capabilities: ClientCapabilities;
22
24
  });
23
- init(): Promise<void>;
25
+ /**
26
+ * Initialize a client connection
27
+ *
28
+ * @param code Optional OAuth code to initialize the connection with if auth hasn't been initialized
29
+ * @returns
30
+ */
31
+ init(code?: string, clientId?: string): Promise<void>;
24
32
  /**
25
33
  * Notification handler registration
26
34
  */
27
35
  registerTools(): Promise<Tool[]>;
28
36
  registerResources(): Promise<Resource[]>;
29
- registerPrompts(): Promise<Prompt$1[]>;
37
+ registerPrompts(): Promise<Prompt[]>;
30
38
  registerResourceTemplates(): Promise<ResourceTemplate[]>;
31
39
  fetchTools(): Promise<{
32
40
  [x: string]: unknown;
@@ -67,11 +75,28 @@ declare class MCPClientConnection {
67
75
  }[]>;
68
76
  }
69
77
 
78
+ interface AgentsOAuthProvider extends OAuthClientProvider {
79
+ authUrl: string | undefined;
80
+ clientId: string | undefined;
81
+ }
82
+
70
83
  /**
71
84
  * Utility class that aggregates multiple MCP clients into one
72
85
  */
73
86
  declare class MCPClientManager {
87
+ private name;
88
+ private version;
89
+ private auth?;
74
90
  mcpConnections: Record<string, MCPClientConnection>;
91
+ /**
92
+ * @param name Name of the MCP client
93
+ * @param version Version of the MCP Client
94
+ * @param auth Auth paramters if being used to create a DurableObjectOAuthClientProvider
95
+ */
96
+ constructor(name: string, version: string, auth?: {
97
+ baseCallbackUri: string;
98
+ storage: DurableObjectStorage;
99
+ } | undefined);
75
100
  /**
76
101
  * Connect to and register an MCP server
77
102
  *
@@ -79,11 +104,25 @@ declare class MCPClientManager {
79
104
  * @param clientConfig Client config
80
105
  * @param capabilities Client capabilities (i.e. if the client supports roots/sampling)
81
106
  */
82
- connectToServer(url: URL, info: ConstructorParameters<typeof Client>[0], opts?: {
83
- transport: SSEClientTransportOptions;
84
- client: ConstructorParameters<typeof Client>[1];
85
- capabilities: ClientCapabilities;
86
- }): Promise<void>;
107
+ connect(url: string, opts?: {
108
+ reconnect?: {
109
+ id: string;
110
+ oauthClientId?: string;
111
+ oauthCode?: string;
112
+ };
113
+ transport?: SSEClientTransportOptions & {
114
+ authProvider: AgentsOAuthProvider;
115
+ };
116
+ client?: ConstructorParameters<typeof Client>[1];
117
+ capabilities?: ClientCapabilities;
118
+ }): Promise<{
119
+ id: string;
120
+ authUrl: string | undefined;
121
+ }>;
122
+ isCallbackRequest(req: Request): boolean;
123
+ handleCallbackRequest(req: Request): Promise<{
124
+ serverId: string;
125
+ }>;
87
126
  /**
88
127
  * @returns namespaced list of tools
89
128
  */
@@ -104,7 +143,7 @@ declare class MCPClientManager {
104
143
  * Namespaced version of callTool
105
144
  */
106
145
  callTool(params: CallToolRequest["params"] & {
107
- serverName: string;
146
+ serverId: string;
108
147
  }, resultSchema: typeof CallToolResultSchema | typeof CompatibilityCallToolResultSchema, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
109
148
  _meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
110
149
  }, {
@@ -239,7 +278,7 @@ declare class MCPClientManager {
239
278
  * Namespaced version of readResource
240
279
  */
241
280
  readResource(params: ReadResourceRequest["params"] & {
242
- serverName: string;
281
+ serverId: string;
243
282
  }, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
244
283
  _meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
245
284
  }, {
@@ -279,7 +318,7 @@ declare class MCPClientManager {
279
318
  * Namespaced version of getPrompt
280
319
  */
281
320
  getPrompt(params: GetPromptRequest["params"] & {
282
- serverName: string;
321
+ serverId: string;
283
322
  }, options: RequestOptions): Promise<zod.objectOutputType<zod.objectUtil.extendShape<{
284
323
  _meta: zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, zod.objectOutputType<{}, zod.ZodTypeAny, "passthrough">, zod.objectInputType<{}, zod.ZodTypeAny, "passthrough">>>;
285
324
  }, {
@@ -658,16 +697,16 @@ declare class MCPClientManager {
658
697
  }
659
698
  type NamespacedData = {
660
699
  tools: (Tool & {
661
- serverName: string;
700
+ serverId: string;
662
701
  })[];
663
702
  prompts: (Prompt & {
664
- serverName: string;
703
+ serverId: string;
665
704
  })[];
666
705
  resources: (Resource & {
667
- serverName: string;
706
+ serverId: string;
668
707
  })[];
669
708
  resourceTemplates: (ResourceTemplate & {
670
- serverName: string;
709
+ serverId: string;
671
710
  })[];
672
711
  };
673
712
  declare function getNamespacedData<T extends keyof NamespacedData>(mcpClients: Record<string, MCPClientConnection>, type: T): NamespacedData[T];