@inkeep/agents-run-api 0.0.0-dev-20251008200151 → 0.0.0-dev-20251009000750

package/dist/index.js

@@ -4,7 +4,7 @@ import { getFormattedConversationHistory, createDefaultConversationHistoryConfig
 import { dbClient_default } from './chunk-7IMXW4RD.js';
 import { env } from './chunk-NZHNG4A3.js';
 import { __publicField } from './chunk-PKBMQBKP.js';
-import { getLogger as getLogger$1, getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentGraphWithDefaultAgent, contextValidationMiddleware, getConversationId, getFullGraph, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getAgentById, handleContextResolution, createMessage, commonGetErrorResponses, loggerFactory, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, upsertLedgerArtifact, getAgentGraphById, createTask, updateTask, setSpanWithError, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getRelatedAgentsForGraph, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, validateAndGetApiKey, getProject, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getContextConfigById, getFullGraphDefinition, TemplateEngine, graphHasArtifactComponents, MCPTransportType, getExternalAgent } from '@inkeep/agents-core';
+import { getLogger as getLogger$1, getTracer, HeadersScopeSchema, getRequestExecutionContext, createApiError, getAgentGraphWithDefaultAgent, contextValidationMiddleware, getConversationId, getFullGraph, createOrGetConversation, getActiveAgentForConversation, setActiveAgentForConversation, getAgentById, handleContextResolution, createMessage, commonGetErrorResponses, loggerFactory, createDefaultCredentialStores, CredentialStoreRegistry, listTaskIdsByContextId, getTask, getLedgerArtifacts, upsertLedgerArtifact, getAgentGraphById, createTask, updateTask, setSpanWithError, updateConversation, handleApiError, TaskState, setActiveAgentForThread, getConversation, getRelatedAgentsForGraph, getToolsForAgent, getDataComponentsForAgent, getArtifactComponentsForAgent, dbResultToMcpTool, validateAndGetApiKey, getProject, ContextResolver, CredentialStuffer, MCPServerType, getCredentialReference, McpClient, getFunction, getContextConfigById, getFullGraphDefinition, TemplateEngine, graphHasArtifactComponents, MCPTransportType, getExternalAgent } from '@inkeep/agents-core';
 import { otel } from '@hono/otel';
 import { OpenAPIHono, createRoute, z as z$1 } from '@hono/zod-openapi';
 import { trace, propagation, context, SpanStatusCode } from '@opentelemetry/api';
@@ -6837,7 +6837,10 @@ var Agent = class {
     ]);
   }
   async getMcpTools(sessionId, streamRequestId) {
-    const tools = await Promise.all(this.config.tools?.map((tool3) => this.getMcpTool(tool3)) || []) || [];
+    const mcpTools = this.config.tools?.filter((tool3) => {
+      return tool3.config?.type === "mcp";
+    }) || [];
+    const tools = await Promise.all(mcpTools.map((tool3) => this.getMcpTool(tool3)) || []) || [];
     if (!sessionId) {
       const combinedTools = tools.reduce((acc, tool3) => {
         return Object.assign(acc, tool3);
@@ -6897,6 +6900,9 @@ var Agent = class {
    * Convert database McpTool to builder MCPToolConfig format
    */
   convertToMCPToolConfig(tool3, agentToolRelationHeaders) {
+    if (tool3.config.type !== "mcp") {
+      throw new Error(`Cannot convert non-MCP tool to MCP config: ${tool3.id}`);
+    }
     return {
       id: tool3.id,
       name: tool3.name,
@@ -6965,6 +6971,9 @@ var Agent = class {
         selectedTools
       );
     } else {
+      if (tool3.config.type !== "mcp") {
+        throw new Error(`Cannot build server config for non-MCP tool: ${tool3.id}`);
+      }
       serverConfig = {
         type: tool3.config.mcp.transport?.type || MCPTransportType.streamableHttp,
         url: tool3.config.mcp.server.url,
@@ -7033,21 +7042,88 @@ var Agent = class {
       throw error;
     }
   }
-  getFunctionTools(streamRequestId) {
-    if (!this.config.functionTools) return {};
+  async getFunctionTools(sessionId, streamRequestId) {
     const functionTools = {};
-    for (const funcTool of this.config.functionTools) {
-      const aiTool = tool({
-        description: funcTool.description,
-        inputSchema: funcTool.schema || z.object({}),
-        execute: funcTool.execute
+    try {
+      const toolsForAgent = await getToolsForAgent(dbClient_default)({
+        scopes: {
+          tenantId: this.config.tenantId || "default",
+          projectId: this.config.projectId || "default",
+          graphId: this.config.graphId,
+          agentId: this.config.id
+        }
       });
-      functionTools[funcTool.name] = this.wrapToolWithStreaming(
-        funcTool.name,
-        aiTool,
-        streamRequestId,
-        "tool"
-      );
+      const toolsData = toolsForAgent.data || [];
+      const functionToolDefs = toolsData.filter((tool3) => tool3.tool.config.type === "function");
+      if (functionToolDefs.length === 0) {
+        return functionTools;
+      }
+      const { LocalSandboxExecutor } = await import('./LocalSandboxExecutor-JI4X2Z3N.js');
+      const sandboxExecutor = LocalSandboxExecutor.getInstance();
+      for (const toolDef of functionToolDefs) {
+        if (toolDef.tool.config?.type === "function") {
+          const functionId = toolDef.tool.functionId;
+          if (!functionId) {
+            logger17.warn({ toolId: toolDef.tool.id }, "Function tool missing functionId reference");
+            continue;
+          }
+          const functionData = await getFunction(dbClient_default)({
+            functionId,
+            scopes: {
+              tenantId: this.config.tenantId || "default",
+              projectId: this.config.projectId || "default"
+            }
+          });
+          if (!functionData) {
+            logger17.warn(
+              { functionId, toolId: toolDef.tool.id },
+              "Function not found in functions table"
+            );
+            continue;
+          }
+          const zodSchema = jsonSchemaToZod(functionData.inputSchema);
+          const aiTool = tool({
+            description: toolDef.tool.description || toolDef.tool.name,
+            inputSchema: zodSchema,
+            execute: async (args, { toolCallId }) => {
+              logger17.debug(
+                { toolName: toolDef.tool.name, toolCallId, args },
+                "Function Tool Called"
+              );
+              try {
+                const result = await sandboxExecutor.executeFunctionTool(toolDef.tool.id, args, {
+                  description: toolDef.tool.description || toolDef.tool.name,
+                  inputSchema: functionData.inputSchema || {},
+                  executeCode: functionData.executeCode,
+                  dependencies: functionData.dependencies || {}
+                });
+                toolSessionManager.recordToolResult(sessionId || "", {
+                  toolCallId,
+                  toolName: toolDef.tool.name,
+                  args,
+                  result,
+                  timestamp: Date.now()
+                });
+                return { result, toolCallId };
+              } catch (error) {
+                logger17.error(
+                  { toolName: toolDef.tool.name, toolCallId, error },
+                  "Function tool execution failed"
+                );
+                throw error;
+              }
+            }
+          });
+          functionTools[toolDef.tool.name] = this.wrapToolWithStreaming(
+            toolDef.tool.name,
+            aiTool,
+            streamRequestId || "",
+            "tool"
+          );
+        }
+      }
+    } catch (error) {
+      logger17.error({ error }, "Failed to load function tools from database");
     }
     return functionTools;
   }
@@ -7241,9 +7317,24 @@ var Agent = class {
     }
     const streamRequestId = runtimeContext?.metadata?.streamRequestId;
     const mcpTools = await this.getMcpTools(void 0, streamRequestId);
-    const functionTools = this.getFunctionTools(streamRequestId);
+    const functionTools = await this.getFunctionTools(streamRequestId || "");
     const relationTools = this.getRelationTools(runtimeContext);
     const allTools = { ...mcpTools, ...functionTools, ...relationTools };
+    logger17.info(
+      {
+        mcpTools: Object.keys(mcpTools),
+        functionTools: Object.keys(functionTools),
+        relationTools: Object.keys(relationTools),
+        allTools: Object.keys(allTools),
+        functionToolsDetails: Object.entries(functionTools).map(([name, tool3]) => ({
+          name,
+          hasExecute: typeof tool3.execute === "function",
+          hasDescription: !!tool3.description,
+          hasInputSchema: !!tool3.inputSchema
+        }))
+      },
+      "Tools loaded for agent"
+    );
     const toolDefinitions = Object.entries(allTools).map(([name, tool3]) => ({
       name,
       description: tool3.description || "",
@@ -7335,7 +7426,7 @@ var Agent = class {
     });
   }
   // Provide a default tool set that is always available to the agent.
-  async getDefaultTools(sessionId, streamRequestId) {
+  async getDefaultTools(_sessionId, streamRequestId) {
     const defaultTools = {};
     if (await this.graphHasArtifactComponents()) {
       defaultTools.get_reference_artifact = this.getArtifactTools();
@@ -7423,13 +7514,19 @@ var Agent = class {
       if (Array.isArray(obj)) {
         obj.slice(0, 3).forEach((item) => {
           if (item && typeof item === "object") {
-            Object.keys(item).forEach((key) => fields.add(key));
+            Object.keys(item).forEach((key) => {
+              fields.add(key);
+            });
           }
         });
       } else if (obj && typeof obj === "object") {
-        Object.keys(obj).forEach((key) => fields.add(key));
+        Object.keys(obj).forEach((key) => {
+          fields.add(key);
+        });
         Object.values(obj).forEach((value) => {
-          findCommonFields(value, depth + 1).forEach((field) => fields.add(field));
+          findCommonFields(value, depth + 1).forEach((field) => {
+            fields.add(field);
+          });
         });
       }
       return fields;
@@ -7613,7 +7710,7 @@ var Agent = class {
                 // Normal prompt with data components
                 this.buildSystemPrompt(runtimeContext, true),
                 // Thinking prompt without data components
-                Promise.resolve(this.getFunctionTools(streamRequestId)),
+                this.getFunctionTools(sessionId, streamRequestId),
                 Promise.resolve(this.getRelationTools(runtimeContext, sessionId)),
                 this.getDefaultTools(sessionId, streamRequestId)
               ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkeep/agents-run-api",
-  "version": "0.0.0-dev-20251008200151",
+  "version": "0.0.0-dev-20251009000750",
   "description": "Agents Run API for Inkeep Agent Framework - handles chat, agent execution, and streaming",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -51,7 +51,7 @@
     "traverse": "^0.6.11",
     "ts-pattern": "^5.7.1",
     "zod": "^4.1.11",
-    "@inkeep/agents-core": "^0.0.0-dev-20251008200151"
+    "@inkeep/agents-core": "^0.0.0-dev-20251009000750"
   },
   "optionalDependencies": {
     "keytar": "^7.9.0"