@voltagent/core 2.3.2 → 2.3.3

package/dist/index.d.mts

@@ -8428,6 +8428,7 @@ declare class Agent {
     private resetOperationAttemptState;
     private getConversationBuffer;
     private getMemoryPersistQueue;
+    private ensureStreamingResponseMessageId;
     private flushPendingMessagesOnError;
     /**
      * Get contextual logger with parent tracking
@@ -8469,6 +8470,7 @@ declare class Agent {
      * Prepare messages with system prompt and memory
      */
     private prepareMessages;
+    private validateIncomingUIMessages;
     /**
      * Get system message with dynamic instructions and retriever context
      */

package/dist/index.d.ts

@@ -8428,6 +8428,7 @@ declare class Agent {
     private resetOperationAttemptState;
     private getConversationBuffer;
     private getMemoryPersistQueue;
+    private ensureStreamingResponseMessageId;
     private flushPendingMessagesOnError;
     /**
      * Get contextual logger with parent tracking
@@ -8469,6 +8470,7 @@ declare class Agent {
      * Prepare messages with system prompt and memory
      */
     private prepareMessages;
+    private validateIncomingUIMessages;
     /**
      * Get system message with dynamic instructions and retriever context
      */

package/dist/index.js

@@ -19184,6 +19184,32 @@ var TOOL_ROUTING_CONTEXT_KEY = Symbol("toolRoutingConfig");
 var TOOL_ROUTING_SEARCHED_TOOLS_CONTEXT_KEY = Symbol("toolRoutingSearchedTools");
 
 // src/agent/conversation-buffer.ts
+var extractOpenAIItemId = /* @__PURE__ */ __name((metadata) => {
+  if (!metadata || typeof metadata !== "object") {
+    return "";
+  }
+  const openai = metadata.openai;
+  if (!openai || typeof openai !== "object") {
+    return "";
+  }
+  const openaiRecord = openai;
+  const itemId = typeof openaiRecord.itemId === "string" ? openaiRecord.itemId.trim() : "";
+  if (itemId) {
+    return itemId;
+  }
+  const traceId = typeof openaiRecord.reasoning_trace_id === "string" ? openaiRecord.reasoning_trace_id.trim() : "";
+  if (traceId) {
+    return traceId;
+  }
+  const reasoning = openaiRecord.reasoning;
+  if (reasoning && typeof reasoning === "object") {
+    const reasoningId = typeof reasoning.id === "string" ? reasoning.id.trim() : "";
+    if (reasoningId) {
+      return reasoningId;
+    }
+  }
+  return "";
+}, "extractOpenAIItemId");
 var ConversationBuffer = class {
   constructor(initialMessages, logger) {
     this.logger = logger;
@@ -19256,13 +19282,21 @@ var ConversationBuffer = class {
   getAllMessages() {
     return this.messages.map((message) => this.cloneMessage(message));
   }
-  addMetadataToLastAssistantMessage(metadata) {
+  addMetadataToLastAssistantMessage(metadata, options) {
     if (!metadata || Object.keys(metadata).length === 0) {
-      return;
+      return false;
     }
-    const lastAssistantIndex = this.findLastAssistantIndex();
+    let lastAssistantIndex = this.findLastAssistantIndex({
+      pendingOnly: options?.requirePending
+    });
     if (lastAssistantIndex === -1) {
-      return;
+      if (options?.requirePending) {
+        return false;
+      }
+      lastAssistantIndex = this.findLastAssistantIndex();
+    }
+    if (lastAssistantIndex === -1) {
+      return false;
     }
     const target = this.messages[lastAssistantIndex];
     const existing = typeof target.metadata === "object" && target.metadata !== null ? target.metadata : {};
@@ -19271,6 +19305,7 @@ var ConversationBuffer = class {
       ...metadata
     };
     this.pendingMessageIds.add(target.id);
+    return true;
   }
   appendExistingMessage(message, options = { markAsSaved: true }) {
     const hydrated = this.cloneMessage(message);
@@ -19411,9 +19446,12 @@ var ConversationBuffer = class {
       }
     }
   }
-  findLastAssistantIndex() {
+  findLastAssistantIndex(options) {
     for (let i = this.messages.length - 1; i >= 0; i--) {
       if (this.messages[i].role === "assistant") {
+        if (options?.pendingOnly && !this.pendingMessageIds.has(this.messages[i].id)) {
+          continue;
+        }
         return i;
       }
     }
@@ -19541,8 +19579,12 @@ var ConversationBuffer = class {
     switch (part.type) {
       case "text":
         return `text:${part.text}:${JSON.stringify(part.providerMetadata ?? null)}`;
-      case "reasoning":
-        return `reasoning:${part.text}`;
+      case "reasoning": {
+        const reasoningText = typeof part.text === "string" ? part.text : "";
+        const reasoningId = typeof part.reasoningId === "string" ? part.reasoningId.trim() : "";
+        const openaiItemId = extractOpenAIItemId(part.providerMetadata);
+        return `reasoning:${reasoningText}:${reasoningId}:${openaiItemId}`;
+      }
       case "step-start":
         return "step-start";
       default: {
@@ -19749,6 +19791,13 @@ var safeClone = /* @__PURE__ */ __name((value) => {
     return { ...value };
   }
 }, "safeClone");
+var compactObject = /* @__PURE__ */ __name((value) => {
+  const entries = Object.entries(value).filter(([, entryValue]) => entryValue !== void 0);
+  if (entries.length === Object.keys(value).length) {
+    return value;
+  }
+  return Object.fromEntries(entries);
+}, "compactObject");
 var normalizeText = /* @__PURE__ */ __name((part) => {
   const text = typeof part.text === "string" ? part.text : "";
   if (!text.trim()) {
@@ -20153,10 +20202,35 @@ var stripReasoningLinkedProviderMetadata = /* @__PURE__ */ __name((parts) => {
     }
     const cloned = { ...metadata };
     const openaiMetadata = cloned.openai;
-    if (!isObject(openaiMetadata) || !("itemId" in openaiMetadata || "reasoning_trace_id" in openaiMetadata || "reasoning" in openaiMetadata && isObject(openaiMetadata.reasoning))) {
+    if (!isObject(openaiMetadata)) {
       return metadata;
     }
-    const { openai, ...cleanedMetadata } = cloned;
+    const openaiClone = { ...openaiMetadata };
+    let changed = false;
+    if (typeof openaiClone.itemId === "string") {
+      const itemId = openaiClone.itemId.trim();
+      if (itemId && isOpenAIReasoningId(itemId)) {
+        openaiClone.itemId = void 0;
+        changed = true;
+      }
+    }
+    if (typeof openaiClone.reasoning_trace_id === "string") {
+      openaiClone.reasoning_trace_id = void 0;
+      changed = true;
+    }
+    if ("reasoning" in openaiClone) {
+      openaiClone.reasoning = void 0;
+      changed = true;
+    }
+    if (!changed) {
+      return metadata;
+    }
+    const cleanedOpenai = compactObject(openaiClone);
+    const nextMetadata = {
+      ...cloned,
+      openai: Object.keys(cleanedOpenai).length > 0 ? cleanedOpenai : void 0
+    };
+    const cleanedMetadata = compactObject(nextMetadata);
     return Object.keys(cleanedMetadata).length > 0 ? cleanedMetadata : void 0;
   }, "stripMetadata");
   let mutated = false;
@@ -21944,6 +22018,7 @@ var QUEUE_CONTEXT_KEY = Symbol("memoryPersistQueue");
 var STEP_PERSIST_COUNT_KEY = Symbol("persistedStepCount");
 var ABORT_LISTENER_ATTACHED_KEY = Symbol("abortListenerAttached");
 var MIDDLEWARE_RETRY_FEEDBACK_KEY = Symbol("middlewareRetryFeedback");
+var STREAM_RESPONSE_MESSAGE_ID_KEY = Symbol("streamResponseMessageId");
 var DEFAULT_FEEDBACK_KEY = "satisfaction";
 var DEFAULT_CONVERSATION_TITLE_PROMPT = [
   "You generate concise titles for new conversations.",
@@ -21954,6 +22029,67 @@ var DEFAULT_CONVERSATION_TITLE_MAX_OUTPUT_TOKENS = 32;
 var DEFAULT_CONVERSATION_TITLE_MAX_CHARS = 80;
 var CONVERSATION_TITLE_INPUT_MAX_CHARS = 2e3;
 var DEFAULT_TOOL_SEARCH_TOP_K = 1;
+var isRecord2 = /* @__PURE__ */ __name((value) => typeof value === "object" && value !== null, "isRecord");
+var hasNonEmptyString = /* @__PURE__ */ __name((value) => typeof value === "string" && value.trim().length > 0, "hasNonEmptyString");
+var isAssistantContentPart = /* @__PURE__ */ __name((value) => {
+  if (!isRecord2(value)) {
+    return false;
+  }
+  switch (value.type) {
+    case "text":
+    case "reasoning":
+      return typeof value.text === "string";
+    case "tool-call":
+    case "tool-result":
+      return hasNonEmptyString(value.toolCallId) && hasNonEmptyString(value.toolName);
+    case "tool-approval-request":
+      return hasNonEmptyString(value.toolCallId) && hasNonEmptyString(value.approvalId);
+    case "image":
+      return "image" in value && value.image != null;
+    case "file":
+      return hasNonEmptyString(value.mediaType) && "data" in value && value.data != null;
+    default:
+      return false;
+  }
+}, "isAssistantContentPart");
+var isToolContentPart = /* @__PURE__ */ __name((value) => {
+  if (!isRecord2(value)) {
+    return false;
+  }
+  switch (value.type) {
+    case "tool-result":
+      return hasNonEmptyString(value.toolCallId) && hasNonEmptyString(value.toolName);
+    case "tool-approval-response":
+      return hasNonEmptyString(value.approvalId) && typeof value.approved === "boolean";
+    default:
+      return false;
+  }
+}, "isToolContentPart");
+var isResponseMessage = /* @__PURE__ */ __name((value) => {
+  if (!isRecord2(value)) {
+    return false;
+  }
+  if (value.role === "assistant") {
+    if (typeof value.content === "string") {
+      return true;
+    }
+    if (Array.isArray(value.content)) {
+      return value.content.every(isAssistantContentPart);
+    }
+    return false;
+  }
+  if (value.role === "tool") {
+    return Array.isArray(value.content) && value.content.every(isToolContentPart);
+  }
+  return false;
+}, "isResponseMessage");
+var filterResponseMessages = /* @__PURE__ */ __name((messages) => {
+  if (!Array.isArray(messages)) {
+    return void 0;
+  }
+  const filtered = messages.filter(isResponseMessage);
+  return filtered.length > 0 ? filtered : void 0;
+}, "filterResponseMessages");
 var searchToolsParameters = import_zod3.z.object({
   query: import_zod3.z.string().describe("User request or query to search tools for."),
   topK: import_zod3.z.number().int().positive().optional().describe("Maximum number of tools to return.")
@@ -22449,7 +22585,20 @@ var Agent = class {
               feedbackMetadata = await feedbackPromise;
             }
             if (feedbackMetadata) {
-              buffer.addMetadataToLastAssistantMessage({ feedback: feedbackMetadata });
+              const metadataApplied = buffer.addMetadataToLastAssistantMessage(
+                { feedback: feedbackMetadata },
+                { requirePending: true }
+              );
+              if (!metadataApplied) {
+                const responseMessages = filterResponseMessages(result.response?.messages);
+                if (responseMessages?.length) {
+                  buffer.addModelMessages(responseMessages, "response");
+                  buffer.addMetadataToLastAssistantMessage(
+                    { feedback: feedbackMetadata },
+                    { requirePending: true }
+                  );
+                }
+              }
             }
             if (shouldDeferPersist) {
               await persistQueue.flush(buffer, oc);
@@ -22569,6 +22718,7 @@ var Agent = class {
     let feedbackResolved = false;
     let feedbackFinalizeRequested = false;
     let feedbackApplied = false;
+    let latestResponseMessages;
     const resolveFeedbackDeferred = /* @__PURE__ */ __name((value) => {
       if (!feedbackDeferred || feedbackResolved) {
         return;
@@ -22590,7 +22740,17 @@ var Agent = class {
           return;
         }
         feedbackApplied = true;
-        buffer.addMetadataToLastAssistantMessage({ feedback: metadata });
+        const metadataApplied = buffer.addMetadataToLastAssistantMessage(
+          { feedback: metadata },
+          { requirePending: true }
+        );
+        if (!metadataApplied && latestResponseMessages?.length) {
+          buffer.addModelMessages(latestResponseMessages, "response");
+          buffer.addMetadataToLastAssistantMessage(
+            { feedback: metadata },
+            { requirePending: true }
+          );
+        }
         if (shouldDeferPersist) {
           void persistQueue.flush(buffer, oc).catch((error) => {
             oc.logger?.debug?.("Failed to persist feedback metadata", { error });
@@ -22718,6 +22878,7 @@ var Agent = class {
         } = options || {};
         const forcedToolChoice = oc.systemContext.get(FORCED_TOOL_CHOICE_CONTEXT_KEY);
         applyForcedToolChoice(aiSDKOptions, forcedToolChoice);
+        const responseMessageId = await this.ensureStreamingResponseMessageId(oc, buffer);
         const guardrailStreamingEnabled = guardrailSet.output.length > 0;
         let guardrailPipeline = null;
         let sanitizedTextPromise;
@@ -22842,6 +23003,7 @@ var Agent = class {
                 );
               }, "onError"),
               onFinish: /* @__PURE__ */ __name(async (finalResult) => {
+                latestResponseMessages = filterResponseMessages(finalResult.response?.messages);
                 const providerUsage = finalResult.usage ? await Promise.resolve(finalResult.usage) : void 0;
                 const usageForFinish = resolveFinishUsage({
                   providerMetadata: finalResult.providerMetadata,
@@ -23001,6 +23163,15 @@ var Agent = class {
           );
         }
         const agent = this;
+        const applyResponseMessageId = /* @__PURE__ */ __name((streamOptions) => {
+          if (!responseMessageId) {
+            return streamOptions;
+          }
+          return {
+            ...streamOptions ?? {},
+            generateMessageId: /* @__PURE__ */ __name(() => responseMessageId, "generateMessageId")
+          };
+        }, "applyResponseMessageId");
         const createBaseFullStream = /* @__PURE__ */ __name(() => {
           const wrapWithAbortHandling = /* @__PURE__ */ __name(async function* (baseStream) {
             const iterator = baseStream[Symbol.asyncIterator]();
@@ -23115,10 +23286,11 @@ var Agent = class {
           return guardrailPipeline.createUIStream(streamOptions);
         }, "getGuardrailAwareUIStream");
         const createMergedUIStream = /* @__PURE__ */ __name((streamOptions) => {
+          const resolvedStreamOptions = applyResponseMessageId(streamOptions);
           const mergedStream = (0, import_ai7.createUIMessageStream)({
             execute: /* @__PURE__ */ __name(async ({ writer }) => {
               oc.systemContext.set("uiStreamWriter", writer);
-              writer.merge(getGuardrailAwareUIStream(streamOptions));
+              writer.merge(getGuardrailAwareUIStream(resolvedStreamOptions));
             }, "execute"),
             onError: /* @__PURE__ */ __name((error) => String(error), "onError")
           });
@@ -23174,7 +23346,8 @@ var Agent = class {
           });
         }, "attachFeedbackMetadata");
         const toUIMessageStreamSanitized = /* @__PURE__ */ __name((streamOptions) => {
-          const baseStream = agent.subAgentManager.hasSubAgents() ? createMergedUIStream(streamOptions) : getGuardrailAwareUIStream(streamOptions);
+          const resolvedStreamOptions = applyResponseMessageId(streamOptions);
+          const baseStream = agent.subAgentManager.hasSubAgents() ? createMergedUIStream(resolvedStreamOptions) : getGuardrailAwareUIStream(resolvedStreamOptions);
           return attachFeedbackMetadata(baseStream);
         }, "toUIMessageStreamSanitized");
         const toUIMessageStreamResponseSanitized = /* @__PURE__ */ __name((options2) => {
@@ -24085,6 +24258,7 @@ Metadata: ${(0, import_utils28.safeStringify)(metadata)}`;
     oc.systemContext.delete(STEP_PERSIST_COUNT_KEY);
     oc.systemContext.delete("conversationSteps");
     oc.systemContext.delete("bailedResult");
+    oc.systemContext.delete(STREAM_RESPONSE_MESSAGE_ID_KEY);
     oc.conversationSteps = [];
     oc.output = void 0;
   }
@@ -24104,6 +24278,21 @@ Metadata: ${(0, import_utils28.safeStringify)(metadata)}`;
     }
     return queue;
   }
+  async ensureStreamingResponseMessageId(oc, buffer) {
+    const existing = oc.systemContext.get(STREAM_RESPONSE_MESSAGE_ID_KEY);
+    if (typeof existing === "string" && existing.trim().length > 0) {
+      return existing;
+    }
+    const messageId = (0, import_ai7.generateId)();
+    const placeholder = {
+      id: messageId,
+      role: "assistant",
+      parts: []
+    };
+    buffer.ingestUIMessages([placeholder], false);
+    oc.systemContext.set(STREAM_RESPONSE_MESSAGE_ID_KEY, messageId);
+    return messageId;
+  }
   async flushPendingMessagesOnError(oc) {
     const buffer = this.getConversationBuffer(oc);
     const queue = this.getMemoryPersistQueue(oc);
@@ -24509,8 +24698,9 @@ Metadata: ${(0, import_utils28.safeStringify)(metadata)}`;
    */
   // biome-ignore lint/complexity/noExcessiveCognitiveComplexity: legacy message preparation pipeline
   async prepareMessages(input, oc, options, buffer) {
+    const resolvedInput = await this.validateIncomingUIMessages(input, oc);
     const messages = [];
-    const systemMessage = await this.getSystemMessage(input, oc, options);
+    const systemMessage = await this.getSystemMessage(resolvedInput, oc, options);
     if (systemMessage) {
       const systemMessagesAsUI = (() => {
         if (typeof systemMessage === "string") {
@@ -24555,7 +24745,7 @@ Metadata: ${(0, import_utils28.safeStringify)(metadata)}`;
     const canIUseMemory = options?.userId && options.conversationId;
     if (canIUseMemory) {
       const useSemanticSearch = options?.semanticMemory?.enabled ?? this.hasSemanticSearchSupport();
-      const currentQuery = useSemanticSearch ? this.extractUserQuery(input) : void 0;
+      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";
@@ -24563,7 +24753,7 @@ Metadata: ${(0, import_utils28.safeStringify)(metadata)}`;
       const traceContext = oc.traceContext;
       if (traceContext) {
         const spanInput = {
-          query: isSemanticSearch ? currentQuery : input,
+          query: isSemanticSearch ? currentQuery : resolvedInput,
           userId: options?.userId,
           conversationId: options?.conversationId
         };
@@ -24601,7 +24791,7 @@ Metadata: ${(0, import_utils28.safeStringify)(metadata)}`;
               buffer.ingestUIMessages(memMessages, true);
               return memMessages;
             }
-            const inputForMemory = typeof input === "string" ? input : Array.isArray(input) && input[0]?.parts ? input : convertModelMessagesToUIMessages(input);
+            const inputForMemory = typeof resolvedInput === "string" ? resolvedInput : Array.isArray(resolvedInput) && resolvedInput[0]?.parts ? resolvedInput : convertModelMessagesToUIMessages(resolvedInput);
             const result = await this.memoryManager.prepareConversationContext(
               oc,
               inputForMemory,
@@ -24626,7 +24816,7 @@ Metadata: ${(0, import_utils28.safeStringify)(metadata)}`;
           messages.push(...memoryResult);
           if (isSemanticSearch && oc.userId && oc.conversationId) {
             try {
-              const inputForMemory = typeof input === "string" ? input : Array.isArray(input) && input[0]?.parts ? input : convertModelMessagesToUIMessages(input);
+              const inputForMemory = typeof resolvedInput === "string" ? resolvedInput : Array.isArray(resolvedInput) && resolvedInput[0]?.parts ? resolvedInput : convertModelMessagesToUIMessages(resolvedInput);
               this.memoryManager.queueSaveInput(oc, inputForMemory, oc.userId, oc.conversationId);
             } catch (_e) {
             }
@@ -24639,16 +24829,16 @@ Metadata: ${(0, import_utils28.safeStringify)(metadata)}`;
         }
       }
     }
-    if (typeof input === "string") {
+    if (typeof resolvedInput === "string") {
       messages.push({
         id: randomUUID(),
         role: "user",
-        parts: [{ type: "text", text: input }]
+        parts: [{ type: "text", text: resolvedInput }]
       });
-    } else if (Array.isArray(input)) {
-      const first = input[0];
+    } else if (Array.isArray(resolvedInput)) {
+      const first = resolvedInput[0];
       if (first && Array.isArray(first.parts)) {
-        const inputMessages = input;
+        const inputMessages = resolvedInput;
         const idsToReplace = new Set(
           inputMessages.map((message) => message.id).filter((id) => typeof id === "string" && id.trim().length > 0)
         );
@@ -24661,7 +24851,7 @@ Metadata: ${(0, import_utils28.safeStringify)(metadata)}`;
         }
         messages.push(...inputMessages);
       } else {
-        messages.push(...convertModelMessagesToUIMessages(input));
+        messages.push(...convertModelMessagesToUIMessages(resolvedInput));
       }
     }
     const sanitizedMessages = sanitizeMessagesForModel(messages);
@@ -24681,9 +24871,25 @@ Metadata: ${(0, import_utils28.safeStringify)(metadata)}`;
         agent: this,
         context: oc
       });
-      return result?.messages || summarizedMessages;
+      const preparedMessages = result?.messages || summarizedMessages;
+      return await (0, import_ai7.validateUIMessages)({ messages: preparedMessages });
+    }
+    return await (0, import_ai7.validateUIMessages)({ messages: summarizedMessages });
+  }
+  async validateIncomingUIMessages(input, oc) {
+    if (!Array.isArray(input) || input.length === 0) {
+      return input;
+    }
+    const first = input[0];
+    if (!first || !Array.isArray(first.parts)) {
+      return input;
+    }
+    try {
+      return await (0, import_ai7.validateUIMessages)({ messages: input });
+    } catch (error) {
+      oc.logger?.error?.("Invalid UI messages", { error });
+      throw error;
     }
-    return summarizedMessages;
   }
   /**
    * Get system message with dynamic instructions and retriever context
@@ -26169,7 +26375,7 @@ ${retrieverContext}`;
           }
         }
       }
-      const responseMessages = event.response?.messages;
+      const responseMessages = filterResponseMessages(event.response?.messages);
       if (responseMessages && responseMessages.length > 0) {
         buffer.addModelMessages(responseMessages, "response");
       }