@inkeep/agents-run-api 0.33.1 → 0.34.0

package/dist/{chunk-BEMQODJT.js → chunk-7GZGZNDA.js}

@@ -7,7 +7,7 @@ function createDefaultConversationHistoryConfig(mode = "full") {
     mode,
     limit: CONVERSATION_HISTORY_DEFAULT_LIMIT,
     includeInternal: true,
-    messageTypes: ["chat"],
+    messageTypes: ["chat", "tool-result"],
     maxOutputTokens: CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT
   };
 }
@@ -67,29 +67,40 @@ async function getScopedHistory({
       conversationId,
       options
     });
-    if (!filters || !filters.subAgentId && !filters.taskId) {
+    if (!filters || !filters.subAgentId && !filters.taskId && !filters.delegationId && filters.isDelegated === void 0) {
       return messages;
     }
     const relevantMessages = messages.filter((msg) => {
       if (msg.role === "user") return true;
       let matchesAgent = true;
       let matchesTask = true;
+      let matchesDelegation = true;
       if (filters.subAgentId) {
         matchesAgent = msg.role === "agent" && msg.visibility === "user-facing" || msg.toSubAgentId === filters.subAgentId || msg.fromSubAgentId === filters.subAgentId;
       }
       if (filters.taskId) {
         matchesTask = msg.taskId === filters.taskId || msg.a2aTaskId === filters.taskId;
       }
-      if (filters.subAgentId && filters.taskId) {
-        return matchesAgent && matchesTask;
+      if (filters.delegationId !== void 0 || filters.isDelegated !== void 0) {
+        if (msg.messageType === "tool-result") {
+          const messageDelegationId = msg.metadata?.a2a_metadata?.delegationId;
+          const messageIsDelegated = msg.metadata?.a2a_metadata?.isDelegated;
+          if (filters.delegationId) {
+            matchesDelegation = messageDelegationId === filters.delegationId || !messageDelegationId;
+          } else if (filters.isDelegated === false) {
+            matchesDelegation = !messageIsDelegated;
+          } else if (filters.isDelegated === true) {
+            matchesDelegation = messageIsDelegated === true;
+          }
+        }
       }
-      if (filters.subAgentId) {
-        return matchesAgent;
-      }
-      if (filters.taskId) {
-        return matchesTask;
-      }
-      return false;
+      const conditions = [];
+      if (filters.subAgentId) conditions.push(matchesAgent);
+      if (filters.taskId) conditions.push(matchesTask);
+      if (filters.delegationId !== void 0 || filters.isDelegated !== void 0)
+        conditions.push(matchesDelegation);
+      const finalResult = conditions.length === 0 || conditions.every(Boolean);
+      return finalResult;
     });
     return relevantMessages;
   } catch (error) {
@@ -109,10 +120,12 @@ async function getUserFacingHistory(tenantId, projectId, conversationId, limit =
   });
 }
 async function getFullConversationContext(tenantId, projectId, conversationId, maxTokens) {
+  const defaultConfig = createDefaultConversationHistoryConfig();
   return await getConversationHistory(dbClient_default)({
     scopes: { tenantId, projectId },
     conversationId,
     options: {
+      ...defaultConfig,
       limit: 100,
       includeInternal: true,
       maxOutputTokens: maxTokens
@@ -127,7 +140,7 @@ async function getFormattedConversationHistory({
   options,
   filters
 }) {
-  const historyOptions = options ?? { includeInternal: true };
+  const historyOptions = options ?? createDefaultConversationHistoryConfig();
   const conversationHistory = await getScopedHistory({
     tenantId,
     projectId,
@@ -156,6 +169,10 @@ async function getFormattedConversationHistory({
     } else if (msg.role === "agent" && msg.messageType === "chat") {
       const fromSubAgent = msg.fromSubAgentId || "unknown";
       roleLabel = `${fromSubAgent} to User`;
+    } else if (msg.role === "assistant" && msg.messageType === "tool-result") {
+      const fromSubAgent = msg.fromSubAgentId || "unknown";
+      const toolName = msg.metadata?.a2a_metadata?.toolName || "unknown";
+      roleLabel = `${fromSubAgent} tool: ${toolName}`;
     } else {
       roleLabel = msg.role || "system";
     }

package/dist/{conversations-FGU5QUYM.js → conversations-WAUHDR5J.js}

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

package/dist/index.cjs

@@ -34,6 +34,7 @@ var anthropic = require('@ai-sdk/anthropic');
 var gateway = require('@ai-sdk/gateway');
 var google = require('@ai-sdk/google');
 var openai = require('@ai-sdk/openai');
+var openaiCompatible = require('@ai-sdk/openai-compatible');
 var aiSdkProvider = require('@openrouter/ai-sdk-provider');
 var jmespath = require('jmespath');
 var Ajv = require('ajv');
@@ -360,7 +361,7 @@ function createDefaultConversationHistoryConfig(mode = "full") {
     mode,
     limit: CONVERSATION_HISTORY_DEFAULT_LIMIT,
     includeInternal: true,
-    messageTypes: ["chat"],
+    messageTypes: ["chat", "tool-result"],
     maxOutputTokens: agentsCore.CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT
   };
 }
@@ -420,29 +421,40 @@ async function getScopedHistory({
       conversationId,
       options
     });
-    if (!filters || !filters.subAgentId && !filters.taskId) {
+    if (!filters || !filters.subAgentId && !filters.taskId && !filters.delegationId && filters.isDelegated === void 0) {
       return messages;
     }
     const relevantMessages = messages.filter((msg) => {
       if (msg.role === "user") return true;
       let matchesAgent = true;
       let matchesTask = true;
+      let matchesDelegation = true;
       if (filters.subAgentId) {
         matchesAgent = msg.role === "agent" && msg.visibility === "user-facing" || msg.toSubAgentId === filters.subAgentId || msg.fromSubAgentId === filters.subAgentId;
       }
       if (filters.taskId) {
         matchesTask = msg.taskId === filters.taskId || msg.a2aTaskId === filters.taskId;
       }
-      if (filters.subAgentId && filters.taskId) {
-        return matchesAgent && matchesTask;
-      }
-      if (filters.subAgentId) {
-        return matchesAgent;
-      }
-      if (filters.taskId) {
-        return matchesTask;
+      if (filters.delegationId !== void 0 || filters.isDelegated !== void 0) {
+        if (msg.messageType === "tool-result") {
+          const messageDelegationId = msg.metadata?.a2a_metadata?.delegationId;
+          const messageIsDelegated = msg.metadata?.a2a_metadata?.isDelegated;
+          if (filters.delegationId) {
+            matchesDelegation = messageDelegationId === filters.delegationId || !messageDelegationId;
+          } else if (filters.isDelegated === false) {
+            matchesDelegation = !messageIsDelegated;
+          } else if (filters.isDelegated === true) {
+            matchesDelegation = messageIsDelegated === true;
+          }
+        }
       }
-      return false;
+      const conditions = [];
+      if (filters.subAgentId) conditions.push(matchesAgent);
+      if (filters.taskId) conditions.push(matchesTask);
+      if (filters.delegationId !== void 0 || filters.isDelegated !== void 0)
+        conditions.push(matchesDelegation);
+      const finalResult = conditions.length === 0 || conditions.every(Boolean);
+      return finalResult;
     });
     return relevantMessages;
   } catch (error) {
@@ -462,10 +474,12 @@ async function getUserFacingHistory(tenantId, projectId, conversationId, limit =
   });
 }
 async function getFullConversationContext(tenantId, projectId, conversationId, maxTokens) {
+  const defaultConfig2 = createDefaultConversationHistoryConfig();
   return await agentsCore.getConversationHistory(dbClient_default)({
     scopes: { tenantId, projectId },
     conversationId,
     options: {
+      ...defaultConfig2,
       limit: 100,
       includeInternal: true,
       maxOutputTokens: maxTokens
@@ -480,7 +494,7 @@ async function getFormattedConversationHistory({
   options,
   filters
 }) {
-  const historyOptions = options ?? { includeInternal: true };
+  const historyOptions = options ?? createDefaultConversationHistoryConfig();
   const conversationHistory = await getScopedHistory({
     tenantId,
     projectId,
@@ -509,6 +523,10 @@ async function getFormattedConversationHistory({
     } else if (msg.role === "agent" && msg.messageType === "chat") {
       const fromSubAgent = msg.fromSubAgentId || "unknown";
       roleLabel = `${fromSubAgent} to User`;
+    } else if (msg.role === "assistant" && msg.messageType === "tool-result") {
+      const fromSubAgent = msg.fromSubAgentId || "unknown";
+      const toolName = msg.metadata?.a2a_metadata?.toolName || "unknown";
+      roleLabel = `${fromSubAgent} tool: ${toolName}`;
     } else {
       roleLabel = msg.role || "system";
     }
@@ -2561,6 +2579,13 @@ init_logger();
 // src/agents/ModelFactory.ts
 init_logger();
 var logger4 = agentsCore.getLogger("ModelFactory");
+var nimDefault = openaiCompatible.createOpenAICompatible({
+  name: "nim",
+  baseURL: "https://integrate.api.nvidia.com/v1",
+  headers: {
+    Authorization: `Bearer ${process.env.NIM_API_KEY}`
+  }
+});
 var _ModelFactory = class _ModelFactory {
   /**
    * Create a provider instance with custom configuration
@@ -2585,6 +2610,47 @@ var _ModelFactory = class _ModelFactory {
         };
       case "gateway":
         return gateway.createGateway(config);
+      case "nim": {
+        const nimConfig = {
+          name: "nim",
+          baseURL: "https://integrate.api.nvidia.com/v1",
+          headers: {
+            Authorization: `Bearer ${process.env.NIM_API_KEY}`
+          },
+          ...config
+        };
+        return openaiCompatible.createOpenAICompatible(nimConfig);
+      }
+      case "custom": {
+        if (!config.baseURL && !config.baseUrl) {
+          throw new Error(
+            "Custom provider requires baseURL. Please provide it in providerOptions.baseURL or providerOptions.baseUrl"
+          );
+        }
+        const customConfig = {
+          name: "custom",
+          baseURL: config.baseURL || config.baseUrl,
+          headers: {
+            ...process.env.CUSTOM_LLM_API_KEY && {
+              Authorization: `Bearer ${process.env.CUSTOM_LLM_API_KEY}`
+            },
+            ...config.headers || {}
+          },
+          ...config
+        };
+        logger4.info(
+          {
+            config: {
+              baseURL: customConfig.baseURL,
+              hasApiKey: !!process.env.CUSTOM_LLM_API_KEY,
+              apiKeyPrefix: process.env.CUSTOM_LLM_API_KEY?.substring(0, 10) + "...",
+              headers: Object.keys(customConfig.headers || {})
+            }
+          },
+          "Creating custom OpenAI-compatible provider"
+        );
+        return openaiCompatible.createOpenAICompatible(customConfig);
+      }
       default:
         throw new Error(`Unsupported provider: ${provider}`);
     }
@@ -2601,9 +2667,18 @@ var _ModelFactory = class _ModelFactory {
     if (providerOptions.baseUrl || providerOptions.baseURL) {
       providerConfig.baseURL = providerOptions.baseUrl || providerOptions.baseURL;
     }
+    if (providerOptions.headers) {
+      providerConfig.headers = providerOptions.headers;
+    }
     if (providerOptions.gateway) {
       Object.assign(providerConfig, providerOptions.gateway);
     }
+    if (providerOptions.nim) {
+      Object.assign(providerConfig, providerOptions.nim);
+    }
+    if (providerOptions.custom) {
+      Object.assign(providerConfig, providerOptions.custom);
+    }
     return providerConfig;
   }
   /**
@@ -2648,9 +2723,15 @@ var _ModelFactory = class _ModelFactory {
         return aiSdkProvider.openrouter(modelName);
       case "gateway":
         return gateway.gateway(modelName);
+      case "nim":
+        return nimDefault(modelName);
+      case "custom":
+        throw new Error(
+          "Custom provider requires configuration. Please provide baseURL in providerOptions.custom.baseURL or providerOptions.baseURL"
+        );
       default:
         throw new Error(
-          `Unsupported provider: ${provider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id) or Vercel AI Gateway (gateway/model-id).`
+          `Unsupported provider: ${provider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id), Vercel AI Gateway (gateway/model-id), NVIDIA NIM (nim/model-id), or Custom OpenAI-compatible (custom/model-id).`
         );
     }
   }
@@ -2666,7 +2747,7 @@ var _ModelFactory = class _ModelFactory {
       const normalizedProvider = provider.toLowerCase();
       if (!_ModelFactory.BUILT_IN_PROVIDERS.includes(normalizedProvider)) {
         throw new Error(
-          `Unsupported provider: ${normalizedProvider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id) or Vercel AI Gateway (gateway/model-id).`
+          `Unsupported provider: ${normalizedProvider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id), Vercel AI Gateway (gateway/model-id), NVIDIA NIM (nim/model-id), or Custom OpenAI-compatible (custom/model-id).`
         );
       }
       return {
@@ -2685,7 +2766,16 @@ var _ModelFactory = class _ModelFactory {
     if (!providerOptions) {
       return {};
     }
-    const excludedKeys = ["apiKey", "baseURL", "baseUrl", "maxDuration"];
+    const excludedKeys = [
+      "apiKey",
+      "baseURL",
+      "baseUrl",
+      "maxDuration",
+      "headers",
+      "gateway",
+      "nim",
+      "custom"
+    ];
     const params = {};
     for (const [key, value] of Object.entries(providerOptions)) {
       if (!excludedKeys.includes(key) && value !== void 0) {
@@ -2746,7 +2836,9 @@ __publicField(_ModelFactory, "BUILT_IN_PROVIDERS", [
   "openai",
   "google",
   "openrouter",
-  "gateway"
+  "gateway",
+  "nim",
+  "custom"
 ]);
 var ModelFactory = _ModelFactory;
 
@@ -4664,10 +4756,12 @@ var AgentSession = class {
               const conversationHistory = await getFormattedConversationHistory({
                 tenantId: this.tenantId,
                 projectId: this.projectId,
-                conversationId: this.sessionId,
+                conversationId: this.contextId || "default",
                 options: {
                   limit: agentsCore.CONVERSATION_HISTORY_DEFAULT_LIMIT,
-                  maxOutputTokens: agentsCore.CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT
+                  maxOutputTokens: agentsCore.CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT,
+                  includeInternal: true,
+                  messageTypes: ["chat", "tool-result"]
                 },
                 filters: {}
               });
@@ -4787,8 +4881,10 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
             }
           });
           const result = object;
+          logger9.info({ result: JSON.stringify(result) }, "DEBUG: Result");
           const summaries = [];
           for (const [componentId, data] of Object.entries(result)) {
+            logger9.info({ componentId, data: JSON.stringify(data) }, "DEBUG: Component data");
             if (componentId === "no_relevant_updates") {
               continue;
             }
@@ -5355,10 +5451,10 @@ var AgentSessionManager = class {
   /**
    * Initialize status updates for a session
    */
-  initializeStatusUpdates(sessionId, config, summarizerModel) {
+  initializeStatusUpdates(sessionId, config, summarizerModel, baseModel) {
     const session = this.sessions.get(sessionId);
     if (session) {
-      session.initializeStatusUpdates(config, summarizerModel);
+      session.initializeStatusUpdates(config, summarizerModel, baseModel);
     } else {
       logger9.error(
         {
@@ -8594,6 +8690,7 @@ var Agent = class {
     __publicField(this, "streamHelper");
     __publicField(this, "streamRequestId");
     __publicField(this, "conversationId");
+    __publicField(this, "delegationId");
     __publicField(this, "artifactComponents", []);
     __publicField(this, "isDelegatedAgent", false);
     __publicField(this, "contextResolver");
@@ -8731,6 +8828,12 @@ var Agent = class {
   setDelegationStatus(isDelegated) {
     this.isDelegatedAgent = isDelegated;
   }
+  /**
+   * Set delegation ID for this agent instance
+   */
+  setDelegationId(delegationId) {
+    this.delegationId = delegationId;
+  }
   /**
    * Get streaming helper if this agent should stream to user
    * Returns undefined for delegated agents to prevent streaming data operations to user
@@ -8741,7 +8844,7 @@ var Agent = class {
   /**
    * Wraps a tool with streaming lifecycle tracking (start, complete, error) and AgentSession recording
    */
-  wrapToolWithStreaming(toolName, toolDefinition, streamRequestId, toolType) {
+  wrapToolWithStreaming(toolName, toolDefinition, streamRequestId, toolType, relationshipId) {
     if (!toolDefinition || typeof toolDefinition !== "object" || !("execute" in toolDefinition)) {
       return toolDefinition;
     }
@@ -8762,23 +8865,59 @@ var Agent = class {
             "agent.id": this.config.agentId || "unknown"
           });
         }
-        const isInternalTool = toolName.includes("save_tool_result") || toolName.includes("thinking_complete") || toolName.startsWith("transfer_to_") || toolName.startsWith("delegate_to_");
+        const isInternalTool = toolName.includes("save_tool_result") || toolName.includes("thinking_complete") || toolName.startsWith("transfer_to_");
         if (streamRequestId && !isInternalTool) {
           agentSessionManager.recordEvent(streamRequestId, "tool_call", this.config.id, {
             toolName,
             input: args,
-            toolCallId
+            toolCallId,
+            relationshipId
           });
         }
         try {
           const result = await originalExecute(args, context);
           const duration = Date.now() - startTime;
+          const toolResultConversationId = this.getToolResultConversationId();
+          if (streamRequestId && !isInternalTool && toolResultConversationId) {
+            try {
+              const messageId = agentsCore.generateId();
+              const messagePayload = {
+                id: messageId,
+                tenantId: this.config.tenantId,
+                projectId: this.config.projectId,
+                conversationId: toolResultConversationId,
+                role: "assistant",
+                content: {
+                  text: this.formatToolResult(toolName, args, result, toolCallId)
+                },
+                visibility: "internal",
+                messageType: "tool-result",
+                fromSubAgentId: this.config.id,
+                metadata: {
+                  a2a_metadata: {
+                    toolName,
+                    toolCallId,
+                    timestamp: Date.now(),
+                    delegationId: this.delegationId,
+                    isDelegated: this.isDelegatedAgent
+                  }
+                }
+              };
+              await agentsCore.createMessage(dbClient_default)(messagePayload);
+            } catch (error) {
+              logger19.warn(
+                { error, toolName, toolCallId, conversationId: toolResultConversationId },
+                "Failed to store tool result in conversation history"
+              );
+            }
+          }
           if (streamRequestId && !isInternalTool) {
             agentSessionManager.recordEvent(streamRequestId, "tool_result", this.config.id, {
               toolName,
               output: result,
               toolCallId,
-              duration
+              duration,
+              relationshipId
             });
           }
           return result;
@@ -8791,7 +8930,8 @@ var Agent = class {
               output: null,
               toolCallId,
               duration,
-              error: errorMessage
+              error: errorMessage,
+              relationshipId
             });
           }
           throw error;
@@ -8857,22 +8997,24 @@ var Agent = class {
     }) || [];
     const tools = await Promise.all(mcpTools.map((tool3) => this.getMcpTool(tool3)) || []) || [];
     if (!sessionId) {
-      const combinedTools = tools.reduce((acc, tool3) => {
-        return Object.assign(acc, tool3);
-      }, {});
       const wrappedTools2 = {};
-      for (const [toolName, toolDef] of Object.entries(combinedTools)) {
-        wrappedTools2[toolName] = this.wrapToolWithStreaming(
-          toolName,
-          toolDef,
-          streamRequestId,
-          "mcp"
-        );
+      for (const [index, toolSet] of tools.entries()) {
+        const relationshipId = mcpTools[index]?.relationshipId;
+        for (const [toolName, toolDef] of Object.entries(toolSet)) {
+          wrappedTools2[toolName] = this.wrapToolWithStreaming(
+            toolName,
+            toolDef,
+            streamRequestId,
+            "mcp",
+            relationshipId
+          );
+        }
       }
       return wrappedTools2;
     }
     const wrappedTools = {};
-    for (const toolSet of tools) {
+    for (const [index, toolSet] of tools.entries()) {
+      const relationshipId = mcpTools[index]?.relationshipId;
       for (const [toolName, originalTool] of Object.entries(toolSet)) {
         if (!isValidTool(originalTool)) {
           logger19.error({ toolName }, "Invalid MCP tool structure - missing required properties");
@@ -8885,7 +9027,7 @@ var Agent = class {
             logger19.debug({ toolName, toolCallId }, "MCP Tool Called");
             try {
               const rawResult = await originalTool.execute(args, { toolCallId });
-              if (rawResult && typeof rawResult === "object" && "isError" in rawResult && rawResult.isError) {
+              if (rawResult && typeof rawResult === "object" && rawResult.isError) {
                 const errorMessage = rawResult.content?.[0]?.text || "MCP tool returned an error";
                 logger19.error(
                   { toolName, toolCallId, errorMessage, rawResult },
@@ -8906,7 +9048,8 @@ var Agent = class {
                     context: {
                       toolName,
                       toolCallId,
-                      errorMessage
+                      errorMessage,
+                      relationshipId
                     }
                   });
                 }
@@ -8945,7 +9088,8 @@ var Agent = class {
           toolName,
           sessionWrappedTool,
           streamRequestId,
-          "mcp"
+          "mcp",
+          relationshipId
         );
       }
     }
@@ -9570,7 +9714,20 @@ var Agent = class {
    */
   formatToolResult(toolName, args, result, toolCallId) {
     const input = args ? JSON.stringify(args, null, 2) : "No input";
-    const output = typeof result === "string" ? result : JSON.stringify(result, null, 2);
+    let parsedResult = result;
+    if (typeof result === "string") {
+      try {
+        parsedResult = JSON.parse(result);
+      } catch (e) {
+      }
+    }
+    const cleanResult = parsedResult && typeof parsedResult === "object" && !Array.isArray(parsedResult) ? {
+      ...parsedResult,
+      result: parsedResult.result && typeof parsedResult.result === "object" && !Array.isArray(parsedResult.result) ? Object.fromEntries(
+        Object.entries(parsedResult.result).filter(([key]) => key !== "_structureHints")
+      ) : parsedResult.result
+    } : parsedResult;
+    const output = typeof cleanResult === "string" ? cleanResult : JSON.stringify(cleanResult, null, 2);
     return `## Tool: ${toolName}
 
 ### \u{1F527} TOOL_CALL_ID: ${toolCallId}
@@ -9581,6 +9738,13 @@ ${input}
 ### Output
 ${output}`;
   }
+  /**
+   * Get the conversation ID for storing tool results
+   * Always uses the real conversation ID - delegation filtering happens at query time
+   */
+  getToolResultConversationId() {
+    return this.conversationId;
+  }
   /**
    * Analyze tool result structure and add helpful path hints for artifact creation
    * Only adds hints when artifact components are available
@@ -9880,13 +10044,17 @@ ${output}`;
           const historyConfig = this.config.conversationHistoryConfig ?? createDefaultConversationHistoryConfig();
           if (historyConfig && historyConfig.mode !== "none") {
             if (historyConfig.mode === "full") {
+              const filters = {
+                delegationId: this.delegationId,
+                isDelegated: this.isDelegatedAgent
+              };
               conversationHistory = await getFormattedConversationHistory({
                 tenantId: this.config.tenantId,
                 projectId: this.config.projectId,
                 conversationId: contextId,
                 currentMessage: userMessage,
                 options: historyConfig,
-                filters: {}
+                filters
               });
             } else if (historyConfig.mode === "scoped") {
               conversationHistory = await getFormattedConversationHistory({
@@ -9897,7 +10065,9 @@ ${output}`;
                 options: historyConfig,
                 filters: {
                   subAgentId: this.config.id,
-                  taskId
+                  taskId,
+                  delegationId: this.delegationId,
+                  isDelegated: this.isDelegatedAgent
                 }
               });
             }
@@ -10473,7 +10643,6 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           }
         })
       ]);
-      logger20.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
       const enhancedInternalRelations = await Promise.all(
         internalRelations.data.map(async (relation) => {
           try {
@@ -10592,7 +10761,12 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       const stopWhen = "stopWhen" in config.agentSchema ? config.agentSchema.stopWhen : void 0;
       const toolsForAgentResult = await Promise.all(
         toolsForAgent.data.map(async (item) => {
-          const mcpTool = await agentsCore.dbResultToMcpTool(item.tool, dbClient_default, credentialStoreRegistry);
+          const mcpTool = await agentsCore.dbResultToMcpTool(
+            item.tool,
+            dbClient_default,
+            credentialStoreRegistry,
+            item.id
+          );
           if (item.selectedTools && item.selectedTools.length > 0) {
             const selectedToolsSet = new Set(item.selectedTools);
             mcpTool.availableTools = mcpTool.availableTools?.filter((tool3) => selectedToolsSet.has(tool3.name)) || [];
@@ -10674,7 +10848,8 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                   const mcpTool = await agentsCore.dbResultToMcpTool(
                     item.tool,
                     dbClient_default,
-                    credentialStoreRegistry
+                    credentialStoreRegistry,
+                    item.id
                   );
                   if (item.selectedTools && item.selectedTools.length > 0) {
                     const selectedToolsSet = new Set(item.selectedTools);
@@ -10813,10 +10988,12 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       }
       const streamRequestId = task.context?.metadata?.stream_request_id || task.context?.metadata?.streamRequestId;
       const isDelegation = task.context?.metadata?.isDelegation === true;
+      const delegationId = task.context?.metadata?.delegationId;
       agent.setDelegationStatus(isDelegation);
+      agent.setDelegationId(delegationId);
       if (isDelegation) {
         logger20.info(
-          { subAgentId: config.subAgentId, taskId: task.id },
+          { subAgentId: config.subAgentId, taskId: task.id, delegationId },
           "Delegated agent - streaming disabled"
         );
         if (streamRequestId && config.tenantId && config.projectId) {
@@ -10970,7 +11147,7 @@ var createTaskHandlerConfig = async (params) => {
     throw new Error(`Agent not found: ${params.subAgentId}`);
   }
   const effectiveModels = await resolveModelConfig(params.agentId, subAgent);
-  const effectiveConversationHistoryConfig = subAgent.conversationHistoryConfig || { mode: "full" };
+  const effectiveConversationHistoryConfig = subAgent.conversationHistoryConfig;
   return {
     tenantId: params.tenantId,
     projectId: params.projectId,
@@ -11325,40 +11502,16 @@ init_dbClient();
 init_dbClient();
 init_logger();
 function isTransferTask(result) {
-  console.log(
-    "[isTransferTask] Checking result:",
-    JSON.stringify(
-      {
-        hasArtifacts: "artifacts" in result,
-        artifactsLength: result.kind === "task" ? result.artifacts?.length : 0,
-        firstArtifactParts: result.kind === "task" ? result.artifacts?.[0]?.parts?.length : 0,
-        allParts: result.kind === "task" ? result.artifacts?.[0]?.parts?.map((p, i) => ({
-          index: i,
-          kind: p.kind,
-          hasData: !!(p.kind === "data" && p.data),
-          dataType: p.kind === "data" ? p.data?.type : void 0,
-          dataKeys: p.kind === "data" ? Object.keys(p.data) : []
-        })) : []
-      },
-      null,
-      2
-    )
-  );
   if (!("artifacts" in result) || !result.artifacts) {
-    console.log("[isTransferTask] No artifacts found");
     return false;
   }
   const hasTransfer = result.artifacts.some(
     (artifact) => artifact.parts.some((part) => {
       if (part.kind !== "data" || !part.data) return false;
       const isTransfer = typeof part.data === "object" && "type" in part.data && part.data.type === "transfer";
-      if (isTransfer) {
-        console.log("[isTransferTask] Found transfer data:", JSON.stringify(part.data, null, 2));
-      }
       return isTransfer;
     })
   );
-  console.log("[isTransferTask] Result:", hasTransfer);
   return hasTransfer;
 }
 function extractTransferData(task) {
@@ -12020,11 +12173,42 @@ var ExecutionHandler = class {
         scopes: { tenantId, projectId, agentId }
       });
       if (agentConfig?.statusUpdates && agentConfig.statusUpdates.enabled !== false) {
-        agentSessionManager.initializeStatusUpdates(
-          requestId2,
-          agentConfig.statusUpdates,
-          agentConfig.models?.summarizer
-        );
+        try {
+          const agentWithDefault = await agentsCore.getAgentWithDefaultSubAgent(dbClient_default)({
+            scopes: { tenantId, projectId, agentId }
+          });
+          if (agentWithDefault?.defaultSubAgent) {
+            const resolvedModels = await resolveModelConfig(
+              agentId,
+              agentWithDefault.defaultSubAgent
+            );
+            agentSessionManager.initializeStatusUpdates(
+              requestId2,
+              agentConfig.statusUpdates,
+              resolvedModels.summarizer,
+              resolvedModels.base
+            );
+          } else {
+            agentSessionManager.initializeStatusUpdates(
+              requestId2,
+              agentConfig.statusUpdates,
+              agentConfig.models?.summarizer
+            );
+          }
+        } catch (modelError) {
+          logger24.warn(
+            {
+              error: modelError instanceof Error ? modelError.message : "Unknown error",
+              agentId
+            },
+            "Failed to resolve models for status updates, using agent-level config"
+          );
+          agentSessionManager.initializeStatusUpdates(
+            requestId2,
+            agentConfig.statusUpdates,
+            agentConfig.models?.summarizer
+          );
+        }
       }
     } catch (error) {
       logger24.error(

package/dist/index.js

@@ -1,11 +1,11 @@
 import { flushBatchProcessor } from './chunk-H2IQDFCM.js';
-import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-BEMQODJT.js';
+import { getFormattedConversationHistory, createDefaultConversationHistoryConfig, saveA2AMessageResponse } from './chunk-7GZGZNDA.js';
 import { dbClient_default } from './chunk-4HDXSU6S.js';
 import { env } from './chunk-UZXC6MEO.js';
 import { getLogger } from './chunk-A2S7GSHL.js';
 import { STREAM_PARSER_MAX_SNAPSHOT_SIZE, STREAM_PARSER_MAX_STREAMED_SIZE, STREAM_PARSER_MAX_COLLECTED_PARTS, STREAM_BUFFER_MAX_SIZE_BYTES, SESSION_CLEANUP_INTERVAL_MS, STREAM_MAX_LIFETIME_MS, STREAM_TEXT_GAP_THRESHOLD_MS, AGENT_EXECUTION_MAX_CONSECUTIVE_ERRORS, SESSION_TOOL_RESULT_CACHE_TIMEOUT_MS, ARTIFACT_GENERATION_MAX_RETRIES, ARTIFACT_SESSION_MAX_PENDING, STATUS_UPDATE_DEFAULT_INTERVAL_SECONDS, STATUS_UPDATE_DEFAULT_NUM_EVENTS, ARTIFACT_SESSION_MAX_PREVIOUS_SUMMARIES, ARTIFACT_GENERATION_BACKOFF_INITIAL_MS, ARTIFACT_GENERATION_BACKOFF_MAX_MS, AGENT_EXECUTION_MAX_GENERATION_STEPS, FUNCTION_TOOL_SANDBOX_VCPUS_DEFAULT, FUNCTION_TOOL_EXECUTION_TIMEOUT_MS_DEFAULT, LLM_GENERATION_MAX_ALLOWED_TIMEOUT_MS, LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_STREAMING, LLM_GENERATION_FIRST_CALL_TIMEOUT_MS_NON_STREAMING, LLM_GENERATION_SUBSEQUENT_CALL_TIMEOUT_MS, DELEGATION_TOOL_BACKOFF_MAX_ELAPSED_TIME_MS, DELEGATION_TOOL_BACKOFF_EXPONENT, DELEGATION_TOOL_BACKOFF_MAX_INTERVAL_MS, DELEGATION_TOOL_BACKOFF_INITIAL_INTERVAL_MS } from './chunk-IVALDC72.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, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, upsertLedgerArtifact, createTask, updateTask, setSpanWithError, AGENT_EXECUTION_TRANSFER_COUNT_DEFAULT, updateConversation, handleApiError, CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT, CONVERSATION_HISTORY_DEFAULT_LIMIT, TaskState, setActiveAgentForThread, getConversation, getAgentById, getRelatedAgentsForAgent, getExternalAgentsForSubAgent, getTeamAgentsForSubAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, validateAndGetApiKey, verifyServiceToken, validateTargetAgent, getProject, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, getContextConfigById, getFullAgentDefinition, TemplateEngine, agentHasArtifactComponents, MCPTransportType, SPAN_KEYS, headers, generateServiceToken } from '@inkeep/agents-core';
+import { getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentWithDefaultSubAgent, contextValidationMiddleware, getConversationId, getFullAgent, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getSubAgentById, handleContextResolution, createMessage, generateId, commonGetErrorResponses, loggerFactory, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, upsertLedgerArtifact, createTask, updateTask, setSpanWithError, AGENT_EXECUTION_TRANSFER_COUNT_DEFAULT, updateConversation, handleApiError, CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT, CONVERSATION_HISTORY_DEFAULT_LIMIT, TaskState, getAgentById, getProject, setActiveAgentForThread, getConversation, getRelatedAgentsForAgent, getExternalAgentsForSubAgent, getTeamAgentsForSubAgent, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, validateAndGetApiKey, verifyServiceToken, validateTargetAgent, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunctionToolsForSubAgent, getFunction, getContextConfigById, getFullAgentDefinition, TemplateEngine, agentHasArtifactComponents, MCPTransportType, SPAN_KEYS, headers, generateServiceToken } 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';
@@ -22,6 +22,7 @@ import { createAnthropic, anthropic } from '@ai-sdk/anthropic';
 import { createGateway, gateway } from '@ai-sdk/gateway';
 import { createGoogleGenerativeAI, google } from '@ai-sdk/google';
 import { createOpenAI, openai } from '@ai-sdk/openai';
+import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
 import { createOpenRouter, openrouter } from '@openrouter/ai-sdk-provider';
 import jmespath from 'jmespath';
 import Ajv from 'ajv';
@@ -932,6 +933,13 @@ async function handleTasksResubscribe(c, agent, request) {
   }
 }
 var logger3 = getLogger("ModelFactory");
+var nimDefault = createOpenAICompatible({
+  name: "nim",
+  baseURL: "https://integrate.api.nvidia.com/v1",
+  headers: {
+    Authorization: `Bearer ${process.env.NIM_API_KEY}`
+  }
+});
 var _ModelFactory = class _ModelFactory {
   /**
    * Create a provider instance with custom configuration
@@ -956,6 +964,47 @@ var _ModelFactory = class _ModelFactory {
         };
       case "gateway":
         return createGateway(config);
+      case "nim": {
+        const nimConfig = {
+          name: "nim",
+          baseURL: "https://integrate.api.nvidia.com/v1",
+          headers: {
+            Authorization: `Bearer ${process.env.NIM_API_KEY}`
+          },
+          ...config
+        };
+        return createOpenAICompatible(nimConfig);
+      }
+      case "custom": {
+        if (!config.baseURL && !config.baseUrl) {
+          throw new Error(
+            "Custom provider requires baseURL. Please provide it in providerOptions.baseURL or providerOptions.baseUrl"
+          );
+        }
+        const customConfig = {
+          name: "custom",
+          baseURL: config.baseURL || config.baseUrl,
+          headers: {
+            ...process.env.CUSTOM_LLM_API_KEY && {
+              Authorization: `Bearer ${process.env.CUSTOM_LLM_API_KEY}`
+            },
+            ...config.headers || {}
+          },
+          ...config
+        };
+        logger3.info(
+          {
+            config: {
+              baseURL: customConfig.baseURL,
+              hasApiKey: !!process.env.CUSTOM_LLM_API_KEY,
+              apiKeyPrefix: process.env.CUSTOM_LLM_API_KEY?.substring(0, 10) + "...",
+              headers: Object.keys(customConfig.headers || {})
+            }
+          },
+          "Creating custom OpenAI-compatible provider"
+        );
+        return createOpenAICompatible(customConfig);
+      }
       default:
         throw new Error(`Unsupported provider: ${provider}`);
     }
@@ -972,9 +1021,18 @@ var _ModelFactory = class _ModelFactory {
     if (providerOptions.baseUrl || providerOptions.baseURL) {
       providerConfig.baseURL = providerOptions.baseUrl || providerOptions.baseURL;
     }
+    if (providerOptions.headers) {
+      providerConfig.headers = providerOptions.headers;
+    }
     if (providerOptions.gateway) {
       Object.assign(providerConfig, providerOptions.gateway);
     }
+    if (providerOptions.nim) {
+      Object.assign(providerConfig, providerOptions.nim);
+    }
+    if (providerOptions.custom) {
+      Object.assign(providerConfig, providerOptions.custom);
+    }
     return providerConfig;
   }
   /**
@@ -1019,9 +1077,15 @@ var _ModelFactory = class _ModelFactory {
         return openrouter(modelName);
       case "gateway":
         return gateway(modelName);
+      case "nim":
+        return nimDefault(modelName);
+      case "custom":
+        throw new Error(
+          "Custom provider requires configuration. Please provide baseURL in providerOptions.custom.baseURL or providerOptions.baseURL"
+        );
       default:
         throw new Error(
-          `Unsupported provider: ${provider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id) or Vercel AI Gateway (gateway/model-id).`
+          `Unsupported provider: ${provider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id), Vercel AI Gateway (gateway/model-id), NVIDIA NIM (nim/model-id), or Custom OpenAI-compatible (custom/model-id).`
         );
     }
   }
@@ -1037,7 +1101,7 @@ var _ModelFactory = class _ModelFactory {
       const normalizedProvider = provider.toLowerCase();
       if (!_ModelFactory.BUILT_IN_PROVIDERS.includes(normalizedProvider)) {
         throw new Error(
-          `Unsupported provider: ${normalizedProvider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id) or Vercel AI Gateway (gateway/model-id).`
+          `Unsupported provider: ${normalizedProvider}. Supported providers are: ${_ModelFactory.BUILT_IN_PROVIDERS.join(", ")}. To access other models, use OpenRouter (openrouter/model-id), Vercel AI Gateway (gateway/model-id), NVIDIA NIM (nim/model-id), or Custom OpenAI-compatible (custom/model-id).`
         );
       }
       return {
@@ -1056,7 +1120,16 @@ var _ModelFactory = class _ModelFactory {
     if (!providerOptions) {
       return {};
     }
-    const excludedKeys = ["apiKey", "baseURL", "baseUrl", "maxDuration"];
+    const excludedKeys = [
+      "apiKey",
+      "baseURL",
+      "baseUrl",
+      "maxDuration",
+      "headers",
+      "gateway",
+      "nim",
+      "custom"
+    ];
     const params = {};
     for (const [key, value] of Object.entries(providerOptions)) {
       if (!excludedKeys.includes(key) && value !== void 0) {
@@ -1117,7 +1190,9 @@ __publicField(_ModelFactory, "BUILT_IN_PROVIDERS", [
   "openai",
   "google",
   "openrouter",
-  "gateway"
+  "gateway",
+  "nim",
+  "custom"
 ]);
 var ModelFactory = _ModelFactory;
 var logger4 = getLogger("ToolSessionManager");
@@ -3017,10 +3092,12 @@ var AgentSession = class {
               const conversationHistory = await getFormattedConversationHistory({
                 tenantId: this.tenantId,
                 projectId: this.projectId,
-                conversationId: this.sessionId,
+                conversationId: this.contextId || "default",
                 options: {
                   limit: CONVERSATION_HISTORY_DEFAULT_LIMIT,
-                  maxOutputTokens: CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT
+                  maxOutputTokens: CONVERSATION_HISTORY_MAX_OUTPUT_TOKENS_DEFAULT,
+                  includeInternal: true,
+                  messageTypes: ["chat", "tool-result"]
                 },
                 filters: {}
               });
@@ -3140,8 +3217,10 @@ ${this.statusUpdateState?.config.prompt?.trim() || ""}`;
             }
           });
           const result = object;
+          logger8.info({ result: JSON.stringify(result) }, "DEBUG: Result");
           const summaries = [];
           for (const [componentId, data] of Object.entries(result)) {
+            logger8.info({ componentId, data: JSON.stringify(data) }, "DEBUG: Component data");
             if (componentId === "no_relevant_updates") {
               continue;
             }
@@ -3708,10 +3787,10 @@ var AgentSessionManager = class {
   /**
    * Initialize status updates for a session
    */
-  initializeStatusUpdates(sessionId, config, summarizerModel) {
+  initializeStatusUpdates(sessionId, config, summarizerModel, baseModel) {
     const session = this.sessions.get(sessionId);
     if (session) {
-      session.initializeStatusUpdates(config, summarizerModel);
+      session.initializeStatusUpdates(config, summarizerModel, baseModel);
     } else {
       logger8.error(
         {
@@ -6919,6 +6998,7 @@ var Agent = class {
     __publicField(this, "streamHelper");
     __publicField(this, "streamRequestId");
     __publicField(this, "conversationId");
+    __publicField(this, "delegationId");
     __publicField(this, "artifactComponents", []);
     __publicField(this, "isDelegatedAgent", false);
     __publicField(this, "contextResolver");
@@ -7056,6 +7136,12 @@ var Agent = class {
   setDelegationStatus(isDelegated) {
     this.isDelegatedAgent = isDelegated;
   }
+  /**
+   * Set delegation ID for this agent instance
+   */
+  setDelegationId(delegationId) {
+    this.delegationId = delegationId;
+  }
   /**
    * Get streaming helper if this agent should stream to user
    * Returns undefined for delegated agents to prevent streaming data operations to user
@@ -7066,7 +7152,7 @@ var Agent = class {
   /**
    * Wraps a tool with streaming lifecycle tracking (start, complete, error) and AgentSession recording
    */
-  wrapToolWithStreaming(toolName, toolDefinition, streamRequestId, toolType) {
+  wrapToolWithStreaming(toolName, toolDefinition, streamRequestId, toolType, relationshipId) {
     if (!toolDefinition || typeof toolDefinition !== "object" || !("execute" in toolDefinition)) {
       return toolDefinition;
     }
@@ -7087,23 +7173,59 @@ var Agent = class {
             "agent.id": this.config.agentId || "unknown"
           });
         }
-        const isInternalTool = toolName.includes("save_tool_result") || toolName.includes("thinking_complete") || toolName.startsWith("transfer_to_") || toolName.startsWith("delegate_to_");
+        const isInternalTool = toolName.includes("save_tool_result") || toolName.includes("thinking_complete") || toolName.startsWith("transfer_to_");
         if (streamRequestId && !isInternalTool) {
           agentSessionManager.recordEvent(streamRequestId, "tool_call", this.config.id, {
             toolName,
             input: args,
-            toolCallId
+            toolCallId,
+            relationshipId
           });
         }
         try {
           const result = await originalExecute(args, context);
           const duration = Date.now() - startTime;
+          const toolResultConversationId = this.getToolResultConversationId();
+          if (streamRequestId && !isInternalTool && toolResultConversationId) {
+            try {
+              const messageId = generateId();
+              const messagePayload = {
+                id: messageId,
+                tenantId: this.config.tenantId,
+                projectId: this.config.projectId,
+                conversationId: toolResultConversationId,
+                role: "assistant",
+                content: {
+                  text: this.formatToolResult(toolName, args, result, toolCallId)
+                },
+                visibility: "internal",
+                messageType: "tool-result",
+                fromSubAgentId: this.config.id,
+                metadata: {
+                  a2a_metadata: {
+                    toolName,
+                    toolCallId,
+                    timestamp: Date.now(),
+                    delegationId: this.delegationId,
+                    isDelegated: this.isDelegatedAgent
+                  }
+                }
+              };
+              await createMessage(dbClient_default)(messagePayload);
+            } catch (error) {
+              logger15.warn(
+                { error, toolName, toolCallId, conversationId: toolResultConversationId },
+                "Failed to store tool result in conversation history"
+              );
+            }
+          }
           if (streamRequestId && !isInternalTool) {
             agentSessionManager.recordEvent(streamRequestId, "tool_result", this.config.id, {
               toolName,
               output: result,
               toolCallId,
-              duration
+              duration,
+              relationshipId
             });
           }
           return result;
@@ -7116,7 +7238,8 @@ var Agent = class {
               output: null,
               toolCallId,
               duration,
-              error: errorMessage
+              error: errorMessage,
+              relationshipId
             });
           }
           throw error;
@@ -7182,22 +7305,24 @@ var Agent = class {
     }) || [];
     const tools = await Promise.all(mcpTools.map((tool3) => this.getMcpTool(tool3)) || []) || [];
     if (!sessionId) {
-      const combinedTools = tools.reduce((acc, tool3) => {
-        return Object.assign(acc, tool3);
-      }, {});
       const wrappedTools2 = {};
-      for (const [toolName, toolDef] of Object.entries(combinedTools)) {
-        wrappedTools2[toolName] = this.wrapToolWithStreaming(
-          toolName,
-          toolDef,
-          streamRequestId,
-          "mcp"
-        );
+      for (const [index, toolSet] of tools.entries()) {
+        const relationshipId = mcpTools[index]?.relationshipId;
+        for (const [toolName, toolDef] of Object.entries(toolSet)) {
+          wrappedTools2[toolName] = this.wrapToolWithStreaming(
+            toolName,
+            toolDef,
+            streamRequestId,
+            "mcp",
+            relationshipId
+          );
+        }
       }
       return wrappedTools2;
     }
     const wrappedTools = {};
-    for (const toolSet of tools) {
+    for (const [index, toolSet] of tools.entries()) {
+      const relationshipId = mcpTools[index]?.relationshipId;
       for (const [toolName, originalTool] of Object.entries(toolSet)) {
         if (!isValidTool(originalTool)) {
           logger15.error({ toolName }, "Invalid MCP tool structure - missing required properties");
@@ -7210,7 +7335,7 @@ var Agent = class {
             logger15.debug({ toolName, toolCallId }, "MCP Tool Called");
             try {
               const rawResult = await originalTool.execute(args, { toolCallId });
-              if (rawResult && typeof rawResult === "object" && "isError" in rawResult && rawResult.isError) {
+              if (rawResult && typeof rawResult === "object" && rawResult.isError) {
                 const errorMessage = rawResult.content?.[0]?.text || "MCP tool returned an error";
                 logger15.error(
                   { toolName, toolCallId, errorMessage, rawResult },
@@ -7231,7 +7356,8 @@ var Agent = class {
                     context: {
                       toolName,
                       toolCallId,
-                      errorMessage
+                      errorMessage,
+                      relationshipId
                     }
                   });
                 }
@@ -7270,7 +7396,8 @@ var Agent = class {
           toolName,
           sessionWrappedTool,
           streamRequestId,
-          "mcp"
+          "mcp",
+          relationshipId
         );
       }
     }
@@ -7783,7 +7910,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-FGU5QUYM.js');
+    const { getConversationScopedArtifacts } = await import('./conversations-WAUHDR5J.js');
     const historyConfig = this.config.conversationHistoryConfig ?? createDefaultConversationHistoryConfig();
     const referenceArtifacts = await getConversationScopedArtifacts({
       tenantId: this.config.tenantId,
@@ -7895,7 +8022,20 @@ var Agent = class {
    */
   formatToolResult(toolName, args, result, toolCallId) {
     const input = args ? JSON.stringify(args, null, 2) : "No input";
-    const output = typeof result === "string" ? result : JSON.stringify(result, null, 2);
+    let parsedResult = result;
+    if (typeof result === "string") {
+      try {
+        parsedResult = JSON.parse(result);
+      } catch (e) {
+      }
+    }
+    const cleanResult = parsedResult && typeof parsedResult === "object" && !Array.isArray(parsedResult) ? {
+      ...parsedResult,
+      result: parsedResult.result && typeof parsedResult.result === "object" && !Array.isArray(parsedResult.result) ? Object.fromEntries(
+        Object.entries(parsedResult.result).filter(([key]) => key !== "_structureHints")
+      ) : parsedResult.result
+    } : parsedResult;
+    const output = typeof cleanResult === "string" ? cleanResult : JSON.stringify(cleanResult, null, 2);
     return `## Tool: ${toolName}
 
 ### \u{1F527} TOOL_CALL_ID: ${toolCallId}
@@ -7906,6 +8046,13 @@ ${input}
 ### Output
 ${output}`;
   }
+  /**
+   * Get the conversation ID for storing tool results
+   * Always uses the real conversation ID - delegation filtering happens at query time
+   */
+  getToolResultConversationId() {
+    return this.conversationId;
+  }
   /**
    * Analyze tool result structure and add helpful path hints for artifact creation
    * Only adds hints when artifact components are available
@@ -8205,13 +8352,17 @@ ${output}`;
           const historyConfig = this.config.conversationHistoryConfig ?? createDefaultConversationHistoryConfig();
           if (historyConfig && historyConfig.mode !== "none") {
             if (historyConfig.mode === "full") {
+              const filters = {
+                delegationId: this.delegationId,
+                isDelegated: this.isDelegatedAgent
+              };
               conversationHistory = await getFormattedConversationHistory({
                 tenantId: this.config.tenantId,
                 projectId: this.config.projectId,
                 conversationId: contextId,
                 currentMessage: userMessage,
                 options: historyConfig,
-                filters: {}
+                filters
               });
             } else if (historyConfig.mode === "scoped") {
               conversationHistory = await getFormattedConversationHistory({
@@ -8222,7 +8373,9 @@ ${output}`;
                 options: historyConfig,
                 filters: {
                   subAgentId: this.config.id,
-                  taskId
+                  taskId,
+                  delegationId: this.delegationId,
+                  isDelegated: this.isDelegatedAgent
                 }
               });
             }
@@ -8798,7 +8951,6 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
           }
         })
       ]);
-      logger16.info({ toolsForAgent, internalRelations, externalRelations }, "agent stuff");
       const enhancedInternalRelations = await Promise.all(
         internalRelations.data.map(async (relation) => {
           try {
@@ -8917,7 +9069,12 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       const stopWhen = "stopWhen" in config.agentSchema ? config.agentSchema.stopWhen : void 0;
       const toolsForAgentResult = await Promise.all(
         toolsForAgent.data.map(async (item) => {
-          const mcpTool = await dbResultToMcpTool(item.tool, dbClient_default, credentialStoreRegistry);
+          const mcpTool = await dbResultToMcpTool(
+            item.tool,
+            dbClient_default,
+            credentialStoreRegistry,
+            item.id
+          );
           if (item.selectedTools && item.selectedTools.length > 0) {
             const selectedToolsSet = new Set(item.selectedTools);
             mcpTool.availableTools = mcpTool.availableTools?.filter((tool3) => selectedToolsSet.has(tool3.name)) || [];
@@ -8999,7 +9156,8 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
                   const mcpTool = await dbResultToMcpTool(
                     item.tool,
                     dbClient_default,
-                    credentialStoreRegistry
+                    credentialStoreRegistry,
+                    item.id
                   );
                   if (item.selectedTools && item.selectedTools.length > 0) {
                     const selectedToolsSet = new Set(item.selectedTools);
@@ -9138,10 +9296,12 @@ var createTaskHandler = (config, credentialStoreRegistry) => {
       }
       const streamRequestId = task.context?.metadata?.stream_request_id || task.context?.metadata?.streamRequestId;
       const isDelegation = task.context?.metadata?.isDelegation === true;
+      const delegationId = task.context?.metadata?.delegationId;
       agent.setDelegationStatus(isDelegation);
+      agent.setDelegationId(delegationId);
       if (isDelegation) {
         logger16.info(
-          { subAgentId: config.subAgentId, taskId: task.id },
+          { subAgentId: config.subAgentId, taskId: task.id, delegationId },
           "Delegated agent - streaming disabled"
         );
         if (streamRequestId && config.tenantId && config.projectId) {
@@ -9295,7 +9455,7 @@ var createTaskHandlerConfig = async (params) => {
     throw new Error(`Agent not found: ${params.subAgentId}`);
   }
   const effectiveModels = await resolveModelConfig(params.agentId, subAgent);
-  const effectiveConversationHistoryConfig = subAgent.conversationHistoryConfig || { mode: "full" };
+  const effectiveConversationHistoryConfig = subAgent.conversationHistoryConfig;
   return {
     tenantId: params.tenantId,
     projectId: params.projectId,
@@ -9639,40 +9799,16 @@ app.post("/a2a", async (c) => {
 });
 var agents_default = app;
 function isTransferTask(result) {
-  console.log(
-    "[isTransferTask] Checking result:",
-    JSON.stringify(
-      {
-        hasArtifacts: "artifacts" in result,
-        artifactsLength: result.kind === "task" ? result.artifacts?.length : 0,
-        firstArtifactParts: result.kind === "task" ? result.artifacts?.[0]?.parts?.length : 0,
-        allParts: result.kind === "task" ? result.artifacts?.[0]?.parts?.map((p, i) => ({
-          index: i,
-          kind: p.kind,
-          hasData: !!(p.kind === "data" && p.data),
-          dataType: p.kind === "data" ? p.data?.type : void 0,
-          dataKeys: p.kind === "data" ? Object.keys(p.data) : []
-        })) : []
-      },
-      null,
-      2
-    )
-  );
   if (!("artifacts" in result) || !result.artifacts) {
-    console.log("[isTransferTask] No artifacts found");
     return false;
   }
   const hasTransfer = result.artifacts.some(
     (artifact) => artifact.parts.some((part) => {
       if (part.kind !== "data" || !part.data) return false;
       const isTransfer = typeof part.data === "object" && "type" in part.data && part.data.type === "transfer";
-      if (isTransfer) {
-        console.log("[isTransferTask] Found transfer data:", JSON.stringify(part.data, null, 2));
-      }
       return isTransfer;
     })
   );
-  console.log("[isTransferTask] Result:", hasTransfer);
   return hasTransfer;
 }
 function extractTransferData(task) {
@@ -10326,11 +10462,42 @@ var ExecutionHandler = class {
         scopes: { tenantId, projectId, agentId }
       });
       if (agentConfig?.statusUpdates && agentConfig.statusUpdates.enabled !== false) {
-        agentSessionManager.initializeStatusUpdates(
-          requestId2,
-          agentConfig.statusUpdates,
-          agentConfig.models?.summarizer
-        );
+        try {
+          const agentWithDefault = await getAgentWithDefaultSubAgent(dbClient_default)({
+            scopes: { tenantId, projectId, agentId }
+          });
+          if (agentWithDefault?.defaultSubAgent) {
+            const resolvedModels = await resolveModelConfig(
+              agentId,
+              agentWithDefault.defaultSubAgent
+            );
+            agentSessionManager.initializeStatusUpdates(
+              requestId2,
+              agentConfig.statusUpdates,
+              resolvedModels.summarizer,
+              resolvedModels.base
+            );
+          } else {
+            agentSessionManager.initializeStatusUpdates(
+              requestId2,
+              agentConfig.statusUpdates,
+              agentConfig.models?.summarizer
+            );
+          }
+        } catch (modelError) {
+          logger20.warn(
+            {
+              error: modelError instanceof Error ? modelError.message : "Unknown error",
+              agentId
+            },
+            "Failed to resolve models for status updates, using agent-level config"
+          );
+          agentSessionManager.initializeStatusUpdates(
+            requestId2,
+            agentConfig.statusUpdates,
+            agentConfig.models?.summarizer
+          );
+        }
       }
     } catch (error) {
       logger20.error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkeep/agents-run-api",
-  "version": "0.33.1",
+  "version": "0.34.0",
   "description": "Agents Run API for Inkeep Agent Framework - handles chat, agent execution, and streaming",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,6 +18,7 @@
     "@ai-sdk/gateway": "^1.0.23",
     "@ai-sdk/google": "^2.0.14",
     "@ai-sdk/openai": "2.0.11",
+    "@ai-sdk/openai-compatible": "^1.0.27",
     "@ai-sdk/react": "2.0.11",
     "@alcyone-labs/modelcontextprotocol-sdk": "^1.16.0",
     "@hono/node-server": "^1.14.3",
@@ -53,7 +54,7 @@
     "traverse": "^0.6.11",
     "ts-pattern": "^5.7.1",
     "zod": "4.1.5",
-    "@inkeep/agents-core": "^0.33.1"
+    "@inkeep/agents-core": "^0.34.0"
   },
   "optionalDependencies": {
     "keytar": "^7.9.0"