@tokenoftrust/cli 4.4.1 → 4.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenoftrust/cli",
-  "version": "4.4.1",
+  "version": "4.5.0",
   "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, normalizeLiveDrift } from "./ship.mjs";
+import { resolveOperatorSecret, normalizeLiveDrift } from "./ship.mjs";
 
 const DEFAULT_STOREFRONT_URL = "https://storefront.tokenoftrust.store";
 
@@ -127,6 +127,7 @@ export function normalizeHotfixPlan(data) {
       bypassedPrs: Array.isArray(o.bypassedPrs) ? o.bypassedPrs : [],
       rollbackTarget: o.rollbackTarget && typeof o.rollbackTarget === "object" ? o.rollbackTarget : null,
       warning: normalizeLiveDrift(o.warning),
+      liveUrl: typeof o.liveUrl === "string" && o.liveUrl ? o.liveUrl : null,
       paywall:
         o.paywall && typeof o.paywall === "object"
           ? { allowed: o.paywall.allowed === true, message: typeof o.paywall.message === "string" ? o.paywall.message : null }
@@ -277,7 +278,7 @@ export async function runHotfix(
 
   // 2. Print the EXACT plan — including the unshipped preview work it BYPASSES —
   //    then require ONE explicit confirm (default NO).
-  const liveUrl = liveUrlFor(tenant);
+  const liveUrl = plan.liveUrl;
   const planLines = planForAction({
     action: "hotfix",
     tenant,

package/src/commands/ship.mjs

@@ -223,14 +223,6 @@ export async function pollChangeShipped(scoped, { id }, { attempts = 6, delayMs
   return last;
 }
 
-// ─── URL derivation (pure) ─────────────────────────────────────────────────────
-
-/** The live site URL for a tenant (the tenant IS its apex domain, e.g. tokenoftrust.com). Pure. */
-export function liveUrlFor(tenant) {
-  const t = (tenant || "").trim();
-  return t ? `https://${t}` : null;
-}
-
 // ─── Response normalisation (defensive — one endpoint, but shapes may vary) ─────
 
 /**
@@ -242,7 +234,8 @@ export function liveUrlFor(tenant) {
  *   includedPrs:Array<{prNumber?:number|null,changeId?:string|null,headSha?:string|null}>,
  *   integrationRunId:string|null, receiptId:string|null,
  *   rollbackTarget:{receiptId:string,aggregateSha:string,artifactDigest?:string}|null,
- *   paywall:{allowed:boolean,message:string|null}, alreadyShipped:boolean} |
+ *   paywall:{allowed:boolean,message:string|null}, alreadyShipped:boolean,
+ *   provedAt:string|null, liveUrl:string|null} |
  *   {ok:false, reason:string, message:string}}
  */
 /** The plan CDN drift warning, or null when the ledger and the CDN name the same release. */
@@ -283,6 +276,8 @@ export function normalizeShipPlan(data) {
             }
           : { allowed: true, message: null },
       alreadyShipped: o.alreadyShipped === true,
+      provedAt: typeof o.provedAt === "string" && o.provedAt ? o.provedAt : null,
+      liveUrl: typeof o.liveUrl === "string" && o.liveUrl ? o.liveUrl : null,
     };
   }
   return {
@@ -553,9 +548,22 @@ export async function runShip(
     return 1;
   }
 
+  // The pinned release is already what live serves and nothing else is pending: there is nothing
+  // to confirm or POST. A CDN-drift warning means live is not what the ledger says, so that
+  // still goes through the plan.
+  if (plan.ok && plan.alreadyShipped && !plan.warning && !spaces.ready.length) {
+    const detail = [
+      plan.receiptId ? `receipt ${plan.receiptId}` : null,
+      plan.provedAt ? `proved ${plan.provedAt}` : null,
+    ].filter(Boolean).join(", ");
+    console.log(`  Already live: ${plan.pinnedSha}${detail ? ` (${detail})` : ""} — nothing to ship`);
+    return 0;
+  }
+
   // 2. Print the EXACT plan via the shared affordance, then require ONE
   //    explicit confirm (`--yes` non-interactive; a non-TTY without it refuses).
-  const liveUrl = liveUrlFor(tenant);
+  // The live URL is the server's served truth; the client derives none.
+  const liveUrl = plan.ok ? plan.liveUrl : null;
   const planLines = plan.ok
     ? planForAction({
       action: "ship",

package/src/declared-config.d.mts

@@ -68,6 +68,9 @@ export interface NicotineWarningPresentation {
   textTransform: "uppercase" | "none";
   fontWeight: number;
   fontSizePx: number;
+  borderWidthPx?: number;
+  paddingYPx?: number;
+  letterSpacingPx?: number;
 }
 export interface ResolvedNicotineWarning {
   enabled: boolean;
@@ -79,6 +82,8 @@ export interface ResolvedNicotineWarning {
 export const NICOTINE_WARNING_TEXT: string;
 export const CONSPICUITY_FLOOR: Readonly<{ contrast: number; fontSizePx: number; fontWeight: number }>;
 export const DEFAULT_NICOTINE_WARNING_PRESET: string;
+export const NICOTINE_WARNING_BOX_BOUNDS: Readonly<Record<"borderWidthPx" | "paddingYPx" | "letterSpacingPx", Readonly<{ min: number; max: number; integer: boolean }>>>;
+export const MEDIUM_WEIGHT_REQUIREMENTS: Readonly<{ fontSizePx: number; contrast: number; borderWidthPx: number }>;
 export const NICOTINE_WARNING_PRESETS: Readonly<Record<string, Readonly<NicotineWarningPresentation>>>;
 export const NICOTINE_WARNING_KEYS: readonly string[];
 export const NICOTINE_WARNING_STYLE_KEYS: readonly string[];

package/src/declared-config.mjs

@@ -782,6 +782,16 @@ export const CONSPICUITY_FLOOR = Object.freeze({ contrast: 7, fontSizePx: 12, fo
 /** Bounds on the size a custom style may declare, so the bar cannot swallow the header. */
 const MAX_FONT_SIZE_PX = 24;
 
+/** Bounds on the optional box and spacing keys; an unset key renders the preset's own frame. */
+export const NICOTINE_WARNING_BOX_BOUNDS = Object.freeze({
+  borderWidthPx: Object.freeze({ min: 0, max: 8, integer: true }),
+  paddingYPx: Object.freeze({ min: 0, max: 24, integer: true }),
+  letterSpacingPx: Object.freeze({ min: 0, max: 4, integer: false }),
+});
+
+/** Weight 500 is allowed only on a boxed bar that is at least this large, contrasty and bordered. */
+export const MEDIUM_WEIGHT_REQUIREMENTS = Object.freeze({ fontSizePx: 16, contrast: 7, borderWidthPx: 2 });
+
 export const DEFAULT_NICOTINE_WARNING_PRESET = "dark";
 
 /**
@@ -816,6 +826,9 @@ export const NICOTINE_WARNING_PRESETS = Object.freeze({
  *   textTransform: "uppercase" | "none",
  *   fontWeight: number,
  *   fontSizePx: number,
+ *   borderWidthPx?: number,
+ *   paddingYPx?: number,
+ *   letterSpacingPx?: number,
  * }} NicotineWarningPresentation
  */
 
@@ -824,9 +837,10 @@ export const NICOTINE_WARNING_KEYS = Object.freeze(["preset", "style", "checkWid
 
 export const NICOTINE_WARNING_STYLE_KEYS = Object.freeze([
   "background", "text", "border", "textTransform", "fontWeight", "fontSizePx",
+  "borderWidthPx", "paddingYPx", "letterSpacingPx",
 ]);
 const TEXT_TRANSFORMS = ["uppercase", "none"];
-const FONT_WEIGHTS = [600, 700, 800, 900];
+const FONT_WEIGHTS = [500, 600, 700, 800, 900];
 const HEX = /^#(?:[0-9a-f]{3}|[0-9a-f]{6})$/i;
 
 /** `#abc` / `#AABBCC` → `#aabbcc`. */
@@ -865,7 +879,15 @@ export function conspicuityProblems(p) {
     out.push(`font size ${p.fontSizePx}px is below the ${CONSPICUITY_FLOOR.fontSizePx}px floor`);
   }
   if (p.fontWeight < CONSPICUITY_FLOOR.fontWeight) {
-    out.push(`font weight ${p.fontWeight} is below the ${CONSPICUITY_FLOOR.fontWeight} floor`);
+    const need = MEDIUM_WEIGHT_REQUIREMENTS;
+    const medium = p.fontWeight === 500 && p.fontSizePx >= need.fontSizePx && ratio >= need.contrast
+      && (p.borderWidthPx ?? 0) >= need.borderWidthPx;
+    if (!medium) {
+      out.push(`font weight ${p.fontWeight} is below the ${CONSPICUITY_FLOOR.fontWeight} floor` +
+        (p.fontWeight === 500
+          ? ` (500 needs font size >= ${need.fontSizePx}px, contrast >= ${need.contrast}:1 and borderWidthPx >= ${need.borderWidthPx})`
+          : ""));
+    }
   }
   return out;
 }
@@ -885,6 +907,14 @@ function styleValueProblem(key, value) {
       return typeof value === "number" && Number.isFinite(value) && value >= CONSPICUITY_FLOOR.fontSizePx && value <= MAX_FONT_SIZE_PX
         ? null
         : `\`fontSizePx\` must be a number from ${CONSPICUITY_FLOOR.fontSizePx} to ${MAX_FONT_SIZE_PX}`;
+    case "borderWidthPx":
+    case "paddingYPx":
+    case "letterSpacingPx": {
+      const { min, max, integer } = NICOTINE_WARNING_BOX_BOUNDS[key];
+      return typeof value === "number" && Number.isFinite(value) && value >= min && value <= max && (!integer || Number.isInteger(value))
+        ? null
+        : `\`${key}\` must be ${integer ? "a whole number" : "a number"} from ${min} to ${max}`;
+    }
     default:
       return `\`${key}\` is not a nicotine-warning style key (allowed: ${NICOTINE_WARNING_STYLE_KEYS.join(", ")})`;
   }
@@ -993,7 +1023,10 @@ export function nicotineWarningCheckWidths(declaration) {
  */
 export function describeNicotineWarningPresentation(p) {
   return `background ${p.background}, text ${p.text}, border ${p.border}, ` +
-    `${p.textTransform === "uppercase" ? "uppercase" : "normal case"}, weight ${p.fontWeight}, ${p.fontSizePx}px`;
+    `${p.textTransform === "uppercase" ? "uppercase" : "normal case"}, weight ${p.fontWeight}, ${p.fontSizePx}px` +
+    (p.borderWidthPx === undefined ? "" : `, border width ${p.borderWidthPx}px`) +
+    (p.paddingYPx === undefined ? "" : `, vertical padding ${p.paddingYPx}px`) +
+    (p.letterSpacingPx === undefined ? "" : `, letter spacing ${p.letterSpacingPx}px`);
 }
 
 /**
@@ -1017,11 +1050,12 @@ export function describeNicotineWarningPresentation(p) {
  */
 export function nicotineWarningHtml(declaration, variant) {
   const { presentation, preset } = resolveNicotineWarning(declaration);
+  const barPadding = presentation.paddingYPx === undefined ? "0.5rem" : `${presentation.paddingYPx}px`;
   const attrs = `style="${nicotineWarningStyle(presentation, variant)}" role="note" aria-label="Health warning" ` +
     `data-compliance="nicotine-warning" data-nicotine-warning-preset="${preset ?? "custom"}"`;
   const text = NICOTINE_WARNING_TEXT_LOCK;
   return variant === "bar"
-    ? `<div ${attrs}><p class="container-prose" style="margin-block:0;padding-block:0.5rem;text-align:center;${text}">${NICOTINE_WARNING_TEXT}</p></div>`
+    ? `<div ${attrs}><p class="container-prose" style="margin-block:0;padding-block:${barPadding};text-align:center;${text}">${NICOTINE_WARNING_TEXT}</p></div>`
     : `<div ${attrs}><p style="margin:0;${text}">${NICOTINE_WARNING_TEXT}</p></div>`;
 }
 
@@ -1061,15 +1095,17 @@ const NICOTINE_WARNING_TEXT_LOCK = [
  */
 export function nicotineWarningStyle(p, variant) {
   const size = variant === "block" ? Math.max(p.fontSizePx, 14) : p.fontSizePx;
+  const boxed = `${p.borderWidthPx ?? 2}px`;
   const frame = variant === "bar"
-    ? [`border-bottom:2px solid ${p.border}`]
-    : [`border:2px solid ${p.border}`, "border-radius:var(--radius-md)", "padding:0.75rem 1rem"];
+    ? [p.borderWidthPx === undefined ? `border-bottom:2px solid ${p.border}` : `border:${boxed} solid ${p.border}`]
+    : [`border:${boxed} solid ${p.border}`, "border-radius:var(--radius-md)",
+      `padding:${p.paddingYPx === undefined ? "0.75rem" : `${p.paddingYPx}px`} 1rem`];
   return [
     ...frame,
     `background-color:${p.background}`,
     `color:${p.text}`,
     `text-transform:${p.textTransform}`,
-    `letter-spacing:${p.textTransform === "uppercase" ? "0.06em" : "normal"}`,
+    `letter-spacing:${p.letterSpacingPx !== undefined ? `${p.letterSpacingPx}px` : p.textTransform === "uppercase" ? "0.06em" : "normal"}`,
     `font-weight:${p.fontWeight}`,
     `font-size:${size}px`,
     "line-height:1.4",