gutterpress 0.11.23-alpha.4 → 0.11.23-alpha.6

package/dist/{index-ea94zbq4.js → index-ejbfetdn.js}

@@ -37,7 +37,7 @@ import {
   validatePageMargin,
   withFetchTimeout,
   writeManifestDoc
-} from "./index-kaks3mm2.js";
+} from "./index-cmakyf43.js";
 import {
   EXTENSION_MANIFEST_FILENAME,
   GUTTERPRESS_CSS,
@@ -73,7 +73,7 @@ import {
   setLogLevel,
   slugify,
   warn
-} from "./index-8ywkd2sv.js";
+} from "./index-1zqkfzcd.js";
 import {
   blackTextToGray
 } from "./index-ht1bcqdd.js";
@@ -84,7 +84,7 @@ import {
   getAssetPath,
   lastPageMode,
   resolvePage
-} from "./index-5kh4c78h.js";
+} from "./index-2vxzxyyj.js";
 import {
   BuildError
 } from "./index-46ycxe6r.js";
@@ -115,18 +115,23 @@ import {
   spawnCapture
 } from "./index-bt0qws5c.js";
 import {
+  NO_VERSION_HISTORY,
+  assertFreeRevisionName,
   errorLogData,
   gitFs,
   gitScopeFor,
   hasPendingChanges,
   hasUncommittedChanges,
+  isContained,
   listWorkdirChanges,
+  readRevisionRefs,
   resolveGitAuthor,
   resolveLogger,
+  revisionNameFrom,
   snapshotStagingMarkerPath,
   snapshotWorkingTreeUnlocked,
   withRepoLock
-} from "./index-h6yk5tjx.js";
+} from "./index-cw03e9p4.js";
 import {
   EXTENSIONS_DIR,
   resolveVendoredPluginInstallRoot,
@@ -153,21 +158,21 @@ import { randomBytes } from "node:crypto";
 import { readdir as readdir2, readFile as readFile2, writeFile, mkdir } from "node:fs/promises";
 
 // src/lib/remote-auth/sync-messages.ts
-var MSG_UP_TO_DATE = "Everything is in sync.";
-var MSG_UP_TO_DATE_PULLED = "Everything is in sync. The latest online changes were downloaded to this computer.";
+var MSG_UP_TO_DATE = "You're up to date with the online copy.";
+var MSG_UP_TO_DATE_PULLED = "You're up to date. The latest changes from the online copy were downloaded to this computer.";
 var MSG_SYNCED = "Your changes are online.";
 var MSG_SYNCED_MERGED = "Your changes are online, combined with changes from the online copy.";
-var MSG_OFFLINE = "Your changes are saved on this computer. Gutterpress couldn't reach the online repository — try syncing again when you're back online.";
-var MSG_AUTH = "The online repository didn't accept the saved connection. Reconnect and try again.";
-var MSG_INSECURE_TRANSPORT = "This book's online address isn't secure, so the saved connection wasn't sent — connections are never sent over an insecure address. Switch the address to a secure one (starting with https), or to a local loopback address for a server on this computer, to sync.";
-var MSG_BUSY = "The online copy is changing very quickly right now. Your work is saved on this computer — try Sync again in a moment.";
-var MSG_HISTORY_UNREADABLE = "This book's version history can't be read, so syncing can't continue. Your writing is safe — every file is still here on this computer. Use Repair online backup (in Where your work is kept) to get history and syncing working again.";
-var MSG_UNRELATED = "This book and the online copy have no history in common, so they can't be combined. Either the online address points at a different book, or this book's own history was lost and started over. Your writing is safe — every file is still here on this computer. Check the online address; if it is correct, use Repair online backup (in Where your work is kept).";
-var MSG_NO_REMOTE = "This book isn't connected to an online repository yet.";
-var MSG_SSH_REMOTE = "This book's online address uses SSH (git@…), which Gutterpress can't sync to. Switch it to the web (HTTPS) address to sync from here.";
-var MSG_NO_BRANCH = "This book's version history isn't on a named branch, so it can't be synced right now.";
-var SYNC_SNAPSHOT_MESSAGE = "Automatic backup of your work";
-var SYNC_LATE_EDIT_MESSAGE = "Saved the edit you made while syncing";
+var MSG_OFFLINE = "Your changes are saved on this computer. Gutterpress couldn't reach the online copy — try again when you're back online.";
+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_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.";
+var SYNC_SNAPSHOT_MESSAGE = "Automatic version before backing up";
+var SYNC_LATE_EDIT_MESSAGE = "Saved the edit you made while backing up";
 function onlineSiblingPath(filepath) {
   const dot = filepath.lastIndexOf(".");
   const slash = filepath.lastIndexOf("/");
@@ -4019,8 +4024,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) {
@@ -4046,7 +4051,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
           }));
@@ -4055,7 +4060,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
             }));
@@ -4076,7 +4081,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
         }));
       }
@@ -5527,7 +5532,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-6txhxmmv.js");
+      const { buildNativePdf } = await import("./engine-wm4fggac.js");
       const engineDiagnostics = await buildNativePdf(htmlFile, rawPdf, {
         title: config.title,
         author: config.authors.length > 0 ? config.authors.join(", ") : undefined,
@@ -7356,7 +7361,7 @@ async function scaffoldProject(options) {
   let versionHistoryError;
   if (requested === "local-git") {
     try {
-      const { providerFor } = await import("./source-provider-98k5deda.js");
+      const { providerFor } = await import("./source-provider-tgzet3j5.js");
       const provider = providerFor({ type: "local-folder", path: projectDir });
       await provider.initVersionHistory({
         projectDir,
@@ -7368,7 +7373,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 ${path14.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 ${path14.basename(enclosingRepoDir)}'s shared version history; save a version to record it.` : e instanceof Error ? e.message : String(e);
     }
   }
   const result = {
@@ -7447,7 +7452,7 @@ styles:
   let versionHistoryError;
   if (requested === "local-git") {
     try {
-      const { providerFor } = await import("./source-provider-98k5deda.js");
+      const { providerFor } = await import("./source-provider-tgzet3j5.js");
       const provider = providerFor({ type: "local-folder", path: dir });
       await provider.initVersionHistory({
         projectDir: dir,
@@ -8644,7 +8649,7 @@ function isCredentialTransmissionSafe(url) {
 class InsecureTransportError extends Error {
   code = "InsecureTransport";
   constructor() {
-    super("This online address isn't secure, so the saved connection wasn't sent — " + "connections are never sent over an insecure address. Switch the address " + "to a secure one (starting with https) to sync with a saved connection.");
+    super("This online copy's address 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) to use a saved sign-in.");
     this.name = "InsecureTransportError";
   }
 }
@@ -8726,7 +8731,7 @@ function failureOutcome(e, snapshotId) {
   }
   return {
     status: "error",
-    message: "Syncing didn't complete. Your work is saved on this computer — please try again.",
+    message: "Backing up didn't finish. Your work is saved on this computer — please try again.",
     ...base
   };
 }
@@ -8805,8 +8810,11 @@ async function fetchRemoteTip(dir, branch, transport, http2, cache2) {
     const code = e?.code;
     if (code === "NoRefspecError")
       return null;
+    if (code === "NotFoundError" && e.data?.what === branch) {
+      return null;
+    }
     if (code === "NotFoundError" || e?.data?.statusCode === 404) {
-      const err = new Error("The online repository couldn't be accessed with the saved connection. Reconnect and try again.", { cause: e });
+      const err = new Error("The online copy couldn't be reached with the saved sign-in. Sign in again and try again.", { cause: e });
       err.code = "HttpError";
       err.data = { statusCode: 401 };
       throw err;
@@ -8814,6 +8822,16 @@ async function fetchRemoteTip(dir, branch, transport, http2, cache2) {
     throw e;
   }
 }
+async function serverTip(transport, branch, http2) {
+  const refs = await git2.listServerRefs({
+    http: http2,
+    url: transport.url,
+    prefix: `refs/heads/${branch}`,
+    ...onAuthFor(transport.credential),
+    ...transport.credential ? { onAuthFailure: () => ({ cancel: true }) } : {}
+  });
+  return refs.find((r) => r.ref === `refs/heads/${branch}`)?.oid;
+}
 function short(oid) {
   return oid ? oid.slice(0, 8) : "none";
 }
@@ -9827,7 +9845,7 @@ var API_BASE2 = "https://api.github.com";
 var REQUEST_TIMEOUT_MS3 = 15000;
 var PER_PAGE = 100;
 var MAX_PAGES = 50;
-var RECONNECT_MESSAGE2 = "Your GitHub connection has expired. Reconnect GitHub and try again.";
+var RECONNECT_MESSAGE2 = "Your GitHub sign-in has expired. Sign in to GitHub again and try again.";
 async function apiGet(fetchImpl, url, token) {
   const res = await withFetchTimeout({ timeoutMs: REQUEST_TIMEOUT_MS3, offlineMessage: OFFLINE_MESSAGE }, (signal) => fetchImpl(url, { method: "GET", headers: githubApiHeaders(token), signal }));
   if (res.status === 401 || res.status === 403) {
@@ -10341,6 +10359,7 @@ async function syncProject(options) {
             return {
               status: "up-to-date",
               message: pulled ? MSG_UP_TO_DATE_PULLED : MSG_UP_TO_DATE,
+              pushDeferred: true,
               ...convergeExtras(),
               ...base()
             };
@@ -10435,14 +10454,7 @@ async function checkRemoteUpdates(options) {
       ...options.tokenStore ? { tokenStore: options.tokenStore } : {}
     });
     const branch = await currentBranchOrThrow(dir);
-    const refs = await git5.listServerRefs({
-      http: http3,
-      url: transport.url,
-      prefix: `refs/heads/${branch}`,
-      ...onAuthFor(transport.credential),
-      ...transport.credential ? { onAuthFailure: () => ({ cancel: true }) } : {}
-    });
-    const remoteTip = refs.find((r) => r.ref === `refs/heads/${branch}`)?.oid;
+    const remoteTip = await serverTip(transport, branch, http3);
     if (!remoteTip)
       return { available: false };
     const known = async (ref) => {
@@ -10473,20 +10485,20 @@ 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 online backup.",
-  auth: "GitHub didn't accept the saved connection. Reconnect GitHub in Settings > Accounts and try again.",
+  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.",
   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. Online backup copies the versions Gutterpress keeps on this computer.",
+  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.",
   noName: "Give the online copy a name.",
-  badName: "A repository name can only use letters, numbers, hyphens (-), underscores (_) and dots (.), and be at most 100 characters.",
-  notFound: "Gutterpress couldn't find that repository on GitHub, or your account can't see it. Choose another one.",
-  noPermission: "Your GitHub account isn't allowed to add to that repository (it may be archived or read-only). Choose another one.",
-  noCreatePermission: "GitHub wouldn't let Gutterpress create a repository with this connection. Create an empty repository on github.com yourself, then choose it from your existing repositories here.",
-  notEmpty: "That repository already has files in it, and online backup needs an empty one. Choose an empty repository, or create a new one.",
-  pushFailed: "Your book couldn't be copied to GitHub. Your writing is safe on this computer. Please try again."
+  badName: "An online copy's name can only use letters, numbers, hyphens (-), underscores (_) and dots (.), and be at most 100 characters.",
+  notFound: "Gutterpress couldn't find that online copy on GitHub, or your account can't see it. Choose another one.",
+  noPermission: "Your GitHub account isn't allowed to add to that online copy (it may be archived or read-only). Choose another one.",
+  noCreatePermission: "GitHub wouldn't let Gutterpress create an online copy with this sign-in. Create an empty one on github.com yourself (GitHub calls it a repository), then choose it from your existing empty online copies here.",
+  notEmpty: "That online copy already has files in it, and a new online copy needs to be empty. Choose an empty one, or create a new one.",
+  pushFailed: "Your book couldn't be sent to GitHub. Your writing is safe on this computer. Please try again."
 };
-var nameTaken = (name) => `You already have a repository named "${name}" on GitHub. Pick a different name, or choose that repository from your existing empty repositories.`;
+var nameTaken = (name) => `You already have an online copy named "${name}" on GitHub. Pick a different name, or choose that one from your existing empty online copies.`;
 
 class BackupFailure extends Error {
   reason;
@@ -10528,7 +10540,7 @@ async function createRepository(fetchImpl, token, name, isPrivate) {
     name,
     private: isPrivate,
     auto_init: false,
-    description: "Online backup made with Gutterpress"
+    description: "Online copy made with Gutterpress"
   });
   if (res.status === 201 || res.status === 200)
     return await res.json();
@@ -10541,7 +10553,7 @@ async function createRepository(fetchImpl, token, name, isPrivate) {
     const taken = (body.errors ?? []).some((e) => /already exists/i.test(e.message ?? ""));
     throw new BackupFailure("name-taken", taken ? nameTaken(name) : MSG.badName);
   }
-  throw new BackupFailure("push-failed", `GitHub couldn't create the repository (error ${res.status}). Please try again.`);
+  throw new BackupFailure("push-failed", `GitHub couldn't create the online copy (error ${res.status}). Please try again.`);
 }
 async function loadEmptyRepository(fetchImpl, credential, owner, name) {
   const path21 = `/repos/${encodeURIComponent(owner)}/${encodeURIComponent(name)}`;
@@ -10561,7 +10573,7 @@ async function loadEmptyRepository(fetchImpl, credential, owner, name) {
   }
   const branches = await listGitHubBranches(credential, owner, name, { fetchImpl }).catch((e) => {
     const msg = e instanceof Error ? e.message : "";
-    throw new BackupFailure(/reconnect/i.test(msg) ? "auth" : /reach/i.test(msg) ? "offline" : "push-failed", msg || MSG.pushFailed);
+    throw new BackupFailure(/sign in/i.test(msg) ? "auth" : /reach/i.test(msg) ? "offline" : "push-failed", msg || MSG.pushFailed);
   });
   if (branches.length > 0)
     throw new BackupFailure("not-empty", MSG.notEmpty, toRemoteRepository(repo));
@@ -10652,14 +10664,14 @@ async function assertCloneTarget(dir) {
 }
 function friendlyCloneError(e) {
   if (isInsecureTransportError(e)) {
-    return new Error("That repository address isn't secure, so the saved connection wasn't sent — connections are never sent over an insecure address. Use a secure address (starting with https), or a local loopback address for a server on this computer.", { cause: e });
+    return new Error("That address isn't secure, so the saved sign-in wasn't sent — sign-ins are never sent over an insecure address. Use a secure address (starting with https), or a local loopback address for a server on this computer.", { cause: e });
   }
   const msg = e instanceof Error ? e.message : String(e);
   if (/401|403|auth|credential/i.test(msg)) {
-    return new Error("GitHub didn't accept the connection for this repository. Reconnect GitHub and try again.", { cause: e });
+    return new Error("GitHub didn't accept the saved sign-in for this book. Sign in to GitHub again and try again.", { cause: e });
   }
   if (/404|not found/i.test(msg)) {
-    return new Error("That repository couldn't be found. It may have been renamed or you may no longer have access.", { cause: e });
+    return new Error("That online copy couldn't be found. It may have been renamed or you may no longer have access.", { cause: e });
   }
   if (/ENOTFOUND|ECONNREFUSED|ETIMEDOUT|EAI_AGAIN|network|fetch failed/i.test(msg)) {
     return new Error(OFFLINE_MESSAGE, { cause: e });
@@ -10678,10 +10690,10 @@ async function cloneRepository(options) {
   try {
     parsed = new URL(options.url);
   } catch {
-    throw new Error("That repository address is not a valid web URL.");
+    throw new Error("That address is not a valid web address.");
   }
   if (!/^https?:$/.test(parsed.protocol)) {
-    throw new Error("Only HTTPS repository addresses are supported. SSH addresses (git@…) can't be used here.");
+    throw new Error("Only secure web (https) addresses are supported. SSH addresses (git@…) can't be used here.");
   }
   const { cleanUrl, credential: urlCredential } = extractUrlCredential(options.url);
   const credential = options.credential ?? urlCredential;
@@ -10740,11 +10752,11 @@ function isSshRemoteUrl(url) {
   return /^[\w.-]+@[\w.][\w.-]*:/.test(trimmed) || /^[\w.-]+@\[/.test(trimmed);
 }
 var FAILURE_MESSAGES = {
-  auth: "The Git server didn't accept the saved connection. Reconnect to this server with a current access token and try again.",
-  "not-found": "The server answered, but no repository was found at that address. It may have been moved, renamed, or you may no longer have access.",
+  auth: "The Git server didn't accept the saved sign-in. Sign in to this server again with a current access token and try again.",
+  "not-found": "The server answered, but no online copy was found at that address. It may have been moved, renamed, or you may no longer have access.",
   unreachable: "Couldn't reach the Git server. Check your internet connection (and VPN, if this is a private server), then try again.",
-  "ssh-unsupported": "This book's online address uses SSH (git@…), which Gutterpress can't check or sync with. Everything on this computer still works — sync with your usual Git tool.",
-  "insecure-transport": "This address isn't secure, so the saved connection wasn't sent — connections are never sent over an insecure address. Switch the address to a secure one (starting with https), or to a local loopback address for a server on this computer, to use a saved connection.",
+  "ssh-unsupported": "This book's online copy uses an SSH address (git@…), which Gutterpress can't check or back up to. Everything on this computer still works — back up with your usual Git tool.",
+  "insecure-transport": "This address 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 use a saved sign-in.",
   tls: "The server's security certificate couldn't be verified. If this is a private server with its own certificate, ask its administrator about trusting it (NODE_EXTRA_CA_CERTS).",
   unknown: "The connection test failed unexpectedly. The server may not be a Git server, or it may be temporarily unavailable."
 };
@@ -10848,7 +10860,7 @@ function connectError(result, host) {
     case "tls":
       return new Error(result.message);
     case "not-found":
-      return new Error("The server answered, but that repository wasn't found. Check the repository address and that the token has access to it.");
+      return new Error("The server answered, but that online copy wasn't found. Check its address and that the token has access to it.");
     default:
       return new Error(`Couldn't verify the connection to ${host}. Check the server address and try again.`);
   }
@@ -10858,6 +10870,9 @@ async function connectGenericHost(input, options = {}) {
   if (!host) {
     throw new Error("Enter your Git server's web address (like https://git.example.com).");
   }
+  if (host === GITHUB_HOST) {
+    throw new Error("GitHub has its own sign-in. Use Connect GitHub instead of a Git server.");
+  }
   const token = input.token?.trim();
   if (!token) {
     throw new Error("Paste an access token from your Git server to connect.");
@@ -10979,11 +10994,171 @@ async function diagnoseProjectRemote(projectDir, options = {}) {
     guidance
   };
 }
-// src/lib/remote-auth/repair.ts
+// src/lib/remote-auth/revisions.ts
 import git9 from "isomorphic-git";
+function onlineFailure(e, unchanged) {
+  const setup = setupErrorMessage(e);
+  if (setup)
+    return new Error(setup, { cause: e });
+  switch (classifyTransportFailure(e)) {
+    case "network_unavailable":
+      return new Error(`Couldn't reach the online copy, so ${unchanged}. Try again when you're back online.`, { cause: e });
+    case "auth_required":
+      return new Error(`The online copy didn't accept the saved sign-in, so ${unchanged}. Sign in again and try again.`, { cause: e });
+    case "insecure_transport":
+      return new Error(MSG_INSECURE_TRANSPORT, { cause: e });
+    default:
+      return new Error(`The online copy didn't allow that, so ${unchanged}. Some online copies don't allow changing their main revision.`, { cause: e });
+  }
+}
+function localTip(refs, name) {
+  const tip = refs.local.get(name);
+  if (tip)
+    return tip;
+  throw new Error(refs.online.has(name) ? `"${name}" is only in the online copy so far. Switch to it first.` : `Couldn't find a revision named "${name}" — it may have been renamed or deleted.`);
+}
+async function reachOnline(dir, name, tip, open, options, unchanged) {
+  const http3 = options.httpClient ?? defaultGitHttp;
+  let transport;
+  let onlineTip;
+  try {
+    transport = await resolveTransport(dir, options);
+    onlineTip = await serverTip(transport, name, http3);
+  } catch (e) {
+    throw onlineFailure(e, unchanged);
+  }
+  if (!onlineTip)
+    return null;
+  if (!await isContained(dir, onlineTip, tip, {})) {
+    throw new Error(`The online copy has versions of "${name}" that this computer doesn't have yet. ` + `${open ? "Get" : `Switch to "${name}" and get`} the latest first, then try again.`);
+  }
+  return { transport, http: http3 };
+}
+async function sendRef(dir, { transport, http: http3 }, ref, remoteName, remove2 = false) {
+  await git9.push({
+    fs: gitFs,
+    http: http3,
+    dir,
+    remote: transport.remote,
+    ref,
+    remoteRef: `refs/heads/${remoteName}`,
+    delete: remove2,
+    ...onAuthFor(transport.credential)
+  });
+  if (remove2)
+    await git9.deleteRef({ fs: gitFs, dir, ref: `refs/remotes/${transport.remote}/${remoteName}` });
+}
+async function renameRevision(options) {
+  const source = await detectProjectSource(options.projectDir);
+  if (source.type !== "local-git-folder")
+    throw new Error(NO_VERSION_HISTORY);
+  const dir = gitScopeFor(source);
+  const { from } = options;
+  const to = revisionNameFrom(options.to);
+  return withRepoLock(dir, async () => {
+    const refs = await readRevisionRefs(dir);
+    const tip = localTip(refs, from);
+    const current = refs.current === from ? to : refs.current;
+    if (to === from)
+      return { current, name: to };
+    await assertFreeRevisionName(dir, to);
+    const unchanged = `"${from}" wasn't renamed`;
+    const online = refs.online.has(from) ? await reachOnline(dir, from, tip, refs.current === from, options, unchanged) : null;
+    if (online) {
+      const here = `refs/heads/${from}`;
+      try {
+        await sendRef(dir, online, here, to);
+      } catch (e) {
+        throw onlineFailure(e, unchanged);
+      }
+      try {
+        await sendRef(dir, online, here, from, true);
+      } catch (e) {
+        const undone = await sendRef(dir, online, `refs/remotes/${online.transport.remote}/${to}`, to, true).then(() => true, () => false);
+        throw undone ? onlineFailure(e, unchanged) : new Error(`"${from}" couldn't be renamed in the online copy, which now has both "${from}" and "${to}". ` + `Your work is safe on this computer. Delete the one you don't want, or try again later.`, { cause: e });
+      }
+    }
+    await git9.renameBranch({ fs: gitFs, dir, ref: to, oldref: from });
+    return { current, name: to };
+  });
+}
+async function countVersionsOnlyIn(dir, tip, others, limit = 5000) {
+  const cache2 = {};
+  const waiting = new Map;
+  const visited = new Set;
+  const reach = async (oid, shared) => {
+    const known = waiting.get(oid);
+    if (known) {
+      known.shared ||= shared;
+      return;
+    }
+    if (visited.has(oid))
+      return;
+    const read = await git9.readCommit({ fs: gitFs, dir, cache: cache2, oid }).catch(() => {
+      return;
+    });
+    if (read) {
+      waiting.set(oid, { time: read.commit.committer.timestamp, parents: read.commit.parent, shared });
+    }
+  };
+  await git9.readCommit({ fs: gitFs, dir, cache: cache2, oid: tip });
+  await reach(tip, false);
+  for (const oid of others)
+    await reach(oid, true);
+  let onlyHere = 0;
+  for (let walked = 0;walked < limit; walked++) {
+    const entries = [...waiting];
+    if (entries.every(([, v]) => v.shared))
+      break;
+    const [oid, version] = entries.reduce((a, b) => b[1].time > a[1].time ? b : a);
+    waiting.delete(oid);
+    visited.add(oid);
+    if (!version.shared)
+      onlyHere++;
+    for (const parent of version.parents)
+      await reach(parent, version.shared);
+  }
+  return onlyHere;
+}
+async function deleteRevision(options) {
+  const source = await detectProjectSource(options.projectDir);
+  if (source.type !== "local-git-folder")
+    throw new Error(NO_VERSION_HISTORY);
+  const dir = gitScopeFor(source);
+  const { name } = options;
+  return withRepoLock(dir, async () => {
+    const refs = await readRevisionRefs(dir);
+    if (name === refs.current) {
+      throw new Error(`You're working on "${name}" right now. Switch to another revision first, then delete it.`);
+    }
+    const tip = localTip(refs, name);
+    const everywhere = options.everywhere === true && refs.online.has(name);
+    const online = everywhere ? await reachOnline(dir, name, tip, false, options, `"${name}" wasn't deleted`) : null;
+    if (!options.discard) {
+      const others = [
+        ...[...refs.local].filter(([n]) => n !== name),
+        ...[...refs.online].filter(([n]) => !(everywhere && n === name))
+      ].map(([, otherTip]) => otherTip);
+      const versionsOnlyHere = await countVersionsOnlyIn(dir, tip, others);
+      if (versionsOnlyHere > 0)
+        return { deleted: false, versionsOnlyHere };
+    }
+    if (online) {
+      try {
+        await sendRef(dir, online, `refs/heads/${name}`, name, true);
+      } catch (e) {
+        throw onlineFailure(e, `"${name}" wasn't deleted`);
+      }
+    }
+    await git9.deleteBranch({ fs: gitFs, dir, ref: name });
+    return { deleted: true };
+  });
+}
+// src/lib/remote-auth/repair.ts
+import git10 from "isomorphic-git";
 import { cp as cp4, mkdir as mkdir13, rename as rename3, rm as rm4 } from "node:fs/promises";
 import path22 from "node:path";
-var REPAIR_SNAPSHOT_MESSAGE = "Repaired online backup";
+var REPAIR_SNAPSHOT_MESSAGE = "Repaired the online copy";
 async function moveDir(from, to) {
   await mkdir13(path22.dirname(to), { recursive: true });
   try {
@@ -11005,7 +11180,7 @@ async function repairOnlineBackup(options) {
     const transport = await resolveTransport(dir, options);
     let branch;
     try {
-      branch = await git9.currentBranch({ fs: gitFs, dir }) ?? undefined;
+      branch = await git10.currentBranch({ fs: gitFs, dir }) ?? undefined;
     } catch {
       branch = undefined;
     }
@@ -11031,10 +11206,10 @@ async function repairOnlineBackup(options) {
     const ref = fresh.branch ?? "HEAD";
     let missing = [];
     try {
-      const tracked = await git9.listFiles({ fs: gitFs, dir, ref });
+      const tracked = await git10.listFiles({ fs: gitFs, dir, ref });
       missing = tracked.filter((f) => !gitFs.existsSync(path22.join(dir, f)));
       if (missing.length > 0) {
-        await git9.checkout({ fs: gitFs, dir, ref, filepaths: missing, force: true });
+        await git10.checkout({ fs: gitFs, dir, ref, filepaths: missing, force: true });
         logger.info("restore", "restored files missing on this computer", { files: missing });
       }
     } catch (e) {
@@ -11061,7 +11236,7 @@ async function repairOnlineBackup(options) {
   return { outcome, movedGitTo, restoredFiles };
 }
 // src/lib/remote-auth/scorched-earth.ts
-import git10 from "isomorphic-git";
+import git11 from "isomorphic-git";
 import { cp as cp5, mkdir as mkdir14, readdir as readdir10, rm as rm5 } from "node:fs/promises";
 import path23 from "node:path";
 async function emptyDir(dir) {
@@ -11087,7 +11262,7 @@ async function scorchedEarth(options) {
       const transport2 = await resolveTransport(dir, options);
       let branch2;
       try {
-        branch2 = await git10.currentBranch({ fs: gitFs, dir }) ?? undefined;
+        branch2 = await git11.currentBranch({ fs: gitFs, dir }) ?? undefined;
       } catch {
         branch2 = undefined;
       }
@@ -12417,7 +12592,7 @@ function publishProviderFor(id) {
 }
 
 // src/lib/publish/plugin-provider.ts
-var RESERVED_SETTINGS = new Set(["format", "credential"]);
+var RESERVED_SETTINGS = new Set(["format", "credential", "enabled"]);
 var isBuiltIn = (id) => listPublishProviders().some((p) => p.id === id);
 var messageOf = (e) => e instanceof Error ? e.message : String(e);
 async function bookExtensions(book) {
@@ -12473,7 +12648,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-dymzcasz.js");
+    const { restoreForCommand: restoreForCommand2 } = await import("./extension-restore-whag4sm0.js");
     await restoreForCommand2(book.projectDir, { manifestPath: book.manifestPath, failFast: true });
   }
   const publishers = await discover(ext);
@@ -12511,7 +12686,7 @@ function infoFor(p) {
 }
 function pluginProvider(p) {
   let loading;
-  const load = () => loading ??= import("./plugins-fec8t2bh.js").then((m) => m.loadPublishFunction(p));
+  const load = () => loading ??= import("./plugins-racab3cj.js").then((m) => m.loadPublishFunction(p));
   return {
     info: infoFor(p),
     async authenticate() {
@@ -12578,7 +12753,10 @@ async function requestFor(provider, options, deps) {
   const { manifest, manifestDir } = await loadManifestWithPath(options.manifestPath ?? options.projectDir, { explicit: options.manifestPath !== undefined });
   const config = resolveConfig({}, manifest);
   const publishSettings = manifest.publish ?? {};
-  const providerConfig = publishSettings[provider.info.id] ?? {};
+  const providerConfig = {
+    ...publishSettings[provider.info.id] ?? {},
+    ...(await deps.selections?.settings(options.projectDir))?.[provider.info.id] ?? {}
+  };
   const bookAccount = typeof providerConfig.credential === "string" ? providerConfig.credential.trim() : "";
   const effectiveAccount = bookAccount || deps.credentialAccount;
   const effectiveDeps = effectiveAccount ? { ...deps, credentialAccount: effectiveAccount } : deps;
@@ -12754,11 +12932,20 @@ async function connectPublishProvider(options, deps) {
     label: account || info10.label,
     createdAt: Date.now()
   };
-  const req = await resolvePublishRequest({
+  const shop = (options.shop ?? "").trim();
+  if (!options.projectDir && info10.id === "shopify" && !shop) {
+    throw new Error("Enter your Shopify store's address (like my-store.myshopify.com) to check the key.");
+  }
+  const req = options.projectDir ? await resolvePublishRequest({
     projectDir: options.projectDir,
     providerId: info10.id,
     ...options.manifestPath ? { manifestPath: options.manifestPath } : {}
-  }, deps);
+  }, deps) : {
+    project: { projectDir: "", title: "", authors: [] },
+    config: shop ? { shop } : {},
+    artifact: { path: "", format: info10.format },
+    deps
+  };
   const trialDeps = {
     ...deps,
     env: {},
@@ -12822,7 +13009,7 @@ class PublishSelectionsStore {
   resolve(providerId, projectDir) {
     return this.enqueue(async () => {
       const data = await this.read();
-      const proj = projectDir ? data.projects[normalizeProjectKey(projectDir)]?.[providerId] : undefined;
+      const proj = projectDir ? data.projects[normalizeProjectKey(projectDir)]?.[providerId]?.credential : undefined;
       return proj && proj.trim() || data.global[providerId]?.trim() || undefined;
     });
   }
@@ -12830,7 +13017,7 @@ class PublishSelectionsStore {
     return this.enqueue(async () => {
       const data = await this.read();
       const global = data.global[providerId];
-      const project = projectDir ? data.projects[normalizeProjectKey(projectDir)]?.[providerId] : undefined;
+      const project = projectDir ? data.projects[normalizeProjectKey(projectDir)]?.[providerId]?.credential : undefined;
       return {
         ...project ? { project } : {},
         ...global ? { global } : {}
@@ -12849,17 +13036,35 @@ class PublishSelectionsStore {
     });
   }
   setProject(projectDir, providerId, account) {
+    return this.setSettings(projectDir, providerId, { credential: account });
+  }
+  settings(projectDir) {
+    return this.enqueue(async () => {
+      const data = await this.read();
+      return data.projects[normalizeProjectKey(projectDir)] ?? {};
+    });
+  }
+  setSettings(projectDir, providerId, values) {
     return this.enqueue(async () => {
       const data = await this.read();
       const key = normalizeProjectKey(projectDir);
-      const a = (account ?? "").trim();
-      const bucket = data.projects[key] ?? {};
-      if (a)
-        bucket[providerId] = a;
+      const book = data.projects[key] ?? {};
+      const mine = { ...book[providerId] };
+      for (const [k, v] of Object.entries(values)) {
+        const text = (v ?? "").trim();
+        if (text)
+          mine[k] = text;
+        else
+          delete mine[k];
+      }
+      if (JSON.stringify(mine) === JSON.stringify(book[providerId] ?? {}))
+        return;
+      if (Object.keys(mine).length > 0)
+        book[providerId] = mine;
       else
-        delete bucket[providerId];
-      if (Object.keys(bucket).length > 0)
-        data.projects[key] = bucket;
+        delete book[providerId];
+      if (Object.keys(book).length > 0)
+        data.projects[key] = book;
       else
         delete data.projects[key];
       await this.write(data);
@@ -12870,6 +13075,7 @@ function normalizeProjectKey(projectDir) {
   return projectDir.replace(/[\\/]+$/, "");
 }
 // src/lib/publish/manifest-publish.ts
+import path31 from "node:path";
 import { isMap as isMap4 } from "yaml";
 function settingsFromDoc(doc) {
   const node = doc.get("publish", true);
@@ -12884,9 +13090,13 @@ function settingsFromDoc(doc) {
   }
   return out;
 }
-async function readPublishSettings(projectDir) {
+async function readPublishSettings(projectDir, selections) {
   const { doc } = await loadManifestDoc(projectDir);
-  return settingsFromDoc(doc);
+  const settings = settingsFromDoc(doc);
+  for (const [id, mine] of Object.entries(await selections?.settings(projectDir) ?? {})) {
+    settings[id] = { ...settings[id], ...mine };
+  }
+  return settings;
 }
 async function setPublishProviderConfig(projectDir, providerId, values) {
   const { doc, file } = await loadManifestDoc(projectDir);
@@ -12908,4 +13118,35 @@ async function setPublishProviderConfig(projectDir, providerId, values) {
   await writeManifestDoc(file, doc);
   return settingsFromDoc(doc);
 }
-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, REPAIR_SNAPSHOT_MESSAGE, repairOnlineBackup, scorchedEarth, listPublishProviders, publishProviderFor, listBookPublishProviders, resolvePublishProvider, resolvePublishFormat, resolvePublishRequest, runPublish, connectPublishProvider, disconnectPublishCredential, PublishSelectionsStore, readPublishSettings, setPublishProviderConfig };
+function insideBook(projectDir, dir) {
+  const rel = path31.relative(projectDir, path31.resolve(projectDir, dir));
+  if (rel === ".." || rel.startsWith(`..${path31.sep}`) || path31.isAbsolute(rel))
+    return null;
+  return rel.split(path31.sep).join("/") || ".";
+}
+async function savePublishSettings(projectDir, providerId, values, selections) {
+  const shared = {};
+  const mine = {};
+  for (const [key, value] of Object.entries(values)) {
+    const text = value === undefined || value === null ? "" : String(value).trim();
+    const isDir = providerId === "local" && key === "dir";
+    const inside = isDir && text ? insideBook(projectDir, text) : null;
+    if (inside !== null) {
+      shared[key] = inside;
+      mine[key] = "";
+    } else if (isDir || key === "credential") {
+      mine[key] = isDir && text ? path31.resolve(projectDir, text) : text;
+      shared[key] = "";
+    } else {
+      shared[key] = value;
+    }
+  }
+  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 };