@dexto/core 1.1.11 → 1.2.0

package/dist/llm/services/vercel.cjs

@@ -1,8 +1,15 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,6 +23,44 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __decoratorStart = (base) => [, , , __create(base?.[__knownSymbol("metadata")] ?? null)];
+var __decoratorStrings = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
+var __expectFn = (fn) => fn !== void 0 && typeof fn !== "function" ? __typeError("Function expected") : fn;
+var __decoratorContext = (kind, name, done, metadata, fns) => ({ kind: __decoratorStrings[kind], name, metadata, addInitializer: (fn) => done._ ? __typeError("Already initialized") : fns.push(__expectFn(fn || null)) });
+var __decoratorMetadata = (array, target) => __defNormalProp(target, __knownSymbol("metadata"), array[3]);
+var __runInitializers = (array, flags, self, value) => {
+  for (var i = 0, fns = array[flags >> 1], n = fns && fns.length; i < n; i++) flags & 1 ? fns[i].call(self) : value = fns[i].call(self, value);
+  return value;
+};
+var __decorateElement = (array, flags, name, decorators, target, extra) => {
+  var fn, it, done, ctx, access, k = flags & 7, s = !!(flags & 8), p = !!(flags & 16);
+  var j = k > 3 ? array.length + 1 : k ? s ? 1 : 2 : 0, key = __decoratorStrings[k + 5];
+  var initializers = k > 3 && (array[j - 1] = []), extraInitializers = array[j] || (array[j] = []);
+  var desc = k && (!p && !s && (target = target.prototype), k < 5 && (k > 3 || !p) && __getOwnPropDesc(k < 4 ? target : { get [name]() {
+    return __privateGet(this, extra);
+  }, set [name](x) {
+    return __privateSet(this, extra, x);
+  } }, name));
+  k ? p && k < 4 && __name(extra, (k > 2 ? "set " : k > 1 ? "get " : "") + name) : __name(target, name);
+  for (var i = decorators.length - 1; i >= 0; i--) {
+    ctx = __decoratorContext(k, name, done = {}, array[3], extraInitializers);
+    if (k) {
+      ctx.static = s, ctx.private = p, access = ctx.access = { has: p ? (x) => __privateIn(target, x) : (x) => name in x };
+      if (k ^ 3) access.get = p ? (x) => (k ^ 1 ? __privateGet : __privateMethod)(x, target, k ^ 4 ? extra : desc.get) : (x) => x[name];
+      if (k > 2) access.set = p ? (x, y) => __privateSet(x, target, y, k ^ 4 ? extra : desc.set) : (x, y) => x[name] = y;
+    }
+    it = (0, decorators[i])(k ? k < 4 ? p ? extra : desc[key] : k > 4 ? void 0 : { get: desc.get, set: desc.set } : target, ctx), done._ = 1;
+    if (k ^ 4 || it === void 0) __expectFn(it) && (k > 4 ? initializers.unshift(it) : k ? p ? extra = it : desc[key] = it : target = it);
+    else if (typeof it !== "object" || it === null) __typeError("Object expected");
+    else __expectFn(fn = it.get) && (desc.get = fn), __expectFn(fn = it.set) && (desc.set = fn), __expectFn(fn = it.init) && initializers.unshift(fn);
+  }
+  return k || __decoratorMetadata(array, target), desc && __defProp(target, name, desc), p ? k ^ 4 ? extra : desc : target;
+};
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateIn = (member, obj) => Object(obj) !== obj ? __typeError('Cannot use the "in" operator on this value') : member.has(obj);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
+var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 var vercel_exports = {};
 __export(vercel_exports, {
   VercelLLMService: () => VercelLLMService
@@ -35,6 +80,13 @@ var import_error_conversion = require("../../utils/error-conversion.js");
 var import_error_codes2 = require("../../tools/error-codes.js");
 var import_vercel = require("../formatters/vercel.js");
 var import_factory = require("../tokenizer/factory.js");
+var import_decorators = require("../../telemetry/decorators.js");
+var import_api = require("@opentelemetry/api");
+var _VercelLLMService_decorators, _init;
+_VercelLLMService_decorators = [(0, import_decorators.InstrumentClass)({
+  prefix: "llm.vercel",
+  excludeMethods: ["getModelId", "getAllTools", "formatTools", "validateToolSupport"]
+})];
 class VercelLLMService {
   model;
   config;
@@ -43,8 +95,6 @@ class VercelLLMService {
   sessionEventBus;
   sessionId;
   toolSupportCache = /* @__PURE__ */ new Map();
-  // Map of toolCallId -> queue of raw results to emit with that callId
-  rawResultsByCallId = /* @__PURE__ */ new Map();
   /**
    * Helper to extract model ID from LanguageModel union type (string | LanguageModelV2)
    */
@@ -86,28 +136,72 @@ class VercelLLMService {
         acc[toolName] = {
           inputSchema: (0, import_ai2.jsonSchema)(tool.parameters),
           execute: async (args, options) => {
+            const callId = options.toolCallId;
             try {
+              import_logger.logger.debug(
+                `[vercel] Emitting toolCall event for ${toolName} with callId ${callId}`
+              );
+              this.sessionEventBus.emit("llmservice:toolCall", {
+                toolName,
+                args,
+                callId
+              });
               const rawResult = await this.toolManager.executeTool(
                 toolName,
                 args,
                 this.sessionId
               );
-              const callId = options.toolCallId;
-              const queue = this.rawResultsByCallId.get(callId) ?? [];
-              queue.push(rawResult);
-              this.rawResultsByCallId.set(callId, queue);
-              const normalized = await (0, import_utils.normalizeToolResult)(rawResult);
-              const summaryText = (0, import_utils.summarizeToolContentForText)(normalized.parts);
+              const persisted = await this.contextManager.addToolResult(
+                callId,
+                toolName,
+                rawResult,
+                { success: true }
+              );
+              import_logger.logger.debug(
+                `[vercel] Emitting toolResult event for ${toolName} with callId ${callId}`
+              );
+              this.sessionEventBus.emit("llmservice:toolResult", {
+                toolName,
+                callId,
+                success: true,
+                sanitized: persisted,
+                ...(0, import_debug.shouldIncludeRawToolResult)() ? { rawResult } : {}
+              });
+              const summaryText = (0, import_utils.summarizeToolContentForText)(persisted.content);
               return summaryText;
             } catch (err) {
+              let errorResult;
+              let errorFlags = "";
               if (err instanceof import_DextoRuntimeError.DextoRuntimeError && err.code === import_error_codes2.ToolErrorCode.EXECUTION_DENIED) {
-                return { error: err.message, denied: true };
+                errorResult = { error: err.message, denied: true };
+                errorFlags = " (denied)";
+              } else if (err instanceof import_DextoRuntimeError.DextoRuntimeError && err.code === import_error_codes2.ToolErrorCode.CONFIRMATION_TIMEOUT) {
+                errorResult = { error: err.message, denied: true, timeout: true };
+                errorFlags = " (timeout)";
+              } else {
+                const message = err instanceof Error ? err.message : String(err);
+                errorResult = { error: message };
               }
-              if (err instanceof import_DextoRuntimeError.DextoRuntimeError && err.code === import_error_codes2.ToolErrorCode.CONFIRMATION_TIMEOUT) {
-                return { error: err.message, denied: true, timeout: true };
+              try {
+                const persisted = await this.contextManager.addToolResult(
+                  callId,
+                  toolName,
+                  errorResult,
+                  { success: false }
+                );
+                this.sessionEventBus.emit("llmservice:toolResult", {
+                  toolName,
+                  callId,
+                  success: false,
+                  sanitized: persisted,
+                  ...(0, import_debug.shouldIncludeRawToolResult)() ? { rawResult: errorResult } : {}
+                });
+              } catch (persistErr) {
+                import_logger.logger.error(
+                  `Failed to persist error result for ${toolName}: ${String(persistErr)}`
+                );
               }
-              const message = err instanceof Error ? err.message : String(err);
-              return { error: message };
+              return `Tool ${toolName} failed${errorFlags}: ${errorResult.error}`;
             }
           },
           ...tool.description && { description: tool.description }
@@ -241,48 +335,6 @@ class VercelLLMService {
           import_logger.logger.debug(
             `Step finished, step tool results: ${JSON.stringify(step.toolResults, null, 2)}`
           );
-          if (step.toolCalls && step.toolCalls.length > 0) {
-            for (const toolCall of step.toolCalls) {
-              this.sessionEventBus.emit("llmservice:toolCall", {
-                toolName: toolCall.toolName,
-                args: toolCall.input,
-                callId: toolCall.toolCallId
-              });
-            }
-          }
-          if (step.toolResults && step.toolResults.length > 0) {
-            for (const toolResult of step.toolResults) {
-              const callId = toolResult.toolCallId;
-              const sanitizedFromSdk = toolResult.output;
-              let raw;
-              if (callId) {
-                const q = this.rawResultsByCallId.get(callId) ?? [];
-                raw = q.shift();
-                if (q.length > 0) this.rawResultsByCallId.set(callId, q);
-                else this.rawResultsByCallId.delete(callId);
-              }
-              try {
-                const effectiveCallId = callId ?? `${toolResult.toolName}-${Date.now()}`;
-                const persisted = await this.contextManager.addToolResult(
-                  effectiveCallId,
-                  toolResult.toolName,
-                  raw ?? sanitizedFromSdk,
-                  { success: true }
-                );
-                this.sessionEventBus.emit("llmservice:toolResult", {
-                  toolName: toolResult.toolName,
-                  callId: effectiveCallId,
-                  success: true,
-                  sanitized: persisted,
-                  ...(0, import_debug.shouldIncludeRawToolResult)() ? { rawResult: raw ?? sanitizedFromSdk } : {}
-                });
-              } catch (err) {
-                import_logger.logger.error(
-                  `Failed to persist tool result for ${toolResult.toolName}: ${String(err)}`
-                );
-              }
-            }
-          }
         },
         stopWhen: (0, import_ai.stepCountIs)(maxSteps),
         ...includeMaxOutputTokens ? { maxOutputTokens } : {},
@@ -309,6 +361,23 @@ class VercelLLMService {
           }
         }
       });
+      const activeSpan = import_api.trace.getActiveSpan();
+      if (activeSpan) {
+        const attributes = {};
+        if (response.totalUsage.inputTokens !== void 0) {
+          attributes["gen_ai.usage.input_tokens"] = response.totalUsage.inputTokens;
+        }
+        if (response.totalUsage.outputTokens !== void 0) {
+          attributes["gen_ai.usage.output_tokens"] = response.totalUsage.outputTokens;
+        }
+        if (response.totalUsage.totalTokens !== void 0) {
+          attributes["gen_ai.usage.total_tokens"] = response.totalUsage.totalTokens;
+        }
+        if (response.totalUsage.reasoningTokens !== void 0) {
+          attributes["gen_ai.usage.reasoning_tokens"] = response.totalUsage.reasoningTokens;
+        }
+        activeSpan.setAttributes(attributes);
+      }
       await this.contextManager.processLLMResponse(response);
       if (typeof response.totalUsage.totalTokens === "number") {
         this.contextManager.updateActualTokenCount(response.totalUsage.totalTokens);
@@ -432,48 +501,6 @@ class VercelLLMService {
         import_logger.logger.debug(
           `Step finished, step tool results: ${JSON.stringify(step.toolResults, null, 2)}`
         );
-        if (step.toolCalls && step.toolCalls.length > 0) {
-          for (const toolCall of step.toolCalls) {
-            this.sessionEventBus.emit("llmservice:toolCall", {
-              toolName: toolCall.toolName,
-              args: toolCall.input,
-              callId: toolCall.toolCallId
-            });
-          }
-        }
-        if (step.toolResults && step.toolResults.length > 0) {
-          for (const toolResult of step.toolResults) {
-            const callId = toolResult.toolCallId;
-            const sanitizedFromSdk = toolResult.output;
-            let raw;
-            if (callId) {
-              const q = this.rawResultsByCallId.get(callId) ?? [];
-              raw = q.shift();
-              if (q.length > 0) this.rawResultsByCallId.set(callId, q);
-              else this.rawResultsByCallId.delete(callId);
-            }
-            try {
-              const effectiveCallId = callId ?? `${toolResult.toolName}-${Date.now()}`;
-              const persisted = await this.contextManager.addToolResult(
-                effectiveCallId,
-                toolResult.toolName,
-                raw ?? sanitizedFromSdk,
-                { success: true }
-              );
-              this.sessionEventBus.emit("llmservice:toolResult", {
-                toolName: toolResult.toolName,
-                callId: effectiveCallId,
-                success: true,
-                sanitized: persisted,
-                ...(0, import_debug.shouldIncludeRawToolResult)() ? { rawResult: raw ?? sanitizedFromSdk } : {}
-              });
-            } catch (err) {
-              import_logger.logger.error(
-                `Failed to persist tool result for ${toolResult.toolName}: ${String(err)}`
-              );
-            }
-          }
-        }
       },
       // No onFinish: we finalize after the stream completes below.
       stopWhen: (0, import_ai.stepCountIs)(maxSteps),
@@ -504,6 +531,23 @@ class VercelLLMService {
         ...usage.totalTokens !== void 0 && { totalTokens: usage.totalTokens }
       }
     });
+    const activeSpan = import_api.trace.getActiveSpan();
+    if (activeSpan) {
+      const attributes = {};
+      if (usage.inputTokens !== void 0) {
+        attributes["gen_ai.usage.input_tokens"] = usage.inputTokens;
+      }
+      if (usage.outputTokens !== void 0) {
+        attributes["gen_ai.usage.output_tokens"] = usage.outputTokens;
+      }
+      if (usage.totalTokens !== void 0) {
+        attributes["gen_ai.usage.total_tokens"] = usage.totalTokens;
+      }
+      if (usage.reasoningTokens !== void 0) {
+        attributes["gen_ai.usage.reasoning_tokens"] = usage.reasoningTokens;
+      }
+      activeSpan.setAttributes(attributes);
+    }
     if (typeof usage.totalTokens === "number") {
       this.contextManager.updateActualTokenCount(usage.totalTokens);
     }
@@ -550,6 +594,9 @@ class VercelLLMService {
     return this.contextManager;
   }
 }
+_init = __decoratorStart(null);
+VercelLLMService = __decorateElement(_init, 0, "VercelLLMService", _VercelLLMService_decorators, VercelLLMService);
+__runInitializers(_init, 1, VercelLLMService);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   VercelLLMService

package/dist/llm/services/vercel.d.ts

@@ -12,6 +12,12 @@ import type { ValidatedLLMConfig } from '../schemas.js';
 /**
  * Vercel AI SDK implementation of LLMService
  * TODO: improve token counting logic across all LLM services - approximation isn't matching vercel actual token count properly
+ * TODO (Telemetry): Add OpenTelemetry metrics collection
+ *   - LLM call counters (by provider/model)
+ *   - Token usage histograms (input/output/total/reasoning)
+ *   - Request latency histograms
+ *   - Error rate counters
+ *   See feature-plans/telemetry.md for details
  */
 export declare class VercelLLMService implements ILLMService {
     private model;
@@ -21,7 +27,6 @@ export declare class VercelLLMService implements ILLMService {
     private sessionEventBus;
     private readonly sessionId;
     private toolSupportCache;
-    private rawResultsByCallId;
     /**
      * Helper to extract model ID from LanguageModel union type (string | LanguageModelV2)
      */

package/dist/llm/services/vercel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,aAAa,EAEb,KAAK,YAAY,EAGpB,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,OAAO,IAAI,aAAa,EAAc,MAAM,IAAI,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAI7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAExD;;;GAGG;AACH,qBAAa,gBAAiB,YAAW,WAAW;IAChD,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,gBAAgB,CAAmC;IAE3D,OAAO,CAAC,kBAAkB,CAAqC;IAE/D;;OAEG;IACH,OAAO,CAAC,UAAU;gBAKd,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,aAAa,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,4BAA4B,EAC7C,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe;IAgCvE,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa;YAoD5B,mBAAmB;IA4D3B,YAAY,CACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,EACjC,SAAS,CAAC,EAAE,SAAS,EACrB,QAAQ,CAAC,EAAE,QAAQ,EACnB,MAAM,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,MAAM,CAAC;IAgEZ,YAAY,CACd,QAAQ,EAAE,YAAY,EAAE,EACxB,KAAK,EAAE,aAAa,EACpB,QAAQ,GAAE,MAAW,EACrB,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,MAAM,CAAC;IAiIlB,OAAO,CAAC,gBAAgB;IAgElB,UAAU,CACZ,QAAQ,EAAE,YAAY,EAAE,EACxB,KAAK,EAAE,aAAa,EACpB,QAAQ,GAAE,MAAW,EACrB,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,MAAM,CAAC;IA4KlB;;;OAGG;IACH,SAAS,IAAI,gBAAgB;IAgC7B;;OAEG;IACH,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;CAG/C"}
+{"version":3,"file":"vercel.d.ts","sourceRoot":"","sources":["../../../src/llm/services/vercel.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,aAAa,EAEb,KAAK,YAAY,EAGpB,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,OAAO,IAAI,aAAa,EAAc,MAAM,IAAI,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAI7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAIxD;;;;;;;;;GASG;AACH,qBAIa,gBAAiB,YAAW,WAAW;IAChD,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,gBAAgB,CAAmC;IAE3D;;OAEG;IACH,OAAO,CAAC,UAAU;gBAKd,WAAW,EAAE,WAAW,EACxB,KAAK,EAAE,aAAa,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,4BAA4B,EAC7C,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe;IAgCvE,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa;YA6G5B,mBAAmB;IA4D3B,YAAY,CACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,EACjC,SAAS,CAAC,EAAE,SAAS,EACrB,QAAQ,CAAC,EAAE,QAAQ,EACnB,MAAM,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,MAAM,CAAC;IAgEZ,YAAY,CACd,QAAQ,EAAE,YAAY,EAAE,EACxB,KAAK,EAAE,aAAa,EACpB,QAAQ,GAAE,MAAW,EACrB,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,MAAM,CAAC;IAuGlB,OAAO,CAAC,gBAAgB;IAgElB,UAAU,CACZ,QAAQ,EAAE,YAAY,EAAE,EACxB,KAAK,EAAE,aAAa,EACpB,QAAQ,GAAE,MAAW,EACrB,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,MAAM,CAAC;IA8IlB;;;OAGG;IACH,SAAS,IAAI,gBAAgB;IAgC7B;;OAEG;IACH,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;CAG/C"}

package/dist/llm/services/vercel.js

@@ -1,3 +1,9 @@
+import {
+  __decorateElement,
+  __decoratorStart,
+  __runInitializers
+} from "../../chunk-C6A6W6XS.js";
+var _VercelLLMService_decorators, _init;
 import {
   generateText,
   streamText,
@@ -7,7 +13,7 @@ import {
 import { logger } from "../../logger/index.js";
 import { jsonSchema } from "ai";
 import { ContextManager } from "../../context/manager.js";
-import { summarizeToolContentForText, normalizeToolResult } from "../../context/utils.js";
+import { summarizeToolContentForText } from "../../context/utils.js";
 import { shouldIncludeRawToolResult } from "../../utils/debug.js";
 import { getMaxInputTokensForModel, getEffectiveMaxInputTokens } from "../registry.js";
 import { DextoRuntimeError } from "../../errors/DextoRuntimeError.js";
@@ -17,6 +23,12 @@ import { toError } from "../../utils/error-conversion.js";
 import { ToolErrorCode } from "../../tools/error-codes.js";
 import { VercelMessageFormatter } from "../formatters/vercel.js";
 import { createTokenizer } from "../tokenizer/factory.js";
+import { InstrumentClass } from "../../telemetry/decorators.js";
+import { trace } from "@opentelemetry/api";
+_VercelLLMService_decorators = [InstrumentClass({
+  prefix: "llm.vercel",
+  excludeMethods: ["getModelId", "getAllTools", "formatTools", "validateToolSupport"]
+})];
 class VercelLLMService {
   model;
   config;
@@ -25,8 +37,6 @@ class VercelLLMService {
   sessionEventBus;
   sessionId;
   toolSupportCache = /* @__PURE__ */ new Map();
-  // Map of toolCallId -> queue of raw results to emit with that callId
-  rawResultsByCallId = /* @__PURE__ */ new Map();
   /**
    * Helper to extract model ID from LanguageModel union type (string | LanguageModelV2)
    */
@@ -68,28 +78,72 @@ class VercelLLMService {
         acc[toolName] = {
           inputSchema: jsonSchema(tool.parameters),
           execute: async (args, options) => {
+            const callId = options.toolCallId;
             try {
+              logger.debug(
+                `[vercel] Emitting toolCall event for ${toolName} with callId ${callId}`
+              );
+              this.sessionEventBus.emit("llmservice:toolCall", {
+                toolName,
+                args,
+                callId
+              });
               const rawResult = await this.toolManager.executeTool(
                 toolName,
                 args,
                 this.sessionId
               );
-              const callId = options.toolCallId;
-              const queue = this.rawResultsByCallId.get(callId) ?? [];
-              queue.push(rawResult);
-              this.rawResultsByCallId.set(callId, queue);
-              const normalized = await normalizeToolResult(rawResult);
-              const summaryText = summarizeToolContentForText(normalized.parts);
+              const persisted = await this.contextManager.addToolResult(
+                callId,
+                toolName,
+                rawResult,
+                { success: true }
+              );
+              logger.debug(
+                `[vercel] Emitting toolResult event for ${toolName} with callId ${callId}`
+              );
+              this.sessionEventBus.emit("llmservice:toolResult", {
+                toolName,
+                callId,
+                success: true,
+                sanitized: persisted,
+                ...shouldIncludeRawToolResult() ? { rawResult } : {}
+              });
+              const summaryText = summarizeToolContentForText(persisted.content);
               return summaryText;
             } catch (err) {
+              let errorResult;
+              let errorFlags = "";
               if (err instanceof DextoRuntimeError && err.code === ToolErrorCode.EXECUTION_DENIED) {
-                return { error: err.message, denied: true };
+                errorResult = { error: err.message, denied: true };
+                errorFlags = " (denied)";
+              } else if (err instanceof DextoRuntimeError && err.code === ToolErrorCode.CONFIRMATION_TIMEOUT) {
+                errorResult = { error: err.message, denied: true, timeout: true };
+                errorFlags = " (timeout)";
+              } else {
+                const message = err instanceof Error ? err.message : String(err);
+                errorResult = { error: message };
               }
-              if (err instanceof DextoRuntimeError && err.code === ToolErrorCode.CONFIRMATION_TIMEOUT) {
-                return { error: err.message, denied: true, timeout: true };
+              try {
+                const persisted = await this.contextManager.addToolResult(
+                  callId,
+                  toolName,
+                  errorResult,
+                  { success: false }
+                );
+                this.sessionEventBus.emit("llmservice:toolResult", {
+                  toolName,
+                  callId,
+                  success: false,
+                  sanitized: persisted,
+                  ...shouldIncludeRawToolResult() ? { rawResult: errorResult } : {}
+                });
+              } catch (persistErr) {
+                logger.error(
+                  `Failed to persist error result for ${toolName}: ${String(persistErr)}`
+                );
               }
-              const message = err instanceof Error ? err.message : String(err);
-              return { error: message };
+              return `Tool ${toolName} failed${errorFlags}: ${errorResult.error}`;
             }
           },
           ...tool.description && { description: tool.description }
@@ -223,48 +277,6 @@ class VercelLLMService {
           logger.debug(
             `Step finished, step tool results: ${JSON.stringify(step.toolResults, null, 2)}`
           );
-          if (step.toolCalls && step.toolCalls.length > 0) {
-            for (const toolCall of step.toolCalls) {
-              this.sessionEventBus.emit("llmservice:toolCall", {
-                toolName: toolCall.toolName,
-                args: toolCall.input,
-                callId: toolCall.toolCallId
-              });
-            }
-          }
-          if (step.toolResults && step.toolResults.length > 0) {
-            for (const toolResult of step.toolResults) {
-              const callId = toolResult.toolCallId;
-              const sanitizedFromSdk = toolResult.output;
-              let raw;
-              if (callId) {
-                const q = this.rawResultsByCallId.get(callId) ?? [];
-                raw = q.shift();
-                if (q.length > 0) this.rawResultsByCallId.set(callId, q);
-                else this.rawResultsByCallId.delete(callId);
-              }
-              try {
-                const effectiveCallId = callId ?? `${toolResult.toolName}-${Date.now()}`;
-                const persisted = await this.contextManager.addToolResult(
-                  effectiveCallId,
-                  toolResult.toolName,
-                  raw ?? sanitizedFromSdk,
-                  { success: true }
-                );
-                this.sessionEventBus.emit("llmservice:toolResult", {
-                  toolName: toolResult.toolName,
-                  callId: effectiveCallId,
-                  success: true,
-                  sanitized: persisted,
-                  ...shouldIncludeRawToolResult() ? { rawResult: raw ?? sanitizedFromSdk } : {}
-                });
-              } catch (err) {
-                logger.error(
-                  `Failed to persist tool result for ${toolResult.toolName}: ${String(err)}`
-                );
-              }
-            }
-          }
         },
         stopWhen: stepCountIs(maxSteps),
         ...includeMaxOutputTokens ? { maxOutputTokens } : {},
@@ -291,6 +303,23 @@ class VercelLLMService {
           }
         }
       });
+      const activeSpan = trace.getActiveSpan();
+      if (activeSpan) {
+        const attributes = {};
+        if (response.totalUsage.inputTokens !== void 0) {
+          attributes["gen_ai.usage.input_tokens"] = response.totalUsage.inputTokens;
+        }
+        if (response.totalUsage.outputTokens !== void 0) {
+          attributes["gen_ai.usage.output_tokens"] = response.totalUsage.outputTokens;
+        }
+        if (response.totalUsage.totalTokens !== void 0) {
+          attributes["gen_ai.usage.total_tokens"] = response.totalUsage.totalTokens;
+        }
+        if (response.totalUsage.reasoningTokens !== void 0) {
+          attributes["gen_ai.usage.reasoning_tokens"] = response.totalUsage.reasoningTokens;
+        }
+        activeSpan.setAttributes(attributes);
+      }
       await this.contextManager.processLLMResponse(response);
       if (typeof response.totalUsage.totalTokens === "number") {
         this.contextManager.updateActualTokenCount(response.totalUsage.totalTokens);
@@ -414,48 +443,6 @@ class VercelLLMService {
         logger.debug(
           `Step finished, step tool results: ${JSON.stringify(step.toolResults, null, 2)}`
         );
-        if (step.toolCalls && step.toolCalls.length > 0) {
-          for (const toolCall of step.toolCalls) {
-            this.sessionEventBus.emit("llmservice:toolCall", {
-              toolName: toolCall.toolName,
-              args: toolCall.input,
-              callId: toolCall.toolCallId
-            });
-          }
-        }
-        if (step.toolResults && step.toolResults.length > 0) {
-          for (const toolResult of step.toolResults) {
-            const callId = toolResult.toolCallId;
-            const sanitizedFromSdk = toolResult.output;
-            let raw;
-            if (callId) {
-              const q = this.rawResultsByCallId.get(callId) ?? [];
-              raw = q.shift();
-              if (q.length > 0) this.rawResultsByCallId.set(callId, q);
-              else this.rawResultsByCallId.delete(callId);
-            }
-            try {
-              const effectiveCallId = callId ?? `${toolResult.toolName}-${Date.now()}`;
-              const persisted = await this.contextManager.addToolResult(
-                effectiveCallId,
-                toolResult.toolName,
-                raw ?? sanitizedFromSdk,
-                { success: true }
-              );
-              this.sessionEventBus.emit("llmservice:toolResult", {
-                toolName: toolResult.toolName,
-                callId: effectiveCallId,
-                success: true,
-                sanitized: persisted,
-                ...shouldIncludeRawToolResult() ? { rawResult: raw ?? sanitizedFromSdk } : {}
-              });
-            } catch (err) {
-              logger.error(
-                `Failed to persist tool result for ${toolResult.toolName}: ${String(err)}`
-              );
-            }
-          }
-        }
       },
       // No onFinish: we finalize after the stream completes below.
       stopWhen: stepCountIs(maxSteps),
@@ -486,6 +473,23 @@ class VercelLLMService {
         ...usage.totalTokens !== void 0 && { totalTokens: usage.totalTokens }
       }
     });
+    const activeSpan = trace.getActiveSpan();
+    if (activeSpan) {
+      const attributes = {};
+      if (usage.inputTokens !== void 0) {
+        attributes["gen_ai.usage.input_tokens"] = usage.inputTokens;
+      }
+      if (usage.outputTokens !== void 0) {
+        attributes["gen_ai.usage.output_tokens"] = usage.outputTokens;
+      }
+      if (usage.totalTokens !== void 0) {
+        attributes["gen_ai.usage.total_tokens"] = usage.totalTokens;
+      }
+      if (usage.reasoningTokens !== void 0) {
+        attributes["gen_ai.usage.reasoning_tokens"] = usage.reasoningTokens;
+      }
+      activeSpan.setAttributes(attributes);
+    }
     if (typeof usage.totalTokens === "number") {
       this.contextManager.updateActualTokenCount(usage.totalTokens);
     }
@@ -532,6 +536,9 @@ class VercelLLMService {
     return this.contextManager;
   }
 }
+_init = __decoratorStart(null);
+VercelLLMService = __decorateElement(_init, 0, "VercelLLMService", _VercelLLMService_decorators, VercelLLMService);
+__runInitializers(_init, 1, VercelLLMService);
 export {
   VercelLLMService
 };

package/dist/llm/tokenizer/anthropic.js

@@ -1,3 +1,4 @@
+import "../../chunk-C6A6W6XS.js";
 class AnthropicTokenizer {
   /**
    * TODO: Replace with a better implementation for anthropic

package/dist/llm/tokenizer/default.js

@@ -1,3 +1,4 @@
+import "../../chunk-C6A6W6XS.js";
 class DefaultTokenizer {
   /**
    * Assumes roughly 4 characters per token.

package/dist/llm/tokenizer/factory.js

@@ -1,3 +1,4 @@
+import "../../chunk-C6A6W6XS.js";
 import { OpenAITokenizer } from "./openai.js";
 import { AnthropicTokenizer } from "./anthropic.js";
 import { GoogleTokenizer } from "./google.js";

package/dist/llm/tokenizer/google.js

@@ -1,3 +1,4 @@
+import "../../chunk-C6A6W6XS.js";
 class GoogleTokenizer {
   modelName;
   /**

package/dist/llm/tokenizer/openai.cjs

@@ -33,7 +33,7 @@ class OpenAITokenizer {
   // Tiktoken encoding instance
   /**
    * Initializes the tokenizer for a specific OpenAI model or compatible model.
-   * @param model The OpenAI model name (e.g., 'gpt-4o') or a custom model name.
+   * @param model The OpenAI model name (e.g., 'gpt-5') or a custom model name.
    * @throws TokenizationError if tiktoken initialization fails for both specific model and fallback.
    */
   constructor(model) {