@convex-dev/agent 0.0.12 → 0.0.14-alpha.0

package/src/component/_generated/api.d.ts

@@ -38,14 +38,23 @@ export type Mounts = {
       "public",
       {
         agentName?: string;
-        embeddings?: {
-          dimension: 128 | 256 | 512 | 768 | 1024 | 1536 | 2048 | 3072 | 4096;
-          model: string;
-          vectors: Array<Array<number> | null>;
-        };
         failPendingSteps?: boolean;
         messages: Array<{
+          embedding?: {
+            dimension: 128 | 256 | 512 | 768 | 1024 | 1536 | 2048 | 3072 | 4096;
+            model: string;
+            vector: Array<number>;
+          };
+          error?: string;
           fileId?: string;
+          finishReason?:
+            | "stop"
+            | "length"
+            | "content-filter"
+            | "tool-calls"
+            | "error"
+            | "other"
+            | "unknown";
           id?: string;
           message:
             | {
@@ -144,8 +153,29 @@ export type Mounts = {
                 providerOptions?: Record<string, any>;
                 role: "system";
               };
+          model?: string;
+          provider?: string;
+          providerMetadata?: Record<string, any>;
+          reasoning?: string;
+          sources?: Array<{
+            id: string;
+            providerMetadata?: Record<string, any>;
+            sourceType: "url";
+            title?: string;
+            url: string;
+          }>;
+          text?: string;
+          usage?: {
+            completionTokens: number;
+            promptTokens: number;
+            totalTokens: number;
+          };
+          warnings?: Array<
+            | { details?: string; setting: string; type: "unsupported-setting" }
+            | { details?: string; tool: any; type: "unsupported-tool" }
+            | { message: string; type: "other" }
+          >;
         }>;
-        model?: string;
         parentMessageId?: string;
         pending?: boolean;
         stepId?: string;
@@ -169,6 +199,14 @@ export type Mounts = {
             | string;
           error?: string;
           fileId?: string;
+          finishReason?:
+            | "stop"
+            | "length"
+            | "content-filter"
+            | "tool-calls"
+            | "error"
+            | "other"
+            | "unknown";
           id?: string;
           message?:
             | {
@@ -270,13 +308,33 @@ export type Mounts = {
           model?: string;
           order: number;
           parentMessageId?: string;
+          provider?: string;
+          providerMetadata?: Record<string, any>;
+          reasoning?: string;
+          sources?: Array<{
+            id: string;
+            providerMetadata?: Record<string, any>;
+            sourceType: "url";
+            title?: string;
+            url: string;
+          }>;
           status: "pending" | "success" | "failed";
           stepId?: string;
           stepOrder: number;
           text?: string;
           threadId: string;
           tool: boolean;
+          usage?: {
+            completionTokens: number;
+            promptTokens: number;
+            totalTokens: number;
+          };
           userId?: string;
+          warnings?: Array<
+            | { details?: string; setting: string; type: "unsupported-setting" }
+            | { details?: string; tool: any; type: "unsupported-tool" }
+            | { message: string; type: "other" }
+          >;
         }>;
         pending?: {
           _creationTime: number;
@@ -294,6 +352,14 @@ export type Mounts = {
             | string;
           error?: string;
           fileId?: string;
+          finishReason?:
+            | "stop"
+            | "length"
+            | "content-filter"
+            | "tool-calls"
+            | "error"
+            | "other"
+            | "unknown";
           id?: string;
           message?:
             | {
@@ -395,13 +461,33 @@ export type Mounts = {
           model?: string;
           order: number;
           parentMessageId?: string;
+          provider?: string;
+          providerMetadata?: Record<string, any>;
+          reasoning?: string;
+          sources?: Array<{
+            id: string;
+            providerMetadata?: Record<string, any>;
+            sourceType: "url";
+            title?: string;
+            url: string;
+          }>;
           status: "pending" | "success" | "failed";
           stepId?: string;
           stepOrder: number;
           text?: string;
           threadId: string;
           tool: boolean;
+          usage?: {
+            completionTokens: number;
+            promptTokens: number;
+            totalTokens: number;
+          };
           userId?: string;
+          warnings?: Array<
+            | { details?: string; setting: string; type: "unsupported-setting" }
+            | { details?: string; tool: any; type: "unsupported-tool" }
+            | { message: string; type: "other" }
+          >;
         };
       }
     >;
@@ -409,16 +495,34 @@ export type Mounts = {
       "mutation",
       "public",
       {
-        embeddings?: {
-          dimension: 128 | 256 | 512 | 768 | 1024 | 1536 | 2048 | 3072 | 4096;
-          model: string;
-          vectors: Array<Array<number> | null>;
-        };
         failPendingSteps?: boolean;
         messageId: string;
         step: {
           messages: Array<{
+            embedding?: {
+              dimension:
+                | 128
+                | 256
+                | 512
+                | 768
+                | 1024
+                | 1536
+                | 2048
+                | 3072
+                | 4096;
+              model: string;
+              vector: Array<number>;
+            };
+            error?: string;
             fileId?: string;
+            finishReason?:
+              | "stop"
+              | "length"
+              | "content-filter"
+              | "tool-calls"
+              | "error"
+              | "other"
+              | "unknown";
             id?: string;
             message:
               | {
@@ -517,6 +621,32 @@ export type Mounts = {
                   providerOptions?: Record<string, any>;
                   role: "system";
                 };
+            model?: string;
+            provider?: string;
+            providerMetadata?: Record<string, any>;
+            reasoning?: string;
+            sources?: Array<{
+              id: string;
+              providerMetadata?: Record<string, any>;
+              sourceType: "url";
+              title?: string;
+              url: string;
+            }>;
+            text?: string;
+            usage?: {
+              completionTokens: number;
+              promptTokens: number;
+              totalTokens: number;
+            };
+            warnings?: Array<
+              | {
+                  details?: string;
+                  setting: string;
+                  type: "unsupported-setting";
+                }
+              | { details?: string; tool: any; type: "unsupported-tool" }
+              | { message: string; type: "other" }
+            >;
           }>;
           step: {
             experimental_providerMetadata?: Record<string, any>;
@@ -1050,6 +1180,14 @@ export type Mounts = {
             | string;
           error?: string;
           fileId?: string;
+          finishReason?:
+            | "stop"
+            | "length"
+            | "content-filter"
+            | "tool-calls"
+            | "error"
+            | "other"
+            | "unknown";
           id?: string;
           message?:
             | {
@@ -1151,13 +1289,33 @@ export type Mounts = {
           model?: string;
           order: number;
           parentMessageId?: string;
+          provider?: string;
+          providerMetadata?: Record<string, any>;
+          reasoning?: string;
+          sources?: Array<{
+            id: string;
+            providerMetadata?: Record<string, any>;
+            sourceType: "url";
+            title?: string;
+            url: string;
+          }>;
           status: "pending" | "success" | "failed";
           stepId?: string;
           stepOrder: number;
           text?: string;
           threadId: string;
           tool: boolean;
+          usage?: {
+            completionTokens: number;
+            promptTokens: number;
+            totalTokens: number;
+          };
           userId?: string;
+          warnings?: Array<
+            | { details?: string; setting: string; type: "unsupported-setting" }
+            | { details?: string; tool: any; type: "unsupported-tool" }
+            | { message: string; type: "other" }
+          >;
         }>;
         pageStatus?: "SplitRecommended" | "SplitRequired" | null;
         splitCursor?: string | null;
@@ -1232,6 +1390,14 @@ export type Mounts = {
           | string;
         error?: string;
         fileId?: string;
+        finishReason?:
+          | "stop"
+          | "length"
+          | "content-filter"
+          | "tool-calls"
+          | "error"
+          | "other"
+          | "unknown";
         id?: string;
         message?:
           | {
@@ -1333,13 +1499,33 @@ export type Mounts = {
         model?: string;
         order: number;
         parentMessageId?: string;
+        provider?: string;
+        providerMetadata?: Record<string, any>;
+        reasoning?: string;
+        sources?: Array<{
+          id: string;
+          providerMetadata?: Record<string, any>;
+          sourceType: "url";
+          title?: string;
+          url: string;
+        }>;
         status: "pending" | "success" | "failed";
         stepId?: string;
         stepOrder: number;
         text?: string;
         threadId: string;
         tool: boolean;
+        usage?: {
+          completionTokens: number;
+          promptTokens: number;
+          totalTokens: number;
+        };
         userId?: string;
+        warnings?: Array<
+          | { details?: string; setting: string; type: "unsupported-setting" }
+          | { details?: string; tool: any; type: "unsupported-tool" }
+          | { message: string; type: "other" }
+        >;
       }>
     >;
     textSearch: FunctionReference<
@@ -1362,6 +1548,14 @@ export type Mounts = {
           | string;
         error?: string;
         fileId?: string;
+        finishReason?:
+          | "stop"
+          | "length"
+          | "content-filter"
+          | "tool-calls"
+          | "error"
+          | "other"
+          | "unknown";
         id?: string;
         message?:
           | {
@@ -1463,13 +1657,33 @@ export type Mounts = {
         model?: string;
         order: number;
         parentMessageId?: string;
+        provider?: string;
+        providerMetadata?: Record<string, any>;
+        reasoning?: string;
+        sources?: Array<{
+          id: string;
+          providerMetadata?: Record<string, any>;
+          sourceType: "url";
+          title?: string;
+          url: string;
+        }>;
         status: "pending" | "success" | "failed";
         stepId?: string;
         stepOrder: number;
         text?: string;
         threadId: string;
         tool: boolean;
+        usage?: {
+          completionTokens: number;
+          promptTokens: number;
+          totalTokens: number;
+        };
         userId?: string;
+        warnings?: Array<
+          | { details?: string; setting: string; type: "unsupported-setting" }
+          | { details?: string; tool: any; type: "unsupported-tool" }
+          | { message: string; type: "other" }
+        >;
       }>
     >;
     updateThread: FunctionReference<

package/src/component/messages.ts

@@ -11,9 +11,8 @@ import {
 } from "../shared.js";
 import {
   paginationResultValidator,
-  vEmbeddingsWithMetadata,
   vMessageStatus,
-  vMessageWithFileAndId,
+  vMessageWithMetadata,
   vSearchOptions,
   vStepWithMessages,
 } from "../validators.js";
@@ -340,12 +339,10 @@ const addMessagesArgs = {
   threadId: v.id("threads"),
   stepId: v.optional(v.id("steps")),
   parentMessageId: v.optional(v.id("messages")),
-  messages: v.array(vMessageWithFileAndId),
-  model: v.optional(v.string()),
   agentName: v.optional(v.string()),
+  messages: v.array(vMessageWithMetadata),
   pending: v.optional(v.boolean()),
   failPendingSteps: v.optional(v.boolean()),
-  embeddings: v.optional(vEmbeddingsWithMetadata),
 };
 export const addMessages = mutation({
   args: addMessagesArgs,
@@ -359,10 +356,6 @@ async function addMessagesHandler(
   ctx: MutationCtx,
   args: ObjectType<typeof addMessagesArgs>
 ) {
-  assert(
-    !args.embeddings || args.embeddings.vectors.length === args.messages.length,
-    "embeddings must have one vector per message"
-  );
   let userId = args.userId;
   const threadId = args.threadId;
   if (!userId && args.threadId) {
@@ -370,14 +363,8 @@ async function addMessagesHandler(
     assert(thread, `Thread ${args.threadId} not found`);
     userId = thread.userId;
   }
-  const {
-    failPendingSteps,
-    pending,
-    messages,
-    parentMessageId,
-    embeddings,
-    ...rest
-  } = args;
+  const { failPendingSteps, pending, messages, parentMessageId, ...rest } =
+    args;
   const parent = parentMessageId && (await ctx.db.get(parentMessageId));
   // TODO: I think this is a bug - parent will be pending always?
   if (failPendingSteps && parent?.status !== "pending") {
@@ -390,7 +377,7 @@ async function addMessagesHandler(
       .collect();
     await Promise.all(
       pendingMessages.map((m) =>
-        ctx.db.patch(m._id, { status: "failed", text: "Restarting" })
+        ctx.db.patch(m._id, { status: "failed", error: "Restarting" })
       )
     );
   }
@@ -398,13 +385,12 @@ async function addMessagesHandler(
   let order = maxMessage?.order ?? -1;
   const toReturn: Doc<"messages">[] = [];
   if (messages.length > 0) {
-    for (const [i, { message, fileId, id }] of messages.entries()) {
-      const embedding = embeddings?.vectors[i] ?? undefined;
+    for (const { message, fileId, embedding, ...fields } of messages) {
       let embeddingId: VectorTableId | undefined;
-      if (embeddings && embedding) {
-        embeddingId = await insertVector(ctx, embeddings.dimension, {
-          vector: embedding,
-          model: embeddings.model,
+      if (embedding) {
+        embeddingId = await insertVector(ctx, embedding.dimension, {
+          vector: embedding.vector,
+          model: embedding.model,
           table: "messages",
           userId,
           threadId,
@@ -417,11 +403,11 @@ async function addMessagesHandler(
       const text = extractText(message);
       const messageId = await ctx.db.insert("messages", {
         ...rest,
+        ...fields,
         embeddingId,
         parentMessageId,
         userId,
         message,
-        id,
         order,
         tool,
         text,
@@ -489,7 +475,6 @@ const addStepArgs = {
   messageId: v.id("messages"),
   step: vStepWithMessages,
   failPendingSteps: v.optional(v.boolean()),
-  embeddings: v.optional(vEmbeddingsWithMetadata),
 };
 
 export const addStep = mutation({
@@ -534,11 +519,8 @@ async function addStepHandler(
     parentMessageId: args.messageId,
     stepId,
     messages,
-    model: parentMessage.model,
-    agentName: parentMessage.agentName,
     pending: step.finishReason === "stop" ? false : true,
     failPendingSteps: false,
-    embeddings: args.embeddings,
   });
   // We don't commit if the parent is still pending.
   if (step.finishReason === "stop") {

package/src/component/schema.ts

@@ -5,6 +5,10 @@ import {
   vMessage,
   vMessageStatus,
   vStep,
+  vUsage,
+  vSource,
+  vLanguageModelV1CallWarning,
+  vFinishReason,
 } from "../validators.js";
 import { typedV } from "convex-helpers/validators";
 import vectorTables, { vVectorId } from "./vector/tables.js";
@@ -35,6 +39,7 @@ export const schema = defineSchema({
     message: v.optional(vMessage),
     error: v.optional(v.string()),
     model: v.optional(v.string()),
+    provider: v.optional(v.string()),
     text: v.optional(v.string()),
     embeddingId: v.optional(vVectorId),
     // TODO: add sub-messages back in? or be able to skip them?
@@ -43,6 +48,12 @@ export const schema = defineSchema({
     // Unset if it's not in a thread.
     order: v.number(),
     stepOrder: v.number(),
+    usage: v.optional(vUsage),
+    finishReason: v.optional(vFinishReason),
+    providerMetadata: v.optional(v.record(v.string(), v.any())),
+    sources: v.optional(v.array(vSource)),
+    reasoning: v.optional(v.string()),
+    warnings: v.optional(v.array(vLanguageModelV1CallWarning)),
     fileId: v.optional(v.id("files")),
     status: vMessageStatus,
   })

package/src/mapping.ts

@@ -13,9 +13,9 @@ import {
 } from "ai";
 import { assert } from "convex-helpers";
 import {
-  MessageWithFileAndId,
+  MessageWithMetadata,
   Step,
-  StepWithMessagesWithFileAndId,
+  StepWithMessagesWithMetadata,
 } from "./validators";
 
 export type AIMessageWithoutId = Omit<AIMessage, "id">;
@@ -80,49 +80,79 @@ export function serializeStep<TOOLS extends ToolSet>(
 }
 
 export function serializeNewMessagesInStep<TOOLS extends ToolSet>(
-  step: StepResult<TOOLS>
-): MessageWithFileAndId[] {
+  step: StepResult<TOOLS>,
+  metadata: { model: string; provider: string }
+): MessageWithMetadata[] {
   // If there are tool results, there's another message with the tool results
   // ref: https://github.com/vercel/ai/blob/main/packages/ai/core/generate-text/to-response-messages.ts
-  const messages: MessageWithFileAndId[] = (
+  const assistantFields = {
+    model: metadata.model,
+    provider: metadata.provider,
+    providerMetadata: step.providerMetadata,
+    reasoning: step.reasoning,
+    usage: step.usage,
+    warnings: step.warnings,
+    finishReason: step.finishReason,
+  };
+  const toolFields = {
+    sources: step.sources,
+  };
+  const messages: MessageWithMetadata[] = (
     step.toolResults.length > 0
       ? step.response.messages.slice(-2)
       : step.response.messages.slice(-1)
-  ).map(serializeMessageWithId);
+  ).map((message) => ({
+    message: serializeMessage(message),
+    id: message.id,
+    ...(message.role === "tool" ? toolFields : assistantFields),
+    // fileId: message.fileId,
+  }));
   return messages;
 }
 
 export function serializeObjectResult(
-  result: GenerateObjectResult<unknown>
-): StepWithMessagesWithFileAndId {
-  const text = JSON.stringify(result.object);
-  const serializedMessage = serializeMessageWithId({
-    role: "assistant" as const,
-    content: text,
-    id: result.response.id,
-  });
-
-  const messages = [serializedMessage];
+  step: GenerateObjectResult<unknown>,
+  metadata: { model: string; provider: string }
+): StepWithMessagesWithMetadata {
+  const text = JSON.stringify(step.object);
 
   return {
-    messages,
+    messages: [
+      {
+        message: { role: "assistant" as const, content: text },
+        id: step.response.id,
+        model: metadata.model,
+        provider: metadata.provider,
+        providerMetadata: step.providerMetadata,
+        finishReason: step.finishReason,
+        text,
+        usage: step.usage,
+        warnings: step.warnings,
+      },
+    ],
     step: {
       text,
       isContinued: false,
       stepType: "initial",
       toolCalls: [],
       toolResults: [],
-      usage: result.usage,
-      warnings: result.warnings,
-      finishReason: result.finishReason,
-      request: result.request,
+      usage: step.usage,
+      warnings: step.warnings,
+      finishReason: step.finishReason,
+      request: step.request,
       response: {
-        ...result.response,
-        timestamp: result.response.timestamp.getTime(),
-        messages,
+        ...step.response,
+        timestamp: step.response.timestamp.getTime(),
+        messages: [
+          serializeMessageWithId({
+            role: "assistant" as const,
+            content: text,
+            id: step.response.id,
+          }),
+        ],
       },
-      providerMetadata: result.providerMetadata,
-      experimental_providerMetadata: result.experimental_providerMetadata,
+      providerMetadata: step.providerMetadata,
+      experimental_providerMetadata: step.experimental_providerMetadata,
     },
   };
 }