@letterstory/cli 0.71.0 → 0.72.1

package/lib/cli.mjs

@@ -56,7 +56,7 @@ import {
 } from "./commands.mjs";
 
 // Keep in sync with cli/package.json.
-export const VERSION = "0.71.0";
+export const VERSION = "0.72.1";
 
 // Flags that never take a value. Listing them explicitly means `deploy get --json <id>`
 // can't accidentally swallow the id as --json's value.
@@ -645,7 +645,8 @@ Admin (STAFF key — --staff-key / LETTERSTORY_STAFF_API_KEY; acts before an org
                                                        trial-run, trial-save, the Write input bank
                                                        (inputs, input, inputs-harvest, input-save),
                                                        screens (screen-new, screens, screen,
-                                                       screen-advance),
+                                                       screen-advance), the bake-off (bakeoff,
+                                                       bakeoff-pick, bakeoff-merge),
                                                        and the arena, shredder
                                                        and enhancer twins (every flag is listed in
                                                        cli/lib/commands/admin.mjs).

package/lib/commands/admin.mjs

@@ -505,6 +505,15 @@ async function cmdAdminTuningContext(ctx) {
  *   admin tuning screens | screen <id>                         list / one screen: per candidate, each measure against the Base, with its noise
  *   admin tuning screen-advance <id>                           queue what the caps allow now (the cron does it every minute)
  *
+ * The bake-off: a screen's versions graded item by item against the checklist (the eval list's
+ * confirmed and unvetted categories, and the craft axes commitment / economy / movement), the winner
+ * per item tallied across the inputs, and a merge that composes the best of each into one candidate.
+ * Deterministic; a person overrides a grade and confirms the merge, which is a hypothesis until the
+ * eye test confirms it.
+ *   admin tuning bakeoff <screen-id> [--regrade]                 the winners table: item, trusted, leader, wins per version, graded; then the conflicts a merge would meet
+ *   admin tuning bakeoff-pick <screen-id> --input <key> --item <category:id|axis:id> --winner <version|none>   a person's grade on one input and item (replaces the machine's)
+ *   admin tuning bakeoff-merge <screen-id> [--resolve item=version,…] [--note "…"] [--compare 10]   save the merged file as a candidate of the base kernel (never live); --compare starts a comparison against live on that many pairs
+ *
  * Research (Phase 3): our arena's versions as files, research comparisons, the deploy split.
  *   admin tuning arenas | arena <version-id>                   our arena's versions / one version's file and diff
  *   admin tuning arena-candidate --patch '{…}' | --file f.json [--of <version-id>] [--note "…"]   save a candidate
@@ -1534,6 +1543,98 @@ async function cmdAdminTuning(ctx) {
 				? printResult(io, flags, r)
 				: io.log(`queued ${r.queued} run(s)${r.waiting ? `; waiting: ${r.waiting}` : ""}`);
 		}
+		// --- The bake-off: a screen's versions graded item by item, the winners table, the merge ---
+		case "bakeoff": {
+			if (!id) throw new CliError("Usage: admin tuning bakeoff <screen-id> [--regrade]");
+			const r = await staffRequest(
+				ctx,
+				"GET",
+				`${T}/screens/${id}/bakeoff${flagBool(flags.regrade) ? "?regrade=1" : ""}`
+			);
+			if (json) return printResult(io, flags, r);
+			io.log(
+				`bake-off ${r.screen.title}: v${r.versions.join(", v")} on ${r.inputs.length} input(s); leader ${r.leader === null ? "none" : `v${r.leader}`}`
+			);
+			if (r.unversioned.length) io.log(`left out (not a saved version): ${r.unversioned.join(", ")}`);
+			io.log("");
+			io.log(
+				`${"item".padEnd(32)} ${"trusted".padEnd(8)} ${"leader".padEnd(7)} ${r.versions.map((v) => `v${v}`.padStart(6)).join("")}  graded`
+			);
+			for (const row of r.table)
+				io.log(
+					`${row.item.id.padEnd(32)} ${(row.trusted ? "yes" : "no").padEnd(8)} ${(row.leader === null ? "—" : `v${row.leader}`).padEnd(7)} ${r.versions.map((v) => String(row.wins[v] ?? 0).padStart(6)).join("")}  ${row.graded}`
+				);
+			io.log("");
+			io.log(
+				r.conflicts_if_merged.length
+					? `conflicts if merged: ${r.conflicts_if_merged.map((c) => `${c.path} ← ${c.candidates.map((x) => `${x.item} v${x.version}`).join(" | ")}`).join("; ")}`
+					: "conflicts if merged: none"
+			);
+			return;
+		}
+		case "bakeoff-pick": {
+			const input = flagStr(flags.input);
+			const item = flagStr(flags.item);
+			const winner = flagStr(flags.winner);
+			if (!id || !input || !item || !winner)
+				throw new CliError(
+					"Usage: admin tuning bakeoff-pick <screen-id> --input <key> --item <category:id|axis:id> --winner <version|none>"
+				);
+			const winnerVersion = winner === "none" ? null : Number(winner);
+			if (winnerVersion !== null && !(Number.isInteger(winnerVersion) && winnerVersion > 0))
+				throw new CliError("--winner is a version number, or none");
+			const r = await staffRequest(ctx, "POST", `${T}/screens/${id}/bakeoff/pick`, {
+				input_key: input,
+				item_id: item,
+				winner_version: winnerVersion,
+			});
+			if (json) return printResult(io, flags, r);
+			const row = r.read.table.find((x) => x.item.id === item);
+			return io.log(
+				`graded ${item} on ${input}: ${winnerVersion === null ? "none" : `v${winnerVersion}`}${row ? ` · leader now ${row.leader === null ? "none" : `v${row.leader}`}` : ""}`
+			);
+		}
+		case "bakeoff-merge": {
+			if (!id)
+				throw new CliError(
+					'Usage: admin tuning bakeoff-merge <screen-id> [--resolve item=version,…] [--note "…"] [--compare 10]'
+				);
+			const resolve = {};
+			for (const pair of flagList(flags.resolve).flatMap((x) =>
+				x
+					.split(",")
+					.map((y) => y.trim())
+					.filter(Boolean)
+			)) {
+				const [item, version] = pair.split("=").map((x) => x.trim());
+				const v = Number(version);
+				if (!item || !(Number.isInteger(v) && v > 0))
+					throw new CliError(`--resolve: "${pair}" is not item=version`);
+				resolve[item] = v;
+			}
+			const compare = flags.compare === undefined ? undefined : { pairs: flagNum(flags.compare) ?? 10 };
+			const r = await staffRequest(
+				ctx,
+				"POST",
+				`${T}/screens/${id}/bakeoff/merge`,
+				compact({
+					resolve: Object.keys(resolve).length ? resolve : undefined,
+					note: flagStr(flags.note),
+					compare,
+				})
+			);
+			if (json) return printResult(io, flags, r);
+			io.log(
+				`merged from v${r.base} → candidate v${r.version}${r.comparison_id ? ` · comparison ${r.comparison_id}` : ""}`
+			);
+			for (const p of r.provenance)
+				io.log(`  ${p.applied ? "applied" : `skipped (${p.skipped})`}  ${p.item}  ${p.path}  from v${p.from}`);
+			if (r.conflicts.length)
+				io.log(
+					`conflicts left (the base's value kept): ${r.conflicts.map((c) => `${c.path} ← ${c.candidates.map((x) => `${x.item} v${x.version}`).join(" | ")}`).join("; ")}`
+				);
+			return;
+		}
 		// --- Research: our arena's versions, research comparisons, the deploy split ---
 		case "arenas": {
 			const r = await staffRequest(ctx, "GET", `${T}/arena-files`);

package/lib/commands/phantom.mjs

@@ -73,6 +73,12 @@ export const ARGS = {
 				theme: "theme",
 				customer_ref: { flag: "customer-ref" },
 				collection_id: { flag: "collection" },
+				redesign: { flag: "redesign", type: "bool", negate: "no-redesign" },
+				// `--layout none` clears the choice (the site's theme then suggests one).
+				layout: {
+					value: (flags) =>
+						flags.layout === undefined ? undefined : flags.layout === "none" ? null : String(flags.layout),
+				},
 			},
 		},
 		collection: { value: (flags) => readJsonObjectFlag(flags, "collection-config") },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@letterstory/cli",
-	"version": "0.71.0",
+	"version": "0.72.1",
 	"description": "Spin up and manage Letterstory phantom blogs from your terminal.",
 	"type": "module",
 	"license": "UNLICENSED",