@inkeep/agents-sdk 0.16.3 → 0.18.0

package/dist/index.cjs

@@ -212,7 +212,7 @@ var DataComponent = class {
       "DataComponent constructor initialized"
     );
   }
-  // Set context (tenantId, projectId, and baseURL) from external source (agent, graph, CLI, etc)
+  // Set context (tenantId, projectId, and baseURL) from external source (sub-agent, graph, CLI, etc)
   setContext(tenantId, projectId, baseURL) {
     this.tenantId = tenantId;
     this.projectId = projectId;
@@ -455,16 +455,20 @@ function buildToolManifestFromCodeTS(code, projectRoot = process.cwd()) {
   const warnings = [];
   const dependencies = {};
   for (const pkg of deps) {
-    const v = resolveInstalledVersion(pkg, projectRoot);
-    if (!v) {
-      warnings.push(`Could not resolve version for "${pkg}"`);
-      continue;
-    }
-    if ("unresolved" in v) {
-      warnings.push(`Using range for "${pkg}" -> ${v.range} (no lockfile / not installed)`);
-      dependencies[pkg] = v.range;
-    } else {
-      dependencies[pkg] = v.exact;
+    try {
+      const v = resolveInstalledVersion(pkg, projectRoot);
+      if (!v) {
+        warnings.push(`Could not resolve version for "${pkg}"`);
+        continue;
+      }
+      if ("unresolved" in v) {
+        warnings.push(`Using range for "${pkg}" -> ${v.range} (no lockfile / not installed)`);
+        dependencies[pkg] = v.range;
+      } else {
+        dependencies[pkg] = v.exact;
+      }
+    } catch {
+      dependencies[pkg] = false;
     }
   }
   return { dependencies, warnings };
@@ -480,7 +484,14 @@ var FunctionTool = class {
     this.id = generateIdFromName(config.name);
     if (!config.dependencies) {
       const executeCode = typeof config.execute === "string" ? config.execute : config.execute.toString();
-      this.config.dependencies = getFunctionToolDeps(config.name, executeCode);
+      const deps = getFunctionToolDeps(config.name, executeCode);
+      for (const dep in deps) {
+        if (deps[dep] === false) {
+          delete deps[dep];
+        }
+        throw new Error(`Dependency \x1B[1;32m${dep}\x1B[0m used in function tool \x1B[1;32m${config.name}\x1B[0m is neither installed nor in dependencies object.`);
+      }
+      this.config.dependencies = deps;
     }
     logger4.info(
       {
@@ -717,34 +728,31 @@ function resolveGetter(value) {
   }
   return value;
 }
-var Agent = class {
+var SubAgent = class {
   constructor(config) {
     __publicField(this, "config");
     __publicField(this, "type", "internal");
     __publicField(this, "baseURL");
     __publicField(this, "tenantId");
     __publicField(this, "projectId");
-    __publicField(this, "graphId");
     __publicField(this, "initialized", false);
     this.config = { ...config, type: "internal" };
     this.baseURL = process.env.INKEEP_API_URL || "http://localhost:3002";
     this.tenantId = "default";
     this.projectId = "default";
-    this.graphId = "default";
     logger6.info(
       {
         tenantId: this.tenantId,
-        agentId: this.config.id,
+        subAgentId: this.config.id,
         agentName: config.name
       },
       "Agent constructor initialized"
     );
   }
-  // Set context (tenantId, projectId, graphId, and baseURL) from external source (graph, CLI, etc)
-  setContext(tenantId, projectId, graphId, baseURL) {
+  // Set context (tenantId, projectId, and baseURL) from external source (graph, CLI, etc)
+  setContext(tenantId, projectId, baseURL) {
     this.tenantId = tenantId;
     this.projectId = projectId;
-    this.graphId = graphId;
     if (baseURL) {
       this.baseURL = baseURL;
     }
@@ -884,7 +892,7 @@ var Agent = class {
       await this.saveArtifactComponents();
       logger6.info(
         {
-          agentId: this.getId()
+          subAgentId: this.getId()
         },
         "Agent initialized successfully"
       );
@@ -892,7 +900,7 @@ var Agent = class {
     } catch (error) {
       logger6.error(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           error: error instanceof Error ? error.message : "Unknown error"
         },
         "Failed to initialize agent"
@@ -924,7 +932,7 @@ var Agent = class {
     if (updateResponse.ok) {
       logger6.info(
         {
-          agentId: this.getId()
+          subAgentId: this.getId()
         },
         "Agent updated successfully"
       );
@@ -933,7 +941,7 @@ var Agent = class {
     if (updateResponse.status === 404) {
       logger6.info(
         {
-          agentId: this.getId()
+          subAgentId: this.getId()
         },
         "Agent not found, creating new agent"
       );
@@ -952,7 +960,7 @@ var Agent = class {
       }
       logger6.info(
         {
-          agentId: this.getId()
+          subAgentId: this.getId()
         },
         "Agent created successfully"
       );
@@ -1059,7 +1067,7 @@ var Agent = class {
       this.config.dataComponents = () => uniqueComponents;
       logger6.info(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           dbComponentCount: dbDataComponents.length,
           configComponentCount: configComponents.length,
           totalComponentCount: uniqueComponents.length
@@ -1069,7 +1077,7 @@ var Agent = class {
     } catch (error) {
       logger6.error(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           error: error instanceof Error ? error.message : "Unknown error"
         },
         "Failed to load data components from database"
@@ -1116,7 +1124,7 @@ var Agent = class {
       this.config.artifactComponents = () => uniqueComponents;
       logger6.info(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           dbComponentCount: dbArtifactComponents.length,
           configComponentCount: configComponents.length,
           totalComponentCount: uniqueComponents.length
@@ -1126,7 +1134,7 @@ var Agent = class {
     } catch (error) {
       logger6.error(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           error: error instanceof Error ? error.message : "Unknown error"
         },
         "Failed to load artifact components from database"
@@ -1260,7 +1268,7 @@ var Agent = class {
       if (toolConfig.type === "function") {
         logger6.info(
           {
-            agentId: this.getId(),
+            subAgentId: this.getId(),
             toolId
           },
           "Skipping function tool creation - will be handled at runtime"
@@ -1292,7 +1300,7 @@ var Agent = class {
       await this.createAgentToolRelation(tool.getId(), selectedTools, headers);
       logger6.info(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           toolId: tool.getId()
         },
         "Tool created and linked to agent"
@@ -1300,7 +1308,7 @@ var Agent = class {
     } catch (error) {
       logger6.error(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           toolId,
           error: error instanceof Error ? error.message : "Unknown error"
         },
@@ -1322,7 +1330,7 @@ var Agent = class {
       await this.createAgentDataComponentRelation(dc.getId());
       logger6.info(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           dataComponentId: dc.getId()
         },
         "DataComponent created and linked to agent"
@@ -1330,7 +1338,7 @@ var Agent = class {
     } catch (error) {
       logger6.error(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           dataComponentName: dataComponent2.name,
           error: error instanceof Error ? error.message : "Unknown error"
         },
@@ -1352,7 +1360,7 @@ var Agent = class {
       await this.createAgentArtifactComponentRelation(ac.getId());
       logger6.info(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           artifactComponentId: ac.getId()
         },
         "ArtifactComponent created and linked to agent"
@@ -1360,7 +1368,7 @@ var Agent = class {
     } catch (error) {
       logger6.error(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           artifactComponentName: artifactComponent2.name,
           error: error instanceof Error ? error.message : "Unknown error"
         },
@@ -1380,7 +1388,7 @@ var Agent = class {
         body: JSON.stringify({
           id: `${this.getId()}-dc-${dataComponentId}`,
           tenantId: this.tenantId,
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           dataComponentId
         })
       }
@@ -1392,7 +1400,7 @@ var Agent = class {
     }
     logger6.info(
       {
-        agentId: this.getId(),
+        subAgentId: this.getId(),
         dataComponentId
       },
       "Created agent-dataComponent relation"
@@ -1409,7 +1417,7 @@ var Agent = class {
         body: JSON.stringify({
           id: crypto.randomUUID(),
           tenantId: this.tenantId,
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           artifactComponentId
         })
       }
@@ -1421,7 +1429,7 @@ var Agent = class {
     }
     logger6.info(
       {
-        agentId: this.getId(),
+        subAgentId: this.getId(),
         artifactComponentId
       },
       "Created agent-artifactComponent relation"
@@ -1432,7 +1440,7 @@ var Agent = class {
       id: `${this.getId()}-tool-${toolId}`,
       tenantId: this.tenantId,
       projectId: this.projectId,
-      agentId: this.getId(),
+      subAgentId: this.getId(),
       toolId
     };
     if (selectedTools !== void 0) {
@@ -1520,9 +1528,9 @@ function resolveGetter2(value) {
 }
 var AgentGraph = class {
   constructor(config) {
-    __publicField(this, "agents", []);
+    __publicField(this, "subAgents", []);
     __publicField(this, "agentMap", /* @__PURE__ */ new Map());
-    __publicField(this, "defaultAgent");
+    __publicField(this, "defaultSubAgent");
     __publicField(this, "baseURL");
     __publicField(this, "tenantId");
     __publicField(this, "projectId");
@@ -1538,7 +1546,7 @@ var AgentGraph = class {
     __publicField(this, "graphPrompt");
     __publicField(this, "stopWhen");
     __publicField(this, "dbClient");
-    this.defaultAgent = config.defaultAgent;
+    this.defaultSubAgent = config.defaultSubAgent;
     this.tenantId = "default";
     this.projectId = "default";
     this.graphId = config.id;
@@ -1557,11 +1565,11 @@ var AgentGraph = class {
     this.stopWhen = config.stopWhen ? {
       transferCountIs: config.stopWhen.transferCountIs
     } : void 0;
-    this.agents = resolveGetter2(config.agents) || [];
-    this.agentMap = new Map(this.agents.map((agent2) => [agent2.getId(), agent2]));
-    if (this.defaultAgent) {
-      this.agents.push(this.defaultAgent);
-      this.agentMap.set(this.defaultAgent.getId(), this.defaultAgent);
+    this.subAgents = resolveGetter2(config.subAgents) || [];
+    this.agentMap = new Map(this.subAgents.map((agent) => [agent.getId(), agent]));
+    if (this.defaultSubAgent) {
+      this.subAgents.push(this.defaultSubAgent);
+      this.agentMap.set(this.defaultSubAgent.getId(), this.defaultSubAgent);
     }
     if (this.models) {
       this.propagateImmediateModelSettings();
@@ -1570,8 +1578,8 @@ var AgentGraph = class {
       {
         graphId: this.graphId,
         tenantId: this.tenantId,
-        agentCount: this.agents.length,
-        defaultAgent: this.defaultAgent?.getName()
+        agentCount: this.subAgents.length,
+        defaultSubAgent: this.defaultSubAgent?.getName()
       },
       "AgentGraph created"
     );
@@ -1587,9 +1595,9 @@ var AgentGraph = class {
     this.tenantId = tenantId;
     this.projectId = projectId;
     this.baseURL = apiUrl;
-    for (const agent2 of this.agents) {
-      if (this.isInternalAgent(agent2)) {
-        const internalAgent = agent2;
+    for (const agent of this.subAgents) {
+      if (this.isInternalAgent(agent)) {
+        const internalAgent = agent;
         if (internalAgent.setContext) {
           internalAgent.setContext(tenantId, projectId, apiUrl);
         }
@@ -1602,7 +1610,7 @@ var AgentGraph = class {
           }
         }
       } else {
-        const externalAgent2 = agent2;
+        const externalAgent2 = agent;
         if (externalAgent2.setContext) {
           externalAgent2.setContext(tenantId, apiUrl);
         }
@@ -1626,9 +1634,11 @@ var AgentGraph = class {
    */
   async toFullGraphDefinition() {
     const agentsObject = {};
-    for (const agent2 of this.agents) {
-      if (this.isInternalAgent(agent2)) {
-        const internalAgent = agent2;
+    const functionToolsObject = {};
+    const functionsObject = {};
+    for (const agent of this.subAgents) {
+      if (this.isInternalAgent(agent)) {
+        const internalAgent = agent;
         const transfers = internalAgent.getTransfers();
         const delegates = internalAgent.getDelegates();
         const tools = [];
@@ -1644,19 +1654,36 @@ var AgentGraph = class {
             headersMapping[toolId] = toolInstance.headers;
           }
           tools.push(toolId);
+          if (toolInstance.constructor.name === "FunctionTool" && toolInstance instanceof FunctionTool) {
+            if (!functionsObject[toolId]) {
+              const functionData = toolInstance.serializeFunction();
+              functionsObject[toolId] = functionData;
+            }
+            if (!functionToolsObject[toolId]) {
+              const toolData = toolInstance.serializeTool();
+              functionToolsObject[toolId] = {
+                id: toolData.id,
+                name: toolData.name,
+                description: toolData.description,
+                functionId: toolData.functionId,
+                graphId: this.graphId
+                // Include graphId for graph-scoped function tools
+              };
+            }
+          }
         }
         const dataComponents = [];
-        const agentDataComponents = internalAgent.getDataComponents();
-        if (agentDataComponents) {
-          for (const dataComponent2 of agentDataComponents) {
+        const subAgentDataComponents = internalAgent.getDataComponents();
+        if (subAgentDataComponents) {
+          for (const dataComponent2 of subAgentDataComponents) {
             const dataComponentId = dataComponent2.id || dataComponent2.name.toLowerCase().replace(/\s+/g, "-");
             dataComponents.push(dataComponentId);
           }
         }
         const artifactComponents = [];
-        const agentArtifactComponents = internalAgent.getArtifactComponents();
-        if (agentArtifactComponents) {
-          for (const artifactComponent2 of agentArtifactComponents) {
+        const subAgentArtifactComponents = internalAgent.getArtifactComponents();
+        if (subAgentArtifactComponents) {
+          for (const artifactComponent2 of subAgentArtifactComponents) {
             const artifactComponentId = artifactComponent2.id || artifactComponent2.name.toLowerCase().replace(/\s+/g, "-");
             artifactComponents.push(artifactComponentId);
           }
@@ -1681,7 +1708,7 @@ var AgentGraph = class {
           type: "internal"
         };
       } else {
-        const externalAgent2 = agent2;
+        const externalAgent2 = agent;
         agentsObject[externalAgent2.getId()] = {
           id: externalAgent2.getId(),
           name: externalAgent2.getName(),
@@ -1697,9 +1724,11 @@ var AgentGraph = class {
       id: this.graphId,
       name: this.graphName,
       description: this.graphDescription,
-      defaultAgentId: this.defaultAgent?.getId() || "",
-      agents: agentsObject,
+      defaultSubAgentId: this.defaultSubAgent?.getId() || "",
+      subAgents: agentsObject,
       contextConfig: this.contextConfig?.toObject(),
+      ...Object.keys(functionToolsObject).length > 0 && { functionTools: functionToolsObject },
+      ...Object.keys(functionsObject).length > 0 && { functions: functionsObject },
       models: this.models,
       statusUpdates: this.statusUpdateSettings,
       graphPrompt: this.graphPrompt,
@@ -1713,11 +1742,11 @@ var AgentGraph = class {
   async initializeAllTools() {
     logger8.info({ graphId: this.graphId }, "Initializing all tools in graph");
     const toolInitPromises = [];
-    for (const agent2 of this.agents) {
-      if (!agent2.getTools) {
+    for (const agent of this.subAgents) {
+      if (!agent.getTools) {
         continue;
       }
-      const internalAgent = agent2;
+      const internalAgent = agent;
       const agentTools = internalAgent.getTools();
       for (const [toolName, toolInstance] of Object.entries(agentTools)) {
         if (toolInstance && typeof toolInstance === "object") {
@@ -1737,7 +1766,7 @@ var AgentGraph = class {
                   }
                   logger8.debug(
                     {
-                      agentId: agent2.getId(),
+                      subAgentId: agent.getId(),
                       toolName,
                       toolType: toolInstance.constructor.name,
                       skipDbRegistration
@@ -1747,7 +1776,7 @@ var AgentGraph = class {
                 } catch (error) {
                   logger8.error(
                     {
-                      agentId: agent2.getId(),
+                      subAgentId: agent.getId(),
                       toolName,
                       error: error instanceof Error ? error.message : "Unknown error"
                     },
@@ -1778,7 +1807,7 @@ var AgentGraph = class {
     logger8.info(
       {
         graphId: this.graphId,
-        agentCount: this.agents.length
+        agentCount: this.subAgents.length
       },
       "Initializing agent graph using new graph endpoint"
     );
@@ -1832,7 +1861,7 @@ var AgentGraph = class {
     logger8.info(
       {
         graphId: this.graphId,
-        agentCount: this.agents.length
+        agentCount: this.subAgents.length
       },
       "Initializing agent graph"
     );
@@ -1847,13 +1876,13 @@ var AgentGraph = class {
           "Context configuration initialized for graph"
         );
       }
-      const initPromises = this.agents.map(async (agent2) => {
+      const initPromises = this.subAgents.map(async (agent) => {
         try {
-          agent2.config.graphId = this.graphId;
-          await agent2.init();
+          agent.config.graphId = this.graphId;
+          await agent.init();
           logger8.debug(
             {
-              agentId: agent2.getId(),
+              subAgentId: agent.getId(),
               graphId: this.graphId
             },
             "Agent initialized in graph"
@@ -1861,7 +1890,7 @@ var AgentGraph = class {
         } catch (error) {
           logger8.error(
             {
-              agentId: agent2.getId(),
+              subAgentId: agent.getId(),
               graphId: this.graphId,
               error: error instanceof Error ? error.message : "Unknown error"
             },
@@ -1879,7 +1908,7 @@ var AgentGraph = class {
       logger8.info(
         {
           graphId: this.graphId,
-          agentCount: this.agents.length
+          agentCount: this.subAgents.length
         },
         "Agent graph initialized successfully"
       );
@@ -1899,13 +1928,13 @@ var AgentGraph = class {
    */
   async generate(input, options) {
     await this._init();
-    if (!this.defaultAgent) {
+    if (!this.defaultSubAgent) {
       throw new Error("No default agent configured for this graph");
     }
     logger8.info(
       {
         graphId: this.graphId,
-        defaultAgent: this.defaultAgent.getName(),
+        defaultSubAgent: this.defaultSubAgent.getName(),
         conversationId: options?.conversationId
       },
       "Generating response with default agent"
@@ -1918,13 +1947,13 @@ var AgentGraph = class {
    */
   async stream(input, options) {
     await this._init();
-    if (!this.defaultAgent) {
+    if (!this.defaultSubAgent) {
       throw new Error("No default agent configured for this graph");
     }
     logger8.info(
       {
         graphId: this.graphId,
-        defaultAgent: this.defaultAgent.getName(),
+        defaultSubAgent: this.defaultSubAgent.getName(),
         conversationId: options?.conversationId
       },
       "Streaming response with default agent"
@@ -1949,21 +1978,21 @@ var AgentGraph = class {
   /**
    * Run with a specific agent from the graph
    */
-  async runWith(agentId, input, options) {
+  async runWith(subAgentId, input, options) {
     await this._init();
-    const agent2 = this.getAgent(agentId);
-    if (!agent2) {
-      throw new Error(`Agent '${agentId}' not found in graph`);
+    const agent = this.getAgent(subAgentId);
+    if (!agent) {
+      throw new Error(`Agent '${subAgentId}' not found in graph`);
     }
-    if (!this.isInternalAgent(agent2)) {
+    if (!this.isInternalAgent(agent)) {
       throw new Error(
-        `Agent '${agentId}' is an external agent and cannot be run directly. External agents are only accessible via delegation.`
+        `Agent '${subAgentId}' is an external agent and cannot be run directly. External agents are only accessible via delegation.`
       );
     }
     logger8.info(
       {
         graphId: this.graphId,
-        agentId,
+        subAgentId,
         conversationId: options?.conversationId
       },
       "Running with specific agent"
@@ -1971,7 +2000,7 @@ var AgentGraph = class {
     const response = await this.executeWithBackend(input, options);
     return {
       finalOutput: response,
-      agent: agent2,
+      agent,
       turnCount: 1,
       usage: { inputTokens: 0, outputTokens: 0 },
       metadata: {
@@ -1989,17 +2018,17 @@ var AgentGraph = class {
   /**
    * Add an agent to the graph
    */
-  addAgent(agent2) {
-    this.agents.push(agent2);
-    this.agentMap.set(agent2.getId(), agent2);
-    if (this.models && this.isInternalAgent(agent2)) {
-      this.propagateModelSettingsToAgent(agent2);
+  addSubAgent(agent) {
+    this.subAgents.push(agent);
+    this.agentMap.set(agent.getId(), agent);
+    if (this.models && this.isInternalAgent(agent)) {
+      this.propagateModelSettingsToAgent(agent);
     }
     logger8.info(
       {
         graphId: this.graphId,
-        agentId: agent2.getId(),
-        agentType: this.isInternalAgent(agent2) ? "internal" : "external"
+        subAgentId: agent.getId(),
+        agentType: this.isInternalAgent(agent) ? "internal" : "external"
       },
       "Agent added to graph"
     );
@@ -2007,15 +2036,15 @@ var AgentGraph = class {
   /**
    * Remove an agent from the graph
    */
-  removeAgent(id) {
+  removeSubAgent(id) {
     const agentToRemove = this.agentMap.get(id);
     if (agentToRemove) {
       this.agentMap.delete(agentToRemove.getId());
-      this.agents = this.agents.filter((agent2) => agent2.getId() !== agentToRemove.getId());
+      this.subAgents = this.subAgents.filter((agent) => agent.getId() !== agentToRemove.getId());
       logger8.info(
         {
           graphId: this.graphId,
-          agentId: agentToRemove.getId()
+          subAgentId: agentToRemove.getId()
         },
         "Agent removed from graph"
       );
@@ -2026,25 +2055,25 @@ var AgentGraph = class {
   /**
    * Get all agents in the graph
    */
-  getAgents() {
-    return this.agents;
+  getSubAgents() {
+    return this.subAgents;
   }
   /**
    * Get all agent ids (unified method for all agent types)
    */
-  getAgentIds() {
+  getSubAgentIds() {
     return Array.from(this.agentMap.keys());
   }
   /**
    * Set the default agent
    */
-  setDefaultAgent(agent2) {
-    this.defaultAgent = agent2;
-    this.addAgent(agent2);
+  setdefaultSubAgent(agent) {
+    this.defaultSubAgent = agent;
+    this.addSubAgent(agent);
     logger8.info(
       {
         graphId: this.graphId,
-        defaultAgent: agent2.getId()
+        defaultSubAgent: agent.getId()
       },
       "Default agent updated"
     );
@@ -2052,8 +2081,8 @@ var AgentGraph = class {
   /**
    * Get the default agent
    */
-  getDefaultAgent() {
-    return this.defaultAgent;
+  getdefaultSubAgent() {
+    return this.defaultSubAgent;
   }
   /**
    * Get the graph ID
@@ -2111,8 +2140,8 @@ var AgentGraph = class {
    */
   getStats() {
     return {
-      agentCount: this.agents.length,
-      defaultAgent: this.defaultAgent?.getName() || null,
+      agentCount: this.subAgents.length,
+      defaultSubAgent: this.defaultSubAgent?.getName() || null,
       initialized: this.initialized,
       graphId: this.graphId,
       tenantId: this.tenantId
@@ -2123,35 +2152,35 @@ var AgentGraph = class {
    */
   validate() {
     const errors = [];
-    if (this.agents.length === 0) {
+    if (this.subAgents.length === 0) {
       errors.push("Graph must contain at least one agent");
     }
-    if (!this.defaultAgent) {
+    if (!this.defaultSubAgent) {
       errors.push("Graph must have a default agent");
     }
     const names = /* @__PURE__ */ new Set();
-    for (const agent2 of this.agents) {
-      const name = agent2.getName();
+    for (const agent of this.subAgents) {
+      const name = agent.getName();
       if (names.has(name)) {
         errors.push(`Duplicate agent name: ${name}`);
       }
       names.add(name);
     }
-    for (const agent2 of this.agents) {
-      if (!this.isInternalAgent(agent2)) continue;
-      const transfers = agent2.getTransfers();
+    for (const agent of this.subAgents) {
+      if (!this.isInternalAgent(agent)) continue;
+      const transfers = agent.getTransfers();
       for (const transferAgent of transfers) {
         if (!this.agentMap.has(transferAgent.getName())) {
           errors.push(
-            `Agent '${agent2.getName()}' has transfer to '${transferAgent.getName()}' which is not in the graph`
+            `Agent '${agent.getName()}' has transfer to '${transferAgent.getName()}' which is not in the graph`
           );
         }
       }
-      const delegates = agent2.getDelegates();
+      const delegates = agent.getDelegates();
       for (const delegateAgent of delegates) {
         if (!this.agentMap.has(delegateAgent.getName())) {
           errors.push(
-            `Agent '${agent2.getName()}' has delegation to '${delegateAgent.getName()}' which is not in the graph`
+            `Agent '${agent.getName()}' has delegation to '${delegateAgent.getName()}' which is not in the graph`
           );
         }
       }
@@ -2170,8 +2199,8 @@ var AgentGraph = class {
   /**
    * Type guard to check if an agent is an internal AgentInterface
    */
-  isInternalAgent(agent2) {
-    return "getTransfers" in agent2 && typeof agent2.getTransfers === "function";
+  isInternalAgent(agent) {
+    return "getTransfers" in agent && typeof agent.getTransfers === "function";
   }
   /**
    * Get project-level model settingsuration defaults
@@ -2235,9 +2264,9 @@ var AgentGraph = class {
       }
     }
     await this.applyStopWhenInheritance();
-    for (const agent2 of this.agents) {
-      if (this.isInternalAgent(agent2)) {
-        this.propagateModelSettingsToAgent(agent2);
+    for (const agent of this.subAgents) {
+      if (this.isInternalAgent(agent)) {
+        this.propagateModelSettingsToAgent(agent);
       }
     }
   }
@@ -2256,9 +2285,9 @@ var AgentGraph = class {
       this.stopWhen.transferCountIs = 10;
     }
     if (projectStopWhen?.stepCountIs !== void 0) {
-      for (const agent2 of this.agents) {
-        if (this.isInternalAgent(agent2)) {
-          const internalAgent = agent2;
+      for (const agent of this.subAgents) {
+        if (this.isInternalAgent(agent)) {
+          const internalAgent = agent;
           if (!internalAgent.config.stopWhen) {
             internalAgent.config.stopWhen = {};
           }
@@ -2280,19 +2309,19 @@ var AgentGraph = class {
   /**
    * Propagate graph-level model settings to agents (supporting partial inheritance)
    */
-  propagateModelSettingsToAgent(agent2) {
+  propagateModelSettingsToAgent(agent) {
     if (this.models) {
-      if (!agent2.config.models) {
-        agent2.config.models = {};
+      if (!agent.config.models) {
+        agent.config.models = {};
       }
-      if (!agent2.config.models.base && this.models.base) {
-        agent2.config.models.base = this.models.base;
+      if (!agent.config.models.base && this.models.base) {
+        agent.config.models.base = this.models.base;
       }
-      if (!agent2.config.models.structuredOutput && this.models.structuredOutput) {
-        agent2.config.models.structuredOutput = this.models.structuredOutput;
+      if (!agent.config.models.structuredOutput && this.models.structuredOutput) {
+        agent.config.models.structuredOutput = this.models.structuredOutput;
       }
-      if (!agent2.config.models.summarizer && this.models.summarizer) {
-        agent2.config.models.summarizer = this.models.summarizer;
+      if (!agent.config.models.summarizer && this.models.summarizer) {
+        agent.config.models.summarizer = this.models.summarizer;
       }
     }
   }
@@ -2300,17 +2329,17 @@ var AgentGraph = class {
    * Immediately propagate graph-level models to all agents during construction
    */
   propagateImmediateModelSettings() {
-    for (const agent2 of this.agents) {
-      if (this.isInternalAgent(agent2)) {
-        this.propagateModelSettingsToAgent(agent2);
+    for (const agent of this.subAgents) {
+      if (this.isInternalAgent(agent)) {
+        this.propagateModelSettingsToAgent(agent);
       }
     }
   }
   /**
    * Type guard to check if an agent is an external AgentInterface
    */
-  isExternalAgent(agent2) {
-    return !this.isInternalAgent(agent2);
+  isExternalAgent(agent) {
+    return !this.isInternalAgent(agent);
   }
   /**
    * Execute agent using the backend system instead of local runner
@@ -2423,7 +2452,7 @@ var AgentGraph = class {
         body: JSON.stringify({
           id: this.graphId,
           name: this.graphName,
-          defaultAgentId: this.defaultAgent?.getId() || "",
+          defaultSubAgentId: this.defaultSubAgent?.getId() || "",
           contextConfigId: this.contextConfig?.getId(),
           models: this.models
         })
@@ -2441,7 +2470,7 @@ var AgentGraph = class {
     }
   }
   async saveRelations() {
-    if (this.defaultAgent) {
+    if (this.defaultSubAgent) {
       try {
         const updateUrl = `${this.baseURL}/tenants/${this.tenantId}/agent-graphs/${this.graphId}`;
         const updateResponse = await fetch(updateUrl, {
@@ -2451,7 +2480,7 @@ var AgentGraph = class {
           },
           body: JSON.stringify({
             id: this.graphId,
-            defaultAgentId: this.defaultAgent.getId(),
+            defaultSubAgentId: this.defaultSubAgent.getId(),
             contextConfigId: this.contextConfig?.getId()
           })
         });
@@ -2461,7 +2490,7 @@ var AgentGraph = class {
         logger8.debug(
           {
             graphId: this.graphId,
-            defaultAgent: this.defaultAgent.getName()
+            defaultSubAgent: this.defaultSubAgent.getName()
           },
           "Graph relationships configured"
         );
@@ -2479,21 +2508,21 @@ var AgentGraph = class {
   }
   async createAgentRelations() {
     const allRelationPromises = [];
-    for (const agent2 of this.agents) {
-      if (this.isInternalAgent(agent2)) {
-        const transfers = agent2.getTransfers();
+    for (const agent of this.subAgents) {
+      if (this.isInternalAgent(agent)) {
+        const transfers = agent.getTransfers();
         for (const transferAgent of transfers) {
           allRelationPromises.push(
-            this.createInternalAgentRelation(agent2, transferAgent, "transfer")
+            this.createInternalAgentRelation(agent, transferAgent, "transfer")
           );
         }
-        const delegates = agent2.getDelegates();
+        const delegates = agent.getDelegates();
         for (const delegate of delegates) {
           if (delegate.type === "external") {
-            allRelationPromises.push(this.createExternalAgentRelation(agent2, delegate, "delegate"));
+            allRelationPromises.push(this.createExternalAgentRelation(agent, delegate, "delegate"));
           } else {
             allRelationPromises.push(
-              this.createInternalAgentRelation(agent2, delegate, "delegate")
+              this.createInternalAgentRelation(agent, delegate, "delegate")
             );
           }
         }
@@ -2538,8 +2567,8 @@ var AgentGraph = class {
         },
         body: JSON.stringify({
           graphId: this.graphId,
-          sourceAgentId: sourceAgent.getId(),
-          targetAgentId: targetAgent.getId(),
+          sourceSubAgentId: sourceAgent.getId(),
+          targetSubAgentId: targetAgent.getId(),
           relationType
         })
       });
@@ -2548,8 +2577,8 @@ var AgentGraph = class {
         if (response.status === 422 && errorText.includes("already exists")) {
           logger8.info(
             {
-              sourceAgentId: sourceAgent.getId(),
-              targetAgentId: targetAgent.getId(),
+              sourceSubAgentId: sourceAgent.getId(),
+              targetSubAgentId: targetAgent.getId(),
               graphId: this.graphId,
               relationType
             },
@@ -2561,8 +2590,8 @@ var AgentGraph = class {
       }
       logger8.info(
         {
-          sourceAgentId: sourceAgent.getId(),
-          targetAgentId: targetAgent.getId(),
+          sourceSubAgentId: sourceAgent.getId(),
+          targetSubAgentId: targetAgent.getId(),
           graphId: this.graphId,
           relationType
         },
@@ -2571,8 +2600,8 @@ var AgentGraph = class {
     } catch (error) {
       logger8.error(
         {
-          sourceAgentId: sourceAgent.getId(),
-          targetAgentId: targetAgent.getId(),
+          sourceSubAgentId: sourceAgent.getId(),
+          targetSubAgentId: targetAgent.getId(),
           graphId: this.graphId,
           relationType,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -2591,8 +2620,8 @@ var AgentGraph = class {
         },
         body: JSON.stringify({
           graphId: this.graphId,
-          sourceAgentId: sourceAgent.getId(),
-          externalAgentId: externalAgent2.getId(),
+          sourceSubAgentId: sourceAgent.getId(),
+          externalSubAgentId: externalAgent2.getId(),
           relationType
         })
       });
@@ -2601,8 +2630,8 @@ var AgentGraph = class {
         if (response.status === 422 && errorText.includes("already exists")) {
           logger8.info(
             {
-              sourceAgentId: sourceAgent.getId(),
-              externalAgentId: externalAgent2.getId(),
+              sourceSubAgentId: sourceAgent.getId(),
+              externalSubAgentId: externalAgent2.getId(),
               graphId: this.graphId,
               relationType
             },
@@ -2616,8 +2645,8 @@ var AgentGraph = class {
       }
       logger8.info(
         {
-          sourceAgentId: sourceAgent.getId(),
-          externalAgentId: externalAgent2.getId(),
+          sourceSubAgentId: sourceAgent.getId(),
+          externalSubAgentId: externalAgent2.getId(),
           graphId: this.graphId,
           relationType
         },
@@ -2626,8 +2655,8 @@ var AgentGraph = class {
     } catch (error) {
       logger8.error(
         {
-          sourceAgentId: sourceAgent.getId(),
-          externalAgentId: externalAgent2.getId(),
+          sourceSubAgentId: sourceAgent.getId(),
+          externalSubAgentId: externalAgent2.getId(),
           graphId: this.graphId,
           relationType,
           error: error instanceof Error ? error.message : "Unknown error"
@@ -2641,7 +2670,7 @@ var AgentGraph = class {
    * Create external agents in the database
    */
   async createExternalAgents() {
-    const externalAgents2 = this.agents.filter((agent2) => this.isExternalAgent(agent2));
+    const externalAgents2 = this.subAgents.filter((agent) => this.isExternalAgent(agent));
     logger8.info(
       {
         graphId: this.graphId,
@@ -2654,7 +2683,7 @@ var AgentGraph = class {
         await externalAgent2.init();
         logger8.debug(
           {
-            externalAgentId: externalAgent2.getId(),
+            externalSubAgentId: externalAgent2.getId(),
             graphId: this.graphId
           },
           "External agent created in database"
@@ -2662,7 +2691,7 @@ var AgentGraph = class {
       } catch (error) {
         logger8.error(
           {
-            externalAgentId: externalAgent2.getId(),
+            externalSubAgentId: externalAgent2.getId(),
             graphId: this.graphId,
             error: error instanceof Error ? error.message : "Unknown error"
           },
@@ -3234,6 +3263,7 @@ var Project = class {
   async toFullProjectDefinition() {
     const graphsObject = {};
     const toolsObject = {};
+    const functionToolsObject = {};
     const functionsObject = {};
     const dataComponentsObject = {};
     const artifactComponentsObject = {};
@@ -3313,11 +3343,11 @@ var Project = class {
           }
         }
       }
-      for (const agent2 of graph.getAgents()) {
-        if (agent2.type === "external") {
+      for (const agent of graph.getSubAgents()) {
+        if (agent.type === "external") {
           continue;
         }
-        const agentTools = agent2.getTools();
+        const agentTools = agent.getTools();
         for (const [, toolInstance] of Object.entries(agentTools)) {
           const actualTool = toolInstance;
           const toolId = actualTool.getId();
@@ -3326,18 +3356,13 @@ var Project = class {
               const functionData = actualTool.serializeFunction();
               functionsObject[toolId] = functionData;
             }
-            if (!toolsObject[toolId]) {
+            if (!functionToolsObject[toolId]) {
               const toolData = actualTool.serializeTool();
-              const toolConfig = {
-                type: "function"
-                // No inline function details - they're in the functions table via functionId
-              };
-              toolsObject[toolId] = {
+              functionToolsObject[toolId] = {
                 id: toolData.id,
                 name: toolData.name,
                 description: toolData.description,
-                functionId: toolData.functionId,
-                config: toolConfig
+                functionId: toolData.functionId
               };
             }
           } else {
@@ -3376,9 +3401,9 @@ var Project = class {
             }
           }
         }
-        const agentDataComponents = agent2.getDataComponents?.();
-        if (agentDataComponents) {
-          for (const dataComponent2 of agentDataComponents) {
+        const subAgentDataComponents = agent.getDataComponents?.();
+        if (subAgentDataComponents) {
+          for (const dataComponent2 of subAgentDataComponents) {
             let dataComponentId;
             let dataComponentName;
             let dataComponentDescription;
@@ -3404,9 +3429,9 @@ var Project = class {
             }
           }
         }
-        const agentArtifactComponents = agent2.getArtifactComponents?.();
-        if (agentArtifactComponents) {
-          for (const artifactComponent2 of agentArtifactComponents) {
+        const subAgentArtifactComponents = agent.getArtifactComponents?.();
+        if (subAgentArtifactComponents) {
+          for (const artifactComponent2 of subAgentArtifactComponents) {
             let artifactComponentId;
             let artifactComponentName;
             let artifactComponentDescription;
@@ -3534,13 +3559,13 @@ function agentGraph(config) {
 function project(config) {
   return new Project(config);
 }
-function agent(config) {
+function subAgent(config) {
   if (!config.id) {
     throw new Error(
-      "Agent ID is required. Agents must have stable IDs for consistency across deployments."
+      "Sub-Agent ID is required. Sub-Agents must have stable IDs for consistency across deployments."
     );
   }
-  return new Agent(config);
+  return new SubAgent(config);
 }
 function credential(config) {
   return agentsCore.CredentialReferenceApiInsertSchema.parse(config);
@@ -3595,17 +3620,6 @@ function functionTool(config) {
   return new FunctionTool(config);
 }
 
-// src/credential-ref.ts
-function credentialRef(id) {
-  return {
-    __type: "credential-ref",
-    id
-  };
-}
-function isCredentialReference(value) {
-  return value && typeof value === "object" && value.__type === "credential-ref";
-}
-
 // src/utils/validateFunction.ts
 function validateFunction(value, name) {
   if (typeof value !== "function") {
@@ -3615,7 +3629,7 @@ function validateFunction(value, name) {
 
 // src/builders.ts
 var TransferConfigSchema = zod.z.object({
-  agent: zod.z.instanceof(Agent),
+  agent: zod.z.instanceof(SubAgent),
   description: zod.z.string().optional()
 });
 function transfer(targetAgent, description, condition) {
@@ -3634,6 +3648,17 @@ function transfer(targetAgent, description, condition) {
   return config;
 }
 
+// src/credential-ref.ts
+function credentialRef(id) {
+  return {
+    __type: "credential-ref",
+    id
+  };
+}
+function isCredentialReference(value) {
+  return value && typeof value === "object" && value.__type === "credential-ref";
+}
+
 // src/environment-settings.ts
 function createEnvironmentSettings(environments) {
   return {
@@ -3685,7 +3710,7 @@ var ExternalAgent = class {
       await this.upsertExternalAgent();
       logger11.info(
         {
-          externalAgentId: this.getId()
+          externalSubAgentId: this.getId()
         },
         "External agent initialized successfully"
       );
@@ -3693,7 +3718,7 @@ var ExternalAgent = class {
     } catch (error) {
       logger11.error(
         {
-          externalAgentId: this.getId(),
+          externalSubAgentId: this.getId(),
           error: error instanceof Error ? error.message : "Unknown error"
         },
         "Failed to initialize external agent"
@@ -3735,7 +3760,7 @@ var ExternalAgent = class {
     if (updateResponse.ok) {
       logger11.info(
         {
-          externalAgentId: this.getId()
+          externalSubAgentId: this.getId()
         },
         "External agent updated successfully"
       );
@@ -3744,7 +3769,7 @@ var ExternalAgent = class {
     if (updateResponse.status === 404) {
       logger11.info(
         {
-          externalAgentId: this.getId()
+          externalSubAgentId: this.getId()
         },
         "External agent not found, creating new external agent"
       );
@@ -3766,7 +3791,7 @@ var ExternalAgent = class {
       }
       logger11.info(
         {
-          externalAgentId: this.getId()
+          externalSubAgentId: this.getId()
         },
         "External agent created successfully"
       );
@@ -3854,7 +3879,7 @@ var Runner = class _Runner {
     logger12.info(
       {
         graphId: graph.getId(),
-        defaultAgent: graph.getDefaultAgent()?.getName(),
+        defaultSubAgent: graph.getdefaultSubAgent()?.getName(),
         maxTurns,
         initialMessageCount: messageHistory.length
       },
@@ -3881,7 +3906,7 @@ var Runner = class _Runner {
       );
       return {
         finalOutput: response,
-        agent: graph.getDefaultAgent() || {},
+        agent: graph.getdefaultSubAgent() || {},
         turnCount,
         usage: { inputTokens: 0, outputTokens: 0 },
         metadata: {
@@ -3908,7 +3933,7 @@ var Runner = class _Runner {
     logger12.info(
       {
         graphId: graph.getId(),
-        defaultAgent: graph.getDefaultAgent()?.getName()
+        defaultSubAgent: graph.getdefaultSubAgent()?.getName()
       },
       "Starting graph stream"
     );
@@ -3973,23 +3998,23 @@ var Runner = class _Runner {
     if (!graph.getId()) {
       errors.push("Graph ID is required");
     }
-    const defaultAgent = graph.getDefaultAgent();
-    if (!defaultAgent) {
+    const defaultSubAgent = graph.getdefaultSubAgent();
+    if (!defaultSubAgent) {
       errors.push("Default agent is required");
     } else {
-      if (!defaultAgent.getName()) {
+      if (!defaultSubAgent.getName()) {
         errors.push("Default agent name is required");
       }
-      if (!defaultAgent.getInstructions()) {
+      if (!defaultSubAgent.getInstructions()) {
         errors.push("Default agent instructions are required");
       }
     }
-    const agents = graph.getAgents();
+    const agents = graph.getSubAgents();
     if (agents.length === 0) {
       errors.push("Graph must contain at least one agent");
     }
-    for (const agent2 of agents) {
-      if (!agent2.getName()) {
+    for (const agent of agents) {
+      if (!agent.getName()) {
         errors.push(`Agent missing name`);
       }
     }
@@ -4002,15 +4027,15 @@ var Runner = class _Runner {
    * Get execution statistics for a graph
    */
   static async getExecutionStats(graph, messages, options) {
-    const agents = graph.getAgents();
-    const defaultAgent = graph.getDefaultAgent();
+    const agents = graph.getSubAgents();
+    const defaultSubAgent = graph.getdefaultSubAgent();
     const messageCount = Array.isArray(messages) ? messages.length : 1;
     return {
       estimatedTurns: Math.min(Math.max(messageCount, 1), options?.maxTurns || 10),
       estimatedTokens: messageCount * 100,
       // Rough estimate
       agentCount: agents.length,
-      defaultAgent: defaultAgent?.getName()
+      defaultSubAgent: defaultSubAgent?.getName()
     };
   }
 };
@@ -4018,7 +4043,7 @@ var run = Runner.run.bind(Runner);
 var stream = Runner.stream.bind(Runner);
 var raceGraphs = Runner.raceGraphs.bind(Runner);
 
-exports.Agent = Agent;
+exports.Agent = SubAgent;
 exports.ArtifactComponent = ArtifactComponent;
 exports.DataComponent = DataComponent;
 exports.ExternalAgent = ExternalAgent;
@@ -4026,7 +4051,7 @@ exports.FunctionTool = FunctionTool;
 exports.Project = Project;
 exports.Runner = Runner;
 exports.Tool = Tool;
-exports.agent = agent;
+exports.agent = subAgent;
 exports.agentGraph = agentGraph;
 exports.agentMcp = agentMcp;
 exports.artifactComponent = artifactComponent;