@minnovate/shadow-publisher 0.10.2 → 0.10.3

package/dist/claude/plugin/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "git-publisher",
   "displayName": "Git Publisher",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "Publish an app folder's Git history to the serverless Git publishing backend and keep it updated (\"publish my app\", \"update my app\", \"fetch the engineered version\").",
   "author": { "name": "git-publisher project" },
   "keywords": ["git", "publish", "deploy", "serverless"]

package/dist/publisher.cjs

@@ -3269,7 +3269,7 @@ async function runGit(args, opts = {}) {
 function startWatchdog(child, opts, kill, isClosed) {
   if (opts.maxMemoryBytes === void 0 && opts.maxDiskBytes === void 0) return { stop: () => void 0, done: Promise.resolve() };
   const sampler = opts.sampler ?? defaultResourceSampler;
-  const interval = Math.max(10, opts.sampleIntervalMs ?? 500);
+  const interval2 = Math.max(10, opts.sampleIntervalMs ?? 500);
   const sampleBoundMs = opts.cleanupBoundMs ?? CLEANUP_BOUND_MS;
   const pgid = child.pid;
   let stopped = false;
@@ -3299,7 +3299,7 @@ function startWatchdog(child, opts, kill, isClosed) {
     }
     let tick = 0;
     while (!stopped) {
-      await sleep2(interval);
+      await sleep2(interval2);
       if (stopped) return;
       if (opts.maxMemoryBytes !== void 0) {
         const rss = await sample("memory", (signal) => sampler.groupRss(pgid, signal));
@@ -4712,7 +4712,7 @@ async function followRun(input, opts) {
   const fetchImpl = opts.fetch ?? fetch;
   const sleep2 = opts.sleep ?? sleep;
   const now = opts.now ?? Date.now;
-  const interval = opts.intervalMs ?? POLL_INTERVAL_MS;
+  const interval2 = opts.intervalMs ?? POLL_INTERVAL_MS;
   const deadline = now() + (opts.timeoutMs ?? FOLLOW_TIMEOUT_MS);
   const query = new URLSearchParams({ publication: input.publicationId, ref: input.ref, commit: input.commit });
   const url2 = `${input.portal.replace(/\/+$/, "")}/api/v1/terminal/repositories/${encodeURIComponent(input.repoId)}/runs?${query}`;
@@ -4758,8 +4758,8 @@ async function followRun(input, opts) {
     } else {
       lastError = answer.status === 0 ? "the portal could not be reached" : `the portal answered ${answer.status}`;
     }
-    if (now() + interval > deadline) return { kind: "timed-out", stages: last, lastError };
-    await sleep2(interval);
+    if (now() + interval2 > deadline) return { kind: "timed-out", stages: last, lastError };
+    await sleep2(interval2);
   }
 }
 function soleRun(body) {
@@ -5911,6 +5911,93 @@ function gitSupported(version2) {
   return compareVersions(version2, CLIENT_GIT_MINIMUM) >= 0;
 }
 
+// src/progress.ts
+var SAYS = {
+  received: { doing: "Shadow is picking up your changes", done: "Shadow has your changes", still: "still picking up your changes" },
+  running: { doing: "checking that everything still works", done: "everything still works", still: "still checking" },
+  deploying: { doing: "putting the new version in place; the current one stays up meanwhile", done: "the new version is in place", still: "still putting it in place" },
+  live: { doing: "going live", done: "everyone sees the new version", still: "still going live" }
+};
+var HEARTBEAT_MS = 3e4;
+var SPINNER = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+function took(ms) {
+  const seconds = Math.max(0, Math.floor(ms / 1e3));
+  if (seconds < 60) return `${seconds} s`;
+  const minutes = Math.floor(seconds / 60);
+  return minutes >= 10 ? `${minutes} min` : `${minutes} min ${String(seconds % 60).padStart(2, "0")} s`;
+}
+function interval(fn, ms) {
+  const timer = setInterval(fn, ms);
+  timer.unref();
+  return { stop: () => clearInterval(timer) };
+}
+function settledLine(e, total) {
+  const word = e.word.padEnd(10);
+  switch (e.state) {
+    case "done":
+      return `  \u2713 ${word} ${SAYS[e.stage].done}${total}
+`;
+    case "failed":
+      return `  \u2717 ${word} it stopped here
+`;
+    case "skipped":
+      return `  \u2013 ${word} skipped
+`;
+    default:
+      return null;
+  }
+}
+function stageReporter(io) {
+  const now = io.now ?? Date.now;
+  const every = io.every ?? interval;
+  let ticking = null;
+  let drawn = false;
+  let receivedAt = null;
+  const clear = () => {
+    if (drawn) io.write("\r\x1B[2K");
+    drawn = false;
+  };
+  const stopTicking = () => {
+    ticking?.timer.stop();
+    ticking = null;
+    clear();
+  };
+  const since = (e) => {
+    const at = e.at === null ? NaN : Date.parse(e.at);
+    return Number.isFinite(at) ? Math.min(at, now()) : now();
+  };
+  return {
+    onStage(e) {
+      if (e.state === "in-progress" || ticking?.stage === e.stage) stopTicking();
+      else clear();
+      const says = SAYS[e.stage];
+      if (e.stage === "received" && e.at !== null) receivedAt = since(e);
+      if (e.state !== "in-progress") {
+        const total = e.stage === "live" && e.state === "done" && receivedAt !== null ? ` (${took(since(e) - receivedAt)} after Shadow received it)` : "";
+        const line = settledLine(e, total);
+        if (line !== null) io.write(line);
+        return;
+      }
+      io.write(`  \u2026 ${e.word.padEnd(10)} ${says.doing}
+`);
+      const from = since(e);
+      if (io.isTTY) {
+        let frame = 0;
+        const draw = () => {
+          io.write(`\r\x1B[2K    ${SPINNER[frame++ % SPINNER.length]} ${says.still} \xB7 ${took(now() - from)}`);
+          drawn = true;
+        };
+        draw();
+        ticking = { stage: e.stage, timer: every(draw, 1e3) };
+      } else {
+        ticking = { stage: e.stage, timer: every(() => io.write(`    ${says.still} (${took(now() - from)} so far)
+`), HEARTBEAT_MS) };
+      }
+    },
+    stop: stopTicking
+  };
+}
+
 // src/follow.ts
 async function followPublication(p, endpoint, o, opts) {
   const derived = portalForEndpoint(endpoint);
@@ -5925,11 +6012,11 @@ async function followPublication(p, endpoint, o, opts) {
   const refs = Object.entries(o.refs ?? {});
   if (refs.length !== 1) return elsewhere("several-refs");
   const [ref, commit] = refs[0];
-  opts.log("Following it: received -> checked -> going live -> live. Ctrl-C stops watching; the publication is already saved.");
+  opts.log("Following it to live: received -> checked -> going live -> live. Ctrl-C stops watching; the publication is saved and carries on without you.");
   const outcome = await p.followRun(
     { portal, repoId: o.repoId, publicationId: o.publicationId, ref, commit },
     { onStage: opts.onStage, ...opts.timeoutMs === void 0 ? {} : { timeoutMs: opts.timeoutMs }, ...opts.untilChange === true ? { untilChange: true } : {} }
-  );
+  ).finally(() => opts.stopStages?.());
   const answerable = confirmed.terminal.includes(PREPARATION);
   const dir = shellWord(opts.dir);
   const next = outcome.kind === "timed-out" || outcome.kind === "moving" ? { action: "follow", command: `publisher follow ${dir} --publication ${o.publicationId}${opts.untilChange === true ? " --until-change" : ""} --json` } : outcome.kind === "waiting" && answerable ? { action: "question", command: `publisher question ${dir} --json` } : void 0;
@@ -5965,13 +6052,15 @@ function shellWord(path) {
   return /^[A-Za-z0-9_./-]+$/.test(path) ? path : `'${path.replace(/'/g, `'\\''`)}'`;
 }
 function stageEmitter(json, quiet) {
-  return (e) => {
-    if (json) process.stdout.write(stageLine(e, true) + "\n");
-    else if (!quiet) process.stderr.write(stageLine(e, false) + "\n");
+  const nothing = () => {
   };
+  if (json) return { onStage: (e) => process.stdout.write(stageLine(e) + "\n"), stopStages: nothing };
+  if (quiet) return { onStage: nothing, stopStages: nothing };
+  const { onStage, stop } = stageReporter({ write: (s) => process.stderr.write(s), isTTY: process.stderr.isTTY === true });
+  return { onStage, stopStages: stop };
 }
-function stageLine(e, json) {
-  return json ? JSON.stringify({ event: "stage", stage: e.stage, word: e.word, state: e.state, at: e.at }) : `  ${e.word}: ${e.state.replace("-", " ")}`;
+function stageLine(e) {
+  return JSON.stringify({ event: "stage", stage: e.stage, word: e.word, state: e.state, at: e.at });
 }
 function inPortal(portal, lead, verb) {
   return `${lead} ${verb} in the portal${portal === null ? "" : `: ${portal}`}.`;
@@ -5993,7 +6082,7 @@ function progressHint(r, portal, answerable = false) {
       }
       break;
     case "moving": {
-      const now = r.stages.find((s) => s.state === "in-progress") ?? r.stages.filter((s) => s.state !== "pending").at(-1);
+      const now = r.stages.filter((s) => s.state === "in-progress").at(-1) ?? r.stages.filter((s) => s.state !== "pending").at(-1);
       return `Now: ${now?.word ?? "received"}. Run next.command to wait for the next step.`;
     }
     case "timed-out":
@@ -6367,7 +6456,7 @@ async function main(argv) {
     if (e.phase === "done") process.stderr.write("\n");
   };
   const dirArg = (i) => (0, import_node_path8.resolve)(cmd[i] ?? ".");
-  const following = { onStage: stageEmitter(json, quiet), log, untilChange: flags["until-change"] === true };
+  const following = { ...stageEmitter(json, quiet), log, untilChange: flags["until-change"] === true };
   const resolutionInput = async (dir) => {
     let association;
     if (dir && await isGitRepo(dir)) association = (await readAssociation(dir))?.endpoint;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minnovate/shadow-publisher",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "publisher: publish an app's Git history to the serverless Git backend",
   "license": "Apache-2.0",
   "type": "module",