effect 4.0.0-beta.5 → 4.0.0-beta.51

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
 // =============================================================================
@@ -453,9 +451,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))
 
 /**
@@ -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({}))
   )
 })
 
@@ -629,7 +627,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 +687,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 +755,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 +816,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 +887,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 +947,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 +1015,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 +1076,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,14 +1157,14 @@ 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,
   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
@@ -1234,7 +1232,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 +1297,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 +1412,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>(
@@ -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
 
 /**
@@ -1618,9 +1616,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 +1633,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 +1793,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 +1886,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 +1983,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 +2074,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 +2113,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 +2255,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 +2462,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 +2525,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/ResponseIdTracker.ts

@@ -0,0 +1,95 @@
+/**
+ * @since 4.0.0
+ */
+import * as Context from "../../Context.ts"
+import * as Effect from "../../Effect.ts"
+import * as Option from "../../Option.ts"
+import * as Prompt from "./Prompt.ts"
+
+/**
+ * @since 4.0.0
+ * @category models
+ */
+export interface PrepareResult {
+  readonly previousResponseId: string
+  readonly prompt: Prompt.Prompt
+}
+
+/**
+ * @since 4.0.0
+ * @category models
+ */
+export interface Service {
+  clearUnsafe(): void
+  markParts(parts: ReadonlyArray<object>, responseId: string): void
+  prepareUnsafe(prompt: Prompt.Prompt): Option.Option<PrepareResult>
+}
+
+/**
+ * @since 4.0.0
+ * @category Services
+ */
+export class ResponseIdTracker extends Context.Service<ResponseIdTracker, Service>()("effect/ai/ResponseIdTracker") {}
+
+/**
+ * @since 4.0.0
+ * @category constructors
+ */
+export const make: Effect.Effect<Service> = Effect.sync(() => {
+  const sentParts = new Map<object, string>()
+
+  const none = () => {
+    sentParts.clear()
+    return Option.none<PrepareResult>()
+  }
+
+  return {
+    clearUnsafe() {
+      sentParts.clear()
+    },
+    markParts(parts, responseId) {
+      for (let i = 0; i < parts.length; i++) {
+        sentParts.set(parts[i], responseId)
+      }
+    },
+    prepareUnsafe(prompt) {
+      const messages = prompt.content
+
+      let anyTracked = false
+      for (let i = 0; i < messages.length; i++) {
+        if (sentParts.has(messages[i])) {
+          anyTracked = true
+          break
+        }
+      }
+      if (!anyTracked) return none()
+
+      let lastAssistantIndex = -1
+      for (let i = messages.length - 1; i >= 0; i--) {
+        if (messages[i].role === "assistant") {
+          lastAssistantIndex = i
+          break
+        }
+      }
+      if (lastAssistantIndex === -1) return none()
+
+      let responseId: string | undefined
+      for (let i = 0; i < lastAssistantIndex; i++) {
+        const id = sentParts.get(messages[i])
+        if (id === undefined) return none()
+        responseId = id
+      }
+      if (responseId === undefined) return none()
+
+      const partsAfterLastAssistant = messages.slice(lastAssistantIndex + 1)
+      if (partsAfterLastAssistant.length === 0) {
+        return none()
+      }
+
+      return Option.some({
+        previousResponseId: responseId,
+        prompt: Prompt.fromMessages(partsAfterLastAssistant)
+      })
+    }
+  }
+})

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"
 ) {}

package/src/unstable/ai/Tokenizer.ts

@@ -35,9 +35,9 @@
  *
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Predicate from "../../Predicate.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type * as AiError from "./AiError.ts"
 import * as Prompt from "./Prompt.ts"
 
@@ -62,7 +62,7 @@ import * as Prompt from "./Prompt.ts"
  * @since 4.0.0
  * @category services
  */
-export class Tokenizer extends ServiceMap.Service<Tokenizer, Service>()(
+export class Tokenizer extends Context.Service<Tokenizer, Service>()(
   "effect/ai/Tokenizer"
 ) {}
 

package/src/unstable/ai/Tool.ts

@@ -26,6 +26,7 @@
  *
  * @since 1.0.0
  */
+import * as Context from "../../Context.ts"
 import type * as Effect from "../../Effect.ts"
 import { constFalse, constTrue, identity } from "../../Function.ts"
 import type * as JsonSchema from "../../JsonSchema.ts"
@@ -33,7 +34,6 @@ import { pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
 import * as AST from "../../SchemaAST.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type * as Struct from "../../Struct.ts"
 import type * as Types from "../../Types.ts"
 import type * as AiError from "./AiError.ts"
@@ -232,10 +232,10 @@ export interface Tool<
   readonly failureSchema: Config["failure"]
 
   /**
-   * A `ServiceMap` containing tool annotations which can store metadata about
+   * A `Context` containing tool annotations which can store metadata about
    * the tool.
    */
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
 
   /**
    * Specifies whether user approval is required before executing this tool.
@@ -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: Context.Key<Identifier, Service>
   ): Tool<Name, Config, Identifier | Requirements>
 
   /**
@@ -311,12 +311,12 @@ 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: Context.Key<I, S>, value: S): Tool<Name, Config, Requirements>
 
   /**
    * Add many annotations to the tool.
    */
-  annotateMerge<I>(context: ServiceMap.ServiceMap<I>): Tool<Name, Config, Requirements>
+  annotateMerge<I>(context: Context.Context<I>): Tool<Name, Config, Requirements>
 }
 
 /**
@@ -893,7 +893,7 @@ export type ResultDecodingServices<T> = T extends Tool<
 export interface Handler<Name extends string> {
   readonly _: unique symbol
   readonly name: Name
-  readonly services: ServiceMap.ServiceMap<never>
+  readonly context: Context.Context<never>
   readonly handler: (params: any, ctx: any) => Effect.Effect<any, any>
 }
 
@@ -952,7 +952,7 @@ export type HandlerError<T> = T extends Tool<
   infer _Name,
   infer _Config,
   infer _Requirements
-> ? _Config["failureMode"] extends "error" ? _Config["failure"]["Type"] | AiError.AiError | AiError.AiErrorReason
+> ? _Config["failureMode"] extends "error" ? _Config["failure"]["Type"] | AiError.AiError
   : never
   : never
 
@@ -1006,16 +1006,16 @@ 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: Context.Key<I, S>, value: S) {
     return userDefinedProto({
       ...this,
-      annotations: ServiceMap.add(this.annotations, tag, value)
+      annotations: Context.add(this.annotations, tag, value)
     })
   },
-  annotateMerge<I>(this: Any, context: ServiceMap.ServiceMap<I>) {
+  annotateMerge<I>(this: Any, context: Context.Context<I>) {
     return userDefinedProto({
       ...this,
-      annotations: ServiceMap.merge(this.annotations, context)
+      annotations: Context.merge(this.annotations, context)
     })
   }
 }
@@ -1042,7 +1042,7 @@ const userDefinedProto = <
   readonly parametersSchema: Parameters
   readonly successSchema: Success
   readonly failureSchema: Failure
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
   readonly failureMode: Mode
   readonly needsApproval?: NeedsApproval<Parameters> | undefined
 }): Tool<
@@ -1104,7 +1104,7 @@ const dynamicProto = <
   readonly parametersSchema: Parameters
   readonly successSchema: Success
   readonly failureSchema: Failure
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
   readonly failureMode: Mode
   readonly needsApproval?: NeedsApproval<any> | undefined
   readonly jsonSchema: JsonSchema.JsonSchema | undefined
@@ -1129,6 +1129,9 @@ const dynamicProto = <
  * can call. The tool definition includes parameter validation, success/failure
  * schemas, and optional service dependencies.
  *
+ * If a tool accepts no parameters but still needs an explicit empty object
+ * schema, use {@link EmptyParams}.
+ *
  * @example
  * ```ts
  * import { Schema } from "effect"
@@ -1146,11 +1149,11 @@ const dynamicProto = <
  */
 export const make = <
   const Name extends string,
-  Parameters extends Schema.Top = typeof Schema.Void,
+  Parameters extends Schema.Top = typeof EmptyParams,
   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<Context.Key<any, any> | Context.Key<never, any>> = []
 >(name: Name, options?: {
   /**
    * An optional description explaining what the tool does.
@@ -1200,18 +1203,18 @@ export const make = <
     readonly failure: Failure
     readonly failureMode: Mode extends undefined ? "error" : Mode
   },
-  ServiceMap.Service.Identifier<Dependencies[number]>
+  Context.Service.Identifier<Dependencies[number]>
 > => {
   const successSchema = options?.success ?? Schema.Void
   const failureSchema = options?.failure ?? Schema.Never
   return userDefinedProto({
     name,
     description: options?.description,
-    parametersSchema: options?.parameters ?? Schema.Void,
+    parametersSchema: options?.parameters ?? EmptyParams,
     successSchema,
     failureSchema,
     failureMode: options?.failureMode ?? "error",
-    annotations: ServiceMap.empty(),
+    annotations: Context.empty(),
     needsApproval: options?.needsApproval as any
   }) as any
 }
@@ -1341,7 +1344,7 @@ export const dynamic: {
     successSchema,
     failureSchema,
     failureMode: options?.failureMode ?? "error",
-    annotations: ServiceMap.empty(),
+    annotations: Context.empty(),
     needsApproval: options?.needsApproval,
     jsonSchema
   })
@@ -1622,15 +1625,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
   }
@@ -1659,7 +1653,22 @@ export const getJsonSchemaFromSchema = <S extends Schema.Top>(schema: S, options
  * @since 1.0.0
  * @category annotations
  */
-export class Title extends ServiceMap.Service<Title, string>()("effect/ai/Tool/Title") {}
+export class Title extends Context.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 Context.Service<Meta, Record<string, unknown>>()("effect/ai/Tool/Meta") {}
 
 /**
  * Annotation indicating whether a tool only reads data without making changes.
@@ -1675,7 +1684,7 @@ export class Title extends ServiceMap.Service<Title, string>()("effect/ai/Tool/T
  * @since 1.0.0
  * @category annotations
  */
-export const Readonly = ServiceMap.Reference<boolean>("effect/ai/Tool/Readonly", {
+export const Readonly = Context.Reference<boolean>("effect/ai/Tool/Readonly", {
   defaultValue: constFalse
 })
 
@@ -1693,7 +1702,7 @@ export const Readonly = ServiceMap.Reference<boolean>("effect/ai/Tool/Readonly",
  * @since 1.0.0
  * @category annotations
  */
-export const Destructive = ServiceMap.Reference<boolean>("effect/ai/Tool/Destructive", {
+export const Destructive = Context.Reference<boolean>("effect/ai/Tool/Destructive", {
   defaultValue: constTrue
 })
 
@@ -1711,7 +1720,7 @@ export const Destructive = ServiceMap.Reference<boolean>("effect/ai/Tool/Destruc
  * @since 1.0.0
  * @category annotations
  */
-export const Idempotent = ServiceMap.Reference<boolean>("effect/ai/Tool/Idempotent", {
+export const Idempotent = Context.Reference<boolean>("effect/ai/Tool/Idempotent", {
   defaultValue: constFalse
 })
 
@@ -1729,7 +1738,7 @@ export const Idempotent = ServiceMap.Reference<boolean>("effect/ai/Tool/Idempote
  * @since 1.0.0
  * @category annotations
  */
-export const OpenWorld = ServiceMap.Reference<boolean>("effect/ai/Tool/OpenWorld", {
+export const OpenWorld = Context.Reference<boolean>("effect/ai/Tool/OpenWorld", {
   defaultValue: constTrue
 })
 
@@ -1755,7 +1764,7 @@ export const OpenWorld = ServiceMap.Reference<boolean>("effect/ai/Tool/OpenWorld
  * @since 1.0.0
  * @category annotations
  */
-export const Strict = ServiceMap.Reference<boolean | undefined>("effect/ai/Tool/Strict", {
+export const Strict = Context.Reference<boolean | undefined>("effect/ai/Tool/Strict", {
   defaultValue: () => undefined
 })
 
@@ -1765,7 +1774,7 @@ export const Strict = ServiceMap.Reference<boolean | undefined>("effect/ai/Tool/
  * @since 1.0.0
  * @category utilities
  */
-export const getStrictMode = <T extends Any>(tool: T): boolean | undefined => ServiceMap.get(tool.annotations, Strict)
+export const getStrictMode = <T extends Any>(tool: T): boolean | undefined => Context.get(tool.annotations, Strict)
 
 // Licensed under BSD-3-Clause (below code only)
 // Code adapted from https://github.com/fastify/secure-json-parse/blob/783fcb1b5434709466759847cec974381939673a/index.js
@@ -1860,3 +1869,20 @@ export const unsafeSecureJsonParse = (text: string): unknown => {
     Error.stackTraceLimit = stackTraceLimit
   }
 }
+
+/**
+ * @since 4.0.0
+ */
+export interface EmptyParams extends Schema.$Record<Schema.String, Schema.Never> {}
+
+/**
+ * A schema for tools that accept no parameters.
+ *
+ * @since 4.0.0
+ */
+export const EmptyParams: EmptyParams = Schema.Record(Schema.String, Schema.Never)
+
+/** @internal */
+export function isEmptyParamsRecord(indexSignature: AST.IndexSignature): boolean {
+  return indexSignature.parameter === AST.string && AST.isNever(indexSignature.type)
+}