@inkeep/agents-core 0.59.4 → 0.61.0

package/dist/db/runtime/runtime-schema.js

@@ -1,10 +1,12 @@
 import { __exportAll } from "../../_virtual/rolldown_runtime.js";
 import { account, deviceCode, invitation, member, organization, session, ssoProvider, user, verification } from "../../auth/auth-schema.js";
+import { USAGE_GENERATION_TYPES } from "../../constants/otel-attributes.js";
 import { relations } from "drizzle-orm";
 import { boolean, foreignKey, index, integer, jsonb, pgTable, primaryKey, text, timestamp, unique, uniqueIndex, varchar } from "drizzle-orm/pg-core";
 
 //#region src/db/runtime/runtime-schema.ts
 var runtime_schema_exports = /* @__PURE__ */ __exportAll({
+	USAGE_GENERATION_TYPES: () => USAGE_GENERATION_TYPES,
 	account: () => account,
 	apiKeys: () => apiKeys,
 	apps: () => apps,
@@ -49,7 +51,8 @@ var runtime_schema_exports = /* @__PURE__ */ __exportAll({
 	workAppSlackChannelAgentConfigs: () => workAppSlackChannelAgentConfigs,
 	workAppSlackMcpToolAccessConfig: () => workAppSlackMcpToolAccessConfig,
 	workAppSlackUserMappings: () => workAppSlackUserMappings,
-	workAppSlackWorkspaces: () => workAppSlackWorkspaces
+	workAppSlackWorkspaces: () => workAppSlackWorkspaces,
+	workflowExecutions: () => workflowExecutions
 });
 const tenantScoped = {
 	tenantId: varchar("tenant_id", { length: 256 }).notNull(),
@@ -121,6 +124,19 @@ const tasks = pgTable("tasks", {
 	table.projectId,
 	table.id
 ] })]);
+const workflowExecutions = pgTable("workflow_executions", {
+	...projectScoped,
+	agentId: varchar("agent_id", { length: 256 }).notNull(),
+	conversationId: varchar("conversation_id", { length: 256 }).notNull(),
+	requestId: varchar("request_id", { length: 256 }),
+	status: varchar("status", { length: 50 }).notNull().default("running"),
+	metadata: jsonb("metadata").$type(),
+	...timestamps
+}, (table) => [primaryKey({ columns: [
+	table.tenantId,
+	table.projectId,
+	table.id
+] }), index("workflow_executions_conversation_idx").on(table.tenantId, table.projectId, table.conversationId)]);
 const apiKeys = pgTable("api_keys", {
 	...projectScoped,
 	agentId: varchar("agent_id", { length: 256 }).notNull(),
@@ -150,6 +166,7 @@ const apps = pgTable("apps", {
 	type: varchar("type", { length: 64 }).$type().notNull(),
 	defaultProjectId: varchar("default_project_id", { length: 256 }),
 	defaultAgentId: varchar("default_agent_id", { length: 256 }),
+	prompt: text("prompt"),
 	enabled: boolean("enabled").notNull().default(true),
 	config: jsonb("config").$type().notNull(),
 	lastUsedAt: timestamp("last_used_at", { mode: "string" }),
@@ -822,4 +839,4 @@ const workAppSlackMcpToolAccessConfig = pgTable("work_app_slack_mcp_tool_access_
 ]);
 
 //#endregion
-export { account, apiKeys, apps, contextCache, conversations, conversationsRelations, datasetRun, datasetRunConversationRelations, deviceCode, evaluationResult, evaluationRun, invitation, ledgerArtifacts, ledgerArtifactsRelations, member, messages, messagesRelations, organization, projectMetadata, runtime_schema_exports, scheduledTriggerInvocations, session, ssoProvider, taskRelations, taskRelationsRelations, tasks, tasksRelations, triggerInvocations, user, userProfile, userProfileRelations, verification, workAppGitHubInstallations, workAppGitHubInstallationsRelations, workAppGitHubMcpToolAccessMode, workAppGitHubMcpToolRepositoryAccess, workAppGitHubMcpToolRepositoryAccessRelations, workAppGitHubProjectAccessMode, workAppGitHubProjectRepositoryAccess, workAppGitHubProjectRepositoryAccessRelations, workAppGitHubRepositories, workAppGitHubRepositoriesRelations, workAppSlackChannelAgentConfigs, workAppSlackMcpToolAccessConfig, workAppSlackUserMappings, workAppSlackWorkspaces };
+export { USAGE_GENERATION_TYPES, account, apiKeys, apps, contextCache, conversations, conversationsRelations, datasetRun, datasetRunConversationRelations, deviceCode, evaluationResult, evaluationRun, invitation, ledgerArtifacts, ledgerArtifactsRelations, member, messages, messagesRelations, organization, projectMetadata, runtime_schema_exports, scheduledTriggerInvocations, session, ssoProvider, taskRelations, taskRelationsRelations, tasks, tasksRelations, triggerInvocations, user, userProfile, userProfileRelations, verification, workAppGitHubInstallations, workAppGitHubInstallationsRelations, workAppGitHubMcpToolAccessMode, workAppGitHubMcpToolRepositoryAccess, workAppGitHubMcpToolRepositoryAccessRelations, workAppGitHubProjectAccessMode, workAppGitHubProjectRepositoryAccess, workAppGitHubProjectRepositoryAccessRelations, workAppGitHubRepositories, workAppGitHubRepositoriesRelations, workAppSlackChannelAgentConfigs, workAppSlackMcpToolAccessConfig, workAppSlackUserMappings, workAppSlackWorkspaces, workflowExecutions };

package/dist/dolt/fk-map.d.ts

@@ -0,0 +1,5 @@
+//#region src/dolt/fk-map.d.ts
+type FkDeps = Record<string, string[]>;
+declare const manageFkDeps: FkDeps;
+//#endregion
+export { FkDeps, manageFkDeps };

package/dist/dolt/fk-map.js

@@ -0,0 +1,34 @@
+import { manage_schema_exports } from "../db/manage/manage-schema.js";
+import { getTableConfig } from "drizzle-orm/pg-core";
+
+//#region src/dolt/fk-map.ts
+function buildFkDepsFromSchema() {
+	const deps = {};
+	for (const value of Object.values(manage_schema_exports)) {
+		if (value == null || typeof value !== "object") continue;
+		let config;
+		try {
+			config = getTableConfig(value);
+		} catch {
+			continue;
+		}
+		if (!config?.name) continue;
+		const tableDeps = /* @__PURE__ */ new Set();
+		for (const fk of config.foreignKeys ?? []) {
+			const ref = fk.reference();
+			let refName;
+			try {
+				refName = getTableConfig(ref.foreignTable).name;
+			} catch {
+				continue;
+			}
+			if (refName && refName !== config.name) tableDeps.add(refName);
+		}
+		if (tableDeps.size > 0) deps[config.name] = [...tableDeps];
+	}
+	return deps;
+}
+const manageFkDeps = buildFkDepsFromSchema();
+
+//#endregion
+export { manageFkDeps };

package/dist/dolt/index.d.ts

@@ -3,11 +3,12 @@ import { branchScopes, doltActiveBranch, doltBranch, doltBranchExists, doltCheck
 import { CheckoutBranchParams, CheckoutBranchResult, CreateBranchParams, DeleteBranchParams, GetBranchParams, MAIN_BRANCH_SUFFIX, checkoutBranch, createBranch, deleteBranch, getBranch, getTempBranchSuffix, getTenantMainBranch, invalidBranchParamsError, isProtectedBranchName, isTempBranchName, listBranches, listBranchesForAgent, syncSchemaOnBranch } from "./branches-api.js";
 import { doltAdd, doltAddAndCommit, doltCommit, doltDeleteTag, doltHashOf, doltListTags, doltLog, doltReset, doltStatus, doltTag } from "./commit.js";
 import { doltDiff, doltDiffSummary } from "./diff.js";
+import { FkDeps, manageFkDeps } from "./fk-map.js";
 import { MergeConflictError, doltAbortMerge, doltConflicts, doltMerge, doltMergeStatus, doltPreviewMergeConflicts, doltPreviewMergeConflictsSummary, doltResolveConflicts, doltSchemaConflicts, doltTableConflicts } from "./merge.js";
 import { PkMap, isValidManageTable, managePkMap } from "./pk-map.js";
 import { RefType, checkoutRef, getCurrentBranchOrCommit, getProjectMainResolvedRef, getProjectScopedRef, getTenantScopedRef, isRefWritable, isValidCommitHash, resolveProjectMainRefs, resolveRef } from "./ref-helpers.js";
 import { RefContext, RefMiddlewareOptions, createRefMiddleware, createWriteProtectionMiddleware, isMergeRoute, refMiddlewareFactory, writeProtectionMiddlewareFactory } from "./ref-middleware.js";
 import { NestedRefScopeError, WithRefOptions, getCurrentRefScope, getRefScopedDb, isInRefScope, withRef } from "./ref-scope.js";
-import { ResolutionValidationError, applyResolutions } from "./resolve-conflicts.js";
+import { ResolutionValidationError, applyResolutions, computeTableInsertOrder, sortByFkDependencyOrder } from "./resolve-conflicts.js";
 import { EnsureSchemaSyncOptions, SCHEMA_SOURCE_BRANCH, SchemaDiff, SchemaSyncOptions, SchemaSyncResult, areBranchesSchemaCompatible, ensureSchemaSync, formatSchemaDiffSummary, getActiveBranch, getSchemaDiff, hasSchemaDifferences, hasUncommittedChanges, isLocalhostUrl, syncSchemaFromMain } from "./schema-sync.js";
-export { CheckoutBranchParams, CheckoutBranchResult, CreateBranchParams, DeleteBranchParams, EnsureSchemaSyncOptions, GetBranchParams, MAIN_BRANCH_SUFFIX, MergeConflictError, NestedRefScopeError, PkMap, RefContext, RefMiddlewareOptions, RefType, ResolutionValidationError, SCHEMA_SOURCE_BRANCH, SchemaDiff, SchemaSyncOptions, SchemaSyncResult, WithRefOptions, applyResolutions, areBranchesSchemaCompatible, branchScopes, checkoutBranch, checkoutRef, createBranch, createRefMiddleware, createWriteProtectionMiddleware, deleteBranch, doltAbortMerge, doltActiveBranch, doltAdd, doltAddAndCommit, doltBranch, doltBranchExists, doltCheckout, doltCommit, doltConflicts, doltDeleteBranch, doltDeleteTag, doltDiff, doltDiffSummary, doltGetBranchNamespace, doltHashOf, doltListBranches, doltListTags, doltLog, doltMerge, doltMergeStatus, doltPreviewMergeConflicts, doltPreviewMergeConflictsSummary, doltRenameBranch, doltReset, doltResolveConflicts, doltSchemaConflicts, doltStatus, doltTableConflicts, doltTag, ensureBranchExists, ensureSchemaSync, formatSchemaDiffSummary, getActiveBranch, getBranch, getCurrentBranchOrCommit, getCurrentRefScope, getProjectMainResolvedRef, getProjectScopedRef, getRefScopedDb, getSchemaDiff, getTempBranchSuffix, getTenantMainBranch, getTenantScopedRef, hasSchemaDifferences, hasUncommittedChanges, invalidBranchParamsError, isInRefScope, isLocalhostUrl, isMergeRoute, isProtectedBranchName, isRefWritable, isTempBranchName, isValidCommitHash, isValidManageTable, listBranches, listBranchesForAgent, managePkMap, refMiddlewareFactory, releaseAdvisoryLock, resolveProjectMainRefs, resolveRef, syncSchemaFromMain, syncSchemaOnBranch, tryAdvisoryLock, withRef, writeProtectionMiddlewareFactory };
+export { CheckoutBranchParams, CheckoutBranchResult, CreateBranchParams, DeleteBranchParams, EnsureSchemaSyncOptions, FkDeps, GetBranchParams, MAIN_BRANCH_SUFFIX, MergeConflictError, NestedRefScopeError, PkMap, RefContext, RefMiddlewareOptions, RefType, ResolutionValidationError, SCHEMA_SOURCE_BRANCH, SchemaDiff, SchemaSyncOptions, SchemaSyncResult, WithRefOptions, applyResolutions, areBranchesSchemaCompatible, branchScopes, checkoutBranch, checkoutRef, computeTableInsertOrder, createBranch, createRefMiddleware, createWriteProtectionMiddleware, deleteBranch, doltAbortMerge, doltActiveBranch, doltAdd, doltAddAndCommit, doltBranch, doltBranchExists, doltCheckout, doltCommit, doltConflicts, doltDeleteBranch, doltDeleteTag, doltDiff, doltDiffSummary, doltGetBranchNamespace, doltHashOf, doltListBranches, doltListTags, doltLog, doltMerge, doltMergeStatus, doltPreviewMergeConflicts, doltPreviewMergeConflictsSummary, doltRenameBranch, doltReset, doltResolveConflicts, doltSchemaConflicts, doltStatus, doltTableConflicts, doltTag, ensureBranchExists, ensureSchemaSync, formatSchemaDiffSummary, getActiveBranch, getBranch, getCurrentBranchOrCommit, getCurrentRefScope, getProjectMainResolvedRef, getProjectScopedRef, getRefScopedDb, getSchemaDiff, getTempBranchSuffix, getTenantMainBranch, getTenantScopedRef, hasSchemaDifferences, hasUncommittedChanges, invalidBranchParamsError, isInRefScope, isLocalhostUrl, isMergeRoute, isProtectedBranchName, isRefWritable, isTempBranchName, isValidCommitHash, isValidManageTable, listBranches, listBranchesForAgent, manageFkDeps, managePkMap, refMiddlewareFactory, releaseAdvisoryLock, resolveProjectMainRefs, resolveRef, sortByFkDependencyOrder, syncSchemaFromMain, syncSchemaOnBranch, tryAdvisoryLock, withRef, writeProtectionMiddlewareFactory };

package/dist/dolt/index.js

@@ -1,6 +1,7 @@
 import { doltAdd, doltAddAndCommit, doltCommit, doltDeleteTag, doltHashOf, doltListTags, doltLog, doltReset, doltStatus, doltTag } from "./commit.js";
 import { isValidManageTable, managePkMap } from "./pk-map.js";
-import { ResolutionValidationError, applyResolutions } from "./resolve-conflicts.js";
+import { manageFkDeps } from "./fk-map.js";
+import { ResolutionValidationError, applyResolutions, computeTableInsertOrder, sortByFkDependencyOrder } from "./resolve-conflicts.js";
 import { MergeConflictError, doltAbortMerge, doltConflicts, doltMerge, doltMergeStatus, doltPreviewMergeConflicts, doltPreviewMergeConflictsSummary, doltResolveConflicts, doltSchemaConflicts, doltTableConflicts } from "./merge.js";
 import { SCHEMA_SOURCE_BRANCH, areBranchesSchemaCompatible, ensureSchemaSync, formatSchemaDiffSummary, getActiveBranch, getSchemaDiff, hasSchemaDifferences, hasUncommittedChanges, isLocalhostUrl, syncSchemaFromMain } from "./schema-sync.js";
 import { MAIN_BRANCH_SUFFIX, checkoutBranch, createBranch, deleteBranch, getBranch, getTempBranchSuffix, getTenantMainBranch, invalidBranchParamsError, isProtectedBranchName, isTempBranchName, listBranches, listBranchesForAgent, syncSchemaOnBranch } from "./branches-api.js";
@@ -11,4 +12,4 @@ import { doltDiff, doltDiffSummary } from "./diff.js";
 import { createRefMiddleware, createWriteProtectionMiddleware, isMergeRoute, refMiddlewareFactory, writeProtectionMiddlewareFactory } from "./ref-middleware.js";
 import { NestedRefScopeError, getCurrentRefScope, getRefScopedDb, isInRefScope, withRef } from "./ref-scope.js";
 
-export { MAIN_BRANCH_SUFFIX, MergeConflictError, NestedRefScopeError, ResolutionValidationError, SCHEMA_SOURCE_BRANCH, applyResolutions, areBranchesSchemaCompatible, checkoutBranch, checkoutRef, createBranch, createRefMiddleware, createWriteProtectionMiddleware, deleteBranch, doltAbortMerge, doltActiveBranch, doltAdd, doltAddAndCommit, doltBranch, doltBranchExists, doltCheckout, doltCommit, doltConflicts, doltDeleteBranch, doltDeleteTag, doltDiff, doltDiffSummary, doltGetBranchNamespace, doltHashOf, doltListBranches, doltListTags, doltLog, doltMerge, doltMergeStatus, doltPreviewMergeConflicts, doltPreviewMergeConflictsSummary, doltRenameBranch, doltReset, doltResolveConflicts, doltSchemaConflicts, doltStatus, doltTableConflicts, doltTag, ensureBranchExists, ensureSchemaSync, formatSchemaDiffSummary, getActiveBranch, getBranch, getCurrentBranchOrCommit, getCurrentRefScope, getProjectMainResolvedRef, getProjectScopedRef, getRefScopedDb, getSchemaDiff, getTempBranchSuffix, getTenantMainBranch, getTenantScopedRef, hasSchemaDifferences, hasUncommittedChanges, invalidBranchParamsError, isInRefScope, isLocalhostUrl, isMergeRoute, isProtectedBranchName, isRefWritable, isTempBranchName, isValidCommitHash, isValidManageTable, listBranches, listBranchesForAgent, managePkMap, refMiddlewareFactory, releaseAdvisoryLock, resolveProjectMainRefs, resolveRef, syncSchemaFromMain, syncSchemaOnBranch, tryAdvisoryLock, withRef, writeProtectionMiddlewareFactory };
+export { MAIN_BRANCH_SUFFIX, MergeConflictError, NestedRefScopeError, ResolutionValidationError, SCHEMA_SOURCE_BRANCH, applyResolutions, areBranchesSchemaCompatible, checkoutBranch, checkoutRef, computeTableInsertOrder, createBranch, createRefMiddleware, createWriteProtectionMiddleware, deleteBranch, doltAbortMerge, doltActiveBranch, doltAdd, doltAddAndCommit, doltBranch, doltBranchExists, doltCheckout, doltCommit, doltConflicts, doltDeleteBranch, doltDeleteTag, doltDiff, doltDiffSummary, doltGetBranchNamespace, doltHashOf, doltListBranches, doltListTags, doltLog, doltMerge, doltMergeStatus, doltPreviewMergeConflicts, doltPreviewMergeConflictsSummary, doltRenameBranch, doltReset, doltResolveConflicts, doltSchemaConflicts, doltStatus, doltTableConflicts, doltTag, ensureBranchExists, ensureSchemaSync, formatSchemaDiffSummary, getActiveBranch, getBranch, getCurrentBranchOrCommit, getCurrentRefScope, getProjectMainResolvedRef, getProjectScopedRef, getRefScopedDb, getSchemaDiff, getTempBranchSuffix, getTenantMainBranch, getTenantScopedRef, hasSchemaDifferences, hasUncommittedChanges, invalidBranchParamsError, isInRefScope, isLocalhostUrl, isMergeRoute, isProtectedBranchName, isRefWritable, isTempBranchName, isValidCommitHash, isValidManageTable, listBranches, listBranchesForAgent, manageFkDeps, managePkMap, refMiddlewareFactory, releaseAdvisoryLock, resolveProjectMainRefs, resolveRef, sortByFkDependencyOrder, syncSchemaFromMain, syncSchemaOnBranch, tryAdvisoryLock, withRef, writeProtectionMiddlewareFactory };

package/dist/dolt/resolve-conflicts.d.ts

@@ -1,10 +1,20 @@
 import { ConflictResolution } from "../validation/dolt-schemas.js";
 import { AgentsManageDatabaseClient } from "../db/manage/manage-client.js";
+import { FkDeps } from "./fk-map.js";
 
 //#region src/dolt/resolve-conflicts.d.ts
 declare class ResolutionValidationError extends Error {
   constructor(message: string);
 }
+type OperationType = 'skip' | 'delete' | 'update' | 'insert';
+interface ClassifiedResolution {
+  resolution: ConflictResolution;
+  conflictRow: Record<string, unknown>;
+  pkColumns: string[];
+  operation: OperationType;
+}
+declare function computeTableInsertOrder(fkDeps: FkDeps): Map<string, number>;
+declare function sortByFkDependencyOrder(classified: ClassifiedResolution[]): ClassifiedResolution[];
 declare const applyResolutions: (db: AgentsManageDatabaseClient) => (resolutions: ConflictResolution[]) => Promise<void>;
 //#endregion
-export { ResolutionValidationError, applyResolutions };
+export { ResolutionValidationError, applyResolutions, computeTableInsertOrder, sortByFkDependencyOrder };

package/dist/dolt/resolve-conflicts.js

@@ -1,4 +1,5 @@
 import { isValidManageTable, managePkMap } from "./pk-map.js";
+import { manageFkDeps } from "./fk-map.js";
 import { sql } from "drizzle-orm";
 
 //#region src/dolt/resolve-conflicts.ts
@@ -13,21 +14,114 @@ function toSqlLiteral(val) {
 	if (typeof val === "object") return `'${JSON.stringify(val).replace(/'/g, "''")}'`;
 	return `'${String(val).replace(/'/g, "''")}'`;
 }
+function classifyOperation(conflictRow, rowDefaultPick, hasColumnOverrides) {
+	const ourDiffType = conflictRow.our_diff_type;
+	const theirDiffType = conflictRow.their_diff_type;
+	if (rowDefaultPick === "theirs" && !hasColumnOverrides) {
+		if (theirDiffType === "removed") return "delete";
+		if (ourDiffType === "removed") return "insert";
+		return "update";
+	}
+	if (theirDiffType === "removed" || ourDiffType === "removed") {
+		if (rowDefaultPick === "ours") return "skip";
+		if (theirDiffType === "removed") return "delete";
+		if (ourDiffType === "removed") return "insert";
+	}
+	return "update";
+}
+function computeTableInsertOrder(fkDeps) {
+	const order = /* @__PURE__ */ new Map();
+	const visited = /* @__PURE__ */ new Set();
+	let counter = 0;
+	function visit(table) {
+		if (visited.has(table)) return;
+		visited.add(table);
+		for (const dep of fkDeps[table] ?? []) visit(dep);
+		order.set(table, counter++);
+	}
+	for (const table of Object.keys(fkDeps)) visit(table);
+	return order;
+}
+const PHASE_ORDER = {
+	delete: 0,
+	update: 1,
+	insert: 2,
+	skip: 3
+};
+const tableOrder = computeTableInsertOrder(manageFkDeps);
+function sortByFkDependencyOrder(classified) {
+	return [...classified].sort((a, b) => {
+		const phaseA = PHASE_ORDER[a.operation];
+		const phaseB = PHASE_ORDER[b.operation];
+		if (phaseA !== phaseB) return phaseA - phaseB;
+		const orderA = tableOrder.get(a.resolution.table) ?? 0;
+		const orderB = tableOrder.get(b.resolution.table) ?? 0;
+		if (a.operation === "delete") return orderB - orderA;
+		if (a.operation === "insert") return orderA - orderB;
+		return 0;
+	});
+}
 const applyResolutions = (db) => async (resolutions) => {
 	const affectedTables = /* @__PURE__ */ new Set();
+	const classified = [];
 	for (const resolution of resolutions) {
 		if (!isValidManageTable(resolution.table)) throw new ResolutionValidationError(`Invalid table name: ${resolution.table}`);
 		affectedTables.add(resolution.table);
 		const pkColumns = managePkMap[resolution.table];
 		if (!pkColumns) throw new ResolutionValidationError(`No PK columns found for table: ${resolution.table}`);
 		const hasColumnOverrides = resolution.columns && Object.keys(resolution.columns).length > 0;
-		if (resolution.rowDefaultPick === "ours" && !hasColumnOverrides) continue;
+		if (resolution.rowDefaultPick === "ours" && !hasColumnOverrides) {
+			classified.push({
+				resolution,
+				conflictRow: {},
+				pkColumns,
+				operation: "skip"
+			});
+			continue;
+		}
 		const conflictRow = await readConflictRow(db, resolution.table, resolution.primaryKey, pkColumns);
 		if (!conflictRow) throw new ResolutionValidationError(`No conflict found for table ${resolution.table} with PK ${JSON.stringify(resolution.primaryKey)}`);
-		const ourDiffType = conflictRow.our_diff_type;
-		const theirDiffType = conflictRow.their_diff_type;
-		if (resolution.rowDefaultPick === "theirs" && !hasColumnOverrides) await applyTheirsResolution(db, resolution.table, resolution.primaryKey, pkColumns, conflictRow, ourDiffType, theirDiffType);
-		else await applyMixedResolution(db, resolution.table, resolution.primaryKey, pkColumns, conflictRow, resolution.rowDefaultPick, resolution.columns ?? {});
+		if (hasColumnOverrides) {
+			const ourDiffType = conflictRow.our_diff_type;
+			const theirDiffType = conflictRow.their_diff_type;
+			if (Object.values(resolution.columns ?? {}).some((pick) => pick !== resolution.rowDefaultPick) && (ourDiffType === "removed" || theirDiffType === "removed")) {
+				const removedSide = ourDiffType === "removed" ? "ours" : "theirs";
+				throw new ResolutionValidationError(`Cannot apply column overrides for table ${resolution.table} (PK ${JSON.stringify(resolution.primaryKey)}): ${removedSide} side deleted the row`);
+			}
+		}
+		const operation = classifyOperation(conflictRow, resolution.rowDefaultPick, hasColumnOverrides ?? false);
+		classified.push({
+			resolution,
+			conflictRow,
+			pkColumns,
+			operation
+		});
+	}
+	const sorted = sortByFkDependencyOrder(classified);
+	for (const { resolution, conflictRow, pkColumns, operation } of sorted) {
+		if (operation === "skip") continue;
+		const pkWhere = buildPkWhere(pkColumns, resolution.primaryKey);
+		switch (operation) {
+			case "delete":
+				await db.execute(sql.raw(`DELETE FROM "${resolution.table}" WHERE ${pkWhere}`));
+				break;
+			case "insert": {
+				const columns = getColumnNames(conflictRow, pkColumns);
+				const allCols = [...pkColumns, ...columns];
+				const values = allCols.map((col) => {
+					return toSqlLiteral(pkColumns.includes(col) ? resolution.primaryKey[col] : conflictRow[`their_${col}`]);
+				});
+				await db.execute(sql.raw(`INSERT INTO "${resolution.table}" (${allCols.map((c) => `"${c}"`).join(", ")}) VALUES (${values.join(", ")})`));
+				break;
+			}
+			case "update": {
+				const setClauses = getColumnNames(conflictRow, pkColumns).map((col) => {
+					return `"${col}" = ${toSqlLiteral(conflictRow[`${(resolution.columns?.[col] ?? resolution.rowDefaultPick) === "theirs" ? "their_" : "our_"}${col}`])}`;
+				});
+				await db.execute(sql.raw(`UPDATE "${resolution.table}" SET ${setClauses.join(", ")} WHERE ${pkWhere}`));
+				break;
+			}
+		}
 	}
 	for (const table of affectedTables) await db.execute(sql.raw(`SELECT DOLT_CONFLICTS_RESOLVE('--ours', '${table}')`));
 };
@@ -40,6 +134,11 @@ async function readConflictRow(db, table, primaryKey, pkColumns) {
 	}).join(" AND ");
 	return (await db.execute(sql.raw(`SELECT * FROM dolt_conflicts_${table} WHERE ${whereClause} LIMIT 1`))).rows[0] ?? null;
 }
+function buildPkWhere(pkColumns, primaryKey) {
+	return pkColumns.map((col) => {
+		return `"${col}" = '${primaryKey[col]?.replace(/'/g, "''")}'`;
+	}).join(" AND ");
+}
 function getColumnNames(conflictRow, pkColumns) {
 	const theirPrefix = "their_";
 	const skipColumns = new Set([
@@ -54,47 +153,6 @@ function getColumnNames(conflictRow, pkColumns) {
 	for (const key of Object.keys(conflictRow)) if (key.startsWith(theirPrefix) && !skipColumns.has(key)) columns.push(key.slice(6));
 	return columns;
 }
-async function applyTheirsResolution(db, table, primaryKey, pkColumns, conflictRow, ourDiffType, theirDiffType) {
-	const pkWhere = pkColumns.map((col) => {
-		return `"${col}" = '${primaryKey[col]?.replace(/'/g, "''")}'`;
-	}).join(" AND ");
-	if (theirDiffType === "removed") {
-		await db.execute(sql.raw(`DELETE FROM "${table}" WHERE ${pkWhere}`));
-		return;
-	}
-	const columns = getColumnNames(conflictRow, pkColumns);
-	if (ourDiffType === "removed") {
-		const allCols = [...pkColumns, ...columns];
-		const values = allCols.map((col) => {
-			return toSqlLiteral(pkColumns.includes(col) ? primaryKey[col] : conflictRow[`their_${col}`]);
-		});
-		await db.execute(sql.raw(`INSERT INTO "${table}" (${allCols.map((c) => `"${c}"`).join(", ")}) VALUES (${values.join(", ")})`));
-		return;
-	}
-	const setClauses = columns.map((col) => {
-		const val = conflictRow[`their_${col}`];
-		return `"${col}" = ${toSqlLiteral(val)}`;
-	});
-	await db.execute(sql.raw(`UPDATE "${table}" SET ${setClauses.join(", ")} WHERE ${pkWhere}`));
-}
-async function applyMixedResolution(db, table, primaryKey, pkColumns, conflictRow, rowDefaultPick, columnOverrides) {
-	const ourDiffType = conflictRow.our_diff_type;
-	const theirDiffType = conflictRow.their_diff_type;
-	if (theirDiffType === "removed" || ourDiffType === "removed") {
-		if (rowDefaultPick === "ours") return;
-		await applyTheirsResolution(db, table, primaryKey, pkColumns, conflictRow, ourDiffType, theirDiffType);
-		return;
-	}
-	const columns = getColumnNames(conflictRow, pkColumns);
-	const pkWhere = pkColumns.map((col) => {
-		return `"${col}" = '${primaryKey[col]?.replace(/'/g, "''")}'`;
-	}).join(" AND ");
-	const setClauses = columns.map((col) => {
-		const val = conflictRow[`${(columnOverrides[col] ?? rowDefaultPick) === "theirs" ? "their_" : "our_"}${col}`];
-		return `"${col}" = ${toSqlLiteral(val)}`;
-	});
-	await db.execute(sql.raw(`UPDATE "${table}" SET ${setClauses.join(", ")} WHERE ${pkWhere}`));
-}
 
 //#endregion
-export { ResolutionValidationError, applyResolutions };
+export { ResolutionValidationError, applyResolutions, computeTableInsertOrder, sortByFkDependencyOrder };