@dexto/core 1.2.3 → 1.2.5

package/dist/systemPrompt/schemas.d.ts

@@ -8,15 +8,15 @@ export declare const ContributorConfigSchema: z.ZodDiscriminatedUnion<"type", [z
     content: z.ZodString;
 }, "strict", z.ZodTypeAny, {
     type: "static";
-    id: string;
-    priority: number;
     enabled: boolean;
     content: string;
+    id: string;
+    priority: number;
 }, {
     type: "static";
+    content: string;
     id: string;
     priority: number;
-    content: string;
     enabled?: boolean | undefined;
 }>, z.ZodObject<{
     id: z.ZodString;
@@ -27,15 +27,15 @@ export declare const ContributorConfigSchema: z.ZodDiscriminatedUnion<"type", [z
     source: z.ZodEnum<["dateTime", "memorySummary", "resources"]>;
 }, "strict", z.ZodTypeAny, {
     type: "dynamic";
+    enabled: boolean;
     id: string;
     priority: number;
-    enabled: boolean;
-    source: "dateTime" | "memorySummary" | "resources";
+    source: "resources" | "dateTime" | "memorySummary";
 }, {
     type: "dynamic";
     id: string;
     priority: number;
-    source: "dateTime" | "memorySummary" | "resources";
+    source: "resources" | "dateTime" | "memorySummary";
     enabled?: boolean | undefined;
 }>, z.ZodObject<{
     id: z.ZodString;
@@ -43,7 +43,7 @@ export declare const ContributorConfigSchema: z.ZodDiscriminatedUnion<"type", [z
     enabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 } & {
     type: z.ZodLiteral<"file">;
-    files: z.ZodArray<z.ZodString, "many">;
+    files: z.ZodArray<z.ZodEffects<z.ZodString, string, string>, "many">;
     options: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         includeFilenames: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         separator: z.ZodDefault<z.ZodOptional<z.ZodString>>;
@@ -64,6 +64,7 @@ export declare const ContributorConfigSchema: z.ZodDiscriminatedUnion<"type", [z
         includeMetadata?: boolean | undefined;
     }>>>;
 }, "strict", z.ZodTypeAny, {
+    type: "file";
     options: {
         includeFilenames: boolean;
         separator: string;
@@ -71,10 +72,9 @@ export declare const ContributorConfigSchema: z.ZodDiscriminatedUnion<"type", [z
         maxFileSize: number;
         includeMetadata: boolean;
     };
-    type: "file";
+    enabled: boolean;
     id: string;
     priority: number;
-    enabled: boolean;
     files: string[];
 }, {
     type: "file";
@@ -112,16 +112,16 @@ export declare const ContributorConfigSchema: z.ZodDiscriminatedUnion<"type", [z
         pinnedOnly?: boolean | undefined;
     }>>>;
 }, "strict", z.ZodTypeAny, {
+    type: "memory";
     options: {
         includeTimestamps: boolean;
         includeTags: boolean;
         pinnedOnly: boolean;
         limit?: number | undefined;
     };
-    type: "memory";
+    enabled: boolean;
     id: string;
     priority: number;
-    enabled: boolean;
 }, {
     type: "memory";
     id: string;
@@ -146,15 +146,15 @@ export declare const SystemPromptContributorsSchema: z.ZodObject<{
         content: z.ZodString;
     }, "strict", z.ZodTypeAny, {
         type: "static";
-        id: string;
-        priority: number;
         enabled: boolean;
         content: string;
+        id: string;
+        priority: number;
     }, {
         type: "static";
+        content: string;
         id: string;
         priority: number;
-        content: string;
         enabled?: boolean | undefined;
     }>, z.ZodObject<{
         id: z.ZodString;
@@ -165,15 +165,15 @@ export declare const SystemPromptContributorsSchema: z.ZodObject<{
         source: z.ZodEnum<["dateTime", "memorySummary", "resources"]>;
     }, "strict", z.ZodTypeAny, {
         type: "dynamic";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
-        source: "dateTime" | "memorySummary" | "resources";
+        source: "resources" | "dateTime" | "memorySummary";
     }, {
         type: "dynamic";
         id: string;
         priority: number;
-        source: "dateTime" | "memorySummary" | "resources";
+        source: "resources" | "dateTime" | "memorySummary";
         enabled?: boolean | undefined;
     }>, z.ZodObject<{
         id: z.ZodString;
@@ -181,7 +181,7 @@ export declare const SystemPromptContributorsSchema: z.ZodObject<{
         enabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     } & {
         type: z.ZodLiteral<"file">;
-        files: z.ZodArray<z.ZodString, "many">;
+        files: z.ZodArray<z.ZodEffects<z.ZodString, string, string>, "many">;
         options: z.ZodDefault<z.ZodOptional<z.ZodObject<{
             includeFilenames: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
             separator: z.ZodDefault<z.ZodOptional<z.ZodString>>;
@@ -202,6 +202,7 @@ export declare const SystemPromptContributorsSchema: z.ZodObject<{
             includeMetadata?: boolean | undefined;
         }>>>;
     }, "strict", z.ZodTypeAny, {
+        type: "file";
         options: {
             includeFilenames: boolean;
             separator: string;
@@ -209,10 +210,9 @@ export declare const SystemPromptContributorsSchema: z.ZodObject<{
             maxFileSize: number;
             includeMetadata: boolean;
         };
-        type: "file";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
         files: string[];
     }, {
         type: "file";
@@ -250,16 +250,16 @@ export declare const SystemPromptContributorsSchema: z.ZodObject<{
             pinnedOnly?: boolean | undefined;
         }>>>;
     }, "strict", z.ZodTypeAny, {
+        type: "memory";
         options: {
             includeTimestamps: boolean;
             includeTags: boolean;
             pinnedOnly: boolean;
             limit?: number | undefined;
         };
-        type: "memory";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
     }, {
         type: "memory";
         id: string;
@@ -275,17 +275,18 @@ export declare const SystemPromptContributorsSchema: z.ZodObject<{
 }, "strict", z.ZodTypeAny, {
     contributors: ({
         type: "static";
-        id: string;
-        priority: number;
         enabled: boolean;
         content: string;
+        id: string;
+        priority: number;
     } | {
         type: "dynamic";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
-        source: "dateTime" | "memorySummary" | "resources";
+        source: "resources" | "dateTime" | "memorySummary";
     } | {
+        type: "file";
         options: {
             includeFilenames: boolean;
             separator: string;
@@ -293,35 +294,34 @@ export declare const SystemPromptContributorsSchema: z.ZodObject<{
             maxFileSize: number;
             includeMetadata: boolean;
         };
-        type: "file";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
         files: string[];
     } | {
+        type: "memory";
         options: {
             includeTimestamps: boolean;
             includeTags: boolean;
             pinnedOnly: boolean;
             limit?: number | undefined;
         };
-        type: "memory";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
     })[];
 }, {
     contributors?: ({
         type: "static";
+        content: string;
         id: string;
         priority: number;
-        content: string;
         enabled?: boolean | undefined;
     } | {
         type: "dynamic";
         id: string;
         priority: number;
-        source: "dateTime" | "memorySummary" | "resources";
+        source: "resources" | "dateTime" | "memorySummary";
         enabled?: boolean | undefined;
     } | {
         type: "file";
@@ -367,15 +367,15 @@ export declare const SystemPromptConfigSchema: z.ZodBranded<z.ZodUnion<[z.ZodEff
         content: z.ZodString;
     }, "strict", z.ZodTypeAny, {
         type: "static";
-        id: string;
-        priority: number;
         enabled: boolean;
         content: string;
+        id: string;
+        priority: number;
     }, {
         type: "static";
+        content: string;
         id: string;
         priority: number;
-        content: string;
         enabled?: boolean | undefined;
     }>, z.ZodObject<{
         id: z.ZodString;
@@ -386,15 +386,15 @@ export declare const SystemPromptConfigSchema: z.ZodBranded<z.ZodUnion<[z.ZodEff
         source: z.ZodEnum<["dateTime", "memorySummary", "resources"]>;
     }, "strict", z.ZodTypeAny, {
         type: "dynamic";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
-        source: "dateTime" | "memorySummary" | "resources";
+        source: "resources" | "dateTime" | "memorySummary";
     }, {
         type: "dynamic";
         id: string;
         priority: number;
-        source: "dateTime" | "memorySummary" | "resources";
+        source: "resources" | "dateTime" | "memorySummary";
         enabled?: boolean | undefined;
     }>, z.ZodObject<{
         id: z.ZodString;
@@ -402,7 +402,7 @@ export declare const SystemPromptConfigSchema: z.ZodBranded<z.ZodUnion<[z.ZodEff
         enabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     } & {
         type: z.ZodLiteral<"file">;
-        files: z.ZodArray<z.ZodString, "many">;
+        files: z.ZodArray<z.ZodEffects<z.ZodString, string, string>, "many">;
         options: z.ZodDefault<z.ZodOptional<z.ZodObject<{
             includeFilenames: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
             separator: z.ZodDefault<z.ZodOptional<z.ZodString>>;
@@ -423,6 +423,7 @@ export declare const SystemPromptConfigSchema: z.ZodBranded<z.ZodUnion<[z.ZodEff
             includeMetadata?: boolean | undefined;
         }>>>;
     }, "strict", z.ZodTypeAny, {
+        type: "file";
         options: {
             includeFilenames: boolean;
             separator: string;
@@ -430,10 +431,9 @@ export declare const SystemPromptConfigSchema: z.ZodBranded<z.ZodUnion<[z.ZodEff
             maxFileSize: number;
             includeMetadata: boolean;
         };
-        type: "file";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
         files: string[];
     }, {
         type: "file";
@@ -471,16 +471,16 @@ export declare const SystemPromptConfigSchema: z.ZodBranded<z.ZodUnion<[z.ZodEff
             pinnedOnly?: boolean | undefined;
         }>>>;
     }, "strict", z.ZodTypeAny, {
+        type: "memory";
         options: {
             includeTimestamps: boolean;
             includeTags: boolean;
             pinnedOnly: boolean;
             limit?: number | undefined;
         };
-        type: "memory";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
     }, {
         type: "memory";
         id: string;
@@ -496,17 +496,18 @@ export declare const SystemPromptConfigSchema: z.ZodBranded<z.ZodUnion<[z.ZodEff
 }, "strict", z.ZodTypeAny, {
     contributors: ({
         type: "static";
-        id: string;
-        priority: number;
         enabled: boolean;
         content: string;
+        id: string;
+        priority: number;
     } | {
         type: "dynamic";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
-        source: "dateTime" | "memorySummary" | "resources";
+        source: "resources" | "dateTime" | "memorySummary";
     } | {
+        type: "file";
         options: {
             includeFilenames: boolean;
             separator: string;
@@ -514,35 +515,34 @@ export declare const SystemPromptConfigSchema: z.ZodBranded<z.ZodUnion<[z.ZodEff
             maxFileSize: number;
             includeMetadata: boolean;
         };
-        type: "file";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
         files: string[];
     } | {
+        type: "memory";
         options: {
             includeTimestamps: boolean;
             includeTags: boolean;
             pinnedOnly: boolean;
             limit?: number | undefined;
         };
-        type: "memory";
+        enabled: boolean;
         id: string;
         priority: number;
-        enabled: boolean;
     })[];
 }, {
     contributors?: ({
         type: "static";
+        content: string;
         id: string;
         priority: number;
-        content: string;
         enabled?: boolean | undefined;
     } | {
         type: "dynamic";
         id: string;
         priority: number;
-        source: "dateTime" | "memorySummary" | "resources";
+        source: "resources" | "dateTime" | "memorySummary";
         enabled?: boolean | undefined;
     } | {
         type: "file";

package/dist/systemPrompt/schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/systemPrompt/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA+GxB,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAuB/B,CAAC;AAGN,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAExE,MAAM,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAElF,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuB9B,CAAC;AAGd,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAUM,CAAC;AAG5C,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAC1E,MAAM,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/systemPrompt/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA0HxB,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAuB/B,CAAC;AAGN,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAExE,MAAM,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAElF,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuB9B,CAAC;AAGd,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAUM,CAAC;AAG5C,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAC1E,MAAM,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC"}

package/dist/systemPrompt/schemas.js

@@ -1,5 +1,6 @@
 import "../chunk-C6A6W6XS.js";
 import { z } from "zod";
+import * as path from "path";
 import { PROMPT_GENERATOR_SOURCES } from "./registry.js";
 const BaseContributorSchema = z.object({
   id: z.string().describe("Unique identifier for the contributor"),
@@ -18,7 +19,16 @@ const DynamicContributorSchema = BaseContributorSchema.extend({
 }).strict();
 const FileContributorSchema = BaseContributorSchema.extend({
   type: z.literal("file"),
-  files: z.array(z.string()).min(1).describe("Array of file paths to include as context (.md and .txt files)"),
+  files: z.array(
+    z.string().superRefine((filePath, ctx) => {
+      if (!path.isAbsolute(filePath)) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "FileContributor paths must be absolute after template expansion (use ${{dexto.agent_dir}} or provide an absolute path)."
+        });
+      }
+    })
+  ).min(1).describe("Array of file paths to include as context (.md and .txt files)"),
   options: z.object({
     includeFilenames: z.boolean().optional().default(true).describe("Whether to include the filename as a header for each file"),
     separator: z.string().optional().default("\n\n---\n\n").describe("Separator to use between multiple files"),

package/dist/telemetry/decorators.cjs

@@ -23,7 +23,6 @@ __export(decorators_exports, {
 });
 module.exports = __toCommonJS(decorators_exports);
 var import_api = require("@opentelemetry/api");
-var import_logger = require("../logger/index.js");
 var import_utils = require("./utils.js");
 var import_safe_stringify = require("../utils/safe-stringify.js");
 function withSpan(options) {
@@ -32,7 +31,8 @@ function withSpan(options) {
     const originalMethod = descriptor.value;
     const methodName = String(propertyKey);
     descriptor.value = function(...args) {
-      if (options?.skipIfNoTelemetry && (!globalThis.__TELEMETRY__ || !(0, import_utils.hasActiveTelemetry)())) {
+      const logger = this?.logger;
+      if (options?.skipIfNoTelemetry && (!globalThis.__TELEMETRY__ || !(0, import_utils.hasActiveTelemetry)(logger))) {
         return originalMethod.apply(this, args);
       }
       const tracer = import_api.trace.getTracer(options?.tracerName ?? "dexto");
@@ -53,21 +53,30 @@ function withSpan(options) {
       args.forEach((arg, index) => {
         span.setAttribute(`${spanName}.argument.${index}`, (0, import_safe_stringify.safeStringify)(arg, 8192));
       });
-      const { requestId, componentName, runId, threadId, resourceId } = (0, import_utils.getBaggageValues)(ctx);
+      const { requestId, componentName, runId, threadId, resourceId, sessionId } = (0, import_utils.getBaggageValues)(ctx);
+      if (sessionId) {
+        span.setAttribute("sessionId", sessionId);
+        span.setAttribute("baggage.sessionId", sessionId);
+      }
       if (requestId) {
         span.setAttribute("http.request_id", requestId);
+        span.setAttribute("baggage.http.request_id", requestId);
       }
       if (threadId) {
         span.setAttribute("threadId", threadId);
+        span.setAttribute("baggage.threadId", threadId);
       }
       if (resourceId) {
         span.setAttribute("resourceId", resourceId);
+        span.setAttribute("baggage.resourceId", resourceId);
+      }
+      if (runId !== void 0) {
+        span.setAttribute("runId", String(runId));
+        span.setAttribute("baggage.runId", String(runId));
       }
       if (componentName) {
         span.setAttribute("componentName", componentName);
-        if (runId !== void 0) {
-          span.setAttribute("runId", String(runId));
-        }
+        span.setAttribute("baggage.componentName", componentName);
       } else if (this && typeof this === "object") {
         const contextObj = this;
         const inferredName = contextObj.name ?? contextObj.constructor?.name;
@@ -76,22 +85,50 @@ function withSpan(options) {
         }
         if (contextObj.runId) {
           span.setAttribute("runId", contextObj.runId);
+          span.setAttribute("baggage.runId", contextObj.runId);
         }
+        const existingBaggage = import_api.propagation.getBaggage(ctx);
         const baggageEntries = {};
-        if (inferredName !== void 0) {
-          baggageEntries.componentName = { value: String(inferredName) };
+        if (existingBaggage) {
+          existingBaggage.getAllEntries().forEach(([key, entry]) => {
+            baggageEntries[key] = entry;
+          });
         }
-        if (contextObj.runId !== void 0) {
-          baggageEntries.runId = { value: String(contextObj.runId) };
+        if (sessionId !== void 0) {
+          baggageEntries.sessionId = {
+            ...baggageEntries.sessionId,
+            value: String(sessionId)
+          };
         }
         if (requestId !== void 0) {
-          baggageEntries["http.request_id"] = { value: String(requestId) };
+          baggageEntries["http.request_id"] = {
+            ...baggageEntries["http.request_id"],
+            value: String(requestId)
+          };
         }
         if (threadId !== void 0) {
-          baggageEntries.threadId = { value: String(threadId) };
+          baggageEntries.threadId = {
+            ...baggageEntries.threadId,
+            value: String(threadId)
+          };
         }
         if (resourceId !== void 0) {
-          baggageEntries.resourceId = { value: String(resourceId) };
+          baggageEntries.resourceId = {
+            ...baggageEntries.resourceId,
+            value: String(resourceId)
+          };
+        }
+        if (inferredName !== void 0) {
+          baggageEntries.componentName = {
+            ...baggageEntries.componentName,
+            value: String(inferredName)
+          };
+        }
+        if (contextObj.runId !== void 0) {
+          baggageEntries.runId = {
+            ...baggageEntries.runId,
+            value: String(contextObj.runId)
+          };
         }
         if (Object.keys(baggageEntries).length > 0) {
           ctx = import_api.propagation.setBaggage(ctx, import_api.propagation.createBaggage(baggageEntries));
@@ -121,8 +158,10 @@ function withSpan(options) {
         span.setAttribute(`${spanName}.result`, (0, import_safe_stringify.safeStringify)(result, 8192));
         return result;
       } catch (error) {
-        import_logger.logger.error(
-          `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`
+        const logger2 = this?.logger;
+        logger2?.error(
+          `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`,
+          { error }
         );
         span.setStatus({
           code: import_api.SpanStatusCode.ERROR,

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

@@ -1 +1 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/telemetry/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,QAAQ,EAGX,MAAM,oBAAoB,CAAC;AAM5B,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,GAAG,CA6JN;AAGD,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,IACoB,CAAC,SAAS;IAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;CAAE,EAAE,QAAQ,CAAC,OA4BrE"}
+{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/telemetry/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,QAAQ,EAIX,MAAM,oBAAoB,CAAC;AAM5B,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,GAAG,CAqNN;AAGD,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,IACoB,CAAC,SAAS;IAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;CAAE,EAAE,QAAQ,CAAC,OA4BrE"}

package/dist/telemetry/decorators.js

@@ -6,7 +6,6 @@ import {
   SpanKind,
   propagation
 } from "@opentelemetry/api";
-import { logger } from "../logger/index.js";
 import { hasActiveTelemetry, getBaggageValues } from "./utils.js";
 import { safeStringify } from "../utils/safe-stringify.js";
 function withSpan(options) {
@@ -15,7 +14,8 @@ function withSpan(options) {
     const originalMethod = descriptor.value;
     const methodName = String(propertyKey);
     descriptor.value = function(...args) {
-      if (options?.skipIfNoTelemetry && (!globalThis.__TELEMETRY__ || !hasActiveTelemetry())) {
+      const logger = this?.logger;
+      if (options?.skipIfNoTelemetry && (!globalThis.__TELEMETRY__ || !hasActiveTelemetry(logger))) {
         return originalMethod.apply(this, args);
       }
       const tracer = trace.getTracer(options?.tracerName ?? "dexto");
@@ -36,21 +36,30 @@ function withSpan(options) {
       args.forEach((arg, index) => {
         span.setAttribute(`${spanName}.argument.${index}`, safeStringify(arg, 8192));
       });
-      const { requestId, componentName, runId, threadId, resourceId } = getBaggageValues(ctx);
+      const { requestId, componentName, runId, threadId, resourceId, sessionId } = getBaggageValues(ctx);
+      if (sessionId) {
+        span.setAttribute("sessionId", sessionId);
+        span.setAttribute("baggage.sessionId", sessionId);
+      }
       if (requestId) {
         span.setAttribute("http.request_id", requestId);
+        span.setAttribute("baggage.http.request_id", requestId);
       }
       if (threadId) {
         span.setAttribute("threadId", threadId);
+        span.setAttribute("baggage.threadId", threadId);
       }
       if (resourceId) {
         span.setAttribute("resourceId", resourceId);
+        span.setAttribute("baggage.resourceId", resourceId);
+      }
+      if (runId !== void 0) {
+        span.setAttribute("runId", String(runId));
+        span.setAttribute("baggage.runId", String(runId));
       }
       if (componentName) {
         span.setAttribute("componentName", componentName);
-        if (runId !== void 0) {
-          span.setAttribute("runId", String(runId));
-        }
+        span.setAttribute("baggage.componentName", componentName);
       } else if (this && typeof this === "object") {
         const contextObj = this;
         const inferredName = contextObj.name ?? contextObj.constructor?.name;
@@ -59,22 +68,50 @@ function withSpan(options) {
         }
         if (contextObj.runId) {
           span.setAttribute("runId", contextObj.runId);
+          span.setAttribute("baggage.runId", contextObj.runId);
         }
+        const existingBaggage = propagation.getBaggage(ctx);
         const baggageEntries = {};
-        if (inferredName !== void 0) {
-          baggageEntries.componentName = { value: String(inferredName) };
+        if (existingBaggage) {
+          existingBaggage.getAllEntries().forEach(([key, entry]) => {
+            baggageEntries[key] = entry;
+          });
         }
-        if (contextObj.runId !== void 0) {
-          baggageEntries.runId = { value: String(contextObj.runId) };
+        if (sessionId !== void 0) {
+          baggageEntries.sessionId = {
+            ...baggageEntries.sessionId,
+            value: String(sessionId)
+          };
         }
         if (requestId !== void 0) {
-          baggageEntries["http.request_id"] = { value: String(requestId) };
+          baggageEntries["http.request_id"] = {
+            ...baggageEntries["http.request_id"],
+            value: String(requestId)
+          };
         }
         if (threadId !== void 0) {
-          baggageEntries.threadId = { value: String(threadId) };
+          baggageEntries.threadId = {
+            ...baggageEntries.threadId,
+            value: String(threadId)
+          };
         }
         if (resourceId !== void 0) {
-          baggageEntries.resourceId = { value: String(resourceId) };
+          baggageEntries.resourceId = {
+            ...baggageEntries.resourceId,
+            value: String(resourceId)
+          };
+        }
+        if (inferredName !== void 0) {
+          baggageEntries.componentName = {
+            ...baggageEntries.componentName,
+            value: String(inferredName)
+          };
+        }
+        if (contextObj.runId !== void 0) {
+          baggageEntries.runId = {
+            ...baggageEntries.runId,
+            value: String(contextObj.runId)
+          };
         }
         if (Object.keys(baggageEntries).length > 0) {
           ctx = propagation.setBaggage(ctx, propagation.createBaggage(baggageEntries));
@@ -104,8 +141,10 @@ function withSpan(options) {
         span.setAttribute(`${spanName}.result`, safeStringify(result, 8192));
         return result;
       } catch (error) {
-        logger.error(
-          `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`
+        const logger2 = this?.logger;
+        logger2?.error(
+          `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`,
+          { error }
         );
         span.setStatus({
           code: SpanStatusCode.ERROR,