@convex-dev/agent 0.6.3 → 0.7.0-alpha.0

package/dist/{client → vercel/client}/start.d.ts

@@ -1,9 +1,17 @@
-import { type CallSettings, type GenerateObjectResult, type IdGenerator, type LanguageModel, type ModelMessage, type StepResult, type StopCondition, type ToolSet } from "ai";
-import type { ActionCtx, AgentComponent, Config, Options } from "./types.js";
-import type { Message, MessageDoc } from "../validators.js";
-import { type ModelOrMetadata } from "../shared.js";
-import type { Agent } from "./index.js";
-export declare function startGeneration<T, Tools extends ToolSet = ToolSet, CustomCtx extends object = object>(ctx: ActionCtx & CustomCtx, component: AgentComponent, 
+import { type GenerateObjectResult, type IdGenerator, type LanguageModel, type Instructions, type ModelMessage, type StepResult, type StopCondition, type ToolSet } from "ai";
+import type { Context } from "@ai-sdk/provider-utils";
+import type { ActionCtx, AgentCallSettings, AgentComponent, Config, Options } from "./types.js";
+import type { Message, MessageDoc } from "../../validators.js";
+import { type ModelOrMetadata } from "../../shared.js";
+import type { Agent } from "../index.js";
+export declare function resolveUsageModel(toSave: {
+    step: {
+        model?: ModelOrMetadata;
+    };
+} | {
+    object: unknown;
+}, activeModel: ModelOrMetadata): ModelOrMetadata;
+export declare function startGeneration<T, Tools extends ToolSet = ToolSet, CustomCtx extends object = object, RUNTIME_CONTEXT extends Context = Context>(ctx: ActionCtx & CustomCtx, component: AgentComponent, 
 /**
  * These are the arguments you'll pass to the LLM call such as
  * `generateText` or `streamText`. This function will look up the context
@@ -44,13 +52,18 @@ args: T & {
      *   the promptMessageId message, if provided.
      */
     messages?: (ModelMessage | Message)[];
+    instructions?: Instructions;
+    /** @deprecated Use instructions. */
+    system?: Instructions;
+    allowSystemInMessages?: boolean;
     /**
      * The abort signal to be passed to the LLM call. If triggered, it will
      * mark the pending message as failed. If the generation is asynchronously
      * aborted, it will trigger this signal when detected.
      */
     abortSignal?: AbortSignal;
-    stopWhen?: StopCondition<Tools> | Array<StopCondition<Tools>>;
+    runtimeContext?: RUNTIME_CONTEXT;
+    stopWhen?: StopCondition<Tools, RUNTIME_CONTEXT> | Array<StopCondition<Tools, RUNTIME_CONTEXT>>;
     _internal?: {
         generateId?: IdGenerator;
     };
@@ -60,21 +73,23 @@ args: T & {
     languageModel?: LanguageModel;
     agentName: string;
     agentForToolCtx?: Agent;
-}): Promise<{
+}, _operation?: "generateText" | "streamText" | "generateObject" | "streamObject"): Promise<{
     args: T & {
-        system?: string;
+        instructions?: Instructions;
         model: LanguageModel;
         messages: ModelMessage[];
         prompt?: never;
         tools?: Tools;
-    } & CallSettings;
+        runtimeContext?: RUNTIME_CONTEXT;
+    } & AgentCallSettings;
     order: number;
     stepOrder: number;
     userId: string | undefined;
     promptMessageId: string | undefined;
     updateModel: (model: ModelOrMetadata | undefined) => void;
     save: <TOOLS extends ToolSet>(toSave: {
-        step: StepResult<TOOLS>;
+        step: StepResult<TOOLS, RUNTIME_CONTEXT>;
+        responseMessages?: ModelMessage[];
     } | {
         object: GenerateObjectResult<unknown>;
     }, createPendingMessage?: boolean, finishStreamId?: string) => Promise<void>;

package/dist/vercel/client/start.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/vercel/client/start.ts"],"names":[],"mappings":"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"}

package/dist/{client → vercel/client}/start.js

@@ -1,10 +1,32 @@
-import { stepCountIs, } from "ai";
+import { isStepCount, } from "ai";
 import { serializeResponseMessages, serializeObjectResult, } from "../mapping.js";
 import { embedMessages, fetchContextWithPrompt } from "./search.js";
-import { getModelName, getProviderName, } from "../shared.js";
+import { getModelName, getProviderName, } from "../../shared.js";
 import { wrapTools } from "./createTool.js";
 import { assert, omit } from "convex-helpers";
 import { saveInputMessages } from "./saveInputMessages.js";
+export function resolveUsageModel(toSave, activeModel) {
+    return "step" in toSave ? (toSave.step.model ?? activeModel) : activeModel;
+}
+/**
+ * The raw handler promises request and, for non-streaming calls, response
+ * bodies. Preserve explicit caller choices while opting in to those bodies.
+ */
+function rawRequestResponseInclude(args, enabled, operation) {
+    if (!enabled)
+        return undefined;
+    const requested = {
+        ...args.experimental_include,
+        ...args.include,
+    };
+    return {
+        ...requested,
+        requestBody: requested.requestBody ?? true,
+        ...((operation === "generateText" || operation === "generateObject")
+            ? { responseBody: requested.responseBody ?? true }
+            : {}),
+    };
+}
 export async function startGeneration(ctx, component, 
 /**
  * These are the arguments you'll pass to the LLM call such as
@@ -13,7 +35,7 @@ export async function startGeneration(ctx, component,
  * The type of the arguments returned infers from the type of the arguments
  * you pass here.
  */
-args, { threadId, ...opts }) {
+args, { threadId, ...opts }, _operation) {
     const userId = opts.userId ??
         (threadId &&
             (await ctx.runQuery(component.threads.getThread, { threadId }))
@@ -27,6 +49,11 @@ args, { threadId, ...opts }) {
         prompt: args.prompt,
         promptMessageId: args.promptMessageId,
     });
+    const allowSystemInMessages = args.allowSystemInMessages ?? true;
+    if (!allowSystemInMessages &&
+        context.messages.some((message) => message.role === "system")) {
+        throw new Error("System messages in assembled message history require allowSystemInMessages: true. Use instructions for top-level system guidance.");
+    }
     const saveMessages = opts.storageOptions?.saveMessages ?? "promptAndOutput";
     const { promptMessageId, pendingMessage, savedMessages } = threadId && saveMessages !== "none"
         ? await saveInputMessages(ctx, component, {
@@ -49,13 +76,23 @@ args, { threadId, ...opts }) {
     const model = args.model ?? opts.languageModel;
     assert(model, "model is required");
     let activeModel = model;
-    const fail = async (reason) => {
-        if (pendingMessageId) {
-            await ctx.runMutation(component.messages.finalizeMessage, {
-                messageId: pendingMessageId,
+    // Both the caller's AbortSignal listener and AI SDK's onAbort can report
+    // the same cancellation. Share the one finalization instead of racing two
+    // mutations for the pending message.
+    let pendingMessageFailure;
+    const fail = (reason) => {
+        if (!pendingMessageId)
+            return Promise.resolve();
+        if (!pendingMessageFailure) {
+            const messageId = pendingMessageId;
+            pendingMessageFailure = ctx
+                .runMutation(component.messages.finalizeMessage, {
+                messageId,
                 result: { status: "failed", error: reason },
-            });
+            })
+                .then(() => undefined);
         }
+        return pendingMessageFailure;
     };
     if (args.abortSignal) {
         const abortSignal = args.abortSignal;
@@ -71,26 +108,26 @@ args, { threadId, ...opts }) {
         agent: opts.agentForToolCtx,
     };
     const tools = wrapTools(toolCtx, args.tools);
+    const argsWithoutSystem = omit(args, ["system"]);
+    const { promptMessageId: _promptMessageId, messages: _messages, prompt: _prompt, instructions: _instructions, onStepFinish: _onStepFinish, ...aiCallArgs } = argsWithoutSystem;
+    const include = rawRequestResponseInclude(aiCallArgs, Boolean(opts.rawRequestResponseHandler), _operation);
     const aiArgs = {
         ...opts.callSettings,
         providerOptions: opts.providerOptions,
-        ...omit(args, ["promptMessageId", "messages", "prompt"]),
+        ...aiCallArgs,
         model,
         messages: context.messages,
-        stopWhen: args.stopWhen ?? (opts.maxSteps ? stepCountIs(opts.maxSteps) : undefined),
+        instructions: args.instructions ?? args.system,
+        allowSystemInMessages,
+        stopWhen: args.stopWhen ?? (opts.maxSteps ? isStepCount(opts.maxSteps) : undefined),
         tools,
+        ...(include ? { include } : {}),
     };
     // NOTE: We intentionally do NOT override _internal.generateId here.
     // The AI SDK uses generateId() for many internal IDs (approval IDs,
     // tool execution IDs, message IDs, etc.) and they must be unique.
     // The pending message is linked via the explicit `pendingMessageId`
     // parameter passed to addMessages in the save closure.
-    // Track how many response messages we've already saved across steps.
-    // step.response.messages is cumulative — each step appends to it.
-    // We need to know which messages are new in each step to serialize
-    // only the new ones (important for tool approval flows where the SDK
-    // may add extra messages like approval tool-results).
-    let previousResponseMessageCount = 0;
     return {
         args: aiArgs,
         order: order ?? 0,
@@ -116,10 +153,13 @@ args, { threadId, ...opts }) {
                     serialized = await serializeObjectResult(ctx, component, toSave.object, activeModel);
                 }
                 else {
-                    const allResponseMessages = toSave.step.response.messages;
-                    const newResponseMessages = allResponseMessages.slice(previousResponseMessageCount);
-                    previousResponseMessageCount = allResponseMessages.length;
-                    serialized = await serializeResponseMessages(ctx, component, toSave.step, activeModel, newResponseMessages);
+                    const newResponseMessages = toSave.responseMessages ?? toSave.step.response.messages;
+                    // Even an empty completed step needs a durable assistant result so
+                    // the pending message can be finalized at the storage boundary.
+                    const responseMessagesToSave = newResponseMessages.length > 0
+                        ? newResponseMessages
+                        : [{ role: "assistant", content: [] }];
+                    serialized = await serializeResponseMessages(ctx, component, toSave.step, activeModel, responseMessagesToSave);
                 }
                 const embeddings = await embedMessages(ctx, { threadId, ...opts, userId }, serialized.messages.map((m) => m.message));
                 if (createPendingMessage) {
@@ -150,6 +190,7 @@ args, { threadId, ...opts }) {
                     }
                     else {
                         pendingMessageId = lastMessage._id;
+                        pendingMessageFailure = undefined;
                         savedMessages.push(...saved.messages.slice(0, -1));
                     }
                 }
@@ -169,12 +210,13 @@ args, { threadId, ...opts }) {
                 });
             }
             if (opts.usageHandler && output.usage) {
+                const usageModel = resolveUsageModel(toSave, activeModel);
                 await opts.usageHandler(ctx, {
                     userId,
                     threadId,
                     agentName: opts.agentName,
-                    model: getModelName(activeModel),
-                    provider: getProviderName(activeModel),
+                    model: getModelName(usageModel),
+                    provider: getProviderName(usageModel),
                     usage: output.usage,
                     providerMetadata: output.providerMetadata,
                 });

package/dist/vercel/client/start.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/vercel/client/start.ts"],"names":[],"mappings":"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"}

package/dist/{client → vercel/client}/streamText.d.ts

@@ -1,8 +1,15 @@
 import type { StreamTextResult, ToolSet } from "ai";
-import { streamText as streamTextAi } from "ai";
+import type { Context } from "@ai-sdk/provider-utils";
 import { type StreamingOptions } from "./streaming.js";
-import type { ActionCtx, AgentComponent, AgentPrompt, GenerationOutputMetadata, Options, Output } from "./types.js";
-import type { Agent } from "./index.js";
+import type { ActionCtx, AgentComponent, GenerationOutputMetadata, Options, StreamingTextArgs } from "./types.js";
+import type { Output as AISDKOutput } from "ai";
+import type { Agent } from "../index.js";
+/** Finish every abort cleanup path before surfacing an internal failure. */
+export declare function runAbortCleanup(cleanup: {
+    failCall: () => Promise<void>;
+    failStreamer: () => Promise<void>;
+    onAbort?: () => PromiseLike<void> | void;
+}): Promise<void>;
 /**
  * This behaves like {@link streamText} from the "ai" package except that
  * it add context based on the userId and threadId and saves the input and
@@ -10,18 +17,12 @@ import type { Agent } from "./index.js";
  * Use {@link continueThread} to get a version of this function already scoped
  * to a thread (and optionally userId).
  */
-export declare function streamText<TOOLS extends ToolSet, OUTPUT extends Output<any, any, any> = never>(ctx: ActionCtx, component: AgentComponent, 
+export declare function streamText<AgentTools extends ToolSet, TOOLS extends ToolSet | undefined = undefined, OUTPUT extends AISDKOutput.Output<any, any, any> = AISDKOutput.Output<string, string, never>, RUNTIME_CONTEXT extends Context = Context>(ctx: ActionCtx, component: AgentComponent, 
 /**
  * The arguments to the streamText function, similar to the ai sdk's
  * {@link streamText} function, along with Agent prompt options.
  */
-streamTextArgs: AgentPrompt & Omit<Parameters<typeof streamTextAi<TOOLS, OUTPUT>>[0], "model" | "prompt" | "messages"> & {
-    /**
-     * The tools to use for the tool calls. This will override tools specified
-     * in the Agent constructor or createThread / continueThread.
-     */
-    tools?: TOOLS;
-}, 
+streamTextArgs: StreamingTextArgs<AgentTools, TOOLS, OUTPUT, RUNTIME_CONTEXT>, 
 /**
  * The {@link ContextOptions} and {@link StorageOptions}
  * options to use for fetching contextual messages and saving input/output messages.
@@ -42,5 +43,5 @@ options: Options & {
      */
     saveStreamDeltas?: boolean | StreamingOptions;
     agentForToolCtx?: Agent;
-}): Promise<StreamTextResult<TOOLS, OUTPUT> & GenerationOutputMetadata>;
+}): Promise<StreamTextResult<TOOLS extends undefined ? AgentTools : TOOLS, RUNTIME_CONTEXT, OUTPUT> & GenerationOutputMetadata>;
 //# sourceMappingURL=streamText.d.ts.map

package/dist/vercel/client/streamText.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"streamText.d.ts","sourceRoot":"","sources":["../../../src/vercel/client/streamText.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,gBAAgB,EAChB,OAAO,EAER,MAAM,IAAI,CAAC;AACZ,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,SAAS,EACT,cAAc,EACd,wBAAwB,EACxB,OAAO,EACP,iBAAiB,EAClB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,IAAI,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAIzC,4EAA4E;AAC5E,wBAAsB,eAAe,CAAC,OAAO,EAAE;IAC7C,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,MAAM,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC1C,GAAG,OAAO,CAAC,IAAI,CAAC,CAQhB;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,UAAU,SAAS,OAAO,EAC1B,KAAK,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EAC7C,MAAM,SAAS,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,WAAW,CAAC,MAAM,CACnE,MAAM,EACN,MAAM,EACN,KAAK,CACN,EACD,eAAe,SAAS,OAAO,GAAG,OAAO,EAEzC,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,cAAc;AACzB;;;GAGG;AACH,cAAc,EAAE,iBAAiB,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC;AAC7E;;;GAGG;AACH,OAAO,EAAE,OAAO,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;;;;OASG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC;IAC9C,eAAe,CAAC,EAAE,KAAK,CAAC;CACzB,GACA,OAAO,CACR,gBAAgB,CACd,KAAK,SAAS,SAAS,GAAG,UAAU,GAAG,KAAK,EAC5C,eAAe,EACf,MAAM,CACP,GACC,wBAAwB,CAC3B,CA4LA"}

package/dist/{client → vercel/client}/streamText.js

@@ -1,8 +1,19 @@
 import { streamText as streamTextAi } from "ai";
 import { compressUIMessageChunks, DeltaStreamer, mergeTransforms, } from "./streaming.js";
 import { startGeneration } from "./start.js";
-import { getModelName, getProviderName } from "../shared.js";
+import { getModelName, getProviderName } from "../../shared.js";
 import { errorToString, willContinue } from "./utils.js";
+/** Finish every abort cleanup path before surfacing an internal failure. */
+export async function runAbortCleanup(cleanup) {
+    const results = await Promise.allSettled([
+        cleanup.failCall(),
+        cleanup.failStreamer(),
+    ]);
+    await cleanup.onAbort?.();
+    const failure = results.find((result) => result.status === "rejected");
+    if (failure)
+        throw failure.reason;
+}
 /**
  * This behaves like {@link streamText} from the "ai" package except that
  * it add context based on the userId and threadId and saves the input and
@@ -22,8 +33,14 @@ streamTextArgs,
  */
 options) {
     const { threadId } = options ?? {};
-    const { args, userId, order, stepOrder, promptMessageId, ...call } = await startGeneration(ctx, component, streamTextArgs, options);
+    const { args, userId, order, stepOrder, promptMessageId, ...call } = await startGeneration(ctx, component, streamTextArgs, options, "streamText");
     const steps = [];
+    let initialResponseMessages = [];
+    let initialResponseMessagesSaved = false;
+    const responseMessagesForStep = (step) => [
+        ...(initialResponseMessagesSaved ? [] : initialResponseMessages),
+        ...step.response.messages,
+    ];
     // Track the final step for atomic save with stream finish (issue #181).
     // Only used when streamText awaits stream consumption itself; the
     // `returnImmediately` path saves inline instead (see onStepFinish below).
@@ -66,7 +83,19 @@ options) {
             await streamer?.fail(errorToString(error.error));
             return streamTextArgs.onError?.(error);
         },
+        onAbort: async (event) => {
+            const reason = args.abortSignal?.reason
+                ? errorToString(args.abortSignal.reason)
+                : "streamText aborted";
+            await runAbortCleanup({
+                failCall: () => call.fail(reason),
+                failStreamer: async () => streamer?.fail(reason),
+                onAbort: () => streamTextArgs.onAbort?.(event),
+            });
+        },
         prepareStep: async (options) => {
+            if (options.stepNumber === 0)
+                initialResponseMessages = [...options.responseMessages];
             const result = await streamTextArgs.prepareStep?.(options);
             if (result) {
                 const model = result.model ?? options.model;
@@ -80,7 +109,7 @@ options) {
             }
             return undefined;
         },
-        onStepFinish: async (step) => {
+        onStepEnd: async (step) => {
             steps.push(step);
             const createPendingMessage = await willContinue(steps, args.stopWhen);
             if (!createPendingMessage && streamer) {
@@ -89,20 +118,25 @@ options) {
                 if (willAwaitStream) {
                     // We're about to `await stream` below — defer the save so it
                     // happens atomically with stream finish (issue #181).
-                    pendingFinalStep = step;
+                    pendingFinalStep = {
+                        step,
+                        responseMessages: responseMessagesForStep(step),
+                    };
                 }
                 else {
                     // returnImmediately path: streamText is about to return without
                     // awaiting consumption, so the deferred-save block below won't
                     // see this step. Save inline now (issue #265).
                     const finishStreamId = await streamer.getOrCreateStreamId();
-                    await call.save({ step }, false, finishStreamId);
+                    await call.save({ step, responseMessages: responseMessagesForStep(step) }, false, finishStreamId);
+                    initialResponseMessagesSaved = true;
                 }
             }
             else {
-                await call.save({ step }, createPendingMessage);
+                await call.save({ step, responseMessages: responseMessagesForStep(step) }, createPendingMessage);
+                initialResponseMessagesSaved = true;
             }
-            return args.onStepFinish?.(step);
+            return (streamTextArgs.onStepEnd ?? streamTextArgs.onStepFinish)?.(step);
         },
     });
     const stream = streamer?.consumeStream(result.toUIMessageStream());
@@ -119,7 +153,7 @@ options) {
             // Save the deferred final step if it was already generated but not yet persisted
             if (pendingFinalStep) {
                 try {
-                    await call.save({ step: pendingFinalStep }, false);
+                    await call.save(pendingFinalStep, false);
                 }
                 catch (saveError) {
                     console.error("Failed to save deferred final step:", saveError);
@@ -132,7 +166,7 @@ options) {
     // If we deferred the final step save, do it now with atomic stream finish.
     if (pendingFinalStep && streamer) {
         const finishStreamId = await streamer.getOrCreateStreamId();
-        await call.save({ step: pendingFinalStep }, false, finishStreamId);
+        await call.save(pendingFinalStep, false, finishStreamId);
     }
     const metadata = {
         promptMessageId,

package/dist/vercel/client/streamText.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"streamText.js","sourceRoot":"","sources":["../../../src/vercel/client/streamText.ts"],"names":[],"mappings":"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"}