@reddoorla/maintenance 0.45.0 → 0.47.0

package/dist/cli/bin.js

@@ -607,7 +607,10 @@ var init_checklist = __esm({
         label: "Interactions & Animations",
         field: "Test: Interactions & Animations"
       },
-      { key: "updates", label: "Verified After Updates", field: "Test: Verified After Updates" }
+      // `field` keeps its original Airtable column name ("…Verified After Updates") even though
+      // the client-facing label is now "Tested After Updates" — the column holds operator data,
+      // so renaming the label is display-only and avoids a live-base column migration.
+      { key: "updates", label: "Tested After Updates", field: "Test: Verified After Updates" }
     ];
     ALL_CHECKLIST_FIELDS = [...MAINTENANCE_CHECKLIST, ...TESTING_CHECKLIST].map(
       (i) => i.field
@@ -701,7 +704,7 @@ async function createDraft(base, input) {
 async function setDraftReady(base, recordId, ready) {
   await base(REPORTS_TABLE).update([{ id: recordId, fields: { "Draft ready": ready } }]);
 }
-async function updateReportScores(base, recordId, scores, completedOn) {
+async function updateReportScores(base, recordId, scores, completedOn, enrichment) {
   const fields = {
     "Lighthouse \u2014 Performance": scores.performance,
     "Lighthouse \u2014 Accessibility": scores.accessibility,
@@ -709,6 +712,14 @@ async function updateReportScores(base, recordId, scores, completedOn) {
     "Lighthouse \u2014 SEO": scores.seo
   };
   if (completedOn) fields["Completed on"] = ymd(completedOn);
+  if (enrichment?.gaUsersCurrent !== void 0)
+    fields["GA users (period)"] = enrichment.gaUsersCurrent;
+  if (enrichment?.gaUsersPrevious !== void 0)
+    fields["GA users (prev period)"] = enrichment.gaUsersPrevious;
+  if (enrichment?.searchFoundPage1 !== void 0)
+    fields["Search found page 1"] = enrichment.searchFoundPage1;
+  if (enrichment?.searchPosition !== void 0)
+    fields["Search position"] = enrichment.searchPosition;
   await base(REPORTS_TABLE).update([{ id: recordId, fields }]);
 }
 async function listSendableReports(base) {
@@ -808,7 +819,7 @@ var init_copy = __esm({
         "Links & Navigation",
         "Form Functionality",
         "Interactions & Animations",
-        "Verified After Updates"
+        "Tested After Updates"
       ],
       notesHeader: "NOTES",
       seoCta: "Contact us if you are interested in more in-depth data or have questions about SEO.",
@@ -827,8 +838,8 @@ var init_copy = __esm({
       announceCadenceHeading: "WHAT TO EXPECT",
       announceTestingLabel: "Full site testing",
       announceMaintenanceLabel: "Routine maintenance",
-      announceMonitorItems: ["Performance", "Accessibility", "Security", "Uptime"],
       announcePreviewLabel: "From your latest full site test:",
+      announceScoreNote: "These are independent Google Lighthouse scores, each out of 100 \u2014 higher is better.",
       announceImprovementResend: "Your contact forms now deliver straight to your inbox through reliable infrastructure, so no inquiry slips through the cracks.",
       announceImprovementSvelte5: "We've modernized your site to the latest framework \u2014 it's faster, more secure, and built to last.",
       announceCadence: "After each one we'll send you a short report like this \u2014 there's nothing you need to do.",
@@ -1049,7 +1060,7 @@ function buildMjml(data) {
         <mj-text color="#C00" font-size="44px" font-weight="400" padding-top="0px">${data.lighthouse.performance}</mj-text>
         <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="0px" padding-bottom="36px">Acceptable 50\u201389 // Ideal 90\u2013100</mj-text>
         <mj-divider border-width="1px" border-style="solid" border-color="#CCCCCC" padding="0" />
-        <mj-text color="#C00" font-size="20px" font-weight="300" padding-top="25px">Readability</mj-text>
+        <mj-text color="#C00" font-size="20px" font-weight="300" padding-top="25px">Readability (A11y)</mj-text>
         <mj-text color="#C00" font-size="44px" font-weight="400" padding-top="0px">${data.lighthouse.accessibility}</mj-text>
         <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="0px" padding-bottom="36px">Acceptable 80\u201399 // Ideal 100</mj-text>
         <mj-divider border-width="1px" border-style="solid" border-color="#CCCCCC" padding="0" />
@@ -1170,6 +1181,22 @@ var init_template2 = __esm({
 });
 
 // src/reports/announcement-email/template.ts
+function fmtVisitors(n) {
+  return n.toLocaleString("en-US");
+}
+function visitorTrend(cur, prev) {
+  if (cur === void 0 || prev === void 0 || prev === 0) return null;
+  const pct = Math.round((cur - prev) / prev * 100);
+  if (pct > 0) return `\u25B2 ${pct}% vs the previous month`;
+  if (pct < 0) return `\u25BC ${Math.abs(pct)}% vs the previous month`;
+  return "No change vs the previous month";
+}
+function announcementSiteExtras(site) {
+  return {
+    cadence: { maintenance: site.maintenanceFreq, testing: site.testingFreq },
+    improvements: { resendForms: true, svelte5: true }
+  };
+}
 function buildAnnouncementMjml(data) {
   const copy = data.copy ?? DEFAULT_COPY;
   const previewText = "Your monthly report from Reddoor";
@@ -1187,31 +1214,53 @@ function buildAnnouncementMjml(data) {
       </mj-column>
     </mj-section>` : "";
   const cad = data.cadence;
-  const cadenceLines = [];
+  const cadenceBlocks = [];
   if (cad && cad.testing !== "None")
-    cadenceLines.push(`${copy.announceTestingLabel} \u2014 ${FREQ_PHRASE[cad.testing]}`);
+    cadenceBlocks.push({
+      line: `${copy.announceTestingLabel} \u2014 ${FREQ_PHRASE[cad.testing]}`,
+      checks: copy.testingChecklist
+    });
   if (cad && cad.maintenance !== "None")
-    cadenceLines.push(`${copy.announceMaintenanceLabel} \u2014 ${FREQ_PHRASE[cad.maintenance]}`);
-  const cadenceSection = cadenceLines.length > 0 ? `
+    cadenceBlocks.push({
+      line: `${copy.announceMaintenanceLabel} \u2014 ${FREQ_PHRASE[cad.maintenance]}`,
+      checks: copy.maintenanceChecks
+    });
+  const cadenceSection = cadenceBlocks.length > 0 ? `
     <mj-section background-color="white">
       <mj-column>
         <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="36px">${escapeXml(copy.announceCadenceHeading)}</mj-text>
-        ${cadenceLines.map(
-    (line) => `
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="4px" padding-bottom="4px">\u2022 ${escapeXml(line)}</mj-text>`
+        ${cadenceBlocks.map(
+    (b) => `
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="400" line-height="24px" padding-top="12px" padding-bottom="2px">\u2022 ${escapeXml(b.line)}</mj-text>${b.checks.map(
+      (c) => `
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="14px" font-weight="300" line-height="22px" padding-top="1px" padding-bottom="0px" padding-left="16px">${escapeXml(c)} <img src="${CHECK_PNG2}" alt="\u2713" width="14" height="14" style="vertical-align:middle;display:inline-block;margin-left:2px;" /></mj-text>`
+    ).join("")}`
   ).join("")}
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="12px">${escapeXml(copy.announceCadence)}</mj-text>
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="14px">${escapeXml(copy.announceCadence)}</mj-text>
       </mj-column>
     </mj-section>` : "";
-  const monitorRows = copy.announceMonitorItems.map(
-    (item) => `
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="4px" padding-bottom="4px">\u2022 ${escapeXml(item)}</mj-text>`
-  ).join("");
   const scoreRows = SCORE_PREVIEW.map(
     ({ label, key }) => `
         <mj-text color="${RED2}" font-size="20px" font-weight="300" padding-top="25px">${label}</mj-text>
         <mj-text color="${RED2}" font-size="44px" font-weight="400" padding-top="0px">${data.lighthouse[key]}</mj-text>`
   ).join("");
+  const scoreNote = copy.announceScoreNote ? `
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" font-style="italic" line-height="18px" padding-top="16px">${escapeXml(copy.announceScoreNote)}</mj-text>` : "";
+  const trend = visitorTrend(data.gaUsersCurrent, data.gaUsersPrevious);
+  const trafficRows = [];
+  if (data.gaUsersCurrent !== void 0)
+    trafficRows.push(`
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="8px"><span style="color:${RED2};font-size:22px;font-weight:400;">${escapeXml(fmtVisitors(data.gaUsersCurrent))}</span> visitors in the last month${trend ? ` \u2014 ${escapeXml(trend)}` : ""}</mj-text>`);
+  if (data.searchPosition !== void 0)
+    trafficRows.push(`
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="4px">Page 1 Google result (#${data.searchPosition}) for your brand search</mj-text>`);
+  const trafficSection = trafficRows.length > 0 ? `
+    <mj-section background-color="white">
+      <mj-column>
+        <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="36px">TRAFFIC &amp; SEARCH</mj-text>
+        ${trafficRows.join("")}
+      </mj-column>
+    </mj-section>` : "";
   const contactRows = copy.contact.map(
     (line) => `
       <mj-text font-family="helvetica, sans-serif" font-size="24px" font-weight="300" line-height="30px">${escapeXml(line)}</mj-text>`
@@ -1243,18 +1292,13 @@ function buildAnnouncementMjml(data) {
     </mj-section>
     ${cadenceSection}
     ${improvementsSection}
-    <mj-section background-color="white">
-      <mj-column>
-        <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="36px">WHAT WE MONITOR</mj-text>
-        ${monitorRows}
-      </mj-column>
-    </mj-section>
     <mj-section background-color="#F4F4F4">
       <mj-column>
         <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="55px">${escapeXml(copy.announcePreviewLabel)}</mj-text>
-        ${scoreRows}
+        ${scoreRows}${scoreNote}
       </mj-column>
     </mj-section>
+    ${trafficSection}
     <mj-section background-color="white">
       <mj-column>
         <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="36px">${escapeXml(copy.announceOpenDoor)}</mj-text>
@@ -1274,12 +1318,13 @@ function buildAnnouncementMjml(data) {
   </mj-body>
 </mjml>`;
 }
-var FREQ_PHRASE, RED2, GREY2, SCORE_PREVIEW;
+var FREQ_PHRASE, RED2, GREY2, CHECK_PNG2, SCORE_PREVIEW;
 var init_template3 = __esm({
   "src/reports/announcement-email/template.ts"() {
     "use strict";
     init_copy();
     init_template();
+    init_assets();
     FREQ_PHRASE = {
       Monthly: "every month",
       Quarterly: "every quarter",
@@ -1287,9 +1332,10 @@ var init_template3 = __esm({
     };
     RED2 = "#C00";
     GREY2 = "#757575";
+    CHECK_PNG2 = `cid:${CHECK_CID}`;
     SCORE_PREVIEW = [
       { label: "Performance", key: "performance" },
-      { label: "Readability", key: "accessibility" },
+      { label: "Readability (A11y)", key: "accessibility" },
       { label: "Best Practices", key: "bestPractices" },
       { label: "Site Structure", key: "seo" }
     ];
@@ -1955,7 +2001,12 @@ async function sendOne(client, base, site, report) {
     headerImageCid: cidName,
     headerWidth: header.displayWidth,
     headerHeight: header.displayHeight,
-    headerBgColor: header.placeholderColor
+    headerBgColor: header.placeholderColor,
+    // Announcement-only: re-derive cadence + improvements from the site row so the SENT email
+    // keeps its WHAT TO EXPECT section + improvement callouts. Without this the send-time
+    // re-render drops them entirely (they're not stored on the Reports row). Ignored by the
+    // other report templates.
+    ...report.reportType === "Announcement" ? announcementSiteExtras(site) : {}
   });
   const reportDate = report.completedOn ? new Date(report.completedOn) : /* @__PURE__ */ new Date();
   const subject = report.subjectOverride ?? `${site.name} \u2014 ${monthYear(reportDate)} ${report.reportType} Report`;
@@ -2041,6 +2092,7 @@ var init_orchestrate = __esm({
     init_attachments();
     init_render();
     init_copy();
+    init_template3();
     init_assets();
     init_header_image();
     init_resend();
@@ -5780,6 +5832,7 @@ import { JWT as JWT2 } from "google-auth-library";
 var WEBMASTERS_READONLY = "https://www.googleapis.com/auth/webmasters.readonly";
 var SC_BASE = "https://searchconsole.googleapis.com/webmasters/v3";
 var PAGE_1_MAX_POSITION = 10;
+var BRAND_QUERY_ROW_LIMIT = 100;
 function bareHost(s) {
   return s.trim().replace(/^sc-domain:/i, "").replace(/^https?:\/\//i, "").split("/")[0].replace(/^www\./i, "").toLowerCase();
 }
@@ -5793,6 +5846,25 @@ function resolvePropertyCandidates(entries, host) {
 function ymd3(d) {
   return d.toISOString().slice(0, 10);
 }
+function pickBrandQuery(rows) {
+  let best;
+  for (const r of rows) {
+    if (typeof r.position !== "number") continue;
+    const impressions = r.impressions ?? 0;
+    if (best === void 0 || impressions > best.impressions || impressions === best.impressions && r.position < best.position) {
+      best = { position: r.position, impressions };
+    }
+  }
+  return best?.position;
+}
+function selectBrandPosition(rows, exactQuery) {
+  const want = exactQuery.toLowerCase();
+  const exact = rows.find(
+    (r) => typeof r.position === "number" && (r.keys?.[0] ?? "").toLowerCase() === want
+  );
+  if (exact) return exact.position;
+  return pickBrandQuery(rows);
+}
 async function fetchSearchPresence(q, periodStart, periodEnd) {
   const key = JSON.parse(readFileSync4(q.keyPath, "utf8"));
   const jwt = new JWT2({
@@ -5824,14 +5896,14 @@ async function fetchSearchPresence(q, periodStart, periodEnd) {
         dimensionFilterGroups: [
           {
             filters: [
-              { dimension: "query", operator: "equals", expression: q.query.toLowerCase() }
+              { dimension: "query", operator: "contains", expression: q.query.toLowerCase() }
             ]
           }
         ],
-        rowLimit: 1
+        rowLimit: BRAND_QUERY_ROW_LIMIT
       }
     });
-    const pos = res.data.rows?.[0]?.position;
+    const pos = selectBrandPosition(res.data.rows ?? [], q.query.toLowerCase());
     if (typeof pos === "number") {
       return { foundOnPage1: pos <= PAGE_1_MAX_POSITION, position: Math.max(1, Math.round(pos)) };
     }
@@ -6423,6 +6495,7 @@ init_reports();
 init_attachments();
 init_render();
 init_copy();
+init_template3();
 async function announce(deps) {
   const base = deps?.base ?? openBase(readAirtableConfig());
   const now = deps?.now ?? /* @__PURE__ */ new Date();
@@ -6441,15 +6514,24 @@ async function announce(deps) {
         results.push({ site: w.name, status: "skipped-no-scores" });
         continue;
       }
+      const periodEnd = now;
+      const periodStart = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1e3);
+      const gaUsers = (await fetchGaUsers(w, periodStart, periodEnd)).value;
+      const search = (await fetchSearch(w, periodStart, periodEnd)).value;
+      const enrichment = {
+        ...gaUsers ? { gaUsersCurrent: gaUsers.current, gaUsersPrevious: gaUsers.previous } : {},
+        ...search ? { searchFoundPage1: search.foundOnPage1 } : {},
+        ...search?.foundOnPage1 && search.position !== null ? { searchPosition: search.position } : {}
+      };
       let report;
       let statusKind;
       const existing = await findReportByPeriod(base, w.id, "Announcement", period);
       if (existing) {
-        await updateReportScores(base, existing.id, scores, now);
+        await updateReportScores(base, existing.id, scores, now, enrichment);
         report = existing;
         statusKind = "reused";
       } else {
-        report = await createDraft(base, draftInputFor2(w, scores, now, period));
+        report = await createDraft(base, draftInputFor2(w, scores, now, period, enrichment));
         statusKind = "drafted";
       }
       const slug = siteSlug(w.name);
@@ -6459,18 +6541,17 @@ async function announce(deps) {
         reportType: "Announcement",
         completedOn: now,
         lighthouse: scores,
+        gaUsersCurrent: gaUsers?.current,
+        gaUsersPrevious: gaUsers?.previous,
+        searchPosition: search?.foundOnPage1 ? search.position ?? void 0 : void 0,
         lastTestedDate: null,
         commentary: null,
         copy: resolveCopy(w),
         headerImageCid: `${slug}-header`,
-        // The client's go-forward pace, read straight off the Websites row — the email
-        // states each cadence ("Full site testing — every quarter", etc.); a "None" pace
-        // is omitted so we never claim a cadence the site isn't on.
-        cadence: { maintenance: w.maintenanceFreq, testing: w.testingFreq },
-        // Default-on fleet-wide for v1: both recent-improvement callouts render for every
-        // site. Operator review (the draft never auto-sends) is the relevance backstop;
-        // per-site conditioning of these flags is a future lever, not a v1 requirement.
-        improvements: { resendForms: true, svelte5: true }
+        // cadence (the client's go-forward pace, "None" omitted) + default-on improvement
+        // callouts. Shared with the send re-render via announcementSiteExtras so the sent
+        // email matches this reviewed preview.
+        ...announcementSiteExtras(w)
       });
       try {
         await uploadAttachment(
@@ -6509,7 +6590,7 @@ function scoresFromRow(w) {
     seo: w.seoScore
   };
 }
-function draftInputFor2(w, scores, now, period) {
+function draftInputFor2(w, scores, now, period, enrichment) {
   return {
     reportId: `${w.name} \u2014 Announcement \u2014 ${now.toISOString().slice(0, 10)}`,
     siteId: w.id,
@@ -6520,7 +6601,8 @@ function draftInputFor2(w, scores, now, period) {
     completedOn: now,
     lighthouse: scores,
     lastTestedDate: null,
-    subjectOverride: `Your testing & maintenance schedule for ${w.name}`
+    subjectOverride: `Your testing & maintenance schedule for ${w.name}`,
+    ...enrichment
   };
 }