effect 4.0.0-beta.19 → 4.0.0-beta.20

package/src/unstable/ai/AiError.ts

@@ -89,8 +89,11 @@ import { HttpRequestDetails, HttpResponseDetails } from "./Response.ts"
 
 const ReasonTypeId = "~effect/unstable/ai/AiError/Reason" as const
 
-const constEmptyObjectOption = () => Option.some({})
-const constEmptyObject = () => ({})
+const providerMetadataWithDefaults = <Metadata extends ProviderMetadata>() =>
+  (ProviderMetadata as unknown as typeof ProviderMetadata & Schema.Schema<Metadata>).pipe(
+    Schema.withConstructorDefault(() => Option.some({} as Metadata)),
+    Schema.withDecodingDefault(() => ({} as Metadata))
+  )
 
 const redactHeaders = (headers: Record<string, string>): Record<string, string> => {
   const redacted = redact(headers) as Record<string, string | Redacted.Redacted>
@@ -258,6 +261,86 @@ export const ProviderMetadata: Schema.$Record<
  */
 export type ProviderMetadata = typeof ProviderMetadata.Type
 
+/**
+ * Provider-specific metadata attached to `RateLimitError`.
+ *
+ * @since 1.0.0
+ * @category provider options
+ */
+export interface RateLimitErrorMetadata extends ProviderMetadata {}
+
+/**
+ * Provider-specific metadata attached to `QuotaExhaustedError`.
+ *
+ * @since 1.0.0
+ * @category provider options
+ */
+export interface QuotaExhaustedErrorMetadata extends ProviderMetadata {}
+
+/**
+ * Provider-specific metadata attached to `AuthenticationError`.
+ *
+ * @since 1.0.0
+ * @category provider options
+ */
+export interface AuthenticationErrorMetadata extends ProviderMetadata {}
+
+/**
+ * Provider-specific metadata attached to `ContentPolicyError`.
+ *
+ * @since 1.0.0
+ * @category provider options
+ */
+export interface ContentPolicyErrorMetadata extends ProviderMetadata {}
+
+/**
+ * Provider-specific metadata attached to `InvalidRequestError`.
+ *
+ * @since 1.0.0
+ * @category provider options
+ */
+export interface InvalidRequestErrorMetadata extends ProviderMetadata {}
+
+/**
+ * Provider-specific metadata attached to `InternalProviderError`.
+ *
+ * @since 1.0.0
+ * @category provider options
+ */
+export interface InternalProviderErrorMetadata extends ProviderMetadata {}
+
+/**
+ * Provider-specific metadata attached to `InvalidOutputError`.
+ *
+ * @since 1.0.0
+ * @category provider options
+ */
+export interface InvalidOutputErrorMetadata extends ProviderMetadata {}
+
+/**
+ * Provider-specific metadata attached to `StructuredOutputError`.
+ *
+ * @since 1.0.0
+ * @category provider options
+ */
+export interface StructuredOutputErrorMetadata extends ProviderMetadata {}
+
+/**
+ * Provider-specific metadata attached to `UnsupportedSchemaError`.
+ *
+ * @since 1.0.0
+ * @category provider options
+ */
+export interface UnsupportedSchemaErrorMetadata extends ProviderMetadata {}
+
+/**
+ * Provider-specific metadata attached to `UnknownError`.
+ *
+ * @since 1.0.0
+ * @category provider options
+ */
+export interface UnknownErrorMetadata extends ProviderMetadata {}
+
 /**
  * Token usage information from AI operations.
  *
@@ -313,10 +396,7 @@ export class RateLimitError extends Schema.ErrorClass<RateLimitError>(
 )({
   _tag: Schema.tag("RateLimitError"),
   retryAfter: Schema.optional(Schema.Duration),
-  metadata: ProviderMetadata.pipe(
-    Schema.withConstructorDefault(constEmptyObjectOption),
-    Schema.withDecodingDefault(constEmptyObject)
-  ),
+  metadata: providerMetadataWithDefaults<RateLimitErrorMetadata>(),
   http: Schema.optional(HttpContext)
 }) {
   /**
@@ -364,10 +444,7 @@ export class QuotaExhaustedError extends Schema.ErrorClass<QuotaExhaustedError>(
 )({
   _tag: Schema.tag("QuotaExhaustedError"),
   resetAt: Schema.optional(Schema.DateTimeUtc),
-  metadata: ProviderMetadata.pipe(
-    Schema.withConstructorDefault(constEmptyObjectOption),
-    Schema.withDecodingDefault(constEmptyObject)
-  ),
+  metadata: providerMetadataWithDefaults<QuotaExhaustedErrorMetadata>(),
   http: Schema.optional(HttpContext)
 }) {
   /**
@@ -417,10 +494,7 @@ export class AuthenticationError extends Schema.ErrorClass<AuthenticationError>(
 )({
   _tag: Schema.tag("AuthenticationError"),
   kind: Schema.Literals(["InvalidKey", "ExpiredKey", "MissingKey", "InsufficientPermissions", "Unknown"]),
-  metadata: ProviderMetadata.pipe(
-    Schema.withConstructorDefault(constEmptyObjectOption),
-    Schema.withDecodingDefault(constEmptyObject)
-  ),
+  metadata: providerMetadataWithDefaults<AuthenticationErrorMetadata>(),
   http: Schema.optional(HttpContext)
 }) {
   /**
@@ -475,10 +549,7 @@ export class ContentPolicyError extends Schema.ErrorClass<ContentPolicyError>(
 )({
   _tag: Schema.tag("ContentPolicyError"),
   description: Schema.String,
-  metadata: ProviderMetadata.pipe(
-    Schema.withConstructorDefault(constEmptyObjectOption),
-    Schema.withDecodingDefault(constEmptyObject)
-  ),
+  metadata: providerMetadataWithDefaults<ContentPolicyErrorMetadata>(),
   http: Schema.optional(HttpContext)
 }) {
   /**
@@ -530,10 +601,7 @@ export class InvalidRequestError extends Schema.ErrorClass<InvalidRequestError>(
   parameter: Schema.optional(Schema.String),
   constraint: Schema.optional(Schema.String),
   description: Schema.optional(Schema.String),
-  metadata: ProviderMetadata.pipe(
-    Schema.withConstructorDefault(constEmptyObjectOption),
-    Schema.withDecodingDefault(constEmptyObject)
-  ),
+  metadata: providerMetadataWithDefaults<InvalidRequestErrorMetadata>(),
   http: Schema.optional(HttpContext)
 }) {
   /**
@@ -585,10 +653,7 @@ export class InternalProviderError extends Schema.ErrorClass<InternalProviderErr
 )({
   _tag: Schema.tag("InternalProviderError"),
   description: Schema.String,
-  metadata: ProviderMetadata.pipe(
-    Schema.withConstructorDefault(constEmptyObjectOption),
-    Schema.withDecodingDefault(constEmptyObject)
-  ),
+  metadata: providerMetadataWithDefaults<InternalProviderErrorMetadata>(),
   http: Schema.optional(HttpContext)
 }) {
   /**
@@ -636,10 +701,7 @@ export class InvalidOutputError extends Schema.ErrorClass<InvalidOutputError>(
 )({
   _tag: Schema.tag("InvalidOutputError"),
   description: Schema.String,
-  metadata: ProviderMetadata.pipe(
-    Schema.withConstructorDefault(constEmptyObjectOption),
-    Schema.withDecodingDefault(constEmptyObject)
-  ),
+  metadata: providerMetadataWithDefaults<InvalidOutputErrorMetadata>(),
   usage: Schema.optional(UsageInfo)
 }) {
   /**
@@ -710,10 +772,7 @@ export class StructuredOutputError extends Schema.ErrorClass<StructuredOutputErr
 )({
   _tag: Schema.tag("StructuredOutputError"),
   description: Schema.String,
-  metadata: ProviderMetadata.pipe(
-    Schema.withConstructorDefault(constEmptyObjectOption),
-    Schema.withDecodingDefault(constEmptyObject)
-  ),
+  metadata: providerMetadataWithDefaults<StructuredOutputErrorMetadata>(),
   usage: Schema.optional(UsageInfo)
 }) {
   /**
@@ -785,10 +844,7 @@ export class UnsupportedSchemaError extends Schema.ErrorClass<UnsupportedSchemaE
 )({
   _tag: Schema.tag("UnsupportedSchemaError"),
   description: Schema.String,
-  metadata: ProviderMetadata.pipe(
-    Schema.withConstructorDefault(constEmptyObjectOption),
-    Schema.withDecodingDefault(constEmptyObject)
-  )
+  metadata: providerMetadataWithDefaults<UnsupportedSchemaErrorMetadata>()
 }) {
   /**
    * @since 1.0.0
@@ -835,10 +891,7 @@ export class UnknownError extends Schema.ErrorClass<UnknownError>(
 )({
   _tag: Schema.tag("UnknownError"),
   description: Schema.optional(Schema.String),
-  metadata: ProviderMetadata.pipe(
-    Schema.withConstructorDefault(constEmptyObjectOption),
-    Schema.withDecodingDefault(constEmptyObject)
-  ),
+  metadata: providerMetadataWithDefaults<UnknownErrorMetadata>(),
   http: Schema.optional(HttpContext)
 }) {
   /**

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/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.

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

package/src/unstable/cli/Command.ts

@@ -1177,7 +1177,7 @@ export const annotate: {
    * @since 4.0.0
    * @category combinators
    */
-  <I, S>(service: ServiceMap.Service<I, S>, value: NoInfer<S>): <Name extends string, Input, E, R>(
+  <I, S>(service: ServiceMap.Key<I, S>, value: NoInfer<S>): <Name extends string, Input, E, R>(
     self: Command<Name, Input, E, R>
   ) => Command<Name, Input, E, R>
   /**
@@ -1188,12 +1188,12 @@ export const annotate: {
    */
   <Name extends string, Input, E, R, I, S>(
     self: Command<Name, Input, E, R>,
-    service: ServiceMap.Service<I, S>,
+    service: ServiceMap.Key<I, S>,
     value: NoInfer<S>
   ): Command<Name, Input, E, R>
 } = dual(3, <Name extends string, Input, E, R, I, S>(
   self: Command<Name, Input, E, R>,
-  service: ServiceMap.Service<I, S>,
+  service: ServiceMap.Key<I, S>,
   value: NoInfer<S>
 ) => {
   const impl = toImpl(self)
@@ -1466,10 +1466,7 @@ export const provideSync: {
    * @since 4.0.0
    * @category providing services
    */
-  <I, S, Input>(
-    service: ServiceMap.Service<I, S>,
-    implementation: S | ((input: Input) => S)
-  ): <const Name extends string, E, R>(
+  <I, S, Input>(service: ServiceMap.Key<I, S>, implementation: S | ((input: Input) => S)): <const Name extends string, E, R>(
     self: Command<Name, Input, E, R>
   ) => Command<Name, Input, E, Exclude<R, I>>
   /**
@@ -1481,12 +1478,12 @@ export const provideSync: {
    */
   <const Name extends string, Input, E, R, I, S>(
     self: Command<Name, Input, E, R>,
-    service: ServiceMap.Service<I, S>,
+    service: ServiceMap.Key<I, S>,
     implementation: S | ((input: Input) => S)
   ): Command<Name, Input, E, Exclude<R, I>>
 } = dual(3, <const Name extends string, Input, E, R, I, S>(
   self: Command<Name, Input, E, R>,
-  service: ServiceMap.Service<I, S>,
+  service: ServiceMap.Key<I, S>,
   implementation: S | ((input: Input) => S)
 ) =>
   mapHandler(self, (handler, input) =>
@@ -1512,7 +1509,7 @@ export const provideEffect: {
    * @category providing services
    */
   <I, S, Input, R2, E2>(
-    service: ServiceMap.Service<I, S>,
+    service: ServiceMap.Key<I, S>,
     effect: Effect.Effect<S, E2, R2> | ((input: Input) => Effect.Effect<S, E2, R2>)
   ): <const Name extends string, E, R>(
     self: Command<Name, Input, E, R>
@@ -1526,12 +1523,12 @@ export const provideEffect: {
    */
   <const Name extends string, Input, E, R, I, S, R2, E2>(
     self: Command<Name, Input, E, R>,
-    service: ServiceMap.Service<I, S>,
+    service: ServiceMap.Key<I, S>,
     effect: Effect.Effect<S, E2, R2> | ((input: Input) => Effect.Effect<S, E2, R2>)
   ): Command<Name, Input, E | E2, Exclude<R, I> | R2>
 } = dual(3, <const Name extends string, Input, E, R, I, S, R2, E2>(
   self: Command<Name, Input, E, R>,
-  service: ServiceMap.Service<I, S>,
+  service: ServiceMap.Key<I, S>,
   effect: Effect.Effect<S, E2, R2> | ((input: Input) => Effect.Effect<S, E2, R2>)
 ) =>
   mapHandler(

package/src/unstable/cli/internal/command.ts

@@ -35,7 +35,7 @@ interface SubcommandGroup {
  */
 export interface CommandInternal<Name extends string, Input, E, R> extends Command<Name, Input, E, R> {
   readonly config: ConfigInternal
-  readonly service: ServiceMap.Service<CommandContext<Name>, Input>
+  readonly service: ServiceMap.Key<CommandContext<Name>, Input>
   readonly annotations: ServiceMap.ServiceMap<never>
   readonly globalFlags: ReadonlyArray<GlobalFlag.GlobalFlag<any>>
   readonly parse: (input: ParsedTokens) => Effect.Effect<Input, CliError.CliError, Environment>
@@ -88,7 +88,7 @@ export const Proto = {
 export const makeCommand = <const Name extends string, Input, E, R>(options: {
   readonly name: Name
   readonly config: ConfigInternal
-  readonly service?: ServiceMap.Service<CommandContext<Name>, Input> | undefined
+  readonly service?: ServiceMap.Key<CommandContext<Name>, Input> | undefined
   readonly annotations?: ServiceMap.ServiceMap<never> | undefined
   readonly globalFlags?: ReadonlyArray<GlobalFlag.GlobalFlag<any>> | undefined
   readonly description?: string | undefined

package/src/unstable/cluster/Entity.ts

@@ -75,12 +75,12 @@ export interface Entity<
   /**
    * Annotate the entity with a value.
    */
-  annotate<I, S>(key: ServiceMap.Service<I, S>, value: S): Entity<Type, Rpcs>
+  annotate<I, S>(key: ServiceMap.Key<I, S>, value: S): Entity<Type, Rpcs>
 
   /**
    * Annotate the Rpc's above this point with a value.
    */
-  annotateRpcs<I, S>(key: ServiceMap.Service<I, S>, value: S): Entity<Type, Rpcs>
+  annotateRpcs<I, S>(key: ServiceMap.Key<I, S>, value: S): Entity<Type, Rpcs>
 
   /**
    * Annotate the entity with the given annotations.
@@ -207,10 +207,10 @@ const Proto = {
   [Equal.symbol](this: Entity<string, any>, that: Equal.Equal): boolean {
     return isEntity(that) && this.type === that.type
   },
-  annotate<I, S>(this: Entity<string, any>, key: ServiceMap.Service<I, S>, value: S) {
+  annotate<I, S>(this: Entity<string, any>, key: ServiceMap.Key<I, S>, value: S) {
     return fromRpcGroup(this.type, this.protocol.annotate(key, value))
   },
-  annotateRpcs<I, S>(this: Entity<string, any>, key: ServiceMap.Service<I, S>, value: S) {
+  annotateRpcs<I, S>(this: Entity<string, any>, key: ServiceMap.Key<I, S>, value: S) {
     return fromRpcGroup(this.type, this.protocol.annotateRpcs(key, value))
   },
   annotateMerge<S>(this: Entity<string, any>, annotations: ServiceMap.ServiceMap<S>) {

package/src/unstable/cluster/ShardingConfig.ts

@@ -170,11 +170,11 @@ export const layerDefaults: Layer.Layer<ShardingConfig> = layer()
 export const config: Config.Config<ShardingConfig["Service"]> = Config.all({
   runnerAddress: Config.all({
     host: Config.string("host").pipe(
-      Config.withDefault(() => defaultRunnerAddress.host)
+      Config.withDefault(defaultRunnerAddress.host)
       // Config.withDescription("The hostname or IP address of the runner.")
     ),
     port: Config.int("port").pipe(
-      Config.withDefault(() => defaultRunnerAddress.port)
+      Config.withDefault(defaultRunnerAddress.port)
       // Config.withDescription("The port used for inter-runner communication.")
     )
   }).pipe(Config.map((options) => RunnerAddress.makeUnsafe(options)), Config.option, Config.map(Option.getOrUndefined)),
@@ -182,79 +182,79 @@ export const config: Config.Config<ShardingConfig["Service"]> = Config.all({
     host: Config.string("listenHost"),
     // Config.withDescription("The host to listen on.")
     port: Config.int("listenPort").pipe(
-      Config.withDefault(() => defaultRunnerAddress.port)
+      Config.withDefault(defaultRunnerAddress.port)
       // Config.withDescription("The port to listen on.")
     )
   }).pipe(Config.map((options) => RunnerAddress.makeUnsafe(options)), Config.option, Config.map(Option.getOrUndefined)),
   runnerShardWeight: Config.int("runnerShardWeight").pipe(
-    Config.withDefault(() => defaults.runnerShardWeight)
+    Config.withDefault(defaults.runnerShardWeight)
     // Config.withDescription("A number that determines how many shards this runner will be assigned relative to other runners.")
   ),
   shardGroups: Config.schema(Schema.Array(Schema.String), "shardGroups").pipe(
-    Config.withDefault(() => ["default"])
+    Config.withDefault(["default"])
     // Config.withDescription("The shard groups that are assigned to this runner.")
   ),
   shardsPerGroup: Config.int("shardsPerGroup").pipe(
-    Config.withDefault(() => defaults.shardsPerGroup)
+    Config.withDefault(defaults.shardsPerGroup)
     // Config.withDescription("The number of shards to allocate per shard group.")
   ),
   shardLockRefreshInterval: Config.duration("shardLockRefreshInterval").pipe(
-    Config.withDefault(() => defaults.shardLockRefreshInterval)
+    Config.withDefault(defaults.shardLockRefreshInterval)
     // Config.withDescription("Shard lock refresh interval.")
   ),
   shardLockExpiration: Config.duration("shardLockExpiration").pipe(
-    Config.withDefault(() => defaults.shardLockExpiration)
+    Config.withDefault(defaults.shardLockExpiration)
     // Config.withDescription("Shard lock expiration duration.")
   ),
   shardLockDisableAdvisory: Config.boolean("shardLockDisableAdvisory").pipe(
-    Config.withDefault(() => defaults.shardLockDisableAdvisory)
+    Config.withDefault(defaults.shardLockDisableAdvisory)
     // Config.withDescription("Disable the use of advisory locks for shard locking.")
   ),
   preemptiveShutdown: Config.boolean("preemptiveShutdown").pipe(
-    Config.withDefault(() => defaults.preemptiveShutdown)
+    Config.withDefault(defaults.preemptiveShutdown)
     // Config.withDescription("Start shutting down as soon as an Entity has started shutting down.")
   ),
   entityMailboxCapacity: Config.int("entityMailboxCapacity").pipe(
-    Config.withDefault(() => defaults.entityMailboxCapacity)
+    Config.withDefault(defaults.entityMailboxCapacity)
     // Config.withDescription("The default capacity of the mailbox for entities.")
   ),
   entityMaxIdleTime: Config.duration("entityMaxIdleTime").pipe(
-    Config.withDefault(() => defaults.entityMaxIdleTime)
+    Config.withDefault(defaults.entityMaxIdleTime)
     // Config.withDescription(
     //   "The maximum duration of inactivity (i.e. without receiving a message) after which an entity will be interrupted."
     // )
   ),
   entityRegistrationTimeout: Config.duration("entityRegistrationTimeout").pipe(
-    Config.withDefault(() => defaults.entityRegistrationTimeout)
+    Config.withDefault(defaults.entityRegistrationTimeout)
     // Config.withDescription("If an entity does not register itself within this time after a message is sent to it, the message will be marked as failed.")
   ),
   entityTerminationTimeout: Config.duration("entityTerminationTimeout").pipe(
-    Config.withDefault(() => defaults.entityTerminationTimeout)
+    Config.withDefault(defaults.entityTerminationTimeout)
     // Config.withDescription("The maximum duration of time to wait for an entity to terminate.")
   ),
   entityMessagePollInterval: Config.duration("entityMessagePollInterval").pipe(
-    Config.withDefault(() => defaults.entityMessagePollInterval)
+    Config.withDefault(defaults.entityMessagePollInterval)
     // Config.withDescription("The interval at which to poll for unprocessed messages from storage.")
   ),
   entityReplyPollInterval: Config.duration("entityReplyPollInterval").pipe(
-    Config.withDefault(() => defaults.entityReplyPollInterval)
+    Config.withDefault(defaults.entityReplyPollInterval)
     // Config.withDescription("The interval at which to poll for client replies from storage.")
   ),
   sendRetryInterval: Config.duration("sendRetryInterval").pipe(
-    Config.withDefault(() => defaults.sendRetryInterval)
+    Config.withDefault(defaults.sendRetryInterval)
     // Config.withDescription("The interval to retry a send if EntityNotManagedByRunner is returned.")
   ),
   refreshAssignmentsInterval: Config.duration("refreshAssignmentsInterval").pipe(
-    Config.withDefault(() => defaults.refreshAssignmentsInterval)
+    Config.withDefault(defaults.refreshAssignmentsInterval)
     // Config.withDescription("The interval at which to refresh shard assignments.")
   ),
   runnerHealthCheckInterval: Config.duration("runnerHealthCheckInterval").pipe(
-    Config.withDefault(() => defaults.runnerHealthCheckInterval)
+    Config.withDefault(defaults.runnerHealthCheckInterval)
     // Config.withDescription("The interval at which to check for unhealthy runners and report them.")
   ),
   // unhealthyRunnerReportInterval: Config.duration("unhealthyRunnerReportInterval").pipe(
   simulateRemoteSerialization: Config.boolean("simulateRemoteSerialization").pipe(
-    Config.withDefault(() => defaults.simulateRemoteSerialization)
+    Config.withDefault(defaults.simulateRemoteSerialization)
     // Config.withDescription("Simulate serialization and deserialization to remote runners for local entities.")
   )
 })

package/src/unstable/httpapi/HttpApi.ts

@@ -67,13 +67,13 @@ export interface HttpApi<
    * api is called.
    */
   middleware<I extends HttpApiMiddleware.AnyId, S>(
-    middleware: ServiceMap.Service<I, S>
+    middleware: ServiceMap.Key<I, S>
   ): HttpApi<Id, HttpApiGroup.AddMiddleware<Groups, I>>
 
   /**
    * Annotate the `HttpApi`.
    */
-  annotate<I, S>(tag: ServiceMap.Service<I, S>, value: S): HttpApi<Id, Groups>
+  annotate<I, S>(tag: ServiceMap.Key<I, S>, value: S): HttpApi<Id, Groups>
 
   /**
    * Annotate the `HttpApi` with a ServiceMap.
@@ -137,14 +137,14 @@ const Proto = {
       annotations: this.annotations
     })
   },
-  middleware(this: AnyWithProps, tag: HttpApiMiddleware.AnyKey) {
+  middleware(this: AnyWithProps, tag: HttpApiMiddleware.AnyService) {
     return makeProto({
       identifier: this.identifier,
       groups: Record.map(this.groups, (group) => group.middleware(tag as any)),
       annotations: this.annotations
     })
   },
-  annotate(this: AnyWithProps, key: ServiceMap.Service<any, any>, value: any) {
+  annotate(this: AnyWithProps, key: ServiceMap.Key<any, any>, value: any) {
     return makeProto({
       identifier: this.identifier,
       groups: this.groups,
@@ -212,7 +212,7 @@ export const reflect = <Id extends string, Groups extends HttpApiGroup.Any>(
       readonly group: HttpApiGroup.AnyWithProps
       readonly endpoint: HttpApiEndpoint.AnyWithProps
       readonly mergedAnnotations: ServiceMap.ServiceMap<never>
-      readonly middleware: ReadonlySet<HttpApiMiddleware.AnyKey>
+      readonly middleware: ReadonlySet<HttpApiMiddleware.AnyService>
       readonly successes: ReadonlyMap<number, readonly [Schema.Top, ...Array<Schema.Top>]>
       readonly errors: ReadonlyMap<number, readonly [Schema.Top, ...Array<Schema.Top>]>
     }) => void

package/src/unstable/httpapi/HttpApiBuilder.ts

@@ -641,7 +641,7 @@ const applyMiddleware = <A extends Effect.Effect<any, any, any>>(
 ) => {
   const options = { group, endpoint }
   for (const key_ of endpoint.middlewares) {
-    const key = key_ as any as HttpApiMiddleware.AnyKey
+    const key = key_ as any as HttpApiMiddleware.AnyService
     const service = services.mapUnsafe.get(key_.key) as HttpApiMiddleware.HttpApiMiddleware<any, any, any>
     const apply = HttpApiMiddleware.isSecurity(key)
       ? makeSecurityMiddleware(key, service as any)
@@ -657,7 +657,7 @@ const securityMiddlewareCache = new WeakMap<
 >()
 
 const makeSecurityMiddleware = (
-  key: HttpApiMiddleware.AnyKeySecurity,
+  key: HttpApiMiddleware.AnyServiceSecurity,
   service: HttpApiMiddleware.HttpApiMiddlewareSecurity<any, any, any, any>
 ): (effect: Effect.Effect<any, any, any>, options: any) => Effect.Effect<any, any, any> => {
   if (securityMiddlewareCache.has(key)) {