mnfst-publish 0.1.9 → 0.1.11

package/manifest.publish.mjs

@@ -301,7 +301,15 @@ export function collectFiles(root, outputDir) {
   // .manifestignore applies ON TOP of gitignore, so a versioned file can still be
   // kept out of the published bundle.
   const publishIgnored = loadPublishIgnore(root);
-  return rels.filter((r) => !isExcludedPath(r) && !publishIgnored(r));
+  return rels
+    .filter((r) => !isExcludedPath(r) && !publishIgnored(r))
+    // `git ls-files -c` reports paths from the index, not the working tree — a file
+    // committed once (e.g. an old build's <locale>/docs/** output) then deleted on
+    // disk without `git rm` still shows up here. Ship what's actually there; a
+    // stale tracked-but-missing path would otherwise crash buildZip with ENOENT
+    // (seen with mnfst-publish --no-render after a re-render dropped locale
+    // variants under an excluded route prefix).
+    .filter((r) => existsSync(join(root, r)));
 }
 
 // --- Upload + publish status ------------------------------------------------
@@ -313,8 +321,12 @@ export function collectFiles(root, outputDir) {
 // A server that predates this ignores the header and answers synchronously with
 // {ok:true}; both are handled below.
 const POLL_FIRST_MS = 1000;
-const POLL_MAX_MS = 5000;
+const POLL_MAX_MS = 2000;
 const POLL_TOTAL_MS = 10 * 60 * 1000;
+/* Ingest advances a bounded slice per status poll, so polls that observe the
+   `written` counter climbing must never give up: the overall cap applies only
+   while NO progress is being made. */
+const NO_PROGRESS_MS = 10 * 60 * 1000;
 // A status read that stays "pending" this long means the bundle never actually
 // arrived. The grace matters because the server's token record is eventually
 // consistent, so a brief stale "pending" right after an upload is normal.
@@ -353,6 +365,8 @@ export async function pollPublishStatus(statusUrl, opts = {}) {
   const started = now();
   let delay = POLL_FIRST_MS;
   let lastProgress = started;
+  let lastWritten = -1;
+  let lastAdvance = started;
 
   for (;;) {
     let status = 0;
@@ -380,11 +394,22 @@ export async function pollPublishStatus(statusUrl, opts = {}) {
     if (json && json.status === 'pending' && now() - started >= pendingGraceMs) {
       return { state: 'pending', body: json };
     }
+    // An HTTP error body that skips the {status:'error'} tag entirely (a plain
+    // {error, message} shape, same as an upload-time rejection) is still a
+    // settled failure, not a blip — UNLESS it's 429 (rate limited) or a 5xx,
+    // both of which are expected to be transient and worth retrying.
+    if (json && json.error && !json.status && status >= 400 && status !== 429 && status < 500) {
+      return { state: 'error', body: json };
+    }
     // Anything else (ingesting, pending inside the grace, 429, 5xx, a blip) —
     // keep waiting.
 
     const elapsed = now() - started;
-    if (elapsed >= totalMs) return { state: 'timeout' };
+    if (json && typeof json.written === 'number' && json.written > lastWritten) {
+      lastWritten = json.written;
+      lastAdvance = now();
+    }
+    if (now() - lastAdvance >= Math.min(totalMs, NO_PROGRESS_MS)) return { state: 'timeout' };
     if (elapsed - (lastProgress - started) >= PROGRESS_EVERY_MS) {
       lastProgress = now();
       logFn(`  still publishing… (${Math.round(elapsed / 1000)}s)`);
@@ -399,7 +424,8 @@ function settledPayload(res) {
   if (res.state === 'done') return res.body;
   if (res.state === 'error') {
     const b = res.body || {};
-    throw new Error(`publish failed${b.error ? ` (${b.error})` : ''}: ${b.message || 'the server rejected the upload.'}`);
+    const retrySafe = b.error === 'retry_upload' ? ' Re-running the same command is safe and cheap — nothing was double-charged or double-shipped.' : '';
+    throw new Error(`publish failed${b.error ? ` (${b.error})` : ''}: ${b.message || 'the server rejected the upload.'}${retrySafe}`);
   }
   if (res.state === 'unknown') {
     throw new Error('this publish link expired before the upload finished. Run the publish again.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnfst-publish",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "One-command managed publishing for Manifest projects — render, zip, upload, live URL.",
   "type": "module",
   "bin": {