effect 4.0.4 → 4.0.6

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
   }
 }) {}
 /**

package/src/cli/CliError.ts

@@ -3,10 +3,11 @@
  *
  * CLI errors describe problems such as unknown or duplicate flags, missing
  * flags or arguments, unexpected positional arguments, invalid values, unknown
- * subcommands, user handler failures, and requests to show command help. This
- * module includes the `CliError` union, the `isCliError` guard, schema-backed
- * error classes with display messages, and the `NonShowHelpErrors` union used
- * when parse or validation errors should be shown with help output.
+ * subcommands, rejected input combinations, user handler failures, and
+ * requests to show command help. This module includes the `CliError` union,
+ * the `isCliError` guard, schema-backed error classes with display messages,
+ * and the `NonShowHelpErrors` union used when parse or validation errors
+ * should be shown with help output.
  *
  * @stability unstable
  * @since 4.0.0
@@ -83,6 +84,7 @@ export type CliError =
   | UnexpectedArgument
   | InvalidValue
   | UnknownSubcommand
+  | ValidationError
   | ShowHelp
   | UserError
 
@@ -500,6 +502,47 @@ export class UnknownSubcommand extends Schema.TaggedError<UnknownSubcommand>(
   }
 }
 
+/**
+ * Error for parsed input that fails a rule of your own, such as two flags
+ * that cannot be used together.
+ *
+ * **Details**
+ *
+ * Fail with it from `Command.validate`, `Flag.mapEffect` or
+ * `Argument.mapEffect`. The runner shows it with the command help, like any
+ * other parse error. Handlers report their own failures with `UserError`.
+ *
+ * **Example** (Rejecting a flag combination)
+ *
+ * ```ts import.meta.vitest
+ * import { CliError } from "effect/cli"
+ *
+ * const error = new CliError.ValidationError({
+ *   message: "--use-api and --use-docker are mutually exclusive"
+ * })
+ *
+ * error._tag // => "ValidationError"
+ * error.message // => "--use-api and --use-docker are mutually exclusive"
+ * ```
+ *
+ * @stability unstable
+ * @category errors
+ * @since 4.1.0
+ */
+export class ValidationError extends Schema.TaggedError<ValidationError>(
+  `${TypeId}/ValidationError`
+)("ValidationError", {
+  message: Schema.String
+}) {
+  /**
+   * Marks this value as a CLI validation error for runtime guards.
+   *
+   * @stability unstable
+   * @since 4.1.0
+   */
+  readonly [TypeId] = TypeId
+}
+
 /**
  * Error wrapper for user handler failures in the CLI error channel.
  *
@@ -604,6 +647,7 @@ export const NonShowHelpErrors: Schema.Union<
     typeof UnexpectedArgument,
     typeof InvalidValue,
     typeof UnknownSubcommand,
+    typeof ValidationError,
     typeof UserError
   ]
 > = Schema.Union([
@@ -614,6 +658,7 @@ export const NonShowHelpErrors: Schema.Union<
   UnexpectedArgument,
   InvalidValue,
   UnknownSubcommand,
+  ValidationError,
   UserError
 ])