@inkeep/agents-core 0.0.0-dev-20260311074352 → 0.0.0-dev-20260311144908

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/tools.d.ts

@@ -4,6 +4,7 @@ import "../../types/index.js";
 import { CredentialStoreRegistry } from "../../credential-stores/CredentialStoreRegistry.js";
 import "../../credential-stores/index.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
+import { WithTimestamps } from "../../validation/extend-schemas.js";
 import "../../index.js";
 import { McpTool, ToolInsert, ToolSelect, ToolUpdate } from "../../types/entities.js";
 
@@ -13,8 +14,8 @@ import { McpTool, ToolInsert, ToolSelect, ToolUpdate } from "../../types/entitie
  * This is a fast path that returns status='unknown' and empty availableTools.
  * Use this for list views where you want instant page load.
  */
-declare const dbResultToMcpToolSkeleton: (dbResult: ToolSelect, relationshipId?: string) => McpTool;
-declare const dbResultToMcpTool: (dbResult: ToolSelect, dbClient: AgentsManageDatabaseClient, credentialStoreRegistry?: CredentialStoreRegistry, relationshipId?: string, userId?: string) => Promise<McpTool>;
+declare const dbResultToMcpToolSkeleton: (dbResult: ToolSelect, relationshipId?: string) => WithTimestamps<McpTool>;
+declare const dbResultToMcpTool: (dbResult: ToolSelect, dbClient: AgentsManageDatabaseClient, credentialStoreRegistry?: CredentialStoreRegistry, relationshipId?: string, userId?: string) => Promise<WithTimestamps<McpTool>>;
 declare const getToolById: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   toolId: string;
@@ -99,7 +100,7 @@ declare const createTool: (db: AgentsManageDatabaseClient) => (params: ToolInser
 declare const updateTool: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   toolId: string;
-  data: ToolUpdate;
+  data: WithTimestamps<ToolUpdate>;
 }) => Promise<{
   createdAt: string;
   updatedAt: string;

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

@@ -40,13 +40,13 @@ declare const listTriggersPaginated: (db: AgentsManageDatabaseClient) => (params
       algorithm: "sha256" | "sha512" | "sha384" | "sha1" | "md5";
       encoding: "hex" | "base64";
       signature: {
-        source: "query" | "body" | "header";
+        source: "query" | "header" | "body";
         key: string;
         prefix?: string | undefined;
         regex?: string | undefined;
       };
       signedComponents: {
-        source: "literal" | "body" | "header";
+        source: "literal" | "header" | "body";
         required: boolean;
         key?: string | undefined;
         value?: string | undefined;

package/dist/data-access/runtime/conversations.d.ts

@@ -24,12 +24,12 @@ declare const createConversation: (db: AgentsRunDatabaseClient) => (params: Conv
   createdAt: string;
   updatedAt: string;
   metadata: ConversationMetadata | null;
-  userId: string | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
+  userId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;
 }>;
@@ -93,12 +93,12 @@ declare const getConversation: (db: AgentsRunDatabaseClient) => (params: {
   createdAt: string;
   updatedAt: string;
   metadata: ConversationMetadata | null;
-  userId: string | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
+  userId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;
 } | undefined>;
@@ -129,12 +129,12 @@ declare const createOrGetConversation: (db: AgentsRunDatabaseClient) => (input:
   createdAt: string;
   updatedAt: string;
   metadata: ConversationMetadata | null;
-  userId: string | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
+  userId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;
 }>;
@@ -161,12 +161,12 @@ declare const getActiveAgentForConversation: (db: AgentsRunDatabaseClient) => (p
   createdAt: string;
   updatedAt: string;
   metadata: ConversationMetadata | null;
-  userId: string | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
+  userId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;
 } | undefined>;

package/dist/data-access/runtime/messages.d.ts

@@ -18,18 +18,18 @@ declare const getMessageById: (db: AgentsRunDatabaseClient) => (params: {
   metadata: MessageMetadata | null;
   content: MessageContent;
   role: string;
+  conversationId: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
-  taskId: string | null;
-  a2aTaskId: string | null;
-  conversationId: string;
   fromTeamAgentId: string | null;
   toTeamAgentId: string | null;
   visibility: string;
   messageType: string;
+  taskId: string | null;
   parentMessageId: string | null;
+  a2aTaskId: string | null;
   a2aSessionId: string | null;
 } | undefined>;
 declare const listMessages: (db: AgentsRunDatabaseClient) => (params: {
@@ -149,18 +149,18 @@ declare const createMessage: (db: AgentsRunDatabaseClient) => (params: MessageIn
   metadata: MessageMetadata | null;
   content: MessageContent;
   role: string;
+  conversationId: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
-  taskId: string | null;
-  a2aTaskId: string | null;
-  conversationId: string;
   fromTeamAgentId: string | null;
   toTeamAgentId: string | null;
   visibility: string;
   messageType: string;
+  taskId: string | null;
   parentMessageId: string | null;
+  a2aTaskId: string | null;
   a2aSessionId: string | null;
 }>;
 declare const updateMessage: (db: AgentsRunDatabaseClient) => (params: {
@@ -202,18 +202,18 @@ declare const deleteMessage: (db: AgentsRunDatabaseClient) => (params: {
   metadata: MessageMetadata | null;
   content: MessageContent;
   role: string;
+  conversationId: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
-  taskId: string | null;
-  a2aTaskId: string | null;
-  conversationId: string;
   fromTeamAgentId: string | null;
   toTeamAgentId: string | null;
   visibility: string;
   messageType: string;
+  taskId: string | null;
   parentMessageId: string | null;
+  a2aTaskId: string | null;
   a2aSessionId: string | null;
 }>;
 declare const countMessagesByConversation: (db: AgentsRunDatabaseClient) => (params: {

package/dist/data-access/runtime/tasks.d.ts

@@ -13,12 +13,12 @@ declare const createTask: (db: AgentsRunDatabaseClient) => (params: TaskInsert)
   createdAt: string;
   updatedAt: string;
   metadata: TaskMetadataConfig | null;
-  status: string;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
+  status: string;
   subAgentId: string;
   contextId: string;
 }>;

package/dist/db/manage/manage-schema.d.ts

@@ -814,13 +814,13 @@ declare const triggers: drizzle_orm_pg_core217.PgTableWithColumns<{
         algorithm: "sha256" | "sha512" | "sha384" | "sha1" | "md5";
         encoding: "hex" | "base64";
         signature: {
-          source: "query" | "body" | "header";
+          source: "query" | "header" | "body";
           key: string;
           prefix?: string | undefined;
           regex?: string | undefined;
         };
         signedComponents: {
-          source: "literal" | "body" | "header";
+          source: "literal" | "header" | "body";
           required: boolean;
           key?: string | undefined;
           value?: string | undefined;
@@ -851,13 +851,13 @@ declare const triggers: drizzle_orm_pg_core217.PgTableWithColumns<{
         algorithm: "sha256" | "sha512" | "sha384" | "sha1" | "md5";
         encoding: "hex" | "base64";
         signature: {
-          source: "query" | "body" | "header";
+          source: "query" | "header" | "body";
           key: string;
           prefix?: string | undefined;
           regex?: string | undefined;
         };
         signedComponents: {
-          source: "literal" | "body" | "header";
+          source: "literal" | "header" | "body";
           required: boolean;
           key?: string | undefined;
           value?: string | undefined;

package/dist/db/runtime/runtime-schema.d.ts

@@ -4378,7 +4378,7 @@ declare const workAppGitHubInstallations: drizzle_orm_pg_core573.PgTableWithColu
       tableName: "work_app_github_installations";
       dataType: "string";
       columnType: "PgVarchar";
-      data: "User" | "Organization";
+      data: "Organization" | "User";
       driverParam: string;
       notNull: true;
       hasDefault: false;
@@ -4391,7 +4391,7 @@ declare const workAppGitHubInstallations: drizzle_orm_pg_core573.PgTableWithColu
       generated: undefined;
     }, {}, {
       length: 20;
-      $type: "User" | "Organization";
+      $type: "Organization" | "User";
     }>;
     status: drizzle_orm_pg_core573.PgColumn<{
       name: "status";

package/dist/validation/drizzle-schema-helpers.d.ts

@@ -1,10 +1,10 @@
 import { z } from "@hono/zod-openapi";
-import * as drizzle_zod0 from "drizzle-zod";
+import * as drizzle_zod15 from "drizzle-zod";
 import { AnySQLiteTable } from "drizzle-orm/sqlite-core";
 
 //#region src/validation/drizzle-schema-helpers.d.ts
-declare function createSelectSchemaWithModifiers<T extends AnySQLiteTable>(table: T, overrides?: Partial<Record<keyof T['_']['columns'], (schema: z.ZodTypeAny) => z.ZodTypeAny>>): drizzle_zod0.BuildSchema<"select", T["_"]["columns"], drizzle_zod0.BuildRefine<T["_"]["columns"], undefined>, undefined>;
-declare function createInsertSchemaWithModifiers<T extends AnySQLiteTable>(table: T, overrides?: Partial<Record<keyof T['_']['columns'], (schema: z.ZodTypeAny) => z.ZodTypeAny>>): drizzle_zod0.BuildSchema<"insert", T["_"]["columns"], drizzle_zod0.BuildRefine<Pick<T["_"]["columns"], keyof T["$inferInsert"]>, undefined>, undefined>;
+declare function createSelectSchemaWithModifiers<T extends AnySQLiteTable>(table: T, overrides?: Partial<Record<keyof T['_']['columns'], (schema: z.ZodTypeAny) => z.ZodTypeAny>>): drizzle_zod15.BuildSchema<"select", T["_"]["columns"], drizzle_zod15.BuildRefine<T["_"]["columns"], undefined>, undefined>;
+declare function createInsertSchemaWithModifiers<T extends AnySQLiteTable>(table: T, overrides?: Partial<Record<keyof T['_']['columns'], (schema: z.ZodTypeAny) => z.ZodTypeAny>>): drizzle_zod15.BuildSchema<"insert", T["_"]["columns"], drizzle_zod15.BuildRefine<Pick<T["_"]["columns"], keyof T["$inferInsert"]>, undefined>, undefined>;
 declare const createSelectSchema: typeof createSelectSchemaWithModifiers;
 declare const createInsertSchema: typeof createInsertSchemaWithModifiers;
 /**

package/dist/validation/extend-schemas.d.ts

@@ -30,5 +30,9 @@ declare const ArtifactComponentExtendSchema: {
     description: z.ZodOptional<z.ZodString>;
   }, z.core.$loose>>;
 };
+type WithTimestamps<T> = T & {
+  createdAt?: string;
+  updatedAt?: string;
+};
 //#endregion
-export { ArtifactComponentExtendSchema, DataComponentExtendSchema, DescriptionSchema, NameSchema, transformToJson };
+export { ArtifactComponentExtendSchema, DataComponentExtendSchema, DescriptionSchema, NameSchema, WithTimestamps, transformToJson };