@binaryandthread/cli 0.4.11 → 0.4.13

package/README.md

@@ -58,7 +58,7 @@ Listing them would defeat the point.
 | `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; `--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 stage <n\|slug>` | add to your cart (`--size`, `--colour`, `--fit regular\|oversize`; `--size` is required unless `bt config set defaultSize M`; a design sold in both fits needs `--fit`, or `bt config set defaultFit …`; one design per command, a two-word colour is `--colour coal` or quoted) |
 | `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 |
@@ -111,7 +111,7 @@ skips the interactive confirm so it never hangs in CI. Field shapes (stable, saf
 | --- | --- |
 | `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 cart` | `{ cart_id, items: [{ id, title, colour, qty, total }], total, total_excludes_shipping }`; a cart that became an order answers `{ cart_id: null, items: [], completed: true }` and clears the saved id |
 | `bt checkout` | `{ status: "placed"\|"timeout"\|"expired", order_id?, display_id?, total?, currency?, checkout_url? }` |
 | `bt region` | `{ region, currency, matched, home }` · `--list` → `{ regions: [{ currency, countries[] }] }` |
 | `bt whoami` | `{ authenticated, tier, commits, standing_pct, token_expires_at, token_expired }` |

package/dist/bin.js

@@ -5,7 +5,7 @@ import {
   forgetConfig,
   loadConfig,
   saveConfig
-} from "./chunk-T7MFWTB7.js";
+} from "./chunk-IUN3OOYY.js";
 import {
   makePrompts
 } from "./chunk-AAN4VWP3.js";
@@ -38,6 +38,7 @@ import {
   labelVariantTitle,
   lineColour,
   ok,
+  oneDesignPerCommand,
   orderStage,
   priceLine,
   printResult,
@@ -58,7 +59,7 @@ import {
   versionLine,
   warn,
   working
-} from "./chunk-UTSTDWKZ.js";
+} from "./chunk-ZRHSCMBQ.js";
 import {
   __require
 } from "./chunk-7OCVIDC7.js";
@@ -107,7 +108,7 @@ function makeLogger(debug, write = (s) => process.stderr.write(s)) {
 }
 
 // src/version.ts
-var VERSION = "0.4.11";
+var VERSION = "0.4.13";
 
 // src/eggs.ts
 function teapot() {
@@ -195,7 +196,7 @@ function manPage(version) {
     "       init       first-run welcome + the happy path",
     "       browse     list what's in stock",
     "       view       render one piece (image or ASCII) + specs",
-    "       stage      reserve stock (like git add)",
+    "       stage      reserve stock (like git add); --size required unless bt config set defaultSize",
     "       commit     turn your staged items into an order",
     "       buy        stage + commit in one",
     "       log        your order history as a git log (--graph, --oneline)",
@@ -527,7 +528,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-UM5FCZDG.js");
+      const { runInteractiveBrowse } = await import("./interactive-JONAXMTQ.js");
       const handled = await runInteractiveBrowse(makeClient2(), loadConfig2(), { branch: opts.branch, brand });
       if (handled) return;
     }
@@ -730,6 +731,7 @@ function registerSearch(program, makeClient2, loadConfig2) {
 
 // src/commands/cart.ts
 var EMPTY_STATE = "no commits yet. your wardrobe is a fresh repo.";
+var COMMITTED_LINE = "that cart was committed as an order, so it is no longer yours to edit.";
 async function runCart(client, config, args) {
   if (!config.cart_id) {
     return {
@@ -740,6 +742,14 @@ async function runCart(client, config, args) {
   const style = brandOf(args);
   try {
     const cart = await client.getCart(config.cart_id);
+    if (cart.completed_at) {
+      return {
+        lines: [warn(COMMITTED_LINE), empty(EMPTY_STATE), "   start one \u2192 bt browse"],
+        // the id is dead: clear it, so the next bt stage starts a fresh cart without a detour
+        save: { cart_id: null },
+        json: args.json ? { cart_id: null, items: [], completed: true } : void 0
+      };
+    }
     const lines = [];
     if (!cart.items || cart.items.length === 0) {
       lines.push(empty(EMPTY_STATE));
@@ -795,6 +805,10 @@ function registerCart(program, makeClient2, loadConfig2) {
   program.command("cart").description("show your current cart \u2014 the authoritative server state.").action(async () => {
     const { json, brand } = resolveOutput(program);
     const res = await runCart(makeClient2(), loadConfig2(), { json, brand });
+    if (res.save) {
+      const { saveConfig: saveConfig2 } = await import("./config-PWI2G2O5.js");
+      saveConfig2(res.save);
+    }
     printResult(res, json);
   });
 }
@@ -815,6 +829,14 @@ function heartbeatLine(attempt, opts = {}) {
     `still waiting for the browser hand-off, ${elapsedS}s in. ctrl-c is safe; resume with bt checkout --resume`
   );
 }
+function committedResult(args) {
+  return {
+    lines: [warn(COMMITTED_LINE), "   see the order \u2192 bt log"],
+    save: { cart_id: null },
+    json: args.json ? { status: "completed", cart_id: null } : void 0,
+    exitCode: 0
+  };
+}
 async function runCheckout(client, config, args, deps) {
   const cartId = config.cart_id;
   if (!cartId) {
@@ -847,6 +869,9 @@ async function runCheckout(client, config, args, deps) {
     }
     throw e;
   }
+  if (cart.completed_at) {
+    return committedResult(args);
+  }
   if (!cart.items || cart.items.length === 0) {
     return {
       lines: [
@@ -886,7 +911,15 @@ async function runCheckout(client, config, args, deps) {
     };
   }
   const email = (config.email ?? "").trim();
-  const mint = await client.mintCheckout(cartId, email || void 0, "cli");
+  let mint;
+  try {
+    mint = await client.mintCheckout(cartId, email || void 0, "cli");
+  } catch (e) {
+    if (e instanceof StoreApiError && e.status === 409) {
+      return committedResult(args);
+    }
+    throw e;
+  }
   const { checkout_url, session_id } = mint;
   const save = email ? { email } : {};
   const currency = mint.currency ?? cart.currency_code ?? region.currency_code;
@@ -965,7 +998,7 @@ async function runCheckout(client, config, args, deps) {
   }
   const lines = [];
   if (outcome.status === "placed") {
-    const displayId = await resolveDisplayId(client, outcome.order_id, email);
+    const displayId = outcome.summary?.display_id ?? await resolveDisplayId(client, outcome.order_id, email);
     lines.push("");
     lines.push(ok("deploy successful."));
     lines.push(`   committed to wardrobe@main`);
@@ -976,7 +1009,7 @@ async function runCheckout(client, config, args, deps) {
     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) {
+    } else if (!settled && 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, fmtPrice(finalTotal, finalCurrency))}${taxIncl ? "   (incl. VAT)" : ""}`);
@@ -991,7 +1024,9 @@ async function runCheckout(client, config, args, deps) {
     }
     return {
       lines,
-      save,
+      // TB252 (plan-check 2): the cart is an order now, so its id leaves the config. Left behind, it made
+      // `bt cart` list the paid items as still staged.
+      save: { ...save, cart_id: null },
       json: args.json ? {
         status: "placed",
         order_id: outcome.order_id,
@@ -1036,6 +1071,9 @@ async function resolveDisplayId(client, orderId, email) {
   if (!orderId) {
     return "\u2014";
   }
+  if (!email) {
+    return orderId;
+  }
   try {
     const looked = await client.getOrder(orderId, email);
     const display = looked?.order?.display_id ?? looked?.display_id;
@@ -1060,7 +1098,7 @@ function registerCheckout(program, makeClient2, loadConfig2) {
     const { makePrompts: makePrompts2 } = await import("./prompts-DDVV5RE6.js");
     const { openCheckout } = await import("./browser-WCNC4AWS.js");
     const { pollUntilPlaced } = await import("./poll-II3TVJLK.js");
-    const { saveConfig: saveConfig2 } = await import("./config-L4X7G563.js");
+    const { saveConfig: saveConfig2 } = await import("./config-PWI2G2O5.js");
     const client = makeClient2();
     const print = json ? () => {
     } : (line) => process.stdout.write(line + "\n");
@@ -1314,6 +1352,13 @@ async function runStatus(client, config, args) {
   const style = brandOf(args);
   try {
     const cart = await client.getCart(config.cart_id);
+    if (cart.completed_at) {
+      return {
+        lines: ["on branch main", warn(COMMITTED_LINE), empty(FRESH_REPO), "   nothing staged. clean tree \u2192 bt browse"],
+        save: { cart_id: null },
+        json: args.json ? { branch: "main", staged: [], clean: true, completed: true } : void 0
+      };
+    }
     const items = cart.items ?? [];
     const lines = ["on branch main"];
     if (items.length === 0) {
@@ -1352,6 +1397,10 @@ function registerStatus(program, makeClient2, loadConfig2) {
   program.command("status").description("working-tree state: what's staged, what's in flight.").action(async () => {
     const { json, brand } = resolveOutput(program);
     const res = await runStatus(makeClient2(), loadConfig2(), { json, brand });
+    if (res.save) {
+      const { saveConfig: saveConfig2 } = await import("./config-PWI2G2O5.js");
+      saveConfig2(res.save);
+    }
     printResult(res, json);
   });
 }
@@ -1811,6 +1860,7 @@ async function runBuy(client, config, args, deps) {
   if (!cartId) {
     return staged;
   }
+  deps.saveConfig(staged.save);
   const checked = await runCheckout(
     client,
     { ...config, cart_id: cartId },
@@ -1827,12 +1877,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").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) => {
+  program.command("buy").argument("<handle>", "the design: a slug, a bt browse number (3), or a fuzzy hint (termnl)").option("--size <size>", "garment size (required unless bt config set defaultSize)").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.").allowExcessArguments().action(async (handle, opts, cmd) => {
     const { json, brand } = resolveOutput(program);
+    if (cmd.args.length > 1) {
+      printResult(oneDesignPerCommand(), json);
+      return;
+    }
     const { makePrompts: makePrompts2 } = await import("./prompts-DDVV5RE6.js");
     const { openCheckout } = await import("./browser-WCNC4AWS.js");
     const { pollUntilPlaced } = await import("./poll-II3TVJLK.js");
-    const { saveConfig: saveConfig2 } = await import("./config-L4X7G563.js");
+    const { saveConfig: saveConfig2 } = await import("./config-PWI2G2O5.js");
     const client = makeClient2();
     const print = json ? () => {
     } : (line) => process.stdout.write(line + "\n");
@@ -1892,7 +1946,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-L4X7G563.js");
+    const { loadConfig: loadConfig2, saveConfig: saveConfig2 } = await import("./config-PWI2G2O5.js");
     const res = runConfig({ sub, key, value, json }, { load: loadConfig2, save: saveConfig2 });
     printResult(res, json);
   });
@@ -2059,6 +2113,10 @@ function buildProgram() {
     "the binary & thread terminal store. techno-minimalist clothing & lifestyle, bought with the ceremony of a deploy.\nprimary invocation: npx @binaryandthread/cli  (a bare `bt` may collide with another binary)"
   ).version(versionLine(VERSION), "-v, --version", "print the version").option("--json", "machine-readable output", false).option("--no-color", "disable ANSI colour + inline images (also honours NO_COLOR)").option("--debug, --verbose", "trace requests to stderr (redacted) \u2014 for bug reports (d15)").option("--region <cc>", "ship-to country for this command (ISO-2, overrides your saved region)").showSuggestionAfterError();
   program.addHelpText("beforeAll", "\n  bt \u2014 the binary & thread terminal store. new here? \u2192 bt init\n");
+  program.addHelpText(
+    "after",
+    "\nexamples:\n  bt browse\n  bt stage konami-code --size M --colour coal\n  bt buy konami-code --size M --colour coal\n  bt stage --help   (every command has its own)\n"
+  );
   program.command("brew").alias("teapot").argument("[what]", "what to brew").description("we make clothing, not coffee.").action(() => {
     process.stdout.write(teapot() + "\n");
   });