@poe-platform/safe-bash 0.1.799 → 0.1.801

package/dist/safe-bash-command-pdfinfo/index.js

@@ -4,6 +4,7 @@ import {
 
 // packages/safe-bash-command-pdfinfo/src/index.ts
 init_buffer();
+import { resolvePath } from "../safe-bash-contracts/path.js";
 import { yieldTurn, drainCooperativeSteps as drainSteps } from "../safe-bash-contracts/yield.js";
 import { InputByteBudget } from "../safe-bash-contracts/io.js";
 import { writeFileOutput } from "../safe-bash-contracts/filesystem-output-budget.js";
@@ -13,7 +14,7 @@ import {
 } from "../safe-bash-contracts/command.js";
 import { readBytes, writeBytes } from "../safe-bash-contracts/io.js";
 import { createOutputOperation } from "../safe-bash-contracts/output.js";
-import { PdfDocument, cosArray, cosDict, cosName, cosNumber, cosStream, dictGet, dictSet, decodePdfString, parseContentStream, resolveDestinationPageIndex, decodePngSteps, encodePngSteps, encodePpmSteps, encodePgmSteps, encodePbmSteps, encodeJpegSteps, encodeTiffSteps, renderPdfPageToBitmapSteps, renderDisplayListToSvgSteps, extractDocumentImagesSteps } from "../pdf-ast/index.js";
+import { PdfDocument, cosArray, cosDict, cosName, cosNumber, cosStream, dictGet, decodePdfString, parseContentStream, resolveDestinationPageIndex } from "../pdf-ast/index.js";
 var SUPPORTED_ENCODINGS = /* @__PURE__ */ new Set([
   "ASCII7",
   "Latin1",
@@ -56,6 +57,10 @@ function parseArgs(argv) {
   const positional = [];
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
+    if (arg === "--") {
+      positional.push(...argv.slice(i + 1));
+      break;
+    }
     if (arg === "-f") {
       const next = argv[++i];
       const val = Number.parseInt(next ?? "", 10);
@@ -150,7 +155,7 @@ function sanitizeControls(value, preserveLf = false) {
 }
 function formatField(label, value) {
   const prefix = `${label}:`;
-  const pad = Math.max(1, 16 - [...prefix].length);
+  const pad = Math.max(1, 17 - [...prefix].length);
   return `${prefix}${" ".repeat(pad)}${sanitizeControls(value)}
 `;
 }
@@ -890,11 +895,12 @@ ${act.js}
     );
     out += formatField(`${pagePrefix}rot`, String(rot));
     if (args.box) {
-      out += formatField(`${pagePrefix}MediaBox`, formatBox8(mediaBox));
-      out += formatField(`${pagePrefix}CropBox`, formatBox8(cropBox));
-      out += formatField(`${pagePrefix}BleedBox`, formatBox8(bleedBox));
-      out += formatField(`${pagePrefix}TrimBox`, formatBox8(trimBox));
-      out += formatField(`${pagePrefix}ArtBox`, formatBox8(artBox));
+      const boxPrefix = multiPage ? pagePrefix : "";
+      out += formatField(`${boxPrefix}MediaBox`, formatBox8(mediaBox));
+      out += formatField(`${boxPrefix}CropBox`, formatBox8(cropBox));
+      out += formatField(`${boxPrefix}BleedBox`, formatBox8(bleedBox));
+      out += formatField(`${boxPrefix}TrimBox`, formatBox8(trimBox));
+      out += formatField(`${boxPrefix}ArtBox`, formatBox8(artBox));
     }
   }
   const fileSize = options.isStdin ? 0 : options.fileSize ?? bytes.byteLength;
@@ -1001,7 +1007,7 @@ async function pdfinfo(context) {
         offset += c.byteLength;
       }
     } else {
-      const resolvedPath = inputTarget.startsWith("/") ? inputTarget : `${context.cwd === "/" ? "" : context.cwd}/${inputTarget}`;
+      const resolvedPath = resolvePath(context.cwd, inputTarget);
       try {
         pdfBytes = await context.fs.readFile(resolvedPath, { signal: invocation.signal });
         chargeBytes(pdfBytes.byteLength);
@@ -1040,530 +1046,6 @@ function createPdfinfoCommand(options = {}) {
   });
 }
 var pdfinfoCommand = createPdfinfoCommand();
-function* runPdftoppmCliSteps(argv, files, signal) {
-  let cooperativeWork = 63;
-  let format = "ppm";
-  let colorMode = "color";
-  let dpi = 150;
-  let dpiX;
-  let dpiY;
-  let scaleTo = 0;
-  let scaleToX = 0;
-  let scaleToY = 0;
-  let cropX = 0;
-  let cropY = 0;
-  let cropW = 0;
-  let cropH = 0;
-  let hasCrop = false;
-  let useCropBox = false;
-  let hideAnnotations = false;
-  let transparent = false;
-  let progress = false;
-  let quiet = false;
-  let jpegQuality = 90;
-  let firstPage = 1;
-  let lastPage = 0;
-  let oddOnly = false;
-  let evenOnly = false;
-  let singleFile = false;
-  let forceNum = false;
-  let sep = "-";
-  let setPageNo;
-  let password = "";
-  const positionals = [];
-  for (let i = 0; i < argv.length; i++) {
-    if (++cooperativeWork % 64 === 0)
-      yield;
-    const arg = argv[i];
-    if (arg === "-v" || arg === "--version") {
-      return { exitCode: 0, stdout: "pdftoppm version 24.08.0\n", stderr: "" };
-    }
-    if (arg === "-h" || arg === "-help" || arg === "--help" || arg === "-?") {
-      return {
-        exitCode: 0,
-        stdout: "Usage: pdftoppm [options] [PDF-file [PPM-file-prefix]]\n  -png / -ppm / -gray / -mono / -jpeg / -svg\n  -r <dpi> / -rx <dpi> / -ry <dpi> / -scale-to <px> / -f <int> / -l <int> / -singlefile / -cropbox\n",
-        stderr: ""
-      };
-    }
-    if (arg === "-png")
-      format = "png";
-    else if (arg === "-tiff")
-      format = "tif";
-    else if (arg === "-ppm")
-      format = "ppm";
-    else if (arg === "-gray" || arg === "-pgm") {
-      colorMode = "gray";
-      if (format === "ppm")
-        format = "pgm";
-    } else if (arg === "-mono" || arg === "-pbm") {
-      colorMode = "mono";
-      if (format === "ppm")
-        format = "pbm";
-    } else if (arg === "-jpeg" || arg === "-jpg")
-      format = "jpeg";
-    else if (arg === "-svg")
-      format = "svg";
-    else if (arg === "-singlefile")
-      singleFile = true;
-    else if (arg === "-forcenum")
-      forceNum = true;
-    else if (arg === "-o")
-      oddOnly = true;
-    else if (arg === "-e")
-      evenOnly = true;
-    else if (arg === "-cropbox")
-      useCropBox = true;
-    else if (arg === "-hide-annotations")
-      hideAnnotations = true;
-    else if (arg === "-transp")
-      transparent = true;
-    else if (arg === "-overprint") {
-    } else if (arg === "-progress")
-      progress = true;
-    else if (arg === "-q")
-      quiet = true;
-    else if (arg === "-setpageno") {
-      const n = Number.parseInt(argv[++i] ?? "", 10);
-      if (Number.isFinite(n))
-        setPageNo = n;
-    } else if (arg === "-jpegopt") {
-      const optStr = argv[++i] ?? "";
-      for (const part of optStr.split(",")) {
-        if (++cooperativeWork % 64 === 0)
-          yield;
-        const eqIdx = part.indexOf("=");
-        if (eqIdx > 0 && part.slice(0, eqIdx).trim().toLowerCase() === "quality") {
-          const qVal = Number(part.slice(eqIdx + 1).trim());
-          if (Number.isFinite(qVal) && qVal >= 1 && qVal <= 100) {
-            jpegQuality = Math.round(qVal);
-          }
-        }
-      }
-    } else if (arg === "-sep")
-      sep = argv[++i] ?? "-";
-    else if (arg === "-r")
-      dpi = Number(argv[++i] ?? "150") || 150;
-    else if (arg === "-rx")
-      dpiX = Number(argv[++i] ?? "150") || 150;
-    else if (arg === "-ry")
-      dpiY = Number(argv[++i] ?? "150") || 150;
-    else if (arg === "-scale-to")
-      scaleTo = Number(argv[++i] ?? "0") || 0;
-    else if (arg === "-scale-to-x")
-      scaleToX = Number(argv[++i] ?? "0") || 0;
-    else if (arg === "-scale-to-y")
-      scaleToY = Number(argv[++i] ?? "0") || 0;
-    else if (arg === "-x") {
-      cropX = Number(argv[++i] ?? "0") || 0;
-      hasCrop = true;
-    } else if (arg === "-y") {
-      cropY = Number(argv[++i] ?? "0") || 0;
-      hasCrop = true;
-    } else if (arg === "-W") {
-      cropW = Number(argv[++i] ?? "0") || 0;
-      hasCrop = true;
-    } else if (arg === "-H") {
-      cropH = Number(argv[++i] ?? "0") || 0;
-      hasCrop = true;
-    } else if (arg === "-sz") {
-      const sz = Number(argv[++i] ?? "0") || 0;
-      cropW = sz;
-      cropH = sz;
-      hasCrop = true;
-    } else if (arg === "-f")
-      firstPage = Math.max(1, Number(argv[++i] ?? "1") || 1);
-    else if (arg === "-l")
-      lastPage = Math.max(0, Number(argv[++i] ?? "0") || 0);
-    else if (arg === "-upw" || arg === "-opw")
-      password = argv[++i] ?? "";
-    else if (arg === "-tiffcompression" || arg === "-aa" || arg === "-aaVector" || arg === "-thinlinemode" || arg === "-freetype")
-      i++;
-    else if (!arg.startsWith("-") || arg === "-")
-      positionals.push(arg);
-  }
-  const inputPath = positionals[0] ?? (files.has("-") ? "-" : void 0);
-  if (!inputPath) {
-    return { exitCode: 99, stdout: "", stderr: "Usage: pdftoppm [options] [PDF-file [PPM-root]]\n" };
-  }
-  const pdfBytes = files.get(inputPath);
-  if (!pdfBytes) {
-    return { exitCode: 1, stdout: "", stderr: `I/O Error: Couldn't open file '${inputPath}'
-` };
-  }
-  let doc;
-  try {
-    doc = PdfDocument.load(pdfBytes, password ? { password } : void 0);
-  } catch (err) {
-    return { exitCode: 1, stdout: "", stderr: `PDF Error: ${err.message}
-` };
-  }
-  const totalPages = Math.max(1, doc.pageCount);
-  const endPage = lastPage > 0 ? Math.min(totalPages, lastPage) : totalPages;
-  const prefix = positionals[1];
-  const ext = format === "jpeg" ? "jpg" : format;
-  const padWidth = Math.max(1, String(totalPages).length);
-  const outChunks = [];
-  const progressLines = [];
-  for (let p = firstPage; p <= endPage; p++) {
-    yield;
-    if (oddOnly && p % 2 === 0)
-      continue;
-    if (evenOnly && p % 2 === 1)
-      continue;
-    const page = doc.getPage(p - 1);
-    let rawSize = page.getSize();
-    let resolvedCropBox;
-    if (useCropBox) {
-      let cur = page.pageDict;
-      const visited = /* @__PURE__ */ new Set();
-      while (cur && !visited.has(cur)) {
-        if (++cooperativeWork % 64 === 0)
-          yield;
-        visited.add(cur);
-        const cb = doc.cos.resolveArray(dictGet(cur, "CropBox"));
-        if (cb && cb.items.length >= 4) {
-          const nums = cb.items.slice(0, 4).map((it) => {
-            const r = doc.cos.resolve(it);
-            return r?.kind === "number" ? r.value : 0;
-          });
-          resolvedCropBox = [nums[0], nums[1], nums[2], nums[3]];
-          rawSize = {
-            width: Math.max(1, Math.abs(nums[2] - nums[0])),
-            height: Math.max(1, Math.abs(nums[3] - nums[1]))
-          };
-          break;
-        }
-        cur = doc.cos.resolveDict(dictGet(cur, "Parent"));
-      }
-    }
-    const rot = page.getRotation();
-    const ptW = Math.max(1, rot === 90 || rot === 270 ? rawSize.height : rawSize.width);
-    const ptH = Math.max(1, rot === 90 || rot === 270 ? rawSize.width : rawSize.height);
-    let effDpiX = dpiX ?? dpi;
-    let effDpiY = dpiY ?? dpi;
-    if (scaleTo > 0) {
-      const s = scaleTo * 72 / Math.max(ptW, ptH);
-      effDpiX = s;
-      effDpiY = s;
-    } else {
-      if (scaleToX > 0) {
-        effDpiX = scaleToX * 72 / ptW;
-        if (scaleToY <= 0)
-          effDpiY = effDpiX;
-      }
-      if (scaleToY > 0) {
-        effDpiY = scaleToY * 72 / ptH;
-        if (scaleToX <= 0)
-          effDpiX = effDpiY;
-      }
-    }
-    let renderedBytes;
-    if (format === "svg") {
-      const fullSz = page.getSize();
-      let svgCropRect = hasCrop ? { x: cropX, y: cropY, width: cropW, height: cropH } : void 0;
-      if (useCropBox && resolvedCropBox) {
-        const sx = effDpiX / 72;
-        const sy = effDpiY / 72;
-        const cbScreenX = Math.min(resolvedCropBox[0], resolvedCropBox[2]) * sx;
-        const cbScreenY = (fullSz.height - Math.max(resolvedCropBox[1], resolvedCropBox[3])) * sy;
-        const cbScreenW = Math.abs(resolvedCropBox[2] - resolvedCropBox[0]) * sx;
-        const cbScreenH = Math.abs(resolvedCropBox[3] - resolvedCropBox[1]) * sy;
-        svgCropRect = svgCropRect ? {
-          x: cbScreenX + svgCropRect.x,
-          y: cbScreenY + svgCropRect.y,
-          width: svgCropRect.width || cbScreenW,
-          height: svgCropRect.height || cbScreenH
-        } : { x: cbScreenX, y: cbScreenY, width: cbScreenW, height: cbScreenH };
-      }
-      const svgText = yield* renderDisplayListToSvgSteps(page.evaluateDisplayList({ hideAnnotations }), {
-        dpi: effDpiX,
-        dpiX: effDpiX,
-        dpiY: effDpiY,
-        useCropBox,
-        cropRect: svgCropRect,
-        hideAnnotations,
-        transparent
-      });
-      renderedBytes = new TextEncoder().encode(svgText);
-    } else {
-      const bitmap = yield* renderPdfPageToBitmapSteps(doc.cos, p - 1, {
-        dpi: effDpiX,
-        dpiX: effDpiX,
-        dpiY: effDpiY,
-        useCropBox,
-        hideAnnotations,
-        transparent,
-        ...hasCrop ? { cropRect: { x: cropX, y: cropY, width: cropW, height: cropH } } : {}
-      });
-      if (colorMode !== "color" && (format === "png" || format === "tif" || format === "jpeg")) {
-        for (let px = 0; px < bitmap.data.length; px += 4) {
-          if (++cooperativeWork % 65536 === 0)
-            yield;
-          const r = bitmap.data[px];
-          const g = bitmap.data[px + 1];
-          const b = bitmap.data[px + 2];
-          const lum = Math.round(0.299 * r + 0.587 * g + 0.114 * b);
-          const v = colorMode === "mono" ? lum < 128 ? 0 : 255 : lum;
-          bitmap.data[px] = v;
-          bitmap.data[px + 1] = v;
-          bitmap.data[px + 2] = v;
-        }
-      }
-      if (format === "png")
-        renderedBytes = yield* encodePngSteps(bitmap);
-      else if (format === "tif")
-        renderedBytes = yield* encodeTiffSteps(bitmap, effDpiX);
-      else if (format === "ppm")
-        renderedBytes = yield* encodePpmSteps(bitmap);
-      else if (format === "pgm")
-        renderedBytes = yield* encodePgmSteps(bitmap);
-      else if (format === "pbm")
-        renderedBytes = yield* encodePbmSteps(bitmap);
-      else
-        renderedBytes = yield* encodeJpegSteps(bitmap, jpegQuality);
-    }
-    if (!prefix || prefix === "-") {
-      outChunks.push(renderedBytes);
-      if (progress && !quiet)
-        progressLines.push(`${p} ${endPage} -`);
-    } else {
-      const effectivePageNo = setPageNo !== void 0 ? setPageNo + (p - firstPage) : p;
-      const pageNumStr = String(effectivePageNo).padStart(Math.max(padWidth, String(effectivePageNo).length), "0");
-      const fileName = singleFile && !forceNum ? `${prefix}.${ext}` : `${prefix}${sep}${pageNumStr}.${ext}`;
-      files.set(fileName, renderedBytes);
-      if (progress && !quiet)
-        progressLines.push(`${p} ${endPage} ${fileName}`);
-    }
-    if (singleFile)
-      break;
-  }
-  const stderrText = progressLines.length > 0 ? progressLines.join("\n") + "\n" : "";
-  if (outChunks.length > 0) {
-    const totalLen = outChunks.reduce((s, c) => s + c.byteLength, 0);
-    const merged = new Uint8Array(totalLen);
-    let off = 0;
-    for (const c of outChunks) {
-      if (++cooperativeWork % 64 === 0)
-        yield;
-      merged.set(c, off);
-      off += c.byteLength;
-    }
-    return { exitCode: 0, stdout: "", stderr: stderrText, stdoutBytes: merged };
-  }
-  return { exitCode: 0, stdout: "", stderr: stderrText };
-}
-async function runPdftoppmCli(argv, files, signal) {
-  return drainSteps(runPdftoppmCliSteps(argv, files, signal), signal);
-}
-function formatPopplerSize(byteLength) {
-  if (byteLength >= 1024 * 1024) {
-    return `${(byteLength / (1024 * 1024)).toFixed(1)}M`;
-  }
-  if (byteLength >= 1024) {
-    return `${(byteLength / 1024).toFixed(1)}K`;
-  }
-  return `${byteLength}B`;
-}
-function formatPopplerRatio(byteLength, width, height, components, bpc) {
-  const uncompressedBits = Math.max(1, width * height * components * bpc);
-  const uncompressedBytes = Math.max(1, uncompressedBits / 8);
-  const pct = Math.min(999, Math.max(0.1, byteLength / uncompressedBytes * 100));
-  return `${pct.toFixed(1)}%`;
-}
-function* runPdfimagesCliSteps(argv, files, signal) {
-  let cooperativeWork = 63;
-  let listOnly = false;
-  let usePng = false;
-  let useJpeg = false;
-  let useTiff = false;
-  let useJp2 = false;
-  let useJbig2 = false;
-  let useCcitt = false;
-  let firstPage = 1;
-  let lastPage = 0;
-  let includePage = false;
-  let uniqueOnly = false;
-  let printFilenames = false;
-  let quiet = false;
-  let password = "";
-  const positionals = [];
-  for (let i = 0; i < argv.length; i++) {
-    if (++cooperativeWork % 64 === 0)
-      yield;
-    const arg = argv[i];
-    if (arg === "-v" || arg === "--version") {
-      return { exitCode: 0, stdout: "pdfimages version 24.08.0\n", stderr: "" };
-    }
-    if (arg === "-h" || arg === "-help" || arg === "--help" || arg === "-?") {
-      return {
-        exitCode: 0,
-        stdout: "Usage: pdfimages [options] <PDF-file> [<image-root>]\n  -list / -png / -j / -all / -f <int> / -l <int> / -p\n",
-        stderr: ""
-      };
-    }
-    if (arg === "-list")
-      listOnly = true;
-    else if (arg === "-png")
-      usePng = true;
-    else if (arg === "-j")
-      useJpeg = true;
-    else if (arg === "-tiff")
-      useTiff = true;
-    else if (arg === "-jp2")
-      useJp2 = true;
-    else if (arg === "-jbig2")
-      useJbig2 = true;
-    else if (arg === "-ccitt")
-      useCcitt = true;
-    else if (arg === "-all") {
-      usePng = true;
-      useJpeg = true;
-      useJp2 = true;
-      useJbig2 = true;
-      useCcitt = true;
-    } else if (arg === "-p")
-      includePage = true;
-    else if (arg === "-u")
-      uniqueOnly = true;
-    else if (arg === "-print-filenames")
-      printFilenames = true;
-    else if (arg === "-q")
-      quiet = true;
-    else if (arg === "-f") {
-      firstPage = Math.max(1, Number.parseInt(argv[++i] ?? "1", 10) || 1);
-    } else if (arg === "-l") {
-      lastPage = Math.max(0, Number.parseInt(argv[++i] ?? "0", 10) || 0);
-    } else if (arg === "-upw" || arg === "-opw") {
-      password = argv[++i] ?? "";
-    } else if (!arg.startsWith("-") || arg === "-") {
-      positionals.push(arg);
-    }
-  }
-  const inputPath = positionals[0] ?? (files.has("-") ? "-" : void 0);
-  if (!inputPath) {
-    return { exitCode: 99, stdout: "", stderr: quiet ? "" : "Usage: pdfimages [options] <PDF-file> [<image-root>]\n" };
-  }
-  const pdfBytes = files.get(inputPath);
-  if (!pdfBytes) {
-    return { exitCode: 1, stdout: "", stderr: quiet ? "" : `I/O Error: Couldn't open file '${inputPath}'
-` };
-  }
-  let doc;
-  try {
-    doc = PdfDocument.load(pdfBytes, password ? { password } : void 0);
-  } catch (err) {
-    return { exitCode: 1, stdout: "", stderr: quiet ? "" : `PDF Error: ${err.message}
-` };
-  }
-  const totalPages = Math.max(1, doc.pageCount);
-  const endPage = lastPage > 0 ? Math.min(totalPages, lastPage) : totalPages;
-  if (firstPage > totalPages || firstPage > endPage) {
-    return {
-      exitCode: 99,
-      stdout: "",
-      stderr: quiet ? "" : `Command Line Error: Wrong page range given: the first page (${firstPage}) can not be after the last page (${endPage}).
-`
-    };
-  }
-  const allExtracted = yield* extractDocumentImagesSteps(doc.cos, {
-    firstPage,
-    ...lastPage > 0 ? { lastPage } : {},
-    signal
-  });
-  const seenObjectIds = /* @__PURE__ */ new Set();
-  const extracted = uniqueOnly ? allExtracted.filter((img) => {
-    if (img.inline || !img.objectId)
-      return true;
-    const key = `${img.objectId.objNum}:${img.objectId.genNum}`;
-    if (seenObjectIds.has(key))
-      return false;
-    seenObjectIds.add(key);
-    return true;
-  }) : allExtracted;
-  const listLines = [
-    "page   num  type   width height color comp bpc  enc interp  object ID x-ppi y-ppi size ratio",
-    "--------------------------------------------------------------------------------------------"
-  ];
-  const root = positionals[1] ?? "image";
-  const printedFilenames = [];
-  for (let idx = 0; idx < extracted.length; idx++) {
-    if (++cooperativeWork % 64 === 0)
-      yield;
-    const img = extracted[idx];
-    const numStr = String(idx).padStart(3, "0");
-    const objField = img.inline || !img.objectId ? "  [inline]" : `${String(img.objectId.objNum).padStart(6)} ${String(img.objectId.genNum).padStart(2)}`;
-    const sizeStr = formatPopplerSize(img.byteLength).padStart(5);
-    const ratioStr = formatPopplerRatio(img.byteLength, img.width, img.height, img.components, img.bitsPerComponent).padStart(5);
-    const interpStr = (img.interpolate ? "yes" : "no").padStart(6);
-    const colorCol = (img.colorSpaceLabel ?? img.colorSpace).padEnd(5);
-    listLines.push(`${String(img.pageNumber).padStart(4)} ${String(idx).padStart(5)} ${img.type.padEnd(6)} ${String(img.width).padStart(5)} ${String(img.height).padStart(6)} ${colorCol} ${String(img.components).padStart(4)} ${String(img.bitsPerComponent).padStart(3)}  ${img.encoding.padEnd(5)} ${interpStr} ${objField} ${String(img.xPpi).padStart(5)} ${String(img.yPpi).padStart(5)} ${sizeStr} ${ratioStr}`);
-    if (!listOnly) {
-      let ext;
-      let outBytes;
-      if (useJpeg && img.encoding === "jpeg" && img.rawJpegBytes) {
-        ext = "jpg";
-        outBytes = img.rawJpegBytes;
-      } else if (useJp2 && img.encoding === "jpx" && img.rawEncodedBytes) {
-        ext = "jp2";
-        outBytes = img.rawEncodedBytes;
-      } else if (useJbig2 && img.encoding === "jbig2" && img.rawEncodedBytes) {
-        ext = "jb2e";
-        outBytes = img.rawEncodedBytes;
-      } else if (useCcitt && img.encoding === "ccitt" && img.rawEncodedBytes) {
-        ext = "ccitt";
-        outBytes = img.rawEncodedBytes;
-      } else if (useTiff) {
-        ext = "tif";
-        outBytes = yield* encodeTiffSteps(img.bitmap, img.xPpi);
-      } else if (usePng) {
-        ext = "png";
-        outBytes = yield* encodePngSteps(img.bitmap);
-      } else if (img.colorSpace === "gray" && img.bitsPerComponent === 1) {
-        ext = "pbm";
-        outBytes = yield* encodePbmSteps(img.bitmap);
-      } else {
-        ext = "ppm";
-        outBytes = yield* encodePpmSteps(img.bitmap);
-      }
-      const outName = includePage ? `${root}-${String(img.pageNumber).padStart(3, "0")}-${numStr}.${ext}` : `${root}-${numStr}.${ext}`;
-      files.set(outName, outBytes);
-      if (ext === "jb2e" && img.jbig2GlobalsBytes) {
-        const jb2gName = includePage ? `${root}-${String(img.pageNumber).padStart(3, "0")}-${numStr}.jb2g` : `${root}-${numStr}.jb2g`;
-        files.set(jb2gName, img.jbig2GlobalsBytes);
-        if (printFilenames)
-          printedFilenames.push(jb2gName);
-      }
-      if (ext === "ccitt") {
-        const paramsBase = includePage ? `${root}-${String(img.pageNumber).padStart(3, "0")}-${numStr}.params` : `${root}-${numStr}.params`;
-        const kVal = img.ccittParams?.k ?? 0;
-        const kFlag = kVal < 0 ? "-4" : kVal > 0 ? "-2" : "-1";
-        const extraFlags = [
-          kFlag,
-          `-x ${img.width}`,
-          `-y ${img.height}`,
-          ...img.ccittParams?.blackIs1 ? ["-B"] : [],
-          ...img.ccittParams?.byteAlign ? ["-A"] : []
-        ].join(" ");
-        files.set(paramsBase, new TextEncoder().encode(`${extraFlags}
-`));
-        if (printFilenames)
-          printedFilenames.push(paramsBase);
-      }
-      if (printFilenames)
-        printedFilenames.push(outName);
-    }
-  }
-  if (listOnly) {
-    return { exitCode: 0, stdout: listLines.join("\n") + "\n", stderr: "" };
-  }
-  if (printFilenames && printedFilenames.length > 0) {
-    return { exitCode: 0, stdout: printedFilenames.join("\n") + "\n", stderr: "" };
-  }
-  return { exitCode: 0, stdout: "", stderr: "" };
-}
-async function runPdfimagesCli(argv, files, signal) {
-  return drainSteps(runPdfimagesCliSteps(argv, files, signal), signal);
-}
 function copyDocumentMetadata(srcDoc, dstDoc) {
   const meta = srcDoc.getMetadata();
   if (meta.title) dstDoc.setTitle(meta.title);
@@ -2244,6 +1726,13 @@ function collectEmbeddedAttachments(doc) {
   }
   return results;
 }
+function attachmentBasename(name) {
+  const leaf = name.split("/").at(-1).split("\\").at(-1);
+  if (!leaf || leaf === "." || leaf === ".." || leaf.includes("\0")) {
+    throw new Error("Invalid embedded attachment filename");
+  }
+  return leaf;
+}
 function* runPdfdetachCliSteps(argv, files, signal) {
   let cooperativeWork = 63;
   let listOnly = false;
@@ -2327,7 +1816,7 @@ function* runPdfdetachCliSteps(argv, files, signal) {
       return { exitCode: 1, stdout: "", stderr: `Error: Invalid file index ${saveNumber}
 ` };
     }
-    const dest = outputPath ? outputPath.endsWith("/") ? `${outputPath}${target.name}` : outputPath : target.name;
+    const dest = outputPath ? outputPath.endsWith("/") ? `${outputPath}${attachmentBasename(target.name)}` : outputPath : attachmentBasename(target.name);
     files.set(dest, target.data);
     return { exitCode: 0, stdout: "", stderr: "" };
   }
@@ -2337,7 +1826,7 @@ function* runPdfdetachCliSteps(argv, files, signal) {
       return { exitCode: 1, stdout: "", stderr: `Error: Embedded file '${saveFileName}' not found
 ` };
     }
-    const dest = outputPath ? outputPath.endsWith("/") ? `${outputPath}${target.name}` : outputPath : target.name;
+    const dest = outputPath ? outputPath.endsWith("/") ? `${outputPath}${attachmentBasename(target.name)}` : outputPath : attachmentBasename(target.name);
     files.set(dest, target.data);
     return { exitCode: 0, stdout: "", stderr: "" };
   }
@@ -2346,7 +1835,8 @@ function* runPdfdetachCliSteps(argv, files, signal) {
     for (const att of attachments) {
       if (++cooperativeWork % 64 === 0)
         yield;
-      files.set(prefix ? `${prefix}/${att.name}` : att.name, att.data);
+      const name = attachmentBasename(att.name);
+      files.set(prefix ? `${prefix}/${name}` : name, att.data);
     }
   }
   return { exitCode: 0, stdout: "", stderr: "" };
@@ -2399,6 +1889,10 @@ function extractPopplerFileToolPositionals(argv) {
   const pos = [];
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
+    if (arg === "--") {
+      pos.push(...argv.slice(i + 1));
+      break;
+    }
     if (POPPLER_FILE_TOOL_VALUE_FLAGS.has(arg)) {
       i++;
       continue;
@@ -2417,7 +1911,6 @@ async function executePopplerFileTool(context, runner) {
     const carrier = getCommandArguments(context);
     const argv = [...carrier.args];
     const vfsFiles = /* @__PURE__ */ new Map();
-    const resolveVfsPath = (p) => p.startsWith("/") ? p : `${context.cwd === "/" ? "" : context.cwd}/${p}`;
     let accountedBytes = 0;
     const chargeBytes = (delta) => {
       if (delta > 0) {
@@ -2446,11 +1939,11 @@ async function executePopplerFileTool(context, runner) {
         vfsFiles.set("-", buf);
       }
     }
-    for (const token of positionals) {
+    for (const token of new Set(runner === runPdfuniteCli ? positionals.slice(0, -1) : positionals.slice(0, 1))) {
       if (++cooperativeWork % 64 === 0) await yieldTurn(context.signal);
       if (token === "-") continue;
       try {
-        const bytes = await context.fs.readFile(resolveVfsPath(token), { signal: invocation.signal });
+        const bytes = await context.fs.readFile(resolvePath(context.cwd, token), { signal: invocation.signal });
         chargeBytes(bytes.byteLength);
         vfsFiles.set(token, bytes);
       } catch {
@@ -2476,13 +1969,16 @@ async function executePopplerFileTool(context, runner) {
       if (++cooperativeWork % 64 === 0) await yieldTurn(context.signal);
       if (key !== "-" && existingSnap.get(key) !== val) {
         chargeBytes(val.byteLength);
-        const abs = resolveVfsPath(key);
-        const parentDir = abs.slice(0, abs.lastIndexOf("/")) || "/";
+        const abs = resolvePath(context.cwd, key);
         try {
-          await context.fs.mkdir(parentDir, { recursive: true, signal: invocation.signal });
-        } catch {
+          await writeFileOutput(context, val, (data) => context.fs.writeFile(abs, data, { signal: invocation.signal }));
+        } catch (error) {
+          invocation.signal.throwIfAborted();
+          if (!(error instanceof Error) || !("code" in error)) throw error;
+          await writeBytes(context.stderr, new TextEncoder().encode(`I/O Error: ${runner === runPdfdetachCli ? "Error saving embedded file as" : runner === runPdfuniteCli ? "Could not open file" : "Couldn't open file"} '${key}'
+`), invocation.signal);
+          return { exitCode: runner === runPdfuniteCli ? 255 : runner === runPdfseparateCli ? 99 : 2 };
         }
-        await writeFileOutput(context, val, (data) => context.fs.writeFile(abs, data, { signal: invocation.signal }));
       }
     }
     return { exitCode: res.exitCode };
@@ -2490,34 +1986,6 @@ async function executePopplerFileTool(context, runner) {
     await invocation.close();
   }
 }
-function createPdftoppmCommand(options = {}) {
-  const maxInputBytes = InputByteBudget.limit(options.limits?.maxInputBytes);
-  return Object.freeze({
-    name: "pdftoppm",
-    runtimeIdentity: commandRuntimeIdentity,
-    description: "Render PDF pages to PNG, PPM, PGM, or PBM images via @poe-code/pdf-ast",
-    execute(context) {
-      return new InputByteBudget(maxInputBytes).run(context, async (context2) => {
-        return executePopplerFileTool(context2, runPdftoppmCli);
-      });
-    }
-  });
-}
-var pdftoppmCommand = createPdftoppmCommand();
-function createPdfimagesCommand(options = {}) {
-  const maxInputBytes = InputByteBudget.limit(options.limits?.maxInputBytes);
-  return Object.freeze({
-    name: "pdfimages",
-    runtimeIdentity: commandRuntimeIdentity,
-    description: "List and extract embedded images from PDF pages via @poe-code/pdf-ast",
-    execute(context) {
-      return new InputByteBudget(maxInputBytes).run(context, async (context2) => {
-        return executePopplerFileTool(context2, runPdfimagesCli);
-      });
-    }
-  });
-}
-var pdfimagesCommand = createPdfimagesCommand();
 function createPdfuniteCommand(options = {}) {
   const maxInputBytes = InputByteBudget.limit(options.limits?.maxInputBytes);
   return Object.freeze({
@@ -2574,208 +2042,6 @@ function createPdfdetachCommand(options = {}) {
   });
 }
 var pdfdetachCommand = createPdfdetachCommand();
-function* runPdftocairoCliSteps(argv, files, signal) {
-  let cooperativeWork = 63;
-  let format = "png";
-  let grayMode = false;
-  let monoMode = false;
-  let firstPage = 1;
-  let lastPage = 0;
-  let cropX = 0;
-  let cropY = 0;
-  let cropW = 0;
-  let cropH = 0;
-  let hasCrop = false;
-  const paperW = 0;
-  const paperH = 0;
-  const origPageSizes = false;
-  let password = "";
-  const forwardedArgs = [];
-  const positionals = [];
-  for (let i = 0; i < argv.length; i++) {
-    if (++cooperativeWork % 64 === 0)
-      yield;
-    const arg = argv[i];
-    if (arg === "-v" || arg === "--version") {
-      return { exitCode: 0, stdout: "pdftocairo version 24.08.0\n", stderr: "" };
-    }
-    if (arg === "-h" || arg === "-help" || arg === "--help" || arg === "-?") {
-      return {
-        exitCode: 0,
-        stdout: "Usage: pdftocairo [options] <PDF-file> [<output-file>]\n",
-        stderr: ""
-      };
-    }
-    if (arg === "-png") {
-      format = "png";
-      forwardedArgs.push("-png");
-    } else if (arg === "-jpeg" || arg === "-jpg") {
-      format = "jpg";
-      forwardedArgs.push("-jpeg");
-    } else if (arg === "-tiff") {
-      format = "tif";
-      forwardedArgs.push("-tiff");
-    } else if (arg === "-svg")
-      format = "svg";
-    else if (arg === "-pdf")
-      format = "pdf";
-    else if (arg === "-ps")
-      format = "ps";
-    else if (arg === "-eps")
-      format = "eps";
-    else if (arg === "-gray")
-      grayMode = true;
-    else if (arg === "-mono")
-      monoMode = true;
-    else if (arg === "-antialias") {
-      const m = (argv[++i] ?? "").toLowerCase();
-      if (!["default", "none", "gray", "subpixel", "fast", "good", "best"].includes(m)) {
-        return { exitCode: 99, stdout: "", stderr: "Bad '-antialias' value on command line\n" };
-      }
-    } else if (POPPLER_FILE_TOOL_VALUE_FLAGS.has(arg)) {
-      const v = argv[++i] ?? "";
-      forwardedArgs.push(arg, v);
-      if (arg === "-f")
-        firstPage = Math.max(1, Number.parseInt(v, 10) || 1);
-      else if (arg === "-l")
-        lastPage = Math.max(0, Number.parseInt(v, 10) || 0);
-      else if (arg === "-x") {
-        cropX = Math.max(0, Number.parseInt(v, 10) || 0);
-        hasCrop = true;
-      } else if (arg === "-y") {
-        cropY = Math.max(0, Number.parseInt(v, 10) || 0);
-        hasCrop = true;
-      } else if (arg === "-W") {
-        cropW = Math.max(0, Number.parseInt(v, 10) || 0);
-        hasCrop = true;
-      } else if (arg === "-H") {
-        cropH = Math.max(0, Number.parseInt(v, 10) || 0);
-        hasCrop = true;
-      } else if (arg === "-upw" || arg === "-opw")
-        password = v;
-    } else if (arg.startsWith("-") && arg !== "-") {
-      forwardedArgs.push(arg);
-    } else {
-      positionals.push(arg);
-    }
-  }
-  const inputPath = positionals[0] ?? (files.has("-") ? "-" : void 0);
-  if (!inputPath) {
-    return { exitCode: 99, stdout: "", stderr: "Usage: pdftocairo [options] <PDF-file> [<output-file>]\n" };
-  }
-  const inputStem = inputPath.toLowerCase().endsWith(".pdf") ? inputPath.slice(0, -4) : inputPath;
-  if (format === "svg") {
-    const rawOut = positionals[1] ?? (inputPath === "-" ? "-" : `${inputStem}.svg`);
-    const rootForSvg = rawOut.toLowerCase().endsWith(".svg") ? rawOut.slice(0, -4) : rawOut;
-    return yield* runPdftoppmCliSteps(["-svg", "-singlefile", ...forwardedArgs, inputPath, rootForSvg], files, signal);
-  }
-  if (format === "pdf" || format === "ps" || format === "eps") {
-    const pdfBytes = files.get(inputPath);
-    if (!pdfBytes)
-      return { exitCode: 1, stdout: "", stderr: `I/O Error: Couldn't open file '${inputPath}'
-` };
-    const doc = PdfDocument.load(pdfBytes, password ? { password } : void 0);
-    const endPage = lastPage > 0 ? Math.min(doc.pageCount, lastPage) : doc.pageCount;
-    if (firstPage > doc.pageCount || firstPage > endPage) {
-      return { exitCode: 99, stdout: "", stderr: "Command Line Error: Wrong page range given\n" };
-    }
-    const rawOut = positionals[1] ?? (inputPath === "-" ? "-" : `${inputStem}.${format}`);
-    const finalOut = rawOut === "-" || rawOut.toLowerCase().endsWith(`.${format}`) ? rawOut : `${rawOut}.${format}`;
-    if (format === "pdf") {
-      const outDoc = PdfDocument.create();
-      for (let p = firstPage; p <= endPage; p++) {
-        yield;
-        const [copied] = outDoc.copyPagesFrom(doc, [p - 1]);
-        if (copied && hasCrop) {
-          const origSize = copied.getSize();
-          const effW = cropW > 0 ? cropW : Math.max(1, origSize.width - cropX);
-          const effH = cropH > 0 ? cropH : Math.max(1, origSize.height - cropY);
-          dictSet(copied.pageDict, "MediaBox", cosArray([cosNumber(0), cosNumber(0), cosNumber(effW), cosNumber(effH)]));
-          dictSet(copied.pageDict, "CropBox", cosArray([cosNumber(0), cosNumber(0), cosNumber(effW), cosNumber(effH)]));
-        }
-      }
-      const outBytes = outDoc.save();
-      if (finalOut === "-")
-        return { exitCode: 0, stdout: "", stderr: "", stdoutBytes: outBytes };
-      files.set(finalOut, outBytes);
-      return { exitCode: 0, stdout: "", stderr: "" };
-    }
-    const firstSize = doc.getPage(firstPage - 1).getSize();
-    const psLines = [
-      format === "eps" ? "%!PS-Adobe-3.0 EPSF-3.0" : "%!PS-Adobe-3.0",
-      `%%BoundingBox: 0 0 ${Math.round(firstSize.width)} ${Math.round(firstSize.height)}`,
-      `%%Pages: ${endPage - firstPage + 1}`,
-      "%%EndComments"
-    ];
-    for (let p = firstPage; p <= endPage; p++) {
-      yield;
-      const page = doc.getPage(p - 1);
-      psLines.push(`%%Page: ${p - firstPage + 1} ${p - firstPage + 1}`);
-      for (const b of page.extractPage().blocks) {
-        yield;
-        for (const l of b.lines) {
-          if (++cooperativeWork % 64 === 0)
-            yield;
-          psLines.push(`${Math.round(l.bbox[0])} ${Math.round(l.bbox[1])} moveto (${l.text}) show`);
-        }
-      }
-      psLines.push("showpage");
-    }
-    psLines.push("%%Trailer", "%%EOF", "");
-    const psBytes = new TextEncoder().encode(psLines.join("\n"));
-    if (finalOut === "-")
-      return { exitCode: 0, stdout: "", stderr: "", stdoutBytes: psBytes };
-    files.set(finalOut, psBytes);
-    return { exitCode: 0, stdout: "", stderr: "" };
-  }
-  const rasterPositionals = positionals.length === 1 && inputPath !== "-" ? [inputPath, inputStem] : positionals;
-  const snapBefore = new Map(files);
-  const res = yield* runPdftoppmCliSteps([...forwardedArgs, ...rasterPositionals], files, signal);
-  if (res.exitCode !== 0 || !grayMode && !monoMode) {
-    return res;
-  }
-  const convertRgbaInPlace = (data) => {
-    for (let p = 0; p < data.length; p += 4) {
-      const lum = Math.round(0.299 * data[p] + 0.587 * data[p + 1] + 0.114 * data[p + 2]);
-      const val = monoMode ? lum >= 128 ? 255 : 0 : lum;
-      data[p] = val;
-      data[p + 1] = val;
-      data[p + 2] = val;
-    }
-  };
-  if (res.stdoutBytes && format === "png") {
-    const decoded = yield* decodePngSteps(res.stdoutBytes);
-    convertRgbaInPlace(decoded.data);
-    return { ...res, stdoutBytes: yield* encodePngSteps(decoded) };
-  }
-  for (const [k, v] of files.entries()) {
-    if (++cooperativeWork % 64 === 0)
-      yield;
-    if (snapBefore.get(k) !== v && k.endsWith(".png")) {
-      const decoded = yield* decodePngSteps(v);
-      convertRgbaInPlace(decoded.data);
-      files.set(k, yield* encodePngSteps(decoded));
-    }
-  }
-  return res;
-}
-async function runPdftocairoCli(argv, files, signal) {
-  return drainSteps(runPdftocairoCliSteps(argv, files, signal), signal);
-}
-function createPdftocairoCommand(options = {}) {
-  const maxInputBytes = InputByteBudget.limit(options.limits?.maxInputBytes);
-  return Object.freeze({
-    name: "pdftocairo",
-    runtimeIdentity: commandRuntimeIdentity,
-    description: "Render PDF pages to PNG, JPEG, TIFF, PDF, PS, EPS, or SVG via @poe-code/pdf-ast",
-    execute(context) {
-      return new InputByteBudget(maxInputBytes).run(context, async (context2) => {
-        return executePopplerFileTool(context2, runPdftocairoCli);
-      });
-    }
-  });
-}
-var pdftocairoCommand = createPdftocairoCommand();
 function pdfinfoCommands(options = {}) {
   const command = createPdfinfoCommand(options);
   const uniteCmd = createPdfuniteCommand(options);
@@ -2800,32 +2066,23 @@ function createPdfinfoCommands(options = {}) {
 export {
   createPdfdetachCommand,
   createPdffontsCommand,
-  createPdfimagesCommand,
   createPdfinfoCommand,
   createPdfinfoCommands,
   createPdfseparateCommand,
-  createPdftocairoCommand,
-  createPdftoppmCommand,
   createPdfuniteCommand,
   inspectPdfBytes,
   pdfdetachCommand,
   pdffontsCommand,
-  pdfimagesCommand,
   pdfinfo,
   pdfinfoCommand,
   pdfinfoCommands,
   pdfseparateCommand,
-  pdftocairoCommand,
-  pdftoppmCommand,
   pdfuniteCommand,
   runPdfdetachCli,
   runPdfdetachCliSync,
   runPdffontsCli,
   runPdffontsCliSync,
-  runPdfimagesCli,
   runPdfinfoCli,
   runPdfseparateCli,
-  runPdftocairoCli,
-  runPdftoppmCli,
   runPdfuniteCli
 };