@infinitedusky/indusk-mcp 1.18.1 → 1.18.2

package/dist/lib/eval/otel.d.ts

@@ -19,14 +19,21 @@ export interface EvalOtelConfig {
 }
 /**
  * Pure predicate — reads `.indusk/config.json` `eval.otel.{enabled,dataset}` and
- * the `INDUSK_EVAL_OTEL` / `INDUSK_EVAL_OTEL_DATASET` / `OTEL_EXPORTER_OTLP_ENDPOINT`
- * env vars. Does not init anything or touch the network.
+ * the `INDUSK_EVAL_OTEL` / `INDUSK_EVAL_OTEL_DATASET` / `EVAL_AGENT_DATASET` /
+ * `OTEL_EXPORTER_OTLP_ENDPOINT` env vars. Does not init anything or touch the network.
  *
  * Resolution:
  * - `enabled`: `INDUSK_EVAL_OTEL=1` (truthy) wins, else config `eval.otel.enabled`, else false.
  * - `endpoint`: `OTEL_EXPORTER_OTLP_ENDPOINT` (null if unset).
- * - `dataset`: `INDUSK_EVAL_OTEL_DATASET` env var wins, else config `eval.otel.dataset`,
- *   else `"agent"` default. Sent as the `Dash0-Dataset` header on every OTLP export.
+ * - `dataset` (priority, highest → lowest):
+ *   1. `INDUSK_EVAL_OTEL_DATASET` env var (explicit per-invocation override)
+ *   2. `EVAL_AGENT_DATASET` env var (composable.env convention — see env/components/dash0.env)
+ *   3. `.indusk/config.json` `eval.otel.dataset`
+ *   4. `"agent"` default
+ *
+ *   Sent as the `Dash0-Dataset` header on every OTLP export. Also rewritten into
+ *   `OTEL_EXPORTER_OTLP_HEADERS` if present there (env headers beat constructor
+ *   headers per OTel spec — so we fix the env header at the source).
  */
 export declare function isEvalOtelEnabled(projectRoot: string): EvalOtelConfig;
 /**

package/dist/lib/eval/otel.js

@@ -34,19 +34,27 @@ function syslog(projectRoot, msg) {
 const DEFAULT_DATASET = "agent";
 /**
  * Pure predicate — reads `.indusk/config.json` `eval.otel.{enabled,dataset}` and
- * the `INDUSK_EVAL_OTEL` / `INDUSK_EVAL_OTEL_DATASET` / `OTEL_EXPORTER_OTLP_ENDPOINT`
- * env vars. Does not init anything or touch the network.
+ * the `INDUSK_EVAL_OTEL` / `INDUSK_EVAL_OTEL_DATASET` / `EVAL_AGENT_DATASET` /
+ * `OTEL_EXPORTER_OTLP_ENDPOINT` env vars. Does not init anything or touch the network.
  *
  * Resolution:
  * - `enabled`: `INDUSK_EVAL_OTEL=1` (truthy) wins, else config `eval.otel.enabled`, else false.
  * - `endpoint`: `OTEL_EXPORTER_OTLP_ENDPOINT` (null if unset).
- * - `dataset`: `INDUSK_EVAL_OTEL_DATASET` env var wins, else config `eval.otel.dataset`,
- *   else `"agent"` default. Sent as the `Dash0-Dataset` header on every OTLP export.
+ * - `dataset` (priority, highest → lowest):
+ *   1. `INDUSK_EVAL_OTEL_DATASET` env var (explicit per-invocation override)
+ *   2. `EVAL_AGENT_DATASET` env var (composable.env convention — see env/components/dash0.env)
+ *   3. `.indusk/config.json` `eval.otel.dataset`
+ *   4. `"agent"` default
+ *
+ *   Sent as the `Dash0-Dataset` header on every OTLP export. Also rewritten into
+ *   `OTEL_EXPORTER_OTLP_HEADERS` if present there (env headers beat constructor
+ *   headers per OTel spec — so we fix the env header at the source).
  */
 export function isEvalOtelEnabled(projectRoot) {
     const envFlag = process.env.INDUSK_EVAL_OTEL;
     const endpoint = process.env.OTEL_EXPORTER_OTLP_ENDPOINT ?? null;
-    const envDataset = process.env.INDUSK_EVAL_OTEL_DATASET;
+    const explicitDataset = process.env.INDUSK_EVAL_OTEL_DATASET;
+    const composableDataset = process.env.EVAL_AGENT_DATASET;
     let configEnabled = false;
     let configDataset;
     const configPath = join(projectRoot, ".indusk", "config.json");
@@ -63,13 +71,31 @@ export function isEvalOtelEnabled(projectRoot) {
         }
     }
     const envForcesEnabled = envFlag !== undefined && envFlag !== "" && envFlag !== "0" && envFlag.toLowerCase() !== "false";
-    const dataset = envDataset && envDataset !== "" ? envDataset : (configDataset ?? DEFAULT_DATASET);
+    const dataset = (explicitDataset && explicitDataset !== "" && explicitDataset) ||
+        (composableDataset && composableDataset !== "" && composableDataset) ||
+        configDataset ||
+        DEFAULT_DATASET;
     return {
         enabled: envForcesEnabled || configEnabled,
         endpoint,
         dataset,
     };
 }
+/**
+ * Rewrite the `Dash0-Dataset=<old>` entry in `OTEL_EXPORTER_OTLP_HEADERS` to
+ * `Dash0-Dataset=<target>`. OTel spec says env-set headers override constructor
+ * headers, so we have to fix the env directly for routing to work when the user's
+ * shell already sets `OTEL_EXPORTER_OTLP_HEADERS` via composable.env.
+ *
+ * No-op if the env var is unset or doesn't contain `Dash0-Dataset=`.
+ */
+function rewriteDatasetInEnvHeaders(target) {
+    const current = process.env.OTEL_EXPORTER_OTLP_HEADERS;
+    if (!current || !current.includes("Dash0-Dataset="))
+        return;
+    const rewritten = current.replace(/Dash0-Dataset=[^,]*/g, `Dash0-Dataset=${target}`);
+    process.env.OTEL_EXPORTER_OTLP_HEADERS = rewritten;
+}
 let activeProvider = null;
 /**
  * Initialize OTel tracing for the evaluator if enabled + endpoint set.
@@ -92,6 +118,12 @@ export function initEvalOtel(projectRoot) {
     if (activeProvider) {
         return trace.getTracer(TRACER_NAME);
     }
+    // Ensure env-set OTEL_EXPORTER_OTLP_HEADERS routes to the eval agent's
+    // dataset. Env headers beat constructor headers per OTel spec — so if the
+    // user's shell (composable.env) already set Dash0-Dataset for project
+    // telemetry, we rewrite it in-place to the eval agent dataset before the
+    // exporter reads it.
+    rewriteDatasetInEnvHeaders(dataset);
     // Build exporter headers. We pass Authorization and Dash0-Dataset in the
     // constructor rather than relying on OTEL_EXPORTER_OTLP_HEADERS env parsing,
     // because the OTel SDK's env parser has proven unreliable for tokens with

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@infinitedusky/indusk-mcp",
-	"version": "1.18.1",
+	"version": "1.18.2",
 	"description": "InDusk development system — skills, MCP tools, and CLI for structured AI-assisted development",
 	"type": "module",
 	"files": [