effect 4.0.0-beta.1 → 4.0.0-beta.11

package/src/testing/TestClock.ts

@@ -8,8 +8,10 @@ import * as Duration from "../Duration.ts"
 import * as Effect from "../Effect.ts"
 import * as Fiber from "../Fiber.ts"
 import { flow } from "../Function.ts"
+import * as Latch from "../Latch.ts"
 import * as Layer from "../Layer.ts"
 import * as Order from "../Order.ts"
+import * as Semaphore from "../Semaphore.ts"
 
 /**
  * A `TestClock` simplifies deterministically and efficiently testing effects
@@ -79,7 +81,7 @@ export interface TestClock extends Clock.Clock {
    * that were scheduled to occur on or before the new time will be run in
    * order.
    */
-  adjust(duration: Duration.DurationInput): Effect.Effect<void>
+  adjust(duration: Duration.Input): Effect.Effect<void>
   /**
    * Sets the current clock time to the specified `timestamp`. Any effects that
    * were scheduled to occur on or before the new time will be run in order.
@@ -139,7 +141,7 @@ export declare namespace TestClock {
      * The amount of time to wait before displaying a warning message when a
      * test is using time but is not advancing the `TestClock`.
      */
-    readonly warningDelay?: Duration.DurationInput
+    readonly warningDelay?: Duration.Input
   }
 
   /**
@@ -155,7 +157,7 @@ export declare namespace TestClock {
    *   const timestamp = testClock.currentTimeMillisUnsafe()
    *   console.log(timestamp) // Current test time
    *
-   *   // Internal state structure: { timestamp: number, sleeps: Array<[number, Effect.Latch]> }
+   *   // Internal state structure: { timestamp: number, sleeps: Array<[number, Latch.Latch]> }
    * })
    * ```
    *
@@ -164,7 +166,7 @@ export declare namespace TestClock {
    */
   export interface State {
     readonly timestamp: number
-    readonly sleeps: ReadonlyArray<[number, Effect.Latch]>
+    readonly sleeps: ReadonlyArray<[number, Latch.Latch]>
   }
 }
 
@@ -220,10 +222,10 @@ export const make = Effect.fnUntraced(function*(
   const sleeps: Array<{
     readonly sequence: number
     readonly timestamp: number
-    readonly latch: Effect.Latch
+    readonly latch: Latch.Latch
   }> = []
   const liveClock = yield* Clock.clockWith(Effect.succeed)
-  const warningSemaphore = yield* Effect.makeSemaphore(1)
+  const warningSemaphore = yield* Semaphore.make(1)
 
   let currentTimestamp: number = new Date(0).getTime()
   let warningState: WarningState = WarningState.Start()
@@ -292,7 +294,7 @@ export const make = Effect.fnUntraced(function*(
     const millis = Duration.toMillis(duration)
     const end = currentTimestamp + millis
     if (end <= currentTimestamp) return
-    const latch = Effect.makeLatchUnsafe()
+    const latch = Latch.makeUnsafe()
     sleeps.push({
       sequence: sequence++,
       timestamp: end,
@@ -303,7 +305,7 @@ export const make = Effect.fnUntraced(function*(
     yield* latch.await
   })
 
-  const runSemaphore = yield* Effect.makeSemaphore(1)
+  const runSemaphore = yield* Semaphore.make(1)
   const run = Effect.fnUntraced(function*(step: (currentTimestamp: number) => number) {
     yield* Fiber.await(yield* Effect.forkScoped(Effect.yieldNow))
     const endTimestamp = step(currentTimestamp)
@@ -317,8 +319,8 @@ export const make = Effect.fnUntraced(function*(
     currentTimestamp = endTimestamp
   }, runSemaphore.withPermits(1))
 
-  function adjust(duration: Duration.DurationInput) {
-    const millis = Duration.toMillis(Duration.fromDurationInputUnsafe(duration))
+  function adjust(duration: Duration.Input) {
+    const millis = Duration.toMillis(Duration.fromInputUnsafe(duration))
     return warningDone.pipe(Effect.andThen(run((timestamp) => timestamp + millis)))
   }
 
@@ -429,7 +431,7 @@ export const testClockWith = <A, E, R>(
  * @since 2.0.0
  * @category utils
  */
-export const adjust = (duration: Duration.DurationInput): Effect.Effect<void> =>
+export const adjust = (duration: Duration.Input): Effect.Effect<void> =>
   testClockWith((testClock) => testClock.adjust(duration))
 
 /**

package/src/testing/TestSchema.ts

@@ -156,16 +156,16 @@ export class Decoding<S extends Schema.Top> {
   /**
    * Asserts that decoding succeeds with the expected value.
    */
-  async succeed<S extends Schema.Codec<unknown, unknown, never, unknown>>(
+  async succeed<S extends Schema.Decoder<unknown, never>>(
     this: Decoding<S>,
     input: unknown
   ): Promise<void>
-  async succeed<S extends Schema.Codec<unknown, unknown, never, unknown>>(
+  async succeed<S extends Schema.Decoder<unknown, never>>(
     this: Decoding<S>,
     input: unknown,
     expected: S["Type"]
   ): Promise<void>
-  async succeed<S extends Schema.Codec<unknown, unknown, never, unknown>>(
+  async succeed<S extends Schema.Decoder<unknown, never>>(
     this: Decoding<S>,
     input: unknown,
     expected?: S["Type"]
@@ -182,7 +182,7 @@ export class Decoding<S extends Schema.Top> {
   /**
    * Asserts that decoding fails with the expected error message.
    */
-  async fail<S extends Schema.Codec<unknown, unknown, never, unknown>>(
+  async fail<S extends Schema.Decoder<unknown, never>>(
     this: Decoding<S>,
     input: unknown,
     message: string
@@ -232,16 +232,16 @@ class Encoding<S extends Schema.Top> {
   /**
    * Asserts that encoding succeeds with the expected value.
    */
-  async succeed<S extends Schema.Codec<unknown, unknown, unknown, never>>(
+  async succeed<S extends Schema.Encoder<unknown, never>>(
     this: Encoding<S>,
     input: unknown
   ): Promise<void>
-  async succeed<S extends Schema.Codec<unknown, unknown, unknown, never>>(
+  async succeed<S extends Schema.Encoder<unknown, never>>(
     this: Encoding<S>,
     input: unknown,
     expected: S["Encoded"]
   ): Promise<void>
-  async succeed<S extends Schema.Codec<unknown, unknown, unknown, never>>(
+  async succeed<S extends Schema.Encoder<unknown, never>>(
     this: Encoding<S>,
     input: unknown,
     expected?: S["Encoded"]
@@ -258,7 +258,7 @@ class Encoding<S extends Schema.Top> {
   /**
    * Asserts that encoding fails with the expected error message.
    */
-  async fail<S extends Schema.Codec<unknown, unknown, unknown, never>>(
+  async fail<S extends Schema.Encoder<unknown, never>>(
     this: Encoding<S>,
     input: unknown,
     message: string

package/src/unstable/ai/AiError.ts

@@ -247,9 +247,9 @@ export class NetworkError extends Schema.ErrorClass<NetworkError>(
  * @since 1.0.0
  * @category schemas
  */
-export const ProviderMetadata: Schema.Record$<
+export const ProviderMetadata: Schema.$Record<
   Schema.String,
-  Schema.NullOr<Schema.Codec<Schema.MutableJson, Schema.MutableJson, never, never>>
+  Schema.NullOr<Schema.Codec<Schema.MutableJson>>
 > = Schema.Record(Schema.String, Schema.NullOr(Schema.MutableJson))
 
 /**

package/src/unstable/ai/Chat.ts

@@ -53,6 +53,7 @@ import * as Option from "../../Option.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Ref from "../../Ref.ts"
 import * as Schema from "../../Schema.ts"
+import * as Semaphore from "../../Semaphore.ts"
 import * as ServiceMap from "../../ServiceMap.ts"
 import * as Stream from "../../Stream.ts"
 import type { NoExcessProperties } from "../../Types.ts"
@@ -276,7 +277,7 @@ export interface Service {
    */
   readonly generateObject: <
     ObjectEncoded extends Record<string, any>,
-    ObjectSchema extends Schema.Codec<any, ObjectEncoded, any, any>,
+    ObjectSchema extends Schema.Encoder<ObjectEncoded, unknown>,
     Options extends NoExcessProperties<LanguageModel.GenerateObjectOptions<any, ObjectSchema>, Options>,
     Tools extends Record<string, Tool.Any> = {}
   >(options: Options & LanguageModel.GenerateObjectOptions<Tools, ObjectSchema>) => Effect.Effect<
@@ -325,7 +326,7 @@ const encodeHistoryJson = Schema.encodeUnknownEffect(Schema.fromJsonString(Promp
 export const empty: Effect.Effect<Service> = Effect.gen(function*() {
   const history = yield* Ref.make(Prompt.empty)
   const services = yield* Effect.services<never>()
-  const semaphore = yield* Effect.makeSemaphore(1)
+  const semaphore = yield* Semaphore.make(1)
 
   const provideContext = <A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>
     Effect.updateServices(effect, (existing) => ServiceMap.merge(services, existing))
@@ -627,7 +628,7 @@ export declare namespace Persistence {
      * the persistence store, a `ChatNotFoundError` will be returned.
      */
     readonly get: (chatId: string, options?: {
-      readonly timeToLive?: Duration.DurationInput | undefined
+      readonly timeToLive?: Duration.Input | undefined
     }) => Effect.Effect<Persisted, ChatNotFoundError | PersistenceError>
 
     /**
@@ -637,7 +638,7 @@ export declare namespace Persistence {
      * returned.
      */
     readonly getOrCreate: (chatId: string, options?: {
-      readonly timeToLive?: Duration.DurationInput | undefined
+      readonly timeToLive?: Duration.Input | undefined
     }) => Effect.Effect<Persisted, AiError.AiError | PersistenceError>
   }
 }
@@ -680,7 +681,7 @@ export const makePersisted = Effect.fnUntraced(function*(options: {
   const store = yield* persistence.make(options.storeId)
 
   const toPersisted = Effect.fnUntraced(
-    function*(chatId: string, chat: Service, ttl: Duration.DurationInput | undefined) {
+    function*(chatId: string, chat: Service, ttl: Duration.Input | undefined) {
       const idGenerator = yield* Effect.serviceOption(IdGenerator.IdGenerator).pipe(
         Effect.map(Option.getOrElse(() => IdGenerator.defaultIdGenerator))
       )
@@ -712,7 +713,7 @@ export const makePersisted = Effect.fnUntraced(function*(options: {
           yield* Ref.set(chat.history, history)
           // Export the chat history
           const exported = yield* Effect.orDie(chat.export)
-          const timeToLive = Predicate.isNotUndefined(ttl) ? Duration.fromDurationInput(ttl) : undefined
+          const timeToLive = Predicate.isNotUndefined(ttl) ? Duration.fromInput(ttl) : undefined
           // Save the chat to the backing store
           yield* store.set(chatId, exported as object, timeToLive)
         }
@@ -748,13 +749,13 @@ export const makePersisted = Effect.fnUntraced(function*(options: {
   )
 
   const createChat = Effect.fnUntraced(
-    function*(chatId: string, ttl: Duration.DurationInput | undefined) {
+    function*(chatId: string, ttl: Duration.Input | undefined) {
       // Create an empty chat
       const chat = yield* empty
       // Export the chat history
       const history = yield* Effect.orDie(chat.export)
       // Save the history for the newly created chat
-      const timeToLive = Predicate.isNotUndefined(ttl) ? Duration.fromDurationInput(ttl) : undefined
+      const timeToLive = Predicate.isNotUndefined(ttl) ? Duration.fromInput(ttl) : undefined
       yield* store.set(chatId, history as object, timeToLive)
       // Convert the chat to a persisted chat
       return yield* toPersisted(chatId, chat, ttl)
@@ -762,7 +763,7 @@ export const makePersisted = Effect.fnUntraced(function*(options: {
   )
 
   const getChat = Effect.fnUntraced(
-    function*(chatId: string, ttl: Duration.DurationInput | undefined) {
+    function*(chatId: string, ttl: Duration.Input | undefined) {
       // Create an empty chat
       const chat = yield* empty
       // Attempt to retrieve the previous history from the store
@@ -783,7 +784,7 @@ export const makePersisted = Effect.fnUntraced(function*(options: {
 
   const get = Effect.fnUntraced(
     function*(chatId: string, options?: {
-      readonly timeToLive?: Duration.DurationInput | undefined
+      readonly timeToLive?: Duration.Input | undefined
     }) {
       return yield* getChat(chatId, options?.timeToLive)
     },
@@ -795,7 +796,7 @@ export const makePersisted = Effect.fnUntraced(function*(options: {
 
   const getOrCreate = Effect.fnUntraced(
     function*(chatId: string, options?: {
-      readonly timeToLive?: Duration.DurationInput | undefined
+      readonly timeToLive?: Duration.Input | undefined
     }) {
       return yield* getChat(chatId, options?.timeToLive).pipe(
         Effect.catchTag("ChatNotFoundError", () => createChat(chatId, options?.timeToLive))

package/src/unstable/ai/LanguageModel.ts

@@ -135,7 +135,7 @@ export interface Service {
    */
   readonly generateObject: <
     ObjectEncoded extends Record<string, any>,
-    StructuredOutputSchema extends Schema.Codec<any, ObjectEncoded, any, any>,
+    StructuredOutputSchema extends Schema.Encoder<ObjectEncoded, unknown>,
     Options extends NoExcessProperties<
       GenerateObjectOptions<any, StructuredOutputSchema>,
       Options
@@ -728,7 +728,7 @@ export const make: (params: ConstructorParams) => Effect.Effect<Service> = Effec
 
   const generateObject = <
     ObjectEncoded extends Record<string, any>,
-    StructuredOutputSchema extends Schema.Codec<any, ObjectEncoded, any, any>,
+    StructuredOutputSchema extends Schema.Encoder<ObjectEncoded, unknown>,
     Options extends NoExcessProperties<
       GenerateObjectOptions<any, StructuredOutputSchema>,
       Options
@@ -984,6 +984,13 @@ export const make: (params: ConstructorParams) => Effect.Effect<Service> = Effec
           toolMessage
         ])
       }
+
+      // Strip consumed approval artifacts so they don't reach the provider
+      providerOptions.prompt = stripResolvedApprovals(
+        providerOptions.prompt,
+        approved,
+        denied
+      )
     }
 
     const tools = typeof toolChoice === "object" && "oneOf" in toolChoice
@@ -1165,6 +1172,13 @@ export const make: (params: ConstructorParams) => Effect.Effect<Service> = Effec
           toolMessage
         ])
       }
+
+      // Strip consumed approval artifacts so they don't reach the provider
+      providerOptions.prompt = stripResolvedApprovals(
+        providerOptions.prompt,
+        pendingApproved,
+        pendingDenied
+      )
     }
 
     const tools = typeof toolChoice === "object" && "oneOf" in toolChoice
@@ -1359,7 +1373,7 @@ export const generateText = <
  */
 export const generateObject = <
   ObjectEncoded extends Record<string, any>,
-  StructuredOutputSchema extends Schema.Codec<any, ObjectEncoded, any, any>,
+  StructuredOutputSchema extends Schema.Encoder<ObjectEncoded, unknown>,
   Options extends NoExcessProperties<
     GenerateObjectOptions<any, StructuredOutputSchema>,
     Options
@@ -1506,6 +1520,63 @@ const collectToolApprovals = (
   return { approved, denied }
 }
 
+/**
+ * Strip resolved approval artifacts from the prompt before sending to the
+ * provider. After pre-resolving approvals (executing approved tools and
+ * creating denial results), the original `tool-approval-request` parts in
+ * assistant messages and `tool-approval-response` parts in tool messages are
+ * no longer needed. Leaving them in causes provider-specific errors (e.g.
+ * OpenAI rejects `mcp_approval_response` items that reference approval
+ * requests it never issued).
+ */
+const stripResolvedApprovals = (
+  prompt: Prompt.Prompt,
+  approved: ReadonlyArray<ApprovalResult>,
+  denied: ReadonlyArray<ApprovalResult>
+): Prompt.Prompt => {
+  const resolvedApprovalIds = new Set<string>()
+  for (const a of approved) resolvedApprovalIds.add(a.approvalId)
+  for (const d of denied) resolvedApprovalIds.add(d.approvalId)
+
+  const cleanedMessages: Array<Prompt.Message> = []
+
+  for (const message of prompt.content) {
+    if (message.role === "assistant") {
+      const filteredContent = message.content.filter(
+        (part) =>
+          part.type !== "tool-approval-request" ||
+          !resolvedApprovalIds.has(part.approvalId)
+      )
+      if (filteredContent.length > 0) {
+        cleanedMessages.push(
+          Prompt.makeMessage("assistant", {
+            content: filteredContent,
+            options: message.options
+          })
+        )
+      }
+    } else if (message.role === "tool") {
+      const filteredContent = message.content.filter(
+        (part) =>
+          part.type !== "tool-approval-response" ||
+          !resolvedApprovalIds.has(part.approvalId)
+      )
+      if (filteredContent.length > 0) {
+        cleanedMessages.push(
+          Prompt.makeMessage("tool", {
+            content: filteredContent,
+            options: message.options
+          })
+        )
+      }
+    } else {
+      cleanedMessages.push(message)
+    }
+  }
+
+  return Prompt.fromMessages(cleanedMessages)
+}
+
 const isApprovalNeeded = Effect.fnUntraced(function*<T extends Tool.Any>(
   tool: T,
   toolCall: Response.ToolCallPartEncoded,

package/src/unstable/ai/McpServer.ts

@@ -992,14 +992,14 @@ export const prompt = <
  * @since 4.0.0
  * @category elicitation
  */
-export const elicit: <S extends Schema.Codec<any, Record<string, unknown>, any, any>>(options: {
+export const elicit: <S extends Schema.Encoder<Record<string, unknown>, unknown>>(options: {
   readonly message: string
   readonly schema: S
 }) => Effect.Effect<
   S["Type"],
   ElicitationDeclined,
   McpServerClient | S["DecodingServices"]
-> = Effect.fnUntraced(function*<S extends Schema.Codec<any, Record<string, unknown>, any, any>>(options: {
+> = Effect.fnUntraced(function*<S extends Schema.Encoder<Record<string, unknown>, unknown>>(options: {
   readonly message: string
   readonly schema: S
 }) {

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({