@voltagent/core 2.6.5 → 2.6.6

package/dist/index.d.mts

@@ -8390,6 +8390,35 @@ interface AgentEvalConfig {
     sampling?: AgentEvalSamplingPolicy;
     redact?: (payload: AgentEvalPayload) => AgentEvalPayload;
 }
+/**
+ * Common generate options - internal version that includes historyEntryId
+ * Not exposed directly to users
+ */
+interface CommonSemanticMemoryOptions {
+    enabled?: boolean;
+    semanticLimit?: number;
+    semanticThreshold?: number;
+    mergeStrategy?: "prepend" | "append" | "interleave";
+}
+interface CommonRuntimeMemoryBehaviorOptions {
+    contextLimit?: number;
+    semanticMemory?: CommonSemanticMemoryOptions;
+    conversationPersistence?: AgentConversationPersistenceOptions;
+}
+interface CommonRuntimeMemoryEnvelope {
+    conversationId?: string;
+    userId?: string;
+    options?: CommonRuntimeMemoryBehaviorOptions;
+}
+type SemanticMemoryOptions = CommonSemanticMemoryOptions;
+type RuntimeMemoryEnvelope = CommonRuntimeMemoryEnvelope;
+interface CommonResolvedRuntimeMemoryOptions {
+    userId?: string;
+    conversationId?: string;
+    contextLimit?: number;
+    semanticMemory?: CommonSemanticMemoryOptions;
+    conversationPersistence?: AgentConversationPersistenceOptions;
+}
 /**
  * Agent status information
  */
@@ -8459,6 +8488,8 @@ type OperationContext = {
     userId?: string;
     /** Optional conversation identifier associated with this operation */
     conversationId?: string;
+    /** Resolved runtime memory options (memory envelope preferred, legacy as fallback) */
+    resolvedMemory?: CommonResolvedRuntimeMemoryOptions;
     /** Workspace configured on the executing agent (if any). */
     workspace?: Workspace;
     /** User-managed context map for this operation */
@@ -9177,7 +9208,17 @@ interface GenerateObjectResultWithContext<T> extends GenerateObjectResult<T> {
  * Extends AI SDK's CallSettings for full compatibility
  */
 interface BaseGenerationOptions<TProviderOptions extends ProviderOptions$1 = ProviderOptions$1> extends Partial<CallSettings> {
+    /**
+     * Runtime memory envelope for per-call memory identity and behavior overrides.
+     */
+    memory?: RuntimeMemoryEnvelope;
+    /**
+     * @deprecated Use `memory.userId` instead.
+     */
     userId?: string;
+    /**
+     * @deprecated Use `memory.conversationId` instead.
+     */
     conversationId?: string;
     context?: ContextInput;
     elicitation?: (request: unknown) => Promise<unknown>;
@@ -9185,13 +9226,17 @@ interface BaseGenerationOptions<TProviderOptions extends ProviderOptions$1 = Pro
     parentOperationContext?: OperationContext;
     parentSpan?: Span;
     inheritParentSpan?: boolean;
+    /**
+     * @deprecated Use `memory.options.contextLimit` instead.
+     */
     contextLimit?: number;
-    semanticMemory?: {
-        enabled?: boolean;
-        semanticLimit?: number;
-        semanticThreshold?: number;
-        mergeStrategy?: "prepend" | "append" | "interleave";
-    };
+    /**
+     * @deprecated Use `memory.options.semanticMemory` instead.
+     */
+    semanticMemory?: SemanticMemoryOptions;
+    /**
+     * @deprecated Use `memory.options.conversationPersistence` instead.
+     */
     conversationPersistence?: AgentConversationPersistenceOptions;
     maxSteps?: number;
     feedback?: boolean | AgentFeedbackOptions;
@@ -9321,6 +9366,7 @@ declare class Agent {
      */
     private normalizeConversationPersistenceOptions;
     private resolveConversationPersistenceOptions;
+    private resolveMemoryRuntimeOptions;
     private getConversationPersistenceOptionsForContext;
     /**
      * Create only the OperationContext (sync)

package/dist/index.d.ts

@@ -8390,6 +8390,35 @@ interface AgentEvalConfig {
     sampling?: AgentEvalSamplingPolicy;
     redact?: (payload: AgentEvalPayload) => AgentEvalPayload;
 }
+/**
+ * Common generate options - internal version that includes historyEntryId
+ * Not exposed directly to users
+ */
+interface CommonSemanticMemoryOptions {
+    enabled?: boolean;
+    semanticLimit?: number;
+    semanticThreshold?: number;
+    mergeStrategy?: "prepend" | "append" | "interleave";
+}
+interface CommonRuntimeMemoryBehaviorOptions {
+    contextLimit?: number;
+    semanticMemory?: CommonSemanticMemoryOptions;
+    conversationPersistence?: AgentConversationPersistenceOptions;
+}
+interface CommonRuntimeMemoryEnvelope {
+    conversationId?: string;
+    userId?: string;
+    options?: CommonRuntimeMemoryBehaviorOptions;
+}
+type SemanticMemoryOptions = CommonSemanticMemoryOptions;
+type RuntimeMemoryEnvelope = CommonRuntimeMemoryEnvelope;
+interface CommonResolvedRuntimeMemoryOptions {
+    userId?: string;
+    conversationId?: string;
+    contextLimit?: number;
+    semanticMemory?: CommonSemanticMemoryOptions;
+    conversationPersistence?: AgentConversationPersistenceOptions;
+}
 /**
  * Agent status information
  */
@@ -8459,6 +8488,8 @@ type OperationContext = {
     userId?: string;
     /** Optional conversation identifier associated with this operation */
     conversationId?: string;
+    /** Resolved runtime memory options (memory envelope preferred, legacy as fallback) */
+    resolvedMemory?: CommonResolvedRuntimeMemoryOptions;
     /** Workspace configured on the executing agent (if any). */
     workspace?: Workspace;
     /** User-managed context map for this operation */
@@ -9177,7 +9208,17 @@ interface GenerateObjectResultWithContext<T> extends GenerateObjectResult<T> {
  * Extends AI SDK's CallSettings for full compatibility
  */
 interface BaseGenerationOptions<TProviderOptions extends ProviderOptions$1 = ProviderOptions$1> extends Partial<CallSettings> {
+    /**
+     * Runtime memory envelope for per-call memory identity and behavior overrides.
+     */
+    memory?: RuntimeMemoryEnvelope;
+    /**
+     * @deprecated Use `memory.userId` instead.
+     */
     userId?: string;
+    /**
+     * @deprecated Use `memory.conversationId` instead.
+     */
     conversationId?: string;
     context?: ContextInput;
     elicitation?: (request: unknown) => Promise<unknown>;
@@ -9185,13 +9226,17 @@ interface BaseGenerationOptions<TProviderOptions extends ProviderOptions$1 = Pro
     parentOperationContext?: OperationContext;
     parentSpan?: Span;
     inheritParentSpan?: boolean;
+    /**
+     * @deprecated Use `memory.options.contextLimit` instead.
+     */
     contextLimit?: number;
-    semanticMemory?: {
-        enabled?: boolean;
-        semanticLimit?: number;
-        semanticThreshold?: number;
-        mergeStrategy?: "prepend" | "append" | "interleave";
-    };
+    /**
+     * @deprecated Use `memory.options.semanticMemory` instead.
+     */
+    semanticMemory?: SemanticMemoryOptions;
+    /**
+     * @deprecated Use `memory.options.conversationPersistence` instead.
+     */
     conversationPersistence?: AgentConversationPersistenceOptions;
     maxSteps?: number;
     feedback?: boolean | AgentFeedbackOptions;
@@ -9321,6 +9366,7 @@ declare class Agent {
      */
     private normalizeConversationPersistenceOptions;
     private resolveConversationPersistenceOptions;
+    private resolveMemoryRuntimeOptions;
     private getConversationPersistenceOptionsForContext;
     /**
      * Create only the OperationContext (sync)

package/dist/index.js

@@ -30033,6 +30033,14 @@ var DEFAULT_CONVERSATION_PERSISTENCE_OPTIONS = {
 };
 var isRecord4 = /* @__PURE__ */ __name((value) => typeof value === "object" && value !== null, "isRecord");
 var hasNonEmptyString2 = /* @__PURE__ */ __name((value) => typeof value === "string" && value.trim().length > 0, "hasNonEmptyString");
+var firstNonBlank = /* @__PURE__ */ __name((...values) => {
+  for (const value of values) {
+    if (hasNonEmptyString2(value)) {
+      return value;
+    }
+  }
+  return void 0;
+}, "firstNonBlank");
 var isAssistantContentPart = /* @__PURE__ */ __name((value) => {
   if (!isRecord4(value)) {
     return false;
@@ -30470,7 +30478,8 @@ var Agent = class {
               this
             );
             const { messages, uiMessages, modelName, tools, maxSteps } = await this.prepareExecution(effectiveInput, oc, options);
-            const contextLimit = options?.contextLimit;
+            const resolvedMemory = this.resolveMemoryRuntimeOptions(options, oc);
+            const contextLimit = resolvedMemory.contextLimit;
             addModelAttributesToSpan(
               rootSpan,
               modelName,
@@ -30516,6 +30525,7 @@ var Agent = class {
             const {
               userId,
               conversationId,
+              memory: _memory,
               context: context8,
               // Explicitly exclude to prevent collision with AI SDK's future 'context' field
               parentAgentId,
@@ -30524,6 +30534,8 @@ var Agent = class {
               feedback: _feedback,
               maxSteps: userMaxSteps,
               tools: userTools,
+              contextLimit: _contextLimit,
+              semanticMemory: _semanticMemory,
               conversationPersistence: _conversationPersistence,
               output,
               providerOptions,
@@ -30954,7 +30966,8 @@ var Agent = class {
           oc,
           options
         );
-        const contextLimit = options?.contextLimit;
+        const resolvedMemory = this.resolveMemoryRuntimeOptions(options, oc);
+        const contextLimit = resolvedMemory.contextLimit;
         if (oc.traceContext) {
           const rootSpan2 = oc.traceContext.getRootSpan();
           addModelAttributesToSpan(
@@ -30994,6 +31007,7 @@ var Agent = class {
         const {
           userId,
           conversationId,
+          memory: _memory,
           context: context8,
           // Explicitly exclude to prevent collision with AI SDK's future 'context' field
           parentAgentId,
@@ -31003,6 +31017,8 @@ var Agent = class {
           maxSteps: userMaxSteps,
           tools: userTools,
           onFinish: userOnFinish,
+          contextLimit: _contextLimit,
+          semanticMemory: _semanticMemory,
           conversationPersistence: _conversationPersistence,
           output,
           providerOptions,
@@ -31656,6 +31672,7 @@ var Agent = class {
             const {
               userId,
               conversationId,
+              memory: _memory,
               context: context8,
               // Explicitly exclude to prevent collision with AI SDK's future 'context' field
               parentAgentId,
@@ -31664,6 +31681,8 @@ var Agent = class {
               feedback: _feedback,
               maxSteps: userMaxSteps,
               tools: userTools,
+              contextLimit: _contextLimit,
+              semanticMemory: _semanticMemory,
               conversationPersistence: _conversationPersistence,
               output: _output,
               providerOptions,
@@ -31945,6 +31964,7 @@ var Agent = class {
         const {
           userId,
           conversationId,
+          memory: _memory,
           context: context8,
           // Explicitly exclude to prevent collision with AI SDK's future 'context' field
           parentAgentId,
@@ -31954,6 +31974,8 @@ var Agent = class {
           maxSteps: userMaxSteps,
           tools: userTools,
           onFinish: userOnFinish,
+          contextLimit: _contextLimit,
+          semanticMemory: _semanticMemory,
           conversationPersistence: _conversationPersistence,
           output: _output,
           providerOptions,
@@ -32331,15 +32353,44 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
     };
   }
   resolveConversationPersistenceOptions(options) {
-    if (!options?.conversationPersistence) {
+    const resolvedMemory = this.resolveMemoryRuntimeOptions(options);
+    if (!resolvedMemory.conversationPersistence) {
       return { ...this.conversationPersistence };
     }
+    const conversationPersistence = resolvedMemory.conversationPersistence;
     return this.normalizeConversationPersistenceOptions({
-      mode: options.conversationPersistence.mode ?? this.conversationPersistence.mode,
-      debounceMs: options.conversationPersistence.debounceMs ?? this.conversationPersistence.debounceMs,
-      flushOnToolResult: options.conversationPersistence.flushOnToolResult ?? this.conversationPersistence.flushOnToolResult
+      mode: conversationPersistence.mode ?? this.conversationPersistence.mode,
+      debounceMs: conversationPersistence.debounceMs ?? this.conversationPersistence.debounceMs,
+      flushOnToolResult: conversationPersistence.flushOnToolResult ?? this.conversationPersistence.flushOnToolResult
     });
   }
+  resolveMemoryRuntimeOptions(options, operationContext) {
+    const memory = options?.memory;
+    const memoryOptions = memory?.options;
+    const contextResolvedMemory = operationContext?.resolvedMemory;
+    const parentResolvedMemory = options?.parentOperationContext?.resolvedMemory;
+    const parentUserId = parentResolvedMemory?.userId ?? options?.parentOperationContext?.userId;
+    const parentConversationId = parentResolvedMemory?.conversationId ?? options?.parentOperationContext?.conversationId;
+    return {
+      userId: firstNonBlank(
+        contextResolvedMemory?.userId,
+        operationContext?.userId,
+        memory?.userId,
+        options?.userId,
+        parentUserId
+      ),
+      conversationId: firstNonBlank(
+        contextResolvedMemory?.conversationId,
+        operationContext?.conversationId,
+        memory?.conversationId,
+        options?.conversationId,
+        parentConversationId
+      ),
+      contextLimit: contextResolvedMemory?.contextLimit ?? memoryOptions?.contextLimit ?? options?.contextLimit ?? parentResolvedMemory?.contextLimit,
+      semanticMemory: contextResolvedMemory?.semanticMemory ?? memoryOptions?.semanticMemory ?? options?.semanticMemory ?? parentResolvedMemory?.semanticMemory,
+      conversationPersistence: contextResolvedMemory?.conversationPersistence ?? memoryOptions?.conversationPersistence ?? options?.conversationPersistence ?? parentResolvedMemory?.conversationPersistence
+    };
+  }
   getConversationPersistenceOptionsForContext(oc) {
     const fromContext = oc.systemContext.get(CONVERSATION_PERSISTENCE_OPTIONS_KEY);
     if (fromContext) {
@@ -32356,6 +32407,7 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
   createOperationContext(input, options) {
     const operationId = randomUUID();
     const startTimeDate = /* @__PURE__ */ new Date();
+    const resolvedMemory = this.resolveMemoryRuntimeOptions(options);
     const runtimeContext = toContextMap(options?.context);
     const parentContext = options?.parentOperationContext?.context;
     let context8;
@@ -32393,16 +32445,16 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
     }
     const logger = this.getContextualLogger(options?.parentAgentId).child({
       operationId,
-      userId: options?.userId,
-      conversationId: options?.conversationId,
+      userId: resolvedMemory.userId,
+      conversationId: resolvedMemory.conversationId,
       executionId: operationId
     });
     const observability = this.getObservability();
     const traceContext = new AgentTraceContext(observability, this.name, {
       agentId: this.id,
       agentName: this.name,
-      userId: options?.userId,
-      conversationId: options?.conversationId,
+      userId: resolvedMemory.userId,
+      conversationId: resolvedMemory.conversationId,
       operationId,
       parentSpan: options?.parentSpan,
       inheritParentSpan: options?.inheritParentSpan ?? this.inheritParentSpan,
@@ -32444,8 +32496,9 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
       logger,
       conversationSteps: options?.parentOperationContext?.conversationSteps || [],
       abortController,
-      userId: options?.userId,
-      conversationId: options?.conversationId,
+      userId: resolvedMemory.userId,
+      conversationId: resolvedMemory.conversationId,
+      resolvedMemory: { ...resolvedMemory },
       workspace: this.workspace,
       parentAgentId: options?.parentAgentId,
       traceContext,
@@ -32951,62 +33004,22 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
   async prepareMessages(input, oc, options, buffer, runtimeToolkits = []) {
     const resolvedInput = await this.validateIncomingUIMessages(input, oc);
     const messages = [];
-    const systemMessage = await this.getSystemMessage(resolvedInput, oc, options, runtimeToolkits);
-    if (systemMessage) {
-      const systemMessagesAsUI = (() => {
-        if (typeof systemMessage === "string") {
-          return [
-            {
-              id: randomUUID(),
-              role: "system",
-              parts: [
-                {
-                  type: "text",
-                  text: systemMessage
-                }
-              ]
-            }
-          ];
-        }
-        if (Array.isArray(systemMessage)) {
-          return convertModelMessagesToUIMessages(systemMessage);
-        }
-        return convertModelMessagesToUIMessages([systemMessage]);
-      })();
-      for (const systemUIMessage of systemMessagesAsUI) {
-        messages.push(systemUIMessage);
-      }
-      const instructionText = systemMessagesAsUI.flatMap(
-        (msg) => msg.parts.flatMap(
-          (part) => part.type === "text" && typeof part.text === "string" ? [part.text] : []
-        )
-      ).join("\n\n");
-      if (instructionText) {
-        oc.traceContext.setInstructions(instructionText);
-      }
-    }
-    const middlewareRetryFeedback = this.consumeMiddlewareRetryFeedback(oc);
-    if (middlewareRetryFeedback) {
-      messages.push({
-        id: randomUUID(),
-        role: "system",
-        parts: [{ type: "text", text: middlewareRetryFeedback }]
-      });
-    }
-    const canIUseMemory = options?.userId && options.conversationId;
+    const resolvedMemory = this.resolveMemoryRuntimeOptions(options, oc);
+    const canIUseMemory = Boolean(resolvedMemory.userId);
+    const memoryContextMessages = [];
     if (canIUseMemory) {
-      const useSemanticSearch = options?.semanticMemory?.enabled ?? this.hasSemanticSearchSupport();
+      const useSemanticSearch = resolvedMemory.semanticMemory?.enabled ?? this.hasSemanticSearchSupport();
       const currentQuery = useSemanticSearch ? this.extractUserQuery(resolvedInput) : void 0;
-      const semanticLimit = options?.semanticMemory?.semanticLimit ?? 5;
-      const semanticThreshold = options?.semanticMemory?.semanticThreshold ?? 0.7;
-      const mergeStrategy = options?.semanticMemory?.mergeStrategy ?? "append";
+      const semanticLimit = resolvedMemory.semanticMemory?.semanticLimit ?? 5;
+      const semanticThreshold = resolvedMemory.semanticMemory?.semanticThreshold ?? 0.7;
+      const mergeStrategy = resolvedMemory.semanticMemory?.mergeStrategy ?? "append";
       const isSemanticSearch = useSemanticSearch && currentQuery;
       const traceContext = oc.traceContext;
       if (traceContext) {
         const spanInput = {
           query: isSemanticSearch ? currentQuery : resolvedInput,
-          userId: options?.userId,
-          conversationId: options?.conversationId
+          userId: resolvedMemory.userId,
+          conversationId: resolvedMemory.conversationId
         };
         const memoryReadSpan = traceContext.createChildSpan("memory.read", "memory", {
           label: isSemanticSearch ? "Semantic Memory Read" : "Memory Context Read",
@@ -33028,7 +33041,7 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
                 oc,
                 oc.userId,
                 oc.conversationId,
-                options?.contextLimit,
+                resolvedMemory.contextLimit,
                 {
                   useSemanticSearch: true,
                   currentQuery,
@@ -33048,9 +33061,12 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
               inputForMemory,
               oc.userId,
               oc.conversationId,
-              options?.contextLimit
+              resolvedMemory.contextLimit
             );
             oc.conversationId = result.conversationId;
+            if (oc.resolvedMemory) {
+              oc.resolvedMemory.conversationId = result.conversationId;
+            }
             buffer.ingestUIMessages(result.messages, true);
             return result.messages;
           });
@@ -33063,8 +33079,11 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
           });
           if (isSemanticSearch && !oc.conversationId) {
             oc.conversationId = randomUUID();
+            if (oc.resolvedMemory) {
+              oc.resolvedMemory.conversationId = oc.conversationId;
+            }
           }
-          messages.push(...memoryResult);
+          memoryContextMessages.push(...memoryResult);
           if (isSemanticSearch && oc.userId && oc.conversationId) {
             try {
               const inputForMemory = typeof resolvedInput === "string" ? resolvedInput : Array.isArray(resolvedInput) && resolvedInput[0]?.parts ? resolvedInput : convertModelMessagesToUIMessages(resolvedInput);
@@ -33080,6 +33099,51 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
         }
       }
     }
+    const systemMessage = await this.getSystemMessage(resolvedInput, oc, options, runtimeToolkits);
+    if (systemMessage) {
+      const systemMessagesAsUI = (() => {
+        if (typeof systemMessage === "string") {
+          return [
+            {
+              id: randomUUID(),
+              role: "system",
+              parts: [
+                {
+                  type: "text",
+                  text: systemMessage
+                }
+              ]
+            }
+          ];
+        }
+        if (Array.isArray(systemMessage)) {
+          return convertModelMessagesToUIMessages(systemMessage);
+        }
+        return convertModelMessagesToUIMessages([systemMessage]);
+      })();
+      for (const systemUIMessage of systemMessagesAsUI) {
+        messages.push(systemUIMessage);
+      }
+      const instructionText = systemMessagesAsUI.flatMap(
+        (msg) => msg.parts.flatMap(
+          (part) => part.type === "text" && typeof part.text === "string" ? [part.text] : []
+        )
+      ).join("\n\n");
+      if (instructionText) {
+        oc.traceContext.setInstructions(instructionText);
+      }
+    }
+    const middlewareRetryFeedback = this.consumeMiddlewareRetryFeedback(oc);
+    if (middlewareRetryFeedback) {
+      messages.push({
+        id: randomUUID(),
+        role: "system",
+        parts: [{ type: "text", text: middlewareRetryFeedback }]
+      });
+    }
+    if (memoryContextMessages.length > 0) {
+      messages.push(...memoryContextMessages);
+    }
     if (typeof resolvedInput === "string") {
       messages.push({
         id: randomUUID(),
@@ -33147,6 +33211,9 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
    */
   // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: legacy system message assembly
   async getSystemMessage(input, oc, options, runtimeToolkits = []) {
+    const resolvedMemory = this.resolveMemoryRuntimeOptions(options, oc);
+    const workingMemoryConversationId = oc.conversationId ?? resolvedMemory.conversationId;
+    const workingMemoryUserId = oc.userId ?? resolvedMemory.userId;
     const promptHelper = VoltOpsClient.createPromptHelperWithFallback(
       this.id,
       this.name,
@@ -33204,13 +33271,14 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
       retrieverContext = await this.getRetrieverContext(input, oc);
     }
     let workingMemoryContext = null;
-    if (this.hasWorkingMemorySupport() && options?.conversationId) {
+    const workingMemoryLookup = workingMemoryConversationId || workingMemoryUserId ? {
+      ...workingMemoryConversationId ? { conversationId: workingMemoryConversationId } : {},
+      ...workingMemoryUserId ? { userId: workingMemoryUserId } : {}
+    } : void 0;
+    if (this.hasWorkingMemorySupport() && workingMemoryLookup) {
       const memory = this.memoryManager.getMemory();
       if (memory) {
-        const workingMemoryInstructions = await memory.getWorkingMemoryInstructions({
-          conversationId: options.conversationId,
-          userId: options.userId
-        });
+        const workingMemoryInstructions = await memory.getWorkingMemoryInstructions(workingMemoryLookup);
         if (workingMemoryInstructions) {
           workingMemoryContext = `
 
@@ -33218,10 +33286,7 @@ ${workingMemoryInstructions}`;
         }
         if (oc.traceContext) {
           const rootSpan = oc.traceContext.getRootSpan();
-          const workingMemoryContent = await memory.getWorkingMemory({
-            conversationId: options.conversationId,
-            userId: options.userId
-          });
+          const workingMemoryContent = await memory.getWorkingMemory(workingMemoryLookup);
           if (workingMemoryContent) {
             rootSpan.setAttribute("agent.workingMemory.content", workingMemoryContent);
             rootSpan.setAttribute("agent.workingMemory.enabled", true);
@@ -33868,6 +33933,7 @@ ${retrieverContext}`;
    * Prepare tools with execution context
    */
   async prepareTools(adHocTools, oc, maxSteps, options) {
+    const resolvedMemory = this.resolveMemoryRuntimeOptions(options, oc);
     const hooks = this.getMergedHooks(options);
     const createToolExecuteFunction = this.createToolExecutionFactory(oc, hooks);
     const runtimeTools = [...adHocTools];
@@ -33877,12 +33943,12 @@ ${retrieverContext}`;
         currentHistoryEntryId: oc.operationId,
         operationContext: oc,
         maxSteps,
-        conversationId: options?.conversationId,
-        userId: options?.userId
+        conversationId: resolvedMemory.conversationId,
+        userId: resolvedMemory.userId
       });
       runtimeTools.push(delegateTool);
     }
-    const workingMemoryTools = this.createWorkingMemoryTools(options);
+    const workingMemoryTools = this.createWorkingMemoryTools(options, oc);
     if (workingMemoryTools.length > 0) {
       runtimeTools.push(...workingMemoryTools);
     }
@@ -35660,11 +35726,21 @@ ${retrieverContext}`;
       execute: /* @__PURE__ */ __name(async (args, options2) => {
         const prompt = args.prompt || args;
         const oc = options2;
+        const resolvedMemory = options2?.resolvedMemory;
+        const memoryBehaviorOverrides = resolvedMemory ? {
+          ...resolvedMemory.contextLimit !== void 0 ? { contextLimit: resolvedMemory.contextLimit } : {},
+          ...resolvedMemory.semanticMemory !== void 0 ? { semanticMemory: resolvedMemory.semanticMemory } : {},
+          ...resolvedMemory.conversationPersistence !== void 0 ? { conversationPersistence: resolvedMemory.conversationPersistence } : {}
+        } : void 0;
+        const memory = resolvedMemory || options2?.conversationId || options2?.userId ? {
+          conversationId: resolvedMemory?.conversationId ?? options2?.conversationId,
+          userId: resolvedMemory?.userId ?? options2?.userId,
+          ...memoryBehaviorOverrides && Object.keys(memoryBehaviorOverrides).length > 0 ? { options: memoryBehaviorOverrides } : {}
+        } : void 0;
         const result = await this.generateText(prompt, {
           // Pass through the operation context if available
           parentOperationContext: oc,
-          conversationId: options2?.conversationId,
-          userId: options2?.userId
+          ...memory ? { memory } : {}
         });
         return {
           text: result.text,
@@ -35699,10 +35775,11 @@ ${retrieverContext}`;
   /**
    * Create working memory tools if configured
    */
-  createWorkingMemoryTools(options) {
+  createWorkingMemoryTools(options, operationContext) {
     if (!this.hasWorkingMemorySupport()) {
       return [];
     }
+    const resolvedMemory = this.resolveMemoryRuntimeOptions(options, operationContext);
     const memoryManager = this.memoryManager;
     const memory = memoryManager.getMemory();
     if (!memory) {
@@ -35716,8 +35793,8 @@ ${retrieverContext}`;
         parameters: import_zod7.z.object({}),
         execute: /* @__PURE__ */ __name(async () => {
           const content = await memory.getWorkingMemory({
-            conversationId: options?.conversationId,
-            userId: options?.userId
+            conversationId: resolvedMemory.conversationId,
+            userId: resolvedMemory.userId
           });
           return content || "No working memory content found.";
         }, "execute")
@@ -35738,8 +35815,8 @@ ${retrieverContext}`;
         parameters: import_zod7.z.object({ ...baseParams, ...modeParam }),
         execute: /* @__PURE__ */ __name(async ({ content, mode }, oc) => {
           await memory.updateWorkingMemory({
-            conversationId: options?.conversationId,
-            userId: options?.userId,
+            conversationId: resolvedMemory.conversationId,
+            userId: resolvedMemory.userId,
             content,
             options: {
               mode
@@ -35747,8 +35824,8 @@ ${retrieverContext}`;
           });
           if (oc?.traceContext) {
             const finalContent = await memory.getWorkingMemory({
-              conversationId: options?.conversationId,
-              userId: options?.userId
+              conversationId: resolvedMemory.conversationId,
+              userId: resolvedMemory.userId
             });
             const rootSpan = oc.traceContext.getRootSpan();
             rootSpan.setAttribute("agent.workingMemory.finalContent", finalContent || "");
@@ -35765,8 +35842,8 @@ ${retrieverContext}`;
         parameters: import_zod7.z.object({}),
         execute: /* @__PURE__ */ __name(async (_, oc) => {
           await memory.clearWorkingMemory({
-            conversationId: options?.conversationId,
-            userId: options?.userId
+            conversationId: resolvedMemory.conversationId,
+            userId: resolvedMemory.userId
           });
           if (oc?.traceContext) {
             const rootSpan = oc.traceContext.getRootSpan();