@effect-vfs/core 0.7.1 → 0.8.0

package/dist/SnapshotDelta.d.ts

@@ -284,5 +284,239 @@ export declare const SnapshotDeltaLimits: Schema.Struct<{
         readonly maxInheritedRecords: number;
     };
 };
+/**
+ * Schema for what one side of a merge did at a conflicted path.
+ *
+ * `Unchanged` means the side did not touch the path itself; a conflict can
+ * still name it when the other side's change depends on it, for example a
+ * hard-link group whose membership diverged, or a name held at base because
+ * it shares a node with a conflicted name.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export declare const MergeSideChange: Schema.TaggedUnion<{
+    readonly Added: Schema.TaggedStruct<"Added", {
+        readonly kind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+    }>;
+    readonly Removed: Schema.TaggedStruct<"Removed", {
+        readonly kind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+    }>;
+    readonly Unchanged: Schema.TaggedStruct<"Unchanged", {}>;
+    readonly Updated: Schema.TaggedStruct<"Updated", {
+        readonly beforeKind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+        readonly afterKind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+        readonly differences: Schema.$Array<Schema.Literals<readonly ["kind", "content", "target", "hardLinks", "mode", "uid", "gid", "atimeNs", "mtimeNs", "ctimeNs", "birthtimeNs"]>>;
+    }>;
+}>;
+/**
+ * What one side of a merge did at a conflicted path.
+ *
+ * @category models
+ * @since 0.8.0
+ */
+export type MergeSideChange = typeof MergeSideChange.Type;
+/**
+ * Schema for the reasons a path-level merge reports a conflict.
+ *
+ * - `BothChanged`: both sides changed the same field of one node to different values.
+ * - `ChangedRemoved`: one side changed a node the other side removed, or linked a new name to it.
+ * - `BothAddedDifferent`: both sides added different nodes at one path.
+ * - `KindDiverged`: one side changed a node's kind while the other side changed or removed the node.
+ * - `ParentRemoved`: one side changed a path under a directory the other side removed or replaced.
+ * - `HardLinkGroupDiverged`: both sides changed which names share one hard-linked node.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export declare const MergeConflictReason: Schema.Literals<readonly ["BothChanged", "ChangedRemoved", "BothAddedDifferent", "KindDiverged", "ParentRemoved", "HardLinkGroupDiverged"]>;
+/**
+ * The reason a path-level merge reports a conflict.
+ *
+ * @category models
+ * @since 0.8.0
+ */
+export type MergeConflictReason = typeof MergeConflictReason.Type;
+/**
+ * Schema for one conflict between two snapshot deltas from the same base.
+ *
+ * A conflict carries what each side did, as kinds and changed fields, and no
+ * payload bytes or metadata values. The application reads those from the base,
+ * ours, and theirs snapshots it already holds. Timestamp fields are left out of
+ * `differences`, because timestamps never conflict.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export declare const MergeConflict: Schema.Struct<{
+    readonly path: Schema.declare<BytePath, BytePath>;
+    readonly reason: Schema.Literals<readonly ["BothChanged", "ChangedRemoved", "BothAddedDifferent", "KindDiverged", "ParentRemoved", "HardLinkGroupDiverged"]>;
+    readonly ours: Schema.TaggedUnion<{
+        readonly Added: Schema.TaggedStruct<"Added", {
+            readonly kind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+        }>;
+        readonly Removed: Schema.TaggedStruct<"Removed", {
+            readonly kind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+        }>;
+        readonly Unchanged: Schema.TaggedStruct<"Unchanged", {}>;
+        readonly Updated: Schema.TaggedStruct<"Updated", {
+            readonly beforeKind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+            readonly afterKind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+            readonly differences: Schema.$Array<Schema.Literals<readonly ["kind", "content", "target", "hardLinks", "mode", "uid", "gid", "atimeNs", "mtimeNs", "ctimeNs", "birthtimeNs"]>>;
+        }>;
+    }>;
+    readonly theirs: Schema.TaggedUnion<{
+        readonly Added: Schema.TaggedStruct<"Added", {
+            readonly kind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+        }>;
+        readonly Removed: Schema.TaggedStruct<"Removed", {
+            readonly kind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+        }>;
+        readonly Unchanged: Schema.TaggedStruct<"Unchanged", {}>;
+        readonly Updated: Schema.TaggedStruct<"Updated", {
+            readonly beforeKind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+            readonly afterKind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+            readonly differences: Schema.$Array<Schema.Literals<readonly ["kind", "content", "target", "hardLinks", "mode", "uid", "gid", "atimeNs", "mtimeNs", "ctimeNs", "birthtimeNs"]>>;
+        }>;
+    }>;
+}>;
+/**
+ * One conflict between two snapshot deltas from the same base.
+ *
+ * @category models
+ * @since 0.8.0
+ */
+export type MergeConflict = typeof MergeConflict.Type;
+/**
+ * Schema for the side a merge takes at one conflicted path.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export declare const MergeTake: Schema.Literals<readonly ["ours", "theirs", "base"]>;
+/**
+ * The side a merge takes at one conflicted path.
+ *
+ * @category models
+ * @since 0.8.0
+ */
+export type MergeTake = typeof MergeTake.Type;
+/**
+ * Schema for one resolution of a reported merge conflict.
+ *
+ * The path must be one a previous merge of the same inputs reported.
+ * Conflicts that span several paths, a removed directory's subtree or a
+ * hard-link group, take one side as a whole: every reported path in the set
+ * must name the same side.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export declare const MergeResolution: Schema.Struct<{
+    readonly path: Schema.declare<BytePath, BytePath>;
+    readonly take: Schema.Literals<readonly ["ours", "theirs", "base"]>;
+}>;
+/**
+ * One resolution of a reported merge conflict.
+ *
+ * @category models
+ * @since 0.8.0
+ */
+export type MergeResolution = typeof MergeResolution.Type;
+/**
+ * Schema for snapshot-delta merge options.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export declare const MergeOptions: Schema.Struct<{
+    /** Sides to take at paths an earlier merge reported as conflicts. */
+    readonly resolutions: Schema.optionalKey<Schema.$Array<Schema.Struct<{
+        readonly path: Schema.declare<BytePath, BytePath>;
+        readonly take: Schema.Literals<readonly ["ours", "theirs", "base"]>;
+    }>>>;
+    /** Resource limits for verifying both deltas and building the merged one. Defaults to `SnapshotDeltaLimits.default`. */
+    readonly limits: Schema.optionalKey<Schema.Struct<{
+        /** Maximum encoded delta length in bytes. */
+        readonly maxEncodedBytes: Schema.ByteSize;
+        /** Maximum bytes hashed for one snapshot's identity. */
+        readonly maxIdentityBytes: Schema.ByteSize;
+        /** Maximum number of changes a delta holds. */
+        readonly maxDeltaRecords: Schema.Natural;
+        /** Maximum decoded bytes of a delta's digests, paths and payloads. */
+        readonly maxDecodedDeltaBytes: Schema.ByteSize;
+        /** Maximum number of nodes in the base snapshot. */
+        readonly maxBaseRecords: Schema.Natural;
+        /** Maximum number of nodes in the target snapshot. */
+        readonly maxTargetRecords: Schema.Natural;
+        /** Maximum number of names in either snapshot, and of names a delta writes. */
+        readonly maxEntries: Schema.Natural;
+        /** Maximum number of nodes an applied delta produces. */
+        readonly maxOutputRecords: Schema.Natural;
+        /** Maximum payload bytes of the target, and of the payloads a delta carries. */
+        readonly maxOutputBytes: Schema.ByteSize;
+        /** Maximum number of target nodes carried over from the base rather than written by the delta. */
+        readonly maxInheritedRecords: Schema.Natural;
+    }>>;
+}>;
+/**
+ * Snapshot-delta merge options.
+ *
+ * @category models
+ * @since 0.8.0
+ */
+export type MergeOptions = typeof MergeOptions.Type;
+/**
+ * Schema for the result of merging two snapshot deltas.
+ *
+ * The delta applies every change neither side disputed, plus every resolved
+ * conflict; paths still in conflict keep the base node. It is bound to the
+ * same base as its inputs and applies with `applySnapshotDelta`.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export declare const MergeResult: Schema.Struct<{
+    readonly delta: Schema.declare<SnapshotDelta, SnapshotDelta>;
+    readonly conflicts: Schema.$Array<Schema.Struct<{
+        readonly path: Schema.declare<BytePath, BytePath>;
+        readonly reason: Schema.Literals<readonly ["BothChanged", "ChangedRemoved", "BothAddedDifferent", "KindDiverged", "ParentRemoved", "HardLinkGroupDiverged"]>;
+        readonly ours: Schema.TaggedUnion<{
+            readonly Added: Schema.TaggedStruct<"Added", {
+                readonly kind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+            }>;
+            readonly Removed: Schema.TaggedStruct<"Removed", {
+                readonly kind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+            }>;
+            readonly Unchanged: Schema.TaggedStruct<"Unchanged", {}>;
+            readonly Updated: Schema.TaggedStruct<"Updated", {
+                readonly beforeKind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+                readonly afterKind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+                readonly differences: Schema.$Array<Schema.Literals<readonly ["kind", "content", "target", "hardLinks", "mode", "uid", "gid", "atimeNs", "mtimeNs", "ctimeNs", "birthtimeNs"]>>;
+            }>;
+        }>;
+        readonly theirs: Schema.TaggedUnion<{
+            readonly Added: Schema.TaggedStruct<"Added", {
+                readonly kind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+            }>;
+            readonly Removed: Schema.TaggedStruct<"Removed", {
+                readonly kind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+            }>;
+            readonly Unchanged: Schema.TaggedStruct<"Unchanged", {}>;
+            readonly Updated: Schema.TaggedStruct<"Updated", {
+                readonly beforeKind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+                readonly afterKind: Schema.Literals<readonly ["directory", "file", "symlink"]>;
+                readonly differences: Schema.$Array<Schema.Literals<readonly ["kind", "content", "target", "hardLinks", "mode", "uid", "gid", "atimeNs", "mtimeNs", "ctimeNs", "birthtimeNs"]>>;
+            }>;
+        }>;
+    }>>;
+}>;
+/**
+ * The result of merging two snapshot deltas.
+ *
+ * @category models
+ * @since 0.8.0
+ */
+export type MergeResult = typeof MergeResult.Type;
 export {};
 //# sourceMappingURL=SnapshotDelta.d.ts.map

package/dist/SnapshotDelta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SnapshotDelta.d.ts","sourceRoot":"","sources":["../src/SnapshotDelta.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAGxC;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,gCAA+D,CAAA;AAEjG;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAA;AAE5D;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAA;CACpD;AAED;;;;;GAKG;AACH,eAAO,MAAM,aAAa,8CAA0D,CAAA;AAEpF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,4DAAoD,CAAA;AAEjF;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,GAAG,OAAO,gBAAgB,CAAC,IAAI,CAAA;AAE3D;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,4IAY7B,CAAA;AAEF;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,OAAO,kBAAkB,CAAC,IAAI,CAAA;AAI/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;IASzB,CAAA;AAEF;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,cAAc,CAAC,IAAI,CAAA;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,sBAAsB;IACjC,6FAA6F;;EAE7F,CAAA;AAEF;;;;;GAKG;AACH,MAAM,MAAM,sBAAsB,GAAG,OAAO,sBAAsB,CAAC,IAAI,CAAA;AAEvE,QAAA,MAAM,yBAAyB;IAC7B,6CAA6C;;IAE7C,wDAAwD;;IAExD,+CAA+C;;IAE/C,sEAAsE;;IAEtE,oDAAoD;;IAEpD,sDAAsD;;IAEtD,+EAA+E;;IAE/E,yDAAyD;;IAEzD,gFAAgF;;IAEhF,kGAAkG;;EAElG,CAAA;AAEF;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG,OAAO,yBAAyB,CAAC,IAAI,CAAA;AAEvE;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,WAAY,mBAAmB,KAAG,mBACxC,CAAA;AA4B9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,mBAAmB;IA9F9B,6CAA6C;;IAE7C,wDAAwD;;IAExD,+CAA+C;;IAE/C,sEAAsE;;IAEtE,oDAAoD;;IAEpD,sDAAsD;;IAEtD,+EAA+E;;IAE/E,yDAAyD;;IAEzD,gFAAgF;;IAEhF,kGAAkG;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+ElG,CAAA"}
+{"version":3,"file":"SnapshotDelta.d.ts","sourceRoot":"","sources":["../src/SnapshotDelta.ts"],"names":[],"mappings":"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"}

package/dist/SnapshotDelta.js

@@ -226,3 +226,110 @@ export const SnapshotDeltaLimits = Object.assign(SnapshotDeltaLimitsSchema, {
     constrained,
     default: defaultLimits
 });
+/**
+ * Schema for what one side of a merge did at a conflicted path.
+ *
+ * `Unchanged` means the side did not touch the path itself; a conflict can
+ * still name it when the other side's change depends on it, for example a
+ * hard-link group whose membership diverged, or a name held at base because
+ * it shares a node with a conflicted name.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export const MergeSideChange = Schema.TaggedUnion({
+    Unchanged: {},
+    Added: { kind: SnapshotNodeKind },
+    Removed: { kind: SnapshotNodeKind },
+    Updated: {
+        beforeKind: SnapshotNodeKind,
+        afterKind: SnapshotNodeKind,
+        differences: SnapshotDifferences
+    }
+});
+/**
+ * Schema for the reasons a path-level merge reports a conflict.
+ *
+ * - `BothChanged`: both sides changed the same field of one node to different values.
+ * - `ChangedRemoved`: one side changed a node the other side removed, or linked a new name to it.
+ * - `BothAddedDifferent`: both sides added different nodes at one path.
+ * - `KindDiverged`: one side changed a node's kind while the other side changed or removed the node.
+ * - `ParentRemoved`: one side changed a path under a directory the other side removed or replaced.
+ * - `HardLinkGroupDiverged`: both sides changed which names share one hard-linked node.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export const MergeConflictReason = Schema.Literals([
+    "BothChanged",
+    "ChangedRemoved",
+    "BothAddedDifferent",
+    "KindDiverged",
+    "ParentRemoved",
+    "HardLinkGroupDiverged"
+]);
+/**
+ * Schema for one conflict between two snapshot deltas from the same base.
+ *
+ * A conflict carries what each side did, as kinds and changed fields, and no
+ * payload bytes or metadata values. The application reads those from the base,
+ * ours, and theirs snapshots it already holds. Timestamp fields are left out of
+ * `differences`, because timestamps never conflict.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export const MergeConflict = Schema.Struct({
+    path: BytePath,
+    reason: MergeConflictReason,
+    ours: MergeSideChange,
+    theirs: MergeSideChange
+});
+/**
+ * Schema for the side a merge takes at one conflicted path.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export const MergeTake = Schema.Literals(["ours", "theirs", "base"]);
+/**
+ * Schema for one resolution of a reported merge conflict.
+ *
+ * The path must be one a previous merge of the same inputs reported.
+ * Conflicts that span several paths, a removed directory's subtree or a
+ * hard-link group, take one side as a whole: every reported path in the set
+ * must name the same side.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export const MergeResolution = Schema.Struct({
+    path: BytePath,
+    take: MergeTake
+});
+/**
+ * Schema for snapshot-delta merge options.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export const MergeOptions = Schema.Struct({
+    /** Sides to take at paths an earlier merge reported as conflicts. */
+    resolutions: Schema.optionalKey(Schema.Array(MergeResolution)),
+    /** Resource limits for verifying both deltas and building the merged one. Defaults to `SnapshotDeltaLimits.default`. */
+    limits: Schema.optionalKey(SnapshotDeltaLimitsSchema)
+});
+/**
+ * Schema for the result of merging two snapshot deltas.
+ *
+ * The delta applies every change neither side disputed, plus every resolved
+ * conflict; paths still in conflict keep the base node. It is bound to the
+ * same base as its inputs and applies with `applySnapshotDelta`.
+ *
+ * @category schemas
+ * @since 0.8.0
+ */
+export const MergeResult = Schema.Struct({
+    delta: SnapshotDelta,
+    conflicts: Schema.Array(MergeConflict)
+});

package/dist/VirtualFileSystem.d.ts

@@ -38,7 +38,7 @@ import type { DecodeLimits, Snapshot } from "./Snapshot.js";
 export { DecodeLimits, type Snapshot, SnapshotTypeId } from "./Snapshot.js";
 import { type LiveImageStore, type Options as LiveVolumeOptions } from "./LiveVolume.js";
 import * as SnapshotDeltaModel from "./SnapshotDelta.js";
-export { SnapshotChange, SnapshotChangesOptions, type SnapshotDelta, SnapshotDeltaLimits, SnapshotDeltaTypeId, SnapshotDifference, SnapshotNodeKind } from "./SnapshotDelta.js";
+export { MergeConflict, MergeConflictReason, MergeOptions, MergeResolution, MergeResult, MergeSideChange, MergeTake, SnapshotChange, SnapshotChangesOptions, type SnapshotDelta, SnapshotDeltaLimits, SnapshotDeltaTypeId, SnapshotDifference, SnapshotNodeKind } from "./SnapshotDelta.js";
 /**
  * A UTF-8 string path or an opaque byte-preserving path.
  *
@@ -1782,6 +1782,58 @@ export declare const inspectSnapshotDelta: (base: Snapshot, delta: SnapshotDelta
  * @since 0.1.0
  */
 export declare const applySnapshotDelta: (base: Snapshot, delta: SnapshotDeltaModel.SnapshotDelta, limits?: SnapshotDeltaModel.SnapshotDeltaLimits) => Effect.Effect<Snapshot, VfsError | PlatformError.PlatformError, Crypto.Crypto>;
+/**
+ * Merges two snapshot deltas that share one base into a single delta, reporting path-level conflicts as data.
+ *
+ * Changes only one side made are taken as they are. Where both sides changed one path the merge keeps the change
+ * when both agree, combines metadata fields that only one side changed, and otherwise reports a conflict and leaves
+ * the base node in place. Timestamps never conflict. The merged delta is bound to the same base as its inputs and
+ * applies with {@link applySnapshotDelta}. Pass `resolutions` to take one side at paths an earlier merge reported.
+ * Requires the platform-neutral `Crypto.Crypto` service for base identity. Provide
+ * `NodeCrypto.layer`, `BunCrypto.layer`, or your own via `Crypto.make`.
+ *
+ * @example
+ * ```ts
+ * import * as BunCrypto from "@effect/platform-bun/BunCrypto"
+ * import { VirtualFileSystem as Vfs } from "@effect-vfs/core"
+ * import { Effect } from "effect"
+ *
+ * const encoder = new TextEncoder()
+ *
+ * const program = Effect.gen(function*() {
+ *   const source = yield* Vfs.fromFixture({
+ *     entries: [{ kind: "file", path: "/shared.txt", bytes: encoder.encode("v0") }]
+ *   })
+ *   const base = yield* source.snapshot
+ *
+ *   // Two agents work on separate overlays of one base.
+ *   const ours = yield* Vfs.makeOverlay(base)
+ *   const theirs = yield* Vfs.makeOverlay(base)
+ *   yield* (yield* ours.caller()).writeFile("/ours.txt", encoder.encode("a"), { access: "write", create: "exclusive" })
+ *   yield* (yield* theirs.caller()).writeFile("/shared.txt", encoder.encode("v1"), { access: "write", truncate: true })
+ *
+ *   const result = yield* Vfs.mergeSnapshotDeltas(
+ *     base,
+ *     yield* Vfs.diffSnapshots(base, (yield* ours.capture()).snapshot),
+ *     yield* Vfs.diffSnapshots(base, (yield* theirs.capture()).snapshot)
+ *   )
+ *
+ *   // Disjoint changes merge without conflicts; the delta applies to the shared base.
+ *   const merged = yield* Vfs.fromSnapshot(yield* Vfs.applySnapshotDelta(base, result.delta))
+ *   const reader = yield* merged.caller()
+ *
+ *   return [result.conflicts.length, new TextDecoder().decode(yield* reader.readFile("/shared.txt"))]
+ * })
+ *
+ * Effect.runPromise(program.pipe(Effect.provide(BunCrypto.layer))).then(console.log)
+ * // [ 0, 'v1' ]
+ * ```
+ *
+ * @see {@link diffSnapshots} to build each side's delta, {@link applySnapshotDelta} to apply the merged one.
+ * @category snapshots
+ * @since 0.8.0
+ */
+export declare const mergeSnapshotDeltas: (base: Snapshot, ours: SnapshotDeltaModel.SnapshotDelta, theirs: SnapshotDeltaModel.SnapshotDelta, options?: SnapshotDeltaModel.MergeOptions) => Effect.Effect<SnapshotDeltaModel.MergeResult, VfsError | PlatformError.PlatformError, Crypto.Crypto>;
 /**
  * Creates an Effect Schema codec between owned bytes and opaque snapshot deltas.
  * Omission uses `SnapshotDeltaLimits.default`.

package/dist/VirtualFileSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VirtualFileSystem.d.ts","sourceRoot":"","sources":["../src/VirtualFileSystem.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"VirtualFileSystem.d.ts","sourceRoot":"","sources":["../src/VirtualFileSystem.ts"],"names":[],"mappings":"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"}

package/dist/VirtualFileSystem.js

@@ -23,10 +23,11 @@ import * as FixtureInternal from "./internal/fixture.js";
 import * as Image from "./internal/image.js";
 import * as Path from "./internal/path.js";
 import * as SnapshotDeltaInternal from "./internal/snapshotDelta.js";
+import * as SnapshotMergeInternal from "./internal/snapshotMerge.js";
 import * as VfsModel from "./internal/virtualFileSystem.js";
 import { open as openLiveVolume } from "./LiveVolume.js";
 import * as SnapshotDeltaModel from "./SnapshotDelta.js";
-export { SnapshotChange, SnapshotChangesOptions, SnapshotDeltaLimits, SnapshotDeltaTypeId, SnapshotDifference, SnapshotNodeKind } from "./SnapshotDelta.js";
+export { MergeConflict, MergeConflictReason, MergeOptions, MergeResolution, MergeResult, MergeSideChange, MergeTake, SnapshotChange, SnapshotChangesOptions, SnapshotDeltaLimits, SnapshotDeltaTypeId, SnapshotDifference, SnapshotNodeKind } from "./SnapshotDelta.js";
 /**
  * Schema for portable virtual filesystem error codes.
  *
@@ -981,6 +982,63 @@ export const inspectSnapshotDelta = Effect.fn("VirtualFileSystem.inspectSnapshot
 export const applySnapshotDelta = Effect.fn("VirtualFileSystem.applySnapshotDelta")(function* (base, delta, limits) {
     return yield* SnapshotDeltaInternal.applySnapshotDelta(base, delta, yield* deltaLimits("applySnapshotDelta", limits)).pipe(Effect.mapError((error) => retargetFailure("applySnapshotDelta", error)));
 });
+/**
+ * Merges two snapshot deltas that share one base into a single delta, reporting path-level conflicts as data.
+ *
+ * Changes only one side made are taken as they are. Where both sides changed one path the merge keeps the change
+ * when both agree, combines metadata fields that only one side changed, and otherwise reports a conflict and leaves
+ * the base node in place. Timestamps never conflict. The merged delta is bound to the same base as its inputs and
+ * applies with {@link applySnapshotDelta}. Pass `resolutions` to take one side at paths an earlier merge reported.
+ * Requires the platform-neutral `Crypto.Crypto` service for base identity. Provide
+ * `NodeCrypto.layer`, `BunCrypto.layer`, or your own via `Crypto.make`.
+ *
+ * @example
+ * ```ts
+ * import * as BunCrypto from "@effect/platform-bun/BunCrypto"
+ * import { VirtualFileSystem as Vfs } from "@effect-vfs/core"
+ * import { Effect } from "effect"
+ *
+ * const encoder = new TextEncoder()
+ *
+ * const program = Effect.gen(function*() {
+ *   const source = yield* Vfs.fromFixture({
+ *     entries: [{ kind: "file", path: "/shared.txt", bytes: encoder.encode("v0") }]
+ *   })
+ *   const base = yield* source.snapshot
+ *
+ *   // Two agents work on separate overlays of one base.
+ *   const ours = yield* Vfs.makeOverlay(base)
+ *   const theirs = yield* Vfs.makeOverlay(base)
+ *   yield* (yield* ours.caller()).writeFile("/ours.txt", encoder.encode("a"), { access: "write", create: "exclusive" })
+ *   yield* (yield* theirs.caller()).writeFile("/shared.txt", encoder.encode("v1"), { access: "write", truncate: true })
+ *
+ *   const result = yield* Vfs.mergeSnapshotDeltas(
+ *     base,
+ *     yield* Vfs.diffSnapshots(base, (yield* ours.capture()).snapshot),
+ *     yield* Vfs.diffSnapshots(base, (yield* theirs.capture()).snapshot)
+ *   )
+ *
+ *   // Disjoint changes merge without conflicts; the delta applies to the shared base.
+ *   const merged = yield* Vfs.fromSnapshot(yield* Vfs.applySnapshotDelta(base, result.delta))
+ *   const reader = yield* merged.caller()
+ *
+ *   return [result.conflicts.length, new TextDecoder().decode(yield* reader.readFile("/shared.txt"))]
+ * })
+ *
+ * Effect.runPromise(program.pipe(Effect.provide(BunCrypto.layer))).then(console.log)
+ * // [ 0, 'v1' ]
+ * ```
+ *
+ * @see {@link diffSnapshots} to build each side's delta, {@link applySnapshotDelta} to apply the merged one.
+ * @category snapshots
+ * @since 0.8.0
+ */
+export const mergeSnapshotDeltas = Effect.fn("VirtualFileSystem.mergeSnapshotDeltas")(function* (base, ours, theirs, options) {
+    // Limits decode first so a bad limit names its own field; the rest of the options decode as one.
+    const limits = yield* deltaLimits("mergeSnapshotDeltas", options?.limits);
+    const decoded = yield* Effect.fromResult(decodeConfiguration(SnapshotDeltaModel.MergeOptions, options ?? {}, "mergeSnapshotDeltas"));
+    return yield* SnapshotMergeInternal.mergeSnapshotDeltas(base, ours, theirs, decoded.resolutions ?? [], limits).pipe(Effect.mapError((error) => retargetFailure("mergeSnapshotDeltas", error)));
+});
 const deltaSchemaIssue = (cause, input, options) => new SchemaIssue.InvalidValue({ message: `Snapshot delta ${cause.code}${cause.field === undefined ? "" : ` at ${cause.field}`}` }, input, options);
 /**
  * Creates an Effect Schema codec between owned bytes and opaque snapshot deltas.

package/dist/index.d.ts

@@ -79,4 +79,11 @@ export * as Volume from "./Volume.js";
  * @category re-exports
  */
 export * as Watch from "./Watch.js";
+/**
+ * Bounded filename search over immutable snapshots.
+ *
+ * @category re-exports
+ * @since 0.8.0
+ */
+export * as Search from "./Search.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;GAKG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAE3D;;;;;GAKG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAEzC;;;;;GAKG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;;GAGG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAEzC;;;GAGG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;GAGG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC;;;GAGG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAEzC;;;GAGG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAEzC;;;GAGG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD;;;GAGG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC;;;GAGG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;GAGG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;GAKG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAE3D;;;;;GAKG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAEzC;;;;;GAKG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;;GAGG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAEzC;;;GAGG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;GAGG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC;;;GAGG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAEzC;;;GAGG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAEzC;;;GAGG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AAEnD;;;GAGG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC;;;GAGG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;GAGG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;;;;GAKG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA"}

package/dist/index.js

@@ -79,3 +79,10 @@ export * as Volume from "./Volume.js";
  * @category re-exports
  */
 export * as Watch from "./Watch.js";
+/**
+ * Bounded filename search over immutable snapshots.
+ *
+ * @category re-exports
+ * @since 0.8.0
+ */
+export * as Search from "./Search.js";

package/dist/internal/fixture.js

@@ -5,7 +5,7 @@ import { Fixture as FixtureSchema, FixtureEntry } from "../Fixture.js";
 import { VolumeIdentity, VolumeOptions as VolumeOptionsSchema } from "../Volume.js";
 import { decodeConfiguration, imageFailure, OpContext, VfsError } from "./errors.js";
 import { inputBytes, isAttachedBytes, isDotComponent, preparePath } from "./path.js";
-import { makeVolume, VolumeSource } from "./virtualFileSystem.js";
+import { makeVolume, memoryCommitProvider, VolumeSource } from "./virtualFileSystem.js";
 import { assemble, Ino, ROOT_INO } from "./volumeState.js";
 const DEFAULT_MODE = { directory: 0o755, file: 0o644, symlink: 0o777 };
 const EPOCH_NS = 0n;
@@ -124,8 +124,8 @@ export const fromFixture = Effect.fn("VirtualFileSystem.fromFixture")(function*
     const restored = VolumeSource.Restored({ value: assemble(specs) });
     const { identity, ...volumeOptions } = config;
     if (identity === undefined)
-        return (yield* makeVolume(restored, volumeOptions)).volume;
-    const { volume } = yield* makeVolume(restored, {
+        return (yield* makeVolume(restored, memoryCommitProvider, volumeOptions)).volume;
+    const { volume } = yield* makeVolume(restored, memoryCommitProvider, {
         ...volumeOptions,
         identity: VolumeIdentity.make(identity)
     });