@trigger.dev/sdk 4.6.1 → 4.6.2

package/dist/commonjs/v3/ai.d.ts

@@ -667,14 +667,24 @@ export type CompactedEvent = {
 export type ShouldCompactEvent = {
     /** The current model messages (full conversation). */
     messages: ModelMessage[];
-    /** Total token count from the triggering step/turn. */
+    /**
+     * Total token count of the triggering model call: the step that just finished
+     * (`"inner"`), or the turn's LAST step (`"outer"`). This is the size of the
+     * context the model held on that call, which is what a compaction decision is
+     * about. It is never the sum over a multi-step turn; see `turnUsage` for that.
+     */
     totalTokens: number | undefined;
-    /** Input token count from the triggering step/turn. */
+    /** Input token count of the triggering model call (see `totalTokens`). */
     inputTokens: number | undefined;
-    /** Output token count from the triggering step/turn. */
+    /** Output token count of the triggering model call (see `totalTokens`). */
     outputTokens: number | undefined;
-    /** Full usage object from the triggering step/turn. */
+    /** Full usage object of the triggering model call (see `totalTokens`). */
     usage?: LanguageModelUsage;
+    /**
+     * The whole turn's usage summed over every step, as the provider billed it.
+     * Only present when `source` is `"outer"`.
+     */
+    turnUsage?: LanguageModelUsage;
     /** Cumulative token usage across all completed turns. Present in chat.agent contexts. */
     totalUsage?: LanguageModelUsage;
     /** The chat session ID (if running inside a chat.agent). */
@@ -2899,6 +2909,8 @@ declare class ChatMessageAccumulator {
     modelMessages: ModelMessage[];
     uiMessages: UIMessage[];
     private _compaction?;
+    /** The run a spliced head-start partial contributed, until its response replaces it. */
+    private _handoverRun?;
     private _pendingMessages?;
     private _steeringQueue;
     constructor(options?: {
@@ -2995,8 +3007,10 @@ declare class ChatMessageAccumulator {
     } | undefined>) | undefined;
     /**
      * Run outer-loop compaction if needed. Call after adding the response
-     * and capturing usage. Applies `compactModelMessages` and `compactUIMessages`
-     * callbacks if configured.
+     * and capturing usage. Pass the LAST step's usage (`result.usage`), which is
+     * the context the model held on its final call; `result.totalUsage` sums every
+     * step of a tool-using turn and belongs in `context.turnUsage`. Applies
+     * `compactModelMessages` and `compactUIMessages` callbacks if configured.
      *
      * @returns `true` if compaction was performed, `false` otherwise.
      */
@@ -3004,6 +3018,8 @@ declare class ChatMessageAccumulator {
         chatId?: string;
         turn?: number;
         clientData?: unknown;
+        /** The whole turn summed over its steps (`result.totalUsage`). */
+        turnUsage?: LanguageModelUsage;
         totalUsage?: LanguageModelUsage;
     }): Promise<boolean>;
 }

package/dist/commonjs/v3/ai.js

@@ -15,6 +15,7 @@ const v3_1 = require("@trigger.dev/core/v3");
 // Runtime VALUES go through the ESM/CJS shim so the CJS build can `require`
 // ESM-only `ai@7` (see ../imports/ai-runtime.ts).
 const api_1 = require("@opentelemetry/api");
+const sessionTracing_js_1 = require("./sessionTracing.js");
 const ai_runtime_js_1 = require("../imports/ai-runtime.js");
 const transcriptStorage_js_1 = require("./transcriptStorage.js");
 let transcriptStorageOverride;
@@ -1110,7 +1111,7 @@ async function waitOnChatRoute(route, options) {
     return tracer_js_1.tracer.startActiveSpan(options.spanName ?? `chat.${route}.wait()`, async (span) => {
         const idleMs = (options.idleTimeoutInSeconds ?? 0) * 1000;
         if (idleMs > 0) {
-            const warm = await router.next(route, { timeoutMs: idleMs });
+            const warm = await (0, sessionTracing_js_1.traceSessionIdle)(session.id, idleMs / 1000, () => router.next(route, { timeoutMs: idleMs }));
             if (warm) {
                 span.setAttribute("wait.resolved", "idle");
                 return { ok: true, output: warm.data, record: warm };
@@ -1164,10 +1165,6 @@ async function waitOnChatRoute(route, options) {
             session: session.id,
             io: "in",
             route,
-            ...(0, v3_1.accessoryAttributes)({
-                items: [{ text: `${session.id}.in:${route}`, variant: "normal" }],
-                style: "codepath",
-            }),
         },
     });
 }
@@ -1843,6 +1840,14 @@ const chatHandoverPartialKey = locals_js_1.locals.create("chat.handoverPartial")
  * @internal
  */
 const chatHandoverMessageIdKey = locals_js_1.locals.create("chat.handoverMessageId");
+/**
+ * The model messages a turn-0 head-start splice contributed to the model lane,
+ * keyed by the UI message id it was synthesized under. When the agent's response
+ * completes that message under the same id, this is the run to replace: the UI
+ * form alone converts to something else (its pending tool calls drop out, the
+ * approval round was never on it), so it cannot locate the run itself.
+ */
+const chatHandoverSplicedRunKey = locals_js_1.locals.create("chat.handoverSplicedRun");
 /**
  * Run-scoped slot indicating that the customer's step-1 head-start
  * response is the FINAL turn response. When true, turn 0 runs through
@@ -1926,16 +1931,19 @@ function synthesizeHandoverUIMessage(partial, messageId) {
  */
 function spliceHandoverPartial(modelMessages, uiMessages, signal) {
     if (!signal.partialAssistantMessage || signal.partialAssistantMessage.length === 0) {
-        return;
+        return undefined;
     }
     // Skip if the hydrated chain already persisted the partial under this id.
     const alreadyInChain = signal.messageId !== undefined && uiMessages.some((m) => m.id === signal.messageId);
     if (alreadyInChain)
-        return;
-    modelMessages.push(...signal.partialAssistantMessage);
+        return undefined;
+    const run = [...signal.partialAssistantMessage];
+    modelMessages.push(...run);
     const partialUI = synthesizeHandoverUIMessage(signal.partialAssistantMessage, signal.messageId);
-    if (partialUI)
-        uiMessages.push(partialUI);
+    if (!partialUI)
+        return undefined;
+    uiMessages.push(partialUI);
+    return { id: partialUI.id, run };
 }
 /**
  * Per-turn background context queue. Messages added via `chat.backgroundWork.inject()`
@@ -3665,8 +3673,8 @@ function isActionTurn(value) {
  * tail does not match the old message's conversion, nothing is changed and
  * `false` is returned so the caller can fall back to a full reconversion.
  */
-async function replaceModelRun(lane, oldUi, newUi, tailAfter) {
-    const oldRun = await toModelMessages([stripProviderMetadata(oldUi)]);
+async function replaceModelRun(lane, oldUi, newUi, tailAfter, knownOldRun) {
+    const oldRun = knownOldRun ?? (await toModelMessages([stripProviderMetadata(oldUi)]));
     const newRun = await toModelMessages([stripProviderMetadata(newUi)]);
     // A message that converts to nothing (a pending tool call with no output yet,
     // which `ignoreIncompleteToolCalls` drops) locates no run in the lane. Matching
@@ -4798,7 +4806,7 @@ function chatAgent(options) {
                     const preloadResult = await messagesInput.waitWithIdleTimeout({
                         idleTimeoutInSeconds: effectivePreloadIdleTimeout,
                         timeout: effectivePreloadTimeout,
-                        spanName: "waiting for first message",
+                        spanName: "first message",
                         skipSuspend: exitAfterPreloadIdle,
                         onSuspend: onChatSuspend
                             ? async () => {
@@ -4950,7 +4958,7 @@ function chatAgent(options) {
                         const continuationResult = await messagesInput.waitWithIdleTimeout({
                             idleTimeoutInSeconds: effectiveIdleTimeout,
                             timeout: effectiveTurnTimeout,
-                            spanName: "waiting for first message (continuation)",
+                            spanName: "first message (continuation)",
                             onSuspend: onChatSuspend
                                 ? async () => {
                                     await tracer_js_1.tracer.startActiveSpan("onChatSuspend()", async () => {
@@ -5479,10 +5487,12 @@ function chatAgent(options) {
                                     // `UIMessageStreamError: No tool invocation found`.
                                     const pendingHandoverPartial = locals_js_1.locals.get(chatHandoverPartialKey);
                                     if (pendingHandoverPartial && pendingHandoverPartial.length > 0) {
-                                        spliceHandoverPartial(accumulatedMessages, accumulatedUIMessages, {
+                                        const spliced = spliceHandoverPartial(accumulatedMessages, accumulatedUIMessages, {
                                             partialAssistantMessage: pendingHandoverPartial,
                                             messageId: locals_js_1.locals.get(chatHandoverMessageIdKey),
                                         });
+                                        if (spliced)
+                                            locals_js_1.locals.set(chatHandoverSplicedRunKey, spliced);
                                         locals_js_1.locals.set(chatHandoverPartialKey, []); // consume once
                                         splicedHandoverPartial = true;
                                     }
@@ -5827,6 +5837,7 @@ function chatAgent(options) {
                                 // never reports final usage), which would block the turn loop
                                 // from ever firing onTurnComplete / writeTurnComplete.
                                 let turnUsage;
+                                let lastStepUsage;
                                 if (runResult != null &&
                                     typeof runResult.totalUsage?.then === "function") {
                                     try {
@@ -5839,6 +5850,18 @@ function chatAgent(options) {
                                         /* non-fatal — usage capture failed */
                                     }
                                 }
+                                const lastStepUsagePromise = runResult != null ? runResult.usage : undefined;
+                                if (typeof lastStepUsagePromise?.then === "function") {
+                                    try {
+                                        lastStepUsage = (await Promise.race([
+                                            lastStepUsagePromise,
+                                            new Promise((r) => setTimeout(() => r(undefined), 2_000)),
+                                        ]));
+                                    }
+                                    catch {
+                                        /* non-fatal — usage capture failed */
+                                    }
+                                }
                                 if (turnUsage) {
                                     cumulativeUsage = addUsage(cumulativeUsage, turnUsage);
                                     previousTurnUsage = turnUsage;
@@ -5984,8 +6007,14 @@ function chatAgent(options) {
                                                 stripProviderMetadata(capturedResponseMessage),
                                             ]);
                                             if (existingIdx !== -1) {
+                                                const spliced = locals_js_1.locals.get(chatHandoverSplicedRunKey);
+                                                const splicedRun = spliced && previousAtIdx && spliced.id === previousAtIdx.id
+                                                    ? spliced.run
+                                                    : undefined;
                                                 const ok = previousAtIdx !== undefined &&
-                                                    (await replaceModelRun(accumulatedMessages, previousAtIdx, capturedResponseMessage, steerTailThisTurn));
+                                                    (await replaceModelRun(accumulatedMessages, previousAtIdx, capturedResponseMessage, steerTailThisTurn, splicedRun));
+                                                if (splicedRun)
+                                                    locals_js_1.locals.set(chatHandoverSplicedRunKey, undefined);
                                                 if (!ok) {
                                                     v3_1.logger.warn("chat.agent: replaced response not found at the model lane tail; reconverting the lane");
                                                     accumulatedMessages = await toModelMessages(accumulatedUIMessages);
@@ -6045,12 +6074,14 @@ function chatAgent(options) {
                                 const outerCompaction = locals_js_1.locals.get(chatAgentCompactionKey);
                                 const innerCompactionState = locals_js_1.locals.get(chatCompactionStateKey);
                                 if (outerCompaction && !innerCompactionState && turnUsage && !wasStopped) {
+                                    const contextUsage = lastStepUsage ?? turnUsage;
                                     const shouldTrigger = await outerCompaction.shouldCompact({
                                         messages: accumulatedMessages,
-                                        totalTokens: turnUsage.totalTokens,
-                                        inputTokens: turnUsage.inputTokens,
-                                        outputTokens: turnUsage.outputTokens,
-                                        usage: turnUsage,
+                                        totalTokens: contextUsage.totalTokens,
+                                        inputTokens: contextUsage.inputTokens,
+                                        outputTokens: contextUsage.outputTokens,
+                                        usage: contextUsage,
+                                        turnUsage,
                                         totalUsage: cumulativeUsage,
                                         chatId: currentWirePayload.chatId,
                                         turn,
@@ -6375,7 +6406,7 @@ function chatAgent(options) {
                             const next = await messagesInput.waitWithIdleTimeout({
                                 idleTimeoutInSeconds: effectiveIdleTimeout,
                                 timeout: effectiveTurnTimeout,
-                                spanName: "waiting for next message",
+                                spanName: "next message",
                                 onSuspend: onChatSuspend
                                     ? async () => {
                                         await tracer_js_1.tracer.startActiveSpan("onChatSuspend()", async () => {
@@ -6712,7 +6743,7 @@ function chatAgent(options) {
                         const next = await messagesInput.waitWithIdleTimeout({
                             idleTimeoutInSeconds: effectiveIdleTimeout,
                             timeout: effectiveTurnTimeout,
-                            spanName: "waiting for next message (after error)",
+                            spanName: "next message (after error)",
                         });
                         if (!next.ok) {
                             return; // Timed out — end run gracefully
@@ -7752,6 +7783,8 @@ class ChatMessageAccumulator {
     modelMessages = [];
     uiMessages = [];
     _compaction;
+    /** The run a spliced head-start partial contributed, until its response replaces it. */
+    _handoverRun;
     _pendingMessages;
     _steeringQueue = [];
     constructor(options) {
@@ -7795,7 +7828,7 @@ class ChatMessageAccumulator {
      * `consumeHandover` for the wait+seed+apply convenience.
      */
     applyHandover(signal) {
-        spliceHandoverPartial(this.modelMessages, this.uiMessages, signal);
+        this._handoverRun = spliceHandoverPartial(this.modelMessages, this.uiMessages, signal);
     }
     /**
      * One-call `chat.headStart` handover for a custom-agent loop: waits for the
@@ -7838,8 +7871,13 @@ class ChatMessageAccumulator {
         if (existingIdx !== -1) {
             const previous = this.uiMessages[existingIdx];
             this.uiMessages[existingIdx] = response;
+            const handoverRun = this._handoverRun && this._handoverRun.id === previous.id
+                ? this._handoverRun.run
+                : undefined;
+            if (handoverRun)
+                this._handoverRun = undefined;
             try {
-                if (!(await replaceModelRun(this.modelMessages, previous, response, 0))) {
+                if (!(await replaceModelRun(this.modelMessages, previous, response, 0, handoverRun))) {
                     this.modelMessages = await toModelMessages(this.uiMessages.map((m) => stripProviderMetadata(m)));
                 }
             }
@@ -7942,8 +7980,10 @@ class ChatMessageAccumulator {
     }
     /**
      * Run outer-loop compaction if needed. Call after adding the response
-     * and capturing usage. Applies `compactModelMessages` and `compactUIMessages`
-     * callbacks if configured.
+     * and capturing usage. Pass the LAST step's usage (`result.usage`), which is
+     * the context the model held on its final call; `result.totalUsage` sums every
+     * step of a tool-using turn and belongs in `context.turnUsage`. Applies
+     * `compactModelMessages` and `compactUIMessages` callbacks if configured.
      *
      * @returns `true` if compaction was performed, `false` otherwise.
      */
@@ -7956,6 +7996,7 @@ class ChatMessageAccumulator {
             inputTokens: usage.inputTokens,
             outputTokens: usage.outputTokens,
             usage,
+            turnUsage: context?.turnUsage,
             totalUsage: context?.totalUsage,
             chatId: context?.chatId,
             turn: context?.turn,
@@ -8188,8 +8229,8 @@ function createChatSession(payload, options) {
                             idleTimeoutInSeconds: sessionIdleTimeoutOpt ?? currentPayload.idleTimeoutInSeconds ?? 30,
                             timeout,
                             spanName: currentPayload.trigger === "preload"
-                                ? "waiting for first message"
-                                : "waiting for first message (continuation)",
+                                ? "first message"
+                                : "first message (continuation)",
                         });
                         if (!result.ok || runSignal.aborted) {
                             stop.cleanup();
@@ -8226,7 +8267,7 @@ function createChatSession(payload, options) {
                         const next = await messagesInput.waitWithIdleTimeout({
                             idleTimeoutInSeconds,
                             timeout,
-                            spanName: "waiting for next message",
+                            spanName: "next message",
                         });
                         if (!next.ok || runSignal.aborted) {
                             stop.cleanup();
@@ -8437,6 +8478,7 @@ function createChatSession(payload, options) {
                             // indefinitely, which would wedge the turn loop (same guard as
                             // chat.agent's turn loop).
                             let turnUsage;
+                            let lastStepUsage;
                             if (typeof source.totalUsage?.then === "function") {
                                 try {
                                     const usage = (await Promise.race([
@@ -8453,14 +8495,28 @@ function createChatSession(payload, options) {
                                     /* non-fatal */
                                 }
                             }
+                            const lastStepUsagePromise = source.usage;
+                            if (typeof lastStepUsagePromise?.then === "function") {
+                                try {
+                                    lastStepUsage = (await Promise.race([
+                                        lastStepUsagePromise,
+                                        new Promise((r) => setTimeout(() => r(undefined), 2_000)),
+                                    ]));
+                                }
+                                catch {
+                                    /* non-fatal */
+                                }
+                            }
                             // Outer-loop compaction (same logic as chat.agent)
                             if (sessionCompaction && turnUsage && !turnObj.stopped) {
+                                const contextUsage = lastStepUsage ?? turnUsage;
                                 const shouldTrigger = await sessionCompaction.shouldCompact({
                                     messages: accumulator.modelMessages,
-                                    totalTokens: turnUsage.totalTokens,
-                                    inputTokens: turnUsage.inputTokens,
-                                    outputTokens: turnUsage.outputTokens,
-                                    usage: turnUsage,
+                                    totalTokens: contextUsage.totalTokens,
+                                    inputTokens: contextUsage.inputTokens,
+                                    outputTokens: contextUsage.outputTokens,
+                                    usage: contextUsage,
+                                    turnUsage,
                                     totalUsage: cumulativeUsage,
                                     chatId: currentPayload.chatId,
                                     turn,