@inkeep/agents-run-api 0.0.0-dev-20250919020857 → 0.0.0-dev-20250919052931

package/dist/index.cjs

@@ -1226,7 +1226,7 @@ async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
     throw new Error("Agent ID is required");
   }
   const dbAgent = await agentsCore.getAgentById(dbClient_default)({
-    scopes: { tenantId, projectId },
+    scopes: { tenantId, projectId, graphId },
     agentId
   });
   if (!dbAgent) {
@@ -1245,6 +1245,41 @@ async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
 // src/agents/generateTaskHandler.ts
 init_dbClient();
 
+// src/utils/model-resolver.ts
+init_dbClient();
+async function resolveModelConfig(graphId, agent) {
+  if (agent.models?.base?.model) {
+    return {
+      base: agent.models.base,
+      structuredOutput: agent.models.structuredOutput || agent.models.base,
+      summarizer: agent.models.summarizer || agent.models.base
+    };
+  }
+  const graph = await agentsCore.getAgentGraphById(dbClient_default)({
+    scopes: { tenantId: agent.tenantId, projectId: agent.projectId, graphId }
+  });
+  if (graph?.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
+    };
+  }
+  const project = await agentsCore.getProject(dbClient_default)({
+    scopes: { tenantId: agent.tenantId, projectId: agent.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
+    };
+  }
+  throw new Error(
+    "Base model configuration is required. Please configure models at the project level."
+  );
+}
+
 // src/agents/Agent.ts
 init_conversations();
 init_dbClient();
@@ -1408,6 +1443,9 @@ var _ModelFactory = class _ModelFactory {
       );
     }
     const modelSettings = config;
+    if (!modelSettings.model) {
+      throw new Error("Model configuration is required");
+    }
     const modelString = modelSettings.model.trim();
     const { provider, modelName } = _ModelFactory.parseModelString(modelString);
     logger5.debug(
@@ -2078,6 +2116,9 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
             }
             modelToUse = this.statusUpdateState.baseModel;
           }
+          if (!modelToUse) {
+            throw new Error("No model configuration available");
+          }
           const model = ModelFactory.createModel(modelToUse);
           const { text } = await ai.generateText({
             model,
@@ -2212,6 +2253,9 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
             }
             modelToUse = this.statusUpdateState.baseModel;
           }
+          if (!modelToUse) {
+            throw new Error("No model configuration available");
+          }
           const model = ModelFactory.createModel(modelToUse);
           const { object } = await ai.generateObject({
             model,
@@ -2502,6 +2546,9 @@ Make it specific and relevant.`;
             }
             modelToUse = this.statusUpdateState.baseModel;
           }
+          if (!modelToUse) {
+            throw new Error("No model configuration available");
+          }
           const model = ModelFactory.createModel(modelToUse);
           const schema = z5.z.object({
             name: z5.z.string().max(50).describe("Concise, descriptive name for the artifact"),
@@ -2783,6 +2830,7 @@ var _ArtifactParser = class _ArtifactParser {
     }
     for (let i = matches.length - 1; i >= 0; i--) {
       const match = matches[i];
+      if (match.index === void 0) continue;
       const startIdx = match.index;
       const textAfterMatch = text.slice(startIdx);
       if (!textAfterMatch.includes("/>")) {
@@ -2850,6 +2898,7 @@ var _ArtifactParser = class _ArtifactParser {
     let lastIndex = 0;
     for (const match of matches) {
       const [fullMatch, artifactId, taskId] = match;
+      if (match.index === void 0) continue;
       const matchStart = match.index;
       if (matchStart > lastIndex) {
         const textBefore = text.slice(lastIndex, matchStart);
@@ -4670,7 +4719,8 @@ function createDelegateToAgentTool({
         const externalAgent = await agentsCore.getExternalAgent(dbClient_default)({
           scopes: {
             tenantId,
-            projectId
+            projectId,
+            graphId
           },
           agentId: delegateConfig.config.id
         });
@@ -5559,8 +5609,12 @@ var Agent = class {
   async getMcpTool(tool4) {
     const credentialReferenceId = tool4.credentialReferenceId;
     const toolsForAgent = await agentsCore.getToolsForAgent(dbClient_default)({
-      scopes: { tenantId: this.config.tenantId, projectId: this.config.projectId },
-      agentId: this.config.id
+      scopes: {
+        tenantId: this.config.tenantId,
+        projectId: this.config.projectId,
+        graphId: this.config.graphId,
+        agentId: this.config.id
+      }
     });
     const selectedTools = toolsForAgent.data.find((t) => t.toolId === tool4.id)?.selectedTools || void 0;
     let serverConfig;
@@ -5707,9 +5761,9 @@ var Agent = class {
       const graphDefinition = await agentsCore.getFullGraphDefinition(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
-          projectId: this.config.projectId
-        },
-        graphId: this.config.graphId
+          projectId: this.config.projectId,
+          graphId: this.config.graphId
+        }
       });
       return graphDefinition?.graphPrompt || void 0;
     } catch (error) {
@@ -5731,14 +5785,16 @@ var Agent = class {
       const graphDefinition = await agentsCore.getFullGraphDefinition(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
-          projectId: this.config.projectId
-        },
-        graphId: this.config.graphId
+          projectId: this.config.projectId,
+          graphId: this.config.graphId
+        }
       });
       if (!graphDefinition) {
         return false;
       }
-      return !!(graphDefinition.artifactComponents && Object.keys(graphDefinition.artifactComponents).length > 0);
+      return Object.values(graphDefinition.agents).some(
+        (agent) => "artifactComponents" in agent && agent.artifactComponents && agent.artifactComponents.length > 0
+      );
     } catch (error) {
       logger15.warn(
         {
@@ -5937,9 +5993,9 @@ Key requirements:
       return await agentsCore.graphHasArtifactComponents(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
-          projectId: this.config.projectId
-        },
-        graphId: this.config.graphId
+          projectId: this.config.projectId,
+          graphId: this.config.graphId
+        }
       });
     } catch (error) {
       logger15.error(
@@ -6418,45 +6474,6 @@ ${output}`;
   }
 };
 
-// src/utils/model-resolver.ts
-init_dbClient();
-async function resolveModelConfig(graphId, agent) {
-  if (agent.models?.base?.model) {
-    return {
-      base: agent.models.base,
-      structuredOutput: agent.models.structuredOutput || agent.models.base,
-      summarizer: agent.models.summarizer || agent.models.base
-    };
-  }
-  let graph = null;
-  if (graphId) {
-    graph = await agentsCore.getAgentGraph(dbClient_default)({
-      scopes: { tenantId: agent.tenantId, projectId: agent.projectId },
-      graphId
-    });
-  }
-  if (graph?.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
-    };
-  }
-  const project = await agentsCore.getProject(dbClient_default)({
-    scopes: { tenantId: agent.tenantId, projectId: agent.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
-    };
-  }
-  throw new Error(
-    "Base model configuration is required. Please configure models at the project level."
-  );
-}
-
 // src/agents/generateTaskHandler.ts
 function parseEmbeddedJson(data) {
   return traverse__default.default(data).map(function(x) {
@@ -6491,31 +6508,34 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         agentsCore.getRelatedAgentsForGraph(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
+            projectId: config.projectId,
+            graphId: config.graphId
           },
-          graphId: config.graphId,
           agentId: config.agentId
         }),
         agentsCore.getToolsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
-          },
-          agentId: config.agentId
+            projectId: config.projectId,
+            graphId: config.graphId,
+            agentId: config.agentId
+          }
         }),
         agentsCore.getDataComponentsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
-          },
-          agentId: config.agentId
+            projectId: config.projectId,
+            graphId: config.graphId,
+            agentId: config.agentId
+          }
         }),
         agentsCore.getArtifactComponentsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
-          },
-          agentId: config.agentId
+            projectId: config.projectId,
+            graphId: config.graphId,
+            agentId: config.agentId
+          }
         })
       ]);
       logger16.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
@@ -6523,13 +6543,16 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         internalRelations.map(async (relation) => {
           try {
             const relatedAgent = await agentsCore.getAgentById(dbClient_default)({
-              scopes: { tenantId: config.tenantId, projectId: config.projectId },
+              scopes: {
+                tenantId: config.tenantId,
+                projectId: config.projectId,
+                graphId: config.graphId
+              },
               agentId: relation.id
             });
             if (relatedAgent) {
               const relatedAgentRelations = await agentsCore.getRelatedAgentsForGraph(dbClient_default)({
-                scopes: { tenantId: config.tenantId, projectId: config.projectId },
-                graphId: config.graphId,
+                scopes: { tenantId: config.tenantId, projectId: config.projectId, graphId: config.graphId },
                 agentId: relation.id
               });
               const enhancedDescription = generateDescriptionWithTransfers(
@@ -6752,16 +6775,17 @@ var createTaskHandlerConfig = async (params) => {
   const agent = await agentsCore.getAgentById(dbClient_default)({
     scopes: {
       tenantId: params.tenantId,
-      projectId: params.projectId
+      projectId: params.projectId,
+      graphId: params.graphId
     },
     agentId: params.agentId
   });
-  const agentGraph = await agentsCore.getAgentGraph(dbClient_default)({
+  const agentGraph = await agentsCore.getAgentGraphById(dbClient_default)({
     scopes: {
       tenantId: params.tenantId,
-      projectId: params.projectId
-    },
-    graphId: params.graphId
+      projectId: params.projectId,
+      graphId: params.graphId
+    }
   });
   if (!agent) {
     throw new Error(`Agent not found: ${params.agentId}`);
@@ -6801,10 +6825,14 @@ async function hydrateGraph({
   apiKey
 }) {
   try {
+    if (!dbGraph.defaultAgentId) {
+      throw new Error(`Graph ${dbGraph.id} does not have a default agent configured`);
+    }
     const defaultAgent = await agentsCore.getAgentById(dbClient_default)({
       scopes: {
         tenantId: dbGraph.tenantId,
-        projectId: dbGraph.projectId
+        projectId: dbGraph.projectId,
+        graphId: dbGraph.id
       },
       agentId: dbGraph.defaultAgentId
     });
@@ -6859,7 +6887,7 @@ async function hydrateGraph({
 }
 async function getRegisteredGraph(executionContext) {
   const { tenantId, projectId, graphId, baseUrl, apiKey } = executionContext;
-  const dbGraph = await agentsCore.getAgentGraph(dbClient_default)({ scopes: { tenantId, projectId }, graphId });
+  const dbGraph = await agentsCore.getAgentGraphById(dbClient_default)({ scopes: { tenantId, projectId, graphId } });
   if (!dbGraph) {
     return null;
   }
@@ -6918,6 +6946,7 @@ app.openapi(
     );
     const executionContext = agentsCore.getRequestExecutionContext(c);
     const { tenantId, projectId, graphId, agentId } = executionContext;
+    console.dir("executionContext", executionContext);
     if (agentId) {
       logger17.info(
         {
@@ -7005,8 +7034,7 @@ app.post("/a2a", async (c) => {
       "graph-level a2a endpoint"
     );
     const graph = await agentsCore.getAgentGraphWithDefaultAgent(dbClient_default)({
-      scopes: { tenantId, projectId },
-      graphId
+      scopes: { tenantId, projectId, graphId }
     });
     if (!graph) {
       return c.json(
@@ -7018,6 +7046,16 @@ app.post("/a2a", async (c) => {
         404
       );
     }
+    if (!graph.defaultAgentId) {
+      return c.json(
+        {
+          jsonrpc: "2.0",
+          error: { code: -32004, message: "Graph does not have a default agent configured" },
+          id: null
+        },
+        400
+      );
+    }
     executionContext.agentId = graph.defaultAgentId;
     const credentialStores = c.get("credentialStores");
     const defaultAgent = await getRegisteredAgent(executionContext, credentialStores);
@@ -7061,6 +7099,9 @@ function isTransferResponse(result) {
     (artifact) => artifact.parts.some((part) => part.kind === "data" && part.data?.type === "transfer")
   );
 }
+
+// src/handlers/executionHandler.ts
+init_dbClient();
 var SSEStreamHelper = class {
   constructor(stream2, requestId2, timestamp) {
     this.stream = stream2;
@@ -7374,8 +7415,8 @@ var _VercelDataStreamHelper = class _VercelDataStreamHelper {
       });
     } else {
       this.writer.write({
-        type: "error",
-        ...error
+        ...error,
+        type: "error"
       });
     }
   }
@@ -7630,7 +7671,6 @@ function createMCPStreamHelper() {
 }
 
 // src/handlers/executionHandler.ts
-init_dbClient();
 var logger19 = agentsCore.getLogger("ExecutionHandler");
 var ExecutionHandler = class {
   constructor() {
@@ -7659,7 +7699,7 @@ var ExecutionHandler = class {
     logger19.info({ sessionId: requestId2, graphId }, "Created GraphSession for message execution");
     let graphConfig = null;
     try {
-      graphConfig = await agentsCore.getFullGraph(dbClient_default)({ scopes: { tenantId, projectId }, graphId });
+      graphConfig = await agentsCore.getFullGraph(dbClient_default)({ scopes: { tenantId, projectId, graphId } });
       if (graphConfig?.statusUpdates && graphConfig.statusUpdates.enabled !== false) {
         graphSessionManager.initializeStatusUpdates(
           requestId2,
@@ -8156,8 +8196,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     const body = c.get("requestBody") || {};
     const conversationId = body.conversationId || nanoid.nanoid();
     const fullGraph = await agentsCore.getFullGraph(dbClient_default)({
-      scopes: { tenantId, projectId },
-      graphId
+      scopes: { tenantId, projectId, graphId }
     });
     let agentGraph;
     let defaultAgentId;
@@ -8174,8 +8213,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       defaultAgentId = fullGraph.defaultAgentId || firstAgentId;
     } else {
       agentGraph = await agentsCore.getAgentGraphWithDefaultAgent(dbClient_default)({
-        scopes: { tenantId, projectId },
-        graphId
+        scopes: { tenantId, projectId, graphId }
       });
       if (!agentGraph) {
         return c.json({ error: "Agent graph not found" }, 404);
@@ -8204,7 +8242,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     }
     const agentId = activeAgent?.activeAgentId || defaultAgentId;
     const agentInfo = await agentsCore.getAgentById(dbClient_default)({
-      scopes: { tenantId, projectId },
+      scopes: { tenantId, projectId, graphId },
       agentId
     });
     if (!agentInfo) {
@@ -8212,18 +8250,19 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     }
     const validatedContext = c.get("validatedContext") || body.requestContext || {};
     const credentialStores = c.get("credentialStores");
-    await agentsCore.handleContextResolution(
+    await agentsCore.handleContextResolution({
       tenantId,
       projectId,
-      conversationId,
       graphId,
-      validatedContext,
-      dbClient_default,
+      conversationId,
+      requestContext: validatedContext,
+      dbClient: dbClient_default,
       credentialStores
-    );
+    });
     logger20.info(
       {
         tenantId,
+        projectId,
         graphId,
         conversationId,
         defaultAgentId,
@@ -8366,6 +8405,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
   try {
     const executionContext = agentsCore.getRequestExecutionContext(c);
     const { tenantId, projectId, graphId } = executionContext;
+    agentsCore.loggerFactory.getLogger("chatDataStream").debug({ tenantId, projectId, graphId }, "Extracted chatDataStream parameters");
     const body = c.get("requestBody") || {};
     const conversationId = body.conversationId || nanoid.nanoid();
     const activeSpan = api.trace.getActiveSpan();
@@ -8378,14 +8418,16 @@ app3.openapi(chatDataStreamRoute, async (c) => {
       });
     }
     const agentGraph = await agentsCore.getAgentGraphWithDefaultAgent(dbClient_default)({
-      scopes: { tenantId, projectId },
-      graphId
+      scopes: { tenantId, projectId, graphId }
     });
     if (!agentGraph) {
       return c.json({ error: "Agent graph not found" }, 404);
     }
     const defaultAgentId = agentGraph.defaultAgentId;
     const graphName = agentGraph.name;
+    if (!defaultAgentId) {
+      return c.json({ error: "Graph does not have a default agent configured" }, 400);
+    }
     const activeAgent = await agentsCore.getActiveAgentForConversation(dbClient_default)({
       scopes: { tenantId, projectId },
       conversationId
@@ -8399,7 +8441,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
     }
     const agentId = activeAgent?.activeAgentId || defaultAgentId;
     const agentInfo = await agentsCore.getAgentById(dbClient_default)({
-      scopes: { tenantId, projectId },
+      scopes: { tenantId, projectId, graphId },
       agentId
     });
     if (!agentInfo) {
@@ -8407,15 +8449,15 @@ app3.openapi(chatDataStreamRoute, async (c) => {
     }
     const validatedContext = c.get("validatedContext") || body.requestContext || {};
     const credentialStores = c.get("credentialStores");
-    await agentsCore.handleContextResolution(
+    await agentsCore.handleContextResolution({
       tenantId,
       projectId,
-      conversationId,
       graphId,
-      validatedContext,
-      dbClient_default,
+      conversationId,
+      requestContext: validatedContext,
+      dbClient: dbClient_default,
       credentialStores
-    );
+    });
     const lastUserMessage = body.messages.filter((m) => m.role === "user").slice(-1)[0];
     const userText = typeof lastUserMessage?.content === "string" ? lastUserMessage.content : lastUserMessage?.parts?.map((p) => p.text).join("") || "";
     logger21.info({ userText, lastUserMessage }, "userText");
@@ -8687,8 +8729,7 @@ var getServer = async (requestContext, executionContext, conversationId, credent
   const { tenantId, projectId, graphId } = executionContext;
   setupTracing(conversationId, tenantId, graphId);
   const agentGraph = await agentsCore.getAgentGraphWithDefaultAgent(dbClient_default)({
-    scopes: { tenantId, projectId },
-    graphId
+    scopes: { tenantId, projectId, graphId }
   });
   if (!agentGraph) {
     throw new Error("Agent graph not found");
@@ -8708,9 +8749,20 @@ var getServer = async (requestContext, executionContext, conversationId, credent
     },
     async ({ query }) => {
       try {
+        if (!agentGraph.defaultAgentId) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Graph does not have a default agent configured`
+              }
+            ],
+            isError: true
+          };
+        }
         const defaultAgentId = agentGraph.defaultAgentId;
         const agentInfo = await agentsCore.getAgentById(dbClient_default)({
-          scopes: { tenantId, projectId },
+          scopes: { tenantId, projectId, graphId },
           agentId: defaultAgentId
         });
         if (!agentInfo) {
@@ -8724,18 +8776,19 @@ var getServer = async (requestContext, executionContext, conversationId, credent
             isError: true
           };
         }
-        const resolvedContext = await agentsCore.handleContextResolution(
+        const resolvedContext = await agentsCore.handleContextResolution({
           tenantId,
           projectId,
-          conversationId,
           graphId,
+          conversationId,
           requestContext,
-          dbClient_default,
+          dbClient: dbClient_default,
           credentialStores
-        );
+        });
         logger22.info(
           {
             tenantId,
+            projectId,
             graphId,
             conversationId,
             hasContextConfig: !!agentGraph.contextConfigId,
@@ -8797,8 +8850,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
   logger22.info({ body }, "Received initialization request");
   const sessionId = nanoid.nanoid();
   const agentGraph = await agentsCore.getAgentGraphWithDefaultAgent(dbClient_default)({
-    scopes: { tenantId, projectId },
-    graphId
+    scopes: { tenantId, projectId, graphId }
   });
   if (!agentGraph) {
     return c.json(
@@ -8810,6 +8862,16 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
       { status: 404 }
     );
   }
+  if (!agentGraph.defaultAgentId) {
+    return c.json(
+      {
+        jsonrpc: "2.0",
+        error: { code: -32001, message: "Graph does not have a default agent configured" },
+        id: body.id || null
+      },
+      { status: 400 }
+    );
+  }
   const conversation = await agentsCore.createOrGetConversation(dbClient_default)({
     id: sessionId,
     tenantId,

package/dist/index.js

@@ -8,7 +8,7 @@ import { resourceFromAttributes } from '@opentelemetry/resources';
 import { NodeSDK } from '@opentelemetry/sdk-node';
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
-import { getLogger, getTracer, HeadersScopeSchema, getRequestExecutionContext, getAgentGraphWithDefaultAgent, contextValidationMiddleware, getFullGraph, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getAgentById, handleContextResolution, createMessage, commonGetErrorResponses, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, getAgentGraph, createTask, updateTask, setSpanWithError, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getRelatedAgentsForGraph, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, validateAndGetApiKey, getProject, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getContextConfigById, getFullGraphDefinition, TemplateEngine, graphHasArtifactComponents, MCPTransportType, getExternalAgent } from '@inkeep/agents-core';
+import { getLogger, getTracer, HeadersScopeSchema, getRequestExecutionContext, getAgentGraphWithDefaultAgent, contextValidationMiddleware, getFullGraph, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getAgentById, handleContextResolution, createMessage, commonGetErrorResponses, loggerFactory, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, getAgentGraphById, createTask, updateTask, setSpanWithError, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getRelatedAgentsForGraph, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, validateAndGetApiKey, getProject, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getContextConfigById, getFullGraphDefinition, TemplateEngine, graphHasArtifactComponents, MCPTransportType, getExternalAgent } from '@inkeep/agents-core';
 import { OpenAPIHono, createRoute, z as z$1 } from '@hono/zod-openapi';
 import { trace, propagation, context, SpanStatusCode } from '@opentelemetry/api';
 import { Hono } from 'hono';
@@ -965,7 +965,7 @@ async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
     throw new Error("Agent ID is required");
   }
   const dbAgent = await getAgentById(dbClient_default)({
-    scopes: { tenantId, projectId },
+    scopes: { tenantId, projectId, graphId },
     agentId
   });
   if (!dbAgent) {
@@ -980,6 +980,38 @@ async function getRegisteredAgent(executionContext, credentialStoreRegistry) {
     apiKey
   });
 }
+async function resolveModelConfig(graphId, agent) {
+  if (agent.models?.base?.model) {
+    return {
+      base: agent.models.base,
+      structuredOutput: agent.models.structuredOutput || agent.models.base,
+      summarizer: agent.models.summarizer || agent.models.base
+    };
+  }
+  const graph = await getAgentGraphById(dbClient_default)({
+    scopes: { tenantId: agent.tenantId, projectId: agent.projectId, graphId }
+  });
+  if (graph?.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
+    };
+  }
+  const project = await getProject(dbClient_default)({
+    scopes: { tenantId: agent.tenantId, projectId: agent.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
+    };
+  }
+  throw new Error(
+    "Base model configuration is required. Please configure models at the project level."
+  );
+}
 function agentInitializingOp(sessionId, graphId) {
   return {
     type: "agent_initializing",
@@ -1140,6 +1172,9 @@ var _ModelFactory = class _ModelFactory {
       );
     }
     const modelSettings = config;
+    if (!modelSettings.model) {
+      throw new Error("Model configuration is required");
+    }
     const modelString = modelSettings.model.trim();
     const { provider, modelName } = _ModelFactory.parseModelString(modelString);
     logger5.debug(
@@ -1806,6 +1841,9 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
             }
             modelToUse = this.statusUpdateState.baseModel;
           }
+          if (!modelToUse) {
+            throw new Error("No model configuration available");
+          }
           const model = ModelFactory.createModel(modelToUse);
           const { text } = await generateText({
             model,
@@ -1940,6 +1978,9 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
             }
             modelToUse = this.statusUpdateState.baseModel;
           }
+          if (!modelToUse) {
+            throw new Error("No model configuration available");
+          }
           const model = ModelFactory.createModel(modelToUse);
           const { object } = await generateObject({
             model,
@@ -2230,6 +2271,9 @@ Make it specific and relevant.`;
             }
             modelToUse = this.statusUpdateState.baseModel;
           }
+          if (!modelToUse) {
+            throw new Error("No model configuration available");
+          }
           const model = ModelFactory.createModel(modelToUse);
           const schema = z.object({
             name: z.string().max(50).describe("Concise, descriptive name for the artifact"),
@@ -2508,6 +2552,7 @@ var _ArtifactParser = class _ArtifactParser {
     }
     for (let i = matches.length - 1; i >= 0; i--) {
       const match = matches[i];
+      if (match.index === void 0) continue;
       const startIdx = match.index;
       const textAfterMatch = text.slice(startIdx);
       if (!textAfterMatch.includes("/>")) {
@@ -2575,6 +2620,7 @@ var _ArtifactParser = class _ArtifactParser {
     let lastIndex = 0;
     for (const match of matches) {
       const [fullMatch, artifactId, taskId] = match;
+      if (match.index === void 0) continue;
       const matchStart = match.index;
       if (matchStart > lastIndex) {
         const textBefore = text.slice(lastIndex, matchStart);
@@ -4393,7 +4439,8 @@ function createDelegateToAgentTool({
         const externalAgent = await getExternalAgent(dbClient_default)({
           scopes: {
             tenantId,
-            projectId
+            projectId,
+            graphId
           },
           agentId: delegateConfig.config.id
         });
@@ -5282,8 +5329,12 @@ var Agent = class {
   async getMcpTool(tool4) {
     const credentialReferenceId = tool4.credentialReferenceId;
     const toolsForAgent = await getToolsForAgent(dbClient_default)({
-      scopes: { tenantId: this.config.tenantId, projectId: this.config.projectId },
-      agentId: this.config.id
+      scopes: {
+        tenantId: this.config.tenantId,
+        projectId: this.config.projectId,
+        graphId: this.config.graphId,
+        agentId: this.config.id
+      }
     });
     const selectedTools = toolsForAgent.data.find((t) => t.toolId === tool4.id)?.selectedTools || void 0;
     let serverConfig;
@@ -5430,9 +5481,9 @@ var Agent = class {
       const graphDefinition = await getFullGraphDefinition(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
-          projectId: this.config.projectId
-        },
-        graphId: this.config.graphId
+          projectId: this.config.projectId,
+          graphId: this.config.graphId
+        }
       });
       return graphDefinition?.graphPrompt || void 0;
     } catch (error) {
@@ -5454,14 +5505,16 @@ var Agent = class {
       const graphDefinition = await getFullGraphDefinition(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
-          projectId: this.config.projectId
-        },
-        graphId: this.config.graphId
+          projectId: this.config.projectId,
+          graphId: this.config.graphId
+        }
       });
       if (!graphDefinition) {
         return false;
       }
-      return !!(graphDefinition.artifactComponents && Object.keys(graphDefinition.artifactComponents).length > 0);
+      return Object.values(graphDefinition.agents).some(
+        (agent) => "artifactComponents" in agent && agent.artifactComponents && agent.artifactComponents.length > 0
+      );
     } catch (error) {
       logger15.warn(
         {
@@ -5660,9 +5713,9 @@ Key requirements:
       return await graphHasArtifactComponents(dbClient_default)({
         scopes: {
           tenantId: this.config.tenantId,
-          projectId: this.config.projectId
-        },
-        graphId: this.config.graphId
+          projectId: this.config.projectId,
+          graphId: this.config.graphId
+        }
       });
     } catch (error) {
       logger15.error(
@@ -6140,42 +6193,6 @@ ${output}`;
     });
   }
 };
-async function resolveModelConfig(graphId, agent) {
-  if (agent.models?.base?.model) {
-    return {
-      base: agent.models.base,
-      structuredOutput: agent.models.structuredOutput || agent.models.base,
-      summarizer: agent.models.summarizer || agent.models.base
-    };
-  }
-  let graph = null;
-  if (graphId) {
-    graph = await getAgentGraph(dbClient_default)({
-      scopes: { tenantId: agent.tenantId, projectId: agent.projectId },
-      graphId
-    });
-  }
-  if (graph?.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
-    };
-  }
-  const project = await getProject(dbClient_default)({
-    scopes: { tenantId: agent.tenantId, projectId: agent.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
-    };
-  }
-  throw new Error(
-    "Base model configuration is required. Please configure models at the project level."
-  );
-}
 
 // src/agents/generateTaskHandler.ts
 function parseEmbeddedJson(data) {
@@ -6211,31 +6228,34 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         getRelatedAgentsForGraph(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
+            projectId: config.projectId,
+            graphId: config.graphId
           },
-          graphId: config.graphId,
           agentId: config.agentId
         }),
         getToolsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
-          },
-          agentId: config.agentId
+            projectId: config.projectId,
+            graphId: config.graphId,
+            agentId: config.agentId
+          }
         }),
         getDataComponentsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
-          },
-          agentId: config.agentId
+            projectId: config.projectId,
+            graphId: config.graphId,
+            agentId: config.agentId
+          }
         }),
         getArtifactComponentsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
-            projectId: config.projectId
-          },
-          agentId: config.agentId
+            projectId: config.projectId,
+            graphId: config.graphId,
+            agentId: config.agentId
+          }
         })
       ]);
       logger16.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
@@ -6243,13 +6263,16 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         internalRelations.map(async (relation) => {
           try {
             const relatedAgent = await getAgentById(dbClient_default)({
-              scopes: { tenantId: config.tenantId, projectId: config.projectId },
+              scopes: {
+                tenantId: config.tenantId,
+                projectId: config.projectId,
+                graphId: config.graphId
+              },
               agentId: relation.id
             });
             if (relatedAgent) {
               const relatedAgentRelations = await getRelatedAgentsForGraph(dbClient_default)({
-                scopes: { tenantId: config.tenantId, projectId: config.projectId },
-                graphId: config.graphId,
+                scopes: { tenantId: config.tenantId, projectId: config.projectId, graphId: config.graphId },
                 agentId: relation.id
               });
               const enhancedDescription = generateDescriptionWithTransfers(
@@ -6472,16 +6495,17 @@ var createTaskHandlerConfig = async (params) => {
   const agent = await getAgentById(dbClient_default)({
     scopes: {
       tenantId: params.tenantId,
-      projectId: params.projectId
+      projectId: params.projectId,
+      graphId: params.graphId
     },
     agentId: params.agentId
   });
-  const agentGraph = await getAgentGraph(dbClient_default)({
+  const agentGraph = await getAgentGraphById(dbClient_default)({
     scopes: {
       tenantId: params.tenantId,
-      projectId: params.projectId
-    },
-    graphId: params.graphId
+      projectId: params.projectId,
+      graphId: params.graphId
+    }
   });
   if (!agent) {
     throw new Error(`Agent not found: ${params.agentId}`);
@@ -6520,10 +6544,14 @@ async function hydrateGraph({
   apiKey
 }) {
   try {
+    if (!dbGraph.defaultAgentId) {
+      throw new Error(`Graph ${dbGraph.id} does not have a default agent configured`);
+    }
     const defaultAgent = await getAgentById(dbClient_default)({
       scopes: {
         tenantId: dbGraph.tenantId,
-        projectId: dbGraph.projectId
+        projectId: dbGraph.projectId,
+        graphId: dbGraph.id
       },
       agentId: dbGraph.defaultAgentId
     });
@@ -6578,7 +6606,7 @@ async function hydrateGraph({
 }
 async function getRegisteredGraph(executionContext) {
   const { tenantId, projectId, graphId, baseUrl, apiKey } = executionContext;
-  const dbGraph = await getAgentGraph(dbClient_default)({ scopes: { tenantId, projectId }, graphId });
+  const dbGraph = await getAgentGraphById(dbClient_default)({ scopes: { tenantId, projectId, graphId } });
   if (!dbGraph) {
     return null;
   }
@@ -6636,6 +6664,7 @@ app.openapi(
     );
     const executionContext = getRequestExecutionContext(c);
     const { tenantId, projectId, graphId, agentId } = executionContext;
+    console.dir("executionContext", executionContext);
     if (agentId) {
       logger17.info(
         {
@@ -6723,8 +6752,7 @@ app.post("/a2a", async (c) => {
       "graph-level a2a endpoint"
     );
     const graph = await getAgentGraphWithDefaultAgent(dbClient_default)({
-      scopes: { tenantId, projectId },
-      graphId
+      scopes: { tenantId, projectId, graphId }
     });
     if (!graph) {
       return c.json(
@@ -6736,6 +6764,16 @@ app.post("/a2a", async (c) => {
         404
       );
     }
+    if (!graph.defaultAgentId) {
+      return c.json(
+        {
+          jsonrpc: "2.0",
+          error: { code: -32004, message: "Graph does not have a default agent configured" },
+          id: null
+        },
+        400
+      );
+    }
     executionContext.agentId = graph.defaultAgentId;
     const credentialStores = c.get("credentialStores");
     const defaultAgent = await getRegisteredAgent(executionContext, credentialStores);
@@ -7086,8 +7124,8 @@ var _VercelDataStreamHelper = class _VercelDataStreamHelper {
       });
     } else {
       this.writer.write({
-        type: "error",
-        ...error
+        ...error,
+        type: "error"
       });
     }
   }
@@ -7340,6 +7378,8 @@ var MCPStreamHelper = class {
 function createMCPStreamHelper() {
   return new MCPStreamHelper();
 }
+
+// src/handlers/executionHandler.ts
 var logger19 = getLogger("ExecutionHandler");
 var ExecutionHandler = class {
   constructor() {
@@ -7368,7 +7408,7 @@ var ExecutionHandler = class {
     logger19.info({ sessionId: requestId2, graphId }, "Created GraphSession for message execution");
     let graphConfig = null;
     try {
-      graphConfig = await getFullGraph(dbClient_default)({ scopes: { tenantId, projectId }, graphId });
+      graphConfig = await getFullGraph(dbClient_default)({ scopes: { tenantId, projectId, graphId } });
       if (graphConfig?.statusUpdates && graphConfig.statusUpdates.enabled !== false) {
         graphSessionManager.initializeStatusUpdates(
           requestId2,
@@ -7865,8 +7905,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     const body = c.get("requestBody") || {};
     const conversationId = body.conversationId || nanoid();
     const fullGraph = await getFullGraph(dbClient_default)({
-      scopes: { tenantId, projectId },
-      graphId
+      scopes: { tenantId, projectId, graphId }
     });
     let agentGraph;
     let defaultAgentId;
@@ -7883,8 +7922,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
       defaultAgentId = fullGraph.defaultAgentId || firstAgentId;
     } else {
       agentGraph = await getAgentGraphWithDefaultAgent(dbClient_default)({
-        scopes: { tenantId, projectId },
-        graphId
+        scopes: { tenantId, projectId, graphId }
       });
       if (!agentGraph) {
         return c.json({ error: "Agent graph not found" }, 404);
@@ -7913,7 +7951,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     }
     const agentId = activeAgent?.activeAgentId || defaultAgentId;
     const agentInfo = await getAgentById(dbClient_default)({
-      scopes: { tenantId, projectId },
+      scopes: { tenantId, projectId, graphId },
       agentId
     });
     if (!agentInfo) {
@@ -7921,18 +7959,19 @@ app2.openapi(chatCompletionsRoute, async (c) => {
     }
     const validatedContext = c.get("validatedContext") || body.requestContext || {};
     const credentialStores = c.get("credentialStores");
-    await handleContextResolution(
+    await handleContextResolution({
       tenantId,
       projectId,
-      conversationId,
       graphId,
-      validatedContext,
-      dbClient_default,
+      conversationId,
+      requestContext: validatedContext,
+      dbClient: dbClient_default,
       credentialStores
-    );
+    });
     logger20.info(
       {
         tenantId,
+        projectId,
         graphId,
         conversationId,
         defaultAgentId,
@@ -8072,6 +8111,7 @@ 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 body = c.get("requestBody") || {};
     const conversationId = body.conversationId || nanoid();
     const activeSpan = trace.getActiveSpan();
@@ -8084,14 +8124,16 @@ app3.openapi(chatDataStreamRoute, async (c) => {
       });
     }
     const agentGraph = await getAgentGraphWithDefaultAgent(dbClient_default)({
-      scopes: { tenantId, projectId },
-      graphId
+      scopes: { tenantId, projectId, graphId }
     });
     if (!agentGraph) {
       return c.json({ error: "Agent graph not found" }, 404);
     }
     const defaultAgentId = agentGraph.defaultAgentId;
     const graphName = agentGraph.name;
+    if (!defaultAgentId) {
+      return c.json({ error: "Graph does not have a default agent configured" }, 400);
+    }
     const activeAgent = await getActiveAgentForConversation(dbClient_default)({
       scopes: { tenantId, projectId },
       conversationId
@@ -8105,7 +8147,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
     }
     const agentId = activeAgent?.activeAgentId || defaultAgentId;
     const agentInfo = await getAgentById(dbClient_default)({
-      scopes: { tenantId, projectId },
+      scopes: { tenantId, projectId, graphId },
       agentId
     });
     if (!agentInfo) {
@@ -8113,15 +8155,15 @@ app3.openapi(chatDataStreamRoute, async (c) => {
     }
     const validatedContext = c.get("validatedContext") || body.requestContext || {};
     const credentialStores = c.get("credentialStores");
-    await handleContextResolution(
+    await handleContextResolution({
       tenantId,
       projectId,
-      conversationId,
       graphId,
-      validatedContext,
-      dbClient_default,
+      conversationId,
+      requestContext: validatedContext,
+      dbClient: dbClient_default,
       credentialStores
-    );
+    });
     const lastUserMessage = body.messages.filter((m) => m.role === "user").slice(-1)[0];
     const userText = typeof lastUserMessage?.content === "string" ? lastUserMessage.content : lastUserMessage?.parts?.map((p) => p.text).join("") || "";
     logger21.info({ userText, lastUserMessage }, "userText");
@@ -8390,8 +8432,7 @@ var getServer = async (requestContext, executionContext, conversationId, credent
   const { tenantId, projectId, graphId } = executionContext;
   setupTracing(conversationId, tenantId, graphId);
   const agentGraph = await getAgentGraphWithDefaultAgent(dbClient_default)({
-    scopes: { tenantId, projectId },
-    graphId
+    scopes: { tenantId, projectId, graphId }
   });
   if (!agentGraph) {
     throw new Error("Agent graph not found");
@@ -8411,9 +8452,20 @@ var getServer = async (requestContext, executionContext, conversationId, credent
     },
     async ({ query }) => {
       try {
+        if (!agentGraph.defaultAgentId) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `Graph does not have a default agent configured`
+              }
+            ],
+            isError: true
+          };
+        }
         const defaultAgentId = agentGraph.defaultAgentId;
         const agentInfo = await getAgentById(dbClient_default)({
-          scopes: { tenantId, projectId },
+          scopes: { tenantId, projectId, graphId },
           agentId: defaultAgentId
         });
         if (!agentInfo) {
@@ -8427,18 +8479,19 @@ var getServer = async (requestContext, executionContext, conversationId, credent
             isError: true
           };
         }
-        const resolvedContext = await handleContextResolution(
+        const resolvedContext = await handleContextResolution({
           tenantId,
           projectId,
-          conversationId,
           graphId,
+          conversationId,
           requestContext,
-          dbClient_default,
+          dbClient: dbClient_default,
           credentialStores
-        );
+        });
         logger22.info(
           {
             tenantId,
+            projectId,
             graphId,
             conversationId,
             hasContextConfig: !!agentGraph.contextConfigId,
@@ -8500,8 +8553,7 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
   logger22.info({ body }, "Received initialization request");
   const sessionId = nanoid();
   const agentGraph = await getAgentGraphWithDefaultAgent(dbClient_default)({
-    scopes: { tenantId, projectId },
-    graphId
+    scopes: { tenantId, projectId, graphId }
   });
   if (!agentGraph) {
     return c.json(
@@ -8513,6 +8565,16 @@ var handleInitializationRequest = async (body, executionContext, validatedContex
       { status: 404 }
     );
   }
+  if (!agentGraph.defaultAgentId) {
+    return c.json(
+      {
+        jsonrpc: "2.0",
+        error: { code: -32001, message: "Graph does not have a default agent configured" },
+        id: body.id || null
+      },
+      { status: 400 }
+    );
+  }
   const conversation = await createOrGetConversation(dbClient_default)({
     id: sessionId,
     tenantId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkeep/agents-run-api",
-  "version": "0.0.0-dev-20250919020857",
+  "version": "0.0.0-dev-20250919052931",
   "description": "Agents Run API for Inkeep Agent Framework - handles chat, agent execution, and streaming",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -45,7 +45,7 @@
     "traverse": "^0.6.11",
     "ts-pattern": "^5.7.1",
     "zod": "^4.1.5",
-    "@inkeep/agents-core": "^0.0.0-dev-20250919020857"
+    "@inkeep/agents-core": "^0.0.0-dev-20250919052931"
   },
   "devDependencies": {
     "@hono/vite-dev-server": "^0.20.1",