@opencode/core 2.0.3 → 2.0.4

package/dist/types/mcp/client.d.ts

@@ -1,13 +1,14 @@
 export * as McpClient from "./client.js";
-import { type OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
-import { type ElicitRequestFormParams, type ElicitRequestParams, type ElicitRequestURLParams, type ElicitResult, type LoggingMessageNotification } from "@modelcontextprotocol/sdk/types.js";
+import { type ElicitRequestFormParams, type ElicitRequestParams, type ElicitRequestURLParams, type ElicitResult, type GetPromptResult, type OAuthClientProvider, type Prompt, type ReadResourceResult, type Resource, type ResourceTemplateType, type Tool } from "@modelcontextprotocol/client";
 import { Cause, Effect, Schema } from "effect";
 import type { Session } from "@opencode/schema/session";
+export type { GetPromptResult, Prompt, ReadResourceResult, Resource, Tool };
+export type ResourceTemplate = ResourceTemplateType;
 declare const NeedsAuthError_base: Schema.Class<NeedsAuthError, Schema.TaggedStruct<"MCP.NeedsAuthError", {
     readonly server: Schema.String;
+    readonly message: Schema.String;
 }>, Cause.YieldableError>;
 export declare class NeedsAuthError extends NeedsAuthError_base {
-    get message(): string;
 }
 declare const ConnectError_base: Schema.Class<ConnectError, Schema.TaggedStruct<"MCP.ConnectError", {
     readonly server: Schema.String;
@@ -15,53 +16,12 @@ declare const ConnectError_base: Schema.Class<ConnectError, Schema.TaggedStruct<
 }>, Cause.YieldableError>;
 export declare class ConnectError extends ConnectError_base {
 }
-export interface ToolDefinition {
-    readonly name: string;
-    readonly description: string | undefined;
-    readonly inputSchema: unknown;
-    readonly outputSchema: unknown;
-}
-export interface PromptDefinition {
-    readonly name: string;
-    readonly description: string | undefined;
-    readonly arguments: ReadonlyArray<{
-        readonly name: string;
-        readonly description: string | undefined;
-        readonly required: boolean | undefined;
-    }> | undefined;
-}
-export interface PromptMessage {
-    readonly role: string;
-    readonly content: unknown;
-}
-export interface PromptResult {
-    readonly messages: ReadonlyArray<PromptMessage>;
-}
-export interface ResourceDefinition {
-    readonly name: string;
-    readonly uri: string;
-    readonly description: string | undefined;
-    readonly mimeType: string | undefined;
-}
-export interface ResourceTemplateDefinition {
-    readonly name: string;
-    readonly uriTemplate: string;
-    readonly description: string | undefined;
-    readonly mimeType: string | undefined;
-}
-export type ResourceContentPart = {
-    readonly type: "text";
-    readonly uri: string;
-    readonly text: string;
-    readonly mimeType: string | undefined;
-} | {
-    readonly type: "blob";
-    readonly uri: string;
-    readonly blob: string;
-    readonly mimeType: string | undefined;
-};
-export interface ReadResourceResult {
-    readonly contents: ReadonlyArray<ResourceContentPart>;
+declare const SessionExpiredError_base: Schema.Class<SessionExpiredError, Schema.TaggedStruct<"MCP.SessionExpiredError", {
+    readonly server: Schema.String;
+}>, Cause.YieldableError>;
+/** A legacy Streamable HTTP server no longer recognizes this connection's session; the lifecycle reconnects. */
+export declare class SessionExpiredError extends SessionExpiredError_base {
+    get message(): string;
 }
 export type CallToolContent = {
     readonly type: "text";
@@ -73,7 +33,7 @@ export type CallToolContent = {
 };
 export interface CallToolResult {
     readonly isError: boolean;
-    readonly structured: unknown;
+    readonly structured?: unknown;
     readonly content: ReadonlyArray<CallToolContent>;
 }
 export type ElicitationFormParams = ElicitRequestFormParams;
@@ -85,58 +45,48 @@ export interface ElicitationHandler {
         readonly params: ElicitationParams;
         readonly signal: AbortSignal;
     }) => Effect.Effect<ElicitationResult, Error>;
+    /**
+     * Legacy era only: the server announces that a URL-mode elicitation finished out of band. Removed in
+     * 2026-07-28, where the client learns the outcome by retrying, but legacy servers still send it and
+     * it lets the form settle without the user re-running the tool.
+     */
     readonly complete: (input: {
         readonly server: string;
         readonly elicitationID: ElicitRequestURLParams["elicitationId"];
     }) => Effect.Effect<void>;
 }
-export interface LogMessage {
-    readonly level: LoggingMessageNotification["params"]["level"];
-    readonly logger?: LoggingMessageNotification["params"]["logger"];
-    readonly data: LoggingMessageNotification["params"]["data"];
-}
 /** Handle over a connected MCP server that keeps the SDK `Client` out of the rest of core. */
 export interface Connection {
-    /** Server-supplied usage instructions from the initialize result, if any. */
+    /** True when the connection negotiated revision 2026-07-28 or later; false is the initialize handshake. */
+    readonly modern: boolean;
     readonly instructions: string | undefined;
-    /** Lists the server's tools; returns [] when the server doesn't advertise tool support, fails on a transport error. */
-    readonly tools: () => Effect.Effect<ToolDefinition[], Error>;
-    /** Lists the server's prompts; returns [] when the server doesn't advertise prompt support, fails on a transport error. */
-    readonly prompts: () => Effect.Effect<PromptDefinition[], Error>;
-    /** Lists the server's resources; returns [] when the server doesn't advertise resource support. */
-    readonly resources: () => Effect.Effect<ResourceDefinition[], Error>;
-    /** Lists the server's resource templates; returns [] when the server doesn't advertise resource support. */
-    readonly resourceTemplates: () => Effect.Effect<ResourceTemplateDefinition[], Error>;
-    /** Reads one resource; returns undefined when the server doesn't advertise resource support. */
+    readonly tools: () => Effect.Effect<Tool[], Error>;
+    readonly prompts: () => Effect.Effect<Prompt[], Error>;
+    readonly resources: () => Effect.Effect<Resource[], Error>;
+    readonly resourceTemplates: () => Effect.Effect<ResourceTemplateType[], Error>;
+    /** Resolves to undefined when the server does not advertise resources. */
     readonly readResource: (input: {
         readonly uri: string;
     }) => Effect.Effect<ReadResourceResult | undefined, Error>;
-    /** Invokes a prompt on the server. Interruption aborts the in-flight request. */
     readonly prompt: (input: {
         readonly name: string;
         readonly args?: Record<string, string>;
-    }) => Effect.Effect<PromptResult, Error>;
-    /** Invokes a tool on the server. Interruption aborts the in-flight request. */
+    }) => Effect.Effect<GetPromptResult, Error>;
     readonly callTool: (input: {
         readonly name: string;
         readonly args?: Record<string, unknown>;
         readonly sessionID?: Session.ID;
     }) => Effect.Effect<CallToolResult, Error>;
     readonly onClose: (callback: () => void) => void;
-    /** Registers a callback fired when the server emits an MCP logging notification. */
-    readonly onLog: (callback: (message: LogMessage) => void) => void;
-    /** Registers a callback fired when the server announces its tool list changed; no-op if unsupported. */
+    readonly onSessionExpired: (callback: () => void) => void;
     readonly onToolsChanged: (callback: () => void) => void;
-    /** Registers a callback fired when the server announces its prompt list changed; no-op if unsupported. */
     readonly onPromptsChanged: (callback: () => void) => void;
-    /** Registers a callback fired when the server announces its resource catalog changed. */
     readonly onResourcesChanged: (callback: () => void) => void;
 }
 /**
  * Connects an MCP server; closing the calling scope tears down the transport and any spawned process.
- *
- * A stdio server is spawned through the location's `Environment`, so it runs on the same execution
- * plane as the location's shell commands rather than always on the host.
+ * A stdio server is spawned through the location's `Environment`, so it runs wherever the location's
+ * shell commands run rather than always on the host.
  */
 export declare const connect: (server: string, config: import("@opencode/schema/mcp").LocalConfig | import("@opencode/schema/mcp").RemoteConfig, directory: string, authProvider?: OAuthClientProvider | undefined, elicitation?: ElicitationHandler | undefined, clientInfo?: {
     version: string;
@@ -151,48 +101,169 @@ export declare const connect: (server: string, config: import("@opencode/schema/
     }[] | undefined;
     title?: string | undefined;
 } | undefined) => Effect.Effect<{
+    modern: boolean;
     instructions: string | undefined;
     tools: () => Effect.Effect<{
-        name: string;
-        description: string | undefined;
         inputSchema: {
             [x: string]: unknown;
             type: "object";
-            properties?: Record<string, object> | undefined;
+            properties?: {
+                [x: string]: string | number | boolean | {
+                    [x: string]: string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | /*elided*/ any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null;
+                } | (string | number | boolean | {
+                    [x: string]: string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | /*elided*/ any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null;
+                } | (string | number | boolean | {
+                    [x: string]: string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | /*elided*/ any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null;
+                } | (string | number | boolean | {
+                    [x: string]: string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | /*elided*/ any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null;
+                } | (string | number | boolean | {
+                    [x: string]: string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | /*elided*/ any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null;
+                } | (string | number | boolean | {
+                    [x: string]: string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | /*elided*/ any | null)[] | null)[] | null)[] | null)[] | null)[] | null;
+                } | (string | number | boolean | {
+                    [x: string]: string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | /*elided*/ any | null)[] | null)[] | null)[] | null)[] | null;
+                } | (string | number | boolean | {
+                    [x: string]: string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | /*elided*/ any | null)[] | null)[] | null)[] | null;
+                } | (string | number | boolean | {
+                    [x: string]: string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | /*elided*/ any | null)[] | null)[] | null;
+                } | (string | number | boolean | {
+                    [x: string]: string | number | boolean | /*elided*/ any | (string | number | boolean | /*elided*/ any | /*elided*/ any | null)[] | null;
+                } | (string | number | boolean | {
+                    [x: string]: string | number | boolean | /*elided*/ any | /*elided*/ any | null;
+                } | /*elided*/ any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null;
+            } | undefined;
             required?: string[] | undefined;
         };
-        outputSchema: unknown;
-    }[], Error, never>;
+        name: string;
+        description?: string | undefined;
+        outputSchema?: {
+            [x: string]: unknown;
+            $schema?: string | undefined;
+        } | undefined;
+        annotations?: {
+            title?: string | undefined;
+            readOnlyHint?: boolean | undefined;
+            destructiveHint?: boolean | undefined;
+            idempotentHint?: boolean | undefined;
+            openWorldHint?: boolean | undefined;
+        } | undefined;
+        execution?: {
+            taskSupport?: "required" | "optional" | "forbidden" | undefined;
+        } | undefined;
+        _meta?: {
+            [x: string]: unknown;
+        } | undefined;
+        icons?: {
+            src: string;
+            mimeType?: string | undefined;
+            sizes?: string[] | undefined;
+            theme?: "light" | "dark" | undefined;
+        }[] | undefined;
+        title?: string | undefined;
+    }[], Error | SessionExpiredError, never>;
     prompts: () => Effect.Effect<{
         name: string;
-        description: string | undefined;
-        arguments: {
+        description?: string | undefined;
+        arguments?: {
             name: string;
-            description: string | undefined;
-            required: boolean | undefined;
+            description?: string | undefined;
+            required?: boolean | undefined;
+        }[] | undefined;
+        _meta?: {
+            [x: string]: unknown;
+        } | undefined;
+        icons?: {
+            src: string;
+            mimeType?: string | undefined;
+            sizes?: string[] | undefined;
+            theme?: "light" | "dark" | undefined;
         }[] | undefined;
-    }[], Error, never>;
+        title?: string | undefined;
+    }[], Error | SessionExpiredError, never>;
     resources: () => Effect.Effect<{
-        name: string;
         uri: string;
-        description: string | undefined;
-        mimeType: string | undefined;
-    }[], Error, never>;
-    resourceTemplates: () => Effect.Effect<{
         name: string;
+        description?: string | undefined;
+        mimeType?: string | undefined;
+        size?: number | undefined;
+        annotations?: {
+            audience?: ("user" | "assistant")[] | undefined;
+            priority?: number | undefined;
+            lastModified?: string | undefined;
+        } | undefined;
+        _meta?: {
+            [x: string]: unknown;
+        } | undefined;
+        icons?: {
+            src: string;
+            mimeType?: string | undefined;
+            sizes?: string[] | undefined;
+            theme?: "light" | "dark" | undefined;
+        }[] | undefined;
+        title?: string | undefined;
+    }[], Error | SessionExpiredError, never>;
+    resourceTemplates: () => Effect.Effect<{
         uriTemplate: string;
-        description: string | undefined;
-        mimeType: string | undefined;
-    }[], Error, never>;
+        name: string;
+        description?: string | undefined;
+        mimeType?: string | undefined;
+        annotations?: {
+            audience?: ("user" | "assistant")[] | undefined;
+            priority?: number | undefined;
+            lastModified?: string | undefined;
+        } | undefined;
+        _meta?: {
+            [x: string]: unknown;
+        } | undefined;
+        icons?: {
+            src: string;
+            mimeType?: string | undefined;
+            sizes?: string[] | undefined;
+            theme?: "light" | "dark" | undefined;
+        }[] | undefined;
+        title?: string | undefined;
+    }[], Error | SessionExpiredError, never>;
     readResource: (input: {
         readonly uri: string;
-    }) => Effect.Effect<{
-        contents: ResourceContentPart[];
-    } | undefined, Error, never>;
+    }) => Effect.Effect<undefined, never, never> | Effect.Effect<{
+        [x: string]: unknown;
+        contents: ({
+            uri: string;
+            text: string;
+            mimeType?: string | undefined;
+            _meta?: {
+                [x: string]: unknown;
+            } | undefined;
+        } | {
+            uri: string;
+            blob: string;
+            mimeType?: string | undefined;
+            _meta?: {
+                [x: string]: unknown;
+            } | undefined;
+        })[];
+        _meta?: {
+            [x: string]: unknown;
+            "io.modelcontextprotocol/serverInfo"?: {
+                version: string;
+                name: string;
+                websiteUrl?: string | undefined;
+                description?: string | undefined;
+                icons?: {
+                    src: string;
+                    mimeType?: string | undefined;
+                    sizes?: string[] | undefined;
+                    theme?: "light" | "dark" | undefined;
+                }[] | undefined;
+                title?: string | undefined;
+            } | undefined;
+        } | undefined;
+    }, Error | SessionExpiredError, never>;
     prompt: (input: {
         readonly name: string;
         readonly args?: Record<string, string>;
     }) => Effect.Effect<{
+        [x: string]: unknown;
         messages: {
             role: "user" | "assistant";
             content: {
@@ -203,7 +274,9 @@ export declare const connect: (server: string, config: import("@opencode/schema/
                     priority?: number | undefined;
                     lastModified?: string | undefined;
                 } | undefined;
-                _meta?: Record<string, unknown> | undefined;
+                _meta?: {
+                    [x: string]: unknown;
+                } | undefined;
             } | {
                 type: "image";
                 data: string;
@@ -213,7 +286,9 @@ export declare const connect: (server: string, config: import("@opencode/schema/
                     priority?: number | undefined;
                     lastModified?: string | undefined;
                 } | undefined;
-                _meta?: Record<string, unknown> | undefined;
+                _meta?: {
+                    [x: string]: unknown;
+                } | undefined;
             } | {
                 type: "audio";
                 data: string;
@@ -223,41 +298,65 @@ export declare const connect: (server: string, config: import("@opencode/schema/
                     priority?: number | undefined;
                     lastModified?: string | undefined;
                 } | undefined;
-                _meta?: Record<string, unknown> | undefined;
+                _meta?: {
+                    [x: string]: unknown;
+                } | undefined;
+            } | {
+                uri: string;
+                name: string;
+                type: "resource_link";
+                description?: string | undefined;
+                mimeType?: string | undefined;
+                size?: number | undefined;
+                annotations?: {
+                    audience?: ("user" | "assistant")[] | undefined;
+                    priority?: number | undefined;
+                    lastModified?: string | undefined;
+                } | undefined;
+                _meta?: {
+                    [x: string]: unknown;
+                } | undefined;
+                icons?: {
+                    src: string;
+                    mimeType?: string | undefined;
+                    sizes?: string[] | undefined;
+                    theme?: "light" | "dark" | undefined;
+                }[] | undefined;
+                title?: string | undefined;
             } | {
                 type: "resource";
                 resource: {
                     uri: string;
                     text: string;
                     mimeType?: string | undefined;
-                    _meta?: Record<string, unknown> | undefined;
+                    _meta?: {
+                        [x: string]: unknown;
+                    } | undefined;
                 } | {
                     uri: string;
                     blob: string;
                     mimeType?: string | undefined;
-                    _meta?: Record<string, unknown> | undefined;
+                    _meta?: {
+                        [x: string]: unknown;
+                    } | undefined;
                 };
                 annotations?: {
                     audience?: ("user" | "assistant")[] | undefined;
                     priority?: number | undefined;
                     lastModified?: string | undefined;
                 } | undefined;
-                _meta?: Record<string, unknown> | undefined;
-            } | {
-                uri: string;
-                name: string;
-                type: "resource_link";
-                description?: string | undefined;
-                mimeType?: string | undefined;
-                size?: number | undefined;
-                annotations?: {
-                    audience?: ("user" | "assistant")[] | undefined;
-                    priority?: number | undefined;
-                    lastModified?: string | undefined;
-                } | undefined;
                 _meta?: {
                     [x: string]: unknown;
                 } | undefined;
+            };
+        }[];
+        _meta?: {
+            [x: string]: unknown;
+            "io.modelcontextprotocol/serverInfo"?: {
+                version: string;
+                name: string;
+                websiteUrl?: string | undefined;
+                description?: string | undefined;
                 icons?: {
                     src: string;
                     mimeType?: string | undefined;
@@ -265,20 +364,17 @@ export declare const connect: (server: string, config: import("@opencode/schema/
                     theme?: "light" | "dark" | undefined;
                 }[] | undefined;
                 title?: string | undefined;
-            };
-        }[];
-    }, Error, never>;
+            } | undefined;
+        } | undefined;
+        description?: string | undefined;
+    }, Error | SessionExpiredError, never>;
     callTool: (input: {
         readonly name: string;
         readonly args?: Record<string, unknown>;
         readonly sessionID?: Session.ID;
-    }) => Effect.Effect<{
-        isError: boolean;
-        structured: Record<string, unknown> | undefined;
-        content: CallToolContent[];
-    }, Error, never>;
+    }) => Effect.Effect<CallToolResult, Error | SessionExpiredError, never>;
     onClose: (callback: () => void) => void;
-    onLog: (callback: (message: LogMessage) => void) => void;
+    onSessionExpired: (callback: () => void) => void;
     onToolsChanged: (callback: () => void) => void;
     onPromptsChanged: (callback: () => void) => void;
     onResourcesChanged: (callback: () => void) => void;

package/dist/types/mcp/index.d.ts

@@ -9,7 +9,9 @@ import { Form } from "../form.js";
 import { Integration } from "../integration.js";
 import { Location } from "../location.js";
 import { State } from "../state.js";
+import type { McpClient } from "./client.js";
 export declare const ServerName: Schema.brand<Schema.String, "MCP.ServerName">;
+export type ServerName = typeof ServerName.Type;
 export declare const PromptsChanged: Schema.Struct<{
     readonly id: Schema.brand<Schema.String, "Event.ID"> & {
         create: () => string & import("effect/Brand").Brand<"Event.ID">;
@@ -47,7 +49,6 @@ export declare const PromptsChanged: Schema.Struct<{
         readonly server: Schema.String;
     }>;
 };
-export type ServerName = typeof ServerName.Type;
 export declare const Status: Schema.toTaggedUnion<"status", readonly [Schema.Struct<{
     readonly status: Schema.Literal<"connected">;
 }>, Schema.Struct<{
@@ -59,95 +60,31 @@ export declare const Status: Schema.toTaggedUnion<"status", readonly [Schema.Str
     readonly error: Schema.String;
 }>, Schema.Struct<{
     readonly status: Schema.Literal<"needs_auth">;
+    readonly error: Schema.String;
 }>]>;
 export type Status = Mcp.Status;
-declare const ServerInfo_base: Schema.Class<ServerInfo, Schema.Struct<{
-    readonly name: Schema.brand<Schema.String, "MCP.ServerName">;
-    readonly status: Schema.toTaggedUnion<"status", readonly [Schema.Struct<{
-        readonly status: Schema.Literal<"connected">;
-    }>, Schema.Struct<{
-        readonly status: Schema.Literal<"pending">;
-    }>, Schema.Struct<{
-        readonly status: Schema.Literal<"disabled">;
-    }>, Schema.Struct<{
-        readonly status: Schema.Literal<"failed">;
-        readonly error: Schema.String;
-    }>, Schema.Struct<{
-        readonly status: Schema.Literal<"needs_auth">;
-    }>]>;
-    readonly integrationID: Schema.optional<Schema.brand<Schema.String, "Integration.ID">>;
-}>, {}>;
-export declare class ServerInfo extends ServerInfo_base {
-}
-declare const ServerInstructions_base: Schema.Class<ServerInstructions, Schema.Struct<{
-    readonly server: Schema.brand<Schema.String, "MCP.ServerName">;
-    readonly instructions: Schema.String;
-}>, {}>;
-export declare class ServerInstructions extends ServerInstructions_base {
-}
-declare const Tool_base: Schema.Class<Tool, Schema.Struct<{
-    readonly server: Schema.brand<Schema.String, "MCP.ServerName">;
-    readonly name: Schema.String;
-    readonly codemode: Schema.optional<Schema.Boolean>;
-    readonly description: Schema.optional<Schema.String>;
-    readonly inputSchema: Schema.optional<Schema.Unknown>;
-    readonly outputSchema: Schema.optional<Schema.Unknown>;
-}>, {}>;
-export declare class Tool extends Tool_base {
-}
-export declare const ToolResultContent: Schema.toTaggedUnion<"type", readonly [Schema.Struct<{
-    readonly type: Schema.Literal<"text">;
-    readonly text: Schema.String;
-}>, Schema.Struct<{
-    readonly type: Schema.Literal<"media">;
-    readonly data: Schema.String;
-    readonly mimeType: Schema.String;
-}>]>;
-export type ToolResultContent = typeof ToolResultContent.Type;
-declare const ToolResult_base: Schema.Class<ToolResult, Schema.Struct<{
-    readonly server: Schema.brand<Schema.String, "MCP.ServerName">;
-    readonly tool: Schema.String;
-    readonly isError: Schema.Boolean;
-    readonly structured: Schema.optional<Schema.Unknown>;
-    readonly content: Schema.$Array<Schema.toTaggedUnion<"type", readonly [Schema.Struct<{
-        readonly type: Schema.Literal<"text">;
-        readonly text: Schema.String;
-    }>, Schema.Struct<{
-        readonly type: Schema.Literal<"media">;
-        readonly data: Schema.String;
-        readonly mimeType: Schema.String;
-    }>]>>;
-}>, {}>;
-export declare class ToolResult extends ToolResult_base {
-}
-declare const PromptArgument_base: Schema.Class<PromptArgument, Schema.Struct<{
-    readonly name: Schema.String;
-    readonly description: Schema.optional<Schema.String>;
-    readonly required: Schema.optional<Schema.Boolean>;
-}>, {}>;
-export declare class PromptArgument extends PromptArgument_base {
-}
-declare const Prompt_base: Schema.Class<Prompt, Schema.Struct<{
-    readonly server: Schema.brand<Schema.String, "MCP.ServerName">;
-    readonly name: Schema.String;
-    readonly description: Schema.optional<Schema.String>;
-    readonly arguments: Schema.optional<Schema.$Array<typeof PromptArgument>>;
-}>, {}>;
-export declare class Prompt extends Prompt_base {
-}
-declare const PromptMessage_base: Schema.Class<PromptMessage, Schema.Struct<{
-    readonly role: Schema.String;
-    readonly content: Schema.Unknown;
-}>, {}>;
-export declare class PromptMessage extends PromptMessage_base {
-}
-declare const PromptResult_base: Schema.Class<PromptResult, Schema.Struct<{
-    readonly server: Schema.brand<Schema.String, "MCP.ServerName">;
-    readonly name: Schema.String;
-    readonly messages: Schema.$Array<typeof PromptMessage>;
-}>, {}>;
-export declare class PromptResult extends PromptResult_base {
+export type ServerInfo = Mcp.Server;
+export interface ServerInstructions {
+    readonly server: ServerName;
+    readonly instructions: string;
 }
+/** SDK tool definition tagged with the server that owns it. */
+export type Tool = McpClient.Tool & {
+    readonly server: ServerName;
+    readonly codemode?: boolean;
+};
+export type ToolResultContent = McpClient.CallToolContent;
+export type ToolResult = McpClient.CallToolResult & {
+    readonly server: ServerName;
+    readonly tool: string;
+};
+export type Prompt = McpClient.Prompt & {
+    readonly server: ServerName;
+};
+export type PromptResult = McpClient.GetPromptResult & {
+    readonly server: ServerName;
+    readonly name: string;
+};
 export declare const Resource: Schema.Struct<{
     readonly server: Schema.String;
     readonly name: Schema.String;