@convex-dev/agent 0.0.17-alpha.2 → 0.1.0

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

@@ -89,13 +89,13 @@ 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;
           files?: Array<{
             data?: ArrayBuffer | string;
@@ -224,8 +224,8 @@ export type Mounts = {
             | { message: string; type: "other" }
           >;
         }>;
-        parentMessageId?: string;
         pending?: boolean;
+        promptMessageId?: string;
         stepId?: string;
         threadId: string;
         userId?: string;
@@ -235,16 +235,7 @@ export type Mounts = {
           _creationTime: number;
           _id: string;
           agentName?: string;
-          embeddingId?:
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string;
+          embeddingId?: string;
           error?: string;
           files?: Array<{
             data?: ArrayBuffer | string;
@@ -348,7 +339,6 @@ export type Mounts = {
               };
           model?: string;
           order: number;
-          parentMessageId?: string;
           provider?: string;
           providerMetadata?: Record<string, Record<string, any>>;
           providerOptions?: Record<string, Record<string, any>>;
@@ -365,7 +355,6 @@ export type Mounts = {
             url: string;
           }>;
           status: "pending" | "success" | "failed";
-          stepId?: string;
           stepOrder: number;
           text?: string;
           threadId: string;
@@ -386,16 +375,7 @@ export type Mounts = {
           _creationTime: number;
           _id: string;
           agentName?: string;
-          embeddingId?:
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string;
+          embeddingId?: string;
           error?: string;
           files?: Array<{
             data?: ArrayBuffer | string;
@@ -499,7 +479,6 @@ export type Mounts = {
               };
           model?: string;
           order: number;
-          parentMessageId?: string;
           provider?: string;
           providerMetadata?: Record<string, Record<string, any>>;
           providerOptions?: Record<string, Record<string, any>>;
@@ -516,7 +495,6 @@ export type Mounts = {
             url: string;
           }>;
           status: "pending" | "success" | "failed";
-          stepId?: string;
           stepOrder: number;
           text?: string;
           threadId: string;
@@ -540,23 +518,14 @@ export type Mounts = {
       "public",
       {
         failPendingSteps?: boolean;
-        parentMessageId: string;
+        promptMessageId: string;
         step: {
+          embeddings?: {
+            dimension: 128 | 256 | 512 | 768 | 1024 | 1536 | 2048 | 3072 | 4096;
+            model: string;
+            vectors: Array<Array<number> | null>;
+          };
           messages: Array<{
-            embedding?: {
-              dimension:
-                | 128
-                | 256
-                | 512
-                | 768
-                | 1024
-                | 1536
-                | 2048
-                | 3072
-                | 4096;
-              model: string;
-              vector: Array<number>;
-            };
             error?: string;
             files?: Array<{
               data?: ArrayBuffer | string;
@@ -1118,16 +1087,7 @@ export type Mounts = {
           _creationTime: number;
           _id: string;
           agentName?: string;
-          embeddingId?:
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string;
+          embeddingId?: string;
           error?: string;
           files?: Array<{
             data?: ArrayBuffer | string;
@@ -1231,7 +1191,6 @@ export type Mounts = {
               };
           model?: string;
           order: number;
-          parentMessageId?: string;
           provider?: string;
           providerMetadata?: Record<string, Record<string, any>>;
           providerOptions?: Record<string, Record<string, any>>;
@@ -1248,7 +1207,6 @@ export type Mounts = {
             url: string;
           }>;
           status: "pending" | "success" | "failed";
-          stepId?: string;
           stepOrder: number;
           text?: string;
           threadId: string;
@@ -1273,7 +1231,6 @@ export type Mounts = {
       "query",
       "public",
       {
-        beforeMessageId?: string;
         excludeToolMessages?: boolean;
         isTool?: "use excludeToolMessages instead of this";
         order?: "asc" | "desc";
@@ -1287,6 +1244,7 @@ export type Mounts = {
         };
         statuses?: Array<"pending" | "success" | "failed">;
         threadId: string;
+        upToAndIncludingMessageId?: string;
       },
       {
         continueCursor: string;
@@ -1295,16 +1253,7 @@ export type Mounts = {
           _creationTime: number;
           _id: string;
           agentName?: string;
-          embeddingId?:
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string
-            | string;
+          embeddingId?: string;
           error?: string;
           files?: Array<{
             data?: ArrayBuffer | string;
@@ -1408,7 +1357,6 @@ export type Mounts = {
               };
           model?: string;
           order: number;
-          parentMessageId?: string;
           provider?: string;
           providerMetadata?: Record<string, Record<string, any>>;
           providerOptions?: Record<string, Record<string, any>>;
@@ -1425,7 +1373,6 @@ export type Mounts = {
             url: string;
           }>;
           status: "pending" | "success" | "failed";
-          stepId?: string;
           stepOrder: number;
           text?: string;
           threadId: string;
@@ -1470,16 +1417,7 @@ export type Mounts = {
         _creationTime: number;
         _id: string;
         agentName?: string;
-        embeddingId?:
-          | string
-          | string
-          | string
-          | string
-          | string
-          | string
-          | string
-          | string
-          | string;
+        embeddingId?: string;
         error?: string;
         files?: Array<{
           data?: ArrayBuffer | string;
@@ -1583,7 +1521,6 @@ export type Mounts = {
             };
         model?: string;
         order: number;
-        parentMessageId?: string;
         provider?: string;
         providerMetadata?: Record<string, Record<string, any>>;
         providerOptions?: Record<string, Record<string, any>>;
@@ -1600,7 +1537,6 @@ export type Mounts = {
           url: string;
         }>;
         status: "pending" | "success" | "failed";
-        stepId?: string;
         stepOrder: number;
         text?: string;
         threadId: string;
@@ -1632,16 +1568,7 @@ export type Mounts = {
         _creationTime: number;
         _id: string;
         agentName?: string;
-        embeddingId?:
-          | string
-          | string
-          | string
-          | string
-          | string
-          | string
-          | string
-          | string
-          | string;
+        embeddingId?: string;
         error?: string;
         files?: Array<{
           data?: ArrayBuffer | string;
@@ -1745,7 +1672,6 @@ export type Mounts = {
             };
         model?: string;
         order: number;
-        parentMessageId?: string;
         provider?: string;
         providerMetadata?: Record<string, Record<string, any>>;
         providerOptions?: Record<string, Record<string, any>>;
@@ -1762,7 +1688,6 @@ export type Mounts = {
           url: string;
         }>;
         status: "pending" | "success" | "failed";
-        stepId?: string;
         stepOrder: number;
         text?: string;
         threadId: string;

package/src/component/messages.test.ts

@@ -9,10 +9,28 @@ import { Id } from "./_generated/dataModel.js";
 import { getMaxMessage } from "./messages.js";
 
 describe("agent", () => {
-  test("add and subtract", async () => {
+  test("getMaxMessage works for threads", async () => {
     const t = convexTest(schema, modules);
+    const thread = await t.mutation(api.threads.createThread, {
+      userId: "test",
+    });
+    const { messages } = await t.mutation(api.messages.addMessages, {
+      threadId: thread._id as Id<"threads">,
+      messages: [
+        { message: { role: "user", content: "hello" } },
+        { message: { role: "assistant", content: "world" } },
+      ],
+    });
+    const maxMessage = await t.run(async (ctx) => {
+      return await getMaxMessage(ctx, thread._id as Id<"threads">);
+    });
+    expect(maxMessage).toMatchObject({
+      _id: messages.at(-1)!._id,
+      order: 0,
+      stepOrder: 1,
+    });
   });
-  test("getMaxMessage works for threads", async () => {
+  test("getMaxMessages works when there are tools involved", async () => {
     const t = convexTest(schema, modules);
     const thread = await t.mutation(api.threads.createThread, {
       userId: "test",
@@ -21,16 +39,105 @@ describe("agent", () => {
       threadId: thread._id as Id<"threads">,
       messages: [
         { message: { role: "user", content: "hello" } },
+        {
+          message: {
+            role: "assistant",
+            content: [
+              {
+                type: "tool-call",
+                args: { a: 1 },
+                toolCallId: "1",
+                toolName: "tool",
+              },
+            ],
+          },
+        },
+        {
+          message: {
+            role: "tool",
+            content: [
+              {
+                type: "tool-result",
+                toolName: "tool",
+                result: "foo",
+                toolCallId: "1",
+              },
+            ],
+          },
+        },
         { message: { role: "assistant", content: "world" } },
       ],
     });
     const maxMessage = await t.run(async (ctx) => {
-      return await getMaxMessage(ctx, thread._id as Id<"threads">, "test");
+      return await getMaxMessage(ctx, thread._id as Id<"threads">);
     });
     expect(maxMessage).toMatchObject({
       _id: messages.at(-1)!._id,
+      order: 0,
+      stepOrder: 3,
+    });
+  });
+
+  test("ordering is incremented on subsequent calls to addMessages", async () => {
+    const t = convexTest(schema, modules);
+    const thread = await t.mutation(api.threads.createThread, {
+      userId: "test",
+    });
+    const { messages } = await t.mutation(api.messages.addMessages, {
+      threadId: thread._id as Id<"threads">,
+      messages: [{ message: { role: "user", content: "hello" } }],
+    });
+    const maxMessage = await t.run(async (ctx) => {
+      return await getMaxMessage(ctx, thread._id as Id<"threads">);
+    });
+    expect(maxMessage).toMatchObject({
+      _id: messages.at(-1)!._id,
+      order: 0,
+      stepOrder: 0,
+    });
+    const { messages: messages2 } = await t.mutation(api.messages.addMessages, {
+      threadId: thread._id as Id<"threads">,
+      messages: [{ message: { role: "user", content: "hello" } }],
+    });
+    const maxMessage2 = await t.run(async (ctx) => {
+      return await getMaxMessage(ctx, thread._id as Id<"threads">);
+    });
+    expect(maxMessage2).toMatchObject({
+      _id: messages2.at(-1)!._id,
       order: 1,
       stepOrder: 0,
     });
   });
+
+  test("sub order is incremented on subsequent calls to addMessages for the same promptMessageId", async () => {
+    const t = convexTest(schema, modules);
+    const thread = await t.mutation(api.threads.createThread, {
+      userId: "test",
+    });
+    const { messages } = await t.mutation(api.messages.addMessages, {
+      threadId: thread._id as Id<"threads">,
+      messages: [{ message: { role: "user", content: "hello" } }],
+    });
+    const maxMessage = await t.run(async (ctx) => {
+      return await getMaxMessage(ctx, thread._id as Id<"threads">);
+    });
+    expect(maxMessage).toMatchObject({
+      _id: messages.at(-1)!._id,
+      order: 0,
+      stepOrder: 0,
+    });
+    const { messages: messages2 } = await t.mutation(api.messages.addMessages, {
+      threadId: thread._id as Id<"threads">,
+      messages: [{ message: { role: "user", content: "hello" } }],
+      promptMessageId: messages.at(-1)!._id,
+    });
+    const maxMessage2 = await t.run(async (ctx) => {
+      return await getMaxMessage(ctx, thread._id as Id<"threads">);
+    });
+    expect(maxMessage2).toMatchObject({
+      _id: messages2.at(-1)!._id,
+      order: 0,
+      stepOrder: 1,
+    });
+  });
 });