@convex-dev/agent 0.3.2 → 0.6.0-alpha.0

package/src/component/files.ts

@@ -9,7 +9,9 @@ const addFileArgs = v.object({
   storageId: v.string(),
   hash: v.string(),
   filename: v.optional(v.string()),
-  mimeType: v.string(),
+  mediaType: v.optional(v.string()),
+  /** @deprecated Use `mediaType` instead. */
+  mimeType: v.optional(v.string()),
 });
 
 export const addFile = mutation({
@@ -25,6 +27,9 @@ export async function addFileHandler(
   ctx: MutationCtx,
   args: Infer<typeof addFileArgs>,
 ) {
+  // Support both mediaType (preferred) and mimeType (deprecated)
+  const mediaType = args.mediaType ?? args.mimeType;
+  
   const existingFile = await ctx.db
     .query("files")
     .withIndex("hash", (q) => q.eq("hash", args.hash))
@@ -42,7 +47,11 @@ export async function addFileHandler(
     };
   }
   const fileId = await ctx.db.insert("files", {
-    ...args,
+    storageId: args.storageId,
+    hash: args.hash,
+    filename: args.filename,
+    mediaType,
+    mimeType: args.mimeType, // Keep for backwards compatibility
     // We start out with it unused - when it's saved in a message we increment.
     refcount: 0,
     lastTouchedAt: Date.now(),

package/src/component/messages.test.ts

@@ -6,11 +6,11 @@ import { api } from "./_generated/api.js";
 import type { Id } from "./_generated/dataModel.js";
 import { getMaxMessage } from "./messages.js";
 import schema from "./schema.js";
-import { modules } from "./setup.test.js";
+import { initConvexTest, modules } from "./setup.test.js";
 
 describe("agent", () => {
   test("getMaxMessage works for threads", async () => {
-    const t = convexTest(schema, modules);
+    const t = initConvexTest();
     const thread = await t.mutation(api.threads.createThread, {
       userId: "test",
     });
@@ -68,7 +68,7 @@ describe("agent", () => {
             content: [
               {
                 type: "tool-call",
-                args: { a: 1 },
+                input: { a: 1 },
                 toolCallId: "1",
                 toolName: "tool",
               },
@@ -258,7 +258,7 @@ describe("agent", () => {
             content: [
               {
                 type: "tool-call",
-                args: { a: 1 },
+                input: { a: 1 },
                 toolCallId: "1",
                 toolName: "tool",
               },
@@ -389,7 +389,7 @@ describe("agent", () => {
             content: [
               {
                 type: "tool-call",
-                args: { a: 1 },
+                input: { a: 1 },
                 toolCallId: "1",
                 toolName: "tool",
               },
@@ -408,7 +408,7 @@ describe("agent", () => {
           content: [
             {
               type: "tool-call",
-              args: { a: 2, b: 3 },
+              input: { a: 2, b: 3 },
               toolCallId: "1",
               toolName: "tool",
             },
@@ -422,7 +422,7 @@ describe("agent", () => {
       content: [
         {
           type: "tool-call",
-          args: { a: 2, b: 3 },
+          input: { a: 2, b: 3 },
           toolCallId: "1",
           toolName: "tool",
         },

package/src/component/schema.ts

@@ -149,7 +149,9 @@ export const schema = defineSchema({
 
   files: defineTable({
     storageId: v.string(),
-    mimeType: v.string(),
+    mediaType: v.optional(v.string()),
+    /** @deprecated Use `mediaType` instead. */
+    mimeType: v.optional(v.string()),
     filename: v.optional(v.string()),
     hash: v.string(),
     refcount: v.number(),

package/src/component/setup.test.ts

@@ -1,5 +1,12 @@
 /// <reference types="vite/client" />
+import { convexTest } from "convex-test";
 import { test } from "vitest";
+import schema from "./schema.js";
 export const modules = import.meta.glob("./**/*.*s");
 
+export function initConvexTest() {
+  const t = convexTest(schema, modules);
+  return t;
+}
+
 test("setup", () => {});

package/src/component/streams.ts

@@ -545,7 +545,7 @@ export async function getStreamingMessagesWithMetadata(
         // We don't save messages that have already been saved
         const numToSkip = stepOrder - streamingMessage.stepOrder;
         const messages = await Promise.all(
-          fromUIMessages(uiMessages, streamingMessage)
+          (await fromUIMessages(uiMessages, streamingMessage))
             .slice(numToSkip)
             .filter((m) => m.message !== undefined)
             .map(async (msg) => {

package/src/deltas.test.ts

@@ -156,6 +156,49 @@ describe("UIMessageChunks", () => {
   });
 });
 
+describe("UIMessageChunks - continuation stream", () => {
+  it("gracefully handles tool-result without tool-call in continuation stream after approval", async () => {
+    // This simulates what happens after tool approval:
+    // Stream A: tool-call, tool-approval-request -> finishes
+    // User approves
+    // Stream B: tool-result (referencing tool-call from Stream A) -> this test
+    //
+    // The AI SDK's readUIMessageStream expects tool-call before tool-result,
+    // but they're in different streams. The onError handler should gracefully
+    // ignore this error since stored messages provide the fallback.
+    const uiMessage = blankUIMessage(
+      {
+        streamId: "continuation-stream",
+        status: "streaming",
+        order: 1,
+        stepOrder: 0,
+        format: "UIMessageChunk",
+        agentName: "agent1",
+      },
+      "thread1",
+    );
+
+    // Send a tool-result without the corresponding tool-call in this stream
+    // This would normally throw "No tool invocation found" error
+    const updatedMessage = await updateFromUIMessageChunks(uiMessage, [
+      { type: "start" },
+      { type: "start-step" },
+      {
+        type: "tool-output-available",
+        toolCallId: "call_from_previous_stream",
+        output: "Tool execution result",
+      },
+      { type: "finish-step" },
+      { type: "finish" },
+    ]);
+
+    // The message should NOT be marked as failed - the error should be suppressed
+    expect(updatedMessage.status).not.toBe("failed");
+    // The stream still processes (even if tool-output isn't reflected without tool-input)
+    expect(updatedMessage).toBeDefined();
+  });
+});
+
 describe("mergeDeltas", () => {
   it("merges a single text-delta into a message", () => {
     const streamId = "s1";
@@ -533,4 +576,51 @@ describe("mergeDeltas", () => {
       },
     ]);
   });
+
+  it("handles streaming tool-approval-request and updates tool state", () => {
+    const streamId = "s10";
+    const deltas = [
+      {
+        streamId,
+        start: 0,
+        end: 1,
+        parts: [
+          {
+            type: "tool-call",
+            toolCallId: "call1",
+            toolName: "dangerousTool",
+            input: { action: "delete" },
+          },
+        ],
+      } satisfies StreamDelta,
+      {
+        streamId,
+        start: 1,
+        end: 2,
+        parts: [
+          {
+            type: "tool-approval-request",
+            toolCallId: "call1",
+            approvalId: "approval1",
+          },
+        ],
+      } satisfies StreamDelta,
+    ];
+    const [[message], _, changed] = deriveUIMessagesFromTextStreamParts(
+      "thread1",
+      [{ streamId, order: 10, stepOrder: 0, status: "streaming" }],
+      [],
+      deltas,
+    );
+    expect(message).toBeDefined();
+    expect(message.role).toBe("assistant");
+    expect(changed).toBe(true);
+
+    const toolPart = message.parts.find(
+      (p) => p.type === "tool-dangerousTool",
+    ) as any;
+    expect(toolPart).toBeDefined();
+    expect(toolPart.state).toBe("approval-requested");
+    expect(toolPart.approval).toEqual({ id: "approval1" });
+  });
 });

package/src/deltas.ts

@@ -66,22 +66,40 @@ export async function updateFromUIMessageChunks(
     },
   });
   let failed = false;
+  let suppressError = false;
   const messageStream = readUIMessageStream({
     message: uiMessage,
     stream: partsStream,
     onError: (e) => {
+      const errorMessage = e instanceof Error ? e.message : String(e);
+      // Tool invocation errors can be safely ignored when streaming continuation
+      // after tool approval - the stored messages have the complete tool context
+      if (errorMessage.toLowerCase().includes("no tool invocation found")) {
+        // Silently suppress - this is expected after tool approval when the
+        // continuation stream has tool-result without the original tool-call
+        suppressError = true;
+        return;
+      }
       failed = true;
       console.error("Error in stream", e);
     },
     terminateOnError: true,
   });
   let message = uiMessage;
-  for await (const messagePart of messageStream) {
-    assert(
-      messagePart.id === message.id,
-      `Expecting to only make one UIMessage in a stream`,
-    );
-    message = messagePart;
+  try {
+    for await (const messagePart of messageStream) {
+      assert(
+        messagePart.id === message.id,
+        `Expecting to only make one UIMessage in a stream`,
+      );
+      message = messagePart;
+    }
+  } catch (e) {
+    // If we've already handled this error in onError and marked it as suppressed,
+    // don't rethrow - the stored messages provide the fallback
+    if (!suppressError) {
+      throw e;
+    }
   }
   if (failed) {
     message.status = "failed";
@@ -472,6 +490,25 @@ export function updateFromTextStreamParts(
         }
         break;
       }
+      case "tool-approval-request": {
+        const typedPart = part as unknown as {
+          type: "tool-approval-request";
+          toolCallId: string;
+          approvalId: string;
+        };
+        const toolPart = toolPartsById.get(typedPart.toolCallId);
+        if (toolPart) {
+          toolPart.state = "approval-requested";
+          (toolPart as ToolUIPart & { approval?: object }).approval = {
+            id: typedPart.approvalId,
+          };
+        } else {
+          console.warn(
+            `Expected tool call part ${typedPart.toolCallId} for approval request`,
+          );
+        }
+        break;
+      }
       case "file":
       case "text-end":
       case "finish-step":
@@ -482,8 +519,10 @@ export function updateFromTextStreamParts(
         // ignore
         break;
       default: {
-        // Should never happen
-        const _: never = part;
+        // Exhaustiveness check disabled intentionally for forwards compatibility.
+        // New TextStreamPart types from future AI SDK versions will trigger a
+        // runtime warning rather than a compile error, allowing graceful degradation.
+        // const _: never = part;
         console.warn(`Received unexpected part: ${JSON.stringify(part)}`);
         break;
       }

package/src/fromUIMessages.test.ts

@@ -20,7 +20,7 @@ function baseMessageDoc<T = unknown>(
 }
 
 describe("fromUIMessages round-trip tests", () => {
-  it("preserves essential data for simple user message", () => {
+  it("preserves essential data for simple user message", async () => {
     const originalMessages = [
       baseMessageDoc({
         message: {
@@ -32,7 +32,7 @@ describe("fromUIMessages round-trip tests", () => {
     ];
 
     const uiMessages = toUIMessages(originalMessages);
-    const backToMessageDocs = fromUIMessages(uiMessages, {
+    const backToMessageDocs = await fromUIMessages(uiMessages, {
       threadId: "thread1",
     });
 
@@ -54,7 +54,7 @@ describe("fromUIMessages round-trip tests", () => {
     }
   });
 
-  it("preserves essential data for assistant message", () => {
+  it("preserves essential data for assistant message", async () => {
     const originalMessages = [
       baseMessageDoc({
         message: {
@@ -66,7 +66,7 @@ describe("fromUIMessages round-trip tests", () => {
     ];
 
     const uiMessages = toUIMessages(originalMessages);
-    const backToMessageDocs = fromUIMessages(uiMessages, {
+    const backToMessageDocs = await fromUIMessages(uiMessages, {
       threadId: "thread1",
     });
 
@@ -78,7 +78,7 @@ describe("fromUIMessages round-trip tests", () => {
     expect(backToMessageDocs[0].text).toBe("Hi there! How can I help?");
   });
 
-  it("preserves system messages correctly", () => {
+  it("preserves system messages correctly", async () => {
     const originalMessages = [
       baseMessageDoc({
         message: {
@@ -90,7 +90,7 @@ describe("fromUIMessages round-trip tests", () => {
     ];
 
     const uiMessages = toUIMessages(originalMessages);
-    const backToMessageDocs = fromUIMessages(uiMessages, {
+    const backToMessageDocs = await fromUIMessages(uiMessages, {
       threadId: "thread1",
     });
 
@@ -108,7 +108,7 @@ describe("fromUIMessages round-trip tests", () => {
     );
   });
 
-  it("preserves reasoning in assistant messages", () => {
+  it("preserves reasoning in assistant messages", async () => {
     const originalMessages = [
       baseMessageDoc({
         message: {
@@ -130,7 +130,7 @@ describe("fromUIMessages round-trip tests", () => {
     ];
 
     const uiMessages = toUIMessages(originalMessages);
-    const backToMessageDocs = fromUIMessages(uiMessages, {
+    const backToMessageDocs = await fromUIMessages(uiMessages, {
       threadId: "thread1",
     });
 
@@ -152,7 +152,7 @@ describe("fromUIMessages round-trip tests", () => {
     expect(backToMessageDocs[0].reasoning).toBe("Let me think about this...");
   });
 
-  it("handles tool calls and groups them correctly", () => {
+  it("handles tool calls and groups them correctly", async () => {
     // Tool calls get grouped into single UI message but expanded back to multiple message docs
     const originalMessages = [
       baseMessageDoc({
@@ -166,6 +166,7 @@ describe("fromUIMessages round-trip tests", () => {
               type: "tool-call",
               toolName: "calculator",
               toolCallId: "call1",
+              input: { operation: "add", a: 2, b: 3 },
               args: { operation: "add", a: 2, b: 3 },
             },
           ],
@@ -196,7 +197,7 @@ describe("fromUIMessages round-trip tests", () => {
     const toTest = [originalMessages, [...originalMessages].reverse()];
     for (const messages of toTest) {
       const uiMessages = toUIMessages(messages);
-      const backToMessageDocs = fromUIMessages(uiMessages, {
+      const backToMessageDocs = await fromUIMessages(uiMessages, {
         threadId: "thread1",
       });
 
@@ -230,7 +231,7 @@ describe("fromUIMessages round-trip tests", () => {
     }
   });
 
-  it("preserves file attachments in user messages", () => {
+  it("preserves file attachments in user messages", async () => {
     const originalMessages = [
       baseMessageDoc({
         message: {
@@ -252,7 +253,7 @@ describe("fromUIMessages round-trip tests", () => {
     ];
 
     const uiMessages = toUIMessages(originalMessages);
-    const backToMessageDocs = fromUIMessages(uiMessages, {
+    const backToMessageDocs = await fromUIMessages(uiMessages, {
       threadId: "thread1",
     });
 
@@ -277,12 +278,12 @@ describe("fromUIMessages round-trip tests", () => {
       expect(fileContent).toBeDefined();
       expect(fileContent).toMatchObject({
         type: "file",
-        mimeType: "image/png",
+        mediaType: "image/png",
       });
     }
   });
 
-  it("preserves sources correctly", () => {
+  it("preserves sources correctly", async () => {
     const originalMessages = [
       baseMessageDoc({
         message: {
@@ -315,7 +316,7 @@ describe("fromUIMessages round-trip tests", () => {
     ];
 
     const uiMessages = toUIMessages(originalMessages);
-    const backToMessageDocs = fromUIMessages(uiMessages, {
+    const backToMessageDocs = await fromUIMessages(uiMessages, {
       threadId: "thread1",
     });
 
@@ -338,7 +339,7 @@ describe("fromUIMessages round-trip tests", () => {
     });
   });
 
-  it("preserves metadata when provided", () => {
+  it("preserves metadata when provided", async () => {
     const testMetadata = {
       customField: "customValue",
       timestamp: Date.now(),
@@ -356,7 +357,7 @@ describe("fromUIMessages round-trip tests", () => {
     ];
 
     const uiMessages = toUIMessages(originalMessages);
-    const backToMessageDocs = fromUIMessages(uiMessages, {
+    const backToMessageDocs = await fromUIMessages(uiMessages, {
       threadId: "thread1",
     });
 
@@ -367,7 +368,7 @@ describe("fromUIMessages round-trip tests", () => {
     expect(backToMessageDocs[0].metadata).toEqual(testMetadata);
   });
 
-  it("handles streaming status correctly", () => {
+  it("handles streaming status correctly", async () => {
     const originalMessages = [
       baseMessageDoc({
         message: {
@@ -381,7 +382,7 @@ describe("fromUIMessages round-trip tests", () => {
     ];
 
     const uiMessages = toUIMessages(originalMessages);
-    const backToMessageDocs = fromUIMessages(uiMessages, {
+    const backToMessageDocs = await fromUIMessages(uiMessages, {
       threadId: "thread1",
     });
 
@@ -395,13 +396,13 @@ describe("fromUIMessages round-trip tests", () => {
 });
 
 describe("fromUIMessages functionality tests", () => {
-  it("handles empty messages array", () => {
+  it("handles empty messages array", async () => {
     const uiMessages: UIMessage[] = [];
-    const result = fromUIMessages(uiMessages, { threadId: "thread1" });
+    const result = await fromUIMessages(uiMessages, { threadId: "thread1" });
     expect(result).toHaveLength(0);
   });
 
-  it("correctly assigns thread ID", () => {
+  it("correctly assigns thread ID", async () => {
     const uiMessage: UIMessage = {
       id: "test-id",
       _creationTime: Date.now(),
@@ -414,14 +415,14 @@ describe("fromUIMessages functionality tests", () => {
       parts: [{ type: "text", text: "Hello" }],
     };
 
-    const result = fromUIMessages([uiMessage], {
+    const result = await fromUIMessages([uiMessage], {
       threadId: "custom-thread-id",
     });
     expect(result).toHaveLength(1);
     expect(result[0].threadId).toBe("custom-thread-id");
   });
 
-  it("correctly determines tool status", () => {
+  it("correctly determines tool status", async () => {
     const toolUIMessage: UIMessage = {
       id: "tool-id",
       _creationTime: Date.now(),
@@ -442,7 +443,9 @@ describe("fromUIMessages functionality tests", () => {
       ],
     };
 
-    const result = fromUIMessages([toolUIMessage], { threadId: "thread1" });
+    const result = await fromUIMessages([toolUIMessage], {
+      threadId: "thread1",
+    });
     expect(result.length).toBeGreaterThan(0);
 
     // Should have tool messages
@@ -450,7 +453,7 @@ describe("fromUIMessages functionality tests", () => {
     expect(toolMessages.length).toBeGreaterThan(0);
   });
 
-  it("handles tool calls without responses", () => {
+  it("handles tool calls without responses", async () => {
     const toolUIMessage: UIMessage = {
       id: "tool-id",
       _creationTime: Date.now(),
@@ -471,7 +474,9 @@ describe("fromUIMessages functionality tests", () => {
       ],
     };
 
-    const result = fromUIMessages([toolUIMessage], { threadId: "thread1" });
+    const result = await fromUIMessages([toolUIMessage], {
+      threadId: "thread1",
+    });
     expect(result.length).toBeGreaterThan(0);
 
     // Should have tool messages

package/src/mapping.test.ts

@@ -209,4 +209,52 @@ describe("mapping", () => {
     const { fileIds } = await serializeContent(ctx, component, content);
     expect(fileIds).toBeUndefined();
   });
+
+  test("tool-approval-request is preserved after serialization", async () => {
+    const approvalRequest = {
+      type: "tool-approval-request" as const,
+      approvalId: "approval-123",
+      toolCallId: "tool-call-456",
+    };
+    const { content } = await serializeContent(
+      {} as ActionCtx,
+      {} as AgentComponent,
+      [approvalRequest],
+    );
+    expect(content).toHaveLength(1);
+    expect((content as unknown[])[0]).toMatchObject(approvalRequest);
+  });
+
+  test("tool-approval-response with approved: true is preserved", async () => {
+    const approvalResponse = {
+      type: "tool-approval-response" as const,
+      approvalId: "approval-123",
+      approved: true,
+      reason: "User approved",
+    };
+    const { content } = await serializeContent(
+      {} as ActionCtx,
+      {} as AgentComponent,
+      [approvalResponse],
+    );
+    expect(content).toHaveLength(1);
+    expect((content as unknown[])[0]).toMatchObject(approvalResponse);
+  });
+
+  test("tool-approval-response with approved: false is preserved", async () => {
+    const approvalResponse = {
+      type: "tool-approval-response" as const,
+      approvalId: "approval-123",
+      approved: false,
+      reason: "User denied",
+      providerExecuted: false,
+    };
+    const { content } = await serializeContent(
+      {} as ActionCtx,
+      {} as AgentComponent,
+      [approvalResponse],
+    );
+    expect(content).toHaveLength(1);
+    expect((content as unknown[])[0]).toMatchObject(approvalResponse);
+  });
 });