@convex-dev/agent 0.1.9-alpha.11 → 0.1.9-alpha.2

package/src/component/streams.ts

@@ -6,7 +6,7 @@ import {
   vStreamMessage,
 } from "../validators.js";
 import { api, internal } from "./_generated/api.js";
-import type { Doc, Id } from "./_generated/dataModel.js";
+import type { Id } from "./_generated/dataModel.js";
 import {
   internalMutation,
   mutation,
@@ -17,15 +17,11 @@ import {
 import schema from "./schema.js";
 import { stream } from "convex-helpers/server/stream";
 import { mergedStream } from "convex-helpers/server/stream";
-import { paginator } from "convex-helpers/server/pagination";
-
-const SECOND = 1000;
-const MINUTE = 60 * SECOND;
 
 const MAX_DELTAS_PER_REQUEST = 1000;
 const MAX_DELTAS_PER_STREAM = 100;
-const TIMEOUT_INTERVAL = 10 * MINUTE;
-const DELETE_STREAM_DELAY = MINUTE * 5; // 5 minutes
+const TIMEOUT_INTERVAL = 1000 * 60; // 1 minute
+const DELETE_STREAM_DELAY = 1000 * 60 * 5; // 5 minutes
 
 const deltaValidator = schema.tables.streamDeltas.validator;
 
@@ -106,87 +102,33 @@ export const create = mutation({
 export const list = query({
   args: {
     threadId: v.id("threads"),
-    startOrder: v.optional(v.number()),
-    statuses: v.optional(
-      v.array(
-        v.union(
-          v.literal("streaming"),
-          v.literal("finished"),
-          v.literal("aborted")
-        )
-      )
-    ),
   },
   returns: v.array(vStreamMessage),
   handler: async (ctx, args) => {
-    const statuses = args.statuses ?? ["streaming"];
-    const messages = await mergedStream(
-      statuses.map((status) =>
-        stream(ctx.db, schema)
-          .query("streamingMessages")
-          .withIndex("threadId_state_order_stepOrder", (q) =>
-            q
-              .eq("threadId", args.threadId)
-              .eq("state.kind", status)
-              .gte("order", args.startOrder ?? 0)
-          )
-          .order("desc")
-      ),
-      ["order", "stepOrder"]
-    ).take(100);
-
-    return messages.map((m) => ({
-      streamId: m._id,
-      status: m.state.kind,
-      ...pick(m, [
-        "order",
-        "stepOrder",
-        "userId",
-        "agentName",
-        "model",
-        "provider",
-        "providerOptions",
-      ]),
-    }));
-  },
-});
-
-export const abort = mutation({
-  args: {
-    streamId: v.id("streamingMessages"),
-    reason: v.string(),
-  },
-  returns: v.null(),
-  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 ctx.db
+      .query("streamingMessages")
+      .withIndex("threadId_state_order_stepOrder", (q) =>
+        q.eq("threadId", args.threadId).eq("state.kind", "streaming")
+      )
+      .order("desc")
+      .take(100)
+      .then((msgs) =>
+        msgs.map((m) => ({
+          streamId: m._id,
+          ...pick(m, [
+            "order",
+            "stepOrder",
+            "userId",
+            "agentName",
+            "model",
+            "provider",
+            "providerOptions",
+          ]),
+        }))
       );
-      return;
-    }
-    await cleanupTimeoutFn(ctx, stream);
-    await ctx.db.patch(args.streamId, {
-      state: { kind: "aborted", reason: args.reason },
-    });
   },
 });
 
-async function cleanupTimeoutFn(
-  ctx: MutationCtx,
-  stream: Doc<"streamingMessages">
-) {
-  if (stream.state.kind === "streaming" && stream.state.timeoutFnId) {
-    const timeoutFn = await ctx.db.system.get(stream.state.timeoutFnId);
-    if (timeoutFn?.state.kind === "pending") {
-      await ctx.scheduler.cancel(stream.state.timeoutFnId);
-    }
-  }
-}
-
 export const finish = mutation({
   args: {
     streamId: v.id("streamingMessages"),
@@ -207,7 +149,12 @@ export const finish = mutation({
       );
       return;
     }
-    await cleanupTimeoutFn(ctx, stream);
+    if (stream.state.timeoutFnId) {
+      const timeoutFn = await ctx.db.system.get(stream.state.timeoutFnId);
+      if (timeoutFn?.state.kind === "pending") {
+        await ctx.scheduler.cancel(stream.state.timeoutFnId);
+      }
+    }
     await ctx.db.patch(args.streamId, {
       state: { kind: "finished", endedAt: Date.now() },
     });
@@ -272,8 +219,8 @@ export const timeoutStream = internalMutation({
     }
     await ctx.db.patch(args.streamId, {
       state: {
-        kind: "aborted",
-        reason: "timeout",
+        kind: "finished",
+        endedAt: Date.now(),
       },
     });
   },
@@ -283,7 +230,7 @@ async function deletePageForStreamId(
   ctx: MutationCtx,
   args: { streamId: Id<"streamingMessages">; cursor?: string }
 ) {
-  const deltas = await paginator(ctx.db, schema)
+  const deltas = await ctx.db
     .query("streamDeltas")
     .withIndex("streamId_start_end", (q) => q.eq("streamId", args.streamId))
     .paginate({
@@ -291,9 +238,6 @@ async function deletePageForStreamId(
       cursor: args.cursor ?? null,
     });
   await Promise.all(deltas.page.map((d) => ctx.db.delete(d._id)));
-  if (deltas.isDone) {
-    await ctx.db.delete(args.streamId);
-  }
   return deltas;
 }
 
@@ -333,12 +277,13 @@ export async function deleteStreamsPageForThreadId(
     cursor: deltaCursor,
   });
   if (result.isDone) {
+    await ctx.db.delete(streamMessage._id);
     deltaCursor = undefined;
   }
   return {
     isDone: false,
     streamOrder: streamMessage.order,
-    deltaCursor,
+    deltaCursor: result.continueCursor,
   };
 }
 
@@ -397,6 +342,7 @@ export const deleteStreamSync = mutation({
         cursor: deltas.continueCursor,
       });
     }
+    await ctx.db.delete(args.streamId);
   },
 });
 

package/src/component/threads.ts

@@ -16,7 +16,6 @@ import {
 } from "./_generated/server.js";
 import { deleteMessage } from "./messages.js";
 import { schema, v } from "./schema.js";
-import { deleteStreamsPageForThreadId } from "./streams.js";
 
 function publicThreadOrNull(thread: Doc<"threads"> | null): ThreadDoc | null {
   if (thread === null) {
@@ -101,17 +100,29 @@ export const updateThread = mutation({
 
 // TODO: delete thread
 
+const deleteThreadArgs = {
+  threadId: v.id("threads"),
+  cursor: v.optional(v.string()),
+  limit: v.optional(v.number()),
+};
+type DeleteThreadArgs = ObjectType<typeof deleteThreadArgs>;
+const deleteThreadReturns = {
+  cursor: v.string(),
+  isDone: v.boolean(),
+};
+type DeleteThreadReturns = ObjectType<typeof deleteThreadReturns>;
+
 /**
  * Use this to delete a thread and everything it contains.
  * It will try to delete all pages synchronously.
  * If it times out or fails, you'll have to run it again.
  */
 export const deleteAllForThreadIdSync = action({
-  args: { threadId: v.id("threads"), limit: v.optional(v.number()) },
+  args: deleteThreadArgs,
   handler: async (ctx, args) => {
-    let cursor: string | undefined = undefined;
+    let cursor = args.cursor;
     while (true) {
-      const result: DeleteThreadReturns = await ctx.runMutation(
+      const result = await ctx.runMutation(
         internal.threads._deletePageForThreadId,
         { threadId: args.threadId, cursor, limit: args.limit }
       );
@@ -127,22 +138,6 @@ export const deleteAllForThreadIdSync = action({
   returns: v.null(),
 });
 
-const deleteThreadArgs = {
-  threadId: v.id("threads"),
-  cursor: v.optional(v.string()),
-  messagesDone: v.optional(v.boolean()),
-  streamsDone: v.optional(v.boolean()),
-  streamOrder: v.optional(v.number()),
-  deltaCursor: v.optional(v.string()),
-  limit: v.optional(v.number()),
-};
-type DeleteThreadArgs = ObjectType<typeof deleteThreadArgs>;
-const deleteThreadReturns = {
-  cursor: v.string(),
-  isDone: v.boolean(),
-};
-type DeleteThreadReturns = ObjectType<typeof deleteThreadReturns>;
-
 export const _deletePageForThreadId = internalMutation({
   args: deleteThreadArgs,
   handler: deletePageForThreadIdHandler,
@@ -156,39 +151,22 @@ export const _deletePageForThreadId = internalMutation({
 export const deleteAllForThreadIdAsync = mutation({
   args: deleteThreadArgs,
   handler: async (ctx, args) => {
-    let messagesResult = {
-      isDone: args.messagesDone ?? false,
-      cursor: args.cursor,
-    };
-    if (!args.messagesDone) {
-      messagesResult = await deletePageForThreadIdHandler(ctx, args);
-    }
-    let streamResult = {
-      isDone: args.streamsDone ?? false,
-      streamOrder: args.streamOrder,
-      deltaCursor: args.deltaCursor,
-    };
-    if (!args.streamsDone) {
-      streamResult = await deleteStreamsPageForThreadId(ctx, {
-        threadId: args.threadId,
-        streamOrder: args.streamOrder,
-        deltaCursor: args.deltaCursor,
-      });
-    }
-    const isDone = messagesResult.isDone && streamResult.isDone;
-    if (!isDone) {
+    const result = await deletePageForThreadIdHandler(ctx, args);
+    if (!result.isDone) {
       await ctx.scheduler.runAfter(0, api.threads.deleteAllForThreadIdAsync, {
         threadId: args.threadId,
-        cursor: messagesResult.cursor,
-        messagesDone: messagesResult.isDone,
-        streamsDone: streamResult.isDone,
-        streamOrder: streamResult.streamOrder,
-        deltaCursor: streamResult.deltaCursor,
+        cursor: result.cursor,
       });
     }
-    return { isDone };
+    // Kick off the streams deletion
+    await ctx.scheduler.runAfter(
+      0,
+      api.streams.deleteAllStreamsForThreadIdSync,
+      { threadId: args.threadId }
+    );
+    return result;
   },
-  returns: v.object({ isDone: v.boolean() }),
+  returns: deleteThreadReturns,
 });
 
 async function deletePageForThreadIdHandler(

package/src/react/deltas.ts

@@ -189,7 +189,6 @@ export function applyDeltasToStreamMessage(
         contentToAdd = part;
         break;
       case "reasoning":
-        currentMessage.reasoning += part.textDelta;
         if (lastContent?.type === "reasoning") {
           lastContent.text += part.textDelta;
         } else {
@@ -256,14 +255,12 @@ export function createStreamingMessage(
 ): MessageDoc {
   const { streamId, ...rest } = message;
   const metadata: MessageDoc = {
-    ...rest,
     _id: `${streamId}-${index}`,
     _creationTime: Date.now(),
-    status: (
-      { streaming: "pending", finished: "success", aborted: "failed" } as const
-    )[message.status],
+    status: "pending",
     threadId,
     tool: false,
+    ...rest,
   };
   switch (part.type) {
     case "text-delta":

package/src/react/index.ts

@@ -1,5 +1,5 @@
 "use client";
-import { omit, type ErrorMessage } from "convex-helpers";
+import type { ErrorMessage } from "convex-helpers";
 import {
   type PaginatedQueryArgs,
   type UsePaginatedQueryResult,
@@ -7,7 +7,7 @@ import {
 } from "convex/react";
 import { usePaginatedQuery } from "convex-helpers/react";
 import type { FunctionArgs } from "convex/server";
-import { useMemo, useRef, useState } from "react";
+import { useMemo, useState } from "react";
 import type { MessageDoc } from "../client/index.js";
 import type { SyncStreamsReturnValue } from "../client/types.js";
 import type { StreamArgs } from "../validators.js";
@@ -103,18 +103,14 @@ export function useThreadMessages<
       ThreadMessagesArgs<Query>,
       ThreadMessagesResult<Query>
     >,
-    !options.stream ||
-      args === "skip" ||
-      paginated.status === "LoadingFirstPage"
-      ? "skip"
-      : { ...args, startOrder: paginated.results.at(-1)?.order }
+    !options.stream ? "skip" : args
   );
 
   const merged = useMemo(() => {
     const streamListMessages =
       streamMessages?.map((m) => ({
         ...m,
-        streaming: !m.status || m.status === "streaming",
+        streaming: true,
       })) ?? [];
     return {
       ...paginated,
@@ -154,7 +150,7 @@ export function useStreamingThreadMessages<
   Query extends ThreadStreamQuery<any, any>,
 >(
   query: Query,
-  args: (ThreadMessagesArgs<Query> & { startOrder?: number }) | "skip"
+  args: ThreadMessagesArgs<Query> | "skip"
 ): Array<ThreadMessagesResult<Query>> | undefined {
   // Invariant: streamMessages[streamId] is comprised of all deltas up to the
   // cursor. There can be multiple messages in the same stream, e.g. for tool
@@ -162,23 +158,15 @@ export function useStreamingThreadMessages<
   const [streams, setStreams] = useState<
     Array<{ streamId: string; cursor: number; messages: MessageDoc[] }>
   >([]);
-  const startOrderRef = useRef<number>(0);
-  const queryArgs = args === "skip" ? args : omit(args, ["startOrder"]);
-  if (args !== "skip" && !startOrderRef.current && args.startOrder) {
-    startOrderRef.current = args.startOrder;
-  }
   // Get all the active streams
   const streamList = useQuery(
     query,
-    queryArgs === "skip"
-      ? queryArgs
+    args === "skip"
+      ? args
       : ({
-          ...queryArgs,
+          ...args,
           paginationOpts: { cursor: null, numItems: 0 },
-          streamArgs: {
-            kind: "list",
-            startOrder: startOrderRef.current,
-          } as StreamArgs,
+          streamArgs: { kind: "list" } as StreamArgs,
         } as FunctionArgs<Query>)
   ) as
     | { streams: Extract<SyncStreamsReturnValue, { kind: "list" }> }
@@ -198,10 +186,10 @@ export function useStreamingThreadMessages<
   // Get the deltas for all the active streams, if any.
   const cursorQuery = useQuery(
     query,
-    queryArgs === "skip" || !streamList
+    args === "skip" || !streamList
       ? ("skip" as const)
       : ({
-          ...queryArgs,
+          ...args,
           paginationOpts: { cursor: null, numItems: 0 },
           streamArgs: { kind: "deltas", cursors } as StreamArgs,
         } as FunctionArgs<Query>)

package/src/react/optimisticallySendMessage.ts

@@ -11,7 +11,7 @@ export function optimisticallySendMessage(
 ) => void {
   return (store, args) => {
     const queries = store.getAllQueries(query);
-    let maxOrder = -1;
+    let maxOrder = 0;
     let maxStepOrder = 0;
     for (const q of queries) {
       if (q.args?.threadId !== args.threadId) continue;

package/src/validators.ts

@@ -460,7 +460,6 @@ export const vStreamArgs = v.optional(
   v.union(
     v.object({
       kind: v.literal("list"),
-      startOrder: v.optional(v.number()),
     }),
     v.object({
       kind: v.literal("deltas"),
@@ -472,11 +471,6 @@ export type StreamArgs = Infer<typeof vStreamArgs>;
 
 export const vStreamMessage = v.object({
   streamId: v.string(),
-  status: v.union(
-    v.literal("streaming"),
-    v.literal("finished"),
-    v.literal("aborted")
-  ),
   order: v.number(),
   stepOrder: v.number(),
   // metadata