@inkeep/agents-run-api 0.37.2 → 0.38.0

package/dist/index.js

@@ -1,10 +1,10 @@
-import { flushBatchProcessor } from './chunk-QOUOKHYQ.js';
-import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-BQB27EXW.js';
-import { dbClient_default } from './chunk-W6UIBREL.js';
-import { env } from './chunk-CDYXP4BN.js';
+import { defaultSDK, flushBatchProcessor } from './chunk-UC2EPLSW.js';
+import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-KCJWSIDZ.js';
+import { dbClient_default } from './chunk-EVOISBFH.js';
+import { env } from './chunk-KBZIYCPJ.js';
 import { getLogger } from './chunk-A2S7GSHL.js';
-import { SESSION_CLEANUP_INTERVAL_MS, AGENT_EXECUTION_MAX_CONSECUTIVE_ERRORS, SESSION_TOOL_RESULT_CACHE_TIMEOUT_MS, STREAM_MAX_LIFETIME_MS, STREAM_BUFFER_MAX_SIZE_BYTES, STREAM_TEXT_GAP_THRESHOLD_MS, ARTIFACT_GENERATION_MAX_RETRIES, ARTIFACT_SESSION_MAX_PENDING, STATUS_UPDATE_DEFAULT_INTERVAL_SECONDS, STATUS_UPDATE_DEFAULT_NUM_EVENTS, ARTIFACT_SESSION_MAX_PREVIOUS_SUMMARIES, AGENT_EXECUTION_MAX_GENERATION_STEPS, FUNCTION_TOOL_SANDBOX_VCPUS_DEFAULT, FUNCTION_TOOL_EXECUTION_TIMEOUT_MS_DEFAULT, LLM_GENERATION_MAX_ALLOWED_TIMEOUT_MS, ARTIFACT_GENERATION_BACKOFF_INITIAL_MS, ARTIFACT_GENERATION_BACKOFF_MAX_MS, LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_STREAMING, LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_NON_STREAMING, LLM_GENERATION_SUBSEQUENT_CALL_TIMEOUT_MS, DELEGATION_TOOL_BACKOFF_MAX_ELAPSED_TIME_MS, DELEGATION_TOOL_BACKOFF_EXPONENT, DELEGATION_TOOL_BACKOFF_MAX_INTERVAL_MS, DELEGATION_TOOL_BACKOFF_INITIAL_INTERVAL_MS, STREAM_PARSER_MAX_SNAPSHOT_SIZE, STREAM_PARSER_MAX_STREAMED_SIZE, STREAM_PARSER_MAX_COLLECTED_PARTS } from './chunk-SUUSOBLI.js';
-import { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullAgent, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, generateId, commonGetErrorResponses, loggerFactory, getConversation, createDefaultCredentialStores, CredentialStoreRegistry, createTask, getTask, updateTask, setSpanWithError, AGENT_EXECUTION_TRANSFER_COUNT_DEFAULT, updateConversation, handleApiError, TaskState, getAgentById, getProject, setActiveAgentForThread, getRelatedAgentsForAgent, getExternalAgentsForSubAgent, getTeamAgentsForSubAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT, CONVERSATION_HISTORY_DEFAULT_LIMIT, ModelFactory, verifyTempToken, validateAndGetApiKey, verifyServiceToken, validateTargetAgent, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, getContextConfigById, getFullAgentDefinition, TemplateEngine, listTaskIdsByContextId, getLedgerArtifacts, agentHasArtifactComponents, upsertLedgerArtifact, MCPTransportType, SPAN_KEYS, headers, generateServiceToken } from '@inkeep/agents-core';
+import { SESSION_CLEANUP_INTERVAL_MS, AGENT_EXECUTION_MAX_CONSECUTIVE_ERRORS, SESSION_TOOL_RESULT_CACHE_TIMEOUT_MS, STREAM_MAX_LIFETIME_MS, STREAM_BUFFER_MAX_SIZE_BYTES, STREAM_TEXT_GAP_THRESHOLD_MS, ARTIFACT_GENERATION_MAX_RETRIES, ARTIFACT_SESSION_MAX_PENDING, STATUS_UPDATE_DEFAULT_INTERVAL_SECONDS, STATUS_UPDATE_DEFAULT_NUM_EVENTS, ARTIFACT_SESSION_MAX_PREVIOUS_SUMMARIES, AGENT_EXECUTION_MAX_GENERATION_STEPS, FUNCTION_TOOL_SANDBOX_VCPUS_DEFAULT, FUNCTION_TOOL_EXECUTION_TIMEOUT_MS_DEFAULT, LLM_GENERATION_MAX_ALLOWED_TIMEOUT_MS, ARTIFACT_GENERATION_BACKOFF_INITIAL_MS, ARTIFACT_GENERATION_BACKOFF_MAX_MS, LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_STREAMING, LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_NON_STREAMING, LLM_GENERATION_SUBSEQUENT_CALL_TIMEOUT_MS, DELEGATION_TOOL_BACKOFF_MAX_ELAPSED_TIME_MS, DELEGATION_TOOL_BACKOFF_EXPONENT, DELEGATION_TOOL_BACKOFF_MAX_INTERVAL_MS, DELEGATION_TOOL_BACKOFF_INITIAL_INTERVAL_MS, STREAM_PARSER_MAX_SNAPSHOT_SIZE, STREAM_PARSER_MAX_STREAMED_SIZE, STREAM_PARSER_MAX_COLLECTED_PARTS } from './chunk-THWNUGWP.js';
+import { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullAgent, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, generateId, commonGetErrorResponses, loggerFactory, getConversation, createDefaultCredentialStores, CredentialStoreRegistry, createTask, getTask, updateTask, setSpanWithError, AGENT_EXECUTION_TRANSFER_COUNT_DEFAULT, updateConversation, handleApiError, TaskState, getAgentById, getProject, setActiveAgentForThread, getRelatedAgentsForAgent, getExternalAgentsForSubAgent, getTeamAgentsForSubAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT, CONVERSATION_HISTORY_DEFAULT_LIMIT, ModelFactory, verifyTempToken, validateAndGetApiKey, verifyServiceToken, validateTargetAgent, ContextResolver, CredentialStuffer, MCPServerType, getUserScopedCredentialReference, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, jsonSchemaToZod, getContextConfigById, getFullAgentDefinition, TemplateEngine, listTaskIdsByContextId, getLedgerArtifacts, agentHasArtifactComponents, upsertLedgerArtifact, MCPTransportType, SPAN_KEYS, headers, generateServiceToken } from '@inkeep/agents-core';
 import { otel } from '@hono/otel';
 import { OpenAPIHono, createRoute, z } from '@hono/zod-openapi';
 import { trace, propagation, context, SpanStatusCode } from '@opentelemetry/api';
@@ -25,6 +25,10 @@ import { StreamableHTTPServerTransport } from '@alcyone-labs/modelcontextprotoco
 import { toReqRes, toFetchResponse } from 'fetch-to-node';
 
 // src/types/execution-context.ts
+function getUserIdFromContext(ctx) {
+  const metadata = ctx.metadata;
+  return metadata?.initiatedBy?.type === "user" ? metadata.initiatedBy.id : void 0;
+}
 function createExecutionContext(params) {
   return {
     apiKey: params.apiKey,
@@ -2659,13 +2663,30 @@ var AgentSession = class {
   /**
    * Clean up status update resources when session ends
    */
-  cleanup() {
+  async cleanup() {
     this.isEnded = true;
     if (this.statusUpdateTimer) {
       clearInterval(this.statusUpdateTimer);
       this.statusUpdateTimer = void 0;
     }
     this.statusUpdateState = void 0;
+    if (this.pendingArtifacts.size > 0) {
+      const maxWaitTime = 1e4;
+      const startTime = Date.now();
+      while (this.pendingArtifacts.size > 0 && Date.now() - startTime < maxWaitTime) {
+        await new Promise((resolve) => setTimeout(resolve, 100));
+      }
+      if (this.pendingArtifacts.size > 0) {
+        logger7.warn(
+          {
+            sessionId: this.sessionId,
+            pendingCount: this.pendingArtifacts.size,
+            pendingIds: Array.from(this.pendingArtifacts)
+          },
+          "Cleanup proceeding with pending artifacts still processing"
+        );
+      }
+    }
     this.pendingArtifacts.clear();
     this.artifactProcessingErrors.clear();
     this.artifactCache.clear();
@@ -3440,6 +3461,9 @@ Make it specific and relevant.`;
             result = object;
           }
           try {
+            if (!this.artifactService) {
+              throw new Error("ArtifactService is not initialized");
+            }
             await this.artifactService.saveArtifact({
               artifactId: artifactData.artifactId,
               name: result.name,
@@ -3629,7 +3653,7 @@ var AgentSessionManager = class {
   /**
    * End a session and return the final event data
    */
-  endSession(sessionId) {
+  async endSession(sessionId) {
     const session = this.sessions.get(sessionId);
     if (!session) {
       logger7.warn({ sessionId }, "Attempted to end non-existent session");
@@ -3638,7 +3662,7 @@ var AgentSessionManager = class {
     const events = session.getEvents();
     const summary = session.getSummary();
     logger7.info({ sessionId, summary }, "AgentSession ended");
-    session.cleanup();
+    await session.cleanup();
     this.sessions.delete(sessionId);
     return events;
   }
@@ -4463,46 +4487,6 @@ function errorOp(message, subAgentId, severity = "error", code) {
 function generateToolId() {
   return `tool_${generateId(8)}`;
 }
-var logger11 = getLogger("DataComponentSchema");
-function jsonSchemaToZod(jsonSchema) {
-  if (!jsonSchema || typeof jsonSchema !== "object") {
-    logger11.warn({ jsonSchema }, "Invalid JSON schema provided, using string fallback");
-    return z.string();
-  }
-  switch (jsonSchema.type) {
-    case "object":
-      if (jsonSchema.properties) {
-        const shape = {};
-        for (const [key, prop] of Object.entries(jsonSchema.properties)) {
-          shape[key] = jsonSchemaToZod(prop);
-        }
-        return z.object(shape);
-      }
-      return z.record(z.string(), z.unknown());
-    case "array": {
-      const itemSchema = jsonSchema.items ? jsonSchemaToZod(jsonSchema.items) : z.unknown();
-      return z.array(itemSchema);
-    }
-    case "string":
-      return z.string();
-    case "number":
-    case "integer":
-      return z.number();
-    case "boolean":
-      return z.boolean();
-    case "null":
-      return z.null();
-    default:
-      logger11.warn(
-        {
-          unsupportedType: jsonSchema.type,
-          schema: jsonSchema
-        },
-        "Unsupported JSON schema type, using unknown validation"
-      );
-      return z.unknown();
-  }
-}
 var SchemaProcessor = class _SchemaProcessor {
   static logger = getLogger("SchemaProcessor");
   /**
@@ -4859,7 +4843,7 @@ function parseEmbeddedJson(data) {
 }
 
 // src/a2a/client.ts
-var logger12 = getLogger("a2aClient");
+var logger11 = getLogger("a2aClient");
 var DEFAULT_BACKOFF = {
   initialInterval: 500,
   maxInterval: 6e4,
@@ -5066,7 +5050,7 @@ var A2AClient = class {
       try {
         const res = await fn();
         if (attempt > 0) {
-          logger12.info(
+          logger11.info(
             {
               attempts: attempt + 1,
               elapsedTime: Date.now() - start
@@ -5081,7 +5065,7 @@ var A2AClient = class {
         }
         const elapsed = Date.now() - start;
         if (elapsed > maxElapsedTime) {
-          logger12.warn(
+          logger11.warn(
             {
               attempts: attempt + 1,
               elapsedTime: elapsed,
@@ -5102,7 +5086,7 @@ var A2AClient = class {
           retryInterval = initialInterval * attempt ** exponent + Math.random() * 1e3;
         }
         const delayMs = Math.min(retryInterval, maxInterval);
-        logger12.info(
+        logger11.info(
           {
             attempt: attempt + 1,
             delayMs,
@@ -5193,7 +5177,7 @@ var A2AClient = class {
       });
     }
     if (rpcResponse.id !== requestId2) {
-      logger12.warn(
+      logger11.warn(
         {
           method,
           expectedId: requestId2,
@@ -5390,7 +5374,7 @@ var A2AClient = class {
     try {
       while (true) {
         const { done, value } = await reader.read();
-        logger12.info({ done, value }, "parseA2ASseStream");
+        logger11.info({ done, value }, "parseA2ASseStream");
         if (done) {
           if (eventDataBuffer.trim()) {
             const result = this._processSseEventData(
@@ -5477,7 +5461,7 @@ var A2AClient = class {
 };
 
 // src/agents/relationTools.ts
-var logger13 = getLogger("relationships Tools");
+var logger12 = getLogger("relationships Tools");
 var A2A_RETRY_STATUS_CODES = ["429", "500", "502", "503", "504"];
 var generateTransferToolDescription = (config) => {
   let toolsSection = "";
@@ -5588,7 +5572,7 @@ var createTransferToAgentTool = ({
           [SPAN_KEYS.TRANSFER_TO_SUB_AGENT_ID]: transferConfig.id ?? "unknown"
         });
       }
-      logger13.info(
+      logger12.info(
         {
           transferTo: transferConfig.id ?? "unknown",
           fromSubAgent: callingAgentId
@@ -5609,7 +5593,7 @@ var createTransferToAgentTool = ({
         fromSubAgentId: callingAgentId
         // Include the calling agent ID for tracking
       };
-      logger13.info(
+      logger12.info(
         {
           transferResult,
           transferResultKeys: Object.keys(transferResult)
@@ -5756,7 +5740,7 @@ function createDelegateToAgentTool({
           ...isInternal ? { fromSubAgentId: callingAgentId } : { fromExternalAgentId: callingAgentId }
         }
       };
-      logger13.info({ messageToSend }, "messageToSend");
+      logger12.info({ messageToSend }, "messageToSend");
       await createMessage(dbClient_default)({
         id: generateId(),
         tenantId,
@@ -5818,7 +5802,7 @@ function createDelegateToAgentTool({
 }
 
 // src/agents/SystemPromptBuilder.ts
-var logger14 = getLogger("SystemPromptBuilder");
+var logger13 = getLogger("SystemPromptBuilder");
 var SystemPromptBuilder = class {
   constructor(version, versionConfig) {
     this.version = version;
@@ -5834,12 +5818,12 @@ var SystemPromptBuilder = class {
         this.templates.set(name, content);
       }
       this.loaded = true;
-      logger14.debug(
+      logger13.debug(
         { templateCount: this.templates.size, version: this.version },
         `Loaded ${this.templates.size} templates for version ${this.version}`
       );
     } catch (error) {
-      logger14.error({ error }, `Failed to load templates for version ${this.version}`);
+      logger13.error({ error }, `Failed to load templates for version ${this.version}`);
       throw new Error(`Template loading failed: ${error}`);
     }
   }
@@ -6079,7 +6063,14 @@ var Phase1Config = class _Phase1Config {
       throw new Error("System prompt template not loaded");
     }
     let systemPrompt = systemPromptTemplate;
-    systemPrompt = systemPrompt.replace("{{CORE_INSTRUCTIONS}}", config.corePrompt);
+    if (config.corePrompt && config.corePrompt.trim()) {
+      systemPrompt = systemPrompt.replace("{{CORE_INSTRUCTIONS}}", config.corePrompt);
+    } else {
+      systemPrompt = systemPrompt.replace(
+        /<core_instructions>\s*\{\{CORE_INSTRUCTIONS\}\}\s*<\/core_instructions>/g,
+        ""
+      );
+    }
     const agentContextSection = this.generateAgentContextSection(config.prompt);
     systemPrompt = systemPrompt.replace("{{AGENT_CONTEXT_SECTION}}", agentContextSection);
     const toolData = this.isToolDataArray(config.tools) ? config.tools : _Phase1Config.convertMcpToolsToToolData(config.tools);
@@ -6109,7 +6100,7 @@ var Phase1Config = class _Phase1Config {
     return systemPrompt;
   }
   generateAgentContextSection(prompt) {
-    if (!prompt) {
+    if (!prompt || prompt.trim() === "") {
       return "";
     }
     return `
@@ -6246,6 +6237,8 @@ THE details PROPERTY MUST CONTAIN JMESPATH SELECTORS THAT EXTRACT DATA FROM THE
 \u274C NEVER: [?text ~ contains(@, 'word')] (~ with @ operator)
 \u274C NEVER: contains(@, 'text') (@ operator usage)
 \u274C NEVER: [?field=="value"] (double quotes in filters)
+\u274C NEVER: [?field=='value'] (escaped quotes in filters)  
+\u274C NEVER: [?field=='"'"'value'"'"'] (nightmare quote mixing)
 \u274C NEVER: result.items[?type=='doc'][?status=='active'] (chained filters)
 
 \u2705 CORRECT JMESPATH SYNTAX:
@@ -6257,6 +6250,11 @@ THE details PROPERTY MUST CONTAIN JMESPATH SELECTORS THAT EXTRACT DATA FROM THE
 \u2705 [?contains(text, 'Founder')] (contains haystack, needle format)
 \u2705 source.content[?contains(text, 'Founder')].text (correct filter usage)
 
+\u{1F6A8} MANDATORY QUOTE PATTERN - FOLLOW EXACTLY:
+- ALWAYS: base="path[?field=='value']" (double quotes outside, single inside)
+- This is the ONLY allowed pattern - any other pattern WILL FAIL
+- NEVER escape quotes, NEVER mix quote types, NEVER use complex quoting
+
 \u{1F6A8} CRITICAL: EXAMINE TOOL RESULTS BEFORE CREATING SELECTORS! \u{1F6A8}
 
 STEP 1: INSPECT THE ACTUAL DATA FIRST
@@ -6295,7 +6293,7 @@ Only use artifact:ref when you need to cite the SAME artifact again for a differ
 Format: <artifact:ref id="artifact-id" tool="tool_call_id" />
 
 EXAMPLE TEXT RESPONSE:
-"I found the authentication documentation. <artifact:create id='auth-doc-1' tool='call_xyz789' type='APIDoc' base='result.documents[?type=="auth"]' details='{"title":"metadata.title","endpoint":"api.endpoint","description":"content.description","parameters":"spec.parameters","examples":"examples.sample_code"}' /> The documentation explains OAuth 2.0 implementation in detail.
+"I found the authentication documentation. <artifact:create id='auth-doc-1' tool='call_xyz789' type='APIDoc' base="result.documents[?type=='auth']" details='{"title":"metadata.title","endpoint":"api.endpoint","description":"content.description","parameters":"spec.parameters","examples":"examples.sample_code"}' /> The documentation explains OAuth 2.0 implementation in detail.
 
 The process involves three main steps: registration, token exchange, and API calls. As mentioned in the authentication documentation <artifact:ref id='auth-doc-1' tool='call_xyz789' />, you'll need to register your application first."
 
@@ -6793,7 +6791,7 @@ ${componentDescriptions}`;
     dataComponentXml = dataComponentXml.replace("{{COMPONENT_NAME}}", dataComponent.name);
     dataComponentXml = dataComponentXml.replace(
       "{{COMPONENT_DESCRIPTION}}",
-      dataComponent.description
+      dataComponent.description || ""
     );
     dataComponentXml = dataComponentXml.replace(
       "{{COMPONENT_PROPS_SCHEMA}}",
@@ -6889,7 +6887,14 @@ ${artifact_retrieval_guidance_default}
       artifactComponents
     );
     let phase2Prompt = system_prompt_default2;
-    phase2Prompt = phase2Prompt.replace("{{CORE_INSTRUCTIONS}}", corePrompt);
+    if (corePrompt && corePrompt.trim()) {
+      phase2Prompt = phase2Prompt.replace("{{CORE_INSTRUCTIONS}}", corePrompt);
+    } else {
+      phase2Prompt = phase2Prompt.replace(
+        /<core_instructions>\s*\{\{CORE_INSTRUCTIONS\}\}\s*<\/core_instructions>/g,
+        ""
+      );
+    }
     phase2Prompt = phase2Prompt.replace("{{DATA_COMPONENTS_SECTION}}", dataComponentsSection);
     phase2Prompt = phase2Prompt.replace("{{ARTIFACTS_SECTION}}", artifactsSection);
     phase2Prompt = phase2Prompt.replace("{{ARTIFACT_GUIDANCE_SECTION}}", artifactGuidance);
@@ -6908,7 +6913,7 @@ function hasToolCallWithPrefix(prefix) {
     return false;
   };
 }
-var logger15 = getLogger("Agent");
+var logger14 = getLogger("Agent");
 function validateModel(modelString, modelType) {
   if (!modelString?.trim()) {
     throw new Error(
@@ -7014,6 +7019,32 @@ var Agent = class {
     }
     return sanitizedTools;
   }
+  #createRelationToolName(prefix, targetId) {
+    return `${prefix}_to_${targetId.toLowerCase().replace(/\s+/g, "_")}`;
+  }
+  #getRelationshipIdForTool(toolName, toolType) {
+    if (toolType === "mcp") {
+      const matchingTool = this.config.tools?.find((tool3) => {
+        if (tool3.config?.type !== "mcp") {
+          return false;
+        }
+        if (tool3.availableTools?.some((available) => available.name === toolName)) {
+          return true;
+        }
+        if (tool3.config.mcp.activeTools?.includes(toolName)) {
+          return true;
+        }
+        return tool3.name === toolName;
+      });
+      return matchingTool?.relationshipId;
+    }
+    if (toolType === "delegation") {
+      const relation = this.config.delegateRelations.find(
+        (relation2) => this.#createRelationToolName("delegate", relation2.config.id) === toolName
+      );
+      return relation?.config.relationId;
+    }
+  }
   /**
    * Get the primary model settings for text generation and thinking
    * Requires model to be configured at project level
@@ -7082,10 +7113,11 @@ var Agent = class {
   /**
    * Wraps a tool with streaming lifecycle tracking (start, complete, error) and AgentSession recording
    */
-  wrapToolWithStreaming(toolName, toolDefinition, streamRequestId, toolType, relationshipId, options) {
+  wrapToolWithStreaming(toolName, toolDefinition, streamRequestId, toolType, options) {
     if (!toolDefinition || typeof toolDefinition !== "object" || !("execute" in toolDefinition)) {
       return toolDefinition;
     }
+    const relationshipId = this.#getRelationshipIdForTool(toolName, toolType);
     const originalExecute = toolDefinition.execute;
     return {
       ...toolDefinition,
@@ -7154,7 +7186,7 @@ var Agent = class {
               };
               await createMessage(dbClient_default)(messagePayload);
             } catch (error) {
-              logger15.warn(
+              logger14.warn(
                 { error, toolName, toolCallId, conversationId: toolResultConversationId },
                 "Failed to store tool result in conversation history"
               );
@@ -7192,10 +7224,9 @@ var Agent = class {
   }
   getRelationTools(runtimeContext, sessionId) {
     const { transferRelations = [], delegateRelations = [] } = this.config;
-    const createToolName = (prefix, subAgentId) => `${prefix}_to_${subAgentId.toLowerCase().replace(/\s+/g, "_")}`;
     return Object.fromEntries([
       ...transferRelations.map((agentConfig) => {
-        const toolName = createToolName("transfer", agentConfig.id);
+        const toolName = this.#createRelationToolName("transfer", agentConfig.id);
         return [
           toolName,
           this.wrapToolWithStreaming(
@@ -7212,7 +7243,7 @@ var Agent = class {
         ];
       }),
       ...delegateRelations.map((relation) => {
-        const toolName = createToolName("delegate", relation.config.id);
+        const toolName = this.#createRelationToolName("delegate", relation.config.id);
         return [
           toolName,
           this.wrapToolWithStreaming(
@@ -7249,8 +7280,7 @@ var Agent = class {
     const tools = await Promise.all(mcpTools.map((tool3) => this.getMcpTool(tool3)) || []) || [];
     if (!sessionId) {
       const wrappedTools2 = {};
-      for (const [index, toolSet] of tools.entries()) {
-        const relationshipId = mcpTools[index]?.relationshipId;
+      for (const toolSet of tools) {
         for (const [toolName, toolDef] of Object.entries(toolSet.tools)) {
           const needsApproval = toolSet.toolPolicies?.[toolName]?.needsApproval || false;
           const enhancedTool = {
@@ -7262,7 +7292,6 @@ var Agent = class {
             enhancedTool,
             streamRequestId,
             "mcp",
-            relationshipId,
             { needsApproval }
           );
         }
@@ -7270,15 +7299,14 @@ var Agent = class {
       return wrappedTools2;
     }
     const wrappedTools = {};
-    for (const [index, toolResult] of tools.entries()) {
-      const relationshipId = mcpTools[index]?.relationshipId;
+    for (const toolResult of tools) {
       for (const [toolName, originalTool] of Object.entries(toolResult.tools)) {
         if (!isValidTool(originalTool)) {
-          logger15.error({ toolName }, "Invalid MCP tool structure - missing required properties");
+          logger14.error({ toolName }, "Invalid MCP tool structure - missing required properties");
           continue;
         }
         const needsApproval = toolResult.toolPolicies?.[toolName]?.needsApproval || false;
-        logger15.debug(
+        logger14.debug(
           {
             toolName,
             toolPolicies: toolResult.toolPolicies,
@@ -7292,7 +7320,7 @@ var Agent = class {
           inputSchema: originalTool.inputSchema,
           execute: async (args, { toolCallId }) => {
             if (needsApproval) {
-              logger15.info(
+              logger14.info(
                 { toolName, toolCallId, args },
                 "Tool requires approval - waiting for user response"
               );
@@ -7338,7 +7366,7 @@ var Agent = class {
                     }
                   },
                   (denialSpan) => {
-                    logger15.info(
+                    logger14.info(
                       { toolName, toolCallId, reason: approvalResult.reason },
                       "Tool execution denied by user"
                     );
@@ -7359,18 +7387,18 @@ var Agent = class {
                   }
                 },
                 (approvedSpan) => {
-                  logger15.info({ toolName, toolCallId }, "Tool approved, continuing with execution");
+                  logger14.info({ toolName, toolCallId }, "Tool approved, continuing with execution");
                   approvedSpan.setStatus({ code: SpanStatusCode.OK });
                   approvedSpan.end();
                 }
               );
             }
-            logger15.debug({ toolName, toolCallId }, "MCP Tool Called");
+            logger14.debug({ toolName, toolCallId }, "MCP Tool Called");
             try {
               const rawResult = await originalTool.execute(args, { toolCallId });
               if (rawResult && typeof rawResult === "object" && rawResult.isError) {
                 const errorMessage = rawResult.content?.[0]?.text || "MCP tool returned an error";
-                logger15.error(
+                logger14.error(
                   { toolName, toolCallId, errorMessage, rawResult },
                   "MCP tool returned error status"
                 );
@@ -7382,6 +7410,7 @@ var Agent = class {
                   timestamp: Date.now()
                 });
                 if (streamRequestId) {
+                  const relationshipId = this.#getRelationshipIdForTool(toolName, "mcp");
                   agentSessionManager.recordEvent(streamRequestId, "error", this.config.id, {
                     message: `MCP tool "${toolName}" failed: ${errorMessage}`,
                     code: "mcp_tool_error",
@@ -7420,7 +7449,7 @@ var Agent = class {
               });
               return { result: enhancedResult, toolCallId };
             } catch (error) {
-              logger15.error({ toolName, toolCallId, error }, "MCP tool execution failed");
+              logger14.error({ toolName, toolCallId, error }, "MCP tool execution failed");
               throw error;
             }
           }
@@ -7430,7 +7459,6 @@ var Agent = class {
           sessionWrappedTool,
           streamRequestId,
           "mcp",
-          relationshipId,
           { needsApproval }
         );
       }
@@ -7475,7 +7503,51 @@ var Agent = class {
     const selectedTools = toolRelation?.selectedTools || void 0;
     const toolPolicies = toolRelation?.toolPolicies || {};
     let serverConfig;
-    if (credentialReferenceId && this.credentialStuffer) {
+    const isUserScoped = tool3.credentialScope === "user";
+    const userId = this.config.userId;
+    if (isUserScoped && userId && this.credentialStuffer) {
+      const userCredentialReference = await getUserScopedCredentialReference(dbClient_default)({
+        scopes: {
+          tenantId: this.config.tenantId,
+          projectId: this.config.projectId
+        },
+        toolId: tool3.id,
+        userId
+      });
+      if (userCredentialReference) {
+        const storeReference = {
+          credentialStoreId: userCredentialReference.credentialStoreId,
+          retrievalParams: userCredentialReference.retrievalParams || {}
+        };
+        serverConfig = await this.credentialStuffer.buildMcpServerConfig(
+          {
+            tenantId: this.config.tenantId,
+            projectId: this.config.projectId,
+            contextConfigId: this.config.contextConfigId || void 0,
+            conversationId: this.conversationId || void 0
+          },
+          this.convertToMCPToolConfig(tool3, agentToolRelationHeaders),
+          storeReference,
+          selectedTools
+        );
+      } else {
+        logger14.warn(
+          { toolId: tool3.id, userId },
+          "User-scoped tool has no credential connected for this user"
+        );
+        serverConfig = await this.credentialStuffer.buildMcpServerConfig(
+          {
+            tenantId: this.config.tenantId,
+            projectId: this.config.projectId,
+            contextConfigId: this.config.contextConfigId || void 0,
+            conversationId: this.conversationId || void 0
+          },
+          this.convertToMCPToolConfig(tool3, agentToolRelationHeaders),
+          void 0,
+          selectedTools
+        );
+      }
+    } else if (credentialReferenceId && this.credentialStuffer) {
       const credentialReference = await getCredentialReference(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
@@ -7525,7 +7597,7 @@ var Agent = class {
         headers: agentToolRelationHeaders
       };
     }
-    logger15.info(
+    logger14.info(
       {
         toolName: tool3.name,
         credentialReferenceId,
@@ -7550,7 +7622,7 @@ var Agent = class {
         this.mcpClientCache.set(cacheKey, client);
       } catch (error) {
         this.mcpConnectionLocks.delete(cacheKey);
-        logger15.error(
+        logger14.error(
           {
             toolName: tool3.name,
             subAgentId: this.config.id,
@@ -7615,7 +7687,7 @@ var Agent = class {
       await client.connect();
       return client;
     } catch (error) {
-      logger15.error(
+      logger14.error(
         {
           toolName: tool3.name,
           subAgentId: this.config.id,
@@ -7652,12 +7724,12 @@ var Agent = class {
       if (functionToolsData.length === 0) {
         return functionTools;
       }
-      const { SandboxExecutorFactory } = await import('./SandboxExecutorFactory-A2LTPE2X.js');
+      const { SandboxExecutorFactory } = await import('./SandboxExecutorFactory-2N27SE3B.js');
       const sandboxExecutor = SandboxExecutorFactory.getInstance();
       for (const functionToolDef of functionToolsData) {
         const functionId = functionToolDef.functionId;
         if (!functionId) {
-          logger15.warn(
+          logger14.warn(
             { functionToolId: functionToolDef.id },
             "Function tool missing functionId reference"
           );
@@ -7671,7 +7743,7 @@ var Agent = class {
           }
         });
         if (!functionData) {
-          logger15.warn(
+          logger14.warn(
             { functionId, functionToolId: functionToolDef.id },
             "Function not found in functions table"
           );
@@ -7682,7 +7754,7 @@ var Agent = class {
           description: functionToolDef.description || functionToolDef.name,
           inputSchema: zodSchema,
           execute: async (args, { toolCallId }) => {
-            logger15.debug(
+            logger14.debug(
               { toolName: functionToolDef.name, toolCallId, args },
               "Function Tool Called"
             );
@@ -7709,7 +7781,7 @@ var Agent = class {
               });
               return { result, toolCallId };
             } catch (error) {
-              logger15.error(
+              logger14.error(
                 {
                   toolName: functionToolDef.name,
                   toolCallId,
@@ -7729,7 +7801,7 @@ var Agent = class {
         );
       }
     } catch (error) {
-      logger15.error({ error }, "Failed to load function tools from database");
+      logger14.error({ error }, "Failed to load function tools from database");
     }
     return functionTools;
   }
@@ -7739,7 +7811,7 @@ var Agent = class {
   async getResolvedContext(conversationId, headers2) {
     try {
       if (!this.config.contextConfigId) {
-        logger15.debug({ agentId: this.config.agentId }, "No context config found for agent");
+        logger14.debug({ agentId: this.config.agentId }, "No context config found for agent");
         return null;
       }
       const contextConfig = await getContextConfigById(dbClient_default)({
@@ -7751,7 +7823,7 @@ var Agent = class {
         id: this.config.contextConfigId
       });
       if (!contextConfig) {
-        logger15.warn({ contextConfigId: this.config.contextConfigId }, "Context config not found");
+        logger14.warn({ contextConfigId: this.config.contextConfigId }, "Context config not found");
         return null;
       }
       if (!this.contextResolver) {
@@ -7767,7 +7839,7 @@ var Agent = class {
         ...result.resolvedContext,
         $env: process.env
       };
-      logger15.debug(
+      logger14.debug(
         {
           conversationId,
           contextConfigId: contextConfig.id,
@@ -7781,7 +7853,7 @@ var Agent = class {
       );
       return contextWithBuiltins;
     } catch (error) {
-      logger15.error(
+      logger14.error(
         {
           conversationId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -7805,7 +7877,7 @@ var Agent = class {
       });
       return agentDefinition?.prompt || void 0;
     } catch (error) {
-      logger15.warn(
+      logger14.warn(
         {
           agentId: this.config.agentId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -7834,7 +7906,7 @@ var Agent = class {
         (subAgent) => "artifactComponents" in subAgent && subAgent.artifactComponents && subAgent.artifactComponents.length > 0
       );
     } catch (error) {
-      logger15.warn(
+      logger14.warn(
         {
           agentId: this.config.agentId,
           tenantId: this.config.tenantId,
@@ -7855,15 +7927,15 @@ var Agent = class {
     const hasAgentArtifactComponents = await this.hasAgentArtifactComponents();
     const conversationId = runtimeContext?.metadata?.conversationId || runtimeContext?.contextId;
     const resolvedContext = conversationId ? await this.getResolvedContext(conversationId) : null;
-    let processedPrompt = this.config.prompt;
-    if (resolvedContext) {
+    let processedPrompt = this.config.prompt || "";
+    if (resolvedContext && this.config.prompt) {
       try {
         processedPrompt = TemplateEngine.render(this.config.prompt, resolvedContext, {
           strict: false,
           preserveUnresolved: false
         });
       } catch (error) {
-        logger15.error(
+        logger14.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -7902,15 +7974,15 @@ var Agent = class {
       this.setConversationId(conversationId);
     }
     const resolvedContext = conversationId ? await this.getResolvedContext(conversationId) : null;
-    let processedPrompt = this.config.prompt;
-    if (resolvedContext) {
+    let processedPrompt = this.config.prompt || "";
+    if (resolvedContext && this.config.prompt) {
       try {
         processedPrompt = TemplateEngine.render(this.config.prompt, resolvedContext, {
           strict: false,
           preserveUnresolved: false
         });
       } catch (error) {
-        logger15.error(
+        logger14.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -7925,7 +7997,7 @@ var Agent = class {
     const functionTools = await this.getFunctionTools(streamRequestId || "");
     const relationTools = this.getRelationTools(runtimeContext);
     const allTools = { ...mcpTools, ...functionTools, ...relationTools };
-    logger15.info(
+    logger14.info(
       {
         mcpTools: Object.keys(mcpTools),
         functionTools: Object.keys(functionTools),
@@ -7946,7 +8018,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-33GSAG2C.js');
+    const { getConversationScopedArtifacts } = await import('./conversations-XPSTWUMK.js');
     const historyConfig = this.config.conversationHistoryConfig ?? createDefaultConversationHistoryConfig();
     const referenceArtifacts = await getConversationScopedArtifacts({
       tenantId: this.config.tenantId,
@@ -7964,7 +8036,7 @@ var Agent = class {
           preserveUnresolved: false
         });
       } catch (error) {
-        logger15.error(
+        logger14.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -7997,7 +8069,7 @@ var Agent = class {
         toolCallId: z.string().describe("The tool call ID associated with this artifact.")
       }),
       execute: async ({ artifactId, toolCallId }) => {
-        logger15.info({ artifactId, toolCallId }, "get_artifact_full executed");
+        logger14.info({ artifactId, toolCallId }, "get_artifact_full executed");
         const streamRequestId = this.getStreamRequestId();
         const artifactService = agentSessionManager.getArtifactService(streamRequestId);
         if (!artifactService) {
@@ -8293,7 +8365,7 @@ ${output}`;
       };
       return enhanced;
     } catch (error) {
-      logger15.warn({ error }, "Failed to enhance tool result with structure hints");
+      logger14.warn({ error }, "Failed to enhance tool result with structure hints");
       return result;
     }
   }
@@ -8308,7 +8380,7 @@ ${output}`;
         }
       });
     } catch (error) {
-      logger15.error(
+      logger14.error(
         { error, agentId: this.config.agentId },
         "Failed to check agent artifact components"
       );
@@ -8425,7 +8497,7 @@ ${output}`;
           const configuredTimeout = modelSettings.maxDuration ? Math.min(modelSettings.maxDuration * 1e3, LLM_GENERATION_MAX_ALLOWED_TIMEOUT_MS) : shouldStreamPhase1 ? LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_STREAMING : LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_NON_STREAMING;
           const timeoutMs = Math.min(configuredTimeout, LLM_GENERATION_MAX_ALLOWED_TIMEOUT_MS);
           if (modelSettings.maxDuration && modelSettings.maxDuration * 1e3 > LLM_GENERATION_MAX_ALLOWED_TIMEOUT_MS) {
-            logger15.warn(
+            logger14.warn(
               {
                 requestedTimeout: modelSettings.maxDuration * 1e3,
                 appliedTimeout: timeoutMs,
@@ -8467,7 +8539,7 @@ ${output}`;
                       }
                     );
                   } catch (error) {
-                    logger15.debug({ error }, "Failed to track agent reasoning");
+                    logger14.debug({ error }, "Failed to track agent reasoning");
                   }
                 }
                 if (last && last["content"] && last["content"].length > 0) {
@@ -8602,7 +8674,7 @@ ${output}`;
                       }
                     );
                   } catch (error) {
-                    logger15.debug({ error }, "Failed to track agent reasoning");
+                    logger14.debug({ error }, "Failed to track agent reasoning");
                   }
                 }
                 if (steps.length >= 2) {
@@ -8749,7 +8821,7 @@ ${output}${structureHintsFormatted}`;
                 LLM_GENERATION_MAX_ALLOWED_TIMEOUT_MS
               );
               if (structuredModelSettings.maxDuration && structuredModelSettings.maxDuration * 1e3 > LLM_GENERATION_MAX_ALLOWED_TIMEOUT_MS) {
-                logger15.warn(
+                logger14.warn(
                   {
                     requestedTimeout: structuredModelSettings.maxDuration * 1e3,
                     appliedTimeout: phase2TimeoutMs,
@@ -8925,7 +8997,7 @@ ${output}${structureHintsFormatted}`;
 };
 
 // src/agents/generateTaskHandler.ts
-var logger16 = getLogger("generateTaskHandler");
+var logger15 = getLogger("generateTaskHandler");
 var createTaskHandler = (config, credentialStoreRegistry) => {
   return async (task) => {
     try {
@@ -9043,7 +9115,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
               return { ...relation, description: enhancedDescription };
             }
           } catch (error) {
-            logger16.warn({ subAgentId: relation.id, error }, "Failed to enhance agent description");
+            logger15.warn({ subAgentId: relation.id, error }, "Failed to enhance agent description");
           }
           return relation;
         })
@@ -9101,7 +9173,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
               };
             }
           } catch (error) {
-            logger16.warn(
+            logger15.warn(
               { targetAgentId: relation.targetAgentId, error },
               "Failed to enhance team agent description"
             );
@@ -9109,7 +9181,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           return relation;
         })
       );
-      const prompt = "prompt" in config.agentSchema ? config.agentSchema.prompt : "";
+      const prompt = "prompt" in config.agentSchema ? config.agentSchema.prompt || void 0 : "";
       const models = "models" in config.agentSchema ? config.agentSchema.models : void 0;
       const stopWhen = "stopWhen" in config.agentSchema ? config.agentSchema.stopWhen : void 0;
       const toolsForAgentResult = await Promise.all(
@@ -9118,7 +9190,8 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             item.tool,
             dbClient_default,
             credentialStoreRegistry,
-            item.id
+            item.id,
+            config.userId
           );
           if (item.selectedTools && item.selectedTools.length > 0) {
             const selectedToolsSet = new Set(item.selectedTools);
@@ -9135,6 +9208,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           agentId: config.agentId,
           baseUrl: config.baseUrl,
           apiKey: config.apiKey,
+          userId: config.userId,
           name: config.name,
           description: config.description || "",
           prompt,
@@ -9148,7 +9222,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             baseUrl: config.baseUrl,
             apiKey: config.apiKey,
             name: relation.name,
-            description: relation.description,
+            description: relation.description || void 0,
             prompt: "",
             delegateRelations: [],
             subAgentRelations: [],
@@ -9188,7 +9262,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 targetTransferRelations = transferRel;
                 targetDelegateRelations = delegateRel;
               } catch (err) {
-                logger16.info(
+                logger15.info(
                   {
                     agentId: relation.id,
                     error: err?.message || "Unknown error"
@@ -9202,7 +9276,8 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                     item.tool,
                     dbClient_default,
                     credentialStoreRegistry,
-                    item.id
+                    item.id,
+                    config.userId
                   );
                   if (item.selectedTools && item.selectedTools.length > 0) {
                     const selectedToolsSet = new Set(item.selectedTools);
@@ -9251,7 +9326,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 projectId: config.projectId,
                 agentId: config.agentId,
                 name: relation.name,
-                description: relation.description,
+                description: relation.description || void 0,
                 prompt: "",
                 delegateRelations: targetDelegateRelationsConfig,
                 subAgentRelations: [],
@@ -9266,13 +9341,14 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
               type: "internal",
               config: {
                 id: relation.id,
+                relationId: relation.relationId,
                 tenantId: config.tenantId,
                 projectId: config.projectId,
                 agentId: config.agentId,
                 baseUrl: config.baseUrl,
                 apiKey: config.apiKey,
                 name: relation.name,
-                description: relation.description,
+                description: relation.description || void 0,
                 prompt: "",
                 delegateRelations: [],
                 // Simplified - no nested relations
@@ -9327,7 +9403,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         const taskIdMatch = task.id.match(/^task_([^-]+-[^-]+-\d+)-/);
         if (taskIdMatch) {
           contextId = taskIdMatch[1];
-          logger16.info(
+          logger15.info(
             {
               taskId: task.id,
               extractedContextId: contextId,
@@ -9345,7 +9421,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       agent.setDelegationStatus(isDelegation);
       agent.setDelegationId(delegationId);
       if (isDelegation) {
-        logger16.info(
+        logger15.info(
           { subAgentId: config.subAgentId, taskId: task.id, delegationId },
           "Delegated agent - streaming disabled"
         );
@@ -9382,7 +9458,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             const toolResult = allToolResults.find(
               (result) => result.toolCallId === toolCall.toolCallId
             );
-            logger16.info(
+            logger15.info(
               {
                 toolCallName: toolCall.toolName,
                 toolCallId: toolCall.toolCallId,
@@ -9399,7 +9475,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             const transferReason = responseText || allThoughts[allThoughts.length - 1]?.text || "Agent requested transfer. No reason provided.";
             if (toolResult?.output && isValidTransferResult(toolResult.output)) {
               const transferResult = toolResult.output;
-              logger16.info(
+              logger15.info(
                 {
                   validationPassed: true,
                   transferResult,
@@ -9416,7 +9492,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 reason: transferReason,
                 original_message: userMessage
               };
-              logger16.info(
+              logger15.info(
                 {
                   artifactData,
                   artifactDataKeys: Object.keys(artifactData)
@@ -9441,7 +9517,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 ]
               };
             }
-            logger16.warn(
+            logger15.warn(
               {
                 hasToolResult: !!toolResult,
                 hasOutput: !!toolResult?.output,
@@ -9470,7 +9546,9 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
     } catch (error) {
       console.error("Task handler error:", error);
       const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
-      const isConnectionRefused = errorMessage.includes("Connection refused. Please check if the MCP server is running.");
+      const isConnectionRefused = errorMessage.includes(
+        "Connection refused. Please check if the MCP server is running."
+      );
       return {
         status: {
           state: TaskState.Failed,
@@ -9522,15 +9600,16 @@ var createTaskHandlerConfig = async (params) => {
     baseUrl: params.baseUrl,
     apiKey: params.apiKey,
     name: subAgent.name,
-    description: subAgent.description,
+    description: subAgent.description || void 0,
     conversationHistoryConfig: effectiveConversationHistoryConfig,
     contextConfigId: agent?.contextConfigId || void 0,
-    sandboxConfig: params.sandboxConfig
+    sandboxConfig: params.sandboxConfig,
+    userId: params.userId
   };
 };
 
 // src/data/agents.ts
-var logger17 = getLogger("agents");
+var logger16 = getLogger("agents");
 function createAgentCard({
   dbAgent,
   baseUrl
@@ -9600,7 +9679,8 @@ async function hydrateAgent({
   baseUrl,
   apiKey,
   credentialStoreRegistry,
-  sandboxConfig
+  sandboxConfig,
+  userId
 }) {
   try {
     const taskHandlerConfig = await createTaskHandlerConfig({
@@ -9610,7 +9690,8 @@ async function hydrateAgent({
       subAgentId: dbAgent.id,
       baseUrl,
       apiKey,
-      sandboxConfig
+      sandboxConfig,
+      userId
     });
     const taskHandler = createTaskHandler(taskHandlerConfig, credentialStoreRegistry);
     const agentCard = createAgentCard({
@@ -9633,12 +9714,13 @@ async function hydrateAgent({
 async function getRegisteredAgent(params) {
   const { executionContext, credentialStoreRegistry, sandboxConfig } = params;
   const { tenantId, projectId, agentId, subAgentId, baseUrl, apiKey } = executionContext;
+  const userId = getUserIdFromContext(executionContext);
   let dbAgent;
   if (!subAgentId) {
     const agent = await getAgentWithDefaultSubAgent(dbClient_default)({
       scopes: { tenantId, projectId, agentId }
     });
-    logger17.info({ agent }, "agent with default sub agent");
+    logger16.info({ agent }, "agent with default sub agent");
     if (!agent || !agent.defaultSubAgent) {
       return null;
     }
@@ -9663,13 +9745,14 @@ async function getRegisteredAgent(params) {
     baseUrl: agentFrameworkBaseUrl,
     credentialStoreRegistry,
     apiKey,
-    sandboxConfig
+    sandboxConfig,
+    userId
   });
 }
 
 // src/routes/agents.ts
 var app = new OpenAPIHono();
-var logger18 = getLogger("agents");
+var logger17 = getLogger("agents");
 app.openapi(
   createRoute({
     method: "get",
@@ -9707,7 +9790,7 @@ app.openapi(
       tracestate: c.req.header("tracestate"),
       baggage: c.req.header("baggage")
     };
-    logger18.info(
+    logger17.info(
       {
         otelHeaders,
         path: c.req.path,
@@ -9717,8 +9800,8 @@ app.openapi(
     );
     const executionContext = getRequestExecutionContext(c);
     const { tenantId, projectId, agentId, subAgentId } = executionContext;
-    logger18.info({ executionContext }, "executionContext");
-    logger18.info(
+    logger17.info({ executionContext }, "executionContext");
+    logger17.info(
       {
         message: "getRegisteredAgent (agent-level)",
         tenantId,
@@ -9735,7 +9818,7 @@ app.openapi(
       credentialStoreRegistry: credentialStores,
       sandboxConfig
     });
-    logger18.info({ agent }, "agent registered: well-known agent.json");
+    logger17.info({ agent }, "agent registered: well-known agent.json");
     if (!agent) {
       throw createApiError({
         code: "not_found",
@@ -9751,7 +9834,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,
@@ -9762,7 +9845,7 @@ app.post("/a2a", async (c) => {
   const executionContext = getRequestExecutionContext(c);
   const { tenantId, projectId, agentId, subAgentId } = executionContext;
   if (subAgentId) {
-    logger18.info(
+    logger17.info(
       {
         message: "a2a (agent-level)",
         tenantId,
@@ -9791,7 +9874,7 @@ app.post("/a2a", async (c) => {
     }
     return a2aHandler(c, agent2);
   }
-  logger18.info(
+  logger17.info(
     {
       message: "a2a (agent-level)",
       tenantId,
@@ -9869,14 +9952,14 @@ function extractTransferData(task) {
 }
 
 // src/a2a/transfer.ts
-var logger19 = getLogger("Transfer");
+var logger18 = getLogger("Transfer");
 async function executeTransfer({
   tenantId,
   threadId,
   projectId,
   targetSubAgentId
 }) {
-  logger19.info(
+  logger18.info(
     {
       targetAgent: targetSubAgentId,
       threadId,
@@ -9891,12 +9974,12 @@ async function executeTransfer({
       threadId,
       subAgentId: targetSubAgentId
     });
-    logger19.info(
+    logger18.info(
       { targetAgent: targetSubAgentId, threadId },
       "Successfully updated active_sub_agent_id in database"
     );
   } catch (error) {
-    logger19.error(
+    logger18.error(
       { error, targetAgent: targetSubAgentId, threadId },
       "Failed to update active_sub_agent_id"
     );
@@ -10460,7 +10543,7 @@ function createBufferingStreamHelper() {
 var createMCPStreamHelper = createBufferingStreamHelper;
 
 // src/handlers/executionHandler.ts
-var logger20 = getLogger("ExecutionHandler");
+var logger19 = getLogger("ExecutionHandler");
 var ExecutionHandler = class {
   MAX_ERRORS = AGENT_EXECUTION_MAX_CONSECUTIVE_ERRORS;
   /**
@@ -10493,7 +10576,7 @@ var ExecutionHandler = class {
     if (emitOperations) {
       agentSessionManager.enableEmitOperations(requestId2);
     }
-    logger20.info(
+    logger19.info(
       { sessionId: requestId2, agentId, conversationId, emitOperations },
       "Created AgentSession for message execution"
     );
@@ -10526,7 +10609,7 @@ var ExecutionHandler = class {
             );
           }
         } catch (modelError) {
-          logger20.warn(
+          logger19.warn(
             {
               error: modelError instanceof Error ? modelError.message : "Unknown error",
               agentId
@@ -10541,7 +10624,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
@@ -10557,7 +10640,7 @@ var ExecutionHandler = class {
     try {
       await sseHelper.writeOperation(agentInitializingOp(requestId2, agentId));
       const taskId = `task_${conversationId}-${requestId2}`;
-      logger20.info(
+      logger19.info(
         { taskId, currentAgentId, conversationId, requestId: requestId2 },
         "Attempting to create or reuse existing task"
       );
@@ -10581,7 +10664,7 @@ var ExecutionHandler = class {
             sub_agent_id: currentAgentId
           }
         });
-        logger20.info(
+        logger19.info(
           {
             taskId,
             createdTaskMetadata: Array.isArray(task) ? task[0]?.metadata : task?.metadata
@@ -10590,27 +10673,27 @@ var ExecutionHandler = class {
         );
       } catch (error) {
         if (error?.cause?.code === "23505") {
-          logger20.info(
+          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(
+            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(),
           executionType: "create_initial_task",
@@ -10629,7 +10712,7 @@ var ExecutionHandler = class {
       const maxTransfers = agentConfig?.stopWhen?.transferCountIs ?? AGENT_EXECUTION_TRANSFER_COUNT_DEFAULT;
       while (iterations < maxTransfers) {
         iterations++;
-        logger20.info(
+        logger19.info(
           { iterations, currentAgentId, agentId, conversationId, fromSubAgentId },
           `Execution loop iteration ${iterations} with agent ${currentAgentId}, transfer from: ${fromSubAgentId || "none"}`
         );
@@ -10637,10 +10720,10 @@ var ExecutionHandler = class {
           scopes: { tenantId, projectId },
           conversationId
         });
-        logger20.info({ activeAgent }, "activeAgent");
+        logger19.info({ activeAgent }, "activeAgent");
         if (activeAgent && activeAgent.activeSubAgentId !== currentAgentId) {
           currentAgentId = activeAgent.activeSubAgentId;
-          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, {
@@ -10681,13 +10764,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.writeOperation(errorOp(errorMessage2, currentAgentId || "system"));
             if (task) {
               await updateTask(dbClient_default)({
@@ -10702,7 +10785,7 @@ var ExecutionHandler = class {
                 }
               });
             }
-            agentSessionManager.endSession(requestId2);
+            await agentSessionManager.endSession(requestId2);
             unregisterStreamHelper(requestId2);
             return { success: false, error: errorMessage2, iterations };
           }
@@ -10711,7 +10794,7 @@ var ExecutionHandler = class {
         if (isTransferTask(messageResponse.result)) {
           const transferData = extractTransferData(messageResponse.result);
           if (!transferData) {
-            logger20.error(
+            logger19.error(
               { result: messageResponse.result },
               "Transfer detected but no transfer data found"
             );
@@ -10720,7 +10803,7 @@ var ExecutionHandler = class {
           const { targetSubAgentId, fromSubAgentId: transferFromAgent } = transferData;
           const firstArtifact = messageResponse.result.artifacts[0];
           const transferReason = firstArtifact?.parts[1]?.kind === "text" ? firstArtifact.parts[1].text : "Transfer initiated";
-          logger20.info({ targetSubAgentId, transferReason, transferFromAgent }, "Transfer response");
+          logger19.info({ targetSubAgentId, transferReason, transferFromAgent }, "Transfer response");
           await createMessage(dbClient_default)({
             id: generateId(),
             tenantId,
@@ -10751,7 +10834,7 @@ var ExecutionHandler = class {
           if (success) {
             fromSubAgentId = currentAgentId;
             currentAgentId = newAgentId;
-            logger20.info(
+            logger19.info(
               {
                 transferFrom: fromSubAgentId,
                 transferTo: currentAgentId,
@@ -10765,7 +10848,7 @@ var ExecutionHandler = class {
         let responseParts = [];
         if (messageResponse.result.streamedContent?.parts) {
           responseParts = messageResponse.result.streamedContent.parts;
-          logger20.info(
+          logger19.info(
             { partsCount: responseParts.length },
             "Using streamed content for conversation history"
           );
@@ -10773,7 +10856,7 @@ var ExecutionHandler = class {
           responseParts = messageResponse.result.artifacts?.flatMap(
             (artifact) => artifact.parts || []
           ) || [];
-          logger20.info(
+          logger19.info(
             { partsCount: responseParts.length },
             "Using artifacts for conversation history (fallback)"
           );
@@ -10782,7 +10865,7 @@ var ExecutionHandler = class {
           const agentSessionData = agentSessionManager.getSession(requestId2);
           if (agentSessionData) {
             const sessionSummary = agentSessionData.getSummary();
-            logger20.info(sessionSummary, "AgentSession data after completion");
+            logger19.info(sessionSummary, "AgentSession data after completion");
           }
           let textContent = "";
           for (const part of responseParts) {
@@ -10836,22 +10919,22 @@ 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 AgentSession and cleaning up");
-              agentSessionManager.endSession(requestId2);
-              logger20.info({}, "Cleaning up streamHelper");
+              logger19.info({}, "Ending AgentSession and cleaning up");
+              await agentSessionManager.endSession(requestId2);
+              logger19.info({}, "Cleaning up streamHelper");
               unregisterStreamHelper(requestId2);
               let response;
               if (sseHelper instanceof BufferingStreamHelper) {
                 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 };
             } catch (error) {
               setSpanWithError(span, error instanceof Error ? error : new Error(String(error)));
@@ -10862,13 +10945,13 @@ var ExecutionHandler = class {
           });
         }
         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.writeOperation(errorOp(errorMessage2, currentAgentId || "system"));
           if (task) {
             await updateTask(dbClient_default)({
@@ -10883,13 +10966,13 @@ var ExecutionHandler = class {
               }
             });
           }
-          agentSessionManager.endSession(requestId2);
+          await agentSessionManager.endSession(requestId2);
           unregisterStreamHelper(requestId2);
           return { success: false, error: errorMessage2, iterations };
         }
       }
       const errorMessage = `Maximum transfer limit (${maxTransfers}) reached without completion`;
-      logger20.error({ maxTransfers, iterations }, errorMessage);
+      logger19.error({ maxTransfers, iterations }, errorMessage);
       await sseHelper.writeOperation(errorOp(errorMessage, currentAgentId || "system"));
       if (task) {
         await updateTask(dbClient_default)({
@@ -10904,11 +10987,11 @@ var ExecutionHandler = class {
           }
         });
       }
-      agentSessionManager.endSession(requestId2);
+      await agentSessionManager.endSession(requestId2);
       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.writeOperation(
         errorOp(`Execution error: ${errorMessage}`, currentAgentId || "system")
@@ -10926,7 +11009,7 @@ var ExecutionHandler = class {
           }
         });
       }
-      agentSessionManager.endSession(requestId2);
+      await agentSessionManager.endSession(requestId2);
       unregisterStreamHelper(requestId2);
       return { success: false, error: errorMessage, iterations };
     }
@@ -10935,7 +11018,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",
@@ -11053,7 +11136,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,
@@ -11162,7 +11245,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
         dbClient: dbClient_default,
         credentialStores
       });
-      logger21.info(
+      logger20.info(
         {
           tenantId,
           projectId,
@@ -11210,7 +11293,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
         try {
           const sseHelper = createSSEStreamHelper(stream2, requestId2, timestamp);
           await sseHelper.writeRole();
-          logger21.info({ subAgentId }, "Starting execution");
+          logger20.info({ subAgentId }, "Starting execution");
           const emitOperationsHeader = c.req.header("x-emit-operations");
           const emitOperations = emitOperationsHeader === "true";
           const executionHandler = new ExecutionHandler();
@@ -11223,7 +11306,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
             sseHelper,
             emitOperations
           });
-          logger21.info(
+          logger20.info(
             { result },
             `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
           );
@@ -11237,7 +11320,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
           }
           await sseHelper.complete();
         } catch (error) {
-          logger21.error(
+          logger20.error(
             {
               error: error instanceof Error ? error.message : error,
               stack: error instanceof Error ? error.stack : void 0
@@ -11254,13 +11337,13 @@ app2.openapi(chatCompletionsRoute, async (c) => {
             );
             await sseHelper.complete();
           } catch (streamError) {
-            logger21.error({ streamError }, "Failed to write error to stream");
+            logger20.error({ streamError }, "Failed to write error to stream");
           }
         }
       });
     });
   } catch (error) {
-    logger21.error(
+    logger20.error(
       {
         error: error instanceof Error ? error.message : error,
         stack: error instanceof Error ? error.stack : void 0
@@ -11284,7 +11367,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",
@@ -11411,7 +11494,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({
@@ -11494,7 +11577,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
               await streamHelper.writeOperation(errorOp("Unable to process request", "system"));
             }
           } catch (err) {
-            logger22.error({ err }, "Streaming error");
+            logger21.error({ err }, "Streaming error");
             await streamHelper.writeOperation(errorOp("Internal server error", "system"));
           } finally {
             if ("cleanup" in streamHelper && typeof streamHelper.cleanup === "function") {
@@ -11516,7 +11599,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
       );
     });
   } catch (error) {
-    logger22.error(
+    logger21.error(
       {
         error,
         errorMessage: error instanceof Error ? error.message : String(error),
@@ -11605,7 +11688,7 @@ app3.openapi(toolApprovalRoute, async (c) => {
       const { tenantId, projectId } = executionContext;
       const requestBody = await c.req.json();
       const { conversationId, toolCallId, approved, reason } = requestBody;
-      logger22.info(
+      logger21.info(
         {
           conversationId,
           toolCallId,
@@ -11634,7 +11717,7 @@ app3.openapi(toolApprovalRoute, async (c) => {
         span.setStatus({ code: 1, message: "Tool call not found" });
         return c.json({ error: "Tool call not found or already processed" }, 404);
       }
-      logger22.info({ conversationId, toolCallId, approved }, "Tool approval processed successfully");
+      logger21.info({ conversationId, toolCallId, approved }, "Tool approval processed successfully");
       span.setStatus({ code: 1, message: "Success" });
       return c.json({
         success: true,
@@ -11642,7 +11725,7 @@ app3.openapi(toolApprovalRoute, async (c) => {
       });
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      logger22.error(
+      logger21.error(
         {
           error: errorMessage,
           stack: error instanceof Error ? error.stack : void 0
@@ -11663,7 +11746,7 @@ app3.openapi(toolApprovalRoute, async (c) => {
   });
 });
 var chatDataStream_default = app3;
-var logger23 = getLogger("mcp");
+var logger22 = getLogger("mcp");
 var MockResponseSingleton = class _MockResponseSingleton {
   static instance;
   mockRes;
@@ -11717,21 +11800,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, agentId) => {
   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",
@@ -11758,7 +11841,7 @@ var validateSession = async (req, res, body, tenantId, projectId, agentId) => {
     scopes: { tenantId, projectId },
     conversationId: sessionId
   });
-  logger23.info(
+  logger22.info(
     {
       sessionId,
       conversationFound: !!conversation,
@@ -11769,7 +11852,7 @@ var validateSession = async (req, res, body, tenantId, projectId, agentId) => {
     "Conversation lookup result"
   );
   if (!conversation || conversation.metadata?.sessionData?.sessionType !== "mcp" || conversation.metadata?.sessionData?.agentId !== agentId) {
-    logger23.info(
+    logger22.info(
       { sessionId, conversationId: conversation?.id },
       "MCP session not found or invalid"
     );
@@ -11830,7 +11913,7 @@ var executeAgentQuery = async (executionContext, conversationId, query, defaultS
     requestId: requestId2,
     sseHelper: mcpStreamHelper
   });
-  logger23.info(
+  logger22.info(
     { result },
     `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
   );
@@ -11914,7 +11997,7 @@ var getServer = async (headers2, executionContext, conversationId, credentialSto
           dbClient: dbClient_default,
           credentialStores
         });
-        logger23.info(
+        logger22.info(
           {
             tenantId,
             projectId,
@@ -11976,7 +12059,7 @@ var validateRequestParameters = (c) => {
 };
 var handleInitializationRequest = async (body, executionContext, validatedContext, req, res, c, credentialStores) => {
   const { tenantId, projectId, agentId } = executionContext;
-  logger23.info({ body }, "Received initialization request");
+  logger22.info({ body }, "Received initialization request");
   const sessionId = getConversationId();
   const activeSpan = trace.getActiveSpan();
   if (activeSpan) {
@@ -12032,7 +12115,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
         }
       }
     });
-    logger23.info(
+    logger22.info(
       { sessionId, conversationId: conversation.id },
       "Created MCP session as conversation"
     );
@@ -12041,9 +12124,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,
@@ -12052,7 +12135,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);
   });
 };
@@ -12079,8 +12162,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 || {}),
@@ -12094,9 +12177,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,
@@ -12147,13 +12230,13 @@ app4.openapi(
       }
       const { executionContext } = paramValidation;
       const body = c.get("requestBody") || {};
-      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,
@@ -12174,7 +12257,7 @@ app4.openapi(
         credentialStores
       );
     } catch (e) {
-      logger23.error(
+      logger22.error(
         {
           error: e instanceof Error ? e.message : e,
           stack: e instanceof Error ? e.stack : void 0
@@ -12186,7 +12269,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",
@@ -12200,7 +12283,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",
@@ -12213,7 +12296,7 @@ app4.delete("/", async (c) => {
 var mcp_default = app4;
 
 // src/app.ts
-var logger24 = getLogger("agents-run-api");
+var logger23 = getLogger("agents-run-api");
 function createExecutionHono(serverConfig, credentialStores, sandboxConfig) {
   const app6 = new OpenAPIHono();
   app6.use("*", otel());
@@ -12232,7 +12315,7 @@ function createExecutionHono(serverConfig, credentialStores, sandboxConfig) {
         const body = await c.req.json();
         c.set("requestBody", body);
       } catch (error) {
-        logger24.debug({ error }, "Failed to parse JSON body, continuing without parsed body");
+        logger23.debug({ error }, "Failed to parse JSON body, continuing without parsed body");
       }
     }
     return next();
@@ -12283,8 +12366,8 @@ function createExecutionHono(serverConfig, credentialStores, sandboxConfig) {
       if (!isExpectedError) {
         const errorMessage = err instanceof Error ? err.message : String(err);
         const errorStack = err instanceof Error ? err.stack : void 0;
-        if (logger24) {
-          logger24.error(
+        if (logger23) {
+          logger23.error(
             {
               error: err,
               message: errorMessage,
@@ -12296,8 +12379,8 @@ function createExecutionHono(serverConfig, credentialStores, sandboxConfig) {
           );
         }
       } else {
-        if (logger24) {
-          logger24.error(
+        if (logger23) {
+          logger23.error(
             {
               error: err,
               path: c.req.path,
@@ -12314,8 +12397,8 @@ function createExecutionHono(serverConfig, credentialStores, sandboxConfig) {
         const response = err.getResponse();
         return response;
       } catch (responseError) {
-        if (logger24) {
-          logger24.error({ error: responseError }, "Error while handling HTTPException response");
+        if (logger23) {
+          logger23.error({ error: responseError }, "Error while handling HTTPException response");
         }
       }
     }
@@ -12349,7 +12432,7 @@ function createExecutionHono(serverConfig, credentialStores, sandboxConfig) {
   app6.use("*", async (c, next) => {
     const executionContext = c.get("executionContext");
     if (!executionContext) {
-      logger24.debug({}, "Empty execution context");
+      logger23.debug({}, "Empty execution context");
       return next();
     }
     const { tenantId, projectId, agentId } = executionContext;
@@ -12358,7 +12441,7 @@ function createExecutionHono(serverConfig, credentialStores, sandboxConfig) {
     if (requestBody) {
       conversationId = requestBody.conversationId;
       if (!conversationId) {
-        logger24.debug({ requestBody }, "No conversation ID found in request body");
+        logger23.debug({ requestBody }, "No conversation ID found in request body");
       }
     }
     const entries = Object.fromEntries(
@@ -12373,7 +12456,7 @@ function createExecutionHono(serverConfig, credentialStores, sandboxConfig) {
       })
     );
     if (!Object.keys(entries).length) {
-      logger24.debug({}, "Empty entries for baggage");
+      logger23.debug({}, "Empty entries for baggage");
       return next();
     }
     const bag = Object.entries(entries).reduce(
@@ -12427,6 +12510,7 @@ function createExecutionHono(serverConfig, credentialStores, sandboxConfig) {
 }
 
 // src/index.ts
+defaultSDK.start();
 var defaultConfig = {
   port: 3003,
   serverOptions: {