@binaryandthread/cli 0.4.11 → 0.4.12

package/dist/{chunk-T7MFWTB7.js → chunk-IUN3OOYY.js}

@@ -31,7 +31,11 @@ function loadConfig() {
   }
 }
 function saveConfig(patch) {
-  const merged = { ...loadConfig(), ...sanitize(patch) };
+  const raw = patch;
+  const merged = { ...loadConfig(), ...sanitize(raw) };
+  for (const key of ALLOWED_KEYS) {
+    if (raw[key] === null) delete merged[key];
+  }
   const dir = configDir();
   fs.mkdirSync(dir, { recursive: true });
   const target = configPath();
@@ -64,4 +68,4 @@ export {
   saveConfig,
   forgetConfig
 };
-//# sourceMappingURL=chunk-T7MFWTB7.js.map
+//# sourceMappingURL=chunk-IUN3OOYY.js.map

package/dist/chunk-IUN3OOYY.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/config.ts"],"sourcesContent":["// Local config — ~/.config/bt/config.json.\n//\n// Holds ONLY non-sensitive fields (SECURITY G15): cart_id, email, region, defaults.\n// The auth TOKEN is NEVER here — it goes in the OS keychain in Wave 5. Persisting a\n// token in plaintext config would be the exact leak G15 forbids.\n//\n// Writes are ATOMIC (F-B1): write to config.json.tmp then fs.renameSync, so a crash\n// mid-write never corrupts the file (rename is atomic on POSIX + Windows same-volume).\n\nimport * as fs from \"node:fs\"\nimport * as os from \"node:os\"\nimport * as path from \"node:path\"\n\nexport interface BtConfig {\n  cart_id?: string\n  email?: string\n  region?: string\n  defaultSize?: string\n  defaultColour?: string\n  /** CAT-31: \"regular\" | \"oversize\", used when a design comes in both fits and no --fit is given. */\n  defaultFit?: string\n  defaultBranch?: string\n  /** RUNTIME-ONLY (ENG-21): where the effective region came from this run — flag, saved config, or\n   *  a locale guess. Deliberately NOT in ALLOWED_KEYS, so saveConfig always strips it. */\n  region_source?: \"flag\" | \"config\" | \"locale\"\n}\n\n// Persisted keys exclude the RUNTIME-ONLY fields (region_source) — typing ALLOWED_KEYS as the full\n// `keyof BtConfig` wrongly widened `key` to include region_source's literal union, so `out[key] = v`\n// (a string) failed to typecheck. PersistedKey narrows it to the string-valued, persistable fields.\nexport type PersistedKey = Exclude<keyof BtConfig, \"region_source\">\n\n/** A config patch: a string sets the key, `null` DELETES it (TB252: a paid cart's id must go), undefined leaves it. */\nexport type ConfigPatch = { [K in PersistedKey]?: string | null }\n\n// Only these keys are ever persisted — anything else (notably `token`) is dropped (G15).\nconst ALLOWED_KEYS: Array<PersistedKey> = [\n  \"cart_id\",\n  \"email\",\n  \"region\",\n  \"defaultSize\",\n  \"defaultColour\",\n  \"defaultFit\",\n  \"defaultBranch\",\n]\n\n/** The config directory: $XDG_CONFIG_HOME/bt or ~/.config/bt. */\nexport function configDir(): string {\n  const xdg = process.env.XDG_CONFIG_HOME\n  const base = xdg && xdg.trim() ? xdg : path.join(os.homedir(), \".config\")\n  return path.join(base, \"bt\")\n}\n\nexport function configPath(): string {\n  return path.join(configDir(), \"config.json\")\n}\n\n/** Load the config, or {} if none / unreadable. Never throws. */\nexport function loadConfig(): BtConfig {\n  try {\n    const raw = fs.readFileSync(configPath(), \"utf8\")\n    const parsed = JSON.parse(raw) as Record<string, unknown>\n    return sanitize(parsed)\n  } catch {\n    return {}\n  }\n}\n\n/**\n * Merge-and-save the given fields. Strips any non-allowlisted key (G15). Atomic (F-B1). A value of\n * exactly `null` deletes that key (TB252: before this no path could clear cart_id, so a paid cart's\n * id outlived its order and `bt cart` listed the paid items as still staged).\n */\nexport function saveConfig(patch: ConfigPatch | Partial<BtConfig>): BtConfig {\n  const raw = patch as Record<string, unknown>\n  const merged = { ...loadConfig(), ...sanitize(raw) }\n  for (const key of ALLOWED_KEYS) {\n    if (raw[key] === null) delete merged[key]\n  }\n  const dir = configDir()\n  fs.mkdirSync(dir, { recursive: true })\n  const target = configPath()\n  const tmp = target + \".tmp\"\n  // write to a temp file then atomically rename (F-B1)\n  fs.writeFileSync(tmp, JSON.stringify(merged, null, 2), { encoding: \"utf8\", mode: 0o600 })\n  fs.renameSync(tmp, target)\n  return merged\n}\n\n/** Wipe the local config file (G15 erasure — `bt forget`). Never throws. */\nexport function forgetConfig(): void {\n  try {\n    fs.rmSync(configPath(), { force: true })\n  } catch {\n    /* ignore */\n  }\n}\n\n/** Keep only allowlisted, non-sensitive keys (drops `token` and anything unexpected). */\nfunction sanitize(obj: Record<string, unknown>): BtConfig {\n  const out: BtConfig = {}\n  for (const key of ALLOWED_KEYS) {\n    const v = obj[key]\n    if (typeof v === \"string\" && v.length > 0) {\n      out[key] = v\n    }\n  }\n  return out\n}\n"],"mappings":";;;AASA,YAAY,QAAQ;AACpB,YAAY,QAAQ;AACpB,YAAY,UAAU;AAyBtB,IAAM,eAAoC;AAAA,EACxC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAGO,SAAS,YAAoB;AAClC,QAAM,MAAM,QAAQ,IAAI;AACxB,QAAM,OAAO,OAAO,IAAI,KAAK,IAAI,MAAW,UAAQ,WAAQ,GAAG,SAAS;AACxE,SAAY,UAAK,MAAM,IAAI;AAC7B;AAEO,SAAS,aAAqB;AACnC,SAAY,UAAK,UAAU,GAAG,aAAa;AAC7C;AAGO,SAAS,aAAuB;AACrC,MAAI;AACF,UAAM,MAAS,gBAAa,WAAW,GAAG,MAAM;AAChD,UAAM,SAAS,KAAK,MAAM,GAAG;AAC7B,WAAO,SAAS,MAAM;AAAA,EACxB,QAAQ;AACN,WAAO,CAAC;AAAA,EACV;AACF;AAOO,SAAS,WAAW,OAAkD;AAC3E,QAAM,MAAM;AACZ,QAAM,SAAS,EAAE,GAAG,WAAW,GAAG,GAAG,SAAS,GAAG,EAAE;AACnD,aAAW,OAAO,cAAc;AAC9B,QAAI,IAAI,GAAG,MAAM,KAAM,QAAO,OAAO,GAAG;AAAA,EAC1C;AACA,QAAM,MAAM,UAAU;AACtB,EAAG,aAAU,KAAK,EAAE,WAAW,KAAK,CAAC;AACrC,QAAM,SAAS,WAAW;AAC1B,QAAM,MAAM,SAAS;AAErB,EAAG,iBAAc,KAAK,KAAK,UAAU,QAAQ,MAAM,CAAC,GAAG,EAAE,UAAU,QAAQ,MAAM,IAAM,CAAC;AACxF,EAAG,cAAW,KAAK,MAAM;AACzB,SAAO;AACT;AAGO,SAAS,eAAqB;AACnC,MAAI;AACF,IAAG,UAAO,WAAW,GAAG,EAAE,OAAO,KAAK,CAAC;AAAA,EACzC,QAAQ;AAAA,EAER;AACF;AAGA,SAAS,SAAS,KAAwC;AACxD,QAAM,MAAgB,CAAC;AACvB,aAAW,OAAO,cAAc;AAC9B,UAAM,IAAI,IAAI,GAAG;AACjB,QAAI,OAAO,MAAM,YAAY,EAAE,SAAS,GAAG;AACzC,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AACA,SAAO;AACT;","names":[]}

package/dist/{chunk-UTSTDWKZ.js → chunk-YNBNKCCN.js}

@@ -220,13 +220,19 @@ var StoreClient = class {
         } catch {
           parsed = {};
         }
-        if (opts.cartRecovery && (res.status === 404 || res.status === 409 || String(parsed.type ?? "").includes("cart.completed") || /cart.*complete/i.test(String(parsed.message ?? "")))) {
+        const idempotencyConflict = res.status === 409 && parsed.code === "IDEMPOTENCY_CONFLICT";
+        const parsedType = String(parsed.type ?? "");
+        if (opts.cartRecovery && (res.status === 404 || parsedType === "cart_completed" || parsedType.includes("cart.completed") || /cart.*complete/i.test(String(parsed.message ?? "")))) {
           throw new RecoverableCartError(
             `cart is stale or completed (HTTP ${res.status})`,
             res.status
           );
         }
-        if (res.status === 429) {
+        if (idempotencyConflict) {
+          retryAfterMs = parseRetryAfterMs(res);
+          lastErr = new StoreApiError(`request in flight (HTTP 409)`, 409, path);
+          this.logWarn("store.request.idempotency_conflict", { path, attempt: attempt + 1, retryAfterMs });
+        } else if (res.status === 429) {
           retryAfterMs = parseRetryAfterMs(res);
           lastErr = new StoreApiError(`rate limited (HTTP 429)`, 429, path);
           this.logWarn("store.request.rate_limited", {
@@ -964,6 +970,31 @@ function firstImageUrl(images) {
 function escapeRegex(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+function sizeTokenOf(title) {
+  return titleSegments(title).find((s) => SIZE_TOKEN.test(s)) ?? null;
+}
+var SIZE_ORDER = ["xxs", "xs", "s", "m", "l", "xl", "2xl", "xxl", "3xl", "xxxl", "4xl", "5xl"];
+function sortSizes(sizes) {
+  const rank = (s) => {
+    const i = SIZE_ORDER.indexOf(s.trim().toLowerCase());
+    return i === -1 ? SIZE_ORDER.length : i;
+  };
+  return [...sizes].sort((a, b) => rank(a) - rank(b) || a.localeCompare(b));
+}
+function lineOption(item, titles) {
+  const o = item.variant?.options?.find((x) => titles.includes((x.option?.title ?? "").toLowerCase()));
+  const v = typeof o?.value === "string" ? o.value.trim() : "";
+  return v ? v : null;
+}
+function lineColour(item) {
+  const opt = lineOption(item, ["colour", "color"]);
+  if (opt) return opt.toLowerCase();
+  const vt = (item.variant_title ?? "").toString();
+  return vt ? variantColour({ id: "x", title: vt }) : null;
+}
+function lineSize(item) {
+  return lineOption(item, ["size"]) ?? sizeTokenOf(item.variant_title);
+}
 function orderStage(o) {
   const status = (o.status ?? "").trim().toLowerCase();
   if (status === "canceled" || status === "refunded") return "reverted";
@@ -1298,14 +1329,6 @@ function regionLine(rr, style, source) {
   const nudge = rr.home ? " \xB7 not you? \u2192 bt region" : source === "locale" ? " \xB7 guessed from your locale \u2014 not you? \u2192 bt region" : "";
   return dim(style, `${GLYPH.gear}  region: ${loc}${rr.region.currency_code}${nudge}`);
 }
-var SIZE_ORDER = ["xxs", "xs", "s", "m", "l", "xl", "2xl", "xxl", "3xl", "xxxl", "4xl", "5xl"];
-function sortSizes(sizes) {
-  const rank = (s) => {
-    const i = SIZE_ORDER.indexOf(s.trim().toLowerCase());
-    return i === -1 ? SIZE_ORDER.length : i;
-  };
-  return [...sizes].sort((a, b) => rank(a) - rank(b) || a.localeCompare(b));
-}
 function brandOf(args) {
   return args?.brand ?? PLAIN;
 }
@@ -1330,21 +1353,6 @@ function displayName(p) {
   const title = (p.title ?? "").toString().trim() || handle;
   return { title, handle };
 }
-function lineOption(item, titles) {
-  const o = item.variant?.options?.find((x) => titles.includes((x.option?.title ?? "").toLowerCase()));
-  const v = typeof o?.value === "string" ? o.value.trim() : "";
-  return v ? v : null;
-}
-function lineColour(item) {
-  const opt = lineOption(item, ["colour", "color"]);
-  if (opt) return opt.toLowerCase();
-  const vt = (item.variant_title ?? "").toString();
-  if (vt) {
-    const c = variantColour({ id: "x", title: vt });
-    if (c) return c;
-  }
-  return null;
-}
 function lineFit(item) {
   const opt = parseFit(lineOption(item, ["fit"]));
   if (opt) return opt;
@@ -1365,7 +1373,8 @@ function formatCartLine(item, index, currency, brand) {
   const idTag = item.id ? dimTag(style, ` (#${shortItemId(item.id)})`) : "";
   const colour = lineColour(item);
   const fit = lineFit(item);
-  const tags = [colour ? colourLabel(colour).toLowerCase() : null, fit ? fitLabel(fit).toLowerCase() : null].filter(Boolean).join(", ");
+  const size = lineSize(item);
+  const tags = [colour ? colourLabel(colour).toLowerCase() : null, fit ? fitLabel(fit).toLowerCase() : null, size].filter(Boolean).join(", ");
   const colourTag = tags ? ` \xB7 ${tags}` : "";
   const price = item.total != null ? `   ${accentPrice(style, fmtPrice(item.total, currency))}` : "";
   return `   ${ref} ${title}${colourTag}${idTag} \xB7 qty ${item.quantity}${price}`;
@@ -1721,6 +1730,10 @@ function registerView(program, makeClient, loadConfig) {
 }
 
 // src/commands/stage.ts
+function sizeChoice(sizes) {
+  const sorted = sortSizes(sizes);
+  return sorted.length === 1 ? sorted[0] : `<${sorted.join("|")}>`;
+}
 async function runStage(client, config, args) {
   const style = brandOf(args);
   const rr = await client.resolveRegionResult(config.region);
@@ -1745,6 +1758,11 @@ async function runStage(client, config, args) {
       cartId = void 0;
       recovered = true;
     }
+    if (existing?.completed_at) {
+      existing = null;
+      cartId = void 0;
+      recovered = true;
+    }
     if (existing) {
       const to = await cartShipTo(existing, () => client.getRegions());
       if (!to) {
@@ -1817,7 +1835,7 @@ async function runStage(client, config, args) {
     }
     const fitFlag = r.fit && productFits(product).length > 1 ? ` --fit ${r.fit}` : "";
     const colourAsked = "colour" in r ? r.colour : null;
-    const madeIn = coloursFor(product, r.fit ?? null);
+    const madeIn = coloursFor(product, productFits(product).length > 0 ? r.fit ?? null : null);
     if (colourAsked && (r.reason === "fit_unavailable" || r.reason === "not_found") && !madeIn.includes(colourAsked)) {
       return failResult({
         code: EXIT.DATAERR,
@@ -1839,7 +1857,7 @@ async function runStage(client, config, args) {
         code: EXIT.DATAERR,
         what: `${r.size} is not made in ${r.fit} where you ship (${countryCode ?? "your region"}).`,
         money: "nothing staged, nothing charged.",
-        fix: r.sizes.length ? `bt stage ${handleShown} --fit ${r.fit} --size ${r.sizes[0]}   (sizes here: ${r.sizes.join(" ")})` : `bt view ${handleShown} --fit ${r.fit}   (to see the sizes you can buy)`
+        fix: r.sizes.length ? `${r.sizes.length > 1 ? "ask which size is wanted, don't choose for them, then: " : ""}bt stage ${handleShown} --fit ${r.fit} --size ${sizeChoice(r.sizes)}` : `bt view ${handleShown} --fit ${r.fit}   (to see the sizes you can buy)`
       });
     }
     const inColour = r.colour ? ` in ${r.colour}` : "";
@@ -1848,7 +1866,7 @@ async function runStage(client, config, args) {
         code: EXIT.DATAERR,
         what: `${handleShown} doesn't come in size ${size}${inColour}. sizes: ${r.sizes.join(" ")}.`,
         money: "nothing staged, nothing charged.",
-        fix: `bt stage ${handleShown}${fitFlag} --size ${r.sizes[0]}${r.colour ? ` --colour ${r.colour}` : ""}`
+        fix: `${r.sizes.length > 1 ? "ask which size is wanted, don't choose for them, then: " : ""}bt stage ${handleShown}${fitFlag} --size ${sizeChoice(r.sizes)}${r.colour ? ` --colour ${r.colour}` : ""}`
       });
     }
     return failResult({
@@ -1861,6 +1879,20 @@ async function runStage(client, config, args) {
   const variant = r.variant;
   const colour = r.colour ?? void 0;
   const fit = r.fit;
+  if (!size) {
+    const sizes = sortSizes(
+      r.colour ? sizesFor(product, r.fit, r.colour, countryCode) : [...new Set((product.variants ?? []).map((v) => sizeOfVariant(v)).filter((s) => !!s))]
+    );
+    if (sizes.length > 1) {
+      const fitFlag = r.fit && productFits(product).length > 1 ? ` --fit ${r.fit}` : "";
+      return failResult({
+        code: EXIT.DATAERR,
+        what: `${handleShown} needs a size. sizes${r.colour ? ` in ${r.colour}` : ""}: ${sizes.join(" ")}.`,
+        money: "nothing staged, nothing charged.",
+        fix: `ask which size is wanted, don't choose for them, then: bt stage ${handleShown}${fitFlag} --size ${sizeChoice(sizes)}${r.colour ? ` --colour ${r.colour}` : ""}`
+      });
+    }
+  }
   const refTags = [colour ? colourLabel(colour).toLowerCase() : null, fit].filter(Boolean).join(", ");
   const colourSuffix = refTags ? ` (${refTags})` : "";
   if (args.dryRun) {
@@ -1931,9 +1963,19 @@ async function runStage(client, config, args) {
     json: args.json ? { cart_id: cartId, recovered, fit: fit ?? null, colour: colour ?? null, items: cart.items ?? [], total: cart.total ?? null } : void 0
   };
 }
+function oneDesignPerCommand() {
+  return failResult({
+    code: EXIT.DATAERR,
+    what: 'one design per command. a two-word colour is written --colour coal, or in quotes: --colour "faded coal"'
+  });
+}
 function registerStage(program, makeClient, loadConfig) {
-  program.command("stage").alias("add").argument("<handle>", "the design: a slug (terminal-velocity), a bt browse number (3), or a fuzzy hint (termnl)").option("--size <size>", "garment size (default: your last commit's size)").option("--colour <colour>", "colour, e.g. white / black (default: the product's first colour)").option("--fit <fit>", "regular or oversize (required when a design comes in both; default: your defaultFit)").option("--dry-run", "resolve the variant + show what would be staged, without staging").description("reserve stock \u2014 acquires an inventory lock, reserves nothing permanent.").action(async (handle, opts) => {
+  program.command("stage").alias("add").argument("<handle>", "the design: a slug (terminal-velocity), 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 (default: the product's first colour)").option("--fit <fit>", "regular or oversize (required when a design comes in both; default: your defaultFit)").option("--dry-run", "resolve the variant + show what would be staged, without staging").description("reserve stock \u2014 acquires an inventory lock, reserves nothing permanent.").allowExcessArguments().action(async (handle, opts, cmd) => {
     const { json, brand } = resolveOutput(program);
+    if (cmd.args.length > 1) {
+      printResult(oneDesignPerCommand(), json);
+      return;
+    }
     const res = await runStage(makeClient(), loadConfig(), {
       handle,
       size: opts.size,
@@ -1944,7 +1986,7 @@ function registerStage(program, makeClient, loadConfig) {
       brand
     });
     if (res.save) {
-      const { saveConfig } = await import("./config-L4X7G563.js");
+      const { saveConfig } = await import("./config-PWI2G2O5.js");
       saveConfig(res.save);
     }
     printResult(res, json);
@@ -1967,6 +2009,7 @@ export {
   labelVariantTitle,
   productColours,
   findVariant,
+  lineColour,
   orderStage,
   productLore,
   isCartTaxInclusive,
@@ -1996,7 +2039,6 @@ export {
   priceLine,
   stageMarker,
   displayName,
-  lineColour,
   formatCartLine,
   resolveLineItemRef,
   resolveProduct,
@@ -2007,6 +2049,7 @@ export {
   runView,
   registerView,
   runStage,
+  oneDesignPerCommand,
   registerStage
 };
-//# sourceMappingURL=chunk-UTSTDWKZ.js.map
+//# sourceMappingURL=chunk-YNBNKCCN.js.map