@binaryandthread/cli 0.3.1 → 0.4.0

package/README.md

@@ -33,8 +33,8 @@ unambiguous form.)
 | --- | --- |
 | `bt browse` | the catalog as a numbered table (`bt stage <n>`); `--pick` opts into the ↑/↓ picker; `--json` for scripts |
 | `bt search <q>` | filter the catalog |
-| `bt view <n\|slug>` | one piece, specs + mockup (`--colour black` renders the black row) |
-| `bt stage <n\|slug>` | add to your cart (`--size`, `--colour`) |
+| `bt view <n\|slug>` | one piece, specs + mockup (`--colour black` renders the black row; `--fit oversize` shows the other fit of a two-fit design) |
+| `bt stage <n\|slug>` | add to your cart (`--size`, `--colour`, `--fit regular\|oversize`; a design sold in both fits needs `--fit`, or `bt config set defaultFit …`) |
 | `bt blame <n\|slug>` | the design's lore + sources (git blame, for motifs) |
 | `bt cart` / `bt unstage <ref>` | show / remove a line |
 | `bt checkout` | mint a checkout, hand off to the browser to pay, then poll |
@@ -70,8 +70,8 @@ skips the interactive confirm so it never hangs in CI. Field shapes (stable, saf
 
 | command | `--json` shape |
 | --- | --- |
-| `bt browse` / `bt search` | `[{ id, handle, title, price, currency, colours[], channel_stage }]` |
-| `bt view <handle>` | `{ id, handle, title, price, currency, colours[], sizes[] }` |
+| `bt browse` / `bt search` | `[{ id, handle, title, price, price_from, currency, colours[], fits[], channel_stage }]` (`price` is the cheapest fit when `price_from`) |
+| `bt view <handle>` | `{ id, handle, title, fits[], fit, colours[], unavailable_colours[], specs, variants: [{ id, fit, colour, size, price, currency }] }` |
 | `bt cart` | `{ cart_id, items: [{ id, title, colour, qty, total }], total, total_excludes_shipping }` |
 | `bt checkout` | `{ status: "placed"\|"timeout"\|"expired", order_id?, display_id?, total?, currency?, checkout_url? }` |
 | `bt region` | `{ region, currency, matched, home }` · `--list` → `{ regions: [{ currency, countries[] }] }` |

package/dist/bin.js

@@ -5,7 +5,7 @@ import {
   forgetConfig,
   loadConfig,
   saveConfig
-} from "./chunk-ZNDKXHMV.js";
+} from "./chunk-T7MFWTB7.js";
 import {
   makePrompts
 } from "./chunk-AAN4VWP3.js";
@@ -27,7 +27,6 @@ import {
   empty,
   fail,
   failResult,
-  firstPrice,
   fmtPrice,
   formatCartLine,
   formatFatal,
@@ -36,8 +35,10 @@ import {
   isCartTaxInclusive,
   lineColour,
   ok,
+  priceLine,
   printResult,
   productColours,
+  productFits,
   productLore,
   redact,
   regionLine,
@@ -53,7 +54,7 @@ import {
   versionLine,
   warn,
   working
-} from "./chunk-VDOFLQ2P.js";
+} from "./chunk-X3RWS3AG.js";
 import {
   __require
 } from "./chunk-7OCVIDC7.js";
@@ -102,7 +103,7 @@ function makeLogger(debug, write = (s) => process.stderr.write(s)) {
 }
 
 // src/version.ts
-var VERSION = "0.3.1";
+var VERSION = "0.4.0";
 
 // src/eggs.ts
 function teapot() {
@@ -418,15 +419,18 @@ function truncate(s, w) {
 }
 function layoutRows(rows, style) {
   const cells = rows.map(({ p, stage }, i) => {
-    const { amount, currency } = firstPrice(p);
+    const { amount, currency, from } = priceLine(p);
     const { title, handle } = displayName(p);
+    const fits = productFits(p);
+    const fitsMarker = fits.length > 1 ? fits.join(" \xB7 ") : "";
+    const colours = colourMarker(productColours(p));
     return {
       ref: `[${i + 1}]`,
       title,
-      price: fmtPrice(amount, currency),
+      price: `${from ? "from " : ""}${fmtPrice(amount, currency)}`,
       handle,
       stage,
-      colours: colourMarker(productColours(p))
+      colours: [colours, fitsMarker].filter(Boolean).join("   ")
     };
   });
   const refW = Math.max(...cells.map((c) => c.ref.length));
@@ -491,11 +495,14 @@ async function runBrowse(client, config, args) {
     if (drops.length > 0) {
       lines.push("   on next, before the web \u2192 bt drops");
     }
-    const taxIncl = rows.length > 0 ? firstPrice(rows[0].p).taxInclusive : null;
+    const taxIncl = rows.length > 0 ? priceLine(rows[0].p).taxInclusive : null;
     if (taxIncl === true) {
       lines.push(dim(style, "   prices incl. VAT"));
     }
     lines.push("   view one \u2192 bt view <n|slug>   \xB7   stage one \u2192 bt stage <n|slug> --size L");
+    if (rows.some(({ p }) => productFits(p).length > 1)) {
+      lines.push(dim(style, "   two fits? add --fit regular|oversize (or bt config set defaultFit \u2026)"));
+    }
   }
   return {
     lines,
@@ -503,9 +510,11 @@ async function runBrowse(client, config, args) {
       id: p.id,
       handle: p.handle,
       title: p.title,
-      price: firstPrice(p).amount,
-      currency: firstPrice(p).currency,
+      price: priceLine(p).amount,
+      price_from: priceLine(p).from,
+      currency: priceLine(p).currency,
       colours: productColours(p),
+      fits: productFits(p),
       channel_stage: p.metadata?.["channel_stage"] ?? "main"
     })) : void 0
   };
@@ -514,7 +523,7 @@ function registerBrowse(program, makeClient2, loadConfig2) {
   program.command("browse").alias("ls").description("list what's in stock on a branch.").option("--branch <branch>", "main (live) or next (terminal-only drops)").option("--pick", "opt into the arrow-key picker (default is the numbered table \u2014 use bt stage <n>)").option("--plain", "force the static table (the default; kept for back-compat)").action(async (opts) => {
     const { json, brand } = resolveOutput(program);
     if (opts.pick && !json && brand.color && process.stdout.isTTY && process.stdin.isTTY) {
-      const { runInteractiveBrowse } = await import("./interactive-JALKLT56.js");
+      const { runInteractiveBrowse } = await import("./interactive-VBATIHRD.js");
       const handled = await runInteractiveBrowse(makeClient2(), loadConfig2(), { branch: opts.branch, brand });
       if (handled) return;
     }
@@ -677,13 +686,14 @@ async function runSearch(client, config, args) {
   } else {
     lines.push(header(style, `bt search "${args.query}"`));
     for (const p of filtered) {
-      const { amount, currency } = firstPrice(p);
+      const { amount, currency, from } = priceLine(p);
       const { title, handle } = displayName(p);
       const stage = p.metadata?.["channel_stage"] ?? "main";
-      const colours = colourMarker(productColours(p));
+      const fits = productFits(p);
+      const colours = [colourMarker(productColours(p)), fits.length > 1 ? fits.join(" \xB7 ") : ""].filter(Boolean).join("   ");
       const row = [
         title.padEnd(22),
-        cyan(style, fmtPrice(amount, currency).padEnd(11)),
+        cyan(style, `${from ? "from " : ""}${fmtPrice(amount, currency)}`.padEnd(11)),
         dim(style, handle.padEnd(34)),
         stageMarker(stage)
       ].join(" ").trimEnd();
@@ -698,9 +708,11 @@ async function runSearch(client, config, args) {
       id: p.id,
       handle: p.handle,
       title: p.title,
-      price: firstPrice(p).amount,
-      currency: firstPrice(p).currency,
-      colours: productColours(p)
+      price: priceLine(p).amount,
+      price_from: priceLine(p).from,
+      currency: priceLine(p).currency,
+      colours: productColours(p),
+      fits: productFits(p)
     })) : void 0
   };
 }
@@ -927,10 +939,16 @@ async function runCheckout(client, config, args, deps) {
     lines.push(ok("deploy successful."));
     lines.push(`   committed to wardrobe@main`);
     lines.push(`   order      #${displayId}`);
-    if (mint.discount && mint.discount.amount > 0) {
+    const settled = outcome.summary;
+    const finalTotal = settled?.total ?? mint.total ?? shippedCart?.total ?? cart.total;
+    const finalCurrency = settled?.currency_code ?? currency;
+    if (settled?.discount_total) {
+      const codes = settled.discount_codes.length ? ` (${settled.discount_codes.join(", ")})` : "";
+      lines.push(dim(style, `   discount${codes} \u2212${fmtPrice(settled.discount_total, finalCurrency)}`));
+    } else if (mint.discount && mint.discount.amount > 0) {
       lines.push(dim(style, `   dev channel \u2212${fmtPrice(mint.discount.amount, currency)}   (${mint.discount.pct}% \u2014 the terminal's cut for you)`));
     }
-    lines.push(`   total      ${cyan(style, totalLine)}${taxIncl ? "   (incl. VAT)" : ""}`);
+    lines.push(`   total      ${cyan(style, fmtPrice(finalTotal, finalCurrency))}${taxIncl ? "   (incl. VAT)" : ""}`);
     if (shipsTo) {
       lines.push(`   ships to   ${shipsTo} \xB7 ~3\u20136 working days`);
     } else {
@@ -947,11 +965,13 @@ async function runCheckout(client, config, args, deps) {
         status: "placed",
         order_id: outcome.order_id,
         display_id: displayId,
-        // A2 — the SHIPPING-INCLUSIVE, dev-channel-discounted total the buyer consented to (same
-        // figure as the review), so a --json / bt buy consumer has the real amount, not just a status.
-        total: mint.total ?? shippedCart?.total ?? cart.total ?? null,
-        currency: mint.currency ?? cart.currency_code ?? region.currency_code ?? null,
-        discount: mint.discount ?? null
+        // A2/ENG-39 — the REAL settled total (every discount applied, incl. at payment); fall back
+        // to the mint estimate for an older backend. A --json / bt buy consumer gets the true amount.
+        total: settled?.total ?? mint.total ?? shippedCart?.total ?? cart.total ?? null,
+        currency: settled?.currency_code ?? mint.currency ?? cart.currency_code ?? region.currency_code ?? null,
+        discount: mint.discount ?? null,
+        // The full settled summary (subtotal, discount_total, promo codes, line items) when available.
+        summary: settled ?? null
       } : void 0
     };
   }
@@ -1008,8 +1028,8 @@ function registerCheckout(program, makeClient2, loadConfig2) {
     const { json, brand } = resolveOutput(program);
     const { makePrompts: makePrompts2 } = await import("./prompts-DDVV5RE6.js");
     const { openCheckout } = await import("./browser-WCNC4AWS.js");
-    const { pollUntilPlaced } = await import("./poll-O3VUD5WV.js");
-    const { saveConfig: saveConfig2 } = await import("./config-GVEB4R7I.js");
+    const { pollUntilPlaced } = await import("./poll-II3TVJLK.js");
+    const { saveConfig: saveConfig2 } = await import("./config-L4X7G563.js");
     const client = makeClient2();
     const print = json ? () => {
     } : (line) => process.stdout.write(line + "\n");
@@ -1716,7 +1736,7 @@ function registerDrop(program, exec) {
 }
 
 // src/commands/init.ts
-var HAPPY_PATH = ["bt browse", "bt stage <handle> --size L", "bt checkout"];
+var HAPPY_PATH = ["bt browse", "bt stage <handle> --size L   # add --fit regular|oversize for a two-fit design", "bt checkout"];
 var DOCS_URL = "https://binaryandthread.com/docs";
 function runInit(args) {
   const style = brandOf(args);
@@ -1727,7 +1747,7 @@ function runInit(args) {
     "",
     "   the happy path:",
     "     bt browse                    # the catalog, numbered",
-    "     bt stage <n|slug> --size L   # add to your cart (a browse number, or a slug)",
+    "     bt stage <n|slug> --size L   # add to your cart (a browse number, or a slug; --fit for a two-fit design)",
     "     bt checkout                  # pay in your browser \u2014 cards never touch the terminal (10% applied)",
     "",
     "   ships worldwide \u2014 set your country so prices show your currency:",
@@ -1756,6 +1776,7 @@ async function runBuy(client, config, args, deps) {
     handle: args.handle,
     size: args.size,
     colour: args.colour,
+    fit: args.fit,
     json: args.json,
     brand: args.brand
   });
@@ -1779,16 +1800,16 @@ async function runBuy(client, config, args, deps) {
   };
 }
 function registerBuy(program, makeClient2, loadConfig2) {
-  program.command("buy").argument("<handle>", "the design: a slug, a bt browse number (3), or a fuzzy hint (termnl)").option("--size <size>", "garment size").option("--colour <colour>", "colour, e.g. white / black").description("stage + checkout in one \u2014 reserve, then open browser checkout. cards never touch the terminal.").action(async (handle, opts) => {
+  program.command("buy").argument("<handle>", "the design: a slug, a bt browse number (3), or a fuzzy hint (termnl)").option("--size <size>", "garment size").option("--colour <colour>", "colour, e.g. white / black").option("--fit <fit>", "regular or oversize (required when a design comes in both)").description("stage + checkout in one \u2014 reserve, then open browser checkout. cards never touch the terminal.").action(async (handle, opts) => {
     const { json, brand } = resolveOutput(program);
     const { makePrompts: makePrompts2 } = await import("./prompts-DDVV5RE6.js");
     const { openCheckout } = await import("./browser-WCNC4AWS.js");
-    const { pollUntilPlaced } = await import("./poll-O3VUD5WV.js");
-    const { saveConfig: saveConfig2 } = await import("./config-GVEB4R7I.js");
+    const { pollUntilPlaced } = await import("./poll-II3TVJLK.js");
+    const { saveConfig: saveConfig2 } = await import("./config-L4X7G563.js");
     const client = makeClient2();
     const print = json ? () => {
     } : (line) => process.stdout.write(line + "\n");
-    const res = await runBuy(client, loadConfig2(), { handle, size: opts.size, colour: opts.colour, json, brand }, {
+    const res = await runBuy(client, loadConfig2(), { handle, size: opts.size, colour: opts.colour, fit: opts.fit, json, brand }, {
       prompts: makePrompts2(),
       open: (url) => openCheckout(url),
       // Same heartbeat as bt checkout — bt buy's browser-hop wait is the identical 20-min poll.
@@ -1809,7 +1830,7 @@ function registerBuy(program, makeClient2, loadConfig2) {
 }
 
 // src/commands/config.ts
-var SETTABLE = ["email", "region", "defaultSize", "defaultColour", "defaultBranch"];
+var SETTABLE = ["email", "region", "defaultSize", "defaultColour", "defaultFit", "defaultBranch"];
 function runConfig(args, deps) {
   const cfg = deps.load();
   const sub = (args.sub ?? "get").toLowerCase();
@@ -1844,7 +1865,7 @@ function runConfig(args, deps) {
 function registerConfig(program) {
   program.command("config").argument("[sub]", "get | set", "get").argument("[key]", "config key").argument("[value]", "value (for set)").description("view or set local prefs (email, region, defaults). the auth token is never stored here.").action(async (sub, key, value) => {
     const { json } = resolveOutput(program);
-    const { loadConfig: loadConfig2, saveConfig: saveConfig2 } = await import("./config-GVEB4R7I.js");
+    const { loadConfig: loadConfig2, saveConfig: saveConfig2 } = await import("./config-L4X7G563.js");
     const res = runConfig({ sub, key, value, json }, { load: loadConfig2, save: saveConfig2 });
     printResult(res, json);
   });