effect 4.0.0-beta.2 → 4.0.0-beta.21

package/src/unstable/ai/Model.ts

@@ -14,7 +14,7 @@
  *
  * declare const myAnthropicLayer: Layer.Layer<LanguageModel.LanguageModel>
  *
- * const anthropicModel = Model.make("anthropic", myAnthropicLayer)
+ * const anthropicModel = Model.make("anthropic", "claude-3-5-haiku", myAnthropicLayer)
  *
  * const program = Effect.gen(function*() {
  *   const response = yield* LanguageModel.generateText({
@@ -55,8 +55,13 @@ const TypeId = "~effect/ai/Model" as const
  */
 export interface Model<in out Provider, in out Provides, in out Requires>
   extends
-    Layer.Layer<Provides | ProviderName, never, Requires>,
-    Effect.Yieldable<Model<Provider, Provides, Requires>, Layer.Layer<Provides | ProviderName>, never, Requires>
+    Layer.Layer<Provides | ProviderName | ModelName, never, Requires>,
+    Effect.Yieldable<
+      Model<Provider, Provides, Requires>,
+      Layer.Layer<Provides | ProviderName | ModelName>,
+      never,
+      Requires
+    >
 {
   readonly [TypeId]: typeof TypeId
   /**
@@ -79,6 +84,20 @@ export class ProviderName extends ServiceMap.Service<ProviderName, string>()(
   "effect/unstable/ai/Model/ProviderName"
 ) {}
 
+/**
+ * Service tag that provides the current large language model name.
+ *
+ * This tag is automatically provided by Model instances and can be used to
+ * access the name of the model that is currently in use within a given Effect
+ * program.
+ *
+ * @since 4.0.0
+ * @category services
+ */
+export class ModelName extends ServiceMap.Service<ModelName, string>()(
+  "effect/unstable/ai/Model/ModelName"
+) {}
+
 const Proto = {
   ...YieldableProto,
   ...PipeInspectableProto,
@@ -112,11 +131,12 @@ const Proto = {
  *
  * declare const bedrockLayer: Layer.Layer<LanguageModel.LanguageModel>
  *
- * // Model automatically provides ProviderName service
+ * // Model automatically provides ProviderName and ModelName services
  * const checkProviderAndGenerate = Effect.gen(function*() {
  *   const provider = yield* Model.ProviderName
+ *   const modelName = yield* Model.ModelName
  *
- *   console.log(`Generating with: ${provider}`)
+ *   console.log(`Generating with: ${provider}/${modelName}`)
  *
  *   return yield* LanguageModel.generateText({
  *     prompt: `Hello from ${provider}!`
@@ -124,19 +144,23 @@ const Proto = {
  * })
  *
  * const program = checkProviderAndGenerate.pipe(
- *   Effect.provide(Model.make("amazon-bedrock", bedrockLayer))
+ *   Effect.provide(Model.make("amazon-bedrock", "claude-3-5-haiku", bedrockLayer))
  * )
- * // Will log: "Generating with: amazon-bedrock"
+ * // Will log: "Generating with: amazon-bedrock/claude-3-5-haiku"
  * ```
  *
  * @since 4.0.0
  * @category constructors
  */
-export const make = <const Provider extends string, Provides, Requires>(
+export const make = <const Provider extends string, const Name extends string, Provides, Requires>(
   /**
    * Provider identifier (e.g., "openai", "anthropic", "amazon-bedrock").
    */
   provider: Provider,
+  /**
+   * Model identifier (e.g., "gpt-5", "claude-3-5-haiku").
+   */
+  modelName: Name,
   /**
    * Layer that provides the AI services for this provider.
    */
@@ -145,5 +169,12 @@ export const make = <const Provider extends string, Provides, Requires>(
   Object.assign(
     Object.create(Proto),
     { provider },
-    Layer.merge(Layer.succeed(ProviderName)(provider), layer)
+    Layer.merge(
+      layer,
+      Layer.succeedServices(
+        ProviderName.serviceMap(provider).pipe(
+          ServiceMap.add(ModelName, modelName)
+        )
+      )
+    )
   )

package/src/unstable/ai/Prompt.ts

@@ -86,9 +86,9 @@ const constEmptyObject = () => ({})
  * @since 4.0.0
  * @category models
  */
-export const ProviderOptions: Schema.Record$<
+export const ProviderOptions: Schema.$Record<
   Schema.String,
-  Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+  Schema.NullOr<Schema.Codec<Schema.Json>>
 > = Schema.Record(Schema.String, Schema.NullOr(Schema.Json))
 
 /**
@@ -309,9 +309,9 @@ export const TextPart: Schema.Struct<
     readonly text: Schema.String
     readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
     readonly options: Schema.withDecodingDefault<
-      Schema.Record$<
+      Schema.$Record<
         Schema.String,
-        Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+        Schema.NullOr<Schema.Codec<Schema.Json>>
       >
     >
   }
@@ -389,9 +389,9 @@ export const ReasoningPart: Schema.Struct<{
   readonly text: Schema.String
   readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
   readonly options: Schema.withDecodingDefault<
-    Schema.Record$<
+    Schema.$Record<
       Schema.String,
-      Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+      Schema.NullOr<Schema.Codec<Schema.Json>>
     >
   >
 }> = Schema.Struct({
@@ -497,9 +497,9 @@ export const FilePart: Schema.Struct<{
   readonly data: Schema.Union<readonly [Schema.String, Schema.Uint8Array, Schema.URL]>
   readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
   readonly options: Schema.withDecodingDefault<
-    Schema.Record$<
+    Schema.$Record<
       Schema.String,
-      Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+      Schema.NullOr<Schema.Codec<Schema.Json>>
     >
   >
 }> = Schema.Struct({
@@ -607,9 +607,9 @@ export const ToolCallPart: Schema.Struct<{
   readonly providerExecuted: Schema.withDecodingDefault<Schema.Boolean>
   readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
   readonly options: Schema.withDecodingDefault<
-    Schema.Record$<
+    Schema.$Record<
       Schema.String,
-      Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+      Schema.NullOr<Schema.Codec<Schema.Json>>
     >
   >
 }> = Schema.Struct({
@@ -723,9 +723,9 @@ export const ToolResultPart: Schema.Struct<{
   readonly result: Schema.Unknown
   readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
   readonly options: Schema.withDecodingDefault<
-    Schema.Record$<
+    Schema.$Record<
       Schema.String,
-      Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+      Schema.NullOr<Schema.Codec<Schema.Json>>
     >
   >
 }> = Schema.Struct({
@@ -841,9 +841,9 @@ export const ToolApprovalResponsePart: Schema.Struct<{
   readonly reason: Schema.optional<Schema.String>
   readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
   readonly options: Schema.withDecodingDefault<
-    Schema.Record$<
+    Schema.$Record<
       Schema.String,
-      Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+      Schema.NullOr<Schema.Codec<Schema.Json>>
     >
   >
 }> = Schema.Struct({
@@ -942,9 +942,9 @@ export const ToolApprovalRequestPart: Schema.Struct<{
   readonly toolCallId: Schema.String
   readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
   readonly options: Schema.withDecodingDefault<
-    Schema.Record$<
+    Schema.$Record<
       Schema.String,
-      Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+      Schema.NullOr<Schema.Codec<Schema.Json>>
     >
   >
 }> = Schema.Struct({
@@ -1087,9 +1087,9 @@ export const ContentFromString: Schema.decodeTo<
         readonly text: Schema.String
         readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
         readonly options: Schema.withDecodingDefault<
-          Schema.Record$<
+          Schema.$Record<
             Schema.String,
-            Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+            Schema.NullOr<Schema.Codec<Schema.Json>>
           >
         >
       }>
@@ -1166,9 +1166,9 @@ export const SystemMessage: Schema.Struct<{
   readonly content: Schema.String
   readonly "~effect/ai/Prompt/Message": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Message">>
   readonly options: Schema.withDecodingDefault<
-    Schema.Record$<
+    Schema.$Record<
       Schema.String,
-      Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+      Schema.NullOr<Schema.Codec<Schema.Json>>
     >
   >
 }> = Schema.Struct({
@@ -1285,9 +1285,9 @@ export const UserMessage: Schema.Struct<{
               readonly text: Schema.String
               readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
               readonly options: Schema.withDecodingDefault<
-                Schema.Record$<
+                Schema.$Record<
                   Schema.String,
-                  Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+                  Schema.NullOr<Schema.Codec<Schema.Json>>
                 >
               >
             }>
@@ -1297,7 +1297,7 @@ export const UserMessage: Schema.Struct<{
         never,
         never
       >,
-      Schema.Array$<
+      Schema.$Array<
         Schema.Union<
           readonly [
             Schema.Struct<{
@@ -1305,9 +1305,9 @@ export const UserMessage: Schema.Struct<{
               readonly text: Schema.String
               readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
               readonly options: Schema.withDecodingDefault<
-                Schema.Record$<
+                Schema.$Record<
                   Schema.String,
-                  Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+                  Schema.NullOr<Schema.Codec<Schema.Json>>
                 >
               >
             }>,
@@ -1318,9 +1318,9 @@ export const UserMessage: Schema.Struct<{
               readonly data: Schema.Union<readonly [Schema.String, Schema.Uint8Array, Schema.URL]>
               readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
               readonly options: Schema.withDecodingDefault<
-                Schema.Record$<
+                Schema.$Record<
                   Schema.String,
-                  Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+                  Schema.NullOr<Schema.Codec<Schema.Json>>
                 >
               >
             }>
@@ -1331,9 +1331,9 @@ export const UserMessage: Schema.Struct<{
   >
   readonly "~effect/ai/Prompt/Message": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Message">>
   readonly options: Schema.withDecodingDefault<
-    Schema.Record$<
+    Schema.$Record<
       Schema.String,
-      Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+      Schema.NullOr<Schema.Codec<Schema.Json>>
     >
   >
 }> = Schema.Struct({
@@ -1470,9 +1470,9 @@ export const AssistantMessage: Schema.Struct<{
               readonly text: Schema.String
               readonly "~effect/ai/Prompt/Part": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Part">>
               readonly options: Schema.withDecodingDefault<
-                Schema.Record$<
+                Schema.$Record<
                   Schema.String,
-                  Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+                  Schema.NullOr<Schema.Codec<Schema.Json>>
                 >
               >
             }>
@@ -1482,7 +1482,7 @@ export const AssistantMessage: Schema.Struct<{
         never,
         never
       >,
-      Schema.Array$<
+      Schema.$Array<
         Schema.Union<
           readonly [
             typeof TextPart,
@@ -1498,9 +1498,9 @@ export const AssistantMessage: Schema.Struct<{
   >
   readonly "~effect/ai/Prompt/Message": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Message">>
   readonly options: Schema.withDecodingDefault<
-    Schema.Record$<
+    Schema.$Record<
       Schema.String,
-      Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+      Schema.NullOr<Schema.Codec<Schema.Json>>
     >
   >
 }> = Schema.Struct({
@@ -1613,14 +1613,14 @@ export interface ToolMessageOptions extends ProviderOptions {}
  */
 export const ToolMessage: Schema.Struct<{
   readonly role: Schema.Literal<"tool">
-  readonly content: Schema.Array$<
+  readonly content: Schema.$Array<
     Schema.Union<readonly [typeof ToolResultPart, typeof ToolApprovalResponsePart]>
   >
   readonly "~effect/ai/Prompt/Message": Schema.withDecodingDefaultKey<Schema.Literal<"~effect/ai/Prompt/Message">>
   readonly options: Schema.withDecodingDefault<
-    Schema.Record$<
+    Schema.$Record<
       Schema.String,
-      Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+      Schema.NullOr<Schema.Codec<Schema.Json>>
     >
   >
 }> = Schema.Struct({

package/src/unstable/ai/Response.ts

@@ -453,9 +453,9 @@ export type ToolResultParts<Tools extends Record<string, Tool.Any>> = {
  * @since 1.0.0
  * @category schemas
  */
-export const ProviderMetadata: Schema.Record$<
+export const ProviderMetadata: Schema.$Record<
   Schema.String,
-  Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json>>
+  Schema.NullOr<Schema.Codec<Schema.Json>>
 > = Schema.Record(Schema.String, Schema.NullOr(Schema.Json))
 
 /**
@@ -629,7 +629,7 @@ export const TextPart: Schema.Struct<{
   readonly text: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -689,7 +689,7 @@ export const TextStartPart: Schema.Struct<{
   readonly id: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -757,7 +757,7 @@ export const TextDeltaPart: Schema.Struct<{
   readonly delta: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -818,7 +818,7 @@ export const TextEndPart: Schema.Struct<{
   readonly id: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -889,7 +889,7 @@ export const ReasoningPart: Schema.Struct<{
   readonly text: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -949,7 +949,7 @@ export const ReasoningStartPart: Schema.Struct<{
   readonly id: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -1017,7 +1017,7 @@ export const ReasoningDeltaPart: Schema.Struct<{
   readonly delta: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -1078,7 +1078,7 @@ export const ReasoningEndPart: Schema.Struct<{
   readonly id: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -1159,7 +1159,7 @@ export const ToolParamsStartPart: Schema.Struct<{
   readonly providerExecuted: Schema.withDecodingDefaultKey<Schema.Boolean>
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -1234,7 +1234,7 @@ export const ToolParamsDeltaPart: Schema.Struct<{
   readonly delta: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -1299,7 +1299,7 @@ export const ToolParamsEndPart: Schema.Struct<{
   readonly id: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -1414,7 +1414,7 @@ export const ToolCallPart: <const Name extends string, Params extends Schema.Top
     readonly providerExecuted: Schema.withDecodingDefaultKey<Schema.Boolean>
     readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
     readonly metadata: Schema.withDecodingDefault<
-      Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+      Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
     >
   }
 > = <const Name extends string, Params extends Schema.Top>(
@@ -1618,9 +1618,9 @@ export const ToolResultPart: <const Name extends string, Success extends Schema.
       readonly "~effect/ai/Content/Part": Schema.Literal<"~effect/ai/Content/Part">
       readonly result: Schema.Union<readonly [Success, Failure]>
       readonly providerExecuted: Schema.Boolean
-      readonly metadata: Schema.Record$<
+      readonly metadata: Schema.$Record<
         Schema.String,
-        Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json, never, never>>
+        Schema.NullOr<Schema.Codec<Schema.Json>>
       >
       readonly encodedResult: Schema.toEncoded<Schema.Union<readonly [Success, Failure]>>
       readonly preliminary: Schema.Boolean
@@ -1635,7 +1635,7 @@ export const ToolResultPart: <const Name extends string, Success extends Schema.
       readonly result: Schema.toEncoded<Schema.Union<readonly [Success, Failure]>>
       readonly providerExecuted: Schema.optional<Schema.Boolean>
       readonly metadata: Schema.optional<
-        Schema.Record$<Schema.String, Schema.NullOr<Schema.Codec<Schema.Json, Schema.Json, never, never>>>
+        Schema.$Record<Schema.String, Schema.NullOr<Schema.Codec<Schema.Json>>>
       >
       readonly preliminary: Schema.optional<Schema.Boolean>
       readonly id: Schema.String
@@ -1795,7 +1795,7 @@ export const ToolApprovalRequestPart: Schema.Struct<{
   readonly toolCallId: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -1888,7 +1888,7 @@ export const FilePart: Schema.Struct<{
   readonly data: Schema.Uint8ArrayFromBase64
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -1985,7 +1985,7 @@ export const DocumentSourcePart: Schema.Struct<{
   readonly fileName: Schema.optionalKey<Schema.String>
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -2076,7 +2076,7 @@ export const UrlSourcePart: Schema.Struct<{
   readonly title: Schema.String
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -2115,7 +2115,7 @@ export const UrlSourcePart: Schema.Struct<{
  * @category schemas
  */
 export const HttpRequestDetails = Schema.Struct({
-  method: Schema.Literals(["GET", "POST", "PATCH", "PUT", "DELETE", "HEAD", "OPTIONS"]),
+  method: Schema.Literals(["GET", "POST", "PATCH", "PUT", "DELETE", "HEAD", "OPTIONS", "TRACE"]),
   url: Schema.String,
   urlParams: Schema.Array(Schema.Tuple([Schema.String, Schema.String])),
   hash: Schema.UndefinedOr(Schema.String),
@@ -2257,7 +2257,7 @@ export const ResponseMetadataPart: Schema.Struct<{
   readonly request: Schema.UndefinedOr<typeof HttpRequestDetails>
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -2464,7 +2464,7 @@ export const FinishPart: Schema.Struct<{
   readonly response: Schema.UndefinedOr<typeof HttpResponseDetails>
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,
@@ -2527,7 +2527,7 @@ export const ErrorPart: Schema.Struct<{
   readonly error: Schema.Unknown
   readonly "~effect/ai/Content/Part": Schema.withDecodingDefaultKey<Schema.tag<"~effect/ai/Content/Part">>
   readonly metadata: Schema.withDecodingDefault<
-    Schema.Record$<Schema.String, Schema.Codec<Schema.Json, Schema.Json>>
+    Schema.$Record<Schema.String, Schema.Codec<Schema.Json>>
   >
 }> = Schema.Struct({
   ...BasePart.fields,

package/src/unstable/ai/Tool.ts

@@ -257,7 +257,7 @@ export interface Tool<
    * instead of being provided when creating the tool call handler layer.
    */
   addDependency<Identifier, Service>(
-    tag: ServiceMap.Service<Identifier, Service>
+    tag: ServiceMap.Key<Identifier, Service>
   ): Tool<Name, Config, Identifier | Requirements>
 
   /**
@@ -311,7 +311,7 @@ export interface Tool<
   /**
    * Add an annotation to the tool.
    */
-  annotate<I, S>(tag: ServiceMap.Service<I, S>, value: S): Tool<Name, Config, Requirements>
+  annotate<I, S>(tag: ServiceMap.Key<I, S>, value: S): Tool<Name, Config, Requirements>
 
   /**
    * Add many annotations to the tool.
@@ -1006,7 +1006,7 @@ const Proto = {
   setFailure(this: Any, failureSchema: Schema.Top) {
     return userDefinedProto({ ...this, failureSchema })
   },
-  annotate<I, S>(this: Any, tag: ServiceMap.Service<I, S>, value: S) {
+  annotate<I, S>(this: Any, tag: ServiceMap.Key<I, S>, value: S) {
     return userDefinedProto({
       ...this,
       annotations: ServiceMap.add(this.annotations, tag, value)
@@ -1150,7 +1150,7 @@ export const make = <
   Success extends Schema.Top = typeof Schema.Void,
   Failure extends Schema.Top = typeof Schema.Never,
   Mode extends FailureMode | undefined = undefined,
-  Dependencies extends Array<ServiceMap.Service<any, any>> = []
+  Dependencies extends Array<ServiceMap.Key<any, any> | ServiceMap.Key<never, any>> = []
 >(name: Name, options?: {
   /**
    * An optional description explaining what the tool does.
@@ -1622,15 +1622,6 @@ export const getJsonSchema = <Tool extends Any>(tool: Tool, options?: {
 export const getJsonSchemaFromSchema = <S extends Schema.Top>(schema: S, options?: {
   readonly transformer?: CodecTransformer
 }): JsonSchema.JsonSchema => {
-  const props = AST.isObjects(schema.ast) ? schema.ast.propertySignatures : []
-  if (props.length === 0) {
-    return {
-      type: "object",
-      properties: {},
-      required: [],
-      additionalProperties: false
-    }
-  }
   if (Predicate.isNotUndefined(options?.transformer)) {
     return options.transformer(schema).jsonSchema
   }
@@ -1661,6 +1652,21 @@ export const getJsonSchemaFromSchema = <S extends Schema.Top>(schema: S, options
  */
 export class Title extends ServiceMap.Service<Title, string>()("effect/ai/Tool/Title") {}
 
+/**
+ * Annotation for providing tool metadata for MCP.
+ *
+ * @example
+ * ```ts
+ * import { Tool } from "effect/unstable/ai"
+ *
+ * const myCalculatorUi = Tool.make("calculator_ui", {})
+ *   .annotate(Tool.Meta, { ui: { resourceUri: "ui://example/calculator-ui" } })
+ * ```
+ * @since 1.0.0
+ * @category annotations
+ */
+export class Meta extends ServiceMap.Service<Meta, Record<string, unknown>>()("effect/ai/Tool/Meta") {}
+
 /**
  * Annotation indicating whether a tool only reads data without making changes.
  *

package/src/unstable/ai/index.ts

@@ -280,7 +280,7 @@ export * as McpServer from "./McpServer.ts"
  *
  * declare const myAnthropicLayer: Layer.Layer<LanguageModel.LanguageModel>
  *
- * const anthropicModel = Model.make("anthropic", myAnthropicLayer)
+ * const anthropicModel = Model.make("anthropic", "claude-3-5-haiku", myAnthropicLayer)
  *
  * const program = Effect.gen(function*() {
  *   const response = yield* LanguageModel.generateText({