effect 4.0.0-beta.6 → 4.0.0-beta.60

package/dist/unstable/ai/EmbeddingModel.d.ts

@@ -0,0 +1,130 @@
+/**
+ * The `EmbeddingModel` module provides provider-agnostic text embedding capabilities.
+ *
+ * @example
+ * ```ts
+ * import { Effect } from "effect"
+ * import { EmbeddingModel } from "effect/unstable/ai"
+ *
+ * const program = Effect.gen(function*() {
+ *   const model = yield* EmbeddingModel.EmbeddingModel
+ *   return yield* model.embed("hello world")
+ * })
+ * ```
+ *
+ * @since 4.0.0
+ */
+import * as Context from "../../Context.ts";
+import * as Effect from "../../Effect.ts";
+import * as Request from "../../Request.ts";
+import * as RequestResolver from "../../RequestResolver.ts";
+import * as Schema from "../../Schema.ts";
+import * as AiError from "./AiError.ts";
+declare const EmbeddingModel_base: Context.ServiceClass<EmbeddingModel, "effect/unstable/ai/EmbeddingModel", Service>;
+/**
+ * Service tag for embedding model operations.
+ *
+ * @since 4.0.0
+ * @category services
+ */
+export declare class EmbeddingModel extends EmbeddingModel_base {
+}
+declare const Dimensions_base: Context.ServiceClass<Dimensions, "effect/unstable/ai/EmbeddingModel/Dimensions", number>;
+/**
+ * Service tag that provides the current embedding dimensions.
+ *
+ * @since 4.0.0
+ * @category services
+ */
+export declare class Dimensions extends Dimensions_base {
+}
+declare const EmbeddingUsage_base: Schema.Class<EmbeddingUsage, Schema.Struct<{
+    readonly inputTokens: Schema.UndefinedOr<Schema.Finite>;
+}>, {}>;
+/**
+ * Token usage metadata for embedding operations.
+ *
+ * @since 4.0.0
+ * @category models
+ */
+export declare class EmbeddingUsage extends EmbeddingUsage_base {
+}
+declare const EmbedResponse_base: Schema.Class<EmbedResponse, Schema.Struct<{
+    readonly vector: Schema.$Array<Schema.Finite>;
+}>, {}>;
+/**
+ * Response for a single embedding request.
+ *
+ * @since 4.0.0
+ * @category models
+ */
+export declare class EmbedResponse extends EmbedResponse_base {
+}
+declare const EmbedManyResponse_base: Schema.Class<EmbedManyResponse, Schema.Struct<{
+    readonly embeddings: Schema.$Array<typeof EmbedResponse>;
+    readonly usage: typeof EmbeddingUsage;
+}>, {}>;
+/**
+ * Response for multiple embeddings.
+ *
+ * @since 4.0.0
+ * @category models
+ */
+export declare class EmbedManyResponse extends EmbedManyResponse_base {
+}
+/**
+ * Provider input options for embedding requests.
+ *
+ * @since 4.0.0
+ * @category models
+ */
+export interface ProviderOptions {
+    readonly inputs: ReadonlyArray<string>;
+}
+/**
+ * Provider response for batch embedding requests.
+ *
+ * @since 4.0.0
+ * @category models
+ */
+export interface ProviderResponse {
+    readonly results: Array<Array<number>>;
+    readonly usage: {
+        readonly inputTokens: number | undefined;
+    };
+}
+declare const EmbeddingRequest_base: new <A extends Record<string, any>, Success, Error = never, Services = never>(args: import("../../Types.ts").Equals<Omit<A, "~effect/Request">, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | "~effect/Request" ? never : P]: A[P]; }) => Request.Request<Success, Error, Services> & Readonly<A> & {
+    readonly _tag: "EmbeddingRequest";
+};
+/**
+ * Tagged request used by request resolvers for embedding operations.
+ *
+ * @since 4.0.0
+ * @category constructors
+ */
+export declare class EmbeddingRequest extends EmbeddingRequest_base<{
+    readonly input: string;
+}, EmbedResponse, AiError.AiError> {
+}
+/**
+ * Service interface for embedding operations.
+ *
+ * @since 4.0.0
+ * @category models
+ */
+export interface Service {
+    readonly resolver: RequestResolver.RequestResolver<EmbeddingRequest>;
+    readonly embed: (input: string) => Effect.Effect<EmbedResponse, AiError.AiError>;
+    readonly embedMany: (input: ReadonlyArray<string>) => Effect.Effect<EmbedManyResponse, AiError.AiError>;
+}
+/**
+ * Creates an EmbeddingModel service from a provider embedMany implementation.
+ *
+ * @since 4.0.0
+ * @category constructors
+ */
+export declare const make: (params: {
+    readonly embedMany: (options: ProviderOptions) => Effect.Effect<ProviderResponse, AiError.AiError>;
+}) => Effect.Effect<Service>;
+export {};
+//# sourceMappingURL=EmbeddingModel.d.ts.map

package/dist/unstable/ai/EmbeddingModel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmbeddingModel.d.ts","sourceRoot":"","sources":["../../../src/unstable/ai/EmbeddingModel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AAEzC,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,eAAe,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;;AAEvC;;;;;GAKG;AACH,qBAAa,cAAe,SAAQ,mBAEnC;CAAG;;AAEJ;;;;;GAKG;AACH,qBAAa,UAAW,SAAQ,eAE/B;CAAG;;;;AAEJ;;;;;GAKG;AACH,qBAAa,cAAe,SAAQ,mBAIlC;CAAG;;;;AAEL;;;;;GAKG;AACH,qBAAa,aAAc,SAAQ,kBAIjC;CAAG;;;;;AAEL;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,sBAKrC;CAAG;AAEL;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;CACvC;AAED;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;IACtC,QAAQ,CAAC,KAAK,EAAE;QACd,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;KACzC,CAAA;CACF;;;;AAED;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,sBACpC;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAC1B,aAAa,EACb,OAAO,CAAC,OAAO,CAChB;CAAG;AAEJ;;;;;GAKG;AACH,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAA;IACpE,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;IAChF,QAAQ,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CACxG;AASD;;;;;GAKG;AACH,eAAO,MAAM,IAAI,EAAE,CAAC,MAAM,EAAE;IAC1B,QAAQ,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;CACnG,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,CA8CzB,CAAA"}

package/dist/unstable/ai/EmbeddingModel.js

@@ -0,0 +1,127 @@
+/**
+ * The `EmbeddingModel` module provides provider-agnostic text embedding capabilities.
+ *
+ * @example
+ * ```ts
+ * import { Effect } from "effect"
+ * import { EmbeddingModel } from "effect/unstable/ai"
+ *
+ * const program = Effect.gen(function*() {
+ *   const model = yield* EmbeddingModel.EmbeddingModel
+ *   return yield* model.embed("hello world")
+ * })
+ * ```
+ *
+ * @since 4.0.0
+ */
+import * as Context from "../../Context.js";
+import * as Effect from "../../Effect.js";
+import * as Exit from "../../Exit.js";
+import * as Request from "../../Request.js";
+import * as RequestResolver from "../../RequestResolver.js";
+import * as Schema from "../../Schema.js";
+import * as AiError from "./AiError.js";
+/**
+ * Service tag for embedding model operations.
+ *
+ * @since 4.0.0
+ * @category services
+ */
+export class EmbeddingModel extends /*#__PURE__*/Context.Service()("effect/unstable/ai/EmbeddingModel") {}
+/**
+ * Service tag that provides the current embedding dimensions.
+ *
+ * @since 4.0.0
+ * @category services
+ */
+export class Dimensions extends /*#__PURE__*/Context.Service()("effect/unstable/ai/EmbeddingModel/Dimensions") {}
+/**
+ * Token usage metadata for embedding operations.
+ *
+ * @since 4.0.0
+ * @category models
+ */
+export class EmbeddingUsage extends /*#__PURE__*/Schema.Class("effect/ai/EmbeddingModel/EmbeddingUsage")({
+  inputTokens: /*#__PURE__*/Schema.UndefinedOr(Schema.Finite)
+}) {}
+/**
+ * Response for a single embedding request.
+ *
+ * @since 4.0.0
+ * @category models
+ */
+export class EmbedResponse extends /*#__PURE__*/Schema.Class("effect/ai/EmbeddingModel/EmbedResponse")({
+  vector: /*#__PURE__*/Schema.Array(Schema.Finite)
+}) {}
+/**
+ * Response for multiple embeddings.
+ *
+ * @since 4.0.0
+ * @category models
+ */
+export class EmbedManyResponse extends /*#__PURE__*/Schema.Class("effect/ai/EmbeddingModel/EmbedManyResponse")({
+  embeddings: /*#__PURE__*/Schema.Array(EmbedResponse),
+  usage: EmbeddingUsage
+}) {}
+/**
+ * Tagged request used by request resolvers for embedding operations.
+ *
+ * @since 4.0.0
+ * @category constructors
+ */
+export class EmbeddingRequest extends /*#__PURE__*/Request.TaggedClass("EmbeddingRequest") {}
+const invalidProviderResponse = description => AiError.make({
+  module: "EmbeddingModel",
+  method: "embedMany",
+  reason: new AiError.InvalidOutputError({
+    description
+  })
+});
+/**
+ * Creates an EmbeddingModel service from a provider embedMany implementation.
+ *
+ * @since 4.0.0
+ * @category constructors
+ */
+export const make = /*#__PURE__*/Effect.fnUntraced(function* (params) {
+  const resolver = RequestResolver.make(entries => Effect.flatMap(params.embedMany({
+    inputs: entries.map(entry => entry.request.input)
+  }), response => Effect.map(mapProviderResults(entries.length, response.results), embeddings => {
+    for (let i = 0; i < entries.length; i++) {
+      entries[i].completeUnsafe(Exit.succeed(embeddings[i]));
+    }
+  }))).pipe(RequestResolver.withSpan("EmbeddingModel.resolver"));
+  return EmbeddingModel.of({
+    resolver,
+    embed: input => Effect.request(new EmbeddingRequest({
+      input
+    }), resolver).pipe(Effect.withSpan("EmbeddingModel.embed")),
+    embedMany: input => (input.length === 0 ? Effect.succeed(new EmbedManyResponse({
+      embeddings: [],
+      usage: new EmbeddingUsage({
+        inputTokens: undefined
+      })
+    })) : params.embedMany({
+      inputs: input
+    }).pipe(Effect.flatMap(response => mapProviderResults(input.length, response.results).pipe(Effect.map(embeddings => new EmbedManyResponse({
+      embeddings,
+      usage: new EmbeddingUsage({
+        inputTokens: response.usage.inputTokens
+      })
+    })))))).pipe(Effect.withSpan("EmbeddingModel.embedMany"))
+  });
+});
+const mapProviderResults = (inputLength, results) => {
+  const embeddings = new Array(inputLength);
+  if (results.length !== inputLength) {
+    return Effect.fail(invalidProviderResponse(`Provider returned ${results.length} embeddings but expected ${inputLength}`));
+  }
+  for (let i = 0; i < results.length; i++) {
+    const vector = results[i];
+    embeddings[i] = new EmbedResponse({
+      vector
+    });
+  }
+  return Effect.succeed(embeddings);
+};
+//# sourceMappingURL=EmbeddingModel.js.map

package/dist/unstable/ai/EmbeddingModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmbeddingModel.js","names":["Context","Effect","Exit","Request","RequestResolver","Schema","AiError","EmbeddingModel","Service","Dimensions","EmbeddingUsage","Class","inputTokens","UndefinedOr","Finite","EmbedResponse","vector","Array","EmbedManyResponse","embeddings","usage","EmbeddingRequest","TaggedClass","invalidProviderResponse","description","make","module","method","reason","InvalidOutputError","fnUntraced","params","resolver","entries","flatMap","embedMany","inputs","map","entry","request","input","response","mapProviderResults","length","results","i","completeUnsafe","succeed","pipe","withSpan","of","embed","undefined","inputLength","fail"],"sources":["../../../src/unstable/ai/EmbeddingModel.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/unstable/ai/IdGenerator.d.ts

@@ -46,10 +46,10 @@
  * @since 4.0.0
  */
 import * as Cause from "../../Cause.ts";
+import * as Context from "../../Context.ts";
 import * as Effect from "../../Effect.ts";
 import * as Layer from "../../Layer.ts";
-import * as ServiceMap from "../../ServiceMap.ts";
-declare const IdGenerator_base: ServiceMap.ServiceClass<IdGenerator, "@effect/ai/IdGenerator", Service>;
+declare const IdGenerator_base: Context.ServiceClass<IdGenerator, "@effect/ai/IdGenerator", Service>;
 /**
  * The `IdGenerator` service tag for dependency injection.
  *

package/dist/unstable/ai/IdGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IdGenerator.d.ts","sourceRoot":"","sources":["../../../src/unstable/ai/IdGenerator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAGvC,OAAO,KAAK,UAAU,MAAM,qBAAqB,CAAA;;AAEjD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,WAAY,SAAQ,gBAEhC;CAAG;AAEJ;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;CACjD;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACpC;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AA2BD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,kBAAkB,EAAE,OAEhC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AACH,eAAO,MAAM,IAAI;;qCAgBf,CAAA;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,WAAW,KAAG,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,oBAAoB,CACtD,CAAA"}
+{"version":3,"file":"IdGenerator.d.ts","sourceRoot":"","sources":["../../../src/unstable/ai/IdGenerator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;;AAIvC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,WAAY,SAAQ,gBAEhC;CAAG;AAEJ;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;CACjD;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACpC;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AA2BD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,kBAAkB,EAAE,OAEhC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AACH,eAAO,MAAM,IAAI;;qCAgBf,CAAA;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,WAAW,KAAG,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,oBAAoB,CACtD,CAAA"}

package/dist/unstable/ai/IdGenerator.js

@@ -46,11 +46,11 @@
  * @since 4.0.0
  */
 import * as Cause from "../../Cause.js";
+import * as Context from "../../Context.js";
 import * as Effect from "../../Effect.js";
 import * as Layer from "../../Layer.js";
 import * as Predicate from "../../Predicate.js";
 import * as Random from "../../Random.js";
-import * as ServiceMap from "../../ServiceMap.js";
 /**
  * The `IdGenerator` service tag for dependency injection.
  *
@@ -73,7 +73,7 @@ import * as ServiceMap from "../../ServiceMap.js";
  * @since 4.0.0
  * @category models
  */
-export class IdGenerator extends /*#__PURE__*/ServiceMap.Service()("@effect/ai/IdGenerator") {}
+export class IdGenerator extends /*#__PURE__*/Context.Service()("@effect/ai/IdGenerator") {}
 const DEFAULT_ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 const DEFAULT_SEPARATOR = "_";
 const DEFAULT_SIZE = 16;

package/dist/unstable/ai/IdGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"IdGenerator.js","names":["Cause","Effect","Layer","Predicate","Random","ServiceMap","IdGenerator","Service","DEFAULT_ALPHABET","DEFAULT_SEPARATOR","DEFAULT_SIZE","makeGenerator","alphabet","prefix","separator","size","alphabetLength","length","fnUntraced","chars","Array","i","index","next","identifier","join","isUndefined","defaultIdGenerator","generateId","make","includes","message","IllegalArgumentError","layer","options","effect"],"sources":["../../../src/unstable/ai/IdGenerator.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+CA,OAAO,KAAKA,KAAK,MAAM,gBAAgB;AACvC,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AACzC,OAAO,KAAKC,KAAK,MAAM,gBAAgB;AACvC,OAAO,KAAKC,SAAS,MAAM,oBAAoB;AAC/C,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AACzC,OAAO,KAAKC,UAAU,MAAM,qBAAqB;AAEjD;;;;;;;;;;;;;;;;;;;;;;AAsBA,OAAM,MAAOC,WAAY,sBAAQD,UAAU,CAACE,OAAO,EAAwB,CACzE,wBAAwB,CACzB;AAyED,MAAMC,gBAAgB,GAAG,gEAAgE;AACzF,MAAMC,iBAAiB,GAAG,GAAG;AAC7B,MAAMC,YAAY,GAAG,EAAE;AAEvB,MAAMC,aAAa,GAAGA,CAAC;EACrBC,QAAQ,GAAGJ,gBAAgB;EAC3BK,MAAM;EACNC,SAAS,GAAGL,iBAAiB;EAC7BM,IAAI,GAAGL;AAAY,CACE,KAAI;EACzB,MAAMM,cAAc,GAAGJ,QAAQ,CAACK,MAAM;EACtC,OAAOhB,MAAM,CAACiB,UAAU,CAAC,aAAS;IAChC,MAAMC,KAAK,GAAG,IAAIC,KAAK,CAACL,IAAI,CAAC;IAC7B,KAAK,IAAIM,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGN,IAAI,EAAEM,CAAC,EAAE,EAAE;MAC7B,MAAMC,KAAK,GAAG,OAAOlB,MAAM,CAACmB,IAAI;MAChCJ,KAAK,CAACE,CAAC,CAAC,GAAGT,QAAQ,CAAEU,KAAK,GAAGN,cAAc,GAAI,CAAC,CAAC;IACnD;IACA,MAAMQ,UAAU,GAAGL,KAAK,CAACM,IAAI,CAAC,EAAE,CAAC;IACjC,IAAItB,SAAS,CAACuB,WAAW,CAACb,MAAM,CAAC,EAAE;MACjC,OAAOW,UAAU;IACnB;IACA,OAAO,GAAGX,MAAM,GAAGC,SAAS,GAAGU,UAAU,EAAE;EAC7C,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8BA,OAAO,MAAMG,kBAAkB,GAAY;EACzCC,UAAU,eAAEjB,aAAa,CAAC;IAAEE,MAAM,EAAE;EAAI,CAAE;CAC3C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoDA,OAAO,MAAMgB,IAAI,gBAAG5B,MAAM,CAACiB,UAAU,CAAC,WAAU;EAC9CN,QAAQ,GAAGJ,gBAAgB;EAC3BK,MAAM;EACNC,SAAS,GAAGL,iBAAiB;EAC7BM,IAAI,GAAGL;AAAY,CACP;EACZ,IAAIE,QAAQ,CAACkB,QAAQ,CAAChB,SAAS,CAAC,EAAE;IAChC,MAAMiB,OAAO,GAAG,kBAAkBjB,SAAS,uCAAuCF,QAAQ,IAAI;IAC9F,OAAO,OAAO,IAAIZ,KAAK,CAACgC,oBAAoB,CAACD,OAAO,CAAC;EACvD;EAEA,MAAMH,UAAU,GAAGjB,aAAa,CAAC;IAAEC,QAAQ;IAAEC,MAAM;IAAEC,SAAS;IAAEC;EAAI,CAAE,CAAC;EAEvE,OAAO;IACLa;GACQ;AACZ,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCA,OAAO,MAAMK,KAAK,GAAIC,OAAoB,IACxChC,KAAK,CAACiC,MAAM,CAAC7B,WAAW,CAAC,CAACuB,IAAI,CAACK,OAAO,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"IdGenerator.js","names":["Cause","Context","Effect","Layer","Predicate","Random","IdGenerator","Service","DEFAULT_ALPHABET","DEFAULT_SEPARATOR","DEFAULT_SIZE","makeGenerator","alphabet","prefix","separator","size","alphabetLength","length","fnUntraced","chars","Array","i","index","next","identifier","join","isUndefined","defaultIdGenerator","generateId","make","includes","message","IllegalArgumentError","layer","options","effect"],"sources":["../../../src/unstable/ai/IdGenerator.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+CA,OAAO,KAAKA,KAAK,MAAM,gBAAgB;AACvC,OAAO,KAAKC,OAAO,MAAM,kBAAkB;AAC3C,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AACzC,OAAO,KAAKC,KAAK,MAAM,gBAAgB;AACvC,OAAO,KAAKC,SAAS,MAAM,oBAAoB;AAC/C,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AAEzC;;;;;;;;;;;;;;;;;;;;;;AAsBA,OAAM,MAAOC,WAAY,sBAAQL,OAAO,CAACM,OAAO,EAAwB,CACtE,wBAAwB,CACzB;AAyED,MAAMC,gBAAgB,GAAG,gEAAgE;AACzF,MAAMC,iBAAiB,GAAG,GAAG;AAC7B,MAAMC,YAAY,GAAG,EAAE;AAEvB,MAAMC,aAAa,GAAGA,CAAC;EACrBC,QAAQ,GAAGJ,gBAAgB;EAC3BK,MAAM;EACNC,SAAS,GAAGL,iBAAiB;EAC7BM,IAAI,GAAGL;AAAY,CACE,KAAI;EACzB,MAAMM,cAAc,GAAGJ,QAAQ,CAACK,MAAM;EACtC,OAAOf,MAAM,CAACgB,UAAU,CAAC,aAAS;IAChC,MAAMC,KAAK,GAAG,IAAIC,KAAK,CAACL,IAAI,CAAC;IAC7B,KAAK,IAAIM,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGN,IAAI,EAAEM,CAAC,EAAE,EAAE;MAC7B,MAAMC,KAAK,GAAG,OAAOjB,MAAM,CAACkB,IAAI;MAChCJ,KAAK,CAACE,CAAC,CAAC,GAAGT,QAAQ,CAAEU,KAAK,GAAGN,cAAc,GAAI,CAAC,CAAC;IACnD;IACA,MAAMQ,UAAU,GAAGL,KAAK,CAACM,IAAI,CAAC,EAAE,CAAC;IACjC,IAAIrB,SAAS,CAACsB,WAAW,CAACb,MAAM,CAAC,EAAE;MACjC,OAAOW,UAAU;IACnB;IACA,OAAO,GAAGX,MAAM,GAAGC,SAAS,GAAGU,UAAU,EAAE;EAC7C,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8BA,OAAO,MAAMG,kBAAkB,GAAY;EACzCC,UAAU,eAAEjB,aAAa,CAAC;IAAEE,MAAM,EAAE;EAAI,CAAE;CAC3C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoDA,OAAO,MAAMgB,IAAI,gBAAG3B,MAAM,CAACgB,UAAU,CAAC,WAAU;EAC9CN,QAAQ,GAAGJ,gBAAgB;EAC3BK,MAAM;EACNC,SAAS,GAAGL,iBAAiB;EAC7BM,IAAI,GAAGL;AAAY,CACP;EACZ,IAAIE,QAAQ,CAACkB,QAAQ,CAAChB,SAAS,CAAC,EAAE;IAChC,MAAMiB,OAAO,GAAG,kBAAkBjB,SAAS,uCAAuCF,QAAQ,IAAI;IAC9F,OAAO,OAAO,IAAIZ,KAAK,CAACgC,oBAAoB,CAACD,OAAO,CAAC;EACvD;EAEA,MAAMH,UAAU,GAAGjB,aAAa,CAAC;IAAEC,QAAQ;IAAEC,MAAM;IAAEC,SAAS;IAAEC;EAAI,CAAE,CAAC;EAEvE,OAAO;IACLa;GACQ;AACZ,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCA,OAAO,MAAMK,KAAK,GAAIC,OAAoB,IACxC/B,KAAK,CAACgC,MAAM,CAAC7B,WAAW,CAAC,CAACuB,IAAI,CAACK,OAAO,CAAC,CAAC","ignoreList":[]}

package/dist/unstable/ai/LanguageModel.d.ts

@@ -1,7 +1,7 @@
+import * as Context from "../../Context.ts";
 import * as Effect from "../../Effect.ts";
 import type * as JsonSchema from "../../JsonSchema.ts";
 import * as Schema from "../../Schema.ts";
-import * as ServiceMap from "../../ServiceMap.ts";
 import * as Stream from "../../Stream.ts";
 import type { Span } from "../../Tracer.ts";
 import type { Concurrency, NoExcessProperties } from "../../Types.ts";
@@ -11,7 +11,7 @@ import * as Prompt from "./Prompt.ts";
 import * as Response from "./Response.ts";
 import type * as Tool from "./Tool.ts";
 import * as Toolkit from "./Toolkit.ts";
-declare const LanguageModel_base: ServiceMap.ServiceClass<LanguageModel, "effect/unstable/ai/LanguageModel", Service>;
+declare const LanguageModel_base: Context.ServiceClass<LanguageModel, "effect/unstable/ai/LanguageModel", Service>;
 /**
  * The `LanguageModel` service key for dependency injection.
  *
@@ -51,15 +51,39 @@ export interface Service {
     /**
      * Generate text using the language model.
      */
-    readonly generateText: <Options extends NoExcessProperties<GenerateTextOptions<any>, Options>, Tools extends Record<string, Tool.Any> = {}>(options: Options & GenerateTextOptions<Tools>) => Effect.Effect<GenerateTextResponse<Tools>, ExtractError<Options>, ExtractServices<Options>>;
+    readonly generateText: {
+        <Options extends NoExcessProperties<GenerateTextOptionsWithoutToolkit, Options>>(options: Options & GenerateTextOptionsWithoutToolkit): Effect.Effect<GenerateTextResponse<{}>, ExtractError<Options>, ExtractServices<Options>>;
+        <Tools extends Record<string, Tool.Any>, Options extends NoExcessProperties<GenerateTextOptions<Tools> & {
+            readonly toolkit: ToolkitInput<Tools>;
+        }, Options>>(options: Options & GenerateTextOptions<Tools> & {
+            readonly toolkit: ToolkitInput<Tools>;
+        }): Effect.Effect<GenerateTextResponse<Tools>, ExtractError<Options>, ExtractServices<Options>>;
+        <Options extends {
+            readonly toolkit: ToolkitOption<any>;
+        } & NoExcessProperties<GenerateTextOptions<any>, Options>>(options: Options & GenerateTextOptions<ExtractTools<Options>> & {
+            readonly toolkit: Options["toolkit"];
+        }): Effect.Effect<GenerateTextResponse<ExtractTools<Options>>, ExtractError<Options>, ExtractServices<Options>>;
+    };
     /**
      * Generate a structured object from a schema using the language model.
      */
-    readonly generateObject: <ObjectEncoded extends Record<string, any>, StructuredOutputSchema extends Schema.Codec<any, ObjectEncoded, any, any>, Options extends NoExcessProperties<GenerateObjectOptions<any, StructuredOutputSchema>, Options>, Tools extends Record<string, Tool.Any> = {}>(options: Options & GenerateObjectOptions<Tools, StructuredOutputSchema>) => Effect.Effect<GenerateObjectResponse<Tools, StructuredOutputSchema["Type"]>, ExtractError<Options>, ExtractServices<Options> | StructuredOutputSchema["DecodingServices"]>;
+    readonly generateObject: <ObjectEncoded extends Record<string, any>, StructuredOutputSchema extends Schema.Encoder<ObjectEncoded, unknown>, Options extends NoExcessProperties<GenerateObjectOptions<any, StructuredOutputSchema>, Options>, Tools extends Record<string, Tool.Any> = {}>(options: Options & GenerateObjectOptions<Tools, StructuredOutputSchema>) => Effect.Effect<GenerateObjectResponse<Tools, StructuredOutputSchema["Type"]>, ExtractError<Options>, ExtractServices<Options> | StructuredOutputSchema["DecodingServices"]>;
     /**
      * Generate text using the language model with streaming output.
      */
-    readonly streamText: <Options extends NoExcessProperties<GenerateTextOptions<any>, Options>, Tools extends Record<string, Tool.Any> = {}>(options: Options & GenerateTextOptions<Tools>) => Stream.Stream<Response.StreamPart<Tools>, ExtractError<Options>, ExtractServices<Options>>;
+    readonly streamText: {
+        <Options extends NoExcessProperties<GenerateTextOptionsWithoutToolkit, Options>>(options: Options & GenerateTextOptionsWithoutToolkit): Stream.Stream<Response.StreamPart<{}>, ExtractError<Options>, ExtractServices<Options>>;
+        <Tools extends Record<string, Tool.Any>, Options extends NoExcessProperties<GenerateTextOptions<Tools> & {
+            readonly toolkit: ToolkitInput<Tools>;
+        }, Options>>(options: Options & GenerateTextOptions<Tools> & {
+            readonly toolkit: ToolkitInput<Tools>;
+        }): Stream.Stream<Response.StreamPart<Tools>, ExtractError<Options>, ExtractServices<Options>>;
+        <Options extends {
+            readonly toolkit: ToolkitOption<any>;
+        } & NoExcessProperties<GenerateTextOptions<any>, Options>>(options: Options & GenerateTextOptions<ExtractTools<Options>> & {
+            readonly toolkit: Options["toolkit"];
+        }): Stream.Stream<Response.StreamPart<ExtractTools<Options>>, ExtractError<Options>, ExtractServices<Options>>;
+    };
 }
 /**
  * A function that transforms a `Schema.Codec` into a provider-compatible form
@@ -76,20 +100,6 @@ export type CodecTransformer = <T, E, RD, RE>(schema: Schema.Codec<T, E, RD, RE>
     readonly codec: Schema.Codec<T, unknown, RD, RE>;
     readonly jsonSchema: JsonSchema.JsonSchema;
 };
-/**
- * A `ServiceMap.Reference` that holds the current `CodecTransformer` used by
- * `LanguageModel.generateObject` to adapt structured output schemas for the
- * active provider.
- *
- * By default, this is the identity function (no transformation). Provider
- * packages (e.g. `@effect/ai-anthropic`) override this reference with a
- * provider-specific transformer so that schemas are automatically rewritten
- * before being sent to the model as well as before decoding the generated value.
- *
- * @since 4.0.0
- * @category services
- */
-export declare const CurrentCodecTransformer: ServiceMap.Reference<CodecTransformer>;
 /**
  * The default codec transformer that passes schemas through without
  * provider-specific rewrites.
@@ -113,7 +123,7 @@ export interface GenerateTextOptions<Tools extends Record<string, Tool.Any>> {
      * A toolkit containing both the tools and the tool call handler to use to
      * augment text generation.
      */
-    readonly toolkit?: Toolkit.WithHandler<Tools> | Effect.Yieldable<Toolkit.Toolkit<Tools>, Toolkit.WithHandler<Tools>, never, any> | undefined;
+    readonly toolkit?: ToolkitInput<Tools> | undefined;
     /**
      * The tool choice mode for the language model.
      * - `auto` (default): The model can decide whether or not to call tools, as
@@ -149,6 +159,9 @@ export interface GenerateTextOptions<Tools extends Record<string, Tool.Any>> {
      */
     readonly disableToolCallResolution?: boolean | undefined;
 }
+type GenerateTextOptionsWithoutToolkit = Omit<GenerateTextOptions<{}>, "toolkit"> & {
+    readonly toolkit?: undefined;
+};
 /**
  * Configuration options for structured object generation.
  *
@@ -286,6 +299,36 @@ export declare class GenerateObjectResponse<Tools extends Record<string, Tool.An
     readonly value: A;
     constructor(value: A, content: Array<Response.Part<Tools>>);
 }
+/**
+ * The supported toolkit option shapes for language model operations.
+ *
+ * @since 4.0.0
+ * @category utility types
+ */
+export type ToolkitOption<Tools extends Record<string, Tool.Any>, E = never, R = any> = Tools extends any ? (Toolkit.WithHandler<Tools> | Effect.Yieldable<Toolkit.Toolkit<Tools>, Toolkit.WithHandler<Tools>, E, R>) : never;
+/**
+ * The supported toolkit input shapes for language model operation options.
+ *
+ * Unlike `ToolkitOption`, this type does not distribute over unions. It is
+ * intended for call-site assignability, while `ToolkitOption` remains the
+ * distributive helper used for extraction and inference.
+ *
+ * @since 4.0.0
+ * @category utility types
+ */
+export type ToolkitInput<Tools extends Record<string, Tool.Any>, E = never, R = any> = ToolkitOption<Tools, E, R> | Toolkit.WithHandler<Tools> | Effect.Yieldable<Toolkit.Toolkit<Tools>, Toolkit.WithHandler<Tools>, E, R>;
+type ExtractToolsFromToolkitOption<ToolkitValue> = ToolkitValue extends Toolkit.WithHandler<infer Tools> ? Tools : ToolkitValue extends Effect.Yieldable<Toolkit.Toolkit<infer Tools>, Toolkit.WithHandler<infer _Tools>, infer _E, infer _R> ? Tools : never;
+/**
+ * Utility type that extracts the toolset from LanguageModel options.
+ *
+ * @since 4.0.0
+ * @category utility types
+ */
+export type ExtractTools<Options> = Options extends {
+    readonly toolkit: infer ToolkitValue;
+} ? ExtractToolsFromToolkitOption<Exclude<ToolkitValue, undefined>> : {};
+type ExtractErrorFromToolkitOption<ToolkitValue, DisableToolCallResolution extends boolean> = ToolkitValue extends Toolkit.WithHandler<infer Tools> ? AiError.AiError | (DisableToolCallResolution extends true ? never : Tool.HandlerError<Tools[keyof Tools]>) : ToolkitValue extends Effect.Yieldable<Toolkit.Toolkit<infer Tools>, Toolkit.WithHandler<infer _Tools>, infer E, infer _R> ? AiError.AiError | E | (DisableToolCallResolution extends true ? never : Tool.HandlerError<Tools[keyof Tools]>) : AiError.AiError;
+type ExtractServicesFromToolkitOption<ToolkitValue> = ToolkitValue extends Toolkit.WithHandler<infer Tools> ? Tool.HandlerServices<Tools[keyof Tools]> | Tool.ResultDecodingServices<Tools[keyof Tools]> : ToolkitValue extends Effect.Yieldable<Toolkit.Toolkit<infer Tools>, Toolkit.WithHandler<infer _Tools>, infer _E, infer R> ? Tool.HandlerServices<Tools[keyof Tools]> | Tool.ResultDecodingServices<Tools[keyof Tools]> | R : never;
 /**
  * Utility type that extracts the error type from LanguageModel options.
  *
@@ -296,16 +339,13 @@ export declare class GenerateObjectResponse<Tools extends Record<string, Tool.An
  * @category utility types
  */
 export type ExtractError<Options> = Options extends {
-    readonly toolkit: Toolkit.WithHandler<infer _Tools>;
     readonly disableToolCallResolution: true;
-} ? AiError.AiError : Options extends {
-    readonly toolkit: Effect.Yieldable<Toolkit.Toolkit<infer _Tools>, Toolkit.WithHandler<infer _Tools>, infer _E, infer _R>;
+    readonly toolkit: infer ToolkitValue;
+} ? ExtractErrorFromToolkitOption<Exclude<ToolkitValue, undefined>, true> : Options extends {
+    readonly toolkit: infer ToolkitValue;
+} ? ExtractErrorFromToolkitOption<Exclude<ToolkitValue, undefined>, false> : Options extends {
     readonly disableToolCallResolution: true;
-} ? AiError.AiError | _E : Options extends {
-    readonly toolkit: Toolkit.WithHandler<infer _Tools>;
-} ? AiError.AiError | Tool.HandlerError<_Tools[keyof _Tools]> : Options extends {
-    readonly toolkit: Effect.Yieldable<Toolkit.Toolkit<infer _Tools>, Toolkit.WithHandler<infer _Tools>, infer _E, infer _R>;
-} ? AiError.AiError | Tool.HandlerError<_Tools[keyof _Tools]> | _E : AiError.AiError;
+} ? AiError.AiError : AiError.AiError;
 /**
  * Utility type that extracts the context requirements from LanguageModel options.
  *
@@ -315,10 +355,10 @@ export type ExtractError<Options> = Options extends {
  * @category utility types
  */
 export type ExtractServices<Options> = Options extends {
-    readonly toolkit: Toolkit.WithHandler<infer _Tools>;
-} ? Tool.ResultEncodingServices<_Tools[keyof _Tools]> | Tool.ResultDecodingServices<_Tools[keyof _Tools]> : Options extends {
-    readonly toolkit: Effect.Yieldable<Toolkit.Toolkit<infer _Tools>, Toolkit.WithHandler<infer _Tools>, infer _E, infer _R>;
-} ? Tool.ResultEncodingServices<_Tools[keyof _Tools]> | Tool.ResultDecodingServices<_Tools[keyof _Tools]> | _R : never;
+    readonly disableToolCallResolution: true;
+} ? never : Options extends {
+    readonly toolkit: infer Toolkit;
+} ? ExtractServicesFromToolkitOption<Exclude<Toolkit, undefined>> : never;
 /**
  * Configuration options passed along to language model provider
  * implementations.
@@ -378,14 +418,25 @@ export interface ProviderOptions {
      * The span to use to trace interactions with the large language model.
      */
     readonly span: Span;
+    /**
+     * The previous response identifier for incremental provider calls.
+     */
+    readonly previousResponseId: string | undefined;
+    /**
+     * The prompt reduced to messages not yet seen by the provider.
+     */
+    readonly incrementalPrompt: Prompt.Prompt | undefined;
 }
 /**
- * Parameters required to construct a LanguageModel service.
+ * Creates a LanguageModel service from provider-specific implementations.
+ *
+ * This constructor takes provider-specific implementations for text generation
+ * and streaming text generation and returns a LanguageModel service.
  *
  * @since 4.0.0
- * @category models
+ * @category constructors
  */
-export interface ConstructorParams {
+export declare const make: (params: {
     /**
      * A method which requests text generation from the large language model
      * provider.
@@ -401,17 +452,12 @@ export interface ConstructorParams {
      * Intermediate results are streamed from the large language model provider.
      */
     readonly streamText: (options: ProviderOptions) => Stream.Stream<Response.StreamPartEncoded, AiError.AiError, IdGenerator>;
-}
-/**
- * Creates a LanguageModel service from provider-specific implementations.
- *
- * This constructor takes provider-specific implementations for text generation
- * and streaming text generation and returns a LanguageModel service.
- *
- * @since 4.0.0
- * @category constructors
- */
-export declare const make: (params: ConstructorParams) => Effect.Effect<Service>;
+    /**
+     * A function that transforms a `Schema.Codec` into a provider-compatible form
+     * for structured output generation.
+     */
+    readonly codecTransformer?: CodecTransformer | undefined;
+}) => Effect.Effect<Service>;
 /**
  * Generate text using a language model.
  *
@@ -436,7 +482,19 @@ export declare const make: (params: ConstructorParams) => Effect.Effect<Service>
  * @since 4.0.0
  * @category text generation
  */
-export declare const generateText: <Options extends NoExcessProperties<GenerateTextOptions<any>, Options>, Tools extends Record<string, Tool.Any> = {}>(options: Options & GenerateTextOptions<Tools>) => Effect.Effect<GenerateTextResponse<Tools>, ExtractError<Options>, LanguageModel | ExtractServices<Options>>;
+export declare const generateText: {
+    <Options extends NoExcessProperties<GenerateTextOptionsWithoutToolkit, Options>>(options: Options & GenerateTextOptionsWithoutToolkit): Effect.Effect<GenerateTextResponse<{}>, ExtractError<Options>, LanguageModel | ExtractServices<Options>>;
+    <Tools extends Record<string, Tool.Any>, Options extends NoExcessProperties<GenerateTextOptions<Tools> & {
+        readonly toolkit: ToolkitInput<Tools>;
+    }, Options>>(options: Options & GenerateTextOptions<Tools> & {
+        readonly toolkit: ToolkitInput<Tools>;
+    }): Effect.Effect<GenerateTextResponse<Tools>, ExtractError<Options>, LanguageModel | ExtractServices<Options>>;
+    <Options extends {
+        readonly toolkit: ToolkitOption<any>;
+    } & NoExcessProperties<GenerateTextOptions<any>, Options>>(options: Options & GenerateTextOptions<ExtractTools<Options>> & {
+        readonly toolkit: Options["toolkit"];
+    }): Effect.Effect<GenerateTextResponse<ExtractTools<Options>>, ExtractError<Options>, ExtractServices<Options> | LanguageModel>;
+};
 /**
  * Generate a structured object from a schema using a language model.
  *
@@ -469,7 +527,7 @@ export declare const generateText: <Options extends NoExcessProperties<GenerateT
  * @since 4.0.0
  * @category object generation
  */
-export declare const generateObject: <ObjectEncoded extends Record<string, any>, StructuredOutputSchema extends Schema.Codec<any, ObjectEncoded, any, any>, Options extends NoExcessProperties<GenerateObjectOptions<any, StructuredOutputSchema>, Options>, Tools extends Record<string, Tool.Any> = {}>(options: Options & GenerateObjectOptions<Tools, StructuredOutputSchema>) => Effect.Effect<GenerateObjectResponse<Tools, StructuredOutputSchema["Type"]>, ExtractError<Options>, ExtractServices<Options> | StructuredOutputSchema["DecodingServices"] | LanguageModel>;
+export declare const generateObject: <ObjectEncoded extends Record<string, any>, StructuredOutputSchema extends Schema.Encoder<ObjectEncoded, unknown>, Options extends NoExcessProperties<GenerateObjectOptions<any, StructuredOutputSchema>, Options>>(options: Options & GenerateObjectOptions<ExtractTools<Options>, StructuredOutputSchema>) => Effect.Effect<GenerateObjectResponse<ExtractTools<Options>, StructuredOutputSchema["Type"]>, ExtractError<Options>, ExtractServices<Options> | StructuredOutputSchema["DecodingServices"] | LanguageModel>;
 /**
  * Generate text using a language model with streaming output.
  *
@@ -494,6 +552,18 @@ export declare const generateObject: <ObjectEncoded extends Record<string, any>,
  * @since 4.0.0
  * @category text generation
  */
-export declare const streamText: <Options extends NoExcessProperties<GenerateTextOptions<any>, Options>, Tools extends Record<string, Tool.Any> = {}>(options: Options & GenerateTextOptions<Tools>) => Stream.Stream<Response.StreamPart<Tools>, ExtractError<Options>, ExtractServices<Options> | LanguageModel>;
+export declare const streamText: {
+    <Options extends NoExcessProperties<GenerateTextOptionsWithoutToolkit, Options>>(options: Options & GenerateTextOptionsWithoutToolkit): Stream.Stream<Response.StreamPart<{}>, ExtractError<Options>, ExtractServices<Options> | LanguageModel>;
+    <Tools extends Record<string, Tool.Any>, Options extends NoExcessProperties<GenerateTextOptions<Tools> & {
+        readonly toolkit: ToolkitInput<Tools>;
+    }, Options>>(options: Options & GenerateTextOptions<Tools> & {
+        readonly toolkit: ToolkitInput<Tools>;
+    }): Stream.Stream<Response.StreamPart<Tools>, ExtractError<Options>, ExtractServices<Options> | LanguageModel>;
+    <Options extends {
+        readonly toolkit: ToolkitOption<any>;
+    } & NoExcessProperties<GenerateTextOptions<any>, Options>>(options: Options & GenerateTextOptions<ExtractTools<Options>> & {
+        readonly toolkit: Options["toolkit"];
+    }): Stream.Stream<Response.StreamPart<ExtractTools<Options>>, ExtractError<Options>, ExtractServices<Options> | LanguageModel>;
+};
 export {};
 //# sourceMappingURL=LanguageModel.d.ts.map