@dexto/core 1.8.3 → 1.8.5

package/dist/telemetry/operation-span.js

@@ -0,0 +1,51 @@
+import "../chunk-C6A6W6XS.js";
+import { context, SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
+import { addBaggageAttributesToSpan, hasActiveTelemetry } from "./utils.js";
+async function recordOperationSpan(options, operation, logger) {
+  const skipIfNoTelemetry = options.skipIfNoTelemetry ?? true;
+  if (skipIfNoTelemetry && !hasActiveTelemetry(logger)) {
+    return 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 {
+      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) {
+      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) {
+    return;
+  }
+  for (const [key, value] of Object.entries(attributes)) {
+    span.setAttribute(key, value);
+  }
+}
+export {
+  recordOperationSpan
+};

package/dist/telemetry/telemetry.cjs

@@ -32,7 +32,6 @@ __export(telemetry_exports, {
 });
 module.exports = __toCommonJS(telemetry_exports);
 var import_api = require("@opentelemetry/api");
-var import_logger = require("../logger/logger.js");
 var import_errors = require("./errors.js");
 var import_DextoRuntimeError = require("../errors/DextoRuntimeError.js");
 class Telemetry {
@@ -318,7 +317,7 @@ class Telemetry {
       }
     } catch (error) {
       const errorMsg = error instanceof Error ? error.message : String(error);
-      import_logger.logger.warn(`Telemetry shutdown failed to flush spans (non-blocking): ${errorMsg}`);
+      console.warn(`Telemetry shutdown failed to flush spans (non-blocking): ${errorMsg}`);
     } finally {
       this.cleanupAfterShutdown();
     }
@@ -326,7 +325,7 @@ class Telemetry {
   cleanupAfterShutdown() {
     this._isInitialized = false;
     globalThis.__TELEMETRY__ = void 0;
-    if (Telemetry._signalHandlers) {
+    if (Telemetry._signalHandlers && typeof process !== "undefined") {
       process.off("SIGTERM", Telemetry._signalHandlers.sigterm);
       process.off("SIGINT", Telemetry._signalHandlers.sigint);
       Telemetry._signalHandlers = void 0;

package/dist/telemetry/telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/telemetry/telemetry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAUtD,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAE3D,MAAM,MAAM,4BAA4B,GAAG;IACvC,MAAM,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACvC,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,wBAAwB,GAAG,SAAS,CAAC;CACnD,CAAC;AASF,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,aAAa,EAAE,SAAS,GAAG,SAAS,CAAC;CAC5C;AAED;;;;;;;;GAQG;AACH,qBAAa,SAAS;IACX,MAAM,EAAE,MAAM,CAA4B;IACjD,IAAI,EAAE,MAAM,CAAmB;IAC/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,IAAI,CAAC,CAA0B;IACvC,OAAO,CAAC,gBAAgB,CAAC,CAAuC;IAChE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAiC;IAC7D,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAA0D;IAEzF,OAAO;mBAWc,kBAAkB;IA0DvC;;;;;OAKG;WACU,IAAI,CACb,MAAM,GAAE,iBAAsB,EAC9B,QAAQ,CAAC,EAAE,OAAO,+BAA+B,EAAE,YAAY,GAChE,OAAO,CAAC,SAAS,CAAC;IAiIrB;;;;OAIG;WACU,cAAc,CAAC,OAAO,GAAE,4BAAiC,GAAG,OAAO,CAAC,SAAS,CAAC;IAiC3F,MAAM,CAAC,aAAa;IAKpB;;;;OAIG;IACH,MAAM,CAAC,GAAG,IAAI,SAAS;IAOvB;;;OAGG;IACH,MAAM,CAAC,iBAAiB,IAAI,OAAO;IAInC;;;;;OAKG;WACU,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAS5C;;;OAGG;IACI,aAAa,IAAI,OAAO;IAI/B,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,GAAE,OAA8B;IAc5F,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,IAAI;IAI/C;;;OAGG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxC;;;;;;;;;OASG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBtC,OAAO,CAAC,oBAAoB;CAiB/B"}
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/telemetry/telemetry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAStD,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAE3D,MAAM,MAAM,4BAA4B,GAAG;IACvC,MAAM,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACvC,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,wBAAwB,GAAG,SAAS,CAAC;CACnD,CAAC;AASF,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,aAAa,EAAE,SAAS,GAAG,SAAS,CAAC;CAC5C;AAED;;;;;;;;GAQG;AACH,qBAAa,SAAS;IACX,MAAM,EAAE,MAAM,CAA4B;IACjD,IAAI,EAAE,MAAM,CAAmB;IAC/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,IAAI,CAAC,CAA0B;IACvC,OAAO,CAAC,gBAAgB,CAAC,CAAuC;IAChE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAiC;IAC7D,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAA0D;IAEzF,OAAO;mBAWc,kBAAkB;IA0DvC;;;;;OAKG;WACU,IAAI,CACb,MAAM,GAAE,iBAAsB,EAC9B,QAAQ,CAAC,EAAE,OAAO,+BAA+B,EAAE,YAAY,GAChE,OAAO,CAAC,SAAS,CAAC;IAiIrB;;;;OAIG;WACU,cAAc,CAAC,OAAO,GAAE,4BAAiC,GAAG,OAAO,CAAC,SAAS,CAAC;IAiC3F,MAAM,CAAC,aAAa;IAKpB;;;;OAIG;IACH,MAAM,CAAC,GAAG,IAAI,SAAS;IAOvB;;;OAGG;IACH,MAAM,CAAC,iBAAiB,IAAI,OAAO;IAInC;;;;;OAKG;WACU,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAS5C;;;OAGG;IACI,aAAa,IAAI,OAAO;IAI/B,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,GAAE,OAA8B;IAc5F,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,IAAI;IAI/C;;;OAGG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxC;;;;;;;;;OASG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBtC,OAAO,CAAC,oBAAoB;CAiB/B"}

package/dist/telemetry/telemetry.js

@@ -1,6 +1,5 @@
 import "../chunk-C6A6W6XS.js";
 import { context as otlpContext, trace, propagation } from "@opentelemetry/api";
-import { logger } from "../logger/logger.js";
 import { TelemetryError } from "./errors.js";
 import { DextoRuntimeError } from "../errors/DextoRuntimeError.js";
 class Telemetry {
@@ -286,7 +285,7 @@ class Telemetry {
       }
     } catch (error) {
       const errorMsg = error instanceof Error ? error.message : String(error);
-      logger.warn(`Telemetry shutdown failed to flush spans (non-blocking): ${errorMsg}`);
+      console.warn(`Telemetry shutdown failed to flush spans (non-blocking): ${errorMsg}`);
     } finally {
       this.cleanupAfterShutdown();
     }
@@ -294,7 +293,7 @@ class Telemetry {
   cleanupAfterShutdown() {
     this._isInitialized = false;
     globalThis.__TELEMETRY__ = void 0;
-    if (Telemetry._signalHandlers) {
+    if (Telemetry._signalHandlers && typeof process !== "undefined") {
       process.off("SIGTERM", Telemetry._signalHandlers.sigterm);
       process.off("SIGINT", Telemetry._signalHandlers.sigint);
       Telemetry._signalHandlers = void 0;

package/dist/telemetry/utils.cjs

@@ -24,21 +24,20 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_api = require("@opentelemetry/api");
-var import_telemetry = require("./telemetry.js");
 var import_runtime = require("../runtime/index.js");
-function hasActiveTelemetry(logger) {
-  logger?.silly("hasActiveTelemetry called.");
-  try {
-    const telemetryInstance = import_telemetry.Telemetry.get();
-    const isActive = telemetryInstance.isInitialized();
-    logger?.silly(`hasActiveTelemetry: Telemetry is initialized: ${isActive}`);
-    return isActive;
-  } catch (error) {
-    logger?.silly(
-      `hasActiveTelemetry: Telemetry not active or initialized. Error: ${error instanceof Error ? error.message : String(error)}`
-    );
+function getGlobalTelemetryInitialized() {
+  const telemetry = Reflect.get(globalThis, "__TELEMETRY__");
+  if (typeof telemetry !== "object" || telemetry === null) {
     return false;
   }
+  const isInitialized = Reflect.get(telemetry, "isInitialized");
+  return typeof isInitialized === "function" && Reflect.apply(isInitialized, telemetry, []) === true;
+}
+function hasActiveTelemetry(logger) {
+  logger?.silly("hasActiveTelemetry called.");
+  const isActive = getGlobalTelemetryInitialized();
+  logger?.silly(`hasActiveTelemetry: Telemetry is initialized: ${isActive}`);
+  return isActive;
 }
 function getBaggageValues(ctx, logger) {
   logger?.silly("getBaggageValues called.");

package/dist/telemetry/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/telemetry/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAa3D;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM;;;;;;;;;;EAsB7D;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CA2B1F"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/telemetry/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAgBpD,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAK3D;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM;;;;;;;;;;EAsB7D;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CA2B1F"}

package/dist/telemetry/utils.js

@@ -1,20 +1,19 @@
 import "../chunk-C6A6W6XS.js";
 import { propagation } from "@opentelemetry/api";
-import { Telemetry } from "./telemetry.js";
 import { getHostRuntimeAttributes, getHostRuntimeContextFromBaggage } from "../runtime/index.js";
-function hasActiveTelemetry(logger) {
-  logger?.silly("hasActiveTelemetry called.");
-  try {
-    const telemetryInstance = Telemetry.get();
-    const isActive = telemetryInstance.isInitialized();
-    logger?.silly(`hasActiveTelemetry: Telemetry is initialized: ${isActive}`);
-    return isActive;
-  } catch (error) {
-    logger?.silly(
-      `hasActiveTelemetry: Telemetry not active or initialized. Error: ${error instanceof Error ? error.message : String(error)}`
-    );
+function getGlobalTelemetryInitialized() {
+  const telemetry = Reflect.get(globalThis, "__TELEMETRY__");
+  if (typeof telemetry !== "object" || telemetry === null) {
     return false;
   }
+  const isInitialized = Reflect.get(telemetry, "isInitialized");
+  return typeof isInitialized === "function" && Reflect.apply(isInitialized, telemetry, []) === true;
+}
+function hasActiveTelemetry(logger) {
+  logger?.silly("hasActiveTelemetry called.");
+  const isActive = getGlobalTelemetryInitialized();
+  logger?.silly(`hasActiveTelemetry: Telemetry is initialized: ${isActive}`);
+  return isActive;
 }
 function getBaggageValues(ctx, logger) {
   logger?.silly("getBaggageValues called.");

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

@@ -45,17 +45,132 @@ const META_SCHEMA = {
   additionalProperties: true
 };
 const META_KEY = "__meta";
-function wrapToolParametersSchema(parameters) {
-  if (parameters.type !== "object" || !parameters.properties) {
-    return parameters;
+const FORBIDDEN_TOP_LEVEL_SCHEMA_KEYS = ["oneOf", "anyOf", "allOf", "enum", "not"];
+function hasForbiddenTopLevelSchemaKey(parameters) {
+  return FORBIDDEN_TOP_LEVEL_SCHEMA_KEYS.some((key) => key in parameters);
+}
+function readObjectAlternatives(parameters) {
+  const alternatives = parameters.oneOf ?? parameters.anyOf;
+  if (!Array.isArray(alternatives)) {
+    return [];
+  }
+  return alternatives.filter(
+    (alternative) => alternative !== true && alternative !== false && alternative.type === "object"
+  );
+}
+function readRequiredPropertyNames(schema) {
+  return new Set(
+    Array.isArray(schema.required) ? schema.required.filter((propertyName) => typeof propertyName === "string") : []
+  );
+}
+function intersectRequiredProperties(alternatives) {
+  if (alternatives.length === 0) {
+    return void 0;
+  }
+  const requiredSets = alternatives.map(readRequiredPropertyNames);
+  const first = requiredSets[0];
+  if (first === void 0) {
+    return void 0;
+  }
+  const rest = requiredSets.slice(1);
+  const required = [...first].filter(
+    (propertyName) => rest.every((requiredProperties) => requiredProperties.has(propertyName))
+  );
+  return required.length === 0 ? void 0 : required;
+}
+function valuesEqual(left, right) {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
+function mergeEnumValues(values) {
+  const merged = [];
+  for (const value of values) {
+    if (!merged.some((existing) => valuesEqual(existing, value))) {
+      merged.push(value);
+    }
+  }
+  return merged;
+}
+function readEnumValues(schema) {
+  if (schema.const !== void 0) {
+    return [schema.const];
+  }
+  return Array.isArray(schema.enum) ? schema.enum : void 0;
+}
+function mergePropertySchema(current, next) {
+  if (current === void 0 || current === false) {
+    return next;
+  }
+  if (current === true || next === true) {
+    return {};
+  }
+  if (next === false) {
+    return current;
+  }
+  if (valuesEqual(current, next)) {
+    return current;
   }
-  if (META_KEY in parameters.properties) {
+  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 };
+  }
+  return {};
+}
+function flattenObjectUnionSchema(parameters) {
+  const alternatives = readObjectAlternatives(parameters);
+  if (alternatives.length === 0) {
+    return void 0;
+  }
+  const properties = {};
+  const required = intersectRequiredProperties(alternatives);
+  for (const alternative of alternatives) {
+    const alternativeProperties = alternative.properties ?? {};
+    for (const [propertyName, propertySchema] of Object.entries(alternativeProperties)) {
+      properties[propertyName] = mergePropertySchema(
+        properties[propertyName],
+        propertySchema
+      );
+    }
+  }
+  return {
+    ...parameters.description === void 0 ? {} : { description: parameters.description },
+    type: "object",
+    properties,
+    ...required === void 0 ? {} : { required },
+    additionalProperties: true
+  };
+}
+function normalizeToolParametersSchema(parameters) {
+  if (parameters.type === "object" && !hasForbiddenTopLevelSchemaKey(parameters)) {
     return parameters;
   }
+  const flattened = flattenObjectUnionSchema(parameters);
+  if (flattened !== void 0) {
+    return flattened;
+  }
+  return {
+    type: "object",
+    additionalProperties: true
+  };
+}
+function wrapToolParametersSchema(parameters) {
+  const normalized = normalizeToolParametersSchema(parameters);
+  if (!normalized.properties) {
+    return normalized;
+  }
+  if (META_KEY in normalized.properties) {
+    return normalized;
+  }
   return {
-    ...parameters,
+    ...normalized,
     properties: {
-      ...parameters.properties,
+      ...normalized.properties,
       [META_KEY]: META_SCHEMA
     }
   };

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;AAE/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;AA2BF,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,WAAW,GAAG,WAAW,CAgB7E;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

@@ -22,17 +22,132 @@ const META_SCHEMA = {
   additionalProperties: true
 };
 const META_KEY = "__meta";
-function wrapToolParametersSchema(parameters) {
-  if (parameters.type !== "object" || !parameters.properties) {
-    return parameters;
+const FORBIDDEN_TOP_LEVEL_SCHEMA_KEYS = ["oneOf", "anyOf", "allOf", "enum", "not"];
+function hasForbiddenTopLevelSchemaKey(parameters) {
+  return FORBIDDEN_TOP_LEVEL_SCHEMA_KEYS.some((key) => key in parameters);
+}
+function readObjectAlternatives(parameters) {
+  const alternatives = parameters.oneOf ?? parameters.anyOf;
+  if (!Array.isArray(alternatives)) {
+    return [];
+  }
+  return alternatives.filter(
+    (alternative) => alternative !== true && alternative !== false && alternative.type === "object"
+  );
+}
+function readRequiredPropertyNames(schema) {
+  return new Set(
+    Array.isArray(schema.required) ? schema.required.filter((propertyName) => typeof propertyName === "string") : []
+  );
+}
+function intersectRequiredProperties(alternatives) {
+  if (alternatives.length === 0) {
+    return void 0;
+  }
+  const requiredSets = alternatives.map(readRequiredPropertyNames);
+  const first = requiredSets[0];
+  if (first === void 0) {
+    return void 0;
+  }
+  const rest = requiredSets.slice(1);
+  const required = [...first].filter(
+    (propertyName) => rest.every((requiredProperties) => requiredProperties.has(propertyName))
+  );
+  return required.length === 0 ? void 0 : required;
+}
+function valuesEqual(left, right) {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
+function mergeEnumValues(values) {
+  const merged = [];
+  for (const value of values) {
+    if (!merged.some((existing) => valuesEqual(existing, value))) {
+      merged.push(value);
+    }
+  }
+  return merged;
+}
+function readEnumValues(schema) {
+  if (schema.const !== void 0) {
+    return [schema.const];
+  }
+  return Array.isArray(schema.enum) ? schema.enum : void 0;
+}
+function mergePropertySchema(current, next) {
+  if (current === void 0 || current === false) {
+    return next;
+  }
+  if (current === true || next === true) {
+    return {};
+  }
+  if (next === false) {
+    return current;
+  }
+  if (valuesEqual(current, next)) {
+    return current;
   }
-  if (META_KEY in parameters.properties) {
+  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 };
+  }
+  return {};
+}
+function flattenObjectUnionSchema(parameters) {
+  const alternatives = readObjectAlternatives(parameters);
+  if (alternatives.length === 0) {
+    return void 0;
+  }
+  const properties = {};
+  const required = intersectRequiredProperties(alternatives);
+  for (const alternative of alternatives) {
+    const alternativeProperties = alternative.properties ?? {};
+    for (const [propertyName, propertySchema] of Object.entries(alternativeProperties)) {
+      properties[propertyName] = mergePropertySchema(
+        properties[propertyName],
+        propertySchema
+      );
+    }
+  }
+  return {
+    ...parameters.description === void 0 ? {} : { description: parameters.description },
+    type: "object",
+    properties,
+    ...required === void 0 ? {} : { required },
+    additionalProperties: true
+  };
+}
+function normalizeToolParametersSchema(parameters) {
+  if (parameters.type === "object" && !hasForbiddenTopLevelSchemaKey(parameters)) {
     return parameters;
   }
+  const flattened = flattenObjectUnionSchema(parameters);
+  if (flattened !== void 0) {
+    return flattened;
+  }
+  return {
+    type: "object",
+    additionalProperties: true
+  };
+}
+function wrapToolParametersSchema(parameters) {
+  const normalized = normalizeToolParametersSchema(parameters);
+  if (!normalized.properties) {
+    return normalized;
+  }
+  if (META_KEY in normalized.properties) {
+    return normalized;
+  }
   return {
-    ...parameters,
+    ...normalized,
     properties: {
-      ...parameters.properties,
+      ...normalized.properties,
       [META_KEY]: META_SCHEMA
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexto/core",
-  "version": "1.8.3",
+  "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.3"
+    "@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",