@inkeep/agents-core 0.58.9 → 0.58.12

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

@@ -93,8 +93,8 @@ declare const countCredentialReferences: (db: AgentsManageDatabaseClient) => (pa
 }) => Promise<number>;
 /**
  * Upsert a credential reference (create if it doesn't exist, update if it does).
- * For user-scoped credentials (toolId + userId set), uses an atomic INSERT ... ON CONFLICT
- * on the (toolId, userId) unique constraint to avoid TOCTOU races.
+ * For user-scoped credentials (toolId + userId set), also checks the unique constraint pair.
+ * Uses application-level find-then-update since Doltgres does not support ON CONFLICT DO UPDATE.
  */
 declare const upsertCredentialReference: (db: AgentsManageDatabaseClient) => (params: {
   data: CredentialReferenceInsert;

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

@@ -1,4 +1,5 @@
 import { credentialReferences, externalAgents, tools } from "../../db/manage/manage-schema.js";
+import { isUniqueConstraintError } from "../../utils/error.js";
 import { and, count, desc, eq, sql } from "drizzle-orm";
 
 //#region src/data-access/manage/credentialReferences.ts
@@ -120,15 +121,14 @@ const countCredentialReferences = (db) => async (params) => {
 };
 /**
 * Upsert a credential reference (create if it doesn't exist, update if it does).
-* For user-scoped credentials (toolId + userId set), uses an atomic INSERT ... ON CONFLICT
-* on the (toolId, userId) unique constraint to avoid TOCTOU races.
+* For user-scoped credentials (toolId + userId set), also checks the unique constraint pair.
+* Uses application-level find-then-update since Doltgres does not support ON CONFLICT DO UPDATE.
 */
 const upsertCredentialReference = (db) => async (params) => {
 	const scopes = {
 		tenantId: params.data.tenantId,
 		projectId: params.data.projectId
 	};
-	const now = (/* @__PURE__ */ new Date()).toISOString();
 	const existingById = await getCredentialReference(db)({
 		scopes,
 		id: params.data.id
@@ -148,23 +148,51 @@ const upsertCredentialReference = (db) => async (params) => {
 		return updated;
 	}
 	if (params.data.toolId && params.data.userId) {
-		const [result] = await db.insert(credentialReferences).values({
-			...params.data,
-			createdAt: now,
-			updatedAt: now
-		}).onConflictDoUpdate({
-			target: [credentialReferences.toolId, credentialReferences.userId],
-			set: {
-				name: params.data.name,
-				type: params.data.type,
-				credentialStoreId: params.data.credentialStoreId,
-				retrievalParams: params.data.retrievalParams,
-				updatedAt: now
+		const existingByToolUser = await getUserScopedCredentialReference(db)({
+			scopes,
+			toolId: params.data.toolId,
+			userId: params.data.userId
+		});
+		if (existingByToolUser) {
+			const updated = await updateCredentialReference(db)({
+				scopes,
+				id: existingByToolUser.id,
+				data: {
+					name: params.data.name,
+					type: params.data.type,
+					credentialStoreId: params.data.credentialStoreId,
+					retrievalParams: params.data.retrievalParams
+				}
+			});
+			if (!updated) throw new Error("Failed to update credential reference - no rows affected");
+			return updated;
+		}
+	}
+	try {
+		return await createCredentialReference(db)(params.data);
+	} catch (error) {
+		if (isUniqueConstraintError(error) && params.data.toolId && params.data.userId) {
+			const raceWinner = await getUserScopedCredentialReference(db)({
+				scopes,
+				toolId: params.data.toolId,
+				userId: params.data.userId
+			});
+			if (raceWinner) {
+				const updated = await updateCredentialReference(db)({
+					scopes,
+					id: raceWinner.id,
+					data: {
+						name: params.data.name,
+						type: params.data.type,
+						credentialStoreId: params.data.credentialStoreId,
+						retrievalParams: params.data.retrievalParams
+					}
+				});
+				if (updated) return updated;
 			}
-		}).returning();
-		return result;
+		}
+		throw error;
 	}
-	return await createCredentialReference(db)(params.data);
 };
 
 //#endregion

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

@@ -66,10 +66,10 @@ declare const associateDataComponentWithAgent: (db: AgentsManageDatabaseClient)
   dataComponentId: string;
 }) => Promise<{
   id: string;
-  createdAt: string;
-  agentId: string;
-  projectId: string;
   tenantId: string;
+  projectId: string;
+  agentId: string;
+  createdAt: string;
   subAgentId: string;
   dataComponentId: string;
 }>;
@@ -108,10 +108,10 @@ declare const upsertAgentDataComponentRelation: (db: AgentsManageDatabaseClient)
   dataComponentId: string;
 }) => Promise<{
   id: string;
-  createdAt: string;
-  agentId: string;
-  projectId: string;
   tenantId: string;
+  projectId: string;
+  agentId: string;
+  createdAt: string;
   subAgentId: string;
   dataComponentId: string;
 } | null>;

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

@@ -55,12 +55,12 @@ declare const createFunctionTool: (db: AgentsManageDatabaseClient) => (params: {
 }) => Promise<{
   id: string;
   name: string;
-  createdAt: string;
-  updatedAt: string;
   description: string | null;
-  agentId: string;
-  projectId: string;
   tenantId: string;
+  projectId: string;
+  agentId: string;
+  createdAt: string;
+  updatedAt: string;
   functionId: string;
 }>;
 /**
@@ -97,12 +97,12 @@ declare const upsertFunctionTool: (db: AgentsManageDatabaseClient) => (params: {
 }) => Promise<{
   id: string;
   name: string;
-  createdAt: string;
-  updatedAt: string;
   description: string | null;
-  agentId: string;
-  projectId: string;
   tenantId: string;
+  projectId: string;
+  agentId: string;
+  createdAt: string;
+  updatedAt: string;
   functionId: string;
 }>;
 declare const getFunctionToolsForSubAgent: (db: AgentsManageDatabaseClient) => (params: {
@@ -162,16 +162,16 @@ declare const addFunctionToolToSubAgent: (db: AgentsManageDatabaseClient) => (pa
   }> | null;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
-  functionToolId: string;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
+  subAgentId: string;
+  functionToolId: string;
 }>;
 /**
  * Update an agent-function tool relation
@@ -227,16 +227,16 @@ declare const associateFunctionToolWithSubAgent: (db: AgentsManageDatabaseClient
   }> | null;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
-  functionToolId: string;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
+  subAgentId: string;
+  functionToolId: string;
 }>;
 //#endregion
 export { addFunctionToolToSubAgent, associateFunctionToolWithSubAgent, createFunctionTool, deleteFunctionTool, getFunctionToolById, getFunctionToolsForSubAgent, getSubAgentsUsingFunctionTool, isFunctionToolAssociatedWithSubAgent, listFunctionTools, removeFunctionToolFromSubAgent, updateFunctionTool, updateSubAgentFunctionToolRelation, upsertFunctionTool, upsertSubAgentFunctionToolRelation };

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

@@ -10,12 +10,12 @@ declare const getSkillById: (db: AgentsManageDatabaseClient) => (params: {
 }) => Promise<{
   id: string;
   name: string;
+  description: string;
+  tenantId: string;
+  projectId: string;
   createdAt: string;
   updatedAt: string;
   metadata: Record<string, string> | null;
-  description: string;
-  projectId: string;
-  tenantId: string;
   content: string;
 } | null>;
 declare const listSkills: (db: AgentsManageDatabaseClient) => (params: {
@@ -43,23 +43,23 @@ declare const listSkills: (db: AgentsManageDatabaseClient) => (params: {
 declare const createSkill: (db: AgentsManageDatabaseClient) => (data: SkillInsert) => Promise<{
   id: string;
   name: string;
+  description: string;
+  tenantId: string;
+  projectId: string;
   createdAt: string;
   updatedAt: string;
   metadata: Record<string, string> | null;
-  description: string;
-  projectId: string;
-  tenantId: string;
   content: string;
 }>;
 declare const upsertSkill: (db: AgentsManageDatabaseClient) => (data: SkillInsert) => Promise<{
   id: string;
   name: string;
+  description: string;
+  tenantId: string;
+  projectId: string;
   createdAt: string;
   updatedAt: string;
   metadata: Record<string, string> | null;
-  description: string;
-  projectId: string;
-  tenantId: string;
   content: string;
 }>;
 declare const updateSkill: (db: AgentsManageDatabaseClient) => (params: {
@@ -92,15 +92,15 @@ declare const upsertSubAgentSkill: (db: AgentsManageDatabaseClient) => (params:
   alwaysLoaded?: boolean;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
-  skillId: string;
   index: number;
   alwaysLoaded: boolean;
+  subAgentId: string;
+  skillId: string;
 }>;
 declare const deleteSubAgentSkill: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;

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

@@ -10,14 +10,14 @@ declare const getSubAgentExternalAgentRelationById: (db: AgentsManageDatabaseCli
   relationId: string;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   externalAgentId: string;
+  subAgentId: string;
 } | undefined>;
 declare const listSubAgentExternalAgentRelations: (db: AgentsManageDatabaseClient) => (params: {
   scopes: SubAgentScopeConfig;
@@ -45,27 +45,27 @@ declare const getSubAgentExternalAgentRelations: (db: AgentsManageDatabaseClient
   scopes: SubAgentScopeConfig;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   externalAgentId: string;
+  subAgentId: string;
 }[]>;
 declare const getSubAgentExternalAgentRelationsByAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   externalAgentId: string;
+  subAgentId: string;
 }[]>;
 declare const getSubAgentExternalAgentRelationsByExternalAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
@@ -181,14 +181,14 @@ declare const createSubAgentExternalAgentRelation: (db: AgentsManageDatabaseClie
   };
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   externalAgentId: string;
+  subAgentId: string;
 }>;
 /**
  * Check if sub-agent external agent relation exists by params
@@ -198,14 +198,14 @@ declare const getSubAgentExternalAgentRelationByParams: (db: AgentsManageDatabas
   externalAgentId: string;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   externalAgentId: string;
+  subAgentId: string;
 } | undefined>;
 /**
  * Upsert sub-agent external agent relation (create if it doesn't exist, update if it does)
@@ -219,14 +219,14 @@ declare const upsertSubAgentExternalAgentRelation: (db: AgentsManageDatabaseClie
   };
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   externalAgentId: string;
+  subAgentId: string;
 }>;
 declare const updateSubAgentExternalAgentRelation: (db: AgentsManageDatabaseClient) => (params: {
   scopes: SubAgentScopeConfig;

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

@@ -10,11 +10,11 @@ declare const getAgentRelationById: (db: AgentsManageDatabaseClient) => (params:
   relationId: string;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -45,11 +45,11 @@ declare const getAgentRelations: (db: AgentsManageDatabaseClient) => (params: {
   scopes: SubAgentScopeConfig;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -58,11 +58,11 @@ declare const getAgentRelationsByAgent: (db: AgentsManageDatabaseClient) => (par
   scopes: AgentScopeConfig;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -127,11 +127,11 @@ declare const getRelatedAgentsForAgent: (db: AgentsManageDatabaseClient) => (par
 }>;
 declare const createSubAgentRelation: (db: AgentsManageDatabaseClient) => (params: SubAgentRelationInsert) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -146,11 +146,11 @@ declare const getAgentRelationByParams: (db: AgentsManageDatabaseClient) => (par
   relationType: string;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -160,11 +160,11 @@ declare const getAgentRelationByParams: (db: AgentsManageDatabaseClient) => (par
  */
 declare const upsertSubAgentRelation: (db: AgentsManageDatabaseClient) => (params: SubAgentRelationInsert) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -205,17 +205,17 @@ declare const createAgentToolRelation: (db: AgentsManageDatabaseClient) => (para
   };
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
-  headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   toolId: string;
-  subAgentId: string;
+  headers: Record<string, string> | null;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
+  subAgentId: string;
   selectedTools: string[] | null;
 }>;
 declare const updateAgentToolRelation: (db: AgentsManageDatabaseClient) => (params: {
@@ -249,17 +249,17 @@ declare const getAgentToolRelationById: (db: AgentsManageDatabaseClient) => (par
   relationId: string;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
-  headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   toolId: string;
-  subAgentId: string;
+  headers: Record<string, string> | null;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
+  subAgentId: string;
   selectedTools: string[] | null;
 } | undefined>;
 declare const getAgentToolRelationByAgent: (db: AgentsManageDatabaseClient) => (params: {

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

@@ -10,12 +10,12 @@ declare const getSubAgentTeamAgentRelationById: (db: AgentsManageDatabaseClient)
   relationId: string;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   subAgentId: string;
   targetAgentId: string;
 } | undefined>;
@@ -45,12 +45,12 @@ declare const getSubAgentTeamAgentRelations: (db: AgentsManageDatabaseClient) =>
   scopes: SubAgentScopeConfig;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   subAgentId: string;
   targetAgentId: string;
 }[]>;
@@ -58,12 +58,12 @@ declare const getSubAgentTeamAgentRelationsByAgent: (db: AgentsManageDatabaseCli
   scopes: AgentScopeConfig;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   subAgentId: string;
   targetAgentId: string;
 }[]>;
@@ -211,12 +211,12 @@ declare const createSubAgentTeamAgentRelation: (db: AgentsManageDatabaseClient)
   };
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   subAgentId: string;
   targetAgentId: string;
 }>;
@@ -228,12 +228,12 @@ declare const getSubAgentTeamAgentRelationByParams: (db: AgentsManageDatabaseCli
   targetAgentId: string;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   subAgentId: string;
   targetAgentId: string;
 } | undefined>;
@@ -249,12 +249,12 @@ declare const upsertSubAgentTeamAgentRelation: (db: AgentsManageDatabaseClient)
   };
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
   headers: Record<string, string> | null;
-  agentId: string;
-  projectId: string;
-  tenantId: string;
   subAgentId: string;
   targetAgentId: string;
 }>;