@binaryandthread/mcp 0.4.6 → 0.4.8

package/README.md

@@ -115,4 +115,5 @@ floor. The buy is never blocked on rendering.
 Some designs are sold in two fits, **regular** and **oversize**, priced apart. `list_products` marks them
 (`fits`, `price_from`), `get_product` lists sizes and prices per fit (pass `fit` to narrow), and
 `add_to_cart` **requires** `fit` for them: without it the tool returns an error naming both fits, and
-nothing is added. Colours follow the ship-to region (khaki is available on the oversize fit in the US only).
+nothing is added. A design sold in one fit needs no `fit`. Colours and sizes follow the ship-to region:
+`get_product` lists the ones you can buy where the cart ships.

package/dist/bin.js

@@ -573,24 +573,116 @@ var BLANK_COLOURS = {
   "sols-03996": ["black", "white"],
   "shaka-shmhss": ["black", "white", "khaki"]
 };
+var STOCK_REGION_BY_COUNTRY = {
+  us: "US-CA",
+  se: "EU",
+  at: "EU",
+  be: "EU",
+  bg: "EU",
+  hr: "EU",
+  cy: "EU",
+  cz: "EU",
+  dk: "EU",
+  ee: "EU",
+  fi: "EU",
+  fr: "EU",
+  de: "EU",
+  gr: "EU",
+  hu: "EU",
+  ie: "EU",
+  it: "EU",
+  lv: "EU",
+  lt: "EU",
+  lu: "EU",
+  mt: "EU",
+  nl: "EU",
+  pl: "EU",
+  pt: "EU",
+  ro: "EU",
+  sk: "EU",
+  si: "EU",
+  es: "EU"
+};
+var BLANK_BY_REGION = {
+  regular: { "*": "gildan-5000" },
+  oversize: { EU: "sols-03996", "US-CA": "shaka-shmhss" }
+};
 function blankFor(fit, countryCode) {
-  if (fit === "regular") return "gildan-5000";
-  return (countryCode ?? "").trim().toLowerCase() === "us" ? "shaka-shmhss" : "sols-03996";
+  const region = STOCK_REGION_BY_COUNTRY[(countryCode ?? "").trim().toLowerCase()];
+  if (!region) return null;
+  const map = BLANK_BY_REGION[fit];
+  return map["*"] ?? map[region] ?? null;
 }
 var BLANK_SIZES = {
   "gildan-5000": ["s", "m", "l", "xl", "2xl", "3xl", "4xl", "5xl"],
   "shaka-shmhss": ["s", "m", "l", "xl", "2xl", "3xl", "4xl", "5xl"],
   "sols-03996": ["xs", "s", "m", "l", "xl", "2xl", "3xl"]
 };
+function supplierOf(p) {
+  const v = (p.metadata ?? {})["bt_supplier"];
+  if (v === void 0 || v === null) return "gelato";
+  return v === "gelato" || v === "printful" ? v : null;
+}
+var PRINTFUL_BLANK_COLOURS = {
+  "ascolour-5082": ["black", "white"]
+};
+var PRINTFUL_BLANK_SIZES = {
+  "ascolour-5082": ["s", "m", "l", "xl", "2xl"]
+};
+var PRINTFUL_SERVED_COUNTRIES = [
+  "se",
+  "us",
+  "at",
+  "be",
+  "bg",
+  "hr",
+  "cy",
+  "cz",
+  "dk",
+  "ee",
+  "fi",
+  "fr",
+  "de",
+  "gr",
+  "hu",
+  "ie",
+  "it",
+  "lv",
+  "lt",
+  "lu",
+  "mt",
+  "nl",
+  "pl",
+  "pt",
+  "ro",
+  "sk",
+  "si",
+  "es"
+];
+function printfulBlankFor(fit, countryCode) {
+  if (!PRINTFUL_SERVED_COUNTRIES.includes((countryCode ?? "").trim().toLowerCase())) return null;
+  return fit === "regular" ? "ascolour-5082" : null;
+}
 function sizeKey(size) {
   const s = size.trim().toLowerCase();
   return s === "xxl" ? "2xl" : s === "xxxl" ? "3xl" : s;
 }
-function colourBuyable(fit, colour, countryCode) {
-  return BLANK_COLOURS[blankFor(fit, countryCode)].includes(colour.trim().toLowerCase());
+function blankRule(fit, countryCode, supplier) {
+  if (supplier === null) return null;
+  if (supplier === "printful") {
+    const pb = printfulBlankFor(fit, countryCode);
+    return pb ? { colours: PRINTFUL_BLANK_COLOURS[pb], sizes: PRINTFUL_BLANK_SIZES[pb] } : null;
+  }
+  const blank = blankFor(fit, countryCode);
+  return blank ? { colours: BLANK_COLOURS[blank], sizes: BLANK_SIZES[blank] } : null;
+}
+function colourBuyable(fit, colour, countryCode, supplier = "gelato") {
+  const rule = blankRule(fit, countryCode, supplier);
+  return !!rule && rule.colours.includes(colour.trim().toLowerCase());
 }
-function sizeBuyable(fit, size, countryCode) {
-  return BLANK_SIZES[blankFor(fit, countryCode)].includes(sizeKey(size));
+function sizeBuyable(fit, size, countryCode, supplier = "gelato") {
+  const rule = blankRule(fit, countryCode, supplier);
+  return !!rule && rule.sizes.includes(sizeKey(size));
 }
 function legacyFit(p) {
   const md = p.metadata ?? {};
@@ -607,24 +699,26 @@ function variantsOfFit(p, fit) {
 }
 function coloursFor(p, fit, countryCode) {
   const gate = gateFit(p, fit);
+  const supplier = supplierOf(p);
   const out = [];
   for (const v of variantsOfFit(p, fit)) {
     const c = variantColour(v);
     if (!c || out.includes(c)) continue;
-    if (gate && countryCode !== void 0 && !colourBuyable(gate, c, countryCode)) continue;
+    if (gate && countryCode !== void 0 && !colourBuyable(gate, c, countryCode, supplier)) continue;
     out.push(c);
   }
   return out;
 }
 function sizesFor(p, fit, colour, countryCode) {
   const gate = gateFit(p, fit);
+  const supplier = supplierOf(p);
   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)) continue;
-    if (gate && countryCode !== void 0 && !sizeBuyable(gate, s, countryCode)) continue;
+    if (gate && countryCode !== void 0 && !sizeBuyable(gate, s, countryCode, supplier)) continue;
     out.push(s);
   }
   return out;
@@ -662,21 +756,22 @@ function resolveVariant(p, opts) {
   }
   const pool = variantsOfFit(p, fit);
   const gate = gateFit(p, fit);
+  const supplier = supplierOf(p);
   const colours = coloursFor(p, fit, opts.countryCode);
   const colour = (opts.colour ?? "").trim().toLowerCase() || (colours[0] ?? null);
-  if (gate && colour && opts.countryCode !== void 0 && !colourBuyable(gate, colour, opts.countryCode)) {
+  if (gate && colour && opts.countryCode !== void 0 && !colourBuyable(gate, colour, opts.countryCode, supplier)) {
     return { ok: false, reason: "fit_unavailable", fit: gate, colour };
   }
   const size = (opts.size ?? "").trim() || null;
   const sizeLc = size?.toLowerCase();
   const buyableSizes = colour ? sizesFor(p, fit, colour, opts.countryCode) : [];
   const sizeExists = !!size && pool.some((x) => (sizeOfVariant(x) ?? x.title ?? "").toLowerCase() === size.toLowerCase());
-  if (gate && size && sizeExists && opts.countryCode !== void 0 && !sizeBuyable(gate, size, opts.countryCode)) {
+  if (gate && size && sizeExists && opts.countryCode !== void 0 && !sizeBuyable(gate, size, opts.countryCode, supplier)) {
     return { ok: false, reason: "size_unavailable", fit: gate, size, sizes: buyableSizes };
   }
   const sellable = gate && opts.countryCode !== void 0 ? pool.filter((x) => {
     const s = sizeOfVariant(x);
-    return !s || sizeBuyable(gate, s, opts.countryCode);
+    return !s || sizeBuyable(gate, s, opts.countryCode, supplier);
   }) : pool;
   const v = sellable.find((x) => {
     const colourOk = !colour || variantColour(x) === colour;
@@ -805,25 +900,58 @@ function firstImageUrl(images) {
 function escapeRegex(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+async function cartShipTo(cart, regions) {
+  const embedded = cart.region?.countries?.length ? cart.region : null;
+  const id = cart.region_id ?? cart.region?.id ?? null;
+  const region = embedded ?? (id ? (await regions()).find((r) => r.id === id) ?? null : null);
+  if (!region) return null;
+  const regionCountries = (region.countries ?? []).map((c) => (c.iso_2 ?? "").trim().toLowerCase()).filter(Boolean);
+  const address = (cart.shipping_address?.country_code ?? "").trim().toLowerCase() || null;
+  const country = address ?? regionCountries[0] ?? null;
+  if (!country) return null;
+  return { region, country, fromAddress: address !== null, regionCountries };
+}
+function shipToDisagrees(requested, shipTo) {
+  const cc = (requested ?? "").trim().toLowerCase();
+  if (!cc || cc === shipTo.country) return false;
+  return shipTo.fromAddress || !shipTo.regionCountries.includes(cc);
+}
 function str(v, fallback) {
   return typeof v === "string" && v.length > 0 ? v : fallback;
 }
 function productReadme(p) {
   return typeof p.description === "string" ? p.description : "";
 }
+var GELATO_FALLBACK = {
+  material: "100% cotton",
+  weight: "180 g/m\xB2",
+  fit: "Unisex heavyweight crewneck",
+  delivery: "Ships in 2\u20135 business days + transit",
+  care: "Cold wash, line dry"
+};
+var PRINTFUL_FALLBACK = {
+  material: "100% cotton",
+  weight: "240 g/m\xB2",
+  fit: "Unisex heavyweight crewneck, garment-dyed",
+  delivery: "Ships in 2\u20135 business days + transit",
+  care: "Machine wash cold, inside out. Do not tumble dry or iron the print. Line dry in shade."
+};
 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);
+  const d = supplierOf(p) === "printful" ? PRINTFUL_FALLBACK : GELATO_FALLBACK;
   return [
-    { 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: "material", value: pick("material", d.material) },
+    { key: "weight", value: pick("weight", d.weight) },
+    { key: "fit", value: pick("fit", d.fit) },
     { 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") }
+    // Delivery: the product's own line first (Sam 2026-10-01, as the storefront since U1), else the same
+    // fallback wording for both suppliers. No per-region times.
+    { key: "delivery", value: pick("delivery", d.delivery) },
+    { key: "care", value: pick("care", d.care) }
   ];
 }
 function productLore(p) {
@@ -883,7 +1011,7 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
 // src/version.ts
-var VERSION = "0.4.6";
+var VERSION = "0.4.8";
 
 // src/onboarding.ts
 var GETTING_STARTED_URI = "bt://getting-started";
@@ -1285,7 +1413,7 @@ function makeTools(client, opts = {}) {
           // the map used to hand out ids for colours the ship-to blank can't print, with the caveat buried
           // in a separate unavailable_colours field. Same derived answer, on the row an agent actually uses.
           // CAT-37 added the SIZE half — the US and EU oversize blanks have different size ranges.
-          buyable: (!gFit || !vColour || colourBuyable(gFit, vColour, shipCC)) && (!gFit || !vSize || sizeBuyable(gFit, vSize, shipCC))
+          buyable: (!gFit || !vColour || colourBuyable(gFit, vColour, shipCC, supplierOf(product))) && (!gFit || !vSize || sizeBuyable(gFit, vSize, shipCC, supplierOf(product)))
         };
       });
       const sizeList = colours.length > 0 ? Object.fromEntries(colours.map((c) => [c, sizesForColour(product, c)])) : (product.variants ?? []).map((v) => v.title ?? "?");
@@ -1324,24 +1452,50 @@ function makeTools(client, opts = {}) {
   };
   const add_to_cart = {
     name: "add_to_cart",
-    description: "Add a piece to a cart. Pass cart_id to reuse an existing cart (the durable handle), or omit it to start a fresh one. Call get_product first to get valid sizes/colours (or an exact variant_id); for a design sold in two fits (regular / oversize, priced apart) you MUST pass `fit`. qty is capped at 20. Returns the cart_id and the server-side cart summary (VAT included where applicable). `region` (ISO-2) sets the currency for a NEW cart only \u2014 a reused cart keeps its original region.",
+    description: "Add a piece to a cart. Pass cart_id to reuse an existing cart (the durable handle), or omit it to start a fresh one. Call get_product first to get valid sizes/colours (or an exact variant_id); for a design sold in two fits (regular / oversize, priced apart) you MUST pass `fit`. qty is capped at 20. Returns the cart_id and the server-side cart summary (VAT included where applicable). `region` (ISO-2) sets the ship-to country + currency of a NEW cart. A reused cart ships where it already ships: a `region` that disagrees with it is refused (start a new cart instead). If a reused cart has expired or was already checked out, a fresh one is made in the same region and the reply says cart_replaced: true.",
     inputSchema: {
       handle: z.string().optional().describe("product handle (resolves a variant by size + colour; call get_product for valid values)"),
       variant_id: z.string().optional().describe("a specific variant id from get_product (overrides handle/size/colour)"),
       fit: z.string().optional().describe("regular or oversize; REQUIRED when the design comes in both (get_product lists them)"),
-      size: z.string().optional().describe("size label from get_product (Regular S / M / L / XL / 2XL; Oversize XS \u2026 3XL)"),
-      colour: z.string().optional().describe("piece colour from get_product, e.g. black / white / khaki (khaki: US oversize only; default: the first colour you can buy)"),
+      size: z.string().optional().describe("size label from get_product (it lists the sizes you can buy where the cart ships)"),
+      colour: z.string().optional().describe("piece colour from get_product, e.g. black / white (default: the first colour you can buy where the cart ships)"),
       qty: z.number().int().positive().max(20).optional().describe("quantity, 1\u201320 (default 1)"),
       cart_id: z.string().optional().describe("reuse this cart; omit to create a new one"),
-      region: z.string().optional().describe("ISO-2 ship-to country for a NEW cart (e.g. se / us / de); ignored when reusing a cart_id")
+      region: z.string().optional().describe("ISO-2 ship-to country for a NEW cart (e.g. se / us / de); with a cart_id it must match where that cart ships, or nothing is added")
     },
     handler: async (args) => {
-      const cc = typeof args.region === "string" && args.region.trim() || regionCC;
-      const rr = await client.resolveRegionResult(cc);
-      if (rr.requested && !rr.matched) {
-        return errorText(`we don't ship to ${sanitize(rr.requested, 8)} yet \u2014 nothing was added. (list_products with a supported region to see prices.)`);
+      const reuse = typeof args.cart_id === "string" && args.cart_id.trim() ? args.cart_id.trim() : void 0;
+      const explicitCC = typeof args.region === "string" && args.region.trim().toLowerCase() || void 0;
+      let existing = null;
+      if (reuse) {
+        try {
+          existing = await client.getCart(reuse);
+        } catch (e) {
+          if (!(e instanceof RecoverableCartError)) throw e;
+        }
+      }
+      let region;
+      let shipCC;
+      if (existing) {
+        const to = await cartShipTo(existing, () => client.getRegions());
+        if (!to) {
+          return errorText(`can't tell where cart ${sanitize(reuse, 60)} ships, so nothing was added. omit cart_id to start a new cart.`);
+        }
+        if (shipToDisagrees(explicitCC, to)) {
+          return errorText(
+            `cart ${sanitize(reuse, 60)} ships to ${sanitize(to.country, 8)}, not ${sanitize(explicitCC, 8)}. nothing was added. omit region to keep adding to this cart, or omit cart_id to start a new cart for ${sanitize(explicitCC, 8)}.`
+          );
+        }
+        region = to.region;
+        shipCC = to.country;
+      } else {
+        const rr = await client.resolveRegionResult(explicitCC || regionCC);
+        if (rr.requested && !rr.matched) {
+          return errorText(`we don't ship to ${sanitize(rr.requested, 8)} yet \u2014 nothing was added. (list_products with a supported region to see prices.)`);
+        }
+        region = rr.region;
+        shipCC = (rr.requested ?? region.countries?.[0]?.iso_2 ?? "").toLowerCase() || null;
       }
-      const region = rr.region;
       const qty = typeof args.qty === "number" ? args.qty : 1;
       let variantId = typeof args.variant_id === "string" ? args.variant_id : void 0;
       if (variantId) {
@@ -1355,13 +1509,14 @@ function makeTools(client, opts = {}) {
         const vColour = variantColour(v);
         const vSize = sizeOfVariant(v);
         const gFit = gateFit(owner, variantFit(v));
-        const shipCC2 = (rr.requested ?? region.countries?.[0]?.iso_2 ?? "").toLowerCase() || null;
-        if (gFit && vColour && !colourBuyable(gFit, vColour, shipCC2)) {
+        const shipCC2 = shipCC;
+        const supplier = supplierOf(owner);
+        if (gFit && vColour && !colourBuyable(gFit, vColour, shipCC2, supplier)) {
           return errorText(
             `${sanitize(vColour, 20)} is not available in ${gFit} for ${sanitize(shipCC2 ?? "this region", 8)}. nothing was added.`
           );
         }
-        if (gFit && vSize && !sizeBuyable(gFit, vSize, shipCC2)) {
+        if (gFit && vSize && !sizeBuyable(gFit, vSize, shipCC2, supplier)) {
           return errorText(
             `size ${sanitize(vSize, 20)} is not made in ${gFit} for ${sanitize(shipCC2 ?? "this region", 8)}. nothing was added.`
           );
@@ -1377,7 +1532,6 @@ function makeTools(client, opts = {}) {
           return errorText(`no product with handle "${sanitize(handle, 60)}".`);
         }
         const size = typeof args.size === "string" ? args.size : void 0;
-        const shipCC = (rr.requested ?? region.countries?.[0]?.iso_2 ?? "").toLowerCase() || null;
         const r = resolveVariant(product, {
           fit: typeof args.fit === "string" ? args.fit : void 0,
           size,
@@ -1414,27 +1568,31 @@ function makeTools(client, opts = {}) {
         }
         variantId = r.variant.id;
       }
-      const reuse = typeof args.cart_id === "string" ? args.cart_id : void 0;
       const addTo = async (cartId) => client.addLineItem(cartId, variantId, qty);
       let cart;
-      try {
-        const targetId = reuse ?? (await client.createCart(region)).id;
-        cart = await addTo(targetId);
-      } catch (e) {
-        if (e instanceof RecoverableCartError && reuse) {
-          const fresh = await client.createCart(region);
-          cart = await addTo(fresh.id);
-        } else {
-          throw e;
+      let replaced = !!reuse && !existing;
+      if (existing) {
+        try {
+          cart = await addTo(reuse);
+        } catch (e) {
+          if (!(e instanceof RecoverableCartError)) throw e;
+          replaced = true;
+          cart = await addTo((await client.createCart(region)).id);
         }
+      } else {
+        cart = await addTo((await client.createCart(region)).id);
       }
       const itemCount = (cart.items ?? []).reduce((n, li) => n + (li.quantity ?? 1), 0);
+      const replacedNote = replaced ? `
+cart ${sanitize(reuse, 60)} had expired or was already checked out, so this is a NEW cart${existing ? " (same region)" : ""}. use the new cart_id from now on.` : "";
       return result(
         `added.
-cart_id: ${cart.id}  (reuse this handle on the next add / checkout)
+cart_id: ${cart.id}  (reuse this handle on the next add / checkout)${replacedNote}
 ${cartSummary(cart, region)}`,
         {
           cart_id: cart.id,
+          // only when a cart_id was passed, so a fresh-cart reply is unchanged
+          ...reuse ? { cart_replaced: replaced, ...replaced ? { replaced_cart_id: reuse } : {} } : {},
           total: cart.total ?? null,
           currency: cart.currency_code ?? region.currency_code ?? null,
           item_count: itemCount,
@@ -1554,7 +1712,7 @@ ${cartSummary(cart, region)}`,
       const out = redactForOutput({ status: res.status, order_id: res.order_id, summary: s ?? null });
       let human;
       if (res.status === "placed") {
-        const lines = [`paid \u2014 order ${s?.display_id ? `#${s.display_id}` : "placed"}. order_id: ${res.order_id ?? "\u2014"}`];
+        const lines = [`placed \u2014 order ${s?.display_id ? `#${s.display_id}` : "created"}. order_id: ${res.order_id ?? "\u2014"}`];
         if (s) {
           const cur = s.currency_code;
           const vat = taxSuffix(s.is_tax_inclusive === true);