effect 4.0.0-beta.43 → 4.0.0-beta.45

package/src/unstable/ai/McpServer.ts

@@ -3,6 +3,7 @@
  */
 import * as Arr from "../../Array.ts"
 import * as Cause from "../../Cause.ts"
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Exit from "../../Exit.ts"
 import * as Fiber from "../../Fiber.ts"
@@ -13,7 +14,6 @@ import * as RcMap from "../../RcMap.ts"
 import { CurrentLogLevel } from "../../References.ts"
 import * as Schema from "../../Schema.ts"
 import * as AST from "../../SchemaAST.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Sink from "../../Sink.ts"
 import type { Stdio } from "../../Stdio.ts"
 import * as Stream from "../../Stream.ts"
@@ -24,7 +24,7 @@ import { appendPreResponseHandlerUnsafe } from "../http/HttpEffect.ts"
 import * as HttpRouter from "../http/HttpRouter.ts"
 import * as HttpServerRequest from "../http/HttpServerRequest.ts"
 import * as HttpServerResponse from "../http/HttpServerResponse.ts"
-import type * as Rpc from "../rpc/Rpc.ts"
+import * as Rpc from "../rpc/Rpc.ts"
 import * as RpcClient from "../rpc/RpcClient.ts"
 import type * as RpcGroup from "../rpc/RpcGroup.ts"
 import * as RpcMessage from "../rpc/RpcMessage.ts"
@@ -75,18 +75,18 @@ import type * as Toolkit from "./Toolkit.ts"
  * @since 4.0.0
  * @category server
  */
-export class McpServer extends ServiceMap.Service<McpServer, {
+export class McpServer extends Context.Service<McpServer, {
   readonly notifications: RpcClient.RpcClient<RpcGroup.Rpcs<typeof ServerNotificationRpcs>>
   readonly notificationsQueue: Queue.Dequeue<RpcMessage.Request<any>>
   readonly initializedClients: Set<number>
 
   readonly tools: ReadonlyArray<{
     readonly tool: McpTool
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
   }>
   readonly addTool: (options: {
     readonly tool: McpTool
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
     readonly handle: (payload: any) => Effect.Effect<CallToolResult, never, McpServerClient>
   }) => Effect.Effect<void>
   readonly callTool: (
@@ -95,22 +95,22 @@ export class McpServer extends ServiceMap.Service<McpServer, {
 
   readonly resources: ReadonlyArray<{
     readonly resource: Resource
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
   }>
   readonly addResource: (options: {
     readonly resource: Resource
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
     readonly handle: Effect.Effect<typeof ReadResourceResult.Type, InternalError, McpServerClient>
   }) => Effect.Effect<void>
 
   readonly resourceTemplates: ReadonlyArray<{
     readonly template: ResourceTemplate
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
   }>
   readonly addResourceTemplate: (
     options: {
       readonly template: ResourceTemplate
-      readonly annotations: ServiceMap.ServiceMap<never>
+      readonly annotations: Context.Context<never>
       readonly routerPath: string
       readonly completions: Record<string, (input: string) => Effect.Effect<CompleteResult, InternalError>>
       readonly handle: (
@@ -126,11 +126,11 @@ export class McpServer extends ServiceMap.Service<McpServer, {
 
   readonly prompts: ReadonlyArray<{
     readonly prompt: Prompt
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
   }>
   readonly addPrompt: (options: {
     readonly prompt: Prompt
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
     readonly completions: Record<
       string,
       (input: string) => Effect.Effect<CompleteResult, InternalError, McpServerClient>
@@ -165,20 +165,20 @@ export class McpServer extends ServiceMap.Service<McpServer, {
     >()
     const tools = Arr.empty<{
       readonly tool: McpTool
-      readonly annotations: ServiceMap.ServiceMap<never>
+      readonly annotations: Context.Context<never>
     }>()
     const toolMap = new Map<string, (payload: any) => Effect.Effect<CallToolResult, InternalError, McpServerClient>>()
     const resources: Array<{
       readonly resource: Resource
-      readonly annotations: ServiceMap.ServiceMap<never>
+      readonly annotations: Context.Context<never>
     }> = []
     const resourceTemplates: Array<{
       readonly template: ResourceTemplate
-      readonly annotations: ServiceMap.ServiceMap<never>
+      readonly annotations: Context.Context<never>
     }> = []
     const prompts: Array<{
       readonly prompt: Prompt
-      readonly annotations: ServiceMap.ServiceMap<never>
+      readonly annotations: Context.Context<never>
     }> = []
     const promptMap = new Map<
       string,
@@ -353,9 +353,11 @@ export const run: (options: {
         Effect.provideServiceEffect(
           RpcClient.Protocol,
           RpcClient.Protocol.make(Effect.fnUntraced(function*(writeResponse) {
-            write = writeResponse
+            let cid = 0
+            write = (message) => writeResponse(cid, message)
             return {
-              send(request, _transferables) {
+              send(id, request, _transferables) {
+                cid = id
                 return protocol.send(clientId, {
                   ...request,
                   headers: undefined,
@@ -377,8 +379,8 @@ export const run: (options: {
     idleTimeToLive: 10000
   })
 
-  const clientMiddleware = McpServerClientMiddleware.of((effect, { clientId, headers, rpc }) => {
-    const initializePayload = getInitializedClient(clientSessions, clientId, headers)
+  const clientMiddleware = McpServerClientMiddleware.of((effect, { client, headers, rpc }) => {
+    const initializePayload = getInitializedClient(clientSessions, client.id, headers)
     const isInitialize = rpc._tag === "initialize"
     if (!isInitialize && !initializePayload) {
       return Effect.die(new Error(`Mcp-Session-Id does not exist`))
@@ -387,9 +389,9 @@ export const run: (options: {
       effect,
       McpServerClient,
       McpServerClient.of({
-        clientId,
+        clientId: client.id,
         initializePayload: initializePayload!,
-        getClient: RcMap.get(clients, clientId).pipe(
+        getClient: RcMap.get(clients, client.id).pipe(
           Effect.map(({ client }) => client)
         )
       })
@@ -407,7 +409,7 @@ export const run: (options: {
           case "Request": {
             if (isHttp) {
               const fiber = Fiber.getCurrent()!
-              const httpRequest = ServiceMap.getUnsafe(fiber.services, HttpServerRequest.HttpServerRequest)
+              const httpRequest = Context.getUnsafe(fiber.context, HttpServerRequest.HttpServerRequest)
               const client = getInitializedClient(clientSessions, clientId, httpRequest.headers)
               if (client) {
                 appendPreResponseHandlerUnsafe(httpRequest, (_, res) =>
@@ -429,7 +431,7 @@ export const run: (options: {
                 ? handler.handler(request.payload, {
                   rpc,
                   requestId: RpcMessage.RequestId(request.id),
-                  clientId,
+                  client: new Rpc.ServerClient(clientId),
                   headers: Headers.fromInput(request.headers)
                 }) as Effect.Effect<void>
                 : Effect.void
@@ -607,23 +609,23 @@ export const registerToolkit: <Tools extends Record<string, Tool.Any>>(
     never,
     Exclude<Tool.HandlersFor<Tools>, McpServerClient>
   >)
-  const services = yield* Effect.services<never>()
+  const services = yield* Effect.context<never>()
   for (const tool of Object.values(built.tools)) {
     const annotations = tool.annotations
-    const toolMeta = ServiceMap.getOrUndefined(annotations, Tool.Meta)
+    const toolMeta = Context.getOrUndefined(annotations, Tool.Meta)
     const mcpTool = new McpTool({
       name: tool.name,
       description: Tool.getDescription(tool),
       inputSchema: Tool.getJsonSchema(tool),
       annotations: {
-        ...(ServiceMap.getOption(tool.annotations, Tool.Title).pipe(
+        ...(Context.getOption(tool.annotations, Tool.Title).pipe(
           Option.map((title) => ({ title })),
           Option.getOrUndefined
         )),
-        readOnlyHint: ServiceMap.get(tool.annotations, Tool.Readonly),
-        destructiveHint: ServiceMap.get(tool.annotations, Tool.Destructive),
-        idempotentHint: ServiceMap.get(tool.annotations, Tool.Idempotent),
-        openWorldHint: ServiceMap.get(tool.annotations, Tool.OpenWorld)
+        readOnlyHint: Context.get(tool.annotations, Tool.Readonly),
+        destructiveHint: Context.get(tool.annotations, Tool.Destructive),
+        idempotentHint: Context.get(tool.annotations, Tool.Idempotent),
+        openWorldHint: Context.get(tool.annotations, Tool.OpenWorld)
       },
       _meta: toolMeta
     })
@@ -635,7 +637,7 @@ export const registerToolkit: <Tools extends Record<string, Tool.Any>>(
           Stream.unwrap,
           Stream.run(Sink.last()),
           Effect.flatMap(Effect.fromOption),
-          Effect.provideServices(services as ServiceMap.ServiceMap<any>),
+          Effect.provideContext(services as Context.Context<any>),
           Effect.matchCause({
             onFailure: (cause) =>
               new CallToolResult({
@@ -724,7 +726,7 @@ export const registerResource: {
         E,
         R
       >
-      readonly annotations?: ServiceMap.ServiceMap<never> | undefined
+      readonly annotations?: Context.Context<never> | undefined
     }
   ): Effect.Effect<void, never, Exclude<R, McpServerClient> | McpServer>
   /**
@@ -749,7 +751,7 @@ export const registerResource: {
       E,
       R
     >
-    readonly annotations?: ServiceMap.ServiceMap<never> | undefined
+    readonly annotations?: Context.Context<never> | undefined
   }) => Effect.Effect<
     void,
     never,
@@ -774,10 +776,10 @@ export const registerResource: {
       readonly audience?: ReadonlyArray<"user" | "assistant"> | undefined
       readonly priority?: number | undefined
       readonly content: Effect.Effect<typeof ReadResourceResult.Type | string | Uint8Array, any, any>
-      readonly annotations?: ServiceMap.ServiceMap<never> | undefined
+      readonly annotations?: Context.Context<never> | undefined
     }
     return Effect.gen(function*() {
-      const services = yield* Effect.services<any>()
+      const services = yield* Effect.context<any>()
       const registry = yield* McpServer
       yield* registry.addResource({
         resource: new Resource({
@@ -785,14 +787,14 @@ export const registerResource: {
           annotations: options
         }),
         handle: options.content.pipe(
-          Effect.provideServices(services),
+          Effect.provideContext(services),
           Effect.map((content) => resolveResourceContent(options.uri, content)),
           Effect.catchCause((cause) => {
             const prettyError = Cause.prettyErrors(cause)[0]
             return Effect.fail(new InternalError({ message: prettyError.message }))
           })
         ),
-        annotations: options.annotations ?? ServiceMap.empty()
+        annotations: options.annotations ?? Context.empty()
       })
     })
   }
@@ -814,9 +816,9 @@ export const registerResource: {
       E,
       R
     >
-    readonly annotations?: ServiceMap.ServiceMap<never> | undefined
+    readonly annotations?: Context.Context<never> | undefined
   }) {
-    const services = yield* Effect.services<any>()
+    const services = yield* Effect.context<any>()
     const registry = yield* McpServer
     const decode = Schema.decodeUnknownEffect(schema)
     const template = new ResourceTemplate({
@@ -841,7 +843,7 @@ export const registerResource: {
             const prettyError = Cause.prettyErrors(cause)[0]
             return Effect.fail(new InternalError({ message: prettyError.message }))
           }),
-          Effect.provideServices(services)
+          Effect.provideContext(services)
         )
       completions[param] = handler
     }
@@ -849,7 +851,7 @@ export const registerResource: {
       template,
       routerPath,
       completions,
-      annotations: options.annotations ?? ServiceMap.empty(),
+      annotations: options.annotations ?? Context.empty(),
       handle: (uri, params) =>
         decode(params).pipe(
           Effect.mapError((error) => new InvalidParams({ message: error.message })),
@@ -862,7 +864,7 @@ export const registerResource: {
               })
             )
           ),
-          Effect.provideServices(services)
+          Effect.provideContext(services)
         )
     })
   })
@@ -962,7 +964,7 @@ export const registerPrompt = <
     readonly parameters?: Params | undefined
     readonly completion?: ValidateCompletions<Completions, Extract<keyof Params, string>> | undefined
     readonly content: (params: Params) => Effect.Effect<Array<typeof PromptMessage.Type> | string, E, R>
-    readonly annotations?: ServiceMap.ServiceMap<never> | undefined
+    readonly annotations?: Context.Context<never> | undefined
   }
 ): Effect.Effect<void, never, Exclude<Schema.Struct.DecodingServices<Params> | R, McpServerClient> | McpServer> => {
   const args = Arr.empty<typeof PromptArgument.Type>()
@@ -985,7 +987,7 @@ export const registerPrompt = <
   const completion: Record<string, (input: string) => Effect.Effect<any>> = options.completion ?? {}
   return Effect.gen(function*() {
     const registry = yield* McpServer
-    const services = yield* Effect.services<Exclude<R | Schema.Struct.DecodingServices<Params>, McpServerClient>>()
+    const services = yield* Effect.context<Exclude<R | Schema.Struct.DecodingServices<Params>, McpServerClient>>()
     const completions: Record<
       string,
       (input: string) => Effect.Effect<CompleteResult, InternalError, McpServerClient>
@@ -1013,7 +1015,7 @@ export const registerPrompt = <
     yield* registry.addPrompt({
       prompt,
       completions,
-      annotations: options.annotations ?? ServiceMap.empty(),
+      annotations: options.annotations ?? Context.empty(),
       handle: (params) =>
         decode(params).pipe(
           Effect.mapError((error) => new InvalidParams({ message: error.message })),
@@ -1022,7 +1024,7 @@ export const registerPrompt = <
             messages = typeof messages === "string" ?
               [{
                 role: "user",
-                content: TextContent.makeUnsafe({ text: messages })
+                content: TextContent.make({ text: messages })
               }] :
               messages
             return new GetPromptResult({ messages, description: prompt.description })
@@ -1031,7 +1033,7 @@ export const registerPrompt = <
             const prettyError = Cause.prettyErrors(cause)[0]
             return Effect.fail(new InternalError({ message: prettyError.message }))
           }),
-          Effect.provideServices(services as ServiceMap.ServiceMap<unknown>)
+          Effect.provideContext(services as Context.Context<unknown>)
         )
     })
   })
@@ -1059,7 +1061,7 @@ export const prompt = <
     readonly content: (
       params: Schema.Struct.Type<Params>
     ) => Effect.Effect<Array<typeof PromptMessage.Type> | string, E, R>
-    readonly annotations?: ServiceMap.ServiceMap<never> | undefined
+    readonly annotations?: Context.Context<never> | undefined
   }
 ): Layer.Layer<never, never, Exclude<Schema.Struct.DecodingServices<Params> | R, McpServerClient>> =>
   Layer.effectDiscard(registerPrompt(options)).pipe(
@@ -1086,7 +1088,7 @@ export const elicit: <S extends Schema.Encoder<Record<string, unknown>, unknown>
   const { getClient } = yield* McpServerClient
   const client = yield* getClient
   const schema = options.schema
-  const request = Elicit.payloadSchema.makeUnsafe({
+  const request = Elicit.payloadSchema.make({
     message: options.message,
     requestedSchema: Tool.getJsonSchemaFromSchema(schema)
   })
@@ -1176,7 +1178,7 @@ const layerHandlers = (serverInfo: {
       return ClientRpcs.of({
         // Requests
         ping: () => Effect.succeed({}),
-        initialize(params, { clientId }) {
+        initialize(params, { client }) {
           const requestedVersion = SUPPORTED_PROTOCOL_VERSIONS.includes(params.protocolVersion)
             ? params.protocolVersion
             : LATEST_PROTOCOL_VERSION
@@ -1205,7 +1207,7 @@ const layerHandlers = (serverInfo: {
             capabilities.extensions = serverInfo.extensions as any
           }
           return Effect.withFiber((fiber) => {
-            const httpRequest = ServiceMap.getOrUndefined(fiber.services, HttpServerRequest.HttpServerRequest)
+            const httpRequest = Context.getOrUndefined(fiber.context, HttpServerRequest.HttpServerRequest)
             if (httpRequest) {
               const sessionId = crypto.randomUUID()
               options.clientSessions.set(sessionId, params)
@@ -1215,7 +1217,7 @@ const layerHandlers = (serverInfo: {
                   [mcpProtocolVersionHeader]: requestedVersion
                 })))
             } else {
-              options.clientSessions.set(String(clientId), params)
+              options.clientSessions.set(String(client.id), params)
             }
             return Effect.succeed({
               capabilities,
@@ -1255,15 +1257,15 @@ const layerHandlers = (serverInfo: {
           server.getPromptResult(r).pipe(
             Effect.provideService(CurrentLogLevel, currentLogLevel)
           ),
-        "prompts/list": (_, { clientId, headers }) =>
+        "prompts/list": (_, { client, headers }) =>
           Effect.sync(() => {
-            const client = getInitializedClient(options.clientSessions, clientId, headers)
-            return new ListPromptsResult({ prompts: filterByClient(client, server.prompts, "prompt") })
+            const initialized = getInitializedClient(options.clientSessions, client.id, headers)
+            return new ListPromptsResult({ prompts: filterByClient(initialized, server.prompts, "prompt") })
           }),
-        "resources/list": (_, { clientId, headers }) =>
+        "resources/list": (_, { client, headers }) =>
           Effect.sync(() => {
-            const client = getInitializedClient(options.clientSessions, clientId, headers)
-            return new ListResourcesResult({ resources: filterByClient(client, server.resources, "resource") })
+            const initialized = getInitializedClient(options.clientSessions, client.id, headers)
+            return new ListResourcesResult({ resources: filterByClient(initialized, server.resources, "resource") })
           }),
         "resources/read": ({ uri }) =>
           server.findResource(uri).pipe(
@@ -1273,22 +1275,22 @@ const layerHandlers = (serverInfo: {
           InternalError.notImplemented.asEffect(),
         "resources/unsubscribe": () =>
           InternalError.notImplemented.asEffect(),
-        "resources/templates/list": (_, { clientId, headers }) =>
+        "resources/templates/list": (_, { client, headers }) =>
           Effect.sync(() => {
-            const client = getInitializedClient(options.clientSessions, clientId, headers)
+            const initialized = getInitializedClient(options.clientSessions, client.id, headers)
             return new ListResourceTemplatesResult({
-              resourceTemplates: filterByClient(client, server.resourceTemplates, "template")
+              resourceTemplates: filterByClient(initialized, server.resourceTemplates, "template")
             })
           }),
         "tools/call": (r) =>
           server.callTool(r).pipe(
             Effect.provideService(CurrentLogLevel, currentLogLevel)
           ),
-        "tools/list": (_, { clientId, headers }) =>
+        "tools/list": (_, { client, headers }) =>
           Effect.sync(() => {
-            const client = getInitializedClient(options.clientSessions, clientId, headers)
+            const initialized = getInitializedClient(options.clientSessions, client.id, headers)
             return new ListToolsResult({
-              tools: filterByClient(client, server.tools, "tool")
+              tools: filterByClient(initialized, server.tools, "tool")
             })
           }),
 
@@ -1325,7 +1327,7 @@ const resolveResourceContent = (
 
 const filterByClient = <
   A extends {
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
   },
   P extends keyof A
 >(
@@ -1339,7 +1341,7 @@ const filterByClient = <
   const out = Arr.empty<A[P]>()
   for (let i = 0; i < items.length; i++) {
     const item = items[i]
-    const enabledWhen = ServiceMap.getOrUndefined(item.annotations, EnabledWhen)
+    const enabledWhen = Context.getOrUndefined(item.annotations, EnabledWhen)
     if (!enabledWhen || enabledWhen(client)) {
       out.push(item[prop])
     }

package/src/unstable/ai/Model.ts

@@ -28,11 +28,11 @@
  *
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import { identity } from "../../Function.ts"
 import { PipeInspectableProto, YieldableProto } from "../../internal/core.ts"
 import * as Layer from "../../Layer.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 
 const TypeId = "~effect/ai/Model" as const
 
@@ -80,7 +80,7 @@ export interface Model<in out Provider, in out Provides, in out Requires>
  * @since 4.0.0
  * @category services
  */
-export class ProviderName extends ServiceMap.Service<ProviderName, string>()(
+export class ProviderName extends Context.Service<ProviderName, string>()(
   "effect/unstable/ai/Model/ProviderName"
 ) {}
 
@@ -94,7 +94,7 @@ export class ProviderName extends ServiceMap.Service<ProviderName, string>()(
  * @since 4.0.0
  * @category services
  */
-export class ModelName extends ServiceMap.Service<ModelName, string>()(
+export class ModelName extends Context.Service<ModelName, string>()(
   "effect/unstable/ai/Model/ModelName"
 ) {}
 
@@ -108,8 +108,8 @@ const Proto = {
     _RIn: identity
   },
   asEffect(this: Model<any, any, any>) {
-    return Effect.servicesWith((services: ServiceMap.ServiceMap<never>) =>
-      Effect.succeed(Layer.provide(this, Layer.succeedServices(services)))
+    return Effect.contextWith((context: Context.Context<never>) =>
+      Effect.succeed(Layer.provide(this, Layer.succeedContext(context)))
     )
   },
   toJSON(this: Model<any, any, any>): unknown {
@@ -171,9 +171,9 @@ export const make = <const Provider extends string, const Name extends string, P
     { provider },
     Layer.merge(
       layer,
-      Layer.succeedServices(
-        ProviderName.serviceMap(provider).pipe(
-          ServiceMap.add(ModelName, modelName)
+      Layer.succeedContext(
+        ProviderName.context(provider).pipe(
+          Context.add(ModelName, modelName)
         )
       )
     )

package/src/unstable/ai/Prompt.ts

@@ -53,7 +53,7 @@
  */
 import * as Arr from "../../Array.ts"
 import * as Effect from "../../Effect.ts"
-import { constFalse, dual } from "../../Function.ts"
+import { dual } from "../../Function.ts"
 import * as Option from "../../Option.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
@@ -63,8 +63,6 @@ import * as Parser from "../../SchemaParser.ts"
 import * as SchemaTransformation from "../../SchemaTransformation.ts"
 import type * as Response from "./Response.ts"
 
-const constEmptyObject = () => ({})
-
 // =============================================================================
 // Options
 // =============================================================================
@@ -103,8 +101,6 @@ export type ProviderOptions = typeof ProviderOptions.Type
 
 const PartTypeId = "~effect/ai/Prompt/Part" as const
 
-const constPartTypeId = () => PartTypeId
-
 /**
  * Type guard to check if a value is a Part.
  *
@@ -185,9 +181,9 @@ export interface BasePartEncoded<Type extends string, Options extends ProviderOp
 
 const BasePart = Schema.Struct({
   [PartTypeId]: Schema.Literal(PartTypeId).pipe(
-    Schema.withDecodingDefaultKey(constPartTypeId, { encodingStrategy: "omit" })
+    Schema.withDecodingDefaultKey(Effect.succeed(PartTypeId), { encodingStrategy: "omit" })
   ),
-  options: ProviderOptions.pipe(Schema.withDecodingDefault(constEmptyObject))
+  options: ProviderOptions.pipe(Schema.withDecodingDefault(Effect.succeed({})))
 })
 
 /**
@@ -618,7 +614,7 @@ export const ToolCallPart: Schema.Struct<{
   id: Schema.String,
   name: Schema.String,
   params: Schema.Unknown,
-  providerExecuted: Schema.Boolean.pipe(Schema.withDecodingDefault(constFalse))
+  providerExecuted: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false)))
 }).annotate({ identifier: "ToolCallPart" })
 
 /**
@@ -970,8 +966,6 @@ export const toolApprovalRequestPart = (
 
 const MessageTypeId = "~effect/ai/Prompt/Message" as const
 
-const constMessageTypeId = () => MessageTypeId
-
 /**
  * Type guard to check if a value is a Message.
  *
@@ -1021,9 +1015,9 @@ export interface BaseMessageEncoded<Role extends string, Options extends Provide
 
 const BaseMessage = Schema.Struct({
   [MessageTypeId]: Schema.Literal(MessageTypeId).pipe(
-    Schema.withDecodingDefaultKey(constMessageTypeId, { encodingStrategy: "omit" })
+    Schema.withDecodingDefaultKey(Effect.succeed(MessageTypeId), { encodingStrategy: "omit" })
   ),
-  options: ProviderOptions.pipe(Schema.withDecodingDefault(constEmptyObject))
+  options: ProviderOptions.pipe(Schema.withDecodingDefault(Effect.succeed({})))
 })
 
 /**

package/src/unstable/ai/Response.ts

@@ -27,7 +27,8 @@
  * @since 1.0.0
  */
 import type * as DateTime from "../../DateTime.ts"
-import { constFalse, identity } from "../../Function.ts"
+import * as Effect from "../../Effect.ts"
+import { identity } from "../../Function.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
 import * as SchemaTransformation from "../../SchemaTransformation.ts"
@@ -36,9 +37,6 @@ import type * as Toolkit from "./Toolkit.ts"
 
 const PartTypeId = "~effect/ai/Content/Part" as const
 
-const constEmptyObject = () => ({})
-const constPartTypeId = () => PartTypeId
-
 // =============================================================================
 // All Parts
 // =============================================================================
@@ -503,10 +501,10 @@ export interface BasePartEncoded<Type extends string, Metadata extends ProviderM
 
 const BasePart = Schema.Struct({
   [PartTypeId]: Schema.tag(PartTypeId).pipe(
-    Schema.withDecodingDefaultKey(constPartTypeId, { encodingStrategy: "omit" })
+    Schema.withDecodingDefaultKey(Effect.succeed(PartTypeId), { encodingStrategy: "omit" })
   ),
   metadata: ProviderMetadata.pipe(
-    Schema.withDecodingDefault(constEmptyObject)
+    Schema.withDecodingDefault(Effect.succeed({}))
   )
 })
 
@@ -1166,7 +1164,7 @@ export const ToolParamsStartPart: Schema.Struct<{
   type: Schema.tag("tool-params-start"),
   id: Schema.String,
   name: Schema.String,
-  providerExecuted: Schema.Boolean.pipe(Schema.withDecodingDefaultKey(constFalse))
+  providerExecuted: Schema.Boolean.pipe(Schema.withDecodingDefaultKey(Effect.succeed(false)))
 }).annotate({ identifier: "ToolParamsStartPart" }) satisfies Schema.Codec<
   ToolParamsStartPart,
   ToolParamsStartPartEncoded
@@ -1427,7 +1425,7 @@ export const ToolCallPart: <const Name extends string, Params extends Schema.Top
     id: Schema.String,
     name: Schema.Literal(name),
     params,
-    providerExecuted: Schema.Boolean.pipe(Schema.withDecodingDefaultKey(constFalse))
+    providerExecuted: Schema.Boolean.pipe(Schema.withDecodingDefaultKey(Effect.succeed(false)))
   }).annotate({ identifier: "ToolCallPart" }) as any
 
 /**

package/src/unstable/ai/ResponseIdTracker.ts

@@ -1,9 +1,9 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Option from "../../Option.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Prompt from "./Prompt.ts"
 
 /**
@@ -29,9 +29,7 @@ export interface Service {
  * @since 4.0.0
  * @category Services
  */
-export class ResponseIdTracker
-  extends ServiceMap.Service<ResponseIdTracker, Service>()("effect/ai/ResponseIdTracker")
-{}
+export class ResponseIdTracker extends Context.Service<ResponseIdTracker, Service>()("effect/ai/ResponseIdTracker") {}
 
 /**
  * @since 4.0.0

package/src/unstable/ai/Telemetry.ts

@@ -31,9 +31,9 @@
  *
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import { dual } from "../../Function.ts"
 import * as Predicate from "../../Predicate.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as String from "../../String.ts"
 import type * as Struct from "../../Struct.ts"
 import type { Span } from "../../Tracer.ts"
@@ -545,6 +545,6 @@ export interface SpanTransformer {
  * @since 4.0.0
  * @category services
  */
-export class CurrentSpanTransformer extends ServiceMap.Service<CurrentSpanTransformer, SpanTransformer>()(
+export class CurrentSpanTransformer extends Context.Service<CurrentSpanTransformer, SpanTransformer>()(
   "effect/ai/Telemetry/CurrentSpanTransformer"
 ) {}