@convex-dev/agent 0.2.1 → 0.2.2-alpha.1

package/src/react/toUIMessages.ts

@@ -25,6 +25,7 @@ export type UIMessage<
   status: "streaming" | MessageStatus;
   agentName?: string;
   text: string;
+  _creationTime: number;
 };
 
 export function toUIMessages<
@@ -45,13 +46,13 @@ export function toUIMessages<
     if (!coreMessage) continue;
     const common = {
       id: message._id,
-      createdAt: new Date(message._creationTime),
+      _creationTime: message._creationTime,
       order: message.order,
       stepOrder: message.stepOrder,
       status: message.streaming ? ("streaming" as const) : message.status,
       key: `${message.threadId}-${message.order}-${message.stepOrder}`,
       text,
-    };
+    } satisfies Partial<UIMessage<METADATA, DATA_PARTS, TOOLS>>;
     const partCommon = {
       state: message.streaming ? ("streaming" as const) : ("done" as const),
       ...(message.providerMetadata
@@ -67,22 +68,21 @@ export function toUIMessages<
       });
     } else if (coreMessage.role === "user") {
       const parts: UIMessage<METADATA, DATA_PARTS, TOOLS>["parts"] = [];
-      if (text) {
+      if (text && !nonStringContent.length) {
         parts.push({ type: "text", text });
       }
       nonStringContent.forEach((contentPart) => {
         switch (contentPart.type) {
+          case "text":
+            parts.push({ type: "text", text: contentPart.text, ...partCommon });
+            break;
           case "file":
           case "image":
             parts.push(toUIFilePart(contentPart));
             break;
         }
       });
-      uiMessages.push({
-        ...common,
-        role: "user",
-        parts,
-      });
+      uiMessages.push({ ...common, role: "user", parts });
     } else {
       if (coreMessage.role === "tool" && !assistantMessage) {
         console.warn(
@@ -123,26 +123,6 @@ export function toUIMessages<
           ...partCommon,
         } satisfies TextUIPart);
       }
-      for (const source of message.sources ?? []) {
-        if (source.sourceType === "url") {
-          assistantMessage.parts.push({
-            type: "source-url",
-            url: source.url!,
-            sourceId: source.id,
-            providerMetadata: message.providerMetadata,
-            title: source.title,
-          } satisfies SourceUrlUIPart);
-        } else {
-          assistantMessage.parts.push({
-            type: "source-document",
-            mediaType: source.mediaType,
-            sourceId: source.id,
-            title: source.title,
-            filename: source.filename,
-            providerMetadata: message.providerMetadata,
-          } satisfies SourceDocumentUIPart);
-        }
-      }
       for (const contentPart of nonStringContent) {
         switch (contentPart.type) {
           case "text":
@@ -239,6 +219,26 @@ export function toUIMessages<
           }
         }
       }
+      for (const source of message.sources ?? []) {
+        if (source.sourceType === "url") {
+          assistantMessage.parts.push({
+            type: "source-url",
+            url: source.url!,
+            sourceId: source.id,
+            providerMetadata: message.providerMetadata,
+            title: source.title,
+          } satisfies SourceUrlUIPart);
+        } else {
+          assistantMessage.parts.push({
+            type: "source-document",
+            mediaType: source.mediaType,
+            sourceId: source.id,
+            title: source.title,
+            filename: source.filename,
+            providerMetadata: message.providerMetadata,
+          } satisfies SourceDocumentUIPart);
+        }
+      }
     }
     if (
       !message.tool &&

package/src/validators.ts

@@ -80,10 +80,7 @@ export const vReasoningDetails = v.array(
       text: v.string(),
       signature: v.optional(v.string()),
     }),
-    v.object({
-      type: v.literal("redacted"),
-      data: v.string(),
-    }),
+    v.object({ type: v.literal("redacted"), data: v.string() }),
   ),
 );
 
@@ -111,10 +108,7 @@ export const vAssistantContent = v.union(
 
 const vToolResultContent = v.array(
   v.union(
-    v.object({
-      type: v.literal("text"),
-      text: v.string(),
-    }),
+    v.object({ type: v.literal("text"), text: v.string() }),
     v.object({
       type: v.literal("image"),
       data: v.string(),