@dxos/mcp-client 0.8.4-main.c85a9c8dae → 0.8.4-main.cb12b3f963

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.
@@ -7,6 +7,8 @@ var __export = (target, all) => {
7
7
  // src/McpToolkit.ts
8
8
  var McpToolkit_exports = {};
9
9
  __export(McpToolkit_exports, {
10
+ McpConnectionError: () => McpConnectionError,
11
+ is405: () => is405,
10
12
  make: () => make3
11
13
  });
12
14
  import * as Tool from "@effect/ai/Tool";
@@ -14,21 +16,34 @@ import * as Toolkit from "@effect/ai/Toolkit";
14
16
  import { Client } from "@modelcontextprotocol/sdk/client/index.js";
15
17
  import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
16
18
  import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
19
+ import * as Cause from "effect/Cause";
17
20
  import * as Effect from "effect/Effect";
18
21
  import * as Schema from "effect/Schema";
19
- import { GenericToolkit } from "@dxos/ai";
22
+ import { OpaqueToolkit } from "@dxos/ai";
20
23
  import { invariant } from "@dxos/invariant";
21
24
  var __dxlog_file = "/__w/dxos/dxos/packages/core/mcp-client/src/McpToolkit.ts";
25
+ var McpConnectionError = class extends Schema.TaggedError("McpConnectionError")("McpConnectionError", {
26
+ url: Schema.String,
27
+ kind: Schema.Literal("sse", "http"),
28
+ message: Schema.String
29
+ }) {
30
+ };
31
+ var CLIENT_INFO = {
32
+ name: "@dxos/mcp-client",
33
+ version: "0.8.3"
34
+ };
22
35
  var make3 = (options) => Effect.gen(function* () {
23
- const transport = createTransport(options.url, options.kind);
24
- const client = new Client({
25
- name: "@dxos/mcp-client",
26
- version: "0.8.3"
36
+ const client = yield* connectWithFallback(options);
37
+ const { tools } = yield* Effect.tryPromise({
38
+ try: () => client.listTools(),
39
+ catch: (cause) => new McpConnectionError({
40
+ url: options.url,
41
+ kind: options.kind,
42
+ message: `Failed to list MCP tools: ${formatCause(cause)}`
43
+ })
27
44
  });
28
- yield* Effect.promise(() => client.connect(transport));
29
- const { tools } = yield* Effect.promise(() => client.listTools());
30
45
  if (tools.length === 0) {
31
- return GenericToolkit.empty;
46
+ return OpaqueToolkit.empty;
32
47
  }
33
48
  const effectTools = tools.map((mcpTool) => {
34
49
  const parameters = {};
@@ -65,26 +80,69 @@ var make3 = (options) => Effect.gen(function* () {
65
80
  ];
66
81
  }));
67
82
  const layer = toolkit.toLayer(handlers);
68
- return GenericToolkit.make(toolkit, layer);
83
+ return OpaqueToolkit.make(toolkit, layer);
69
84
  }).pipe(Effect.withSpan("McpToolkit.make"));
70
- var createTransport = (url, kind) => {
85
+ var is405 = (error) => {
86
+ const cause = error != null && typeof error === "object" && "error" in error ? error.error : error;
87
+ return cause instanceof Error && cause.message.includes("405");
88
+ };
89
+ var connectWithFallback = (options) => Effect.gen(function* () {
90
+ const fallbackKind = options.kind === "sse" ? "http" : "sse";
91
+ const primary = yield* connectClient(options.url, options.kind, options.apiKey).pipe(Effect.either);
92
+ if (primary._tag === "Right") {
93
+ return primary.right;
94
+ }
95
+ if (is405(primary.left)) {
96
+ const fallback = yield* connectClient(options.url, fallbackKind, options.apiKey).pipe(Effect.either);
97
+ if (fallback._tag === "Right") {
98
+ return fallback.right;
99
+ }
100
+ return yield* Effect.fail(new McpConnectionError({
101
+ url: options.url,
102
+ kind: fallbackKind,
103
+ message: `Failed to connect via ${fallbackKind} after 405 fallback: ${formatCause(fallback.left)}`
104
+ }));
105
+ }
106
+ return yield* Effect.fail(new McpConnectionError({
107
+ url: options.url,
108
+ kind: options.kind,
109
+ message: `Failed to connect via ${options.kind}: ${formatCause(primary.left)}`
110
+ }));
111
+ });
112
+ var connectClient = (url, kind, apiKey) => Effect.tryPromise(() => {
113
+ const client = new Client(CLIENT_INFO);
114
+ const transport = createTransport(url, kind, apiKey);
115
+ return client.connect(transport).then(() => client);
116
+ });
117
+ var formatCause = (error) => {
118
+ const inner = error != null && typeof error === "object" && "error" in error ? error.error : error;
119
+ if (inner instanceof Error) {
120
+ return inner.message;
121
+ }
122
+ if (Cause.isCause(error)) {
123
+ return Cause.pretty(error);
124
+ }
125
+ return String(inner);
126
+ };
127
+ var createTransport = (url, kind, apiKey) => {
71
128
  const urlObj = new URL(url);
129
+ const requestInit = apiKey ? {
130
+ headers: {
131
+ Authorization: `Bearer ${apiKey}`
132
+ }
133
+ } : void 0;
72
134
  switch (kind) {
73
135
  case "sse":
74
- return new SSEClientTransport(urlObj);
136
+ return new SSEClientTransport(urlObj, {
137
+ requestInit
138
+ });
75
139
  case "http":
76
- return new StreamableHTTPClientTransport(urlObj);
140
+ return new StreamableHTTPClientTransport(urlObj, {
141
+ requestInit
142
+ });
77
143
  default: {
78
144
  const _exhaustive = kind;
79
- return invariant(false, `Unsupported MCP transport kind: ${_exhaustive}`, {
80
- F: __dxlog_file,
81
- L: 105,
82
- S: void 0,
83
- A: [
84
- "false",
85
- "`Unsupported MCP transport kind: ${_exhaustive}`"
86
- ]
87
- });
145
+ return invariant(false, `Unsupported MCP transport kind: ${_exhaustive}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 159, S: void 0, A: ["false", "`Unsupported MCP transport kind: ${_exhaustive}`"] });
88
146
  }
89
147
  }
90
148
  };
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/McpToolkit.ts"],
4
- "sourcesContent": ["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Tool from '@effect/ai/Tool';\nimport * as Toolkit from '@effect/ai/Toolkit';\nimport { Client } from '@modelcontextprotocol/sdk/client/index.js';\nimport { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';\nimport { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';\nimport * as Effect from 'effect/Effect';\nimport * as Schema from 'effect/Schema';\n\nimport { GenericToolkit } from '@dxos/ai';\nimport { invariant } from '@dxos/invariant';\n\nexport interface McpToolkitOptions {\n url: string;\n kind: 'sse' | 'http';\n}\n\n/**\n * Creates a GenericToolkit that connects to an MCP server and exposes its tools to the assistant.\n *\n * @param options MCP server URL and transport kind ('sse' for SSE, 'http' for Streamable HTTP).\n * @returns A GenericToolkit containing all tools from the MCP server.\n */\nexport const make = (options: McpToolkitOptions): Effect.Effect<GenericToolkit.GenericToolkit> =>\n Effect.gen(function* () {\n const transport = createTransport(options.url, options.kind);\n const client = new Client({ name: '@dxos/mcp-client', version: '0.8.3' });\n yield* Effect.promise(() => client.connect(transport));\n\n const { tools } = yield* Effect.promise(() => client.listTools());\n\n if (tools.length === 0) {\n return GenericToolkit.empty;\n }\n\n const effectTools = tools.map((mcpTool) => {\n const parameters: any = {};\n for (const [key, value] of Object.entries(mcpTool.inputSchema.properties ?? {})) {\n if (mcpTool.inputSchema.required?.includes(key)) {\n parameters[key] = Schema.Unknown.pipe(\n Schema.annotations({\n jsonSchema: value,\n }),\n );\n } else {\n parameters[key] = Schema.Unknown.pipe(\n Schema.annotations({\n jsonSchema: value,\n }),\n ).pipe(Schema.optional);\n }\n }\n\n return Tool.make(sanitizeToolName(mcpTool.name), {\n description: mcpTool.description ?? `MCP tool: ${mcpTool.name}`,\n parameters,\n success: Schema.String,\n failure: Schema.Never,\n });\n });\n\n const toolkit = Toolkit.make(...effectTools);\n\n const handlers = Object.fromEntries(\n tools.map((mcpTool) => {\n const toolName = sanitizeToolName(mcpTool.name);\n return [\n toolName,\n Effect.fn(function* (args: unknown) {\n const result = yield* Effect.promise(() =>\n client.callTool({\n name: mcpTool.name,\n arguments: args as any,\n }),\n );\n return formatToolResult(result);\n }),\n ];\n }),\n ) as any;\n\n const layer = toolkit.toLayer(handlers);\n\n return GenericToolkit.make(toolkit, layer);\n }).pipe(Effect.withSpan('McpToolkit.make'));\n\n/**\n * Creates a transport for the given MCP server URL and kind.\n */\nconst createTransport = (\n url: string,\n kind: McpToolkitOptions['kind'],\n): SSEClientTransport | StreamableHTTPClientTransport => {\n const urlObj = new URL(url);\n switch (kind) {\n case 'sse':\n return new SSEClientTransport(urlObj);\n case 'http':\n return new StreamableHTTPClientTransport(urlObj);\n default: {\n const _exhaustive: never = kind;\n return invariant(false, `Unsupported MCP transport kind: ${_exhaustive}`) as never;\n }\n }\n};\n\n/**\n * Sanitizes MCP tool names for use as Effect tool names (replaces / with _).\n */\nconst sanitizeToolName = (name: string): string => name.replace(/\\//g, '_');\n\n/**\n * Formats MCP callTool result content for the assistant.\n */\nconst formatToolResult = (result: Awaited<ReturnType<Client['callTool']>>): string => {\n if ('toolResult' in result && result.toolResult !== undefined) {\n return JSON.stringify(result.toolResult);\n }\n if ('content' in result && Array.isArray(result.content)) {\n return result.content\n .filter((part): part is { type: 'text'; text: string } => part.type === 'text')\n .map((part) => part.text)\n .join('\\n');\n }\n return String(result);\n};\n"],
5
- "mappings": "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",
6
- "names": ["make", "Tool", "Toolkit", "Client", "SSEClientTransport", "StreamableHTTPClientTransport", "Effect", "Schema", "GenericToolkit", "invariant", "options", "gen", "transport", "createTransport", "url", "kind", "client", "name", "version", "promise", "connect", "tools", "listTools", "length", "empty", "effectTools", "map", "mcpTool", "parameters", "key", "value", "Object", "entries", "inputSchema", "properties", "required", "includes", "Unknown", "pipe", "annotations", "jsonSchema", "optional", "sanitizeToolName", "description", "success", "String", "failure", "Never", "toolkit", "handlers", "fromEntries", "toolName", "fn", "args", "result", "callTool", "arguments", "formatToolResult", "layer", "toLayer", "withSpan", "urlObj", "URL", "_exhaustive", "replace", "toolResult", "undefined", "JSON", "stringify", "Array", "isArray", "content", "filter", "part", "type", "text", "join"]
4
+ "sourcesContent": ["//\n// Copyright 2026 DXOS.org\n//\n\n// @import-as-namespace\n\nimport * as Tool from '@effect/ai/Tool';\nimport * as Toolkit from '@effect/ai/Toolkit';\nimport { Client } from '@modelcontextprotocol/sdk/client/index.js';\nimport { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';\nimport { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';\nimport * as Cause from 'effect/Cause';\nimport * as Effect from 'effect/Effect';\nimport * as Schema from 'effect/Schema';\n\nimport { OpaqueToolkit } from '@dxos/ai';\nimport { invariant } from '@dxos/invariant';\n\nexport interface McpToolkitOptions {\n url: string;\n kind: 'sse' | 'http';\n apiKey?: string;\n}\n\n/**\n * Typed failure raised when the MCP client cannot connect or list tools.\n * Carries the underlying cause and the server URL for diagnostics.\n */\nexport class McpConnectionError extends Schema.TaggedError<McpConnectionError>('McpConnectionError')(\n 'McpConnectionError',\n {\n url: Schema.String,\n kind: Schema.Literal('sse', 'http'),\n message: Schema.String,\n },\n) {}\n\n/**\n * Creates an OpaqueToolkit that connects to an MCP server and exposes its tools to the assistant.\n *\n * @param options MCP server URL and transport kind ('sse' for SSE, 'http' for Streamable HTTP).\n * @returns An OpaqueToolkit containing all tools from the MCP server.\n */\nconst CLIENT_INFO = { name: '@dxos/mcp-client', version: '0.8.3' };\n\nexport const make = (options: McpToolkitOptions): Effect.Effect<OpaqueToolkit.OpaqueToolkit, McpConnectionError> =>\n Effect.gen(function* () {\n const client = yield* connectWithFallback(options);\n\n const { tools } = yield* Effect.tryPromise({\n try: () => client.listTools(),\n catch: (cause) =>\n new McpConnectionError({\n url: options.url,\n kind: options.kind,\n message: `Failed to list MCP tools: ${formatCause(cause)}`,\n }),\n });\n if (tools.length === 0) {\n return OpaqueToolkit.empty;\n }\n\n const effectTools = tools.map((mcpTool) => {\n const parameters: any = {};\n for (const [key, value] of Object.entries(mcpTool.inputSchema.properties ?? {})) {\n if (mcpTool.inputSchema.required?.includes(key)) {\n parameters[key] = Schema.Unknown.pipe(Schema.annotations({ jsonSchema: value }));\n } else {\n parameters[key] = Schema.Unknown.pipe(Schema.annotations({ jsonSchema: value })).pipe(Schema.optional);\n }\n }\n\n return Tool.make(sanitizeToolName(mcpTool.name), {\n description: mcpTool.description ?? `MCP tool: ${mcpTool.name}`,\n parameters,\n success: Schema.String,\n failure: Schema.Never,\n });\n });\n\n const toolkit = Toolkit.make(...effectTools);\n\n const handlers = Object.fromEntries(\n tools.map((mcpTool) => {\n const toolName = sanitizeToolName(mcpTool.name);\n return [\n toolName,\n Effect.fn(function* (args: unknown) {\n const result = yield* Effect.promise(() =>\n client.callTool({\n name: mcpTool.name,\n arguments: args as any,\n }),\n );\n return formatToolResult(result);\n }),\n ];\n }),\n ) as any;\n\n const layer = toolkit.toLayer(handlers);\n\n return OpaqueToolkit.make(toolkit, layer);\n }).pipe(Effect.withSpan('McpToolkit.make'));\n\n/**\n * Returns true when the error (or its wrapped cause) contains a 405 status code.\n * `Effect.tryPromise` wraps thrown errors in `UnknownException`, so we unwrap first.\n */\nexport const is405 = (error: unknown): boolean => {\n const cause = error != null && typeof error === 'object' && 'error' in error ? (error as any).error : error;\n return cause instanceof Error && cause.message.includes('405');\n};\n\n/**\n * Connects to an MCP server, falling back to the alternate transport on 405 errors.\n * Per the MCP spec, a 405 indicates the server uses the other transport protocol.\n * Returns the connected Client (a fresh instance is created for the fallback attempt).\n *\n * Failures are surfaced as typed `McpConnectionError` so callers can recover (e.g. drop\n * the misconfigured server) without breaking the surrounding effect.\n */\nconst connectWithFallback = (options: McpToolkitOptions): Effect.Effect<Client, McpConnectionError> =>\n Effect.gen(function* () {\n const fallbackKind = options.kind === 'sse' ? 'http' : 'sse';\n const primary = yield* connectClient(options.url, options.kind, options.apiKey).pipe(Effect.either);\n if (primary._tag === 'Right') {\n return primary.right;\n }\n if (is405(primary.left)) {\n const fallback = yield* connectClient(options.url, fallbackKind, options.apiKey).pipe(Effect.either);\n if (fallback._tag === 'Right') {\n return fallback.right;\n }\n return yield* Effect.fail(\n new McpConnectionError({\n url: options.url,\n kind: fallbackKind,\n message: `Failed to connect via ${fallbackKind} after 405 fallback: ${formatCause(fallback.left)}`,\n }),\n );\n }\n return yield* Effect.fail(\n new McpConnectionError({\n url: options.url,\n kind: options.kind,\n message: `Failed to connect via ${options.kind}: ${formatCause(primary.left)}`,\n }),\n );\n });\n\nconst connectClient = (url: string, kind: McpToolkitOptions['kind'], apiKey?: string) =>\n Effect.tryPromise(() => {\n const client = new Client(CLIENT_INFO);\n const transport = createTransport(url, kind, apiKey);\n return client.connect(transport).then(() => client);\n });\n\n/**\n * Renders a thrown value to a short string for inclusion in error messages.\n * `Effect.tryPromise` wraps thrown errors in `UnknownException`; unwrap when present.\n */\nconst formatCause = (error: unknown): string => {\n const inner = error != null && typeof error === 'object' && 'error' in error ? (error as any).error : error;\n if (inner instanceof Error) {\n return inner.message;\n }\n if (Cause.isCause(error)) {\n return Cause.pretty(error);\n }\n return String(inner);\n};\n\n/**\n * Creates a transport for the given MCP server URL and kind.\n */\nconst createTransport = (\n url: string,\n kind: McpToolkitOptions['kind'],\n apiKey?: string,\n): SSEClientTransport | StreamableHTTPClientTransport => {\n const urlObj = new URL(url);\n const requestInit: RequestInit | undefined = apiKey ? { headers: { Authorization: `Bearer ${apiKey}` } } : undefined;\n switch (kind) {\n case 'sse':\n return new SSEClientTransport(urlObj, { requestInit });\n case 'http':\n return new StreamableHTTPClientTransport(urlObj, { requestInit });\n default: {\n const _exhaustive: never = kind;\n return invariant(false, `Unsupported MCP transport kind: ${_exhaustive}`) as never;\n }\n }\n};\n\n/**\n * Sanitizes MCP tool names for use as Effect tool names (replaces / with _).\n */\nconst sanitizeToolName = (name: string): string => name.replace(/\\//g, '_');\n\n/**\n * Formats MCP callTool result content for the assistant.\n */\nconst formatToolResult = (result: Awaited<ReturnType<Client['callTool']>>): string => {\n if ('toolResult' in result && result.toolResult !== undefined) {\n return JSON.stringify(result.toolResult);\n }\n if ('content' in result && Array.isArray(result.content)) {\n return result.content\n .filter((part): part is { type: 'text'; text: string } => part.type === 'text')\n .map((part) => part.text)\n .join('\\n');\n }\n\n return String(result);\n};\n"],
5
+ "mappings": ";;;;;;;AAAA;;;;cAAAA;;AAMA,YAAYC,UAAU;AACtB,YAAYC,aAAa;AACzB,SAASC,cAAc;AACvB,SAASC,0BAA0B;AACnC,SAASC,qCAAqC;AAC9C,YAAYC,WAAW;AACvB,YAAYC,YAAY;AACxB,YAAYC,YAAY;AAExB,SAASC,qBAAqB;AAC9B,SAASC,iBAAiB;AAQ1B,IAAA,eAAA;AAQUF,IAAOG,qBAAPH,cAAsB,mBAAA,oBAAA,EAAA,sBAAA;EAC5BI,KAASJ;EACX,MAAA,eAAA,OAAA,MAAA;EACC,SAAA;AAEH,CAAA,EAAA;;AAMgDK,IAAAA,cAAS;EAAQ,MAAA;EAEjE,SAAab;;IAITA,QAAQc,CAAK,YAAYP,WAAOQ,aAAW;QACzCC,SAAWC,OAAOC,oBAAS,OAAA;QAC3BC,EAAAA,MAAQC,IAAAA,OACFC,kBAAmB;eACrBC,OAAKC,UAAW;YAChBC,UAAMD,IAAAA,mBAAY;MAClBX,KAAAA,QAAU;MACZ,MAAA,QAAA;MACJ,SAAA,6BAAA,YAAA,KAAA,CAAA;IACIE,CAAAA;;AAEJ,MAAA,MAAA,WAAA,GAAA;AAEA,WAAMW,cAAcX;;QAElB,cAAYY,MAAKC,IAAM,CAAIC,YAAOC;UAChC,aAAYC,CAAAA;eACVC,CAAAA,KAAAA,KAAWL,KAAOlB,OAAOwB,QAAQC,QAAKzB,YAAO0B,cAAY,CAAA,CAAA,GAAA;kBAAEC,YAAYR,UAAAA,SAAAA,GAAAA,GAAAA;AAAM,mBAAA,GAAA,IAAA,eAAA,KAAA,mBAAA;UACxE,YAAA;QACLI,CAAAA,CAAAA;;AAA6E,mBAASvB,GAAAA,IAAe,eAAA,KAAA,mBAAA;UACvG,YAAA;QACF,CAAA,CAAA,EAAA,KAAA,eAAA;MAEA;;WAEEuB,UAAAA,iBAAAA,QAAAA,IAAAA,GAAAA;MACAK,aAAS5B,QAAO6B,eAAM,aAAA,QAAA,IAAA;MACtBC;MACF,SAAA;MACF,SAAA;IAEA,CAAA;EAEA,CAAA;QAEI,UAAiBC,aAAAA,GAAAA,WAAiBC;QAClC,WAAO,OAAA,YAAA,MAAA,IAAA,CAAA,YAAA;UACLC,WAAAA,iBAAAA,QAAAA,IAAAA;WACAlC;;2BAGYiC,MAAQE;uBACdC,OAAWC,eAAAA,MAAAA,OAAAA,SAAAA;UACb,MAAA,QAAA;UAEKC,WAAAA;QACT,CAAA,CAAA;AACD,eAAA,iBAAA,MAAA;MACH,CAAA;IAGF;EAEA,CAAA,CAAA;AACCZ,QAAK1B,QAAOuC,QAAS,QAAA,QAAA;AAE1B,SAAA,cAAA,KAAA,SAAA,KAAA;;AAMS1B,IAAAA,QAAAA,CAAAA,UAAiB2B;AACxB,QAAA,QAAA,SAAA,QAAA,OAAA,UAAA,YAAA,WAAA,QAAA,MAAA,QAAA;AAEF,SAAA,iBAAA,SAAA,MAAA,QAAA,SAAA,KAAA;;IAWI,sBAAuBC,CAAAA,YAAczB,WAAQD,aAAaE;AAC1D,QAAIyB,eAAiB,QAAA,SAAS,QAAA,SAAA;QAC5B,UAAOA,OAAQC,cAAK,QAAA,KAAA,QAAA,MAAA,QAAA,MAAA,EAAA,KAAA,aAAA;AACtB,MAAA,QAAA,SAAA,SAAA;AACIC,WAAMF,QAAQG;;MAEhB,MAAIC,QAASC,IAAI,GAAA;UACf,WAAOD,OAASH,cAAK,QAAA,KAAA,cAAA,QAAA,MAAA,EAAA,KAAA,aAAA;AACvB,QAAA,SAAA,SAAA,SAAA;AACA,aAAO,SAAO3C;;WAGViB,OAAM+B,YAAAA,IAAAA,mBAAAA;MACN3C,KAAAA,QAAU;MACZ,MAAA;MAEJ,SAAA,yBAAA,YAAA,wBAAA,YAAA,SAAA,IAAA,CAAA;IACA,CAAA,CAAA;;SAGIY,OAAcA,YAAI,IAAA,mBAAA;IAClBZ,KAAAA,QAAU;IACZ,MAAA,QAAA;IAEJ,SAAA,yBAAA,QAAA,IAAA,KAAA,YAAA,QAAA,IAAA,CAAA;EAEIoC,CAAAA,CAAAA;;oBAGIQ,CAAAA,KAAYC,MAAAA,WAAqBjC,kBAAMkC,MAAAA;AAC7C,QAAA,SAAcC,IAAAA,OAAQH,WAAe;AACvC,QAAA,YAAA,gBAAA,KAAA,MAAA,MAAA;AAEF,SAAA,OAAA,QAAA,SAAA,EAAA,KAAA,MAAA,MAAA;;AAME,IAAII,cAAAA,CAAiBb,UAAO;QAC1B,QAAOa,SAAMhD,QAAO,OAAA,UAAA,YAAA,WAAA,QAAA,MAAA,QAAA;AACtB,MAAA,iBAAA,OAAA;AACIN,WAAMuD,MAAO;;AAEjB,MAAA,cAAA,KAAA,GAAA;AACA,WAAcD,aAAAA,KAAAA;EAChB;AAEA,SAAA,OAAA,KAAA;;AASE,IAAME,kBAAuCJ,CAAAA,KAAS,MAAA,WAAA;QAAEK,SAAS,IAAA,IAAA,GAAA;sBAAEC,SAAgB;IAAkB,SAAA;MAAMC,eAAAA,UAAAA,MAAAA;IAC3G;MACE;gBACE;;AAAoD,aAAA,IAAA,mBAAA,QAAA;QACjD;MACH,CAAA;;AAA+D,aAAA,IAAA,8BAAA,QAAA;QACjE;MAAS,CAAA;;AAGT,YAAA,cAAA;AACF,aAAA,UAAA,OAAA,mCAAA,WAAA,IAAA,EAAA,YAAA,YAAA,GAAA,cAAA,GAAA,KAAA,GAAA,QAAA,GAAA,CAAA,SAAA,kDAAA,EAAA,CAAA;IACF;EAEA;;;IAUI,mBAAqB,CAACC,WAAOC;AAC/B,MAAA,gBAAA,UAAA,OAAA,eAAA,QAAA;AACI,WAAA,KAAA,UAAaD,OAAgBE,UAAQF;;AAKzC,MAAA,aAAA,UAAA,MAAA,QAAA,OAAA,OAAA,GAAA;AAEA,WAAO7B,OAAO6B,QAAAA,OAAAA,CAAAA,SAAAA,KAAAA,SAAAA,MAAAA,EAAAA,IAAAA,CAAAA,SAAAA,KAAAA,IAAAA,EAAAA,KAAAA,IAAAA;EAChB;;;",
6
+ "names": ["make", "Tool", "Toolkit", "Client", "SSEClientTransport", "StreamableHTTPClientTransport", "Cause", "Effect", "Schema", "OpaqueToolkit", "invariant", "Literal", "message", "version", "tools", "tryPromise", "try", "client", "listTools", "catch", "cause", "McpConnectionError", "url", "options", "kind", "effectTools", "key", "value", "Object", "entries", "inputSchema", "parameters", "Unknown", "pipe", "annotations", "jsonSchema", "success", "String", "failure", "sanitizeToolName", "mcpTool", "toolName", "name", "arguments", "args", "formatToolResult", "withSpan", "Error", "connectClient", "primary", "right", "is405", "left", "fallback", "_tag", "fallbackKind", "transport", "createTransport", "apiKey", "connect", "inner", "isCause", "requestInit", "headers", "Authorization", "undefined", "result", "toolResult", "isArray"]
7
7
  }
@@ -1 +1 @@
1
- {"inputs":{"src/McpToolkit.ts":{"bytes":14456,"imports":[{"path":"@effect/ai/Tool","kind":"import-statement","external":true},{"path":"@effect/ai/Toolkit","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/index.js","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/sse.js","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/streamableHttp.js","kind":"import-statement","external":true},{"path":"effect/Effect","kind":"import-statement","external":true},{"path":"effect/Schema","kind":"import-statement","external":true},{"path":"@dxos/ai","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":527,"imports":[{"path":"src/McpToolkit.ts","kind":"import-statement","original":"./McpToolkit"}],"format":"esm"}},"outputs":{"dist/lib/neutral/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":7340},"dist/lib/neutral/index.mjs":{"imports":[{"path":"@effect/ai/Tool","kind":"import-statement","external":true},{"path":"@effect/ai/Toolkit","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/index.js","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/sse.js","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/streamableHttp.js","kind":"import-statement","external":true},{"path":"effect/Effect","kind":"import-statement","external":true},{"path":"effect/Schema","kind":"import-statement","external":true},{"path":"@dxos/ai","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true}],"exports":["McpToolkit"],"entryPoint":"src/index.ts","inputs":{"src/McpToolkit.ts":{"bytesInOutput":3270},"src/index.ts":{"bytesInOutput":0}},"bytes":3541}}}
1
+ {"inputs":{"src/McpToolkit.ts":{"bytes":25295,"imports":[{"path":"@effect/ai/Tool","kind":"import-statement","external":true},{"path":"@effect/ai/Toolkit","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/index.js","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/sse.js","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/streamableHttp.js","kind":"import-statement","external":true},{"path":"effect/Cause","kind":"import-statement","external":true},{"path":"effect/Effect","kind":"import-statement","external":true},{"path":"effect/Schema","kind":"import-statement","external":true},{"path":"@dxos/ai","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":452,"imports":[{"path":"src/McpToolkit.ts","kind":"import-statement","original":"./McpToolkit"}],"format":"esm"}},"outputs":{"dist/lib/neutral/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":11776},"dist/lib/neutral/index.mjs":{"imports":[{"path":"@effect/ai/Tool","kind":"import-statement","external":true},{"path":"@effect/ai/Toolkit","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/index.js","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/sse.js","kind":"import-statement","external":true},{"path":"@modelcontextprotocol/sdk/client/streamableHttp.js","kind":"import-statement","external":true},{"path":"effect/Cause","kind":"import-statement","external":true},{"path":"effect/Effect","kind":"import-statement","external":true},{"path":"effect/Schema","kind":"import-statement","external":true},{"path":"@dxos/ai","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true}],"exports":["McpToolkit"],"entryPoint":"src/index.ts","inputs":{"src/McpToolkit.ts":{"bytesInOutput":5440},"src/index.ts":{"bytesInOutput":0}},"bytes":5711}}}
@@ -1,14 +1,29 @@
1
1
  import * as Effect from 'effect/Effect';
2
- import { GenericToolkit } from '@dxos/ai';
2
+ import * as Schema from 'effect/Schema';
3
+ import { OpaqueToolkit } from '@dxos/ai';
3
4
  export interface McpToolkitOptions {
4
5
  url: string;
5
6
  kind: 'sse' | 'http';
7
+ apiKey?: string;
6
8
  }
9
+ declare const McpConnectionError_base: Schema.TaggedErrorClass<McpConnectionError, "McpConnectionError", {
10
+ readonly _tag: Schema.tag<"McpConnectionError">;
11
+ } & {
12
+ url: typeof Schema.String;
13
+ kind: Schema.Literal<["sse", "http"]>;
14
+ message: typeof Schema.String;
15
+ }>;
7
16
  /**
8
- * Creates a GenericToolkit that connects to an MCP server and exposes its tools to the assistant.
9
- *
10
- * @param options MCP server URL and transport kind ('sse' for SSE, 'http' for Streamable HTTP).
11
- * @returns A GenericToolkit containing all tools from the MCP server.
17
+ * Typed failure raised when the MCP client cannot connect or list tools.
18
+ * Carries the underlying cause and the server URL for diagnostics.
12
19
  */
13
- export declare const make: (options: McpToolkitOptions) => Effect.Effect<GenericToolkit.GenericToolkit>;
20
+ export declare class McpConnectionError extends McpConnectionError_base {
21
+ }
22
+ export declare const make: (options: McpToolkitOptions) => Effect.Effect<OpaqueToolkit.OpaqueToolkit, McpConnectionError>;
23
+ /**
24
+ * Returns true when the error (or its wrapped cause) contains a 405 status code.
25
+ * `Effect.tryPromise` wraps thrown errors in `UnknownException`, so we unwrap first.
26
+ */
27
+ export declare const is405: (error: unknown) => boolean;
28
+ export {};
14
29
  //# sourceMappingURL=McpToolkit.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"McpToolkit.d.ts","sourceRoot":"","sources":["../../../src/McpToolkit.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG1C,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,eAAO,MAAM,IAAI,GAAI,SAAS,iBAAiB,KAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,cAAc,CA6DhD,CAAC"}
1
+ {"version":3,"file":"McpToolkit.d.ts","sourceRoot":"","sources":["../../../src/McpToolkit.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;;;;;;;;AAED;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,uBAOvC;CAAG;AAUJ,eAAO,MAAM,IAAI,YAAa,iBAAiB,KAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,EAAE,kBAAkB,CA0DlE,CAAC;AAE9C;;;GAGG;AACH,eAAO,MAAM,KAAK,UAAW,OAAO,KAAG,OAGtC,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=is405.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"is405.test.d.ts","sourceRoot":"","sources":["../../../src/is405.test.ts"],"names":[],"mappings":""}