@convex-dev/agent 0.2.10-alpha.0 → 0.2.11-alpha.0

package/src/client/streaming.ts

@@ -19,9 +19,10 @@ import {
   type StreamMessage,
 } from "../validators.js";
 import type {
+  ActionCtx,
   AgentComponent,
-  RunMutationCtx,
-  RunQueryCtx,
+  MutationCtx,
+  QueryCtx,
   SyncStreamsReturnValue,
 } from "./types.js";
 
@@ -45,7 +46,7 @@ export const vStreamMessagesReturnValue = v.object({
  * @returns The deltas for each stream from their existing cursor.
  */
 export async function syncStreams(
-  ctx: RunQueryCtx,
+  ctx: QueryCtx | MutationCtx | ActionCtx,
   component: AgentComponent,
   {
     threadId,
@@ -80,7 +81,7 @@ export async function syncStreams(
 }
 
 export async function abortStream(
-  ctx: RunMutationCtx,
+  ctx: MutationCtx,
   component: AgentComponent,
   args: { reason: string } & (
     | { streamId: string }
@@ -111,7 +112,7 @@ export async function abortStream(
  * @returns The streams for the thread.
  */
 export async function listStreams(
-  ctx: RunQueryCtx,
+  ctx: QueryCtx | MutationCtx | ActionCtx,
   component: AgentComponent,
   {
     threadId,
@@ -212,7 +213,7 @@ export class DeltaStreamer<T> {
 
   constructor(
     public readonly component: AgentComponent,
-    public readonly ctx: RunMutationCtx,
+    public readonly ctx: MutationCtx,
     config: {
       throttleMs: number | undefined;
       onAsyncAbort: (reason: string) => Promise<void>;

package/src/client/threads.ts

@@ -1,6 +1,11 @@
 import type { WithoutSystemFields } from "convex/server";
 import type { ThreadDoc } from "../validators.js";
-import type { AgentComponent, RunMutationCtx, RunQueryCtx } from "./types.js";
+import type {
+  ActionCtx,
+  AgentComponent,
+  MutationCtx,
+  QueryCtx,
+} from "./types.js";
 
 /**
  * Create a thread to store messages with an Agent.
@@ -10,7 +15,7 @@ import type { AgentComponent, RunMutationCtx, RunQueryCtx } from "./types.js";
  * @returns The id of the created thread.
  */
 export async function createThread(
-  ctx: RunMutationCtx,
+  ctx: MutationCtx,
   component: AgentComponent,
   args?: { userId?: string | null; title?: string; summary?: string },
 ) {
@@ -32,7 +37,7 @@ export async function createThread(
  * @returns The metadata for the thread.
  */
 export async function getThreadMetadata(
-  ctx: RunQueryCtx,
+  ctx: QueryCtx | MutationCtx | ActionCtx,
   component: AgentComponent,
   args: { threadId: string },
 ): Promise<ThreadDoc> {
@@ -46,7 +51,7 @@ export async function getThreadMetadata(
 }
 
 export async function updateThreadMetadata(
-  ctx: RunMutationCtx,
+  ctx: MutationCtx,
   component: AgentComponent,
   args: { threadId: string; patch: Partial<WithoutSystemFields<ThreadDoc>> },
 ) {
@@ -62,7 +67,7 @@ export async function updateThreadMetadata(
  * @returns The threads matching the search, paginated.
  */
 export async function searchThreadTitles(
-  ctx: RunQueryCtx,
+  ctx: QueryCtx | MutationCtx | ActionCtx,
   component: AgentComponent,
   {
     userId,

package/src/client/types.ts

@@ -223,7 +223,7 @@ export type GenerationOutputMetadata = {
 };
 
 export type UsageHandler = (
-  ctx: RunActionCtx,
+  ctx: ActionCtx,
   args: {
     userId: string | undefined;
     threadId: string | undefined;
@@ -242,7 +242,7 @@ export type UsageHandler = (
  * out, add in, or reorder messages.
  */
 export type ContextHandler = (
-  ctx: RunActionCtx,
+  ctx: ActionCtx,
   args: {
     /**
      * All messages in the default order.
@@ -727,26 +727,24 @@ export type SyncStreamsReturnValue =
   | undefined;
 
 /* Type utils follow */
-export type RunQueryCtx = {
+type RunQueryCtx = {
   runQuery: <Query extends FunctionReference<"query", "internal">>(
     query: Query,
     args: FunctionArgs<Query>,
   ) => Promise<FunctionReturnType<Query>>;
 };
-export type RunMutationCtx = RunQueryCtx & {
+export type MutationCtx = RunQueryCtx & {
   runMutation: <Mutation extends FunctionReference<"mutation", "internal">>(
     mutation: Mutation,
     args: FunctionArgs<Mutation>,
   ) => Promise<FunctionReturnType<Mutation>>;
 };
-export type RunActionCtx = RunMutationCtx & {
+export type UserActionCtx = GenericActionCtx<GenericDataModel>;
+export type ActionCtx = MutationCtx & {
   runAction<Action extends FunctionReference<"action", "internal">>(
     action: Action,
     args: FunctionArgs<Action>,
   ): Promise<FunctionReturnType<Action>>;
-};
-export type UserActionCtx = GenericActionCtx<GenericDataModel>;
-export type ActionCtx = RunActionCtx & {
   auth: Auth;
   storage: StorageActionWriter;
 };

package/src/deltas.test.ts

@@ -100,7 +100,7 @@ describe("UIMessageChunks", () => {
       { type: "finish" },
     ]);
     expect(updatedMessage.text).toBe(
-      "Hey ho.The best ice cream flavor is vanilla.",
+      "Hey ho. The best ice cream flavor is vanilla.",
     );
     const expectedParts = [
       {
@@ -590,7 +590,9 @@ describe("combineUIMessages", () => {
     expect(combined[0].text).toBe("The result is 5.");
     expect(combined[0].parts).toHaveLength(2);
 
-    const toolPart = combined[0].parts.find(p => p.type === "tool-calculator");
+    const toolPart = combined[0].parts.find(
+      (p) => p.type === "tool-calculator",
+    );
     expect(toolPart).toMatchObject({
       type: "tool-calculator",
       state: "output-available",
@@ -599,7 +601,7 @@ describe("combineUIMessages", () => {
       output: { result: 5 },
     });
 
-    const textPart = combined[0].parts.find(p => p.type === "text");
+    const textPart = combined[0].parts.find((p) => p.type === "text");
     expect(textPart).toMatchObject({
       type: "text",
       text: "The result is 5.",
@@ -629,7 +631,13 @@ describe("combineUIMessages", () => {
       status: "success" as const,
       role: "assistant" as const,
       text: "The result is 5.",
-      parts: [{ type: "text" as const, text: "The result is 5.", state: "done" as const }],
+      parts: [
+        {
+          type: "text" as const,
+          text: "The result is 5.",
+          state: "done" as const,
+        },
+      ],
     };
 
     const combined = combineUIMessages([userMessage, assistantMessage]);
@@ -706,8 +714,11 @@ describe("combineUIMessages", () => {
     expect(combined[0].text).toBe("The formatted result is: 5");
     expect(combined[0].parts).toHaveLength(3);
 
-    const calculatorPart = combined[0].parts.find(p =>
-      p.type === "tool-calculator" && "toolCallId" in p && p.toolCallId === "call_1"
+    const calculatorPart = combined[0].parts.find(
+      (p) =>
+        p.type === "tool-calculator" &&
+        "toolCallId" in p &&
+        p.toolCallId === "call_1",
     );
     expect(calculatorPart).toMatchObject({
       type: "tool-calculator",
@@ -717,8 +728,11 @@ describe("combineUIMessages", () => {
       output: { result: 5 },
     });
 
-    const formatterPart = combined[0].parts.find(p =>
-      p.type === "tool-formatter" && "toolCallId" in p && p.toolCallId === "call_2"
+    const formatterPart = combined[0].parts.find(
+      (p) =>
+        p.type === "tool-formatter" &&
+        "toolCallId" in p &&
+        p.toolCallId === "call_2",
     );
     expect(formatterPart).toMatchObject({
       type: "tool-formatter",
@@ -775,9 +789,7 @@ describe("combineUIMessages", () => {
     expect(combined[0].text).toBe("Still processing...");
     expect(combined[0].parts).toHaveLength(2);
 
-    const toolPart = combined[0].parts.find(p =>
-      p.type === "dynamic-tool"
-    );
+    const toolPart = combined[0].parts.find((p) => p.type === "dynamic-tool");
     expect(toolPart).toMatchObject({
       type: "dynamic-tool",
       state: "input-available",
@@ -786,9 +798,7 @@ describe("combineUIMessages", () => {
       input: { operation: "add", a: 2, b: 3 },
     });
 
-    const textPart = combined[0].parts.find(p =>
-      p.type === "text"
-    );
+    const textPart = combined[0].parts.find((p) => p.type === "text");
     expect(textPart).toMatchObject({
       type: "text",
       text: "Still processing...",

package/src/deltas.ts

@@ -11,12 +11,13 @@ import {
 } from "ai";
 import { assert, pick } from "convex-helpers";
 import { type UIMessage } from "./UIMessages.js";
-import { sorted } from "./shared.js";
+import { joinText, sorted } from "./shared.js";
 import {
   type MessageStatus,
   type StreamDelta,
   type StreamMessage,
 } from "./validators.js";
+import { getErrorMessage } from "@ai-sdk/provider-utils";
 
 export function blankUIMessage<METADATA = unknown>(
   streamMessage: StreamMessage & { metadata?: METADATA },
@@ -85,10 +86,7 @@ export async function updateFromUIMessageChunks(
   if (failed) {
     message.status = "failed";
   }
-  message.text = message.parts
-    .filter((p) => p.type === "text")
-    .map((p) => p.text)
-    .join("");
+  message.text = joinText(message.parts);
   return message;
 }
 
@@ -470,10 +468,7 @@ export function updateFromTextStreamParts(
       case "tool-error": {
         const toolPart = toolPartsById.get(part.toolCallId);
         if (toolPart) {
-          toolPart.errorText =
-            part.error instanceof Error
-              ? part.error.message.toString()
-              : String(part.error);
+          toolPart.errorText = getErrorMessage(part.error);
         }
         break;
       }
@@ -501,10 +496,7 @@ export function updateFromTextStreamParts(
       part.state = "done";
     }
   }
-  message.text = message.parts
-    .filter((p) => p.type === "text")
-    .map((p) => p.text)
-    .join("");
+  message.text = joinText(message.parts);
   return [
     {
       streamId: streamMessage.streamId,
@@ -571,10 +563,7 @@ export function combineUIMessages(messages: UIMessage[]): UIMessage[] {
       ...previous,
       ...pick(message, ["status", "metadata", "agentName"]),
       parts: newParts,
-      text: newParts
-        .filter((p) => p.type === "text")
-        .map((p) => p.text)
-        .join(""),
+      text: joinText(newParts),
     });
     return acc;
   }, [] as UIMessage[]);

package/src/mapping.ts

@@ -35,9 +35,10 @@ import {
   type vToolResultPart,
   type SourcePart,
   vToolResultOutput,
+  type MessageDoc,
 } from "./validators.js";
 import type { ActionCtx, AgentComponent } from "./client/types.js";
-import type { RunMutationCtx } from "./client/types.js";
+import type { MutationCtx } from "./client/types.js";
 import { MAX_FILE_SIZE, storeFile } from "./client/files.js";
 import type { Infer } from "convex/values";
 import {
@@ -70,7 +71,7 @@ export type SerializedContent = Message["content"];
 export type SerializedMessage = Message;
 
 export async function serializeMessage(
-  ctx: ActionCtx | RunMutationCtx,
+  ctx: ActionCtx | MutationCtx,
   component: AgentComponent,
   message: ModelMessage | Message,
 ): Promise<{ message: SerializedMessage; fileIds?: string[] }> {
@@ -132,6 +133,14 @@ export function toModelMessage(
   } as ModelMessage;
 }
 
+export function docsToModelMessages(messages: MessageDoc[]): ModelMessage[] {
+  return messages
+    .map((m) => m.message)
+    .filter((m) => !!m)
+    .filter((m) => !!m.content.length)
+    .map(toModelMessage);
+}
+
 export function serializeUsage(usage: LanguageModelUsage): Usage {
   return {
     promptTokens: usage.inputTokens ?? 0,
@@ -254,7 +263,7 @@ function getMimeOrMediaType(part: { mediaType?: string; mimeType?: string }) {
 }
 
 export async function serializeContent(
-  ctx: ActionCtx | RunMutationCtx,
+  ctx: ActionCtx | MutationCtx,
   component: AgentComponent,
   content: Content | Message["content"],
 ): Promise<{ content: SerializedContent; fileIds?: string[] }> {

package/src/shared.ts

@@ -1,5 +1,18 @@
-import type { ModelMessage } from "ai";
-import type { Message } from "./validators.js";
+import type {
+  FilePart,
+  ImagePart,
+  ReasoningPart,
+  ToolCallPart,
+  ToolResultPart,
+} from "@ai-sdk/provider-utils";
+import type {
+  ModelMessage,
+  TextPart,
+  UIDataTypes,
+  UIMessagePart,
+  UITools,
+} from "ai";
+import type { Message, MessageContentParts } from "./validators.js";
 
 export const DEFAULT_RECENT_MESSAGES = 100;
 
@@ -18,19 +31,12 @@ export function extractText(message: Message | ModelMessage) {
       if (typeof message.content === "string") {
         return message.content;
       }
-      return message.content
-        .filter((c) => c.type === "text")
-        .map((c) => c.text)
-        .join("");
+      return joinText(message.content);
     case "assistant":
       if (typeof message.content === "string") {
         return message.content;
       } else {
-        const textParts = message.content.filter((c) => c.type === "text");
-        if (!textParts.length) {
-          return undefined;
-        }
-        return textParts.map((c) => c.text).join("");
+        return joinText(message.content) || undefined;
       }
     case "system":
       return message.content;
@@ -39,6 +45,25 @@ export function extractText(message: Message | ModelMessage) {
   return undefined;
 }
 
+export function joinText(
+  parts: (
+    | UIMessagePart<UIDataTypes, UITools>
+    | TextPart
+    | ImagePart
+    | FilePart
+    | ReasoningPart
+    | ToolCallPart
+    | ToolResultPart
+    | MessageContentParts
+  )[],
+) {
+  return parts
+    .filter((p) => p.type === "text")
+    .map((p) => p.text)
+    .filter(Boolean)
+    .join(" ");
+}
+
 export function extractReasoning(message: Message | ModelMessage) {
   if (typeof message.content === "string") {
     return undefined;
@@ -46,7 +71,7 @@ export function extractReasoning(message: Message | ModelMessage) {
   return message.content
     .filter((c) => c.type === "reasoning")
     .map((c) => c.text)
-    .join("");
+    .join(" ");
 }
 
 export const DEFAULT_MESSAGE_RANGE = { before: 2, after: 1 };

package/src/toUIMessages.test.ts

@@ -132,10 +132,7 @@ describe("toUIMessages", () => {
       type: "tool-myTool",
       toolCallId: "call1",
       state: "output-available",
-      output: {
-        type: "text",
-        value: "42",
-      },
+      output: "42",
     });
   });
 
@@ -163,14 +160,14 @@ describe("toUIMessages", () => {
             },
           ],
         },
-        reasoning: "I'm thinking...I'm thinking...",
+        reasoning: "I'm thinking... I'm thinking...",
         text: "Here's one idea. Here's another idea.",
       }),
     ];
     const uiMessages = toUIMessages(messages);
     expect(uiMessages).toHaveLength(1);
     expect(uiMessages[0].role).toBe("assistant");
-    expect(uiMessages[0].text).toBe("Here's one idea.Here's another idea.");
+    expect(uiMessages[0].text).toBe("Here's one idea. Here's another idea.");
     expect(uiMessages[0].parts.filter((p) => p.type === "reasoning")).toEqual([
       {
         providerOptions: undefined,
@@ -206,6 +203,81 @@ describe("toUIMessages", () => {
     );
   });
 
+  it("combines text from between messages", () => {
+    const messages = [
+      baseMessageDoc({
+        message: {
+          role: "assistant",
+          content: [
+            {
+              type: "reasoning",
+              text: "I'm thinking...",
+            },
+            {
+              type: "text",
+              text: "I'm going to ask a question.",
+            },
+            {
+              type: "tool-call",
+              args: "What's the meaning of life?",
+              toolCallId: "call1",
+              toolName: "myTool",
+            },
+          ],
+        },
+        reasoning: "I'm thinking...",
+        text: "Here's one idea.",
+        tool: true,
+        order: 1,
+        stepOrder: 1,
+      }),
+      baseMessageDoc({
+        message: {
+          role: "tool",
+          content: [
+            {
+              type: "tool-result",
+              toolCallId: "call1",
+              toolName: "myTool",
+              output: {
+                type: "text",
+                value: "42",
+              },
+            },
+          ],
+        },
+        text: "",
+        tool: true,
+        order: 1,
+        stepOrder: 2,
+      }),
+      baseMessageDoc({
+        message: {
+          role: "assistant",
+          content: [
+            {
+              type: "reasoning",
+              text: "Thinking again...",
+            },
+            {
+              type: "text",
+              text: "Ok now I know.",
+            },
+          ],
+        },
+        text: "One last thing.",
+        order: 1,
+        stepOrder: 3,
+      }),
+    ];
+    const uiMessages = toUIMessages(messages);
+    expect(uiMessages).toHaveLength(1);
+    expect(uiMessages[0].role).toBe("assistant");
+    expect(uiMessages[0].text).toBe(
+      "I'm going to ask a question. Ok now I know.",
+    );
+  });
+
   it("handles system message", () => {
     const messages = [
       baseMessageDoc({
@@ -252,7 +324,7 @@ describe("toUIMessages", () => {
               type: "tool-result",
               toolName: "myTool",
               toolCallId: "call1",
-              result: {
+              output: {
                 type: "json",
                 value: { data: "wrapped result", success: true },
               },
@@ -648,10 +720,7 @@ describe("toUIMessages", () => {
       toolCallId: "call1",
       state: "output-available",
       input: { operation: "add", a: 40, b: 2 },
-      output: {
-        type: "text",
-        value: "42",
-      },
+      output: "42",
     });
 
     // Should also have text part

package/src/validators.ts

@@ -221,6 +221,16 @@ export const vMessage = v.union(
 );
 export type Message = Infer<typeof vMessage>;
 
+export type MessageContentParts =
+  | Infer<typeof vTextPart>
+  | Infer<typeof vImagePart>
+  | Infer<typeof vFilePart>
+  | Infer<typeof vReasoningPart>
+  | Infer<typeof vRedactedReasoningPart>
+  | Infer<typeof vToolCallPart>
+  | Infer<typeof vToolResultPart>
+  | Infer<typeof vSourcePart>;
+
 export const vSource = v.union(
   v.object({
     type: v.optional(v.literal("source")),