gutterpress 0.10.0 → 0.10.1-beta.2

package/dist/{index-ge7q9xj3.js → index-h1x7krkg.js}

@@ -17,19 +17,18 @@ import {
   resolveChromiumExecutable,
   run,
   spawnCapture
-} from "./index-ycpvr0am.js";
+} from "./index-7hrvksrb.js";
 import {
-  gitDirFor,
+  gitFs,
   gitScopeFor,
   hasPendingChanges,
   hasUncommittedChanges,
-  isNoChangesError,
   resolveGitAuthor,
   resolveLogger,
   snapshotStagingMarkerPath,
   snapshotWorkingTreeUnlocked,
   withRepoLock
-} from "./index-mdefp0y5.js";
+} from "./index-dtrftayr.js";
 import {
   detectProjectSource,
   syncRemoteFor
@@ -39,7 +38,7 @@ import {
 } from "./index-37x76zdn.js";
 
 // src/lib/build-runner.ts
-import path7 from "node:path";
+import path8 from "node:path";
 import fs2 from "node:fs";
 import fsp2 from "node:fs/promises";
 import os2 from "node:os";
@@ -544,6 +543,37 @@ function resolveWithPreset(cliOverrides, manifest, preset) {
 
 // src/lib/markdown/index.ts
 import { readdir as readdir2, readFile as readFile3, 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_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 project'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 project's version history can't be read, so syncing can't continue. Your writing is safe — every file is still here on this computer. To get history and syncing working again, download a fresh copy of the project from online, then move any recent changes into it.";
+var MSG_UNRELATED = "This project and the online copy have no history in common, so they can't be combined. Either the online address points at a different project, or this project's own history was lost and started over. Your writing is safe — every file is still here on this computer. Check the online address; if it is correct, download a fresh copy from online and move any recent changes into it.";
+var MSG_NO_REMOTE = "This project isn't connected to an online repository yet.";
+var MSG_SSH_REMOTE = "This project'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 project'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";
+function onlineSiblingPath(filepath) {
+  const dot = filepath.lastIndexOf(".");
+  const slash = filepath.lastIndexOf("/");
+  const hasExt = dot > slash + 1;
+  return hasExt ? `${filepath.slice(0, dot)}.online${filepath.slice(dot)}` : `${filepath}.online`;
+}
+function isOnlineSibling(filepath) {
+  const dot = filepath.lastIndexOf(".");
+  const slash = filepath.lastIndexOf("/");
+  const stem = dot > slash + 1 ? filepath.slice(0, dot) : filepath;
+  return stem.endsWith(".online");
+}
+
+// src/lib/markdown/index.ts
 import { join } from "node:path";
 
 // src/lib/desktop.ts
@@ -2404,7 +2434,7 @@ async function inlineShapeUrls(html, baseDir) {
 async function resolveActiveMarkdownFiles(inputDir, configuredFiles) {
   if (configuredFiles && configuredFiles.length > 0)
     return configuredFiles;
-  return (await readdir2(inputDir)).filter((f) => f.endsWith(".md")).sort();
+  return (await readdir2(inputDir)).filter((f) => f.endsWith(".md") && !isOnlineSibling(f)).sort();
 }
 async function renderChapters(inputDir, opts = {}) {
   const styles = await resolveActiveStyles(inputDir, opts.styles);
@@ -3950,7 +3980,7 @@ import git from "isomorphic-git";
 // package.json
 var package_default = {
   name: "gutterpress",
-  version: "0.10.0",
+  version: "0.10.1-beta.2",
   description: "Markdown-to-PDF converter for professional print layout using a native Chromium print engine and Ghostscript.",
   author: "itlackey",
   license: "MPL-2.0",
@@ -6184,11 +6214,9 @@ var check22 = {
 };
 registerCheck(check22);
 
-// src/checks/asset/image-file-size.ts
-import { stat as stat3 } from "node:fs/promises";
-
-// src/lib/image-inspect.ts
-import { stat as stat2, readFile as readFile18 } from "node:fs/promises";
+// src/checks/source/merge-markers.ts
+import { readFile as readFile18 } from "node:fs/promises";
+import path6 from "node:path";
 
 // src/checks/asset/extensions.ts
 var RASTER_INSPECTABLE_EXTS = [
@@ -6211,27 +6239,108 @@ var ASSET_SCAN_IGNORE_GLOBS = [
   "**/dist/**"
 ];
 
+// src/checks/source/merge-markers.ts
+var OPEN_SENTINEL = "<<<<<<< your version";
+var CLOSE_SENTINEL = ">>>>>>> online version";
+function withoutOnlineTag(relPath) {
+  return relPath.replace(/\.online(?=\.[^./]*$|$)/, "");
+}
+var check23 = {
+  id: "source.sync.merge-markers",
+  name: "Combined Versions",
+  description: "Finds passages and files still holding two versions (yours and the online copy) after a sync",
+  category: "source",
+  phase: "pre-build",
+  async run(ctx) {
+    const results = [];
+    const textFiles = [...ctx.markdownFiles ?? [], ...ctx.cssFiles ?? []].sort();
+    for (const file of textFiles) {
+      let content;
+      try {
+        content = await readFile18(file, "utf8");
+      } catch {
+        results.push(inspectionFailed(check23.id, `Could not read source file: ${file}`, { file }));
+        continue;
+      }
+      if (!content.includes(OPEN_SENTINEL) && !content.includes(CLOSE_SENTINEL))
+        continue;
+      let inBlock = false;
+      const lines = content.split(`
+`);
+      for (let i = 0;i < lines.length; i++) {
+        const line = lines[i].endsWith("\r") ? lines[i].slice(0, -1) : lines[i];
+        if (line === OPEN_SENTINEL) {
+          inBlock = true;
+          results.push(finding(check23.id, {
+            severity: "error",
+            code: "two-versions-passage",
+            message: "This passage has two versions (yours and the online copy) — keep what you want, then delete the marker lines.",
+            file,
+            line: i + 1
+          }));
+        } else if (line === CLOSE_SENTINEL) {
+          if (!inBlock) {
+            results.push(finding(check23.id, {
+              severity: "error",
+              code: "leftover-version-marker",
+              message: "This marker line is left over from combining two versions — delete it.",
+              file,
+              line: i + 1
+            }));
+          }
+          inBlock = false;
+        }
+      }
+    }
+    try {
+      const { glob } = await import("glob");
+      const siblings = await glob(["**/*.online", "**/*.online.*"], {
+        cwd: ctx.inputDir,
+        absolute: true,
+        ignore: [...ASSET_SCAN_IGNORE_GLOBS]
+      });
+      for (const sibling of siblings.sort()) {
+        const rel = path6.relative(ctx.inputDir, sibling).split(path6.sep).join("/");
+        results.push(finding(check23.id, {
+          severity: "warning",
+          code: "kept-both-versions",
+          message: `Two versions of ${withoutOnlineTag(rel)} are in your project — keep the one you want, then delete the other.`,
+          file: sibling
+        }));
+      }
+    } catch (error2) {
+      results.push(inspectionFailed(check23.id, `Could not scan for kept-both files: ${error2 instanceof Error ? error2.message : String(error2)}`));
+    }
+    return results;
+  }
+};
+registerCheck(check23);
+
+// src/checks/asset/image-file-size.ts
+import { stat as stat3 } from "node:fs/promises";
+
 // src/lib/image-inspect.ts
+import { stat as stat2, readFile as readFile19 } from "node:fs/promises";
 var DEFAULT_DPI = 72;
 var cache = new Map;
-async function inspectImage(path6) {
+async function inspectImage(path7) {
   let st;
   try {
-    st = await stat2(path6);
+    st = await stat2(path7);
   } catch {
     return null;
   }
-  const hit = cache.get(path6);
+  const hit = cache.get(path7);
   if (hit && hit.mtimeMs === st.mtimeMs && hit.size === st.size)
     return hit.info;
   let info2 = null;
   try {
-    const buf = await readFile18(path6);
+    const buf = await readFile19(path7);
     info2 = parseImage(buf);
   } catch {
     info2 = null;
   }
-  cache.set(path6, { mtimeMs: st.mtimeMs, size: st.size, info: info2 });
+  cache.set(path7, { mtimeMs: st.mtimeMs, size: st.size, info: info2 });
   return info2;
 }
 function parseImage(b) {
@@ -6431,7 +6540,7 @@ async function collectImageFiles(dirs, exts, ignore = ASSET_SCAN_IGNORE_GLOBS) {
 }
 
 // src/checks/asset/image-file-size.ts
-var check23 = {
+var check24 = {
   id: "asset.image.file-size",
   name: "Image File Size",
   description: "Checks that image files do not exceed the maximum size limit",
@@ -6452,14 +6561,14 @@ var check23 = {
         if (info2.size > maxSize) {
           const sizeMb = (info2.size / 1e6).toFixed(1);
           const maxMb = (maxSize / 1e6).toFixed(1);
-          results.push(finding(check23.id, {
+          results.push(finding(check24.id, {
             severity: "warning",
             message: `Image file too large: ${sizeMb}MB (max ${maxMb}MB)`,
             file
           }));
         }
       } catch {
-        results.push(inspectionFailed(check23.id, `Could not stat image file: ${file}`, {
+        results.push(inspectionFailed(check24.id, `Could not stat image file: ${file}`, {
           file
         }));
       }
@@ -6467,10 +6576,10 @@ var check23 = {
     return results;
   }
 };
-registerCheck(check23);
+registerCheck(check24);
 
 // src/checks/asset/image-resolution.ts
-var check24 = {
+var check25 = {
   id: "asset.image.resolution",
   name: "Image Resolution",
   description: "Checks source image DPI from embedded density metadata",
@@ -6492,7 +6601,7 @@ var check24 = {
       const { xDpi, yDpi } = info2;
       if (xDpi > 0 && yDpi > 0 && (xDpi < minDpi || yDpi < minDpi)) {
         results.push({
-          checkId: check24.id,
+          checkId: check25.id,
           severity: "warning",
           message: `Image resolution too low: ${xDpi}x${yDpi} DPI (minimum ${minDpi} DPI)`,
           file
@@ -6502,7 +6611,7 @@ var check24 = {
     return results;
   }
 };
-registerCheck(check24);
+registerCheck(check25);
 
 // src/checks/asset/image-color-space.ts
 var LABEL = {
@@ -6510,7 +6619,7 @@ var LABEL = {
   gray: "Gray",
   cmyk: "CMYK"
 };
-var check25 = {
+var check26 = {
   id: "asset.image.color-space",
   name: "Image Color Space",
   description: "Validates image color spaces against allowed list",
@@ -6531,7 +6640,7 @@ var check25 = {
       const cs = info2?.colorSpace;
       if (cs && !allowedLower.has(cs)) {
         results.push({
-          checkId: check25.id,
+          checkId: check26.id,
           severity: "warning",
           message: `Image uses ${LABEL[cs] ?? cs} color space (allowed: ${allowed.join(", ")})`,
           file
@@ -6541,10 +6650,10 @@ var check25 = {
     return results;
   }
 };
-registerCheck(check25);
+registerCheck(check26);
 
 // src/checks/asset/image-alpha.ts
-var check26 = {
+var check27 = {
   id: "asset.image.alpha-channel",
   name: "Image Alpha Channel",
   description: "Checks for alpha channels in PNG/TIFF images",
@@ -6562,7 +6671,7 @@ var check26 = {
       const info2 = await inspectImage(file);
       if (info2?.hasAlpha) {
         results.push({
-          checkId: check26.id,
+          checkId: check27.id,
           severity: "warning",
           message: "Image contains alpha channel, which may cause print issues",
           file
@@ -6572,10 +6681,10 @@ var check26 = {
     return results;
   }
 };
-registerCheck(check26);
+registerCheck(check27);
 
 // src/checks/asset/image-tac.ts
-var check27 = {
+var check28 = {
   id: "asset.image.tac-raster",
   name: "Image TAC (Raster)",
   description: "Rasterizes and checks TAC per image using Ghostscript",
@@ -6594,7 +6703,7 @@ var check27 = {
     const ghostscript = await resolveGhostscript();
     if (!ghostscript) {
       return [
-        inspectionFailed(check27.id, "Could not inspect image ink coverage: Ghostscript executable not found")
+        inspectionFailed(check28.id, "Could not inspect image ink coverage: Ghostscript executable not found")
       ];
     }
     for (const file of files) {
@@ -6612,7 +6721,7 @@ var check27 = {
           if (nums.length === 4 && nums.every((n) => Number.isFinite(n))) {
             const tac = (nums[0] + nums[1] + nums[2] + nums[3]) * 100;
             if (tac > maxTac) {
-              results.push(finding(check27.id, {
+              results.push(finding(check28.id, {
                 severity: "warning",
                 message: `Image TAC exceeds limit: ${tac.toFixed(1)}% (max ${maxTac}%)`,
                 file,
@@ -6624,16 +6733,16 @@ var check27 = {
           }
         }
       } catch {
-        results.push(inspectionFailed(check27.id, `Could not inspect image ink coverage: ${file}`, { file }));
+        results.push(inspectionFailed(check28.id, `Could not inspect image ink coverage: ${file}`, { file }));
       }
     }
     return results;
   }
 };
-registerCheck(check27);
+registerCheck(check28);
 
 // src/checks/asset/approved-fonts.ts
-var check28 = {
+var check29 = {
   id: "asset.font.approved-files",
   name: "Approved Font Files",
   description: "Checks font files against the approved file patterns",
@@ -6672,7 +6781,7 @@ var check28 = {
     for (const font of allFonts) {
       if (!approvedFonts.has(font)) {
         results.push({
-          checkId: check28.id,
+          checkId: check29.id,
           severity: "warning",
           message: "Font file not in approved list",
           file: font
@@ -6682,7 +6791,7 @@ var check28 = {
     return results;
   }
 };
-registerCheck(check28);
+registerCheck(check29);
 
 // src/checks/asset/font-license.ts
 import { existsSync as existsSync8 } from "node:fs";
@@ -6697,7 +6806,7 @@ var LICENSE_NAMES = [
   "OFL-1.1.txt",
   "COPYING"
 ];
-var check29 = {
+var check30 = {
   id: "asset.font.license",
   name: "Font License",
   description: "Checks for license files in font directories",
@@ -6724,7 +6833,7 @@ var check29 = {
       const hasLicense = LICENSE_NAMES.some((name) => existsSync8(resolve7(fontDir, name)));
       if (!hasLicense) {
         results.push({
-          checkId: check29.id,
+          checkId: check30.id,
           severity: "warning",
           message: `No font license file found in directory`,
           file: fontDir
@@ -6734,10 +6843,10 @@ var check29 = {
     return results;
   }
 };
-registerCheck(check29);
+registerCheck(check30);
 
 // src/checks/heuristic/text-density.ts
-var check30 = {
+var check31 = {
   id: "heuristic.whitespace.text-density",
   name: "Text Density",
   description: "Checks characters-per-page ratio",
@@ -6766,7 +6875,7 @@ var check30 = {
     });
     if (lowPages.length > 0) {
       results.push({
-        checkId: check30.id,
+        checkId: check31.id,
         severity: "info",
         message: `Low text density on pages: ${lowPages.join(", ")} (below ${range.min} chars)`,
         file: ctx.pdfPath
@@ -6774,7 +6883,7 @@ var check30 = {
     }
     if (highPages.length > 0) {
       results.push({
-        checkId: check30.id,
+        checkId: check31.id,
         severity: "info",
         message: `High text density on pages: ${highPages.join(", ")} (above ${range.max} chars)`,
         file: ctx.pdfPath
@@ -6783,11 +6892,11 @@ var check30 = {
     return results;
   }
 };
-registerCheck(check30);
+registerCheck(check31);
 
 // src/checks/heuristic/section-density.ts
-import { readFile as readFile19 } from "node:fs/promises";
-var check31 = {
+import { readFile as readFile20 } from "node:fs/promises";
+var check32 = {
   id: "heuristic.chunking.section-density",
   name: "Section Density",
   description: "Checks heading/paragraph/callout density from source Markdown",
@@ -6803,7 +6912,7 @@ var check31 = {
     const results = [];
     for (const file of files) {
       try {
-        const content = await readFile19(file, "utf8");
+        const content = await readFile20(file, "utf8");
         const lines = content.split(`
 `);
         let currentSectionStart = 0;
@@ -6813,7 +6922,7 @@ var check31 = {
           const line = lines[i];
           if (/^#{1,6}\s/.test(line)) {
             if (paragraphCount > maxParas) {
-              results.push(finding(check31.id, {
+              results.push(finding(check32.id, {
                 severity: "info",
                 message: `Section has ${paragraphCount} paragraphs (max recommended: ${maxParas})`,
                 file,
@@ -6833,7 +6942,7 @@ var check31 = {
           }
         }
         if (paragraphCount > maxParas) {
-          results.push(finding(check31.id, {
+          results.push(finding(check32.id, {
             severity: "info",
             message: `Section has ${paragraphCount} paragraphs (max recommended: ${maxParas})`,
             file,
@@ -6841,7 +6950,7 @@ var check31 = {
           }));
         }
       } catch {
-        results.push(inspectionFailed(check31.id, `Could not read source file: ${file}`, {
+        results.push(inspectionFailed(check32.id, `Could not read source file: ${file}`, {
           file
         }));
       }
@@ -6849,10 +6958,10 @@ var check31 = {
     return results;
   }
 };
-registerCheck(check31);
+registerCheck(check32);
 
 // src/checks/heuristic/layer-count.ts
-var check32 = {
+var check33 = {
   id: "heuristic.decoration.layer-count",
   name: "Layer Count",
   description: "Counts image objects per page",
@@ -6877,7 +6986,7 @@ var check32 = {
       heavyPages.sort((a, b) => a - b);
       return [
         {
-          checkId: check32.id,
+          checkId: check33.id,
           severity: "info",
           message: `Pages with many image layers (>${maxLayers}): ${heavyPages.join(", ")}`,
           file: ctx.pdfPath
@@ -6887,10 +6996,10 @@ var check32 = {
     return [];
   }
 };
-registerCheck(check32);
+registerCheck(check33);
 
 // src/checks/heuristic/placement-variance.ts
-var check33 = {
+var check34 = {
   id: "heuristic.layout.placement-variance",
   name: "Placement Variance",
   description: "Analyzes text baseline coordinates for layout consistency",
@@ -6908,7 +7017,7 @@ var check33 = {
     const uniqueX = new Set(positions.map((p) => Math.round(p.x)));
     return [
       {
-        checkId: check33.id,
+        checkId: check34.id,
         severity: "info",
         message: `Layout analysis: ${uniqueX.size} unique horizontal text positions across ${positions.length} text blocks.`,
         file: ctx.pdfPath
@@ -6916,7 +7025,7 @@ var check33 = {
     ];
   }
 };
-registerCheck(check33);
+registerCheck(check34);
 
 // src/checks/runner.ts
 function getCheckSeverityOverride(checkId, config) {
@@ -6946,25 +7055,25 @@ async function runChecks(ctx, opts = {}) {
   }
   const release = retainPdfCache();
   try {
-    for (const check34 of checks2) {
+    for (const check35 of checks2) {
       try {
-        const results = await check34.run(ctx);
-        const severityOverride = getCheckSeverityOverride(check34.id, ctx.config);
+        const results = await check35.run(ctx);
+        const severityOverride = getCheckSeverityOverride(check35.id, ctx.config);
         if (severityOverride) {
           for (const r of results) {
             r.severity = severityOverride;
           }
         }
         if (results.length === 0) {
-          passed.push(check34.id);
+          passed.push(check35.id);
         } else {
           allResults.push(...results);
         }
       } catch (err) {
         allResults.push({
-          checkId: check34.id,
+          checkId: check35.id,
           severity: "error",
-          message: `Check "${check34.id}" threw: ${err instanceof Error ? err.message : String(err)}`
+          message: `Check "${check35.id}" threw: ${err instanceof Error ? err.message : String(err)}`
         });
       }
     }
@@ -7004,15 +7113,15 @@ function emptyReport() {
 async function checkToolAvailability(config, opts = {}) {
   const { checks: checks2 } = selectChecks(opts, config);
   const toolToChecks = new Map;
-  for (const check34 of checks2) {
-    if (!check34.requiredTools?.length)
+  for (const check35 of checks2) {
+    if (!check35.requiredTools?.length)
       continue;
-    for (const tool of check34.requiredTools) {
+    for (const tool of check35.requiredTools) {
       const existing = toolToChecks.get(tool);
       if (existing) {
-        existing.push(check34.id);
+        existing.push(check35.id);
       } else {
-        toolToChecks.set(tool, [check34.id]);
+        toolToChecks.set(tool, [check35.id]);
       }
     }
   }
@@ -7028,11 +7137,11 @@ async function checkToolAvailability(config, opts = {}) {
   const missing = results.filter((r) => !r.found).map((r) => r.tool);
   const missingSet = new Set(missing);
   const skippedChecks = [];
-  for (const check34 of checks2) {
-    if (!check34.requiredTools?.length)
+  for (const check35 of checks2) {
+    if (!check35.requiredTools?.length)
       continue;
-    if (check34.requiredTools.some((t) => missingSet.has(t))) {
-      skippedChecks.push(check34.id);
+    if (check35.requiredTools.some((t) => missingSet.has(t))) {
+      skippedChecks.push(check35.id);
     }
   }
   return { available, missing, skippedChecks, toolToChecks };
@@ -7435,7 +7544,7 @@ function computeGates(format, opts, config) {
 }
 
 // src/lib/build-staging.ts
-import path6 from "node:path";
+import path7 from "node:path";
 import os from "node:os";
 import fsp from "node:fs/promises";
 
@@ -7618,8 +7727,8 @@ function placeholderPng(width = 640, height = 480, cell = 32) {
 
 // src/lib/build-staging.ts
 async function shipViewerHtml(htmlFile, outDir) {
-  await fsp.mkdir(path6.join(outDir, "engine"), { recursive: true });
-  await fsp.copyFile(await getAssetPath("engine/gutterpress-viewer.js"), path6.join(outDir, "engine/gutterpress-viewer.js"));
+  await fsp.mkdir(path7.join(outDir, "engine"), { recursive: true });
+  await fsp.copyFile(await getAssetPath("engine/gutterpress-viewer.js"), path7.join(outDir, "engine/gutterpress-viewer.js"));
   const tag = `  <script src="engine/gutterpress-viewer.js"></script>
 `;
   const html = await fsp.readFile(htmlFile, "utf-8");
@@ -7648,18 +7757,18 @@ async function stageBookAssets(options) {
   return { missing: [...missingPlaceholders.keys()].sort() };
 }
 async function copyReferencedAssets(copies, outDir) {
-  const dirs = new Set(copies.map((c) => path6.dirname(path6.resolve(outDir, c.to))));
+  const dirs = new Set(copies.map((c) => path7.dirname(path7.resolve(outDir, c.to))));
   await Promise.all([...dirs].map((d) => fsp.mkdir(d, { recursive: true })));
   const missing = new Map;
   await Promise.all(copies.map(async (c) => {
-    const dest = path6.resolve(outDir, c.to);
+    const dest = path7.resolve(outDir, c.to);
     try {
       await fsp.copyFile(c.from, dest);
     } catch (err) {
       if (err?.code === "ENOENT") {
         const placeholder = placeholderOutputPath(c.to);
-        const placeholderDest = path6.resolve(outDir, placeholder);
-        await fsp.mkdir(path6.dirname(placeholderDest), { recursive: true });
+        const placeholderDest = path7.resolve(outDir, placeholder);
+        await fsp.mkdir(path7.dirname(placeholderDest), { recursive: true });
         await fsp.writeFile(placeholderDest, placeholderPng());
         missing.set(c.to, placeholder);
         return;
@@ -7670,7 +7779,7 @@ async function copyReferencedAssets(copies, outDir) {
   return missing;
 }
 async function createStageRoot() {
-  return fsp.mkdtemp(path6.join(os.tmpdir(), "gutterpress-stage-"));
+  return fsp.mkdtemp(path7.join(os.tmpdir(), "gutterpress-stage-"));
 }
 
 // src/lib/build-runner.ts
@@ -7678,18 +7787,18 @@ function splitOutPath(outArg, format) {
   if (typeof outArg !== "string" || outArg.length === 0) {
     return { outDir: undefined, pdfFileOverride: null };
   }
-  const resolved = path7.resolve(outArg);
+  const resolved = path8.resolve(outArg);
   if ((format === "pdf" || format === "pdfx") && resolved.toLowerCase().endsWith(".pdf")) {
-    return { outDir: path7.dirname(resolved), pdfFileOverride: resolved };
+    return { outDir: path8.dirname(resolved), pdfFileOverride: resolved };
   }
   return { outDir: resolved, pdfFileOverride: null };
 }
 function layoutWarningKey(file, line, message) {
-  return `${path7.resolve(file)}\x00${line ?? 0}\x00${message}`;
+  return `${path8.resolve(file)}\x00${line ?? 0}\x00${message}`;
 }
 async function resolveBuildContext(opts) {
   const { format } = opts;
-  const inputDir = path7.resolve(opts.inputDir);
+  const inputDir = path8.resolve(opts.inputDir);
   const { manifest, manifestDir, manifestPath } = await loadManifestWithPath(opts.manifestPath ?? inputDir, { explicit: opts.manifestPath !== undefined });
   if (manifestPath === null) {
     throw new UsageError(`No project manifest found in ${inputDir}. Looked for ${MANIFEST_FILENAMES.join(" or ")}. ` + "Run from your project folder or pass that folder with `gutterpress build <project-dir>`. " + "For a custom manifest filename, pass `--manifest <path>`.");
@@ -7704,10 +7813,10 @@ async function resolveBuildContext(opts) {
     pdfx: pdfxConfigOverride,
     engine: opts.engine
   }, manifest);
-  const target = opts.pdfFileOverride ? { kind: "file", file: path7.resolve(opts.pdfFileOverride) } : opts.outDir ? { kind: "directory", dir: opts.outDir } : { kind: "project", dir: resolveOutputDir(manifestDir, config.title) };
-  const outDir = target.kind === "file" ? path7.dirname(target.file) : target.dir;
+  const target = opts.pdfFileOverride ? { kind: "file", file: path8.resolve(opts.pdfFileOverride) } : opts.outDir ? { kind: "directory", dir: opts.outDir } : { kind: "project", dir: resolveOutputDir(manifestDir, config.title) };
+  const outDir = target.kind === "file" ? path8.dirname(target.file) : target.dir;
   const gates = computeGates(format, opts, config);
-  const workDir = target.kind === "project" ? path7.join(path7.dirname(target.dir), `.${path7.basename(target.dir)}-build-${randomBytes(6).toString("hex")}`) : path7.join(os2.tmpdir(), `gutterpress-build-${randomBytes(6).toString("hex")}`);
+  const workDir = target.kind === "project" ? path8.join(path8.dirname(target.dir), `.${path8.basename(target.dir)}-build-${randomBytes(6).toString("hex")}`) : path8.join(os2.tmpdir(), `gutterpress-build-${randomBytes(6).toString("hex")}`);
   return {
     opts,
     format,
@@ -7774,7 +7883,7 @@ async function renderBook(ctx) {
     pluginCss,
     onChapterWarnings: (file, warnings) => {
       for (const w of warnings) {
-        const key = layoutWarningKey(path7.resolve(renderDir, file), w.line, w.message);
+        const key = layoutWarningKey(path8.resolve(renderDir, file), w.line, w.message);
         if (!ctx.prevalidatedLayoutWarningKeys.has(key)) {
           log.warn(`  ${file}, line ${w.line}: ${w.message}`);
         }
@@ -7812,9 +7921,9 @@ async function renderBook(ctx) {
   return htmlFile;
 }
 async function resolveIccProfile(icc, manifestDir, explicitIccPath) {
-  const iccCandidates = path7.isAbsolute(icc) ? [icc] : [path7.resolve(manifestDir, icc), path7.resolve(icc)];
+  const iccCandidates = path8.isAbsolute(icc) ? [icc] : [path8.resolve(manifestDir, icc), path8.resolve(icc)];
   let effectiveIccPath = iccCandidates.find((candidate) => fs2.existsSync(candidate)) ?? null;
-  if (!effectiveIccPath && !explicitIccPath && path7.basename(icc) === "CGATS21_CRPC1.icc") {
+  if (!effectiveIccPath && !explicitIccPath && path8.basename(icc) === "CGATS21_CRPC1.icc") {
     effectiveIccPath = await getAssetPath("profiles/CGATS21_CRPC1.icc");
   }
   if (!effectiveIccPath) {
@@ -7830,13 +7939,13 @@ async function finalizeBuild(ctx, fingerprint, wroteMessage, paths, artifactName
   });
   await publishBuild(ctx, artifactName2);
   const delivered = ctx.target.kind !== "file";
-  const fingerprintPath = delivered ? path7.join(ctx.outDir, path7.basename(workFingerprint)) : null;
+  const fingerprintPath = delivered ? path8.join(ctx.outDir, path8.basename(workFingerprint)) : null;
   log.success(wroteMessage);
   if (fingerprintPath)
     log.info(`Fingerprint: ${fingerprintPath}`);
   return {
     outDir: ctx.outDir,
-    htmlPath: delivered ? path7.join(ctx.outDir, path7.relative(ctx.workDir, paths.htmlPath)) : null,
+    htmlPath: delivered ? path8.join(ctx.outDir, path8.relative(ctx.workDir, paths.htmlPath)) : null,
     pdfPath: paths.pdfPath,
     fingerprintPath,
     diagnostics
@@ -7847,8 +7956,8 @@ async function publishBuild(ctx, artifactName2) {
   if (target.kind === "file") {
     if (!artifactName2)
       throw new BuildError("No artifact to write for this format", 1);
-    await fsp2.mkdir(path7.dirname(target.file), { recursive: true });
-    await fsp2.copyFile(path7.join(workDir, artifactName2), target.file);
+    await fsp2.mkdir(path8.dirname(target.file), { recursive: true });
+    await fsp2.copyFile(path8.join(workDir, artifactName2), target.file);
     return;
   }
   if (target.kind === "directory") {
@@ -7857,12 +7966,12 @@ async function publishBuild(ctx, artifactName2) {
     return;
   }
   for (const name of await listPdfs(target.dir)) {
-    if (!fs2.existsSync(path7.join(workDir, name))) {
-      await fsp2.rename(path7.join(target.dir, name), path7.join(workDir, name));
+    if (!fs2.existsSync(path8.join(workDir, name))) {
+      await fsp2.rename(path8.join(target.dir, name), path8.join(workDir, name));
     }
   }
   await fsp2.rm(target.dir, { recursive: true, force: true });
-  await fsp2.mkdir(path7.dirname(target.dir), { recursive: true });
+  await fsp2.mkdir(path8.dirname(target.dir), { recursive: true });
   await fsp2.rename(workDir, target.dir);
 }
 async function listPdfs(dir) {
@@ -7878,7 +7987,7 @@ class HtmlOutput {
     const { workDir, outDir, inputDir, config, opts } = ctx;
     log.info("Shipping self-contained HTML + viewer bundle (native engine)");
     await shipViewerHtml(htmlFile, workDir);
-    await fsp2.writeFile(path7.join(workDir, "index.html"), `<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="refresh" content="0;url=book.html"><title>Gutterpress</title></head><body></body></html>
+    await fsp2.writeFile(path8.join(workDir, "index.html"), `<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="refresh" content="0;url=book.html"><title>Gutterpress</title></head><body></body></html>
 `, "utf-8");
     return finalizeBuild(ctx, {
       command: "build",
@@ -7891,7 +8000,7 @@ class HtmlOutput {
         iccPath: null,
         stripAnnotations: null
       }
-    }, `Wrote: ${path7.join(outDir, BOOK_HTML)}`, { htmlPath: htmlFile, pdfPath: null });
+    }, `Wrote: ${path8.join(outDir, BOOK_HTML)}`, { htmlPath: htmlFile, pdfPath: null });
   }
 }
 
@@ -7900,14 +8009,14 @@ class PdfOutput {
     const { workDir, outDir, inputDir, config, opts, format, manifestDir, gates } = ctx;
     const pdfxMode = format === "pdfx" ? opts.pdfxFlavor ?? config.pdfx.flavor : undefined;
     const pdfName = artifactName(config.title, pdfxMode ? "pdfx" : "pdf");
-    const pdfFile = path7.join(workDir, pdfName);
-    const reportedPdf = ctx.target.kind === "file" ? ctx.target.file : path7.join(outDir, pdfName);
+    const pdfFile = path8.join(workDir, pdfName);
+    const reportedPdf = ctx.target.kind === "file" ? ctx.target.file : path8.join(outDir, pdfName);
     const stage = await createStageRoot();
     try {
-      const rawPdf = pdfxMode ? path7.join(stage, "raw.pdf") : path7.resolve(pdfFile);
-      await fsp2.mkdir(path7.dirname(path7.resolve(pdfFile)), { recursive: true });
+      const rawPdf = pdfxMode ? path8.join(stage, "raw.pdf") : path8.resolve(pdfFile);
+      await fsp2.mkdir(path8.dirname(path8.resolve(pdfFile)), { recursive: true });
       log.info("Rendering HTML to PDF via the Gutterpress engine (native Chromium pagination)");
-      const { buildNativePdf } = await import("./engine-b159tbns.js");
+      const { buildNativePdf } = await import("./engine-8kdwy0jz.js");
       const engineDiagnostics = await buildNativePdf(htmlFile, rawPdf, {
         title: config.title,
         author: config.authors.length > 0 ? config.authors.join(", ") : undefined,
@@ -7938,7 +8047,7 @@ class PdfOutput {
           await stripAnnotations(rawPdf, stage);
         }
         log.info(`Converting to CMYK PDF/X (${pdfxMode})`);
-        await convertToPdfxCmyk(rawPdf, path7.resolve(pdfFile), {
+        await convertToPdfxCmyk(rawPdf, path8.resolve(pdfFile), {
           iccPath: effectiveIccPath,
           pdfx: pdfxMode,
           title: config.title,
@@ -7998,10 +8107,10 @@ async function runBuild(opts) {
   }
 }
 // src/preview/lifecycle.ts
-import path9 from "path";
+import path10 from "path";
 import { tmpdir as tmpdir2 } from "os";
 import { randomBytes as randomBytes2 } from "crypto";
-import { readdir as readdir5, readFile as readFile20, writeFile as writeFile5 } from "node:fs/promises";
+import { readdir as readdir5, readFile as readFile21, writeFile as writeFile5 } from "node:fs/promises";
 
 // src/utils/file-utils.ts
 import { promises as fs3 } from "fs";
@@ -8023,7 +8132,7 @@ async function mkdir4(dirPath) {
 // src/preview/file-watcher.ts
 import { watch } from "chokidar";
 import fsp3 from "node:fs/promises";
-import path8 from "path";
+import path9 from "path";
 var EMPTY_BOOK_HTML = `<!doctype html>
 <html lang="en">
 <head>
@@ -8076,7 +8185,7 @@ function injectPreviewScripts(html, pageIsolateChapters) {
 async function generateAndWriteHtml(inputPath, tempDir, config, cssAssets) {
   if (!inputPath) {
     cssAssets.clear();
-    await fsp3.writeFile(path8.join(tempDir, BOOK_HTML_FILENAME), EMPTY_BOOK_HTML, "utf-8");
+    await fsp3.writeFile(path9.join(tempDir, BOOK_HTML_FILENAME), EMPTY_BOOK_HTML, "utf-8");
     return;
   }
   const nextAssets = new Map;
@@ -8091,7 +8200,7 @@ async function generateAndWriteHtml(inputPath, tempDir, config, cssAssets) {
   cssAssets.clear();
   for (const [to, from] of nextAssets)
     cssAssets.set(to, from);
-  await fsp3.writeFile(path8.join(tempDir, BOOK_HTML_FILENAME), injectPreviewScripts(html, false), "utf-8");
+  await fsp3.writeFile(path9.join(tempDir, BOOK_HTML_FILENAME), injectPreviewScripts(html, false), "utf-8");
 }
 async function renderChapterPreviewHtml(inputPath, file, config) {
   const html = await renderPreviewBook(inputPath, config, {
@@ -8103,12 +8212,12 @@ async function renderChapterPreviewHtml(inputPath, file, config) {
 function describeChanges(changes, inputResolved) {
   const files = [];
   for (const [changedPath, event] of changes) {
-    const relative2 = path8.relative(inputResolved, path8.resolve(changedPath));
-    if (relative2 === "" || relative2 === ".." || relative2.startsWith(`..${path8.sep}`) || path8.isAbsolute(relative2))
+    const relative2 = path9.relative(inputResolved, path9.resolve(changedPath));
+    if (relative2 === "" || relative2 === ".." || relative2.startsWith(`..${path9.sep}`) || path9.isAbsolute(relative2))
       continue;
     files.push({
       relativePath: canonicalChapterId(relative2),
-      ext: path8.extname(changedPath).toLowerCase(),
+      ext: path9.extname(changedPath).toLowerCase(),
       event
     });
   }
@@ -8160,23 +8269,23 @@ function isIgnoredWatchPath(candidatePath, projectRoot) {
   return isDotPathUnderRoot(candidatePath, projectRoot) || isGeneratedProjectPath(relative2);
 }
 function isExternalWatchCandidate(candidatePath, targets) {
-  const candidate = path8.resolve(candidatePath);
+  const candidate = path9.resolve(candidatePath);
   for (const rawTarget of targets) {
-    const target = path8.resolve(rawTarget);
-    const rel = path8.relative(candidate, target);
-    if (rel === "" || rel !== ".." && !rel.startsWith(`..${path8.sep}`) && !path8.isAbsolute(rel))
+    const target = path9.resolve(rawTarget);
+    const rel = path9.relative(candidate, target);
+    if (rel === "" || rel !== ".." && !rel.startsWith(`..${path9.sep}`) && !path9.isAbsolute(rel))
       return true;
   }
   return false;
 }
 async function nearestExistingDirectory(start) {
-  let current = path8.resolve(start);
+  let current = path9.resolve(start);
   while (true) {
     try {
       if ((await fsp3.stat(current)).isDirectory())
         return current;
     } catch {}
-    const parent = path8.dirname(current);
+    const parent = path9.dirname(current);
     if (parent === current)
       return current;
     current = parent;
@@ -8185,12 +8294,12 @@ async function nearestExistingDirectory(start) {
 async function externalWatchRoots(targets) {
   const roots = new Set;
   for (const target of targets) {
-    roots.add(await nearestExistingDirectory(path8.dirname(path8.resolve(target))));
+    roots.add(await nearestExistingDirectory(path9.dirname(path9.resolve(target))));
   }
   return [...roots];
 }
 async function externalWatchTargets(projectDir, config) {
-  const root = path8.resolve(projectDir);
+  const root = path9.resolve(projectDir);
   let canonicalRoot = root;
   try {
     canonicalRoot = await fsp3.realpath(root);
@@ -8198,21 +8307,21 @@ async function externalWatchTargets(projectDir, config) {
   const styles = await resolveActiveStyles(root, config.styles);
   const candidates = [
     ...await collectStyleDependencies(root, styles),
-    ...(config.plugins ?? []).map((p) => p.path).filter((p) => !!p).map((p) => path8.resolve(root, p))
+    ...(config.plugins ?? []).map((p) => p.path).filter((p) => !!p).map((p) => path9.resolve(root, p))
   ];
   const external = new Set;
   for (const abs of candidates) {
-    const authoredPath = path8.resolve(abs);
-    const authoredRel = path8.relative(root, authoredPath);
-    if (authoredRel !== "" && (authoredRel === ".." || authoredRel.startsWith(`..${path8.sep}`) || path8.isAbsolute(authoredRel))) {
+    const authoredPath = path9.resolve(abs);
+    const authoredRel = path9.relative(root, authoredPath);
+    if (authoredRel !== "" && (authoredRel === ".." || authoredRel.startsWith(`..${path9.sep}`) || path9.isAbsolute(authoredRel))) {
       external.add(authoredPath);
     }
     let canonicalPath = authoredPath;
     try {
       canonicalPath = await fsp3.realpath(canonicalPath);
     } catch {}
-    const rel = path8.relative(canonicalRoot, canonicalPath);
-    if (rel === "" || rel !== ".." && !rel.startsWith(`..${path8.sep}`) && !path8.isAbsolute(rel))
+    const rel = path9.relative(canonicalRoot, canonicalPath);
+    if (rel === "" || rel !== ".." && !rel.startsWith(`..${path9.sep}`) && !path9.isAbsolute(rel))
       continue;
     external.add(canonicalPath);
   }
@@ -8239,7 +8348,7 @@ async function addAndAwaitWatch(watcher, roots) {
   }
 }
 function createFileWatcher(state) {
-  const inputResolved = path8.resolve(state.currentInputPath);
+  const inputResolved = path9.resolve(state.currentInputPath);
   const watcher = watch(inputResolved, {
     persistent: true,
     ignoreInitial: true,
@@ -8279,7 +8388,7 @@ function createFileWatcher(state) {
   async function recordChange(event, filePath) {
     if (closed)
       return;
-    const target = path8.resolve(filePath);
+    const target = path9.resolve(filePath);
     const settled = settledWrites.get(target);
     if (settled && event !== "unlink" && Date.now() <= settled.expiresAt) {
       const diskContent = await fsp3.readFile(target, "utf8").catch(() => null);
@@ -8300,7 +8409,7 @@ function createFileWatcher(state) {
     recordChange(event, filePath);
   });
   externalWatcher.on("all", (event, filePath) => {
-    const target = path8.resolve(filePath);
+    const target = path9.resolve(filePath);
     if (!desiredExternals.has(target))
       return;
     if (event === "add" && suppressInitialExternalAdds.delete(target))
@@ -8308,8 +8417,8 @@ function createFileWatcher(state) {
     recordChange(event, target);
   });
   function isWatchedSource(target) {
-    const rel = path8.relative(inputResolved, target);
-    const inProject = rel === "" || rel !== ".." && !rel.startsWith(`..${path8.sep}`) && !path8.isAbsolute(rel);
+    const rel = path9.relative(inputResolved, target);
+    const inProject = rel === "" || rel !== ".." && !rel.startsWith(`..${path9.sep}`) && !path9.isAbsolute(rel);
     if (inProject)
       return !isIgnoredWatchPath(target, inputResolved);
     return desiredExternals.has(target);
@@ -8334,7 +8443,7 @@ function createFileWatcher(state) {
   state.notifySettledWrite = (filePath, writtenContent) => {
     if (closed)
       return;
-    const target = path8.resolve(filePath);
+    const target = path9.resolve(filePath);
     if (isWatchedSource(target)) {
       acceptSettledWrite(target, writtenContent);
       return;
@@ -8355,7 +8464,7 @@ function createFileWatcher(state) {
       return;
     let nextTargets;
     try {
-      nextTargets = new Set((await externalWatchTargets(inputResolved, state.config)).map((target) => path8.resolve(target)));
+      nextTargets = new Set((await externalWatchTargets(inputResolved, state.config)).map((target) => path9.resolve(target)));
     } catch (err) {
       debug(`Could not resolve external watch targets: ${err}`);
       return;
@@ -8487,7 +8596,7 @@ async function stopFileWatcher(state) {
 }
 
 // src/preview/lifecycle.ts
-var TEMP_DIR_BASE = path9.join(tmpdir2(), "gutterpress-preview");
+var TEMP_DIR_BASE = path10.join(tmpdir2(), "gutterpress-preview");
 var PID_FILE_NAME = ".gutterpress.pid";
 function isProcessAlive(pid) {
   if (!Number.isFinite(pid) || pid <= 0)
@@ -8507,10 +8616,10 @@ async function cleanupOrphanTempDirs() {
     return;
   }
   for (const entry of entries) {
-    const dir = path9.join(TEMP_DIR_BASE, entry);
-    const pidFile = path9.join(dir, PID_FILE_NAME);
+    const dir = path10.join(TEMP_DIR_BASE, entry);
+    const pidFile = path10.join(dir, PID_FILE_NAME);
     try {
-      const raw = await readFile20(pidFile, "utf8");
+      const raw = await readFile21(pidFile, "utf8");
       const pid = parseInt(raw.trim(), 10);
       if (!isProcessAlive(pid)) {
         debug(`Removing orphan temp dir ${dir} (pid ${pid} not alive)`);
@@ -8522,10 +8631,10 @@ async function cleanupOrphanTempDirs() {
 async function initializePreviewDirectories() {
   await cleanupOrphanTempDirs();
   const tempDirSuffix = randomBytes2(8).toString("hex");
-  const tempDir = path9.join(TEMP_DIR_BASE, tempDirSuffix);
+  const tempDir = path10.join(TEMP_DIR_BASE, tempDirSuffix);
   await mkdir4(tempDir);
   debug(`Created temporary directory: ${tempDir}`);
-  await writeFile5(path9.join(tempDir, PID_FILE_NAME), `${process.pid}
+  await writeFile5(path10.join(tempDir, PID_FILE_NAME), `${process.pid}
 `, "utf8");
   return tempDir;
 }
@@ -8616,8 +8725,8 @@ function createServerState(inputPath, tempDir, config, options) {
 import http from "node:http";
 import net from "node:net";
 import { createHash as createHash6, randomUUID } from "node:crypto";
-import { readFile as readFile21, stat as stat4 } from "node:fs/promises";
-import path11 from "path";
+import { readFile as readFile22, stat as stat4 } from "node:fs/promises";
+import path12 from "path";
 import { WebSocket, WebSocketServer } from "ws";
 
 // src/lib/open-path.ts
@@ -8649,7 +8758,7 @@ function openPath(filePath) {
 }
 
 // src/lib/static-serve.ts
-import path10 from "node:path";
+import path11 from "node:path";
 var STATIC_MIME = {
   ".html": "text/html; charset=utf-8",
   ".htm": "text/html; charset=utf-8",
@@ -8671,9 +8780,9 @@ var STATIC_MIME = {
   ".otf": "font/otf"
 };
 function resolveWithinRoot(relPath, root) {
-  const resolvedRoot = path10.resolve(root);
-  const candidate = path10.resolve(resolvedRoot, "." + (relPath.startsWith("/") ? relPath : "/" + relPath));
-  if (candidate !== resolvedRoot && !candidate.startsWith(resolvedRoot + path10.sep)) {
+  const resolvedRoot = path11.resolve(root);
+  const candidate = path11.resolve(resolvedRoot, "." + (relPath.startsWith("/") ? relPath : "/" + relPath));
+  if (candidate !== resolvedRoot && !candidate.startsWith(resolvedRoot + path11.sep)) {
     return null;
   }
   return candidate;
@@ -8926,7 +9035,7 @@ async function serveStatic(absPath, res, cacheControl = "no-store", extraHeaders
   try {
     const s = await stat4(filePath);
     if (s.isDirectory())
-      filePath = path11.join(filePath, "index.html");
+      filePath = path12.join(filePath, "index.html");
   } catch {
     res.writeHead(404);
     res.end("Not Found");
@@ -8934,7 +9043,7 @@ async function serveStatic(absPath, res, cacheControl = "no-store", extraHeaders
   }
   let data;
   try {
-    data = await readFile21(filePath);
+    data = await readFile22(filePath);
   } catch {
     res.writeHead(404);
     res.end("Not Found");
@@ -8947,7 +9056,7 @@ async function serveStatic(absPath, res, cacheControl = "no-store", extraHeaders
     res.end(withHmr);
     return;
   }
-  const ct = STATIC_MIME[path11.extname(filePath).toLowerCase()] ?? "application/octet-stream";
+  const ct = STATIC_MIME[path12.extname(filePath).toLowerCase()] ?? "application/octet-stream";
   res.writeHead(200, { "Content-Type": ct, "Cache-Control": cacheControl, ...extraHeaders });
   res.end(data);
 }
@@ -8957,7 +9066,7 @@ var EMBEDDED_CACHE_CONTROL = "public, no-cache";
 var EMBEDDED_ETAG = `"gutterpress-${PACKAGE_VERSION}"`;
 var PROJECT_ASSET_CACHE_CONTROL = "private, no-cache";
 async function serveRevalidatedStatic(req, absPath, res, validators) {
-  const extension = path11.extname(absPath).toLowerCase();
+  const extension = path12.extname(absPath).toLowerCase();
   if (extension === ".html" || extension === ".htm") {
     await serveStatic(absPath, res);
     return;
@@ -8984,7 +9093,7 @@ async function serveRevalidatedStatic(req, absPath, res, validators) {
   let data;
   if (!validator || validator.stamp !== stamp) {
     try {
-      data = await readFile21(absPath);
+      data = await readFile22(absPath);
     } catch {
       await serveStatic(absPath, res);
       return;
@@ -9123,7 +9232,7 @@ async function createPreviewServer(state, port) {
       const file = rawFile ? canonicalChapterId(rawFile) : "";
       const revision = Number(url.searchParams.get("revision"));
       const configuredFiles = state.config.source?.files;
-      if (!file || !state.currentInputPath || !incrementalPreviewEnabled() || !Number.isSafeInteger(revision) || revision !== reloadRevision || path11.extname(file).toLowerCase() !== ".md" || hasDotSegment(file) || !resolveWithinRoot(file, state.currentInputPath) || Array.isArray(configuredFiles) && configuredFiles.length > 0 && !configuredFiles.some((configured) => canonicalChapterId(configured) === file)) {
+      if (!file || !state.currentInputPath || !incrementalPreviewEnabled() || !Number.isSafeInteger(revision) || revision !== reloadRevision || path12.extname(file).toLowerCase() !== ".md" || hasDotSegment(file) || !resolveWithinRoot(file, state.currentInputPath) || Array.isArray(configuredFiles) && configuredFiles.length > 0 && !configuredFiles.some((configured) => canonicalChapterId(configured) === file)) {
         res.writeHead(400);
         res.end("Bad Request");
         return;
@@ -9325,12 +9434,9 @@ async function startPreviewServer(options) {
 import { platform, arch, release } from "node:os";
 
 // src/lib/remote-auth/token-store.ts
-import { chmod, mkdir as mkdir5, readFile as readFile22, rename as rename2, writeFile as writeFile6 } from "node:fs/promises";
+import { chmod, mkdir as mkdir5, readFile as readFile23, rename as rename2, writeFile as writeFile6 } from "node:fs/promises";
 import os3 from "node:os";
-import path12 from "node:path";
-function redactCredential(cred) {
-  return { ...cred, token: "•••redacted•••" };
-}
+import path13 from "node:path";
 function credentialHostKey(hostOrUrl) {
   const trimmed = String(hostOrUrl ?? "").trim();
   if (!trimmed)
@@ -9357,22 +9463,22 @@ function defaultConfigDir() {
   if (override)
     return override;
   if (process.platform === "win32" && process.env.APPDATA) {
-    return path12.join(process.env.APPDATA, "gutterpress");
+    return path13.join(process.env.APPDATA, "gutterpress");
   }
   const xdg = process.env.XDG_CONFIG_HOME?.trim();
-  return path12.join(xdg || path12.join(os3.homedir(), ".config"), "gutterpress");
+  return path13.join(xdg || path13.join(os3.homedir(), ".config"), "gutterpress");
 }
 
 class FileTokenStore {
   filePath;
   queue = Promise.resolve();
   constructor(filePath) {
-    this.filePath = filePath ?? path12.join(defaultConfigDir(), "credentials.json");
+    this.filePath = filePath ?? path13.join(defaultConfigDir(), "credentials.json");
   }
   async read() {
     let raw;
     try {
-      raw = await readFile22(this.filePath, "utf8");
+      raw = await readFile23(this.filePath, "utf8");
     } catch (e) {
       if (e?.code === "ENOENT") {
         return { version: 1, credentials: {} };
@@ -9392,7 +9498,7 @@ class FileTokenStore {
     return { version: 1, credentials: {} };
   }
   async write(data) {
-    await mkdir5(path12.dirname(this.filePath), { recursive: true });
+    await mkdir5(path13.dirname(this.filePath), { recursive: true });
     const tmpPath = `${this.filePath}.${process.pid}.${Math.random().toString(36).slice(2)}.tmp`;
     await writeFile6(tmpPath, JSON.stringify(data, null, 2), {
       encoding: "utf8",
@@ -9470,13 +9576,6 @@ function extractUrlCredential(url) {
   };
   return { cleanUrl: parsed.toString(), credential };
 }
-async function migrateUrlCredential(url, store) {
-  const { cleanUrl, credential } = extractUrlCredential(url);
-  if (credential && !await store.get(credential.host)) {
-    await store.set(credential.host, credential);
-  }
-  return cleanUrl;
-}
 
 // src/lib/diagnostics.ts
 var INSTALL_HINTS3 = {
@@ -9548,18 +9647,18 @@ async function getSystemDiagnostics() {
         installHint: INSTALL_HINTS3[t.hintKey]
       };
     }
-    const [path13, available] = await Promise.all([
+    const [path14, available] = await Promise.all([
       findTool(t.bin),
       isToolAvailable(t.bin)
     ]);
-    const found = available || !!path13;
+    const found = available || !!path14;
     const version = found ? await getVersion(t.bin) : undefined;
     return {
       id: t.id,
       name: t.name,
       bin: t.bin,
       found,
-      path: path13,
+      path: path14,
       version,
       usedBy: t.usedBy,
       installHint: INSTALL_HINTS3[t.hintKey]
@@ -9579,25 +9678,25 @@ async function getSystemDiagnostics() {
   };
 }
 // src/lib/project-scaffold.ts
-import { access, copyFile, cp as cp2, mkdir as mkdir7, readdir as readdir6, readFile as readFile24, stat as stat5, writeFile as writeFile7 } from "node:fs/promises";
+import { access, copyFile, cp as cp2, mkdir as mkdir7, readdir as readdir6, readFile as readFile25, stat as stat5, writeFile as writeFile7 } from "node:fs/promises";
 import { constants as FS, existsSync as existsSync11 } from "node:fs";
-import path14 from "node:path";
+import path15 from "node:path";
 
 // src/lib/manifest-doc.ts
 import { existsSync as existsSync10 } from "node:fs";
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { mkdir as mkdir6, open, readFile as readFile23, rename as rename3, rm as rm2 } from "node:fs/promises";
-import path13 from "node:path";
+import { mkdir as mkdir6, open, readFile as readFile24, rename as rename3, rm as rm2 } from "node:fs/promises";
+import path14 from "node:path";
 import { parseDocument, isSeq, YAMLSeq } from "yaml";
 function resolveManifestPath(projectDir) {
-  const existing = MANIFEST_FILENAMES.find((name) => existsSync10(path13.join(projectDir, name)));
-  return path13.join(projectDir, existing ?? MANIFEST_FILENAMES[0]);
+  const existing = MANIFEST_FILENAMES.find((name) => existsSync10(path14.join(projectDir, name)));
+  return path14.join(projectDir, existing ?? MANIFEST_FILENAMES[0]);
 }
 async function loadManifestDoc(projectDir) {
   const file = resolveManifestPath(projectDir);
   let text = "";
   try {
-    text = await readFile23(file, "utf8");
+    text = await readFile24(file, "utf8");
   } catch (error2) {
     if (error2.code !== "ENOENT")
       throw error2;
@@ -9605,9 +9704,9 @@ async function loadManifestDoc(projectDir) {
   return { doc: parseDocument(text), file };
 }
 async function writeManifestDoc(file, doc) {
-  const dir = path13.dirname(file);
+  const dir = path14.dirname(file);
   await mkdir6(dir, { recursive: true });
-  const temporary = path13.join(dir, `.${path13.basename(file)}.tmp-${process.pid}-${randomUUID2()}`);
+  const temporary = path14.join(dir, `.${path14.basename(file)}.tmp-${process.pid}-${randomUUID2()}`);
   try {
     const handle = await open(temporary, "wx", 438);
     try {
@@ -9709,7 +9808,7 @@ async function scaffoldProject(options) {
     throw new CreateProjectErrorImpl("invalid-name", `Could not derive a valid folder name from "${name}".`);
   }
   const parentDir = options.parentDir;
-  if (!parentDir || !path14.isAbsolute(parentDir)) {
+  if (!parentDir || !path15.isAbsolute(parentDir)) {
     throw new CreateProjectErrorImpl("parent-not-writable", "The save location must be an absolute path.");
   }
   try {
@@ -9717,7 +9816,7 @@ async function scaffoldProject(options) {
   } catch {
     throw new CreateProjectErrorImpl("parent-not-writable", `The chosen save location can't be written to: ${parentDir}`);
   }
-  const projectDir = path14.join(parentDir, folderName);
+  const projectDir = path15.join(parentDir, folderName);
   let targetExists = true;
   try {
     await access(projectDir, FS.F_OK);
@@ -9738,19 +9837,19 @@ async function scaffoldProject(options) {
       for (const entry of entries) {
         if (entry.name === ".gutterpress-template.json")
           continue;
-        await cp2(path14.join(customTemplateDir, entry.name), path14.join(projectDir, entry.name), { recursive: true });
+        await cp2(path15.join(customTemplateDir, entry.name), path15.join(projectDir, entry.name), { recursive: true });
       }
-      await mkdir7(path14.join(projectDir, "assets"), { recursive: true });
+      await mkdir7(path15.join(projectDir, "assets"), { recursive: true });
     } else {
       const tplManifest = await getAssetPath(`templates/${template}/manifest.yaml`);
       const tplChapter = await getAssetPath(`templates/${template}/chapter-01.md`);
-      await mkdir7(path14.join(projectDir, "assets"), { recursive: true });
-      await copyFile(tplManifest, path14.join(projectDir, MANIFEST_FILENAMES[0]));
-      await copyFile(tplChapter, path14.join(projectDir, "chapter-01.md"));
+      await mkdir7(path15.join(projectDir, "assets"), { recursive: true });
+      await copyFile(tplManifest, path15.join(projectDir, MANIFEST_FILENAMES[0]));
+      await copyFile(tplChapter, path15.join(projectDir, "chapter-01.md"));
       const starterThemeId = STARTER_THEME_FOR_TEMPLATE[template] ?? "clean-book";
       const starterCss = await getAssetPath(`themes/${starterThemeId}/theme.css`);
-      await mkdir7(path14.join(projectDir, "styles"), { recursive: true });
-      await copyFile(starterCss, path14.join(projectDir, "styles", "book.css"));
+      await mkdir7(path15.join(projectDir, "styles"), { recursive: true });
+      await copyFile(starterCss, path15.join(projectDir, "styles", "book.css"));
     }
   } catch (e) {
     throw new CreateProjectErrorImpl("scaffold-io", `Could not create the project files: ${e instanceof Error ? e.message : String(e)}`);
@@ -9760,13 +9859,13 @@ async function scaffoldProject(options) {
   } catch (e) {
     throw new CreateProjectErrorImpl("scaffold-io", `Could not write .gitignore: ${e instanceof Error ? e.message : String(e)}`);
   }
-  const manifestPath = MANIFEST_FILENAMES.map((name2) => path14.join(projectDir, name2)).find(existsSync11) ?? path14.join(projectDir, MANIFEST_FILENAMES[0]);
+  const manifestPath = MANIFEST_FILENAMES.map((name2) => path15.join(projectDir, name2)).find(existsSync11) ?? path15.join(projectDir, MANIFEST_FILENAMES[0]);
   const author = (options.author ?? "").trim() || DEFAULT_AUTHOR;
   const substitutions = {
     "{{TITLE}}": escapeYamlScalar(name),
     "{{AUTHOR}}": escapeYamlScalar(author)
   };
-  let openFile = path14.join(projectDir, "chapter-01.md");
+  let openFile = path15.join(projectDir, "chapter-01.md");
   try {
     await fillTemplateFile(manifestPath, substitutions);
     if (preset) {
@@ -9787,7 +9886,7 @@ async function scaffoldProject(options) {
     }
     const firstSource = await firstSourceFile(manifestPath);
     if (firstSource)
-      openFile = path14.join(projectDir, firstSource);
+      openFile = path15.join(projectDir, firstSource);
     await fillTemplateFile(openFile, { "{{TITLE}}": name }).catch(() => {});
   } catch (e) {
     throw new CreateProjectErrorImpl("scaffold-io", `Could not finalise the project files: ${e instanceof Error ? e.message : String(e)}`);
@@ -9797,7 +9896,7 @@ async function scaffoldProject(options) {
   let versionHistoryError;
   if (requested === "local-git") {
     try {
-      const { providerFor } = await import("./source-provider-vanafrt9.js");
+      const { providerFor } = await import("./source-provider-kn41jmbs.js");
       const provider = providerFor({ type: "local-folder", path: projectDir });
       await provider.initVersionHistory({
         projectDir,
@@ -9809,7 +9908,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 ${path15.basename(enclosingRepoDir)}'s shared version history; save a snapshot to record it.` : e instanceof Error ? e.message : String(e);
     }
   }
   const result = {
@@ -9829,7 +9928,7 @@ function prettifyFolderName(base) {
 }
 async function adoptFolder(options) {
   const dir = options.dir;
-  if (typeof dir !== "string" || !path14.isAbsolute(dir)) {
+  if (typeof dir !== "string" || !path15.isAbsolute(dir)) {
     throw new CreateProjectErrorImpl("scaffold-io", "An absolute folder path is required.");
   }
   let st;
@@ -9841,11 +9940,11 @@ async function adoptFolder(options) {
   if (!st.isDirectory()) {
     throw new CreateProjectErrorImpl("scaffold-io", `Not a folder: ${dir}`);
   }
-  if (MANIFEST_FILENAMES.some((name) => existsSync11(path14.join(dir, name)))) {
+  if (MANIFEST_FILENAMES.some((name) => existsSync11(path15.join(dir, name)))) {
     throw new CreateProjectErrorImpl("target-exists", "This folder is already a Gutterpress project.");
   }
   const template = options.template ?? "book";
-  const title = (options.title ?? "").trim() || prettifyFolderName(path14.basename(dir));
+  const title = (options.title ?? "").trim() || prettifyFolderName(path15.basename(dir));
   const author = (options.author ?? "").trim() || DEFAULT_AUTHOR;
   let mdFiles;
   try {
@@ -9853,13 +9952,13 @@ async function adoptFolder(options) {
     mdFiles = entries.filter((e) => e.isFile() && /\.(md|markdown)$/i.test(e.name)).map((e) => e.name).sort((a, b) => a.localeCompare(b));
     if (mdFiles.length === 0) {
       const tplChapter = await getAssetPath(`templates/${template}/chapter-01.md`);
-      await copyFile(tplChapter, path14.join(dir, "chapter-01.md"));
-      await fillTemplateFile(path14.join(dir, "chapter-01.md"), { "{{TITLE}}": title }).catch(() => {});
+      await copyFile(tplChapter, path15.join(dir, "chapter-01.md"));
+      await fillTemplateFile(path15.join(dir, "chapter-01.md"), { "{{TITLE}}": title }).catch(() => {});
       mdFiles = ["chapter-01.md"];
     }
     const themeId = STARTER_THEME_FOR_TEMPLATE[template] ?? "clean-book";
-    await mkdir7(path14.join(dir, "styles"), { recursive: true });
-    const bookCssPath = path14.join(dir, "styles", "book.css");
+    await mkdir7(path15.join(dir, "styles"), { recursive: true });
+    const bookCssPath = path15.join(dir, "styles", "book.css");
     if (!existsSync11(bookCssPath)) {
       await copyFile(await getAssetPath(`themes/${themeId}/theme.css`), bookCssPath);
     }
@@ -9877,8 +9976,8 @@ ${filesYaml}
 styles:
   - styles/book.css
 `;
-    await writeFile7(path14.join(dir, MANIFEST_FILENAMES[0]), manifest, "utf8");
-    await mkdir7(path14.join(dir, "assets"), { recursive: true });
+    await writeFile7(path15.join(dir, MANIFEST_FILENAMES[0]), manifest, "utf8");
+    await mkdir7(path15.join(dir, "assets"), { recursive: true });
     await ensureGitignoreHasDist(dir);
   } catch (e) {
     if (e instanceof CreateProjectErrorImpl)
@@ -9890,7 +9989,7 @@ styles:
   let versionHistoryError;
   if (requested === "local-git") {
     try {
-      const { providerFor } = await import("./source-provider-vanafrt9.js");
+      const { providerFor } = await import("./source-provider-kn41jmbs.js");
       const provider = providerFor({ type: "local-folder", path: dir });
       await provider.initVersionHistory({
         projectDir: dir,
@@ -9905,8 +10004,8 @@ styles:
   }
   const result = {
     projectDir: dir,
-    manifestPath: path14.join(dir, MANIFEST_FILENAMES[0]),
-    openFile: path14.join(dir, mdFiles[0]),
+    manifestPath: path15.join(dir, MANIFEST_FILENAMES[0]),
+    openFile: path15.join(dir, mdFiles[0]),
     versionHistory
   };
   if (versionHistoryError !== undefined)
@@ -9914,10 +10013,10 @@ styles:
   return result;
 }
 async function ensureGitignoreHasDist(projectDir) {
-  const gitignorePath = path14.join(projectDir, ".gitignore");
+  const gitignorePath = path15.join(projectDir, ".gitignore");
   let existing = null;
   try {
-    existing = await readFile24(gitignorePath, "utf8");
+    existing = await readFile25(gitignorePath, "utf8");
   } catch {}
   if (existing === null) {
     await writeFile7(gitignorePath, `dist/
@@ -9937,7 +10036,7 @@ async function ensureGitignoreHasDist(projectDir) {
 async function firstSourceFile(manifestPath) {
   let text;
   try {
-    text = await readFile24(manifestPath, "utf8");
+    text = await readFile25(manifestPath, "utf8");
   } catch {
     return;
   }
@@ -9949,17 +10048,17 @@ async function firstSourceFile(manifestPath) {
   return m ? m[1].trim() : undefined;
 }
 async function fillTemplateFile(filePath, substitutions) {
-  let text = await readFile24(filePath, "utf8");
+  let text = await readFile25(filePath, "utf8");
   for (const [token, value] of Object.entries(substitutions)) {
     text = text.split(token).join(value);
   }
   await writeFile7(filePath, text, "utf8");
 }
 // src/lib/project-templates.ts
-import { cp as cp3, mkdir as mkdir8, readFile as readFile25, readdir as readdir7, stat as stat6, writeFile as writeFile8 } from "node:fs/promises";
+import { cp as cp3, mkdir as mkdir8, readFile as readFile26, readdir as readdir7, stat as stat6, writeFile as writeFile8 } from "node:fs/promises";
 import { constants as FS2, existsSync as existsSync12 } from "node:fs";
 import { access as access2 } from "node:fs/promises";
-import path15 from "node:path";
+import path16 from "node:path";
 import { isMap, isScalar, isSeq as isSeq2, parseDocument as parseDocument2 } from "yaml";
 var BUILT_IN_TEMPLATE_IDS = [
   "book",
@@ -9968,7 +10067,7 @@ var BUILT_IN_TEMPLATE_IDS = [
 ];
 async function readTemplateChoices(manifestPath) {
   try {
-    const text = await readFile25(manifestPath, "utf8");
+    const text = await readFile26(manifestPath, "utf8");
     const doc = parseDocument2(text);
     const out = {};
     const preset = doc.get("preset");
@@ -10043,7 +10142,7 @@ function rewriteEntry(node, newPath) {
     node.value = newPath;
 }
 function commonAncestorDir(absFiles) {
-  const dirSegs = absFiles.map((f) => path15.resolve(f).split(path15.sep).slice(0, -1));
+  const dirSegs = absFiles.map((f) => path16.resolve(f).split(path16.sep).slice(0, -1));
   if (dirSegs.length === 0)
     return "";
   let common = dirSegs[0];
@@ -10053,22 +10152,22 @@ function commonAncestorDir(absFiles) {
       i++;
     common = common.slice(0, i);
   }
-  return common.join(path15.sep) || path15.sep;
+  return common.join(path16.sep) || path16.sep;
 }
 function pickVendorDir(templateDir, base) {
-  const preferred = path15.basename(base) || VENDOR_DIR;
-  if (!existsSync12(path15.join(templateDir, preferred)))
+  const preferred = path16.basename(base) || VENDOR_DIR;
+  if (!existsSync12(path16.join(templateDir, preferred)))
     return preferred;
   for (let n = 1;; n++) {
     const candidate = `${preferred}-${n}`;
-    if (!existsSync12(path15.join(templateDir, candidate)))
+    if (!existsSync12(path16.join(templateDir, candidate)))
       return candidate;
   }
 }
 var TEMPLATE_META_FILE = ".gutterpress-template.json";
 async function reconcileSharedRefs(templateDir, sourceProjectDir, mode) {
   const { doc, file } = await loadManifestDoc(templateDir);
-  const escapes = (p) => escapesProjectRoot(sourceProjectDir, path15.resolve(sourceProjectDir, p));
+  const escapes = (p) => escapesProjectRoot(sourceProjectDir, path16.resolve(sourceProjectDir, p));
   const stylesSeq = doc.get("styles", true);
   const pluginsSeq = doc.get("plugins", true);
   const escapingStyles = collectEscaping(isSeq2(stylesSeq) ? stylesSeq.items : [], scalarString, escapes);
@@ -10084,16 +10183,16 @@ async function reconcileSharedRefs(templateDir, sourceProjectDir, mode) {
     return { vendoredRefs: [], excludedRefs };
   }
   const styleClosure = await collectStyleDependencies(sourceProjectDir, escapingStyles.map((s) => s.value));
-  const pluginFiles = escapingPlugins.map((p) => path15.resolve(sourceProjectDir, p.value));
+  const pluginFiles = escapingPlugins.map((p) => path16.resolve(sourceProjectDir, p.value));
   const externalFiles = [...new Set([...styleClosure, ...pluginFiles])].filter((f) => escapesProjectRoot(sourceProjectDir, f));
   const base = commonAncestorDir(externalFiles);
   const vendorDir = pickVendorDir(templateDir, base);
   await Promise.all(externalFiles.filter((abs) => existsSync12(abs)).map(async (abs) => {
-    const dest = path15.join(templateDir, vendorDir, path15.relative(base, abs));
-    await mkdir8(path15.dirname(dest), { recursive: true });
+    const dest = path16.join(templateDir, vendorDir, path16.relative(base, abs));
+    await mkdir8(path16.dirname(dest), { recursive: true });
     await cp3(abs, dest);
   }));
-  const bookLocal = (value) => toPosixPath(path15.join(vendorDir, path15.relative(base, path15.resolve(sourceProjectDir, value))));
+  const bookLocal = (value) => toPosixPath(path16.join(vendorDir, path16.relative(base, path16.resolve(sourceProjectDir, value))));
   const vendoredRefs = [];
   for (const { node, value } of [...escapingStyles, ...escapingPlugins]) {
     const rewritten = bookLocal(value);
@@ -10108,7 +10207,7 @@ async function saveProjectAsTemplate(options) {
   const id = slugify(name);
   if (!id)
     throw new Error(`Could not derive a template id from "${name}".`);
-  const dir = path15.join(templatesRoot, id);
+  const dir = path16.join(templatesRoot, id);
   let exists = true;
   try {
     await access2(dir, FS2.F_OK);
@@ -10125,13 +10224,13 @@ async function saveProjectAsTemplate(options) {
       continue;
     if (entry.name === TEMPLATE_META_FILE)
       continue;
-    await cp3(path15.join(projectDir, entry.name), path15.join(dir, entry.name), { recursive: true });
+    await cp3(path16.join(projectDir, entry.name), path16.join(dir, entry.name), { recursive: true });
   }
   const manifestName = MANIFEST_FILENAMES.find((name2) => entries.some((entry) => entry.name === name2));
   const shared = manifestName ? await reconcileSharedRefs(dir, projectDir, options.sharedRefs ?? "vendor") : { vendoredRefs: [], excludedRefs: [] };
   if (manifestName)
-    await retokeniseManifest(path15.join(dir, manifestName));
-  await writeFile8(path15.join(dir, TEMPLATE_META_FILE), JSON.stringify({ label: name }, null, 2), "utf8");
+    await retokeniseManifest(path16.join(dir, manifestName));
+  await writeFile8(path16.join(dir, TEMPLATE_META_FILE), JSON.stringify({ label: name }, null, 2), "utf8");
   return {
     id,
     label: name,
@@ -10144,7 +10243,7 @@ async function saveProjectAsTemplate(options) {
 async function retokeniseManifest(manifestPath) {
   let text;
   try {
-    text = await readFile25(manifestPath, "utf8");
+    text = await readFile26(manifestPath, "utf8");
   } catch {
     return;
   }
@@ -10162,10 +10261,10 @@ async function listCustomTemplates(templatesRoot) {
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;
-    const dir = path15.join(templatesRoot, entry.name);
+    const dir = path16.join(templatesRoot, entry.name);
     let label = prettify(entry.name);
     try {
-      const meta = JSON.parse(await readFile25(path15.join(dir, TEMPLATE_META_FILE), "utf8"));
+      const meta = JSON.parse(await readFile26(path16.join(dir, TEMPLATE_META_FILE), "utf8"));
       if (typeof meta.label === "string" && meta.label)
         label = meta.label;
     } catch {}
@@ -10175,7 +10274,7 @@ async function listCustomTemplates(templatesRoot) {
       description: "Your saved template.",
       kind: "custom",
       dir,
-      ...await readTemplateChoices(path15.join(dir, MANIFEST_FILENAMES[0]))
+      ...await readTemplateChoices(path16.join(dir, MANIFEST_FILENAMES[0]))
     });
   }
   out.sort((a, b) => a.label.localeCompare(b.label));
@@ -10187,12 +10286,12 @@ async function importTemplateFromFolder(options) {
   if (!srcStat.isDirectory()) {
     throw new Error("The chosen path is not a folder.");
   }
-  const name = options.name?.trim() || prettify(path15.basename(sourceDir));
+  const name = options.name?.trim() || prettify(path16.basename(sourceDir));
   return saveProjectAsTemplate({ projectDir: sourceDir, name, templatesRoot });
 }
 // src/lib/snippets.ts
-import { readdir as readdir8, readFile as readFile26, writeFile as writeFile9, mkdir as mkdir9, rm as rm3 } from "node:fs/promises";
-import path16 from "node:path";
+import { readdir as readdir8, readFile as readFile27, writeFile as writeFile9, mkdir as mkdir9, rm as rm3 } from "node:fs/promises";
+import path17 from "node:path";
 var SNIPPETS_DIR = "snippets";
 var PLACEHOLDER_RE = /\{\{\s*([a-zA-Z0-9_.-]+)\s*\}\}/g;
 function extractVariables(template) {
@@ -10211,15 +10310,15 @@ function substituteVariables(template, values) {
   return template.replace(PLACEHOLDER_RE, (_full, name) => Object.prototype.hasOwnProperty.call(values, name) ? values[name] : "");
 }
 function resolveSnippetPath(projectDir, fileName) {
-  const dir = path16.resolve(projectDir, SNIPPETS_DIR);
-  const full = path16.resolve(dir, fileName);
-  if (full !== path16.join(dir, path16.basename(fileName)) || path16.dirname(full) !== dir) {
+  const dir = path17.resolve(projectDir, SNIPPETS_DIR);
+  const full = path17.resolve(dir, fileName);
+  if (full !== path17.join(dir, path17.basename(fileName)) || path17.dirname(full) !== dir) {
     throw new Error(`Unsafe snippet filename: ${fileName}`);
   }
   return full;
 }
 async function listSnippets(projectDir) {
-  const dir = path16.join(projectDir, SNIPPETS_DIR);
+  const dir = path17.join(projectDir, SNIPPETS_DIR);
   let names;
   try {
     names = await readdir8(dir);
@@ -10232,7 +10331,7 @@ async function listSnippets(projectDir) {
       continue;
     let body = "";
     try {
-      body = await readFile26(path16.join(dir, fileName), "utf8");
+      body = await readFile27(path17.join(dir, fileName), "utf8");
     } catch {
       continue;
     }
@@ -10246,14 +10345,14 @@ async function listSnippets(projectDir) {
   return entries;
 }
 async function readSnippet(projectDir, fileName) {
-  return readFile26(resolveSnippetPath(projectDir, fileName), "utf8");
+  return readFile27(resolveSnippetPath(projectDir, fileName), "utf8");
 }
 async function saveSnippet(projectDir, name, body) {
   const stem = slugify(name);
   if (!stem)
     throw new Error(`Could not derive a filename from "${name}".`);
   const fileName = `${stem}.md`;
-  const dir = path16.join(projectDir, SNIPPETS_DIR);
+  const dir = path17.join(projectDir, SNIPPETS_DIR);
   await mkdir9(dir, { recursive: true });
   await writeFile9(resolveSnippetPath(projectDir, fileName), body, "utf8");
   return { name, fileName, variables: extractVariables(body) };
@@ -10264,7 +10363,7 @@ async function deleteSnippet(projectDir, fileName) {
 // src/lib/plugin-manager.ts
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { cp as cp4, lstat as lstat3, mkdir as mkdir11, rename as rename5, rm as rm5, stat as stat7 } from "node:fs/promises";
-import path18 from "node:path";
+import path19 from "node:path";
 import { isSeq as isSeq3, isMap as isMap2, isScalar as isScalar2, YAMLMap, Scalar } from "yaml";
 
 // src/lib/npm-plugin-installer.ts
@@ -10275,12 +10374,12 @@ import {
   mkdir as mkdir10,
   mkdtemp as mkdtemp2,
   open as open2,
-  readFile as readFile27,
+  readFile as readFile28,
   realpath as realpath2,
   rename as rename4,
   rm as rm4
 } from "node:fs/promises";
-import path17 from "node:path";
+import path18 from "node:path";
 import { Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { createGunzip } from "node:zlib";
@@ -10360,8 +10459,8 @@ function mb(bytes) {
   return `${Math.ceil(bytes / 1024 / 1024)}MB`;
 }
 function isContained2(root, candidate) {
-  const relative2 = path17.relative(root, candidate);
-  return relative2 === "" || !relative2.startsWith("..") && !path17.isAbsolute(relative2);
+  const relative2 = path18.relative(root, candidate);
+  return relative2 === "" || !relative2.startsWith("..") && !path18.isAbsolute(relative2);
 }
 function mergeLimits(overrides) {
   const limits = { ...DEFAULT_LIMITS, ...overrides };
@@ -10668,13 +10767,13 @@ async function extractTarball(ctx, archivePath, packageDir, packageName) {
     throw rejected;
 }
 async function readInstalledManifest(packageDir, selected) {
-  const packageJsonPath = path17.join(packageDir, "package.json");
+  const packageJsonPath = path18.join(packageDir, "package.json");
   let manifest = null;
   try {
     const info2 = await lstat2(packageJsonPath);
     if (!info2.isFile() || info2.isSymbolicLink())
       throw new Error("not a regular file");
-    manifest = object2(JSON.parse(await readFile27(packageJsonPath, "utf8")));
+    manifest = object2(JSON.parse(await readFile28(packageJsonPath, "utf8")));
   } catch (error2) {
     throw new SecurityInstallError(`Downloaded ${selected.name}@${selected.version} has no valid package.json (${error2 instanceof Error ? error2.message : String(error2)}).`);
   }
@@ -10744,10 +10843,10 @@ async function installPackage(ctx, name, selector, parentPackagePath, ancestors,
     throw new SecurityInstallError(`Dependency graph exceeds ${ctx.limits.totalPackages} packages.`);
   }
   const relativePath = relativePackagePath(parentPackagePath, name);
-  const packageDir = path17.join(ctx.stageRoot, ...relativePath.split("/"));
-  const archivePath = path17.join(ctx.downloadsDir, `${ctx.archiveCounter++}.tgz`);
+  const packageDir = path18.join(ctx.stageRoot, ...relativePath.split("/"));
+  const archivePath = path18.join(ctx.downloadsDir, `${ctx.archiveCounter++}.tgz`);
   try {
-    await mkdir10(path17.dirname(packageDir), { recursive: true });
+    await mkdir10(path18.dirname(packageDir), { recursive: true });
     await downloadTarball(ctx, selected, archivePath);
     await extractTarball(ctx, archivePath, packageDir, selected.name);
     const manifest = await readInstalledManifest(packageDir, selected);
@@ -10846,9 +10945,9 @@ async function ensureDirectory(pathname) {
   }
 }
 async function prepareVendorParent(projectDir, name) {
-  const plugins = path17.join(projectDir, PLUGINS_DIR);
-  const npm = path17.join(plugins, VENDORED_NPM_DIR);
-  const packageParent = path17.dirname(vendoredNpmPluginRoot(projectDir, name, "0.0.0"));
+  const plugins = path18.join(projectDir, PLUGINS_DIR);
+  const npm = path18.join(plugins, VENDORED_NPM_DIR);
+  const packageParent = path18.dirname(vendoredNpmPluginRoot(projectDir, name, "0.0.0"));
   await mkdir10(projectDir, { recursive: true });
   await ensureDirectory(plugins);
   await ensureDirectory(npm);
@@ -10876,14 +10975,14 @@ function publicReceipt(record) {
   };
 }
 async function installNpmPlugin(projectDirInput, packageSpec, options = {}) {
-  const requestedProjectDir = path17.resolve(projectDirInput);
+  const requestedProjectDir = path18.resolve(projectDirInput);
   await mkdir10(requestedProjectDir, { recursive: true });
   const projectDir = await realpath2(requestedProjectDir);
   const requested = parseNpmPluginSpec(packageSpec);
   const npmRoot = await prepareVendorParent(projectDir, requested.name);
-  const container = await mkdtemp2(path17.join(npmRoot, ".install-"));
-  const stageRoot = path17.join(container, "root");
-  const downloadsDir = path17.join(container, "downloads");
+  const container = await mkdtemp2(path18.join(npmRoot, ".install-"));
+  const stageRoot = path18.join(container, "root");
+  const downloadsDir = path18.join(container, "downloads");
   await Promise.all([mkdir10(stageRoot), mkdir10(downloadsDir)]);
   const ctx = {
     fetch: options.fetch ?? globalThis.fetch,
@@ -10929,7 +11028,7 @@ async function installNpmPlugin(projectDirInput, packageSpec, options = {}) {
       skipped: ctx.skipped,
       tree: { algorithm: "sha256", ...tree }
     };
-    const receiptFile = await open2(path17.join(stageRoot, VENDOR_RECEIPT_FILE), "wx");
+    const receiptFile = await open2(path18.join(stageRoot, VENDOR_RECEIPT_FILE), "wx");
     try {
       await receiptFile.writeFile(`${JSON.stringify(receipt, null, 2)}
 `, "utf8");
@@ -10938,7 +11037,7 @@ async function installNpmPlugin(projectDirInput, packageSpec, options = {}) {
       await receiptFile.close();
     }
     finalRoot = vendoredNpmPluginRoot(projectDir, rootRecord.name, rootRecord.version);
-    const realFinalParent = await realpath2(path17.dirname(finalRoot));
+    const realFinalParent = await realpath2(path18.dirname(finalRoot));
     if (!isContained2(projectDir, realFinalParent)) {
       throw new Error("Plugin install destination resolves outside the project.");
     }
@@ -10987,7 +11086,7 @@ async function rollbackNpmPluginInstall(installed) {
 // src/lib/plugin-manager.ts
 var pluginMutationQueues = new Map;
 function withPluginMutationLock(projectDir, mutation) {
-  const resolved = path18.resolve(projectDir);
+  const resolved = path19.resolve(projectDir);
   const key = process.platform === "win32" ? resolved.toLowerCase() : resolved;
   const previous = pluginMutationQueues.get(key) ?? Promise.resolve();
   const run2 = previous.then(mutation, mutation);
@@ -11101,7 +11200,7 @@ async function setPluginEnabledUnlocked(projectDir, ref, enabled) {
   const { doc, file } = await loadManifestDoc(projectDir);
   const seq = doc.get("plugins", true);
   if (!isSeq3(seq)) {
-    throw new Error(`No plugins are configured in ${path18.basename(file)}.`);
+    throw new Error(`No plugins are configured in ${path19.basename(file)}.`);
   }
   const idx = indexOfRef(seq, ref);
   if (idx < 0) {
@@ -11219,12 +11318,12 @@ async function addLocalPluginUnlocked(projectDir, sourcePath) {
   } catch {
     throw new Error(`Plugin source not found: ${sourcePath}`);
   }
-  const base = path18.basename(sourcePath);
-  const destDir = path18.join(projectDir, PLUGINS_DIR);
+  const base = path19.basename(sourcePath);
+  const destDir = path19.join(projectDir, PLUGINS_DIR);
   await mkdir11(destDir, { recursive: true });
-  const dest = path18.join(destDir, base);
-  const staging = path18.join(destDir, `.import-${randomUUID4()}`);
-  const backup = path18.join(destDir, `.backup-${randomUUID4()}`);
+  const dest = path19.join(destDir, base);
+  const staging = path19.join(destDir, `.import-${randomUUID4()}`);
+  const backup = path19.join(destDir, `.backup-${randomUUID4()}`);
   let hasBackup = false;
   try {
     if (info2.isDirectory()) {
@@ -11299,9 +11398,9 @@ async function validateProjectPlugins(projectDir) {
   return out;
 }
 // src/lib/theme-manager.ts
-import { cp as cp5, mkdir as mkdir12, readFile as readFile28, readdir as readdir9, stat as stat8, writeFile as writeFile10, rm as rm6 } from "node:fs/promises";
+import { cp as cp5, mkdir as mkdir12, readFile as readFile29, readdir as readdir9, stat as stat8, writeFile as writeFile10, rm as rm6 } from "node:fs/promises";
 import { existsSync as existsSync13 } from "node:fs";
-import path19 from "node:path";
+import path20 from "node:path";
 import { isSeq as isSeq4, Scalar as Scalar2 } from "yaml";
 var THEMES_DIR = "themes";
 var BUILT_IN_THEME_IDS = [
@@ -11325,7 +11424,7 @@ var BUILT_IN_FALLBACK_META = {
 };
 async function readThemeMeta(jsonPath) {
   try {
-    const text = await readFile28(jsonPath, "utf8");
+    const text = await readFile29(jsonPath, "utf8");
     const parsed = JSON.parse(text);
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
@@ -11349,7 +11448,7 @@ function themeDirFor(projectDir, id) {
   if (typeof id !== "string" || id.length === 0 || themeSlug(id) !== id) {
     throw new Error(`Invalid theme id "${id}".`);
   }
-  return path19.join(projectDir, THEMES_DIR, id);
+  return path20.join(projectDir, THEMES_DIR, id);
 }
 async function listBuiltInThemes() {
   const out = [];
@@ -11384,10 +11483,10 @@ async function resolveBuiltInTheme(id) {
   if (!meta.description) {
     meta.description = BUILT_IN_FALLBACK_META[id]?.description;
   }
-  return { info: themeInfo(id, "builtin", meta), cssPath, dir: path19.dirname(cssPath) };
+  return { info: themeInfo(id, "builtin", meta), cssPath, dir: path20.dirname(cssPath) };
 }
 async function listProjectThemes(projectDir) {
-  const root = path19.join(projectDir, THEMES_DIR);
+  const root = path20.join(projectDir, THEMES_DIR);
   let entries;
   try {
     entries = await readdir9(root, { withFileTypes: true });
@@ -11398,10 +11497,10 @@ async function listProjectThemes(projectDir) {
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;
-    const dir = path19.join(root, entry.name);
-    if (!existsSync13(path19.join(dir, "theme.css")))
+    const dir = path20.join(root, entry.name);
+    if (!existsSync13(path20.join(dir, "theme.css")))
       continue;
-    const meta = await readThemeMeta(path19.join(dir, "theme.json"));
+    const meta = await readThemeMeta(path20.join(dir, "theme.json"));
     out.push(themeInfo(entry.name, "project", meta));
   }
   out.sort((a, b) => a.name.localeCompare(b.name));
@@ -11434,10 +11533,10 @@ async function getActiveTheme(projectDir) {
     if (!m)
       continue;
     const id = m[1];
-    const dir = path19.join(projectDir, THEMES_DIR, id);
-    if (!existsSync13(path19.join(dir, "theme.css")))
+    const dir = path20.join(projectDir, THEMES_DIR, id);
+    if (!existsSync13(path20.join(dir, "theme.css")))
       continue;
-    const meta = await readThemeMeta(path19.join(dir, "theme.json"));
+    const meta = await readThemeMeta(path20.join(dir, "theme.json"));
     return themeInfo(id, "project", meta);
   }
   return null;
@@ -11472,12 +11571,12 @@ async function getPreviousTheme(projectDir) {
   if (!id)
     return null;
   const dir = themeDirFor(projectDir, id);
-  if (!existsSync13(path19.join(dir, "theme.css")))
+  if (!existsSync13(path20.join(dir, "theme.css")))
     return null;
   const active = await getActiveTheme(projectDir);
   if (active && active.id === id)
     return null;
-  const meta = await readThemeMeta(path19.join(dir, "theme.json"));
+  const meta = await readThemeMeta(path20.join(dir, "theme.json"));
   return themeInfo(id, "project", meta);
 }
 async function revertTheme(projectDir) {
@@ -11492,28 +11591,28 @@ async function applyTheme(projectDir, target) {
   if (target.kind === "builtin") {
     const resolved = await resolveBuiltInTheme(target.id);
     let destId = target.id;
-    if (existsSync13(path19.join(projectDir, THEMES_DIR, destId, "theme.css"))) {
+    if (existsSync13(path20.join(projectDir, THEMES_DIR, destId, "theme.css"))) {
       destId = await uniqueThemeId(projectDir, target.id);
     }
-    const destDir = path19.join(projectDir, THEMES_DIR, destId);
+    const destDir = path20.join(projectDir, THEMES_DIR, destId);
     await mkdir12(destDir, { recursive: true });
     await cp5(resolved.dir, destDir, { recursive: true });
-    info2 = themeInfo(destId, "project", await readThemeMeta(path19.join(destDir, "theme.json")));
+    info2 = themeInfo(destId, "project", await readThemeMeta(path20.join(destDir, "theme.json")));
   } else {
     const dir = themeDirFor(projectDir, target.id);
-    if (!existsSync13(path19.join(dir, "theme.css"))) {
+    if (!existsSync13(path20.join(dir, "theme.css"))) {
       throw new Error(`Theme "${target.id}" is not present in this project.`);
     }
-    info2 = themeInfo(target.id, "project", await readThemeMeta(path19.join(dir, "theme.json")));
+    info2 = themeInfo(target.id, "project", await readThemeMeta(path20.join(dir, "theme.json")));
   }
   await setActiveThemeStyle(projectDir, info2.id);
   return info2;
 }
 async function uniqueThemeId(projectDir, base) {
-  const root = path19.join(projectDir, THEMES_DIR);
+  const root = path20.join(projectDir, THEMES_DIR);
   let id = themeSlug(base);
   let n = 2;
-  while (existsSync13(path19.join(root, id))) {
+  while (existsSync13(path20.join(root, id))) {
     id = `${themeSlug(base)}-${n++}`;
   }
   return id;
@@ -11528,16 +11627,16 @@ async function importThemeFromFolder(projectDir, sourceDir) {
   if (!info2.isDirectory()) {
     throw new Error("The chosen path is not a folder.");
   }
-  if (!existsSync13(path19.join(sourceDir, "theme.css"))) {
+  if (!existsSync13(path20.join(sourceDir, "theme.css"))) {
     throw new Error("A theme folder must contain a theme.css file.");
   }
-  const meta = await readThemeMeta(path19.join(sourceDir, "theme.json"));
-  const base = meta.name || path19.basename(sourceDir);
+  const meta = await readThemeMeta(path20.join(sourceDir, "theme.json"));
+  const base = meta.name || path20.basename(sourceDir);
   const id = await uniqueThemeId(projectDir, base);
-  const destDir = path19.join(projectDir, THEMES_DIR, id);
-  await mkdir12(path19.dirname(destDir), { recursive: true });
+  const destDir = path20.join(projectDir, THEMES_DIR, id);
+  await mkdir12(path20.dirname(destDir), { recursive: true });
   await cp5(sourceDir, destDir, { recursive: true });
-  return themeInfo(id, "project", await readThemeMeta(path19.join(destDir, "theme.json")));
+  return themeInfo(id, "project", await readThemeMeta(path20.join(destDir, "theme.json")));
 }
 function looksLikeCssUrl(url) {
   try {
@@ -11584,7 +11683,7 @@ async function importThemeFromUrl(projectDir, url) {
   let baseName;
   if (looksLikeCssUrl(trimmed)) {
     css = await fetchText(trimmed);
-    baseName = path19.basename(new URL(trimmed, "https://x/").pathname, ".css") || "theme";
+    baseName = path20.basename(new URL(trimmed, "https://x/").pathname, ".css") || "theme";
   } else {
     const base = trimmed.endsWith("/") ? trimmed : `${trimmed}/`;
     css = await fetchText(`${base}theme.css`);
@@ -11594,37 +11693,37 @@ async function importThemeFromUrl(projectDir, url) {
       if (parsed && typeof parsed === "object")
         meta = parsed;
     } catch {}
-    baseName = meta.name || path19.basename(new URL(base, "https://x/").pathname.replace(/\/$/, "")) || "theme";
+    baseName = meta.name || path20.basename(new URL(base, "https://x/").pathname.replace(/\/$/, "")) || "theme";
   }
   if (!css.trim()) {
     throw new Error(`Fetched theme CSS from ${trimmed} was empty.`);
   }
   assertLooksLikeCss(css, trimmed);
   const id = await uniqueThemeId(projectDir, meta.name || baseName);
-  const destDir = path19.join(projectDir, THEMES_DIR, id);
+  const destDir = path20.join(projectDir, THEMES_DIR, id);
   await mkdir12(destDir, { recursive: true });
-  await writeFile10(path19.join(destDir, "theme.css"), css, "utf8");
+  await writeFile10(path20.join(destDir, "theme.css"), css, "utf8");
   const finalMeta = {
     name: meta.name || prettify(id),
     author: meta.author,
     description: meta.description,
     preview: meta.preview ?? null
   };
-  await writeFile10(path19.join(destDir, "theme.json"), JSON.stringify(finalMeta, null, 2), "utf8");
+  await writeFile10(path20.join(destDir, "theme.json"), JSON.stringify(finalMeta, null, 2), "utf8");
   return themeInfo(id, "project", finalMeta);
 }
 async function readThemeCss(projectDir, source) {
   if (source.kind === "builtin") {
     const resolved = await resolveBuiltInTheme(source.id);
-    return readFile28(resolved.cssPath, "utf8");
+    return readFile29(resolved.cssPath, "utf8");
   }
   if (!projectDir)
     throw new Error("A project is required to read a project theme.");
-  const cssPath = path19.join(themeDirFor(projectDir, source.id), "theme.css");
+  const cssPath = path20.join(themeDirFor(projectDir, source.id), "theme.css");
   if (!existsSync13(cssPath)) {
     throw new Error(`Theme "${source.id}" has no theme.css in this project.`);
   }
-  return readFile28(cssPath, "utf8");
+  return readFile29(cssPath, "utf8");
 }
 async function removeProjectTheme(projectDir, id) {
   const dir = themeDirFor(projectDir, id);
@@ -11651,9 +11750,9 @@ async function removeProjectTheme(projectDir, id) {
 }
 // src/lib/theme-import.ts
 import { existsSync as existsSync14 } from "node:fs";
-import { mkdir as mkdir13, mkdtemp as mkdtemp3, readFile as readFile29, rm as rm7, writeFile as writeFile11 } from "node:fs/promises";
+import { mkdir as mkdir13, mkdtemp as mkdtemp3, readFile as readFile30, rm as rm7, writeFile as writeFile11 } from "node:fs/promises";
 import { tmpdir as tmpdir3 } from "node:os";
-import path20 from "node:path";
+import path21 from "node:path";
 import { unzipSync } from "fflate";
 var MAX_THEME_ARCHIVE_BYTES = 25 * 1024 * 1024;
 var MAX_THEME_UNZIPPED_BYTES = 25 * 1024 * 1024;
@@ -11717,18 +11816,18 @@ function mb2(n) {
 }
 async function readThemeJson(p) {
   try {
-    const parsed = JSON.parse(await readFile29(p, "utf8"));
+    const parsed = JSON.parse(await readFile30(p, "utf8"));
     return parsed && typeof parsed === "object" ? parsed : {};
   } catch {
     return null;
   }
 }
 async function finalizeThemeImport(projectDir, sourceDir, relPaths) {
-  const cssPath = path20.join(sourceDir, "theme.css");
+  const cssPath = path21.join(sourceDir, "theme.css");
   if (!existsSync14(cssPath)) {
     throw new Error("A theme must contain a theme.css file.");
   }
-  const css = await readFile29(cssPath, "utf8");
+  const css = await readFile30(cssPath, "utf8");
   const { reject, warnings: printFindings } = classifyThemeCssFindings(checkCss(css, "theme.css"));
   if (reject) {
     throw new Error(`theme.css could not be parsed — ${reject.message}`);
@@ -11737,7 +11836,7 @@ async function finalizeThemeImport(projectDir, sourceDir, relPaths) {
   for (const w of printFindings) {
     warnings.push({ code: "print-safety", message: w.message });
   }
-  const jsonPath = path20.join(sourceDir, "theme.json");
+  const jsonPath = path21.join(sourceDir, "theme.json");
   if (!existsSync14(jsonPath)) {
     warnings.push({
       code: "no-theme-json",
@@ -11804,7 +11903,7 @@ async function importThemeFromZip(projectDir, archive) {
     throw new Error("No theme.css found in the package. A theme needs a theme.css at the package root or inside a single folder.");
   }
   const prefix = root === "" ? "" : `${root}/`;
-  const tmp = await mkdtemp3(path20.join(tmpdir3(), "gutterpress-theme-"));
+  const tmp = await mkdtemp3(path21.join(tmpdir3(), "gutterpress-theme-"));
   try {
     const relPaths = [];
     for (const [name, data] of Object.entries(files)) {
@@ -11816,12 +11915,12 @@ async function importThemeFromZip(projectDir, archive) {
       const rel = prefix ? norm.slice(prefix.length) : norm;
       if (!rel || rel.split("/").some((seg) => seg === ".."))
         continue;
-      const dest = path20.join(tmp, rel);
-      if (dest !== tmp && !dest.startsWith(tmp + path20.sep)) {
+      const dest = path21.join(tmp, rel);
+      if (dest !== tmp && !dest.startsWith(tmp + path21.sep)) {
         throw new Error(`The package contains an unsafe path and was rejected: ${name}`);
       }
       relPaths.push(rel);
-      await mkdir13(path20.dirname(dest), { recursive: true });
+      await mkdir13(path21.dirname(dest), { recursive: true });
       await writeFile11(dest, data);
     }
     return await finalizeThemeImport(projectDir, tmp, relPaths);
@@ -11835,10 +11934,10 @@ async function importThemeFromCssText(projectDir, css, name) {
     throw new Error(`The CSS could not be parsed — ${reject.message}`);
   }
   const displayName = name.trim() || "Imported theme";
-  const tmp = await mkdtemp3(path20.join(tmpdir3(), "gutterpress-theme-"));
+  const tmp = await mkdtemp3(path21.join(tmpdir3(), "gutterpress-theme-"));
   try {
-    await writeFile11(path20.join(tmp, "theme.css"), css, "utf8");
-    await writeFile11(path20.join(tmp, "theme.json"), JSON.stringify({ name: displayName }, null, 2), "utf8");
+    await writeFile11(path21.join(tmp, "theme.css"), css, "utf8");
+    await writeFile11(path21.join(tmp, "theme.json"), JSON.stringify({ name: displayName }, null, 2), "utf8");
     const result = await finalizeThemeImport(projectDir, tmp, ["theme.css", "theme.json"]);
     result.warnings.unshift({
       code: "no-theme-json",
@@ -11850,14 +11949,14 @@ async function importThemeFromCssText(projectDir, css, name) {
   }
 }
 async function importThemeFromFile(projectDir, filePath) {
-  const ext = path20.extname(filePath).toLowerCase();
+  const ext = path21.extname(filePath).toLowerCase();
   if (ext === ".zip") {
-    const buf = await readFile29(filePath);
+    const buf = await readFile30(filePath);
     return importThemeFromZip(projectDir, new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength));
   }
   if (ext === ".css") {
-    const css = await readFile29(filePath, "utf8");
-    return importThemeFromCssText(projectDir, css, prettify(path20.basename(filePath, ".css")));
+    const css = await readFile30(filePath, "utf8");
+    return importThemeFromCssText(projectDir, css, prettify(path21.basename(filePath, ".css")));
   }
   throw new Error("Choose a .zip theme package or a .css stylesheet.");
 }
@@ -11951,52 +12050,6 @@ async function setActiveStyles(projectDir, paths) {
   await writeManifestDoc(file, doc);
   return paths;
 }
-// src/lib/app-heartbeat.ts
-import { readFile as readFile30, unlink as unlink3, writeFile as writeFile12 } from "node:fs/promises";
-import path21 from "node:path";
-var HEARTBEAT_FILENAME = "gutterpress-app-heartbeat";
-var APP_HEARTBEAT_FRESH_MS = 2 * 60000;
-var HEARTBEAT_TTL_MULTIPLIER = 2;
-var HEARTBEAT_TTL_BUFFER_MS = 30000;
-function heartbeatTtlMs(periodicMs) {
-  if (periodicMs === null)
-    return APP_HEARTBEAT_FRESH_MS;
-  return periodicMs * HEARTBEAT_TTL_MULTIPLIER + HEARTBEAT_TTL_BUFFER_MS;
-}
-function appHeartbeatPath(repoDir) {
-  return path21.join(gitDirFor(repoDir), HEARTBEAT_FILENAME);
-}
-async function writeAppHeartbeat(repoDir, now = Date.now(), pid = process.pid, ttlMs) {
-  try {
-    const heartbeat = { pid, timestamp: now, ...ttlMs !== undefined ? { ttlMs } : {} };
-    await writeFile12(appHeartbeatPath(repoDir), JSON.stringify(heartbeat));
-  } catch {}
-}
-async function removeAppHeartbeat(repoDir) {
-  try {
-    await unlink3(appHeartbeatPath(repoDir));
-  } catch {}
-}
-async function readAppHeartbeat(repoDir) {
-  try {
-    const raw = await readFile30(appHeartbeatPath(repoDir), "utf8");
-    const parsed = JSON.parse(raw);
-    if (parsed && typeof parsed === "object" && typeof parsed.pid === "number" && typeof parsed.timestamp === "number") {
-      const candidate = parsed;
-      const ttlMs = typeof candidate.ttlMs === "number" ? candidate.ttlMs : undefined;
-      return { pid: candidate.pid, timestamp: candidate.timestamp, ...ttlMs !== undefined ? { ttlMs } : {} };
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
-async function isAppHeartbeatFresh(repoDir, now = Date.now(), maxAgeMs = APP_HEARTBEAT_FRESH_MS) {
-  const heartbeat = await readAppHeartbeat(repoDir);
-  if (!heartbeat)
-    return false;
-  return now - heartbeat.timestamp < (heartbeat.ttlMs ?? maxAgeMs);
-}
 // src/lib/host-policy.ts
 var AUTO_SNAPSHOT_MIN_MINUTES = 5;
 var AUTO_SNAPSHOT_MAX_MINUTES = 24 * 60;
@@ -12004,6 +12057,7 @@ var AUTO_SNAPSHOT_DEFAULT_MINUTES = 10;
 var AUTO_SYNC_MIN_MINUTES = 1;
 var AUTO_SYNC_MAX_MINUTES = 24 * 60;
 var AUTO_SYNC_DEFAULT_MINUTES = 2;
+var AUTO_SYNC_PUSH_INTERVAL_MINUTES = 15;
 function clampedDelayMs(enabled, minutes, bounds) {
   const isEnabled = enabled ?? bounds.enabledDefault;
   if (!isEnabled)
@@ -12065,9 +12119,6 @@ class GitHubAuthProvider {
     this.fetchImpl = options.fetchImpl ?? fetch;
     this.sleep = options.sleepImpl ?? defaultSleep;
   }
-  matches(origin) {
-    return origin.hostname.toLowerCase() === GITHUB_HOST;
-  }
   async connect(callbacks) {
     const { signal } = callbacks;
     const codeRes = await safeFetch(this.fetchImpl, DEVICE_CODE_URL, {
@@ -12131,17 +12182,6 @@ class GitHubAuthProvider {
       }
     }
   }
-  async validate(credential) {
-    try {
-      const res = await safeFetch(this.fetchImpl, `${API_BASE}/user`, {
-        method: "GET",
-        headers: githubApiHeaders(credential.token)
-      });
-      return res.status === 200;
-    } catch {
-      return true;
-    }
-  }
   async fetchUsername(token) {
     try {
       const res = await safeFetch(this.fetchImpl, `${API_BASE}/user`, {
@@ -12264,10 +12304,9 @@ async function listGitHubBranches(credential, owner, repo, options = {}) {
   return branches;
 }
 // src/lib/remote-auth/clone.ts
-import * as fs6 from "node:fs";
-import { mkdir as mkdir14, readdir as readdir11, readFile as readFile31, rm as rm9, writeFile as writeFile13 } from "node:fs/promises";
-import path24 from "node:path";
-import git4 from "isomorphic-git";
+import { mkdir as mkdir14, readdir as readdir10, rm as rm8 } from "node:fs/promises";
+import path22 from "node:path";
+import git3 from "isomorphic-git";
 
 // src/lib/remote-auth/git-http.ts
 import httpNode from "isomorphic-git/http/node";
@@ -12360,20 +12399,27 @@ function withIdleTimeout(http2, idleMs = GIT_HTTP_IDLE_TIMEOUT_MS, uploadMs = GI
 }
 var defaultGitHttp = withIdleTimeout(httpNode);
 
-// src/lib/remote-auth/recovery/classify.ts
-var STALE_LOCK_MIN_AGE_MS = 2 * 60 * 1000;
-
-class RepoNeedsRecoveryError extends Error {
-  kind;
-  code = "RepoNeedsRecovery";
-  constructor(kind) {
-    super(`The project needs repair before it can sync (${kind}).`);
-    this.kind = kind;
-    this.name = "RepoNeedsRecoveryError";
-  }
+// src/lib/remote-auth/transport.ts
+import git2 from "isomorphic-git";
+async function repoDirFor(projectDir) {
+  const source = await detectProjectSource(projectDir);
+  if (source.type === "local-git-folder")
+    return gitScopeFor(source);
+  return projectDir;
 }
-function isRepoNeedsRecoveryError(e) {
-  return e?.code === "RepoNeedsRecovery";
+function isCredentialTransmissionSafe(url) {
+  try {
+    const u = new URL(url);
+    if (u.protocol === "https:")
+      return true;
+    if (u.protocol === "http:") {
+      const host = u.hostname.toLowerCase();
+      return host === "127.0.0.1" || host === "[::1]" || host === "localhost";
+    }
+    return false;
+  } catch {
+    return false;
+  }
 }
 
 class InsecureTransportError extends Error {
@@ -12386,25 +12432,50 @@ class InsecureTransportError extends Error {
 function isInsecureTransportError(e) {
   return e?.code === "InsecureTransport";
 }
-function isPushRejected(e) {
-  const code = e?.code;
-  if (code === "PushRejectedError") {
-    const reason = e?.data?.reason;
-    return reason === undefined || reason === "not-fast-forward";
+function onAuthFor(credential) {
+  if (!credential)
+    return {};
+  return {
+    onAuth: (url) => {
+      if (!isCredentialTransmissionSafe(url))
+        throw new InsecureTransportError;
+      return {
+        username: credential.kind === "github-oauth" ? "x-access-token" : credential.username || credential.token,
+        password: credential.token
+      };
+    }
+  };
+}
+async function resolveTransport(dir, options) {
+  const origin = await syncRemoteFor(dir);
+  if (!origin?.url)
+    throw new Error(MSG_NO_REMOTE);
+  const { cleanUrl, credential: urlCredential } = extractUrlCredential(origin.url);
+  let parsed;
+  try {
+    parsed = new URL(cleanUrl);
+  } catch {
+    throw new Error(MSG_SSH_REMOTE);
   }
-  if (code === "GitPushError") {
-    const msg = (e?.data?.prettyDetails ?? "") + " " + (e?.message ?? "");
-    return /non-fast-forward|would not be a fast-forward|not a simple fast-forward/i.test(msg);
+  if (!/^https?:$/.test(parsed.protocol))
+    throw new Error(MSG_SSH_REMOTE);
+  const host = credentialHostKey(cleanUrl);
+  let credential = options.credential ?? undefined;
+  if (!credential && options.tokenStore) {
+    try {
+      credential = await options.tokenStore.get(host) ?? undefined;
+    } catch {
+      credential = undefined;
+    }
   }
-  return false;
-}
-function isMergeConflictError(e) {
-  return e?.code === "MergeConflictError";
-}
-function isUnrelatedHistories(e) {
-  const code = e?.code;
-  const msg = e?.message ?? String(e);
-  return code === "MergeNotSupportedError" || /unrelated histories|no common commits|refusing to merge unrelated/i.test(msg);
+  if (!credential && urlCredential)
+    credential = urlCredential;
+  return {
+    remote: origin.remote,
+    url: cleanUrl,
+    host,
+    ...credential ? { credential } : {}
+  };
 }
 function classifyTransportFailure(e) {
   if (isInsecureTransportError(e))
@@ -12424,300 +12495,6 @@ function classifyTransportFailure(e) {
   }
   return null;
 }
-function isLikelyRepoCorruption(e) {
-  if (classifyTransportFailure(e))
-    return false;
-  const code = e?.code;
-  const msg = e?.message ?? String(e);
-  return code === "ReadObjectFail" || code === "ObjectTypeError" || code === "NotFoundError" && /could not find/i.test(msg) || /object not found|missing object|pack.*corrupt|bad object|corrupt.*index|index.*corrupt|invalid index|could not find head|packed-refs/i.test(msg);
-}
-function classifyFromHealth(health, opts = {}) {
-  const minLockAgeMs = opts.minLockAgeMs ?? STALE_LOCK_MIN_AGE_MS;
-  if (!health.hasGitDir)
-    return "needs_repair";
-  if (health.hasInterruptedRebase)
-    return "needs_repair";
-  if (health.hasInterruptedCherryPick)
-    return "needs_repair";
-  if (health.hasInterruptedMerge)
-    return "needs_repair";
-  if (health.headUnreadable)
-    return "needs_repair";
-  if (health.isDetachedHead)
-    return "needs_repair";
-  if (health.hasStaleLock && (health.lockAgeMs ?? 0) >= minLockAgeMs) {
-    return "stale_lock";
-  }
-  return null;
-}
-
-// src/lib/remote-auth/transport.ts
-import * as fs5 from "node:fs";
-import git3 from "isomorphic-git";
-
-// src/lib/remote-auth/recovery/inspect.ts
-import * as fs4 from "node:fs";
-import path23 from "node:path";
-import git2 from "isomorphic-git";
-
-// src/lib/remote-auth/recovery/locks.ts
-import { readdir as readdir10, rm as rm8, stat as stat9 } from "node:fs/promises";
-import path22 from "node:path";
-var TOP_LEVEL_LOCK_NAMES = [
-  "index.lock",
-  "HEAD.lock",
-  "config.lock",
-  "packed-refs.lock"
-];
-async function collectRefLockPaths(dir, out) {
-  let entries;
-  try {
-    entries = await readdir10(dir, { withFileTypes: true });
-  } catch {
-    return;
-  }
-  for (const entry of entries) {
-    const abs = path22.join(dir, entry.name);
-    if (entry.isDirectory()) {
-      await collectRefLockPaths(abs, out);
-    } else if (entry.isFile() && entry.name.endsWith(".lock")) {
-      out.push(abs);
-    }
-  }
-}
-async function findLockCandidates(gitDir, now) {
-  const paths = TOP_LEVEL_LOCK_NAMES.map((name) => path22.join(gitDir, name));
-  await collectRefLockPaths(path22.join(gitDir, "refs"), paths);
-  const candidates = [];
-  for (const p of paths) {
-    try {
-      const s = await stat9(p);
-      if (s.isFile())
-        candidates.push({ path: p, ageMs: now - s.mtimeMs });
-    } catch {}
-  }
-  return candidates;
-}
-async function sweepStaleLocks(gitDir, now = Date.now(), minAgeMs = STALE_LOCK_MIN_AGE_MS) {
-  const candidates = await findLockCandidates(gitDir, now);
-  if (candidates.length === 0)
-    return "clean";
-  if (candidates.some((c) => c.ageMs < minAgeMs))
-    return "fresh";
-  for (const c of candidates) {
-    await rm8(c.path, { force: true });
-  }
-  return "swept";
-}
-
-// src/lib/remote-auth/recovery/inspect.ts
-async function inspectRepo(ctx, opts = {}) {
-  let repoDir = ctx.repoDir;
-  try {
-    const source = ctx.source ?? await detectProjectSource(ctx.repoDir);
-    if (source.type === "local-git-folder")
-      repoDir = gitScopeFor(source);
-  } catch {}
-  const gitDir = gitDirFor(repoDir);
-  const hasGitDir = fs4.existsSync(gitDir);
-  if (!hasGitDir) {
-    return {
-      hasGitDir: false,
-      isDetachedHead: false,
-      headUnreadable: false,
-      hasStaleLock: false,
-      hasInterruptedMerge: false,
-      hasInterruptedRebase: false,
-      hasInterruptedCherryPick: false,
-      hasLocalChanges: false
-    };
-  }
-  let currentBranch;
-  let isDetachedHead = false;
-  let headUnreadable = false;
-  try {
-    const branch = await git2.currentBranch({ fs: fs4, dir: repoDir });
-    if (branch == null) {
-      isDetachedHead = true;
-    } else {
-      currentBranch = branch;
-    }
-  } catch {
-    headUnreadable = true;
-  }
-  const lockCandidates = await findLockCandidates(gitDir, Date.now());
-  const hasStaleLock = lockCandidates.length > 0;
-  const lockAgeMs = hasStaleLock ? Math.min(...lockCandidates.map((c) => c.ageMs)) : undefined;
-  const hasInterruptedMerge = fs4.existsSync(path23.join(gitDir, "MERGE_HEAD"));
-  const hasInterruptedRebase = fs4.existsSync(path23.join(gitDir, "rebase-merge")) || fs4.existsSync(path23.join(gitDir, "rebase-apply"));
-  const hasInterruptedCherryPick = fs4.existsSync(path23.join(gitDir, "CHERRY_PICK_HEAD"));
-  let hasLocalChanges = false;
-  if (opts.checkLocalChanges !== false) {
-    try {
-      hasLocalChanges = await hasPendingChanges(repoDir);
-    } catch {
-      hasLocalChanges = true;
-    }
-  }
-  return {
-    hasGitDir,
-    currentBranch,
-    isDetachedHead,
-    headUnreadable,
-    hasStaleLock,
-    lockAgeMs,
-    hasInterruptedMerge,
-    hasInterruptedRebase,
-    hasInterruptedCherryPick,
-    hasLocalChanges
-  };
-}
-async function verifyRepoReadable(dir) {
-  const headOid = await git2.resolveRef({ fs: fs4, dir, ref: "HEAD" });
-  const { commit } = await git2.readCommit({ fs: fs4, dir, oid: headOid });
-  await git2.readTree({ fs: fs4, dir, oid: commit.tree });
-}
-function isUnbornRepo(repoDir) {
-  const objectsDir = path23.join(gitDirFor(repoDir), "objects");
-  let entries;
-  try {
-    entries = fs4.readdirSync(objectsDir);
-  } catch {
-    return false;
-  }
-  for (const entry of entries) {
-    if (/^[0-9a-f]{2}$/.test(entry)) {
-      try {
-        if (fs4.readdirSync(path23.join(objectsDir, entry)).length > 0)
-          return false;
-      } catch {
-        return false;
-      }
-    } else if (entry === "pack") {
-      try {
-        if (fs4.readdirSync(path23.join(objectsDir, entry)).some((f) => f.endsWith(".pack"))) {
-          return false;
-        }
-      } catch {
-        return false;
-      }
-    }
-  }
-  return true;
-}
-function preflightStructuralReason(kind) {
-  switch (kind) {
-    case "stale_lock":
-      return "health.hasStaleLock";
-    case "needs_repair":
-      return "health.structural";
-    case null:
-      return "none";
-  }
-}
-function buildPreflightDiagnostics(openedDir, repoDir, health, kind) {
-  return {
-    openedDir,
-    repoDir,
-    repoRootDiffers: repoDir !== openedDir,
-    kind: kind ?? "none",
-    reason: preflightStructuralReason(kind),
-    hasGitDir: health.hasGitDir,
-    hasInterruptedMerge: health.hasInterruptedMerge,
-    hasInterruptedRebase: health.hasInterruptedRebase,
-    hasInterruptedCherryPick: health.hasInterruptedCherryPick,
-    hasStaleLock: health.hasStaleLock,
-    isDetachedHead: health.isDetachedHead,
-    hasLocalChanges: health.hasLocalChanges
-  };
-}
-
-// 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_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 project'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_UNRELATED = "The online address points at a different project's files, so the two can't be combined. Check the project's online address.";
-var MSG_NO_REMOTE = "This project isn't connected to an online repository yet.";
-var MSG_SSH_REMOTE = "This project'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 project's version history isn't on a named branch, so it can't be synced right now.";
-var MSG_PULLED = "The latest online changes were downloaded to this computer.";
-var MSG_PULLED_MERGED = "The latest online changes were combined with your changes on this computer.";
-var MSG_PULL_UP_TO_DATE = "You already have the latest online changes.";
-var MSG_PUSH_UP_TO_DATE = "There's nothing new to send — everything is already online.";
-var MSG_PULL_FIRST = "The online copy has changes you don't have yet. Get the latest changes first, then send yours.";
-var SYNC_SNAPSHOT_MESSAGE = "Snapshot before syncing";
-
-// src/lib/remote-auth/transport.ts
-async function repoDirFor(projectDir) {
-  const source = await detectProjectSource(projectDir);
-  if (source.type === "local-git-folder")
-    return gitScopeFor(source);
-  return projectDir;
-}
-function isCredentialTransmissionSafe(url) {
-  try {
-    const u = new URL(url);
-    if (u.protocol === "https:")
-      return true;
-    if (u.protocol === "http:") {
-      const host = u.hostname.toLowerCase();
-      return host === "127.0.0.1" || host === "[::1]" || host === "localhost";
-    }
-    return false;
-  } catch {
-    return false;
-  }
-}
-function onAuthFor(credential) {
-  if (!credential)
-    return {};
-  return {
-    onAuth: (url) => {
-      if (!isCredentialTransmissionSafe(url))
-        throw new InsecureTransportError;
-      return {
-        username: credential.kind === "github-oauth" ? "x-access-token" : credential.username || credential.token,
-        password: credential.token
-      };
-    }
-  };
-}
-async function resolveTransport(dir, options) {
-  const origin = await syncRemoteFor(dir);
-  if (!origin?.url)
-    throw new Error(MSG_NO_REMOTE);
-  const { cleanUrl, credential: urlCredential } = extractUrlCredential(origin.url);
-  let parsed;
-  try {
-    parsed = new URL(cleanUrl);
-  } catch {
-    throw new Error(MSG_SSH_REMOTE);
-  }
-  if (!/^https?:$/.test(parsed.protocol))
-    throw new Error(MSG_SSH_REMOTE);
-  const host = credentialHostKey(cleanUrl);
-  let credential = options.credential ?? undefined;
-  if (!credential && options.tokenStore) {
-    try {
-      credential = await options.tokenStore.get(host) ?? undefined;
-    } catch {
-      credential = undefined;
-    }
-  }
-  if (!credential && urlCredential)
-    credential = urlCredential;
-  return {
-    remote: origin.remote,
-    url: cleanUrl,
-    host,
-    ...credential ? { credential } : {}
-  };
-}
 function failureOutcome(e, snapshotId) {
   const kind = classifyTransportFailure(e);
   const base = snapshotId ? { snapshotId } : {};
@@ -12743,7 +12520,7 @@ function setupErrorMessage(e) {
 async function snapshotBeforeAction(args) {
   const { projectDir, dir, cache: cache2 } = args;
   const hasChanges = await hasPendingChanges(dir, cache2);
-  const staleStaging = fs5.existsSync(snapshotStagingMarkerPath(dir));
+  const staleStaging = gitFs.existsSync(snapshotStagingMarkerPath(dir));
   if (!hasChanges && !staleStaging)
     return;
   const snap = await snapshotWorkingTreeUnlocked({
@@ -12751,70 +12528,49 @@ async function snapshotBeforeAction(args) {
     repoRoot: dir,
     message: args.message?.trim() || SYNC_SNAPSHOT_MESSAGE,
     authorName: args.authorName,
-    authorEmail: args.authorEmail
+    authorEmail: args.authorEmail,
+    cache: cache2
   });
   return snap.id;
 }
-async function assertNoStructuralDamage(projectDir, logger) {
-  const health = await inspectRepo({ repoDir: projectDir }, { checkLocalChanges: false });
-  const structural = classifyFromHealth(health);
-  if (structural) {
-    logger.warn("sync", "structural preflight blocked sync", { kind: structural });
-    throw new RepoNeedsRecoveryError(structural);
-  }
-}
 async function currentBranchOrThrow(dir) {
-  const branch = await git3.currentBranch({ fs: fs5, dir });
+  const branch = await git2.currentBranch({ fs: gitFs, dir });
   if (!branch)
     throw new Error(MSG_NO_BRANCH);
   return branch;
 }
 async function resolveRefOrNull(dir, ref) {
   try {
-    return await git3.resolveRef({ fs: fs5, dir, ref });
+    return await git2.resolveRef({ fs: gitFs, dir, ref });
   } catch {
     return null;
   }
 }
-async function guardRefs(dir, listRefs, cache2, fn) {
-  const before = new Map;
-  for (const ref of await listRefs().catch(() => [])) {
-    before.set(ref, await resolveRefOrNull(dir, ref));
-  }
+async function guardTrackingRef(dir, ref, cache2, fn) {
+  const before = await resolveRefOrNull(dir, ref);
   try {
     return await fn();
   } catch (e) {
     try {
-      const relisted = await listRefs().catch(() => []);
-      const refs = new Set([...before.keys(), ...relisted]);
-      for (const ref of refs) {
-        try {
-          const prev = before.get(ref) ?? null;
-          const after = await resolveRefOrNull(dir, ref);
-          if (!after || after === prev)
-            continue;
-          const landed = await git3.readObject({ fs: fs5, dir, oid: after, cache: cache2 }).then(() => true, () => false);
-          if (landed)
-            continue;
-          if (prev) {
-            await git3.writeRef({ fs: fs5, dir, ref, value: prev, force: true });
-          } else {
-            await git3.deleteRef({ fs: fs5, dir, ref });
-          }
-        } catch {}
+      const after = await resolveRefOrNull(dir, ref);
+      if (after && after !== before) {
+        const landed = await git2.readObject({ fs: gitFs, dir, oid: after, cache: cache2 }).then(() => true, () => false);
+        if (!landed) {
+          if (before)
+            await git2.writeRef({ fs: gitFs, dir, ref, value: before, force: true });
+          else
+            await git2.deleteRef({ fs: gitFs, dir, ref });
+        }
       }
     } catch {}
     throw e;
   }
 }
-async function guardTrackingRef(dir, ref, cache2, fn) {
-  return guardRefs(dir, async () => [ref], cache2, fn);
-}
 async function fetchRemoteTip(dir, branch, transport, http2, cache2) {
   try {
     const trackingRef = `refs/remotes/${transport.remote}/${branch}`;
-    const result = await guardTrackingRef(dir, trackingRef, cache2, () => git3.fetch({
-      fs: fs5,
+    const result = await guardTrackingRef(dir, trackingRef, cache2, () => git2.fetch({
+      fs: gitFs,
       http: http2,
       dir,
       cache: cache2,
@@ -12844,25 +12600,12 @@ function short(oid) {
 }
 
 // src/lib/remote-auth/clone.ts
-var PROVENANCE_FILE = "gutterpress-remote.json";
-function provenancePath(projectDir) {
-  return path24.join(projectDir, ".git", PROVENANCE_FILE);
-}
-async function readProjectProvenance(projectDir) {
-  try {
-    const raw = await readFile31(provenancePath(projectDir), "utf8");
-    const parsed = JSON.parse(raw);
-    return parsed && parsed.provider ? parsed : null;
-  } catch {
-    return null;
-  }
-}
 function sanitizeCloneFolderName(name) {
   return String(name ?? "").replace(/[\\/]/g, "-").replace(/^\.+/, "").trim();
 }
 async function assertCloneTarget(dir) {
   try {
-    const entries = await readdir11(dir);
+    const entries = await readdir10(dir);
     if (entries.length > 0) {
       throw new Error("That folder already has files in it. Choose an empty folder for the project.");
     }
@@ -12892,8 +12635,8 @@ function friendlyCloneError(e) {
   return new Error("The project couldn't be downloaded from GitHub. Please try again.", { cause: e });
 }
 async function cloneRepository(options) {
-  const { dir, onProgress, tokenStore, provenance } = options;
-  if (!path24.isAbsolute(dir)) {
+  const { dir, onProgress, tokenStore } = options;
+  if (!path22.isAbsolute(dir)) {
     throw new Error("cloneRepository requires an absolute destination path.");
   }
   let parsed;
@@ -12912,11 +12655,11 @@ async function cloneRepository(options) {
   }
   return withRepoLock(dir, async () => {
     await assertCloneTarget(dir);
-    const dirExistedBefore = fs6.existsSync(dir);
+    const dirExistedBefore = gitFs.existsSync(dir);
     await mkdir14(dir, { recursive: true });
     try {
-      await git4.clone({
-        fs: fs6,
+      await git3.clone({
+        fs: gitFs,
         http: options.httpClient ?? defaultGitHttp,
         dir,
         url: cleanUrl,
@@ -12936,21 +12679,16 @@ async function cloneRepository(options) {
       const friendly = friendlyCloneError(e);
       if (!dirExistedBefore) {
         try {
-          await rm9(dir, { recursive: true, force: true });
+          await rm8(dir, { recursive: true, force: true });
         } catch {
           throw new Error(`${friendly.message} A partial download was left at ${dir} — delete that folder before trying again.`, { cause: e });
         }
       }
       throw friendly;
     }
-    if (provenance) {
-      try {
-        await writeFile13(provenancePath(dir), JSON.stringify(provenance, null, 2), "utf8");
-      } catch {}
-    }
     let branch;
     try {
-      branch = await git4.currentBranch({ fs: fs6, dir }) ?? undefined;
+      branch = await git3.currentBranch({ fs: gitFs, dir }) ?? undefined;
     } catch {
       branch = undefined;
     }
@@ -12958,7 +12696,7 @@ async function cloneRepository(options) {
   });
 }
 // src/lib/remote-auth/test-access.ts
-import git5 from "isomorphic-git";
+import git4 from "isomorphic-git";
 import httpNode2 from "isomorphic-git/http/node";
 function isSshRemoteUrl(url) {
   const trimmed = url.trim();
@@ -13014,7 +12752,7 @@ async function testRemoteAccess(options) {
   });
   const probe = (async () => {
     try {
-      const refs = await git5.listServerRefs({
+      const refs = await git4.listServerRefs({
         http: options.httpClient ?? httpNode2,
         url: cleanUrl,
         protocolVersion: 1,
@@ -13113,28 +12851,6 @@ async function connectGenericHost(input, options = {}) {
   }
   return candidate;
 }
-
-class GenericTokenAuthProvider {
-  options;
-  constructor(options = {}) {
-    this.options = options;
-  }
-  matches(origin) {
-    return /^https?:$/.test(origin.protocol) && origin.hostname.toLowerCase() !== GITHUB_HOST;
-  }
-  connect(callbacks) {
-    return connectGenericHost(callbacks, this.options);
-  }
-  async validate(credential) {
-    const result = await testRemoteAccess({
-      url: `https://${credential.host}/`,
-      credential,
-      ...this.options.httpClient ? { httpClient: this.options.httpClient } : {},
-      ...this.options.timeoutMs ? { timeoutMs: this.options.timeoutMs } : {}
-    });
-    return result.ok || result.reason !== "auth";
-  }
-}
 // src/lib/remote-auth/diagnose.ts
 function parseRemoteOrigin(url) {
   const trimmed = url.trim();
@@ -13229,19 +12945,23 @@ async function diagnoseProjectRemote(projectDir, options = {}) {
   };
 }
 // src/lib/remote-auth/sync.ts
-import * as fs8 from "node:fs";
-import git7 from "isomorphic-git";
+import git6 from "isomorphic-git";
 
 // src/lib/remote-auth/converge-merge.ts
-import * as fs7 from "node:fs";
-import { mkdir as mkdir15, unlink as unlink4, writeFile as writeFile14 } from "node:fs/promises";
-import path25 from "node:path";
-import git6 from "isomorphic-git";
+import { mkdir as mkdir15, unlink as unlink3, writeFile as writeFile12 } from "node:fs/promises";
+import path23 from "node:path";
+import git5 from "isomorphic-git";
 import diff3Merge from "diff3";
+function isMergeConflictError(e) {
+  return e?.code === "MergeConflictError";
+}
+function isCheckoutConflict(e) {
+  return e?.code === "CheckoutConflictError";
+}
 var CONVERGE_PREPARE_MESSAGE = "Getting your changes ready to combine with the online version";
-var CONVERGE_RESTORE_MESSAGE = "Kept the newest version of files that can't be combined";
+var CONVERGE_RESTORE_MESSAGE = "Kept both versions of the files that can't be combined";
 var CONVERGE_MERGE_MESSAGE = "Combined your changes with the online version";
-var IMAGE_EXT = /\.(png|jpe?g|gif|webp|svg|avif|bmp|ico)$/i;
+var MARKER_UNSAFE_EXT = /\.svg$/i;
 var OUR_LABEL = "your version";
 var THEIR_LABEL = "online version";
 function stringLooksBinary(s) {
@@ -13269,31 +12989,31 @@ function mergeWithMarkers(baseContent, ourContent, theirContent) {
 }
 async function readBlobOrNull(dir, cache2, oid, filepath) {
   try {
-    const r = await git6.readBlob({ fs: fs7, dir, cache: cache2, oid, filepath });
+    const r = await git5.readBlob({ fs: gitFs, dir, cache: cache2, oid, filepath });
     return { oid: r.oid, blob: r.blob };
   } catch {
     return null;
   }
 }
 async function writeTreeFile(dir, filepath, content) {
-  const abs = path25.join(dir, filepath);
-  await mkdir15(path25.dirname(abs), { recursive: true });
-  await writeFile14(abs, content);
+  const abs = path23.join(dir, filepath);
+  await mkdir15(path23.dirname(abs), { recursive: true });
+  await writeFile12(abs, content);
 }
 async function bothAddedPaths(dir, cache2, ourTip, theirTip, allowUnrelated) {
-  const bases = await git6.findMergeBase({ fs: fs7, dir, cache: cache2, oids: [ourTip, theirTip] });
+  const bases = await git5.findMergeBase({ fs: gitFs, dir, cache: cache2, oids: [ourTip, theirTip] });
   const base = bases[0];
   if (!base && !allowUnrelated)
     return null;
   const out = [];
-  await git6.walk({
-    fs: fs7,
+  await git5.walk({
+    fs: gitFs,
     dir,
     cache: cache2,
     trees: [
-      git6.TREE({ ref: ourTip }),
-      git6.TREE({ ref: theirTip }),
-      ...base ? [git6.TREE({ ref: base })] : []
+      git5.TREE({ ref: ourTip }),
+      git5.TREE({ ref: theirTip }),
+      ...base ? [git5.TREE({ ref: base })] : []
     ],
     map: async (filepath, entries) => {
       if (filepath === ".")
@@ -13314,44 +13034,44 @@ async function bothAddedPaths(dir, cache2, ourTip, theirTip, allowUnrelated) {
 }
 async function convergeMerge(params) {
   const { dir, cache: cache2, branch, theirs, author } = params;
-  const ourTip = await git6.resolveRef({ fs: fs7, dir, ref: branch });
-  const [ourCommit, theirCommit] = await Promise.all([
-    git6.readCommit({ fs: fs7, dir, cache: cache2, oid: ourTip }),
-    git6.readCommit({ fs: fs7, dir, cache: cache2, oid: theirs })
-  ]);
-  const localNewer = ourCommit.commit.committer.timestamp >= theirCommit.commit.committer.timestamp;
-  const combined = new Set;
-  const driverBinary = new Set;
-  const imageClashes = [];
-  const attempt = () => git6.merge({
-    fs: fs7,
-    dir,
-    cache: cache2,
-    ours: branch,
-    theirs,
-    author,
-    message: CONVERGE_MERGE_MESSAGE,
-    allowUnrelatedHistories: params.allowUnrelatedHistories ?? false,
-    mergeDriver: ({ contents, path: filepath }) => {
-      const [base, ours, theirsContent] = contents;
-      if (IMAGE_EXT.test(filepath) || stringLooksBinary(ours) || stringLooksBinary(theirsContent) || stringLooksBinary(base)) {
-        driverBinary.add(filepath);
-        return { cleanMerge: false, mergedText: ours };
-      }
-      combined.add(filepath);
-      return {
-        cleanMerge: true,
-        mergedText: mergeWithMarkers(base, ours, theirsContent)
-      };
-    }
-  });
   const snapshot = (message) => snapshotWorkingTreeUnlocked({
     projectDir: dir,
     repoRoot: dir,
     message,
     authorName: params.authorName,
-    authorEmail: params.authorEmail
+    authorEmail: params.authorEmail,
+    cache: cache2
   });
+  const ourTip = await git5.resolveRef({ fs: gitFs, dir, ref: branch });
+  const combined = new Set;
+  const driverBinary = new Set;
+  const keptBothFiles = [];
+  let tipBeforeMerge = ourTip;
+  const attempt = async () => {
+    tipBeforeMerge = await git5.resolveRef({ fs: gitFs, dir, ref: branch });
+    return git5.merge({
+      fs: gitFs,
+      dir,
+      cache: cache2,
+      ours: branch,
+      theirs,
+      author,
+      message: CONVERGE_MERGE_MESSAGE,
+      allowUnrelatedHistories: false,
+      mergeDriver: ({ contents, path: filepath }) => {
+        const [base, ours, theirsContent] = contents;
+        if (MARKER_UNSAFE_EXT.test(filepath) || stringLooksBinary(ours) || stringLooksBinary(theirsContent) || stringLooksBinary(base)) {
+          driverBinary.add(filepath);
+          return { cleanMerge: false, mergedText: ours };
+        }
+        combined.add(filepath);
+        return {
+          cleanMerge: true,
+          mergedText: mergeWithMarkers(base, ours, theirsContent)
+        };
+      }
+    });
+  };
   const postRestore = [];
   const equalize = async (paths) => {
     for (const p of paths.binary) {
@@ -13362,16 +13082,10 @@ async function convergeMerge(params) {
       if (!ourBlob || !theirBlob)
         continue;
       await writeTreeFile(dir, p, theirBlob.blob);
-      if (localNewer)
-        postRestore.push({ path: p, bytes: ourBlob.blob });
-      if (IMAGE_EXT.test(p)) {
-        imageClashes.push({
-          path: p,
-          localOid: ourBlob.oid,
-          remoteOid: theirBlob.oid,
-          kept: localNewer ? "local" : "online"
-        });
-      }
+      const onlinePath = onlineSiblingPath(p);
+      postRestore.push({ path: p, bytes: ourBlob.blob });
+      postRestore.push({ path: onlinePath, bytes: theirBlob.blob });
+      keptBothFiles.push({ path: p, onlinePath });
     }
     for (const p of paths.deleteByUs) {
       const theirBlob = await readBlobOrNull(dir, cache2, theirs, p);
@@ -13380,7 +13094,7 @@ async function convergeMerge(params) {
     }
     for (const p of paths.deleteByTheirs) {
       const ourBlob = await readBlobOrNull(dir, cache2, ourTip, p);
-      await unlink4(path25.join(dir, p)).catch((e) => {
+      await unlink3(path23.join(dir, p)).catch((e) => {
         if (e?.code !== "ENOENT")
           throw e;
       });
@@ -13401,7 +13115,7 @@ async function convergeMerge(params) {
       });
       await attempt();
     } else if (e?.code === "MergeNotSupportedError") {
-      const added = await bothAddedPaths(dir, cache2, ourTip, theirs, params.allowUnrelatedHistories ?? false);
+      const added = await bothAddedPaths(dir, cache2, ourTip, theirs, false);
       if (added === null || added.length === 0)
         throw e;
       await equalize({ binary: added, deleteByUs: [], deleteByTheirs: [] });
@@ -13410,7 +13124,20 @@ async function convergeMerge(params) {
       throw e;
     }
   }
-  await git6.checkout({ fs: fs7, dir, cache: cache2, ref: branch, force: true });
+  try {
+    await git5.checkout({ fs: gitFs, dir, cache: cache2, ref: branch, force: false });
+  } catch (e) {
+    if (!isCheckoutConflict(e))
+      throw e;
+    await git5.writeRef({
+      fs: gitFs,
+      dir,
+      ref: await git5.expandRef({ fs: gitFs, dir, ref: branch }),
+      value: tipBeforeMerge,
+      force: true
+    });
+    throw e;
+  }
   if (postRestore.length > 0) {
     for (const r of postRestore)
       await writeTreeFile(dir, r.path, r.bytes);
@@ -13418,12 +13145,39 @@ async function convergeMerge(params) {
       await snapshot(CONVERGE_RESTORE_MESSAGE);
   }
   return {
-    oid: await git6.resolveRef({ fs: fs7, dir, ref: branch }),
+    oid: await git5.resolveRef({ fs: gitFs, dir, ref: branch }),
     combinedFiles: [...combined].sort(),
-    imageClashes
+    keptBothFiles
   };
 }
 // src/lib/remote-auth/sync.ts
+function isPushRejected(e) {
+  const code = e?.code;
+  if (code === "PushRejectedError") {
+    const reason = e?.data?.reason;
+    return reason === undefined || reason === "not-fast-forward";
+  }
+  if (code === "GitPushError") {
+    const msg = (e?.data?.prettyDetails ?? "") + " " + (e?.message ?? "");
+    return /non-fast-forward|would not be a fast-forward|not a simple fast-forward/i.test(msg);
+  }
+  return false;
+}
+function isUnrelatedHistories(e) {
+  const code = e?.code;
+  const msg = e?.message ?? String(e);
+  return code === "MergeNotSupportedError" || /unrelated histories|no common commits|refusing to merge unrelated/i.test(msg);
+}
+async function historyUnreadable(dir) {
+  try {
+    const oid = await git6.resolveRef({ fs: gitFs, dir, ref: "HEAD" });
+    await git6.readCommit({ fs: gitFs, dir, oid });
+    await git6.listFiles({ fs: gitFs, dir });
+    return false;
+  } catch {
+    return true;
+  }
+}
 var DEFAULT_SYNC_RETRY = {
   attempts: 3,
   backoffMs: 150
@@ -13432,254 +13186,157 @@ function defaultSleep2(ms) {
   return new Promise((resolve9) => setTimeout(resolve9, ms));
 }
 async function syncProject(options) {
-  const logger = resolveLogger(options.logFile, "sync");
+  const http2 = options.httpClient ?? defaultGitHttp;
+  const push = options.push ?? true;
   const attempts = Math.max(1, options.retry?.attempts ?? DEFAULT_SYNC_RETRY.attempts);
   const backoffMs = Math.max(0, options.retry?.backoffMs ?? DEFAULT_SYNC_RETRY.backoffMs);
   const sleep = options.retry?.sleep ?? defaultSleep2;
-  let snapshotId;
-  let pulled = false;
-  let filesChanged = false;
-  const combinedFiles = new Set;
-  const imageClashes = [];
-  const convergeExtras = () => ({
-    ...combinedFiles.size > 0 ? { combinedFiles: [...combinedFiles].sort() } : {},
-    ...imageClashes.length > 0 ? { imageClashes } : {}
-  });
-  for (let attempt = 0;attempt < attempts; attempt++) {
-    logger.info("sync", `sync pass ${attempt + 1}/${attempts}`);
-    const pull = await pullChanges(options);
-    snapshotId = snapshotId ?? pull.snapshotId;
-    const base = snapshotId ? { snapshotId } : {};
-    if (pull.status !== "pulled" && pull.status !== "up-to-date") {
-      logger.warn("sync", `pull non-success`, { status: pull.status });
-      return { ...pull, ...base };
-    }
-    pulled = pulled || pull.status === "pulled";
-    filesChanged = filesChanged || pull.status === "pulled" && pull.filesChanged;
-    if (pull.status === "pulled") {
-      for (const f of pull.combinedFiles ?? [])
-        combinedFiles.add(f);
-      imageClashes.push(...pull.imageClashes ?? []);
-    }
-    const push = await pushChanges(options);
-    snapshotId = snapshotId ?? push.snapshotId;
-    switch (push.status) {
-      case "pushed":
-        logger.info("sync", `synced`, { pulled });
-        return {
-          status: "synced",
-          message: pulled ? MSG_SYNCED_MERGED : MSG_SYNCED,
-          mergedRemoteChanges: pulled,
-          ...filesChanged ? { filesChanged: true } : {},
-          ...convergeExtras(),
-          ...snapshotId ? { snapshotId } : {}
-        };
-      case "up-to-date":
-        logger.info("sync", `up-to-date`, { pulled });
-        return {
-          status: "up-to-date",
-          message: pulled ? MSG_UP_TO_DATE_PULLED : MSG_UP_TO_DATE,
-          ...filesChanged ? { filesChanged: true } : {},
-          ...snapshotId ? { snapshotId } : {}
-        };
-      case "pull-first":
-        logger.info("sync", `push rejected (non-fast-forward) — retrying`);
-        if (attempt < attempts - 1 && backoffMs > 0)
-          await sleep(backoffMs);
-        continue;
-      default:
-        logger.warn("sync", `push non-success`, { status: push.status });
-        return {
-          ...push,
-          ...filesChanged ? { filesChanged: true } : {},
-          ...snapshotId ? { snapshotId } : {}
-        };
-    }
-  }
-  logger.error("sync", `exhausted ${attempts} retry attempts (race)`);
-  return {
-    status: "error",
-    message: MSG_BUSY,
-    ...filesChanged ? { filesChanged: true } : {},
-    ...convergeExtras(),
-    ...snapshotId ? { snapshotId } : {}
-  };
-}
-async function pullChanges(options) {
-  const http2 = options.httpClient ?? defaultGitHttp;
   const dir = await repoDirFor(options.projectDir);
   return withRepoLock(dir, async () => {
     const logger = resolveLogger(options.logFile, "sync");
-    await assertNoStructuralDamage(options.projectDir, logger);
     const cache2 = {};
     let snapshotId;
+    let pulled = false;
+    let filesChanged = false;
+    const combinedFiles = new Set;
+    const keptBothFiles = [];
+    const base = () => ({
+      ...filesChanged ? { filesChanged: true } : {},
+      ...snapshotId ? { snapshotId } : {}
+    });
+    const convergeExtras = () => ({
+      ...combinedFiles.size > 0 ? { combinedFiles: [...combinedFiles].sort() } : {},
+      ...keptBothFiles.length > 0 ? { keptBothFiles } : {}
+    });
     try {
       const branch = await currentBranchOrThrow(dir);
       const transport = await resolveTransport(dir, options);
-      snapshotId = await snapshotBeforeAction({
-        projectDir: options.projectDir,
-        dir,
-        message: options.message,
-        authorName: options.authorName,
-        authorEmail: options.authorEmail,
-        cache: cache2
-      });
-      const remoteTip = await fetchRemoteTip(dir, branch, transport, http2, cache2);
-      const localTip = await git7.resolveRef({ fs: fs8, dir, ref: branch });
-      const base = snapshotId ? { snapshotId } : {};
-      logger.info("pull", `branch=${branch} local=${short(localTip)} fetched=${short(remoteTip)}`);
-      if (!remoteTip || remoteTip === localTip) {
-        return { status: "up-to-date", message: MSG_PULL_UP_TO_DATE, ...base };
-      }
-      let converge;
-      try {
-        converge = await convergeMerge({
+      if (push) {
+        snapshotId = await snapshotBeforeAction({
+          projectDir: options.projectDir,
           dir,
-          cache: cache2,
-          branch,
-          theirs: remoteTip,
-          author: await resolveGitAuthor(dir, options.authorName, options.authorEmail),
+          message: options.message,
           authorName: options.authorName,
-          authorEmail: options.authorEmail
+          authorEmail: options.authorEmail,
+          cache: cache2
         });
-      } catch (e) {
-        if (isUnrelatedHistories(e)) {
-          logger.warn("pull", "unrelated histories — refusing to combine");
-          return { status: "error", message: MSG_UNRELATED, ...base };
-        }
-        throw e;
       }
-      const newTip = converge.oid;
-      if (newTip === localTip) {
-        return { status: "up-to-date", message: MSG_PULL_UP_TO_DATE, ...base };
-      }
-      if (converge.combinedFiles.length > 0) {
-        logger.info("pull", `combined with markers`, { files: converge.combinedFiles });
-      }
-      const merged = newTip !== remoteTip;
-      const treeBefore = (await git7.readCommit({ fs: fs8, dir, cache: cache2, oid: localTip })).commit.tree;
-      const treeAfter = (await git7.readCommit({ fs: fs8, dir, cache: cache2, oid: newTip })).commit.tree;
-      return {
-        status: "pulled",
-        message: merged ? MSG_PULLED_MERGED : MSG_PULLED,
-        merged,
-        filesChanged: treeBefore !== treeAfter,
-        ...converge.combinedFiles.length > 0 ? { combinedFiles: converge.combinedFiles } : {},
-        ...converge.imageClashes.length > 0 ? { imageClashes: converge.imageClashes } : {},
-        ...base
-      };
-    } catch (e) {
-      const setupMsg = setupErrorMessage(e);
-      if (setupMsg) {
+      for (let attempt = 0;attempt < attempts; attempt++) {
+        logger.info("sync", `sync pass ${attempt + 1}/${attempts}`);
+        const remoteTip = await fetchRemoteTip(dir, branch, transport, http2, cache2);
+        let localTip = await git6.resolveRef({ fs: gitFs, dir, ref: branch });
+        if (push || remoteTip !== null && remoteTip !== localTip) {
+          const lateSnapshot = await snapshotBeforeAction({
+            projectDir: options.projectDir,
+            dir,
+            message: SYNC_LATE_EDIT_MESSAGE,
+            authorName: options.authorName,
+            authorEmail: options.authorEmail,
+            cache: cache2
+          });
+          if (lateSnapshot) {
+            snapshotId = lateSnapshot;
+            localTip = await git6.resolveRef({ fs: gitFs, dir, ref: branch });
+          }
+        }
+        logger.info("sync", `branch=${branch} local=${short(localTip)} fetched=${short(remoteTip)} snapshot=${snapshotId ? short(snapshotId) : "none"}`);
+        let tip = localTip;
+        if (remoteTip && remoteTip !== localTip) {
+          let converge;
+          try {
+            converge = await convergeMerge({
+              dir,
+              cache: cache2,
+              branch,
+              theirs: remoteTip,
+              author: await resolveGitAuthor(dir, options.authorName, options.authorEmail),
+              authorName: options.authorName,
+              authorEmail: options.authorEmail
+            });
+          } catch (e) {
+            if (isUnrelatedHistories(e)) {
+              logger.warn("sync", "unrelated histories — refusing to combine");
+              return { status: "error", message: MSG_UNRELATED, ...base() };
+            }
+            throw e;
+          }
+          tip = converge.oid;
+          if (tip !== localTip) {
+            pulled = true;
+            const [before, after] = await Promise.all([
+              git6.readCommit({ fs: gitFs, dir, cache: cache2, oid: localTip }),
+              git6.readCommit({ fs: gitFs, dir, cache: cache2, oid: tip })
+            ]);
+            filesChanged = filesChanged || before.commit.tree !== after.commit.tree;
+            for (const f of converge.combinedFiles)
+              combinedFiles.add(f);
+            keptBothFiles.push(...converge.keptBothFiles);
+            if (converge.combinedFiles.length > 0) {
+              logger.info("sync", `combined with markers`, { files: converge.combinedFiles });
+            }
+          }
+        }
+        if (tip === remoteTip) {
+          logger.info("sync", `up-to-date`, { pulled });
+          return {
+            status: "up-to-date",
+            message: pulled ? MSG_UP_TO_DATE_PULLED : MSG_UP_TO_DATE,
+            ...base()
+          };
+        }
+        if (!push) {
+          logger.info("sync", `pull-only pass complete — push deferred`, { pulled });
+          return {
+            status: "up-to-date",
+            message: pulled ? MSG_UP_TO_DATE_PULLED : MSG_UP_TO_DATE,
+            ...convergeExtras(),
+            ...base()
+          };
+        }
+        try {
+          await git6.push({
+            fs: gitFs,
+            http: http2,
+            dir,
+            cache: cache2,
+            remote: transport.remote,
+            ref: branch,
+            ...onAuthFor(transport.credential)
+          });
+        } catch (e) {
+          if (!isPushRejected(e))
+            throw e;
+          logger.info("sync", `push rejected (non-fast-forward) — retrying`);
+          if (attempt < attempts - 1 && backoffMs > 0)
+            await sleep(backoffMs);
+          continue;
+        }
+        logger.info("sync", `synced`, { pulled });
         return {
-          status: "error",
-          message: setupMsg,
-          ...snapshotId ? { snapshotId } : {}
+          status: "synced",
+          message: pulled ? MSG_SYNCED_MERGED : MSG_SYNCED,
+          mergedRemoteChanges: pulled,
+          ...convergeExtras(),
+          ...base()
         };
       }
-      return failureOutcome(e, snapshotId);
-    }
-  });
-}
-async function pushChanges(options) {
-  const http2 = options.httpClient ?? defaultGitHttp;
-  const dir = await repoDirFor(options.projectDir);
-  return withRepoLock(dir, async () => {
-    const logger = resolveLogger(options.logFile, "sync");
-    await assertNoStructuralDamage(options.projectDir, logger);
-    const cache2 = {};
-    let snapshotId;
-    try {
-      const branch = await currentBranchOrThrow(dir);
-      const transport = await resolveTransport(dir, options);
-      snapshotId = await snapshotBeforeAction({
-        projectDir: options.projectDir,
-        dir,
-        message: options.message,
-        authorName: options.authorName,
-        authorEmail: options.authorEmail,
-        cache: cache2
-      });
-      const remoteTip = await fetchRemoteTip(dir, branch, transport, http2, cache2);
-      const localTip = await git7.resolveRef({ fs: fs8, dir, ref: branch });
-      const base = snapshotId ? { snapshotId } : {};
-      logger.info("push", `branch=${branch} local=${short(localTip)} fetched=${short(remoteTip)} snapshot=${snapshotId ? short(snapshotId) : "none"}`);
-      if (remoteTip === localTip) {
-        return { status: "up-to-date", message: MSG_PUSH_UP_TO_DATE, ...base };
-      }
-      try {
-        await git7.push({
-          fs: fs8,
-          http: http2,
-          dir,
-          cache: cache2,
-          remote: transport.remote,
-          ref: branch,
-          ...onAuthFor(transport.credential)
-        });
-      } catch (e) {
-        if (isPushRejected(e)) {
-          return { status: "pull-first", message: MSG_PULL_FIRST, ...base };
-        }
-        throw e;
-      }
-      return { status: "pushed", message: MSG_SYNCED, ...base };
+      logger.error("sync", `exhausted ${attempts} retry attempts (race)`);
+      return { status: "error", message: MSG_BUSY, ...convergeExtras(), ...base() };
     } catch (e) {
       const setupMsg = setupErrorMessage(e);
-      if (setupMsg) {
-        return {
-          status: "error",
-          message: setupMsg,
-          ...snapshotId ? { snapshotId } : {}
-        };
+      if (setupMsg)
+        return { status: "error", message: setupMsg, ...base() };
+      if (await historyUnreadable(dir)) {
+        logger.error("sync", "the project's history could not be read");
+        return { status: "error", message: MSG_HISTORY_UNREADABLE, ...base() };
       }
-      return failureOutcome(e, snapshotId);
+      return { ...failureOutcome(e, snapshotId), ...filesChanged ? { filesChanged: true } : {} };
     }
   });
 }
-// src/lib/remote-auth/image-clash.ts
-import * as fs9 from "node:fs";
-import { mkdir as mkdir16, writeFile as writeFile15 } from "node:fs/promises";
-import path26 from "node:path";
-import git8 from "isomorphic-git";
-var OID = /^[0-9a-f]{40}$/;
-function assertSafeRelativePath(filepath) {
-  if (path26.isAbsolute(filepath) || filepath.split(/[\\/]/).some((seg) => seg === "..")) {
-    throw new Error("Invalid file path.");
-  }
-}
-async function readImageVersion(options) {
-  if (!OID.test(options.oid))
-    throw new Error("Invalid version id.");
-  const dir = await repoDirFor(options.projectDir);
-  const { blob } = await git8.readBlob({ fs: fs9, dir, oid: options.oid });
-  return blob;
-}
-async function keepImageVersion(options) {
-  if (!OID.test(options.oid))
-    throw new Error("Invalid version id.");
-  assertSafeRelativePath(options.path);
-  const dir = await repoDirFor(options.projectDir);
-  await withRepoLock(dir, async () => {
-    const { blob } = await git8.readBlob({ fs: fs9, dir, oid: options.oid });
-    const abs = path26.join(dir, options.path);
-    await mkdir16(path26.dirname(abs), { recursive: true });
-    await writeFile15(abs, blob);
-    await snapshotWorkingTreeUnlocked({
-      projectDir: dir,
-      repoRoot: dir,
-      message: `Kept your chosen version of ${path26.posix.basename(options.path)}`,
-      authorName: options.authorName,
-      authorEmail: options.authorEmail
-    }).catch((e) => {
-      if (!(e instanceof Error && /nothing new to save/i.test(e.message)))
-        throw e;
-    });
-  });
-}
 // src/lib/publish/run-publish.ts
-import { readdir as readdir12, stat as stat11 } from "node:fs/promises";
-import path29 from "node:path";
+import { readdir as readdir11, stat as stat10 } from "node:fs/promises";
+import path26 from "node:path";
 
 // src/lib/publish/command-runner.ts
 var CAPTURE_LIMIT = 64 * 1024;
@@ -13866,25 +13523,25 @@ ${tail}` : ""}`);
 };
 
 // src/lib/publish/providers/guided.ts
-import { copyFile as copyFile2, mkdir as mkdir17, writeFile as writeFile16 } from "node:fs/promises";
-import path27 from "node:path";
+import { copyFile as copyFile2, mkdir as mkdir16, writeFile as writeFile13 } from "node:fs/promises";
+import path24 from "node:path";
 async function stageGuidedPackage(req, providerId, listingLines) {
-  const packageDir = path27.join(path27.dirname(req.artifact.path), "publish", providerId);
-  await mkdir17(packageDir, { recursive: true });
-  await copyFile2(req.artifact.path, path27.join(packageDir, path27.basename(req.artifact.path)));
+  const packageDir = path24.join(path24.dirname(req.artifact.path), "publish", providerId);
+  await mkdir16(packageDir, { recursive: true });
+  await copyFile2(req.artifact.path, path24.join(packageDir, path24.basename(req.artifact.path)));
   const { title, authors } = req.project;
   const sheet = [
     `# ${title || "Untitled"}`,
     "",
     `- **Authors:** ${authors.length ? authors.join(", ") : "(not set)"}`,
-    `- **File:** ${path27.basename(req.artifact.path)}`,
+    `- **File:** ${path24.basename(req.artifact.path)}`,
     ...listingLines,
     "",
     "Copy these details into the platform's listing form when uploading.",
     ""
   ].join(`
 `);
-  await writeFile16(path27.join(packageDir, "LISTING.md"), sheet, "utf8");
+  await writeFile13(path24.join(packageDir, "LISTING.md"), sheet, "utf8");
   return packageDir;
 }
 
@@ -13947,8 +13604,8 @@ var drivethrurpgProvider = {
 };
 
 // src/lib/publish/butler.ts
-import { chmod as chmod2, mkdir as mkdir18, stat as stat10, writeFile as writeFile17 } from "node:fs/promises";
-import path28 from "node:path";
+import { chmod as chmod2, mkdir as mkdir17, stat as stat9, writeFile as writeFile14 } from "node:fs/promises";
+import path25 from "node:path";
 import { unzipSync as unzipSync2 } from "fflate";
 var BUTLER_DOWNLOAD_TIMEOUT_MS = 300000;
 function butlerBrothChannel(platform2 = process.platform, arch2 = process.arch) {
@@ -13968,7 +13625,7 @@ function butlerBinaryName(platform2 = process.platform) {
 }
 async function fileExists2(p) {
   try {
-    return (await stat10(p)).isFile();
+    return (await stat9(p)).isFile();
   } catch {
     return false;
   }
@@ -13985,8 +13642,8 @@ async function ensureButler(deps) {
   }
   if (await commandExists("butler", runCommand, deps.env))
     return "butler";
-  const cacheDir = path28.join(deps.configDir ?? defaultConfigDir(), "tools", "butler");
-  const cached = path28.join(cacheDir, butlerBinaryName());
+  const cacheDir = path25.join(deps.configDir ?? defaultConfigDir(), "tools", "butler");
+  const cached = path25.join(cacheDir, butlerBinaryName());
   if (await fileExists2(cached))
     return cached;
   const channel = butlerBrothChannel();
@@ -14008,14 +13665,14 @@ async function ensureButler(deps) {
     return new Uint8Array(await response.arrayBuffer());
   });
   const files = unzipSync2(archive);
-  await mkdir18(cacheDir, { recursive: true });
+  await mkdir17(cacheDir, { recursive: true });
   let foundBinary = false;
   for (const [name, data] of Object.entries(files)) {
     if (name.endsWith("/"))
       continue;
-    const target = path28.join(cacheDir, path28.basename(name));
-    await writeFile17(target, data);
-    if (path28.basename(name) === butlerBinaryName()) {
+    const target = path25.join(cacheDir, path25.basename(name));
+    await writeFile14(target, data);
+    if (path25.basename(name) === butlerBinaryName()) {
       await chmod2(target, 493).catch(() => {});
       foundBinary = true;
     }
@@ -14453,9 +14110,9 @@ async function resolvePublishRequest(options, deps) {
   const effectiveAccount = bookAccount || deps.credentialAccount;
   const effectiveDeps = effectiveAccount ? { ...deps, credentialAccount: effectiveAccount } : deps;
   const outDir = resolveOutputDir(manifestDir, config.title);
-  const defaultArtifact = provider.info.format === "pdf" ? path29.join(outDir, artifactName(config.title, "pdf")) : outDir;
+  const defaultArtifact = provider.info.format === "pdf" ? path26.join(outDir, artifactName(config.title, "pdf")) : outDir;
   const artifact = {
-    path: options.artifactPath ? path29.resolve(options.projectDir, options.artifactPath) : defaultArtifact,
+    path: options.artifactPath ? path26.resolve(options.projectDir, options.artifactPath) : defaultArtifact,
     format: provider.info.format
   };
   return {
@@ -14473,7 +14130,7 @@ var PDF_HINT = "Build the PDF first (gutterpress build, or export it from the ap
 var HTML_HINT = "Build the website export first (gutterpress build --format html).";
 async function artifactIssues(artifact) {
   try {
-    const s = await stat11(artifact.path);
+    const s = await stat10(artifact.path);
     if (artifact.format === "pdf" && !s.isFile()) {
       return [
         {
@@ -14519,7 +14176,7 @@ async function artifactIssues(artifact) {
 var BUILD_FINGERPRINT_FILENAME = "build-fingerprint.json";
 async function htmlDirIssues(dir) {
   const issues = [];
-  const isThere = async (rel) => stat11(path29.join(dir, rel)).then(() => true, () => false);
+  const isThere = async (rel) => stat10(path26.join(dir, rel)).then(() => true, () => false);
   if (!await isThere(BOOK_HTML)) {
     issues.push({
       severity: "error",
@@ -14527,7 +14184,7 @@ async function htmlDirIssues(dir) {
       message: `${dir} has no ${BOOK_HTML} — it isn't an HTML export. ${HTML_HINT}`
     });
   }
-  const entries = await readdir12(dir).catch(() => []);
+  const entries = await readdir11(dir).catch(() => []);
   const extras = entries.filter((name) => name.toLowerCase().endsWith(".pdf") || name === BUILD_FINGERPRINT_FILENAME);
   if (extras.length > 0) {
     issues.push({
@@ -14626,17 +14283,17 @@ async function connectPublishProvider(options, deps) {
   return { connected: true, providerId: info7.id };
 }
 // src/lib/publish/selections.ts
-import { chmod as chmod3, mkdir as mkdir19, readFile as readFile32, writeFile as writeFile18 } from "node:fs/promises";
-import path30 from "node:path";
+import { chmod as chmod3, mkdir as mkdir18, readFile as readFile31, writeFile as writeFile15 } from "node:fs/promises";
+import path27 from "node:path";
 class PublishSelectionsStore {
   filePath;
   queue = Promise.resolve();
   constructor(filePath) {
-    this.filePath = filePath ?? path30.join(defaultConfigDir(), "publish-selections.json");
+    this.filePath = filePath ?? path27.join(defaultConfigDir(), "publish-selections.json");
   }
   async read() {
     try {
-      const raw = await readFile32(this.filePath, "utf8");
+      const raw = await readFile31(this.filePath, "utf8");
       const parsed = JSON.parse(raw);
       if (parsed && typeof parsed === "object") {
         return {
@@ -14649,8 +14306,8 @@ class PublishSelectionsStore {
     return { version: 1, global: {}, projects: {} };
   }
   async write(data) {
-    await mkdir19(path30.dirname(this.filePath), { recursive: true });
-    await writeFile18(this.filePath, JSON.stringify(data, null, 2), {
+    await mkdir18(path27.dirname(this.filePath), { recursive: true });
+    await writeFile15(this.filePath, JSON.stringify(data, null, 2), {
       encoding: "utf8",
       mode: 384
     });
@@ -14752,372 +14409,4 @@ async function setPublishProviderConfig(projectDir, providerId, values) {
   await writeManifestDoc(file, doc);
   return settingsFromDoc(doc);
 }
-// src/lib/remote-auth/recovery/repair.ts
-import * as fs10 from "node:fs";
-import { cp as cp6, mkdtemp as mkdtemp4, rename as rename6, rm as rm10 } from "node:fs/promises";
-import os4 from "node:os";
-import path31 from "node:path";
-import git9 from "isomorphic-git";
-var INTERRUPTED_STATE = [
-  "MERGE_HEAD",
-  "MERGE_MSG",
-  "MERGE_MODE",
-  "CHERRY_PICK_HEAD",
-  "REVERT_HEAD",
-  "sequencer",
-  "rebase-merge",
-  "rebase-apply"
-];
-var MSG_REPAIRED = "Your project's version history is working again. Your files were not changed.";
-var MSG_RETRY = "Another program may be using this project's history right now — try again in a moment.";
-var MSG_FAILED = "Your project's history couldn't be repaired automatically, but your files are safe and untouched.";
-function stamp() {
-  return new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
-}
-async function indexReadable(dir) {
-  try {
-    await git9.listFiles({ fs: fs10, dir });
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function rebuildIndexFromHead(dir) {
-  await rm10(path31.join(gitDirFor(dir), "index"), { force: true });
-  const cache2 = {};
-  let files;
-  try {
-    files = await git9.listFiles({ fs: fs10, dir, ref: "HEAD" });
-  } catch {
-    return;
-  }
-  for (const filepath of files) {
-    await git9.resetIndex({ fs: fs10, dir, cache: cache2, filepath, ref: "HEAD" });
-  }
-}
-function readDamagedBranchTips(damagedGitDir) {
-  const tips = new Map;
-  const OID2 = /^[0-9a-f]{40}$/;
-  try {
-    const packed = fs10.readFileSync(path31.join(damagedGitDir, "packed-refs"), "utf8");
-    for (const line of packed.split(`
-`)) {
-      const m = /^([0-9a-f]{40}) refs\/heads\/(.+)$/.exec(line.trim());
-      if (m)
-        tips.set(m[2], m[1]);
-    }
-  } catch {}
-  const headsDir = path31.join(damagedGitDir, "refs", "heads");
-  const walk = (dir, prefix) => {
-    let entries;
-    try {
-      entries = fs10.readdirSync(dir, { withFileTypes: true });
-    } catch {
-      return;
-    }
-    for (const e of entries) {
-      const name = prefix ? `${prefix}/${e.name}` : e.name;
-      if (e.isDirectory())
-        walk(path31.join(dir, e.name), name);
-      else if (e.isFile()) {
-        try {
-          const oid = fs10.readFileSync(path31.join(dir, e.name), "utf8").trim();
-          if (OID2.test(oid))
-            tips.set(name, oid);
-        } catch {}
-      }
-    }
-  };
-  walk(headsDir, "");
-  return [...tips].map(([name, oid]) => ({ name, oid }));
-}
-async function looseCommitTips(dir, cache2) {
-  const objectsDir = path31.join(gitDirFor(dir), "objects");
-  const oids = [];
-  let fanouts;
-  try {
-    fanouts = fs10.readdirSync(objectsDir).filter((e) => /^[0-9a-f]{2}$/.test(e));
-  } catch {
-    return [];
-  }
-  for (const fan of fanouts) {
-    let files;
-    try {
-      files = fs10.readdirSync(path31.join(objectsDir, fan));
-    } catch {
-      continue;
-    }
-    for (const f of files) {
-      if (/^[0-9a-f]{38}$/.test(f))
-        oids.push(fan + f);
-    }
-  }
-  const commits = new Map;
-  for (const oid of oids) {
-    try {
-      const obj = await git9.readObject({ fs: fs10, dir, cache: cache2, oid, format: "parsed" });
-      if (obj.type === "commit") {
-        commits.set(oid, obj.object.parent ?? []);
-      }
-    } catch {}
-  }
-  const isParent = new Set;
-  for (const parents of commits.values())
-    for (const p of parents)
-      isParent.add(p);
-  return [...commits.keys()].filter((oid) => !isParent.has(oid));
-}
-async function targetBranch(dir) {
-  try {
-    const branches = await git9.listBranches({ fs: fs10, dir });
-    if (branches.includes("main"))
-      return "main";
-    if (branches.includes("master"))
-      return "master";
-    if (branches.length > 0)
-      return branches[0];
-  } catch {}
-  return "main";
-}
-async function repairRepo(options) {
-  const dir = await repoDirFor(options.projectDir);
-  return withRepoLock(dir, () => repairLocked(dir, options));
-}
-async function repairLocked(dir, options) {
-  const logger = resolveLogger(options.logFile, "repair");
-  const gitDir = gitDirFor(dir);
-  const actions = [];
-  const snapshotFiles = async (message) => {
-    try {
-      if (await hasPendingChanges(dir)) {
-        await snapshotWorkingTreeUnlocked({
-          projectDir: dir,
-          repoRoot: dir,
-          message,
-          authorName: options.authorName,
-          authorEmail: options.authorEmail
-        });
-      }
-    } catch (e) {
-      if (!isNoChangesError(e))
-        throw e;
-    }
-  };
-  try {
-    if (fs10.existsSync(gitDir)) {
-      const sweep = await sweepStaleLocks(gitDir);
-      if (sweep === "fresh") {
-        logger.info("repair", "fresh lock present — deferring");
-        return { status: "retry_later", message: MSG_RETRY, actions, retryAfterMs: 30000 };
-      }
-      if (sweep === "swept") {
-        actions.push("Removed leftover lock files from an interrupted operation.");
-        logger.info("repair", "swept stale locks");
-      }
-    }
-    if (fs10.existsSync(gitDir)) {
-      let removedState = false;
-      for (const name of INTERRUPTED_STATE) {
-        const p = path31.join(gitDir, name);
-        if (fs10.existsSync(p)) {
-          await rm10(p, { recursive: true, force: true });
-          removedState = true;
-        }
-      }
-      if (removedState) {
-        actions.push("Cleared an unfinished operation another program left behind.");
-        logger.info("repair", "removed interrupted-operation state");
-        await rebuildIndexFromHead(dir);
-      } else if (!await indexReadable(dir)) {
-        await rebuildIndexFromHead(dir);
-        actions.push("Rebuilt the project's tracking information.");
-        logger.info("repair", "rebuilt corrupt index");
-      }
-    }
-    let health = await inspectRepo({ repoDir: dir }, { checkLocalChanges: false });
-    if (health.hasGitDir && !health.headUnreadable && health.isDetachedHead) {
-      await snapshotFiles("Saved your latest changes");
-      const headOid = await git9.resolveRef({ fs: fs10, dir, ref: "HEAD" });
-      const rescueRef = `refs/heads/recovered-${stamp()}`;
-      await git9.writeRef({ fs: fs10, dir, ref: rescueRef, value: headOid, force: true });
-      const branch = await targetBranch(dir);
-      const branchExists = (await git9.listBranches({ fs: fs10, dir })).includes(branch);
-      if (!branchExists) {
-        await git9.writeRef({ fs: fs10, dir, ref: `refs/heads/${branch}`, value: headOid, force: true });
-      }
-      await git9.writeRef({
-        fs: fs10,
-        dir,
-        ref: "HEAD",
-        value: `refs/heads/${branch}`,
-        symbolic: true,
-        force: true
-      });
-      const cache2 = {};
-      await git9.checkout({ fs: fs10, dir, cache: cache2, ref: branch, force: true });
-      const branchTip = await git9.resolveRef({ fs: fs10, dir, ref: branch });
-      if (branchTip !== headOid) {
-        await convergeMerge({
-          dir,
-          cache: cache2,
-          branch,
-          theirs: headOid,
-          author: await resolveGitAuthor(dir, options.authorName, options.authorEmail),
-          authorName: options.authorName,
-          authorEmail: options.authorEmail,
-          allowUnrelatedHistories: true
-        });
-      }
-      actions.push("Reconnected your work to the project's version line.");
-      logger.info("repair", "reattached detached HEAD", { rescueRef });
-    }
-    health = await inspectRepo({ repoDir: dir }, { checkLocalChanges: false });
-    if (classifyFromHealth(health, { minLockAgeMs: 0 }) === null) {
-      await snapshotFiles("Saved your latest changes");
-      logger.info("repair", "repaired in place", { actions: actions.length });
-      return { status: "repaired", message: MSG_REPAIRED, actions };
-    }
-    return await recloneWithSalvage(dir, options, actions, logger, snapshotFiles);
-  } catch (e) {
-    logger.error("repair", "repair failed", { error: e instanceof Error ? e.message : String(e) });
-    return { status: "failed", message: MSG_FAILED, actions };
-  }
-}
-async function recloneWithSalvage(dir, options, actions, logger, snapshotFiles) {
-  const gitDir = gitDirFor(dir);
-  let remoteUrl;
-  let credential;
-  try {
-    const transport = await resolveTransport(dir, {
-      credential: options.credential,
-      tokenStore: options.tokenStore
-    });
-    remoteUrl = transport.url;
-    credential = transport.credential;
-  } catch {
-    remoteUrl = undefined;
-  }
-  let freshGitDir;
-  let tempDir;
-  if (remoteUrl) {
-    tempDir = await mkdtemp4(path31.join(os4.tmpdir(), "gutterpress-repair-"));
-    const cloneDir = path31.join(tempDir, "clone");
-    try {
-      await cloneRepository({
-        url: remoteUrl,
-        dir: cloneDir,
-        ...credential ? { credential } : {}
-      });
-    } catch (e) {
-      await rm10(tempDir, { recursive: true, force: true });
-      logger.warn("repair", "re-clone failed — deferring", {
-        error: e instanceof Error ? e.message : String(e)
-      });
-      return {
-        status: "retry_later",
-        message: "The online copy couldn't be reached to finish the repair. Your files are safe — it will be tried again.",
-        actions,
-        retryAfterMs: 60000
-      };
-    }
-    freshGitDir = path31.join(cloneDir, ".git");
-  } else {
-    tempDir = await mkdtemp4(path31.join(os4.tmpdir(), "gutterpress-repair-"));
-    const initDir = path31.join(tempDir, "init");
-    fs10.mkdirSync(initDir, { recursive: true });
-    await git9.init({ fs: fs10, dir: initDir, defaultBranch: "main" });
-    freshGitDir = path31.join(initDir, ".git");
-  }
-  let damagedBackup;
-  if (fs10.existsSync(gitDir)) {
-    damagedBackup = path31.join(dir, `.git-damaged-${stamp()}`);
-    await rename6(gitDir, damagedBackup);
-    actions.push("Kept the old history folder on disk as a backup.");
-  }
-  await rename6(freshGitDir, gitDir);
-  if (tempDir)
-    await rm10(tempDir, { recursive: true, force: true });
-  actions.push(remoteUrl ? "Rebuilt the project's history from the online copy." : "Started a fresh history for the project (no online copy is connected).");
-  logger.info("repair", "replaced .git", { fromRemote: Boolean(remoteUrl), damagedBackup });
-  if (damagedBackup) {
-    const from = path31.join(damagedBackup, "objects");
-    if (fs10.existsSync(from)) {
-      await cp6(from, path31.join(gitDir, "objects"), {
-        recursive: true,
-        force: false,
-        errorOnExist: false
-      }).catch(() => {});
-    }
-    const branch = await targetBranch(dir);
-    let branchExists = (await git9.listBranches({ fs: fs10, dir })).includes(branch);
-    const scanCache = {};
-    const tips = new Map;
-    for (const tip of readDamagedBranchTips(damagedBackup)) {
-      tips.set(tip.oid, tip.name);
-    }
-    for (const oid of await looseCommitTips(dir, scanCache)) {
-      if (!tips.has(oid))
-        tips.set(oid, "recovered-work");
-    }
-    for (const [oid, name] of tips) {
-      const cache2 = {};
-      try {
-        await git9.readCommit({ fs: fs10, dir, cache: cache2, oid });
-      } catch {
-        logger.warn("repair", "old tip unreadable — left in the backup", { tip: name });
-        continue;
-      }
-      if (!branchExists) {
-        await git9.writeRef({ fs: fs10, dir, ref: `refs/heads/${branch}`, value: oid, force: true });
-        await git9.writeRef({
-          fs: fs10,
-          dir,
-          ref: "HEAD",
-          value: `refs/heads/${branch}`,
-          symbolic: true,
-          force: true
-        });
-        await rebuildIndexFromHead(dir);
-        branchExists = true;
-        actions.push("Restored your saved history from the backup.");
-        continue;
-      }
-      try {
-        const branchTip = await git9.resolveRef({ fs: fs10, dir, ref: branch });
-        if (branchTip === oid)
-          continue;
-        await convergeMerge({
-          dir,
-          cache: cache2,
-          branch,
-          theirs: oid,
-          author: await resolveGitAuthor(dir, options.authorName, options.authorEmail),
-          authorName: options.authorName,
-          authorEmail: options.authorEmail,
-          allowUnrelatedHistories: true
-        });
-        actions.push("Brought your earlier saved versions back into the history.");
-      } catch (e) {
-        logger.warn("repair", "old tip could not be merged — pinned as a recovery branch", {
-          tip: name,
-          error: e instanceof Error ? e.message : String(e)
-        });
-        await git9.writeRef({
-          fs: fs10,
-          dir,
-          ref: `refs/heads/recovered-${stamp()}-${name.replace(/[^A-Za-z0-9_-]/g, "_")}`,
-          value: oid,
-          force: true
-        }).catch(() => {});
-      }
-    }
-  }
-  await snapshotFiles("Saved your files after repairing the project");
-  return {
-    status: "repaired",
-    message: MSG_REPAIRED,
-    actions,
-    ...damagedBackup ? { damagedGitBackupPath: damagedBackup } : {}
-  };
-}
-export { PRESET_IDS, PRESETS, TARGETS, TARGET_IDS, publishTargetFor, MANIFEST_FILENAMES, hasProjectManifest, loadManifest, loadManifestWithPath, resolveConfig, log, resolveActiveStyles, listProjectStyles, PLUGINS_DIR, ruleRemoteUrls, ruleRiskyProps, ruleSyntax, checkCss, runLint, formatReport, getChecks, getCheckById, resolveCheckSelectors, inspectImage, runChecks, checkToolAvailability, reportMissingTools, executeValidation, executeAndReport, splitOutPath, runBuild, openPath, startPreviewServer, redactCredential, defaultConfigDir, FileTokenStore, extractUrlCredential, migrateUrlCredential, getSystemDiagnostics, slugifyProjectName, escapeYamlScalar, scaffoldProject, adoptFolder, BUILT_IN_TEMPLATE_IDS, listBuiltInTemplates, saveProjectAsTemplate, listCustomTemplates, importTemplateFromFolder, SNIPPETS_DIR, extractVariables, substituteVariables, listSnippets, readSnippet, saveSnippet, deleteSnippet, RECOMMENDED_PLUGINS, listProjectPlugins, setPluginEnabled, addNpmPlugin, addLocalPlugin, validateProjectPlugins, THEMES_DIR, BUILT_IN_THEME_IDS, listBuiltInThemes, resolveBuiltInTheme, listProjectThemes, getActiveTheme, getPreviousTheme, revertTheme, applyTheme, importThemeFromFolder, importThemeFromUrl, readThemeCss, removeProjectTheme, importThemeFromFile, setManifestFields, readManifestFields, setActiveStyles, APP_HEARTBEAT_FRESH_MS, heartbeatTtlMs, appHeartbeatPath, writeAppHeartbeat, removeAppHeartbeat, readAppHeartbeat, isAppHeartbeatFresh, AUTO_SNAPSHOT_MIN_MINUTES, AUTO_SNAPSHOT_MAX_MINUTES, AUTO_SNAPSHOT_DEFAULT_MINUTES, AUTO_SYNC_MIN_MINUTES, AUTO_SYNC_MAX_MINUTES, AUTO_SYNC_DEFAULT_MINUTES, autoSnapshotDelayMs, autoSyncDelayMs, isGitInternalPath, resolveGitHubClientId, GITHUB_HOST, GitHubAuthProvider, listGitHubRepositories, listRepoBooks, listGitHubBranches, STALE_LOCK_MIN_AGE_MS, RepoNeedsRecoveryError, isRepoNeedsRecoveryError, isLikelyRepoCorruption, classifyFromHealth, inspectRepo, verifyRepoReadable, isUnbornRepo, preflightStructuralReason, buildPreflightDiagnostics, SYNC_SNAPSHOT_MESSAGE, provenancePath, readProjectProvenance, sanitizeCloneFolderName, cloneRepository, isSshRemoteUrl, testRemoteAccess, normalizeForgeHost, knownForgeTokenUrl, connectGenericHost, GenericTokenAuthProvider, parseRemoteOrigin, forgeKindForHost, diagnoseProjectRemote, syncProject, pullChanges, pushChanges, readImageVersion, keepImageVersion, publishCredentialKey, publishConnectionStatus, listPublishAccounts, listPublishProviders, publishProviderFor, resolvePublishRequest, runPublish, connectPublishProvider, PublishSelectionsStore, readPublishSettings, setPublishProviderConfig, repairRepo };
+export { PRESET_IDS, PRESETS, TARGETS, TARGET_IDS, publishTargetFor, MANIFEST_FILENAMES, hasProjectManifest, loadManifest, loadManifestWithPath, resolveConfig, SYNC_SNAPSHOT_MESSAGE, log, resolveActiveStyles, listProjectStyles, PLUGINS_DIR, ruleRemoteUrls, ruleRiskyProps, ruleSyntax, checkCss, runLint, formatReport, getChecks, getCheckById, resolveCheckSelectors, inspectImage, runChecks, checkToolAvailability, reportMissingTools, executeValidation, executeAndReport, splitOutPath, runBuild, openPath, startPreviewServer, defaultConfigDir, FileTokenStore, extractUrlCredential, getSystemDiagnostics, slugifyProjectName, escapeYamlScalar, scaffoldProject, adoptFolder, BUILT_IN_TEMPLATE_IDS, listBuiltInTemplates, saveProjectAsTemplate, listCustomTemplates, importTemplateFromFolder, SNIPPETS_DIR, extractVariables, substituteVariables, listSnippets, readSnippet, saveSnippet, deleteSnippet, RECOMMENDED_PLUGINS, listProjectPlugins, setPluginEnabled, addNpmPlugin, addLocalPlugin, validateProjectPlugins, THEMES_DIR, BUILT_IN_THEME_IDS, listBuiltInThemes, resolveBuiltInTheme, listProjectThemes, getActiveTheme, getPreviousTheme, revertTheme, applyTheme, importThemeFromFolder, importThemeFromUrl, readThemeCss, removeProjectTheme, importThemeFromFile, setManifestFields, readManifestFields, setActiveStyles, AUTO_SNAPSHOT_MIN_MINUTES, AUTO_SNAPSHOT_MAX_MINUTES, 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, listGitHubRepositories, listRepoBooks, listGitHubBranches, sanitizeCloneFolderName, cloneRepository, isSshRemoteUrl, testRemoteAccess, knownForgeTokenUrl, connectGenericHost, parseRemoteOrigin, forgeKindForHost, diagnoseProjectRemote, syncProject, publishCredentialKey, publishConnectionStatus, listPublishAccounts, listPublishProviders, publishProviderFor, resolvePublishRequest, runPublish, connectPublishProvider, PublishSelectionsStore, readPublishSettings, setPublishProviderConfig };