@inkeep/agents-core 0.5.0 → 0.6.4

package/dist/index.cjs

@@ -790,6 +790,7 @@ var apiKeys = sqliteCore.sqliteTable(
     // Hashed API key (never store plaintext)
     keyPrefix: sqliteCore.text("key_prefix").notNull(),
     // First 8 chars for identification (e.g., "sk_live_abc...")
+    name: sqliteCore.text("name"),
     lastUsedAt: sqliteCore.text("last_used_at"),
     expiresAt: sqliteCore.text("expires_at"),
     createdAt: sqliteCore.text("created_at").notNull().default(drizzleOrm.sql`CURRENT_TIMESTAMP`),
@@ -1423,8 +1424,6 @@ var ArtifactComponentApiInsertSchema = ArtifactComponentInsertSchema.omit({
   projectId: true,
   createdAt: true,
   updatedAt: true
-}).extend({
-  id: resourceIdSchema.optional()
 });
 var ArtifactComponentApiUpdateSchema = createApiUpdateSchema(
   ArtifactComponentUpdateSchema
@@ -1644,10 +1643,13 @@ var StatusUpdateSchema = zodOpenapi.z.object({
   prompt: zodOpenapi.z.string().max(2e3, "Custom prompt cannot exceed 2000 characters").optional(),
   statusComponents: zodOpenapi.z.array(StatusComponentSchema).optional()
 });
+var CanUseItemSchema = zodOpenapi.z.object({
+  toolId: zodOpenapi.z.string(),
+  toolSelection: zodOpenapi.z.array(zodOpenapi.z.string()).nullable().optional()
+});
 var FullGraphAgentInsertSchema = AgentApiInsertSchema.extend({
   type: zodOpenapi.z.literal("internal"),
-  tools: zodOpenapi.z.array(zodOpenapi.z.string()),
-  selectedTools: zodOpenapi.z.record(zodOpenapi.z.string(), zodOpenapi.z.array(zodOpenapi.z.string())).optional(),
+  canUse: zodOpenapi.z.array(CanUseItemSchema),
   dataComponents: zodOpenapi.z.array(zodOpenapi.z.string()).optional(),
   artifactComponents: zodOpenapi.z.array(zodOpenapi.z.string()).optional(),
   canTransferTo: zodOpenapi.z.array(zodOpenapi.z.string()).optional(),
@@ -1811,6 +1813,22 @@ var PaginationQueryParamsSchema = zodOpenapi.z.object({
 
 // src/context/ContextConfig.ts
 var logger = getLogger("context-config");
+var RequestContextSchemaBuilder = class {
+  constructor(options) {
+    __publicField(this, "schema");
+    this.schema = options.schema;
+  }
+  /** Template function for request context paths with type-safe autocomplete */
+  toTemplate(path2) {
+    return `{{requestContext.${path2}}}`;
+  }
+  getSchema() {
+    return this.schema;
+  }
+  getJsonSchema() {
+    return convertZodToJsonSchema(this.schema);
+  }
+};
 function convertZodToJsonSchema(zodSchema) {
   try {
     return zod.z.toJSONSchema(zodSchema, { target: "draft-7" });
@@ -1833,23 +1851,34 @@ var ContextConfigBuilder = class {
     this.tenantId = options.tenantId || "default";
     this.projectId = options.projectId || "default";
     this.baseURL = process.env.INKEEP_AGENTS_MANAGE_API_URL || "http://localhost:3002";
-    let requestContextSchema;
+    let requestContextSchema2;
     if (options.requestContextSchema) {
+      const actualSchema = options.requestContextSchema instanceof RequestContextSchemaBuilder ? options.requestContextSchema.getSchema() : options.requestContextSchema;
       logger.info(
         {
           requestContextSchema: options.requestContextSchema
         },
         "Converting request headers schema to JSON Schema for database storage"
       );
-      let schema = options.requestContextSchema;
-      if (schema instanceof zod.z.ZodObject) {
-        schema = schema.loose();
+      requestContextSchema2 = convertZodToJsonSchema(actualSchema);
+    }
+    const processedContextVariables = {};
+    if (options.contextVariables) {
+      for (const [key, definition] of Object.entries(options.contextVariables)) {
+        const { credentialReference, ...rest } = definition;
+        processedContextVariables[key] = {
+          ...rest,
+          responseSchema: convertZodToJsonSchema(definition.responseSchema),
+          credentialReferenceId: credentialReference?.id
+        };
         logger.debug(
-          { schemaType: "ZodObject" },
-          "Applied .loose() to ZodObject requestContextSchema for more permissive validation"
+          {
+            contextVariableKey: key,
+            originalSchema: definition.responseSchema
+          },
+          "Converting contextVariable responseSchema to JSON Schema for database storage"
         );
       }
-      requestContextSchema = convertZodToJsonSchema(schema);
     }
     this.config = {
       id: options.id,
@@ -1857,8 +1886,8 @@ var ContextConfigBuilder = class {
       projectId: this.projectId,
       name: options.name,
       description: options.description || "",
-      requestContextSchema,
-      contextVariables: options.contextVariables || {}
+      requestContextSchema: requestContextSchema2,
+      contextVariables: processedContextVariables
     };
     logger.info(
       {
@@ -1868,6 +1897,22 @@ var ContextConfigBuilder = class {
       "ContextConfig builder initialized"
     );
   }
+  /**
+   * Convert the builder to a plain object for database operations
+   */
+  toObject() {
+    return {
+      id: this.getId(),
+      tenantId: this.tenantId,
+      projectId: this.projectId,
+      name: this.getName(),
+      description: this.getDescription(),
+      requestContextSchema: this.getRequestContextSchema(),
+      contextVariables: this.getContextVariables(),
+      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+      updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
+  }
   // Getter methods
   getId() {
     if (!this.config.id) {
@@ -1890,35 +1935,14 @@ var ContextConfigBuilder = class {
   getContextVariables() {
     return this.config.contextVariables || {};
   }
-  /**
-   * Convert the builder to a plain object for database operations
-   */
-  toObject() {
-    return {
-      id: this.getId(),
-      tenantId: this.tenantId,
-      projectId: this.projectId,
-      name: this.getName(),
-      description: this.getDescription(),
-      requestContextSchema: this.getRequestContextSchema(),
-      contextVariables: this.getContextVariables(),
-      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-      updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-    };
-  }
   // Builder methods for fluent API
   withRequestContextSchema(schema) {
     this.config.requestContextSchema = schema;
     return this;
   }
-  withContextVariable(key, definition) {
-    this.config.contextVariables = this.config.contextVariables || {};
-    this.config.contextVariables[key] = definition;
-    return this;
-  }
-  withContextVariables(variables) {
-    this.config.contextVariables = variables;
-    return this;
+  /** 4) The function you ship: path autocomplete + validation, returns {{path}} */
+  toTemplate(path2) {
+    return `{{${path2}}}`;
   }
   // Validation method
   validate() {
@@ -2063,15 +2087,11 @@ var ContextConfigBuilder = class {
 function contextConfig(options) {
   return new ContextConfigBuilder(options);
 }
+function requestContextSchema(options) {
+  return new RequestContextSchemaBuilder(options);
+}
 function fetchDefinition(options) {
-  const fetchConfig = options.fetchConfig || {
-    url: options.url,
-    method: options.method,
-    headers: options.headers,
-    body: options.body,
-    transform: options.transform,
-    timeout: options.timeout
-  };
+  const fetchConfig = options.fetchConfig;
   return {
     id: options.id,
     name: options.name,
@@ -2084,9 +2104,9 @@ function fetchDefinition(options) {
       transform: fetchConfig.transform,
       timeout: fetchConfig.timeout
     },
-    responseSchema: options.responseSchema ? convertZodToJsonSchema(options.responseSchema) : void 0,
+    responseSchema: options.responseSchema,
     defaultValue: options.defaultValue,
-    credentialReferenceId: options.credential?.id
+    credentialReferenceId: options.credentialReference?.id
   };
 }
 var logger2 = getLogger("template-engine");
@@ -2609,16 +2629,21 @@ var getRelatedAgentsForGraph = (db) => async (params) => {
     name: agents.name,
     description: agents.description,
     relationType: agentRelations.relationType
-  }).from(agentRelations).innerJoin(agents, drizzleOrm.eq(agentRelations.targetAgentId, agents.id)).where(
+  }).from(agentRelations).innerJoin(
+    agents,
+    drizzleOrm.and(
+      drizzleOrm.eq(agentRelations.targetAgentId, agents.id),
+      drizzleOrm.eq(agentRelations.tenantId, agents.tenantId),
+      drizzleOrm.eq(agentRelations.projectId, agents.projectId),
+      drizzleOrm.eq(agentRelations.graphId, agents.graphId)
+    )
+  ).where(
     drizzleOrm.and(
       drizzleOrm.eq(agentRelations.tenantId, params.scopes.tenantId),
       drizzleOrm.eq(agentRelations.projectId, params.scopes.projectId),
       drizzleOrm.eq(agentRelations.graphId, params.scopes.graphId),
       drizzleOrm.eq(agentRelations.sourceAgentId, params.agentId),
-      drizzleOrm.isNotNull(agentRelations.targetAgentId),
-      drizzleOrm.eq(agents.tenantId, params.scopes.tenantId),
-      drizzleOrm.eq(agents.projectId, params.scopes.projectId),
-      drizzleOrm.eq(agents.graphId, params.scopes.graphId)
+      drizzleOrm.isNotNull(agentRelations.targetAgentId)
     )
   );
   const externalRelations = await db.select({
@@ -2630,16 +2655,21 @@ var getRelatedAgentsForGraph = (db) => async (params) => {
       description: externalAgents.description,
       baseUrl: externalAgents.baseUrl
     }
-  }).from(agentRelations).innerJoin(externalAgents, drizzleOrm.eq(agentRelations.externalAgentId, externalAgents.id)).where(
+  }).from(agentRelations).innerJoin(
+    externalAgents,
+    drizzleOrm.and(
+      drizzleOrm.eq(agentRelations.externalAgentId, externalAgents.id),
+      drizzleOrm.eq(agentRelations.tenantId, externalAgents.tenantId),
+      drizzleOrm.eq(agentRelations.projectId, externalAgents.projectId),
+      drizzleOrm.eq(agentRelations.graphId, externalAgents.graphId)
+    )
+  ).where(
     drizzleOrm.and(
       drizzleOrm.eq(agentRelations.tenantId, params.scopes.tenantId),
       drizzleOrm.eq(agentRelations.projectId, params.scopes.projectId),
       drizzleOrm.eq(agentRelations.graphId, params.scopes.graphId),
       drizzleOrm.eq(agentRelations.sourceAgentId, params.agentId),
-      drizzleOrm.isNotNull(agentRelations.externalAgentId),
-      drizzleOrm.eq(externalAgents.tenantId, params.scopes.tenantId),
-      drizzleOrm.eq(externalAgents.projectId, params.scopes.projectId),
-      drizzleOrm.eq(externalAgents.graphId, params.scopes.graphId)
+      drizzleOrm.isNotNull(agentRelations.externalAgentId)
     )
   );
   return {
@@ -2902,7 +2932,14 @@ var getToolsForAgent = (db) => async (params) => {
         availableTools: tools.availableTools,
         credentialReferenceId: tools.credentialReferenceId
       }
-    }).from(agentToolRelations).innerJoin(tools, drizzleOrm.eq(agentToolRelations.toolId, tools.id)).where(
+    }).from(agentToolRelations).innerJoin(
+      tools,
+      drizzleOrm.and(
+        drizzleOrm.eq(agentToolRelations.tenantId, tools.tenantId),
+        drizzleOrm.eq(agentToolRelations.projectId, tools.projectId),
+        drizzleOrm.eq(agentToolRelations.toolId, tools.id)
+      )
+    ).where(
       drizzleOrm.and(
         drizzleOrm.eq(agentToolRelations.tenantId, params.scopes.tenantId),
         drizzleOrm.eq(agentToolRelations.projectId, params.scopes.projectId),
@@ -2950,7 +2987,15 @@ var getAgentsForTool = (db) => async (params) => {
         createdAt: agents.createdAt,
         updatedAt: agents.updatedAt
       }
-    }).from(agentToolRelations).innerJoin(agents, drizzleOrm.eq(agentToolRelations.agentId, agents.id)).where(
+    }).from(agentToolRelations).innerJoin(
+      agents,
+      drizzleOrm.and(
+        drizzleOrm.eq(agentToolRelations.agentId, agents.id),
+        drizzleOrm.eq(agentToolRelations.tenantId, agents.tenantId),
+        drizzleOrm.eq(agentToolRelations.projectId, agents.projectId),
+        drizzleOrm.eq(agentToolRelations.graphId, agents.graphId)
+      )
+    ).where(
       drizzleOrm.and(
         drizzleOrm.eq(agentToolRelations.tenantId, params.scopes.tenantId),
         drizzleOrm.eq(agentToolRelations.projectId, params.scopes.projectId),
@@ -3637,8 +3682,20 @@ var getFullGraphDefinition = (db) => async ({
         availableTools: tools.availableTools,
         lastToolsSync: tools.lastToolsSync,
         selectedTools: agentToolRelations.selectedTools
-      }).from(agentToolRelations).innerJoin(tools, drizzleOrm.eq(agentToolRelations.toolId, tools.id)).where(
-        drizzleOrm.and(drizzleOrm.eq(agentToolRelations.tenantId, tenantId), drizzleOrm.eq(agentToolRelations.agentId, agent.id))
+      }).from(agentToolRelations).innerJoin(
+        tools,
+        drizzleOrm.and(
+          drizzleOrm.eq(agentToolRelations.toolId, tools.id),
+          drizzleOrm.eq(agentToolRelations.tenantId, tools.tenantId),
+          drizzleOrm.eq(agentToolRelations.projectId, tools.projectId)
+        )
+      ).where(
+        drizzleOrm.and(
+          drizzleOrm.eq(agentToolRelations.tenantId, tenantId),
+          drizzleOrm.eq(agentToolRelations.projectId, projectId),
+          drizzleOrm.eq(agentToolRelations.graphId, graphId),
+          drizzleOrm.eq(agentToolRelations.agentId, agent.id)
+        )
       );
       const agentDataComponentRelations = await db.query.agentDataComponents.findMany({
         where: drizzleOrm.and(
@@ -3656,12 +3713,10 @@ var getFullGraphDefinition = (db) => async ({
       const agentArtifactComponentIds = agentArtifactComponentRelations.map(
         (rel) => rel.artifactComponentId
       );
-      const selectedTools = {};
-      agentTools.forEach((tool2) => {
-        if (tool2.selectedTools && Array.isArray(tool2.selectedTools)) {
-          selectedTools[tool2.id] = tool2.selectedTools;
-        }
-      });
+      const canUse = agentTools.map((tool2) => ({
+        toolId: tool2.id,
+        toolSelection: tool2.selectedTools || null
+      }));
       return {
         id: agent.id,
         name: agent.name,
@@ -3673,20 +3728,8 @@ var getFullGraphDefinition = (db) => async ({
         canDelegateTo,
         dataComponents: agentDataComponentIds,
         artifactComponents: agentArtifactComponentIds,
-        ...Object.keys(selectedTools).length > 0 && { selectedTools },
-        tools: agentTools.map((tool2) => ({
-          id: tool2.id,
-          name: tool2.name,
-          config: tool2.config,
-          imageUrl: tool2.imageUrl || void 0,
-          status: tool2.status,
-          capabilities: tool2.capabilities || void 0,
-          lastHealthCheck: tool2.lastHealthCheck && !Number.isNaN(new Date(tool2.lastHealthCheck).getTime()) ? new Date(tool2.lastHealthCheck).toISOString() : void 0,
-          lastError: tool2.lastError || void 0,
-          availableTools: tool2.availableTools || void 0,
-          activeTools: tool2.config?.mcp?.activeTools || void 0,
-          lastToolsSync: tool2.lastToolsSync && !Number.isNaN(new Date(tool2.lastToolsSync).getTime()) ? new Date(tool2.lastToolsSync).toISOString() : void 0
-        }))
+        canUse
+        // Use the new canUse structure
       };
     })
   );
@@ -3709,7 +3752,6 @@ var getFullGraphDefinition = (db) => async ({
     (agent) => agent !== null
   );
   const agentsObject = {};
-  const toolsObject = {};
   for (const agent of validAgents) {
     const isExternalAgent2 = "baseUrl" in agent && agent.baseUrl;
     if (isExternalAgent2) {
@@ -3720,22 +3762,7 @@ var getFullGraphDefinition = (db) => async ({
         baseUrl: agent.baseUrl
       };
     } else {
-      const toolsData = agent.tools || [];
-      const toolIds = [];
-      const agentSelectedTools = {};
-      for (const tool2 of toolsData) {
-        toolsObject[tool2.id] = tool2;
-        toolIds.push(tool2.id);
-        if (tool2.selectedTools !== null && tool2.selectedTools !== void 0) {
-          agentSelectedTools[tool2.id] = tool2.selectedTools;
-        }
-      }
-      agentsObject[agent.id] = {
-        ...agent,
-        tools: toolIds,
-        // Replace tool objects with tool IDs
-        ...Object.keys(agentSelectedTools).length > 0 && { selectedTools: agentSelectedTools }
-      };
+      agentsObject[agent.id] = agent;
     }
   }
   let contextConfig2 = null;
@@ -3749,11 +3776,10 @@ var getFullGraphDefinition = (db) => async ({
       console.warn(`Failed to retrieve contextConfig ${graph.contextConfigId}:`, error);
     }
   }
-  let dataComponentsObject = {};
   try {
     const internalAgentIds = graphAgents.map((agent) => agent.id);
     const agentIds = Array.from(internalAgentIds);
-    dataComponentsObject = await fetchComponentRelationships(db)(
+    await fetchComponentRelationships(db)(
       { tenantId, projectId },
       agentIds,
       {
@@ -3772,11 +3798,10 @@ var getFullGraphDefinition = (db) => async ({
   } catch (error) {
     console.warn("Failed to retrieve dataComponents:", error);
   }
-  let artifactComponentsObject = {};
   try {
     const internalAgentIds = graphAgents.map((agent) => agent.id);
     const agentIds = Array.from(internalAgentIds);
-    artifactComponentsObject = await fetchComponentRelationships(db)(
+    await fetchComponentRelationships(db)(
       { tenantId, projectId },
       agentIds,
       {
@@ -3802,7 +3827,7 @@ var getFullGraphDefinition = (db) => async ({
     description: graph.description,
     defaultAgentId: graph.defaultAgentId,
     agents: agentsObject,
-    tools: toolsObject,
+    // No tools field - tools are defined at project level
     createdAt: graph.createdAt && !Number.isNaN(new Date(graph.createdAt).getTime()) ? new Date(graph.createdAt).toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: graph.updatedAt && !Number.isNaN(new Date(graph.updatedAt).getTime()) ? new Date(graph.updatedAt).toISOString() : (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -3827,12 +3852,6 @@ var getFullGraphDefinition = (db) => async ({
       contextVariables: contextConfig2.contextVariables
     };
   }
-  if (Object.keys(dataComponentsObject).length > 0) {
-    result.dataComponents = dataComponentsObject;
-  }
-  if (Object.keys(artifactComponentsObject).length > 0) {
-    result.artifactComponents = artifactComponentsObject;
-  }
   try {
     if (!db.query?.projects?.findFirst) {
       return result;
@@ -4035,6 +4054,7 @@ var createApiKey = (db) => async (params) => {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const [apiKey] = await db.insert(apiKeys).values({
     id: params.id,
+    name: params.name,
     tenantId: params.tenantId,
     projectId: params.projectId,
     graphId: params.graphId,
@@ -4050,6 +4070,7 @@ var createApiKey = (db) => async (params) => {
 var updateApiKey = (db) => async (params) => {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const [updatedKey] = await db.update(apiKeys).set({
+    name: params.data.name,
     expiresAt: params.data.expiresAt,
     updatedAt: now
   }).where(
@@ -4103,12 +4124,13 @@ var countApiKeys = (db) => async (params) => {
   return typeof total === "string" ? Number.parseInt(total, 10) : total;
 };
 var generateAndCreateApiKey = async (params, db) => {
-  const { tenantId, projectId, graphId, expiresAt } = params;
+  const { tenantId, projectId, graphId, expiresAt, name } = params;
   const keyData = await generateApiKey();
   const apiKey = await createApiKey(db)({
     tenantId,
     projectId,
     graphId,
+    name,
     expiresAt,
     ...keyData
   });
@@ -4304,7 +4326,21 @@ var isArtifactComponentAssociatedWithAgent = (db) => async (params) => {
   return result.length > 0;
 };
 var graphHasArtifactComponents = (db) => async (params) => {
-  const result = await db.select({ count: drizzleOrm.count() }).from(agentArtifactComponents).innerJoin(agents, drizzleOrm.eq(agentArtifactComponents.agentId, agents.id)).innerJoin(agentRelations, drizzleOrm.eq(agents.id, agentRelations.sourceAgentId)).where(
+  const result = await db.select({ count: drizzleOrm.count() }).from(agentArtifactComponents).innerJoin(
+    agents,
+    drizzleOrm.and(
+      drizzleOrm.eq(agentArtifactComponents.agentId, agents.id),
+      drizzleOrm.eq(agentArtifactComponents.tenantId, agents.tenantId)
+    )
+  ).innerJoin(
+    agentRelations,
+    drizzleOrm.and(
+      drizzleOrm.eq(agents.id, agentRelations.sourceAgentId),
+      drizzleOrm.eq(agents.tenantId, agentRelations.tenantId),
+      drizzleOrm.eq(agents.projectId, agentRelations.projectId),
+      drizzleOrm.eq(agents.graphId, agentRelations.graphId)
+    )
+  ).where(
     drizzleOrm.and(
       drizzleOrm.eq(agentArtifactComponents.tenantId, params.scopes.tenantId),
       drizzleOrm.eq(agentArtifactComponents.projectId, params.scopes.projectId),
@@ -5067,10 +5103,10 @@ function validateToolReferences(graphData, availableToolIds) {
   }
   const errors = [];
   for (const [agentId, agentData] of Object.entries(graphData.agents)) {
-    if (isInternalAgent(agentData) && agentData.tools && Array.isArray(agentData.tools)) {
-      for (const toolId of agentData.tools) {
-        if (!availableToolIds.has(toolId)) {
-          errors.push(`Agent '${agentId}' references non-existent tool '${toolId}'`);
+    if (isInternalAgent(agentData) && agentData.canUse && Array.isArray(agentData.canUse)) {
+      for (const canUseItem of agentData.canUse) {
+        if (!availableToolIds.has(canUseItem.toolId)) {
+          errors.push(`Agent '${agentId}' references non-existent tool '${canUseItem.toolId}'`);
         }
       }
     }
@@ -5605,22 +5641,22 @@ var createFullGraphServerSide = (db, logger11 = defaultLogger) => async (scopes,
     }
     const agentToolPromises = [];
     for (const [agentId, agentData] of Object.entries(typed.agents)) {
-      if (isInternalAgent(agentData) && agentData.tools && Array.isArray(agentData.tools)) {
-        for (const toolId of agentData.tools) {
+      if (isInternalAgent(agentData) && agentData.canUse && Array.isArray(agentData.canUse)) {
+        for (const canUseItem of agentData.canUse) {
           agentToolPromises.push(
             (async () => {
               try {
-                const selectedTools = agentData.selectedTools?.[toolId];
+                const { toolId, toolSelection } = canUseItem;
                 logger11.info({ agentId, toolId }, "Processing agent-tool relation");
                 await upsertAgentToolRelation(db)({
                   scopes: { tenantId, projectId, graphId: finalGraphId },
                   agentId,
                   toolId,
-                  selectedTools
+                  selectedTools: toolSelection || void 0
                 });
                 logger11.info({ agentId, toolId }, "Agent-tool relation processed successfully");
               } catch (error) {
-                logger11.error({ agentId, toolId, error }, "Failed to create agent-tool relation");
+                logger11.error({ agentId, toolId: canUseItem.toolId, error }, "Failed to create agent-tool relation");
               }
             })()
           );
@@ -5998,23 +6034,23 @@ var updateFullGraphServerSide = (db, logger11 = defaultLogger) => async (scopes,
     }
     const agentToolPromises = [];
     for (const [agentId, agentData] of Object.entries(typedGraphDefinition.agents)) {
-      if (isInternalAgent(agentData) && agentData.tools && Array.isArray(agentData.tools)) {
-        for (const toolId of agentData.tools) {
+      if (isInternalAgent(agentData) && agentData.canUse && Array.isArray(agentData.canUse)) {
+        for (const canUseItem of agentData.canUse) {
           agentToolPromises.push(
             (async () => {
               try {
-                const selectedTools = agentData.selectedTools?.[toolId];
+                const { toolId, toolSelection } = canUseItem;
                 await createAgentToolRelation(db)({
                   scopes: { tenantId, projectId, graphId: finalGraphId },
                   data: {
                     agentId,
                     toolId,
-                    selectedTools
+                    selectedTools: toolSelection || void 0
                   }
                 });
                 logger11.info({ agentId, toolId }, "Agent-tool relation created");
               } catch (error) {
-                logger11.error({ agentId, toolId, error }, "Failed to create agent-tool relation");
+                logger11.error({ agentId, toolId: canUseItem.toolId, error }, "Failed to create agent-tool relation");
               }
             })()
           );
@@ -6878,7 +6914,6 @@ var createFullProjectServerSide = (db, logger11 = defaultLogger2) => async (scop
             );
             await upsertArtifactComponent(db)({
               data: {
-                id: componentId,
                 ...componentData,
                 tenantId,
                 projectId: typed.id
@@ -7184,7 +7219,6 @@ var updateFullProjectServerSide = (db, logger11 = defaultLogger2) => async (scop
             );
             await upsertArtifactComponent(db)({
               data: {
-                id: componentId,
                 ...componentData,
                 tenantId,
                 projectId: typed.id
@@ -7310,14 +7344,10 @@ var getFullProject = (db, logger11 = defaultLogger2) => async (params) => {
           id: tool2.id,
           name: tool2.name,
           config: tool2.config,
-          imageUrl: tool2.imageUrl || void 0,
-          status: tool2.status,
-          capabilities: tool2.capabilities || void 0,
-          lastHealthCheck: tool2.lastHealthCheck && !Number.isNaN(new Date(tool2.lastHealthCheck).getTime()) ? new Date(tool2.lastHealthCheck).toISOString() : void 0,
-          lastError: tool2.lastError || void 0,
-          availableTools: tool2.availableTools || void 0,
-          activeTools: tool2.config?.mcp?.activeTools || void 0,
-          lastToolsSync: tool2.lastToolsSync && !Number.isNaN(new Date(tool2.lastToolsSync).getTime()) ? new Date(tool2.lastToolsSync).toISOString() : void 0
+          credentialReferenceId: tool2.credentialReferenceId || void 0,
+          imageUrl: tool2.imageUrl || void 0
+          // Don't include runtime fields in configuration
+          // status, capabilities, lastHealthCheck, lastError, availableTools, activeTools, lastToolsSync are all runtime
         };
       }
       logger11.info(
@@ -8774,21 +8804,62 @@ var ContextResolver = class {
 var logger7 = getLogger("context-validation");
 var ajv = new Ajv__default.default({ allErrors: true, strict: false });
 var HTTP_REQUEST_PARTS = ["headers"];
+var MAX_SCHEMA_CACHE_SIZE = 1e3;
 var schemaCache = /* @__PURE__ */ new Map();
 function isValidHttpRequest(obj) {
   return obj != null && typeof obj === "object" && !Array.isArray(obj) && "headers" in obj;
 }
 function getCachedValidator(schema) {
   const key = JSON.stringify(schema);
-  if (!schemaCache.has(key)) {
-    schemaCache.set(key, ajv.compile(schema));
+  if (schemaCache.has(key)) {
+    const validator2 = schemaCache.get(key);
+    if (!validator2) {
+      throw new Error("Unexpected: validator not found in cache after has() check");
+    }
+    schemaCache.delete(key);
+    schemaCache.set(key, validator2);
+    return validator2;
   }
-  const validator = schemaCache.get(key);
-  if (!validator) {
-    throw new Error("Failed to compile JSON schema");
+  if (schemaCache.size >= MAX_SCHEMA_CACHE_SIZE) {
+    const firstKey = schemaCache.keys().next().value;
+    if (firstKey) {
+      schemaCache.delete(firstKey);
+    }
   }
+  const permissiveSchema = makeSchemaPermissive(schema);
+  const validator = ajv.compile(permissiveSchema);
+  schemaCache.set(key, validator);
   return validator;
 }
+function makeSchemaPermissive(schema) {
+  if (!schema || typeof schema !== "object") {
+    return schema;
+  }
+  const permissiveSchema = { ...schema };
+  if (permissiveSchema.type === "object") {
+    permissiveSchema.additionalProperties = true;
+    if (permissiveSchema.properties && typeof permissiveSchema.properties === "object") {
+      const newProperties = {};
+      for (const [key, value] of Object.entries(permissiveSchema.properties)) {
+        newProperties[key] = makeSchemaPermissive(value);
+      }
+      permissiveSchema.properties = newProperties;
+    }
+  }
+  if (permissiveSchema.type === "array" && permissiveSchema.items) {
+    permissiveSchema.items = makeSchemaPermissive(permissiveSchema.items);
+  }
+  if (permissiveSchema.oneOf) {
+    permissiveSchema.oneOf = permissiveSchema.oneOf.map(makeSchemaPermissive);
+  }
+  if (permissiveSchema.anyOf) {
+    permissiveSchema.anyOf = permissiveSchema.anyOf.map(makeSchemaPermissive);
+  }
+  if (permissiveSchema.allOf) {
+    permissiveSchema.allOf = permissiveSchema.allOf.map(makeSchemaPermissive);
+  }
+  return permissiveSchema;
+}
 function validationHelper(jsonSchema) {
   return getCachedValidator(jsonSchema);
 }
@@ -10233,7 +10304,7 @@ var loadEnvironmentFiles = () => {
 loadEnvironmentFiles();
 var envSchema = zod.z.object({
   ENVIRONMENT: zod.z.enum(["development", "production", "pentest", "test"]).optional(),
-  DB_FILE_NAME: zod.z.string(),
+  DB_FILE_NAME: zod.z.string().optional(),
   OTEL_TRACES_FORCE_FLUSH_ENABLED: zod.z.coerce.boolean().optional()
 });
 var parseEnv = () => {
@@ -10323,6 +10394,7 @@ exports.ArtifactComponentApiUpdateSchema = ArtifactComponentApiUpdateSchema;
 exports.ArtifactComponentInsertSchema = ArtifactComponentInsertSchema;
 exports.ArtifactComponentSelectSchema = ArtifactComponentSelectSchema;
 exports.ArtifactComponentUpdateSchema = ArtifactComponentUpdateSchema;
+exports.CanUseItemSchema = CanUseItemSchema;
 exports.ContextCache = ContextCache;
 exports.ContextCacheApiInsertSchema = ContextCacheApiInsertSchema;
 exports.ContextCacheApiSelectSchema = ContextCacheApiSelectSchema;
@@ -10689,6 +10761,7 @@ exports.projectsRelations = projectsRelations;
 exports.removeArtifactComponentFromAgent = removeArtifactComponentFromAgent;
 exports.removeDataComponentFromAgent = removeDataComponentFromAgent;
 exports.removeToolFromAgent = removeToolFromAgent;
+exports.requestContextSchema = requestContextSchema;
 exports.resourceIdSchema = resourceIdSchema;
 exports.setActiveAgentForConversation = setActiveAgentForConversation;
 exports.setActiveAgentForThread = setActiveAgentForThread;