@inkeep/agents-sdk 0.17.0 → 0.18.0

package/dist/index.js

@@ -184,7 +184,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;
@@ -427,16 +427,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 };
@@ -452,7 +456,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(
       {
@@ -689,34 +700,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;
     }
@@ -856,7 +864,7 @@ var Agent = class {
       await this.saveArtifactComponents();
       logger6.info(
         {
-          agentId: this.getId()
+          subAgentId: this.getId()
         },
         "Agent initialized successfully"
       );
@@ -864,7 +872,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"
@@ -896,7 +904,7 @@ var Agent = class {
     if (updateResponse.ok) {
       logger6.info(
         {
-          agentId: this.getId()
+          subAgentId: this.getId()
         },
         "Agent updated successfully"
       );
@@ -905,7 +913,7 @@ var Agent = class {
     if (updateResponse.status === 404) {
       logger6.info(
         {
-          agentId: this.getId()
+          subAgentId: this.getId()
         },
         "Agent not found, creating new agent"
       );
@@ -924,7 +932,7 @@ var Agent = class {
       }
       logger6.info(
         {
-          agentId: this.getId()
+          subAgentId: this.getId()
         },
         "Agent created successfully"
       );
@@ -1031,7 +1039,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
@@ -1041,7 +1049,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"
@@ -1088,7 +1096,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
@@ -1098,7 +1106,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"
@@ -1232,7 +1240,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"
@@ -1264,7 +1272,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"
@@ -1272,7 +1280,7 @@ var Agent = class {
     } catch (error) {
       logger6.error(
         {
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           toolId,
           error: error instanceof Error ? error.message : "Unknown error"
         },
@@ -1294,7 +1302,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"
@@ -1302,7 +1310,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"
         },
@@ -1324,7 +1332,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"
@@ -1332,7 +1340,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"
         },
@@ -1352,7 +1360,7 @@ var Agent = class {
         body: JSON.stringify({
           id: `${this.getId()}-dc-${dataComponentId}`,
           tenantId: this.tenantId,
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           dataComponentId
         })
       }
@@ -1364,7 +1372,7 @@ var Agent = class {
     }
     logger6.info(
       {
-        agentId: this.getId(),
+        subAgentId: this.getId(),
         dataComponentId
       },
       "Created agent-dataComponent relation"
@@ -1381,7 +1389,7 @@ var Agent = class {
         body: JSON.stringify({
           id: crypto.randomUUID(),
           tenantId: this.tenantId,
-          agentId: this.getId(),
+          subAgentId: this.getId(),
           artifactComponentId
         })
       }
@@ -1393,7 +1401,7 @@ var Agent = class {
     }
     logger6.info(
       {
-        agentId: this.getId(),
+        subAgentId: this.getId(),
         artifactComponentId
       },
       "Created agent-artifactComponent relation"
@@ -1404,7 +1412,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) {
@@ -1492,9 +1500,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");
@@ -1510,7 +1518,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;
@@ -1529,11 +1537,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();
@@ -1542,8 +1550,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"
     );
@@ -1559,9 +1567,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);
         }
@@ -1574,7 +1582,7 @@ var AgentGraph = class {
           }
         }
       } else {
-        const externalAgent2 = agent2;
+        const externalAgent2 = agent;
         if (externalAgent2.setContext) {
           externalAgent2.setContext(tenantId, apiUrl);
         }
@@ -1598,9 +1606,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 = [];
@@ -1616,19 +1626,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);
           }
@@ -1653,7 +1680,7 @@ var AgentGraph = class {
           type: "internal"
         };
       } else {
-        const externalAgent2 = agent2;
+        const externalAgent2 = agent;
         agentsObject[externalAgent2.getId()] = {
           id: externalAgent2.getId(),
           name: externalAgent2.getName(),
@@ -1669,9 +1696,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,
@@ -1685,11 +1714,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") {
@@ -1709,7 +1738,7 @@ var AgentGraph = class {
                   }
                   logger8.debug(
                     {
-                      agentId: agent2.getId(),
+                      subAgentId: agent.getId(),
                       toolName,
                       toolType: toolInstance.constructor.name,
                       skipDbRegistration
@@ -1719,7 +1748,7 @@ var AgentGraph = class {
                 } catch (error) {
                   logger8.error(
                     {
-                      agentId: agent2.getId(),
+                      subAgentId: agent.getId(),
                       toolName,
                       error: error instanceof Error ? error.message : "Unknown error"
                     },
@@ -1750,7 +1779,7 @@ var AgentGraph = class {
     logger8.info(
       {
         graphId: this.graphId,
-        agentCount: this.agents.length
+        agentCount: this.subAgents.length
       },
       "Initializing agent graph using new graph endpoint"
     );
@@ -1804,7 +1833,7 @@ var AgentGraph = class {
     logger8.info(
       {
         graphId: this.graphId,
-        agentCount: this.agents.length
+        agentCount: this.subAgents.length
       },
       "Initializing agent graph"
     );
@@ -1819,13 +1848,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"
@@ -1833,7 +1862,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"
             },
@@ -1851,7 +1880,7 @@ var AgentGraph = class {
       logger8.info(
         {
           graphId: this.graphId,
-          agentCount: this.agents.length
+          agentCount: this.subAgents.length
         },
         "Agent graph initialized successfully"
       );
@@ -1871,13 +1900,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"
@@ -1890,13 +1919,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"
@@ -1921,21 +1950,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"
@@ -1943,7 +1972,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: {
@@ -1961,17 +1990,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"
     );
@@ -1979,15 +2008,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"
       );
@@ -1998,25 +2027,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"
     );
@@ -2024,8 +2053,8 @@ var AgentGraph = class {
   /**
    * Get the default agent
    */
-  getDefaultAgent() {
-    return this.defaultAgent;
+  getdefaultSubAgent() {
+    return this.defaultSubAgent;
   }
   /**
    * Get the graph ID
@@ -2083,8 +2112,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
@@ -2095,35 +2124,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`
           );
         }
       }
@@ -2142,8 +2171,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
@@ -2207,9 +2236,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);
       }
     }
   }
@@ -2228,9 +2257,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 = {};
           }
@@ -2252,19 +2281,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;
       }
     }
   }
@@ -2272,17 +2301,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
@@ -2395,7 +2424,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
         })
@@ -2413,7 +2442,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, {
@@ -2423,7 +2452,7 @@ var AgentGraph = class {
           },
           body: JSON.stringify({
             id: this.graphId,
-            defaultAgentId: this.defaultAgent.getId(),
+            defaultSubAgentId: this.defaultSubAgent.getId(),
             contextConfigId: this.contextConfig?.getId()
           })
         });
@@ -2433,7 +2462,7 @@ var AgentGraph = class {
         logger8.debug(
           {
             graphId: this.graphId,
-            defaultAgent: this.defaultAgent.getName()
+            defaultSubAgent: this.defaultSubAgent.getName()
           },
           "Graph relationships configured"
         );
@@ -2451,21 +2480,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")
             );
           }
         }
@@ -2510,8 +2539,8 @@ var AgentGraph = class {
         },
         body: JSON.stringify({
           graphId: this.graphId,
-          sourceAgentId: sourceAgent.getId(),
-          targetAgentId: targetAgent.getId(),
+          sourceSubAgentId: sourceAgent.getId(),
+          targetSubAgentId: targetAgent.getId(),
           relationType
         })
       });
@@ -2520,8 +2549,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
             },
@@ -2533,8 +2562,8 @@ var AgentGraph = class {
       }
       logger8.info(
         {
-          sourceAgentId: sourceAgent.getId(),
-          targetAgentId: targetAgent.getId(),
+          sourceSubAgentId: sourceAgent.getId(),
+          targetSubAgentId: targetAgent.getId(),
           graphId: this.graphId,
           relationType
         },
@@ -2543,8 +2572,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"
@@ -2563,8 +2592,8 @@ var AgentGraph = class {
         },
         body: JSON.stringify({
           graphId: this.graphId,
-          sourceAgentId: sourceAgent.getId(),
-          externalAgentId: externalAgent2.getId(),
+          sourceSubAgentId: sourceAgent.getId(),
+          externalSubAgentId: externalAgent2.getId(),
           relationType
         })
       });
@@ -2573,8 +2602,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
             },
@@ -2588,8 +2617,8 @@ var AgentGraph = class {
       }
       logger8.info(
         {
-          sourceAgentId: sourceAgent.getId(),
-          externalAgentId: externalAgent2.getId(),
+          sourceSubAgentId: sourceAgent.getId(),
+          externalSubAgentId: externalAgent2.getId(),
           graphId: this.graphId,
           relationType
         },
@@ -2598,8 +2627,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"
@@ -2613,7 +2642,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,
@@ -2626,7 +2655,7 @@ var AgentGraph = class {
         await externalAgent2.init();
         logger8.debug(
           {
-            externalAgentId: externalAgent2.getId(),
+            externalSubAgentId: externalAgent2.getId(),
             graphId: this.graphId
           },
           "External agent created in database"
@@ -2634,7 +2663,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"
           },
@@ -3206,6 +3235,7 @@ var Project = class {
   async toFullProjectDefinition() {
     const graphsObject = {};
     const toolsObject = {};
+    const functionToolsObject = {};
     const functionsObject = {};
     const dataComponentsObject = {};
     const artifactComponentsObject = {};
@@ -3285,11 +3315,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();
@@ -3298,18 +3328,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 {
@@ -3348,9 +3373,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;
@@ -3376,9 +3401,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;
@@ -3506,13 +3531,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 CredentialReferenceApiInsertSchema.parse(config);
@@ -3567,17 +3592,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") {
@@ -3587,7 +3601,7 @@ function validateFunction(value, name) {
 
 // src/builders.ts
 var TransferConfigSchema = z.object({
-  agent: z.instanceof(Agent),
+  agent: z.instanceof(SubAgent),
   description: z.string().optional()
 });
 function transfer(targetAgent, description, condition) {
@@ -3606,6 +3620,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 {
@@ -3657,7 +3682,7 @@ var ExternalAgent = class {
       await this.upsertExternalAgent();
       logger11.info(
         {
-          externalAgentId: this.getId()
+          externalSubAgentId: this.getId()
         },
         "External agent initialized successfully"
       );
@@ -3665,7 +3690,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"
@@ -3707,7 +3732,7 @@ var ExternalAgent = class {
     if (updateResponse.ok) {
       logger11.info(
         {
-          externalAgentId: this.getId()
+          externalSubAgentId: this.getId()
         },
         "External agent updated successfully"
       );
@@ -3716,7 +3741,7 @@ var ExternalAgent = class {
     if (updateResponse.status === 404) {
       logger11.info(
         {
-          externalAgentId: this.getId()
+          externalSubAgentId: this.getId()
         },
         "External agent not found, creating new external agent"
       );
@@ -3738,7 +3763,7 @@ var ExternalAgent = class {
       }
       logger11.info(
         {
-          externalAgentId: this.getId()
+          externalSubAgentId: this.getId()
         },
         "External agent created successfully"
       );
@@ -3826,7 +3851,7 @@ var Runner = class _Runner {
     logger12.info(
       {
         graphId: graph.getId(),
-        defaultAgent: graph.getDefaultAgent()?.getName(),
+        defaultSubAgent: graph.getdefaultSubAgent()?.getName(),
         maxTurns,
         initialMessageCount: messageHistory.length
       },
@@ -3853,7 +3878,7 @@ var Runner = class _Runner {
       );
       return {
         finalOutput: response,
-        agent: graph.getDefaultAgent() || {},
+        agent: graph.getdefaultSubAgent() || {},
         turnCount,
         usage: { inputTokens: 0, outputTokens: 0 },
         metadata: {
@@ -3880,7 +3905,7 @@ var Runner = class _Runner {
     logger12.info(
       {
         graphId: graph.getId(),
-        defaultAgent: graph.getDefaultAgent()?.getName()
+        defaultSubAgent: graph.getdefaultSubAgent()?.getName()
       },
       "Starting graph stream"
     );
@@ -3945,23 +3970,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`);
       }
     }
@@ -3974,15 +3999,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()
     };
   }
 };
@@ -3990,4 +4015,4 @@ var run = Runner.run.bind(Runner);
 var stream = Runner.stream.bind(Runner);
 var raceGraphs = Runner.raceGraphs.bind(Runner);
 
-export { Agent, ArtifactComponent, DataComponent, ExternalAgent, FunctionTool, Project, Runner, Tool, agent, agentGraph, agentMcp, artifactComponent, createEnvironmentSettings, createFullProjectViaAPI, credential, credentialRef, dataComponent, deleteFullProjectViaAPI, externalAgent, externalAgents, functionTool, getFullProjectViaAPI, isCredentialReference, mcpServer, mcpTool, project, raceGraphs, registerEnvironmentSettings, run, stream, transfer, updateFullProjectViaAPI };
+export { SubAgent as Agent, ArtifactComponent, DataComponent, ExternalAgent, FunctionTool, Project, Runner, Tool, subAgent as agent, agentGraph, agentMcp, artifactComponent, createEnvironmentSettings, createFullProjectViaAPI, credential, credentialRef, dataComponent, deleteFullProjectViaAPI, externalAgent, externalAgents, functionTool, getFullProjectViaAPI, isCredentialReference, mcpServer, mcpTool, project, raceGraphs, registerEnvironmentSettings, run, stream, transfer, updateFullProjectViaAPI };