@inkeep/agents-run-api 0.18.0 → 0.19.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-DQQRVSJS.js';
+import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-QRT6EIUX.js';
 import { dbClient_default } from './chunk-7IMXW4RD.js';
 import { env } from './chunk-NZHNG4A3.js';
 import { __publicField } from './chunk-PKBMQBKP.js';
-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 { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullAgent, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, commonGetErrorResponses, loggerFactory, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, upsertLedgerArtifact, createTask, updateTask, setSpanWithError, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getAgentById, getRelatedAgentsForAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, validateAndGetApiKey, getProject, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, getContextConfigById, getFullAgentDefinition, TemplateEngine, agentHasArtifactComponents, MCPTransportType, SPAN_KEYS, getExternalAgent } from '@inkeep/agents-core';
 import { otel } from '@hono/otel';
 import { OpenAPIHono, createRoute, z as z$1 } from '@hono/zod-openapi';
 import { trace, propagation, context, SpanStatusCode } from '@opentelemetry/api';
@@ -38,7 +38,7 @@ function createExecutionContext(params) {
     apiKey: params.apiKey,
     tenantId: params.tenantId,
     projectId: params.projectId,
-    graphId: params.graphId,
+    agentId: params.agentId,
     baseUrl: params.baseUrl || process.env.API_URL || "http://localhost:3003",
     apiKeyId: params.apiKeyId,
     subAgentId: params.subAgentId
@@ -55,8 +55,8 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
   const authHeader = c.req.header("Authorization");
   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 subAgentId = c.req.header("x-inkeep-agent-id");
+  const agentId = c.req.header("x-inkeep-agent-id");
+  const subAgentId = c.req.header("x-inkeep-sub-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");
@@ -74,7 +74,7 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
           apiKey: "development",
           tenantId: tenantId || "test-tenant",
           projectId: projectId || "test-project",
-          graphId: graphId || "test-graph",
+          agentId: agentId || "test-agent",
           apiKeyId: "test-key",
           baseUrl,
           subAgentId
@@ -89,7 +89,7 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
         apiKey: "development",
         tenantId: tenantId || "test-tenant",
         projectId: projectId || "test-project",
-        graphId: graphId || "test-graph",
+        agentId: agentId || "test-agent",
         apiKeyId: "test-key",
         baseUrl,
         subAgentId
@@ -111,16 +111,16 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
   const apiKey = authHeader.substring(7);
   if (env.INKEEP_AGENTS_RUN_API_BYPASS_SECRET) {
     if (apiKey === env.INKEEP_AGENTS_RUN_API_BYPASS_SECRET) {
-      if (!tenantId || !projectId || !graphId) {
+      if (!tenantId || !projectId || !agentId) {
         throw new HTTPException(401, {
-          message: "Missing or invalid tenant, project, or graph ID"
+          message: "Missing or invalid tenant, project, or agent ID"
         });
       }
       const executionContext = createExecutionContext({
         apiKey,
         tenantId,
         projectId,
-        graphId,
+        agentId,
         apiKeyId: "bypass",
         baseUrl,
         subAgentId
@@ -155,7 +155,7 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
       {
         tenantId: executionContext.tenantId,
         projectId: executionContext.projectId,
-        graphId: executionContext.graphId,
+        agentId: executionContext.agentId,
         subAgentId: executionContext.subAgentId
       },
       "API key authenticated successfully"
@@ -182,7 +182,7 @@ var extractContextFromApiKey = async (apiKey, baseUrl) => {
     apiKey,
     tenantId: apiKeyRecord.tenantId,
     projectId: apiKeyRecord.projectId,
-    graphId: apiKeyRecord.graphId,
+    agentId: apiKeyRecord.agentId,
     apiKeyId: apiKeyRecord.id,
     baseUrl
   });
@@ -278,7 +278,7 @@ async function handleMessageSend(c, agent, request) {
   try {
     const params = request.params;
     const executionContext = getRequestExecutionContext(c);
-    const { graphId } = executionContext;
+    const { agentId } = executionContext;
     const task = {
       id: nanoid(),
       input: {
@@ -292,7 +292,7 @@ async function handleMessageSend(c, agent, request) {
         conversationId: params.message.contextId,
         metadata: {
           blocking: params.configuration?.blocking ?? false,
-          custom: { graph_id: graphId || "" },
+          custom: { agent_id: agentId || "" },
           // Pass through streaming metadata from the original message
           ...params.message.metadata
         }
@@ -353,7 +353,7 @@ async function handleMessageSend(c, agent, request) {
       id: task.id,
       tenantId: agent.tenantId,
       projectId: agent.projectId,
-      graphId: graphId || "",
+      agentId: agentId || "",
       contextId: effectiveContextId,
       status: "working",
       metadata: {
@@ -361,8 +361,8 @@ 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.subAgentId,
-        graph_id: graphId || "",
+        sub_agent_id: agent.subAgentId,
+        agent_id: agentId || "",
         stream_request_id: params.message.metadata?.stream_request_id
       },
       subAgentId: agent.subAgentId,
@@ -370,7 +370,7 @@ async function handleMessageSend(c, agent, request) {
       updatedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
     logger2.info({ metadata: params.message.metadata }, "message metadata");
-    if (params.message.metadata?.fromAgentId || params.message.metadata?.fromExternalAgentId) {
+    if (params.message.metadata?.fromSubAgentId || params.message.metadata?.fromExternalAgentId) {
       const messageText = params.message.parts.filter((part) => part.kind === "text" && "text" in part && part.text).map((part) => part.text).join(" ");
       try {
         const messageData = {
@@ -386,19 +386,19 @@ async function handleMessageSend(c, agent, request) {
           messageType: "a2a-request",
           taskId: task.id
         };
-        if (params.message.metadata?.fromAgentId) {
-          messageData.fromAgentId = params.message.metadata.fromAgentId;
-          messageData.toAgentId = agent.subAgentId;
+        if (params.message.metadata?.fromSubAgentId) {
+          messageData.fromSubAgentId = params.message.metadata.fromSubAgentId;
+          messageData.toSubAgentId = agent.subAgentId;
         } else if (params.message.metadata?.fromExternalAgentId) {
           messageData.fromExternalAgentId = params.message.metadata.fromExternalAgentId;
-          messageData.toAgentId = agent.subAgentId;
+          messageData.toSubAgentId = agent.subAgentId;
         }
         await createMessage(dbClient_default)(messageData);
         logger2.info(
           {
-            fromAgentId: params.message.metadata.fromAgentId,
+            fromSubAgentId: params.message.metadata.fromSubAgentId,
             fromExternalAgentId: params.message.metadata.fromExternalAgentId,
-            toAgentId: agent.subAgentId,
+            toSubAgentId: agent.subAgentId,
             conversationId: effectiveContextId,
             messageType: "a2a-request",
             taskId: task.id
@@ -409,9 +409,9 @@ async function handleMessageSend(c, agent, request) {
         logger2.error(
           {
             error,
-            fromAgentId: params.message.metadata.fromAgentId,
+            fromSubAgentId: params.message.metadata.fromSubAgentId,
             fromExternalAgentId: params.message.metadata.fromExternalAgentId,
-            toAgentId: agent.subAgentId,
+            toSubAgentId: agent.subAgentId,
             conversationId: effectiveContextId
           },
           "Failed to store A2A message in database"
@@ -428,8 +428,8 @@ 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.subAgentId,
-          graph_id: graphId || ""
+          sub_agent_id: agent.subAgentId,
+          agent_id: agentId || ""
         }
       }
     });
@@ -462,7 +462,8 @@ async function handleMessageSend(c, agent, request) {
                     kind: "data",
                     data: {
                       type: "transfer",
-                      targetSubAgentId: transferPart.data.target
+                      targetSubAgentId: transferPart.data.targetSubAgentId,
+                      fromSubAgentId: transferPart.data.fromSubAgentId
                     }
                   },
                   {
@@ -530,7 +531,7 @@ async function handleMessageStream(c, agent, request) {
   try {
     const params = request.params;
     const executionContext = getRequestExecutionContext(c);
-    const { graphId } = executionContext;
+    const { agentId } = executionContext;
     if (!agent.agentCard.capabilities.streaming) {
       return c.json({
         jsonrpc: "2.0",
@@ -555,7 +556,7 @@ async function handleMessageStream(c, agent, request) {
         metadata: {
           blocking: false,
           // Streaming is always non-blocking
-          custom: { graph_id: graphId || "" }
+          custom: { agent_id: agentId || "" }
         }
       }
     };
@@ -594,7 +595,7 @@ async function handleMessageStream(c, agent, request) {
                 jsonrpc: "2.0",
                 result: {
                   type: "transfer",
-                  target: transferPart.data.target,
+                  target: transferPart.data.targetSubAgentId,
                   task_id: task.id,
                   reason: transferPart.data.reason || "Agent requested transfer",
                   original_message: transferPart.data.original_message,
@@ -825,126 +826,6 @@ async function handleTasksResubscribe(c, agent, request) {
     });
   }
 }
-function createAgentCard({
-  dbAgent,
-  baseUrl
-}) {
-  const description = dbAgent.description || "AI Agent";
-  return {
-    name: dbAgent.name,
-    description,
-    url: baseUrl ? `${baseUrl}/a2a` : "",
-    version: "1.0.0",
-    capabilities: {
-      streaming: true,
-      // Enable streaming for A2A compliance
-      pushNotifications: false,
-      stateTransitionHistory: false
-    },
-    defaultInputModes: ["text", "text/plain"],
-    defaultOutputModes: ["text", "text/plain"],
-    skills: [],
-    // Add provider info if available
-    ...baseUrl && {
-      provider: {
-        organization: "Inkeep",
-        url: baseUrl
-      }
-    }
-  };
-}
-function generateDescriptionWithTransfers(baseDescription, internalRelations, externalRelations) {
-  const transfers = [
-    ...internalRelations.filter((rel) => rel.relationType === "transfer"),
-    ...externalRelations.filter((rel) => rel.relationType === "transfer")
-  ];
-  const delegates = [
-    ...internalRelations.filter((rel) => rel.relationType === "delegate"),
-    ...externalRelations.filter((rel) => rel.relationType === "delegate")
-  ];
-  if (transfers.length === 0 && delegates.length === 0) {
-    return baseDescription;
-  }
-  let enhancedDescription = baseDescription;
-  if (transfers.length > 0) {
-    const transferList = transfers.map((rel) => {
-      const name = rel.externalAgent?.name || rel.name;
-      const desc = rel.externalAgent?.description || rel.description || "";
-      return `- ${name}: ${desc}`;
-    }).join("\n");
-    enhancedDescription += `
-
-Can transfer to:
-${transferList}`;
-  }
-  if (delegates.length > 0) {
-    const delegateList = delegates.map((rel) => {
-      const name = rel.externalAgent?.name || rel.name;
-      const desc = rel.externalAgent?.description || rel.description || "";
-      return `- ${name}: ${desc}`;
-    }).join("\n");
-    enhancedDescription += `
-
-Can delegate to:
-${delegateList}`;
-  }
-  return enhancedDescription;
-}
-async function hydrateAgent({
-  dbAgent,
-  graphId,
-  baseUrl,
-  apiKey,
-  credentialStoreRegistry
-}) {
-  try {
-    const taskHandlerConfig = await createTaskHandlerConfig({
-      tenantId: dbAgent.tenantId,
-      projectId: dbAgent.projectId,
-      graphId,
-      subAgentId: dbAgent.id,
-      baseUrl,
-      apiKey
-    });
-    const taskHandler = createTaskHandler(taskHandlerConfig, credentialStoreRegistry);
-    const agentCard = createAgentCard({
-      dbAgent,
-      baseUrl
-    });
-    return {
-      subAgentId: dbAgent.id,
-      tenantId: dbAgent.tenantId,
-      projectId: dbAgent.projectId,
-      graphId,
-      agentCard,
-      taskHandler
-    };
-  } catch (error) {
-    console.error(`\u274C Failed to hydrate agent ${dbAgent.id}:`, error);
-    throw error;
-  }
-}
-async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
-  const { tenantId, projectId, graphId, subAgentId, baseUrl, apiKey } = executionContext;
-  if (!subAgentId) {
-    throw new Error("Agent ID is required");
-  }
-  const dbAgent = await getSubAgentById(dbClient_default)({
-    scopes: { tenantId, projectId, graphId },
-    subAgentId
-  });
-  if (!dbAgent) {
-    return null;
-  }
-  const agentFrameworkBaseUrl = `${baseUrl}/agents`;
-  return hydrateAgent({
-    dbAgent,
-    graphId,
-    baseUrl: agentFrameworkBaseUrl,
-    credentialStoreRegistry,
-    apiKey
-  });
-}
 var logger3 = getLogger("ModelFactory");
 var _ModelFactory = class _ModelFactory {
   /**
@@ -1156,7 +1037,7 @@ var _ToolSessionManager = class _ToolSessionManager {
     return this.createSessionWithId(sessionId, tenantId, projectId, contextId, taskId);
   }
   /**
-   * Create a new tool session with a specific ID (for coordination with GraphSession)
+   * Create a new tool session with a specific ID (for coordination with AgentSession)
    */
   createSessionWithId(sessionId, tenantId, projectId, contextId, taskId) {
     const session = {
@@ -1182,17 +1063,17 @@ var _ToolSessionManager = class _ToolSessionManager {
     return sessionId;
   }
   /**
-   * Ensure a graph-scoped session exists (idempotent)
-   * All agents in the same graph execution share this session
+   * Ensure an agent-scoped session exists (idempotent)
+   * All agents in the same agent execution share this session
    */
-  ensureGraphSession(sessionId, tenantId, projectId, contextId, taskId) {
+  ensureAgentSession(sessionId, tenantId, projectId, contextId, taskId) {
     if (this.sessions.has(sessionId)) {
-      logger4.debug({ sessionId }, "Graph session already exists, reusing");
+      logger4.debug({ sessionId }, "Agent session already exists, reusing");
       return sessionId;
     }
     logger4.debug(
       { sessionId, tenantId, contextId, taskId },
-      "Creating new graph-scoped tool session"
+      "Creating new agent-scoped tool session"
     );
     return this.createSessionWithId(sessionId, tenantId, projectId, contextId, taskId);
   }
@@ -1509,7 +1390,7 @@ var _ArtifactService = class _ArtifactService {
   async getArtifactSummary(artifactId, toolCallId, artifactMap) {
     const key = `${artifactId}:${toolCallId}`;
     if (this.context.streamRequestId) {
-      const cachedArtifact = await graphSessionManager.getArtifactCache(
+      const cachedArtifact = await agentSessionManager.getArtifactCache(
         this.context.streamRequestId,
         key
       );
@@ -1555,7 +1436,7 @@ var _ArtifactService = class _ArtifactService {
   async getArtifactFull(artifactId, toolCallId, artifactMap) {
     const key = `${artifactId}:${toolCallId}`;
     if (this.context.streamRequestId) {
-      const cachedArtifact = await graphSessionManager.getArtifactCache(
+      const cachedArtifact = await agentSessionManager.getArtifactCache(
         this.context.streamRequestId,
         key
       );
@@ -1622,12 +1503,12 @@ var _ArtifactService = class _ArtifactService {
     };
   }
   /**
-   * Persist artifact to database via graph session
+   * Persist artifact to database vian agent session
    */
   async persistArtifact(request, summaryData, fullData, subAgentId) {
     const effectiveAgentId = subAgentId || this.context.subAgentId;
     if (this.context.streamRequestId && effectiveAgentId && this.context.taskId) {
-      await graphSessionManager.recordEvent(
+      await agentSessionManager.recordEvent(
         this.context.streamRequestId,
         "artifact_saved",
         effectiveAgentId,
@@ -1679,7 +1560,7 @@ var _ArtifactService = class _ArtifactService {
     };
     this.createdArtifacts.set(cacheKey, artifactForCache);
     if (this.context.streamRequestId) {
-      await graphSessionManager.setArtifactCache(
+      await agentSessionManager.setArtifactCache(
         this.context.streamRequestId,
         cacheKey,
         artifactForCache
@@ -1711,7 +1592,7 @@ var _ArtifactService = class _ArtifactService {
   }
   /**
    * Save an already-created artifact directly to the database
-   * Used by GraphSession to save artifacts after name/description generation
+   * Used by AgentSession to save artifacts after name/description generation
    */
   async saveArtifact(artifact) {
     let summaryData = artifact.data;
@@ -2258,14 +2139,14 @@ __publicField(_ArtifactParser, "ARTIFACT_PATTERNS", [
 __publicField(_ArtifactParser, "INCOMPLETE_CREATE_REGEX", /<artifact:create(?![^>]*(?:\/>|<\/artifact:create>))/);
 var ArtifactParser = _ArtifactParser;
 
-// src/services/GraphSession.ts
-var logger8 = getLogger("GraphSession");
-var GraphSession = class {
+// src/services/AgentSession.ts
+var logger8 = getLogger("AgentSession");
+var AgentSession = class {
   // Whether to send data operations
-  constructor(sessionId, messageId, graphId, tenantId, projectId, contextId) {
+  constructor(sessionId, messageId, agentId, tenantId, projectId, contextId) {
     this.sessionId = sessionId;
     this.messageId = messageId;
-    this.graphId = graphId;
+    this.agentId = agentId;
     this.tenantId = tenantId;
     this.projectId = projectId;
     this.contextId = contextId;
@@ -2292,7 +2173,7 @@ var GraphSession = class {
     __publicField(this, "artifactParser");
     // Session-scoped ArtifactParser instance
     __publicField(this, "isEmitOperations", false);
-    logger8.debug({ sessionId, messageId, graphId }, "GraphSession created");
+    logger8.debug({ sessionId, messageId, agentId }, "AgentSession created");
     if (tenantId && projectId) {
       toolSessionManager.createSessionWithId(
         sessionId,
@@ -2328,7 +2209,7 @@ var GraphSession = class {
     this.isEmitOperations = true;
     logger8.info(
       { sessionId: this.sessionId },
-      "\u{1F50D} DEBUG: Emit operations enabled for GraphSession"
+      "\u{1F50D} DEBUG: Emit operations enabled for AgentSession"
     );
   }
   /**
@@ -2601,7 +2482,7 @@ var GraphSession = class {
     return {
       sessionId: this.sessionId,
       messageId: this.messageId,
-      graphId: this.graphId,
+      agentId: this.agentId,
       totalEvents: this.events.length,
       eventCounts,
       agentCounts,
@@ -2652,7 +2533,7 @@ var GraphSession = class {
     }
   }
   /**
-   * Generate and send a status update using graph-level summarizer
+   * Generate and send a status update using agent-level summarizer
    */
   async generateAndSendUpdate() {
     if (this.isEnded) {
@@ -2677,8 +2558,8 @@ var GraphSession = class {
       logger8.warn({ sessionId: this.sessionId }, "No status update state - cannot generate update");
       return;
     }
-    if (!this.graphId) {
-      logger8.warn({ sessionId: this.sessionId }, "No graph ID - cannot generate update");
+    if (!this.agentId) {
+      logger8.warn({ sessionId: this.sessionId }, "No agent ID - cannot generate update");
       return;
     }
     const newEventCount = this.events.length - this.statusUpdateState.lastEventCount;
@@ -2830,10 +2711,10 @@ var GraphSession = class {
    */
   async generateStructuredStatusUpdate(newEvents, elapsedTime, statusComponents, summarizerModel, previousSummaries = []) {
     return tracer.startActiveSpan(
-      "graph_session.generate_structured_update",
+      "agent_session.generate_structured_update",
       {
         attributes: {
-          "graph_session.id": this.sessionId,
+          "agent_session.id": this.sessionId,
           "events.count": newEvents.length,
           "elapsed_time.seconds": Math.round(elapsedTime / 1e3),
           "llm.model": summarizerModel?.model,
@@ -2914,7 +2795,7 @@ CRITICAL - HIDE ALL INTERNAL SYSTEM OPERATIONS:
 - ABSOLUTELY FORBIDDEN WORDS/PHRASES: "transfer", "transferring", "delegation", "delegating", "delegate", "agent", "routing", "route", "artifact", "saving artifact", "stored artifact", "artifact saved", "continuing", "passing to", "handing off", "switching to"
 - NEVER reveal internal architecture: No mentions of different agents, components, systems, or modules working together
 - NEVER mention artifact operations: Users don't need to know about data being saved, stored, or organized internally
-- NEVER describe handoffs or transitions: Present everything as one seamless operation
+- NEVER describe transfers or transitions: Present everything as one seamless operation
 - If you see "transfer", "delegation_sent", "delegation_returned", or "artifact_saved" events - IGNORE THEM or translate to user-facing information only
 - Focus ONLY on actual discoveries, findings, and results that matter to the user
 
@@ -3136,10 +3017,10 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
    */
   async processArtifact(artifactData) {
     return tracer.startActiveSpan(
-      "graph_session.process_artifact",
+      "agent_session.process_artifact",
       {
         attributes: {
-          "graph_session.id": this.sessionId,
+          "agent_session.id": this.sessionId,
           "artifact.id": artifactData.artifactId,
           "artifact.type": artifactData.artifactType || "unknown",
           "artifact.agent_id": artifactData.subAgentId || "unknown",
@@ -3207,7 +3088,7 @@ Make it specific and relevant.`;
                     scopes: {
                       tenantId: artifactData.tenantId,
                       projectId: artifactData.projectId,
-                      graphId: this.graphId || ""
+                      agentId: this.agentId || ""
                     },
                     subAgentId: artifactData.subAgentId
                   });
@@ -3262,7 +3143,7 @@ Make it specific and relevant.`;
               description: z.string().describe("Brief description of the artifact's relevance to the user's question")
             });
             const { object } = await tracer.startActiveSpan(
-              "graph_session.generate_artifact_metadata",
+              "agent_session.generate_artifact_metadata",
               {
                 attributes: {
                   "llm.model": this.statusUpdateState?.summarizerModel?.model,
@@ -3472,20 +3353,20 @@ Make it specific and relevant.`;
     }
   }
 };
-var GraphSessionManager = class {
+var AgentSessionManager = class {
   constructor() {
     __publicField(this, "sessions", /* @__PURE__ */ new Map());
   }
   /**
    * Create a new session for a message
    */
-  createSession(messageId, graphId, tenantId, projectId, contextId) {
+  createSession(messageId, agentId, tenantId, projectId, contextId) {
     const sessionId = messageId;
-    const session = new GraphSession(sessionId, messageId, graphId, tenantId, projectId, contextId);
+    const session = new AgentSession(sessionId, messageId, agentId, tenantId, projectId, contextId);
     this.sessions.set(sessionId, session);
     logger8.info(
-      { sessionId, messageId, graphId, tenantId, projectId, contextId },
-      "GraphSession created"
+      { sessionId, messageId, agentId, tenantId, projectId, contextId },
+      "AgentSession created"
     );
     return sessionId;
   }
@@ -3552,7 +3433,7 @@ var GraphSessionManager = class {
     }
     const events = session.getEvents();
     const summary = session.getSummary();
-    logger8.info({ sessionId, summary }, "GraphSession ended");
+    logger8.info({ sessionId, summary }, "AgentSession ended");
     session.cleanup();
     this.sessions.delete(sessionId);
     return events;
@@ -3616,33 +3497,33 @@ var GraphSessionManager = class {
     }
   }
 };
-var graphSessionManager = new GraphSessionManager();
-async function resolveModelConfig(graphId, agent) {
-  if (agent.models?.base?.model) {
+var agentSessionManager = new AgentSessionManager();
+async function resolveModelConfig(agentId, subAgent) {
+  if (subAgent.models?.base?.model) {
     return {
-      base: agent.models.base,
-      structuredOutput: agent.models.structuredOutput || agent.models.base,
-      summarizer: agent.models.summarizer || agent.models.base
+      base: subAgent.models.base,
+      structuredOutput: subAgent.models.structuredOutput || subAgent.models.base,
+      summarizer: subAgent.models.summarizer || subAgent.models.base
     };
   }
-  const graph = await getAgentGraphById(dbClient_default)({
-    scopes: { tenantId: agent.tenantId, projectId: agent.projectId, graphId }
+  const agent = await getAgentById(dbClient_default)({
+    scopes: { tenantId: subAgent.tenantId, projectId: subAgent.projectId, agentId }
   });
-  if (graph?.models?.base?.model) {
+  if (agent?.models?.base?.model) {
     return {
-      base: graph.models.base,
-      structuredOutput: agent.models?.structuredOutput || graph.models.structuredOutput || graph.models.base,
-      summarizer: agent.models?.summarizer || graph.models.summarizer || graph.models.base
+      base: agent.models.base,
+      structuredOutput: subAgent.models?.structuredOutput || agent.models.structuredOutput || agent.models.base,
+      summarizer: subAgent.models?.summarizer || agent.models.summarizer || agent.models.base
     };
   }
   const project = await getProject(dbClient_default)({
-    scopes: { tenantId: agent.tenantId, projectId: agent.projectId }
+    scopes: { tenantId: subAgent.tenantId, projectId: subAgent.projectId }
   });
   if (project?.models?.base?.model) {
     return {
       base: project.models.base,
-      structuredOutput: agent.models?.structuredOutput || project.models.structuredOutput || project.models.base,
-      summarizer: agent.models?.summarizer || project.models.summarizer || project.models.base
+      structuredOutput: subAgent.models?.structuredOutput || project.models.structuredOutput || project.models.base,
+      summarizer: subAgent.models?.summarizer || project.models.summarizer || project.models.base
     };
   }
   throw new Error(
@@ -3673,7 +3554,7 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
     this.contextId = contextId;
     this.subAgentId = artifactParserOptions?.subAgentId;
     if (artifactParserOptions?.streamRequestId) {
-      const sessionParser = graphSessionManager.getArtifactParser(
+      const sessionParser = agentSessionManager.getArtifactParser(
         artifactParserOptions.streamRequestId
       );
       if (sessionParser) {
@@ -3682,9 +3563,9 @@ var _IncrementalStreamParser = class _IncrementalStreamParser {
       }
     }
     let sharedArtifactService = null;
-    if (artifactParserOptions?.streamRequestId && typeof graphSessionManager.getArtifactService === "function") {
+    if (artifactParserOptions?.streamRequestId && typeof agentSessionManager.getArtifactService === "function") {
       try {
-        sharedArtifactService = graphSessionManager.getArtifactService(
+        sharedArtifactService = agentSessionManager.getArtifactService(
           artifactParserOptions.streamRequestId
         );
       } catch (error) {
@@ -4058,7 +3939,7 @@ var ResponseFormatter = class {
     __publicField(this, "subAgentId");
     this.subAgentId = artifactParserOptions?.subAgentId;
     if (artifactParserOptions?.streamRequestId) {
-      const sessionParser = graphSessionManager.getArtifactParser(
+      const sessionParser = agentSessionManager.getArtifactParser(
         artifactParserOptions.streamRequestId
       );
       if (sessionParser) {
@@ -4067,9 +3948,9 @@ var ResponseFormatter = class {
       }
     }
     let sharedArtifactService = null;
-    if (artifactParserOptions?.streamRequestId && typeof graphSessionManager.getArtifactService === "function") {
+    if (artifactParserOptions?.streamRequestId && typeof agentSessionManager.getArtifactService === "function") {
       try {
-        sharedArtifactService = graphSessionManager.getArtifactService(
+        sharedArtifactService = agentSessionManager.getArtifactService(
           artifactParserOptions.streamRequestId
         );
       } catch (error) {
@@ -4211,12 +4092,12 @@ var ResponseFormatter = class {
     }
   }
 };
-function agentInitializingOp(sessionId, graphId) {
+function agentInitializingOp(sessionId, agentId) {
   return {
     type: "agent_initializing",
     details: {
       sessionId,
-      graphId
+      agentId
     }
   };
 }
@@ -5289,23 +5170,29 @@ var createTransferToAgentTool = ({
       logger13.info(
         {
           transferTo: transferConfig.id ?? "unknown",
-          fromAgent: callingAgentId
+          fromSubAgent: callingAgentId
         },
         "invoked transferToAgentTool"
       );
       if (streamRequestId) {
-        graphSessionManager.recordEvent(streamRequestId, "transfer", callingAgentId, {
+        agentSessionManager.recordEvent(streamRequestId, "transfer", callingAgentId, {
           fromSubAgent: callingAgentId,
           targetSubAgent: transferConfig.id ?? "unknown",
           reason: `Transfer to ${transferConfig.name || transferConfig.id}`
         });
       }
-      return {
+      const transferResult = {
         type: "transfer",
-        target: transferConfig.id ?? "unknown",
-        fromAgentId: callingAgentId
+        targetSubAgentId: transferConfig.id ?? "unknown",
+        // Changed from "target" for type safety
+        fromSubAgentId: callingAgentId
         // Include the calling agent ID for tracking
       };
+      logger13.info({
+        transferResult,
+        transferResultKeys: Object.keys(transferResult)
+      }, "[DEBUG] Transfer tool returning");
+      return transferResult;
     }
   });
 };
@@ -5314,7 +5201,7 @@ function createDelegateToAgentTool({
   callingAgentId,
   tenantId,
   projectId,
-  graphId,
+  agentId,
   contextId,
   metadata,
   sessionId,
@@ -5335,7 +5222,7 @@ function createDelegateToAgentTool({
         });
       }
       if (metadata.streamRequestId) {
-        graphSessionManager.recordEvent(
+        agentSessionManager.recordEvent(
           metadata.streamRequestId,
           "delegation_sent",
           callingAgentId,
@@ -5354,7 +5241,7 @@ function createDelegateToAgentTool({
           scopes: {
             tenantId,
             projectId,
-            graphId
+            agentId
           },
           subAgentId: delegateConfig.config.id
         });
@@ -5400,8 +5287,8 @@ function createDelegateToAgentTool({
           Authorization: `Bearer ${metadata.apiKey}`,
           "x-inkeep-tenant-id": tenantId,
           "x-inkeep-project-id": projectId,
-          "x-inkeep-graph-id": graphId,
-          "x-inkeep-agent-id": delegateConfig.config.id
+          "x-inkeep-agent-id": agentId,
+          "x-inkeep-sub-agent-id": delegateConfig.config.id
         };
       }
       const a2aClient = new A2AClient(delegateConfig.config.baseUrl, {
@@ -5432,7 +5319,7 @@ function createDelegateToAgentTool({
           // Flag to prevent streaming in delegated agents
           delegationId,
           // Include delegation ID for tracking
-          ...isInternal ? { fromAgentId: callingAgentId } : { fromExternalAgentId: callingAgentId }
+          ...isInternal ? { fromSubAgentId: callingAgentId } : { fromExternalAgentId: callingAgentId }
         }
       };
       logger13.info({ messageToSend }, "messageToSend");
@@ -5448,7 +5335,7 @@ function createDelegateToAgentTool({
         visibility: isInternal ? "internal" : "external",
         messageType: "a2a-request",
         fromSubAgentId: callingAgentId,
-        ...isInternal ? { toAgentId: delegateConfig.config.id } : { toExternalAgentId: delegateConfig.config.id }
+        ...isInternal ? { toSubAgentId: delegateConfig.config.id } : { toExternalAgentId: delegateConfig.config.id }
       });
       const response = await a2aClient.sendMessage({
         message: messageToSend
@@ -5476,7 +5363,7 @@ function createDelegateToAgentTool({
         toolSessionManager.recordToolResult(sessionId, toolResult);
       }
       if (metadata.streamRequestId) {
-        graphSessionManager.recordEvent(
+        agentSessionManager.recordEvent(
           metadata.streamRequestId,
           "delegation_returned",
           callingAgentId,
@@ -5554,7 +5441,7 @@ var system_prompt_default = `<system_message>
     {{CORE_INSTRUCTIONS}}
   </core_instructions>
 
-  {{GRAPH_CONTEXT_SECTION}}
+  {{AGENT_CONTEXT_SECTION}}
 
   {{ARTIFACTS_SECTION}}
   {{TOOLS_SECTION}}
@@ -5719,7 +5606,7 @@ When you use delegation tools, the response may include artifacts in the parts a
 These artifacts become immediately available for you to reference using the artifactId and toolCallId from the response.
 Present delegation results naturally without mentioning the delegation process itself.
 
-IMPORTANT: All agents can retrieve and use information from existing artifacts when the graph has artifact components, regardless of whether the individual agent can create new artifacts.`;
+IMPORTANT: All sub-agents can retrieve and use information from existing artifacts when the agent has artifact components, regardless of whether the individual agent or sub-agents can create new artifacts.`;
 
 // src/agents/versions/v1/Phase1Config.ts
 getLogger("Phase1Config");
@@ -5764,8 +5651,8 @@ var Phase1Config = class _Phase1Config {
     }
     let systemPrompt = systemPromptTemplate;
     systemPrompt = systemPrompt.replace("{{CORE_INSTRUCTIONS}}", config.corePrompt);
-    const graphContextSection = this.generateGraphContextSection(config.graphPrompt);
-    systemPrompt = systemPrompt.replace("{{GRAPH_CONTEXT_SECTION}}", graphContextSection);
+    const agentContextSection = this.generateAgentContextSection(config.agentPrompt);
+    systemPrompt = systemPrompt.replace("{{AGENT_CONTEXT_SECTION}}", agentContextSection);
     const toolData = this.isToolDataArray(config.tools) ? config.tools : _Phase1Config.convertMcpToolsToToolData(config.tools);
     const hasArtifactComponents = config.artifactComponents && config.artifactComponents.length > 0;
     const artifactsSection = this.generateArtifactsSection(
@@ -5773,7 +5660,7 @@ var Phase1Config = class _Phase1Config {
       config.artifacts,
       hasArtifactComponents,
       config.artifactComponents,
-      config.hasGraphArtifactComponents
+      config.hasAgentArtifactComponents
     );
     systemPrompt = systemPrompt.replace("{{ARTIFACTS_SECTION}}", artifactsSection);
     const toolsSection = this.generateToolsSection(templates, toolData);
@@ -5792,14 +5679,14 @@ var Phase1Config = class _Phase1Config {
     systemPrompt = systemPrompt.replace("{{DELEGATION_INSTRUCTIONS}}", delegationSection);
     return systemPrompt;
   }
-  generateGraphContextSection(graphPrompt) {
-    if (!graphPrompt) {
+  generateAgentContextSection(agentPrompt) {
+    if (!agentPrompt) {
       return "";
     }
     return `
-  <graph_context>
-    ${graphPrompt}
-  </graph_context>`;
+  <agent_context>
+    ${agentPrompt}
+  </agent_context>`;
   }
   generateThinkingPreparationSection(templates, isThinkingPreparation) {
     if (!isThinkingPreparation) {
@@ -5817,7 +5704,7 @@ var Phase1Config = class _Phase1Config {
     }
     return `- You have transfer_to_* tools that seamlessly continue the conversation
 - NEVER announce transfers - just call the tool when needed
-- The conversation continues naturally without any handoff language`;
+- The conversation continues naturally without any transfer language`;
   }
   generateDelegationInstructions(hasDelegateRelations) {
     if (!hasDelegateRelations) {
@@ -6051,8 +5938,8 @@ ${typeDescriptions}
 - Do NOT abbreviate, modify, or guess the type name
 - Copy the exact quoted name from the "AVAILABLE ARTIFACT TYPES" list above`;
   }
-  generateArtifactsSection(templates, artifacts, hasArtifactComponents = false, artifactComponents, hasGraphArtifactComponents) {
-    const shouldShowReferencingRules = hasGraphArtifactComponents || artifacts.length > 0;
+  generateArtifactsSection(templates, artifacts, hasArtifactComponents = false, artifactComponents, hasAgentArtifactComponents) {
+    const shouldShowReferencingRules = hasAgentArtifactComponents || artifacts.length > 0;
     const rules = this.getArtifactReferencingRules(
       hasArtifactComponents,
       templates,
@@ -6532,7 +6419,7 @@ ${artifact_retrieval_guidance_default}
       dataComponents,
       artifactComponents,
       hasArtifactComponents,
-      hasGraphArtifactComponents,
+      hasAgentArtifactComponents,
       artifacts = []
     } = config;
     let allDataComponents = [...dataComponents];
@@ -6548,7 +6435,7 @@ ${artifact_retrieval_guidance_default}
     }
     const dataComponentsSection = this.generateDataComponentsSection(allDataComponents);
     const artifactsSection = this.generateArtifactsSection(artifacts);
-    const shouldShowReferencingRules = hasGraphArtifactComponents || artifacts.length > 0;
+    const shouldShowReferencingRules = hasAgentArtifactComponents || artifacts.length > 0;
     const artifactGuidance = this.getStructuredArtifactGuidance(
       hasArtifactComponents,
       artifactComponents,
@@ -6753,7 +6640,7 @@ var Agent = class {
     return this.isDelegatedAgent ? void 0 : this.streamHelper;
   }
   /**
-   * Wraps a tool with streaming lifecycle tracking (start, complete, error) and GraphSession recording
+   * Wraps a tool with streaming lifecycle tracking (start, complete, error) and AgentSession recording
    */
   wrapToolWithStreaming(toolName, toolDefinition, streamRequestId, toolType) {
     if (!toolDefinition || typeof toolDefinition !== "object" || !("execute" in toolDefinition)) {
@@ -6772,7 +6659,7 @@ var Agent = class {
             "tool.purpose": toolDefinition.description || "No description provided",
             "ai.toolType": toolType || "unknown",
             "ai.agentName": this.config.name || "unknown",
-            "graph.id": this.config.graphId || "unknown"
+            "agent.id": this.config.agentId || "unknown"
           });
         }
         const isInternalTool = toolName.includes("save_tool_result") || toolName.includes("thinking_complete") || toolName.startsWith("transfer_to_") || toolName.startsWith("delegate_to_");
@@ -6780,7 +6667,7 @@ var Agent = class {
           const result = await originalExecute(args, context);
           const duration = Date.now() - startTime;
           if (streamRequestId && !isInternalTool) {
-            graphSessionManager.recordEvent(streamRequestId, "tool_execution", this.config.id, {
+            agentSessionManager.recordEvent(streamRequestId, "tool_execution", this.config.id, {
               toolName,
               args,
               result,
@@ -6793,7 +6680,7 @@ var Agent = class {
           const duration = Date.now() - startTime;
           const errorMessage = error instanceof Error ? error.message : "Unknown error";
           if (streamRequestId && !isInternalTool) {
-            graphSessionManager.recordEvent(streamRequestId, "tool_execution", this.config.id, {
+            agentSessionManager.recordEvent(streamRequestId, "tool_execution", this.config.id, {
               toolName,
               args,
               result: { error: errorMessage },
@@ -6838,7 +6725,7 @@ var Agent = class {
               callingAgentId: this.config.id,
               tenantId: this.config.tenantId,
               projectId: this.config.projectId,
-              graphId: this.config.graphId,
+              agentId: this.config.agentId,
               contextId: runtimeContext?.contextId || "default",
               // fallback for compatibility
               metadata: runtimeContext?.metadata || {
@@ -6947,7 +6834,7 @@ var Agent = class {
       scopes: {
         tenantId: this.config.tenantId,
         projectId: this.config.projectId,
-        graphId: this.config.graphId,
+        agentId: this.config.agentId,
         subAgentId: this.config.id
       }
     });
@@ -7053,26 +6940,26 @@ var Agent = class {
               "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.`,
+                message: `MCP server has 0 effective tools. Double check the selected tools in your agent 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",
+              "agent.id": this.config.agentId || "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, {
+            agentSessionManager.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.`,
+                message: `MCP server has 0 effective tools. Double check the selected tools in your agent and the active tools in the MCP server configuration.`,
                 serverUrl: tool3.config.type === "mcp" ? tool3.config.mcp.server.url : "unknown"
               }
             });
@@ -7121,7 +7008,7 @@ var Agent = class {
         scopes: {
           tenantId: this.config.tenantId,
           projectId: this.config.projectId,
-          graphId: this.config.graphId
+          agentId: this.config.agentId
         },
         subAgentId: this.config.id
       });
@@ -7129,7 +7016,7 @@ var Agent = class {
       if (functionToolsData.length === 0) {
         return functionTools;
       }
-      const { LocalSandboxExecutor } = await import('./LocalSandboxExecutor-PQIRECLQ.js');
+      const { LocalSandboxExecutor } = await import('./LocalSandboxExecutor-2UQ32ZZH.js');
       const sandboxExecutor = LocalSandboxExecutor.getInstance();
       for (const functionToolDef of functionToolsData) {
         const functionId = functionToolDef.functionId;
@@ -7164,11 +7051,21 @@ var Agent = class {
               "Function Tool Called"
             );
             try {
+              const project = await getProject(dbClient_default)({
+                scopes: { tenantId: this.config.tenantId, projectId: this.config.projectId }
+              });
+              const defaultSandboxConfig = {
+                provider: "local",
+                runtime: "node22",
+                timeout: 3e4,
+                vcpus: 1
+              };
               const result = await sandboxExecutor.executeFunctionTool(functionToolDef.id, args, {
                 description: functionToolDef.description || functionToolDef.name,
                 inputSchema: functionData.inputSchema || {},
                 executeCode: functionData.executeCode,
-                dependencies: functionData.dependencies || {}
+                dependencies: functionData.dependencies || {},
+                sandboxConfig: project?.sandboxConfig || defaultSandboxConfig
               });
               toolSessionManager.recordToolResult(sessionId || "", {
                 toolCallId,
@@ -7205,14 +7102,14 @@ var Agent = class {
   async getResolvedContext(conversationId, headers) {
     try {
       if (!this.config.contextConfigId) {
-        logger16.debug({ graphId: this.config.graphId }, "No context config found for graph");
+        logger16.debug({ agentId: this.config.agentId }, "No context config found for agent");
         return null;
       }
       const contextConfig = await getContextConfigById(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
           projectId: this.config.projectId,
-          graphId: this.config.graphId
+          agentId: this.config.agentId
         },
         id: this.config.contextConfigId
       });
@@ -7259,67 +7156,67 @@ var Agent = class {
     }
   }
   /**
-   * Get the graph prompt for this agent's graph
+   * Get the agent prompt for this agent's agent
    */
-  async getGraphPrompt() {
+  async getAgentPrompt() {
     try {
-      const graphDefinition = await getFullGraphDefinition(dbClient_default)({
+      const agentDefinition = await getFullAgentDefinition(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
           projectId: this.config.projectId,
-          graphId: this.config.graphId
+          agentId: this.config.agentId
         }
       });
-      return graphDefinition?.graphPrompt || void 0;
+      return agentDefinition?.prompt || void 0;
     } catch (error) {
       logger16.warn(
         {
-          graphId: this.config.graphId,
+          agentId: this.config.agentId,
           error: error instanceof Error ? error.message : "Unknown error"
         },
-        "Failed to get graph prompt"
+        "Failed to get agent prompt"
       );
       return void 0;
     }
   }
   /**
-   * Check if any agent in the graph has artifact components configured
+   * Check if any agent in the agent has artifact components configured
    */
-  async hasGraphArtifactComponents() {
+  async hasAgentArtifactComponents() {
     try {
-      const graphDefinition = await getFullGraphDefinition(dbClient_default)({
+      const agentDefinition = await getFullAgentDefinition(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
           projectId: this.config.projectId,
-          graphId: this.config.graphId
+          agentId: this.config.agentId
         }
       });
-      if (!graphDefinition) {
+      if (!agentDefinition) {
         return false;
       }
-      return Object.values(graphDefinition.subAgents).some(
+      return Object.values(agentDefinition.subAgents).some(
         (subAgent) => "artifactComponents" in subAgent && subAgent.artifactComponents && subAgent.artifactComponents.length > 0
       );
     } catch (error) {
       logger16.warn(
         {
-          graphId: this.config.graphId,
+          agentId: this.config.agentId,
           tenantId: this.config.tenantId,
           projectId: this.config.projectId,
           error: error instanceof Error ? error.message : "Unknown error"
         },
-        "Failed to check graph artifact components, assuming none exist"
+        "Failed to check agent artifact components, assuming none exist"
       );
       return this.artifactComponents.length > 0;
     }
   }
   /**
    * Build adaptive system prompt for Phase 2 structured output generation
-   * based on configured data components and artifact components across the graph
+   * based on configured data components and artifact components across the agent
    */
   async buildPhase2SystemPrompt(runtimeContext) {
     const phase2Config = new Phase2Config();
-    const hasGraphArtifactComponents = await this.hasGraphArtifactComponents();
+    const hasAgentArtifactComponents = await this.hasAgentArtifactComponents();
     const conversationId = runtimeContext?.metadata?.conversationId || runtimeContext?.contextId;
     const resolvedContext = conversationId ? await this.getResolvedContext(conversationId) : null;
     let processedPrompt = this.config.agentPrompt;
@@ -7359,7 +7256,7 @@ var Agent = class {
       dataComponents: this.config.dataComponents || [],
       artifactComponents: this.artifactComponents,
       hasArtifactComponents: this.artifactComponents && this.artifactComponents.length > 0,
-      hasGraphArtifactComponents,
+      hasAgentArtifactComponents,
       artifacts: referenceArtifacts
     });
   }
@@ -7413,7 +7310,7 @@ var Agent = class {
       inputSchema: tool3.inputSchema || tool3.parameters || {},
       usageGuidelines: name.startsWith("transfer_to_") || name.startsWith("delegate_to_") ? `Use this tool to ${name.startsWith("transfer_to_") ? "transfer" : "delegate"} to another agent when appropriate.` : "Use this tool when appropriate for the task at hand."
     }));
-    const { getConversationScopedArtifacts } = await import('./conversations-JSORLLWS.js');
+    const { getConversationScopedArtifacts } = await import('./conversations-OFIM2WLJ.js');
     const historyConfig = this.config.conversationHistoryConfig ?? createDefaultConversationHistoryConfig();
     const referenceArtifacts = await getConversationScopedArtifacts({
       tenantId: this.config.tenantId,
@@ -7423,10 +7320,10 @@ var Agent = class {
     });
     const componentDataComponents = excludeDataComponents ? [] : this.config.dataComponents || [];
     const isThinkingPreparation = this.config.dataComponents && this.config.dataComponents.length > 0 && excludeDataComponents;
-    let graphPrompt = await this.getGraphPrompt();
-    if (graphPrompt && resolvedContext) {
+    let agentPrompt = await this.getAgentPrompt();
+    if (agentPrompt && resolvedContext) {
       try {
-        graphPrompt = TemplateEngine.render(graphPrompt, resolvedContext, {
+        agentPrompt = TemplateEngine.render(agentPrompt, resolvedContext, {
           strict: false,
           preserveUnresolved: false
         });
@@ -7436,20 +7333,20 @@ var Agent = class {
             conversationId,
             error: error instanceof Error ? error.message : "Unknown error"
           },
-          "Failed to process graph prompt with context, using original"
+          "Failed to process agent prompt with context, using original"
         );
       }
     }
     const shouldIncludeArtifactComponents = !excludeDataComponents;
-    const hasGraphArtifactComponents = await this.hasGraphArtifactComponents();
+    const hasAgentArtifactComponents = await this.hasAgentArtifactComponents();
     const config = {
       corePrompt: processedPrompt,
-      graphPrompt,
+      agentPrompt,
       tools: toolDefinitions,
       dataComponents: componentDataComponents,
       artifacts: referenceArtifacts,
       artifactComponents: shouldIncludeArtifactComponents ? this.artifactComponents : [],
-      hasGraphArtifactComponents,
+      hasAgentArtifactComponents,
       isThinkingPreparation,
       hasTransferRelations: (this.config.transferRelations?.length ?? 0) > 0,
       hasDelegateRelations: (this.config.delegateRelations?.length ?? 0) > 0
@@ -7466,7 +7363,7 @@ var Agent = class {
       execute: async ({ artifactId, toolCallId }) => {
         logger16.info({ artifactId, toolCallId }, "get_artifact_full executed");
         const streamRequestId = this.getStreamRequestId();
-        const artifactService = graphSessionManager.getArtifactService(streamRequestId);
+        const artifactService = agentSessionManager.getArtifactService(streamRequestId);
         if (!artifactService) {
           throw new Error(`ArtifactService not found for session ${streamRequestId}`);
         }
@@ -7500,7 +7397,7 @@ var Agent = class {
   // Provide a default tool set that is always available to the agent.
   async getDefaultTools(streamRequestId) {
     const defaultTools = {};
-    if (await this.graphHasArtifactComponents()) {
+    if (await this.agentHasArtifactComponents()) {
       defaultTools.get_reference_artifact = this.getArtifactTools();
     }
     const hasStructuredOutput = this.config.dataComponents && this.config.dataComponents.length > 0;
@@ -7728,20 +7625,20 @@ var Agent = class {
       return result;
     }
   }
-  // Check if any agents in the graph have artifact components
-  async graphHasArtifactComponents() {
+  // Check if any agents in the agent have artifact components
+  async agentHasArtifactComponents() {
     try {
-      return await graphHasArtifactComponents(dbClient_default)({
+      return await agentHasArtifactComponents(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
           projectId: this.config.projectId,
-          graphId: this.config.graphId
+          agentId: this.config.agentId
         }
       });
     } catch (error) {
       logger16.error(
-        { error, graphId: this.config.graphId },
-        "Failed to check graph artifact components"
+        { error, agentId: this.config.agentId },
+        "Failed to check agent artifact components"
       );
       return false;
     }
@@ -7873,7 +7770,7 @@ var Agent = class {
               const last = steps.at(-1);
               if (last && "text" in last && last.text) {
                 try {
-                  await graphSessionManager.recordEvent(
+                  await agentSessionManager.recordEvent(
                     this.getStreamRequestId(),
                     "agent_reasoning",
                     this.config.id,
@@ -7885,8 +7782,14 @@ var Agent = class {
                   logger16.debug({ error }, "Failed to track agent reasoning");
                 }
               }
-              if (last && "toolCalls" in last && last.toolCalls) {
-                return last.toolCalls.some((tc) => tc.toolName.startsWith("transfer_to_"));
+              if (steps.length >= 2) {
+                const previousStep = steps[steps.length - 2];
+                if (previousStep && "toolCalls" in previousStep && previousStep.toolCalls) {
+                  const hasTransferCall = previousStep.toolCalls.some((tc) => tc.toolName.startsWith("transfer_to_"));
+                  if (hasTransferCall && "toolResults" in previousStep && previousStep.toolResults) {
+                    return true;
+                  }
+                }
               }
               return steps.length >= this.getMaxGenerationSteps();
             },
@@ -7987,7 +7890,7 @@ var Agent = class {
               const last = steps.at(-1);
               if (last && "text" in last && last.text) {
                 try {
-                  await graphSessionManager.recordEvent(
+                  await agentSessionManager.recordEvent(
                     this.getStreamRequestId(),
                     "agent_reasoning",
                     this.config.id,
@@ -7999,10 +7902,16 @@ var Agent = class {
                   logger16.debug({ error }, "Failed to track agent reasoning");
                 }
               }
-              if (last && "toolCalls" in last && last.toolCalls) {
-                return last.toolCalls.some(
-                  (tc) => tc.toolName.startsWith("transfer_to_") || tc.toolName === "thinking_complete"
-                );
+              if (steps.length >= 2) {
+                const previousStep = steps[steps.length - 2];
+                if (previousStep && "toolCalls" in previousStep && previousStep.toolCalls) {
+                  const hasStopTool = previousStep.toolCalls.some(
+                    (tc) => tc.toolName.startsWith("transfer_to_") || tc.toolName === "thinking_complete"
+                  );
+                  if (hasStopTool && "toolResults" in previousStep && previousStep.toolResults) {
+                    return true;
+                  }
+                }
               }
               return steps.length >= this.getMaxGenerationSteps();
             },
@@ -8268,7 +8177,7 @@ ${output}${structureHintsFormatted}`;
         };
         if (streamRequestId) {
           const generationType = response.object ? "object_generation" : "text_generation";
-          graphSessionManager.recordEvent(streamRequestId, "agent_generate", this.config.id, {
+          agentSessionManager.recordEvent(streamRequestId, "agent_generate", this.config.id, {
             parts: (formattedContent?.parts || []).map((part) => ({
               type: part.kind === "text" ? "text" : part.kind === "data" ? "tool_result" : "text",
               content: part.text || JSON.stringify(part.data)
@@ -8308,11 +8217,11 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         dataComponents,
         artifactComponents
       ] = await Promise.all([
-        getRelatedAgentsForGraph(dbClient_default)({
+        getRelatedAgentsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
             projectId: config.projectId,
-            graphId: config.graphId
+            agentId: config.agentId
           },
           subAgentId: config.subAgentId
         }),
@@ -8320,7 +8229,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           scopes: {
             tenantId: config.tenantId,
             projectId: config.projectId,
-            graphId: config.graphId,
+            agentId: config.agentId,
             subAgentId: config.subAgentId
           }
         }),
@@ -8328,7 +8237,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           scopes: {
             tenantId: config.tenantId,
             projectId: config.projectId,
-            graphId: config.graphId,
+            agentId: config.agentId,
             subAgentId: config.subAgentId
           }
         }),
@@ -8336,7 +8245,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           scopes: {
             tenantId: config.tenantId,
             projectId: config.projectId,
-            graphId: config.graphId,
+            agentId: config.agentId,
             subAgentId: config.subAgentId
           }
         })
@@ -8349,16 +8258,16 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
               scopes: {
                 tenantId: config.tenantId,
                 projectId: config.projectId,
-                graphId: config.graphId
+                agentId: config.agentId
               },
               subAgentId: relation.id
             });
             if (relatedAgent) {
-              const relatedAgentRelations = await getRelatedAgentsForGraph(dbClient_default)({
+              const relatedAgentRelations = await getRelatedAgentsForAgent(dbClient_default)({
                 scopes: {
                   tenantId: config.tenantId,
                   projectId: config.projectId,
-                  graphId: config.graphId
+                  agentId: config.agentId
                 },
                 subAgentId: relation.id
               });
@@ -8388,7 +8297,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           id: config.subAgentId,
           tenantId: config.tenantId,
           projectId: config.projectId,
-          graphId: config.graphId,
+          agentId: config.agentId,
           baseUrl: config.baseUrl,
           apiKey: config.apiKey,
           name: config.name,
@@ -8400,7 +8309,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             id: relation.id,
             tenantId: config.tenantId,
             projectId: config.projectId,
-            graphId: config.graphId,
+            agentId: config.agentId,
             baseUrl: config.baseUrl,
             apiKey: config.apiKey,
             name: relation.name,
@@ -8416,7 +8325,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             id: relation.id,
             tenantId: config.tenantId,
             projectId: config.projectId,
-            graphId: config.graphId,
+            agentId: config.agentId,
             name: relation.name,
             description: relation.description,
             agentPrompt: "",
@@ -8432,7 +8341,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 id: relation.id,
                 tenantId: config.tenantId,
                 projectId: config.projectId,
-                graphId: config.graphId,
+                agentId: config.agentId,
                 baseUrl: config.baseUrl,
                 apiKey: config.apiKey,
                 name: relation.name,
@@ -8467,7 +8376,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       );
       const artifactStreamRequestId = task.context?.metadata?.streamRequestId;
       if (artifactStreamRequestId && artifactComponents.length > 0) {
-        graphSessionManager.updateArtifactComponents(artifactStreamRequestId, artifactComponents);
+        agentSessionManager.updateArtifactComponents(artifactStreamRequestId, artifactComponents);
       }
       let contextId = task.context?.conversationId;
       if (!contextId || contextId === "default" || contextId === "") {
@@ -8495,7 +8404,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           "Delegated agent - streaming disabled"
         );
         if (streamRequestId && config.tenantId && config.projectId) {
-          toolSessionManager.ensureGraphSession(
+          toolSessionManager.ensureAgentSession(
             streamRequestId,
             config.tenantId,
             config.projectId,
@@ -8527,17 +8436,42 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
             const toolResult = allToolResults.find(
               (result) => result.toolCallId === toolCall.toolCallId
             );
+            logger17.info({
+              toolCallName: toolCall.toolName,
+              toolCallId: toolCall.toolCallId,
+              hasToolResult: !!toolResult,
+              toolResultOutput: toolResult?.output,
+              toolResultKeys: toolResult?.output ? Object.keys(toolResult.output) : []
+            }, "[DEBUG] Transfer tool result found");
             const isValidTransferResult = (output) => {
-              return typeof output === "object" && output !== null && "type" in output && "target" in output && output.type === "transfer" && typeof output.target === "string" && (output.reason === void 0 || typeof output.reason === "string");
+              return typeof output === "object" && output !== null && "type" in output && "targetSubAgentId" in output && output.type === "transfer" && typeof output.targetSubAgentId === "string";
             };
             const responseText = response.text || (response.object ? JSON.stringify(response.object) : "");
             const transferReason = responseText || allThoughts[allThoughts.length - 1]?.text || "Agent requested transfer. No reason provided.";
             if (toolResult?.output && isValidTransferResult(toolResult.output)) {
               const transferResult = toolResult.output;
+              logger17.info({
+                validationPassed: true,
+                transferResult,
+                targetSubAgentId: transferResult.targetSubAgentId,
+                fromSubAgentId: transferResult.fromSubAgentId
+              }, "[DEBUG] Transfer validation passed, extracted data");
+              const artifactData = {
+                type: "transfer",
+                targetSubAgentId: transferResult.targetSubAgentId,
+                fromSubAgentId: transferResult.fromSubAgentId,
+                task_id: task.id,
+                reason: transferReason,
+                original_message: userMessage
+              };
+              logger17.info({
+                artifactData,
+                artifactDataKeys: Object.keys(artifactData)
+              }, "[DEBUG] Artifact data being returned");
               return {
                 status: {
                   state: TaskState.Completed,
-                  message: `Transfer requested to ${transferResult.target}`
+                  message: `Transfer requested to ${transferResult.targetSubAgentId}`
                 },
                 artifacts: [
                   {
@@ -8545,18 +8479,19 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                     parts: [
                       {
                         kind: "data",
-                        data: {
-                          type: "transfer",
-                          target: transferResult.target,
-                          task_id: task.id,
-                          reason: transferReason,
-                          original_message: userMessage
-                        }
+                        data: artifactData
                       }
                     ]
                   }
                 ]
               };
+            } else {
+              logger17.warn({
+                hasToolResult: !!toolResult,
+                hasOutput: !!toolResult?.output,
+                validationPassed: false,
+                output: toolResult?.output
+              }, "[DEBUG] Transfer validation FAILED");
             }
           }
         }
@@ -8588,128 +8523,171 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
   };
 };
 var createTaskHandlerConfig = async (params) => {
-  const agent = await getSubAgentById(dbClient_default)({
+  const subAgent = 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)({
+  const agent = await getAgentById(dbClient_default)({
     scopes: {
       tenantId: params.tenantId,
       projectId: params.projectId,
-      graphId: params.graphId
+      agentId: params.agentId
     }
   });
-  if (!agent) {
+  if (!subAgent) {
     throw new Error(`Agent not found: ${params.subAgentId}`);
   }
-  const effectiveModels = await resolveModelConfig(params.graphId, agent);
-  const effectiveConversationHistoryConfig = agent.conversationHistoryConfig || { mode: "full" };
+  const effectiveModels = await resolveModelConfig(params.agentId, subAgent);
+  const effectiveConversationHistoryConfig = subAgent.conversationHistoryConfig || { mode: "full" };
   return {
     tenantId: params.tenantId,
     projectId: params.projectId,
-    graphId: params.graphId,
+    agentId: params.agentId,
     subAgentId: params.subAgentId,
     agentSchema: {
-      id: agent.id,
-      name: agent.name,
-      description: agent.description,
-      prompt: agent.prompt,
+      id: subAgent.id,
+      name: subAgent.name,
+      description: subAgent.description,
+      prompt: subAgent.prompt,
       models: effectiveModels,
       conversationHistoryConfig: effectiveConversationHistoryConfig || null,
-      stopWhen: agent.stopWhen || null,
-      createdAt: agent.createdAt,
-      updatedAt: agent.updatedAt
+      stopWhen: subAgent.stopWhen || null,
+      createdAt: subAgent.createdAt,
+      updatedAt: subAgent.updatedAt
     },
     baseUrl: params.baseUrl,
     apiKey: params.apiKey,
-    name: agent.name,
-    description: agent.description,
+    name: subAgent.name,
+    description: subAgent.description,
     conversationHistoryConfig: effectiveConversationHistoryConfig,
-    contextConfigId: agentGraph?.contextConfigId || void 0
+    contextConfigId: agent?.contextConfigId || void 0
   };
 };
 
-// src/data/agentGraph.ts
-async function hydrateGraph({
-  dbGraph,
+// src/data/agents.ts
+function createAgentCard({
+  dbAgent,
+  baseUrl
+}) {
+  const description = dbAgent.description || "AI Agent";
+  return {
+    name: dbAgent.name,
+    description,
+    url: baseUrl ? `${baseUrl}/a2a` : "",
+    version: "1.0.0",
+    capabilities: {
+      streaming: true,
+      // Enable streaming for A2A compliance
+      pushNotifications: false,
+      stateTransitionHistory: false
+    },
+    defaultInputModes: ["text", "text/plain"],
+    defaultOutputModes: ["text", "text/plain"],
+    skills: [],
+    // Add provider info if available
+    ...baseUrl && {
+      provider: {
+        organization: "Inkeep",
+        url: baseUrl
+      }
+    }
+  };
+}
+function generateDescriptionWithTransfers(baseDescription, internalRelations, externalRelations) {
+  const transfers = [
+    ...internalRelations.filter((rel) => rel.relationType === "transfer"),
+    ...externalRelations.filter((rel) => rel.relationType === "transfer")
+  ];
+  const delegates = [
+    ...internalRelations.filter((rel) => rel.relationType === "delegate"),
+    ...externalRelations.filter((rel) => rel.relationType === "delegate")
+  ];
+  if (transfers.length === 0 && delegates.length === 0) {
+    return baseDescription;
+  }
+  let enhancedDescription = baseDescription;
+  if (transfers.length > 0) {
+    const transferList = transfers.map((rel) => {
+      const name = rel.externalAgent?.name || rel.name;
+      const desc = rel.externalAgent?.description || rel.description || "";
+      return `- ${name}: ${desc}`;
+    }).join("\n");
+    enhancedDescription += `
+
+Can transfer to:
+${transferList}`;
+  }
+  if (delegates.length > 0) {
+    const delegateList = delegates.map((rel) => {
+      const name = rel.externalAgent?.name || rel.name;
+      const desc = rel.externalAgent?.description || rel.description || "";
+      return `- ${name}: ${desc}`;
+    }).join("\n");
+    enhancedDescription += `
+
+Can delegate to:
+${delegateList}`;
+  }
+  return enhancedDescription;
+}
+async function hydrateAgent({
+  dbAgent,
+  agentId,
   baseUrl,
-  apiKey
+  apiKey,
+  credentialStoreRegistry
 }) {
   try {
-    if (!dbGraph.defaultSubAgentId) {
-      throw new Error(`Graph ${dbGraph.id} does not have a default agent configured`);
-    }
-    const defaultSubAgent = await getSubAgentById(dbClient_default)({
-      scopes: {
-        tenantId: dbGraph.tenantId,
-        projectId: dbGraph.projectId,
-        graphId: dbGraph.id
-      },
-      subAgentId: dbGraph.defaultSubAgentId
-    });
-    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,
-      subAgentId: dbGraph.defaultSubAgentId,
+      tenantId: dbAgent.tenantId,
+      projectId: dbAgent.projectId,
+      agentId,
+      subAgentId: dbAgent.id,
       baseUrl,
       apiKey
     });
-    const taskHandler = createTaskHandler(taskHandlerConfig);
-    const agentCard = {
-      name: dbGraph.name,
-      description: dbGraph.description || `Agent graph: ${dbGraph.name}`,
-      url: baseUrl ? `${baseUrl}/a2a` : "",
-      version: "1.0.0",
-      capabilities: {
-        streaming: true,
-        // Enable streaming for A2A compliance
-        pushNotifications: false,
-        stateTransitionHistory: false
-      },
-      defaultInputModes: ["text", "text/plain"],
-      defaultOutputModes: ["text", "text/plain"],
-      skills: [],
-      // TODO: Could aggregate skills from all agents in the graph
-      // Add provider info if available
-      ...baseUrl && {
-        provider: {
-          organization: "Inkeep",
-          url: baseUrl
-        }
-      }
-    };
+    const taskHandler = createTaskHandler(taskHandlerConfig, credentialStoreRegistry);
+    const agentCard = createAgentCard({
+      dbAgent,
+      baseUrl
+    });
     return {
-      subAgentId: dbGraph.id,
-      // Use graph ID as agent ID for A2A purposes
-      tenantId: dbGraph.tenantId,
-      projectId: dbGraph.projectId,
-      graphId: dbGraph.id,
+      subAgentId: dbAgent.id,
+      tenantId: dbAgent.tenantId,
+      projectId: dbAgent.projectId,
+      agentId,
       agentCard,
       taskHandler
     };
   } catch (error) {
-    console.error(`\u274C Failed to hydrate graph ${dbGraph.id}:`, error);
+    console.error(`\u274C Failed to hydrate agent ${dbAgent.id}:`, error);
     throw error;
   }
 }
-async function getRegisteredGraph(executionContext) {
-  const { tenantId, projectId, graphId, baseUrl, apiKey } = executionContext;
-  const dbGraph = await getAgentGraphById(dbClient_default)({ scopes: { tenantId, projectId, graphId } });
-  if (!dbGraph) {
+async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
+  const { tenantId, projectId, agentId, subAgentId, baseUrl, apiKey } = executionContext;
+  if (!subAgentId) {
+    throw new Error("Agent ID is required");
+  }
+  const dbAgent = await getSubAgentById(dbClient_default)({
+    scopes: { tenantId, projectId, agentId },
+    subAgentId
+  });
+  if (!dbAgent) {
     return null;
   }
   const agentFrameworkBaseUrl = `${baseUrl}/agents`;
-  return hydrateGraph({ dbGraph, baseUrl: agentFrameworkBaseUrl, apiKey });
+  return hydrateAgent({
+    dbAgent,
+    agentId,
+    baseUrl: agentFrameworkBaseUrl,
+    credentialStoreRegistry,
+    apiKey
+  });
 }
 
 // src/routes/agents.ts
@@ -8761,7 +8739,7 @@ app.openapi(
       "OpenTelemetry headers: well-known agent.json"
     );
     const executionContext = getRequestExecutionContext(c);
-    const { tenantId, projectId, graphId, subAgentId } = executionContext;
+    const { tenantId, projectId, agentId, subAgentId } = executionContext;
     console.dir("executionContext", executionContext);
     if (subAgentId) {
       logger18.info(
@@ -8769,7 +8747,7 @@ app.openapi(
           message: "getRegisteredAgent (agent-level)",
           tenantId,
           projectId,
-          graphId,
+          agentId,
           subAgentId
         },
         "agent-level well-known agent.json"
@@ -8787,21 +8765,21 @@ app.openapi(
     } else {
       logger18.info(
         {
-          message: "getRegisteredGraph (graph-level)",
+          message: "getRegisteredAgent (agent-level)",
           tenantId,
           projectId,
-          graphId
+          agentId
         },
-        "graph-level well-known agent.json"
+        "agent-level well-known agent.json"
       );
-      const graph = await getRegisteredGraph(executionContext);
-      if (!graph) {
+      const agent = await getRegisteredAgent(executionContext);
+      if (!agent) {
         throw createApiError({
           code: "not_found",
-          message: "Graph not found"
+          message: "Agent not found"
         });
       }
-      return c.json(graph.agentCard);
+      return c.json(agent.agentCard);
     }
   }
 );
@@ -8820,14 +8798,14 @@ app.post("/a2a", async (c) => {
     "OpenTelemetry headers: a2a"
   );
   const executionContext = getRequestExecutionContext(c);
-  const { tenantId, projectId, graphId, subAgentId } = executionContext;
+  const { tenantId, projectId, agentId, subAgentId } = executionContext;
   if (subAgentId) {
     logger18.info(
       {
         message: "a2a (agent-level)",
         tenantId,
         projectId,
-        graphId,
+        agentId,
         subAgentId
       },
       "agent-level a2a endpoint"
@@ -8848,17 +8826,17 @@ app.post("/a2a", async (c) => {
   } else {
     logger18.info(
       {
-        message: "a2a (graph-level)",
+        message: "a2a (agent-level)",
         tenantId,
         projectId,
-        graphId
+        agentId
       },
-      "graph-level a2a endpoint"
+      "agent-level a2a endpoint"
     );
-    const graph = await getAgentGraphWithDefaultSubAgent(dbClient_default)({
-      scopes: { tenantId, projectId, graphId }
+    const agent = await getAgentWithDefaultSubAgent(dbClient_default)({
+      scopes: { tenantId, projectId, agentId }
     });
-    if (!graph) {
+    if (!agent) {
       return c.json(
         {
           jsonrpc: "2.0",
@@ -8868,17 +8846,17 @@ app.post("/a2a", async (c) => {
         404
       );
     }
-    if (!graph.defaultSubAgentId) {
+    if (!agent.defaultSubAgentId) {
       return c.json(
         {
           jsonrpc: "2.0",
-          error: { code: -32004, message: "Graph does not have a default agent configured" },
+          error: { code: -32004, message: "Agent does not have a default agent configured" },
           id: null
         },
         400
       );
     }
-    executionContext.subAgentId = graph.defaultSubAgentId;
+    executionContext.subAgentId = agent.defaultSubAgentId;
     const credentialStores = c.get("credentialStores");
     const defaultSubAgent = await getRegisteredAgent(executionContext, credentialStores);
     if (!defaultSubAgent) {
@@ -8895,6 +8873,55 @@ app.post("/a2a", async (c) => {
   }
 });
 var agents_default = app;
+function isTransferTask(result) {
+  console.log(
+    "[isTransferTask] Checking result:",
+    JSON.stringify(
+      {
+        hasArtifacts: "artifacts" in result,
+        artifactsLength: result.kind === "task" ? result.artifacts?.length : 0,
+        firstArtifactParts: result.kind === "task" ? result.artifacts?.[0]?.parts?.length : 0,
+        allParts: result.kind === "task" ? result.artifacts?.[0]?.parts?.map((p, i) => ({
+          index: i,
+          kind: p.kind,
+          hasData: !!(p.kind === "data" && p.data),
+          dataType: p.kind === "data" ? p.data?.type : void 0,
+          dataKeys: p.kind === "data" ? Object.keys(p.data) : []
+        })) : []
+      },
+      null,
+      2
+    )
+  );
+  if (!("artifacts" in result) || !result.artifacts) {
+    console.log("[isTransferTask] No artifacts found");
+    return false;
+  }
+  const hasTransfer = result.artifacts.some(
+    (artifact) => artifact.parts.some((part) => {
+      if (part.kind !== "data" || !part.data) return false;
+      const isTransfer = typeof part.data === "object" && "type" in part.data && part.data.type === "transfer";
+      if (isTransfer) {
+        console.log("[isTransferTask] Found transfer data:", JSON.stringify(part.data, null, 2));
+      }
+      return isTransfer;
+    })
+  );
+  console.log("[isTransferTask] Result:", hasTransfer);
+  return hasTransfer;
+}
+function extractTransferData(task) {
+  for (const artifact of task.artifacts) {
+    for (const part of artifact.parts) {
+      if (part.kind === "data" && part.data?.type === "transfer") {
+        return part.data;
+      }
+    }
+  }
+  return null;
+}
+
+// src/a2a/transfer.ts
 var logger19 = getLogger("Transfer");
 async function executeTransfer({
   tenantId,
@@ -8902,19 +8929,25 @@ async function executeTransfer({
   projectId,
   targetSubAgentId
 }) {
-  logger19.info({ targetAgent: targetSubAgentId }, "Executing transfer to agent");
-  await setActiveAgentForThread(dbClient_default)({
-    scopes: { tenantId, projectId },
+  logger19.info({
+    targetAgent: targetSubAgentId,
     threadId,
-    subAgentId: targetSubAgentId
-  });
+    tenantId,
+    projectId
+  }, "Executing transfer - calling setActiveAgentForThread");
+  try {
+    await setActiveAgentForThread(dbClient_default)({
+      scopes: { tenantId, projectId },
+      threadId,
+      subAgentId: targetSubAgentId
+    });
+    logger19.info({ targetAgent: targetSubAgentId, threadId }, "Successfully updated active_sub_agent_id in database");
+  } catch (error) {
+    logger19.error({ error, targetAgent: targetSubAgentId, threadId }, "Failed to update active_sub_agent_id");
+    throw error;
+  }
   return { success: true, targetSubAgentId };
 }
-function isTransferResponse(result) {
-  return result?.artifacts.some(
-    (artifact) => artifact.parts.some((part) => part.kind === "data" && part.data?.type === "transfer")
-  );
-}
 var SSEStreamHelper = class {
   constructor(stream2, requestId2, timestamp) {
     this.stream = stream2;
@@ -9514,24 +9547,26 @@ var ExecutionHandler = class {
       sseHelper,
       emitOperations
     } = params;
-    const { tenantId, projectId, graphId, apiKey, baseUrl } = executionContext;
+    const { tenantId, projectId, agentId, apiKey, baseUrl } = executionContext;
     registerStreamHelper(requestId2, sseHelper);
-    graphSessionManager.createSession(requestId2, graphId, tenantId, projectId, conversationId);
+    agentSessionManager.createSession(requestId2, agentId, tenantId, projectId, conversationId);
     if (emitOperations) {
-      graphSessionManager.enableEmitOperations(requestId2);
+      agentSessionManager.enableEmitOperations(requestId2);
     }
     logger20.info(
-      { sessionId: requestId2, graphId, conversationId, emitOperations },
-      "Created GraphSession for message execution"
+      { sessionId: requestId2, agentId, conversationId, emitOperations },
+      "Created AgentSession for message execution"
     );
-    let graphConfig = null;
+    let agentConfig = null;
     try {
-      graphConfig = await getFullGraph(dbClient_default)({ scopes: { tenantId, projectId, graphId } });
-      if (graphConfig?.statusUpdates && graphConfig.statusUpdates.enabled !== false) {
-        graphSessionManager.initializeStatusUpdates(
+      agentConfig = await getFullAgent(dbClient_default)({
+        scopes: { tenantId, projectId, agentId }
+      });
+      if (agentConfig?.statusUpdates && agentConfig.statusUpdates.enabled !== false) {
+        agentSessionManager.initializeStatusUpdates(
           requestId2,
-          graphConfig.statusUpdates,
-          graphConfig.models?.summarizer
+          agentConfig.statusUpdates,
+          agentConfig.models?.summarizer
         );
       }
     } catch (error) {
@@ -9547,9 +9582,9 @@ var ExecutionHandler = class {
     let iterations = 0;
     let errorCount = 0;
     let task = null;
-    let fromAgentId;
+    let fromSubAgentId;
     try {
-      await sseHelper.writeOperation(agentInitializingOp(requestId2, graphId));
+      await sseHelper.writeOperation(agentInitializingOp(requestId2, agentId));
       const taskId = `task_${conversationId}-${requestId2}`;
       logger20.info(
         { taskId, currentAgentId, conversationId, requestId: requestId2 },
@@ -9560,7 +9595,7 @@ var ExecutionHandler = class {
           id: taskId,
           tenantId,
           projectId,
-          graphId,
+          agentId,
           subAgentId: currentAgentId,
           contextId: conversationId,
           status: "pending",
@@ -9568,11 +9603,11 @@ var ExecutionHandler = class {
             conversation_id: conversationId,
             message_id: requestId2,
             stream_request_id: requestId2,
-            // This also serves as the GraphSession ID
+            // This also serves as the AgentSession ID
             created_at: (/* @__PURE__ */ new Date()).toISOString(),
             updated_at: (/* @__PURE__ */ new Date()).toISOString(),
-            root_agent_id: initialAgentId,
-            agent_id: currentAgentId
+            root_sub_agent_id: initialAgentId,
+            sub_agent_id: currentAgentId
           }
         });
         logger20.info(
@@ -9609,6 +9644,7 @@ var ExecutionHandler = class {
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
           executionType: "create_initial_task",
           conversationId,
+          agentId,
           requestId: requestId2,
           currentAgentId,
           taskId: Array.isArray(task) ? task[0]?.id : task?.id,
@@ -9619,12 +9655,12 @@ var ExecutionHandler = class {
       );
       if (Array.isArray(task)) task = task[0];
       let currentMessage = userMessage;
-      const maxTransfers = graphConfig?.stopWhen?.transferCountIs ?? 10;
+      const maxTransfers = agentConfig?.stopWhen?.transferCountIs ?? 10;
       while (iterations < maxTransfers) {
         iterations++;
         logger20.info(
-          { iterations, currentAgentId, graphId, conversationId, fromAgentId },
-          `Execution loop iteration ${iterations} with agent ${currentAgentId}, transfer from: ${fromAgentId || "none"}`
+          { iterations, currentAgentId, agentId, conversationId, fromSubAgentId },
+          `Execution loop iteration ${iterations} with agent ${currentAgentId}, transfer from: ${fromSubAgentId || "none"}`
         );
         const activeAgent = await getActiveAgentForConversation(dbClient_default)({
           scopes: { tenantId, projectId },
@@ -9641,17 +9677,17 @@ var ExecutionHandler = class {
             Authorization: `Bearer ${apiKey}`,
             "x-inkeep-tenant-id": tenantId,
             "x-inkeep-project-id": projectId,
-            "x-inkeep-graph-id": graphId,
-            "x-inkeep-agent-id": currentAgentId
+            "x-inkeep-agent-id": agentId,
+            "x-inkeep-sub-agent-id": currentAgentId
           }
         });
         let messageResponse = null;
         const messageMetadata = {
           stream_request_id: requestId2
-          // This also serves as the GraphSession ID
+          // This also serves as the AgentSession ID
         };
-        if (fromAgentId) {
-          messageMetadata.fromAgentId = fromAgentId;
+        if (fromSubAgentId) {
+          messageMetadata.fromSubAgentId = fromSubAgentId;
         }
         messageResponse = await a2aClient.sendMessage({
           message: {
@@ -9695,17 +9731,28 @@ var ExecutionHandler = class {
                 }
               });
             }
-            graphSessionManager.endSession(requestId2);
+            agentSessionManager.endSession(requestId2);
             unregisterStreamHelper(requestId2);
             return { success: false, error: errorMessage2, iterations };
           }
           continue;
         }
-        if (isTransferResponse(messageResponse.result)) {
-          const transferResponse = messageResponse.result;
-          const targetSubAgentId = transferResponse.artifacts?.[0]?.parts?.[0]?.data?.targetSubAgentId;
-          const transferReason = transferResponse.artifacts?.[0]?.parts?.[1]?.text;
-          logger20.info({ targetSubAgentId, transferReason }, "transfer response");
+        if (isTransferTask(messageResponse.result)) {
+          const transferData = extractTransferData(messageResponse.result);
+          if (!transferData) {
+            logger20.error(
+              { result: messageResponse.result },
+              "Transfer detected but no transfer data found"
+            );
+            continue;
+          }
+          const { targetSubAgentId, fromSubAgentId: transferFromAgent } = transferData;
+          const firstArtifact = messageResponse.result.artifacts[0];
+          const transferReason = firstArtifact?.parts[1]?.kind === "text" ? firstArtifact.parts[1].text : "Transfer initiated";
+          logger20.info(
+            { targetSubAgentId, transferReason, transferFromAgent },
+            "Transfer response"
+          );
           currentMessage = `<transfer_context> ${transferReason} </transfer_context>`;
           const { success, targetSubAgentId: newAgentId } = await executeTransfer({
             projectId,
@@ -9714,15 +9761,15 @@ var ExecutionHandler = class {
             targetSubAgentId
           });
           if (success) {
-            fromAgentId = currentAgentId;
+            fromSubAgentId = currentAgentId;
             currentAgentId = newAgentId;
             logger20.info(
               {
-                transferFrom: fromAgentId,
+                transferFrom: fromSubAgentId,
                 transferTo: currentAgentId,
                 reason: transferReason
               },
-              "Transfer executed, tracking fromAgentId for next iteration"
+              "Transfer executed, tracking fromSubAgentId for next iteration"
             );
           }
           continue;
@@ -9744,10 +9791,10 @@ var ExecutionHandler = class {
           );
         }
         if (responseParts && responseParts.length > 0) {
-          const graphSessionData = graphSessionManager.getSession(requestId2);
-          if (graphSessionData) {
-            const sessionSummary = graphSessionData.getSummary();
-            logger20.info(sessionSummary, "GraphSession data after completion");
+          const agentSessionData = agentSessionManager.getSession(requestId2);
+          if (agentSessionData) {
+            const sessionSummary = agentSessionData.getSummary();
+            logger20.info(sessionSummary, "AgentSession data after completion");
           }
           let textContent = "";
           for (const part of responseParts) {
@@ -9806,8 +9853,8 @@ var ExecutionHandler = class {
               );
               await sseHelper.writeOperation(completionOp(currentAgentId, iterations));
               await sseHelper.complete();
-              logger20.info({}, "Ending GraphSession and cleaning up");
-              graphSessionManager.endSession(requestId2);
+              logger20.info({}, "Ending AgentSession and cleaning up");
+              agentSessionManager.endSession(requestId2);
               logger20.info({}, "Cleaning up streamHelper");
               unregisterStreamHelper(requestId2);
               let response;
@@ -9847,7 +9894,7 @@ var ExecutionHandler = class {
               }
             });
           }
-          graphSessionManager.endSession(requestId2);
+          agentSessionManager.endSession(requestId2);
           unregisterStreamHelper(requestId2);
           return { success: false, error: errorMessage2, iterations };
         }
@@ -9868,7 +9915,7 @@ var ExecutionHandler = class {
           }
         });
       }
-      graphSessionManager.endSession(requestId2);
+      agentSessionManager.endSession(requestId2);
       unregisterStreamHelper(requestId2);
       return { success: false, error: errorMessage, iterations };
     } catch (error) {
@@ -9890,7 +9937,7 @@ var ExecutionHandler = class {
           }
         });
       }
-      graphSessionManager.endSession(requestId2);
+      agentSessionManager.endSession(requestId2);
       unregisterStreamHelper(requestId2);
       return { success: false, error: errorMessage, iterations };
     }
@@ -9905,7 +9952,7 @@ var chatCompletionsRoute = createRoute({
   path: "/completions",
   tags: ["chat"],
   summary: "Create chat completion",
-  description: "Creates a new chat completion with streaming SSE response using the configured agent graph",
+  description: "Creates a new chat completion with streaming SSE response using the configured agent",
   security: [{ bearerAuth: [] }],
   request: {
     body: {
@@ -9980,7 +10027,7 @@ var chatCompletionsRoute = createRoute({
       }
     },
     404: {
-      description: "Agent graph or agent not found",
+      description: "Agent or agent not found",
       content: {
         "application/json": {
           schema: z.object({
@@ -10027,48 +10074,48 @@ app2.openapi(chatCompletionsRoute, async (c) => {
   );
   try {
     const executionContext = getRequestExecutionContext(c);
-    const { tenantId, projectId, graphId } = executionContext;
+    const { tenantId, projectId, agentId } = executionContext;
     getLogger("chat").debug(
       {
         tenantId,
-        graphId
+        agentId
       },
       "Extracted chat parameters from API key context"
     );
     const body = c.get("requestBody") || {};
     const conversationId = body.conversationId || getConversationId();
-    const fullGraph = await getFullGraph(dbClient_default)({
-      scopes: { tenantId, projectId, graphId }
+    const fullAgent = await getFullAgent(dbClient_default)({
+      scopes: { tenantId, projectId, agentId }
     });
-    let agentGraph;
+    let agent;
     let defaultSubAgentId;
-    if (fullGraph) {
-      agentGraph = {
-        id: fullGraph.id,
-        name: fullGraph.name,
+    if (fullAgent) {
+      agent = {
+        id: fullAgent.id,
+        name: fullAgent.name,
         tenantId,
         projectId,
-        defaultSubAgentId: fullGraph.defaultSubAgentId
+        defaultSubAgentId: fullAgent.defaultSubAgentId
       };
-      const agentKeys = Object.keys(fullGraph.subAgents || {});
+      const agentKeys = Object.keys(fullAgent.subAgents || {});
       const firstAgentId = agentKeys.length > 0 ? agentKeys[0] : "";
-      defaultSubAgentId = fullGraph.defaultSubAgentId || firstAgentId;
+      defaultSubAgentId = fullAgent.defaultSubAgentId || firstAgentId;
     } else {
-      agentGraph = await getAgentGraphWithDefaultSubAgent(dbClient_default)({
-        scopes: { tenantId, projectId, graphId }
+      agent = await getAgentWithDefaultSubAgent(dbClient_default)({
+        scopes: { tenantId, projectId, agentId }
       });
-      if (!agentGraph) {
+      if (!agent) {
         throw createApiError({
           code: "not_found",
-          message: "Agent graph not found"
+          message: "Agent not found"
         });
       }
-      defaultSubAgentId = agentGraph.defaultSubAgentId || "";
+      defaultSubAgentId = agent.defaultSubAgentId || "";
     }
     if (!defaultSubAgentId) {
       throw createApiError({
         code: "not_found",
-        message: "No default agent found in graph"
+        message: "No default agent found in agent"
       });
     }
     await createOrGetConversation(dbClient_default)({
@@ -10090,7 +10137,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     }
     const subAgentId = activeAgent?.activeSubAgentId || defaultSubAgentId;
     const agentInfo = await getSubAgentById(dbClient_default)({
-      scopes: { tenantId, projectId, graphId },
+      scopes: { tenantId, projectId, agentId },
       subAgentId
     });
     if (!agentInfo) {
@@ -10104,7 +10151,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     await handleContextResolution({
       tenantId,
       projectId,
-      graphId,
+      agentId,
       conversationId,
       headers: validatedContext,
       dbClient: dbClient_default,
@@ -10114,11 +10161,11 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       {
         tenantId,
         projectId,
-        graphId,
+        agentId,
         conversationId,
         defaultSubAgentId,
         activeSubAgentId: activeAgent?.activeSubAgentId || "none",
-        hasContextConfig: !!agentGraph.contextConfigId,
+        hasContextConfig: !!agent.contextConfigId,
         hasHeaders: !!body.headers,
         hasValidatedContext: !!validatedContext,
         validatedContextKeys: Object.keys(validatedContext)
@@ -10283,8 +10330,8 @@ app3.use("/chat", contextValidationMiddleware(dbClient_default));
 app3.openapi(chatDataStreamRoute, async (c) => {
   try {
     const executionContext = getRequestExecutionContext(c);
-    const { tenantId, projectId, graphId } = executionContext;
-    loggerFactory.getLogger("chatDataStream").debug({ tenantId, projectId, graphId }, "Extracted chatDataStream parameters");
+    const { tenantId, projectId, agentId } = executionContext;
+    loggerFactory.getLogger("chatDataStream").debug({ tenantId, projectId, agentId }, "Extracted chatDataStream parameters");
     const body = c.get("requestBody") || {};
     const conversationId = body.conversationId || getConversationId();
     const activeSpan = trace.getActiveSpan();
@@ -10292,25 +10339,25 @@ app3.openapi(chatDataStreamRoute, async (c) => {
       activeSpan.setAttributes({
         "conversation.id": conversationId,
         "tenant.id": tenantId,
-        "graph.id": graphId,
+        "agent.id": agentId,
         "project.id": projectId
       });
     }
-    const agentGraph = await getAgentGraphWithDefaultSubAgent(dbClient_default)({
-      scopes: { tenantId, projectId, graphId }
+    const agent = await getAgentWithDefaultSubAgent(dbClient_default)({
+      scopes: { tenantId, projectId, agentId }
     });
-    if (!agentGraph) {
+    if (!agent) {
       throw createApiError({
         code: "not_found",
-        message: "Agent graph not found"
+        message: "Agent not found"
       });
     }
-    const defaultSubAgentId = agentGraph.defaultSubAgentId;
-    const graphName = agentGraph.name;
+    const defaultSubAgentId = agent.defaultSubAgentId;
+    const agentName = agent.name;
     if (!defaultSubAgentId) {
       throw createApiError({
         code: "bad_request",
-        message: "Graph does not have a default agent configured"
+        message: "Agent does not have a default agent configured"
       });
     }
     const activeAgent = await getActiveAgentForConversation(dbClient_default)({
@@ -10326,7 +10373,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
     }
     const subAgentId = activeAgent?.activeSubAgentId || defaultSubAgentId;
     const agentInfo = await getSubAgentById(dbClient_default)({
-      scopes: { tenantId, projectId, graphId },
+      scopes: { tenantId, projectId, agentId },
       subAgentId
     });
     if (!agentInfo) {
@@ -10340,7 +10387,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
     await handleContextResolution({
       tenantId,
       projectId,
-      graphId,
+      agentId,
       conversationId,
       headers: validatedContext,
       dbClient: dbClient_default,
@@ -10354,7 +10401,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
       messageSpan.setAttributes({
         "message.timestamp": (/* @__PURE__ */ new Date()).toISOString(),
         "message.content": userText,
-        "graph.name": graphName
+        "agent.name": agentName
       });
     }
     await createMessage(dbClient_default)({
@@ -10490,7 +10537,7 @@ var spoofTransportInitialization = async (transport, req, sessionId, mcpProtocol
     logger23.warn({ sessionId, error: spoofError }, "Spoof initialization failed, continuing anyway");
   }
 };
-var validateSession = async (req, res, body, tenantId, projectId, graphId) => {
+var validateSession = async (req, res, body, tenantId, projectId, agentId) => {
   const sessionId = req.headers["mcp-session-id"];
   logger23.info({ sessionId }, "Received MCP session ID");
   if (!sessionId) {
@@ -10525,12 +10572,12 @@ var validateSession = async (req, res, body, tenantId, projectId, graphId) => {
       sessionId,
       conversationFound: !!conversation,
       sessionType: conversation?.metadata?.sessionData?.sessionType,
-      storedGraphId: conversation?.metadata?.sessionData?.graphId,
-      requestGraphId: graphId
+      storedAgentId: conversation?.metadata?.sessionData?.agentId,
+      requestAgentId: agentId
     },
     "Conversation lookup result"
   );
-  if (!conversation || conversation.metadata?.sessionData?.sessionType !== "mcp" || conversation.metadata?.sessionData?.graphId !== graphId) {
+  if (!conversation || conversation.metadata?.sessionData?.sessionType !== "mcp" || conversation.metadata?.sessionData?.agentId !== agentId) {
     logger23.info(
       { sessionId, conversationId: conversation?.id },
       "MCP session not found or invalid"
@@ -10549,13 +10596,13 @@ var validateSession = async (req, res, body, tenantId, projectId, graphId) => {
   }
   return conversation;
 };
-var setupTracing = (conversationId, tenantId, graphId) => {
+var setupTracing = (conversationId, tenantId, agentId) => {
   const activeSpan = trace.getActiveSpan();
   if (activeSpan) {
     activeSpan.setAttributes({
       "conversation.id": conversationId,
       "tenant.id": tenantId,
-      "graph.id": graphId
+      "agent.id": agentId
     });
   }
 };
@@ -10617,13 +10664,13 @@ var executeAgentQuery = async (executionContext, conversationId, query, defaultS
   };
 };
 var getServer = async (headers, executionContext, conversationId, credentialStores) => {
-  const { tenantId, projectId, graphId } = executionContext;
-  setupTracing(conversationId, tenantId, graphId);
-  const agentGraph = await getAgentGraphWithDefaultSubAgent(dbClient_default)({
-    scopes: { tenantId, projectId, graphId }
+  const { tenantId, projectId, agentId } = executionContext;
+  setupTracing(conversationId, tenantId, agentId);
+  const agent = await getAgentWithDefaultSubAgent(dbClient_default)({
+    scopes: { tenantId, projectId, agentId }
   });
-  if (!agentGraph) {
-    throw new Error("Agent graph not found");
+  if (!agent) {
+    throw new Error("Agent not found");
   }
   const server = new McpServer(
     {
@@ -10634,26 +10681,26 @@ var getServer = async (headers, executionContext, conversationId, credentialStor
   );
   server.tool(
     "send-query-to-agent",
-    `Send a query to the ${agentGraph.name} agent. The agent has the following description: ${agentGraph.description}`,
+    `Send a query to the ${agent.name} agent. The agent has the following description: ${agent.description}`,
     {
       query: createMCPSchema(z$2.string().describe("The query to send to the agent"))
     },
     async ({ query }) => {
       try {
-        if (!agentGraph.defaultSubAgentId) {
+        if (!agent.defaultSubAgentId) {
           return {
             content: [
               {
                 type: "text",
-                text: `Graph does not have a default agent configured`
+                text: `Agent does not have a default agent configured`
               }
             ],
             isError: true
           };
         }
-        const defaultSubAgentId = agentGraph.defaultSubAgentId;
+        const defaultSubAgentId = agent.defaultSubAgentId;
         const agentInfo = await getSubAgentById(dbClient_default)({
-          scopes: { tenantId, projectId, graphId },
+          scopes: { tenantId, projectId, agentId },
           subAgentId: defaultSubAgentId
         });
         if (!agentInfo) {
@@ -10670,7 +10717,7 @@ var getServer = async (headers, executionContext, conversationId, credentialStor
         const resolvedContext = await handleContextResolution({
           tenantId,
           projectId,
-          graphId,
+          agentId,
           conversationId,
           headers,
           dbClient: dbClient_default,
@@ -10680,9 +10727,9 @@ var getServer = async (headers, executionContext, conversationId, credentialStor
           {
             tenantId,
             projectId,
-            graphId,
+            agentId,
             conversationId,
-            hasContextConfig: !!agentGraph.contextConfigId,
+            hasContextConfig: !!agent.contextConfigId,
             hasHeaders: !!headers,
             hasValidatedContext: !!resolvedContext
           },
@@ -10715,8 +10762,8 @@ app4.use("/", async (c, next) => {
 var validateRequestParameters = (c) => {
   try {
     const executionContext = getRequestExecutionContext(c);
-    const { tenantId, projectId, graphId } = executionContext;
-    getLogger("mcp").debug({ tenantId, projectId, graphId }, "Extracted MCP entity parameters");
+    const { tenantId, projectId, agentId } = executionContext;
+    getLogger("mcp").debug({ tenantId, projectId, agentId }, "Extracted MCP entity parameters");
     return { valid: true, executionContext };
   } catch (error) {
     getLogger("chat").warn(
@@ -10737,27 +10784,27 @@ var validateRequestParameters = (c) => {
   }
 };
 var handleInitializationRequest = async (body, executionContext, validatedContext, req, res, c, credentialStores) => {
-  const { tenantId, projectId, graphId } = executionContext;
+  const { tenantId, projectId, agentId } = executionContext;
   logger23.info({ body }, "Received initialization request");
   const sessionId = getConversationId();
-  const agentGraph = await getAgentGraphWithDefaultSubAgent(dbClient_default)({
-    scopes: { tenantId, projectId, graphId }
+  const agent = await getAgentWithDefaultSubAgent(dbClient_default)({
+    scopes: { tenantId, projectId, agentId }
   });
-  if (!agentGraph) {
+  if (!agent) {
     return c.json(
       {
         jsonrpc: "2.0",
-        error: { code: -32001, message: "Agent graph not found" },
+        error: { code: -32001, message: "Agent not found" },
         id: body.id || null
       },
       { status: 404 }
     );
   }
-  if (!agentGraph.defaultSubAgentId) {
+  if (!agent.defaultSubAgentId) {
     return c.json(
       {
         jsonrpc: "2.0",
-        error: { code: -32001, message: "Graph does not have a default agent configured" },
+        error: { code: -32001, message: "Agent does not have a default agent configured" },
         id: body.id || null
       },
       { status: 400 }
@@ -10767,10 +10814,10 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
     id: sessionId,
     tenantId,
     projectId,
-    activeSubAgentId: agentGraph.defaultSubAgentId,
+    activeSubAgentId: agent.defaultSubAgentId,
     metadata: {
       sessionData: {
-        graphId,
+        agentId,
         sessionType: "mcp",
         mcpProtocolVersion: c.req.header("mcp-protocol-version"),
         initialized: false
@@ -10802,8 +10849,8 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
   return toFetchResponse(res);
 };
 var handleExistingSessionRequest = async (body, executionContext, validatedContext, req, res, credentialStores) => {
-  const { tenantId, projectId, graphId } = executionContext;
-  const conversation = await validateSession(req, res, body, tenantId, projectId, graphId);
+  const { tenantId, projectId, agentId } = executionContext;
+  const conversation = await validateSession(req, res, body, tenantId, projectId, agentId);
   if (!conversation) {
     return toFetchResponse(res);
   }
@@ -10879,7 +10926,7 @@ app4.openapi(
         description: "Unauthorized - API key authentication required"
       },
       404: {
-        description: "Not Found - Agent graph not found"
+        description: "Not Found - Agent not found"
       },
       500: {
         description: "Internal Server Error"
@@ -11097,7 +11144,7 @@ function createExecutionHono(serverConfig, credentialStores) {
       logger24.debug({}, "Empty execution context");
       return next();
     }
-    const { tenantId, projectId, graphId } = executionContext;
+    const { tenantId, projectId, agentId } = executionContext;
     let conversationId;
     const requestBody = c.get("requestBody") || {};
     if (requestBody) {
@@ -11108,7 +11155,7 @@ function createExecutionHono(serverConfig, credentialStores) {
     }
     const entries = Object.fromEntries(
       Object.entries({
-        "graph.id": graphId,
+        "agent.id": agentId,
         "tenant.id": tenantId,
         "project.id": projectId,
         "conversation.id": conversationId