gutterpress 0.11.2 → 0.11.4

package/dist/api/index.js

@@ -124,7 +124,7 @@ import {
   syncProject,
   testRemoteAccess,
   validateProjectExtensions
-} from "../index-pge2jxjm.js";
+} from "../index-xefff326.js";
 import {
   BuildError,
   DEFAULT_PRINT_OPTS,

package/dist/{audit-qvs2gf85.js → audit-hnqcf3w9.js}

@@ -1,14 +1,14 @@
 import {
   executeAndReport
-} from "./cli-59cxxeb5.js";
+} from "./cli-58np1xae.js";
 import {
   log
-} from "./cli-asree94f.js";
+} from "./cli-r2hsreyr.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{build-9k3qee1e.js → build-5apre79d.js}

@@ -1,17 +1,17 @@
 import {
   runBuild,
   splitOutPath
-} from "./cli-59cxxeb5.js";
+} from "./cli-58np1xae.js";
 import {
   log
-} from "./cli-asree94f.js";
+} from "./cli-r2hsreyr.js";
 import {
   UsageError,
   parseFormat,
   parsePdfxFlavor,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{cli-59cxxeb5.js → cli-58np1xae.js}

@@ -13,12 +13,12 @@ import {
   stampCreator,
   stripAnnotations,
   warn
-} from "./cli-asree94f.js";
+} from "./cli-r2hsreyr.js";
 import {
   DEBOUNCE,
   UsageError,
   resolvePort
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import {
   MARGIN_BOX_IGNORED_PROPERTIES,
   RENDER_TIMEOUT_MS,

package/dist/{cli-kr7f2kj5.js → cli-en9tew8h.js}

@@ -4,7 +4,7 @@ import {
 // package.json
 var package_default = {
   name: "gutterpress",
-  version: "0.11.2",
+  version: "0.11.4",
   description: "Markdown-to-PDF converter for professional print layout using a native Chromium print engine and Ghostscript.",
   author: "itlackey",
   license: "MPL-2.0",

package/dist/{cli-asree94f.js → cli-r2hsreyr.js}

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import {
   execCapture,
   findTool,

package/dist/cli.js

@@ -6,7 +6,7 @@ import {
   UsageError,
   package_default,
   rejectUnknownFlags
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import {
   EXIT_CODES
 } from "./cli-46ycxe6r.js";
@@ -18,16 +18,16 @@ import {
 import { defineCommand, parseArgs, runMain } from "citty";
 import { statSync } from "node:fs";
 var SUBCOMMANDS = {
-  new: () => import("./new-01p2pbv7.js").then((m) => m.default),
-  preview: () => import("./preview-48zhqser.js").then((m) => m.default),
-  build: () => import("./build-9k3qee1e.js").then((m) => m.default),
-  publish: () => import("./publish-pmwvj7qf.js").then((m) => m.default),
-  lint: () => import("./lint-00z3aqcy.js").then((m) => m.default),
-  validate: () => import("./validate-bthhscqf.js").then((m) => m.default),
-  audit: () => import("./audit-qvs2gf85.js").then((m) => m.default),
-  preflight: () => import("./preflight-w7wpraxp.js").then((m) => m.default),
-  doctor: () => import("./doctor-qt76awxj.js").then((m) => m.default),
-  ext: () => import("./ext-h5srcx5p.js").then((m) => m.default)
+  new: () => import("./new-et0fffvj.js").then((m) => m.default),
+  preview: () => import("./preview-8ptv04xf.js").then((m) => m.default),
+  build: () => import("./build-5apre79d.js").then((m) => m.default),
+  publish: () => import("./publish-sqp59a20.js").then((m) => m.default),
+  lint: () => import("./lint-zeyzqkz2.js").then((m) => m.default),
+  validate: () => import("./validate-tfk44ey7.js").then((m) => m.default),
+  audit: () => import("./audit-hnqcf3w9.js").then((m) => m.default),
+  preflight: () => import("./preflight-qya0kg4p.js").then((m) => m.default),
+  doctor: () => import("./doctor-tj6k990h.js").then((m) => m.default),
+  ext: () => import("./ext-jgwqgkrn.js").then((m) => m.default)
 };
 var VERSION = package_default.version;
 var main = defineCommand({
@@ -52,7 +52,7 @@ async function preflightRequiredInvocations(rawArgs) {
   const [command, ...commandArgs] = rawArgs;
   try {
     if (command === "new") {
-      const { newArgs } = await import("./new-01p2pbv7.js");
+      const { newArgs } = await import("./new-et0fffvj.js");
       rejectUnknownFlags(commandArgs, newArgs, "new");
       const parsed = parseArgs(commandArgs, {
         ...newArgs,
@@ -64,7 +64,7 @@ async function preflightRequiredInvocations(rawArgs) {
       return;
     }
     if (command === "preflight") {
-      const { preflightArgs } = await import("./preflight-w7wpraxp.js");
+      const { preflightArgs } = await import("./preflight-qya0kg4p.js");
       rejectUnknownFlags(commandArgs, preflightArgs, "preflight");
       const parsed = parseArgs(commandArgs, {
         ...preflightArgs,
@@ -84,7 +84,7 @@ async function preflightRequiredInvocations(rawArgs) {
       }
       if (subcommand.startsWith("-"))
         return;
-      const { EXT_SUBCOMMANDS, extAddArgs, extRemoveArgs, extEnableArgs, extDisableArgs } = await import("./ext-h5srcx5p.js");
+      const { EXT_SUBCOMMANDS, extAddArgs, extRemoveArgs, extEnableArgs, extDisableArgs } = await import("./ext-jgwqgkrn.js");
       if (!EXT_SUBCOMMANDS.includes(subcommand)) {
         throw new UsageError(`gutterpress ext: unknown command "${subcommand}"`);
       }

package/dist/{doctor-qt76awxj.js → doctor-tj6k990h.js}

@@ -1,12 +1,12 @@
 import {
   getSystemDiagnostics,
   log
-} from "./cli-asree94f.js";
+} from "./cli-r2hsreyr.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import"./cli-c41yr7he.js";
 import"./cli-46ycxe6r.js";
 import"./cli-37x76zdn.js";

package/dist/{ext-h5srcx5p.js → ext-jgwqgkrn.js}

@@ -10,15 +10,15 @@ import {
   removeExtension,
   searchNpmExtensions,
   setExtensionEnabled
-} from "./cli-59cxxeb5.js";
-import"./cli-asree94f.js";
+} from "./cli-58np1xae.js";
+import"./cli-r2hsreyr.js";
 import {
   UsageError,
   exitForUsage,
   rejectExtraPositionals,
   rejectUnknownFlags,
   resolveProjectDir
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{index-pge2jxjm.js → index-xefff326.js}

@@ -4874,7 +4874,7 @@ import git from "isomorphic-git";
 // package.json
 var package_default = {
   name: "gutterpress",
-  version: "0.11.2",
+  version: "0.11.4",
   description: "Markdown-to-PDF converter for professional print layout using a native Chromium print engine and Ghostscript.",
   author: "itlackey",
   license: "MPL-2.0",
@@ -14885,7 +14885,6 @@ async function convergeMerge(params) {
   });
   const ourTip = await git5.resolveRef({ fs: gitFs, dir, ref: branch });
   const combined = new Set;
-  const driverBinary = new Set;
   const keptBothFiles = [];
   let tipBeforeMerge = ourTip;
   const attempt = async () => {
@@ -14902,7 +14901,6 @@ async function convergeMerge(params) {
       mergeDriver: ({ contents, path: filepath }) => {
         const [base, ours, theirsContent] = contents;
         if (MARKER_UNSAFE_EXT.test(filepath) || stringLooksBinary(ours) || stringLooksBinary(theirsContent) || stringLooksBinary(base)) {
-          driverBinary.add(filepath);
           return { cleanMerge: false, mergedText: ours };
         }
         combined.add(filepath);
@@ -14950,7 +14948,7 @@ async function convergeMerge(params) {
   } catch (e) {
     if (isMergeConflictError(e)) {
       await equalize({
-        binary: (e.data.bothModified ?? []).filter((p) => driverBinary.has(p)),
+        binary: e.data.bothModified ?? [],
         deleteByUs: e.data.deleteByUs ?? [],
         deleteByTheirs: e.data.deleteByTheirs ?? []
       });
@@ -15145,8 +15143,14 @@ async function syncProject(options) {
             ...onAuthFor(transport.credential)
           });
         } catch (e) {
-          if (!isPushRejected(e))
+          if (!isPushRejected(e)) {
+            const err = e;
+            logger.warn("sync", "push failed", {
+              code: err?.code ?? err?.name,
+              error: String(err?.message ?? e).replace(/\s+/g, " ").trim().replace(/\/\/[^/\s]*@/g, "//")
+            });
             throw e;
+          }
           logger.info("sync", `push rejected (non-fast-forward) — retrying`);
           if (attempt < attempts - 1 && backoffMs > 0)
             await sleep(backoffMs);

package/dist/index.js

@@ -143,7 +143,7 @@ import {
   syncProject,
   testRemoteAccess,
   validateProjectExtensions
-} from "./index-pge2jxjm.js";
+} from "./index-xefff326.js";
 import {
   BUILD_DIAGNOSTIC_CODES
 } from "./index-12pvhbyz.js";

package/dist/{lint-00z3aqcy.js → lint-zeyzqkz2.js}

@@ -1,15 +1,15 @@
 import {
   MANIFEST_FILENAMES,
   runLint
-} from "./cli-59cxxeb5.js";
+} from "./cli-58np1xae.js";
 import {
   log
-} from "./cli-asree94f.js";
+} from "./cli-r2hsreyr.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{new-01p2pbv7.js → new-et0fffvj.js}

@@ -7,15 +7,15 @@ import {
   TARGET_IDS,
   scaffoldExtension,
   scaffoldProject
-} from "./cli-59cxxeb5.js";
+} from "./cli-58np1xae.js";
 import {
   resolveGhostscript
-} from "./cli-asree94f.js";
+} from "./cli-r2hsreyr.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import"./cli-sekhwex4.js";
 import {
   isToolAvailable

package/dist/{preflight-w7wpraxp.js → preflight-qya0kg4p.js}

@@ -2,15 +2,15 @@ import {
   executeValidation,
   publishTargetFor,
   reportMissingTools
-} from "./cli-59cxxeb5.js";
+} from "./cli-58np1xae.js";
 import {
   log
-} from "./cli-asree94f.js";
+} from "./cli-r2hsreyr.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{preview-48zhqser.js → preview-8ptv04xf.js}

@@ -6,10 +6,10 @@ import {
   runBuild,
   splitOutPath,
   startPreviewServer
-} from "./cli-59cxxeb5.js";
+} from "./cli-58np1xae.js";
 import {
   log
-} from "./cli-asree94f.js";
+} from "./cli-r2hsreyr.js";
 import {
   UsageError,
   parseFormat,
@@ -17,7 +17,7 @@ import {
   rejectExtraPositionals,
   rejectUnknownFlags,
   resolvePort
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{publish-pmwvj7qf.js → publish-sqp59a20.js}

@@ -11,16 +11,16 @@ import {
   publishProviderFor,
   resolvePublishFormat,
   runPublish
-} from "./cli-59cxxeb5.js";
+} from "./cli-58np1xae.js";
 import {
   FileTokenStore,
   log
-} from "./cli-asree94f.js";
+} from "./cli-r2hsreyr.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{validate-bthhscqf.js → validate-tfk44ey7.js}

@@ -1,14 +1,14 @@
 import {
   executeAndReport
-} from "./cli-59cxxeb5.js";
+} from "./cli-58np1xae.js";
 import {
   log
-} from "./cli-asree94f.js";
+} from "./cli-r2hsreyr.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-kr7f2kj5.js";
+} from "./cli-en9tew8h.js";
 import"./cli-sekhwex4.js";
 import"./cli-c41yr7he.js";
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutterpress",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "Markdown-to-PDF converter for professional print layout using a native Chromium print engine and Ghostscript.",
   "author": "itlackey",
   "license": "MPL-2.0",