shell-dsl 0.0.34 → 0.0.36

package/dist/cjs/src/vcs/diff.cjs

@@ -39,63 +39,107 @@ var __export = (target, all) => {
 // src/vcs/diff.ts
 var exports_diff = {};
 __export(exports_diff, {
-  diffWorkingTree: () => diffWorkingTree,
   diffManifests: () => diffManifests
 });
 module.exports = __toCommonJS(exports_diff);
+var import_content = require("./content.cjs");
 var import_rules = require("./rules.cjs");
-var import_snapshot = require("./snapshot.cjs");
-function diffManifests(before, after, rules = new import_rules.VCSRules) {
+var import_text_diff = require("./text-diff.cjs");
+async function diffManifests(before, after, options) {
   const entries = [];
   const allPaths = new Set([...Object.keys(before), ...Object.keys(after)]);
-  for (const path of allPaths) {
+  for (const path of [...allPaths].sort((a, b) => a.localeCompare(b))) {
     const prev = before[path];
     const curr = after[path];
     if (!prev && curr) {
-      entries.push(createDiffEntry("add", path, curr, undefined, rules));
+      entries.push(await createDiffEntry("add", path, curr, undefined, options));
     } else if (prev && !curr) {
-      entries.push(createDiffEntry("delete", path, undefined, prev, rules));
+      entries.push(await createDiffEntry("delete", path, undefined, prev, options));
     } else if (prev && curr && !entriesEqual(prev, curr)) {
-      entries.push(createDiffEntry("modify", path, curr, prev, rules));
+      entries.push(await createDiffEntry("modify", path, curr, prev, options));
     }
   }
-  return entries.sort((a, b) => a.path.localeCompare(b.path));
+  return entries;
 }
-async function diffWorkingTree(fs, rootPath, manifest, rules = new import_rules.VCSRules({ internalDirName: ".vcs" })) {
-  const workingManifest = await import_snapshot.buildTreeManifest(fs, rootPath, {
-    rules,
-    trackedPaths: Object.keys(manifest)
-  });
-  return diffManifests(manifest, workingManifest, rules);
-}
-function createDiffEntry(type, path, current, previous, rules) {
+async function createDiffEntry(type, path, current, previous, options) {
+  const rules = options.rules ?? new import_rules.VCSRules;
   const attributes = rules.resolveAttributes(path);
   const entryKind = getEntryKind(current ?? previous);
   const previousEntryKind = previous ? getEntryKind(previous) : undefined;
+  const currentFile = isFileEntry(current) ? current : undefined;
+  const previousFile = isFileEntry(previous) ? previous : undefined;
+  const binary = await resolveBinary(path, currentFile, previousFile, attributes, options);
+  const diff = resolveDiffMode(attributes, binary);
   const entry = {
     type,
     path,
-    binary: attributes.binary,
-    diff: attributes.diff,
+    binary,
+    diff,
     entryKind,
-    previousEntryKind
+    previousEntryKind,
+    blobId: currentFile?.blobId,
+    previousBlobId: previousFile?.blobId
   };
-  if (attributes.diff !== "none") {
-    if (isFileEntry(current)) {
-      entry.content = current.content;
-    }
-    if (isFileEntry(previous)) {
-      entry.previousContent = previous.content;
-    }
+  if (!currentFile && !previousFile) {
+    return entry;
+  }
+  if (diff === "none") {
+    entry.patchSuppressedReason = "none";
+    return entry;
   }
+  if (diff === "binary") {
+    entry.patchSuppressedReason = "binary";
+    return entry;
+  }
+  const largestSize = Math.max(currentFile?.size ?? 0, previousFile?.size ?? 0);
+  if (largestSize > import_content.MAX_PATCH_BYTES) {
+    entry.patchSuppressedReason = "too-large";
+    return entry;
+  }
+  const previousText = previousFile ? await options.objectStore.readBlobText(previousFile.blobId) : "";
+  const currentText = currentFile ? await options.objectStore.readBlobText(currentFile.blobId) : "";
+  entry.patch = import_text_diff.createUnifiedPatch(path, previousText, currentText);
   return entry;
 }
+async function resolveBinary(path, current, previous, attributes, options) {
+  if (attributes.diff === "text") {
+    return false;
+  }
+  if (attributes.diff === "binary" || attributes.binary === true) {
+    return true;
+  }
+  const currentBinary = await resolveEntryBinary(path, current, options.afterIndex, options.objectStore);
+  const previousBinary = await resolveEntryBinary(path, previous, options.beforeIndex, options.objectStore);
+  return currentBinary || previousBinary;
+}
+async function resolveEntryBinary(path, entry, indexEntries, objectStore) {
+  if (!entry) {
+    return false;
+  }
+  const cached = indexEntries?.[path];
+  if (cached?.blobId === entry.blobId) {
+    return cached.binary;
+  }
+  return objectStore.isBinaryBlob(entry.blobId);
+}
+function resolveDiffMode(attributes, binary) {
+  if (attributes.diff === "none") {
+    return "none";
+  }
+  if (attributes.diff === "text") {
+    return "text";
+  }
+  if (attributes.diff === "binary" || binary) {
+    return "binary";
+  }
+  return "text";
+}
 function entriesEqual(a, b) {
   if (getEntryKind(a) !== getEntryKind(b))
     return false;
   if (!isFileEntry(a) || !isFileEntry(b))
     return true;
-  return a.content === b.content;
+  return a.blobId === b.blobId && a.size === b.size;
 }
 function getEntryKind(entry) {
   return entry?.kind === "directory" ? "directory" : "file";
@@ -104,4 +148,4 @@ function isFileEntry(entry) {
   return !!entry && entry.kind !== "directory";
 }
 
-//# debugId=F0849DE3546011FF64756E2164756E21
+//# debugId=07954E8C085717B664756E2164756E21

package/dist/cjs/src/vcs/diff.cjs.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../../../src/vcs/diff.ts"],
   "sourcesContent": [
-    "import type { VirtualFS } from \"../types.cjs\";\nimport type { TreeManifest, DiffEntry, TreeEntry } from \"./types.cjs\";\nimport { VCSRules } from \"./rules.cjs\";\nimport { buildTreeManifest } from \"./snapshot.cjs\";\n\n/**\n * Compute diff entries between two tree manifests.\n */\nexport function diffManifests(\n  before: TreeManifest,\n  after: TreeManifest,\n  rules: VCSRules = new VCSRules(),\n): DiffEntry[] {\n  const entries: DiffEntry[] = [];\n  const allPaths = new Set([...Object.keys(before), ...Object.keys(after)]);\n\n  for (const path of allPaths) {\n    const prev = before[path];\n    const curr = after[path];\n\n    if (!prev && curr) {\n      entries.push(createDiffEntry(\"add\", path, curr, undefined, rules));\n    } else if (prev && !curr) {\n      entries.push(createDiffEntry(\"delete\", path, undefined, prev, rules));\n    } else if (prev && curr && !entriesEqual(prev, curr)) {\n      entries.push(createDiffEntry(\"modify\", path, curr, prev, rules));\n    }\n  }\n\n  return entries.sort((a, b) => a.path.localeCompare(b.path));\n}\n\n/**\n * Compute diff between a tree manifest and the current working tree.\n */\nexport async function diffWorkingTree(\n  fs: VirtualFS,\n  rootPath: string,\n  manifest: TreeManifest,\n  rules: VCSRules = new VCSRules({ internalDirName: \".vcs\" }),\n): Promise<DiffEntry[]> {\n  const workingManifest = await buildTreeManifest(fs, rootPath, {\n    rules,\n    trackedPaths: Object.keys(manifest),\n  });\n  return diffManifests(manifest, workingManifest, rules);\n}\n\nfunction createDiffEntry(\n  type: DiffEntry[\"type\"],\n  path: string,\n  current: TreeEntry | undefined,\n  previous: TreeEntry | undefined,\n  rules: VCSRules,\n): DiffEntry {\n  const attributes = rules.resolveAttributes(path);\n  const entryKind = getEntryKind(current ?? previous);\n  const previousEntryKind = previous ? getEntryKind(previous) : undefined;\n  const entry: DiffEntry = {\n    type,\n    path,\n    binary: attributes.binary,\n    diff: attributes.diff,\n    entryKind,\n    previousEntryKind,\n  };\n\n  if (attributes.diff !== \"none\") {\n    if (isFileEntry(current)) {\n      entry.content = current.content;\n    }\n    if (isFileEntry(previous)) {\n      entry.previousContent = previous.content;\n    }\n  }\n\n  return entry;\n}\n\nfunction entriesEqual(a: TreeEntry, b: TreeEntry): boolean {\n  if (getEntryKind(a) !== getEntryKind(b)) return false;\n  if (!isFileEntry(a) || !isFileEntry(b)) return true;\n  return a.content === b.content;\n}\n\nfunction getEntryKind(entry: TreeEntry | undefined): \"file\" | \"directory\" {\n  return entry?.kind === \"directory\" ? \"directory\" : \"file\";\n}\n\nfunction isFileEntry(entry: TreeEntry | undefined): entry is Extract<TreeEntry, { kind?: \"file\" }> {\n  return !!entry && entry.kind !== \"directory\";\n}\n"
+    "import type { TreeManifest, DiffEntry, TreeEntry, VCSIndexEntry } from \"./types.cjs\";\nimport { MAX_PATCH_BYTES } from \"./content.cjs\";\nimport { VCSObjectStore } from \"./objects.cjs\";\nimport { VCSRules } from \"./rules.cjs\";\nimport { createUnifiedPatch } from \"./text-diff.cjs\";\n\ninterface DiffOptions {\n  rules?: VCSRules;\n  objectStore: VCSObjectStore;\n  beforeIndex?: Record<string, VCSIndexEntry>;\n  afterIndex?: Record<string, VCSIndexEntry>;\n}\n\n/**\n * Compute diff entries between two tree manifests.\n */\nexport async function diffManifests(\n  before: TreeManifest,\n  after: TreeManifest,\n  options: DiffOptions,\n): Promise<DiffEntry[]> {\n  const entries: DiffEntry[] = [];\n  const allPaths = new Set([...Object.keys(before), ...Object.keys(after)]);\n\n  for (const path of [...allPaths].sort((a, b) => a.localeCompare(b))) {\n    const prev = before[path];\n    const curr = after[path];\n\n    if (!prev && curr) {\n      entries.push(await createDiffEntry(\"add\", path, curr, undefined, options));\n    } else if (prev && !curr) {\n      entries.push(await createDiffEntry(\"delete\", path, undefined, prev, options));\n    } else if (prev && curr && !entriesEqual(prev, curr)) {\n      entries.push(await createDiffEntry(\"modify\", path, curr, prev, options));\n    }\n  }\n\n  return entries;\n}\n\nasync function createDiffEntry(\n  type: DiffEntry[\"type\"],\n  path: string,\n  current: TreeEntry | undefined,\n  previous: TreeEntry | undefined,\n  options: DiffOptions,\n): Promise<DiffEntry> {\n  const rules = options.rules ?? new VCSRules();\n  const attributes = rules.resolveAttributes(path);\n  const entryKind = getEntryKind(current ?? previous);\n  const previousEntryKind = previous ? getEntryKind(previous) : undefined;\n  const currentFile = isFileEntry(current) ? current : undefined;\n  const previousFile = isFileEntry(previous) ? previous : undefined;\n  const binary = await resolveBinary(path, currentFile, previousFile, attributes, options);\n  const diff = resolveDiffMode(attributes, binary);\n  const entry: DiffEntry = {\n    type,\n    path,\n    binary,\n    diff,\n    entryKind,\n    previousEntryKind,\n    blobId: currentFile?.blobId,\n    previousBlobId: previousFile?.blobId,\n  };\n\n  if (!currentFile && !previousFile) {\n    return entry;\n  }\n\n  if (diff === \"none\") {\n    entry.patchSuppressedReason = \"none\";\n    return entry;\n  }\n\n  if (diff === \"binary\") {\n    entry.patchSuppressedReason = \"binary\";\n    return entry;\n  }\n\n  const largestSize = Math.max(currentFile?.size ?? 0, previousFile?.size ?? 0);\n  if (largestSize > MAX_PATCH_BYTES) {\n    entry.patchSuppressedReason = \"too-large\";\n    return entry;\n  }\n\n  const previousText = previousFile\n    ? await options.objectStore.readBlobText(previousFile.blobId)\n    : \"\";\n  const currentText = currentFile\n    ? await options.objectStore.readBlobText(currentFile.blobId)\n    : \"\";\n  entry.patch = createUnifiedPatch(path, previousText, currentText);\n  return entry;\n}\n\nasync function resolveBinary(\n  path: string,\n  current: Extract<TreeEntry, { kind?: \"file\" }> | undefined,\n  previous: Extract<TreeEntry, { kind?: \"file\" }> | undefined,\n  attributes: ReturnType<VCSRules[\"resolveAttributes\"]>,\n  options: DiffOptions,\n): Promise<boolean> {\n  if (attributes.diff === \"text\") {\n    return false;\n  }\n  if (attributes.diff === \"binary\" || attributes.binary === true) {\n    return true;\n  }\n\n  const currentBinary = await resolveEntryBinary(\n    path,\n    current,\n    options.afterIndex,\n    options.objectStore,\n  );\n  const previousBinary = await resolveEntryBinary(\n    path,\n    previous,\n    options.beforeIndex,\n    options.objectStore,\n  );\n\n  return currentBinary || previousBinary;\n}\n\nasync function resolveEntryBinary(\n  path: string,\n  entry: Extract<TreeEntry, { kind?: \"file\" }> | undefined,\n  indexEntries: Record<string, VCSIndexEntry> | undefined,\n  objectStore: VCSObjectStore,\n): Promise<boolean> {\n  if (!entry) {\n    return false;\n  }\n  const cached = indexEntries?.[path];\n  if (cached?.blobId === entry.blobId) {\n    return cached.binary;\n  }\n  return objectStore.isBinaryBlob(entry.blobId);\n}\n\nfunction resolveDiffMode(\n  attributes: ReturnType<VCSRules[\"resolveAttributes\"]>,\n  binary: boolean,\n): DiffEntry[\"diff\"] {\n  if (attributes.diff === \"none\") {\n    return \"none\";\n  }\n  if (attributes.diff === \"text\") {\n    return \"text\";\n  }\n  if (attributes.diff === \"binary\" || binary) {\n    return \"binary\";\n  }\n  return \"text\";\n}\n\nfunction entriesEqual(a: TreeEntry, b: TreeEntry): boolean {\n  if (getEntryKind(a) !== getEntryKind(b)) return false;\n  if (!isFileEntry(a) || !isFileEntry(b)) return true;\n  return a.blobId === b.blobId && a.size === b.size;\n}\n\nfunction getEntryKind(entry: TreeEntry | undefined): \"file\" | \"directory\" {\n  return entry?.kind === \"directory\" ? \"directory\" : \"file\";\n}\n\nfunction isFileEntry(entry: TreeEntry | undefined): entry is Extract<TreeEntry, { kind?: \"file\" }> {\n  return !!entry && entry.kind !== \"directory\";\n}\n"
   ],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEyB,IAAzB;AACkC,IAAlC;AAKO,SAAS,aAAa,CAC3B,QACA,OACA,QAAkB,IAAI,uBACT;AAAA,EACb,MAAM,UAAuB,CAAC;AAAA,EAC9B,MAAM,WAAW,IAAI,IAAI,CAAC,GAAG,OAAO,KAAK,MAAM,GAAG,GAAG,OAAO,KAAK,KAAK,CAAC,CAAC;AAAA,EAExE,WAAW,QAAQ,UAAU;AAAA,IAC3B,MAAM,OAAO,OAAO;AAAA,IACpB,MAAM,OAAO,MAAM;AAAA,IAEnB,IAAI,CAAC,QAAQ,MAAM;AAAA,MACjB,QAAQ,KAAK,gBAAgB,OAAO,MAAM,MAAM,WAAW,KAAK,CAAC;AAAA,IACnE,EAAO,SAAI,QAAQ,CAAC,MAAM;AAAA,MACxB,QAAQ,KAAK,gBAAgB,UAAU,MAAM,WAAW,MAAM,KAAK,CAAC;AAAA,IACtE,EAAO,SAAI,QAAQ,QAAQ,CAAC,aAAa,MAAM,IAAI,GAAG;AAAA,MACpD,QAAQ,KAAK,gBAAgB,UAAU,MAAM,MAAM,MAAM,KAAK,CAAC;AAAA,IACjE;AAAA,EACF;AAAA,EAEA,OAAO,QAAQ,KAAK,CAAC,GAAG,MAAM,EAAE,KAAK,cAAc,EAAE,IAAI,CAAC;AAAA;AAM5D,eAAsB,eAAe,CACnC,IACA,UACA,UACA,QAAkB,IAAI,sBAAS,EAAE,iBAAiB,OAAO,CAAC,GACpC;AAAA,EACtB,MAAM,kBAAkB,MAAM,kCAAkB,IAAI,UAAU;AAAA,IAC5D;AAAA,IACA,cAAc,OAAO,KAAK,QAAQ;AAAA,EACpC,CAAC;AAAA,EACD,OAAO,cAAc,UAAU,iBAAiB,KAAK;AAAA;AAGvD,SAAS,eAAe,CACtB,MACA,MACA,SACA,UACA,OACW;AAAA,EACX,MAAM,aAAa,MAAM,kBAAkB,IAAI;AAAA,EAC/C,MAAM,YAAY,aAAa,WAAW,QAAQ;AAAA,EAClD,MAAM,oBAAoB,WAAW,aAAa,QAAQ,IAAI;AAAA,EAC9D,MAAM,QAAmB;AAAA,IACvB;AAAA,IACA;AAAA,IACA,QAAQ,WAAW;AAAA,IACnB,MAAM,WAAW;AAAA,IACjB;AAAA,IACA;AAAA,EACF;AAAA,EAEA,IAAI,WAAW,SAAS,QAAQ;AAAA,IAC9B,IAAI,YAAY,OAAO,GAAG;AAAA,MACxB,MAAM,UAAU,QAAQ;AAAA,IAC1B;AAAA,IACA,IAAI,YAAY,QAAQ,GAAG;AAAA,MACzB,MAAM,kBAAkB,SAAS;AAAA,IACnC;AAAA,EACF;AAAA,EAEA,OAAO;AAAA;AAGT,SAAS,YAAY,CAAC,GAAc,GAAuB;AAAA,EACzD,IAAI,aAAa,CAAC,MAAM,aAAa,CAAC;AAAA,IAAG,OAAO;AAAA,EAChD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC;AAAA,IAAG,OAAO;AAAA,EAC/C,OAAO,EAAE,YAAY,EAAE;AAAA;AAGzB,SAAS,YAAY,CAAC,OAAoD;AAAA,EACxE,OAAO,OAAO,SAAS,cAAc,cAAc;AAAA;AAGrD,SAAS,WAAW,CAAC,OAA8E;AAAA,EACjG,OAAO,CAAC,CAAC,SAAS,MAAM,SAAS;AAAA;",
-  "debugId": "F0849DE3546011FF64756E2164756E21",
+  "mappings": "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",
+  "debugId": "07954E8C085717B664756E2164756E21",
   "names": []
 }

package/dist/cjs/src/vcs/index.cjs.map

@@ -2,7 +2,7 @@
   "version": 3,
   "sources": ["../../../../src/vcs/index.ts"],
   "sourcesContent": [
-    "export { VersionControlSystem } from \"./vcs.cjs\";\nexport type {\n  VCSConfig,\n  VCSAttributeRule,\n  VCSResolvedAttributes,\n  VCSDiffMode,\n  Revision,\n  DiffEntry,\n  TreeManifest,\n  TreeEntry,\n  FileEntry,\n  DirectoryEntry,\n  CommitOptions,\n  CheckoutOptions,\n  LogOptions,\n  LogEntry,\n  BranchInfo,\n} from \"./types.cjs\";\n"
+    "export { VersionControlSystem } from \"./vcs.cjs\";\nexport type {\n  VCSConfig,\n  VCSAttributeRule,\n  VCSResolvedAttributes,\n  VCSDiffMode,\n  VCSPatchSuppressionReason,\n  Revision,\n  DiffEntry,\n  TreeManifest,\n  TreeEntry,\n  FileEntry,\n  DirectoryEntry,\n  VCSIndexEntry,\n  VCSIndexFile,\n  CommitOptions,\n  CheckoutOptions,\n  LogOptions,\n  LogEntry,\n  BranchInfo,\n} from \"./types.cjs\";\n"
   ],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAqC,IAArC;",
   "debugId": "882B2013CEEDB5D864756E2164756E21",

package/dist/cjs/src/vcs/objects.cjs

@@ -0,0 +1,141 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toCommonJS = (from) => {
+  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
+  if (entry)
+    return entry;
+  entry = __defProp({}, "__esModule", { value: true });
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (var key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(entry, key))
+        __defProp(entry, key, {
+          get: __accessProp.bind(from, key),
+          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+        });
+  }
+  __moduleCache.set(from, entry);
+  return entry;
+};
+var __moduleCache;
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {
+      get: all[name],
+      enumerable: true,
+      configurable: true,
+      set: __exportSetter.bind(all, name)
+    });
+};
+
+// src/vcs/objects.ts
+var exports_objects = {};
+__export(exports_objects, {
+  VCSObjectStore: () => VCSObjectStore
+});
+module.exports = __toCommonJS(exports_objects);
+var import_sha2 = require("@noble/hashes/sha2.js");
+var import_content = require("./content.cjs");
+
+class VCSObjectStore {
+  fs;
+  basePath;
+  constructor(fs, basePath) {
+    this.fs = fs;
+    this.basePath = basePath;
+  }
+  async initialize() {
+    await this.fs.mkdir(this.path("objects", "blobs"), { recursive: true });
+    await this.fs.mkdir(this.path("tmp"), { recursive: true });
+  }
+  async hasBlob(blobId) {
+    return this.fs.exists(this.blobPath(blobId));
+  }
+  async store(source) {
+    const tempPath = this.path("tmp", `${Date.now()}-${Math.random().toString(36).slice(2)}.blob`);
+    const writer = await this.fs.writeStream(tempPath);
+    const hash = import_sha2.sha256.create();
+    let size = 0;
+    let sample = new Uint8Array;
+    try {
+      for await (const chunk of source) {
+        const bytes = chunk instanceof Uint8Array ? chunk : new Uint8Array(chunk);
+        hash.update(bytes);
+        size += bytes.byteLength;
+        sample = import_content.appendSample(sample, bytes);
+        await writer.write(bytes);
+      }
+      await writer.close();
+      const blobId = toHex(hash.digest());
+      const finalPath = this.blobPath(blobId);
+      await this.fs.mkdir(this.fs.dirname(finalPath), { recursive: true });
+      if (!await this.fs.exists(finalPath)) {
+        await copyStream(this.fs, tempPath, finalPath);
+      }
+      await this.fs.rm(tempPath, { force: true });
+      return {
+        blobId,
+        size,
+        binary: import_content.detectBinaryFromSample(sample),
+        sampleHash: import_content.hashSample(sample)
+      };
+    } catch (error) {
+      await writer.abort?.(error);
+      await this.fs.rm(tempPath, { force: true });
+      throw error;
+    }
+  }
+  async readBlob(blobId) {
+    return this.fs.readFile(this.blobPath(blobId));
+  }
+  async readBlobText(blobId) {
+    return this.fs.readFile(this.blobPath(blobId), "utf8");
+  }
+  readBlobStream(blobId) {
+    return this.fs.readStream(this.blobPath(blobId));
+  }
+  async isBinaryBlob(blobId) {
+    const sample = await import_content.readStreamSample(this.readBlobStream(blobId));
+    return import_content.detectBinaryFromSample(sample);
+  }
+  async deleteTempFiles() {
+    await this.fs.rm(this.path("tmp"), { recursive: true, force: true });
+    await this.fs.mkdir(this.path("tmp"), { recursive: true });
+  }
+  blobPath(blobId) {
+    return this.path("objects", "blobs", blobId.slice(0, 2), blobId.slice(2));
+  }
+  path(...segments) {
+    return this.fs.resolve(this.basePath, ...segments);
+  }
+}
+async function copyStream(fs, fromPath, toPath) {
+  const writer = await fs.writeStream(toPath);
+  try {
+    for await (const chunk of fs.readStream(fromPath)) {
+      await writer.write(chunk);
+    }
+    await writer.close();
+  } catch (error) {
+    await writer.abort?.(error);
+    await fs.rm(toPath, { force: true });
+    throw error;
+  }
+}
+function toHex(bytes) {
+  let out = "";
+  for (const byte of bytes) {
+    out += byte.toString(16).padStart(2, "0");
+  }
+  return out;
+}
+
+//# debugId=46E2107E1DA7789564756E2164756E21

package/dist/cjs/src/vcs/objects.cjs.map

@@ -0,0 +1,10 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/vcs/objects.ts"],
+  "sourcesContent": [
+    "import { sha256 } from \"@noble/hashes/sha2.js\";\nimport type { VirtualFS } from \"../types.cjs\";\nimport {\n  appendSample,\n  detectBinaryFromSample,\n  hashSample,\n  readStreamSample,\n} from \"./content.cjs\";\n\nexport interface StoredBlob {\n  blobId: string;\n  size: number;\n  binary: boolean;\n  sampleHash: string;\n}\n\nexport class VCSObjectStore {\n  constructor(\n    private readonly fs: VirtualFS,\n    private readonly basePath: string,\n  ) {}\n\n  async initialize(): Promise<void> {\n    await this.fs.mkdir(this.path(\"objects\", \"blobs\"), { recursive: true });\n    await this.fs.mkdir(this.path(\"tmp\"), { recursive: true });\n  }\n\n  async hasBlob(blobId: string): Promise<boolean> {\n    return this.fs.exists(this.blobPath(blobId));\n  }\n\n  async store(source: AsyncIterable<Uint8Array>): Promise<StoredBlob> {\n    const tempPath = this.path(\"tmp\", `${Date.now()}-${Math.random().toString(36).slice(2)}.blob`);\n    const writer = await this.fs.writeStream(tempPath);\n    const hash = sha256.create();\n    let size = 0;\n    let sample: Uint8Array<ArrayBufferLike> = new Uint8Array();\n\n    try {\n      for await (const chunk of source) {\n        const bytes = chunk instanceof Uint8Array ? chunk : new Uint8Array(chunk);\n        hash.update(bytes);\n        size += bytes.byteLength;\n        sample = appendSample(sample, bytes);\n        await writer.write(bytes);\n      }\n      await writer.close();\n\n      const blobId = toHex(hash.digest());\n      const finalPath = this.blobPath(blobId);\n      await this.fs.mkdir(this.fs.dirname(finalPath), { recursive: true });\n\n      if (!(await this.fs.exists(finalPath))) {\n        await copyStream(this.fs, tempPath, finalPath);\n      }\n\n      await this.fs.rm(tempPath, { force: true });\n      return {\n        blobId,\n        size,\n        binary: detectBinaryFromSample(sample),\n        sampleHash: hashSample(sample),\n      };\n    } catch (error) {\n      await writer.abort?.(error);\n      await this.fs.rm(tempPath, { force: true });\n      throw error;\n    }\n  }\n\n  async readBlob(blobId: string): Promise<Buffer> {\n    return this.fs.readFile(this.blobPath(blobId));\n  }\n\n  async readBlobText(blobId: string): Promise<string> {\n    return this.fs.readFile(this.blobPath(blobId), \"utf8\");\n  }\n\n  readBlobStream(blobId: string): AsyncIterable<Uint8Array> {\n    return this.fs.readStream(this.blobPath(blobId));\n  }\n\n  async isBinaryBlob(blobId: string): Promise<boolean> {\n    const sample = await readStreamSample(this.readBlobStream(blobId));\n    return detectBinaryFromSample(sample);\n  }\n\n  async deleteTempFiles(): Promise<void> {\n    await this.fs.rm(this.path(\"tmp\"), { recursive: true, force: true });\n    await this.fs.mkdir(this.path(\"tmp\"), { recursive: true });\n  }\n\n  private blobPath(blobId: string): string {\n    return this.path(\"objects\", \"blobs\", blobId.slice(0, 2), blobId.slice(2));\n  }\n\n  private path(...segments: string[]): string {\n    return this.fs.resolve(this.basePath, ...segments);\n  }\n}\n\nasync function copyStream(fs: VirtualFS, fromPath: string, toPath: string): Promise<void> {\n  const writer = await fs.writeStream(toPath);\n  try {\n    for await (const chunk of fs.readStream(fromPath)) {\n      await writer.write(chunk);\n    }\n    await writer.close();\n  } catch (error) {\n    await writer.abort?.(error);\n    await fs.rm(toPath, { force: true });\n    throw error;\n  }\n}\n\nfunction toHex(bytes: Uint8Array): string {\n  let out = \"\";\n  for (const byte of bytes) {\n    out += byte.toString(16).padStart(2, \"0\");\n  }\n  return out;\n}\n"
+  ],
+  "mappings": "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",
+  "debugId": "46E2107E1DA7789564756E2164756E21",
+  "names": []
+}

package/dist/cjs/src/vcs/rules.cjs

@@ -97,8 +97,8 @@ class VCSRules {
     return this.isIgnored(relPath);
   }
   resolveAttributes(relPath) {
-    let binary = false;
-    let diff = "text";
+    let binary;
+    let diff;
     for (const rule of this.attributeRules) {
       if (!matchVCSPath(rule.pattern, relPath))
         continue;
@@ -112,6 +112,9 @@ class VCSRules {
     if (diff === "binary") {
       binary = true;
     }
+    if (diff === "text") {
+      binary = false;
+    }
     return { binary, diff };
   }
 }
@@ -177,4 +180,4 @@ function hasTrackedPathAtOrBelow(relPath, trackedPaths) {
   return false;
 }
 
-//# debugId=FD722B600498944364756E2164756E21
+//# debugId=44746568854B06D364756E2164756E21

package/dist/cjs/src/vcs/rules.cjs.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../../../src/vcs/rules.ts"],
   "sourcesContent": [
-    "import { matchGlobPath } from \"./match.cjs\";\nimport type { VCSAttributeRule, VCSResolvedAttributes } from \"./types.cjs\";\n\ninterface VCSRulesConfig {\n  internalPath?: string;\n  internalDirName?: string;\n  ignore?: string[];\n  attributes?: VCSAttributeRule[];\n}\n\nexport class VCSRules {\n  private readonly internalPath: string;\n  private readonly ignorePatterns: string[];\n  private readonly attributeRules: VCSAttributeRule[];\n\n  constructor(config: VCSRulesConfig = {}) {\n    this.internalPath = normalizePath(config.internalPath ?? config.internalDirName ?? \"\");\n    this.ignorePatterns = [...(config.ignore ?? [])];\n    this.attributeRules = [...(config.attributes ?? [])];\n  }\n\n  isInternalPath(relPath: string): boolean {\n    if (!this.internalPath) return false;\n    const normalizedPath = normalizePath(relPath);\n    if (!normalizedPath) return false;\n    return normalizedPath === this.internalPath || normalizedPath.startsWith(`${this.internalPath}/`);\n  }\n\n  isIgnored(relPath: string): boolean {\n    if (this.isInternalPath(relPath)) return true;\n    return this.ignorePatterns.some((pattern) => matchVCSPath(pattern, relPath));\n  }\n\n  shouldEnterDirectory(relPath: string, trackedPaths: Iterable<string>): boolean {\n    if (this.isInternalPath(relPath)) return false;\n    if (!this.isIgnored(relPath)) return true;\n    return hasTrackedPathAtOrBelow(relPath, trackedPaths);\n  }\n\n  shouldIncludeWorkingFile(relPath: string, trackedPaths: ReadonlySet<string>): boolean {\n    if (this.isInternalPath(relPath)) return false;\n    if (trackedPaths.has(relPath)) return true;\n    return !this.isIgnored(relPath);\n  }\n\n  shouldIncludeEmptyDirectory(relPath: string, trackedPaths: ReadonlySet<string>): boolean {\n    if (this.isInternalPath(relPath)) return false;\n    if (trackedPaths.has(relPath)) return true;\n    return !this.isIgnored(relPath);\n  }\n\n  shouldIncludeRestoreScanFile(relPath: string): boolean {\n    return !this.isInternalPath(relPath);\n  }\n\n  shouldPreserveUntrackedIgnored(relPath: string, trackedPaths: ReadonlySet<string>): boolean {\n    if (trackedPaths.has(relPath)) return false;\n    return this.isIgnored(relPath);\n  }\n\n  resolveAttributes(relPath: string): VCSResolvedAttributes {\n    let binary = false;\n    let diff: VCSResolvedAttributes[\"diff\"] = \"text\";\n\n    for (const rule of this.attributeRules) {\n      if (!matchVCSPath(rule.pattern, relPath)) continue;\n      if (rule.binary !== undefined) {\n        binary = rule.binary;\n      }\n      if (rule.diff !== undefined) {\n        diff = rule.diff;\n      }\n    }\n\n    if (diff === \"binary\") {\n      binary = true;\n    }\n\n    return { binary, diff };\n  }\n}\n\nexport function matchVCSPath(pattern: string, relPath: string): boolean {\n  const normalizedPattern = normalizePattern(pattern);\n  const normalizedPath = normalizePath(relPath);\n\n  if (!normalizedPattern || !normalizedPath) return false;\n\n  if (normalizedPattern.mode === \"root-path\") {\n    return matchGlobPath(normalizedPattern.pattern, normalizedPath);\n  }\n\n  if (normalizedPattern.mode === \"root-segment\") {\n    const [firstSegment] = normalizedPath.split(\"/\");\n    return firstSegment ? matchGlobPath(normalizedPattern.pattern, firstSegment) : false;\n  }\n\n  if (normalizedPattern.mode === \"root-prefix\") {\n    return (\n      matchGlobPath(normalizedPattern.pattern, normalizedPath) ||\n      matchGlobPath(`${normalizedPattern.pattern}/**`, normalizedPath)\n    );\n  }\n\n  const segments = normalizedPath.split(\"/\");\n  return segments.some((segment) => matchGlobPath(normalizedPattern.pattern, segment));\n}\n\nfunction normalizePath(relPath: string): string {\n  return relPath.replace(/\\\\/g, \"/\").replace(/^\\/+/, \"\").replace(/\\/+$/, \"\");\n}\n\nfunction normalizePattern(pattern: string): {\n  pattern: string;\n  mode: \"root-path\" | \"root-prefix\" | \"root-segment\" | \"segment\";\n} | null {\n  let normalized = pattern.trim();\n  if (!normalized) return null;\n\n  normalized = normalized.replace(/\\\\/g, \"/\");\n  const anchored = normalized.startsWith(\"/\");\n  const directoryOnly = normalized.endsWith(\"/\");\n  normalized = normalized.replace(/^\\/+/, \"\").replace(/\\/+$/, \"\");\n  if (!normalized) return null;\n\n  if (normalized.includes(\"/\")) {\n    return {\n      pattern: normalized,\n      mode: directoryOnly ? \"root-prefix\" : \"root-path\",\n    };\n  }\n\n  if (anchored) {\n    return {\n      pattern: normalized,\n      mode: \"root-segment\",\n    };\n  }\n\n  return {\n    pattern: normalized,\n    mode: \"segment\",\n  };\n}\n\nfunction hasTrackedPathAtOrBelow(relPath: string, trackedPaths: Iterable<string>): boolean {\n  const normalizedPath = normalizePath(relPath);\n  if (!normalizedPath) return false;\n\n  const prefix = normalizedPath + \"/\";\n  for (const trackedPath of trackedPaths) {\n    const normalizedTrackedPath = normalizePath(trackedPath);\n    if (\n      normalizedTrackedPath === normalizedPath ||\n      normalizedTrackedPath.startsWith(prefix)\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n"
+    "import { matchGlobPath } from \"./match.cjs\";\nimport type { VCSAttributeRule, VCSResolvedAttributes } from \"./types.cjs\";\n\ninterface VCSRulesConfig {\n  internalPath?: string;\n  internalDirName?: string;\n  ignore?: string[];\n  attributes?: VCSAttributeRule[];\n}\n\nexport class VCSRules {\n  private readonly internalPath: string;\n  private readonly ignorePatterns: string[];\n  private readonly attributeRules: VCSAttributeRule[];\n\n  constructor(config: VCSRulesConfig = {}) {\n    this.internalPath = normalizePath(config.internalPath ?? config.internalDirName ?? \"\");\n    this.ignorePatterns = [...(config.ignore ?? [])];\n    this.attributeRules = [...(config.attributes ?? [])];\n  }\n\n  isInternalPath(relPath: string): boolean {\n    if (!this.internalPath) return false;\n    const normalizedPath = normalizePath(relPath);\n    if (!normalizedPath) return false;\n    return normalizedPath === this.internalPath || normalizedPath.startsWith(`${this.internalPath}/`);\n  }\n\n  isIgnored(relPath: string): boolean {\n    if (this.isInternalPath(relPath)) return true;\n    return this.ignorePatterns.some((pattern) => matchVCSPath(pattern, relPath));\n  }\n\n  shouldEnterDirectory(relPath: string, trackedPaths: Iterable<string>): boolean {\n    if (this.isInternalPath(relPath)) return false;\n    if (!this.isIgnored(relPath)) return true;\n    return hasTrackedPathAtOrBelow(relPath, trackedPaths);\n  }\n\n  shouldIncludeWorkingFile(relPath: string, trackedPaths: ReadonlySet<string>): boolean {\n    if (this.isInternalPath(relPath)) return false;\n    if (trackedPaths.has(relPath)) return true;\n    return !this.isIgnored(relPath);\n  }\n\n  shouldIncludeEmptyDirectory(relPath: string, trackedPaths: ReadonlySet<string>): boolean {\n    if (this.isInternalPath(relPath)) return false;\n    if (trackedPaths.has(relPath)) return true;\n    return !this.isIgnored(relPath);\n  }\n\n  shouldIncludeRestoreScanFile(relPath: string): boolean {\n    return !this.isInternalPath(relPath);\n  }\n\n  shouldPreserveUntrackedIgnored(relPath: string, trackedPaths: ReadonlySet<string>): boolean {\n    if (trackedPaths.has(relPath)) return false;\n    return this.isIgnored(relPath);\n  }\n\n  resolveAttributes(relPath: string): VCSResolvedAttributes {\n    let binary: boolean | undefined;\n    let diff: VCSResolvedAttributes[\"diff\"];\n\n    for (const rule of this.attributeRules) {\n      if (!matchVCSPath(rule.pattern, relPath)) continue;\n      if (rule.binary !== undefined) {\n        binary = rule.binary;\n      }\n      if (rule.diff !== undefined) {\n        diff = rule.diff;\n      }\n    }\n\n    if (diff === \"binary\") {\n      binary = true;\n    }\n    if (diff === \"text\") {\n      binary = false;\n    }\n\n    return { binary, diff };\n  }\n}\n\nexport function matchVCSPath(pattern: string, relPath: string): boolean {\n  const normalizedPattern = normalizePattern(pattern);\n  const normalizedPath = normalizePath(relPath);\n\n  if (!normalizedPattern || !normalizedPath) return false;\n\n  if (normalizedPattern.mode === \"root-path\") {\n    return matchGlobPath(normalizedPattern.pattern, normalizedPath);\n  }\n\n  if (normalizedPattern.mode === \"root-segment\") {\n    const [firstSegment] = normalizedPath.split(\"/\");\n    return firstSegment ? matchGlobPath(normalizedPattern.pattern, firstSegment) : false;\n  }\n\n  if (normalizedPattern.mode === \"root-prefix\") {\n    return (\n      matchGlobPath(normalizedPattern.pattern, normalizedPath) ||\n      matchGlobPath(`${normalizedPattern.pattern}/**`, normalizedPath)\n    );\n  }\n\n  const segments = normalizedPath.split(\"/\");\n  return segments.some((segment) => matchGlobPath(normalizedPattern.pattern, segment));\n}\n\nfunction normalizePath(relPath: string): string {\n  return relPath.replace(/\\\\/g, \"/\").replace(/^\\/+/, \"\").replace(/\\/+$/, \"\");\n}\n\nfunction normalizePattern(pattern: string): {\n  pattern: string;\n  mode: \"root-path\" | \"root-prefix\" | \"root-segment\" | \"segment\";\n} | null {\n  let normalized = pattern.trim();\n  if (!normalized) return null;\n\n  normalized = normalized.replace(/\\\\/g, \"/\");\n  const anchored = normalized.startsWith(\"/\");\n  const directoryOnly = normalized.endsWith(\"/\");\n  normalized = normalized.replace(/^\\/+/, \"\").replace(/\\/+$/, \"\");\n  if (!normalized) return null;\n\n  if (normalized.includes(\"/\")) {\n    return {\n      pattern: normalized,\n      mode: directoryOnly ? \"root-prefix\" : \"root-path\",\n    };\n  }\n\n  if (anchored) {\n    return {\n      pattern: normalized,\n      mode: \"root-segment\",\n    };\n  }\n\n  return {\n    pattern: normalized,\n    mode: \"segment\",\n  };\n}\n\nfunction hasTrackedPathAtOrBelow(relPath: string, trackedPaths: Iterable<string>): boolean {\n  const normalizedPath = normalizePath(relPath);\n  if (!normalizedPath) return false;\n\n  const prefix = normalizedPath + \"/\";\n  for (const trackedPath of trackedPaths) {\n    const normalizedTrackedPath = normalizePath(trackedPath);\n    if (\n      normalizedTrackedPath === normalizedPath ||\n      normalizedTrackedPath.startsWith(prefix)\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n"
   ],
-  "mappings": "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",
-  "debugId": "FD722B600498944364756E2164756E21",
+  "mappings": "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",
+  "debugId": "44746568854B06D364756E2164756E21",
   "names": []
 }

package/dist/cjs/src/vcs/snapshot.cjs

@@ -39,17 +39,20 @@ var __export = (target, all) => {
 // src/vcs/snapshot.ts
 var exports_snapshot = {};
 __export(exports_snapshot, {
+  updateIndexForScopedPaths: () => updateIndexForScopedPaths,
   restoreTree: () => restoreTree,
-  buildTreeManifest: () => buildTreeManifest,
-  buildPartialManifest: () => buildPartialManifest
+  rebuildIndexForManifest: () => rebuildIndexForManifest,
+  buildTreeManifest: () => buildTreeManifest
 });
 module.exports = __toCommonJS(exports_snapshot);
+var import_content = require("./content.cjs");
 var import_rules = require("./rules.cjs");
 var import_walk = require("./walk.cjs");
 async function buildTreeManifest(fs, rootPath, options) {
   const manifest = {};
-  const rules = options?.rules ?? new import_rules.VCSRules({ internalDirName: ".vcs" });
-  const trackedPaths = new Set(options?.trackedPaths ?? []);
+  const nextIndexEntries = {};
+  const rules = options.rules ?? new import_rules.VCSRules({ internalDirName: ".vcs" });
+  const trackedPaths = new Set(options.trackedPaths ?? []);
   const entries = await import_walk.walkTreeEntries(fs, rootPath, {
     enterDirectory: (relPath) => rules.shouldEnterDirectory(relPath, trackedPaths),
     includeFile: (relPath) => rules.shouldIncludeWorkingFile(relPath, trackedPaths),
@@ -61,43 +64,37 @@ async function buildTreeManifest(fs, rootPath, options) {
       continue;
     }
     const fullPath = fs.resolve(rootPath, entry.path);
-    const content = await fs.readFile(fullPath);
-    const buf = Buffer.from(content);
-    manifest[entry.path] = {
-      kind: "file",
-      content: buf.toString("base64"),
-      size: buf.length
-    };
-  }
-  return manifest;
-}
-async function buildPartialManifest(fs, rootPath, paths) {
-  const manifest = {};
-  for (const relPath of paths) {
-    const fullPath = fs.resolve(rootPath, relPath);
-    if (!await fs.exists(fullPath))
-      continue;
     const stat = await fs.stat(fullPath);
-    if (stat.isDirectory()) {
-      const entries = await fs.readdir(fullPath);
-      if (entries.length === 0) {
-        manifest[relPath] = { kind: "directory", size: 0 };
+    const cached = options.indexEntries?.[entry.path];
+    if (cached && cached.size === stat.size && cached.mtimeMs === stat.mtimeMs && await options.objectStore.hasBlob(cached.blobId)) {
+      const sampleHash = import_content.hashSample(await import_content.readStreamSample(fs.readStream(fullPath)));
+      if (sampleHash === cached.sampleHash) {
+        manifest[entry.path] = {
+          kind: "file",
+          blobId: cached.blobId,
+          size: cached.size
+        };
+        nextIndexEntries[entry.path] = cached;
+        continue;
       }
-      continue;
     }
-    if (!stat.isFile())
-      continue;
-    const content = await fs.readFile(fullPath);
-    const buf = Buffer.from(content);
-    manifest[relPath] = {
+    const stored = await options.objectStore.store(fs.readStream(fullPath));
+    manifest[entry.path] = {
       kind: "file",
-      content: buf.toString("base64"),
-      size: buf.length
+      blobId: stored.blobId,
+      size: stored.size
+    };
+    nextIndexEntries[entry.path] = {
+      blobId: stored.blobId,
+      size: stored.size,
+      mtimeMs: stat.mtimeMs,
+      binary: stored.binary,
+      sampleHash: stored.sampleHash
     };
   }
-  return manifest;
+  return { manifest, indexEntries: nextIndexEntries };
 }
-async function restoreTree(fs, rootPath, manifest, options) {
+async function restoreTree(fs, rootPath, manifest, objectStore, options) {
   const fullRestore = options?.fullRestore ?? false;
   const rules = options?.rules ?? new import_rules.VCSRules({ internalDirName: ".vcs" });
   const trackedPaths = new Set(options?.trackedPaths ?? []);
@@ -132,7 +129,7 @@ async function restoreTree(fs, rootPath, manifest, options) {
       await ensureDirectoryExists(fs, fs.resolve(rootPath, relPath));
       continue;
     }
-    await writeFileFromEntry(fs, rootPath, relPath, entry);
+    await writeFileFromEntry(fs, rootPath, relPath, entry, objectStore);
   }
   if (shouldDeleteExtras) {
     const currentEntries = await import_walk.walkTreeEntries(fs, rootPath, {
@@ -153,12 +150,65 @@ async function restoreTree(fs, rootPath, manifest, options) {
     }
   }
 }
-async function writeFileFromEntry(fs, rootPath, relPath, entry) {
+async function rebuildIndexForManifest(fs, rootPath, manifest, objectStore) {
+  const entries = {};
+  for (const [relPath, entry] of Object.entries(manifest)) {
+    if (isDirectoryEntry(entry)) {
+      continue;
+    }
+    const fullPath = fs.resolve(rootPath, relPath);
+    const stat = await fs.stat(fullPath);
+    entries[relPath] = {
+      blobId: entry.blobId,
+      size: entry.size,
+      mtimeMs: stat.mtimeMs,
+      binary: await objectStore.isBinaryBlob(entry.blobId),
+      sampleHash: import_content.hashSample(await import_content.readStreamSample(fs.readStream(fullPath)))
+    };
+  }
+  return entries;
+}
+async function updateIndexForScopedPaths(fs, rootPath, manifest, objectStore, existingIndex, patterns) {
+  const nextIndex = { ...existingIndex };
+  for (const relPath of Object.keys(existingIndex)) {
+    if (isPathInScope(relPath, patterns) && !manifest[relPath]) {
+      delete nextIndex[relPath];
+    }
+  }
+  for (const [relPath, entry] of Object.entries(manifest)) {
+    if (!isPathInScope(relPath, patterns) || isDirectoryEntry(entry)) {
+      continue;
+    }
+    const fullPath = fs.resolve(rootPath, relPath);
+    if (!await fs.exists(fullPath)) {
+      delete nextIndex[relPath];
+      continue;
+    }
+    const stat = await fs.stat(fullPath);
+    nextIndex[relPath] = {
+      blobId: entry.blobId,
+      size: entry.size,
+      mtimeMs: stat.mtimeMs,
+      binary: await objectStore.isBinaryBlob(entry.blobId),
+      sampleHash: import_content.hashSample(await import_content.readStreamSample(fs.readStream(fullPath)))
+    };
+  }
+  return nextIndex;
+}
+async function writeFileFromEntry(fs, rootPath, relPath, entry, objectStore) {
   const fullPath = fs.resolve(rootPath, relPath);
   await ensureDirectoryExists(fs, fs.dirname(fullPath));
   await removeDirectoryAtPath(fs, fullPath);
-  const buf = Buffer.from(entry.content, "base64");
-  await fs.writeFile(fullPath, buf);
+  const writer = await fs.writeStream(fullPath);
+  try {
+    for await (const chunk of objectStore.readBlobStream(entry.blobId)) {
+      await writer.write(chunk);
+    }
+    await writer.close();
+  } catch (error) {
+    await writer.abort?.(error);
+    throw error;
+  }
 }
 function isDirectoryEntry(entry) {
   return entry.kind === "directory";
@@ -225,4 +275,4 @@ async function isEmptyDirectory(fs, dirPath) {
   }
 }
 
-//# debugId=7E15F1F035E56CC164756E2164756E21
+//# debugId=7BF3A16CF496D89964756E2164756E21