@inkeep/agents-run-api 0.16.3 → 0.18.0

package/dist/index.js

@@ -1,10 +1,10 @@
 import { flushBatchProcessor } from './chunk-XO4RG36I.js';
 import { getLogger } from './chunk-A2S7GSHL.js';
-import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-5GUNCN5X.js';
+import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-DQQRVSJS.js';
 import { dbClient_default } from './chunk-7IMXW4RD.js';
 import { env } from './chunk-NZHNG4A3.js';
 import { __publicField } from './chunk-PKBMQBKP.js';
-import { getLogger as getLogger$1, getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentGraphWithDefaultAgent, contextValidationMiddleware, getConversationId, getFullGraph, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getAgentById, handleContextResolution, createMessage, commonGetErrorResponses, loggerFactory, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, upsertLedgerArtifact, getAgentGraphById, createTask, updateTask, setSpanWithError, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getRelatedAgentsForGraph, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, validateAndGetApiKey, getProject, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunction, getContextConfigById, getFullGraphDefinition, TemplateEngine, graphHasArtifactComponents, MCPTransportType, getExternalAgent } from '@inkeep/agents-core';
+import { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentGraphWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullGraph, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, commonGetErrorResponses, loggerFactory, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, upsertLedgerArtifact, getAgentGraphById, createTask, updateTask, setSpanWithError, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getRelatedAgentsForGraph, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, validateAndGetApiKey, getProject, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, getContextConfigById, getFullGraphDefinition, TemplateEngine, graphHasArtifactComponents, MCPTransportType, SPAN_KEYS, getExternalAgent } from '@inkeep/agents-core';
 import { otel } from '@hono/otel';
 import { OpenAPIHono, createRoute, z as z$1 } from '@hono/zod-openapi';
 import { trace, propagation, context, SpanStatusCode } from '@opentelemetry/api';
@@ -41,7 +41,7 @@ function createExecutionContext(params) {
     graphId: params.graphId,
     baseUrl: params.baseUrl || process.env.API_URL || "http://localhost:3003",
     apiKeyId: params.apiKeyId,
-    agentId: params.agentId
+    subAgentId: params.subAgentId
   };
 }
 
@@ -56,16 +56,18 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
   const tenantId = c.req.header("x-inkeep-tenant-id");
   const projectId = c.req.header("x-inkeep-project-id");
   const graphId = c.req.header("x-inkeep-graph-id");
-  const agentId = c.req.header("x-inkeep-agent-id");
-  const proto = c.req.header("x-forwarded-proto") ?? "http";
-  const host = c.req.header("x-forwarded-host") ?? c.req.header("host");
-  const baseUrl = `${proto}://${host}`;
+  const subAgentId = c.req.header("x-inkeep-agent-id");
+  const proto = c.req.header("x-forwarded-proto")?.split(",")[0].trim();
+  const fwdHost = c.req.header("x-forwarded-host")?.split(",")[0].trim();
+  const host = fwdHost ?? c.req.header("host");
+  const reqUrl = new URL(c.req.url);
+  const baseUrl = proto && host ? `${proto}://${host}` : host ? `${reqUrl.protocol}//${host}` : `${reqUrl.origin}`;
   if (process.env.ENVIRONMENT === "development" || process.env.ENVIRONMENT === "test") {
     let executionContext;
     if (authHeader?.startsWith("Bearer ")) {
       try {
         executionContext = await extractContextFromApiKey(authHeader.substring(7), baseUrl);
-        executionContext.agentId = agentId;
+        executionContext.subAgentId = subAgentId;
         logger.info({}, "Development/test environment - API key authenticated successfully");
       } catch {
         executionContext = createExecutionContext({
@@ -75,7 +77,7 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
           graphId: graphId || "test-graph",
           apiKeyId: "test-key",
           baseUrl,
-          agentId
+          subAgentId
         });
         logger.info(
           {},
@@ -90,7 +92,7 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
         graphId: graphId || "test-graph",
         apiKeyId: "test-key",
         baseUrl,
-        agentId
+        subAgentId
       });
       logger.info(
         {},
@@ -121,7 +123,7 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
         graphId,
         apiKeyId: "bypass",
         baseUrl,
-        agentId
+        subAgentId
       });
       c.set("executionContext", executionContext);
       logger.info({}, "Bypass secret authenticated successfully");
@@ -129,7 +131,7 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
       return;
     } else if (apiKey) {
       const executionContext = await extractContextFromApiKey(apiKey, baseUrl);
-      executionContext.agentId = agentId;
+      executionContext.subAgentId = subAgentId;
       c.set("executionContext", executionContext);
       logger.info({}, "API key authenticated successfully");
       await next();
@@ -147,14 +149,14 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
   }
   try {
     const executionContext = await extractContextFromApiKey(apiKey, baseUrl);
-    executionContext.agentId = agentId;
+    executionContext.subAgentId = subAgentId;
     c.set("executionContext", executionContext);
     logger.debug(
       {
         tenantId: executionContext.tenantId,
         projectId: executionContext.projectId,
         graphId: executionContext.graphId,
-        agentId: executionContext.agentId
+        subAgentId: executionContext.subAgentId
       },
       "API key authenticated successfully"
     );
@@ -322,7 +324,7 @@ async function handleMessageSend(c, agent, request) {
         logger2.warn(
           {
             taskId: task.id,
-            agentId: agent.agentId,
+            subAgentId: agent.subAgentId,
             originalMessage: params.message
           },
           "Created fallback message content for empty delegation message"
@@ -343,7 +345,7 @@ async function handleMessageSend(c, agent, request) {
         taskContextId: task.context?.conversationId,
         metadataContextId: params.message.metadata?.conversationId,
         finalContextId: effectiveContextId,
-        agentId: agent.agentId
+        subAgentId: agent.subAgentId
       },
       "A2A contextId resolution for delegation"
     );
@@ -359,11 +361,11 @@ async function handleMessageSend(c, agent, request) {
         message_id: params.message.messageId || "",
         created_at: (/* @__PURE__ */ new Date()).toISOString(),
         updated_at: (/* @__PURE__ */ new Date()).toISOString(),
-        agent_id: agent.agentId,
+        agent_id: agent.subAgentId,
         graph_id: graphId || "",
         stream_request_id: params.message.metadata?.stream_request_id
       },
-      agentId: agent.agentId,
+      subAgentId: agent.subAgentId,
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       updatedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
@@ -386,17 +388,17 @@ async function handleMessageSend(c, agent, request) {
         };
         if (params.message.metadata?.fromAgentId) {
           messageData.fromAgentId = params.message.metadata.fromAgentId;
-          messageData.toAgentId = agent.agentId;
+          messageData.toAgentId = agent.subAgentId;
         } else if (params.message.metadata?.fromExternalAgentId) {
           messageData.fromExternalAgentId = params.message.metadata.fromExternalAgentId;
-          messageData.toAgentId = agent.agentId;
+          messageData.toAgentId = agent.subAgentId;
         }
         await createMessage(dbClient_default)(messageData);
         logger2.info(
           {
             fromAgentId: params.message.metadata.fromAgentId,
             fromExternalAgentId: params.message.metadata.fromExternalAgentId,
-            toAgentId: agent.agentId,
+            toAgentId: agent.subAgentId,
             conversationId: effectiveContextId,
             messageType: "a2a-request",
             taskId: task.id
@@ -409,7 +411,7 @@ async function handleMessageSend(c, agent, request) {
             error,
             fromAgentId: params.message.metadata.fromAgentId,
             fromExternalAgentId: params.message.metadata.fromExternalAgentId,
-            toAgentId: agent.agentId,
+            toAgentId: agent.subAgentId,
             conversationId: effectiveContextId
           },
           "Failed to store A2A message in database"
@@ -426,7 +428,7 @@ async function handleMessageSend(c, agent, request) {
           message_id: params.message.messageId || "",
           created_at: (/* @__PURE__ */ new Date()).toISOString(),
           updated_at: (/* @__PURE__ */ new Date()).toISOString(),
-          agent_id: agent.agentId,
+          agent_id: agent.subAgentId,
           graph_id: graphId || ""
         }
       }
@@ -460,7 +462,7 @@ async function handleMessageSend(c, agent, request) {
                     kind: "data",
                     data: {
                       type: "transfer",
-                      targetAgentId: transferPart.data.target
+                      targetSubAgentId: transferPart.data.target
                     }
                   },
                   {
@@ -760,7 +762,7 @@ async function handleGetCapabilities(c, agent, request) {
 async function handleGetStatus(c, agent, request) {
   return c.json({
     jsonrpc: "2.0",
-    result: { status: "ready", agentId: agent.agentId },
+    result: { status: "ready", subAgentId: agent.subAgentId },
     id: request.id
   });
 }
@@ -823,7 +825,6 @@ async function handleTasksResubscribe(c, agent, request) {
     });
   }
 }
-getLogger$1("agents");
 function createAgentCard({
   dbAgent,
   baseUrl
@@ -901,7 +902,7 @@ async function hydrateAgent({
       tenantId: dbAgent.tenantId,
       projectId: dbAgent.projectId,
       graphId,
-      agentId: dbAgent.id,
+      subAgentId: dbAgent.id,
       baseUrl,
       apiKey
     });
@@ -911,7 +912,7 @@ async function hydrateAgent({
       baseUrl
     });
     return {
-      agentId: dbAgent.id,
+      subAgentId: dbAgent.id,
       tenantId: dbAgent.tenantId,
       projectId: dbAgent.projectId,
       graphId,
@@ -924,13 +925,13 @@ async function hydrateAgent({
   }
 }
 async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
-  const { tenantId, projectId, graphId, agentId, baseUrl, apiKey } = executionContext;
-  if (!agentId) {
+  const { tenantId, projectId, graphId, subAgentId, baseUrl, apiKey } = executionContext;
+  if (!subAgentId) {
     throw new Error("Agent ID is required");
   }
-  const dbAgent = await getAgentById(dbClient_default)({
+  const dbAgent = await getSubAgentById(dbClient_default)({
     scopes: { tenantId, projectId, graphId },
-    agentId
+    subAgentId
   });
   if (!dbAgent) {
     return null;
@@ -944,7 +945,7 @@ async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
     apiKey
   });
 }
-var logger4 = getLogger("ModelFactory");
+var logger3 = getLogger("ModelFactory");
 var _ModelFactory = class _ModelFactory {
   /**
    * Create a provider instance with custom configuration
@@ -1006,7 +1007,7 @@ var _ModelFactory = class _ModelFactory {
     }
     const modelString = modelSettings.model.trim();
     const { provider, modelName } = _ModelFactory.parseModelString(modelString);
-    logger4.debug(
+    logger3.debug(
       {
         provider,
         model: modelName,
@@ -1017,7 +1018,7 @@ var _ModelFactory = class _ModelFactory {
     );
     const providerConfig = _ModelFactory.extractProviderConfig(modelSettings.providerOptions);
     if (Object.keys(providerConfig).length > 0) {
-      logger4.info({ config: providerConfig }, `Applying custom ${provider} provider configuration`);
+      logger3.info({ config: providerConfig }, `Applying custom ${provider} provider configuration`);
       const customProvider = _ModelFactory.createProvider(provider, providerConfig);
       return customProvider.languageModel(modelName);
     }
@@ -1133,7 +1134,7 @@ __publicField(_ModelFactory, "BUILT_IN_PROVIDERS", [
   "gateway"
 ]);
 var ModelFactory = _ModelFactory;
-var logger5 = getLogger("ToolSessionManager");
+var logger4 = getLogger("ToolSessionManager");
 var _ToolSessionManager = class _ToolSessionManager {
   // 5 minutes
   constructor() {
@@ -1168,7 +1169,7 @@ var _ToolSessionManager = class _ToolSessionManager {
       createdAt: Date.now()
     };
     this.sessions.set(sessionId, session);
-    logger5.debug(
+    logger4.debug(
       {
         sessionId,
         tenantId,
@@ -1186,10 +1187,10 @@ var _ToolSessionManager = class _ToolSessionManager {
    */
   ensureGraphSession(sessionId, tenantId, projectId, contextId, taskId) {
     if (this.sessions.has(sessionId)) {
-      logger5.debug({ sessionId }, "Graph session already exists, reusing");
+      logger4.debug({ sessionId }, "Graph session already exists, reusing");
       return sessionId;
     }
-    logger5.debug(
+    logger4.debug(
       { sessionId, tenantId, contextId, taskId },
       "Creating new graph-scoped tool session"
     );
@@ -1201,7 +1202,7 @@ var _ToolSessionManager = class _ToolSessionManager {
   recordToolResult(sessionId, toolResult) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger5.warn(
+      logger4.warn(
         {
           sessionId,
           toolCallId: toolResult.toolCallId,
@@ -1213,7 +1214,7 @@ var _ToolSessionManager = class _ToolSessionManager {
       return;
     }
     session.toolResults.set(toolResult.toolCallId, toolResult);
-    logger5.debug(
+    logger4.debug(
       {
         sessionId,
         toolCallId: toolResult.toolCallId,
@@ -1228,7 +1229,7 @@ var _ToolSessionManager = class _ToolSessionManager {
   getToolResult(sessionId, toolCallId) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger5.warn(
+      logger4.warn(
         {
           sessionId,
           toolCallId,
@@ -1241,7 +1242,7 @@ var _ToolSessionManager = class _ToolSessionManager {
     }
     const result = session.toolResults.get(toolCallId);
     if (!result) {
-      logger5.warn(
+      logger4.warn(
         {
           sessionId,
           toolCallId,
@@ -1251,7 +1252,7 @@ var _ToolSessionManager = class _ToolSessionManager {
         "Tool result not found"
       );
     } else {
-      logger5.debug(
+      logger4.debug(
         {
           sessionId,
           toolCallId,
@@ -1290,10 +1291,10 @@ var _ToolSessionManager = class _ToolSessionManager {
     }
     for (const sessionId of expiredSessions) {
       this.sessions.delete(sessionId);
-      logger5.debug({ sessionId }, "Cleaned up expired tool session");
+      logger4.debug({ sessionId }, "Cleaned up expired tool session");
     }
     if (expiredSessions.length > 0) {
-      logger5.info({ expiredCount: expiredSessions.length }, "Cleaned up expired tool sessions");
+      logger4.info({ expiredCount: expiredSessions.length }, "Cleaned up expired tool sessions");
     }
   }
 };
@@ -1363,7 +1364,7 @@ function extractFullFields(schema) {
 }
 
 // src/services/ArtifactService.ts
-var logger7 = getLogger("ArtifactService");
+var logger6 = getLogger("ArtifactService");
 var _ArtifactService = class _ArtifactService {
   constructor(context) {
     this.context = context;
@@ -1395,7 +1396,7 @@ var _ArtifactService = class _ArtifactService {
           id: taskId
         });
         if (!task) {
-          logger7.warn({ taskId }, "Task not found when fetching artifacts");
+          logger6.warn({ taskId }, "Task not found when fetching artifacts");
           continue;
         }
         const taskArtifacts = await getLedgerArtifacts(dbClient_default)({
@@ -1413,21 +1414,21 @@ var _ArtifactService = class _ArtifactService {
         }
       }
     } catch (error) {
-      logger7.error({ error, contextId }, "Error loading context artifacts");
+      logger6.error({ error, contextId }, "Error loading context artifacts");
     }
     return artifacts;
   }
   /**
    * Create artifact from tool result and request data
    */
-  async createArtifact(request, agentId) {
+  async createArtifact(request, subAgentId) {
     if (!this.context.sessionId) {
-      logger7.warn({ request }, "No session ID available for artifact creation");
+      logger6.warn({ request }, "No session ID available for artifact creation");
       return null;
     }
     const toolResult = toolSessionManager.getToolResult(this.context.sessionId, request.toolCallId);
     if (!toolResult) {
-      logger7.warn(
+      logger6.warn(
         { request, sessionId: this.context.sessionId },
         "Tool result not found for artifact"
       );
@@ -1443,7 +1444,7 @@ var _ArtifactService = class _ArtifactService {
         selectedData = selectedData.length > 0 ? selectedData[0] : {};
       }
       if (!selectedData) {
-        logger7.warn(
+        logger6.warn(
           {
             request,
             baseSelector: request.baseSelector
@@ -1488,7 +1489,7 @@ var _ArtifactService = class _ArtifactService {
         type: request.type,
         data: cleanedSummaryData
       };
-      await this.persistArtifact(request, cleanedSummaryData, cleanedFullData, agentId);
+      await this.persistArtifact(request, cleanedSummaryData, cleanedFullData, subAgentId);
       await this.cacheArtifact(
         request.artifactId,
         request.toolCallId,
@@ -1497,7 +1498,7 @@ var _ArtifactService = class _ArtifactService {
       );
       return artifactData;
     } catch (error) {
-      logger7.error({ error, request }, "Failed to create artifact");
+      logger6.error({ error, request }, "Failed to create artifact");
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
       throw new Error(`Artifact creation failed for ${request.artifactId}: ${errorMessage}`);
     }
@@ -1526,7 +1527,7 @@ var _ArtifactService = class _ArtifactService {
     }
     try {
       if (!this.context.projectId || !this.context.taskId) {
-        logger7.warn(
+        logger6.warn(
           { artifactId, toolCallId },
           "No projectId or taskId available for artifact lookup"
         );
@@ -1541,7 +1542,7 @@ var _ArtifactService = class _ArtifactService {
         return this.formatArtifactSummaryData(artifacts[0], artifactId, toolCallId);
       }
     } catch (error) {
-      logger7.warn(
+      logger6.warn(
         { artifactId, toolCallId, taskId: this.context.taskId, error },
         "Failed to fetch artifact"
       );
@@ -1572,7 +1573,7 @@ var _ArtifactService = class _ArtifactService {
     }
     try {
       if (!this.context.projectId || !this.context.taskId) {
-        logger7.warn(
+        logger6.warn(
           { artifactId, toolCallId },
           "No projectId or taskId available for artifact lookup"
         );
@@ -1587,7 +1588,7 @@ var _ArtifactService = class _ArtifactService {
         return this.formatArtifactFullData(artifacts[0], artifactId, toolCallId);
       }
     } catch (error) {
-      logger7.warn(
+      logger6.warn(
         { artifactId, toolCallId, taskId: this.context.taskId, error },
         "Failed to fetch artifact"
       );
@@ -1623,8 +1624,8 @@ var _ArtifactService = class _ArtifactService {
   /**
    * Persist artifact to database via graph session
    */
-  async persistArtifact(request, summaryData, fullData, agentId) {
-    const effectiveAgentId = agentId || this.context.agentId;
+  async persistArtifact(request, summaryData, fullData, subAgentId) {
+    const effectiveAgentId = subAgentId || this.context.subAgentId;
     if (this.context.streamRequestId && effectiveAgentId && this.context.taskId) {
       await graphSessionManager.recordEvent(
         this.context.streamRequestId,
@@ -1637,7 +1638,7 @@ var _ArtifactService = class _ArtifactService {
           artifactType: request.type,
           summaryData,
           data: fullData,
-          agentId: effectiveAgentId,
+          subAgentId: effectiveAgentId,
           metadata: {
             toolCallId: request.toolCallId,
             baseSelector: request.baseSelector,
@@ -1652,14 +1653,14 @@ var _ArtifactService = class _ArtifactService {
         }
       );
     } else {
-      logger7.warn(
+      logger6.warn(
         {
           artifactId: request.artifactId,
           hasStreamRequestId: !!this.context.streamRequestId,
           hasAgentId: !!effectiveAgentId,
           hasTaskId: !!this.context.taskId,
-          passedAgentId: agentId,
-          contextAgentId: this.context.agentId
+          passedAgentId: subAgentId,
+          contextAgentId: this.context.subAgentId
         },
         "Skipping artifact_saved event - missing required context"
       );
@@ -1727,7 +1728,7 @@ var _ArtifactService = class _ArtifactService {
           summaryData = this.filterBySchema(artifact.data, previewSchema);
           fullData = this.filterBySchema(artifact.data, fullSchema);
         } catch (error) {
-          logger7.warn(
+          logger6.warn(
             {
               artifactType: artifact.type,
               error: error instanceof Error ? error.message : "Unknown error"
@@ -1765,7 +1766,7 @@ var _ArtifactService = class _ArtifactService {
       artifact: artifactToSave
     });
     if (!result.created && result.existing) {
-      logger7.debug(
+      logger6.debug(
         {
           artifactId: artifact.artifactId,
           taskId: this.context.taskId
@@ -1818,7 +1819,7 @@ var _ArtifactService = class _ArtifactService {
           extracted[propName] = this.cleanEscapedContent(rawValue);
         }
       } catch (error) {
-        logger7.warn(
+        logger6.warn(
           { propName, selector, error: error instanceof Error ? error.message : "Unknown error" },
           "Failed to extract property"
         );
@@ -1850,7 +1851,7 @@ var _ArtifactService = class _ArtifactService {
             extracted[fieldName] = this.cleanEscapedContent(rawValue);
           }
         } catch (error) {
-          logger7.warn(
+          logger6.warn(
             { fieldName, error: error instanceof Error ? error.message : "Unknown error" },
             "Failed to extract schema field"
           );
@@ -1881,7 +1882,7 @@ __publicField(_ArtifactService, "selectorCache", /* @__PURE__ */ new Map());
 var ArtifactService = _ArtifactService;
 
 // src/services/ArtifactParser.ts
-var logger8 = getLogger("ArtifactParser");
+var logger7 = getLogger("ArtifactParser");
 var _ArtifactParser = class _ArtifactParser {
   constructor(tenantId, options) {
     __publicField(this, "artifactService");
@@ -1969,7 +1970,7 @@ var _ArtifactParser = class _ArtifactParser {
       attrs[key] = value;
     }
     if (!attrs.id || !attrs.tool || !attrs.type || !attrs.base) {
-      logger8.warn({ attrs, attrString }, "Missing required attributes in artifact annotation");
+      logger7.warn({ attrs, attrString }, "Missing required attributes in artifact annotation");
       return null;
     }
     return {
@@ -2000,7 +2001,7 @@ var _ArtifactParser = class _ArtifactParser {
   /**
    * Extract artifact data from a create annotation - delegates to service
    */
-  async extractFromCreateAnnotation(annotation, agentId) {
+  async extractFromCreateAnnotation(annotation, subAgentId) {
     const request = {
       artifactId: annotation.artifactId,
       toolCallId: annotation.toolCallId,
@@ -2008,21 +2009,21 @@ var _ArtifactParser = class _ArtifactParser {
       baseSelector: annotation.baseSelector,
       detailsSelector: annotation.detailsSelector
     };
-    return this.artifactService.createArtifact(request, agentId);
+    return this.artifactService.createArtifact(request, subAgentId);
   }
   /**
    * Parse text with artifact markers into parts array
    * Handles both artifact:ref and artifact:create tags
    * Can work with or without pre-fetched artifact map
    */
-  async parseText(text, artifactMap, agentId) {
+  async parseText(text, artifactMap, subAgentId) {
     let processedText = text;
     const createAnnotations = this.parseCreateAnnotations(text);
     const createdArtifactData = /* @__PURE__ */ new Map();
     const failedAnnotations = [];
     for (const annotation of createAnnotations) {
       try {
-        const artifactData = await this.extractFromCreateAnnotation(annotation, agentId);
+        const artifactData = await this.extractFromCreateAnnotation(annotation, subAgentId);
         if (artifactData && annotation.raw) {
           createdArtifactData.set(annotation.raw, artifactData);
         } else if (annotation.raw) {
@@ -2030,7 +2031,7 @@ var _ArtifactParser = class _ArtifactParser {
             `Failed to create artifact "${annotation.artifactId}": Missing or invalid data`
           );
           processedText = processedText.replace(annotation.raw, "");
-          logger8.warn(
+          logger7.warn(
             { annotation, artifactData },
             "Removed failed artifact:create annotation from output"
           );
@@ -2041,11 +2042,11 @@ var _ArtifactParser = class _ArtifactParser {
         if (annotation.raw) {
           processedText = processedText.replace(annotation.raw, "");
         }
-        logger8.error({ annotation, error }, "Failed to extract artifact from create annotation");
+        logger7.error({ annotation, error }, "Failed to extract artifact from create annotation");
       }
     }
     if (failedAnnotations.length > 0) {
-      logger8.warn(
+      logger7.warn(
         {
           failedCount: failedAnnotations.length,
           failures: failedAnnotations
@@ -2109,7 +2110,7 @@ var _ArtifactParser = class _ArtifactParser {
   /**
    * Process object/dataComponents for artifact components
    */
-  async parseObject(obj, artifactMap, agentId) {
+  async parseObject(obj, artifactMap, subAgentId) {
     if (obj?.dataComponents && Array.isArray(obj.dataComponents)) {
       const parts = [];
       for (const component of obj.dataComponents) {
@@ -2133,7 +2134,7 @@ var _ArtifactParser = class _ArtifactParser {
             });
           }
         } else if (this.isArtifactCreateComponent(component)) {
-          const createData = await this.extractFromArtifactCreateComponent(component, agentId);
+          const createData = await this.extractFromArtifactCreateComponent(component, subAgentId);
           if (createData) {
             parts.push({
               kind: "data",
@@ -2174,7 +2175,7 @@ var _ArtifactParser = class _ArtifactParser {
       ] : [];
     }
     if (this.isArtifactCreateComponent(obj)) {
-      const createData = await this.extractFromArtifactCreateComponent(obj, agentId);
+      const createData = await this.extractFromArtifactCreateComponent(obj, subAgentId);
       return createData ? [
         {
           kind: "data",
@@ -2206,7 +2207,7 @@ var _ArtifactParser = class _ArtifactParser {
   /**
    * Extract artifact from ArtifactCreate component
    */
-  async extractFromArtifactCreateComponent(component, agentId) {
+  async extractFromArtifactCreateComponent(component, subAgentId) {
     const props = component.props;
     if (!props) {
       return null;
@@ -2218,7 +2219,7 @@ var _ArtifactParser = class _ArtifactParser {
       baseSelector: props.base_selector,
       detailsSelector: props.details_selector || {}
     };
-    return await this.extractFromCreateAnnotation(annotation, agentId);
+    return await this.extractFromCreateAnnotation(annotation, subAgentId);
   }
   /**
    * Get artifact data - delegates to service
@@ -2258,7 +2259,7 @@ __publicField(_ArtifactParser, "INCOMPLETE_CREATE_REGEX", /<artifact:create(?![^
 var ArtifactParser = _ArtifactParser;
 
 // src/services/GraphSession.ts
-var logger9 = getLogger("GraphSession");
+var logger8 = getLogger("GraphSession");
 var GraphSession = class {
   // Whether to send data operations
   constructor(sessionId, messageId, graphId, tenantId, projectId, contextId) {
@@ -2291,7 +2292,7 @@ var GraphSession = class {
     __publicField(this, "artifactParser");
     // Session-scoped ArtifactParser instance
     __publicField(this, "isEmitOperations", false);
-    logger9.debug({ sessionId, messageId, graphId }, "GraphSession created");
+    logger8.debug({ sessionId, messageId, graphId }, "GraphSession created");
     if (tenantId && projectId) {
       toolSessionManager.createSessionWithId(
         sessionId,
@@ -2305,7 +2306,6 @@ var GraphSession = class {
         tenantId,
         projectId,
         sessionId,
-        // Same ID as ToolSession
         contextId,
         taskId: `task_${contextId}-${messageId}`,
         streamRequestId: sessionId
@@ -2326,7 +2326,7 @@ var GraphSession = class {
    */
   enableEmitOperations() {
     this.isEmitOperations = true;
-    logger9.info(
+    logger8.info(
       { sessionId: this.sessionId },
       "\u{1F50D} DEBUG: Emit operations enabled for GraphSession"
     );
@@ -2343,14 +2343,14 @@ var GraphSession = class {
           label: this.generateEventLabel(event),
           details: {
             timestamp: event.timestamp,
-            agentId: event.agentId,
+            subAgentId: event.subAgentId,
             data: event.data
           }
         };
         await streamHelper.writeOperation(formattedOperation);
       }
     } catch (error) {
-      logger9.error(
+      logger8.error(
         {
           sessionId: this.sessionId,
           eventType: event.eventType,
@@ -2366,29 +2366,19 @@ var GraphSession = class {
   generateEventLabel(event) {
     switch (event.eventType) {
       case "agent_generate":
-        return `Agent ${event.agentId} generating response`;
+        return `Agent ${event.subAgentId} generating response`;
       case "agent_reasoning":
-        return `Agent ${event.agentId} reasoning through request`;
-      case "tool_execution": {
-        const toolData = event.data;
-        return `Tool execution: ${toolData.toolName || "unknown"}`;
-      }
-      case "transfer": {
-        const transferData = event.data;
-        return `Agent transfer: ${transferData.fromAgent} \u2192 ${transferData.targetAgent}`;
-      }
-      case "delegation_sent": {
-        const delegationData = event.data;
-        return `Task delegated: ${delegationData.fromAgent} \u2192 ${delegationData.targetAgent}`;
-      }
-      case "delegation_returned": {
-        const returnData = event.data;
-        return `Task completed: ${returnData.targetAgent} \u2192 ${returnData.fromAgent}`;
-      }
-      case "artifact_saved": {
-        const artifactData = event.data;
-        return `Artifact saved: ${artifactData.artifactType || "unknown type"}`;
-      }
+        return `Agent ${event.subAgentId} reasoning through request`;
+      case "tool_execution":
+        return `Tool execution: ${event.data.toolName || "unknown"}`;
+      case "transfer":
+        return `Agent transfer: ${event.data.fromSubAgent} \u2192 ${event.data.targetSubAgent}`;
+      case "delegation_sent":
+        return `Task delegated: ${event.data.fromSubAgent} \u2192 ${event.data.targetSubAgent}`;
+      case "delegation_returned":
+        return `Task completed: ${event.data.targetSubAgent} \u2192 ${event.data.fromSubAgent}`;
+      case "artifact_saved":
+        return `Artifact saved: ${event.data.artifactType || "unknown type"}`;
       default:
         return `${event.eventType} event`;
     }
@@ -2413,7 +2403,7 @@ var GraphSession = class {
     if (this.statusUpdateState.config.timeInSeconds) {
       this.statusUpdateTimer = setInterval(async () => {
         if (!this.statusUpdateState || this.isEnded) {
-          logger9.debug(
+          logger8.debug(
             { sessionId: this.sessionId },
             "Timer triggered but session already cleaned up or ended"
           );
@@ -2425,7 +2415,7 @@ var GraphSession = class {
         }
         await this.checkAndSendTimeBasedUpdate();
       }, this.statusUpdateState.config.timeInSeconds * 1e3);
-      logger9.info(
+      logger8.info(
         {
           sessionId: this.sessionId,
           intervalMs: this.statusUpdateState.config.timeInSeconds * 1e3
@@ -2436,22 +2426,24 @@ var GraphSession = class {
   }
   /**
    * Record an event in the session and trigger status updates if configured
+   * Generic type parameter T ensures eventType and data are correctly paired
    */
-  recordEvent(eventType, agentId, data) {
+  recordEvent(eventType, subAgentId, data) {
     if (this.isEmitOperations) {
-      this.sendDataOperation({
+      const dataOpEvent = {
         timestamp: Date.now(),
         eventType,
-        agentId,
+        subAgentId,
         data
-      });
+      };
+      this.sendDataOperation(dataOpEvent);
     }
     if (this.isEnded) {
-      logger9.debug(
+      logger8.debug(
         {
           sessionId: this.sessionId,
           eventType,
-          agentId
+          subAgentId
         },
         "Event received after session ended - ignoring"
       );
@@ -2460,59 +2452,62 @@ var GraphSession = class {
     const event = {
       timestamp: Date.now(),
       eventType,
-      agentId,
+      subAgentId,
       data
     };
     this.events.push(event);
-    if (eventType === "artifact_saved" && data.pendingGeneration) {
-      const artifactId = data.artifactId;
-      if (this.pendingArtifacts.size >= this.MAX_PENDING_ARTIFACTS) {
-        logger9.warn(
-          {
-            sessionId: this.sessionId,
-            artifactId,
-            pendingCount: this.pendingArtifacts.size,
-            maxAllowed: this.MAX_PENDING_ARTIFACTS
-          },
-          "Too many pending artifacts, skipping processing"
-        );
-        return;
-      }
-      this.pendingArtifacts.add(artifactId);
-      setImmediate(() => {
-        const artifactDataWithAgent = { ...data, agentId };
-        this.processArtifact(artifactDataWithAgent).then(() => {
-          this.pendingArtifacts.delete(artifactId);
-          this.artifactProcessingErrors.delete(artifactId);
-        }).catch((error) => {
-          const errorCount = (this.artifactProcessingErrors.get(artifactId) || 0) + 1;
-          this.artifactProcessingErrors.set(artifactId, errorCount);
-          if (errorCount >= this.MAX_ARTIFACT_RETRIES) {
+    if (eventType === "artifact_saved") {
+      const artifactData = data;
+      if (artifactData.pendingGeneration) {
+        const artifactId = artifactData.artifactId;
+        if (this.pendingArtifacts.size >= this.MAX_PENDING_ARTIFACTS) {
+          logger8.warn(
+            {
+              sessionId: this.sessionId,
+              artifactId,
+              pendingCount: this.pendingArtifacts.size,
+              maxAllowed: this.MAX_PENDING_ARTIFACTS
+            },
+            "Too many pending artifacts, skipping processing"
+          );
+          return;
+        }
+        this.pendingArtifacts.add(artifactId);
+        setImmediate(() => {
+          const artifactDataWithAgent = { ...artifactData, subAgentId };
+          this.processArtifact(artifactDataWithAgent).then(() => {
             this.pendingArtifacts.delete(artifactId);
-            logger9.error(
-              {
-                sessionId: this.sessionId,
-                artifactId,
-                errorCount,
-                maxRetries: this.MAX_ARTIFACT_RETRIES,
-                error: error instanceof Error ? error.message : "Unknown error",
-                stack: error instanceof Error ? error.stack : void 0
-              },
-              "Artifact processing failed after max retries, giving up"
-            );
-          } else {
-            logger9.warn(
-              {
-                sessionId: this.sessionId,
-                artifactId,
-                errorCount,
-                error: error instanceof Error ? error.message : "Unknown error"
-              },
-              "Artifact processing failed, may retry"
-            );
-          }
+            this.artifactProcessingErrors.delete(artifactId);
+          }).catch((error) => {
+            const errorCount = (this.artifactProcessingErrors.get(artifactId) || 0) + 1;
+            this.artifactProcessingErrors.set(artifactId, errorCount);
+            if (errorCount >= this.MAX_ARTIFACT_RETRIES) {
+              this.pendingArtifacts.delete(artifactId);
+              logger8.error(
+                {
+                  sessionId: this.sessionId,
+                  artifactId,
+                  errorCount,
+                  maxRetries: this.MAX_ARTIFACT_RETRIES,
+                  error: error instanceof Error ? error.message : "Unknown error",
+                  stack: error instanceof Error ? error.stack : void 0
+                },
+                "Artifact processing failed after max retries, giving up"
+              );
+            } else {
+              logger8.warn(
+                {
+                  sessionId: this.sessionId,
+                  artifactId,
+                  errorCount,
+                  error: error instanceof Error ? error.message : "Unknown error"
+                },
+                "Artifact processing failed, may retry"
+              );
+            }
+          });
         });
-      });
+      }
     }
     if (!this.isEnded) {
       this.checkStatusUpdates();
@@ -2523,14 +2518,14 @@ var GraphSession = class {
    */
   checkStatusUpdates() {
     if (this.isEnded) {
-      logger9.debug(
+      logger8.debug(
         { sessionId: this.sessionId },
         "Session has ended - skipping status update check"
       );
       return;
     }
     if (!this.statusUpdateState) {
-      logger9.debug({ sessionId: this.sessionId }, "No status update state - skipping check");
+      logger8.debug({ sessionId: this.sessionId }, "No status update state - skipping check");
       return;
     }
     const statusUpdateState = this.statusUpdateState;
@@ -2541,11 +2536,11 @@ var GraphSession = class {
    */
   async checkAndSendTimeBasedUpdate() {
     if (this.isEnded) {
-      logger9.debug({ sessionId: this.sessionId }, "Session has ended - skipping time-based update");
+      logger8.debug({ sessionId: this.sessionId }, "Session has ended - skipping time-based update");
       return;
     }
     if (!this.statusUpdateState) {
-      logger9.debug(
+      logger8.debug(
         { sessionId: this.sessionId },
         "No status updates configured for time-based check"
       );
@@ -2558,7 +2553,7 @@ var GraphSession = class {
     try {
       await this.generateAndSendUpdate();
     } catch (error) {
-      logger9.error(
+      logger8.error(
         {
           sessionId: this.sessionId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -2582,8 +2577,8 @@ var GraphSession = class {
   /**
    * Get events filtered by agent
    */
-  getEventsByAgent(agentId) {
-    return this.events.filter((event) => event.agentId === agentId);
+  getEventsByAgent(subAgentId) {
+    return this.events.filter((event) => event.subAgentId === subAgentId);
   }
   /**
    * Get summary of session activity
@@ -2598,7 +2593,7 @@ var GraphSession = class {
     );
     const agentCounts = this.events.reduce(
       (counts, event) => {
-        counts[event.agentId] = (counts[event.agentId] || 0) + 1;
+        counts[event.subAgentId] = (counts[event.subAgentId] || 0) + 1;
         return counts;
       },
       {}
@@ -2661,29 +2656,29 @@ var GraphSession = class {
    */
   async generateAndSendUpdate() {
     if (this.isEnded) {
-      logger9.debug({ sessionId: this.sessionId }, "Session has ended - not generating update");
+      logger8.debug({ sessionId: this.sessionId }, "Session has ended - not generating update");
       return;
     }
     if (this.isTextStreaming) {
-      logger9.debug(
+      logger8.debug(
         { sessionId: this.sessionId },
         "Text is currently streaming - skipping status update"
       );
       return;
     }
     if (this.isGeneratingUpdate) {
-      logger9.debug(
+      logger8.debug(
         { sessionId: this.sessionId },
         "Update already in progress - skipping duplicate generation"
       );
       return;
     }
     if (!this.statusUpdateState) {
-      logger9.warn({ sessionId: this.sessionId }, "No status update state - cannot generate update");
+      logger8.warn({ sessionId: this.sessionId }, "No status update state - cannot generate update");
       return;
     }
     if (!this.graphId) {
-      logger9.warn({ sessionId: this.sessionId }, "No graph ID - cannot generate update");
+      logger8.warn({ sessionId: this.sessionId }, "No graph ID - cannot generate update");
       return;
     }
     const newEventCount = this.events.length - this.statusUpdateState.lastEventCount;
@@ -2695,7 +2690,7 @@ var GraphSession = class {
     try {
       const streamHelper = getStreamHelper(this.sessionId);
       if (!streamHelper) {
-        logger9.warn(
+        logger8.warn(
           { sessionId: this.sessionId },
           "No stream helper found - cannot send status update"
         );
@@ -2715,7 +2710,7 @@ var GraphSession = class {
       if (result.summaries && result.summaries.length > 0) {
         for (const summary of result.summaries) {
           if (!summary || !summary.type || !summary.data || !summary.data.label || Object.keys(summary.data).length === 0) {
-            logger9.warn(
+            logger8.warn(
               {
                 sessionId: this.sessionId,
                 summary
@@ -2752,7 +2747,7 @@ var GraphSession = class {
         this.statusUpdateState.lastEventCount = this.events.length;
       }
     } catch (error) {
-      logger9.error(
+      logger8.error(
         {
           sessionId: this.sessionId,
           error: error instanceof Error ? error.message : "Unknown error",
@@ -2790,7 +2785,7 @@ var GraphSession = class {
           this.releaseUpdateLock();
         }
       } catch (error) {
-        logger9.error(
+        logger8.error(
           {
             sessionId: this.sessionId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -2868,7 +2863,7 @@ User's Question/Context:
 ${conversationHistory}
 ` : "";
             } catch (error) {
-              logger9.warn(
+              logger8.warn(
                 { sessionId: this.sessionId, error },
                 "Failed to fetch conversation history for structured status update"
               );
@@ -3002,7 +2997,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           return { summaries };
         } catch (error) {
           setSpanWithError(span, error instanceof Error ? error : new Error(String(error)));
-          logger9.error({ error }, "Failed to generate structured update, using fallback");
+          logger8.error({ error }, "Failed to generate structured update, using fallback");
           return { summaries: [] };
         } finally {
           span.end();
@@ -3028,7 +3023,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
    */
   buildZodSchemaFromJson(jsonSchema) {
     const properties = {};
-    properties["label"] = z.string().describe(
+    properties.label = z.string().describe(
       'A short 3-5 word phrase, that is a descriptive label for the update component. This Label must be EXTREMELY unique to represent the UNIQUE update we are providing. The SPECIFIC finding, result, or insight discovered (e.g., "Slack bot needs workspace admin role", "Found ingestion requires 3 steps", "Channel history limited to 10k messages"). State the ACTUAL information found, not that you searched. What did you LEARN or DISCOVER? What specific detail is now known? CRITICAL: Only use facts explicitly found in the activities - NEVER invent names, people, organizations, or details that are not present in the actual tool results.'
     );
     for (const [key, value] of Object.entries(jsonSchema.properties)) {
@@ -3097,11 +3092,10 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
     for (const event of events) {
       switch (event.eventType) {
         case "tool_execution": {
-          const data = event.data;
-          const resultStr = JSON.stringify(data.result);
+          const resultStr = JSON.stringify(event.data.result);
           activities.push(
-            `\u{1F527} **${data.toolName}** ${data.duration ? `(${data.duration}ms)` : ""}
-   \u{1F4E5} Input: ${JSON.stringify(data.args)}
+            `\u{1F527} **${event.data.toolName}** ${event.data.duration ? `(${event.data.duration}ms)` : ""}
+   \u{1F4E5} Input: ${JSON.stringify(event.data.args)}
    \u{1F4E4} Output: ${resultStr}`
           );
           break;
@@ -3113,23 +3107,24 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
         case "artifact_saved":
           break;
         case "agent_reasoning": {
-          const data = event.data;
           activities.push(
             `\u2699\uFE0F **Analyzing request**
-   Details: ${JSON.stringify(data.parts, null, 2)}`
+   Details: ${JSON.stringify(event.data.parts, null, 2)}`
           );
           break;
         }
         case "agent_generate": {
-          const data = event.data;
           activities.push(
             `\u2699\uFE0F **Preparing response**
-   Details: ${JSON.stringify(data.parts, null, 2)}`
+   Details: ${JSON.stringify(event.data.parts, null, 2)}`
           );
           break;
         }
         default: {
-          activities.push(`\u{1F4CB} **${event.eventType}**: ${JSON.stringify(event.data, null, 2)}`);
+          const safeEvent = event;
+          activities.push(
+            `\u{1F4CB} **${safeEvent.eventType}**: ${JSON.stringify(safeEvent.data, null, 2)}`
+          );
           break;
         }
       }
@@ -3147,7 +3142,7 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
           "graph_session.id": this.sessionId,
           "artifact.id": artifactData.artifactId,
           "artifact.type": artifactData.artifactType || "unknown",
-          "artifact.agent_id": artifactData.agentId || "unknown",
+          "artifact.agent_id": artifactData.subAgentId || "unknown",
           "artifact.tool_call_id": artifactData.metadata?.toolCallId || "unknown",
           "artifact.data": JSON.stringify(artifactData.data, null, 2),
           "tenant.id": artifactData.tenantId || "unknown",
@@ -3206,34 +3201,34 @@ Make it specific and relevant.`;
           let modelToUse = this.statusUpdateState?.summarizerModel;
           if (!modelToUse?.model?.trim()) {
             if (!this.statusUpdateState?.baseModel?.model?.trim()) {
-              if (artifactData.agentId && artifactData.tenantId && artifactData.projectId) {
+              if (artifactData.subAgentId && artifactData.tenantId && artifactData.projectId) {
                 try {
-                  const agentData = await getAgentById(dbClient_default)({
+                  const agentData = await getSubAgentById(dbClient_default)({
                     scopes: {
                       tenantId: artifactData.tenantId,
                       projectId: artifactData.projectId,
                       graphId: this.graphId || ""
                     },
-                    agentId: artifactData.agentId
+                    subAgentId: artifactData.subAgentId
                   });
                   if (agentData && "models" in agentData && agentData.models?.base?.model) {
                     modelToUse = agentData.models.base;
-                    logger9.info(
+                    logger8.info(
                       {
                         sessionId: this.sessionId,
                         artifactId: artifactData.artifactId,
-                        agentId: artifactData.agentId,
+                        subAgentId: artifactData.subAgentId,
                         model: modelToUse.model
                       },
                       "Using agent model configuration for artifact name generation"
                     );
                   }
                 } catch (error) {
-                  logger9.warn(
+                  logger8.warn(
                     {
                       sessionId: this.sessionId,
                       artifactId: artifactData.artifactId,
-                      agentId: artifactData.agentId,
+                      subAgentId: artifactData.subAgentId,
                       error: error instanceof Error ? error.message : "Unknown error"
                     },
                     "Failed to get agent model configuration"
@@ -3241,7 +3236,7 @@ Make it specific and relevant.`;
                 }
               }
               if (!modelToUse?.model?.trim()) {
-                logger9.warn(
+                logger8.warn(
                   {
                     sessionId: this.sessionId,
                     artifactId: artifactData.artifactId
@@ -3323,7 +3318,7 @@ Make it specific and relevant.`;
                     return result2;
                   } catch (error) {
                     lastError = error instanceof Error ? error : new Error(String(error));
-                    logger9.warn(
+                    logger8.warn(
                       {
                         sessionId: this.sessionId,
                         artifactId: artifactData.artifactId,
@@ -3375,7 +3370,7 @@ Make it specific and relevant.`;
             });
             span.setStatus({ code: SpanStatusCode.OK });
           } catch (saveError) {
-            logger9.error(
+            logger8.error(
               {
                 sessionId: this.sessionId,
                 artifactId: artifactData.artifactId,
@@ -3403,7 +3398,7 @@ Make it specific and relevant.`;
                   metadata: artifactData.metadata || {},
                   toolCallId: artifactData.toolCallId
                 });
-                logger9.info(
+                logger8.info(
                   {
                     sessionId: this.sessionId,
                     artifactId: artifactData.artifactId
@@ -3414,7 +3409,7 @@ Make it specific and relevant.`;
             } catch (fallbackError) {
               const isDuplicateError = fallbackError instanceof Error && (fallbackError.message?.includes("UNIQUE") || fallbackError.message?.includes("duplicate"));
               if (isDuplicateError) ; else {
-                logger9.error(
+                logger8.error(
                   {
                     sessionId: this.sessionId,
                     artifactId: artifactData.artifactId,
@@ -3427,7 +3422,7 @@ Make it specific and relevant.`;
           }
         } catch (error) {
           setSpanWithError(span, error instanceof Error ? error : new Error(String(error)));
-          logger9.error(
+          logger8.error(
             {
               sessionId: this.sessionId,
               artifactId: artifactData.artifactId,
@@ -3446,7 +3441,7 @@ Make it specific and relevant.`;
    */
   setArtifactCache(key, artifact) {
     this.artifactCache.set(key, artifact);
-    logger9.debug({ sessionId: this.sessionId, key }, "Artifact cached in session");
+    logger8.debug({ sessionId: this.sessionId, key }, "Artifact cached in session");
   }
   /**
    * Get session-scoped ArtifactService instance
@@ -3465,7 +3460,7 @@ Make it specific and relevant.`;
    */
   getArtifactCache(key) {
     const artifact = this.artifactCache.get(key);
-    logger9.debug({ sessionId: this.sessionId, key, found: !!artifact }, "Artifact cache lookup");
+    logger8.debug({ sessionId: this.sessionId, key, found: !!artifact }, "Artifact cache lookup");
     return artifact || null;
   }
   /**
@@ -3488,7 +3483,7 @@ var GraphSessionManager = class {
     const sessionId = messageId;
     const session = new GraphSession(sessionId, messageId, graphId, tenantId, projectId, contextId);
     this.sessions.set(sessionId, session);
-    logger9.info(
+    logger8.info(
       { sessionId, messageId, graphId, tenantId, projectId, contextId },
       "GraphSession created"
     );
@@ -3502,7 +3497,7 @@ var GraphSessionManager = class {
     if (session) {
       session.initializeStatusUpdates(config, summarizerModel);
     } else {
-      logger9.error(
+      logger8.error(
         {
           sessionId,
           availableSessions: Array.from(this.sessions.keys())
@@ -3519,7 +3514,7 @@ var GraphSessionManager = class {
     if (session) {
       session.enableEmitOperations();
     } else {
-      logger9.error(
+      logger8.error(
         {
           sessionId,
           availableSessions: Array.from(this.sessions.keys())
@@ -3536,14 +3531,15 @@ var GraphSessionManager = class {
   }
   /**
    * Record an event in a session
+   * Generic type parameter T ensures eventType and data are correctly paired
    */
-  recordEvent(sessionId, eventType, agentId, data) {
+  recordEvent(sessionId, eventType, subAgentId, data) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger9.warn({ sessionId }, "Attempted to record event in non-existent session");
+      logger8.warn({ sessionId }, "Attempted to record event in non-existent session");
       return;
     }
-    session.recordEvent(eventType, agentId, data);
+    session.recordEvent(eventType, subAgentId, data);
   }
   /**
    * End a session and return the final event data
@@ -3551,12 +3547,12 @@ var GraphSessionManager = class {
   endSession(sessionId) {
     const session = this.sessions.get(sessionId);
     if (!session) {
-      logger9.warn({ sessionId }, "Attempted to end non-existent session");
+      logger8.warn({ sessionId }, "Attempted to end non-existent session");
       return [];
     }
     const events = session.getEvents();
     const summary = session.getSummary();
-    logger9.info({ sessionId, summary }, "GraphSession ended");
+    logger8.info({ sessionId, summary }, "GraphSession ended");
     session.cleanup();
     this.sessions.delete(sessionId);
     return events;
@@ -3655,7 +3651,7 @@ async function resolveModelConfig(graphId, agent) {
 }
 
 // src/services/IncrementalStreamParser.ts
-var logger10 = getLogger("IncrementalStreamParser");
+var logger9 = getLogger("IncrementalStreamParser");
 var _IncrementalStreamParser = class _IncrementalStreamParser {
   // Max number of collected parts to prevent unbounded growth
   constructor(streamHelper, tenantId, contextId, artifactParserOptions) {
@@ -3671,10 +3667,11 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
     __publicField(this, "lastStreamedComponents", /* @__PURE__ */ new Map());
     __publicField(this, "componentSnapshots", /* @__PURE__ */ new Map());
     __publicField(this, "artifactMap");
-    __publicField(this, "agentId");
+    __publicField(this, "subAgentId");
+    __publicField(this, "allStreamedContent", []);
     this.streamHelper = streamHelper;
     this.contextId = contextId;
-    this.agentId = artifactParserOptions?.agentId;
+    this.subAgentId = artifactParserOptions?.subAgentId;
     if (artifactParserOptions?.streamRequestId) {
       const sessionParser = graphSessionManager.getArtifactParser(
         artifactParserOptions.streamRequestId
@@ -3707,7 +3704,7 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
   async initializeArtifactMap() {
     try {
       this.artifactMap = await this.artifactParser.getContextArtifacts(this.contextId);
-      logger10.debug(
+      logger9.debug(
         {
           contextId: this.contextId,
           artifactMapSize: this.artifactMap.size
@@ -3715,7 +3712,7 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
         "Initialized artifact map for streaming"
       );
     } catch (error) {
-      logger10.warn({ error, contextId: this.contextId }, "Failed to initialize artifact map");
+      logger9.warn({ error, contextId: this.contextId }, "Failed to initialize artifact map");
       this.artifactMap = /* @__PURE__ */ new Map();
     }
   }
@@ -3790,10 +3787,12 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
               this.hasStartedRole = true;
             }
             await this.streamHelper.streamText(newText, 50);
-            this.collectedParts.push({
+            const textPart = {
               kind: "text",
               text: newText
-            });
+            };
+            this.collectedParts.push(textPart);
+            this.allStreamedContent.push(textPart);
           }
           continue;
         }
@@ -3817,7 +3816,7 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
         dataComponents: [component]
       },
       this.artifactMap,
-      this.agentId
+      this.subAgentId
     );
     if (!Array.isArray(parts)) {
       console.warn("parseObject returned non-array:", parts);
@@ -3893,7 +3892,7 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
               dataComponents: [component]
             },
             this.artifactMap,
-            this.agentId
+            this.subAgentId
           );
           for (const part of parts) {
             await this.streamPart(part);
@@ -3919,10 +3918,12 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
     if (this.pendingTextBuffer) {
       const cleanedText = this.pendingTextBuffer.replace(/<\/?artifact:ref(?:\s[^>]*)?>\/?>/g, "").replace(/<\/?artifact(?:\s[^>]*)?>\/?>/g, "").replace(/<\/artifact:ref>/g, "").replace(/<\/(?:\w+:)?artifact>/g, "");
       if (cleanedText) {
-        this.collectedParts.push({
+        const textPart = {
           kind: "text",
           text: cleanedText
-        });
+        };
+        this.collectedParts.push(textPart);
+        this.allStreamedContent.push(textPart);
         await this.streamHelper.streamText(cleanedText, 50);
       }
       this.pendingTextBuffer = "";
@@ -3937,6 +3938,12 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
   getCollectedParts() {
     return [...this.collectedParts];
   }
+  /**
+   * Get all streamed content that was actually sent to the user
+   */
+  getAllStreamedContent() {
+    return [...this.allStreamedContent];
+  }
   /**
    * Parse buffer for complete artifacts and text parts (for text streaming)
    */
@@ -3947,7 +3954,11 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
       const safeEnd = this.artifactParser.findSafeTextBoundary(workingBuffer);
       if (safeEnd > 0) {
         const safeText = workingBuffer.slice(0, safeEnd);
-        const parts2 = await this.artifactParser.parseText(safeText, this.artifactMap, this.agentId);
+        const parts2 = await this.artifactParser.parseText(
+          safeText,
+          this.artifactMap,
+          this.subAgentId
+        );
         completeParts.push(...parts2);
         return {
           completeParts,
@@ -3962,7 +3973,7 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
     const parts = await this.artifactParser.parseText(
       workingBuffer,
       this.artifactMap,
-      this.agentId
+      this.subAgentId
     );
     if (parts.length > 0 && parts[parts.length - 1].kind === "text") {
       const lastPart = parts[parts.length - 1];
@@ -3992,10 +4003,15 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
    */
   async streamPart(part) {
     this.collectedParts.push({ ...part });
+    this.allStreamedContent.push({ ...part });
     if (this.collectedParts.length > _IncrementalStreamParser.MAX_COLLECTED_PARTS) {
       const excess = this.collectedParts.length - _IncrementalStreamParser.MAX_COLLECTED_PARTS;
       this.collectedParts.splice(0, excess);
     }
+    if (this.allStreamedContent.length > _IncrementalStreamParser.MAX_COLLECTED_PARTS) {
+      const excess = this.allStreamedContent.length - _IncrementalStreamParser.MAX_COLLECTED_PARTS;
+      this.allStreamedContent.splice(0, excess);
+    }
     if (!this.hasStartedRole) {
       await this.streamHelper.writeRole("assistant");
       this.hasStartedRole = true;
@@ -4035,12 +4051,12 @@ __publicField(_IncrementalStreamParser, "MAX_COLLECTED_PARTS", 1e4);
 var IncrementalStreamParser = _IncrementalStreamParser;
 
 // src/services/ResponseFormatter.ts
-var logger11 = getLogger("ResponseFormatter");
+var logger10 = getLogger("ResponseFormatter");
 var ResponseFormatter = class {
   constructor(tenantId, artifactParserOptions) {
     __publicField(this, "artifactParser");
-    __publicField(this, "agentId");
-    this.agentId = artifactParserOptions?.agentId;
+    __publicField(this, "subAgentId");
+    this.subAgentId = artifactParserOptions?.subAgentId;
     if (artifactParserOptions?.streamRequestId) {
       const sessionParser = graphSessionManager.getArtifactParser(
         artifactParserOptions.streamRequestId
@@ -4079,7 +4095,7 @@ var ResponseFormatter = class {
         const parts = await this.artifactParser.parseObject(
           responseObject,
           artifactMap,
-          this.agentId
+          this.subAgentId
         );
         const uniqueArtifacts = this.countUniqueArtifacts(parts);
         span.setAttributes({
@@ -4094,7 +4110,7 @@ var ResponseFormatter = class {
         return { parts };
       } catch (error) {
         setSpanWithError(span, error instanceof Error ? error : new Error(String(error)));
-        logger11.error({ error, responseObject }, "Error formatting object response");
+        logger10.error({ error, responseObject }, "Error formatting object response");
         return {
           parts: [{ kind: "data", data: responseObject }]
         };
@@ -4126,7 +4142,11 @@ var ResponseFormatter = class {
           "response.type": "text",
           "response.availableArtifacts": artifactMap.size
         });
-        const parts = await this.artifactParser.parseText(responseText, artifactMap, this.agentId);
+        const parts = await this.artifactParser.parseText(
+          responseText,
+          artifactMap,
+          this.subAgentId
+        );
         if (parts.length === 1 && parts[0].kind === "text") {
           return { text: parts[0].text };
         }
@@ -4146,7 +4166,7 @@ var ResponseFormatter = class {
         return { parts };
       } catch (error) {
         setSpanWithError(span, error instanceof Error ? error : new Error(String(error)));
-        logger11.error({ error, responseText }, "Error formatting response");
+        logger10.error({ error, responseText }, "Error formatting response");
         return { text: responseText };
       } finally {
         span.end();
@@ -4200,20 +4220,20 @@ function agentInitializingOp(sessionId, graphId) {
     }
   };
 }
-function completionOp(agentId, iterations) {
+function completionOp(subAgentId, iterations) {
   return {
     type: "completion",
     details: {
-      agent: agentId,
+      agent: subAgentId,
       iteration: iterations
     }
   };
 }
-function errorOp(message, agentId, severity = "error", code) {
+function errorOp(message, subAgentId, severity = "error", code) {
   return {
     type: "error",
     message,
-    agent: agentId,
+    agent: subAgentId,
     severity,
     code,
     timestamp: Date.now()
@@ -4222,10 +4242,10 @@ function errorOp(message, agentId, severity = "error", code) {
 function generateToolId() {
   return `tool_${nanoid(8)}`;
 }
-var logger12 = getLogger("DataComponentSchema");
+var logger11 = getLogger("DataComponentSchema");
 function jsonSchemaToZod(jsonSchema) {
   if (!jsonSchema || typeof jsonSchema !== "object") {
-    logger12.warn({ jsonSchema }, "Invalid JSON schema provided, using string fallback");
+    logger11.warn({ jsonSchema }, "Invalid JSON schema provided, using string fallback");
     return z.string();
   }
   switch (jsonSchema.type) {
@@ -4252,7 +4272,7 @@ function jsonSchemaToZod(jsonSchema) {
     case "null":
       return z.null();
     default:
-      logger12.warn(
+      logger11.warn(
         {
           unsupportedType: jsonSchema.type,
           schema: jsonSchema
@@ -4615,7 +4635,7 @@ function parseEmbeddedJson(data) {
 }
 
 // src/a2a/client.ts
-var logger13 = getLogger("a2aClient");
+var logger12 = getLogger("a2aClient");
 var DEFAULT_BACKOFF = {
   initialInterval: 500,
   maxInterval: 6e4,
@@ -4821,7 +4841,7 @@ var A2AClient = class {
       try {
         const res = await fn();
         if (attempt > 0) {
-          logger13.info(
+          logger12.info(
             {
               attempts: attempt + 1,
               elapsedTime: Date.now() - start
@@ -4836,7 +4856,7 @@ var A2AClient = class {
         }
         const elapsed = Date.now() - start;
         if (elapsed > maxElapsedTime) {
-          logger13.warn(
+          logger12.warn(
             {
               attempts: attempt + 1,
               elapsedTime: elapsed,
@@ -4857,7 +4877,7 @@ var A2AClient = class {
           retryInterval = initialInterval * attempt ** exponent + Math.random() * 1e3;
         }
         const delayMs = Math.min(retryInterval, maxInterval);
-        logger13.info(
+        logger12.info(
           {
             attempt: attempt + 1,
             delayMs,
@@ -4942,7 +4962,7 @@ var A2AClient = class {
     }
     const rpcResponse = await httpResponse.json();
     if (rpcResponse.id !== requestId2) {
-      logger13.warn(
+      logger12.warn(
         {
           method,
           expectedId: requestId2,
@@ -5141,7 +5161,7 @@ var A2AClient = class {
     try {
       while (true) {
         const { done, value } = await reader.read();
-        logger13.info({ done, value }, "parseA2ASseStream");
+        logger12.info({ done, value }, "parseA2ASseStream");
         if (done) {
           if (eventDataBuffer.trim()) {
             const result = this._processSseEventData(
@@ -5228,7 +5248,7 @@ var A2AClient = class {
 };
 
 // src/agents/relationTools.ts
-var logger14 = getLogger("relationships Tools");
+var logger13 = getLogger("relationships Tools");
 var generateTransferToolDescription = (config) => {
   return `Hand off the conversation to agent ${config.id}.
 
@@ -5252,7 +5272,7 @@ Delegate a specific task to agent ${config.id} when it seems like the agent can
 var createTransferToAgentTool = ({
   transferConfig,
   callingAgentId,
-  agent,
+  subAgent,
   streamRequestId
 }) => {
   return tool({
@@ -5262,11 +5282,11 @@ var createTransferToAgentTool = ({
       const activeSpan = trace.getActiveSpan();
       if (activeSpan) {
         activeSpan.setAttributes({
-          "transfer.from_agent_id": callingAgentId,
-          "transfer.to_agent_id": transferConfig.id ?? "unknown"
+          [SPAN_KEYS.TRANSFER_FROM_SUB_AGENT_ID]: callingAgentId,
+          [SPAN_KEYS.TRANSFER_TO_SUB_AGENT_ID]: transferConfig.id ?? "unknown"
         });
       }
-      logger14.info(
+      logger13.info(
         {
           transferTo: transferConfig.id ?? "unknown",
           fromAgent: callingAgentId
@@ -5275,8 +5295,8 @@ var createTransferToAgentTool = ({
       );
       if (streamRequestId) {
         graphSessionManager.recordEvent(streamRequestId, "transfer", callingAgentId, {
-          fromAgent: callingAgentId,
-          targetAgent: transferConfig.id ?? "unknown",
+          fromSubAgent: callingAgentId,
+          targetSubAgent: transferConfig.id ?? "unknown",
           reason: `Transfer to ${transferConfig.name || transferConfig.id}`
         });
       }
@@ -5298,7 +5318,7 @@ function createDelegateToAgentTool({
   contextId,
   metadata,
   sessionId,
-  agent,
+  subAgent,
   credentialStoreRegistry
 }) {
   return tool({
@@ -5309,9 +5329,9 @@ function createDelegateToAgentTool({
       const activeSpan = trace.getActiveSpan();
       if (activeSpan) {
         activeSpan.setAttributes({
-          "delegation.from_agent_id": callingAgentId,
-          "delegation.to_agent_id": delegateConfig.config.id ?? "unknown",
-          "delegation.id": delegationId
+          [SPAN_KEYS.DELEGATION_FROM_SUB_AGENT_ID]: callingAgentId,
+          [SPAN_KEYS.DELEGATION_TO_SUB_AGENT_ID]: delegateConfig.config.id ?? "unknown",
+          [SPAN_KEYS.DELEGATION_ID]: delegationId
         });
       }
       if (metadata.streamRequestId) {
@@ -5321,8 +5341,8 @@ function createDelegateToAgentTool({
           callingAgentId,
           {
             delegationId,
-            fromAgent: callingAgentId,
-            targetAgent: delegateConfig.config.id,
+            fromSubAgent: callingAgentId,
+            targetSubAgent: delegateConfig.config.id,
             taskDescription: input.message
           }
         );
@@ -5336,7 +5356,7 @@ function createDelegateToAgentTool({
             projectId,
             graphId
           },
-          agentId: delegateConfig.config.id
+          subAgentId: delegateConfig.config.id
         });
         if (externalAgent && (externalAgent.credentialReferenceId || externalAgent.headers) && credentialStoreRegistry) {
           const contextResolver = new ContextResolver(
@@ -5415,7 +5435,7 @@ function createDelegateToAgentTool({
           ...isInternal ? { fromAgentId: callingAgentId } : { fromExternalAgentId: callingAgentId }
         }
       };
-      logger14.info({ messageToSend }, "messageToSend");
+      logger13.info({ messageToSend }, "messageToSend");
       await createMessage(dbClient_default)({
         id: nanoid(),
         tenantId,
@@ -5427,7 +5447,7 @@ function createDelegateToAgentTool({
         },
         visibility: isInternal ? "internal" : "external",
         messageType: "a2a-request",
-        fromAgentId: callingAgentId,
+        fromSubAgentId: callingAgentId,
         ...isInternal ? { toAgentId: delegateConfig.config.id } : { toExternalAgentId: delegateConfig.config.id }
       });
       const response = await a2aClient.sendMessage({
@@ -5442,8 +5462,8 @@ function createDelegateToAgentTool({
         conversationId: contextId,
         messageType: "a2a-response",
         visibility: isInternal ? "internal" : "external",
-        toAgentId: callingAgentId,
-        ...isInternal ? { fromAgentId: delegateConfig.config.id } : { fromExternalAgentId: delegateConfig.config.id }
+        toSubAgentId: callingAgentId,
+        ...isInternal ? { fromSubAgentId: delegateConfig.config.id } : { fromExternalAgentId: delegateConfig.config.id }
       });
       if (sessionId && context?.toolCallId) {
         const toolResult = {
@@ -5462,8 +5482,8 @@ function createDelegateToAgentTool({
           callingAgentId,
           {
             delegationId,
-            fromAgent: delegateConfig.config.id,
-            targetAgent: callingAgentId,
+            fromSubAgent: delegateConfig.config.id,
+            targetSubAgent: callingAgentId,
             result: response.result
           }
         );
@@ -5477,7 +5497,7 @@ function createDelegateToAgentTool({
 }
 
 // src/agents/SystemPromptBuilder.ts
-var logger15 = getLogger("SystemPromptBuilder");
+var logger14 = getLogger("SystemPromptBuilder");
 var SystemPromptBuilder = class {
   constructor(version, versionConfig) {
     this.version = version;
@@ -5493,12 +5513,12 @@ var SystemPromptBuilder = class {
         this.templates.set(name, content);
       }
       this.loaded = true;
-      logger15.debug(
+      logger14.debug(
         { templateCount: this.templates.size, version: this.version },
         `Loaded ${this.templates.size} templates for version ${this.version}`
       );
     } catch (error) {
-      logger15.error({ error }, `Failed to load templates for version ${this.version}`);
+      logger14.error({ error }, `Failed to load templates for version ${this.version}`);
       throw new Error(`Template loading failed: ${error}`);
     }
   }
@@ -6558,7 +6578,7 @@ function hasToolCallWithPrefix(prefix) {
     return false;
   };
 }
-var logger17 = getLogger("Agent");
+var logger16 = getLogger("Agent");
 var CONSTANTS = {
   MAX_GENERATION_STEPS: 12,
   PHASE_1_TIMEOUT_MS: 27e4,
@@ -6788,7 +6808,7 @@ var Agent = class {
   }
   getRelationTools(runtimeContext, sessionId) {
     const { transferRelations = [], delegateRelations = [] } = this.config;
-    const createToolName = (prefix, agentId) => `${prefix}_to_${agentId.toLowerCase().replace(/\s+/g, "_")}`;
+    const createToolName = (prefix, subAgentId) => `${prefix}_to_${subAgentId.toLowerCase().replace(/\s+/g, "_")}`;
     return Object.fromEntries([
       ...transferRelations.map((agentConfig) => {
         const toolName = createToolName("transfer", agentConfig.id);
@@ -6799,7 +6819,7 @@ var Agent = class {
             createTransferToAgentTool({
               transferConfig: agentConfig,
               callingAgentId: this.config.id,
-              agent: this,
+              subAgent: this,
               streamRequestId: runtimeContext?.metadata?.streamRequestId
             }),
             runtimeContext?.metadata?.streamRequestId,
@@ -6828,7 +6848,7 @@ var Agent = class {
                 apiKey: runtimeContext?.metadata?.apiKey
               },
               sessionId,
-              agent: this,
+              subAgent: this,
               credentialStoreRegistry: this.credentialStoreRegistry
             }),
             runtimeContext?.metadata?.streamRequestId,
@@ -6862,14 +6882,14 @@ var Agent = class {
     for (const toolSet of tools) {
       for (const [toolName, originalTool] of Object.entries(toolSet)) {
         if (!isValidTool(originalTool)) {
-          logger17.error({ toolName }, "Invalid MCP tool structure - missing required properties");
+          logger16.error({ toolName }, "Invalid MCP tool structure - missing required properties");
           continue;
         }
         const sessionWrappedTool = tool({
           description: originalTool.description,
           inputSchema: originalTool.inputSchema,
           execute: async (args, { toolCallId }) => {
-            logger17.debug({ toolName, toolCallId }, "MCP Tool Called");
+            logger16.debug({ toolName, toolCallId }, "MCP Tool Called");
             try {
               const rawResult = await originalTool.execute(args, { toolCallId });
               const parsedResult = parseEmbeddedJson(rawResult);
@@ -6883,7 +6903,7 @@ var Agent = class {
               });
               return { result: enhancedResult, toolCallId };
             } catch (error) {
-              logger17.error({ toolName, toolCallId, error }, "MCP tool execution failed");
+              logger16.error({ toolName, toolCallId, error }, "MCP tool execution failed");
               throw error;
             }
           }
@@ -6928,7 +6948,7 @@ var Agent = class {
         tenantId: this.config.tenantId,
         projectId: this.config.projectId,
         graphId: this.config.graphId,
-        agentId: this.config.id
+        subAgentId: this.config.id
       }
     });
     const agentToolRelationHeaders = toolsForAgent.data.find((t) => t.toolId === tool3.id)?.headers || void 0;
@@ -6984,7 +7004,7 @@ var Agent = class {
         headers: agentToolRelationHeaders
       };
     }
-    logger17.info(
+    logger16.info(
       {
         toolName: tool3.name,
         credentialReferenceId,
@@ -7009,10 +7029,10 @@ var Agent = class {
         this.mcpClientCache.set(cacheKey, client);
       } catch (error) {
         this.mcpConnectionLocks.delete(cacheKey);
-        logger17.error(
+        logger16.error(
           {
             toolName: tool3.name,
-            agentId: this.config.id,
+            subAgentId: this.config.id,
             cacheKey,
             error: error instanceof Error ? error.message : String(error)
           },
@@ -7022,6 +7042,45 @@ var Agent = class {
       }
     }
     const tools = await client.tools();
+    if (!tools || Object.keys(tools).length === 0) {
+      const streamRequestId = this.getStreamRequestId();
+      if (streamRequestId) {
+        tracer.startActiveSpan(
+          "ai.toolCall",
+          {
+            attributes: {
+              "ai.toolCall.name": tool3.name,
+              "ai.toolCall.args": JSON.stringify({ operation: "mcp_tool_discovery" }),
+              "ai.toolCall.result": JSON.stringify({
+                status: "no_tools_available",
+                message: `MCP server has 0 effective tools. Double check the selected tools in your graph and the active tools in the MCP server configuration.`,
+                serverUrl: tool3.config.type === "mcp" ? tool3.config.mcp.server.url : "unknown",
+                originalToolName: tool3.name
+              }),
+              "ai.toolType": "mcp",
+              "ai.agentName": this.config.name || "unknown",
+              "conversation.id": this.conversationId || "unknown",
+              "graph.id": this.config.graphId || "unknown",
+              "tenant.id": this.config.tenantId || "unknown",
+              "project.id": this.config.projectId || "unknown"
+            }
+          },
+          (span) => {
+            setSpanWithError(span, new Error(`0 effective tools available for ${tool3.name}`));
+            graphSessionManager.recordEvent(streamRequestId, "tool_execution", this.config.id, {
+              toolName: tool3.name,
+              args: { operation: "mcp_tool_discovery" },
+              result: {
+                status: "no_tools_available",
+                message: `MCP server has 0 effective tools. Double check the selected tools in your graph and the active tools in the MCP server configuration.`,
+                serverUrl: tool3.config.type === "mcp" ? tool3.config.mcp.server.url : "unknown"
+              }
+            });
+            span.end();
+          }
+        );
+      }
+    }
     return tools;
   }
   async createMcpConnection(tool3, serverConfig) {
@@ -7033,99 +7092,110 @@ var Agent = class {
       await client.connect();
       return client;
     } catch (error) {
-      logger17.error(
+      logger16.error(
         {
           toolName: tool3.name,
-          agentId: this.config.id,
+          subAgentId: this.config.id,
           error: error instanceof Error ? error.message : String(error)
         },
         "Agent failed to connect to MCP server"
       );
+      if (error instanceof Error) {
+        if (error?.cause && JSON.stringify(error.cause).includes("ECONNREFUSED")) {
+          const errorMessage = "Connection refused. Please check if the MCP server is running.";
+          throw new Error(errorMessage);
+        } else if (error.message.includes("404")) {
+          const errorMessage = "Error accessing endpoint (HTTP 404)";
+          throw new Error(errorMessage);
+        } else {
+          throw new Error(`MCP server connection failed: ${error.message}`);
+        }
+      }
       throw error;
     }
   }
   async getFunctionTools(sessionId, streamRequestId) {
     const functionTools = {};
     try {
-      const toolsForAgent = await getToolsForAgent(dbClient_default)({
+      const functionToolsForAgent = await getFunctionToolsForSubAgent(dbClient_default)({
         scopes: {
-          tenantId: this.config.tenantId || "default",
-          projectId: this.config.projectId || "default",
-          graphId: this.config.graphId,
-          agentId: this.config.id
-        }
+          tenantId: this.config.tenantId,
+          projectId: this.config.projectId,
+          graphId: this.config.graphId
+        },
+        subAgentId: this.config.id
       });
-      const toolsData = toolsForAgent.data || [];
-      const functionToolDefs = toolsData.filter((tool3) => tool3.tool.config.type === "function");
-      if (functionToolDefs.length === 0) {
+      const functionToolsData = functionToolsForAgent.data || [];
+      if (functionToolsData.length === 0) {
         return functionTools;
       }
-      const { LocalSandboxExecutor } = await import('./LocalSandboxExecutor-JI4X2Z3N.js');
+      const { LocalSandboxExecutor } = await import('./LocalSandboxExecutor-PQIRECLQ.js');
       const sandboxExecutor = LocalSandboxExecutor.getInstance();
-      for (const toolDef of functionToolDefs) {
-        if (toolDef.tool.config?.type === "function") {
-          const functionId = toolDef.tool.functionId;
-          if (!functionId) {
-            logger17.warn({ toolId: toolDef.tool.id }, "Function tool missing functionId reference");
-            continue;
+      for (const functionToolDef of functionToolsData) {
+        const functionId = functionToolDef.functionId;
+        if (!functionId) {
+          logger16.warn(
+            { functionToolId: functionToolDef.id },
+            "Function tool missing functionId reference"
+          );
+          continue;
+        }
+        const functionData = await getFunction(dbClient_default)({
+          functionId,
+          scopes: {
+            tenantId: this.config.tenantId || "default",
+            projectId: this.config.projectId || "default"
           }
-          const functionData = await getFunction(dbClient_default)({
-            functionId,
-            scopes: {
-              tenantId: this.config.tenantId || "default",
-              projectId: this.config.projectId || "default"
-            }
-          });
-          if (!functionData) {
-            logger17.warn(
-              { functionId, toolId: toolDef.tool.id },
-              "Function not found in functions table"
+        });
+        if (!functionData) {
+          logger16.warn(
+            { functionId, functionToolId: functionToolDef.id },
+            "Function not found in functions table"
+          );
+          continue;
+        }
+        const zodSchema = jsonSchemaToZod(functionData.inputSchema);
+        const aiTool = tool({
+          description: functionToolDef.description || functionToolDef.name,
+          inputSchema: zodSchema,
+          execute: async (args, { toolCallId }) => {
+            logger16.debug(
+              { toolName: functionToolDef.name, toolCallId, args },
+              "Function Tool Called"
             );
-            continue;
-          }
-          const zodSchema = jsonSchemaToZod(functionData.inputSchema);
-          const aiTool = tool({
-            description: toolDef.tool.description || toolDef.tool.name,
-            inputSchema: zodSchema,
-            execute: async (args, { toolCallId }) => {
-              logger17.debug(
-                { toolName: toolDef.tool.name, toolCallId, args },
-                "Function Tool Called"
+            try {
+              const result = await sandboxExecutor.executeFunctionTool(functionToolDef.id, args, {
+                description: functionToolDef.description || functionToolDef.name,
+                inputSchema: functionData.inputSchema || {},
+                executeCode: functionData.executeCode,
+                dependencies: functionData.dependencies || {}
+              });
+              toolSessionManager.recordToolResult(sessionId || "", {
+                toolCallId,
+                toolName: functionToolDef.name,
+                args,
+                result,
+                timestamp: Date.now()
+              });
+              return { result, toolCallId };
+            } catch (error) {
+              logger16.error(
+                { toolName: functionToolDef.name, toolCallId, error },
+                "Function tool execution failed"
               );
-              try {
-                const result = await sandboxExecutor.executeFunctionTool(toolDef.tool.id, args, {
-                  description: toolDef.tool.description || toolDef.tool.name,
-                  inputSchema: functionData.inputSchema || {},
-                  executeCode: functionData.executeCode,
-                  dependencies: functionData.dependencies || {}
-                });
-                toolSessionManager.recordToolResult(sessionId || "", {
-                  toolCallId,
-                  toolName: toolDef.tool.name,
-                  args,
-                  result,
-                  timestamp: Date.now()
-                });
-                return { result, toolCallId };
-              } catch (error) {
-                logger17.error(
-                  { toolName: toolDef.tool.name, toolCallId, error },
-                  "Function tool execution failed"
-                );
-                throw error;
-              }
+              throw error;
             }
-          });
-          functionTools[toolDef.tool.name] = this.wrapToolWithStreaming(
-            toolDef.tool.name,
-            aiTool,
-            streamRequestId || "",
-            "tool"
-          );
-        }
+          }
+        });
+        functionTools[functionToolDef.name] = this.wrapToolWithStreaming(
+          functionToolDef.name,
+          aiTool,
+          streamRequestId || "",
+          "tool"
+        );
       }
     } catch (error) {
-      logger17.error({ error }, "Failed to load function tools from database");
+      logger16.error({ error }, "Failed to load function tools from database");
     }
     return functionTools;
   }
@@ -7135,7 +7205,7 @@ var Agent = class {
   async getResolvedContext(conversationId, headers) {
     try {
       if (!this.config.contextConfigId) {
-        logger17.debug({ graphId: this.config.graphId }, "No context config found for graph");
+        logger16.debug({ graphId: this.config.graphId }, "No context config found for graph");
         return null;
       }
       const contextConfig = await getContextConfigById(dbClient_default)({
@@ -7147,7 +7217,7 @@ var Agent = class {
         id: this.config.contextConfigId
       });
       if (!contextConfig) {
-        logger17.warn({ contextConfigId: this.config.contextConfigId }, "Context config not found");
+        logger16.warn({ contextConfigId: this.config.contextConfigId }, "Context config not found");
         return null;
       }
       if (!this.contextResolver) {
@@ -7164,7 +7234,7 @@ var Agent = class {
         $now: (/* @__PURE__ */ new Date()).toISOString(),
         $env: process.env
       };
-      logger17.debug(
+      logger16.debug(
         {
           conversationId,
           contextConfigId: contextConfig.id,
@@ -7178,7 +7248,7 @@ var Agent = class {
       );
       return contextWithBuiltins;
     } catch (error) {
-      logger17.error(
+      logger16.error(
         {
           conversationId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -7202,7 +7272,7 @@ var Agent = class {
       });
       return graphDefinition?.graphPrompt || void 0;
     } catch (error) {
-      logger17.warn(
+      logger16.warn(
         {
           graphId: this.config.graphId,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -7227,11 +7297,11 @@ var Agent = class {
       if (!graphDefinition) {
         return false;
       }
-      return Object.values(graphDefinition.agents).some(
-        (agent) => "artifactComponents" in agent && agent.artifactComponents && agent.artifactComponents.length > 0
+      return Object.values(graphDefinition.subAgents).some(
+        (subAgent) => "artifactComponents" in subAgent && subAgent.artifactComponents && subAgent.artifactComponents.length > 0
       );
     } catch (error) {
-      logger17.warn(
+      logger16.warn(
         {
           graphId: this.config.graphId,
           tenantId: this.config.tenantId,
@@ -7260,7 +7330,7 @@ var Agent = class {
           preserveUnresolved: false
         });
       } catch (error) {
-        logger17.error(
+        logger16.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -7307,7 +7377,7 @@ var Agent = class {
           preserveUnresolved: false
         });
       } catch (error) {
-        logger17.error(
+        logger16.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -7322,7 +7392,7 @@ var Agent = class {
     const functionTools = await this.getFunctionTools(streamRequestId || "");
     const relationTools = this.getRelationTools(runtimeContext);
     const allTools = { ...mcpTools, ...functionTools, ...relationTools };
-    logger17.info(
+    logger16.info(
       {
         mcpTools: Object.keys(mcpTools),
         functionTools: Object.keys(functionTools),
@@ -7343,7 +7413,7 @@ var Agent = class {
       inputSchema: tool3.inputSchema || tool3.parameters || {},
       usageGuidelines: name.startsWith("transfer_to_") || name.startsWith("delegate_to_") ? `Use this tool to ${name.startsWith("transfer_to_") ? "transfer" : "delegate"} to another agent when appropriate.` : "Use this tool when appropriate for the task at hand."
     }));
-    const { getConversationScopedArtifacts } = await import('./conversations-6HJ4FX5F.js');
+    const { getConversationScopedArtifacts } = await import('./conversations-JSORLLWS.js');
     const historyConfig = this.config.conversationHistoryConfig ?? createDefaultConversationHistoryConfig();
     const referenceArtifacts = await getConversationScopedArtifacts({
       tenantId: this.config.tenantId,
@@ -7361,7 +7431,7 @@ var Agent = class {
           preserveUnresolved: false
         });
       } catch (error) {
-        logger17.error(
+        logger16.error(
           {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
@@ -7394,7 +7464,7 @@ var Agent = class {
         toolCallId: z.string().describe("The tool call ID associated with this artifact.")
       }),
       execute: async ({ artifactId, toolCallId }) => {
-        logger17.info({ artifactId, toolCallId }, "get_artifact_full executed");
+        logger16.info({ artifactId, toolCallId }, "get_artifact_full executed");
         const streamRequestId = this.getStreamRequestId();
         const artifactService = graphSessionManager.getArtifactService(streamRequestId);
         if (!artifactService) {
@@ -7428,7 +7498,7 @@ var Agent = class {
     });
   }
   // Provide a default tool set that is always available to the agent.
-  async getDefaultTools(_sessionId, streamRequestId) {
+  async getDefaultTools(streamRequestId) {
     const defaultTools = {};
     if (await this.graphHasArtifactComponents()) {
       defaultTools.get_reference_artifact = this.getArtifactTools();
@@ -7654,7 +7724,7 @@ var Agent = class {
       };
       return enhanced;
     } catch (error) {
-      logger17.warn({ error }, "Failed to enhance tool result with structure hints");
+      logger16.warn({ error }, "Failed to enhance tool result with structure hints");
       return result;
     }
   }
@@ -7669,7 +7739,7 @@ var Agent = class {
         }
       });
     } catch (error) {
-      logger17.error(
+      logger16.error(
         { error, graphId: this.config.graphId },
         "Failed to check graph artifact components"
       );
@@ -7714,7 +7784,7 @@ var Agent = class {
                 // Thinking prompt without data components
                 this.getFunctionTools(sessionId, streamRequestId),
                 Promise.resolve(this.getRelationTools(runtimeContext, sessionId)),
-                this.getDefaultTools(sessionId, streamRequestId)
+                this.getDefaultTools(streamRequestId)
               ]);
               childSpan.setStatus({ code: SpanStatusCode.OK });
               return result;
@@ -7754,7 +7824,7 @@ var Agent = class {
               currentMessage: userMessage,
               options: historyConfig,
               filters: {
-                agentId: this.config.id,
+                subAgentId: this.config.id,
                 taskId
               }
             });
@@ -7770,7 +7840,7 @@ var Agent = class {
         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) {
-          logger17.warn(
+          logger16.warn(
             {
               requestedTimeout: modelSettings.maxDuration * 1e3,
               appliedTimeout: timeoutMs,
@@ -7812,7 +7882,7 @@ var Agent = class {
                     }
                   );
                 } catch (error) {
-                  logger17.debug({ error }, "Failed to track agent reasoning");
+                  logger16.debug({ error }, "Failed to track agent reasoning");
                 }
               }
               if (last && "toolCalls" in last && last.toolCalls) {
@@ -7839,7 +7909,7 @@ var Agent = class {
             projectId: session?.projectId,
             artifactComponents: this.artifactComponents,
             streamRequestId: this.getStreamRequestId(),
-            agentId: this.config.id
+            subAgentId: this.config.id
           };
           const parser = new IncrementalStreamParser(
             streamHelper,
@@ -7884,6 +7954,16 @@ var Agent = class {
               }))
             };
           }
+          const streamedContent = parser.getAllStreamedContent();
+          if (streamedContent.length > 0) {
+            response.streamedContent = {
+              parts: streamedContent.map((part) => ({
+                kind: part.kind,
+                ...part.kind === "text" && { text: part.text },
+                ...part.kind === "data" && { data: part.data }
+              }))
+            };
+          }
         } else {
           let genConfig;
           if (hasStructuredOutput) {
@@ -7916,7 +7996,7 @@ var Agent = class {
                     }
                   );
                 } catch (error) {
-                  logger17.debug({ error }, "Failed to track agent reasoning");
+                  logger16.debug({ error }, "Failed to track agent reasoning");
                 }
               }
               if (last && "toolCalls" in last && last.toolCalls) {
@@ -8088,7 +8168,7 @@ ${output}${structureHintsFormatted}`;
                 projectId: session?.projectId,
                 artifactComponents: this.artifactComponents,
                 streamRequestId: this.getStreamRequestId(),
-                agentId: this.config.id
+                subAgentId: this.config.id
               };
               const parser = new IncrementalStreamParser(
                 streamHelper,
@@ -8171,7 +8251,7 @@ ${output}${structureHintsFormatted}`;
             contextId,
             artifactComponents: this.artifactComponents,
             streamRequestId: this.getStreamRequestId(),
-            agentId: this.config.id
+            subAgentId: this.config.id
           });
           if (response.object) {
             formattedContent = await responseFormatter.formatObjectResponse(
@@ -8208,7 +8288,7 @@ ${output}${structureHintsFormatted}`;
 };
 
 // src/agents/generateTaskHandler.ts
-var logger18 = getLogger("generateTaskHandler");
+var logger17 = getLogger("generateTaskHandler");
 var createTaskHandler = (config, credentialStoreRegistry) => {
   return async (task) => {
     try {
@@ -8234,14 +8314,14 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             projectId: config.projectId,
             graphId: config.graphId
           },
-          agentId: config.agentId
+          subAgentId: config.subAgentId
         }),
         getToolsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
             projectId: config.projectId,
             graphId: config.graphId,
-            agentId: config.agentId
+            subAgentId: config.subAgentId
           }
         }),
         getDataComponentsForAgent(dbClient_default)({
@@ -8249,7 +8329,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             tenantId: config.tenantId,
             projectId: config.projectId,
             graphId: config.graphId,
-            agentId: config.agentId
+            subAgentId: config.subAgentId
           }
         }),
         getArtifactComponentsForAgent(dbClient_default)({
@@ -8257,21 +8337,21 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             tenantId: config.tenantId,
             projectId: config.projectId,
             graphId: config.graphId,
-            agentId: config.agentId
+            subAgentId: config.subAgentId
           }
         })
       ]);
-      logger18.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
+      logger17.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
       const enhancedInternalRelations = await Promise.all(
         internalRelations.map(async (relation) => {
           try {
-            const relatedAgent = await getAgentById(dbClient_default)({
+            const relatedAgent = await getSubAgentById(dbClient_default)({
               scopes: {
                 tenantId: config.tenantId,
                 projectId: config.projectId,
                 graphId: config.graphId
               },
-              agentId: relation.id
+              subAgentId: relation.id
             });
             if (relatedAgent) {
               const relatedAgentRelations = await getRelatedAgentsForGraph(dbClient_default)({
@@ -8280,7 +8360,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                   projectId: config.projectId,
                   graphId: config.graphId
                 },
-                agentId: relation.id
+                subAgentId: relation.id
               });
               const enhancedDescription = generateDescriptionWithTransfers(
                 relation.description || "",
@@ -8290,7 +8370,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
               return { ...relation, description: enhancedDescription };
             }
           } catch (error) {
-            logger18.warn({ agentId: relation.id, error }, "Failed to enhance agent description");
+            logger17.warn({ subAgentId: relation.id, error }, "Failed to enhance agent description");
           }
           return relation;
         })
@@ -8305,7 +8385,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       ) ?? [];
       const agent = new Agent(
         {
-          id: config.agentId,
+          id: config.subAgentId,
           tenantId: config.tenantId,
           projectId: config.projectId,
           graphId: config.graphId,
@@ -8316,7 +8396,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           agentPrompt,
           models: models || void 0,
           stopWhen: stopWhen || void 0,
-          agentRelations: enhancedInternalRelations.map((relation) => ({
+          subAgentRelations: enhancedInternalRelations.map((relation) => ({
             id: relation.id,
             tenantId: config.tenantId,
             projectId: config.projectId,
@@ -8327,7 +8407,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             description: relation.description,
             agentPrompt: "",
             delegateRelations: [],
-            agentRelations: [],
+            subAgentRelations: [],
             transferRelations: []
           })),
           transferRelations: enhancedInternalRelations.filter((relation) => relation.relationType === "transfer").map((relation) => ({
@@ -8341,7 +8421,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             description: relation.description,
             agentPrompt: "",
             delegateRelations: [],
-            agentRelations: [],
+            subAgentRelations: [],
             transferRelations: []
           })),
           delegateRelations: [
@@ -8359,7 +8439,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 description: relation.description,
                 agentPrompt: "",
                 delegateRelations: [],
-                agentRelations: [],
+                subAgentRelations: [],
                 transferRelations: []
               }
             })),
@@ -8394,11 +8474,11 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         const taskIdMatch = task.id.match(/^task_([^-]+-[^-]+-\d+)-/);
         if (taskIdMatch) {
           contextId = taskIdMatch[1];
-          logger18.info(
+          logger17.info(
             {
               taskId: task.id,
               extractedContextId: contextId,
-              agentId: config.agentId
+              subAgentId: config.subAgentId
             },
             "Extracted contextId from task ID for delegation"
           );
@@ -8410,8 +8490,8 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       const isDelegation = task.context?.metadata?.isDelegation === true;
       agent.setDelegationStatus(isDelegation);
       if (isDelegation) {
-        logger18.info(
-          { agentId: config.agentId, taskId: task.id },
+        logger17.info(
+          { subAgentId: config.subAgentId, taskId: task.id },
           "Delegated agent - streaming disabled"
         );
         if (streamRequestId && config.tenantId && config.projectId) {
@@ -8508,13 +8588,13 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
   };
 };
 var createTaskHandlerConfig = async (params) => {
-  const agent = await getAgentById(dbClient_default)({
+  const agent = await getSubAgentById(dbClient_default)({
     scopes: {
       tenantId: params.tenantId,
       projectId: params.projectId,
       graphId: params.graphId
     },
-    agentId: params.agentId
+    subAgentId: params.subAgentId
   });
   const agentGraph = await getAgentGraphById(dbClient_default)({
     scopes: {
@@ -8524,7 +8604,7 @@ var createTaskHandlerConfig = async (params) => {
     }
   });
   if (!agent) {
-    throw new Error(`Agent not found: ${params.agentId}`);
+    throw new Error(`Agent not found: ${params.subAgentId}`);
   }
   const effectiveModels = await resolveModelConfig(params.graphId, agent);
   const effectiveConversationHistoryConfig = agent.conversationHistoryConfig || { mode: "full" };
@@ -8532,7 +8612,7 @@ var createTaskHandlerConfig = async (params) => {
     tenantId: params.tenantId,
     projectId: params.projectId,
     graphId: params.graphId,
-    agentId: params.agentId,
+    subAgentId: params.subAgentId,
     agentSchema: {
       id: agent.id,
       name: agent.name,
@@ -8560,25 +8640,27 @@ async function hydrateGraph({
   apiKey
 }) {
   try {
-    if (!dbGraph.defaultAgentId) {
+    if (!dbGraph.defaultSubAgentId) {
       throw new Error(`Graph ${dbGraph.id} does not have a default agent configured`);
     }
-    const defaultAgent = await getAgentById(dbClient_default)({
+    const defaultSubAgent = await getSubAgentById(dbClient_default)({
       scopes: {
         tenantId: dbGraph.tenantId,
         projectId: dbGraph.projectId,
         graphId: dbGraph.id
       },
-      agentId: dbGraph.defaultAgentId
+      subAgentId: dbGraph.defaultSubAgentId
     });
-    if (!defaultAgent) {
-      throw new Error(`Default agent ${dbGraph.defaultAgentId} not found for graph ${dbGraph.id}`);
+    if (!defaultSubAgent) {
+      throw new Error(
+        `Default agent ${dbGraph.defaultSubAgentId} not found for graph ${dbGraph.id}`
+      );
     }
     const taskHandlerConfig = await createTaskHandlerConfig({
       tenantId: dbGraph.tenantId,
       projectId: dbGraph.projectId,
       graphId: dbGraph.id,
-      agentId: dbGraph.defaultAgentId,
+      subAgentId: dbGraph.defaultSubAgentId,
       baseUrl,
       apiKey
     });
@@ -8607,7 +8689,7 @@ async function hydrateGraph({
       }
     };
     return {
-      agentId: dbGraph.id,
+      subAgentId: dbGraph.id,
       // Use graph ID as agent ID for A2A purposes
       tenantId: dbGraph.tenantId,
       projectId: dbGraph.projectId,
@@ -8632,7 +8714,7 @@ async function getRegisteredGraph(executionContext) {
 
 // src/routes/agents.ts
 var app = new OpenAPIHono();
-var logger19 = getLogger("agents");
+var logger18 = getLogger("agents");
 app.openapi(
   createRoute({
     method: "get",
@@ -8670,7 +8752,7 @@ app.openapi(
       tracestate: c.req.header("tracestate"),
       baggage: c.req.header("baggage")
     };
-    logger19.info(
+    logger18.info(
       {
         otelHeaders,
         path: c.req.path,
@@ -8679,22 +8761,22 @@ app.openapi(
       "OpenTelemetry headers: well-known agent.json"
     );
     const executionContext = getRequestExecutionContext(c);
-    const { tenantId, projectId, graphId, agentId } = executionContext;
+    const { tenantId, projectId, graphId, subAgentId } = executionContext;
     console.dir("executionContext", executionContext);
-    if (agentId) {
-      logger19.info(
+    if (subAgentId) {
+      logger18.info(
         {
           message: "getRegisteredAgent (agent-level)",
           tenantId,
           projectId,
           graphId,
-          agentId
+          subAgentId
         },
         "agent-level well-known agent.json"
       );
       const credentialStores = c.get("credentialStores");
       const agent = await getRegisteredAgent(executionContext, credentialStores);
-      logger19.info({ agent }, "agent registered: well-known agent.json");
+      logger18.info({ agent }, "agent registered: well-known agent.json");
       if (!agent) {
         throw createApiError({
           code: "not_found",
@@ -8703,7 +8785,7 @@ app.openapi(
       }
       return c.json(agent.agentCard);
     } else {
-      logger19.info(
+      logger18.info(
         {
           message: "getRegisteredGraph (graph-level)",
           tenantId,
@@ -8729,7 +8811,7 @@ app.post("/a2a", async (c) => {
     tracestate: c.req.header("tracestate"),
     baggage: c.req.header("baggage")
   };
-  logger19.info(
+  logger18.info(
     {
       otelHeaders,
       path: c.req.path,
@@ -8738,15 +8820,15 @@ app.post("/a2a", async (c) => {
     "OpenTelemetry headers: a2a"
   );
   const executionContext = getRequestExecutionContext(c);
-  const { tenantId, projectId, graphId, agentId } = executionContext;
-  if (agentId) {
-    logger19.info(
+  const { tenantId, projectId, graphId, subAgentId } = executionContext;
+  if (subAgentId) {
+    logger18.info(
       {
         message: "a2a (agent-level)",
         tenantId,
         projectId,
         graphId,
-        agentId
+        subAgentId
       },
       "agent-level a2a endpoint"
     );
@@ -8764,7 +8846,7 @@ app.post("/a2a", async (c) => {
     }
     return a2aHandler(c, agent);
   } else {
-    logger19.info(
+    logger18.info(
       {
         message: "a2a (graph-level)",
         tenantId,
@@ -8773,7 +8855,7 @@ app.post("/a2a", async (c) => {
       },
       "graph-level a2a endpoint"
     );
-    const graph = await getAgentGraphWithDefaultAgent(dbClient_default)({
+    const graph = await getAgentGraphWithDefaultSubAgent(dbClient_default)({
       scopes: { tenantId, projectId, graphId }
     });
     if (!graph) {
@@ -8786,7 +8868,7 @@ app.post("/a2a", async (c) => {
         404
       );
     }
-    if (!graph.defaultAgentId) {
+    if (!graph.defaultSubAgentId) {
       return c.json(
         {
           jsonrpc: "2.0",
@@ -8796,10 +8878,10 @@ app.post("/a2a", async (c) => {
         400
       );
     }
-    executionContext.agentId = graph.defaultAgentId;
+    executionContext.subAgentId = graph.defaultSubAgentId;
     const credentialStores = c.get("credentialStores");
-    const defaultAgent = await getRegisteredAgent(executionContext, credentialStores);
-    if (!defaultAgent) {
+    const defaultSubAgent = await getRegisteredAgent(executionContext, credentialStores);
+    if (!defaultSubAgent) {
       return c.json(
         {
           jsonrpc: "2.0",
@@ -8809,24 +8891,24 @@ app.post("/a2a", async (c) => {
         404
       );
     }
-    return a2aHandler(c, defaultAgent);
+    return a2aHandler(c, defaultSubAgent);
   }
 });
 var agents_default = app;
-var logger20 = getLogger("Transfer");
+var logger19 = getLogger("Transfer");
 async function executeTransfer({
   tenantId,
   threadId,
   projectId,
-  targetAgentId
+  targetSubAgentId
 }) {
-  logger20.info({ targetAgent: targetAgentId }, "Executing transfer to agent");
+  logger19.info({ targetAgent: targetSubAgentId }, "Executing transfer to agent");
   await setActiveAgentForThread(dbClient_default)({
     scopes: { tenantId, projectId },
     threadId,
-    agentId: targetAgentId
+    subAgentId: targetSubAgentId
   });
-  return { success: true, targetAgentId };
+  return { success: true, targetSubAgentId };
 }
 function isTransferResponse(result) {
   return result?.artifacts.some(
@@ -9402,7 +9484,7 @@ function createMCPStreamHelper() {
 }
 
 // src/handlers/executionHandler.ts
-var logger21 = getLogger("ExecutionHandler");
+var logger20 = getLogger("ExecutionHandler");
 var ExecutionHandler = class {
   constructor() {
     // Hardcoded error limit - separate from configurable stopWhen
@@ -9438,7 +9520,7 @@ var ExecutionHandler = class {
     if (emitOperations) {
       graphSessionManager.enableEmitOperations(requestId2);
     }
-    logger21.info(
+    logger20.info(
       { sessionId: requestId2, graphId, conversationId, emitOperations },
       "Created GraphSession for message execution"
     );
@@ -9453,7 +9535,7 @@ var ExecutionHandler = class {
         );
       }
     } catch (error) {
-      logger21.error(
+      logger20.error(
         {
           error: error instanceof Error ? error.message : "Unknown error",
           stack: error instanceof Error ? error.stack : void 0
@@ -9469,7 +9551,7 @@ var ExecutionHandler = class {
     try {
       await sseHelper.writeOperation(agentInitializingOp(requestId2, graphId));
       const taskId = `task_${conversationId}-${requestId2}`;
-      logger21.info(
+      logger20.info(
         { taskId, currentAgentId, conversationId, requestId: requestId2 },
         "Attempting to create or reuse existing task"
       );
@@ -9479,7 +9561,7 @@ var ExecutionHandler = class {
           tenantId,
           projectId,
           graphId,
-          agentId: currentAgentId,
+          subAgentId: currentAgentId,
           contextId: conversationId,
           status: "pending",
           metadata: {
@@ -9493,7 +9575,7 @@ var ExecutionHandler = class {
             agent_id: currentAgentId
           }
         });
-        logger21.info(
+        logger20.info(
           {
             taskId,
             createdTaskMetadata: Array.isArray(task) ? task[0]?.metadata : task?.metadata
@@ -9502,27 +9584,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") {
-          logger21.info(
+          logger20.info(
             { taskId, error: error.message },
             "Task already exists, fetching existing task"
           );
           const existingTask = await getTask(dbClient_default)({ id: taskId });
           if (existingTask) {
             task = existingTask;
-            logger21.info(
+            logger20.info(
               { taskId, existingTask },
               "Successfully reused existing task from race condition"
             );
           } else {
-            logger21.error({ taskId, error }, "Task constraint failed but task not found");
+            logger20.error({ taskId, error }, "Task constraint failed but task not found");
             throw error;
           }
         } else {
-          logger21.error({ taskId, error }, "Failed to create task due to non-constraint error");
+          logger20.error({ taskId, error }, "Failed to create task due to non-constraint error");
           throw error;
         }
       }
-      logger21.debug(
+      logger20.debug(
         {
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           executionType: "create_initial_task",
@@ -9540,7 +9622,7 @@ var ExecutionHandler = class {
       const maxTransfers = graphConfig?.stopWhen?.transferCountIs ?? 10;
       while (iterations < maxTransfers) {
         iterations++;
-        logger21.info(
+        logger20.info(
           { iterations, currentAgentId, graphId, conversationId, fromAgentId },
           `Execution loop iteration ${iterations} with agent ${currentAgentId}, transfer from: ${fromAgentId || "none"}`
         );
@@ -9548,10 +9630,10 @@ var ExecutionHandler = class {
           scopes: { tenantId, projectId },
           conversationId
         });
-        logger21.info({ activeAgent }, "activeAgent");
-        if (activeAgent && activeAgent.activeAgentId !== currentAgentId) {
-          currentAgentId = activeAgent.activeAgentId;
-          logger21.info({ currentAgentId }, `Updated current agent to: ${currentAgentId}`);
+        logger20.info({ activeAgent }, "activeAgent");
+        if (activeAgent && activeAgent.activeSubAgentId !== currentAgentId) {
+          currentAgentId = activeAgent.activeSubAgentId;
+          logger20.info({ currentAgentId }, `Updated current agent to: ${currentAgentId}`);
         }
         const agentBaseUrl = `${baseUrl}/agents`;
         const a2aClient = new A2AClient(agentBaseUrl, {
@@ -9592,13 +9674,13 @@ var ExecutionHandler = class {
         });
         if (!messageResponse?.result) {
           errorCount++;
-          logger21.error(
+          logger20.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`;
-            logger21.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
+            logger20.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
             await sseHelper.writeOperation(errorOp(errorMessage2, currentAgentId || "system"));
             if (task) {
               await updateTask(dbClient_default)({
@@ -9621,20 +9703,20 @@ var ExecutionHandler = class {
         }
         if (isTransferResponse(messageResponse.result)) {
           const transferResponse = messageResponse.result;
-          const targetAgentId = transferResponse.artifacts?.[0]?.parts?.[0]?.data?.targetAgentId;
+          const targetSubAgentId = transferResponse.artifacts?.[0]?.parts?.[0]?.data?.targetSubAgentId;
           const transferReason = transferResponse.artifacts?.[0]?.parts?.[1]?.text;
-          logger21.info({ targetAgentId, transferReason }, "transfer response");
+          logger20.info({ targetSubAgentId, transferReason }, "transfer response");
           currentMessage = `<transfer_context> ${transferReason} </transfer_context>`;
-          const { success, targetAgentId: newAgentId } = await executeTransfer({
+          const { success, targetSubAgentId: newAgentId } = await executeTransfer({
             projectId,
             tenantId,
             threadId: conversationId,
-            targetAgentId
+            targetSubAgentId
           });
           if (success) {
             fromAgentId = currentAgentId;
             currentAgentId = newAgentId;
-            logger21.info(
+            logger20.info(
               {
                 transferFrom: fromAgentId,
                 transferTo: currentAgentId,
@@ -9645,14 +9727,27 @@ var ExecutionHandler = class {
           }
           continue;
         }
-        const responseParts = messageResponse.result.artifacts?.flatMap(
-          (artifact) => artifact.parts || []
-        ) || [];
+        let responseParts = [];
+        if (messageResponse.result.streamedContent?.parts) {
+          responseParts = messageResponse.result.streamedContent.parts;
+          logger20.info(
+            { partsCount: responseParts.length },
+            "Using streamed content for conversation history"
+          );
+        } else {
+          responseParts = messageResponse.result.artifacts?.flatMap(
+            (artifact) => artifact.parts || []
+          ) || [];
+          logger20.info(
+            { partsCount: responseParts.length },
+            "Using artifacts for conversation history (fallback)"
+          );
+        }
         if (responseParts && responseParts.length > 0) {
           const graphSessionData = graphSessionManager.getSession(requestId2);
           if (graphSessionData) {
             const sessionSummary = graphSessionData.getSummary();
-            logger21.info(sessionSummary, "GraphSession data after completion");
+            logger20.info(sessionSummary, "GraphSession data after completion");
           }
           let textContent = "";
           for (const part of responseParts) {
@@ -9684,8 +9779,7 @@ var ExecutionHandler = class {
                 },
                 visibility: "user-facing",
                 messageType: "chat",
-                agentId: currentAgentId,
-                fromAgentId: currentAgentId,
+                fromSubAgentId: currentAgentId,
                 taskId: task.id
               });
               const updateTaskStart = Date.now();
@@ -9706,22 +9800,22 @@ var ExecutionHandler = class {
                 }
               });
               const updateTaskEnd = Date.now();
-              logger21.info(
+              logger20.info(
                 { duration: updateTaskEnd - updateTaskStart },
                 "Completed updateTask operation"
               );
               await sseHelper.writeOperation(completionOp(currentAgentId, iterations));
               await sseHelper.complete();
-              logger21.info({}, "Ending GraphSession and cleaning up");
+              logger20.info({}, "Ending GraphSession and cleaning up");
               graphSessionManager.endSession(requestId2);
-              logger21.info({}, "Cleaning up streamHelper");
+              logger20.info({}, "Cleaning up streamHelper");
               unregisterStreamHelper(requestId2);
               let response;
               if (sseHelper instanceof MCPStreamHelper) {
                 const captured = sseHelper.getCapturedResponse();
                 response = captured.text || "No response content";
               }
-              logger21.info({}, "ExecutionHandler returning success");
+              logger20.info({}, "ExecutionHandler returning success");
               return { success: true, iterations, response };
             } catch (error) {
               setSpanWithError(span, error instanceof Error ? error : new Error(String(error)));
@@ -9732,13 +9826,13 @@ var ExecutionHandler = class {
           });
         }
         errorCount++;
-        logger21.warn(
+        logger20.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`;
-          logger21.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
+          logger20.error({ maxErrors: this.MAX_ERRORS, errorCount }, errorMessage2);
           await sseHelper.writeOperation(errorOp(errorMessage2, currentAgentId || "system"));
           if (task) {
             await updateTask(dbClient_default)({
@@ -9759,7 +9853,7 @@ var ExecutionHandler = class {
         }
       }
       const errorMessage = `Maximum transfer limit (${maxTransfers}) reached without completion`;
-      logger21.error({ maxTransfers, iterations }, errorMessage);
+      logger20.error({ maxTransfers, iterations }, errorMessage);
       await sseHelper.writeOperation(errorOp(errorMessage, currentAgentId || "system"));
       if (task) {
         await updateTask(dbClient_default)({
@@ -9778,7 +9872,7 @@ var ExecutionHandler = class {
       unregisterStreamHelper(requestId2);
       return { success: false, error: errorMessage, iterations };
     } catch (error) {
-      logger21.error({ error }, "Error in execution handler");
+      logger20.error({ error }, "Error in execution handler");
       const errorMessage = error instanceof Error ? error.message : "Unknown execution error";
       await sseHelper.writeOperation(
         errorOp(`Execution error: ${errorMessage}`, currentAgentId || "system")
@@ -9805,7 +9899,7 @@ var ExecutionHandler = class {
 
 // src/routes/chat.ts
 var app2 = new OpenAPIHono();
-var logger22 = getLogger("completionsHandler");
+var logger21 = getLogger("completionsHandler");
 var chatCompletionsRoute = createRoute({
   method: "post",
   path: "/completions",
@@ -9923,7 +10017,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     tracestate: c.req.header("tracestate"),
     baggage: c.req.header("baggage")
   };
-  logger22.info(
+  logger21.info(
     {
       otelHeaders,
       path: c.req.path,
@@ -9947,20 +10041,20 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       scopes: { tenantId, projectId, graphId }
     });
     let agentGraph;
-    let defaultAgentId;
+    let defaultSubAgentId;
     if (fullGraph) {
       agentGraph = {
         id: fullGraph.id,
         name: fullGraph.name,
         tenantId,
         projectId,
-        defaultAgentId: fullGraph.defaultAgentId
+        defaultSubAgentId: fullGraph.defaultSubAgentId
       };
-      const agentKeys = Object.keys(fullGraph.agents || {});
+      const agentKeys = Object.keys(fullGraph.subAgents || {});
       const firstAgentId = agentKeys.length > 0 ? agentKeys[0] : "";
-      defaultAgentId = fullGraph.defaultAgentId || firstAgentId;
+      defaultSubAgentId = fullGraph.defaultSubAgentId || firstAgentId;
     } else {
-      agentGraph = await getAgentGraphWithDefaultAgent(dbClient_default)({
+      agentGraph = await getAgentGraphWithDefaultSubAgent(dbClient_default)({
         scopes: { tenantId, projectId, graphId }
       });
       if (!agentGraph) {
@@ -9969,9 +10063,9 @@ app2.openapi(chatCompletionsRoute, async (c) => {
           message: "Agent graph not found"
         });
       }
-      defaultAgentId = agentGraph.defaultAgentId || "";
+      defaultSubAgentId = agentGraph.defaultSubAgentId || "";
     }
-    if (!defaultAgentId) {
+    if (!defaultSubAgentId) {
       throw createApiError({
         code: "not_found",
         message: "No default agent found in graph"
@@ -9981,7 +10075,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       tenantId,
       projectId,
       id: conversationId,
-      activeAgentId: defaultAgentId
+      activeSubAgentId: defaultSubAgentId
     });
     const activeAgent = await getActiveAgentForConversation(dbClient_default)({
       scopes: { tenantId, projectId },
@@ -9991,13 +10085,13 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       setActiveAgentForConversation(dbClient_default)({
         scopes: { tenantId, projectId },
         conversationId,
-        agentId: defaultAgentId
+        subAgentId: defaultSubAgentId
       });
     }
-    const agentId = activeAgent?.activeAgentId || defaultAgentId;
-    const agentInfo = await getAgentById(dbClient_default)({
+    const subAgentId = activeAgent?.activeSubAgentId || defaultSubAgentId;
+    const agentInfo = await getSubAgentById(dbClient_default)({
       scopes: { tenantId, projectId, graphId },
-      agentId
+      subAgentId
     });
     if (!agentInfo) {
       throw createApiError({
@@ -10016,14 +10110,14 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       dbClient: dbClient_default,
       credentialStores
     });
-    logger22.info(
+    logger21.info(
       {
         tenantId,
         projectId,
         graphId,
         conversationId,
-        defaultAgentId,
-        activeAgentId: activeAgent?.activeAgentId || "none",
+        defaultSubAgentId,
+        activeSubAgentId: activeAgent?.activeSubAgentId || "none",
         hasContextConfig: !!agentGraph.contextConfigId,
         hasHeaders: !!body.headers,
         hasValidatedContext: !!validatedContext,
@@ -10064,7 +10158,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       try {
         const sseHelper = createSSEStreamHelper(stream2, requestId2, timestamp);
         await sseHelper.writeRole();
-        logger22.info({ agentId }, "Starting execution");
+        logger21.info({ subAgentId }, "Starting execution");
         const emitOperationsHeader = c.req.header("x-emit-operations");
         const emitOperations = emitOperationsHeader === "true";
         const executionHandler = new ExecutionHandler();
@@ -10072,12 +10166,12 @@ app2.openapi(chatCompletionsRoute, async (c) => {
           executionContext,
           conversationId,
           userMessage,
-          initialAgentId: agentId,
+          initialAgentId: subAgentId,
           requestId: requestId2,
           sseHelper,
           emitOperations
         });
-        logger22.info(
+        logger21.info(
           { result },
           `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
         );
@@ -10091,7 +10185,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
         }
         await sseHelper.complete();
       } catch (error) {
-        logger22.error(
+        logger21.error(
           {
             error: error instanceof Error ? error.message : error,
             stack: error instanceof Error ? error.stack : void 0
@@ -10108,12 +10202,12 @@ app2.openapi(chatCompletionsRoute, async (c) => {
           );
           await sseHelper.complete();
         } catch (streamError) {
-          logger22.error({ streamError }, "Failed to write error to stream");
+          logger21.error({ streamError }, "Failed to write error to stream");
         }
       }
     });
   } catch (error) {
-    logger22.error(
+    logger21.error(
       {
         error: error instanceof Error ? error.message : error,
         stack: error instanceof Error ? error.stack : void 0
@@ -10137,7 +10231,7 @@ var getMessageText = (content) => {
 };
 var chat_default = app2;
 var app3 = new OpenAPIHono();
-var logger23 = getLogger("chatDataStream");
+var logger22 = getLogger("chatDataStream");
 var chatDataStreamRoute = createRoute({
   method: "post",
   path: "/chat",
@@ -10202,7 +10296,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
         "project.id": projectId
       });
     }
-    const agentGraph = await getAgentGraphWithDefaultAgent(dbClient_default)({
+    const agentGraph = await getAgentGraphWithDefaultSubAgent(dbClient_default)({
       scopes: { tenantId, projectId, graphId }
     });
     if (!agentGraph) {
@@ -10211,9 +10305,9 @@ app3.openapi(chatDataStreamRoute, async (c) => {
         message: "Agent graph not found"
       });
     }
-    const defaultAgentId = agentGraph.defaultAgentId;
+    const defaultSubAgentId = agentGraph.defaultSubAgentId;
     const graphName = agentGraph.name;
-    if (!defaultAgentId) {
+    if (!defaultSubAgentId) {
       throw createApiError({
         code: "bad_request",
         message: "Graph does not have a default agent configured"
@@ -10227,13 +10321,13 @@ app3.openapi(chatDataStreamRoute, async (c) => {
       setActiveAgentForConversation(dbClient_default)({
         scopes: { tenantId, projectId },
         conversationId,
-        agentId: defaultAgentId
+        subAgentId: defaultSubAgentId
       });
     }
-    const agentId = activeAgent?.activeAgentId || defaultAgentId;
-    const agentInfo = await getAgentById(dbClient_default)({
+    const subAgentId = activeAgent?.activeSubAgentId || defaultSubAgentId;
+    const agentInfo = await getSubAgentById(dbClient_default)({
       scopes: { tenantId, projectId, graphId },
-      agentId
+      subAgentId
     });
     if (!agentInfo) {
       throw createApiError({
@@ -10254,7 +10348,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("") || "";
-    logger23.info({ userText, lastUserMessage }, "userText");
+    logger22.info({ userText, lastUserMessage }, "userText");
     const messageSpan = trace.getActiveSpan();
     if (messageSpan) {
       messageSpan.setAttributes({
@@ -10290,7 +10384,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
             executionContext,
             conversationId,
             userMessage: userText,
-            initialAgentId: agentId,
+            initialAgentId: subAgentId,
             requestId: `chatds-${Date.now()}`,
             sseHelper: streamHelper,
             emitOperations
@@ -10299,7 +10393,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
             await streamHelper.writeOperation(errorOp("Unable to process request", "system"));
           }
         } catch (err) {
-          logger23.error({ err }, "Streaming error");
+          logger22.error({ err }, "Streaming error");
           await streamHelper.writeOperation(errorOp("Internal server error", "system"));
         } finally {
           if ("cleanup" in streamHelper && typeof streamHelper.cleanup === "function") {
@@ -10320,7 +10414,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
       )
     );
   } catch (error) {
-    logger23.error({ error }, "chatDataStream error");
+    logger22.error({ error }, "chatDataStream error");
     throw createApiError({
       code: "internal_server_error",
       message: "Failed to process chat completion"
@@ -10331,7 +10425,7 @@ var chatDataStream_default = app3;
 function createMCPSchema(schema) {
   return schema;
 }
-var logger24 = getLogger("mcp");
+var logger23 = getLogger("mcp");
 var _MockResponseSingleton = class _MockResponseSingleton {
   constructor() {
     __publicField(this, "mockRes");
@@ -10386,21 +10480,21 @@ var createSpoofInitMessage = (mcpProtocolVersion) => ({
   id: 0
 });
 var spoofTransportInitialization = async (transport, req, sessionId, mcpProtocolVersion) => {
-  logger24.info({ sessionId }, "Spoofing initialization message to set transport state");
+  logger23.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);
-    logger24.info({ sessionId }, "Successfully spoofed initialization");
+    logger23.info({ sessionId }, "Successfully spoofed initialization");
   } catch (spoofError) {
-    logger24.warn({ sessionId, error: spoofError }, "Spoof initialization failed, continuing anyway");
+    logger23.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"];
-  logger24.info({ sessionId }, "Received MCP session ID");
+  logger23.info({ sessionId }, "Received MCP session ID");
   if (!sessionId) {
-    logger24.info({ body }, "Missing session ID");
+    logger23.info({ body }, "Missing session ID");
     res.writeHead(400).end(
       JSON.stringify({
         jsonrpc: "2.0",
@@ -10426,7 +10520,7 @@ var validateSession = async (req, res, body, tenantId, projectId, graphId) => {
     scopes: { tenantId, projectId },
     conversationId: sessionId
   });
-  logger24.info(
+  logger23.info(
     {
       sessionId,
       conversationFound: !!conversation,
@@ -10437,7 +10531,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) {
-    logger24.info(
+    logger23.info(
       { sessionId, conversationId: conversation?.id },
       "MCP session not found or invalid"
     );
@@ -10486,7 +10580,7 @@ var processUserMessage = async (tenantId, projectId, conversationId, query) => {
     messageType: "chat"
   });
 };
-var executeAgentQuery = async (executionContext, conversationId, query, defaultAgentId) => {
+var executeAgentQuery = async (executionContext, conversationId, query, defaultSubAgentId) => {
   const requestId2 = `mcp-${Date.now()}`;
   const mcpStreamHelper = createMCPStreamHelper();
   const executionHandler = new ExecutionHandler();
@@ -10494,11 +10588,11 @@ var executeAgentQuery = async (executionContext, conversationId, query, defaultA
     executionContext,
     conversationId,
     userMessage: query,
-    initialAgentId: defaultAgentId,
+    initialAgentId: defaultSubAgentId,
     requestId: requestId2,
     sseHelper: mcpStreamHelper
   });
-  logger24.info(
+  logger23.info(
     { result },
     `Execution completed: ${result.success ? "success" : "failed"} after ${result.iterations} iterations`
   );
@@ -10525,7 +10619,7 @@ var executeAgentQuery = async (executionContext, conversationId, query, defaultA
 var getServer = async (headers, executionContext, conversationId, credentialStores) => {
   const { tenantId, projectId, graphId } = executionContext;
   setupTracing(conversationId, tenantId, graphId);
-  const agentGraph = await getAgentGraphWithDefaultAgent(dbClient_default)({
+  const agentGraph = await getAgentGraphWithDefaultSubAgent(dbClient_default)({
     scopes: { tenantId, projectId, graphId }
   });
   if (!agentGraph) {
@@ -10546,7 +10640,7 @@ var getServer = async (headers, executionContext, conversationId, credentialStor
     },
     async ({ query }) => {
       try {
-        if (!agentGraph.defaultAgentId) {
+        if (!agentGraph.defaultSubAgentId) {
           return {
             content: [
               {
@@ -10557,10 +10651,10 @@ var getServer = async (headers, executionContext, conversationId, credentialStor
             isError: true
           };
         }
-        const defaultAgentId = agentGraph.defaultAgentId;
-        const agentInfo = await getAgentById(dbClient_default)({
+        const defaultSubAgentId = agentGraph.defaultSubAgentId;
+        const agentInfo = await getSubAgentById(dbClient_default)({
           scopes: { tenantId, projectId, graphId },
-          agentId: defaultAgentId
+          subAgentId: defaultSubAgentId
         });
         if (!agentInfo) {
           return {
@@ -10582,7 +10676,7 @@ var getServer = async (headers, executionContext, conversationId, credentialStor
           dbClient: dbClient_default,
           credentialStores
         });
-        logger24.info(
+        logger23.info(
           {
             tenantId,
             projectId,
@@ -10595,7 +10689,7 @@ var getServer = async (headers, executionContext, conversationId, credentialStor
           "parameters"
         );
         await processUserMessage(tenantId, projectId, conversationId, query);
-        return executeAgentQuery(executionContext, conversationId, query, defaultAgentId);
+        return executeAgentQuery(executionContext, conversationId, query, defaultSubAgentId);
       } catch (error) {
         return {
           content: [
@@ -10644,9 +10738,9 @@ var validateRequestParameters = (c) => {
 };
 var handleInitializationRequest = async (body, executionContext, validatedContext, req, res, c, credentialStores) => {
   const { tenantId, projectId, graphId } = executionContext;
-  logger24.info({ body }, "Received initialization request");
+  logger23.info({ body }, "Received initialization request");
   const sessionId = getConversationId();
-  const agentGraph = await getAgentGraphWithDefaultAgent(dbClient_default)({
+  const agentGraph = await getAgentGraphWithDefaultSubAgent(dbClient_default)({
     scopes: { tenantId, projectId, graphId }
   });
   if (!agentGraph) {
@@ -10659,7 +10753,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
       { status: 404 }
     );
   }
-  if (!agentGraph.defaultAgentId) {
+  if (!agentGraph.defaultSubAgentId) {
     return c.json(
       {
         jsonrpc: "2.0",
@@ -10673,7 +10767,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
     id: sessionId,
     tenantId,
     projectId,
-    activeAgentId: agentGraph.defaultAgentId,
+    activeSubAgentId: agentGraph.defaultSubAgentId,
     metadata: {
       sessionData: {
         graphId,
@@ -10684,7 +10778,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
       }
     }
   });
-  logger24.info(
+  logger23.info(
     { sessionId, conversationId: conversation.id },
     "Created MCP session as conversation"
   );
@@ -10693,9 +10787,9 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
   });
   const server = await getServer(validatedContext, executionContext, sessionId, credentialStores);
   await server.connect(transport);
-  logger24.info({ sessionId }, "Server connected for initialization");
+  logger23.info({ sessionId }, "Server connected for initialization");
   res.setHeader("Mcp-Session-Id", sessionId);
-  logger24.info(
+  logger23.info(
     {
       sessionId,
       bodyMethod: body?.method,
@@ -10704,7 +10798,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
     "About to handle initialization request"
   );
   await transport.handleRequest(req, res, body);
-  logger24.info({ sessionId }, "Successfully handled initialization request");
+  logger23.info({ sessionId }, "Successfully handled initialization request");
   return toFetchResponse(res);
 };
 var handleExistingSessionRequest = async (body, executionContext, validatedContext, req, res, credentialStores) => {
@@ -10732,8 +10826,8 @@ var handleExistingSessionRequest = async (body, executionContext, validatedConte
     sessionId,
     conversation.metadata?.session_data?.mcpProtocolVersion
   );
-  logger24.info({ sessionId }, "Server connected and transport initialized");
-  logger24.info(
+  logger23.info({ sessionId }, "Server connected and transport initialized");
+  logger23.info(
     {
       sessionId,
       bodyKeys: Object.keys(body || {}),
@@ -10747,9 +10841,9 @@ var handleExistingSessionRequest = async (body, executionContext, validatedConte
   );
   try {
     await transport.handleRequest(req, res, body);
-    logger24.info({ sessionId }, "Successfully handled MCP request");
+    logger23.info({ sessionId }, "Successfully handled MCP request");
   } catch (transportError) {
-    logger24.error(
+    logger23.error(
       {
         sessionId,
         error: transportError,
@@ -10800,13 +10894,13 @@ app4.openapi(
       }
       const { executionContext } = paramValidation;
       const body = c.get("requestBody") || {};
-      logger24.info({ body, bodyKeys: Object.keys(body || {}) }, "Parsed request body");
+      logger23.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");
-      logger24.info({ validatedContext }, "Validated context");
-      logger24.info({ req }, "request");
+      logger23.info({ validatedContext }, "Validated context");
+      logger23.info({ req }, "request");
       if (isInitRequest) {
         return await handleInitializationRequest(
           body,
@@ -10828,7 +10922,7 @@ app4.openapi(
         );
       }
     } catch (e) {
-      logger24.error(
+      logger23.error(
         {
           error: e instanceof Error ? e.message : e,
           stack: e instanceof Error ? e.stack : void 0
@@ -10840,7 +10934,7 @@ app4.openapi(
   }
 );
 app4.get("/", async (c) => {
-  logger24.info({}, "Received GET MCP request");
+  logger23.info({}, "Received GET MCP request");
   return c.json(
     {
       jsonrpc: "2.0",
@@ -10854,7 +10948,7 @@ app4.get("/", async (c) => {
   );
 });
 app4.delete("/", async (c) => {
-  logger24.info({}, "Received DELETE MCP request");
+  logger23.info({}, "Received DELETE MCP request");
   return c.json(
     {
       jsonrpc: "2.0",
@@ -10867,7 +10961,7 @@ app4.delete("/", async (c) => {
 var mcp_default = app4;
 
 // src/app.ts
-var logger25 = getLogger("agents-run-api");
+var logger24 = getLogger("agents-run-api");
 function createExecutionHono(serverConfig, credentialStores) {
   const app6 = new OpenAPIHono();
   app6.use("*", otel());
@@ -10883,7 +10977,7 @@ function createExecutionHono(serverConfig, credentialStores) {
         const body = await c.req.json();
         c.set("requestBody", body);
       } catch (error) {
-        logger25.debug({ error }, "Failed to parse JSON body, continuing without parsed body");
+        logger24.debug({ error }, "Failed to parse JSON body, continuing without parsed body");
       }
     }
     return next();
@@ -10934,8 +11028,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 (logger25) {
-          logger25.error(
+        if (logger24) {
+          logger24.error(
             {
               error: err,
               message: errorMessage,
@@ -10947,8 +11041,8 @@ function createExecutionHono(serverConfig, credentialStores) {
           );
         }
       } else {
-        if (logger25) {
-          logger25.error(
+        if (logger24) {
+          logger24.error(
             {
               error: err,
               path: c.req.path,
@@ -10965,8 +11059,8 @@ function createExecutionHono(serverConfig, credentialStores) {
         const response = err.getResponse();
         return response;
       } catch (responseError) {
-        if (logger25) {
-          logger25.error({ error: responseError }, "Error while handling HTTPException response");
+        if (logger24) {
+          logger24.error({ error: responseError }, "Error while handling HTTPException response");
         }
       }
     }
@@ -11000,7 +11094,7 @@ function createExecutionHono(serverConfig, credentialStores) {
   app6.use("*", async (c, next) => {
     const executionContext = c.get("executionContext");
     if (!executionContext) {
-      logger25.debug({}, "Empty execution context");
+      logger24.debug({}, "Empty execution context");
       return next();
     }
     const { tenantId, projectId, graphId } = executionContext;
@@ -11009,7 +11103,7 @@ function createExecutionHono(serverConfig, credentialStores) {
     if (requestBody) {
       conversationId = requestBody.conversationId;
       if (!conversationId) {
-        logger25.debug({ requestBody }, "No conversation ID found in request body");
+        logger24.debug({ requestBody }, "No conversation ID found in request body");
       }
     }
     const entries = Object.fromEntries(
@@ -11024,7 +11118,7 @@ function createExecutionHono(serverConfig, credentialStores) {
       })
     );
     if (!Object.keys(entries).length) {
-      logger25.debug({}, "Empty entries for baggage");
+      logger24.debug({}, "Empty entries for baggage");
       return next();
     }
     const bag = Object.entries(entries).reduce(