@inkeep/agents-run-api 0.24.1 → 0.25.0

package/dist/{chunk-T5AYIGCU.js → chunk-XLUE6U2L.js}

@@ -1,6 +1,5 @@
 import { dbClient_default } from './chunk-IBMWBEXH.js';
-import { createMessage, getConversationHistory } from '@inkeep/agents-core';
-import { nanoid } from 'nanoid';
+import { createMessage, generateId, getConversationHistory } from '@inkeep/agents-core';
 
 function createDefaultConversationHistoryConfig(mode = "full") {
   return {
@@ -35,7 +34,7 @@ async function saveA2AMessageResponse(response, params) {
     return null;
   }
   return await createMessage(dbClient_default)({
-    id: nanoid(),
+    id: generateId(),
     tenantId: params.tenantId,
     projectId: params.projectId,
     conversationId: params.conversationId,

package/dist/{conversations-6OGSD67W.js → conversations-H2TSLD3U.js}

@@ -1 +1 @@
-export { createDefaultConversationHistoryConfig, getConversationScopedArtifacts, getFormattedConversationHistory, getFullConversationContext, getScopedHistory, getUserFacingHistory, saveA2AMessageResponse } from './chunk-T5AYIGCU.js';
+export { createDefaultConversationHistoryConfig, getConversationScopedArtifacts, getFormattedConversationHistory, getFullConversationContext, getScopedHistory, getUserFacingHistory, saveA2AMessageResponse } from './chunk-XLUE6U2L.js';

package/dist/index.cjs

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var agentsCore = require('@inkeep/agents-core');
 var z6 = require('zod');
-var nanoid = require('nanoid');
 var child_process = require('child_process');
 var crypto = require('crypto');
 var fs = require('fs');
@@ -192,7 +191,7 @@ async function saveA2AMessageResponse(response, params) {
     return null;
   }
   return await agentsCore.createMessage(dbClient_default)({
-    id: nanoid.nanoid(),
+    id: agentsCore.generateId(),
     tenantId: params.tenantId,
     projectId: params.projectId,
     conversationId: params.conversationId,
@@ -1486,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({
@@ -1550,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();
@@ -1568,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(
       {
@@ -1597,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
   });
 };
 
@@ -1704,7 +1724,7 @@ async function handleMessageSend(c, agent, request) {
     const executionContext = agentsCore.getRequestExecutionContext(c);
     const { agentId } = executionContext;
     const task = {
-      id: nanoid.nanoid(),
+      id: agentsCore.generateId(),
       input: {
         parts: params.message.parts.map((part) => ({
           kind: part.kind,
@@ -1797,7 +1817,7 @@ async function handleMessageSend(c, agent, request) {
       const messageText = params.message.parts.filter((part) => part.kind === "text" && "text" in part && part.text).map((part) => part.text).join(" ");
       try {
         const messageData = {
-          id: nanoid.nanoid(),
+          id: agentsCore.generateId(),
           tenantId: agent.tenantId,
           projectId: agent.projectId,
           conversationId: effectiveContextId,
@@ -1879,7 +1899,7 @@ async function handleMessageSend(c, agent, request) {
             },
             artifacts: [
               {
-                artifactId: nanoid.nanoid(),
+                artifactId: agentsCore.generateId(),
                 parts: [
                   {
                     kind: "data",
@@ -1908,7 +1928,7 @@ async function handleMessageSend(c, agent, request) {
     if (params.configuration?.blocking === false) {
       const taskResponse = {
         id: task.id,
-        contextId: params.message.contextId || nanoid.nanoid(),
+        contextId: params.message.contextId || agentsCore.generateId(),
         status: taskStatus,
         artifacts: result.artifacts,
         kind: "task"
@@ -1920,7 +1940,7 @@ async function handleMessageSend(c, agent, request) {
       });
     }
     const messageResponse = {
-      messageId: nanoid.nanoid(),
+      messageId: agentsCore.generateId(),
       parts: result.artifacts?.[0]?.parts || [
         {
           kind: "text",
@@ -1965,7 +1985,7 @@ async function handleMessageStream(c, agent, request) {
       });
     }
     const task = {
-      id: nanoid.nanoid(),
+      id: agentsCore.generateId(),
       input: {
         parts: params.message.parts.map((part) => ({
           kind: part.kind,
@@ -1986,7 +2006,7 @@ async function handleMessageStream(c, agent, request) {
       try {
         const initialTask = {
           id: task.id,
-          contextId: params.message.contextId || nanoid.nanoid(),
+          contextId: params.message.contextId || agentsCore.generateId(),
           status: {
             state: agentsCore.TaskState.Working,
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
@@ -2034,7 +2054,7 @@ async function handleMessageStream(c, agent, request) {
           }
         }
         const messageResponse = {
-          messageId: nanoid.nanoid(),
+          messageId: agentsCore.generateId(),
           parts: result.artifacts?.[0]?.parts || [
             {
               kind: "text",
@@ -2100,14 +2120,14 @@ async function handleTasksGet(c, _agent, request) {
     const params = request.params;
     const task = {
       id: params.id,
-      contextId: nanoid.nanoid(),
+      contextId: agentsCore.generateId(),
       status: {
         state: agentsCore.TaskState.Completed,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       },
       artifacts: [
         {
-          artifactId: nanoid.nanoid(),
+          artifactId: agentsCore.generateId(),
           parts: [
             {
               kind: "text",
@@ -2206,7 +2226,7 @@ async function handleTasksResubscribe(c, agent, request) {
       try {
         const task = {
           id: params.taskId,
-          contextId: nanoid.nanoid(),
+          contextId: agentsCore.generateId(),
           status: {
             state: agentsCore.TaskState.Completed,
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
@@ -2463,7 +2483,7 @@ var _ToolSessionManager = class _ToolSessionManager {
    * Create a new tool session for an agent execution
    */
   createSession(tenantId, projectId, contextId, taskId) {
-    const sessionId = nanoid.nanoid();
+    const sessionId = agentsCore.generateId();
     return this.createSessionWithId(sessionId, tenantId, projectId, contextId, taskId);
   }
   /**
@@ -5562,7 +5582,7 @@ function errorOp(message, subAgentId, severity = "error", code) {
   };
 }
 function generateToolId() {
-  return `tool_${nanoid.nanoid(8)}`;
+  return `tool_${agentsCore.generateId(8)}`;
 }
 
 // src/utils/artifact-component-schema.ts
@@ -6672,7 +6692,7 @@ function createDelegateToAgentTool({
     description: generateDelegateToolDescription(delegateConfig.config),
     inputSchema: z6__default.default.object({ message: z6__default.default.string() }),
     execute: async (input, context) => {
-      const delegationId = `del_${nanoid.nanoid()}`;
+      const delegationId = `del_${agentsCore.generateId()}`;
       const activeSpan = api.trace.getActiveSpan();
       if (activeSpan) {
         activeSpan.setAttributes({
@@ -6697,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,
@@ -6721,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 = {
@@ -6739,7 +6751,7 @@ function createDelegateToAgentTool({
           resolvedHeaders = await credentialStuffer.getCredentialHeaders({
             context: credentialContext,
             storeReference,
-            headers: externalAgent.headers || void 0
+            headers: delegateConfig.config.headers || void 0
           });
         }
       } else {
@@ -6769,7 +6781,7 @@ function createDelegateToAgentTool({
       const messageToSend = {
         role: "agent",
         parts: [{ text: input.message, kind: "text" }],
-        messageId: nanoid.nanoid(),
+        messageId: agentsCore.generateId(),
         kind: "message",
         contextId,
         metadata: {
@@ -6784,7 +6796,7 @@ function createDelegateToAgentTool({
       };
       logger14.info({ messageToSend }, "messageToSend");
       await agentsCore.createMessage(dbClient_default)({
-        id: nanoid.nanoid(),
+        id: agentsCore.generateId(),
         tenantId,
         projectId,
         conversationId: contextId,
@@ -9728,7 +9740,8 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         };
       }
       const [
-        { internalRelations, externalRelations },
+        internalRelations,
+        externalRelations,
         toolsForAgent,
         dataComponents,
         artifactComponents
@@ -9741,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,
@@ -9768,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: {
@@ -9787,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 };
             }
@@ -9867,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"
               }
             }))
           ],
@@ -9999,7 +10033,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 },
                 artifacts: [
                   {
-                    artifactId: nanoid.nanoid(),
+                    artifactId: agentsCore.generateId(),
                     parts: [
                       {
                         kind: "data",
@@ -10032,7 +10066,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         status: { state: agentsCore.TaskState.Completed },
         artifacts: [
           {
-            artifactId: nanoid.nanoid(),
+            artifactId: agentsCore.generateId(),
             parts
           }
         ]
@@ -10127,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;
@@ -10152,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 += `
@@ -10275,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(
         {
@@ -11375,7 +11406,7 @@ var ExecutionHandler = class {
                 "ai.subAgent.name": currentAgentId
               });
               await agentsCore.createMessage(dbClient_default)({
-                id: nanoid.nanoid(),
+                id: agentsCore.generateId(),
                 tenantId,
                 projectId,
                 conversationId,
@@ -11765,7 +11796,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
         });
       }
       await agentsCore.createMessage(dbClient_default)({
-        id: nanoid.nanoid(),
+        id: agentsCore.generateId(),
         tenantId,
         projectId,
         conversationId,
@@ -11998,7 +12029,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
         });
       }
       await agentsCore.createMessage(dbClient_default)({
-        id: nanoid.nanoid(),
+        id: agentsCore.generateId(),
         tenantId,
         projectId,
         conversationId,
@@ -12454,7 +12485,7 @@ var processUserMessage = async (tenantId, projectId, conversationId, query) => {
     });
   }
   await agentsCore.createMessage(dbClient_default)({
-    id: nanoid.nanoid(),
+    id: agentsCore.generateId(),
     tenantId,
     projectId,
     conversationId,

package/dist/index.js

@@ -1,10 +1,10 @@
 import { flushBatchProcessor } from './chunk-TVLDBLRZ.js';
-import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-T5AYIGCU.js';
+import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-XLUE6U2L.js';
 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, 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';
@@ -16,7 +16,6 @@ import { createMiddleware } from 'hono/factory';
 import { swaggerUI } from '@hono/swagger-ui';
 import z5, { z } from 'zod';
 import { streamSSE, stream } from 'hono/streaming';
-import { nanoid } from 'nanoid';
 import { createUIMessageStream, JsonToSseTransformStream, streamObject, parsePartialJson, generateObject, tool, streamText, generateText } from 'ai';
 import { createAnthropic, anthropic } from '@ai-sdk/anthropic';
 import { createGateway, gateway } from '@ai-sdk/gateway';
@@ -67,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({
@@ -131,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();
@@ -149,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(
       {
@@ -178,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) {
@@ -278,7 +298,7 @@ async function handleMessageSend(c, agent, request) {
     const executionContext = getRequestExecutionContext(c);
     const { agentId } = executionContext;
     const task = {
-      id: nanoid(),
+      id: generateId(),
       input: {
         parts: params.message.parts.map((part) => ({
           kind: part.kind,
@@ -371,7 +391,7 @@ async function handleMessageSend(c, agent, request) {
       const messageText = params.message.parts.filter((part) => part.kind === "text" && "text" in part && part.text).map((part) => part.text).join(" ");
       try {
         const messageData = {
-          id: nanoid(),
+          id: generateId(),
           tenantId: agent.tenantId,
           projectId: agent.projectId,
           conversationId: effectiveContextId,
@@ -453,7 +473,7 @@ async function handleMessageSend(c, agent, request) {
             },
             artifacts: [
               {
-                artifactId: nanoid(),
+                artifactId: generateId(),
                 parts: [
                   {
                     kind: "data",
@@ -482,7 +502,7 @@ async function handleMessageSend(c, agent, request) {
     if (params.configuration?.blocking === false) {
       const taskResponse = {
         id: task.id,
-        contextId: params.message.contextId || nanoid(),
+        contextId: params.message.contextId || generateId(),
         status: taskStatus,
         artifacts: result.artifacts,
         kind: "task"
@@ -494,7 +514,7 @@ async function handleMessageSend(c, agent, request) {
       });
     }
     const messageResponse = {
-      messageId: nanoid(),
+      messageId: generateId(),
       parts: result.artifacts?.[0]?.parts || [
         {
           kind: "text",
@@ -539,7 +559,7 @@ async function handleMessageStream(c, agent, request) {
       });
     }
     const task = {
-      id: nanoid(),
+      id: generateId(),
       input: {
         parts: params.message.parts.map((part) => ({
           kind: part.kind,
@@ -560,7 +580,7 @@ async function handleMessageStream(c, agent, request) {
       try {
         const initialTask = {
           id: task.id,
-          contextId: params.message.contextId || nanoid(),
+          contextId: params.message.contextId || generateId(),
           status: {
             state: TaskState.Working,
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
@@ -608,7 +628,7 @@ async function handleMessageStream(c, agent, request) {
           }
         }
         const messageResponse = {
-          messageId: nanoid(),
+          messageId: generateId(),
           parts: result.artifacts?.[0]?.parts || [
             {
               kind: "text",
@@ -674,14 +694,14 @@ async function handleTasksGet(c, _agent, request) {
     const params = request.params;
     const task = {
       id: params.id,
-      contextId: nanoid(),
+      contextId: generateId(),
       status: {
         state: TaskState.Completed,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       },
       artifacts: [
         {
-          artifactId: nanoid(),
+          artifactId: generateId(),
           parts: [
             {
               kind: "text",
@@ -780,7 +800,7 @@ async function handleTasksResubscribe(c, agent, request) {
       try {
         const task = {
           id: params.taskId,
-          contextId: nanoid(),
+          contextId: generateId(),
           status: {
             state: TaskState.Completed,
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
@@ -1029,7 +1049,7 @@ var _ToolSessionManager = class _ToolSessionManager {
    * Create a new tool session for an agent execution
    */
   createSession(tenantId, projectId, contextId, taskId) {
-    const sessionId = nanoid();
+    const sessionId = generateId();
     return this.createSessionWithId(sessionId, tenantId, projectId, contextId, taskId);
   }
   /**
@@ -4105,7 +4125,7 @@ function errorOp(message, subAgentId, severity = "error", code) {
   };
 }
 function generateToolId() {
-  return `tool_${nanoid(8)}`;
+  return `tool_${generateId(8)}`;
 }
 var logger11 = getLogger("DataComponentSchema");
 function jsonSchemaToZod(jsonSchema) {
@@ -5202,7 +5222,7 @@ function createDelegateToAgentTool({
     description: generateDelegateToolDescription(delegateConfig.config),
     inputSchema: z5.object({ message: z5.string() }),
     execute: async (input, context) => {
-      const delegationId = `del_${nanoid()}`;
+      const delegationId = `del_${generateId()}`;
       const activeSpan = trace.getActiveSpan();
       if (activeSpan) {
         activeSpan.setAttributes({
@@ -5227,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,
@@ -5251,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 = {
@@ -5269,7 +5281,7 @@ function createDelegateToAgentTool({
           resolvedHeaders = await credentialStuffer.getCredentialHeaders({
             context: credentialContext,
             storeReference,
-            headers: externalAgent.headers || void 0
+            headers: delegateConfig.config.headers || void 0
           });
         }
       } else {
@@ -5299,7 +5311,7 @@ function createDelegateToAgentTool({
       const messageToSend = {
         role: "agent",
         parts: [{ text: input.message, kind: "text" }],
-        messageId: nanoid(),
+        messageId: generateId(),
         kind: "message",
         contextId,
         metadata: {
@@ -5314,7 +5326,7 @@ function createDelegateToAgentTool({
       };
       logger13.info({ messageToSend }, "messageToSend");
       await createMessage(dbClient_default)({
-        id: nanoid(),
+        id: generateId(),
         tenantId,
         projectId,
         conversationId: contextId,
@@ -7343,7 +7355,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-6OGSD67W.js');
+    const { getConversationScopedArtifacts } = await import('./conversations-H2TSLD3U.js');
     const historyConfig = this.config.conversationHistoryConfig ?? createDefaultConversationHistoryConfig();
     const referenceArtifacts = await getConversationScopedArtifacts({
       tenantId: this.config.tenantId,
@@ -8256,7 +8268,8 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         };
       }
       const [
-        { internalRelations, externalRelations },
+        internalRelations,
+        externalRelations,
         toolsForAgent,
         dataComponents,
         artifactComponents
@@ -8269,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,
@@ -8296,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: {
@@ -8315,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 };
             }
@@ -8395,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"
               }
             }))
           ],
@@ -8527,7 +8561,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                 },
                 artifacts: [
                   {
-                    artifactId: nanoid(),
+                    artifactId: generateId(),
                     parts: [
                       {
                         kind: "data",
@@ -8560,7 +8594,7 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
         status: { state: TaskState.Completed },
         artifacts: [
           {
-            artifactId: nanoid(),
+            artifactId: generateId(),
             parts
           }
         ]
@@ -8654,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;
@@ -8679,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 += `
@@ -8800,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(
         {
@@ -9889,7 +9920,7 @@ var ExecutionHandler = class {
                 "ai.subAgent.name": currentAgentId
               });
               await createMessage(dbClient_default)({
-                id: nanoid(),
+                id: generateId(),
                 tenantId,
                 projectId,
                 conversationId,
@@ -10278,7 +10309,7 @@ app2.openapi(chatCompletionsRoute, async (c) => {
         });
       }
       await createMessage(dbClient_default)({
-        id: nanoid(),
+        id: generateId(),
         tenantId,
         projectId,
         conversationId,
@@ -10507,7 +10538,7 @@ app3.openapi(chatDataStreamRoute, async (c) => {
         });
       }
       await createMessage(dbClient_default)({
-        id: nanoid(),
+        id: generateId(),
         tenantId,
         projectId,
         conversationId,
@@ -10957,7 +10988,7 @@ var processUserMessage = async (tenantId, projectId, conversationId, query) => {
     });
   }
   await createMessage(dbClient_default)({
-    id: nanoid(),
+    id: generateId(),
     tenantId,
     projectId,
     conversationId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkeep/agents-run-api",
-  "version": "0.24.1",
+  "version": "0.25.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.1"
+    "@inkeep/agents-core": "^0.25.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"
   },