@opencode/core 2.0.3 → 2.0.5

package/dist/mcp/client.js

@@ -1,95 +1,97 @@
-import"../chunks/mime-2a5m3afh.js";
-import"../chunks/mime-1dazxqgg.js";
-import"../chunks/mime-b6gygkdw.js";
-import"../chunks/mime-aaet6srn.js";
-import"../chunks/mime-922hggd3.js";
-import"../chunks/mime-f0mxakyp.js";
-import"../chunks/mime-emrn6kk6.js";
-import"../chunks/mime-w3wsvvr9.js";
-import"../chunks/mime-7bmhse3q.js";
-import"../chunks/mime-cf4snx6d.js";
-import"../chunks/mime-822emrt2.js";
-import"../chunks/mime-wd87259q.js";
-import"../chunks/mime-m9w0rfyh.js";
-import"../chunks/mime-ex105f0g.js";
-import"../chunks/mime-6b2vme4h.js";
-import"../chunks/mime-2t5kqt1k.js";
-import"../chunks/mime-y6r7tp3a.js";
-import"../chunks/mime-95wcbadv.js";
-import"../chunks/mime-0zkw76rk.js";
-import"../chunks/mime-jzg6c2d5.js";
-import"../chunks/mime-q3sfg36h.js";
-import"../chunks/mime-1cnp2v09.js";
-import"../chunks/mime-rcb2kzg1.js";
-import"../chunks/mime-msx8hqn2.js";
-import"../chunks/mime-bkyjaxrp.js";
-import"../chunks/mime-g86h250q.js";
-import"../chunks/mime-jr7sbwjy.js";
-import"../chunks/mime-7m9af43g.js";
-import"../chunks/mime-j2ntwpah.js";
-import"../chunks/mime-njntx4h6.js";
-import"../chunks/mime-qrg20bc0.js";
-import"../chunks/mime-z9919s4g.js";
-import"../chunks/mime-43n2bw4t.js";
-import"../chunks/mime-n3j8tn72.js";
-import"../chunks/mime-d9jj8t3e.js";
-import"../chunks/mime-fd410y7t.js";
-import"../chunks/mime-e5kj55wp.js";
-import"../chunks/mime-f6n9ztr4.js";
-import"../chunks/mime-q74kybfr.js";
-import"../chunks/mime-53557ph1.js";
-import"../chunks/mime-7akdwqpd.js";
-import"../chunks/mime-wer8tq1h.js";
-import"../chunks/mime-wtztk69x.js";
-import"../chunks/mime-ssg3fenm.js";
-import"../chunks/mime-2c3vjs8z.js";
-import"../chunks/mime-17cy0kzp.js";
-import"../chunks/mime-hk9envan.js";
-import"../chunks/mime-w803qqfp.js";
-import"../chunks/mime-jwfs4k6c.js";
-import"../chunks/mime-mp448xyj.js";
-import"../chunks/mime-aqzs7mqg.js";
-import"../chunks/mime-ygaqb7jw.js";
-import"../chunks/mime-8n3pysct.js";
-import"../chunks/mime-d9fn303g.js";
-import"../chunks/mime-cvy3z8tj.js";
-import"../chunks/mime-9a4afbnw.js";
-import"../chunks/mime-n05xt0ee.js";
-import"../chunks/mime-sdp7kfr6.js";
-import"../chunks/mime-a6k6eb26.js";
-import"../chunks/mime-4knz6hnm.js";
-import"../chunks/mime-df08tz66.js";
-import"../chunks/mime-bmr6ed5q.js";
-import"../chunks/mime-atq7p7m5.js";
-import"../chunks/mime-qb87gjwd.js";
-import"../chunks/mime-359p4xyc.js";
-import"../chunks/mime-y8f7s663.js";
-import"../chunks/mime-s2azsgc2.js";
-import"../chunks/mime-twg0f83k.js";
-import"../chunks/mime-n0ta87th.js";
-import"../chunks/mime-bhp9fn5h.js";
-import"../chunks/mime-2710q6r3.js";
-import"../chunks/mime-y71avatq.js";
-import"../chunks/mime-3wjgak91.js";
-import"../chunks/mime-tazgh4e4.js";
-import"../chunks/mime-mr645x8e.js";
-import"../chunks/mime-rk0rec3h.js";
-import"../chunks/mime-6msgmcgs.js";
-import"../chunks/mime-qfa1cgps.js";
-import"../chunks/mime-8p4f9s12.js";
-import"../chunks/mime-cfpkc3c9.js";
-import"../chunks/mime-jg33m14x.js";
-import"../chunks/mime-bawj3v5d.js";
-import"../chunks/mime-rqcbxq1a.js";
-import"../chunks/mime-faypxj3z.js";
-import"../chunks/mime-31je9t57.js";
-import"../chunks/mime-3xz6hyac.js";
+import"../chunks/instruction-discovery-2a5m3afh.js";
+import"../chunks/instruction-discovery-1dazxqgg.js";
+import"../chunks/instruction-discovery-b6gygkdw.js";
+import"../chunks/instruction-discovery-aaet6srn.js";
+import"../chunks/instruction-discovery-922hggd3.js";
+import"../chunks/instruction-discovery-f0mxakyp.js";
+import"../chunks/instruction-discovery-emrn6kk6.js";
+import"../chunks/instruction-discovery-w3wsvvr9.js";
+import"../chunks/instruction-discovery-7bmhse3q.js";
+import"../chunks/instruction-discovery-cf4snx6d.js";
+import"../chunks/instruction-discovery-822emrt2.js";
+import"../chunks/instruction-discovery-wd87259q.js";
+import"../chunks/instruction-discovery-m9w0rfyh.js";
+import"../chunks/instruction-discovery-5rz2hsq0.js";
+import"../chunks/instruction-discovery-q581keqr.js";
+import"../chunks/instruction-discovery-wd3qynhg.js";
+import"../chunks/instruction-discovery-gq5rp1wh.js";
+import"../chunks/instruction-discovery-x83qg319.js";
+import"../chunks/instruction-discovery-0zkw76rk.js";
+import"../chunks/instruction-discovery-jzg6c2d5.js";
+import"../chunks/instruction-discovery-q3sfg36h.js";
+import"../chunks/instruction-discovery-1cnp2v09.js";
+import"../chunks/instruction-discovery-rcb2kzg1.js";
+import"../chunks/instruction-discovery-msx8hqn2.js";
+import"../chunks/instruction-discovery-bkyjaxrp.js";
+import"../chunks/instruction-discovery-g86h250q.js";
+import"../chunks/instruction-discovery-jr7sbwjy.js";
+import"../chunks/instruction-discovery-7m9af43g.js";
+import"../chunks/instruction-discovery-j2ntwpah.js";
+import"../chunks/instruction-discovery-njntx4h6.js";
+import"../chunks/instruction-discovery-qrg20bc0.js";
+import"../chunks/instruction-discovery-z9919s4g.js";
+import"../chunks/instruction-discovery-43n2bw4t.js";
+import"../chunks/instruction-discovery-n3j8tn72.js";
+import"../chunks/instruction-discovery-d9jj8t3e.js";
+import"../chunks/instruction-discovery-fd410y7t.js";
+import"../chunks/instruction-discovery-e5kj55wp.js";
+import"../chunks/instruction-discovery-f6n9ztr4.js";
+import"../chunks/instruction-discovery-q74kybfr.js";
+import"../chunks/instruction-discovery-53557ph1.js";
+import"../chunks/instruction-discovery-7akdwqpd.js";
+import"../chunks/instruction-discovery-wer8tq1h.js";
+import"../chunks/instruction-discovery-wtztk69x.js";
+import"../chunks/instruction-discovery-ssg3fenm.js";
+import"../chunks/instruction-discovery-2c3vjs8z.js";
+import"../chunks/instruction-discovery-17cy0kzp.js";
+import"../chunks/instruction-discovery-hk9envan.js";
+import"../chunks/instruction-discovery-w803qqfp.js";
+import"../chunks/instruction-discovery-jwfs4k6c.js";
+import"../chunks/instruction-discovery-mp448xyj.js";
+import"../chunks/instruction-discovery-aqzs7mqg.js";
+import"../chunks/instruction-discovery-ygaqb7jw.js";
+import"../chunks/instruction-discovery-8n3pysct.js";
+import"../chunks/instruction-discovery-d9fn303g.js";
+import"../chunks/instruction-discovery-cvy3z8tj.js";
+import"../chunks/instruction-discovery-9a4afbnw.js";
+import"../chunks/instruction-discovery-n05xt0ee.js";
+import"../chunks/instruction-discovery-sdp7kfr6.js";
+import"../chunks/instruction-discovery-a6k6eb26.js";
+import"../chunks/instruction-discovery-4knz6hnm.js";
+import"../chunks/instruction-discovery-df08tz66.js";
+import"../chunks/instruction-discovery-bmr6ed5q.js";
+import"../chunks/instruction-discovery-atq7p7m5.js";
+import"../chunks/instruction-discovery-qb87gjwd.js";
+import"../chunks/instruction-discovery-359p4xyc.js";
+import"../chunks/instruction-discovery-y8f7s663.js";
+import"../chunks/instruction-discovery-hnpkfvtv.js";
+import"../chunks/instruction-discovery-twg0f83k.js";
+import"../chunks/instruction-discovery-n81wkjqj.js";
+import"../chunks/instruction-discovery-wjck36vb.js";
+import"../chunks/instruction-discovery-2710q6r3.js";
+import"../chunks/instruction-discovery-dpkg50ah.js";
+import"../chunks/instruction-discovery-7kvy0jtg.js";
+import"../chunks/instruction-discovery-tazgh4e4.js";
+import"../chunks/instruction-discovery-qaymkmh1.js";
+import"../chunks/instruction-discovery-ef5x83kb.js";
+import"../chunks/instruction-discovery-df9eyrmy.js";
+import"../chunks/instruction-discovery-2w6fc0zt.js";
+import"../chunks/instruction-discovery-6msgmcgs.js";
+import"../chunks/instruction-discovery-qfa1cgps.js";
+import"../chunks/instruction-discovery-8p4f9s12.js";
+import"../chunks/instruction-discovery-cfpkc3c9.js";
+import"../chunks/instruction-discovery-jk6a9ave.js";
+import"../chunks/instruction-discovery-88dkmhka.js";
+import"../chunks/instruction-discovery-029er0hp.js";
+import"../chunks/instruction-discovery-faypxj3z.js";
+import"../chunks/instruction-discovery-x12gwff2.js";
+import"../chunks/instruction-discovery-cvnk88jx.js";
 import {
   make2
-} from "../chunks/mime-xcggh081.js";
+} from "../chunks/instruction-discovery-2jh18hkm.js";
 import {
   __export
-} from "../chunks/mime-9rqn6x4v.js";
+} from "../chunks/instruction-discovery-9rqn6x4v.js";
 
 // src/mcp/client.ts
 var exports_client = {};
@@ -97,40 +99,28 @@ __export(exports_client, {
   ConnectError: () => ConnectError,
   McpClient: () => exports_client,
   NeedsAuthError: () => NeedsAuthError,
+  SessionExpiredError: () => SessionExpiredError,
   connect: () => connect
 });
 import path from "node:path";
 import { pathToFileURL } from "node:url";
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { StreamableHTTPClientTransport, StreamableHTTPError } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
-import { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js";
 import {
-  CallToolResultSchema,
-  ElicitationCompleteNotificationSchema,
-  ElicitRequestSchema,
-  ListRootsRequestSchema,
-  ListToolsResultSchema,
-  PromptListChangedNotificationSchema,
-  ResourceListChangedNotificationSchema,
-  LoggingMessageNotificationSchema,
-  ToolListChangedNotificationSchema,
-  ToolSchema
-} from "@modelcontextprotocol/sdk/types.js";
+  Client,
+  SdkHttpError,
+  StreamableHTTPClientTransport,
+  UnauthorizedError,
+  UnsupportedProtocolVersionError
+} from "@modelcontextprotocol/client";
 import { Cause, Effect, Exit, Schema } from "effect";
 var DEFAULT_STARTUP_TIMEOUT = 30000;
 var DEFAULT_CATALOG_TIMEOUT = 30000;
 var DEFAULT_EXECUTION_TIMEOUT = 12 * 60 * 60 * 1000;
 var toError = (error) => error instanceof Error ? error : new Error(String(error));
-var TolerantListToolsResult = ListToolsResultSchema.extend({
-  tools: ToolSchema.omit({ outputSchema: true }).array()
-});
 
 class NeedsAuthError extends Schema.TaggedError()("MCP.NeedsAuthError", {
-  server: Schema.String
+  server: Schema.String,
+  message: Schema.String
 }) {
-  get message() {
-    return `MCP server requires authentication: ${this.server}`;
-  }
 }
 
 class ConnectError extends Schema.TaggedError()("MCP.ConnectError", {
@@ -138,18 +128,38 @@ class ConnectError extends Schema.TaggedError()("MCP.ConnectError", {
   message: Schema.String
 }) {
 }
+
+class SessionExpiredError extends Schema.TaggedError()("MCP.SessionExpiredError", {
+  server: Schema.String
+}) {
+  get message() {
+    return `MCP server session expired: ${this.server}`;
+  }
+}
 var connect = Effect.fnUntraced(function* (server, config, directory, authProvider, elicitation, clientInfo = { name: "opencode", version: "unknown" }) {
+  const changed = { tools: () => {}, prompts: () => {}, resources: () => {} };
+  const listChanged = (key) => ({
+    autoRefresh: false,
+    debounceMs: 0,
+    onChanged: () => changed[key]()
+  });
   const initialize = Effect.fnUntraced(function* (transport) {
     const client = new Client(clientInfo, {
       capabilities: {
         ...elicitation ? { elicitation: { form: { applyDefaults: true }, url: {} } } : {},
         roots: {}
+      },
+      versionNegotiation: negotiation(config.protocol),
+      listChanged: {
+        tools: listChanged("tools"),
+        prompts: listChanged("prompts"),
+        resources: listChanged("resources")
       }
     });
-    client.setRequestHandler(ListRootsRequestSchema, () => Promise.resolve({ roots: [{ uri: pathToFileURL(directory).href }] }));
+    client.setRequestHandler("roots/list", () => ({ roots: [{ uri: pathToFileURL(directory).href }] }));
     if (elicitation) {
-      client.setRequestHandler(ElicitRequestSchema, (request, extra) => Effect.runPromise(elicitation.create({ server, params: request.params, signal: extra.signal })));
-      client.setNotificationHandler(ElicitationCompleteNotificationSchema, (notification) => Effect.runPromise(elicitation.complete({ server, elicitationID: notification.params.elicitationId })));
+      client.setRequestHandler("elicitation/create", (request, ctx) => Effect.runPromise(elicitation.create({ server, params: request.params, signal: ctx.mcpReq.signal })));
+      client.setNotificationHandler("notifications/elicitation/complete", (notification) => Effect.runPromise(elicitation.complete({ server, elicitationID: notification.params.elicitationId })));
     }
     yield* Effect.tryPromise({
       try: (signal) => client.connect(transport, { timeout: config.timeout?.startup ?? DEFAULT_STARTUP_TIMEOUT, signal }),
@@ -157,6 +167,21 @@ var connect = Effect.fnUntraced(function* (server, config, directory, authProvid
     }).pipe(Effect.onError(() => Effect.promise(() => transport.close()).pipe(Effect.ignore)));
     return client;
   });
+  const session = {
+    reported: false
+  };
+  const failure = (error) => {
+    if (!(error instanceof SdkHttpError) || session.transport?.sessionId === undefined)
+      return toError(error);
+    const expired = error.status === 404 || error.status === 400 && typeof error.data.text === "string" && error.data.text.includes("Bad Request: Server not initialized");
+    if (!expired)
+      return toError(error);
+    if (!session.reported) {
+      session.reported = true;
+      session.expired?.();
+    }
+    return new SessionExpiredError({ server });
+  };
   const exit = yield* Effect.gen(function* () {
     if (config.type === "local") {
       const [command, ...args] = config.command;
@@ -180,13 +205,16 @@ var connect = Effect.fnUntraced(function* (server, config, directory, authProvid
     const addedCodemode = config.codemode !== false && !url.searchParams.has("codemode");
     if (addedCodemode)
       url.searchParams.set("codemode", "false");
-    const open = (url) => initialize(new StreamableHTTPClientTransport(url, {
-      requestInit: config.headers ? { headers: config.headers } : undefined,
-      authProvider,
-      fetch
-    }));
+    const open = (url) => {
+      session.transport = new StreamableHTTPClientTransport(url, {
+        requestInit: config.headers ? { headers: config.headers } : undefined,
+        authProvider,
+        fetch
+      });
+      return initialize(session.transport);
+    };
     return yield* open(url).pipe(Effect.catch((error) => {
-      if (!addedCodemode || !(error instanceof StreamableHTTPError) || error.code !== 400 && error.code !== 404)
+      if (!addedCodemode || !(error instanceof SdkHttpError) || error.status !== 400 && error.status !== 404)
         return Effect.fail(error);
       return open(new URL(config.url));
     }));
@@ -194,174 +222,88 @@ var connect = Effect.fnUntraced(function* (server, config, directory, authProvid
   if (Exit.isSuccess(exit)) {
     const client = exit.value;
     yield* Effect.addFinalizer(() => Effect.promise(() => client.close()).pipe(Effect.ignore));
-    const catalogTimeout = config.timeout?.catalog ?? DEFAULT_CATALOG_TIMEOUT;
-    const executionTimeout = config.timeout?.execution ?? DEFAULT_EXECUTION_TIMEOUT;
+    const catalog = { timeout: config.timeout?.catalog ?? DEFAULT_CATALOG_TIMEOUT };
+    const execution = config.timeout?.execution ?? DEFAULT_EXECUTION_TIMEOUT;
+    const request = (what, run) => Effect.tryPromise({ try: run, catch: failure }).pipe(Effect.tapError((error) => Effect.logWarning(`failed to ${what}`, { server, error: error.message })));
     return {
+      modern: client.getProtocolEra() === "modern",
       instructions: client.getInstructions()?.trim() || undefined,
-      tools: () => Effect.gen(function* () {
-        if (!client.getServerCapabilities()?.tools)
-          return [];
-        const tools = yield* Effect.tryPromise({
-          try: () => paginate(async (cursor) => {
-            const params = cursor === undefined ? undefined : { cursor };
-            try {
-              return await client.listTools(params, { timeout: catalogTimeout });
-            } catch (error) {
-              if (!(error instanceof Error) || !isOutputSchemaError(error))
-                throw error;
-              return client.request({ method: "tools/list", params }, TolerantListToolsResult, {
-                timeout: catalogTimeout
-              });
-            }
-          }, (result) => result.tools),
-          catch: toError
-        }).pipe(Effect.tapError((error) => Effect.logWarning("failed to list MCP tools", { server, error: error.message })));
-        return tools.map((tool) => ({
-          name: tool.name,
-          description: tool.description,
-          inputSchema: tool.inputSchema,
-          outputSchema: "outputSchema" in tool ? tool.outputSchema : undefined
-        }));
-      }),
-      prompts: () => Effect.gen(function* () {
-        if (!client.getServerCapabilities()?.prompts)
-          return [];
-        const prompts = yield* Effect.tryPromise({
-          try: () => paginate((cursor) => client.listPrompts(cursor === undefined ? undefined : { cursor }, { timeout: catalogTimeout }), (result) => result.prompts),
-          catch: toError
-        }).pipe(Effect.tapError((error) => Effect.logWarning("failed to list MCP prompts", { server, error: error.message })));
-        return prompts.map((prompt) => ({
-          name: prompt.name,
-          description: prompt.description,
-          arguments: prompt.arguments?.map((argument) => ({
-            name: argument.name,
-            description: argument.description,
-            required: argument.required
-          }))
-        }));
-      }),
-      resources: () => Effect.gen(function* () {
-        if (!client.getServerCapabilities()?.resources)
-          return [];
-        const resources = yield* Effect.tryPromise({
-          try: () => paginate((cursor) => client.listResources(cursor === undefined ? undefined : { cursor }, { timeout: catalogTimeout }), (result) => result.resources),
-          catch: toError
-        }).pipe(Effect.tapError((error) => Effect.logWarning("failed to list MCP resources", { server, error: error.message })));
-        return resources.map((resource) => ({
-          name: resource.name,
-          uri: resource.uri,
-          description: resource.description,
-          mimeType: resource.mimeType
-        }));
-      }),
-      resourceTemplates: () => Effect.gen(function* () {
+      tools: () => request("list MCP tools", () => client.listTools(undefined, catalog)).pipe(Effect.map((r) => r.tools)),
+      prompts: () => request("list MCP prompts", () => client.listPrompts(undefined, catalog)).pipe(Effect.map((r) => r.prompts)),
+      resources: () => request("list MCP resources", () => client.listResources(undefined, catalog)).pipe(Effect.map((r) => r.resources)),
+      resourceTemplates: () => request("list MCP resource templates", () => client.listResourceTemplates(undefined, catalog)).pipe(Effect.map((r) => r.resourceTemplates)),
+      readResource: (input) => {
         if (!client.getServerCapabilities()?.resources)
-          return [];
-        const templates = yield* Effect.tryPromise({
-          try: () => paginate((cursor) => client.listResourceTemplates(cursor === undefined ? undefined : { cursor }, {
-            timeout: catalogTimeout
-          }), (result) => result.resourceTemplates),
-          catch: toError
-        }).pipe(Effect.tapError((error) => Effect.logWarning("failed to list MCP resource templates", { server, error: error.message })));
-        return templates.map((template) => ({
-          name: template.name,
-          uriTemplate: template.uriTemplate,
-          description: template.description,
-          mimeType: template.mimeType
-        }));
-      }),
-      readResource: (input) => Effect.gen(function* () {
-        if (!client.getServerCapabilities()?.resources)
-          return;
-        const result = yield* Effect.tryPromise({
-          try: (signal) => client.readResource({ uri: input.uri }, { signal, timeout: executionTimeout }),
-          catch: toError
-        }).pipe(Effect.tapError((error) => Effect.logWarning("failed to read MCP resource", { server, uri: input.uri, error: error.message })));
-        return {
-          contents: result.contents.map((part) => ("text" in part) ? { type: "text", uri: part.uri, text: part.text, mimeType: part.mimeType } : { type: "blob", uri: part.uri, blob: part.blob, mimeType: part.mimeType })
-        };
-      }),
-      prompt: (input) => Effect.tryPromise({
-        try: (signal) => client.getPrompt({ name: input.name, arguments: input.args ?? {} }, { signal, timeout: executionTimeout }),
-        catch: toError
-      }).pipe(Effect.map((result) => ({
-        messages: result.messages.map((message) => ({ role: message.role, content: message.content }))
-      }))),
-      callTool: (input) => Effect.tryPromise({
-        try: (signal) => client.callTool({
-          name: input.name,
-          arguments: input.args ?? {},
-          ...input.sessionID === undefined ? {} : { _meta: { sessionID: input.sessionID } }
-        }, CallToolResultSchema, { signal, timeout: executionTimeout, onprogress: () => {} }),
-        catch: toError
-      }).pipe(Effect.map((result) => ({
-        isError: result.isError === true,
-        structured: result.structuredContent,
-        content: result.content.flatMap((part) => {
-          if (part.type === "text")
-            return [{ type: "text", text: part.text }];
-          if (part.type === "image" || part.type === "audio")
-            return [{ type: "media", data: part.data, mimeType: part.mimeType }];
-          if (part.type === "resource_link")
-            return [{ type: "text", text: part.uri }];
-          if (part.type === "resource") {
-            const resource = part.resource;
-            if ("text" in resource && typeof resource.text === "string")
-              return [{ type: "text", text: resource.text }];
-            if ("blob" in resource && typeof resource.blob === "string" && typeof resource.mimeType === "string")
-              return [{ type: "media", data: resource.blob, mimeType: resource.mimeType }];
-            return [{ type: "text", text: resource.uri }];
-          }
-          return [];
-        })
-      }))),
+          return Effect.succeed(undefined);
+        return request("read MCP resource", (signal) => client.readResource({ uri: input.uri }, { signal, timeout: execution }));
+      },
+      prompt: (input) => request("get MCP prompt", (signal) => client.getPrompt({ name: input.name, arguments: input.args ?? {} }, { signal, timeout: execution })),
+      callTool: (input) => request("call MCP tool", (signal) => client.callTool({
+        name: input.name,
+        arguments: input.args ?? {},
+        ...input.sessionID === undefined ? {} : { _meta: { "ai.opencode/sessionID": input.sessionID } }
+      }, { signal, timeout: execution, onprogress: () => {} })).pipe(Effect.map(toCallToolResult)),
       onClose: (callback) => {
         client.onclose = callback;
       },
-      onLog: (callback) => {
-        client.setNotificationHandler(LoggingMessageNotificationSchema, (notification) => callback(notification.params));
+      onSessionExpired: (callback) => {
+        session.expired = callback;
       },
       onToolsChanged: (callback) => {
-        if (!client.getServerCapabilities()?.tools?.listChanged)
-          return;
-        client.setNotificationHandler(ToolListChangedNotificationSchema, async () => callback());
+        changed.tools = callback;
       },
       onPromptsChanged: (callback) => {
-        if (!client.getServerCapabilities()?.prompts?.listChanged)
-          return;
-        client.setNotificationHandler(PromptListChangedNotificationSchema, async () => callback());
+        changed.prompts = callback;
       },
       onResourcesChanged: (callback) => {
-        if (!client.getServerCapabilities()?.resources?.listChanged)
-          return;
-        client.setNotificationHandler(ResourceListChangedNotificationSchema, async () => callback());
+        changed.resources = callback;
       }
     };
   }
   const error = Cause.squash(exit.cause);
   if (error instanceof UnauthorizedError)
-    return yield* new NeedsAuthError({ server });
+    return yield* new NeedsAuthError({ server, message: error.message });
+  if (error instanceof UnsupportedProtocolVersionError)
+    return yield* new ConnectError({
+      server,
+      message: `${error.message}; the server supports ${error.supported.join(", ")}. Set "protocol" for this server to one of those or to "legacy".`
+    });
   return yield* new ConnectError({ server, message: error instanceof Error ? error.message : String(error) });
 });
-async function paginate(list, items) {
-  const collected = [];
-  const seen = new Set;
-  let cursor;
-  while (true) {
-    const result = await list(cursor);
-    collected.push(...items(result));
-    if (result.nextCursor === undefined)
-      return collected;
-    if (seen.has(result.nextCursor))
-      throw new Error(`MCP list returned duplicate cursor: ${result.nextCursor}`);
-    seen.add(result.nextCursor);
-    cursor = result.nextCursor;
-  }
+function negotiation(protocol) {
+  if (protocol === undefined || protocol === "legacy")
+    return;
+  if (protocol === "auto")
+    return { mode: "auto" };
+  return { mode: { pin: protocol } };
+}
+function toCallToolResult(result) {
+  return {
+    isError: result.isError === true,
+    structured: result.structuredContent,
+    content: result.content.flatMap((part) => {
+      if (part.type === "text")
+        return [{ type: "text", text: part.text }];
+      if (part.type === "image" || part.type === "audio")
+        return [{ type: "media", data: part.data, mimeType: part.mimeType }];
+      if (part.type === "resource_link")
+        return [{ type: "text", text: part.uri }];
+      if (part.type === "resource") {
+        const resource = part.resource;
+        if ("text" in resource && typeof resource.text === "string")
+          return [{ type: "text", text: resource.text }];
+        if ("blob" in resource && typeof resource.blob === "string" && typeof resource.mimeType === "string")
+          return [{ type: "media", data: resource.blob, mimeType: resource.mimeType }];
+        return [{ type: "text", text: resource.uri }];
+      }
+      return [];
+    })
+  };
 }
-var isOutputSchemaError = (error) => /can't resolve reference|resolves to more than one schema|outputSchema|schema.*reference|reference.*schema/i.test(error.message);
 export {
   ConnectError,
   exports_client as McpClient,
   NeedsAuthError,
+  SessionExpiredError,
   connect
 };