@poe-platform/safe-bash 0.1.800 → 0.1.802

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

@@ -35,17 +35,6 @@ Diagnose invalid or unportable file names.
 var VERSION_TEXT = `pathchk (Sandbox VFS-ish/GNU coreutils) 9.7
 `;
 var PORTABLE_CHAR_RE = /^[A-Za-z0-9._-]+$/;
-function resolveVfsPath(cwd, target) {
-  const raw = target.startsWith("/") ? target : cwd.endsWith("/") ? cwd + target : `${cwd}/${target}`;
-  const parts = raw.split("/");
-  const stack = [];
-  for (const part of parts) {
-    if (!part || part === ".") continue;
-    if (part === "..") stack.pop();
-    else stack.push(part);
-  }
-  return "/" + stack.join("/");
-}
 function createPathchkCommand(options = {}) {
   const limits = settings(options);
   return {
@@ -182,12 +171,13 @@ function createPathchkCommand(options = {}) {
           continue;
         }
         if (!checkBasicPosix) {
-          const full = resolveVfsPath(context.cwd, name);
-          const parts = full.split("/").filter(Boolean);
+          const full = name.startsWith("/") ? name : `${context.cwd}/${name}`;
+          const parts = full.split("/");
           let current = "";
           for (let k = 0; k < parts.length - 1; k++) {
             context.signal.throwIfAborted();
             if ((k & 127) === 0) await yieldTurn(context.signal);
+            if (!parts[k]) continue;
             current += "/" + parts[k];
             try {
               const st = await context.fs.stat(current, { signal: context.signal });

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

@@ -4,6 +4,7 @@ import {
 
 // packages/safe-bash-command-pdfimages/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";
@@ -29,11 +30,15 @@ function formatPopplerRatio(byteLength, width, height, components, bpc) {
   const pct = Math.min(999, Math.max(0.1, byteLength / uncompressedBytes * 100));
   return `${pct.toFixed(1)}%`;
 }
-var PDFIMAGES_VALUE_FLAGS = /* @__PURE__ */ new Set(["-f", "-l", "-upw", "-opw"]);
+var PDFIMAGES_VALUE_FLAGS = /* @__PURE__ */ new Set(["-f", "-l", "-upw", "-opw", "-min-width", "-min-height"]);
 function extractPdfimagesPositionals(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 (PDFIMAGES_VALUE_FLAGS.has(arg)) {
       i++;
       continue;
@@ -55,6 +60,8 @@ function* runPdfimagesCliSteps(argv, files, options = {}) {
   let useCcitt = false;
   let firstPage = 1;
   let lastPage = 0;
+  let minWidth = 0;
+  let minHeight = 0;
   let includePage = false;
   let uniqueOnly = false;
   let printFilenames = false;
@@ -65,15 +72,19 @@ function* runPdfimagesCliSteps(argv, files, options = {}) {
     if (++cooperativeWork % 64 === 0)
       yield;
     const arg = argv[i];
+    if (arg === "--") {
+      positionals.push(...argv.slice(i + 1));
+      break;
+    }
     if (PDFIMAGES_VALUE_FLAGS.has(arg)) {
       const value = argv[i + 1];
       if (value === void 0) {
         return { exitCode: 99, stdout: "", stderr: `Missing value for '${arg}'
 ` };
       }
-      if (arg === "-f" || arg === "-l") {
+      if (arg === "-f" || arg === "-l" || arg === "-min-width" || arg === "-min-height") {
         const unsigned = value.startsWith("+") || value.startsWith("-") ? value.slice(1) : value;
-        if (![...unsigned].every((char) => char >= "0" && char <= "9")) {
+        if (unsigned.length === 0 || !Number.isSafeInteger(Number(value)) || ![...unsigned].every((char) => char >= "0" && char <= "9")) {
           return { exitCode: 99, stdout: "", stderr: `Bad '${arg}' value on command line
 ` };
         }
@@ -85,7 +96,7 @@ function* runPdfimagesCliSteps(argv, files, options = {}) {
     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",
+        stdout: "Usage: pdfimages [options] <PDF-file> [<image-root>]\n  -list / -png / -j / -all / -f <int> / -l <int> / -p\n  -min-width <int> / -min-height <int> : ignore smaller images\n",
         stderr: ""
       };
     }
@@ -121,6 +132,10 @@ function* runPdfimagesCliSteps(argv, files, options = {}) {
       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 === "-min-width") {
+      minWidth = Number(argv[++i]);
+    } else if (arg === "-min-height") {
+      minHeight = Number(argv[++i]);
     } else if (arg === "-upw" || arg === "-opw") {
       password = argv[++i] ?? "";
     } else if (!arg.startsWith("-") || arg === "-") {
@@ -165,7 +180,8 @@ function* runPdfimagesCliSteps(argv, files, options = {}) {
     signal: options.signal
   });
   const seenObjectIds = /* @__PURE__ */ new Set();
-  const extracted = uniqueOnly ? allExtracted.filter((img) => {
+  const sizedImages = allExtracted.filter((img) => img.width >= minWidth && img.height >= minHeight);
+  const extracted = uniqueOnly ? sizedImages.filter((img) => {
     if (img.inline || !img.objectId)
       return true;
     const key = `${img.objectId.objNum}:${img.objectId.genNum}`;
@@ -173,7 +189,7 @@ function* runPdfimagesCliSteps(argv, files, options = {}) {
       return false;
     seenObjectIds.add(key);
     return true;
-  }) : allExtracted;
+  }) : sizedImages;
   const listLines = [
     "page   num  type   width height color comp bpc  enc interp  object ID x-ppi y-ppi size ratio",
     "--------------------------------------------------------------------------------------------"
@@ -275,7 +291,6 @@ async function executePdfimages(context) {
     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) {
@@ -283,8 +298,9 @@ async function executePdfimages(context) {
         context.inputBudget?.check(accountedBytes);
       }
     };
-    const positionals = extractPdfimagesPositionals(argv);
-    if (positionals.length === 0 || positionals[0] === "-") {
+    const needsInput = (await runPdfimagesCli(argv, /* @__PURE__ */ new Map(), { signal: invocation.signal })).exitCode === 1;
+    const positionals = needsInput ? extractPdfimagesPositionals(argv) : [];
+    if (needsInput && (positionals.length === 0 || positionals[0] === "-")) {
       const chunks = [];
       let total = 0;
       for await (const chunk of readBytes(context.stdin, invocation.signal)) {
@@ -306,7 +322,7 @@ async function executePdfimages(context) {
       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 {
@@ -325,7 +341,7 @@ async function executePdfimages(context) {
     for (const [key, val] of vfsFiles.entries()) {
       if (++cooperativeWork % 64 === 0) await yieldTurn(context.signal);
       if (key !== "-" && existingSnap.get(key) !== val) {
-        const abs = resolveVfsPath(key);
+        const abs = resolvePath(context.cwd, key);
         try {
           await writeFileOutput(context, val, (data) => context.fs.writeFile(abs, data, { signal: invocation.signal }));
         } catch (error) {

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";
@@ -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);
@@ -1883,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;
@@ -1901,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) {
@@ -1934,7 +1943,7 @@ async function executePopplerFileTool(context, runner) {
       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 {
@@ -1960,7 +1969,7 @@ 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 abs = resolvePath(context.cwd, key);
         try {
           await writeFileOutput(context, val, (data) => context.fs.writeFile(abs, data, { signal: invocation.signal }));
         } catch (error) {

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

@@ -4,6 +4,7 @@ import {
 
 // packages/safe-bash-command-pdftk/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";
@@ -1810,7 +1811,6 @@ async function executePdftk(context) {
     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) {
@@ -1861,7 +1861,7 @@ async function executePdftk(context) {
       if (++cooperativeWork % 64 === 0) await yieldTurn(context.signal);
       if (filePath === "-") continue;
       try {
-        const bytes = await context.fs.readFile(resolveVfsPath(filePath), { signal: invocation.signal });
+        const bytes = await context.fs.readFile(resolvePath(context.cwd, filePath), { signal: invocation.signal });
         chargeBytes(bytes.byteLength);
         vfsFiles.set(filePath, bytes);
       } catch {
@@ -1887,7 +1887,7 @@ async function executePdftk(context) {
       if (++cooperativeWork % 64 === 0) await yieldTurn(context.signal);
       if (key !== "-" && existingSnap.get(key) !== val) {
         chargeBytes(val.byteLength);
-        const abs = resolveVfsPath(key);
+        const abs = resolvePath(context.cwd, key);
         try {
           await writeFileOutput(context, val, (data) => context.fs.writeFile(abs, data, { signal: invocation.signal }));
         } catch (error) {

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

@@ -4,6 +4,7 @@ import {
 
 // packages/safe-bash-command-pdftoppm/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";
@@ -48,6 +49,10 @@ function extractPdftoppmPositionals(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 (VALUE_FLAGS.has(arg)) {
       i++;
       continue;
@@ -98,6 +103,10 @@ function* runPdftoppmCliSteps(argv, files, options = {}) {
     if (++cooperativeWork % 64 === 0)
       yield;
     const arg = argv[i];
+    if (arg === "--") {
+      positionals.push(...argv.slice(i + 1));
+      break;
+    }
     if (VALUE_FLAGS.has(arg)) {
       const value = argv[i + 1];
       if (value === void 0) {
@@ -439,7 +448,6 @@ async function executePdftoppm(context) {
     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) {
@@ -447,8 +455,9 @@ async function executePdftoppm(context) {
         context.inputBudget?.check(accountedBytes);
       }
     };
-    const positionals = extractPdftoppmPositionals(argv);
-    const readStdin = positionals.length === 0 || positionals[0] === "-";
+    const needsInput = (await runPdftoppmCli(argv, /* @__PURE__ */ new Map([["-", new Uint8Array()]]), { signal: invocation.signal })).exitCode === 1;
+    const positionals = needsInput ? extractPdftoppmPositionals(argv) : [];
+    const readStdin = needsInput && (positionals.length === 0 || positionals[0] === "-");
     if (readStdin) {
       const chunks = [];
       let total = 0;
@@ -471,7 +480,7 @@ async function executePdftoppm(context) {
       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 {
@@ -493,7 +502,7 @@ async function executePdftoppm(context) {
     for (const [key, val] of vfsFiles.entries()) {
       if (++cooperativeWork % 64 === 0) await yieldTurn(context.signal);
       if (key !== "-" && existingSnap.get(key) !== val) {
-        const abs = resolveVfsPath(key);
+        const abs = resolvePath(context.cwd, key);
         try {
           await writeFileOutput(context, val, (data) => context.fs.writeFile(abs, data, { signal: invocation.signal }));
         } catch (error) {
@@ -543,6 +552,10 @@ function extractPdftocairoPositionals(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 (CAIRO_VALUE_FLAGS.has(arg)) {
       i++;
       continue;
@@ -578,6 +591,10 @@ function* runPdftocairoCliSteps(argv, files, options = {}) {
     if (++cooperativeWork % 64 === 0)
       yield;
     const arg = argv[i];
+    if (arg === "--") {
+      positionals.push(...argv.slice(i + 1));
+      break;
+    }
     if (arg === "-v" || arg === "--version") {
       return { exitCode: 0, stdout: "pdftocairo version 24.08.0\n", stderr: "" };
     }
@@ -699,7 +716,7 @@ function* runPdftocairoCliSteps(argv, files, options = {}) {
   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, options);
+    return yield* runPdftoppmCliSteps(["-svg", "-singlefile", ...forwardedArgs, "--", inputPath, rootForSvg], files, options);
   }
   if (format === "pdf" || format === "ps" || format === "eps") {
     const pdfBytes = files.get(inputPath);
@@ -810,7 +827,7 @@ function* runPdftocairoCliSteps(argv, files, options = {}) {
   }
   const snapBefore = new Map(files);
   const rasterPositionals = positionals.length === 1 && inputPath !== "-" ? [inputPath, inputStem] : positionals;
-  const res = yield* runPdftoppmCliSteps([...forwardedArgs, ...rasterPositionals], files, options);
+  const res = yield* runPdftoppmCliSteps([...forwardedArgs, "--", ...rasterPositionals], files, options);
   if (res.exitCode !== 0 || !grayMode && !monoMode) {
     return res;
   }
@@ -860,7 +877,6 @@ function createPdftocairoCommand(options = {}) {
           const carrier = getCommandArguments(context2);
           const argv = [...carrier.args];
           const vfsFiles = /* @__PURE__ */ new Map();
-          const resolveVfsPath = (p) => p.startsWith("/") ? p : `${context2.cwd === "/" ? "" : context2.cwd}/${p}`;
           let accountedBytes = 0;
           const chargeBytes = (delta) => {
             if (delta > 0) {
@@ -893,7 +909,7 @@ function createPdftocairoCommand(options = {}) {
             if (++cooperativeWork % 64 === 0) await yieldTurn(context2.signal);
             if (token === "-") continue;
             try {
-              const bytes = await context2.fs.readFile(resolveVfsPath(token), { signal: invocation.signal });
+              const bytes = await context2.fs.readFile(resolvePath(context2.cwd, token), { signal: invocation.signal });
               chargeBytes(bytes.byteLength);
               vfsFiles.set(token, bytes);
             } catch {
@@ -915,7 +931,7 @@ function createPdftocairoCommand(options = {}) {
           for (const [key, val] of vfsFiles.entries()) {
             if (++cooperativeWork % 64 === 0) await yieldTurn(context2.signal);
             if (key !== "-" && existingSnap.get(key) !== val) {
-              const abs = resolveVfsPath(key);
+              const abs = resolvePath(context2.cwd, key);
               try {
                 await writeFileOutput(context2, val, (data) => context2.fs.writeFile(abs, data, { signal: invocation.signal }));
               } catch (error) {

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

@@ -4,6 +4,7 @@ import {
 
 // packages/safe-bash-command-pdftotext/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";
@@ -285,6 +286,13 @@ var ASCII7_COMPAT_MAP = {
   "\u2026": "...",
   "\xA0": " "
 };
+function encodeUcs2(text) {
+  const bytes = new Uint8Array(2 + text.length * 2);
+  const view = new DataView(bytes.buffer);
+  view.setUint16(0, 65279);
+  for (let i = 0; i < text.length; i++) view.setUint16(2 + i * 2, text.charCodeAt(i));
+  return bytes;
+}
 function applyPopplerOutputEncoding(text, encoding) {
   if (!encoding || encoding === "UTF-8" || encoding === "UCS-2") return text;
   if (encoding === "ASCII7") {
@@ -431,14 +439,14 @@ function renderBboxHtml(doc, pages, args) {
       const bxMax = (block.bbox[2] * scale).toFixed(6);
       const byMax = ((extracted.height - block.bbox[1]) * scale).toFixed(6);
       if (args.bboxLayout) html += "    <flow>\n";
-      html += `      <block xMin="${bxMin}" yMin="${byMin}" xMax="${bxMax}" yMax="${byMax}">
+      if (args.bboxLayout) html += `      <block xMin="${bxMin}" yMin="${byMin}" xMax="${bxMax}" yMax="${byMax}">
 `;
       for (const line of block.lines) {
         const lxMin = (line.bbox[0] * scale).toFixed(6);
         const lyMin = ((extracted.height - line.bbox[3]) * scale).toFixed(6);
         const lxMax = (line.bbox[2] * scale).toFixed(6);
         const lyMax = ((extracted.height - line.bbox[1]) * scale).toFixed(6);
-        html += `        <line xMin="${lxMin}" yMin="${lyMin}" xMax="${lxMax}" yMax="${lyMax}">
+        if (args.bboxLayout) html += `        <line xMin="${lxMin}" yMin="${lyMin}" xMax="${lxMax}" yMax="${lyMax}">
 `;
         for (const word of line.words) {
           const wxMin = (word.bbox[0] * scale).toFixed(6);
@@ -448,9 +456,9 @@ function renderBboxHtml(doc, pages, args) {
           html += `          <word xMin="${wxMin}" yMin="${wyMin}" xMax="${wxMax}" yMax="${wyMax}">${escapeXml(word.text)}</word>
 `;
         }
-        html += "        </line>\n";
+        if (args.bboxLayout) html += "        </line>\n";
       }
-      html += "      </block>\n";
+      if (args.bboxLayout) html += "      </block>\n";
       if (args.bboxLayout) html += "    </flow>\n";
     }
     html += "  </page>\n";
@@ -474,7 +482,7 @@ function renderTsv(pages, args) {
       const bWidth = ((block.bbox[2] - block.bbox[0]) * scale).toFixed(6);
       const bHeight = ((block.bbox[3] - block.bbox[1]) * scale).toFixed(6);
       rows.push(
-        `2	${pageNumber}	${blockIdx}	${blockIdx}	0	0	${bLeft}	${bTop}	${bWidth}	${bHeight}	-1	###FLOW###`
+        `3	${pageNumber}	${blockIdx}	${blockIdx}	0	0	${bLeft}	${bTop}	${bWidth}	${bHeight}	-1	###FLOW###`
       );
       block.lines.forEach((line, lineIdx) => {
         const lLeft = (line.bbox[0] * scale).toFixed(6);
@@ -690,7 +698,7 @@ ${escapeXml(tsvText)}</pre>
     if (eolChar !== "\n") {
       pageText = pageText.replaceAll("\n", eolChar);
     }
-    if (pageText.length > 0 && !pageText.endsWith(eolChar)) {
+    if (mode !== "raw" && pageText.length > 0 && !pageText.endsWith(eolChar)) {
       pageText += eolChar;
     }
     if (mode === "logical" && pageText.length > 0) {
@@ -819,7 +827,7 @@ async function pdftotext(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);
@@ -839,13 +847,13 @@ async function pdftotext(context) {
     if (res.exitCode !== 0) {
       return { exitCode: res.exitCode };
     }
-    const outBytes = new TextEncoder().encode(res.output);
+    const outBytes = parsed.encoding === "Latin1" ? Uint8Array.from(res.output, (char) => char.charCodeAt(0)) : parsed.encoding === "UCS-2" ? encodeUcs2(res.output) : new TextEncoder().encode(res.output);
     chargeBytes(outBytes.byteLength);
     if (res.outputPath === "-") {
       const stdout = invocation.child(context.stdout);
       await writeBytes(stdout.output, outBytes, invocation.signal);
     } else {
-      const outResolved = res.outputPath.startsWith("/") ? res.outputPath : `${context.cwd === "/" ? "" : context.cwd}/${res.outputPath}`;
+      const outResolved = resolvePath(context.cwd, res.outputPath);
       try {
         await writeFileOutput(context, outBytes, (data) => context.fs.writeFile(outResolved, data, { signal: invocation.signal }));
       } catch {
@@ -909,6 +917,10 @@ function* runPdftohtmlCliSteps(argv, files, signal) {
     if (++cooperativeWork % 64 === 0)
       yield;
     const arg = argv[i];
+    if (arg === "--") {
+      positionals.push(...argv.slice(i + 1));
+      break;
+    }
     if (arg === "-v" || arg === "--version") {
       return { exitCode: 0, stdout: "pdftohtml version 24.08.0\n", stderr: "" };
     }
@@ -1233,7 +1245,6 @@ async function pdftohtml(context) {
     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) {
@@ -1245,6 +1256,10 @@ async function pdftohtml(context) {
     for (let i = 0; i < argv.length; i++) {
       if (++cooperativeWork % 64 === 0) await yieldTurn(context.signal);
       const arg = argv[i];
+      if (arg === "--") {
+        inputOperand = argv[i + 1];
+        break;
+      }
       if (["-f", "-l", "-zoom", "-fmt", "-enc", "-upw", "-opw"].includes(arg)) {
         i++;
       } else if (arg === "-" || !arg.startsWith("-")) {
@@ -1274,9 +1289,8 @@ async function pdftohtml(context) {
     }
     for (const token of inputOperand && inputOperand !== "-" ? [inputOperand] : []) {
       if (++cooperativeWork % 64 === 0) await yieldTurn(context.signal);
-      if (token.startsWith("-") && 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 {
@@ -1298,7 +1312,7 @@ async function pdftohtml(context) {
       if (++cooperativeWork % 64 === 0) await yieldTurn(context.signal);
       if (existingSnap.get(key) !== val) {
         chargeBytes(val.byteLength);
-        const abs = resolveVfsPath(key);
+        const abs = resolvePath(context.cwd, key);
         try {
           await writeFileOutput(context, val, (data) => context.fs.writeFile(abs, data, { signal: invocation.signal }));
         } catch (error) {

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

@@ -4,6 +4,7 @@ import {
 
 // packages/safe-bash-command-qpdf/src/index.ts
 init_buffer();
+import { resolvePath } from "../safe-bash-contracts/path.js";
 import { yieldTurn } from "../safe-bash-contracts/yield.js";
 import { writeFileOutput } from "../safe-bash-contracts/filesystem-output-budget.js";
 import {
@@ -2365,7 +2366,6 @@ async function qpdf(context, options = {}) {
     const argumentBytes = argv.reduce((total, arg) => total + new TextEncoder().encode(arg).byteLength + 1, 0);
     if (argumentBytes > limits.maxArgumentBytes) throw new RangeError("Argument byte limit exceeded");
     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) {
@@ -2380,7 +2380,7 @@ async function qpdf(context, options = {}) {
       const path = token.slice(1);
       let bytes;
       try {
-        bytes = await context.fs.readFile(resolveVfsPath(path), { signal: invocation.signal });
+        bytes = await context.fs.readFile(resolvePath(context.cwd, path), { signal: invocation.signal });
       } catch {
         await writeBytes(context.stderr, new TextEncoder().encode(`qpdf: cannot open ${path}
 `), invocation.signal);
@@ -2405,7 +2405,7 @@ async function qpdf(context, options = {}) {
     for (const candidate of new Set(inputs)) {
       await yieldTurn(invocation.signal);
       if (!candidate || candidate === "-" || candidate === ".") continue;
-      const abs = resolveVfsPath(candidate);
+      const abs = resolvePath(context.cwd, candidate);
       let bytes;
       try {
         bytes = await context.fs.readFile(abs, { signal: invocation.signal });
@@ -2433,7 +2433,7 @@ async function qpdf(context, options = {}) {
           if (!stream || typeof stream.datafile !== "string" || vfsFiles.has(stream.datafile)) continue;
           let bytes;
           try {
-            bytes = await context.fs.readFile(resolveVfsPath(stream.datafile), { signal: invocation.signal });
+            bytes = await context.fs.readFile(resolvePath(context.cwd, stream.datafile), { signal: invocation.signal });
           } catch {
             invocation.signal.throwIfAborted();
             continue;
@@ -2477,7 +2477,7 @@ async function qpdf(context, options = {}) {
           const stdout = invocation.child(context.stdout);
           await writeBytes(stdout.output, fileBytes, invocation.signal);
         } else {
-          const abs = resolveVfsPath(fileKey);
+          const abs = resolvePath(context.cwd, fileKey);
           try {
             await writeFileOutput(context, fileBytes, (data) => context.fs.writeFile(abs, data, { signal: invocation.signal }));
           } catch (error) {

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

@@ -1,6 +1,6 @@
 import {
   createRgCommand
-} from "../safe-bash/command-chunks/chunk-GLOZX57Y.js";
+} from "../safe-bash/command-chunks/chunk-OQKC5ZU2.js";
 import {
   init_buffer
 } from "../safe-bash/command-chunks/chunk-HX3SHTCE.js";

package/dist/safe-bash-command-rg/rg-command.d.ts

@@ -1,6 +1,5 @@
 import { type CommandDefinition } from "../safe-bash-contracts/index.js";
 import { type SearchOptions } from "../safe-bash-search-engine/options.js";
 import { RegexExecutor } from "../safe-bash-regex-engine/execution/portable.js";
-export declare function preverifyMemoryRgTree(fastMem: unknown): void;
 export declare function clearRgFastRunnerPool(): void;
 export declare function createRgCommand(executor: RegexExecutor, options?: SearchOptions): CommandDefinition;

package/dist/safe-bash-command-rg/rg-command.js

@@ -1,11 +1,9 @@
 import {
   clearRgFastRunnerPool,
-  createRgCommand,
-  preverifyMemoryRgTree
-} from "../safe-bash/command-chunks/chunk-GLOZX57Y.js";
+  createRgCommand
+} from "../safe-bash/command-chunks/chunk-OQKC5ZU2.js";
 import "../safe-bash/command-chunks/chunk-HX3SHTCE.js";
 export {
   clearRgFastRunnerPool,
-  createRgCommand,
-  preverifyMemoryRgTree
+  createRgCommand
 };

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

@@ -1,6 +1,6 @@
 import {
   sedCommand
-} from "../safe-bash/command-chunks/chunk-TEVJJPTC.js";
+} from "../safe-bash/command-chunks/chunk-7U7EXOXX.js";
 import "../safe-bash/command-chunks/chunk-CQ5YGOGB.js";
 import {
   init_buffer