gutterpress 0.11.23-alpha.7 → 0.11.23-beta.2

package/dist/{index-nfysshcc.js → index-0k43evt0.js}

@@ -10,20 +10,13 @@ import {
   UsageError,
   addExtension,
   applyDefaultPdfStrictChecks,
-  cssLength,
   ensureProjectGitignore,
   extensionConfigFor,
-  formatPageSize,
-  isNonNegativePoints,
-  isPositivePoints,
-  judgeRect,
   listProjectExtensions,
   loadManifest,
   loadManifestDoc,
   loadManifestWithPath,
   npmRegistryUrl,
-  pageBoxes,
-  printAreaMeta,
   publishTargetFor,
   readEntryCss,
   resolveConfig,
@@ -31,13 +24,12 @@ import {
   resolvePort,
   resolveTargets,
   restoreForCommand,
-  round3,
   scalarString,
   uniqueExtensionId,
   validatePageMargin,
   withFetchTimeout,
   writeManifestDoc
-} from "./index-hphcn7th.js";
+} from "./index-ytjkvwy5.js";
 import {
   EXTENSION_MANIFEST_FILENAME,
   GUTTERPRESS_CSS,
@@ -73,7 +65,7 @@ import {
   setLogLevel,
   slugify,
   warn
-} from "./index-fp7xwvpr.js";
+} from "./index-80vg3ed6.js";
 import {
   blackTextToGray
 } from "./index-ht1bcqdd.js";
@@ -84,10 +76,18 @@ import {
   getAssetPath,
   lastPageMode,
   resolvePage
-} from "./index-2vxzxyyj.js";
+} from "./index-swfdgn2n.js";
 import {
-  BuildError
-} from "./index-46ycxe6r.js";
+  BuildError,
+  cssLength,
+  formatPageSize,
+  isNonNegativePoints,
+  isPositivePoints,
+  judgeRect,
+  pageBoxes,
+  printAreaMeta,
+  round3
+} from "./index-tayzfr9c.js";
 import {
   countLinkAnnotations,
   getImageResolutions,
@@ -124,14 +124,16 @@ import {
   hasUncommittedChanges,
   isContained,
   listWorkdirChanges,
+  nextInHistory,
   readRevisionRefs,
   resolveGitAuthor,
   resolveLogger,
   revisionNameFrom,
   snapshotStagingMarkerPath,
   snapshotWorkingTreeUnlocked,
+  startHistoryWalk,
   withRepoLock
-} from "./index-cw03e9p4.js";
+} from "./index-7j3hkwya.js";
 import {
   EXTENSIONS_DIR,
   resolveVendoredPluginInstallRoot,
@@ -166,8 +168,8 @@ var MSG_OFFLINE = "Your changes are saved on this computer. Gutterpress couldn't
 var MSG_AUTH = "The online copy didn't accept the saved sign-in. Sign in again and try again.";
 var MSG_INSECURE_TRANSPORT = "This book's online copy is at an address that isn't secure, so the saved sign-in wasn't sent — sign-ins 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 back up.";
 var MSG_BUSY = "The online copy is changing very quickly right now. Your work is saved on this computer — try again in a moment.";
-var MSG_HISTORY_UNREADABLE = `This book's versions can't be read, so backing up can't continue. Your writing is safe — every file is still here on this computer. Use "Repair the online copy" (in Book setup → Online copy) to get versions and backing up working again.`;
-var MSG_UNRELATED = `This book and the online copy have no versions in common, so they can't be combined. Either the online copy's address points at a different book, or this book's own versions were lost and started over. Your writing is safe — every file is still here on this computer. Check the online copy's address; if it is correct, use "Repair the online copy" (in Book setup → Online copy).`;
+var MSG_HISTORY_UNREADABLE = `This book's versions can't be read, so backing up can't continue. Your writing is safe — every file is still here on this computer. Use "Repair the online copy" in Book setup to get versions and backing up working again.`;
+var MSG_UNRELATED = `This book and the online copy have no versions in common, so they can't be combined. Either the online copy's address points at a different book, or this book's own versions were lost and started over. Your writing is safe — every file is still here on this computer. Check the online copy's address; if it is correct, use "Repair the online copy" in Book setup.`;
 var MSG_NO_REMOTE = "This book doesn't have an online copy yet.";
 var MSG_SSH_REMOTE = "This book's online copy uses an SSH address (git@…), which Gutterpress can't back up to. Switch it to the web (HTTPS) address to back up from here.";
 var MSG_NO_BRANCH = "This book isn't on a named revision, so it can't be backed up right now.";
@@ -202,6 +204,7 @@ function canonicalChapterId(p) {
 }
 
 // src/lib/markdown/assemble.ts
+import postcss from "postcss";
 function pageGeometryCss(page) {
   if (!page || !isPositivePoints(page.width) || !isPositivePoints(page.height))
     return null;
@@ -222,6 +225,65 @@ function defaultPageMarginCss(page) {
 @page { margin: ${cssLength(DEFAULT_PAGE_MARGIN_PT)}; }
 }`;
 }
+function liftPageRules(css) {
+  if (!/@page\b/i.test(css))
+    return { layered: css, pages: "" };
+  let root;
+  try {
+    root = postcss.parse(css);
+  } catch {
+    return { layered: css, pages: "" };
+  }
+  const found = [];
+  root.walkAtRules(/^page$/i, (rule) => {
+    found.push(rule);
+  });
+  const pages = found.map((rule) => {
+    let lifted = rule.clone();
+    for (let p = rule.parent;p instanceof postcss.AtRule || p instanceof postcss.Rule; p = p.parent) {
+      if (p instanceof postcss.AtRule && p.name.toLowerCase() === "layer")
+        continue;
+      lifted = p.clone({ nodes: [] }).append(lifted);
+    }
+    rule.remove();
+    return lifted.toString();
+  });
+  return { layered: root.toString(), pages: pages.join(`
+`) };
+}
+var CORE_MARKERS = liftPageRules(`${MARKER_CSS.trim()}
+${TWO_VERSIONS_CSS.trim()}`);
+var CORE_VOCAB = liftPageRules(GUTTERPRESS_CSS.trim());
+function assembleCssChunks(opts) {
+  const core = (css) => css ? [{ origin: { kind: "core" }, css }] : [];
+  const headed = (title, chunks = []) => chunks.map((chunk, i) => i === 0 ? { ...chunk, css: `/* ${title} */
+${chunk.css.trim()}` } : chunk);
+  const pageGeometry = pageGeometryCss(opts.printArea);
+  const defaultMargin = defaultPageMarginCss(opts.printArea);
+  return [
+    ...core("@layer gp.marker, gp.vocab;"),
+    ...core(`/* gutterpress markers */
+@layer gp.marker {
+${CORE_MARKERS.layered.trim()}
+}`),
+    ...core(CORE_MARKERS.pages && `/* gutterpress markers: page rules */
+${CORE_MARKERS.pages}`),
+    ...core(`/* gutterpress */
+@layer gp.vocab {
+${CORE_VOCAB.layered.trim()}
+}`),
+    ...core(CORE_VOCAB.pages && `/* gutterpress: page rules */
+${CORE_VOCAB.pages}`),
+    ...core(defaultMargin && `/* page margins (default) */
+${defaultMargin}`),
+    ...headed("extension css", opts.extensions),
+    ...core(`/* column alignment */
+${TABLE_ALIGN_CSS.trim()}`),
+    ...headed("project css", opts.book),
+    ...core(pageGeometry && `/* page geometry (manifest) */
+${pageGeometry}`)
+  ];
+}
 async function assembleBookHtml(opts) {
   const title = opts.title ?? "Document";
   const projectCss = opts.projectCss ?? "";
@@ -260,30 +322,11 @@ async function assembleBookHtml(opts) {
       imageRefs.add(ref);
     opts.onImageRefs([...imageRefs]);
   }
-  const pageGeometry = pageGeometryCss(opts.printArea);
-  const defaultMargin = defaultPageMarginCss(opts.printArea);
-  const inlineCss = [
-    "@layer gp.marker, gp.vocab;",
-    `/* gutterpress markers */
-@layer gp.marker {
-${MARKER_CSS.trim()}
-${TWO_VERSIONS_CSS.trim()}
-}`,
-    `/* gutterpress */
-@layer gp.vocab {
-${GUTTERPRESS_CSS.trim()}
-}`,
-    defaultMargin ? `/* page margins (default) */
-${defaultMargin}` : null,
-    pluginCss ? `/* extension css */
-${pluginCss.trim()}` : null,
-    `/* column alignment */
-${TABLE_ALIGN_CSS.trim()}`,
-    projectCss ? `/* project css */
-${projectCss.trim()}` : null,
-    pageGeometry ? `/* page geometry (manifest) */
-${pageGeometry}` : null
-  ].filter(Boolean).join(`
+  const inlineCss = assembleCssChunks({
+    printArea: opts.printArea,
+    extensions: pluginCss ? [{ origin: { kind: "extension" }, css: pluginCss }] : [],
+    book: projectCss ? [{ origin: { kind: "book" }, css: projectCss }] : []
+  }).map((chunk) => chunk.css).join(`
 
 `);
   const preloadTags = (opts.preloadImages ?? []).map((href) => `
@@ -396,7 +439,7 @@ async function listProjectStyles(projectDir, opts = {}) {
 import { createHash } from "node:crypto";
 import { readFile } from "node:fs/promises";
 import path2 from "node:path";
-import postcss from "postcss";
+import postcss2 from "postcss";
 var FONT_EXTS = new Set([".woff2", ".woff", ".ttf", ".otf"]);
 var HASHED_ASSET_DIR = "assets";
 var MIME_BY_EXT = {
@@ -496,15 +539,15 @@ function wrapImportConditions(node, imported) {
   const layer = media.match(/\blayer\(([^)]*)\)|\blayer\b/i);
   if (layer) {
     media = media.replace(layer[0], "").trim();
-    inner = postcss.atRule({ name: "layer", params: (layer[1] ?? "").trim(), nodes: [inner] });
+    inner = postcss2.atRule({ name: "layer", params: (layer[1] ?? "").trim(), nodes: [inner] });
   }
   const supports = media.match(/\bsupports\(([\s\S]*)\)/i);
   if (supports) {
     media = media.replace(supports[0], "").trim();
-    inner = postcss.atRule({ name: "supports", params: (supports[1] ?? "").trim(), nodes: [inner] });
+    inner = postcss2.atRule({ name: "supports", params: (supports[1] ?? "").trim(), nodes: [inner] });
   }
   if (media) {
-    inner = postcss.atRule({ name: "media", params: media, nodes: [inner] });
+    inner = postcss2.atRule({ name: "media", params: media, nodes: [inner] });
   }
   return inner;
 }
@@ -526,7 +569,7 @@ async function inlineOne(cssPath, copies, warnings, seen) {
   const cssDir = path2.dirname(abs);
   let root;
   try {
-    root = postcss.parse(source.toString("utf-8"), { from: abs });
+    root = postcss2.parse(source.toString("utf-8"), { from: abs });
   } catch (err) {
     throw new BuildError(`Could not parse CSS: ${abs}
   ${err instanceof Error ? err.message : String(err)}`, 1);
@@ -566,7 +609,7 @@ async function inlineOne(cssPath, copies, warnings, seen) {
   for (const { node, target } of imports) {
     const importedAbs = path2.resolve(cssDir, stripUrlSuffix(decodeRef(target)));
     const inlined = await inlineOne(importedAbs, copies, warnings, seen);
-    node.replaceWith(wrapImportConditions(node, postcss.parse(inlined, { from: importedAbs })));
+    node.replaceWith(wrapImportConditions(node, postcss2.parse(inlined, { from: importedAbs })));
   }
   return root.toString();
 }
@@ -608,7 +651,7 @@ async function collectStyleDependencies(projectDir, stylePaths) {
     }
     let root;
     try {
-      root = postcss.parse(source, { from: abs });
+      root = postcss2.parse(source, { from: abs });
     } catch {
       return;
     }
@@ -705,6 +748,7 @@ async function resolveActiveMarkdownFiles(inputDir, configuredFiles) {
 async function renderChapters(inputDir, opts = {}) {
   const styles = await resolveActiveStyles(inputDir, opts.styles);
   const inlined = await inlineStyles(inputDir, styles);
+  const book = liftPageRules(inlined.css);
   const blocks = [];
   const layers = [];
   const styleWarnings = [];
@@ -719,10 +763,13 @@ async function renderChapters(inputDir, opts = {}) {
     if (!css)
       continue;
     layers.push(group.layer);
+    const { layered, pages } = liftPageRules(css);
     blocks.push(`/* ${group.name} */
 @layer ${group.layer} {
-${css.trim()}
-}`);
+${layered.trim()}
+}` + (pages ? `
+/* ${group.name}: page rules */
+${pages}` : ""));
   }
   styleWarnings.push(...inlined.warnings);
   if (styleWarnings.length > 0)
@@ -740,7 +787,8 @@ ${css.trim()}
   return assembleBookHtml({
     files,
     readText: (relPath) => readFile2(join(inputDir, canonicalChapterId(relPath)), "utf-8"),
-    projectCss: inlined.css,
+    projectCss: book.pages ? `${book.layered.trim()}
+${book.pages}` : inlined.css,
     preloadImages: cssAssetCopies.map((c) => c.to),
     title: opts.title,
     language: opts.language,
@@ -2737,7 +2785,7 @@ registerCheck(check19);
 import { readFile as readFile11 } from "node:fs/promises";
 
 // src/lib/printsafe.ts
-import postcss2 from "postcss";
+import postcss3 from "postcss";
 
 // src/lib/lint-rules.ts
 function ruleLevel(rules, id) {
@@ -3029,7 +3077,7 @@ function filterFindings(findings, css, rules) {
 function checkCssRaw(css, from) {
   let root;
   try {
-    root = postcss2.parse(css, from ? { from } : undefined);
+    root = postcss3.parse(css, from ? { from } : undefined);
   } catch (err) {
     const e = err;
     return [
@@ -3063,7 +3111,7 @@ function checkCssRaw(css, from) {
       warnings.push({
         rule: rulePageSizeInStylesheet,
         severity: "warning",
-        message: `"size" in a stylesheet's @page rule is ignored: the page size comes from the manifest (preset:, or page: width and height — Setup > Book in the app), which is written after every stylesheet. Remove this declaration; to print at another size, change the manifest.`,
+        message: `"size" in a stylesheet's @page rule is ignored: the page size comes from the manifest (preset:, or page: width and height — set them in Book setup), which is written after every stylesheet. Remove this declaration; to print at another size, change the manifest.`,
         ...nodeLoc(decl)
       });
       return;
@@ -3199,7 +3247,7 @@ registerCheck(check20);
 
 // src/checks/source/css-ownership.ts
 import { readFile as readFile12 } from "node:fs/promises";
-import postcss3 from "postcss";
+import postcss4 from "postcss";
 import { parse as parseYaml2 } from "yaml";
 var CONFIG_NAMES3 = [".gutterpress/css-contract.yaml", ".gutterpress/css-contract.yml"];
 async function loadContract(configPath) {
@@ -3356,7 +3404,7 @@ var check21 = {
       }
       let root;
       try {
-        root = postcss3.parse(css, { from: absFile });
+        root = postcss4.parse(css, { from: absFile });
       } catch {
         continue;
       }
@@ -3851,7 +3899,7 @@ registerCheck(check25);
 import { readFile as readFile15 } from "node:fs/promises";
 
 // src/lib/unknown-classes.ts
-import postcss4 from "postcss";
+import postcss5 from "postcss";
 var EMITTED = new Set([
   "chapter",
   "spread",
@@ -3899,7 +3947,7 @@ function addSelectorClasses(selector, into) {
 }
 function addCssClasses(css, into) {
   try {
-    postcss4.parse(css).walk((node) => {
+    postcss5.parse(css).walk((node) => {
       if (node.type === "rule")
         addSelectorClasses(node.selector, into);
       else if (node.type === "atrule") {
@@ -4097,7 +4145,7 @@ registerCheck(check27);
 import { readFile as readFile17 } from "node:fs/promises";
 
 // src/checks/source/character-table.ts
-var CHARACTER_PATTERN = new RegExp("[\\u0000-\\u0008\\u000B\\u000C\\u000E-\\u001F\\u007F-\\u00A0\\u00AD\\u00B4\\u02BC" + "\\u061C\\u2000-\\u2015\\u2018\\u201B-\\u201D\\u201F\\u2022\\u2026" + "\\u2028-\\u202F\\u2032\\u2033\\u205F\\u2060\\u2066-\\u2069\\u2190\\u2192" + "\\u2194\\u21D2\\u2212\\u25AA\\u25E6\\u2605\\u2713\\u2714\\u2717\\u3000" + "\\uE000-\\uF8FF\\uFEFF\\uFF02\\uFF07\\uFFFD]" + "|\\p{Emoji_Presentation}|\\p{Extended_Pictographic}(?=\\uFE0F)" + "|(?<=[\\p{L}\\p{N}])\\u2019|\\u2019(?![\\p{L}\\p{N}])", "gu");
+var CHARACTER_PATTERN = new RegExp("[\\u0000-\\u0008\\u000B\\u000C\\u000E-\\u001F\\u007F-\\u00A0\\u00AD\\u00B4\\u02BC" + "\\u061C\\u2000-\\u2015\\u2018\\u201B-\\u201D\\u201F\\u2022\\u2026" + "\\u2028-\\u202F\\u2032\\u2033\\u205F\\u2060\\u2066-\\u2069\\u2190\\u2192" + "\\u2194\\u21D2\\u25AA\\u25E6\\u2605\\u2713\\u2714\\u2717\\u3000" + "\\uE000-\\uF8FF\\uFEFF\\uFF02\\uFF07\\uFFFD]" + "|\\p{Emoji_Presentation}|\\p{Extended_Pictographic}(?=\\uFE0F)" + "|(?<=[\\p{L}\\p{N}])\\u2019|\\u2019(?![\\p{L}\\p{N}])", "gu");
 var NAMED = {
   8212: ["Em dash", "typographer", "---"],
   8211: ["En dash", "typographer", "--"],
@@ -4118,7 +4166,6 @@ var NAMED = {
   8209: ["Non-breaking hyphen", "lookalike", "-"],
   8210: ["Figure dash", "lookalike", "-"],
   8213: ["Horizontal bar", "lookalike", "---"],
-  8722: ["Minus sign", "lookalike", "-"],
   8226: ["Bullet", "symbol", "&bull;"],
   9702: ["White bullet", "symbol", "&#x25E6;"],
   9642: ["Small square", "symbol", "&squf;"],
@@ -5532,7 +5579,7 @@ class PdfOutput {
       const rawPdf = pdfxMode ? path7.join(stage, "raw.pdf") : path7.resolve(pdfFile);
       await fsp2.mkdir(path7.dirname(path7.resolve(pdfFile)), { recursive: true });
       log.info("Rendering HTML to PDF via the Gutterpress engine (native Chromium pagination)");
-      const { buildNativePdf } = await import("./engine-wm4fggac.js");
+      const { buildNativePdf } = await import("./engine-cs5g2ez0.js");
       const engineDiagnostics = await buildNativePdf(htmlFile, rawPdf, {
         title: config.title,
         author: config.authors.length > 0 ? config.authors.join(", ") : undefined,
@@ -7216,10 +7263,10 @@ function starterOverridesCss() {
   return `/**
  * Your book's own styles. Rules here win over your look's.
  *
- * In the app you rarely need this file: Setup > Look chooses a look and
- * changes its fonts and colors (those changes are saved here as :root
- * custom properties), Setup > Advanced lists every setting, and Setup > Book
- * sets the page size and margins (in the manifest).
+ * In the app you rarely need this file: Book setup chooses a look, changes
+ * its fonts and colors (those changes are saved here as :root custom
+ * properties), lists every setting, and sets the page size and margins (in
+ * the manifest).
  *
  * To change the look from the command line: gutterpress ext remove <old>
  * <book>, then gutterpress ext add <look> <book>.
@@ -7361,7 +7408,7 @@ async function scaffoldProject(options) {
   let versionHistoryError;
   if (requested === "local-git") {
     try {
-      const { providerFor } = await import("./source-provider-tgzet3j5.js");
+      const { providerFor } = await import("./source-provider-tjaf303m.js");
       const provider = providerFor({ type: "local-folder", path: projectDir });
       await provider.initVersionHistory({
         projectDir,
@@ -7452,7 +7499,7 @@ styles:
   let versionHistoryError;
   if (requested === "local-git") {
     try {
-      const { providerFor } = await import("./source-provider-tgzet3j5.js");
+      const { providerFor } = await import("./source-provider-tjaf303m.js");
       const provider = providerFor({ type: "local-folder", path: dir });
       await provider.initVersionHistory({
         projectDir: dir,
@@ -8621,7 +8668,7 @@ async function setActiveStyles(projectDir, paths) {
 import path19 from "node:path";
 import { mkdir as mkdir10, readFile as readFile30, writeFile as writeFile12 } from "node:fs/promises";
 import git3 from "isomorphic-git";
-import postcss5 from "postcss";
+import postcss6 from "postcss";
 
 // src/lib/remote-auth/transport.ts
 import git2 from "isomorphic-git";
@@ -9087,7 +9134,7 @@ function paragraphs(text) {
 }
 function cssRules(text) {
   try {
-    return postcss5.parse(text).nodes.map((node) => node.toString().trim()).filter((rule) => rule.length > 0);
+    return postcss6.parse(text).nodes.map((node) => node.toString().trim()).filter((rule) => rule.length > 0);
   } catch {
     return textLines(text);
   }
@@ -9108,13 +9155,10 @@ function changeHint(filepath, before, after) {
   }
   return count > 0 ? `${plural(count, unit)} changed` : "changed";
 }
-async function firstParent(dir, cache2, oid) {
-  const { commit } = await git3.readCommit({ fs: gitFs, dir, cache: cache2, oid });
-  return commit.parent[0] ?? null;
-}
-async function listVersionChanges(dir, oid, options = {}) {
-  const cache2 = options.cache ?? {};
-  const parent = await firstParent(dir, cache2, oid);
+async function listVersionChanges(projectDir, oid) {
+  const dir = await repoDirFor(projectDir);
+  const cache2 = {};
+  const parent = (await git3.readCommit({ fs: gitFs, dir, cache: cache2, oid })).commit.parent[0] ?? null;
   const found = [];
   await git3.walk({
     fs: gitFs,
@@ -9185,52 +9229,105 @@ async function trackingTip(dir) {
   }
   return resolveOrNull(dir, `refs/remotes/${remote.remote}/${branch}`);
 }
-async function isAncestor(dir, cache2, oid, ancestor) {
-  if (oid === ancestor)
-    return true;
-  try {
-    return await git3.isDescendent({ fs: gitFs, dir, cache: cache2, oid, ancestor });
-  } catch {
-    return false;
-  }
-}
 async function describeVersions(projectDir, entries) {
   const dir = await repoDirFor(projectDir);
-  const cache2 = {};
   const tip = await trackingTip(dir);
+  if (!tip)
+    return entries.map((entry) => ({ ...entry, backedUp: null }));
+  const cache2 = {};
+  const shallow = await readFile30(path19.join(dir, ".git", "shallow"), "utf8").catch(() => "");
+  const reached = new Set([tip]);
+  const queued = new Set;
+  const queue = [tip];
   const out = [];
   let olderAreBackedUp = false;
   for (const entry of entries) {
-    const { files, more } = await listVersionChanges(dir, entry.id, { cache: cache2 });
-    let backedUp = null;
-    if (tip) {
-      backedUp = olderAreBackedUp || await isAncestor(dir, cache2, tip, entry.id);
-      if (backedUp)
-        olderAreBackedUp = true;
+    try {
+      while (!olderAreBackedUp && !reached.has(entry.id) && queue.length > 0) {
+        const oid = queue.shift();
+        const { commit } = await git3.readCommit({ fs: gitFs, dir, cache: cache2, oid });
+        for (const parent of commit.parent)
+          reached.add(parent);
+        if (shallow.includes(oid))
+          continue;
+        for (const parent of commit.parent) {
+          if (queued.has(parent))
+            continue;
+          queued.add(parent);
+          queue.push(parent);
+        }
+      }
+    } catch {
+      queue.length = 0;
     }
-    out.push({ ...entry, changes: files, moreChanges: more, backedUp });
+    const backedUp = olderAreBackedUp || reached.has(entry.id);
+    if (backedUp)
+      olderAreBackedUp = true;
+    out.push({ ...entry, backedUp });
   }
   return out;
 }
+var CLOCK_SKEW_SECONDS = 10 * 60;
 async function commitsAhead(dir, fromOid, baseOid, cache2 = {}, limit = 100) {
   if (fromOid === baseOid)
     return [];
-  const bases = await git3.findMergeBase({ fs: gitFs, dir, cache: cache2, oids: [fromOid, baseOid] });
-  const stopAt = new Set(bases);
-  if (stopAt.size === 0)
-    return [];
-  const commits = await git3.log({ fs: gitFs, dir, cache: cache2, ref: fromOid, depth: limit });
-  const seen = new Set;
-  const out = [];
-  for (const c of commits) {
-    if (stopAt.has(c.oid))
+  const walk = await startHistoryWalk(dir, cache2, [baseOid, fromOid]);
+  const local = new Set([baseOid]);
+  const online = new Set([fromOid]);
+  const parentsOf = new Map;
+  const listed = [];
+  let shared = false;
+  const mark = (oid) => {
+    const stack = [oid];
+    for (let next = stack.pop();next !== undefined; next = stack.pop()) {
+      if (local.has(next))
+        continue;
+      local.add(next);
+      if (online.has(next))
+        shared = true;
+      stack.push(...parentsOf.get(next) ?? []);
+    }
+  };
+  const firstAhead = () => {
+    const out = [];
+    for (const c of listed) {
+      if (out.length === limit)
+        break;
+      if (!local.has(c.oid))
+        out.push(c);
+    }
+    return out;
+  };
+  const time = (c) => c.commit.committer.timestamp;
+  for (;; ) {
+    const searching = walk.tips.some((c2) => !local.has(c2.oid));
+    if (!searching || shared && listed.length >= limit) {
+      const shown = firstAhead();
+      if (!searching || shown.length === limit) {
+        const oldest = Math.min(...shown.map(time));
+        const newestMarked = walk.tips.findLast((c2) => local.has(c2.oid));
+        if (!newestMarked || time(newestMarked) < oldest - CLOCK_SKEW_SECONDS)
+          break;
+      }
+    }
+    const c = await nextInHistory(dir, walk, cache2, 1);
+    if (!c)
       break;
-    if (seen.has(c.oid))
+    const parents = walk.shallow.has(c.oid) ? [] : c.commit.parent;
+    parentsOf.set(c.oid, parents);
+    if (local.has(c.oid)) {
+      for (const p of parents)
+        mark(p);
       continue;
-    seen.add(c.oid);
-    out.push(toEntry(c));
+    }
+    listed.push(c);
+    for (const p of parents) {
+      online.add(p);
+      if (local.has(p))
+        shared = true;
+    }
   }
-  return out;
+  return shared ? firstAhead().map(toEntry) : [];
 }
 async function listOnlineVersions(options) {
   const http2 = options.httpClient ?? defaultGitHttp;
@@ -9258,12 +9355,8 @@ async function listOnlineVersions(options) {
     const local = await resolveOrNull(dir, branch);
     if (!tip || !local)
       return { entries: [] };
-    const entries = [];
-    for (const entry of await commitsAhead(dir, tip, local, cache2)) {
-      const { files, more } = await listVersionChanges(dir, entry.id, { cache: cache2 });
-      entries.push({ ...entry, changes: files, moreChanges: more, backedUp: true });
-    }
-    return { entries };
+    const entries = await commitsAhead(dir, tip, local, cache2);
+    return { entries: entries.map((entry) => ({ ...entry, backedUp: true })) };
   } catch (e) {
     const message = e?.message ?? "";
     if (message === MSG_NO_REMOTE || message === MSG_SSH_REMOTE)
@@ -9953,9 +10046,9 @@ function isMergeConflictError(e) {
 function isCheckoutConflict(e) {
   return e?.code === "CheckoutConflictError";
 }
-var CONVERGE_PREPARE_MESSAGE = "Getting your changes ready to combine with the online version";
-var CONVERGE_RESTORE_MESSAGE = "Kept both versions of the files that can't be combined";
-var CONVERGE_MERGE_MESSAGE = "Combined your changes with the online version";
+var CONVERGE_PREPARE_MESSAGE = "Getting your changes ready to combine with the online copy's changes";
+var CONVERGE_RESTORE_MESSAGE = "Kept both takes of the files that can't be combined";
+var CONVERGE_MERGE_MESSAGE = "Combined your changes with the online copy's";
 var MARKER_UNSAFE_EXT = /\.svg$/i;
 var OUR_LABEL = YOUR_VERSION_LABEL;
 var THEIR_LABEL = ONLINE_VERSION_LABEL;
@@ -10485,8 +10578,8 @@ var API_BASE3 = "https://api.github.com";
 var REQUEST_TIMEOUT_MS4 = 15000;
 var MAX_NAME_LENGTH = 100;
 var MSG = {
-  notConnected: "Connect your GitHub account first (Settings > Accounts), then set up the online copy.",
-  auth: "GitHub didn't accept the saved sign-in. Sign in to GitHub again in Settings > Accounts and try again.",
+  notConnected: "Connect your GitHub account first, then set up the online copy.",
+  auth: "GitHub didn't accept the saved sign-in. Sign in to GitHub again and try again.",
   offline: "Gutterpress couldn't reach GitHub. Check your internet connection and try again. Nothing was changed.",
   noHistory: "Turn on version history for this book first. The online copy holds the versions Gutterpress keeps on this computer.",
   alreadyHasRemote: "This book already has an online copy.",
@@ -11659,13 +11752,13 @@ async function createFolder(fetchImpl, accessToken, name) {
     throw await driveFailure(res, `Couldn't create the Google Drive folder "${name}"`);
   return await res.json();
 }
-async function findFolderByName(fetchImpl, accessToken, name) {
+async function findFoldersByName(fetchImpl, accessToken, name, limit = 1) {
   const q = `name='${escapeDriveQueryValue(name)}' and mimeType='${FOLDER_MIME}' and trashed=false`;
   const params = new URLSearchParams({
     q,
     fields: "files(id,name)",
     orderBy: "modifiedTime desc",
-    pageSize: "1"
+    pageSize: String(limit)
   });
   const res = await driveFetch(fetchImpl, `${DRIVE_API_BASE}/files?${params.toString()}`, {
     method: "GET",
@@ -11674,10 +11767,10 @@ async function findFolderByName(fetchImpl, accessToken, name) {
   if (!res.ok)
     throw await driveFailure(res, `Couldn't look up the Google Drive folder "${name}"`);
   const body = await res.json();
-  return body.files?.[0] ?? null;
+  return body.files ?? [];
 }
 async function ensureFolder(fetchImpl, accessToken, name) {
-  const found = await findFolderByName(fetchImpl, accessToken, name);
+  const [found] = await findFoldersByName(fetchImpl, accessToken, name);
   if (found)
     return found;
   return createFolder(fetchImpl, accessToken, name);
@@ -11810,8 +11903,80 @@ async function resumableUpload(fetchImpl, accessToken, opts) {
   }
 }
 
-// src/lib/publish/providers/gdrive.ts
+// src/lib/publish/providers/gdrive-folder.ts
 var DEFAULT_FOLDER_NAME = "Gutterpress";
+var NO_OWN_FOLDER = { myFolderId: "", myFolder: "", myFolderFor: "", myFolderAccount: "" };
+function readConfig(req) {
+  const text = (key) => {
+    const value = req.config[key];
+    return (typeof value === "string" ? value.trim() : "") || undefined;
+  };
+  return {
+    folder: text("folder"),
+    folderId: text("folderId"),
+    myFolderId: text("myFolderId"),
+    myFolder: text("myFolder"),
+    myFolderFor: text("myFolderFor"),
+    myFolderAccount: text("myFolderAccount"),
+    account: req.deps.credentialAccount?.trim() ?? ""
+  };
+}
+async function resolveFolder(req, accessToken) {
+  const fetchImpl = req.deps.fetch ?? globalThis.fetch;
+  const cfg = readConfig(req);
+  let found = [];
+  if (cfg.folderId) {
+    const folder = await getFolderById(fetchImpl, accessToken, cfg.folderId);
+    if (folder)
+      found = [folder];
+  } else if (cfg.folder) {
+    found = await findFoldersByName(fetchImpl, accessToken, cfg.folder, 2);
+  }
+  const first = found[0];
+  const book = { title: cfg.folder || cfg.folderId || "", reachable: !cfg.folderId || !!first };
+  if (cfg.myFolderId) {
+    const bookKey = cfg.folderId || cfg.folder;
+    if (bookKey && cfg.myFolderFor === bookKey && (cfg.myFolderAccount ?? "") === cfg.account) {
+      const mine = await getFolderById(fetchImpl, accessToken, cfg.myFolderId);
+      return mine ? { state: "mine", destination: toDestination(mine), book } : { state: "unreachable", book, mine: cfg.myFolder || cfg.myFolderId };
+    }
+    if (book.reachable) {
+      await req.deps.selections?.setSettings(req.project.projectDir, "gdrive", NO_OWN_FOLDER);
+    }
+  }
+  if (cfg.folderId) {
+    return first ? { state: "book", destination: toDestination(first) } : { state: "unreachable", book };
+  }
+  if (cfg.folder) {
+    return {
+      state: "by-name",
+      name: cfg.folder,
+      ...first ? { destination: toDestination(first) } : {},
+      several: found.length > 1
+    };
+  }
+  return { state: "unset" };
+}
+async function uploadFolder(where, fetchImpl, accessToken) {
+  switch (where.state) {
+    case "unreachable":
+      throw new Error(where.mine ? `Your own Drive folder "${where.mine}" for this book can't be reached any more: it was trashed or deleted, or belongs to another Google account. Choose a folder you can reach on the Google Drive step (it is saved for you only).` : `This book publishes to the Drive folder "${where.book.title}", which this Google account can't reach: it isn't shared with Gutterpress under this account, or it was trashed or deleted. The book keeps its folder for everyone else. To publish to a folder you can reach, choose one for yourself on the Google Drive step in the desktop app (saved for you only), or pass --folder-id <id> or --folder <name> to "gutterpress publish" for one run.`);
+    case "unset":
+      return toDestination(await ensureFolder(fetchImpl, accessToken, DEFAULT_FOLDER_NAME));
+    case "by-name":
+      return where.destination ?? toDestination(await createFolder(fetchImpl, accessToken, where.name));
+    default:
+      return where.destination;
+  }
+}
+function folderUrl(id) {
+  return `https://drive.google.com/drive/folders/${id}`;
+}
+function toDestination(folder) {
+  return { id: folder.id, title: folder.name, url: folderUrl(folder.id) };
+}
+
+// src/lib/publish/providers/gdrive.ts
 var NOT_CONNECTED_MESSAGE = "Google Drive isn't connected. Run `gutterpress publish --provider gdrive --connect` (or set GDRIVE_REFRESH_TOKEN) first.";
 var info5 = {
   id: "gdrive",
@@ -11830,13 +11995,6 @@ var info5 = {
   },
   destinations: { label: "Folder", canCreate: true }
 };
-function readConfig(req) {
-  const cfg = req.config;
-  return {
-    folder: cfg.folder?.trim() || undefined,
-    folderId: cfg.folderId?.trim() || undefined
-  };
-}
 function formatBytes(bytes) {
   if (bytes < 1024 * 1024)
     return `${(bytes / 1024).toFixed(0)} KB`;
@@ -11858,22 +12016,6 @@ async function getAccessToken(req) {
   const accessToken = await mintAccessToken(resolved, req.deps.fetch ?? globalThis.fetch);
   return { accessToken, source: resolved.source };
 }
-async function resolveFolder(fetchImpl, accessToken, cfg) {
-  if (cfg.folderId) {
-    const folder = await getFolderById(fetchImpl, accessToken, cfg.folderId);
-    if (!folder) {
-      throw new Error(`The Drive folder recorded in publish.gdrive.folderId ("${cfg.folderId}") can't be found — it may have been trashed or the id copied wrong. Pick the folder again.`);
-    }
-    return folder;
-  }
-  return ensureFolder(fetchImpl, accessToken, cfg.folder || DEFAULT_FOLDER_NAME);
-}
-function folderUrl(id) {
-  return `https://drive.google.com/drive/folders/${id}`;
-}
-function toDestination(folder) {
-  return { id: folder.id, title: folder.name, url: folderUrl(folder.id) };
-}
 var ZIP_CHUNK_BYTES = 64 * 1024;
 function yieldToEventLoop() {
   return new Promise((resolve6) => setImmediate(resolve6));
@@ -12000,9 +12142,12 @@ var gdriveProvider = {
     const folder = await createFolder(req.deps.fetch ?? globalThis.fetch, accessToken, name);
     return toDestination(folder);
   },
+  async destinationStatus(req) {
+    const { accessToken } = await getAccessToken(req);
+    return resolveFolder(req, accessToken);
+  },
   async upload(req) {
     const fetchImpl = req.deps.fetch ?? globalThis.fetch;
-    const cfg = readConfig(req);
     const { accessToken } = await getAccessToken(req);
     const isHtml = req.artifact.format === "html";
     const source = isHtml ? await zipHtmlExport(req.artifact.path, req.project.title, (msg) => req.deps.onProgress?.(msg)) : {
@@ -12020,10 +12165,11 @@ var gdriveProvider = {
         }
       }
       req.deps.onProgress?.("Resolving the Drive folder…");
-      const folder = await resolveFolder(fetchImpl, accessToken, cfg);
+      const where = await resolveFolder(req, accessToken);
+      const folder = await uploadFolder(where, fetchImpl, accessToken);
       const fileName = source.fileName;
       const existing = await findFileInFolder(fetchImpl, accessToken, folder.id, fileName);
-      req.deps.onProgress?.(existing ? `Updating "${fileName}" in "${folder.name}"…` : `Uploading "${fileName}" to "${folder.name}"…`);
+      req.deps.onProgress?.(existing ? `Updating "${fileName}" in "${folder.title}"…` : `Uploading "${fileName}" to "${folder.title}"…`);
       let lastReported = -1;
       const file = await resumableUpload(fetchImpl, accessToken, {
         ...existing ? { fileId: existing.id } : {},
@@ -12043,11 +12189,11 @@ var gdriveProvider = {
       return {
         kind: "published",
         url: file.webViewLink,
-        detail: `Uploaded "${fileName}" to the "${folder.name}" folder in your Google Drive${existing ? " (updated the existing file)" : ""}.`,
+        detail: `Uploaded "${fileName}" to the "${folder.title}" folder in your Google Drive${existing ? " (updated the existing file)" : ""}.` + (where.state === "by-name" && where.several ? ` Several of your folders are named "${where.name}"; this is the most recently changed one: ${folder.url}` : ""),
         followUp: [
           "To share it, open it in Drive and use the Share button — Gutterpress never changes who can see your files.",
           isHtml ? "Google Drive stores files, not live websites — download and unzip it to view the export, or publish it as a real site with the Azure Static Web Apps provider." : undefined,
-          cfg.folderId ? undefined : `Tip (CLI): record the folder id in the manifest (publish.gdrive.folderId: "${folder.id}") so renaming the folder in Drive can never break publishing.`
+          where.state === "unset" ? `Tip (CLI): record the folder id in the manifest (publish.gdrive.folderId: "${folder.id}") so renaming the folder in Drive can never break publishing.` : undefined
         ].filter((s) => !!s)
       };
     } finally {
@@ -12659,7 +12805,7 @@ async function resolvePublishProvider(id, book) {
   const ext = await bookExtensions(book);
   const npmEntry = ext.extensions.some((c) => !c.path && c.name === id);
   if (npmEntry) {
-    const { restoreForCommand: restoreForCommand2 } = await import("./extension-restore-vghc58vx.js");
+    const { restoreForCommand: restoreForCommand2 } = await import("./extension-restore-chj5nx3t.js");
     await restoreForCommand2(book.projectDir, { manifestPath: book.manifestPath, failFast: true });
   }
   const publishers = await discover(ext);
@@ -12697,7 +12843,7 @@ function infoFor(p) {
 }
 function pluginProvider(p) {
   let loading;
-  const load = () => loading ??= import("./plugins-3aj0wc5h.js").then((m) => m.loadPublishFunction(p));
+  const load = () => loading ??= import("./plugins-0hhw6s17.js").then((m) => m.loadPublishFunction(p));
   return {
     info: infoFor(p),
     async authenticate() {
@@ -12766,7 +12912,8 @@ async function requestFor(provider, options, deps) {
   const publishSettings = manifest.publish ?? {};
   const providerConfig = {
     ...publishSettings[provider.info.id] ?? {},
-    ...(await deps.selections?.settings(options.projectDir))?.[provider.info.id] ?? {}
+    ...(await deps.selections?.settings(options.projectDir))?.[provider.info.id] ?? {},
+    ...options.settings
   };
   const bookAccount = typeof providerConfig.credential === "string" ? providerConfig.credential.trim() : "";
   const effectiveAccount = bookAccount || deps.credentialAccount;
@@ -13145,19 +13292,26 @@ async function savePublishSettings(projectDir, providerId, values, selections) {
     if (inside !== null) {
       shared[key] = inside;
       mine[key] = "";
-    } else if (isDir || key === "credential") {
+    } else if (isDir || key === "credential" || providerId === "gdrive" && key.startsWith("myFolder")) {
       mine[key] = isDir && text ? path31.resolve(projectDir, text) : text;
       shared[key] = "";
     } else {
       shared[key] = value;
     }
   }
+  const inManifest = (await readPublishSettings(projectDir))[providerId] ?? {};
+  if ("myFolderId" in mine) {
+    const own = !!mine.myFolderId;
+    const account = mine.credential ?? (await selections.settings(projectDir))[providerId]?.credential;
+    mine.myFolder = own ? mine.myFolder ?? "" : "";
+    mine.myFolderFor = own ? String(inManifest.folderId || inManifest.folder || "") : "";
+    mine.myFolderAccount = own ? account ?? String(inManifest.credential ?? "") : "";
+  }
   if (Object.keys(mine).length > 0)
     await selections.setSettings(projectDir, providerId, mine);
-  const inManifest = (await readPublishSettings(projectDir))[providerId] ?? {};
   const changes = Object.fromEntries(Object.entries(shared).filter(([key, value]) => value !== "" || (key in inManifest)));
   if (Object.keys(changes).length > 0)
     await setPublishProviderConfig(projectDir, providerId, changes);
   return readPublishSettings(projectDir, selections);
 }
-export { SYNC_SNAPSHOT_MESSAGE, resolveActiveStyles, listProjectStyles, getChecks, getCheckById, resolveCheckSelectors, formatReport, ruleRemoteUrls, ruleRiskyProps, ruleSyntax, checkCss, inspectImage, runChecks, checkToolAvailability, reportMissingTools, executeValidation, executeAndReport, splitOutPath, runBuild, openPath, startPreviewServer, defaultConfigDir, FileTokenStore, extractUrlCredential, getSystemDiagnostics, readPageSetup, setPageSetup, slugifyProjectName, escapeYamlScalar, scaffoldProject, adoptFolder, EXTENSION_KINDS, RESERVED_PREFIX, resolveExtensionPrefix, scaffoldExtension, BUILT_IN_TEMPLATE_IDS, listBuiltInTemplates, saveProjectAsTemplate, listCustomTemplates, importTemplateFromFolder, SNIPPETS_DIR, extractVariables, substituteVariables, listSnippets, saveSnippet, deleteSnippet, listMergedSnippets, listMarkerComponents, listLocationVariants, importExtensionFromFile, importExtensionFromUrl, MAX_SEARCH_BYTES, SEARCH_KEYWORDS, searchNpmExtensions, setManifestFields, readManifestFields, setActiveStyles, VERSION_CHANGES_SHOWN, describeVersions, listOnlineVersions, compareVersionFile, exportVersionTree, 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, syncProject, refreshRemoteCopies, checkRemoteUpdates, isValidRepositoryName, setUpOnlineBackup, sanitizeCloneFolderName, cloneRepository, isSshRemoteUrl, testRemoteAccess, knownForgeTokenUrl, connectGenericHost, parseRemoteOrigin, forgeKindForHost, diagnoseProjectRemote, renameRevision, deleteRevision, REPAIR_SNAPSHOT_MESSAGE, repairOnlineBackup, scorchedEarth, listPublishProviders, publishProviderFor, listBookPublishProviders, resolvePublishProvider, resolvePublishFormat, resolvePublishRequest, runPublish, connectPublishProvider, disconnectPublishCredential, PublishSelectionsStore, readPublishSettings, setPublishProviderConfig, savePublishSettings };
+export { SYNC_SNAPSHOT_MESSAGE, assembleCssChunks, relDisplay, resolveActiveStyles, listProjectStyles, getChecks, getCheckById, resolveCheckSelectors, formatReport, ruleRemoteUrls, ruleRiskyProps, ruleSyntax, checkCss, inspectImage, runChecks, checkToolAvailability, reportMissingTools, executeValidation, executeAndReport, splitOutPath, runBuild, openPath, startPreviewServer, defaultConfigDir, FileTokenStore, extractUrlCredential, getSystemDiagnostics, readPageSetup, setPageSetup, slugifyProjectName, escapeYamlScalar, scaffoldProject, adoptFolder, EXTENSION_KINDS, RESERVED_PREFIX, resolveExtensionPrefix, scaffoldExtension, BUILT_IN_TEMPLATE_IDS, listBuiltInTemplates, saveProjectAsTemplate, listCustomTemplates, importTemplateFromFolder, SNIPPETS_DIR, extractVariables, substituteVariables, listSnippets, saveSnippet, deleteSnippet, listMergedSnippets, listMarkerComponents, listLocationVariants, importExtensionFromFile, importExtensionFromUrl, MAX_SEARCH_BYTES, SEARCH_KEYWORDS, searchNpmExtensions, setManifestFields, readManifestFields, setActiveStyles, VERSION_CHANGES_SHOWN, listVersionChanges, describeVersions, listOnlineVersions, compareVersionFile, exportVersionTree, 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, syncProject, refreshRemoteCopies, checkRemoteUpdates, isValidRepositoryName, setUpOnlineBackup, sanitizeCloneFolderName, cloneRepository, isSshRemoteUrl, testRemoteAccess, knownForgeTokenUrl, connectGenericHost, parseRemoteOrigin, forgeKindForHost, diagnoseProjectRemote, renameRevision, deleteRevision, REPAIR_SNAPSHOT_MESSAGE, repairOnlineBackup, scorchedEarth, listPublishProviders, publishProviderFor, listBookPublishProviders, resolvePublishProvider, resolvePublishFormat, resolvePublishRequest, runPublish, connectPublishProvider, disconnectPublishCredential, PublishSelectionsStore, readPublishSettings, setPublishProviderConfig, savePublishSettings };