@inkeep/agents-cli 0.0.0-dev-20251009192735 → 0.0.0-dev-20251009215610

package/README.md

@@ -322,7 +322,7 @@ const assistantAgent = agent({
 export const graph = agentGraph({
   id: "my-assistant",
   name: "My Assistant Graph",
-  defaultAgent: assistantAgent,
+  defaultSubAgent: assistantAgent,
   agents: {
     assistant: assistantAgent,
   },
@@ -498,7 +498,7 @@ const assistantAgent = agent({
 export const graph = agentGraph({
   id: "my-assistant",
   name: "My Assistant",
-  defaultAgent: assistantAgent,
+  defaultSubAgent: assistantAgent,
   agents: { assistant: assistantAgent },
 });
 

package/dist/index.js

@@ -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) {
@@ -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, functions, subAgentToolRelations, 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;
 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")
       ]
     );
@@ -1845,10 +1916,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 +1929,15 @@ 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
         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")
       ]
     );
@@ -1875,7 +1946,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 +1970,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 +1987,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 +2113,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,7 +2123,7 @@ var init_schema = __esm({
       ledgerArtifacts: many(ledgerArtifacts)
     }));
     projectsRelations = relations(projects, ({ many }) => ({
-      agents: many(agents),
+      subAgents: many(subAgents),
       agentGraphs: many(agentGraph),
       tools: many(tools),
       contextConfigs: many(contextConfigs),
@@ -2093,17 +2161,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,18 +2183,18 @@ var init_schema = __esm({
       associatedMessages: many(messages, {
         relationName: "associatedAgent"
       }),
-      toolRelations: many(agentToolRelations),
-      dataComponentRelations: many(agentDataComponents),
-      artifactComponentRelations: many(agentArtifactComponents)
+      toolRelations: many(subAgentToolRelations),
+      dataComponentRelations: many(subAgentDataComponents),
+      artifactComponentRelations: many(subAgentArtifactComponents)
     }));
     agentGraphRelations = relations(agentGraph, ({ one }) => ({
       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],
@@ -2138,7 +2206,7 @@ var init_schema = __esm({
         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 +2222,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,7 +2240,7 @@ 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]
@@ -2188,9 +2256,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 +2266,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 +2299,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]
       })
     }));
@@ -2280,23 +2349,23 @@ var init_schema = __esm({
     functionsRelations = relations(functions, ({ many }) => ({
       tools: many(tools)
     }));
-    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]
       })
     }));
@@ -2328,7 +2397,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, AgentStopWhenSchema, 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, 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, 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";
@@ -2385,22 +2454,22 @@ 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);
+    AgentRelationSelectSchema = createSelectSchema(subAgentRelations);
+    AgentRelationInsertSchema = 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);
@@ -2410,13 +2479,13 @@ var init_schemas = __esm({
       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(
@@ -2425,28 +2494,28 @@ var init_schemas = __esm({
       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 agent relationships",
+        path: ["targetSubAgentId", "externalSubAgentId"]
       }
     );
     AgentRelationQuerySchema = z2.object({
-      sourceAgentId: z2.string().optional(),
-      targetAgentId: z2.string().optional(),
-      externalAgentId: z2.string().optional()
+      sourceSubAgentId: z2.string().optional(),
+      targetSubAgentId: z2.string().optional(),
+      externalSubAgentId: z2.string().optional()
     });
-    ExternalAgentRelationInsertSchema = createInsertSchema(agentRelations).extend({
+    ExternalAgentRelationInsertSchema = createInsertSchema(subAgentRelations).extend({
       id: resourceIdSchema,
       graphId: resourceIdSchema,
-      sourceAgentId: resourceIdSchema,
-      externalAgentId: resourceIdSchema
+      sourceSubAgentId: resourceIdSchema,
+      externalSubAgentId: resourceIdSchema
     });
     ExternalAgentRelationApiInsertSchema = createApiInsertSchema(
       ExternalAgentRelationInsertSchema
@@ -2580,8 +2649,8 @@ var init_schemas = __esm({
     DataComponentApiSelectSchema = createApiSchema(DataComponentSelectSchema);
     DataComponentApiInsertSchema = createApiInsertSchema(DataComponentInsertSchema);
     DataComponentApiUpdateSchema = createApiUpdateSchema(DataComponentUpdateSchema);
-    AgentDataComponentSelectSchema = createSelectSchema(agentDataComponents);
-    AgentDataComponentInsertSchema = createInsertSchema(agentDataComponents);
+    AgentDataComponentSelectSchema = createSelectSchema(subAgentDataComponents);
+    AgentDataComponentInsertSchema = createInsertSchema(subAgentDataComponents);
     AgentDataComponentUpdateSchema = AgentDataComponentInsertSchema.partial();
     AgentDataComponentApiSelectSchema = createGraphScopedApiSchema(
       AgentDataComponentSelectSchema
@@ -2610,12 +2679,12 @@ var init_schemas = __esm({
     ArtifactComponentApiUpdateSchema = createApiUpdateSchema(
       ArtifactComponentUpdateSchema
     );
-    AgentArtifactComponentSelectSchema = createSelectSchema(agentArtifactComponents);
+    AgentArtifactComponentSelectSchema = createSelectSchema(subAgentArtifactComponents);
     AgentArtifactComponentInsertSchema = createInsertSchema(
-      agentArtifactComponents
+      subAgentArtifactComponents
     ).extend({
       id: resourceIdSchema,
-      agentId: resourceIdSchema,
+      subAgentId: resourceIdSchema,
       artifactComponentId: resourceIdSchema
     });
     AgentArtifactComponentUpdateSchema = AgentArtifactComponentInsertSchema.partial();
@@ -2643,7 +2712,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);
@@ -2797,10 +2866,10 @@ var init_schemas = __esm({
     ContextConfigApiUpdateSchema = createApiUpdateSchema(ContextConfigUpdateSchema).omit({
       graphId: true
     });
-    AgentToolRelationSelectSchema = createSelectSchema(agentToolRelations);
-    AgentToolRelationInsertSchema = createInsertSchema(agentToolRelations).extend({
+    AgentToolRelationSelectSchema = createSelectSchema(subAgentToolRelations);
+    AgentToolRelationInsertSchema = 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()
@@ -2843,7 +2912,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)
@@ -2852,27 +2921,17 @@ var init_schemas = __esm({
       canTransferTo: z2.array(z2.string()).optional(),
       canDelegateTo: z2.array(z2.string()).optional()
     });
-    FullGraphDefinitionSchema = AgentGraphApiInsertSchema.extend({
-      agents: 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
-      functions: z2.record(z2.string(), FunctionApiInsertSchema).optional(),
-      // Get function code for function tools
-      contextConfig: z2.optional(ContextConfigApiInsertSchema),
-      statusUpdates: z2.optional(StatusUpdateSchema),
-      models: ModelSchema.optional(),
-      stopWhen: GraphStopWhenSchema.optional(),
-      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") })
         ])
       ),
+      tools: z2.record(z2.string(), ToolApiInsertSchema).optional(),
+      // Get tool name/description from toolId
+      functions: z2.record(z2.string(), FunctionApiInsertSchema).optional(),
       contextConfig: z2.optional(ContextConfigApiInsertSchema),
       statusUpdates: z2.optional(StatusUpdateSchema),
       models: ModelSchema.optional(),
@@ -2937,72 +2996,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 +4649,50 @@ 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/subAgentRelations.ts
+import { and as and4, count as count3, desc as desc3, eq as eq4, 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/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/subAgents.ts
+import { and as and5, count as count4, desc as desc4, eq as eq5, inArray } from "drizzle-orm";
+var init_subAgents = __esm({
+  "../packages/agents-core/src/data-access/subAgents.ts"() {
     "use strict";
     init_esm_shims();
     init_schema();
@@ -13578,8 +13611,8 @@ var init_tools = __esm({
     init_utils();
     init_logger();
     init_mcp_client();
-    init_agentRelations();
     init_credentialReferences();
+    init_subAgentRelations();
     logger6 = getLogger("tools");
   }
 });
@@ -13591,11 +13624,11 @@ var init_agentGraphs = __esm({
     "use strict";
     init_esm_shims();
     init_schema();
-    init_agentRelations();
-    init_agents();
     init_contextConfigs();
     init_externalAgents();
     init_functions();
+    init_subAgentRelations();
+    init_subAgents();
     init_tools();
   }
 });
@@ -20155,12 +20188,12 @@ var init_graphFull2 = __esm({
     init_schema();
     init_graphFull();
     init_agentGraphs();
-    init_agentRelations();
-    init_agents();
     init_artifactComponents();
     init_contextConfigs();
     init_dataComponents();
     init_externalAgents();
+    init_subAgentRelations();
+    init_subAgents();
     init_tools();
   }
 });
@@ -20240,8 +20273,6 @@ var init_data_access = __esm({
     init_esm_shims();
     init_client();
     init_agentGraphs();
-    init_agentRelations();
-    init_agents();
     init_apiKeys2();
     init_artifactComponents();
     init_contextCache();
@@ -20256,6 +20287,8 @@ var init_data_access = __esm({
     init_messages();
     init_projectFull();
     init_projects();
+    init_subAgentRelations();
+    init_subAgents();
     init_tasks();
     init_tools();
     init_validation();
@@ -20625,6 +20658,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 +20719,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 +20733,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();
@@ -20959,7 +21042,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 +21050,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 +21277,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 +21507,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 +22152,7 @@ async function listGraphsCommand(options) {
       table.push([
         graph.id || "",
         graph.name || graph.id || "",
-        graph.defaultAgentId || chalk6.gray("None"),
+        graph.defaultSubAgentId || chalk6.gray("None"),
         createdDate
       ]);
     }
@@ -22332,7 +22417,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",
@@ -22683,7 +22768,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]
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkeep/agents-cli",
-  "version": "0.0.0-dev-20251009192735",
+  "version": "0.0.0-dev-20251009215610",
   "description": "Inkeep CLI tool",
   "type": "module",
   "main": "./dist/index.js",
@@ -46,8 +46,8 @@
     "recast": "^0.23.0",
     "ts-morph": "^26.0.0",
     "tsx": "^4.20.5",
-    "@inkeep/agents-core": "^0.0.0-dev-20251009192735",
-    "@inkeep/agents-sdk": "^0.0.0-dev-20251009192735"
+    "@inkeep/agents-core": "^0.0.0-dev-20251009215610",
+    "@inkeep/agents-sdk": "^0.0.0-dev-20251009215610"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",
@@ -62,7 +62,7 @@
     "vitest": "^3.2.4"
   },
   "peerDependencies": {
-    "@inkeep/agents-manage-ui": "0.0.0-dev-20251009192735",
+    "@inkeep/agents-manage-ui": "0.0.0-dev-20251009215610",
     "zod": "^4.1.11"
   },
   "engines": {