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

package/dist/index.js

@@ -1,6 +1,10 @@
-import { env, dbClient_default, getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-JIWNRFDU.js';
-import { __publicField } from './chunk-PKBMQBKP.js';
-import { getLogger as getLogger$1, HeadersScopeSchema, getRequestExecutionContext, getAgentGraphWithDefaultAgent, contextValidationMiddleware, getFullGraph, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getAgentById, handleContextResolution, createMessage, commonGetErrorResponses, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, getAgentGraph, createTask, updateTask, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getRelatedAgentsForGraph, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, validateAndGetApiKey, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getContextConfigById, getFullGraphDefinition, TemplateEngine, graphHasArtifactComponents, MCPTransportType, getExternalAgent } from '@inkeep/agents-core';
+import { env, __publicField, dbClient_default, getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-2MQ324HB.js';
+import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
+import { BaggageSpanProcessor, ALLOW_ALL_BAGGAGE_KEYS } from '@opentelemetry/baggage-span-processor';
+import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
+import { NodeSDK } from '@opentelemetry/sdk-node';
+import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-node';
+import { getLogger as getLogger$1, getTracer, HeadersScopeSchema, getRequestExecutionContext, getAgentGraphWithDefaultAgent, contextValidationMiddleware, getFullGraph, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getAgentById, handleContextResolution, createMessage, commonGetErrorResponses, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, getAgentGraph, createTask, updateTask, updateConversation, handleApiError, setSpanWithError, TaskState, setActiveAgentForThread, getConversation, getRelatedAgentsForGraph, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, validateAndGetApiKey, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getContextConfigById, getFullGraphDefinition, TemplateEngine, graphHasArtifactComponents, MCPTransportType, getExternalAgent } from '@inkeep/agents-core';
 import { Hono } from 'hono';
 import { OpenAPIHono, createRoute, z as z$1 } from '@hono/zod-openapi';
 import { trace, propagation, context, SpanStatusCode } from '@opentelemetry/api';
@@ -29,6 +33,61 @@ import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/
 import { z as z$2 } from 'zod/v3';
 import { toReqRes, toFetchResponse } from 'fetch-to-node';
 
+var otlpUrl = env.OTEL_EXPORTER_OTLP_ENDPOINT;
+var otlpExporter = new 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(ALLOW_ALL_BAGGAGE_KEYS),
+  new BatchSpanProcessor(otlpExporter, {
+    maxExportBatchSize
+  })
+]);
+var sdk = new NodeSDK({
+  serviceName: "inkeep-agents-run-api",
+  spanProcessor,
+  instrumentations: [
+    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 path = span.attributes?.["url.path"];
+          if (method && path)
+            span.updateName(host ? `${method} ${host}${path}` : `${method} ${path}`);
+        }
+      }
+    })
+  ]
+});
+sdk.start();
 var isDevelopment = env.ENVIRONMENT === "development";
 var loggerConfig = {
   level: env.LOG_LEVEL,
@@ -840,79 +899,11 @@ async function handleTasksResubscribe(c, agent, request) {
     });
   }
 }
-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: SpanStatusCode.ERROR,
-    message: errorMessage
-  });
-}
-function getGlobalTracer() {
-  if (!globalTracerInstance) {
-    try {
-      globalTracerInstance = 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 } = await import('./instrumentation-KKYHA3A3.js');
-    if (spanProcessor && typeof spanProcessor.forceFlush === "function") {
-      await spanProcessor.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 = getTracer("agents-run-api", package_default.version);
 function agentInitializingOp(sessionId, graphId) {
   return {
     type: "agent_initializing",
@@ -949,10 +940,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 z.string();
   }
   switch (jsonSchema.type) {
@@ -979,7 +970,7 @@ function jsonSchemaToZod(jsonSchema) {
     case "null":
       return z.null();
     default:
-      logger5.warn(
+      logger4.warn(
         {
           unsupportedType: jsonSchema.type,
           schema: jsonSchema
@@ -1033,7 +1024,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
@@ -1046,7 +1037,7 @@ var _ModelFactory = class _ModelFactory {
     const modelSettings = config;
     const modelString = modelSettings.model.trim();
     const { provider, modelName } = _ModelFactory.parseModelString(modelString);
-    logger6.debug(
+    logger5.debug(
       {
         provider,
         model: modelName,
@@ -1065,7 +1056,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,
@@ -1086,7 +1077,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"
         );
@@ -1115,14 +1106,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 = createAnthropic(anthropicConfig);
       return provider(modelName);
     }
@@ -1137,11 +1128,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 = createOpenAI(openaiConfig);
       return provider(modelName);
     }
@@ -1230,8 +1221,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) {
@@ -1255,7 +1245,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
@@ -1277,7 +1267,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"
           );
@@ -1289,7 +1279,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
@@ -1303,7 +1293,7 @@ var GraphSession = class {
    */
   recordEvent(eventType, agentId, data) {
     if (this.isEnded) {
-      logger7.debug(
+      logger6.debug(
         {
           sessionId: this.sessionId,
           eventType,
@@ -1323,7 +1313,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,
@@ -1341,7 +1331,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,
@@ -1350,7 +1340,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,
@@ -1369,14 +1359,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;
@@ -1387,11 +1377,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"
       );
@@ -1404,7 +1394,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"
@@ -1497,29 +1487,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;
@@ -1532,7 +1522,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"
         );
@@ -1553,7 +1543,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
@@ -1606,7 +1596,7 @@ var GraphSession = class {
         this.previousSummaries.shift();
       }
       if (!operation || !operation.type || !operation.ctx) {
-        logger7.warn(
+        logger6.warn(
           {
             sessionId: this.sessionId,
             operation
@@ -1621,7 +1611,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",
@@ -1659,7 +1649,7 @@ var GraphSession = class {
           this.releaseUpdateLock();
         }
       } catch (error) {
-        logger7.error(
+        logger6.error(
           {
             sessionId: this.sessionId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -1704,7 +1694,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,
@@ -1736,7 +1726,7 @@ User's Question/Context:
 ${conversationHistory}
 ` : "";
             } catch (error) {
-              logger7.warn(
+              logger6.warn(
                 { sessionId: this.sessionId, error },
                 "Failed to fetch conversation history for status update"
               );
@@ -1785,8 +1775,8 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           span.setStatus({ code: SpanStatusCode.OK });
           return text.trim();
         } catch (error) {
-          handleSpanError(span, error);
-          logger7.error({ error }, "Failed to generate summary, using fallback");
+          setSpanWithError(span, error);
+          logger6.error({ error }, "Failed to generate summary, using fallback");
           return this.generateFallbackSummary(newEvents, elapsedTime);
         } finally {
           span.end();
@@ -1799,7 +1789,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,
@@ -1832,7 +1822,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"
               );
@@ -1928,8 +1918,8 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           span.setStatus({ code: SpanStatusCode.OK });
           return { operations };
         } catch (error) {
-          handleSpanError(span, error);
-          logger7.error({ error }, "Failed to generate structured update, using fallback");
+          setSpanWithError(span, error);
+          logger6.error({ error }, "Failed to generate structured update, using fallback");
           return { operations: [] };
         } finally {
           span.end();
@@ -2114,7 +2104,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,
@@ -2145,7 +2135,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
             );
           }
           span.setAttributes({ "validation.passed": true });
-          const { getFormattedConversationHistory: getFormattedConversationHistory2 } = await import('./conversations-YTJWHN67.js');
+          const { getFormattedConversationHistory: getFormattedConversationHistory2 } = await import('./conversations-WZLXOMZH.js');
           const conversationHistory = await getFormattedConversationHistory2({
             tenantId: artifactData.tenantId,
             projectId: artifactData.projectId,
@@ -2187,7 +2177,7 @@ Make it specific and relevant.`;
             description: 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,
@@ -2220,7 +2210,7 @@ Make it specific and relevant.`;
                 generationSpan.setStatus({ code: SpanStatusCode.OK });
                 return result2;
               } catch (error) {
-                handleSpanError(generationSpan, error);
+                setSpanWithError(generationSpan, error);
                 throw error;
               } finally {
                 generationSpan.end();
@@ -2254,7 +2244,7 @@ Make it specific and relevant.`;
             taskId: artifactData.taskId,
             artifacts: [artifactToSave]
           });
-          logger7.info(
+          logger6.info(
             {
               sessionId: this.sessionId,
               artifactId: artifactData.artifactId,
@@ -2270,8 +2260,8 @@ Make it specific and relevant.`;
           });
           span.setStatus({ code: SpanStatusCode.OK });
         } catch (error) {
-          handleSpanError(span, error);
-          logger7.error(
+          setSpanWithError(span, error);
+          logger6.error(
             {
               sessionId: this.sessionId,
               artifactId: artifactData.artifactId,
@@ -2307,7 +2297,7 @@ Make it specific and relevant.`;
                 taskId: artifactData.taskId,
                 artifacts: [fallbackArtifact]
               });
-              logger7.info(
+              logger6.info(
                 {
                   sessionId: this.sessionId,
                   artifactId: artifactData.artifactId
@@ -2316,7 +2306,7 @@ Make it specific and relevant.`;
               );
             }
           } catch (fallbackError) {
-            logger7.error(
+            logger6.error(
               {
                 sessionId: this.sessionId,
                 artifactId: artifactData.artifactId,
@@ -2343,7 +2333,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;
   }
   /**
@@ -2354,7 +2344,7 @@ var GraphSessionManager = class {
     if (session) {
       session.initializeStatusUpdates(config, summarizerModel);
     } else {
-      logger7.error(
+      logger6.error(
         {
           sessionId,
           availableSessions: Array.from(this.sessions.keys())
@@ -2375,7 +2365,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);
@@ -2386,12 +2376,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;
@@ -2417,7 +2407,7 @@ var GraphSessionManager = class {
   }
 };
 var graphSessionManager = new GraphSessionManager();
-var logger8 = getLogger("ArtifactParser");
+var logger7 = getLogger("ArtifactParser");
 var _ArtifactParser = class _ArtifactParser {
   constructor(tenantId) {
     this.tenantId = tenantId;
@@ -2481,7 +2471,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 getLedgerArtifacts(dbClient_default)({
@@ -2493,9 +2483,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;
   }
@@ -2598,7 +2588,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 getLedgerArtifacts(dbClient_default)({
@@ -2610,7 +2600,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;
   }
@@ -2650,7 +2640,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", "");
@@ -2710,13 +2700,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;
@@ -2731,7 +2721,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
@@ -2744,7 +2734,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;
                   }
@@ -2757,7 +2747,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");
                 }
               }
             }
@@ -2774,7 +2764,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
@@ -2916,12 +2906,9 @@ var IncrementalStreamParser = class {
     }
   }
 };
-var logger10 = getLogger("ResponseFormatter");
-var RESPONSE_FORMATTER_SERVICE = "responseFormatter";
-function getResponseFormatterTracer() {
-  const tracerProvider = 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");
@@ -2931,8 +2918,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({
@@ -2952,8 +2938,8 @@ var ResponseFormatter = class {
         });
         return { parts };
       } catch (error) {
-        span.recordException(error);
-        logger10.error({ error, responseObject }, "Error formatting object response");
+        setSpanWithError(span, error);
+        logger9.error({ error, responseObject }, "Error formatting object response");
         return {
           parts: [{ kind: "data", data: responseObject }]
         };
@@ -2966,8 +2952,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),
@@ -3004,9 +2989,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");
+        setSpanWithError(span, error);
+        logger9.error({ error, responseText }, "Error formatting response");
         return { text: responseText };
       } finally {
         span.end();
@@ -3051,7 +3035,7 @@ var ResponseFormatter = class {
     }
   }
 };
-var logger11 = getLogger("ToolSessionManager");
+var logger10 = getLogger("ToolSessionManager");
 var _ToolSessionManager = class _ToolSessionManager {
   // 5 minutes
   constructor() {
@@ -3080,7 +3064,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;
   }
   /**
@@ -3089,7 +3073,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"
       );
@@ -3103,12 +3087,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,
@@ -3147,10 +3131,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");
     }
   }
 };
@@ -3159,7 +3143,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)) {
@@ -3380,7 +3364,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`,
@@ -3390,7 +3374,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`,
@@ -3403,7 +3387,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
         const baseData = jmespath.search(parsedResult, baseSelector);
         if (!baseData || Array.isArray(baseData) && baseData.length === 0) {
           const debugInfo = analyzeSelectorFailure(parsedResult, baseSelector);
-          logger12.warn(
+          logger11.warn(
             {
               baseSelector,
               toolCallId,
@@ -3446,7 +3430,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`
                       );
@@ -3458,7 +3442,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`
                     );
@@ -3571,7 +3555,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"}`,
@@ -3583,7 +3567,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,
@@ -3789,7 +3773,7 @@ var A2AClient = class {
       try {
         const res = await fn();
         if (attempt > 0) {
-          logger13.info(
+          logger12.info(
             {
               attempts: attempt + 1,
               elapsedTime: Date.now() - start
@@ -3804,7 +3788,7 @@ var A2AClient = class {
         }
         const elapsed = Date.now() - start;
         if (elapsed > maxElapsedTime) {
-          logger13.warn(
+          logger12.warn(
             {
               attempts: attempt + 1,
               elapsedTime: elapsed,
@@ -3825,7 +3809,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,
@@ -3910,7 +3894,7 @@ var A2AClient = class {
     }
     const rpcResponse = await httpResponse.json();
     if (rpcResponse.id !== requestId2) {
-      logger13.warn(
+      logger12.warn(
         {
           method,
           expectedId: requestId2,
@@ -4109,7 +4093,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(
@@ -4196,7 +4180,7 @@ var A2AClient = class {
 };
 
 // src/agents/relationTools.ts
-var logger14 = getLogger("relationships Tools");
+var logger13 = getLogger("relationships Tools");
 var generateTransferToolDescription = (config) => {
   return `Hand off the conversation to agent ${config.id}.
 
@@ -4234,7 +4218,7 @@ var createTransferToAgentTool = ({
           "transfer.to_agent_id": transferConfig.id ?? "unknown"
         });
       }
-      logger14.info(
+      logger13.info(
         {
           transferTo: transferConfig.id ?? "unknown",
           fromAgent: callingAgentId
@@ -4382,7 +4366,7 @@ function createDelegateToAgentTool({
           ...isInternal ? { fromAgentId: callingAgentId } : { fromExternalAgentId: callingAgentId }
         }
       };
-      logger14.info({ messageToSend }, "messageToSend");
+      logger13.info({ messageToSend }, "messageToSend");
       await createMessage(dbClient_default)({
         id: nanoid(),
         tenantId,
@@ -4442,7 +4426,7 @@ function createDelegateToAgentTool({
     }
   });
 }
-var logger15 = getLogger("SystemPromptBuilder");
+var logger14 = getLogger("SystemPromptBuilder");
 var SystemPromptBuilder = class {
   constructor(version, versionConfig) {
     this.version = version;
@@ -4466,9 +4450,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}`);
     }
   }
@@ -4804,8 +4788,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,
@@ -5058,14 +5041,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 = 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, {
@@ -5077,7 +5060,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;
             }
           }
@@ -5110,6 +5093,11 @@ var Agent = class {
   }
   async getMcpTool(tool4) {
     const credentialReferenceId = tool4.credentialReferenceId;
+    const toolsForAgent = await 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 getCredentialReference(dbClient_default)({
@@ -5134,7 +5122,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(
@@ -5144,16 +5133,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 || 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,
@@ -5193,7 +5185,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 getContextConfigById(dbClient_default)({
@@ -5201,7 +5193,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) {
@@ -5218,7 +5210,7 @@ var Agent = class {
         $now: (/* @__PURE__ */ new Date()).toISOString(),
         $env: process.env
       };
-      logger16.debug(
+      logger15.debug(
         {
           conversationId,
           contextConfigId: contextConfig.id,
@@ -5232,7 +5224,7 @@ var Agent = class {
       );
       return contextWithBuiltins;
     } catch (error) {
-      logger16.error(
+      logger15.error(
         {
           conversationId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -5256,7 +5248,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"
@@ -5283,7 +5275,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,
@@ -5343,7 +5335,7 @@ Key requirements:
           preserveUnresolved: false
         });
       } catch (error) {
-        logger16.error(
+        logger15.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -5388,7 +5380,7 @@ Key requirements:
           preserveUnresolved: false
         });
       } catch (error) {
-        logger16.error(
+        logger15.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -5416,7 +5408,7 @@ Key requirements:
         artifactId: 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 getLedgerArtifacts(dbClient_default)({
           scopes: {
             tenantId: this.config.tenantId,
@@ -5483,7 +5475,7 @@ Key requirements:
         graphId: this.config.graphId
       });
     } catch (error) {
-      logger16.error(
+      logger15.error(
         { error, graphId: this.config.graphId },
         "Failed to check graph artifact components"
       );
@@ -5491,7 +5483,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(
@@ -5515,8 +5507,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,
@@ -5538,11 +5530,10 @@ Key requirements:
               childSpan.setStatus({ code: SpanStatusCode.OK });
               return result;
             } catch (err) {
-              handleSpanError(childSpan, err);
+              setSpanWithError(childSpan, err);
               throw err;
             } finally {
               childSpan.end();
-              await forceFlushTracer();
             }
           }
         );
@@ -5588,7 +5579,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,
@@ -5630,7 +5621,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) {
@@ -5713,7 +5704,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) {
@@ -5758,7 +5749,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";
@@ -5864,7 +5855,6 @@ ${output}`;
         }
         span.setStatus({ code: SpanStatusCode.OK });
         span.end();
-        await forceFlushTracer();
         let formattedContent = response.formattedContent || null;
         if (!formattedContent) {
           if (response.object) {
@@ -5894,14 +5884,8 @@ ${output}`;
         return formattedResponse;
       } catch (error) {
         toolSessionManager.endSession(sessionId);
-        span.recordException(error);
-        span.setStatus({
-          code: SpanStatusCode.ERROR,
-          message: error.message
-        });
+        setSpanWithError(span, error);
         span.end();
-        await forceFlushTracer();
-        getLogger("Agent").error(error, "Agent generate error");
         throw error;
       }
     });
@@ -5919,7 +5903,7 @@ function parseEmbeddedJson(data) {
     }
   });
 }
-var logger17 = getLogger("generateTaskHandler");
+var logger16 = getLogger("generateTaskHandler");
 var createTaskHandler = (config, credentialStoreRegistry) => {
   return async (task) => {
     try {
@@ -5969,7 +5953,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           agentId: config.agentId
         })
       ]);
-      logger17.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
+      logger16.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
       const agentPrompt = "prompt" in config.agentSchema ? config.agentSchema.prompt : "";
       const models = "models" in config.agentSchema ? config.agentSchema.models : void 0;
       const stopWhen = "stopWhen" in config.agentSchema ? config.agentSchema.stopWhen : void 0;
@@ -6069,7 +6053,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         const taskIdMatch = task.id.match(/^task_([^-]+-[^-]+-\d+)-/);
         if (taskIdMatch) {
           contextId = taskIdMatch[1];
-          logger17.info(
+          logger16.info(
             {
               taskId: task.id,
               extractedContextId: contextId,
@@ -6085,7 +6069,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       const isDelegation = task.context?.metadata?.isDelegation === true;
       agent.setDelegationStatus(isDelegation);
       if (isDelegation) {
-        logger17.info(
+        logger16.info(
           { agentId: config.agentId, taskId: task.id },
           "Delegated agent - streaming disabled"
         );
@@ -6365,7 +6349,7 @@ async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
 
 // src/routes/agents.ts
 var app = new OpenAPIHono();
-var logger18 = getLogger("agents");
+var logger17 = getLogger("agents");
 app.openapi(
   createRoute({
     method: "get",
@@ -6403,7 +6387,7 @@ app.openapi(
       tracestate: c.req.header("tracestate"),
       baggage: c.req.header("baggage")
     };
-    logger18.info(
+    logger17.info(
       {
         otelHeaders,
         path: c.req.path,
@@ -6414,7 +6398,7 @@ app.openapi(
     const executionContext = getRequestExecutionContext(c);
     const { tenantId, projectId, graphId, agentId } = executionContext;
     if (agentId) {
-      logger18.info(
+      logger17.info(
         {
           message: "getRegisteredAgent (agent-level)",
           tenantId,
@@ -6426,13 +6410,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,
@@ -6455,7 +6439,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,
@@ -6466,7 +6450,7 @@ app.post("/a2a", async (c) => {
   const executionContext = getRequestExecutionContext(c);
   const { tenantId, projectId, graphId, agentId } = executionContext;
   if (agentId) {
-    logger18.info(
+    logger17.info(
       {
         message: "a2a (agent-level)",
         tenantId,
@@ -6490,7 +6474,7 @@ app.post("/a2a", async (c) => {
     }
     return a2aHandler(c, agent);
   } else {
-    logger18.info(
+    logger17.info(
       {
         message: "a2a (graph-level)",
         tenantId,
@@ -6530,14 +6514,14 @@ app.post("/a2a", async (c) => {
   }
 });
 var agents_default = app;
-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 setActiveAgentForThread(dbClient_default)({
     scopes: { tenantId, projectId },
     threadId,
@@ -7076,7 +7060,7 @@ var MCPStreamHelper = class {
 function createMCPStreamHelper() {
   return new MCPStreamHelper();
 }
-var logger20 = getLogger("ExecutionHandler");
+var logger19 = getLogger("ExecutionHandler");
 var ExecutionHandler = class {
   constructor() {
     // Hardcoded error limit - separate from configurable stopWhen
@@ -7101,7 +7085,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 getFullGraph(dbClient_default)({ scopes: { tenantId, projectId }, graphId });
@@ -7113,7 +7097,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
@@ -7129,7 +7113,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"
       );
@@ -7152,7 +7136,7 @@ var ExecutionHandler = class {
             agent_id: currentAgentId
           }
         });
-        logger20.info(
+        logger19.info(
           {
             taskId,
             createdTaskMetadata: Array.isArray(task) ? task[0]?.metadata : task?.metadata
@@ -7161,21 +7145,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 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",
@@ -7193,7 +7177,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"}`
         );
@@ -7201,10 +7185,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, {
@@ -7245,13 +7229,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) {
@@ -7277,7 +7261,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,
@@ -7288,7 +7272,7 @@ var ExecutionHandler = class {
           if (success) {
             fromAgentId = currentAgentId;
             currentAgentId = newAgentId;
-            logger20.info(
+            logger19.info(
               {
                 transferFrom: fromAgentId,
                 transferTo: currentAgentId,
@@ -7306,7 +7290,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) {
@@ -7361,32 +7345,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) {
@@ -7408,7 +7392,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) {
@@ -7428,7 +7412,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"));
@@ -7454,7 +7438,7 @@ var ExecutionHandler = class {
 
 // src/routes/chat.ts
 var app2 = new OpenAPIHono();
-var logger21 = getLogger("completionsHandler");
+var logger20 = getLogger("completionsHandler");
 var chatCompletionsRoute = createRoute({
   method: "post",
   path: "/completions",
@@ -7572,7 +7556,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,
@@ -7658,7 +7642,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       dbClient_default,
       credentialStores
     );
-    logger21.info(
+    logger20.info(
       {
         tenantId,
         graphId,
@@ -7704,7 +7688,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     return 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,
@@ -7714,7 +7698,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
         requestId: requestId2,
         sseHelper
       });
-      logger21.info(
+      logger20.info(
         { result },
         `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
       );
@@ -7747,7 +7731,7 @@ var getMessageText = (content) => {
 };
 var chat_default = app2;
 var app3 = new OpenAPIHono();
-var logger22 = getLogger("chatDataStream");
+var logger21 = getLogger("chatDataStream");
 var chatDataStreamRoute = createRoute({
   method: "post",
   path: "/chat",
@@ -7852,7 +7836,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 = trace.getActiveSpan();
     if (messageSpan) {
       messageSpan.setAttributes({
@@ -7894,7 +7878,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") {
@@ -7915,7 +7899,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);
   }
 });
@@ -7923,7 +7907,7 @@ var chatDataStream_default = app3;
 function createMCPSchema(schema) {
   return schema;
 }
-var logger23 = getLogger("mcp");
+var logger22 = getLogger("mcp");
 var _MockResponseSingleton = class _MockResponseSingleton {
   constructor() {
     __publicField(this, "mockRes");
@@ -7978,21 +7962,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",
@@ -8018,7 +8002,7 @@ var validateSession = async (req, res, body, tenantId, projectId, graphId) => {
     scopes: { tenantId, projectId },
     conversationId: sessionId
   });
-  logger23.info(
+  logger22.info(
     {
       sessionId,
       conversationFound: !!conversation,
@@ -8029,7 +8013,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"
     );
@@ -8090,7 +8074,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`
   );
@@ -8164,7 +8148,7 @@ var getServer = async (requestContext, executionContext, conversationId, credent
           dbClient_default,
           credentialStores
         );
-        logger23.info(
+        logger22.info(
           {
             tenantId,
             graphId,
@@ -8225,7 +8209,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();
   const agentGraph = await getAgentGraphWithDefaultAgent(dbClient_default)({
     scopes: { tenantId, projectId },
@@ -8256,7 +8240,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
       }
     }
   });
-  logger23.info(
+  logger22.info(
     { sessionId, conversationId: conversation.id },
     "Created MCP session as conversation"
   );
@@ -8265,9 +8249,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,
@@ -8276,7 +8260,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 toFetchResponse(res);
 };
 var handleExistingSessionRequest = async (body, executionContext, validatedContext, req, res, credentialStores) => {
@@ -8304,8 +8288,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 || {}),
@@ -8319,9 +8303,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,
@@ -8372,13 +8356,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 } = 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,
@@ -8400,7 +8384,7 @@ app4.openapi(
         );
       }
     } catch (e) {
-      logger23.error(
+      logger22.error(
         {
           error: e instanceof Error ? e.message : e,
           stack: e instanceof Error ? e.stack : void 0
@@ -8412,7 +8396,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",
@@ -8426,7 +8410,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",
@@ -8506,9 +8490,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,
@@ -8520,9 +8504,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,
@@ -8539,9 +8523,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");
         }
       }
     }