@inkeep/agents-run-api 0.19.5 → 0.19.7

package/dist/index.js

@@ -1,8 +1,8 @@
-import { flushBatchProcessor } from './chunk-XO4RG36I.js';
+import { flushBatchProcessor } from './chunk-RZXPMRBA.js';
 import { getLogger } from './chunk-A2S7GSHL.js';
-import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-QRT6EIUX.js';
-import { dbClient_default } from './chunk-7IMXW4RD.js';
-import { env } from './chunk-NZHNG4A3.js';
+import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-T5AYIGCU.js';
+import { dbClient_default } from './chunk-IBMWBEXH.js';
+import { env } from './chunk-LHCIBW34.js';
 import { __publicField } from './chunk-PKBMQBKP.js';
 import { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullAgent, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, commonGetErrorResponses, loggerFactory, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, upsertLedgerArtifact, createTask, updateTask, setSpanWithError, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getAgentById, getRelatedAgentsForAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, validateAndGetApiKey, getProject, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, getContextConfigById, getFullAgentDefinition, TemplateEngine, agentHasArtifactComponents, MCPTransportType, SPAN_KEYS, getExternalAgent } from '@inkeep/agents-core';
 import { otel } from '@hono/otel';
@@ -3023,7 +3023,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           "agent_session.id": this.sessionId,
           "artifact.id": artifactData.artifactId,
           "artifact.type": artifactData.artifactType || "unknown",
-          "artifact.agent_id": artifactData.subAgentId || "unknown",
+          "artifact.sub_agent_id": artifactData.subAgentId || "unknown",
           "artifact.tool_call_id": artifactData.metadata?.toolCallId || "unknown",
           "artifact.data": JSON.stringify(artifactData.data, null, 2),
           "tenant.id": artifactData.tenantId || "unknown",
@@ -6658,7 +6658,7 @@ var Agent = class {
             "conversation.id": this.conversationId,
             "tool.purpose": toolDefinition.description || "No description provided",
             "ai.toolType": toolType || "unknown",
-            "ai.agentName": this.config.name || "unknown",
+            "ai.subAgentName": this.config.name || "unknown",
             "agent.id": this.config.agentId || "unknown"
           });
         }
@@ -6945,7 +6945,7 @@ var Agent = class {
                 originalToolName: tool3.name
               }),
               "ai.toolType": "mcp",
-              "ai.agentName": this.config.name || "unknown",
+              "ai.subAgentName": this.config.name || "unknown",
               "conversation.id": this.conversationId || "unknown",
               "agent.id": this.config.agentId || "unknown",
               "tenant.id": this.config.tenantId || "unknown",
@@ -7310,7 +7310,7 @@ var Agent = class {
       inputSchema: tool3.inputSchema || tool3.parameters || {},
       usageGuidelines: name.startsWith("transfer_to_") || name.startsWith("delegate_to_") ? `Use this tool to ${name.startsWith("transfer_to_") ? "transfer" : "delegate"} to another agent when appropriate.` : "Use this tool when appropriate for the task at hand."
     }));
-    const { getConversationScopedArtifacts } = await import('./conversations-OFIM2WLJ.js');
+    const { getConversationScopedArtifacts } = await import('./conversations-6OGSD67W.js');
     const historyConfig = this.config.conversationHistoryConfig ?? createDefaultConversationHistoryConfig();
     const referenceArtifacts = await getConversationScopedArtifacts({
       tenantId: this.config.tenantId,
@@ -7667,7 +7667,7 @@ var Agent = class {
           "agent.load_tools",
           {
             attributes: {
-              "agent.name": this.config.name,
+              "subAgent.name": this.config.name,
               "session.id": sessionId
             }
           },
@@ -9808,7 +9808,7 @@ var ExecutionHandler = class {
               span.setAttributes({
                 "ai.response.content": textContent || "No response content",
                 "ai.response.timestamp": (/* @__PURE__ */ new Date()).toISOString(),
-                "ai.agent.name": currentAgentId
+                "ai.subAgent.name": currentAgentId
               });
               await createMessage(dbClient_default)({
                 id: nanoid(),
@@ -10084,174 +10084,191 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     );
     const body = c.get("requestBody") || {};
     const conversationId = body.conversationId || getConversationId();
-    const fullAgent = await getFullAgent(dbClient_default)({
-      scopes: { tenantId, projectId, agentId }
-    });
-    let agent;
-    let defaultSubAgentId;
-    if (fullAgent) {
-      agent = {
-        id: fullAgent.id,
-        name: fullAgent.name,
-        tenantId,
-        projectId,
-        defaultSubAgentId: fullAgent.defaultSubAgentId
-      };
-      const agentKeys = Object.keys(fullAgent.subAgents || {});
-      const firstAgentId = agentKeys.length > 0 ? agentKeys[0] : "";
-      defaultSubAgentId = fullAgent.defaultSubAgentId || firstAgentId;
-    } else {
-      agent = await getAgentWithDefaultSubAgent(dbClient_default)({
+    const activeSpan = trace.getActiveSpan();
+    if (activeSpan) {
+      activeSpan.setAttributes({
+        "conversation.id": conversationId,
+        "tenant.id": tenantId,
+        "agent.id": agentId,
+        "project.id": projectId
+      });
+    }
+    let currentBag = propagation.getBaggage(context.active());
+    if (!currentBag) {
+      currentBag = propagation.createBaggage();
+    }
+    currentBag = currentBag.setEntry("conversation.id", { value: conversationId });
+    const ctxWithBaggage = propagation.setBaggage(context.active(), currentBag);
+    return await context.with(ctxWithBaggage, async () => {
+      const fullAgent = await getFullAgent(dbClient_default)({
         scopes: { tenantId, projectId, agentId }
       });
-      if (!agent) {
+      let agent;
+      let defaultSubAgentId;
+      if (fullAgent) {
+        agent = {
+          id: fullAgent.id,
+          name: fullAgent.name,
+          tenantId,
+          projectId,
+          defaultSubAgentId: fullAgent.defaultSubAgentId
+        };
+        const agentKeys = Object.keys(fullAgent.subAgents || {});
+        const firstAgentId = agentKeys.length > 0 ? agentKeys[0] : "";
+        defaultSubAgentId = fullAgent.defaultSubAgentId || firstAgentId;
+      } else {
+        agent = await getAgentWithDefaultSubAgent(dbClient_default)({
+          scopes: { tenantId, projectId, agentId }
+        });
+        if (!agent) {
+          throw createApiError({
+            code: "not_found",
+            message: "Agent not found"
+          });
+        }
+        defaultSubAgentId = agent.defaultSubAgentId || "";
+      }
+      if (!defaultSubAgentId) {
         throw createApiError({
           code: "not_found",
-          message: "Agent not found"
+          message: "No default agent found in agent"
         });
       }
-      defaultSubAgentId = agent.defaultSubAgentId || "";
-    }
-    if (!defaultSubAgentId) {
-      throw createApiError({
-        code: "not_found",
-        message: "No default agent found in agent"
+      await createOrGetConversation(dbClient_default)({
+        tenantId,
+        projectId,
+        id: conversationId,
+        activeSubAgentId: defaultSubAgentId
       });
-    }
-    await createOrGetConversation(dbClient_default)({
-      tenantId,
-      projectId,
-      id: conversationId,
-      activeSubAgentId: defaultSubAgentId
-    });
-    const activeAgent = await getActiveAgentForConversation(dbClient_default)({
-      scopes: { tenantId, projectId },
-      conversationId
-    });
-    if (!activeAgent) {
-      setActiveAgentForConversation(dbClient_default)({
+      const activeAgent = await getActiveAgentForConversation(dbClient_default)({
         scopes: { tenantId, projectId },
-        conversationId,
-        subAgentId: defaultSubAgentId
+        conversationId
       });
-    }
-    const subAgentId = activeAgent?.activeSubAgentId || defaultSubAgentId;
-    const agentInfo = await getSubAgentById(dbClient_default)({
-      scopes: { tenantId, projectId, agentId },
-      subAgentId
-    });
-    if (!agentInfo) {
-      throw createApiError({
-        code: "not_found",
-        message: "Agent not found"
+      if (!activeAgent) {
+        setActiveAgentForConversation(dbClient_default)({
+          scopes: { tenantId, projectId },
+          conversationId,
+          subAgentId: defaultSubAgentId
+        });
+      }
+      const subAgentId = activeAgent?.activeSubAgentId || defaultSubAgentId;
+      const agentInfo = await getSubAgentById(dbClient_default)({
+        scopes: { tenantId, projectId, agentId },
+        subAgentId
       });
-    }
-    const validatedContext = c.get("validatedContext") || body.headers || {};
-    const credentialStores = c.get("credentialStores");
-    await handleContextResolution({
-      tenantId,
-      projectId,
-      agentId,
-      conversationId,
-      headers: validatedContext,
-      dbClient: dbClient_default,
-      credentialStores
-    });
-    logger21.info(
-      {
+      if (!agentInfo) {
+        throw createApiError({
+          code: "not_found",
+          message: "Agent not found"
+        });
+      }
+      const validatedContext = c.get("validatedContext") || body.headers || {};
+      const credentialStores = c.get("credentialStores");
+      await handleContextResolution({
         tenantId,
         projectId,
         agentId,
         conversationId,
-        defaultSubAgentId,
-        activeSubAgentId: activeAgent?.activeSubAgentId || "none",
-        hasContextConfig: !!agent.contextConfigId,
-        hasHeaders: !!body.headers,
-        hasValidatedContext: !!validatedContext,
-        validatedContextKeys: Object.keys(validatedContext)
-      },
-      "parameters"
-    );
-    const requestId2 = `chatcmpl-${Date.now()}`;
-    const timestamp = Math.floor(Date.now() / 1e3);
-    const lastUserMessage = body.messages.filter((msg) => msg.role === "user").slice(-1)[0];
-    const userMessage = lastUserMessage ? getMessageText(lastUserMessage.content) : "";
-    const messageSpan = trace.getActiveSpan();
-    if (messageSpan) {
-      messageSpan.setAttributes({
-        "message.content": userMessage,
-        "message.timestamp": Date.now()
+        headers: validatedContext,
+        dbClient: dbClient_default,
+        credentialStores
       });
-    }
-    await createMessage(dbClient_default)({
-      id: nanoid(),
-      tenantId,
-      projectId,
-      conversationId,
-      role: "user",
-      content: {
-        text: userMessage
-      },
-      visibility: "user-facing",
-      messageType: "chat"
-    });
-    if (messageSpan) {
-      messageSpan.addEvent("user.message.stored", {
-        "message.id": conversationId,
-        "database.operation": "insert"
-      });
-    }
-    return streamSSE(c, async (stream2) => {
-      try {
-        const sseHelper = createSSEStreamHelper(stream2, requestId2, timestamp);
-        await sseHelper.writeRole();
-        logger21.info({ subAgentId }, "Starting execution");
-        const emitOperationsHeader = c.req.header("x-emit-operations");
-        const emitOperations = emitOperationsHeader === "true";
-        const executionHandler = new ExecutionHandler();
-        const result = await executionHandler.execute({
-          executionContext,
+      logger21.info(
+        {
+          tenantId,
+          projectId,
+          agentId,
           conversationId,
-          userMessage,
-          initialAgentId: subAgentId,
-          requestId: requestId2,
-          sseHelper,
-          emitOperations
+          defaultSubAgentId,
+          activeSubAgentId: activeAgent?.activeSubAgentId || "none",
+          hasContextConfig: !!agent.contextConfigId,
+          hasHeaders: !!body.headers,
+          hasValidatedContext: !!validatedContext,
+          validatedContextKeys: Object.keys(validatedContext)
+        },
+        "parameters"
+      );
+      const requestId2 = `chatcmpl-${Date.now()}`;
+      const timestamp = Math.floor(Date.now() / 1e3);
+      const lastUserMessage = body.messages.filter((msg) => msg.role === "user").slice(-1)[0];
+      const userMessage = lastUserMessage ? getMessageText(lastUserMessage.content) : "";
+      const messageSpan = trace.getActiveSpan();
+      if (messageSpan) {
+        messageSpan.setAttributes({
+          "message.content": userMessage,
+          "message.timestamp": Date.now()
         });
-        logger21.info(
-          { result },
-          `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
-        );
-        if (!result.success) {
-          await sseHelper.writeOperation(
-            errorOp(
-              "Sorry, I was unable to process your request at this time. Please try again.",
-              "system"
-            )
-          );
-        }
-        await sseHelper.complete();
-      } catch (error) {
-        logger21.error(
-          {
-            error: error instanceof Error ? error.message : error,
-            stack: error instanceof Error ? error.stack : void 0
-          },
-          "Error during streaming execution"
-        );
+      }
+      await createMessage(dbClient_default)({
+        id: nanoid(),
+        tenantId,
+        projectId,
+        conversationId,
+        role: "user",
+        content: {
+          text: userMessage
+        },
+        visibility: "user-facing",
+        messageType: "chat"
+      });
+      if (messageSpan) {
+        messageSpan.addEvent("user.message.stored", {
+          "message.id": conversationId,
+          "database.operation": "insert"
+        });
+      }
+      return streamSSE(c, async (stream2) => {
         try {
           const sseHelper = createSSEStreamHelper(stream2, requestId2, timestamp);
-          await sseHelper.writeOperation(
-            errorOp(
-              "Sorry, I was unable to process your request at this time. Please try again.",
-              "system"
-            )
+          await sseHelper.writeRole();
+          logger21.info({ subAgentId }, "Starting execution");
+          const emitOperationsHeader = c.req.header("x-emit-operations");
+          const emitOperations = emitOperationsHeader === "true";
+          const executionHandler = new ExecutionHandler();
+          const result = await executionHandler.execute({
+            executionContext,
+            conversationId,
+            userMessage,
+            initialAgentId: subAgentId,
+            requestId: requestId2,
+            sseHelper,
+            emitOperations
+          });
+          logger21.info(
+            { result },
+            `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
           );
+          if (!result.success) {
+            await sseHelper.writeOperation(
+              errorOp(
+                "Sorry, I was unable to process your request at this time. Please try again.",
+                "system"
+              )
+            );
+          }
           await sseHelper.complete();
-        } catch (streamError) {
-          logger21.error({ streamError }, "Failed to write error to stream");
+        } catch (error) {
+          logger21.error(
+            {
+              error: error instanceof Error ? error.message : error,
+              stack: error instanceof Error ? error.stack : void 0
+            },
+            "Error during streaming execution"
+          );
+          try {
+            const sseHelper = createSSEStreamHelper(stream2, requestId2, timestamp);
+            await sseHelper.writeOperation(
+              errorOp(
+                "Sorry, I was unable to process your request at this time. Please try again.",
+                "system"
+              )
+            );
+            await sseHelper.complete();
+          } catch (streamError) {
+            logger21.error({ streamError }, "Failed to write error to stream");
+          }
         }
-      }
+      });
     });
   } catch (error) {
     logger21.error(
@@ -10343,123 +10360,131 @@ app3.openapi(chatDataStreamRoute, async (c) => {
         "project.id": projectId
       });
     }
-    const agent = await getAgentWithDefaultSubAgent(dbClient_default)({
-      scopes: { tenantId, projectId, agentId }
-    });
-    if (!agent) {
-      throw createApiError({
-        code: "not_found",
-        message: "Agent not found"
-      });
+    let currentBag = propagation.getBaggage(context.active());
+    if (!currentBag) {
+      currentBag = propagation.createBaggage();
     }
-    const defaultSubAgentId = agent.defaultSubAgentId;
-    const agentName = agent.name;
-    if (!defaultSubAgentId) {
-      throw createApiError({
-        code: "bad_request",
-        message: "Agent does not have a default agent configured"
+    currentBag = currentBag.setEntry("conversation.id", { value: conversationId });
+    const ctxWithBaggage = propagation.setBaggage(context.active(), currentBag);
+    return await context.with(ctxWithBaggage, async () => {
+      const agent = await getAgentWithDefaultSubAgent(dbClient_default)({
+        scopes: { tenantId, projectId, agentId }
       });
-    }
-    const activeAgent = await getActiveAgentForConversation(dbClient_default)({
-      scopes: { tenantId, projectId },
-      conversationId
-    });
-    if (!activeAgent) {
-      setActiveAgentForConversation(dbClient_default)({
+      if (!agent) {
+        throw createApiError({
+          code: "not_found",
+          message: "Agent not found"
+        });
+      }
+      const defaultSubAgentId = agent.defaultSubAgentId;
+      const agentName = agent.name;
+      if (!defaultSubAgentId) {
+        throw createApiError({
+          code: "bad_request",
+          message: "Agent does not have a default agent configured"
+        });
+      }
+      const activeAgent = await getActiveAgentForConversation(dbClient_default)({
         scopes: { tenantId, projectId },
-        conversationId,
-        subAgentId: defaultSubAgentId
+        conversationId
       });
-    }
-    const subAgentId = activeAgent?.activeSubAgentId || defaultSubAgentId;
-    const agentInfo = await getSubAgentById(dbClient_default)({
-      scopes: { tenantId, projectId, agentId },
-      subAgentId
-    });
-    if (!agentInfo) {
-      throw createApiError({
-        code: "not_found",
-        message: "Agent not found"
+      if (!activeAgent) {
+        setActiveAgentForConversation(dbClient_default)({
+          scopes: { tenantId, projectId },
+          conversationId,
+          subAgentId: defaultSubAgentId
+        });
+      }
+      const subAgentId = activeAgent?.activeSubAgentId || defaultSubAgentId;
+      const agentInfo = await getSubAgentById(dbClient_default)({
+        scopes: { tenantId, projectId, agentId },
+        subAgentId
       });
-    }
-    const validatedContext = c.get("validatedContext") || body.headers || {};
-    const credentialStores = c.get("credentialStores");
-    await handleContextResolution({
-      tenantId,
-      projectId,
-      agentId,
-      conversationId,
-      headers: validatedContext,
-      dbClient: dbClient_default,
-      credentialStores
-    });
-    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");
-    const messageSpan = trace.getActiveSpan();
-    if (messageSpan) {
-      messageSpan.setAttributes({
-        "message.timestamp": (/* @__PURE__ */ new Date()).toISOString(),
-        "message.content": userText,
-        "agent.name": agentName
+      if (!agentInfo) {
+        throw createApiError({
+          code: "not_found",
+          message: "Agent not found"
+        });
+      }
+      const validatedContext = c.get("validatedContext") || body.headers || {};
+      const credentialStores = c.get("credentialStores");
+      await handleContextResolution({
+        tenantId,
+        projectId,
+        agentId,
+        conversationId,
+        headers: validatedContext,
+        dbClient: dbClient_default,
+        credentialStores
       });
-    }
-    await createMessage(dbClient_default)({
-      id: nanoid(),
-      tenantId,
-      projectId,
-      conversationId,
-      role: "user",
-      content: { text: userText },
-      visibility: "user-facing",
-      messageType: "chat"
-    });
-    if (messageSpan) {
-      messageSpan.addEvent("user.message.stored", {
-        "message.id": conversationId,
-        "database.operation": "insert"
+      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");
+      const messageSpan = trace.getActiveSpan();
+      if (messageSpan) {
+        messageSpan.setAttributes({
+          "message.timestamp": (/* @__PURE__ */ new Date()).toISOString(),
+          "message.content": userText,
+          "agent.name": agentName
+        });
+      }
+      await createMessage(dbClient_default)({
+        id: nanoid(),
+        tenantId,
+        projectId,
+        conversationId,
+        role: "user",
+        content: { text: userText },
+        visibility: "user-facing",
+        messageType: "chat"
       });
-    }
-    const dataStream = createUIMessageStream({
-      execute: async ({ writer }) => {
-        const streamHelper = createVercelStreamHelper(writer);
-        try {
-          const emitOperationsHeader = c.req.header("x-emit-operations");
-          const emitOperations = emitOperationsHeader === "true";
-          const executionHandler = new ExecutionHandler();
-          const result = await executionHandler.execute({
-            executionContext,
-            conversationId,
-            userMessage: userText,
-            initialAgentId: subAgentId,
-            requestId: `chatds-${Date.now()}`,
-            sseHelper: streamHelper,
-            emitOperations
-          });
-          if (!result.success) {
-            await streamHelper.writeOperation(errorOp("Unable to process request", "system"));
-          }
-        } catch (err) {
-          logger22.error({ err }, "Streaming error");
-          await streamHelper.writeOperation(errorOp("Internal server error", "system"));
-        } finally {
-          if ("cleanup" in streamHelper && typeof streamHelper.cleanup === "function") {
-            streamHelper.cleanup();
+      if (messageSpan) {
+        messageSpan.addEvent("user.message.stored", {
+          "message.id": conversationId,
+          "database.operation": "insert"
+        });
+      }
+      const dataStream = createUIMessageStream({
+        execute: async ({ writer }) => {
+          const streamHelper = createVercelStreamHelper(writer);
+          try {
+            const emitOperationsHeader = c.req.header("x-emit-operations");
+            const emitOperations = emitOperationsHeader === "true";
+            const executionHandler = new ExecutionHandler();
+            const result = await executionHandler.execute({
+              executionContext,
+              conversationId,
+              userMessage: userText,
+              initialAgentId: subAgentId,
+              requestId: `chatds-${Date.now()}`,
+              sseHelper: streamHelper,
+              emitOperations
+            });
+            if (!result.success) {
+              await streamHelper.writeOperation(errorOp("Unable to process request", "system"));
+            }
+          } catch (err) {
+            logger22.error({ err }, "Streaming error");
+            await streamHelper.writeOperation(errorOp("Internal server error", "system"));
+          } finally {
+            if ("cleanup" in streamHelper && typeof streamHelper.cleanup === "function") {
+              streamHelper.cleanup();
+            }
           }
         }
-      }
+      });
+      c.header("content-type", "text/event-stream");
+      c.header("cache-control", "no-cache");
+      c.header("connection", "keep-alive");
+      c.header("x-vercel-ai-data-stream", "v2");
+      c.header("x-accel-buffering", "no");
+      return stream(
+        c,
+        (stream2) => stream2.pipe(
+          dataStream.pipeThrough(new JsonToSseTransformStream()).pipeThrough(new TextEncoderStream())
+        )
+      );
     });
-    c.header("content-type", "text/event-stream");
-    c.header("cache-control", "no-cache");
-    c.header("connection", "keep-alive");
-    c.header("x-vercel-ai-data-stream", "v2");
-    c.header("x-accel-buffering", "no");
-    return stream(
-      c,
-      (stream2) => stream2.pipe(
-        dataStream.pipeThrough(new JsonToSseTransformStream()).pipeThrough(new TextEncoderStream())
-      )
-    );
   } catch (error) {
     logger22.error({ error }, "chatDataStream error");
     throw createApiError({
@@ -10787,66 +10812,83 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
   const { tenantId, projectId, agentId } = executionContext;
   logger23.info({ body }, "Received initialization request");
   const sessionId = getConversationId();
-  const agent = await getAgentWithDefaultSubAgent(dbClient_default)({
-    scopes: { tenantId, projectId, agentId }
-  });
-  if (!agent) {
-    return c.json(
-      {
-        jsonrpc: "2.0",
-        error: { code: -32001, message: "Agent not found" },
-        id: body.id || null
-      },
-      { status: 404 }
-    );
+  const activeSpan = trace.getActiveSpan();
+  if (activeSpan) {
+    activeSpan.setAttributes({
+      "conversation.id": sessionId,
+      "tenant.id": tenantId,
+      "agent.id": agentId,
+      "project.id": projectId
+    });
+  }
+  let currentBag = propagation.getBaggage(context.active());
+  if (!currentBag) {
+    currentBag = propagation.createBaggage();
   }
-  if (!agent.defaultSubAgentId) {
-    return c.json(
+  currentBag = currentBag.setEntry("conversation.id", { value: sessionId });
+  const ctxWithBaggage = propagation.setBaggage(context.active(), currentBag);
+  return await context.with(ctxWithBaggage, async () => {
+    const agent = await getAgentWithDefaultSubAgent(dbClient_default)({
+      scopes: { tenantId, projectId, agentId }
+    });
+    if (!agent) {
+      return c.json(
+        {
+          jsonrpc: "2.0",
+          error: { code: -32001, message: "Agent not found" },
+          id: body.id || null
+        },
+        { status: 404 }
+      );
+    }
+    if (!agent.defaultSubAgentId) {
+      return c.json(
+        {
+          jsonrpc: "2.0",
+          error: { code: -32001, message: "Agent does not have a default agent configured" },
+          id: body.id || null
+        },
+        { status: 400 }
+      );
+    }
+    const conversation = await createOrGetConversation(dbClient_default)({
+      id: sessionId,
+      tenantId,
+      projectId,
+      activeSubAgentId: agent.defaultSubAgentId,
+      metadata: {
+        sessionData: {
+          agentId,
+          sessionType: "mcp",
+          mcpProtocolVersion: c.req.header("mcp-protocol-version"),
+          initialized: false
+          // Track initialization state
+        }
+      }
+    });
+    logger23.info(
+      { sessionId, conversationId: conversation.id },
+      "Created MCP session as conversation"
+    );
+    const transport = new StreamableHTTPServerTransport({
+      sessionIdGenerator: () => sessionId
+    });
+    const server = await getServer(validatedContext, executionContext, sessionId, credentialStores);
+    await server.connect(transport);
+    logger23.info({ sessionId }, "Server connected for initialization");
+    res.setHeader("Mcp-Session-Id", sessionId);
+    logger23.info(
       {
-        jsonrpc: "2.0",
-        error: { code: -32001, message: "Agent does not have a default agent configured" },
-        id: body.id || null
+        sessionId,
+        bodyMethod: body?.method,
+        bodyId: body?.id
       },
-      { status: 400 }
+      "About to handle initialization request"
     );
-  }
-  const conversation = await createOrGetConversation(dbClient_default)({
-    id: sessionId,
-    tenantId,
-    projectId,
-    activeSubAgentId: agent.defaultSubAgentId,
-    metadata: {
-      sessionData: {
-        agentId,
-        sessionType: "mcp",
-        mcpProtocolVersion: c.req.header("mcp-protocol-version"),
-        initialized: false
-        // Track initialization state
-      }
-    }
-  });
-  logger23.info(
-    { sessionId, conversationId: conversation.id },
-    "Created MCP session as conversation"
-  );
-  const transport = new StreamableHTTPServerTransport({
-    sessionIdGenerator: () => sessionId
+    await transport.handleRequest(req, res, body);
+    logger23.info({ sessionId }, "Successfully handled initialization request");
+    return toFetchResponse(res);
   });
-  const server = await getServer(validatedContext, executionContext, sessionId, credentialStores);
-  await server.connect(transport);
-  logger23.info({ sessionId }, "Server connected for initialization");
-  res.setHeader("Mcp-Session-Id", sessionId);
-  logger23.info(
-    {
-      sessionId,
-      bodyMethod: body?.method,
-      bodyId: body?.id
-    },
-    "About to handle initialization request"
-  );
-  await transport.handleRequest(req, res, body);
-  logger23.info({ sessionId }, "Successfully handled initialization request");
-  return toFetchResponse(res);
 };
 var handleExistingSessionRequest = async (body, executionContext, validatedContext, req, res, credentialStores) => {
   const { tenantId, projectId, agentId } = executionContext;