@inkeep/agents-cli 0.16.3 → 0.18.0

package/dist/index.js

@@ -21,11 +21,11 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __copyProps = (to, from, except, desc14) => {
+var __copyProps = (to, from, except, desc15) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
       if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc14 = __getOwnPropDesc(from, key)) || desc14.enumerable });
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc15 = __getOwnPropDesc(from, key)) || desc15.enumerable });
   }
   return to;
 };
@@ -66,6 +66,78 @@ var init_base_client = __esm({
   }
 });
 
+// ../packages/agents-core/src/constants/otel-attributes.ts
+var init_otel_attributes = __esm({
+  "../packages/agents-core/src/constants/otel-attributes.ts"() {
+    "use strict";
+    init_esm_shims();
+  }
+});
+
+// ../packages/agents-core/src/constants/signoz-queries.ts
+var DATA_TYPES, FIELD_TYPES, QUERY_FIELD_CONFIGS;
+var init_signoz_queries = __esm({
+  "../packages/agents-core/src/constants/signoz-queries.ts"() {
+    "use strict";
+    init_esm_shims();
+    DATA_TYPES = {
+      STRING: "string",
+      INT64: "int64",
+      FLOAT64: "float64",
+      BOOL: "bool"
+    };
+    FIELD_TYPES = {
+      TAG: "tag",
+      RESOURCE: "resource"
+    };
+    QUERY_FIELD_CONFIGS = {
+      // String tag fields
+      STRING_TAG: {
+        dataType: DATA_TYPES.STRING,
+        type: FIELD_TYPES.TAG,
+        isColumn: false
+      },
+      STRING_TAG_COLUMN: {
+        dataType: DATA_TYPES.STRING,
+        type: FIELD_TYPES.TAG,
+        isColumn: true
+      },
+      // Numeric tag fields
+      INT64_TAG: {
+        dataType: DATA_TYPES.INT64,
+        type: FIELD_TYPES.TAG,
+        isColumn: false
+      },
+      INT64_TAG_COLUMN: {
+        dataType: DATA_TYPES.INT64,
+        type: FIELD_TYPES.TAG,
+        isColumn: true
+      },
+      FLOAT64_TAG: {
+        dataType: DATA_TYPES.FLOAT64,
+        type: FIELD_TYPES.TAG,
+        isColumn: false
+      },
+      FLOAT64_TAG_COLUMN: {
+        dataType: DATA_TYPES.FLOAT64,
+        type: FIELD_TYPES.TAG,
+        isColumn: true
+      },
+      // Boolean tag fields
+      BOOL_TAG: {
+        dataType: DATA_TYPES.BOOL,
+        type: FIELD_TYPES.TAG,
+        isColumn: false
+      },
+      BOOL_TAG_COLUMN: {
+        dataType: DATA_TYPES.BOOL,
+        type: FIELD_TYPES.TAG,
+        isColumn: true
+      }
+    };
+  }
+});
+
 // ../node_modules/.pnpm/nanoid@5.1.6/node_modules/nanoid/index.js
 import { webcrypto as crypto2 } from "crypto";
 function fillPool(bytes) {
@@ -258,22 +330,22 @@ var init_logger = __esm({
        */
       getLogger(name) {
         if (this.loggers.has(name)) {
-          const logger15 = this.loggers.get(name);
-          if (!logger15) {
+          const logger16 = this.loggers.get(name);
+          if (!logger16) {
             throw new Error(`Logger '${name}' not found in cache`);
           }
-          return logger15;
+          return logger16;
         }
-        let logger14;
+        let logger15;
         if (this.config.loggerFactory) {
-          logger14 = this.config.loggerFactory(name);
+          logger15 = this.config.loggerFactory(name);
         } else if (this.config.defaultLogger) {
-          logger14 = this.config.defaultLogger;
+          logger15 = this.config.defaultLogger;
         } else {
-          logger14 = new PinoLogger(name, this.config.pinoConfig);
+          logger15 = new PinoLogger(name, this.config.pinoConfig);
         }
-        this.loggers.set(name, logger14);
-        return logger14;
+        this.loggers.set(name, logger15);
+        return logger15;
       }
       /**
        * Reset factory to default state
@@ -1242,7 +1314,7 @@ function columnToSchema(column, factory) {
   }
   return schema;
 }
-function numberColumnToSchema(column, z12, coerce) {
+function numberColumnToSchema(column, z13, coerce) {
   let unsigned = column.getSQLType().includes("unsigned");
   let min;
   let max;
@@ -1310,20 +1382,20 @@ function numberColumnToSchema(column, z12, coerce) {
     min = Number.MIN_SAFE_INTEGER;
     max = Number.MAX_SAFE_INTEGER;
   }
-  let schema = coerce === true || coerce?.number ? integer2 ? z12.coerce.number() : z12.coerce.number().int() : integer2 ? z12.int() : z12.number();
+  let schema = coerce === true || coerce?.number ? integer2 ? z13.coerce.number() : z13.coerce.number().int() : integer2 ? z13.int() : z13.number();
   schema = schema.gte(min).lte(max);
   return schema;
 }
-function bigintColumnToSchema(column, z12, coerce) {
+function bigintColumnToSchema(column, z13, coerce) {
   const unsigned = column.getSQLType().includes("unsigned");
   const min = unsigned ? 0n : CONSTANTS.INT64_MIN;
   const max = unsigned ? CONSTANTS.INT64_UNSIGNED_MAX : CONSTANTS.INT64_MAX;
-  const schema = coerce === true || coerce?.bigint ? z12.coerce.bigint() : z12.bigint();
+  const schema = coerce === true || coerce?.bigint ? z13.coerce.bigint() : z13.bigint();
   return schema.gte(min).lte(max);
 }
-function stringColumnToSchema(column, z12, coerce) {
+function stringColumnToSchema(column, z13, coerce) {
   if (isColumnType(column, ["PgUUID"])) {
-    return z12.uuid();
+    return z13.uuid();
   }
   let max;
   let regex;
@@ -1355,7 +1427,7 @@ function stringColumnToSchema(column, z12, coerce) {
     regex = /^[01]+$/;
     max = column.dimensions;
   }
-  let schema = coerce === true || coerce?.string ? z12.coerce.string() : z12.string();
+  let schema = coerce === true || coerce?.string ? z13.coerce.string() : z13.string();
   schema = regex ? schema.regex(regex) : schema;
   return max && fixed ? schema.length(max) : max ? schema.max(max) : schema;
 }
@@ -1467,7 +1539,7 @@ import {
   text,
   unique
 } from "drizzle-orm/sqlite-core";
-var tenantScoped, projectScoped, graphScoped, agentScoped, uiProperties, timestamps, projects, agentGraph, contextConfigs, contextCache, agents, agentRelations, externalAgents, tasks, taskRelations, dataComponents, agentDataComponents, artifactComponents, agentArtifactComponents, tools, functions, agentToolRelations, conversations, messages, ledgerArtifacts, apiKeys, credentialReferences, tasksRelations, projectsRelations, taskRelationsRelations, contextConfigsRelations, contextCacheRelations, agentsRelations, agentGraphRelations, externalAgentsRelations, apiKeysRelations, agentToolRelationsRelations, credentialReferencesRelations, toolsRelations, conversationsRelations, messagesRelations, artifactComponentsRelations, agentArtifactComponentsRelations, dataComponentsRelations, agentDataComponentsRelations, ledgerArtifactsRelations, functionsRelations, agentRelationsRelations;
+var tenantScoped, projectScoped, graphScoped, subAgentScoped, uiProperties, timestamps, projects, agentGraph, contextConfigs, contextCache, subAgents, subAgentRelations, externalAgents, tasks, taskRelations, dataComponents, subAgentDataComponents, artifactComponents, subAgentArtifactComponents, tools, functionTools, functions, subAgentToolRelations, agentFunctionToolRelations, conversations, messages, ledgerArtifacts, apiKeys, credentialReferences, tasksRelations, projectsRelations, taskRelationsRelations, contextConfigsRelations, contextCacheRelations, subAgentsRelations, agentGraphRelations, externalAgentsRelations, apiKeysRelations, agentToolRelationsRelations, credentialReferencesRelations, toolsRelations, conversationsRelations, messagesRelations, artifactComponentsRelations, subAgentArtifactComponentsRelations, dataComponentsRelations, subAgentDataComponentsRelations, ledgerArtifactsRelations, functionsRelations, subAgentRelationsRelations, functionToolsRelations, agentFunctionToolRelationsRelations;
 var init_schema = __esm({
   "../packages/agents-core/src/db/schema.ts"() {
     "use strict";
@@ -1484,9 +1556,9 @@ var init_schema = __esm({
       ...projectScoped,
       graphId: text("graph_id").notNull()
     };
-    agentScoped = {
+    subAgentScoped = {
       ...graphScoped,
-      agentId: text("agent_id").notNull()
+      subAgentId: text("sub_agent_id").notNull()
     };
     uiProperties = {
       name: text("name").notNull(),
@@ -1517,7 +1589,7 @@ var init_schema = __esm({
         ...projectScoped,
         name: text("name").notNull(),
         description: text("description"),
-        defaultAgentId: text("default_agent_id"),
+        defaultSubAgentId: text("default_sub_agent_id"),
         // Reference to shared context configuration for all agents in this graph
         contextConfigId: text("context_config_id"),
         // add fk relationship
@@ -1596,8 +1668,8 @@ var init_schema = __esm({
         )
       ]
     );
-    agents = sqliteTable(
-      "agents",
+    subAgents = sqliteTable(
+      "sub_agents",
       {
         ...graphScoped,
         ...uiProperties,
@@ -1619,17 +1691,16 @@ var init_schema = __esm({
         }).onDelete("cascade")
       ]
     );
-    agentRelations = sqliteTable(
-      "agent_relations",
+    subAgentRelations = sqliteTable(
+      "sub_agent_relations",
       {
         ...graphScoped,
-        sourceAgentId: text("source_agent_id").notNull(),
+        sourceSubAgentId: text("source_sub_agent_id").notNull(),
         // For internal relationships
-        targetAgentId: text("target_agent_id"),
+        targetSubAgentId: text("target_sub_agent_id"),
         // For external relationships
-        externalAgentId: text("external_agent_id"),
+        externalSubAgentId: text("external_sub_agent_id"),
         relationType: text("relation_type"),
-        // 'transfer' | 'delegate'
         ...timestamps
       },
       (table) => [
@@ -1637,7 +1708,7 @@ var init_schema = __esm({
         foreignKey({
           columns: [table.tenantId, table.projectId, table.graphId],
           foreignColumns: [agentGraph.tenantId, agentGraph.projectId, agentGraph.id],
-          name: "agent_relations_graph_fk"
+          name: "sub_agent_relations_graph_fk"
         }).onDelete("cascade")
       ]
     );
@@ -1673,7 +1744,7 @@ var init_schema = __esm({
     tasks = sqliteTable(
       "tasks",
       {
-        ...agentScoped,
+        ...subAgentScoped,
         contextId: text("context_id").notNull(),
         status: text("status").notNull(),
         metadata: blob("metadata", { mode: "json" }).$type(),
@@ -1682,9 +1753,9 @@ var init_schema = __esm({
       (table) => [
         primaryKey({ columns: [table.tenantId, table.projectId, table.id] }),
         foreignKey({
-          columns: [table.tenantId, table.projectId, table.graphId, table.agentId],
-          foreignColumns: [agents.tenantId, agents.projectId, agents.graphId, agents.id],
-          name: "tasks_agent_fk"
+          columns: [table.tenantId, table.projectId, table.graphId, table.subAgentId],
+          foreignColumns: [subAgents.tenantId, subAgents.projectId, subAgents.graphId, subAgents.id],
+          name: "tasks_sub_agent_fk"
         }).onDelete("cascade")
       ]
     );
@@ -1724,10 +1795,10 @@ var init_schema = __esm({
         }).onDelete("cascade")
       ]
     );
-    agentDataComponents = sqliteTable(
-      "agent_data_components",
+    subAgentDataComponents = sqliteTable(
+      "sub_agent_data_components",
       {
-        ...agentScoped,
+        ...subAgentScoped,
         dataComponentId: text("data_component_id").notNull(),
         createdAt: text("created_at").notNull().default(sql`CURRENT_TIMESTAMP`)
       },
@@ -1735,15 +1806,15 @@ var init_schema = __esm({
         primaryKey({ columns: [table.tenantId, table.projectId, table.id] }),
         // Foreign key constraint to agents table (ensures graph and project exist via cascade)
         foreignKey({
-          columns: [table.tenantId, table.projectId, table.graphId, table.agentId],
-          foreignColumns: [agents.tenantId, agents.projectId, agents.graphId, agents.id],
-          name: "agent_data_components_agent_fk"
+          columns: [table.tenantId, table.projectId, table.graphId, table.subAgentId],
+          foreignColumns: [subAgents.tenantId, subAgents.projectId, subAgents.graphId, subAgents.id],
+          name: "sub_agent_data_components_sub_agent_fk"
         }).onDelete("cascade"),
         // Foreign key constraint to data_components table
         foreignKey({
           columns: [table.tenantId, table.projectId, table.dataComponentId],
           foreignColumns: [dataComponents.tenantId, dataComponents.projectId, dataComponents.id],
-          name: "agent_data_components_data_component_fk"
+          name: "sub_agent_data_components_data_component_fk"
         }).onDelete("cascade")
       ]
     );
@@ -1764,22 +1835,22 @@ var init_schema = __esm({
         }).onDelete("cascade")
       ]
     );
-    agentArtifactComponents = sqliteTable(
-      "agent_artifact_components",
+    subAgentArtifactComponents = sqliteTable(
+      "sub_agent_artifact_components",
       {
-        ...agentScoped,
+        ...subAgentScoped,
         artifactComponentId: text("artifact_component_id").notNull(),
         createdAt: text("created_at").notNull().default(sql`CURRENT_TIMESTAMP`)
       },
       (table) => [
         primaryKey({
-          columns: [table.tenantId, table.projectId, table.graphId, table.agentId, table.id]
+          columns: [table.tenantId, table.projectId, table.graphId, table.subAgentId, table.id]
         }),
         // Foreign key constraint to agents table (ensures graph and project exist via cascade)
         foreignKey({
-          columns: [table.tenantId, table.projectId, table.graphId, table.agentId],
-          foreignColumns: [agents.tenantId, agents.projectId, agents.graphId, agents.id],
-          name: "agent_artifact_components_agent_fk"
+          columns: [table.tenantId, table.projectId, table.graphId, table.subAgentId],
+          foreignColumns: [subAgents.tenantId, subAgents.projectId, subAgents.graphId, subAgents.id],
+          name: "sub_agent_artifact_components_sub_agent_fk"
         }).onDelete("cascade"),
         // Foreign key constraint to artifact_components table
         foreignKey({
@@ -1789,7 +1860,7 @@ var init_schema = __esm({
             artifactComponents.projectId,
             artifactComponents.id
           ],
-          name: "agent_artifact_components_artifact_component_fk"
+          name: "sub_agent_artifact_components_artifact_component_fk"
         }).onDelete("cascade")
       ]
     );
@@ -1799,10 +1870,7 @@ var init_schema = __esm({
         ...projectScoped,
         name: text("name").notNull(),
         description: text("description"),
-        // Tool configuration - supports both MCP and function tools
         config: blob("config", { mode: "json" }).$type().notNull(),
-        // For function tools, reference the global functions table
-        functionId: text("function_id"),
         credentialReferenceId: text("credential_reference_id"),
         headers: blob("headers", { mode: "json" }).$type(),
         // Image URL for custom tool icon (supports regular URLs and base64 encoded images)
@@ -1818,12 +1886,30 @@ var init_schema = __esm({
           columns: [table.tenantId, table.projectId],
           foreignColumns: [projects.tenantId, projects.id],
           name: "tools_project_fk"
+        }).onDelete("cascade")
+      ]
+    );
+    functionTools = sqliteTable(
+      "function_tools",
+      {
+        ...graphScoped,
+        name: text("name").notNull(),
+        description: text("description"),
+        functionId: text("function_id").notNull(),
+        ...timestamps
+      },
+      (table) => [
+        primaryKey({ columns: [table.tenantId, table.projectId, table.graphId, table.id] }),
+        foreignKey({
+          columns: [table.tenantId, table.projectId, table.graphId],
+          foreignColumns: [agentGraph.tenantId, agentGraph.projectId, agentGraph.id],
+          name: "function_tools_graph_fk"
         }).onDelete("cascade"),
-        // Foreign key constraint to functions table (for function tools)
+        // Foreign key constraint to functions table
         foreignKey({
           columns: [table.tenantId, table.projectId, table.functionId],
           foreignColumns: [functions.tenantId, functions.projectId, functions.id],
-          name: "tools_function_fk"
+          name: "function_tools_function_fk"
         }).onDelete("cascade")
       ]
     );
@@ -1845,10 +1931,10 @@ var init_schema = __esm({
         }).onDelete("cascade")
       ]
     );
-    agentToolRelations = sqliteTable(
-      "agent_tool_relations",
+    subAgentToolRelations = sqliteTable(
+      "sub_agent_tool_relations",
       {
-        ...agentScoped,
+        ...subAgentScoped,
         toolId: text("tool_id").notNull(),
         selectedTools: blob("selected_tools", { mode: "json" }).$type(),
         headers: blob("headers", { mode: "json" }).$type(),
@@ -1858,15 +1944,43 @@ var init_schema = __esm({
         primaryKey({ columns: [table.tenantId, table.projectId, table.graphId, table.id] }),
         // Foreign key constraint to agents table (which includes project and graph scope)
         foreignKey({
-          columns: [table.tenantId, table.projectId, table.graphId, table.agentId],
-          foreignColumns: [agents.tenantId, agents.projectId, agents.graphId, agents.id],
-          name: "agent_tool_relations_agent_fk"
+          columns: [table.tenantId, table.projectId, table.graphId, table.subAgentId],
+          foreignColumns: [subAgents.tenantId, subAgents.projectId, subAgents.graphId, subAgents.id],
+          name: "sub_agent_tool_relations_agent_fk"
         }).onDelete("cascade"),
-        // Foreign key constraint to tools table
+        // Foreign key constraint to tools table (MCP tools)
         foreignKey({
           columns: [table.tenantId, table.projectId, table.toolId],
           foreignColumns: [tools.tenantId, tools.projectId, tools.id],
-          name: "agent_tool_relations_tool_fk"
+          name: "sub_agent_tool_relations_tool_fk"
+        }).onDelete("cascade")
+      ]
+    );
+    agentFunctionToolRelations = sqliteTable(
+      "agent_function_tool_relations",
+      {
+        ...subAgentScoped,
+        functionToolId: text("function_tool_id").notNull(),
+        ...timestamps
+      },
+      (table) => [
+        primaryKey({ columns: [table.tenantId, table.projectId, table.graphId, table.id] }),
+        // Foreign key constraint to agents table
+        foreignKey({
+          columns: [table.tenantId, table.projectId, table.graphId, table.subAgentId],
+          foreignColumns: [subAgents.tenantId, subAgents.projectId, subAgents.graphId, subAgents.id],
+          name: "agent_function_tool_relations_agent_fk"
+        }).onDelete("cascade"),
+        // Foreign key constraint to functionTools table
+        foreignKey({
+          columns: [table.tenantId, table.projectId, table.graphId, table.functionToolId],
+          foreignColumns: [
+            functionTools.tenantId,
+            functionTools.projectId,
+            functionTools.graphId,
+            functionTools.id
+          ],
+          name: "agent_function_tool_relations_function_tool_fk"
         }).onDelete("cascade")
       ]
     );
@@ -1875,7 +1989,7 @@ var init_schema = __esm({
       {
         ...projectScoped,
         userId: text("user_id"),
-        activeAgentId: text("active_agent_id").notNull(),
+        activeSubAgentId: text("active_sub_agent_id").notNull(),
         title: text("title"),
         lastContextResolution: text("last_context_resolution"),
         metadata: blob("metadata", { mode: "json" }).$type(),
@@ -1899,15 +2013,15 @@ var init_schema = __esm({
         role: text("role").notNull(),
         // 'user' | 'agent' | 'system'
         // Agent sender/recipient tracking (nullable - only populated when relevant)
-        fromAgentId: text("from_agent_id"),
+        fromSubAgentId: text("from_sub_agent_id"),
         // Populated when message is from an agent
-        toAgentId: text("to_agent_id"),
+        toSubAgentId: text("to_sub_agent_id"),
         // Populated when message is directed to a specific agent (e.g., transfers/delegations)
         // External agent sender tracking
-        fromExternalAgentId: text("from_external_agent_id"),
+        fromExternalAgentId: text("from_external_sub_agent_id"),
         // Populated when message is directed from an external agent
         // External agent recipient tracking
-        toExternalAgentId: text("to_external_agent_id"),
+        toExternalAgentId: text("to_external_sub_agent_id"),
         // Populated when message is directed to an external agent
         // Message content stored as JSON to support both formats
         content: blob("content", { mode: "json" }).$type().notNull(),
@@ -1916,8 +2030,6 @@ var init_schema = __esm({
         // 'user-facing' | 'internal' | 'system' | 'external'
         messageType: text("message_type").notNull().default("chat"),
         // 'chat' | 'a2a-request' | 'a2a-response' | 'task-update' | 'tool-call'
-        // Legacy agent association (consider deprecating in favor of fromAgentId/toAgentId)
-        agentId: text("agent_id"),
         taskId: text("task_id"),
         parentMessageId: text("parent_message_id"),
         // Remove self-reference constraint here
@@ -2044,10 +2156,9 @@ var init_schema = __esm({
       childRelations: many(taskRelations, {
         relationName: "parentTask"
       }),
-      // A task belongs to one agent
-      agent: one(agents, {
-        fields: [tasks.agentId],
-        references: [agents.id]
+      subAgent: one(subAgents, {
+        fields: [tasks.subAgentId],
+        references: [subAgents.id]
       }),
       // A task can have many messages associated with it
       messages: many(messages),
@@ -2055,9 +2166,10 @@ var init_schema = __esm({
       ledgerArtifacts: many(ledgerArtifacts)
     }));
     projectsRelations = relations(projects, ({ many }) => ({
-      agents: many(agents),
+      subAgents: many(subAgents),
       agentGraphs: many(agentGraph),
       tools: many(tools),
+      functions: many(functions),
       contextConfigs: many(contextConfigs),
       externalAgents: many(externalAgents),
       conversations: many(conversations),
@@ -2093,17 +2205,17 @@ var init_schema = __esm({
         references: [contextConfigs.id]
       })
     }));
-    agentsRelations = relations(agents, ({ many, one }) => ({
+    subAgentsRelations = relations(subAgents, ({ many, one }) => ({
       project: one(projects, {
-        fields: [agents.tenantId, agents.projectId],
+        fields: [subAgents.tenantId, subAgents.projectId],
         references: [projects.tenantId, projects.id]
       }),
       tasks: many(tasks),
       defaultForGraphs: many(agentGraph),
-      sourceRelations: many(agentRelations, {
+      sourceRelations: many(subAgentRelations, {
         relationName: "sourceRelations"
       }),
-      targetRelations: many(agentRelations, {
+      targetRelations: many(subAgentRelations, {
         relationName: "targetRelations"
       }),
       sentMessages: many(messages, {
@@ -2115,30 +2227,32 @@ var init_schema = __esm({
       associatedMessages: many(messages, {
         relationName: "associatedAgent"
       }),
-      toolRelations: many(agentToolRelations),
-      dataComponentRelations: many(agentDataComponents),
-      artifactComponentRelations: many(agentArtifactComponents)
+      toolRelations: many(subAgentToolRelations),
+      functionToolRelations: many(agentFunctionToolRelations),
+      dataComponentRelations: many(subAgentDataComponents),
+      artifactComponentRelations: many(subAgentArtifactComponents)
     }));
-    agentGraphRelations = relations(agentGraph, ({ one }) => ({
+    agentGraphRelations = relations(agentGraph, ({ one, many }) => ({
       project: one(projects, {
         fields: [agentGraph.tenantId, agentGraph.projectId],
         references: [projects.tenantId, projects.id]
       }),
-      defaultAgent: one(agents, {
-        fields: [agentGraph.defaultAgentId],
-        references: [agents.id]
+      defaultSubAgent: one(subAgents, {
+        fields: [agentGraph.defaultSubAgentId],
+        references: [subAgents.id]
       }),
       contextConfig: one(contextConfigs, {
         fields: [agentGraph.contextConfigId],
         references: [contextConfigs.id]
-      })
+      }),
+      functionTools: many(functionTools)
     }));
     externalAgentsRelations = relations(externalAgents, ({ one, many }) => ({
       project: one(projects, {
         fields: [externalAgents.tenantId, externalAgents.projectId],
         references: [projects.tenantId, projects.id]
       }),
-      agentRelations: many(agentRelations),
+      subAgentRelations: many(subAgentRelations),
       credentialReference: one(credentialReferences, {
         fields: [externalAgents.credentialReferenceId],
         references: [credentialReferences.id]
@@ -2154,13 +2268,13 @@ var init_schema = __esm({
         references: [agentGraph.id]
       })
     }));
-    agentToolRelationsRelations = relations(agentToolRelations, ({ one }) => ({
-      agent: one(agents, {
-        fields: [agentToolRelations.agentId],
-        references: [agents.id]
+    agentToolRelationsRelations = relations(subAgentToolRelations, ({ one }) => ({
+      subAgent: one(subAgents, {
+        fields: [subAgentToolRelations.subAgentId],
+        references: [subAgents.id]
       }),
       tool: one(tools, {
-        fields: [agentToolRelations.toolId],
+        fields: [subAgentToolRelations.toolId],
         references: [tools.id]
       })
     }));
@@ -2172,14 +2286,10 @@ var init_schema = __esm({
         fields: [tools.tenantId, tools.projectId],
         references: [projects.tenantId, projects.id]
       }),
-      agentRelations: many(agentToolRelations),
+      subAgentRelations: many(subAgentToolRelations),
       credentialReference: one(credentialReferences, {
         fields: [tools.credentialReferenceId],
         references: [credentialReferences.id]
-      }),
-      function: one(functions, {
-        fields: [tools.functionId],
-        references: [functions.id]
       })
     }));
     conversationsRelations = relations(conversations, ({ one, many }) => ({
@@ -2188,9 +2298,9 @@ var init_schema = __esm({
         references: [projects.tenantId, projects.id]
       }),
       messages: many(messages),
-      activeAgent: one(agents, {
-        fields: [conversations.activeAgentId],
-        references: [agents.id]
+      activeSubAgent: one(subAgents, {
+        fields: [conversations.activeSubAgentId],
+        references: [subAgents.id]
       })
     }));
     messagesRelations = relations(messages, ({ one, many }) => ({
@@ -2198,20 +2308,14 @@ var init_schema = __esm({
         fields: [messages.conversationId],
         references: [conversations.id]
       }),
-      // Legacy agent association (consider deprecating)
-      agent: one(agents, {
-        fields: [messages.agentId],
-        references: [agents.id],
-        relationName: "associatedAgent"
-      }),
-      fromAgent: one(agents, {
-        fields: [messages.fromAgentId],
-        references: [agents.id],
+      fromSubAgent: one(subAgents, {
+        fields: [messages.fromSubAgentId],
+        references: [subAgents.id],
         relationName: "sentMessages"
       }),
-      toAgent: one(agents, {
-        fields: [messages.toAgentId],
-        references: [agents.id],
+      toSubAgent: one(subAgents, {
+        fields: [messages.toSubAgentId],
+        references: [subAgents.id],
         relationName: "receivedMessages"
       }),
       fromExternalAgent: one(externalAgents, {
@@ -2237,33 +2341,40 @@ var init_schema = __esm({
         relationName: "parentChild"
       })
     }));
-    artifactComponentsRelations = relations(artifactComponents, ({ many }) => ({
-      agentRelations: many(agentArtifactComponents)
-    }));
-    agentArtifactComponentsRelations = relations(agentArtifactComponents, ({ one }) => ({
-      agent: one(agents, {
-        fields: [agentArtifactComponents.agentId],
-        references: [agents.id]
+    artifactComponentsRelations = relations(artifactComponents, ({ many, one }) => ({
+      project: one(projects, {
+        fields: [artifactComponents.tenantId, artifactComponents.projectId],
+        references: [projects.tenantId, projects.id]
       }),
-      artifactComponent: one(artifactComponents, {
-        fields: [agentArtifactComponents.artifactComponentId],
-        references: [artifactComponents.id]
-      })
+      subAgentRelations: many(subAgentArtifactComponents)
     }));
+    subAgentArtifactComponentsRelations = relations(
+      subAgentArtifactComponents,
+      ({ one }) => ({
+        subAgent: one(subAgents, {
+          fields: [subAgentArtifactComponents.subAgentId],
+          references: [subAgents.id]
+        }),
+        artifactComponent: one(artifactComponents, {
+          fields: [subAgentArtifactComponents.artifactComponentId],
+          references: [artifactComponents.id]
+        })
+      })
+    );
     dataComponentsRelations = relations(dataComponents, ({ many, one }) => ({
       project: one(projects, {
         fields: [dataComponents.tenantId, dataComponents.projectId],
         references: [projects.tenantId, projects.id]
       }),
-      agentRelations: many(agentDataComponents)
+      subAgentRelations: many(subAgentDataComponents)
     }));
-    agentDataComponentsRelations = relations(agentDataComponents, ({ one }) => ({
-      agent: one(agents, {
-        fields: [agentDataComponents.agentId],
-        references: [agents.id]
+    subAgentDataComponentsRelations = relations(subAgentDataComponents, ({ one }) => ({
+      subAgent: one(subAgents, {
+        fields: [subAgentDataComponents.subAgentId],
+        references: [subAgents.id]
       }),
       dataComponent: one(dataComponents, {
-        fields: [agentDataComponents.dataComponentId],
+        fields: [subAgentDataComponents.dataComponentId],
         references: [dataComponents.id]
       })
     }));
@@ -2278,28 +2389,56 @@ var init_schema = __esm({
       })
     }));
     functionsRelations = relations(functions, ({ many }) => ({
-      tools: many(tools)
+      functionTools: many(functionTools)
     }));
-    agentRelationsRelations = relations(agentRelations, ({ one }) => ({
+    subAgentRelationsRelations = relations(subAgentRelations, ({ one }) => ({
       graph: one(agentGraph, {
-        fields: [agentRelations.graphId],
+        fields: [subAgentRelations.graphId],
         references: [agentGraph.id]
       }),
-      sourceAgent: one(agents, {
-        fields: [agentRelations.sourceAgentId],
-        references: [agents.id],
+      sourceSubAgent: one(subAgents, {
+        fields: [subAgentRelations.sourceSubAgentId],
+        references: [subAgents.id],
         relationName: "sourceRelations"
       }),
-      targetAgent: one(agents, {
-        fields: [agentRelations.targetAgentId],
-        references: [agents.id],
+      targetSubAgent: one(subAgents, {
+        fields: [subAgentRelations.targetSubAgentId],
+        references: [subAgents.id],
         relationName: "targetRelations"
       }),
       externalAgent: one(externalAgents, {
-        fields: [agentRelations.externalAgentId],
+        fields: [subAgentRelations.externalSubAgentId],
         references: [externalAgents.id]
       })
     }));
+    functionToolsRelations = relations(functionTools, ({ one, many }) => ({
+      project: one(projects, {
+        fields: [functionTools.tenantId, functionTools.projectId],
+        references: [projects.tenantId, projects.id]
+      }),
+      graph: one(agentGraph, {
+        fields: [functionTools.tenantId, functionTools.projectId, functionTools.graphId],
+        references: [agentGraph.tenantId, agentGraph.projectId, agentGraph.id]
+      }),
+      function: one(functions, {
+        fields: [functionTools.tenantId, functionTools.projectId, functionTools.functionId],
+        references: [functions.tenantId, functions.projectId, functions.id]
+      }),
+      agentRelations: many(agentFunctionToolRelations)
+    }));
+    agentFunctionToolRelationsRelations = relations(
+      agentFunctionToolRelations,
+      ({ one }) => ({
+        agent: one(subAgents, {
+          fields: [agentFunctionToolRelations.subAgentId],
+          references: [subAgents.id]
+        }),
+        functionTool: one(functionTools, {
+          fields: [agentFunctionToolRelations.functionToolId],
+          references: [functionTools.id]
+        })
+      })
+    );
   }
 });
 
@@ -2328,7 +2467,7 @@ var init_utility = __esm({
 });
 
 // ../packages/agents-core/src/validation/schemas.ts
-var StopWhenSchema, GraphStopWhenSchema, AgentStopWhenSchema, MIN_ID_LENGTH, MAX_ID_LENGTH, URL_SAFE_ID_PATTERN, resourceIdSchema, ModelSettingsSchema, ModelSchema, ProjectModelSchema, SandboxConfigSchema, FunctionToolConfigSchema, createApiSchema, createApiInsertSchema, createApiUpdateSchema, createGraphScopedApiSchema, createGraphScopedApiInsertSchema, createGraphScopedApiUpdateSchema, AgentSelectSchema, AgentInsertSchema, AgentUpdateSchema, AgentApiSelectSchema, AgentApiInsertSchema, AgentApiUpdateSchema, AgentRelationSelectSchema, AgentRelationInsertSchema, AgentRelationUpdateSchema, AgentRelationApiSelectSchema, AgentRelationApiInsertSchema, AgentRelationApiUpdateSchema, AgentRelationQuerySchema, ExternalAgentRelationInsertSchema, ExternalAgentRelationApiInsertSchema, AgentGraphSelectSchema, AgentGraphInsertSchema, AgentGraphUpdateSchema, AgentGraphApiSelectSchema, AgentGraphApiInsertSchema, AgentGraphApiUpdateSchema, TaskSelectSchema, TaskInsertSchema, TaskUpdateSchema, TaskApiSelectSchema, TaskApiInsertSchema, TaskApiUpdateSchema, TaskRelationSelectSchema, TaskRelationInsertSchema, TaskRelationUpdateSchema, TaskRelationApiSelectSchema, TaskRelationApiInsertSchema, TaskRelationApiUpdateSchema, imageUrlSchema, McpTransportConfigSchema, ToolStatusSchema, McpToolDefinitionSchema, ToolSelectSchema, ToolInsertSchema, ConversationSelectSchema, ConversationInsertSchema, ConversationUpdateSchema, ConversationApiSelectSchema, ConversationApiInsertSchema, ConversationApiUpdateSchema, MessageSelectSchema, MessageInsertSchema, MessageUpdateSchema, MessageApiSelectSchema, MessageApiInsertSchema, MessageApiUpdateSchema, ContextCacheSelectSchema, ContextCacheInsertSchema, ContextCacheUpdateSchema, ContextCacheApiSelectSchema, ContextCacheApiInsertSchema, ContextCacheApiUpdateSchema, DataComponentSelectSchema, DataComponentInsertSchema, DataComponentBaseSchema, DataComponentUpdateSchema, DataComponentApiSelectSchema, DataComponentApiInsertSchema, DataComponentApiUpdateSchema, AgentDataComponentSelectSchema, AgentDataComponentInsertSchema, AgentDataComponentUpdateSchema, AgentDataComponentApiSelectSchema, AgentDataComponentApiInsertSchema, AgentDataComponentApiUpdateSchema, ArtifactComponentSelectSchema, ArtifactComponentInsertSchema, ArtifactComponentUpdateSchema, ArtifactComponentApiSelectSchema, ArtifactComponentApiInsertSchema, ArtifactComponentApiUpdateSchema, AgentArtifactComponentSelectSchema, AgentArtifactComponentInsertSchema, AgentArtifactComponentUpdateSchema, AgentArtifactComponentApiSelectSchema, AgentArtifactComponentApiInsertSchema, AgentArtifactComponentApiUpdateSchema, ExternalAgentSelectSchema, ExternalAgentInsertSchema, ExternalAgentUpdateSchema, ExternalAgentApiSelectSchema, ExternalAgentApiInsertSchema, ExternalAgentApiUpdateSchema, AllAgentSchema, ApiKeySelectSchema, ApiKeyInsertSchema, ApiKeyUpdateSchema, ApiKeyApiSelectSchema, ApiKeyApiCreationResponseSchema, ApiKeyApiInsertSchema, CredentialReferenceSelectSchema, CredentialReferenceInsertSchema, CredentialReferenceUpdateSchema, CredentialReferenceApiSelectSchema, CredentialReferenceApiInsertSchema, CredentialReferenceApiUpdateSchema, McpToolSchema, MCPToolConfigSchema, ToolUpdateSchema, ToolApiSelectSchema, ToolApiInsertSchema, ToolApiUpdateSchema, FunctionSelectSchema, FunctionInsertSchema, FunctionUpdateSchema, FunctionApiSelectSchema, FunctionApiInsertSchema, FunctionApiUpdateSchema, FetchConfigSchema, FetchDefinitionSchema, ContextConfigSelectSchema, ContextConfigInsertSchema, ContextConfigUpdateSchema, ContextConfigApiSelectSchema, ContextConfigApiInsertSchema, ContextConfigApiUpdateSchema, AgentToolRelationSelectSchema, AgentToolRelationInsertSchema, AgentToolRelationUpdateSchema, AgentToolRelationApiSelectSchema, AgentToolRelationApiInsertSchema, AgentToolRelationApiUpdateSchema, LedgerArtifactSelectSchema, LedgerArtifactInsertSchema, LedgerArtifactUpdateSchema, LedgerArtifactApiSelectSchema, LedgerArtifactApiInsertSchema, LedgerArtifactApiUpdateSchema, StatusComponentSchema, StatusUpdateSchema, CanUseItemSchema, FullGraphAgentInsertSchema, FullGraphDefinitionSchema, GraphWithinContextOfProjectSchema, PaginationSchema, ErrorResponseSchema, ExistsResponseSchema, RemovedResponseSchema, ProjectSelectSchema, ProjectInsertSchema, ProjectUpdateSchema, ProjectApiSelectSchema, ProjectApiInsertSchema, ProjectApiUpdateSchema, FullProjectDefinitionSchema, HeadersScopeSchema, TenantParamsSchema, TenantProjectParamsSchema, TenantProjectGraphParamsSchema, TenantProjectGraphIdParamsSchema, TenantProjectIdParamsSchema, TenantIdParamsSchema, IdParamsSchema, PaginationQueryParamsSchema;
+var StopWhenSchema, GraphStopWhenSchema, SubAgentStopWhenSchema, MIN_ID_LENGTH, MAX_ID_LENGTH, URL_SAFE_ID_PATTERN, resourceIdSchema, ModelSettingsSchema, ModelSchema, ProjectModelSchema, SandboxConfigSchema, FunctionToolConfigSchema, createApiSchema, createApiInsertSchema, createApiUpdateSchema, createGraphScopedApiSchema, createGraphScopedApiInsertSchema, createGraphScopedApiUpdateSchema, SubAgentSelectSchema, SubAgentInsertSchema, SubAgentUpdateSchema, SubAgentApiSelectSchema, SubAgentApiInsertSchema, SubAgentApiUpdateSchema, SubAgentRelationSelectSchema, SubAgentRelationInsertSchema, SubAgentRelationUpdateSchema, SubAgentRelationApiSelectSchema, SubAgentRelationApiInsertSchema, SubAgentRelationApiUpdateSchema, SubAgentRelationQuerySchema, ExternalSubAgentRelationInsertSchema, ExternalSubAgentRelationApiInsertSchema, AgentGraphSelectSchema, AgentGraphInsertSchema, AgentGraphUpdateSchema, AgentGraphApiSelectSchema, AgentGraphApiInsertSchema, AgentGraphApiUpdateSchema, TaskSelectSchema, TaskInsertSchema, TaskUpdateSchema, TaskApiSelectSchema, TaskApiInsertSchema, TaskApiUpdateSchema, TaskRelationSelectSchema, TaskRelationInsertSchema, TaskRelationUpdateSchema, TaskRelationApiSelectSchema, TaskRelationApiInsertSchema, TaskRelationApiUpdateSchema, imageUrlSchema, McpTransportConfigSchema, ToolStatusSchema, McpToolDefinitionSchema, ToolSelectSchema, ToolInsertSchema, ConversationSelectSchema, ConversationInsertSchema, ConversationUpdateSchema, ConversationApiSelectSchema, ConversationApiInsertSchema, ConversationApiUpdateSchema, MessageSelectSchema, MessageInsertSchema, MessageUpdateSchema, MessageApiSelectSchema, MessageApiInsertSchema, MessageApiUpdateSchema, ContextCacheSelectSchema, ContextCacheInsertSchema, ContextCacheUpdateSchema, ContextCacheApiSelectSchema, ContextCacheApiInsertSchema, ContextCacheApiUpdateSchema, DataComponentSelectSchema, DataComponentInsertSchema, DataComponentBaseSchema, DataComponentUpdateSchema, DataComponentApiSelectSchema, DataComponentApiInsertSchema, DataComponentApiUpdateSchema, SubAgentDataComponentSelectSchema, SubAgentDataComponentInsertSchema, SubAgentDataComponentUpdateSchema, SubAgentDataComponentApiSelectSchema, SubAgentDataComponentApiInsertSchema, SubAgentDataComponentApiUpdateSchema, ArtifactComponentSelectSchema, ArtifactComponentInsertSchema, ArtifactComponentUpdateSchema, ArtifactComponentApiSelectSchema, ArtifactComponentApiInsertSchema, ArtifactComponentApiUpdateSchema, SubAgentArtifactComponentSelectSchema, SubAgentArtifactComponentInsertSchema, SubAgentArtifactComponentUpdateSchema, SubAgentArtifactComponentApiSelectSchema, SubAgentArtifactComponentApiInsertSchema, SubAgentArtifactComponentApiUpdateSchema, ExternalAgentSelectSchema, ExternalAgentInsertSchema, ExternalAgentUpdateSchema, ExternalAgentApiSelectSchema, ExternalAgentApiInsertSchema, ExternalAgentApiUpdateSchema, AllAgentSchema, ApiKeySelectSchema, ApiKeyInsertSchema, ApiKeyUpdateSchema, ApiKeyApiSelectSchema, ApiKeyApiCreationResponseSchema, ApiKeyApiInsertSchema, CredentialReferenceSelectSchema, CredentialReferenceInsertSchema, CredentialReferenceUpdateSchema, CredentialReferenceApiSelectSchema, CredentialReferenceApiInsertSchema, CredentialReferenceApiUpdateSchema, McpToolSchema, MCPToolConfigSchema, ToolUpdateSchema, ToolApiSelectSchema, ToolApiInsertSchema, ToolApiUpdateSchema, FunctionToolSelectSchema, FunctionToolInsertSchema, FunctionToolUpdateSchema, FunctionToolApiSelectSchema, FunctionToolApiInsertSchema, FunctionToolApiUpdateSchema, FunctionSelectSchema, FunctionInsertSchema, FunctionUpdateSchema, FunctionApiSelectSchema, FunctionApiInsertSchema, FunctionApiUpdateSchema, FetchConfigSchema, FetchDefinitionSchema, ContextConfigSelectSchema, ContextConfigInsertSchema, ContextConfigUpdateSchema, ContextConfigApiSelectSchema, ContextConfigApiInsertSchema, ContextConfigApiUpdateSchema, SubAgentToolRelationSelectSchema, SubAgentToolRelationInsertSchema, SubAgentToolRelationUpdateSchema, SubAgentToolRelationApiSelectSchema, SubAgentToolRelationApiInsertSchema, SubAgentToolRelationApiUpdateSchema, LedgerArtifactSelectSchema, LedgerArtifactInsertSchema, LedgerArtifactUpdateSchema, LedgerArtifactApiSelectSchema, LedgerArtifactApiInsertSchema, LedgerArtifactApiUpdateSchema, StatusComponentSchema, StatusUpdateSchema, CanUseItemSchema, FullGraphAgentInsertSchema, FullGraphDefinitionSchema, GraphWithinContextOfProjectSchema, PaginationSchema, ErrorResponseSchema, ExistsResponseSchema, RemovedResponseSchema, ProjectSelectSchema, ProjectInsertSchema, ProjectUpdateSchema, ProjectApiSelectSchema, ProjectApiInsertSchema, ProjectApiUpdateSchema, FullProjectDefinitionSchema, HeadersScopeSchema, TenantId, ProjectId, GraphId, SubAgentId, TenantParamsSchema, TenantIdParamsSchema, TenantProjectParamsSchema, TenantProjectIdParamsSchema, TenantProjectGraphParamsSchema, TenantProjectGraphIdParamsSchema, TenantProjectGraphSubAgentParamsSchema, TenantProjectGraphSubAgentIdParamsSchema, PaginationQueryParamsSchema;
 var init_schemas = __esm({
   "../packages/agents-core/src/validation/schemas.ts"() {
     "use strict";
@@ -2342,7 +2481,7 @@ var init_schemas = __esm({
       stepCountIs: z2.number().min(1).max(1e3).optional()
     });
     GraphStopWhenSchema = StopWhenSchema.pick({ transferCountIs: true });
-    AgentStopWhenSchema = StopWhenSchema.pick({ stepCountIs: true });
+    SubAgentStopWhenSchema = StopWhenSchema.pick({ stepCountIs: true });
     MIN_ID_LENGTH = 1;
     MAX_ID_LENGTH = 255;
     URL_SAFE_ID_PATTERN = /^[a-zA-Z0-9\-_.]+$/;
@@ -2385,71 +2524,73 @@ var init_schemas = __esm({
     createGraphScopedApiSchema = (schema) => schema.omit({ tenantId: true, projectId: true, graphId: true });
     createGraphScopedApiInsertSchema = (schema) => schema.omit({ tenantId: true, projectId: true, graphId: true });
     createGraphScopedApiUpdateSchema = (schema) => schema.omit({ tenantId: true, projectId: true, graphId: true }).partial();
-    AgentSelectSchema = createSelectSchema(agents);
-    AgentInsertSchema = createInsertSchema(agents).extend({
+    SubAgentSelectSchema = createSelectSchema(subAgents);
+    SubAgentInsertSchema = createInsertSchema(subAgents).extend({
       id: resourceIdSchema,
       models: ModelSchema.optional()
     });
-    AgentUpdateSchema = AgentInsertSchema.partial();
-    AgentApiSelectSchema = createGraphScopedApiSchema(AgentSelectSchema);
-    AgentApiInsertSchema = createGraphScopedApiInsertSchema(AgentInsertSchema);
-    AgentApiUpdateSchema = createGraphScopedApiUpdateSchema(AgentUpdateSchema);
-    AgentRelationSelectSchema = createSelectSchema(agentRelations);
-    AgentRelationInsertSchema = createInsertSchema(agentRelations).extend({
+    SubAgentUpdateSchema = SubAgentInsertSchema.partial();
+    SubAgentApiSelectSchema = createGraphScopedApiSchema(SubAgentSelectSchema);
+    SubAgentApiInsertSchema = createGraphScopedApiInsertSchema(SubAgentInsertSchema);
+    SubAgentApiUpdateSchema = createGraphScopedApiUpdateSchema(SubAgentUpdateSchema);
+    SubAgentRelationSelectSchema = createSelectSchema(subAgentRelations);
+    SubAgentRelationInsertSchema = createInsertSchema(subAgentRelations).extend({
       id: resourceIdSchema,
       graphId: resourceIdSchema,
-      sourceAgentId: resourceIdSchema,
-      targetAgentId: resourceIdSchema.optional(),
-      externalAgentId: resourceIdSchema.optional()
+      sourceSubAgentId: resourceIdSchema,
+      targetSubAgentId: resourceIdSchema.optional(),
+      externalSubAgentId: resourceIdSchema.optional()
     });
-    AgentRelationUpdateSchema = AgentRelationInsertSchema.partial();
-    AgentRelationApiSelectSchema = createGraphScopedApiSchema(AgentRelationSelectSchema);
-    AgentRelationApiInsertSchema = createGraphScopedApiInsertSchema(
-      AgentRelationInsertSchema
+    SubAgentRelationUpdateSchema = SubAgentRelationInsertSchema.partial();
+    SubAgentRelationApiSelectSchema = createGraphScopedApiSchema(
+      SubAgentRelationSelectSchema
+    );
+    SubAgentRelationApiInsertSchema = createGraphScopedApiInsertSchema(
+      SubAgentRelationInsertSchema
     ).extend({
       relationType: z2.enum(VALID_RELATION_TYPES)
     }).refine(
       (data) => {
-        const hasTarget = data.targetAgentId != null;
-        const hasExternal = data.externalAgentId != null;
+        const hasTarget = data.targetSubAgentId != null;
+        const hasExternal = data.externalSubAgentId != null;
         return hasTarget !== hasExternal;
       },
       {
-        message: "Must specify exactly one of targetAgentId or externalAgentId",
-        path: ["targetAgentId", "externalAgentId"]
+        message: "Must specify exactly one of targetSubAgentId or externalSubAgentId",
+        path: ["targetSubAgentId", "externalSubAgentId"]
       }
     );
-    AgentRelationApiUpdateSchema = createGraphScopedApiUpdateSchema(
-      AgentRelationUpdateSchema
+    SubAgentRelationApiUpdateSchema = createGraphScopedApiUpdateSchema(
+      SubAgentRelationUpdateSchema
     ).extend({
       relationType: z2.enum(VALID_RELATION_TYPES).optional()
     }).refine(
       (data) => {
-        const hasTarget = data.targetAgentId != null;
-        const hasExternal = data.externalAgentId != null;
+        const hasTarget = data.targetSubAgentId != null;
+        const hasExternal = data.externalSubAgentId != null;
         if (!hasTarget && !hasExternal) {
           return true;
         }
         return hasTarget !== hasExternal;
       },
       {
-        message: "Must specify exactly one of targetAgentId or externalAgentId when updating agent relationships",
-        path: ["targetAgentId", "externalAgentId"]
+        message: "Must specify exactly one of targetSubAgentId or externalSubAgentId when updating sub-agent relationships",
+        path: ["targetSubAgentId", "externalSubAgentId"]
       }
     );
-    AgentRelationQuerySchema = z2.object({
-      sourceAgentId: z2.string().optional(),
-      targetAgentId: z2.string().optional(),
-      externalAgentId: z2.string().optional()
+    SubAgentRelationQuerySchema = z2.object({
+      sourceSubAgentId: z2.string().optional(),
+      targetSubAgentId: z2.string().optional(),
+      externalSubAgentId: z2.string().optional()
     });
-    ExternalAgentRelationInsertSchema = createInsertSchema(agentRelations).extend({
+    ExternalSubAgentRelationInsertSchema = createInsertSchema(subAgentRelations).extend({
       id: resourceIdSchema,
       graphId: resourceIdSchema,
-      sourceAgentId: resourceIdSchema,
-      externalAgentId: resourceIdSchema
+      sourceSubAgentId: resourceIdSchema,
+      externalSubAgentId: resourceIdSchema
     });
-    ExternalAgentRelationApiInsertSchema = createApiInsertSchema(
-      ExternalAgentRelationInsertSchema
+    ExternalSubAgentRelationApiInsertSchema = createApiInsertSchema(
+      ExternalSubAgentRelationInsertSchema
     );
     AgentGraphSelectSchema = createSelectSchema(agentGraph);
     AgentGraphInsertSchema = createInsertSchema(agentGraph).extend({
@@ -2516,32 +2657,22 @@ var init_schemas = __esm({
     ToolInsertSchema = createInsertSchema(tools).extend({
       id: resourceIdSchema,
       imageUrl: imageUrlSchema,
-      functionId: resourceIdSchema.optional(),
-      // For function tools, reference to global functions table
-      config: z2.discriminatedUnion("type", [
-        // MCP tools
-        z2.object({
-          type: z2.literal("mcp"),
-          mcp: z2.object({
-            server: z2.object({
-              url: z2.string().url()
-            }),
-            transport: z2.object({
-              type: z2.enum(MCPTransportType),
-              requestInit: z2.record(z2.string(), z2.unknown()).optional(),
-              eventSourceInit: z2.record(z2.string(), z2.unknown()).optional(),
-              reconnectionOptions: z2.custom().optional(),
-              sessionId: z2.string().optional()
-            }).optional(),
-            activeTools: z2.array(z2.string()).optional()
-          })
-        }),
-        // Function tools (reference-only, no inline duplication)
-        z2.object({
-          type: z2.literal("function")
-          // No inline function details - they're in the functions table via functionId
+      config: z2.object({
+        type: z2.literal("mcp"),
+        mcp: z2.object({
+          server: z2.object({
+            url: z2.string().url()
+          }),
+          transport: z2.object({
+            type: z2.enum(MCPTransportType),
+            requestInit: z2.record(z2.string(), z2.unknown()).optional(),
+            eventSourceInit: z2.record(z2.string(), z2.unknown()).optional(),
+            reconnectionOptions: z2.custom().optional(),
+            sessionId: z2.string().optional()
+          }).optional(),
+          activeTools: z2.array(z2.string()).optional()
         })
-      ])
+      })
     });
     ConversationSelectSchema = createSelectSchema(conversations);
     ConversationInsertSchema = createInsertSchema(conversations).extend({
@@ -2580,20 +2711,20 @@ var init_schemas = __esm({
     DataComponentApiSelectSchema = createApiSchema(DataComponentSelectSchema);
     DataComponentApiInsertSchema = createApiInsertSchema(DataComponentInsertSchema);
     DataComponentApiUpdateSchema = createApiUpdateSchema(DataComponentUpdateSchema);
-    AgentDataComponentSelectSchema = createSelectSchema(agentDataComponents);
-    AgentDataComponentInsertSchema = createInsertSchema(agentDataComponents);
-    AgentDataComponentUpdateSchema = AgentDataComponentInsertSchema.partial();
-    AgentDataComponentApiSelectSchema = createGraphScopedApiSchema(
-      AgentDataComponentSelectSchema
+    SubAgentDataComponentSelectSchema = createSelectSchema(subAgentDataComponents);
+    SubAgentDataComponentInsertSchema = createInsertSchema(subAgentDataComponents);
+    SubAgentDataComponentUpdateSchema = SubAgentDataComponentInsertSchema.partial();
+    SubAgentDataComponentApiSelectSchema = createGraphScopedApiSchema(
+      SubAgentDataComponentSelectSchema
     );
-    AgentDataComponentApiInsertSchema = AgentDataComponentInsertSchema.omit({
+    SubAgentDataComponentApiInsertSchema = SubAgentDataComponentInsertSchema.omit({
       tenantId: true,
       projectId: true,
       id: true,
       createdAt: true
     });
-    AgentDataComponentApiUpdateSchema = createGraphScopedApiUpdateSchema(
-      AgentDataComponentUpdateSchema
+    SubAgentDataComponentApiUpdateSchema = createGraphScopedApiUpdateSchema(
+      SubAgentDataComponentUpdateSchema
     );
     ArtifactComponentSelectSchema = createSelectSchema(artifactComponents);
     ArtifactComponentInsertSchema = createInsertSchema(artifactComponents).extend({
@@ -2610,26 +2741,26 @@ var init_schemas = __esm({
     ArtifactComponentApiUpdateSchema = createApiUpdateSchema(
       ArtifactComponentUpdateSchema
     );
-    AgentArtifactComponentSelectSchema = createSelectSchema(agentArtifactComponents);
-    AgentArtifactComponentInsertSchema = createInsertSchema(
-      agentArtifactComponents
+    SubAgentArtifactComponentSelectSchema = createSelectSchema(subAgentArtifactComponents);
+    SubAgentArtifactComponentInsertSchema = createInsertSchema(
+      subAgentArtifactComponents
     ).extend({
       id: resourceIdSchema,
-      agentId: resourceIdSchema,
+      subAgentId: resourceIdSchema,
       artifactComponentId: resourceIdSchema
     });
-    AgentArtifactComponentUpdateSchema = AgentArtifactComponentInsertSchema.partial();
-    AgentArtifactComponentApiSelectSchema = createGraphScopedApiSchema(
-      AgentArtifactComponentSelectSchema
+    SubAgentArtifactComponentUpdateSchema = SubAgentArtifactComponentInsertSchema.partial();
+    SubAgentArtifactComponentApiSelectSchema = createGraphScopedApiSchema(
+      SubAgentArtifactComponentSelectSchema
     );
-    AgentArtifactComponentApiInsertSchema = AgentArtifactComponentInsertSchema.omit({
+    SubAgentArtifactComponentApiInsertSchema = SubAgentArtifactComponentInsertSchema.omit({
       tenantId: true,
       projectId: true,
       id: true,
       createdAt: true
     });
-    AgentArtifactComponentApiUpdateSchema = createGraphScopedApiUpdateSchema(
-      AgentArtifactComponentUpdateSchema
+    SubAgentArtifactComponentApiUpdateSchema = createGraphScopedApiUpdateSchema(
+      SubAgentArtifactComponentUpdateSchema
     );
     ExternalAgentSelectSchema = createSelectSchema(externalAgents).extend({
       credentialReferenceId: z2.string().nullable().optional(),
@@ -2643,7 +2774,7 @@ var init_schemas = __esm({
     ExternalAgentApiInsertSchema = createGraphScopedApiInsertSchema(ExternalAgentInsertSchema);
     ExternalAgentApiUpdateSchema = createGraphScopedApiUpdateSchema(ExternalAgentUpdateSchema);
     AllAgentSchema = z2.discriminatedUnion("type", [
-      AgentApiSelectSchema.extend({ type: z2.literal("internal") }),
+      SubAgentApiSelectSchema.extend({ type: z2.literal("internal") }),
       ExternalAgentApiSelectSchema.extend({ type: z2.literal("external") })
     ]);
     ApiKeySelectSchema = createSelectSchema(apiKeys);
@@ -2750,6 +2881,14 @@ var init_schemas = __esm({
     ToolApiSelectSchema = createApiSchema(ToolSelectSchema);
     ToolApiInsertSchema = createApiInsertSchema(ToolInsertSchema);
     ToolApiUpdateSchema = createApiUpdateSchema(ToolUpdateSchema);
+    FunctionToolSelectSchema = createSelectSchema(functionTools);
+    FunctionToolInsertSchema = createInsertSchema(functionTools).extend({
+      id: resourceIdSchema
+    });
+    FunctionToolUpdateSchema = FunctionToolInsertSchema.partial();
+    FunctionToolApiSelectSchema = createApiSchema(FunctionToolSelectSchema);
+    FunctionToolApiInsertSchema = createGraphScopedApiInsertSchema(FunctionToolInsertSchema);
+    FunctionToolApiUpdateSchema = createApiUpdateSchema(FunctionToolUpdateSchema);
     FunctionSelectSchema = createSelectSchema(functions);
     FunctionInsertSchema = createInsertSchema(functions).extend({
       id: resourceIdSchema
@@ -2797,23 +2936,23 @@ var init_schemas = __esm({
     ContextConfigApiUpdateSchema = createApiUpdateSchema(ContextConfigUpdateSchema).omit({
       graphId: true
     });
-    AgentToolRelationSelectSchema = createSelectSchema(agentToolRelations);
-    AgentToolRelationInsertSchema = createInsertSchema(agentToolRelations).extend({
+    SubAgentToolRelationSelectSchema = createSelectSchema(subAgentToolRelations);
+    SubAgentToolRelationInsertSchema = createInsertSchema(subAgentToolRelations).extend({
       id: resourceIdSchema,
-      agentId: resourceIdSchema,
+      subAgentId: resourceIdSchema,
       toolId: resourceIdSchema,
       selectedTools: z2.array(z2.string()).nullish(),
       headers: z2.record(z2.string(), z2.string()).nullish()
     });
-    AgentToolRelationUpdateSchema = AgentToolRelationInsertSchema.partial();
-    AgentToolRelationApiSelectSchema = createGraphScopedApiSchema(
-      AgentToolRelationSelectSchema
+    SubAgentToolRelationUpdateSchema = SubAgentToolRelationInsertSchema.partial();
+    SubAgentToolRelationApiSelectSchema = createGraphScopedApiSchema(
+      SubAgentToolRelationSelectSchema
     );
-    AgentToolRelationApiInsertSchema = createGraphScopedApiInsertSchema(
-      AgentToolRelationInsertSchema
+    SubAgentToolRelationApiInsertSchema = createGraphScopedApiInsertSchema(
+      SubAgentToolRelationInsertSchema
     );
-    AgentToolRelationApiUpdateSchema = createGraphScopedApiUpdateSchema(
-      AgentToolRelationUpdateSchema
+    SubAgentToolRelationApiUpdateSchema = createGraphScopedApiUpdateSchema(
+      SubAgentToolRelationUpdateSchema
     );
     LedgerArtifactSelectSchema = createSelectSchema(ledgerArtifacts);
     LedgerArtifactInsertSchema = createInsertSchema(ledgerArtifacts);
@@ -2843,7 +2982,7 @@ var init_schemas = __esm({
       toolSelection: z2.array(z2.string()).nullish(),
       headers: z2.record(z2.string(), z2.string()).nullish()
     });
-    FullGraphAgentInsertSchema = AgentApiInsertSchema.extend({
+    FullGraphAgentInsertSchema = SubAgentApiInsertSchema.extend({
       type: z2.literal("internal"),
       canUse: z2.array(CanUseItemSchema),
       // All tools (both MCP and function tools)
@@ -2853,10 +2992,15 @@ var init_schemas = __esm({
       canDelegateTo: z2.array(z2.string()).optional()
     });
     FullGraphDefinitionSchema = AgentGraphApiInsertSchema.extend({
-      agents: z2.record(z2.string(), z2.union([FullGraphAgentInsertSchema, ExternalAgentApiInsertSchema])),
+      subAgents: z2.record(
+        z2.string(),
+        z2.union([FullGraphAgentInsertSchema, ExternalAgentApiInsertSchema])
+      ),
       // Lookup maps for UI to resolve canUse items
       tools: z2.record(z2.string(), ToolApiInsertSchema).optional(),
-      // Get tool name/description from toolId
+      // MCP tools (project-scoped)
+      functionTools: z2.record(z2.string(), FunctionToolApiInsertSchema).optional(),
+      // Function tools (graph-scoped)
       functions: z2.record(z2.string(), FunctionApiInsertSchema).optional(),
       // Get function code for function tools
       contextConfig: z2.optional(ContextConfigApiInsertSchema),
@@ -2866,13 +3010,20 @@ var init_schemas = __esm({
       graphPrompt: z2.string().max(5e3, "Graph prompt cannot exceed 5000 characters").optional()
     });
     GraphWithinContextOfProjectSchema = AgentGraphApiInsertSchema.extend({
-      agents: z2.record(
+      subAgents: z2.record(
         z2.string(),
         z2.discriminatedUnion("type", [
           FullGraphAgentInsertSchema,
           ExternalAgentApiInsertSchema.extend({ type: z2.literal("external") })
         ])
       ),
+      // Lookup maps for UI to resolve canUse items
+      tools: z2.record(z2.string(), ToolApiInsertSchema).optional(),
+      // MCP tools (project-scoped)
+      functionTools: z2.record(z2.string(), FunctionToolApiInsertSchema).optional(),
+      // Function tools (graph-scoped)
+      functions: z2.record(z2.string(), FunctionApiInsertSchema).optional(),
+      // Get function code for function tools
       contextConfig: z2.optional(ContextConfigApiInsertSchema),
       statusUpdates: z2.optional(StatusUpdateSchema),
       models: ModelSchema.optional(),
@@ -2913,9 +3064,9 @@ var init_schemas = __esm({
     FullProjectDefinitionSchema = ProjectApiInsertSchema.extend({
       graphs: z2.record(z2.string(), GraphWithinContextOfProjectSchema),
       tools: z2.record(z2.string(), ToolApiInsertSchema),
-      // Now includes both MCP and function tools
+      // MCP tools (project-scoped)
       functions: z2.record(z2.string(), FunctionApiInsertSchema).optional(),
-      // Global functions
+      // Functions (project-scoped)
       dataComponents: z2.record(z2.string(), DataComponentApiInsertSchema).optional(),
       artifactComponents: z2.record(z2.string(), ArtifactComponentApiInsertSchema).optional(),
       statusUpdates: z2.optional(StatusUpdateSchema),
@@ -2937,72 +3088,46 @@ var init_schemas = __esm({
         example: "graph_789"
       })
     });
+    TenantId = z2.string().openapi({
+      description: "Tenant identifier",
+      example: "tenant_123"
+    });
+    ProjectId = z2.string().openapi({
+      description: "Project identifier",
+      example: "project_456"
+    });
+    GraphId = z2.string().openapi({
+      description: "Graph identifier",
+      example: "graph_789"
+    });
+    SubAgentId = z2.string().openapi({
+      description: "Sub-agent identifier",
+      example: "sub_agent_123"
+    });
     TenantParamsSchema = z2.object({
-      tenantId: z2.string().openapi({
-        description: "Tenant identifier",
-        example: "tenant_123"
-      })
+      tenantId: TenantId
     }).openapi("TenantParams");
-    TenantProjectParamsSchema = z2.object({
-      tenantId: z2.string().openapi({
-        description: "Tenant identifier",
-        example: "tenant_123"
-      }),
-      projectId: z2.string().openapi({
-        description: "Project identifier",
-        example: "project_456"
-      })
-    }).openapi("TenantProjectParams");
-    TenantProjectGraphParamsSchema = z2.object({
-      tenantId: z2.string().openapi({
-        description: "Tenant identifier",
-        example: "tenant_123"
-      }),
-      projectId: z2.string().openapi({
-        description: "Project identifier",
-        example: "project_456"
-      }),
-      graphId: z2.string().openapi({
-        description: "Graph identifier",
-        example: "graph_789"
-      })
-    }).openapi("TenantProjectGraphParams");
-    TenantProjectGraphIdParamsSchema = z2.object({
-      tenantId: z2.string().openapi({
-        description: "Tenant identifier",
-        example: "tenant_123"
-      }),
-      projectId: z2.string().openapi({
-        description: "Project identifier",
-        example: "project_456"
-      }),
-      graphId: z2.string().openapi({
-        description: "Graph identifier",
-        example: "graph_789"
-      }),
+    TenantIdParamsSchema = TenantParamsSchema.extend({
       id: resourceIdSchema
-    }).openapi("TenantProjectGraphIdParams");
-    TenantProjectIdParamsSchema = z2.object({
-      tenantId: z2.string().openapi({
-        description: "Tenant identifier",
-        example: "tenant_123"
-      }),
-      projectId: z2.string().openapi({
-        description: "Project identifier",
-        example: "project_456"
-      }),
+    }).openapi("TenantIdParams");
+    TenantProjectParamsSchema = TenantParamsSchema.extend({
+      projectId: ProjectId
+    }).openapi("TenantProjectParams");
+    TenantProjectIdParamsSchema = TenantProjectParamsSchema.extend({
       id: resourceIdSchema
     }).openapi("TenantProjectIdParams");
-    TenantIdParamsSchema = z2.object({
-      tenantId: z2.string().openapi({
-        description: "Tenant identifier",
-        example: "tenant_123"
-      }),
+    TenantProjectGraphParamsSchema = TenantProjectParamsSchema.extend({
+      graphId: GraphId
+    }).openapi("TenantProjectGraphParams");
+    TenantProjectGraphIdParamsSchema = TenantProjectGraphParamsSchema.extend({
       id: resourceIdSchema
-    }).openapi("TenantIdParams");
-    IdParamsSchema = z2.object({
+    }).openapi("TenantProjectGraphIdParams");
+    TenantProjectGraphSubAgentParamsSchema = TenantProjectGraphParamsSchema.extend({
+      subAgentId: SubAgentId
+    }).openapi("TenantProjectGraphSubAgentParams");
+    TenantProjectGraphSubAgentIdParamsSchema = TenantProjectGraphSubAgentParamsSchema.extend({
       id: resourceIdSchema
-    }).openapi("IdParams");
+    }).openapi("TenantProjectGraphSubAgentIdParams");
     PaginationQueryParamsSchema = z2.object({
       page: z2.coerce.number().min(1).default(1),
       limit: z2.coerce.number().min(1).max(100).default(10)
@@ -4616,50 +4741,63 @@ var init_client = __esm({
   }
 });
 
-// ../packages/agents-core/src/data-access/agentRelations.ts
-import { and, count, desc, eq, isNotNull } from "drizzle-orm";
-var init_agentRelations = __esm({
-  "../packages/agents-core/src/data-access/agentRelations.ts"() {
+// ../packages/agents-core/src/data-access/contextConfigs.ts
+import { and, count, desc, eq, sql as sql2 } from "drizzle-orm";
+var init_contextConfigs = __esm({
+  "../packages/agents-core/src/data-access/contextConfigs.ts"() {
     "use strict";
     init_esm_shims();
     init_schema();
   }
 });
 
-// ../packages/agents-core/src/data-access/agents.ts
-import { and as and2, count as count2, desc as desc2, eq as eq2, inArray } from "drizzle-orm";
-var init_agents = __esm({
-  "../packages/agents-core/src/data-access/agents.ts"() {
+// ../packages/agents-core/src/data-access/externalAgents.ts
+import { and as and2, asc, count as count2, desc as desc2, eq as eq2 } from "drizzle-orm";
+var init_externalAgents = __esm({
+  "../packages/agents-core/src/data-access/externalAgents.ts"() {
     "use strict";
     init_esm_shims();
     init_schema();
   }
 });
 
-// ../packages/agents-core/src/data-access/contextConfigs.ts
-import { and as and3, count as count3, desc as desc3, eq as eq3, sql as sql2 } from "drizzle-orm";
-var init_contextConfigs = __esm({
-  "../packages/agents-core/src/data-access/contextConfigs.ts"() {
+// ../packages/agents-core/src/data-access/functions.ts
+import { and as and3, eq as eq3 } from "drizzle-orm";
+var init_functions = __esm({
+  "../packages/agents-core/src/data-access/functions.ts"() {
     "use strict";
     init_esm_shims();
     init_schema();
   }
 });
 
-// ../packages/agents-core/src/data-access/externalAgents.ts
-import { and as and4, asc, count as count4, desc as desc4, eq as eq4 } from "drizzle-orm";
-var init_externalAgents = __esm({
-  "../packages/agents-core/src/data-access/externalAgents.ts"() {
+// ../packages/agents-core/src/data-access/functionTools.ts
+import { and as and4, count as count3, desc as desc3, eq as eq4 } from "drizzle-orm";
+var logger4;
+var init_functionTools = __esm({
+  "../packages/agents-core/src/data-access/functionTools.ts"() {
     "use strict";
     init_esm_shims();
     init_schema();
+    init_logger();
+    logger4 = getLogger("functionTools");
   }
 });
 
-// ../packages/agents-core/src/data-access/functions.ts
-import { and as and5, eq as eq5 } from "drizzle-orm";
-var init_functions = __esm({
-  "../packages/agents-core/src/data-access/functions.ts"() {
+// ../packages/agents-core/src/data-access/subAgentRelations.ts
+import { and as and5, count as count4, desc as desc4, eq as eq5, isNotNull } from "drizzle-orm";
+var init_subAgentRelations = __esm({
+  "../packages/agents-core/src/data-access/subAgentRelations.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_schema();
+  }
+});
+
+// ../packages/agents-core/src/data-access/subAgents.ts
+import { and as and6, count as count5, desc as desc5, eq as eq6, inArray } from "drizzle-orm";
+var init_subAgents = __esm({
+  "../packages/agents-core/src/data-access/subAgents.ts"() {
     "use strict";
     init_esm_shims();
     init_schema();
@@ -4678,7 +4816,7 @@ var init_credential_stuffer = __esm({
 // ../packages/agents-core/src/utils/apiKeys.ts
 import { randomBytes, scrypt, timingSafeEqual } from "crypto";
 import { promisify } from "util";
-var scryptAsync, logger4, PUBLIC_ID_LENGTH, PUBLIC_ID_ALPHABET, generatePublicId;
+var scryptAsync, logger5, PUBLIC_ID_LENGTH, PUBLIC_ID_ALPHABET, generatePublicId;
 var init_apiKeys = __esm({
   "../packages/agents-core/src/utils/apiKeys.ts"() {
     "use strict";
@@ -4686,7 +4824,7 @@ var init_apiKeys = __esm({
     init_nanoid();
     init_logger();
     scryptAsync = promisify(scrypt);
-    logger4 = getLogger("api-key");
+    logger5 = getLogger("api-key");
     PUBLIC_ID_LENGTH = 12;
     PUBLIC_ID_ALPHABET = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-";
     generatePublicId = customAlphabet(PUBLIC_ID_ALPHABET, PUBLIC_ID_LENGTH);
@@ -7328,26 +7466,26 @@ var require_resolve = __commonJS({
       return true;
     }
     function countKeys(schema) {
-      var count15 = 0, item;
+      var count16 = 0, item;
       if (Array.isArray(schema)) {
         for (var i2 = 0; i2 < schema.length; i2++) {
           item = schema[i2];
-          if (typeof item == "object") count15 += countKeys(item);
-          if (count15 == Infinity) return Infinity;
+          if (typeof item == "object") count16 += countKeys(item);
+          if (count16 == Infinity) return Infinity;
         }
       } else {
         for (var key in schema) {
           if (key == "$ref") return Infinity;
           if (SIMPLE_INLINED[key]) {
-            count15++;
+            count16++;
           } else {
             item = schema[key];
-            if (typeof item == "object") count15 += countKeys(item) + 1;
-            if (count15 == Infinity) return Infinity;
+            if (typeof item == "object") count16 += countKeys(item) + 1;
+            if (count16 == Infinity) return Infinity;
           }
         }
       }
-      return count15;
+      return count16;
     }
     function getFullPath(id, normalize) {
       if (normalize !== false) id = normalizeId(id);
@@ -12069,14 +12207,14 @@ var require_ajv = __commonJS({
       return metaOpts;
     }
     function setLogger(self) {
-      var logger14 = self._opts.logger;
-      if (logger14 === false) {
+      var logger15 = self._opts.logger;
+      if (logger15 === false) {
         self.logger = { log: noop, warn: noop, error: noop };
       } else {
-        if (logger14 === void 0) logger14 = console;
-        if (!(typeof logger14 == "object" && logger14.log && logger14.warn && logger14.error))
+        if (logger15 === void 0) logger15 = console;
+        if (!(typeof logger15 == "object" && logger15.log && logger15.warn && logger15.error))
           throw new Error("logger must implement log, warn and error methods");
-        self.logger = logger14;
+        self.logger = logger15;
       }
     }
     function noop() {
@@ -12721,12 +12859,12 @@ var init_global_utils = __esm({
 
 // ../node_modules/.pnpm/@opentelemetry+api@1.9.0/node_modules/@opentelemetry/api/build/esm/diag/ComponentLogger.js
 function logProxy(funcName, namespace, args) {
-  var logger14 = getGlobal("diag");
-  if (!logger14) {
+  var logger15 = getGlobal("diag");
+  if (!logger15) {
     return;
   }
   args.unshift(namespace);
-  return logger14[funcName].apply(logger14, __spreadArray([], __read(args), false));
+  return logger15[funcName].apply(logger15, __spreadArray([], __read(args), false));
 }
 var __read, __spreadArray, DiagComponentLogger;
 var init_ComponentLogger = __esm({
@@ -12824,17 +12962,17 @@ var init_types3 = __esm({
 });
 
 // ../node_modules/.pnpm/@opentelemetry+api@1.9.0/node_modules/@opentelemetry/api/build/esm/diag/internal/logLevelLogger.js
-function createLogLevelDiagLogger(maxLevel, logger14) {
+function createLogLevelDiagLogger(maxLevel, logger15) {
   if (maxLevel < DiagLogLevel.NONE) {
     maxLevel = DiagLogLevel.NONE;
   } else if (maxLevel > DiagLogLevel.ALL) {
     maxLevel = DiagLogLevel.ALL;
   }
-  logger14 = logger14 || {};
+  logger15 = logger15 || {};
   function _filterFunc(funcName, theLevel) {
-    var theFunc = logger14[funcName];
+    var theFunc = logger15[funcName];
     if (typeof theFunc === "function" && maxLevel >= theLevel) {
-      return theFunc.bind(logger14);
+      return theFunc.bind(logger15);
     }
     return function() {
     };
@@ -12901,19 +13039,19 @@ var init_diag = __esm({
             for (var _i = 0; _i < arguments.length; _i++) {
               args[_i] = arguments[_i];
             }
-            var logger14 = getGlobal("diag");
-            if (!logger14)
+            var logger15 = getGlobal("diag");
+            if (!logger15)
               return;
-            return logger14[funcName].apply(logger14, __spreadArray2([], __read2(args), false));
+            return logger15[funcName].apply(logger15, __spreadArray2([], __read2(args), false));
           };
         }
         var self = this;
-        var setLogger = function(logger14, optionsOrLogLevel) {
+        var setLogger = function(logger15, optionsOrLogLevel) {
           var _a, _b, _c;
           if (optionsOrLogLevel === void 0) {
             optionsOrLogLevel = { logLevel: DiagLogLevel.INFO };
           }
-          if (logger14 === self) {
+          if (logger15 === self) {
             var err = new Error("Cannot use diag as the logger for itself. Please use a DiagLogger implementation like ConsoleDiagLogger or a custom implementation");
             self.error((_a = err.stack) !== null && _a !== void 0 ? _a : err.message);
             return false;
@@ -12924,7 +13062,7 @@ var init_diag = __esm({
             };
           }
           var oldLogger = getGlobal("diag");
-          var newLogger = createLogLevelDiagLogger((_b = optionsOrLogLevel.logLevel) !== null && _b !== void 0 ? _b : DiagLogLevel.INFO, logger14);
+          var newLogger = createLogLevelDiagLogger((_b = optionsOrLogLevel.logLevel) !== null && _b !== void 0 ? _b : DiagLogLevel.INFO, logger15);
           if (oldLogger && !optionsOrLogLevel.suppressOverrideMessage) {
             var stack = (_c = new Error().stack) !== null && _c !== void 0 ? _c : "<failed to generate stacktrace>";
             oldLogger.warn("Current logger will be overwritten from " + stack);
@@ -13493,18 +13631,18 @@ function getTracer(serviceName, serviceVersion) {
   try {
     return trace.getTracer(serviceName, serviceVersion);
   } catch (_error) {
-    logger5.debug({}, "OpenTelemetry tracer not available, using no-op tracer");
+    logger6.debug({}, "OpenTelemetry tracer not available, using no-op tracer");
     return noopTracer;
   }
 }
-var logger5, createNoOpSpan, noopTracer;
+var logger6, createNoOpSpan, noopTracer;
 var init_tracer_factory = __esm({
   "../packages/agents-core/src/utils/tracer-factory.ts"() {
     "use strict";
     init_esm_shims();
     init_esm();
     init_utils();
-    logger5 = getLogger("tracer");
+    logger6 = getLogger("tracer");
     createNoOpSpan = () => ({
       setAttributes: () => ({}),
       recordException: () => ({}),
@@ -13555,7 +13693,7 @@ var init_utils = __esm({
 });
 
 // ../packages/agents-core/src/data-access/credentialReferences.ts
-import { and as and6, count as count5, desc as desc5, eq as eq6, sql as sql3 } from "drizzle-orm";
+import { and as and7, count as count6, desc as desc6, eq as eq7, sql as sql3 } from "drizzle-orm";
 var init_credentialReferences = __esm({
   "../packages/agents-core/src/data-access/credentialReferences.ts"() {
     "use strict";
@@ -13565,8 +13703,8 @@ var init_credentialReferences = __esm({
 });
 
 // ../packages/agents-core/src/data-access/tools.ts
-import { and as and7, count as count6, desc as desc6, eq as eq7 } from "drizzle-orm";
-var logger6;
+import { and as and8, count as count7, desc as desc7, eq as eq8 } from "drizzle-orm";
+var logger7;
 var init_tools = __esm({
   "../packages/agents-core/src/data-access/tools.ts"() {
     "use strict";
@@ -13578,30 +13716,31 @@ var init_tools = __esm({
     init_utils();
     init_logger();
     init_mcp_client();
-    init_agentRelations();
     init_credentialReferences();
-    logger6 = getLogger("tools");
+    init_subAgentRelations();
+    logger7 = getLogger("tools");
   }
 });
 
 // ../packages/agents-core/src/data-access/agentGraphs.ts
-import { and as and8, count as count7, desc as desc7, eq as eq8, inArray as inArray2 } from "drizzle-orm";
+import { and as and9, count as count8, desc as desc8, eq as eq9, inArray as inArray2 } from "drizzle-orm";
 var init_agentGraphs = __esm({
   "../packages/agents-core/src/data-access/agentGraphs.ts"() {
     "use strict";
     init_esm_shims();
     init_schema();
-    init_agentRelations();
-    init_agents();
     init_contextConfigs();
     init_externalAgents();
     init_functions();
+    init_functionTools();
+    init_subAgentRelations();
+    init_subAgents();
     init_tools();
   }
 });
 
 // ../packages/agents-core/src/data-access/apiKeys.ts
-import { and as and9, count as count8, desc as desc8, eq as eq9 } from "drizzle-orm";
+import { and as and10, count as count9, desc as desc9, eq as eq10 } from "drizzle-orm";
 var init_apiKeys2 = __esm({
   "../packages/agents-core/src/data-access/apiKeys.ts"() {
     "use strict";
@@ -14615,10 +14754,10 @@ var require_codegen = __commonJS({
     }
     exports.not = not2;
     var andCode = mappend(exports.operators.AND);
-    function and19(...args) {
+    function and20(...args) {
       return args.reduce(andCode);
     }
-    exports.and = and19;
+    exports.and = and20;
     var orCode = mappend(exports.operators.OR);
     function or(...args) {
       return args.reduce(orCode);
@@ -15779,20 +15918,20 @@ var require_resolve2 = __commonJS({
       return false;
     }
     function countKeys(schema) {
-      let count15 = 0;
+      let count16 = 0;
       for (const key in schema) {
         if (key === "$ref")
           return Infinity;
-        count15++;
+        count16++;
         if (SIMPLE_INLINED.has(key))
           continue;
         if (typeof schema[key] == "object") {
-          (0, util_1.eachItem)(schema[key], (sch) => count15 += countKeys(sch));
+          (0, util_1.eachItem)(schema[key], (sch) => count16 += countKeys(sch));
         }
-        if (count15 === Infinity)
+        if (count16 === Infinity)
           return Infinity;
       }
-      return count15;
+      return count16;
     }
     function getFullPath(resolver, id = "", normalize) {
       if (normalize !== false)
@@ -17936,13 +18075,13 @@ var require_core = __commonJS({
     }, warn() {
     }, error() {
     } };
-    function getLogger2(logger14) {
-      if (logger14 === false)
+    function getLogger2(logger15) {
+      if (logger15 === false)
         return noLogs;
-      if (logger14 === void 0)
+      if (logger15 === void 0)
         return console;
-      if (logger14.log && logger14.warn && logger14.error)
-        return logger14;
+      if (logger15.log && logger15.warn && logger15.error)
+        return logger15;
       throw new Error("logger must implement log, warn and error methods");
     }
     var KEYWORD_NAME = /^[a-z_$][a-z0-9_$:-]*$/i;
@@ -18898,8 +19037,8 @@ var require_contains2 = __commonJS({
         cxt.result(valid, () => cxt.reset());
         function validateItemsWithCount() {
           const schValid = gen.name("_valid");
-          const count15 = gen.let("count", 0);
-          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count15)));
+          const count16 = gen.let("count", 0);
+          validateItems(schValid, () => gen.if(schValid, () => checkLimits(count16)));
         }
         function validateItems(_valid, block) {
           gen.forRange("i", 0, len, (i2) => {
@@ -18912,16 +19051,16 @@ var require_contains2 = __commonJS({
             block();
           });
         }
-        function checkLimits(count15) {
-          gen.code((0, codegen_1._)`${count15}++`);
+        function checkLimits(count16) {
+          gen.code((0, codegen_1._)`${count16}++`);
           if (max === void 0) {
-            gen.if((0, codegen_1._)`${count15} >= ${min}`, () => gen.assign(valid, true).break());
+            gen.if((0, codegen_1._)`${count16} >= ${min}`, () => gen.assign(valid, true).break());
           } else {
-            gen.if((0, codegen_1._)`${count15} > ${max}`, () => gen.assign(valid, false).break());
+            gen.if((0, codegen_1._)`${count16} > ${max}`, () => gen.assign(valid, false).break());
             if (min === 1)
               gen.assign(valid, true);
             else
-              gen.if((0, codegen_1._)`${count15} >= ${min}`, () => gen.assign(valid, true));
+              gen.if((0, codegen_1._)`${count16} >= ${min}`, () => gen.assign(valid, true));
           }
         }
       }
@@ -20095,7 +20234,7 @@ var init_props_validation = __esm({
 });
 
 // ../packages/agents-core/src/data-access/artifactComponents.ts
-import { and as and10, count as count9, desc as desc9, eq as eq10 } from "drizzle-orm";
+import { and as and11, count as count10, desc as desc10, eq as eq11 } from "drizzle-orm";
 var init_artifactComponents = __esm({
   "../packages/agents-core/src/data-access/artifactComponents.ts"() {
     "use strict";
@@ -20106,7 +20245,7 @@ var init_artifactComponents = __esm({
 });
 
 // ../packages/agents-core/src/data-access/contextCache.ts
-import { and as and11, eq as eq11 } from "drizzle-orm";
+import { and as and12, eq as eq12 } from "drizzle-orm";
 var init_contextCache = __esm({
   "../packages/agents-core/src/data-access/contextCache.ts"() {
     "use strict";
@@ -20116,7 +20255,7 @@ var init_contextCache = __esm({
 });
 
 // ../packages/agents-core/src/data-access/conversations.ts
-import { and as and12, count as count10, desc as desc10, eq as eq12 } from "drizzle-orm";
+import { and as and13, count as count11, desc as desc11, eq as eq13 } from "drizzle-orm";
 var init_conversations2 = __esm({
   "../packages/agents-core/src/data-access/conversations.ts"() {
     "use strict";
@@ -20127,7 +20266,7 @@ var init_conversations2 = __esm({
 });
 
 // ../packages/agents-core/src/data-access/dataComponents.ts
-import { and as and13, count as count11, desc as desc11, eq as eq13 } from "drizzle-orm";
+import { and as and14, count as count12, desc as desc12, eq as eq14 } from "drizzle-orm";
 var init_dataComponents = __esm({
   "../packages/agents-core/src/data-access/dataComponents.ts"() {
     "use strict";
@@ -20147,7 +20286,7 @@ var init_graphFull = __esm({
 });
 
 // ../packages/agents-core/src/data-access/graphFull.ts
-import { and as and14, eq as eq14, inArray as inArray3, not } from "drizzle-orm";
+import { and as and15, eq as eq15, inArray as inArray3, not } from "drizzle-orm";
 var init_graphFull2 = __esm({
   "../packages/agents-core/src/data-access/graphFull.ts"() {
     "use strict";
@@ -20155,18 +20294,20 @@ var init_graphFull2 = __esm({
     init_schema();
     init_graphFull();
     init_agentGraphs();
-    init_agentRelations();
-    init_agents();
     init_artifactComponents();
     init_contextConfigs();
     init_dataComponents();
     init_externalAgents();
+    init_functions();
+    init_functionTools();
+    init_subAgentRelations();
+    init_subAgents();
     init_tools();
   }
 });
 
 // ../packages/agents-core/src/data-access/ledgerArtifacts.ts
-import { and as and15, count as count12, eq as eq15 } from "drizzle-orm";
+import { and as and16, count as count13, eq as eq16 } from "drizzle-orm";
 var init_ledgerArtifacts = __esm({
   "../packages/agents-core/src/data-access/ledgerArtifacts.ts"() {
     "use strict";
@@ -20176,7 +20317,7 @@ var init_ledgerArtifacts = __esm({
 });
 
 // ../packages/agents-core/src/data-access/messages.ts
-import { and as and16, asc as asc2, count as count13, desc as desc12, eq as eq16, inArray as inArray4 } from "drizzle-orm";
+import { and as and17, asc as asc2, count as count14, desc as desc13, eq as eq17, inArray as inArray4 } from "drizzle-orm";
 var init_messages = __esm({
   "../packages/agents-core/src/data-access/messages.ts"() {
     "use strict";
@@ -20186,7 +20327,7 @@ var init_messages = __esm({
 });
 
 // ../packages/agents-core/src/data-access/projects.ts
-import { and as and17, count as count14, desc as desc13, eq as eq17 } from "drizzle-orm";
+import { and as and18, count as count15, desc as desc14, eq as eq18 } from "drizzle-orm";
 var init_projects = __esm({
   "../packages/agents-core/src/data-access/projects.ts"() {
     "use strict";
@@ -20215,7 +20356,7 @@ var init_projectFull = __esm({
 });
 
 // ../packages/agents-core/src/data-access/tasks.ts
-import { and as and18, eq as eq18 } from "drizzle-orm";
+import { and as and19, eq as eq19 } from "drizzle-orm";
 var init_tasks = __esm({
   "../packages/agents-core/src/data-access/tasks.ts"() {
     "use strict";
@@ -20240,8 +20381,6 @@ var init_data_access = __esm({
     init_esm_shims();
     init_client();
     init_agentGraphs();
-    init_agentRelations();
-    init_agents();
     init_apiKeys2();
     init_artifactComponents();
     init_contextCache();
@@ -20251,11 +20390,14 @@ var init_data_access = __esm({
     init_dataComponents();
     init_externalAgents();
     init_functions();
+    init_functionTools();
     init_graphFull2();
     init_ledgerArtifacts();
     init_messages();
     init_projectFull();
     init_projects();
+    init_subAgentRelations();
+    init_subAgents();
     init_tasks();
     init_tools();
     init_validation();
@@ -20275,20 +20417,20 @@ var init_tracer = __esm({
 });
 
 // ../packages/agents-core/src/context/contextCache.ts
-var logger7;
+var logger8;
 var init_contextCache2 = __esm({
   "../packages/agents-core/src/context/contextCache.ts"() {
     "use strict";
     init_esm_shims();
     init_data_access();
     init_logger();
-    logger7 = getLogger("context-cache");
+    logger8 = getLogger("context-cache");
   }
 });
 
 // ../packages/agents-core/src/context/ContextResolver.ts
 import crypto4 from "crypto";
-var logger8;
+var logger9;
 var init_ContextResolver = __esm({
   "../packages/agents-core/src/context/ContextResolver.ts"() {
     "use strict";
@@ -20297,12 +20439,12 @@ var init_ContextResolver = __esm({
     init_tracer();
     init_ContextFetcher();
     init_contextCache2();
-    logger8 = getLogger("context-resolver");
+    logger9 = getLogger("context-resolver");
   }
 });
 
 // ../packages/agents-core/src/middleware/contextValidation.ts
-var import_ajv3, logger9, ajv;
+var import_ajv3, logger10, ajv;
 var init_contextValidation = __esm({
   "../packages/agents-core/src/middleware/contextValidation.ts"() {
     "use strict";
@@ -20314,7 +20456,7 @@ var init_contextValidation = __esm({
     init_error();
     init_execution();
     init_logger();
-    logger9 = getLogger("context-validation");
+    logger10 = getLogger("context-validation");
     ajv = new import_ajv3.default({ allErrors: true, strict: false });
   }
 });
@@ -20329,7 +20471,7 @@ var init_middleware = __esm({
 });
 
 // ../packages/agents-core/src/context/ContextFetcher.ts
-var import_jmespath2, logger10;
+var import_jmespath2, logger11;
 var init_ContextFetcher = __esm({
   "../packages/agents-core/src/context/ContextFetcher.ts"() {
     "use strict";
@@ -20340,12 +20482,12 @@ var init_ContextFetcher = __esm({
     init_middleware();
     init_logger();
     init_TemplateEngine();
-    logger10 = getLogger("context-fetcher");
+    logger11 = getLogger("context-fetcher");
   }
 });
 
 // ../packages/agents-core/src/context/context.ts
-var logger11;
+var logger12;
 var init_context4 = __esm({
   "../packages/agents-core/src/context/context.ts"() {
     "use strict";
@@ -20354,7 +20496,7 @@ var init_context4 = __esm({
     init_utils();
     init_tracer();
     init_ContextResolver();
-    logger11 = getLogger("context");
+    logger12 = getLogger("context");
   }
 });
 
@@ -20447,7 +20589,7 @@ var init_dist6 = __esm({
 
 // ../packages/agents-core/src/credential-stores/nango-store.ts
 import { z as z9 } from "zod";
-var logger12, CredentialKeySchema;
+var logger13, CredentialKeySchema;
 var init_nango_store = __esm({
   "../packages/agents-core/src/credential-stores/nango-store.ts"() {
     "use strict";
@@ -20455,7 +20597,7 @@ var init_nango_store = __esm({
     init_dist6();
     init_types();
     init_logger();
-    logger12 = getLogger("nango-credential-store");
+    logger13 = getLogger("nango-credential-store");
     CredentialKeySchema = z9.object({
       connectionId: z9.string().min(1, "connectionId must be a non-empty string"),
       providerConfigKey: z9.string().min(1, "providerConfigKey must be a non-empty string")
@@ -20625,6 +20767,53 @@ ${error.message}`
   }
 });
 
+// ../packages/agents-core/src/validation/event-schemas.ts
+import { z as z11 } from "zod";
+var TransferDataSchema, DelegationSentDataSchema, DelegationReturnedDataSchema, DataOperationDetailsSchema, DataOperationEventSchema, A2AMessageMetadataSchema;
+var init_event_schemas = __esm({
+  "../packages/agents-core/src/validation/event-schemas.ts"() {
+    "use strict";
+    init_esm_shims();
+    TransferDataSchema = z11.object({
+      fromSubAgent: z11.string().describe("ID of the sub-agent transferring control"),
+      targetSubAgent: z11.string().describe("ID of the sub-agent receiving control"),
+      reason: z11.string().optional().describe("Reason for the transfer"),
+      context: z11.any().optional().describe("Additional context data")
+    });
+    DelegationSentDataSchema = z11.object({
+      delegationId: z11.string().describe("Unique identifier for this delegation"),
+      fromSubAgent: z11.string().describe("ID of the delegating sub-agent"),
+      targetSubAgent: z11.string().describe("ID of the sub-agent receiving the delegation"),
+      taskDescription: z11.string().describe("Description of the delegated task"),
+      context: z11.any().optional().describe("Additional context data")
+    });
+    DelegationReturnedDataSchema = z11.object({
+      delegationId: z11.string().describe("Unique identifier matching the original delegation"),
+      fromSubAgent: z11.string().describe("ID of the sub-agent that completed the task"),
+      targetSubAgent: z11.string().describe("ID of the sub-agent receiving the result"),
+      result: z11.any().optional().describe("Result data from the delegated task")
+    });
+    DataOperationDetailsSchema = z11.object({
+      timestamp: z11.number().describe("Unix timestamp in milliseconds"),
+      subAgentId: z11.string().describe("ID of the sub-agent that generated this data"),
+      data: z11.any().describe("The actual data payload")
+    });
+    DataOperationEventSchema = z11.object({
+      type: z11.string().describe("Event type identifier"),
+      label: z11.string().describe("Human-readable label for the event"),
+      details: DataOperationDetailsSchema
+    });
+    A2AMessageMetadataSchema = z11.object({
+      fromSubAgentId: z11.string().optional().describe("ID of the sending sub-agent"),
+      toSubAgentId: z11.string().optional().describe("ID of the receiving sub-agent"),
+      fromExternalAgentId: z11.string().optional().describe("ID of the sending external agent"),
+      toExternalAgentId: z11.string().optional().describe("ID of the receiving external agent"),
+      taskId: z11.string().optional().describe("Associated task ID"),
+      a2aTaskId: z11.string().optional().describe("A2A-specific task ID")
+    });
+  }
+});
+
 // ../packages/agents-core/src/validation/id-validation.ts
 var init_id_validation = __esm({
   "../packages/agents-core/src/validation/id-validation.ts"() {
@@ -20639,6 +20828,7 @@ var init_validation2 = __esm({
   "../packages/agents-core/src/validation/index.ts"() {
     "use strict";
     init_esm_shims();
+    init_event_schemas();
     init_graphFull();
     init_id_validation();
     init_props_validation();
@@ -20652,6 +20842,8 @@ var init_src = __esm({
     "use strict";
     init_esm_shims();
     init_base_client();
+    init_otel_attributes();
+    init_signoz_queries();
     init_context5();
     init_credential_stores();
     init_credential_stuffer();
@@ -20769,7 +20961,7 @@ function findConfigFile(startPath = process.cwd()) {
   return null;
 }
 async function loadConfigFromFile(configPath) {
-  logger13.info({ fromPath: configPath }, `Loading config file`);
+  logger14.info({ fromPath: configPath }, `Loading config file`);
   let resolvedPath;
   if (configPath) {
     resolvedPath = resolve2(process.cwd(), configPath);
@@ -20789,7 +20981,7 @@ async function loadConfigFromFile(configPath) {
       throw new Error(`No config exported from ${resolvedPath}`);
     }
     const config = normalizeConfig(rawConfig);
-    logger13.info({ config: maskSensitiveConfig(config) }, `Loaded config values`);
+    logger14.info({ config: maskSensitiveConfig(config) }, `Loaded config values`);
     return config;
   } catch (error) {
     console.warn(`Warning: Failed to load config file ${resolvedPath}:`, error);
@@ -20810,9 +21002,9 @@ async function loadConfig(configPath) {
         config[key] = value;
       }
     });
-    logger13.info({ mergedConfig: maskSensitiveConfig(config) }, `Config loaded from file`);
+    logger14.info({ mergedConfig: maskSensitiveConfig(config) }, `Config loaded from file`);
   } else {
-    logger13.info(
+    logger14.info(
       { config: maskSensitiveConfig(config) },
       `Using default config (no config file found)`
     );
@@ -20864,14 +21056,14 @@ Please add agentsRunApiUrl to your configuration file`
     sources
   };
 }
-var logger13;
+var logger14;
 var init_config = __esm({
   "src/utils/config.ts"() {
     "use strict";
     init_esm_shims();
     init_src();
     init_tsx_loader();
-    logger13 = getLogger("config");
+    logger14 = getLogger("config");
   }
 });
 
@@ -20959,7 +21151,6 @@ var init_api = __esm({
       async pushGraph(graphDefinition) {
         const tenantId = this.checkTenantId();
         const projectId = this.getProjectId();
-        graphDefinition.tenantId = tenantId;
         const graphId = graphDefinition.id;
         if (!graphId) {
           throw new Error("Graph must have an id property");
@@ -20968,7 +21159,10 @@ var init_api = __esm({
           `${this.apiUrl}/tenants/${tenantId}/projects/${projectId}/graph/${graphId}`,
           {
             method: "PUT",
-            body: JSON.stringify(graphDefinition)
+            body: JSON.stringify({
+              ...graphDefinition,
+              tenantId
+            })
           }
         );
         if (!response.ok) {
@@ -21192,8 +21386,8 @@ async function chatCommandEnhanced(graphIdInput, options) {
     if (graph.description) {
       console.log(chalk9.gray(`Description: ${graph.description}`));
     }
-    if (graph.defaultAgentId || graph.default_agent_id) {
-      console.log(chalk9.gray(`Default Agent: ${graph.defaultAgentId || graph.default_agent_id}`));
+    if (graph.defaultSubAgentId) {
+      console.log(chalk9.gray(`Default Agent: ${graph.defaultSubAgentId}`));
     }
   } catch (error) {
     spinner.fail("Failed to connect to graph");
@@ -21422,19 +21616,19 @@ init_esm_shims();
 // src/env.ts
 init_esm_shims();
 init_src();
-import { z as z11 } from "zod";
+import { z as z12 } from "zod";
 loadEnvironmentFiles();
-var envSchema2 = z11.object({
-  DEBUG: z11.string().optional(),
+var envSchema2 = z12.object({
+  DEBUG: z12.string().optional(),
   // Secrets loaded from .env files (relative to where CLI is executed)
-  ANTHROPIC_API_KEY: z11.string().optional()
+  ANTHROPIC_API_KEY: z12.string().optional()
 });
 var parseEnv2 = () => {
   try {
     const parsedEnv = envSchema2.parse(process.env);
     return parsedEnv;
   } catch (error) {
-    if (error instanceof z11.ZodError) {
+    if (error instanceof z12.ZodError) {
       const missingVars = error.issues.map((issue) => issue.path.join("."));
       throw new Error(
         `\u274C Invalid environment variables: ${missingVars.join(", ")}
@@ -22067,7 +22261,7 @@ async function listGraphsCommand(options) {
       table.push([
         graph.id || "",
         graph.name || graph.id || "",
-        graph.defaultAgentId || chalk6.gray("None"),
+        graph.defaultSubAgentId || chalk6.gray("None"),
         createdDate
       ]);
     }
@@ -22149,6 +22343,43 @@ function generatePlaceholder(jsonPath) {
 function shouldReplaceString(value, placeholder) {
   return value.length >= MIN_REPLACEMENT_LENGTH && placeholder.length < value.length;
 }
+function containsTemplateLiterals(value) {
+  return /\{\{([^}]+)\}\}/.test(value);
+}
+function generateMultiPlaceholderString(value, jsonPath, tracker) {
+  const templateLiterals = value.match(/\{\{([^}]+)\}\}/g);
+  if (!templateLiterals) {
+    return value;
+  }
+  const parts = value.split(/\{\{[^}]+\}\}/);
+  let result = "";
+  let partIndex = 0;
+  const tempMappings = [];
+  for (let i2 = 0; i2 < parts.length; i2++) {
+    const part = parts[i2];
+    if (part.length > 0) {
+      const existingPlaceholder = tracker.valueToPlaceholder.get(part);
+      if (existingPlaceholder) {
+        result += existingPlaceholder;
+      } else {
+        const placeholder = generatePlaceholder(`${jsonPath}.part${partIndex}`);
+        tempMappings.push({ placeholder, value: part });
+        result += placeholder;
+      }
+      partIndex++;
+    }
+    if (i2 < templateLiterals.length) {
+      result += templateLiterals[i2];
+    }
+  }
+  if (result.length < value.length) {
+    for (const mapping of tempMappings) {
+      updateTracker(tracker, mapping.placeholder, mapping.value);
+    }
+    return result;
+  }
+  return value;
+}
 function isJsonSchemaPath(path3) {
   if (path3.endsWith("contextConfig.headersSchema") || path3.endsWith("responseSchema")) {
     return true;
@@ -22161,20 +22392,24 @@ function updateTracker(tracker, placeholder, value) {
 }
 function processObject(obj, tracker, path3 = "") {
   if (typeof obj === "string") {
-    const existingPlaceholder = tracker.valueToPlaceholder.get(obj);
-    if (existingPlaceholder) {
-      return existingPlaceholder;
-    }
-    const placeholder = generatePlaceholder(path3);
-    if (shouldReplaceString(obj, placeholder)) {
-      const existingValue = tracker.placeholderToValue.get(placeholder);
-      if (existingValue && existingValue !== obj) {
-        throw new Error(
-          `Placeholder collision detected: placeholder '${placeholder}' already exists with different value. Existing value length: ${existingValue.length}, New value length: ${obj.length}`
-        );
+    if (containsTemplateLiterals(obj)) {
+      return generateMultiPlaceholderString(obj, path3, tracker);
+    } else {
+      const existingPlaceholder = tracker.valueToPlaceholder.get(obj);
+      if (existingPlaceholder) {
+        return existingPlaceholder;
+      }
+      const placeholder = generatePlaceholder(path3);
+      if (shouldReplaceString(obj, placeholder)) {
+        const existingValue = tracker.placeholderToValue.get(placeholder);
+        if (existingValue && existingValue !== obj) {
+          throw new Error(
+            `Placeholder collision detected: placeholder '${placeholder}' already exists with different value. Existing value length: ${existingValue.length}, New value length: ${obj.length}`
+          );
+        }
+        updateTracker(tracker, placeholder, obj);
+        return placeholder;
       }
-      updateTracker(tracker, placeholder, obj);
-      return placeholder;
     }
     return obj;
   }
@@ -22332,7 +22567,7 @@ var PROJECT_JSON_EXAMPLE = `
       "id": "customer-service",
       "name": "customer-service",
       "description": "respond to customer service requests",
-      "defaultAgentId": "router",
+      "defaultSubAgentId": "router",
       "agents": {
         "refund-agent": {
           "id": "refund-agent",
@@ -22601,6 +22836,10 @@ REQUIREMENTS:
    - Placeholders contain multi-line content and require template literals
    - This prevents TypeScript syntax errors with newlines and special characters
    - you must import { z } from 'zod' if you are using zod schemas in the graph file.
+   - you must import { headers } from '@inkeep/agents-core' and use it to create the headers schema if you are using headers in a contextConfig.
+   - convert template literals to use the appropriate headers schema or context config toTemplate method. a template literal is a substring that starts with {{ and ends with }}.
+    - if you see a template literal with {{headers.}}, convert it to use the headers schema toTemplate method.
+    - if you see a template literal with {{contextVariableKey.field_name}}, convert it to use the context config toTemplate method.
 6. If you are writing zod schemas make them clean. For example if you see z.union([z.string(), z.null()]) write it as z.string().nullable()
 
 PLACEHOLDER HANDLING EXAMPLES:
@@ -22612,12 +22851,18 @@ prompt: '<{{agents.facts.prompt.abc12345}}>'
 
 FULL EXAMPLE:
 import { agent, agentGraph } from '@inkeep/agents-sdk';
-import { contextConfig, fetchDefinition } from '@inkeep/agents-core';
+import { contextConfig, fetchDefinition, headers } from '@inkeep/agents-core';
 import { userProfile } from '../data-components/user-profile';
 import { searchTool } from '../tools/search-tool';
 import { weatherTool } from '../tools/weather-tool';
 import { z } from 'zod';
 
+const supportGraphHeaders = headers({
+  schema: z.object({
+    userId: z.string(),
+    sessionToken: z.string(),
+  }),
+});
 
 const supportDescriptionFetchDefinition = fetchDefinition({
   id: 'support-description',
@@ -22627,7 +22872,7 @@ const supportDescriptionFetchDefinition = fetchDefinition({
     url: 'https://api.example.com/support-description',
     method: 'GET',
     headers: {
-      'Authorization': 'Bearer {{headers.sessionToken}}',
+      'Authorization': \`Bearer \${supportGraphHeaders.toTemplate('sessionToken')}\`,
     },
     transform: 'data',
   },
@@ -22638,10 +22883,7 @@ const supportDescriptionFetchDefinition = fetchDefinition({
 });
 
 const supportGraphContext = contextConfig({
-  headers: z.object({
-    userId: z.string(),
-    sessionToken: z.string(),
-  }),
+  headers: supportGraphHeaders,
   contextVariables: {
     supportDescription: supportDescriptionDefinition,
   },
@@ -22650,7 +22892,7 @@ const supportGraphContext = contextConfig({
 const routerAgent = agent({
   id: 'router',
   name: 'Router Agent',
-  prompt: 'Route requests to appropriate agents',
+  prompt: \`Route requests to appropriate agents using \${supportGraphContext.toTemplate('supportDescription.description')} for the user \${supportGraphHeaders.toTemplate('userId')}\`,
   canTransferTo: () => [qaAgent]
 });
 
@@ -22662,6 +22904,7 @@ const qaAgent = agent({
 Follow these rules:
 - Always be helpful
 - Provide accurate answers
+- Use the user's name \${supportGraphHeaders.toTemplate('userId')} when applicable
 - Use available tools\`,
   canUse: () => [searchTool, weatherTool],
   selectedTools: {
@@ -22675,7 +22918,7 @@ export const supportGraph = agentGraph({
   id: 'support-graph',
   name: 'Support Graph',
   description: 'Multi-agent support system', // Only include if description has a value
-  defaultAgent: routerAgent,
+  defaultSubAgent: routerAgent,
   agents: () => [routerAgent, qaAgent]
 });
 
@@ -23493,7 +23736,7 @@ async function pullProjectCommand(options) {
           for (const usage of usageInfo) {
             usageByType[usage.type] = (usageByType[usage.type] || 0) + 1;
           }
-          const usageSummary = Object.entries(usageByType).map(([type, count15]) => `${count15} ${type}${count15 > 1 ? "s" : ""}`).join(", ");
+          const usageSummary = Object.entries(usageByType).map(([type, count16]) => `${count16} ${type}${count16 > 1 ? "s" : ""}`).join(", ");
           console.log(chalk7.gray(`      Used by: ${usageSummary}`));
         }
       }
@@ -23804,7 +24047,7 @@ async function pushCommand(options) {
             for (const usage of usageInfo) {
               usageByType[usage.type] = (usageByType[usage.type] || 0) + 1;
             }
-            const usageSummary = Object.entries(usageByType).map(([type, count15]) => `${count15} ${type}${count15 > 1 ? "s" : ""}`).join(", ");
+            const usageSummary = Object.entries(usageByType).map(([type, count16]) => `${count16} ${type}${count16 > 1 ? "s" : ""}`).join(", ");
             console.log(chalk8.gray(`      Used by: ${usageSummary}`));
           }
         }