just-git 1.5.12 → 1.5.14

package/README.md

@@ -2,13 +2,14 @@
 
 [![CI](https://github.com/blindmansion/just-git/actions/workflows/ci.yml/badge.svg)](https://github.com/blindmansion/just-git/actions/workflows/ci.yml)
 [![npm](https://img.shields.io/npm/v/just-git)](https://www.npmjs.com/package/just-git)
-[![bundle size](https://img.shields.io/bundlejs/size/just-git)](https://bundlejs.com/?q=just-git)
+[![client size](https://img.shields.io/bundlejs/size/just-git?label=client)](https://bundlejs.com/?q=just-git)
+[![server size](https://img.shields.io/bundlejs/size/just-git/server?label=server)](https://bundlejs.com/?q=just-git/server)
 
 Pure TypeScript git implementation. Zero dependencies. 36 commands. Works in Node, Bun, Deno, Cloudflare Workers, and the browser. [Tested against real git](docs/TESTING.md) across more than a million randomized operations.
 
 The Git CLI, Git servers, and CI workflows are no longer just things you use to develop apps: they can be part of the apps themselves. The goal of this project is to make that practical.
 
-- **Virtual filesystem client** for sandboxed environments. Pairs with [just-bash](https://github.com/vercel-labs/just-bash), or use standalone.
+- **[Virtual filesystem client](docs/CLIENT.md)** for sandboxed environments. Pairs with [just-bash](https://github.com/vercel-labs/just-bash), or use standalone.
 - **[Embeddable git server](docs/SERVER.md)** with pluggable storage, auth, and hooks. Supports HTTP, SSH, and in-process transport.
 - **[Repo module](docs/REPO.md)** with typed functions for commits, diffs, merges, blame, and bisect that work identically against a virtual filesystem or a database.
 
@@ -61,11 +62,18 @@ await git.exec('git commit -m "initial commit"');
 
 Both `fs` and `cwd` can be set once in `createGit` and overridden per-call. `cwd` defaults to `"/"`. Set it to the repo root so every `exec` call finds `.git` automatically.
 
-`createGit` also supports [command restrictions, network policies, and config overrides](docs/CLIENT.md#options) for sandboxing, a [lifecycle hooks API](docs/CLIENT.md#hooks) covering pre-commit secret scanning to push gating, and [cross-VFS remote resolution](docs/CLIENT.md#multi-agent-collaboration) for multi-agent collaboration. See [CLIENT.md](docs/CLIENT.md) for the full reference.
+`createGit` also supports:
+
+- [Command restrictions, network policies, and config overrides](docs/CLIENT.md#options) for sandboxing
+- [Lifecycle hooks](docs/CLIENT.md#hooks) from pre-commit secret scanning to push gating
+- [Custom merge drivers](docs/CLIENT.md#merge-driver) for programmatic conflict resolution
+- [Cross-VFS remote resolution](docs/CLIENT.md#multi-agent-collaboration) for multi-agent collaboration
+
+See [CLIENT.md](docs/CLIENT.md) for the full reference.
 
 ### Server
 
-Stand up a git server in two lines. Storage defaults to in-memory; swap in SQLite, PostgreSQL, or your own backend for persistence:
+Stand up a git server in two lines. Storage defaults to in-memory; swap in SQLite, PostgreSQL, [Cloudflare Durable Objects](docs/SERVER.md#durableobjectsqlitestorage), or your own backend for persistence:
 
 ```ts
 import { createServer } from "just-git/server";
@@ -117,7 +125,12 @@ await server.gc("my-repo");
 Bun.serve({ fetch: server.fetch });
 ```
 
-Uses web-standard `Request`/`Response`. Works with Bun, Hono, Cloudflare Workers, or any fetch-compatible runtime. For Node.js, use `server.nodeHandler` with `http.createServer` and `BetterSqlite3Storage` for `better-sqlite3`. SSH is supported via `server.handleSession`. The [`Storage` interface](docs/SERVER.md#custom-storage) is small enough to plug in any datastore. See [SERVER.md](docs/SERVER.md) for the full API.
+- Web-standard `Request`/`Response` — works with Bun, Hono, Cloudflare Workers, Durable Objects, or any fetch-compatible runtime
+- Node.js support via `server.nodeHandler` with `http.createServer` and `BetterSqlite3Storage`
+- [SSH](docs/SERVER.md#ssh) via `server.handleSession`
+- [`Storage` interface](docs/SERVER.md#custom-storage) small enough to plug in any datastore
+
+See [SERVER.md](docs/SERVER.md) for the full API.
 
 ## Repo module
 

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 import { F as FileSystem, G as GitHooks, C as CredentialProvider, I as IdentityOverride, N as NetworkPolicy, R as RemoteResolver, O as ObjectStore, a as RefStore, b as ConfigOverrides, P as ProgressCallback, E as ExecResult, c as FileStat, d as GitContext } from './hooks-B50z7ycn.js';
 export { A as AfterCommandEvent, B as BeforeCommandEvent, e as Commit, f as CommitMsgEvent, D as DirectRef, g as GitRepo, H as HttpAuth, h as Identity, M as MergeMsgEvent, i as ObjectId, j as ObjectType, k as ObjectWriteEvent, l as PackObject, m as PostApplyEvent, n as PostCheckoutEvent, o as PostCherryPickEvent, p as PostCloneEvent, q as PostCommitEvent, r as PostFetchEvent, s as PostMergeEvent, t as PostPullEvent, u as PostPushEvent, v as PostResetEvent, w as PostRevertEvent, x as PreApplyEvent, y as PreCheckoutEvent, z as PreCherryPickEvent, J as PreCloneEvent, K as PreCommitEvent, L as PreFetchEvent, Q as PreMergeCommitEvent, S as PrePullEvent, T as PrePushEvent, U as PreRebaseEvent, V as PreResetEvent, W as PreRevertEvent, X as RawObject, Y as Ref, Z as RefDeleteEvent, _ as RefEntry, $ as RefUpdateEvent, a0 as Rejection, a1 as SymbolicRef, a2 as composeGitHooks, a3 as isRejection } from './hooks-B50z7ycn.js';
+import { M as MergeDriver } from './merge-ort-BYMritNd.js';
+export { a as MergeDriverResult } from './merge-ort-BYMritNd.js';
 
 /** Options for subcommand execution (mirrors just-bash's CommandExecOptions). */
 interface CommandExecOptions {
@@ -86,6 +88,15 @@ interface GitOptions {
      * remote — format varies by server.
      */
     onProgress?: ProgressCallback;
+    /**
+     * Custom merge driver for content conflicts. Called during
+     * `git merge`, `git cherry-pick`, `git revert`, `git rebase`,
+     * and `git pull` when both sides modify the same file.
+     *
+     * Return `{ content, conflict: false }` for a clean resolution,
+     * or `null` to fall back to the default diff3 algorithm.
+     */
+    mergeDriver?: MergeDriver;
 }
 /** Simplified context for {@link Git.exec}. */
 interface ExecContext {
@@ -175,4 +186,4 @@ declare class MemoryFileSystem implements FileSystem {
  */
 declare function findRepo(fs: FileSystem, startPath: string): Promise<GitContext | null>;
 
-export { ConfigOverrides, CredentialProvider, type ExecContext, ExecResult, FileStat, FileSystem, Git, type GitCommandName, GitContext, GitHooks, type GitOptions, IdentityOverride, MemoryFileSystem, NetworkPolicy, ObjectStore, ProgressCallback, RefStore, RemoteResolver, createGit, findRepo };
+export { ConfigOverrides, CredentialProvider, type ExecContext, ExecResult, FileStat, FileSystem, Git, type GitCommandName, GitContext, GitHooks, type GitOptions, IdentityOverride, MemoryFileSystem, MergeDriver, NetworkPolicy, ObjectStore, ProgressCallback, RefStore, RemoteResolver, createGit, findRepo };