@rejot-dev/thalo 0.0.0

package/dist/merge/conflict-detector.js

@@ -0,0 +1,352 @@
+//#region src/merge/conflict-detector.ts
+/**
+* Detect conflicts in matched entries
+*
+* @param matches - Array of matched entry triplets
+* @param options - Merge options (for custom rules)
+* @returns Array of detected conflicts
+*/
+function detectConflicts(matches, options = {}) {
+	const conflicts = [];
+	const rules = [...DEFAULT_CONFLICT_RULES, ...options.conflictRules || []];
+	for (const match of matches) for (const rule of rules) {
+		const conflict = rule.detect(match);
+		if (conflict) {
+			conflicts.push(conflict);
+			break;
+		}
+	}
+	return conflicts;
+}
+/**
+* Default conflict detection rules
+*
+* Rules are applied in order, stopping at first match
+*/
+const DEFAULT_CONFLICT_RULES = [
+	{
+		name: "duplicate-link-id",
+		detect: (match) => {
+			if (!match.base && match.ours && match.theirs && match.identity.linkId) return {
+				type: "duplicate-link-id",
+				message: `Both sides created entry with link ID '^${match.identity.linkId}'`,
+				location: 0,
+				identity: match.identity,
+				ours: match.ours,
+				theirs: match.theirs,
+				context: { linkId: match.identity.linkId }
+			};
+			return null;
+		}
+	},
+	{
+		name: "concurrent-metadata-update",
+		detect: (match) => {
+			if (!match.base || !match.ours || !match.theirs) return null;
+			if (match.ours.type !== "instance_entry" && match.ours.type !== "synthesis_entry" && match.ours.type !== "actualize_entry") return null;
+			if (match.theirs.type !== "instance_entry" && match.theirs.type !== "synthesis_entry" && match.theirs.type !== "actualize_entry") return null;
+			const baseMetadata = getMetadataMap(match.base);
+			const oursMetadata = getMetadataMap(match.ours);
+			const theirsMetadata = getMetadataMap(match.theirs);
+			const allKeys = new Set([
+				...baseMetadata.keys(),
+				...oursMetadata.keys(),
+				...theirsMetadata.keys()
+			]);
+			for (const key of allKeys) {
+				const baseValue = baseMetadata.get(key);
+				const oursValue = oursMetadata.get(key);
+				const theirsValue = theirsMetadata.get(key);
+				if (oursValue !== baseValue && theirsValue !== baseValue && oursValue !== theirsValue) return {
+					type: "concurrent-metadata-update",
+					message: `Both sides modified metadata key '${key}'`,
+					location: 0,
+					identity: match.identity,
+					base: match.base,
+					ours: match.ours,
+					theirs: match.theirs,
+					context: { metadataKey: key }
+				};
+			}
+			return null;
+		}
+	},
+	{
+		name: "concurrent-content-edit",
+		detect: (match) => {
+			if (!match.base || !match.ours || !match.theirs) return null;
+			const baseContent = getEntryContent(match.base);
+			const oursContent = getEntryContent(match.ours);
+			const theirsContent = getEntryContent(match.theirs);
+			if (!baseContent) return null;
+			const oursChanged = !contentEquals(baseContent, oursContent);
+			const theirsChanged = !contentEquals(baseContent, theirsContent);
+			const different = !contentEquals(oursContent, theirsContent);
+			if (oursChanged && theirsChanged && different) return {
+				type: "concurrent-content-edit",
+				message: "Both sides modified content",
+				location: 0,
+				identity: match.identity,
+				base: match.base,
+				ours: match.ours,
+				theirs: match.theirs
+			};
+			return null;
+		}
+	},
+	{
+		name: "incompatible-schema-change",
+		detect: (match) => {
+			if (match.ours?.type !== "schema_entry" || match.theirs?.type !== "schema_entry") return null;
+			if (!match.base) {
+				if (!schemaEntriesEqual(match.ours, match.theirs)) return {
+					type: "incompatible-schema-change",
+					message: "Both sides defined same entity with different schemas",
+					location: 0,
+					identity: match.identity,
+					ours: match.ours,
+					theirs: match.theirs
+				};
+				return null;
+			}
+			if (match.base.type !== "schema_entry") return null;
+			const oursFields = getSchemaFields(match.ours);
+			const theirsFields = getSchemaFields(match.theirs);
+			const baseFields = getSchemaFields(match.base);
+			for (const [fieldName, oursField] of oursFields) {
+				const baseField = baseFields.get(fieldName);
+				const theirsField = theirsFields.get(fieldName);
+				if (oursField !== baseField && theirsField !== baseField && oursField !== theirsField) return {
+					type: "incompatible-schema-change",
+					message: `Both sides modified schema field '${fieldName}' differently`,
+					location: 0,
+					identity: match.identity,
+					base: match.base,
+					ours: match.ours,
+					theirs: match.theirs,
+					context: { fieldName }
+				};
+			}
+			const oursSections = getSchemaSections(match.ours);
+			const theirsSections = getSchemaSections(match.theirs);
+			const baseSections = getSchemaSections(match.base);
+			const allSectionNames = new Set([
+				...baseSections.keys(),
+				...oursSections.keys(),
+				...theirsSections.keys()
+			]);
+			for (const sectionName of allSectionNames) {
+				const baseSection = baseSections.get(sectionName);
+				const oursSection = oursSections.get(sectionName);
+				const theirsSection = theirsSections.get(sectionName);
+				if (oursSection !== baseSection && theirsSection !== baseSection && oursSection !== theirsSection) return {
+					type: "incompatible-schema-change",
+					message: `Both sides modified section '${sectionName}' differently`,
+					location: 0,
+					identity: match.identity,
+					base: match.base,
+					ours: match.ours,
+					theirs: match.theirs,
+					context: { fieldName: sectionName }
+				};
+			}
+			const oursRemovedFields = getRemovedFields(match.ours);
+			const theirsRemovedFields = getRemovedFields(match.theirs);
+			const baseRemovedFields = getRemovedFields(match.base);
+			const allRemovedFieldNames = new Set([
+				...baseRemovedFields.keys(),
+				...oursRemovedFields.keys(),
+				...theirsRemovedFields.keys()
+			]);
+			for (const fieldName of allRemovedFieldNames) {
+				const baseRemoved = baseRemovedFields.get(fieldName);
+				const oursRemoved = oursRemovedFields.get(fieldName);
+				const theirsRemoved = theirsRemovedFields.get(fieldName);
+				if (oursRemoved !== baseRemoved && theirsRemoved !== baseRemoved && oursRemoved !== theirsRemoved) return {
+					type: "incompatible-schema-change",
+					message: `Both sides modified field removal '${fieldName}' differently`,
+					location: 0,
+					identity: match.identity,
+					base: match.base,
+					ours: match.ours,
+					theirs: match.theirs,
+					context: { fieldName }
+				};
+			}
+			const oursRemovedSections = getRemovedSections(match.ours);
+			const theirsRemovedSections = getRemovedSections(match.theirs);
+			const baseRemovedSections = getRemovedSections(match.base);
+			const allRemovedSectionNames = new Set([
+				...baseRemovedSections.keys(),
+				...oursRemovedSections.keys(),
+				...theirsRemovedSections.keys()
+			]);
+			for (const sectionName of allRemovedSectionNames) {
+				const baseRemoved = baseRemovedSections.get(sectionName);
+				const oursRemoved = oursRemovedSections.get(sectionName);
+				const theirsRemoved = theirsRemovedSections.get(sectionName);
+				if (oursRemoved !== baseRemoved && theirsRemoved !== baseRemoved && oursRemoved !== theirsRemoved) return {
+					type: "incompatible-schema-change",
+					message: `Both sides modified section removal '${sectionName}' differently`,
+					location: 0,
+					identity: match.identity,
+					base: match.base,
+					ours: match.ours,
+					theirs: match.theirs,
+					context: { fieldName: sectionName }
+				};
+			}
+			return null;
+		}
+	},
+	{
+		name: "concurrent-title-change",
+		detect: (match) => {
+			if (!match.base || !match.ours || !match.theirs) return null;
+			const baseTitle = getEntryTitle(match.base);
+			const oursTitle = getEntryTitle(match.ours);
+			const theirsTitle = getEntryTitle(match.theirs);
+			if (baseTitle !== oursTitle && baseTitle !== theirsTitle && oursTitle !== theirsTitle) return {
+				type: "concurrent-title-change",
+				message: "Both sides changed entry title",
+				location: 0,
+				identity: match.identity,
+				base: match.base,
+				ours: match.ours,
+				theirs: match.theirs
+			};
+			return null;
+		}
+	}
+];
+/**
+* Get metadata as a map from key to raw value
+*/
+function getMetadataMap(entry) {
+	const map = /* @__PURE__ */ new Map();
+	if (entry.type === "instance_entry" || entry.type === "synthesis_entry" || entry.type === "actualize_entry") for (const meta of entry.metadata) map.set(meta.key.value, meta.value.raw);
+	return map;
+}
+/**
+* Get content from an entry
+*/
+function getEntryContent(entry) {
+	if (entry.type === "instance_entry" || entry.type === "synthesis_entry") return entry.content;
+	return null;
+}
+/**
+* Check if two content nodes are equal
+*/
+function contentEquals(a, b) {
+	if (a === null && b === null) return true;
+	if (a === null || b === null) return false;
+	if (a.children.length !== b.children.length) return false;
+	for (let i = 0; i < a.children.length; i++) {
+		const childA = a.children[i];
+		const childB = b.children[i];
+		if (childA.type !== childB.type) return false;
+		if (childA.text !== childB.text) return false;
+	}
+	return true;
+}
+/**
+* Check if two schema entries are equal
+*/
+function schemaEntriesEqual(a, b) {
+	if (a.type !== "schema_entry" || b.type !== "schema_entry") return false;
+	const aFields = getSchemaFields(a);
+	const bFields = getSchemaFields(b);
+	if (aFields.size !== bFields.size) return false;
+	for (const [key, value] of aFields) if (bFields.get(key) !== value) return false;
+	const aSections = getSchemaSections(a);
+	const bSections = getSchemaSections(b);
+	if (aSections.size !== bSections.size) return false;
+	for (const [key, value] of aSections) if (bSections.get(key) !== value) return false;
+	const aRemovedFields = getRemovedFields(a);
+	const bRemovedFields = getRemovedFields(b);
+	if (aRemovedFields.size !== bRemovedFields.size) return false;
+	for (const [key, value] of aRemovedFields) if (bRemovedFields.get(key) !== value) return false;
+	const aRemovedSections = getRemovedSections(a);
+	const bRemovedSections = getRemovedSections(b);
+	if (aRemovedSections.size !== bRemovedSections.size) return false;
+	for (const [key, value] of aRemovedSections) if (bRemovedSections.get(key) !== value) return false;
+	return true;
+}
+/**
+* Get schema fields as a map from field name to serialized definition
+*/
+function getSchemaFields(entry) {
+	const map = /* @__PURE__ */ new Map();
+	if (entry.type !== "schema_entry") return map;
+	if (entry.metadataBlock) for (const field of entry.metadataBlock.fields) map.set(`field:${field.name.value}`, serializeFieldDef(field));
+	return map;
+}
+/**
+* Get schema sections as a map from section name to serialized definition
+*/
+function getSchemaSections(entry) {
+	const map = /* @__PURE__ */ new Map();
+	if (entry.type !== "schema_entry") return map;
+	if (entry.sectionsBlock) for (const section of entry.sectionsBlock.sections) map.set(section.name.value, JSON.stringify({
+		optional: section.optional,
+		description: section.description?.value ?? null
+	}));
+	return map;
+}
+/**
+* Get removed schema fields as a map
+*/
+function getRemovedFields(entry) {
+	const map = /* @__PURE__ */ new Map();
+	if (entry.type !== "schema_entry") return map;
+	if (entry.removeMetadataBlock) for (const removal of entry.removeMetadataBlock.fields) map.set(removal.name.value, removal.reason?.value ?? "");
+	return map;
+}
+/**
+* Get removed schema sections as a map
+*/
+function getRemovedSections(entry) {
+	const map = /* @__PURE__ */ new Map();
+	if (entry.type !== "schema_entry") return map;
+	if (entry.removeSectionsBlock) for (const removal of entry.removeSectionsBlock.sections) map.set(removal.name.value, removal.reason?.value ?? "");
+	return map;
+}
+/**
+* Serialize a field definition to a string for comparison
+*/
+function serializeFieldDef(field) {
+	return JSON.stringify({
+		optional: field.optional,
+		type: serializeTypeExpr(field.typeExpr),
+		defaultValue: field.defaultValue ? field.defaultValue.raw : null,
+		description: field.description ? field.description.value : null
+	});
+}
+/**
+* Serialize a type expression to a string
+*/
+function serializeTypeExpr(typeExpr) {
+	switch (typeExpr.type) {
+		case "primitive_type": return typeExpr.name;
+		case "literal_type": return `"${typeExpr.value}"`;
+		case "array_type": return `${serializeTypeExpr(typeExpr.elementType)}[]`;
+		case "union_type": return typeExpr.members.map((m) => serializeTypeExpr(m)).join(" | ");
+		default: return "unknown";
+	}
+}
+/**
+* Get entry title
+*/
+function getEntryTitle(entry) {
+	switch (entry.type) {
+		case "instance_entry":
+		case "schema_entry":
+		case "synthesis_entry": return entry.header.title.value;
+		case "actualize_entry": return "";
+		default: return "";
+	}
+}
+
+//#endregion
+export { detectConflicts };
+//# sourceMappingURL=conflict-detector.js.map

package/dist/merge/conflict-detector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-detector.js","names":["conflicts: MergeConflict[]","rules: ConflictRule[]","DEFAULT_CONFLICT_RULES: ConflictRule[]"],"sources":["../../src/merge/conflict-detector.ts"],"sourcesContent":["import type { Entry, Content, FieldDefinition } from \"../ast/ast-types.js\";\nimport type { EntryMatch, EntryIdentity } from \"./entry-matcher.js\";\nimport type { MergeOptions } from \"./driver.js\";\n\n/**\n * Types of conflicts that can be detected\n */\nexport type ConflictType =\n  | \"duplicate-link-id\" // Both sides created entry with same ^link-id\n  | \"concurrent-metadata-update\" // Both modified same metadata key\n  | \"incompatible-schema-change\" // Conflicting schema modifications\n  | \"concurrent-content-edit\" // Both modified content of same entry\n  | \"concurrent-title-change\" // Both changed title of same entry\n  | \"parse-error\" // Failed to parse one or more versions\n  | \"merge-error\"; // Internal merge failure\n\n/**\n * Additional context for conflicts\n */\nexport interface ConflictContext {\n  /**\n   * The metadata key involved (for metadata conflicts)\n   */\n  metadataKey?: string;\n\n  /**\n   * The link ID involved (for link conflicts)\n   */\n  linkId?: string;\n\n  /**\n   * The entity name involved (for schema conflicts)\n   */\n  entityName?: string;\n\n  /**\n   * The field name involved (for schema field conflicts)\n   */\n  fieldName?: string;\n\n  /**\n   * Error message (for parse-error and merge-error conflicts)\n   */\n  errorMessage?: string;\n}\n\n/**\n * A conflict detected during merging\n */\nexport interface MergeConflict {\n  /**\n   * Type of conflict detected\n   */\n  type: ConflictType;\n\n  /**\n   * Human-readable description of the conflict\n   */\n  message: string;\n\n  /**\n   * Line number in the merged output where conflict appears\n   * (Computed during result building)\n   */\n  location: number;\n\n  /**\n   * Identity of the conflicting entry (for unique keying)\n   */\n  identity: EntryIdentity;\n\n  /**\n   * The base entry (common ancestor), if applicable\n   */\n  base?: Entry;\n\n  /**\n   * The ours entry (local/current version)\n   */\n  ours?: Entry;\n\n  /**\n   * The theirs entry (incoming version)\n   */\n  theirs?: Entry;\n\n  /**\n   * Additional context about the conflict\n   */\n  context?: ConflictContext;\n}\n\n/**\n * A conflict detection rule\n */\nexport interface ConflictRule {\n  /**\n   * Rule identifier\n   */\n  name: string;\n\n  /**\n   * Check if this rule applies to a match\n   * @returns MergeConflict if conflict detected, null otherwise\n   */\n  detect: (match: EntryMatch) => MergeConflict | null;\n}\n\n/**\n * Detect conflicts in matched entries\n *\n * @param matches - Array of matched entry triplets\n * @param options - Merge options (for custom rules)\n * @returns Array of detected conflicts\n */\nexport function detectConflicts(\n  matches: EntryMatch[],\n  options: MergeOptions = {},\n): MergeConflict[] {\n  const conflicts: MergeConflict[] = [];\n\n  const rules: ConflictRule[] = [...DEFAULT_CONFLICT_RULES, ...(options.conflictRules || [])];\n\n  for (const match of matches) {\n    for (const rule of rules) {\n      const conflict = rule.detect(match);\n      if (conflict) {\n        conflicts.push(conflict);\n        break;\n      }\n    }\n  }\n\n  return conflicts;\n}\n\n/**\n * Default conflict detection rules\n *\n * Rules are applied in order, stopping at first match\n */\nconst DEFAULT_CONFLICT_RULES: ConflictRule[] = [\n  {\n    name: \"duplicate-link-id\",\n    detect: (match) => {\n      if (!match.base && match.ours && match.theirs && match.identity.linkId) {\n        return {\n          type: \"duplicate-link-id\",\n          message: `Both sides created entry with link ID '^${match.identity.linkId}'`,\n          location: 0,\n          identity: match.identity,\n          ours: match.ours,\n          theirs: match.theirs,\n          context: { linkId: match.identity.linkId },\n        };\n      }\n      return null;\n    },\n  },\n\n  {\n    name: \"concurrent-metadata-update\",\n    detect: (match) => {\n      if (!match.base || !match.ours || !match.theirs) {\n        return null;\n      }\n\n      if (\n        match.ours.type !== \"instance_entry\" &&\n        match.ours.type !== \"synthesis_entry\" &&\n        match.ours.type !== \"actualize_entry\"\n      ) {\n        return null;\n      }\n      if (\n        match.theirs.type !== \"instance_entry\" &&\n        match.theirs.type !== \"synthesis_entry\" &&\n        match.theirs.type !== \"actualize_entry\"\n      ) {\n        return null;\n      }\n\n      const baseMetadata = getMetadataMap(match.base);\n      const oursMetadata = getMetadataMap(match.ours);\n      const theirsMetadata = getMetadataMap(match.theirs);\n\n      // Iterate over union of all keys to catch delete-vs-edit conflicts\n      const allKeys = new Set([\n        ...baseMetadata.keys(),\n        ...oursMetadata.keys(),\n        ...theirsMetadata.keys(),\n      ]);\n\n      for (const key of allKeys) {\n        const baseValue = baseMetadata.get(key);\n        const oursValue = oursMetadata.get(key);\n        const theirsValue = theirsMetadata.get(key);\n\n        // Conflict if both sides changed from base differently\n        if (oursValue !== baseValue && theirsValue !== baseValue && oursValue !== theirsValue) {\n          return {\n            type: \"concurrent-metadata-update\",\n            message: `Both sides modified metadata key '${key}'`,\n            location: 0,\n            identity: match.identity,\n            base: match.base,\n            ours: match.ours,\n            theirs: match.theirs,\n            context: { metadataKey: key },\n          };\n        }\n      }\n\n      return null;\n    },\n  },\n\n  {\n    name: \"concurrent-content-edit\",\n    detect: (match) => {\n      if (!match.base || !match.ours || !match.theirs) {\n        return null;\n      }\n\n      const baseContent = getEntryContent(match.base);\n      const oursContent = getEntryContent(match.ours);\n      const theirsContent = getEntryContent(match.theirs);\n\n      if (!baseContent) {\n        return null;\n      }\n\n      const oursChanged = !contentEquals(baseContent, oursContent);\n      const theirsChanged = !contentEquals(baseContent, theirsContent);\n      const different = !contentEquals(oursContent, theirsContent);\n\n      if (oursChanged && theirsChanged && different) {\n        return {\n          type: \"concurrent-content-edit\",\n          message: \"Both sides modified content\",\n          location: 0,\n          identity: match.identity,\n          base: match.base,\n          ours: match.ours,\n          theirs: match.theirs,\n        };\n      }\n\n      return null;\n    },\n  },\n\n  {\n    name: \"incompatible-schema-change\",\n    detect: (match) => {\n      if (match.ours?.type !== \"schema_entry\" || match.theirs?.type !== \"schema_entry\") {\n        return null;\n      }\n\n      if (!match.base) {\n        if (!schemaEntriesEqual(match.ours, match.theirs)) {\n          return {\n            type: \"incompatible-schema-change\",\n            message: \"Both sides defined same entity with different schemas\",\n            location: 0,\n            identity: match.identity,\n            ours: match.ours,\n            theirs: match.theirs,\n          };\n        }\n        return null;\n      }\n\n      if (match.base.type !== \"schema_entry\") {\n        return null;\n      }\n\n      // Check metadata fields\n      const oursFields = getSchemaFields(match.ours);\n      const theirsFields = getSchemaFields(match.theirs);\n      const baseFields = getSchemaFields(match.base);\n\n      for (const [fieldName, oursField] of oursFields) {\n        const baseField = baseFields.get(fieldName);\n        const theirsField = theirsFields.get(fieldName);\n\n        if (oursField !== baseField && theirsField !== baseField && oursField !== theirsField) {\n          return {\n            type: \"incompatible-schema-change\",\n            message: `Both sides modified schema field '${fieldName}' differently`,\n            location: 0,\n            identity: match.identity,\n            base: match.base,\n            ours: match.ours,\n            theirs: match.theirs,\n            context: { fieldName },\n          };\n        }\n      }\n\n      // Check section definitions\n      const oursSections = getSchemaSections(match.ours);\n      const theirsSections = getSchemaSections(match.theirs);\n      const baseSections = getSchemaSections(match.base);\n\n      const allSectionNames = new Set([\n        ...baseSections.keys(),\n        ...oursSections.keys(),\n        ...theirsSections.keys(),\n      ]);\n\n      for (const sectionName of allSectionNames) {\n        const baseSection = baseSections.get(sectionName);\n        const oursSection = oursSections.get(sectionName);\n        const theirsSection = theirsSections.get(sectionName);\n\n        if (\n          oursSection !== baseSection &&\n          theirsSection !== baseSection &&\n          oursSection !== theirsSection\n        ) {\n          return {\n            type: \"incompatible-schema-change\",\n            message: `Both sides modified section '${sectionName}' differently`,\n            location: 0,\n            identity: match.identity,\n            base: match.base,\n            ours: match.ours,\n            theirs: match.theirs,\n            context: { fieldName: sectionName },\n          };\n        }\n      }\n\n      // Check removed fields\n      const oursRemovedFields = getRemovedFields(match.ours);\n      const theirsRemovedFields = getRemovedFields(match.theirs);\n      const baseRemovedFields = getRemovedFields(match.base);\n\n      const allRemovedFieldNames = new Set([\n        ...baseRemovedFields.keys(),\n        ...oursRemovedFields.keys(),\n        ...theirsRemovedFields.keys(),\n      ]);\n\n      for (const fieldName of allRemovedFieldNames) {\n        const baseRemoved = baseRemovedFields.get(fieldName);\n        const oursRemoved = oursRemovedFields.get(fieldName);\n        const theirsRemoved = theirsRemovedFields.get(fieldName);\n\n        if (\n          oursRemoved !== baseRemoved &&\n          theirsRemoved !== baseRemoved &&\n          oursRemoved !== theirsRemoved\n        ) {\n          return {\n            type: \"incompatible-schema-change\",\n            message: `Both sides modified field removal '${fieldName}' differently`,\n            location: 0,\n            identity: match.identity,\n            base: match.base,\n            ours: match.ours,\n            theirs: match.theirs,\n            context: { fieldName },\n          };\n        }\n      }\n\n      // Check removed sections\n      const oursRemovedSections = getRemovedSections(match.ours);\n      const theirsRemovedSections = getRemovedSections(match.theirs);\n      const baseRemovedSections = getRemovedSections(match.base);\n\n      const allRemovedSectionNames = new Set([\n        ...baseRemovedSections.keys(),\n        ...oursRemovedSections.keys(),\n        ...theirsRemovedSections.keys(),\n      ]);\n\n      for (const sectionName of allRemovedSectionNames) {\n        const baseRemoved = baseRemovedSections.get(sectionName);\n        const oursRemoved = oursRemovedSections.get(sectionName);\n        const theirsRemoved = theirsRemovedSections.get(sectionName);\n\n        if (\n          oursRemoved !== baseRemoved &&\n          theirsRemoved !== baseRemoved &&\n          oursRemoved !== theirsRemoved\n        ) {\n          return {\n            type: \"incompatible-schema-change\",\n            message: `Both sides modified section removal '${sectionName}' differently`,\n            location: 0,\n            identity: match.identity,\n            base: match.base,\n            ours: match.ours,\n            theirs: match.theirs,\n            context: { fieldName: sectionName },\n          };\n        }\n      }\n\n      return null;\n    },\n  },\n\n  {\n    name: \"concurrent-title-change\",\n    detect: (match) => {\n      if (!match.base || !match.ours || !match.theirs) {\n        return null;\n      }\n\n      const baseTitle = getEntryTitle(match.base);\n      const oursTitle = getEntryTitle(match.ours);\n      const theirsTitle = getEntryTitle(match.theirs);\n\n      if (baseTitle !== oursTitle && baseTitle !== theirsTitle && oursTitle !== theirsTitle) {\n        return {\n          type: \"concurrent-title-change\",\n          message: \"Both sides changed entry title\",\n          location: 0,\n          identity: match.identity,\n          base: match.base,\n          ours: match.ours,\n          theirs: match.theirs,\n        };\n      }\n\n      return null;\n    },\n  },\n];\n\n/**\n * Get metadata as a map from key to raw value\n */\nfunction getMetadataMap(entry: Entry): Map<string, string> {\n  const map = new Map<string, string>();\n\n  if (\n    entry.type === \"instance_entry\" ||\n    entry.type === \"synthesis_entry\" ||\n    entry.type === \"actualize_entry\"\n  ) {\n    for (const meta of entry.metadata) {\n      map.set(meta.key.value, meta.value.raw);\n    }\n  }\n\n  return map;\n}\n\n/**\n * Get content from an entry\n */\nfunction getEntryContent(entry: Entry): Content | null {\n  if (entry.type === \"instance_entry\" || entry.type === \"synthesis_entry\") {\n    return entry.content;\n  }\n  return null;\n}\n\n/**\n * Check if two content nodes are equal\n */\nfunction contentEquals(a: Content | null, b: Content | null): boolean {\n  if (a === null && b === null) {\n    return true;\n  }\n  if (a === null || b === null) {\n    return false;\n  }\n\n  if (a.children.length !== b.children.length) {\n    return false;\n  }\n\n  for (let i = 0; i < a.children.length; i++) {\n    const childA = a.children[i];\n    const childB = b.children[i];\n\n    if (childA.type !== childB.type) {\n      return false;\n    }\n    if (childA.text !== childB.text) {\n      return false;\n    }\n  }\n\n  return true;\n}\n\n/**\n * Check if two schema entries are equal\n */\nfunction schemaEntriesEqual(a: Entry, b: Entry): boolean {\n  if (a.type !== \"schema_entry\" || b.type !== \"schema_entry\") {\n    return false;\n  }\n\n  // Check metadata fields\n  const aFields = getSchemaFields(a);\n  const bFields = getSchemaFields(b);\n\n  if (aFields.size !== bFields.size) {\n    return false;\n  }\n\n  for (const [key, value] of aFields) {\n    if (bFields.get(key) !== value) {\n      return false;\n    }\n  }\n\n  // Check sections\n  const aSections = getSchemaSections(a);\n  const bSections = getSchemaSections(b);\n\n  if (aSections.size !== bSections.size) {\n    return false;\n  }\n\n  for (const [key, value] of aSections) {\n    if (bSections.get(key) !== value) {\n      return false;\n    }\n  }\n\n  // Check removed fields\n  const aRemovedFields = getRemovedFields(a);\n  const bRemovedFields = getRemovedFields(b);\n\n  if (aRemovedFields.size !== bRemovedFields.size) {\n    return false;\n  }\n\n  for (const [key, value] of aRemovedFields) {\n    if (bRemovedFields.get(key) !== value) {\n      return false;\n    }\n  }\n\n  // Check removed sections\n  const aRemovedSections = getRemovedSections(a);\n  const bRemovedSections = getRemovedSections(b);\n\n  if (aRemovedSections.size !== bRemovedSections.size) {\n    return false;\n  }\n\n  for (const [key, value] of aRemovedSections) {\n    if (bRemovedSections.get(key) !== value) {\n      return false;\n    }\n  }\n\n  return true;\n}\n\n/**\n * Get schema fields as a map from field name to serialized definition\n */\nfunction getSchemaFields(entry: Entry): Map<string, string> {\n  const map = new Map<string, string>();\n\n  if (entry.type !== \"schema_entry\") {\n    return map;\n  }\n\n  if (entry.metadataBlock) {\n    for (const field of entry.metadataBlock.fields) {\n      map.set(`field:${field.name.value}`, serializeFieldDef(field));\n    }\n  }\n\n  return map;\n}\n\n/**\n * Get schema sections as a map from section name to serialized definition\n */\nfunction getSchemaSections(entry: Entry): Map<string, string> {\n  const map = new Map<string, string>();\n\n  if (entry.type !== \"schema_entry\") {\n    return map;\n  }\n\n  if (entry.sectionsBlock) {\n    for (const section of entry.sectionsBlock.sections) {\n      map.set(\n        section.name.value,\n        JSON.stringify({\n          optional: section.optional,\n          description: section.description?.value ?? null,\n        }),\n      );\n    }\n  }\n\n  return map;\n}\n\n/**\n * Get removed schema fields as a map\n */\nfunction getRemovedFields(entry: Entry): Map<string, string> {\n  const map = new Map<string, string>();\n\n  if (entry.type !== \"schema_entry\") {\n    return map;\n  }\n\n  if (entry.removeMetadataBlock) {\n    for (const removal of entry.removeMetadataBlock.fields) {\n      map.set(removal.name.value, removal.reason?.value ?? \"\");\n    }\n  }\n\n  return map;\n}\n\n/**\n * Get removed schema sections as a map\n */\nfunction getRemovedSections(entry: Entry): Map<string, string> {\n  const map = new Map<string, string>();\n\n  if (entry.type !== \"schema_entry\") {\n    return map;\n  }\n\n  if (entry.removeSectionsBlock) {\n    for (const removal of entry.removeSectionsBlock.sections) {\n      map.set(removal.name.value, removal.reason?.value ?? \"\");\n    }\n  }\n\n  return map;\n}\n\n/**\n * Serialize a field definition to a string for comparison\n */\nfunction serializeFieldDef(field: FieldDefinition): string {\n  return JSON.stringify({\n    optional: field.optional,\n    type: serializeTypeExpr(field.typeExpr),\n    defaultValue: field.defaultValue ? field.defaultValue.raw : null,\n    description: field.description ? field.description.value : null,\n  });\n}\n\n/**\n * Serialize a type expression to a string\n */\nfunction serializeTypeExpr(typeExpr: FieldDefinition[\"typeExpr\"]): string {\n  switch (typeExpr.type) {\n    case \"primitive_type\":\n      return typeExpr.name;\n    case \"literal_type\":\n      return `\"${typeExpr.value}\"`;\n    case \"array_type\":\n      return `${serializeTypeExpr(typeExpr.elementType)}[]`;\n    case \"union_type\":\n      return typeExpr.members.map((m) => serializeTypeExpr(m)).join(\" | \");\n    default:\n      return \"unknown\";\n  }\n}\n\n/**\n * Get entry title\n */\nfunction getEntryTitle(entry: Entry): string {\n  switch (entry.type) {\n    case \"instance_entry\":\n    case \"schema_entry\":\n    case \"synthesis_entry\":\n      return entry.header.title.value;\n    case \"actualize_entry\":\n      return \"\";\n    default:\n      return \"\";\n  }\n}\n"],"mappings":"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"}

package/dist/merge/conflict-formatter.js

@@ -0,0 +1,143 @@
+//#region src/merge/conflict-formatter.ts
+/**
+* Format a conflict with Git-style markers
+*
+* @param conflict - The conflict to format
+* @param options - Merge options (for marker style)
+* @returns Array of lines representing the conflict
+*/
+function formatConflict(conflict, options = {}) {
+	const lines = [];
+	const showBase = options.showBase || options.markerStyle === "diff3";
+	lines.push("<<<<<<< ours");
+	if (conflict.ours) lines.push(...formatEntry(conflict.ours));
+	if (showBase && conflict.base) {
+		lines.push("||||||| base");
+		lines.push(...formatEntry(conflict.base));
+	}
+	lines.push("=======");
+	if (conflict.theirs) lines.push(...formatEntry(conflict.theirs));
+	lines.push(">>>>>>> theirs");
+	return lines;
+}
+/**
+* Format an entry back to source text
+*
+* Reconstructs source from AST nodes
+*
+* @param entry - Entry to format
+* @returns Array of source lines
+*/
+function formatEntry(entry) {
+	const lines = [];
+	lines.push(formatHeader(entry));
+	if (entry.type === "instance_entry" || entry.type === "synthesis_entry" || entry.type === "actualize_entry") for (const meta of entry.metadata) lines.push(`  ${meta.key.value}: ${meta.value.raw}`);
+	if (entry.type === "instance_entry" || entry.type === "synthesis_entry") {
+		if (entry.content) {
+			lines.push("");
+			for (const child of entry.content.children) lines.push(`  ${child.text}`);
+		}
+	}
+	if (entry.type === "schema_entry") {
+		if (entry.metadataBlock) {
+			lines.push("  # Metadata");
+			for (const field of entry.metadataBlock.fields) lines.push(`  ${formatFieldDefinition(field)}`);
+		}
+		if (entry.sectionsBlock) {
+			lines.push("  # Sections");
+			for (const section of entry.sectionsBlock.sections) lines.push(`  ${formatSectionDefinition(section)}`);
+		}
+		if (entry.removeMetadataBlock) {
+			lines.push("  # Remove Metadata");
+			for (const removal of entry.removeMetadataBlock.fields) lines.push(`  ${removal.name.value}`);
+		}
+		if (entry.removeSectionsBlock) {
+			lines.push("  # Remove Sections");
+			for (const removal of entry.removeSectionsBlock.sections) lines.push(`  ${removal.name.value}`);
+		}
+	}
+	return lines;
+}
+/**
+* Format entry header
+*/
+function formatHeader(entry) {
+	switch (entry.type) {
+		case "instance_entry": {
+			const h = entry.header;
+			const parts = [
+				h.timestamp.value,
+				h.directive,
+				h.entity,
+				`"${h.title.value}"`
+			];
+			if (h.link) parts.push(`^${h.link.id}`);
+			for (const tag of h.tags) parts.push(`#${tag.name}`);
+			return parts.join(" ");
+		}
+		case "schema_entry": {
+			const h = entry.header;
+			const parts = [
+				h.timestamp.value,
+				h.directive,
+				h.entityName.value,
+				`"${h.title.value}"`
+			];
+			if (h.link) parts.push(`^${h.link.id}`);
+			for (const tag of h.tags) parts.push(`#${tag.name}`);
+			return parts.join(" ");
+		}
+		case "synthesis_entry": {
+			const h = entry.header;
+			const parts = [
+				h.timestamp.value,
+				"define-synthesis",
+				`"${h.title.value}"`,
+				`^${h.linkId.id}`
+			];
+			for (const tag of h.tags) parts.push(`#${tag.name}`);
+			return parts.join(" ");
+		}
+		case "actualize_entry": {
+			const h = entry.header;
+			return `${h.timestamp.value} actualize-synthesis ^${h.target.id}`;
+		}
+		default: return "";
+	}
+}
+/**
+* Format a field definition
+*/
+function formatFieldDefinition(field) {
+	let result = field.name.value;
+	if (field.optional) result += "?";
+	result += `: ${formatTypeExpr(field.typeExpr)}`;
+	if (field.defaultValue) result += ` = ${field.defaultValue.raw}`;
+	if (field.description) result += ` ; ${field.description.value}`;
+	return result;
+}
+/**
+* Format a section definition
+*/
+function formatSectionDefinition(section) {
+	let result = section.name.value;
+	if (section.optional) result += "?";
+	if (section.description) result += ` ; ${section.description.value}`;
+	return result;
+}
+/**
+* Format a type expression
+*/
+function formatTypeExpr(typeExpr) {
+	switch (typeExpr.type) {
+		case "primitive_type": return typeExpr.name ?? "unknown";
+		case "literal_type": return `"${typeExpr.value}"`;
+		case "array_type": return typeExpr.elementType ? `${formatTypeExpr(typeExpr.elementType)}[]` : "unknown[]";
+		case "union_type": return typeExpr.members ? typeExpr.members.map((m) => formatTypeExpr(m)).join(" | ") : "unknown";
+		default: return "unknown";
+	}
+}
+
+//#endregion
+export { formatConflict, formatEntry };
+//# sourceMappingURL=conflict-formatter.js.map

package/dist/merge/conflict-formatter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-formatter.js","names":["lines: string[]"],"sources":["../../src/merge/conflict-formatter.ts"],"sourcesContent":["import type { Entry } from \"../ast/ast-types.js\";\nimport type { MergeConflict } from \"./conflict-detector.js\";\nimport type { MergeOptions } from \"./driver.js\";\n\n/**\n * Format a conflict with Git-style markers\n *\n * @param conflict - The conflict to format\n * @param options - Merge options (for marker style)\n * @returns Array of lines representing the conflict\n */\nexport function formatConflict(conflict: MergeConflict, options: MergeOptions = {}): string[] {\n  const lines: string[] = [];\n  const showBase = options.showBase || options.markerStyle === \"diff3\";\n\n  lines.push(\"<<<<<<< ours\");\n  if (conflict.ours) {\n    lines.push(...formatEntry(conflict.ours));\n  }\n\n  if (showBase && conflict.base) {\n    lines.push(\"||||||| base\");\n    lines.push(...formatEntry(conflict.base));\n  }\n\n  lines.push(\"=======\");\n  if (conflict.theirs) {\n    lines.push(...formatEntry(conflict.theirs));\n  }\n  lines.push(\">>>>>>> theirs\");\n\n  return lines;\n}\n\n/**\n * Format an entry back to source text\n *\n * Reconstructs source from AST nodes\n *\n * @param entry - Entry to format\n * @returns Array of source lines\n */\nexport function formatEntry(entry: Entry): string[] {\n  const lines: string[] = [];\n\n  lines.push(formatHeader(entry));\n\n  if (\n    entry.type === \"instance_entry\" ||\n    entry.type === \"synthesis_entry\" ||\n    entry.type === \"actualize_entry\"\n  ) {\n    for (const meta of entry.metadata) {\n      lines.push(`  ${meta.key.value}: ${meta.value.raw}`);\n    }\n  }\n\n  if (entry.type === \"instance_entry\" || entry.type === \"synthesis_entry\") {\n    if (entry.content) {\n      lines.push(\"\");\n      for (const child of entry.content.children) {\n        lines.push(`  ${child.text}`);\n      }\n    }\n  }\n\n  if (entry.type === \"schema_entry\") {\n    if (entry.metadataBlock) {\n      lines.push(\"  # Metadata\");\n      for (const field of entry.metadataBlock.fields) {\n        lines.push(`  ${formatFieldDefinition(field)}`);\n      }\n    }\n\n    if (entry.sectionsBlock) {\n      lines.push(\"  # Sections\");\n      for (const section of entry.sectionsBlock.sections) {\n        lines.push(`  ${formatSectionDefinition(section)}`);\n      }\n    }\n\n    if (entry.removeMetadataBlock) {\n      lines.push(\"  # Remove Metadata\");\n      for (const removal of entry.removeMetadataBlock.fields) {\n        lines.push(`  ${removal.name.value}`);\n      }\n    }\n\n    if (entry.removeSectionsBlock) {\n      lines.push(\"  # Remove Sections\");\n      for (const removal of entry.removeSectionsBlock.sections) {\n        lines.push(`  ${removal.name.value}`);\n      }\n    }\n  }\n\n  return lines;\n}\n\n/**\n * Format entry header\n */\nfunction formatHeader(entry: Entry): string {\n  switch (entry.type) {\n    case \"instance_entry\": {\n      const h = entry.header;\n      const parts = [h.timestamp.value, h.directive, h.entity, `\"${h.title.value}\"`];\n      if (h.link) {\n        parts.push(`^${h.link.id}`);\n      }\n      for (const tag of h.tags) {\n        parts.push(`#${tag.name}`);\n      }\n      return parts.join(\" \");\n    }\n\n    case \"schema_entry\": {\n      const h = entry.header;\n      const parts = [h.timestamp.value, h.directive, h.entityName.value, `\"${h.title.value}\"`];\n      if (h.link) {\n        parts.push(`^${h.link.id}`);\n      }\n      for (const tag of h.tags) {\n        parts.push(`#${tag.name}`);\n      }\n      return parts.join(\" \");\n    }\n\n    case \"synthesis_entry\": {\n      const h = entry.header;\n      const parts = [\n        h.timestamp.value,\n        \"define-synthesis\",\n        `\"${h.title.value}\"`,\n        `^${h.linkId.id}`,\n      ];\n      for (const tag of h.tags) {\n        parts.push(`#${tag.name}`);\n      }\n      return parts.join(\" \");\n    }\n\n    case \"actualize_entry\": {\n      const h = entry.header;\n      return `${h.timestamp.value} actualize-synthesis ^${h.target.id}`;\n    }\n\n    default:\n      return \"\";\n  }\n}\n\n/**\n * Format a field definition\n */\nfunction formatFieldDefinition(field: {\n  name: { value: string };\n  optional: boolean;\n  typeExpr: {\n    type: string;\n    name?: string;\n    value?: string;\n    elementType?: unknown;\n    members?: unknown[];\n  };\n  defaultValue?: { raw: string } | null;\n  description?: { value: string } | null;\n}): string {\n  let result = field.name.value;\n  if (field.optional) {\n    result += \"?\";\n  }\n  result += `: ${formatTypeExpr(field.typeExpr)}`;\n  if (field.defaultValue) {\n    result += ` = ${field.defaultValue.raw}`;\n  }\n  if (field.description) {\n    result += ` ; ${field.description.value}`;\n  }\n  return result;\n}\n\n/**\n * Format a section definition\n */\nfunction formatSectionDefinition(section: {\n  name: { value: string };\n  optional: boolean;\n  description?: { value: string } | null;\n}): string {\n  let result = section.name.value;\n  if (section.optional) {\n    result += \"?\";\n  }\n  if (section.description) {\n    result += ` ; ${section.description.value}`;\n  }\n  return result;\n}\n\n/**\n * Format a type expression\n */\nfunction formatTypeExpr(typeExpr: {\n  type: string;\n  name?: string;\n  value?: string;\n  elementType?: unknown;\n  members?: unknown[];\n}): string {\n  switch (typeExpr.type) {\n    case \"primitive_type\":\n      return typeExpr.name ?? \"unknown\";\n\n    case \"literal_type\":\n      return `\"${typeExpr.value}\"`;\n\n    case \"array_type\":\n      return typeExpr.elementType\n        ? `${formatTypeExpr(typeExpr.elementType as typeof typeExpr)}[]`\n        : \"unknown[]\";\n\n    case \"union_type\":\n      return typeExpr.members\n        ? (typeExpr.members as (typeof typeExpr)[]).map((m) => formatTypeExpr(m)).join(\" | \")\n        : \"unknown\";\n\n    default:\n      return \"unknown\";\n  }\n}\n"],"mappings":"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"}

package/dist/merge/driver.d.ts

@@ -0,0 +1,54 @@
+import { ConflictRule } from "./conflict-detector.js";
+import { MergeResult } from "./merge-result-builder.js";
+
+//#region src/merge/driver.d.ts
+
+/**
+ * Options for the merge driver
+ */
+interface MergeOptions {
+  /**
+   * Conflict marker style
+   * - "git": Standard Git style (ours/theirs)
+   * - "diff3": Include base section
+   */
+  markerStyle?: "git" | "diff3";
+  /**
+   * Whether to include base in markers (diff3 style)
+   * Deprecated: Use markerStyle: "diff3" instead
+   */
+  showBase?: boolean;
+  /**
+   * Custom conflict detection rules
+   * Applied after default rules
+   */
+  conflictRules?: ConflictRule[];
+}
+/**
+ * Perform three-way merge of thalo files
+ *
+ * This is the main entry point for the merge driver.
+ * It parses all three versions, matches entries, detects conflicts,
+ * and produces a merged result.
+ *
+ * @param base - Base version content (common ancestor)
+ * @param ours - Our version content (local changes)
+ * @param theirs - Their version content (incoming changes)
+ * @param options - Merge options
+ * @returns MergeResult with merged content and conflict information
+ *
+ * @example
+ * ```typescript
+ * const base = '2026-01-01T00:00Z define-entity lore "Lore"';
+ * const ours = base + '\n2026-01-02T00:00Z create lore "My entry" ^entry1';
+ * const theirs = base + '\n2026-01-03T00:00Z create lore "Their entry" ^entry2';
+ *
+ * const result = mergeThaloFiles(base, ours, theirs);
+ * console.log(result.success); // true
+ * console.log(result.content); // Merged content with both entries
+ * ```
+ */
+declare function mergeThaloFiles(base: string, ours: string, theirs: string, options?: MergeOptions): MergeResult;
+//#endregion
+export { MergeOptions, mergeThaloFiles };
+//# sourceMappingURL=driver.d.ts.map

package/dist/merge/driver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"driver.d.ts","names":[],"sources":["../../src/merge/driver.ts"],"sourcesContent":[],"mappings":";;;;;;;AAWA;AA6CgB,UA7CC,YAAA,CA6Cc;;;;;;;;;;;;;;;;kBA3Bb;;;;;;;;;;;;;;;;;;;;;;;;;;iBA2BF,eAAA,uDAIL,eACR"}