@binaryandthread/cli 0.3.0 → 0.3.2

package/dist/bin.js

@@ -5,7 +5,7 @@ import {
   forgetConfig,
   loadConfig,
   saveConfig
-} from "./chunk-OVG37IIX.js";
+} from "./chunk-RGFMXWD5.js";
 import {
   makePrompts
 } from "./chunk-AAN4VWP3.js";
@@ -53,7 +53,7 @@ import {
   versionLine,
   warn,
   working
-} from "./chunk-RDJJLYXB.js";
+} from "./chunk-BFMH7VCE.js";
 import {
   __require
 } from "./chunk-7OCVIDC7.js";
@@ -62,6 +62,26 @@ import {
 import { spawn } from "child_process";
 import { Command } from "commander";
 
+// src/locale.ts
+function detectRegionFromLocale(env) {
+  const raw = (env.LC_ALL || env.LC_MESSAGES || env.LANG || "").trim();
+  const m = /^[A-Za-z]{2,3}[_-]([A-Za-z]{2})(?:[.@]|$)/.exec(raw);
+  return m ? m[1].toLowerCase() : null;
+}
+function resolveEffectiveRegion(flag, saved, env) {
+  if (flag && flag.trim()) {
+    return { region: flag.trim().toLowerCase(), source: "flag" };
+  }
+  if (saved && saved.trim()) {
+    return { region: saved.trim().toLowerCase(), source: "config" };
+  }
+  const fromLocale = detectRegionFromLocale(env);
+  if (fromLocale) {
+    return { region: fromLocale, source: "locale" };
+  }
+  return { region: void 0, source: void 0 };
+}
+
 // src/client-config.ts
 function resolveClientConfig(env = process.env) {
   const baseUrl = env.BT_API_URL || env.MEDUSA_BACKEND_URL || BT_DEFAULT_STORE_URL;
@@ -82,7 +102,7 @@ function makeLogger(debug, write = (s) => process.stderr.write(s)) {
 }
 
 // src/version.ts
-var VERSION = "0.3.0";
+var VERSION = "0.3.2";
 
 // src/eggs.ts
 function teapot() {
@@ -223,6 +243,7 @@ import * as fs from "fs";
 import * as path from "path";
 var CACHE_FILE = "update-check.json";
 var CHECK_INTERVAL_MS = 6 * 60 * 60 * 1e3;
+var NOTICE_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 var REGISTRY_LATEST = "https://registry.npmjs.org/@binaryandthread/cli/latest";
 var FETCH_TIMEOUT_MS = 2e3;
 function parseSemver(v) {
@@ -254,9 +275,14 @@ function maybeNotifyUpdate(deps) {
   const now = deps.now ?? Date.now();
   const read = deps.readCache ?? readUpdateCache;
   const refresh = deps.refresh ?? ((n) => void fetchLatestIntoCache(n));
+  const markNotified = deps.markNotified ?? markNotifiedInCache;
   const cache = read();
   const line = updateNoticeLine(deps.current, cache?.latest);
-  if (line) deps.write(line + "\n");
+  const canNotify = cache?.lastNotified === void 0 || now - cache.lastNotified >= NOTICE_INTERVAL_MS;
+  if (line && canNotify) {
+    deps.write(line + "\n");
+    markNotified(now);
+  }
   if (!cache || now - cache.lastCheck > CHECK_INTERVAL_MS) {
     refresh(now);
   }
@@ -268,12 +294,22 @@ function readUpdateCache() {
   try {
     const j = JSON.parse(fs.readFileSync(cachePath(), "utf8"));
     if (j && typeof j.latest === "string" && typeof j.lastCheck === "number") {
-      return { latest: j.latest, lastCheck: j.lastCheck };
+      const cache = { latest: j.latest, lastCheck: j.lastCheck };
+      if (typeof j.lastNotified === "number") {
+        cache.lastNotified = j.lastNotified;
+      }
+      return cache;
     }
   } catch {
   }
   return null;
 }
+function markNotifiedInCache(now) {
+  const cache = readUpdateCache();
+  if (cache) {
+    writeUpdateCache({ ...cache, lastNotified: now });
+  }
+}
 function writeUpdateCache(c) {
   try {
     fs.mkdirSync(configDir(), { recursive: true });
@@ -439,7 +475,7 @@ async function runBrowse(client, config, args) {
     lines.push("   peek at next \u2192 bt browse --branch=next");
   } else {
     lines.push(header(style, "bt browse \u2014 in stock"));
-    lines.push(regionLine(rr, style));
+    lines.push(regionLine(rr, style, config.region_source));
     lines.push(...layoutRows(rows, style));
     for (const d of drops) {
       const dt = (d.title ?? d.handle ?? d.id).toString();
@@ -478,7 +514,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-DJXIUVBM.js");
+      const { runInteractiveBrowse } = await import("./interactive-BOS6VMRJ.js");
       const handled = await runInteractiveBrowse(makeClient2(), loadConfig2(), { branch: opts.branch, brand });
       if (handled) return;
     }
@@ -891,10 +927,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 {
@@ -911,11 +953,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
     };
   }
@@ -972,8 +1016,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-FXGCWC6Y.js");
+    const { pollUntilPlaced } = await import("./poll-II3TVJLK.js");
+    const { saveConfig: saveConfig2 } = await import("./config-WV4DTQXU.js");
     const client = makeClient2();
     const print = json ? () => {
     } : (line) => process.stdout.write(line + "\n");
@@ -1747,8 +1791,8 @@ function registerBuy(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-FXGCWC6Y.js");
+    const { pollUntilPlaced } = await import("./poll-II3TVJLK.js");
+    const { saveConfig: saveConfig2 } = await import("./config-WV4DTQXU.js");
     const client = makeClient2();
     const print = json ? () => {
     } : (line) => process.stdout.write(line + "\n");
@@ -1808,7 +1852,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-FXGCWC6Y.js");
+    const { loadConfig: loadConfig2, saveConfig: saveConfig2 } = await import("./config-WV4DTQXU.js");
     const res = runConfig({ sub, key, value, json }, { load: loadConfig2, save: saveConfig2 });
     printResult(res, json);
   });
@@ -2010,7 +2054,8 @@ function registerCommands(program) {
   const effectiveConfig = () => {
     const saved = loadConfig();
     const flag = program.opts().region;
-    return flag ? { ...saved, region: flag.trim().toLowerCase() } : saved;
+    const { region, source } = resolveEffectiveRegion(flag, saved.region, process.env);
+    return { ...saved, region, region_source: source };
   };
   registerInit(program);
   registerBrowse(program, makeClient, effectiveConfig);