gutterpress 0.11.23-alpha.5 → 0.11.23-alpha.6

package/README.md

@@ -162,7 +162,7 @@ gutterpress new <name> [--kind <id>] [options]
   --targets <ids>          Publish targets recorded in the manifest (comma-separated: dtrpg, itch; or "none") — default: the preset's
   --page-width <pt>        Trim width in points, 72pt = 1in (required with --preset custom; optional override otherwise)
   --page-height <pt>       Trim height in points, 72pt = 1in (required with --preset custom; optional override otherwise)
-  --git                    Initialise local version history (default: true; use --no-git to skip)
+  --git                    Keep version history on this computer (default: true; use --no-git to skip)
   --no-git
 ```
 

package/dist/api/index.d.ts

@@ -53,8 +53,8 @@ export { readManifestFields, setManifestFields, setActiveStyles, } from "../lib/
 export type { ProjectConfigFields } from "../lib/manifest-config.ts";
 export { readPageSetup, setPageSetup } from "../lib/page-size.ts";
 export type { PageMargin, PageSetup, PageSetupChange, PageSizeChoice, PageSizePoints } from "../lib/page-size.ts";
-export { providerFor, restoreVersionWithBackup, isNoChangesError, countUnversionedChanges, whenGitIdle, AUTO_SNAPSHOT_MESSAGE, RESTORE_BACKUP_MESSAGE, HISTORY_PAGE_LIMIT, listLocalBranches, switchBranch, SWITCH_BRANCH_SNAPSHOT_MESSAGE, } from "../lib/source-provider.ts";
-export type { ListHistoryOptions, HistoryPage, UnversionedChanges, LocalBranches, SwitchBranchOptions, SwitchBranchResult, } from "../lib/source-provider.ts";
+export { providerFor, restoreVersionWithBackup, isNoChangesError, countUnversionedChanges, whenGitIdle, AUTO_SNAPSHOT_MESSAGE, RESTORE_BACKUP_MESSAGE, HISTORY_PAGE_LIMIT, listRevisions, createRevision, revisionNameFrom, switchBranch, SWITCH_BRANCH_SNAPSHOT_MESSAGE, } from "../lib/source-provider.ts";
+export type { ListHistoryOptions, HistoryPage, UnversionedChanges, Revision, RevisionList, CreateRevisionOptions, SwitchBranchOptions, SwitchBranchResult, } from "../lib/source-provider.ts";
 export { describeVersions, listOnlineVersions, compareVersionFile, exportVersionTree, VERSION_CHANGES_SHOWN, } from "../lib/version-changes.ts";
 export type { VersionEntry, VersionFileChange, CompareRow } from "../lib/version-changes.ts";
 export { autoSnapshotDelayMs, autoSyncDelayMs, isGitInternalPath, AUTO_SNAPSHOT_DEFAULT_MINUTES, AUTO_SYNC_MIN_MINUTES, AUTO_SYNC_MAX_MINUTES, AUTO_SYNC_DEFAULT_MINUTES, AUTO_SYNC_PUSH_INTERVAL_MINUTES, } from "../lib/host-policy.ts";
@@ -80,6 +80,8 @@ 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, checkRemoteUpdates, SYNC_SNAPSHOT_MESSAGE, } from "../lib/remote-auth/sync.ts";
+export { renameRevision, deleteRevision } from "../lib/remote-auth/revisions.ts";
+export type { RenameRevisionOptions, DeleteRevisionOptions } from "../lib/remote-auth/revisions.ts";
 export { repairOnlineBackup, REPAIR_SNAPSHOT_MESSAGE, type RepairOnlineBackupOptions, type RepairOnlineBackupResult, } from "../lib/remote-auth/repair.ts";
 export { scorchedEarth, type ScorchedEarthOptions, type ScorchedEarthResult, } from "../lib/remote-auth/scorched-earth.ts";
 export type { SyncOutcome, SyncProjectOptions, KeptBothFile, } from "../lib/remote-auth/sync.ts";

package/dist/api/index.js

@@ -30,6 +30,7 @@ import {
   connectGoogleDrive,
   connectPublishProvider,
   defaultConfigDir,
+  deleteRevision,
   deleteSnippet,
   describeVersions,
   diagnoseProjectRemote,
@@ -70,6 +71,7 @@ import {
   readPageSetup,
   readPublishSettings,
   refreshRemoteCopies,
+  renameRevision,
   repairOnlineBackup,
   requireGoogleClientCredentials,
   resolveActiveStyles,
@@ -102,7 +104,7 @@ import {
   substituteVariables,
   syncProject,
   testRemoteAccess
-} from "../index-agrkfbkv.js";
+} from "../index-ejbfetdn.js";
 import {
   DEFAULT_NPM_REGISTRY,
   MANIFEST_FILENAMES,
@@ -131,7 +133,7 @@ import {
   setExtensionEnabled,
   updateExtensions,
   validateProjectExtensions
-} from "../index-t3jkavdz.js";
+} from "../index-cmakyf43.js";
 import {
   BUNDLED_EXTENSIONS,
   EXTENSION_MANIFEST_FILENAME,
@@ -146,7 +148,7 @@ import {
   pathEscapesFolder,
   readExtensionMeta,
   resolveExtension
-} from "../index-9ye22m7r.js";
+} from "../index-1zqkfzcd.js";
 import"../index-ht1bcqdd.js";
 import"../index-2vxzxyyj.js";
 import {
@@ -164,14 +166,16 @@ import {
   RESTORE_BACKUP_MESSAGE,
   SWITCH_BRANCH_SNAPSHOT_MESSAGE,
   countUnversionedChanges,
+  createRevision,
   isNoChangesError,
-  listLocalBranches,
+  listRevisions,
   providerFor,
   resolveLogger,
   restoreVersionWithBackup,
+  revisionNameFrom,
   switchBranch,
   whenGitIdle
-} from "../index-h6yk5tjx.js";
+} from "../index-cw03e9p4.js";
 import {
   EXTENSIONS_DIR
 } from "../index-5x42amh8.js";
@@ -212,6 +216,7 @@ export {
   runPublish,
   runBuild,
   revokeGoogleCredential,
+  revisionNameFrom,
   restoreVersionWithBackup,
   restorePinnedExtensions,
   restoreFailureMessage,
@@ -231,6 +236,7 @@ export {
   repoRootForSource,
   repairOnlineBackup,
   reorderExtensions,
+  renameRevision,
   removeExtension,
   refreshRemoteCopies,
   readyProbeExpr,
@@ -251,6 +257,7 @@ export {
   npmRegistryUrl,
   loadManifestWithPath,
   listSnippets,
+  listRevisions,
   listRepoBooks,
   listPublishProviders,
   listPublishAccounts,
@@ -261,7 +268,6 @@ export {
   listMergedSnippets,
   listMarkerComponents,
   listLocationVariants,
-  listLocalBranches,
   listGitHubRepositories,
   listGitHubBranches,
   listCustomTemplates,
@@ -296,7 +302,9 @@ export {
   describeVersions,
   describeExtension,
   deleteSnippet,
+  deleteRevision,
   defaultConfigDir,
+  createRevision,
   countUnversionedChanges,
   connectPublishProvider,
   connectGoogleDrive,

package/dist/{build-4qv9wvrx.js → build-py643c5a.js}

@@ -1,20 +1,20 @@
 import {
   runBuild,
   splitOutPath
-} from "./cli-pth362d8.js";
-import"./cli-nk0efg2x.js";
+} from "./cli-09jj8w5g.js";
+import"./cli-bnf7eb38.js";
 import"./cli-ht1bcqdd.js";
 import"./cli-58fsk6d7.js";
 import"./cli-5crpmz42.js";
 import"./cli-eyyggect.js";
 import"./cli-asap4t1z.js";
-import"./cli-a35w7wzg.js";
+import"./cli-31anr0r9.js";
 import"./cli-v5mp7a6q.js";
-import"./cli-w97xcpag.js";
-import"./cli-de8ydmm7.js";
+import"./cli-55br530w.js";
+import"./cli-x777v272.js";
 import {
   log
-} from "./cli-2t3krcfy.js";
+} from "./cli-tf9tw6at.js";
 import {
   UsageError,
   parseFormat,
@@ -22,7 +22,7 @@ import {
   rejectExtraPositionals,
   rejectUnknownFlags
 } from "./cli-d8xjns66.js";
-import"./cli-yxfznmsq.js";
+import"./cli-qzkq9em8.js";
 import {
   BuildError
 } from "./cli-46ycxe6r.js";

package/dist/{cli-pth362d8.js → cli-09jj8w5g.js}

@@ -8,7 +8,7 @@ import {
   stampCreator,
   stripAnnotations,
   transparentPages
-} from "./cli-nk0efg2x.js";
+} from "./cli-bnf7eb38.js";
 import {
   blackTextToGray
 } from "./cli-ht1bcqdd.js";
@@ -42,7 +42,7 @@ import {
 import {
   hasUncommittedChanges,
   listWorkdirChanges
-} from "./cli-a35w7wzg.js";
+} from "./cli-31anr0r9.js";
 import {
   detectProjectSource,
   repoSubPath
@@ -75,7 +75,7 @@ import {
   uniqueExtensionId,
   withFetchTimeout,
   writeManifestDoc
-} from "./cli-w97xcpag.js";
+} from "./cli-55br530w.js";
 import {
   EXTENSION_MANIFEST_FILENAME,
   GUTTERPRESS_CSS,
@@ -96,7 +96,7 @@ import {
   readExtensionMeta,
   resolveDeclaredStyles,
   slugify
-} from "./cli-de8ydmm7.js";
+} from "./cli-x777v272.js";
 import {
   PACKAGE_META,
   PACKAGE_VERSION,
@@ -106,7 +106,7 @@ import {
   log,
   setLogLevel,
   warn
-} from "./cli-2t3krcfy.js";
+} from "./cli-tf9tw6at.js";
 import {
   DEBOUNCE,
   UsageError,
@@ -3024,8 +3024,8 @@ function withoutOnlineTag(relPath) {
 }
 var check27 = {
   id: "source.sync.merge-markers",
-  name: "Combined Versions",
-  description: "Finds passages and files still holding two versions (yours and the online version) after a sync",
+  name: "Combined Takes",
+  description: "Finds passages and files still holding two takes (yours and the online copy's) after getting the latest changes",
   category: "source",
   phase: "pre-build",
   async run(ctx) {
@@ -3051,7 +3051,7 @@ var check27 = {
           results.push(finding(check27.id, {
             severity: "error",
             code: "two-versions-passage",
-            message: "This passage has two versions — yours and the online version. Choose one in the editor's Two versions panel, or keep the text you want and delete the marker lines.",
+            message: "This passage has two takes — yours and the online copy's. Choose one in the editor's Two takes panel, or keep the text you want and delete the marker lines.",
             file,
             line: i + 1
           }));
@@ -3060,7 +3060,7 @@ var check27 = {
             results.push(finding(check27.id, {
               severity: "error",
               code: "leftover-version-marker",
-              message: "This marker line is left over from combining two versions — delete it.",
+              message: "This marker line is left over from combining two takes — delete it.",
               file,
               line: i + 1
             }));
@@ -3081,7 +3081,7 @@ var check27 = {
         results.push(finding(check27.id, {
           severity: "warning",
           code: "kept-both-versions",
-          message: `Two versions of ${withoutOnlineTag(rel)} are in your book — keep the one you want, then delete the other.`,
+          message: `Two takes of ${withoutOnlineTag(rel)} are in your book — keep the one you want, then delete the other.`,
           file: sibling
         }));
       }
@@ -6524,7 +6524,7 @@ async function scaffoldProject(options) {
   let versionHistoryError;
   if (requested === "local-git") {
     try {
-      const { providerFor } = await import("./source-provider-knmcam50.js");
+      const { providerFor } = await import("./source-provider-n7vehh6t.js");
       const provider = providerFor({ type: "local-folder", path: projectDir });
       await provider.initVersionHistory({
         projectDir,
@@ -6536,7 +6536,7 @@ async function scaffoldProject(options) {
       versionHistory = "none";
       const { findEnclosingRepoDir } = await import("./project-source-ekcyp63q.js");
       const enclosingRepoDir = await findEnclosingRepoDir(projectDir);
-      versionHistoryError = enclosingRepoDir ? `This book was added to ${path12.basename(enclosingRepoDir)}'s shared version history; save a snapshot to record it.` : e instanceof Error ? e.message : String(e);
+      versionHistoryError = enclosingRepoDir ? `This book was added to ${path12.basename(enclosingRepoDir)}'s shared version history; save a version to record it.` : e instanceof Error ? e.message : String(e);
     }
   }
   const result = {
@@ -8878,7 +8878,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-x3mtn844.js");
+    const { restoreForCommand: restoreForCommand2 } = await import("./extension-restore-fjfn1hrk.js");
     await restoreForCommand2(book.projectDir, { manifestPath: book.manifestPath, failFast: true });
   }
   const publishers = await discover(ext);
@@ -8916,7 +8916,7 @@ function infoFor(p) {
 }
 function pluginProvider(p) {
   let loading;
-  const load = () => loading ??= import("./plugins-cfzf26b8.js").then((m) => m.loadPublishFunction(p));
+  const load = () => loading ??= import("./plugins-vpx7c53c.js").then((m) => m.loadPublishFunction(p));
   return {
     info: infoFor(p),
     async authenticate() {
@@ -9321,10 +9321,12 @@ import git7 from "isomorphic-git";
 // src/lib/remote-auth/test-access.ts
 import git8 from "isomorphic-git";
 import httpNode2 from "isomorphic-git/http/node";
-// src/lib/remote-auth/repair.ts
+// src/lib/remote-auth/revisions.ts
 import git9 from "isomorphic-git";
-// src/lib/remote-auth/scorched-earth.ts
+// src/lib/remote-auth/repair.ts
 import git10 from "isomorphic-git";
+// src/lib/remote-auth/scorched-earth.ts
+import git11 from "isomorphic-git";
 // src/lib/publish/selections.ts
 import { chmod as chmod2, mkdir as mkdir10, readFile as readFile26, writeFile as writeFile11 } from "node:fs/promises";
 import path21 from "node:path";

package/dist/{cli-a35w7wzg.js → cli-31anr0r9.js}

@@ -1,7 +1,8 @@
 import {
   capabilitiesFor,
   detectProjectSource,
-  findEnclosingRepoDir
+  findEnclosingRepoDir,
+  syncRemoteFor
 } from "./cli-v5mp7a6q.js";
 import {
   EXTENSIONS_DIR,
@@ -163,6 +164,7 @@ function gitScopeFor(source) {
   return source.repoRoot || source.path;
 }
 var HISTORY_PAGE_LIMIT = 100;
+var NO_VERSION_HISTORY = "This book isn't keeping version history yet. Turn on version history first.";
 var DEFAULT_AUTHOR = "gutterpress";
 var DEFAULT_EMAIL = "noreply@gutterpress.local";
 var DEFAULT_BRANCH = "main";
@@ -334,7 +336,7 @@ class LocalFolderSourceProvider {
   async initVersionHistory(options) {
     const dir = options.projectDir;
     if (await findEnclosingRepoDir(dir) !== undefined) {
-      throw new Error("This folder is already inside a versioned book, so gutterpress " + "won't create a separate history here.");
+      throw new Error("This folder is already inside a book that keeps version history, so " + "Gutterpress won't start a separate one here.");
     }
     return withRepoLock(dir, async () => {
       const cache = {};
@@ -358,7 +360,7 @@ class LocalFolderSourceProvider {
     });
   }
   snapshot() {
-    return Promise.reject(new Error("This book has no version history yet. Enable version history first."));
+    return Promise.reject(new Error(NO_VERSION_HISTORY));
   }
   listHistory() {
     return Promise.resolve([]);
@@ -367,7 +369,7 @@ class LocalFolderSourceProvider {
     return Promise.resolve({ entries: [], hasMore: false });
   }
   restore() {
-    return Promise.reject(new Error("This book has no version history yet. Enable version history first."));
+    return Promise.reject(new Error(NO_VERSION_HISTORY));
   }
 }
 
@@ -466,7 +468,7 @@ async function snapshotWorkingTreeUnlocked(options) {
   const workdirClean = changes.adds.length === 0 && changes.removes.length === 0;
   if (workdirClean && !staleStaging) {
     logger.debug("snapshot", "no changes — skipping");
-    throw new Error("No changes since the last snapshot — there is nothing new to save.");
+    throw new Error("Nothing new to save — your last version already has everything.");
   }
   if (workdirClean && staleStaging && await stageMatchesHead(dir, cache)) {
     logger.debug("snapshot", "stale marker outlived a completed commit — clearing, not recommitting");
@@ -504,7 +506,7 @@ async function snapshotWorkingTreeUnlocked(options) {
   };
 }
 function isNoChangesError(e) {
-  return e instanceof Error && /no changes since the last snapshot/i.test(e.message);
+  return e instanceof Error && /nothing new to save/i.test(e.message);
 }
 async function countUnversionedChanges(projectDir) {
   const source = await detectProjectSource(projectDir);
@@ -535,14 +537,13 @@ function gitDirFor(projectDir) {
 function snapshotStagingMarkerPath(projectDir) {
   return path2.join(gitDirFor(projectDir), SNAPSHOT_STAGING_MARKER);
 }
-var RESTORE_BACKUP_MESSAGE = "Automatic backup before restoring an earlier version";
-var AUTO_SNAPSHOT_MESSAGE = "Automatic snapshot";
+var RESTORE_BACKUP_MESSAGE = "Automatic version before restoring";
+var AUTO_SNAPSHOT_MESSAGE = "Automatic version";
 async function restoreVersionWithBackup(options) {
   const { projectDir, id, authorName, authorEmail } = options;
   const source = await detectProjectSource(projectDir);
-  if (source.type !== "local-git-folder") {
-    throw new Error("This book has no version history yet. Enable version history first.");
-  }
+  if (source.type !== "local-git-folder")
+    throw new Error(NO_VERSION_HISTORY);
   const provider = new LocalGitSourceProvider(source);
   const repoDir = gitScopeFor(source);
   return withRepoLock(repoDir, async () => {
@@ -559,42 +560,105 @@ async function restoreVersionWithBackup(options) {
     try {
       await provider.restoreUnlocked({ projectDir, id });
     } catch (cause) {
-      throw new Error(backupId ? "The restore could not be completed, but your work is safe — it was " + `automatically saved as a backup snapshot (${backupId.slice(0, 7)}) ` + "and appears in your version history." : "The restore could not be completed. Your book files were not changed.", { cause });
+      throw new Error(backupId ? "Going back to that version didn't finish, but your work is safe — it was " + "saved as an automatic version and appears in your version history." : "Going back to that version didn't finish. Your book files were not changed.", { cause });
     }
     return { restoredId: id, backupId };
   });
 }
-var SWITCH_BRANCH_SNAPSHOT_MESSAGE = "Saved before switching copy";
-async function listLocalBranches(dir) {
-  const source = await detectProjectSource(dir);
-  if (source.type !== "local-git-folder")
-    return null;
-  const repoDir = gitScopeFor(source);
-  const [local, current, remotes] = await Promise.all([
-    git.listBranches({ fs: gitFs, dir: repoDir }),
-    git.currentBranch({ fs: gitFs, dir: repoDir, fullname: false }).catch(() => {
+var SWITCH_BRANCH_SNAPSHOT_MESSAGE = "Saved before switching revision";
+async function readRevisionRefs(dir) {
+  const [names, current, remote] = await Promise.all([
+    git.listBranches({ fs: gitFs, dir }),
+    git.currentBranch({ fs: gitFs, dir, fullname: false }).catch(() => {
       return;
     }),
-    git.listRemotes({ fs: gitFs, dir: repoDir }).catch(() => [])
+    syncRemoteFor(dir)
   ]);
-  const localNames = new Set(local);
-  const remoteOnly = new Set;
-  for (const { remote } of remotes) {
-    const names = await git.listBranches({ fs: gitFs, dir: repoDir, remote }).catch(() => []);
-    for (const name of names) {
-      if (name === "HEAD")
-        continue;
-      if (!localNames.has(name))
-        remoteOnly.add(name);
-    }
-  }
+  const tips = async (branches, prefix) => new Map(await Promise.all(branches.map(async (name) => [name, await git.resolveRef({ fs: gitFs, dir, ref: `${prefix}${name}` })])));
+  const onlineNames = remote ? (await git.listBranches({ fs: gitFs, dir, remote: remote.remote }).catch(() => [])).filter((name) => name !== "HEAD") : [];
   return {
     current: current ?? null,
-    branches: [...localNames, ...remoteOnly].sort(),
-    remoteOnly: [...remoteOnly].sort()
+    local: await tips(names, "refs/heads/"),
+    online: await tips(onlineNames, `refs/remotes/${remote?.remote}/`)
   };
 }
-async function resolveCopy(repoDir, branch) {
+var ANCESTRY_DEPTH = 1000;
+async function isContained(dir, tip, inTip, cache) {
+  if (tip === inTip)
+    return true;
+  return git.isDescendent({ fs: gitFs, dir, cache, oid: inTip, ancestor: tip, depth: ANCESTRY_DEPTH }).catch(() => false);
+}
+async function listRevisions(dir) {
+  const source = await detectProjectSource(dir);
+  if (source.type !== "local-git-folder")
+    return null;
+  const repoDir = gitScopeFor(source);
+  const { current, local, online } = await readRevisionRefs(repoDir);
+  const cache = {};
+  const names = [...new Set([...local.keys(), ...online.keys()])].sort((a, b) => a.localeCompare(b));
+  const revisions = await Promise.all(names.map(async (name) => {
+    const here = local.get(name);
+    const there = online.get(name);
+    return {
+      name,
+      current: name === current,
+      where: here && there ? "online" : here ? "this-computer" : "online-only",
+      notBackedUp: Boolean(here && there && !await isContained(repoDir, here, there, cache))
+    };
+  }));
+  return { current, revisions };
+}
+function revisionNameFrom(input) {
+  return input.trim().replace(/\s+/g, "-");
+}
+var UNUSABLE_REVISION_NAME = /[\u0000- \u007f~^:?*[\\/<>"|]|\.\.|@\{|^[-.]|\.$|\.lock$|^@$/;
+var REVISION_NAME_MAX = 100;
+async function assertFreeRevisionName(repoDir, name) {
+  if (!name)
+    throw new Error("Give the revision a name.");
+  if (name.length > REVISION_NAME_MAX || UNUSABLE_REVISION_NAME.test(name)) {
+    throw new Error(`"${name}" can't be a revision name. Use plain words, numbers and dashes, up to ${REVISION_NAME_MAX} characters.`);
+  }
+  const { local, online } = await readRevisionRefs(repoDir);
+  const taken = (names) => [...names].find((n) => n.toLowerCase() === name.toLowerCase());
+  const here = taken(local.keys());
+  if (here)
+    throw new Error(`There's already a revision called "${here}". Pick a different name.`);
+  const there = taken(online.keys());
+  if (there) {
+    throw new Error(`"${there}" is already a revision in the online copy. Switch to it, or pick a different name.`);
+  }
+}
+async function saveUnsavedWork(options, cache) {
+  try {
+    await snapshotWorkingTreeUnlocked({
+      projectDir: options.projectDir,
+      repoRoot: options.repoDir,
+      message: SWITCH_BRANCH_SNAPSHOT_MESSAGE,
+      authorName: options.authorName,
+      authorEmail: options.authorEmail,
+      cache
+    });
+  } catch (e) {
+    if (!isNoChangesError(e))
+      throw e;
+  }
+}
+async function createRevision(options) {
+  const { projectDir, authorName, authorEmail } = options;
+  const source = await detectProjectSource(projectDir);
+  if (source.type !== "local-git-folder")
+    throw new Error(NO_VERSION_HISTORY);
+  const repoDir = gitScopeFor(source);
+  const name = revisionNameFrom(options.name);
+  return withRepoLock(repoDir, async () => {
+    await assertFreeRevisionName(repoDir, name);
+    await saveUnsavedWork({ projectDir, repoDir, authorName, authorEmail }, {});
+    await git.branch({ fs: gitFs, dir: repoDir, ref: name, checkout: true });
+    return { current: name };
+  });
+}
+async function resolveRevision(repoDir, branch) {
   const local = await git.resolveRef({ fs: gitFs, dir: repoDir, ref: `refs/heads/${branch}` }).catch(() => {
     return;
   });
@@ -608,7 +672,7 @@ async function resolveCopy(repoDir, branch) {
     if (oid)
       return { oid, remote };
   }
-  throw new Error(`Couldn't find a copy named "${branch}" — it may have been renamed or deleted.`);
+  throw new Error(`Couldn't find a revision named "${branch}" — it may have been renamed or deleted.`);
 }
 function isCheckoutConflictError(e) {
   return e?.code === "CheckoutConflictError";
@@ -645,29 +709,16 @@ async function diffCommitPaths(dir, fromOid, toOid, cache) {
 async function switchBranch(options) {
   const { projectDir, branch, authorName, authorEmail } = options;
   const source = await detectProjectSource(projectDir);
-  if (source.type !== "local-git-folder") {
-    throw new Error("This book has no version history yet. Enable version history first.");
-  }
+  if (source.type !== "local-git-folder")
+    throw new Error(NO_VERSION_HISTORY);
   const repoDir = gitScopeFor(source);
   return withRepoLock(repoDir, async () => {
     const cache = {};
-    try {
-      await snapshotWorkingTreeUnlocked({
-        projectDir,
-        repoRoot: repoDir,
-        message: SWITCH_BRANCH_SNAPSHOT_MESSAGE,
-        authorName,
-        authorEmail,
-        cache
-      });
-    } catch (e) {
-      if (!isNoChangesError(e))
-        throw e;
-    }
+    await saveUnsavedWork({ projectDir, repoDir, authorName, authorEmail }, cache);
     const fromOid = await git.resolveRef({ fs: gitFs, dir: repoDir, ref: "HEAD" }).catch(() => {
       return;
     });
-    const { oid: toOid, remote } = await resolveCopy(repoDir, branch);
+    const { oid: toOid, remote } = await resolveRevision(repoDir, branch);
     try {
       await git.checkout({
         fs: gitFs,
@@ -679,7 +730,7 @@ async function switchBranch(options) {
       });
     } catch (e) {
       if (isCheckoutConflictError(e)) {
-        throw new Error("Couldn't switch copies — some files changed on disk right as the switch " + "started. Try again.", { cause: e });
+        throw new Error("Couldn't switch revisions — some files changed on disk right as the switch " + "started. Try again.", { cause: e });
       }
       throw e;
     }
@@ -691,4 +742,4 @@ async function switchBranch(options) {
   });
 }
 
-export { gitScopeFor, HISTORY_PAGE_LIMIT, withRepoLock, whenGitIdle, __repoLockQueueSizeForTests, resolveGitAuthor, listWorkdirChanges, stageChanges, hasPendingChanges, hasUncommittedChanges, snapshotWorkingTreeUnlocked, isNoChangesError, countUnversionedChanges, providerFor, gitDirFor, snapshotStagingMarkerPath, RESTORE_BACKUP_MESSAGE, AUTO_SNAPSHOT_MESSAGE, restoreVersionWithBackup, SWITCH_BRANCH_SNAPSHOT_MESSAGE, listLocalBranches, switchBranch };
+export { gitScopeFor, HISTORY_PAGE_LIMIT, NO_VERSION_HISTORY, withRepoLock, whenGitIdle, __repoLockQueueSizeForTests, resolveGitAuthor, listWorkdirChanges, stageChanges, hasPendingChanges, hasUncommittedChanges, snapshotWorkingTreeUnlocked, isNoChangesError, countUnversionedChanges, providerFor, gitDirFor, snapshotStagingMarkerPath, RESTORE_BACKUP_MESSAGE, AUTO_SNAPSHOT_MESSAGE, restoreVersionWithBackup, SWITCH_BRANCH_SNAPSHOT_MESSAGE, readRevisionRefs, isContained, listRevisions, revisionNameFrom, assertFreeRevisionName, createRevision, switchBranch };

package/dist/{cli-w97xcpag.js → cli-55br530w.js}

@@ -11,10 +11,10 @@ import {
   prettify,
   readExtensionMeta,
   slugify
-} from "./cli-de8ydmm7.js";
+} from "./cli-x777v272.js";
 import {
   log
-} from "./cli-2t3krcfy.js";
+} from "./cli-tf9tw6at.js";
 import {
   UsageError
 } from "./cli-d8xjns66.js";
@@ -562,7 +562,7 @@ async function loadManifestWithPath(pathOrDir, opts) {
     if (existsSync(p) && statSync(p).isFile()) {
       const raw = await readFile(p, "utf8");
       if (raw.split(/\r?\n/).includes(TWO_VERSIONS_OPEN)) {
-        throw new UsageError(`"${p}" has two versions of a setting — yours and the online version — left by a sync. Open it, keep the one you want and delete the marker lines.`);
+        throw new UsageError(`"${p}" has two takes of a setting — yours and the online copy's — left by getting the latest changes. Open it, keep the one you want and delete the marker lines.`);
       }
       try {
         const parsed = parseYaml(raw) ?? {};
@@ -1916,7 +1916,7 @@ async function vendorNpmExtension(projectDir, input, exportName, options, commit
   }
   const warnings = [...installed.warnings];
   await finalizeNpmPluginInstall(installed).catch((error) => {
-    warnings.push(`The extension was installed, but an old backup could not be removed: ` + `${error instanceof Error ? error.message : String(error)}`);
+    warnings.push(`The extension was installed, but an old download could not be removed: ` + `${error instanceof Error ? error.message : String(error)}`);
   });
   warnings.push(...await retireLegacyCopies(projectDir, installed.name));
   try {

package/dist/{cli-nk0efg2x.js → cli-bnf7eb38.js}

@@ -14,7 +14,7 @@ import {
 import {
   PACKAGE_VERSION,
   log
-} from "./cli-2t3krcfy.js";
+} from "./cli-tf9tw6at.js";
 import {
   __require
 } from "./cli-37x76zdn.js";

package/dist/{cli-yxfznmsq.js → cli-qzkq9em8.js}

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "gutterpress",
-  version: "0.11.23-alpha.5",
+  version: "0.11.23-alpha.6",
   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-2t3krcfy.js → cli-tf9tw6at.js}

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "./cli-yxfznmsq.js";
+} from "./cli-qzkq9em8.js";
 
 // src/utils/logger.ts
 var currentLevel = "INFO";

package/dist/{cli-de8ydmm7.js → cli-x777v272.js}

@@ -1,7 +1,7 @@
 import {
   PACKAGE_VERSION,
   debug
-} from "./cli-2t3krcfy.js";
+} from "./cli-tf9tw6at.js";
 import {
   isExactNpmVersion,
   isValidNpmPackageName,
@@ -2691,8 +2691,8 @@ function twoVersions(state, startLine, endLine, silent) {
   open.attrSet("class", "gp-two-versions");
   open.map = [startLine, closer + 1];
   open.block = true;
-  pushVersion(state, "yours", "Your version", startLine + 1, separator);
-  pushVersion(state, "online", "Online version", separator + 1, closer);
+  pushVersion(state, "yours", "Your take", startLine + 1, separator);
+  pushVersion(state, "online", "Online take", separator + 1, closer);
   const close = state.push("two_versions_close", "div", -1);
   close.block = true;
   state.parentType = oldParent;