@inkeep/agents-core 0.63.3 → 0.64.1

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

@@ -20,20 +20,20 @@ declare const getToolById: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   toolId: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
   name: string;
   description: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
+  headers: Record<string, string> | null;
   config: {
     type: "mcp";
     mcp: ToolMcpConfig;
   };
   credentialReferenceId: string | null;
   credentialScope: string;
-  headers: Record<string, string> | null;
   imageUrl: string | null;
   capabilities: ToolServerCapabilities | null;
   lastError: string | null;
@@ -78,20 +78,20 @@ declare const listTools: (db: AgentsManageDatabaseClient) => (params: {
   };
 }>;
 declare const createTool: (db: AgentsManageDatabaseClient) => (params: ToolInsert) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
   name: string;
   description: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
+  headers: Record<string, string> | null;
   config: {
     type: "mcp";
     mcp: ToolMcpConfig;
   };
   credentialReferenceId: string | null;
   credentialScope: string;
-  headers: Record<string, string> | null;
   imageUrl: string | null;
   capabilities: ToolServerCapabilities | null;
   lastError: string | null;
@@ -135,38 +135,38 @@ declare const addToolToAgent: (db: AgentsManageDatabaseClient) => (params: {
     needsApproval?: boolean;
   }> | null;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
   agentId: string;
-  subAgentId: string;
   toolId: string;
   headers: Record<string, string> | null;
-  selectedTools: string[] | null;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
+  subAgentId: string;
+  selectedTools: string[] | null;
 }>;
 declare const removeToolFromAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
   subAgentId: string;
   toolId: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
   agentId: string;
-  subAgentId: string;
   toolId: string;
   headers: Record<string, string> | null;
-  selectedTools: string[] | null;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
+  subAgentId: string;
+  selectedTools: string[] | null;
 }>;
 /**
  * Upsert agent-tool relation (create if it doesn't exist, update if it does)
@@ -182,19 +182,19 @@ declare const upsertSubAgentToolRelation: (db: AgentsManageDatabaseClient) => (p
   }> | null;
   relationId?: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
   agentId: string;
-  subAgentId: string;
   toolId: string;
   headers: Record<string, string> | null;
-  selectedTools: string[] | null;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
+  subAgentId: string;
+  selectedTools: string[] | null;
 }>;
 /**
  * Upsert a tool (create if it doesn't exist, update if it does)
@@ -202,20 +202,20 @@ declare const upsertSubAgentToolRelation: (db: AgentsManageDatabaseClient) => (p
 declare const upsertTool: (db: AgentsManageDatabaseClient) => (params: {
   data: ToolInsert;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
   name: string;
   description: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
+  headers: Record<string, string> | null;
   config: {
     type: "mcp";
     mcp: ToolMcpConfig;
   };
   credentialReferenceId: string | null;
   credentialScope: string;
-  headers: Record<string, string> | null;
   imageUrl: string | null;
   capabilities: ToolServerCapabilities | null;
   lastError: string | null;

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

@@ -23,20 +23,45 @@ import "../../utils/index.js";
 import { isGithubWorkAppTool } from "../runtime/github-work-app-installations.js";
 import { getCredentialReference, getUserScopedCredentialReference } from "./credentialReferences.js";
 import { and, count, desc, eq } from "drizzle-orm";
+import { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js";
+import { StreamableHTTPError } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { ErrorCode, McpError } from "@modelcontextprotocol/sdk/types.js";
 
 //#region src/data-access/manage/tools.ts
 /**
-* Check if an error is a timeout/connection error.
+* Check if an error is a timeout/connection error (transient, not auth-related).
 * 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 McpError) return error.code === ErrorCode.RequestTimeout || error.code === ErrorCode.ConnectionClosed || error.code === ErrorCode.InternalError;
+	if (error instanceof StreamableHTTPError) return error.code !== void 0 && error.code >= 500;
 	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;
+		if (message.includes("timed out") || message.includes("timeout") || message.includes("fetch failed")) return true;
+		if (cause?.code && [
+			"ETIMEDOUT",
+			"ECONNABORTED",
+			"ECONNRESET",
+			"ECONNREFUSED",
+			"ENOTFOUND",
+			"EHOSTUNREACH",
+			"ENETUNREACH",
+			"EPIPE"
+		].includes(cause.code)) return true;
+	}
+	return false;
+}
+/**
+* Check if an error indicates the credential is invalid/expired/revoked.
+* These errors mean the user genuinely needs to re-authenticate.
+*/
+function isAuthenticationError(error) {
+	if (error instanceof UnauthorizedError) return true;
+	if (error instanceof StreamableHTTPError) return error.code === 401 || error.code === 403;
+	if (error instanceof Error) {
+		const message = error.message.toLowerCase();
+		if (message.includes("unauthorized") || message.includes("forbidden") || message.includes("invalid_token") || message.includes("token expired") || message.includes("invalid_grant")) return true;
 	}
 	return false;
 }
@@ -243,6 +268,18 @@ const dbResultToMcpTool = async (dbResult, dbClient, credentialStoreRegistry, re
 		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 if (isAuthenticationError(error)) {
+			status = "needs_auth";
+			lastErrorComputed = `Authentication required - OAuth login needed. ${errorMessage}`;
+		} else if (credentialReference) {
+			logger.warn({
+				toolId: dbResult.id,
+				credentialId: credentialReference.id,
+				errorCode: error instanceof McpError ? error.code : void 0,
+				errorMessage
+			}, "MCP server discovery failed with existing credential — treating as transient");
+			status = "unavailable";
+			lastErrorComputed = `Server temporarily unavailable. ${errorMessage}`;
 		} else {
 			const toolNeedsAuth = await detectAuthenticationRequired({
 				serverUrl: mcpServerUrl,

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

@@ -8,28 +8,28 @@ declare const getApiKeyById: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   id: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
   name: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  expiresAt: string | null;
   agentId: string;
+  expiresAt: string | null;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
   lastUsedAt: string | null;
 } | undefined>;
 declare const getApiKeyByPublicId: (db: AgentsRunDatabaseClient) => (publicId: string) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
   name: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  expiresAt: string | null;
   agentId: string;
+  expiresAt: string | null;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
@@ -39,14 +39,14 @@ declare const listApiKeys: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   agentId?: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
   name: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  expiresAt: string | null;
   agentId: string;
+  expiresAt: string | null;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
@@ -66,14 +66,14 @@ declare const listApiKeysPaginated: (db: AgentsRunDatabaseClient) => (params: {
   };
 }>;
 declare const createApiKey: (db: AgentsRunDatabaseClient) => (params: ApiKeyInsert) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
   name: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  expiresAt: string | null;
   agentId: string;
+  expiresAt: string | null;
   publicId: string;
   keyHash: string;
   keyPrefix: string;

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

@@ -5,39 +5,36 @@ import { AppInsert, AppSelect, AppUpdate } from "../../types/entities.js";
 
 //#region src/data-access/runtime/apps.d.ts
 declare const getAppById: (db: AgentsRunDatabaseClient) => (id: string) => Promise<{
+  type: AppType;
+  tenantId: string | null;
+  projectId: string | null;
   id: string;
   name: string;
   description: string | null;
+  enabled: boolean;
+  prompt: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string | null;
-  tenantId: string | null;
-  type: AppType;
-  lastUsedAt: string | null;
-  defaultProjectId: string | null;
-  defaultAgentId: string | null;
-  prompt: string | null;
-  enabled: boolean;
   config: {
     type: "web_client";
     webClient: {
       allowedDomains: string[];
-      auth?: {
-        publicKeys: {
-          kid: string;
-          publicKey: string;
-          algorithm: "RS256" | "RS384" | "RS512" | "ES256" | "ES384" | "ES512" | "EdDSA";
-          addedAt: string;
-        }[];
-        audience?: string | undefined;
-        validateScopeClaims?: boolean | undefined;
-        allowAnonymous?: boolean | undefined;
-      } | undefined;
+      publicKeys: {
+        kid: string;
+        publicKey: string;
+        algorithm: "RS256" | "RS384" | "RS512" | "ES256" | "ES384" | "ES512" | "EdDSA";
+        addedAt: string;
+      }[];
+      allowAnonymous: boolean;
+      audience?: string | undefined;
     };
   } | {
     type: "api";
     api: Record<string, never>;
   };
+  lastUsedAt: string | null;
+  defaultProjectId: string | null;
+  defaultAgentId: string | null;
 } | undefined>;
 declare const updateAppLastUsed: (db: AgentsRunDatabaseClient) => (id: string) => Promise<void>;
 declare const getAppByIdForTenant: (db: AgentsRunDatabaseClient) => (params: {
@@ -64,39 +61,36 @@ declare const listAppsPaginated: (db: AgentsRunDatabaseClient) => (params: {
   };
 }>;
 declare const createApp: (db: AgentsRunDatabaseClient) => (params: AppInsert) => Promise<{
+  type: AppType;
+  tenantId: string | null;
+  projectId: string | null;
   id: string;
   name: string;
   description: string | null;
+  enabled: boolean;
+  prompt: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string | null;
-  tenantId: string | null;
-  type: AppType;
-  lastUsedAt: string | null;
-  defaultProjectId: string | null;
-  defaultAgentId: string | null;
-  prompt: string | null;
-  enabled: boolean;
   config: {
     type: "web_client";
     webClient: {
       allowedDomains: string[];
-      auth?: {
-        publicKeys: {
-          kid: string;
-          publicKey: string;
-          algorithm: "RS256" | "RS384" | "RS512" | "ES256" | "ES384" | "ES512" | "EdDSA";
-          addedAt: string;
-        }[];
-        audience?: string | undefined;
-        validateScopeClaims?: boolean | undefined;
-        allowAnonymous?: boolean | undefined;
-      } | undefined;
+      publicKeys: {
+        kid: string;
+        publicKey: string;
+        algorithm: "RS256" | "RS384" | "RS512" | "ES256" | "ES384" | "ES512" | "EdDSA";
+        addedAt: string;
+      }[];
+      allowAnonymous: boolean;
+      audience?: string | undefined;
     };
   } | {
     type: "api";
     api: Record<string, never>;
   };
+  lastUsedAt: string | null;
+  defaultProjectId: string | null;
+  defaultAgentId: string | null;
 }>;
 declare const updateAppForTenant: (db: AgentsRunDatabaseClient) => (params: {
   scopes: TenantScopeConfig;
@@ -151,17 +145,14 @@ declare const updateApp: (db: AgentsRunDatabaseClient) => (params: {
     type: "web_client";
     webClient: {
       allowedDomains: string[];
-      auth?: {
-        publicKeys: {
-          kid: string;
-          publicKey: string;
-          algorithm: "RS256" | "RS384" | "RS512" | "ES256" | "ES384" | "ES512" | "EdDSA";
-          addedAt: string;
-        }[];
-        audience?: string | undefined;
-        validateScopeClaims?: boolean | undefined;
-        allowAnonymous?: boolean | undefined;
-      } | undefined;
+      publicKeys: {
+        kid: string;
+        publicKey: string;
+        algorithm: "RS256" | "RS384" | "RS512" | "ES256" | "ES384" | "ES512" | "EdDSA";
+        addedAt: string;
+      }[];
+      allowAnonymous: boolean;
+      audience?: string | undefined;
     };
   } | {
     type: "api";

package/dist/data-access/runtime/cascade-delete.d.ts

@@ -1,6 +1,6 @@
 import { AgentScopeConfig, ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
-import "../../types/index.js";
 import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
+import "../../types/index.js";
 
 //#region src/data-access/runtime/cascade-delete.d.ts
 /**

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

@@ -1,8 +1,8 @@
 import { ResolvedRef } from "../../validation/dolt-schemas.js";
 import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
 import { ConversationHistoryConfig, ConversationMetadata, PaginationConfig } from "../../types/utility.js";
-import "../../types/index.js";
 import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
+import "../../types/index.js";
 import { ConversationInsert, ConversationSelect, ConversationUpdate, MessageSelect } from "../../types/entities.js";
 
 //#region src/data-access/runtime/conversations.d.ts
@@ -15,20 +15,20 @@ declare const listConversations: (db: AgentsRunDatabaseClient) => (params: {
   total: number;
 }>;
 declare const createConversation: (db: AgentsRunDatabaseClient) => (params: ConversationInsert) => Promise<{
+  tenantId: string;
+  userId: string | null;
+  projectId: string;
   id: string;
-  metadata: ConversationMetadata | null;
+  title: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  title: string | null;
+  metadata: ConversationMetadata | null;
+  agentId: string | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  userId: string | null;
-  agentId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;
 }>;
@@ -84,20 +84,20 @@ declare const getConversation: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   conversationId: string;
 }) => Promise<{
+  tenantId: string;
+  userId: string | null;
+  projectId: string;
   id: string;
-  metadata: ConversationMetadata | null;
+  title: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  title: string | null;
+  metadata: ConversationMetadata | null;
+  agentId: string | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  userId: string | null;
-  agentId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;
 } | undefined>;
@@ -120,20 +120,20 @@ declare const createOrGetConversation: (db: AgentsRunDatabaseClient) => (input:
   metadata?: ConversationMetadata | null | undefined;
   contextConfigId?: string | undefined;
 } | {
+  tenantId: string;
+  userId: string | null;
+  projectId: string;
   id: string;
-  metadata: ConversationMetadata | null;
+  title: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  title: string | null;
+  metadata: ConversationMetadata | null;
+  agentId: string | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  userId: string | null;
-  agentId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;
 }>;
@@ -152,20 +152,20 @@ declare const getActiveAgentForConversation: (db: AgentsRunDatabaseClient) => (p
   scopes: ProjectScopeConfig;
   conversationId: string;
 }) => Promise<{
+  tenantId: string;
+  userId: string | null;
+  projectId: string;
   id: string;
-  metadata: ConversationMetadata | null;
+  title: string | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  title: string | null;
+  metadata: ConversationMetadata | null;
+  agentId: string | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  userId: string | null;
-  agentId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;
 } | undefined>;

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

@@ -0,0 +1,13 @@
+import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
+
+//#region src/data-access/runtime/entitlements.d.ts
+declare const listOrgEntitlements: (db: AgentsRunDatabaseClient) => (orgId: string) => Promise<Array<{
+  resourceType: string;
+  maxValue: number;
+}>>;
+declare function dalResolveEntitlement(db: AgentsRunDatabaseClient, orgId: string, resourceType: string): Promise<number | null>;
+declare function dalGetServiceAccountUserId(db: AgentsRunDatabaseClient, orgId: string): Promise<string | null>;
+declare function dalCountMembersByRoleBucket(db: AgentsRunDatabaseClient, orgId: string, isAdminBucket: boolean, serviceAccountUserId: string | null): Promise<number>;
+declare function dalSumSeatEntitlements(db: AgentsRunDatabaseClient, orgId: string): Promise<number | null>;
+//#endregion
+export { dalCountMembersByRoleBucket, dalGetServiceAccountUserId, dalResolveEntitlement, dalSumSeatEntitlements, listOrgEntitlements };

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

@@ -0,0 +1,33 @@
+import { member, organization } from "../../auth/auth-schema.js";
+import { orgEntitlement } from "../../db/runtime/runtime-schema.js";
+import { and, eq, like, or, sql } from "drizzle-orm";
+
+//#region src/data-access/runtime/entitlements.ts
+const listOrgEntitlements = (db) => async (orgId) => {
+	return await db.select({
+		resourceType: orgEntitlement.resourceType,
+		maxValue: orgEntitlement.maxValue
+	}).from(orgEntitlement).where(eq(orgEntitlement.organizationId, orgId));
+};
+async function dalResolveEntitlement(db, orgId, resourceType) {
+	const rows = await db.select({ maxValue: orgEntitlement.maxValue }).from(orgEntitlement).where(and(eq(orgEntitlement.organizationId, orgId), eq(orgEntitlement.resourceType, resourceType)));
+	if (rows.length === 0) return null;
+	return rows[0].maxValue;
+}
+async function dalGetServiceAccountUserId(db, orgId) {
+	return (await db.select({ serviceAccountUserId: organization.serviceAccountUserId }).from(organization).where(eq(organization.id, orgId)))[0]?.serviceAccountUserId ?? null;
+}
+async function dalCountMembersByRoleBucket(db, orgId, isAdminBucket, serviceAccountUserId) {
+	const memberCondition = isAdminBucket ? or(eq(member.role, "owner"), eq(member.role, "admin")) : eq(member.role, "member");
+	const memberWhere = serviceAccountUserId ? and(eq(member.organizationId, orgId), memberCondition, sql`${member.userId} != ${serviceAccountUserId}`) : and(eq(member.organizationId, orgId), memberCondition);
+	const [result] = await db.select({ count: sql`count(*)::int` }).from(member).where(memberWhere);
+	return result?.count ?? 0;
+}
+async function dalSumSeatEntitlements(db, orgId) {
+	const rows = await db.select({ maxValue: orgEntitlement.maxValue }).from(orgEntitlement).where(and(eq(orgEntitlement.organizationId, orgId), like(orgEntitlement.resourceType, "seat:%")));
+	if (rows.length === 0) return null;
+	return rows.reduce((sum, r) => sum + r.maxValue, 0);
+}
+
+//#endregion
+export { dalCountMembersByRoleBucket, dalGetServiceAccountUserId, dalResolveEntitlement, dalSumSeatEntitlements, listOrgEntitlements };

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

@@ -1,7 +1,7 @@
 import { Artifact, Part } from "../../types/a2a.js";
 import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
-import "../../types/index.js";
 import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
+import "../../types/index.js";
 import { LedgerArtifactSelect } from "../../types/entities.js";
 
 //#region src/data-access/runtime/ledgerArtifacts.d.ts

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

@@ -1,7 +1,7 @@
 import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
 import { MessageContent, MessageMetadata, MessageVisibility, PaginationConfig } from "../../types/utility.js";
-import "../../types/index.js";
 import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
+import "../../types/index.js";
 import "../../index.js";
 import { MessageInsert, MessageUpdate } from "../../types/entities.js";
 
@@ -10,13 +10,13 @@ declare const getMessageById: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   messageId: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
-  content: MessageContent;
-  metadata: MessageMetadata | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
+  metadata: MessageMetadata | null;
+  content: MessageContent;
   role: string;
   conversationId: string;
   fromSubAgentId: string | null;
@@ -144,13 +144,13 @@ declare const createMessage: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   data: Omit<MessageInsert, "tenantId" | "projectId">;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
-  content: MessageContent;
-  metadata: MessageMetadata | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
+  metadata: MessageMetadata | null;
+  content: MessageContent;
   role: string;
   conversationId: string;
   fromSubAgentId: string | null;
@@ -197,13 +197,13 @@ declare const deleteMessage: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   messageId: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
-  content: MessageContent;
-  metadata: MessageMetadata | null;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
+  metadata: MessageMetadata | null;
+  content: MessageContent;
   role: string;
   conversationId: string;
   fromSubAgentId: string | null;