@inkeep/agents-run-api 0.1.10 → 0.2.1

package/dist/index.js

@@ -1,13 +1,14 @@
 import { env, __publicField, dbClient_default, getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-HO5J26MO.js';
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
 import { BaggageSpanProcessor, ALLOW_ALL_BAGGAGE_KEYS } from '@opentelemetry/baggage-span-processor';
+import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
+import { CompositePropagator, W3CTraceContextPropagator, W3CBaggagePropagator } from '@opentelemetry/core';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
+import { resourceFromAttributes } from '@opentelemetry/resources';
 import { NodeSDK } from '@opentelemetry/sdk-node';
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
-import { resourceFromAttributes } from '@opentelemetry/resources';
-import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
-import { getLogger, getTracer, HeadersScopeSchema, getRequestExecutionContext, getAgentGraphWithDefaultAgent, contextValidationMiddleware, getFullGraph, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getAgentById, handleContextResolution, createMessage, commonGetErrorResponses, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, getAgentGraph, createTask, updateTask, updateConversation, handleApiError, setSpanWithError, TaskState, setActiveAgentForThread, getConversation, getRelatedAgentsForGraph, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, validateAndGetApiKey, getProject, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getContextConfigById, getFullGraphDefinition, TemplateEngine, graphHasArtifactComponents, MCPTransportType, getExternalAgent } from '@inkeep/agents-core';
+import { getLogger, getTracer, HeadersScopeSchema, getRequestExecutionContext, getAgentGraphWithDefaultAgent, contextValidationMiddleware, getFullGraph, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getAgentById, handleContextResolution, createMessage, commonGetErrorResponses, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, getAgentGraph, createTask, updateTask, setSpanWithError, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getRelatedAgentsForGraph, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, validateAndGetApiKey, getProject, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getContextConfigById, getFullGraphDefinition, TemplateEngine, graphHasArtifactComponents, MCPTransportType, getExternalAgent } from '@inkeep/agents-core';
 import { OpenAPIHono, createRoute, z as z$1 } from '@hono/zod-openapi';
 import { trace, propagation, context, SpanStatusCode } from '@opentelemetry/api';
 import { Hono } from 'hono';
@@ -23,12 +24,14 @@ import destr from 'destr';
 import traverse from 'traverse';
 import { createUIMessageStream, JsonToSseTransformStream, parsePartialJson, generateText, generateObject, tool, streamText } from 'ai';
 import { createAnthropic, anthropic } from '@ai-sdk/anthropic';
+import { createGoogleGenerativeAI, google } from '@ai-sdk/google';
 import { createOpenAI, openai } from '@ai-sdk/openai';
 import jmespath from 'jmespath';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { z as z$2 } from 'zod/v3';
 import { toReqRes, toFetchResponse } from 'fetch-to-node';
+import { otel } from '@hono/otel';
 
 var maxExportBatchSize = env.OTEL_MAX_EXPORT_BATCH_SIZE ?? (env.ENVIRONMENT === "development" ? 1 : 512);
 var otlpExporter = new OTLPTraceExporter();
@@ -41,6 +44,9 @@ var resource = resourceFromAttributes({
 var sdk = new NodeSDK({
   resource,
   contextManager: new AsyncLocalStorageContextManager(),
+  textMapPropagator: new CompositePropagator({
+    propagators: [new W3CTraceContextPropagator(), new W3CBaggagePropagator()]
+  }),
   spanProcessors: [new BaggageSpanProcessor(ALLOW_ALL_BAGGAGE_KEYS), batchProcessor],
   instrumentations: [
     getNodeAutoInstrumentations({
@@ -161,6 +167,7 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
       return;
     } else if (apiKey) {
       const executionContext = await extractContextFromApiKey(apiKey);
+      executionContext.agentId = agentId;
       c.set("executionContext", executionContext);
       logger.info({}, "API key authenticated successfully");
       await next();
@@ -178,12 +185,14 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
   }
   try {
     const executionContext = await extractContextFromApiKey(apiKey);
+    executionContext.agentId = agentId;
     c.set("executionContext", executionContext);
     logger.debug(
       {
         tenantId: executionContext.tenantId,
         projectId: executionContext.projectId,
-        graphId: executionContext.graphId
+        graphId: executionContext.graphId,
+        agentId: executionContext.agentId
       },
       "API key authenticated successfully"
     );
@@ -850,6 +859,127 @@ async function handleTasksResubscribe(c, agent, request) {
     });
   }
 }
+getLogger("agents");
+function createAgentCard({
+  dbAgent,
+  baseUrl
+}) {
+  const description = dbAgent.description || "AI Agent";
+  return {
+    name: dbAgent.name,
+    description,
+    url: baseUrl ? `${baseUrl}/a2a` : "",
+    version: "1.0.0",
+    capabilities: {
+      streaming: true,
+      // Enable streaming for A2A compliance
+      pushNotifications: false,
+      stateTransitionHistory: false
+    },
+    defaultInputModes: ["text", "text/plain"],
+    defaultOutputModes: ["text", "text/plain"],
+    skills: [],
+    // Add provider info if available
+    ...baseUrl && {
+      provider: {
+        organization: "Inkeep",
+        url: baseUrl
+      }
+    }
+  };
+}
+function generateDescriptionWithTransfers(baseDescription, internalRelations, externalRelations) {
+  const transfers = [
+    ...internalRelations.filter((rel) => rel.relationType === "transfer"),
+    ...externalRelations.filter((rel) => rel.relationType === "transfer")
+  ];
+  const delegates = [
+    ...internalRelations.filter((rel) => rel.relationType === "delegate"),
+    ...externalRelations.filter((rel) => rel.relationType === "delegate")
+  ];
+  if (transfers.length === 0 && delegates.length === 0) {
+    return baseDescription;
+  }
+  let enhancedDescription = baseDescription;
+  if (transfers.length > 0) {
+    const transferList = transfers.map((rel) => {
+      const name = rel.externalAgent?.name || rel.name;
+      const desc = rel.externalAgent?.description || rel.description || "";
+      return `- ${name}: ${desc}`;
+    }).join("\n");
+    enhancedDescription += `
+
+Can transfer to:
+${transferList}`;
+  }
+  if (delegates.length > 0) {
+    const delegateList = delegates.map((rel) => {
+      const name = rel.externalAgent?.name || rel.name;
+      const desc = rel.externalAgent?.description || rel.description || "";
+      return `- ${name}: ${desc}`;
+    }).join("\n");
+    enhancedDescription += `
+
+Can delegate to:
+${delegateList}`;
+  }
+  return enhancedDescription;
+}
+async function hydrateAgent({
+  dbAgent,
+  graphId,
+  baseUrl,
+  apiKey,
+  credentialStoreRegistry
+}) {
+  try {
+    const taskHandlerConfig = await createTaskHandlerConfig({
+      tenantId: dbAgent.tenantId,
+      projectId: dbAgent.projectId,
+      graphId,
+      agentId: dbAgent.id,
+      baseUrl,
+      apiKey
+    });
+    const taskHandler = createTaskHandler(taskHandlerConfig, credentialStoreRegistry);
+    const agentCard = createAgentCard({
+      dbAgent,
+      baseUrl
+    });
+    return {
+      agentId: dbAgent.id,
+      tenantId: dbAgent.tenantId,
+      projectId: dbAgent.projectId,
+      graphId,
+      agentCard,
+      taskHandler
+    };
+  } catch (error) {
+    console.error(`\u274C Failed to hydrate agent ${dbAgent.id}:`, error);
+    throw error;
+  }
+}
+async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
+  const { tenantId, projectId, graphId, agentId, baseUrl, apiKey } = executionContext;
+  if (!agentId) {
+    throw new Error("Agent ID is required");
+  }
+  const dbAgent = await getAgentById(dbClient_default)({
+    scopes: { tenantId, projectId },
+    agentId
+  });
+  if (!dbAgent) {
+    return null;
+  }
+  const agentFrameworkBaseUrl = `${baseUrl}/agents`;
+  return hydrateAgent({
+    dbAgent,
+    graphId,
+    baseUrl: agentFrameworkBaseUrl,
+    credentialStoreRegistry,
+    apiKey
+  });
+}
 function agentInitializingOp(sessionId, graphId) {
   return {
     type: "agent_initializing",
@@ -886,10 +1016,10 @@ function statusUpdateOp(ctx) {
     ctx
   };
 }
-var logger3 = getLogger("DataComponentSchema");
+var logger4 = getLogger("DataComponentSchema");
 function jsonSchemaToZod(jsonSchema) {
   if (!jsonSchema || typeof jsonSchema !== "object") {
-    logger3.warn({ jsonSchema }, "Invalid JSON schema provided, using string fallback");
+    logger4.warn({ jsonSchema }, "Invalid JSON schema provided, using string fallback");
     return z.string();
   }
   switch (jsonSchema.type) {
@@ -916,7 +1046,7 @@ function jsonSchemaToZod(jsonSchema) {
     case "null":
       return z.null();
     default:
-      logger3.warn(
+      logger4.warn(
         {
           unsupportedType: jsonSchema.type,
           schema: jsonSchema
@@ -970,8 +1100,40 @@ __publicField(_ArtifactReferenceSchema, "ARTIFACT_PROPS_SCHEMA", {
   required: ["artifact_id", "task_id"]
 });
 var ArtifactReferenceSchema = _ArtifactReferenceSchema;
-var logger4 = getLogger("ModelFactory");
+var logger5 = getLogger("ModelFactory");
 var _ModelFactory = class _ModelFactory {
+  /**
+   * Create a provider instance with custom configuration
+   */
+  static createProvider(provider, config) {
+    switch (provider) {
+      case "anthropic":
+        return createAnthropic(config);
+      case "openai":
+        return createOpenAI(config);
+      case "google":
+        return createGoogleGenerativeAI(config);
+      default:
+        throw new Error(`Unsupported provider: ${provider}`);
+    }
+  }
+  /**
+   * Extract provider configuration from providerOptions
+   * Only includes settings that go to the provider constructor (baseURL, apiKey, etc.)
+   */
+  static extractProviderConfig(providerOptions) {
+    if (!providerOptions) {
+      return {};
+    }
+    const providerConfig = {};
+    if (providerOptions.baseUrl || providerOptions.baseURL) {
+      providerConfig.baseURL = providerOptions.baseUrl || providerOptions.baseURL;
+    }
+    if (providerOptions.gateway) {
+      Object.assign(providerConfig, providerOptions.gateway);
+    }
+    return providerConfig;
+  }
   /**
    * Create a language model instance from configuration
    * Throws error if no config provided - models must be configured at project level
@@ -985,7 +1147,7 @@ var _ModelFactory = class _ModelFactory {
     const modelSettings = config;
     const modelString = modelSettings.model.trim();
     const { provider, modelName } = _ModelFactory.parseModelString(modelString);
-    logger4.debug(
+    logger5.debug(
       {
         provider,
         model: modelName,
@@ -994,49 +1156,40 @@ var _ModelFactory = class _ModelFactory {
       },
       "Creating language model from config"
     );
-    try {
-      switch (provider) {
-        case "anthropic":
-          return _ModelFactory.createAnthropicModel(modelName, modelSettings.providerOptions);
-        case "openai":
-          return _ModelFactory.createOpenAIModel(modelName, modelSettings.providerOptions);
-        default:
-          throw new Error(
-            `Unsupported provider: ${provider}. Supported providers are: ${_ModelFactory.SUPPORTED_PROVIDERS.join(", ")}`
-          );
-      }
-    } catch (error) {
-      logger4.error(
-        {
-          provider,
-          model: modelName,
-          error: error instanceof Error ? error.message : "Unknown error"
-        },
-        "Failed to create model"
-      );
-      throw new Error(
-        `Failed to create model ${modelString}: ${error instanceof Error ? error.message : "Unknown error"}`
-      );
+    const providerConfig = _ModelFactory.extractProviderConfig(modelSettings.providerOptions);
+    if (Object.keys(providerConfig).length > 0) {
+      logger5.info({ config: providerConfig }, `Applying custom ${provider} provider configuration`);
+      const customProvider = _ModelFactory.createProvider(provider, providerConfig);
+      return customProvider.languageModel(modelName);
+    }
+    switch (provider) {
+      case "anthropic":
+        return anthropic(modelName);
+      case "openai":
+        return openai(modelName);
+      case "google":
+        return google(modelName);
+      default:
+        throw new Error(`Unsupported provider: ${provider}`);
     }
   }
   /**
    * Parse model string to extract provider and model name
-   * Examples: "anthropic/claude-4-sonnet" -> { provider: "anthropic", modelName: "claude-4-sonnet" }
-   *          "claude-4-sonnet" -> { provider: "anthropic", modelName: "claude-4-sonnet" } (default to anthropic)
+   * Examples: "anthropic/claude-sonnet-4" -> { provider: "anthropic", modelName: "claude-sonnet-4" }
+   *          "claude-sonnet-4" -> { provider: "anthropic", modelName: "claude-sonnet-4" } (default to anthropic)
    */
   static parseModelString(modelString) {
     if (modelString.includes("/")) {
       const [provider, ...modelParts] = modelString.split("/");
       const normalizedProvider = provider.toLowerCase();
       if (!_ModelFactory.SUPPORTED_PROVIDERS.includes(normalizedProvider)) {
-        logger4.warn(
+        logger5.error(
           { provider: normalizedProvider, modelName: modelParts.join("/") },
           "Unsupported provider detected, falling back to anthropic"
         );
-        return {
-          provider: "anthropic",
-          modelName: modelParts.join("/")
-        };
+        throw new Error(
+          `Unsupported provider: ${normalizedProvider}. Please provide a model in the format of provider/model-name.`
+        );
       }
       return {
         provider: normalizedProvider,
@@ -1044,51 +1197,9 @@ var _ModelFactory = class _ModelFactory {
         // In case model name has slashes
       };
     }
-    return {
-      provider: "anthropic",
-      modelName: modelString
-    };
-  }
-  /**
-   * Create an Anthropic model instance
-   */
-  static createAnthropicModel(modelName, providerOptions) {
-    const anthropicConfig = {};
-    if (providerOptions?.baseUrl || providerOptions?.baseURL) {
-      anthropicConfig.baseURL = providerOptions.baseUrl || providerOptions.baseURL;
-    }
-    if (providerOptions?.gateway) {
-      logger4.info(
-        { gateway: providerOptions.gateway },
-        "Setting up AI Gateway for Anthropic model"
-      );
-      Object.assign(anthropicConfig, providerOptions.gateway);
-    }
-    if (Object.keys(anthropicConfig).length > 0) {
-      logger4.info({ config: anthropicConfig }, "Applying custom Anthropic provider configuration");
-      const provider = createAnthropic(anthropicConfig);
-      return provider(modelName);
-    }
-    return anthropic(modelName);
-  }
-  /**
-   * Create an OpenAI model instance
-   */
-  static createOpenAIModel(modelName, providerOptions) {
-    const openaiConfig = {};
-    if (providerOptions?.baseUrl || providerOptions?.baseURL) {
-      openaiConfig.baseURL = providerOptions.baseUrl || providerOptions.baseURL;
-    }
-    if (providerOptions?.gateway) {
-      logger4.info({ gateway: providerOptions.gateway }, "Setting up AI Gateway for OpenAI model");
-      Object.assign(openaiConfig, providerOptions.gateway);
-    }
-    if (Object.keys(openaiConfig).length > 0) {
-      logger4.info({ config: openaiConfig }, "Applying custom OpenAI provider configuration");
-      const provider = createOpenAI(openaiConfig);
-      return provider(modelName);
-    }
-    return openai(modelName);
+    throw new Error(
+      `Invalid model provided: ${modelString}. Please provide a model in the format of provider/model-name.`
+    );
   }
   /**
    * Get generation parameters from provider options
@@ -1113,7 +1224,7 @@ var _ModelFactory = class _ModelFactory {
    * Includes maxDuration if specified in provider options (in seconds, following Vercel standard)
    */
   static prepareGenerationConfig(modelSettings) {
-    const modelString = modelSettings?.model?.trim() || "anthropic/claude-4-sonnet-20250514";
+    const modelString = modelSettings?.model?.trim();
     const model = _ModelFactory.createModel({
       model: modelString,
       providerOptions: modelSettings?.providerOptions
@@ -1154,7 +1265,7 @@ var _ModelFactory = class _ModelFactory {
 /**
  * Supported providers for security validation
  */
-__publicField(_ModelFactory, "SUPPORTED_PROVIDERS", ["anthropic", "openai"]);
+__publicField(_ModelFactory, "SUPPORTED_PROVIDERS", ["anthropic", "openai", "google"]);
 var ModelFactory = _ModelFactory;
 var tracer = getTracer("agents-run-api");
 
@@ -1174,7 +1285,7 @@ function unregisterStreamHelper(requestId2) {
 }
 
 // src/utils/graph-session.ts
-var logger5 = getLogger("GraphSession");
+var logger6 = getLogger("GraphSession");
 var GraphSession = class {
   // Track scheduled timeouts for cleanup
   constructor(sessionId, messageId, graphId, tenantId, projectId) {
@@ -1198,7 +1309,7 @@ var GraphSession = class {
     __publicField(this, "MAX_PENDING_ARTIFACTS", 100);
     // Prevent unbounded growth
     __publicField(this, "scheduledTimeouts");
-    logger5.debug({ sessionId, messageId, graphId }, "GraphSession created");
+    logger6.debug({ sessionId, messageId, graphId }, "GraphSession created");
   }
   /**
    * Initialize status updates for this session
@@ -1212,15 +1323,15 @@ var GraphSession = class {
       summarizerModel,
       baseModel,
       config: {
-        numEvents: config.numEvents || 10,
-        timeInSeconds: config.timeInSeconds || 30,
+        numEvents: config.numEvents || 1,
+        timeInSeconds: config.timeInSeconds || 2,
         ...config
       }
     };
     if (this.statusUpdateState.config.timeInSeconds) {
       this.statusUpdateTimer = setInterval(async () => {
         if (!this.statusUpdateState || this.isEnded) {
-          logger5.debug(
+          logger6.debug(
             { sessionId: this.sessionId },
             "Timer triggered but session already cleaned up or ended"
           );
@@ -1232,7 +1343,7 @@ var GraphSession = class {
         }
         await this.checkAndSendTimeBasedUpdate();
       }, this.statusUpdateState.config.timeInSeconds * 1e3);
-      logger5.info(
+      logger6.info(
         {
           sessionId: this.sessionId,
           intervalMs: this.statusUpdateState.config.timeInSeconds * 1e3
@@ -1246,7 +1357,7 @@ var GraphSession = class {
    */
   recordEvent(eventType, agentId, data) {
     if (this.isEnded) {
-      logger5.debug(
+      logger6.debug(
         {
           sessionId: this.sessionId,
           eventType,
@@ -1266,7 +1377,7 @@ var GraphSession = class {
     if (eventType === "artifact_saved" && data.pendingGeneration) {
       const artifactId = data.artifactId;
       if (this.pendingArtifacts.size >= this.MAX_PENDING_ARTIFACTS) {
-        logger5.warn(
+        logger6.warn(
           {
             sessionId: this.sessionId,
             artifactId,
@@ -1287,7 +1398,7 @@ var GraphSession = class {
           this.artifactProcessingErrors.set(artifactId, errorCount);
           if (errorCount >= this.MAX_ARTIFACT_RETRIES) {
             this.pendingArtifacts.delete(artifactId);
-            logger5.error(
+            logger6.error(
               {
                 sessionId: this.sessionId,
                 artifactId,
@@ -1299,7 +1410,7 @@ var GraphSession = class {
               "Artifact processing failed after max retries, giving up"
             );
           } else {
-            logger5.warn(
+            logger6.warn(
               {
                 sessionId: this.sessionId,
                 artifactId,
@@ -1321,14 +1432,14 @@ var GraphSession = class {
    */
   checkStatusUpdates() {
     if (this.isEnded) {
-      logger5.debug(
+      logger6.debug(
         { sessionId: this.sessionId },
         "Session has ended - skipping status update check"
       );
       return;
     }
     if (!this.statusUpdateState) {
-      logger5.debug({ sessionId: this.sessionId }, "No status update state - skipping check");
+      logger6.debug({ sessionId: this.sessionId }, "No status update state - skipping check");
       return;
     }
     const statusUpdateState = this.statusUpdateState;
@@ -1339,11 +1450,11 @@ var GraphSession = class {
    */
   async checkAndSendTimeBasedUpdate() {
     if (this.isEnded) {
-      logger5.debug({ sessionId: this.sessionId }, "Session has ended - skipping time-based update");
+      logger6.debug({ sessionId: this.sessionId }, "Session has ended - skipping time-based update");
       return;
     }
     if (!this.statusUpdateState) {
-      logger5.debug(
+      logger6.debug(
         { sessionId: this.sessionId },
         "No status updates configured for time-based check"
       );
@@ -1356,7 +1467,7 @@ var GraphSession = class {
     try {
       await this.generateAndSendUpdate();
     } catch (error) {
-      logger5.error(
+      logger6.error(
         {
           sessionId: this.sessionId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -1449,29 +1560,29 @@ var GraphSession = class {
    */
   async generateAndSendUpdate() {
     if (this.isEnded) {
-      logger5.debug({ sessionId: this.sessionId }, "Session has ended - not generating update");
+      logger6.debug({ sessionId: this.sessionId }, "Session has ended - not generating update");
       return;
     }
     if (this.isTextStreaming) {
-      logger5.debug(
+      logger6.debug(
         { sessionId: this.sessionId },
         "Text is currently streaming - skipping status update"
       );
       return;
     }
     if (this.isGeneratingUpdate) {
-      logger5.debug(
+      logger6.debug(
         { sessionId: this.sessionId },
         "Update already in progress - skipping duplicate generation"
       );
       return;
     }
     if (!this.statusUpdateState) {
-      logger5.warn({ sessionId: this.sessionId }, "No status update state - cannot generate update");
+      logger6.warn({ sessionId: this.sessionId }, "No status update state - cannot generate update");
       return;
     }
     if (!this.graphId) {
-      logger5.warn({ sessionId: this.sessionId }, "No graph ID - cannot generate update");
+      logger6.warn({ sessionId: this.sessionId }, "No graph ID - cannot generate update");
       return;
     }
     const newEventCount = this.events.length - this.statusUpdateState.lastEventCount;
@@ -1484,7 +1595,7 @@ var GraphSession = class {
     try {
       const streamHelper = getStreamHelper(this.sessionId);
       if (!streamHelper) {
-        logger5.warn(
+        logger6.warn(
           { sessionId: this.sessionId },
           "No stream helper found - cannot send status update"
         );
@@ -1505,7 +1616,7 @@ var GraphSession = class {
         if (result.operations && result.operations.length > 0) {
           for (const op of result.operations) {
             if (!op || !op.type || !op.data || Object.keys(op.data).length === 0) {
-              logger5.warn(
+              logger6.warn(
                 {
                   sessionId: this.sessionId,
                   operation: op
@@ -1558,7 +1669,7 @@ var GraphSession = class {
         this.previousSummaries.shift();
       }
       if (!operation || !operation.type || !operation.ctx) {
-        logger5.warn(
+        logger6.warn(
           {
             sessionId: this.sessionId,
             operation
@@ -1573,7 +1684,7 @@ var GraphSession = class {
         this.statusUpdateState.lastEventCount = this.events.length;
       }
     } catch (error) {
-      logger5.error(
+      logger6.error(
         {
           sessionId: this.sessionId,
           error: error instanceof Error ? error.message : "Unknown error",
@@ -1611,7 +1722,7 @@ var GraphSession = class {
           this.releaseUpdateLock();
         }
       } catch (error) {
-        logger5.error(
+        logger6.error(
           {
             sessionId: this.sessionId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -1688,7 +1799,7 @@ User's Question/Context:
 ${conversationHistory}
 ` : "";
             } catch (error) {
-              logger5.warn(
+              logger6.warn(
                 { sessionId: this.sessionId, error },
                 "Failed to fetch conversation history for status update"
               );
@@ -1740,7 +1851,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           return text.trim();
         } catch (error) {
           setSpanWithError(span, error);
-          logger5.error({ error }, "Failed to generate summary, using fallback");
+          logger6.error({ error }, "Failed to generate summary, using fallback");
           return this.generateFallbackSummary(newEvents, elapsedTime);
         } finally {
           span.end();
@@ -1786,7 +1897,7 @@ User's Question/Context:
 ${conversationHistory}
 ` : "";
             } catch (error) {
-              logger5.warn(
+              logger6.warn(
                 { sessionId: this.sessionId, error },
                 "Failed to fetch conversation history for structured status update"
               );
@@ -1829,9 +1940,11 @@ Rules:
 - Labels MUST contain the ACTUAL information discovered ("Found X", "Learned Y", "Discovered Z requires A")
 - DO NOT use action words like "Searching", "Processing", "Analyzing" - state what was FOUND
 - Include specific details, numbers, requirements, or insights discovered
-- You are ONE AI (no agents/delegations)
-- Anonymize all internal operations so that the information appears descriptive and USER FRIENDLY. HIDE INTERNAL OPERATIONS!
-- Bad examples: "Searching docs", "Processing request", "Status update", or not using the no_relevant_updates: e.g. "No New Updates", "No new info to report"
+- You are ONE unified AI system - NEVER mention agents, transfers, delegations, or routing
+- CRITICAL: NEVER use the words "transfer", "delegation", "agent", "routing", or any internal system terminology in labels
+- Present all operations as seamless actions by a single system
+- Anonymize all internal operations so that the information appears descriptive and USER FRIENDLY. HIDE ALL INTERNAL OPERATIONS!
+- Bad examples: "Transferring to search agent", "Delegating task", "Routing request", "Processing request", or not using the no_relevant_updates
 - Good examples: "Slack bot needs admin privileges", "Found 3-step OAuth flow required", "Channel limit is 500 per workspace", or use the no_relevant_updates component if nothing new to report.
 
 REMEMBER YOU CAN ONLY USE 'no_relevant_updates' ALONE! IT CANNOT BE CONCATENATED WITH OTHER STATUS UPDATES!
@@ -1885,7 +1998,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           return { operations };
         } catch (error) {
           setSpanWithError(span, error);
-          logger5.error({ error }, "Failed to generate structured update, using fallback");
+          logger6.error({ error }, "Failed to generate structured update, using fallback");
           return { operations: [] };
         } finally {
           span.end();
@@ -1992,8 +2105,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
         case "transfer": {
           const data = event.data;
           activities.push(
-            `\u{1F504} **Transfer**: ${data.fromAgent} \u2192 ${data.targetAgent}
-   ${data.reason ? `Reason: ${data.reason}` : "Control transfer"}
+            `\u{1F504} **Continuing**: ${data.reason || "Processing request"}
    ${data.context ? `Context: ${JSON.stringify(data.context, null, 2)}` : ""}`
           );
           break;
@@ -2001,8 +2113,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
         case "delegation_sent": {
           const data = event.data;
           activities.push(
-            `\u{1F4E4} **Delegation Sent** [${data.delegationId}]: ${data.fromAgent} \u2192 ${data.targetAgent}
-   Task: ${data.taskDescription}
+            `\u{1F4E4} **Processing**: ${data.taskDescription}
    ${data.context ? `Context: ${JSON.stringify(data.context, null, 2)}` : ""}`
           );
           break;
@@ -2010,7 +2121,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
         case "delegation_returned": {
           const data = event.data;
           activities.push(
-            `\u{1F4E5} **Delegation Returned** [${data.delegationId}]: ${data.fromAgent} \u2190 ${data.targetAgent}
+            `\u{1F4E5} **Completed subtask**
    Result: ${JSON.stringify(data.result, null, 2)}`
           );
           break;
@@ -2029,16 +2140,16 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
         case "agent_reasoning": {
           const data = event.data;
           activities.push(
-            `\u2699\uFE0F **Reasoning**: reasoning
-   Full Details: ${JSON.stringify(data.parts, null, 2)}`
+            `\u2699\uFE0F **Analyzing request**
+   Details: ${JSON.stringify(data.parts, null, 2)}`
           );
           break;
         }
         case "agent_generate": {
           const data = event.data;
           activities.push(
-            `\u2699\uFE0F **Generation**: ${data.generationType}
-   Full Details: ${JSON.stringify(data.parts, null, 2)}`
+            `\u2699\uFE0F **Preparing response**
+   Details: ${JSON.stringify(data.parts, null, 2)}`
           );
           break;
         }
@@ -2212,7 +2323,7 @@ Make it specific and relevant.`;
             taskId: artifactData.taskId,
             artifacts: [artifactToSave]
           });
-          logger5.info(
+          logger6.info(
             {
               sessionId: this.sessionId,
               artifactId: artifactData.artifactId,
@@ -2229,7 +2340,7 @@ Make it specific and relevant.`;
           span.setStatus({ code: SpanStatusCode.OK });
         } catch (error) {
           setSpanWithError(span, error);
-          logger5.error(
+          logger6.error(
             {
               sessionId: this.sessionId,
               artifactId: artifactData.artifactId,
@@ -2265,7 +2376,7 @@ Make it specific and relevant.`;
                 taskId: artifactData.taskId,
                 artifacts: [fallbackArtifact]
               });
-              logger5.info(
+              logger6.info(
                 {
                   sessionId: this.sessionId,
                   artifactId: artifactData.artifactId
@@ -2274,7 +2385,7 @@ Make it specific and relevant.`;
               );
             }
           } catch (fallbackError) {
-            logger5.error(
+            logger6.error(
               {
                 sessionId: this.sessionId,
                 artifactId: artifactData.artifactId,
@@ -2301,7 +2412,7 @@ var GraphSessionManager = class {
     const sessionId = messageId;
     const session = new GraphSession(sessionId, messageId, graphId, tenantId, projectId);
     this.sessions.set(sessionId, session);
-    logger5.info({ sessionId, messageId, graphId, tenantId, projectId }, "GraphSession created");
+    logger6.info({ sessionId, messageId, graphId, tenantId, projectId }, "GraphSession created");
     return sessionId;
   }
   /**
@@ -2312,7 +2423,7 @@ var GraphSessionManager = class {
     if (session) {
       session.initializeStatusUpdates(config, summarizerModel);
     } else {
-      logger5.error(
+      logger6.error(
         {
           sessionId,
           availableSessions: Array.from(this.sessions.keys())
@@ -2333,7 +2444,7 @@ var GraphSessionManager = class {
   recordEvent(sessionId, eventType, agentId, data) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger5.warn({ sessionId }, "Attempted to record event in non-existent session");
+      logger6.warn({ sessionId }, "Attempted to record event in non-existent session");
       return;
     }
     session.recordEvent(eventType, agentId, data);
@@ -2344,12 +2455,12 @@ var GraphSessionManager = class {
   endSession(sessionId) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger5.warn({ sessionId }, "Attempted to end non-existent session");
+      logger6.warn({ sessionId }, "Attempted to end non-existent session");
       return [];
     }
     const events = session.getEvents();
     const summary = session.getSummary();
-    logger5.info({ sessionId, summary }, "GraphSession ended");
+    logger6.info({ sessionId, summary }, "GraphSession ended");
     session.cleanup();
     this.sessions.delete(sessionId);
     return events;
@@ -2375,7 +2486,7 @@ var GraphSessionManager = class {
   }
 };
 var graphSessionManager = new GraphSessionManager();
-var logger6 = getLogger("ArtifactParser");
+var logger7 = getLogger("ArtifactParser");
 var _ArtifactParser = class _ArtifactParser {
   constructor(tenantId) {
     this.tenantId = tenantId;
@@ -2391,9 +2502,7 @@ var _ArtifactParser = class _ArtifactParser {
    * More robust detection that handles streaming fragments
    */
   hasIncompleteArtifact(text) {
-    return /^.*<(?:artifact(?::ref)?|a(?:r(?:t(?:i(?:f(?:a(?:c(?:t(?::(?:r(?:e(?:f)?)?)?)?)?)?)?)?)?)?)?)?$/.test(
-      text
-    ) || /^.*<artifact:ref(?:[^>]*)$/.test(text) || // Incomplete artifact:ref at end
+    return /<(a(r(t(i(f(a(c(t(:?(r(e(f)?)?)?)?)?)?)?)?)?)?)?)?$/.test(text) || /<artifact:ref[^>]+$/.test(text) || // Incomplete artifact ref at end
     this.findSafeTextBoundary(text) < text.length;
   }
   /**
@@ -2402,10 +2511,10 @@ var _ArtifactParser = class _ArtifactParser {
    */
   findSafeTextBoundary(text) {
     const endPatterns = [
-      /^.*<artifact:ref(?:[^/>]+(?:[^>]*[^/])?)?$/,
+      /<artifact:ref(?![^>]*\/>).*$/,
       // artifact:ref that doesn't end with />
-      /^.*<(?:artifact(?::ref)?|a(?:r(?:t(?:i(?:f(?:a(?:c(?:t(?::(?:r(?:e(?:f)?)?)?)?)?)?)?)?)?)?)?)?$/
-      // Safe partial artifact pattern
+      /<(a(r(t(i(f(a(c(t(:?(r(e(f)?)?)?)?)?)?)?)?)?)?)?)?$/
+      // Any partial artifact pattern at end
     ];
     for (const pattern of endPatterns) {
       const match = text.match(pattern);
@@ -2441,7 +2550,7 @@ var _ArtifactParser = class _ArtifactParser {
           id: taskId
         });
         if (!task) {
-          logger6.warn({ taskId }, "Task not found when fetching artifacts");
+          logger7.warn({ taskId }, "Task not found when fetching artifacts");
           continue;
         }
         const taskArtifacts = await getLedgerArtifacts(dbClient_default)({
@@ -2453,9 +2562,9 @@ var _ArtifactParser = class _ArtifactParser {
           artifacts.set(key, artifact);
         }
       }
-      logger6.debug({ contextId, count: artifacts.size }, "Loaded context artifacts");
+      logger7.debug({ contextId, count: artifacts.size }, "Loaded context artifacts");
     } catch (error) {
-      logger6.error({ error, contextId }, "Error loading context artifacts");
+      logger7.error({ error, contextId }, "Error loading context artifacts");
     }
     return artifacts;
   }
@@ -2558,7 +2667,7 @@ var _ArtifactParser = class _ArtifactParser {
         id: taskId
       });
       if (!task) {
-        logger6.warn({ taskId }, "Task not found when fetching artifact");
+        logger7.warn({ taskId }, "Task not found when fetching artifact");
         return null;
       }
       const artifacts = await getLedgerArtifacts(dbClient_default)({
@@ -2570,7 +2679,7 @@ var _ArtifactParser = class _ArtifactParser {
         return this.formatArtifactData(artifacts[0], artifactId, taskId);
       }
     } catch (error) {
-      logger6.warn({ artifactId, taskId, error }, "Failed to fetch artifact");
+      logger7.warn({ artifactId, taskId, error }, "Failed to fetch artifact");
     }
     return null;
   }
@@ -2606,11 +2715,11 @@ var _ArtifactParser = class _ArtifactParser {
 __publicField(_ArtifactParser, "ARTIFACT_REGEX", /<artifact:ref\s+id="([^"]*?)"\s+task="([^"]*?)"\s*\/>/gs);
 __publicField(_ArtifactParser, "ARTIFACT_CHECK_REGEX", /<artifact:ref\s+(?=.*id="[^"]+")(?=.*task="[^"]+")[^>]*\/>/);
 // Regex for catching any partial artifact pattern (< + any prefix of "artifact:ref")
-__publicField(_ArtifactParser, "INCOMPLETE_ARTIFACT_REGEX", /<(a(r(t(i(f(a(c(t(:(r(e(f?)?)?)?)?)?)?)?)?)?)?)?)?$/g);
+__publicField(_ArtifactParser, "INCOMPLETE_ARTIFACT_REGEX", /<(a(r(t(i(f(a(c(t(:?(r(e(f)?)?)?)?)?)?)?)?)?)?)?)?$/g);
 var ArtifactParser = _ArtifactParser;
 
 // src/utils/incremental-stream-parser.ts
-var logger7 = getLogger("IncrementalStreamParser");
+var logger8 = getLogger("IncrementalStreamParser");
 var IncrementalStreamParser = class {
   constructor(streamHelper, tenantId, contextId) {
     __publicField(this, "buffer", "");
@@ -2670,13 +2779,19 @@ var IncrementalStreamParser = class {
       if (part.type === "tool-call-delta" && part.toolName === targetToolName) {
         const delta = part.argsTextDelta || "";
         if (jsonBuffer.length + delta.length > MAX_BUFFER_SIZE) {
-          logger7.warn("JSON buffer exceeded maximum size, truncating");
+          logger8.warn(
+            { bufferSize: jsonBuffer.length + delta.length, maxSize: MAX_BUFFER_SIZE },
+            "JSON buffer exceeded maximum size, truncating"
+          );
           jsonBuffer = jsonBuffer.slice(-MAX_BUFFER_SIZE / 2);
         }
         jsonBuffer += delta;
         for (const char of delta) {
           if (componentBuffer.length > MAX_BUFFER_SIZE) {
-            logger7.warn("Component buffer exceeded maximum size, resetting");
+            logger8.warn(
+              { bufferSize: componentBuffer.length, maxSize: MAX_BUFFER_SIZE },
+              "Component buffer exceeded maximum size, resetting"
+            );
             componentBuffer = "";
             depth = 0;
             continue;
@@ -2691,7 +2806,7 @@ var IncrementalStreamParser = class {
               if (componentMatch) {
                 const MAX_COMPONENT_SIZE = 1024 * 1024;
                 if (componentMatch[0].length > MAX_COMPONENT_SIZE) {
-                  logger7.warn(
+                  logger8.warn(
                     {
                       size: componentMatch[0].length,
                       maxSize: MAX_COMPONENT_SIZE
@@ -2704,7 +2819,7 @@ var IncrementalStreamParser = class {
                 try {
                   const component = JSON.parse(componentMatch[0]);
                   if (typeof component !== "object" || !component.id) {
-                    logger7.warn("Invalid component structure, skipping");
+                    logger8.warn({ component }, "Invalid component structure, skipping");
                     componentBuffer = "";
                     continue;
                   }
@@ -2717,7 +2832,7 @@ var IncrementalStreamParser = class {
                   componentsStreamed++;
                   componentBuffer = "";
                 } catch (e) {
-                  logger7.debug({ error: e }, "Failed to parse component, continuing to accumulate");
+                  logger8.debug({ error: e }, "Failed to parse component, continuing to accumulate");
                 }
               }
             }
@@ -2734,7 +2849,7 @@ var IncrementalStreamParser = class {
         break;
       }
     }
-    logger7.debug({ componentsStreamed }, "Finished streaming components");
+    logger8.debug({ componentsStreamed }, "Finished streaming components");
   }
   /**
    * Legacy method for backward compatibility - defaults to text processing
@@ -2878,7 +2993,7 @@ var IncrementalStreamParser = class {
 };
 
 // src/utils/response-formatter.ts
-var logger8 = getLogger("ResponseFormatter");
+var logger9 = getLogger("ResponseFormatter");
 var ResponseFormatter = class {
   constructor(tenantId) {
     __publicField(this, "artifactParser");
@@ -2909,7 +3024,7 @@ var ResponseFormatter = class {
         return { parts };
       } catch (error) {
         setSpanWithError(span, error);
-        logger8.error({ error, responseObject }, "Error formatting object response");
+        logger9.error({ error, responseObject }, "Error formatting object response");
         return {
           parts: [{ kind: "data", data: responseObject }]
         };
@@ -2960,7 +3075,7 @@ var ResponseFormatter = class {
         return { parts };
       } catch (error) {
         setSpanWithError(span, error);
-        logger8.error({ error, responseText }, "Error formatting response");
+        logger9.error({ error, responseText }, "Error formatting response");
         return { text: responseText };
       } finally {
         span.end();
@@ -3005,7 +3120,7 @@ var ResponseFormatter = class {
     }
   }
 };
-var logger9 = getLogger("ToolSessionManager");
+var logger10 = getLogger("ToolSessionManager");
 var _ToolSessionManager = class _ToolSessionManager {
   // 5 minutes
   constructor() {
@@ -3034,7 +3149,7 @@ var _ToolSessionManager = class _ToolSessionManager {
       createdAt: Date.now()
     };
     this.sessions.set(sessionId, session);
-    logger9.debug({ sessionId, tenantId, contextId, taskId }, "Created tool session");
+    logger10.debug({ sessionId, tenantId, contextId, taskId }, "Created tool session");
     return sessionId;
   }
   /**
@@ -3043,7 +3158,7 @@ var _ToolSessionManager = class _ToolSessionManager {
   recordToolResult(sessionId, toolResult) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger9.warn(
+      logger10.warn(
         { sessionId, toolCallId: toolResult.toolCallId },
         "Tool result recorded for unknown session"
       );
@@ -3057,12 +3172,12 @@ var _ToolSessionManager = class _ToolSessionManager {
   getToolResult(sessionId, toolCallId) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger9.warn({ sessionId, toolCallId }, "Requested tool result for unknown session");
+      logger10.warn({ sessionId, toolCallId }, "Requested tool result for unknown session");
       return void 0;
     }
     const result = session.toolResults.get(toolCallId);
     if (!result) {
-      logger9.warn(
+      logger10.warn(
         {
           sessionId,
           toolCallId,
@@ -3101,10 +3216,10 @@ var _ToolSessionManager = class _ToolSessionManager {
     }
     for (const sessionId of expiredSessions) {
       this.sessions.delete(sessionId);
-      logger9.debug({ sessionId }, "Cleaned up expired tool session");
+      logger10.debug({ sessionId }, "Cleaned up expired tool session");
     }
     if (expiredSessions.length > 0) {
-      logger9.info({ expiredCount: expiredSessions.length }, "Cleaned up expired tool sessions");
+      logger10.info({ expiredCount: expiredSessions.length }, "Cleaned up expired tool sessions");
     }
   }
 };
@@ -3113,7 +3228,7 @@ var ToolSessionManager = _ToolSessionManager;
 var toolSessionManager = ToolSessionManager.getInstance();
 
 // src/agents/artifactTools.ts
-var logger10 = getLogger("artifactTools");
+var logger11 = getLogger("artifactTools");
 function buildKeyNestingMap(data, prefix = "", map = /* @__PURE__ */ new Map()) {
   if (typeof data === "object" && data !== null) {
     if (Array.isArray(data)) {
@@ -3216,7 +3331,7 @@ function createPropSelectorsSchema(artifactComponents) {
         Object.entries(summaryProps.properties).forEach(([propName, propDef]) => {
           const propDescription = propDef?.description || propDef?.title || `${propName} property`;
           propSchema[propName] = z4.string().describe(
-            `JMESPath selector for ${propName} (${propDescription}) - summary version, relative to base selector`
+            `JMESPath selector for ${propName} (${propDescription}) - summary version, MUST be relative to your baseSelector target level. Access fields WITHIN the items your baseSelector returns.`
           );
         });
       }
@@ -3228,7 +3343,7 @@ function createPropSelectorsSchema(artifactComponents) {
           if (!propSchema[propName]) {
             const propDescription = propDef?.description || propDef?.title || `${propName} property`;
             propSchema[propName] = z4.string().describe(
-              `JMESPath selector for ${propName} (${propDescription}) - full version, relative to base selector`
+              `JMESPath selector for ${propName} (${propDescription}) - MUST be relative to your baseSelector target level. If baseSelector stops at a document, this accesses fields WITHIN that document. Examples: "title", "content.body", "metadata.author"`
             );
           }
         });
@@ -3242,7 +3357,26 @@ function createPropSelectorsSchema(artifactComponents) {
     return z4.union(propSelectorSchemas);
   }
   return z4.record(z4.string(), z4.string()).describe(
-    "Prop selectors mapping schema properties to JMESPath expressions relative to base selector"
+    `Prop selectors mapping schema properties to JMESPath expressions relative to base selector. Each path is relative to the item(s) your baseSelector returns.
+
+\u{1F3AF} CRITICAL: PropSelectors work ONLY on the data your baseSelector returns!
+If baseSelector = "result.docs[0]" \u2192 propSelectors access fields INSIDE that doc
+If baseSelector = "result.docs[0].content[0]" \u2192 propSelectors access fields INSIDE that content item
+
+\u2705 CORRECT EXAMPLES (paths relative to baseSelector target):
+\u2022 baseSelector: "result.documents[?type=='article']" \u2192 propSelectors: {"title": "title", "url": "url"}
+\u2022 baseSelector: "result.content[0].text" \u2192 propSelectors: {"content": "content[0].text", "source": "content[0].source"}
+\u2022 baseSelector: "result.items" \u2192 propSelectors: {"name": "profile.name", "email": "contact.email"}
+
+\u274C WRONG EXAMPLES (accessing data not at baseSelector level):
+\u2022 baseSelector: "result.docs[0].content[0]" \u2192 propSelectors: {"title": "title"} \u2190 title is at doc level, not content level!
+\u2022 baseSelector: "result.source.content" \u2192 propSelectors: {"title": "content[4].text"} \u2190 baseSelector ends at array, can't index into it!
+\u2022 baseSelector: "result.items" \u2192 propSelectors: {"title": "documents[0].title"} \u2190 going deeper when baseSelector should handle depth
+
+\u274C NEVER USE LITERAL VALUES:
+{"title": "Robert Tran", "url": "https://linkedin.com/..."}
+
+\u{1F4A1} TIP: Match your baseSelector depth to where the properties you need actually exist!`
   );
 }
 function createInputSchema(artifactComponents) {
@@ -3251,7 +3385,18 @@ function createInputSchema(artifactComponents) {
       "EXACT toolCallId from a previous tool execution - copy it exactly from the tool call result. NEVER invent or make up tool call IDs."
     ),
     baseSelector: z4.string().describe(
-      `JMESPath selector to get to the main data array/object. ALWAYS start with "result." Example: "result.content[?type=='text']"`
+      `JMESPath selector to get to the main data array/object. ALWAYS start with "result." That is a mandatory prefix.
+
+Data structures are COMPLEX and NESTED. Examples:
+\u2022 "result.content[0].text.content[2]" - parsed JSON in text field
+\u2022 "result.structuredContent.content[1]" - direct structured data
+\u2022 "result.data.items[?type=='doc']" - filtered array
+
+\u{1F6A8} CRITICAL: If you need data from array[4], your baseSelector must END at array[4], NOT at the array itself!
+\u2705 CORRECT: "result.source.content[4]" \u2192 propSelectors can access fields in that item
+\u274C WRONG: "result.source.content" \u2192 propSelectors can't use content[4] because baseSelector already selected the array
+
+\u{1F525} IF YOUR PATH FAILS: READ THE ERROR MESSAGE! It tells you the correct path! \u{1F525}`
     ),
     propSelectors: createPropSelectorsSchema(artifactComponents)
   });
@@ -3270,6 +3415,9 @@ function createSaveToolResultTool(sessionId, streamRequestId, agentId, artifactC
   return tool({
     description: `Save tool results as structured artifacts. Each artifact should represent ONE SPECIFIC, IMPORTANT, and UNIQUE document or data item.
 
+\u26A1 CRITICAL: JSON-like text content in tool results is AUTOMATICALLY PARSED into proper JSON objects - treat all data as structured, not text strings.
+\u{1F6A8} CRITICAL: Data structures are deeply nested. When your path fails, READ THE ERROR MESSAGE - it shows the correct path!
+
 AVAILABLE ARTIFACT TYPES:
 ${availableTypesWithDescriptions}
 
@@ -3281,26 +3429,6 @@ Each artifact you save becomes a SEPARATE DATA COMPONENT in the structured respo
 \u2705 UNIQUE with distinct value from other artifacts
 \u2705 RENDERED AS INDIVIDUAL DATA COMPONENT in the UI
 
-\u274C DO NOT save multiple different items in one artifact unless they are EXTREMELY SIMILAR
-\u274C DO NOT batch unrelated items together - each item becomes its own data component
-\u274C DO NOT save generic collections - break them into individual data components
-
-\u{1F3AF} STRUCTURED DATA COMPONENT PRINCIPLE:
-Each artifact save creates ONE data component that will be rendered separately in the UI. If you have 5 important items, save them as 5 separate artifacts to create 5 separate data components for better user experience.
-
-THINK: "What is the ONE most important piece of information here that deserves its own data component?"
-
-EXAMPLES OF GOOD INDIVIDUAL ARTIFACTS (SEPARATE DATA COMPONENTS):
-- Nick Gomez's founder profile (specific person) \u2192 Individual data component
-- The /users/create API endpoint documentation (specific endpoint) \u2192 Individual data component  
-- Error message for authentication failure (specific error type) \u2192 Individual data component
-- Configuration for Redis caching (specific config topic) \u2192 Individual data component
-
-EXAMPLES OF BAD BATCHING:
-\u274C "All team members" \u2192 Should be separate artifacts for each important member (separate data components)
-\u274C "All API endpoints" \u2192 Should be separate artifacts for each distinct endpoint (separate data components)
-\u274C "All error types" \u2192 Should be separate artifacts for each error category (separate data components)
-
 USAGE PATTERN:
 1. baseSelector: Navigate through nested structures to target ONE SPECIFIC item
    - Navigate through all necessary levels: "result.data.items.nested[?condition]"
@@ -3310,9 +3438,11 @@ USAGE PATTERN:
    - NOT: "result.items[*]" (too broad, gets everything)
 
 2. propSelectors: Extract properties relative to your selected item
-   - Always relative to the single item that baseSelector returns
-   - Simple paths from that item: { prop1: "field_x", prop2: "nested.field_y", prop3: "deep.nested.field_z" }
-   - The tool handles array iteration - your selectors work on individual items
+   - \u{1F3AF} CRITICAL: Always relative to the single item that baseSelector returns
+   - If baseSelector ends at a document \u2192 propSelectors access document fields
+   - If baseSelector ends at content[0] \u2192 propSelectors access content[0] fields
+   - Simple paths from that exact level: { prop1: "field_x", prop2: "nested.field_y" }
+   - \u274C DON'T try to go back up or deeper - adjust your baseSelector instead!
 
 3. Result: ONE artifact representing ONE important, unique item \u2192 ONE data component
 
@@ -3321,20 +3451,12 @@ USAGE PATTERN:
 - Focus on getting to the right level with baseSelector, then keep propSelectors simple
 - Test your baseSelector: Does it return exactly the items you want?
 
-\u26A0\uFE0F  STRICT SELECTIVITY RULES FOR DATA COMPONENTS:
-- ALWAYS ask: "Is this ONE specific, important thing that deserves its own data component?"
-- If the answer is no, don't save it or find a more specific selector
-- Multiple similar items = Multiple separate artifact saves (use the tool multiple times) \u2192 Multiple data components
-- Each artifact should be independently valuable and uniquely identifiable \u2192 Each data component stands alone
-- BETTER to save 3 individual, specific artifacts (3 data components) than 1 generic collection (1 data component)
-
-\u{1F504} MULTIPLE ARTIFACTS = MULTIPLE DATA COMPONENTS:
-Remember: Each time you call this tool, you create a separate data component. Call it multiple times for multiple items to create a rich, structured response with individual data components for each important piece of information.`,
+Please use Error Messages to Debug when there is an error in the tool call.`,
     inputSchema,
     execute: async ({ toolCallId, baseSelector, propSelectors, ...rest }, _context) => {
       const artifactType = "artifactType" in rest ? rest.artifactType : void 0;
       if (!sessionId) {
-        logger10.warn({ toolCallId }, "No session ID provided to save_tool_result");
+        logger11.warn({ toolCallId }, "No session ID provided to save_tool_result");
         return {
           saved: false,
           error: `[toolCallId: ${toolCallId}] No session context available`,
@@ -3344,7 +3466,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
       }
       const toolResult = toolSessionManager.getToolResult(sessionId, toolCallId);
       if (!toolResult) {
-        logger10.warn({ toolCallId, sessionId }, "Tool result not found in session");
+        logger11.warn({ toolCallId, sessionId }, "Tool result not found in session");
         return {
           saved: false,
           error: `[toolCallId: ${toolCallId}] Tool result not found`,
@@ -3357,7 +3479,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
         const baseData = jmespath.search(parsedResult, baseSelector);
         if (!baseData || Array.isArray(baseData) && baseData.length === 0) {
           const debugInfo = analyzeSelectorFailure(parsedResult, baseSelector);
-          logger10.warn(
+          logger11.warn(
             {
               baseSelector,
               toolCallId,
@@ -3400,7 +3522,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
                     const fallbackValue = item[propName];
                     if (fallbackValue !== null && fallbackValue !== void 0) {
                       extractedItem[propName] = fallbackValue;
-                      logger10.info(
+                      logger11.info(
                         { propName, propSelector, context },
                         `PropSelector failed, used fallback direct property access`
                       );
@@ -3412,7 +3534,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
                   const fallbackValue = item[propName];
                   if (fallbackValue !== null && fallbackValue !== void 0) {
                     extractedItem[propName] = fallbackValue;
-                    logger10.warn(
+                    logger11.warn(
                       { propName, propSelector, context, error: error.message },
                       `PropSelector syntax error, used fallback direct property access`
                     );
@@ -3525,7 +3647,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
           warnings
         };
       } catch (error) {
-        logger10.error({ error, toolCallId, sessionId }, "Error processing save_tool_result");
+        logger11.error({ error, toolCallId, sessionId }, "Error processing save_tool_result");
         return {
           saved: false,
           error: `[toolCallId: ${toolCallId}] ${error instanceof Error ? error.message : "Unknown error"}`,
@@ -3537,7 +3659,7 @@ Remember: Each time you call this tool, you create a separate data component. Ca
 }
 
 // src/a2a/client.ts
-var logger11 = getLogger("a2aClient");
+var logger12 = getLogger("a2aClient");
 var DEFAULT_BACKOFF = {
   initialInterval: 500,
   maxInterval: 6e4,
@@ -3743,7 +3865,7 @@ var A2AClient = class {
       try {
         const res = await fn();
         if (attempt > 0) {
-          logger11.info(
+          logger12.info(
             {
               attempts: attempt + 1,
               elapsedTime: Date.now() - start
@@ -3758,7 +3880,7 @@ var A2AClient = class {
         }
         const elapsed = Date.now() - start;
         if (elapsed > maxElapsedTime) {
-          logger11.warn(
+          logger12.warn(
             {
               attempts: attempt + 1,
               elapsedTime: elapsed,
@@ -3779,7 +3901,7 @@ var A2AClient = class {
           retryInterval = initialInterval * attempt ** exponent + Math.random() * 1e3;
         }
         const delayMs = Math.min(retryInterval, maxInterval);
-        logger11.info(
+        logger12.info(
           {
             attempt: attempt + 1,
             delayMs,
@@ -3864,7 +3986,7 @@ var A2AClient = class {
     }
     const rpcResponse = await httpResponse.json();
     if (rpcResponse.id !== requestId2) {
-      logger11.warn(
+      logger12.warn(
         {
           method,
           expectedId: requestId2,
@@ -4063,7 +4185,7 @@ var A2AClient = class {
     try {
       while (true) {
         const { done, value } = await reader.read();
-        logger11.info({ done, value }, "parseA2ASseStream");
+        logger12.info({ done, value }, "parseA2ASseStream");
         if (done) {
           if (eventDataBuffer.trim()) {
             const result = this._processSseEventData(
@@ -4150,7 +4272,7 @@ var A2AClient = class {
 };
 
 // src/agents/relationTools.ts
-var logger12 = getLogger("relationships Tools");
+var logger13 = getLogger("relationships Tools");
 var generateTransferToolDescription = (config) => {
   return `Hand off the conversation to agent ${config.id}.
 
@@ -4188,7 +4310,7 @@ var createTransferToAgentTool = ({
           "transfer.to_agent_id": transferConfig.id ?? "unknown"
         });
       }
-      logger12.info(
+      logger13.info(
         {
           transferTo: transferConfig.id ?? "unknown",
           fromAgent: callingAgentId
@@ -4298,7 +4420,7 @@ function createDelegateToAgentTool({
         }
       } else {
         resolvedHeaders = {
-          Authorization: `Bearer ${delegateConfig.config.apiKey}`,
+          Authorization: `Bearer ${metadata.apiKey}`,
           "x-inkeep-tenant-id": tenantId,
           "x-inkeep-project-id": projectId,
           "x-inkeep-graph-id": graphId,
@@ -4336,7 +4458,7 @@ function createDelegateToAgentTool({
           ...isInternal ? { fromAgentId: callingAgentId } : { fromExternalAgentId: callingAgentId }
         }
       };
-      logger12.info({ messageToSend }, "messageToSend");
+      logger13.info({ messageToSend }, "messageToSend");
       await createMessage(dbClient_default)({
         id: nanoid(),
         tenantId,
@@ -4398,7 +4520,7 @@ function createDelegateToAgentTool({
 }
 
 // src/agents/SystemPromptBuilder.ts
-var logger13 = getLogger("SystemPromptBuilder");
+var logger14 = getLogger("SystemPromptBuilder");
 var SystemPromptBuilder = class {
   constructor(version, versionConfig) {
     this.version = version;
@@ -4414,9 +4536,12 @@ var SystemPromptBuilder = class {
         this.templates.set(name, content);
       }
       this.loaded = true;
-      logger13.debug(`Loaded ${this.templates.size} templates for version ${this.version}`);
+      logger14.debug(
+        { templateCount: this.templates.size, version: this.version },
+        `Loaded ${this.templates.size} templates for version ${this.version}`
+      );
     } catch (error) {
-      logger13.error({ error }, `Failed to load templates for version ${this.version}`);
+      logger14.error({ error }, `Failed to load templates for version ${this.version}`);
       throw new Error(`Template loading failed: ${error}`);
     }
   }
@@ -4818,7 +4943,7 @@ function hasToolCallWithPrefix(prefix) {
     return false;
   };
 }
-var logger14 = getLogger("Agent");
+var logger15 = getLogger("Agent");
 var CONSTANTS = {
   MAX_GENERATION_STEPS: 12,
   PHASE_1_TIMEOUT_MS: 27e4,
@@ -5071,14 +5196,14 @@ var Agent = class {
     for (const toolSet of tools) {
       for (const [toolName, originalTool] of Object.entries(toolSet)) {
         if (!isValidTool(originalTool)) {
-          logger14.error({ toolName }, "Invalid MCP tool structure - missing required properties");
+          logger15.error({ toolName }, "Invalid MCP tool structure - missing required properties");
           continue;
         }
         const sessionWrappedTool = tool({
           description: originalTool.description,
           inputSchema: originalTool.inputSchema,
           execute: async (args, { toolCallId }) => {
-            logger14.debug({ toolName, toolCallId }, "MCP Tool Called");
+            logger15.debug({ toolName, toolCallId }, "MCP Tool Called");
             try {
               const result = await originalTool.execute(args, { toolCallId });
               toolSessionManager.recordToolResult(sessionId, {
@@ -5090,7 +5215,7 @@ var Agent = class {
               });
               return { result, toolCallId };
             } catch (error) {
-              logger14.error({ toolName, toolCallId, error }, "MCP tool execution failed");
+              logger15.error({ toolName, toolCallId, error }, "MCP tool execution failed");
               throw error;
             }
           }
@@ -5175,7 +5300,7 @@ var Agent = class {
         selectedTools
       };
     }
-    logger14.info(
+    logger15.info(
       {
         toolName: tool4.name,
         credentialReferenceId,
@@ -5215,7 +5340,7 @@ var Agent = class {
   async getResolvedContext(conversationId, requestContext) {
     try {
       if (!this.config.contextConfigId) {
-        logger14.debug({ graphId: this.config.graphId }, "No context config found for graph");
+        logger15.debug({ graphId: this.config.graphId }, "No context config found for graph");
         return null;
       }
       const contextConfig = await getContextConfigById(dbClient_default)({
@@ -5223,7 +5348,7 @@ var Agent = class {
         id: this.config.contextConfigId
       });
       if (!contextConfig) {
-        logger14.warn({ contextConfigId: this.config.contextConfigId }, "Context config not found");
+        logger15.warn({ contextConfigId: this.config.contextConfigId }, "Context config not found");
         return null;
       }
       if (!this.contextResolver) {
@@ -5240,7 +5365,7 @@ var Agent = class {
         $now: (/* @__PURE__ */ new Date()).toISOString(),
         $env: process.env
       };
-      logger14.debug(
+      logger15.debug(
         {
           conversationId,
           contextConfigId: contextConfig.id,
@@ -5254,7 +5379,7 @@ var Agent = class {
       );
       return contextWithBuiltins;
     } catch (error) {
-      logger14.error(
+      logger15.error(
         {
           conversationId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -5278,7 +5403,7 @@ var Agent = class {
       });
       return graphDefinition?.graphPrompt || void 0;
     } catch (error) {
-      logger14.warn(
+      logger15.warn(
         {
           graphId: this.config.graphId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -5305,7 +5430,7 @@ var Agent = class {
       }
       return !!(graphDefinition.artifactComponents && Object.keys(graphDefinition.artifactComponents).length > 0);
     } catch (error) {
-      logger14.warn(
+      logger15.warn(
         {
           graphId: this.config.graphId,
           tenantId: this.config.tenantId,
@@ -5365,7 +5490,7 @@ Key requirements:
           preserveUnresolved: false
         });
       } catch (error) {
-        logger14.error(
+        logger15.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -5410,7 +5535,7 @@ Key requirements:
           preserveUnresolved: false
         });
       } catch (error) {
-        logger14.error(
+        logger15.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -5438,7 +5563,7 @@ Key requirements:
         artifactId: z.string().describe("The unique identifier of the artifact to get.")
       }),
       execute: async ({ artifactId }) => {
-        logger14.info({ artifactId }, "get_artifact executed");
+        logger15.info({ artifactId }, "get_artifact executed");
         const artifact = await getLedgerArtifacts(dbClient_default)({
           scopes: {
             tenantId: this.config.tenantId,
@@ -5505,7 +5630,7 @@ Key requirements:
         graphId: this.config.graphId
       });
     } catch (error) {
-      logger14.error(
+      logger15.error(
         { error, graphId: this.config.graphId },
         "Failed to check graph artifact components"
       );
@@ -5609,7 +5734,7 @@ Key requirements:
         const configuredTimeout = modelSettings.maxDuration ? Math.min(modelSettings.maxDuration * 1e3, MAX_ALLOWED_TIMEOUT_MS) : shouldStreamPhase1 ? CONSTANTS.PHASE_1_TIMEOUT_MS : CONSTANTS.NON_STREAMING_PHASE_1_TIMEOUT_MS;
         const timeoutMs = Math.min(configuredTimeout, MAX_ALLOWED_TIMEOUT_MS);
         if (modelSettings.maxDuration && modelSettings.maxDuration * 1e3 > MAX_ALLOWED_TIMEOUT_MS) {
-          logger14.warn(
+          logger15.warn(
             {
               requestedTimeout: modelSettings.maxDuration * 1e3,
               appliedTimeout: timeoutMs,
@@ -5651,7 +5776,7 @@ Key requirements:
                     }
                   );
                 } catch (error) {
-                  logger14.debug("Failed to track agent reasoning");
+                  logger15.debug({ error }, "Failed to track agent reasoning");
                 }
               }
               if (last && "toolCalls" in last && last.toolCalls) {
@@ -5734,7 +5859,7 @@ Key requirements:
                     }
                   );
                 } catch (error) {
-                  logger14.debug("Failed to track agent reasoning");
+                  logger15.debug({ error }, "Failed to track agent reasoning");
                 }
               }
               if (last && "toolCalls" in last && last.toolCalls) {
@@ -5779,7 +5904,7 @@ Key requirements:
                         return;
                       }
                       if (toolName === "save_artifact_tool" || toolName === "save_tool_result") {
-                        logger14.info({ result }, "save_artifact_tool or save_tool_result");
+                        logger15.info({ result }, "save_artifact_tool or save_tool_result");
                         if (result.output.artifacts) {
                           for (const artifact of result.output.artifacts) {
                             const artifactId = artifact?.artifactId || "N/A";
@@ -5854,7 +5979,7 @@ ${output}`;
                 { role: "user", content: userMessage },
                 ...reasoningFlow,
                 {
-                  role: "system",
+                  role: "user",
                   content: await this.buildPhase2SystemPrompt()
                 }
               ],
@@ -5950,7 +6075,9 @@ async function resolveModelConfig(graphId, agent) {
       summarizer: agent.models?.summarizer || project.models.summarizer || project.models.base
     };
   }
-  throw new Error("Base model configuration is required. Please configure models at the project level.");
+  throw new Error(
+    "Base model configuration is required. Please configure models at the project level."
+  );
 }
 
 // src/agents/generateTaskHandler.ts
@@ -5964,7 +6091,7 @@ function parseEmbeddedJson(data) {
     }
   });
 }
-var logger15 = getLogger("generateTaskHandler");
+var logger16 = getLogger("generateTaskHandler");
 var createTaskHandler = (config, credentialStoreRegistry) => {
   return async (task) => {
     try {
@@ -6014,7 +6141,33 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           agentId: config.agentId
         })
       ]);
-      logger15.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
+      logger16.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
+      const enhancedInternalRelations = await Promise.all(
+        internalRelations.map(async (relation) => {
+          try {
+            const relatedAgent = await getAgentById(dbClient_default)({
+              scopes: { tenantId: config.tenantId, projectId: config.projectId },
+              agentId: relation.id
+            });
+            if (relatedAgent) {
+              const relatedAgentRelations = await getRelatedAgentsForGraph(dbClient_default)({
+                scopes: { tenantId: config.tenantId, projectId: config.projectId },
+                graphId: config.graphId,
+                agentId: relation.id
+              });
+              const enhancedDescription = generateDescriptionWithTransfers(
+                relation.description || "",
+                relatedAgentRelations.internalRelations,
+                relatedAgentRelations.externalRelations
+              );
+              return { ...relation, description: enhancedDescription };
+            }
+          } catch (error) {
+            logger16.warn({ agentId: relation.id, error }, "Failed to enhance agent description");
+          }
+          return relation;
+        })
+      );
       const agentPrompt = "prompt" in config.agentSchema ? config.agentSchema.prompt : "";
       const models = "models" in config.agentSchema ? config.agentSchema.models : void 0;
       const stopWhen = "stopWhen" in config.agentSchema ? config.agentSchema.stopWhen : void 0;
@@ -6031,7 +6184,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           agentPrompt,
           models: models || void 0,
           stopWhen: stopWhen || void 0,
-          agentRelations: internalRelations.map((relation) => ({
+          agentRelations: enhancedInternalRelations.map((relation) => ({
             id: relation.id,
             tenantId: config.tenantId,
             projectId: config.projectId,
@@ -6045,7 +6198,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             agentRelations: [],
             transferRelations: []
           })),
-          transferRelations: internalRelations.filter((relation) => relation.relationType === "transfer").map((relation) => ({
+          transferRelations: enhancedInternalRelations.filter((relation) => relation.relationType === "transfer").map((relation) => ({
             baseUrl: config.baseUrl,
             apiKey: config.apiKey,
             id: relation.id,
@@ -6061,7 +6214,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           })),
           delegateRelations: [
             // Internal delegate relations
-            ...internalRelations.filter((relation) => relation.relationType === "delegate").map((relation) => ({
+            ...enhancedInternalRelations.filter((relation) => relation.relationType === "delegate").map((relation) => ({
               type: "internal",
               config: {
                 id: relation.id,
@@ -6114,7 +6267,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         const taskIdMatch = task.id.match(/^task_([^-]+-[^-]+-\d+)-/);
         if (taskIdMatch) {
           contextId = taskIdMatch[1];
-          logger15.info(
+          logger16.info(
             {
               taskId: task.id,
               extractedContextId: contextId,
@@ -6130,7 +6283,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       const isDelegation = task.context?.metadata?.isDelegation === true;
       agent.setDelegationStatus(isDelegation);
       if (isDelegation) {
-        logger15.info(
+        logger16.info(
           { agentId: config.agentId, taskId: task.id },
           "Delegated agent - streaming disabled"
         );
@@ -6142,7 +6295,8 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           taskId: task.id,
           threadId: contextId,
           // using conversationId as threadId for now
-          streamRequestId
+          streamRequestId,
+          ...config.apiKey ? { apiKey: config.apiKey } : {}
         }
       });
       const stepContents = response.steps && Array.isArray(response.steps) ? response.steps.flatMap((step) => {
@@ -6334,83 +6488,10 @@ async function getRegisteredGraph(executionContext) {
   const agentFrameworkBaseUrl = `${baseUrl}/agents`;
   return hydrateGraph({ dbGraph, baseUrl: agentFrameworkBaseUrl, apiKey });
 }
-getLogger("agents");
-async function hydrateAgent({
-  dbAgent,
-  graphId,
-  baseUrl,
-  apiKey,
-  credentialStoreRegistry
-}) {
-  try {
-    const taskHandlerConfig = await createTaskHandlerConfig({
-      tenantId: dbAgent.tenantId,
-      projectId: dbAgent.projectId,
-      graphId,
-      agentId: dbAgent.id,
-      baseUrl,
-      apiKey
-    });
-    const taskHandler = createTaskHandler(taskHandlerConfig, credentialStoreRegistry);
-    const agentCard = {
-      name: dbAgent.name,
-      description: dbAgent.description || "AI Agent",
-      url: baseUrl ? `${baseUrl}/a2a` : "",
-      version: "1.0.0",
-      capabilities: {
-        streaming: true,
-        // Enable streaming for A2A compliance
-        pushNotifications: false,
-        stateTransitionHistory: false
-      },
-      defaultInputModes: ["text", "text/plain"],
-      defaultOutputModes: ["text", "text/plain"],
-      skills: [],
-      // Add provider info if available
-      ...baseUrl && {
-        provider: {
-          organization: "Inkeep",
-          url: baseUrl
-        }
-      }
-    };
-    return {
-      agentId: dbAgent.id,
-      tenantId: dbAgent.tenantId,
-      projectId: dbAgent.projectId,
-      graphId,
-      agentCard,
-      taskHandler
-    };
-  } catch (error) {
-    console.error(`\u274C Failed to hydrate agent ${dbAgent.id}:`, error);
-    throw error;
-  }
-}
-async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
-  const { tenantId, projectId, graphId, agentId, baseUrl } = executionContext;
-  if (!agentId) {
-    throw new Error("Agent ID is required");
-  }
-  const dbAgent = await getAgentById(dbClient_default)({
-    scopes: { tenantId, projectId },
-    agentId
-  });
-  if (!dbAgent) {
-    return null;
-  }
-  const agentFrameworkBaseUrl = `${baseUrl}/agents`;
-  return hydrateAgent({
-    dbAgent,
-    graphId,
-    baseUrl: agentFrameworkBaseUrl,
-    credentialStoreRegistry
-  });
-}
 
 // src/routes/agents.ts
 var app = new OpenAPIHono();
-var logger16 = getLogger("agents");
+var logger17 = getLogger("agents");
 app.openapi(
   createRoute({
     method: "get",
@@ -6448,7 +6529,7 @@ app.openapi(
       tracestate: c.req.header("tracestate"),
       baggage: c.req.header("baggage")
     };
-    logger16.info(
+    logger17.info(
       {
         otelHeaders,
         path: c.req.path,
@@ -6459,7 +6540,7 @@ app.openapi(
     const executionContext = getRequestExecutionContext(c);
     const { tenantId, projectId, graphId, agentId } = executionContext;
     if (agentId) {
-      logger16.info(
+      logger17.info(
         {
           message: "getRegisteredAgent (agent-level)",
           tenantId,
@@ -6471,13 +6552,13 @@ app.openapi(
       );
       const credentialStores = c.get("credentialStores");
       const agent = await getRegisteredAgent(executionContext, credentialStores);
-      logger16.info({ agent }, "agent registered: well-known agent.json");
+      logger17.info({ agent }, "agent registered: well-known agent.json");
       if (!agent) {
         return c.json({ error: "Agent not found" }, 404);
       }
       return c.json(agent.agentCard);
     } else {
-      logger16.info(
+      logger17.info(
         {
           message: "getRegisteredGraph (graph-level)",
           tenantId,
@@ -6500,7 +6581,7 @@ app.post("/a2a", async (c) => {
     tracestate: c.req.header("tracestate"),
     baggage: c.req.header("baggage")
   };
-  logger16.info(
+  logger17.info(
     {
       otelHeaders,
       path: c.req.path,
@@ -6511,7 +6592,7 @@ app.post("/a2a", async (c) => {
   const executionContext = getRequestExecutionContext(c);
   const { tenantId, projectId, graphId, agentId } = executionContext;
   if (agentId) {
-    logger16.info(
+    logger17.info(
       {
         message: "a2a (agent-level)",
         tenantId,
@@ -6535,7 +6616,7 @@ app.post("/a2a", async (c) => {
     }
     return a2aHandler(c, agent);
   } else {
-    logger16.info(
+    logger17.info(
       {
         message: "a2a (graph-level)",
         tenantId,
@@ -6575,14 +6656,14 @@ app.post("/a2a", async (c) => {
   }
 });
 var agents_default = app;
-var logger17 = getLogger("Transfer");
+var logger18 = getLogger("Transfer");
 async function executeTransfer({
   tenantId,
   threadId,
   projectId,
   targetAgentId
 }) {
-  logger17.info({ targetAgent: targetAgentId }, "Executing transfer to agent");
+  logger18.info({ targetAgent: targetAgentId }, "Executing transfer to agent");
   await setActiveAgentForThread(dbClient_default)({
     scopes: { tenantId, projectId },
     threadId,
@@ -6777,7 +6858,7 @@ var _VercelDataStreamHelper = class _VercelDataStreamHelper {
     __publicField(this, "queuedOperations", []);
     // Timing tracking for text sequences (text-end to text-start gap)
     __publicField(this, "lastTextEndTimestamp", 0);
-    __publicField(this, "TEXT_GAP_THRESHOLD", 1e3);
+    __publicField(this, "TEXT_GAP_THRESHOLD", 50);
     // milliseconds - if gap between text sequences is less than this, queue operations
     // Connection management and forced cleanup
     __publicField(this, "connectionDropTimer");
@@ -7123,7 +7204,7 @@ var MCPStreamHelper = class {
 function createMCPStreamHelper() {
   return new MCPStreamHelper();
 }
-var logger18 = getLogger("ExecutionHandler");
+var logger19 = getLogger("ExecutionHandler");
 var ExecutionHandler = class {
   constructor() {
     // Hardcoded error limit - separate from configurable stopWhen
@@ -7148,7 +7229,7 @@ var ExecutionHandler = class {
     const { tenantId, projectId, graphId, apiKey, baseUrl } = executionContext;
     registerStreamHelper(requestId2, sseHelper);
     graphSessionManager.createSession(requestId2, graphId, tenantId, projectId);
-    logger18.info({ sessionId: requestId2, graphId }, "Created GraphSession for message execution");
+    logger19.info({ sessionId: requestId2, graphId }, "Created GraphSession for message execution");
     let graphConfig = null;
     try {
       graphConfig = await getFullGraph(dbClient_default)({ scopes: { tenantId, projectId }, graphId });
@@ -7160,7 +7241,7 @@ var ExecutionHandler = class {
         );
       }
     } catch (error) {
-      logger18.error(
+      logger19.error(
         {
           error: error instanceof Error ? error.message : "Unknown error",
           stack: error instanceof Error ? error.stack : void 0
@@ -7176,7 +7257,7 @@ var ExecutionHandler = class {
     try {
       await sseHelper.writeOperation(agentInitializingOp(requestId2, graphId));
       const taskId = `task_${conversationId}-${requestId2}`;
-      logger18.info(
+      logger19.info(
         { taskId, currentAgentId, conversationId, requestId: requestId2 },
         "Attempting to create or reuse existing task"
       );
@@ -7199,7 +7280,7 @@ var ExecutionHandler = class {
             agent_id: currentAgentId
           }
         });
-        logger18.info(
+        logger19.info(
           {
             taskId,
             createdTaskMetadata: Array.isArray(task) ? task[0]?.metadata : task?.metadata
@@ -7208,27 +7289,27 @@ var ExecutionHandler = class {
         );
       } catch (error) {
         if (error?.message?.includes("UNIQUE constraint failed") || error?.message?.includes("PRIMARY KEY constraint failed") || error?.code === "SQLITE_CONSTRAINT_PRIMARYKEY") {
-          logger18.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;
-            logger18.info(
+            logger19.info(
               { taskId, existingTask },
               "Successfully reused existing task from race condition"
             );
           } else {
-            logger18.error({ taskId, error }, "Task constraint failed but task not found");
+            logger19.error({ taskId, error }, "Task constraint failed but task not found");
             throw error;
           }
         } else {
-          logger18.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;
         }
       }
-      logger18.debug(
+      logger19.debug(
         {
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           executionType: "create_initial_task",
@@ -7246,7 +7327,7 @@ var ExecutionHandler = class {
       const maxTransfers = graphConfig?.stopWhen?.transferCountIs ?? 10;
       while (iterations < maxTransfers) {
         iterations++;
-        logger18.info(
+        logger19.info(
           { iterations, currentAgentId, graphId, conversationId, fromAgentId },
           `Execution loop iteration ${iterations} with agent ${currentAgentId}, transfer from: ${fromAgentId || "none"}`
         );
@@ -7254,10 +7335,10 @@ var ExecutionHandler = class {
           scopes: { tenantId, projectId },
           conversationId
         });
-        logger18.info({ activeAgent }, "activeAgent");
+        logger19.info({ activeAgent }, "activeAgent");
         if (activeAgent && activeAgent.activeAgentId !== currentAgentId) {
           currentAgentId = activeAgent.activeAgentId;
-          logger18.info({ currentAgentId }, `Updated current agent to: ${currentAgentId}`);
+          logger19.info({ currentAgentId }, `Updated current agent to: ${currentAgentId}`);
         }
         const agentBaseUrl = `${baseUrl}/agents`;
         const a2aClient = new A2AClient(agentBaseUrl, {
@@ -7298,13 +7379,13 @@ var ExecutionHandler = class {
         });
         if (!messageResponse?.result) {
           errorCount++;
-          logger18.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`;
-            logger18.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
+            logger19.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
             await sseHelper.writeError(errorMessage2);
             await sseHelper.writeOperation(errorOp(errorMessage2, currentAgentId || "system"));
             if (task) {
@@ -7330,7 +7411,7 @@ var ExecutionHandler = class {
           const transferResponse = messageResponse.result;
           const targetAgentId = transferResponse.artifacts?.[0]?.parts?.[0]?.data?.targetAgentId;
           const transferReason = transferResponse.artifacts?.[0]?.parts?.[1]?.text;
-          logger18.info({ targetAgentId, transferReason }, "transfer response");
+          logger19.info({ targetAgentId, transferReason }, "transfer response");
           currentMessage = `<transfer_context> ${transferReason} </transfer_context>`;
           const { success, targetAgentId: newAgentId } = await executeTransfer({
             projectId,
@@ -7341,7 +7422,7 @@ var ExecutionHandler = class {
           if (success) {
             fromAgentId = currentAgentId;
             currentAgentId = newAgentId;
-            logger18.info(
+            logger19.info(
               {
                 transferFrom: fromAgentId,
                 transferTo: currentAgentId,
@@ -7359,7 +7440,7 @@ var ExecutionHandler = class {
           const graphSessionData = graphSessionManager.getSession(requestId2);
           if (graphSessionData) {
             const sessionSummary = graphSessionData.getSummary();
-            logger18.info(sessionSummary, "GraphSession data after completion");
+            logger19.info(sessionSummary, "GraphSession data after completion");
           }
           let textContent = "";
           for (const part of responseParts) {
@@ -7368,78 +7449,84 @@ var ExecutionHandler = class {
               textContent += part.text;
             }
           }
-          const activeSpan = trace.getActiveSpan();
-          if (activeSpan) {
-            activeSpan.setAttributes({
-              "ai.response.content": textContent || "No response content",
-              "ai.response.timestamp": (/* @__PURE__ */ new Date()).toISOString(),
-              "ai.agent.name": currentAgentId
-            });
-          }
-          await createMessage(dbClient_default)({
-            id: nanoid(),
-            tenantId,
-            projectId,
-            conversationId,
-            role: "agent",
-            content: {
-              text: textContent || void 0,
-              parts: responseParts.map((part) => ({
-                type: part.kind === "text" ? "text" : "data",
-                text: part.kind === "text" ? part.text : void 0,
-                data: part.kind === "data" ? JSON.stringify(part.data) : void 0
-              }))
-            },
-            visibility: "user-facing",
-            messageType: "chat",
-            agentId: currentAgentId,
-            fromAgentId: currentAgentId,
-            taskId: task.id
-          });
-          const updateTaskStart = Date.now();
-          await updateTask(dbClient_default)({
-            taskId: task.id,
-            data: {
-              status: "completed",
-              metadata: {
-                ...task.metadata,
-                completed_at: (/* @__PURE__ */ new Date()).toISOString(),
-                response: {
-                  text: textContent,
-                  parts: responseParts,
-                  hasText: !!textContent,
-                  hasData: responseParts.some((p) => p.kind === "data")
+          return tracer.startActiveSpan("execution_handler.execute", {}, async (span) => {
+            try {
+              span.setAttributes({
+                "ai.response.content": textContent || "No response content",
+                "ai.response.timestamp": (/* @__PURE__ */ new Date()).toISOString(),
+                "ai.agent.name": currentAgentId
+              });
+              await createMessage(dbClient_default)({
+                id: nanoid(),
+                tenantId,
+                projectId,
+                conversationId,
+                role: "agent",
+                content: {
+                  text: textContent || void 0,
+                  parts: responseParts.map((part) => ({
+                    type: part.kind === "text" ? "text" : "data",
+                    text: part.kind === "text" ? part.text : void 0,
+                    data: part.kind === "data" ? JSON.stringify(part.data) : void 0
+                  }))
+                },
+                visibility: "user-facing",
+                messageType: "chat",
+                agentId: currentAgentId,
+                fromAgentId: currentAgentId,
+                taskId: task.id
+              });
+              const updateTaskStart = Date.now();
+              await updateTask(dbClient_default)({
+                taskId: task.id,
+                data: {
+                  status: "completed",
+                  metadata: {
+                    ...task.metadata,
+                    completed_at: (/* @__PURE__ */ new Date()).toISOString(),
+                    response: {
+                      text: textContent,
+                      parts: responseParts,
+                      hasText: !!textContent,
+                      hasData: responseParts.some((p) => p.kind === "data")
+                    }
+                  }
                 }
+              });
+              const updateTaskEnd = Date.now();
+              logger19.info(
+                { duration: updateTaskEnd - updateTaskStart },
+                "Completed updateTask operation"
+              );
+              await sseHelper.writeOperation(completionOp(currentAgentId, iterations));
+              await sseHelper.complete();
+              logger19.info({}, "Ending GraphSession and cleaning up");
+              graphSessionManager.endSession(requestId2);
+              logger19.info({}, "Cleaning up streamHelper");
+              unregisterStreamHelper(requestId2);
+              let response;
+              if (sseHelper instanceof MCPStreamHelper) {
+                const captured = sseHelper.getCapturedResponse();
+                response = captured.text || "No response content";
               }
+              logger19.info({}, "ExecutionHandler returning success");
+              return { success: true, iterations, response };
+            } catch (error) {
+              setSpanWithError(span, error);
+              throw error;
+            } finally {
+              span.end();
             }
           });
-          const updateTaskEnd = Date.now();
-          logger18.info(
-            { duration: updateTaskEnd - updateTaskStart },
-            "Completed updateTask operation"
-          );
-          await sseHelper.writeOperation(completionOp(currentAgentId, iterations));
-          await sseHelper.complete();
-          logger18.info({}, "Ending GraphSession and cleaning up");
-          graphSessionManager.endSession(requestId2);
-          logger18.info({}, "Cleaning up streamHelper");
-          unregisterStreamHelper(requestId2);
-          let response;
-          if (sseHelper instanceof MCPStreamHelper) {
-            const captured = sseHelper.getCapturedResponse();
-            response = captured.text || "No response content";
-          }
-          logger18.info({}, "ExecutionHandler returning success");
-          return { success: true, iterations, response };
         }
         errorCount++;
-        logger18.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`;
-          logger18.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
+          logger19.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
           await sseHelper.writeError(errorMessage2);
           await sseHelper.writeOperation(errorOp(errorMessage2, currentAgentId || "system"));
           if (task) {
@@ -7461,7 +7548,7 @@ var ExecutionHandler = class {
         }
       }
       const errorMessage = `Maximum transfer limit (${maxTransfers}) reached without completion`;
-      logger18.error({ maxTransfers, iterations }, errorMessage);
+      logger19.error({ maxTransfers, iterations }, errorMessage);
       await sseHelper.writeError(errorMessage);
       await sseHelper.writeOperation(errorOp(errorMessage, currentAgentId || "system"));
       if (task) {
@@ -7481,7 +7568,7 @@ var ExecutionHandler = class {
       unregisterStreamHelper(requestId2);
       return { success: false, error: errorMessage, iterations };
     } catch (error) {
-      logger18.error({ error }, "Error in execution handler");
+      logger19.error({ error }, "Error in execution handler");
       const errorMessage = error instanceof Error ? error.message : "Unknown execution error";
       await sseHelper.writeError(`Execution error: ${errorMessage}`);
       await sseHelper.writeOperation(errorOp(errorMessage, currentAgentId || "system"));
@@ -7507,7 +7594,7 @@ var ExecutionHandler = class {
 
 // src/routes/chat.ts
 var app2 = new OpenAPIHono();
-var logger19 = getLogger("completionsHandler");
+var logger20 = getLogger("completionsHandler");
 var chatCompletionsRoute = createRoute({
   method: "post",
   path: "/completions",
@@ -7625,7 +7712,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     tracestate: c.req.header("tracestate"),
     baggage: c.req.header("baggage")
   };
-  logger19.info(
+  logger20.info(
     {
       otelHeaders,
       path: c.req.path,
@@ -7711,7 +7798,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       dbClient_default,
       credentialStores
     );
-    logger19.info(
+    logger20.info(
       {
         tenantId,
         graphId,
@@ -7757,7 +7844,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     return streamSSE(c, async (stream2) => {
       const sseHelper = createSSEStreamHelper(stream2, requestId2, timestamp);
       await sseHelper.writeRole();
-      logger19.info({ agentId }, "Starting execution");
+      logger20.info({ agentId }, "Starting execution");
       const executionHandler = new ExecutionHandler();
       const result = await executionHandler.execute({
         executionContext,
@@ -7767,7 +7854,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
         requestId: requestId2,
         sseHelper
       });
-      logger19.info(
+      logger20.info(
         { result },
         `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
       );
@@ -7800,7 +7887,7 @@ var getMessageText = (content) => {
 };
 var chat_default = app2;
 var app3 = new OpenAPIHono();
-var logger20 = getLogger("chatDataStream");
+var logger21 = getLogger("chatDataStream");
 var chatDataStreamRoute = createRoute({
   method: "post",
   path: "/chat",
@@ -7905,7 +7992,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("") || "";
-    logger20.info({ userText, lastUserMessage }, "userText");
+    logger21.info({ userText, lastUserMessage }, "userText");
     const messageSpan = trace.getActiveSpan();
     if (messageSpan) {
       messageSpan.setAttributes({
@@ -7947,7 +8034,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
             await streamHelper.writeError("Unable to process request");
           }
         } catch (err) {
-          logger20.error({ err }, "Streaming error");
+          logger21.error({ err }, "Streaming error");
           await streamHelper.writeError("Internal server error");
         } finally {
           if ("cleanup" in streamHelper && typeof streamHelper.cleanup === "function") {
@@ -7968,7 +8055,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
       )
     );
   } catch (error) {
-    logger20.error({ error }, "chatDataStream error");
+    logger21.error({ error }, "chatDataStream error");
     return c.json({ error: "Failed to process chat completion" }, 500);
   }
 });
@@ -7976,7 +8063,7 @@ var chatDataStream_default = app3;
 function createMCPSchema(schema) {
   return schema;
 }
-var logger21 = getLogger("mcp");
+var logger22 = getLogger("mcp");
 var _MockResponseSingleton = class _MockResponseSingleton {
   constructor() {
     __publicField(this, "mockRes");
@@ -8031,21 +8118,21 @@ var createSpoofInitMessage = (mcpProtocolVersion) => ({
   id: 0
 });
 var spoofTransportInitialization = async (transport, req, sessionId, mcpProtocolVersion) => {
-  logger21.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);
-    logger21.info({ sessionId }, "Successfully spoofed initialization");
+    logger22.info({ sessionId }, "Successfully spoofed initialization");
   } catch (spoofError) {
-    logger21.warn({ sessionId, error: spoofError }, "Spoof initialization failed, continuing anyway");
+    logger22.warn({ sessionId, error: spoofError }, "Spoof initialization failed, continuing anyway");
   }
 };
 var validateSession = async (req, res, body, tenantId, projectId, graphId) => {
   const sessionId = req.headers["mcp-session-id"];
-  logger21.info({ sessionId }, "Received MCP session ID");
+  logger22.info({ sessionId }, "Received MCP session ID");
   if (!sessionId) {
-    logger21.info({ body }, "Missing session ID");
+    logger22.info({ body }, "Missing session ID");
     res.writeHead(400).end(
       JSON.stringify({
         jsonrpc: "2.0",
@@ -8071,7 +8158,7 @@ var validateSession = async (req, res, body, tenantId, projectId, graphId) => {
     scopes: { tenantId, projectId },
     conversationId: sessionId
   });
-  logger21.info(
+  logger22.info(
     {
       sessionId,
       conversationFound: !!conversation,
@@ -8082,7 +8169,7 @@ var validateSession = async (req, res, body, tenantId, projectId, graphId) => {
     "Conversation lookup result"
   );
   if (!conversation || conversation.metadata?.sessionData?.sessionType !== "mcp" || conversation.metadata?.sessionData?.graphId !== graphId) {
-    logger21.info(
+    logger22.info(
       { sessionId, conversationId: conversation?.id },
       "MCP session not found or invalid"
     );
@@ -8143,7 +8230,7 @@ var executeAgentQuery = async (executionContext, conversationId, query, defaultA
     requestId: requestId2,
     sseHelper: mcpStreamHelper
   });
-  logger21.info(
+  logger22.info(
     { result },
     `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
   );
@@ -8217,7 +8304,7 @@ var getServer = async (requestContext, executionContext, conversationId, credent
           dbClient_default,
           credentialStores
         );
-        logger21.info(
+        logger22.info(
           {
             tenantId,
             graphId,
@@ -8278,7 +8365,7 @@ var validateRequestParameters = (c) => {
 };
 var handleInitializationRequest = async (body, executionContext, validatedContext, req, res, c, credentialStores) => {
   const { tenantId, projectId, graphId } = executionContext;
-  logger21.info({ body }, "Received initialization request");
+  logger22.info({ body }, "Received initialization request");
   const sessionId = nanoid();
   const agentGraph = await getAgentGraphWithDefaultAgent(dbClient_default)({
     scopes: { tenantId, projectId },
@@ -8309,7 +8396,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
       }
     }
   });
-  logger21.info(
+  logger22.info(
     { sessionId, conversationId: conversation.id },
     "Created MCP session as conversation"
   );
@@ -8318,9 +8405,9 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
   });
   const server = await getServer(validatedContext, executionContext, sessionId, credentialStores);
   await server.connect(transport);
-  logger21.info({ sessionId }, "Server connected for initialization");
+  logger22.info({ sessionId }, "Server connected for initialization");
   res.setHeader("Mcp-Session-Id", sessionId);
-  logger21.info(
+  logger22.info(
     {
       sessionId,
       bodyMethod: body?.method,
@@ -8329,7 +8416,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
     "About to handle initialization request"
   );
   await transport.handleRequest(req, res, body);
-  logger21.info({ sessionId }, "Successfully handled initialization request");
+  logger22.info({ sessionId }, "Successfully handled initialization request");
   return toFetchResponse(res);
 };
 var handleExistingSessionRequest = async (body, executionContext, validatedContext, req, res, credentialStores) => {
@@ -8357,8 +8444,8 @@ var handleExistingSessionRequest = async (body, executionContext, validatedConte
     sessionId,
     conversation.metadata?.session_data?.mcpProtocolVersion
   );
-  logger21.info({ sessionId }, "Server connected and transport initialized");
-  logger21.info(
+  logger22.info({ sessionId }, "Server connected and transport initialized");
+  logger22.info(
     {
       sessionId,
       bodyKeys: Object.keys(body || {}),
@@ -8372,9 +8459,9 @@ var handleExistingSessionRequest = async (body, executionContext, validatedConte
   );
   try {
     await transport.handleRequest(req, res, body);
-    logger21.info({ sessionId }, "Successfully handled MCP request");
+    logger22.info({ sessionId }, "Successfully handled MCP request");
   } catch (transportError) {
-    logger21.error(
+    logger22.error(
       {
         sessionId,
         error: transportError,
@@ -8425,13 +8512,13 @@ app4.openapi(
       }
       const { executionContext } = paramValidation;
       const body = c.get("requestBody") || {};
-      logger21.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");
-      logger21.info({ validatedContext }, "Validated context");
-      logger21.info({ req }, "request");
+      logger22.info({ validatedContext }, "Validated context");
+      logger22.info({ req }, "request");
       if (isInitRequest) {
         return await handleInitializationRequest(
           body,
@@ -8453,7 +8540,7 @@ app4.openapi(
         );
       }
     } catch (e) {
-      logger21.error(
+      logger22.error(
         {
           error: e instanceof Error ? e.message : e,
           stack: e instanceof Error ? e.stack : void 0
@@ -8465,7 +8552,7 @@ app4.openapi(
   }
 );
 app4.get("/", async (c) => {
-  logger21.info({}, "Received GET MCP request");
+  logger22.info({}, "Received GET MCP request");
   return c.json(
     {
       jsonrpc: "2.0",
@@ -8479,7 +8566,7 @@ app4.get("/", async (c) => {
   );
 });
 app4.delete("/", async (c) => {
-  logger21.info({}, "Received DELETE MCP request");
+  logger22.info({}, "Received DELETE MCP request");
   return c.json(
     {
       jsonrpc: "2.0",
@@ -8490,11 +8577,10 @@ app4.delete("/", async (c) => {
   );
 });
 var mcp_default = app4;
-
-// src/app.ts
-var logger22 = getLogger("agents-run-api");
+var logger23 = getLogger("agents-run-api");
 function createExecutionHono(serverConfig, credentialStores) {
   const app6 = new OpenAPIHono();
+  app6.use("*", otel());
   app6.use("*", requestId());
   app6.use("*", async (c, next) => {
     c.set("serverConfig", serverConfig);
@@ -8507,7 +8593,7 @@ function createExecutionHono(serverConfig, credentialStores) {
         const body = await c.req.json();
         c.set("requestBody", body);
       } catch (error) {
-        logger22.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();
@@ -8558,8 +8644,8 @@ function createExecutionHono(serverConfig, credentialStores) {
       if (!isExpectedError) {
         const errorMessage = err instanceof Error ? err.message : String(err);
         const errorStack = err instanceof Error ? err.stack : void 0;
-        if (logger22) {
-          logger22.error(
+        if (logger23) {
+          logger23.error(
             {
               error: err,
               message: errorMessage,
@@ -8571,8 +8657,8 @@ function createExecutionHono(serverConfig, credentialStores) {
           );
         }
       } else {
-        if (logger22) {
-          logger22.error(
+        if (logger23) {
+          logger23.error(
             {
               error: err,
               path: c.req.path,
@@ -8589,8 +8675,8 @@ function createExecutionHono(serverConfig, credentialStores) {
         const response = err.getResponse();
         return response;
       } catch (responseError) {
-        if (logger22) {
-          logger22.error({ error: responseError }, "Error while handling HTTPException response");
+        if (logger23) {
+          logger23.error({ error: responseError }, "Error while handling HTTPException response");
         }
       }
     }
@@ -8624,7 +8710,7 @@ function createExecutionHono(serverConfig, credentialStores) {
   app6.use("*", async (c, next) => {
     const executionContext = c.get("executionContext");
     if (!executionContext) {
-      logger22.debug({}, "Empty execution context");
+      logger23.debug({}, "Empty execution context");
       return next();
     }
     const { tenantId, projectId, graphId } = executionContext;
@@ -8633,7 +8719,7 @@ function createExecutionHono(serverConfig, credentialStores) {
     if (requestBody) {
       conversationId = requestBody.conversationId;
       if (!conversationId) {
-        logger22.debug({ requestBody }, "No conversation ID found in request body");
+        logger23.debug({ requestBody }, "No conversation ID found in request body");
       }
     }
     const entries = Object.fromEntries(
@@ -8648,7 +8734,7 @@ function createExecutionHono(serverConfig, credentialStores) {
       })
     );
     if (!Object.keys(entries).length) {
-      logger22.debug({}, "Empty entries for baggage");
+      logger23.debug({}, "Empty entries for baggage");
       return next();
     }
     const bag = Object.entries(entries).reduce(