@poe-platform/safe-bash 0.1.814 → 0.1.815

package/dist/safe-bash/command-chunks/{chunk-K4XNUJVJ.js → chunk-6EINUY5G.js}

@@ -9,7 +9,7 @@ import {
   parseStreamingManifest,
   probeOggFlacSource,
   probeOggStreamMetadata
-} from "./chunk-LAPOMHGY.js";
+} from "./chunk-NEYITAAO.js";
 
 // packages/safe-bash-command-ffprobe/src/ogg-probe.ts
 import { probeOggStreamSource } from "../../audio-ast/index.js";
@@ -1350,47 +1350,74 @@ function formatIntrospectionOutput(flag, plugins, command = "ffmpeg") {
 function formatFfprobeResult(probe2, opts, audioInput) {
   return Array.from(formatFfprobeResultChunks(probe2, opts, audioInput)).join("");
 }
-function* formatFfprobeResultChunks(probe2, opts, audioInput) {
-  if (audioInput && !opts.showPackets && !opts.showFrames && !opts.showChapters && !opts.showPrograms && !opts.countFrames && !opts.countPackets && probe2.streams.length > 0 && probe2.streams.every((stream) => stream.codec_type === "audio")) {
+function formatQualifiedAudio(probe2, opts, audioInput) {
+  if (audioInput && !opts.showPackets && !opts.showFrames && !opts.showChapters && !opts.showPrograms && !opts.countFrames && !opts.countPackets && Array.isArray(probe2.streams) && probe2.streams.length > 0 && probe2.streams.every((stream) => stream.codec_type === "audio")) {
     let formatted;
     try {
       formatted = "bytes" in audioInput ? probe(audioInput.bytes, audioInput.args) : formatAudioProbe({ ...audioInput.audio, nodes: audioInput.audio.nodes ?? [] }, audioInput.size, parseArguments(audioInput.args));
     } catch {
     }
-    if (formatted !== void 0) {
-      yield formatted;
-      return;
+    return formatted;
+  }
+}
+function* formatFfprobeResultChunks(probe2, opts, audioInput) {
+  const audio = formatQualifiedAudio(probe2, opts, audioInput);
+  if (audio !== void 0) {
+    yield audio;
+    return;
+  }
+  for (const step of formatProbeSteps(probe2, opts)) {
+    if (typeof step === "string") {
+      yield step;
+      continue;
     }
+    let index = 0;
+    for (const row of step.rows) yield* step.render(row, index++);
+  }
+}
+async function* formatFfprobeSourceChunks(probe2, opts, audioInput, signal) {
+  signal?.throwIfAborted();
+  const audio = formatQualifiedAudio(probe2, opts, audioInput);
+  if (audio !== void 0) {
+    yield audio;
+    return;
   }
-  let filteredStreams = [...probe2.streams];
-  if (opts.selectStreams) {
-    const spec = opts.selectStreams.toLowerCase();
-    if (spec === "v") {
-      filteredStreams = filteredStreams.filter((s) => s.codec_type === "video");
-    } else if (spec === "a") {
-      filteredStreams = filteredStreams.filter((s) => s.codec_type === "audio");
-    } else if (spec === "s") {
-      filteredStreams = filteredStreams.filter((s) => s.codec_type === "subtitle");
-    } else if (spec.startsWith("v:")) {
-      const ord = parseInt(spec.slice(2), 10) || 0;
-      const vList = filteredStreams.filter((s) => s.codec_type === "video");
-      filteredStreams = vList[ord] ? [vList[ord]] : [];
-    } else if (spec.startsWith("a:")) {
-      const ord = parseInt(spec.slice(2), 10) || 0;
-      const aList = filteredStreams.filter((s) => s.codec_type === "audio");
-      filteredStreams = aList[ord] ? [aList[ord]] : [];
-    } else if (/^\d+$/.test(spec)) {
-      const idx = parseInt(spec, 10);
-      filteredStreams = filteredStreams.filter((s) => s.index === idx);
-    }
-  }
-  if (opts.countFrames || opts.countPackets) {
-    filteredStreams = filteredStreams.map((s) => ({
-      ...s,
-      ...opts.countFrames ? { nb_read_frames: s.nb_frames ?? "0" } : {},
-      ...opts.countPackets ? { nb_read_packets: s.nb_frames ?? "0" } : {}
-    }));
+  for (const step of formatProbeSteps(probe2, opts)) {
+    signal?.throwIfAborted();
+    if (typeof step === "string") {
+      yield step;
+      continue;
+    }
+    const iterator = Symbol.asyncIterator in step.rows ? step.rows[Symbol.asyncIterator]() : step.rows[Symbol.iterator]();
+    let index = 0, ended = false, failed = false;
+    try {
+      for (; ; ) {
+        signal?.throwIfAborted();
+        const next = await iterator.next();
+        signal?.throwIfAborted();
+        if (next.done) {
+          ended = true;
+          break;
+        }
+        yield* step.render(next.value, index++);
+        if (index % 256 === 0) await yieldTurn6(signal);
+      }
+    } catch (error) {
+      failed = true;
+      throw error;
+    } finally {
+      if (!ended) {
+        if (failed) {
+          try {
+            await iterator.return?.();
+          } catch {
+          }
+        } else await iterator.return?.();
+      }
+    }
   }
+}
+function* formatProbeSteps(probe2, opts) {
   const entryFilter = /* @__PURE__ */ new Map();
   if (opts.showEntries) {
     for (const secSpec of opts.showEntries.split(":")) {
@@ -1440,9 +1467,23 @@ function* formatFfprobeResultChunks(probe2, opts, audioInput) {
   const includeFrames = opts.showFrames || entryFilter.has("frame");
   const includeChapters = opts.showChapters || entryFilter.has("chapter");
   const includePrograms = opts.showPrograms || entryFilter.has("program");
-  const finalStreams = includeStreams ? filteredStreams.map(
-    (s) => filterObject(s, "stream", "stream_tags")
-  ) : void 0;
+  let typeOrdinal = 0;
+  const prepareStream = (row) => {
+    const stream = row, spec = opts.selectStreams?.toLowerCase();
+    if (spec) {
+      const type = spec[0] === "v" ? "video" : spec[0] === "a" ? "audio" : spec[0] === "s" ? "subtitle" : void 0;
+      if ((spec === "v" || spec === "a" || spec === "s") && stream.codec_type !== type) return;
+      if (spec.startsWith("v:") || spec.startsWith("a:")) {
+        if (stream.codec_type !== type) return;
+        if (typeOrdinal++ !== (parseInt(spec.slice(2), 10) || 0)) return;
+      } else if ([...spec].every((c) => c >= "0" && c <= "9") && stream.index !== parseInt(spec, 10)) return;
+    }
+    return filterObject({
+      ...stream,
+      ...opts.countFrames ? { nb_read_frames: stream.nb_frames ?? "0" } : {},
+      ...opts.countPackets ? { nb_read_packets: stream.nb_frames ?? "0" } : {}
+    }, "stream", "stream_tags");
+  };
   const finalFormat = includeFormat ? filterObject(probe2.format, "format", "format_tags") : void 0;
   const [fmtNameRaw, ...fmtParams] = opts.printFormat.split(":");
   const rawHead = fmtNameRaw ?? "default";
@@ -1463,7 +1504,7 @@ function* formatFfprobeResultChunks(probe2, opts, audioInput) {
     if (includePrograms) sections.push({ name: "programs", rows: [] });
     if (includePackets && probe2.packets) sections.push({ name: "packets", rows: probe2.packets });
     if (includeFrames && probe2.frames) sections.push({ name: "frames", rows: probe2.frames });
-    if (finalStreams !== void 0) sections.push({ name: "streams", rows: finalStreams });
+    if (includeStreams) sections.push({ name: "streams", rows: probe2.streams });
     if (includeChapters) sections.push({ name: "chapters", rows: probe2.chapters });
     if (finalFormat !== void 0) sections.push({ name: "format", value: finalFormat });
     const compact = paramMap.c === "1" || paramMap.compact === "1";
@@ -1475,12 +1516,16 @@ function* formatFfprobeResultChunks(probe2, opts, audioInput) {
       if (section.rows) {
         yield "[";
         let firstRow = true;
-        for (const row of section.rows) {
+        yield { rows: section.rows, *render(row) {
+          if (section.name === "streams") {
+            row = prepareStream(row);
+            if (row === void 0) return;
+          }
           yield (firstRow ? "" : ",") + (compact ? "" : "\n    ");
           firstRow = false;
           const text = JSON.stringify(row, null, compact ? void 0 : 2) ?? "null";
           yield compact ? text : text.replaceAll("\n", "\n    ");
-        }
+        } };
         yield (compact || firstRow ? "" : "\n  ") + "]";
       } else {
         const text = JSON.stringify(section.value, null, compact ? void 0 : 2);
@@ -1512,103 +1557,53 @@ function* formatFfprobeResultChunks(probe2, opts, audioInput) {
     }
     return fmt === "flat" ? '"' + escaped + '"' : escaped;
   }
-  if (fmt === "csv" || fmt === "compact") {
-    const sep = fmt === "csv" ? paramMap.s ?? "," : paramMap.s ?? "|";
-    const printSection = paramMap.p !== "0" && paramMap.print_section !== "0";
-    const lines2 = [];
-    if (finalStreams) {
-      for (const s of finalStreams) {
-        const vals = [];
-        if (printSection) vals.push("stream");
-        for (const [k, v] of probeEntries(s, "tag:")) {
-          if (v === void 0 || typeof v === "object") continue;
-          vals.push(noKey || fmt === "csv" ? probeText(v, sep) : `${k}=${probeText(v, sep)}`);
-        }
-        lines2.push(vals.join(sep));
-      }
-    }
-    if (finalFormat) {
-      const vals = [];
-      if (printSection) vals.push("format");
-      for (const [k, v] of probeEntries(finalFormat, "tag:")) {
-        if (v === void 0 || typeof v === "object") continue;
-        vals.push(noKey || fmt === "csv" ? probeText(v, sep) : `${k}=${probeText(v, sep)}`);
-      }
-      lines2.push(vals.join(sep));
-    }
-    yield lines2.join("\n") + (lines2.length > 0 ? "\n" : "");
-    return;
-  }
-  if (fmt === "flat") {
-    const sep = paramMap.s ?? ".";
-    const lines2 = [];
-    if (finalStreams) {
-      finalStreams.forEach((s, idx) => {
-        for (const [k, v] of probeEntries(s, `tags${sep}`)) {
-          if (v === void 0 || typeof v === "object") continue;
-          lines2.push(`streams${sep}stream${sep}${idx}${sep}${k}=${probeText(v)}`);
-        }
-      });
-    }
-    if (finalFormat) {
-      for (const [k, v] of probeEntries(finalFormat, `tags${sep}`)) {
-        if (v === void 0 || typeof v === "object") continue;
-        lines2.push(`format${sep}${k}=${probeText(v)}`);
+  let streamIndex = 0;
+  function* render(section, name, index = 0) {
+    if (fmt === "csv" || fmt === "compact") {
+      const sep = fmt === "csv" ? paramMap.s ?? "," : paramMap.s ?? "|";
+      const printSection = paramMap.p !== "0" && paramMap.print_section !== "0";
+      let first = true;
+      if (printSection) {
+        yield name;
+        first = false;
       }
-    }
-    yield lines2.join("\n") + (lines2.length > 0 ? "\n" : "");
-    return;
-  }
-  const lines = [];
-  if (finalStreams) {
-    for (const s of finalStreams) {
-      if (!noWrappers) lines.push("[STREAM]");
-      for (const [k, v] of Object.entries(s)) {
-        if (v === void 0) continue;
-        if (k === "tags" && v && typeof v === "object") {
-          for (const [tk, tv] of Object.entries(v)) {
-            lines.push(noKey ? String(tv) : `TAG:${tk}=${String(tv)}`);
-          }
-          continue;
-        }
-        if (typeof v === "object") continue;
-        lines.push(noKey ? String(v) : `${k}=${String(v)}`);
+      for (const [key, value] of probeEntries(section, "tag:")) {
+        if (value === void 0 || typeof value === "object") continue;
+        if (!first) yield sep;
+        first = false;
+        yield noKey || fmt === "csv" ? probeText(value, sep) : `${key}=${probeText(value, sep)}`;
       }
-      if (!noWrappers) lines.push("[/STREAM]");
-    }
-  }
-  if (includeChapters && probe2.chapters.length > 0) {
-    for (const ch of probe2.chapters) {
-      if (!noWrappers) lines.push("[CHAPTER]");
-      lines.push(noKey ? String(ch.id) : `id=${ch.id}`);
-      lines.push(noKey ? ch.time_base : `time_base=${ch.time_base}`);
-      lines.push(noKey ? String(ch.start) : `start=${ch.start}`);
-      lines.push(noKey ? ch.start_time : `start_time=${ch.start_time}`);
-      lines.push(noKey ? String(ch.end) : `end=${ch.end}`);
-      lines.push(noKey ? ch.end_time : `end_time=${ch.end_time}`);
-      for (const [tk, tv] of Object.entries(ch.tags)) {
-        lines.push(noKey ? String(tv) : `TAG:${tk}=${tv}`);
+      yield "\n";
+    } else if (fmt === "flat") {
+      const sep = paramMap.s ?? ".", prefix = name === "stream" ? `streams${sep}stream${sep}${index}${sep}` : `format${sep}`;
+      for (const [key, value] of probeEntries(section, `tags${sep}`)) {
+        if (value === void 0 || typeof value === "object") continue;
+        yield `${prefix}${key}=${probeText(value)}
+`;
       }
-      if (!noWrappers) lines.push("[/CHAPTER]");
-    }
-  }
-  if (finalFormat) {
-    if (!noWrappers) lines.push("[FORMAT]");
-    for (const [k, v] of Object.entries(finalFormat)) {
-      if (v === void 0) continue;
-      if (k === "tags" && v && typeof v === "object") {
-        for (const [tk, tv] of Object.entries(v)) {
-          lines.push(noKey ? String(tv) : `TAG:${tk}=${String(tv)}`);
-        }
-        continue;
+    } else {
+      const wrapper = name.toUpperCase();
+      if (!noWrappers) yield `[${wrapper}]
+`;
+      for (const [key, value] of Object.entries(section)) {
+        if (value === void 0) continue;
+        if (key === "tags" && value && typeof value === "object") {
+          for (const [tag, text] of Object.entries(value)) yield (noKey ? String(text) : `TAG:${tag}=${String(text)}`) + "\n";
+        } else if (typeof value !== "object") yield (noKey ? String(value) : `${key}=${String(value)}`) + "\n";
       }
-      if (typeof v === "object") continue;
-      lines.push(noKey ? String(v) : `${k}=${String(v)}`);
+      if (!noWrappers) yield `[/${wrapper}]
+`;
     }
-    if (!noWrappers) lines.push("[/FORMAT]");
   }
-  yield lines.join("\n") + (lines.length > 0 ? "\n" : "");
-  return;
+  if (includeStreams) yield { rows: probe2.streams, *render(row) {
+    const stream = prepareStream(row);
+    if (stream !== void 0) yield* render(stream, "stream", streamIndex++);
+  } };
+  if (includeChapters && fmt !== "csv" && fmt !== "compact" && fmt !== "flat") yield { rows: probe2.chapters, *render(row) {
+    const chapter = row;
+    yield* render({ id: chapter.id, time_base: chapter.time_base, start: chapter.start, start_time: chapter.start_time, end: chapter.end, end_time: chapter.end_time, tags: chapter.tags }, "chapter");
+  } };
+  if (finalFormat) yield* render(finalFormat, "format");
 }
 var defaultAstPluginsCache;
 var defaultRegistryCache;
@@ -1700,14 +1695,15 @@ async function probeSourceMetadata(context, plugins, input, filename, budget, re
     plugin = plugins.find((candidate) => candidate.detect(header, filename));
   }
   if (!plugin) return void 0;
-  if (plugin.formatName === "ogg" && !plugin.probeMetadata) {
+  if (plugin.formatName === "ogg" && !plugin.probeRecords && !plugin.probeMetadata) {
     const probeOptions = { ...records, filename, signal: context.signal, budget, limits: budget.limits, checkpoint: () => yieldTurn6(context.signal) };
     const flac = await probeOggFlacSource(source, probeOptions);
     if (flac) return flac;
     const ogg = await probeStoredOgg(source, context, retain);
     return onAudio ? { oggRows: ogg.rows } : probeOggStreamMetadata(ogg.first, source.size, probeOptions);
   }
-  const result = await plugin.probeMetadata(source, { ...records, filename, signal: context.signal, budget, limits: budget.limits });
+  const result = await (plugin.probeRecords ?? plugin.probeMetadata).call(plugin, source, { ...records, filename, signal: context.signal, budget, limits: budget.limits });
+  if (result.close) retain(result.close.bind(result));
   if (onAudio) {
     const tags = plugin.formatName === "flac" ? new FlacTags(source, context) : new SourceAudioTags(source, context);
     retain(tags.close);
@@ -1752,35 +1748,22 @@ async function probeRetainedMetadata(context, plugins, path, filename, budget, r
   context.signal.throwIfAborted();
   if (capabilities.retainedRead !== true) return void 0;
   const handle = await context.fs.openReadFile(path, { signal: context.signal });
-  if (onAudio) retain(handle.close.bind(handle));
-  let failed = true;
-  try {
-    context.signal.throwIfAborted();
-    const stat = await handle.stat({ signal: context.signal });
-    context.signal.throwIfAborted();
-    if (!Number.isSafeInteger(stat.size) || stat.size < 0) throw new Error("Invalid media source size");
-    context.inputBudget?.check(stat.size);
-    budget.checkInputBytes(stat.size);
-    const result = await probeSourceMetadata(context, plugins, {
-      size: stat.size,
-      read: (offset, length) => handle.read(offset, length, { signal: context.signal })
-    }, filename, budget, records, onAudio, retain, detect);
-    context.signal.throwIfAborted();
-    failed = false;
-    return result;
-  } finally {
-    if (!onAudio) {
-      if (failed) {
-        try {
-          await handle.close();
-        } catch {
-        }
-      } else await handle.close();
-    }
-  }
+  retain(handle.close.bind(handle));
+  context.signal.throwIfAborted();
+  const stat = await handle.stat({ signal: context.signal });
+  context.signal.throwIfAborted();
+  if (!Number.isSafeInteger(stat.size) || stat.size < 0) throw new Error("Invalid media source size");
+  context.inputBudget?.check(stat.size);
+  budget.checkInputBytes(stat.size);
+  const result = await probeSourceMetadata(context, plugins, {
+    size: stat.size,
+    read: (offset, length) => handle.read(offset, length, { signal: context.signal })
+  }, filename, budget, records, onAudio, retain, detect);
+  context.signal.throwIfAborted();
+  return result;
 }
 async function probeStreamMetadata(context, plugin, filename, budget, records) {
-  if (!plugin.canDemux || !plugin.probeMetadataStream) return void 0;
+  if (!plugin.canDemux || plugin.probeRecords || !plugin.probeMetadataStream) return void 0;
   context.signal.throwIfAborted();
   const source = await openProbeStream(context, isStdin(filename) ? void 0 : resolvePath(context.cwd, filename));
   if (!source) return void 0;
@@ -1882,9 +1865,9 @@ function createFfprobeCommand(options = {}) {
             automaticAudio = false;
           }
         }
-        const automaticPlugins = !options.asts && !explicitFormat ? astPlugins.filter((plugin) => plugin.canDemux && (plugin.probeMetadata || plugin === registry.findByFormatName("ogg")) && (!automaticAudio || ["wav", "flac", "mp3", "ogg"].some((format) => plugin === registry.findByFormatName(format)))) : [];
+        const automaticPlugins = !explicitFormat ? astPlugins.filter((plugin) => plugin.canDemux && (plugin.probeRecords || plugin.probeMetadata || !options.asts && plugin === registry.findByFormatName("ogg")) && (!automaticAudio || ["wav", "flac", "mp3", "ogg"].some((format) => plugin === registry.findByFormatName(format)))) : [];
         const explicitPlugin = explicitFormat ? registry.findByFormatName(explicitFormat) : void 0;
-        const retainedPlugins = explicitPlugin ? explicitPlugin.canDemux && (explicitPlugin.probeMetadata || !options.asts && explicitPlugin === registry.findByFormatName("ogg")) ? [explicitPlugin] : [] : automaticPlugins;
+        const retainedPlugins = explicitPlugin ? explicitPlugin.canDemux && (explicitPlugin.probeRecords || explicitPlugin.probeMetadata || !options.asts && explicitPlugin === registry.findByFormatName("ogg")) ? [explicitPlugin] : [] : automaticPlugins;
         let probeResult = retainedPlugins.length && !isStdin(inputTarget) ? await probeRetainedMetadata(context, retainedPlugins, resolvePath(context.cwd, inputTarget), inputTarget, budget, { showPackets, showFrames }, automaticAudio ? (audio, size, tags) => {
           audioInput = { audio, size, args };
           storedTags = tags;
@@ -1902,7 +1885,7 @@ function createFfprobeCommand(options = {}) {
             });
             const automaticPlugin = explicitPlugin ?? streamPlugins.find((plugin) => plugin.detect(sniffed.prefix, inputTarget));
             if (automaticPlugin) {
-              if (!automaticAudio && automaticPlugin.probeMetadataStream) {
+              if (!automaticAudio && !automaticPlugin.probeRecords && automaticPlugin.probeMetadataStream) {
                 probeResult = await automaticPlugin.probeMetadataStream(sniffed.stream, {
                   showPackets,
                   showFrames,
@@ -1943,7 +1926,7 @@ function createFfprobeCommand(options = {}) {
           });
           if (!options.asts && !explicitFormat) audioInput = { bytes, args };
         }
-        const formatted = "oggRows" in probeResult ? formatTaggedRows(probeResult.oggRows(args), args) : storedTags && audioInput && "audio" in audioInput ? formatTaggedAudio(audioInput.audio, audioInput.size, audioInput.args, storedTags) : formatFfprobeResultChunks(probeResult, {
+        const formatted = "oggRows" in probeResult ? formatTaggedRows(probeResult.oggRows(args), args) : storedTags && audioInput && "audio" in audioInput ? formatTaggedAudio(audioInput.audio, audioInput.size, audioInput.args, storedTags) : formatFfprobeSourceChunks(probeResult, {
           printFormat,
           showFormat,
           showStreams,
@@ -1955,7 +1938,7 @@ function createFfprobeCommand(options = {}) {
           showEntries,
           countFrames,
           countPackets
-        }, audioInput);
+        }, audioInput, context.signal);
         await writeProbeOutput(context, formatted, (total) => budget.checkOutputBytes(total), closeInputs);
         options.onMetrics?.(budget.getStats());
         return { exitCode: 0 };
@@ -2044,6 +2027,7 @@ export {
   formatIntrospectionOutput,
   formatFfprobeResult,
   formatFfprobeResultChunks,
+  formatFfprobeSourceChunks,
   getDefaultMediaRegistry,
   createFfprobeCommand,
   evalSyncFfprobe

package/dist/safe-bash/command-chunks/{chunk-5BIQWWLB.js → chunk-CFMJXJS5.js}

@@ -1,6 +1,6 @@
 import {
   targetBytes
-} from "./chunk-CK2WFJZN.js";
+} from "./chunk-KASXIRKD.js";
 
 // packages/safe-bash-command-patch/src/patch-publication.ts
 import { compareCopyIdentity } from "../../safe-bash-contracts/filesystem-identity.js";

package/dist/safe-bash/command-chunks/{chunk-3JM7E42I.js → chunk-GPGLTWNR.js}

@@ -1,6 +1,6 @@
 import {
   targetBytes
-} from "./chunk-CK2WFJZN.js";
+} from "./chunk-KASXIRKD.js";
 
 // packages/safe-bash-command-patch/src/stored-patch.ts
 import { PagedStorage } from "@poe-platform/safe-fs/storage";
@@ -8,33 +8,48 @@ import { closeDocumentResources } from "../../safe-bash-diff-engine/document.js"
 async function patchLine(hunk, index) {
   return Array.isArray(hunk.lines) ? hunk.lines[index] : hunk.lines.read(index);
 }
+async function patchHunk(patch, index) {
+  return Array.isArray(patch.hunks) ? patch.hunks[index] : patch.hunks.read(index);
+}
+async function* patchHunks(patch) {
+  for (let index = 0; index < patch.hunks.length; index++) yield [index, await patchHunk(patch, index)];
+}
+var BodyLines = class {
+  constructor(start, records, data) {
+    this.start = start;
+    this.records = records;
+    this.data = data;
+  }
+  start;
+  records;
+  data;
+  length = 0;
+  async read(index) {
+    if (!Number.isSafeInteger(index) || index < 0 || index >= this.length) throw new RangeError("Invalid patch line");
+    const bytes = await this.records.read(this.start + index * 24, 24);
+    const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+    return {
+      kind: String.fromCharCode(bytes[16]),
+      text: { storage: this.data, start: view.getFloat64(0, true), end: view.getFloat64(8, true) }
+    };
+  }
+};
 var PatchBodyStore = class {
   data;
   records;
+  hunks;
   dataEnd = 8;
   recordEnd = 8;
+  hunkEnd = 8;
   constructor(documents) {
     this.data = new PagedStorage(documents.budget.context, 16, documents.cache);
     this.records = new PagedStorage(documents.budget.context, 16, documents.cache);
+    this.hunks = new PagedStorage(documents.budget.context, 16, documents.cache);
   }
   begin() {
-    const start = this.recordEnd;
-    let length = 0;
+    const lines = new BodyLines(this.recordEnd, this.records, this.data);
     return {
-      lines: {
-        get length() {
-          return length;
-        },
-        read: async (index) => {
-          if (!Number.isSafeInteger(index) || index < 0 || index >= length) throw new RangeError("Invalid patch line");
-          const bytes = await this.records.read(start + index * 24, 24);
-          const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
-          return {
-            kind: String.fromCharCode(bytes[16]),
-            text: { storage: this.data, start: view.getFloat64(0, true), end: view.getFloat64(8, true) }
-          };
-        }
-      },
+      lines,
       append: async (line) => {
         const textStart = this.dataEnd;
         for await (const bytes of targetBytes(line.text)) {
@@ -47,12 +62,66 @@ var PatchBodyStore = class {
         cell[16] = line.kind.charCodeAt(0);
         await this.records.append(cell);
         this.recordEnd += 24;
+        lines.length++;
+      }
+    };
+  }
+  beginHunks() {
+    const start = this.hunkEnd;
+    let length = 0;
+    return {
+      hunks: {
+        get length() {
+          return length;
+        },
+        read: async (index) => {
+          if (!Number.isSafeInteger(index) || index < 0 || index >= length) throw new RangeError("Invalid patch hunk");
+          const bytes = await this.hunks.read(start + index * 64, 64), view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+          const lines = new BodyLines(view.getFloat64(32, true), this.records, this.data);
+          lines.length = view.getFloat64(40, true);
+          const decoder = new TextDecoder();
+          let section = "";
+          for (let position = view.getFloat64(48, true), end = view.getFloat64(56, true); position < end; ) {
+            const part = await this.data.read(position, Math.min(16384, end - position));
+            section += decoder.decode(part, { stream: true });
+            position += part.length;
+          }
+          section += decoder.decode();
+          return {
+            oldStart: view.getFloat64(0, true),
+            oldCount: view.getFloat64(8, true),
+            newStart: view.getFloat64(16, true),
+            newCount: view.getFloat64(24, true),
+            lines,
+            section
+          };
+        }
+      },
+      append: async (hunk) => {
+        const sectionStart = this.dataEnd;
+        for await (const bytes of targetBytes(hunk.section ?? "")) {
+          await this.data.append(bytes);
+          this.dataEnd += bytes.length;
+        }
+        const cell = new Uint8Array(64), view = new DataView(cell.buffer);
+        for (const [index, value] of [
+          hunk.oldStart,
+          hunk.oldCount,
+          hunk.newStart,
+          hunk.newCount,
+          hunk.lines.start,
+          hunk.lines.length,
+          sectionStart,
+          this.dataEnd
+        ].entries()) view.setFloat64(index * 8, value, true);
+        await this.hunks.append(cell);
+        this.hunkEnd += 64;
         length++;
       }
     };
   }
   close() {
-    return closeDocumentResources([this.data, this.records]);
+    return closeDocumentResources([this.data, this.records, this.hunks]);
   }
 };
 function reverseStoredPatch(patch) {
@@ -62,20 +131,23 @@ function reverseStoredPatch(patch) {
     newPath: patch.oldPath,
     oldEpoch: patch.newEpoch,
     newEpoch: patch.oldEpoch,
-    hunks: patch.hunks.map((hunk) => ({
-      ...hunk,
-      oldStart: hunk.newStart,
-      oldCount: hunk.newCount,
-      newStart: hunk.oldStart,
-      newCount: hunk.oldCount,
-      lines: {
-        length: hunk.lines.length,
-        async read(index) {
-          const line = await patchLine(hunk, index);
-          return { kind: line.kind === "+" ? "-" : line.kind === "-" ? "+" : " ", text: line.text };
+    hunks: { length: patch.hunks.length, async read(index) {
+      const hunk = await patchHunk(patch, index);
+      return {
+        ...hunk,
+        oldStart: hunk.newStart,
+        oldCount: hunk.newCount,
+        newStart: hunk.oldStart,
+        newCount: hunk.oldCount,
+        lines: {
+          length: hunk.lines.length,
+          async read(index2) {
+            const line = await patchLine(hunk, index2);
+            return { kind: line.kind === "+" ? "-" : line.kind === "-" ? "+" : " ", text: line.text };
+          }
         }
-      }
-    }))
+      };
+    } }
   };
 }
 
@@ -111,7 +183,7 @@ async function* rejectBytes(patch, outcomes, oldName, newName, indexName, revers
   yield* add(`${context ? "***" : "---"} ${names[0]}${times[0]}
 ${context ? "---" : "+++"} ${names[1]}${times[1]}
 `);
-  for (const outcome of outcomes) {
+  for await (const outcome of outcomes) {
     if (!outcome.failed) continue;
     budget.step();
     {
@@ -191,6 +263,8 @@ ${context ? "---" : "+++"} ${names[1]}${times[1]}
 
 export {
   patchLine,
+  patchHunk,
+  patchHunks,
   PatchBodyStore,
   reverseStoredPatch,
   rejectBytes