@voltagent/core 2.3.7 → 2.3.8

package/dist/index.d.mts

@@ -9233,6 +9233,7 @@ declare class Agent {
      * Enrich instructions with additional context and modifiers
      */
     private enrichInstructions;
+    private extractToolkits;
     /**
      * Prepare agents memory for supervisor
      */

package/dist/index.d.ts

@@ -9233,6 +9233,7 @@ declare class Agent {
      * Enrich instructions with additional context and modifiers
      */
     private enrichInstructions;
+    private extractToolkits;
     /**
      * Prepare agents memory for supervisor
      */

package/dist/index.js

@@ -9115,8 +9115,8 @@ var WorkflowRegistry = class _WorkflowRegistry extends SimpleEventEmitter {
     this.logger.trace(`Added suspension controller for resumed execution ${executionId}`);
     const resumeOptions = {
       executionId,
-      userId: workflowState.metadata?.userId,
-      conversationId: workflowState.metadata?.conversationId,
+      userId: workflowState.userId ?? workflowState.metadata?.userId,
+      conversationId: workflowState.conversationId ?? workflowState.metadata?.conversationId,
       suspendController,
       resumeFrom: {
         executionId,
@@ -9139,7 +9139,10 @@ var WorkflowRegistry = class _WorkflowRegistry extends SimpleEventEmitter {
     }
     this.logger.debug(`Resuming workflow from step ${resumeOptions.resumeFrom.resumeStepIndex}`);
     try {
-      const inputToUse = workflowState.input;
+      const workflowStartEventInput = workflowState.events?.find(
+        (event) => event.type === "workflow-start"
+      )?.input;
+      const inputToUse = workflowState.input ?? workflowStartEventInput;
       if (resumeData !== void 0) {
         resumeOptions.resumeFrom = {
           ...resumeOptions.resumeFrom,
@@ -9755,6 +9758,8 @@ function createWorkflow({
           input: input2,
           context: options?.context ? Array.from(options.context.entries()) : void 0,
           workflowState: workflowStateStore,
+          userId: options?.userId,
+          conversationId: options?.conversationId,
           metadata: {
             traceId: rootSpan.spanContext().traceId,
             spanId: rootSpan.spanContext().spanId
@@ -30016,8 +30021,12 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
    * Common preparation for all execution methods
    */
   async prepareExecution(input, oc, options) {
+    const dynamicToolList = await this.resolveValue(this.dynamicTools, oc) || [];
+    const optionToolsArray = options?.tools || [];
+    const adHocTools = [...dynamicToolList, ...optionToolsArray];
+    const runtimeToolkits = this.extractToolkits(adHocTools);
     const buffer = this.getConversationBuffer(oc);
-    const uiMessages = await this.prepareMessages(input, oc, options, buffer);
+    const uiMessages = await this.prepareMessages(input, oc, options, buffer, runtimeToolkits);
     const hooks = this.getMergedHooks(options);
     let messages = await (0, import_ai7.convertToModelMessages)(uiMessages);
     if (hooks.onPrepareModelMessages) {
@@ -30034,9 +30043,6 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
     messages = stripDanglingOpenAIReasoningFromModelMessages(messages);
     const maxSteps = options?.maxSteps ?? this.calculateMaxSteps();
     const modelName = this.getModelName();
-    const dynamicToolList = await this.resolveValue(this.dynamicTools, oc) || [];
-    const optionToolsArray = options?.tools || [];
-    const adHocTools = [...dynamicToolList, ...optionToolsArray];
     const tools = await this.prepareTools(adHocTools, oc, maxSteps, options);
     return {
       messages,
@@ -30607,10 +30613,10 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
    * Prepare messages with system prompt and memory
    */
   // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: legacy message preparation pipeline
-  async prepareMessages(input, oc, options, buffer) {
+  async prepareMessages(input, oc, options, buffer, runtimeToolkits = []) {
     const resolvedInput = await this.validateIncomingUIMessages(input, oc);
     const messages = [];
-    const systemMessage = await this.getSystemMessage(resolvedInput, oc, options);
+    const systemMessage = await this.getSystemMessage(resolvedInput, oc, options, runtimeToolkits);
     if (systemMessage) {
       const systemMessagesAsUI = (() => {
         if (typeof systemMessage === "string") {
@@ -30805,7 +30811,7 @@ Metadata: ${(0, import_utils33.safeStringify)(metadata)}`;
    * Get system message with dynamic instructions and retriever context
    */
   // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: legacy system message assembly
-  async getSystemMessage(input, oc, options) {
+  async getSystemMessage(input, oc, options, runtimeToolkits = []) {
     const promptHelper = VoltOpsClient.createPromptHelperWithFallback(
       this.id,
       this.name,
@@ -30930,7 +30936,8 @@ ${additionalContext}`
           baseContent2,
           retrieverContext,
           workingMemoryContext,
-          oc
+          oc,
+          runtimeToolkits
         );
         return {
           role: "system",
@@ -30943,7 +30950,8 @@ ${additionalContext}`
       baseContent,
       retrieverContext,
       workingMemoryContext,
-      oc
+      oc,
+      runtimeToolkits
     );
     return {
       role: "system",
@@ -30953,8 +30961,30 @@ ${additionalContext}`
   /**
    * Add toolkit instructions
    */
-  addToolkitInstructions(baseInstructions) {
-    const toolkits = this.toolManager.getToolkits();
+  addToolkitInstructions(baseInstructions, runtimeToolkits = []) {
+    const toolkits = this.toolManager.getToolkits().map((toolkit) => ({
+      name: toolkit.name,
+      instructions: toolkit.instructions,
+      addInstructions: toolkit.addInstructions
+    }));
+    const toolkitIndexByName = /* @__PURE__ */ new Map();
+    for (const [index, toolkit] of toolkits.entries()) {
+      toolkitIndexByName.set(toolkit.name, index);
+    }
+    for (const runtimeToolkit of runtimeToolkits) {
+      const runtimeToolkitSource = {
+        name: runtimeToolkit.name,
+        instructions: runtimeToolkit.instructions,
+        addInstructions: runtimeToolkit.addInstructions
+      };
+      const existingIndex = toolkitIndexByName.get(runtimeToolkit.name);
+      if (existingIndex === void 0) {
+        toolkitIndexByName.set(runtimeToolkit.name, toolkits.length);
+        toolkits.push(runtimeToolkitSource);
+        continue;
+      }
+      toolkits[existingIndex] = runtimeToolkitSource;
+    }
     let toolInstructions = "";
     for (const toolkit of toolkits) {
       if (toolkit.addInstructions && toolkit.instructions) {
@@ -30968,9 +30998,9 @@ ${toolkit.instructions}`;
   /**
    * Enrich instructions with additional context and modifiers
    */
-  async enrichInstructions(baseContent, retrieverContext, workingMemoryContext, oc) {
+  async enrichInstructions(baseContent, retrieverContext, workingMemoryContext, oc, runtimeToolkits = []) {
     let content = baseContent;
-    content = this.addToolkitInstructions(content);
+    content = this.addToolkitInstructions(content, runtimeToolkits);
     if (this.markdown) {
       content = `${content}
 
@@ -30995,6 +31025,11 @@ ${retrieverContext}`;
     }
     return content;
   }
+  extractToolkits(items) {
+    return items.filter(
+      (item) => typeof item === "object" && item !== null && "tools" in item && Array.isArray(item.tools)
+    );
+  }
   /**
    * Prepare agents memory for supervisor
    */