@convex-dev/agent 0.1.16-alpha.1 → 0.1.16-alpha.3

package/src/client/index.ts

@@ -13,7 +13,13 @@ import type {
   ToolSet,
   UserContent,
 } from "ai";
-import { generateObject, generateText, streamObject, streamText } from "ai";
+import {
+  embedMany,
+  generateObject,
+  generateText,
+  streamObject,
+  streamText,
+} from "ai";
 import { assert } from "convex-helpers";
 import {
   internalActionGeneric,
@@ -76,6 +82,7 @@ import type {
   TextArgs,
   Thread,
   UsageHandler,
+  UserActionCtx,
 } from "./types.js";
 
 export { vMessageDoc, vThreadDoc } from "../component/schema.js";
@@ -192,7 +199,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        * log the raw request body or response headers to a table, or logs.
        */
       rawRequestResponseHandler?: RawRequestResponseHandler;
-    }
+    },
   ) {}
 
   /**
@@ -212,7 +219,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        * The userId to associate with the thread. If not provided, the thread will be
        * anonymous.
        */
-      userId?: string;
+      userId?: string | null;
       /**
        * The title of the thread. Not currently used for anything.
        */
@@ -231,7 +238,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        * Overrides any tools passed in the agent constructor.
        */
       tools?: ThreadTools;
-    }
+    },
   ): Promise<{
     threadId: string;
     thread: Thread<ThreadTools extends undefined ? AgentTools : ThreadTools>;
@@ -252,7 +259,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        * The userId to associate with the thread. If not provided, the thread will be
        * anonymous.
        */
-      userId?: string;
+      userId?: string | null;
       /**
        * The title of the thread. Not currently used for anything.
        */
@@ -271,25 +278,25 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        * Overrides any tools passed in the agent constructor.
        */
       tools?: ThreadTools;
-    }
+    },
   ): Promise<{
     threadId: string;
   }>;
   async createThread<ThreadTools extends ToolSet | undefined = undefined>(
     ctx: ActionCtx | RunMutationCtx,
     args?: {
-      userId: string;
+      userId: string | null;
       title?: string;
       summary?: string;
       usageHandler?: UsageHandler;
       tools?: ThreadTools;
-    }
+    },
   ): Promise<{
     threadId: string;
     thread?: Thread<ThreadTools extends undefined ? AgentTools : ThreadTools>;
   }> {
     const threadId = await createThread(ctx, this.component, args);
-    if (!("runAction" in ctx)) {
+    if (!("runAction" in ctx) || "workflowId" in ctx) {
       return { threadId };
     }
     const { thread } = await this.continueThread(ctx, {
@@ -323,7 +330,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        * If supplied, the userId can be used to search across other threads for
        * relevant messages from the same user as context for the LLM calls.
        */
-      userId?: string;
+      userId?: string | null;
       /**
        * The usage handler to use for this thread. Overrides any handler
        * set in the agent constructor.
@@ -334,7 +341,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        * Overrides any tools passed in the agent constructor.
        */
       tools?: ThreadTools;
-    }
+    },
   ): Promise<{
     thread: Thread<ThreadTools extends undefined ? AgentTools : ThreadTools>;
   }> {
@@ -372,7 +379,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       userId?: string | undefined;
       query: string;
       limit?: number;
-    }
+    },
   ): Promise<ThreadDoc[]> {
     return ctx.runQuery(this.component.threads.searchThreadTitles, {
       userId,
@@ -405,7 +412,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       usageHandler,
       tools: threadTools,
     }: {
-      userId?: string;
+      userId?: string | null;
       threadId?: string;
       /**
        * The usage handler to use for this thread. Overrides any handler
@@ -416,24 +423,30 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       tools?: ToolSet;
     },
     args: TextArgs<AgentTools, TOOLS, OUTPUT, OUTPUT_PARTIAL>,
-    options?: Options
+    options?: Options,
   ): Promise<
     GenerateTextResult<TOOLS extends undefined ? AgentTools : TOOLS, OUTPUT> &
       GenerationOutputMetadata
   > {
     const context = await this._saveMessagesAndFetchContext(ctx, args, {
-      userId: argsUserId,
+      userId: argsUserId ?? undefined,
       threadId,
       ...options,
     });
     const { args: aiArgs, messageId, order, userId } = context;
-    const toolCtx = { ...ctx, userId, threadId, messageId, agent: this };
+    const toolCtx = {
+      ...(ctx as UserActionCtx),
+      userId,
+      threadId,
+      messageId,
+      agent: this,
+    };
     const tools = wrapTools(
       toolCtx,
-      args.tools ?? threadTools ?? this.options.tools
+      args.tools ?? threadTools ?? this.options.tools,
     ) as TOOLS extends undefined ? AgentTools : TOOLS;
     const saveOutputMessages = this._shouldSaveOutputMessages(
-      options?.storageOptions
+      options?.storageOptions,
     );
     const trackUsage = usageHandler ?? this.options.usageHandler;
     try {
@@ -515,7 +528,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       /** Note: to get better type inference, pass tools in the next arg */
       tools: threadTools,
     }: {
-      userId?: string;
+      userId?: string | null;
       threadId?: string;
       usageHandler?: UsageHandler;
       tools?: ToolSet;
@@ -540,7 +553,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        * iterating over the text, streaming it over HTTP, etc.
        */
       saveStreamDeltas?: boolean | StreamingOptions;
-    }
+    },
   ): Promise<
     StreamTextResult<
       TOOLS extends undefined ? AgentTools : TOOLS,
@@ -549,18 +562,24 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       GenerationOutputMetadata
   > {
     const context = await this._saveMessagesAndFetchContext(ctx, args, {
-      userId: argsUserId,
+      userId: argsUserId ?? undefined,
       threadId,
       ...options,
     });
     const { args: aiArgs, messageId, order, stepOrder, userId } = context;
-    const toolCtx = { ...ctx, userId, threadId, messageId, agent: this };
+    const toolCtx = {
+      ...(ctx as UserActionCtx),
+      userId,
+      threadId,
+      messageId,
+      agent: this,
+    };
     const tools = wrapTools(
       toolCtx,
-      args.tools ?? threadTools ?? this.options.tools
+      args.tools ?? threadTools ?? this.options.tools,
     ) as TOOLS extends undefined ? AgentTools : TOOLS;
     const saveOutputMessages = this._shouldSaveOutputMessages(
-      options?.storageOptions
+      options?.storageOptions,
     );
     const trackUsage = usageHandler ?? this.options.usageHandler;
     const streamer =
@@ -586,7 +605,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       abortSignal: streamer?.abortController.signal ?? aiArgs.abortSignal,
       experimental_transform: mergeTransforms(
         options?.saveStreamDeltas,
-        args.experimental_transform
+        args.experimental_transform,
       ),
       onChunk: async (event) => {
         await streamer?.addParts([event.chunk]);
@@ -662,7 +681,11 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       userId: argsUserId,
       threadId,
       usageHandler,
-    }: { userId?: string; threadId?: string; usageHandler?: UsageHandler },
+    }: {
+      userId?: string | null;
+      threadId?: string;
+      usageHandler?: UsageHandler;
+    },
     /**
      * The arguments to the generateObject function, similar to the ai.generateObject function.
      */
@@ -671,22 +694,22 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
      * The {@link ContextOptions} and {@link StorageOptions}
      * options to use for fetching contextual messages and saving input/output messages.
      */
-    options?: Options
+    options?: Options,
   ): Promise<GenerateObjectResult<T> & GenerationOutputMetadata> {
     const context = await this._saveMessagesAndFetchContext(ctx, args, {
-      userId: argsUserId,
+      userId: argsUserId ?? undefined,
       threadId,
       ...options,
     });
     const { args: aiArgs, messageId, order, userId } = context;
     const trackUsage = usageHandler ?? this.options.usageHandler;
     const saveOutputMessages = this._shouldSaveOutputMessages(
-      options?.storageOptions
+      options?.storageOptions,
     );
     try {
       const result = (await generateObject(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        aiArgs as any
+        aiArgs as any,
       )) as GenerateObjectResult<T> & GenerationOutputMetadata;
 
       if (threadId && messageId && saveOutputMessages) {
@@ -746,7 +769,11 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       userId: argsUserId,
       threadId,
       usageHandler,
-    }: { userId?: string; threadId?: string; usageHandler?: UsageHandler },
+    }: {
+      userId?: string | null;
+      threadId?: string;
+      usageHandler?: UsageHandler;
+    },
     /**
      * The arguments to the streamObject function, similar to the ai `streamObject` function.
      */
@@ -755,20 +782,20 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
      * The {@link ContextOptions} and {@link StorageOptions}
      * options to use for fetching contextual messages and saving input/output messages.
      */
-    options?: Options
+    options?: Options,
   ): Promise<
     StreamObjectResult<DeepPartial<T>, T, never> & GenerationOutputMetadata
   > {
     // TODO: unify all this shared code between all the generate* and stream* functions
     const context = await this._saveMessagesAndFetchContext(ctx, args, {
-      userId: argsUserId,
+      userId: argsUserId ?? undefined,
       threadId,
       ...options,
     });
     const { args: aiArgs, messageId, order, userId } = context;
     const trackUsage = usageHandler ?? this.options.usageHandler;
     const saveOutputMessages = this._shouldSaveOutputMessages(
-      options?.storageOptions
+      options?.storageOptions,
     );
     const stream = streamObject<T>({
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -847,7 +874,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        * action later that calls `agent.generateAndSaveEmbeddings`.
        */
       skipEmbeddings?: boolean;
-    }
+    },
   ) {
     const { lastMessageId, messages } = await this.saveMessages(ctx, {
       threadId: args.threadId,
@@ -886,7 +913,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        * action later that calls `agent.generateAndSaveEmbeddings`.
        */
       skipEmbeddings?: boolean;
-    }
+    },
   ): Promise<{
     lastMessageId: string;
     messages: MessageDoc[];
@@ -900,25 +927,31 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
     const { skipEmbeddings, ...rest } = args;
     if (args.embeddings) {
       embeddings = args.embeddings;
-    } else if (skipEmbeddings || !("runAction" in ctx)) {
-      embeddings = undefined;
-      if (!skipEmbeddings && this.options.textEmbedding) {
+    } else if (!skipEmbeddings && this.options.textEmbedding) {
+      if (!("runAction" in ctx)) {
         console.warn(
           "You're trying to save messages and generate embeddings, but you're in a mutation. " +
             "Pass `skipEmbeddings: true` to skip generating embeddings in the mutation and skip this warning. " +
             "They will be generated lazily when you generate or stream text / objects. " +
-            "You can explicitly generate them asynchronously by using the scheduler to run an action later that calls `agent.generateAndSaveEmbeddings`."
+            "You can explicitly generate them asynchronously by using the scheduler to run an action later that calls `agent.generateAndSaveEmbeddings`.",
+        );
+      } else if ("workflowId" in ctx) {
+        console.warn(
+          "You're trying to save messages and generate embeddings, but you're in a workflow. " +
+            "Pass `skipEmbeddings: true` to skip generating embeddings in the workflow and skip this warning. " +
+            "They will be generated lazily when you generate or stream text / objects. " +
+            "You can explicitly generate them asynchronously by using the scheduler to run an action later that calls `agent.generateAndSaveEmbeddings`.",
+        );
+      } else {
+        embeddings = await this.generateEmbeddings(
+          ctx,
+          {
+            userId: args.userId ?? undefined,
+            threadId: args.threadId,
+          },
+          args.messages,
         );
       }
-    } else {
-      embeddings = await this.generateEmbeddings(
-        ctx,
-        {
-          userId: args.userId,
-          threadId: args.threadId,
-        },
-        args.messages
-      );
     }
     return saveMessages(ctx, this.component, {
       ...rest,
@@ -944,7 +977,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       paginationOpts: PaginationOptions;
       excludeToolMessages?: boolean;
       statuses?: MessageStatus[];
-    }
+    },
   ): Promise<PaginationResult<MessageDoc>> {
     return listMessages(ctx, this.component, args);
   }
@@ -964,7 +997,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       streamArgs: StreamArgs | undefined;
       // By default, only streaming messages are included.
       includeStatuses?: ("streaming" | "finished" | "aborted")[];
-    }
+    },
   ): Promise<SyncStreamsReturnValue | undefined> {
     return syncStreams(ctx, this.component, args);
   }
@@ -990,7 +1023,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        */
       upToAndIncludingMessageId?: string;
       contextOptions: ContextOptions | undefined;
-    }
+    },
   ): Promise<MessageDoc[]> {
     assert(args.userId || args.threadId, "Specify userId or threadId");
     const opts = this._mergedContextOptions(args.contextOptions);
@@ -1001,17 +1034,17 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
         assert("runAction" in ctx);
         assert(
           this.options.textEmbedding,
-          "A textEmbedding model is required to be set on the Agent that you're doing vector search with"
+          "A textEmbedding model is required to be set on the Agent that you're doing vector search with",
         );
         return {
-          vector: (
+          embedding: (
             await this.doEmbed(ctx, {
               userId: args.userId,
               threadId: args.threadId,
               values: [text],
             })
           ).embeddings[0],
-          vectorModel: this.options.textEmbedding.modelId,
+          embeddingModel: this.options.textEmbedding.modelId,
         };
       },
     });
@@ -1025,7 +1058,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
    */
   async getThreadMetadata(
     ctx: RunQueryCtx,
-    args: { threadId: string }
+    args: { threadId: string },
   ): Promise<ThreadDoc> {
     return getThreadMetadata(ctx, this.component, args);
   }
@@ -1044,11 +1077,11 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       patch: Partial<
         Pick<ThreadDoc, (typeof threadFieldsSupportingPatch)[number]>
       >;
-    }
+    },
   ): Promise<ThreadDoc> {
     const thread = await ctx.runMutation(
       this.component.threads.updateThread,
-      args
+      args,
     );
     return thread;
   }
@@ -1067,7 +1100,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       userId: string | undefined;
       threadId: string | undefined;
     },
-    messages: CoreMessage[]
+    messages: CoreMessage[],
   ) {
     if (!this.options.textEmbedding) {
       return undefined;
@@ -1122,7 +1155,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
     ctx: RunActionCtx,
     args: {
       messageIds: string[];
-    }
+    },
   ) {
     const messages = (
       await ctx.runQuery(this.component.messages.getMessagesByIds, {
@@ -1134,16 +1167,20 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
         "Some messages were not found: " +
           args.messageIds
             .filter((id) => !messages.some((m) => m?._id === id))
-            .join(", ")
+            .join(", "),
       );
     }
+    await this._generateAndSaveEmbeddings(ctx, messages);
+  }
+
+  async _generateAndSaveEmbeddings(ctx: RunActionCtx, messages: MessageDoc[]) {
     if (messages.some((m) => !m.message)) {
       throw new Error(
         "Some messages don't have a message: " +
-          args.messageIds
-            .map((id, i) => (!messages[i].message ? id : undefined))
-            .filter((id): id is string => id !== undefined)
-            .join(", ")
+          messages
+            .filter((m) => !m.message)
+            .map((m) => m._id)
+            .join(", "),
       );
     }
     const messagesMissingEmbeddings = messages.filter((m) => !m.embeddingId);
@@ -1156,17 +1193,17 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
         userId: messagesMissingEmbeddings[0]!.userId,
         threadId: messagesMissingEmbeddings[0]!.threadId,
       },
-      messagesMissingEmbeddings.map((m) => m!.message!)
+      messagesMissingEmbeddings.map((m) => m!.message!),
     );
     if (!embeddings) {
       if (!this.options.textEmbedding) {
         throw new Error(
-          "No embeddings were generated for the messages. You must pass a textEmbedding model to the agent constructor."
+          "No embeddings were generated for the messages. You must pass a textEmbedding model to the agent constructor.",
         );
       }
       throw new Error(
         "No embeddings were generated for these messages: " +
-          messagesMissingEmbeddings.map((m) => m!._id).join(", ")
+          messagesMissingEmbeddings.map((m) => m!._id).join(", "),
       );
     }
     await ctx.runMutation(this.component.vector.index.insertBatch, {
@@ -1181,7 +1218,8 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
           vector: embeddings.vectors[i],
         }))
         .filter(
-          (v): v is Extract<typeof v, { vector: number[] }> => v.vector !== null
+          (v): v is Extract<typeof v, { vector: number[] }> =>
+            v.vector !== null,
         ),
     });
   }
@@ -1214,7 +1252,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
        * Defaults to the chat provider for the Agent.
        */
       provider?: string;
-    }
+    },
   ): Promise<{ messages: MessageDoc[]; pending?: MessageDoc }> {
     const messages = await serializeNewMessagesInStep(
       ctx,
@@ -1223,12 +1261,12 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       {
         provider: args.provider ?? this.options.chat.provider,
         model: args.model ?? this.options.chat.modelId,
-      }
+      },
     );
     const embeddings = await this.generateEmbeddings(
       ctx,
       { userId: args.userId, threadId: args.threadId },
-      messages.map((m) => m.message)
+      messages.map((m) => m.message),
     );
     const saved = await ctx.runMutation(this.component.messages.addMessages, {
       userId: args.userId,
@@ -1259,7 +1297,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       provider: string | undefined;
       result: GenerateObjectResult<unknown>;
       metadata?: Omit<MessageWithMetadata, "message">;
-    }
+    },
   ): Promise<void> {
     const { messages } = await serializeObjectResult(
       ctx,
@@ -1268,12 +1306,12 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       {
         model: args.model ?? this.options.chat.modelId,
         provider: args.provider ?? this.options.chat.provider,
-      }
+      },
     );
     const embeddings = await this.generateEmbeddings(
       ctx,
       { userId: args.userId, threadId: args.threadId },
-      messages.map((m) => m.message)
+      messages.map((m) => m.message),
     );
 
     await ctx.runMutation(this.component.messages.addMessages, {
@@ -1302,7 +1340,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       threadId: string;
       messageId: string;
       result: { kind: "error"; error: string } | { kind: "success" };
-    }
+    },
   ): Promise<void> {
     const result = args.result;
     if (result.kind === "success") {
@@ -1346,12 +1384,12 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
          */
         fileIds?: string[];
       };
-    }
+    },
   ): Promise<void> {
     const { message, fileIds } = await serializeMessage(
       ctx,
       this.component,
-      args.patch.message
+      args.patch.message,
     );
     await ctx.runMutation(this.component.messages.updateMessage, {
       messageId: args.messageId,
@@ -1376,7 +1414,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
     ctx: RunMutationCtx,
     args: {
       messageIds: string[];
-    }
+    },
   ): Promise<void> {
     await ctx.runMutation(this.component.messages.deleteByIds, args);
   }
@@ -1391,7 +1429,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
     ctx: RunMutationCtx,
     args: {
       messageId: string;
-    }
+    },
   ): Promise<void> {
     await ctx.runMutation(this.component.messages.deleteByIds, {
       messageIds: [args.messageId],
@@ -1443,7 +1481,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       startStepOrder?: number;
       endOrder: number;
       endStepOrder?: number;
-    }
+    },
   ): Promise<void> {
     await ctx.runMutation(this.component.messages.deleteByOrder, {
       threadId: args.threadId,
@@ -1466,7 +1504,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
     args: {
       threadId: string;
       pageSize?: number;
-    }
+    },
   ): Promise<void> {
     await ctx.runMutation(this.component.threads.deleteAllForThreadIdAsync, {
       threadId: args.threadId,
@@ -1486,7 +1524,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
     args: {
       threadId: string;
       pageSize?: number;
-    }
+    },
   ): Promise<void> {
     await ctx.runAction(this.component.threads.deleteAllForThreadIdSync, {
       threadId: args.threadId,
@@ -1515,7 +1553,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
     }: {
       userId: string | undefined;
       threadId: string | undefined;
-    } & Options
+    } & Options,
   ): Promise<{
     args: T & { model: LanguageModelV1 };
     userId: string | undefined;
@@ -1570,7 +1608,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
         userId,
         messages: coreMessages,
         metadata: coreMessages.map((_, i) =>
-          i === coreMessages.length - 1 ? { id: args.id } : {}
+          i === coreMessages.length - 1 ? { id: args.id } : {},
         ),
         failPendingSteps: true,
       });
@@ -1585,9 +1623,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       // embeddings yet. This can happen if the message was saved in a mutation
       // where the LLM is not available.
       if (!promptMessage.embeddingId && this.options.textEmbedding) {
-        await this.generateAndSaveEmbeddings(ctx, {
-          messageIds: [promptMessage._id],
-        });
+        await this._generateAndSaveEmbeddings(ctx, [promptMessage]);
       }
     }
 
@@ -1643,29 +1679,29 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
       threadId: string | undefined;
       values: string[];
       abortSignal?: AbortSignal;
-      headers?: Record<string, string | undefined>;
-    }
+      headers?: Record<string, string>;
+    },
   ): Promise<{ embeddings: number[][] }> {
-    const embedding = this.options.textEmbedding;
+    const embeddingModel = this.options.textEmbedding;
     assert(
-      embedding,
-      "a textEmbedding model is required to be set on the Agent that you're doing vector search with"
+      embeddingModel,
+      "a textEmbedding model is required to be set on the Agent that you're doing vector search with",
     );
-    const result = await embedding.doEmbed({
+    const result = await embedMany({
+      model: embeddingModel,
       values: options.values,
       abortSignal: options.abortSignal,
       headers: options.headers,
+      maxRetries: this.options.maxRetries,
     });
     if (this.options.usageHandler && result.usage) {
       await this.options.usageHandler(ctx, {
         userId: options.userId,
         threadId: options.threadId,
         agentName: this.options.name,
-        model: embedding.modelId,
-        provider: embedding.provider,
-        providerMetadata: result.rawResponse
-          ? { [embedding.provider]: result.rawResponse }
-          : undefined,
+        model: embeddingModel.modelId,
+        provider: embeddingModel.provider,
+        providerMetadata: undefined,
         usage: {
           promptTokens: result.usage.tokens,
           completionTokens: 0,
@@ -1682,7 +1718,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
    * able to access localhost URLs.
    */
   private async _inlineMessagesFiles(
-    messages: CoreMessage[]
+    messages: CoreMessage[],
   ): Promise<CoreMessage[]> {
     // Process each message to convert localhost URLs to base64
     return Promise.all(
@@ -1700,7 +1736,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
             if (part.type === "image" && part.image instanceof URL) {
               assert(
                 message.role === "user",
-                "Images can only be in user messages"
+                "Images can only be in user messages",
               );
               if (this._isLocalhostUrl(part.image)) {
                 const imageData = await this._downloadFile(part.image);
@@ -1723,7 +1759,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
             }
 
             return part;
-          })
+          }),
         );
         if (message.role === "user") {
           return {
@@ -1736,7 +1772,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
             content: processedContent as AssistantContent,
           };
         }
-      })
+      }),
     );
   }
 
@@ -1888,7 +1924,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
     options?: {
       contextOptions?: ContextOptions;
       storageOptions?: StorageOptions;
-    }
+    },
   ) {
     const maxSteps = spec?.maxSteps ?? this.options.maxSteps;
     return internalActionGeneric({
@@ -1912,7 +1948,7 @@ export class Agent<AgentTools extends ToolSet = ToolSet> {
               storageOptions ??
               options?.storageOptions ??
               this.options.storageOptions,
-          }
+          },
         );
         return {
           object: value.object as T,
@@ -1983,14 +2019,18 @@ export async function createThread(
   ctx: RunMutationCtx,
   component: AgentComponent,
   args?: {
-    userId?: string;
+    userId?: string | null;
     title?: string;
     summary?: string;
-  }
+  },
 ) {
   const { _id: threadId } = await ctx.runMutation(
     component.threads.createThread,
-    { userId: args?.userId, title: args?.title, summary: args?.summary }
+    {
+      userId: args?.userId ?? undefined,
+      title: args?.title,
+      summary: args?.summary,
+    },
   );
   return threadId;
 }
@@ -2004,7 +2044,7 @@ export async function createThread(
 export async function getThreadMetadata(
   ctx: RunQueryCtx,
   component: AgentComponent,
-  args: { threadId: string }
+  args: { threadId: string },
 ): Promise<ThreadDoc> {
   const thread = await ctx.runQuery(component.threads.getThread, {
     threadId: args.threadId,
@@ -2017,7 +2057,7 @@ export async function getThreadMetadata(
 
 type SaveMessagesArgs = {
   threadId: string;
-  userId?: string;
+  userId?: string | null;
   /**
    * The message that these messages are in response to. They will be
    * the same "order" as this message, at increasing stepOrder(s).
@@ -2060,7 +2100,7 @@ export async function saveMessages(
      * The agent name to associate with the messages.
      */
     agentName?: string;
-  }
+  },
 ) {
   let embeddings: MessageEmbeddings | undefined;
   if (args.embeddings) {
@@ -2076,7 +2116,7 @@ export async function saveMessages(
   }
   const result = await ctx.runMutation(component.messages.addMessages, {
     threadId: args.threadId,
-    userId: args.userId,
+    userId: args.userId ?? undefined,
     agentName: args.agentName,
     promptMessageId: args.promptMessageId,
     embeddings,
@@ -2088,7 +2128,7 @@ export async function saveMessages(
           message,
           fileIds,
         } as MessageWithMetadata;
-      })
+      }),
     ),
     failPendingSteps: args.failPendingSteps ?? false,
     pending: args.pending ?? false,
@@ -2101,7 +2141,7 @@ export async function saveMessages(
 
 type SaveMessageArgs = {
   threadId: string;
-  userId?: string;
+  userId?: string | null;
   /**
    * Metadata to save with the messages. Each element corresponds to the
    * message at the same index.
@@ -2146,7 +2186,7 @@ export async function saveMessage(
      * The agent name to associate with the message.
      */
     agentName?: string;
-  }
+  },
 ) {
   let embeddings:
     | {
@@ -2162,7 +2202,7 @@ export async function saveMessage(
   }
   const { lastMessageId, messages } = await saveMessages(ctx, component, {
     threadId: args.threadId,
-    userId: args.userId,
+    userId: args.userId ?? undefined,
     agentName: args.agentName,
     messages:
       args.prompt !== undefined