@inkeep/agents-run-api 0.0.0-dev-20250911192304 → 0.0.0-dev-20250911210702

package/dist/index.cjs

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var autoInstrumentationsNode = require('@opentelemetry/auto-instrumentations-node');
-var baggageSpanProcessor = require('@opentelemetry/baggage-span-processor');
-var exporterTraceOtlpProto = require('@opentelemetry/exporter-trace-otlp-proto');
-var sdkNode = require('@opentelemetry/sdk-node');
-var sdkTraceNode = require('@opentelemetry/sdk-trace-node');
 var fs = require('fs');
 var path = require('path');
 var dotenv = require('dotenv');
 var z5 = require('zod');
 var agentsCore = require('@inkeep/agents-core');
 var nanoid = require('nanoid');
+var autoInstrumentationsNode = require('@opentelemetry/auto-instrumentations-node');
+var baggageSpanProcessor = require('@opentelemetry/baggage-span-processor');
+var exporterTraceOtlpProto = require('@opentelemetry/exporter-trace-otlp-proto');
+var sdkNode = require('@opentelemetry/sdk-node');
+var sdkTraceNode = require('@opentelemetry/sdk-trace-node');
 var hono = require('hono');
 var zodOpenapi = require('@hono/zod-openapi');
 var api = require('@opentelemetry/api');
@@ -78,79 +78,6 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-
-// src/instrumentation.ts
-var instrumentation_exports = {};
-__export(instrumentation_exports, {
-  sdk: () => sdk,
-  spanProcessor: () => spanProcessor
-});
-var otlpUrl, otlpExporter, FanOutSpanProcessor, spanProcessor, sdk;
-var init_instrumentation = __esm({
-  "src/instrumentation.ts"() {
-    otlpUrl = process.env.OTEL_EXPORTER_OTLP_ENDPOINT || "http://localhost:14318/v1/traces";
-    otlpExporter = new exporterTraceOtlpProto.OTLPTraceExporter({ url: otlpUrl });
-    FanOutSpanProcessor = class {
-      constructor(inner) {
-        this.inner = inner;
-      }
-      onStart(span, parent) {
-        this.inner.forEach((p) => p.onStart(span, parent));
-      }
-      onEnd(span) {
-        this.inner.forEach((p) => p.onEnd(span));
-      }
-      forceFlush() {
-        return Promise.all(this.inner.map((p) => p.forceFlush?.())).then(() => {
-        });
-      }
-      shutdown() {
-        return Promise.all(this.inner.map((p) => p.shutdown?.())).then(() => {
-        });
-      }
-    };
-    spanProcessor = new FanOutSpanProcessor([
-      new baggageSpanProcessor.BaggageSpanProcessor(baggageSpanProcessor.ALLOW_ALL_BAGGAGE_KEYS),
-      new sdkTraceNode.BatchSpanProcessor(otlpExporter, {
-        maxExportBatchSize: 1,
-        // Send immediately (vs 512)
-        scheduledDelayMillis: 100,
-        // 100ms delay (vs 5000ms)
-        exportTimeoutMillis: 5e3,
-        // 5s timeout (vs 30s)
-        maxQueueSize: 512
-        // Smaller queue
-      })
-    ]);
-    sdk = new sdkNode.NodeSDK({
-      serviceName: "inkeep-chat",
-      spanProcessor,
-      instrumentations: [
-        autoInstrumentationsNode.getNodeAutoInstrumentations({
-          "@opentelemetry/instrumentation-http": {
-            enabled: true,
-            requestHook: (span, request) => {
-              const url = request?.url ?? request?.path;
-              if (!url) return;
-              const u = new URL(url, "http://localhost");
-              span.updateName(`${request?.method || "UNKNOWN"} ${u.pathname}`);
-            }
-          },
-          "@opentelemetry/instrumentation-undici": {
-            requestHook: (span) => {
-              const method = span.attributes?.["http.request.method"];
-              const host = span.attributes?.["server.address"];
-              const path2 = span.attributes?.["url.path"];
-              if (method && path2)
-                span.updateName(host ? `${method} ${host}${path2}` : `${method} ${path2}`);
-            }
-          }
-        })
-      ]
-    });
-    sdk.start();
-  }
-});
 var environmentSchema, criticalEnv, loadEnvFile, envSchema, parseEnv, env;
 var init_env = __esm({
   "src/env.ts"() {
@@ -183,7 +110,8 @@ var init_env = __esm({
       OPENAI_API_KEY: z5.z.string().optional(),
       ANTHROPIC_API_KEY: z5.z.string(),
       INKEEP_AGENTS_RUN_BYPASS_SECRET: z5.z.string().optional(),
-      OTEL_TRACES_FORCE_FLUSH_ENABLED: z5.z.stringbool().optional()
+      OTEL_MAX_EXPORT_BATCH_SIZE: z5.z.coerce.number().optional(),
+      OTEL_EXPORTER_OTLP_ENDPOINT: z5.z.string().optional().default("http://localhost:14318/v1/traces")
     });
     parseEnv = () => {
       try {
@@ -401,8 +329,63 @@ var init_conversations = __esm({
   }
 });
 
-// src/index.ts
-init_instrumentation();
+// src/instrumentation.ts
+init_env();
+var otlpUrl = env.OTEL_EXPORTER_OTLP_ENDPOINT;
+var otlpExporter = new exporterTraceOtlpProto.OTLPTraceExporter({ url: otlpUrl });
+var FanOutSpanProcessor = class {
+  constructor(inner) {
+    this.inner = inner;
+  }
+  onStart(span, parent) {
+    this.inner.forEach((p) => p.onStart(span, parent));
+  }
+  onEnd(span) {
+    this.inner.forEach((p) => p.onEnd(span));
+  }
+  forceFlush() {
+    return Promise.all(this.inner.map((p) => p.forceFlush?.())).then(() => {
+    });
+  }
+  shutdown() {
+    return Promise.all(this.inner.map((p) => p.shutdown?.())).then(() => {
+    });
+  }
+};
+var maxExportBatchSize = env.OTEL_MAX_EXPORT_BATCH_SIZE ?? (env.ENVIRONMENT === "development" ? 1 : 512);
+var spanProcessor = new FanOutSpanProcessor([
+  new baggageSpanProcessor.BaggageSpanProcessor(baggageSpanProcessor.ALLOW_ALL_BAGGAGE_KEYS),
+  new sdkTraceNode.BatchSpanProcessor(otlpExporter, {
+    maxExportBatchSize
+  })
+]);
+var sdk = new sdkNode.NodeSDK({
+  serviceName: "inkeep-agents-run-api",
+  spanProcessor,
+  instrumentations: [
+    autoInstrumentationsNode.getNodeAutoInstrumentations({
+      "@opentelemetry/instrumentation-http": {
+        enabled: true,
+        requestHook: (span, request) => {
+          const url = request?.url ?? request?.path;
+          if (!url) return;
+          const u = new URL(url, "http://localhost");
+          span.updateName(`${request?.method || "UNKNOWN"} ${u.pathname}`);
+        }
+      },
+      "@opentelemetry/instrumentation-undici": {
+        requestHook: (span) => {
+          const method = span.attributes?.["http.request.method"];
+          const host = span.attributes?.["server.address"];
+          const path2 = span.attributes?.["url.path"];
+          if (method && path2)
+            span.updateName(host ? `${method} ${host}${path2}` : `${method} ${path2}`);
+        }
+      }
+    })
+  ]
+});
+sdk.start();
 
 // src/logger.ts
 init_env();
@@ -1235,81 +1218,10 @@ init_dbClient();
 init_conversations();
 init_dbClient();
 
-// src/tracer.ts
-init_env();
-var FORCE_FLUSH_ENVIRONMENTS = ["development"];
-var logger4 = getLogger("tracer");
-var BASE = "inkeep-chat";
-var SERVICE_NAME = "inkeep-chat";
-var SERVICE_VERSION = "1.0.0";
-var createSpanName = (suffix) => `${BASE}.${suffix}`;
-var createNoOpSpan = () => ({
-  setAttributes: () => ({}),
-  recordException: () => ({}),
-  setStatus: () => ({}),
-  addEvent: () => ({}),
-  end: () => {
-  },
-  isRecording: () => false,
-  setAttribute: () => ({}),
-  updateName: () => ({}),
-  spanContext: () => ({
-    traceId: "00000000000000000000000000000000",
-    spanId: "0000000000000000",
-    traceFlags: 0
-  }),
-  addLink: () => ({}),
-  addLinks: () => ({})
-});
-var noopTracer = {
-  startActiveSpan(_name, arg1, arg2, arg3) {
-    const fn = typeof arg1 === "function" ? arg1 : typeof arg2 === "function" ? arg2 : arg3;
-    if (!fn) throw new Error("No callback function provided");
-    return fn(createNoOpSpan());
-  },
-  startSpan(_name, _options) {
-    return createNoOpSpan();
-  }
-};
-var globalTracerInstance = null;
-function handleSpanError(span, error, logger24, logMessage) {
-  const errorMessage = error instanceof Error ? error.message : String(error);
-  span.recordException(error);
-  span.setStatus({
-    code: api.SpanStatusCode.ERROR,
-    message: errorMessage
-  });
-}
-function getGlobalTracer() {
-  if (!globalTracerInstance) {
-    try {
-      globalTracerInstance = api.trace.getTracer(SERVICE_NAME, SERVICE_VERSION);
-    } catch (_error) {
-      logger4.debug("OpenTelemetry tracer not available, using no-op tracer");
-      globalTracerInstance = noopTracer;
-    }
-  }
-  return globalTracerInstance;
-}
-async function forceFlushTracer() {
-  const isOtelTracesForceFlushEnabled = env.OTEL_TRACES_FORCE_FLUSH_ENABLED;
-  const isForceFlushEnvironment = env.ENVIRONMENT && FORCE_FLUSH_ENVIRONMENTS.includes(env.ENVIRONMENT);
-  const shouldForceFlush = isOtelTracesForceFlushEnabled === true || isOtelTracesForceFlushEnabled == null && isForceFlushEnvironment;
-  if (!shouldForceFlush) {
-    return;
-  }
-  try {
-    const { spanProcessor: spanProcessor2 } = await Promise.resolve().then(() => (init_instrumentation(), instrumentation_exports));
-    if (spanProcessor2 && typeof spanProcessor2.forceFlush === "function") {
-      await spanProcessor2.forceFlush();
-      logger4.debug("Span processor force flush completed");
-    } else {
-      logger4.debug("Span processor does not support force flush or is not available");
-    }
-  } catch (error) {
-    logger4.warn({ error }, "Failed to force flush tracer");
-  }
-}
+// package.json
+var package_default = {
+  version: "0.1.3"};
+var tracer = agentsCore.getTracer("agents-run-api", package_default.version);
 function agentInitializingOp(sessionId, graphId) {
   return {
     type: "agent_initializing",
@@ -1346,10 +1258,10 @@ function statusUpdateOp(ctx) {
     ctx
   };
 }
-var logger5 = getLogger("DataComponentSchema");
+var logger4 = getLogger("DataComponentSchema");
 function jsonSchemaToZod(jsonSchema) {
   if (!jsonSchema || typeof jsonSchema !== "object") {
-    logger5.warn({ jsonSchema }, "Invalid JSON schema provided, using string fallback");
+    logger4.warn({ jsonSchema }, "Invalid JSON schema provided, using string fallback");
     return z5.z.string();
   }
   switch (jsonSchema.type) {
@@ -1376,7 +1288,7 @@ function jsonSchemaToZod(jsonSchema) {
     case "null":
       return z5.z.null();
     default:
-      logger5.warn(
+      logger4.warn(
         {
           unsupportedType: jsonSchema.type,
           schema: jsonSchema
@@ -1430,7 +1342,7 @@ __publicField(_ArtifactReferenceSchema, "ARTIFACT_PROPS_SCHEMA", {
   required: ["artifact_id", "task_id"]
 });
 var ArtifactReferenceSchema = _ArtifactReferenceSchema;
-var logger6 = getLogger("ModelFactory");
+var logger5 = getLogger("ModelFactory");
 var _ModelFactory = class _ModelFactory {
   /**
    * Create a language model instance from configuration
@@ -1443,7 +1355,7 @@ var _ModelFactory = class _ModelFactory {
     const modelSettings = config2;
     const modelString = modelSettings.model.trim();
     const { provider, modelName } = _ModelFactory.parseModelString(modelString);
-    logger6.debug(
+    logger5.debug(
       {
         provider,
         model: modelName,
@@ -1462,7 +1374,7 @@ var _ModelFactory = class _ModelFactory {
           throw new Error(`Unsupported provider: ${provider}. Supported providers are: ${_ModelFactory.SUPPORTED_PROVIDERS.join(", ")}`);
       }
     } catch (error) {
-      logger6.error(
+      logger5.error(
         {
           provider,
           model: modelName,
@@ -1483,7 +1395,7 @@ var _ModelFactory = class _ModelFactory {
       const [provider, ...modelParts] = modelString.split("/");
       const normalizedProvider = provider.toLowerCase();
       if (!_ModelFactory.SUPPORTED_PROVIDERS.includes(normalizedProvider)) {
-        logger6.warn(
+        logger5.warn(
           { provider: normalizedProvider, modelName: modelParts.join("/") },
           "Unsupported provider detected, falling back to anthropic"
         );
@@ -1512,14 +1424,14 @@ var _ModelFactory = class _ModelFactory {
       anthropicConfig.baseURL = providerOptions.baseUrl || providerOptions.baseURL;
     }
     if (providerOptions?.gateway) {
-      logger6.info(
+      logger5.info(
         { gateway: providerOptions.gateway },
         "Setting up AI Gateway for Anthropic model"
       );
       Object.assign(anthropicConfig, providerOptions.gateway);
     }
     if (Object.keys(anthropicConfig).length > 0) {
-      logger6.info({ config: anthropicConfig }, "Applying custom Anthropic provider configuration");
+      logger5.info({ config: anthropicConfig }, "Applying custom Anthropic provider configuration");
       const provider = anthropic.createAnthropic(anthropicConfig);
       return provider(modelName);
     }
@@ -1534,11 +1446,11 @@ var _ModelFactory = class _ModelFactory {
       openaiConfig.baseURL = providerOptions.baseUrl || providerOptions.baseURL;
     }
     if (providerOptions?.gateway) {
-      logger6.info({ gateway: providerOptions.gateway }, "Setting up AI Gateway for OpenAI model");
+      logger5.info({ gateway: providerOptions.gateway }, "Setting up AI Gateway for OpenAI model");
       Object.assign(openaiConfig, providerOptions.gateway);
     }
     if (Object.keys(openaiConfig).length > 0) {
-      logger6.info({ config: openaiConfig }, "Applying custom OpenAI provider configuration");
+      logger5.info({ config: openaiConfig }, "Applying custom OpenAI provider configuration");
       const provider = openai.createOpenAI(openaiConfig);
       return provider(modelName);
     }
@@ -1631,8 +1543,7 @@ function unregisterStreamHelper(requestId2) {
 }
 
 // src/utils/graph-session.ts
-var logger7 = getLogger("GraphSession");
-var tracer = getGlobalTracer();
+var logger6 = getLogger("GraphSession");
 var GraphSession = class {
   // Track scheduled timeouts for cleanup
   constructor(sessionId, messageId, graphId, tenantId, projectId) {
@@ -1656,7 +1567,7 @@ var GraphSession = class {
     __publicField(this, "MAX_PENDING_ARTIFACTS", 100);
     // Prevent unbounded growth
     __publicField(this, "scheduledTimeouts");
-    logger7.debug({ sessionId, messageId, graphId }, "GraphSession created");
+    logger6.debug({ sessionId, messageId, graphId }, "GraphSession created");
   }
   /**
    * Initialize status updates for this session
@@ -1678,7 +1589,7 @@ var GraphSession = class {
     if (this.statusUpdateState.config.timeInSeconds) {
       this.statusUpdateTimer = setInterval(async () => {
         if (!this.statusUpdateState || this.isEnded) {
-          logger7.debug(
+          logger6.debug(
             { sessionId: this.sessionId },
             "Timer triggered but session already cleaned up or ended"
           );
@@ -1690,7 +1601,7 @@ var GraphSession = class {
         }
         await this.checkAndSendTimeBasedUpdate();
       }, this.statusUpdateState.config.timeInSeconds * 1e3);
-      logger7.info(
+      logger6.info(
         {
           sessionId: this.sessionId,
           intervalMs: this.statusUpdateState.config.timeInSeconds * 1e3
@@ -1704,7 +1615,7 @@ var GraphSession = class {
    */
   recordEvent(eventType, agentId, data) {
     if (this.isEnded) {
-      logger7.debug(
+      logger6.debug(
         {
           sessionId: this.sessionId,
           eventType,
@@ -1724,7 +1635,7 @@ var GraphSession = class {
     if (eventType === "artifact_saved" && data.pendingGeneration) {
       const artifactId = data.artifactId;
       if (this.pendingArtifacts.size >= this.MAX_PENDING_ARTIFACTS) {
-        logger7.warn({
+        logger6.warn({
           sessionId: this.sessionId,
           artifactId,
           pendingCount: this.pendingArtifacts.size,
@@ -1742,7 +1653,7 @@ var GraphSession = class {
           this.artifactProcessingErrors.set(artifactId, errorCount);
           if (errorCount >= this.MAX_ARTIFACT_RETRIES) {
             this.pendingArtifacts.delete(artifactId);
-            logger7.error({
+            logger6.error({
               sessionId: this.sessionId,
               artifactId,
               errorCount,
@@ -1751,7 +1662,7 @@ var GraphSession = class {
               stack: error instanceof Error ? error.stack : void 0
             }, "Artifact processing failed after max retries, giving up");
           } else {
-            logger7.warn({
+            logger6.warn({
               sessionId: this.sessionId,
               artifactId,
               errorCount,
@@ -1770,14 +1681,14 @@ var GraphSession = class {
    */
   checkStatusUpdates() {
     if (this.isEnded) {
-      logger7.debug(
+      logger6.debug(
         { sessionId: this.sessionId },
         "Session has ended - skipping status update check"
       );
       return;
     }
     if (!this.statusUpdateState) {
-      logger7.debug({ sessionId: this.sessionId }, "No status update state - skipping check");
+      logger6.debug({ sessionId: this.sessionId }, "No status update state - skipping check");
       return;
     }
     const statusUpdateState = this.statusUpdateState;
@@ -1788,11 +1699,11 @@ var GraphSession = class {
    */
   async checkAndSendTimeBasedUpdate() {
     if (this.isEnded) {
-      logger7.debug({ sessionId: this.sessionId }, "Session has ended - skipping time-based update");
+      logger6.debug({ sessionId: this.sessionId }, "Session has ended - skipping time-based update");
       return;
     }
     if (!this.statusUpdateState) {
-      logger7.debug(
+      logger6.debug(
         { sessionId: this.sessionId },
         "No status updates configured for time-based check"
       );
@@ -1805,7 +1716,7 @@ var GraphSession = class {
     try {
       await this.generateAndSendUpdate();
     } catch (error) {
-      logger7.error(
+      logger6.error(
         {
           sessionId: this.sessionId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -1898,29 +1809,29 @@ var GraphSession = class {
    */
   async generateAndSendUpdate() {
     if (this.isEnded) {
-      logger7.debug({ sessionId: this.sessionId }, "Session has ended - not generating update");
+      logger6.debug({ sessionId: this.sessionId }, "Session has ended - not generating update");
       return;
     }
     if (this.isTextStreaming) {
-      logger7.debug(
+      logger6.debug(
         { sessionId: this.sessionId },
         "Text is currently streaming - skipping status update"
       );
       return;
     }
     if (this.isGeneratingUpdate) {
-      logger7.debug(
+      logger6.debug(
         { sessionId: this.sessionId },
         "Update already in progress - skipping duplicate generation"
       );
       return;
     }
     if (!this.statusUpdateState) {
-      logger7.warn({ sessionId: this.sessionId }, "No status update state - cannot generate update");
+      logger6.warn({ sessionId: this.sessionId }, "No status update state - cannot generate update");
       return;
     }
     if (!this.graphId) {
-      logger7.warn({ sessionId: this.sessionId }, "No graph ID - cannot generate update");
+      logger6.warn({ sessionId: this.sessionId }, "No graph ID - cannot generate update");
       return;
     }
     const newEventCount = this.events.length - this.statusUpdateState.lastEventCount;
@@ -1933,7 +1844,7 @@ var GraphSession = class {
     try {
       const streamHelper = getStreamHelper(this.sessionId);
       if (!streamHelper) {
-        logger7.warn(
+        logger6.warn(
           { sessionId: this.sessionId },
           "No stream helper found - cannot send status update"
         );
@@ -1954,7 +1865,7 @@ var GraphSession = class {
         if (result.operations && result.operations.length > 0) {
           for (const op of result.operations) {
             if (!op || !op.type || !op.data || Object.keys(op.data).length === 0) {
-              logger7.warn(
+              logger6.warn(
                 {
                   sessionId: this.sessionId,
                   operation: op
@@ -2007,7 +1918,7 @@ var GraphSession = class {
         this.previousSummaries.shift();
       }
       if (!operation || !operation.type || !operation.ctx) {
-        logger7.warn(
+        logger6.warn(
           {
             sessionId: this.sessionId,
             operation
@@ -2022,7 +1933,7 @@ var GraphSession = class {
         this.statusUpdateState.lastEventCount = this.events.length;
       }
     } catch (error) {
-      logger7.error(
+      logger6.error(
         {
           sessionId: this.sessionId,
           error: error instanceof Error ? error.message : "Unknown error",
@@ -2060,7 +1971,7 @@ var GraphSession = class {
           this.releaseUpdateLock();
         }
       } catch (error) {
-        logger7.error(
+        logger6.error(
           {
             sessionId: this.sessionId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -2105,7 +2016,7 @@ var GraphSession = class {
    */
   async generateProgressSummary(newEvents, elapsedTime, summarizerModel, previousSummaries = []) {
     return tracer.startActiveSpan(
-      createSpanName("graph_session.generate_progress_summary"),
+      "graph_session.generate_progress_summary",
       {
         attributes: {
           "graph_session.id": this.sessionId,
@@ -2137,7 +2048,7 @@ User's Question/Context:
 ${conversationHistory}
 ` : "";
             } catch (error) {
-              logger7.warn(
+              logger6.warn(
                 { sessionId: this.sessionId, error },
                 "Failed to fetch conversation history for status update"
               );
@@ -2186,8 +2097,8 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           span.setStatus({ code: api.SpanStatusCode.OK });
           return text.trim();
         } catch (error) {
-          handleSpanError(span, error);
-          logger7.error({ error }, "Failed to generate summary, using fallback");
+          agentsCore.setSpanWithError(span, error);
+          logger6.error({ error }, "Failed to generate summary, using fallback");
           return this.generateFallbackSummary(newEvents, elapsedTime);
         } finally {
           span.end();
@@ -2200,7 +2111,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
    */
   async generateStructuredStatusUpdate(newEvents, elapsedTime, statusComponents, summarizerModel, previousSummaries = []) {
     return tracer.startActiveSpan(
-      createSpanName("graph_session.generate_structured_update"),
+      "graph_session.generate_structured_update",
       {
         attributes: {
           "graph_session.id": this.sessionId,
@@ -2233,7 +2144,7 @@ User's Question/Context:
 ${conversationHistory}
 ` : "";
             } catch (error) {
-              logger7.warn(
+              logger6.warn(
                 { sessionId: this.sessionId, error },
                 "Failed to fetch conversation history for structured status update"
               );
@@ -2329,8 +2240,8 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           span.setStatus({ code: api.SpanStatusCode.OK });
           return { operations };
         } catch (error) {
-          handleSpanError(span, error);
-          logger7.error({ error }, "Failed to generate structured update, using fallback");
+          agentsCore.setSpanWithError(span, error);
+          logger6.error({ error }, "Failed to generate structured update, using fallback");
           return { operations: [] };
         } finally {
           span.end();
@@ -2515,7 +2426,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
    */
   async processArtifact(artifactData) {
     return tracer.startActiveSpan(
-      createSpanName("graph_session.process_artifact"),
+      "graph_session.process_artifact",
       {
         attributes: {
           "graph_session.id": this.sessionId,
@@ -2588,7 +2499,7 @@ Make it specific and relevant.`;
             description: z5.z.string().max(150).describe("Brief description of the artifact's relevance to the user's question")
           });
           const { object: result } = await tracer.startActiveSpan(
-            createSpanName("graph_session.generate_artifact_metadata"),
+            "graph_session.generate_artifact_metadata",
             {
               attributes: {
                 "llm.model": this.statusUpdateState?.summarizerModel?.model,
@@ -2621,7 +2532,7 @@ Make it specific and relevant.`;
                 generationSpan.setStatus({ code: api.SpanStatusCode.OK });
                 return result2;
               } catch (error) {
-                handleSpanError(generationSpan, error);
+                agentsCore.setSpanWithError(generationSpan, error);
                 throw error;
               } finally {
                 generationSpan.end();
@@ -2655,7 +2566,7 @@ Make it specific and relevant.`;
             taskId: artifactData.taskId,
             artifacts: [artifactToSave]
           });
-          logger7.info(
+          logger6.info(
             {
               sessionId: this.sessionId,
               artifactId: artifactData.artifactId,
@@ -2671,8 +2582,8 @@ Make it specific and relevant.`;
           });
           span.setStatus({ code: api.SpanStatusCode.OK });
         } catch (error) {
-          handleSpanError(span, error);
-          logger7.error(
+          agentsCore.setSpanWithError(span, error);
+          logger6.error(
             {
               sessionId: this.sessionId,
               artifactId: artifactData.artifactId,
@@ -2708,7 +2619,7 @@ Make it specific and relevant.`;
                 taskId: artifactData.taskId,
                 artifacts: [fallbackArtifact]
               });
-              logger7.info(
+              logger6.info(
                 {
                   sessionId: this.sessionId,
                   artifactId: artifactData.artifactId
@@ -2717,7 +2628,7 @@ Make it specific and relevant.`;
               );
             }
           } catch (fallbackError) {
-            logger7.error(
+            logger6.error(
               {
                 sessionId: this.sessionId,
                 artifactId: artifactData.artifactId,
@@ -2744,7 +2655,7 @@ var GraphSessionManager = class {
     const sessionId = messageId;
     const session = new GraphSession(sessionId, messageId, graphId, tenantId, projectId);
     this.sessions.set(sessionId, session);
-    logger7.info({ sessionId, messageId, graphId, tenantId, projectId }, "GraphSession created");
+    logger6.info({ sessionId, messageId, graphId, tenantId, projectId }, "GraphSession created");
     return sessionId;
   }
   /**
@@ -2755,7 +2666,7 @@ var GraphSessionManager = class {
     if (session) {
       session.initializeStatusUpdates(config2, summarizerModel);
     } else {
-      logger7.error(
+      logger6.error(
         {
           sessionId,
           availableSessions: Array.from(this.sessions.keys())
@@ -2776,7 +2687,7 @@ var GraphSessionManager = class {
   recordEvent(sessionId, eventType, agentId, data) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger7.warn({ sessionId }, "Attempted to record event in non-existent session");
+      logger6.warn({ sessionId }, "Attempted to record event in non-existent session");
       return;
     }
     session.recordEvent(eventType, agentId, data);
@@ -2787,12 +2698,12 @@ var GraphSessionManager = class {
   endSession(sessionId) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger7.warn({ sessionId }, "Attempted to end non-existent session");
+      logger6.warn({ sessionId }, "Attempted to end non-existent session");
       return [];
     }
     const events = session.getEvents();
     const summary = session.getSummary();
-    logger7.info({ sessionId, summary }, "GraphSession ended");
+    logger6.info({ sessionId, summary }, "GraphSession ended");
     session.cleanup();
     this.sessions.delete(sessionId);
     return events;
@@ -2821,7 +2732,7 @@ var graphSessionManager = new GraphSessionManager();
 
 // src/utils/artifact-parser.ts
 init_dbClient();
-var logger8 = getLogger("ArtifactParser");
+var logger7 = getLogger("ArtifactParser");
 var _ArtifactParser = class _ArtifactParser {
   constructor(tenantId) {
     this.tenantId = tenantId;
@@ -2885,7 +2796,7 @@ var _ArtifactParser = class _ArtifactParser {
           id: taskId
         });
         if (!task) {
-          logger8.warn({ taskId }, "Task not found when fetching artifacts");
+          logger7.warn({ taskId }, "Task not found when fetching artifacts");
           continue;
         }
         const taskArtifacts = await agentsCore.getLedgerArtifacts(dbClient_default)({
@@ -2897,9 +2808,9 @@ var _ArtifactParser = class _ArtifactParser {
           artifacts.set(key, artifact);
         }
       }
-      logger8.debug({ contextId, count: artifacts.size }, "Loaded context artifacts");
+      logger7.debug({ contextId, count: artifacts.size }, "Loaded context artifacts");
     } catch (error) {
-      logger8.error({ error, contextId }, "Error loading context artifacts");
+      logger7.error({ error, contextId }, "Error loading context artifacts");
     }
     return artifacts;
   }
@@ -3002,7 +2913,7 @@ var _ArtifactParser = class _ArtifactParser {
         id: taskId
       });
       if (!task) {
-        logger8.warn({ taskId }, "Task not found when fetching artifact");
+        logger7.warn({ taskId }, "Task not found when fetching artifact");
         return null;
       }
       const artifacts = await agentsCore.getLedgerArtifacts(dbClient_default)({
@@ -3014,7 +2925,7 @@ var _ArtifactParser = class _ArtifactParser {
         return this.formatArtifactData(artifacts[0], artifactId, taskId);
       }
     } catch (error) {
-      logger8.warn({ artifactId, taskId, error }, "Failed to fetch artifact");
+      logger7.warn({ artifactId, taskId, error }, "Failed to fetch artifact");
     }
     return null;
   }
@@ -3054,7 +2965,7 @@ __publicField(_ArtifactParser, "INCOMPLETE_ARTIFACT_REGEX", /<(a(r(t(i(f(a(c(t(:
 var ArtifactParser = _ArtifactParser;
 
 // src/utils/incremental-stream-parser.ts
-var logger9 = getLogger("IncrementalStreamParser");
+var logger8 = getLogger("IncrementalStreamParser");
 var IncrementalStreamParser = class {
   constructor(streamHelper, tenantId, contextId) {
     __publicField(this, "buffer", "");
@@ -3114,13 +3025,13 @@ var IncrementalStreamParser = class {
       if (part.type === "tool-call-delta" && part.toolName === targetToolName) {
         const delta = part.argsTextDelta || "";
         if (jsonBuffer.length + delta.length > MAX_BUFFER_SIZE) {
-          logger9.warn("JSON buffer exceeded maximum size, truncating");
+          logger8.warn("JSON buffer exceeded maximum size, truncating");
           jsonBuffer = jsonBuffer.slice(-MAX_BUFFER_SIZE / 2);
         }
         jsonBuffer += delta;
         for (const char of delta) {
           if (componentBuffer.length > MAX_BUFFER_SIZE) {
-            logger9.warn("Component buffer exceeded maximum size, resetting");
+            logger8.warn("Component buffer exceeded maximum size, resetting");
             componentBuffer = "";
             depth = 0;
             continue;
@@ -3135,7 +3046,7 @@ var IncrementalStreamParser = class {
               if (componentMatch) {
                 const MAX_COMPONENT_SIZE = 1024 * 1024;
                 if (componentMatch[0].length > MAX_COMPONENT_SIZE) {
-                  logger9.warn(
+                  logger8.warn(
                     {
                       size: componentMatch[0].length,
                       maxSize: MAX_COMPONENT_SIZE
@@ -3148,7 +3059,7 @@ var IncrementalStreamParser = class {
                 try {
                   const component = JSON.parse(componentMatch[0]);
                   if (typeof component !== "object" || !component.id) {
-                    logger9.warn("Invalid component structure, skipping");
+                    logger8.warn("Invalid component structure, skipping");
                     componentBuffer = "";
                     continue;
                   }
@@ -3161,7 +3072,7 @@ var IncrementalStreamParser = class {
                   componentsStreamed++;
                   componentBuffer = "";
                 } catch (e) {
-                  logger9.debug({ error: e }, "Failed to parse component, continuing to accumulate");
+                  logger8.debug({ error: e }, "Failed to parse component, continuing to accumulate");
                 }
               }
             }
@@ -3178,7 +3089,7 @@ var IncrementalStreamParser = class {
         break;
       }
     }
-    logger9.debug({ componentsStreamed }, "Finished streaming components");
+    logger8.debug({ componentsStreamed }, "Finished streaming components");
   }
   /**
    * Legacy method for backward compatibility - defaults to text processing
@@ -3320,12 +3231,9 @@ var IncrementalStreamParser = class {
     }
   }
 };
-var logger10 = getLogger("ResponseFormatter");
-var RESPONSE_FORMATTER_SERVICE = "responseFormatter";
-function getResponseFormatterTracer() {
-  const tracerProvider = api.trace.getTracerProvider();
-  return tracerProvider.getTracer(RESPONSE_FORMATTER_SERVICE, SERVICE_VERSION);
-}
+
+// src/utils/response-formatter.ts
+var logger9 = getLogger("ResponseFormatter");
 var ResponseFormatter = class {
   constructor(tenantId) {
     __publicField(this, "artifactParser");
@@ -3335,8 +3243,7 @@ var ResponseFormatter = class {
    * Process structured object response and replace artifact markers with actual artifacts
    */
   async formatObjectResponse(responseObject, contextId) {
-    const tracer3 = getResponseFormatterTracer();
-    return tracer3.startActiveSpan("response.formatObject", async (span) => {
+    return tracer.startActiveSpan("response.format_object_response", async (span) => {
       try {
         const artifactMap = await this.artifactParser.getContextArtifacts(contextId);
         span.setAttributes({
@@ -3356,8 +3263,8 @@ var ResponseFormatter = class {
         });
         return { parts };
       } catch (error) {
-        span.recordException(error);
-        logger10.error({ error, responseObject }, "Error formatting object response");
+        agentsCore.setSpanWithError(span, error);
+        logger9.error({ error, responseObject }, "Error formatting object response");
         return {
           parts: [{ kind: "data", data: responseObject }]
         };
@@ -3370,8 +3277,7 @@ var ResponseFormatter = class {
    * Process agent response and convert artifact markers to data parts
    */
   async formatResponse(responseText, contextId) {
-    const tracer3 = getResponseFormatterTracer();
-    return tracer3.startActiveSpan("response.format", async (span) => {
+    return tracer.startActiveSpan("response.format_response", async (span) => {
       try {
         span.setAttributes({
           "response.hasArtifactMarkers": this.artifactParser.hasArtifactMarkers(responseText),
@@ -3408,9 +3314,8 @@ var ResponseFormatter = class {
         });
         return { parts };
       } catch (error) {
-        span.recordException(error);
-        span.setStatus({ code: 2, message: error.message });
-        logger10.error({ error, responseText }, "Error formatting response");
+        agentsCore.setSpanWithError(span, error);
+        logger9.error({ error, responseText }, "Error formatting response");
         return { text: responseText };
       } finally {
         span.end();
@@ -3455,7 +3360,7 @@ var ResponseFormatter = class {
     }
   }
 };
-var logger11 = getLogger("ToolSessionManager");
+var logger10 = getLogger("ToolSessionManager");
 var _ToolSessionManager = class _ToolSessionManager {
   // 5 minutes
   constructor() {
@@ -3484,7 +3389,7 @@ var _ToolSessionManager = class _ToolSessionManager {
       createdAt: Date.now()
     };
     this.sessions.set(sessionId, session);
-    logger11.debug({ sessionId, tenantId, contextId, taskId }, "Created tool session");
+    logger10.debug({ sessionId, tenantId, contextId, taskId }, "Created tool session");
     return sessionId;
   }
   /**
@@ -3493,7 +3398,7 @@ var _ToolSessionManager = class _ToolSessionManager {
   recordToolResult(sessionId, toolResult) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger11.warn(
+      logger10.warn(
         { sessionId, toolCallId: toolResult.toolCallId },
         "Tool result recorded for unknown session"
       );
@@ -3507,12 +3412,12 @@ var _ToolSessionManager = class _ToolSessionManager {
   getToolResult(sessionId, toolCallId) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger11.warn({ sessionId, toolCallId }, "Requested tool result for unknown session");
+      logger10.warn({ sessionId, toolCallId }, "Requested tool result for unknown session");
       return void 0;
     }
     const result = session.toolResults.get(toolCallId);
     if (!result) {
-      logger11.warn(
+      logger10.warn(
         {
           sessionId,
           toolCallId,
@@ -3551,10 +3456,10 @@ var _ToolSessionManager = class _ToolSessionManager {
     }
     for (const sessionId of expiredSessions) {
       this.sessions.delete(sessionId);
-      logger11.debug({ sessionId }, "Cleaned up expired tool session");
+      logger10.debug({ sessionId }, "Cleaned up expired tool session");
     }
     if (expiredSessions.length > 0) {
-      logger11.info({ expiredCount: expiredSessions.length }, "Cleaned up expired tool sessions");
+      logger10.info({ expiredCount: expiredSessions.length }, "Cleaned up expired tool sessions");
     }
   }
 };
@@ -3563,7 +3468,7 @@ var ToolSessionManager = _ToolSessionManager;
 var toolSessionManager = ToolSessionManager.getInstance();
 
 // src/agents/artifactTools.ts
-var logger12 = getLogger("artifactTools");
+var logger11 = getLogger("artifactTools");
 function buildKeyNestingMap(data, prefix = "", map = /* @__PURE__ */ new Map()) {
   if (typeof data === "object" && data !== null) {
     if (Array.isArray(data)) {
@@ -3784,7 +3689,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
     execute: async ({ toolCallId, baseSelector, propSelectors, ...rest }, _context) => {
       const artifactType = "artifactType" in rest ? rest.artifactType : void 0;
       if (!sessionId) {
-        logger12.warn({ toolCallId }, "No session ID provided to save_tool_result");
+        logger11.warn({ toolCallId }, "No session ID provided to save_tool_result");
         return {
           saved: false,
           error: `[toolCallId: ${toolCallId}] No session context available`,
@@ -3794,7 +3699,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
       }
       const toolResult = toolSessionManager.getToolResult(sessionId, toolCallId);
       if (!toolResult) {
-        logger12.warn({ toolCallId, sessionId }, "Tool result not found in session");
+        logger11.warn({ toolCallId, sessionId }, "Tool result not found in session");
         return {
           saved: false,
           error: `[toolCallId: ${toolCallId}] Tool result not found`,
@@ -3807,7 +3712,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
         const baseData = jmespath__default.default.search(parsedResult, baseSelector);
         if (!baseData || Array.isArray(baseData) && baseData.length === 0) {
           const debugInfo = analyzeSelectorFailure(parsedResult, baseSelector);
-          logger12.warn(
+          logger11.warn(
             {
               baseSelector,
               toolCallId,
@@ -3850,7 +3755,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
                     const fallbackValue = item[propName];
                     if (fallbackValue !== null && fallbackValue !== void 0) {
                       extractedItem[propName] = fallbackValue;
-                      logger12.info(
+                      logger11.info(
                         { propName, propSelector, context },
                         `PropSelector failed, used fallback direct property access`
                       );
@@ -3862,7 +3767,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
                   const fallbackValue = item[propName];
                   if (fallbackValue !== null && fallbackValue !== void 0) {
                     extractedItem[propName] = fallbackValue;
-                    logger12.warn(
+                    logger11.warn(
                       { propName, propSelector, context, error: error.message },
                       `PropSelector syntax error, used fallback direct property access`
                     );
@@ -3975,7 +3880,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
           warnings
         };
       } catch (error) {
-        logger12.error({ error, toolCallId, sessionId }, "Error processing save_tool_result");
+        logger11.error({ error, toolCallId, sessionId }, "Error processing save_tool_result");
         return {
           saved: false,
           error: `[toolCallId: ${toolCallId}] ${error instanceof Error ? error.message : "Unknown error"}`,
@@ -3987,7 +3892,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
 }
 
 // src/a2a/client.ts
-var logger13 = getLogger("a2aClient");
+var logger12 = getLogger("a2aClient");
 var DEFAULT_BACKOFF = {
   initialInterval: 500,
   maxInterval: 6e4,
@@ -4193,7 +4098,7 @@ var A2AClient = class {
       try {
         const res = await fn();
         if (attempt > 0) {
-          logger13.info(
+          logger12.info(
             {
               attempts: attempt + 1,
               elapsedTime: Date.now() - start
@@ -4208,7 +4113,7 @@ var A2AClient = class {
         }
         const elapsed = Date.now() - start;
         if (elapsed > maxElapsedTime) {
-          logger13.warn(
+          logger12.warn(
             {
               attempts: attempt + 1,
               elapsedTime: elapsed,
@@ -4229,7 +4134,7 @@ var A2AClient = class {
           retryInterval = initialInterval * attempt ** exponent + Math.random() * 1e3;
         }
         const delayMs = Math.min(retryInterval, maxInterval);
-        logger13.info(
+        logger12.info(
           {
             attempt: attempt + 1,
             delayMs,
@@ -4314,7 +4219,7 @@ var A2AClient = class {
     }
     const rpcResponse = await httpResponse.json();
     if (rpcResponse.id !== requestId2) {
-      logger13.warn(
+      logger12.warn(
         {
           method,
           expectedId: requestId2,
@@ -4513,7 +4418,7 @@ var A2AClient = class {
     try {
       while (true) {
         const { done, value } = await reader.read();
-        logger13.info({ done, value }, "parseA2ASseStream");
+        logger12.info({ done, value }, "parseA2ASseStream");
         if (done) {
           if (eventDataBuffer.trim()) {
             const result = this._processSseEventData(
@@ -4602,7 +4507,7 @@ var A2AClient = class {
 // src/agents/relationTools.ts
 init_conversations();
 init_dbClient();
-var logger14 = getLogger("relationships Tools");
+var logger13 = getLogger("relationships Tools");
 var generateTransferToolDescription = (config2) => {
   return `Hand off the conversation to agent ${config2.id}.
 
@@ -4640,7 +4545,7 @@ var createTransferToAgentTool = ({
           "transfer.to_agent_id": transferConfig.id ?? "unknown"
         });
       }
-      logger14.info(
+      logger13.info(
         {
           transferTo: transferConfig.id ?? "unknown",
           fromAgent: callingAgentId
@@ -4788,7 +4693,7 @@ function createDelegateToAgentTool({
           ...isInternal ? { fromAgentId: callingAgentId } : { fromExternalAgentId: callingAgentId }
         }
       };
-      logger14.info({ messageToSend }, "messageToSend");
+      logger13.info({ messageToSend }, "messageToSend");
       await agentsCore.createMessage(dbClient_default)({
         id: nanoid.nanoid(),
         tenantId,
@@ -4848,7 +4753,7 @@ function createDelegateToAgentTool({
     }
   });
 }
-var logger15 = getLogger("SystemPromptBuilder");
+var logger14 = getLogger("SystemPromptBuilder");
 var SystemPromptBuilder = class {
   constructor(version, versionConfig) {
     this.version = version;
@@ -4872,9 +4777,9 @@ var SystemPromptBuilder = class {
         this.templates.set(name, content);
       }
       this.loaded = true;
-      logger15.debug(`Loaded ${this.templates.size} templates for version ${this.version}`);
+      logger14.debug(`Loaded ${this.templates.size} templates for version ${this.version}`);
     } catch (error) {
-      logger15.error({ error }, `Failed to load templates for version ${this.version}`);
+      logger14.error({ error }, `Failed to load templates for version ${this.version}`);
       throw new Error(`Template loading failed: ${error}`);
     }
   }
@@ -5210,8 +5115,7 @@ function hasToolCallWithPrefix(prefix) {
     return false;
   };
 }
-var logger16 = getLogger("Agent");
-var tracer2 = getGlobalTracer();
+var logger15 = getLogger("Agent");
 var CONSTANTS = {
   MAX_GENERATION_STEPS: 12,
   PHASE_1_TIMEOUT_MS: 27e4,
@@ -5464,14 +5368,14 @@ var Agent = class {
     for (const toolSet of tools) {
       for (const [toolName, originalTool] of Object.entries(toolSet)) {
         if (!isValidTool(originalTool)) {
-          logger16.error({ toolName }, "Invalid MCP tool structure - missing required properties");
+          logger15.error({ toolName }, "Invalid MCP tool structure - missing required properties");
           continue;
         }
         const sessionWrappedTool = ai.tool({
           description: originalTool.description,
           inputSchema: originalTool.inputSchema,
           execute: async (args, { toolCallId }) => {
-            logger16.debug({ toolName, toolCallId }, "MCP Tool Called");
+            logger15.debug({ toolName, toolCallId }, "MCP Tool Called");
             try {
               const result = await originalTool.execute(args, { toolCallId });
               toolSessionManager.recordToolResult(sessionId, {
@@ -5483,7 +5387,7 @@ var Agent = class {
               });
               return { result, toolCallId };
             } catch (error) {
-              logger16.error({ toolName, toolCallId, error }, "MCP tool execution failed");
+              logger15.error({ toolName, toolCallId, error }, "MCP tool execution failed");
               throw error;
             }
           }
@@ -5516,6 +5420,11 @@ var Agent = class {
   }
   async getMcpTool(tool4) {
     const credentialReferenceId = tool4.credentialReferenceId;
+    const toolsForAgent = await agentsCore.getToolsForAgent(dbClient_default)({
+      scopes: { tenantId: this.config.tenantId, projectId: this.config.projectId },
+      agentId: this.config.id
+    });
+    const selectedTools = toolsForAgent.data.find((t) => t.toolId === tool4.id)?.selectedTools || void 0;
     let serverConfig;
     if (credentialReferenceId && this.credentialStuffer) {
       const credentialReference = await agentsCore.getCredentialReference(dbClient_default)({
@@ -5540,7 +5449,8 @@ var Agent = class {
           conversationId: this.conversationId || void 0
         },
         this.convertToMCPToolConfig(tool4),
-        storeReference
+        storeReference,
+        selectedTools
       );
     } else if (tool4.headers && this.credentialStuffer) {
       serverConfig = await this.credentialStuffer.buildMcpServerConfig(
@@ -5550,16 +5460,19 @@ var Agent = class {
           contextConfigId: this.config.contextConfigId || void 0,
           conversationId: this.conversationId || void 0
         },
-        this.convertToMCPToolConfig(tool4)
+        this.convertToMCPToolConfig(tool4),
+        void 0,
+        selectedTools
       );
     } else {
       serverConfig = {
         type: tool4.config.mcp.transport?.type || agentsCore.MCPTransportType.streamableHttp,
         url: tool4.config.mcp.server.url,
-        activeTools: tool4.config.mcp.activeTools
+        activeTools: tool4.config.mcp.activeTools,
+        selectedTools
       };
     }
-    logger16.info(
+    logger15.info(
       {
         toolName: tool4.name,
         credentialReferenceId,
@@ -5599,7 +5512,7 @@ var Agent = class {
   async getResolvedContext(conversationId, requestContext) {
     try {
       if (!this.config.contextConfigId) {
-        logger16.debug({ graphId: this.config.graphId }, "No context config found for graph");
+        logger15.debug({ graphId: this.config.graphId }, "No context config found for graph");
         return null;
       }
       const contextConfig = await agentsCore.getContextConfigById(dbClient_default)({
@@ -5607,7 +5520,7 @@ var Agent = class {
         id: this.config.contextConfigId
       });
       if (!contextConfig) {
-        logger16.warn({ contextConfigId: this.config.contextConfigId }, "Context config not found");
+        logger15.warn({ contextConfigId: this.config.contextConfigId }, "Context config not found");
         return null;
       }
       if (!this.contextResolver) {
@@ -5624,7 +5537,7 @@ var Agent = class {
         $now: (/* @__PURE__ */ new Date()).toISOString(),
         $env: process.env
       };
-      logger16.debug(
+      logger15.debug(
         {
           conversationId,
           contextConfigId: contextConfig.id,
@@ -5638,7 +5551,7 @@ var Agent = class {
       );
       return contextWithBuiltins;
     } catch (error) {
-      logger16.error(
+      logger15.error(
         {
           conversationId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -5662,7 +5575,7 @@ var Agent = class {
       });
       return graphDefinition?.graphPrompt || void 0;
     } catch (error) {
-      logger16.warn(
+      logger15.warn(
         {
           graphId: this.config.graphId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -5689,7 +5602,7 @@ var Agent = class {
       }
       return !!(graphDefinition.artifactComponents && Object.keys(graphDefinition.artifactComponents).length > 0);
     } catch (error) {
-      logger16.warn(
+      logger15.warn(
         {
           graphId: this.config.graphId,
           tenantId: this.config.tenantId,
@@ -5749,7 +5662,7 @@ Key requirements:
           preserveUnresolved: false
         });
       } catch (error) {
-        logger16.error(
+        logger15.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -5794,7 +5707,7 @@ Key requirements:
           preserveUnresolved: false
         });
       } catch (error) {
-        logger16.error(
+        logger15.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -5822,7 +5735,7 @@ Key requirements:
         artifactId: z5.z.string().describe("The unique identifier of the artifact to get.")
       }),
       execute: async ({ artifactId }) => {
-        logger16.info({ artifactId }, "get_artifact executed");
+        logger15.info({ artifactId }, "get_artifact executed");
         const artifact = await agentsCore.getLedgerArtifacts(dbClient_default)({
           scopes: {
             tenantId: this.config.tenantId,
@@ -5889,7 +5802,7 @@ Key requirements:
         graphId: this.config.graphId
       });
     } catch (error) {
-      logger16.error(
+      logger15.error(
         { error, graphId: this.config.graphId },
         "Failed to check graph artifact components"
       );
@@ -5897,7 +5810,7 @@ Key requirements:
     }
   }
   async generate(userMessage, runtimeContext) {
-    return tracer2.startActiveSpan(createSpanName("agent.generate"), async (span) => {
+    return tracer.startActiveSpan("agent.generate", async (span) => {
       const contextId = runtimeContext?.contextId || "default";
       const taskId = runtimeContext?.metadata?.taskId || "unknown";
       const sessionId = toolSessionManager.createSession(
@@ -5921,8 +5834,8 @@ Key requirements:
           functionTools,
           relationTools,
           defaultTools
-        ] = await tracer2.startActiveSpan(
-          createSpanName("agent.load_tools"),
+        ] = await tracer.startActiveSpan(
+          "agent.load_tools",
           {
             attributes: {
               "agent.name": this.config.name,
@@ -5944,11 +5857,10 @@ Key requirements:
               childSpan.setStatus({ code: api.SpanStatusCode.OK });
               return result;
             } catch (err) {
-              handleSpanError(childSpan, err);
+              agentsCore.setSpanWithError(childSpan, err);
               throw err;
             } finally {
               childSpan.end();
-              await forceFlushTracer();
             }
           }
         );
@@ -5994,7 +5906,7 @@ Key requirements:
         const configuredTimeout = modelSettings.maxDuration ? Math.min(modelSettings.maxDuration * 1e3, MAX_ALLOWED_TIMEOUT_MS) : shouldStreamPhase1 ? CONSTANTS.PHASE_1_TIMEOUT_MS : CONSTANTS.NON_STREAMING_PHASE_1_TIMEOUT_MS;
         const timeoutMs = Math.min(configuredTimeout, MAX_ALLOWED_TIMEOUT_MS);
         if (modelSettings.maxDuration && modelSettings.maxDuration * 1e3 > MAX_ALLOWED_TIMEOUT_MS) {
-          logger16.warn(
+          logger15.warn(
             {
               requestedTimeout: modelSettings.maxDuration * 1e3,
               appliedTimeout: timeoutMs,
@@ -6036,7 +5948,7 @@ Key requirements:
                     }
                   );
                 } catch (error) {
-                  logger16.debug("Failed to track agent reasoning");
+                  logger15.debug("Failed to track agent reasoning");
                 }
               }
               if (last && "toolCalls" in last && last.toolCalls) {
@@ -6119,7 +6031,7 @@ Key requirements:
                     }
                   );
                 } catch (error) {
-                  logger16.debug("Failed to track agent reasoning");
+                  logger15.debug("Failed to track agent reasoning");
                 }
               }
               if (last && "toolCalls" in last && last.toolCalls) {
@@ -6164,7 +6076,7 @@ Key requirements:
                         return;
                       }
                       if (toolName === "save_artifact_tool" || toolName === "save_tool_result") {
-                        logger16.info({ result }, "save_artifact_tool or save_tool_result");
+                        logger15.info({ result }, "save_artifact_tool or save_tool_result");
                         if (result.output.artifacts) {
                           for (const artifact of result.output.artifacts) {
                             const artifactId = artifact?.artifactId || "N/A";
@@ -6270,7 +6182,6 @@ ${output}`;
         }
         span.setStatus({ code: api.SpanStatusCode.OK });
         span.end();
-        await forceFlushTracer();
         let formattedContent = response.formattedContent || null;
         if (!formattedContent) {
           if (response.object) {
@@ -6300,14 +6211,8 @@ ${output}`;
         return formattedResponse;
       } catch (error) {
         toolSessionManager.endSession(sessionId);
-        span.recordException(error);
-        span.setStatus({
-          code: api.SpanStatusCode.ERROR,
-          message: error.message
-        });
+        agentsCore.setSpanWithError(span, error);
         span.end();
-        await forceFlushTracer();
-        getLogger("Agent").error(error, "Agent generate error");
         throw error;
       }
     });
@@ -6325,7 +6230,7 @@ function parseEmbeddedJson(data) {
     }
   });
 }
-var logger17 = getLogger("generateTaskHandler");
+var logger16 = getLogger("generateTaskHandler");
 var createTaskHandler = (config2, credentialStoreRegistry) => {
   return async (task) => {
     try {
@@ -6375,7 +6280,7 @@ var createTaskHandler = (config2, credentialStoreRegistry) => {
           agentId: config2.agentId
         })
       ]);
-      logger17.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
+      logger16.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
       const agentPrompt = "prompt" in config2.agentSchema ? config2.agentSchema.prompt : "";
       const models = "models" in config2.agentSchema ? config2.agentSchema.models : void 0;
       const stopWhen = "stopWhen" in config2.agentSchema ? config2.agentSchema.stopWhen : void 0;
@@ -6475,7 +6380,7 @@ var createTaskHandler = (config2, credentialStoreRegistry) => {
         const taskIdMatch = task.id.match(/^task_([^-]+-[^-]+-\d+)-/);
         if (taskIdMatch) {
           contextId = taskIdMatch[1];
-          logger17.info(
+          logger16.info(
             {
               taskId: task.id,
               extractedContextId: contextId,
@@ -6491,7 +6396,7 @@ var createTaskHandler = (config2, credentialStoreRegistry) => {
       const isDelegation = task.context?.metadata?.isDelegation === true;
       agent.setDelegationStatus(isDelegation);
       if (isDelegation) {
-        logger17.info(
+        logger16.info(
           { agentId: config2.agentId, taskId: task.id },
           "Delegated agent - streaming disabled"
         );
@@ -6774,7 +6679,7 @@ async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
 // src/routes/agents.ts
 init_dbClient();
 var app = new zodOpenapi.OpenAPIHono();
-var logger18 = getLogger("agents");
+var logger17 = getLogger("agents");
 app.openapi(
   zodOpenapi.createRoute({
     method: "get",
@@ -6812,7 +6717,7 @@ app.openapi(
       tracestate: c.req.header("tracestate"),
       baggage: c.req.header("baggage")
     };
-    logger18.info(
+    logger17.info(
       {
         otelHeaders,
         path: c.req.path,
@@ -6823,7 +6728,7 @@ app.openapi(
     const executionContext = agentsCore.getRequestExecutionContext(c);
     const { tenantId, projectId, graphId, agentId } = executionContext;
     if (agentId) {
-      logger18.info(
+      logger17.info(
         {
           message: "getRegisteredAgent (agent-level)",
           tenantId,
@@ -6835,13 +6740,13 @@ app.openapi(
       );
       const credentialStores = c.get("credentialStores");
       const agent = await getRegisteredAgent(executionContext, credentialStores);
-      logger18.info({ agent }, "agent registered: well-known agent.json");
+      logger17.info({ agent }, "agent registered: well-known agent.json");
       if (!agent) {
         return c.json({ error: "Agent not found" }, 404);
       }
       return c.json(agent.agentCard);
     } else {
-      logger18.info(
+      logger17.info(
         {
           message: "getRegisteredGraph (graph-level)",
           tenantId,
@@ -6864,7 +6769,7 @@ app.post("/a2a", async (c) => {
     tracestate: c.req.header("tracestate"),
     baggage: c.req.header("baggage")
   };
-  logger18.info(
+  logger17.info(
     {
       otelHeaders,
       path: c.req.path,
@@ -6875,7 +6780,7 @@ app.post("/a2a", async (c) => {
   const executionContext = agentsCore.getRequestExecutionContext(c);
   const { tenantId, projectId, graphId, agentId } = executionContext;
   if (agentId) {
-    logger18.info(
+    logger17.info(
       {
         message: "a2a (agent-level)",
         tenantId,
@@ -6899,7 +6804,7 @@ app.post("/a2a", async (c) => {
     }
     return a2aHandler(c, agent);
   } else {
-    logger18.info(
+    logger17.info(
       {
         message: "a2a (graph-level)",
         tenantId,
@@ -6945,14 +6850,14 @@ init_dbClient();
 
 // src/a2a/transfer.ts
 init_dbClient();
-var logger19 = getLogger("Transfer");
+var logger18 = getLogger("Transfer");
 async function executeTransfer({
   tenantId,
   threadId,
   projectId,
   targetAgentId
 }) {
-  logger19.info({ targetAgent: targetAgentId }, "Executing transfer to agent");
+  logger18.info({ targetAgent: targetAgentId }, "Executing transfer to agent");
   await agentsCore.setActiveAgentForThread(dbClient_default)({
     scopes: { tenantId, projectId },
     threadId,
@@ -7494,7 +7399,7 @@ function createMCPStreamHelper() {
 
 // src/handlers/executionHandler.ts
 init_dbClient();
-var logger20 = getLogger("ExecutionHandler");
+var logger19 = getLogger("ExecutionHandler");
 var ExecutionHandler = class {
   constructor() {
     // Hardcoded error limit - separate from configurable stopWhen
@@ -7519,7 +7424,7 @@ var ExecutionHandler = class {
     const { tenantId, projectId, graphId, apiKey, baseUrl } = executionContext;
     registerStreamHelper(requestId2, sseHelper);
     graphSessionManager.createSession(requestId2, graphId, tenantId, projectId);
-    logger20.info({ sessionId: requestId2, graphId }, "Created GraphSession for message execution");
+    logger19.info({ sessionId: requestId2, graphId }, "Created GraphSession for message execution");
     let graphConfig = null;
     try {
       graphConfig = await agentsCore.getFullGraph(dbClient_default)({ scopes: { tenantId, projectId }, graphId });
@@ -7531,7 +7436,7 @@ var ExecutionHandler = class {
         );
       }
     } catch (error) {
-      logger20.error(
+      logger19.error(
         {
           error: error instanceof Error ? error.message : "Unknown error",
           stack: error instanceof Error ? error.stack : void 0
@@ -7547,7 +7452,7 @@ var ExecutionHandler = class {
     try {
       await sseHelper.writeOperation(agentInitializingOp(requestId2, graphId));
       const taskId = `task_${conversationId}-${requestId2}`;
-      logger20.info(
+      logger19.info(
         { taskId, currentAgentId, conversationId, requestId: requestId2 },
         "Attempting to create or reuse existing task"
       );
@@ -7570,7 +7475,7 @@ var ExecutionHandler = class {
             agent_id: currentAgentId
           }
         });
-        logger20.info(
+        logger19.info(
           {
             taskId,
             createdTaskMetadata: Array.isArray(task) ? task[0]?.metadata : task?.metadata
@@ -7579,21 +7484,21 @@ var ExecutionHandler = class {
         );
       } catch (error) {
         if (error?.message?.includes("UNIQUE constraint failed") || error?.message?.includes("PRIMARY KEY constraint failed") || error?.code === "SQLITE_CONSTRAINT_PRIMARYKEY") {
-          logger20.info({ taskId, error: error.message }, "Task already exists, fetching existing task");
+          logger19.info({ taskId, error: error.message }, "Task already exists, fetching existing task");
           const existingTask = await agentsCore.getTask(dbClient_default)({ id: taskId });
           if (existingTask) {
             task = existingTask;
-            logger20.info({ taskId, existingTask }, "Successfully reused existing task from race condition");
+            logger19.info({ taskId, existingTask }, "Successfully reused existing task from race condition");
           } else {
-            logger20.error({ taskId, error }, "Task constraint failed but task not found");
+            logger19.error({ taskId, error }, "Task constraint failed but task not found");
             throw error;
           }
         } else {
-          logger20.error({ taskId, error }, "Failed to create task due to non-constraint error");
+          logger19.error({ taskId, error }, "Failed to create task due to non-constraint error");
           throw error;
         }
       }
-      logger20.debug(
+      logger19.debug(
         {
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           executionType: "create_initial_task",
@@ -7611,7 +7516,7 @@ var ExecutionHandler = class {
       const maxTransfers = graphConfig?.stopWhen?.transferCountIs ?? 10;
       while (iterations < maxTransfers) {
         iterations++;
-        logger20.info(
+        logger19.info(
           { iterations, currentAgentId, graphId, conversationId, fromAgentId },
           `Execution loop iteration ${iterations} with agent ${currentAgentId}, transfer from: ${fromAgentId || "none"}`
         );
@@ -7619,10 +7524,10 @@ var ExecutionHandler = class {
           scopes: { tenantId, projectId },
           conversationId
         });
-        logger20.info({ activeAgent }, "activeAgent");
+        logger19.info({ activeAgent }, "activeAgent");
         if (activeAgent && activeAgent.activeAgentId !== currentAgentId) {
           currentAgentId = activeAgent.activeAgentId;
-          logger20.info({ currentAgentId }, `Updated current agent to: ${currentAgentId}`);
+          logger19.info({ currentAgentId }, `Updated current agent to: ${currentAgentId}`);
         }
         const agentBaseUrl = `${baseUrl}/agents`;
         const a2aClient = new A2AClient(agentBaseUrl, {
@@ -7663,13 +7568,13 @@ var ExecutionHandler = class {
         });
         if (!messageResponse?.result) {
           errorCount++;
-          logger20.error(
+          logger19.error(
             { currentAgentId, iterations, errorCount },
             `No response from agent ${currentAgentId} on iteration ${iterations} (error ${errorCount}/${this.MAX_ERRORS})`
           );
           if (errorCount >= this.MAX_ERRORS) {
             const errorMessage2 = `Maximum error limit (${this.MAX_ERRORS}) reached`;
-            logger20.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
+            logger19.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
             await sseHelper.writeError(errorMessage2);
             await sseHelper.writeOperation(errorOp(errorMessage2, currentAgentId || "system"));
             if (task) {
@@ -7695,7 +7600,7 @@ var ExecutionHandler = class {
           const transferResponse = messageResponse.result;
           const targetAgentId = transferResponse.artifacts?.[0]?.parts?.[0]?.data?.targetAgentId;
           const transferReason = transferResponse.artifacts?.[0]?.parts?.[1]?.text;
-          logger20.info({ targetAgentId, transferReason }, "transfer response");
+          logger19.info({ targetAgentId, transferReason }, "transfer response");
           currentMessage = `<transfer_context> ${transferReason} </transfer_context>`;
           const { success, targetAgentId: newAgentId } = await executeTransfer({
             projectId,
@@ -7706,7 +7611,7 @@ var ExecutionHandler = class {
           if (success) {
             fromAgentId = currentAgentId;
             currentAgentId = newAgentId;
-            logger20.info(
+            logger19.info(
               {
                 transferFrom: fromAgentId,
                 transferTo: currentAgentId,
@@ -7724,7 +7629,7 @@ var ExecutionHandler = class {
           const graphSessionData = graphSessionManager.getSession(requestId2);
           if (graphSessionData) {
             const sessionSummary = graphSessionData.getSummary();
-            logger20.info(sessionSummary, "GraphSession data after completion");
+            logger19.info(sessionSummary, "GraphSession data after completion");
           }
           let textContent = "";
           for (const part of responseParts) {
@@ -7779,32 +7684,32 @@ var ExecutionHandler = class {
             }
           });
           const updateTaskEnd = Date.now();
-          logger20.info(
+          logger19.info(
             { duration: updateTaskEnd - updateTaskStart },
             "Completed updateTask operation"
           );
           await sseHelper.writeOperation(completionOp(currentAgentId, iterations));
           await sseHelper.complete();
-          logger20.info("Ending GraphSession and cleaning up");
+          logger19.info("Ending GraphSession and cleaning up");
           graphSessionManager.endSession(requestId2);
-          logger20.info("Cleaning up streamHelper");
+          logger19.info("Cleaning up streamHelper");
           unregisterStreamHelper(requestId2);
           let response;
           if (sseHelper instanceof MCPStreamHelper) {
             const captured = sseHelper.getCapturedResponse();
             response = captured.text || "No response content";
           }
-          logger20.info("ExecutionHandler returning success");
+          logger19.info("ExecutionHandler returning success");
           return { success: true, iterations, response };
         }
         errorCount++;
-        logger20.warn(
+        logger19.warn(
           { iterations, errorCount },
           `No valid response or transfer on iteration ${iterations} (error ${errorCount}/${this.MAX_ERRORS})`
         );
         if (errorCount >= this.MAX_ERRORS) {
           const errorMessage2 = `Maximum error limit (${this.MAX_ERRORS}) reached`;
-          logger20.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
+          logger19.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
           await sseHelper.writeError(errorMessage2);
           await sseHelper.writeOperation(errorOp(errorMessage2, currentAgentId || "system"));
           if (task) {
@@ -7826,7 +7731,7 @@ var ExecutionHandler = class {
         }
       }
       const errorMessage = `Maximum transfer limit (${maxTransfers}) reached without completion`;
-      logger20.error({ maxTransfers, iterations }, errorMessage);
+      logger19.error({ maxTransfers, iterations }, errorMessage);
       await sseHelper.writeError(errorMessage);
       await sseHelper.writeOperation(errorOp(errorMessage, currentAgentId || "system"));
       if (task) {
@@ -7846,7 +7751,7 @@ var ExecutionHandler = class {
       unregisterStreamHelper(requestId2);
       return { success: false, error: errorMessage, iterations };
     } catch (error) {
-      logger20.error({ error }, "Error in execution handler");
+      logger19.error({ error }, "Error in execution handler");
       const errorMessage = error instanceof Error ? error.message : "Unknown execution error";
       await sseHelper.writeError(`Execution error: ${errorMessage}`);
       await sseHelper.writeOperation(errorOp(errorMessage, currentAgentId || "system"));
@@ -7872,7 +7777,7 @@ var ExecutionHandler = class {
 
 // src/routes/chat.ts
 var app2 = new zodOpenapi.OpenAPIHono();
-var logger21 = getLogger("completionsHandler");
+var logger20 = getLogger("completionsHandler");
 var chatCompletionsRoute = zodOpenapi.createRoute({
   method: "post",
   path: "/completions",
@@ -7990,7 +7895,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     tracestate: c.req.header("tracestate"),
     baggage: c.req.header("baggage")
   };
-  logger21.info(
+  logger20.info(
     {
       otelHeaders,
       path: c.req.path,
@@ -8076,7 +7981,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       dbClient_default,
       credentialStores
     );
-    logger21.info(
+    logger20.info(
       {
         tenantId,
         graphId,
@@ -8122,7 +8027,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     return streaming.streamSSE(c, async (stream2) => {
       const sseHelper = createSSEStreamHelper(stream2, requestId2, timestamp);
       await sseHelper.writeRole();
-      logger21.info({ agentId }, "Starting execution");
+      logger20.info({ agentId }, "Starting execution");
       const executionHandler = new ExecutionHandler();
       const result = await executionHandler.execute({
         executionContext,
@@ -8132,7 +8037,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
         requestId: requestId2,
         sseHelper
       });
-      logger21.info(
+      logger20.info(
         { result },
         `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
       );
@@ -8168,7 +8073,7 @@ var chat_default = app2;
 // src/routes/chatDataStream.ts
 init_dbClient();
 var app3 = new zodOpenapi.OpenAPIHono();
-var logger22 = getLogger("chatDataStream");
+var logger21 = getLogger("chatDataStream");
 var chatDataStreamRoute = zodOpenapi.createRoute({
   method: "post",
   path: "/chat",
@@ -8273,7 +8178,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
     );
     const lastUserMessage = body.messages.filter((m) => m.role === "user").slice(-1)[0];
     const userText = typeof lastUserMessage?.content === "string" ? lastUserMessage.content : lastUserMessage?.parts?.map((p) => p.text).join("") || "";
-    logger22.info({ userText, lastUserMessage }, "userText");
+    logger21.info({ userText, lastUserMessage }, "userText");
     const messageSpan = api.trace.getActiveSpan();
     if (messageSpan) {
       messageSpan.setAttributes({
@@ -8315,7 +8220,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
             await streamHelper.writeError("Unable to process request");
           }
         } catch (err) {
-          logger22.error({ err }, "Streaming error");
+          logger21.error({ err }, "Streaming error");
           await streamHelper.writeError("Internal server error");
         } finally {
           if ("cleanup" in streamHelper && typeof streamHelper.cleanup === "function") {
@@ -8336,7 +8241,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
       )
     );
   } catch (error) {
-    logger22.error({ error }, "chatDataStream error");
+    logger21.error({ error }, "chatDataStream error");
     return c.json({ error: "Failed to process chat completion" }, 500);
   }
 });
@@ -8347,7 +8252,7 @@ init_dbClient();
 function createMCPSchema(schema) {
   return schema;
 }
-var logger23 = getLogger("mcp");
+var logger22 = getLogger("mcp");
 var _MockResponseSingleton = class _MockResponseSingleton {
   constructor() {
     __publicField(this, "mockRes");
@@ -8402,21 +8307,21 @@ var createSpoofInitMessage = (mcpProtocolVersion) => ({
   id: 0
 });
 var spoofTransportInitialization = async (transport, req, sessionId, mcpProtocolVersion) => {
-  logger23.info({ sessionId }, "Spoofing initialization message to set transport state");
+  logger22.info({ sessionId }, "Spoofing initialization message to set transport state");
   const spoofInitMessage = createSpoofInitMessage(mcpProtocolVersion);
   const mockRes = MockResponseSingleton.getInstance().getMockResponse();
   try {
     await transport.handleRequest(req, mockRes, spoofInitMessage);
-    logger23.info({ sessionId }, "Successfully spoofed initialization");
+    logger22.info({ sessionId }, "Successfully spoofed initialization");
   } catch (spoofError) {
-    logger23.warn({ sessionId, error: spoofError }, "Spoof initialization failed, continuing anyway");
+    logger22.warn({ sessionId, error: spoofError }, "Spoof initialization failed, continuing anyway");
   }
 };
 var validateSession = async (req, res, body, tenantId, projectId, graphId) => {
   const sessionId = req.headers["mcp-session-id"];
-  logger23.info({ sessionId }, "Received MCP session ID");
+  logger22.info({ sessionId }, "Received MCP session ID");
   if (!sessionId) {
-    logger23.info({ body }, "Missing session ID");
+    logger22.info({ body }, "Missing session ID");
     res.writeHead(400).end(
       JSON.stringify({
         jsonrpc: "2.0",
@@ -8442,7 +8347,7 @@ var validateSession = async (req, res, body, tenantId, projectId, graphId) => {
     scopes: { tenantId, projectId },
     conversationId: sessionId
   });
-  logger23.info(
+  logger22.info(
     {
       sessionId,
       conversationFound: !!conversation,
@@ -8453,7 +8358,7 @@ var validateSession = async (req, res, body, tenantId, projectId, graphId) => {
     "Conversation lookup result"
   );
   if (!conversation || conversation.metadata?.sessionData?.sessionType !== "mcp" || conversation.metadata?.sessionData?.graphId !== graphId) {
-    logger23.info(
+    logger22.info(
       { sessionId, conversationId: conversation?.id },
       "MCP session not found or invalid"
     );
@@ -8514,7 +8419,7 @@ var executeAgentQuery = async (executionContext, conversationId, query, defaultA
     requestId: requestId2,
     sseHelper: mcpStreamHelper
   });
-  logger23.info(
+  logger22.info(
     { result },
     `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
   );
@@ -8588,7 +8493,7 @@ var getServer = async (requestContext, executionContext, conversationId, credent
           dbClient_default,
           credentialStores
         );
-        logger23.info(
+        logger22.info(
           {
             tenantId,
             graphId,
@@ -8649,7 +8554,7 @@ var validateRequestParameters = (c) => {
 };
 var handleInitializationRequest = async (body, executionContext, validatedContext, req, res, c, credentialStores) => {
   const { tenantId, projectId, graphId } = executionContext;
-  logger23.info({ body }, "Received initialization request");
+  logger22.info({ body }, "Received initialization request");
   const sessionId = nanoid.nanoid();
   const agentGraph = await agentsCore.getAgentGraphWithDefaultAgent(dbClient_default)({
     scopes: { tenantId, projectId },
@@ -8680,7 +8585,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
       }
     }
   });
-  logger23.info(
+  logger22.info(
     { sessionId, conversationId: conversation.id },
     "Created MCP session as conversation"
   );
@@ -8689,9 +8594,9 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
   });
   const server = await getServer(validatedContext, executionContext, sessionId, credentialStores);
   await server.connect(transport);
-  logger23.info({ sessionId }, "Server connected for initialization");
+  logger22.info({ sessionId }, "Server connected for initialization");
   res.setHeader("Mcp-Session-Id", sessionId);
-  logger23.info(
+  logger22.info(
     {
       sessionId,
       bodyMethod: body?.method,
@@ -8700,7 +8605,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
     "About to handle initialization request"
   );
   await transport.handleRequest(req, res, body);
-  logger23.info({ sessionId }, "Successfully handled initialization request");
+  logger22.info({ sessionId }, "Successfully handled initialization request");
   return fetchToNode.toFetchResponse(res);
 };
 var handleExistingSessionRequest = async (body, executionContext, validatedContext, req, res, credentialStores) => {
@@ -8728,8 +8633,8 @@ var handleExistingSessionRequest = async (body, executionContext, validatedConte
     sessionId,
     conversation.metadata?.session_data?.mcpProtocolVersion
   );
-  logger23.info({ sessionId }, "Server connected and transport initialized");
-  logger23.info(
+  logger22.info({ sessionId }, "Server connected and transport initialized");
+  logger22.info(
     {
       sessionId,
       bodyKeys: Object.keys(body || {}),
@@ -8743,9 +8648,9 @@ var handleExistingSessionRequest = async (body, executionContext, validatedConte
   );
   try {
     await transport.handleRequest(req, res, body);
-    logger23.info({ sessionId }, "Successfully handled MCP request");
+    logger22.info({ sessionId }, "Successfully handled MCP request");
   } catch (transportError) {
-    logger23.error(
+    logger22.error(
       {
         sessionId,
         error: transportError,
@@ -8796,13 +8701,13 @@ app4.openapi(
       }
       const { executionContext } = paramValidation;
       const body = await c.req.json();
-      logger23.info({ body, bodyKeys: Object.keys(body || {}) }, "Parsed request body");
+      logger22.info({ body, bodyKeys: Object.keys(body || {}) }, "Parsed request body");
       const isInitRequest = body.method === "initialize";
       const { req, res } = fetchToNode.toReqRes(c.req.raw);
       const validatedContext = c.get("validatedContext") || {};
       const credentialStores = c.get("credentialStores");
-      logger23.info({ validatedContext }, "Validated context");
-      logger23.info({ req }, "request");
+      logger22.info({ validatedContext }, "Validated context");
+      logger22.info({ req }, "request");
       if (isInitRequest) {
         return await handleInitializationRequest(
           body,
@@ -8824,7 +8729,7 @@ app4.openapi(
         );
       }
     } catch (e) {
-      logger23.error(
+      logger22.error(
         {
           error: e instanceof Error ? e.message : e,
           stack: e instanceof Error ? e.stack : void 0
@@ -8836,7 +8741,7 @@ app4.openapi(
   }
 );
 app4.get("/", async (c) => {
-  logger23.info("Received GET MCP request");
+  logger22.info("Received GET MCP request");
   return c.json(
     {
       jsonrpc: "2.0",
@@ -8850,7 +8755,7 @@ app4.get("/", async (c) => {
   );
 });
 app4.delete("/", async (c) => {
-  logger23.info("Received DELETE MCP request");
+  logger22.info("Received DELETE MCP request");
   return c.json(
     {
       jsonrpc: "2.0",
@@ -8930,9 +8835,9 @@ function createExecutionHono(serverConfig, credentialStores) {
       if (!isExpectedError) {
         const errorMessage = err instanceof Error ? err.message : String(err);
         const errorStack = err instanceof Error ? err.stack : void 0;
-        const logger24 = getLogger();
-        if (logger24) {
-          logger24.error(
+        const logger23 = getLogger();
+        if (logger23) {
+          logger23.error(
             {
               error: err,
               message: errorMessage,
@@ -8944,9 +8849,9 @@ function createExecutionHono(serverConfig, credentialStores) {
           );
         }
       } else {
-        const logger24 = getLogger();
-        if (logger24) {
-          logger24.error(
+        const logger23 = getLogger();
+        if (logger23) {
+          logger23.error(
             {
               error: err,
               path: c.req.path,
@@ -8963,9 +8868,9 @@ function createExecutionHono(serverConfig, credentialStores) {
         const response = err.getResponse();
         return response;
       } catch (responseError) {
-        const logger24 = getLogger();
-        if (logger24) {
-          logger24.error({ error: responseError }, "Error while handling HTTPException response");
+        const logger23 = getLogger();
+        if (logger23) {
+          logger23.error({ error: responseError }, "Error while handling HTTPException response");
         }
       }
     }