@binaryandthread/cli 0.3.2 → 0.4.0

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

@@ -10,6 +10,7 @@ var ALLOWED_KEYS = [
   "region",
   "defaultSize",
   "defaultColour",
+  "defaultFit",
   "defaultBranch"
 ];
 function configDir() {
@@ -63,4 +64,4 @@ export {
   saveConfig,
   forgetConfig
 };
-//# sourceMappingURL=chunk-RGFMXWD5.js.map
+//# sourceMappingURL=chunk-T7MFWTB7.js.map

package/dist/chunk-T7MFWTB7.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.\ntype PersistedKey = Exclude<keyof BtConfig, \"region_source\">\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/** Merge-and-save the given fields. Strips any non-allowlisted key (G15). Atomic (F-B1). */\nexport function saveConfig(patch: Partial<BtConfig>): BtConfig {\n  const merged = { ...loadConfig(), ...sanitize(patch as Record<string, unknown>) }\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;AAsBtB,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;AAGO,SAAS,WAAW,OAAoC;AAC7D,QAAM,SAAS,EAAE,GAAG,WAAW,GAAG,GAAG,SAAS,KAAgC,EAAE;AAChF,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-BFMH7VCE.js → chunk-X3RWS3AG.js}

@@ -545,6 +545,116 @@ function isAllowedImageHost(url) {
     (allowed) => host === allowed || host.endsWith("." + allowed)
   );
 }
+var FITS = ["regular", "oversize"];
+function parseFit(v) {
+  const s = typeof v === "string" ? v.trim().toLowerCase() : "";
+  return s === "regular" || s === "oversize" ? s : null;
+}
+function fitLabel(f) {
+  return f === "oversize" ? "Oversize" : "Regular";
+}
+function variantFit(v) {
+  const opt = (v.options ?? []).find((o) => (o.option?.title ?? "").toLowerCase() === "fit");
+  return opt ? parseFit(opt.value) : null;
+}
+function productFits(p) {
+  const seen = /* @__PURE__ */ new Set();
+  for (const v of p.variants ?? []) {
+    const f = variantFit(v);
+    if (f) seen.add(f);
+  }
+  return FITS.filter((f) => seen.has(f));
+}
+var BLANK_COLOURS = {
+  "gildan-5000": ["black", "white"],
+  "sols-03996": ["black", "white"],
+  "shaka-shmhss": ["black", "white", "khaki"]
+};
+function blankFor(fit, countryCode) {
+  if (fit === "regular") return "gildan-5000";
+  return (countryCode ?? "").trim().toLowerCase() === "us" ? "shaka-shmhss" : "sols-03996";
+}
+function colourBuyable(fit, colour, countryCode) {
+  return BLANK_COLOURS[blankFor(fit, countryCode)].includes(colour.trim().toLowerCase());
+}
+function variantsOfFit(p, fit) {
+  const all = p.variants ?? [];
+  return fit === null ? all : all.filter((v) => variantFit(v) === fit);
+}
+function coloursFor(p, fit, countryCode) {
+  const out = [];
+  for (const v of variantsOfFit(p, fit)) {
+    const c = variantColour(v);
+    if (!c || out.includes(c)) continue;
+    if (fit && countryCode !== void 0 && !colourBuyable(fit, c, countryCode)) continue;
+    out.push(c);
+  }
+  return out;
+}
+function sizesFor(p, fit, colour) {
+  const target = colour.trim().toLowerCase();
+  const out = [];
+  for (const v of variantsOfFit(p, fit)) {
+    if (variantColour(v) !== target) continue;
+    const s = sizeOfVariant(v);
+    if (s && !out.includes(s)) out.push(s);
+  }
+  return out;
+}
+function cheapest(vs) {
+  const priced = vs.filter((v2) => typeof v2.calculated_price?.calculated_amount === "number").sort(
+    (a, b) => a.calculated_price.calculated_amount - b.calculated_price.calculated_amount
+  );
+  const v = priced[0];
+  return {
+    amount: v?.calculated_price?.calculated_amount ?? null,
+    currency: v?.calculated_price?.currency_code ?? null,
+    taxInclusive: v?.calculated_price?.is_calculated_price_tax_inclusive ?? null
+  };
+}
+function priceFrom(p) {
+  const fits = productFits(p);
+  const base = cheapest(p.variants ?? []);
+  const amounts = new Set(fits.map((f) => cheapest(variantsOfFit(p, f)).amount));
+  return { ...base, from: fits.length > 1 && amounts.size > 1 };
+}
+function priceFor(p, fit) {
+  return cheapest(variantsOfFit(p, fit));
+}
+function resolveVariant(p, opts) {
+  const fits = productFits(p);
+  const requested = parseFit(opts.fit);
+  const askedFor = typeof opts.fit === "string" ? opts.fit.trim() : "";
+  let fit = null;
+  if (fits.length > 0) {
+    if (requested && fits.includes(requested)) fit = requested;
+    else if (askedFor) return { ok: false, reason: "fit_not_offered", requested: askedFor, fits };
+    else if (fits.length === 1) fit = fits[0];
+    else return { ok: false, reason: "ambiguous_fit", fits: fits.map((f) => ({ fit: f, ...priceFor(p, f) })) };
+  }
+  const pool = variantsOfFit(p, fit);
+  const colours = coloursFor(p, fit, opts.countryCode);
+  const colour = (opts.colour ?? "").trim().toLowerCase() || (colours[0] ?? null);
+  if (fit && colour && opts.countryCode !== void 0 && !colourBuyable(fit, colour, opts.countryCode)) {
+    return { ok: false, reason: "fit_unavailable", fit, colour };
+  }
+  const size = (opts.size ?? "").trim() || null;
+  const sizeLc = size?.toLowerCase();
+  const v = pool.find((x) => {
+    const colourOk = !colour || variantColour(x) === colour;
+    const sizeOk = !sizeLc || (sizeOfVariant(x) ?? "").toLowerCase() === sizeLc || (x.title ?? "").toLowerCase() === sizeLc;
+    return colourOk && sizeOk;
+  });
+  if (!v) {
+    return { ok: false, reason: "not_found", fit, colour, size, colours, sizes: colour ? sizesFor(p, fit, colour) : [] };
+  }
+  return { ok: true, variant: v, fit, colour: variantColour(v), size: sizeOfVariant(v) };
+}
+var SIZE_TOKEN = /^(xxs|xs|s|m|l|xl|xxl|2xl|3xl|xxxl|4xl|5xl)$/i;
+var FIT_TOKEN = /^(regular|oversize)$/i;
+function titleSegments(title) {
+  return (title ?? "").split("/").map((s) => s.trim()).filter(Boolean);
+}
 function displayColour(colour) {
   const c = colour.trim();
   if (!c) return c;
@@ -557,11 +667,10 @@ function variantColour(v) {
   if (opt && typeof opt.value === "string" && opt.value.trim()) {
     return opt.value.trim().toLowerCase();
   }
-  const title = (v.title ?? "").trim();
-  if (title.includes("/")) {
-    const parts = title.split("/").map((p) => p.trim());
-    const tail = parts[parts.length - 1];
-    if (tail) return tail.toLowerCase();
+  const segs = titleSegments(v.title);
+  if (segs.length >= 2) {
+    const seg = segs.find((s) => !SIZE_TOKEN.test(s) && !FIT_TOKEN.test(s));
+    if (seg) return seg.toLowerCase();
   }
   return null;
 }
@@ -575,32 +684,28 @@ function productColours(p) {
   }
   return seen;
 }
-function sizesForColour(p, colour) {
-  const target = colour.trim().toLowerCase();
-  const sizes = [];
-  for (const v of p.variants ?? []) {
-    if (variantColour(v) !== target) continue;
-    const size = sizeOfVariant(v);
-    if (size && !sizes.includes(size)) {
-      sizes.push(size);
-    }
-  }
-  return sizes;
-}
 function sizeOfVariant(v) {
   const opt = (v.options ?? []).find((o) => (o.option?.title ?? "").toLowerCase() === "size");
   if (opt && typeof opt.value === "string" && opt.value.trim()) {
     return opt.value.trim();
   }
-  const title = (v.title ?? "").trim();
-  if (title.includes("/")) {
-    const head = title.split("/")[0]?.trim();
-    if (head) return head;
-  }
-  return title || null;
+  const segs = titleSegments(v.title);
+  const token = segs.find((s) => SIZE_TOKEN.test(s));
+  if (token) return token;
+  return segs.length === 1 ? segs[0] : segs[0] ?? null;
 }
 function findVariant(p, opts = {}) {
-  const variants = p.variants ?? [];
+  const fits = productFits(p);
+  let fit = null;
+  if (fits.length > 0) {
+    const wanted = parseFit(opts.fit);
+    const askedFor = typeof opts.fit === "string" ? opts.fit.trim() : "";
+    if (wanted && fits.includes(wanted)) fit = wanted;
+    else if (askedFor) return void 0;
+    else if (fits.length === 1) fit = fits[0];
+    else return void 0;
+  }
+  const variants = (p.variants ?? []).filter((v) => fit === null || variantFit(v) === fit);
   const size = opts.size?.trim().toLowerCase();
   const colour = opts.colour?.trim().toLowerCase();
   const sizeMatches = (v) => {
@@ -660,6 +765,24 @@ function imageForColour(p, colour) {
   }
   return null;
 }
+function imageFor(p, sel) {
+  const colour = sel.colour.trim().toLowerCase();
+  if (!colour) return null;
+  const metas = (p.images ?? []).map((img) => ({
+    url: (img?.url ?? "").trim(),
+    scene: typeof img?.metadata?.["scene"] === "string" ? String(img.metadata["scene"]) : null,
+    fit: parseFit(img?.metadata?.["fit"]),
+    colour: typeof img?.metadata?.["colour"] === "string" ? String(img.metadata["colour"]).toLowerCase() : null
+  }));
+  const tagged = metas.filter((m) => m.url && m.colour === colour && m.scene === PREFERRED_SCENE);
+  const exact = tagged.find((m) => sel.fit !== null && m.fit === sel.fit);
+  if (exact) return exact.url;
+  const neutral = tagged.find((m) => m.fit === null);
+  if (neutral) return neutral.url;
+  const otherFitOnly = tagged.length > 0 && sel.fit !== null;
+  if (otherFitOnly) return null;
+  return imageForColour(p, colour);
+}
 function firstImageUrl(images) {
   for (const img of images ?? []) {
     const u = (img?.url ?? "").trim();
@@ -673,15 +796,19 @@ function escapeRegex(s) {
 function str(v, fallback) {
   return typeof v === "string" && v.length > 0 ? v : fallback;
 }
-function productSpecs(p) {
+function productSpecs(p, fit) {
   const md = p.metadata ?? {};
+  const byFit = md.specs_by_fit ?? null;
+  const fitKey = fit ?? (byFit && Object.keys(byFit).length === 1 ? Object.keys(byFit)[0] : void 0);
+  const src = fitKey && byFit?.[fitKey] || md;
+  const pick = (k, fallback) => str(src[k] ?? md[k], fallback);
   return [
-    { key: "material", value: str(md.material, "100% cotton") },
-    { key: "weight", value: str(md.weight, "180 g/m\xB2") },
-    { key: "fit", value: str(md.fit, "Unisex heavyweight crewneck") },
-    { key: "print", value: str(md.print, "Front print") },
-    { key: "delivery", value: str(md.delivery, "Ships in 2\u20135 business days + transit") },
-    { key: "care", value: str(md.care, "Cold wash, line dry") }
+    { key: "material", value: pick("material", "100% cotton") },
+    { key: "weight", value: pick("weight", "180 g/m\xB2") },
+    { key: "fit", value: pick("fit", "Unisex heavyweight crewneck") },
+    { key: "print", value: pick("print", "Front print") },
+    { key: "delivery", value: pick("delivery", "Ships in 2\u20135 business days + transit") },
+    { key: "care", value: pick("care", "Cold wash, line dry") }
   ];
 }
 function productLore(p) {
@@ -891,6 +1018,7 @@ function colourSwatch(colour) {
   const c = colour.trim().toLowerCase();
   if (c === "white") return "\u2B1C";
   if (c === "black") return "\u2B1B";
+  if (c === "khaki") return "\u{1F7EB}";
   return "\u25FC";
 }
 function colourMarker(colours) {
@@ -928,13 +1056,8 @@ function fmtPrice(amount, currency) {
 function taxSuffix(isTaxInclusive) {
   return isTaxInclusive ? " incl. VAT" : "";
 }
-function firstPrice(p) {
-  const v = (p.variants ?? [])[0];
-  return {
-    amount: v?.calculated_price?.calculated_amount ?? null,
-    currency: v?.calculated_price?.currency_code ?? null,
-    taxInclusive: v?.calculated_price?.is_calculated_price_tax_inclusive ?? null
-  };
+function priceLine(p) {
+  return priceFrom(p);
 }
 function stageMarker(channelStage) {
   return channelStage === "next" ? "\u25CB on next" : "\u25CF in stock";
@@ -944,7 +1067,14 @@ 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 });
@@ -952,6 +1082,15 @@ function lineColour(item) {
   }
   return null;
 }
+function lineFit(item) {
+  const opt = parseFit(lineOption(item, ["fit"]));
+  if (opt) return opt;
+  for (const seg of (item.variant_title ?? "").toString().split("/")) {
+    const f = parseFit(seg);
+    if (f) return f;
+  }
+  return null;
+}
 function shortItemId(id) {
   const s = (id ?? "").toString();
   return s.length <= 6 ? s : s.slice(-6);
@@ -962,7 +1101,9 @@ function formatCartLine(item, index, currency, brand) {
   const title = (item.title ?? item.product_title ?? "item").toString();
   const idTag = item.id ? dimTag(style, ` (#${shortItemId(item.id)})`) : "";
   const colour = lineColour(item);
-  const colourTag = colour ? ` \xB7 ${colour}` : "";
+  const fit = lineFit(item);
+  const tags = [colour, fit ? fitLabel(fit).toLowerCase() : null].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}`;
 }
@@ -1032,6 +1173,17 @@ async function resolveProduct(client, region, selector) {
     if (exact) {
       return { product: exact };
     }
+    const m = needle.match(/^(.+)-oversize$/i);
+    if (m && m[1]) {
+      const base = await client.getProduct(m[1], { region });
+      if (base) {
+        return {
+          product: base,
+          impliedFit: "oversize",
+          aliasNote: `"${needle}" is a retired handle \xB7 resolved to ${base.handle ?? m[1]} --fit oversize`
+        };
+      }
+    }
   }
   const products = await client.listProducts({ region });
   const r = resolveProductSelector(products, needle);
@@ -1172,47 +1324,70 @@ async function runView(client, config, args) {
     });
   }
   const { title, handle } = displayName(product);
-  const colours = productColours(product);
+  const fits = productFits(product);
+  const requestedFit = parseFit(args.fit ?? picked.impliedFit);
+  if (args.fit && (!requestedFit || !fits.includes(requestedFit))) {
+    return failResult({
+      code: EXIT.DATAERR,
+      what: fits.length ? `no fit called "${args.fit}" for ${handle}.` : `${handle} comes in one fit; --fit does not apply.`,
+      fix: fits.length ? `bt view ${handle} --fit ${fits.join(" | ")}` : `bt view ${handle}`
+    });
+  }
+  const fit = fits.length ? requestedFit ?? (fits.includes("regular") ? "regular" : fits[0]) : null;
+  const countryCode = (rr.requested ?? region.countries?.[0]?.iso_2 ?? "").toLowerCase() || null;
+  const colours = coloursFor(product, fit, countryCode);
+  const unavailable = coloursFor(product, fit).filter((c) => !colours.includes(c));
   const lines = [];
   if (picked.fuzzy && handle !== args.handle.trim()) {
     lines.push(working(`matched "${handle}" from "${args.handle}"`));
   }
+  if (picked.aliasNote) {
+    lines.push(working(picked.aliasNote));
+  }
   lines.push(header(style, title));
   lines.push(`   ${dim(style, handle)}`);
   if (product.description) {
     lines.push(empty(`   ${product.description}`));
   }
   const fabric = product.metadata?.["fabric"] ?? null;
-  const specs = productSpecs(product);
+  if (fit && fits.length > 1) {
+    const other = fits.find((f) => f !== fit);
+    const op = priceFor(product, other);
+    lines.push(`   fits     ${fits.map((f) => fitLabel(f)).join(" \xB7 ")}   \u2192 viewing ${fitLabel(fit)} \xB7 the other \u2192 bt view ${handle} --fit ${other} (${fmtPrice(op.amount, op.currency)})`);
+  }
+  const specs = productSpecs(product, fit);
   for (const s of specs) {
     lines.push(`   ${s.key.padEnd(9)}${s.value}`);
   }
-  if (colours.length > 0) {
+  if (colours.length > 0 || unavailable.length > 0) {
     lines.push(`   colours  ${colours.map((c) => `${colourSwatch(c)} ${c}`).join(" \xB7 ")}`);
     for (const c of colours) {
-      const sizes = sortSizes(sizesForColour(product, c));
+      const sizes = sortSizes(sizesFor(product, fit, c));
       lines.push(`   ${colourSwatch(c)} ${c.padEnd(6)} ${sizes.join("  ")}`);
     }
+    for (const c of unavailable) {
+      lines.push(dim(style, `   ${colourSwatch(c)} ${c.padEnd(6)} not available where you ship (${countryCode ?? "your region"})`));
+    }
   } else {
     const sizes = sortSizes((product.variants ?? []).map((v) => v.title ?? "?"));
     lines.push(`   sizes    ${sizes.join("  ")}`);
   }
-  const v0 = (product.variants ?? [])[0];
-  if (v0?.calculated_price) {
+  const pr = fit ? { ...priceFor(product, fit), from: false } : priceLine(product);
+  if (pr.amount != null) {
     lines.push(
-      `   price    ${cyan(style, fmtPrice(v0.calculated_price.calculated_amount, v0.calculated_price.currency_code))}${taxSuffix(v0.calculated_price.is_calculated_price_tax_inclusive)}`
+      `   price    ${cyan(style, `${pr.from ? "from " : ""}${fmtPrice(pr.amount, pr.currency)}`)}${taxSuffix(pr.taxInclusive)}`
     );
     lines.push(`   ${regionLine(rr, style, config.region_source)}`);
   }
   let imageUrl = product.thumbnail ?? null;
   let blackNote = null;
-  if (args.colour) {
-    const wanted = args.colour.trim().toLowerCase();
-    const resolved = imageForColour(product, wanted);
+  const wanted = args.colour?.trim().toLowerCase() || (fit ? colours[0] : void 0);
+  if (wanted) {
+    const resolved = imageFor(product, { fit, colour: wanted }) ?? (fit === null ? imageForColour(product, wanted) : null);
     if (resolved) {
       imageUrl = resolved;
-    } else {
-      blackNote = `   ${displayColour(wanted)} available \u2014 showing the default mockup (no ${wanted} render on file).`;
+    } else if (args.colour) {
+      blackNote = unavailable.includes(wanted) ? `   ${displayColour(wanted)} isn't available where you ship \u2014 showing the default mockup.` : `   ${displayColour(wanted)} available \u2014 showing the default mockup (no ${wanted} render on file).`;
     }
   }
   if (imageUrl) {
@@ -1224,7 +1399,7 @@ async function runView(client, config, args) {
   }
   if (colours.length > 1 && !args.colour) {
     const others = colours.filter((c) => c !== colours[0]).join(", ");
-    lines.push(`   see another colour \u2192 bt view ${handle} --colour ${others.split(",")[0]?.trim()}`);
+    lines.push(`   see another colour \u2192 bt view ${handle} --colour ${others.split(",")[0]?.trim()}${fit && fits.length > 1 ? ` --fit ${fit}` : ""}`);
   }
   if (productLore(product).text) {
     lines.push(`   the story \u2192 bt blame ${handle}`);
@@ -1237,11 +1412,17 @@ async function runView(client, config, args) {
       title: product.title,
       fabric,
       specs,
+      fits,
+      fit,
       colours,
+      unavailable_colours: unavailable,
       thumbnail: product.thumbnail,
+      // CAT-31: `size` is the REAL size (never the variant title); fit/colour from the options.
       variants: (product.variants ?? []).map((v) => ({
         id: v.id,
-        size: v.title,
+        fit: variantFit(v),
+        colour: variantColour(v),
+        size: sizeOfVariant(v),
         price: v.calculated_price?.calculated_amount ?? null,
         currency: v.calculated_price?.currency_code ?? null
       }))
@@ -1249,12 +1430,13 @@ async function runView(client, config, args) {
   };
 }
 function registerView(program, makeClient, loadConfig) {
-  program.command("view").alias("show").argument("<handle>", "the design: a slug, a bt browse number (3), or a fuzzy hint (termnl)").option("--colour <colour>", "render a specific colour's mockup (e.g. black)").description("render a design: specs + image (always with the link as the floor).").action(async (handle, opts) => {
+  program.command("view").alias("show").argument("<handle>", "the design: a slug, a bt browse number (3), or a fuzzy hint (termnl)").option("--colour <colour>", "render a specific colour's mockup (e.g. black)").option("--fit <fit>", "regular or oversize: which fit's sizes, price and image to show (default: regular)").description("render a design: specs + image (always with the link as the floor).").action(async (handle, opts) => {
     const { json, brand } = resolveOutput(program);
     const noColor = program.opts().color === false;
     const res = await runView(makeClient(), loadConfig(), {
       handle,
       colour: opts.colour,
+      fit: opts.fit,
       json,
       noColor,
       brand
@@ -1279,38 +1461,74 @@ async function runStage(client, config, args) {
   const resolved = await resolveProduct(client, region, args.handle);
   if (!resolved.product) {
     if (resolved.candidates && resolved.candidates.length > 1) {
-      const r = failResult({ code: EXIT.DATAERR, what: `"${args.handle}" matches ${resolved.candidates.length} designs \u2014 pick one:` });
-      r.lines.push(...resolved.candidates.map((p) => `     ${p.handle ?? p.id}`), "   or be exact \u2192 bt stage <slug>");
-      return r;
+      const r2 = failResult({ code: EXIT.DATAERR, what: `"${args.handle}" matches ${resolved.candidates.length} designs \u2014 pick one:` });
+      r2.lines.push(...resolved.candidates.map((p) => `     ${p.handle ?? p.id}`), "   or be exact \u2192 bt stage <slug>");
+      return r2;
     }
     return failResult({ code: EXIT.UNAVAILABLE, what: `no design here called "${args.handle}".`, fix: "bt browse" });
   }
   const product = resolved.product;
   const matchNote = resolved.fuzzy && (product.handle ?? "") !== args.handle.trim() ? working(`matched "${product.handle}" from "${args.handle}"`) : null;
   const size = args.size ?? config.defaultSize;
-  const colours = productColours(product);
-  const colour = args.colour ?? config.defaultColour ?? (colours.length > 0 ? colours[0] : void 0);
-  const variant = findVariant(product, { size, colour });
-  if (!variant) {
-    const have = colours.length ? `  available colours: ${colours.join(", ")}.` : "";
+  const countryCode = (rr.requested ?? region.countries?.[0]?.iso_2 ?? "").toLowerCase() || null;
+  const explicitFit = args.fit ?? resolved.impliedFit;
+  const fitArg = explicitFit ?? (productFits(product).length > 1 ? config.defaultFit : void 0);
+  const r = resolveVariant(product, { fit: fitArg, size, colour: args.colour ?? config.defaultColour, countryCode });
+  const handleShown = product.handle ?? args.handle;
+  if (!r.ok) {
+    if (r.reason === "ambiguous_fit") {
+      const fitList = r.fits.map((f) => `${f.fit} (${fmtPrice(f.amount, f.currency)})`).join(" \xB7 ");
+      const res = failResult({
+        code: EXIT.DATAERR,
+        what: `${handleShown} comes in two fits: ${fitList}.`,
+        money: "nothing staged, nothing charged.",
+        fix: `bt stage ${handleShown} --fit ${r.fits[0].fit}${size ? ` --size ${size}` : ""}`
+      });
+      res.lines.push(`   or set yours once \u2192 bt config set defaultFit ${r.fits[0].fit}`);
+      return res;
+    }
+    if (r.reason === "fit_not_offered") {
+      return failResult({
+        code: EXIT.DATAERR,
+        what: `${handleShown} isn't sold in "${r.requested}"${r.fits.length ? ` \u2014 it comes in ${r.fits.join(" \xB7 ")}` : ""}.`,
+        money: "nothing staged, nothing charged.",
+        fix: r.fits.length ? `bt stage ${handleShown} --fit ${r.fits[0]}${size ? ` --size ${size}` : ""}` : `bt stage ${handleShown}${size ? ` --size ${size}` : ""}   (this design comes in one fit)`
+      });
+    }
+    if (r.reason === "fit_unavailable") {
+      return failResult({
+        code: EXIT.DATAERR,
+        what: `${r.colour} is not available in ${r.fit} where you ship (${countryCode ?? "your region"}).`,
+        money: "nothing staged, nothing charged.",
+        fix: `bt view ${handleShown} --fit ${r.fit}   (to see the colours you can buy)`
+      });
+    }
+    const have = r.colours.length ? `  available colours: ${r.colours.join(", ")}.` : "";
+    const haveSizes = r.sizes.length ? `  sizes: ${r.sizes.join(" ")}.` : "";
     return failResult({
       code: EXIT.DATAERR,
-      what: `no variant for ${args.handle}${size ? `#size=${size}` : ""}${colour ? ` (${colour})` : ""}.`,
-      fix: `bt view ${args.handle}   (to see available sizes + colours)${have}`
+      what: `no variant for ${args.handle}${r.fit ? ` --fit ${r.fit}` : ""}${size ? `#size=${size}` : ""}${r.colour ? ` (${r.colour})` : ""}.`,
+      fix: `bt view ${args.handle}${r.fit ? ` --fit ${r.fit}` : ""}   (to see available sizes + colours)${have}${haveSizes}`
     });
   }
+  const variant = r.variant;
+  const colour = r.colour ?? void 0;
+  const fit = r.fit;
+  const refTags = [colour, fit].filter(Boolean).join(", ");
+  const colourSuffix = refTags ? ` (${refTags})` : "";
   if (args.dryRun) {
-    const colourSuffix2 = colour ? ` (${colour})` : "";
     return {
       lines: [
         ...matchNote ? [matchNote] : [],
-        ok(`dry-run \u2014 would stage ${product.handle ?? args.handle}${size ? `#${size}` : ""}${colourSuffix2} (nothing staged).`),
+        ...resolved.aliasNote ? [warn(resolved.aliasNote)] : [],
+        ok(`dry-run \u2014 would stage ${product.handle ?? args.handle}${size ? `#${size}` : ""}${colourSuffix} (nothing staged).`),
         "   run without --dry-run to acquire the inventory lock."
       ],
       json: args.json ? {
         dry_run: true,
         would_stage: {
           handle: product.handle ?? args.handle,
+          fit: fit ?? null,
           size: size ?? null,
           colour: colour ?? null,
           variant_id: variant.id
@@ -1322,6 +1540,9 @@ async function runStage(client, config, args) {
   if (matchNote) {
     lines.push(matchNote);
   }
+  if (resolved.aliasNote) {
+    lines.push(warn(resolved.aliasNote));
+  }
   let cartId = config.cart_id;
   let recovered = false;
   if (!cartId) {
@@ -1348,7 +1569,6 @@ async function runStage(client, config, args) {
       )
     );
   }
-  const colourSuffix = colour ? ` (${colour})` : "";
   lines.push(
     ok(
       `staged ${product.handle ?? args.handle}${size ? `#${size}` : ""}${colourSuffix} \xB7 inventory lock acquired (held 10m)`
@@ -1363,22 +1583,23 @@ async function runStage(client, config, args) {
     // persist the cart_id atomically BEFORE returning (the router calls config.save)
     save: { cart_id: cartId },
     lines,
-    json: args.json ? { cart_id: cartId, recovered, colour: colour ?? null, items: cart.items ?? [], total: cart.total ?? null } : void 0
+    json: args.json ? { cart_id: cartId, recovered, fit: fit ?? null, colour: colour ?? null, items: cart.items ?? [], total: cart.total ?? null } : void 0
   };
 }
 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("--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 (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) => {
     const { json, brand } = resolveOutput(program);
     const res = await runStage(makeClient(), loadConfig(), {
       handle,
       size: opts.size,
       colour: opts.colour,
+      fit: opts.fit,
       dryRun: opts.dryRun,
       json,
       brand
     });
     if (res.save) {
-      const { saveConfig } = await import("./config-WV4DTQXU.js");
+      const { saveConfig } = await import("./config-L4X7G563.js");
       saveConfig(res.save);
     }
     printResult(res, json);
@@ -1392,8 +1613,12 @@ export {
   StoreClient,
   BT_DEFAULT_STORE_URL,
   BT_DEFAULT_PUBLISHABLE_KEY,
+  fitLabel,
+  productFits,
+  coloursFor,
+  sizesFor,
+  priceFor,
   productColours,
-  sizesForColour,
   findVariant,
   productLore,
   isCartTaxInclusive,
@@ -1419,7 +1644,7 @@ export {
   brandOf,
   fmtPrice,
   taxSuffix,
-  firstPrice,
+  priceLine,
   stageMarker,
   displayName,
   lineColour,
@@ -1434,4 +1659,4 @@ export {
   runStage,
   registerStage
 };
-//# sourceMappingURL=chunk-BFMH7VCE.js.map
+//# sourceMappingURL=chunk-X3RWS3AG.js.map