@convex-dev/agent 0.1.15-alpha.2 → 0.1.16-alpha.0

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

@@ -578,160 +578,11 @@ export type Mounts = {
         >;
       }>
     >;
-    getThreadMessages: FunctionReference<
-      "query",
-      "public",
-      { deprecated: "Use listMessagesByThreadId instead" },
-      {
-        continueCursor: string;
-        isDone: boolean;
-        page: Array<{
-          _creationTime: number;
-          _id: string;
-          agentName?: string;
-          embeddingId?: string;
-          error?: string;
-          fileIds?: Array<string>;
-          finishReason?:
-            | "stop"
-            | "length"
-            | "content-filter"
-            | "tool-calls"
-            | "error"
-            | "other"
-            | "unknown";
-          id?: string;
-          message?:
-            | {
-                content:
-                  | string
-                  | Array<
-                      | {
-                          providerOptions?: Record<string, Record<string, any>>;
-                          text: string;
-                          type: "text";
-                        }
-                      | {
-                          image: string | ArrayBuffer;
-                          mimeType?: string;
-                          providerOptions?: Record<string, Record<string, any>>;
-                          type: "image";
-                        }
-                      | {
-                          data: string | ArrayBuffer;
-                          filename?: string;
-                          mimeType: string;
-                          providerOptions?: Record<string, Record<string, any>>;
-                          type: "file";
-                        }
-                    >;
-                providerOptions?: Record<string, Record<string, any>>;
-                role: "user";
-              }
-            | {
-                content:
-                  | string
-                  | Array<
-                      | {
-                          providerOptions?: Record<string, Record<string, any>>;
-                          text: string;
-                          type: "text";
-                        }
-                      | {
-                          data: string | ArrayBuffer;
-                          filename?: string;
-                          mimeType: string;
-                          providerOptions?: Record<string, Record<string, any>>;
-                          type: "file";
-                        }
-                      | {
-                          providerOptions?: Record<string, Record<string, any>>;
-                          signature?: string;
-                          text: string;
-                          type: "reasoning";
-                        }
-                      | {
-                          data: string;
-                          providerOptions?: Record<string, Record<string, any>>;
-                          type: "redacted-reasoning";
-                        }
-                      | {
-                          args: any;
-                          providerOptions?: Record<string, Record<string, any>>;
-                          toolCallId: string;
-                          toolName: string;
-                          type: "tool-call";
-                        }
-                    >;
-                providerOptions?: Record<string, Record<string, any>>;
-                role: "assistant";
-              }
-            | {
-                content: Array<{
-                  args?: any;
-                  experimental_content?: Array<
-                    | { text: string; type: "text" }
-                    | { data: string; mimeType?: string; type: "image" }
-                  >;
-                  isError?: boolean;
-                  providerOptions?: Record<string, Record<string, any>>;
-                  result: any;
-                  toolCallId: string;
-                  toolName: string;
-                  type: "tool-result";
-                }>;
-                providerOptions?: Record<string, Record<string, any>>;
-                role: "tool";
-              }
-            | {
-                content: string;
-                providerOptions?: Record<string, Record<string, any>>;
-                role: "system";
-              };
-          model?: string;
-          order: number;
-          provider?: string;
-          providerMetadata?: Record<string, Record<string, any>>;
-          providerOptions?: Record<string, Record<string, any>>;
-          reasoning?: string;
-          reasoningDetails?: Array<
-            | { signature?: string; text: string; type: "text" }
-            | { data: string; type: "redacted" }
-          >;
-          sources?: Array<{
-            id: string;
-            providerOptions?: Record<string, Record<string, any>>;
-            sourceType: "url";
-            title?: string;
-            url: string;
-          }>;
-          status: "pending" | "success" | "failed";
-          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;
-      }
-    >;
     listMessagesByThreadId: FunctionReference<
       "query",
       "public",
       {
         excludeToolMessages?: boolean;
-        isTool?: "use excludeToolMessages instead of this";
         order: "asc" | "desc";
         paginationOpts?: {
           cursor: string | null;
@@ -1437,7 +1288,13 @@ export type Mounts = {
       "mutation",
       "public",
       { reason: string; streamId: string },
-      null
+      boolean
+    >;
+    abortByOrder: FunctionReference<
+      "mutation",
+      "public",
+      { order: number; reason: string; threadId: string },
+      boolean
     >;
     addDelta: FunctionReference<
       "mutation",

package/src/component/messages.ts

@@ -40,15 +40,6 @@ import {
 } from "./vector/tables.js";
 import { changeRefcount } from "./files.js";
 
-/** @deprecated Use *.threads.listMessagesByThreadId instead. */
-export const listThreadsByUserId = _listThreadsByUserId;
-
-/** @deprecated Use *.threads.getThread */
-export const getThread = _getThread;
-
-/** @deprecated Use *.threads.updateThread instead */
-export const updateThread = _updateThread;
-
 function publicMessage(message: Doc<"messages">): MessageDoc {
   return omit(message, ["parentMessageId", "stepId", "files"]);
 }
@@ -385,8 +376,6 @@ export const listMessagesByThreadId = query({
   args: {
     threadId: v.id("threads"),
     excludeToolMessages: v.optional(v.boolean()),
-    /** @deprecated Use excludeToolMessages instead. */
-    isTool: v.optional(v.literal("use excludeToolMessages instead of this")),
     /** What order to sort the messages in. To get the latest, use "desc". */
     order: v.union(v.literal("asc"), v.literal("desc")),
     paginationOpts: v.optional(paginationOptsValidator),
@@ -421,10 +410,8 @@ export const listMessagesByThreadId = query({
           })
           .order(order)
           .filterWith(
-            async (m) =>
-              !last ||
-              m.order < last.order ||
-              (m.order === last.order && m.stepOrder <= last.stepOrder)
+            // We allow all messages on the same order.
+            async (m) => !last || m.order < last.order || m.order === last.order
           )
       )
     );
@@ -452,15 +439,6 @@ export const getMessagesByIds = query({
   returns: v.array(v.union(v.null(), vMessageDoc)),
 });
 
-/** @deprecated Use listMessagesByThreadId instead. */
-export const getThreadMessages = query({
-  args: { deprecated: v.literal("Use listMessagesByThreadId instead") },
-  handler: async () => {
-    throw new Error("Use listMessagesByThreadId instead of getThreadMessages");
-  },
-  returns: vPaginationResult(vMessageDoc),
-});
-
 export const searchMessages = action({
   args: {
     threadId: v.optional(v.id("threads")),
@@ -563,14 +541,19 @@ export const _fetchSearchMessages = internalQuery({
         args.vectorIds.map((embeddingId) =>
           ctx.db
             .query("messages")
-            .withIndex("embeddingId", (q) => q.eq("embeddingId", embeddingId))
-            .filter((q) =>
+            .withIndex("embeddingId_threadId", (q) =>
               searchAllMessagesForUserId
-                ? q.eq(q.field("userId"), searchAllMessagesForUserId)
-                : q.eq(q.field("threadId"), threadId!)
+                ? q.eq("embeddingId", embeddingId)
+                : q.eq("embeddingId", embeddingId).eq("threadId", threadId!)
+            )
+            .filter((q) =>
+              q.and(
+                q.eq(q.field("status"), "success"),
+                searchAllMessagesForUserId
+                  ? q.eq(q.field("userId"), searchAllMessagesForUserId)
+                  : q.eq(q.field("threadId"), threadId)
+              )
             )
-            // Don't include pending. Failed messages hopefully are deleted but may as well be safe.
-            .filter((q) => q.eq(q.field("status"), "success"))
             .first()
         )
       )

package/src/component/schema.ts

@@ -85,7 +85,7 @@ export const schema = defineSchema({
       filterFields: ["userId", "threadId"],
     })
     // Allows finding messages by vector embedding id
-    .index("embeddingId", ["embeddingId"]),
+    .index("embeddingId_threadId", ["embeddingId", "threadId"]),
 
   // Status: if it's done, it's deleted, then deltas are vacuumed
   streamingMessages: defineTable({

package/src/component/streams.ts

@@ -151,30 +151,63 @@ export const list = query({
   },
 });
 
-export const abort = mutation({
+export const abortByOrder = mutation({
   args: {
-    streamId: v.id("streamingMessages"),
+    threadId: v.id("threads"),
+    order: v.number(),
     reason: v.string(),
   },
-  returns: v.null(),
+  returns: v.boolean(),
   handler: async (ctx, args) => {
-    const stream = await ctx.db.get(args.streamId);
-    if (!stream) {
-      throw new Error(`Stream not found: ${args.streamId}`);
-    }
-    if (stream.state.kind !== "streaming") {
-      console.warn(
-        `Stream trying to abort but not currently streaming (${stream.state.kind}): ${args.streamId}`
-      );
-      return;
+    const streams = await ctx.db
+      .query("streamingMessages")
+      .withIndex("threadId_state_order_stepOrder", (q) =>
+        q
+          .eq("threadId", args.threadId)
+          .eq("state.kind", "streaming")
+          .eq("order", args.order)
+      )
+      .take(100);
+    for (const stream of streams) {
+      await abortById(ctx, {
+        streamId: stream._id,
+        reason: args.reason,
+      });
     }
-    await cleanupTimeoutFn(ctx, stream);
-    await ctx.db.patch(args.streamId, {
-      state: { kind: "aborted", reason: args.reason },
-    });
+    return streams.length > 0;
+  },
+});
+
+export const abort = mutation({
+  args: {
+    streamId: v.id("streamingMessages"),
+    reason: v.string(),
   },
+  returns: v.boolean(),
+  handler: abortById,
 });
 
+async function abortById(
+  ctx: MutationCtx,
+  args: { streamId: Id<"streamingMessages">; reason: string }
+) {
+  const stream = await ctx.db.get(args.streamId);
+  if (!stream) {
+    throw new Error(`Stream not found: ${args.streamId}`);
+  }
+  if (stream.state.kind !== "streaming") {
+    console.warn(
+      `Stream trying to abort but not currently streaming (${stream.state.kind}): ${args.streamId}`
+    );
+    return false;
+  }
+  await cleanupTimeoutFn(ctx, stream);
+  await ctx.db.patch(args.streamId, {
+    state: { kind: "aborted", reason: args.reason },
+  });
+  return true;
+}
+
 async function cleanupTimeoutFn(
   ctx: MutationCtx,
   stream: Doc<"streamingMessages">

package/src/component/vector/tables.ts

@@ -37,7 +37,7 @@ export type EmbeddingsWithoutDenormalizedFields = Infer<
   typeof vEmbeddingsWithoutDenormalizedFields
 >;
 
-function table<D extends number>(dimensions: D): Table<D> {
+function table<D extends number>(dimensions: D): VectorTable<D> {
   return defineTable(embeddings)
     .vectorIndex("vector", {
       vectorField: "vector",
@@ -47,7 +47,7 @@ function table<D extends number>(dimensions: D): Table<D> {
     .index("model_table_threadId", ["model", "table", "threadId"]);
 }
 
-type Table<D extends number> = TableDefinition<
+type VectorTable<D extends number> = TableDefinition<
   VObject<ObjectType<typeof embeddings>, typeof embeddings>,
   { model_table_threadId: ["model", "table", "threadId", "_creationTime"] },
   GenericTableSearchIndexes,
@@ -63,7 +63,7 @@ type VectorIndex<D extends number> = {
 };
 
 export type VectorSchema = SchemaDefinition<
-  { [key in VectorTableName]: Table<128> },
+  { [key in VectorTableName]: VectorTable<128> },
   true
 >;
 
@@ -110,7 +110,7 @@ export function getVectorIdInfo(ctx: QueryCtx, id: VectorTableId) {
 
 const tables: {
   [K in keyof typeof VectorDimensions &
-    number as `embeddings_${(typeof VectorDimensions)[K]}`]: Table<
+    number as `embeddings_${(typeof VectorDimensions)[K]}`]: VectorTable<
     (typeof VectorDimensions)[K]
   >;
 } = Object.fromEntries(
@@ -120,7 +120,7 @@ const tables: {
   ])
 ) as Record<
   `embeddings_${(typeof VectorDimensions)[number]}`,
-  Table<(typeof VectorDimensions)[number]>
+  VectorTable<(typeof VectorDimensions)[number]>
 >;
 
 export default tables;

package/src/mapping.ts

@@ -125,7 +125,6 @@ export async function serializeObjectResult(
   const { message, fileIds } = await serializeMessage(ctx, component, {
     role: "assistant" as const,
     content: text,
-    id: result.response.id,
   });
   return {
     messages: [
@@ -187,6 +186,9 @@ export async function serializeContent(
           }
           return { ...part, data };
         }
+        case "tool-result": {
+          return { ...part, result: part.result ?? null };
+        }
         default:
           return part;
       }
@@ -281,6 +283,11 @@ export function guessMimeType(buf: ArrayBuffer | string): string {
   return "application/octet-stream";
 }
 
+/**
+ * Serialize an AI SDK `DataContent` or `URL` to a Convex-serializable format.
+ * @param dataOrUrl - The data or URL to serialize.
+ * @returns The serialized data as an ArrayBuffer or the URL as a string.
+ */
 export function serializeDataOrUrl(
   dataOrUrl: DataContent | URL
 ): ArrayBuffer | string {

package/src/react/deltas.ts

@@ -2,6 +2,7 @@ import type { TextPart, ToolCallPart, ToolResultPart } from "ai";
 import type { MessageDoc } from "../client/index.js";
 import type {
   Message,
+  MessageStatus,
   StreamDelta,
   StreamMessage,
   TextStreamPart,
@@ -99,6 +100,12 @@ export function applyDeltasToStreamMessage(
     cursor = delta.end;
     parts.push(...delta.parts);
   }
+  if (existing && existing.messages.length > 0 && !changed) {
+    const lastMessage = existing.messages.at(-1)!;
+    if (statusFromStreamStatus(streamMessage.status) !== lastMessage.status) {
+      changed = true;
+    }
+  }
   if (!changed) {
     return [
       existing ?? { streamId: streamMessage.streamId, cursor, messages: [] },
@@ -115,6 +122,7 @@ export function applyDeltasToStreamMessage(
     currentMessage = {
       ...lastMessage,
       message: cloneMessageAndContent(lastMessage.message),
+      status: statusFromStreamStatus(streamMessage.status),
     };
   } else {
     const newMessage = createStreamingMessage(
@@ -248,6 +256,21 @@ function getLastContent(message: MessageDoc) {
   return undefined;
 }
 
+function statusFromStreamStatus(
+  status: StreamMessage["status"]
+): MessageStatus {
+  switch (status) {
+    case "streaming":
+      return "pending";
+    case "finished":
+      return "success";
+    case "aborted":
+      return "failed";
+    default:
+      return "pending";
+  }
+}
+
 export function createStreamingMessage(
   threadId: string,
   message: StreamMessage,
@@ -259,9 +282,7 @@ export function createStreamingMessage(
     ...rest,
     _id: `${streamId}-${index}`,
     _creationTime: Date.now(),
-    status: (
-      { streaming: "pending", finished: "success", aborted: "failed" } as const
-    )[message.status],
+    status: statusFromStreamStatus(message.status),
     threadId,
     tool: false,
   };

package/src/react/index.ts

@@ -114,7 +114,7 @@ export function useThreadMessages<
     const streamListMessages =
       streamMessages?.map((m) => ({
         ...m,
-        streaming: !m.status || m.status === "streaming",
+        streaming: !m.status || m.status === "pending",
       })) ?? [];
     return {
       ...paginated,

package/src/react/toUIMessages.ts

@@ -25,7 +25,7 @@ export function toUIMessages(
       content && typeof content !== "string" ? content : [];
     if (!coreMessage) continue;
     const common = {
-      id: message.id ?? message._id,
+      id: message._id,
       createdAt: new Date(message._creationTime),
       order: message.order,
       stepOrder: message.stepOrder,
@@ -82,7 +82,7 @@ export function toUIMessages(
           : message.status;
       }
       // update it to the last message's id
-      assistantMessage.id = message.id ?? message._id;
+      assistantMessage.id = message._id;
       if (message.reasoning) {
         assistantMessage.parts.push({
           type: "reasoning",

package/src/validators.ts

@@ -4,7 +4,6 @@ import {
   type ObjectType,
   type Validator,
   type Value,
-  type VObject,
 } from "convex/values";
 import { vVectorDimension } from "./component/vector/tables.js";
 
@@ -312,30 +311,6 @@ export const vStorageOptions = v.object({
   ),
 });
 
-const vStorageOptionsIncludingDeprecated = v.object({
-  ...vStorageOptions.fields,
-  saveAllInputMessages: v.optional(v.boolean()),
-  saveAnyInputMessages: v.optional(v.boolean()),
-  saveOutputMessages: v.optional(v.boolean()),
-}) as VObject<
-  {
-    saveMessages?: "all" | "none" | "promptAndOutput";
-    /**
-     * @deprecated Use saveMessages instead.
-     */
-    saveAllInputMessages?: boolean;
-    /**
-     * @deprecated Use saveMessages instead.
-     */
-    saveAnyInputMessages?: boolean;
-    /**
-     * @deprecated Use saveMessages instead.
-     */
-    saveOutputMessages?: boolean;
-  },
-  typeof vStorageOptions.fields
->;
-
 const vPromptFields = {
   system: v.optional(v.string()),
   prompt: v.optional(v.string()),
@@ -360,7 +335,7 @@ const vCommonArgs = {
   userId: v.optional(v.string()),
   threadId: v.optional(v.string()),
   contextOptions: v.optional(vContextOptions),
-  storageOptions: v.optional(vStorageOptionsIncludingDeprecated),
+  storageOptions: v.optional(vStorageOptions),
   providerOptions,
   ...vCallSettingsFields,
   ...vPromptFields,