@dexto/core 1.8.4 → 1.8.5

package/dist/telemetry/operation-span.cjs

@@ -28,36 +28,37 @@ async function recordOperationSpan(options, operation, logger) {
   if (skipIfNoTelemetry && !(0, import_utils.hasActiveTelemetry)(logger)) {
     return operation();
   }
-  const span = import_api.trace.getTracer(options.tracerName ?? "dexto").startSpan(options.name, { kind: import_api.SpanKind.INTERNAL });
-  const spanContext = import_api.trace.setSpan(import_api.context.active(), span);
-  (0, import_utils.addBaggageAttributesToSpan)(span, spanContext, logger);
-  if (options.componentName !== void 0) {
-    span.setAttribute("componentName", options.componentName);
-  }
-  setOperationSpanAttributes(span, options.attributes);
-  try {
-    const result = await import_api.context.with(spanContext, operation);
+  return import_api.trace.getTracer(options.tracerName ?? "dexto").startActiveSpan(options.name, { kind: import_api.SpanKind.INTERNAL }, async (span) => {
+    const spanContext = import_api.trace.setSpan(import_api.context.active(), span);
+    (0, import_utils.addBaggageAttributesToSpan)(span, spanContext, logger);
+    if (options.componentName !== void 0) {
+      span.setAttribute("componentName", options.componentName);
+    }
+    setOperationSpanAttributes(span, options.attributes);
     try {
-      setOperationSpanAttributes(span, options.resultAttributes?.(result));
+      const result = await operation();
+      try {
+        setOperationSpanAttributes(span, options.resultAttributes?.(result));
+      } catch (error) {
+        logger?.debug("Failed to set OpenTelemetry result attributes", {
+          error: error instanceof Error ? error.message : String(error),
+          span: options.name
+        });
+      }
+      span.setStatus({ code: import_api.SpanStatusCode.OK });
+      return result;
     } catch (error) {
-      logger?.debug("Failed to set OpenTelemetry result attributes", {
-        error: error instanceof Error ? error.message : String(error),
-        span: options.name
-      });
+      if (error instanceof Error) {
+        span.recordException(error);
+        span.setStatus({ code: import_api.SpanStatusCode.ERROR, message: error.message });
+      } else {
+        span.setStatus({ code: import_api.SpanStatusCode.ERROR, message: String(error) });
+      }
+      throw error;
+    } finally {
+      span.end();
     }
-    span.setStatus({ code: import_api.SpanStatusCode.OK });
-    return result;
-  } catch (error) {
-    if (error instanceof Error) {
-      span.recordException(error);
-      span.setStatus({ code: import_api.SpanStatusCode.ERROR, message: error.message });
-    } else {
-      span.setStatus({ code: import_api.SpanStatusCode.ERROR, message: String(error) });
-    }
-    throw error;
-  } finally {
-    span.end();
-  }
+  });
 }
 function setOperationSpanAttributes(span, attributes) {
   if (span === void 0 || attributes === void 0) {

package/dist/telemetry/operation-span.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operation-span.d.ts","sourceRoot":"","sources":["../../src/telemetry/operation-span.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,KAAK,uBAAuB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AAEzE,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI;IAClC,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,uBAAuB,GAAG,SAAS,CAAC;IACtE,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAsB,mBAAmB,CAAC,CAAC,EACvC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAChC,SAAS,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAC/B,MAAM,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,CAAC,CAyCZ"}
+{"version":3,"file":"operation-span.d.ts","sourceRoot":"","sources":["../../src/telemetry/operation-span.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,KAAK,uBAAuB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AAEzE,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI;IAClC,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,uBAAuB,GAAG,SAAS,CAAC;IACtE,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAsB,mBAAmB,CAAC,CAAC,EACvC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAChC,SAAS,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAC/B,MAAM,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,CAAC,CA0CZ"}

package/dist/telemetry/operation-span.js

@@ -6,36 +6,37 @@ async function recordOperationSpan(options, operation, logger) {
   if (skipIfNoTelemetry && !hasActiveTelemetry(logger)) {
     return operation();
   }
-  const span = trace.getTracer(options.tracerName ?? "dexto").startSpan(options.name, { kind: SpanKind.INTERNAL });
-  const spanContext = trace.setSpan(context.active(), span);
-  addBaggageAttributesToSpan(span, spanContext, logger);
-  if (options.componentName !== void 0) {
-    span.setAttribute("componentName", options.componentName);
-  }
-  setOperationSpanAttributes(span, options.attributes);
-  try {
-    const result = await context.with(spanContext, operation);
+  return trace.getTracer(options.tracerName ?? "dexto").startActiveSpan(options.name, { kind: SpanKind.INTERNAL }, async (span) => {
+    const spanContext = trace.setSpan(context.active(), span);
+    addBaggageAttributesToSpan(span, spanContext, logger);
+    if (options.componentName !== void 0) {
+      span.setAttribute("componentName", options.componentName);
+    }
+    setOperationSpanAttributes(span, options.attributes);
     try {
-      setOperationSpanAttributes(span, options.resultAttributes?.(result));
+      const result = await operation();
+      try {
+        setOperationSpanAttributes(span, options.resultAttributes?.(result));
+      } catch (error) {
+        logger?.debug("Failed to set OpenTelemetry result attributes", {
+          error: error instanceof Error ? error.message : String(error),
+          span: options.name
+        });
+      }
+      span.setStatus({ code: SpanStatusCode.OK });
+      return result;
     } catch (error) {
-      logger?.debug("Failed to set OpenTelemetry result attributes", {
-        error: error instanceof Error ? error.message : String(error),
-        span: options.name
-      });
+      if (error instanceof Error) {
+        span.recordException(error);
+        span.setStatus({ code: SpanStatusCode.ERROR, message: error.message });
+      } else {
+        span.setStatus({ code: SpanStatusCode.ERROR, message: String(error) });
+      }
+      throw error;
+    } finally {
+      span.end();
     }
-    span.setStatus({ code: SpanStatusCode.OK });
-    return result;
-  } catch (error) {
-    if (error instanceof Error) {
-      span.recordException(error);
-      span.setStatus({ code: SpanStatusCode.ERROR, message: error.message });
-    } else {
-      span.setStatus({ code: SpanStatusCode.ERROR, message: String(error) });
-    }
-    throw error;
-  } finally {
-    span.end();
-  }
+  });
 }
 function setOperationSpanAttributes(span, attributes) {
   if (span === void 0 || attributes === void 0) {

package/dist/tools/tool-call-metadata.cjs

@@ -109,10 +109,13 @@ function mergePropertySchema(current, next) {
   if (valuesEqual(current, next)) {
     return current;
   }
-  const currentEnum = readEnumValues(current);
-  const nextEnum = readEnumValues(next);
-  if (currentEnum !== void 0 && nextEnum !== void 0) {
-    return { enum: mergeEnumValues([...currentEnum, ...nextEnum]) };
+  const currentEnumValues = readEnumValues(current);
+  const nextEnumValues = readEnumValues(next);
+  if (currentEnumValues !== void 0 && nextEnumValues !== void 0) {
+    return { enum: mergeEnumValues([...currentEnumValues, ...nextEnumValues]) };
+  }
+  if (currentEnumValues !== void 0 || nextEnumValues !== void 0) {
+    return {};
   }
   if (current.type !== void 0 && valuesEqual(current.type, next.type)) {
     return { type: current.type };

package/dist/tools/tool-call-metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-call-metadata.d.ts","sourceRoot":"","sources":["../../src/tools/tool-call-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IACrD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAC9B,MAAM,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AA0KF,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,WAAW,GAAG,WAAW,CAkB7E;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAChE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,IAAI,EAAE,gBAAgB,CAAC;CAC1B,CAQA"}
+{"version":3,"file":"tool-call-metadata.d.ts","sourceRoot":"","sources":["../../src/tools/tool-call-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IACrD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAC9B,MAAM,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AA8KF,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,WAAW,GAAG,WAAW,CAkB7E;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAChE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,IAAI,EAAE,gBAAgB,CAAC;CAC1B,CAQA"}

package/dist/tools/tool-call-metadata.js

@@ -86,10 +86,13 @@ function mergePropertySchema(current, next) {
   if (valuesEqual(current, next)) {
     return current;
   }
-  const currentEnum = readEnumValues(current);
-  const nextEnum = readEnumValues(next);
-  if (currentEnum !== void 0 && nextEnum !== void 0) {
-    return { enum: mergeEnumValues([...currentEnum, ...nextEnum]) };
+  const currentEnumValues = readEnumValues(current);
+  const nextEnumValues = readEnumValues(next);
+  if (currentEnumValues !== void 0 && nextEnumValues !== void 0) {
+    return { enum: mergeEnumValues([...currentEnumValues, ...nextEnumValues]) };
+  }
+  if (currentEnumValues !== void 0 || nextEnumValues !== void 0) {
+    return {};
   }
   if (current.type !== void 0 && valuesEqual(current.type, next.type)) {
     return { type: current.type };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexto/core",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -157,9 +157,10 @@
     "nanoid": "^5.1.6",
     "winston": "^3.17.0",
     "yaml": "^2.8.3",
-    "@dexto/llm": "1.8.4"
+    "@dexto/llm": "1.8.5"
   },
   "devDependencies": {
+    "@opentelemetry/context-async-hooks": "^1.28.0",
     "@opentelemetry/instrumentation-http": "^0.210.0",
     "@opentelemetry/instrumentation-undici": "^0.20.0",
     "@opentelemetry/resources": "^1.28.0",