effect 4.0.5 → 4.0.6

package/src/ai/internal/mcpProtocol/v2025_06_18.ts

@@ -122,10 +122,10 @@ const projectResourceContents = (
     }
 
 const projectStructuredContent = (
-  content: Schema.Json | undefined
-): Schema.JsonObject | undefined => content === undefined || isJsonObject(content) ? content : undefined
+  content: unknown
+): Readonly<Record<string, unknown>> | undefined => content === undefined || isObject(content) ? content : undefined
 
-const isJsonObject = (value: Schema.Json): value is Schema.JsonObject => Predicate.isReadonlyObject(value)
+const isObject = (value: unknown): value is Readonly<Record<string, unknown>> => Predicate.isReadonlyObject(value)
 
 /**
  * @internal

package/src/ai/internal/mcpProtocol/v2025_11_25.ts

@@ -112,10 +112,10 @@ const projectContent = Effect.fnUntraced(function*(content: PublicMcpSchema.Cont
 })
 
 const projectStructuredContent = (
-  content: Schema.Json | undefined
-): Schema.JsonObject | undefined => content === undefined || isJsonObject(content) ? content : undefined
+  content: unknown
+): Readonly<Record<string, unknown>> | undefined => content === undefined || isObject(content) ? content : undefined
 
-const isJsonObject = (value: Schema.Json): value is Schema.JsonObject => Predicate.isReadonlyObject(value)
+const isObject = (value: unknown): value is Readonly<Record<string, unknown>> => Predicate.isReadonlyObject(value)
 
 /**
  * @internal

package/src/ai/internal/mcpProtocol/v2026_07_28.ts

@@ -26,7 +26,7 @@ import * as McpCore from "../mcpCore.ts"
 import * as McpProtocol from "../mcpProtocol.ts"
 import * as McpSchema from "../mcpSchema/v2026_07_28.ts"
 
-const InputResponses = Schema.Record(Schema.String, Schema.JsonObject)
+const InputResponses = Schema.Record(Schema.String, Schema.Record(Schema.String, Schema.Unknown))
 const decodeRequestMetadata = Schema.decodeUnknownEffect(McpSchema.RequestMetaObject)
 const decodeCancellation = Schema.decodeUnknownEffect(McpSchema.CancelledNotification.payloadSchema)
 const isJson = Schema.is(Schema.Json)
@@ -92,8 +92,8 @@ export const profileFromRequestMetadata = Effect.fnUntraced(function*(metadata:
 
 const resultMetadata = (
   value: ObjectWithUndefined,
-  serverInfo: Schema.JsonObject
-): Schema.JsonObject => {
+  serverInfo: Readonly<Record<string, unknown>>
+): Readonly<Record<string, unknown>> => {
   const metadata: unknown = value._meta
   return {
     ...(Predicate.isReadonlyObject(metadata) ? metadata : {}),
@@ -103,7 +103,7 @@ const resultMetadata = (
 
 const projectInputRequired = (
   outcome: McpCore.InputRequiredFields,
-  serverInfo: Schema.JsonObject
+  serverInfo: Readonly<Record<string, unknown>>
 ) =>
   omitUndefined({
     _meta: { "io.modelcontextprotocol/serverInfo": serverInfo },
@@ -138,8 +138,8 @@ export const projectCallToolOutcome = Effect.fnUntraced(function*(
 const requiredCapabilitiesForInputRequests = (
   inputRequests: McpCore.InputRequiredFields["inputRequests"],
   capabilities: McpCore.NegotiatedProtocolProfile["clientCapabilities"]
-): Record<string, Schema.JsonObject> => {
-  const required: Record<string, Types.Mutable<Schema.JsonObject>> = {}
+): Record<string, Readonly<Record<string, unknown>>> => {
+  const required: Record<string, Record<string, unknown>> = {}
   for (const request of Object.values(inputRequests ?? {})) {
     Match.value(request).pipe(
       Match.when({ method: "roots/list" }, () => {
@@ -264,16 +264,14 @@ const projectError = (error: ProtocolError): McpSchema.McpError => {
   })
 }
 
-const failWithHttpStatus = Effect.fnUntraced(function*(status: number, error: McpProtocol.ProtocolError) {
-  const request = yield* Effect.serviceOption(HttpServerRequest.HttpServerRequest)
-  if (Option.isSome(request)) {
+const failWithHttpStatus = (status: number, error: McpProtocol.ProtocolError) =>
+  Effect.withFiber((fiber) => {
     appendPreResponseHandlerUnsafe(
-      request.value,
+      fiber.context,
       (_request, response) => Effect.succeed(HttpServerResponse.setStatus(response, status))
     )
-  }
-  return yield* error
-})
+    return Effect.fail(error)
+  })
 
 /**
  * @internal
@@ -327,7 +325,7 @@ export const makeHandlers = (
   // Older adapters accept arbitrary JSON; this binding requires extension settings objects.
   const extensions = context.serverInfo.extensions === undefined ? undefined : Record.filter(
     context.serverInfo.extensions,
-    (value): value is Schema.JsonObject => Predicate.isReadonlyObject(value)
+    (value): value is Readonly<Record<string, unknown>> => Predicate.isReadonlyObject(value)
   )
   const getDiscovery = Effect.map(context.registrationPresence, (presence) => {
     const capabilities: Types.Mutable<typeof McpSchema.ServerCapabilities.Type> = { completions: {}, logging: {} }

package/src/ai/internal/mcpProtocol.ts

@@ -19,8 +19,10 @@ import * as PublicMcpSchema from "../McpSchema.ts"
 import * as McpCore from "./mcpCore.ts"
 
 const LEGACY_RESOURCE_NOT_FOUND_ERROR_CODE = -32002
-const BASE64_SENTINEL_PREFIX = "=?base64?"
-const BASE64_SENTINEL_SUFFIX = "?="
+/** @internal */
+export const BASE64_SENTINEL_PREFIX = "=?base64?"
+/** @internal */
+export const BASE64_SENTINEL_SUFFIX = "?="
 // A leading U+FEFF belongs to the header value and must survive comparison with the JSON body.
 const routingHeaderDecoder = new TextDecoder("utf-8", { fatal: true, ignoreBOM: true })
 
@@ -120,6 +122,24 @@ export const requireCompleteOperation = <A>(
     ? Effect.succeed(outcome.value)
     : Effect.fail(new McpCore.UnsupportedByProtocol({ protocolVersion, feature: "Client input" }))
 
+/**
+ * Projects boolean property schemas to equivalent objects for pre-June adapters.
+ * Their dated tool descriptors require object-valued direct property schemas.
+ *
+ * @internal
+ */
+export const projectLegacyToolInputSchema = (inputSchema: PublicMcpSchema.ToolJson) => ({
+  ...inputSchema,
+  properties: inputSchema.properties === undefined
+    ? undefined
+    : Object.fromEntries<Readonly<Record<string, unknown>>>(
+      Object.entries(inputSchema.properties).map(([name, schema]) => [
+        name,
+        typeof schema === "boolean" ? schema ? {} : { not: {} } : schema
+      ])
+    )
+})
+
 /**
  * Unquotes an exact text mirror when the protocol drops string `structuredContent`.
  *

package/src/ai/internal/mcpRuntime.ts

@@ -31,7 +31,6 @@ const MCP_METHOD_HEADER = "mcp-method"
 const MCP_NAME_HEADER = "mcp-name"
 const PROTOCOL_VERSION_METADATA_KEY = "io.modelcontextprotocol/protocolVersion"
 const CLIENT_CAPABILITIES_METADATA_KEY = "io.modelcontextprotocol/clientCapabilities"
-const UNSUPPORTED_PROTOCOL_VERSION_ERROR_CODE = -32022
 
 const asRecord = (input: unknown): Record<string, unknown> | undefined =>
   typeof input === "object" && input !== null ? input as Record<string, unknown> : undefined
@@ -236,7 +235,7 @@ export const make = Effect.fnUntraced(function*(
   const registry = yield* McpProtocolRegistry.make(protocols)
   const sessionTerminationListeners = new Set<(binding: RequestBinding) => Effect.Effect<void>>()
   const unsupportedProtocolVersion = (requested: string) => ({
-    code: UNSUPPORTED_PROTOCOL_VERSION_ERROR_CODE,
+    code: PublicMcpSchema.UNSUPPORTED_PROTOCOL_VERSION_ERROR_CODE,
     message: `Unsupported protocol version '${requested}'`,
     data: { supported: protocolVersions, requested }
   })
@@ -345,7 +344,7 @@ export const make = Effect.fnUntraced(function*(
         const selected = selectStatefulProtocol(registry.protocols, offeredVersion)
         if (selected === undefined) {
           return yield* new McpProtocol.ProtocolError({
-            code: UNSUPPORTED_PROTOCOL_VERSION_ERROR_CODE,
+            code: PublicMcpSchema.UNSUPPORTED_PROTOCOL_VERSION_ERROR_CODE,
             message: `initialize is not supported by the configured MCP protocols (requested '${offeredVersion}')`
           })
         }
@@ -568,7 +567,7 @@ export const make = Effect.fnUntraced(function*(
                 const sessionId = crypto.randomUUID()
                 stateful.registerHttp(sessionId, registration)
                 appendPreResponseHandlerUnsafe(
-                  httpRequest,
+                  fiber.context,
                   (_request, response) =>
                     Effect.succeed(HttpServerResponse.setHeaders(response, {
                       [MCP_SESSION_ID_HEADER]: sessionId,

package/src/ai/internal/mcpSchema/v2024_11_05.ts

@@ -29,7 +29,14 @@ export const optional = <S extends Schema.Constraint>(
       encode: SchemaGetter.transformOptional(Option.flatMap(Option.fromUndefinedOr))
     })
   )
-const JsonObject = Schema.JsonObject
+
+/**
+ * Object checked one level deep. Payloads come from `JSON.parse` or are serialized
+ * through `Schema.toCodecJson`, so deep JSON validation would be redundant.
+ *
+ * @internal
+ */
+export const UnknownObject = Schema.Record(Schema.String, Schema.Unknown)
 
 /**
  * @internal
@@ -65,7 +72,7 @@ export const RequestMeta = Schema.Struct({
     Schema.Struct({
       progressToken: optional(ProgressToken)
     }),
-    [Schema.JsonObject]
+    [UnknownObject]
   ))
 })
 
@@ -73,14 +80,14 @@ export const RequestMeta = Schema.Struct({
  * @internal
  */
 export const NotificationMeta = Schema.Struct({
-  _meta: optional(JsonObject)
+  _meta: optional(UnknownObject)
 })
 
 /**
  * @internal
  */
 export const ResultMeta = Schema.Struct({
-  _meta: optional(JsonObject)
+  _meta: optional(UnknownObject)
 })
 
 /**
@@ -111,21 +118,21 @@ export const Implementation = Schema.Struct({
  * @internal
  */
 export const ClientCapabilities = Schema.Struct({
-  extensions: optional(Schema.Record(Schema.TemplateLiteral([Schema.String, "/", Schema.String]), Schema.Json)),
-  experimental: optional(Schema.Record(Schema.String, JsonObject)),
+  extensions: optional(Schema.Record(Schema.TemplateLiteral([Schema.String, "/", Schema.String]), Schema.Unknown)),
+  experimental: optional(Schema.Record(Schema.String, UnknownObject)),
   roots: optional(Schema.Struct({
     listChanged: optional(Schema.Boolean)
   })),
-  sampling: optional(JsonObject)
+  sampling: optional(UnknownObject)
 })
 
 /**
  * @internal
  */
 export const ServerCapabilities = Schema.Struct({
-  extensions: optional(Schema.Record(Schema.TemplateLiteral([Schema.String, "/", Schema.String]), Schema.Json)),
-  experimental: optional(Schema.Record(Schema.String, JsonObject)),
-  logging: optional(JsonObject),
+  extensions: optional(Schema.Record(Schema.TemplateLiteral([Schema.String, "/", Schema.String]), Schema.Unknown)),
+  experimental: optional(Schema.Record(Schema.String, UnknownObject)),
+  logging: optional(UnknownObject),
   prompts: optional(Schema.Struct({
     listChanged: optional(Schema.Boolean)
   })),
@@ -284,7 +291,7 @@ export const PromptMessage = Schema.Struct({
  */
 export const ToolInputSchema = Schema.Struct({
   type: Schema.Literal("object"),
-  properties: optional(Schema.Record(Schema.String, JsonObject)),
+  properties: optional(Schema.Record(Schema.String, UnknownObject)),
   required: optional(Schema.Array(Schema.String))
 })
 
@@ -582,7 +589,7 @@ export class CallTool extends Rpc.make("tools/call", {
   payload: {
     ...RequestMeta.fields,
     name: Schema.String,
-    arguments: optional(JsonObject)
+    arguments: optional(UnknownObject)
   }
 }) {}
 
@@ -610,7 +617,7 @@ export class CreateMessage extends Rpc.make("sampling/createMessage", {
     temperature: optional(Schema.Finite),
     maxTokens: Schema.Finite,
     stopSequences: optional(Schema.Array(Schema.String)),
-    metadata: optional(JsonObject)
+    metadata: optional(UnknownObject)
   }
 }) {}
 

package/src/ai/internal/mcpSchema/v2025_03_26.ts

@@ -21,6 +21,8 @@ export const protocolVersion = "2025-03-26"
 
 const optional = Previous.optional
 
+const UnknownObject = Previous.UnknownObject
+
 /**
  * @internal
  */
@@ -186,7 +188,7 @@ export class CallTool extends Rpc.make("tools/call", {
   payload: {
     ...Previous.RequestMeta.fields,
     name: Schema.String,
-    arguments: optional(Schema.JsonObject)
+    arguments: optional(UnknownObject)
   }
 }) {}
 
@@ -205,7 +207,7 @@ export class CreateMessage extends Rpc.make("sampling/createMessage", {
     temperature: optional(Schema.Finite),
     maxTokens: Schema.Finite,
     stopSequences: optional(Schema.Array(Schema.String)),
-    metadata: optional(Schema.JsonObject)
+    metadata: optional(UnknownObject)
   }
 }) {}
 

package/src/ai/internal/mcpSchema/v2025_06_18.ts

@@ -19,8 +19,8 @@ export * from "./v2025_03_26.ts"
 export const protocolVersion = "2025-06-18"
 
 const optional = Previous.optional
-const JsonObject = Schema.JsonObject
-const Meta = optional(JsonObject)
+const UnknownObject = Previous.UnknownObject
+const Meta = optional(UnknownObject)
 
 /**
  * @internal
@@ -218,10 +218,10 @@ export class Initialize extends Rpc.make("initialize", {
 const ToolJsonSchema = Schema.StructWithRest(
   Schema.Struct({
     type: Schema.Literal("object"),
-    properties: optional(Schema.Record(Schema.String, JsonObject)),
+    properties: optional(Schema.Record(Schema.String, Schema.Union([UnknownObject, Schema.Boolean]))),
     required: optional(Schema.Array(Schema.String))
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 
 /**
@@ -243,7 +243,7 @@ export const Tool = Schema.Struct({
 export const CallToolResult = Schema.Struct({
   ...Previous.ResultMeta.fields,
   content: Schema.Array(ContentBlock),
-  structuredContent: optional(JsonObject),
+  structuredContent: optional(UnknownObject),
   isError: optional(Schema.Boolean)
 })
 
@@ -273,7 +273,7 @@ export class CreateMessage extends Rpc.make("sampling/createMessage", {
     temperature: optional(Schema.Finite),
     maxTokens: Schema.Finite,
     stopSequences: optional(Schema.Array(Schema.String)),
-    metadata: optional(JsonObject)
+    metadata: optional(UnknownObject)
   }
 }) {}
 
@@ -433,7 +433,7 @@ export class CallTool extends Rpc.make("tools/call", {
   payload: {
     ...Previous.RequestMeta.fields,
     name: Schema.String,
-    arguments: optional(JsonObject)
+    arguments: optional(UnknownObject)
   }
 }) {}
 

package/src/ai/internal/mcpSchema/v2025_11_25.ts

@@ -19,8 +19,8 @@ export * from "./v2025_06_18.ts"
 export const protocolVersion = "2025-11-25"
 
 const optional = Previous.optional
-const JsonObject = Schema.JsonObject
-const Meta = optional(JsonObject)
+const UnknownObject = Previous.UnknownObject
+const Meta = optional(UnknownObject)
 
 /**
  * @internal
@@ -48,12 +48,12 @@ export const Implementation = Schema.Struct({
 export const ClientCapabilities = Schema.Struct({
   ...Previous.ClientCapabilities.fields,
   sampling: optional(Schema.Struct({
-    context: optional(JsonObject),
-    tools: optional(JsonObject)
+    context: optional(UnknownObject),
+    tools: optional(UnknownObject)
   })),
   elicitation: optional(Schema.Struct({
-    form: optional(JsonObject),
-    url: optional(JsonObject)
+    form: optional(UnknownObject),
+    url: optional(UnknownObject)
   }))
 })
 
@@ -182,7 +182,7 @@ export const ToolUseContent = Schema.Struct({
   type: Schema.Literal("tool_use"),
   id: Schema.String,
   name: Schema.String,
-  input: JsonObject,
+  input: UnknownObject,
   _meta: Meta
 })
 
@@ -193,7 +193,7 @@ export const ToolResultContent = Schema.Struct({
   type: Schema.Literal("tool_result"),
   toolUseId: Schema.String,
   content: Schema.Array(ContentBlock),
-  structuredContent: optional(JsonObject),
+  structuredContent: optional(UnknownObject),
   isError: optional(Schema.Boolean),
   _meta: Meta
 })

package/src/ai/internal/mcpSchema/v2026_07_28.ts

@@ -16,7 +16,9 @@ export * from "./v2025_11_25.ts"
 export const protocolVersion = "2026-07-28"
 
 const optional = Previous.optional
-const Meta = optional(Schema.JsonObject)
+
+const UnknownObject = Previous.UnknownObject
+const Meta = optional(UnknownObject)
 
 /**
  * @internal
@@ -44,19 +46,19 @@ export const Implementation = Previous.Implementation
  */
 export const ClientCapabilities = Schema.StructWithRest(
   Schema.Struct({
-    experimental: optional(Schema.Record(Schema.String, Schema.JsonObject)),
+    experimental: optional(Schema.Record(Schema.String, UnknownObject)),
     roots: optional(Schema.Struct({})),
     sampling: optional(Schema.Struct({
-      context: optional(Schema.JsonObject),
-      tools: optional(Schema.JsonObject)
+      context: optional(UnknownObject),
+      tools: optional(UnknownObject)
     })),
     elicitation: optional(Schema.Struct({
-      form: optional(Schema.JsonObject),
-      url: optional(Schema.JsonObject)
+      form: optional(UnknownObject),
+      url: optional(UnknownObject)
     })),
-    extensions: optional(Schema.Record(Schema.String, Schema.JsonObject))
+    extensions: optional(Schema.Record(Schema.String, UnknownObject))
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 
 /**
@@ -64,18 +66,18 @@ export const ClientCapabilities = Schema.StructWithRest(
  */
 export const ServerCapabilities = Schema.StructWithRest(
   Schema.Struct({
-    experimental: optional(Schema.Record(Schema.String, Schema.JsonObject)),
-    logging: optional(Schema.JsonObject),
-    completions: optional(Schema.JsonObject),
+    experimental: optional(Schema.Record(Schema.String, UnknownObject)),
+    logging: optional(UnknownObject),
+    completions: optional(UnknownObject),
     prompts: optional(Schema.Struct({ listChanged: optional(Schema.Boolean) })),
     resources: optional(Schema.Struct({
       subscribe: optional(Schema.Boolean),
       listChanged: optional(Schema.Boolean)
     })),
     tools: optional(Schema.Struct({ listChanged: optional(Schema.Boolean) })),
-    extensions: optional(Schema.Record(Schema.String, Schema.JsonObject))
+    extensions: optional(Schema.Record(Schema.String, UnknownObject))
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 
 /**
@@ -89,7 +91,7 @@ export const RequestMetaObject = Schema.StructWithRest(
     "io.modelcontextprotocol/clientCapabilities": ClientCapabilities,
     "io.modelcontextprotocol/logLevel": optional(LoggingLevel)
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 
 /**
@@ -104,7 +106,7 @@ export const NotificationMetaObject = Schema.StructWithRest(
   Schema.Struct({
     "io.modelcontextprotocol/subscriptionId": optional(RequestId)
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -116,15 +118,15 @@ export const NotificationParams = Schema.Struct({ _meta: optional(NotificationMe
  */
 export const ResultMetaObject = Schema.StructWithRest(
   Schema.Struct({
-    "io.modelcontextprotocol/serverInfo": Implementation
+    "io.modelcontextprotocol/serverInfo": optional(Implementation)
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
  */
 export const ResultMeta = {
-  _meta: ResultMetaObject,
+  _meta: optional(ResultMetaObject),
   resultType: Schema.Literal("complete")
 }
 /**
@@ -133,7 +135,7 @@ export const ResultMeta = {
 export const McpError = Schema.Struct({
   code: Schema.Int,
   message: Schema.String,
-  data: optional(Schema.Json)
+  data: optional(Schema.Unknown)
 })
 /**
  * @internal
@@ -220,11 +222,11 @@ const ToolInputSchema = Schema.StructWithRest(
     $schema: optional(Schema.String),
     type: Schema.Literal("object")
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 const ToolOutputSchema = Schema.StructWithRest(
   Schema.Struct({ $schema: optional(Schema.String) }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -251,7 +253,7 @@ export const ToolResultContent = Schema.Struct({
   type: Schema.Literal("tool_result"),
   toolUseId: Schema.String,
   content: Schema.Array(ContentBlock),
-  structuredContent: optional(Schema.Json),
+  structuredContent: optional(Schema.Unknown),
   isError: optional(Schema.Boolean),
   _meta: Meta
 })
@@ -278,7 +280,7 @@ export const SamplingMessage = Schema.Struct({
  */
 export const ModelHint = Schema.StructWithRest(
   Schema.Struct({ name: optional(Schema.String) }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 const ModelPriority = Schema.Finite.check(Schema.isBetween({ minimum: 0, maximum: 1 }))
 /**
@@ -309,7 +311,7 @@ export const CreateMessageRequest = Schema.Struct({
     temperature: optional(Schema.Finite),
     maxTokens: Schema.Int,
     stopSequences: optional(Schema.Array(Schema.String)),
-    metadata: optional(Schema.JsonObject),
+    metadata: optional(UnknownObject),
     tools: optional(Schema.Array(Tool)),
     toolChoice: optional(ToolChoice)
   })
@@ -444,7 +446,7 @@ export const InputRequests = Schema.Record(Schema.String, InputRequest)
  */
 export const InputResponses = Schema.Record(Schema.String, InputResponse)
 const InputRequiredResultMeta = {
-  _meta: ResultMetaObject,
+  _meta: optional(ResultMetaObject),
   resultType: Schema.Literal("input_required")
 }
 /**
@@ -457,7 +459,7 @@ export const InputRequiredResult = Schema.Union([
       inputRequests: InputRequests,
       requestState: optional(Schema.String)
     }),
-    [Schema.JsonObject]
+    [UnknownObject]
   ),
   Schema.StructWithRest(
     Schema.Struct({
@@ -465,7 +467,7 @@ export const InputRequiredResult = Schema.Union([
       inputRequests: optional(InputRequests),
       requestState: Schema.String
     }),
-    [Schema.JsonObject]
+    [UnknownObject]
   )
 ])
 /**
@@ -510,7 +512,7 @@ export const DiscoverResult = Schema.StructWithRest(
     capabilities: ServerCapabilities,
     instructions: optional(Schema.String)
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -530,7 +532,7 @@ export const ListResourcesResult = Schema.StructWithRest(
     ...CacheableResult,
     resources: Schema.Array(Resource)
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -550,7 +552,7 @@ export const ListResourceTemplatesResult = Schema.StructWithRest(
     ...CacheableResult,
     resourceTemplates: Schema.Array(ResourceTemplate)
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -569,7 +571,7 @@ export const ReadResourceResult = Schema.StructWithRest(
     ...CacheableResult,
     contents: Schema.Array(ResourceContents)
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -589,7 +591,7 @@ export const ListPromptsResult = Schema.StructWithRest(
     ...CacheableResult,
     prompts: Schema.Array(Prompt)
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -609,7 +611,7 @@ export const GetPromptResult = Schema.StructWithRest(
     description: optional(Schema.String),
     messages: Schema.Array(PromptMessage)
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -633,7 +635,7 @@ export const ListToolsResult = Schema.StructWithRest(
     ...CacheableResult,
     tools: Schema.Array(Tool)
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -651,10 +653,10 @@ export const CallToolResult = Schema.StructWithRest(
   Schema.Struct({
     ...ResultMeta,
     content: Schema.Array(ContentBlock),
-    structuredContent: optional(Schema.Json),
+    structuredContent: optional(Schema.Unknown),
     isError: optional(Schema.Boolean)
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -665,7 +667,7 @@ export class CallTool extends Rpc.make("tools/call", {
   payload: {
     ...InputResponseRequestParams,
     name: Schema.String,
-    arguments: optional(Schema.JsonObject)
+    arguments: optional(UnknownObject)
   }
 }) {}
 
@@ -689,7 +691,7 @@ export const CompleteResult = Schema.StructWithRest(
       hasMore: optional(Schema.Boolean)
     })
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -721,10 +723,10 @@ export const SubscriptionFilter = Schema.Struct({
  */
 export const SubscriptionsListenResultMetaObject = Schema.StructWithRest(
   Schema.Struct({
-    "io.modelcontextprotocol/serverInfo": Implementation,
+    "io.modelcontextprotocol/serverInfo": optional(Implementation),
     "io.modelcontextprotocol/subscriptionId": RequestId
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -734,7 +736,7 @@ export const SubscriptionsListenResult = Schema.StructWithRest(
     _meta: SubscriptionsListenResultMetaObject,
     resultType: Schema.Literal("complete")
   }),
-  [Schema.JsonObject]
+  [UnknownObject]
 )
 /**
  * @internal
@@ -775,7 +777,7 @@ export class LoggingMessageNotification extends Rpc.make("notifications/message"
     ...NotificationParams.fields,
     level: LoggingLevel,
     logger: optional(Schema.String),
-    data: Schema.Json
+    data: Schema.Unknown
   }
 }) {}
 /**