@binaryandthread/cli 0.2.1 → 0.3.1

package/dist/bin.js

@@ -5,7 +5,7 @@ import {
   forgetConfig,
   loadConfig,
   saveConfig
-} from "./chunk-OVG37IIX.js";
+} from "./chunk-ZNDKXHMV.js";
 import {
   makePrompts
 } from "./chunk-AAN4VWP3.js";
@@ -53,7 +53,7 @@ import {
   versionLine,
   warn,
   working
-} from "./chunk-AP5ARNWU.js";
+} from "./chunk-VDOFLQ2P.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.2.1";
+var VERSION = "0.3.1";
 
 // src/eggs.ts
 function teapot() {
@@ -222,7 +242,8 @@ function isMainModule(argv1, moduleUrl, realpath = realpathSync) {
 import * as fs from "fs";
 import * as path from "path";
 var CACHE_FILE = "update-check.json";
-var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
+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-4XWSUOOK.js");
+      const { runInteractiveBrowse } = await import("./interactive-JALKLT56.js");
       const handled = await runInteractiveBrowse(makeClient2(), loadConfig2(), { branch: opts.branch, brand });
       if (handled) return;
     }
@@ -820,8 +856,13 @@ async function runCheckout(client, config, args, deps) {
       // fail-closed, no order placed → non-zero (matches the shown exit 1)
     };
   }
+  const email = (config.email ?? "").trim();
+  const mint = await client.mintCheckout(cartId, email || void 0, "cli");
+  const { checkout_url, session_id } = mint;
+  const save = email ? { email } : {};
+  const currency = mint.currency ?? cart.currency_code ?? region.currency_code;
   const itemCount = cart.items.reduce((n, li) => n + (li.quantity ?? 1), 0);
-  const totalLine = fmtPrice(shippedCart?.total ?? cart.total, cart.currency_code ?? region.currency_code);
+  const totalLine = fmtPrice(mint.total ?? shippedCart?.total ?? cart.total, currency);
   const taxIncl = isCartTaxInclusive(cart);
   const reviewLines = [header(style, "bt checkout \u2014 staged for commit")];
   for (const li of cart.items) {
@@ -831,6 +872,11 @@ async function runCheckout(client, config, args, deps) {
       `   ${(li.title ?? li.product_title ?? "item").toString()}${colourTag} \xB7 qty ${li.quantity}` + (li.total != null ? `   ${cyan(style, fmtPrice(li.total, cart.currency_code ?? region.currency_code))}` : "")
     );
   }
+  if (mint.discount && mint.discount.amount > 0) {
+    reviewLines.push(
+      dim(style, `   dev channel  \u2212${fmtPrice(mint.discount.amount, currency)}  (${mint.discount.pct}% \u2014 for shopping the terminal)`)
+    );
+  }
   reviewLines.push(`   total    ${cyan(style, totalLine)}${taxSuffix(taxIncl)}`);
   const print = deps.print ?? ((line) => process.stdout.write(line + "\n"));
   for (const line of reviewLines) {
@@ -849,9 +895,6 @@ async function runCheckout(client, config, args, deps) {
   }
   const allowed = supportedCountries(region);
   const shipsTo = (allowed[0] ?? "").toUpperCase();
-  const email = (config.email ?? "").trim();
-  const { checkout_url, session_id } = await client.mintCheckout(cartId, email || void 0, "cli");
-  const save = email ? { email } : {};
   const opened = await deps.open(checkout_url);
   for (const line of opened.lines) {
     print(line);
@@ -884,6 +927,9 @@ 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) {
+      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)" : ""}`);
     if (shipsTo) {
       lines.push(`   ships to   ${shipsTo} \xB7 ~3\u20136 working days`);
@@ -901,10 +947,11 @@ async function runCheckout(client, config, args, deps) {
         status: "placed",
         order_id: outcome.order_id,
         display_id: displayId,
-        // A2 — the SHIPPING-INCLUSIVE 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: shippedCart?.total ?? cart.total ?? null,
-        currency: cart.currency_code ?? region.currency_code ?? null
+        // 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
       } : void 0
     };
   }
@@ -962,7 +1009,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-O3VUD5WV.js");
-    const { saveConfig: saveConfig2 } = await import("./config-FXGCWC6Y.js");
+    const { saveConfig: saveConfig2 } = await import("./config-GVEB4R7I.js");
     const client = makeClient2();
     const print = json ? () => {
     } : (line) => process.stdout.write(line + "\n");
@@ -1348,52 +1395,31 @@ function registerUnstage(program, makeClient2, loadConfig2) {
 }
 
 // src/commands/whoami.ts
-var NEXT_TIER = {
-  contributor: { at: 5, name: "maintainer", pct: 10 },
-  maintainer: { at: 20, name: "core", pct: 15 },
-  core: { at: 0, name: "core", pct: 20 }
-};
+var DEV_CHANNEL_PCT = 10;
 var GRAPH_CAP = 20;
 var CARD_WIDTH = 58;
 function profileCard(p, style, handle) {
-  const tier = p.bt_tier ?? "contributor";
   const commits = p.bt_commit_count ?? 0;
-  const next = NEXT_TIER[tier];
-  const isMax = tier === "core" || !next;
-  const toNext = next && !isMax ? Math.max(0, next.at - commits) : 0;
-  const standing = p.standing_pct ?? NEXT_TIER[tier]?.pct ?? null;
   const inner = [];
-  inner.push(`${handle ? `${handle} \xB7 ` : ""}${cyan(style, tier)}`);
+  inner.push(`${handle ? `${handle} \xB7 ` : ""}${cyan(style, "terminal")}`);
   inner.push(rule(CARD_WIDTH - 1));
-  if (isMax) {
-    inner.push(`tier      ${tier.padEnd(13)}max standing \u2014 ${standing ?? 20}%`);
-  } else {
-    inner.push(`tier      ${tier.padEnd(13)}${toNext} more commit${toNext === 1 ? "" : "s"} to ${next.name}`);
-  }
   if (commits === 0) {
-    inner.push(`commits   ${String(commits).padEnd(13)}your repo's empty \u2014 everyone starts at 0`);
+    inner.push(`orders    ${String(commits).padEnd(13)}your repo's empty \u2014 everyone starts at 0`);
   } else {
-    inner.push(`commits   ${String(commits).padEnd(13)}order${commits === 1 ? "" : "s"} committed`);
-  }
-  if (standing != null) {
-    inner.push(`standing  ${cyan(style, `${standing}%`.padEnd(13))}applied at every commit`);
+    inner.push(`orders    ${String(commits).padEnd(13)}committed`);
   }
+  inner.push(`discount  ${cyan(style, `${DEV_CHANNEL_PCT}%`.padEnd(13))}off every order \u2014 for shopping the terminal`);
   const bar = contributionBar(style, commits, GRAPH_CAP);
   const graphLabel = commits === 0 ? "no commits yet" : `${commits} contribution${commits === 1 ? "" : "s"}`;
   inner.push(`graph     ${bar}  ${graphLabel}`);
-  if (p.bt_badges && p.bt_badges.length > 0) {
-    inner.push(`badges    ${p.bt_badges.join(" \xB7 ")}`);
-  }
   if (p.bt_connected_at) {
-    inner.push(`since     contributor since ${p.bt_connected_at.slice(0, 10)}`);
+    inner.push(`since     connected ${p.bt_connected_at.slice(0, 10)}`);
   }
   inner.push(rule(CARD_WIDTH - 1));
-  if (isMax) {
-    inner.push(`in ${green(style, "AUTHORS")}. earned, not bought.`);
-  } else if (commits === 0) {
+  if (commits === 0) {
     inner.push("your first commit makes this worth screenshotting \u2192 bt browse");
   } else {
-    inner.push(`${toNext} more to ${next.name} \u2192 bt browse \xB7 earned, not bought`);
+    inner.push(`in ${green(style, "AUTHORS")}. earned, not bought.`);
   }
   return box(inner, { width: CARD_WIDTH, title: "bt whoami", style });
 }
@@ -1414,10 +1440,8 @@ async function runWhoami(client, config, args, token) {
         lines: profileCard(me, style, handle),
         json: {
           authenticated: true,
-          tier: me.bt_tier,
-          commits: me.bt_commit_count,
-          badges: me.bt_badges,
-          standing_pct: me.standing_pct ?? null,
+          orders: me.bt_commit_count ?? 0,
+          discount_pct: DEV_CHANNEL_PCT,
           connected_at: me.bt_connected_at,
           token_expires_at: expiresAt,
           token_expired: expired
@@ -1430,11 +1454,10 @@ async function runWhoami(client, config, args, token) {
       return {
         lines: [
           empty("you're browsing as a guest \u2014 not connected yet."),
-          "   connect \u2192 bt login   (the contributor on-ramp for this channel)"
+          "   connect \u2192 bt login   (order history + a persistent cart; the terminal's 10% applies either way)"
         ],
         json: args.json ? {
           authenticated: false,
-          tier: null,
           connected: false,
           token_expires_at: expiresAt,
           token_expired: expired
@@ -1445,7 +1468,7 @@ async function runWhoami(client, config, args, token) {
   }
 }
 function registerWhoami(program, makeClient2, loadConfig2) {
-  program.command("whoami").description("your contribution profile + standing.").action(async () => {
+  program.command("whoami").description("your profile + order history.").action(async () => {
     const { json, brand } = resolveOutput(program);
     const res = await runWhoami(makeClient2(), loadConfig2(), { json, brand }, getToken());
     printResult(res, json);
@@ -1505,31 +1528,6 @@ function registerDrops(program, makeClient2, loadConfig2) {
   });
 }
 
-// src/commands/connect.ts
-async function runConnect(args) {
-  const lines = [
-    "connect your wardrobe \u2014 become a contributor.",
-    "   connecting authenticates you and unlocks:",
-    "     \xB7 10% standing (applied at every commit)",
-    "     \xB7 access to next (drops before the web sees them)",
-    "     \xB7 your wardrobe repo + the contributor badge",
-    "",
-    "   connect now \u2192 bt login",
-    "   (we email you a token to paste; it lives in your OS keychain, never in plaintext config.)"
-  ];
-  return {
-    lines,
-    json: args.json ? { connected: false, login_command: "bt login" } : void 0
-  };
-}
-function registerConnect(program) {
-  program.command("connect").description("the contributor on-ramp \u2014 what connecting unlocks. run bt login to connect.").action(async () => {
-    const { json } = resolveOutput(program);
-    const res = await runConnect({ json });
-    printResult(res, json);
-  });
-}
-
 // src/commands/login.ts
 var EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 async function runLogin(client, prompts, keychain, config, args) {
@@ -1557,7 +1555,7 @@ async function runLogin(client, prompts, keychain, config, args) {
     }
     keychain.setToken(jsonResult.jwt);
     return {
-      lines: [ok("authenticated. welcome \u2014 you're a contributor now.")],
+      lines: [ok("authenticated. welcome back.")],
       save: { email: jsonEmail },
       json: { connected: true, customer_id: jsonResult.customer.id }
     };
@@ -1608,9 +1606,9 @@ async function runLogin(client, prompts, keychain, config, args) {
   keychain.setToken(result.jwt);
   return {
     lines: [
-      ok("authenticated. welcome \u2014 you're a contributor now."),
+      ok("authenticated. welcome back."),
       `   ${GLYPH.arrow} your token is in your OS keychain (never plaintext).`,
-      `   ${GLYPH.arrow} see your standing \u2192 bt whoami`
+      `   ${GLYPH.arrow} your profile \u2192 bt whoami   \xB7   order history \u2192 bt log`
     ],
     save: { email },
     json: args.json ? { connected: true, customer_id: result.customer.id } : void 0
@@ -1725,20 +1723,24 @@ function runInit(args) {
   const lines = [
     header(style, "bt \u2014 binary & thread, the terminal store"),
     "   buy heavyweight pieces from your terminal. zero setup \u2014 you're already pointed at the live store.",
+    "   shopping here is 10% off the web \u2014 always, applied at checkout. no code, no login.",
     "",
     "   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 checkout                  # pay in your browser \u2014 cards never touch the terminal",
+    "     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:",
+    "     bt region <cc>               # e.g. se / us / de   \xB7   see all \u2192 bt region --list",
     "",
     "   optional:",
-    "     bt login                     # contributor standing + order history",
+    "     bt login                     # order history + a persistent cart",
     "     bt whoami                    # your profile",
     `   docs \u2192 ${DOCS_URL}`
   ];
   return {
     lines,
-    json: args.json ? { happy_path: HAPPY_PATH, docs: DOCS_URL, zero_setup: true } : void 0
+    json: args.json ? { happy_path: HAPPY_PATH, docs: DOCS_URL, zero_setup: true, dev_channel_discount_pct: 10 } : void 0
   };
 }
 function registerInit(program) {
@@ -1782,7 +1784,7 @@ function registerBuy(program, makeClient2, loadConfig2) {
     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 { saveConfig: saveConfig2 } = await import("./config-GVEB4R7I.js");
     const client = makeClient2();
     const print = json ? () => {
     } : (line) => process.stdout.write(line + "\n");
@@ -1842,7 +1844,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-GVEB4R7I.js");
     const res = runConfig({ sub, key, value, json }, { load: loadConfig2, save: saveConfig2 });
     printResult(res, json);
   });
@@ -2044,7 +2046,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);
@@ -2066,7 +2069,6 @@ function registerCommands(program) {
   registerStatus(program, makeClient, effectiveConfig);
   registerWhoami(program, makeClient, effectiveConfig);
   registerDrops(program, makeClient, effectiveConfig);
-  registerConnect(program);
   registerUnstage(program, makeClient, effectiveConfig);
   const prompts = makePrompts();
   registerLogin(