@wrangled/cli 0.3.42 → 0.3.43

package/dist/guide.js

@@ -301,7 +301,7 @@ ${cli} brief [--from <date>] [--to <date>] [--channel <channel>] [--campaign <id
 ${cli} pages brief --step <key> [--funnel <key>] | --page <ref>   the offer, step, current page, best and worst pages of its kind, its ads and how to hand a page back: start here before writing a landing page
 ${cli} pages results [--from <date>] [--to <date>] [--page <ref>]   each landing page's, and each ad and page pair's, real first-touch sales, cost per sale and sales per page view
 ${cli} messages results [--from <date>] [--to <date>] [--channel email|text] [--sequence <id>]   real sales after each follow-up email, text and sequence: every message the buyer clicked or replied to in the ${MESSAGE_CREDIT_DAYS} days before buying (helped), and the latest one (last nudge)
-${cli} winners [--week <date> | --days <n> | --from <date> --to <date>] [--top <n>] [--ad-format image|video|carousel]   which Facebook ads and landing pages won and flopped in a week or any dates and over 30 days, judged on first-touch sales
+${cli} winners [--week <date> | --days <n> | --from <date> --to <date>] [--top <n>] [--ad-format image|video|carousel]   which Facebook ads and landing pages won and flopped in a week or any dates and over 30 days, judged on first-touch sales, or on Triple Whale's orders for a shop that has them
 ${cli} winners send-to-exodus [--week <date> | --days <n> | --from <date> --to <date>] [--dry-run]   send the winners, with their reasons, lessons and customer words, to Exodus; safe to send again
 ${cli} warehouse schema [--summary] [--table <name> ...] [--search <words>]   list tables and columns; --summary for one row per table
 ${cli} warehouse query "<sql>"      run one read-only query (or --file <path>, or stdin); --out <file.csv | file.ndjson | file.json> saves the rows; add --all for every row

package/dist/main.js

@@ -681,7 +681,7 @@ const commands = {
         },
     },
     winners: {
-        usage: "winners [--week <YYYY-MM-DD> | --days <n> | --from <YYYY-MM-DD> --to <YYYY-MM-DD>] [--top <n>] [--ad-format image|video|carousel]   (which Facebook ads and landing pages won and flopped, judged on real first-touch sales)",
+        usage: "winners [--week <YYYY-MM-DD> | --days <n> | --from <YYYY-MM-DD> --to <YYYY-MM-DD>] [--top <n>] [--ad-format image|video|carousel]   (which Facebook ads and landing pages won and flopped, judged on real sales: first-touch, or Triple Whale's orders when the workspace has them)",
         async run(args, options) {
             if (args.length > 0)
                 throw new CliError("Usage: winners [--week <date> | --days <n> | --from <date> --to <date>] [--top <n>] [--ad-format image|video|carousel]", exitCodes.usage);
@@ -2068,7 +2068,9 @@ function money(value, currency) {
         return `${value.toFixed(2)} ${currency}`;
     }
 }
-const counted = (n, one) => `${n} ${n === 1 ? one : `${one}s`}`;
+/** A model that splits credit between ads gives fractional counts: show tenths at most, grouped as the server writes them. */
+const tenths = (n) => n.toLocaleString("en-US", { maximumFractionDigits: 1 });
+const counted = (n, one) => `${tenths(n)} ${tenths(n) === "1" ? one : `${one}s`}`;
 /** An ad's line: name, SKU and campaign, its numbers, its tags, then why it is on the list. */
 function winnersAdLines(ad, currency) {
     const n = ad.numbers;
@@ -2079,7 +2081,8 @@ function winnersAdLines(ad, currency) {
     const name = [ad.name ?? `Ad ${ad.adId}`, ad.sku && `[${ad.sku}]`, ad.campaignName && `(${ad.campaignName})`].filter(Boolean).join(" ");
     const tags = Object.entries(ad.tags).map(([field, value]) => `${field}: ${value}`).join(", ");
     const count = onSales ? n.sales !== null && counted(n.sales, "sale") : n.signups !== null && counted(n.signups, "first lead");
-    return `- ${name}: spent ${money(n.spend, currency)}, ${count ? `${count}, ` : ""}${cost}${tags ? `. Tags: ${tags}` : ""}\n  ${ad.pickedBecause}\n`;
+    const facebook = n.facebookResults == null ? "" : `, Facebook counts ${tenths(n.facebookResults)}`;
+    return `- ${name}: spent ${money(n.spend, currency)}, ${count ? `${count}, ` : ""}${cost}${facebook}${tags ? `. Tags: ${tags}` : ""}\n  ${ad.pickedBecause}\n`;
 }
 /** A page's or pair's line: the ad for a pair, the page, its visits and numbers, then why it is on the list. */
 function winnersPageLines(page, currency) {
@@ -2117,7 +2120,7 @@ function winnersWindowText(title, window) {
                 : s.accountCostPerSale === null
                     ? "no sale credited to a Facebook ad in these dates"
                     : `the account paid ${money(s.accountCostPerSale, s.currency)} per sale`;
-            const tied = s.adSales === null || !s.facebookSales ? "" : ` ${s.adSales} of ${counted(s.facebookSales, "Facebook sale")} could be tied to a specific ad.`;
+            const tied = s.adSales === null || !s.facebookSales ? "" : ` ${tenths(s.adSales)} of ${counted(s.facebookSales, "Facebook sale")} could be tied to a specific ad.`;
             const tests = s.tests.map((t) => `- Test ${t.testId}${t.hypothesisId ? ` (idea ${t.hypothesisId})` : ""}: ${counted(t.ads.length, "ad")}, spent ${money(t.spend, s.currency)}, ${counted(t.sales, "sale")}` +
                 `${t.costPerSale === null ? "" : `, ${money(t.costPerSale, s.currency)} per sale`}\n`);
             return (`\nIn ${s.currency}: ${account}.${tied} ${s.adsJudgedOnSales} judged on sales, ${s.adsJudgedOnSignups} judged on first leads.\n` +
@@ -2170,12 +2173,18 @@ function winnersSendText(sent) {
         lines.push("Left out:", ...sent.skipped.map((s) => `  ${s.adId}: ${s.reason}`));
     return `${lines.join("\n")}\n`;
 }
-/** The winners report as plain Markdown: what a sale means, then the dates asked for and the last 30 days, each currency apart. */
+/** How an older server, which sent no rule, credited a sale. */
+const FIRST_TOUCH_SALE_RULE = "Each sale goes to the Facebook ad that first brought the buyer in; payments typed into GoHighLevel by hand never count toward an ad.";
+/**
+ * The winners report as plain Markdown: what a sale means, then the dates asked for and, unless they are the same dates,
+ * the last 30 days, each currency apart.
+ */
 function winnersText(report) {
+    const { week, last30Days } = report;
     return (`# Winners and flops for ${report.workspace}${report.format ? `, ${report.format} ads only` : ""}\n\n` +
-        `A sale means ${report.saleMeans}. Each sale goes to the Facebook ad that first brought the buyer in; payments typed into GoHighLevel by hand never count toward an ad.\n` +
-        winnersWindowText(winnersDatesTitle(report.window), report.week) +
-        winnersWindowText(`Last 30 days, ${report.last30Days.from} to ${report.last30Days.to}`, report.last30Days));
+        `A sale means ${report.saleMeans}. ${report.saleRule ?? FIRST_TOUCH_SALE_RULE}\n` +
+        winnersWindowText(winnersDatesTitle(report.window), week) +
+        (week.from === last30Days.from && week.to === last30Days.to ? "" : winnersWindowText(`Last 30 days, ${last30Days.from} to ${last30Days.to}`, last30Days)));
 }
 function reportQuery(options, extra) {
     const query = new URLSearchParams();

package/dist/playbooks.js

@@ -1564,7 +1564,7 @@ const testResultsSql = "SELECT test_id, currency, sum(spend) AS spend, sum(sales
 const lineageSql = "SELECT facebook_ad_id, hypothesis_id, test_id, creative_id, asset_version FROM adzara_ad_lineage ORDER BY synced_at DESC LIMIT 100";
 /** The commands the weekly loop shows, in order; its text is made from them, so a test runs exactly these. */
 export const weeklyLoopCommands = {
-    winners: { purpose: "the Facebook winners and flops of the dates asked for, here a week, and of the 30 days ending on their last day, judged on real first-touch sales", argv: ["winners", "--week", "<week-monday>", "--format", "json"], mcp: "get_winners_report" },
+    winners: { purpose: "the Facebook winners and flops of the dates asked for, here a week, and of the 30 days ending on their last day, judged on real sales (first-touch, or Triple Whale's orders when the workspace has them)", argv: ["winners", "--week", "<week-monday>", "--format", "json"], mcp: "get_winners_report" },
     lessons: { purpose: "what earlier weeks taught, the most often seen first", argv: ["lessons", "--format", "json"], mcp: "get_lessons" },
     writeLessons: { purpose: "install the lessons playbook, then follow it to add, reinforce or retire this week's lessons", argv: ["skill", "install", "lessons"], mcp: "record_lesson" },
     voice: { purpose: "fresh customer words: the most usable single lines said since that Monday", argv: ["voice", "--since", "<week-monday>", "--sort", "useful", "--json"], mcp: "get_customer_voice" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrangled/cli",
-  "version": "0.3.42",
+  "version": "0.3.43",
   "description": "Command-line access to your marketing data warehouse, for people and coding agents",
   "type": "module",
   "bin": {