gutterpress 0.11.8 → 0.11.9-alpha.2

package/dist/api/index.d.ts

@@ -71,6 +71,7 @@ export type { GenericTokenConnectInput, GenericAuthOptions, } from "../lib/remot
 export { diagnoseProjectRemote, parseRemoteOrigin, forgeKindForHost, } from "../lib/remote-auth/diagnose.ts";
 export type { ProjectRemoteDiagnosis, DiagnoseProjectRemoteOptions, RemoteProtocol, RemoteGuidanceId, ForgeKind, } from "../lib/remote-auth/diagnose.ts";
 export { syncProject, refreshRemoteCopies, SYNC_SNAPSHOT_MESSAGE, } from "../lib/remote-auth/sync.ts";
+export { repairOnlineBackup, REPAIR_SNAPSHOT_MESSAGE, type RepairOnlineBackupOptions, type RepairOnlineBackupResult, } from "../lib/remote-auth/repair.ts";
 export type { SyncOutcome, SyncProjectOptions, KeptBothFile, } from "../lib/remote-auth/sync.ts";
 export type { SnapshotEntry, InitVersionHistoryOptions, SnapshotOptions, RestoreSnapshotOptions, RestoreVersionOptions, RestoreVersionResult, SourceProvider, } from "../lib/source-provider.ts";
 export { runPublish, resolvePublishRequest, resolvePublishFormat, } from "../lib/publish/run-publish.ts";

package/dist/api/index.js

@@ -22,6 +22,7 @@ import {
   PRESET_IDS,
   PublishSelectionsStore,
   RECOMMENDED_EXTENSIONS,
+  REPAIR_SNAPSHOT_MESSAGE,
   RESERVED_PREFIX,
   SEARCH_KEYWORDS,
   SNIPPETS_DIR,
@@ -91,6 +92,7 @@ import {
   refreshRemoteCopies,
   removeExtension,
   reorderExtensions,
+  repairOnlineBackup,
   requireGoogleClientCredentials,
   resolveActiveStyles,
   resolveConfig,
@@ -122,7 +124,7 @@ import {
   syncProject,
   testRemoteAccess,
   validateProjectExtensions
-} from "../index-9nhdagfx.js";
+} from "../index-6dr6dn95.js";
 import {
   BuildError,
   DEFAULT_PRINT_OPTS,
@@ -191,6 +193,7 @@ export {
   requireGoogleClientCredentials,
   repoSubPath,
   repoRootForSource,
+  repairOnlineBackup,
   reorderExtensions,
   removeExtension,
   refreshRemoteCopies,
@@ -271,6 +274,7 @@ export {
   SEARCH_KEYWORDS,
   RESTORE_BACKUP_MESSAGE,
   RESERVED_PREFIX,
+  REPAIR_SNAPSHOT_MESSAGE,
   RECOMMENDED_EXTENSIONS,
   PublishSelectionsStore,
   PRESET_IDS,

package/dist/{audit-p2t6e05h.js → audit-r795rt10.js}

@@ -1,14 +1,14 @@
 import {
   executeAndReport
-} from "./cli-8xagm379.js";
+} from "./cli-64n9m3k8.js";
 import {
   log
-} from "./cli-1hmenj11.js";
+} from "./cli-vrnrsetc.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import"./cli-h91e69hm.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{build-10swrj1z.js → build-m0w386vr.js}

@@ -1,17 +1,17 @@
 import {
   runBuild,
   splitOutPath
-} from "./cli-8xagm379.js";
+} from "./cli-64n9m3k8.js";
 import {
   log
-} from "./cli-1hmenj11.js";
+} from "./cli-vrnrsetc.js";
 import {
   UsageError,
   parseFormat,
   parsePdfxFlavor,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import"./cli-h91e69hm.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{cli-481qh6f0.js → cli-5fa9m71c.js}

@@ -4,7 +4,7 @@ import {
 // package.json
 var package_default = {
   name: "gutterpress",
-  version: "0.11.8",
+  version: "0.11.9-alpha.2",
   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-8xagm379.js → cli-64n9m3k8.js}

@@ -13,12 +13,12 @@ import {
   stampCreator,
   stripAnnotations,
   warn
-} from "./cli-1hmenj11.js";
+} from "./cli-vrnrsetc.js";
 import {
   DEBOUNCE,
   UsageError,
   resolvePort
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import {
   MARGIN_BOX_IGNORED_PROPERTIES,
   RENDER_TIMEOUT_MS,
@@ -13541,6 +13541,8 @@ import git6 from "isomorphic-git";
 // src/lib/remote-auth/converge-merge.ts
 import git5 from "isomorphic-git";
 import diff3Merge from "diff3";
+// src/lib/remote-auth/repair.ts
+import git7 from "isomorphic-git";
 // src/lib/publish/selections.ts
 import { chmod as chmod2, mkdir as mkdir13, readFile as readFile30, writeFile as writeFile12 } from "node:fs/promises";
 import path23 from "node:path";

package/dist/{cli-1hmenj11.js → cli-vrnrsetc.js}

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import {
   execCapture,
   findTool,

package/dist/cli.js

@@ -6,7 +6,7 @@ import {
   UsageError,
   package_default,
   rejectUnknownFlags
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.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-w29tx3gk.js").then((m) => m.default),
-  preview: () => import("./preview-eqyhmd48.js").then((m) => m.default),
-  build: () => import("./build-10swrj1z.js").then((m) => m.default),
-  publish: () => import("./publish-9qmnx6d3.js").then((m) => m.default),
-  lint: () => import("./lint-bvdfs5sr.js").then((m) => m.default),
-  validate: () => import("./validate-vwqs5s00.js").then((m) => m.default),
-  audit: () => import("./audit-p2t6e05h.js").then((m) => m.default),
-  preflight: () => import("./preflight-2hgd39c8.js").then((m) => m.default),
-  doctor: () => import("./doctor-jvvb5ewf.js").then((m) => m.default),
-  ext: () => import("./ext-p9488y4j.js").then((m) => m.default)
+  new: () => import("./new-qvqnw4dv.js").then((m) => m.default),
+  preview: () => import("./preview-zjt2mcj9.js").then((m) => m.default),
+  build: () => import("./build-m0w386vr.js").then((m) => m.default),
+  publish: () => import("./publish-mp6zj0x2.js").then((m) => m.default),
+  lint: () => import("./lint-9szyedkb.js").then((m) => m.default),
+  validate: () => import("./validate-m5b73vz6.js").then((m) => m.default),
+  audit: () => import("./audit-r795rt10.js").then((m) => m.default),
+  preflight: () => import("./preflight-nppgkakz.js").then((m) => m.default),
+  doctor: () => import("./doctor-jkbr9jxr.js").then((m) => m.default),
+  ext: () => import("./ext-qxr9fc0z.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-w29tx3gk.js");
+      const { newArgs } = await import("./new-qvqnw4dv.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-2hgd39c8.js");
+      const { preflightArgs } = await import("./preflight-nppgkakz.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-p9488y4j.js");
+      const { EXT_SUBCOMMANDS, extAddArgs, extRemoveArgs, extEnableArgs, extDisableArgs } = await import("./ext-qxr9fc0z.js");
       if (!EXT_SUBCOMMANDS.includes(subcommand)) {
         throw new UsageError(`gutterpress ext: unknown command "${subcommand}"`);
       }

package/dist/{doctor-jvvb5ewf.js → doctor-jkbr9jxr.js}

@@ -1,12 +1,12 @@
 import {
   getSystemDiagnostics,
   log
-} from "./cli-1hmenj11.js";
+} from "./cli-vrnrsetc.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import"./cli-c41yr7he.js";
 import"./cli-46ycxe6r.js";
 import"./cli-37x76zdn.js";

package/dist/{ext-p9488y4j.js → ext-qxr9fc0z.js}

@@ -10,15 +10,15 @@ import {
   removeExtension,
   searchNpmExtensions,
   setExtensionEnabled
-} from "./cli-8xagm379.js";
-import"./cli-1hmenj11.js";
+} from "./cli-64n9m3k8.js";
+import"./cli-vrnrsetc.js";
 import {
   UsageError,
   exitForUsage,
   rejectExtraPositionals,
   rejectUnknownFlags,
   resolveProjectDir
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import"./cli-h91e69hm.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{index-9nhdagfx.js → index-6dr6dn95.js}

@@ -652,8 +652,8 @@ var MSG_OFFLINE = "Your changes are saved on this computer. gutterpress couldn't
 var MSG_AUTH = "The online repository didn't accept the saved connection. Reconnect and try again.";
 var MSG_INSECURE_TRANSPORT = "This book's online address isn't secure, so the saved connection wasn't sent — connections are never sent over an insecure address. Switch the address to a secure one (starting with https), or to a local loopback address for a server on this computer, to sync.";
 var MSG_BUSY = "The online copy is changing very quickly right now. Your work is saved on this computer — try Sync again in a moment.";
-var MSG_HISTORY_UNREADABLE = "This book's version history can't be read, so syncing can't continue. Your writing is safe — every file is still here on this computer. To get history and syncing working again, download a fresh copy of the book from online, then move any recent changes into it.";
-var MSG_UNRELATED = "This book and the online copy have no history in common, so they can't be combined. Either the online address points at a different book, or this book's own history was lost and started over. Your writing is safe — every file is still here on this computer. Check the online address; if it is correct, download a fresh copy from online and move any recent changes into it.";
+var MSG_HISTORY_UNREADABLE = "This book's version history can't be read, so syncing can't continue. Your writing is safe — every file is still here on this computer. Use Repair online backup (in Where your work is kept) to get history and syncing working again.";
+var MSG_UNRELATED = "This book and the online copy have no history in common, so they can't be combined. Either the online address points at a different book, or this book's own history was lost and started over. Your writing is safe — every file is still here on this computer. Check the online address; if it is correct, use Repair online backup (in Where your work is kept).";
 var MSG_NO_REMOTE = "This book isn't connected to an online repository yet.";
 var MSG_SSH_REMOTE = "This book's online address uses SSH (git@…), which gutterpress can't sync to. Switch it to the web (HTTPS) address to sync from here.";
 var MSG_NO_BRANCH = "This book's version history isn't on a named branch, so it can't be synced right now.";
@@ -4301,7 +4301,7 @@ import git from "isomorphic-git";
 // package.json
 var package_default = {
   name: "gutterpress",
-  version: "0.11.8",
+  version: "0.11.9-alpha.2",
   description: "Markdown-to-PDF converter for professional print layout using a native Chromium print engine and Ghostscript.",
   author: "itlackey",
   license: "MPL-2.0",
@@ -14453,13 +14453,14 @@ function isUnrelatedHistories(e) {
   return code === "UnrelatedHistoriesError" || /unrelated histories|no common commits|refusing to merge unrelated/i.test(msg);
 }
 function isDamagedObjectError(e) {
-  return e instanceof TypeError && /property 'caller' on string|^Attempted to assign to readonly property\.$/.test(e.message);
+  return e instanceof TypeError && /property 'caller' on string|^Attempted to assign to readonly property\.$/.test(e.message) || e?.code === "NotFoundError";
 }
 async function historyUnreadable(dir) {
   try {
     const oid = await git6.resolveRef({ fs: gitFs, dir, ref: "HEAD" });
     await git6.readCommit({ fs: gitFs, dir, oid });
     await git6.listFiles({ fs: gitFs, dir });
+    await git6.listFiles({ fs: gitFs, dir, ref: "HEAD" });
     return false;
   } catch {
     return true;
@@ -14665,7 +14666,7 @@ async function syncProject(options) {
         const setupMsg = setupErrorMessage(e);
         if (setupMsg)
           return { status: "error", message: setupMsg, ...base() };
-        if (isDamagedObjectError(e) || await historyUnreadable(dir)) {
+        if (stage !== "fetch" && isDamagedObjectError(e) || await historyUnreadable(dir)) {
           logger.error("sync", "the book's history could not be read");
           return { status: "error", message: MSG_HISTORY_UNREADABLE, ...base() };
         }
@@ -14711,9 +14712,90 @@ async function refreshRemoteCopies(options) {
     return { refreshed: false, reason: "offline" };
   }
 }
+// src/lib/remote-auth/repair.ts
+import git7 from "isomorphic-git";
+import { cp as cp6, mkdir as mkdir16, rename as rename5, rm as rm8 } from "node:fs/promises";
+import path24 from "node:path";
+var REPAIR_SNAPSHOT_MESSAGE = "Repaired online backup";
+async function moveDir(from, to) {
+  await mkdir16(path24.dirname(to), { recursive: true });
+  try {
+    await rename5(from, to);
+  } catch (e) {
+    if (e.code !== "EXDEV")
+      throw e;
+    await cp6(from, to, { recursive: true });
+    await rm8(from, { recursive: true, force: true });
+  }
+}
+async function repairOnlineBackup(options) {
+  const logger = resolveLogger(options.logFile, "repair");
+  const dir = await repoDirFor(options.projectDir);
+  const oldGit = path24.join(dir, ".git");
+  const movedGitTo = path24.join(options.backupDir, "git");
+  const freshDir = path24.join(options.backupDir, "fresh-clone");
+  const { restoredFiles, credential } = await withRepoLock(dir, async () => {
+    const transport = await resolveTransport(dir, options);
+    let branch;
+    try {
+      branch = await git7.currentBranch({ fs: gitFs, dir }) ?? undefined;
+    } catch {
+      branch = undefined;
+    }
+    logger.info("download", "starting", { remote: transport.remote, branch: branch ?? "default" });
+    const fresh = await cloneRepository({
+      url: transport.url,
+      dir: freshDir,
+      ...transport.credential ? { credential: transport.credential } : {},
+      ...branch ? { branch } : {},
+      tokenStore: options.tokenStore,
+      httpClient: options.httpClient
+    });
+    logger.info("swap", "moving old history aside", { to: movedGitTo });
+    await moveDir(oldGit, movedGitTo);
+    try {
+      await moveDir(path24.join(freshDir, ".git"), oldGit);
+    } catch (e) {
+      await rm8(oldGit, { recursive: true, force: true });
+      await moveDir(movedGitTo, oldGit);
+      throw e;
+    }
+    await rm8(freshDir, { recursive: true, force: true });
+    const ref = fresh.branch ?? "HEAD";
+    let missing = [];
+    try {
+      const tracked = await git7.listFiles({ fs: gitFs, dir, ref });
+      missing = tracked.filter((f) => !gitFs.existsSync(path24.join(dir, f)));
+      if (missing.length > 0) {
+        await git7.checkout({ fs: gitFs, dir, ref, filepaths: missing, force: true });
+        logger.info("restore", "restored files missing on this computer", { files: missing });
+      }
+    } catch (e) {
+      logger.warn("restore", "could not restore every online-only file", errorLogData(e));
+      missing = [];
+    }
+    return { restoredFiles: missing, credential: transport.credential };
+  }).catch((e) => {
+    logger.error("repair", "repair failed", errorLogData(e));
+    throw e;
+  });
+  const outcome = await syncProject({
+    projectDir: options.projectDir,
+    credential,
+    tokenStore: options.tokenStore,
+    authorName: options.authorName,
+    authorEmail: options.authorEmail,
+    logFile: options.logFile,
+    httpClient: options.httpClient,
+    message: REPAIR_SNAPSHOT_MESSAGE,
+    push: true
+  });
+  logger.info("result", "repair complete", { status: outcome.status, restored: restoredFiles.length });
+  return { outcome, movedGitTo, restoredFiles };
+}
 // src/lib/publish/run-publish.ts
 import { readdir as readdir10, stat as stat11 } from "node:fs/promises";
-import path27 from "node:path";
+import path28 from "node:path";
 
 // src/lib/publish/command-runner.ts
 var CAPTURE_LIMIT = 64 * 1024;
@@ -14862,25 +14944,25 @@ ${tail}` : ""}`);
 };
 
 // src/lib/publish/providers/guided.ts
-import { copyFile as copyFile2, mkdir as mkdir16, writeFile as writeFile14 } from "node:fs/promises";
-import path24 from "node:path";
+import { copyFile as copyFile2, mkdir as mkdir17, writeFile as writeFile14 } from "node:fs/promises";
+import path25 from "node:path";
 async function stageGuidedPackage(req, providerId, listingLines) {
-  const packageDir = path24.join(path24.dirname(req.artifact.path), "publish", providerId);
-  await mkdir16(packageDir, { recursive: true });
-  await copyFile2(req.artifact.path, path24.join(packageDir, path24.basename(req.artifact.path)));
+  const packageDir = path25.join(path25.dirname(req.artifact.path), "publish", providerId);
+  await mkdir17(packageDir, { recursive: true });
+  await copyFile2(req.artifact.path, path25.join(packageDir, path25.basename(req.artifact.path)));
   const { title, authors } = req.project;
   const sheet = [
     `# ${title || "Untitled"}`,
     "",
     `- **Authors:** ${authors.length ? authors.join(", ") : "(not set)"}`,
-    `- **File:** ${path24.basename(req.artifact.path)}`,
+    `- **File:** ${path25.basename(req.artifact.path)}`,
     ...listingLines,
     "",
     "Copy these details into the platform's listing form when uploading.",
     ""
   ].join(`
 `);
-  await writeFile14(path24.join(packageDir, "LISTING.md"), sheet, "utf8");
+  await writeFile14(path25.join(packageDir, "LISTING.md"), sheet, "utf8");
   return packageDir;
 }
 
@@ -14943,9 +15025,9 @@ var drivethrurpgProvider = {
 };
 
 // src/lib/publish/providers/gdrive.ts
-import { mkdtemp as mkdtemp4, readFile as readFile33, readdir as readdir9, rm as rm8, stat as stat9, writeFile as writeFile15 } from "node:fs/promises";
+import { mkdtemp as mkdtemp4, readFile as readFile33, readdir as readdir9, rm as rm9, stat as stat9, writeFile as writeFile15 } from "node:fs/promises";
 import { tmpdir as tmpdir4 } from "node:os";
-import path25 from "node:path";
+import path26 from "node:path";
 import { Zip, ZipDeflate } from "fflate";
 
 // src/lib/publish/google-drive.ts
@@ -15330,24 +15412,24 @@ function zipEntriesNonBlocking(entries, opts) {
 async function collectZipEntries(root, dir, out, onWarn) {
   const entries = await readdir9(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const full = path25.join(dir, entry.name);
+    const full = path26.join(dir, entry.name);
     if (entry.isDirectory()) {
       await collectZipEntries(root, full, out, onWarn);
     } else if (entry.isFile()) {
-      const rel = path25.relative(root, full).split(path25.sep).join("/");
+      const rel = path26.relative(root, full).split(path26.sep).join("/");
       out[rel] = await readFile33(full);
     } else if (entry.isSymbolicLink()) {
       const resolved = await stat9(full).catch(() => null);
       if (resolved?.isFile()) {
-        const rel = path25.relative(root, full).split(path25.sep).join("/");
+        const rel = path26.relative(root, full).split(path26.sep).join("/");
         out[rel] = await readFile33(full);
       } else if (resolved?.isDirectory()) {
         await collectZipEntries(root, full, out, onWarn);
       } else {
-        onWarn?.(`Skipped "${path25.relative(root, full)}" in the website export — it's a broken symlink.`);
+        onWarn?.(`Skipped "${path26.relative(root, full)}" in the website export — it's a broken symlink.`);
       }
     } else {
-      onWarn?.(`Skipped "${path25.relative(root, full)}" in the website export — not a file, folder, or symlink.`);
+      onWarn?.(`Skipped "${path26.relative(root, full)}" in the website export — not a file, folder, or symlink.`);
     }
   }
 }
@@ -15355,19 +15437,19 @@ async function zipHtmlExport(exportDir, title, onWarn, writeArchiveImpl = writeF
   const entries = {};
   await collectZipEntries(exportDir, exportDir, entries, onWarn);
   const fileName = `${bookSlug(title)}-website.zip`;
-  const tmpRoot = await mkdtemp4(path25.join(tmpdir4(), "gutterpress-gdrive-"));
+  const tmpRoot = await mkdtemp4(path26.join(tmpdir4(), "gutterpress-gdrive-"));
   try {
-    const filePath = path25.join(tmpRoot, fileName);
+    const filePath = path26.join(tmpRoot, fileName);
     const zipped = await zipEntriesNonBlocking(entries, { level: 6 });
     await writeArchiveImpl(filePath, zipped);
     return {
       filePath,
       fileName,
       mimeType: "application/zip",
-      cleanup: () => rm8(tmpRoot, { recursive: true, force: true })
+      cleanup: () => rm9(tmpRoot, { recursive: true, force: true })
     };
   } catch (e) {
-    await rm8(tmpRoot, { recursive: true, force: true }).catch(() => {});
+    await rm9(tmpRoot, { recursive: true, force: true }).catch(() => {});
     throw e;
   }
 }
@@ -15405,7 +15487,7 @@ var gdriveProvider = {
     const isHtml = req.artifact.format === "html";
     const source = isHtml ? await zipHtmlExport(req.artifact.path, req.project.title, (msg) => req.deps.onProgress?.(msg)) : {
       filePath: req.artifact.path,
-      fileName: path25.basename(req.artifact.path),
+      fileName: path26.basename(req.artifact.path),
       mimeType: "application/pdf",
       cleanup: async () => {}
     };
@@ -15455,8 +15537,8 @@ var gdriveProvider = {
 };
 
 // src/lib/publish/butler.ts
-import { chmod as chmod2, mkdir as mkdir17, stat as stat10, writeFile as writeFile16 } from "node:fs/promises";
-import path26 from "node:path";
+import { chmod as chmod2, mkdir as mkdir18, stat as stat10, writeFile as writeFile16 } from "node:fs/promises";
+import path27 from "node:path";
 import { unzipSync as unzipSync2 } from "fflate";
 var BUTLER_DOWNLOAD_TIMEOUT_MS = 300000;
 function butlerBrothChannel(platform2 = process.platform, arch2 = process.arch) {
@@ -15493,8 +15575,8 @@ async function ensureButler(deps) {
   }
   if (await commandExists("butler", runCommand, deps.env))
     return "butler";
-  const cacheDir = path26.join(deps.configDir ?? defaultConfigDir(), "tools", "butler");
-  const cached = path26.join(cacheDir, butlerBinaryName());
+  const cacheDir = path27.join(deps.configDir ?? defaultConfigDir(), "tools", "butler");
+  const cached = path27.join(cacheDir, butlerBinaryName());
   if (await fileExists2(cached))
     return cached;
   const channel = butlerBrothChannel();
@@ -15516,14 +15598,14 @@ async function ensureButler(deps) {
     return new Uint8Array(await response.arrayBuffer());
   });
   const files = unzipSync2(archive);
-  await mkdir17(cacheDir, { recursive: true });
+  await mkdir18(cacheDir, { recursive: true });
   let foundBinary = false;
   for (const [name, data] of Object.entries(files)) {
     if (name.endsWith("/"))
       continue;
-    const target = path26.join(cacheDir, path26.basename(name));
+    const target = path27.join(cacheDir, path27.basename(name));
     await writeFile16(target, data);
-    if (path26.basename(name) === butlerBinaryName()) {
+    if (path27.basename(name) === butlerBinaryName()) {
       await chmod2(target, 493).catch(() => {});
       foundBinary = true;
     }
@@ -15972,9 +16054,9 @@ async function resolvePublishRequest(options, deps) {
   const effectiveDeps = effectiveAccount ? { ...deps, credentialAccount: effectiveAccount } : deps;
   const outDir = resolveOutputDir(manifestDir, config.title);
   const effectiveFormat = resolvePublishFormat(provider.info, providerConfig);
-  const defaultArtifact = effectiveFormat === "pdf" ? path27.join(outDir, artifactName(config.title, "pdf")) : outDir;
+  const defaultArtifact = effectiveFormat === "pdf" ? path28.join(outDir, artifactName(config.title, "pdf")) : outDir;
   const artifact = {
-    path: options.artifactPath ? path27.resolve(options.projectDir, options.artifactPath) : defaultArtifact,
+    path: options.artifactPath ? path28.resolve(options.projectDir, options.artifactPath) : defaultArtifact,
     format: effectiveFormat
   };
   return {
@@ -16038,7 +16120,7 @@ async function artifactIssues(artifact) {
 var BUILD_FINGERPRINT_FILENAME = "build-fingerprint.json";
 async function htmlDirIssues(dir) {
   const issues = [];
-  const isThere = async (rel) => stat11(path27.join(dir, rel)).then(() => true, () => false);
+  const isThere = async (rel) => stat11(path28.join(dir, rel)).then(() => true, () => false);
   if (!await isThere(BOOK_HTML)) {
     issues.push({
       severity: "error",
@@ -16157,13 +16239,13 @@ async function disconnectPublishCredential(key, deps, options = {}) {
   }
 }
 // src/lib/publish/selections.ts
-import { chmod as chmod3, mkdir as mkdir18, readFile as readFile34, writeFile as writeFile17 } from "node:fs/promises";
-import path28 from "node:path";
+import { chmod as chmod3, mkdir as mkdir19, readFile as readFile34, writeFile as writeFile17 } from "node:fs/promises";
+import path29 from "node:path";
 class PublishSelectionsStore {
   filePath;
   queue = Promise.resolve();
   constructor(filePath) {
-    this.filePath = filePath ?? path28.join(defaultConfigDir(), "publish-selections.json");
+    this.filePath = filePath ?? path29.join(defaultConfigDir(), "publish-selections.json");
   }
   async read() {
     try {
@@ -16180,7 +16262,7 @@ class PublishSelectionsStore {
     return { version: 1, global: {}, projects: {} };
   }
   async write(data) {
-    await mkdir18(path28.dirname(this.filePath), { recursive: true });
+    await mkdir19(path29.dirname(this.filePath), { recursive: true });
     await writeFile17(this.filePath, JSON.stringify(data, null, 2), {
       encoding: "utf8",
       mode: 384
@@ -16283,4 +16365,4 @@ async function setPublishProviderConfig(projectDir, providerId, values) {
   await writeManifestDoc(file, doc);
   return settingsFromDoc(doc);
 }
-export { BUNDLED_EXTENSIONS, isBundledExtension, isPathSpecifier, parseExtensionSpecifier, PRESET_IDS, PRESETS, TARGETS, TARGET_IDS, publishTargetFor, MANIFEST_FILENAMES, hasProjectManifest, loadManifest, loadManifestWithPath, resolveConfig, SYNC_SNAPSHOT_MESSAGE, log, resolveActiveStyles, listProjectStyles, EXTENSION_MANIFEST_FILENAME, readExtensionMeta, extensionStyleList, extensionEntry, extensionCarries, pathEscapesFolder, assertExtensionContained, resolveExtension, loadPluginsWithCss, getChecks, getCheckById, resolveCheckSelectors, formatReport, ruleRemoteUrls, ruleRiskyProps, ruleSyntax, rulePageContainment, checkCss, inspectImage, runChecks, checkToolAvailability, reportMissingTools, executeValidation, executeAndReport, splitOutPath, runBuild, openPath, startPreviewServer, defaultConfigDir, FileTokenStore, extractUrlCredential, getSystemDiagnostics, slugifyProjectName, escapeYamlScalar, scaffoldProject, adoptFolder, ensureGitignoreHasDist, EXTENSION_KINDS, RESERVED_PREFIX, resolveExtensionPrefix, scaffoldExtension, BUILT_IN_TEMPLATE_IDS, listBuiltInTemplates, saveProjectAsTemplate, listCustomTemplates, importTemplateFromFolder, EXTENSIONS_DIR, RECOMMENDED_EXTENSIONS, BUILT_IN_STYLE_SET_IDS, sameExtension, listProjectExtensions, describeExtension, setExtensionEnabled, reorderExtensions, removeExtension, addExtension, listBuiltInStyleSets, addBuiltInStyleSet, validateProjectExtensions, readExtensionCss, SNIPPETS_DIR, extractVariables, substituteVariables, listSnippets, readSnippet, saveSnippet, deleteSnippet, listMergedSnippets, readExtensionSnippet, importExtensionFromFile, importExtensionFromUrl, MAX_SEARCH_BYTES, SEARCH_KEYWORDS, searchNpmExtensions, setManifestFields, readManifestFields, setActiveStyles, AUTO_SNAPSHOT_DEFAULT_MINUTES, AUTO_SYNC_MIN_MINUTES, AUTO_SYNC_MAX_MINUTES, AUTO_SYNC_DEFAULT_MINUTES, AUTO_SYNC_PUSH_INTERVAL_MINUTES, autoSnapshotDelayMs, autoSyncDelayMs, isGitInternalPath, resolveGitHubClientId, GITHUB_HOST, GitHubAuthProvider, GDRIVE_HOST, resolveGoogleClientId, resolveGoogleClientSecret, GOOGLE_NOT_CONFIGURED_MESSAGE, requireGoogleClientCredentials, pkceChallengeFromVerifier, GoogleAuthProvider, revokeGoogleCredential, publishCredentialKey, publishConnectionStatus, listPublishAccounts, connectGoogleDrive, listGitHubRepositories, listRepoBooks, listGitHubBranches, sanitizeCloneFolderName, cloneRepository, isSshRemoteUrl, testRemoteAccess, knownForgeTokenUrl, connectGenericHost, parseRemoteOrigin, forgeKindForHost, diagnoseProjectRemote, syncProject, refreshRemoteCopies, listPublishProviders, publishProviderFor, resolvePublishFormat, resolvePublishRequest, runPublish, connectPublishProvider, disconnectPublishCredential, PublishSelectionsStore, readPublishSettings, setPublishProviderConfig };
+export { BUNDLED_EXTENSIONS, isBundledExtension, isPathSpecifier, parseExtensionSpecifier, PRESET_IDS, PRESETS, TARGETS, TARGET_IDS, publishTargetFor, MANIFEST_FILENAMES, hasProjectManifest, loadManifest, loadManifestWithPath, resolveConfig, SYNC_SNAPSHOT_MESSAGE, log, resolveActiveStyles, listProjectStyles, EXTENSION_MANIFEST_FILENAME, readExtensionMeta, extensionStyleList, extensionEntry, extensionCarries, pathEscapesFolder, assertExtensionContained, resolveExtension, loadPluginsWithCss, getChecks, getCheckById, resolveCheckSelectors, formatReport, ruleRemoteUrls, ruleRiskyProps, ruleSyntax, rulePageContainment, checkCss, inspectImage, runChecks, checkToolAvailability, reportMissingTools, executeValidation, executeAndReport, splitOutPath, runBuild, openPath, startPreviewServer, defaultConfigDir, FileTokenStore, extractUrlCredential, getSystemDiagnostics, slugifyProjectName, escapeYamlScalar, scaffoldProject, adoptFolder, ensureGitignoreHasDist, EXTENSION_KINDS, RESERVED_PREFIX, resolveExtensionPrefix, scaffoldExtension, BUILT_IN_TEMPLATE_IDS, listBuiltInTemplates, saveProjectAsTemplate, listCustomTemplates, importTemplateFromFolder, EXTENSIONS_DIR, RECOMMENDED_EXTENSIONS, BUILT_IN_STYLE_SET_IDS, sameExtension, listProjectExtensions, describeExtension, setExtensionEnabled, reorderExtensions, removeExtension, addExtension, listBuiltInStyleSets, addBuiltInStyleSet, validateProjectExtensions, readExtensionCss, SNIPPETS_DIR, extractVariables, substituteVariables, listSnippets, readSnippet, saveSnippet, deleteSnippet, listMergedSnippets, readExtensionSnippet, importExtensionFromFile, importExtensionFromUrl, MAX_SEARCH_BYTES, SEARCH_KEYWORDS, searchNpmExtensions, setManifestFields, readManifestFields, setActiveStyles, AUTO_SNAPSHOT_DEFAULT_MINUTES, AUTO_SYNC_MIN_MINUTES, AUTO_SYNC_MAX_MINUTES, AUTO_SYNC_DEFAULT_MINUTES, AUTO_SYNC_PUSH_INTERVAL_MINUTES, autoSnapshotDelayMs, autoSyncDelayMs, isGitInternalPath, resolveGitHubClientId, GITHUB_HOST, GitHubAuthProvider, GDRIVE_HOST, resolveGoogleClientId, resolveGoogleClientSecret, GOOGLE_NOT_CONFIGURED_MESSAGE, requireGoogleClientCredentials, pkceChallengeFromVerifier, GoogleAuthProvider, revokeGoogleCredential, publishCredentialKey, publishConnectionStatus, listPublishAccounts, connectGoogleDrive, listGitHubRepositories, listRepoBooks, listGitHubBranches, sanitizeCloneFolderName, cloneRepository, isSshRemoteUrl, testRemoteAccess, knownForgeTokenUrl, connectGenericHost, parseRemoteOrigin, forgeKindForHost, diagnoseProjectRemote, syncProject, refreshRemoteCopies, REPAIR_SNAPSHOT_MESSAGE, repairOnlineBackup, listPublishProviders, publishProviderFor, resolvePublishFormat, resolvePublishRequest, runPublish, connectPublishProvider, disconnectPublishCredential, PublishSelectionsStore, readPublishSettings, setPublishProviderConfig };

package/dist/index.js

@@ -22,6 +22,7 @@ import {
   PRESET_IDS,
   PublishSelectionsStore,
   RECOMMENDED_EXTENSIONS,
+  REPAIR_SNAPSHOT_MESSAGE,
   RESERVED_PREFIX,
   SEARCH_KEYWORDS,
   SNIPPETS_DIR,
@@ -103,6 +104,7 @@ import {
   refreshRemoteCopies,
   removeExtension,
   reorderExtensions,
+  repairOnlineBackup,
   reportMissingTools,
   requireGoogleClientCredentials,
   resolveActiveStyles,
@@ -141,7 +143,7 @@ import {
   syncProject,
   testRemoteAccess,
   validateProjectExtensions
-} from "./index-9nhdagfx.js";
+} from "./index-6dr6dn95.js";
 import {
   BUILD_DIAGNOSTIC_CODES
 } from "./index-71pn94g1.js";
@@ -296,6 +298,7 @@ export {
   reportMissingTools,
   repoSubPath,
   repoRootForSource,
+  repairOnlineBackup,
   reorderExtensions,
   removeExtension,
   refreshRemoteCopies,
@@ -387,6 +390,7 @@ export {
   SEARCH_KEYWORDS,
   RESTORE_BACKUP_MESSAGE,
   RESERVED_PREFIX,
+  REPAIR_SNAPSHOT_MESSAGE,
   RECOMMENDED_EXTENSIONS,
   PublishSelectionsStore,
   PRESET_IDS,

package/dist/lib/remote-auth/repair.d.ts

@@ -0,0 +1,20 @@
+import type { SyncOutcome, SyncProjectOptions } from "./sync-types.ts";
+/** Message recorded on the version a repair saves. */
+export declare const REPAIR_SNAPSHOT_MESSAGE = "Repaired online backup";
+export interface RepairOnlineBackupOptions extends Pick<SyncProjectOptions, "projectDir" | "credential" | "tokenStore" | "authorName" | "authorEmail" | "logFile" | "httpClient"> {
+    /**
+     * Where the old `.git` and the fresh download go — chosen by the host,
+     * OUTSIDE the book (a folder inside it would be committed). Created if
+     * missing; the old history is kept at `<backupDir>/git` indefinitely.
+     */
+    backupDir: string;
+}
+export interface RepairOnlineBackupResult {
+    /** The closing sync: "synced" / "up-to-date" when the repair worked. */
+    outcome: SyncOutcome;
+    /** Where the old `.git` was moved to. */
+    movedGitTo: string;
+    /** Files that existed online but not on this computer, restored from the download. */
+    restoredFiles: string[];
+}
+export declare function repairOnlineBackup(options: RepairOnlineBackupOptions): Promise<RepairOnlineBackupResult>;

package/dist/lib/remote-auth/sync-messages.d.ts

@@ -16,10 +16,10 @@ export declare const MSG_BUSY = "The online copy is changing very quickly right
  * The book's own version history is unreadable — a damaged or missing
  * `.git`. Says the three things that are actually true and useful: the writing
  * is safe, the HISTORY is what broke, and (sync always has a remote, so this
- * always applies here) a fresh copy from online is the way back.
+ * always applies here) Repair online backup is the way back.
  */
-export declare const MSG_HISTORY_UNREADABLE = "This book's version history can't be read, so syncing can't continue. Your writing is safe \u2014 every file is still here on this computer. To get history and syncing working again, download a fresh copy of the book from online, then move any recent changes into it.";
-export declare const MSG_UNRELATED = "This book and the online copy have no history in common, so they can't be combined. Either the online address points at a different book, or this book's own history was lost and started over. Your writing is safe \u2014 every file is still here on this computer. Check the online address; if it is correct, download a fresh copy from online and move any recent changes into it.";
+export declare const MSG_HISTORY_UNREADABLE = "This book's version history can't be read, so syncing can't continue. Your writing is safe \u2014 every file is still here on this computer. Use Repair online backup (in Where your work is kept) to get history and syncing working again.";
+export declare const MSG_UNRELATED = "This book and the online copy have no history in common, so they can't be combined. Either the online address points at a different book, or this book's own history was lost and started over. Your writing is safe \u2014 every file is still here on this computer. Check the online address; if it is correct, use Repair online backup (in Where your work is kept).";
 export declare const MSG_NO_REMOTE = "This book isn't connected to an online repository yet.";
 export declare const MSG_SSH_REMOTE = "This book's online address uses SSH (git@\u2026), which gutterpress can't sync to. Switch it to the web (HTTPS) address to sync from here.";
 export declare const MSG_NO_BRANCH = "This book's version history isn't on a named branch, so it can't be synced right now.";

package/dist/lib/remote-auth/test-support/sync-harness.d.ts

@@ -0,0 +1,22 @@
+import type { HostCredential } from "../token-store.ts";
+import { type GitServer } from "./git-http-server.ts";
+export declare const SERVER_AUTHOR: {
+    name: string;
+    email: string;
+};
+export interface Harness {
+    serverDir: string;
+    server: GitServer;
+    projectDir: string;
+    /** The credential the clone used, when the server required one. */
+    credential?: HostCredential;
+    cleanup(): Promise<void>;
+}
+export declare function setupClone(opts?: {
+    requireAuth?: {
+        username: string;
+        password: string;
+    };
+}): Promise<Harness>;
+/** Commit `files` on the server (null deletes); returns the new tip. */
+export declare function serverCommit(serverDir: string, files: Record<string, string | null>, message: string): Promise<string>;

package/dist/{lint-bvdfs5sr.js → lint-9szyedkb.js}

@@ -1,15 +1,15 @@
 import {
   MANIFEST_FILENAMES,
   runLint
-} from "./cli-8xagm379.js";
+} from "./cli-64n9m3k8.js";
 import {
   log
-} from "./cli-1hmenj11.js";
+} from "./cli-vrnrsetc.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import"./cli-h91e69hm.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{new-w29tx3gk.js → new-qvqnw4dv.js}

@@ -7,15 +7,15 @@ import {
   TARGET_IDS,
   scaffoldExtension,
   scaffoldProject
-} from "./cli-8xagm379.js";
+} from "./cli-64n9m3k8.js";
 import {
   resolveGhostscript
-} from "./cli-1hmenj11.js";
+} from "./cli-vrnrsetc.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import"./cli-h91e69hm.js";
 import {
   isToolAvailable

package/dist/{preflight-2hgd39c8.js → preflight-nppgkakz.js}

@@ -2,15 +2,15 @@ import {
   executeValidation,
   publishTargetFor,
   reportMissingTools
-} from "./cli-8xagm379.js";
+} from "./cli-64n9m3k8.js";
 import {
   log
-} from "./cli-1hmenj11.js";
+} from "./cli-vrnrsetc.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import"./cli-h91e69hm.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{preview-eqyhmd48.js → preview-zjt2mcj9.js}

@@ -6,10 +6,10 @@ import {
   runBuild,
   splitOutPath,
   startPreviewServer
-} from "./cli-8xagm379.js";
+} from "./cli-64n9m3k8.js";
 import {
   log
-} from "./cli-1hmenj11.js";
+} from "./cli-vrnrsetc.js";
 import {
   UsageError,
   parseFormat,
@@ -17,7 +17,7 @@ import {
   rejectExtraPositionals,
   rejectUnknownFlags,
   resolvePort
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import"./cli-h91e69hm.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{publish-9qmnx6d3.js → publish-mp6zj0x2.js}

@@ -11,16 +11,16 @@ import {
   publishProviderFor,
   resolvePublishFormat,
   runPublish
-} from "./cli-8xagm379.js";
+} from "./cli-64n9m3k8.js";
 import {
   FileTokenStore,
   log
-} from "./cli-1hmenj11.js";
+} from "./cli-vrnrsetc.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import"./cli-h91e69hm.js";
 import"./cli-c41yr7he.js";
 import {

package/dist/{validate-vwqs5s00.js → validate-m5b73vz6.js}

@@ -1,14 +1,14 @@
 import {
   executeAndReport
-} from "./cli-8xagm379.js";
+} from "./cli-64n9m3k8.js";
 import {
   log
-} from "./cli-1hmenj11.js";
+} from "./cli-vrnrsetc.js";
 import {
   UsageError,
   rejectExtraPositionals,
   rejectUnknownFlags
-} from "./cli-481qh6f0.js";
+} from "./cli-5fa9m71c.js";
 import"./cli-h91e69hm.js";
 import"./cli-c41yr7he.js";
 import {

package/package.json

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