@inkeep/agents-run-api 0.24.2 → 0.26.0

package/dist/index.cjs

@@ -1485,7 +1485,9 @@ var apiKeyAuth = () => factory.createMiddleware(async (c, next) => {
     if (authHeader?.startsWith("Bearer ")) {
       try {
         executionContext = await extractContextFromApiKey(authHeader.substring(7), baseUrl);
-        executionContext.subAgentId = subAgentId;
+        if (subAgentId) {
+          executionContext.subAgentId = subAgentId;
+        }
         logger2.info({}, "Development/test environment - API key authenticated successfully");
       } catch {
         executionContext = createExecutionContext({
@@ -1549,7 +1551,9 @@ var apiKeyAuth = () => factory.createMiddleware(async (c, next) => {
       return;
     } else if (apiKey) {
       const executionContext = await extractContextFromApiKey(apiKey, baseUrl);
-      executionContext.subAgentId = subAgentId;
+      if (subAgentId) {
+        executionContext.subAgentId = subAgentId;
+      }
       c.set("executionContext", executionContext);
       logger2.info({}, "API key authenticated successfully");
       await next();
@@ -1567,7 +1571,9 @@ var apiKeyAuth = () => factory.createMiddleware(async (c, next) => {
   }
   try {
     const executionContext = await extractContextFromApiKey(apiKey, baseUrl);
-    executionContext.subAgentId = subAgentId;
+    if (subAgentId) {
+      executionContext.subAgentId = subAgentId;
+    }
     c.set("executionContext", executionContext);
     logger2.debug(
       {
@@ -1596,13 +1602,28 @@ var extractContextFromApiKey = async (apiKey, baseUrl) => {
       message: "Invalid or expired API key"
     });
   }
+  const agent = await agentsCore.getAgentById(dbClient_default)({
+    scopes: {
+      tenantId: apiKeyRecord.tenantId,
+      projectId: apiKeyRecord.projectId,
+      agentId: apiKeyRecord.agentId
+    }
+  });
+  if (!agent) {
+    throw new httpException.HTTPException(401, {
+      message: "Invalid or expired API key"
+    });
+  }
+  logger2.info({ agent }, "agent");
+  logger2.info({ defaultSubAgentId: agent.defaultSubAgentId }, "agent.defaultSubAgentId");
   return createExecutionContext({
     apiKey,
     tenantId: apiKeyRecord.tenantId,
     projectId: apiKeyRecord.projectId,
     agentId: apiKeyRecord.agentId,
     apiKeyId: apiKeyRecord.id,
-    baseUrl
+    baseUrl,
+    subAgentId: agent.defaultSubAgentId || void 0
   });
 };
 
@@ -6696,15 +6717,7 @@ function createDelegateToAgentTool({
       const isInternal = delegateConfig.type === "internal";
       let resolvedHeaders = {};
       if (!isInternal) {
-        const externalAgent = await agentsCore.getExternalAgent(dbClient_default)({
-          scopes: {
-            tenantId,
-            projectId,
-            agentId
-          },
-          subAgentId: delegateConfig.config.id
-        });
-        if (externalAgent && (externalAgent.credentialReferenceId || externalAgent.headers) && credentialStoreRegistry) {
+        if ((delegateConfig.config.credentialReferenceId || delegateConfig.config.headers) && credentialStoreRegistry) {
           const contextResolver = new agentsCore.ContextResolver(
             tenantId,
             projectId,
@@ -6720,13 +6733,13 @@ function createDelegateToAgentTool({
             metadata
           };
           let storeReference;
-          if (externalAgent.credentialReferenceId) {
+          if (delegateConfig.config.credentialReferenceId) {
             const credentialReference = await agentsCore.getCredentialReference(dbClient_default)({
               scopes: {
                 tenantId,
                 projectId
               },
-              id: externalAgent.credentialReferenceId
+              id: delegateConfig.config.credentialReferenceId
             });
             if (credentialReference) {
               storeReference = {
@@ -6738,7 +6751,7 @@ function createDelegateToAgentTool({
           resolvedHeaders = await credentialStuffer.getCredentialHeaders({
             context: credentialContext,
             storeReference,
-            headers: externalAgent.headers || void 0
+            headers: delegateConfig.config.headers || void 0
           });
         }
       } else {
@@ -9727,7 +9740,8 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         };
       }
       const [
-        { internalRelations, externalRelations },
+        internalRelations,
+        externalRelations,
         toolsForAgent,
         dataComponents,
         artifactComponents
@@ -9740,6 +9754,14 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           },
           subAgentId: config.subAgentId
         }),
+        agentsCore.getExternalAgentsForSubAgent(dbClient_default)({
+          scopes: {
+            tenantId: config.tenantId,
+            projectId: config.projectId,
+            agentId: config.agentId,
+            subAgentId: config.subAgentId
+          }
+        }),
         agentsCore.getToolsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
@@ -9767,7 +9789,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       ]);
       logger20.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
       const enhancedInternalRelations = await Promise.all(
-        internalRelations.map(async (relation) => {
+        internalRelations.data.map(async (relation) => {
           try {
             const relatedAgent = await agentsCore.getSubAgentById(dbClient_default)({
               scopes: {
@@ -9786,10 +9808,20 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 },
                 subAgentId: relation.id
               });
+              const relatedAgentExternalAgentRelations = await agentsCore.getExternalAgentsForSubAgent(
+                dbClient_default
+              )({
+                scopes: {
+                  tenantId: config.tenantId,
+                  projectId: config.projectId,
+                  agentId: config.agentId,
+                  subAgentId: relation.id
+                }
+              });
               const enhancedDescription = generateDescriptionWithTransfers(
                 relation.description || "",
-                relatedAgentRelations.internalRelations,
-                relatedAgentRelations.externalRelations
+                relatedAgentRelations.data,
+                relatedAgentExternalAgentRelations.data
               );
               return { ...relation, description: enhancedDescription };
             }
@@ -9866,14 +9898,17 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 transferRelations: []
               }
             })),
-            ...externalRelations.map((relation) => ({
+            ...externalRelations.data.map((relation) => ({
               type: "external",
               config: {
                 id: relation.externalAgent.id,
                 name: relation.externalAgent.name,
                 description: relation.externalAgent.description || "",
                 baseUrl: relation.externalAgent.baseUrl,
-                relationType: relation.relationType || void 0
+                headers: relation.headers,
+                credentialReferenceId: relation.externalAgent.credentialReferenceId,
+                relationId: relation.id,
+                relationType: "delegate"
               }
             }))
           ],
@@ -10126,13 +10161,10 @@ function createAgentCard({
   };
 }
 function generateDescriptionWithTransfers(baseDescription, internalRelations, externalRelations) {
-  const transfers = [
-    ...internalRelations.filter((rel) => rel.relationType === "transfer"),
-    ...externalRelations.filter((rel) => rel.relationType === "transfer")
-  ];
+  const transfers = [...internalRelations.filter((rel) => rel.relationType === "transfer")];
   const delegates = [
     ...internalRelations.filter((rel) => rel.relationType === "delegate"),
-    ...externalRelations.filter((rel) => rel.relationType === "delegate")
+    ...externalRelations.map((data) => data.externalAgent)
   ];
   if (transfers.length === 0 && delegates.length === 0) {
     return baseDescription;
@@ -10151,8 +10183,8 @@ ${transferList}`;
   }
   if (delegates.length > 0) {
     const delegateList = delegates.map((rel) => {
-      const name = rel.externalAgent?.name || rel.name;
-      const desc = rel.externalAgent?.description || rel.description || "";
+      const name = rel.name;
+      const desc = rel.description || "";
       return `- ${name}: ${desc}`;
     }).join("\n");
     enhancedDescription += `
@@ -10274,7 +10306,7 @@ app.openapi(
     );
     const executionContext = agentsCore.getRequestExecutionContext(c);
     const { tenantId, projectId, agentId, subAgentId } = executionContext;
-    console.dir("executionContext", executionContext);
+    logger21.info({ executionContext }, "executionContext");
     if (subAgentId) {
       logger21.info(
         {

package/dist/index.js

@@ -4,7 +4,7 @@ import { dbClient_default } from './chunk-IBMWBEXH.js';
 import { env } from './chunk-LHCIBW34.js';
 import { getLogger } from './chunk-A2S7GSHL.js';
 import { __publicField } from './chunk-PKBMQBKP.js';
-import { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullAgent, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, generateId, commonGetErrorResponses, loggerFactory, getDataComponent, getProject, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, upsertLedgerArtifact, createTask, updateTask, setSpanWithError, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getAgentById, getRelatedAgentsForAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, validateAndGetApiKey, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, getContextConfigById, getFullAgentDefinition, TemplateEngine, agentHasArtifactComponents, MCPTransportType, SPAN_KEYS, getExternalAgent } from '@inkeep/agents-core';
+import { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullAgent, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, generateId, commonGetErrorResponses, loggerFactory, getDataComponent, getProject, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, upsertLedgerArtifact, createTask, updateTask, setSpanWithError, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getAgentById, getRelatedAgentsForAgent, getExternalAgentsForSubAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, validateAndGetApiKey, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, getContextConfigById, getFullAgentDefinition, TemplateEngine, agentHasArtifactComponents, MCPTransportType, SPAN_KEYS } 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';
@@ -66,7 +66,9 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
     if (authHeader?.startsWith("Bearer ")) {
       try {
         executionContext = await extractContextFromApiKey(authHeader.substring(7), baseUrl);
-        executionContext.subAgentId = subAgentId;
+        if (subAgentId) {
+          executionContext.subAgentId = subAgentId;
+        }
         logger.info({}, "Development/test environment - API key authenticated successfully");
       } catch {
         executionContext = createExecutionContext({
@@ -130,7 +132,9 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
       return;
     } else if (apiKey) {
       const executionContext = await extractContextFromApiKey(apiKey, baseUrl);
-      executionContext.subAgentId = subAgentId;
+      if (subAgentId) {
+        executionContext.subAgentId = subAgentId;
+      }
       c.set("executionContext", executionContext);
       logger.info({}, "API key authenticated successfully");
       await next();
@@ -148,7 +152,9 @@ var apiKeyAuth = () => createMiddleware(async (c, next) => {
   }
   try {
     const executionContext = await extractContextFromApiKey(apiKey, baseUrl);
-    executionContext.subAgentId = subAgentId;
+    if (subAgentId) {
+      executionContext.subAgentId = subAgentId;
+    }
     c.set("executionContext", executionContext);
     logger.debug(
       {
@@ -177,13 +183,28 @@ var extractContextFromApiKey = async (apiKey, baseUrl) => {
       message: "Invalid or expired API key"
     });
   }
+  const agent = await getAgentById(dbClient_default)({
+    scopes: {
+      tenantId: apiKeyRecord.tenantId,
+      projectId: apiKeyRecord.projectId,
+      agentId: apiKeyRecord.agentId
+    }
+  });
+  if (!agent) {
+    throw new HTTPException(401, {
+      message: "Invalid or expired API key"
+    });
+  }
+  logger.info({ agent }, "agent");
+  logger.info({ defaultSubAgentId: agent.defaultSubAgentId }, "agent.defaultSubAgentId");
   return createExecutionContext({
     apiKey,
     tenantId: apiKeyRecord.tenantId,
     projectId: apiKeyRecord.projectId,
     agentId: apiKeyRecord.agentId,
     apiKeyId: apiKeyRecord.id,
-    baseUrl
+    baseUrl,
+    subAgentId: agent.defaultSubAgentId || void 0
   });
 };
 function setupOpenAPIRoutes(app7) {
@@ -5226,15 +5247,7 @@ function createDelegateToAgentTool({
       const isInternal = delegateConfig.type === "internal";
       let resolvedHeaders = {};
       if (!isInternal) {
-        const externalAgent = await getExternalAgent(dbClient_default)({
-          scopes: {
-            tenantId,
-            projectId,
-            agentId
-          },
-          subAgentId: delegateConfig.config.id
-        });
-        if (externalAgent && (externalAgent.credentialReferenceId || externalAgent.headers) && credentialStoreRegistry) {
+        if ((delegateConfig.config.credentialReferenceId || delegateConfig.config.headers) && credentialStoreRegistry) {
           const contextResolver = new ContextResolver(
             tenantId,
             projectId,
@@ -5250,13 +5263,13 @@ function createDelegateToAgentTool({
             metadata
           };
           let storeReference;
-          if (externalAgent.credentialReferenceId) {
+          if (delegateConfig.config.credentialReferenceId) {
             const credentialReference = await getCredentialReference(dbClient_default)({
               scopes: {
                 tenantId,
                 projectId
               },
-              id: externalAgent.credentialReferenceId
+              id: delegateConfig.config.credentialReferenceId
             });
             if (credentialReference) {
               storeReference = {
@@ -5268,7 +5281,7 @@ function createDelegateToAgentTool({
           resolvedHeaders = await credentialStuffer.getCredentialHeaders({
             context: credentialContext,
             storeReference,
-            headers: externalAgent.headers || void 0
+            headers: delegateConfig.config.headers || void 0
           });
         }
       } else {
@@ -8255,7 +8268,8 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         };
       }
       const [
-        { internalRelations, externalRelations },
+        internalRelations,
+        externalRelations,
         toolsForAgent,
         dataComponents,
         artifactComponents
@@ -8268,6 +8282,14 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           },
           subAgentId: config.subAgentId
         }),
+        getExternalAgentsForSubAgent(dbClient_default)({
+          scopes: {
+            tenantId: config.tenantId,
+            projectId: config.projectId,
+            agentId: config.agentId,
+            subAgentId: config.subAgentId
+          }
+        }),
         getToolsForAgent(dbClient_default)({
           scopes: {
             tenantId: config.tenantId,
@@ -8295,7 +8317,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       ]);
       logger16.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
       const enhancedInternalRelations = await Promise.all(
-        internalRelations.map(async (relation) => {
+        internalRelations.data.map(async (relation) => {
           try {
             const relatedAgent = await getSubAgentById(dbClient_default)({
               scopes: {
@@ -8314,10 +8336,20 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 },
                 subAgentId: relation.id
               });
+              const relatedAgentExternalAgentRelations = await getExternalAgentsForSubAgent(
+                dbClient_default
+              )({
+                scopes: {
+                  tenantId: config.tenantId,
+                  projectId: config.projectId,
+                  agentId: config.agentId,
+                  subAgentId: relation.id
+                }
+              });
               const enhancedDescription = generateDescriptionWithTransfers(
                 relation.description || "",
-                relatedAgentRelations.internalRelations,
-                relatedAgentRelations.externalRelations
+                relatedAgentRelations.data,
+                relatedAgentExternalAgentRelations.data
               );
               return { ...relation, description: enhancedDescription };
             }
@@ -8394,14 +8426,17 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 transferRelations: []
               }
             })),
-            ...externalRelations.map((relation) => ({
+            ...externalRelations.data.map((relation) => ({
               type: "external",
               config: {
                 id: relation.externalAgent.id,
                 name: relation.externalAgent.name,
                 description: relation.externalAgent.description || "",
                 baseUrl: relation.externalAgent.baseUrl,
-                relationType: relation.relationType || void 0
+                headers: relation.headers,
+                credentialReferenceId: relation.externalAgent.credentialReferenceId,
+                relationId: relation.id,
+                relationType: "delegate"
               }
             }))
           ],
@@ -8653,13 +8688,10 @@ function createAgentCard({
   };
 }
 function generateDescriptionWithTransfers(baseDescription, internalRelations, externalRelations) {
-  const transfers = [
-    ...internalRelations.filter((rel) => rel.relationType === "transfer"),
-    ...externalRelations.filter((rel) => rel.relationType === "transfer")
-  ];
+  const transfers = [...internalRelations.filter((rel) => rel.relationType === "transfer")];
   const delegates = [
     ...internalRelations.filter((rel) => rel.relationType === "delegate"),
-    ...externalRelations.filter((rel) => rel.relationType === "delegate")
+    ...externalRelations.map((data) => data.externalAgent)
   ];
   if (transfers.length === 0 && delegates.length === 0) {
     return baseDescription;
@@ -8678,8 +8710,8 @@ ${transferList}`;
   }
   if (delegates.length > 0) {
     const delegateList = delegates.map((rel) => {
-      const name = rel.externalAgent?.name || rel.name;
-      const desc = rel.externalAgent?.description || rel.description || "";
+      const name = rel.name;
+      const desc = rel.description || "";
       return `- ${name}: ${desc}`;
     }).join("\n");
     enhancedDescription += `
@@ -8799,7 +8831,7 @@ app.openapi(
     );
     const executionContext = getRequestExecutionContext(c);
     const { tenantId, projectId, agentId, subAgentId } = executionContext;
-    console.dir("executionContext", executionContext);
+    logger17.info({ executionContext }, "executionContext");
     if (subAgentId) {
       logger17.info(
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkeep/agents-run-api",
-  "version": "0.24.2",
+  "version": "0.26.0",
   "description": "Agents Run API for Inkeep Agent Framework - handles chat, agent execution, and streaming",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -52,7 +52,7 @@
     "traverse": "^0.6.11",
     "ts-pattern": "^5.7.1",
     "zod": "^4.1.11",
-    "@inkeep/agents-core": "^0.24.2"
+    "@inkeep/agents-core": "^0.26.0"
   },
   "optionalDependencies": {
     "keytar": "^7.9.0"
@@ -69,7 +69,7 @@
     "nodemon": "^3.1.0",
     "tsx": "^4.7.1",
     "typescript": "^5.3.3",
-    "vite": "^7.1.4",
+    "vite": "^7.1.11",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.2.4"
   },