@agtlantis/core 0.4.1 → 0.5.0

package/dist/index.js

@@ -9,7 +9,6 @@ import * as yaml from 'yaml';
 import { createHash } from 'crypto';
 import { createGoogleGenerativeAI } from '@ai-sdk/google';
 import { GoogleGenAI } from '@google/genai';
-import merge from 'lodash/merge';
 import { createOpenAI } from '@ai-sdk/openai';
 
 // src/errors/utils.ts
@@ -1379,11 +1378,9 @@ function parsePromptYaml(content, promptId) {
   try {
     parsed = yaml.parse(content);
   } catch (error) {
-    throw new PromptInvalidFormatError(
-      promptId,
-      `Invalid YAML: ${toErrorMessage(error)}`,
-      { cause: toErrorCause(error) }
-    );
+    throw new PromptInvalidFormatError(promptId, `Invalid YAML: ${toErrorMessage(error)}`, {
+      cause: toErrorCause(error)
+    });
   }
   if (!parsed || typeof parsed !== "object") {
     throw new PromptInvalidFormatError(promptId, "Expected YAML object");
@@ -1469,17 +1466,17 @@ var FilePromptRepository = class {
         }
         throw new PromptIOError("read", filePath, { cause: toErrorCause(error) });
       }
-      const promptContent = this.parseContent(content, id);
-      if (promptContent.id !== id || promptContent.version !== version) {
+      const promptTemplate = this.parseContent(content, id);
+      if (promptTemplate.id !== id || promptTemplate.version !== version) {
         throw new PromptInvalidFormatError(
           id,
-          `File content mismatch: expected id='${id}' version='${version}', got id='${promptContent.id}' version='${promptContent.version}'`
+          `File content mismatch: expected id='${id}' version='${version}', got id='${promptTemplate.id}' version='${promptTemplate.version}'`
         );
       }
       if (this.cacheEnabled) {
-        this.contentCache.set(cacheKey, promptContent);
+        this.contentCache.set(cacheKey, promptTemplate);
       }
-      return promptContent;
+      return promptTemplate;
     }
     let files;
     try {
@@ -1985,6 +1982,23 @@ var GoogleFileManager = class {
   }
 };
 
+// src/utils/deep-merge.ts
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function deepMerge(...sources) {
+  const result = {};
+  for (const source of sources) {
+    if (!source) continue;
+    for (const key of Object.keys(source)) {
+      const existing = result[key];
+      const incoming = source[key];
+      result[key] = isPlainObject(existing) && isPlainObject(incoming) ? deepMerge(existing, incoming) : incoming;
+    }
+  }
+  return result;
+}
+
 // src/session/usage-extractors.ts
 function mergeUsages(usages) {
   if (usages.length === 0) {
@@ -2253,6 +2267,7 @@ var SimpleSession = class {
   providerPricing;
   defaultProviderOptions;
   defaultTools;
+  defaultGenerationOptions;
   _fileManager;
   logger;
   sessionStartTime;
@@ -2267,6 +2282,7 @@ var SimpleSession = class {
     this.providerPricing = options.providerPricing;
     this.defaultProviderOptions = options.defaultProviderOptions;
     this.defaultTools = options.defaultTools;
+    this.defaultGenerationOptions = options.defaultGenerationOptions;
     this._fileManager = options.fileManager;
     this.logger = options.logger ?? noopLogger;
     this.sessionStartTime = options.startTime ?? Date.now();
@@ -2303,7 +2319,7 @@ var SimpleSession = class {
     const { model: requestedModel, providerOptions, tools, ...restParams } = params;
     const languageModel = this.getModel(requestedModel);
     const modelId = this.extractModelId(languageModel);
-    const mergedProviderOptions = this.defaultProviderOptions || providerOptions ? merge({}, this.defaultProviderOptions ?? {}, providerOptions ?? {}) : void 0;
+    const mergedProviderOptions = this.defaultProviderOptions || providerOptions ? deepMerge(this.defaultProviderOptions ?? {}, providerOptions ?? {}) : void 0;
     const mergedTools = this.defaultTools || tools ? { ...this.defaultTools, ...tools } : void 0;
     this.logger.onLLMCallStart?.({
       type: "llm_call_start",
@@ -2314,6 +2330,7 @@ var SimpleSession = class {
     });
     try {
       const result = await generateText({
+        ...this.defaultGenerationOptions,
         ...restParams,
         tools: mergedTools,
         providerOptions: mergedProviderOptions,
@@ -2364,7 +2381,7 @@ var SimpleSession = class {
     const { model: requestedModel, providerOptions, tools, ...restParams } = params;
     const languageModel = this.getModel(requestedModel);
     const modelId = this.extractModelId(languageModel);
-    const mergedProviderOptions = this.defaultProviderOptions || providerOptions ? merge({}, this.defaultProviderOptions ?? {}, providerOptions ?? {}) : void 0;
+    const mergedProviderOptions = this.defaultProviderOptions || providerOptions ? deepMerge(this.defaultProviderOptions ?? {}, providerOptions ?? {}) : void 0;
     const mergedTools = this.defaultTools || tools ? { ...this.defaultTools, ...tools } : void 0;
     this.logger.onLLMCallStart?.({
       type: "llm_call_start",
@@ -2374,6 +2391,7 @@ var SimpleSession = class {
       request: { params: restParams }
     });
     const result = streamText({
+      ...this.defaultGenerationOptions,
       ...restParams,
       tools: mergedTools,
       providerOptions: mergedProviderOptions,
@@ -2541,7 +2559,8 @@ var StreamingSession = class extends SimpleSession {
       startTime: options.startTime,
       signal: options.signal,
       defaultProviderOptions: options.defaultProviderOptions,
-      defaultTools: options.defaultTools
+      defaultTools: options.defaultTools,
+      defaultGenerationOptions: options.defaultGenerationOptions
     });
     this.lastEventTime = this._startTime;
     this._logger.onExecutionStart?.({
@@ -2673,59 +2692,21 @@ function createStreamingSession(options) {
 
 // src/provider/google/factory.ts
 var GoogleProvider = class _GoogleProvider extends BaseProvider {
-  constructor(apiKey, defaultModelId, logger, safetySettings, pricingConfig, defaultOptions, searchEnabled = false, urlContextEnabled = false, fileCache) {
+  constructor(config) {
     super();
-    this.apiKey = apiKey;
-    this.defaultModelId = defaultModelId;
-    this.logger = logger;
-    this.safetySettings = safetySettings;
-    this.pricingConfig = pricingConfig;
-    this.defaultOptions = defaultOptions;
-    this.searchEnabled = searchEnabled;
-    this.urlContextEnabled = urlContextEnabled;
-    this.fileCache = fileCache;
-    this.google = createGoogleGenerativeAI({ apiKey });
+    this.config = config;
+    this.google = createGoogleGenerativeAI({ apiKey: config.apiKey });
   }
   google;
   withDefaultModel(modelId) {
-    return new _GoogleProvider(
-      this.apiKey,
-      modelId,
-      this.logger,
-      this.safetySettings,
-      this.pricingConfig,
-      this.defaultOptions,
-      this.searchEnabled,
-      this.urlContextEnabled,
-      this.fileCache
-    );
+    return new _GoogleProvider({ ...this.config, defaultModelId: modelId });
   }
   withLogger(newLogger) {
-    return new _GoogleProvider(
-      this.apiKey,
-      this.defaultModelId,
-      newLogger,
-      this.safetySettings,
-      this.pricingConfig,
-      this.defaultOptions,
-      this.searchEnabled,
-      this.urlContextEnabled,
-      this.fileCache
-    );
+    return new _GoogleProvider({ ...this.config, logger: newLogger });
   }
   withPricing(pricing) {
     validateProviderPricing(pricing, "google");
-    return new _GoogleProvider(
-      this.apiKey,
-      this.defaultModelId,
-      this.logger,
-      this.safetySettings,
-      pricing,
-      this.defaultOptions,
-      this.searchEnabled,
-      this.urlContextEnabled,
-      this.fileCache
-    );
+    return new _GoogleProvider({ ...this.config, pricingConfig: pricing });
   }
   /**
    * Set default provider-specific options for all LLM calls.
@@ -2741,17 +2722,10 @@ var GoogleProvider = class _GoogleProvider extends BaseProvider {
    * ```
    */
   withDefaultOptions(options) {
-    return new _GoogleProvider(
-      this.apiKey,
-      this.defaultModelId,
-      this.logger,
-      this.safetySettings,
-      this.pricingConfig,
-      options,
-      this.searchEnabled,
-      this.urlContextEnabled,
-      this.fileCache
-    );
+    return new _GoogleProvider({ ...this.config, defaultOptions: options });
+  }
+  withDefaultGenerationOptions(options) {
+    return new _GoogleProvider({ ...this.config, defaultGenOptions: options });
   }
   /**
    * Enable Google Search grounding for all LLM calls.
@@ -2765,17 +2739,7 @@ var GoogleProvider = class _GoogleProvider extends BaseProvider {
    * ```
    */
   withSearchEnabled() {
-    return new _GoogleProvider(
-      this.apiKey,
-      this.defaultModelId,
-      this.logger,
-      this.safetySettings,
-      this.pricingConfig,
-      this.defaultOptions,
-      true,
-      this.urlContextEnabled,
-      this.fileCache
-    );
+    return new _GoogleProvider({ ...this.config, searchEnabled: true });
   }
   /**
    * Enable URL Context grounding for all LLM calls.
@@ -2789,17 +2753,7 @@ var GoogleProvider = class _GoogleProvider extends BaseProvider {
    * ```
    */
   withUrlContextEnabled() {
-    return new _GoogleProvider(
-      this.apiKey,
-      this.defaultModelId,
-      this.logger,
-      this.safetySettings,
-      this.pricingConfig,
-      this.defaultOptions,
-      this.searchEnabled,
-      true,
-      this.fileCache
-    );
+    return new _GoogleProvider({ ...this.config, urlContextEnabled: true });
   }
   /**
    * Set a file cache for reusing uploaded files across sessions.
@@ -2818,33 +2772,25 @@ var GoogleProvider = class _GoogleProvider extends BaseProvider {
    * ```
    */
   withFileCache(cache) {
-    return new _GoogleProvider(
-      this.apiKey,
-      this.defaultModelId,
-      this.logger,
-      this.safetySettings,
-      this.pricingConfig,
-      this.defaultOptions,
-      this.searchEnabled,
-      this.urlContextEnabled,
-      cache ?? new InMemoryFileCache()
-    );
+    return new _GoogleProvider({ ...this.config, fileCache: cache ?? new InMemoryFileCache() });
   }
   getSessionConfig() {
+    const { searchEnabled, urlContextEnabled } = this.config;
     const defaultTools = {
-      ...this.searchEnabled && { google_search: this.google.tools.googleSearch({}) },
-      ...this.urlContextEnabled && { url_context: this.google.tools.urlContext({}) }
+      ...searchEnabled && { google_search: this.google.tools.googleSearch({}) },
+      ...urlContextEnabled && { url_context: this.google.tools.urlContext({}) }
     };
-    const hasDefaultTools = this.searchEnabled || this.urlContextEnabled;
+    const hasDefaultTools = searchEnabled || urlContextEnabled;
     return {
-      defaultLanguageModel: this.defaultModelId ? this.createModel(this.defaultModelId) : null,
+      defaultLanguageModel: this.config.defaultModelId ? this.createModel(this.config.defaultModelId) : null,
       modelFactory: (modelId) => this.createModel(modelId),
       providerType: "google",
-      providerPricing: this.pricingConfig,
-      fileManager: new GoogleFileManager(this.apiKey, { cache: this.fileCache }),
-      logger: this.logger,
-      defaultProviderOptions: this.defaultOptions ? { google: this.defaultOptions } : void 0,
-      defaultTools: hasDefaultTools ? defaultTools : void 0
+      providerPricing: this.config.pricingConfig,
+      fileManager: new GoogleFileManager(this.config.apiKey, { cache: this.config.fileCache }),
+      logger: this.config.logger,
+      defaultProviderOptions: this.config.defaultOptions ? { google: this.config.defaultOptions } : void 0,
+      defaultTools: hasDefaultTools ? defaultTools : void 0,
+      defaultGenerationOptions: this.config.defaultGenOptions
     };
   }
   createStreamingSession(signal) {
@@ -2858,75 +2804,42 @@ var GoogleProvider = class _GoogleProvider extends BaseProvider {
    * include the second parameter, but it's supported at runtime.
    */
   createModel(modelId) {
-    if (this.safetySettings) {
-      return this.google(modelId, { safetySettings: this.safetySettings });
+    if (this.config.safetySettings) {
+      return this.google(modelId, { safetySettings: this.config.safetySettings });
     }
     return this.google(modelId);
   }
 };
 function createGoogleProvider(config) {
-  return new GoogleProvider(
-    config.apiKey,
-    null,
-    // No default model - must be set with withDefaultModel()
-    noopLogger,
-    config.safetySettings
-  );
+  return new GoogleProvider({
+    apiKey: config.apiKey,
+    defaultModelId: null,
+    logger: noopLogger,
+    safetySettings: config.safetySettings,
+    searchEnabled: false,
+    urlContextEnabled: false
+  });
 }
 var OpenAIProvider = class _OpenAIProvider extends BaseProvider {
-  constructor(apiKey, defaultModelId, logger, baseURL, organization, pricingConfig, defaultOptions, fileCache) {
+  constructor(config) {
     super();
-    this.apiKey = apiKey;
-    this.defaultModelId = defaultModelId;
-    this.logger = logger;
-    this.baseURL = baseURL;
-    this.organization = organization;
-    this.pricingConfig = pricingConfig;
-    this.defaultOptions = defaultOptions;
-    this.fileCache = fileCache;
+    this.config = config;
     this.openai = createOpenAI({
-      apiKey,
-      baseURL,
-      organization
+      apiKey: config.apiKey,
+      baseURL: config.baseURL,
+      organization: config.organization
     });
   }
   openai;
   withDefaultModel(modelId) {
-    return new _OpenAIProvider(
-      this.apiKey,
-      modelId,
-      this.logger,
-      this.baseURL,
-      this.organization,
-      this.pricingConfig,
-      this.defaultOptions,
-      this.fileCache
-    );
+    return new _OpenAIProvider({ ...this.config, defaultModelId: modelId });
   }
   withLogger(newLogger) {
-    return new _OpenAIProvider(
-      this.apiKey,
-      this.defaultModelId,
-      newLogger,
-      this.baseURL,
-      this.organization,
-      this.pricingConfig,
-      this.defaultOptions,
-      this.fileCache
-    );
+    return new _OpenAIProvider({ ...this.config, logger: newLogger });
   }
   withPricing(pricing) {
     validateProviderPricing(pricing, "openai");
-    return new _OpenAIProvider(
-      this.apiKey,
-      this.defaultModelId,
-      this.logger,
-      this.baseURL,
-      this.organization,
-      pricing,
-      this.defaultOptions,
-      this.fileCache
-    );
+    return new _OpenAIProvider({ ...this.config, pricingConfig: pricing });
   }
   /**
    * Set default provider-specific options for all LLM calls.
@@ -2943,16 +2856,10 @@ var OpenAIProvider = class _OpenAIProvider extends BaseProvider {
    * ```
    */
   withDefaultOptions(options) {
-    return new _OpenAIProvider(
-      this.apiKey,
-      this.defaultModelId,
-      this.logger,
-      this.baseURL,
-      this.organization,
-      this.pricingConfig,
-      options,
-      this.fileCache
-    );
+    return new _OpenAIProvider({ ...this.config, defaultOptions: options });
+  }
+  withDefaultGenerationOptions(options) {
+    return new _OpenAIProvider({ ...this.config, defaultGenOptions: options });
   }
   /**
    * Set a file cache for API consistency with GoogleProvider.
@@ -2965,26 +2872,18 @@ var OpenAIProvider = class _OpenAIProvider extends BaseProvider {
    * ```
    */
   withFileCache(cache) {
-    return new _OpenAIProvider(
-      this.apiKey,
-      this.defaultModelId,
-      this.logger,
-      this.baseURL,
-      this.organization,
-      this.pricingConfig,
-      this.defaultOptions,
-      cache
-    );
+    return new _OpenAIProvider({ ...this.config, fileCache: cache });
   }
   getSessionConfig() {
     return {
-      defaultLanguageModel: this.defaultModelId ? this.openai(this.defaultModelId) : null,
+      defaultLanguageModel: this.config.defaultModelId ? this.openai(this.config.defaultModelId) : null,
       modelFactory: (modelId) => this.openai(modelId),
       providerType: "openai",
-      providerPricing: this.pricingConfig,
+      providerPricing: this.config.pricingConfig,
       fileManager: new NoOpFileManager(),
-      logger: this.logger,
-      defaultProviderOptions: this.defaultOptions ? { openai: this.defaultOptions } : void 0
+      logger: this.config.logger,
+      defaultProviderOptions: this.config.defaultOptions ? { openai: this.config.defaultOptions } : void 0,
+      defaultGenerationOptions: this.config.defaultGenOptions
     };
   }
   createStreamingSession(signal) {
@@ -2995,14 +2894,13 @@ var OpenAIProvider = class _OpenAIProvider extends BaseProvider {
   }
 };
 function createOpenAIProvider(config) {
-  return new OpenAIProvider(
-    config.apiKey,
-    null,
-    // No default model - must be set with withDefaultModel()
-    noopLogger,
-    config.baseURL,
-    config.organization
-  );
+  return new OpenAIProvider({
+    apiKey: config.apiKey,
+    defaultModelId: null,
+    logger: noopLogger,
+    baseURL: config.baseURL,
+    organization: config.organization
+  });
 }
 
 // src/validation/validation-history.ts