modelfusion 0.134.0 → 0.135.1

package/index.cjs

@@ -5,7 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -27,10 +26,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 
 // src/index.ts
 var src_exports = {};
@@ -95,6 +90,7 @@ __export(src_exports, {
   OPENAI_TRANSCRIPTION_MODELS: () => OPENAI_TRANSCRIPTION_MODELS,
   ObjectFromTextGenerationModel: () => ObjectFromTextGenerationModel,
   ObjectFromTextStreamingModel: () => ObjectFromTextStreamingModel,
+  ObjectGeneratorTool: () => ObjectGeneratorTool,
   ObjectParseError: () => ObjectParseError,
   ObjectStreamFromResponse: () => ObjectStreamFromResponse,
   ObjectStreamResponse: () => ObjectStreamResponse,
@@ -239,12 +235,12 @@ var import_nanoid = require("nanoid");
 
 // src/core/FunctionEventSource.ts
 var FunctionEventSource = class {
+  observers;
+  errorHandler;
   constructor({
     observers,
     errorHandler
   }) {
-    __publicField(this, "observers");
-    __publicField(this, "errorHandler");
     this.observers = observers;
     this.errorHandler = errorHandler ?? ((error) => console.error(error));
   }
@@ -261,6 +257,13 @@ var FunctionEventSource = class {
 
 // src/core/DefaultRun.ts
 var DefaultRun = class {
+  runId;
+  sessionId;
+  userId;
+  abortSignal;
+  errorHandler;
+  events = [];
+  functionEventSource;
   constructor({
     runId = `run-${(0, import_nanoid.nanoid)()}`,
     sessionId,
@@ -269,19 +272,6 @@ var DefaultRun = class {
     observers,
     errorHandler
   } = {}) {
-    __publicField(this, "runId");
-    __publicField(this, "sessionId");
-    __publicField(this, "userId");
-    __publicField(this, "abortSignal");
-    __publicField(this, "errorHandler");
-    __publicField(this, "events", []);
-    __publicField(this, "functionEventSource");
-    __publicField(this, "functionObserver", {
-      onFunctionEvent: (event) => {
-        this.events.push(event);
-        this.functionEventSource.notify(event);
-      }
-    });
     this.runId = runId;
     this.sessionId = sessionId;
     this.userId = userId;
@@ -292,6 +282,12 @@ var DefaultRun = class {
       errorHandler: this.errorHandler.bind(this)
     });
   }
+  functionObserver = {
+    onFunctionEvent: (event) => {
+      this.events.push(event);
+      this.functionEventSource.notify(event);
+    }
+  };
 };
 
 // src/core/ModelFusionConfiguration.ts
@@ -341,6 +337,13 @@ var AbortError = class extends Error {
 
 // src/core/api/ApiCallError.ts
 var ApiCallError = class extends Error {
+  url;
+  requestBodyValues;
+  statusCode;
+  responseBody;
+  cause;
+  isRetryable;
+  data;
   constructor({
     message,
     url,
@@ -352,13 +355,6 @@ var ApiCallError = class extends Error {
     data
   }) {
     super(message);
-    __publicField(this, "url");
-    __publicField(this, "requestBodyValues");
-    __publicField(this, "statusCode");
-    __publicField(this, "responseBody");
-    __publicField(this, "cause");
-    __publicField(this, "isRetryable");
-    __publicField(this, "data");
     this.name = "ApiCallError";
     this.url = url;
     this.requestBodyValues = requestBodyValues;
@@ -416,16 +412,16 @@ function getErrorMessage(error) {
 
 // src/core/api/RetryError.ts
 var RetryError = class extends Error {
+  // note: property order determines debugging output
+  reason;
+  lastError;
+  errors;
   constructor({
     message,
     reason,
     errors
   }) {
     super(message);
-    // note: property order determines debugging output
-    __publicField(this, "reason");
-    __publicField(this, "lastError");
-    __publicField(this, "errors");
     this.name = "RetryError";
     this.reason = reason;
     this.errors = errors;
@@ -493,10 +489,10 @@ async function _retryWithExponentialBackoff(f, {
 
 // src/core/api/throttleMaxConcurrency.ts
 var MaxConcurrencyThrottler = class {
+  maxConcurrentCalls;
+  activeCallCount;
+  callQueue;
   constructor({ maxConcurrentCalls }) {
-    __publicField(this, "maxConcurrentCalls");
-    __publicField(this, "activeCallCount");
-    __publicField(this, "callQueue");
     this.maxConcurrentCalls = maxConcurrentCalls;
     this.activeCallCount = 0;
     this.callQueue = [];
@@ -540,14 +536,14 @@ var throttleOff = () => (fn) => fn();
 
 // src/core/api/AbstractApiConfiguration.ts
 var AbstractApiConfiguration = class {
+  retry;
+  throttle;
+  customCallHeaders;
   constructor({
     retry,
     throttle,
     customCallHeaders = () => ({})
   }) {
-    __publicField(this, "retry");
-    __publicField(this, "throttle");
-    __publicField(this, "customCallHeaders");
     this.retry = retry;
     this.throttle = throttle;
     this.customCallHeaders = customCallHeaders;
@@ -567,6 +563,8 @@ var AbstractApiConfiguration = class {
 
 // src/core/api/BaseUrlApiConfiguration.ts
 var BaseUrlApiConfiguration = class extends AbstractApiConfiguration {
+  baseUrl;
+  fixedHeadersValue;
   constructor({
     baseUrl,
     headers,
@@ -575,8 +573,6 @@ var BaseUrlApiConfiguration = class extends AbstractApiConfiguration {
     customCallHeaders
   }) {
     super({ retry, throttle, customCallHeaders });
-    __publicField(this, "baseUrl");
-    __publicField(this, "fixedHeadersValue");
     this.baseUrl = typeof baseUrl == "string" ? parseBaseUrl(baseUrl) : baseUrl;
     this.fixedHeadersValue = headers ?? {};
   }
@@ -637,9 +633,7 @@ function resolveBaseUrl(baseUrl = {}, baseUrlDefaults) {
 
 // src/core/cache/MemoryCache.ts
 var MemoryCache = class {
-  constructor() {
-    __publicField(this, "cache", /* @__PURE__ */ new Map());
-  }
+  cache = /* @__PURE__ */ new Map();
   hashKey(key) {
     return JSON.stringify(key);
   }
@@ -763,7 +757,16 @@ function detectRuntime() {
 var runStorage;
 async function ensureLoaded() {
   if (detectRuntime() === "node" && !runStorage) {
-    const { AsyncLocalStorage } = await import("async_hooks");
+    let AsyncLocalStorage;
+    try {
+      AsyncLocalStorage = (await import("async_hooks")).AsyncLocalStorage;
+    } catch (error) {
+      try {
+        AsyncLocalStorage = require("async_hooks").AsyncLocalStorage;
+      } catch (error2) {
+        throw new Error(`Failed to load 'async_hooks' module dynamically.`);
+      }
+    }
     runStorage = new AsyncLocalStorage();
   }
   return Promise.resolve();
@@ -786,9 +789,7 @@ function startDurationMeasurement() {
   return globalThis.performance != null ? new PerformanceNowDurationMeasurement() : new DateDurationMeasurement();
 }
 var PerformanceNowDurationMeasurement = class {
-  constructor() {
-    __publicField(this, "startTime", globalThis.performance.now());
-  }
+  startTime = globalThis.performance.now();
   get startEpochSeconds() {
     return Math.floor(
       (globalThis.performance.timeOrigin + this.startTime) / 1e3
@@ -802,9 +803,7 @@ var PerformanceNowDurationMeasurement = class {
   }
 };
 var DateDurationMeasurement = class {
-  constructor() {
-    __publicField(this, "startTime", Date.now());
-  }
+  startTime = Date.now();
   get startEpochSeconds() {
     return Math.floor(this.startTime / 1e3);
   }
@@ -924,14 +923,14 @@ async function executeFunction(fn, input, options) {
 
 // src/core/schema/JSONParseError.ts
 var JSONParseError = class extends Error {
+  // note: property order determines debugging output
+  text;
+  cause;
   constructor({ text: text13, cause }) {
     super(
       `JSON parsing failed: Text: ${text13}.
 Error message: ${getErrorMessage(cause)}`
     );
-    // note: property order determines debugging output
-    __publicField(this, "text");
-    __publicField(this, "cause");
     this.name = "JSONParseError";
     this.cause = cause;
     this.text = text13;
@@ -949,13 +948,13 @@ Error message: ${getErrorMessage(cause)}`
 
 // src/core/schema/TypeValidationError.ts
 var TypeValidationError = class extends Error {
+  value;
+  cause;
   constructor({ value, cause }) {
     super(
       `Type validation failed: Value: ${JSON.stringify(value)}.
 Error message: ${getErrorMessage(cause)}`
     );
-    __publicField(this, "value");
-    __publicField(this, "cause");
     this.name = "TypeValidationError";
     this.cause = cause;
     this.value = value;
@@ -978,7 +977,6 @@ function uncheckedSchema(jsonSchema) {
 var UncheckedSchema = class {
   constructor(jsonSchema) {
     this.jsonSchema = jsonSchema;
-    __publicField(this, "_type");
   }
   validate(value) {
     return { success: true, value };
@@ -986,6 +984,7 @@ var UncheckedSchema = class {
   getJsonSchema() {
     return this.jsonSchema;
   }
+  _type;
 };
 
 // src/core/schema/ZodSchema.ts
@@ -994,16 +993,8 @@ function zodSchema(zodSchema2) {
   return new ZodSchema(zodSchema2);
 }
 var ZodSchema = class {
+  zodSchema;
   constructor(zodSchema2) {
-    __publicField(this, "zodSchema");
-    /**
-     * Use only for typing purposes. The value is always `undefined`.
-     */
-    __publicField(this, "_type");
-    /**
-     * Use only for typing purposes. The value is always `undefined`.
-     */
-    __publicField(this, "_partialType");
     this.zodSchema = zodSchema2;
   }
   validate(value) {
@@ -1013,6 +1004,14 @@ var ZodSchema = class {
   getJsonSchema() {
     return (0, import_zod_to_json_schema.zodToJsonSchema)(this.zodSchema);
   }
+  /**
+   * Use only for typing purposes. The value is always `undefined`.
+   */
+  _type;
+  /**
+   * Use only for typing purposes. The value is always `undefined`.
+   */
+  _partialType;
 };
 
 // src/core/schema/parseJSON.ts
@@ -1311,13 +1310,13 @@ async function embed({
 
 // src/model-function/classify/EmbeddingSimilarityClassifier.ts
 var EmbeddingSimilarityClassifier = class _EmbeddingSimilarityClassifier {
+  settings;
+  modelInformation = {
+    provider: "modelfusion",
+    modelName: "EmbeddingSimilarityClassifier"
+  };
+  embeddings;
   constructor(settings) {
-    __publicField(this, "settings");
-    __publicField(this, "modelInformation", {
-      provider: "modelfusion",
-      modelName: "EmbeddingSimilarityClassifier"
-    });
-    __publicField(this, "embeddings");
     this.settings = settings;
   }
   async getEmbeddings(options) {
@@ -1414,12 +1413,12 @@ async function classify({
 
 // src/model-function/generate-image/PromptTemplateImageGenerationModel.ts
 var PromptTemplateImageGenerationModel = class _PromptTemplateImageGenerationModel {
+  model;
+  promptTemplate;
   constructor({
     model,
     promptTemplate
   }) {
-    __publicField(this, "model");
-    __publicField(this, "promptTemplate");
     this.model = model;
     this.promptTemplate = promptTemplate;
   }
@@ -1533,11 +1532,9 @@ async function generateSpeech({
 
 // src/util/AsyncQueue.ts
 var AsyncQueue = class {
-  constructor() {
-    __publicField(this, "values", Array());
-    __publicField(this, "pendingResolvers", []);
-    __publicField(this, "closed", false);
-  }
+  values = Array();
+  pendingResolvers = [];
+  closed = false;
   processPendingResolvers() {
     while (this.pendingResolvers.length > 0) {
       this.pendingResolvers.shift()?.();
@@ -1903,13 +1900,13 @@ async function generateText({
 
 // src/model-function/generate-object/ObjectParseError.ts
 var ObjectParseError = class extends Error {
+  cause;
+  valueText;
   constructor({ valueText, cause }) {
     super(
       `Object parsing failed. Value: ${valueText}.
 Error message: ${getErrorMessage(cause)}`
     );
-    __publicField(this, "cause");
-    __publicField(this, "valueText");
     this.name = "ObjectParseError";
     this.cause = cause;
     this.valueText = valueText;
@@ -1927,12 +1924,12 @@ Error message: ${getErrorMessage(cause)}`
 
 // src/model-function/generate-object/ObjectFromTextGenerationModel.ts
 var ObjectFromTextGenerationModel = class _ObjectFromTextGenerationModel {
+  model;
+  template;
   constructor({
     model,
     template
   }) {
-    __publicField(this, "model");
-    __publicField(this, "template");
     this.model = model;
     this.template = template;
   }
@@ -2453,6 +2450,9 @@ function ObjectStreamToTextStream(stream) {
 
 // src/model-function/generate-object/ObjectValidationError.ts
 var ObjectValidationError = class extends Error {
+  cause;
+  valueText;
+  value;
   constructor({
     value,
     valueText,
@@ -2462,9 +2462,6 @@ var ObjectValidationError = class extends Error {
       `Object validation failed. Value: ${valueText}.
 Error message: ${getErrorMessage(cause)}`
     );
-    __publicField(this, "cause");
-    __publicField(this, "valueText");
-    __publicField(this, "value");
     this.name = "ObjectValidationError";
     this.cause = cause;
     this.value = value;
@@ -2531,7 +2528,7 @@ async function generateObject({
 
 // src/model-function/generate-object/jsonObjectPrompt.ts
 var DEFAULT_SCHEMA_PREFIX = "JSON schema:";
-var DEFAULT_SCHEMA_SUFFIX = "\nYou MUST answer with a JSON object matches the above schema.";
+var DEFAULT_SCHEMA_SUFFIX = "\nYou MUST answer with a JSON object that matches the JSON schema above.";
 var jsonObjectPrompt = {
   custom(createPrompt) {
     return { createPrompt, extractObject };
@@ -2578,6 +2575,7 @@ function createSystemPrompt({
 }) {
   return [
     originalSystemPrompt,
+    originalSystemPrompt != null ? "" : null,
     schemaPrefix,
     JSON.stringify(schema.getJsonSchema()),
     schemaSuffix
@@ -2697,6 +2695,9 @@ async function streamObject({
 
 // src/tool/generate-tool-call/ToolCallParseError.ts
 var ToolCallParseError = class extends Error {
+  toolName;
+  valueText;
+  cause;
   constructor({
     toolName,
     valueText,
@@ -2706,9 +2707,6 @@ var ToolCallParseError = class extends Error {
       `Tool call parsing failed for '${toolName}'. Value: ${valueText}.
 Error message: ${getErrorMessage(cause)}`
     );
-    __publicField(this, "toolName");
-    __publicField(this, "valueText");
-    __publicField(this, "cause");
     this.name = "ToolCallParseError";
     this.toolName = toolName;
     this.cause = cause;
@@ -2728,14 +2726,14 @@ Error message: ${getErrorMessage(cause)}`
 
 // src/tool/generate-tool-call/TextGenerationToolCallModel.ts
 var TextGenerationToolCallModel = class _TextGenerationToolCallModel {
+  model;
+  template;
   constructor({
     model,
-    format
+    template
   }) {
-    __publicField(this, "model");
-    __publicField(this, "format");
     this.model = model;
-    this.format = format;
+    this.template = template;
   }
   get modelInformation() {
     return this.model.modelInformation;
@@ -2746,17 +2744,26 @@ var TextGenerationToolCallModel = class _TextGenerationToolCallModel {
   get settingsForEvent() {
     return this.model.settingsForEvent;
   }
+  getModelWithJsonOutput(schema) {
+    if (this.template.withJsonOutput != null) {
+      return this.template.withJsonOutput({
+        model: this.model,
+        schema
+      });
+    }
+    return this.model;
+  }
   async doGenerateToolCall(tool, prompt, options) {
     const { rawResponse, text: text13, metadata } = await generateText({
-      model: this.model,
-      prompt: this.format.createPrompt(prompt, tool),
+      model: this.getModelWithJsonOutput(tool.parameters),
+      prompt: this.template.createPrompt(prompt, tool),
       fullResponse: true,
       ...options
     });
     try {
       return {
         rawResponse,
-        toolCall: this.format.extractToolCall(text13, tool),
+        toolCall: this.template.extractToolCall(text13, tool),
         usage: metadata?.usage
       };
     } catch (error) {
@@ -2770,20 +2777,20 @@ var TextGenerationToolCallModel = class _TextGenerationToolCallModel {
   withSettings(additionalSettings) {
     return new _TextGenerationToolCallModel({
       model: this.model.withSettings(additionalSettings),
-      format: this.format
+      template: this.template
     });
   }
 };
 
 // src/tool/generate-tool-calls/ToolCallsParseError.ts
 var ToolCallsParseError = class extends Error {
+  valueText;
+  cause;
   constructor({ valueText, cause }) {
     super(
       `Tool calls parsing failed. Value: ${valueText}.
 Error message: ${getErrorMessage(cause)}`
     );
-    __publicField(this, "valueText");
-    __publicField(this, "cause");
     this.name = "ToolCallsParseError";
     this.cause = cause;
     this.valueText = valueText;
@@ -2801,12 +2808,12 @@ Error message: ${getErrorMessage(cause)}`
 
 // src/tool/generate-tool-calls/TextGenerationToolCallsModel.ts
 var TextGenerationToolCallsModel = class _TextGenerationToolCallsModel {
+  model;
+  template;
   constructor({
     model,
     template
   }) {
-    __publicField(this, "model");
-    __publicField(this, "template");
     this.model = model;
     this.template = template;
   }
@@ -2855,12 +2862,12 @@ var TextGenerationToolCallsModel = class _TextGenerationToolCallsModel {
 
 // src/model-function/generate-text/PromptTemplateTextGenerationModel.ts
 var PromptTemplateTextGenerationModel = class _PromptTemplateTextGenerationModel {
+  model;
+  promptTemplate;
   constructor({
     model,
     promptTemplate
   }) {
-    __publicField(this, "model");
-    __publicField(this, "promptTemplate");
     this.model = model;
     this.promptTemplate = promptTemplate;
   }
@@ -2900,7 +2907,7 @@ var PromptTemplateTextGenerationModel = class _PromptTemplateTextGenerationModel
   asToolCallGenerationModel(promptTemplate) {
     return new TextGenerationToolCallModel({
       model: this,
-      format: promptTemplate
+      template: promptTemplate
     });
   }
   asToolCallsOrTextGenerationModel(promptTemplate) {
@@ -3000,9 +3007,9 @@ __export(AlpacaPromptTemplate_exports, {
 
 // src/model-function/generate-text/prompt-template/InvalidPromptError.ts
 var InvalidPromptError = class extends Error {
+  prompt;
   constructor(message, prompt) {
     super(message);
-    __publicField(this, "prompt");
     this.name = "InvalidPromptError";
     this.prompt = prompt;
   }
@@ -4017,8 +4024,8 @@ var callWithRetryAndThrottle = async ({
 
 // src/model-function/AbstractModel.ts
 var AbstractModel = class {
+  settings;
   constructor({ settings }) {
-    __publicField(this, "settings");
     this.settings = settings;
   }
   // implemented as a separate accessor to remove all other properties from the model
@@ -4041,8 +4048,8 @@ function mapBasicPromptToAutomatic1111Format() {
 var Automatic1111ImageGenerationModel = class _Automatic1111ImageGenerationModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "Automatic1111");
   }
+  provider = "Automatic1111";
   get modelName() {
     return this.settings.model;
   }
@@ -4218,8 +4225,8 @@ var import_zod5 = require("zod");
 // src/model-provider/cohere/CohereTokenizer.ts
 var import_zod4 = require("zod");
 var CohereTokenizer = class {
+  settings;
   constructor(settings) {
-    __publicField(this, "settings");
     this.settings = settings;
   }
   async callTokenizeAPI(text13, callOptions) {
@@ -4341,12 +4348,6 @@ var COHERE_TEXT_EMBEDDING_MODELS = {
 var CohereTextEmbeddingModel = class _CohereTextEmbeddingModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "cohere");
-    __publicField(this, "maxValuesPerCall", 96);
-    __publicField(this, "isParallelizable", true);
-    __publicField(this, "dimensions");
-    __publicField(this, "contextWindowSize");
-    __publicField(this, "tokenizer");
     this.contextWindowSize = COHERE_TEXT_EMBEDDING_MODELS[this.modelName].contextWindowSize;
     this.tokenizer = new CohereTokenizer({
       api: this.settings.api,
@@ -4354,9 +4355,15 @@ var CohereTextEmbeddingModel = class _CohereTextEmbeddingModel extends AbstractM
     });
     this.dimensions = COHERE_TEXT_EMBEDDING_MODELS[this.modelName].dimensions;
   }
+  provider = "cohere";
   get modelName() {
     return this.settings.model;
   }
+  maxValuesPerCall = 96;
+  isParallelizable = true;
+  dimensions;
+  contextWindowSize;
+  tokenizer;
   async tokenize(text13) {
     return this.tokenizer.tokenize(text13);
   }
@@ -4502,18 +4509,18 @@ var COHERE_TEXT_GENERATION_MODELS = {
 var CohereTextGenerationModel = class _CohereTextGenerationModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "cohere");
-    __publicField(this, "contextWindowSize");
-    __publicField(this, "tokenizer");
     this.contextWindowSize = COHERE_TEXT_GENERATION_MODELS[this.settings.model].contextWindowSize;
     this.tokenizer = new CohereTokenizer({
       api: this.settings.api,
       model: this.settings.model
     });
   }
+  provider = "cohere";
   get modelName() {
     return this.settings.model;
   }
+  contextWindowSize;
+  tokenizer;
   async countPromptTokens(input) {
     return countTokens(this.tokenizer, input);
   }
@@ -4757,7 +4764,16 @@ async function createSimpleWebSocket(url) {
       return new WebSocket(url);
     }
     case "node": {
-      const { default: WebSocket2 } = await import("ws");
+      let WebSocket2;
+      try {
+        WebSocket2 = (await import("ws")).default;
+      } catch (error) {
+        try {
+          WebSocket2 = require("ws");
+        } catch (error2) {
+          throw new Error(`Failed to load 'ws' module dynamically.`);
+        }
+      }
       return new WebSocket2(url);
     }
     default: {
@@ -4771,8 +4787,8 @@ var defaultModel = "eleven_monolingual_v1";
 var ElevenLabsSpeechModel = class _ElevenLabsSpeechModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "elevenlabs");
   }
+  provider = "elevenlabs";
   get modelName() {
     return this.settings.voice;
   }
@@ -5003,19 +5019,18 @@ var import_zod9 = require("zod");
 var HuggingFaceTextEmbeddingModel = class _HuggingFaceTextEmbeddingModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "huggingface");
-    __publicField(this, "maxValuesPerCall");
-    __publicField(this, "isParallelizable", true);
-    __publicField(this, "contextWindowSize");
-    __publicField(this, "dimensions");
-    __publicField(this, "tokenizer");
-    __publicField(this, "countPromptTokens");
     this.maxValuesPerCall = settings.maxValuesPerCall ?? 1024;
     this.dimensions = settings.dimensions;
   }
+  provider = "huggingface";
   get modelName() {
     return this.settings.model;
   }
+  maxValuesPerCall;
+  isParallelizable = true;
+  contextWindowSize = void 0;
+  dimensions;
+  tokenizer = void 0;
   async callAPI(texts, callOptions) {
     if (texts.length > this.maxValuesPerCall) {
       throw new Error(
@@ -5056,6 +5071,7 @@ var HuggingFaceTextEmbeddingModel = class _HuggingFaceTextEmbeddingModel extends
       options: this.settings.options
     };
   }
+  countPromptTokens = void 0;
   async doEmbedValues(texts, options) {
     const rawResponse = await this.callAPI(texts, options);
     return {
@@ -5076,14 +5092,14 @@ var import_zod10 = require("zod");
 var HuggingFaceTextGenerationModel = class _HuggingFaceTextGenerationModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "huggingface");
-    __publicField(this, "contextWindowSize");
-    __publicField(this, "tokenizer");
-    __publicField(this, "countPromptTokens");
   }
+  provider = "huggingface";
   get modelName() {
     return this.settings.model;
   }
+  contextWindowSize = void 0;
+  tokenizer = void 0;
+  countPromptTokens = void 0;
   async callAPI(prompt, callOptions) {
     const api = this.settings.api ?? new HuggingFaceApiConfiguration();
     const abortSignal = callOptions?.run?.abortSignal;
@@ -5427,8 +5443,8 @@ var BakLLaVA1 = LlamaCppBakLLaVA1PromptTemplate_exports;
 // src/model-provider/llamacpp/LlamaCppTokenizer.ts
 var import_zod12 = require("zod");
 var LlamaCppTokenizer = class {
+  api;
   constructor(api = new LlamaCppApiConfiguration()) {
-    __publicField(this, "api");
     this.api = api;
   }
   async callTokenizeAPI(text13, callOptions) {
@@ -5481,9 +5497,7 @@ var PRIMITIVE_RULES = {
   null: '"null" space'
 };
 var RuleMap = class {
-  constructor() {
-    __publicField(this, "rules", /* @__PURE__ */ new Map());
-  }
+  rules = /* @__PURE__ */ new Map();
   add(name, rule) {
     const escapedName = this.escapeRuleName(name, rule);
     this.rules.set(escapedName, rule);
@@ -5575,16 +5589,16 @@ function visit(schema, name, rules) {
 var LlamaCppCompletionModel = class _LlamaCppCompletionModel extends AbstractModel {
   constructor(settings = {}) {
     super({ settings });
-    __publicField(this, "provider", "llamacpp");
-    __publicField(this, "tokenizer");
     this.tokenizer = new LlamaCppTokenizer(this.settings.api);
   }
+  provider = "llamacpp";
   get modelName() {
     return null;
   }
   get contextWindowSize() {
     return this.settings.contextWindowSize;
   }
+  tokenizer;
   async callAPI(prompt, callOptions, options) {
     const api = this.settings.api ?? new LlamaCppApiConfiguration();
     const responseFormat = options.responseFormat;
@@ -5884,21 +5898,21 @@ var import_zod14 = require("zod");
 var LlamaCppTextEmbeddingModel = class _LlamaCppTextEmbeddingModel extends AbstractModel {
   constructor(settings = {}) {
     super({ settings });
-    __publicField(this, "provider", "llamacpp");
-    __publicField(this, "maxValuesPerCall", 1);
-    __publicField(this, "contextWindowSize");
-    __publicField(this, "tokenizer");
     this.tokenizer = new LlamaCppTokenizer(this.settings.api);
   }
+  provider = "llamacpp";
   get modelName() {
     return null;
   }
+  maxValuesPerCall = 1;
   get isParallelizable() {
     return this.settings.isParallelizable ?? false;
   }
+  contextWindowSize = void 0;
   get dimensions() {
     return this.settings.dimensions;
   }
+  tokenizer;
   async tokenize(text13) {
     return this.tokenizer.tokenize(text13);
   }
@@ -6081,8 +6095,8 @@ var import_zod15 = require("zod");
 var LmntSpeechModel = class _LmntSpeechModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "lmnt");
   }
+  provider = "lmnt";
   get modelName() {
     return this.settings.voice;
   }
@@ -6326,14 +6340,14 @@ var failedMistralCallResponseHandler = createJsonErrorResponseHandler({
 var MistralChatModel = class _MistralChatModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "mistral");
-    __publicField(this, "contextWindowSize");
-    __publicField(this, "tokenizer");
-    __publicField(this, "countPromptTokens");
   }
+  provider = "mistral";
   get modelName() {
     return this.settings.model;
   }
+  contextWindowSize = void 0;
+  tokenizer = void 0;
+  countPromptTokens = void 0;
   async callAPI(prompt, callOptions, options) {
     const api = this.settings.api ?? new MistralApiConfiguration();
     const abortSignal = callOptions.run?.abortSignal;
@@ -6518,18 +6532,18 @@ var import_zod18 = require("zod");
 var MistralTextEmbeddingModel = class _MistralTextEmbeddingModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "mistral");
-    __publicField(this, "maxValuesPerCall", 32);
-    /**
-     * Parallel calls are technically possible, but I have been hitting rate limits and disabled
-     * them for now.
-     */
-    __publicField(this, "isParallelizable", false);
-    __publicField(this, "dimensions", 1024);
   }
+  provider = "mistral";
   get modelName() {
     return this.settings.model;
   }
+  maxValuesPerCall = 32;
+  /**
+   * Parallel calls are technically possible, but I have been hitting rate limits and disabled
+   * them for now.
+   */
+  isParallelizable = false;
+  dimensions = 1024;
   async callAPI(texts, callOptions) {
     if (texts.length > this.maxValuesPerCall) {
       throw new Error(
@@ -6724,14 +6738,14 @@ var failedOllamaCallResponseHandler = createJsonErrorResponseHandler({
 var OllamaChatModel = class _OllamaChatModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "ollama");
-    __publicField(this, "tokenizer");
-    __publicField(this, "countPromptTokens");
-    __publicField(this, "contextWindowSize");
   }
+  provider = "ollama";
   get modelName() {
     return this.settings.model;
   }
+  tokenizer = void 0;
+  countPromptTokens = void 0;
+  contextWindowSize = void 0;
   async callAPI(prompt, callOptions, options) {
     const { responseFormat } = options;
     const api = this.settings.api ?? new OllamaApiConfiguration();
@@ -6840,7 +6854,7 @@ var OllamaChatModel = class _OllamaChatModel extends AbstractModel {
   asToolCallGenerationModel(promptTemplate) {
     return new TextGenerationToolCallModel({
       model: this,
-      format: promptTemplate
+      template: promptTemplate
     });
   }
   asToolCallsOrTextGenerationModel(promptTemplate) {
@@ -7025,13 +7039,13 @@ var Vicuna2 = asOllamaCompletionTextPromptTemplateProvider(VicunaPromptTemplate_
 var OllamaCompletionModel = class _OllamaCompletionModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "ollama");
-    __publicField(this, "tokenizer");
-    __publicField(this, "countPromptTokens");
   }
+  provider = "ollama";
   get modelName() {
     return this.settings.model;
   }
+  tokenizer = void 0;
+  countPromptTokens = void 0;
   get contextWindowSize() {
     return this.settings.contextWindowSize;
   }
@@ -7162,7 +7176,7 @@ var OllamaCompletionModel = class _OllamaCompletionModel extends AbstractModel {
   asToolCallGenerationModel(promptTemplate) {
     return new TextGenerationToolCallModel({
       model: this,
-      format: promptTemplate
+      template: promptTemplate
     });
   }
   asToolCallsOrTextGenerationModel(promptTemplate) {
@@ -7310,12 +7324,12 @@ var import_zod22 = require("zod");
 var OllamaTextEmbeddingModel = class _OllamaTextEmbeddingModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "ollama");
-    __publicField(this, "maxValuesPerCall", 1);
   }
+  provider = "ollama";
   get modelName() {
     return null;
   }
+  maxValuesPerCall = 1;
   get isParallelizable() {
     return this.settings.isParallelizable ?? false;
   }
@@ -7876,11 +7890,11 @@ var import_zod26 = require("zod");
 var AbstractOpenAITextEmbeddingModel = class extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "isParallelizable", true);
   }
   get maxValuesPerCall() {
     return this.settings.maxValuesPerCall ?? 2048;
   }
+  isParallelizable = true;
   async callAPI(texts, callOptions) {
     const api = this.settings.api ?? new OpenAIApiConfiguration();
     const abortSignal = callOptions.run?.abortSignal;
@@ -7941,6 +7955,10 @@ var openAITextEmbeddingResponseSchema = import_zod26.z.object({
 
 // src/model-provider/openai/AzureOpenAIApiConfiguration.ts
 var AzureOpenAIApiConfiguration = class extends AbstractApiConfiguration {
+  resourceName;
+  deploymentId;
+  apiVersion;
+  fixedHeaderValue;
   constructor({
     resourceName,
     deploymentId,
@@ -7950,10 +7968,6 @@ var AzureOpenAIApiConfiguration = class extends AbstractApiConfiguration {
     throttle
   }) {
     super({ retry, throttle });
-    __publicField(this, "resourceName");
-    __publicField(this, "deploymentId");
-    __publicField(this, "apiVersion");
-    __publicField(this, "fixedHeaderValue");
     this.resourceName = resourceName;
     this.deploymentId = deploymentId;
     this.apiVersion = apiVersion;
@@ -8152,16 +8166,16 @@ function chat12() {
 
 // src/model-provider/openai/OpenAIChatFunctionCallObjectGenerationModel.ts
 var OpenAIChatFunctionCallObjectGenerationModel = class _OpenAIChatFunctionCallObjectGenerationModel {
+  model;
+  fnName;
+  fnDescription;
+  promptTemplate;
   constructor({
     model,
     fnName,
     fnDescription,
     promptTemplate
   }) {
-    __publicField(this, "model");
-    __publicField(this, "fnName");
-    __publicField(this, "fnDescription");
-    __publicField(this, "promptTemplate");
     this.model = model;
     this.fnName = fnName;
     this.fnDescription = fnDescription;
@@ -8303,9 +8317,9 @@ var TikTokenTokenizer = class {
    * Get a TikToken tokenizer for a specific model or encoding.
    */
   constructor(settings) {
-    __publicField(this, "tiktoken");
     this.tiktoken = new import_lite.Tiktoken(getTiktokenBPE(settings.model));
   }
+  tiktoken;
   async tokenize(text13) {
     return this.tiktoken.encode(text13);
   }
@@ -8519,18 +8533,18 @@ var calculateOpenAIChatCostInMillicents = ({
 var OpenAIChatModel = class _OpenAIChatModel extends AbstractOpenAIChatModel {
   constructor(settings) {
     super(settings);
-    __publicField(this, "provider", "openai");
-    __publicField(this, "contextWindowSize");
-    __publicField(this, "tokenizer");
     const modelInformation = getOpenAIChatModelInformation(this.settings.model);
     this.tokenizer = new TikTokenTokenizer({
       model: modelInformation.baseModel
     });
     this.contextWindowSize = modelInformation.contextWindowSize;
   }
+  provider = "openai";
   get modelName() {
     return this.settings.model;
   }
+  contextWindowSize;
+  tokenizer;
   /**
    * Counts the prompt tokens required for the messages. This includes the message base tokens
    * and the prompt base tokens.
@@ -8632,9 +8646,6 @@ var calculateOpenAICompletionCostInMillicents = ({
 var OpenAICompletionModel = class _OpenAICompletionModel extends AbstractOpenAICompletionModel {
   constructor(settings) {
     super(settings);
-    __publicField(this, "provider", "openai");
-    __publicField(this, "contextWindowSize");
-    __publicField(this, "tokenizer");
     const modelInformation = getOpenAICompletionModelInformation(
       this.settings.model
     );
@@ -8643,9 +8654,12 @@ var OpenAICompletionModel = class _OpenAICompletionModel extends AbstractOpenAIC
     });
     this.contextWindowSize = modelInformation.contextWindowSize;
   }
+  provider = "openai";
   get modelName() {
     return this.settings.model;
   }
+  contextWindowSize;
+  tokenizer;
   async countPromptTokens(input) {
     return countTokens(this.tokenizer, input);
   }
@@ -8770,8 +8784,8 @@ var calculateOpenAIImageGenerationCostInMillicents = ({
 var OpenAIImageGenerationModel = class _OpenAIImageGenerationModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "openai");
   }
+  provider = "openai";
   get modelName() {
     return this.settings.model;
   }
@@ -8892,8 +8906,8 @@ var calculateOpenAISpeechCostInMillicents = ({
 var OpenAISpeechModel = class _OpenAISpeechModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "openai");
   }
+  provider = "openai";
   get voice() {
     return this.settings.voice;
   }
@@ -8978,17 +8992,17 @@ var calculateOpenAIEmbeddingCostInMillicents = ({
 var OpenAITextEmbeddingModel = class _OpenAITextEmbeddingModel extends AbstractOpenAITextEmbeddingModel {
   constructor(settings) {
     super(settings);
-    __publicField(this, "provider", "openai");
-    __publicField(this, "dimensions");
-    __publicField(this, "tokenizer");
-    __publicField(this, "contextWindowSize");
     this.tokenizer = new TikTokenTokenizer({ model: this.modelName });
     this.contextWindowSize = OPENAI_TEXT_EMBEDDING_MODELS[this.modelName].contextWindowSize;
     this.dimensions = this.settings.dimensions ?? OPENAI_TEXT_EMBEDDING_MODELS[this.modelName].dimensions;
   }
+  provider = "openai";
   get modelName() {
     return this.settings.model;
   }
+  dimensions;
+  tokenizer;
+  contextWindowSize;
   async countTokens(input) {
     return countTokens(this.tokenizer, input);
   }
@@ -9052,8 +9066,8 @@ var calculateOpenAITranscriptionCostInMillicents = ({
 var OpenAITranscriptionModel = class _OpenAITranscriptionModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "openai");
   }
+  provider = "openai";
   get modelName() {
     return this.settings.model;
   }
@@ -9233,17 +9247,14 @@ var FireworksAIApiConfiguration = class extends BaseUrlApiConfigurationWithDefau
         path: "/inference/v1"
       }
     });
-    __publicField(this, "provider", "openaicompatible-fireworksai");
   }
+  provider = "openaicompatible-fireworksai";
 };
 
 // src/model-provider/openai-compatible/OpenAICompatibleChatModel.ts
 var OpenAICompatibleChatModel = class _OpenAICompatibleChatModel extends AbstractOpenAIChatModel {
   constructor(settings) {
     super(settings);
-    __publicField(this, "contextWindowSize");
-    __publicField(this, "tokenizer");
-    __publicField(this, "countPromptTokens");
   }
   get provider() {
     return this.settings.provider ?? this.settings.api.provider ?? "openaicompatible";
@@ -9251,6 +9262,9 @@ var OpenAICompatibleChatModel = class _OpenAICompatibleChatModel extends Abstrac
   get modelName() {
     return this.settings.model;
   }
+  contextWindowSize = void 0;
+  tokenizer = void 0;
+  countPromptTokens = void 0;
   get settingsForEvent() {
     const eventSettingProperties = [
       ...textGenerationModelProperties,
@@ -9313,9 +9327,6 @@ var OpenAICompatibleChatModel = class _OpenAICompatibleChatModel extends Abstrac
 var OpenAICompatibleCompletionModel = class _OpenAICompatibleCompletionModel extends AbstractOpenAICompletionModel {
   constructor(settings) {
     super(settings);
-    __publicField(this, "contextWindowSize");
-    __publicField(this, "tokenizer");
-    __publicField(this, "countPromptTokens");
   }
   get provider() {
     return this.settings.provider ?? this.settings.api.provider ?? "openaicompatible";
@@ -9323,6 +9334,9 @@ var OpenAICompatibleCompletionModel = class _OpenAICompatibleCompletionModel ext
   get modelName() {
     return this.settings.model;
   }
+  contextWindowSize = void 0;
+  tokenizer = void 0;
+  countPromptTokens = void 0;
   get settingsForEvent() {
     const eventSettingProperties = [
       ...textGenerationModelProperties,
@@ -9426,8 +9440,8 @@ var PerplexityApiConfiguration = class extends BaseUrlApiConfigurationWithDefaul
         path: ""
       }
     });
-    __publicField(this, "provider", "openaicompatible-perplexity");
   }
+  provider = "openaicompatible-perplexity";
 };
 
 // src/model-provider/openai-compatible/TogetherAIApiConfiguration.ts
@@ -9449,8 +9463,8 @@ var TogetherAIApiConfiguration = class extends BaseUrlApiConfigurationWithDefaul
         path: "/v1"
       }
     });
-    __publicField(this, "provider", "openaicompatible-togetherai");
   }
+  provider = "openaicompatible-togetherai";
 };
 
 // src/model-provider/openai-compatible/OpenAICompatibleFacade.ts
@@ -9526,8 +9540,8 @@ function mapBasicPromptToStabilityFormat() {
 var StabilityImageGenerationModel = class _StabilityImageGenerationModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "stability");
   }
+  provider = "stability";
   get modelName() {
     return this.settings.model;
   }
@@ -9647,9 +9661,9 @@ var import_zod31 = require("zod");
 var WhisperCppTranscriptionModel = class _WhisperCppTranscriptionModel extends AbstractModel {
   constructor(settings) {
     super({ settings });
-    __publicField(this, "provider", "whispercpp");
-    __publicField(this, "modelName", null);
   }
+  provider = "whispercpp";
+  modelName = null;
   async doTranscribe({
     audioData,
     mimeType
@@ -9875,6 +9889,9 @@ async function splitTextChunk(splitFunction, input) {
 
 // src/tool/NoSuchToolDefinitionError.ts
 var NoSuchToolDefinitionError = class extends Error {
+  toolName;
+  cause;
+  parameters;
   constructor({
     toolName,
     parameters
@@ -9882,9 +9899,6 @@ var NoSuchToolDefinitionError = class extends Error {
     super(
       `Tool definition '${toolName}' not found. Parameters: ${JSON.stringify(parameters)}.`
     );
-    __publicField(this, "toolName");
-    __publicField(this, "cause");
-    __publicField(this, "parameters");
     this.name = "NoSuchToolDefinitionError";
     this.toolName = toolName;
     this.parameters = parameters;
@@ -9903,6 +9917,28 @@ var NoSuchToolDefinitionError = class extends Error {
 
 // src/tool/Tool.ts
 var Tool = class {
+  /**
+   * The name of the tool.
+   * Should be understandable for language models and unique among the tools that they know.
+   */
+  name;
+  /**
+   * A optional description of what the tool does. Will be used by the language model to decide whether to use the tool.
+   */
+  description;
+  /**
+   * The schema of the input that the tool expects. The language model will use this to generate the input.
+   * Use descriptions to make the input understandable for the language model.
+   */
+  parameters;
+  /**
+   * An optional schema of the output that the tool produces. This will be used to validate the output.
+   */
+  returnType;
+  /**
+   * The actual execution function of the tool.
+   */
+  execute;
   constructor({
     name,
     description,
@@ -9910,28 +9946,6 @@ var Tool = class {
     returnType,
     execute
   }) {
-    /**
-     * The name of the tool.
-     * Should be understandable for language models and unique among the tools that they know.
-     */
-    __publicField(this, "name");
-    /**
-     * A description of what the tool does. Will be used by the language model to decide whether to use the tool.
-     */
-    __publicField(this, "description");
-    /**
-     * The schema of the input that the tool expects. The language model will use this to generate the input.
-     * Use descriptions to make the input understandable for the language model.
-     */
-    __publicField(this, "parameters");
-    /**
-     * An optional schema of the output that the tool produces. This will be used to validate the output.
-     */
-    __publicField(this, "returnType");
-    /**
-     * The actual execution function of the tool.
-     */
-    __publicField(this, "execute");
     this.name = name;
     this.description = description;
     this.parameters = parameters;
@@ -9940,8 +9954,36 @@ var Tool = class {
   }
 };
 
+// src/tool/ObjectGeneratorTool.ts
+var ObjectGeneratorTool = class extends Tool {
+  constructor({
+    name = "object-generator",
+    // eslint-disable-line @typescript-eslint/no-explicit-any
+    description,
+    model,
+    parameters,
+    objectSchema,
+    prompt
+  }) {
+    super({
+      name,
+      description,
+      parameters,
+      execute: async (input, options) => generateObject({
+        model,
+        schema: objectSchema,
+        prompt: prompt(input),
+        ...options
+      })
+    });
+  }
+};
+
 // src/tool/ToolCallArgumentsValidationError.ts
 var ToolCallArgumentsValidationError = class extends Error {
+  toolName;
+  cause;
+  args;
   constructor({
     toolName,
     args,
@@ -9952,9 +9994,6 @@ var ToolCallArgumentsValidationError = class extends Error {
 Arguments: ${JSON.stringify(args)}.
 Error message: ${getErrorMessage(cause)}`
     );
-    __publicField(this, "toolName");
-    __publicField(this, "cause");
-    __publicField(this, "args");
     this.name = "ToolCallArgumentsValidationError";
     this.toolName = toolName;
     this.cause = cause;
@@ -9974,14 +10013,14 @@ Error message: ${getErrorMessage(cause)}`
 
 // src/tool/ToolCallError.ts
 var ToolCallError = class extends Error {
+  toolCall;
+  cause;
   constructor({
     cause,
     toolCall,
     message = getErrorMessage(cause)
   }) {
     super(`Tool call for tool '${toolCall.name}' failed: ${message}`);
-    __publicField(this, "toolCall");
-    __publicField(this, "cause");
     this.name = "ToolCallError";
     this.toolCall = toolCall;
     this.cause = cause;
@@ -9999,12 +10038,12 @@ var ToolCallError = class extends Error {
 
 // src/tool/ToolCallGenerationError.ts
 var ToolCallGenerationError = class extends Error {
+  toolName;
+  cause;
   constructor({ toolName, cause }) {
     super(
       `Tool call generation failed for tool '${toolName}'. Error message: ${getErrorMessage(cause)}`
     );
-    __publicField(this, "toolName");
-    __publicField(this, "cause");
     this.name = "ToolCallsGenerationError";
     this.toolName = toolName;
     this.cause = cause;
@@ -10022,6 +10061,9 @@ var ToolCallGenerationError = class extends Error {
 
 // src/tool/ToolExecutionError.ts
 var ToolExecutionError = class extends Error {
+  toolName;
+  input;
+  cause;
   constructor({
     toolName,
     input,
@@ -10029,9 +10071,6 @@ var ToolExecutionError = class extends Error {
     message = getErrorMessage(cause)
   }) {
     super(`Error executing tool '${toolName}': ${message}`);
-    __publicField(this, "toolName");
-    __publicField(this, "input");
-    __publicField(this, "cause");
     this.name = "ToolExecutionError";
     this.toolName = toolName;
     this.input = input;
@@ -10253,29 +10292,63 @@ async function generateToolCall({
 
 // src/tool/generate-tool-call/jsonToolCallPrompt.ts
 var import_nanoid6 = require("nanoid");
+var DEFAULT_TOOL_PROMPT = (tool) => [
+  `You are calling the function "${tool.name}".`,
+  tool.description != null ? `Function description: ${tool.description}` : null,
+  `Function parameters JSON schema: ${JSON.stringify(
+    tool.parameters.getJsonSchema()
+  )}`,
+  ``,
+  `You MUST answer with a JSON object that matches the JSON schema above.`
+].filter(Boolean).join("\n");
 var jsonToolCallPrompt = {
-  text() {
+  text({
+    toolPrompt
+  } = {}) {
     return {
-      createPrompt(instruction13, tool) {
+      createPrompt(prompt, tool) {
         return {
-          system: [
-            `You are calling a function "${tool.name}".`,
-            tool.description != null ? `  Function description: ${tool.description}` : null,
-            `  Function parameters JSON schema: ${JSON.stringify(
-              tool.parameters.getJsonSchema()
-            )}`,
-            ``,
-            `You MUST answer with a JSON object matches the above schema for the arguments.`
-          ].filter(Boolean).join("\n"),
-          instruction: instruction13
+          system: createSystemPrompt2({ tool, toolPrompt }),
+          instruction: prompt
         };
       },
-      extractToolCall(response) {
-        return { id: (0, import_nanoid6.nanoid)(), args: parseJSON({ text: response }) };
-      }
+      extractToolCall,
+      withJsonOutput: ({ model, schema }) => model.withJsonOutput(schema)
+    };
+  },
+  instruction({
+    toolPrompt
+  } = {}) {
+    return {
+      createPrompt(prompt, tool) {
+        return {
+          system: createSystemPrompt2({
+            originalSystemPrompt: prompt.system,
+            tool,
+            toolPrompt
+          }),
+          instruction: prompt.instruction
+        };
+      },
+      extractToolCall,
+      withJsonOutput: ({ model, schema }) => model.withJsonOutput(schema)
     };
   }
 };
+function createSystemPrompt2({
+  originalSystemPrompt,
+  toolPrompt = DEFAULT_TOOL_PROMPT,
+  tool
+}) {
+  return [
+    originalSystemPrompt,
+    originalSystemPrompt != null ? "" : null,
+    toolPrompt(tool)
+  ].filter(Boolean).join("\n");
+}
+function extractToolCall(response) {
+  return { id: (0, import_nanoid6.nanoid)(), args: parseJSON({ text: response }) };
+}
 
 // src/tool/generate-tool-calls/generateToolCalls.ts
 async function generateToolCalls({
@@ -10463,6 +10536,9 @@ function createEventSourceStream(events) {
 
 // src/vector-index/VectorIndexRetriever.ts
 var VectorIndexRetriever = class _VectorIndexRetriever {
+  vectorIndex;
+  embeddingModel;
+  settings;
   constructor({
     vectorIndex,
     embeddingModel,
@@ -10470,9 +10546,6 @@ var VectorIndexRetriever = class _VectorIndexRetriever {
     similarityThreshold,
     filter
   }) {
-    __publicField(this, "vectorIndex");
-    __publicField(this, "embeddingModel");
-    __publicField(this, "settings");
     this.vectorIndex = vectorIndex;
     this.embeddingModel = embeddingModel;
     this.settings = {
@@ -10517,9 +10590,6 @@ var jsonDataSchema = zodSchema(
   )
 );
 var MemoryVectorIndex = class _MemoryVectorIndex {
-  constructor() {
-    __publicField(this, "entries", /* @__PURE__ */ new Map());
-  }
   static async deserialize({
     serializedData,
     schema
@@ -10539,6 +10609,7 @@ var MemoryVectorIndex = class _MemoryVectorIndex {
     );
     return vectorIndex;
   }
+  entries = /* @__PURE__ */ new Map();
   async upsertMany(data) {
     for (const entry of data) {
       this.entries.set(entry.id, entry);
@@ -10661,6 +10732,7 @@ async function upsertIntoVectorIndex({
   OPENAI_TRANSCRIPTION_MODELS,
   ObjectFromTextGenerationModel,
   ObjectFromTextStreamingModel,
+  ObjectGeneratorTool,
   ObjectParseError,
   ObjectStreamFromResponse,
   ObjectStreamResponse,