@trigger.dev/sdk 4.5.0-rc.3 → 4.5.0-rc.5

package/dist/commonjs/v3/ai.js

@@ -12,7 +12,9 @@ exports.__setReplaySessionInTailImplForTests = __setReplaySessionInTailImplForTe
 exports.__replaySessionInTailProductionPathForTests = __replaySessionInTailProductionPathForTests;
 exports.buildSkillTools = buildSkillTools;
 const v3_1 = require("@trigger.dev/core/v3");
-const ai_1 = require("ai");
+// Runtime VALUES go through the ESM/CJS shim so the CJS build can `require`
+// ESM-only `ai@7` (see ../imports/ai-runtime.ts).
+const ai_runtime_js_1 = require("../imports/ai-runtime.js");
 const api_1 = require("@opentelemetry/api");
 const auth_js_1 = require("./auth.js");
 const locals_js_1 = require("./locals.js");
@@ -29,6 +31,7 @@ const agentSkillsRuntime_js_1 = require("./agentSkillsRuntime.js");
 const streams_js_1 = require("./streams.js");
 const sessions_js_1 = require("./sessions.js");
 const shared_js_1 = require("./shared.js");
+const aiAutoTelemetry_js_1 = require("./aiAutoTelemetry.js");
 const v3_2 = require("@trigger.dev/core/v3");
 const tracer_js_1 = require("./tracer.js");
 const METADATA_KEY = "tool.execute.options";
@@ -38,7 +41,16 @@ const METADATA_KEY = "tool.execute.options";
  * stopped/aborted conversations with partial tool parts.
  */
 function toModelMessages(messages) {
-    return (0, ai_1.convertToModelMessages)(messages, { ignoreIncompleteToolCalls: true });
+    // Pass the resolved per-turn `tools` (if any) so the AI SDK can look up each
+    // tool's `toModelOutput` and re-apply it to prior-turn tool results. Without
+    // `tools` it falls back to JSON-stringifying the raw output (TRI-10149). The
+    // conditional spread keeps the options object byte-identical to the no-tools
+    // path when nothing was declared.
+    const tools = locals_js_1.locals.get(chatResolvedToolsKey);
+    return (0, ai_runtime_js_1.convertToModelMessages)(messages, {
+        ignoreIncompleteToolCalls: true,
+        ...(tools ? { tools } : {}),
+    });
 }
 const chatTurnContextKey = locals_js_1.locals.create("chat.turnContext");
 /**
@@ -442,7 +454,7 @@ async function replaySessionOutTail(sessionId, options) {
         });
         let last;
         try {
-            for await (const snapshot of (0, ai_1.readUIMessageStream)({ stream: segmentStream })) {
+            for await (const snapshot of (0, ai_runtime_js_1.readUIMessageStream)({ stream: segmentStream })) {
                 last = snapshot;
             }
         }
@@ -645,9 +657,14 @@ function createTaskToolExecuteHandler(task) {
         const toolMeta = {
             toolCallId: toolOpts?.toolCallId ?? "",
         };
-        if (toolOpts?.experimental_context !== undefined) {
+        // v6 passes user context as `experimental_context`, v7 as `context`. Read
+        // whichever is set and stamp both so subtasks reading either name work.
+        const toolContext = toolOpts?.context ?? toolOpts?.experimental_context;
+        if (toolContext !== undefined) {
             try {
-                toolMeta.experimental_context = JSON.parse(JSON.stringify(toolOpts.experimental_context));
+                const serialized = JSON.parse(JSON.stringify(toolContext));
+                toolMeta.experimental_context = serialized;
+                toolMeta.context = serialized;
             }
             catch {
                 /* non-serializable */
@@ -690,9 +707,9 @@ function toolFromTask(task, options) {
     // Zod-backed tasks: use static `tool()` so runtime shape matches `ToolSet`. Generic task context
     // prevents `tool()` overloads from inferring input; `as any` is localized to this call only.
     if ("schema" in task && task.schema && (0, v3_1.isSchemaZodEsque)(task.schema)) {
-        const staticTool = (0, ai_1.tool)({
+        const staticTool = (0, ai_runtime_js_1.tool)({
             description: task.description ?? "",
-            inputSchema: (0, ai_1.zodSchema)(task.schema),
+            inputSchema: (0, ai_runtime_js_1.zodSchema)(task.schema),
             execute: async (input, toolOpts) => executeFromTaskInput(input, toolOpts),
             ...(options?.experimental_toToolResultContent !== undefined
                 ? { experimental_toToolResultContent: options.experimental_toToolResultContent }
@@ -700,7 +717,7 @@ function toolFromTask(task, options) {
         });
         return staticTool;
     }
-    const toolDefinition = (0, ai_1.dynamicTool)({
+    const toolDefinition = (0, ai_runtime_js_1.dynamicTool)({
         description: task.description,
         inputSchema: convertTaskSchemaToToolParameters(task),
         ...(options?.experimental_toToolResultContent !== undefined
@@ -768,15 +785,15 @@ function convertTaskSchemaToToolParameters(task) {
     if ("schema" in task) {
         // If TaskSchema is ArkTypeEsque, use ai.jsonSchema to convert it to a Schema
         if ("toJsonSchema" in task.schema && typeof task.schema.toJsonSchema === "function") {
-            return (0, ai_1.jsonSchema)(task.schema.toJsonSchema());
+            return (0, ai_runtime_js_1.jsonSchema)(task.schema.toJsonSchema());
         }
         // If TaskSchema is ZodEsque, use ai.zodSchema to convert it to a Schema
         if ((0, v3_1.isSchemaZodEsque)(task.schema)) {
-            return (0, ai_1.zodSchema)(task.schema);
+            return (0, ai_runtime_js_1.zodSchema)(task.schema);
         }
     }
     if ("jsonSchema" in task) {
-        return (0, ai_1.jsonSchema)(task.jsonSchema);
+        return (0, ai_runtime_js_1.jsonSchema)(task.jsonSchema);
     }
     throw new Error("Cannot convert task to a tool. Make sure to use a task with a schema or jsonSchema.");
 }
@@ -1260,7 +1277,7 @@ function synthesizeHandoverUIMessage(partial, messageId) {
     // browser). Fall back to a fresh id only if the handover signal
     // didn't carry one.
     return {
-        id: messageId ?? (0, ai_1.generateId)(),
+        id: messageId ?? (0, ai_runtime_js_1.generateId)(),
         role: "assistant",
         parts,
     };
@@ -1416,7 +1433,7 @@ function* iterateToolParts(message) {
     if (message.role !== "assistant")
         return;
     for (const part of (message.parts ?? [])) {
-        if (!(0, ai_1.isToolUIPart)(part))
+        if (!(0, ai_runtime_js_1.isToolUIPart)(part))
             continue;
         const toolCallId = part.toolCallId;
         if (typeof toolCallId !== "string" || toolCallId.length === 0)
@@ -1424,7 +1441,7 @@ function* iterateToolParts(message) {
         yield {
             part,
             toolCallId,
-            toolName: (0, ai_1.getToolName)(part),
+            toolName: (0, ai_runtime_js_1.getToolName)(part),
             state: part.state,
         };
     }
@@ -1448,7 +1465,7 @@ function extractPendingToolCallsFromPartial(partial) {
     const parts = (partial.parts ?? []);
     for (let i = 0; i < parts.length; i++) {
         const part = parts[i];
-        if (!(0, ai_1.isToolUIPart)(part))
+        if (!(0, ai_runtime_js_1.isToolUIPart)(part))
             continue;
         if (!isPendingToolState(part.state))
             continue;
@@ -1457,7 +1474,7 @@ function extractPendingToolCallsFromPartial(partial) {
             continue;
         out.push({
             toolCallId,
-            toolName: (0, ai_1.getToolName)(part),
+            toolName: (0, ai_runtime_js_1.getToolName)(part),
             input: part.input,
             partIndex: i,
         });
@@ -1560,7 +1577,7 @@ function extractNewToolResultsFromHistory(message, messages) {
 function mergeIncomingIntoHydrated(hydrated, incoming) {
     const incomingAdvancedByCallId = new Map();
     for (const part of (incoming.parts ?? [])) {
-        if (!(0, ai_1.isToolUIPart)(part))
+        if (!(0, ai_runtime_js_1.isToolUIPart)(part))
             continue;
         const toolCallId = part.toolCallId;
         if (typeof toolCallId !== "string" || toolCallId.length === 0)
@@ -1574,7 +1591,7 @@ function mergeIncomingIntoHydrated(hydrated, incoming) {
     let mutated = false;
     const hydratedParts = (hydrated.parts ?? []);
     const mergedParts = hydratedParts.map((part) => {
-        if (!(0, ai_1.isToolUIPart)(part))
+        if (!(0, ai_runtime_js_1.isToolUIPart)(part))
             return part;
         const toolCallId = part.toolCallId;
         if (typeof toolCallId !== "string" || toolCallId.length === 0)
@@ -1743,6 +1760,18 @@ const chatOnCompactedKey = locals_js_1.locals.create("chat.onCompacted");
 /** @internal Full task `ctx` for the active `chat.agent` run (for hooks invoked from nested compaction). */
 const chatAgentRunContextKey = locals_js_1.locals.create("chat.agentRunContext");
 const chatPrepareMessagesKey = locals_js_1.locals.create("chat.prepareMessages");
+/**
+ * @internal The raw `tools` option from `chat.agent({ tools })`, either a
+ * static `ToolSet` or a per-turn function. Set once at boot.
+ */
+const chatToolsOptionKey = locals_js_1.locals.create("chat.toolsOption");
+/**
+ * @internal The concrete `ToolSet` resolved for the current turn. Read by
+ * `toModelMessages` so `convertToModelMessages` can re-run `toModelOutput` on
+ * prior-turn tool results. Unset when no `tools` were declared (preserves the
+ * exact pre-feature conversion behavior).
+ */
+const chatResolvedToolsKey = locals_js_1.locals.create("chat.resolvedTools");
 /** @internal Flag set by `chat.requestUpgrade()` to exit the loop after the current turn. */
 const chatUpgradeRequestedKey = locals_js_1.locals.create("chat.upgradeRequested");
 /**
@@ -1836,6 +1865,37 @@ async function applyPrepareMessages(messages, reason) {
         },
     });
 }
+/**
+ * Resolve the `tools` option into a concrete `ToolSet` and cache it in locals so
+ * `toModelMessages` can pass it to `convertToModelMessages`. For the function
+ * form, invokes the user function with the given context (or the current turn
+ * context when no override is passed). Pass an `override` for the boot-time
+ * history conversion, which runs before the per-turn context exists and uses
+ * the run/continuation payload's `clientData`.
+ *
+ * Fails closed: a throwing resolver propagates rather than carrying a prior
+ * turn's set forward. The function form can gate capabilities by user or flag,
+ * so reusing stale tools would leak capabilities. No-op when no `tools` were
+ * declared.
+ * @internal
+ */
+async function resolveTurnTools(override) {
+    const option = locals_js_1.locals.get(chatToolsOptionKey);
+    if (!option)
+        return;
+    if (typeof option !== "function") {
+        locals_js_1.locals.set(chatResolvedToolsKey, option);
+        return;
+    }
+    const ctx = override ?? locals_js_1.locals.get(chatTurnContextKey);
+    const resolved = await option({
+        chatId: ctx?.chatId ?? "",
+        turn: ctx?.turn ?? 0,
+        continuation: ctx?.continuation ?? false,
+        clientData: ctx?.clientData,
+    });
+    locals_js_1.locals.set(chatResolvedToolsKey, resolved);
+}
 /**
  * Read the current compaction state. Returns the summary and base message count
  * if compaction has occurred in this turn, or `undefined` if not.
@@ -1921,7 +1981,7 @@ async function chatCompact(messages, steps, options) {
         return { type: "skipped" };
     }
     const result = await tracer_js_1.tracer.startActiveSpan("context compaction", async (span) => {
-        const compactionId = (0, ai_1.generateId)();
+        const compactionId = (0, ai_runtime_js_1.generateId)();
         let summary;
         const { waitUntilComplete } = chatStream.writer({
             spanName: "stream compaction chunks",
@@ -2096,7 +2156,7 @@ async function drainSteeringQueue(config, messages, steps, queueOverride) {
                     execute: ({ write }) => {
                         write({
                             type: ai_shared_js_2.PENDING_MESSAGE_INJECTED_TYPE,
-                            id: (0, ai_1.generateId)(),
+                            id: (0, ai_runtime_js_1.generateId)(),
                             data: {
                                 messageIds: uiMessages.map((m) => m.id),
                                 messages: uiMessages.map((m, idx) => ({
@@ -2250,9 +2310,9 @@ function findSkillByName(skills, name) {
  * (e.g. in a `chat.createSession` loop with custom streamText).
  */
 function buildSkillTools(skills) {
-    const loadSkill = (0, ai_1.tool)({
+    const loadSkill = (0, ai_runtime_js_1.tool)({
         description: "Load the full instructions for a skill by its name. Call this first before using a skill.",
-        inputSchema: (0, ai_1.jsonSchema)({
+        inputSchema: (0, ai_runtime_js_1.jsonSchema)({
             type: "object",
             properties: {
                 name: {
@@ -2280,9 +2340,9 @@ function buildSkillTools(skills) {
             };
         },
     });
-    const readFile = (0, ai_1.tool)({
+    const readFile = (0, ai_runtime_js_1.tool)({
         description: "Read a file from a skill's bundled folder. Paths must be relative to the skill's root.",
-        inputSchema: (0, ai_1.jsonSchema)({
+        inputSchema: (0, ai_runtime_js_1.jsonSchema)({
             type: "object",
             properties: {
                 skill: { type: "string", description: "The skill's name (from frontmatter)." },
@@ -2310,9 +2370,9 @@ function buildSkillTools(skills) {
             }
         },
     });
-    const bash = (0, ai_1.tool)({
+    const bash = (0, ai_runtime_js_1.tool)({
         description: "Run a bash command inside a skill's bundled folder. Use this to invoke the skill's scripts. The working directory is the skill's root.",
-        inputSchema: (0, ai_1.jsonSchema)({
+        inputSchema: (0, ai_runtime_js_1.jsonSchema)({
             type: "object",
             properties: {
                 skill: { type: "string", description: "The skill's name (from frontmatter)." },
@@ -2561,7 +2621,7 @@ function chatCustomAgent(options) {
     return task;
 }
 function chatAgent(options) {
-    const { run: userRun, clientDataSchema, onBoot, onRecoveryBoot, onPreload, onChatStart, onValidateMessages, hydrateMessages, actionSchema, onAction, onTurnStart, onBeforeTurnComplete, onCompacted, compaction, pendingMessages: pendingMessagesConfig, prepareMessages, onTurnComplete, maxTurns = 100, turnTimeout = "1h", idleTimeoutInSeconds = 30, chatAccessTokenTTL = "1h", preloadIdleTimeoutInSeconds, preloadTimeout, uiMessageStreamOptions, onChatSuspend, onChatResume, exitAfterPreloadIdle = false, oomMachine, ...restOptions } = options;
+    const { run: userRun, clientDataSchema, onBoot, onRecoveryBoot, onPreload, onChatStart, onValidateMessages, hydrateMessages, actionSchema, onAction, onTurnStart, onBeforeTurnComplete, onCompacted, compaction, pendingMessages: pendingMessagesConfig, prepareMessages, tools: toolsOption, onTurnComplete, maxTurns = 100, turnTimeout = "1h", idleTimeoutInSeconds = 30, chatAccessTokenTTL = "1h", preloadIdleTimeoutInSeconds, preloadTimeout, uiMessageStreamOptions, onChatSuspend, onChatResume, exitAfterPreloadIdle = false, oomMachine, ...restOptions } = options;
     const parseClientData = clientDataSchema ? (0, v3_1.getSchemaParseFn)(clientDataSchema) : undefined;
     const parseAction = actionSchema ? (0, v3_1.getSchemaParseFn)(actionSchema) : undefined;
     // chat.agent does not expose generic retry options (see docstring on
@@ -2578,6 +2638,11 @@ function chatAgent(options) {
         agentConfig: { type: "ai-sdk-chat" },
         run: async (payload, { signal: runSignal, ctx }) => {
             locals_js_1.locals.set(chatAgentRunContextKey, ctx);
+            // On AI SDK 7, register the `@ai-sdk/otel` integration (once per process)
+            // so `experimental_telemetry` spans flow into the run trace. Awaited here
+            // at run boot — before any `streamText` — and a no-op on v5/v6 or when the
+            // optional `@ai-sdk/otel` peer isn't installed. See ./aiAutoTelemetry.ts.
+            await (0, aiAutoTelemetry_js_1.ensureAiSdkTelemetry)();
             // Bind the run to its backing Session so every module-level helper
             // (chat.stream, chat.messages, chat.stopSignal) resolves to this
             // chat's `.in` / `.out` channels.
@@ -2610,6 +2675,19 @@ function chatAgent(options) {
             if (prepareMessages) {
                 locals_js_1.locals.set(chatPrepareMessagesKey, prepareMessages);
             }
+            if (toolsOption) {
+                // Cast: the option's function form is typed against the parsed
+                // `clientData` (`ResolveToolsEvent<inferSchemaOut<...>>`), but the
+                // locals key uses the erased `ResolveToolsEvent<unknown>`. The runtime
+                // value is identical; this mirrors how `prepareMessages` is stored.
+                locals_js_1.locals.set(chatToolsOptionKey, toolsOption);
+                // Static tools are usable immediately. The function form is resolved
+                // just before the boot history conversion (with the payload's
+                // clientData) and again per-turn (see resolveTurnTools).
+                if (typeof toolsOption !== "function") {
+                    locals_js_1.locals.set(chatResolvedToolsKey, toolsOption);
+                }
+            }
             if (compaction) {
                 locals_js_1.locals.set(chatAgentCompactionKey, compaction);
             }
@@ -2940,6 +3018,27 @@ function chatAgent(options) {
                     accumulatedUIMessages = [...payload.headStartMessages];
                 }
                 if (accumulatedUIMessages.length > 0) {
+                    // Resolve a function-form `tools` with the run/continuation payload's
+                    // clientData so this conversion of the restored history applies each
+                    // tool's toModelOutput (static tools were already seeded above). This
+                    // only re-renders saved history, so it fails open: a resolver hiccup
+                    // logs and converts without tools rather than blocking the resume.
+                    // Per-turn resolveTurnTools still fails closed for live turns.
+                    if (typeof toolsOption === "function") {
+                        try {
+                            await resolveTurnTools({
+                                chatId: payload.chatId,
+                                turn: 0,
+                                continuation: payload.continuation ?? false,
+                                clientData: parseClientData
+                                    ? await parseClientData(payload.metadata)
+                                    : payload.metadata,
+                            });
+                        }
+                        catch (error) {
+                            v3_1.logger.warn("chat.agent: tools() resolver threw at boot; restored history converted without toModelOutput", { error: error instanceof Error ? error.message : String(error) });
+                        }
+                    }
                     try {
                         accumulatedMessages = await toModelMessages(accumulatedUIMessages);
                     }
@@ -3361,6 +3460,10 @@ function chatAgent(options) {
                                 continuation,
                                 clientData,
                             });
+                            // Resolve the per-turn `tools` set now that turn context
+                            // (incl. parsed clientData) exists, so every toModelMessages
+                            // call this turn can re-apply tool `toModelOutput`.
+                            await resolveTurnTools();
                             // Per-turn stop controller (reset each turn)
                             const stopController = new AbortController();
                             currentStopController = stopController;
@@ -3736,7 +3839,7 @@ function chatAgent(options) {
                                         const resolvedOptions = resolveUIMessageStreamOptions();
                                         const uiStream = actionStreamResult.toUIMessageStream({
                                             ...resolvedOptions,
-                                            generateMessageId: resolvedOptions.generateMessageId ?? ai_1.generateId,
+                                            generateMessageId: resolvedOptions.generateMessageId ?? ai_runtime_js_1.generateId,
                                         });
                                         await pipeChat(uiStream, {
                                             signal: combinedSignal,
@@ -3930,6 +4033,7 @@ function chatAgent(options) {
                                             previousTurnUsage,
                                             totalUsage: cumulativeUsage,
                                             ctx,
+                                            tools: locals_js_1.locals.get(chatResolvedToolsKey) ?? {},
                                             signal: combinedSignal,
                                             cancelSignal,
                                             stopSignal,
@@ -3959,7 +4063,7 @@ function chatAgent(options) {
                                             // Always provide generateMessageId so the start chunk carries a
                                             // messageId. Without this, the frontend and backend generate IDs
                                             // independently and they won't match for ID-based dedup.
-                                            generateMessageId: resolvedOptions.generateMessageId ?? ai_1.generateId,
+                                            generateMessageId: resolvedOptions.generateMessageId ?? ai_runtime_js_1.generateId,
                                             onFinish: ({ responseMessage, finishReason, }) => {
                                                 capturedResponseMessage = responseMessage;
                                                 capturedFinishReason = finishReason;
@@ -4087,7 +4191,7 @@ function chatAgent(options) {
                                     // may produce a message with an empty ID since IDs are normally
                                     // assigned by the frontend's useChat).
                                     if (!capturedResponseMessage.id) {
-                                        capturedResponseMessage = { ...capturedResponseMessage, id: (0, ai_1.generateId)() };
+                                        capturedResponseMessage = { ...capturedResponseMessage, id: (0, ai_runtime_js_1.generateId)() };
                                     }
                                     // Append any non-transient data parts queued via chat.response or writer.write()
                                     const queuedParts = locals_js_1.locals.get(chatResponsePartsKey);
@@ -4143,7 +4247,7 @@ function chatAgent(options) {
                                     const remainingParts = locals_js_1.locals.get(chatResponsePartsKey);
                                     if (remainingParts && remainingParts.length > 0) {
                                         capturedResponseMessage = {
-                                            id: (0, ai_1.generateId)(),
+                                            id: (0, ai_runtime_js_1.generateId)(),
                                             role: "assistant",
                                             parts: [...remainingParts],
                                         };
@@ -4185,7 +4289,7 @@ function chatAgent(options) {
                                     });
                                     if (shouldTrigger) {
                                         await tracer_js_1.tracer.startActiveSpan("context compaction (outer loop)", async (compactionSpan) => {
-                                            const compactionId = (0, ai_1.generateId)();
+                                            const compactionId = (0, ai_runtime_js_1.generateId)();
                                             const { waitUntilComplete } = chatStream.writer({
                                                 spanName: "stream compaction chunks",
                                                 collapsed: true,
@@ -5259,7 +5363,7 @@ class ChatMessageAccumulator {
     }
     async addResponse(response) {
         if (!response.id) {
-            response = { ...response, id: (0, ai_1.generateId)() };
+            response = { ...response, id: (0, ai_runtime_js_1.generateId)() };
         }
         this.uiMessages.push(response);
         try {
@@ -5588,7 +5692,7 @@ function createChatSession(payload, options) {
                                 const queuedParts = locals_js_1.locals.get(chatResponsePartsKey);
                                 if (queuedParts && queuedParts.length > 0) {
                                     await accumulator.addResponse({
-                                        id: (0, ai_1.generateId)(),
+                                        id: (0, ai_runtime_js_1.generateId)(),
                                         role: "assistant",
                                         parts: queuedParts,
                                     });