@inkeep/agents-core 0.41.2 → 0.43.0

package/dist/data-access/{tools.js → manage/tools.js}

@@ -1,22 +1,36 @@
-import { CredentialStoreType, MCPServerType, MCPTransportType } from "../types/utility.js";
-import { subAgentToolRelations, tools } from "../db/schema.js";
-import { detectAuthenticationRequired } from "../utils/auth-detection.js";
-import { getLogger } from "../utils/logger.js";
-import { getCredentialStoreLookupKeyFromRetrievalParams } from "../utils/credential-store-utils.js";
-import { CredentialStuffer } from "../credential-stuffer/CredentialStuffer.js";
-import { generateId } from "../utils/conversations.js";
+import { CredentialStoreType, MCPServerType, MCPTransportType } from "../../types/utility.js";
+import { subAgentToolRelations, tools } from "../../db/manage/manage-schema.js";
+import { detectAuthenticationRequired } from "../../utils/auth-detection.js";
+import { getLogger } from "../../utils/logger.js";
+import { getCredentialStoreLookupKeyFromRetrievalParams } from "../../utils/credential-store-utils.js";
+import { CredentialStuffer } from "../../credential-stuffer/CredentialStuffer.js";
+import "../../credential-stuffer/index.js";
+import { generateId } from "../../utils/conversations.js";
 import { updateAgentToolRelation } from "./subAgentRelations.js";
-import "../credential-stuffer/index.js";
-import { toISODateString } from "../utils/date.js";
-import { McpClient } from "../utils/mcp-client.js";
-import { isThirdPartyMCPServerAuthenticated } from "../utils/third-party-mcp-servers/third-party-check.js";
-import "../utils/index.js";
+import { toISODateString } from "../../utils/date.js";
+import { McpClient } from "../../utils/mcp-client.js";
+import { buildComposioMCPUrl } from "../../utils/third-party-mcp-servers/composio-client.js";
+import { isThirdPartyMCPServerAuthenticated } from "../../utils/third-party-mcp-servers/third-party-check.js";
+import "../../utils/index.js";
 import { getCredentialReference, getUserScopedCredentialReference } from "./credentialReferences.js";
-import { ContextResolver } from "../context/ContextResolver.js";
-import "../context/index.js";
 import { and, count, desc, eq } from "drizzle-orm";
+import { ErrorCode, McpError } from "@modelcontextprotocol/sdk/types.js";
 
-//#region src/data-access/tools.ts
+//#region src/data-access/manage/tools.ts
+/**
+* Check if an error is a timeout/connection error.
+* Uses MCP SDK ErrorCode for proper type safety.
+*/
+function isTimeoutOrConnectionError(error) {
+	if (error instanceof McpError) return error.code === ErrorCode.RequestTimeout || error.code === ErrorCode.ConnectionClosed;
+	if (error instanceof Error) {
+		const message = error.message.toLowerCase();
+		const cause = error.cause;
+		if (message.includes("timed out") || message.includes("timeout")) return true;
+		if (cause?.code === "ETIMEDOUT" || cause?.code === "ECONNABORTED" || cause?.code === "ECONNRESET") return true;
+	}
+	return false;
+}
 const logger = getLogger("tools");
 /**
 * Extract expiration date from credential data stored in credential store
@@ -49,7 +63,10 @@ async function getCredentialExpiresAt(credentialReference, credentialStoreRegist
 * - parameters (direct) - alternative format
 * - schema - another possible location
 */
-function extractInputSchema(toolDef) {
+function extractInputSchema(toolDef, _toolName, _toolOverrides) {
+	return extractOriginalSchema(toolDef);
+}
+function extractOriginalSchema(toolDef) {
 	if (toolDef.inputSchema) return toolDef.inputSchema;
 	if (toolDef.parameters?.properties) return toolDef.parameters.properties;
 	if (toolDef.parameters && typeof toolDef.parameters === "object") return toolDef.parameters;
@@ -65,34 +82,21 @@ const convertToMCPToolConfig = (tool) => {
 		serverUrl: tool.config.mcp.server.url,
 		mcpType: tool.config.mcp.server.url.includes("api.nango.dev") ? MCPServerType.nango : MCPServerType.generic,
 		transport: tool.config.mcp.transport,
-		headers: tool.headers
+		headers: tool.headers,
+		toolOverrides: tool.config.mcp.toolOverrides
 	};
 };
-const discoverToolsFromServer = async (tool, dbClient, credentialStoreRegistry, userId) => {
+const discoverToolsFromServer = async (tool, credentialReference, credentialStoreRegistry, userId) => {
 	if (tool.config.type !== "mcp") throw new Error(`Cannot discover tools from non-MCP tool: ${tool.id}`);
 	try {
 		let serverConfig;
-		const credentialReference = tool.credentialReferenceId && tool.credentialScope !== "user" ? await getCredentialReference(dbClient)({
-			scopes: {
-				tenantId: tool.tenantId,
-				projectId: tool.projectId
-			},
-			id: tool.credentialReferenceId
-		}) : userId && tool.credentialScope === "user" ? await getUserScopedCredentialReference(dbClient)({
-			scopes: {
-				tenantId: tool.tenantId,
-				projectId: tool.projectId
-			},
-			toolId: tool.id,
-			userId
-		}) : void 0;
 		if (credentialReference) {
 			const storeReference = {
 				credentialStoreId: credentialReference.credentialStoreId,
 				retrievalParams: credentialReference.retrievalParams || {}
 			};
 			if (!credentialStoreRegistry) throw new Error("CredentialStoreRegistry is required for authenticated tools");
-			serverConfig = await new CredentialStuffer(credentialStoreRegistry, new ContextResolver(tool.tenantId, tool.projectId, dbClient, credentialStoreRegistry)).buildMcpServerConfig({
+			serverConfig = await new CredentialStuffer(credentialStoreRegistry).buildMcpServerConfig({
 				tenantId: tool.tenantId,
 				projectId: tool.projectId
 			}, convertToMCPToolConfig(tool), storeReference);
@@ -109,12 +113,7 @@ const discoverToolsFromServer = async (tool, dbClient, credentialStoreRegistry,
 			reconnectionOptions: tool.config.mcp.transport?.reconnectionOptions,
 			sessionId: tool.config.mcp.transport?.sessionId
 		};
-		if (serverConfig.url?.toString().includes("composio.dev")) {
-			const urlObj = new URL(serverConfig.url.toString());
-			if (tool.credentialScope === "user" && userId) urlObj.searchParams.set("user_id", userId);
-			else urlObj.searchParams.set("user_id", `${tool.tenantId}||${tool.projectId}`);
-			serverConfig.url = urlObj.toString();
-		}
+		if (serverConfig.url) serverConfig.url = buildComposioMCPUrl(serverConfig.url.toString(), tool.tenantId, tool.projectId, tool.credentialScope === "user" ? "user" : "project", userId);
 		const client = new McpClient({
 			name: tool.name,
 			server: serverConfig
@@ -122,11 +121,15 @@ const discoverToolsFromServer = async (tool, dbClient, credentialStoreRegistry,
 		await client.connect();
 		const serverTools = await client.tools();
 		await client.disconnect();
-		return Object.entries(serverTools).map(([name, toolDef]) => ({
-			name,
-			description: toolDef.description || "",
-			inputSchema: extractInputSchema(toolDef)
-		}));
+		const toolOverrides = tool.config.mcp.toolOverrides;
+		return Object.entries(serverTools).map(([name, toolDef]) => {
+			const schema = extractInputSchema(toolDef, name, toolOverrides);
+			return {
+				name,
+				description: toolDef.description || "",
+				inputSchema: schema
+			};
+		});
 	} catch (error) {
 		logger.error({
 			toolId: tool.id,
@@ -135,6 +138,27 @@ const discoverToolsFromServer = async (tool, dbClient, credentialStoreRegistry,
 		throw error;
 	}
 };
+/**
+* Convert DB result to McpTool skeleton WITHOUT MCP discovery.
+* This is a fast path that returns status='unknown' and empty availableTools.
+* Use this for list views where you want instant page load.
+*/
+const dbResultToMcpToolSkeleton = (dbResult, relationshipId) => {
+	const { headers, capabilities, credentialReferenceId, imageUrl, createdAt, ...rest } = dbResult;
+	return {
+		...rest,
+		status: "unknown",
+		availableTools: [],
+		capabilities: capabilities || void 0,
+		credentialReferenceId: credentialReferenceId || void 0,
+		createdAt: toISODateString(createdAt),
+		updatedAt: toISODateString(dbResult.updatedAt),
+		lastError: dbResult.lastError || null,
+		headers: headers || void 0,
+		imageUrl: imageUrl || void 0,
+		relationshipId
+	};
+};
 const dbResultToMcpTool = async (dbResult, dbClient, credentialStoreRegistry, relationshipId, userId) => {
 	const { headers, capabilities, credentialReferenceId, imageUrl, createdAt, ...rest } = dbResult;
 	if (dbResult.config.type !== "mcp") return {
@@ -175,18 +199,23 @@ const dbResultToMcpTool = async (dbResult, dbClient, credentialStoreRegistry, re
 	}
 	const mcpServerUrl = dbResult.config.mcp.server.url;
 	try {
-		availableTools = await discoverToolsFromServer(dbResult, dbClient, credentialStoreRegistry, userId);
+		availableTools = await discoverToolsFromServer(dbResult, credentialReference, credentialStoreRegistry, userId);
 		status = "healthy";
 		lastErrorComputed = null;
 	} catch (error) {
-		const toolNeedsAuth = error instanceof Error && await detectAuthenticationRequired({
-			serverUrl: mcpServerUrl,
-			error,
-			logger
-		});
-		status = toolNeedsAuth ? "needs_auth" : "unhealthy";
 		const errorMessage = error instanceof Error ? error.message : "Tool discovery failed";
-		lastErrorComputed = toolNeedsAuth ? `Authentication required - OAuth login needed. ${errorMessage}` : errorMessage;
+		if (isTimeoutOrConnectionError(error)) {
+			status = "unavailable";
+			lastErrorComputed = `Connection failed - the MCP server may be slow or temporarily unreachable.${error instanceof McpError ? ` (MCP error ${error.code})` : ""} ${errorMessage}`;
+		} else {
+			const toolNeedsAuth = await detectAuthenticationRequired({
+				serverUrl: mcpServerUrl,
+				error: error instanceof Error ? error : void 0,
+				logger
+			});
+			status = toolNeedsAuth ? "needs_auth" : "unhealthy";
+			lastErrorComputed = toolNeedsAuth ? `Authentication required - OAuth login needed. ${errorMessage}` : errorMessage;
+		}
 	}
 	if (dbResult.config.mcp.server.url.includes("composio.dev")) {
 		const credentialScope = dbResult.credentialScope || "project";
@@ -196,17 +225,25 @@ const dbResultToMcpTool = async (dbResult, dbClient, credentialStoreRegistry, re
 		}
 	}
 	const now = (/* @__PURE__ */ new Date()).toISOString();
-	await updateTool(dbClient)({
-		scopes: {
-			tenantId: dbResult.tenantId,
-			projectId: dbResult.projectId
-		},
-		toolId: dbResult.id,
-		data: {
-			updatedAt: now,
-			lastError: lastErrorComputed
-		}
-	});
+	try {
+		await updateTool(dbClient)({
+			scopes: {
+				tenantId: dbResult.tenantId,
+				projectId: dbResult.projectId
+			},
+			toolId: dbResult.id,
+			data: {
+				updatedAt: now,
+				lastError: lastErrorComputed
+			}
+		});
+	} catch (updateError) {
+		if (updateError instanceof Error && (updateError.message.includes("serialization failure") || updateError.message.includes("40001") || updateError.cause?.code === "XX000")) logger.debug({ toolId: dbResult.id }, "Skipping tool metadata update due to serialization conflict (concurrent request)");
+		else logger.warn({
+			toolId: dbResult.id,
+			error: updateError
+		}, "Failed to update tool metadata - continuing with stale data");
+	}
 	return {
 		...rest,
 		status,
@@ -226,6 +263,14 @@ const dbResultToMcpTool = async (dbResult, dbClient, credentialStoreRegistry, re
 const getToolById = (db) => async (params) => {
 	return await db.query.tools.findFirst({ where: and(eq(tools.tenantId, params.scopes.tenantId), eq(tools.projectId, params.scopes.projectId), eq(tools.id, params.toolId)) }) ?? null;
 };
+const getMcpToolById = (db) => async (params) => {
+	const tool = await getToolById(db)({
+		scopes: params.scopes,
+		toolId: params.toolId
+	});
+	if (!tool) return null;
+	return await dbResultToMcpTool(tool, db, params.credentialStoreRegistry, params.relationshipId, params.userId);
+};
 const listTools = (db) => async (params) => {
 	const page = params.pagination?.page || 1;
 	const limit = Math.min(params.pagination?.limit || 10, 100);
@@ -329,4 +374,4 @@ const upsertTool = (db) => async (params) => {
 };
 
 //#endregion
-export { addToolToAgent, createTool, dbResultToMcpTool, deleteTool, getToolById, listTools, removeToolFromAgent, updateTool, upsertSubAgentToolRelation, upsertTool };
+export { addToolToAgent, createTool, dbResultToMcpTool, dbResultToMcpToolSkeleton, deleteTool, getMcpToolById, getToolById, listTools, removeToolFromAgent, updateTool, upsertSubAgentToolRelation, upsertTool };

package/dist/data-access/manage/triggers.d.ts

@@ -0,0 +1,106 @@
+import { AgentScopeConfig, PaginationConfig } from "../../types/utility.js";
+import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
+import { TriggerInsert, TriggerSelect, TriggerUpdate } from "../../types/entities.js";
+
+//#region src/data-access/manage/triggers.d.ts
+
+/**
+ * Get a trigger by ID (agent-scoped)
+ */
+declare const getTriggerById: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+  triggerId: string;
+}) => Promise<TriggerSelect | undefined>;
+/**
+ * List all triggers for an agent
+ */
+declare const listTriggers: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+}) => Promise<TriggerSelect[]>;
+/**
+ * List triggers for an agent with pagination
+ */
+declare const listTriggersPaginated: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+  pagination?: PaginationConfig;
+}) => Promise<{
+  data: {
+    createdAt: string;
+    updatedAt: string;
+    enabled: boolean;
+    inputSchema: Record<string, unknown> | null;
+    outputTransform: {
+      jmespath?: string;
+      objectTransformation?: Record<string, string>;
+    } | null;
+    messageTemplate: string | null;
+    authentication: unknown;
+    signingSecretCredentialReferenceId: string | null;
+    signatureVerification: {
+      algorithm: "sha256" | "sha512" | "sha384" | "sha1" | "md5";
+      encoding: "hex" | "base64";
+      signature: {
+        source: "query" | "body" | "header";
+        key: string;
+        prefix?: string | undefined;
+        regex?: string | undefined;
+      };
+      signedComponents: {
+        source: "literal" | "body" | "header";
+        required: boolean;
+        key?: string | undefined;
+        value?: string | undefined;
+        regex?: string | undefined;
+      }[];
+      componentJoin: {
+        strategy: "concatenate";
+        separator: string;
+      };
+      validation?: {
+        headerCaseSensitive: boolean;
+        allowEmptyBody: boolean;
+        normalizeUnicode: boolean;
+      } | undefined;
+    } | null;
+    name: string;
+    description: string | null;
+    agentId: string;
+    projectId: string;
+    tenantId: string;
+    id: string;
+  }[];
+  pagination: {
+    page: number;
+    limit: number;
+    total: number;
+    pages: number;
+  };
+}>;
+/**
+ * Create a new trigger (agent-scoped)
+ */
+declare const createTrigger: (db: AgentsManageDatabaseClient) => (params: TriggerInsert) => Promise<TriggerSelect>;
+/**
+ * Update a trigger (agent-scoped)
+ */
+declare const updateTrigger: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+  triggerId: string;
+  data: TriggerUpdate;
+}) => Promise<TriggerSelect>;
+/**
+ * Delete a trigger (agent-scoped)
+ */
+declare const deleteTrigger: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+  triggerId: string;
+}) => Promise<void>;
+/**
+ * Upsert a trigger (create or update based on existence)
+ */
+declare const upsertTrigger: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+  data: TriggerInsert;
+}) => Promise<TriggerSelect>;
+//#endregion
+export { createTrigger, deleteTrigger, getTriggerById, listTriggers, listTriggersPaginated, updateTrigger, upsertTrigger };

package/dist/data-access/manage/triggers.js

@@ -0,0 +1,81 @@
+import { triggers } from "../../db/manage/manage-schema.js";
+import { and, count, desc, eq } from "drizzle-orm";
+
+//#region src/data-access/manage/triggers.ts
+/**
+* Get a trigger by ID (agent-scoped)
+*/
+const getTriggerById = (db) => async (params) => {
+	const { scopes, triggerId } = params;
+	return await db.query.triggers.findFirst({ where: and(eq(triggers.tenantId, scopes.tenantId), eq(triggers.projectId, scopes.projectId), eq(triggers.agentId, scopes.agentId), eq(triggers.id, triggerId)) });
+};
+/**
+* List all triggers for an agent
+*/
+const listTriggers = (db) => async (params) => {
+	return await db.query.triggers.findMany({ where: and(eq(triggers.tenantId, params.scopes.tenantId), eq(triggers.projectId, params.scopes.projectId), eq(triggers.agentId, params.scopes.agentId)) });
+};
+/**
+* List triggers for an agent with pagination
+*/
+const listTriggersPaginated = (db) => async (params) => {
+	const page = params.pagination?.page || 1;
+	const limit = Math.min(params.pagination?.limit || 10, 100);
+	const offset = (page - 1) * limit;
+	const whereClause = and(eq(triggers.tenantId, params.scopes.tenantId), eq(triggers.projectId, params.scopes.projectId), eq(triggers.agentId, params.scopes.agentId));
+	const [data, totalResult] = await Promise.all([db.select().from(triggers).where(whereClause).limit(limit).offset(offset).orderBy(desc(triggers.createdAt)), db.select({ count: count() }).from(triggers).where(whereClause)]);
+	const total = totalResult[0]?.count || 0;
+	return {
+		data,
+		pagination: {
+			page,
+			limit,
+			total,
+			pages: Math.ceil(total / limit)
+		}
+	};
+};
+/**
+* Create a new trigger (agent-scoped)
+*/
+const createTrigger = (db) => async (params) => {
+	return (await db.insert(triggers).values(params).returning())[0];
+};
+/**
+* Update a trigger (agent-scoped)
+*/
+const updateTrigger = (db) => async (params) => {
+	const updateData = {
+		...params.data,
+		updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+	};
+	return (await db.update(triggers).set(updateData).where(and(eq(triggers.tenantId, params.scopes.tenantId), eq(triggers.projectId, params.scopes.projectId), eq(triggers.agentId, params.scopes.agentId), eq(triggers.id, params.triggerId))).returning())[0];
+};
+/**
+* Delete a trigger (agent-scoped)
+*/
+const deleteTrigger = (db) => async (params) => {
+	await db.delete(triggers).where(and(eq(triggers.tenantId, params.scopes.tenantId), eq(triggers.projectId, params.scopes.projectId), eq(triggers.agentId, params.scopes.agentId), eq(triggers.id, params.triggerId)));
+};
+/**
+* Upsert a trigger (create or update based on existence)
+*/
+const upsertTrigger = (db) => async (params) => {
+	const { scopes, data } = params;
+	if (await db.query.triggers.findFirst({ where: and(eq(triggers.tenantId, scopes.tenantId), eq(triggers.projectId, scopes.projectId), eq(triggers.agentId, scopes.agentId), eq(triggers.id, data.id)) })) {
+		const updateData = {
+			...data,
+			updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+		};
+		return (await db.update(triggers).set(updateData).where(and(eq(triggers.tenantId, scopes.tenantId), eq(triggers.projectId, scopes.projectId), eq(triggers.agentId, scopes.agentId), eq(triggers.id, data.id))).returning())[0];
+	}
+	return (await db.insert(triggers).values({
+		...data,
+		tenantId: scopes.tenantId,
+		projectId: scopes.projectId,
+		agentId: scopes.agentId
+	}).returning())[0];
+};
+
+//#endregion
+export { createTrigger, deleteTrigger, getTriggerById, listTriggers, listTriggersPaginated, updateTrigger, upsertTrigger };

package/dist/data-access/{apiKeys.d.ts → runtime/apiKeys.d.ts}

@@ -1,57 +1,57 @@
-import { ApiKeyInsert, ApiKeySelect, ApiKeyUpdate } from "../types/entities.js";
-import { ApiKeyCreateResult, CreateApiKeyParams, PaginationConfig, ProjectScopeConfig } from "../types/utility.js";
-import { DatabaseClient } from "../db/client.js";
+import { ApiKeyCreateResult, CreateApiKeyParams, PaginationConfig, ProjectScopeConfig } from "../../types/utility.js";
+import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
+import { ApiKeyInsert, ApiKeySelect, ApiKeyUpdate } from "../../types/entities.js";
 
-//#region src/data-access/apiKeys.d.ts
-declare const getApiKeyById: (db: DatabaseClient) => (params: {
+//#region src/data-access/runtime/apiKeys.d.ts
+declare const getApiKeyById: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   id: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
   name: string | null;
+  createdAt: string;
+  updatedAt: string;
+  expiresAt: string | null;
+  tenantId: string;
   agentId: string;
+  projectId: string;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
   lastUsedAt: string | null;
-  expiresAt: string | null;
-  createdAt: string;
-  updatedAt: string;
 } | undefined>;
-declare const getApiKeyByPublicId: (db: DatabaseClient) => (publicId: string) => Promise<{
-  tenantId: string;
-  projectId: string;
+declare const getApiKeyByPublicId: (db: AgentsRunDatabaseClient) => (publicId: string) => Promise<{
   id: string;
   name: string | null;
+  createdAt: string;
+  updatedAt: string;
+  expiresAt: string | null;
+  tenantId: string;
   agentId: string;
+  projectId: string;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
   lastUsedAt: string | null;
-  expiresAt: string | null;
-  createdAt: string;
-  updatedAt: string;
 } | undefined>;
-declare const listApiKeys: (db: DatabaseClient) => (params: {
+declare const listApiKeys: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   agentId?: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
   name: string | null;
+  createdAt: string;
+  updatedAt: string;
+  expiresAt: string | null;
+  tenantId: string;
   agentId: string;
+  projectId: string;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
   lastUsedAt: string | null;
-  expiresAt: string | null;
-  createdAt: string;
-  updatedAt: string;
 }[]>;
-declare const listApiKeysPaginated: (db: DatabaseClient) => (params: {
+declare const listApiKeysPaginated: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   pagination?: PaginationConfig;
   agentId?: string;
@@ -64,48 +64,48 @@ declare const listApiKeysPaginated: (db: DatabaseClient) => (params: {
     pages: number;
   };
 }>;
-declare const createApiKey: (db: DatabaseClient) => (params: ApiKeyInsert) => Promise<{
-  tenantId: string;
-  projectId: string;
+declare const createApiKey: (db: AgentsRunDatabaseClient) => (params: ApiKeyInsert) => Promise<{
   id: string;
   name: string | null;
+  createdAt: string;
+  updatedAt: string;
+  expiresAt: string | null;
+  tenantId: string;
   agentId: string;
+  projectId: string;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
   lastUsedAt: string | null;
-  expiresAt: string | null;
-  createdAt: string;
-  updatedAt: string;
 }>;
-declare const updateApiKey: (db: DatabaseClient) => (params: {
+declare const updateApiKey: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   id: string;
   data: ApiKeyUpdate;
 }) => Promise<{
   createdAt: string;
   updatedAt: string;
+  agentId: string;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
   name: string | null;
   lastUsedAt: string | null;
   expiresAt: string | null;
-  agentId: string;
   projectId: string;
   tenantId: string;
   id: string;
 }>;
-declare const deleteApiKey: (db: DatabaseClient) => (params: {
+declare const deleteApiKey: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   id: string;
 }) => Promise<boolean>;
-declare const hasApiKey: (db: DatabaseClient) => (params: {
+declare const hasApiKey: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   id: string;
 }) => Promise<boolean>;
-declare const updateApiKeyLastUsed: (db: DatabaseClient) => (id: string) => Promise<void>;
-declare const countApiKeys: (db: DatabaseClient) => (params: {
+declare const updateApiKeyLastUsed: (db: AgentsRunDatabaseClient) => (id: string) => Promise<void>;
+declare const countApiKeys: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   agentId?: string;
 }) => Promise<number>;
@@ -113,10 +113,10 @@ declare const countApiKeys: (db: DatabaseClient) => (params: {
  * Create a new API key
  * Returns both the API key record and the full key (which should be shown to the user only once)
  */
-declare const generateAndCreateApiKey: (params: CreateApiKeyParams, db: DatabaseClient) => Promise<ApiKeyCreateResult>;
+declare const generateAndCreateApiKey: (params: CreateApiKeyParams, db: AgentsRunDatabaseClient) => Promise<ApiKeyCreateResult>;
 /**
  * Validate an API key and return the associated record if valid
  */
-declare const validateAndGetApiKey: (key: string, db: DatabaseClient) => Promise<ApiKeySelect | null>;
+declare const validateAndGetApiKey: (key: string, db: AgentsRunDatabaseClient) => Promise<ApiKeySelect | null>;
 //#endregion
 export { countApiKeys, createApiKey, deleteApiKey, generateAndCreateApiKey, getApiKeyById, getApiKeyByPublicId, hasApiKey, listApiKeys, listApiKeysPaginated, updateApiKey, updateApiKeyLastUsed, validateAndGetApiKey };

package/dist/data-access/{apiKeys.js → runtime/apiKeys.js}

@@ -1,8 +1,8 @@
-import { apiKeys } from "../db/schema.js";
-import { extractPublicId, generateApiKey, isApiKeyExpired, validateApiKey } from "../utils/apiKeys.js";
+import { apiKeys } from "../../db/runtime/runtime-schema.js";
+import { extractPublicId, generateApiKey, isApiKeyExpired, validateApiKey } from "../../utils/apiKeys.js";
 import { and, count, desc, eq } from "drizzle-orm";
 
-//#region src/data-access/apiKeys.ts
+//#region src/data-access/runtime/apiKeys.ts
 const getApiKeyById = (db) => async (params) => {
 	return await db.query.apiKeys.findFirst({ where: and(eq(apiKeys.tenantId, params.scopes.tenantId), eq(apiKeys.projectId, params.scopes.projectId), eq(apiKeys.id, params.id)) });
 };