order required again

Author: ianmacartney

example/convex/_generated/api.d.ts

@@ -275,7 +275,7 @@ export declare const components: {
                   role: "system";
                 };
             model?: string;
-            order?: number;
+            order: number;
             status: "pending" | "success" | "failed";
             stepId?: string;
             stepOrder?: number;
@@ -399,7 +399,7 @@ export declare const components: {
                   role: "system";
                 };
             model?: string;
-            order?: number;
+            order: number;
             status: "pending" | "success" | "failed";
             stepId?: string;
             stepOrder?: number;
@@ -1171,7 +1171,7 @@ export declare const components: {
                   role: "system";
                 };
             model?: string;
-            order?: number;
+            order: number;
             status: "pending" | "success" | "failed";
             stepId?: string;
             stepOrder?: number;
@@ -1358,7 +1358,7 @@ export declare const components: {
                 role: "system";
               };
           model?: string;
-          order?: number;
+          order: number;
           status: "pending" | "success" | "failed";
           stepId?: string;
           stepOrder?: number;
@@ -1487,7 +1487,7 @@ export declare const components: {
                 role: "system";
               };
           model?: string;
-          order?: number;
+          order: number;
           status: "pending" | "success" | "failed";
           stepId?: string;
           stepOrder?: number;

src/component/_generated/api.d.ts

@@ -265,7 +265,7 @@ export type Mounts = {
                 role: "system";
               };
           model?: string;
-          order?: number;
+          order: number;
           status: "pending" | "success" | "failed";
           stepId?: string;
           stepOrder?: number;
@@ -389,7 +389,7 @@ export type Mounts = {
                 role: "system";
               };
           model?: string;
-          order?: number;
+          order: number;
           status: "pending" | "success" | "failed";
           stepId?: string;
           stepOrder?: number;
@@ -1133,7 +1133,7 @@ export type Mounts = {
                 role: "system";
               };
           model?: string;
-          order?: number;
+          order: number;
           status: "pending" | "success" | "failed";
           stepId?: string;
           stepOrder?: number;
@@ -1320,7 +1320,7 @@ export type Mounts = {
               role: "system";
             };
         model?: string;
-        order?: number;
+        order: number;
         status: "pending" | "success" | "failed";
         stepId?: string;
         stepOrder?: number;
@@ -1449,7 +1449,7 @@ export type Mounts = {
               role: "system";
             };
         model?: string;
-        order?: number;
+        order: number;
         status: "pending" | "success" | "failed";
         stepId?: string;
         stepOrder?: number;

src/component/messages.ts

@@ -433,7 +433,7 @@ async function addMessagesHandler(
   if (messages.length > 0) {
     for (const { message, fileId, id } of messages) {
       const tool = isTool(message);
-      if (!tool && order !== undefined) {
+      if (!tool) {
         order++;
       }
       const text = extractText(message);
@@ -754,24 +754,22 @@ export const _fetchVectorMessages = internalQuery({
       )
     ).filter(
       (m): m is Doc<"messages"> =>
-        m !== undefined &&
-        m !== null &&
-        (!parent || !m.order || !parent.order || m.order <= parent.order)
+        m !== undefined && m !== null && (!parent || m.order <= parent.order)
     );
     messages.push(...(args.textSearchMessages ?? []));
     // TODO: prioritize more recent messages
     messages.sort((a, b) => a.order! - b.order!);
     messages = messages.slice(0, args.limit);
     // Fetch the surrounding messages
     if (!chatId) {
-      return messages.sort((a, b) => a.order! - b.order!);
+      return messages.sort((a, b) => a.order - b.order);
     }
     const included: Record<string, Set<number>> = {};
     for (const m of messages) {
       if (!included[chatId]) {
         included[chatId] = new Set();
       }
-      included[chatId].add(m.order!);
+      included[m.chatId].add(m.order!);
     }
     const ranges: Record<Id<"chats">, Doc<"messages">[]> = {};
     const { before, after } = args.messageRange;

src/component/schema.ts

@@ -34,7 +34,7 @@ export const schema = defineSchema({
     tool: v.boolean(),
     // Repeats until a non-tool message.
     // Unset if it's not in a chat.
-    order: v.optional(v.number()),
+    order: v.number(),
     stepOrder: v.optional(v.number()),
     fileId: v.optional(v.id("files")),
     status: vMessageStatus,
@@ -48,6 +48,13 @@ export const schema = defineSchema({
       "order",
       "stepOrder",
     ])
+    .index("userId_status_tool_order_stepOrder", [
+      "userId",
+      "status",
+      "tool",
+      "order",
+      "stepOrder",
+    ])
     // Allows finding all threaded messages in order
     // Allows finding all failed messages to evaluate
     // .index("status_threadId_order_stepOrder", [