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

package/dist/{cli-3cvq3n1c.js → cli-pnrararp.js}

@@ -8,7 +8,7 @@ import {
   stampCreator,
   stripAnnotations,
   transparentPages
-} from "./cli-mmgtqnmr.js";
+} from "./cli-0ep11b0q.js";
 import {
   blackTextToGray
 } from "./cli-ht1bcqdd.js";
@@ -17,7 +17,7 @@ import {
   MARGIN_BOX_IGNORED_PROPERTIES,
   getAssetPath,
   lastPageMode
-} from "./cli-58fsk6d7.js";
+} from "./cli-pd2cje5b.js";
 import {
   countLinkAnnotations,
   getImageResolutions,
@@ -42,7 +42,7 @@ import {
 import {
   hasUncommittedChanges,
   listWorkdirChanges
-} from "./cli-31anr0r9.js";
+} from "./cli-v0evdpdf.js";
 import {
   detectProjectSource,
   repoSubPath
@@ -56,17 +56,11 @@ import {
   TARGET_IDS,
   addExtension,
   applyDefaultPdfStrictChecks,
-  cssLength,
   ensureProjectGitignore,
-  formatPageSize,
-  isPositivePoints,
-  judgeRect,
   loadManifest,
   loadManifestDoc,
   loadManifestWithPath,
   npmRegistryUrl,
-  pageBoxes,
-  printAreaMeta,
   publishTargetFor,
   resolveConfig,
   resolveConfigForTarget,
@@ -75,7 +69,7 @@ import {
   uniqueExtensionId,
   withFetchTimeout,
   writeManifestDoc
-} from "./cli-6pv84kf3.js";
+} from "./cli-88arpdke.js";
 import {
   EXTENSION_MANIFEST_FILENAME,
   GUTTERPRESS_CSS,
@@ -96,7 +90,7 @@ import {
   readExtensionMeta,
   resolveDeclaredStyles,
   slugify
-} from "./cli-wyg7qstd.js";
+} from "./cli-tgnyvra3.js";
 import {
   PACKAGE_META,
   PACKAGE_VERSION,
@@ -106,12 +100,20 @@ import {
   log,
   setLogLevel,
   warn
-} from "./cli-eatdqx3z.js";
+} from "./cli-9n9kg58f.js";
 import {
   DEBOUNCE,
   UsageError,
   resolvePort
 } from "./cli-d8xjns66.js";
+import {
+  cssLength,
+  formatPageSize,
+  isPositivePoints,
+  judgeRect,
+  pageBoxes,
+  printAreaMeta
+} from "./cli-65gy8ask.js";
 import {
   BuildError
 } from "./cli-46ycxe6r.js";
@@ -1596,7 +1598,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;
@@ -3097,7 +3099,7 @@ registerCheck(check27);
 import { readFile as readFile13 } 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", "--"],
@@ -3118,7 +3120,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;"],
@@ -3858,6 +3859,7 @@ function canonicalChapterId(p) {
 }
 
 // src/lib/markdown/assemble.ts
+import postcss5 from "postcss";
 function pageGeometryCss(page) {
   if (!page || !isPositivePoints(page.width) || !isPositivePoints(page.height))
     return null;
@@ -3878,6 +3880,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 = postcss5.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 postcss5.AtRule || p instanceof postcss5.Rule; p = p.parent) {
+      if (p instanceof postcss5.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((chunk2, i) => i === 0 ? { ...chunk2, css: `/* ${title} */
+${chunk2.css.trim()}` } : chunk2);
+  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 ?? "";
@@ -3916,30 +3977,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((chunk2) => chunk2.css).join(`
 
 `);
   const preloadTags = (opts.preloadImages ?? []).map((href) => `
@@ -3972,6 +4014,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 = [];
@@ -3986,10 +4029,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)
@@ -4007,7 +4053,8 @@ ${css.trim()}
   return assembleBookHtml({
     files,
     readText: (relPath) => readFile16(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,
@@ -5056,7 +5103,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-4rabsgwq.js");
+      const { buildNativePdf } = await import("./engine-c4pxz79g.js");
       const engineDiagnostics = await buildNativePdf(htmlFile, rawPdf, {
         title: config.title,
         author: config.authors.length > 0 ? config.authors.join(", ") : undefined,
@@ -6379,10 +6426,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>.
@@ -6524,7 +6571,7 @@ async function scaffoldProject(options) {
   let versionHistoryError;
   if (requested === "local-git") {
     try {
-      const { providerFor } = await import("./source-provider-n7vehh6t.js");
+      const { providerFor } = await import("./source-provider-j1w7byeq.js");
       const provider = providerFor({ type: "local-folder", path: projectDir });
       await provider.initVersionHistory({
         projectDir,
@@ -7878,13 +7925,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",
@@ -7893,10 +7940,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);
@@ -8029,8 +8076,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",
@@ -8049,13 +8168,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`;
@@ -8077,22 +8189,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((resolve5) => setImmediate(resolve5));
@@ -8219,9 +8315,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)) : {
@@ -8239,10 +8338,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 } : {},
@@ -8262,11 +8362,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 {
@@ -8878,7 +8978,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-e7je32pr.js");
+    const { restoreForCommand: restoreForCommand2 } = await import("./extension-restore-pd87p8r2.js");
     await restoreForCommand2(book.projectDir, { manifestPath: book.manifestPath, failFast: true });
   }
   const publishers = await discover(ext);
@@ -8916,7 +9016,7 @@ function infoFor(p) {
 }
 function pluginProvider(p) {
   let loading;
-  const load = () => loading ??= import("./plugins-sprxsz5d.js").then((m) => m.loadPublishFunction(p));
+  const load = () => loading ??= import("./plugins-e0n46s6m.js").then((m) => m.loadPublishFunction(p));
   return {
     info: infoFor(p),
     async authenticate() {
@@ -8987,7 +9087,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;
@@ -9205,7 +9306,7 @@ async function disconnectPublishCredential(key, deps, options = {}) {
 import { isSeq as isSeq2, isMap as isMap3, YAMLSeq, Scalar } from "yaml";
 // src/lib/version-changes.ts
 import git3 from "isomorphic-git";
-import postcss5 from "postcss";
+import postcss6 from "postcss";
 
 // src/lib/remote-auth/transport.ts
 import git2 from "isomorphic-git";
@@ -9303,6 +9404,7 @@ var defaultGitHttp = withIdleTimeout(httpNode);
 
 // src/lib/version-changes.ts
 var decoder = new TextDecoder;
+var CLOCK_SKEW_SECONDS = 10 * 60;
 // src/lib/host-policy.ts
 var AUTO_SYNC_MAX_MINUTES = 24 * 60;
 // src/lib/remote-auth/github-repos.ts
@@ -9435,4 +9537,6 @@ function normalizeProjectKey(projectDir) {
 }
 // src/lib/publish/manifest-publish.ts
 import { isMap as isMap4 } from "yaml";
+// src/lib/root-tokens.ts
+import postcss7 from "postcss";
 export { reportMissingTools, executeValidation, executeAndReport, splitOutPath, runBuild, openPath, startPreviewServer, scaffoldProject, EXTENSION_KINDS, scaffoldExtension, BUILT_IN_TEMPLATE_IDS, importExtensionFromFile, importExtensionFromUrl, searchNpmExtensions, publishCredentialKey, publishConnectionStatus, listPublishAccounts, connectGoogleDrive, listBookPublishProviders, resolvePublishProvider, resolvePublishFormat, runPublish, connectPublishProvider, disconnectPublishCredential };

package/dist/{cli-wyg7qstd.js → cli-tgnyvra3.js}

@@ -1,7 +1,7 @@
 import {
   PACKAGE_VERSION,
   debug
-} from "./cli-eatdqx3z.js";
+} from "./cli-9n9kg58f.js";
 import {
   isExactNpmVersion,
   isValidNpmPackageName,
@@ -1950,8 +1950,9 @@ img.gp-shape {
 
 /* Math (the bundled gutterpress-math feature, math.ts): MathJax's own rules
    for the <mjx-container> SVG output it emits, from its SVG output jax's
-   stylesheet, less the ones for its interactive menu and tooltips. Inert in
-   a book without formulas. */
+   stylesheet, less the ones for its interactive menu and tooltips, plus one
+   bound of ours on the hidden MathML copy (#469, below). Inert in a book
+   without formulas. */
 mjx-container[jax="SVG"] { direction: ltr; }
 mjx-container[jax="SVG"] > svg { overflow: visible; min-height: 1px; min-width: 1px; }
 mjx-container[jax="SVG"] > svg a { fill: blue; stroke: blue; }
@@ -1968,6 +1969,15 @@ mjx-assistive-mml {
   border: 0px !important;
   display: block !important;
   width: auto !important;
+  /* Ours (#469). The browser lays the copy out in whatever math font it has,
+     so it can be wider than the formula's SVG; ending a line, it crossed the
+     column edge and Chromium shrank the whole print to fit. MathJax makes the
+     container position: relative with the copy at its top left, so 100% is
+     the formula's width. Clip and overflow still hide the copy and its MathML
+     still reaches screen readers; only its box changes. Not the 1px
+     visually-hidden box MathJax 2 used: its docs note VoiceOver on iOS could
+     not reach a formula by touch in it. */
+  max-width: 100% !important;
   overflow: hidden !important;
   user-select: none;
 }
@@ -3575,9 +3585,9 @@ async function loadNpmPackage(packageName, baseDir, version) {
   const looksLikeJsFilename = /\.(m?js|cjs)$/i.test(packageName);
   const suggestedPath = looksLikeJsFilename ? `./${packageName}` : `./plugins/${packageName}.js`;
   if (!looksLikeJsFilename && (!version || !isExactNpmVersion(version))) {
-    throw new Error(`Extension "${packageName}${version ? `@${version}` : ""}" is not pinned to an exact version, so it can't be downloaded automatically. Run \`gutterpress ext add ${packageName}\` (or use Book setup > Advanced in the desktop app) to download it and pin its version in your manifest.`);
+    throw new Error(`Extension "${packageName}${version ? `@${version}` : ""}" is not pinned to an exact version, so it can't be downloaded automatically. Run \`gutterpress ext add ${packageName}\` (or add it in Book setup) to download it and pin its version in your manifest.`);
   }
-  throw new Error(`Extension "${packageName}" not found. Install it with \`gutterpress ext add ${version ? `${packageName}@${version}` : packageName}\` (or Book setup > Advanced in the desktop app),
+  throw new Error(`Extension "${packageName}" not found. Install it with \`gutterpress ext add ${version ? `${packageName}@${version}` : packageName}\` (or add it in Book setup),
 or reference a local file under \`extensions:\`:
   extensions:
     - ${suggestedPath}`);