just-git 1.5.13 → 1.5.14

package/dist/merge-ort-BYMritNd.d.ts

@@ -0,0 +1,40 @@
+/**
+ * merge-ort — Three-way merge engine modeled after Git's merge-ort.c.
+ *
+ * Key insight: the entire merge is computed in-core first (producing a
+ * result tree with conflict-marker blobs embedded), then a standard
+ * two-way checkout applies the result to the worktree.
+ *
+ * Three phases:
+ *   1. collectMergeInfo  — flatten three trees, build per-path ConflictInfo
+ *   2. detectAndProcessRenames — rename detection, update path map
+ *   3. processEntries — resolve conflicts, content merge, build result tree
+ *
+ * The recursive wrapper (mergeOrtRecursive) handles criss-cross merges
+ * by pairwise-merging multiple LCAs into a virtual base tree.
+ */
+
+/**
+ * Custom content merge callback. Called during three-way merge before the
+ * default line-based diff3 algorithm. Analogous to git's `.gitattributes`
+ * `merge=` drivers, but as an async callback rather than a shell command.
+ *
+ * Return a result to override the default merge, or `null` to fall back
+ * to diff3. When `conflict` is `false`, the content is written as a clean
+ * stage-0 entry. When `conflict` is `true`, the original base/ours/theirs
+ * blobs are preserved as index stages 1/2/3 (so `--ours`/`--theirs`
+ * checkout still works) and the returned content becomes the worktree blob.
+ */
+type MergeDriver = (ctx: {
+    path: string;
+    base: string | null;
+    ours: string;
+    theirs: string;
+}) => MergeDriverResult | null | Promise<MergeDriverResult | null>;
+/** Result from a {@link MergeDriver} callback. */
+interface MergeDriverResult {
+    content: string;
+    conflict: boolean;
+}
+
+export type { MergeDriver as M, MergeDriverResult as a };

package/dist/repo/index.d.ts

@@ -1,6 +1,32 @@
 import { g as GitRepo, _ as RefEntry, e as Commit, a4 as TreeEntry, i as ObjectId, h as Identity, a5 as TreeDiffEntry, d as GitContext, F as FileSystem } from '../hooks-B50z7ycn.js';
-import { b as CommitIdentity } from '../writing-BYrXF-yM.js';
-export { B as BuildCommitOptions, c as CommitAuthor, C as CommitOptions, a as CommitResult, d as CreateAnnotatedTagOptions, e as CreateCommitOptions, T as TreeEntryInput, f as TreeUpdate, g as buildCommit, h as commit, i as createAnnotatedTag, j as createCommit, u as updateTree, w as writeBlob, k as writeTree } from '../writing-BYrXF-yM.js';
+import { C as CommitIdentity } from '../writing-DnvEscb-.js';
+export { B as BuildCommitOptions, a as CommitAuthor, b as CommitOptions, c as CommitResult, d as CreateAnnotatedTagOptions, e as CreateCommitOptions, T as TreeEntryInput, f as TreeUpdate, g as buildCommit, h as commit, i as createAnnotatedTag, j as createCommit, u as updateTree, w as writeBlob, k as writeTree } from '../writing-DnvEscb-.js';
+import { M as MergeDriver } from '../merge-ort-BYMritNd.js';
+export { a as MergeDriverResult } from '../merge-ort-BYMritNd.js';
+
+interface MergeConflict {
+    path: string;
+    reason: "content" | "delete-modify" | "add-add" | "rename-delete" | "rename-rename" | "directory-rename";
+    /** For delete-modify / rename-delete: which side deleted the file. */
+    deletedBy?: "ours" | "theirs";
+    /** For rename conflicts: the old (base) path. */
+    oldPath?: string;
+    /** For rename/rename: the path ours renamed to. */
+    oursPath?: string;
+    /** For rename/rename: the path theirs renamed to. */
+    theirsPath?: string;
+    /**
+     * For content conflicts arising from renames: the path where ours' version
+     * was before the merge. If different from `path`, indicates ours had the
+     * file at a different location.
+     */
+    oursOrigPath?: string;
+    /**
+     * For content conflicts arising from renames: the path where theirs'
+     * version was before the merge.
+     */
+    theirsOrigPath?: string;
+}
 
 /** Extract the short branch name from a full ref path like "refs/heads/main" → "main". */
 declare function branchNameFromRef(ref: string): string;
@@ -271,69 +297,6 @@ declare function walkCommitHistory(repo: GitRepo, startHash: string | string[],
     limit?: number;
 }): AsyncGenerator<CommitInfo>;
 
-interface MergeConflict {
-    path: string;
-    reason: "content" | "delete-modify" | "add-add" | "rename-delete" | "rename-rename" | "directory-rename";
-    /** For delete-modify / rename-delete: which side deleted the file. */
-    deletedBy?: "ours" | "theirs";
-    /** For rename conflicts: the old (base) path. */
-    oldPath?: string;
-    /** For rename/rename: the path ours renamed to. */
-    oursPath?: string;
-    /** For rename/rename: the path theirs renamed to. */
-    theirsPath?: string;
-    /**
-     * For content conflicts arising from renames: the path where ours' version
-     * was before the merge. If different from `path`, indicates ours had the
-     * file at a different location.
-     */
-    oursOrigPath?: string;
-    /**
-     * For content conflicts arising from renames: the path where theirs'
-     * version was before the merge.
-     */
-    theirsOrigPath?: string;
-}
-
-/**
- * merge-ort — Three-way merge engine modeled after Git's merge-ort.c.
- *
- * Key insight: the entire merge is computed in-core first (producing a
- * result tree with conflict-marker blobs embedded), then a standard
- * two-way checkout applies the result to the worktree.
- *
- * Three phases:
- *   1. collectMergeInfo  — flatten three trees, build per-path ConflictInfo
- *   2. detectAndProcessRenames — rename detection, update path map
- *   3. processEntries — resolve conflicts, content merge, build result tree
- *
- * The recursive wrapper (mergeOrtRecursive) handles criss-cross merges
- * by pairwise-merging multiple LCAs into a virtual base tree.
- */
-
-/**
- * Custom content merge callback. Called during three-way merge before the
- * default line-based diff3 algorithm. Analogous to git's `.gitattributes`
- * `merge=` drivers, but as an async callback rather than a shell command.
- *
- * Return a result to override the default merge, or `null` to fall back
- * to diff3. When `conflict` is `false`, the content is written as a clean
- * stage-0 entry. When `conflict` is `true`, the original base/ours/theirs
- * blobs are preserved as index stages 1/2/3 (so `--ours`/`--theirs`
- * checkout still works) and the returned content becomes the worktree blob.
- */
-type MergeDriver = (ctx: {
-    path: string;
-    base: string | null;
-    ours: string;
-    theirs: string;
-}) => MergeDriverResult | null | Promise<MergeDriverResult | null>;
-/** Result from a {@link MergeDriver} callback. */
-interface MergeDriverResult {
-    content: string;
-    conflict: boolean;
-}
-
 /** Result of a tree-level merge via {@link mergeTrees} or {@link mergeTreesFromTreeHashes}. */
 interface MergeTreesResult {
     /** Hash of the result tree (may contain conflict-marker blobs). */
@@ -758,4 +721,4 @@ declare function readonlyRepo(repo: GitRepo): GitRepo;
  */
 declare function overlayRepo(repo: GitRepo): GitRepo;
 
-export { type BisectOptions, type BisectSearchResult, type BisectStepInfo, type BlameEntry, type CherryPickOptions, type CherryPickResult, type CleanPickCommitted, type CleanPickNoCommit, Commit, CommitIdentity, type CommitInfo, type CreateWorktreeOptions, type DiffHunk, type DiffOptions, type ExtractTreeResult, type FileDiff, type FlatTreeEntry, GitRepo, type GrepFileMatch, type GrepMatch, type GrepOptions, type HeadInfo, Identity, type MaterializeTarget, type MergeConflict, type MergeDriver, type MergeDriverResult, type MergeTreesResult, type NoCommitPickResult, type NoCommitRevertResult, type PickConflict, RefEntry, type RevertOptions, type RevertResult, type TreeAccessor, TreeDiffEntry, TreeEntry, type WorktreeResult, bisect, blame, branchNameFromRef, cherryPick, countAheadBehind, createSandboxWorktree, createTreeAccessor, createWorktree, diffCommits, diffTrees, extractTree, findMergeBases, flattenTree, formatDiff, getChangedFiles, getNewCommits, grep, isAncestor, listBranches, listTags, mergeTrees, mergeTreesFromTreeHashes, overlayRepo, readBlob, readBlobText, readCommit, readFileAtCommit, readHead, readTree, readonlyRepo, resolveRef, revParse, revert, tagNameFromRef, walkCommitHistory };
+export { type BisectOptions, type BisectSearchResult, type BisectStepInfo, type BlameEntry, type CherryPickOptions, type CherryPickResult, type CleanPickCommitted, type CleanPickNoCommit, Commit, CommitIdentity, type CommitInfo, type CreateWorktreeOptions, type DiffHunk, type DiffOptions, type ExtractTreeResult, type FileDiff, type FlatTreeEntry, GitRepo, type GrepFileMatch, type GrepMatch, type GrepOptions, type HeadInfo, Identity, type MaterializeTarget, type MergeConflict, MergeDriver, type MergeTreesResult, type NoCommitPickResult, type NoCommitRevertResult, type PickConflict, RefEntry, type RevertOptions, type RevertResult, type TreeAccessor, TreeDiffEntry, TreeEntry, type WorktreeResult, bisect, blame, branchNameFromRef, cherryPick, countAheadBehind, createSandboxWorktree, createTreeAccessor, createWorktree, diffCommits, diffTrees, extractTree, findMergeBases, flattenTree, formatDiff, getChangedFiles, getNewCommits, grep, isAncestor, listBranches, listTags, mergeTrees, mergeTreesFromTreeHashes, overlayRepo, readBlob, readBlobText, readCommit, readFileAtCommit, readHead, readTree, readonlyRepo, resolveRef, revParse, revert, tagNameFromRef, walkCommitHistory };

package/dist/server/index.d.ts

@@ -1,5 +1,5 @@
 import { i as ObjectId, X as RawObject, Y as Ref, g as GitRepo, a0 as Rejection, N as NetworkPolicy } from '../hooks-B50z7ycn.js';
-import { C as CommitOptions, a as CommitResult } from '../writing-BYrXF-yM.js';
+import { b as CommitOptions, c as CommitResult } from '../writing-DnvEscb-.js';
 
 /** Shallow boundary delta: what to add/remove from `.git/shallow`. */
 interface ShallowUpdate {

package/dist/{writing-BYrXF-yM.d.ts → writing-DnvEscb-.d.ts}

@@ -201,4 +201,4 @@ interface TreeUpdate {
  */
 declare function updateTree(repo: GitRepo, treeHash: string, updates: TreeUpdate[]): Promise<string>;
 
-export { type BuildCommitOptions as B, type CommitOptions as C, type TreeEntryInput as T, type CommitResult as a, type CommitIdentity as b, type CommitAuthor as c, type CreateAnnotatedTagOptions as d, type CreateCommitOptions as e, type TreeUpdate as f, buildCommit as g, commit as h, createAnnotatedTag as i, createCommit as j, writeTree as k, updateTree as u, writeBlob as w };
+export { type BuildCommitOptions as B, type CommitIdentity as C, type TreeEntryInput as T, type CommitAuthor as a, type CommitOptions as b, type CommitResult as c, type CreateAnnotatedTagOptions as d, type CreateCommitOptions as e, type TreeUpdate as f, buildCommit as g, commit as h, createAnnotatedTag as i, createCommit as j, writeTree as k, updateTree as u, writeBlob as w };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "just-git",
-	"version": "1.5.13",
+	"version": "1.5.14",
 	"description": "Pure TypeScript git implementation: virtual filesystem client and embeddable server.",
 	"keywords": [
 		"agent",