@agtlantis/core 0.4.1 → 0.5.0

package/dist/{base-provider-C3mFLNiN.d.cts → base-provider-2TTw5HAa.d.cts}

@@ -1,4 +1,4 @@
-import { LanguageModelUsage, ToolSet, generateText, streamText, generateObject, FilePart, ImagePart, LanguageModel } from 'ai';
+import { LanguageModelUsage, CallSettings, ToolSet, generateText, streamText, generateObject, FilePart, ImagePart, LanguageModel } from 'ai';
 import * as zod from 'zod';
 
 /**
@@ -142,6 +142,11 @@ interface CostResult {
     cachedInputCost: number;
 }
 
+/**
+ * Standard AI SDK generation parameters that can be set as defaults at the Provider level.
+ * Per-call parameters override these defaults via simple spread merge.
+ */
+type GenerationOptions = Pick<CallSettings, 'maxOutputTokens' | 'temperature' | 'topP' | 'topK' | 'presencePenalty' | 'frequencyPenalty' | 'stopSequences' | 'seed'>;
 /**
  * Structural interface matching AI SDK's internal Output<OUTPUT, PARTIAL>.
  *
@@ -578,6 +583,11 @@ interface Provider {
      * The actual options type depends on the provider (Google, OpenAI, etc.).
      */
     withDefaultOptions(options: Record<string, unknown>): Provider;
+    /**
+     * Set default generation options (standard AI SDK parameters) for all LLM calls.
+     * Per-call parameters override these defaults.
+     */
+    withDefaultGenerationOptions(options: GenerationOptions): Provider;
     streamingExecution<TEvent extends {
         type: string;
     }>(generator: (session: StreamingSession<TEvent>) => AsyncGenerator<SessionEvent<TEvent>, SessionEvent<TEvent> | Promise<SessionEvent<TEvent>>>, options?: ExecutionOptions): StreamingExecution<TEvent>;
@@ -630,6 +640,11 @@ interface SimpleSessionOptions {
      * These will be merged with per-call tools (per-call takes precedence).
      */
     defaultTools?: ToolSet;
+    /**
+     * Default generation options (standard AI SDK parameters) for all LLM calls.
+     * Per-call parameters override these defaults via simple spread.
+     */
+    defaultGenerationOptions?: GenerationOptions;
 }
 declare class SimpleSession {
     private readonly defaultLanguageModel;
@@ -638,6 +653,7 @@ declare class SimpleSession {
     private readonly providerPricing;
     private readonly defaultProviderOptions;
     private readonly defaultTools;
+    private readonly defaultGenerationOptions;
     private readonly _fileManager;
     private readonly logger;
     private readonly sessionStartTime;
@@ -700,6 +716,7 @@ interface StreamingSessionOptions {
     signal?: AbortSignal;
     defaultProviderOptions?: ProviderOptions;
     defaultTools?: ToolSet;
+    defaultGenerationOptions?: GenerationOptions;
 }
 declare class StreamingSession<TEvent extends {
     type: string;
@@ -1223,6 +1240,7 @@ declare abstract class BaseProvider implements Provider {
     abstract withLogger(logger: Logger): Provider;
     abstract withPricing(pricing: ProviderPricing): Provider;
     abstract withDefaultOptions(options: Record<string, unknown>): Provider;
+    abstract withDefaultGenerationOptions(options: GenerationOptions): Provider;
     streamingExecution<TEvent extends {
         type: string;
     }>(generator: (session: StreamingSession<TEvent>) => AsyncGenerator<SessionEvent<TEvent>, SessionEvent<TEvent> | Promise<SessionEvent<TEvent>>>, options?: ExecutionOptions): StreamingExecution<TEvent>;
@@ -1233,4 +1251,4 @@ declare abstract class BaseProvider implements Provider {
     simpleExecution<TResult>(fn: (session: SimpleSession) => Promise<TResult>, options?: ExecutionOptions): SimpleExecution<TResult>;
 }
 
-export { isFileSourceBase64 as $, type LLMCallStartEvent as A, BaseProvider as B, type CalculateCostParams as C, type DistributiveOmit as D, type ErrorEvent as E, type FileSource as F, type LLMCallEndEvent as G, type ExecutionStartEvent as H, type ExecutionEmitEvent as I, type ExecutionDoneEvent as J, type ExecutionErrorEvent as K, type Logger as L, type ModelPricing as M, noopLogger as N, createLogger as O, type ProviderType as P, type Provider as Q, type ReservedEventType as R, type StreamingExecution as S, type FileSourcePath as T, type UploadedFile as U, type FileSourceData as V, type FileSourceBase64 as W, type FileSourceUrl as X, isFileSource as Y, isFileSourcePath as Z, isFileSourceData as _, type PricingConfig as a, isFileSourceUrl as a0, type SimpleSessionOptions as a1, createStreamingSession as a2, type StreamingSessionOptions as a3, type CreateStreamingSessionOptions as a4, type StreamingSessionInternal as a5, type OutputSpec as a6, type DefaultOutput as a7, type InferOutputComplete as a8, type GenerateTextResultTyped as a9, type StreamTextResultTyped as aa, type GenerateTextParams as ab, type GenerateObjectParams as ac, type ToolCallSummary as ad, type LLMCallType as ae, type LLMCallRecord as af, type AdditionalCost as ag, SessionSummary as ah, type SessionSummaryJSON as ai, type ExecutionSession as aj, type DoneMetadata as ak, type ProviderPricing as b, type CostResult as c, StreamingSession as d, type SessionStreamGeneratorFn as e, type SessionEvent as f, type StreamingResult as g, type ExtractResult as h, type SimpleExecution as i, SimpleSession as j, type SimpleResult as k, type ExecutionStatus as l, type CompletionEvent as m, type StreamTextParams as n, type FileCache as o, type FileManager as p, type FileManagerOptions as q, type Execution as r, type ExecutionOptions as s, type ExecutionResult as t, type SessionEventInput as u, type EmittableEventInput as v, type EventMetrics as w, type ExecutionMetadata as x, type LogLevel as y, type LLMCallLogType as z };
+export { isFileSourceData as $, type LLMCallStartEvent as A, BaseProvider as B, type CalculateCostParams as C, type DistributiveOmit as D, type ErrorEvent as E, type FileSource as F, type GenerationOptions as G, type LLMCallEndEvent as H, type ExecutionStartEvent as I, type ExecutionEmitEvent as J, type ExecutionDoneEvent as K, type Logger as L, type ModelPricing as M, type ExecutionErrorEvent as N, noopLogger as O, type ProviderType as P, createLogger as Q, type ReservedEventType as R, type StreamingExecution as S, type Provider as T, type UploadedFile as U, type FileSourcePath as V, type FileSourceData as W, type FileSourceBase64 as X, type FileSourceUrl as Y, isFileSource as Z, isFileSourcePath as _, type PricingConfig as a, isFileSourceBase64 as a0, isFileSourceUrl as a1, type SimpleSessionOptions as a2, createStreamingSession as a3, type StreamingSessionOptions as a4, type CreateStreamingSessionOptions as a5, type StreamingSessionInternal as a6, type OutputSpec as a7, type DefaultOutput as a8, type InferOutputComplete as a9, type GenerateTextResultTyped as aa, type StreamTextResultTyped as ab, type GenerateTextParams as ac, type GenerateObjectParams as ad, type ToolCallSummary as ae, type LLMCallType as af, type LLMCallRecord as ag, type AdditionalCost as ah, SessionSummary as ai, type SessionSummaryJSON as aj, type ExecutionSession as ak, type DoneMetadata as al, type ProviderPricing as b, type CostResult as c, StreamingSession as d, type SessionStreamGeneratorFn as e, type SessionEvent as f, type StreamingResult as g, type ExtractResult as h, type SimpleExecution as i, SimpleSession as j, type SimpleResult as k, type ExecutionStatus as l, type CompletionEvent as m, type StreamTextParams as n, type FileCache as o, type FileManager as p, type FileManagerOptions as q, type Execution as r, type ExecutionOptions as s, type ExecutionResult as t, type SessionEventInput as u, type EmittableEventInput as v, type EventMetrics as w, type ExecutionMetadata as x, type LogLevel as y, type LLMCallLogType as z };

package/dist/{base-provider-C3mFLNiN.d.ts → base-provider-2TTw5HAa.d.ts}

@@ -1,4 +1,4 @@
-import { LanguageModelUsage, ToolSet, generateText, streamText, generateObject, FilePart, ImagePart, LanguageModel } from 'ai';
+import { LanguageModelUsage, CallSettings, ToolSet, generateText, streamText, generateObject, FilePart, ImagePart, LanguageModel } from 'ai';
 import * as zod from 'zod';
 
 /**
@@ -142,6 +142,11 @@ interface CostResult {
     cachedInputCost: number;
 }
 
+/**
+ * Standard AI SDK generation parameters that can be set as defaults at the Provider level.
+ * Per-call parameters override these defaults via simple spread merge.
+ */
+type GenerationOptions = Pick<CallSettings, 'maxOutputTokens' | 'temperature' | 'topP' | 'topK' | 'presencePenalty' | 'frequencyPenalty' | 'stopSequences' | 'seed'>;
 /**
  * Structural interface matching AI SDK's internal Output<OUTPUT, PARTIAL>.
  *
@@ -578,6 +583,11 @@ interface Provider {
      * The actual options type depends on the provider (Google, OpenAI, etc.).
      */
     withDefaultOptions(options: Record<string, unknown>): Provider;
+    /**
+     * Set default generation options (standard AI SDK parameters) for all LLM calls.
+     * Per-call parameters override these defaults.
+     */
+    withDefaultGenerationOptions(options: GenerationOptions): Provider;
     streamingExecution<TEvent extends {
         type: string;
     }>(generator: (session: StreamingSession<TEvent>) => AsyncGenerator<SessionEvent<TEvent>, SessionEvent<TEvent> | Promise<SessionEvent<TEvent>>>, options?: ExecutionOptions): StreamingExecution<TEvent>;
@@ -630,6 +640,11 @@ interface SimpleSessionOptions {
      * These will be merged with per-call tools (per-call takes precedence).
      */
     defaultTools?: ToolSet;
+    /**
+     * Default generation options (standard AI SDK parameters) for all LLM calls.
+     * Per-call parameters override these defaults via simple spread.
+     */
+    defaultGenerationOptions?: GenerationOptions;
 }
 declare class SimpleSession {
     private readonly defaultLanguageModel;
@@ -638,6 +653,7 @@ declare class SimpleSession {
     private readonly providerPricing;
     private readonly defaultProviderOptions;
     private readonly defaultTools;
+    private readonly defaultGenerationOptions;
     private readonly _fileManager;
     private readonly logger;
     private readonly sessionStartTime;
@@ -700,6 +716,7 @@ interface StreamingSessionOptions {
     signal?: AbortSignal;
     defaultProviderOptions?: ProviderOptions;
     defaultTools?: ToolSet;
+    defaultGenerationOptions?: GenerationOptions;
 }
 declare class StreamingSession<TEvent extends {
     type: string;
@@ -1223,6 +1240,7 @@ declare abstract class BaseProvider implements Provider {
     abstract withLogger(logger: Logger): Provider;
     abstract withPricing(pricing: ProviderPricing): Provider;
     abstract withDefaultOptions(options: Record<string, unknown>): Provider;
+    abstract withDefaultGenerationOptions(options: GenerationOptions): Provider;
     streamingExecution<TEvent extends {
         type: string;
     }>(generator: (session: StreamingSession<TEvent>) => AsyncGenerator<SessionEvent<TEvent>, SessionEvent<TEvent> | Promise<SessionEvent<TEvent>>>, options?: ExecutionOptions): StreamingExecution<TEvent>;
@@ -1233,4 +1251,4 @@ declare abstract class BaseProvider implements Provider {
     simpleExecution<TResult>(fn: (session: SimpleSession) => Promise<TResult>, options?: ExecutionOptions): SimpleExecution<TResult>;
 }
 
-export { isFileSourceBase64 as $, type LLMCallStartEvent as A, BaseProvider as B, type CalculateCostParams as C, type DistributiveOmit as D, type ErrorEvent as E, type FileSource as F, type LLMCallEndEvent as G, type ExecutionStartEvent as H, type ExecutionEmitEvent as I, type ExecutionDoneEvent as J, type ExecutionErrorEvent as K, type Logger as L, type ModelPricing as M, noopLogger as N, createLogger as O, type ProviderType as P, type Provider as Q, type ReservedEventType as R, type StreamingExecution as S, type FileSourcePath as T, type UploadedFile as U, type FileSourceData as V, type FileSourceBase64 as W, type FileSourceUrl as X, isFileSource as Y, isFileSourcePath as Z, isFileSourceData as _, type PricingConfig as a, isFileSourceUrl as a0, type SimpleSessionOptions as a1, createStreamingSession as a2, type StreamingSessionOptions as a3, type CreateStreamingSessionOptions as a4, type StreamingSessionInternal as a5, type OutputSpec as a6, type DefaultOutput as a7, type InferOutputComplete as a8, type GenerateTextResultTyped as a9, type StreamTextResultTyped as aa, type GenerateTextParams as ab, type GenerateObjectParams as ac, type ToolCallSummary as ad, type LLMCallType as ae, type LLMCallRecord as af, type AdditionalCost as ag, SessionSummary as ah, type SessionSummaryJSON as ai, type ExecutionSession as aj, type DoneMetadata as ak, type ProviderPricing as b, type CostResult as c, StreamingSession as d, type SessionStreamGeneratorFn as e, type SessionEvent as f, type StreamingResult as g, type ExtractResult as h, type SimpleExecution as i, SimpleSession as j, type SimpleResult as k, type ExecutionStatus as l, type CompletionEvent as m, type StreamTextParams as n, type FileCache as o, type FileManager as p, type FileManagerOptions as q, type Execution as r, type ExecutionOptions as s, type ExecutionResult as t, type SessionEventInput as u, type EmittableEventInput as v, type EventMetrics as w, type ExecutionMetadata as x, type LogLevel as y, type LLMCallLogType as z };
+export { isFileSourceData as $, type LLMCallStartEvent as A, BaseProvider as B, type CalculateCostParams as C, type DistributiveOmit as D, type ErrorEvent as E, type FileSource as F, type GenerationOptions as G, type LLMCallEndEvent as H, type ExecutionStartEvent as I, type ExecutionEmitEvent as J, type ExecutionDoneEvent as K, type Logger as L, type ModelPricing as M, type ExecutionErrorEvent as N, noopLogger as O, type ProviderType as P, createLogger as Q, type ReservedEventType as R, type StreamingExecution as S, type Provider as T, type UploadedFile as U, type FileSourcePath as V, type FileSourceData as W, type FileSourceBase64 as X, type FileSourceUrl as Y, isFileSource as Z, isFileSourcePath as _, type PricingConfig as a, isFileSourceBase64 as a0, isFileSourceUrl as a1, type SimpleSessionOptions as a2, createStreamingSession as a3, type StreamingSessionOptions as a4, type CreateStreamingSessionOptions as a5, type StreamingSessionInternal as a6, type OutputSpec as a7, type DefaultOutput as a8, type InferOutputComplete as a9, type GenerateTextResultTyped as aa, type StreamTextResultTyped as ab, type GenerateTextParams as ac, type GenerateObjectParams as ad, type ToolCallSummary as ae, type LLMCallType as af, type LLMCallRecord as ag, type AdditionalCost as ah, SessionSummary as ai, type SessionSummaryJSON as aj, type ExecutionSession as ak, type DoneMetadata as al, type ProviderPricing as b, type CostResult as c, StreamingSession as d, type SessionStreamGeneratorFn as e, type SessionEvent as f, type StreamingResult as g, type ExtractResult as h, type SimpleExecution as i, SimpleSession as j, type SimpleResult as k, type ExecutionStatus as l, type CompletionEvent as m, type StreamTextParams as n, type FileCache as o, type FileManager as p, type FileManagerOptions as q, type Execution as r, type ExecutionOptions as s, type ExecutionResult as t, type SessionEventInput as u, type EmittableEventInput as v, type EventMetrics as w, type ExecutionMetadata as x, type LogLevel as y, type LLMCallLogType as z };

package/dist/index.cjs

@@ -9,7 +9,6 @@ var yaml = require('yaml');
 var crypto = require('crypto');
 var google = require('@ai-sdk/google');
 var genai = require('@google/genai');
-var merge = require('lodash/merge');
 var openai = require('@ai-sdk/openai');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -36,7 +35,6 @@ var Handlebars__default = /*#__PURE__*/_interopDefault(Handlebars);
 var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
 var path3__namespace = /*#__PURE__*/_interopNamespace(path3);
 var yaml__namespace = /*#__PURE__*/_interopNamespace(yaml);
-var merge__default = /*#__PURE__*/_interopDefault(merge);
 
 // src/errors/utils.ts
 function wrapAsError(error, ErrorClass, options) {
@@ -1405,11 +1403,9 @@ function parsePromptYaml(content, promptId) {
   try {
     parsed = yaml__namespace.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");
@@ -1495,17 +1491,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 {
@@ -2011,6 +2007,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) {
@@ -2279,6 +2292,7 @@ var SimpleSession = class {
   providerPricing;
   defaultProviderOptions;
   defaultTools;
+  defaultGenerationOptions;
   _fileManager;
   logger;
   sessionStartTime;
@@ -2293,6 +2307,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();
@@ -2329,7 +2344,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__default.default({}, 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",
@@ -2340,6 +2355,7 @@ var SimpleSession = class {
     });
     try {
       const result = await ai.generateText({
+        ...this.defaultGenerationOptions,
         ...restParams,
         tools: mergedTools,
         providerOptions: mergedProviderOptions,
@@ -2390,7 +2406,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__default.default({}, 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",
@@ -2400,6 +2416,7 @@ var SimpleSession = class {
       request: { params: restParams }
     });
     const result = ai.streamText({
+      ...this.defaultGenerationOptions,
       ...restParams,
       tools: mergedTools,
       providerOptions: mergedProviderOptions,
@@ -2567,7 +2584,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?.({
@@ -2699,59 +2717,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 = google.createGoogleGenerativeAI({ apiKey });
+    this.config = config;
+    this.google = 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.
@@ -2767,17 +2747,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.
@@ -2791,17 +2764,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.
@@ -2815,17 +2778,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.
@@ -2844,33 +2797,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) {
@@ -2884,75 +2829,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 = 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.
@@ -2969,16 +2881,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.
@@ -2991,26 +2897,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) {
@@ -3021,14 +2919,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