@rejot-dev/thalo 0.0.0

package/dist/git/git.js

@@ -0,0 +1,240 @@
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+
+//#region src/git/git.ts
+const execFileAsync = promisify(execFile);
+/**
+* Run a git command and return stdout, or null if it fails
+*/
+async function runGit(args, cwd) {
+	try {
+		return await execFileAsync("git", args, {
+			cwd,
+			maxBuffer: 10 * 1024 * 1024
+		});
+	} catch {
+		return null;
+	}
+}
+/**
+* Detect git context for a directory.
+*
+* Returns information about whether the directory is in a git repo,
+* the repo root, and current commit hash.
+*
+* @param cwd - Directory to check
+* @returns Git context information
+*/
+async function detectGitContext(cwd) {
+	const revParseResult = await runGit(["rev-parse", "--is-inside-work-tree"], cwd);
+	if (!revParseResult || revParseResult.stdout.trim() !== "true") return { isGitRepo: false };
+	return {
+		isGitRepo: true,
+		rootDir: (await runGit(["rev-parse", "--show-toplevel"], cwd))?.stdout.trim(),
+		currentCommit: (await runGit(["rev-parse", "HEAD"], cwd))?.stdout.trim()
+	};
+}
+/**
+* Get the current HEAD commit hash.
+*
+* @param cwd - Directory to check
+* @returns Commit hash or null if not in a git repo
+*/
+async function getCurrentCommit(cwd) {
+	return (await runGit(["rev-parse", "HEAD"], cwd))?.stdout.trim() ?? null;
+}
+/**
+* Get list of files changed since a commit with rename detection.
+*
+* Uses `git diff -M --name-status` to detect renames and returns structured change info.
+*
+* @param commit - Base commit to compare against
+* @param cwd - Working directory
+* @returns Array of file changes (relative to repo root)
+*/
+async function getFilesChangedSince(commit, cwd) {
+	const result = await runGit([
+		"diff",
+		"-M",
+		"--name-status",
+		`${commit}..HEAD`
+	], cwd);
+	if (!result) return [];
+	return result.stdout.trim().split("\n").filter((line) => line.length > 0).map((line) => {
+		const parts = line.split("	");
+		const statusCode = parts[0];
+		if (statusCode.startsWith("R")) {
+			if (parts.length < 3) return {
+				status: "modified",
+				path: parts[1] ?? ""
+			};
+			return {
+				status: "renamed",
+				oldPath: parts[1],
+				path: parts[2]
+			};
+		}
+		const status = statusCode === "A" ? "added" : statusCode === "D" ? "deleted" : "modified";
+		if (parts.length < 2) return {
+			status: "modified",
+			path: ""
+		};
+		return {
+			status,
+			path: parts[1]
+		};
+	}).filter((change) => change.path.length > 0);
+}
+/**
+* Get file content at a specific commit.
+*
+* @param file - File path (relative to repo root or absolute)
+* @param commit - Commit hash to retrieve content from
+* @param cwd - Working directory (for finding repo root)
+* @returns File content at that commit, or null if file doesn't exist at commit
+*/
+async function getFileAtCommit(file, commit, cwd) {
+	const rootResult = await runGit(["rev-parse", "--show-toplevel"], cwd);
+	if (!rootResult) return null;
+	const repoRoot = rootResult.stdout.trim();
+	let gitPath;
+	if (path.isAbsolute(file)) {
+		const relativePath = path.relative(repoRoot, file);
+		if (relativePath.startsWith("..")) return null;
+		gitPath = relativePath.split(path.sep).join("/");
+	} else gitPath = file.replace(/\\/g, "/");
+	return (await runGit(["show", `${commit}:${gitPath}`], cwd))?.stdout ?? null;
+}
+/**
+* Read the set of ignored revs for blame-like operations, if configured.
+*
+* Prefers the de-facto standard `.git-blame-ignore-revs` at the repo root, and
+* falls back to `blame.ignoreRevsFile` git config if set.
+*
+* Returns the rev SHAs (one per line) or null if no ignore revs are configured.
+*
+* @param cwd - Working directory
+* @returns Array of ignored revs (as strings) or null
+*/
+async function getBlameIgnoreRevs(cwd) {
+	const rootResult = await runGit(["rev-parse", "--show-toplevel"], cwd);
+	if (!rootResult) return null;
+	const repoRoot = rootResult.stdout.trim();
+	async function readIgnoreFile(filePath) {
+		try {
+			const revs = (await fs.readFile(filePath, "utf8")).split("\n").map((l) => l.trim()).filter((l) => l.length > 0 && !l.startsWith("#")).map((l) => l.split(/\s+/)[0]);
+			return revs.length > 0 ? revs : null;
+		} catch {
+			return null;
+		}
+	}
+	const standardRevs = await readIgnoreFile(path.join(repoRoot, ".git-blame-ignore-revs"));
+	if (standardRevs) return standardRevs;
+	const configPathRaw = (await runGit([
+		"config",
+		"--get",
+		"blame.ignoreRevsFile"
+	], cwd))?.stdout.trim();
+	if (!configPathRaw) return null;
+	return await readIgnoreFile(path.isAbsolute(configPathRaw) ? configPathRaw : path.resolve(repoRoot, configPathRaw));
+}
+/**
+* Check whether `ancestorCommit` is an ancestor of `descendantCommit`.
+*
+* Uses `git merge-base ancestor descendant` and compares the result to the ancestor.
+*/
+async function isCommitAncestorOf(ancestorCommit, descendantCommit, cwd) {
+	const result = await runGit([
+		"merge-base",
+		ancestorCommit,
+		descendantCommit
+	], cwd);
+	return result !== null && result.stdout.trim() === ancestorCommit;
+}
+/**
+* Get the set of commits currently blamed for a line range.
+*
+* @param file - File path (relative to repo root or absolute)
+* @param startLine - 1-based inclusive start line
+* @param endLine - 1-based inclusive end line
+* @param cwd - Working directory
+* @param ignoreRevsFile - Optional absolute path to ignore revs file
+*/
+async function getBlameCommitsForLineRange(file, startLine, endLine, cwd, ignoreRevs) {
+	const rootResult = await runGit(["rev-parse", "--show-toplevel"], cwd);
+	if (!rootResult) return /* @__PURE__ */ new Set();
+	const repoRoot = rootResult.stdout.trim();
+	let gitPath;
+	if (path.isAbsolute(file)) {
+		const relativePath = path.relative(repoRoot, file);
+		if (relativePath.startsWith("..")) return /* @__PURE__ */ new Set();
+		gitPath = relativePath.split(path.sep).join("/");
+	} else gitPath = file.replace(/\\/g, "/");
+	const args = [
+		"blame",
+		"--porcelain",
+		"-L",
+		`${startLine},${endLine}`
+	];
+	if (ignoreRevs && ignoreRevs.length > 0) for (const rev of ignoreRevs) args.push("--ignore-rev", rev);
+	args.push("HEAD", "--", gitPath);
+	const result = await runGit(args, cwd);
+	if (!result) return /* @__PURE__ */ new Set();
+	const commits = /* @__PURE__ */ new Set();
+	for (const line of result.stdout.split("\n")) if (/^[0-9a-f]{40}\s/.test(line)) commits.add(line.slice(0, 40));
+	return commits;
+}
+/**
+* Check if a commit exists in the repository.
+*
+* @param commit - Commit hash to check
+* @param cwd - Working directory
+* @returns true if commit exists, false otherwise
+*/
+async function commitExists(commit, cwd) {
+	const result = await runGit([
+		"cat-file",
+		"-t",
+		commit
+	], cwd);
+	return result !== null && result.stdout.trim() === "commit";
+}
+/**
+* Get list of files with uncommitted changes (staged or unstaged).
+*
+* @param cwd - Working directory
+* @param files - Optional list of files to filter (relative to repo root or absolute)
+* @returns Array of file paths (relative to repo root) with uncommitted changes
+*/
+async function getUncommittedFiles(cwd, files) {
+	const rootResult = await runGit(["rev-parse", "--show-toplevel"], cwd);
+	if (!rootResult) return [];
+	const repoRoot = rootResult.stdout.trim();
+	const args = [
+		"status",
+		"--porcelain",
+		"--"
+	];
+	if (files && files.length > 0) for (const file of files) {
+		let gitPath;
+		if (path.isAbsolute(file)) {
+			const relativePath = path.relative(repoRoot, file);
+			if (relativePath.startsWith("..")) continue;
+			gitPath = relativePath.split(path.sep).join("/");
+		} else gitPath = file.replace(/\\/g, "/");
+		args.push(gitPath);
+	}
+	const result = await runGit(args, cwd);
+	if (!result) return [];
+	return result.stdout.trim().split("\n").filter((line) => line.length > 0).map((line) => {
+		const filePart = line.slice(3);
+		if (filePart.includes(" -> ")) return filePart.split(" -> ")[1];
+		return filePart;
+	}).filter((f) => f.length > 0);
+}
+
+//#endregion
+export { commitExists, detectGitContext, getBlameCommitsForLineRange, getBlameIgnoreRevs, getCurrentCommit, getFileAtCommit, getFilesChangedSince, getUncommittedFiles, isCommitAncestorOf };
+//# sourceMappingURL=git.js.map

package/dist/git/git.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git.js","names":["gitPath: string"],"sources":["../../src/git/git.ts"],"sourcesContent":["import { execFile } from \"node:child_process\";\nimport { promisify } from \"node:util\";\nimport * as path from \"node:path\";\nimport * as fs from \"node:fs/promises\";\n\nconst execFileAsync = promisify(execFile);\n\n/**\n * Git context information for the current working directory\n */\nexport interface GitContext {\n  /** Whether the directory is inside a git repository */\n  isGitRepo: boolean;\n  /** Root directory of the git repository (if isGitRepo is true) */\n  rootDir?: string;\n  /** Current HEAD commit hash (if isGitRepo is true) */\n  currentCommit?: string;\n}\n\n/**\n * Run a git command and return stdout, or null if it fails\n */\nasync function runGit(\n  args: string[],\n  cwd: string,\n): Promise<{ stdout: string; stderr: string } | null> {\n  try {\n    const result = await execFileAsync(\"git\", args, {\n      cwd,\n      maxBuffer: 10 * 1024 * 1024, // 10MB buffer for large diffs\n    });\n    return result;\n  } catch {\n    return null;\n  }\n}\n\n/**\n * Detect git context for a directory.\n *\n * Returns information about whether the directory is in a git repo,\n * the repo root, and current commit hash.\n *\n * @param cwd - Directory to check\n * @returns Git context information\n */\nexport async function detectGitContext(cwd: string): Promise<GitContext> {\n  // Check if inside a git repo\n  const revParseResult = await runGit([\"rev-parse\", \"--is-inside-work-tree\"], cwd);\n\n  if (!revParseResult || revParseResult.stdout.trim() !== \"true\") {\n    return { isGitRepo: false };\n  }\n\n  // Get the root directory\n  const rootResult = await runGit([\"rev-parse\", \"--show-toplevel\"], cwd);\n  const rootDir = rootResult?.stdout.trim();\n\n  // Get current commit hash\n  const commitResult = await runGit([\"rev-parse\", \"HEAD\"], cwd);\n  const currentCommit = commitResult?.stdout.trim();\n\n  return {\n    isGitRepo: true,\n    rootDir,\n    currentCommit,\n  };\n}\n\n/**\n * Get the current HEAD commit hash.\n *\n * @param cwd - Directory to check\n * @returns Commit hash or null if not in a git repo\n */\nexport async function getCurrentCommit(cwd: string): Promise<string | null> {\n  const result = await runGit([\"rev-parse\", \"HEAD\"], cwd);\n  return result?.stdout.trim() ?? null;\n}\n\n/**\n * Represents a file change between commits.\n */\nexport interface FileChange {\n  /** Type of change */\n  status: \"added\" | \"modified\" | \"renamed\" | \"deleted\";\n  /** Current path (or new path for renames) */\n  path: string;\n  /** Original path before rename (only for renamed files) */\n  oldPath?: string;\n}\n\n/**\n * Get list of files changed since a commit with rename detection.\n *\n * Uses `git diff -M --name-status` to detect renames and returns structured change info.\n *\n * @param commit - Base commit to compare against\n * @param cwd - Working directory\n * @returns Array of file changes (relative to repo root)\n */\nexport async function getFilesChangedSince(commit: string, cwd: string): Promise<FileChange[]> {\n  const result = await runGit([\"diff\", \"-M\", \"--name-status\", `${commit}..HEAD`], cwd);\n\n  if (!result) {\n    return [];\n  }\n\n  return result.stdout\n    .trim()\n    .split(\"\\n\")\n    .filter((line) => line.length > 0)\n    .map((line): FileChange => {\n      const parts = line.split(\"\\t\");\n      const statusCode = parts[0];\n\n      // Rename: R100\\told/path\\tnew/path (R followed by similarity percentage)\n      if (statusCode.startsWith(\"R\")) {\n        if (parts.length < 3) {\n          // Invalid format, treat as modified with available path\n          return { status: \"modified\", path: parts[1] ?? \"\" };\n        }\n        return {\n          status: \"renamed\",\n          oldPath: parts[1],\n          path: parts[2],\n        };\n      }\n\n      // Other statuses: A (added), M (modified), D (deleted)\n      const status = statusCode === \"A\" ? \"added\" : statusCode === \"D\" ? \"deleted\" : \"modified\";\n\n      if (parts.length < 2) {\n        // Invalid format, skip this entry\n        return { status: \"modified\", path: \"\" };\n      }\n\n      return {\n        status,\n        path: parts[1],\n      };\n    })\n    .filter((change) => change.path.length > 0);\n}\n\n/**\n * Get file content at a specific commit.\n *\n * @param file - File path (relative to repo root or absolute)\n * @param commit - Commit hash to retrieve content from\n * @param cwd - Working directory (for finding repo root)\n * @returns File content at that commit, or null if file doesn't exist at commit\n */\nexport async function getFileAtCommit(\n  file: string,\n  commit: string,\n  cwd: string,\n): Promise<string | null> {\n  // Get repo root to compute relative path\n  const rootResult = await runGit([\"rev-parse\", \"--show-toplevel\"], cwd);\n  if (!rootResult) {\n    return null;\n  }\n  const repoRoot = rootResult.stdout.trim();\n\n  let gitPath: string;\n\n  if (path.isAbsolute(file)) {\n    // For absolute paths, compute relative to repo root\n    const relativePath = path.relative(repoRoot, file);\n\n    // Guard against paths outside repo root\n    if (relativePath.startsWith(\"..\")) {\n      return null;\n    }\n\n    // Normalize to POSIX forward slashes (git requires forward slashes on all platforms)\n    gitPath = relativePath.split(path.sep).join(\"/\");\n  } else {\n    // For relative paths (e.g., from git diff output), they are already repo-root-relative\n    // Just normalize backslashes to forward slashes\n    gitPath = file.replace(/\\\\/g, \"/\");\n  }\n\n  const result = await runGit([\"show\", `${commit}:${gitPath}`], cwd);\n  return result?.stdout ?? null;\n}\n\n/**\n * Read the set of ignored revs for blame-like operations, if configured.\n *\n * Prefers the de-facto standard `.git-blame-ignore-revs` at the repo root, and\n * falls back to `blame.ignoreRevsFile` git config if set.\n *\n * Returns the rev SHAs (one per line) or null if no ignore revs are configured.\n *\n * @param cwd - Working directory\n * @returns Array of ignored revs (as strings) or null\n */\nexport async function getBlameIgnoreRevs(cwd: string): Promise<string[] | null> {\n  const rootResult = await runGit([\"rev-parse\", \"--show-toplevel\"], cwd);\n  if (!rootResult) {\n    return null;\n  }\n  const repoRoot = rootResult.stdout.trim();\n\n  async function readIgnoreFile(filePath: string): Promise<string[] | null> {\n    try {\n      const raw = await fs.readFile(filePath, \"utf8\");\n      const revs = raw\n        .split(\"\\n\")\n        .map((l) => l.trim())\n        .filter((l) => l.length > 0 && !l.startsWith(\"#\"))\n        // Git accepts abbreviated SHAs in ignore revs; keep them as-is\n        .map((l) => l.split(/\\s+/)[0]);\n      return revs.length > 0 ? revs : null;\n    } catch {\n      return null;\n    }\n  }\n\n  const standardPath = path.join(repoRoot, \".git-blame-ignore-revs\");\n  const standardRevs = await readIgnoreFile(standardPath);\n  if (standardRevs) {\n    return standardRevs;\n  }\n\n  const configResult = await runGit([\"config\", \"--get\", \"blame.ignoreRevsFile\"], cwd);\n  const configPathRaw = configResult?.stdout.trim();\n  if (!configPathRaw) {\n    return null;\n  }\n\n  const resolved = path.isAbsolute(configPathRaw)\n    ? configPathRaw\n    : path.resolve(repoRoot, configPathRaw);\n  return await readIgnoreFile(resolved);\n}\n\n/**\n * Check whether `ancestorCommit` is an ancestor of `descendantCommit`.\n *\n * Uses `git merge-base ancestor descendant` and compares the result to the ancestor.\n */\nexport async function isCommitAncestorOf(\n  ancestorCommit: string,\n  descendantCommit: string,\n  cwd: string,\n): Promise<boolean> {\n  const result = await runGit([\"merge-base\", ancestorCommit, descendantCommit], cwd);\n  return result !== null && result.stdout.trim() === ancestorCommit;\n}\n\n/**\n * Get the set of commits currently blamed for a line range.\n *\n * @param file - File path (relative to repo root or absolute)\n * @param startLine - 1-based inclusive start line\n * @param endLine - 1-based inclusive end line\n * @param cwd - Working directory\n * @param ignoreRevsFile - Optional absolute path to ignore revs file\n */\nexport async function getBlameCommitsForLineRange(\n  file: string,\n  startLine: number,\n  endLine: number,\n  cwd: string,\n  ignoreRevs?: string[] | null,\n): Promise<Set<string>> {\n  // Get repo root to compute relative path\n  const rootResult = await runGit([\"rev-parse\", \"--show-toplevel\"], cwd);\n  if (!rootResult) {\n    return new Set();\n  }\n  const repoRoot = rootResult.stdout.trim();\n\n  let gitPath: string;\n  if (path.isAbsolute(file)) {\n    const relativePath = path.relative(repoRoot, file);\n    if (relativePath.startsWith(\"..\")) {\n      return new Set();\n    }\n    gitPath = relativePath.split(path.sep).join(\"/\");\n  } else {\n    gitPath = file.replace(/\\\\/g, \"/\");\n  }\n\n  const args = [\"blame\", \"--porcelain\", \"-L\", `${startLine},${endLine}`];\n  if (ignoreRevs && ignoreRevs.length > 0) {\n    for (const rev of ignoreRevs) {\n      args.push(\"--ignore-rev\", rev);\n    }\n  }\n  args.push(\"HEAD\", \"--\", gitPath);\n\n  const result = await runGit(args, cwd);\n  if (!result) {\n    return new Set();\n  }\n\n  const commits = new Set<string>();\n  for (const line of result.stdout.split(\"\\n\")) {\n    // Porcelain blame header line: \"<sha> <orig-line> <final-line> <num-lines>\"\n    if (/^[0-9a-f]{40}\\s/.test(line)) {\n      commits.add(line.slice(0, 40));\n    }\n  }\n  return commits;\n}\n\n/**\n * Check if a file was modified since a commit.\n *\n * Uses --follow to track the file through renames.\n *\n * @param file - File path to check\n * @param commit - Base commit to compare against\n * @param cwd - Working directory\n * @returns true if file was modified, false otherwise\n */\nexport async function wasFileModifiedSince(\n  file: string,\n  commit: string,\n  cwd: string,\n): Promise<boolean> {\n  // Get repo root to compute relative path\n  const rootResult = await runGit([\"rev-parse\", \"--show-toplevel\"], cwd);\n  if (!rootResult) {\n    return false;\n  }\n  const repoRoot = rootResult.stdout.trim();\n\n  let gitPath: string;\n\n  if (path.isAbsolute(file)) {\n    // For absolute paths, compute relative to repo root\n    const relativePath = path.relative(repoRoot, file);\n\n    // Guard against paths outside repo root\n    if (relativePath.startsWith(\"..\")) {\n      return false;\n    }\n\n    // Normalize to POSIX forward slashes (git requires forward slashes on all platforms)\n    gitPath = relativePath.split(path.sep).join(\"/\");\n  } else {\n    // For relative paths (e.g., from git diff output), they are already repo-root-relative\n    // Just normalize backslashes to forward slashes\n    gitPath = file.replace(/\\\\/g, \"/\");\n  }\n\n  // Use git log with --follow to track through renames\n  const result = await runGit(\n    [\"log\", \"--follow\", \"-1\", \"--format=%H\", `${commit}..HEAD`, \"--\", gitPath],\n    cwd,\n  );\n\n  // If we get a commit hash, the file was modified\n  return result !== null && result.stdout.trim().length > 0;\n}\n\n/**\n * Check if a commit exists in the repository.\n *\n * @param commit - Commit hash to check\n * @param cwd - Working directory\n * @returns true if commit exists, false otherwise\n */\nexport async function commitExists(commit: string, cwd: string): Promise<boolean> {\n  const result = await runGit([\"cat-file\", \"-t\", commit], cwd);\n  return result !== null && result.stdout.trim() === \"commit\";\n}\n\n/**\n * Get list of files with uncommitted changes (staged or unstaged).\n *\n * @param cwd - Working directory\n * @param files - Optional list of files to filter (relative to repo root or absolute)\n * @returns Array of file paths (relative to repo root) with uncommitted changes\n */\nexport async function getUncommittedFiles(cwd: string, files?: string[]): Promise<string[]> {\n  // Get repo root for path normalization\n  const rootResult = await runGit([\"rev-parse\", \"--show-toplevel\"], cwd);\n  if (!rootResult) {\n    return [];\n  }\n  const repoRoot = rootResult.stdout.trim();\n\n  // Build git status command - porcelain gives us stable, parseable output\n  const args = [\"status\", \"--porcelain\", \"--\"];\n\n  if (files && files.length > 0) {\n    // Normalize file paths to be relative to repo root\n    for (const file of files) {\n      let gitPath: string;\n      if (path.isAbsolute(file)) {\n        const relativePath = path.relative(repoRoot, file);\n        if (relativePath.startsWith(\"..\")) {\n          continue; // Skip files outside repo\n        }\n        gitPath = relativePath.split(path.sep).join(\"/\");\n      } else {\n        gitPath = file.replace(/\\\\/g, \"/\");\n      }\n      args.push(gitPath);\n    }\n  }\n\n  const result = await runGit(args, cwd);\n  if (!result) {\n    return [];\n  }\n\n  // Parse porcelain output: \"XY filename\" or \"XY old -> new\" for renames\n  // X = index status, Y = worktree status\n  // We want files where either X or Y indicates a change\n  return result.stdout\n    .trim()\n    .split(\"\\n\")\n    .filter((line) => line.length > 0)\n    .map((line) => {\n      // Skip the status codes (first 3 chars: XY + space)\n      const filePart = line.slice(3);\n      // Handle renames: \"old -> new\"\n      if (filePart.includes(\" -> \")) {\n        return filePart.split(\" -> \")[1];\n      }\n      return filePart;\n    })\n    .filter((f) => f.length > 0);\n}\n"],"mappings":"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"}

package/dist/merge/conflict-detector.d.ts

@@ -0,0 +1,89 @@
+import { Entry } from "../ast/ast-types.js";
+import { EntryIdentity, EntryMatch } from "./entry-matcher.js";
+
+//#region src/merge/conflict-detector.d.ts
+
+/**
+ * Types of conflicts that can be detected
+ */
+type ConflictType = "duplicate-link-id" | "concurrent-metadata-update" | "incompatible-schema-change" | "concurrent-content-edit" | "concurrent-title-change" | "parse-error" | "merge-error";
+/**
+ * Additional context for conflicts
+ */
+interface ConflictContext {
+  /**
+   * The metadata key involved (for metadata conflicts)
+   */
+  metadataKey?: string;
+  /**
+   * The link ID involved (for link conflicts)
+   */
+  linkId?: string;
+  /**
+   * The entity name involved (for schema conflicts)
+   */
+  entityName?: string;
+  /**
+   * The field name involved (for schema field conflicts)
+   */
+  fieldName?: string;
+  /**
+   * Error message (for parse-error and merge-error conflicts)
+   */
+  errorMessage?: string;
+}
+/**
+ * A conflict detected during merging
+ */
+interface MergeConflict {
+  /**
+   * Type of conflict detected
+   */
+  type: ConflictType;
+  /**
+   * Human-readable description of the conflict
+   */
+  message: string;
+  /**
+   * Line number in the merged output where conflict appears
+   * (Computed during result building)
+   */
+  location: number;
+  /**
+   * Identity of the conflicting entry (for unique keying)
+   */
+  identity: EntryIdentity;
+  /**
+   * The base entry (common ancestor), if applicable
+   */
+  base?: Entry;
+  /**
+   * The ours entry (local/current version)
+   */
+  ours?: Entry;
+  /**
+   * The theirs entry (incoming version)
+   */
+  theirs?: Entry;
+  /**
+   * Additional context about the conflict
+   */
+  context?: ConflictContext;
+}
+/**
+ * A conflict detection rule
+ */
+interface ConflictRule {
+  /**
+   * Rule identifier
+   */
+  name: string;
+  /**
+   * Check if this rule applies to a match
+   * @returns MergeConflict if conflict detected, null otherwise
+   */
+  detect: (match: EntryMatch) => MergeConflict | null;
+}
+//#endregion
+export { ConflictContext, ConflictRule, ConflictType, MergeConflict };
+//# sourceMappingURL=conflict-detector.d.ts.map

package/dist/merge/conflict-detector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-detector.d.ts","names":[],"sources":["../../src/merge/conflict-detector.ts"],"sourcesContent":[],"mappings":";;;;;;AAOA;AAYA;AA8BiB,KA1CL,YAAA,GA0CkB,mBAAA,GAAA,4BAAA,GAAA,4BAAA,GAAA,yBAAA,GAAA,yBAAA,GAAA,aAAA,GAAA,aAAA;;;;AA8BrB,UA5DQ,eAAA,CA4DR;EAKE;;;EAWM,WAAA,CAAA,EAAA,MAAY;;;;;;;;;;;;;;;;;;;;;UA9CZ,aAAA;;;;QAIT;;;;;;;;;;;;;YAgBI;;;;SAKH;;;;SAKA;;;;WAKE;;;;YAKC;;;;;UAMK,YAAA;;;;;;;;;kBAUC,eAAe"}