@nimbus-sh/core 0.6.0 → 0.7.0

package/src/shell/unix-commands.ts

@@ -8,7 +8,8 @@
  * uptime, tree, find, grep -r, head, tail, wc, diff, sort, uniq,
  * sed (s///), awk (field extract), xargs, tee, chown, ln -s,
  * du, man/help, basename, dirname, printf, true, false, seq, sleep,
- * touch, stat, file, xxd, base64, sha256sum, id, hostname, realpath
+ * touch, stat, file, xxd, od, hexdump, base64, sha256sum, id, hostname,
+ * realpath
  */
 
 import type { CredentialedVfs, SqliteVFS } from '../vfs/sqlite-vfs.js';
@@ -27,6 +28,7 @@ import {
 import type { Command, CommandInputStream } from '../substrate/lifo/commands/types.js';
 import { runSed } from '../substrate/lifo/commands/text/sed.js';
 import { parseArgs } from '../substrate/lifo/utils/args.js';
+import { encode } from '../substrate/lifo/utils/encoding.js';
 import {
   findUnixGroupName,
   findUnixUserName,
@@ -37,11 +39,10 @@ import { createSuCommand, createSudoCommand, createUmaskCommand } from './elevat
 /**
  * stdin as the shell hands it over: a pipe reader, whose `readAll` resolves
  * once upstream closes, or the terminal's own stream, which stays open past
- * the command and so is taken from `buffer` instead of awaited.
+ * the command and is drained in place via `drainBuffered`.
  */
 type ShellStdin = CommandInputStream & {
   feed?(text: string): void;
-  buffer?: string[];
 };
 
 /**
@@ -322,6 +323,9 @@ const _CANONICAL_BIN_PATHS: Record<string, string> = {
   bundler: '/usr/bin/bundler',
   sh: '/usr/bin/sh',
   bash: '/usr/bin/bash',
+  // Hex dumps — the real tools live under /usr/bin on Unix
+  od: '/usr/bin/od',
+  hexdump: '/usr/bin/hexdump',
   // Framework CLIs
   astro: '/usr/local/bin/astro',
   nuxt: '/usr/local/bin/nuxt',
@@ -1595,15 +1599,27 @@ async function streamStdinBytes(ctx: Ctx, writer: SinkWriter, limit: number): Pr
     writer.write(enc.encode(stdin).subarray(0, limit));
     return;
   }
-  const reader = stdin as { read?: () => Promise<string | null>; readBytes?: (n: number) => Promise<string | null> };
+  const reader = stdin as {
+    read?: () => Promise<string | null>;
+    readBytes?: (n: number) => Promise<Uint8Array | null>;
+  };
   if (typeof reader?.read !== 'function') return;
 
   let copied = 0;
   while (copied < limit) {
     const want = limit - copied;
-    const chunk = reader.readBytes ? await reader.readBytes(want) : await reader.read();
+    let chunk: Uint8Array | null;
+    if (reader.readBytes) {
+      chunk = await reader.readBytes(want);
+    } else {
+      // Text-only readers report EOF with null; encoding that null into an
+      // empty chunk would spin the loop forever without advancing.
+      const text = await reader.read();
+      if (text === null) break;
+      chunk = enc.encode(text);
+    }
     if (chunk === null) break;
-    const bytes = enc.encode(chunk).subarray(0, want);
+    const bytes = chunk.subarray(0, want);
     writer.write(bytes);
     copied += bytes.length;
   }
@@ -4191,51 +4207,1034 @@ function mkFile(vfs: UnixVfs): CmdFn {
   };
 }
 
-function mkXxd(vfs: UnixVfs): CmdFn {
-  return (ctx) => {
-    const file = ctx.args.find(a => !a.startsWith('-'));
-    if (!file) { ctx.stderr.write('Usage: xxd FILE\n'); return 1; }
-    const fp = resolvePath(ctx.cwd, file);
-    try {
-      const data = vfs.readFile(fp);
-      const len = Math.min(data.length, ctx.args.includes('-l') ? parseInt(ctx.args[ctx.args.indexOf('-l') + 1]) || 256 : 256);
-      for (let i = 0; i < len; i += 16) {
-        const hex = Array.from(data.slice(i, i + 16)).map(b => b.toString(16).padStart(2, '0')).join(' ');
-        const ascii = Array.from(data.slice(i, i + 16)).map(b => b >= 32 && b < 127 ? String.fromCharCode(b) : '.').join('');
-        ctx.stdout.write(`${i.toString(16).padStart(8, '0')}: ${hex.padEnd(48)}  ${ascii}\n`);
+// ── Hex dumps: od, hexdump, xxd ─────────────────────────────────────────
+
+/**
+ * Dump-tool byte counts: decimal, `0x` hex, leading-zero octal, and the
+ * classic suffixes (`b` blocks of 512, K/KiB, KB, M, G — powers of 1024
+ * except the round-decimal `KB`/`MB`/`GB` spellings). Null means the value
+ * is not a count these tools accept.
+ */
+function parseDumpCount(value: string): number | null {
+  const match = /^(0[xX][0-9a-fA-F]+|0[0-7]*|[1-9][0-9]*)([bB]|[kKmMgGtT](?:i?[bB])?)?$/.exec(value);
+  if (match === null) return null;
+  const digits = match[1];
+  const base = digits.startsWith('0x') || digits.startsWith('0X')
+    ? Number.parseInt(digits, 16)
+    : /^0/.test(digits) ? Number.parseInt(digits, 8) : Number.parseInt(digits, 10);
+  if (!Number.isSafeInteger(base) || base < 0) return null;
+  if (match[2] === undefined || match[2] === '') return base;
+  const scale: Record<string, number> = {
+    b: 512, B: 512,
+    k: 1024, K: 1024, KiB: 1024, kB: 1000, KB: 1000,
+    m: 1024 ** 2, M: 1024 ** 2, MiB: 1024 ** 2, mB: 1000 ** 2, MB: 1000 ** 2,
+    g: 1024 ** 3, G: 1024 ** 3, GiB: 1024 ** 3, gB: 1000 ** 3, GB: 1000 ** 3,
+    t: 1024 ** 4, T: 1024 ** 4, TiB: 1024 ** 4, tB: 1000 ** 4, TB: 1000 ** 4,
+  };
+  const factor = scale[match[2]];
+  if (factor === undefined) return null;
+  const total = base * factor;
+  return Number.isSafeInteger(total) ? total : null;
+}
+
+/** Little-endian word; a short final chunk reads its missing bytes as zero. */
+function leWord(chunk: Uint8Array): number {
+  return (chunk[0] ?? 0) | ((chunk[1] ?? 0) << 8);
+}
+
+/**
+ * Shared row suppression: a formatted row equal to the one before it prints
+ * as `*`, and runs of repeats collapse into that single marker. GNU od and
+ * util-linux hexdump suppress the address together with the row, so callers
+ * classify the body alone and print the marker bare.
+ */
+class RowDedup {
+  private previous: string | null = null;
+  private starred = false;
+
+  classify(row: string, verbose: boolean): 'print' | 'star' | 'skip' {
+    if (verbose || row !== this.previous) {
+      this.previous = row;
+      this.starred = false;
+      return 'print';
+    }
+    if (this.starred) return 'skip';
+    this.starred = true;
+    return 'star';
+  }
+}
+
+// ── od ──────────────────────────────────────────────────────────────────
+
+type OdRadix = 'o' | 'd' | 'x' | 'n';
+
+/**
+ * Row addresses follow the radix (`0000000` octal or decimal, `000000`
+ * lowercase hex). The closing total-length line keeps uppercase hex digits —
+ * `00001B`, not `00001b` — matching od on this host byte for byte.
+ */
+function odAddress(radix: OdRadix, offset: number, final: boolean): string {
+  if (radix === 'n') return '';
+  if (radix === 'o') return offset.toString(8).padStart(7, '0');
+  if (radix === 'd') return String(offset).padStart(7, '0');
+  const digits = offset.toString(16);
+  return (final ? digits.toUpperCase() : digits).padStart(6, '0');
+}
+
+/** `\0`-style escapes for `-tc`; other non-printables go out as `\NNN`. */
+const OD_CHAR_ESCAPES: Readonly<Record<number, string>> = {
+  0: '\\0', 7: '\\a', 8: '\\b', 9: '\\t', 10: '\\n', 11: '\\v', 12: '\\f', 13: '\\r',
+};
+
+interface OdTypeSpec {
+  width: number;
+  /** Rendered width of one item, used to align multiple -t types. */
+  natural: number;
+  render: (chunk: Uint8Array) => string;
+}
+
+const OD_TYPES: Readonly<Record<string, OdTypeSpec>> = {
+  c: {
+    width: 1,
+    natural: 3,
+    render: (c) => {
+      const escaped = OD_CHAR_ESCAPES[c[0]];
+      if (escaped !== undefined) return escaped.padStart(3);
+      if (c[0] >= 32 && c[0] < 127) return String.fromCharCode(c[0]).padStart(3);
+      return c[0].toString(8).padStart(3, '0');
+    },
+  },
+  d1: { width: 1, natural: 4, render: (c) => String((c[0] << 24) >> 24).padStart(4) },
+  d2: { width: 2, natural: 6, render: (c) => { const v = leWord(c); return String(v >= 0x8000 ? v - 0x10000 : v).padStart(6); } },
+  u1: { width: 1, natural: 3, render: (c) => String(c[0]).padStart(3) },
+  u2: { width: 2, natural: 5, render: (c) => String(leWord(c)).padStart(5) },
+  o1: { width: 1, natural: 3, render: (c) => c[0].toString(8).padStart(3, '0') },
+  o2: { width: 2, natural: 6, render: (c) => leWord(c).toString(8).padStart(6, '0') },
+  x1: { width: 1, natural: 2, render: (c) => c[0].toString(16).padStart(2, '0') },
+  x2: { width: 2, natural: 4, render: (c) => leWord(c).toString(16).padStart(4, '0') },
+};
+
+type OdArgs =
+  | { error: string }
+  | { radix: OdRadix; types: string[]; limit: number | undefined; verbose: boolean; files: string[] };
+
+/**
+ * Split a `-t` value into its concatenated specifications: a letter with an
+ * optional size (`x1`, `d2`, `c`, …), so `-tx1c` yields x1 then c.
+ */
+function splitOdTypes(value: string): string[] {
+  const specs: string[] = [];
+  const pattern = /([xoducXODUC])([01248]?)/g;
+  let consumed = '';
+  for (const match of value.matchAll(pattern)) {
+    consumed += match[0];
+    const letter = match[1].toLowerCase();
+    const size = match[2] === '' ? '' : match[2];
+    if (letter === 'a') {
+      specs.push('c');
+      continue;
+    }
+    specs.push(`${letter}${size}`);
+  }
+  return consumed === value ? specs : [value];
+}
+
+/** `-A[o|d|x|n]`, cumulative `-t<spec>`, `-N<count>`, `-v`. */
+function parseOdArgs(args: string[]): OdArgs {
+  let radix: OdRadix = 'o';
+  const types: string[] = [];
+  let limit: number | undefined;
+  let verbose = false;
+  const files: string[] = [];
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === '--') { files.push(...args.slice(i + 1)); break; }
+    if (!arg.startsWith('-') || arg === '-') { files.push(arg); continue; }
+    const flag = arg[1];
+    let value = arg.slice(2);
+    if (flag === 'v' && value === '') { verbose = true; continue; }
+    if (flag !== 'A' && flag !== 't' && flag !== 'N') {
+      return { error: `od: invalid option -- '${flag}'` };
+    }
+    if (value === '') { value = args[i + 1]; if (value !== undefined) i++; }
+    if (value === undefined || value === '') {
+      return { error: `od: option requires an argument -- '${flag}'` };
+    }
+    if (flag === 'A') {
+      // Exactly one radix letter per option (`-Aod` is not two glued flags);
+      // repeated valid options are last-wins, like GNU od.
+      if (value.length !== 1 || !'odxn'.includes(value)) {
+        return { error: `od: Radix must be one of [o, d, x, n], got: ${value}` };
       }
-      return 0;
-    } catch { ctx.stderr.write(`xxd: ${file}: No such file\n`); return 1; }
+      radix = value as OdRadix;
+    } else if (flag === 't') {
+      // One -t may carry concatenated specifications (`-tx1c`); repeated
+      // -t flags accumulate too. Both render in request order.
+      for (const spec of splitOdTypes(value)) {
+        if (!(spec in OD_TYPES)) return { error: `od: unsupported type specification '${value}'` };
+        types.push(spec);
+      }
+    } else {
+      const parsed = parseDumpCount(value);
+      if (parsed === null || parsed < 0) {
+        return { error: `od: invalid number of bytes '${value}'` };
+      }
+      limit = parsed;
+    }
+  }
+  if (types.length === 0) types.push('o2');
+  return { radix, types, limit, verbose, files };
+}
+
+/**
+ * Sequential bytes for a dump tool: each operand in order, stdin once,
+ * bounded range reads for files and bounded pulls for pipes. Only one
+ * window of bytes is held at a time, so unbounded tools stream forever
+ * instead of growing silently, and limits stop collection early.
+ */
+class DumpByteSource {
+  private operands: (string | undefined)[];
+  private operandIndex = 0;
+  private remaining: number;
+  private currentPath = '';
+  private cursor = 0;
+  private haveOpen = false;
+  private stdinMode = false;
+  private stdinUsed = false;
+  private probedFirst = false;
+  // Drained-string stdin is encoded once; pulls slice the encoded bytes so
+  // multibyte input never advances past bytes it did not return.
+  private stdinBytes: Uint8Array | null = null;
+  private stdinCursor = 0;
+  private stdinOverflow: Uint8Array[] = [];
+  failures = 0;
+  opened = 0;
+  total = 0;
+
+  constructor(
+    private ctx: Ctx,
+    private label: string,
+    files: string[],
+    limit: number | undefined,
+  ) {
+    this.operands = files.length > 0 ? files : [undefined];
+    this.remaining = limit ?? Number.POSITIVE_INFINITY;
+  }
+
+  get failed(): boolean {
+    return this.failures > 0;
+  }
+
+  /** Every named operand failed to open — distinct from successful empty. */
+  get failedAll(): boolean {
+    return this.operands.length > 0 && this.opened === 0 && this.failures > 0;
+  }
+
+  private async openNextOperand(): Promise<boolean> {
+    while (this.operandIndex < this.operands.length) {
+      const file = this.operands[this.operandIndex++];
+      try {
+        if (file === undefined || file === '-') {
+          if (this.stdinUsed) continue; // second '-' reads stdin already at EOF
+          this.stdinMode = true;
+          this.opened++; // an empty stdin still counts as successfully opened
+          return true;
+        }
+        // Probe the file now so per-operand errors surface exactly once.
+        // Named operands read through ctx.vfs — the mount-aware seam the
+        // host handed the command — so /dev and other mounts resolve while
+        // an embedder's credentialed view keeps its authorization.
+        this.currentPath = absolutePath(this.ctx.cwd, file);
+        this.ctx.vfs.readRange(this.currentPath, 0, 1);
+        this.cursor = 0;
+        this.haveOpen = true;
+        this.opened++;
+        return true;
+      } catch (error) {
+        this.ctx.stderr.write(`${this.label}: ${file}: ${fsErrorMessage(error)}\n`);
+        this.failures++;
+      }
+    }
+    return false;
+  }
+
+  private closeCurrent(): void {
+    this.haveOpen = false;
+    this.stdinMode = false;
+    this.currentPath = '';
+    this.cursor = 0;
+  }
+
+  /** One bounded pull; drained strings are encoded once and sliced by byte. */
+  private async stdinPull(max: number): Promise<Uint8Array | null> {
+    if (typeof this.ctx.stdin === 'string') {
+      if (this.stdinBytes === null) this.stdinBytes = enc.encode(this.ctx.stdin);
+      if (this.stdinCursor >= this.stdinBytes.length) return null;
+      const end = Math.min(this.stdinCursor + max, this.stdinBytes.length);
+      const chunk = this.stdinBytes.subarray(this.stdinCursor, end);
+      this.stdinCursor = end;
+      return chunk;
+    }
+    const reader = this.ctx.stdin as {
+      read?: () => Promise<string | null>;
+      readBytes?: (n: number) => Promise<Uint8Array | null>;
+    };
+    if (typeof reader?.read !== 'function') return null;
+    // read/readAll-only embedders lose nothing: overflow bytes from a bounded
+    // pull wait in stdinOverflow until the next one. A live stream hands back
+    // its first available chunk — waiting to fill `max` would stall a sparse
+    // producer that has written one byte and not the rest.
+    let chunk: Uint8Array | null;
+    if (this.stdinOverflow.length > 0) {
+      chunk = this.stdinOverflow.shift() ?? null;
+    } else if (reader.readBytes) {
+      chunk = await reader.readBytes(Math.min(65536, max));
+    } else {
+      const text = await reader.read();
+      chunk = text === null ? null : enc.encode(text);
+    }
+    if (chunk === null || chunk.length === 0) return null;
+    if (chunk.length <= max) return chunk;
+    this.stdinOverflow.unshift(chunk.subarray(max));
+    return chunk.subarray(0, max);
+  }
+
+  /**
+   * Up to `max` bytes, filling across chunks and operands. A row-oriented
+   * caller wants the whole row before it formats anything, exactly as GNU od
+   * fills its 16-byte buffer, so this waits for the count it asked for.
+   */
+  async take(max: number): Promise<Uint8Array | null> {
+    return this.collect(max, false);
+  }
+
+  /**
+   * Up to `max` bytes, waiting only for the first ones to arrive. A caller
+   * that formats whatever has landed uses this: file operands still answer
+   * in bulk, while a live stream is never waited on for bytes a sparse
+   * producer has not written yet.
+   */
+  async takeReady(max: number): Promise<Uint8Array | null> {
+    return this.collect(max, true);
+  }
+
+  private async collect(max: number, ready: boolean): Promise<Uint8Array | null> {
+    if (!this.probedFirst) {
+      // The first named operand must be attempted even under a zero limit,
+      // so `-l0 /missing` reports the open error instead of succeeding.
+      this.probedFirst = true;
+      if (this.operands.length > 0 && !(await this.openNextOperand())) {
+        return null;
+      }
+    }
+    if (max <= 0) return new Uint8Array(0);
+    const parts: Uint8Array[] = [];
+    let got = 0;
+    while (got < max) {
+      if (this.remaining <= 0) break;
+      if (!this.haveOpen && !this.stdinMode) {
+        if (!(await this.openNextOperand())) break;
+      }
+      const want = Math.min(max - got, this.remaining, 65536);
+      let chunk: Uint8Array | null;
+      if (this.stdinMode) {
+        chunk = await this.stdinPull(want);
+        if (chunk === null || chunk.length === 0) {
+          this.stdinUsed = true;
+          this.closeCurrent();
+          continue;
+        }
+        // A live stream hands back what it has: `takeReady` stops here so a
+        // sparse producer keeps rendering, while `take` loops for the rest of
+        // the row it was asked for.
+        parts.push(chunk);
+        got += chunk.length;
+        this.total += chunk.length;
+        this.remaining -= chunk.length;
+        if (ready) break;
+        continue;
+      }
+      // File operands keep filling: range reads are bulk and cost nothing
+      // extra, and a block may span consecutive operands.
+      chunk = this.ctx.vfs.readRange(this.currentPath, this.cursor, want);
+      if (chunk.length === 0) {
+        this.closeCurrent();
+        continue;
+      }
+      this.cursor += chunk.length;
+      const take = chunk.length <= want ? chunk : chunk.subarray(0, want);
+      parts.push(take);
+      got += take.length;
+      this.total += take.length;
+      this.remaining -= take.length;
+    }
+    if (parts.length === 0) return null;
+    if (parts.length === 1) return parts[0];
+    const out = new Uint8Array(got);
+    let at = 0;
+    for (const part of parts) {
+      out.set(part, at);
+      at += part.length;
+    }
+    return out;
+  }
+}
+
+function mkOd(): CmdFn {
+  return async (ctx) => {
+    const parsed = parseOdArgs(ctx.args);
+    if ('error' in parsed) {
+      ctx.stderr.write(`${parsed.error}\n`);
+      return 1;
+    }
+    const src = new DumpByteSource(ctx, 'od', parsed.files, parsed.limit);
+    const specs = parsed.types.map((name) => OD_TYPES[name]);
+    // With several -t types every item shares one column width (the widest
+    // natural width plus one); each type prints on its own continuation
+    // line indented under the address — uutils od's grid on this host.
+    const columnWidth = Math.max(...specs.map((spec) => spec.natural)) + 1;
+    const renderRow = (row: Uint8Array): string[] => specs.map((spec) => {
+      const items: string[] = [];
+      for (let i = 0; i < row.length; i += spec.width) {
+        items.push(spec.render(row.subarray(i, Math.min(i + spec.width, row.length))));
+      }
+      if (specs.length === 1) return items.join(' ');
+      return items.map((item) => item.padStart(columnWidth)).join('');
+    });
+    const dedup = new RowDedup();
+    while (true) {
+      const row = await src.take(16);
+      if (row === null || row.length === 0) break;
+      const address = odAddress(parsed.radix, src.total - row.length, false);
+      const lines = renderRow(row);
+      const key = lines.join('\n');
+      const indent = address === '' ? '' : ' '.repeat(7);
+      const rendered = specs.length === 1
+        ? `${address} ${lines[0]}`
+        : [`${address}${lines[0]}`, ...lines.slice(1).map((line) => `${indent}${line}`)].join('\n');
+      switch (dedup.classify(key, parsed.verbose)) {
+        case 'print':
+          ctx.stdout.write(`${rendered}\n`);
+          break;
+        case 'star':
+          ctx.stdout.write('*\n');
+          break;
+      }
+    }
+    if (parsed.radix !== 'n') {
+      if (src.failedAll) return 1;
+      ctx.stdout.write(`${odAddress(parsed.radix, src.total, true)}\n`);
+    }
+    return src.failed ? 1 : 0;
   };
 }
 
-// ── Registration ────────────────────────────────────────────────────────
+// ── hexdump ─────────────────────────────────────────────────────────────
 
+interface HexdumpDirective {
+  kind: 'byte' | 'addr';
+  conv?: string;
+  radix?: 'd' | 'o' | 'x';
+  leftAlign: boolean;
+  zeroPad: boolean;
+  width: number | undefined;
+  precision: number | undefined;
+}
+
+/** One quoted piece of an `-e` format: escaped text plus parsed directives. */
+interface HexdumpPiece {
+  segments: (string | HexdumpDirective)[];
+  count: number;
+  size: number;
+  consumes: boolean;
+}
+
+const HEXDUMP_WORD_SIZES: Readonly<Record<string, number>> = { '1': 1, '2': 2, '4': 4, C: 1 };
+/** Field widths an empty iteration pads to, mirroring util-linux. */
+const HEXDUMP_DIGIT_WIDTHS: Readonly<Record<string, { x: number; o: number; d: number }>> = {
+  '1': { x: 2, o: 3, d: 3 },
+  '2': { x: 4, o: 6, d: 5 },
+  '4': { x: 8, o: 11, d: 10 },
+};
+
+/** Shared empty unit: a conversion past end-of-input sees no bytes at all. */
+const HEXDUMP_EMPTY_UNIT = new Uint8Array(0);
+/** Source bytes fetched per pull while streaming `-e` blocks. */
+const HEXDUMP_PULL_BYTES = 4096;
+/** Digits an address directive can render: `Number.MAX_SAFE_INTEGER` in octal. */
+const HEXDUMP_MAX_ADDRESS_DIGITS = 20;
 /**
- * Wrap a sync/async command so it always returns Promise<number>.
- * The LIFO shell calls .then() on the return value of every command,
- * so raw numbers cause "E3(...).then is not a function".
- *
- * Also resolves ctx.stdin from a stream object to a string.
- * The shell passes stdin as an object with .readAll() when piping,
- * but our commands expect a plain string.
+ * Characters one `-e` block may render. A block is held twice while it is
+ * classified — the line and its dedup key — so this ceiling bounds two
+ * strings of ~2 MiB UTF-16 each, small beside a Durable Object's memory and
+ * far above any format that dumps real data.
  */
+const HEXDUMP_MAX_BLOCK_CHARS = 1 << 20;
+
+// util-linux rejects escaped delimiters inside -e units rather than
+// decoding them, so `\"` is deliberately absent here.
+const HEXDUMP_ESCAPES: Readonly<Record<string, string>> = {
+  n: '\n', t: '\t', r: '\r', '\\': '\\', '0': '\0',
+};
+
+function parseHexdumpDirectives(fmt: string): { segments: (string | HexdumpDirective)[] } | { error: string } {
+  const segments: (string | HexdumpDirective)[] = [];
+  let text = '';
+  const flush = () => { if (text !== '') { segments.push(text); text = ''; } };
+  const bad = (what: string) => ({ error: `hexdump: bad format {${what}}` });
+
+  for (let i = 0; i < fmt.length; i++) {
+    const ch = fmt[i];
+    if (ch === '\\') {
+      const esc = fmt[++i];
+      if (esc === undefined || !(esc in HEXDUMP_ESCAPES)) return bad(`\\${esc ?? ''}`);
+      text += HEXDUMP_ESCAPES[esc];
+      continue;
+    }
+    if (ch !== '%') { text += ch; continue; }
+    flush();
+    const directive: HexdumpDirective = { kind: 'byte', leftAlign: false, zeroPad: false, width: undefined, precision: undefined };
+    let j = i + 1;
+    while (fmt[j] === '-' || fmt[j] === '0') {
+      if (fmt[j] === '-') directive.leftAlign = true; else directive.zeroPad = true;
+      j++;
+    }
+    let digits = '';
+    while (fmt[j] >= '0' && fmt[j] <= '9') digits += fmt[j++];
+    if (digits !== '') {
+      directive.width = Number(digits);
+      // A width outside the safe-integer range can never render; reject the
+      // format here rather than attempting an unbounded allocation later.
+      if (!Number.isSafeInteger(directive.width)) return bad(`%${fmt.slice(i + 1, j + 1)}`);
+    }
+    if (fmt[j] === '.') {
+      let prec = '';
+      j++;
+      while (fmt[j] >= '0' && fmt[j] <= '9') prec += fmt[j++];
+      directive.precision = prec === '' ? 0 : Number(prec);
+      if (!Number.isSafeInteger(directive.precision)) return bad(`%${fmt.slice(i + 1, j + 1)}`);
+    }
+    if (fmt[j] === '_' && fmt[j + 1] === 'a' && 'dxo'.includes(fmt[j + 2])) {
+      directive.kind = 'addr';
+      directive.radix = fmt[j + 2] as 'd' | 'o' | 'x';
+      i = j + 2;
+    } else if (j < fmt.length && 'xXduoc'.includes(fmt[j])) {
+      directive.conv = fmt[j];
+      i = j;
+    } else {
+      return bad(`%${fmt.slice(i + 1, j + 1)}`);
+    }
+    segments.push(directive);
+  }
+  flush();
+  return { segments };
+}
+
+function parseHexdumpPieces(value: string): { pieces: HexdumpPiece[] } | { error: string } {
+  const pieces: HexdumpPiece[] = [];
+  let pending: { count: number; size: number } | null = null;
+  let i = 0;
+  while (i < value.length) {
+    const ch = value[i];
+    if (ch === ' ' || ch === '\t') { i++; continue; }
+    if (ch >= '0' && ch <= '9') {
+      let digits = '';
+      while (i < value.length && value[i] >= '0' && value[i] <= '9') digits += value[i++];
+      if (value[i] !== '/') return { error: `hexdump: bad format {${value}}` };
+      const sizeChar = value[i + 1] ?? '';
+      const size = HEXDUMP_WORD_SIZES[sizeChar];
+      if (size === undefined) return { error: `hexdump: bad format {${digits}/${sizeChar}}` };
+      const count = Number(digits);
+      if (!Number.isSafeInteger(count) || count <= 0) {
+        return { error: `hexdump: bad format {${digits}/${sizeChar}}` };
+      }
+      pending = { count, size };
+      i += 2;
+      continue;
+    }
+    if (ch !== '"' && ch !== "'") return { error: `hexdump: bad format {${value.slice(i)}}` };
+    // util-linux refuses an escaped quote inside a unit instead of decoding
+    // it, and names the whole specification when it does.
+    let close = -1;
+    for (let k = i + 1; k < value.length; k++) {
+      const c = value[k];
+      if (c === '\\') {
+        if (value[k + 1] === ch) { close = -2; break; }
+        k++;
+        continue;
+      }
+      if (c === ch) { close = k; break; }
+    }
+    if (close < 0) return { error: `hexdump: bad format {${value}}` };
+    const parsed = parseHexdumpDirectives(value.slice(i + 1, close));
+    if ('error' in parsed) return parsed;
+    const conversions = parsed.segments.filter(
+      (segment) => typeof segment !== 'string' && segment.kind === 'byte',
+    ).length;
+    // util-linux refuses a byte count feeding more than one conversion.
+    if (conversions > 1) {
+      return { error: 'hexdump: byte count with multiple conversion characters' };
+    }
+    // %c defaults to one byte and only accepts one; other conversions
+    // default to four.
+    const soleConv = conversions === 1
+      ? (parsed.segments.find(
+          (segment) => typeof segment !== 'string' && segment.kind === 'byte',
+        ) as HexdumpDirective).conv
+      : undefined;
+    if (soleConv === 'c' && pending !== null && pending.size !== 1) {
+      return { error: 'hexdump: bad byte count for conversion character c' };
+    }
+    pieces.push({
+      segments: parsed.segments,
+      count: pending?.count ?? 1,
+      size: pending?.size ?? (soleConv === 'c' ? 1 : 4),
+      consumes: conversions > 0,
+    });
+    pending = null;
+    i = close + 1;
+  }
+  if (pending !== null) return { error: `hexdump: bad format {${value}}` };
+  return { pieces };
+}
+
+function hexdumpFormatNumber(directive: HexdumpDirective, digits: string): string {
+  // fprintf rules: precision pads the magnitude with zeros, a sign always
+  // sits in front of that padding, '-' alignment overrides '0', and an
+  // explicit precision disables '0' field padding entirely.
+  let sign = '';
+  let magnitude = digits;
+  if (magnitude.startsWith('-')) {
+    sign = '-';
+    magnitude = magnitude.slice(1);
+  }
+  if (directive.precision !== undefined) magnitude = magnitude.padStart(directive.precision, '0');
+  const width = directive.width ?? 0;
+  const value = sign + magnitude;
+  if (directive.leftAlign) return value.padEnd(width);
+  if (directive.zeroPad && directive.precision === undefined && width > 0) {
+    return sign + magnitude.padStart(width - sign.length, '0');
+  }
+  return value.padStart(width);
+}
+
+/** Field width an iteration reserves, so missing ones pad like util-linux. */
+function hexdumpFieldWidth(directive: HexdumpDirective, size: number): number {
+  if (directive.kind === 'addr') return directive.width ?? 0;
+  if (directive.conv === 'c') return directive.width ?? 1;
+  const family = directive.conv === 'x' || directive.conv === 'X'
+    ? 'x'
+    : directive.conv === 'o' ? 'o' : 'd';
+  return directive.width ?? HEXDUMP_DIGIT_WIDTHS[String(size)][family];
+}
+
 /**
- * SHELL-R6-B2 follow-on: wrapStreaming for commands that handle pipe
- * readers directly (head, tail, etc — commands that can terminate
- * before the producer drains).
+ * Render one `-e` block straight off the source, one unit at a time. A
+ * directive past the end of input renders as field-width spaces rather than
+ * dropping its slot, and address directives report the offset of the next
+ * byte to display. The dedup key repeats all of it except addresses, so
+ * repeat suppression ignores where each block sits.
+ *
+ * util-linux's nospace rule: a unit repeated more than once drops the single
+ * trailing whitespace character of its own format text on its LAST
+ * repetition, EOF padding included. Exactly that one character goes, which
+ * is why `3/1 "%02x  "` keeps one of its two spaces, `2/1 "%02x\t"` keeps
+ * the padding that follows the dropped tab, and a unit repeated once keeps
+ * its spacing verbatim.
  *
- * Behavior:
- *   - If ctx.stdin is a terminal stdin (has .feed), drain buffered
- *     bytes to a string (same as wrap — terminal stdin's
- *     buffer-then-close pattern doesn't match streaming).
- *   - If ctx.stdin is a pipe reader (has .read), PASS IT THROUGH
- *     unchanged so the command can read line-by-line. The command
- *     is responsible for terminating itself (e.g. head -n N stops
- *     after N lines, triggering the pipeline-abort cascade from
- *     SHELL-R6-2).
- *   - String stdin / other shapes: same as wrap.
+ * Input arrives unit-sized: nothing collects count*size bytes however large
+ * the repetition count is, and parseHexdumpArgs has already refused any
+ * format whose block could outgrow {@link HEXDUMP_MAX_BLOCK_CHARS}.
+ *
+ * Returns the rendered line, its address-free key, and the source bytes the
+ * block consumed; null once a block consumes nothing, i.e. true end.
+ */
+async function hexdumpRenderBlock(
+  pieces: HexdumpPiece[],
+  pullUnit: (size: number) => Promise<Uint8Array>,
+  blockStart: number,
+): Promise<{ line: string; key: string; consumed: number } | null> {
+  let line = '';
+  let key = '';
+  let pos = 0;
+  let consumed = 0;
+  let ended = false;
+  for (const piece of pieces) {
+    const iterations = piece.consumes ? piece.count : 1;
+    const tail = piece.segments[piece.segments.length - 1];
+    const dropsTailSpace = iterations > 1
+      && typeof tail === 'string'
+      && /[ \t\n\r\v\f]$/.test(tail);
+    for (let iteration = 0; iteration < iterations; iteration++) {
+      const lastIteration = iteration === iterations - 1;
+      let unit: Uint8Array = HEXDUMP_EMPTY_UNIT;
+      if (piece.consumes && !ended) {
+        unit = await pullUnit(piece.size);
+        if (unit.length < piece.size) ended = true;
+      }
+      const missing = piece.consumes && unit.length === 0;
+      // Literals always render; only byte conversions pad when input ran
+      // out, so a trailing literal still reaches the line on short blocks.
+      for (let index = 0; index < piece.segments.length; index++) {
+        const segment = piece.segments[index];
+        if (typeof segment === 'string') {
+          const text = dropsTailSpace && lastIteration && index === piece.segments.length - 1
+            ? segment.slice(0, -1)
+            : segment;
+          line += text;
+          key += text;
+          continue;
+        }
+        if (segment.kind === 'addr') {
+          const shown = blockStart + pos;
+          const digits = segment.radix === 'd'
+            ? String(shown)
+            : shown.toString(segment.radix === 'o' ? 8 : 16);
+          line += hexdumpFormatNumber(segment, digits);
+          continue;
+        }
+        if (missing) {
+          const pad = ' '.repeat(hexdumpFieldWidth(segment, piece.size));
+          line += pad;
+          key += pad;
+          continue;
+        }
+        let value = 0;
+        for (let b = piece.size - 1; b >= 0; b--) value = value * 256 + (unit[b] ?? 0);
+        pos += piece.size;
+        if (segment.conv === 'c') {
+          const text = hexdumpFormatNumber(segment, String.fromCharCode(value & 0xff));
+          line += text;
+          key += text;
+          continue;
+        }
+        let digits: string;
+        if (segment.conv === 'd') {
+          const signBit = 256 ** piece.size / 2;
+          digits = String(value >= signBit ? value - signBit * 2 : value);
+        } else if (segment.conv === 'u') {
+          digits = String(value);
+        } else if (segment.conv === 'o') {
+          digits = value.toString(8);
+        } else {
+          digits = value.toString(16);
+          if (segment.conv === 'X') digits = digits.toUpperCase();
+        }
+        const text = hexdumpFormatNumber(segment, digits);
+        line += text;
+        key += text;
+      }
+      consumed += unit.length;
+    }
+  }
+  if (consumed === 0) return null;
+  return { line, key, consumed };
+}
+
+/** Body columns for the fixed modes; the caller prefixes the address. */
+function hexdumpFixedBody(mode: 'default' | 'x' | 'd' | 'o' | 'C', row: Uint8Array): { body: string; bar: string | null } {
+  if (mode === 'C') {
+    const group1 = Array.from(row.subarray(0, 8), (b) => b.toString(16).padStart(2, '0'));
+    const group2 = Array.from(row.subarray(8), (b) => b.toString(16).padStart(2, '0'));
+    const columns = group1.join(' ') + (group2.length > 0 ? '  ' + group2.join(' ') : '');
+    const bar = Array.from(row, (b) => (b >= 32 && b < 127 ? String.fromCharCode(b) : '.')).join('');
+    return { body: columns.padEnd(50), bar };
+  }
+  if (mode === 'default') {
+    const words: string[] = [];
+    for (let i = 0; i < row.length; i += 2) {
+      words.push(leWord(row.subarray(i)).toString(16).padStart(4, '0'));
+    }
+    return { body: words.join(' ').padEnd(39), bar: null };
+  }
+  const slots: string[] = [];
+  for (let i = 0; i < 16; i += 2) {
+    const chunk = row.subarray(i);
+    if (chunk.length === 0) { slots.push(' '.repeat(8)); continue; }
+    const rendered = mode === 'x'
+      ? leWord(chunk).toString(16).padStart(4, '0')
+      : mode === 'd'
+        ? String(leWord(chunk)).padStart(5, '0')
+        : leWord(chunk).toString(8).padStart(6, '0');
+    slots.push(rendered.padStart(i === 0 ? 7 : 8));
+  }
+  return { body: slots.join(''), bar: null };
+}
+
+type HexdumpArgs =
+  | { error: string }
+  | {
+      mode: 'default' | 'x' | 'd' | 'o' | 'C';
+      pieces: HexdumpPiece[] | null;
+      length: number | undefined;
+      verbose: boolean;
+      files: string[];
+    };
+
+/** Format flags override each other (last wins); `-e` replaces them all. */
+function parseHexdumpArgs(args: string[]): HexdumpArgs {
+  let mode: 'default' | 'x' | 'd' | 'o' | 'C' = 'default';
+  let pieces: HexdumpPiece[] | null = null;
+  let length: number | undefined;
+  let verbose = false;
+  const files: string[] = [];
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === '--') { files.push(...args.slice(i + 1)); break; }
+    if (!arg.startsWith('-') || arg === '-') { files.push(arg); continue; }
+    const flag = arg[1];
+    const inlineValue = arg.slice(2);
+    if (flag === 'C' || flag === 'x' || flag === 'd' || flag === 'o') {
+      if (inlineValue !== '') return { error: `hexdump: invalid option -- '${flag}'` };
+      mode = flag;
+      continue;
+    }
+    if (flag === 'v' && inlineValue === '') { verbose = true; continue; }
+    if (flag !== 'e' && flag !== 'n') {
+      return { error: `hexdump: invalid option -- '${flag}'` };
+    }
+    const value = inlineValue || args[++i];
+    if (value === undefined || value === '') {
+      return { error: `hexdump: option requires an argument -- '${flag}'` };
+    }
+    if (flag === 'n') {
+      const parsed = parseDumpCount(value);
+      if (parsed === null || parsed < 0) {
+        return { error: `hexdump: invalid length '${value}'` };
+      }
+      length = parsed;
+      continue;
+    }
+    if (pieces !== null) return { error: 'hexdump: only one -e format is supported' };
+    const parsed = parseHexdumpPieces(value);
+    if ('error' in parsed) return parsed;
+    if (!parsed.pieces.some((piece) => piece.consumes)) {
+      return { error: `hexdump: bad format {${value}}` };
+    }
+    // The block is held twice while it is classified, so a format whose
+    // rendering cannot fit is refused here — before a byte is ever read.
+    let blockChars = 0;
+    for (const piece of parsed.pieces) {
+      let perIteration = 0;
+      for (const segment of piece.segments) {
+        if (typeof segment === 'string') { perIteration += segment.length; continue; }
+        if (segment.kind === 'addr') {
+          perIteration += Math.max(segment.width ?? 0, HEXDUMP_MAX_ADDRESS_DIGITS);
+          continue;
+        }
+        // A narrow field cannot shrink a value: `%1u` over four bytes still
+        // renders ten characters. Size each conversion by the widest of its
+        // field width, its precision plus a sign, and the natural maximum
+        // for its byte size.
+        const digits = HEXDUMP_DIGIT_WIDTHS[String(piece.size)];
+        const natural = segment.conv === 'c'
+          ? 1
+          : segment.conv === 'd'
+            ? digits.d + 1
+            : segment.conv === 'u'
+              ? digits.d
+              : segment.conv === 'o'
+                ? digits.o
+                : digits.x;
+        perIteration += Math.max(segment.width ?? 0, natural, (segment.precision ?? 0) + 1);
+      }
+      blockChars += (piece.consumes ? piece.count : 1) * perIteration;
+    }
+    if (blockChars > HEXDUMP_MAX_BLOCK_CHARS) {
+      return {
+        error: `hexdump: format renders ${blockChars} characters per block, over the ${HEXDUMP_MAX_BLOCK_CHARS} limit`,
+      };
+    }
+    pieces = parsed.pieces;
+  }
+  return { mode, pieces, length, verbose, files };
+}
+
+function mkHexdump(): CmdFn {
+  return async (ctx) => {
+    const parsed = parseHexdumpArgs(ctx.args);
+    if ('error' in parsed) {
+      ctx.stderr.write(`${parsed.error}\n`);
+      return 1;
+    }
+    const src = new DumpByteSource(ctx, 'hexdump', parsed.files, parsed.length);
+    const dedup = new RowDedup();
+    if (parsed.pieces !== null) {
+      const lastPiece = parsed.pieces[parsed.pieces.length - 1];
+      const lastSegment = lastPiece.segments[lastPiece.segments.length - 1];
+      // Repeat suppression needs line boundaries; free-form formats emit
+      // the whole stream, which is what -v spells on util-linux.
+      const lineStructured = typeof lastSegment === 'string' && lastSegment.endsWith('\n');
+      // Units arrive from a small stash fed well ahead of demand, so
+      // per-unit pulls amortize into large source reads without ever
+      // holding count*size bytes for a block.
+      let pending = HEXDUMP_EMPTY_UNIT;
+      const pullUnit = async (size: number): Promise<Uint8Array> => {
+        while (pending.length < size) {
+          // Ready reads: a file answers the whole block in one range read,
+          // and a live producer answers with whatever it has already written.
+          const chunk = await src.takeReady(Math.max(size - pending.length, HEXDUMP_PULL_BYTES));
+          if (chunk === null || chunk.length === 0) break;
+          const merged = new Uint8Array(pending.length + chunk.length);
+          merged.set(pending);
+          merged.set(chunk, pending.length);
+          pending = merged;
+        }
+        const unit = pending.subarray(0, size);
+        pending = pending.subarray(unit.length);
+        return unit;
+      };
+      let offset = 0;
+      while (true) {
+        const block = await hexdumpRenderBlock(parsed.pieces, pullUnit, offset);
+        if (block === null) break;
+        offset += block.consumed;
+        if (!lineStructured) { ctx.stdout.write(block.line); continue; }
+        switch (dedup.classify(block.key, parsed.verbose)) {
+          case 'print': ctx.stdout.write(block.line); break;
+          case 'star': ctx.stdout.write('*\n'); break;
+        }
+      }
+      if (src.failedAll) ctx.stderr.write('hexdump: all input file arguments failed\n');
+      return src.failed ? 1 : 0;
+    }
+
+    const wide = parsed.mode === 'C';
+    while (true) {
+      const row = await src.take(16);
+      if (row === null || row.length === 0) break;
+      const { body, bar } = hexdumpFixedBody(parsed.mode, row);
+      const address = (src.total - row.length).toString(16).padStart(wide ? 8 : 7, '0');
+      switch (dedup.classify(body, parsed.verbose)) {
+        case 'print':
+          ctx.stdout.write(wide ? `${address}  ${body}|${bar}|\n` : `${address} ${body}\n`);
+          break;
+        case 'star':
+          ctx.stdout.write('*\n');
+          break;
+      }
+    }
+    if (src.failedAll) ctx.stderr.write('hexdump: all input file arguments failed\n');
+    if (src.total > 0) {
+      ctx.stdout.write(`${src.total.toString(16).padStart(wide ? 8 : 7, '0')}\n`);
+    }
+    return src.failed ? 1 : 0;
+  };
+}
+
+// ── xxd ─────────────────────────────────────────────────────────────────
+
+/**
+ * `xxd [FILE [-] [OUTFILE]]` — pipelines are xxd's primary use, so stdin is
+ * read when no input operand is given or `-` names it. A second positional
+ * operand receives the dump as a file, like real xxd. `-l N` limits the dump
+ * (decimal, 0x hex, leading-zero octal, with count suffixes); `-p` emits
+ * continuous hex in bounded 30-byte rows. The default row layout predates
+ * this fix and is preserved verbatim.
  */
+function mkXxd(): CmdFn {
+  return async (ctx) => {
+    let plain = false;
+    let limit: number | undefined;
+    const operands: string[] = [];
+    for (let i = 0; i < ctx.args.length; i++) {
+      const arg = ctx.args[i];
+      if (arg === '-p') { plain = true; continue; }
+      if (arg === '-' || !arg.startsWith('-')) {
+        if (operands.length >= 2) {
+          ctx.stderr.write(`xxd: extra operand '${arg}'\n`);
+          return 1;
+        }
+        operands.push(arg);
+        continue;
+      }
+      if (arg === '-l' || arg.startsWith('-l')) {
+        const value = arg === '-l' ? ctx.args[++i] : arg.slice(2);
+        const parsed = value === undefined ? null : parseDumpCount(value);
+        if (parsed === null || parsed < 0) {
+          ctx.stderr.write(`xxd: invalid length value '${value ?? ''}'\n`);
+          return 1;
+        }
+        limit = parsed;
+        continue;
+      }
+      ctx.stderr.write(`xxd: invalid option -- '${arg.replace(/^-+/, '')}'\n`);
+      return 1;
+    }
+
+    // Prime the source FIRST: pull the initial window (surfacing any open
+    // error) before the output file exists to truncate.
+    const rowSize = plain ? 30 : 16;
+    const src = new DumpByteSource(ctx, 'xxd', operands.slice(0, 1), limit);
+    const firstWindow = await src.take(rowSize);
+    if (src.failedAll || (src.failed && src.opened === 0)) return 1;
+
+    // A second operand names the output file; `-` there means stdout. It
+    // routes through ctx.vfs like every other named path, so dumps may land
+    // on devices and mounts as they do on Unix.
+    const output = operands[1];
+    const outAbs = output !== undefined && output !== '-' ? absolutePath(ctx.cwd, output) : null;
+
+    let offset = 0;
+    let fileOffset = 0;
+    let pending: string[] = [];
+    let pendingBytes = 0;
+    let writeFailed = false;
+    const flush = () => {
+      if (pending.length === 0 || writeFailed || outAbs === null) return;
+      try {
+        ctx.vfs.writeRange(outAbs, fileOffset, encode(pending.join('')));
+      } catch (error) {
+        ctx.stderr.write(`xxd: ${output}: ${fsErrorMessage(error)}\n`);
+        writeFailed = true;
+        return;
+      }
+      fileOffset += pendingBytes;
+      pending = [];
+      pendingBytes = 0;
+    };
+
+    const renderWindow = (rowOffset: number, window: Uint8Array): string => {
+      if (plain) {
+        let line = '';
+        for (const byte of window) line += byte.toString(16).padStart(2, '0');
+        return `${line}\n`;
+      }
+      const pairs = Array.from(window, (b) => b.toString(16).padStart(2, '0')).join(' ');
+      const ascii = Array.from(window, (b) => (b >= 32 && b < 127 ? String.fromCharCode(b) : '.')).join('');
+      return `${rowOffset.toString(16).padStart(8, '0')}: ${pairs.padEnd(48)}  ${ascii}\n`;
+    };
+
+    if (outAbs !== null) {
+      // Input proved readable above, so truncating here cannot destroy data
+      // on a failed dump.
+      try {
+        ctx.vfs.writeFile(outAbs, '');
+      } catch (error) {
+        ctx.stderr.write(`xxd: ${output}: ${fsErrorMessage(error)}\n`);
+        return 1;
+      }
+    }
+
+    let window = firstWindow;
+    while (window !== null && window.length > 0 && !writeFailed) {
+      const text = renderWindow(offset, window);
+      offset += window.length;
+      if (outAbs !== null) {
+        pending.push(text);
+        pendingBytes += text.length;
+        if (pendingBytes >= 65536) flush();
+      } else {
+        ctx.stdout.write(text);
+      }
+      window = await src.take(rowSize);
+    }
+    if (outAbs !== null) flush();
+    return src.failed || writeFailed ? 1 : 0;
+  }
+}
+
 function wrapStreaming(fn: CmdFn): (ctx: Ctx) => Promise<number> {
   return async (ctx: Ctx) => {
     try {
@@ -4243,10 +5242,10 @@ function wrapStreaming(fn: CmdFn): (ctx: Ctx) => Promise<number> {
         const stdinObj = ctx.stdin;
         const isTerminalStdin = typeof stdinObj.feed === 'function';
         if (isTerminalStdin) {
-          const buf: string[] = Array.isArray(stdinObj.buffer)
-            ? stdinObj.buffer.splice(0)
-            : [];
-          ctx.stdin = buf.join('');
+          const drainable = stdinObj as { drainBuffered?: () => string };
+          ctx.stdin = typeof drainable.drainBuffered === 'function'
+            ? drainable.drainBuffered()
+            : '';
         }
         // else: leave as pipe reader for the command to handle.
       }
@@ -4289,10 +5288,10 @@ function wrap(fn: CmdFn): (ctx: Ctx) => Promise<number> {
           // first command on a line; non-empty if the user typed
           // text + Enter before the command was dispatched). DO NOT
           // await — that would wait for the user's next Ctrl-D.
-          const buf: string[] = Array.isArray(stdinObj.buffer)
-            ? stdinObj.buffer.splice(0)
-            : [];
-          ctx.stdin = buf.join('');
+          const drainable = stdinObj as { drainBuffered?: () => string };
+          ctx.stdin = typeof drainable.drainBuffered === 'function'
+            ? drainable.drainBuffered()
+            : '';
         } else if (typeof stdinObj.readAll === 'function') {
           // Pipe reader — upstream will close() after writing, so
           // readAll() resolves bounded.
@@ -4364,7 +5363,12 @@ export function registerUnixCommands(
   registry.register('readlink', wrap(withInvocationVfs(sqliteVfs, mkReadlink)));
   registry.register('sha256sum', wrap(withInvocationVfs(sqliteVfs, mkSha256sum)));
   registry.register('file', wrap(withInvocationVfs(sqliteVfs, mkFile)));
-  registry.register('xxd', wrap(withInvocationVfs(sqliteVfs, mkXxd)));
+  // od/hexdump/xxd read operands and sinks through ctx.vfs — the
+  // mount-aware seam the host hands every command — so they need no
+  // invocation-scoped raw view of their own.
+  registry.register('xxd', wrapStreaming(mkXxd()));
+  registry.register('od', wrapStreaming(mkOd()));
+  registry.register('hexdump', wrapStreaming(mkHexdump()));
 
   registry.register('chown', wrap(mkChown(sqliteVfs)));