@dxos/mcp-client 0.8.4-main.6fa680abb7 → 0.8.4-main.765dc60934

package/LICENSE

@@ -1,8 +1,105 @@
-MIT License 
-Copyright (c) 2022 DXOS
+# Functional Source License, Version 1.1, ALv2 Future License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+## Abbreviation
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+FSL-1.1-Apache-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## Notice
+
+Copyright 2026 DXOS
+
+## Terms and Conditions
+
+### Licensor ("We")
+
+The party offering the Software under these Terms and Conditions.
+
+### The Software
+
+The "Software" is each version of the software that we make available under
+these Terms and Conditions, as indicated by our inclusion of these Terms and
+Conditions with the Software.
+
+### License Grant
+
+Subject to your compliance with this License Grant and the Patents,
+Redistribution and Trademark clauses below, we hereby grant you the right to
+use, copy, modify, create derivative works, publicly perform, publicly display
+and redistribute the Software for any Permitted Purpose identified below.
+
+### Permitted Purpose
+
+A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
+means making the Software available to others in a commercial product or
+service that:
+
+1. substitutes for the Software;
+
+2. substitutes for any other product or service we offer using the Software
+   that exists as of the date we make the Software available; or
+
+3. offers the same or substantially similar functionality as the Software.
+
+Permitted Purposes specifically include using the Software:
+
+1. for your internal use and access;
+
+2. for non-commercial education;
+
+3. for non-commercial research; and
+
+4. in connection with professional services that you provide to a licensee
+   using the Software in accordance with these Terms and Conditions.
+
+### Patents
+
+To the extent your use for a Permitted Purpose would necessarily infringe our
+patents, the license grant above includes a license under our patents. If you
+make a claim against any party that the Software infringes or contributes to
+the infringement of any patent, then your patent license to the Software ends
+immediately.
+
+### Redistribution
+
+The Terms and Conditions apply to all copies, modifications and derivatives of
+the Software.
+
+If you redistribute any copies, modifications or derivatives of the Software,
+you must include a copy of or a link to these Terms and Conditions and not
+remove any copyright notices provided in or with the Software.
+
+### Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+
+IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
+SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
+EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+
+### Trademarks
+
+Except for displaying the License Details and identifying us as the origin of
+the Software, you have no right under these Terms and Conditions to use our
+trademarks, trade names, service marks or product names.
+
+## Grant of Future License
+
+We hereby irrevocably grant you an additional license to use the Software under
+the Apache License, Version 2.0 that is effective on the second anniversary of
+the date we make the Software available. On or after that date, you may use the
+Software under the Apache License, Version 2.0, in which case the following
+will apply:
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.

package/README.md

@@ -18,4 +18,4 @@ pnpm i @dxos/mcp-client
 
 Your ideas, issues, and code are most welcome. Please take a look at our [community code of conduct](https://github.com/dxos/dxos/blob/main/CODE_OF_CONDUCT.md), the [issue guide](https://github.com/dxos/dxos/blob/main/CONTRIBUTING.md#submitting-issues), and the [PR contribution guide](https://github.com/dxos/dxos/blob/main/CONTRIBUTING.md#submitting-prs).
 
-License: [MIT](./LICENSE) Copyright 2022 © DXOS
+License: [FSL-1.1-Apache-2.0](./LICENSE) Copyright 2022 © DXOS

package/dist/lib/neutral/index.mjs

@@ -7,6 +7,8 @@ var __export = (target, all) => {
 // src/McpToolkit.ts
 var McpToolkit_exports = {};
 __export(McpToolkit_exports, {
+  McpConnectionError: () => McpConnectionError,
+  is405: () => is405,
   make: () => make3
 });
 import * as Tool from "@effect/ai/Tool";
@@ -14,21 +16,34 @@ import * as Toolkit from "@effect/ai/Toolkit";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import * as Cause from "effect/Cause";
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
-import { GenericToolkit } from "@dxos/ai";
+import { OpaqueToolkit } from "@dxos/ai";
 import { invariant } from "@dxos/invariant";
-var __dxlog_file = "/__w/dxos/dxos/packages/core/mcp-client/src/McpToolkit.ts";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/compute/mcp-client/src/McpToolkit.ts";
+var McpConnectionError = class extends Schema.TaggedError("McpConnectionError")("McpConnectionError", {
+  url: Schema.String,
+  protocol: Schema.Literal("sse", "http"),
+  message: Schema.String
+}) {
+};
+var CLIENT_INFO = {
+  name: "@dxos/mcp-client",
+  version: "0.8.3"
+};
 var make3 = (options) => Effect.gen(function* () {
-  const transport = createTransport(options.url, options.kind);
-  const client = new Client({
-    name: "@dxos/mcp-client",
-    version: "0.8.3"
+  const { client, protocol } = yield* connectWithFallback(options);
+  const { tools } = yield* Effect.tryPromise({
+    try: () => client.listTools(),
+    catch: (cause) => new McpConnectionError({
+      url: options.url,
+      protocol,
+      message: `Failed to list MCP tools: ${formatCause(cause)}`
+    })
   });
-  yield* Effect.promise(() => client.connect(transport));
-  const { tools } = yield* Effect.promise(() => client.listTools());
   if (tools.length === 0) {
-    return GenericToolkit.empty;
+    return OpaqueToolkit.empty;
   }
   const effectTools = tools.map((mcpTool) => {
     const parameters = {};
@@ -65,26 +80,75 @@ var make3 = (options) => Effect.gen(function* () {
     ];
   }));
   const layer = toolkit.toLayer(handlers);
-  return GenericToolkit.make(toolkit, layer);
+  return OpaqueToolkit.make(toolkit, layer);
 }).pipe(Effect.withSpan("McpToolkit.make"));
-var createTransport = (url, kind) => {
+var is405 = (error) => {
+  const cause = error != null && typeof error === "object" && "error" in error ? error.error : error;
+  return cause instanceof Error && cause.message.includes("405");
+};
+var connectWithFallback = (options) => Effect.gen(function* () {
+  const fallbackProtocol = options.protocol === "sse" ? "http" : "sse";
+  const primary = yield* connectClient(options.url, options.protocol, options.apiKey).pipe(Effect.either);
+  if (primary._tag === "Right") {
+    return {
+      client: primary.right,
+      protocol: options.protocol
+    };
+  }
+  if (is405(primary.left)) {
+    const fallback = yield* connectClient(options.url, fallbackProtocol, options.apiKey).pipe(Effect.either);
+    if (fallback._tag === "Right") {
+      return {
+        client: fallback.right,
+        protocol: fallbackProtocol
+      };
+    }
+    return yield* Effect.fail(new McpConnectionError({
+      url: options.url,
+      protocol: fallbackProtocol,
+      message: `Failed to connect via ${fallbackProtocol} after 405 fallback: ${formatCause(fallback.left)}`
+    }));
+  }
+  return yield* Effect.fail(new McpConnectionError({
+    url: options.url,
+    protocol: options.protocol,
+    message: `Failed to connect via ${options.protocol}: ${formatCause(primary.left)}`
+  }));
+});
+var connectClient = (url, protocol, apiKey) => Effect.tryPromise(() => {
+  const client = new Client(CLIENT_INFO);
+  const transport = createTransport(url, protocol, apiKey);
+  return client.connect(transport).then(() => client);
+});
+var formatCause = (error) => {
+  const inner = error != null && typeof error === "object" && "error" in error ? error.error : error;
+  if (inner instanceof Error) {
+    return inner.message;
+  }
+  if (Cause.isCause(error)) {
+    return Cause.pretty(error);
+  }
+  return String(inner);
+};
+var createTransport = (url, protocol, apiKey) => {
   const urlObj = new URL(url);
-  switch (kind) {
+  const requestInit = apiKey ? {
+    headers: {
+      Authorization: `Bearer ${apiKey}`
+    }
+  } : void 0;
+  switch (protocol) {
     case "sse":
-      return new SSEClientTransport(urlObj);
+      return new SSEClientTransport(urlObj, {
+        requestInit
+      });
     case "http":
-      return new StreamableHTTPClientTransport(urlObj);
-    default: {
-      const _exhaustive = kind;
-      return invariant(false, `Unsupported MCP transport kind: ${_exhaustive}`, {
-        F: __dxlog_file,
-        L: 107,
-        S: void 0,
-        A: [
-          "false",
-          "`Unsupported MCP transport kind: ${_exhaustive}`"
-        ]
+      return new StreamableHTTPClientTransport(urlObj, {
+        requestInit
       });
+    default: {
+      const _exhaustive = protocol;
+      return invariant(false, `Unsupported MCP transport protocol: ${_exhaustive}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 169, S: void 0, A: ["false", "`Unsupported MCP transport protocol: ${_exhaustive}`"] });
     }
   }
 };

package/dist/lib/neutral/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/McpToolkit.ts"],
-  "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 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"],
-  "mappings": "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",
-  "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"]
+  "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';\n// SSEClientTransport is marked @deprecated in the SDK in favor of StreamableHTTP, but the\n// SDK itself notes that clients should keep supporting both while servers migrate.\n// `connectWithFallback` below tries the configured protocol first, then the other on 405.\n// eslint-disable-next-line @typescript-eslint/no-deprecated\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\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    protocol: 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 protocol ('http' for Streamable HTTP, 'sse' for SSE).\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 interface McpToolkitOptions {\n  url: string;\n  protocol: 'sse' | 'http';\n  apiKey?: string;\n}\n\nexport const make = (options: McpToolkitOptions): Effect.Effect<OpaqueToolkit.OpaqueToolkit, McpConnectionError> =>\n  Effect.gen(function* () {\n    const { client, protocol } = 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          protocol,\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 = (\n  options: McpToolkitOptions,\n): Effect.Effect<{ client: Client; protocol: McpToolkitOptions['protocol'] }, McpConnectionError> =>\n  Effect.gen(function* () {\n    const fallbackProtocol = options.protocol === 'sse' ? 'http' : 'sse';\n    const primary = yield* connectClient(options.url, options.protocol, options.apiKey).pipe(Effect.either);\n    if (primary._tag === 'Right') {\n      return { client: primary.right, protocol: options.protocol };\n    }\n    if (is405(primary.left)) {\n      const fallback = yield* connectClient(options.url, fallbackProtocol, options.apiKey).pipe(Effect.either);\n      if (fallback._tag === 'Right') {\n        return { client: fallback.right, protocol: fallbackProtocol };\n      }\n      return yield* Effect.fail(\n        new McpConnectionError({\n          url: options.url,\n          protocol: fallbackProtocol,\n          message: `Failed to connect via ${fallbackProtocol} after 405 fallback: ${formatCause(fallback.left)}`,\n        }),\n      );\n    }\n    return yield* Effect.fail(\n      new McpConnectionError({\n        url: options.url,\n        protocol: options.protocol,\n        message: `Failed to connect via ${options.protocol}: ${formatCause(primary.left)}`,\n      }),\n    );\n  });\n\nconst connectClient = (url: string, protocol: McpToolkitOptions['protocol'], apiKey?: string) =>\n  Effect.tryPromise(() => {\n    const client = new Client(CLIENT_INFO);\n    const transport = createTransport(url, protocol, 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\n  return String(inner);\n};\n\n/**\n * Creates a transport for the given MCP server URL and protocol.\n */\nconst createTransport = (\n  url: string,\n  protocol: McpToolkitOptions['protocol'],\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 (protocol) {\n    case 'sse':\n      return new SSEClientTransport(urlObj, { requestInit });\n    case 'http':\n      return new StreamableHTTPClientTransport(urlObj, { requestInit });\n    default: {\n      const _exhaustive: never = protocol;\n      return invariant(false, `Unsupported MCP transport protocol: ${_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"],
+  "mappings": ";;;;;;;AAAA;;;;cAAAA;;AAMA,YAAYC,UAAU;AACtB,YAAYC,aAAa;AACzB,SAASC,cAAc;AAKvB,SAASC,0BAA0B;AACnC,SAASC,qCAAqC;AAC9C,YAAYC,WAAW;AACvB,YAAYC,YAAY;AACxB,YAAYC,YAAY;AAExB,SAASC,qBAAqB;AAC9B,SAASC,iBAAiB;AAE1B,IAAA,eAAA;AAQIC,IAAUH,qBAAVG,cAAgC,mBAAA,oBAAA,EAAA,sBAAA;EAChCC,KAASJ;EACX,UAAA,eAAA,OAAA,MAAA;EACC,SAAA;AAEH,CAAA,EAAA;;AAMgDK,IAAAA,cAAS;EAAQ,MAAA;EAQjE,SAAab;;IAITA,QAAQc,CAAK,YAAYP,WAAOQ,aAAW;QACzCC,EAAAA,QAAWC,SAAOC,IAAS,OAAA,oBAAA,OAAA;QAC3BC,EAAAA,MAAQC,IAAAA,OACFC,kBAAmB;eACrBC,OAAKC,UAAW;YAChBZ,UAAAA,IAAAA,mBAAAA;MACAC,KAAAA,QAAU;MACZ;MACJ,SAAA,6BAAA,YAAA,KAAA,CAAA;IACIE,CAAAA;;AAEJ,MAAA,MAAA,WAAA,GAAA;AAEA,WAAMU,cAAcV;;QAElB,cAAYW,MAAKC,IAAM,CAAIC,YAAOC;UAChC,aAAYC,CAAAA;eACVC,CAAAA,KAAAA,KAAWL,KAAOjB,OAAOuB,QAAQC,QAAKxB,YAAOyB,cAAY,CAAA,CAAA,GAAA;kBAAEC,YAAYR,UAAAA,SAAAA,GAAAA,GAAAA;AAAM,mBAAA,GAAA,IAAA,eAAA,KAAA,mBAAA;UACxE,YAAA;QACLI,CAAAA,CAAAA;;AAA6E,mBAAStB,GAAAA,IAAe,eAAA,KAAA,mBAAA;UACvG,YAAA;QACF,CAAA,CAAA,EAAA,KAAA,eAAA;MAEA;;WAEEsB,UAAAA,iBAAAA,QAAAA,IAAAA,GAAAA;MACAK,aAAS3B,QAAO4B,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;WACAjC;;2BAGYgC,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,QAAKzB,QAAOsC,QAAS,QAAA,QAAA;AAE1B,SAAA,cAAA,KAAA,SAAA,KAAA;;AAMSzB,IAAAA,QAAAA,CAAAA,UAAiB0B;AACxB,QAAA,QAAA,SAAA,QAAA,OAAA,UAAA,YAAA,WAAA,QAAA,MAAA,QAAA;AAEF,SAAA,iBAAA,SAAA,MAAA,QAAA,SAAA,KAAA;;IAaI,sBAAuBC,CAAAA,YAAcxB,WAAQD,aAAaX;AAC1D,QAAIqC,mBAAiB,QAAS,aAAA,QAAA,SAAA;QAC5B,UAAO,OAAA,cAAA,QAAA,KAAA,QAAA,UAAA,QAAA,MAAA,EAAA,KAAA,aAAA;cAAE/B,SAAQ+B,SAAa;WAAErC;MAA2B,QAAA,QAAA;MAC7D,UAAA,QAAA;IACIsC;;MAEF,MAAIC,QAASC,IAAI,GAAA;UACf,WAAO,OAAA,cAAA,QAAA,KAAA,kBAAA,QAAA,MAAA,EAAA,KAAA,aAAA;iBAAElC,SAAQiC,SAAc;aAAEvC;QAA2B,QAAA,SAAA;QAC9D,UAAA;MACA;;WAGIA,OAAUyC,YAAAA,IAAAA,mBAAAA;MACVxC,KAAAA,QAAU;MACZ,UAAA;MAEJ,SAAA,yBAAA,gBAAA,wBAAA,YAAA,SAAA,IAAA,CAAA;IACA,CAAA,CAAA;;SAGID,OAAUY,YAAQZ,IAAQ,mBAAA;IAC1BC,KAAAA,QAAU;IACZ,UAAA,QAAA;IAEJ,SAAA,yBAAA,QAAA,QAAA,KAAA,YAAA,QAAA,IAAA,CAAA;EAEImC,CAAAA,CAAAA;;oBAGIM,CAAAA,KAAYC,UAAAA,WAAqB3C,kBAAU4C,MAAAA;AACjD,QAAA,SAAcC,IAAAA,OAAQH,WAAe;AACvC,QAAA,YAAA,gBAAA,KAAA,UAAA,MAAA;AAEF,SAAA,OAAA,QAAA,SAAA,EAAA,KAAA,MAAA,MAAA;;AAME,IAAII,cAAAA,CAAiBX,UAAO;QAC1B,QAAOW,SAAM7C,QAAO,OAAA,UAAA,YAAA,WAAA,QAAA,MAAA,QAAA;AACtB,MAAA,iBAAA,OAAA;AACIN,WAAMoD,MAAO;;AAEjB,MAAA,cAAA,KAAA,GAAA;AAEA,WAAcD,aAAAA,KAAAA;EAChB;AAEA,SAAA,OAAA,KAAA;;AASE,IAAME,kBAAuCJ,CAAAA,KAAS,UAAA,WAAA;QAAEK,SAAS,IAAA,IAAA,GAAA;sBAAEC,SAAgB;IAAkB,SAAA;MAAMC,eAAAA,UAAAA,MAAAA;IAC3G;MACE;oBACS;;AAA6C,aAAA,IAAA,mBAAA,QAAA;QACjD;MACH,CAAA;;AAA+D,aAAA,IAAA,8BAAA,QAAA;QACjE;MAAS,CAAA;;AAGT,YAAA,cAAA;AACF,aAAA,UAAA,OAAA,uCAAA,WAAA,IAAA,EAAA,YAAA,YAAA,GAAA,cAAA,GAAA,KAAA,GAAA,QAAA,GAAA,CAAA,SAAA,sDAAA,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,WAAO3B,OAAO2B,QAAAA,OAAAA,CAAAA,SAAAA,KAAAA,SAAAA,MAAAA,EAAAA,IAAAA,CAAAA,SAAAA,KAAAA,IAAAA,EAAAA,KAAAA,IAAAA;EAChB;;;",
+  "names": ["make", "Tool", "Toolkit", "Client", "SSEClientTransport", "StreamableHTTPClientTransport", "Cause", "Effect", "Schema", "OpaqueToolkit", "invariant", "protocol", "message", "version", "tools", "tryPromise", "try", "client", "listTools", "catch", "cause", "McpConnectionError", "url", "options", "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", "is405", "fallback", "_tag", "fallbackProtocol", "transport", "createTransport", "apiKey", "connect", "inner", "isCause", "requestInit", "headers", "Authorization", "undefined", "result", "toolResult", "isArray"]
 }

package/dist/lib/neutral/meta.json

@@ -1 +1 @@
-{"inputs":{"src/McpToolkit.ts":{"bytes":14532,"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":7367},"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}}}
+{"inputs":{"src/McpToolkit.ts":{"bytes":26854,"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":12362},"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":5642},"src/index.ts":{"bytesInOutput":0}},"bytes":5913}}}

package/dist/types/src/McpToolkit.d.ts

@@ -1,14 +1,29 @@
 import * as Effect from 'effect/Effect';
-import { GenericToolkit } from '@dxos/ai';
+import * as Schema from 'effect/Schema';
+import { OpaqueToolkit } from '@dxos/ai';
+declare const McpConnectionError_base: Schema.TaggedErrorClass<McpConnectionError, "McpConnectionError", {
+    readonly _tag: Schema.tag<"McpConnectionError">;
+} & {
+    url: typeof Schema.String;
+    protocol: Schema.Literal<["sse", "http"]>;
+    message: typeof Schema.String;
+}>;
+/**
+ * Typed failure raised when the MCP client cannot connect or list tools.
+ * Carries the underlying cause and the server URL for diagnostics.
+ */
+export declare class McpConnectionError extends McpConnectionError_base {
+}
 export interface McpToolkitOptions {
     url: string;
-    kind: 'sse' | 'http';
+    protocol: 'sse' | 'http';
+    apiKey?: string;
 }
+export declare const make: (options: McpToolkitOptions) => Effect.Effect<OpaqueToolkit.OpaqueToolkit, McpConnectionError>;
 /**
- * Creates a GenericToolkit that connects to an MCP server and exposes its tools to the assistant.
- *
- * @param options MCP server URL and transport kind ('sse' for SSE, 'http' for Streamable HTTP).
- * @returns A GenericToolkit containing all tools from the MCP server.
+ * Returns true when the error (or its wrapped cause) contains a 405 status code.
+ * `Effect.tryPromise` wraps thrown errors in `UnknownException`, so we unwrap first.
  */
-export declare const make: (options: McpToolkitOptions) => Effect.Effect<GenericToolkit.GenericToolkit>;
+export declare const is405: (error: unknown) => boolean;
+export {};
 //# sourceMappingURL=McpToolkit.d.ts.map

package/dist/types/src/McpToolkit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpToolkit.d.ts","sourceRoot":"","sources":["../../../src/McpToolkit.ts"],"names":[],"mappings":"AAWA,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"}
+{"version":3,"file":"McpToolkit.d.ts","sourceRoot":"","sources":["../../../src/McpToolkit.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;;;;;;;;AAGzC;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,uBAOvC;CAAG;AAUJ,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,KAAK,GAAG,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,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"}

package/dist/types/src/is405.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=is405.test.d.ts.map

package/dist/types/src/is405.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"is405.test.d.ts","sourceRoot":"","sources":["../../../src/is405.test.ts"],"names":[],"mappings":""}