@inkeep/agents-core 0.71.0 → 0.72.1

package/dist/data-access/runtime/conversations.js

@@ -1,9 +1,12 @@
 import { conversations, messages } from "../../db/runtime/runtime-schema.js";
+import { getLogger } from "../../utils/logger.js";
 import { getConversationId } from "../../utils/conversations.js";
 import { projectScopedWhere } from "../manage/scope-helpers.js";
+import { deleteEventsByConversationIds } from "./events.js";
 import { and, count, desc, eq, inArray } from "drizzle-orm";
 
 //#region src/data-access/runtime/conversations.ts
+const logger = getLogger("data-access/runtime/conversations");
 const listConversations = (db) => async (params) => {
 	const { userId, pagination } = params;
 	const page = pagination?.page || 1;
@@ -37,11 +40,20 @@ const updateConversation = (db) => async (params) => {
 };
 const deleteConversation = (db) => async (params) => {
 	try {
+		await deleteEventsByConversationIds(db)({
+			scopes: params.scopes,
+			conversationIds: [params.conversationId]
+		});
 		await db.delete(messages).where(and(projectScopedWhere(messages, params.scopes), eq(messages.conversationId, params.conversationId)));
 		await db.delete(conversations).where(and(projectScopedWhere(conversations, params.scopes), eq(conversations.id, params.conversationId)));
 		return true;
 	} catch (error) {
-		console.error("Error deleting conversation:", error);
+		logger.error({
+			tenantId: params.scopes.tenantId,
+			projectId: params.scopes.projectId,
+			conversationId: params.conversationId,
+			error: error instanceof Error ? error.message : String(error)
+		}, "Failed to delete conversation (events/messages/conversation cleanup chain)");
 		return false;
 	}
 };
@@ -60,14 +72,27 @@ const createOrGetConversation = (db) => async (input) => {
 	if (input.id) {
 		const existing = await db.query.conversations.findFirst({ where: and(eq(conversations.tenantId, input.tenantId), eq(conversations.id, input.id)) });
 		if (existing) {
+			const updateSet = { updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
+			let needsUpdate = false;
 			if (existing.activeSubAgentId !== input.activeSubAgentId) {
-				await db.update(conversations).set({
-					activeSubAgentId: input.activeSubAgentId,
-					updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-				}).where(eq(conversations.id, input.id));
+				updateSet.activeSubAgentId = input.activeSubAgentId;
+				needsUpdate = true;
+			}
+			if (input.userProperties !== void 0) {
+				updateSet.userProperties = input.userProperties;
+				needsUpdate = true;
+			}
+			if (input.properties !== void 0) {
+				updateSet.properties = input.properties;
+				needsUpdate = true;
+			}
+			if (needsUpdate) {
+				await db.update(conversations).set(updateSet).where(eq(conversations.id, input.id));
 				return {
 					...existing,
-					activeSubAgentId: input.activeSubAgentId
+					...updateSet.activeSubAgentId ? { activeSubAgentId: updateSet.activeSubAgentId } : {},
+					...input.userProperties !== void 0 ? { userProperties: input.userProperties } : {},
+					...input.properties !== void 0 ? { properties: input.properties } : {}
 				};
 			}
 			return existing;
@@ -83,6 +108,8 @@ const createOrGetConversation = (db) => async (input) => {
 		title: input.title,
 		lastContextResolution: input.lastContextResolution,
 		metadata: input.metadata,
+		userProperties: input.userProperties,
+		properties: input.properties,
 		ref: input.ref,
 		createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 		updatedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -134,6 +161,8 @@ function applyContextWindowManagement(messageHistory, maxOutputTokens) {
 					a2aTaskId: null,
 					a2aSessionId: null,
 					metadata: null,
+					userProperties: null,
+					properties: null,
 					createdAt: referenceMessage.createdAt,
 					updatedAt: referenceMessage.updatedAt
 				};
@@ -167,6 +196,7 @@ const getActiveAgentForConversation = (db) => async (params) => {
 * Set active agent for a conversation (upsert operation)
 */
 const setActiveAgentForConversation = (db) => async (params) => {
+	const now = (/* @__PURE__ */ new Date()).toISOString();
 	await db.insert(conversations).values({
 		id: params.conversationId,
 		tenantId: params.scopes.tenantId,
@@ -176,8 +206,10 @@ const setActiveAgentForConversation = (db) => async (params) => {
 		ref: params.ref,
 		userId: params.userId,
 		metadata: params.metadata,
-		createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-		updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+		userProperties: params.userProperties,
+		properties: params.properties,
+		createdAt: now,
+		updatedAt: now
 	}).onConflictDoUpdate({
 		target: [
 			conversations.tenantId,
@@ -186,7 +218,9 @@ const setActiveAgentForConversation = (db) => async (params) => {
 		],
 		set: {
 			activeSubAgentId: params.subAgentId,
-			updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+			updatedAt: now,
+			...params.userProperties !== void 0 ? { userProperties: params.userProperties } : {},
+			...params.properties !== void 0 ? { properties: params.properties } : {}
 		}
 	});
 };

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

@@ -0,0 +1,97 @@
+import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
+import { PaginationConfig } from "../../types/utility.js";
+import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
+import "../../types/index.js";
+import { EventInsert } from "../../types/entities.js";
+
+//#region src/data-access/runtime/events.d.ts
+declare const createEvent: (db: AgentsRunDatabaseClient) => (params: EventInsert) => Promise<{
+  row: {
+    tenantId: string;
+    projectId: string;
+    id: string;
+    metadata: Record<string, unknown> | null;
+    type: string;
+    properties: Record<string, unknown> | null;
+    agentId: string | null;
+    createdAt: string;
+    updatedAt: string;
+    conversationId: string | null;
+    userProperties: Record<string, unknown> | null;
+    messageId: string | null;
+    serverMetadata: {
+      [k: string]: unknown;
+      authMethod?: string;
+    } | null;
+  };
+  conflict: false;
+} | {
+  row: {
+    createdAt: string;
+    updatedAt: string;
+    type: string;
+    agentId: string | null;
+    conversationId: string | null;
+    messageId: string | null;
+    properties: Record<string, unknown> | null;
+    userProperties: Record<string, unknown> | null;
+    metadata: Record<string, unknown> | null;
+    serverMetadata: {
+      [k: string]: unknown;
+      authMethod?: string;
+    } | null;
+    projectId: string;
+    tenantId: string;
+    id: string;
+  };
+  conflict: true;
+}>;
+declare const getEventById: (db: AgentsRunDatabaseClient) => (params: {
+  scopes: ProjectScopeConfig;
+  eventId: string;
+}) => Promise<{
+  createdAt: string;
+  updatedAt: string;
+  type: string;
+  agentId: string | null;
+  conversationId: string | null;
+  messageId: string | null;
+  properties: Record<string, unknown> | null;
+  userProperties: Record<string, unknown> | null;
+  metadata: Record<string, unknown> | null;
+  serverMetadata: {
+    [k: string]: unknown;
+    authMethod?: string;
+  } | null;
+  projectId: string;
+  tenantId: string;
+  id: string;
+}>;
+declare const listEventsByConversationId: (db: AgentsRunDatabaseClient) => (params: {
+  scopes: ProjectScopeConfig;
+  conversationId: string;
+  pagination?: PaginationConfig;
+}) => Promise<{
+  createdAt: string;
+  updatedAt: string;
+  type: string;
+  agentId: string | null;
+  conversationId: string | null;
+  messageId: string | null;
+  properties: Record<string, unknown> | null;
+  userProperties: Record<string, unknown> | null;
+  metadata: Record<string, unknown> | null;
+  serverMetadata: {
+    [k: string]: unknown;
+    authMethod?: string;
+  } | null;
+  projectId: string;
+  tenantId: string;
+  id: string;
+}[]>;
+declare const deleteEventsByConversationIds: (db: AgentsRunDatabaseClient) => (params: {
+  scopes: ProjectScopeConfig;
+  conversationIds: string[];
+}) => Promise<number>;
+//#endregion
+export { createEvent, deleteEventsByConversationIds, getEventById, listEventsByConversationId };

package/dist/data-access/runtime/events.js

@@ -0,0 +1,47 @@
+import { events } from "../../db/runtime/runtime-schema.js";
+import { projectScopedWhere } from "../manage/scope-helpers.js";
+import { and, desc, eq, inArray } from "drizzle-orm";
+
+//#region src/data-access/runtime/events.ts
+const createEvent = (db) => async (params) => {
+	const now = (/* @__PURE__ */ new Date()).toISOString();
+	const [inserted] = await db.insert(events).values({
+		...params,
+		createdAt: now,
+		updatedAt: now
+	}).onConflictDoNothing({ target: [
+		events.tenantId,
+		events.projectId,
+		events.id
+	] }).returning();
+	if (inserted) return {
+		row: inserted,
+		conflict: false
+	};
+	const [existing] = await db.select().from(events).where(and(projectScopedWhere(events, {
+		tenantId: params.tenantId,
+		projectId: params.projectId
+	}), eq(events.id, params.id))).limit(1);
+	if (!existing) throw new Error(`createEvent: insert returned no row and no existing row found for id=${params.id}`);
+	return {
+		row: existing,
+		conflict: true
+	};
+};
+const getEventById = (db) => async (params) => {
+	const [result] = await db.select().from(events).where(and(projectScopedWhere(events, params.scopes), eq(events.id, params.eventId))).limit(1);
+	return result;
+};
+const listEventsByConversationId = (db) => async (params) => {
+	const page = params.pagination?.page || 1;
+	const limit = Math.min(params.pagination?.limit || 100, 100);
+	const offset = (page - 1) * limit;
+	return db.select().from(events).where(and(projectScopedWhere(events, params.scopes), eq(events.conversationId, params.conversationId))).orderBy(desc(events.createdAt)).limit(limit).offset(offset);
+};
+const deleteEventsByConversationIds = (db) => async (params) => {
+	if (params.conversationIds.length === 0) return 0;
+	return (await db.delete(events).where(and(projectScopedWhere(events, params.scopes), inArray(events.conversationId, params.conversationIds))).returning()).length;
+};
+
+//#endregion
+export { createEvent, deleteEventsByConversationIds, getEventById, listEventsByConversationId };

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

@@ -72,8 +72,8 @@ declare const getFeedbackByIds: (db: AgentsRunDatabaseClient) => (params: {
 declare const createFeedback: (db: AgentsRunDatabaseClient) => (params: FeedbackInsert) => Promise<{
   tenantId: string;
   projectId: string;
-  type: "positive" | "negative";
   id: string;
+  type: "positive" | "negative";
   createdAt: string;
   updatedAt: string;
   conversationId: string;
@@ -102,8 +102,8 @@ declare const deleteFeedback: (db: AgentsRunDatabaseClient) => (params: {
 }) => Promise<{
   tenantId: string;
   projectId: string;
-  type: "positive" | "negative";
   id: string;
+  type: "positive" | "negative";
   createdAt: string;
   updatedAt: string;
   conversationId: string;

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

@@ -13,12 +13,14 @@ declare const getMessageById: (db: AgentsRunDatabaseClient) => (params: {
   tenantId: string;
   projectId: string;
   id: string;
-  createdAt: string;
-  updatedAt: string;
   metadata: MessageMetadata | null;
   content: MessageContent;
+  properties: Record<string, unknown> | null;
+  createdAt: string;
+  updatedAt: string;
   role: string;
   conversationId: string;
+  userProperties: Record<string, unknown> | null;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
@@ -54,6 +56,8 @@ declare const listMessages: (db: AgentsRunDatabaseClient) => (params: {
   a2aTaskId: string | null;
   a2aSessionId: string | null;
   metadata: MessageMetadata | null;
+  userProperties: Record<string, unknown> | null;
+  properties: Record<string, unknown> | null;
   projectId: string;
   tenantId: string;
   id: string;
@@ -81,6 +85,8 @@ declare const getMessagesByConversation: (db: AgentsRunDatabaseClient) => (param
   a2aTaskId: string | null;
   a2aSessionId: string | null;
   metadata: MessageMetadata | null;
+  userProperties: Record<string, unknown> | null;
+  properties: Record<string, unknown> | null;
   projectId: string;
   tenantId: string;
   id: string;
@@ -108,6 +114,8 @@ declare const getMessagesByTask: (db: AgentsRunDatabaseClient) => (params: {
   a2aTaskId: string | null;
   a2aSessionId: string | null;
   metadata: MessageMetadata | null;
+  userProperties: Record<string, unknown> | null;
+  properties: Record<string, unknown> | null;
   projectId: string;
   tenantId: string;
   id: string;
@@ -136,6 +144,8 @@ declare const getVisibleMessages: (db: AgentsRunDatabaseClient) => (params: {
   a2aTaskId: string | null;
   a2aSessionId: string | null;
   metadata: MessageMetadata | null;
+  userProperties: Record<string, unknown> | null;
+  properties: Record<string, unknown> | null;
   projectId: string;
   tenantId: string;
   id: string;
@@ -147,12 +157,14 @@ declare const createMessage: (db: AgentsRunDatabaseClient) => (params: {
   tenantId: string;
   projectId: string;
   id: string;
-  createdAt: string;
-  updatedAt: string;
   metadata: MessageMetadata | null;
   content: MessageContent;
+  properties: Record<string, unknown> | null;
+  createdAt: string;
+  updatedAt: string;
   role: string;
   conversationId: string;
+  userProperties: Record<string, unknown> | null;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
@@ -189,6 +201,8 @@ declare const updateMessage: (db: AgentsRunDatabaseClient) => (params: {
   a2aTaskId: string | null;
   a2aSessionId: string | null;
   metadata: MessageMetadata | null;
+  userProperties: Record<string, unknown> | null;
+  properties: Record<string, unknown> | null;
   projectId: string;
   tenantId: string;
   id: string;
@@ -200,12 +214,14 @@ declare const deleteMessage: (db: AgentsRunDatabaseClient) => (params: {
   tenantId: string;
   projectId: string;
   id: string;
-  createdAt: string;
-  updatedAt: string;
   metadata: MessageMetadata | null;
   content: MessageContent;
+  properties: Record<string, unknown> | null;
+  createdAt: string;
+  updatedAt: string;
   role: string;
   conversationId: string;
+  userProperties: Record<string, unknown> | null;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;

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

@@ -40,7 +40,7 @@ declare const listScheduledTriggerInvocationsPaginated: (db: AgentsRunDatabaseCl
       name: string;
       hash: string;
     } | null;
-    status: "pending" | "running" | "completed" | "failed" | "cancelled";
+    status: "pending" | "failed" | "running" | "completed" | "cancelled";
     scheduledFor: string;
     startedAt: string | null;
     completedAt: string | null;
@@ -199,7 +199,7 @@ declare const listUpcomingInvocationsForAgentPaginated: (db: AgentsRunDatabaseCl
       name: string;
       hash: string;
     } | null;
-    status: "pending" | "running" | "completed" | "failed" | "cancelled";
+    status: "pending" | "failed" | "running" | "completed" | "cancelled";
     scheduledFor: string;
     startedAt: string | null;
     completedAt: string | null;
@@ -239,7 +239,7 @@ declare const listProjectScheduledTriggerInvocationsPaginated: (db: AgentsRunDat
       name: string;
       hash: string;
     } | null;
-    status: "pending" | "running" | "completed" | "failed" | "cancelled";
+    status: "pending" | "failed" | "running" | "completed" | "cancelled";
     scheduledFor: string;
     startedAt: string | null;
     completedAt: string | null;
@@ -292,7 +292,7 @@ declare const listScheduledTriggerInvocationsByTriggerId: (db: AgentsRunDatabase
     name: string;
     hash: string;
   } | null;
-  status: "pending" | "running" | "completed" | "failed" | "cancelled";
+  status: "pending" | "failed" | "running" | "completed" | "cancelled";
   scheduledFor: string;
   startedAt: string | null;
   completedAt: string | null;

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

@@ -9,18 +9,18 @@ import { TaskInsert, TaskSelect } from "../../types/entities.js";
 declare const createTask: (db: AgentsRunDatabaseClient) => (params: TaskInsert) => Promise<{
   tenantId: string;
   projectId: string;
+  id: string;
+  metadata: TaskMetadataConfig | null;
   agentId: string;
   subAgentId: string;
-  id: string;
-  status: string;
   createdAt: string;
   updatedAt: string;
-  metadata: TaskMetadataConfig | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
+  status: string;
   contextId: string;
 }>;
 declare const getTask: (db: AgentsRunDatabaseClient) => (params: {