@sprid/cli 1.2.2 → 1.2.4

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 sprid follows semver: a breaking change to a command's arguments, its output
 shape or its exit codes is a major release.
 
+## 1.2.4 - 2026-10-11
+
+- `sprid post sync` no longer reports a post as synced when its new media never reached Sprid. A file rebuilt since `register`, or a post whose checks are not passing, is now listed as not synced with the step that fixes it, and the command exits 1. `draft` also reads each slide back and says so when Sprid is still holding the old file.
+
+## 1.2.3 - 2026-10-08
+
+- `sprid screenshots` carries @sprid/shots 0.2.2: bounded device commands, retries for transient capture errors, and Android cold-boot recovery for capture hooks.
+
 ## 1.2.2 - 2026-10-08
 
 - `sprid screenshots` carries @sprid/shots 0.2.1: native capture saves a verified

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sprid/cli",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "The Sprid command line: connect your app, review results, prepare posts and store screenshots, and release mobile apps.",
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
@@ -38,8 +38,8 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@sprid/shots": "0.2.1",
-    "@sprid/release": "1.2.0"
+    "@sprid/shots": "0.2.2",
+    "@sprid/release": "1.2.1"
   },
   "publishConfig": {
     "access": "public"

package/src/post/cli.mjs

@@ -384,6 +384,14 @@ const fill = (tpl, slug) => tpl.replaceAll("<slug>", slug);
 const kindOf = (lane) => lane.kind ?? (lane.slides ? "carousel" : "reel");
 const isComposed = (x) => (x?.kind ?? (x?.slides ? "carousel" : "reel")) === "composed";
 
+/** What the media files hash to right now, in the manifest's sha shape. Null if any is missing. */
+function diskSha(cfg, m) {
+  const files = (m.kind ?? "reel") === "carousel" ? (m.slides ?? []).map((sl) => sl.file) : [m.source];
+  const paths = files.map((f) => (f ? resolve(cfg.root, f) : null));
+  if (paths.some((f) => !f || !existsSync(f))) return null;
+  return paths.map(sha256).join(",");
+}
+
 /** The path template a lane's media lives at, whichever kind it is. */
 const mediaTemplate = (lane) =>
   kindOf(lane) === "composed" ? (lane.spec ?? "social/specs/<slug>.json") : kindOf(lane) === "carousel" ? lane.slides : lane.media;
@@ -1561,9 +1569,14 @@ async function cmdPush(cfg, argv) {
   );
   if (!targets.length) return console.log("\n  nothing to push (everything is already in Sprid)\n");
 
+  // **What was refused is returned, not only printed.** `sync` calls this and
+  // used to count a slug as synced whatever happened here, so a refused upload
+  // reported "1 synced" while the draft kept the old file.
+  const pushed = [], refused = [];
   for (const m of targets) {
     if (!checksPass(m)) {
       console.log(`  ${C.warn("skip")}  ${m.slug} ${C.dim("- checks not passing, run `sprid post check`")}`);
+      refused.push({ slug: m.slug, why: "checks not passing - run `sprid post check`" });
       continue;
     }
     // **A composed post has nothing here to upload.** Its pixels are the
@@ -1574,18 +1587,21 @@ async function cmdPush(cfg, argv) {
       continue;
     }
     if ((m.kind ?? "reel") === "carousel") {
-      await pushCarousel(cfg, m);
+      const why = await pushCarousel(cfg, m);
+      (why ? refused : pushed).push(why ? { slug: m.slug, why } : m.slug);
       continue;
     }
     const file = resolve(cfg.root, m.source);
     if (!existsSync(file)) {
       console.log(`  ${C.bad("gone")}  ${m.slug} ${C.dim(`- ${m.source} is not on disk; rebuild it`)}`);
+      refused.push({ slug: m.slug, why: `${m.source} is not on disk` });
       continue;
     }
     // Guard the record against a silent rebuild: the manifest is only true of
     // the bytes it measured.
     if (sha256(file) !== m.media.sha256) {
       console.log(`  ${C.bad("stale")} ${m.slug} ${C.dim("- the file changed since it was registered; re-register it")}`);
+      refused.push({ slug: m.slug, why: "the file changed since `register` - run `register`, then `check`" });
       continue;
     }
 
@@ -1633,9 +1649,11 @@ async function cmdPush(cfg, argv) {
     // scheduled post looking finished. Record the exact bytes uploaded.
     m.sprid = { ...m.sprid, account: cfg.account, videoId, status: "uploaded", mediaShaAtPush: m.media.sha256 };
     writeManifest(cfg, m);
+    pushed.push(m.slug);
     console.log(`  ${C.ok("pushed")} ${m.slug.padEnd(40)} video ${videoId}`);
   }
   console.log();
+  return { pushed, refused };
 }
 
 /**
@@ -1651,12 +1669,12 @@ async function pushCarousel(cfg, m) {
   const missing = files.filter((f) => !existsSync(f));
   if (missing.length) {
     console.log(`  ${C.bad("gone")}  ${m.slug} ${C.dim(`- ${missing.length} slide(s) not on disk; rebuild it`)}`);
-    return;
+    return `${missing.length} slide(s) not on disk`;
   }
   const changed = files.filter((f, i) => sha256(f) !== m.slides[i].sha256);
   if (changed.length) {
     console.log(`  ${C.bad("stale")} ${m.slug} ${C.dim(`- ${changed.length} slide(s) changed since registering; re-register it`)}`);
-    return;
+    return `${changed.length} slide(s) changed since \`register\` - run \`register\`, then \`check\``;
   }
 
   const imageIds = [];
@@ -1699,6 +1717,7 @@ async function pushCarousel(cfg, m) {
   };
   writeManifest(cfg, m);
   console.log(`  ${C.ok("pushed")} ${m.slug.padEnd(40)} ${imageIds.length} images`);
+  return null;
 }
 
 /** A 400px-wide copy, or null if ffmpeg will not make one. */
@@ -1725,6 +1744,7 @@ async function cmdDraft(cfg, argv) {
   );
   if (!targets.length) return console.log("\n  nothing to draft (push first, or everything is drafted)\n");
 
+  const drafted = [], refused = [];
   for (const m of targets) {
     // **`push` refused a failing post and `draft` did not, which left the gate
     // ungated.** For a composed post there is nothing to push at all, so
@@ -1734,6 +1754,7 @@ async function cmdDraft(cfg, argv) {
     // preference.
     if (!checksPass(m)) {
       console.log(`  ${C.warn("skip")}  ${m.slug} ${C.dim("- checks not passing, run `sprid post check`")}`);
+      refused.push({ slug: m.slug, why: "checks not passing - run `sprid post check`" });
       continue;
     }
     const caption = existsSync(captionPath(cfg, m.slug))
@@ -1858,8 +1879,16 @@ async function cmdDraft(cfg, argv) {
     // with a second music bed laid over its own - which is the exact failure
     // the field exists to prevent. The consuming repo has no way to know that
     // from the output, so the record is read back and compared.
-    const dropped = verifyDraft(await api(cfg, "GET", `/posts/${post.id}`), wanted);
+    const back = await api(cfg, "GET", `/posts/${post.id}`);
+    const dropped = verifyDraft(back, wanted);
     for (const [field, why] of dropped) console.log(`  ${C.bad("dropped")} ${m.slug.padEnd(40)} ${field} - ${why}`);
+    // **The media is read back too.** Same reason as the fields above: the
+    // slide PATCH answering 200 is not proof the post now shows the new file.
+    const mediaDrift = composed ? null : slideMediaDrift(back, carousel ? m.sprid.imageIds ?? [] : [m.sprid.videoId], carousel);
+    if (mediaDrift) {
+      console.log(`  ${C.bad("media")}   ${m.slug.padEnd(40)} ${mediaDrift}`);
+      refused.push({ slug: m.slug, why: mediaDrift });
+    }
 
     m.sprid = {
       ...m.sprid,
@@ -1872,12 +1901,28 @@ async function cmdDraft(cfg, argv) {
       dropped: dropped.length ? dropped.map(([f]) => f) : null,
     };
     writeManifest(cfg, m);
+    if (mediaDrift) continue;
+    drafted.push(m.slug);
     console.log(
       `  ${C.ok(existingPost ? "updated" : "drafted")} ${m.slug.padEnd(40)} post ${post.id}` +
         (composed ? C.dim(`  ${seats.length} cards`) : carousel ? C.dim(`  ${m.sprid.imageIds.length} slides`) : ""),
     );
   }
   console.log(`\n  ${C.dim("review in Sprid, then move each to `ready` yourself.")}\n`);
+  return { drafted, refused };
+}
+
+/**
+ * Whether the post's slides carry the files the registry pushed, in order.
+ * Null when they do; otherwise what a person needs to read.
+ */
+export function slideMediaDrift(back, ids, carousel) {
+  const slides = [...(back.slides ?? [])].sort((a, b) => a.position - b.position);
+  const held = slides.map((sl) => (carousel ? sl.imageId : sl.videoId) ?? null);
+  if (held.length === ids.length && held.every((id, i) => id === ids[i])) return null;
+  return carousel
+    ? `Sprid's slides hold images ${held.join(",") || "none"}, not the pushed ${ids.join(",")}`
+    : `Sprid's slide holds video ${held[0] ?? "none"}, not the pushed ${ids[0]}`;
 }
 
 /**
@@ -2007,7 +2052,18 @@ async function cmdSync(cfg, argv) {
       : (m.kind ?? "reel") === "carousel"
         ? (m.slides ?? []).map((sl) => sl.sha256).join(",")
         : m.media?.sha256 ?? null;
-    const media = isComposed(m) ? false : pushedSha == null ? "unknown" : pushedSha !== localSha;
+    // **The registry's sha is not the file.** A rebuild that was never
+    // re-registered leaves the manifest agreeing with what was pushed, and sync
+    // answered "in sync" while the drafts held the old video. So the bytes on
+    // disk are hashed too, and a mismatch is reported as the step it needs.
+    // A file no longer on disk proves nothing either way, so it falls back to
+    // the record: scratch builds get cleaned up after a push.
+    const onDisk = isComposed(m) ? null : diskSha(cfg, m);
+    const media = isComposed(m)
+      ? false
+      : onDisk != null && onDisk !== localSha
+        ? "unregistered"
+        : pushedSha == null ? "unknown" : pushedSha !== localSha;
     const caption = (m.post?.captionSha ?? null) !== (m.sprid.captionShaAtDraft ?? null);
     // The Pin's board, link and words. Unrecorded counts as changed, same as
     // media: a record that cannot say what was sent cannot say it is current.
@@ -2024,7 +2080,10 @@ async function cmdSync(cfg, argv) {
   console.log(`\n  ${C.bold(execute ? "syncing" : "would sync")}  ${plan.length} of ${all.length}\n`);
   for (const { m, media, caption, title, pin, unreadable } of plan) {
     const what = [
-      media === "unknown" ? C.warn("media (never recorded, assumed stale)") : media ? C.warn("media") : null,
+      media === "unregistered"
+        ? C.bad("media (file on disk changed since `register`)")
+        : media === "unknown" ? C.warn("media (never recorded, assumed stale)") : media ? C.warn("media") : null,
+      !checksPass(m) ? C.bad("checks not passing") : null,
       caption ? C.warn("caption") : null,
       title ? C.warn(unreadable ? "title (could not read Sprid's, assumed stale)" : "title") : null,
       pin ? C.warn("pin") : null,
@@ -2038,7 +2097,20 @@ async function cmdSync(cfg, argv) {
 
   console.log();
   let done = 0, skipped = 0;
+  const failed = [];
   for (const { m, media } of plan) {
+    // Refused before touching Sprid: pushing or drafting would either do
+    // nothing or re-send the old file, and both used to be counted as synced.
+    if (media === "unregistered") {
+      console.log(`  ${C.bad("not synced")} ${m.slug.padEnd(36)} ${C.dim("file changed since `register` - run `register`, then `check`")}`);
+      failed.push({ slug: m.slug, why: "file changed since `register`" });
+      continue;
+    }
+    if (!checksPass(m)) {
+      console.log(`  ${C.bad("not synced")} ${m.slug.padEnd(36)} ${C.dim("checks not passing - run `check`")}`);
+      failed.push({ slug: m.slug, why: "checks not passing" });
+      continue;
+    }
     // The live status decides whether this one may be touched at all. Read it
     // here rather than trusting the manifest: the manifest's `status` is what
     // this machine last wrote, and the queue moves without us.
@@ -2059,13 +2131,31 @@ async function cmdSync(cfg, argv) {
       skipped++;
       continue;
     }
-    if (media) await cmdPush(cfg, [m.slug, "--force"]);
+    if (media) {
+      const pushed = await cmdPush(cfg, [m.slug, "--force"]);
+      if (!pushed?.pushed.includes(m.slug)) {
+        const why = pushed?.refused.find((r) => r.slug === m.slug)?.why ?? "nothing was uploaded";
+        console.log(`  ${C.bad("not synced")} ${m.slug.padEnd(36)} ${C.dim(why)}`);
+        failed.push({ slug: m.slug, why });
+        continue;
+      }
+    }
     // Re-read: push rewrote the manifest, and draft has to send the new videoId.
-    await cmdDraft(cfg, [readManifest(cfg, m.slug).slug, "--force"]);
+    const drafted = await cmdDraft(cfg, [readManifest(cfg, m.slug).slug, "--force"]);
+    if (!drafted?.drafted.includes(m.slug)) {
+      const why = drafted?.refused.find((r) => r.slug === m.slug)?.why ?? "the draft was not updated";
+      console.log(`  ${C.bad("not synced")} ${m.slug.padEnd(36)} ${C.dim(why)}`);
+      failed.push({ slug: m.slug, why });
+      continue;
+    }
     done++;
   }
-  console.log(`  ${done} synced, ${skipped} left alone\n`);
-  return { execute, synced: done, skipped, plan: plan.map(({ m, ...change }) => ({ slug: m.slug, ...change })) };
+  console.log(`  ${done} synced, ${skipped} left alone${failed.length ? `, ${C.bad(`${failed.length} not synced`)}` : ""}\n`);
+  return {
+    exitCode: failed.length ? 1 : 0,
+    execute, synced: done, skipped, failed,
+    plan: plan.map(({ m, ...change }) => ({ slug: m.slug, ...change })),
+  };
 }
 
 /**