@convex-dev/agent 0.1.18-alpha.1 → 0.2.0-alpha.2

package/dist/client/index.js

@@ -1,24 +1,28 @@
-import { embedMany, generateObject, generateText, streamObject, streamText, } from "ai";
+import { embedMany, generateObject, generateText, stepCountIs, streamObject, streamText, } from "ai";
 import { assert, omit, pick } from "convex-helpers";
 import { internalActionGeneric, internalMutationGeneric, } from "convex/server";
 import { v } from "convex/values";
 import { validateVectorDimension, } from "../component/vector/tables.js";
-import { deserializeMessage, promptOrMessagesToCoreMessages, serializeMessage, serializeNewMessagesInStep, serializeObjectResult, } from "../mapping.js";
+import { deserializeMessage, serializeMessage, serializeNewMessagesInStep, serializeObjectResult, } from "../mapping.js";
 import { extractText, isTool } from "../shared.js";
-import { vMessageWithMetadata, vSafeObjectArgs, vTextArgs, } from "../validators.js";
+import { vMessageEmbeddings, vMessageWithMetadata, vSafeObjectArgs, vTextArgs, } from "../validators.js";
 import { createTool, wrapTools } from "./createTool.js";
-import { listMessages } from "./listMessages.js";
-import { fetchContextMessages } from "./search.js";
+import { listMessages, saveMessages, } from "./messages.js";
+import { createThread, getThreadMetadata } from "./threads.js";
+import { fetchContextMessages, getModelName, getProviderName, } from "./search.js";
 import { DeltaStreamer, mergeTransforms, syncStreams, } from "./streaming.js";
+export { stepCountIs } from "ai";
 export { vMessageDoc, vThreadDoc } from "../component/schema.js";
-export { serializeDataOrUrl } from "../mapping.js";
+export { serializeDataOrUrl, deserializeMessage, serializeMessage, } from "../mapping.js";
 // NOTE: these are also exported via @convex-dev/agent/validators
 // a future version may put them all here or move these over there
 export { vAssistantMessage, vContextOptions, vMessage, vPaginationResult, vProviderMetadata, vStorageOptions, vStreamArgs, vSystemMessage, vToolMessage, vUsage, vUserMessage, } from "../validators.js";
 export { getFile, storeFile } from "./files.js";
-export { filterOutOrphanedToolMessages } from "./search.js";
-export { abortStream, listStreams } from "./streaming.js";
-export { createTool, extractText, fetchContextMessages, isTool, listMessages, syncStreams, };
+export { filterOutOrphanedToolMessages, fetchContextMessages, } from "./search.js";
+export { abortStream, listStreams, syncStreams } from "./streaming.js";
+export { listMessages, saveMessage, saveMessages, } from "./messages.js";
+export { createThread, getThreadMetadata } from "./threads.js";
+export { createTool, extractText, isTool };
 export { definePlaygroundAPI, } from "./definePlaygroundAPI.js";
 export class Agent {
     component;
@@ -38,10 +42,7 @@ export class Agent {
             usageHandler: args?.usageHandler,
             tools: args?.tools,
         });
-        return {
-            threadId,
-            thread,
-        };
+        return { threadId, thread };
     }
     /**
      * Continues a thread using this agent. Note: threads can be continued
@@ -69,18 +70,6 @@ export class Agent {
             },
         };
     }
-    /**
-     * Search for threads by title, paginated.
-     * @param ctx The context passed from the query/mutation/action.
-     * @returns The threads matching the search, paginated.
-     */
-    async searchThreadTitles(ctx, { userId, query, limit, }) {
-        return ctx.runQuery(this.component.threads.searchThreadTitles, {
-            userId,
-            query,
-            limit: limit ?? 10,
-        });
-    }
     /**
      * This behaves like {@link generateText} from the "ai" package except that
      * it add context based on the userId and threadId and saves the input and
@@ -93,14 +82,15 @@ export class Agent {
      * for the {@link ContextOptions} and {@link StorageOptions}.
      * @returns The result of the generateText function.
      */
-    async generateText(ctx, { userId: argsUserId, threadId, usageHandler, tools: threadTools, }, args, options) {
-        const opts = { ...this.options, ...options, usageHandler };
+    async generateText(ctx, { userId: argsUserId, threadId, tools: threadTools, ...usageHandler }, args, options) {
+        const opts = { ...this.options, ...options, ...usageHandler };
         const context = await this._saveMessagesAndFetchContext(ctx, args, {
             userId: argsUserId ?? undefined,
             threadId,
             ...opts,
         });
         const { args: aiArgs, messageId, order, userId } = context;
+        const messages = context.savedMessages ?? [];
         const toolCtx = {
             ...ctx,
             userId,
@@ -113,12 +103,12 @@ export class Agent {
         try {
             const result = (await generateText({
                 // Can be overridden
-                maxSteps: this.options.maxSteps,
+                stopWhen: this.options.stopWhen,
                 ...aiArgs,
                 tools,
                 onStepFinish: async (step) => {
                     if (threadId && messageId && saveOutput) {
-                        await this.saveStep(ctx, {
+                        const saved = await this.saveStep(ctx, {
                             userId,
                             threadId,
                             promptMessageId: messageId,
@@ -126,6 +116,7 @@ export class Agent {
                             provider: aiArgs.model.provider,
                             step,
                         });
+                        messages.push(...saved.messages);
                     }
                     if (this.options.rawRequestResponseHandler) {
                         await this.options.rawRequestResponseHandler(ctx, {
@@ -152,6 +143,7 @@ export class Agent {
             }));
             result.messageId = messageId;
             result.order = order;
+            result.messages = messages;
             return result;
         }
         catch (error) {
@@ -172,9 +164,9 @@ export class Agent {
      * Use {@link continueThread} to get a version of this function already scoped
      * to a thread (and optionally userId).
      */
-    async streamText(ctx, { userId: argsUserId, threadId, usageHandler, 
+    async streamText(ctx, { userId: argsUserId, threadId, 
     /** Note: to get better type inference, pass tools in the next arg */
-    tools: threadTools, }, 
+    tools: threadTools, ...usageHandler }, 
     /**
      * The arguments to the streamText function, similar to the ai `streamText` function.
      */
@@ -184,13 +176,14 @@ export class Agent {
      * options to use for fetching contextual messages and saving input/output messages.
      */
     options) {
-        const opts = { ...this.options, ...options, usageHandler };
+        const opts = { ...this.options, ...options, ...usageHandler };
         const context = await this._saveMessagesAndFetchContext(ctx, args, {
             userId: argsUserId ?? undefined,
             threadId,
             ...opts,
         });
         const { args: aiArgs, messageId, order, stepOrder, userId } = context;
+        const messages = context.savedMessages ?? [];
         const toolCtx = {
             ...ctx,
             userId,
@@ -214,8 +207,8 @@ export class Agent {
             })
             : undefined;
         const result = streamText({
-            // Can be overridden
-            maxSteps: this.options.maxSteps,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            stopWhen: this.options.stopWhen, // Can be overridden
             ...aiArgs,
             tools,
             abortSignal: streamer?.abortController.signal ?? aiArgs.abortSignal,
@@ -248,6 +241,7 @@ export class Agent {
                         step,
                     });
                     await streamer?.finish(saved.messages);
+                    messages.push(...saved.messages);
                 }
                 if (this.options.rawRequestResponseHandler) {
                     await this.options.rawRequestResponseHandler(ctx, {
@@ -274,6 +268,7 @@ export class Agent {
         });
         result.messageId = messageId;
         result.order = order;
+        result.messages = messages;
         return result;
     }
     /**
@@ -283,7 +278,7 @@ export class Agent {
      * Use {@link continueThread} to get a version of this function already scoped
      * to a thread (and optionally userId).
      */
-    async generateObject(ctx, { userId: argsUserId, threadId, usageHandler, }, 
+    async generateObject(ctx, { userId: argsUserId, threadId, ...usageHandler }, 
     /**
      * The arguments to the generateObject function, similar to the ai.generateObject function.
      */
@@ -293,20 +288,21 @@ export class Agent {
      * options to use for fetching contextual messages and saving input/output messages.
      */
     options) {
-        const opts = { ...this.options, ...options, usageHandler };
+        const opts = { ...this.options, ...options, ...usageHandler };
         const context = await this._saveMessagesAndFetchContext(ctx, args, {
             userId: argsUserId ?? undefined,
             threadId,
             ...opts,
         });
         const { args: aiArgs, messageId, order, userId } = context;
+        const messages = context.savedMessages ?? [];
         const saveOutput = opts.storageOptions?.saveMessages !== "none";
         try {
             const result = (await generateObject(
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             aiArgs));
             if (threadId && messageId && saveOutput) {
-                await this.saveObject(ctx, {
+                const saved = await this.saveObject(ctx, {
                     threadId,
                     promptMessageId: messageId,
                     result,
@@ -314,9 +310,11 @@ export class Agent {
                     model: aiArgs.model.modelId,
                     provider: aiArgs.model.provider,
                 });
+                messages.push(...saved.messages);
             }
             result.messageId = messageId;
             result.order = order;
+            result.messages = messages;
             if (this.options.rawRequestResponseHandler) {
                 await this.options.rawRequestResponseHandler(ctx, {
                     userId,
@@ -356,7 +354,7 @@ export class Agent {
      * Use {@link continueThread} to get a version of this function already scoped
      * to a thread (and optionally userId).
      */
-    async streamObject(ctx, { userId: argsUserId, threadId, usageHandler, }, 
+    async streamObject(ctx, { userId: argsUserId, threadId, ...usageHandler }, 
     /**
      * The arguments to the streamObject function, similar to the ai `streamObject` function.
      */
@@ -367,14 +365,16 @@ export class Agent {
      */
     options) {
         // TODO: unify all this shared code between all the generate* and stream* functions
-        const opts = { ...this.options, ...options, usageHandler };
+        const opts = { ...this.options, ...options, ...usageHandler };
         const context = await this._saveMessagesAndFetchContext(ctx, args, {
             userId: argsUserId ?? undefined,
             threadId,
             ...opts,
         });
         const { args: aiArgs, messageId, order, userId } = context;
+        const messages = context.savedMessages ?? [];
         const saveOutput = opts.storageOptions?.saveMessages !== "none";
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const stream = streamObject({
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             ...aiArgs,
@@ -384,7 +384,7 @@ export class Agent {
             },
             onFinish: async (result) => {
                 if (threadId && messageId && saveOutput) {
-                    await this.saveObject(ctx, {
+                    const saved = await this.saveObject(ctx, {
                         userId,
                         threadId,
                         promptMessageId: messageId,
@@ -396,13 +396,12 @@ export class Agent {
                             request: await stream.request,
                             response: result.response,
                             providerMetadata: result.providerMetadata,
-                            experimental_providerMetadata: result.experimental_providerMetadata,
-                            logprobs: undefined,
                             toJsonResponse: stream.toTextStreamResponse,
                         },
                         model: aiArgs.model.modelId,
                         provider: aiArgs.model.provider,
                     });
+                    messages.push(...saved.messages);
                 }
                 if (opts.usageHandler && result.usage) {
                     await opts.usageHandler(ctx, {
@@ -430,6 +429,7 @@ export class Agent {
         });
         stream.messageId = messageId;
         stream.order = order;
+        stream.messages = messages;
         return stream;
     }
     /**
@@ -440,14 +440,11 @@ export class Agent {
      * @returns The messageId of the saved message.
      */
     async saveMessage(ctx, args) {
-        const { lastMessageId, messages } = await this.saveMessages(ctx, {
+        const { messages } = await this.saveMessages(ctx, {
             threadId: args.threadId,
             userId: args.userId,
             embeddings: args.embedding
-                ? {
-                    model: args.embedding.model,
-                    vectors: [args.embedding.vector],
-                }
+                ? { model: args.embedding.model, vectors: [args.embedding.vector] }
                 : undefined,
             messages: args.prompt !== undefined
                 ? [{ role: "user", content: args.prompt }]
@@ -455,7 +452,8 @@ export class Agent {
             metadata: args.metadata ? [args.metadata] : undefined,
             skipEmbeddings: args.skipEmbeddings,
         });
-        return { messageId: lastMessageId, message: messages.at(-1) };
+        const message = messages.at(-1);
+        return { messageId: message._id, message };
     }
     /**
      * Explicitly save messages associated with the thread (& user if provided)
@@ -485,10 +483,7 @@ export class Agent {
                     "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);
+                embeddings = await this.generateEmbeddings(ctx, { userId: args.userId ?? undefined, threadId: args.threadId }, args.messages);
             }
         }
         return saveMessages(ctx, this.component, {
@@ -547,7 +542,7 @@ export class Agent {
                         threadId: args.threadId,
                         values: [text],
                     })).embeddings[0],
-                    embeddingModel: this.options.textEmbedding.modelId,
+                    embeddingModel: this.options.textEmbedding,
                 };
             },
         });
@@ -596,7 +591,6 @@ export class Agent {
             threadId,
             values: messageTexts,
         });
-        // TODO: record usage of embeddings
         // Then assemble the embeddings into a single array with nulls for the messages without text.
         const embeddingsOrNull = Array(messages.length).fill(null);
         textIndexes.forEach((i, j) => {
@@ -605,11 +599,8 @@ export class Agent {
         if (textEmbeddings.embeddings.length > 0) {
             const dimension = textEmbeddings.embeddings[0].length;
             validateVectorDimension(dimension);
-            embeddings = {
-                vectors: embeddingsOrNull,
-                dimension,
-                model: this.options.textEmbedding.modelId,
-            };
+            const model = getModelName(this.options.textEmbedding);
+            embeddings = { vectors: embeddingsOrNull, dimension, model };
         }
         return embeddings;
     }
@@ -647,7 +638,7 @@ export class Agent {
         const embeddings = await this.generateEmbeddings(ctx, {
             userId: messagesMissingEmbeddings[0].userId,
             threadId: messagesMissingEmbeddings[0].threadId,
-        }, messagesMissingEmbeddings.map((m) => m.message));
+        }, messagesMissingEmbeddings.map((m) => deserializeMessage(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.");
@@ -676,11 +667,11 @@ export class Agent {
      */
     async saveStep(ctx, args) {
         const messages = await serializeNewMessagesInStep(ctx, this.component, args.step, {
-            provider: args.provider ?? this.options.chat.provider,
-            model: args.model ?? this.options.chat.modelId,
+            provider: args.provider ?? getProviderName(this.options.chat),
+            model: args.model ?? getModelName(this.options.chat),
         });
         const embeddings = await this.generateEmbeddings(ctx, { userId: args.userId, threadId: args.threadId }, messages.map((m) => m.message));
-        const saved = await ctx.runMutation(this.component.messages.addMessages, {
+        return ctx.runMutation(this.component.messages.addMessages, {
             userId: args.userId,
             threadId: args.threadId,
             agentName: this.options.name,
@@ -689,7 +680,6 @@ export class Agent {
             embeddings,
             failPendingSteps: false,
         });
-        return saved;
     }
     /**
      * Manually save the result of a generateObject call to the thread.
@@ -700,11 +690,11 @@ export class Agent {
      */
     async saveObject(ctx, args) {
         const { messages } = await serializeObjectResult(ctx, this.component, args.result, {
-            model: args.model ?? this.options.chat.modelId,
-            provider: args.provider ?? this.options.chat.provider,
+            model: args.model ?? getModelName(this.options.chat),
+            provider: args.provider ?? getProviderName(this.options.chat),
         });
-        const embeddings = await this.generateEmbeddings(ctx, { userId: args.userId, threadId: args.threadId }, messages.map((m) => m.message));
-        await ctx.runMutation(this.component.messages.addMessages, {
+        const embeddings = await this.generateEmbeddings(ctx, { userId: args.userId, threadId: args.threadId }, messages.map((m) => deserializeMessage(m.message)));
+        return ctx.runMutation(this.component.messages.addMessages, {
             userId: args.userId,
             threadId: args.threadId,
             promptMessageId: args.promptMessageId,
@@ -712,7 +702,6 @@ export class Agent {
             messages,
             embeddings,
             agentName: this.options.name,
-            pending: false,
         });
     }
     /**
@@ -814,7 +803,7 @@ export class Agent {
      * @param args The range of messages to delete.
      */
     async deleteMessageRange(ctx, args) {
-        await ctx.runMutation(this.component.messages.deleteByOrder, {
+        return ctx.runMutation(this.component.messages.deleteByOrder, {
             threadId: args.threadId,
             startOrder: args.startOrder,
             startStepOrder: args.startStepOrder,
@@ -850,7 +839,12 @@ export class Agent {
     }
     async _saveMessagesAndFetchContext(ctx, args, { userId: argsUserId, threadId, contextOptions, storageOptions, }) {
         // If only a promptMessageId is provided, this will be empty.
-        const messages = promptOrMessagesToCoreMessages(args);
+        const messages = args.messages ?? [];
+        const prompt = !args.prompt
+            ? []
+            : Array.isArray(args.prompt)
+                ? args.prompt
+                : [{ role: "user", content: args.prompt }];
         const userId = argsUserId ??
             (threadId &&
                 (await ctx.runQuery(this.component.threads.getThread, { threadId }))
@@ -865,40 +859,42 @@ export class Agent {
         });
         // If it was a promptMessageId, pop it off context messages
         // and add to the end of messages.
-        // TODO: slice it from the prompt message, to append all of them
-        const promptMessage = !!args.promptMessageId &&
-            contextMessages.at(-1)?._id === args.promptMessageId
-            ? contextMessages.pop()
+        const promptMessageIndex = args.promptMessageId
+            ? contextMessages.findIndex((m) => m._id === args.promptMessageId)
+            : -1;
+        const promptMessage = promptMessageIndex !== -1
+            ? contextMessages.splice(promptMessageIndex, 1)[0]
             : undefined;
-        if (promptMessage && args.prompt) {
-            // If they specify both a promptMessageId and a prompt, we prefer
-            // the prompt to stand in for the promptMessageId message.
-            promptMessage.message = { role: "user", content: args.prompt };
-        }
         let messageId = promptMessage?._id;
         let order = promptMessage?.order;
         let stepOrder = promptMessage?.stepOrder;
+        let savedMessages = undefined;
         if (threadId &&
-            messages.length &&
+            messages.length + prompt.length &&
             storageOptions?.saveMessages !== "none" &&
             // If it was a promptMessageId, we don't want to save it again.
             (!args.promptMessageId || storageOptions?.saveMessages === "all")) {
             const saveAll = storageOptions?.saveMessages === "all";
-            const coreMessages = saveAll ? messages : messages.slice(-1);
+            const coreMessages = [...messages, ...prompt];
+            const toSave = saveAll ? coreMessages : coreMessages.slice(-1);
+            const metadata = Array.from({ length: toSave.length }, () => ({}));
             const saved = await this.saveMessages(ctx, {
                 threadId,
                 userId,
-                messages: coreMessages,
-                metadata: coreMessages.map((_, i) => i === coreMessages.length - 1 ? { id: args.id } : {}),
+                messages: toSave,
+                metadata,
                 failPendingSteps: true,
             });
-            messageId = saved.lastMessageId;
-            order = saved.messages.at(-1)?.order;
-            stepOrder = saved.messages.at(-1)?.stepOrder;
+            messageId = saved.messages.at(-1)._id;
+            order = saved.messages.at(-1).order;
+            stepOrder = saved.messages.at(-1).stepOrder;
+            savedMessages = saved.messages;
         }
         if (promptMessage?.message) {
-            // Add the message after saving the messages, so it's not saved again.
-            messages.push(deserializeMessage(promptMessage.message));
+            if (!args.prompt) {
+                // If they override the prompt, we skip the existing prompt message.
+                messages.push(deserializeMessage(promptMessage.message));
+            }
             // Lazily generate embeddings for the prompt message, if it doesn't have
             // embeddings yet. This can happen if the message was saved in a mutation
             // where the LLM is not available.
@@ -906,10 +902,26 @@ export class Agent {
                 await this._generateAndSaveEmbeddings(ctx, [promptMessage]);
             }
         }
+        const prePrompt = contextMessages.map((m) => deserializeMessage(m.message));
+        let existingResponses = [];
+        if (promptMessageIndex !== -1) {
+            // pull any messages that already responded to the prompt off
+            // and add them after the prompt
+            existingResponses = prePrompt.splice(promptMessageIndex);
+        }
         let processedMessages = [
-            ...contextMessages.map((m) => deserializeMessage(m.message)),
+            ...prePrompt,
             ...messages,
+            ...prompt,
+            ...existingResponses,
         ];
+        if (promptMessageIndex === -1) {
+            processedMessages.push(...prompt);
+        }
+        else {
+            // We add the prompt where the prompt message was
+            processedMessages.splice(promptMessageIndex, 0, ...prompt);
+        }
         // Process messages to inline localhost files (if not, file urls pointing to localhost will be sent to LLM providers)
         if (process.env.CONVEX_CLOUD_URL?.startsWith("http://127.0.0.1")) {
             processedMessages = await this._inlineMessagesFiles(processedMessages);
@@ -917,14 +929,15 @@ export class Agent {
         const { prompt: _, model, ...rest } = args;
         return {
             args: {
+                ...this.options.callSettings,
                 ...rest,
-                maxRetries: args.maxRetries ?? this.options.maxRetries,
                 model: model ?? this.options.chat,
                 system: args.system ?? this.options.instructions,
                 messages: processedMessages,
             },
             userId,
             messageId,
+            savedMessages,
             order,
             stepOrder,
         };
@@ -933,23 +946,23 @@ export class Agent {
         const embeddingModel = this.options.textEmbedding;
         assert(embeddingModel, "a textEmbedding model is required to be set on the Agent that you're doing vector search with");
         const result = await embedMany({
+            ...this.options.callSettings,
             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: embeddingModel.modelId,
-                provider: embeddingModel.provider,
+                model: getModelName(embeddingModel),
+                provider: getProviderName(embeddingModel),
                 providerMetadata: undefined,
                 usage: {
-                    promptTokens: result.usage.tokens,
-                    completionTokens: 0,
+                    inputTokens: result.usage.tokens,
+                    outputTokens: 0,
                     totalTokens: result.usage.tokens,
                 },
             });
@@ -974,35 +987,23 @@ export class Agent {
                     assert(message.role === "user", "Images can only be in user messages");
                     if (this._isLocalhostUrl(part.image)) {
                         const imageData = await this._downloadFile(part.image);
-                        return {
-                            ...part,
-                            image: imageData,
-                        };
+                        return { ...part, image: imageData };
                     }
                 }
                 // Handle file parts
                 if (part.type === "file" && part.data instanceof URL) {
                     if (this._isLocalhostUrl(part.data)) {
                         const fileData = await this._downloadFile(part.data);
-                        return {
-                            ...part,
-                            data: fileData,
-                        };
+                        return { ...part, data: fileData };
                     }
                 }
                 return part;
             }));
             if (message.role === "user") {
-                return {
-                    ...message,
-                    content: processedContent,
-                };
+                return { ...message, content: processedContent };
             }
             else {
-                return {
-                    ...message,
-                    content: processedContent,
-                };
+                return { ...message, content: processedContent };
             }
         }));
     }
@@ -1064,19 +1065,27 @@ export class Agent {
      * Create an action out of this agent so you can call it from workflows or other actions
      * without a wrapping function.
      * @param spec Configuration for the agent acting as an action, including
-     *   {@link ContextOptions}, {@link StorageOptions}, and maxSteps.
+     *   {@link ContextOptions}, {@link StorageOptions}, and {@link stopWhen}.
      */
     asTextAction(spec) {
-        const maxSteps = spec?.maxSteps ?? this.options.maxSteps;
+        const stopWhen = spec?.stopWhen ?? this.options.stopWhen;
         return internalActionGeneric({
             args: vTextArgs,
             handler: async (ctx_, args) => {
-                const stream = args.stream === true ? spec?.stream || true : spec?.stream ?? false;
+                const stream = args.stream === true ? spec?.stream || true : (spec?.stream ?? false);
                 const targetArgs = { userId: args.userId, threadId: args.threadId };
                 const llmArgs = {
-                    maxSteps,
+                    stopWhen,
                     ...omit(args, ["storageOptions", "contextOptions"]),
+                    messages: args.messages?.map(deserializeMessage),
+                    prompt: Array.isArray(args.prompt)
+                        ? args.prompt.map(deserializeMessage)
+                        : args.prompt,
+                    toolChoice: args.toolChoice,
                 };
+                if (args.maxSteps) {
+                    llmArgs.stopWhen = stepCountIs(args.maxSteps);
+                }
                 const opts = {
                     ...this.options,
                     ...(spec && pick(spec, ["contextOptions", "storageOptions"])),
@@ -1087,6 +1096,7 @@ export class Agent {
                     ? { ...ctx_, ...spec.customCtx(ctx_, targetArgs, llmArgs) }
                     : ctx_);
                 if (stream) {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     const result = await this.streamText(ctx, targetArgs, llmArgs, opts);
                     await result.consumeStream();
                     return {
@@ -1098,6 +1108,7 @@ export class Agent {
                     };
                 }
                 else {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     const res = await this.generateText(ctx, targetArgs, llmArgs, opts);
                     return {
                         text: res.text,
@@ -1115,18 +1126,17 @@ export class Agent {
      * it from workflows or other actions without a wrapping function.
      * @param spec Configuration for the agent acting as an action, including
      * the normal parameters to {@link generateObject}, plus {@link ContextOptions}
-     * and maxSteps.
+     * and stopWhen.
      */
     asObjectAction(spec, options) {
-        const maxSteps = spec?.maxSteps ?? this.options.maxSteps;
         return internalActionGeneric({
             args: vSafeObjectArgs,
             handler: async (ctx, args) => {
-                const overrides = pick(args, ["userId", "threadId"]);
-                const value = await this.generateObject(ctx, { userId: args.userId, threadId: args.threadId }, {
+                const { userId, threadId, ...rest } = args;
+                const overrides = pick(rest, ["contextOptions", "storageOptions"]);
+                const value = await this.generateObject(ctx, { userId, threadId }, {
                     ...spec,
-                    maxSteps,
-                    ...omit(args, ["userId", "threadId"]),
+                    ...omit(rest, ["contextOptions", "storageOptions"]),
                 }, { ...this.options, ...options, ...overrides });
                 return {
                     object: value.object,
@@ -1165,116 +1175,22 @@ export class Agent {
                 userId: v.optional(v.string()),
                 promptMessageId: v.optional(v.string()),
                 messages: v.array(vMessageWithMetadata),
-                pending: v.optional(v.boolean()),
                 failPendingSteps: v.optional(v.boolean()),
+                embeddings: v.optional(vMessageEmbeddings),
             },
             handler: async (ctx, args) => {
-                const { lastMessageId, messages } = await this.saveMessages(ctx, {
+                const { messages } = await this.saveMessages(ctx, {
                     ...args,
-                    messages: args.messages.map((m) => m.message),
+                    messages: args.messages.map((m) => deserializeMessage(m.message)),
                     metadata: args.messages.map(({ message: _, ...m }) => m),
+                    skipEmbeddings: true,
                 });
                 return {
-                    lastMessageId,
-                    messageIds: messages.map((m) => m._id),
+                    lastMessageId: messages.at(-1)._id,
+                    messages: messages.map((m) => pick(m, ["_id", "order", "stepOrder"])),
                 };
             },
         });
     }
 }
-/**
- * Create a thread to store messages with an Agent.
- * @param ctx The context from a mutation or action.
- * @param component The Agent component, usually `components.agent`.
- * @param args The associated thread metadata.
- * @returns The id of the created thread.
- */
-export async function createThread(ctx, component, args) {
-    const { _id: threadId } = await ctx.runMutation(component.threads.createThread, {
-        userId: args?.userId ?? undefined,
-        title: args?.title,
-        summary: args?.summary,
-    });
-    return threadId;
-}
-/**
- * Get the metadata for a thread.
- * @param ctx A ctx object from a query, mutation, or action.
- * @param args.threadId The thread to get the metadata for.
- * @returns The metadata for the thread.
- */
-export async function getThreadMetadata(ctx, component, args) {
-    const thread = await ctx.runQuery(component.threads.getThread, {
-        threadId: args.threadId,
-    });
-    if (!thread) {
-        throw new Error("Thread not found");
-    }
-    return thread;
-}
-/**
- * Explicitly save messages associated with the thread (& user if provided)
- */
-export async function saveMessages(ctx, component, args) {
-    let embeddings;
-    if (args.embeddings) {
-        const dimension = args.embeddings.vectors.find((v) => v !== null)?.length;
-        if (dimension) {
-            validateVectorDimension(dimension);
-            embeddings = {
-                model: args.embeddings.model,
-                dimension,
-                vectors: args.embeddings.vectors,
-            };
-        }
-    }
-    const result = await ctx.runMutation(component.messages.addMessages, {
-        threadId: args.threadId,
-        userId: args.userId ?? undefined,
-        agentName: args.agentName,
-        promptMessageId: args.promptMessageId,
-        embeddings,
-        messages: await Promise.all(args.messages.map(async (m, i) => {
-            const { message, fileIds } = await serializeMessage(ctx, component, m);
-            return {
-                ...args.metadata?.[i],
-                message,
-                fileIds,
-            };
-        })),
-        failPendingSteps: args.failPendingSteps ?? false,
-        pending: args.pending ?? false,
-    });
-    return {
-        lastMessageId: result.messages.at(-1)._id,
-        messages: result.messages,
-    };
-}
-/**
- * Save a message to the thread.
- * @param ctx A ctx object from a mutation or action.
- * @param args The message and what to associate it with (user / thread)
- * You can pass extra metadata alongside the message, e.g. associated fileIds.
- * @returns The messageId of the saved message.
- */
-export async function saveMessage(ctx, component, args) {
-    let embeddings;
-    if (args.embedding && args.embedding.vector) {
-        embeddings = {
-            model: args.embedding.model,
-            vectors: [args.embedding.vector],
-        };
-    }
-    const { lastMessageId, messages } = await saveMessages(ctx, component, {
-        threadId: args.threadId,
-        userId: args.userId ?? undefined,
-        agentName: args.agentName,
-        messages: args.prompt !== undefined
-            ? [{ role: "user", content: args.prompt }]
-            : [args.message],
-        metadata: args.metadata ? [args.metadata] : undefined,
-        embeddings,
-    });
-    return { messageId: lastMessageId, message: messages.at(-1) };
-}
 //# sourceMappingURL=index.js.map