@tokenoftrust/cli 3.10.1 → 3.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/cli",
-  "version": "3.10.1",
+  "version": "3.10.2",
   "description": "Token of Trust developer CLI — clone a tenant store, run it locally with save→reload, and submit it for preview. Installs the `tot` command.",
   "license": "Apache-2.0",
   "author": "Token of Trust",

package/src/commands/hotfix.mjs

@@ -39,7 +39,7 @@ import { openBrowser } from "../open.mjs";
 import { missingGrantsOf, refusalHint } from "../admission-hint.mjs";
 // Reuse `tot ship`'s operator-secret precedence + live-url derivation verbatim so
 // ship + hotfix speak ONE operator-auth contract.
-import { resolveOperatorSecret, liveUrlFor } from "./ship.mjs";
+import { resolveOperatorSecret, liveUrlFor, normalizeLiveDrift } from "./ship.mjs";
 
 const DEFAULT_STOREFRONT_URL = "https://storefront.tokenoftrust.store";
 
@@ -126,6 +126,7 @@ export function normalizeHotfixPlan(data) {
       bypassedPreviewSha: typeof o.bypassedPreviewSha === "string" ? o.bypassedPreviewSha : null,
       bypassedPrs: Array.isArray(o.bypassedPrs) ? o.bypassedPrs : [],
       rollbackTarget: o.rollbackTarget && typeof o.rollbackTarget === "object" ? o.rollbackTarget : null,
+      warning: normalizeLiveDrift(o.warning),
       paywall:
         o.paywall && typeof o.paywall === "object"
           ? { allowed: o.paywall.allowed === true, message: typeof o.paywall.message === "string" ? o.paywall.message : null }
@@ -285,6 +286,7 @@ export async function runHotfix(
     bypassedPrs: plan.bypassedPrs,
     bypassedPreviewSha: plan.bypassedPreviewSha,
     rollbackTarget: plan.rollbackTarget,
+    liveDrift: plan.warning,
     paywall: plan.paywall,
     targets: { live: liveUrl },
   });

package/src/commands/ship.mjs

@@ -245,8 +245,8 @@ export function liveUrlFor(tenant) {
  *   paywall:{allowed:boolean,message:string|null}, alreadyShipped:boolean} |
  *   {ok:false, reason:string, message:string}}
  */
-/** The ship-plan CDN drift warning, or null when the ledger and the CDN name the same release. */
-function normalizeLiveDrift(warning) {
+/** The plan CDN drift warning, or null when the ledger and the CDN name the same release. */
+export function normalizeLiveDrift(warning) {
   if (!warning || typeof warning !== "object" || typeof warning.reason !== "string") return null;
   const target = warning.correctedRollbackTarget;
   if (!target || typeof target !== "object" || typeof target.aggregateSha !== "string") return null;

package/src/plan.mjs

@@ -40,6 +40,20 @@ function targetLabel({ pr, changeId }) {
   return "this change";
 }
 
+/** Empty when the CDN and the ledger name the same release. */
+function cdnDriftLines(liveDrift) {
+  if (!liveDrift?.reason) return [];
+  return [
+    `  ⚠ ${liveDrift.reason}: the CDN serves ${liveDrift.served ?? "an unknown revision"}, not the ledger's live ${liveDrift.live ?? "nothing"}.`,
+  ];
+}
+
+function rollbackToLine(rollbackTarget, liveDrift) {
+  return rollbackTarget
+    ? `  rollback to: ${rollbackTarget.aggregateSha} (receipt ${rollbackTarget.receiptId})${liveDrift?.reason ? " — corrected target" : ""}`
+    : "  rollback to: (none — first-ever ship)";
+}
+
 /**
  * Build the EXACT plan for a mutating operator verb — structured lines ready
  * to print verbatim (CLI) or join for a confirm() dialog (admin). Pure: no
@@ -137,16 +151,8 @@ export function planForAction({
           lines.push(`    - ${prLabel}${shortSha}`);
         }
       }
-      if (liveDrift?.reason) {
-        lines.push(
-          `  ⚠ ${liveDrift.reason}: the CDN serves ${liveDrift.served ?? "an unknown revision"}, not the ledger's live ${liveDrift.live ?? "nothing"}.`,
-        );
-      }
-      lines.push(
-        rollbackTarget
-          ? `  rollback to: ${rollbackTarget.aggregateSha} (receipt ${rollbackTarget.receiptId})${liveDrift?.reason ? " — corrected target" : ""}`
-          : "  rollback to: (none — first-ever ship)",
-      );
+      lines.push(...cdnDriftLines(liveDrift));
+      lines.push(rollbackToLine(rollbackTarget, liveDrift));
       if (paywall && paywall.allowed === false) {
         lines.push(`  ⚠ paywall:   ${paywall.message || "go-live is blocked by the storefront subscription gate"}`);
       }
@@ -206,11 +212,8 @@ export function planForAction({
         }
       }
       if (bypassedPreviewSha) lines.push(`  preview head (bypassed): ${bypassedPreviewSha}`);
-      lines.push(
-        rollbackTarget
-          ? `  rollback to: ${rollbackTarget.aggregateSha} (receipt ${rollbackTarget.receiptId})`
-          : "  rollback to: (none — first-ever ship)",
-      );
+      lines.push(...cdnDriftLines(liveDrift));
+      lines.push(rollbackToLine(rollbackTarget, liveDrift));
       if (paywall && paywall.allowed === false) {
         lines.push(`  ⚠ paywall:   ${paywall.message || "go-live is blocked by the storefront subscription gate"}`);
       }