@reddoorla/maintenance 0.46.0 → 0.49.0

package/dist/cli/bin.js

@@ -161,6 +161,9 @@ function parseNotifyRouting(raw) {
 function isDashboardVisible(site) {
   return site.status !== null && ACTIVE_STATUSES.has(site.status);
 }
+function toFrequency(raw) {
+  return typeof raw === "string" && FREQUENCIES.includes(raw) ? raw : "None";
+}
 function mapRow(rec) {
   const f = rec.fields;
   const attachments = f["Header image"] ?? [];
@@ -171,8 +174,8 @@ function mapRow(rec) {
     url: String(f["url"] ?? ""),
     status: f["Status"] ?? null,
     pointOfContact: f["point of contact"] ?? null,
-    maintenanceFreq: f["maintenence freq"] ?? "None",
-    testingFreq: f["testing freq"] ?? "None",
+    maintenanceFreq: toFrequency(f["maintenence freq"]),
+    testingFreq: toFrequency(f["testing freq"]),
     maintenanceDay: f["maintenance day"] ?? null,
     testingDay: f["testing day"] ?? null,
     ga4PropertyId: f["GA4 property ID"] ?? null,
@@ -295,7 +298,7 @@ async function updateLaunched(base, recordId, at) {
   const fields = { Status: "maintenance", "Launched at": at };
   await base(WEBSITES_TABLE).update([{ id: recordId, fields }]);
 }
-var WEBSITES_TABLE, ACTIVE_STATUSES;
+var WEBSITES_TABLE, ACTIVE_STATUSES, FREQUENCIES;
 var init_websites = __esm({
   "src/reports/airtable/websites.ts"() {
     "use strict";
@@ -304,6 +307,7 @@ var init_websites = __esm({
       "maintenance",
       "launch period"
     ]);
+    FREQUENCIES = ["None", "Monthly", "Quarterly", "Yearly"];
   }
 });
 
@@ -607,7 +611,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 +708,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 +716,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 +823,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.",
@@ -824,14 +839,10 @@ var init_copy = __esm({
       ],
       announceHeading: "YOUR ONGOING SITE CARE",
       announceBody: "We've completed a full test of your site and set it up for ongoing care to keep it fast, secure, and healthy. Here's what you can expect from us going forward:",
-      announceCadenceHeading: "WHAT TO EXPECT",
-      announceTestingLabel: "Full site testing",
-      announceMaintenanceLabel: "Routine maintenance",
-      announcePreviewLabel: "From your latest full site test:",
       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.",
-      announceOpenDoor: "And if you'd ever like to expand the scope, add features, or freshen anything up, just reply \u2014 we'd love to help."
+      announceOpenDoor: "And if you'd ever like to expand the scope, add features, or freshen anything up, just let us know."
     };
   }
 });
@@ -905,65 +916,124 @@ var init_html = __esm({
   }
 });
 
-// src/reports/maintenance-email/template.ts
-function fmtDate(d) {
-  if (!d || Number.isNaN(d.getTime())) return "";
-  const mm = String(d.getUTCMonth() + 1).padStart(2, "0");
-  const dd = String(d.getUTCDate()).padStart(2, "0");
-  const yyyy = d.getUTCFullYear();
-  return `${mm}.${dd}.${yyyy}`;
-}
+// src/reports/email-sections.ts
 function fmtUsers(n) {
   return n.toLocaleString("en-US");
 }
-function trendText(color, text) {
-  return `<mj-text color="${color}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px">${text}</mj-text>`;
+function checklistRowsSection(rows, opts) {
+  return rows.map((label, i) => {
+    const isLast = i === rows.length - 1;
+    const border = isLast ? "" : ` border-bottom="solid ${BORDER} 1px"`;
+    const lastPad = isLast ? ` padding-bottom="${opts.lastPaddingBottom}"` : "";
+    return `
+    <mj-section background-color="${opts.background}" padding="0px"${lastPad}>
+      <mj-group>
+        <mj-column padding-left="0px" width="90%"${border}>
+          <mj-text height="25px" padding-left="0px" color="${GREY}" padding-top="20px" padding-bottom="7.5px" font-size="16px">${escapeXml(label)}</mj-text>
+        </mj-column>
+        <mj-column width="10%"${border} padding-top="15px">
+          <mj-image align="right" padding-right="0px" width="20px" height="20px" padding-top="2.5px" padding-bottom="15px" src="${CHECK_PNG}" />
+        </mj-column>
+      </mj-group>
+    </mj-section>`;
+  }).join("");
+}
+function lighthouseScoresSection(lighthouse2, opts = {}) {
+  const background = opts.background ?? "#F4F4F4";
+  const sectionPad = opts.pad ? ` padding-top="${opts.pad}" padding-bottom="${opts.pad}"` : "";
+  const labelTop = opts.pad ?? "55px";
+  const footnoteBottom = opts.pad ? "0px" : "36px";
+  const rows = LIGHTHOUSE_ROWS.map(
+    ({ label, key, range }, i) => `
+        <mj-text color="${RED}" font-size="20px" font-weight="300" padding-top="25px">${label}</mj-text>
+        <mj-text color="${RED}" font-size="44px" font-weight="400" padding-top="0px">${lighthouse2[key]}</mj-text>
+        <mj-text color="${GREY}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="0px" padding-bottom="36px">${range}</mj-text>${i < LIGHTHOUSE_ROWS.length - 1 ? `
+        <mj-divider border-width="1px" border-style="solid" border-color="${BORDER}" padding="0" />` : ""}`
+  ).join("");
+  return `
+    <mj-section background-color="${background}"${sectionPad}>
+      <mj-column>
+        <mj-text color="${RED}" font-size="20px" font-weight="700" padding-top="${labelTop}">LIGHTHOUSE SCORES*</mj-text>${rows}
+        <mj-text color="${GREY}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="24px" padding-bottom="${footnoteBottom}" line-height="20px">*A Lighthouse score is a numerical measure provided by Google's Lighthouse tool, which evaluates various aspects of a web page's quality.</mj-text>
+      </mj-column>
+    </mj-section>`;
 }
 function analyticsTrendLine(cur, prev) {
   if (cur === void 0 || prev === void 0) {
-    return trendText(TREND_NEUTRAL, `Last Period: ${prev !== void 0 ? fmtUsers(prev) : "\u2014"}`);
+    return trendLine(TREND_NEUTRAL, `Last Period: ${prev !== void 0 ? fmtUsers(prev) : "\u2014"}`);
   }
   if (prev === 0) {
-    return cur > 0 ? trendText(TREND_UP, "\u25B2 New this period (0 last period)") : trendText(TREND_NEUTRAL, "Last Period: 0");
+    return cur > 0 ? trendLine(TREND_UP, "\u25B2 New this period (0 last period)") : trendLine(TREND_NEUTRAL, "Last Period: 0");
   }
   const pct = Math.round((cur - prev) / prev * 100);
   const range = `(${fmtUsers(prev)} \u2192 ${fmtUsers(cur)})`;
-  if (pct > 0) return trendText(TREND_UP, `\u25B2 ${pct}% vs last period ${range}`);
-  if (pct < 0) return trendText(TREND_NEUTRAL, `\u25BC ${Math.abs(pct)}% vs last period ${range}`);
-  return trendText(TREND_NEUTRAL, `No change vs last period (${fmtUsers(prev)})`);
+  if (pct > 0) return trendLine(TREND_UP, `\u25B2 ${pct}% vs last period ${range}`);
+  if (pct < 0) return trendLine(TREND_NEUTRAL, `\u25BC ${Math.abs(pct)}% vs last period ${range}`);
+  return trendLine(TREND_NEUTRAL, `No change vs last period (${fmtUsers(prev)})`);
+}
+function trendLine(color, text) {
+  return `<mj-text color="${color}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px">${text}</mj-text>`;
+}
+function footnoteLine(text) {
+  return `<mj-text color="${GREY}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="24px" padding-bottom="36px" line-height="20px">${text}</mj-text>`;
+}
+function analyticsSection(opts) {
+  const users = opts.current !== void 0 ? fmtUsers(opts.current) : "\u2014";
+  const body = (opts.bodyLines ?? []).map((l) => trendLine(TREND_NEUTRAL, l)).join("\n        ");
+  const footnotes = (opts.footnoteLines ?? []).map(footnoteLine).join("\n        ");
+  const sectionPad = opts.pad ? ` padding-top="${opts.pad}" padding-bottom="${opts.pad}"` : "";
+  const labelTop = opts.pad ?? "75px";
+  return `
+    <mj-section background-color="${opts.background}"${sectionPad}>
+      <mj-column>
+        <mj-text color="${RED}" font-size="20px" font-weight="700" padding-top="${labelTop}">ANALYTICS</mj-text>
+        <mj-text color="${RED}" font-size="44px" font-weight="400">${users} Users</mj-text>
+        ${analyticsTrendLine(opts.current, opts.previous)}
+        ${body}
+        ${footnotes}
+      </mj-column>
+    </mj-section>`;
+}
+var escapeXml, RED, GREY, BORDER, TREND_UP, TREND_NEUTRAL, CHECK_PNG, LIGHTHOUSE_ROWS;
+var init_email_sections = __esm({
+  "src/reports/email-sections.ts"() {
+    "use strict";
+    init_html();
+    init_assets();
+    escapeXml = escapeHtml;
+    RED = "#C00";
+    GREY = "#757575";
+    BORDER = "#CCCCCC";
+    TREND_UP = "#2E7D32";
+    TREND_NEUTRAL = GREY;
+    CHECK_PNG = `cid:${CHECK_CID}`;
+    LIGHTHOUSE_ROWS = [
+      { label: "Performance", key: "performance", range: "Acceptable 50\u201389 // Ideal 90\u2013100" },
+      { label: "Readability (A11y)", key: "accessibility", range: "Acceptable 80\u201399 // Ideal 100" },
+      { label: "Best Practices", key: "bestPractices", range: "Acceptable 60\u201379 // Ideal 80\u2013100" },
+      { label: "Site Structure", key: "seo", range: "Acceptable 50\u201389 // Ideal 90\u2013100" }
+    ];
+  }
+});
+
+// src/reports/maintenance-email/template.ts
+function fmtDate(d) {
+  if (!d || Number.isNaN(d.getTime())) return "";
+  const mm = String(d.getUTCMonth() + 1).padStart(2, "0");
+  const dd = String(d.getUTCDate()).padStart(2, "0");
+  const yyyy = d.getUTCFullYear();
+  return `${mm}.${dd}.${yyyy}`;
 }
 function maintenanceChecksSection(copy, searchPosition) {
   const googleLabel = searchPosition !== void 0 ? `Page 1 Google Result (#${searchPosition})` : copy.maintenanceChecks[3] ?? "";
   const rows = copy.maintenanceChecks.map((label, i) => i === 3 ? googleLabel : label);
-  return rows.map(
-    (label, i) => `
-    <mj-section background-color="white" padding="0px"${i === rows.length - 1 ? ' padding-bottom="36px"' : ""}>
-      <mj-group>
-        <mj-column padding-left="0px" width="90%"${i < rows.length - 1 ? ' border-bottom="solid #CCCCCC 1px"' : ""}>
-          <mj-text height="25px" padding-left="0px" color="#757575" padding-top="20px" padding-bottom="7.5px" font-size="16px">${escapeXml(label)}</mj-text>
-        </mj-column>
-        <mj-column width="10%"${i < rows.length - 1 ? ' border-bottom="solid #CCCCCC 1px"' : ""} padding-top="15px">
-          <mj-image align="right" padding-right="0px" width="20px" height="20px" padding-top="2.5px" padding-bottom="15px" src="${CHECK_PNG}" />
-        </mj-column>
-      </mj-group>
-    </mj-section>`
-  ).join("");
+  return checklistRowsSection(rows, { background: "white", lastPaddingBottom: "36px" });
 }
 function testingChecklistSection(copy) {
-  const rows = copy.testingChecklist;
-  return rows.map(
-    (label, i) => `
-    <mj-section background-color="#F4F4F4" padding="0px"${i === rows.length - 1 ? ' padding-bottom="60px"' : ""}>
-      <mj-group>
-        <mj-column width="90%" padding-left="0px"${i < rows.length - 1 ? ' border-bottom="solid #CCCCCC 1px"' : ""}>
-          <mj-text height="25px" padding-left="0px" color="#757575" padding-top="20px" padding-bottom="7.5px" font-size="16px">${escapeXml(label)}</mj-text>
-        </mj-column>
-        <mj-column width="10%"${i < rows.length - 1 ? ' border-bottom="solid #CCCCCC 1px"' : ""} padding-top="15px">
-          <mj-image align="right" padding-right="0px" width="20px" height="20px" padding-top="2.5px" padding-bottom="15px" src="${CHECK_PNG}" />
-        </mj-column>
-      </mj-group>
-    </mj-section>`
-  ).join("");
+  return checklistRowsSection(copy.testingChecklist, {
+    background: "#F4F4F4",
+    lastPaddingBottom: "60px"
+  });
 }
 function maintenanceTestingPlaceholder(lastTested) {
   return `
@@ -983,7 +1053,7 @@ function testingIntroSection(copy) {
     <mj-section background-color="#F4F4F4">
       <mj-column>
         <mj-text color="#C00" font-size="20px" font-weight="700" padding-top="75px">TESTING</mj-text>
-        <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px">${escapeXml(copy.testingIntro)}</mj-text>
+        <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px">${escapeXml2(copy.testingIntro)}</mj-text>
       </mj-column>
     </mj-section>`;
 }
@@ -991,8 +1061,8 @@ function commentarySection(text, copy) {
   return `
     <mj-section background-color="white">
       <mj-column>
-        <mj-text color="#C00" font-size="20px" font-weight="700" padding-top="55px">${escapeXml(copy.notesHeader)}</mj-text>
-        <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px">${escapeXml(text).replace(/\r\n?|\n/g, "<br/>")}</mj-text>
+        <mj-text color="#C00" font-size="20px" font-weight="700" padding-top="55px">${escapeXml2(copy.notesHeader)}</mj-text>
+        <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px">${escapeXml2(text).replace(/\r\n?|\n/g, "<br/>")}</mj-text>
       </mj-column>
     </mj-section>`;
 }
@@ -1001,8 +1071,8 @@ function hasHeaderDims(data) {
 }
 function headerImageTag(data) {
   const src = `cid:${data.headerImageCid}`;
-  const alt = `${escapeXml(data.siteName)} maintenance report`;
-  const href = isHttpUrl(data.siteUrl) ? escapeXml(data.siteUrl) : "#";
+  const alt = `${escapeXml2(data.siteName)} maintenance report`;
+  const href = isHttpUrl(data.siteUrl) ? escapeXml2(data.siteUrl) : "#";
   if (hasHeaderDims(data)) {
     return `<mj-image href="${href}" src="${src}" alt="${alt}" width="${data.headerWidth}px" css-class="rd-header" container-background-color="${data.headerBgColor}" />`;
   }
@@ -1015,7 +1085,7 @@ function headerStyleBlock(data) {
 function buildMjml(data) {
   const copy = data.copy ?? DEFAULT_COPY;
   const isTesting = data.reportType === "Testing";
-  const previewText = `Checked up on ${escapeXml(data.siteName)}`;
+  const previewText = `Checked up on ${escapeXml2(data.siteName)}`;
   return `<mjml>
   <mj-head>
     <mj-attributes>
@@ -1037,89 +1107,65 @@ function buildMjml(data) {
         <mj-text color="#C00" font-size="20px" font-weight="700" padding-top="75px">COMPLETED ON</mj-text>
         <mj-text color="#C00" font-size="44px" font-weight="400">${fmtDate(data.completedOn)}</mj-text>
         <mj-text color="#C00" font-size="20px" font-weight="700" padding-top="75px">MAINTENANCE CHECKS</mj-text>
-        <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px">${escapeXml(copy.maintenanceIntro)}</mj-text>
+        <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px">${escapeXml2(copy.maintenanceIntro)}</mj-text>
       </mj-column>
     </mj-section>
     ${maintenanceChecksSection(copy, data.searchPosition)}
-    <mj-section background-color="#F4F4F4">
-      <mj-column>
-        <mj-text color="#C00" font-size="20px" font-weight="700" padding-top="55px">LIGHTHOUSE SCORES*</mj-text>
-        <mj-text color="#C00" font-size="20px" font-weight="300" padding-top="25px">Performance</mj-text>
-        <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="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" />
-        <mj-text color="#C00" font-size="20px" font-weight="300" padding-top="25px">Best Practices</mj-text>
-        <mj-text color="#C00" font-size="44px" font-weight="400" padding-top="0px">${data.lighthouse.bestPractices}</mj-text>
-        <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="0px" padding-bottom="36px">Acceptable 60\u201379 // Ideal 80\u201392</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">Site Structure</mj-text>
-        <mj-text color="#C00" font-size="44px" font-weight="400" padding-top="0px">${data.lighthouse.seo}</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-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="24px" padding-bottom="36px" line-height="20px">*A Lighthouse score is a numerical measure provided by Google's Lighthouse tool, which evaluates various aspects of a web page's quality.</mj-text>
-      </mj-column>
-    </mj-section>
-    <mj-section background-color="white">
-      <mj-column>
-        <mj-text color="#C00" font-size="20px" font-weight="700" padding-top="75px">ANALYTICS</mj-text>
-        <mj-text color="#C00" font-size="44px" font-weight="400">${data.gaUsersCurrent !== void 0 ? fmtUsers(data.gaUsersCurrent) : "\u2014"} Users</mj-text>
-        ${analyticsTrendLine(data.gaUsersCurrent, data.gaUsersPrevious)}
-        <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="24px" padding-bottom="36px" line-height="20px">${escapeXml(copy.seoCta)}</mj-text>
-      </mj-column>
-    </mj-section>
+    ${lighthouseScoresSection(data.lighthouse)}
+    ${analyticsSection({
+    current: data.gaUsersCurrent,
+    previous: data.gaUsersPrevious,
+    background: "white",
+    footnoteLines: [escapeXml2(copy.seoCta)]
+  })}
     ${isTesting ? testingIntroSection(copy) + testingChecklistSection(copy) : maintenanceTestingPlaceholder(data.lastTestedDate)}
     ${data.commentary ? commentarySection(data.commentary, copy) : ""}
     <mj-section background-color="white">
       <mj-column padding-top="36px">
         <mj-text color="#C00" font-family="helvetica, sans-serif" font-size="24px" font-weight="700" padding-top="36px" line-height="36px">Any questions, concerns or requests?</mj-text>
         ${copy.contact.map(
-    (line, i) => i === copy.contact.length - 1 ? `<mj-text font-family="helvetica, sans-serif" font-size="24px" font-weight="300" padding-top="0px" line-height="30px" padding-bottom="36px">${escapeXml(line)}</mj-text>` : `<mj-text font-family="helvetica, sans-serif" font-size="24px" font-weight="300" line-height="30px">${escapeXml(line)}</mj-text>`
+    (line, i) => i === copy.contact.length - 1 ? `<mj-text font-family="helvetica, sans-serif" font-size="24px" font-weight="300" padding-top="0px" line-height="30px" padding-bottom="36px">${escapeXml2(line)}</mj-text>` : `<mj-text font-family="helvetica, sans-serif" font-size="24px" font-weight="300" line-height="30px">${escapeXml2(line)}</mj-text>`
   ).join("\n        ")}
         <mj-divider border-width="1px" border-style="solid" border-color="#CCCCCC" padding="0" />
-        <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="24px" line-height="20px" font-style="italic">Copyright ${(/* @__PURE__ */ new Date()).getUTCFullYear()} ${escapeXml(copy.footerOrg)}. All rights reserved.</mj-text>
+        <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="24px" line-height="20px" font-style="italic">Copyright ${(/* @__PURE__ */ new Date()).getUTCFullYear()} ${escapeXml2(copy.footerOrg)}. All rights reserved.</mj-text>
         <mj-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="700" line-height="16px" padding-top="0" padding-bottom="0px">Our mailing address is:</mj-text>
         ${[copy.footerOrg, ...copy.footerAddress].map(
-    (line) => `<mj-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" line-height="16px" padding-top="0" padding-bottom="0px">${escapeXml(line)}</mj-text>`
+    (line) => `<mj-text color="#757575" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" line-height="16px" padding-top="0" padding-bottom="0px">${escapeXml2(line)}</mj-text>`
   ).join("\n        ")}
       </mj-column>
     </mj-section>
   </mj-body>
 </mjml>`;
 }
-var escapeXml, CHECK_PNG, BLURRED_TESTS, TREND_UP, TREND_NEUTRAL;
+var escapeXml2, BLURRED_TESTS;
 var init_template = __esm({
   "src/reports/maintenance-email/template.ts"() {
     "use strict";
     init_copy();
     init_assets();
+    init_email_sections();
     init_html();
     init_url();
-    escapeXml = escapeHtml;
-    CHECK_PNG = `cid:${CHECK_CID}`;
+    escapeXml2 = escapeHtml;
     BLURRED_TESTS = `cid:${BLURRED_CID}`;
-    TREND_UP = "#2E7D32";
-    TREND_NEUTRAL = "#757575";
   }
 });
 
 // src/reports/launch-email/template.ts
 function buildLaunchMjml(data) {
   const copy = data.copy ?? DEFAULT_COPY;
-  const previewText = `${escapeXml(data.siteName)} is live`;
+  const previewText = `${escapeXml2(data.siteName)} is live`;
   const setupRows = copy.launchSetupItems.map(
     (item) => `
-      <mj-text color="${GREY}" 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>`
+      <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 ${escapeXml2(item)}</mj-text>`
   ).join("");
   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>`
+      <mj-text font-family="helvetica, sans-serif" font-size="24px" font-weight="300" line-height="30px">${escapeXml2(line)}</mj-text>`
   ).join("");
   const footerAddressRows = copy.footerAddress.map(
     (line) => `
-      <mj-text color="${GREY}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" line-height="16px" padding-top="0" padding-bottom="0px">${escapeXml(line)}</mj-text>`
+      <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" line-height="16px" padding-top="0" padding-bottom="0px">${escapeXml2(line)}</mj-text>`
   ).join("");
   return `<mjml>
   <mj-head>
@@ -1137,90 +1183,112 @@ function buildLaunchMjml(data) {
     </mj-section>
     <mj-section background-color="white">
       <mj-column>
-        <mj-text color="${RED}" font-size="20px" font-weight="700" padding-top="75px">${escapeXml(copy.launchHeading)}</mj-text>
-        <mj-text color="${RED}" font-size="44px" font-weight="400">${fmtDate(data.completedOn)}</mj-text>
-        <mj-text color="${GREY}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="20px">${escapeXml(copy.launchBody)}</mj-text>
+        <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="75px">${escapeXml2(copy.launchHeading)}</mj-text>
+        <mj-text color="${RED2}" font-size="44px" font-weight="400">${fmtDate(data.completedOn)}</mj-text>
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="20px">${escapeXml2(copy.launchBody)}</mj-text>
         ${setupRows}
       </mj-column>
     </mj-section>
     <mj-section background-color="white">
       <mj-column padding-top="36px">
-        <mj-text color="${RED}" font-family="helvetica, sans-serif" font-size="24px" font-weight="700" padding-top="36px" line-height="36px">Any questions, concerns or requests?</mj-text>
+        <mj-text color="${RED2}" font-family="helvetica, sans-serif" font-size="24px" font-weight="700" padding-top="36px" line-height="36px">Any questions, concerns or requests?</mj-text>
         ${contactRows}
         <mj-divider border-width="1px" border-style="solid" border-color="#CCCCCC" padding="0" />
-        <mj-text color="${GREY}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="24px" line-height="20px" font-style="italic">Copyright ${(/* @__PURE__ */ new Date()).getUTCFullYear()} ${escapeXml(copy.footerOrg)}. All rights reserved.</mj-text>
-        <mj-text color="${GREY}" font-family="helvetica, sans-serif" font-size="12px" font-weight="700" line-height="16px" padding-top="0" padding-bottom="0px">Our mailing address is:</mj-text>
-        <mj-text color="${GREY}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" line-height="16px" padding-top="0" padding-bottom="0px">${escapeXml(copy.footerOrg)}</mj-text>
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="24px" line-height="20px" font-style="italic">Copyright ${(/* @__PURE__ */ new Date()).getUTCFullYear()} ${escapeXml2(copy.footerOrg)}. All rights reserved.</mj-text>
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="12px" font-weight="700" line-height="16px" padding-top="0" padding-bottom="0px">Our mailing address is:</mj-text>
+        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" line-height="16px" padding-top="0" padding-bottom="0px">${escapeXml2(copy.footerOrg)}</mj-text>
         ${footerAddressRows}
       </mj-column>
     </mj-section>
   </mj-body>
 </mjml>`;
 }
-var RED, GREY;
+var RED2, GREY2;
 var init_template2 = __esm({
   "src/reports/launch-email/template.ts"() {
     "use strict";
     init_copy();
     init_template();
-    RED = "#C00";
-    GREY = "#757575";
+    RED2 = "#C00";
+    GREY2 = "#757575";
   }
 });
 
 // src/reports/announcement-email/template.ts
+function sectionLabel(text) {
+  return `<mj-text color="${RED3}" font-size="20px" font-weight="700" padding-top="0px">${escapeXml2(text)}</mj-text>`;
+}
+function bodyLine(text, paddingTop = "8px") {
+  return `<mj-text color="${GREY3}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="${paddingTop}">${escapeXml2(text)}</mj-text>`;
+}
+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";
+  const cad = data.cadence;
+  const hasMaint = Boolean(cad && cad.maintenance !== "None");
+  const hasTesting = Boolean(cad && cad.testing !== "None");
   const improvementItems = [];
   if (data.improvements?.resendForms) improvementItems.push(copy.announceImprovementResend);
   if (data.improvements?.svelte5) improvementItems.push(copy.announceImprovementSvelte5);
-  const improvementsSection = improvementItems.length > 0 ? `
-    <mj-section background-color="white">
+  const hasImpr = improvementItems.length > 0;
+  const BANDS = ["white", "#F4F4F4"];
+  let bandN = 0;
+  const nextBg = () => BANDS[bandN++ % 2];
+  const introBg = nextBg();
+  const maintBg = hasMaint ? nextBg() : "";
+  const testBg = hasTesting ? nextBg() : "";
+  const lighthouseBg = nextBg();
+  const analyticsBg = nextBg();
+  const improvementsBg = hasImpr ? nextBg() : "";
+  const contactBg = nextBg();
+  const maintenanceSection = cad && cad.maintenance !== "None" ? `
+    <mj-section background-color="${maintBg}" padding-top="${SECTION_PAD}" padding-bottom="0px">
       <mj-column>
-        <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="36px">RECENT IMPROVEMENTS</mj-text>
-        ${improvementItems.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("")}
+        ${sectionLabel("MAINTENANCE CHECKS")}
+        ${bodyLine(`${copy.maintenanceIntro} We do this ${FREQ_PHRASE[cad.maintenance]}.${cad.testing === "None" ? ` ${copy.announceCadence}` : ""}`)}
       </mj-column>
-    </mj-section>` : "";
-  const cad = data.cadence;
-  const cadenceBlocks = [];
-  if (cad && cad.testing !== "None")
-    cadenceBlocks.push({
-      line: `${copy.announceTestingLabel} \u2014 ${FREQ_PHRASE[cad.testing]}`,
-      checks: copy.testingChecklist
-    });
-  if (cad && cad.maintenance !== "None")
-    cadenceBlocks.push({
-      line: `${copy.announceMaintenanceLabel} \u2014 ${FREQ_PHRASE[cad.maintenance]}`,
-      checks: copy.maintenanceChecks
-    });
-  const cadenceSection = cadenceBlocks.length > 0 ? `
-    <mj-section background-color="white">
+    </mj-section>${checklistRowsSection(copy.maintenanceChecks, {
+    background: maintBg,
+    lastPaddingBottom: SECTION_PAD
+  })}` : "";
+  const testingSection = cad && cad.testing !== "None" ? `
+    <mj-section background-color="${testBg}" padding-top="${SECTION_PAD}" padding-bottom="0px">
       <mj-column>
-        <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="36px">${escapeXml(copy.announceCadenceHeading)}</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="0px">\u2022 ${escapeXml(b.line)}</mj-text>
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="13px" font-weight="300" line-height="20px" padding-top="2px" padding-bottom="0px" padding-left="16px">${escapeXml(b.checks.join(" \xB7 "))}</mj-text>`
-  ).join("")}
-        <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>
+        ${sectionLabel("TESTING")}
+        ${bodyLine(`${copy.testingIntro} We run a full test ${FREQ_PHRASE[cad.testing]}. ${copy.announceCadence}`)}
+      </mj-column>
+    </mj-section>${checklistRowsSection(copy.testingChecklist, {
+    background: testBg,
+    lastPaddingBottom: SECTION_PAD
+  })}` : "";
+  const analytics = analyticsSection({
+    current: data.gaUsersCurrent,
+    previous: data.gaUsersPrevious,
+    background: analyticsBg,
+    pad: SECTION_PAD,
+    bodyLines: data.searchPosition !== void 0 ? [`Page 1 Google result (#${data.searchPosition}) for your brand search`] : []
+  });
+  const improvementsSection = hasImpr ? `
+    <mj-section background-color="${improvementsBg}" padding-top="${SECTION_PAD}" padding-bottom="${SECTION_PAD}">
+      <mj-column>
+        ${sectionLabel("RECENT IMPROVEMENTS")}
+        ${improvementItems.map((item) => bodyLine(item)).join("\n        ")}
+        ${bodyLine(copy.announceOpenDoor, "16px")}
       </mj-column>
     </mj-section>` : "";
-  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 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>`
+      <mj-text font-family="helvetica, sans-serif" font-size="24px" font-weight="300" line-height="30px">${escapeXml2(line)}</mj-text>`
   ).join("");
   const footerAddressRows = copy.footerAddress.map(
     (line) => `
-      <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" line-height="16px" padding-top="0" padding-bottom="0px">${escapeXml(line)}</mj-text>`
+      <mj-text color="${GREY3}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" line-height="16px" padding-top="0" padding-bottom="0px">${escapeXml2(line)}</mj-text>`
   ).join("");
   return `<mjml>
   <mj-head>
@@ -1229,66 +1297,54 @@ function buildAnnouncementMjml(data) {
       <mj-section padding-left="11%" padding-right="11%"/>
       <mj-image padding="0px" />
     </mj-attributes>
-    <mj-preview>${escapeXml(previewText)}</mj-preview>
+    <mj-preview>${escapeXml2(previewText)}</mj-preview>
     ${headerStyleBlock(data)}
   </mj-head>
   <mj-body background-color="white">
     <mj-section background-color="#F4F4F4" padding-top="0px" padding-bottom="0px" padding-left="0px" padding-right="0px">
       <mj-column>${headerImageTag(data)}</mj-column>
     </mj-section>
-    <mj-section background-color="white">
+    <mj-section background-color="${introBg}" padding-top="${SECTION_PAD}" padding-bottom="${SECTION_PAD}">
       <mj-column>
-        <mj-text color="${RED2}" font-size="20px" font-weight="700" padding-top="75px">${escapeXml(copy.announceHeading)}</mj-text>
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="20px">Prepared for ${escapeXml(data.siteName)}</mj-text>
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="8px">${escapeXml(copy.announceBody)}</mj-text>
+        ${sectionLabel(copy.announceHeading)}
+        <mj-text color="${GREY3}" font-family="helvetica, sans-serif" font-size="16px" font-weight="300" line-height="24px" padding-top="20px">Prepared for ${escapeXml2(data.siteName)}</mj-text>
+        ${bodyLine(copy.announceBody)}
       </mj-column>
     </mj-section>
-    ${cadenceSection}
+    ${maintenanceSection}
+    ${testingSection}
+    ${lighthouseScoresSection(data.lighthouse, { background: lighthouseBg, pad: SECTION_PAD })}
+    ${analytics}
     ${improvementsSection}
-    <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}
-      </mj-column>
-    </mj-section>
-    <mj-section background-color="white">
+    <mj-section background-color="${contactBg}" padding-top="${SECTION_PAD}" padding-bottom="${SECTION_PAD}">
       <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>
-      </mj-column>
-    </mj-section>
-    <mj-section background-color="white">
-      <mj-column padding-top="36px">
-        <mj-text color="${RED2}" font-family="helvetica, sans-serif" font-size="24px" font-weight="700" padding-top="36px" line-height="36px">Any questions, concerns or requests?</mj-text>
+        <mj-text color="${RED3}" font-family="helvetica, sans-serif" font-size="24px" font-weight="700" padding-top="0px" line-height="36px">Any questions, concerns or requests?</mj-text>
         ${contactRows}
         <mj-divider border-width="1px" border-style="solid" border-color="#CCCCCC" padding="0" />
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="24px" line-height="20px" font-style="italic">Copyright ${(/* @__PURE__ */ new Date()).getUTCFullYear()} ${escapeXml(copy.footerOrg)}. All rights reserved.</mj-text>
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="12px" font-weight="700" line-height="16px" padding-top="0" padding-bottom="0px">Our mailing address is:</mj-text>
-        <mj-text color="${GREY2}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" line-height="16px" padding-top="0" padding-bottom="0px">${escapeXml(copy.footerOrg)}</mj-text>
+        <mj-text color="${GREY3}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" padding-top="24px" line-height="20px" font-style="italic">Copyright ${(/* @__PURE__ */ new Date()).getUTCFullYear()} ${escapeXml2(copy.footerOrg)}. All rights reserved.</mj-text>
+        <mj-text color="${GREY3}" font-family="helvetica, sans-serif" font-size="12px" font-weight="700" line-height="16px" padding-top="0" padding-bottom="0px">Our mailing address is:</mj-text>
+        <mj-text color="${GREY3}" font-family="helvetica, sans-serif" font-size="12px" font-weight="300" line-height="16px" padding-top="0" padding-bottom="0px">${escapeXml2(copy.footerOrg)}</mj-text>
         ${footerAddressRows}
       </mj-column>
     </mj-section>
   </mj-body>
 </mjml>`;
 }
-var FREQ_PHRASE, RED2, GREY2, SCORE_PREVIEW;
+var FREQ_PHRASE, RED3, GREY3, SECTION_PAD;
 var init_template3 = __esm({
   "src/reports/announcement-email/template.ts"() {
     "use strict";
     init_copy();
     init_template();
+    init_email_sections();
     FREQ_PHRASE = {
       Monthly: "every month",
       Quarterly: "every quarter",
       Yearly: "every year"
     };
-    RED2 = "#C00";
-    GREY2 = "#757575";
-    SCORE_PREVIEW = [
-      { label: "Performance", key: "performance" },
-      { label: "Readability", key: "accessibility" },
-      { label: "Best Practices", key: "bestPractices" },
-      { label: "Site Structure", key: "seo" }
-    ];
+    RED3 = "#C00";
+    GREY3 = "#757575";
+    SECTION_PAD = "40px";
   }
 });
 
@@ -1598,16 +1654,16 @@ __export(digest_exports, {
   runDigest: () => runDigest
 });
 function readySection(items) {
-  const heading = `<h2 style="color:${RED3};font-family:helvetica,sans-serif;font-size:20px;font-weight:700;margin:32px 0 8px">Ready for your yes</h2>`;
+  const heading = `<h2 style="color:${RED4};font-family:helvetica,sans-serif;font-size:20px;font-weight:700;margin:32px 0 8px">Ready for your yes</h2>`;
   if (items.length === 0) {
-    return `${heading}<p style="color:${GREY3};font-family:helvetica,sans-serif;font-size:16px;margin:0">Nothing waiting on you.</p>`;
+    return `${heading}<p style="color:${GREY4};font-family:helvetica,sans-serif;font-size:16px;margin:0">Nothing waiting on you.</p>`;
   }
   const rows = items.map((it) => {
     const safeUrl = it.dashboardUrl.startsWith("https://") ? it.dashboardUrl : void 0;
     const link = safeUrl ? `<a href="${escapeHtml(safeUrl)}" style="${ANCHOR_STYLE}">review &amp; approve</a>` : `review &amp; approve`;
     return `
       <tr>
-        <td style="color:${GREY3};font-family:helvetica,sans-serif;font-size:16px;line-height:24px;padding-bottom:8px">
+        <td style="color:${GREY4};font-family:helvetica,sans-serif;font-size:16px;line-height:24px;padding-bottom:8px">
           <strong style="color:#222">${escapeHtml(it.siteName)}</strong> \u2014 ${escapeHtml(it.reportType)} (${escapeHtml(it.period)})
           \u2014 ${link}
         </td>
@@ -1617,15 +1673,15 @@ function readySection(items) {
 }
 function attentionBadge(status) {
   if (status === "new")
-    return `<strong style="color:${RED3};font-family:helvetica,sans-serif">NEW</strong> `;
+    return `<strong style="color:${RED4};font-family:helvetica,sans-serif">NEW</strong> `;
   if (status === "worse")
-    return `<strong style="color:${RED3};font-family:helvetica,sans-serif">WORSE</strong> `;
+    return `<strong style="color:${RED4};font-family:helvetica,sans-serif">WORSE</strong> `;
   return "";
 }
 function attentionSection(items) {
-  const heading = `<h2 style="color:${RED3};font-family:helvetica,sans-serif;font-size:20px;font-weight:700;margin:32px 0 8px">Needs attention</h2>`;
+  const heading = `<h2 style="color:${RED4};font-family:helvetica,sans-serif;font-size:20px;font-weight:700;margin:32px 0 8px">Needs attention</h2>`;
   if (items.length === 0) {
-    return `${heading}<p style="color:${GREY3};font-family:helvetica,sans-serif;font-size:16px;margin:0">All clear \u2014 nothing needs attention.</p>`;
+    return `${heading}<p style="color:${GREY4};font-family:helvetica,sans-serif;font-size:16px;margin:0">All clear \u2014 nothing needs attention.</p>`;
   }
   const bySite = /* @__PURE__ */ new Map();
   for (const it of items) {
@@ -1642,7 +1698,7 @@ function attentionSection(items) {
       const titleHtml = safeUrl ? `<a href="${escapeHtml(safeUrl)}" style="${ANCHOR_STYLE}">${escapeHtml(it.title)}</a>` : escapeHtml(it.title);
       return `
           <tr>
-            <td style="color:${GREY3};font-family:helvetica,sans-serif;font-size:16px;line-height:24px;padding-bottom:8px">${attentionBadge(it.status)}${titleHtml}</td>
+            <td style="color:${GREY4};font-family:helvetica,sans-serif;font-size:16px;line-height:24px;padding-bottom:8px">${attentionBadge(it.status)}${titleHtml}</td>
           </tr>`;
     }).join("");
     return `
@@ -1767,7 +1823,7 @@ function renderDigestHtml(sections) {
           <table width="600" style="border-collapse:collapse">
             <tr>
               <td>
-                <h1 style="color:${RED3};font-family:helvetica,sans-serif;font-size:24px;font-weight:700;margin:0 0 8px">Your fleet today</h1>
+                <h1 style="color:${RED4};font-family:helvetica,sans-serif;font-size:24px;font-weight:700;margin:0 0 8px">Your fleet today</h1>
                 ${readySection(sections.readyForYourYes)}
                 ${attentionSection(sections.needsAttention)}
               </td>
@@ -1779,7 +1835,7 @@ function renderDigestHtml(sections) {
   </body>
 </html>`;
 }
-var GREY3, RED3, ANCHOR_STYLE, SEVERITY_ORDER, FROM_ADDRESS, DIGEST_OPERATOR_FALLBACK;
+var GREY4, RED4, ANCHOR_STYLE, SEVERITY_ORDER, FROM_ADDRESS, DIGEST_OPERATOR_FALLBACK;
 var init_digest = __esm({
   "src/reports/digest.ts"() {
     "use strict";
@@ -1791,9 +1847,9 @@ var init_digest = __esm({
     init_digest_collectors();
     init_digest_state();
     init_html();
-    GREY3 = "#757575";
-    RED3 = "#C00";
-    ANCHOR_STYLE = `color:${RED3};font-family:helvetica,sans-serif`;
+    GREY4 = "#757575";
+    RED4 = "#C00";
+    ANCHOR_STYLE = `color:${RED4};font-family:helvetica,sans-serif`;
     SEVERITY_ORDER = { critical: 0, warning: 1 };
     FROM_ADDRESS = "Reddoor Reports <reports@reddoorla.com>";
     DIGEST_OPERATOR_FALLBACK = "info@reddoorla.com";
@@ -1951,7 +2007,11 @@ 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 cadence copy + improvement callouts. Without this the send-time re-render drops
+    // them entirely (they're not stored on the Reports row). Ignored by the other 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`;
@@ -2037,6 +2097,7 @@ var init_orchestrate = __esm({
     init_attachments();
     init_render();
     init_copy();
+    init_template3();
     init_assets();
     init_header_image();
     init_resend();
@@ -5719,10 +5780,40 @@ init_render();
 init_websites();
 init_copy();
 init_reports();
-init_attachments();
 import { mkdir as mkdir4, writeFile as writeFile10 } from "fs/promises";
 import { dirname as dirname6 } from "path";
 
+// src/reports/queue.ts
+init_reports();
+var REPORT_TIER = {
+  Maintenance: 1,
+  Testing: 2,
+  Announcement: 3,
+  Launch: 3
+};
+function reportTier(type) {
+  return REPORT_TIER[type];
+}
+async function queueDraft(base, report) {
+  const newTier = reportTier(report.reportType);
+  const others = (await listReportsForSite(base, report.siteId)).filter(isPendingApproval).filter((r) => r.id !== report.id);
+  const blocker = others.find((r) => reportTier(r.reportType) >= newTier);
+  if (blocker) {
+    await setDraftReady(base, report.id, false);
+    return { queued: false, blockedBy: blocker.reportType, supersededIds: [] };
+  }
+  const supersededIds = [];
+  for (const r of others) {
+    await setDraftReady(base, r.id, false);
+    supersededIds.push(r.id);
+  }
+  await setDraftReady(base, report.id, true);
+  return { queued: true, supersededIds };
+}
+
+// src/reports/draft.ts
+init_attachments();
+
 // src/reports/ga/config.ts
 init_credentials();
 import { dirname as dirname5, join as join26 } from "path";
@@ -5776,6 +5867,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();
 }
@@ -5789,6 +5881,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({
@@ -5820,14 +5931,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)) };
     }
@@ -5885,12 +5996,24 @@ async function draftReportForSite(base, siteRow, reportType, options = {}) {
     const path = options.previewPath ?? `reports/${slug}/draft.html`;
     await mkdir4(dirname6(path), { recursive: true });
     await writeFile10(path, html, "utf-8");
-    return { reportRow: null, htmlPath: path, html, softFailures };
+    return { reportRow: null, htmlPath: path, html, softFailures, queued: null, supersededIds: [] };
   }
   if (base === null) throw new Error("base required when previewOnly=false");
   if (options.completeRowId) {
-    await finishDraftRow(base, options.completeRowId, slug, periodEnd, html);
-    return { reportRow: options.existingRow ?? null, htmlPath: null, html, softFailures };
+    await uploadDraftHtml(options.completeRowId, slug, periodEnd, html);
+    const outcome2 = await queueDraft(base, {
+      id: options.completeRowId,
+      siteId: siteRow.id,
+      reportType
+    });
+    return {
+      reportRow: options.existingRow ?? null,
+      htmlPath: null,
+      html,
+      softFailures,
+      queued: outcome2.queued,
+      supersededIds: outcome2.supersededIds
+    };
   }
   const reportId = `${siteRow.name} \u2014 ${reportType} \u2014 ${periodEnd.toISOString().slice(0, 10)}`;
   const created = await createDraft(base, {
@@ -5907,13 +6030,24 @@ async function draftReportForSite(base, siteRow, reportType, options = {}) {
     ...search ? { searchFoundPage1: search.foundOnPage1 } : {},
     ...search?.foundOnPage1 && search.position !== null ? { searchPosition: search.position } : {}
   });
-  await finishDraftRow(base, created.id, slug, periodEnd, html);
-  return { reportRow: created, htmlPath: null, html, softFailures };
+  await uploadDraftHtml(created.id, slug, periodEnd, html);
+  const outcome = await queueDraft(base, {
+    id: created.id,
+    siteId: siteRow.id,
+    reportType
+  });
+  return {
+    reportRow: created,
+    htmlPath: null,
+    html,
+    softFailures,
+    queued: outcome.queued,
+    supersededIds: outcome.supersededIds
+  };
 }
-async function finishDraftRow(base, rowId, slug, periodEnd, html) {
+async function uploadDraftHtml(rowId, slug, periodEnd, html) {
   const htmlFilename = `${slug}-${periodEnd.toISOString().slice(0, 10)}.html`;
   await uploadAttachment(rowId, "Rendered HTML", html, htmlFilename, "text/html");
-  await setDraftReady(base, rowId, true);
 }
 var NO_ENRICHMENT = { value: null, softFailed: false };
 async function fetchGaUsers(siteRow, periodStart, periodEnd) {
@@ -5963,6 +6097,14 @@ async function derivePeriodStart(base, siteRow, reportType, today) {
 }
 
 // src/cli/commands/report.ts
+function draftLine(reportId, queued, supersededIds, verb = "drafted") {
+  const id = reportId ?? "(unknown)";
+  if (queued === false) {
+    return `\u2022 ${verb} but NOT queued: ${id} \u2014 a higher-or-equal-tier report is already pending approval`;
+  }
+  const sup = supersededIds.length > 0 ? ` (superseded ${supersededIds.length} lower-tier draft${supersededIds.length > 1 ? "s" : ""})` : "";
+  return `\u2713 ${verb}: ${id}${sup}`;
+}
 function parseSingleSiteReportType(raw) {
   if (raw === void 0 || raw.trim() === "") return "Maintenance";
   const norm = raw.trim().toLowerCase();
@@ -6025,15 +6167,30 @@ async function draftDueReports(base, today) {
         lines.push(`\u2022 skipped (already drafted ${period}): ${item.site.name} ${item.reportType}`);
         continue;
       }
+      const blockedByPending = reports.some(
+        (r) => r.siteId === item.site.id && r.id !== existing.id && r.sentAt === null && r.draftReady && reportTier(r.reportType) >= reportTier(item.reportType)
+      );
+      if (blockedByPending) {
+        skipped++;
+        lines.push(
+          `\u2022 skipped (superseded \u2014 a higher-or-equal-tier report is pending): ${item.site.name} ${item.reportType}`
+        );
+        continue;
+      }
       try {
         const result = await draftReportForSite(base, item.site, item.reportType, {
           period,
           completeRowId: existing.id,
           existingRow: existing
         });
-        existing.draftReady = true;
+        existing.draftReady = result.queued === true;
         lines.push(
-          `\u2713 completed half-made draft: ${result.reportRow?.reportId ?? existing.reportId}`
+          draftLine(
+            result.reportRow?.reportId ?? existing.reportId,
+            result.queued,
+            result.supersededIds,
+            "completed half-made draft"
+          )
         );
         if (result.softFailures.length > 0) softFailedSites++;
       } catch (e) {
@@ -6053,7 +6210,7 @@ async function draftDueReports(base, today) {
     }
     try {
       const result = await draftReportForSite(base, item.site, item.reportType, { period });
-      lines.push(`\u2713 drafted: ${result.reportRow?.reportId}`);
+      lines.push(draftLine(result.reportRow?.reportId, result.queued, result.supersededIds));
       if (result.reportRow) reports.push(result.reportRow);
       if (result.softFailures.length > 0) softFailedSites++;
     } catch (e) {
@@ -6083,7 +6240,15 @@ async function runSingleSiteDraft(slug, opts) {
   if (opts.previewOnly) {
     return { output: `Preview written to ${result.htmlPath}`, code: 0 };
   }
-  return { output: `Draft created: ${result.reportRow?.reportId}`, code: 0 };
+  return {
+    output: draftLine(
+      result.reportRow?.reportId,
+      result.queued,
+      result.supersededIds,
+      "Draft created"
+    ),
+    code: 0
+  };
 }
 
 // src/cli/commands/init.ts
@@ -6352,7 +6517,7 @@ async function launch(site, deps = {}) {
         `\u26A0 Launch preview upload skipped for ${target.name}: ${uploadErr instanceof Error ? uploadErr.message : String(uploadErr)}`
       );
     }
-    await setDraftReady(base, report.id, true);
+    await queueDraft(base, { id: report.id, siteId: target.id, reportType: "Launch" });
   } catch (err) {
     steps.push({ name: "draft", result: errorOf(err) });
     return stop();
@@ -6419,6 +6584,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();
@@ -6437,15 +6603,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);
@@ -6455,18 +6630,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(
@@ -6481,9 +6655,19 @@ async function announce(deps) {
           `\u26A0 Announcement preview upload skipped for ${w.name}: ${uploadErr instanceof Error ? uploadErr.message : String(uploadErr)}`
         );
       }
-      await setDraftReady(base, report.id, true);
+      const queue = await queueDraft(base, {
+        id: report.id,
+        siteId: w.id,
+        reportType: "Announcement"
+      });
       const recipientMissing = !(w.reportRecipientsTo && w.reportRecipientsTo.trim());
-      results.push({ site: w.name, status: statusKind, reportId: report.id, recipientMissing });
+      results.push({
+        site: w.name,
+        status: statusKind,
+        reportId: report.id,
+        recipientMissing,
+        queued: queue.queued
+      });
     } catch (err) {
       results.push({
         site: w.name,
@@ -6505,7 +6689,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,
@@ -6516,7 +6700,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
   };
 }