@inkeep/agents-core 0.0.0-dev-20251014155922 → 0.0.0-dev-20251014185355

package/dist/index.cjs

@@ -212899,18 +212899,29 @@ async function apiFetch(url, options = {}) {
 
 // src/constants/models.ts
 var ANTHROPIC_MODELS = {
+  CLAUDE_OPUS_4_1: "anthropic/claude-opus-4-1",
   CLAUDE_OPUS_4_1_20250805: "anthropic/claude-opus-4-1-20250805",
+  CLAUDE_SONNET_4_5: "anthropic/claude-sonnet-4-5",
   CLAUDE_SONNET_4_5_20250929: "anthropic/claude-sonnet-4-5-20250929",
+  CLAUDE_SONNET_4: "anthropic/claude-sonnet-4",
   CLAUDE_SONNET_4_20250514: "anthropic/claude-sonnet-4-20250514",
+  CLAUDE_3_5_SONNET: "anthropic/claude-3-5-sonnet",
   CLAUDE_3_5_SONNET_20241022: "anthropic/claude-3-5-sonnet-20241022",
+  CLAUDE_3_5_HAIKU: "anthropic/claude-3-5-haiku",
   CLAUDE_3_5_HAIKU_20241022: "anthropic/claude-3-5-haiku-20241022"
 };
 var OPENAI_MODELS = {
+  GPT_5: "openai/gpt-5",
   GPT_5_20250807: "openai/gpt-5-2025-08-07",
+  GPT_5_MINI: "openai/gpt-5-mini",
   GPT_5_MINI_20250807: "openai/gpt-5-mini-2025-08-07",
+  GPT_5_NANO: "openai/gpt-5-nano",
   GPT_5_NANO_20250807: "openai/gpt-5-nano-2025-08-07",
+  GPT_4_1: "openai/gpt-4.1",
   GPT_4_1_20250414: "openai/gpt-4.1-2025-04-14",
+  GPT_4_1_MINI: "openai/gpt-4.1-mini",
   GPT_4_1_MINI_20250414: "openai/gpt-4.1-mini-2025-04-14",
+  GPT_4_1_NANO: "openai/gpt-4.1-nano",
   GPT_4_1_NANO_20250414: "openai/gpt-4.1-nano-2025-04-14"
 };
 var GOOGLE_MODELS = {
@@ -213422,8 +213433,6 @@ function extractPreviewFields(schema) {
 // src/db/schema.ts
 var schema_exports = {};
 __export(schema_exports, {
-  agentFunctionToolRelations: () => agentFunctionToolRelations,
-  agentFunctionToolRelationsRelations: () => agentFunctionToolRelationsRelations,
   agentRelations: () => agentRelations,
   agentToolRelationsRelations: () => agentToolRelationsRelations,
   agents: () => agents,
@@ -213457,6 +213466,8 @@ __export(schema_exports, {
   subAgentArtifactComponentsRelations: () => subAgentArtifactComponentsRelations,
   subAgentDataComponents: () => subAgentDataComponents,
   subAgentDataComponentsRelations: () => subAgentDataComponentsRelations,
+  subAgentFunctionToolRelations: () => subAgentFunctionToolRelations,
+  subAgentFunctionToolRelationsRelations: () => subAgentFunctionToolRelationsRelations,
   subAgentRelations: () => subAgentRelations,
   subAgentRelationsRelations: () => subAgentRelationsRelations,
   subAgentToolRelations: () => subAgentToolRelations,
@@ -213861,8 +213872,8 @@ var subAgentToolRelations = sqliteCore.sqliteTable(
     }).onDelete("cascade")
   ]
 );
-var agentFunctionToolRelations = sqliteCore.sqliteTable(
-  "agent_function_tool_relations",
+var subAgentFunctionToolRelations = sqliteCore.sqliteTable(
+  "sub_agent_function_tool_relations",
   {
     ...subAgentScoped,
     functionToolId: sqliteCore.text("function_tool_id").notNull(),
@@ -213870,11 +213881,11 @@ var agentFunctionToolRelations = sqliteCore.sqliteTable(
   },
   (table) => [
     sqliteCore.primaryKey({ columns: [table.tenantId, table.projectId, table.agentId, table.id] }),
-    // Foreign key constraint to agents table
+    // Foreign key constraint to sub_agents table
     sqliteCore.foreignKey({
       columns: [table.tenantId, table.projectId, table.agentId, table.subAgentId],
       foreignColumns: [subAgents.tenantId, subAgents.projectId, subAgents.agentId, subAgents.id],
-      name: "agent_function_tool_relations_agent_fk"
+      name: "sub_agent_function_tool_relations_sub_agent_fk"
     }).onDelete("cascade"),
     // Foreign key constraint to functionTools table
     sqliteCore.foreignKey({
@@ -213885,7 +213896,7 @@ var agentFunctionToolRelations = sqliteCore.sqliteTable(
         functionTools.agentId,
         functionTools.id
       ],
-      name: "agent_function_tool_relations_function_tool_fk"
+      name: "sub_agent_function_tool_relations_function_tool_fk"
     }).onDelete("cascade")
   ]
 );
@@ -214111,7 +214122,7 @@ var subAgentsRelations = drizzleOrm.relations(subAgents, ({ many, one }) => ({
     relationName: "receivedMessages"
   }),
   toolRelations: many(subAgentToolRelations),
-  functionToolRelations: many(agentFunctionToolRelations),
+  functionToolRelations: many(subAgentFunctionToolRelations),
   dataComponentRelations: many(subAgentDataComponents),
   artifactComponentRelations: many(subAgentArtifactComponents)
 }));
@@ -214316,17 +214327,17 @@ var functionToolsRelations = drizzleOrm.relations(functionTools, ({ one, many })
     fields: [functionTools.tenantId, functionTools.projectId, functionTools.functionId],
     references: [functions.tenantId, functions.projectId, functions.id]
   }),
-  agentRelations: many(agentFunctionToolRelations)
+  subAgentRelations: many(subAgentFunctionToolRelations)
 }));
-var agentFunctionToolRelationsRelations = drizzleOrm.relations(
-  agentFunctionToolRelations,
+var subAgentFunctionToolRelationsRelations = drizzleOrm.relations(
+  subAgentFunctionToolRelations,
   ({ one }) => ({
-    agent: one(subAgents, {
-      fields: [agentFunctionToolRelations.subAgentId],
+    subAgent: one(subAgents, {
+      fields: [subAgentFunctionToolRelations.subAgentId],
       references: [subAgents.id]
     }),
     functionTool: one(functionTools, {
-      fields: [agentFunctionToolRelations.functionToolId],
+      fields: [subAgentFunctionToolRelations.functionToolId],
       references: [functionTools.id]
     })
   })
@@ -216403,12 +216414,12 @@ var getFunctionToolsForSubAgent = (db) => {
         scopes: { tenantId, projectId, agentId },
         pagination: { page: 1, limit: 1e3 }
       });
-      const relations2 = await db.select().from(agentFunctionToolRelations).where(
+      const relations2 = await db.select().from(subAgentFunctionToolRelations).where(
         drizzleOrm.and(
-          drizzleOrm.eq(agentFunctionToolRelations.tenantId, tenantId),
-          drizzleOrm.eq(agentFunctionToolRelations.projectId, projectId),
-          drizzleOrm.eq(agentFunctionToolRelations.agentId, agentId),
-          drizzleOrm.eq(agentFunctionToolRelations.subAgentId, subAgentId)
+          drizzleOrm.eq(subAgentFunctionToolRelations.tenantId, tenantId),
+          drizzleOrm.eq(subAgentFunctionToolRelations.projectId, projectId),
+          drizzleOrm.eq(subAgentFunctionToolRelations.agentId, agentId),
+          drizzleOrm.eq(subAgentFunctionToolRelations.subAgentId, subAgentId)
         )
       );
       const relatedFunctionToolIds = new Set(relations2.map((r) => r.functionToolId));
@@ -216429,17 +216440,43 @@ var getFunctionToolsForSubAgent = (db) => {
   };
 };
 var upsertSubAgentFunctionToolRelation = (db) => async (params) => {
-  if (params.relationId) {
+  const { scopes, subAgentId, functionToolId, relationId } = params;
+  const { tenantId, projectId, agentId } = scopes;
+  if (relationId) {
     return await updateSubAgentFunctionToolRelation(db)({
-      scopes: params.scopes,
-      relationId: params.relationId,
+      scopes,
+      relationId,
       data: {
-        subAgentId: params.subAgentId,
-        functionToolId: params.functionToolId
+        subAgentId,
+        functionToolId
       }
     });
   }
-  return await addFunctionToolToSubAgent(db)(params);
+  try {
+    const existingRelations = await db.select().from(subAgentFunctionToolRelations).where(
+      drizzleOrm.and(
+        drizzleOrm.eq(subAgentFunctionToolRelations.tenantId, tenantId),
+        drizzleOrm.eq(subAgentFunctionToolRelations.projectId, projectId),
+        drizzleOrm.eq(subAgentFunctionToolRelations.agentId, agentId),
+        drizzleOrm.eq(subAgentFunctionToolRelations.subAgentId, subAgentId),
+        drizzleOrm.eq(subAgentFunctionToolRelations.functionToolId, functionToolId)
+      )
+    ).limit(1);
+    if (existingRelations.length > 0) {
+      logger4.info(
+        { tenantId, projectId, agentId, subAgentId, functionToolId, relationId: existingRelations[0].id },
+        "Sub_agent-function tool relation already exists, returning existing relation"
+      );
+      return { id: existingRelations[0].id };
+    }
+    return await addFunctionToolToSubAgent(db)(params);
+  } catch (error) {
+    logger4.error(
+      { tenantId, projectId, agentId, subAgentId, functionToolId, error },
+      "Failed to upsert sub_agent-function tool relation"
+    );
+    throw error;
+  }
 };
 var addFunctionToolToSubAgent = (db) => {
   return async (params) => {
@@ -216447,7 +216484,7 @@ var addFunctionToolToSubAgent = (db) => {
     const { tenantId, projectId, agentId } = scopes;
     try {
       const relationId = nanoid.nanoid();
-      await db.insert(agentFunctionToolRelations).values({
+      await db.insert(subAgentFunctionToolRelations).values({
         id: relationId,
         tenantId,
         projectId,
@@ -216457,7 +216494,7 @@ var addFunctionToolToSubAgent = (db) => {
       });
       logger4.info(
         { tenantId, projectId, agentId, subAgentId, functionToolId, relationId },
-        "Function tool added to agent"
+        "Function tool added to sub_agent"
       );
       return { id: relationId };
     } catch (error) {
@@ -216474,20 +216511,20 @@ var updateSubAgentFunctionToolRelation = (db) => {
     const { scopes, relationId, data } = params;
     const { tenantId, projectId, agentId } = scopes;
     try {
-      await db.update(agentFunctionToolRelations).set({
+      await db.update(subAgentFunctionToolRelations).set({
         subAgentId: data.subAgentId,
         functionToolId: data.functionToolId
       }).where(
         drizzleOrm.and(
-          drizzleOrm.eq(agentFunctionToolRelations.id, relationId),
-          drizzleOrm.eq(agentFunctionToolRelations.tenantId, tenantId),
-          drizzleOrm.eq(agentFunctionToolRelations.projectId, projectId),
-          drizzleOrm.eq(agentFunctionToolRelations.agentId, agentId)
+          drizzleOrm.eq(subAgentFunctionToolRelations.id, relationId),
+          drizzleOrm.eq(subAgentFunctionToolRelations.tenantId, tenantId),
+          drizzleOrm.eq(subAgentFunctionToolRelations.projectId, projectId),
+          drizzleOrm.eq(subAgentFunctionToolRelations.agentId, agentId)
         )
       );
       logger4.info(
         { tenantId, projectId, agentId, relationId, data },
-        "Agent-function tool relation updated"
+        "SubAgent-function tool relation updated"
       );
       return { id: relationId };
     } catch (error) {
@@ -218531,21 +218568,21 @@ var getFullAgentDefinition = (db) => async ({
         tenantId: functionTools.tenantId,
         projectId: functionTools.projectId,
         agentId: functionTools.agentId,
-        agentToolRelationId: agentFunctionToolRelations.id
-      }).from(agentFunctionToolRelations).innerJoin(
+        agentToolRelationId: subAgentFunctionToolRelations.id
+      }).from(subAgentFunctionToolRelations).innerJoin(
         functionTools,
         drizzleOrm.and(
-          drizzleOrm.eq(agentFunctionToolRelations.functionToolId, functionTools.id),
-          drizzleOrm.eq(agentFunctionToolRelations.tenantId, functionTools.tenantId),
-          drizzleOrm.eq(agentFunctionToolRelations.projectId, functionTools.projectId),
-          drizzleOrm.eq(agentFunctionToolRelations.agentId, functionTools.agentId)
+          drizzleOrm.eq(subAgentFunctionToolRelations.functionToolId, functionTools.id),
+          drizzleOrm.eq(subAgentFunctionToolRelations.tenantId, functionTools.tenantId),
+          drizzleOrm.eq(subAgentFunctionToolRelations.projectId, functionTools.projectId),
+          drizzleOrm.eq(subAgentFunctionToolRelations.agentId, functionTools.agentId)
         )
       ).where(
         drizzleOrm.and(
-          drizzleOrm.eq(agentFunctionToolRelations.tenantId, tenantId),
-          drizzleOrm.eq(agentFunctionToolRelations.projectId, projectId),
-          drizzleOrm.eq(agentFunctionToolRelations.agentId, agentId),
-          drizzleOrm.eq(agentFunctionToolRelations.subAgentId, agent2.id)
+          drizzleOrm.eq(subAgentFunctionToolRelations.tenantId, tenantId),
+          drizzleOrm.eq(subAgentFunctionToolRelations.projectId, projectId),
+          drizzleOrm.eq(subAgentFunctionToolRelations.agentId, agentId),
+          drizzleOrm.eq(subAgentFunctionToolRelations.subAgentId, agent2.id)
         )
       );
       const agentDataComponentRelations = await db.query.subAgentDataComponents.findMany({
@@ -225390,8 +225427,6 @@ exports.VALID_RELATION_TYPES = VALID_RELATION_TYPES;
 exports.addFunctionToolToSubAgent = addFunctionToolToSubAgent;
 exports.addLedgerArtifacts = addLedgerArtifacts;
 exports.addToolToAgent = addToolToAgent;
-exports.agentFunctionToolRelations = agentFunctionToolRelations;
-exports.agentFunctionToolRelationsRelations = agentFunctionToolRelationsRelations;
 exports.agentHasArtifactComponents = agentHasArtifactComponents;
 exports.agentRelations = agentRelations;
 exports.agentToolRelationsRelations = agentToolRelationsRelations;
@@ -225638,6 +225673,8 @@ exports.subAgentArtifactComponents = subAgentArtifactComponents;
 exports.subAgentArtifactComponentsRelations = subAgentArtifactComponentsRelations;
 exports.subAgentDataComponents = subAgentDataComponents;
 exports.subAgentDataComponentsRelations = subAgentDataComponentsRelations;
+exports.subAgentFunctionToolRelations = subAgentFunctionToolRelations;
+exports.subAgentFunctionToolRelationsRelations = subAgentFunctionToolRelationsRelations;
 exports.subAgentRelations = subAgentRelations;
 exports.subAgentRelationsRelations = subAgentRelationsRelations;
 exports.subAgentToolRelations = subAgentToolRelations;

package/dist/index.d.cts

@@ -6,8 +6,8 @@ export { ba as A2AError, bG as A2ARequest, bH as A2AResponse, aL as APIKeySecuri
 import { CredentialStore } from './types/index.cjs';
 export { CorsConfig, ServerConfig, ServerOptions } from './types/index.cjs';
 import { LibSQLDatabase } from 'drizzle-orm/libsql';
-import { s as schema } from './schema-CcSN2XcZ.cjs';
-export { q as agentFunctionToolRelations, U as agentFunctionToolRelationsRelations, E as agentRelations, H as agentToolRelationsRelations, a as agents, w as apiKeys, G as apiKeysRelations, j as artifactComponents, M as artifactComponentsRelations, b as contextCache, C as contextCacheRelations, c as contextConfigs, B as contextConfigsRelations, r as conversations, K as conversationsRelations, x as credentialReferences, I as credentialReferencesRelations, h as dataComponents, O as dataComponentsRelations, f as externalAgents, F as externalAgentsRelations, m as functionTools, T as functionToolsRelations, n as functions, R as functionsRelations, v as ledgerArtifacts, Q as ledgerArtifactsRelations, u as messages, L as messagesRelations, p as projects, z as projectsRelations, k as subAgentArtifactComponents, N as subAgentArtifactComponentsRelations, i as subAgentDataComponents, P as subAgentDataComponentsRelations, e as subAgentRelations, S as subAgentRelationsRelations, o as subAgentToolRelations, d as subAgents, D as subAgentsRelations, g as taskRelations, A as taskRelationsRelations, t as tasks, y as tasksRelations, l as tools, J as toolsRelations } from './schema-CcSN2XcZ.cjs';
+import { s as schema } from './schema-BjQKqtdC.cjs';
+export { E as agentRelations, H as agentToolRelationsRelations, a as agents, w as apiKeys, G as apiKeysRelations, j as artifactComponents, M as artifactComponentsRelations, b as contextCache, C as contextCacheRelations, c as contextConfigs, B as contextConfigsRelations, r as conversations, K as conversationsRelations, x as credentialReferences, I as credentialReferencesRelations, h as dataComponents, O as dataComponentsRelations, f as externalAgents, F as externalAgentsRelations, m as functionTools, T as functionToolsRelations, n as functions, R as functionsRelations, v as ledgerArtifacts, Q as ledgerArtifactsRelations, u as messages, L as messagesRelations, p as projects, z as projectsRelations, k as subAgentArtifactComponents, N as subAgentArtifactComponentsRelations, i as subAgentDataComponents, P as subAgentDataComponentsRelations, q as subAgentFunctionToolRelations, U as subAgentFunctionToolRelationsRelations, e as subAgentRelations, S as subAgentRelationsRelations, o as subAgentToolRelations, d as subAgents, D as subAgentsRelations, g as taskRelations, A as taskRelationsRelations, t as tasks, y as tasksRelations, l as tools, J as toolsRelations } from './schema-BjQKqtdC.cjs';
 import { LoggerOptions, TransportSingleOptions, Logger } from 'pino';
 import { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
 import { StreamableHTTPClientTransportOptions } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
@@ -2153,7 +2153,7 @@ declare const getFunctionToolsForSubAgent: (db: DatabaseClient) => (params: {
     };
 }>;
 /**
- * Upsert an agent-function tool relation (create if it doesn't exist, update if it does)
+ * Upsert a sub_agent-function tool relation (create if it doesn't exist, update if it does)
  */
 declare const upsertSubAgentFunctionToolRelation: (db: DatabaseClient) => (params: {
     scopes: AgentScopeConfig;
@@ -3491,14 +3491,7 @@ declare function isValidHttpRequest(obj: any): obj is ParsedHttpRequest;
 declare function getCachedValidator(schema: Record<string, unknown>): ValidateFunction;
 declare function validationHelper(jsonSchema: Record<string, unknown>): ValidateFunction<unknown>;
 declare function validateAgainstJsonSchema(jsonSchema: Record<string, unknown>, context: unknown): boolean;
-/**
- * Validates HTTP request headers against schema
- */
 declare function validateHttpRequestHeaders(headersSchema: any, httpRequest: ParsedHttpRequest): Promise<ContextValidationResult>;
-/**
- * Validates headers against the JSON Schema stored in context configuration
- * Supports both legacy simple schemas and new comprehensive HTTP request schemas
- */
 declare function validateHeaders({ tenantId, projectId, agentId, conversationId, parsedRequest, dbClient, credentialStores, }: {
     tenantId: string;
     projectId: string;
@@ -3508,9 +3501,6 @@ declare function validateHeaders({ tenantId, projectId, agentId, conversationId,
     dbClient: DatabaseClient;
     credentialStores?: CredentialStoreRegistry;
 }): Promise<ContextValidationResult>;
-/**
- * Hono middleware for context validation
- */
 declare function contextValidationMiddleware(dbClient: DatabaseClient): (c: Context, next: Next) => Promise<void>;
 
 type ApiKeyGenerationResult = {

package/dist/index.d.ts

@@ -6,8 +6,8 @@ export { ba as A2AError, bG as A2ARequest, bH as A2AResponse, aL as APIKeySecuri
 import { CredentialStore } from './types/index.js';
 export { CorsConfig, ServerConfig, ServerOptions } from './types/index.js';
 import { LibSQLDatabase } from 'drizzle-orm/libsql';
-import { s as schema } from './schema-D8h85qdU.js';
-export { q as agentFunctionToolRelations, U as agentFunctionToolRelationsRelations, E as agentRelations, H as agentToolRelationsRelations, a as agents, w as apiKeys, G as apiKeysRelations, j as artifactComponents, M as artifactComponentsRelations, b as contextCache, C as contextCacheRelations, c as contextConfigs, B as contextConfigsRelations, r as conversations, K as conversationsRelations, x as credentialReferences, I as credentialReferencesRelations, h as dataComponents, O as dataComponentsRelations, f as externalAgents, F as externalAgentsRelations, m as functionTools, T as functionToolsRelations, n as functions, R as functionsRelations, v as ledgerArtifacts, Q as ledgerArtifactsRelations, u as messages, L as messagesRelations, p as projects, z as projectsRelations, k as subAgentArtifactComponents, N as subAgentArtifactComponentsRelations, i as subAgentDataComponents, P as subAgentDataComponentsRelations, e as subAgentRelations, S as subAgentRelationsRelations, o as subAgentToolRelations, d as subAgents, D as subAgentsRelations, g as taskRelations, A as taskRelationsRelations, t as tasks, y as tasksRelations, l as tools, J as toolsRelations } from './schema-D8h85qdU.js';
+import { s as schema } from './schema-DylNIx0j.js';
+export { E as agentRelations, H as agentToolRelationsRelations, a as agents, w as apiKeys, G as apiKeysRelations, j as artifactComponents, M as artifactComponentsRelations, b as contextCache, C as contextCacheRelations, c as contextConfigs, B as contextConfigsRelations, r as conversations, K as conversationsRelations, x as credentialReferences, I as credentialReferencesRelations, h as dataComponents, O as dataComponentsRelations, f as externalAgents, F as externalAgentsRelations, m as functionTools, T as functionToolsRelations, n as functions, R as functionsRelations, v as ledgerArtifacts, Q as ledgerArtifactsRelations, u as messages, L as messagesRelations, p as projects, z as projectsRelations, k as subAgentArtifactComponents, N as subAgentArtifactComponentsRelations, i as subAgentDataComponents, P as subAgentDataComponentsRelations, q as subAgentFunctionToolRelations, U as subAgentFunctionToolRelationsRelations, e as subAgentRelations, S as subAgentRelationsRelations, o as subAgentToolRelations, d as subAgents, D as subAgentsRelations, g as taskRelations, A as taskRelationsRelations, t as tasks, y as tasksRelations, l as tools, J as toolsRelations } from './schema-DylNIx0j.js';
 import { LoggerOptions, TransportSingleOptions, Logger } from 'pino';
 import { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
 import { StreamableHTTPClientTransportOptions } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
@@ -2153,7 +2153,7 @@ declare const getFunctionToolsForSubAgent: (db: DatabaseClient) => (params: {
     };
 }>;
 /**
- * Upsert an agent-function tool relation (create if it doesn't exist, update if it does)
+ * Upsert a sub_agent-function tool relation (create if it doesn't exist, update if it does)
  */
 declare const upsertSubAgentFunctionToolRelation: (db: DatabaseClient) => (params: {
     scopes: AgentScopeConfig;
@@ -3491,14 +3491,7 @@ declare function isValidHttpRequest(obj: any): obj is ParsedHttpRequest;
 declare function getCachedValidator(schema: Record<string, unknown>): ValidateFunction;
 declare function validationHelper(jsonSchema: Record<string, unknown>): ValidateFunction<unknown>;
 declare function validateAgainstJsonSchema(jsonSchema: Record<string, unknown>, context: unknown): boolean;
-/**
- * Validates HTTP request headers against schema
- */
 declare function validateHttpRequestHeaders(headersSchema: any, httpRequest: ParsedHttpRequest): Promise<ContextValidationResult>;
-/**
- * Validates headers against the JSON Schema stored in context configuration
- * Supports both legacy simple schemas and new comprehensive HTTP request schemas
- */
 declare function validateHeaders({ tenantId, projectId, agentId, conversationId, parsedRequest, dbClient, credentialStores, }: {
     tenantId: string;
     projectId: string;
@@ -3508,9 +3501,6 @@ declare function validateHeaders({ tenantId, projectId, agentId, conversationId,
     dbClient: DatabaseClient;
     credentialStores?: CredentialStoreRegistry;
 }): Promise<ContextValidationResult>;
-/**
- * Hono middleware for context validation
- */
 declare function contextValidationMiddleware(dbClient: DatabaseClient): (c: Context, next: Next) => Promise<void>;
 
 type ApiKeyGenerationResult = {

package/dist/index.js

@@ -1,14 +1,14 @@
 export { ACTIVITY_NAMES, ACTIVITY_STATUS, ACTIVITY_TYPES, AGENT_IDS, AGGREGATE_OPERATORS, AI_OPERATIONS, AI_TOOL_TYPES, DATA_SOURCES, DATA_TYPES, DELEGATION_FROM_SUB_AGENT_ID, DELEGATION_ID, DELEGATION_TO_SUB_AGENT_ID, FIELD_TYPES, OPERATORS, ORDER_DIRECTIONS, PANEL_TYPES, QUERY_DEFAULTS, QUERY_EXPRESSIONS, QUERY_FIELD_CONFIGS, QUERY_TYPES, REDUCE_OPERATIONS, SPAN_KEYS, SPAN_NAMES, TRANSFER_FROM_SUB_AGENT_ID, TRANSFER_TO_SUB_AGENT_ID, UNKNOWN_VALUE } from './chunk-QFIITHNT.js';
-export { ANTHROPIC_MODELS, GOOGLE_MODELS, OPENAI_MODELS } from './chunk-LZJWVTQ2.js';
+export { ANTHROPIC_MODELS, GOOGLE_MODELS, OPENAI_MODELS } from './chunk-TTIPV5QP.js';
+export { TaskState } from './chunk-H2F72PDA.js';
 import { getLogger, convertZodToJsonSchema } from './chunk-YECQCT5N.js';
 export { PinoLogger, convertZodToJsonSchema, convertZodToJsonSchemaWithPreview, extractPreviewFields, getLogger, isZodSchema, loggerFactory, preview } from './chunk-YECQCT5N.js';
-import { validateAndTypeAgentData, validateAgentStructure, isInternalAgent, isExternalAgent } from './chunk-4FMDWUE4.js';
-export { A2AMessageMetadataSchema, DataOperationDetailsSchema, DataOperationEventSchema, DelegationReturnedDataSchema, DelegationSentDataSchema, TransferDataSchema, generateIdFromName, isExternalAgent, isInternalAgent, isValidResourceId, validateAgentRelationships, validateAgentStructure, validateAndTypeAgentData, validateArtifactComponentReferences, validateDataComponentReferences, validateToolReferences } from './chunk-4FMDWUE4.js';
-import { ContextConfigApiUpdateSchema, validatePropsAsJsonSchema } from './chunk-VICWT3WO.js';
-export { AgentApiInsertSchema, AgentApiSelectSchema, AgentApiUpdateSchema, AgentInsertSchema, AgentListResponse, AgentResponse, AgentSelectSchema, AgentStopWhenSchema, AgentUpdateSchema, AgentWithinContextOfProjectSchema, AllAgentSchema, ApiKeyApiCreationResponseSchema, ApiKeyApiInsertSchema, ApiKeyApiSelectSchema, ApiKeyApiUpdateSchema, ApiKeyInsertSchema, ApiKeyListResponse, ApiKeyResponse, ApiKeySelectSchema, ApiKeyUpdateSchema, ArtifactComponentApiInsertSchema, ArtifactComponentApiSelectSchema, ArtifactComponentApiUpdateSchema, ArtifactComponentInsertSchema, ArtifactComponentListResponse, ArtifactComponentResponse, ArtifactComponentSelectSchema, ArtifactComponentUpdateSchema, CanUseItemSchema, ContextCacheApiInsertSchema, ContextCacheApiSelectSchema, ContextCacheApiUpdateSchema, ContextCacheInsertSchema, ContextCacheSelectSchema, ContextCacheUpdateSchema, ContextConfigApiInsertSchema, ContextConfigApiSelectSchema, ContextConfigApiUpdateSchema, ContextConfigInsertSchema, ContextConfigListResponse, ContextConfigResponse, ContextConfigSelectSchema, ContextConfigUpdateSchema, ConversationApiInsertSchema, ConversationApiSelectSchema, ConversationApiUpdateSchema, ConversationInsertSchema, ConversationListResponse, ConversationResponse, ConversationSelectSchema, ConversationUpdateSchema, CredentialReferenceApiInsertSchema, CredentialReferenceApiSelectSchema, CredentialReferenceApiUpdateSchema, CredentialReferenceInsertSchema, CredentialReferenceListResponse, CredentialReferenceResponse, CredentialReferenceSelectSchema, CredentialReferenceUpdateSchema, DataComponentApiInsertSchema, DataComponentApiSelectSchema, DataComponentApiUpdateSchema, DataComponentBaseSchema, DataComponentInsertSchema, DataComponentListResponse, DataComponentResponse, DataComponentSelectSchema, DataComponentUpdateSchema, ErrorResponseSchema, ExistsResponseSchema, ExternalAgentApiInsertSchema, ExternalAgentApiSelectSchema, ExternalAgentApiUpdateSchema, ExternalAgentInsertSchema, ExternalAgentListResponse, ExternalAgentResponse, ExternalAgentSelectSchema, ExternalAgentUpdateSchema, ExternalSubAgentRelationApiInsertSchema, ExternalSubAgentRelationInsertSchema, FetchConfigSchema, FetchDefinitionSchema, FullAgentAgentInsertSchema, FullProjectDefinitionSchema, FunctionApiInsertSchema, FunctionApiSelectSchema, FunctionApiUpdateSchema, FunctionInsertSchema, FunctionListResponse, FunctionResponse, FunctionSelectSchema, FunctionToolApiInsertSchema, FunctionToolApiSelectSchema, FunctionToolApiUpdateSchema, FunctionToolConfigSchema, FunctionToolInsertSchema, FunctionToolListResponse, FunctionToolResponse, FunctionToolSelectSchema, FunctionToolUpdateSchema, FunctionUpdateSchema, HeadersScopeSchema, LedgerArtifactApiInsertSchema, LedgerArtifactApiSelectSchema, LedgerArtifactApiUpdateSchema, LedgerArtifactInsertSchema, LedgerArtifactSelectSchema, LedgerArtifactUpdateSchema, ListResponseSchema, MAX_ID_LENGTH, MCPToolConfigSchema, MIN_ID_LENGTH, McpToolDefinitionSchema, McpToolSchema, McpTransportConfigSchema, MessageApiInsertSchema, MessageApiSelectSchema, MessageApiUpdateSchema, MessageInsertSchema, MessageListResponse, MessageResponse, MessageSelectSchema, MessageUpdateSchema, ModelSchema, ModelSettingsSchema, PaginationQueryParamsSchema, PaginationSchema, ProjectApiInsertSchema, ProjectApiSelectSchema, ProjectApiUpdateSchema, ProjectInsertSchema, ProjectListResponse, ProjectModelSchema, ProjectResponse, ProjectSelectSchema, ProjectUpdateSchema, RemovedResponseSchema, SandboxConfigSchema, SingleResponseSchema, StatusComponentSchema, StatusUpdateSchema, StopWhenSchema, SubAgentApiInsertSchema, SubAgentApiSelectSchema, SubAgentApiUpdateSchema, SubAgentArtifactComponentApiInsertSchema, SubAgentArtifactComponentApiSelectSchema, SubAgentArtifactComponentApiUpdateSchema, SubAgentArtifactComponentInsertSchema, SubAgentArtifactComponentListResponse, SubAgentArtifactComponentResponse, SubAgentArtifactComponentSelectSchema, SubAgentArtifactComponentUpdateSchema, SubAgentDataComponentApiInsertSchema, SubAgentDataComponentApiSelectSchema, SubAgentDataComponentApiUpdateSchema, SubAgentDataComponentInsertSchema, SubAgentDataComponentListResponse, SubAgentDataComponentResponse, SubAgentDataComponentSelectSchema, SubAgentDataComponentUpdateSchema, SubAgentInsertSchema, SubAgentListResponse, SubAgentRelationApiInsertSchema, SubAgentRelationApiSelectSchema, SubAgentRelationApiUpdateSchema, SubAgentRelationInsertSchema, SubAgentRelationListResponse, SubAgentRelationQuerySchema, SubAgentRelationResponse, SubAgentRelationSelectSchema, SubAgentRelationUpdateSchema, SubAgentResponse, SubAgentSelectSchema, SubAgentStopWhenSchema, SubAgentToolRelationApiInsertSchema, SubAgentToolRelationApiSelectSchema, SubAgentToolRelationApiUpdateSchema, SubAgentToolRelationInsertSchema, SubAgentToolRelationListResponse, SubAgentToolRelationResponse, SubAgentToolRelationSelectSchema, SubAgentToolRelationUpdateSchema, SubAgentUpdateSchema, TaskApiInsertSchema, TaskApiSelectSchema, TaskApiUpdateSchema, TaskInsertSchema, TaskRelationApiInsertSchema, TaskRelationApiSelectSchema, TaskRelationApiUpdateSchema, TaskRelationInsertSchema, TaskRelationSelectSchema, TaskRelationUpdateSchema, TaskSelectSchema, TaskUpdateSchema, TenantIdParamsSchema, TenantParamsSchema, TenantProjectAgentIdParamsSchema, TenantProjectAgentParamsSchema, TenantProjectAgentSubAgentIdParamsSchema, TenantProjectAgentSubAgentParamsSchema, TenantProjectIdParamsSchema, TenantProjectParamsSchema, ToolApiInsertSchema, ToolApiSelectSchema, ToolApiUpdateSchema, ToolInsertSchema, ToolListResponse, ToolResponse, ToolSelectSchema, ToolStatusSchema, ToolUpdateSchema, URL_SAFE_ID_PATTERN, resourceIdSchema, validatePropsAsJsonSchema } from './chunk-VICWT3WO.js';
-import { schema_exports, contextConfigs, externalAgents, functions, functionTools, agentFunctionToolRelations, subAgentRelations, subAgents, subAgentToolRelations, tools, credentialReferences, agents, subAgentDataComponents, subAgentArtifactComponents, dataComponents, artifactComponents, projects, apiKeys, contextCache, conversations, messages, ledgerArtifacts, tasks, taskRelations } from './chunk-B6F3RF4T.js';
-export { agentFunctionToolRelations, agentFunctionToolRelationsRelations, agentRelations, agentToolRelationsRelations, agents, apiKeys, apiKeysRelations, artifactComponents, artifactComponentsRelations, contextCache, contextCacheRelations, contextConfigs, contextConfigsRelations, conversations, conversationsRelations, credentialReferences, credentialReferencesRelations, dataComponents, dataComponentsRelations, externalAgents, externalAgentsRelations, functionTools, functionToolsRelations, functions, functionsRelations, ledgerArtifacts, ledgerArtifactsRelations, messages, messagesRelations, projects, projectsRelations, subAgentArtifactComponents, subAgentArtifactComponentsRelations, subAgentDataComponents, subAgentDataComponentsRelations, subAgentRelations, subAgentRelationsRelations, subAgentToolRelations, subAgents, subAgentsRelations, taskRelations, taskRelationsRelations, tasks, tasksRelations, tools, toolsRelations } from './chunk-B6F3RF4T.js';
-export { TaskState } from './chunk-H2F72PDA.js';
+import { validateAndTypeAgentData, validateAgentStructure, isInternalAgent, isExternalAgent } from './chunk-VTNB6CCI.js';
+export { A2AMessageMetadataSchema, DataOperationDetailsSchema, DataOperationEventSchema, DelegationReturnedDataSchema, DelegationSentDataSchema, TransferDataSchema, generateIdFromName, isExternalAgent, isInternalAgent, isValidResourceId, validateAgentRelationships, validateAgentStructure, validateAndTypeAgentData, validateArtifactComponentReferences, validateDataComponentReferences, validateToolReferences } from './chunk-VTNB6CCI.js';
+import { ContextConfigApiUpdateSchema, validatePropsAsJsonSchema } from './chunk-RCE4G7BW.js';
+export { AgentApiInsertSchema, AgentApiSelectSchema, AgentApiUpdateSchema, AgentInsertSchema, AgentListResponse, AgentResponse, AgentSelectSchema, AgentStopWhenSchema, AgentUpdateSchema, AgentWithinContextOfProjectSchema, AllAgentSchema, ApiKeyApiCreationResponseSchema, ApiKeyApiInsertSchema, ApiKeyApiSelectSchema, ApiKeyApiUpdateSchema, ApiKeyInsertSchema, ApiKeyListResponse, ApiKeyResponse, ApiKeySelectSchema, ApiKeyUpdateSchema, ArtifactComponentApiInsertSchema, ArtifactComponentApiSelectSchema, ArtifactComponentApiUpdateSchema, ArtifactComponentInsertSchema, ArtifactComponentListResponse, ArtifactComponentResponse, ArtifactComponentSelectSchema, ArtifactComponentUpdateSchema, CanUseItemSchema, ContextCacheApiInsertSchema, ContextCacheApiSelectSchema, ContextCacheApiUpdateSchema, ContextCacheInsertSchema, ContextCacheSelectSchema, ContextCacheUpdateSchema, ContextConfigApiInsertSchema, ContextConfigApiSelectSchema, ContextConfigApiUpdateSchema, ContextConfigInsertSchema, ContextConfigListResponse, ContextConfigResponse, ContextConfigSelectSchema, ContextConfigUpdateSchema, ConversationApiInsertSchema, ConversationApiSelectSchema, ConversationApiUpdateSchema, ConversationInsertSchema, ConversationListResponse, ConversationResponse, ConversationSelectSchema, ConversationUpdateSchema, CredentialReferenceApiInsertSchema, CredentialReferenceApiSelectSchema, CredentialReferenceApiUpdateSchema, CredentialReferenceInsertSchema, CredentialReferenceListResponse, CredentialReferenceResponse, CredentialReferenceSelectSchema, CredentialReferenceUpdateSchema, DataComponentApiInsertSchema, DataComponentApiSelectSchema, DataComponentApiUpdateSchema, DataComponentBaseSchema, DataComponentInsertSchema, DataComponentListResponse, DataComponentResponse, DataComponentSelectSchema, DataComponentUpdateSchema, ErrorResponseSchema, ExistsResponseSchema, ExternalAgentApiInsertSchema, ExternalAgentApiSelectSchema, ExternalAgentApiUpdateSchema, ExternalAgentInsertSchema, ExternalAgentListResponse, ExternalAgentResponse, ExternalAgentSelectSchema, ExternalAgentUpdateSchema, ExternalSubAgentRelationApiInsertSchema, ExternalSubAgentRelationInsertSchema, FetchConfigSchema, FetchDefinitionSchema, FullAgentAgentInsertSchema, FullProjectDefinitionSchema, FunctionApiInsertSchema, FunctionApiSelectSchema, FunctionApiUpdateSchema, FunctionInsertSchema, FunctionListResponse, FunctionResponse, FunctionSelectSchema, FunctionToolApiInsertSchema, FunctionToolApiSelectSchema, FunctionToolApiUpdateSchema, FunctionToolConfigSchema, FunctionToolInsertSchema, FunctionToolListResponse, FunctionToolResponse, FunctionToolSelectSchema, FunctionToolUpdateSchema, FunctionUpdateSchema, HeadersScopeSchema, LedgerArtifactApiInsertSchema, LedgerArtifactApiSelectSchema, LedgerArtifactApiUpdateSchema, LedgerArtifactInsertSchema, LedgerArtifactSelectSchema, LedgerArtifactUpdateSchema, ListResponseSchema, MAX_ID_LENGTH, MCPToolConfigSchema, MIN_ID_LENGTH, McpToolDefinitionSchema, McpToolSchema, McpTransportConfigSchema, MessageApiInsertSchema, MessageApiSelectSchema, MessageApiUpdateSchema, MessageInsertSchema, MessageListResponse, MessageResponse, MessageSelectSchema, MessageUpdateSchema, ModelSchema, ModelSettingsSchema, PaginationQueryParamsSchema, PaginationSchema, ProjectApiInsertSchema, ProjectApiSelectSchema, ProjectApiUpdateSchema, ProjectInsertSchema, ProjectListResponse, ProjectModelSchema, ProjectResponse, ProjectSelectSchema, ProjectUpdateSchema, RemovedResponseSchema, SandboxConfigSchema, SingleResponseSchema, StatusComponentSchema, StatusUpdateSchema, StopWhenSchema, SubAgentApiInsertSchema, SubAgentApiSelectSchema, SubAgentApiUpdateSchema, SubAgentArtifactComponentApiInsertSchema, SubAgentArtifactComponentApiSelectSchema, SubAgentArtifactComponentApiUpdateSchema, SubAgentArtifactComponentInsertSchema, SubAgentArtifactComponentListResponse, SubAgentArtifactComponentResponse, SubAgentArtifactComponentSelectSchema, SubAgentArtifactComponentUpdateSchema, SubAgentDataComponentApiInsertSchema, SubAgentDataComponentApiSelectSchema, SubAgentDataComponentApiUpdateSchema, SubAgentDataComponentInsertSchema, SubAgentDataComponentListResponse, SubAgentDataComponentResponse, SubAgentDataComponentSelectSchema, SubAgentDataComponentUpdateSchema, SubAgentInsertSchema, SubAgentListResponse, SubAgentRelationApiInsertSchema, SubAgentRelationApiSelectSchema, SubAgentRelationApiUpdateSchema, SubAgentRelationInsertSchema, SubAgentRelationListResponse, SubAgentRelationQuerySchema, SubAgentRelationResponse, SubAgentRelationSelectSchema, SubAgentRelationUpdateSchema, SubAgentResponse, SubAgentSelectSchema, SubAgentStopWhenSchema, SubAgentToolRelationApiInsertSchema, SubAgentToolRelationApiSelectSchema, SubAgentToolRelationApiUpdateSchema, SubAgentToolRelationInsertSchema, SubAgentToolRelationListResponse, SubAgentToolRelationResponse, SubAgentToolRelationSelectSchema, SubAgentToolRelationUpdateSchema, SubAgentUpdateSchema, TaskApiInsertSchema, TaskApiSelectSchema, TaskApiUpdateSchema, TaskInsertSchema, TaskRelationApiInsertSchema, TaskRelationApiSelectSchema, TaskRelationApiUpdateSchema, TaskRelationInsertSchema, TaskRelationSelectSchema, TaskRelationUpdateSchema, TaskSelectSchema, TaskUpdateSchema, TenantIdParamsSchema, TenantParamsSchema, TenantProjectAgentIdParamsSchema, TenantProjectAgentParamsSchema, TenantProjectAgentSubAgentIdParamsSchema, TenantProjectAgentSubAgentParamsSchema, TenantProjectIdParamsSchema, TenantProjectParamsSchema, ToolApiInsertSchema, ToolApiSelectSchema, ToolApiUpdateSchema, ToolInsertSchema, ToolListResponse, ToolResponse, ToolSelectSchema, ToolStatusSchema, ToolUpdateSchema, URL_SAFE_ID_PATTERN, resourceIdSchema, validatePropsAsJsonSchema } from './chunk-RCE4G7BW.js';
+import { schema_exports, contextConfigs, externalAgents, functions, functionTools, subAgentFunctionToolRelations, subAgentRelations, subAgents, subAgentToolRelations, tools, credentialReferences, agents, subAgentDataComponents, subAgentArtifactComponents, dataComponents, artifactComponents, projects, apiKeys, contextCache, conversations, messages, ledgerArtifacts, tasks, taskRelations } from './chunk-7GKB2SDR.js';
+export { agentRelations, agentToolRelationsRelations, agents, apiKeys, apiKeysRelations, artifactComponents, artifactComponentsRelations, contextCache, contextCacheRelations, contextConfigs, contextConfigsRelations, conversations, conversationsRelations, credentialReferences, credentialReferencesRelations, dataComponents, dataComponentsRelations, externalAgents, externalAgentsRelations, functionTools, functionToolsRelations, functions, functionsRelations, ledgerArtifacts, ledgerArtifactsRelations, messages, messagesRelations, projects, projectsRelations, subAgentArtifactComponents, subAgentArtifactComponentsRelations, subAgentDataComponents, subAgentDataComponentsRelations, subAgentFunctionToolRelations, subAgentFunctionToolRelationsRelations, subAgentRelations, subAgentRelationsRelations, subAgentToolRelations, subAgents, subAgentsRelations, taskRelations, taskRelationsRelations, tasks, tasksRelations, tools, toolsRelations } from './chunk-7GKB2SDR.js';
 import { CredentialStoreType, MCPServerType, MCPTransportType } from './chunk-YFHT5M2R.js';
 export { CredentialStoreType, MCPServerType, MCPTransportType, TOOL_STATUS_VALUES, VALID_RELATION_TYPES } from './chunk-YFHT5M2R.js';
 import { __commonJS, __require, __publicField } from './chunk-E6R6PML7.js';
@@ -214114,12 +214114,12 @@ var getFunctionToolsForSubAgent = (db) => {
         scopes: { tenantId, projectId, agentId },
         pagination: { page: 1, limit: 1e3 }
       });
-      const relations = await db.select().from(agentFunctionToolRelations).where(
+      const relations = await db.select().from(subAgentFunctionToolRelations).where(
         and(
-          eq(agentFunctionToolRelations.tenantId, tenantId),
-          eq(agentFunctionToolRelations.projectId, projectId),
-          eq(agentFunctionToolRelations.agentId, agentId),
-          eq(agentFunctionToolRelations.subAgentId, subAgentId)
+          eq(subAgentFunctionToolRelations.tenantId, tenantId),
+          eq(subAgentFunctionToolRelations.projectId, projectId),
+          eq(subAgentFunctionToolRelations.agentId, agentId),
+          eq(subAgentFunctionToolRelations.subAgentId, subAgentId)
         )
       );
       const relatedFunctionToolIds = new Set(relations.map((r) => r.functionToolId));
@@ -214140,17 +214140,43 @@ var getFunctionToolsForSubAgent = (db) => {
   };
 };
 var upsertSubAgentFunctionToolRelation = (db) => async (params) => {
-  if (params.relationId) {
+  const { scopes, subAgentId, functionToolId, relationId } = params;
+  const { tenantId, projectId, agentId } = scopes;
+  if (relationId) {
     return await updateSubAgentFunctionToolRelation(db)({
-      scopes: params.scopes,
-      relationId: params.relationId,
+      scopes,
+      relationId,
       data: {
-        subAgentId: params.subAgentId,
-        functionToolId: params.functionToolId
+        subAgentId,
+        functionToolId
       }
     });
   }
-  return await addFunctionToolToSubAgent(db)(params);
+  try {
+    const existingRelations = await db.select().from(subAgentFunctionToolRelations).where(
+      and(
+        eq(subAgentFunctionToolRelations.tenantId, tenantId),
+        eq(subAgentFunctionToolRelations.projectId, projectId),
+        eq(subAgentFunctionToolRelations.agentId, agentId),
+        eq(subAgentFunctionToolRelations.subAgentId, subAgentId),
+        eq(subAgentFunctionToolRelations.functionToolId, functionToolId)
+      )
+    ).limit(1);
+    if (existingRelations.length > 0) {
+      logger3.info(
+        { tenantId, projectId, agentId, subAgentId, functionToolId, relationId: existingRelations[0].id },
+        "Sub_agent-function tool relation already exists, returning existing relation"
+      );
+      return { id: existingRelations[0].id };
+    }
+    return await addFunctionToolToSubAgent(db)(params);
+  } catch (error) {
+    logger3.error(
+      { tenantId, projectId, agentId, subAgentId, functionToolId, error },
+      "Failed to upsert sub_agent-function tool relation"
+    );
+    throw error;
+  }
 };
 var addFunctionToolToSubAgent = (db) => {
   return async (params) => {
@@ -214158,7 +214184,7 @@ var addFunctionToolToSubAgent = (db) => {
     const { tenantId, projectId, agentId } = scopes;
     try {
       const relationId = nanoid();
-      await db.insert(agentFunctionToolRelations).values({
+      await db.insert(subAgentFunctionToolRelations).values({
         id: relationId,
         tenantId,
         projectId,
@@ -214168,7 +214194,7 @@ var addFunctionToolToSubAgent = (db) => {
       });
       logger3.info(
         { tenantId, projectId, agentId, subAgentId, functionToolId, relationId },
-        "Function tool added to agent"
+        "Function tool added to sub_agent"
       );
       return { id: relationId };
     } catch (error) {
@@ -214185,20 +214211,20 @@ var updateSubAgentFunctionToolRelation = (db) => {
     const { scopes, relationId, data } = params;
     const { tenantId, projectId, agentId } = scopes;
     try {
-      await db.update(agentFunctionToolRelations).set({
+      await db.update(subAgentFunctionToolRelations).set({
         subAgentId: data.subAgentId,
         functionToolId: data.functionToolId
       }).where(
         and(
-          eq(agentFunctionToolRelations.id, relationId),
-          eq(agentFunctionToolRelations.tenantId, tenantId),
-          eq(agentFunctionToolRelations.projectId, projectId),
-          eq(agentFunctionToolRelations.agentId, agentId)
+          eq(subAgentFunctionToolRelations.id, relationId),
+          eq(subAgentFunctionToolRelations.tenantId, tenantId),
+          eq(subAgentFunctionToolRelations.projectId, projectId),
+          eq(subAgentFunctionToolRelations.agentId, agentId)
         )
       );
       logger3.info(
         { tenantId, projectId, agentId, relationId, data },
-        "Agent-function tool relation updated"
+        "SubAgent-function tool relation updated"
       );
       return { id: relationId };
     } catch (error) {
@@ -216242,21 +216268,21 @@ var getFullAgentDefinition = (db) => async ({
         tenantId: functionTools.tenantId,
         projectId: functionTools.projectId,
         agentId: functionTools.agentId,
-        agentToolRelationId: agentFunctionToolRelations.id
-      }).from(agentFunctionToolRelations).innerJoin(
+        agentToolRelationId: subAgentFunctionToolRelations.id
+      }).from(subAgentFunctionToolRelations).innerJoin(
         functionTools,
         and(
-          eq(agentFunctionToolRelations.functionToolId, functionTools.id),
-          eq(agentFunctionToolRelations.tenantId, functionTools.tenantId),
-          eq(agentFunctionToolRelations.projectId, functionTools.projectId),
-          eq(agentFunctionToolRelations.agentId, functionTools.agentId)
+          eq(subAgentFunctionToolRelations.functionToolId, functionTools.id),
+          eq(subAgentFunctionToolRelations.tenantId, functionTools.tenantId),
+          eq(subAgentFunctionToolRelations.projectId, functionTools.projectId),
+          eq(subAgentFunctionToolRelations.agentId, functionTools.agentId)
         )
       ).where(
         and(
-          eq(agentFunctionToolRelations.tenantId, tenantId),
-          eq(agentFunctionToolRelations.projectId, projectId),
-          eq(agentFunctionToolRelations.agentId, agentId),
-          eq(agentFunctionToolRelations.subAgentId, agent2.id)
+          eq(subAgentFunctionToolRelations.tenantId, tenantId),
+          eq(subAgentFunctionToolRelations.projectId, projectId),
+          eq(subAgentFunctionToolRelations.agentId, agentId),
+          eq(subAgentFunctionToolRelations.subAgentId, agent2.id)
         )
       );
       const agentDataComponentRelations = await db.query.subAgentDataComponents.findMany({